summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
commitc663b6440964f6ac48027143ac9e63298991f9d0 (patch)
tree6d8b0c5a5f9db1ee16acf98b1397cea9126b281d
parenta061f7191beebb0e4a3b0c0a7c534ec5f22f2dc7 (diff)
downloadtdebase-c663b6440964f6ac48027143ac9e63298991f9d0.tar.gz
tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--drkonqi/backtrace.cpp44
-rw-r--r--drkonqi/backtrace.h10
-rw-r--r--drkonqi/crashtest.cpp4
-rw-r--r--drkonqi/debugger.cpp58
-rw-r--r--drkonqi/debugger.h20
-rw-r--r--drkonqi/drbugreport.cpp8
-rw-r--r--drkonqi/drbugreport.h6
-rw-r--r--drkonqi/krashconf.cpp40
-rw-r--r--drkonqi/krashconf.h72
-rw-r--r--drkonqi/krashdcopinterface.h18
-rw-r--r--drkonqi/toplevel.cpp46
-rw-r--r--drkonqi/toplevel.h8
-rw-r--r--kappfinder/common.cpp44
-rw-r--r--kappfinder/common.h22
-rw-r--r--kappfinder/main_install.cpp10
-rw-r--r--kappfinder/toplevel.cpp82
-rw-r--r--kappfinder/toplevel.h30
-rw-r--r--kate/app/kateapp.cpp46
-rw-r--r--kate/app/kateapp.h12
-rw-r--r--kate/app/kateappIface.cpp10
-rw-r--r--kate/app/kateappIface.h10
-rw-r--r--kate/app/kateconfigdialog.cpp140
-rw-r--r--kate/app/kateconfigdialog.h20
-rw-r--r--kate/app/kateconfigplugindialogpage.cpp26
-rw-r--r--kate/app/kateconfigplugindialogpage.h6
-rw-r--r--kate/app/kateconsole.cpp10
-rw-r--r--kate/app/kateconsole.h6
-rw-r--r--kate/app/katedocmanager.cpp80
-rw-r--r--kate/app/katedocmanager.h38
-rw-r--r--kate/app/katedocmanageriface.cpp2
-rw-r--r--kate/app/katedocmanageriface.h2
-rw-r--r--kate/app/kateexternaltools.cpp230
-rw-r--r--kate/app/kateexternaltools.h66
-rw-r--r--kate/app/katefilelist.cpp186
-rw-r--r--kate/app/katefilelist.h52
-rw-r--r--kate/app/katefileselector.cpp278
-rw-r--r--kate/app/katefileselector.h44
-rw-r--r--kate/app/kategrepdialog.cpp162
-rw-r--r--kate/app/kategrepdialog.h44
-rw-r--r--kate/app/katemailfilesdialog.cpp30
-rw-r--r--kate/app/katemailfilesdialog.h10
-rw-r--r--kate/app/katemain.cpp28
-rw-r--r--kate/app/katemainwindow.cpp164
-rw-r--r--kate/app/katemainwindow.h16
-rw-r--r--kate/app/katemainwindowiface.cpp2
-rw-r--r--kate/app/katemdi.cpp146
-rw-r--r--kate/app/katemdi.h74
-rw-r--r--kate/app/katemwmodonhddialog.cpp50
-rw-r--r--kate/app/katemwmodonhddialog.h8
-rw-r--r--kate/app/katepluginmanager.cpp26
-rw-r--r--kate/app/katepluginmanager.h16
-rw-r--r--kate/app/katesavemodifieddialog.cpp62
-rw-r--r--kate/app/katesavemodifieddialog.h10
-rw-r--r--kate/app/katesession.cpp132
-rw-r--r--kate/app/katesession.h46
-rw-r--r--kate/app/katetabwidget.cpp22
-rw-r--r--kate/app/katetabwidget.h18
-rw-r--r--kate/app/kateviewmanager.cpp84
-rw-r--r--kate/app/kateviewmanager.h20
-rw-r--r--kate/app/kateviewspace.cpp108
-rw-r--r--kate/app/kateviewspace.h44
-rw-r--r--kate/app/kateviewspacecontainer.cpp122
-rw-r--r--kate/app/kateviewspacecontainer.h20
-rw-r--r--kate/app/kbookmarkhandler.cpp22
-rw-r--r--kate/app/kbookmarkhandler.h18
-rw-r--r--kate/app/kwritemain.cpp100
-rw-r--r--kate/app/kwritemain.h16
-rw-r--r--kate/interfaces/application.cpp2
-rw-r--r--kate/interfaces/application.h2
-rw-r--r--kate/interfaces/documentmanager.cpp4
-rw-r--r--kate/interfaces/documentmanager.h4
-rw-r--r--kate/interfaces/mainwindow.cpp4
-rw-r--r--kate/interfaces/mainwindow.h6
-rw-r--r--kate/interfaces/plugin.cpp4
-rw-r--r--kate/interfaces/plugin.h6
-rw-r--r--kate/interfaces/pluginconfiginterfaceextension.cpp2
-rw-r--r--kate/interfaces/pluginconfiginterfaceextension.h14
-rw-r--r--kate/interfaces/pluginmanager.cpp10
-rw-r--r--kate/interfaces/pluginmanager.h10
-rw-r--r--kate/interfaces/toolviewmanager.cpp10
-rw-r--r--kate/interfaces/toolviewmanager.h10
-rw-r--r--kate/interfaces/viewmanager.cpp4
-rw-r--r--kate/interfaces/viewmanager.h2
-rw-r--r--kate/utils/dockviewbase.cpp42
-rw-r--r--kate/utils/dockviewbase.h20
-rw-r--r--kate/utils/listboxview.cpp4
-rw-r--r--kate/utils/listboxview.h4
-rw-r--r--kate/utils/messageview.cpp12
-rw-r--r--kate/utils/messageview.h10
-rw-r--r--kcminit/main.cpp44
-rw-r--r--kcminit/main.h6
-rw-r--r--kcontrol/access/kaccess.cpp72
-rw-r--r--kcontrol/access/kaccess.h18
-rw-r--r--kcontrol/access/kcmaccess.cpp310
-rw-r--r--kcontrol/access/kcmaccess.h34
-rw-r--r--kcontrol/accessibility/accessibility.cpp16
-rw-r--r--kcontrol/accessibility/accessibility.h2
-rw-r--r--kcontrol/arts/arts.cpp184
-rw-r--r--kcontrol/arts/arts.h40
-rw-r--r--kcontrol/arts/krichtextlabel.cpp44
-rw-r--r--kcontrol/arts/krichtextlabel.h18
-rw-r--r--kcontrol/background/bgadvanced.cpp132
-rw-r--r--kcontrol/background/bgadvanced.h48
-rw-r--r--kcontrol/background/bgdefaults.h4
-rw-r--r--kcontrol/background/bgdialog.cpp198
-rw-r--r--kcontrol/background/bgdialog.h24
-rw-r--r--kcontrol/background/bghash.h6
-rw-r--r--kcontrol/background/bgmonitor.cpp82
-rw-r--r--kcontrol/background/bgmonitor.h46
-rw-r--r--kcontrol/background/bgrender.cpp178
-rw-r--r--kcontrol/background/bgrender.h52
-rw-r--r--kcontrol/background/bgsettings.cpp166
-rw-r--r--kcontrol/background/bgsettings.h128
-rw-r--r--kcontrol/background/bgwallpaper.cpp48
-rw-r--r--kcontrol/background/bgwallpaper.h14
-rw-r--r--kcontrol/background/main.cpp14
-rw-r--r--kcontrol/background/main.h2
-rw-r--r--kcontrol/bell/bell.cpp46
-rw-r--r--kcontrol/bell/bell.h6
-rw-r--r--kcontrol/clock/dtime.cpp138
-rw-r--r--kcontrol/clock/dtime.h44
-rw-r--r--kcontrol/clock/main.cpp16
-rw-r--r--kcontrol/clock/main.h4
-rw-r--r--kcontrol/clock/tzone.cpp44
-rw-r--r--kcontrol/clock/tzone.h6
-rw-r--r--kcontrol/colors/colorscm.cpp236
-rw-r--r--kcontrol/colors/colorscm.h38
-rw-r--r--kcontrol/colors/widgetcanvas.cpp274
-rw-r--r--kcontrol/colors/widgetcanvas.h84
-rw-r--r--kcontrol/componentchooser/componentchooser.cpp120
-rw-r--r--kcontrol/componentchooser/componentchooser.h28
-rw-r--r--kcontrol/componentchooser/kcm_componentchooser.cpp10
-rw-r--r--kcontrol/componentchooser/kcm_componentchooser.h2
-rw-r--r--kcontrol/crypto/certexport.cpp54
-rw-r--r--kcontrol/crypto/certexport.h8
-rw-r--r--kcontrol/crypto/crypto.cpp718
-rw-r--r--kcontrol/crypto/crypto.h198
-rw-r--r--kcontrol/crypto/kdatetimedlg.cpp36
-rw-r--r--kcontrol/crypto/kdatetimedlg.h14
-rw-r--r--kcontrol/css/kcmcss.cpp134
-rw-r--r--kcontrol/css/kcmcss.h6
-rw-r--r--kcontrol/css/template.cpp18
-rw-r--r--kcontrol/css/template.h10
-rw-r--r--kcontrol/display/display.cpp32
-rw-r--r--kcontrol/display/display.h8
-rw-r--r--kcontrol/dnssd/kcmdnssd.cpp62
-rw-r--r--kcontrol/dnssd/kcmdnssd.h6
-rw-r--r--kcontrol/ebrowsing/filteropts.cpp10
-rw-r--r--kcontrol/ebrowsing/filteropts.h4
-rw-r--r--kcontrol/ebrowsing/main.cpp30
-rw-r--r--kcontrol/ebrowsing/main.h6
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp114
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/ikwsopts.h14
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp4
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h4
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp134
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.h28
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp10
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h8
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp16
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchprovider.h32
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp26
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h2
-rw-r--r--kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp28
-rw-r--r--kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h12
-rw-r--r--kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp98
-rw-r--r--kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h18
-rw-r--r--kcontrol/energy/energy.cpp44
-rw-r--r--kcontrol/energy/energy.h8
-rw-r--r--kcontrol/filetypes/control.cpp2
-rw-r--r--kcontrol/filetypes/filegroupdetails.cpp26
-rw-r--r--kcontrol/filetypes/filegroupdetails.h6
-rw-r--r--kcontrol/filetypes/filetypedetails.cpp104
-rw-r--r--kcontrol/filetypes/filetypedetails.h24
-rw-r--r--kcontrol/filetypes/filetypesview.cpp130
-rw-r--r--kcontrol/filetypes/filetypesview.h32
-rw-r--r--kcontrol/filetypes/keditfiletype.cpp28
-rw-r--r--kcontrol/filetypes/kservicelistwidget.cpp90
-rw-r--r--kcontrol/filetypes/kservicelistwidget.h16
-rw-r--r--kcontrol/filetypes/kserviceselectdlg.cpp14
-rw-r--r--kcontrol/filetypes/kserviceselectdlg.h2
-rw-r--r--kcontrol/filetypes/newtypedlg.cpp30
-rw-r--r--kcontrol/filetypes/newtypedlg.h12
-rw-r--r--kcontrol/filetypes/typeslistitem.cpp110
-rw-r--r--kcontrol/filetypes/typeslistitem.h56
-rw-r--r--kcontrol/fonts/fonts.cpp180
-rw-r--r--kcontrol/fonts/fonts.h44
-rw-r--r--kcontrol/fonts/kxftconfig.cpp186
-rw-r--r--kcontrol/fonts/kxftconfig.h78
-rw-r--r--kcontrol/iccconfig/iccconfig.cpp100
-rw-r--r--kcontrol/iccconfig/iccconfig.h20
-rw-r--r--kcontrol/icons/icons.cpp200
-rw-r--r--kcontrol/icons/icons.h54
-rw-r--r--kcontrol/icons/iconthemes.cpp112
-rw-r--r--kcontrol/icons/iconthemes.h24
-rw-r--r--kcontrol/icons/main.cpp16
-rw-r--r--kcontrol/icons/main.h8
-rw-r--r--kcontrol/info/info.cpp140
-rw-r--r--kcontrol/info/info.h56
-rw-r--r--kcontrol/info/info_aix.cpp76
-rw-r--r--kcontrol/info/info_fbsd.cpp148
-rw-r--r--kcontrol/info/info_generic.cpp22
-rw-r--r--kcontrol/info/info_hpux.cpp216
-rw-r--r--kcontrol/info/info_linux.cpp158
-rw-r--r--kcontrol/info/info_netbsd.cpp90
-rw-r--r--kcontrol/info/info_openbsd.cpp84
-rw-r--r--kcontrol/info/info_osx.cpp42
-rw-r--r--kcontrol/info/info_sgi.cpp26
-rw-r--r--kcontrol/info/info_solaris.cpp76
-rw-r--r--kcontrol/info/info_svr4.cpp38
-rw-r--r--kcontrol/info/main.cpp26
-rw-r--r--kcontrol/info/memory.cpp86
-rw-r--r--kcontrol/info/memory.h42
-rw-r--r--kcontrol/info/memory_linux.cpp4
-rw-r--r--kcontrol/info/memory_osx.cpp2
-rw-r--r--kcontrol/info/opengl.cpp140
-rw-r--r--kcontrol/input/core/themepage.cpp40
-rw-r--r--kcontrol/input/core/themepage.h6
-rw-r--r--kcontrol/input/logitechmouse.cpp40
-rw-r--r--kcontrol/input/logitechmouse.h18
-rw-r--r--kcontrol/input/main.cpp16
-rw-r--r--kcontrol/input/mouse.cpp146
-rw-r--r--kcontrol/input/mouse.h42
-rw-r--r--kcontrol/input/xcursor/previewwidget.cpp40
-rw-r--r--kcontrol/input/xcursor/previewwidget.h8
-rw-r--r--kcontrol/input/xcursor/themepage.cpp160
-rw-r--r--kcontrol/input/xcursor/themepage.h26
-rw-r--r--kcontrol/ioslaveinfo/kcmioslaveinfo.cpp54
-rw-r--r--kcontrol/ioslaveinfo/kcmioslaveinfo.h14
-rw-r--r--kcontrol/joystick/caldialog.cpp36
-rw-r--r--kcontrol/joystick/caldialog.h6
-rw-r--r--kcontrol/joystick/joydevice.cpp4
-rw-r--r--kcontrol/joystick/joydevice.h14
-rw-r--r--kcontrol/joystick/joystick.cpp4
-rw-r--r--kcontrol/joystick/joystick.h2
-rw-r--r--kcontrol/joystick/joywidget.cpp90
-rw-r--r--kcontrol/joystick/joywidget.h22
-rw-r--r--kcontrol/joystick/poswidget.cpp12
-rw-r--r--kcontrol/joystick/poswidget.h6
-rw-r--r--kcontrol/kcontrol/aboutwidget.cpp48
-rw-r--r--kcontrol/kcontrol/aboutwidget.h18
-rw-r--r--kcontrol/kcontrol/dockcontainer.cpp82
-rw-r--r--kcontrol/kcontrol/dockcontainer.h20
-rw-r--r--kcontrol/kcontrol/global.cpp46
-rw-r--r--kcontrol/kcontrol/global.h48
-rw-r--r--kcontrol/kcontrol/helpwidget.cpp10
-rw-r--r--kcontrol/kcontrol/helpwidget.h12
-rw-r--r--kcontrol/kcontrol/indexwidget.cpp50
-rw-r--r--kcontrol/kcontrol/indexwidget.h10
-rw-r--r--kcontrol/kcontrol/kcrootonly.cpp10
-rw-r--r--kcontrol/kcontrol/kcrootonly.h2
-rw-r--r--kcontrol/kcontrol/main.cpp22
-rw-r--r--kcontrol/kcontrol/moduleIface.cpp12
-rw-r--r--kcontrol/kcontrol/moduleIface.h18
-rw-r--r--kcontrol/kcontrol/moduleiconview.cpp38
-rw-r--r--kcontrol/kcontrol/moduleiconview.h22
-rw-r--r--kcontrol/kcontrol/modulemenu.cpp30
-rw-r--r--kcontrol/kcontrol/modulemenu.h18
-rw-r--r--kcontrol/kcontrol/modules.cpp60
-rw-r--r--kcontrol/kcontrol/modules.h30
-rw-r--r--kcontrol/kcontrol/moduletreeview.cpp126
-rw-r--r--kcontrol/kcontrol/moduletreeview.h50
-rw-r--r--kcontrol/kcontrol/proxywidget.cpp110
-rw-r--r--kcontrol/kcontrol/proxywidget.h10
-rw-r--r--kcontrol/kcontrol/searchwidget.cpp66
-rw-r--r--kcontrol/kcontrol/searchwidget.h34
-rw-r--r--kcontrol/kcontrol/toplevel.cpp126
-rw-r--r--kcontrol/kcontrol/toplevel.h14
-rw-r--r--kcontrol/kded/kcmkded.cpp118
-rw-r--r--kcontrol/kded/kcmkded.h26
-rw-r--r--kcontrol/kdm/background.cpp22
-rw-r--r--kcontrol/kdm/background.h10
-rw-r--r--kcontrol/kdm/kbackedcombobox.cpp6
-rw-r--r--kcontrol/kdm/kbackedcombobox.h10
-rw-r--r--kcontrol/kdm/kdm-appear.cpp216
-rw-r--r--kcontrol/kdm/kdm-appear.h36
-rw-r--r--kcontrol/kdm/kdm-conv.cpp164
-rw-r--r--kcontrol/kdm/kdm-conv.h26
-rw-r--r--kcontrol/kdm/kdm-font.cpp52
-rw-r--r--kcontrol/kdm/kdm-font.h4
-rw-r--r--kcontrol/kdm/kdm-shut.cpp80
-rw-r--r--kcontrol/kdm/kdm-shut.h8
-rw-r--r--kcontrol/kdm/kdm-users.cpp240
-rw-r--r--kcontrol/kdm/kdm-users.h34
-rw-r--r--kcontrol/kdm/main.cpp82
-rw-r--r--kcontrol/kdm/main.h14
-rw-r--r--kcontrol/keys/commandShortcuts.cpp72
-rw-r--r--kcontrol/keys/commandShortcuts.h24
-rw-r--r--kcontrol/keys/kaccelaction.h60
-rw-r--r--kcontrol/keys/keyconfig.cpp104
-rw-r--r--kcontrol/keys/keyconfig.h32
-rw-r--r--kcontrol/keys/khotkeys.cpp28
-rw-r--r--kcontrol/keys/khotkeys.h12
-rw-r--r--kcontrol/keys/main.cpp22
-rw-r--r--kcontrol/keys/main.h8
-rw-r--r--kcontrol/keys/modifiers.cpp64
-rw-r--r--kcontrol/keys/modifiers.h14
-rw-r--r--kcontrol/keys/shortcuts.cpp96
-rw-r--r--kcontrol/keys/shortcuts.h26
-rw-r--r--kcontrol/keys/treeview.cpp100
-rw-r--r--kcontrol/keys/treeview.h42
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp138
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KCmFontInst.h14
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp16
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h10
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp136
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KFileFontView.h60
-rw-r--r--kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp24
-rw-r--r--kcontrol/kfontinst/kcmfontinst/PrintDialog.h6
-rw-r--r--kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp26
-rw-r--r--kcontrol/kfontinst/kcmfontinst/SettingsDialog.h4
-rw-r--r--kcontrol/kfontinst/kfile-plugin/KFileFont.cpp42
-rw-r--r--kcontrol/kfontinst/kfile-plugin/KFileFont.h2
-rw-r--r--kcontrol/kfontinst/kfontinst/FontEngine.cpp26
-rw-r--r--kcontrol/kfontinst/kfontinst/FontEngine.h18
-rw-r--r--kcontrol/kfontinst/kfontinst/Fontmap.cpp102
-rw-r--r--kcontrol/kfontinst/kfontinst/Fontmap.h24
-rw-r--r--kcontrol/kfontinst/kfontinst/Main.cpp16
-rw-r--r--kcontrol/kfontinst/kfontinst/XConfig.cpp44
-rw-r--r--kcontrol/kfontinst/kfontinst/XConfig.h24
-rw-r--r--kcontrol/kfontinst/kio/KioFonts.cpp396
-rw-r--r--kcontrol/kfontinst/kio/KioFonts.h50
-rw-r--r--kcontrol/kfontinst/lib/FcEngine.cpp158
-rw-r--r--kcontrol/kfontinst/lib/FcEngine.h52
-rw-r--r--kcontrol/kfontinst/lib/Misc.cpp48
-rw-r--r--kcontrol/kfontinst/lib/Misc.h40
-rw-r--r--kcontrol/kfontinst/thumbnail/FontThumbnail.cpp10
-rw-r--r--kcontrol/kfontinst/thumbnail/FontThumbnail.h2
-rw-r--r--kcontrol/kfontinst/viewpart/FontPreview.cpp22
-rw-r--r--kcontrol/kfontinst/viewpart/FontPreview.h24
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewPart.cpp86
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewPart.h8
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp6
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewPartFactory.h2
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewerApp.cpp10
-rw-r--r--kcontrol/kfontinst/viewpart/KfiPrint.cpp30
-rw-r--r--kcontrol/kfontinst/viewpart/KfiPrint.h4
-rw-r--r--kcontrol/kicker/advancedDialog.cpp54
-rw-r--r--kcontrol/kicker/advancedDialog.h2
-rw-r--r--kcontrol/kicker/applettab_impl.cpp76
-rw-r--r--kcontrol/kicker/applettab_impl.h12
-rw-r--r--kcontrol/kicker/extensionInfo.cpp18
-rw-r--r--kcontrol/kicker/extensionInfo.h20
-rw-r--r--kcontrol/kicker/hidingconfig.cpp20
-rw-r--r--kcontrol/kicker/hidingconfig.h2
-rw-r--r--kcontrol/kicker/hidingtab_impl.cpp60
-rw-r--r--kcontrol/kicker/hidingtab_impl.h2
-rw-r--r--kcontrol/kicker/lookandfeelconfig.cpp20
-rw-r--r--kcontrol/kicker/lookandfeelconfig.h2
-rw-r--r--kcontrol/kicker/lookandfeeltab_impl.cpp66
-rw-r--r--kcontrol/kicker/lookandfeeltab_impl.h12
-rw-r--r--kcontrol/kicker/lookandfeeltab_kcm.cpp10
-rw-r--r--kcontrol/kicker/lookandfeeltab_kcm.h4
-rw-r--r--kcontrol/kicker/main.cpp74
-rw-r--r--kcontrol/kicker/main.h18
-rw-r--r--kcontrol/kicker/menuconfig.cpp20
-rw-r--r--kcontrol/kicker/menuconfig.h2
-rw-r--r--kcontrol/kicker/menutab_impl.cpp86
-rw-r--r--kcontrol/kicker/menutab_impl.h20
-rw-r--r--kcontrol/kicker/positionconfig.cpp20
-rw-r--r--kcontrol/kicker/positionconfig.h2
-rw-r--r--kcontrol/kicker/positiontab_impl.cpp174
-rw-r--r--kcontrol/kicker/positiontab_impl.h10
-rw-r--r--kcontrol/kio/cache.cpp28
-rw-r--r--kcontrol/kio/cache.h4
-rw-r--r--kcontrol/kio/fakeuaprovider.cpp48
-rw-r--r--kcontrol/kio/fakeuaprovider.h14
-rw-r--r--kcontrol/kio/kcookiesmain.cpp18
-rw-r--r--kcontrol/kio/kcookiesmain.h6
-rw-r--r--kcontrol/kio/kcookiesmanagement.cpp136
-rw-r--r--kcontrol/kio/kcookiesmanagement.h36
-rw-r--r--kcontrol/kio/kcookiespolicies.cpp124
-rw-r--r--kcontrol/kio/kcookiespolicies.h16
-rw-r--r--kcontrol/kio/kenvvarproxydlg.cpp62
-rw-r--r--kcontrol/kio/kenvvarproxydlg.h6
-rw-r--r--kcontrol/kio/kmanualproxydlg.cpp90
-rw-r--r--kcontrol/kio/kmanualproxydlg.h22
-rw-r--r--kcontrol/kio/kproxydlg.cpp82
-rw-r--r--kcontrol/kio/kproxydlg.h14
-rw-r--r--kcontrol/kio/kproxydlgbase.cpp8
-rw-r--r--kcontrol/kio/kproxydlgbase.h16
-rw-r--r--kcontrol/kio/ksaveioconfig.cpp42
-rw-r--r--kcontrol/kio/ksaveioconfig.h10
-rw-r--r--kcontrol/kio/main.cpp32
-rw-r--r--kcontrol/kio/main.h6
-rw-r--r--kcontrol/kio/netpref.cpp50
-rw-r--r--kcontrol/kio/netpref.h12
-rw-r--r--kcontrol/kio/policydlg.cpp28
-rw-r--r--kcontrol/kio/policydlg.h18
-rw-r--r--kcontrol/kio/smbrodlg.cpp70
-rw-r--r--kcontrol/kio/smbrodlg.h18
-rw-r--r--kcontrol/kio/socks.cpp68
-rw-r--r--kcontrol/kio/socks.h10
-rw-r--r--kcontrol/kio/uagentproviderdlg.cpp48
-rw-r--r--kcontrol/kio/uagentproviderdlg.h20
-rw-r--r--kcontrol/kio/useragentdlg.cpp114
-rw-r--r--kcontrol/kio/useragentdlg.h8
-rw-r--r--kcontrol/knotify/knotify.cpp56
-rw-r--r--kcontrol/knotify/knotify.h10
-rw-r--r--kcontrol/konq/behaviour.cpp120
-rw-r--r--kcontrol/konq/behaviour.h28
-rw-r--r--kcontrol/konq/browser.cpp30
-rw-r--r--kcontrol/konq/browser.h6
-rw-r--r--kcontrol/konq/desktop.cpp74
-rw-r--r--kcontrol/konq/desktop.h6
-rw-r--r--kcontrol/konq/desktopbehavior_impl.cpp118
-rw-r--r--kcontrol/konq/desktopbehavior_impl.h8
-rw-r--r--kcontrol/konq/fontopts.cpp158
-rw-r--r--kcontrol/konq/fontopts.h46
-rw-r--r--kcontrol/konq/main.cpp20
-rw-r--r--kcontrol/konq/previews.cpp58
-rw-r--r--kcontrol/konq/previews.h10
-rw-r--r--kcontrol/konq/rootopts.cpp74
-rw-r--r--kcontrol/konq/rootopts.h6
-rw-r--r--kcontrol/konqhtml/advancedTabDialog.cpp42
-rw-r--r--kcontrol/konqhtml/advancedTabDialog.h2
-rw-r--r--kcontrol/konqhtml/appearance.cpp238
-rw-r--r--kcontrol/konqhtml/appearance.h36
-rw-r--r--kcontrol/konqhtml/domainlistview.cpp76
-rw-r--r--kcontrol/konqhtml/domainlistview.h34
-rw-r--r--kcontrol/konqhtml/filteropts.cpp116
-rw-r--r--kcontrol/konqhtml/filteropts.h24
-rw-r--r--kcontrol/konqhtml/htmlopts.cpp126
-rw-r--r--kcontrol/konqhtml/htmlopts.h40
-rw-r--r--kcontrol/konqhtml/javaopts.cpp114
-rw-r--r--kcontrol/konqhtml/javaopts.h28
-rw-r--r--kcontrol/konqhtml/jsopts.cpp64
-rw-r--r--kcontrol/konqhtml/jsopts.h18
-rw-r--r--kcontrol/konqhtml/jspolicies.cpp188
-rw-r--r--kcontrol/konqhtml/jspolicies.h26
-rw-r--r--kcontrol/konqhtml/khttpoptdlg.cpp28
-rw-r--r--kcontrol/konqhtml/khttpoptdlg.h22
-rw-r--r--kcontrol/konqhtml/main.cpp28
-rw-r--r--kcontrol/konqhtml/main.h6
-rw-r--r--kcontrol/konqhtml/pluginopts.cpp200
-rw-r--r--kcontrol/konqhtml/pluginopts.h38
-rw-r--r--kcontrol/konqhtml/policies.cpp14
-rw-r--r--kcontrol/konqhtml/policies.h18
-rw-r--r--kcontrol/konqhtml/policydlg.cpp52
-rw-r--r--kcontrol/konqhtml/policydlg.h34
-rw-r--r--kcontrol/konsole/kcmkonsole.cpp56
-rw-r--r--kcontrol/konsole/kcmkonsole.h2
-rw-r--r--kcontrol/konsole/schemaeditor.cpp166
-rw-r--r--kcontrol/konsole/schemaeditor.h26
-rw-r--r--kcontrol/konsole/sessioneditor.cpp100
-rw-r--r--kcontrol/konsole/sessioneditor.h18
-rw-r--r--kcontrol/krdb/krdb.cpp192
-rw-r--r--kcontrol/kthememanager/knewthemedlg.cpp30
-rw-r--r--kcontrol/kthememanager/knewthemedlg.h28
-rw-r--r--kcontrol/kthememanager/ktheme.cpp294
-rw-r--r--kcontrol/kthememanager/ktheme.h86
-rw-r--r--kcontrol/kthememanager/kthemedlg.ui.h2
-rw-r--r--kcontrol/kthememanager/kthememanager.cpp120
-rw-r--r--kcontrol/kthememanager/kthememanager.h18
-rw-r--r--kcontrol/launch/kcmlaunch.cpp60
-rw-r--r--kcontrol/launch/kcmlaunch.h10
-rw-r--r--kcontrol/locale/kcmlocale.cpp238
-rw-r--r--kcontrol/locale/kcmlocale.h34
-rw-r--r--kcontrol/locale/klocalesample.cpp74
-rw-r--r--kcontrol/locale/klocalesample.h14
-rw-r--r--kcontrol/locale/localemon.cpp164
-rw-r--r--kcontrol/locale/localemon.h36
-rw-r--r--kcontrol/locale/localenum.cpp92
-rw-r--r--kcontrol/locale/localenum.h28
-rw-r--r--kcontrol/locale/localeother.cpp48
-rw-r--r--kcontrol/locale/localeother.h12
-rw-r--r--kcontrol/locale/localetime.cpp174
-rw-r--r--kcontrol/locale/localetime.h50
-rw-r--r--kcontrol/locale/main.cpp2
-rw-r--r--kcontrol/locale/toplevel.cpp164
-rw-r--r--kcontrol/locale/toplevel.h10
-rw-r--r--kcontrol/nics/nic.cpp66
-rw-r--r--kcontrol/nics/nic.h6
-rw-r--r--kcontrol/performance/kcmperformance.cpp24
-rw-r--r--kcontrol/performance/kcmperformance.h4
-rw-r--r--kcontrol/performance/konqueror.cpp42
-rw-r--r--kcontrol/performance/konqueror.h4
-rw-r--r--kcontrol/performance/system.cpp16
-rw-r--r--kcontrol/performance/system.h2
-rw-r--r--kcontrol/privacy/kprivacymanager.cpp38
-rw-r--r--kcontrol/privacy/kprivacymanager.h4
-rw-r--r--kcontrol/privacy/privacy.cpp88
-rw-r--r--kcontrol/privacy/privacy.h26
-rw-r--r--kcontrol/randr/configdialog.cpp22
-rw-r--r--kcontrol/randr/configdialog.h26
-rw-r--r--kcontrol/randr/krandrbindings.cpp6
-rw-r--r--kcontrol/randr/krandrmodule.cpp88
-rw-r--r--kcontrol/randr/krandrmodule.h8
-rw-r--r--kcontrol/randr/krandrpassivepopup.cpp20
-rw-r--r--kcontrol/randr/krandrpassivepopup.h20
-rw-r--r--kcontrol/randr/krandrtray.cpp68
-rw-r--r--kcontrol/randr/krandrtray.h12
-rw-r--r--kcontrol/samba/kcmsambaimports.cpp18
-rw-r--r--kcontrol/samba/kcmsambaimports.h10
-rw-r--r--kcontrol/samba/kcmsambalog.cpp42
-rw-r--r--kcontrol/samba/kcmsambalog.h28
-rw-r--r--kcontrol/samba/kcmsambastatistics.cpp114
-rw-r--r--kcontrol/samba/kcmsambastatistics.h52
-rw-r--r--kcontrol/samba/ksmbstatus.cpp42
-rw-r--r--kcontrol/samba/ksmbstatus.h20
-rw-r--r--kcontrol/samba/main.cpp16
-rw-r--r--kcontrol/screensaver/advanceddialog.cpp62
-rw-r--r--kcontrol/screensaver/advanceddialog.h34
-rw-r--r--kcontrol/screensaver/kssmonitor.h4
-rw-r--r--kcontrol/screensaver/kswidget.cpp2
-rw-r--r--kcontrol/screensaver/kswidget.h2
-rw-r--r--kcontrol/screensaver/saverconfig.cpp2
-rw-r--r--kcontrol/screensaver/saverconfig.h28
-rw-r--r--kcontrol/screensaver/saverlist.cpp2
-rw-r--r--kcontrol/screensaver/saverlist.h6
-rw-r--r--kcontrol/screensaver/scrnsave.cpp220
-rw-r--r--kcontrol/screensaver/scrnsave.h42
-rw-r--r--kcontrol/smartcard/smartcard.cpp116
-rw-r--r--kcontrol/smartcard/smartcard.h14
-rw-r--r--kcontrol/smserver/kcmsmserver.cpp22
-rw-r--r--kcontrol/smserver/kcmsmserver.h2
-rw-r--r--kcontrol/smserver/smserverconfigimpl.cpp2
-rw-r--r--kcontrol/smserver/smserverconfigimpl.h4
-rw-r--r--kcontrol/spellchecking/spellchecking.cpp16
-rw-r--r--kcontrol/spellchecking/spellchecking.h2
-rw-r--r--kcontrol/style/kcmstyle.cpp334
-rw-r--r--kcontrol/style/kcmstyle.h114
-rw-r--r--kcontrol/style/keramik/keramikconf.cpp28
-rw-r--r--kcontrol/style/keramik/keramikconf.h8
-rw-r--r--kcontrol/style/main.cpp4
-rw-r--r--kcontrol/style/menupreview.cpp36
-rw-r--r--kcontrol/style/menupreview.h6
-rw-r--r--kcontrol/style/styleconfdialog.cpp6
-rw-r--r--kcontrol/style/styleconfdialog.h2
-rw-r--r--kcontrol/style/stylepreview.ui.h32
-rw-r--r--kcontrol/taskbar/kcmtaskbar.cpp68
-rw-r--r--kcontrol/taskbar/kcmtaskbar.h22
-rw-r--r--kcontrol/usbview/kcmusb.cpp68
-rw-r--r--kcontrol/usbview/kcmusb.h12
-rw-r--r--kcontrol/usbview/usbdb.cpp66
-rw-r--r--kcontrol/usbview/usbdb.h14
-rw-r--r--kcontrol/usbview/usbdevices.cpp108
-rw-r--r--kcontrol/usbview/usbdevices.h26
-rw-r--r--kcontrol/view1394/view1394.cpp72
-rw-r--r--kcontrol/view1394/view1394.h22
-rw-r--r--kcontrol/xinerama/kcmxinerama.cpp86
-rw-r--r--kcontrol/xinerama/kcmxinerama.h12
-rw-r--r--kdcop/kdcoplistview.cpp52
-rw-r--r--kdcop/kdcoplistview.h60
-rw-r--r--kdcop/kdcopwindow.cpp484
-rw-r--r--kdcop/kdcopwindow.h22
-rw-r--r--kdebugdialog/kabstractdebugdialog.cpp18
-rw-r--r--kdebugdialog/kabstractdebugdialog.h4
-rw-r--r--kdebugdialog/kdebugdialog.cpp120
-rw-r--r--kdebugdialog/kdebugdialog.h64
-rw-r--r--kdebugdialog/klistdebugdialog.cpp68
-rw-r--r--kdebugdialog/klistdebugdialog.h20
-rw-r--r--kdebugdialog/main.cpp22
-rw-r--r--kdepasswd/kcm/chfacedlg.cpp78
-rw-r--r--kdepasswd/kcm/chfacedlg.h12
-rw-r--r--kdepasswd/kcm/chfnprocess.cpp4
-rw-r--r--kdepasswd/kcm/chfnprocess.h6
-rw-r--r--kdepasswd/kcm/main.cpp90
-rw-r--r--kdepasswd/kcm/main.h12
-rw-r--r--kdepasswd/kdepasswd.cpp4
-rw-r--r--kdepasswd/passwd.cpp8
-rw-r--r--kdepasswd/passwd.h10
-rw-r--r--kdepasswd/passwddlg.cpp12
-rw-r--r--kdepasswd/passwddlg.h6
-rw-r--r--kdeprint/descriptions/sortthem.cpp6
-rw-r--r--kdeprint/kdeprint_part/printpart.cpp10
-rw-r--r--kdeprint/kdeprint_part/printpart.h6
-rw-r--r--kdeprint/kdeprintfax/conffax.cpp26
-rw-r--r--kdeprint/kdeprintfax/conffax.h4
-rw-r--r--kdeprint/kdeprintfax/conffilters.cpp66
-rw-r--r--kdeprint/kdeprintfax/conffilters.h6
-rw-r--r--kdeprint/kdeprintfax/confgeneral.cpp34
-rw-r--r--kdeprint/kdeprintfax/confgeneral.h8
-rw-r--r--kdeprint/kdeprintfax/configdlg.cpp6
-rw-r--r--kdeprint/kdeprintfax/configdlg.h4
-rw-r--r--kdeprint/kdeprintfax/confsystem.cpp50
-rw-r--r--kdeprint/kdeprintfax/confsystem.h6
-rw-r--r--kdeprint/kdeprintfax/defcmds.cpp4
-rw-r--r--kdeprint/kdeprintfax/defcmds.h4
-rw-r--r--kdeprint/kdeprintfax/faxab.cpp42
-rw-r--r--kdeprint/kdeprintfax/faxab.h18
-rw-r--r--kdeprint/kdeprintfax/faxctrl.cpp158
-rw-r--r--kdeprint/kdeprintfax/faxctrl.h20
-rw-r--r--kdeprint/kdeprintfax/filterdlg.cpp26
-rw-r--r--kdeprint/kdeprintfax/filterdlg.h4
-rw-r--r--kdeprint/kdeprintfax/kdeprintfax.cpp210
-rw-r--r--kdeprint/kdeprintfax/kdeprintfax.h44
-rw-r--r--kdeprint/kdeprintfax/main.cpp6
-rw-r--r--kdeprint/kjobviewer/kjobviewer.cpp26
-rw-r--r--kdeprint/kjobviewer/kjobviewer.h6
-rw-r--r--kdeprint/kprinter/main.cpp4
-rw-r--r--kdeprint/kprinter/printwrapper.cpp68
-rw-r--r--kdeprint/kprinter/printwrapper.h4
-rw-r--r--kdeprint/printmgr/kcmprintmgr.cpp10
-rw-r--r--kdeprint/printmgr/kcmprintmgr.h4
-rw-r--r--kdeprint/slave/kio_print.cpp148
-rw-r--r--kdeprint/slave/kio_print.h20
-rw-r--r--kdesktop/KBackgroundIface.h14
-rw-r--r--kdesktop/KDesktopIface.h8
-rw-r--r--kdesktop/bgmanager.cc98
-rw-r--r--kdesktop/bgmanager.h34
-rw-r--r--kdesktop/desktop.cc186
-rw-r--r--kdesktop/desktop.h28
-rw-r--r--kdesktop/init.cc68
-rw-r--r--kdesktop/kcustommenu.cc30
-rw-r--r--kdesktop/kcustommenu.h4
-rw-r--r--kdesktop/kdesktopbindings.cpp10
-rw-r--r--kdesktop/kdesktopshadowsettings.cpp4
-rw-r--r--kdesktop/kdesktopshadowsettings.h10
-rw-r--r--kdesktop/kdiconview.cc378
-rw-r--r--kdesktop/kdiconview.h68
-rw-r--r--kdesktop/kfileividesktop.cpp50
-rw-r--r--kdesktop/kfileividesktop.h30
-rw-r--r--kdesktop/krootwm.cc134
-rw-r--r--kdesktop/krootwm.h30
-rw-r--r--kdesktop/kshadowengine.cpp16
-rw-r--r--kdesktop/kshadowengine.h16
-rw-r--r--kdesktop/kshadowsettings.cpp10
-rw-r--r--kdesktop/kshadowsettings.h12
-rw-r--r--kdesktop/kwebdesktop/kwebdesktop.cpp44
-rw-r--r--kdesktop/kwebdesktop/kwebdesktop.h14
-rw-r--r--kdesktop/lock/autologout.cc46
-rw-r--r--kdesktop/lock/autologout.h16
-rw-r--r--kdesktop/lock/infodlg.cc48
-rw-r--r--kdesktop/lock/infodlg.h18
-rw-r--r--kdesktop/lock/lockdlg.cc194
-rw-r--r--kdesktop/lock/lockdlg.h30
-rw-r--r--kdesktop/lock/lockprocess.cc164
-rw-r--r--kdesktop/lock/lockprocess.h44
-rw-r--r--kdesktop/lock/main.cc6
-rw-r--r--kdesktop/lock/querydlg.cc56
-rw-r--r--kdesktop/lock/querydlg.h18
-rw-r--r--kdesktop/lockeng.cc30
-rw-r--r--kdesktop/lockeng.h8
-rw-r--r--kdesktop/main.cc10
-rw-r--r--kdesktop/minicli.cpp184
-rw-r--r--kdesktop/minicli.h40
-rw-r--r--kdesktop/pixmapserver.cc14
-rw-r--r--kdesktop/pixmapserver.h38
-rw-r--r--kdesktop/startupid.cpp60
-rw-r--r--kdesktop/startupid.h22
-rw-r--r--kdesktop/xautolock.cc6
-rw-r--r--kdesktop/xautolock.h4
-rw-r--r--kdesu/kdesu/kdesu.cpp60
-rw-r--r--kdesu/kdesu/sudlg.cpp8
-rw-r--r--kdesu/kdesu/sudlg.h4
-rw-r--r--kdesu/kdesud/handler.cpp26
-rw-r--r--kdesu/kdesud/handler.h10
-rw-r--r--kdesu/kdesud/kdesud.cpp16
-rw-r--r--kdesu/kdesud/lexer.cpp6
-rw-r--r--kdesu/kdesud/lexer.h8
-rw-r--r--kdesu/kdesud/repo.cpp30
-rw-r--r--kdesu/kdesud/repo.h28
-rw-r--r--kdialog/kdialog.cpp204
-rw-r--r--kdialog/klistboxdialog.cpp20
-rw-r--r--kdialog/klistboxdialog.h12
-rw-r--r--kdialog/progressdialog.cpp4
-rw-r--r--kdialog/progressdialog.h4
-rw-r--r--kdialog/progressdialogiface.h2
-rw-r--r--kdialog/widgets.cpp76
-rw-r--r--kdialog/widgets.h24
-rw-r--r--kdm/kfrontend/kchooser.cpp78
-rw-r--r--kdm/kfrontend/kchooser.h10
-rw-r--r--kdm/kfrontend/kconsole.cpp12
-rw-r--r--kdm/kfrontend/kconsole.h12
-rw-r--r--kdm/kfrontend/kdm_greet.c2
-rw-r--r--kdm/kfrontend/kdmclock.cpp36
-rw-r--r--kdm/kfrontend/kdmclock.h16
-rw-r--r--kdm/kfrontend/kdmconfig.cpp44
-rw-r--r--kdm/kfrontend/kdmconfig.h10
-rw-r--r--kdm/kfrontend/kdmshutdown.cpp238
-rw-r--r--kdm/kfrontend/kdmshutdown.h72
-rw-r--r--kdm/kfrontend/kfdialog.cpp50
-rw-r--r--kdm/kfrontend/kfdialog.h28
-rw-r--r--kdm/kfrontend/kgapp.cpp18
-rw-r--r--kdm/kfrontend/kgapp.h2
-rw-r--r--kdm/kfrontend/kgdialog.cpp64
-rw-r--r--kdm/kfrontend/kgdialog.h10
-rw-r--r--kdm/kfrontend/kgreeter.cpp216
-rw-r--r--kdm/kfrontend/kgreeter.h34
-rw-r--r--kdm/kfrontend/kgverify.cpp158
-rw-r--r--kdm/kfrontend/kgverify.h84
-rw-r--r--kdm/kfrontend/krootimage.cpp8
-rw-r--r--kdm/kfrontend/krootimage.h4
-rw-r--r--kdm/kfrontend/themer/kdmitem.cpp104
-rw-r--r--kdm/kfrontend/themer/kdmitem.h66
-rw-r--r--kdm/kfrontend/themer/kdmlabel.cpp60
-rw-r--r--kdm/kfrontend/themer/kdmlabel.h28
-rw-r--r--kdm/kfrontend/themer/kdmlayout.cpp38
-rw-r--r--kdm/kfrontend/themer/kdmlayout.h20
-rw-r--r--kdm/kfrontend/themer/kdmpixmap.cpp38
-rw-r--r--kdm/kfrontend/themer/kdmpixmap.h24
-rw-r--r--kdm/kfrontend/themer/kdmrect.cpp56
-rw-r--r--kdm/kfrontend/themer/kdmrect.h20
-rw-r--r--kdm/kfrontend/themer/kdmthemer.cpp112
-rw-r--r--kdm/kfrontend/themer/kdmthemer.h32
-rw-r--r--kdmlib/dmctl.cpp62
-rw-r--r--kdmlib/dmctl.h18
-rw-r--r--kdmlib/kgreet_classic.cpp86
-rw-r--r--kdmlib/kgreet_classic.h20
-rw-r--r--kdmlib/kgreet_winbind.cpp152
-rw-r--r--kdmlib/kgreet_winbind.h28
-rw-r--r--kdmlib/kgreeterplugin.h34
-rw-r--r--kfind/kdatecombo.cpp44
-rw-r--r--kfind/kdatecombo.h28
-rw-r--r--kfind/kfind.cpp38
-rw-r--r--kfind/kfind.h8
-rw-r--r--kfind/kfinddlg.cpp88
-rw-r--r--kfind/kfinddlg.h18
-rw-r--r--kfind/kfindpart.cpp38
-rw-r--r--kfind/kfindpart.h14
-rw-r--r--kfind/kftabdlg.cpp234
-rw-r--r--kfind/kftabdlg.h74
-rw-r--r--kfind/kfwin.cpp136
-rw-r--r--kfind/kfwin.h22
-rw-r--r--kfind/kquery.cpp96
-rw-r--r--kfind/kquery.h58
-rw-r--r--kfind/main.cpp8
-rw-r--r--khelpcenter/docentry.cpp66
-rw-r--r--khelpcenter/docentry.h84
-rw-r--r--khelpcenter/docmetainfo.cpp36
-rw-r--r--khelpcenter/docmetainfo.h22
-rw-r--r--khelpcenter/fontdialog.cpp54
-rw-r--r--khelpcenter/fontdialog.h4
-rw-r--r--khelpcenter/formatter.cpp46
-rw-r--r--khelpcenter/formatter.h22
-rw-r--r--khelpcenter/glossary.cpp108
-rw-r--r--khelpcenter/glossary.h64
-rw-r--r--khelpcenter/history.cpp50
-rw-r--r--khelpcenter/history.h12
-rw-r--r--khelpcenter/htmlsearch.cpp10
-rw-r--r--khelpcenter/htmlsearch.h10
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.cpp112
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.h22
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.cpp146
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.h12
-rw-r--r--khelpcenter/htmlsearch/klangcombo.cpp16
-rw-r--r--khelpcenter/htmlsearch/klangcombo.h6
-rw-r--r--khelpcenter/htmlsearch/ktagcombobox.cpp86
-rw-r--r--khelpcenter/htmlsearch/ktagcombobox.h34
-rw-r--r--khelpcenter/htmlsearch/progressdialog.cpp26
-rw-r--r--khelpcenter/htmlsearch/progressdialog.h4
-rw-r--r--khelpcenter/htmlsearchconfig.cpp64
-rw-r--r--khelpcenter/htmlsearchconfig.h6
-rw-r--r--khelpcenter/infotree.cpp42
-rw-r--r--khelpcenter/infotree.h4
-rw-r--r--khelpcenter/kcmhelpcenter.cpp152
-rw-r--r--khelpcenter/kcmhelpcenter.h44
-rw-r--r--khelpcenter/khc_indexbuilder.cpp56
-rw-r--r--khelpcenter/khc_indexbuilder.h14
-rw-r--r--khelpcenter/mainwindow.cpp126
-rw-r--r--khelpcenter/mainwindow.h14
-rw-r--r--khelpcenter/navigator.cpp180
-rw-r--r--khelpcenter/navigator.h46
-rw-r--r--khelpcenter/navigatorappitem.cpp30
-rw-r--r--khelpcenter/navigatorappitem.h22
-rw-r--r--khelpcenter/navigatoritem.cpp22
-rw-r--r--khelpcenter/navigatoritem.h14
-rw-r--r--khelpcenter/plugintraverser.cpp4
-rw-r--r--khelpcenter/plugintraverser.h4
-rw-r--r--khelpcenter/scopeitem.h10
-rw-r--r--khelpcenter/scrollkeepertreebuilder.cpp46
-rw-r--r--khelpcenter/scrollkeepertreebuilder.h14
-rw-r--r--khelpcenter/searchengine.cpp114
-rw-r--r--khelpcenter/searchengine.h54
-rw-r--r--khelpcenter/searchhandler.cpp70
-rw-r--r--khelpcenter/searchhandler.h40
-rw-r--r--khelpcenter/searchwidget.cpp86
-rw-r--r--khelpcenter/searchwidget.h28
-rw-r--r--khelpcenter/testmetainfo.cpp12
-rw-r--r--khelpcenter/toc.cpp108
-rw-r--r--khelpcenter/toc.h24
-rw-r--r--khelpcenter/treebuilder.cpp6
-rw-r--r--khelpcenter/treebuilder.h6
-rw-r--r--khelpcenter/view.cpp80
-rw-r--r--khelpcenter/view.h26
-rw-r--r--khotkeys/app/app.cpp14
-rw-r--r--khotkeys/app/app.h2
-rw-r--r--khotkeys/app/kded.cpp8
-rw-r--r--khotkeys/app/kded.h2
-rw-r--r--khotkeys/arts/soundrecorder_arts.cpp14
-rw-r--r--khotkeys/arts/soundrecorder_arts.h10
-rw-r--r--khotkeys/arts/voicerecorder_arts.cpp6
-rw-r--r--khotkeys/kcontrol/action_group_tab.cpp30
-rw-r--r--khotkeys/kcontrol/action_group_tab.h4
-rw-r--r--khotkeys/kcontrol/action_list_widget.cpp48
-rw-r--r--khotkeys/kcontrol/action_list_widget.h36
-rw-r--r--khotkeys/kcontrol/actions_listview_widget.cpp36
-rw-r--r--khotkeys/kcontrol/actions_listview_widget.h26
-rw-r--r--khotkeys/kcontrol/command_url_widget.cpp14
-rw-r--r--khotkeys/kcontrol/command_url_widget.h2
-rw-r--r--khotkeys/kcontrol/condition_list_widget.cpp54
-rw-r--r--khotkeys/kcontrol/condition_list_widget.h44
-rw-r--r--khotkeys/kcontrol/dcop_widget.cpp22
-rw-r--r--khotkeys/kcontrol/dcop_widget.h2
-rw-r--r--khotkeys/kcontrol/general_settings_tab.cpp8
-rw-r--r--khotkeys/kcontrol/general_settings_tab.h2
-rw-r--r--khotkeys/kcontrol/general_tab.cpp44
-rw-r--r--khotkeys/kcontrol/general_tab.h6
-rw-r--r--khotkeys/kcontrol/gesture_triggers_tab.cpp40
-rw-r--r--khotkeys/kcontrol/gesture_triggers_tab.h12
-rw-r--r--khotkeys/kcontrol/gesturedrawer.cpp62
-rw-r--r--khotkeys/kcontrol/gesturedrawer.h28
-rw-r--r--khotkeys/kcontrol/gesturerecorder.cpp28
-rw-r--r--khotkeys/kcontrol/gesturerecorder.h14
-rw-r--r--khotkeys/kcontrol/gesturerecordpage.cpp46
-rw-r--r--khotkeys/kcontrol/gesturerecordpage.h14
-rw-r--r--khotkeys/kcontrol/gestures_settings_tab.cpp18
-rw-r--r--khotkeys/kcontrol/gestures_settings_tab.h2
-rw-r--r--khotkeys/kcontrol/info_tab.cpp6
-rw-r--r--khotkeys/kcontrol/info_tab.h2
-rw-r--r--khotkeys/kcontrol/init.cpp4
-rw-r--r--khotkeys/kcontrol/kcmkhotkeys.cpp34
-rw-r--r--khotkeys/kcontrol/kcmkhotkeys.h6
-rw-r--r--khotkeys/kcontrol/keyboard_input_widget.cpp28
-rw-r--r--khotkeys/kcontrol/keyboard_input_widget.h2
-rw-r--r--khotkeys/kcontrol/main_buttons_widget.cpp24
-rw-r--r--khotkeys/kcontrol/main_buttons_widget.h2
-rw-r--r--khotkeys/kcontrol/menuedit.cpp58
-rw-r--r--khotkeys/kcontrol/menuedit.h16
-rw-r--r--khotkeys/kcontrol/menuentry_widget.cpp14
-rw-r--r--khotkeys/kcontrol/menuentry_widget.h2
-rw-r--r--khotkeys/kcontrol/tab_widget.cpp18
-rw-r--r--khotkeys/kcontrol/tab_widget.h6
-rw-r--r--khotkeys/kcontrol/triggers_tab.cpp76
-rw-r--r--khotkeys/kcontrol/triggers_tab.h26
-rw-r--r--khotkeys/kcontrol/voice_settings_tab.cpp8
-rw-r--r--khotkeys/kcontrol/voice_settings_tab.h2
-rw-r--r--khotkeys/kcontrol/voicerecorder.cpp36
-rw-r--r--khotkeys/kcontrol/voicerecorder.h10
-rw-r--r--khotkeys/kcontrol/voicerecordpage.cpp36
-rw-r--r--khotkeys/kcontrol/voicerecordpage.h12
-rw-r--r--khotkeys/kcontrol/window_trigger_widget.cpp20
-rw-r--r--khotkeys/kcontrol/window_trigger_widget.h2
-rw-r--r--khotkeys/kcontrol/windowdef_list_widget.cpp50
-rw-r--r--khotkeys/kcontrol/windowdef_list_widget.h44
-rw-r--r--khotkeys/kcontrol/windowdef_simple_widget.cpp64
-rw-r--r--khotkeys/kcontrol/windowdef_simple_widget.h4
-rw-r--r--khotkeys/kcontrol/windowselector.cpp8
-rw-r--r--khotkeys/kcontrol/windowselector.h4
-rw-r--r--khotkeys/shared/action_data.cpp22
-rw-r--r--khotkeys/shared/action_data.h84
-rw-r--r--khotkeys/shared/actions.cpp48
-rw-r--r--khotkeys/shared/actions.h92
-rw-r--r--khotkeys/shared/conditions.cpp44
-rw-r--r--khotkeys/shared/conditions.h46
-rw-r--r--khotkeys/shared/gestures.cpp18
-rw-r--r--khotkeys/shared/gestures.h28
-rw-r--r--khotkeys/shared/input.cpp36
-rw-r--r--khotkeys/shared/input.h20
-rw-r--r--khotkeys/shared/khlistbox.cpp32
-rw-r--r--khotkeys/shared/khlistbox.h16
-rw-r--r--khotkeys/shared/khlistview.cpp28
-rw-r--r--khotkeys/shared/khlistview.h18
-rw-r--r--khotkeys/shared/khotkeysglobal.cpp10
-rw-r--r--khotkeys/shared/khotkeysglobal.h6
-rw-r--r--khotkeys/shared/settings.cpp22
-rw-r--r--khotkeys/shared/settings.h2
-rw-r--r--khotkeys/shared/sound.cpp34
-rw-r--r--khotkeys/shared/sound.h10
-rw-r--r--khotkeys/shared/soundrecorder.cpp6
-rw-r--r--khotkeys/shared/soundrecorder.h8
-rw-r--r--khotkeys/shared/triggers.cpp48
-rw-r--r--khotkeys/shared/triggers.h58
-rw-r--r--khotkeys/shared/voices.cpp26
-rw-r--r--khotkeys/shared/voices.h16
-rw-r--r--khotkeys/shared/voicesignature.cpp30
-rw-r--r--khotkeys/shared/voicesignature.h14
-rw-r--r--khotkeys/shared/windows.cpp48
-rw-r--r--khotkeys/shared/windows.h74
-rw-r--r--khotkeys/update/update.cpp6
-rw-r--r--kicker/applets/clock/clock.cpp332
-rw-r--r--kicker/applets/clock/clock.h120
-rw-r--r--kicker/applets/clock/datepicker.cpp20
-rw-r--r--kicker/applets/clock/datepicker.h14
-rw-r--r--kicker/applets/clock/zone.cpp38
-rw-r--r--kicker/applets/clock/zone.h14
-rw-r--r--kicker/applets/launcher/configdlg.cpp12
-rw-r--r--kicker/applets/launcher/configdlg.h4
-rw-r--r--kicker/applets/launcher/flowgridmanager.cpp84
-rw-r--r--kicker/applets/launcher/flowgridmanager.h56
-rw-r--r--kicker/applets/launcher/popularity.cpp66
-rw-r--r--kicker/applets/launcher/popularity.h14
-rw-r--r--kicker/applets/launcher/quickaddappsmenu.cpp16
-rw-r--r--kicker/applets/launcher/quickaddappsmenu.h18
-rw-r--r--kicker/applets/launcher/quickbutton.cpp62
-rw-r--r--kicker/applets/launcher/quickbutton.h56
-rw-r--r--kicker/applets/launcher/quickbuttongroup.h10
-rw-r--r--kicker/applets/launcher/quicklauncher.cpp170
-rw-r--r--kicker/applets/launcher/quicklauncher.h54
-rw-r--r--kicker/applets/lockout/lockout.cpp88
-rw-r--r--kicker/applets/lockout/lockout.h22
-rw-r--r--kicker/applets/media/mediaapplet.cpp34
-rw-r--r--kicker/applets/media/mediaapplet.h18
-rw-r--r--kicker/applets/media/mediumbutton.cpp42
-rw-r--r--kicker/applets/media/mediumbutton.h22
-rw-r--r--kicker/applets/media/preferencesdialog.cpp48
-rw-r--r--kicker/applets/media/preferencesdialog.h12
-rw-r--r--kicker/applets/menu/menuapplet.cpp60
-rw-r--r--kicker/applets/menu/menuapplet.h16
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp180
-rw-r--r--kicker/applets/minipager/pagerapplet.h32
-rw-r--r--kicker/applets/minipager/pagerbutton.cpp222
-rw-r--r--kicker/applets/minipager/pagerbutton.h48
-rw-r--r--kicker/applets/naughty/NaughtyApplet.cpp40
-rw-r--r--kicker/applets/naughty/NaughtyApplet.h10
-rw-r--r--kicker/applets/naughty/NaughtyConfigDialog.cpp10
-rw-r--r--kicker/applets/naughty/NaughtyConfigDialog.h6
-rw-r--r--kicker/applets/naughty/NaughtyProcessMonitor.cpp88
-rw-r--r--kicker/applets/naughty/NaughtyProcessMonitor.h10
-rw-r--r--kicker/applets/run/runapplet.cpp56
-rw-r--r--kicker/applets/run/runapplet.h16
-rw-r--r--kicker/applets/swallow/prefwidget.cpp2
-rw-r--r--kicker/applets/swallow/prefwidget.h2
-rw-r--r--kicker/applets/swallow/swallow.cpp60
-rw-r--r--kicker/applets/swallow/swallow.h22
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.cpp112
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.h30
-rw-r--r--kicker/applets/taskbar/taskbarapplet.cpp22
-rw-r--r--kicker/applets/taskbar/taskbarapplet.h8
-rw-r--r--kicker/applets/trash/trashapplet.cpp22
-rw-r--r--kicker/applets/trash/trashapplet.h8
-rw-r--r--kicker/applets/trash/trashbutton.cpp24
-rw-r--r--kicker/applets/trash/trashbutton.h18
-rw-r--r--kicker/extensions/dockbar/dockbarextension.cpp62
-rw-r--r--kicker/extensions/dockbar/dockbarextension.h22
-rw-r--r--kicker/extensions/dockbar/dockcontainer.cpp26
-rw-r--r--kicker/extensions/dockbar/dockcontainer.h30
-rw-r--r--kicker/extensions/kasbar/docs.h10
-rw-r--r--kicker/extensions/kasbar/kasaboutdlg.cpp58
-rw-r--r--kicker/extensions/kasbar/kasaboutdlg.h2
-rw-r--r--kicker/extensions/kasbar/kasbar.cpp152
-rw-r--r--kicker/extensions/kasbar/kasbar.h62
-rw-r--r--kicker/extensions/kasbar/kasbarapp.cpp4
-rw-r--r--kicker/extensions/kasbar/kasbarextension.cpp28
-rw-r--r--kicker/extensions/kasbar/kasbarextension.h14
-rw-r--r--kicker/extensions/kasbar/kasclockitem.cpp44
-rw-r--r--kicker/extensions/kasbar/kasclockitem.h6
-rw-r--r--kicker/extensions/kasbar/kasgrouper.cpp10
-rw-r--r--kicker/extensions/kasbar/kasgroupitem.cpp34
-rw-r--r--kicker/extensions/kasbar/kasgroupitem.h12
-rw-r--r--kicker/extensions/kasbar/kasitem.cpp88
-rw-r--r--kicker/extensions/kasbar/kasitem.h74
-rw-r--r--kicker/extensions/kasbar/kasloaditem.cpp28
-rw-r--r--kicker/extensions/kasbar/kasloaditem.h12
-rw-r--r--kicker/extensions/kasbar/kaspopup.cpp14
-rw-r--r--kicker/extensions/kasbar/kaspopup.h8
-rw-r--r--kicker/extensions/kasbar/kasprefsdlg.cpp298
-rw-r--r--kicker/extensions/kasbar/kasprefsdlg.h40
-rw-r--r--kicker/extensions/kasbar/kasresources.cpp54
-rw-r--r--kicker/extensions/kasbar/kasresources.h100
-rw-r--r--kicker/extensions/kasbar/kasstartupitem.cpp20
-rw-r--r--kicker/extensions/kasbar/kasstartupitem.h10
-rw-r--r--kicker/extensions/kasbar/kastasker.cpp94
-rw-r--r--kicker/extensions/kasbar/kastasker.h6
-rw-r--r--kicker/extensions/kasbar/kastaskitem.cpp128
-rw-r--r--kicker/extensions/kasbar/kastaskitem.h22
-rw-r--r--kicker/extensions/kasbar/kastaskpopup.cpp18
-rw-r--r--kicker/extensions/kasbar/kastaskpopup.h2
-rw-r--r--kicker/extensions/sidebar/sidebarextension.cpp56
-rw-r--r--kicker/extensions/sidebar/sidebarextension.h14
-rw-r--r--kicker/extensions/taskbar/taskbarextension.cpp48
-rw-r--r--kicker/extensions/taskbar/taskbarextension.h16
-rw-r--r--kicker/kicker/buttons/bookmarksbutton.cpp6
-rw-r--r--kicker/kicker/buttons/bookmarksbutton.h4
-rw-r--r--kicker/kicker/buttons/browserbutton.cpp30
-rw-r--r--kicker/kicker/buttons/browserbutton.h20
-rw-r--r--kicker/kicker/buttons/desktopbutton.cpp18
-rw-r--r--kicker/kicker/buttons/desktopbutton.h8
-rw-r--r--kicker/kicker/buttons/extensionbutton.cpp10
-rw-r--r--kicker/kicker/buttons/extensionbutton.h8
-rw-r--r--kicker/kicker/buttons/kbutton.cpp8
-rw-r--r--kicker/kicker/buttons/kbutton.h6
-rw-r--r--kicker/kicker/buttons/nonkdeappbutton.cpp50
-rw-r--r--kicker/kicker/buttons/nonkdeappbutton.h36
-rw-r--r--kicker/kicker/buttons/servicebutton.cpp50
-rw-r--r--kicker/kicker/buttons/servicebutton.h18
-rw-r--r--kicker/kicker/buttons/servicemenubutton.cpp14
-rw-r--r--kicker/kicker/buttons/servicemenubutton.h10
-rw-r--r--kicker/kicker/buttons/urlbutton.cpp28
-rw-r--r--kicker/kicker/buttons/urlbutton.h12
-rw-r--r--kicker/kicker/buttons/windowlistbutton.cpp6
-rw-r--r--kicker/kicker/buttons/windowlistbutton.h4
-rw-r--r--kicker/kicker/core/applethandle.cpp128
-rw-r--r--kicker/kicker/core/applethandle.h36
-rw-r--r--kicker/kicker/core/container_applet.cpp76
-rw-r--r--kicker/kicker/core/container_applet.h22
-rw-r--r--kicker/kicker/core/container_base.cpp16
-rw-r--r--kicker/kicker/core/container_base.h42
-rw-r--r--kicker/kicker/core/container_button.cpp114
-rw-r--r--kicker/kicker/core/container_button.h122
-rw-r--r--kicker/kicker/core/container_extension.cpp278
-rw-r--r--kicker/kicker/core/container_extension.h58
-rw-r--r--kicker/kicker/core/containerarea.cpp308
-rw-r--r--kicker/kicker/core/containerarea.h100
-rw-r--r--kicker/kicker/core/containerarealayout.cpp84
-rw-r--r--kicker/kicker/core/containerarealayout.h40
-rw-r--r--kicker/kicker/core/extensionmanager.cpp84
-rw-r--r--kicker/kicker/core/extensionmanager.h20
-rw-r--r--kicker/kicker/core/kicker.cpp74
-rw-r--r--kicker/kicker/core/kicker.h28
-rw-r--r--kicker/kicker/core/kickerbindings.cpp4
-rw-r--r--kicker/kicker/core/main.cpp14
-rw-r--r--kicker/kicker/core/menumanager.cpp66
-rw-r--r--kicker/kicker/core/menumanager.h22
-rw-r--r--kicker/kicker/core/panelextension.cpp108
-rw-r--r--kicker/kicker/core/panelextension.h52
-rw-r--r--kicker/kicker/core/pluginmanager.cpp80
-rw-r--r--kicker/kicker/core/pluginmanager.h38
-rw-r--r--kicker/kicker/core/showdesktop.cpp40
-rw-r--r--kicker/kicker/core/showdesktop.h4
-rw-r--r--kicker/kicker/core/unhidetrigger.cpp14
-rw-r--r--kicker/kicker/core/unhidetrigger.h4
-rw-r--r--kicker/kicker/core/userrectsel.cpp20
-rw-r--r--kicker/kicker/core/userrectsel.h26
-rw-r--r--kicker/kicker/kicker-3.4-reverseLayout.cpp54
-rw-r--r--kicker/kicker/ui/addapplet.cpp138
-rw-r--r--kicker/kicker/ui/addapplet.h22
-rw-r--r--kicker/kicker/ui/addapplet_mnu.cpp8
-rw-r--r--kicker/kicker/ui/addapplet_mnu.h6
-rw-r--r--kicker/kicker/ui/addappletvisualfeedback.cpp46
-rw-r--r--kicker/kicker/ui/addappletvisualfeedback.h28
-rw-r--r--kicker/kicker/ui/addbutton_mnu.cpp14
-rw-r--r--kicker/kicker/ui/addbutton_mnu.h10
-rw-r--r--kicker/kicker/ui/addextension_mnu.cpp8
-rw-r--r--kicker/kicker/ui/addextension_mnu.h6
-rw-r--r--kicker/kicker/ui/appletop_mnu.cpp28
-rw-r--r--kicker/kicker/ui/appletop_mnu.h10
-rw-r--r--kicker/kicker/ui/appletwidget.h24
-rw-r--r--kicker/kicker/ui/browser_dlg.cpp34
-rw-r--r--kicker/kicker/ui/browser_dlg.h10
-rw-r--r--kicker/kicker/ui/browser_mnu.cpp120
-rw-r--r--kicker/kicker/ui/browser_mnu.h34
-rw-r--r--kicker/kicker/ui/client_mnu.cpp68
-rw-r--r--kicker/kicker/ui/client_mnu.h30
-rw-r--r--kicker/kicker/ui/dirdrop_mnu.cpp4
-rw-r--r--kicker/kicker/ui/dirdrop_mnu.h4
-rw-r--r--kicker/kicker/ui/exe_dlg.cpp70
-rw-r--r--kicker/kicker/ui/exe_dlg.h28
-rw-r--r--kicker/kicker/ui/extensionop_mnu.cpp4
-rw-r--r--kicker/kicker/ui/extensionop_mnu.h4
-rw-r--r--kicker/kicker/ui/hidebutton.cpp36
-rw-r--r--kicker/kicker/ui/hidebutton.h22
-rw-r--r--kicker/kicker/ui/k_mnu.cpp142
-rw-r--r--kicker/kicker/ui/k_mnu.h34
-rw-r--r--kicker/kicker/ui/panelmenuiteminfo.h18
-rw-r--r--kicker/kicker/ui/popupmenutitle.cpp4
-rw-r--r--kicker/kicker/ui/popupmenutitle.h30
-rw-r--r--kicker/kicker/ui/quickbrowser_mnu.cpp10
-rw-r--r--kicker/kicker/ui/quickbrowser_mnu.h2
-rw-r--r--kicker/kicker/ui/recentapps.cpp38
-rw-r--r--kicker/kicker/ui/recentapps.h20
-rw-r--r--kicker/kicker/ui/removeapplet_mnu.cpp14
-rw-r--r--kicker/kicker/ui/removeapplet_mnu.h6
-rw-r--r--kicker/kicker/ui/removebutton_mnu.cpp18
-rw-r--r--kicker/kicker/ui/removebutton_mnu.h8
-rw-r--r--kicker/kicker/ui/removecontainer_mnu.cpp6
-rw-r--r--kicker/kicker/ui/removecontainer_mnu.h4
-rw-r--r--kicker/kicker/ui/removeextension_mnu.cpp18
-rw-r--r--kicker/kicker/ui/removeextension_mnu.h6
-rw-r--r--kicker/kicker/ui/service_mnu.cpp112
-rw-r--r--kicker/kicker/ui/service_mnu.h56
-rw-r--r--kicker/libkicker/appletinfo.cpp12
-rw-r--r--kicker/libkicker/appletinfo.h50
-rw-r--r--kicker/libkicker/global.cpp108
-rw-r--r--kicker/libkicker/global.h28
-rw-r--r--kicker/libkicker/kickertip.cpp110
-rw-r--r--kicker/libkicker/kickertip.h48
-rw-r--r--kicker/libkicker/kshadowengine.cpp40
-rw-r--r--kicker/libkicker/kshadowengine.h18
-rw-r--r--kicker/libkicker/kshadowsettings.cpp10
-rw-r--r--kicker/libkicker/kshadowsettings.h12
-rw-r--r--kicker/libkicker/menuinfo.cpp16
-rw-r--r--kicker/libkicker/menuinfo.h18
-rw-r--r--kicker/libkicker/panelbutton.cpp250
-rw-r--r--kicker/libkicker/panelbutton.h110
-rw-r--r--kicker/libkicker/paneldrag.cpp52
-rw-r--r--kicker/libkicker/paneldrag.h22
-rw-r--r--kicker/libkicker/panner.cpp118
-rw-r--r--kicker/libkicker/panner.h48
-rw-r--r--kicker/libkicker/simplebutton.cpp84
-rw-r--r--kicker/libkicker/simplebutton.h38
-rw-r--r--kicker/menuext/find/findmenu.cpp12
-rw-r--r--kicker/menuext/find/findmenu.h4
-rw-r--r--kicker/menuext/kate/katesessionmenu.cpp24
-rw-r--r--kicker/menuext/kate/katesessionmenu.h6
-rw-r--r--kicker/menuext/kdeprint/print_mnu.cpp14
-rw-r--r--kicker/menuext/kdeprint/print_mnu.h2
-rw-r--r--kicker/menuext/konq-profiles/konqy_menu.cpp20
-rw-r--r--kicker/menuext/konq-profiles/konqy_menu.h6
-rw-r--r--kicker/menuext/konsole/konsole_mnu.cpp68
-rw-r--r--kicker/menuext/konsole/konsole_mnu.h12
-rw-r--r--kicker/menuext/konsole/konsolebookmarkhandler.cpp48
-rw-r--r--kicker/menuext/konsole/konsolebookmarkhandler.h24
-rw-r--r--kicker/menuext/konsole/konsolebookmarkmenu.cpp38
-rw-r--r--kicker/menuext/konsole/konsolebookmarkmenu.h8
-rw-r--r--kicker/menuext/prefmenu/prefmenu.cpp70
-rw-r--r--kicker/menuext/prefmenu/prefmenu.h30
-rw-r--r--kicker/menuext/recentdocs/recentdocsmenu.cpp30
-rw-r--r--kicker/menuext/recentdocs/recentdocsmenu.h10
-rw-r--r--kicker/menuext/remote/remotemenu.cpp38
-rw-r--r--kicker/menuext/remote/remotemenu.h8
-rw-r--r--kicker/menuext/system/systemmenu.cpp18
-rw-r--r--kicker/menuext/system/systemmenu.h8
-rw-r--r--kicker/menuext/tom/tom.cc224
-rw-r--r--kicker/menuext/tom/tom.h48
-rw-r--r--kicker/proxy/appletproxy.cpp100
-rw-r--r--kicker/proxy/appletproxy.h24
-rw-r--r--kicker/proxy/extensiondebugger.cpp42
-rw-r--r--kicker/proxy/extensiondebugger.h4
-rw-r--r--kicker/proxy/extensionproxy.cpp80
-rw-r--r--kicker/proxy/extensionproxy.h20
-rw-r--r--kicker/taskbar/taskbar.cpp150
-rw-r--r--kicker/taskbar/taskbar.h30
-rw-r--r--kicker/taskbar/taskbarbindings.cpp4
-rw-r--r--kicker/taskbar/taskbarcontainer.cpp52
-rw-r--r--kicker/taskbar/taskbarcontainer.h10
-rw-r--r--kicker/taskbar/taskcontainer.cpp302
-rw-r--r--kicker/taskbar/taskcontainer.h68
-rw-r--r--kicker/taskmanager/tasklmbmenu.cpp72
-rw-r--r--kicker/taskmanager/tasklmbmenu.h34
-rw-r--r--kicker/taskmanager/taskmanager.cpp166
-rw-r--r--kicker/taskmanager/taskmanager.h124
-rw-r--r--kicker/taskmanager/taskrmbmenu.cpp66
-rw-r--r--kicker/taskmanager/taskrmbmenu.h12
-rw-r--r--kioslave/about/kio_about.cpp10
-rw-r--r--kioslave/about/kio_about.h4
-rw-r--r--kioslave/cgi/cgi.cpp46
-rw-r--r--kioslave/cgi/cgi.h8
-rw-r--r--kioslave/cgi/kcmcgi/kcmcgi.cpp42
-rw-r--r--kioslave/cgi/kcmcgi/kcmcgi.h12
-rw-r--r--kioslave/filter/filter.cc12
-rw-r--r--kioslave/filter/filter.h6
-rw-r--r--kioslave/finger/kio_finger.cpp48
-rw-r--r--kioslave/finger/kio_finger.h14
-rw-r--r--kioslave/fish/fish.cpp124
-rw-r--r--kioslave/fish/fish.h46
-rw-r--r--kioslave/floppy/kio_floppy.cpp146
-rw-r--r--kioslave/floppy/kio_floppy.h12
-rw-r--r--kioslave/floppy/program.cpp4
-rw-r--r--kioslave/floppy/program.h6
-rw-r--r--kioslave/home/homeimpl.cpp42
-rw-r--r--kioslave/home/homeimpl.h10
-rw-r--r--kioslave/home/kdedmodule/homedirnotify.cpp24
-rw-r--r--kioslave/home/kdedmodule/homedirnotify.h4
-rw-r--r--kioslave/home/kdedmodule/homedirnotifymodule.cpp4
-rw-r--r--kioslave/home/kdedmodule/homedirnotifymodule.h2
-rw-r--r--kioslave/home/kio_home.cpp12
-rw-r--r--kioslave/home/kio_home.h4
-rw-r--r--kioslave/home/testhome.cpp6
-rw-r--r--kioslave/info/info.cc28
-rw-r--r--kioslave/info/info.h16
-rw-r--r--kioslave/ldap/kio_ldap.cpp94
-rw-r--r--kioslave/ldap/kio_ldap.h28
-rw-r--r--kioslave/mac/kio_mac.cpp256
-rw-r--r--kioslave/mac/kio_mac.h28
-rw-r--r--kioslave/man/kio_man.cpp386
-rw-r--r--kioslave/man/kio_man.h60
-rw-r--r--kioslave/man/kio_man_test.cpp4
-rw-r--r--kioslave/man/kmanpart.cpp16
-rw-r--r--kioslave/man/kmanpart.h14
-rw-r--r--kioslave/man/man2html.cpp206
-rw-r--r--kioslave/man/man2html.h4
-rw-r--r--kioslave/media/kcmodule/main.cpp22
-rw-r--r--kioslave/media/kcmodule/main.h4
-rw-r--r--kioslave/media/kcmodule/managermodule.cpp8
-rw-r--r--kioslave/media/kcmodule/managermodule.h2
-rw-r--r--kioslave/media/kcmodule/mimetypelistboxitem.cpp6
-rw-r--r--kioslave/media/kcmodule/mimetypelistboxitem.h10
-rw-r--r--kioslave/media/kcmodule/notifiermodule.cpp50
-rw-r--r--kioslave/media/kcmodule/notifiermodule.h6
-rw-r--r--kioslave/media/kcmodule/serviceconfigdialog.cpp38
-rw-r--r--kioslave/media/kcmodule/serviceconfigdialog.h4
-rw-r--r--kioslave/media/kfile-plugin/kfilemediaplugin.cpp52
-rw-r--r--kioslave/media/kfile-plugin/kfilemediaplugin.h4
-rw-r--r--kioslave/media/kio_media.cpp30
-rw-r--r--kioslave/media/kio_media.h6
-rw-r--r--kioslave/media/libmediacommon/actionlistboxitem.cpp8
-rw-r--r--kioslave/media/libmediacommon/actionlistboxitem.h6
-rw-r--r--kioslave/media/libmediacommon/medium.cpp94
-rw-r--r--kioslave/media/libmediacommon/medium.h84
-rw-r--r--kioslave/media/libmediacommon/notifieraction.cpp28
-rw-r--r--kioslave/media/libmediacommon/notifieraction.h30
-rw-r--r--kioslave/media/libmediacommon/notifiernothingaction.cpp2
-rw-r--r--kioslave/media/libmediacommon/notifiernothingaction.h2
-rw-r--r--kioslave/media/libmediacommon/notifieropenaction.cpp4
-rw-r--r--kioslave/media/libmediacommon/notifieropenaction.h4
-rw-r--r--kioslave/media/libmediacommon/notifierserviceaction.cpp54
-rw-r--r--kioslave/media/libmediacommon/notifierserviceaction.h22
-rw-r--r--kioslave/media/libmediacommon/notifiersettings.cpp104
-rw-r--r--kioslave/media/libmediacommon/notifiersettings.h34
-rw-r--r--kioslave/media/mediaimpl.cpp66
-rw-r--r--kioslave/media/mediaimpl.h30
-rw-r--r--kioslave/media/mediamanager/fstabbackend.cpp104
-rw-r--r--kioslave/media/mediamanager/fstabbackend.h40
-rw-r--r--kioslave/media/mediamanager/halbackend.cpp324
-rw-r--r--kioslave/media/mediamanager/halbackend.h38
-rw-r--r--kioslave/media/mediamanager/linuxcdpolling.cpp96
-rw-r--r--kioslave/media/mediamanager/linuxcdpolling.h26
-rw-r--r--kioslave/media/mediamanager/mediadirnotify.cpp8
-rw-r--r--kioslave/media/mediamanager/medialist.cpp68
-rw-r--r--kioslave/media/mediamanager/medialist.h60
-rw-r--r--kioslave/media/mediamanager/mediamanager.cpp84
-rw-r--r--kioslave/media/mediamanager/mediamanager.h52
-rw-r--r--kioslave/media/mediamanager/removablebackend.cpp62
-rw-r--r--kioslave/media/mediamanager/removablebackend.h22
-rw-r--r--kioslave/media/medianotifier/medianotifier.cpp108
-rw-r--r--kioslave/media/medianotifier/medianotifier.h20
-rw-r--r--kioslave/media/medianotifier/notificationdialog.cpp52
-rw-r--r--kioslave/media/medianotifier/notificationdialog.h4
-rw-r--r--kioslave/media/mounthelper/dialog.cpp14
-rw-r--r--kioslave/media/mounthelper/dialog.h14
-rw-r--r--kioslave/media/mounthelper/kio_media_mounthelper.cpp40
-rw-r--r--kioslave/media/mounthelper/kio_media_mounthelper.h10
-rw-r--r--kioslave/media/propsdlgplugin/propertiespage.cpp76
-rw-r--r--kioslave/media/propsdlgplugin/propertiespage.h8
-rw-r--r--kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp20
-rw-r--r--kioslave/media/propsdlgplugin/propsdlgshareplugin.h2
-rw-r--r--kioslave/media/testmedia.cpp6
-rw-r--r--kioslave/nfs/kio_nfs.cpp148
-rw-r--r--kioslave/nfs/kio_nfs.h38
-rw-r--r--kioslave/nntp/nntp.cpp108
-rw-r--r--kioslave/nntp/nntp.h22
-rw-r--r--kioslave/pop3/pop3.cc90
-rw-r--r--kioslave/pop3/pop3.h16
-rw-r--r--kioslave/remote/kdedmodule/remotedirnotify.cpp6
-rw-r--r--kioslave/remote/kdedmodule/remotedirnotifymodule.cpp4
-rw-r--r--kioslave/remote/kdedmodule/remotedirnotifymodule.h2
-rw-r--r--kioslave/remote/kio_remote.cpp12
-rw-r--r--kioslave/remote/kio_remote.h4
-rw-r--r--kioslave/remote/remoteimpl.cpp84
-rw-r--r--kioslave/remote/remoteimpl.h20
-rw-r--r--kioslave/remote/testremote.cpp6
-rw-r--r--kioslave/settings/kio_settings.cc32
-rw-r--r--kioslave/sftp/kio_sftp.cpp220
-rw-r--r--kioslave/sftp/kio_sftp.h44
-rw-r--r--kioslave/sftp/ksshprocess.cpp114
-rw-r--r--kioslave/sftp/ksshprocess.h50
-rw-r--r--kioslave/sftp/ksshprocesstest.cpp8
-rw-r--r--kioslave/sftp/process.cpp24
-rw-r--r--kioslave/sftp/process.h42
-rw-r--r--kioslave/sftp/sftpfileattr.cpp22
-rw-r--r--kioslave/sftp/sftpfileattr.h32
-rw-r--r--kioslave/smb/kio_smb.cpp2
-rw-r--r--kioslave/smb/kio_smb.h30
-rw-r--r--kioslave/smb/kio_smb_auth.cpp16
-rw-r--r--kioslave/smb/kio_smb_browse.cpp26
-rw-r--r--kioslave/smb/kio_smb_config.cpp14
-rw-r--r--kioslave/smb/kio_smb_file.cpp6
-rw-r--r--kioslave/smb/kio_smb_internal.cpp8
-rw-r--r--kioslave/smb/kio_smb_internal.h22
-rw-r--r--kioslave/smb/kio_smb_mount.cpp42
-rw-r--r--kioslave/smtp/capabilities.cc48
-rw-r--r--kioslave/smtp/capabilities.h30
-rw-r--r--kioslave/smtp/command.cc60
-rw-r--r--kioslave/smtp/command.h58
-rw-r--r--kioslave/smtp/interactivesmtpserver.cc74
-rw-r--r--kioslave/smtp/interactivesmtpserver.h38
-rw-r--r--kioslave/smtp/request.cc36
-rw-r--r--kioslave/smtp/request.h42
-rw-r--r--kioslave/smtp/response.cc16
-rw-r--r--kioslave/smtp/response.h8
-rw-r--r--kioslave/smtp/smtp.cc56
-rw-r--r--kioslave/smtp/smtp.h32
-rw-r--r--kioslave/smtp/test_commands.cc26
-rw-r--r--kioslave/smtp/test_headergeneration.cc4
-rw-r--r--kioslave/smtp/test_responseparser.cc6
-rw-r--r--kioslave/smtp/transactionstate.cc14
-rw-r--r--kioslave/smtp/transactionstate.h26
-rw-r--r--kioslave/system/kdedmodule/systemdirnotify.cpp28
-rw-r--r--kioslave/system/kdedmodule/systemdirnotify.h4
-rw-r--r--kioslave/system/kdedmodule/systemdirnotifymodule.cpp4
-rw-r--r--kioslave/system/kdedmodule/systemdirnotifymodule.h2
-rw-r--r--kioslave/system/kio_system.cpp14
-rw-r--r--kioslave/system/kio_system.h4
-rw-r--r--kioslave/system/systemimpl.cpp94
-rw-r--r--kioslave/system/systemimpl.h22
-rw-r--r--kioslave/system/testsystem.cpp6
-rw-r--r--kioslave/tar/ktartest.cpp28
-rw-r--r--kioslave/tar/tar.cc56
-rw-r--r--kioslave/tar/tar.h6
-rw-r--r--kioslave/thumbnail/cursorcreator.cpp12
-rw-r--r--kioslave/thumbnail/cursorcreator.h2
-rw-r--r--kioslave/thumbnail/djvucreator.cpp12
-rw-r--r--kioslave/thumbnail/djvucreator.h2
-rw-r--r--kioslave/thumbnail/exrcreator.cpp10
-rw-r--r--kioslave/thumbnail/exrcreator.h2
-rw-r--r--kioslave/thumbnail/htmlcreator.cpp22
-rw-r--r--kioslave/thumbnail/htmlcreator.h6
-rw-r--r--kioslave/thumbnail/imagecreator.cpp4
-rw-r--r--kioslave/thumbnail/imagecreator.h2
-rw-r--r--kioslave/thumbnail/textcreator.cpp32
-rw-r--r--kioslave/thumbnail/textcreator.h6
-rw-r--r--kioslave/thumbnail/thumbnail.cpp70
-rw-r--r--kioslave/thumbnail/thumbnail.h12
-rw-r--r--kioslave/trash/kfile-plugin/kfile_trash.cpp22
-rw-r--r--kioslave/trash/kfile-plugin/kfile_trash.h4
-rw-r--r--kioslave/trash/kio_trash.cpp108
-rw-r--r--kioslave/trash/kio_trash.h16
-rw-r--r--kioslave/trash/ktrash.cpp14
-rw-r--r--kioslave/trash/testtrash.cpp414
-rw-r--r--kioslave/trash/testtrash.h36
-rw-r--r--kioslave/trash/trashimpl.cpp242
-rw-r--r--kioslave/trash/trashimpl.h86
-rw-r--r--klipper/applet.cpp18
-rw-r--r--klipper/applet.h8
-rw-r--r--klipper/clipboardpoll.cpp12
-rw-r--r--klipper/clipboardpoll.h8
-rw-r--r--klipper/configdialog.cpp168
-rw-r--r--klipper/configdialog.h64
-rw-r--r--klipper/history.cpp6
-rw-r--r--klipper/history.h10
-rw-r--r--klipper/historyimageitem.cpp12
-rw-r--r--klipper/historyimageitem.h18
-rw-r--r--klipper/historyitem.cpp38
-rw-r--r--klipper/historyitem.h22
-rw-r--r--klipper/historystringitem.cpp6
-rw-r--r--klipper/historystringitem.h16
-rw-r--r--klipper/historyurlitem.cpp16
-rw-r--r--klipper/historyurlitem.h12
-rw-r--r--klipper/klipperbindings.cpp4
-rw-r--r--klipper/klipperpopup.cpp40
-rw-r--r--klipper/klipperpopup.h16
-rw-r--r--klipper/popupproxy.cpp38
-rw-r--r--klipper/popupproxy.h12
-rw-r--r--klipper/toplevel.cpp188
-rw-r--r--klipper/toplevel.h50
-rw-r--r--klipper/urlgrabber.cpp76
-rw-r--r--klipper/urlgrabber.h70
-rw-r--r--kmenuedit/basictab.cpp144
-rw-r--r--kmenuedit/basictab.h12
-rw-r--r--kmenuedit/khotkeys.cpp42
-rw-r--r--kmenuedit/khotkeys.h16
-rw-r--r--kmenuedit/kmenuedit.cpp36
-rw-r--r--kmenuedit/kmenuedit.h8
-rw-r--r--kmenuedit/main.cpp4
-rw-r--r--kmenuedit/menufile.cpp164
-rw-r--r--kmenuedit/menufile.h40
-rw-r--r--kmenuedit/menuinfo.cpp70
-rw-r--r--kmenuedit/menuinfo.h54
-rw-r--r--kmenuedit/treeview.cpp318
-rw-r--r--kmenuedit/treeview.h66
-rw-r--r--knetattach/knetattach.ui.h32
-rw-r--r--konqueror/KonqMainWindowIface.cc22
-rw-r--r--konqueror/KonqMainWindowIface.h18
-rw-r--r--konqueror/KonqViewIface.cc20
-rw-r--r--konqueror/KonqViewIface.h22
-rw-r--r--konqueror/KonquerorIface.cc100
-rw-r--r--konqueror/KonquerorIface.h54
-rw-r--r--konqueror/about/konq_aboutpage.cc160
-rw-r--r--konqueror/about/konq_aboutpage.h38
-rw-r--r--konqueror/client/kfmclient.cc144
-rw-r--r--konqueror/client/kfmclient.h6
-rw-r--r--konqueror/delayedinitializer.cc10
-rw-r--r--konqueror/delayedinitializer.h6
-rw-r--r--konqueror/iconview/konq_iconview.cc286
-rw-r--r--konqueror/iconview/konq_iconview.h46
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp160
-rw-r--r--konqueror/keditbookmarks/actionsimpl.h2
-rw-r--r--konqueror/keditbookmarks/bookmarkinfo.cpp94
-rw-r--r--konqueror/keditbookmarks/bookmarkinfo.h16
-rw-r--r--konqueror/keditbookmarks/bookmarkiterator.cpp12
-rw-r--r--konqueror/keditbookmarks/bookmarkiterator.h10
-rw-r--r--konqueror/keditbookmarks/commands.cpp180
-rw-r--r--konqueror/keditbookmarks/commands.h148
-rw-r--r--konqueror/keditbookmarks/dcop.cpp16
-rw-r--r--konqueror/keditbookmarks/dcop.h4
-rw-r--r--konqueror/keditbookmarks/exporters.cpp12
-rw-r--r--konqueror/keditbookmarks/exporters.h8
-rw-r--r--konqueror/keditbookmarks/favicons.cpp10
-rw-r--r--konqueror/keditbookmarks/favicons.h6
-rw-r--r--konqueror/keditbookmarks/importers.cpp58
-rw-r--r--konqueror/keditbookmarks/importers.h70
-rw-r--r--konqueror/keditbookmarks/kbookmarkmerger.cpp18
-rw-r--r--konqueror/keditbookmarks/kebsearchline.cpp14
-rw-r--r--konqueror/keditbookmarks/kebsearchline.h14
-rw-r--r--konqueror/keditbookmarks/listview.cpp250
-rw-r--r--konqueror/keditbookmarks/listview.h96
-rw-r--r--konqueror/keditbookmarks/main.cpp34
-rw-r--r--konqueror/keditbookmarks/testlink.cpp116
-rw-r--r--konqueror/keditbookmarks/testlink.h28
-rw-r--r--konqueror/keditbookmarks/toplevel.cpp64
-rw-r--r--konqueror/keditbookmarks/toplevel.h34
-rw-r--r--konqueror/keditbookmarks/updater.cpp48
-rw-r--r--konqueror/keditbookmarks/updater.h10
-rw-r--r--konqueror/konq_actions.cc102
-rw-r--r--konqueror/konq_actions.h52
-rw-r--r--konqueror/konq_combo.cc238
-rw-r--r--konqueror/konq_combo.h44
-rw-r--r--konqueror/konq_extensionmanager.cc24
-rw-r--r--konqueror/konq_extensionmanager.h2
-rw-r--r--konqueror/konq_factory.cc42
-rw-r--r--konqueror/konq_factory.h18
-rw-r--r--konqueror/konq_frame.cc202
-rw-r--r--konqueror/konq_frame.h124
-rw-r--r--konqueror/konq_guiclients.cc88
-rw-r--r--konqueror/konq_guiclients.h20
-rw-r--r--konqueror/konq_main.cc46
-rw-r--r--konqueror/konq_mainwindow.cc1104
-rw-r--r--konqueror/konq_mainwindow.h170
-rw-r--r--konqueror/konq_mainwindow_p.h6
-rw-r--r--konqueror/konq_misc.cc54
-rw-r--r--konqueror/konq_misc.h28
-rw-r--r--konqueror/konq_openurlrequest.h16
-rw-r--r--konqueror/konq_profiledlg.cc82
-rw-r--r--konqueror/konq_profiledlg.h26
-rw-r--r--konqueror/konq_run.cc16
-rw-r--r--konqueror/konq_run.h10
-rw-r--r--konqueror/konq_tabs.cc182
-rw-r--r--konqueror/konq_tabs.h48
-rw-r--r--konqueror/konq_view.cc330
-rw-r--r--konqueror/konq_view.h98
-rw-r--r--konqueror/konq_viewmgr.cc244
-rw-r--r--konqueror/konq_viewmgr.h64
-rw-r--r--konqueror/kttsplugin/khtmlkttsd.cpp44
-rw-r--r--konqueror/kttsplugin/khtmlkttsd.h2
-rw-r--r--konqueror/listview/konq_infolistviewitem.cc54
-rw-r--r--konqueror/listview/konq_infolistviewitem.h12
-rw-r--r--konqueror/listview/konq_infolistviewwidget.cc70
-rw-r--r--konqueror/listview/konq_infolistviewwidget.h12
-rw-r--r--konqueror/listview/konq_listview.cc112
-rw-r--r--konqueror/listview/konq_listview.h20
-rw-r--r--konqueror/listview/konq_listviewitems.cc74
-rw-r--r--konqueror/listview/konq_listviewitems.h18
-rw-r--r--konqueror/listview/konq_listviewwidget.cc314
-rw-r--r--konqueror/listview/konq_listviewwidget.h104
-rw-r--r--konqueror/listview/konq_textviewitem.cc28
-rw-r--r--konqueror/listview/konq_textviewitem.h12
-rw-r--r--konqueror/listview/konq_textviewwidget.cc16
-rw-r--r--konqueror/listview/konq_textviewwidget.h12
-rw-r--r--konqueror/listview/konq_treeviewitem.cc8
-rw-r--r--konqueror/listview/konq_treeviewitem.h6
-rw-r--r--konqueror/listview/konq_treeviewwidget.cc40
-rw-r--r--konqueror/listview/konq_treeviewwidget.h14
-rw-r--r--konqueror/preloader/preloader.cc26
-rw-r--r--konqueror/preloader/preloader.h20
-rw-r--r--konqueror/remoteencodingplugin/kremoteencodingplugin.cpp48
-rw-r--r--konqueror/remoteencodingplugin/kremoteencodingplugin.h8
-rw-r--r--konqueror/shellcmdplugin/kshellcmddialog.cpp20
-rw-r--r--konqueror/shellcmdplugin/kshellcmddialog.h4
-rw-r--r--konqueror/shellcmdplugin/kshellcmdexecutor.cpp24
-rw-r--r--konqueror/shellcmdplugin/kshellcmdexecutor.h12
-rw-r--r--konqueror/shellcmdplugin/kshellcmdplugin.cpp12
-rw-r--r--konqueror/shellcmdplugin/kshellcmdplugin.h2
-rw-r--r--konqueror/sidebar/konqsidebar.cpp28
-rw-r--r--konqueror/sidebar/konqsidebar.h16
-rw-r--r--konqueror/sidebar/konqsidebarplugin.cpp6
-rw-r--r--konqueror/sidebar/konqsidebarplugin.h38
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp354
-rw-r--r--konqueror/sidebar/sidebar_widget.h108
-rw-r--r--konqueror/sidebar/test/konqsidebartest.cpp2
-rw-r--r--konqueror/sidebar/test/konqsidebartest.h14
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp8
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_item.h6
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp134
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.h30
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp38
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.h18
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp90
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_module.h12
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.cpp42
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.h26
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.cpp76
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.h32
-rw-r--r--konqueror/sidebar/trees/history_module/history_settings.cpp22
-rw-r--r--konqueror/sidebar/trees/history_module/history_settings.h12
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.cpp88
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.h8
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp254
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.h86
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreeitem.cpp4
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreeitem.h22
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreemodule.h4
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp30
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreetoplevelitem.h20
-rw-r--r--konqueror/sidebar/trees/konqsidebar_tree.cpp68
-rw-r--r--konqueror/sidebar/trees/konqsidebar_tree.h26
-rw-r--r--konqueror/sidebar/web_module/web_module.cpp70
-rw-r--r--konqueror/sidebar/web_module/web_module.h70
-rw-r--r--konsole/konsole/TECommon.h20
-rw-r--r--konsole/konsole/TEHistory.cpp10
-rw-r--r--konsole/konsole/TEHistory.h26
-rw-r--r--konsole/konsole/TEPty.cpp18
-rw-r--r--konsole/konsole/TEPty.h18
-rw-r--r--konsole/konsole/TEScreen.cpp30
-rw-r--r--konsole/konsole/TEScreen.h14
-rw-r--r--konsole/konsole/TEWidget.cpp410
-rw-r--r--konsole/konsole/TEWidget.h136
-rw-r--r--konsole/konsole/TEmuVt102.cpp42
-rw-r--r--konsole/konsole/TEmuVt102.h4
-rw-r--r--konsole/konsole/TEmulation.cpp118
-rw-r--r--konsole/konsole/TEmulation.h32
-rw-r--r--konsole/konsole/fontembedder.cpp18
-rw-r--r--konsole/konsole/keytrans.cpp74
-rw-r--r--konsole/konsole/keytrans.h30
-rw-r--r--konsole/konsole/konsole.cpp1010
-rw-r--r--konsole/konsole/konsole.h160
-rw-r--r--konsole/konsole/konsole_part.cpp228
-rw-r--r--konsole/konsole/konsole_part.h44
-rw-r--r--konsole/konsole/konsole_wcwidth.cpp2
-rw-r--r--konsole/konsole/konsole_wcwidth.h6
-rw-r--r--konsole/konsole/konsolebookmarkhandler.cpp26
-rw-r--r--konsole/konsole/konsolebookmarkhandler.h16
-rw-r--r--konsole/konsole/konsolebookmarkmenu.cpp20
-rw-r--r--konsole/konsole/konsolebookmarkmenu.h4
-rw-r--r--konsole/konsole/konsoleiface.h10
-rw-r--r--konsole/konsole/kwrited.cpp26
-rw-r--r--konsole/konsole/kwrited.h10
-rw-r--r--konsole/konsole/main.cpp140
-rw-r--r--konsole/konsole/printsettings.cpp18
-rw-r--r--konsole/konsole/printsettings.h6
-rw-r--r--konsole/konsole/schema.cpp118
-rw-r--r--konsole/konsole/schema.h52
-rw-r--r--konsole/konsole/session.cpp240
-rw-r--r--konsole/konsole/session.h118
-rw-r--r--konsole/konsole/sessioniface.h24
-rw-r--r--konsole/konsole/zmodem_dialog.cpp10
-rw-r--r--konsole/konsole/zmodem_dialog.h6
-rw-r--r--kpager/config.cpp68
-rw-r--r--kpager/config.h16
-rw-r--r--kpager/desktop.cpp206
-rw-r--r--kpager/desktop.h50
-rw-r--r--kpager/kpager.cpp124
-rw-r--r--kpager/kpager.h28
-rw-r--r--kpager/main.cpp4
-rw-r--r--kpager/windowdrag.cpp14
-rw-r--r--kpager/windowdrag.h8
-rw-r--r--kpersonalizer/kcountrypage.cpp84
-rw-r--r--kpersonalizer/kcountrypage.h8
-rw-r--r--kpersonalizer/keyecandypage.cpp144
-rw-r--r--kpersonalizer/keyecandypage.h68
-rw-r--r--kpersonalizer/kfindlanguage.cpp50
-rw-r--r--kpersonalizer/kfindlanguage.h20
-rw-r--r--kpersonalizer/kospage.cpp28
-rw-r--r--kpersonalizer/kospage.h8
-rw-r--r--kpersonalizer/kpersonalizer.cpp68
-rw-r--r--kpersonalizer/kpersonalizer.h8
-rw-r--r--kpersonalizer/krefinepage.cpp8
-rw-r--r--kpersonalizer/krefinepage.h2
-rw-r--r--kpersonalizer/kstylepage.cpp110
-rw-r--r--kpersonalizer/kstylepage.h104
-rw-r--r--kpersonalizer/ksysinfo.cpp42
-rw-r--r--kpersonalizer/ksysinfo.h16
-rw-r--r--kpersonalizer/stylepreview.ui.h32
-rw-r--r--kreadconfig/kreadconfig.cpp10
-rw-r--r--kreadconfig/kwriteconfig.cpp16
-rw-r--r--kscreensaver/blankscrn.cpp24
-rw-r--r--kscreensaver/blankscrn.h14
-rw-r--r--kscreensaver/random.cpp40
-rw-r--r--kscreensaver/random.h8
-rw-r--r--ksmserver/KSMServerInterface.h12
-rw-r--r--ksmserver/client.cpp34
-rw-r--r--ksmserver/client.h32
-rw-r--r--ksmserver/legacy.cpp64
-rw-r--r--ksmserver/main.cpp32
-rw-r--r--ksmserver/server.cpp120
-rw-r--r--ksmserver/server.h100
-rw-r--r--ksmserver/shutdown.cpp40
-rw-r--r--ksmserver/shutdowndlg.cpp230
-rw-r--r--ksmserver/shutdowndlg.h56
-rw-r--r--ksmserver/startup.cpp62
-rw-r--r--ksmserver/test.cpp2
-rw-r--r--ksplashml/kcmksplash/installer.cpp130
-rw-r--r--ksplashml/kcmksplash/installer.h32
-rw-r--r--ksplashml/kcmksplash/main.cpp22
-rw-r--r--ksplashml/ksplashiface.h6
-rw-r--r--ksplashml/themeengine/default/themelegacy.cpp112
-rw-r--r--ksplashml/themeengine/default/themelegacy.h32
-rw-r--r--ksplashml/themeengine/objkstheme.cpp54
-rw-r--r--ksplashml/themeengine/objkstheme.h32
-rw-r--r--ksplashml/themeengine/redmond/main.cpp12
-rw-r--r--ksplashml/themeengine/redmond/previewredmond.cpp34
-rw-r--r--ksplashml/themeengine/redmond/previewredmond.h42
-rw-r--r--ksplashml/themeengine/redmond/themeredmond.cpp164
-rw-r--r--ksplashml/themeengine/redmond/themeredmond.h56
-rw-r--r--ksplashml/themeengine/standard/themestandard.cpp44
-rw-r--r--ksplashml/themeengine/standard/themestandard.h22
-rw-r--r--ksplashml/themeengine/standard/wndicon.cpp38
-rw-r--r--ksplashml/themeengine/standard/wndicon.h10
-rw-r--r--ksplashml/themeengine/standard/wndstatus.cpp38
-rw-r--r--ksplashml/themeengine/standard/wndstatus.h14
-rw-r--r--ksplashml/themeengine/themeengine.cpp30
-rw-r--r--ksplashml/themeengine/themeengine.h24
-rw-r--r--ksplashml/wndmain.cpp88
-rw-r--r--ksplashml/wndmain.h38
-rw-r--r--kstart/kstart.cpp46
-rw-r--r--kstart/kstart.h4
-rw-r--r--ksysguard/gui/KSGAppletSettings.cc28
-rw-r--r--ksysguard/gui/KSGAppletSettings.h8
-rw-r--r--ksysguard/gui/KSysGuardApplet.cc122
-rw-r--r--ksysguard/gui/KSysGuardApplet.h18
-rw-r--r--ksysguard/gui/SensorBrowser.cc126
-rw-r--r--ksysguard/gui/SensorBrowser.h70
-rw-r--r--ksysguard/gui/SensorDisplayLib/BarGraph.cc28
-rw-r--r--ksysguard/gui/SensorDisplayLib/BarGraph.h24
-rw-r--r--ksysguard/gui/SensorDisplayLib/DancingBars.cc68
-rw-r--r--ksysguard/gui/SensorDisplayLib/DancingBars.h26
-rw-r--r--ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc138
-rw-r--r--ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h32
-rw-r--r--ksysguard/gui/SensorDisplayLib/DummyDisplay.cc18
-rw-r--r--ksysguard/gui/SensorDisplayLib/DummyDisplay.h8
-rw-r--r--ksysguard/gui/SensorDisplayLib/FancyPlotter.cc98
-rw-r--r--ksysguard/gui/SensorDisplayLib/FancyPlotter.h38
-rw-r--r--ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc252
-rw-r--r--ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h54
-rw-r--r--ksysguard/gui/SensorDisplayLib/ListView.cc96
-rw-r--r--ksysguard/gui/SensorDisplayLib/ListView.h42
-rw-r--r--ksysguard/gui/SensorDisplayLib/ListViewSettings.cc18
-rw-r--r--ksysguard/gui/SensorDisplayLib/ListViewSettings.h22
-rw-r--r--ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui.h16
-rw-r--r--ksysguard/gui/SensorDisplayLib/LogFile.cc92
-rw-r--r--ksysguard/gui/SensorDisplayLib/LogFile.h28
-rw-r--r--ksysguard/gui/SensorDisplayLib/MultiMeter.cc52
-rw-r--r--ksysguard/gui/SensorDisplayLib/MultiMeter.h26
-rw-r--r--ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc18
-rw-r--r--ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h22
-rw-r--r--ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h20
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessController.cc122
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessController.h32
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessList.cc298
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessList.h66
-rw-r--r--ksysguard/gui/SensorDisplayLib/ReniceDlg.cc10
-rw-r--r--ksysguard/gui/SensorDisplayLib/ReniceDlg.h20
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorDisplay.cc132
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorDisplay.h106
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLogger.cc110
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLogger.h88
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc12
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h10
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h8
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc18
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h22
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui.h16
-rw-r--r--ksysguard/gui/SensorDisplayLib/SignalPlotter.cc72
-rw-r--r--ksysguard/gui/SensorDisplayLib/SignalPlotter.h50
-rw-r--r--ksysguard/gui/WorkSheet.cc138
-rw-r--r--ksysguard/gui/WorkSheet.h52
-rw-r--r--ksysguard/gui/WorkSheetSettings.cc48
-rw-r--r--ksysguard/gui/WorkSheetSettings.h6
-rw-r--r--ksysguard/gui/Workspace.cc90
-rw-r--r--ksysguard/gui/Workspace.h22
-rw-r--r--ksysguard/gui/ksgrd/HostConnector.cc96
-rw-r--r--ksysguard/gui/ksgrd/HostConnector.h30
-rw-r--r--ksysguard/gui/ksgrd/SensorAgent.cc22
-rw-r--r--ksysguard/gui/ksgrd/SensorAgent.h36
-rw-r--r--ksysguard/gui/ksgrd/SensorClient.h30
-rw-r--r--ksysguard/gui/ksgrd/SensorManager.cc238
-rw-r--r--ksysguard/gui/ksgrd/SensorManager.h54
-rw-r--r--ksysguard/gui/ksgrd/SensorShellAgent.cc28
-rw-r--r--ksysguard/gui/ksgrd/SensorShellAgent.h18
-rw-r--r--ksysguard/gui/ksgrd/SensorSocketAgent.cc22
-rw-r--r--ksysguard/gui/ksgrd/SensorSocketAgent.h8
-rw-r--r--ksysguard/gui/ksgrd/StyleEngine.cc48
-rw-r--r--ksysguard/gui/ksgrd/StyleEngine.h26
-rw-r--r--ksysguard/gui/ksgrd/StyleSettings.cc84
-rw-r--r--ksysguard/gui/ksgrd/StyleSettings.h32
-rw-r--r--ksysguard/gui/ksgrd/TimerSettings.cc28
-rw-r--r--ksysguard/gui/ksgrd/TimerSettings.h8
-rw-r--r--ksysguard/gui/ksysguard.cc124
-rw-r--r--ksysguard/gui/ksysguard.h28
-rw-r--r--ksystraycmd/ksystraycmd.cpp38
-rw-r--r--ksystraycmd/ksystraycmd.h22
-rw-r--r--ksystraycmd/main.cpp10
-rw-r--r--ktip/ktipwindow.cpp6
-rw-r--r--kwin/KWinInterface.h2
-rw-r--r--kwin/activation.cpp10
-rw-r--r--kwin/atoms.cpp2
-rw-r--r--kwin/bridge.cpp32
-rw-r--r--kwin/bridge.h22
-rw-r--r--kwin/client.cpp154
-rw-r--r--kwin/client.h188
-rw-r--r--kwin/clients/b2/b2client.cpp334
-rw-r--r--kwin/clients/b2/b2client.h90
-rw-r--r--kwin/clients/b2/config/config.cpp46
-rw-r--r--kwin/clients/b2/config/config.h22
-rw-r--r--kwin/clients/default/config/config.cpp42
-rw-r--r--kwin/clients/default/config/config.h20
-rw-r--r--kwin/clients/default/kdedefault.cpp134
-rw-r--r--kwin/clients/default/kdedefault.h32
-rw-r--r--kwin/clients/keramik/config/config.cpp18
-rw-r--r--kwin/clients/keramik/config/config.h2
-rw-r--r--kwin/clients/keramik/embedtool.cpp56
-rw-r--r--kwin/clients/keramik/keramik.cpp376
-rw-r--r--kwin/clients/keramik/keramik.h72
-rw-r--r--kwin/clients/kwmtheme/cli_installer/main.cpp26
-rw-r--r--kwin/clients/kwmtheme/kwmthemeclient.cpp182
-rw-r--r--kwin/clients/kwmtheme/kwmthemeclient.h34
-rw-r--r--kwin/clients/laptop/laptopclient.cpp100
-rw-r--r--kwin/clients/laptop/laptopclient.h20
-rw-r--r--kwin/clients/modernsystem/config/config.cpp44
-rw-r--r--kwin/clients/modernsystem/config/config.h18
-rw-r--r--kwin/clients/modernsystem/modernsys.cpp142
-rw-r--r--kwin/clients/modernsystem/modernsys.h26
-rw-r--r--kwin/clients/plastik/config/config.cpp50
-rw-r--r--kwin/clients/plastik/config/config.h4
-rw-r--r--kwin/clients/plastik/misc.cpp18
-rw-r--r--kwin/clients/plastik/misc.h6
-rw-r--r--kwin/clients/plastik/plastik.cpp90
-rw-r--r--kwin/clients/plastik/plastik.h26
-rw-r--r--kwin/clients/plastik/plastikbutton.cpp60
-rw-r--r--kwin/clients/plastik/plastikbutton.h18
-rw-r--r--kwin/clients/plastik/plastikclient.cpp98
-rw-r--r--kwin/clients/plastik/plastikclient.h24
-rw-r--r--kwin/clients/quartz/config/config.cpp24
-rw-r--r--kwin/clients/quartz/config/config.h12
-rw-r--r--kwin/clients/quartz/quartz.cpp76
-rw-r--r--kwin/clients/quartz/quartz.h20
-rw-r--r--kwin/clients/redmond/redmond.cpp84
-rw-r--r--kwin/clients/redmond/redmond.h24
-rw-r--r--kwin/clients/test/test.cpp54
-rw-r--r--kwin/clients/test/test.h12
-rw-r--r--kwin/clients/web/Web.cpp56
-rw-r--r--kwin/clients/web/Web.h14
-rw-r--r--kwin/clients/web/WebButton.cpp30
-rw-r--r--kwin/clients/web/WebButton.h12
-rw-r--r--kwin/data/update_default_rules.cpp10
-rw-r--r--kwin/data/update_window_settings.cpp62
-rw-r--r--kwin/events.cpp90
-rw-r--r--kwin/geometry.cpp354
-rw-r--r--kwin/geometrytip.cpp8
-rw-r--r--kwin/geometrytip.h4
-rw-r--r--kwin/group.cpp18
-rw-r--r--kwin/group.h4
-rw-r--r--kwin/kcmkwin/kwindecoration/buttons.cpp208
-rw-r--r--kwin/kcmkwin/kwindecoration/buttons.h90
-rw-r--r--kwin/kcmkwin/kwindecoration/kwindecoration.cpp174
-rw-r--r--kwin/kcmkwin/kwindecoration/kwindecoration.h48
-rw-r--r--kwin/kcmkwin/kwindecoration/preview.cpp84
-rw-r--r--kwin/kcmkwin/kwindecoration/preview.h46
-rw-r--r--kwin/kcmkwin/kwinoptions/main.cpp44
-rw-r--r--kwin/kcmkwin/kwinoptions/main.h12
-rw-r--r--kwin/kcmkwin/kwinoptions/mouse.cpp278
-rw-r--r--kwin/kcmkwin/kwinoptions/mouse.h52
-rw-r--r--kwin/kcmkwin/kwinoptions/windows.cpp474
-rw-r--r--kwin/kcmkwin/kwinoptions/windows.h104
-rw-r--r--kwin/kcmkwin/kwinrules/detectwidget.cpp28
-rw-r--r--kwin/kcmkwin/kwinrules/detectwidget.h28
-rw-r--r--kwin/kcmkwin/kwinrules/kcm.cpp12
-rw-r--r--kwin/kcmkwin/kwinrules/kcm.h4
-rw-r--r--kwin/kcmkwin/kwinrules/main.cpp34
-rw-r--r--kwin/kcmkwin/kwinrules/ruleslist.cpp56
-rw-r--r--kwin/kcmkwin/kwinrules/ruleslist.h8
-rw-r--r--kwin/kcmkwin/kwinrules/ruleswidget.cpp90
-rw-r--r--kwin/kcmkwin/kwinrules/ruleswidget.h14
-rw-r--r--kwin/killer/killer.cpp10
-rw-r--r--kwin/killwindow.cpp4
-rw-r--r--kwin/kwinbindings.cpp8
-rw-r--r--kwin/layers.cpp2
-rw-r--r--kwin/lib/kcommondecoration.cpp148
-rw-r--r--kwin/lib/kcommondecoration.h52
-rw-r--r--kwin/lib/kdecoration.cpp48
-rw-r--r--kwin/lib/kdecoration.h62
-rw-r--r--kwin/lib/kdecoration_p.cpp36
-rw-r--r--kwin/lib/kdecoration_p.h38
-rw-r--r--kwin/lib/kdecoration_plugins_p.cpp22
-rw-r--r--kwin/lib/kdecoration_plugins_p.h16
-rw-r--r--kwin/lib/kdecorationfactory.cpp6
-rw-r--r--kwin/lib/kdecorationfactory.h4
-rw-r--r--kwin/main.cpp20
-rw-r--r--kwin/manage.cpp26
-rw-r--r--kwin/notifications.cpp14
-rw-r--r--kwin/notifications.h14
-rw-r--r--kwin/options.cpp28
-rw-r--r--kwin/options.h20
-rw-r--r--kwin/placement.cpp90
-rw-r--r--kwin/placement.h36
-rw-r--r--kwin/plugins.cpp6
-rw-r--r--kwin/plugins.h2
-rw-r--r--kwin/popupinfo.cpp40
-rw-r--r--kwin/popupinfo.h14
-rw-r--r--kwin/rules.cpp118
-rw-r--r--kwin/rules.h80
-rw-r--r--kwin/sm.cpp120
-rw-r--r--kwin/sm.h22
-rw-r--r--kwin/tabbox.cpp86
-rw-r--r--kwin/tabbox.h16
-rw-r--r--kwin/tools/decobenchmark/main.cpp14
-rw-r--r--kwin/tools/decobenchmark/main.h2
-rw-r--r--kwin/tools/decobenchmark/preview.cpp54
-rw-r--r--kwin/tools/decobenchmark/preview.h38
-rw-r--r--kwin/useractions.cpp132
-rw-r--r--kwin/utils.cpp8
-rw-r--r--kwin/utils.h18
-rw-r--r--kwin/workspace.cpp238
-rw-r--r--kwin/workspace.h112
-rw-r--r--kxkb/extension.cpp68
-rw-r--r--kxkb/extension.h24
-rw-r--r--kxkb/kcmlayout.cpp290
-rw-r--r--kxkb/kcmlayout.h20
-rw-r--r--kxkb/kcmmisc.cpp46
-rw-r--r--kxkb/kcmmisc.h4
-rw-r--r--kxkb/kxkb.cpp36
-rw-r--r--kxkb/kxkb.h14
-rw-r--r--kxkb/kxkbbindings.cpp4
-rw-r--r--kxkb/kxkbconfig.cpp80
-rw-r--r--kxkb/kxkbconfig.h46
-rw-r--r--kxkb/kxkbtraywindow.cpp38
-rw-r--r--kxkb/kxkbtraywindow.h28
-rw-r--r--kxkb/layoutmap.cpp8
-rw-r--r--kxkb/layoutmap.h12
-rw-r--r--kxkb/pixmap.cpp70
-rw-r--r--kxkb/pixmap.h22
-rw-r--r--kxkb/rules.cpp40
-rw-r--r--kxkb/rules.h40
-rw-r--r--kxkb/x11helper.cpp86
-rw-r--r--kxkb/x11helper.h30
-rw-r--r--libkonq/favicons/favicons.cpp90
-rw-r--r--libkonq/favicons/favicons.h26
-rw-r--r--libkonq/kfileivi.cc136
-rw-r--r--libkonq/kfileivi.h36
-rw-r--r--libkonq/kivdirectoryoverlay.cc22
-rw-r--r--libkonq/kivdirectoryoverlay.h8
-rw-r--r--libkonq/knewmenu.cc166
-rw-r--r--libkonq/knewmenu.h34
-rw-r--r--libkonq/konq_bgnddlg.cc86
-rw-r--r--libkonq/konq_bgnddlg.h28
-rw-r--r--libkonq/konq_dirpart.cc134
-rw-r--r--libkonq/konq_dirpart.h32
-rw-r--r--libkonq/konq_drag.cc102
-rw-r--r--libkonq/konq_drag.h42
-rw-r--r--libkonq/konq_events.h16
-rw-r--r--libkonq/konq_faviconmgr.cc18
-rw-r--r--libkonq/konq_faviconmgr.h10
-rw-r--r--libkonq/konq_filetip.cc96
-rw-r--r--libkonq/konq_filetip.h30
-rw-r--r--libkonq/konq_historycomm.cc10
-rw-r--r--libkonq/konq_historycomm.h34
-rw-r--r--libkonq/konq_historymgr.cc138
-rw-r--r--libkonq/konq_historymgr.h68
-rw-r--r--libkonq/konq_iconviewwidget.cc342
-rw-r--r--libkonq/konq_iconviewwidget.h110
-rw-r--r--libkonq/konq_operations.cc152
-rw-r--r--libkonq/konq_operations.h56
-rw-r--r--libkonq/konq_pixmapprovider.cc48
-rw-r--r--libkonq/konq_pixmapprovider.h18
-rw-r--r--libkonq/konq_popupmenu.cc208
-rw-r--r--libkonq/konq_popupmenu.h38
-rw-r--r--libkonq/konq_propsview.cc60
-rw-r--r--libkonq/konq_propsview.h46
-rw-r--r--libkonq/konq_settings.cc22
-rw-r--r--libkonq/konq_settings.h34
-rw-r--r--libkonq/konq_sound.cc20
-rw-r--r--libkonq/konq_sound.h4
-rw-r--r--libkonq/konq_undo.cc52
-rw-r--r--libkonq/konq_undo.h28
-rw-r--r--libkonq/konq_xmlguiclient.cc36
-rw-r--r--libkonq/konq_xmlguiclient.h20
-rw-r--r--libkonq/konqbookmarkmanager.h2
-rw-r--r--libkonq/libkonq_export.h2
-rw-r--r--libkonq/tests/konqdragtest.cpp6
-rw-r--r--nsplugins/NSPluginCallbackIface.h10
-rw-r--r--nsplugins/kcm_nsplugins.cpp36
-rw-r--r--nsplugins/nspluginloader.cpp102
-rw-r--r--nsplugins/nspluginloader.h50
-rw-r--r--nsplugins/plugin_part.cpp78
-rw-r--r--nsplugins/plugin_part.h54
-rw-r--r--nsplugins/plugin_paths.cpp10
-rw-r--r--nsplugins/plugin_paths.h4
-rw-r--r--nsplugins/pluginscan.cpp152
-rw-r--r--nsplugins/sdk/npruntime.h2
-rw-r--r--nsplugins/test/testnsplugin.cpp38
-rw-r--r--nsplugins/test/testnsplugin.h14
-rw-r--r--nsplugins/viewer/NSPluginClassIface.h18
-rw-r--r--nsplugins/viewer/glibevents.cpp4
-rw-r--r--nsplugins/viewer/glibevents.h6
-rw-r--r--nsplugins/viewer/kxt.cpp72
-rw-r--r--nsplugins/viewer/kxt.h18
-rw-r--r--nsplugins/viewer/nsplugin.cpp242
-rw-r--r--nsplugins/viewer/nsplugin.h136
-rw-r--r--nsplugins/viewer/qxteventloop.cpp74
-rw-r--r--nsplugins/viewer/qxteventloop.h14
-rw-r--r--nsplugins/viewer/viewer.cpp28
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 <qfile.h>
-#include <qregexp.h>
+#include <tqfile.h>
+#include <tqregexp.h>
#include <kprocess.h>
#include <kdebug.h>
@@ -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 <qobject.h>
+#include <tqobject.h>
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 <qlayout.h>
-#include <qhbox.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
#include <kdialog.h>
#include <klocale.h>
@@ -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 <qwidget.h>
+#include <tqwidget.h>
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 <qmultilineedit.h>
+#include <tqmultilineedit.h>
#include <kmessagebox.h>
#include <klocale.h>
@@ -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<QString,QString> 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<TQString,TQString> 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 <kaboutdata.h>
-#include <qstring.h>
-#include <qobject.h>
+#include <tqstring.h>
+#include <tqobject.h>
#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 <dcopobject.h>
-#include <qstring.h>
-#include <qcstring.h>
+#include <tqstring.h>
+#include <tqcstring.h>
#include <kaboutdata.h>
/**
@@ -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 <qstring.h>
-#include <qlabel.h>
-#include <qhbox.h>
+#include <tqstring.h>
+#include <tqlabel.h>
+#include <tqhbox.h>
#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("<p><b>Short description</b></p><p>%1</p>")
@@ -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 <kglobal.h>
#include <kstandarddirs.h>
-#include <qdir.h>
-#include <qfile.h>
+#include <tqdir.h>
+#include <tqfile.h>
#include <stdlib.h>
@@ -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<AppLnkCache> &appCache, const QString &templ,
- QString destDir )
+bool scanDesktopFile( TQPtrList<AppLnkCache> &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<AppLnkCache> &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<AppLnkCache> &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<AppLnkCache> &appCache, const QString &templ,
return true;
}
-void createDesktopFiles( QPtrList<AppLnkCache> &appCache, int &added )
+void createDesktopFiles( TQPtrList<AppLnkCache> &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<AppLnkCache> &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 <qlistview.h>
-#include <qptrlist.h>
-#include <qstring.h>
+#include <tqlistview.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
class AppLnkCache
{
public:
- QString destDir;
- QString destName;
- QString templ;
- QCheckListItem *item;
+ TQString destDir;
+ TQString destName;
+ TQString templ;
+ TQCheckListItem *item;
};
-bool scanDesktopFile( QPtrList<AppLnkCache> &appCache, const QString &templ,
- QString destDir = QString::null );
-void createDesktopFiles( QPtrList<AppLnkCache> &appCache, int &added );
-void decorateDirs( QString destDir = QString::null );
+bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ,
+ TQString destDir = TQString::null );
+void createDesktopFiles( TQPtrList<AppLnkCache> &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 <klocale.h>
#include <kstandarddirs.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include <stdio.h>
@@ -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<AppLnkCache> appCache;
+ TQPtrList<AppLnkCache> 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 <kstdguiitem.h>
#include <kstartupinfo.h>
-#include <qaccel.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qdir.h>
-#include <qregexp.h>
+#include <tqaccel.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqdir.h>
+#include <tqregexp.h>
#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<KServiceGroup*>( 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 <kdialog.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
#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<AppLnkCache> mAppCache;
+ TQLabel *mSummary;
+ TQListView *mListView;
+ TQPushButton *mApplyButton;
+ TQPushButton *mQuitButton;
+ TQPushButton *mScanButton;
+ TQPushButton *mSelectButton;
+ TQPushButton *mUnSelectButton;
+ TQString mDestDir;
+ TQStringList mTemplates;
+
+ TQPtrList<AppLnkCache> 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 <ksimpleconfig.h>
#include <kstartupinfo.h>
-#include <qfile.h>
-#include <qtimer.h>
-#include <qdir.h>
-#include <qtextcodec.h>
+#include <tqfile.h>
+#include <tqtimer.h>
+#include <tqdir.h>
+#include <tqtextcodec.h>
#include <stdlib.h>
#include <unistd.h>
@@ -81,7 +81,7 @@ KateApp::KateApp (KCmdLineArgs *args)
m_obj = new KateAppDCOPIface (this);
kdDebug()<<"Setting KATE_PID: '"<<getpid()<<"'"<<endl;
- ::setenv( "KATE_PID", QString("%1").arg(getpid()).latin1(), 1 );
+ ::setenv( "KATE_PID", TQString("%1").arg(getpid()).latin1(), 1 );
// handle restore different
if (isRestored())
@@ -129,10 +129,10 @@ Kate::Application *KateApp::application ()
* Has always been the Kate Versioning Scheme:
* KDE X.Y.Z contains Kate X-1.Y.Z
*/
-QString KateApp::kateVersion (bool fullVersion)
+TQString KateApp::kateVersion (bool fullVersion)
{
- return fullVersion ? QString ("%1.%2.%3").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor()).arg(KDE::versionRelease())
- : QString ("%1.%2").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor());
+ return fullVersion ? TQString ("%1.%2.%3").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor()).arg(KDE::versionRelease())
+ : TQString ("%1.%2").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor());
}
void KateApp::restoreKate ()
@@ -142,7 +142,7 @@ void KateApp::restoreKate ()
// activate again correct session!!!
sessionConfig()->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; z<m_args->count(); 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 <kapplication.h>
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
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<KateMainWindow*> m_mainWindows;
+ TQValueList<KateMainWindow*> 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 <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qspinbox.h>
-#include <qvbox.h>
-#include <qwhatsthis.h>
-#include <qcombobox.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqspinbox.h>
+#include <tqvbox.h>
+#include <tqwhatsthis.h>
+#include <tqcombobox.h>
#include <kinstance.h>
#include <kdebug.h>
@@ -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 <code>cd</code> 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; i<Kate::pluginConfigInterfaceExtension(plugin)->configPages(); i++)
{
- QStringList path;
+ TQStringList path;
path.clear();
path << i18n("Application")<<i18n("Plugins") << Kate::pluginConfigInterfaceExtension(plugin)->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<PluginPageListItem> pluginPages;
- QPtrList<KTextEditor::ConfigPage> editorPages;
+ TQPtrList<PluginPageListItem> pluginPages;
+ TQPtrList<KTextEditor::ConfigPage> 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 <klistbox.h>
#include "kateapp.h"
-#include <qstringlist.h>
-#include <qhbox.h>
-#include <qlabel.h>
+#include <tqstringlist.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
#include <klocale.h>
-#include <qpushbutton.h>
-#include <qtooltip.h>
+#include <tqpushbutton.h>
+#include <tqtooltip.h>
#include <kiconloader.h>
-#include <qwhatsthis.h>
+#include <tqwhatsthis.h>
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<KatePluginListView *>(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 <klistview.h>
-#include <qvbox.h>
+#include <tqvbox.h>
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 <kmessagebox.h>
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 <kurl.h>
-#include <qvbox.h>
+#include <tqvbox.h>
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 <kio/job.h>
#include <kwin.h>
-#include <qdatetime.h>
-#include <qtextcodec.h>
-#include <qprogressdialog.h>
+#include <tqdatetime.h>
+#include <tqtextcodec.h>
+#include <tqprogressdialog.h>
-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<Kate::Document> it(m_docList);
+ TQPtrListIterator<Kate::Document> it(m_docList);
for (; it.current(); ++it)
{
@@ -216,7 +216,7 @@ int KateDocManager::findDocument ( KURL url )
Kate::Document *KateDocManager::findDocumentByUrl( KURL url )
{
- for (QPtrListIterator<Kate::Document> it(m_docList); it.current(); ++it)
+ for (TQPtrListIterator<Kate::Document> 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<Kate::View> closeList;
+ TQPtrList<Kate::View> 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<Kate::Document> docs = m_docList;
+ TQPtrList<Kate::Document> docs = m_docList;
for (uint i=0; i < KateApp::self()->mainWindows (); i++ )
{
@@ -370,9 +370,9 @@ bool KateDocManager::closeAllDocuments(bool closeURL)
return res;
}
-QPtrList<Kate::Document> KateDocManager::modifiedDocumentList() {
- QPtrList<Kate::Document> modified;
- for (QPtrListIterator<Kate::Document> it(m_docList); it.current(); ++it) {
+TQPtrList<Kate::Document> KateDocManager::modifiedDocumentList() {
+ TQPtrList<Kate::Document> modified;
+ for (TQPtrListIterator<Kate::Document> it(m_docList); it.current(); ++it) {
Kate::Document *doc = it.current();
if (doc->isModified()) {
modified.append(doc);
@@ -385,7 +385,7 @@ QPtrList<Kate::Document> KateDocManager::modifiedDocumentList() {
bool KateDocManager::queryCloseDocuments(KateMainWindow *w)
{
uint docCount = m_docList.count();
- for (QPtrListIterator<Kate::Document> it(m_docList); it.current(); ++it)
+ for (TQPtrListIterator<Kate::Document> 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<Kate::Document> it(m_docList); it.current(); ++it)
+ for (TQPtrListIterator<Kate::Document> 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 <kate/document.h>
-#include <qdatetime.h>
-#include <qguardedptr.h>
-#include <qptrlist.h>
-#include <qobject.h>
-#include <qptrdict.h>
-#include <qintdict.h>
-#include <qmap.h>
-#include <qpair.h>
+#include <tqdatetime.h>
+#include <tqguardedptr.h>
+#include <tqptrlist.h>
+#include <tqobject.h>
+#include <tqptrdict.h>
+#include <tqintdict.h>
+#include <tqmap.h>
+#include <tqpair.h>
namespace KParts { class Factory; }
@@ -52,14 +52,14 @@ class KateDocumentInfo
unsigned char modifiedOnDiscReason;
};
-typedef QPair<KURL,QDateTime> TPair;
+typedef QPair<KURL,TQDateTime> 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<Kate::Document> &documentList () { return m_docList; };
+ TQPtrList<Kate::Document> &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<Kate::Document> modifiedDocumentList();
+ TQPtrList<Kate::Document> 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<Kate::Document> m_docList;
- QIntDict<Kate::Document> m_docDict;
- QPtrDict<KateDocumentInfo> m_docInfos;
- QMap<uint,TPair> m_tempFiles;
- QGuardedPtr<Kate::Document> m_currentDoc;
+ TQPtrList<Kate::Document> m_docList;
+ TQIntDict<Kate::Document> m_docDict;
+ TQPtrDict<KateDocumentInfo> m_docInfos;
+ TQMap<uint,TPair> m_tempFiles;
+ TQGuardedPtr<Kate::Document> 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 <kpopupmenu.h>
#include <kdebug.h>
-#include <qbitmap.h>
-#include <qcombobox.h>
-#include <qfile.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qlistbox.h>
-#include <qmap.h>
-#include <qregexp.h>
-#include <qtextedit.h>
-#include <qtoolbutton.h>
-#include <qwhatsthis.h>
+#include <tqbitmap.h>
+#include <tqcombobox.h>
+#include <tqfile.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqlistbox.h>
+#include <tqmap.h>
+#include <tqregexp.h>
+#include <tqtextedit.h>
+#include <tqtoolbutton.h>
+#include <tqwhatsthis.h>
#include <stdlib.h>
#include <unistd.h>
@@ -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 <corwin@micom.don.ru> !!!
// 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<QWidget*>(view);
+bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQString &) {
+ TQWidget *wv=dynamic_cast<TQWidget*>(view);
if (!wv) {
// kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl;
return false;
@@ -197,7 +197,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const QString &cmd, QStri
return false;
}
// kdDebug(13001)<<"cmd="<<cmd.stripWhiteSpace()<<endl;
- QString actionName=m_map[cmd.stripWhiteSpace()];
+ TQString actionName=m_map[cmd.stripWhiteSpace()];
if (actionName.isEmpty()) return false;
// kdDebug(13001)<<"actionName is not empty:"<<actionName<<endl;
KateExternalToolsMenuAction *a=
@@ -211,13 +211,13 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const QString &cmd, QStri
return true;
}
-bool KateExternalToolsCommand::help (Kate::View *, const QString &, QString &) {
+bool KateExternalToolsCommand::help (Kate::View *, const TQString &, TQString &) {
return false;
}
//END KateExternalToolsCommand
//BEGIN KateExternalToolAction
-KateExternalToolAction::KateExternalToolAction( QObject *parent,
+KateExternalToolAction::KateExternalToolAction( TQObject *parent,
const char *name, KateExternalTool *t)
: KAction( parent, name ),
tool ( t )
@@ -226,10 +226,10 @@ KateExternalToolAction::KateExternalToolAction( QObject *parent,
if ( ! t->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(
"<p>The script to execute to invoke the tool. The script is passed "
"to /bin/sh for execution. The following macros "
"will be expanded:</p>"
@@ -474,57 +474,57 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
"<li><code>%text</code> - the text of the current document.</ul>" ) );
- 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 <em>command</em> "
"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 <kdialogbase.h>
#include <kate/document.h>
#include <kmacroexpander.h>
-#include <qpixmap.h>
+#include <tqpixmap.h>
/**
* 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<QString,QString> m_map;
+ TQStringList m_list;
+ TQMap<TQString,TQString> 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 <qapplication.h>
-#include <qpainter.h>
-#include <qpopupmenu.h>
-#include <qheader.h>
-#include <qcolor.h>
-#include <qcheckbox.h>
-#include <qhbox.h>
-#include <qlayout.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qwhatsthis.h>
+#include <tqapplication.h>
+#include <tqpainter.h>
+#include <tqpopupmenu.h>
+#include <tqheader.h>
+#include <tqcolor.h>
+#include <tqcheckbox.h>
+#include <tqhbox.h>
+#include <tqlayout.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
+#include <tqwhatsthis.h>
#include <kiconloader.h>
#include <kconfig.h>
@@ -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 <klistview.h>
-#include <qtooltip.h>
-#include <qcolor.h>
-#include <qptrlist.h>
+#include <tqtooltip.h>
+#include <tqcolor.h>
+#include <tqptrlist.h>
#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<KateFileListItem> m_viewHistory;
- QPtrList<KateFileListItem> m_editHistory;
+ TQPtrList<KateFileListItem> m_viewHistory;
+ TQPtrList<KateFileListItem> 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 <qlayout.h>
-#include <qtoolbutton.h>
-#include <qhbox.h>
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qstrlist.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qapplication.h>
-#include <qlistbox.h>
-#include <qscrollbar.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-#include <qcheckbox.h>
-#include <qregexp.h>
-#include <qdockarea.h>
-#include <qtimer.h>
-#include <qdir.h>
+#include <tqlayout.h>
+#include <tqtoolbutton.h>
+#include <tqhbox.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
+#include <tqstrlist.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
+#include <tqapplication.h>
+#include <tqlistbox.h>
+#include <tqscrollbar.h>
+#include <tqspinbox.h>
+#include <tqgroupbox.h>
+#include <tqcheckbox.h>
+#include <tqregexp.h>
+#include <tqdockarea.h>
+#include <tqtimer.h>
+#include <tqdir.h>
#include <kapplication.h>
#include <kiconloader.h>
@@ -59,7 +59,7 @@
#include <kaction.h>
#include <kmessagebox.h>
#include <ktoolbarbutton.h>
-#include <qtoolbar.h>
+#include <tqtoolbar.h>
#include <kpopupmenu.h>
#include <kdialog.h>
#include <kdebug.h>
@@ -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("<p>Here you can enter a path for a folder to display."
"<p>To go to a folder previously entered, press the arrow on "
"the right and choose one. <p>The entry has folder "
"completion. Right-click to choose how completion should behave.") );
- QWhatsThis::add( filter,
+ TQWhatsThis::add( filter,
i18n("<p>Here you can enter a name filter to limit which files are displayed."
"<p>To clear the filter, toggle off the filter button to the left."
"<p>To reapply the last filter used, toggle on the filter button." ) );
- QWhatsThis::add( btnFilter,
+ TQWhatsThis::add( btnFilter,
i18n("<p>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"<<endl;
setActiveDocumentDir();
- waitingUrl = QString::null;
+ waitingUrl = TQString::null;
}
// else, if we have a waiting URL set it
else if ( ! waitingUrl.isEmpty() ) {
setDir( waitingUrl );
- waitingUrl = QString::null;
+ waitingUrl = TQString::null;
}
}
-bool KateFileSelector::eventFilter( QObject* o, QEvent *e )
+bool KateFileSelector::eventFilter( TQObject* o, TQEvent *e )
{
/*
This is rather unfortunate, but:
- QComboBox does not support setting the size of the listbox to something
+ TQComboBox does not support setting the size of the listbox to something
reasonable. Even using listbox->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(
"<p>Available actions for the toolbar. To add an action, select it here "
"and press the add (<strong>-&gt;</strong>) button" ) );
- QWhatsThis::add( lbUsedActions, i18n(
+ TQWhatsThis::add( lbUsedActions, i18n(
"<p>Actions used in the toolbar. To remove an action, select it and "
"press the remove (<strong>&lt;-</strong>) button."
"<p>To change the order of the actions, use the Up and Down buttons to "
"move the selected action.") );
*/
- QString lhwt( i18n(
+ TQString lhwt( i18n(
"<p>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(
"<p>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(
"<p>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."
"<p>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(
"<p>If this option is enabled (default), the location will be restored "
"when you start Kate.<p><strong>Note</strong> that if the session is "
"handled by the KDE session manager, the location is always restored.") );
- QWhatsThis::add( cbSesFilter, i18n(
+ TQWhatsThis::add( cbSesFilter, i18n(
"<p>If this option is enabled (default), the current filter will be "
"restored when you start Kate.<p><strong>Note</strong> 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 <kate/document.h>
-#include <qvbox.h>
+#include <tqvbox.h>
#include <kfile.h>
#include <kurl.h>
#include <ktoolbar.h>
-#include <qframe.h>
+#include <tqframe.h>
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 <qobject.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qcheckbox.h>
-#include <qevent.h>
-#include <qlistbox.h>
-#include <qregexp.h>
-#include <qwhatsthis.h>
-#include <qcursor.h>
+#include <tqobject.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqcheckbox.h>
+#include <tqevent.h>
+#include <tqlistbox.h>
+#include <tqregexp.h>
+#include <tqwhatsthis.h>
+#include <tqcursor.h>
#include <kapplication.h>
#include <kaccelmanager.h>
@@ -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("<p>Enter the expression you want to search for here."
"<p>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 <code>\\#</code>."
"<p>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(
"<p>If this is enabled, your pattern will be passed unmodified to "
"<em>grep(1)</em>. 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 <kdialog.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
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 <klocale.h>
#include <kurl.h>
-#include <qevent.h>
-#include <qlabel.h>
-#include <qstringlist.h>
-#include <qvbox.h>
+#include <tqevent.h>
+#include <tqlabel.h>
+#include <tqstringlist.h>
+#include <tqvbox.h>
/* 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(
"<p>Press <strong>Mail...</strong> to email the current document."
"<p>To select more documents to send, press <strong>Show All Documents&nbsp;&gt;&gt;</strong>."), 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<Kate::Document> KateMailDialog::selectedDocs()
+TQPtrList<Kate::Document> KateMailDialog::selectedDocs()
{
- QPtrList<Kate::Document> l;
- QListViewItem *item = list->firstChild();
+ TQPtrList<Kate::Document> 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 <strong>Mail...</strong> 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 <kdialogbase.h>
#include <kurl.h>
-#include <qptrlist.h>
+#include <tqptrlist.h>
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<Kate::Document> selectedDocs();
+ TQPtrList<Kate::Document> 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 <dcopref.h>
#include <kdebug.h>
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
#include <stdlib.h>
@@ -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 <ktip.h>
#include <kmenubar.h>
#include <kstringhandler.h>
-#include <qlayout.h>
-#include <qptrvector.h>
+#include <tqlayout.h>
+#include <tqptrvector.h>
#include <assert.h>
#include <unistd.h>
@@ -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<Kate::Document> modifiedDocuments=KateDocManager::self()->modifiedDocumentList();
+ TQPtrList<Kate::Document> 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<KXMLGUIClient> clients = guiFactory()->clients();
+ TQPtrList<KXMLGUIClient> clients = guiFactory()->clients();
- for( QPtrListIterator<KXMLGUIClient> it( clients ); it.current(); ++it )
+ for( TQPtrListIterator<KXMLGUIClient> it( clients ); it.current(); ++it )
dlg.insert ( (*it)->actionCollection(), (*it)->instance()->aboutData()->programName() );
dlg.insert( externalTools->actionCollection(), i18n("External Tools") );
dlg.configure();
- QPtrList<Kate::Document> l=KateDocManager::self()->documentList();
+ TQPtrList<Kate::Document> l=KateDocManager::self()->documentList();
for (uint i=0;i<l.count();i++) {
// kdDebug(13001)<<"reloading Keysettings for document "<<i<<endl;
l.at(i)->reloadXML();
- QPtrList<class KTextEditor::View> l1=l.at(i)->views ();//KTextEditor::Document
+ TQPtrList<class KTextEditor::View> l1=l.at(i)->views ();//KTextEditor::Document
for (uint i1=0;i1<l1.count();i1++) {
l1.at(i1)->reloadXML();
// kdDebug(13001)<<"reloading Keysettings for view "<<i<<"/"<<i1<<endl;
@@ -555,7 +555,7 @@ void KateMainWindow::editKeys()
externalTools->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<Kate::Document> attDocs = d->selectedDocs();
+ TQPtrList<Kate::Document> 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<Kate::Document> it(attDocs);
+ TQPtrListIterator<Kate::Document> 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 <kdebug.h>
-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 <kpopupmenu.h>
#include <kmessagebox.h>
-#include <qvbox.h>
-#include <qhbox.h>
-#include <qevent.h>
+#include <tqvbox.h>
+#include <tqhbox.h>
+#include <tqevent.h>
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 = ""
"</kpartgui>";
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<KAction> addList;
+ TQPtrList<KAction> 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<ToolView> it( m_idToWidget );
+ TQIntDictIterator<ToolView> 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<ToolView> it( m_idToWidget );
+ TQIntDictIterator<ToolView> 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<ToolView> it( m_idToWidget ); it.current(); ++it )
+ for ( TQIntDictIterator<ToolView> 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<KMultiTabBarTab*>(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<int> s = m_splitter->sizes ();
+ TQValueList<int> 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<TmpToolViewSorter> toSort;
+ TQValueList<TmpToolViewSorter> 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<int> s = config->readIntListEntry (QString ("Kate-MDI-Sidebar-%1-Splitter").arg(position()));
+ TQValueList<int> 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<int> s = m_ownSplit->sizes();
- config->writeEntry (QString ("Kate-MDI-Sidebar-%1-Splitter").arg(position()), s);
+ TQValueList<int> 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 <b>Window &gt; Tool Views &gt; Show Sidebars</b> "
"in the menu. It is still possible to show/hide "
"the tool views with the assigned shortcuts.</qt>"),
- 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<int> hs;
+ TQValueList<int> hs;
hs << 200 << 100 << 200;
- QValueList<int> vs;
+ TQValueList<int> 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<int> hs = m_restoreConfig->readIntListEntry ("Kate-MDI-H-Splitter");
- QValueList<int> vs = m_restoreConfig->readIntListEntry ("Kate-MDI-V-Splitter");
+ TQValueList<int> hs = m_restoreConfig->readIntListEntry ("Kate-MDI-H-Splitter");
+ TQValueList<int> 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<int> hs = m_hSplitter->sizes();
- QValueList<int> vs = m_vSplitter->sizes();
+ TQValueList<int> hs = m_hSplitter->sizes();
+ TQValueList<int> 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 <kxmlguiclient.h>
#include <kaction.h>
-#include <qdict.h>
-#include <qintdict.h>
-#include <qmap.h>
-#include <qsplitter.h>
-#include <qpixmap.h>
-#include <qptrlist.h>
+#include <tqdict.h>
+#include <tqintdict.h>
+#include <tqmap.h>
+#include <tqsplitter.h>
+#include <tqpixmap.h>
+#include <tqptrlist.h>
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<KAction> m_toolViewActions;
- QMap<ToolView*, KAction*> m_toolToAction;
+ TQPtrList<KAction> m_toolViewActions;
+ TQMap<ToolView*, KAction*> 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<ToolView> m_idToWidget;
- QMap<ToolView*, int> m_widgetToId;
+ TQIntDict<ToolView> m_idToWidget;
+ TQMap<ToolView*, int> m_widgetToId;
/**
* list of all toolviews around in this sidebar
*/
- QValueList<ToolView*> m_toolviews;
+ TQValueList<ToolView*> 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<ToolView> m_idToWidget;
+ TQDict<ToolView> m_idToWidget;
/**
* list of all toolviews around
*/
- QValueList<ToolView*> m_toolviews;
+ TQValueList<ToolView*> 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 <ktempfile.h>
#include <kpushbutton.h>
-#include <qlabel.h>
-#include <qlistview.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
-#include <qvbox.h>
+#include <tqlabel.h>
+#include <tqlistview.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqwhatsthis.h>
+#include <tqvbox.h>
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(
"<qt>The documents listed below has changed on disk.<p>Select one "
"or more at the time and press an action button until the list is empty.</qt>"), 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<QListViewItem *> itemsToDelete;
- for ( QListViewItemIterator it ( lvDocuments ); it.current(); ++it )
+ TQValueList<TQListViewItem *> itemsToDelete;
+ for ( TQListViewItemIterator it ( lvDocuments ); it.current(); ++it )
{
KateDocItem *item = static_cast<KateDocItem *>(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 <kdialogbase.h>
-#include <qptrvector.h>
+#include <tqptrvector.h>
#include <kate/document.h>
-typedef QPtrVector<Kate::Document> DocVector;
+typedef TQPtrVector<Kate::Document> 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 <kconfig.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include <kmessagebox.h>
#include <kdebug.h>
-#include <qfile.h>
+#include <tqfile.h>
-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<KService::Ptr> traderList= KTrader::self()->query("Kate/Plugin", "(not ('Kate/ProjectPlugin' in ServiceTypes)) and (not ('Kate/InitPlugin' in ServiceTypes))");
+ TQValueList<KService::Ptr> 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 <ktrader.h>
-#include <qobject.h>
-#include <qvaluelist.h>
+#include <tqobject.h>
+#include <tqvaluelist.h>
class KatePluginInfo
{
@@ -39,14 +39,14 @@ class KatePluginInfo
Kate::Plugin *plugin;
};
-typedef QValueList<KatePluginInfo> KatePluginList;
+typedef TQValueList<KatePluginInfo> 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 <klocale.h>
-#include <qlistview.h>
+#include <tqlistview.h>
#include <klistview.h>
#include <kguiitem.h>
#include <kactivelabel.h>
#include <kstdguiitem.h>
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kdebug.h>
#include <kencodingfiledialog.h>
#include <ktexteditor/encodinginterface.h>
-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<Kate::Document> documents):
+KateSaveModifiedDialog::KateSaveModifiedDialog(TQWidget *parent, TQPtrList<Kate::Document> documents):
KDialogBase( parent, "KateSaveModifiedDialog", true, i18n("Save Documents"), Yes | No | Cancel) {
KGuiItem saveItem=KStdGuiItem::save();
@@ -138,18 +138,18 @@ KateSaveModifiedDialog::KateSaveModifiedDialog(QWidget *parent, QPtrList<Kate::D
cancelItem.setText(i18n("&Abort Closing"));
setButtonGuiItem(KDialogBase::Cancel,cancelItem);
- QVBox *box=makeVBoxMainWidget();
+ TQVBox *box=makeVBoxMainWidget();
new KActiveLabel(i18n("<qt>The following documents have been modified. Do you want to save them before closing?</qt>"),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;i<docCnt;i++) {
new KateSaveModifiedDocumentCheckListItem(m_documentRoot,documents.at(i));
@@ -157,11 +157,11 @@ KateSaveModifiedDialog::KateSaveModifiedDialog(QWidget *parent, QPtrList<Kate::D
m_documentRoot->setOpen(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()"<<endl;
- if (doSave(m_documentRoot)) done(QDialog::Accepted);
+ if (doSave(m_documentRoot)) done(TQDialog::Accepted);
}
void KateSaveModifiedDialog::slotUser1() {
- done(QDialog::Accepted);
+ done(TQDialog::Accepted);
}
-bool KateSaveModifiedDialog::doSave(QListViewItem *root) {
+bool KateSaveModifiedDialog::doSave(TQListViewItem *root) {
if (root) {
- for (QListViewItem *it=root->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<Kate::Document> documents) {
+bool KateSaveModifiedDialog::queryClose(TQWidget *parent,TQPtrList<Kate::Document> 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<Kate::Document> documents);
+ KateSaveModifiedDialog(TQWidget *parent, TQPtrList<Kate::Document> documents);
virtual ~KateSaveModifiedDialog();
- static bool queryClose(QWidget *parent,QPtrList<Kate::Document> documents);
+ static bool queryClose(TQWidget *parent,TQPtrList<Kate::Document> 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 <kpushbutton.h>
#include <kpopupmenu.h>
-#include <qdir.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qvbox.h>
-#include <qhbox.h>
-#include <qcheckbox.h>
-#include <qdatetime.h>
-#include <qmap.h>
+#include <tqdir.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqvbox.h>
+#include <tqhbox.h>
+#include <tqcheckbox.h>
+#include <tqdatetime.h>
+#include <tqmap.h>
#include <unistd.h>
#include <time.h>
@@ -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 <ksharedptr.h>
#include <kaction.h>
-#include <qobject.h>
-#include <qvaluelist.h>
+#include <tqobject.h>
+#include <tqvaluelist.h>
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<KateSession::Ptr> KateSessionList;
+typedef TQValueList<KateSession::Ptr> 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 <qtabbar.h>
+#include <tqtabbar.h>
//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 <ktexteditor/encodinginterface.h>
-#include <qobjectlist.h>
-#include <qstringlist.h>
-#include <qfileinfo.h>
-#include <qtoolbutton.h>
-#include <qtooltip.h>
+#include <tqobjectlist.h>
+#include <tqstringlist.h>
+#include <tqfileinfo.h>
+#include <tqtoolbutton.h>
+#include <tqtooltip.h>
//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<KateViewSpaceContainer*>(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;i<m_viewSpaceContainerList.count();i++) {
- m_viewSpaceContainerList.at(i)->saveViewConfiguration(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;i<tabCount;i++) {
slotNewTab();
- m_viewSpaceContainerList.at(i)->restoreViewConfiguration(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 <kate/view.h>
#include <kate/document.h>
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
class KateMainWindow;
class KateViewSpaceContainer;
@@ -48,7 +48,7 @@ class KateViewManager : public QObject
KateViewSpaceContainer *activeContainer () { return m_currentContainer; }
- QPtrList<KateViewSpaceContainer> *containers() { return &m_viewSpaceContainerList; }
+ TQPtrList<KateViewSpaceContainer> *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<Kate::View> guiMergedView;
+ TQGuardedPtr<Kate::View> 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<KateViewSpaceContainer> m_viewSpaceContainerList;
+ TQPtrList<KateViewSpaceContainer> 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 <kconfig.h>
#include <kdebug.h>
-#include <qwidgetstack.h>
-#include <qpainter.h>
-#include <qlabel.h>
-#include <qcursor.h>
-#include <qpopupmenu.h>
-#include <qpixmap.h>
+#include <tqwidgetstack.h>
+#include <tqpainter.h>
+#include <tqlabel.h>
+#include <tqcursor.h>
+#include <tqpopupmenu.h>
+#include <tqpixmap.h>
//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<Kate::View> it (mViewList);
+ TQPtrListIterator<Kate::View> 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("<<myIndex<<", "<<viewConfGrp<<") - currentView: "<<currentView()<<")"<<endl;
- QString group = QString(viewConfGrp+"-ViewSpace %1").arg( myIndex );
+ TQString group = TQString(viewConfGrp+"-ViewSpace %1").arg( myIndex );
config->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<Kate::View> it(mViewList);
+ TQPtrListIterator<Kate::View> 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 <n> 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 <n> 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<KMainWindow*>( topLevelWidget() );
- QPopupMenu* menu = static_cast<QPopupMenu*>( mainWindow->factory()->container("viewspace_popup", mainWindow ) );
+ TQPopupMenu* menu = static_cast<TQPopupMenu*>( 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 <kate/view.h>
#include <kate/document.h>
-#include <qptrlist.h>
-#include <qwidget.h>
-#include <qvbox.h>
+#include <tqptrlist.h>
+#include <tqwidget.h>
+#include <tqvbox.h>
#include <kstatusbar.h>
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<Kate::View> mViewList;
+ TQLabel* l;
+ TQPixmap i_active;
+ TQPixmap i_empty;
+ TQPtrList<Kate::View> 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 <ktexteditor/encodinginterface.h>
-#include <qlayout.h>
-#include <qobjectlist.h>
-#include <qstringlist.h>
-#include <qvbox.h>
-#include <qtimer.h>
-#include <qfileinfo.h>
+#include <tqlayout.h>
+#include <tqobjectlist.h>
+#include <tqstringlist.h>
+#include <tqvbox.h>
+#include <tqtimer.h>
+#include <tqfileinfo.h>
//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<KateViewSpace> it(m_viewSpaceList);
+ TQPtrListIterator<KateViewSpace> it(m_viewSpaceList);
for (; it.current(); ++it)
{
@@ -183,7 +183,7 @@ Kate::View* KateViewSpaceContainer::activeView ()
m_activeViewRunning = true;
- for (QPtrListIterator<Kate::View> it(m_viewList); it.current(); ++it)
+ for (TQPtrListIterator<Kate::View> 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<Kate::View> it(m_viewList);
+ TQPtrListIterator<Kate::View> 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<Kate::View> closeList;
+ TQPtrList<Kate::View> 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<int> psizes;
+ TQValueList<int> psizes;
if ( ! isFirstTime )
- if ( QSplitter *ps = static_cast<QSplitter*>(vs->parentWidget()->qt_cast("QSplitter")) )
+ if ( TQSplitter *ps = static_cast<TQSplitter*>(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<QSplitter*>(s->parentWidget()->qt_cast("QSplitter")) )
+ if (TQSplitter *ps = static_cast<TQSplitter*>(s->parentWidget()->qt_cast("TQSplitter")) )
ps->setSizes( psizes );
s->show();
- QValueList<int> sizes;
+ TQValueList<int> 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<int> ppsizes;
+ TQValueList<int> 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<QObject>*)p->children())->first());
+ TQWidget* other = ((TQWidget *)(( TQPtrList<TQObject>*)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<Kate::View> &viewList () { return m_viewList; };
+ inline TQPtrList<Kate::View> &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<KateViewSpace> m_viewSpaceList;
- QPtrList<Kate::View> m_viewList;
+ TQPtrList<KateViewSpace> m_viewSpaceList;
+ TQPtrList<Kate::View> m_viewList;
bool m_blockViewCreationAndActivation;
bool m_activeViewRunning;
bool m_pendingViewCreation;
- QGuardedPtr<Kate::Document> m_pendingDocument;
+ TQGuardedPtr<Kate::Document> 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 <stdio.h>
#include <stdlib.h>
-#include <qtextstream.h>
+#include <tqtextstream.h>
#include <kbookmarkimporter.h>
#include <kpopupmenu.h>
@@ -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 << "<bookmark icon=\"" << KMimeType::iconForURL( KURL( url ) );
- *m_importStream << "\" href=\"" << QString::fromUtf8(url) << "\">\n";
- *m_importStream << "<title>" << (additionalInfo.isEmpty() ? QString::fromUtf8(url) : additionalInfo) << "</title>\n</bookmark>\n";
+ *m_importStream << "\" href=\"" << TQString::fromUtf8(url) << "\">\n";
+ *m_importStream << "<title>" << (additionalInfo.isEmpty() ? TQString::fromUtf8(url) : additionalInfo) << "</title>\n</bookmark>\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 << "<folder icon=\"bookmark_folder\">\n<title=\"";
*m_importStream << text << "\">\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 <kparts/event.h>
#include <kmenubar.h>
-#include <qdropsite.h>
-#include <qdragobject.h>
-#include <qvbox.h>
-#include <qtextcodec.h>
-#include <qlayout.h>
+#include <tqdropsite.h>
+#include <tqdragobject.h>
+#include <tqvbox.h>
+#include <tqtextcodec.h>
+#include <tqlayout.h>
// StatusBar field IDs
#define KWRITE_ID_GEN 1
-QPtrList<KTextEditor::Document> KWrite::docList;
-QPtrList<KWrite> KWrite::winList;
+TQPtrList<KTextEditor::Document> KWrite::docList;
+TQPtrList<KWrite> 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<Kate::View*>(m_view->qt_cast("Kate::View")))
- static_cast<Kate::View*>(m_view->qt_cast("Kate::View"))->installPopup ((QPopupMenu*)(factory()->container("ktexteditor_popup", this)) );
+ static_cast<Kate::View*>(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<KAction *> actions = actionCollection()->actions();
- QValueList<KAction *>::ConstIterator it = actions.begin();
- QValueList<KAction *>::ConstIterator end = actions.end();
+ TQValueList<KAction *> actions = actionCollection()->actions();
+ TQValueList<KAction *>::ConstIterator it = actions.begin();
+ TQValueList<KAction *>::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<KTextEditor::Document> docList;
- static QPtrList<KWrite> winList;
+ static TQPtrList<KTextEditor::Document> docList;
+ static TQPtrList<KWrite> 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 <qobject.h>
+#include <tqobject.h>
#include <kurl.h>
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 <qobject.h>
+#include <tqobject.h>
#include <kurl.h>
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 <qobject.h>
+#include <tqobject.h>
#include <kxmlguifactory.h>
#include <kurl.h>
@@ -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<Plugin>( 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 <qwidget.h>
-#include <qpixmap.h>
+#include <tqwidget.h>
+#include <tqpixmap.h>
#include <kicontheme.h>
#include <kurl.h>
@@ -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 <qwidget.h>
-#include <qpixmap.h>
+#include <tqwidget.h>
+#include <tqpixmap.h>
#include <kicontheme.h>
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 <qobject.h>
+#include <tqobject.h>
#include <kurl.h>
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<KateMDI::ToolView*>(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<KateMDI::ToolView*>(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 <qwidget.h>
+#include <tqwidget.h>
#include <kurl.h>
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 <qobject.h>
+#include <tqobject.h>
#include <kurl.h>
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 <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
//#include <kdebug.h>
@@ -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 <qvbox.h>
+#include <tqvbox.h>
/**
* 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 <qtextbrowser.h>
+#include <tqtextbrowser.h>
-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 <unistd.h>
-#include <qfile.h>
-#include <qtimer.h>
+#include <tqfile.h>
+#include <tqtimer.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
@@ -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 <unistd.h>
#include <stdlib.h>
-#include <qtimer.h>
-#include <qpainter.h>
-#include <qvbox.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqtimer.h>
+#include <tqpainter.h>
+#include <tqvbox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
#include <kdialogbase.h>
#include <kmessagebox.h>
@@ -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 <qwidget.h>
-#include <qcolor.h>
+#include <tqwidget.h>
+#include <tqcolor.h>
#include <kuniqueapplication.h>
@@ -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 <dcopref.h>
-#include <qtabwidget.h>
-#include <qlayout.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qcheckbox.h>
-#include <qlineedit.h>
-#include <qradiobutton.h>
-#include <qwhatsthis.h>
-#include <qslider.h>
-#include <qspinbox.h>
+#include <tqtabwidget.h>
+#include <tqlayout.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
+#include <tqcheckbox.h>
+#include <tqlineedit.h>
+#include <tqradiobutton.h>
+#include <tqwhatsthis.h>
+#include <tqslider.h>
+#include <tqspinbox.h>
#include <kcombobox.h>
@@ -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.<p> 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 <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qtabwidget.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqtabwidget.h>
#include <kaboutdata.h>
#include <kcolorbutton.h>
@@ -31,7 +31,7 @@
#include "accessibility.moc"
-typedef KGenericFactory<AccessibilityConfig, QWidget> AccessibilityFactory;
+typedef KGenericFactory<AccessibilityConfig, TQWidget> 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 <unistd.h>
-#include <qcombobox.h>
-#include <qdir.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qregexp.h>
-#include <qslider.h>
-#include <qtabwidget.h>
-#include <qwhatsthis.h>
+#include <tqcombobox.h>
+#include <tqdir.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqregexp.h>
+#include <tqslider.h>
+#include <tqtabwidget.h>
+#include <tqwhatsthis.h>
#include <dcopref.h>
@@ -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 <b>/dev/dsp</b> for sound output. That should work in most cases. On some systems where devfs is used, however, you may need to use <b>/dev/sound/dsp</b> instead. Other alternatives are things like <b>/dev/dsp0</b> or <b>/dev/dsp1</b>, 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 <b>/dev/dsp</b> for sound output. That should work in most cases. On some systems where devfs is used, however, you may need to use <b>/dev/sound/dsp</b> instead. Other alternatives are things like <b>/dev/dsp0</b> or <b>/dev/dsp1</b>, 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 <b>Yamaha soundcards</b>, you might need to configure this to 48000 Hz here, if you are using <b>old SoundBlaster cards</b>, 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 <b>Yamaha soundcards</b>, you might need to configure this to 48000 Hz here, if you are using <b>old SoundBlaster cards</b>, 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 <b>command line options</b> here which will be passed directly to <b>artsd</b>. The command line options will override the choices made in the GUI. To see the possible choices, open a Konsole window, and type <b>artsd -h</b>.");
+ 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 <b>command line options</b> here which will be passed directly to <b>artsd</b>. The command line options will override the choices made in the GUI. To see the possible choices, open a Konsole window, and type <b>artsd -h</b>.");
- 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 <kapplication.h>
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qradiobutton.h>
-#include <qtimer.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
+#include <tqradiobutton.h>
+#include <tqtimer.h>
#include <kcmodule.h>
#include <knuminput.h>
@@ -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<AudioIOElement> audioIOList;
+ TQPtrList<AudioIOElement> 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 <qtooltip.h>
-#include <qstylesheet.h>
-#include <qsimplerichtext.h>
+#include <tqtooltip.h>
+#include <tqstylesheet.h>
+#include <tqsimplerichtext.h>
#include <kglobalsettings.h>
-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("<qt>"))
- QLabel::setText("<qt>"+text+"</qt>");
+ TQLabel::setText("<qt>"+text+"</qt>");
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 <qlabel.h>
+#include <tqlabel.h>
#include <kdelibs_export.h>
/**
- * @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 <bastian@kde.org>
*/
@@ -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 <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qheader.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qcombobox.h>
-#include <qpushbutton.h>
-#include <qslider.h>
-#include <qspinbox.h>
-#include <qwhatsthis.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqheader.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
+#include <tqpushbutton.h>
+#include <tqslider.h>
+#include <tqspinbox.h>
+#include <tqwhatsthis.h>
#include <kconfig.h>
#include <kcolorbutton.h>
@@ -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 <qdict.h>
-#include <qlistview.h>
-#include <qstringlist.h>
+#include <tqdict.h>
+#include <tqlistview.h>
+#include <tqstringlist.h>
#include <kdialogbase.h>
@@ -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<QListViewItem> m_programItems;
- QString m_selectedProgram;
+ TQWidget *m_pMonitor;
+ TQDict<TQListViewItem> 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 <config.h>
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qpainter.h>
-#include <qradiobutton.h>
-#include <qslider.h>
-#include <qtimer.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qapplication.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqpainter.h>
+#include <tqradiobutton.h>
+#include <tqslider.h>
+#include <tqtimer.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
+#include <tqapplication.h>
#include <kconfig.h>
#include <kdebug.h>
@@ -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("<h1>Background</h1> 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<QString, QPair<QString, QString> > papers;
+ TQMap<TQString, QPair<TQString, TQString> > 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<QString, QPair<QString, QString> >::Iterator it = papers.begin();
+ for (TQMap<TQString, QPair<TQString, TQString> >::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<QString,int>::ConstIterator it = m_wallpaper.begin();
+ TQString uri;
+ for(TQMap<TQString,int>::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<QString,int>::ConstIterator it = m_wallpaper.begin();
+ TQString path;
+ for(TQMap<TQString,int>::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 <qptrvector.h>
-#include <qmap.h>
-#include <qvaluevector.h>
+#include <tqptrvector.h>
+#include <tqmap.h>
+#include <tqvaluevector.h>
#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<KBackgroundRenderer> > m_renderer; // m_renderer[desk][screen]
- QMap<QString,int> m_wallpaper;
- QStringList m_patterns;
+ TQValueVector< TQPtrVector<KBackgroundRenderer> > m_renderer; // m_renderer[desk][screen]
+ TQMap<TQString,int> 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 <kpixmap.h>
#include <kstandarddirs.h>
#include <kurldrag.h>
-#include <qapplication.h>
-#include <qpixmap.h>
-#include <qwhatsthis.h>
+#include <tqapplication.h>
+#include <tqpixmap.h>
+#include <tqwhatsthis.h>
#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 <qlabel.h>
-#include <qvaluevector.h>
-#include <qwidget.h>
+#include <tqlabel.h>
+#include <tqvaluevector.h>
+#include <tqwidget.h>
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<BGMonitorLabel*> m_pBGMonitor;
- QSize m_combinedPreviewSize;
- QSize m_maxPreviewSize;
+ TQValueVector<BGMonitorLabel*> 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 <stdlib.h>
#include <utime.h>
-#include <qtimer.h>
-#include <qpainter.h>
-#include <qimage.h>
-#include <qfileinfo.h>
-#include <qdir.h>
+#include <tqtimer.h>
+#include <tqpainter.h>
+#include <tqimage.h>
+#include <tqfileinfo.h>
+#include <tqdir.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -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 <src> with offset <soffs> to rectangle <dr> of <dst>
- * 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; i<m_numRenderers; ++i)
{
fp += m_renderer[i]->fingerprint();
@@ -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; i<m_renderer.size(); ++i)
{
- QSize unscaledRendererSize = renderSize(i);
+ TQSize unscaledRendererSize = renderSize(i);
- m_renderer[i]->setPreview( 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 <qobject.h>
-#include <qptrvector.h>
-#include <qimage.h>
-#include <qpixmap.h>
+#include <tqobject.h>
+#include <tqptrvector.h>
+#include <tqimage.h>
+#include <tqpixmap.h>
#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<bool> m_bFinished;
- QPtrVector<KBackgroundRenderer> m_renderer;
- QPixmap *m_pPixmap;
+ TQMemArray<bool> m_bFinished;
+ TQPtrVector<KBackgroundRenderer> 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 <qdir.h>
-#include <qpixmap.h>
+#include <tqdir.h>
+#include <tqpixmap.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -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 <qstringlist.h>
-#include <qcolor.h>
-#include <qvaluevector.h>
+#include <tqstringlist.h>
+#include <tqcolor.h>
+#include <tqvaluevector.h>
-template <class QString, class T> class QMap;
+template <class TQString, class T> 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<QString,int> m_BMMap;
- QMap<QString,int> m_WMMap;
- QMap<QString,int> m_MMMap;
- QMap<QString,int> m_BlMMap;
+ TQMap<TQString,int> m_BMMap;
+ TQMap<TQString,int> m_WMMap;
+ TQMap<TQString,int> m_MMMap;
+ TQMap<TQString,int> 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<bool> m_bDrawBackgroundPerScreen; // m_bDrawBackgroundPerScreen[desk]
+ TQValueVector<bool> 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 <config.h>
-#include <qcheckbox.h>
-#include <qevent.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
+#include <tqcheckbox.h>
+#include <tqevent.h>
+#include <tqpushbutton.h>
+#include <tqspinbox.h>
#include <kfiledialog.h>
#include <kimageio.h>
@@ -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 <qlistbox.h>
-#include <qstringlist.h>
+#include <tqlistbox.h>
+#include <tqstringlist.h>
#include <kdialogbase.h>
@@ -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 <qlayout.h>
+#include <tqlayout.h>
#include <kapplication.h>
#include <kaboutdata.h>
#include <kconfig.h>
@@ -32,7 +32,7 @@
#include <X11/Xlib.h>
/**** DLL Interface ****/
-typedef KGenericFactory<KBackground, QWidget> KBackGndFactory;
+typedef KGenericFactory<KBackground, TQWidget> 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 <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqwhatsthis.h>
#include <kaboutdata.h>
#include <kapplication.h>
@@ -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 <unistd.h>
#include <sys/types.h>
-#include <qcombobox.h>
-#include <qgroupbox.h>
-#include <qpushbutton.h>
-#include <qpainter.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qwhatsthis.h>
-#include <qcheckbox.h>
-#include <qregexp.h>
+#include <tqcombobox.h>
+#include <tqgroupbox.h>
+#include <tqpushbutton.h>
+#include <tqpainter.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <klocale.h>
@@ -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; i<timeServerList->count();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("<h1>Date & Time</h1> 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 <qdatetime.h>
-#include <qlineedit.h>
-#include <qspinbox.h>
-#include <qstring.h>
-#include <qtimer.h>
-#include <qvalidator.h>
-#include <qwidget.h>
-#include <qcheckbox.h>
+#include <tqdatetime.h>
+#include <tqlineedit.h>
+#include <tqspinbox.h>
+#include <tqstring.h>
+#include <tqtimer.h>
+#include <tqvalidator.h>
+#include <tqwidget.h>
+#include <tqcheckbox.h>
#include <kdatepicker.h>
#include <knuminput.h>
@@ -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 <unistd.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
#include <dcopclient.h>
@@ -36,10 +36,10 @@
#include "tzone.h"
#include "dtime.h"
-typedef KGenericFactory<KclockModule, QWidget> KlockModuleFactory;
+typedef KGenericFactory<KclockModule, TQWidget> 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 <time.h>
#include <config.h>
-#include <qlabel.h>
-#include <qfile.h>
+#include <tqlabel.h>
+#include <tqfile.h>
#include <kdebug.h>
#include <klocale.h>
@@ -46,15 +46,15 @@
#include <sys/stat.h>
#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 <ktimezones.h>
#include <ktimezonewidget.h>
-#include <qvgroupbox.h>
+#include <tqvgroupbox.h>
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 <stdlib.h>
#include <unistd.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qdir.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qslider.h>
-#include <qvgroupbox.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqdir.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpainter.h>
+#include <tqslider.h>
+#include <tqvgroupbox.h>
+#include <tqwhatsthis.h>
#include <kcolorbutton.h>
#include <kcursor.h>
@@ -46,25 +46,25 @@
/**** DLL Interface ****/
-typedef KGenericFactory<KColorScheme , QWidget> KolorFactory;
+typedef KGenericFactory<KColorScheme , TQWidget> 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<KColorSchemeEntry> {
+class KColorSchemeList : public TQPtrList<KColorSchemeEntry> {
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.<p>"
@@ -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 == "<default>")
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 <qcolor.h>
-#include <qobject.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqcolor.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <kcmodule.h>
#include <kdialogbase.h>
@@ -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 <qdrawutil.h>
-#include <qpainter.h>
-#include <qscrollbar.h>
-#include <qbitmap.h>
-#include <qtooltip.h>
-#include <qstyle.h>
-#include <qpopupmenu.h>
+#include <tqdrawutil.h>
+#include <tqpainter.h>
+#include <tqscrollbar.h>
+#include <tqbitmap.h>
+#include <tqtooltip.h>
+#include <tqstyle.h>
+#include <tqpopupmenu.h>
#include <kcolordrag.h>
#include <kpixmapeffect.h>
@@ -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 <qmap.h>
+#include <tqmap.h>
#include <kapplication.h>
#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<int,QString> tips;
+ TQMap<int,TQString> 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 <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
-#include <qwidgetstack.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqradiobutton.h>
+#include <tqwidgetstack.h>
#include <dcopclient.h>
@@ -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;i<ComponentSelector->count();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("<qt>You changed the default component of your choice. Do you want to save that change now?</qt>"),QString::null,KStdGuiItem::save(),KStdGuiItem::discard())==KMessageBox::Yes) save();
+ if (KMessageBox::questionYesNo(this,i18n("<qt>You changed the default component of your choice. Do you want to save that change now?</qt>"),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard())==KMessageBox::Yes) save();
}
KSimpleConfig cfg(static_cast<MyListBoxItem*>(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 <qdict.h>
-#include <qstring.h>
+#include <tqdict.h>
+#include <tqstring.h>
#include <kservice.h>
@@ -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<QString> m_lookupDict,m_revLookupDict;
+ TQDict<TQString> 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 <qlayout.h>
+#include <tqlayout.h>
#include <kaboutdata.h>
#include <kglobal.h>
@@ -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 <qpushbutton.h>
+#include <tqpushbutton.h>
#include <klineedit.h>
#include <kfiledialog.h>
-#include <qradiobutton.h>
-#include <qvbuttongroup.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqradiobutton.h>
+#include <tqvbuttongroup.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
#include <klocale.h>
#include <kdebug.h>
#include <kmessagebox.h>
#include <ksslall.h>
-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 <pwd.h>
#include <unistd.h>
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qframe.h>
-#include <qhbuttongroup.h>
-#include <qhgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qregexp.h>
-#include <qvbox.h>
-#include <qvbuttongroup.h>
-#include <qvgroupbox.h>
-#include <qwhatsthis.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqframe.h>
+#include <tqhbuttongroup.h>
+#include <tqhgroupbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqregexp.h>
+#include <tqvbox.h>
+#include <tqvbuttongroup.h>
+#include <tqvgroupbox.h>
+#include <tqwhatsthis.h>
#include <kaboutdata.h>
#include <kcombobox.h>
@@ -93,18 +93,18 @@
using namespace KNetwork;
-typedef KGenericFactory<KCryptoConfig, QWidget> KryptoFactory;
+typedef KGenericFactory<KCryptoConfig, TQWidget> 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("<h1>Crypto</h1> 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("<qt>Use these preconfigurations to more easily configure the SSL encryption settings. You can choose among the following modes: <ul>");
+ TQString whatStr = i18n("<qt>Use these preconfigurations to more easily configure the SSL encryption settings. You can choose among the following modes: <ul>");
- cwcb->insertItem(QString::null);
+ cwcb->insertItem(TQString::null);
cwcb->insertItem(i18n("Most Compatible"));
whatStr += i18n("<li><b>Most Compatible:</b> Select the settings found to be most compatible.</li>");
cwcb->insertItem(i18n("US Ciphers Only"));
@@ -344,43 +344,43 @@ QString whatstr;
cwcb->insertItem(i18n("Enable All"));
whatStr += i18n("<li><b>Enable All:</b> Select all SSL ciphers and methods.</li></ul>");
- QWhatsThis::add(cwcb, whatStr);
+ TQWhatsThis::add(cwcb, whatStr);
- connect(cwcb, SIGNAL(activated(int)), SLOT(slotSelectCipher(int)));
+ connect(cwcb, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectCipher(int)));
#endif
- mWarnOnEnter = new QCheckBox(i18n("Warn on &entering SSL mode"), tabSSL);
- connect(mWarnOnEnter, SIGNAL(clicked()), SLOT(configChanged()));
+ mWarnOnEnter = new TQCheckBox(i18n("Warn on &entering SSL mode"), tabSSL);
+ connect(mWarnOnEnter, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
grid->addWidget(mWarnOnEnter, 5, 0);
whatstr = i18n("If selected, you will be notified when entering an SSL"
" enabled site");
- QWhatsThis::add(mWarnOnEnter, whatstr);
+ TQWhatsThis::add(mWarnOnEnter, whatstr);
- mWarnOnLeave = new QCheckBox(i18n("Warn on &leaving SSL mode"), tabSSL);
- connect(mWarnOnLeave, SIGNAL(clicked()), SLOT(configChanged()));
+ mWarnOnLeave = new TQCheckBox(i18n("Warn on &leaving SSL mode"), tabSSL);
+ connect(mWarnOnLeave, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
grid->addWidget(mWarnOnLeave, 5, 1);
whatstr = i18n("If selected, you will be notified when leaving an SSL"
" based site.");
- QWhatsThis::add(mWarnOnLeave, whatstr);
+ TQWhatsThis::add(mWarnOnLeave, whatstr);
- mWarnOnUnencrypted = new QCheckBox(i18n("Warn on sending &unencrypted data"), tabSSL);
- connect(mWarnOnUnencrypted, SIGNAL(clicked()), SLOT(configChanged()));
+ mWarnOnUnencrypted = new TQCheckBox(i18n("Warn on sending &unencrypted data"), tabSSL);
+ connect(mWarnOnUnencrypted, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
grid->addWidget(mWarnOnUnencrypted, 6, 0);
whatstr = i18n("If selected, you will be notified before sending"
" unencrypted data via a web browser.");
- QWhatsThis::add(mWarnOnUnencrypted, whatstr);
+ TQWhatsThis::add(mWarnOnUnencrypted, whatstr);
#if 0 // NOT IMPLEMENTED IN KDE 3.0
- mWarnOnMixed = new QCheckBox(i18n("Warn on &mixed SSL/non-SSL pages"), tabSSL);
- connect(mWarnOnMixed, SIGNAL(clicked()), SLOT(configChanged()));
+ mWarnOnMixed = new TQCheckBox(i18n("Warn on &mixed SSL/non-SSL pages"), tabSSL);
+ connect(mWarnOnMixed, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
grid->addWidget(mWarnOnMixed, 6, 1);
whatstr = i18n("If selected, you will be notified if you view a page"
" that has both encrypted and non-encrypted parts.");
- QWhatsThis::add(mWarnOnMixed, whatstr);
+ TQWhatsThis::add(mWarnOnMixed, whatstr);
#endif
///////////////////////////////////////////////////////////////////////////
@@ -388,50 +388,50 @@ QString whatstr;
///////////////////////////////////////////////////////////////////////////
#ifdef HAVE_SSL
- tabOSSL = new QFrame(this);
- QBoxLayout *vbox = new QVBoxLayout(tabOSSL, KDialog::marginHint(), KDialog::spacingHint());
+ tabOSSL = new TQFrame(this);
+ TQBoxLayout *vbox = new TQVBoxLayout(tabOSSL, KDialog::marginHint(), KDialog::spacingHint());
- oInfo = new QVGroupBox(i18n("Path to OpenSSL Shared Libraries"), tabOSSL);
+ oInfo = new TQVGroupBox(i18n("Path to OpenSSL Shared Libraries"), tabOSSL);
vbox->addWidget(oInfo);
oPath = new KURLRequester(oInfo);
oPath->setMode(KFile::Directory);
- oTest = new QPushButton(i18n("&Test"), oInfo);
- connect(oTest, SIGNAL(clicked()), SLOT(slotTestOSSL()));
+ oTest = new TQPushButton(i18n("&Test"), oInfo);
+ connect(oTest, TQT_SIGNAL(clicked()), TQT_SLOT(slotTestOSSL()));
- connect(oPath, SIGNAL(textChanged(const QString&)), SLOT(configChanged()));
+ connect(oPath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged()));
//
// Settings for the EGD
//
- QFrame *eFrame = new QFrame(tabOSSL);
- QVBoxLayout *egrid = new QVBoxLayout(eFrame);
- mUseEGD = new QCheckBox(i18n("Use EGD"), eFrame);
- connect(mUseEGD, SIGNAL(clicked()), SLOT(slotUseEGD()));
- mUseEFile = new QCheckBox(i18n("Use entropy file"), eFrame);
- connect(mUseEFile, SIGNAL(clicked()), SLOT(slotUseEFile()));
+ TQFrame *eFrame = new TQFrame(tabOSSL);
+ TQVBoxLayout *egrid = new TQVBoxLayout(eFrame);
+ mUseEGD = new TQCheckBox(i18n("Use EGD"), eFrame);
+ connect(mUseEGD, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseEGD()));
+ mUseEFile = new TQCheckBox(i18n("Use entropy file"), eFrame);
+ connect(mUseEFile, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseEFile()));
vbox->addWidget(eFrame);
egrid->addWidget(mUseEGD);
egrid->addWidget(mUseEFile);
- QFrame *egdframe = new QFrame(tabOSSL);
- QGridLayout *grid2 = new QGridLayout(egdframe, 2, 2, KDialog::marginHint(),
+ TQFrame *egdframe = new TQFrame(tabOSSL);
+ TQGridLayout *grid2 = new TQGridLayout(egdframe, 2, 2, KDialog::marginHint(),
KDialog::spacingHint());
- mEGDLabel = new QLabel(i18n("Path to EGD:"), egdframe);
+ mEGDLabel = new TQLabel(i18n("Path to EGD:"), egdframe);
grid2->addWidget(mEGDLabel, 0, 0);
mEGDPath = new KURLRequester(egdframe);
grid2->addWidget(mEGDPath, 0, 1);
- connect(mEGDPath, SIGNAL(textChanged(const QString&)), SLOT(configChanged()));
+ connect(mEGDPath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged()));
vbox->addWidget(egdframe);
whatstr = i18n("If selected, OpenSSL will be asked to use the entropy gathering"
" daemon (EGD) for initializing the pseudo-random number generator.");
- QWhatsThis::add(mUseEGD, whatstr);
+ TQWhatsThis::add(mUseEGD, whatstr);
whatstr = i18n("If selected, OpenSSL will be asked to use the given file"
" as entropy for initializing the pseudo-random number generator.");
- QWhatsThis::add(mUseEFile, whatstr);
+ TQWhatsThis::add(mUseEFile, whatstr);
whatstr = i18n("Enter the path to the socket created by the entropy gathering"
" daemon (or the entropy file) here.");
- QWhatsThis::add(mEGDPath, whatstr);
+ TQWhatsThis::add(mEGDPath, whatstr);
whatstr = i18n("Click here to browse for the EGD socket file.");
- QWhatsThis::add(mEGDPath, whatstr);
+ TQWhatsThis::add(mEGDPath, whatstr);
vbox->addStretch();
#endif
@@ -441,85 +441,85 @@ QString whatstr;
///////////////////////////////////////////////////////////////////////////
// THIRD TAB
///////////////////////////////////////////////////////////////////////////
- tabYourSSLCert = new QFrame(this);
+ tabYourSSLCert = new TQFrame(this);
#ifdef HAVE_SSL
- grid = new QGridLayout(tabYourSSLCert, 16, 6, KDialog::marginHint(), KDialog::spacingHint() );
+ grid = new TQGridLayout(tabYourSSLCert, 16, 6, KDialog::marginHint(), KDialog::spacingHint() );
- yourSSLBox = new QListView(tabYourSSLCert);
+ yourSSLBox = new TQListView(tabYourSSLCert);
yourSSLBox->setAllColumnsShowFocus(true);
whatstr = i18n("This list box shows which certificates of yours KDE"
" knows about. You can easily manage them from here.");
- QWhatsThis::add(yourSSLBox, whatstr);
+ TQWhatsThis::add(yourSSLBox, whatstr);
grid->addMultiCellWidget(yourSSLBox, 0, 5, 0, 4);
yourSSLBox->addColumn(i18n("Common Name"));
yourSSLBox->addColumn(i18n("Email Address"));
- connect(yourSSLBox, SIGNAL(selectionChanged()), SLOT(slotYourCertSelect()));
+ connect(yourSSLBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotYourCertSelect()));
- yourSSLImport = new QPushButton(i18n("I&mport..."), tabYourSSLCert);
- connect(yourSSLImport, SIGNAL(clicked()), SLOT(slotYourImport()));
+ yourSSLImport = new TQPushButton(i18n("I&mport..."), tabYourSSLCert);
+ connect(yourSSLImport, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourImport()));
grid->addWidget(yourSSLImport, 0, 5);
- yourSSLExport = new QPushButton(i18n("&Export..."), tabYourSSLCert);
+ yourSSLExport = new TQPushButton(i18n("&Export..."), tabYourSSLCert);
yourSSLExport->setEnabled(false);
- connect(yourSSLExport, SIGNAL(clicked()), SLOT(slotYourExport()));
+ connect(yourSSLExport, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourExport()));
grid->addWidget(yourSSLExport, 1, 5);
- yourSSLRemove = new QPushButton(i18n("Remo&ve"), tabYourSSLCert);
+ yourSSLRemove = new TQPushButton(i18n("Remo&ve"), tabYourSSLCert);
yourSSLRemove->setEnabled(false);
- connect(yourSSLRemove, SIGNAL(clicked()), SLOT(slotYourRemove()));
+ connect(yourSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourRemove()));
grid->addWidget(yourSSLRemove, 2, 5);
- yourSSLUnlock = new QPushButton(i18n("&Unlock"), tabYourSSLCert);
+ yourSSLUnlock = new TQPushButton(i18n("&Unlock"), tabYourSSLCert);
yourSSLUnlock->setEnabled(false);
- connect(yourSSLUnlock, SIGNAL(clicked()), SLOT(slotYourUnlock()));
+ connect(yourSSLUnlock, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourUnlock()));
grid->addWidget(yourSSLUnlock, 3, 5);
- yourSSLVerify = new QPushButton(i18n("Verif&y"), tabYourSSLCert);
+ yourSSLVerify = new TQPushButton(i18n("Verif&y"), tabYourSSLCert);
yourSSLVerify->setEnabled(false);
- connect(yourSSLVerify, SIGNAL(clicked()), SLOT(slotYourVerify()));
+ connect(yourSSLVerify, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourVerify()));
grid->addWidget(yourSSLVerify, 4, 5);
- yourSSLPass = new QPushButton(i18n("Chan&ge Password..."), tabYourSSLCert);
+ yourSSLPass = new TQPushButton(i18n("Chan&ge Password..."), tabYourSSLCert);
yourSSLPass->setEnabled(false);
- connect(yourSSLPass, SIGNAL(clicked()), SLOT(slotYourPass()));
+ connect(yourSSLPass, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourPass()));
grid->addWidget(yourSSLPass, 5, 5);
grid->addMultiCellWidget(new KSeparator(KSeparator::HLine, tabYourSSLCert), 6, 6, 0, 5);
- ySubject = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, QString(QString::null));
- yIssuer = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, QString(QString::null));
+ ySubject = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, TQString(TQString::null));
+ yIssuer = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, TQString(TQString::null));
grid->addMultiCellWidget(ySubject, 7, 11, 0, 2);
grid->addMultiCellWidget(yIssuer, 7, 11, 3, 5);
whatstr = i18n("This is the information known about the owner of the certificate.");
- QWhatsThis::add(ySubject, whatstr);
+ TQWhatsThis::add(ySubject, whatstr);
whatstr = i18n("This is the information known about the issuer of the certificate.");
- QWhatsThis::add(yIssuer, whatstr);
+ TQWhatsThis::add(yIssuer, whatstr);
- grid->addWidget(new QLabel(i18n("Valid from:"), tabYourSSLCert), 12, 0);
- grid->addWidget(new QLabel(i18n("Valid until:"), tabYourSSLCert), 13, 0);
- yValidFrom = new QLabel(tabYourSSLCert);
+ grid->addWidget(new TQLabel(i18n("Valid from:"), tabYourSSLCert), 12, 0);
+ grid->addWidget(new TQLabel(i18n("Valid until:"), tabYourSSLCert), 13, 0);
+ yValidFrom = new TQLabel(tabYourSSLCert);
grid->addWidget(yValidFrom, 12, 1);
- yValidUntil = new QLabel(tabYourSSLCert);
+ yValidUntil = new TQLabel(tabYourSSLCert);
grid->addWidget(yValidUntil, 13, 1);
whatstr = i18n("The certificate is valid starting at this date.");
- QWhatsThis::add(yValidFrom, whatstr);
+ TQWhatsThis::add(yValidFrom, whatstr);
whatstr = i18n("The certificate is valid until this date.");
- QWhatsThis::add(yValidUntil, whatstr);
- grid->addWidget(new QLabel(i18n("MD5 digest:"), tabYourSSLCert), 14, 0);
- yHash = new QLabel(tabYourSSLCert);
+ TQWhatsThis::add(yValidUntil, whatstr);
+ grid->addWidget(new TQLabel(i18n("MD5 digest:"), tabYourSSLCert), 14, 0);
+ yHash = new TQLabel(tabYourSSLCert);
grid->addWidget(yHash, 14, 1);
whatstr = i18n("A hash of the certificate used to identify it quickly.");
- QWhatsThis::add(yHash, whatstr);
+ TQWhatsThis::add(yHash, whatstr);
#if 0
- QHButtonGroup *ocbg = new QHButtonGroup(i18n("On SSL Connection..."), tabYourSSLCert);
- yourSSLUseDefault = new QRadioButton(i18n("&Use default certificate"), ocbg);
- yourSSLList = new QRadioButton(i18n("&List upon connection"), ocbg);
- yourSSLDont = new QRadioButton(i18n("&Do not use certificates"), ocbg);
+ TQHButtonGroup *ocbg = new TQHButtonGroup(i18n("On SSL Connection..."), tabYourSSLCert);
+ yourSSLUseDefault = new TQRadioButton(i18n("&Use default certificate"), ocbg);
+ yourSSLList = new TQRadioButton(i18n("&List upon connection"), ocbg);
+ yourSSLDont = new TQRadioButton(i18n("&Do not use certificates"), ocbg);
grid->addMultiCellWidget(ocbg, 14, 14, 0, 5);
#endif
#else
- nossllabel = new QLabel(i18n("SSL certificates cannot be managed"
+ nossllabel = new TQLabel(i18n("SSL certificates cannot be managed"
" because this module was not linked"
" with OpenSSL."), tabYourSSLCert);
grid->addMultiCellWidget(nossllabel, 3, 3, 0, 5);
@@ -529,48 +529,48 @@ QString whatstr;
///////////////////////////////////////////////////////////////////////////
// FOURTH TAB
///////////////////////////////////////////////////////////////////////////
- tabAuth = new QFrame(this);
+ tabAuth = new TQFrame(this);
#ifdef HAVE_SSL
- grid = new QGridLayout(tabAuth, 20, 6, KDialog::marginHint(), KDialog::spacingHint());
+ grid = new TQGridLayout(tabAuth, 20, 6, KDialog::marginHint(), KDialog::spacingHint());
- grid->addMultiCellWidget(new QLabel(i18n("Default Authentication Certificate"), tabAuth), 0, 0, 0, 2);
- defCertBG = new QVButtonGroup(i18n("Default Action"), tabAuth);
- defSend = new QRadioButton(i18n("&Send"), defCertBG);
- defPrompt = new QRadioButton(i18n("&Prompt"), defCertBG);
- defDont = new QRadioButton(i18n("Do &not send"), defCertBG);
+ grid->addMultiCellWidget(new TQLabel(i18n("Default Authentication Certificate"), tabAuth), 0, 0, 0, 2);
+ defCertBG = new TQVButtonGroup(i18n("Default Action"), tabAuth);
+ defSend = new TQRadioButton(i18n("&Send"), defCertBG);
+ defPrompt = new TQRadioButton(i18n("&Prompt"), defCertBG);
+ defDont = new TQRadioButton(i18n("Do &not send"), defCertBG);
grid->addMultiCellWidget(defCertBG, 1, 3, 0, 2);
- grid->addMultiCellWidget(new QLabel(i18n("Default certificate:"), tabAuth), 1, 1, 3, 5);
+ grid->addMultiCellWidget(new TQLabel(i18n("Default certificate:"), tabAuth), 1, 1, 3, 5);
defCertBox = new KComboBox(false, tabAuth);
grid->addMultiCellWidget(defCertBox, 2, 2, 3, 5);
grid->addMultiCellWidget(new KSeparator(KSeparator::HLine, tabAuth), 4, 4, 0, 5);
- grid->addMultiCellWidget(new QLabel(i18n("Host authentication:"), tabAuth), 5, 5, 0, 1);
- hostAuthList = new QListView(tabAuth);
+ grid->addMultiCellWidget(new TQLabel(i18n("Host authentication:"), tabAuth), 5, 5, 0, 1);
+ hostAuthList = new TQListView(tabAuth);
hostAuthList->setAllColumnsShowFocus(true);
grid->addMultiCellWidget(hostAuthList, 6, 13, 0, 5);
hostAuthList->addColumn(i18n("Host"));
hostAuthList->addColumn(i18n("Certificate"));
hostAuthList->addColumn(i18n("Policy"));
- grid->addWidget(new QLabel(i18n("Host:"), tabAuth), 14, 0);
- grid->addWidget(new QLabel(i18n("Certificate:"), tabAuth), 15, 0);
+ grid->addWidget(new TQLabel(i18n("Host:"), tabAuth), 14, 0);
+ grid->addWidget(new TQLabel(i18n("Certificate:"), tabAuth), 15, 0);
- authHost = new QLineEdit(tabAuth);
+ authHost = new TQLineEdit(tabAuth);
grid->addMultiCellWidget(authHost, 14, 14, 1, 4);
hostCertBox = new KComboBox(false, tabAuth);
grid->addMultiCellWidget(hostCertBox, 15, 15, 1, 4);
- hostCertBG = new QHButtonGroup(i18n("Action"), tabAuth);
- hostSend = new QRadioButton(i18n("Send"), hostCertBG);
- hostPrompt = new QRadioButton(i18n("Prompt"), hostCertBG);
- hostDont = new QRadioButton(i18n("Do not send"), hostCertBG);
+ hostCertBG = new TQHButtonGroup(i18n("Action"), tabAuth);
+ hostSend = new TQRadioButton(i18n("Send"), hostCertBG);
+ hostPrompt = new TQRadioButton(i18n("Prompt"), hostCertBG);
+ hostDont = new TQRadioButton(i18n("Do not send"), hostCertBG);
grid->addMultiCellWidget(hostCertBG, 16, 16, 0, 5);
- authAdd = new QPushButton(i18n("Ne&w"), tabAuth);
- authRemove = new QPushButton(i18n("Remo&ve"), tabAuth);
+ authAdd = new TQPushButton(i18n("Ne&w"), tabAuth);
+ authRemove = new TQPushButton(i18n("Remo&ve"), tabAuth);
grid->addWidget(authAdd, 17, 4);
grid->addWidget(authRemove, 17, 5);
@@ -579,17 +579,17 @@ QString whatstr;
hostCertBG->setEnabled(false);
authRemove->setEnabled(false);
- connect(defCertBox, SIGNAL(activated(int)), this, SLOT(configChanged()));
- connect(defCertBG, SIGNAL(clicked(int)), this, SLOT(configChanged()));
- connect(hostAuthList, SIGNAL(selectionChanged()), this, SLOT(slotAuthItemChanged()));
- connect(authAdd, SIGNAL(clicked()), this, SLOT(slotNewHostAuth()));
- connect(authRemove, SIGNAL(clicked()), this, SLOT(slotRemoveHostAuth()));
- connect(authHost, SIGNAL(textChanged(const QString &)), this, SLOT(slotAuthText(const QString &)));
- connect(hostCertBG, SIGNAL(clicked(int)), this, SLOT(slotAuthButtons()));
- connect(hostCertBox, SIGNAL(activated(int)), this, SLOT(slotAuthCombo()));
+ connect(defCertBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged()));
+ connect(defCertBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(configChanged()));
+ connect(hostAuthList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotAuthItemChanged()));
+ connect(authAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewHostAuth()));
+ connect(authRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveHostAuth()));
+ connect(authHost, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotAuthText(const TQString &)));
+ connect(hostCertBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotAuthButtons()));
+ connect(hostCertBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAuthCombo()));
#else
- nossllabel = new QLabel(i18n("SSL certificates cannot be managed"
+ nossllabel = new TQLabel(i18n("SSL certificates cannot be managed"
" because this module was not linked"
" with OpenSSL."), tabAuth);
grid->addMultiCellWidget(nossllabel, 3, 3, 0, 5);
@@ -600,112 +600,112 @@ QString whatstr;
///////////////////////////////////////////////////////////////////////////
// FIFTH TAB
///////////////////////////////////////////////////////////////////////////
- tabOtherSSLCert = new QFrame(this);
+ tabOtherSSLCert = new TQFrame(this);
#ifdef HAVE_SSL
- oGrid = grid = new QGridLayout(tabOtherSSLCert, 21, 6, KDialog::marginHint(), KDialog::spacingHint());
+ oGrid = grid = new TQGridLayout(tabOtherSSLCert, 21, 6, KDialog::marginHint(), KDialog::spacingHint());
- otherSSLBox = new QListView(tabOtherSSLCert);
+ otherSSLBox = new TQListView(tabOtherSSLCert);
otherSSLBox->setAllColumnsShowFocus(true);
- connect(otherSSLBox, SIGNAL(selectionChanged()), SLOT(slotOtherCertSelect()));
+ connect(otherSSLBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotOtherCertSelect()));
whatstr = i18n("This list box shows which site and person certificates KDE"
" knows about. You can easily manage them from here.");
- QWhatsThis::add(otherSSLBox, whatstr);
+ TQWhatsThis::add(otherSSLBox, whatstr);
otherSSLBox->addColumn(i18n("Organization"));
otherSSLBox->addColumn(i18n("Common Name"));
grid->addMultiCellWidget(otherSSLBox, 0, 7, 0, 4);
- otherSSLExport = new QPushButton(i18n("&Export..."), tabOtherSSLCert);
- connect(otherSSLExport, SIGNAL(clicked()), SLOT(slotExportCert()));
+ otherSSLExport = new TQPushButton(i18n("&Export..."), tabOtherSSLCert);
+ connect(otherSSLExport, TQT_SIGNAL(clicked()), TQT_SLOT(slotExportCert()));
grid->addWidget(otherSSLExport, 0, 5);
whatstr = i18n("This button allows you to export the selected certificate"
" to a file of various formats.");
- QWhatsThis::add(otherSSLExport, whatstr);
+ TQWhatsThis::add(otherSSLExport, whatstr);
- otherSSLRemove = new QPushButton(i18n("&Remove"), tabOtherSSLCert);
- connect(otherSSLRemove, SIGNAL(clicked()), SLOT(slotRemoveCert()));
+ otherSSLRemove = new TQPushButton(i18n("&Remove"), tabOtherSSLCert);
+ connect(otherSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveCert()));
grid->addWidget(otherSSLRemove, 1, 5);
whatstr = i18n("This button removes the selected certificate"
" from the certificate cache.");
- QWhatsThis::add(otherSSLRemove, whatstr);
+ TQWhatsThis::add(otherSSLRemove, whatstr);
- otherSSLVerify = new QPushButton(i18n("&Verify"), tabOtherSSLCert);
- connect(otherSSLVerify, SIGNAL(clicked()), SLOT(slotVerifyCert()));
+ otherSSLVerify = new TQPushButton(i18n("&Verify"), tabOtherSSLCert);
+ connect(otherSSLVerify, TQT_SIGNAL(clicked()), TQT_SLOT(slotVerifyCert()));
grid->addWidget(otherSSLVerify, 2, 5);
whatstr = i18n("This button tests the selected certificate"
" for validity.");
- QWhatsThis::add(otherSSLVerify, whatstr);
+ TQWhatsThis::add(otherSSLVerify, whatstr);
otherSSLExport->setEnabled(false);
otherSSLVerify->setEnabled(false);
otherSSLRemove->setEnabled(false);
grid->addMultiCellWidget(new KSeparator(KSeparator::HLine, tabOtherSSLCert), 8, 8, 0, 5);
- oSubject = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, QString(QString::null));
- oIssuer = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, QString(QString::null));
+ oSubject = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, TQString(TQString::null));
+ oIssuer = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, TQString(TQString::null));
grid->addMultiCellWidget(oSubject, 9, 13, 0, 2);
grid->addMultiCellWidget(oIssuer, 9, 13, 3, 5);
whatstr = i18n("This is the information known about the owner of the certificate.");
- QWhatsThis::add(oSubject, whatstr);
+ TQWhatsThis::add(oSubject, whatstr);
whatstr = i18n("This is the information known about the issuer of the certificate.");
- QWhatsThis::add(oIssuer, whatstr);
+ TQWhatsThis::add(oIssuer, whatstr);
- fromLabel = new QLabel(i18n("Valid from:"), tabOtherSSLCert);
- untilLabel = new QLabel(i18n("Valid until:"), tabOtherSSLCert);
+ fromLabel = new TQLabel(i18n("Valid from:"), tabOtherSSLCert);
+ untilLabel = new TQLabel(i18n("Valid until:"), tabOtherSSLCert);
grid->addWidget(fromLabel, 14, 0);
grid->addWidget(untilLabel, 15, 0);
fromLabel->setEnabled(false);
untilLabel->setEnabled(false);
- validFrom = new QLabel(tabOtherSSLCert);
+ validFrom = new TQLabel(tabOtherSSLCert);
grid->addWidget(validFrom, 14, 1);
- validUntil = new QLabel(tabOtherSSLCert);
+ validUntil = new TQLabel(tabOtherSSLCert);
grid->addWidget(validUntil, 15, 1);
whatstr = i18n("The certificate is valid starting at this date.");
- QWhatsThis::add(validFrom, whatstr);
+ TQWhatsThis::add(validFrom, whatstr);
whatstr = i18n("The certificate is valid until this date.");
- QWhatsThis::add(validUntil, whatstr);
+ TQWhatsThis::add(validUntil, whatstr);
- cacheGroup = new QVButtonGroup(i18n("Cache"), tabOtherSSLCert);
- cachePerm = new QRadioButton(i18n("Permanentl&y"), cacheGroup);
- cacheUntil = new QRadioButton(i18n("&Until"), cacheGroup);
- untilDate = new KURLLabel(QString::null, QString::null, cacheGroup);
+ cacheGroup = new TQVButtonGroup(i18n("Cache"), tabOtherSSLCert);
+ cachePerm = new TQRadioButton(i18n("Permanentl&y"), cacheGroup);
+ cacheUntil = new TQRadioButton(i18n("&Until"), cacheGroup);
+ untilDate = new KURLLabel(TQString::null, TQString::null, cacheGroup);
cacheGroup->setEnabled(false);
grid->addMultiCellWidget(cacheGroup, 16, 19, 0, 2);
cachePerm->setEnabled(false);
cacheUntil->setEnabled(false);
untilDate->setEnabled(false);
- connect(cachePerm, SIGNAL(clicked()), SLOT(slotPermanent()));
- connect(cacheUntil, SIGNAL(clicked()), SLOT(slotUntil()));
- connect(untilDate, SIGNAL(leftClickedURL()), SLOT(slotDatePick()));
+ connect(cachePerm, TQT_SIGNAL(clicked()), TQT_SLOT(slotPermanent()));
+ connect(cacheUntil, TQT_SIGNAL(clicked()), TQT_SLOT(slotUntil()));
+ connect(untilDate, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotDatePick()));
whatstr = i18n("Select here to make the cache entry permanent.");
- QWhatsThis::add(cachePerm, whatstr);
+ TQWhatsThis::add(cachePerm, whatstr);
whatstr = i18n("Select here to make the cache entry temporary.");
- QWhatsThis::add(cacheUntil, whatstr);
+ TQWhatsThis::add(cacheUntil, whatstr);
whatstr = i18n("The date and time until the certificate cache entry should expire.");
- QWhatsThis::add(untilDate, whatstr);
+ TQWhatsThis::add(untilDate, whatstr);
- policyGroup = new QVButtonGroup(i18n("Policy"), tabOtherSSLCert);
- policyAccept = new QRadioButton(i18n("Accep&t"), policyGroup);
- policyReject = new QRadioButton(i18n("Re&ject"), policyGroup);
- policyPrompt = new QRadioButton(i18n("&Prompt"), policyGroup);
+ policyGroup = new TQVButtonGroup(i18n("Policy"), tabOtherSSLCert);
+ policyAccept = new TQRadioButton(i18n("Accep&t"), policyGroup);
+ policyReject = new TQRadioButton(i18n("Re&ject"), policyGroup);
+ policyPrompt = new TQRadioButton(i18n("&Prompt"), policyGroup);
policyGroup->setEnabled(false);
grid->addMultiCellWidget(policyGroup, 16, 19, 3, 5);
- connect(policyGroup, SIGNAL(clicked(int)), SLOT(slotPolicyChanged(int)));
+ connect(policyGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPolicyChanged(int)));
whatstr = i18n("Select this to always accept this certificate.");
- QWhatsThis::add(policyAccept, whatstr);
+ TQWhatsThis::add(policyAccept, whatstr);
whatstr = i18n("Select this to always reject this certificate.");
- QWhatsThis::add(policyReject, whatstr);
+ TQWhatsThis::add(policyReject, whatstr);
whatstr = i18n("Select this if you wish to be prompted for action when receiving this certificate.");
- QWhatsThis::add(policyPrompt, whatstr);
- grid->addWidget(new QLabel(i18n("MD5 digest:"), tabOtherSSLCert), 20, 0);
- pHash = new QLabel(tabOtherSSLCert);
+ TQWhatsThis::add(policyPrompt, whatstr);
+ grid->addWidget(new TQLabel(i18n("MD5 digest:"), tabOtherSSLCert), 20, 0);
+ pHash = new TQLabel(tabOtherSSLCert);
grid->addWidget(pHash, 20, 1);
whatstr = i18n("A hash of the certificate used to identify it quickly.");
- QWhatsThis::add(pHash, whatstr);
+ TQWhatsThis::add(pHash, whatstr);
#else
- nossllabel = new QLabel(i18n("SSL certificates cannot be managed"
+ nossllabel = new TQLabel(i18n("SSL certificates cannot be managed"
" because this module was not linked"
" with OpenSSL."), tabOtherSSLCert);
grid->addMultiCellWidget(nossllabel, 1, 1, 0, 1);
@@ -715,61 +715,61 @@ QString whatstr;
///////////////////////////////////////////////////////////////////////////
// SIXTH TAB
///////////////////////////////////////////////////////////////////////////
- tabSSLCA = new QFrame(this);
+ tabSSLCA = new TQFrame(this);
#ifdef HAVE_SSL
- grid = new QGridLayout(tabSSLCA, 11, 8, KDialog::marginHint(), KDialog::spacingHint());
+ grid = new TQGridLayout(tabSSLCA, 11, 8, KDialog::marginHint(), KDialog::spacingHint());
- caList = new QListView(tabSSLCA);
+ caList = new TQListView(tabSSLCA);
caList->setAllColumnsShowFocus(true);
whatstr = i18n("This list box shows which certificate authorities KDE"
" knows about. You can easily manage them from here.");
- QWhatsThis::add(caList, whatstr);
+ TQWhatsThis::add(caList, whatstr);
grid->addMultiCellWidget(caList, 0, 3, 0, 6);
caList->addColumn(i18n("Organization"));
caList->addColumn(i18n("Organizational Unit"));
caList->addColumn(i18n("Common Name"));
- connect(caList, SIGNAL(selectionChanged()), SLOT(slotCAItemChanged()));
+ connect(caList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotCAItemChanged()));
- caSSLImport = new QPushButton(i18n("I&mport..."), tabSSLCA);
- connect(caSSLImport, SIGNAL(clicked()), SLOT(slotCAImport()));
+ caSSLImport = new TQPushButton(i18n("I&mport..."), tabSSLCA);
+ connect(caSSLImport, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAImport()));
grid->addWidget(caSSLImport, 0, 7);
- caSSLRemove = new QPushButton(i18n("&Remove"), tabSSLCA);
- connect(caSSLRemove, SIGNAL(clicked()), SLOT(slotCARemove()));
+ caSSLRemove = new TQPushButton(i18n("&Remove"), tabSSLCA);
+ connect(caSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotCARemove()));
grid->addWidget(caSSLRemove, 1, 7);
caSSLRemove->setEnabled(false);
- caSSLRestore = new QPushButton(i18n("Res&tore"), tabSSLCA);
- connect(caSSLRestore, SIGNAL(clicked()), SLOT(slotCARestore()));
+ caSSLRestore = new TQPushButton(i18n("Res&tore"), tabSSLCA);
+ connect(caSSLRestore, TQT_SIGNAL(clicked()), TQT_SLOT(slotCARestore()));
grid->addWidget(caSSLRestore, 2, 7);
- caSubject = KSSLInfoDlg::certInfoWidget(tabSSLCA, QString(QString::null));
- caIssuer = KSSLInfoDlg::certInfoWidget(tabSSLCA, QString(QString::null));
+ caSubject = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString::null));
+ caIssuer = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString::null));
grid->addMultiCellWidget(caSubject, 4, 6, 0, 3);
grid->addMultiCellWidget(caIssuer, 4, 6, 4, 7);
// Accept for Web Site Signing, Email Signing, Code Signing
- caSite = new QCheckBox(i18n("Accept for site signing"), tabSSLCA);
- caEmail = new QCheckBox(i18n("Accept for email signing"), tabSSLCA);
- caCode = new QCheckBox(i18n("Accept for code signing"), tabSSLCA);
+ caSite = new TQCheckBox(i18n("Accept for site signing"), tabSSLCA);
+ caEmail = new TQCheckBox(i18n("Accept for email signing"), tabSSLCA);
+ caCode = new TQCheckBox(i18n("Accept for code signing"), tabSSLCA);
grid->addMultiCellWidget(caSite, 7, 7, 0, 3);
- connect(caSite, SIGNAL(clicked()), SLOT(slotCAChecked()));
+ connect(caSite, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked()));
grid->addMultiCellWidget(caEmail, 8, 8, 0, 3);
- connect(caEmail, SIGNAL(clicked()), SLOT(slotCAChecked()));
+ connect(caEmail, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked()));
grid->addMultiCellWidget(caCode, 9, 9, 0, 3);
- connect(caCode, SIGNAL(clicked()), SLOT(slotCAChecked()));
+ connect(caCode, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked()));
caSite->setEnabled(false);
caEmail->setEnabled(false);
caCode->setEnabled(false);
- grid->addWidget(new QLabel(i18n("MD5 digest:"), tabSSLCA), 10, 0);
- cHash = new QLabel(tabSSLCA);
+ grid->addWidget(new TQLabel(i18n("MD5 digest:"), tabSSLCA), 10, 0);
+ cHash = new TQLabel(tabSSLCA);
grid->addWidget(cHash, 10, 1);
whatstr = i18n("A hash of the certificate used to identify it quickly.");
- QWhatsThis::add(cHash, whatstr);
+ TQWhatsThis::add(cHash, whatstr);
#else
- nossllabel = new QLabel(i18n("SSL certificates cannot be managed"
+ nossllabel = new TQLabel(i18n("SSL certificates cannot be managed"
" because this module was not linked"
" with OpenSSL."), tabSSLCA);
grid->addMultiCellWidget(nossllabel, 1, 1, 0, 1);
@@ -780,46 +780,46 @@ QString whatstr;
///////////////////////////////////////////////////////////////////////////
// SEVENTH TAB
///////////////////////////////////////////////////////////////////////////
- tabSSLCOpts = new QFrame(this);
+ tabSSLCOpts = new TQFrame(this);
#ifdef HAVE_SSL
- grid = new QGridLayout(tabSSLCOpts, 9, 4, KDialog::marginHint(), KDialog::spacingHint());
- mWarnSelfSigned = new QCheckBox(i18n("Warn on &self-signed certificates or unknown CA's"), tabSSLCOpts);
- connect(mWarnSelfSigned, SIGNAL(clicked()), SLOT(configChanged()));
- mWarnExpired = new QCheckBox(i18n("Warn on &expired certificates"), tabSSLCOpts);
- connect(mWarnExpired, SIGNAL(clicked()), SLOT(configChanged()));
- mWarnRevoked = new QCheckBox(i18n("Warn on re&voked certificates"), tabSSLCOpts);
- connect(mWarnRevoked, SIGNAL(clicked()), SLOT(configChanged()));
+ grid = new TQGridLayout(tabSSLCOpts, 9, 4, KDialog::marginHint(), KDialog::spacingHint());
+ mWarnSelfSigned = new TQCheckBox(i18n("Warn on &self-signed certificates or unknown CA's"), tabSSLCOpts);
+ connect(mWarnSelfSigned, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+ mWarnExpired = new TQCheckBox(i18n("Warn on &expired certificates"), tabSSLCOpts);
+ connect(mWarnExpired, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+ mWarnRevoked = new TQCheckBox(i18n("Warn on re&voked certificates"), tabSSLCOpts);
+ connect(mWarnRevoked, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
grid->addMultiCellWidget(mWarnSelfSigned, 0, 0, 0, 3);
grid->addMultiCellWidget(mWarnExpired, 1, 1, 0, 3);
grid->addMultiCellWidget(mWarnRevoked, 2, 2, 0, 3);
- macCert = new QLineEdit(tabSSLCOpts);
+ macCert = new TQLineEdit(tabSSLCOpts);
grid->addMultiCellWidget(macCert, 4, 4, 0, 2);
- macBox = new QListBox(tabSSLCOpts);
+ macBox = new TQListBox(tabSSLCOpts);
whatstr = i18n("This list box shows which sites you have decided to accept"
" a certificate from even though the certificate might fail"
" the validation procedure.");
- QWhatsThis::add(macBox, whatstr);
- caSSLBox->setSelectionMode(QListBox::Single);
- caSSLBox->setColumnMode(QListBox::FixedNumber);
+ TQWhatsThis::add(macBox, whatstr);
+ caSSLBox->setSelectionMode(TQListBox::Single);
+ caSSLBox->setColumnMode(TQListBox::FixedNumber);
grid->addMultiCellWidget(macBox, 5, 8, 0, 2);
- macAdd = new QPushButton(i18n("&Add"), tabSSLCOpts);
- //connect(macAdd, SIGNAL(), SLOT());
+ macAdd = new TQPushButton(i18n("&Add"), tabSSLCOpts);
+ //connect(macAdd, TQT_SIGNAL(), TQT_SLOT());
grid->addWidget(macAdd, 4, 3);
- macRemove = new QPushButton(i18n("&Remove"), tabSSLCOpts);
- //connect(macRemove, SIGNAL(), SLOT());
+ macRemove = new TQPushButton(i18n("&Remove"), tabSSLCOpts);
+ //connect(macRemove, TQT_SIGNAL(), TQT_SLOT());
grid->addWidget(macRemove, 5, 3);
macClear = new KPushButton(KGuiItem::clear(), tabSSLCOpts);
- //connect(macAdd, SIGNAL(), SLOT());
+ //connect(macAdd, TQT_SIGNAL(), TQT_SLOT());
grid->addWidget(macClear, 6, 3);
#else
- nossllabel = new QLabel(i18n("These options are not configurable"
+ nossllabel = new TQLabel(i18n("These options are not configurable"
" because this module was not linked"
" with OpenSSL."), tabSSLCOpts);
grid->addMultiCellWidget(nossllabel, 1, 1, 0, 1);
@@ -932,13 +932,13 @@ void KCryptoConfig::load( bool useDefaults )
SSLv2Box->setEnabled( mUseSSLv2->isChecked() );
SSLv3Box->setEnabled( mUseSSLv3->isChecked() );
- QStringList groups = policies->groupList();
+ TQStringList groups = policies->groupList();
otherSSLBox->clear();
- for (QStringList::Iterator i = groups.begin(); i != groups.end(); ++i) {
+ for (TQStringList::Iterator i = groups.begin(); i != groups.end(); ++i) {
if ((*i).isEmpty() || *i == "<default>" || *i == "General") continue;
policies->setGroup(*i);
- KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", QString::null).local8Bit());
+ KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit());
if (cert) {
new OtherCertItem(otherSSLBox, cert->getSubject(), *i,
policies->readBoolEntry("Permanent", true),
@@ -951,20 +951,20 @@ void KCryptoConfig::load( bool useDefaults )
groups = pcerts->groupList();
yourSSLBox->clear();
- for (QStringList::Iterator i = groups.begin(); i != groups.end(); ++i) {
+ for (TQStringList::Iterator i = groups.begin(); i != groups.end(); ++i) {
if ((*i).isEmpty() || *i == "<default>") continue;
pcerts->setGroup(*i);
YourCertItem *j = new YourCertItem(yourSSLBox,
pcerts->readEntry("PKCS12Base64"),
pcerts->readEntry("Password"),
*i, this );
- j->setPassCache(QString::null);
+ j->setPassCache(TQString::null);
}
setAuthCertLists();
config->setGroup("Auth");
- QString whichAuth = config->readEntry("AuthMethod", "none");
+ TQString whichAuth = config->readEntry("AuthMethod", "none");
if (whichAuth == "send")
defCertBG->setButton(defCertBG->id(defSend));
else if (whichAuth == "prompt")
@@ -972,7 +972,7 @@ void KCryptoConfig::load( bool useDefaults )
else
defCertBG->setButton(defCertBG->id(defDont));
- QString whichCert = config->readEntry("DefaultCert");
+ TQString whichCert = config->readEntry("DefaultCert");
defCertBox->setCurrentItem(0);
for (int i = 0; i < defCertBox->count(); i++) {
if (defCertBox->text(i) == whichCert) {
@@ -982,7 +982,7 @@ void KCryptoConfig::load( bool useDefaults )
}
hostAuthList->clear();
groups = authcfg->groupList();
- for (QStringList::Iterator i = groups.begin();
+ for (TQStringList::Iterator i = groups.begin();
i != groups.end();
++i) {
if ((*i).isEmpty() || *i == "<default>") continue;
@@ -1003,7 +1003,7 @@ void KCryptoConfig::load( bool useDefaults )
groups = _signers->list();
KConfig sigcfg("ksslcalist", true, false);
caList->clear();
- for (QStringList::Iterator i = groups.begin();
+ for (TQStringList::Iterator i = groups.begin();
i != groups.end();
++i) {
if ((*i).isEmpty() || *i == "<default>") continue;
@@ -1109,7 +1109,7 @@ void KCryptoConfig::save()
// SSL Policies code
for (OtherCertItem *x = otherCertDelList.first(); x != 0; x = otherCertDelList.next()) {
KSSLX509Map cert(x->configName());
- QString thisCN = cert.getValue("CN");
+ TQString thisCN = cert.getValue("CN");
_cc.removeByCN(thisCN);
otherCertDelList.remove(x);
}
@@ -1119,8 +1119,8 @@ void KCryptoConfig::save()
x;
x = static_cast<OtherCertItem *>(x->nextSibling())) {
KSSLX509Map cert(x->configName());
- QString thisCN = cert.getValue("CN");
- QDateTime expires = x->getExpires();
+ TQString thisCN = cert.getValue("CN");
+ TQDateTime expires = x->getExpires();
_cc.modifyByCN(thisCN, (KSSLCertificateCache::KSSLCertificatePolicy)x->getPolicy(), x->isPermanent(), expires);
}
@@ -1172,7 +1172,7 @@ void KCryptoConfig::save()
config->setGroup("Auth");
- QString whichAuth = config->readEntry("AuthMethod", "none");
+ TQString whichAuth = config->readEntry("AuthMethod", "none");
if (defCertBG->selected() == defSend)
config->writeEntry("AuthMethod", "send");
else if (defCertBG->selected() == defPrompt)
@@ -1181,7 +1181,7 @@ void KCryptoConfig::save()
config->writeEntry("AuthMethod", "none");
if (defCertBox->currentItem() == 0)
- config->writeEntry("DefaultCert", QString::null);
+ config->writeEntry("DefaultCert", TQString::null);
else config->writeEntry("DefaultCert", defCertBox->currentText());
for (HostAuthItem *x = authDelList.first(); x != 0; x = authDelList.next()) {
@@ -1215,9 +1215,9 @@ void KCryptoConfig::save()
authcfg->sync();
// insure proper permissions -- contains sensitive data
- QString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults"));
+ TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults"));
if (!cfgName.isEmpty())
- ::chmod(QFile::encodeName(cfgName), 0600);
+ ::chmod(TQFile::encodeName(cfgName), 0600);
emit changed(false);
}
@@ -1331,7 +1331,7 @@ void KCryptoConfig::slotExportCert() {
OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem());
if (x) {
policies->setGroup(x->getMD5());
- KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", QString::null).local8Bit());
+ KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit());
if (cert) {
KCertExport kce;
kce.setCertificate(cert);
@@ -1345,10 +1345,10 @@ OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem());
void KCryptoConfig::slotRemoveCert() {
-QListViewItem *act = otherSSLBox->selectedItem();
+TQListViewItem *act = otherSSLBox->selectedItem();
OtherCertItem *x = static_cast<OtherCertItem *>(act);
if (x) {
- QListViewItem *next = act->itemBelow();
+ TQListViewItem *next = act->itemBelow();
if (!next) next = act->itemAbove();
otherSSLBox->takeItem(x);
otherCertDelList.append(x);
@@ -1364,7 +1364,7 @@ OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem());
if (!x) return;
policies->setGroup(x->getMD5());
- KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", QString::null).local8Bit());
+ KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit());
if (!cert) {
KMessageBox::error(this, i18n("Error obtaining the certificate."), i18n("SSL"));
@@ -1445,7 +1445,7 @@ OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem());
if (!x || !untilDate->isEnabled()) return;
-QDateTime qdt = x->getExpires();
+TQDateTime qdt = x->getExpires();
kdtd.setDateTime(qdt);
int rc = kdtd.exec();
@@ -1460,7 +1460,7 @@ QDateTime qdt = x->getExpires();
void KCryptoConfig::slotOtherCertSelect() {
OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem());
-QString iss = QString::null;
+TQString iss = TQString::null;
if (x) {
otherSSLExport->setEnabled(true);
otherSSLVerify->setEnabled(true);
@@ -1474,37 +1474,37 @@ QString iss = QString::null;
cacheUntil->setEnabled(true);
policies->setGroup(x->getMD5());
- KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", QString::null).local8Bit());
+ KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit());
if (cert) {
- QPalette cspl;
+ TQPalette cspl;
iss = cert->getIssuer();
cspl = validFrom->palette();
- if (QDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
- cspl.setColor(QColorGroup::Foreground, QColor(196,33,21));
+ if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+ cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
- cspl.setColor(QColorGroup::Foreground, QColor(42,153,59));
+ cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
}
validFrom->setPalette(cspl);
cspl = validUntil->palette();
- if (QDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
- cspl.setColor(QColorGroup::Foreground, QColor(196,33,21));
+ if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+ cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
- cspl.setColor(QColorGroup::Foreground, QColor(42,153,59));
+ cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
}
validUntil->setPalette(cspl);
validFrom->setText(cert->getNotBefore());
validUntil->setText(cert->getNotAfter());
untilDate->setText(x ? KGlobal::locale()->formatDateTime(x->getExpires())
- : KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(Qt::UTC)));
+ : KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC)));
untilDate->setEnabled(x && !x->isPermanent());
pHash->setText(cert->getMD5DigestText());
delete cert;
} else {
- validFrom->setText(QString::null);
- validUntil->setText(QString::null);
+ validFrom->setText(TQString::null);
+ validUntil->setText(TQString::null);
pHash->clear();
}
@@ -1538,15 +1538,15 @@ QString iss = QString::null;
policyPrompt->setChecked(false);
cachePerm->setEnabled(false);
cacheUntil->setEnabled(false);
- validFrom->setText(QString::null);
- validUntil->setText(QString::null);
- untilDate->setText(QString::null);
+ validFrom->setText(TQString::null);
+ validUntil->setText(TQString::null);
+ untilDate->setText(TQString::null);
untilDate->setEnabled(false);
pHash->clear();
}
- oSubject->setValues(x ? x->getSub() : QString(QString::null));
+ oSubject->setValues(x ? x->getSub() : TQString(TQString::null));
oIssuer->setValues(iss);
}
@@ -1554,19 +1554,19 @@ QString iss = QString::null;
void KCryptoConfig::slotYourImport() {
- QString certFile = KFileDialog::getOpenFileName(QString::null, "application/x-pkcs12");
+ TQString certFile = KFileDialog::getOpenFileName(TQString::null, "application/x-pkcs12");
if (certFile.isEmpty())
return;
#ifdef HAVE_SSL
KSSLPKCS12 *cert = NULL;
-QCString pass;
+TQCString pass;
TryImportPassAgain:
int rc = KPasswordDialog::getPassword(pass, i18n("Certificate password"));
if (rc != KPasswordDialog::Accepted) return;
- cert = KSSLPKCS12::loadCertFile(certFile, QString(pass));
+ cert = KSSLPKCS12::loadCertFile(certFile, TQString(pass));
if (!cert) {
rc = KMessageBox::warningYesNo(this, i18n("The certificate file could not be loaded. Try a different password?"), i18n("SSL"),i18n("Try"),i18n("Do Not Try"));
@@ -1581,7 +1581,7 @@ TryImportPassAgain:
// FIXME: prompt if the user wants the password stored along with the
// certificate
- QString name = cert->getCertificate()->getSubject();
+ TQString name = cert->getCertificate()->getSubject();
for (YourCertItem *i =
static_cast<YourCertItem *>(yourSSLBox->firstChild());
i;
@@ -1599,7 +1599,7 @@ TryImportPassAgain:
new YourCertItem(yourSSLBox,
cert->toString(),
- QString::null, // the password - don't store it yet!
+ TQString::null, // the password - don't store it yet!
name,
this );
@@ -1620,8 +1620,8 @@ YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem());
if (!pkcs)
pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPassCache());
if (!pkcs) {
- QString pprompt = i18n("Enter the certificate password:");
- QCString oldpass;
+ TQString pprompt = i18n("Enter the certificate password:");
+ TQCString oldpass;
do {
int i = KPasswordDialog::getPassword(oldpass, pprompt);
if (i != KPasswordDialog::Accepted) return;
@@ -1633,7 +1633,7 @@ YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem());
}
// For now, we will only export to PKCS#12
- QString certFile = KFileDialog::getSaveFileName(QString::null,
+ TQString certFile = KFileDialog::getSaveFileName(TQString::null,
"application/x-pkcs12");
if (certFile.isEmpty())
return;
@@ -1645,15 +1645,15 @@ YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem());
void KCryptoConfig::slotYourVerify() {
YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem());
-QString iss;
+TQString iss;
if (!x) return;
KSSLPKCS12 *pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPass());
if (!pkcs)
pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPassCache());
if (!pkcs) {
- QString pprompt = i18n("Enter the certificate password:");
- QCString oldpass;
+ TQString pprompt = i18n("Enter the certificate password:");
+ TQCString oldpass;
do {
int i = KPasswordDialog::getPassword(oldpass, pprompt);
if (i != KPasswordDialog::Accepted) return;
@@ -1693,15 +1693,15 @@ YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem());
void KCryptoConfig::slotYourUnlock() {
YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem());
-QString iss;
+TQString iss;
if (!x || !yourSSLUnlock->isEnabled()) return;
KSSLPKCS12 *pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPass());
if (!pkcs)
pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPassCache());
if (!pkcs) {
- QString pprompt = i18n("Enter the certificate password:");
- QCString oldpass;
+ TQString pprompt = i18n("Enter the certificate password:");
+ TQCString oldpass;
do {
int i = KPasswordDialog::getPassword(oldpass, pprompt);
if (i != KPasswordDialog::Accepted) return;
@@ -1713,23 +1713,23 @@ QString iss;
// update the info
iss = pkcs->getCertificate()->getIssuer();
- ySubject->setValues(x ? x->getName() : QString(QString::null));
+ ySubject->setValues(x ? x->getName() : TQString(TQString::null));
yIssuer->setValues(iss);
- QPalette cspl;
+ TQPalette cspl;
KSSLCertificate *cert = pkcs->getCertificate();
cspl = yValidFrom->palette();
- if (QDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
- cspl.setColor(QColorGroup::Foreground, QColor(196,33,21));
+ if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+ cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
- cspl.setColor(QColorGroup::Foreground, QColor(42,153,59));
+ cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
}
yValidFrom->setPalette(cspl);
cspl = yValidUntil->palette();
- if (QDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
- cspl.setColor(QColorGroup::Foreground, QColor(196,33,21));
+ if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+ cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
- cspl.setColor(QColorGroup::Foreground, QColor(42,153,59));
+ cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
}
yValidUntil->setPalette(cspl);
@@ -1743,7 +1743,7 @@ QString iss;
void KCryptoConfig::slotYourCertSelect() {
YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem());
-QString iss;
+TQString iss;
yourSSLExport->setEnabled(x != NULL);
yourSSLPass->setEnabled(x != NULL);
@@ -1754,22 +1754,22 @@ QString iss;
if (x) {
KSSLPKCS12 *pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPass());
if (pkcs) {
- QPalette cspl;
+ TQPalette cspl;
KSSLCertificate *cert = pkcs->getCertificate();
iss = cert->getIssuer();
cspl = yValidFrom->palette();
- if (QDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
- cspl.setColor(QColorGroup::Foreground, QColor(196,33,21));
+ if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+ cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
- cspl.setColor(QColorGroup::Foreground, QColor(42,153,59));
+ cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
}
yValidFrom->setPalette(cspl);
cspl = yValidUntil->palette();
- if (QDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
- cspl.setColor(QColorGroup::Foreground, QColor(196,33,21));
+ if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+ cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
- cspl.setColor(QColorGroup::Foreground, QColor(42,153,59));
+ cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
}
yValidUntil->setPalette(cspl);
@@ -1785,21 +1785,21 @@ QString iss;
yHash->clear();
}
- ySubject->setValues(x ? x->getName() : QString(QString::null));
+ ySubject->setValues(x ? x->getName() : TQString(TQString::null));
yIssuer->setValues(iss);
}
void KCryptoConfig::slotYourPass() {
YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem());
-QCString oldpass = "";
+TQCString oldpass = "";
if (!x) return;
KSSLPKCS12 *pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPass());
if (!pkcs)
pkcs = KSSLPKCS12::fromString(x->getPKCS(), x->getPassCache());
if (!pkcs) {
- QString pprompt = i18n("Enter the OLD password for the certificate:");
+ TQString pprompt = i18n("Enter the OLD password for the certificate:");
do {
int i = KPasswordDialog::getPassword(oldpass, pprompt);
if (i != KPasswordDialog::Accepted) break;
@@ -1817,8 +1817,8 @@ QCString oldpass = "";
int i = kpd->exec();
if (i == KPasswordDialog::Accepted) {
- QCString pass = kpd->password();
- pkcs->changePassword(QString(oldpass), QString(pass));
+ TQCString pass = kpd->password();
+ pkcs->changePassword(TQString(oldpass), TQString(pass));
x->setPKCS(pkcs->toString());
x->setPassCache(pass);
configChanged();
@@ -1830,7 +1830,7 @@ QCString oldpass = "";
void KCryptoConfig::slotCAImport() {
- QString certFile = KFileDialog::getOpenFileName(QString::null, "application/x-x509-ca-cert");
+ TQString certFile = KFileDialog::getOpenFileName(TQString::null, "application/x-x509-ca-cert");
if (certFile.isEmpty())
return;
@@ -1863,7 +1863,7 @@ void KCryptoConfig::slotCAImport() {
// Only import CA's
if (!x || !x->x509V3Extensions().certTypeCA()) {
if (x) {
- QString emsg = x->getSubject() + ":\n" +
+ TQString emsg = x->getSubject() + ":\n" +
i18n("This is not a signer certificate.");
KMessageBox::error(this,
emsg,
@@ -1873,7 +1873,7 @@ void KCryptoConfig::slotCAImport() {
continue;
}
- QString name = x->getSubject();
+ TQString name = x->getSubject();
// search for dups
for (CAItem *m = static_cast<CAItem *>(caList->firstChild());
@@ -1883,7 +1883,7 @@ void KCryptoConfig::slotCAImport() {
KSSLCertificate *y = KSSLCertificate::fromString(m->getCert().local8Bit());
if (!y) continue;
if (*x == *y) {
- QString emsg = name + ":\n" +
+ TQString emsg = name + ":\n" +
i18n("You already have this signer certificate installed.");
KMessageBox::error(this,
emsg,
@@ -1911,9 +1911,9 @@ void KCryptoConfig::slotCAImport() {
// Can the PEM code be wiped out now?
} else { // try to load it manually as a single X.509 DER encoded
// ASSUMPTION: we only read one certificate in this code
- QFile qf(certFile);
- QString name;
- QString certtext;
+ TQFile qf(certFile);
+ TQString name;
+ TQString certtext;
KSSLCertificate *x;
qf.open(IO_ReadOnly);
qf.readLine(certtext, qf.size());
@@ -1923,16 +1923,16 @@ void KCryptoConfig::slotCAImport() {
if (certtext.contains("-----BEGIN CERTIFICATE-----")) {
qf.reset();
- certtext = QString::null;
+ certtext = TQString::null;
while (!qf.atEnd()) {
- QString xx;
+ TQString xx;
qf.readLine(xx, qf.size());
certtext += xx;
}
- certtext = certtext.replace("-----BEGIN CERTIFICATE-----", QString::null);
- certtext = certtext.replace("-----END CERTIFICATE-----", QString::null);
+ certtext = certtext.replace("-----BEGIN CERTIFICATE-----", TQString::null);
+ certtext = certtext.replace("-----END CERTIFICATE-----", TQString::null);
certtext = certtext.stripWhiteSpace();
- certtext = certtext.replace("\n", QString::null);
+ certtext = certtext.replace("\n", TQString::null);
} else {
// Must [could?] be DER
qf.close();
@@ -1940,7 +1940,7 @@ void KCryptoConfig::slotCAImport() {
char *cr;
cr = new char[qf.size()+1];
qf.readBlock(cr, qf.size());
- QByteArray qba;
+ TQByteArray qba;
qba.duplicate(cr, qf.size());
certtext = KCodecs::base64Encode(qba);
delete [] cr;
@@ -2001,9 +2001,9 @@ void KCryptoConfig::slotCAImport() {
offerImportToKMail( certFile );
}
-void KCryptoConfig::offerImportToKMail( const QString& certFile )
+void KCryptoConfig::offerImportToKMail( const TQString& certFile )
{
- if ( KMessageBox::questionYesNo( this, i18n( "Do you want to make this certificate available to KMail as well?" ), QString::null, i18n("Make Available"), i18n("Do Not Make Available") ) == KMessageBox::Yes ) {
+ if ( KMessageBox::questionYesNo( this, i18n( "Do you want to make this certificate available to KMail as well?" ), TQString::null, i18n("Make Available"), i18n("Do Not Make Available") ) == KMessageBox::Yes ) {
KProcess proc;
proc << "kleopatra";
proc << "--import-certificate";
@@ -2034,21 +2034,21 @@ void KCryptoConfig::slotCARestore() {
// For now, we just rm the existing file and rebuild
- QString path = KGlobal::dirs()->saveLocation("config");
+ TQString path = KGlobal::dirs()->saveLocation("config");
path += "/ksslcalist";
- QFile::remove(path);
+ TQFile::remove(path);
// Remove all our old work and rebuild the GUI/List
caDelList.clear();
caList->clear();
- QStringList groups = _signers->list();
+ TQStringList groups = _signers->list();
KConfig sigcfg("ksslcalist", true, false);
- for (QStringList::Iterator i = groups.begin();
+ for (TQStringList::Iterator i = groups.begin();
i != groups.end();
++i) {
if ((*i).isEmpty() || *i == "<default>") continue;
@@ -2057,7 +2057,7 @@ void KCryptoConfig::slotCARestore() {
if (!sigcfg.hasKey("x509")) continue;
new CAItem(caList,
(*i),
- sigcfg.readEntry("x509", QString::null),
+ sigcfg.readEntry("x509", TQString::null),
sigcfg.readBoolEntry("site", false),
sigcfg.readBoolEntry("email", false),
sigcfg.readBoolEntry("code", false),
@@ -2073,10 +2073,10 @@ void KCryptoConfig::slotCAItemChanged() {
CAItem *x = static_cast<CAItem *>(caList->selectedItem());
if (x) {
caSSLRemove->setEnabled(true);
- caSubject->setValues(x ? x->getName() : QString(QString::null));
+ caSubject->setValues(x ? x->getName() : TQString(TQString::null));
KSSLCertificate *cert = KSSLCertificate::fromString(x->getCert().local8Bit());
if (!cert) {
- caIssuer->setValues(QString(QString::null));
+ caIssuer->setValues(TQString(TQString::null));
caSite->setEnabled(false);
caEmail->setEnabled(false);
caCode->setEnabled(false);
@@ -2100,8 +2100,8 @@ CAItem *x = static_cast<CAItem *>(caList->selectedItem());
caSite->setEnabled(false);
caEmail->setEnabled(false);
caCode->setEnabled(false);
- caSubject->setValues(QString(QString::null));
- caIssuer->setValues(QString(QString::null));
+ caSubject->setValues(TQString(TQString::null));
+ caIssuer->setValues(TQString(TQString::null));
cHash->clear();
}
}
@@ -2122,8 +2122,8 @@ CAItem *x = static_cast<CAItem *>(caList->selectedItem());
void KCryptoConfig::slotNewHostAuth() {
HostAuthItem *j = new HostAuthItem(hostAuthList,
- QString::null,
- QString::null,
+ TQString::null,
+ TQString::null,
this );
j->setAction(KSSLCertificateHome::AuthSend);
hostAuthList->setSelected(j, true);
@@ -2140,11 +2140,11 @@ void KCryptoConfig::slotNewHostAuth() {
void KCryptoConfig::slotRemoveHostAuth() {
-QListViewItem *act = hostAuthList->selectedItem();
+TQListViewItem *act = hostAuthList->selectedItem();
HostAuthItem *x = static_cast<HostAuthItem *>(act);
if (x) {
- QListViewItem *next = act->itemBelow();
+ TQListViewItem *next = act->itemBelow();
if (!next) next = act->itemAbove();
hostAuthList->takeItem(x);
authDelList.append(x);
@@ -2187,7 +2187,7 @@ if (x) {
___lehack = false;
hostCertBox->setCurrentItem(0);
- QString theCert = x->getCertName();
+ TQString theCert = x->getCertName();
for (int i = 0; i < hostCertBox->count(); i++) {
if (hostCertBox->text(i) == theCert) {
hostCertBox->setCurrentItem(i);
@@ -2204,7 +2204,7 @@ if (x) {
}
-void KCryptoConfig::slotAuthText(const QString &t) {
+void KCryptoConfig::slotAuthText(const TQString &t) {
if (___lehack) return;
HostAuthItem *x = static_cast<HostAuthItem *>(hostAuthList->selectedItem());
@@ -2241,7 +2241,7 @@ HostAuthItem *x = static_cast<HostAuthItem *>(hostAuthList->selectedItem());
if (x) {
if (hostCertBox->currentItem() == 0)
- x->setCertName(QString::null);
+ x->setCertName(TQString::null);
else x->setCertName(hostCertBox->currentText());
configChanged();
}
@@ -2297,7 +2297,7 @@ void KCryptoConfig::slotUseEFile() {
// encompassed in a separate module quite nicely.
void KCryptoConfig::slotGeneratePersonal() {
#if 0
- QStringList qslCertTypes;
+ TQStringList qslCertTypes;
qslCertTypes << i18n("Personal SSL")
<< i18n("Server SSL")
@@ -2342,7 +2342,7 @@ SSL_METHOD *meth;
if (!sc)
break;
// Leak of sc*?
- QString scn(sc->name);
+ TQString scn(sc->name);
if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) {
continue;
}
@@ -2370,7 +2370,7 @@ SSL_METHOD *meth;
if (!sc)
break;
// Leak of sc*?
- QString scn(sc->name);
+ TQString scn(sc->name);
if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) {
continue;
}
@@ -2388,7 +2388,7 @@ return true;
void KCryptoConfig::setAuthCertLists() {
-QString oldDef, oldHost;
+TQString oldDef, oldHost;
bool noneDef, noneHost;
// get the old setting
@@ -2400,7 +2400,7 @@ bool noneDef, noneHost;
// repopulate
defCertBox->clear();
hostCertBox->clear();
- QStringList defCertStrList; // = KSSLCertificateHome::getCertificateList();
+ TQStringList defCertStrList; // = KSSLCertificateHome::getCertificateList();
defCertStrList.append(i18n("None"));
for (YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->firstChild());
x;
@@ -2441,7 +2441,7 @@ bool noneDef, noneHost;
static_cast<HostAuthItem *>(hostAuthList->firstChild());
x;
x = static_cast<HostAuthItem *>(x->nextSibling())) {
- QString newValue = QString::null;
+ TQString newValue = TQString::null;
for (int i = 1; i < hostCertBox->count(); i++) {
if (hostCertBox->text(i) == x->getCertName()) {
newValue = x->getCertName();
diff --git a/kcontrol/crypto/crypto.h b/kcontrol/crypto/crypto.h
index 4d335570a..b9d856ceb 100644
--- a/kcontrol/crypto/crypto.h
+++ b/kcontrol/crypto/crypto.h
@@ -25,13 +25,13 @@
#include <config.h>
#endif
-#include <qcheckbox.h>
-#include <qdatetime.h>
-#include <qlineedit.h>
-#include <qlistview.h>
-#include <qptrlist.h>
-#include <qtabwidget.h>
-#include <qvbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqdatetime.h>
+#include <tqlineedit.h>
+#include <tqlistview.h>
+#include <tqptrlist.h>
+#include <tqtabwidget.h>
+#include <tqvbuttongroup.h>
#include <kcmodule.h>
#include <ksimpleconfig.h>
@@ -50,23 +50,23 @@ class KURLRequester;
class CipherItem : public QCheckListItem
{
public:
- CipherItem( QListView *view, const QString& cipher, int bits, int maxBits,
+ CipherItem( TQListView *view, const TQString& cipher, int bits, int maxBits,
KCryptoConfig *module );
~CipherItem() {}
- void setCipher( const QString& cipher ) { m_cipher = cipher; }
- const QString& cipher() const { return m_cipher; }
+ void setCipher( const TQString& cipher ) { m_cipher = cipher; }
+ const TQString& cipher() const { return m_cipher; }
void setBits( int bits ) { m_bits = bits; }
int bits() const { return m_bits; }
- QString configName() const;
+ TQString configName() const;
protected:
virtual void stateChange( bool );
private:
int m_bits;
- QString m_cipher;
+ TQString m_cipher;
KCryptoConfig *m_module; // just to call configChanged()
};
@@ -75,26 +75,26 @@ private:
class OtherCertItem : public QListViewItem
{
public:
- OtherCertItem(QListView *view, const QString& sub, const QString& md5, bool perm, int policy, QDateTime exp, KCryptoConfig *module );
+ OtherCertItem(TQListView *view, const TQString& sub, const TQString& md5, bool perm, int policy, TQDateTime exp, KCryptoConfig *module );
~OtherCertItem() {}
- QString configName() const;
- const QString& getSub() { return _sub; }
+ TQString configName() const;
+ const TQString& getSub() { return _sub; }
int getPolicy() { return _policy; }
- const QString& getMD5() { return _md5; }
+ const TQString& getMD5() { return _md5; }
bool isPermanent() { return _perm; }
- QDateTime getExpires() { return _exp; }
+ TQDateTime getExpires() { return _exp; }
void setPolicy(int x) { _policy = x; }
void setPermanent(bool x) { _perm = x; }
- void setExpires(QDateTime x) { _exp = x; }
+ void setExpires(TQDateTime x) { _exp = x; }
protected:
virtual void stateChange( bool );
private:
- QString _sub, _md5;
+ TQString _sub, _md5;
KCryptoConfig *m_module; // just to call configChanged()
- QDateTime _exp;
+ TQDateTime _exp;
bool _perm;
int _policy;
};
@@ -105,27 +105,27 @@ private:
class YourCertItem : public QListViewItem
{
public:
- YourCertItem(QListView *view, QString pkcs, QString pass, QString name, KCryptoConfig *module );
+ YourCertItem(TQListView *view, TQString pkcs, TQString pass, TQString name, KCryptoConfig *module );
~YourCertItem() {}
- QString configName() const;
- QString& getPKCS() { return _pkcs; }
- void setPKCS(QString pkcs) { _pkcs = pkcs; }
- QString& getPass() { return _pass; }
- void setPass(QString pass) { _pass = pass; }
- QString& getName() { return _name; }
- void setName(QString name) { _name = name; }
- QString& getPassCache() { return _cpass; }
- void setPassCache(QString pass) { _cpass = pass; }
+ TQString configName() const;
+ TQString& getPKCS() { return _pkcs; }
+ void setPKCS(TQString pkcs) { _pkcs = pkcs; }
+ TQString& getPass() { return _pass; }
+ void setPass(TQString pass) { _pass = pass; }
+ TQString& getName() { return _name; }
+ void setName(TQString name) { _name = name; }
+ TQString& getPassCache() { return _cpass; }
+ void setPassCache(TQString pass) { _cpass = pass; }
protected:
virtual void stateChange( bool );
private:
- QString _pkcs;
- QString _pass;
- QString _cpass;
- QString _name;
+ TQString _pkcs;
+ TQString _pass;
+ TQString _cpass;
+ TQString _name;
KCryptoConfig *m_module; // just to call configChanged()
};
@@ -135,14 +135,14 @@ private:
class CAItem : public QListViewItem
{
public:
- CAItem(QListView *view, QString name, QString cert, bool site, bool email, bool code, KCryptoConfig *module );
+ CAItem(TQListView *view, TQString name, TQString cert, bool site, bool email, bool code, KCryptoConfig *module );
~CAItem() {}
- QString configName() const;
- QString& getName() { return _name; }
- void setName(QString name) { _name = name; }
+ TQString configName() const;
+ TQString& getName() { return _name; }
+ void setName(TQString name) { _name = name; }
- inline QString getCert() const { return _cert; }
+ inline TQString getCert() const { return _cert; }
inline bool getSite() const { return _site; }
inline bool getEmail() const { return _email; }
inline bool getCode() const { return _code; }
@@ -156,8 +156,8 @@ protected:
virtual void stateChange( bool );
private:
- QString _name;
- QString _cert;
+ TQString _name;
+ TQString _cert;
bool _site, _email, _code;
KCryptoConfig *m_module; // just to call configChanged()
};
@@ -169,12 +169,12 @@ private:
class HostAuthItem : public QListViewItem
{
public:
- HostAuthItem(QListView *view, QString host, QString name, KCryptoConfig *module ) : QListViewItem(view, QString::null ) {
+ HostAuthItem(TQListView *view, TQString host, TQString name, KCryptoConfig *module ) : TQListViewItem(view, TQString::null ) {
_name = name; _host = host;
m_module = module;
setText(0, _host);
setText(1, _name);
- _oname = QString::null;
+ _oname = TQString::null;
}
~HostAuthItem() {}
@@ -195,18 +195,18 @@ public:
}
}
KSSLCertificateHome::KSSLAuthAction getAction() const { return _aa; }
- QString configName() const { return _host; }
- QString getCertName() const { return _name; }
- void setCertName(QString name) { _name = name; setText(1, name); }
- void setHost(QString name) { _host = name; setText(0, name); }
- void setOriginalName(QString oname) { _oname = oname; }
- QString originalName() const { return _oname; }
+ TQString configName() const { return _host; }
+ TQString getCertName() const { return _name; }
+ void setCertName(TQString name) { _name = name; setText(1, name); }
+ void setHost(TQString name) { _host = name; setText(0, name); }
+ void setOriginalName(TQString oname) { _oname = oname; }
+ TQString originalName() const { return _oname; }
protected:
private:
- QString _host;
- QString _name, _oname;
+ TQString _host;
+ TQString _name, _oname;
KSSLCertificateHome::KSSLAuthAction _aa;
KCryptoConfig *m_module; // just to call configChanged()
};
@@ -219,7 +219,7 @@ class KCryptoConfig : public KCModule
{
Q_OBJECT
public:
- KCryptoConfig(QWidget *parent = 0L, const char *name = 0L, const QStringList &list = QStringList());
+ KCryptoConfig(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &list = TQStringList());
virtual ~KCryptoConfig();
void load();
@@ -261,7 +261,7 @@ public slots:
void slotNewHostAuth();
void slotRemoveHostAuth();
void slotAuthItemChanged();
- void slotAuthText(const QString &t);
+ void slotAuthText(const TQString &t);
void slotAuthButtons();
void slotAuthCombo();
@@ -279,78 +279,78 @@ protected:
private:
- void offerImportToKMail( const QString& certFile );
+ void offerImportToKMail( const TQString& certFile );
void setAuthCertLists();
void genCAList();
- QTabWidget *tabs;
- QWidget *tabSSL, *tabOSSL;
+ TQTabWidget *tabs;
+ TQWidget *tabSSL, *tabOSSL;
- QWidget *tabYourSSLCert, *tabOtherSSLCert, *tabSSLCA, *tabSSLCOpts, *tabAuth;
+ TQWidget *tabYourSSLCert, *tabOtherSSLCert, *tabSSLCA, *tabSSLCOpts, *tabAuth;
- QListView *SSLv2Box, *SSLv3Box;
- QCheckBox *mUseTLS, *mUseSSLv2, *mUseSSLv3;
- QCheckBox *mWarnOnEnter, *mWarnOnLeave;
+ TQListView *SSLv2Box, *SSLv3Box;
+ TQCheckBox *mUseTLS, *mUseSSLv2, *mUseSSLv3;
+ TQCheckBox *mWarnOnEnter, *mWarnOnLeave;
/* EGD stuff */
- QLabel *mEGDLabel;
+ TQLabel *mEGDLabel;
KURLRequester *mEGDPath;
- QCheckBox *mUseEGD;
- QCheckBox *mUseEFile;
+ TQCheckBox *mUseEGD;
+ TQCheckBox *mUseEFile;
/* CipherWizards */
- QPushButton *mCWall, *mCWus, *mCWexp, *mCWcompatible;
+ TQPushButton *mCWall, *mCWus, *mCWexp, *mCWcompatible;
- QCheckBox *mWarnOnUnencrypted, *mWarnOnMixed;
- QListView *yourSSLBox, *otherSSLBox, *caList;
- QCheckBox *mWarnSelfSigned, *mWarnExpired, *mWarnRevoked;
- QPushButton *macAdd, *macRemove;
+ TQCheckBox *mWarnOnUnencrypted, *mWarnOnMixed;
+ TQListView *yourSSLBox, *otherSSLBox, *caList;
+ TQCheckBox *mWarnSelfSigned, *mWarnExpired, *mWarnRevoked;
+ TQPushButton *macAdd, *macRemove;
KPushButton *macClear;
- QListBox *macBox;
- QPushButton *otherSSLExport, *otherSSLView, *otherSSLRemove, *otherSSLVerify;
- QPushButton *yourSSLImport, *yourSSLPass, *yourSSLRemove, *yourSSLExport,
+ TQListBox *macBox;
+ TQPushButton *otherSSLExport, *otherSSLView, *otherSSLRemove, *otherSSLVerify;
+ TQPushButton *yourSSLImport, *yourSSLPass, *yourSSLRemove, *yourSSLExport,
*yourSSLUnlock, *yourSSLVerify;
- QRadioButton *yourSSLUseDefault, *yourSSLList, *yourSSLDont;
- QLineEdit *macCert;
+ TQRadioButton *yourSSLUseDefault, *yourSSLList, *yourSSLDont;
+ TQLineEdit *macCert;
KSSLCertBox *oSubject, *oIssuer;
KSSLCertBox *ySubject, *yIssuer;
- QGridLayout *oGrid;
-
- QVButtonGroup *policyGroup;
- QVButtonGroup *cacheGroup;
- QRadioButton *policyAccept, *policyReject, *policyPrompt;
- QRadioButton *cacheUntil, *cachePerm;
- QLabel *fromLabel, *untilLabel;
- QLabel *validFrom, *validUntil;
- QLabel *yValidFrom, *yValidUntil;
+ TQGridLayout *oGrid;
+
+ TQVButtonGroup *policyGroup;
+ TQVButtonGroup *cacheGroup;
+ TQRadioButton *policyAccept, *policyReject, *policyPrompt;
+ TQRadioButton *cacheUntil, *cachePerm;
+ TQLabel *fromLabel, *untilLabel;
+ TQLabel *validFrom, *validUntil;
+ TQLabel *yValidFrom, *yValidUntil;
KURLLabel *untilDate;
- QVGroupBox *oInfo;
+ TQVGroupBox *oInfo;
KURLRequester *oPath;
- QPushButton *oTest;
- QPtrList<OtherCertItem> otherCertDelList;
- QPtrList<YourCertItem> yourCertDelList;
- QPtrList<CAItem> caDelList;
+ TQPushButton *oTest;
+ TQPtrList<OtherCertItem> otherCertDelList;
+ TQPtrList<YourCertItem> yourCertDelList;
+ TQPtrList<CAItem> caDelList;
/* Personal Cert Policies tab */
KComboBox *defCertBox;
KComboBox *hostCertBox;
- QVButtonGroup *defCertBG;
- QHButtonGroup *hostCertBG;
- QRadioButton *defSend, *defPrompt, *defDont;
- QRadioButton *hostSend, *hostPrompt, *hostDont;
- QListView *hostAuthList;
- QPushButton *authAdd, *authRemove;
- QLineEdit *authHost;
- QPtrList<HostAuthItem> authDelList;
- QLabel *yHash, *pHash;
+ TQVButtonGroup *defCertBG;
+ TQHButtonGroup *hostCertBG;
+ TQRadioButton *defSend, *defPrompt, *defDont;
+ TQRadioButton *hostSend, *hostPrompt, *hostDont;
+ TQListView *hostAuthList;
+ TQPushButton *authAdd, *authRemove;
+ TQLineEdit *authHost;
+ TQPtrList<HostAuthItem> authDelList;
+ TQLabel *yHash, *pHash;
/* CA stuff */
KSSLCertBox *caSubject, *caIssuer;
- QPushButton *caSSLImport, *caSSLRemove, *caSSLRestore;
- QCheckBox *caSite, *caEmail, *caCode;
+ TQPushButton *caSSLImport, *caSSLRemove, *caSSLRestore;
+ TQCheckBox *caSite, *caEmail, *caCode;
KSSLSigners *_signers;
- QLabel *cHash;
+ TQLabel *cHash;
KConfig *config;
KSimpleConfig *policies, *pcerts, *authcfg;
diff --git a/kcontrol/crypto/kdatetimedlg.cpp b/kcontrol/crypto/kdatetimedlg.cpp
index 26001afdd..f7eae9883 100644
--- a/kcontrol/crypto/kdatetimedlg.cpp
+++ b/kcontrol/crypto/kdatetimedlg.cpp
@@ -23,8 +23,8 @@
#endif
#include "kdatetimedlg.h"
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
#include <klocale.h>
#include <kdebug.h>
#include <kdatepicker.h>
@@ -32,37 +32,37 @@
#include <knuminput.h>
#include <kstdguiitem.h>
-KDateTimeDlg::KDateTimeDlg(QWidget *parent, const char *name)
+KDateTimeDlg::KDateTimeDlg(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("Date & Time Selector"));
_date = new KDatePicker(this);
grid->addMultiCellWidget(_date, 0, 5, 0, 5);
- grid->addWidget(new QLabel(i18n("Hour:"), this), 7, 0);
+ grid->addWidget(new TQLabel(i18n("Hour:"), this), 7, 0);
_hours = new KIntNumInput(this);
_hours->setRange(0, 23, 1, false);
grid->addWidget(_hours, 7, 1);
- grid->addWidget(new QLabel(i18n("Minute:"), this), 7, 2);
+ grid->addWidget(new TQLabel(i18n("Minute:"), this), 7, 2);
_mins = new KIntNumInput(this);
_mins->setRange(0, 59, 1, false);
grid->addWidget(_mins, 7, 3);
- grid->addWidget(new QLabel(i18n("Second:"), this), 7, 4);
+ grid->addWidget(new TQLabel(i18n("Second:"), this), 7, 4);
_secs = new KIntNumInput(this);
_secs->setRange(0, 59, 1, false);
grid->addWidget(_secs, 7, 5);
_ok = new KPushButton(KStdGuiItem::ok(), this);
grid->addWidget(_ok, 8, 4);
- connect(_ok, SIGNAL(clicked()), SLOT(accept()));
+ connect(_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
_cancel = new KPushButton(KStdGuiItem::cancel(), this);
grid->addWidget(_cancel, 8, 5);
- connect(_cancel, SIGNAL(clicked()), SLOT(reject()));
+ connect(_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
}
@@ -72,20 +72,20 @@ KDateTimeDlg::~KDateTimeDlg() {
}
-QDate KDateTimeDlg::getDate() {
+TQDate KDateTimeDlg::getDate() {
return _date->date();
}
-QTime KDateTimeDlg::getTime() {
-QTime rc(_hours->value(), _mins->value(), _secs->value());
+TQTime KDateTimeDlg::getTime() {
+TQTime rc(_hours->value(), _mins->value(), _secs->value());
return rc;
}
-QDateTime KDateTimeDlg::getDateTime() {
-QDateTime qdt;
-QTime qtime(_hours->value(), _mins->value(), _secs->value());
+TQDateTime KDateTimeDlg::getDateTime() {
+TQDateTime qdt;
+TQTime qtime(_hours->value(), _mins->value(), _secs->value());
qdt.setDate(_date->date());
qdt.setTime(qtime);
@@ -94,19 +94,19 @@ return qdt;
}
-void KDateTimeDlg::setDate(const QDate& qdate) {
+void KDateTimeDlg::setDate(const TQDate& qdate) {
_date->setDate(qdate);
}
-void KDateTimeDlg::setTime(const QTime& qtime) {
+void KDateTimeDlg::setTime(const TQTime& qtime) {
_hours->setValue(qtime.hour());
_mins->setValue(qtime.minute());
_secs->setValue(qtime.second());
}
-void KDateTimeDlg::setDateTime(const QDateTime& qdatetime) {
+void KDateTimeDlg::setDateTime(const TQDateTime& qdatetime) {
_date->setDate(qdatetime.date());
_hours->setValue(qdatetime.time().hour());
_mins->setValue(qdatetime.time().minute());
diff --git a/kcontrol/crypto/kdatetimedlg.h b/kcontrol/crypto/kdatetimedlg.h
index 3f25cad2b..4d6cc21f0 100644
--- a/kcontrol/crypto/kdatetimedlg.h
+++ b/kcontrol/crypto/kdatetimedlg.h
@@ -36,16 +36,16 @@ class KDateTimeDlg : public KDialog
{
Q_OBJECT
public:
- KDateTimeDlg(QWidget *parent = 0L, const char *name = 0L);
+ KDateTimeDlg(TQWidget *parent = 0L, const char *name = 0L);
virtual ~KDateTimeDlg();
- virtual QTime getTime();
- virtual QDate getDate();
- virtual QDateTime getDateTime();
+ virtual TQTime getTime();
+ virtual TQDate getDate();
+ virtual TQDateTime getDateTime();
- virtual void setDate(const QDate& qdate);
- virtual void setTime(const QTime& qtime);
- virtual void setDateTime(const QDateTime& qdatetime);
+ virtual void setDate(const TQDate& qdate);
+ virtual void setTime(const TQTime& qtime);
+ virtual void setDateTime(const TQDateTime& qdatetime);
protected slots:
diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp
index bd72a1375..552afd3a3 100644
--- a/kcontrol/css/kcmcss.cpp
+++ b/kcontrol/css/kcmcss.cpp
@@ -1,9 +1,9 @@
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
-#include <qtextbrowser.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqlayout.h>
+#include <tqradiobutton.h>
+#include <tqtextbrowser.h>
#include <kapplication.h>
#include <kcolorbutton.h>
@@ -22,13 +22,13 @@
#include "kcmcss.h"
-typedef KGenericFactory<CSSConfig, QWidget> CSSFactory;
+typedef KGenericFactory<CSSConfig, TQWidget> CSSFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_css, CSSFactory("kcmcss") )
-CSSConfig::CSSConfig(QWidget *parent, const char *name, const QStringList &)
+CSSConfig::CSSConfig(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(CSSFactory::instance(), parent, name)
{
- customDialogBase = new KDialogBase(this, "customCSSDialog", true, QString::null,
+ customDialogBase = new KDialogBase(this, "customCSSDialog", true, TQString::null,
KDialogBase::Close, KDialogBase::Close, true );
customDialog = new CSSCustomDialog(customDialogBase);
customDialogBase->setMainWidget(customDialog);
@@ -46,52 +46,52 @@ CSSConfig::CSSConfig(QWidget *parent, const char *name, const QStringList &)
" that are unreadable due to bad design."));
- QStringList fonts;
+ TQStringList fonts;
KFontChooser::getFontList(fonts, 0);
customDialog->fontFamily->insertStringList(fonts);
- connect(configDialog->useDefault, SIGNAL(clicked()),
- SLOT(changed()));
- connect(configDialog->useAccess, SIGNAL(clicked()),
- SLOT(changed()));
- connect(configDialog->useUser, SIGNAL(clicked()),
- SLOT(changed()));
- connect(configDialog->urlRequester, SIGNAL(textChanged(const QString&)),
- SLOT(changed()));
- connect(configDialog->customize, SIGNAL(clicked()),
- SLOT(slotCustomize()));
- connect(customDialog->basefontsize, SIGNAL(highlighted(int)),
- SLOT(changed()));
- connect(customDialog->basefontsize, SIGNAL(textChanged(const QString&)),
- SLOT(changed()));
- connect(customDialog->dontScale, SIGNAL(clicked()),
- SLOT(changed()));
- connect(customDialog->blackOnWhite, SIGNAL(clicked()),
- SLOT(changed()));
- connect(customDialog->whiteOnBlack, SIGNAL(clicked()),
- SLOT(changed()));
- connect(customDialog->customColor, SIGNAL(clicked()),
- SLOT(changed()));
- connect(customDialog->foregroundColor, SIGNAL(changed(const QColor &)),
- SLOT(changed()));
- connect(customDialog->backgroundColor, SIGNAL(changed(const QColor &)),
- SLOT(changed()));
- connect(customDialog->fontFamily, SIGNAL(highlighted(int)),
- SLOT(changed()));
- connect(customDialog->fontFamily, SIGNAL(textChanged(const QString&)),
- SLOT(changed()));
- connect(customDialog->sameFamily, SIGNAL(clicked()),
- SLOT(changed()));
- connect(customDialog->preview, SIGNAL(clicked()),
- SLOT(slotPreview()));
- connect(customDialog->sameColor, SIGNAL(clicked()),
- SLOT(changed()));
- connect(customDialog->hideImages, SIGNAL(clicked()),
- SLOT(changed()));
- connect(customDialog->hideBackground, SIGNAL(clicked()),
- SLOT(changed()));
-
- QVBoxLayout *vbox = new QVBoxLayout(this, 0, 0);
+ connect(configDialog->useDefault, TQT_SIGNAL(clicked()),
+ TQT_SLOT(changed()));
+ connect(configDialog->useAccess, TQT_SIGNAL(clicked()),
+ TQT_SLOT(changed()));
+ connect(configDialog->useUser, TQT_SIGNAL(clicked()),
+ TQT_SLOT(changed()));
+ connect(configDialog->urlRequester, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(changed()));
+ connect(configDialog->customize, TQT_SIGNAL(clicked()),
+ TQT_SLOT(slotCustomize()));
+ connect(customDialog->basefontsize, TQT_SIGNAL(highlighted(int)),
+ TQT_SLOT(changed()));
+ connect(customDialog->basefontsize, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(changed()));
+ connect(customDialog->dontScale, TQT_SIGNAL(clicked()),
+ TQT_SLOT(changed()));
+ connect(customDialog->blackOnWhite, TQT_SIGNAL(clicked()),
+ TQT_SLOT(changed()));
+ connect(customDialog->whiteOnBlack, TQT_SIGNAL(clicked()),
+ TQT_SLOT(changed()));
+ connect(customDialog->customColor, TQT_SIGNAL(clicked()),
+ TQT_SLOT(changed()));
+ connect(customDialog->foregroundColor, TQT_SIGNAL(changed(const TQColor &)),
+ TQT_SLOT(changed()));
+ connect(customDialog->backgroundColor, TQT_SIGNAL(changed(const TQColor &)),
+ TQT_SLOT(changed()));
+ connect(customDialog->fontFamily, TQT_SIGNAL(highlighted(int)),
+ TQT_SLOT(changed()));
+ connect(customDialog->fontFamily, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(changed()));
+ connect(customDialog->sameFamily, TQT_SIGNAL(clicked()),
+ TQT_SLOT(changed()));
+ connect(customDialog->preview, TQT_SIGNAL(clicked()),
+ TQT_SLOT(slotPreview()));
+ connect(customDialog->sameColor, TQT_SIGNAL(clicked()),
+ TQT_SLOT(changed()));
+ connect(customDialog->hideImages, TQT_SIGNAL(clicked()),
+ TQT_SLOT(changed()));
+ connect(customDialog->hideBackground, TQT_SIGNAL(clicked()),
+ TQT_SLOT(changed()));
+
+ TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, 0);
vbox->addWidget(configDialog);
load();
@@ -108,17 +108,17 @@ void CSSConfig::load( bool useDefaults )
c->setReadDefaults( useDefaults );
c->setGroup("Stylesheet");
- QString u = c->readEntry("Use", "default");
+ TQString u = c->readEntry("Use", "default");
configDialog->useDefault->setChecked(u == "default");
configDialog->useUser->setChecked(u == "user");
configDialog->useAccess->setChecked(u == "access");
configDialog->urlRequester->setURL(c->readEntry("SheetName"));
c->setGroup("Font");
- customDialog->basefontsize->setEditText(QString::number(c->readNumEntry("BaseSize", 12)));
+ customDialog->basefontsize->setEditText(TQString::number(c->readNumEntry("BaseSize", 12)));
customDialog->dontScale->setChecked(c->readBoolEntry("DontScale", false));
- QString fname = c->readEntry("Family", "Arial");
+ TQString fname = c->readEntry("Family", "Arial");
for (int i=0; i < customDialog->fontFamily->count(); ++i)
if (customDialog->fontFamily->text(i) == fname)
{
@@ -129,7 +129,7 @@ void CSSConfig::load( bool useDefaults )
customDialog->sameFamily->setChecked(c->readBoolEntry("SameFamily", false));
c->setGroup("Colors");
- QString m = c->readEntry("Mode", "black-on-white");
+ TQString m = c->readEntry("Mode", "black-on-white");
customDialog->blackOnWhite->setChecked(m == "black-on-white");
customDialog->whiteOnBlack->setChecked(m == "white-on-black");
customDialog->customColor->setChecked(m == "custom");
@@ -187,8 +187,8 @@ void CSSConfig::save()
delete c;
// generate CSS template
- QString templ = locate("data", "kcmcss/template.css");
- QString dest;
+ TQString templ = locate("data", "kcmcss/template.css");
+ TQString dest;
if (!templ.isEmpty())
{
CSSTemplate css(templ);
@@ -222,18 +222,18 @@ void CSSConfig::defaults()
}
-QString px(int i, double scale)
+TQString px(int i, double scale)
{
- QString px;
+ TQString px;
px.setNum(static_cast<int>(i * scale));
px += "px";
return px;
}
-QMap<QString,QString> CSSConfig::cssDict()
+TQMap<TQString,TQString> CSSConfig::cssDict()
{
- QMap<QString,QString> dict;
+ TQMap<TQString,TQString> dict;
// Fontsizes ------------------------------------------------------
@@ -314,10 +314,10 @@ void CSSConfig::slotCustomize()
void CSSConfig::slotPreview()
{
- QStyleSheetItem *h1 = new QStyleSheetItem(QStyleSheet::defaultSheet(), "h1");
- QStyleSheetItem *h2 = new QStyleSheetItem(QStyleSheet::defaultSheet(), "h2");
- QStyleSheetItem *h3 = new QStyleSheetItem(QStyleSheet::defaultSheet(), "h3");
- QStyleSheetItem *text = new QStyleSheetItem(QStyleSheet::defaultSheet(), "p");
+ TQStyleSheetItem *h1 = new TQStyleSheetItem(TQStyleSheet::defaultSheet(), "h1");
+ TQStyleSheetItem *h2 = new TQStyleSheetItem(TQStyleSheet::defaultSheet(), "h2");
+ TQStyleSheetItem *h3 = new TQStyleSheetItem(TQStyleSheet::defaultSheet(), "h3");
+ TQStyleSheetItem *text = new TQStyleSheetItem(TQStyleSheet::defaultSheet(), "p");
// Fontsize
@@ -338,7 +338,7 @@ void CSSConfig::slotPreview()
// Colors
- QColor back, fore;
+ TQColor back, fore;
if (customDialog->blackOnWhite->isChecked())
{
@@ -371,7 +371,7 @@ void CSSConfig::slotPreview()
// Show the preview
PreviewDialog *dlg = new PreviewDialog(this, 0, true);
dlg->preview->setPaper(back);
- dlg->preview->viewport()->setFont(QFont(KGlobalSettings::generalFont().family(), bfs));
+ dlg->preview->viewport()->setFont(TQFont(KGlobalSettings::generalFont().family(), bfs));
dlg->exec();
diff --git a/kcontrol/css/kcmcss.h b/kcontrol/css/kcmcss.h
index decf5c3a3..164f22dae 100644
--- a/kcontrol/css/kcmcss.h
+++ b/kcontrol/css/kcmcss.h
@@ -19,7 +19,7 @@
#define __KCMCSS_H__
-#include <qmap.h>
+#include <tqmap.h>
#include <kcmodule.h>
@@ -35,7 +35,7 @@ class CSSConfig : public KCModule
public:
- CSSConfig(QWidget *parent = 0L, const char *name = 0L, const QStringList &list =QStringList() );
+ CSSConfig(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &list =TQStringList() );
void load();
void load( bool useDefaults );
@@ -49,7 +49,7 @@ public slots:
private:
- QMap<QString,QString> cssDict();
+ TQMap<TQString,TQString> cssDict();
CSSConfigDialog *configDialog;
CSSCustomDialog *customDialog;
diff --git a/kcontrol/css/template.cpp b/kcontrol/css/template.cpp
index 94eba6053..e237ed796 100644
--- a/kcontrol/css/template.cpp
+++ b/kcontrol/css/template.cpp
@@ -1,24 +1,24 @@
-#include <qfile.h>
+#include <tqfile.h>
#include "template.h"
-bool CSSTemplate::expand(QString destname, const QMap<QString,QString> &dict)
+bool CSSTemplate::expand(TQString destname, const TQMap<TQString,TQString> &dict)
{
- QFile inf(_filename);
+ TQFile inf(_filename);
if (!inf.open(IO_ReadOnly))
return false;
- QTextStream is(&inf);
+ TQTextStream is(&inf);
- QFile outf(destname);
+ TQFile outf(destname);
if (!outf.open(IO_WriteOnly))
return false;
- QTextStream os(&outf);
+ TQTextStream os(&outf);
- QString line;
+ TQString line;
while (!is.eof())
{
line = is.readLine();
@@ -29,8 +29,8 @@ bool CSSTemplate::expand(QString destname, const QMap<QString,QString> &dict)
int end = line.find('$', start+1);
if (end >= 0)
{
- QString expr = line.mid(start+1, end-start-1);
- QString res = dict[expr];
+ TQString expr = line.mid(start+1, end-start-1);
+ TQString res = dict[expr];
line.replace(start, end-start+1, res);
}
diff --git a/kcontrol/css/template.h b/kcontrol/css/template.h
index 2b701a238..bdcc8ad63 100644
--- a/kcontrol/css/template.h
+++ b/kcontrol/css/template.h
@@ -2,18 +2,18 @@
#define __TEMPLATE_H__
-#include <qstring.h>
-#include <qmap.h>
+#include <tqstring.h>
+#include <tqmap.h>
class CSSTemplate
{
public:
- CSSTemplate(QString fname) : _filename(fname) {};
- bool expand(QString destname, const QMap<QString,QString> &dict);
+ CSSTemplate(TQString fname) : _filename(fname) {};
+ bool expand(TQString destname, const TQMap<TQString,TQString> &dict);
protected:
- QString _filename;
+ TQString _filename;
};
diff --git a/kcontrol/display/display.cpp b/kcontrol/display/display.cpp
index 1c514810c..d7675160e 100644
--- a/kcontrol/display/display.cpp
+++ b/kcontrol/display/display.cpp
@@ -17,9 +17,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
-#include <qlayout.h>
-#include <qtabwidget.h>
+#include <tqapplication.h>
+#include <tqlayout.h>
+#include <tqtabwidget.h>
#include <kcmoduleloader.h>
#include <kdialog.h>
@@ -27,34 +27,34 @@
#include "display.h"
-typedef KGenericFactory<KCMDisplay, QWidget> DisplayFactory;
+typedef KGenericFactory<KCMDisplay, TQWidget> DisplayFactory;
K_EXPORT_COMPONENT_FACTORY ( kcm_display, DisplayFactory( "display" ) )
-KCMDisplay::KCMDisplay( QWidget *parent, const char *name, const QStringList& )
+KCMDisplay::KCMDisplay( TQWidget *parent, const char *name, const TQStringList& )
: KCModule( parent, name )
, m_changed(false)
{
- m_tabs = new QTabWidget( this );
+ m_tabs = new TQTabWidget( this );
addTab( "randr", i18n( "Size && Orientation" ) );
addTab( "nvidiadisplay", i18n( "Graphics Adaptor" ) );
addTab( "nvidia3d", i18n( "3D Options" ) );
addTab( "kgamma", i18n( "Monitor Gamma" ) );
- if ( QApplication::desktop()->isVirtualDesktop() )
+ if ( TQApplication::desktop()->isVirtualDesktop() )
addTab( "xinerama", i18n( "Multiple Monitors" ) );
addTab( "energy", i18n( "Power Control" ) );
- QVBoxLayout *top = new QVBoxLayout( this, 0, KDialog::spacingHint() );
+ TQVBoxLayout *top = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
top->addWidget( m_tabs );
setButtons( Apply|Help );
load();
}
-void KCMDisplay::addTab( const QString &name, const QString &label )
+void KCMDisplay::addTab( const TQString &name, const TQString &label )
{
- QWidget *page = new QWidget( m_tabs, name.latin1() );
- QVBoxLayout *top = new QVBoxLayout( page, KDialog::marginHint() );
+ TQWidget *page = new TQWidget( m_tabs, name.latin1() );
+ TQVBoxLayout *top = new TQVBoxLayout( page, KDialog::marginHint() );
KCModule *kcm = KCModuleLoader::loadModule( name, page );
@@ -63,7 +63,7 @@ void KCMDisplay::addTab( const QString &name, const QString &label )
top->addWidget( kcm );
m_tabs->addTab( page, label );
- connect( kcm, SIGNAL( changed(bool) ), SLOT( moduleChanged(bool) ) );
+ connect( kcm, TQT_SIGNAL( changed(bool) ), TQT_SLOT( moduleChanged(bool) ) );
m_modules.insert(kcm, false);
}
else
@@ -72,20 +72,20 @@ void KCMDisplay::addTab( const QString &name, const QString &label )
void KCMDisplay::load()
{
- for (QMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it)
+ for (TQMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it)
it.key()->load();
}
void KCMDisplay::save()
{
- for (QMap<KCModule*, bool>::Iterator it = m_modules.begin(); it != m_modules.end(); ++it)
+ for (TQMap<KCModule*, bool>::Iterator it = m_modules.begin(); it != m_modules.end(); ++it)
if (it.data())
it.key()->save();
}
void KCMDisplay::moduleChanged( bool isChanged )
{
- QMap<KCModule*, bool>::Iterator currentModule = m_modules.find(static_cast<KCModule*>(const_cast<QObject*>(sender())));
+ TQMap<KCModule*, bool>::Iterator currentModule = m_modules.find(static_cast<KCModule*>(const_cast<TQObject*>(sender())));
Q_ASSERT(currentModule != m_modules.end());
if (currentModule.data() == isChanged)
return;
@@ -94,7 +94,7 @@ void KCMDisplay::moduleChanged( bool isChanged )
bool c = false;
- for (QMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) {
+ for (TQMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) {
if (it.data()) {
c = true;
break;
diff --git a/kcontrol/display/display.h b/kcontrol/display/display.h
index d07695320..ec5811725 100644
--- a/kcontrol/display/display.h
+++ b/kcontrol/display/display.h
@@ -29,7 +29,7 @@ class KCMDisplay : public KCModule
Q_OBJECT
public:
- KCMDisplay( QWidget *parent, const char *name, const QStringList& );
+ KCMDisplay( TQWidget *parent, const char *name, const TQStringList& );
void load();
void save();
@@ -37,10 +37,10 @@ class KCMDisplay : public KCModule
void moduleChanged(bool isChanged);
private:
- void addTab( const QString &name, const QString &label );
+ void addTab( const TQString &name, const TQString &label );
- QTabWidget *m_tabs;
- QMap<KCModule*, bool> m_modules;
+ TQTabWidget *m_tabs;
+ TQMap<KCModule*, bool> m_modules;
bool m_changed;
};
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index d754f0025..97b532b54 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -21,16 +21,16 @@
#include <sys/stat.h>
#include <config.h>
-#include <qlayout.h>
-#include <qfile.h>
-#include <qgroupbox.h>
-#include <qradiobutton.h>
-#include <qtimer.h>
-#include <qtabwidget.h>
-#include <qcheckbox.h>
-#include <qprocess.h>
-#include <qcursor.h>
-#include <qbuttongroup.h>
+#include <tqlayout.h>
+#include <tqfile.h>
+#include <tqgroupbox.h>
+#include <tqradiobutton.h>
+#include <tqtimer.h>
+#include <tqtabwidget.h>
+#include <tqcheckbox.h>
+#include <tqprocess.h>
+#include <tqcursor.h>
+#include <tqbuttongroup.h>
#include <klocale.h>
#include <kglobal.h>
@@ -50,10 +50,10 @@
#define MDNSD_CONF "/etc/mdnsd.conf"
#define MDNSD_PID "/var/run/mdnsd.pid"
-typedef KGenericFactory<KCMDnssd, QWidget> KCMDnssdFactory;
+typedef KGenericFactory<KCMDnssd, TQWidget> KCMDnssdFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kdnssd, KCMDnssdFactory("kcmkdnssd"))
-KCMDnssd::KCMDnssd(QWidget *parent, const char *name, const QStringList&)
+KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
: ConfigDialog(parent, name), m_wdchanged(false)
{
setAboutData(new KAboutData(I18N_NOOP("kcm_kdnssd"),
@@ -65,13 +65,13 @@ KCMDnssd::KCMDnssd(QWidget *parent, const char *name, const QStringList&)
else if (getenv("KDESU_USER")!=0) tabs->removePage(tab);
addConfig(DNSSD::Configuration::self(),this);
// it is host-wide setting so it has to be in global config file
- domain = new KSimpleConfig( QString::fromLatin1( KDE_CONFDIR "/kdnssdrc" ));
+ domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdnssdrc" ));
domain->setGroup("publishing");
load();
- connect(hostedit,SIGNAL(textChanged(const QString&)),this,SLOT(wdchanged()));
- connect(secretedit,SIGNAL(textChanged(const QString&)),this,SLOT(wdchanged()));
- connect(domainedit,SIGNAL(textChanged(const QString&)),this,SLOT(wdchanged()));
- connect(enableZeroconf,SIGNAL(toggled(bool)),this,SLOT(enableZeroconfChanged(bool)));
+ connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));
+ connect(secretedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));
+ connect(domainedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));
+ connect(enableZeroconf,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableZeroconfChanged(bool)));
m_enableZeroconfChanged=false;
if (DNSSD::Configuration::self()->publishDomain().isEmpty()) WANButton->setEnabled(false);
kcfg_PublishType->hide(); //unused with Avahi
@@ -84,7 +84,7 @@ KCMDnssd::~KCMDnssd()
void KCMDnssd::save()
{
- setCursor(QCursor(Qt::BusyCursor));
+ setCursor(TQCursor(Qt::BusyCursor));
KCModule::save();
if (geteuid()==0 && m_wdchanged) saveMdnsd();
domain->setFileWriteMode(0644); // this should be readable for everyone
@@ -93,7 +93,7 @@ void KCMDnssd::save()
KIPC::sendMessageAll((KIPC::Message)KIPCDomainsChanged);
if (m_enableZeroconfChanged) {
- QString scaryMessage = i18n("Enabling local network browsing will open a network port (5353) on your computer. If security problems are discovered in the zeroconf server, remote attackers could access your computer as the \"avahi\" user.");
+ TQString scaryMessage = i18n("Enabling local network browsing will open a network port (5353) on your computer. If security problems are discovered in the zeroconf server, remote attackers could access your computer as the \"avahi\" user.");
KProcess *proc = new KProcess;
@@ -112,14 +112,14 @@ void KCMDnssd::save()
proc->start(KProcess::Block);
}
}
- setCursor(QCursor(Qt::ArrowCursor));
+ setCursor(TQCursor(Qt::ArrowCursor));
}
void KCMDnssd::load()
{
if (geteuid()==0) loadMdnsd();
enableZeroconf->setChecked(false);
- QProcess avahiStatus(QString("/usr/share/avahi/avahi_status"), this, "avahiStatus");
+ TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus");
avahiStatus.start();
while (avahiStatus.isRunning()) {
kapp->processEvents();
@@ -151,14 +151,14 @@ void KCMDnssd::enableZeroconfChanged(bool)
void KCMDnssd::loadMdnsd()
{
- QFile f(MDNSD_CONF);
+ TQFile f(MDNSD_CONF);
if (!f.open(IO_ReadWrite)) return;
- QTextStream stream(&f);
- QString line;
+ TQTextStream stream(&f);
+ TQString line;
while (!stream.atEnd()) {
line = stream.readLine();
- mdnsdLines.insert(line.section(' ',0,0,QString::SectionSkipEmpty),
- line.section(' ',1,-1,QString::SectionSkipEmpty));
+ mdnsdLines.insert(line.section(' ',0,0,TQString::SectionSkipEmpty),
+ line.section(' ',1,-1,TQString::SectionSkipEmpty));
}
if (!mdnsdLines["zone"].isNull()) domainedit->setText(mdnsdLines["zone"]);
if (!mdnsdLines["hostname"].isNull()) hostedit->setText(mdnsdLines["hostname"]);
@@ -169,13 +169,13 @@ bool KCMDnssd::saveMdnsd()
{
mdnsdLines["zone"]=domainedit->text();
mdnsdLines["hostname"]=hostedit->text();
- if (!secretedit->text().isEmpty()) mdnsdLines["secret-64"]=QString(secretedit->password());
+ if (!secretedit->text().isEmpty()) mdnsdLines["secret-64"]=TQString(secretedit->password());
else mdnsdLines.remove("secret-64");
- QFile f(MDNSD_CONF);
+ TQFile f(MDNSD_CONF);
bool newfile=!f.exists();
if (!f.open(IO_WriteOnly)) return false;
- QTextStream stream(&f);
- for (QMap<QString,QString>::ConstIterator it=mdnsdLines.begin();it!=mdnsdLines.end();
+ TQTextStream stream(&f);
+ for (TQMap<TQString,TQString>::ConstIterator it=mdnsdLines.begin();it!=mdnsdLines.end();
++it) stream << it.key() << " " << (*it) << "\n";
f.close();
// if it is new file, then make it only accessible for root as it can contain shared
@@ -183,7 +183,7 @@ bool KCMDnssd::saveMdnsd()
if (newfile) chmod(MDNSD_CONF,0600);
f.setName(MDNSD_PID);
if (!f.open(IO_ReadOnly)) return true; // it is not running so no need to signal
- QString line;
+ TQString line;
if (f.readLine(line,16)<1) return true;
unsigned int pid = line.toUInt();
if (pid==0) return true; // not a pid
diff --git a/kcontrol/dnssd/kcmdnssd.h b/kcontrol/dnssd/kcmdnssd.h
index 384f7b625..064577283 100644
--- a/kcontrol/dnssd/kcmdnssd.h
+++ b/kcontrol/dnssd/kcmdnssd.h
@@ -21,7 +21,7 @@
#ifndef _KCMDNSSD_H_
#define _KCMDNSSD_H_
-#include <qmap.h>
+#include <tqmap.h>
#include <configdialog.h>
#include <kaboutdata.h>
@@ -32,7 +32,7 @@ class KCMDnssd: public ConfigDialog
Q_OBJECT
public:
- KCMDnssd( QWidget *parent=0, const char *name=0, const QStringList& = QStringList() );
+ KCMDnssd( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() );
~KCMDnssd();
virtual void save();
virtual void load();
@@ -42,7 +42,7 @@ private slots:
private:
void loadMdnsd();
bool saveMdnsd();
- QMap<QString,QString> mdnsdLines;
+ TQMap<TQString,TQString> mdnsdLines;
bool m_wdchanged;
KSimpleConfig* domain;
bool m_enableZeroconfChanged;
diff --git a/kcontrol/ebrowsing/filteropts.cpp b/kcontrol/ebrowsing/filteropts.cpp
index ae2127380..a9c7801d6 100644
--- a/kcontrol/ebrowsing/filteropts.cpp
+++ b/kcontrol/ebrowsing/filteropts.cpp
@@ -21,21 +21,21 @@
#include <unistd.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
#include <dcopclient.h>
#include <klocale.h>
#include "filteropts.h"
-FilterOptions::FilterOptions(QWidget *parent, const char *name)
+FilterOptions::FilterOptions(TQWidget *parent, const char *name)
:KCModule(parent, name)
{
- QGridLayout *lay = new QGridLayout(this, 1, 1, 10, 5);
+ TQGridLayout *lay = new TQGridLayout(this, 1, 1, 10, 5);
- lay->addWidget(new QLabel(i18n("Under construction..."), this), 0, 0);
+ lay->addWidget(new TQLabel(i18n("Under construction..."), this), 0, 0);
lay->activate();
}
diff --git a/kcontrol/ebrowsing/filteropts.h b/kcontrol/ebrowsing/filteropts.h
index f8a530b4a..98753e01c 100644
--- a/kcontrol/ebrowsing/filteropts.h
+++ b/kcontrol/ebrowsing/filteropts.h
@@ -32,7 +32,7 @@ class FilterOptions : public KCModule
Q_OBJECT
public:
- FilterOptions(QWidget *parent = 0, const char *name = 0);
+ FilterOptions(TQWidget *parent = 0, const char *name = 0);
void load( bool useDefaults );
void save();
@@ -42,7 +42,7 @@ protected slots:
void moduleChanged(bool state);
private:
- QListBox* m_lbFilterList;
+ TQListBox* m_lbFilterList;
};
#endif
diff --git a/kcontrol/ebrowsing/main.cpp b/kcontrol/ebrowsing/main.cpp
index 8c7ab1e5d..a41ab92e3 100644
--- a/kcontrol/ebrowsing/main.cpp
+++ b/kcontrol/ebrowsing/main.cpp
@@ -23,9 +23,9 @@
#include <unistd.h>
-#include <qlayout.h>
-#include <qmap.h>
-#include <qtabwidget.h>
+#include <tqlayout.h>
+#include <tqmap.h>
+#include <tqtabwidget.h>
#include <dcopclient.h>
#include <kdialog.h>
@@ -35,12 +35,12 @@
#include "filteropts.h"
#include "main.h"
-typedef KGenericFactory<KURIFilterModule, QWidget> KURIFactory;
+typedef KGenericFactory<KURIFilterModule, TQWidget> KURIFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kurifilt, KURIFactory("kcmkurifilt") )
class FilterOptions;
-KURIFilterModule::KURIFilterModule(QWidget *parent, const char *name, const QStringList &)
+KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQStringList &)
:KCModule(KURIFactory::instance(), parent, name)
{
@@ -56,18 +56,18 @@ KURIFilterModule::KURIFilterModule(QWidget *parent, const char *name, const QStr
" Even easier: just press Alt+F2 (if you have not"
" changed this shortcut) and enter the shortcut in the KDE Run Command dialog."));
- QVBoxLayout *layout = new QVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
#if 0
opts = new FilterOptions(this);
tab->addTab(opts, i18n("&Filters"));
- connect(opts, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
+ connect(opts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
#endif
modules.setAutoDelete(true);
- QMap<QString,KCModule*> helper;
- QPtrListIterator<KURIFilterPlugin> it = filter->pluginsIterator();
+ TQMap<TQString,KCModule*> helper;
+ TQPtrListIterator<KURIFilterPlugin> it = filter->pluginsIterator();
for (; it.current(); ++it)
{
KCModule *module = it.current()->configModule(this, 0);
@@ -75,15 +75,15 @@ KURIFilterModule::KURIFilterModule(QWidget *parent, const char *name, const QStr
{
modules.append(module);
helper.insert(it.current()->configName(), module);
- connect(module, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
+ connect(module, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
}
}
if (modules.count() > 1)
{
- QTabWidget *tab = new QTabWidget(this);
+ TQTabWidget *tab = new TQTabWidget(this);
- QMapIterator<QString,KCModule*> it2;
+ TQMapIterator<TQString,KCModule*> it2;
for (it2 = helper.begin(); it2 != helper.end(); ++it2)
{
tab->addTab(it2.data(), it2.key());
@@ -103,7 +103,7 @@ KURIFilterModule::KURIFilterModule(QWidget *parent, const char *name, const QStr
void KURIFilterModule::load()
{
- QPtrListIterator<KCModule> it(modules);
+ TQPtrListIterator<KCModule> it(modules);
for (; it.current(); ++it)
{
it.current()->load();
@@ -112,7 +112,7 @@ void KURIFilterModule::load()
void KURIFilterModule::save()
{
- QPtrListIterator<KCModule> it(modules);
+ TQPtrListIterator<KCModule> it(modules);
for (; it.current(); ++it)
{
it.current()->save();
@@ -121,7 +121,7 @@ void KURIFilterModule::save()
void KURIFilterModule::defaults()
{
- QPtrListIterator<KCModule> it(modules);
+ TQPtrListIterator<KCModule> it(modules);
for (; it.current(); ++it)
{
it.current()->defaults();
diff --git a/kcontrol/ebrowsing/main.h b/kcontrol/ebrowsing/main.h
index 6b9a0aa21..8508b0a0b 100644
--- a/kcontrol/ebrowsing/main.h
+++ b/kcontrol/ebrowsing/main.h
@@ -33,7 +33,7 @@ class KURIFilterModule : public KCModule {
Q_OBJECT
public:
- KURIFilterModule(QWidget *parent, const char *name, const QStringList &);
+ KURIFilterModule(TQWidget *parent, const char *name, const TQStringList &);
void load();
void load(bool useDefaults );
@@ -43,9 +43,9 @@ public:
private:
KURIFilter *filter;
- QWidget *widget;
+ TQWidget *widget;
FilterOptions *opts;
- QPtrList<KCModule> modules;
+ TQPtrList<KCModule> modules;
};
#endif
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index ca79f0b36..6d89c3219 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -17,15 +17,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qcheckbox.h>
-#include <qfile.h>
-#include <qgroupbox.h>
-#include <qheader.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qvbox.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqfile.h>
+#include <tqgroupbox.h>
+#include <tqheader.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqvbox.h>
+#include <tqwhatsthis.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -52,8 +52,8 @@
class SearchProviderItem : public QCheckListItem
{
public:
- SearchProviderItem(QListView *parent, SearchProvider *provider)
- :QCheckListItem(parent, provider->name(), CheckBox), m_provider(provider)
+ SearchProviderItem(TQListView *parent, SearchProvider *provider)
+ :TQCheckListItem(parent, provider->name(), CheckBox), m_provider(provider)
{
update();
}
@@ -75,10 +75,10 @@ private:
SearchProvider *m_provider;
};
-FilterOptions::FilterOptions(KInstance *instance, QWidget *parent, const char *name)
+FilterOptions::FilterOptions(KInstance *instance, TQWidget *parent, const char *name)
:KCModule(instance, parent, name)
{
- QVBoxLayout *mainLayout = new QVBoxLayout( this, KDialog::marginHint(),
+ TQVBoxLayout *mainLayout = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint());
m_dlg = new FilterOptionsUI (this);
@@ -91,7 +91,7 @@ FilterOptions::FilterOptions(KInstance *instance, QWidget *parent, const char *n
load();
}
-QString FilterOptions::quickHelp() const
+TQString FilterOptions::quickHelp() const
{
return i18n("In this module you can configure the web shortcuts feature. "
"Web shortcuts allow you to quickly search or lookup words on "
@@ -120,7 +120,7 @@ void FilterOptions::load( bool useDefaults )
config.setGroup("General");
- QString defaultSearchEngine = config.readEntry("DefaultSearchEngine");
+ TQString defaultSearchEngine = config.readEntry("DefaultSearchEngine");
m_favoriteEngines.clear();
m_favoriteEngines << "google" << "google_groups" << "google_news" << "webster" << "dmoz" << "wikipedia";
@@ -147,35 +147,35 @@ void FilterOptions::load( bool useDefaults )
m_dlg->lvSearchProviders->setSelected(m_dlg->lvSearchProviders->firstChild(), true);
// Connect all the signals/slots...
- connect(m_dlg->cbEnableShortcuts, SIGNAL(clicked()), this,
- SLOT(setWebShortcutState()));
- connect(m_dlg->cbEnableShortcuts, SIGNAL(clicked()), this,
- SLOT(configChanged()));
-
- connect(m_dlg->lvSearchProviders, SIGNAL(selectionChanged(QListViewItem *)),
- this, SLOT(updateSearchProvider()));
- connect(m_dlg->lvSearchProviders, SIGNAL(doubleClicked(QListViewItem *)),
- this, SLOT(changeSearchProvider()));
- connect(m_dlg->lvSearchProviders, SIGNAL(returnPressed(QListViewItem *)),
- this, SLOT(changeSearchProvider()));
- connect(m_dlg->lvSearchProviders, SIGNAL(executed(QListViewItem *)),
- this, SLOT(checkFavoritesChanged()));
- connect(m_dlg->lvSearchProviders, SIGNAL(spacePressed(QListViewItem *)),
- this, SLOT(checkFavoritesChanged()));
- connect(m_dlg->lvSearchProviders, SIGNAL(pressed(QListViewItem *)),
- this, SLOT(checkFavoritesChanged()));
- connect(m_dlg->lvSearchProviders, SIGNAL(clicked(QListViewItem *)),
- this, SLOT(checkFavoritesChanged()));
-
-
- connect(m_dlg->cmbDefaultEngine, SIGNAL(activated(const QString &)), this,
- SLOT(configChanged()));
- connect(m_dlg->cmbDelimiter, SIGNAL(activated(const QString &)), this,
- SLOT(configChanged()));
-
- connect(m_dlg->pbNew, SIGNAL(clicked()), this, SLOT(addSearchProvider()));
- connect(m_dlg->pbChange, SIGNAL(clicked()), this, SLOT(changeSearchProvider()));
- connect(m_dlg->pbDelete, SIGNAL(clicked()), this, SLOT(deleteSearchProvider()));
+ connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this,
+ TQT_SLOT(setWebShortcutState()));
+ connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this,
+ TQT_SLOT(configChanged()));
+
+ connect(m_dlg->lvSearchProviders, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
+ this, TQT_SLOT(updateSearchProvider()));
+ connect(m_dlg->lvSearchProviders, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
+ this, TQT_SLOT(changeSearchProvider()));
+ connect(m_dlg->lvSearchProviders, TQT_SIGNAL(returnPressed(TQListViewItem *)),
+ this, TQT_SLOT(changeSearchProvider()));
+ connect(m_dlg->lvSearchProviders, TQT_SIGNAL(executed(TQListViewItem *)),
+ this, TQT_SLOT(checkFavoritesChanged()));
+ connect(m_dlg->lvSearchProviders, TQT_SIGNAL(spacePressed(TQListViewItem *)),
+ this, TQT_SLOT(checkFavoritesChanged()));
+ connect(m_dlg->lvSearchProviders, TQT_SIGNAL(pressed(TQListViewItem *)),
+ this, TQT_SLOT(checkFavoritesChanged()));
+ connect(m_dlg->lvSearchProviders, TQT_SIGNAL(clicked(TQListViewItem *)),
+ this, TQT_SLOT(checkFavoritesChanged()));
+
+
+ connect(m_dlg->cmbDefaultEngine, TQT_SIGNAL(activated(const TQString &)), this,
+ TQT_SLOT(configChanged()));
+ connect(m_dlg->cmbDelimiter, TQT_SIGNAL(activated(const TQString &)), this,
+ TQT_SLOT(configChanged()));
+
+ connect(m_dlg->pbNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(addSearchProvider()));
+ connect(m_dlg->pbChange, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeSearchProvider()));
+ connect(m_dlg->pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSearchProvider()));
emit changed( useDefaults );
}
@@ -213,7 +213,7 @@ void FilterOptions::save()
config.writeEntry("EnableWebShortcuts", m_dlg->cbEnableShortcuts->isChecked());
config.writeEntry("KeywordDelimiter", delimiter() );
- QString engine;
+ TQString engine;
if (m_dlg->cmbDefaultEngine->currentItem() != 0)
engine = m_dlg->cmbDefaultEngine->currentText();
@@ -223,11 +223,11 @@ void FilterOptions::save()
// kdDebug () << "Engine: " << m_defaultEngineMap[engine] << endl;
int changedProviderCount = 0;
- QString path = kapp->dirs()->saveLocation("services", "searchproviders/");
+ TQString path = kapp->dirs()->saveLocation("services", "searchproviders/");
m_favoriteEngines.clear();
- for (QListViewItemIterator it(m_dlg->lvSearchProviders); it.current(); ++it)
+ for (TQListViewItemIterator it(m_dlg->lvSearchProviders); it.current(); ++it)
{
SearchProviderItem *item = dynamic_cast<SearchProviderItem *>(it.current());
@@ -235,7 +235,7 @@ void FilterOptions::save()
SearchProvider *provider = item->provider();
- QString name = provider->desktopEntryName();
+ TQString name = provider->desktopEntryName();
if (item->isOn())
m_favoriteEngines << name;
@@ -250,16 +250,16 @@ void FilterOptions::save()
// Take the longest search shortcut as filename,
// if such a file already exists, append a number and increase it
// until the name is unique
- for (QStringList::ConstIterator it = provider->keys().begin(); it != provider->keys().end(); ++it)
+ for (TQStringList::ConstIterator it = provider->keys().begin(); it != provider->keys().end(); ++it)
{
if ((*it).length() > name.length())
name = (*it).lower();
}
for (int suffix = 0; ; ++suffix)
{
- QString located, check = name;
+ TQString located, check = name;
if (suffix)
- check += QString().setNum(suffix);
+ check += TQString().setNum(suffix);
if ((located = locate("services", "searchproviders/" + check + ".desktop")).isEmpty())
{
name = check;
@@ -288,10 +288,10 @@ void FilterOptions::save()
}
}
- for (QStringList::ConstIterator it = m_deletedProviders.begin();
+ for (TQStringList::ConstIterator it = m_deletedProviders.begin();
it != m_deletedProviders.end(); ++it)
{
- QStringList matches = kapp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop");
+ TQStringList matches = kapp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop");
// Shouldn't happen
if (!matches.count())
@@ -301,7 +301,7 @@ void FilterOptions::save()
{
// If only the local copy existed, unlink it
// TODO: error handling
- QFile::remove(matches[0]);
+ TQFile::remove(matches[0]);
continue;
}
KSimpleConfig service(path + *it + ".desktop");
@@ -338,8 +338,8 @@ void FilterOptions::configChanged()
void FilterOptions::checkFavoritesChanged()
{
- QStringList currentFavoriteEngines;
- for (QListViewItemIterator it(m_dlg->lvSearchProviders); it.current(); ++it)
+ TQStringList currentFavoriteEngines;
+ for (TQListViewItemIterator it(m_dlg->lvSearchProviders); it.current(); ++it)
{
SearchProviderItem *item = dynamic_cast<SearchProviderItem *>(it.current());
@@ -437,7 +437,7 @@ SearchProviderItem *FilterOptions::displaySearchProvider(SearchProvider *p, bool
// Show the provider in the list.
SearchProviderItem *item = 0L;
- QListViewItemIterator it(m_dlg->lvSearchProviders);
+ TQListViewItemIterator it(m_dlg->lvSearchProviders);
for (; it.current(); ++it)
{
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
index b533fb9a7..e39997995 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
@@ -20,8 +20,8 @@
#ifndef __IKWSOPTS_H___
#define __IKWSOPTS_H___
-#include <qlayout.h>
-#include <qtabwidget.h>
+#include <tqlayout.h>
+#include <tqtabwidget.h>
#include <kcmodule.h>
#include <kservice.h>
@@ -35,13 +35,13 @@ class FilterOptions : public KCModule
Q_OBJECT
public:
- FilterOptions(KInstance *instance, QWidget *parent = 0, const char *name = 0);
+ FilterOptions(KInstance *instance, TQWidget *parent = 0, const char *name = 0);
void load();
void load( bool useDefaults );
void save();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
protected slots:
void configChanged();
@@ -63,9 +63,9 @@ private:
// The names of the providers that the user deleted,
// these are marked as deleted in the user's homedirectory
// on save if a global service file exists for it.
- QStringList m_deletedProviders;
- QMap <QString, QString> m_defaultEngineMap;
- QStringList m_favoriteEngines;
+ TQStringList m_deletedProviders;
+ TQMap <TQString, TQString> m_defaultEngineMap;
+ TQStringList m_favoriteEngines;
FilterOptionsUI* m_dlg;
};
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
index a7e2e5239..b91d14702 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
@@ -38,7 +38,7 @@
typedef KGenericFactory<KAutoWebSearch> KAutoWebSearchFactory;
K_EXPORT_COMPONENT_FACTORY (libkuriikwsfilter, KAutoWebSearchFactory("kcmkurifilt"))
-KAutoWebSearch::KAutoWebSearch(QObject *parent, const char *name, const QStringList&)
+KAutoWebSearch::KAutoWebSearch(TQObject *parent, const char *name, const TQStringList&)
:KURIFilterPlugin(parent, name ? name : "kuriikwsfilter", 1.0),
DCOPObject("KURIIKWSFilterIface")
{
@@ -64,7 +64,7 @@ bool KAutoWebSearch::filterURI( KURIFilterData &data ) const
KURL u = data.uri();
if ( u.pass().isEmpty() )
{
- QString result = KURISearchFilterEngine::self()->autoWebSearchQuery( data.typedString() );
+ TQString result = KURISearchFilterEngine::self()->autoWebSearchQuery( data.typedString() );
if( !result.isEmpty() )
{
if ( KURISearchFilterEngine::self()->verbose() )
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h
index e286b3bd6..77e8c8b0f 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h
@@ -34,8 +34,8 @@ class KAutoWebSearch : public KURIFilterPlugin, public DCOPObject
K_DCOP
Q_OBJECT
public:
- KAutoWebSearch(QObject *parent = 0, const char *name = 0,
- const QStringList &args = QStringList() );
+ KAutoWebSearch(TQObject *parent = 0, const char *name = 0,
+ const TQStringList &args = TQStringList() );
~KAutoWebSearch();
virtual bool filterURI( KURIFilterData& ) const;
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
index 9cf0cf94d..9f3a245fc 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
@@ -26,8 +26,8 @@
#include <unistd.h>
-#include <qregexp.h>
-#include <qtextcodec.h>
+#include <tqregexp.h>
+#include <tqtextcodec.h>
#include <kurl.h>
#include <kdebug.h>
@@ -57,16 +57,16 @@ KURISearchFilterEngine::KURISearchFilterEngine()
loadConfig();
}
-QString KURISearchFilterEngine::webShortcutQuery( const QString& typedString ) const
+TQString KURISearchFilterEngine::webShortcutQuery( const TQString& typedString ) const
{
- QString result;
+ TQString result;
if (m_bWebShortcutsEnabled)
{
- QString search = typedString;
+ TQString search = typedString;
int pos = search.find(m_cKeywordDelimiter);
- QString key;
+ TQString key;
if (pos > -1)
key = search.left(pos);
else if (m_cKeywordDelimiter == ' ' && !search.isEmpty())
@@ -81,7 +81,7 @@ QString KURISearchFilterEngine::webShortcutQuery( const QString& typedString ) c
if (provider)
{
result = formatResult(provider->query(), provider->charset(),
- QString::null, search.mid(pos+1), true);
+ TQString::null, search.mid(pos+1), true);
delete provider;
}
}
@@ -91,9 +91,9 @@ QString KURISearchFilterEngine::webShortcutQuery( const QString& typedString ) c
}
-QString KURISearchFilterEngine::autoWebSearchQuery( const QString& typedString ) const
+TQString KURISearchFilterEngine::autoWebSearchQuery( const TQString& typedString ) const
{
- QString result;
+ TQString result;
if (m_bWebShortcutsEnabled && !m_defaultSearchEngine.isEmpty())
{
@@ -107,7 +107,7 @@ QString KURISearchFilterEngine::autoWebSearchQuery( const QString& typedString )
if (provider)
{
result = formatResult (provider->query(), provider->charset(),
- QString::null, typedString, true);
+ TQString::null, typedString, true);
delete provider;
}
}
@@ -116,7 +116,7 @@ QString KURISearchFilterEngine::autoWebSearchQuery( const QString& typedString )
return result;
}
-QCString KURISearchFilterEngine::name() const
+TQCString KURISearchFilterEngine::name() const
{
return "kuriikwsfilter";
}
@@ -128,17 +128,17 @@ KURISearchFilterEngine* KURISearchFilterEngine::self()
return s_pSelf;
}
-QStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
- const QString& query) const
+TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
+ const TQString& query) const
{
// Returns the number of query words
- QString userquery = query;
+ TQString userquery = query;
// Do some pre-encoding, before we can start the work:
{
int start = 0;
int pos = 0;
- QRegExp qsexpr("\\\"[^\\\"]*\\\"");
+ TQRegExp qsexpr("\\\"[^\\\"]*\\\"");
// Temporary substitute spaces in quoted strings (" " -> "%20")
// Needed to split user query into StringList correctly.
@@ -146,7 +146,7 @@ QStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
{
int i = 0;
int n = 0;
- QString s = userquery.mid (pos, qsexpr.matchedLength());
+ TQString s = userquery.mid (pos, qsexpr.matchedLength());
while ((i = s.find(" ")) != -1)
{
s = s.replace (i, 1, "%20");
@@ -158,7 +158,7 @@ QStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
}
// Split user query between spaces:
- QStringList l = QStringList::split(" ", userquery.simplifyWhiteSpace());
+ TQStringList l = TQStringList::split(" ", userquery.simplifyWhiteSpace());
// Back-substitute quoted strings (%20 -> " "):
{
@@ -166,7 +166,7 @@ QStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
while ((i = userquery.find("%20")) != -1)
userquery = userquery.replace(i, 3, " ");
- for ( QStringList::Iterator it = l.begin(); it != l.end(); ++it )
+ for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it )
*it = (*it).replace("%20", " ");
}
@@ -176,8 +176,8 @@ QStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
{
int j = 0;
int pos = 0;
- QString v = "";
- QString nr = QString::number(i);
+ TQString v = "";
+ TQString nr = TQString::number(i);
// Add whole user query (\{0}) to substitution map:
if (i==0)
@@ -191,15 +191,15 @@ QStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
v = v.replace(j, 3, " ");
// Insert partial queries (referenced by \1 ... \n) to map:
- map.replace(QString::number(i), v);
+ map.replace(TQString::number(i), v);
PDVAR (" map['" + nr + "']", map[nr]);
// Insert named references (referenced by \name) to map:
j = 0;
if ((i>0) && (pos = v.find("=")) > 0)
{
- QString s = v.mid(pos + 1);
- QString k = v.left(pos);
+ TQString s = v.mid(pos + 1);
+ TQString k = v.left(pos);
// Back-substitute references contained in references (e.g. '\refname' substitutes to 'thisquery=\0')
while ((j = s.find("%5C")) != -1) s = s.replace(j, 3, "\\");
@@ -211,10 +211,10 @@ QStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
return l;
}
-static QString encodeString(const QString &s, int mib)
+static TQString encodeString(const TQString &s, int mib)
{
- QStringList l = QStringList::split(" ", s, true);
- for(QStringList::Iterator it = l.begin();
+ TQStringList l = TQStringList::split(" ", s, true);
+ for(TQStringList::Iterator it = l.begin();
it != l.end(); ++it)
{
*it = KURL::encode_string(*it, mib);
@@ -222,10 +222,10 @@ static QString encodeString(const QString &s, int mib)
return l.join("+");
}
-QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &map, const QString& userquery, const int encodingMib) const
+TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &map, const TQString& userquery, const int encodingMib) const
{
- QString newurl = url;
- QStringList ql = modifySubstitutionMap (map, userquery);
+ TQString newurl = url;
+ TQStringList ql = modifySubstitutionMap (map, userquery);
int count = ql.count();
// Check, if old style '\1' is found and replace it with \{@} (compatibility mode):
@@ -244,7 +244,7 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma
// Substitute references (\{ref1,ref2,...}) with values from user query:
{
int pos = 0;
- QRegExp reflist("\\\\\\{[^\\}]+\\}");
+ TQRegExp reflist("\\\\\\{[^\\}]+\\}");
// Substitute reflists (\{ref1,ref2,...}):
while ((pos = reflist.search(newurl, 0)) >= 0)
@@ -252,8 +252,8 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma
bool found = false;
//bool rest = false;
- QString v = "";
- QString rlstring = newurl.mid(pos + 2, reflist.matchedLength() - 3);
+ TQString v = "";
+ TQString rlstring = newurl.mid(pos + 2, reflist.matchedLength() - 3);
PDVAR (" reference list", rlstring);
// \{@} gets a special treatment later
@@ -264,13 +264,13 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma
}
// TODO: strip whitespaces around commas
- QStringList rl = QStringList::split(",", rlstring);
+ TQStringList rl = TQStringList::split(",", rlstring);
unsigned int i = 0;
while ((i<rl.count()) && !found)
{
- QString rlitem = rl[i];
- QRegExp range("[0-9]*\\-[0-9]*");
+ TQString rlitem = rl[i];
+ TQRegExp range("[0-9]*\\-[0-9]*");
// Substitute a range of keywords
if (range.search(rlitem, 0) >= 0)
@@ -287,7 +287,7 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma
for (int i=first; i<=last; i++)
{
- v += map[QString::number(i)] + " ";
+ v += map[TQString::number(i)] + " ";
// Remove used value from ql (needed for \{@}):
ql[i-1] = "";
}
@@ -296,14 +296,14 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma
if (!v.isEmpty())
found = true;
- PDVAR (" range", QString::number(first) + "-" + QString::number(last) + " => '" + v + "'");
+ PDVAR (" range", TQString::number(first) + "-" + TQString::number(last) + " => '" + v + "'");
v = encodeString(v, encodingMib);
}
else if ( rlitem.startsWith("\"") && rlitem.endsWith("\"") )
{
// Use default string from query definition:
found = true;
- QString s = rlitem.mid(1, rlitem.length() - 2);
+ TQString s = rlitem.mid(1, rlitem.length() - 2);
v = encodeString(s, encodingMib);
PDVAR (" default", s);
}
@@ -315,11 +315,11 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma
v = encodeString(map[rlitem], encodingMib);
// Remove used value from ql (needed for \{@}):
- QString c = rlitem.left(1);
+ TQString c = rlitem.left(1);
if (c=="0")
{
// It's a numeric reference to '0'
- for (QStringList::Iterator it = ql.begin(); it!=ql.end(); ++it)
+ for (TQStringList::Iterator it = ql.begin(); it!=ql.end(); ++it)
(*it) = "";
}
else if ((c>="0") && (c<="9"))
@@ -331,7 +331,7 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma
else
{
// It's a alphanumeric reference
- QStringList::Iterator it = ql.begin();
+ TQStringList::Iterator it = ql.begin();
while ((it != ql.end()) && ((rlitem + "=") != (*it).left(rlitem.length()+1)))
++it;
if ((rlitem + "=") == (*it).left(rlitem.length()+1))
@@ -360,7 +360,7 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma
{
PDVAR (" newurl", newurl);
// Generate list of unmatched strings:
- QString v = "";
+ TQString v = "";
for (unsigned int i=0; i<ql.count(); i++) {
v += " " + ql[i];
}
@@ -378,27 +378,27 @@ QString KURISearchFilterEngine::substituteQuery(const QString& url, SubstMap &ma
return newurl;
}
-QString KURISearchFilterEngine::formatResult( const QString& url,
- const QString& cset1,
- const QString& cset2,
- const QString& query,
+TQString KURISearchFilterEngine::formatResult( const TQString& url,
+ const TQString& cset1,
+ const TQString& cset2,
+ const TQString& query,
bool isMalformed ) const
{
SubstMap map;
return formatResult (url, cset1, cset2, query, isMalformed, map);
}
-QString KURISearchFilterEngine::formatResult( const QString& url,
- const QString& cset1,
- const QString& cset2,
- const QString& query,
+TQString KURISearchFilterEngine::formatResult( const TQString& url,
+ const TQString& cset1,
+ const TQString& cset2,
+ const TQString& query,
bool /* isMalformed */,
SubstMap& map ) const
{
// Return nothing if userquery is empty and it contains
// substitution strings...
- if (query.isEmpty() && url.find(QRegExp(QRegExp::escape("\\{"))) > 0)
- return QString::null;
+ if (query.isEmpty() && url.find(TQRegExp(TQRegExp::escape("\\{"))) > 0)
+ return TQString::null;
// Debug info of map:
if (!map.isEmpty())
@@ -409,19 +409,19 @@ QString KURISearchFilterEngine::formatResult( const QString& url,
}
// Create a codec for the desired encoding so that we can transcode the user's "url".
- QString cseta = cset1;
+ TQString cseta = cset1;
if (cseta.isEmpty())
cseta = "iso-8859-1";
- QTextCodec *csetacodec = QTextCodec::codecForName(cseta.latin1());
+ TQTextCodec *csetacodec = TQTextCodec::codecForName(cseta.latin1());
if (!csetacodec)
{
cseta = "iso-8859-1";
- csetacodec = QTextCodec::codecForName(cseta.latin1());
+ csetacodec = TQTextCodec::codecForName(cseta.latin1());
}
// Decode user query:
- QString userquery = KURL::decode_string(query, 106 /* utf-8*/);
+ TQString userquery = KURL::decode_string(query, 106 /* utf-8*/);
PDVAR ("user query", userquery);
PDVAR ("query definition", url);
@@ -430,12 +430,12 @@ QString KURISearchFilterEngine::formatResult( const QString& url,
map.replace("ikw_charset", cseta);
// Add charset indicator for the fallback query to substitution map:
- QString csetb = cset2;
+ TQString csetb = cset2;
if (csetb.isEmpty())
csetb = "iso-8859-1";
map.replace("wsc_charset", csetb);
- QString newurl = substituteQuery (url, map, userquery, csetacodec->mibEnum());
+ TQString newurl = substituteQuery (url, map, userquery, csetacodec->mibEnum());
PDVAR ("substituted query", newurl);
@@ -449,28 +449,28 @@ void KURISearchFilterEngine::loadConfig()
// contains the sycoca based search provider configuration (malte).
// TODO: Remove in KDE 4 !!! This has been here a sufficient amount of time...
{
- KSimpleConfig oldConfig(kapp->dirs()->saveLocation("config") + QString(name()) + "rc");
+ KSimpleConfig oldConfig(kapp->dirs()->saveLocation("config") + TQString(name()) + "rc");
oldConfig.setGroup("General");
if (oldConfig.hasKey("SearchEngines"))
{
// User has an old config file in his local config dir
PIDDBG << "Migrating config file to .desktop files..." << endl;
- QString fallback = oldConfig.readEntry("InternetKeywordsSearchFallback");
- QStringList engines = oldConfig.readListEntry("SearchEngines");
- for (QStringList::ConstIterator it = engines.begin(); it != engines.end(); ++it)
+ TQString fallback = oldConfig.readEntry("InternetKeywordsSearchFallback");
+ TQStringList engines = oldConfig.readListEntry("SearchEngines");
+ for (TQStringList::ConstIterator it = engines.begin(); it != engines.end(); ++it)
{
if (!oldConfig.hasGroup(*it + " Search"))
continue;
oldConfig.setGroup(*it + " Search");
- QString query = oldConfig.readEntry("Query");
- QStringList keys = oldConfig.readListEntry("Keys");
- QString charset = oldConfig.readEntry("Charset");
+ TQString query = oldConfig.readEntry("Query");
+ TQStringList keys = oldConfig.readListEntry("Keys");
+ TQString charset = oldConfig.readEntry("Charset");
oldConfig.deleteGroup(*it + " Search");
- QString name;
- for (QStringList::ConstIterator key = keys.begin(); key != keys.end(); ++key)
+ TQString name;
+ for (TQStringList::ConstIterator key = keys.begin(); key != keys.end(); ++key)
{
// take the longest key as name for the .desktop file
if ((*key).length() > name.length())
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.h b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.h
index d45c17033..35c519aec 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.h
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.h
@@ -25,8 +25,8 @@
#ifndef __KURISearchFILTERENGINE_H__
#define __KURISearchFILTERENGINE_H__
-#include <qvaluelist.h>
-#include <qstringlist.h>
+#include <tqvaluelist.h>
+#include <tqstringlist.h>
#include <kservice.h>
@@ -36,16 +36,16 @@ class KURL;
class KURISearchFilterEngine
{
public:
- typedef QMap <QString, QString> SubstMap;
+ typedef TQMap <TQString, TQString> SubstMap;
KURISearchFilterEngine();
~KURISearchFilterEngine() {};
- QCString name() const;
+ TQCString name() const;
- QString webShortcutQuery (const QString&) const;
+ TQString webShortcutQuery (const TQString&) const;
- QString autoWebSearchQuery (const QString&) const;
+ TQString autoWebSearchQuery (const TQString&) const;
bool verbose() const { return m_bVerbose; }
@@ -54,23 +54,23 @@ public:
static KURISearchFilterEngine *self();
protected:
- QString formatResult (const QString& url, const QString& cset1, const QString& cset2,
- const QString& query, bool isMalformed) const;
+ TQString formatResult (const TQString& url, const TQString& cset1, const TQString& cset2,
+ const TQString& query, bool isMalformed) const;
- QString formatResult (const QString& url, const QString& cset1, const QString& cset2,
- const QString& query, bool isMalformed, SubstMap& map) const;
+ TQString formatResult (const TQString& url, const TQString& cset1, const TQString& cset2,
+ const TQString& query, bool isMalformed, SubstMap& map) const;
private:
- QStringList modifySubstitutionMap (SubstMap& map, const QString& query) const;
+ TQStringList modifySubstitutionMap (SubstMap& map, const TQString& query) const;
- QString substituteQuery (const QString& url, SubstMap &map,
- const QString& userquery, const int encodingMib) const;
+ TQString substituteQuery (const TQString& url, SubstMap &map,
+ const TQString& userquery, const int encodingMib) const;
bool m_bVerbose;
bool m_bWebShortcutsEnabled;
char m_cKeywordDelimiter;
- QString m_defaultSearchEngine;
+ TQString m_defaultSearchEngine;
static KURISearchFilterEngine *s_pSelf;
};
diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
index d56220935..6280f3899 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
@@ -38,8 +38,8 @@
typedef KGenericFactory<KURISearchFilter> KURISearchFilterFactory;
K_EXPORT_COMPONENT_FACTORY(libkurisearchfilter, KURISearchFilterFactory("kcmkurifilt"))
-KURISearchFilter::KURISearchFilter(QObject *parent, const char *name,
- const QStringList &)
+KURISearchFilter::KURISearchFilter(TQObject *parent, const char *name,
+ const TQStringList &)
:KURIFilterPlugin(parent, name ? name : "kurisearchfilter", 1.0),
DCOPObject("KURISearchFilterIface")
{
@@ -62,7 +62,7 @@ bool KURISearchFilter::filterURI( KURIFilterData &data ) const
if ( KURISearchFilterEngine::self()->verbose() )
kdDebug() << "KURISearchFilter::filterURI: '" << data.typedString() << "'" << endl;
- QString result = KURISearchFilterEngine::self()->webShortcutQuery( data.typedString() );
+ TQString result = KURISearchFilterEngine::self()->webShortcutQuery( data.typedString() );
if ( !result.isEmpty() )
{
@@ -77,12 +77,12 @@ bool KURISearchFilter::filterURI( KURIFilterData &data ) const
return false;
}
-KCModule *KURISearchFilter::configModule(QWidget *parent, const char *) const
+KCModule *KURISearchFilter::configModule(TQWidget *parent, const char *) const
{
return new FilterOptions( KURISearchFilterFactory::instance(), parent, "kcmkurifilt");
}
-QString KURISearchFilter::configName() const
+TQString KURISearchFilter::configName() const
{
return i18n("Search F&ilters");
}
diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
index 0b8dd1b14..eff650902 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
+++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
@@ -34,13 +34,13 @@ class KURISearchFilter : public KURIFilterPlugin, public DCOPObject
Q_OBJECT
K_DCOP
public:
- KURISearchFilter(QObject *parent = 0, const char *name = 0,
- const QStringList &args = QStringList() );
+ KURISearchFilter(TQObject *parent = 0, const char *name = 0,
+ const TQStringList &args = TQStringList() );
~KURISearchFilter();
virtual bool filterURI( KURIFilterData& ) const;
- virtual KCModule *configModule(QWidget *parent = 0, const char *name = 0) const;
- virtual QString configName() const;
+ virtual KCModule *configModule(TQWidget *parent = 0, const char *name = 0) const;
+ virtual TQString configName() const;
k_dcop:
virtual void configure();
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp b/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp
index c9e13dc1f..11b7ee692 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp
@@ -30,7 +30,7 @@ SearchProvider::SearchProvider(const KService::Ptr service)
m_charset = service->property("Charset").toString();
}
-void SearchProvider::setName(const QString &name)
+void SearchProvider::setName(const TQString &name)
{
if (m_name == name)
return;
@@ -38,7 +38,7 @@ void SearchProvider::setName(const QString &name)
m_dirty = true;
}
-void SearchProvider::setQuery(const QString &query)
+void SearchProvider::setQuery(const TQString &query)
{
if (m_query == query)
return;
@@ -46,7 +46,7 @@ void SearchProvider::setQuery(const QString &query)
m_dirty = true;
}
-void SearchProvider::setKeys(const QStringList &keys)
+void SearchProvider::setKeys(const TQStringList &keys)
{
if (m_keys == keys)
return;
@@ -54,7 +54,7 @@ void SearchProvider::setKeys(const QStringList &keys)
m_dirty = true;
}
-void SearchProvider::setCharset(const QString &charset)
+void SearchProvider::setCharset(const TQString &charset)
{
if (m_charset == charset)
return;
@@ -62,17 +62,17 @@ void SearchProvider::setCharset(const QString &charset)
m_dirty = true;
}
-SearchProvider *SearchProvider::findByDesktopName(const QString &name)
+SearchProvider *SearchProvider::findByDesktopName(const TQString &name)
{
KService::Ptr service =
- KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(name));
+ KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(name));
return service ? new SearchProvider(service) : 0;
}
-SearchProvider *SearchProvider::findByKey(const QString &key)
+SearchProvider *SearchProvider::findByKey(const TQString &key)
{
KTrader::OfferList providers =
- KTrader::self()->query("SearchProvider", QString("'%1' in Keys").arg(key));
+ KTrader::self()->query("SearchProvider", TQString("'%1' in Keys").arg(key));
return providers.count() ? new SearchProvider(providers[0]) : 0;
}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchprovider.h b/kcontrol/ebrowsing/plugins/ikws/searchprovider.h
index b7916892c..45309939c 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchprovider.h
+++ b/kcontrol/ebrowsing/plugins/ikws/searchprovider.h
@@ -28,26 +28,26 @@ public:
SearchProvider() : m_dirty(false) {};
SearchProvider(const KService::Ptr service);
- const QString &desktopEntryName() const { return m_desktopEntryName; }
- const QString &name() const { return m_name; }
- const QString &query() const { return m_query; }
- const QStringList &keys() const { return m_keys; }
- const QString &charset() const { return m_charset; }
+ const TQString &desktopEntryName() const { return m_desktopEntryName; }
+ const TQString &name() const { return m_name; }
+ const TQString &query() const { return m_query; }
+ const TQStringList &keys() const { return m_keys; }
+ const TQString &charset() const { return m_charset; }
bool isDirty() const { return m_dirty; }
- void setName(const QString &);
- void setQuery(const QString &);
- void setKeys(const QStringList &);
- void setCharset(const QString &);
+ void setName(const TQString &);
+ void setQuery(const TQString &);
+ void setKeys(const TQStringList &);
+ void setCharset(const TQString &);
- static SearchProvider *findByDesktopName(const QString &);
- static SearchProvider *findByKey(const QString &);
+ static SearchProvider *findByDesktopName(const TQString &);
+ static SearchProvider *findByKey(const TQString &);
private:
- QString m_desktopEntryName;
- QString m_name;
- QString m_query;
- QStringList m_keys;
- QString m_charset;
+ TQString m_desktopEntryName;
+ TQString m_name;
+ TQString m_query;
+ TQStringList m_keys;
+ TQString m_charset;
bool m_dirty;
};
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
index ca7161b1c..586f947ff 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
@@ -16,10 +16,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqwhatsthis.h>
#include <kapplication.h>
#include <klocale.h>
@@ -34,8 +34,8 @@
#include "searchprovider.h"
SearchProviderDialog::SearchProviderDialog(SearchProvider *provider,
- QWidget *parent, const char *name)
- :KDialogBase(parent, name, true, QString::null, Ok|Cancel),
+ TQWidget *parent, const char *name)
+ :KDialogBase(parent, name, true, TQString::null, Ok|Cancel),
m_provider(provider)
{
m_dlg = new SearchProviderDlgUI (this);
@@ -45,12 +45,12 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider,
m_dlg->leQuery->setMinimumWidth(kapp->fontMetrics().maxWidth() * 40);
- connect(m_dlg->leName, SIGNAL(textChanged(const QString &)), SLOT(slotChanged()));
- connect(m_dlg->leQuery, SIGNAL(textChanged(const QString &)), SLOT(slotChanged()));
- connect(m_dlg->leShortcut, SIGNAL(textChanged(const QString &)), SLOT(slotChanged()));
+ connect(m_dlg->leName, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged()));
+ connect(m_dlg->leQuery, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged()));
+ connect(m_dlg->leShortcut, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged()));
// Data init
- QStringList charsets = KGlobal::charsets()->availableEncodingNames();
+ TQStringList charsets = KGlobal::charsets()->availableEncodingNames();
charsets.prepend(i18n("Default"));
m_dlg->cbCharset->insertStringList(charsets);
@@ -86,15 +86,15 @@ void SearchProviderDialog::slotOk()
i18n("The URI does not contain a \\{...} placeholder for the user query.\n"
"This means that the same page is always going to be visited, "
"regardless of what the user types."),
- QString::null, i18n("Keep It")) == KMessageBox::Cancel)
+ TQString::null, i18n("Keep It")) == KMessageBox::Cancel)
return;
if (!m_provider)
m_provider = new SearchProvider;
m_provider->setName(m_dlg->leName->text().stripWhiteSpace());
m_provider->setQuery(m_dlg->leQuery->text().stripWhiteSpace());
- m_provider->setKeys(QStringList::split(",", m_dlg->leShortcut->text().stripWhiteSpace()));
- m_provider->setCharset(m_dlg->cbCharset->currentItem() ? m_dlg->cbCharset->currentText() : QString::null);
+ m_provider->setKeys(TQStringList::split(",", m_dlg->leShortcut->text().stripWhiteSpace()));
+ m_provider->setCharset(m_dlg->cbCharset->currentItem() ? m_dlg->cbCharset->currentText() : TQString::null);
KDialog::accept();
}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h
index 5abb2f057..2a23cbf05 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h
@@ -30,7 +30,7 @@ class SearchProviderDialog : public KDialogBase
Q_OBJECT
public:
- SearchProviderDialog(SearchProvider *provider, QWidget *parent = 0, const char *name = 0);
+ SearchProviderDialog(SearchProvider *provider, TQWidget *parent = 0, const char *name = 0);
SearchProvider *provider() { return m_provider; }
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
index 3bd247729..f0986c188 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
@@ -26,8 +26,8 @@
#include <kstandarddirs.h>
#include <kdebug.h>
-#include <qregexp.h>
-#include <qfile.h>
+#include <tqregexp.h>
+#include <tqfile.h>
#define HOSTPORT_PATTERN "[a-zA-Z0-9][a-zA-Z0-9+-]*(?:\\:[0-9]{1,5})?(?:/[\\w:@&=+$,-.!~*'()]*)*"
@@ -36,12 +36,12 @@
* kdelibs/kio/tests/kurifiltertest
*/
-LocalDomainURIFilter::LocalDomainURIFilter( QObject *parent, const char *name,
- const QStringList & /*args*/ )
+LocalDomainURIFilter::LocalDomainURIFilter( TQObject *parent, const char *name,
+ const TQStringList & /*args*/ )
: KURIFilterPlugin( parent, name ? name : "localdomainurifilter", 1.0 ),
DCOPObject( "LocalDomainURIFilterIface" ),
last_time( 0 ),
- m_hostPortPattern( QString::fromLatin1(HOSTPORT_PATTERN) )
+ m_hostPortPattern( TQString::fromLatin1(HOSTPORT_PATTERN) )
{
configure();
}
@@ -49,14 +49,14 @@ LocalDomainURIFilter::LocalDomainURIFilter( QObject *parent, const char *name,
bool LocalDomainURIFilter::filterURI( KURIFilterData& data ) const
{
KURL url = data.uri();
- QString cmd = url.url();
+ TQString cmd = url.url();
kdDebug() << "LocalDomainURIFilter::filterURI: " << url << endl;
if( m_hostPortPattern.exactMatch( cmd ) &&
isLocalDomainHost( cmd ) )
{
- cmd.prepend( QString::fromLatin1("http://") );
+ cmd.prepend( TQString::fromLatin1("http://") );
setFilteredURI( data, KURL( cmd ) );
setURIType( data, KURIFilterData::NET_PROTOCOL );
@@ -68,24 +68,24 @@ bool LocalDomainURIFilter::filterURI( KURIFilterData& data ) const
}
// if it's e.g. just 'www', try if it's a hostname in the local search domain
-bool LocalDomainURIFilter::isLocalDomainHost( QString& cmd ) const
+bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const
{
// find() returns -1 when no match -> left()/truncate() are noops then
- QString host( cmd.left( cmd.find( '/' ) ) );
+ TQString host( cmd.left( cmd.find( '/' ) ) );
host.truncate( host.find( ':' ) ); // Remove port number
if( !(host == last_host && last_time > time( NULL ) - 5 ) ) {
- QString helper = KStandardDirs::findExe(QString::fromLatin1( "klocaldomainurifilterhelper" ));
+ TQString helper = KStandardDirs::findExe(TQString::fromLatin1( "klocaldomainurifilterhelper" ));
if( helper.isEmpty())
return last_result = false;
- m_fullname = QString::null;
+ m_fullname = TQString::null;
KProcess proc;
proc << helper << host;
- connect( &proc, SIGNAL(receivedStdout(KProcess *, char *, int)),
- SLOT(receiveOutput(KProcess *, char *, int)) );
+ connect( &proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
+ TQT_SLOT(receiveOutput(KProcess *, char *, int)) );
if( !proc.start( KProcess::NotifyOnExit, KProcess::Stdout ))
return last_result = false;
@@ -103,7 +103,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( QString& cmd ) const
void LocalDomainURIFilter::receiveOutput( KProcess *, char *buf, int )
{
- m_fullname = QFile::decodeName( buf );
+ m_fullname = TQFile::decodeName( buf );
}
void LocalDomainURIFilter::configure()
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
index 465214e69..0c8035d89 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
@@ -26,7 +26,7 @@
#include <dcopobject.h>
#include <kgenericfactory.h>
#include <kurifilter.h>
-#include <qregexp.h>
+#include <tqregexp.h>
class KInstance;
class KProcess;
@@ -44,19 +44,19 @@ class LocalDomainURIFilter : public KURIFilterPlugin, public DCOPObject
Q_OBJECT
public:
- LocalDomainURIFilter( QObject* parent, const char* name, const QStringList& args );
+ LocalDomainURIFilter( TQObject* parent, const char* name, const TQStringList& args );
virtual bool filterURI( KURIFilterData &data ) const;
k_dcop:
virtual void configure();
private:
- bool isLocalDomainHost( QString& cmd ) const;
- mutable QString last_host;
+ bool isLocalDomainHost( TQString& cmd ) const;
+ mutable TQString last_host;
mutable bool last_result;
mutable time_t last_time;
- mutable QString m_fullname;
- QRegExp m_hostPortPattern;
+ mutable TQString m_fullname;
+ TQRegExp m_hostPortPattern;
private slots:
void receiveOutput( KProcess *, char *, int );
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
index 3c0677b0f..9d15802f1 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
@@ -26,8 +26,8 @@
#include <pwd.h>
#include <sys/stat.h>
-#include <qdir.h>
-#include <qregexp.h>
+#include <tqdir.h>
+#include <tqregexp.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -43,7 +43,7 @@
#define IPv6_PATTERN "^\\[.*\\]"
#define ENV_VAR_PATTERN "\\$[a-zA-Z_][a-zA-Z0-9_]*"
-#define QFL1(x) QString::fromLatin1(x)
+#define QFL1(x) TQString::fromLatin1(x)
/**
* IMPORTANT:
@@ -54,15 +54,15 @@
* test code to kdelibs/kio/tests/kurifiltertest.
*/
-typedef QMap<QString,QString> EntryMap;
+typedef TQMap<TQString,TQString> EntryMap;
-static bool isValidShortURL( const QString& cmd, bool verbose = false )
+static bool isValidShortURL( const TQString& cmd, bool verbose = false )
{
// Examples of valid short URLs:
// "kde.org", "foo.bar:8080", "user@foo.bar:3128"
// "192.168.1.0", "127.0.0.1:3128"
// "[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]"
- QRegExp exp;
+ TQRegExp exp;
// Match FQDN_PATTERN
exp.setPattern( QFL1(FQDN_PATTERN) );
@@ -110,9 +110,9 @@ static bool isValidShortURL( const QString& cmd, bool verbose = false )
return false;
}
-static QString removeArgs( const QString& _cmd )
+static TQString removeArgs( const TQString& _cmd )
{
- QString cmd( _cmd );
+ TQString cmd( _cmd );
if( cmd[0] != '\'' && cmd[0] != '"' )
{
@@ -134,8 +134,8 @@ static QString removeArgs( const QString& _cmd )
return cmd;
}
-KShortURIFilter::KShortURIFilter( QObject *parent, const char *name,
- const QStringList & /*args*/ )
+KShortURIFilter::KShortURIFilter( TQObject *parent, const char *name,
+ const TQStringList & /*args*/ )
:KURIFilterPlugin( parent, name ? name : "kshorturifilter", 1.0),
DCOPObject("KShortURIFilterIface")
{
@@ -158,19 +158,19 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
*/
KURL url = data.uri();
- QString cmd = data.typedString();
+ TQString cmd = data.typedString();
bool isMalformed = !url.isValid();
//kdDebug() << "url=" << url.url() << " cmd=" << cmd << " isMalformed=" << isMalformed << endl;
if (!isMalformed &&
(url.protocol().length() == 4) &&
- (url.protocol() != QString::fromLatin1("http")) &&
+ (url.protocol() != TQString::fromLatin1("http")) &&
(url.protocol()[0]=='h') &&
(url.protocol()[1]==url.protocol()[2]) &&
(url.protocol()[3]=='p'))
{
// Handle "encrypted" URLs like: h++p://www.kde.org
- url.setProtocol( QString::fromLatin1("http"));
+ url.setProtocol( TQString::fromLatin1("http"));
setFilteredURI( data, url);
setURIType( data, KURIFilterData::NET_PROTOCOL );
return true;
@@ -181,7 +181,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
// executable and only the argument part, if any, changed! (Dawit)
// You mean caching the last filtering, to try and reuse it, to save stat()s? (David)
- const QString starthere_proto = QFL1("start-here:");
+ const TQString starthere_proto = QFL1("start-here:");
if (cmd.find(starthere_proto, 0, true) == 0 )
{
setFilteredURI( data, KURL("system:/") );
@@ -190,8 +190,8 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
}
// Handle MAN & INFO pages shortcuts...
- const QString man_proto = QFL1("man:");
- const QString info_proto = QFL1("info:");
+ const TQString man_proto = QFL1("man:");
+ const TQString info_proto = QFL1("info:");
if( cmd[0] == '#' ||
cmd.find( man_proto, 0, true ) == 0 ||
cmd.find( info_proto, 0, true ) == 0 )
@@ -210,11 +210,11 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
}
// Detect UNC style (aka windows SMB) URLs
- if ( cmd.startsWith( QString::fromLatin1( "\\\\") ) )
+ if ( cmd.startsWith( TQString::fromLatin1( "\\\\") ) )
{
// make sure path is unix style
cmd.replace('\\', '/');
- cmd.prepend( QString::fromLatin1( "smb:" ) );
+ cmd.prepend( TQString::fromLatin1( "smb:" ) );
setFilteredURI( data, KURL( cmd ));
setURIType( data, KURIFilterData::NET_PROTOCOL );
return true;
@@ -223,12 +223,12 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
bool expanded = false;
// Expanding shortcut to HOME URL...
- QString path;
- QString ref;
- QString query;
- QString nameFilter;
+ TQString path;
+ TQString ref;
+ TQString query;
+ TQString nameFilter;
- if (KURL::isRelativeURL(cmd) && QDir::isRelativePath(cmd)) {
+ if (KURL::isRelativeURL(cmd) && TQDir::isRelativePath(cmd)) {
path = cmd;
}
else
@@ -239,7 +239,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
// but not for "/tmp/a#b", if "a#b" is an existing file,
// or for "/tmp/a?b" (#58990)
if ( ( url.hasRef() || !url.query().isEmpty() ) // avoid the calling exists() when not needed
- && QFile::exists(url.path())
+ && TQFile::exists(url.path())
&& !url.path().endsWith(QFL1("/")) ) // /tmp/?foo is a namefilter, not a query
{
path = url.path();
@@ -262,19 +262,19 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
slashPos = path.length();
if( slashPos == 1 ) // ~/
{
- path.replace ( 0, 1, QDir::homeDirPath() );
+ path.replace ( 0, 1, TQDir::homeDirPath() );
}
else // ~username/
{
- QString user = path.mid( 1, slashPos-1 );
+ TQString user = path.mid( 1, slashPos-1 );
struct passwd *dir = getpwnam(user.local8Bit().data());
if( dir && strlen(dir->pw_dir) )
{
- path.replace (0, slashPos, QString::fromLocal8Bit(dir->pw_dir));
+ path.replace (0, slashPos, TQString::fromLocal8Bit(dir->pw_dir));
}
else
{
- QString msg = dir ? i18n("<qt><b>%1</b> does not have a home folder.</qt>").arg(user) :
+ TQString msg = dir ? i18n("<qt><b>%1</b> does not have a home folder.</qt>").arg(user) :
i18n("<qt>There is no user called <b>%1</b>.</qt>").arg(user);
setErrorMsg( data, msg );
setURIType( data, KURIFilterData::ERROR );
@@ -287,13 +287,13 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
}
else if ( path[0] == '$' ) {
// Environment variable expansion.
- QRegExp r (QFL1(ENV_VAR_PATTERN));
+ TQRegExp r (QFL1(ENV_VAR_PATTERN));
if ( r.search( path ) == 0 )
{
const char* exp = getenv( path.mid( 1, r.matchedLength() - 1 ).local8Bit().data() );
if(exp)
{
- path.replace( 0, r.matchedLength(), QString::fromLocal8Bit(exp) );
+ path.replace( 0, r.matchedLength(), TQString::fromLocal8Bit(exp) );
expanded = true;
}
}
@@ -318,7 +318,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
// Checking for local resource match...
// Determine if "uri" is an absolute path to a local resource OR
// A local resource with a supplied absolute path in KURIFilterData
- QString abs_path = data.absolutePath();
+ TQString abs_path = data.absolutePath();
bool canBeAbsolute = (isMalformed && !abs_path.isEmpty());
bool canBeLocalAbsolute = (canBeAbsolute && abs_path[0] =='/');
@@ -330,16 +330,16 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
struct stat buff;
if ( canBeLocalAbsolute )
{
- QString abs = QDir::cleanDirPath( abs_path );
+ TQString abs = TQDir::cleanDirPath( abs_path );
// combine absolute path (abs_path) and relative path (cmd) into abs_path
int len = path.length();
if( (len==1 && path[0]=='.') || (len==2 && path[0]=='.' && path[1]=='.') )
path += '/';
//kdDebug() << "adding " << abs << " and " << path << endl;
- abs = QDir::cleanDirPath(abs + '/' + path);
+ abs = TQDir::cleanDirPath(abs + '/' + path);
//kdDebug() << "checking whether " << abs << " exists." << endl;
// Check if it exists
- if( stat( QFile::encodeName(abs).data(), &buff ) == 0 )
+ if( stat( TQFile::encodeName(abs).data(), &buff ) == 0 )
{
path = abs; // yes -> store as the new cmd
exists = true;
@@ -349,7 +349,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
if( isLocalFullPath && !exists )
{
- exists = ( stat( QFile::encodeName(path).data() , &buff ) == 0 );
+ exists = ( stat( TQFile::encodeName(path).data() , &buff ) == 0 );
if ( !exists ) {
// Support for name filter (/foo/*.txt), see also KonqMainWindow::detectNameFilter
@@ -357,10 +357,10 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
int lastSlash = path.findRev( '/' );
if ( lastSlash > -1 && path.find( ' ', lastSlash ) == -1 ) // no space after last slash, otherwise it's more likely command-line arguments
{
- QString fileName = path.mid( lastSlash + 1 );
- QString testPath = path.left( lastSlash + 1 );
+ TQString fileName = path.mid( lastSlash + 1 );
+ TQString testPath = path.left( lastSlash + 1 );
if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 )
- && stat( QFile::encodeName(testPath).data(), &buff ) == 0 )
+ && stat( TQFile::encodeName(testPath).data(), &buff ) == 0 )
{
nameFilter = fileName;
kdDebug() << "Setting nameFilter to " << nameFilter << endl;
@@ -379,7 +379,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
u.setRef(ref);
u.setQuery(query);
- if (kapp && !kapp->authorizeURLAction( QString::fromLatin1("open"), KURL(), u))
+ if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
{
// No authorisation, we pretend it's a file will get
// an access denied error later on.
@@ -390,7 +390,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
// Can be abs path to file or directory, or to executable with args
bool isDir = S_ISDIR( buff.st_mode );
- if( !isDir && access ( QFile::encodeName(path).data(), X_OK) == 0 )
+ if( !isDir && access ( TQFile::encodeName(path).data(), X_OK) == 0 )
{
//kdDebug() << "Abs path to EXECUTABLE" << endl;
setFilteredURI( data, u );
@@ -417,7 +417,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
// if it is executable under the user's $PATH variable.
// We try hard to avoid parsing any possible command
// line arguments or options that might have been supplied.
- QString exe = removeArgs( cmd );
+ TQString exe = removeArgs( cmd );
//kdDebug() << k_funcinfo << "findExe with " << exe << endl;
if( data.checkForExecutables() && !KStandardDirs::findExe( exe ).isNull() )
{
@@ -435,8 +435,8 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
// be slow things down...
if ( !isMalformed && !isLocalFullPath )
{
- const QStringList protocols = KProtocolInfo::protocols();
- for( QStringList::ConstIterator it = protocols.begin(); it != protocols.end(); ++it )
+ const TQStringList protocols = KProtocolInfo::protocols();
+ for( TQStringList::ConstIterator it = protocols.begin(); it != protocols.end(); ++it )
{
if( (url.protocol() == *it) )
{
@@ -455,10 +455,10 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
// TODO: Make configurable at some point...
if ( !cmd.contains( ' ' ) )
{
- QValueList<URLHint>::ConstIterator it;
+ TQValueList<URLHint>::ConstIterator it;
for( it = m_urlHints.begin(); it != m_urlHints.end(); ++it )
{
- QRegExp match( (*it).regexp );
+ TQRegExp match( (*it).regexp );
if ( match.search( cmd, 0 ) == 0 )
{
//kdDebug() << "match - prepending " << (*it).prepend << endl;
@@ -492,7 +492,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
u.setPath(path);
u.setRef(ref);
- if (kapp && !kapp->authorizeURLAction( QString::fromLatin1("open"), KURL(), u))
+ if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
{
// No authorisation, we pretend it exists and will get
// an access denied error later on.
@@ -511,12 +511,12 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
return false;
}
-KCModule* KShortURIFilter::configModule( QWidget*, const char* ) const
+KCModule* KShortURIFilter::configModule( TQWidget*, const char* ) const
{
return 0; //new KShortURIOptions( parent, name );
}
-QString KShortURIFilter::configName() const
+TQString KShortURIFilter::configName() const
{
return i18n("&ShortURLs");
}
@@ -536,7 +536,7 @@ void KShortURIFilter::configure()
for( EntryMap::Iterator it = patterns.begin(); it != patterns.end(); ++it )
{
- QString protocol = protocols[it.key()];
+ TQString protocol = protocols[it.key()];
if (!protocol.isEmpty())
{
int type = config.readNumEntry(it.key(), -1);
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
index c6603da19..f2bf4654c 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
+++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
@@ -49,8 +49,8 @@ public:
* @param parent the parent of this class.
* @param name the internal name for this object.
*/
- KShortURIFilter( QObject *parent = 0, const char *name = 0,
- const QStringList &args = QStringList() );
+ KShortURIFilter( TQObject *parent = 0, const char *name = 0,
+ const TQStringList &args = TQStringList() );
/**
* Destructor
@@ -76,7 +76,7 @@ public:
*
* @return the name of the config module.
*/
- virtual QString configName() const;
+ virtual TQString configName() const;
/**
* Returns an instance of the module used to configure
@@ -84,7 +84,7 @@ public:
*
* @return the config module
*/
- virtual KCModule* configModule( QWidget*, const char* ) const;
+ virtual KCModule* configModule( TQWidget*, const char* ) const;
public:
k_dcop:
@@ -95,16 +95,16 @@ private:
struct URLHint
{
URLHint() {}
- URLHint( QString r, QString p,
+ URLHint( TQString r, TQString p,
KURIFilterData::URITypes t = KURIFilterData::NET_PROTOCOL )
: regexp(r), prepend(p), type(t) {}
- QString regexp; // if this matches, then...
- QString prepend; // ...prepend this to the url
+ TQString regexp; // if this matches, then...
+ TQString prepend; // ...prepend this to the url
KURIFilterData::URITypes type;
};
- QValueList<URLHint> m_urlHints;
- QString m_strDefaultProtocol;
+ TQValueList<URLHint> m_urlHints;
+ TQString m_strDefaultProtocol;
bool m_bVerbose;
};
diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp
index af3c4965d..1d0241914 100644
--- a/kcontrol/energy/energy.cpp
+++ b/kcontrol/energy/energy.cpp
@@ -22,10 +22,10 @@
#define QT_CLEAN_NAMESPACE
#endif
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
#include <kconfig.h>
#include <kcursor.h>
@@ -85,7 +85,7 @@ static const int DFLT_OFF = 60;
extern "C" {
- KDE_EXPORT KCModule *create_energy(QWidget *parent, char *) {
+ KDE_EXPORT KCModule *create_energy(TQWidget *parent, char *) {
return new KEnergy(parent, "kcmenergy");
}
@@ -131,7 +131,7 @@ extern "C" {
/**** KEnergy ****/
-KEnergy::KEnergy(QWidget *parent, const char *name)
+KEnergy::KEnergy(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
m_bChanged = false;
@@ -156,28 +156,28 @@ KEnergy::KEnergy(QWidget *parent, const char *name)
m_bDPMS = DPMSQueryExtension(qt_xdisplay(), &dummy, &dummy);
#endif
- QVBoxLayout *top = new QVBoxLayout(this, 0, KDialog::spacingHint());
- QHBoxLayout *hbox = new QHBoxLayout();
+ TQVBoxLayout *top = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ TQHBoxLayout *hbox = new TQHBoxLayout();
top->addLayout(hbox);
- QLabel *lbl;
+ TQLabel *lbl;
if (m_bDPMS) {
- m_pCBEnable= new QCheckBox(i18n("&Enable display power management" ), this);
- connect(m_pCBEnable, SIGNAL(toggled(bool)), SLOT(slotChangeEnable(bool)));
+ m_pCBEnable= new TQCheckBox(i18n("&Enable display power management" ), this);
+ connect(m_pCBEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeEnable(bool)));
hbox->addWidget(m_pCBEnable);
- QWhatsThis::add( m_pCBEnable, i18n("Check this option to enable the"
+ TQWhatsThis::add( m_pCBEnable, i18n("Check this option to enable the"
" power saving features of your display.") );
} else {
- lbl = new QLabel(i18n("Your display does not support power saving."), this);
+ lbl = new TQLabel(i18n("Your display does not support power saving."), this);
hbox->addWidget(lbl);
}
KURLLabel *logo = new KURLLabel(this);
logo->setURL("http://www.energystar.gov");
- logo->setPixmap(QPixmap(locate("data", "kcontrol/pics/energybig.png")));
+ logo->setPixmap(TQPixmap(locate("data", "kcontrol/pics/energybig.png")));
logo->setTipText(i18n("Learn more about the Energy Star program"));
logo->setUseTips(true);
-connect(logo, SIGNAL(leftClickedURL(const QString&)), SLOT(openURL(const QString &)));
+connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(const TQString &)));
hbox->addStretch();
hbox->addWidget(logo);
@@ -188,9 +188,9 @@ connect(logo, SIGNAL(leftClickedURL(const QString&)), SLOT(openURL(const QString
m_pStandbySlider->setRange(0, 120, 10);
m_pStandbySlider->setSuffix(i18n(" min"));
m_pStandbySlider->setSpecialValueText(i18n("Disabled"));
- connect(m_pStandbySlider, SIGNAL(valueChanged(int)), SLOT(slotChangeStandby(int)));
+ connect(m_pStandbySlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeStandby(int)));
top->addWidget(m_pStandbySlider);
- QWhatsThis::add( m_pStandbySlider, i18n("Choose the period of inactivity"
+ TQWhatsThis::add( m_pStandbySlider, i18n("Choose the period of inactivity"
" after which the display should enter \"standby\" mode. This is the"
" first level of power saving.") );
@@ -199,9 +199,9 @@ connect(logo, SIGNAL(leftClickedURL(const QString&)), SLOT(openURL(const QString
m_pSuspendSlider->setRange(0, 120, 10);
m_pSuspendSlider->setSuffix(i18n(" min"));
m_pSuspendSlider->setSpecialValueText(i18n("Disabled"));
- connect(m_pSuspendSlider, SIGNAL(valueChanged(int)), SLOT(slotChangeSuspend(int)));
+ connect(m_pSuspendSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeSuspend(int)));
top->addWidget(m_pSuspendSlider);
- QWhatsThis::add( m_pSuspendSlider, i18n("Choose the period of inactivity"
+ TQWhatsThis::add( m_pSuspendSlider, i18n("Choose the period of inactivity"
" after which the display should enter \"suspend\" mode. This is the"
" second level of power saving, but may not be different from the first"
" level for some displays.") );
@@ -211,9 +211,9 @@ connect(logo, SIGNAL(leftClickedURL(const QString&)), SLOT(openURL(const QString
m_pOffSlider->setRange(0, 120, 10);
m_pOffSlider->setSuffix(i18n(" min"));
m_pOffSlider->setSpecialValueText(i18n("Disabled"));
- connect(m_pOffSlider, SIGNAL(valueChanged(int)), SLOT(slotChangeOff(int)));
+ connect(m_pOffSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeOff(int)));
top->addWidget(m_pOffSlider);
- QWhatsThis::add( m_pOffSlider, i18n("Choose the period of inactivity"
+ TQWhatsThis::add( m_pOffSlider, i18n("Choose the period of inactivity"
" after which the display should be powered off. This is the"
" greatest level of power saving that can be achieved while the"
" display is still physically turned on.") );
@@ -434,7 +434,7 @@ void KEnergy::slotChangeOff(int value)
emit changed(true);
}
-void KEnergy::openURL(const QString &URL)
+void KEnergy::openURL(const TQString &URL)
{
new KRun(KURL( URL ));
}
diff --git a/kcontrol/energy/energy.h b/kcontrol/energy/energy.h
index d41b89e26..2625eba92 100644
--- a/kcontrol/energy/energy.h
+++ b/kcontrol/energy/energy.h
@@ -14,7 +14,7 @@
#ifndef __Energy_h_Included__
#define __Energy_h_Included__
-#include <qobject.h>
+#include <tqobject.h>
#include <kcmodule.h>
class QCheckBox;
@@ -31,7 +31,7 @@ class KEnergy: public KCModule
Q_OBJECT
public:
- KEnergy(QWidget *parent, const char *name);
+ KEnergy(TQWidget *parent, const char *name);
~KEnergy();
virtual void load();
@@ -44,7 +44,7 @@ private slots:
void slotChangeStandby(int);
void slotChangeSuspend(int);
void slotChangeOff(int);
- void openURL(const QString &);
+ void openURL(const TQString &);
private:
void readSettings();
@@ -58,7 +58,7 @@ private:
int m_Standby, m_Suspend, m_Off;
int m_StandbyDesired, m_SuspendDesired, m_OffDesired;
- QCheckBox *m_pCBEnable;
+ TQCheckBox *m_pCBEnable;
KIntNumInput *m_pStandbySlider;
KIntNumInput *m_pSuspendSlider;
KIntNumInput *m_pOffSlider;
diff --git a/kcontrol/filetypes/control.cpp b/kcontrol/filetypes/control.cpp
index 55e98d95e..9736e9c9b 100644
--- a/kcontrol/filetypes/control.cpp
+++ b/kcontrol/filetypes/control.cpp
@@ -2,7 +2,7 @@
extern "C"
{
- KDE_EXPORT KCModule *create_filetypes(QWidget *parent, const char *)
+ KDE_EXPORT KCModule *create_filetypes(TQWidget *parent, const char *)
{
return new FileTypesView(parent, "filetypes");
}
diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp
index a8895965a..eb57f50ac 100644
--- a/kcontrol/filetypes/filegroupdetails.cpp
+++ b/kcontrol/filetypes/filegroupdetails.cpp
@@ -17,29 +17,29 @@
*/
#include "filegroupdetails.h"
#include "typeslistitem.h"
-#include <qlayout.h>
-#include <qvbuttongroup.h>
-#include <qradiobutton.h>
-#include <qwhatsthis.h>
+#include <tqlayout.h>
+#include <tqvbuttongroup.h>
+#include <tqradiobutton.h>
+#include <tqwhatsthis.h>
#include <kdialog.h>
#include <klocale.h>
-FileGroupDetails::FileGroupDetails(QWidget *parent, const char *name )
- : QWidget( parent, name )
+FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
- QWidget * parentWidget = this;
- QVBoxLayout *secondLayout = new QVBoxLayout(parentWidget,
+ TQWidget * parentWidget = this;
+ TQVBoxLayout *secondLayout = new TQVBoxLayout(parentWidget,
0, KDialog::spacingHint());
- m_autoEmbed = new QVButtonGroup( i18n("Left Click Action"), parentWidget );
+ m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), parentWidget );
m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() );
secondLayout->addWidget( m_autoEmbed );
// The order of those two items is very important. If you change it, fix typeslistitem.cpp !
- new QRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
- new QRadioButton( i18n("Show file in separate viewer"), m_autoEmbed );
- connect(m_autoEmbed, SIGNAL( clicked( int ) ), SLOT( slotAutoEmbedClicked( int ) ));
+ new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
+ new TQRadioButton( i18n("Show file in separate viewer"), m_autoEmbed );
+ connect(m_autoEmbed, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotAutoEmbedClicked( int ) ));
- QWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager"
+ TQWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager"
" will do when you click on a file belonging to this group. Konqueror can display the file in"
" an embedded viewer or start up a separate application. You can change this setting for a"
" specific file type in the 'Embedding' tab of the file type configuration.") );
diff --git a/kcontrol/filetypes/filegroupdetails.h b/kcontrol/filetypes/filegroupdetails.h
index 1716954f3..d52bec176 100644
--- a/kcontrol/filetypes/filegroupdetails.h
+++ b/kcontrol/filetypes/filegroupdetails.h
@@ -18,7 +18,7 @@
#ifndef _FILEGROUPDETAILS_H
#define _FILEGROUPDETAILS_H
-#include <qwidget.h>
+#include <tqwidget.h>
class TypesListItem;
class QButtonGroup;
@@ -30,7 +30,7 @@ class FileGroupDetails : public QWidget
{
Q_OBJECT
public:
- FileGroupDetails(QWidget *parent = 0, const char *name = 0);
+ FileGroupDetails(TQWidget *parent = 0, const char *name = 0);
void setTypeItem( TypesListItem * item );
@@ -44,7 +44,7 @@ private:
TypesListItem * m_item;
// Embedding config
- QButtonGroup *m_autoEmbed;
+ TQButtonGroup *m_autoEmbed;
};
#endif
diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp
index 436fd138d..a678e0eb2 100644
--- a/kcontrol/filetypes/filetypedetails.cpp
+++ b/kcontrol/filetypes/filetypedetails.cpp
@@ -1,8 +1,8 @@
-#include <qcheckbox.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
-#include <qvbuttongroup.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqlayout.h>
+#include <tqradiobutton.h>
+#include <tqvbuttongroup.h>
+#include <tqwhatsthis.h>
#include <kapplication.h>
#include <kconfig.h>
@@ -16,102 +16,102 @@
#include "filetypedetails.h"
#include "typeslistitem.h"
-FileTypeDetails::FileTypeDetails( QWidget * parent, const char * name )
- : QTabWidget( parent, name ), m_item( 0L )
+FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
+ : TQTabWidget( parent, name ), m_item( 0L )
{
- QString wtstr;
+ TQString wtstr;
// First tab - General
- QWidget * firstWidget = new QWidget(this);
- QVBoxLayout *firstLayout = new QVBoxLayout(firstWidget,KDialog::marginHint(),
+ TQWidget * firstWidget = new TQWidget(this);
+ TQVBoxLayout *firstLayout = new TQVBoxLayout(firstWidget,KDialog::marginHint(),
KDialog::spacingHint());
- QHBoxLayout *hBox = new QHBoxLayout(0L, 0, KDialog::spacingHint());
+ TQHBoxLayout *hBox = new TQHBoxLayout(0L, 0, KDialog::spacingHint());
firstLayout->addLayout(hBox, 1);
iconButton = new KIconButton(firstWidget);
iconButton->setIconType(KIcon::Desktop, KIcon::MimeType);
- connect(iconButton, SIGNAL(iconChanged(QString)), SLOT(updateIcon(QString)));
+ connect(iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(updateIcon(TQString)));
iconButton->setFixedSize(70, 70);
hBox->addWidget(iconButton);
- QWhatsThis::add( iconButton, i18n("This button displays the icon associated"
+ TQWhatsThis::add( iconButton, i18n("This button displays the icon associated"
" with the selected file type. Click on it to choose a different icon.") );
- QGroupBox *gb = new QGroupBox(i18n("Filename Patterns"), firstWidget);
+ TQGroupBox *gb = new TQGroupBox(i18n("Filename Patterns"), firstWidget);
hBox->addWidget(gb);
- QGridLayout *grid = new QGridLayout(gb, 3, 2, KDialog::marginHint(),
+ TQGridLayout *grid = new TQGridLayout(gb, 3, 2, KDialog::marginHint(),
KDialog::spacingHint());
grid->addRowSpacing(0, fontMetrics().lineSpacing());
- extensionLB = new QListBox(gb);
- connect(extensionLB, SIGNAL(highlighted(int)), SLOT(enableExtButtons(int)));
+ extensionLB = new TQListBox(gb);
+ connect(extensionLB, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableExtButtons(int)));
grid->addMultiCellWidget(extensionLB, 1, 2, 0, 0);
grid->setRowStretch(0, 0);
grid->setRowStretch(1, 1);
grid->setRowStretch(2, 0);
- QWhatsThis::add( extensionLB, i18n("This box contains a list of patterns that can be"
+ TQWhatsThis::add( extensionLB, i18n("This box contains a list of patterns that can be"
" used to identify files of the selected type. For example, the pattern *.txt is"
" associated with the file type 'text/plain'; all files ending in '.txt' are recognized"
" as plain text files.") );
- addExtButton = new QPushButton(i18n("Add..."), gb);
+ addExtButton = new TQPushButton(i18n("Add..."), gb);
addExtButton->setEnabled(false);
- connect(addExtButton, SIGNAL(clicked()),
- this, SLOT(addExtension()));
+ connect(addExtButton, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(addExtension()));
grid->addWidget(addExtButton, 1, 1);
- QWhatsThis::add( addExtButton, i18n("Add a new pattern for the selected file type.") );
+ TQWhatsThis::add( addExtButton, i18n("Add a new pattern for the selected file type.") );
- removeExtButton = new QPushButton(i18n("Remove"), gb);
+ removeExtButton = new TQPushButton(i18n("Remove"), gb);
removeExtButton->setEnabled(false);
- connect(removeExtButton, SIGNAL(clicked()),
- this, SLOT(removeExtension()));
+ connect(removeExtButton, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(removeExtension()));
grid->addWidget(removeExtButton, 2, 1);
- QWhatsThis::add( removeExtButton, i18n("Remove the selected filename pattern.") );
+ TQWhatsThis::add( removeExtButton, i18n("Remove the selected filename pattern.") );
- gb = new QGroupBox(i18n("Description"), firstWidget);
+ gb = new TQGroupBox(i18n("Description"), firstWidget);
firstLayout->addWidget(gb);
gb->setColumnLayout(1, Qt::Horizontal);
description = new KLineEdit(gb);
- connect(description, SIGNAL(textChanged(const QString &)),
- SLOT(updateDescription(const QString &)));
+ connect(description, TQT_SIGNAL(textChanged(const TQString &)),
+ TQT_SLOT(updateDescription(const TQString &)));
wtstr = i18n("You can enter a short description for files of the selected"
" file type (e.g. 'HTML Page'). This description will be used by applications"
" like Konqueror to display directory content.");
- QWhatsThis::add( gb, wtstr );
- QWhatsThis::add( description, wtstr );
+ TQWhatsThis::add( gb, wtstr );
+ TQWhatsThis::add( description, wtstr );
serviceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_APPLICATIONS, firstWidget );
- connect( serviceListWidget, SIGNAL(changed(bool)), this, SIGNAL(changed(bool)));
+ connect( serviceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
firstLayout->addWidget(serviceListWidget, 5);
// Second tab - Embedding
- QWidget * secondWidget = new QWidget(this);
- QVBoxLayout *secondLayout = new QVBoxLayout(secondWidget, KDialog::marginHint(),
+ TQWidget * secondWidget = new TQWidget(this);
+ TQVBoxLayout *secondLayout = new TQVBoxLayout(secondWidget, KDialog::marginHint(),
KDialog::spacingHint());
- m_autoEmbed = new QVButtonGroup( i18n("Left Click Action"), secondWidget );
+ m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), secondWidget );
m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() );
secondLayout->addWidget( m_autoEmbed, 1 );
- m_autoEmbed->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) );
+ m_autoEmbed->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) );
// The order of those three items is very important. If you change it, fix typeslistitem.cpp !
- new QRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
- new QRadioButton( i18n("Show file in separate viewer"), m_autoEmbed );
- m_rbGroupSettings = new QRadioButton( i18n("Use settings for '%1' group"), m_autoEmbed );
- connect(m_autoEmbed, SIGNAL( clicked( int ) ), SLOT( slotAutoEmbedClicked( int ) ));
+ new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
+ new TQRadioButton( i18n("Show file in separate viewer"), m_autoEmbed );
+ m_rbGroupSettings = new TQRadioButton( i18n("Use settings for '%1' group"), m_autoEmbed );
+ connect(m_autoEmbed, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotAutoEmbedClicked( int ) ));
- m_chkAskSave = new QCheckBox( i18n("Ask whether to save to disk instead"), m_autoEmbed);
- connect(m_chkAskSave, SIGNAL( toggled(bool) ), SLOT( slotAskSaveToggled(bool) ));
+ m_chkAskSave = new TQCheckBox( i18n("Ask whether to save to disk instead"), m_autoEmbed);
+ connect(m_chkAskSave, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAskSaveToggled(bool) ));
- QWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager"
+ TQWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager"
" will do when you click on a file of this type. Konqueror can display the file in"
" an embedded viewer or start up a separate application. If set to 'Use settings for G group',"
" Konqueror will behave according to the settings of the group G this type belongs to,"
@@ -121,7 +121,7 @@ FileTypeDetails::FileTypeDetails( QWidget * parent, const char * name )
embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget );
embedServiceListWidget->setMinimumHeight( serviceListWidget->sizeHint().height() );
- connect( embedServiceListWidget, SIGNAL(changed(bool)), this, SIGNAL(changed(bool)));
+ connect( embedServiceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
secondLayout->addWidget(embedServiceListWidget, 3);
addTab( firstWidget, i18n("&General") );
@@ -133,7 +133,7 @@ void FileTypeDetails::updateRemoveButton()
removeExtButton->setEnabled(extensionLB->count()>0);
}
-void FileTypeDetails::updateIcon(QString icon)
+void FileTypeDetails::updateIcon(TQString icon)
{
if (!m_item)
return;
@@ -143,7 +143,7 @@ void FileTypeDetails::updateIcon(QString icon)
emit changed(true);
}
-void FileTypeDetails::updateDescription(const QString &desc)
+void FileTypeDetails::updateDescription(const TQString &desc)
{
if (!m_item)
return;
@@ -159,11 +159,11 @@ void FileTypeDetails::addExtension()
return;
bool ok;
- QString ext = KInputDialog::getText( i18n( "Add New Extension" ),
+ TQString ext = KInputDialog::getText( i18n( "Add New Extension" ),
i18n( "Extension:" ), "*.", &ok, this );
if (ok) {
extensionLB->insertItem(ext);
- QStringList patt = m_item->patterns();
+ TQStringList patt = m_item->patterns();
patt += ext;
m_item->setPatterns(patt);
updateRemoveButton();
@@ -177,7 +177,7 @@ void FileTypeDetails::removeExtension()
return;
if ( !m_item )
return;
- QStringList patt = m_item->patterns();
+ TQStringList patt = m_item->patterns();
patt.remove(extensionLB->text(extensionLB->currentItem()));
m_item->setPatterns(patt);
extensionLB->removeItem(extensionLB->currentItem());
@@ -210,9 +210,9 @@ void FileTypeDetails::updateAskSave()
button = embedParent ? 0 : 1;
}
- QString mimeType = m_item->name();
+ TQString mimeType = m_item->name();
- QString dontAskAgainName;
+ TQString dontAskAgainName;
if (button == 0) // Embedded
dontAskAgainName = "askEmbedOrSave"+mimeType;
@@ -271,7 +271,7 @@ void FileTypeDetails::setTypeItem( TypesListItem * tlitem )
iconButton->setIcon(tlitem->icon());
else
iconButton->resetIcon();
- description->setText(tlitem ? tlitem->comment() : QString::null);
+ description->setText(tlitem ? tlitem->comment() : TQString::null);
if ( tlitem )
m_rbGroupSettings->setText( i18n("Use settings for '%1' group").arg( tlitem->majorType() ) );
extensionLB->clear();
diff --git a/kcontrol/filetypes/filetypedetails.h b/kcontrol/filetypes/filetypedetails.h
index 6f9a0a548..fcbe3f3d5 100644
--- a/kcontrol/filetypes/filetypedetails.h
+++ b/kcontrol/filetypes/filetypedetails.h
@@ -1,7 +1,7 @@
#ifndef _FILETYPEDETAILS_H
#define _FILETYPEDETAILS_H
-#include <qtabwidget.h>
+#include <tqtabwidget.h>
class TypesListItem;
class KIconButton;
class QLineEdit;
@@ -22,7 +22,7 @@ class FileTypeDetails : public QTabWidget
{
Q_OBJECT
public:
- FileTypeDetails(QWidget *parent = 0, const char *name = 0);
+ FileTypeDetails(TQWidget *parent = 0, const char *name = 0);
void setTypeItem( TypesListItem * item );
@@ -31,12 +31,12 @@ protected:
void updateAskSave();
signals:
- void embedMajor(const QString &major, bool &embed); // To adjust whether major type is being embedded
+ void embedMajor(const TQString &major, bool &embed); // To adjust whether major type is being embedded
void changed(bool);
protected slots:
- void updateIcon(QString icon);
- void updateDescription(const QString &desc);
+ void updateIcon(TQString icon);
+ void updateDescription(const TQString &desc);
void addExtension();
void removeExtension();
void enableExtButtons(int index);
@@ -48,17 +48,17 @@ private:
// First tab - General
KIconButton *iconButton;
- QListBox *extensionLB;
- QPushButton *addExtButton, *removeExtButton;
- QLineEdit *description;
+ TQListBox *extensionLB;
+ TQPushButton *addExtButton, *removeExtButton;
+ TQLineEdit *description;
KServiceListWidget *serviceListWidget;
// Second tab - Embedding
- QButtonGroup *m_autoEmbed;
+ TQButtonGroup *m_autoEmbed;
KServiceListWidget *embedServiceListWidget;
- QRadioButton *m_rbOpenSeparate;
- QCheckBox *m_chkAskSave;
- QRadioButton *m_rbGroupSettings;
+ TQRadioButton *m_rbOpenSeparate;
+ TQCheckBox *m_chkAskSave;
+ TQRadioButton *m_rbGroupSettings;
};
#endif
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index 4088e9eee..ad60fc3de 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -1,10 +1,10 @@
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qtimer.h>
-#include <qwhatsthis.h>
-#include <qwidgetstack.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqtimer.h>
+#include <tqwhatsthis.h>
+#include <tqwidgetstack.h>
#include <dcopclient.h>
@@ -24,7 +24,7 @@
#include "filetypesview.h"
#include <ksycoca.h>
-FileTypesView::FileTypesView(QWidget *p, const char *name)
+FileTypesView::FileTypesView(TQWidget *p, const char *name)
: KCModule(p, name)
{
m_konqConfig = KSharedConfig::openConfig("konquerorrc", false, false);
@@ -50,30 +50,30 @@ FileTypesView::FileTypesView(QWidget *p, const char *name)
" MIME-type by directly examining the contents of the file."));
setButtons(Help | Apply | Cancel | Ok);
- QString wtstr;
+ TQString wtstr;
- QHBoxLayout *l = new QHBoxLayout(this, 0, KDialog::marginHint());
- QGridLayout *leftLayout = new QGridLayout(0, 4, 3);
+ TQHBoxLayout *l = new TQHBoxLayout(this, 0, KDialog::marginHint());
+ TQGridLayout *leftLayout = new TQGridLayout(0, 4, 3);
leftLayout->setSpacing( KDialog::spacingHint() );
leftLayout->setColStretch(1, 1);
l->addLayout( leftLayout );
- QLabel *patternFilterLBL = new QLabel(i18n("F&ind filename pattern:"), this);
+ TQLabel *patternFilterLBL = new TQLabel(i18n("F&ind filename pattern:"), this);
leftLayout->addMultiCellWidget(patternFilterLBL, 0, 0, 0, 2);
patternFilterLE = new KLineEdit(this);
patternFilterLBL->setBuddy( patternFilterLE );
leftLayout->addMultiCellWidget(patternFilterLE, 1, 1, 0, 2);
- connect(patternFilterLE, SIGNAL(textChanged(const QString &)),
- this, SLOT(slotFilter(const QString &)));
+ connect(patternFilterLE, TQT_SIGNAL(textChanged(const TQString &)),
+ this, TQT_SLOT(slotFilter(const TQString &)));
wtstr = i18n("Enter a part of a filename pattern. Only file types with a "
"matching file pattern will appear in the list.");
- QWhatsThis::add( patternFilterLE, wtstr );
- QWhatsThis::add( patternFilterLBL, wtstr );
+ TQWhatsThis::add( patternFilterLE, wtstr );
+ TQWhatsThis::add( patternFilterLBL, wtstr );
typesLV = new KListView(this);
typesLV->setRootIsDecorated(true);
@@ -81,60 +81,60 @@ FileTypesView::FileTypesView(QWidget *p, const char *name)
typesLV->addColumn(i18n("Known Types"));
leftLayout->addMultiCellWidget(typesLV, 2, 2, 0, 2);
- connect(typesLV, SIGNAL(selectionChanged(QListViewItem *)),
- this, SLOT(updateDisplay(QListViewItem *)));
- connect(typesLV, SIGNAL(doubleClicked(QListViewItem *)),
- this, SLOT(slotDoubleClicked(QListViewItem *)));
+ connect(typesLV, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
+ this, TQT_SLOT(updateDisplay(TQListViewItem *)));
+ connect(typesLV, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
+ this, TQT_SLOT(slotDoubleClicked(TQListViewItem *)));
- QWhatsThis::add( typesLV, i18n("Here you can see a hierarchical list of"
+ TQWhatsThis::add( typesLV, i18n("Here you can see a hierarchical list of"
" the file types which are known on your system. Click on the '+' sign"
" to expand a category, or the '-' sign to collapse it. Select a file type"
" (e.g. text/html for HTML files) to view/edit the information for that"
" file type using the controls on the right.") );
- QPushButton *addTypeB = new QPushButton(i18n("Add..."), this);
- connect(addTypeB, SIGNAL(clicked()), SLOT(addType()));
+ TQPushButton *addTypeB = new TQPushButton(i18n("Add..."), this);
+ connect(addTypeB, TQT_SIGNAL(clicked()), TQT_SLOT(addType()));
leftLayout->addWidget(addTypeB, 3, 0);
- QWhatsThis::add( addTypeB, i18n("Click here to add a new file type.") );
+ TQWhatsThis::add( addTypeB, i18n("Click here to add a new file type.") );
- m_removeTypeB = new QPushButton(i18n("&Remove"), this);
- connect(m_removeTypeB, SIGNAL(clicked()), SLOT(removeType()));
+ m_removeTypeB = new TQPushButton(i18n("&Remove"), this);
+ connect(m_removeTypeB, TQT_SIGNAL(clicked()), TQT_SLOT(removeType()));
leftLayout->addWidget(m_removeTypeB, 3, 2);
m_removeTypeB->setEnabled(false);
- QWhatsThis::add( m_removeTypeB, i18n("Click here to remove the selected file type.") );
+ TQWhatsThis::add( m_removeTypeB, i18n("Click here to remove the selected file type.") );
// For the right panel, prepare a widget stack
- m_widgetStack = new QWidgetStack(this);
+ m_widgetStack = new TQWidgetStack(this);
l->addWidget( m_widgetStack );
// File Type Details
m_details = new FileTypeDetails( m_widgetStack );
- connect( m_details, SIGNAL( changed(bool) ),
- this, SLOT( setDirty(bool) ) );
- connect( m_details, SIGNAL( embedMajor(const QString &, bool &) ),
- this, SLOT( slotEmbedMajor(const QString &, bool &)));
+ connect( m_details, TQT_SIGNAL( changed(bool) ),
+ this, TQT_SLOT( setDirty(bool) ) );
+ connect( m_details, TQT_SIGNAL( embedMajor(const TQString &, bool &) ),
+ this, TQT_SLOT( slotEmbedMajor(const TQString &, bool &)));
m_widgetStack->addWidget( m_details, 1 /*id*/ );
// File Group Details
m_groupDetails = new FileGroupDetails( m_widgetStack );
- connect( m_groupDetails, SIGNAL( changed(bool) ),
- this, SLOT( setDirty(bool) ) );
+ connect( m_groupDetails, TQT_SIGNAL( changed(bool) ),
+ this, TQT_SLOT( setDirty(bool) ) );
m_widgetStack->addWidget( m_groupDetails, 2 /*id*/ );
// Widget shown on startup
- m_emptyWidget = new QLabel( i18n("Select a file type by name or by extension"), m_widgetStack);
+ m_emptyWidget = new TQLabel( i18n("Select a file type by name or by extension"), m_widgetStack);
m_emptyWidget->setAlignment(AlignCenter);
m_widgetStack->addWidget( m_emptyWidget, 3 /*id*/ );
m_widgetStack->raiseWidget( m_emptyWidget );
- QTimer::singleShot( 0, this, SLOT( init() ) ); // this takes some time
+ TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); // this takes some time
- connect( KSycoca::self(), SIGNAL( databaseChanged() ), SLOT( slotDatabaseChanged() ) );
+ connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), TQT_SLOT( slotDatabaseChanged() ) );
}
FileTypesView::~FileTypesView()
@@ -171,14 +171,14 @@ void FileTypesView::readFileTypes()
TypesListItem *groupItem;
KMimeType::List mimetypes = KMimeType::allMimeTypes();
- QValueListIterator<KMimeType::Ptr> it2(mimetypes.begin());
+ TQValueListIterator<KMimeType::Ptr> it2(mimetypes.begin());
for (; it2 != mimetypes.end(); ++it2) {
- QString mimetype = (*it2)->name();
+ TQString mimetype = (*it2)->name();
int index = mimetype.find("/");
- QString maj = mimetype.left(index);
- QString min = mimetype.right(mimetype.length() - index+1);
+ TQString maj = mimetype.left(index);
+ TQString min = mimetype.right(mimetype.length() - index+1);
- QMapIterator<QString,TypesListItem*> mit = m_majorMap.find( maj );
+ TQMapIterator<TQString,TypesListItem*> mit = m_majorMap.find( maj );
if ( mit == m_majorMap.end() ) {
groupItem = new TypesListItem( typesLV, maj );
m_majorMap.insert( maj, groupItem );
@@ -193,10 +193,10 @@ void FileTypesView::readFileTypes()
}
-void FileTypesView::slotEmbedMajor(const QString &major, bool &embed)
+void FileTypesView::slotEmbedMajor(const TQString &major, bool &embed)
{
TypesListItem *groupItem;
- QMapIterator<QString,TypesListItem*> mit = m_majorMap.find( major );
+ TQMapIterator<TQString,TypesListItem*> mit = m_majorMap.find( major );
if ( mit == m_majorMap.end() )
return;
@@ -205,11 +205,11 @@ void FileTypesView::slotEmbedMajor(const QString &major, bool &embed)
embed = (groupItem->autoEmbed() == 0);
}
-void FileTypesView::slotFilter(const QString & patternFilter)
+void FileTypesView::slotFilter(const TQString & patternFilter)
{
// one of the few ways to clear a listview without destroying the
- // listviewitems and without making QListView crash.
- QListViewItem *item;
+ // listviewitems and without making TQListView crash.
+ TQListViewItem *item;
while ( (item = typesLV->firstChild()) ) {
while ( item->firstChild() )
item->takeItem( item->firstChild() );
@@ -218,13 +218,13 @@ void FileTypesView::slotFilter(const QString & patternFilter)
}
// insert all items and their group that match the filter
- QPtrListIterator<TypesListItem> it( m_itemList );
+ TQPtrListIterator<TypesListItem> it( m_itemList );
while ( it.current() ) {
if ( patternFilter.isEmpty() ||
!((*it)->patterns().grep( patternFilter, false )).isEmpty() ) {
TypesListItem *group = m_majorMap[ (*it)->majorType() ];
- // QListView makes sure we don't insert a group-item more than once
+ // TQListView makes sure we don't insert a group-item more than once
typesLV->insertItem( group );
group->insertItem( *it );
}
@@ -234,8 +234,8 @@ void FileTypesView::slotFilter(const QString & patternFilter)
void FileTypesView::addType()
{
- QStringList allGroups;
- QMapIterator<QString,TypesListItem*> it = m_majorMap.begin();
+ TQStringList allGroups;
+ TQMapIterator<TQString,TypesListItem*> it = m_majorMap.begin();
while ( it != m_majorMap.end() ) {
allGroups.append( it.key() );
++it;
@@ -244,13 +244,13 @@ void FileTypesView::addType()
NewTypeDialog m(allGroups, this);
if (m.exec()) {
- QListViewItemIterator it(typesLV);
- QString loc = m.group() + "/" + m.text() + ".desktop";
+ TQListViewItemIterator it(typesLV);
+ TQString loc = m.group() + "/" + m.text() + ".desktop";
loc = locateLocal("mime", loc);
KMimeType::Ptr mimetype = new KMimeType(loc,
m.group() + "/" + m.text(),
- QString(), QString(),
- QStringList());
+ TQString(), TQString(),
+ TQStringList());
TypesListItem *group = m_majorMap[ m.group() ];
if ( !group )
@@ -261,7 +261,7 @@ void FileTypesView::addType()
}
// find out if our group has been filtered out -> insert if necessary
- QListViewItem *item = typesLV->firstChild();
+ TQListViewItem *item = typesLV->firstChild();
bool insert = true;
while ( item ) {
if ( item == group ) {
@@ -297,7 +297,7 @@ void FileTypesView::removeType()
if ( current->isEssential() )
return;
- QListViewItem *li = current->itemAbove();
+ TQListViewItem *li = current->itemAbove();
if (!li)
li = current->itemBelow();
if (!li)
@@ -312,13 +312,13 @@ void FileTypesView::removeType()
typesLV->setSelected(li, true);
}
-void FileTypesView::slotDoubleClicked(QListViewItem *item)
+void FileTypesView::slotDoubleClicked(TQListViewItem *item)
{
if ( !item ) return;
item->setOpen( !item->isOpen() );
}
-void FileTypesView::updateDisplay(QListViewItem *item)
+void FileTypesView::updateDisplay(TQListViewItem *item)
{
if (!item)
{
@@ -348,12 +348,12 @@ void FileTypesView::updateDisplay(QListViewItem *item)
setDirty(false);
}
-bool FileTypesView::sync( QValueList<TypesListItem *>& itemsModified )
+bool FileTypesView::sync( TQValueList<TypesListItem *>& itemsModified )
{
bool didIt = false;
// first, remove those items which we are asked to remove.
- QStringList::Iterator it(removedList.begin());
- QString loc;
+ TQStringList::Iterator it(removedList.begin());
+ TQString loc;
for (; it != removedList.end(); ++it) {
didIt = true;
@@ -370,7 +370,7 @@ bool FileTypesView::sync( QValueList<TypesListItem *>& itemsModified )
// now go through all entries and sync those which are dirty.
// don't use typesLV, it may be filtered
- QMapIterator<QString,TypesListItem*> it1 = m_majorMap.begin();
+ TQMapIterator<TQString,TypesListItem*> it1 = m_majorMap.begin();
while ( it1 != m_majorMap.end() ) {
TypesListItem *tli = *it1;
if (tli->isDirty()) {
@@ -381,7 +381,7 @@ bool FileTypesView::sync( QValueList<TypesListItem *>& itemsModified )
}
++it1;
}
- QPtrListIterator<TypesListItem> it2( m_itemList );
+ TQPtrListIterator<TypesListItem> it2( m_itemList );
while ( it2.current() ) {
TypesListItem *tli = *it2;
if (tli->isDirty()) {
@@ -422,9 +422,9 @@ void FileTypesView::slotDatabaseChanged()
// our 'copies' to be in sync with it. Not important for OK, but
// important for Apply (how to differentiate those 2?).
// See BR 35071.
- QValueList<TypesListItem *>::Iterator it = m_itemsModified.begin();
+ TQValueList<TypesListItem *>::Iterator it = m_itemsModified.begin();
for( ; it != m_itemsModified.end(); ++it ) {
- QString name = (*it)->name();
+ TQString name = (*it)->name();
if ( removedList.find( name ) == removedList.end() ) // if not deleted meanwhile
(*it)->refresh();
}
diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h
index bc6323d85..70b6bb88d 100644
--- a/kcontrol/filetypes/filetypesview.h
+++ b/kcontrol/filetypes/filetypesview.h
@@ -1,8 +1,8 @@
#ifndef _FILETYPESVIEW_H
#define _FILETYPESVIEW_H
-#include <qptrlist.h>
-#include <qmap.h>
+#include <tqptrlist.h>
+#include <tqmap.h>
#include <kconfig.h>
#include <kcmodule.h>
@@ -25,7 +25,7 @@ class FileTypesView : public KCModule
{
Q_OBJECT
public:
- FileTypesView(QWidget *p = 0, const char *name = 0);
+ FileTypesView(TQWidget *p = 0, const char *name = 0);
~FileTypesView();
void load();
@@ -38,34 +38,34 @@ protected slots:
void addType();
void removeType();
- void updateDisplay(QListViewItem *);
- void slotDoubleClicked(QListViewItem *);
- void slotFilter(const QString &patternFilter);
+ void updateDisplay(TQListViewItem *);
+ void slotDoubleClicked(TQListViewItem *);
+ void slotFilter(const TQString &patternFilter);
void setDirty(bool state);
void slotDatabaseChanged();
- void slotEmbedMajor(const QString &major, bool &embed);
+ void slotEmbedMajor(const TQString &major, bool &embed);
protected:
void readFileTypes();
- bool sync( QValueList<TypesListItem *>& itemsModified );
+ bool sync( TQValueList<TypesListItem *>& itemsModified );
private:
KListView *typesLV;
- QPushButton *m_removeTypeB;
+ TQPushButton *m_removeTypeB;
- QWidgetStack * m_widgetStack;
+ TQWidgetStack * m_widgetStack;
FileTypeDetails * m_details;
FileGroupDetails * m_groupDetails;
- QLabel * m_emptyWidget;
+ TQLabel * m_emptyWidget;
- QLineEdit *patternFilterLE;
- QStringList removedList;
+ TQLineEdit *patternFilterLE;
+ TQStringList removedList;
bool m_dirty;
- QMap<QString,TypesListItem*> m_majorMap;
- QPtrList<TypesListItem> m_itemList;
+ TQMap<TQString,TypesListItem*> m_majorMap;
+ TQPtrList<TypesListItem> m_itemList;
- QValueList<TypesListItem *> m_itemsModified;
+ TQValueList<TypesListItem *> m_itemsModified;
KSharedConfig::Ptr m_konqConfig;
};
diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp
index 6c5c4eb6c..48f9e14c5 100644
--- a/kcontrol/filetypes/keditfiletype.cpp
+++ b/kcontrol/filetypes/keditfiletype.cpp
@@ -19,7 +19,7 @@
#include "typeslistitem.h"
#include "keditfiletype.h"
-#include <qfile.h>
+#include <tqfile.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -35,14 +35,14 @@
#endif
FileTypeDialog::FileTypeDialog( KMimeType::Ptr mime )
- : KDialogBase( 0L, 0, false, QString::null, /* Help | */ Cancel | Apply | Ok,
+ : KDialogBase( 0L, 0, false, TQString::null, /* Help | */ Cancel | Apply | Ok,
Ok, false )
{
init( mime, false );
}
FileTypeDialog::FileTypeDialog( KMimeType::Ptr mime, bool newItem )
- : KDialogBase( 0L, 0, false, QString::null, /* Help | */ Cancel | Apply | Ok,
+ : KDialogBase( 0L, 0, false, TQString::null, /* Help | */ Cancel | Apply | Ok,
Ok, false )
{
init( mime, newItem );
@@ -51,18 +51,18 @@ FileTypeDialog::FileTypeDialog( KMimeType::Ptr mime, bool newItem )
void FileTypeDialog::init( KMimeType::Ptr mime, bool newItem )
{
m_details = new FileTypeDetails( this );
- QListView * dummyListView = new QListView( m_details );
+ TQListView * dummyListView = new TQListView( m_details );
dummyListView->hide();
m_item = new TypesListItem( dummyListView, mime, newItem );
m_details->setTypeItem( m_item );
// This code is very similar to kcdialog.cpp
setMainWidget( m_details );
- connect(m_details, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool)));
+ connect(m_details, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool)));
// TODO setHelp()
enableButton(Apply, false);
- connect( KSycoca::self(), SIGNAL( databaseChanged() ), SLOT( slotDatabaseChanged() ) );
+ connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), TQT_SLOT( slotDatabaseChanged() ) );
}
void FileTypeDialog::save()
@@ -126,31 +126,31 @@ int main(int argc, char ** argv)
if (args->count() == 0)
KCmdLineArgs::usage();
- QString arg = args->arg(0);
+ TQString arg = args->arg(0);
bool createType = arg.startsWith( "*" );
KMimeType::Ptr mime;
if ( createType ) {
- QString mimeString = "application/x-kdeuser%1";
- QString loc;
+ TQString mimeString = "application/x-kdeuser%1";
+ TQString loc;
int inc = 0;
do {
++inc;
loc = locateLocal( "mime", mimeString.arg( inc ) + ".desktop" );
}
- while ( QFile::exists( loc ) );
+ while ( TQFile::exists( loc ) );
- QStringList patterns;
+ TQStringList patterns;
if ( arg.length() > 2 )
patterns << arg.lower() << arg.upper();
- QString comment;
+ TQString comment;
if ( arg.startsWith( "*." ) && arg.length() >= 3 ) {
- QString type = arg.mid( 3 ).prepend( arg[2].upper() );
+ TQString type = arg.mid( 3 ).prepend( arg[2].upper() );
comment = i18n( "%1 File" ).arg( type );
}
- mime = new KMimeType( loc, mimeString.arg( inc ), QString::null, comment, patterns );
+ mime = new KMimeType( loc, mimeString.arg( inc ), TQString::null, comment, patterns );
}
else {
mime = KMimeType::mimeType( arg );
diff --git a/kcontrol/filetypes/kservicelistwidget.cpp b/kcontrol/filetypes/kservicelistwidget.cpp
index ed6819a37..e4363415d 100644
--- a/kcontrol/filetypes/kservicelistwidget.cpp
+++ b/kcontrol/filetypes/kservicelistwidget.cpp
@@ -20,9 +20,9 @@
#include <unistd.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
+#include <tqpushbutton.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -38,7 +38,7 @@
#include <kstandarddirs.h>
KServiceListItem::KServiceListItem( KService *pService, int kind )
- : QListBoxText(), desktopPath(pService->desktopEntryPath())
+ : TQListBoxText(), desktopPath(pService->desktopEntryPath())
{
if ( kind == KServiceListWidget::SERVICELIST_APPLICATIONS )
setText( pService->name() );
@@ -57,13 +57,13 @@ bool KServiceListItem::isImmutable()
return !checkAccess(localPath, W_OK);
}
-KServiceListWidget::KServiceListWidget(int kind, QWidget *parent, const char *name)
- : QGroupBox( kind == SERVICELIST_APPLICATIONS ? i18n("Application Preference Order")
+KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *name)
+ : TQGroupBox( kind == SERVICELIST_APPLICATIONS ? i18n("Application Preference Order")
: i18n("Services Preference Order"), parent, name ),
m_kind( kind ), m_item( 0L )
{
- QWidget * gb = this;
- QGridLayout * grid = new QGridLayout(gb, 7, 2, KDialog::marginHint(),
+ TQWidget * gb = this;
+ TQGridLayout * grid = new TQGridLayout(gb, 7, 2, KDialog::marginHint(),
KDialog::spacingHint());
grid->addRowSpacing(0, fontMetrics().lineSpacing());
grid->setRowStretch(1, 1);
@@ -73,12 +73,12 @@ KServiceListWidget::KServiceListWidget(int kind, QWidget *parent, const char *na
grid->setRowStretch(5, 1);
grid->setRowStretch(6, 1);
- servicesLB = new QListBox(gb);
- connect(servicesLB, SIGNAL(highlighted(int)), SLOT(enableMoveButtons(int)));
+ servicesLB = new TQListBox(gb);
+ connect(servicesLB, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int)));
grid->addMultiCellWidget(servicesLB, 1, 6, 0, 0);
- connect( servicesLB, SIGNAL( doubleClicked ( QListBoxItem * )), this, SLOT( editService()));
+ connect( servicesLB, TQT_SIGNAL( doubleClicked ( TQListBoxItem * )), this, TQT_SLOT( editService()));
- QString wtstr =
+ TQString wtstr =
(kind == SERVICELIST_APPLICATIONS ?
i18n("This is a list of applications associated with files of the selected"
" file type. This list is shown in Konqueror's context menus when you select"
@@ -91,15 +91,15 @@ KServiceListWidget::KServiceListWidget(int kind, QWidget *parent, const char *na
" then the list is ordered by priority with the uppermost item taking precedence"
" over the others."));
- QWhatsThis::add( gb, wtstr );
- QWhatsThis::add( servicesLB, wtstr );
+ TQWhatsThis::add( gb, wtstr );
+ TQWhatsThis::add( servicesLB, wtstr );
- servUpButton = new QPushButton(i18n("Move &Up"), gb);
+ servUpButton = new TQPushButton(i18n("Move &Up"), gb);
servUpButton->setEnabled(false);
- connect(servUpButton, SIGNAL(clicked()), SLOT(promoteService()));
+ connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(promoteService()));
grid->addWidget(servUpButton, 2, 1);
- QWhatsThis::add( servUpButton, kind == SERVICELIST_APPLICATIONS ?
+ TQWhatsThis::add( servUpButton, kind == SERVICELIST_APPLICATIONS ?
i18n("Assigns a higher priority to the selected\n"
"application, moving it up in the list. Note: This\n"
"only affects the selected application if the file type is\n"
@@ -107,12 +107,12 @@ KServiceListWidget::KServiceListWidget(int kind, QWidget *parent, const char *na
i18n("Assigns a higher priority to the selected\n"
"service, moving it up in the list."));
- servDownButton = new QPushButton(i18n("Move &Down"), gb);
+ servDownButton = new TQPushButton(i18n("Move &Down"), gb);
servDownButton->setEnabled(false);
- connect(servDownButton, SIGNAL(clicked()), SLOT(demoteService()));
+ connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(demoteService()));
grid->addWidget(servDownButton, 3, 1);
- QWhatsThis::add( servDownButton, kind == SERVICELIST_APPLICATIONS ?
+ TQWhatsThis::add( servDownButton, kind == SERVICELIST_APPLICATIONS ?
i18n("Assigns a lower priority to the selected\n"
"application, moving it down in the list. Note: This \n"
"only affects the selected application if the file type is\n"
@@ -120,28 +120,28 @@ KServiceListWidget::KServiceListWidget(int kind, QWidget *parent, const char *na
i18n("Assigns a lower priority to the selected\n"
"service, moving it down in the list."));
- servNewButton = new QPushButton(i18n("Add..."), gb);
+ servNewButton = new TQPushButton(i18n("Add..."), gb);
servNewButton->setEnabled(false);
- connect(servNewButton, SIGNAL(clicked()), SLOT(addService()));
+ connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addService()));
grid->addWidget(servNewButton, 1, 1);
- QWhatsThis::add( servNewButton, i18n( "Add a new application for this file type." ) );
+ TQWhatsThis::add( servNewButton, i18n( "Add a new application for this file type." ) );
- servEditButton = new QPushButton(i18n("Edit..."), gb);
+ servEditButton = new TQPushButton(i18n("Edit..."), gb);
servEditButton->setEnabled(false);
- connect(servEditButton, SIGNAL(clicked()), SLOT(editService()));
+ connect(servEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(editService()));
grid->addWidget(servEditButton, 4, 1);
- QWhatsThis::add( servEditButton, i18n( "Edit command line of the selected application." ) );
+ TQWhatsThis::add( servEditButton, i18n( "Edit command line of the selected application." ) );
- servRemoveButton = new QPushButton(i18n("Remove"), gb);
+ servRemoveButton = new TQPushButton(i18n("Remove"), gb);
servRemoveButton->setEnabled(false);
- connect(servRemoveButton, SIGNAL(clicked()), SLOT(removeService()));
+ connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeService()));
grid->addWidget(servRemoveButton, 5, 1);
- QWhatsThis::add( servRemoveButton, i18n( "Remove the selected application from the list." ) );
+ TQWhatsThis::add( servRemoveButton, i18n( "Remove the selected application from the list." ) );
}
void KServiceListWidget::setTypeItem( TypesListItem * item )
@@ -163,14 +163,14 @@ void KServiceListWidget::setTypeItem( TypesListItem * item )
if ( item )
{
- QStringList services = ( m_kind == SERVICELIST_APPLICATIONS )
+ TQStringList services = ( m_kind == SERVICELIST_APPLICATIONS )
? item->appServices()
: item->embedServices();
if (services.count() == 0) {
servicesLB->insertItem(i18n("None"));
} else {
- for ( QStringList::Iterator it = services.begin();
+ for ( TQStringList::Iterator it = services.begin();
it != services.end(); it++ )
{
KService::Ptr pService = KService::serviceByDesktopPath( *it );
@@ -196,7 +196,7 @@ void KServiceListWidget::promoteService()
return;
}
- QListBoxItem *selItem = servicesLB->item(selIndex);
+ TQListBoxItem *selItem = servicesLB->item(selIndex);
servicesLB->takeItem(selItem);
servicesLB->insertItem(selItem, selIndex-1);
servicesLB->setCurrentItem(selIndex - 1);
@@ -219,7 +219,7 @@ void KServiceListWidget::demoteService()
return;
}
- QListBoxItem *selItem = servicesLB->item(selIndex);
+ TQListBoxItem *selItem = servicesLB->item(selIndex);
servicesLB->takeItem(selItem);
servicesLB->insertItem(selItem, selIndex+1);
servicesLB->setCurrentItem(selIndex + 1);
@@ -237,9 +237,9 @@ void KServiceListWidget::addService()
KService::Ptr service = 0L;
if ( m_kind == SERVICELIST_APPLICATIONS )
{
- KOpenWithDlg dlg(m_item->name(), QString::null, 0L);
+ KOpenWithDlg dlg(m_item->name(), TQString::null, 0L);
dlg.setSaveNewApplications(true);
- if (dlg.exec() != QDialog::Accepted)
+ if (dlg.exec() != TQDialog::Accepted)
return;
service = dlg.service();
@@ -250,8 +250,8 @@ void KServiceListWidget::addService()
}
else
{
- KServiceSelectDlg dlg(m_item->name(), QString::null, 0L);
- if (dlg.exec() != QDialog::Accepted)
+ KServiceSelectDlg dlg(m_item->name(), TQString::null, 0L);
+ if (dlg.exec() != TQDialog::Accepted)
return;
service = dlg.service();
Q_ASSERT(service);
@@ -294,14 +294,14 @@ void KServiceListWidget::editService()
{
// Just like popping up an add dialog except that we
// pass the current command line as a default
- QListBoxItem *selItem = servicesLB->item(selected);
+ TQListBoxItem *selItem = servicesLB->item(selected);
KService::Ptr service = KService::serviceByDesktopPath(
((KServiceListItem*)selItem)->desktopPath );
if (!service)
return;
- QString path = service->desktopEntryPath();
+ TQString path = service->desktopEntryPath();
// If the path to the desktop file is relative, try to get the full
// path from KStdDirs.
@@ -310,7 +310,7 @@ void KServiceListWidget::editService()
serviceURL.setPath( path );
KFileItem item( serviceURL, "application/x-desktop", KFileItem::Unknown );
KPropertiesDialog dlg( &item, this, 0, true /*modal*/, false /*no auto-show*/ );
- if ( dlg.exec() != QDialog::Accepted )
+ if ( dlg.exec() != TQDialog::Accepted )
return;
// Reload service
@@ -349,15 +349,15 @@ void KServiceListWidget::removeService()
if (!m_item) return;
// Here are some strings already so that we don't have to break translations
// later on.
- QString msg1 = i18n("The service <b>%1</b> can not be removed.");
- QString msg2 = i18n("The service is listed here because it has been associated "
+ TQString msg1 = i18n("The service <b>%1</b> can not be removed.");
+ TQString msg2 = i18n("The service is listed here because it has been associated "
"with the <b>%1</b> (%2) file type and files of type "
"<b>%3</b> (%4) are per definition also of type "
"<b>%5</b>.");
- QString msg3 = i18n("Either select the <b>%1</b> file type to remove the "
+ TQString msg3 = i18n("Either select the <b>%1</b> file type to remove the "
"service from there or move the service down "
"to deprecate it.");
- QString msg4 = i18n("Do you want to remove the service from the <b>%1</b> "
+ TQString msg4 = i18n("Do you want to remove the service from the <b>%1</b> "
"file type or from the <b>%2</b> file type?");
int selected = servicesLB->currentItem();
@@ -398,7 +398,7 @@ void KServiceListWidget::updatePreferredServices()
{
if (!m_item)
return;
- QStringList sl;
+ TQStringList sl;
unsigned int count = servicesLB->count();
for (unsigned int i = 0; i < count; i++) {
diff --git a/kcontrol/filetypes/kservicelistwidget.h b/kcontrol/filetypes/kservicelistwidget.h
index fb20d1c64..eb2590781 100644
--- a/kcontrol/filetypes/kservicelistwidget.h
+++ b/kcontrol/filetypes/kservicelistwidget.h
@@ -21,8 +21,8 @@
#ifndef _KSERVICELISTWIDGET_H
#define _KSERVICELISTWIDGET_H
-#include <qgroupbox.h>
-#include <qlistbox.h>
+#include <tqgroupbox.h>
+#include <tqlistbox.h>
class TypesListItem;
class QLineEdit;
class QPushButton;
@@ -33,8 +33,8 @@ class KServiceListItem : public QListBoxText
public:
KServiceListItem( KService *pService, int kind );
bool isImmutable();
- QString desktopPath;
- QString localPath;
+ TQString desktopPath;
+ TQString localPath;
};
/**
@@ -48,7 +48,7 @@ class KServiceListWidget : public QGroupBox
Q_OBJECT
public:
enum { SERVICELIST_APPLICATIONS, SERVICELIST_SERVICES };
- KServiceListWidget(int kind, QWidget *parent = 0, const char *name = 0);
+ KServiceListWidget(int kind, TQWidget *parent = 0, const char *name = 0);
void setTypeItem( TypesListItem * item );
@@ -68,9 +68,9 @@ protected:
private:
int m_kind;
- QListBox *servicesLB;
- QPushButton *servUpButton, *servDownButton;
- QPushButton *servNewButton, *servEditButton, *servRemoveButton;
+ TQListBox *servicesLB;
+ TQPushButton *servUpButton, *servDownButton;
+ TQPushButton *servNewButton, *servEditButton, *servRemoveButton;
TypesListItem *m_item;
};
diff --git a/kcontrol/filetypes/kserviceselectdlg.cpp b/kcontrol/filetypes/kserviceselectdlg.cpp
index c3a925218..340391e32 100644
--- a/kcontrol/filetypes/kserviceselectdlg.cpp
+++ b/kcontrol/filetypes/kserviceselectdlg.cpp
@@ -22,17 +22,17 @@
#include <klocale.h>
-#include <qvbox.h>
-#include <qlabel.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
-KServiceSelectDlg::KServiceSelectDlg( const QString& /*serviceType*/, const QString& /*value*/, QWidget *parent )
+KServiceSelectDlg::KServiceSelectDlg( const TQString& /*serviceType*/, const TQString& /*value*/, TQWidget *parent )
: KDialogBase( parent, "serviceSelectDlg", true,
i18n( "Add Service" ), Ok|Cancel, Ok )
{
- QVBox *vbox = new QVBox ( this );
+ TQVBox *vbox = new TQVBox ( this );
vbox->setSpacing( KDialog::spacingHint() );
- new QLabel( i18n( "Select service:" ), vbox );
+ new TQLabel( i18n( "Select service:" ), vbox );
m_listbox=new KListBox( vbox );
// Can't make a KTrader query since we don't have a servicetype to give,
@@ -40,7 +40,7 @@ KServiceSelectDlg::KServiceSelectDlg( const QString& /*serviceType*/, const QStr
// So we have to do it the slow way
// ### Why can't we query for KParts/ReadOnlyPart as the servicetype? Should work fine!
KService::List allServices = KService::allServices();
- QValueListIterator<KService::Ptr> it(allServices.begin());
+ TQValueListIterator<KService::Ptr> it(allServices.begin());
for ( ; it != allServices.end() ; ++it )
if ( (*it)->hasServiceType( "KParts/ReadOnlyPart" ) )
{
@@ -50,7 +50,7 @@ KServiceSelectDlg::KServiceSelectDlg( const QString& /*serviceType*/, const QStr
m_listbox->sort();
m_listbox->setMinimumHeight(350);
m_listbox->setMinimumWidth(300);
- connect(m_listbox,SIGNAL(doubleClicked ( QListBoxItem * )),SLOT(slotOk()));
+ connect(m_listbox,TQT_SIGNAL(doubleClicked ( TQListBoxItem * )),TQT_SLOT(slotOk()));
setMainWidget(vbox);
}
diff --git a/kcontrol/filetypes/kserviceselectdlg.h b/kcontrol/filetypes/kserviceselectdlg.h
index 05a2d4e9d..6f9bbe568 100644
--- a/kcontrol/filetypes/kserviceselectdlg.h
+++ b/kcontrol/filetypes/kserviceselectdlg.h
@@ -32,7 +32,7 @@ public:
* @param value is the initial service to select (not implemented currently)
* @param parent parent widget
*/
- KServiceSelectDlg( const QString& serviceType, const QString& value = QString::null, QWidget *parent = 0L );
+ KServiceSelectDlg( const TQString& serviceType, const TQString& value = TQString::null, TQWidget *parent = 0L );
~KServiceSelectDlg();
diff --git a/kcontrol/filetypes/newtypedlg.cpp b/kcontrol/filetypes/newtypedlg.cpp
index 24760cf1d..fb358f567 100644
--- a/kcontrol/filetypes/newtypedlg.cpp
+++ b/kcontrol/filetypes/newtypedlg.cpp
@@ -1,39 +1,39 @@
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qwhatsthis.h>
-#include <qcombobox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqwhatsthis.h>
+#include <tqcombobox.h>
#include <klocale.h>
#include <klineedit.h>
#include "newtypedlg.h"
-NewTypeDialog::NewTypeDialog(QStringList groups,
- QWidget *parent, const char *name)
+NewTypeDialog::NewTypeDialog(TQStringList groups,
+ TQWidget *parent, const char *name)
: KDialogBase(parent, name, true, i18n( "Create New File Type" ),
Ok|Cancel, Ok, true)
{
- QFrame *main = makeMainWidget();
- QVBoxLayout *topl = new QVBoxLayout(main, 0, spacingHint());
+ TQFrame *main = makeMainWidget();
+ TQVBoxLayout *topl = new TQVBoxLayout(main, 0, spacingHint());
- QGridLayout *grid = new QGridLayout(2, 2);
+ TQGridLayout *grid = new TQGridLayout(2, 2);
grid->setColStretch(1, 1);
topl->addLayout(grid);
- QLabel *l = new QLabel(i18n("Group:"), main);
+ TQLabel *l = new TQLabel(i18n("Group:"), main);
grid->addWidget(l, 0, 0);
- groupCombo = new QComboBox(main);
+ groupCombo = new TQComboBox(main);
//groupCombo->setEditable( true ); M.O.: Currently, the code in filetypesview isn't capable of handling
//new top level types; so better not let them be added than crash.
groupCombo->insertStringList(groups);
grid->addWidget(groupCombo, 0, 1);
- QWhatsThis::add( groupCombo, i18n("Select the category under which"
+ TQWhatsThis::add( groupCombo, i18n("Select the category under which"
" the new file type should be added.") );
- l = new QLabel(i18n("Type name:"), main);
+ l = new TQLabel(i18n("Type name:"), main);
grid->addWidget(l, 1, 0);
typeEd = new KLineEdit(main);
@@ -45,13 +45,13 @@ NewTypeDialog::NewTypeDialog(QStringList groups,
setMinimumSize( 300, 50 );
}
-QString NewTypeDialog::group() const
+TQString NewTypeDialog::group() const
{
return groupCombo->currentText();
}
-QString NewTypeDialog::text() const
+TQString NewTypeDialog::text() const
{
return typeEd->text();
}
diff --git a/kcontrol/filetypes/newtypedlg.h b/kcontrol/filetypes/newtypedlg.h
index 386b5fcdb..e76025ea6 100644
--- a/kcontrol/filetypes/newtypedlg.h
+++ b/kcontrol/filetypes/newtypedlg.h
@@ -1,8 +1,8 @@
#ifndef _NEWTYPEDLG_H
#define _NEWTYPEDLG_H
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <kdialogbase.h>
class KLineEdit;
@@ -16,13 +16,13 @@ class QComboBox;
class NewTypeDialog : public KDialogBase
{
public:
- NewTypeDialog(QStringList groups, QWidget *parent = 0,
+ NewTypeDialog(TQStringList groups, TQWidget *parent = 0,
const char *name = 0);
- QString group() const;
- QString text() const;
+ TQString group() const;
+ TQString text() const;
private:
KLineEdit *typeEd;
- QComboBox *groupCombo;
+ TQComboBox *groupCombo;
};
#endif
diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp
index 88f3c8035..5bef9a5d6 100644
--- a/kcontrol/filetypes/typeslistitem.cpp
+++ b/kcontrol/filetypes/typeslistitem.cpp
@@ -26,32 +26,32 @@
#include "typeslistitem.h"
-QMap< QString, QStringList >* TypesListItem::s_changedServices;
-static KStaticDeleter< QMap< QString, QStringList > > deleter;
+TQMap< TQString, TQStringList >* TypesListItem::s_changedServices;
+static KStaticDeleter< TQMap< TQString, TQStringList > > deleter;
-TypesListItem::TypesListItem(QListView *parent, const QString & major)
- : QListViewItem(parent), metaType(true), m_bNewItem(false), m_askSave(2)
+TypesListItem::TypesListItem(TQListView *parent, const TQString & major)
+ : TQListViewItem(parent), metaType(true), m_bNewItem(false), m_askSave(2)
{
initMeta(major);
setText(0, majorType());
}
TypesListItem::TypesListItem(TypesListItem *parent, KMimeType::Ptr mimetype, bool newItem)
- : QListViewItem(parent), metaType(false), m_bNewItem(newItem), m_askSave(2)
+ : TQListViewItem(parent), metaType(false), m_bNewItem(newItem), m_askSave(2)
{
init(mimetype);
setText(0, minorType());
}
-TypesListItem::TypesListItem(QListView *parent, KMimeType::Ptr mimetype)
- : QListViewItem(parent), metaType(false), m_bNewItem(false), m_askSave(2)
+TypesListItem::TypesListItem(TQListView *parent, KMimeType::Ptr mimetype)
+ : TQListViewItem(parent), metaType(false), m_bNewItem(false), m_askSave(2)
{
init(mimetype);
setText(0, majorType());
}
-TypesListItem::TypesListItem(QListView *parent, KMimeType::Ptr mimetype, bool newItem)
- : QListViewItem(parent), metaType(false), m_bNewItem(newItem), m_askSave(2)
+TypesListItem::TypesListItem(TQListView *parent, KMimeType::Ptr mimetype, bool newItem)
+ : TQListViewItem(parent), metaType(false), m_bNewItem(newItem), m_askSave(2)
{
init(mimetype);
setText(0, majorType());
@@ -61,7 +61,7 @@ TypesListItem::~TypesListItem()
{
}
-void TypesListItem::initMeta( const QString & major )
+void TypesListItem::initMeta( const TQString & major )
{
m_bFullInit = true;
m_mimetype = 0L;
@@ -69,10 +69,10 @@ void TypesListItem::initMeta( const QString & major )
KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("EmbedSettings");
bool defaultValue = defaultEmbeddingSetting( major );
- m_autoEmbed = config->readBoolEntry( QString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
+ m_autoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
}
-bool TypesListItem::defaultEmbeddingSetting( const QString& major )
+bool TypesListItem::defaultEmbeddingSetting( const TQString& major )
{
// embedding is false by default except for image/*
return ( major=="image" );
@@ -84,7 +84,7 @@ void TypesListItem::setup()
{
setPixmap(0, m_mimetype->pixmap(KIcon::Small, IconSize(KIcon::Small)));
}
- QListViewItem::setup();
+ TQListViewItem::setup();
}
void TypesListItem::init(KMimeType::Ptr mimetype)
@@ -101,15 +101,15 @@ void TypesListItem::init(KMimeType::Ptr mimetype)
m_major = mimetype->name();
m_minor = "";
}
- m_comment = mimetype->comment(QString(), false);
- m_icon = mimetype->icon(QString(), false);
+ m_comment = mimetype->comment(TQString(), false);
+ m_icon = mimetype->icon(TQString(), false);
m_patterns = mimetype->patterns();
m_autoEmbed = readAutoEmbed( mimetype );
}
int TypesListItem::readAutoEmbed( KMimeType::Ptr mimetype )
{
- QVariant v = mimetype->property( "X-KDE-AutoEmbed" );
+ TQVariant v = mimetype->property( "X-KDE-AutoEmbed" );
if ( v.isValid() )
return (v.toBool() ? 0 : 1);
else if ( !mimetype->property( "X-KDE-LocalProtocol" ).toString().isEmpty() )
@@ -118,7 +118,7 @@ int TypesListItem::readAutoEmbed( KMimeType::Ptr mimetype )
return 2;
}
-QStringList TypesListItem::appServices() const
+TQStringList TypesListItem::appServices() const
{
if (!m_bFullInit)
{
@@ -129,7 +129,7 @@ QStringList TypesListItem::appServices() const
return m_appServices;
}
-QStringList TypesListItem::embedServices() const
+TQStringList TypesListItem::embedServices() const
{
if (!m_bFullInit)
{
@@ -140,13 +140,13 @@ QStringList TypesListItem::embedServices() const
return m_embedServices;
}
-void TypesListItem::getServiceOffers( QStringList & appServices, QStringList & embedServices ) const
+void TypesListItem::getServiceOffers( TQStringList & appServices, TQStringList & embedServices ) const
{
KServiceTypeProfile::setConfigurationMode();
KServiceTypeProfile::OfferList offerList =
KServiceTypeProfile::offers(m_mimetype->name(), "Application");
- QValueListIterator<KServiceOffer> it(offerList.begin());
+ TQValueListIterator<KServiceOffer> it(offerList.begin());
for (; it != offerList.end(); ++it)
if ((*it).allowAsDefault())
appServices.append((*it).service()->desktopEntryPath());
@@ -168,14 +168,14 @@ bool TypesListItem::isMimeTypeDirty() const
kdDebug() << "Mimetype Name Dirty: old=" << m_mimetype->name() << " name()=" << name() << endl;
return true;
}
- if (m_mimetype->comment(QString(), false) != m_comment)
+ if (m_mimetype->comment(TQString(), false) != m_comment)
{
- kdDebug() << "Mimetype Comment Dirty: old=" << m_mimetype->comment(QString(),false) << " m_comment=" << m_comment << endl;
+ kdDebug() << "Mimetype Comment Dirty: old=" << m_mimetype->comment(TQString(),false) << " m_comment=" << m_comment << endl;
return true;
}
- if (m_mimetype->icon(QString(), false) != m_icon)
+ if (m_mimetype->icon(TQString(), false) != m_icon)
{
- kdDebug() << "Mimetype Icon Dirty: old=" << m_mimetype->icon(QString(),false) << " m_icon=" << m_icon << endl;
+ kdDebug() << "Mimetype Icon Dirty: old=" << m_mimetype->icon(TQString(),false) << " m_icon=" << m_icon << endl;
return true;
}
@@ -206,8 +206,8 @@ bool TypesListItem::isDirty() const
if ( !isMeta() )
{
- QStringList oldAppServices;
- QStringList oldEmbedServices;
+ TQStringList oldAppServices;
+ TQStringList oldEmbedServices;
getServiceOffers( oldAppServices, oldEmbedServices );
if (oldAppServices != m_appServices)
@@ -230,7 +230,7 @@ bool TypesListItem::isDirty() const
KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("EmbedSettings");
bool defaultValue = defaultEmbeddingSetting(m_major);
- unsigned int oldAutoEmbed = config->readBoolEntry( QString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
+ unsigned int oldAutoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
if ( m_autoEmbed != oldAutoEmbed )
return true;
}
@@ -249,7 +249,7 @@ void TypesListItem::sync()
{
KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("EmbedSettings");
- config->writeEntry( QString::fromLatin1("embed-")+m_major, m_autoEmbed == 0 );
+ config->writeEntry( TQString::fromLatin1("embed-")+m_major, m_autoEmbed == 0 );
return;
}
@@ -286,9 +286,9 @@ void TypesListItem::sync()
config.writeEntry("Hidden", false);
if ( m_autoEmbed == 2 )
- config.deleteEntry( QString::fromLatin1("X-KDE-AutoEmbed"), false );
+ config.deleteEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), false );
else
- config.writeEntry( QString::fromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 );
+ config.writeEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 );
m_bNewItem = false;
}
@@ -298,9 +298,9 @@ void TypesListItem::sync()
// Deleting current contents in profilerc relating to
// this service type
//
- QStringList groups = profile.groupList();
+ TQStringList groups = profile.groupList();
- for (QStringList::Iterator it = groups.begin();
+ for (TQStringList::Iterator it = groups.begin();
it != groups.end(); it++ )
{
profile.setGroup(*it);
@@ -331,7 +331,7 @@ void TypesListItem::sync()
offerList += KServiceTypeProfile::offers(m_mimetype->name(), "KParts/ReadOnlyPart");
KServiceTypeProfile::unsetConfigurationMode();
- QValueListIterator<KServiceOffer> it_srv(offerList.begin());
+ TQValueListIterator<KServiceOffer> it_srv(offerList.begin());
for (; it_srv != offerList.end(); ++it_srv) {
@@ -350,8 +350,8 @@ void TypesListItem::sync()
// create a new .desktop file without this mimetype
if( s_changedServices == NULL )
- deleter.setObject( s_changedServices, new QMap< QString, QStringList > );
- QStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
+ deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > );
+ TQStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes();
if ( mimeTypeList.contains( name() ) ) {
@@ -364,7 +364,7 @@ void TypesListItem::sync()
}
else
{
- QString path = pService->locateLocal();
+ TQString path = pService->locateLocal();
KConfig orig(pService->desktopEntryPath(), true, false, "apps");
desktop = orig.copyTo(path);
}
@@ -374,7 +374,7 @@ void TypesListItem::sync()
? (*s_changedServices)[ pService->desktopEntryPath() ] : desktop->readListEntry("MimeType", ';');
// Remove entry and the number that might follow.
- QStringList::Iterator it;
+ TQStringList::Iterator it;
for(;(it = mimeTypeList.find(name())) != mimeTypeList.end();)
{
it = mimeTypeList.remove(it);
@@ -405,10 +405,10 @@ void TypesListItem::sync()
// KUserProfile is concerned, but using the mimetype makes it a
// bit more structured for "manual" reading
while ( profile.hasGroup(
- name() + " - " + QString::number(groupCount) ) )
+ name() + " - " + TQString::number(groupCount) ) )
groupCount++;
- profile.setGroup( name() + " - " + QString::number(groupCount) );
+ profile.setGroup( name() + " - " + TQString::number(groupCount) );
profile.writeEntry("Application", pService->storageId());
profile.writeEntry("ServiceType", name());
@@ -419,9 +419,9 @@ void TypesListItem::sync()
}
}
-static bool inheritsMimetype(KMimeType::Ptr m, const QStringList &mimeTypeList)
+static bool inheritsMimetype(KMimeType::Ptr m, const TQStringList &mimeTypeList)
{
- for(QStringList::ConstIterator it = mimeTypeList.begin();
+ for(TQStringList::ConstIterator it = mimeTypeList.begin();
it != mimeTypeList.end(); ++it)
{
if (m->is(*it))
@@ -431,17 +431,17 @@ static bool inheritsMimetype(KMimeType::Ptr m, const QStringList &mimeTypeList)
return false;
}
-KMimeType::Ptr TypesListItem::findImplicitAssociation(const QString &desktop)
+KMimeType::Ptr TypesListItem::findImplicitAssociation(const TQString &desktop)
{
KService::Ptr s = KService::serviceByDesktopPath(desktop);
if (!s) return 0; // Hey, where did that one go?
if( s_changedServices == NULL )
- deleter.setObject( s_changedServices, new QMap< QString, QStringList > );
- QStringList mimeTypeList = s_changedServices->contains( s->desktopEntryPath())
+ deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > );
+ TQStringList mimeTypeList = s_changedServices->contains( s->desktopEntryPath())
? (*s_changedServices)[ s->desktopEntryPath() ] : s->serviceTypes();
- for(QStringList::ConstIterator it = mimeTypeList.begin();
+ for(TQStringList::ConstIterator it = mimeTypeList.begin();
it != mimeTypeList.end(); ++it)
{
if ((m_mimetype->name() != *it) && m_mimetype->is(*it))
@@ -452,9 +452,9 @@ KMimeType::Ptr TypesListItem::findImplicitAssociation(const QString &desktop)
return 0;
}
-void TypesListItem::saveServices( KConfig & profile, QStringList services, const QString & genericServiceType )
+void TypesListItem::saveServices( KConfig & profile, TQStringList services, const TQString & genericServiceType )
{
- QStringList::Iterator it(services.begin());
+ TQStringList::Iterator it(services.begin());
for (int i = services.count(); it != services.end(); ++it, i--) {
KService::Ptr pService = KService::serviceByDesktopPath(*it);
@@ -463,10 +463,10 @@ void TypesListItem::saveServices( KConfig & profile, QStringList services, const
// Find a group header. The headers are just dummy names as far as
// KUserProfile is concerned, but using the mimetype makes it a
// bit more structured for "manual" reading
- while ( profile.hasGroup( name() + " - " + QString::number(groupCount) ) )
+ while ( profile.hasGroup( name() + " - " + TQString::number(groupCount) ) )
groupCount++;
- profile.setGroup( name() + " - " + QString::number(groupCount) );
+ profile.setGroup( name() + " - " + TQString::number(groupCount) );
profile.writeEntry("ServiceType", name());
profile.writeEntry("GenericServiceType", genericServiceType);
@@ -476,20 +476,20 @@ void TypesListItem::saveServices( KConfig & profile, QStringList services, const
// merge new mimetype
if( s_changedServices == NULL )
- deleter.setObject( s_changedServices, new QMap< QString, QStringList > );
- QStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
+ deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > );
+ TQStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes();
if (!mimeTypeList.contains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList))
{
KConfig *desktop;
- if ( pService->type() == QString("Service") )
+ if ( pService->type() == TQString("Service") )
{
desktop = new KConfig(pService->desktopEntryPath(), false, false, "services");
}
else
{
- QString path = pService->locateLocal();
+ TQString path = pService->locateLocal();
KConfig orig(pService->desktopEntryPath(), true, false, "apps");
desktop = orig.copyTo(path);
}
@@ -510,7 +510,7 @@ void TypesListItem::saveServices( KConfig & profile, QStringList services, const
}
}
-void TypesListItem::setIcon( const QString& icon )
+void TypesListItem::setIcon( const TQString& icon )
{
m_icon = icon;
setPixmap( 0, SmallIcon( icon ) );
@@ -518,7 +518,7 @@ void TypesListItem::setIcon( const QString& icon )
bool TypesListItem::isEssential() const
{
- QString n = name();
+ TQString n = name();
if ( n == "application/octet-stream" )
return true;
if ( n == "inode/directory" )
diff --git a/kcontrol/filetypes/typeslistitem.h b/kcontrol/filetypes/typeslistitem.h
index 5f44e9864..18dca1af6 100644
--- a/kcontrol/filetypes/typeslistitem.h
+++ b/kcontrol/filetypes/typeslistitem.h
@@ -20,7 +20,7 @@
#ifndef _TYPESLISTITEM_H
#define _TYPESLISTITEM_H
-#include <qlistview.h>
+#include <tqlistview.h>
#include <kmimetype.h>
#include <kuserprofile.h>
@@ -31,7 +31,7 @@ public:
/**
* Create a filetype group
*/
- TypesListItem(QListView *parent, const QString & major );
+ TypesListItem(TQListView *parent, const TQString & major );
/**
* Create a filetype item inside a group
@@ -41,22 +41,22 @@ public:
/**
* Create a filetype item not inside a group (used by keditfiletype)
*/
- TypesListItem(QListView *parent, KMimeType::Ptr mimetype);
+ TypesListItem(TQListView *parent, KMimeType::Ptr mimetype);
/**
* Create a filetype item not inside a group (used by keditfiletype)
* KDE4: merge with previous
*/
- TypesListItem(QListView *parent, KMimeType::Ptr mimetype, bool newItem);
+ TypesListItem(TQListView *parent, KMimeType::Ptr mimetype, bool newItem);
~TypesListItem();
- QString name() const { return m_major + "/" + m_minor; }
- QString majorType() const { return m_major; }
- QString minorType() const { return m_minor; }
- void setMinor(QString m) { m_minor = m; }
- QString comment() const { return m_comment; }
- void setComment(QString c) { m_comment = c; }
+ TQString name() const { return m_major + "/" + m_minor; }
+ TQString majorType() const { return m_major; }
+ TQString minorType() const { return m_minor; }
+ void setMinor(TQString m) { m_minor = m; }
+ TQString comment() const { return m_comment; }
+ void setComment(TQString c) { m_comment = c; }
/**
* Returns true if "this" is a group
*/
@@ -66,14 +66,14 @@ public:
* (see KMimeType::checkEssentialMimeTypes)
*/
bool isEssential() const;
- QString icon() const { return m_icon; }
- void setIcon(const QString& i);
- QStringList patterns() const { return m_patterns; }
- void setPatterns(const QStringList &p) { m_patterns = p; }
- QStringList appServices() const;
- void setAppServices(const QStringList &dsl) { m_appServices = dsl; }
- QStringList embedServices() const;
- void setEmbedServices(const QStringList &dsl) { m_embedServices = dsl; }
+ TQString icon() const { return m_icon; }
+ void setIcon(const TQString& i);
+ TQStringList patterns() const { return m_patterns; }
+ void setPatterns(const TQStringList &p) { m_patterns = p; }
+ TQStringList appServices() const;
+ void setAppServices(const TQStringList &dsl) { m_appServices = dsl; }
+ TQStringList embedServices() const;
+ void setEmbedServices(const TQStringList &dsl) { m_embedServices = dsl; }
int autoEmbed() const { return m_autoEmbed; }
void setAutoEmbed( int a ) { m_autoEmbed = a; }
const KMimeType::Ptr& mimeType() const { return m_mimetype; }
@@ -83,7 +83,7 @@ public:
void setAskSave(bool);
// Whether the service s lists this mimetype explicitly
- KMimeType::Ptr findImplicitAssociation(const QString &desktop);
+ KMimeType::Ptr findImplicitAssociation(const TQString &desktop);
bool isMimeTypeDirty() const; // whether the mimetype .desktop file needs saving
bool isDirty() const;
@@ -91,13 +91,13 @@ public:
void setup();
void refresh(); // update m_mimetype from ksycoca when Apply is pressed
- static bool defaultEmbeddingSetting( const QString& major );
+ static bool defaultEmbeddingSetting( const TQString& major );
static void reset();
private:
- void getServiceOffers( QStringList & appServices, QStringList & embedServices ) const;
- void saveServices( KConfig & profile, QStringList services, const QString & servicetype2 );
- void initMeta( const QString & major );
+ void getServiceOffers( TQStringList & appServices, TQStringList & embedServices ) const;
+ void saveServices( KConfig & profile, TQStringList services, const TQString & servicetype2 );
+ void initMeta( const TQString & major );
void init(KMimeType::Ptr mimetype);
static int readAutoEmbed( KMimeType::Ptr mimetype );
@@ -108,11 +108,11 @@ private:
unsigned int m_bNewItem:1;
unsigned int m_bFullInit:1;
unsigned int m_askSave:2; // 0 yes, 1 no, 2 default
- QString m_major, m_minor, m_comment, m_icon;
- QStringList m_patterns;
- QStringList m_appServices;
- QStringList m_embedServices;
- static QMap< QString, QStringList >* s_changedServices;
+ TQString m_major, m_minor, m_comment, m_icon;
+ TQStringList m_patterns;
+ TQStringList m_appServices;
+ TQStringList m_embedServices;
+ static TQMap< TQString, TQStringList >* s_changedServices;
};
#endif
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index c50c89bc9..b082cf1fa 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -8,17 +8,17 @@
#include <config.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qdir.h>
-#include <qgroupbox.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qsettings.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqdir.h>
+#include <tqgroupbox.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqsettings.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
#include <dcopclient.h>
@@ -126,18 +126,18 @@ static const char *aa_vbgr_xpm[]={
static const char** aaPixmaps[]={ aa_rgb_xpm, aa_bgr_xpm, aa_vrgb_xpm, aa_vbgr_xpm };
/**** DLL Interface ****/
-typedef KGenericFactory<KFonts, QWidget> FontFactory;
+typedef KGenericFactory<KFonts, TQWidget> FontFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_fonts, FontFactory("kcmfonts") )
/**** FontUseItem ****/
FontUseItem::FontUseItem(
- QWidget * parent,
- const QString &name,
- const QString &grp,
- const QString &key,
- const QString &rc,
- const QFont &default_fnt,
+ TQWidget * parent,
+ const TQString &name,
+ const TQString &grp,
+ const TQString &key,
+ const TQString &rc,
+ const TQFont &default_fnt,
bool f
)
: KFontRequester(parent, 0L, f),
@@ -172,7 +172,7 @@ void FontUseItem::readFont( bool useDefaults )
config->setReadDefaults( useDefaults );
config->setGroup(_rcgroup);
- QFont tmpFnt(_default);
+ TQFont tmpFnt(_default);
setFont( config->readFontEntry(_rckey, &tmpFnt), isFixedOnly() );
if (deleteme) delete config;
}
@@ -194,9 +194,9 @@ void FontUseItem::writeFont()
}
}
-void FontUseItem::applyFontDiff( const QFont &fnt, int fontDiffFlags )
+void FontUseItem::applyFontDiff( const TQFont &fnt, int fontDiffFlags )
{
- QFont _font( font() );
+ TQFont _font( font() );
if (fontDiffFlags & KFontChooser::FontDiffSize) {
_font.setPointSize( fnt.pointSize() );
@@ -215,36 +215,36 @@ void FontUseItem::applyFontDiff( const QFont &fnt, int fontDiffFlags )
/**** FontAASettings ****/
-FontAASettings::FontAASettings(QWidget *parent)
+FontAASettings::FontAASettings(TQWidget *parent)
: KDialogBase(parent, "FontAASettings", true, i18n("Configure Anti-Alias Settings"), Ok|Cancel, Ok, true),
changesMade(false)
{
- QWidget *mw=new QWidget(this);
- QGridLayout *layout=new QGridLayout(mw, 1, 1, 0, KDialog::spacingHint());
+ TQWidget *mw=new TQWidget(this);
+ TQGridLayout *layout=new TQGridLayout(mw, 1, 1, 0, KDialog::spacingHint());
- excludeRange=new QCheckBox(i18n("E&xclude range:"), mw),
+ excludeRange=new TQCheckBox(i18n("E&xclude range:"), mw),
layout->addWidget(excludeRange, 0, 0);
excludeFrom=new KDoubleNumInput(0, 72, 8.0, 1, 1, mw),
excludeFrom->setSuffix(i18n(" pt"));
layout->addWidget(excludeFrom, 0, 1);
- excludeToLabel=new QLabel(i18n(" to "), mw);
+ excludeToLabel=new TQLabel(i18n(" to "), mw);
layout->addWidget(excludeToLabel, 0, 2);
excludeTo=new KDoubleNumInput(0, 72, 15.0, 1, 1, mw);
excludeTo->setSuffix(i18n(" pt"));
layout->addWidget(excludeTo, 0, 3);
- useSubPixel=new QCheckBox(i18n("&Use sub-pixel hinting:"), mw);
+ useSubPixel=new TQCheckBox(i18n("&Use sub-pixel hinting:"), mw);
layout->addWidget(useSubPixel, 1, 0);
- QWhatsThis::add(useSubPixel, i18n("If you have a TFT or LCD screen you"
+ TQWhatsThis::add(useSubPixel, i18n("If you have a TFT or LCD screen you"
" can further improve the quality of displayed fonts by selecting"
" this option.<br>Sub-pixel hinting is also known as ClearType(tm).<br>"
"<br><b>This will not work with CRT monitors.</b>"));
- subPixelType=new QComboBox(false, mw);
+ subPixelType=new TQComboBox(false, mw);
layout->addMultiCellWidget(subPixelType, 1, 1, 1, 3);
- QWhatsThis::add(subPixelType, i18n("In order for sub-pixel hinting to"
+ TQWhatsThis::add(subPixelType, i18n("In order for sub-pixel hinting to"
" work correctly you need to know how the sub-pixels of your display"
" are aligned.<br>"
" On TFT or LCD displays a single pixel is actually composed of"
@@ -252,31 +252,31 @@ FontAASettings::FontAASettings(QWidget *parent)
" have a linear ordering of RGB sub-pixel, some have BGR."));
for(int t=KXftConfig::SubPixel::None+1; t<=KXftConfig::SubPixel::Vbgr; ++t)
- subPixelType->insertItem(QPixmap(aaPixmaps[t-1]), KXftConfig::description((KXftConfig::SubPixel::Type)t));
+ subPixelType->insertItem(TQPixmap(aaPixmaps[t-1]), KXftConfig::description((KXftConfig::SubPixel::Type)t));
#ifdef HAVE_FONTCONFIG
- QLabel *hintingLabel=new QLabel(i18n("Hinting style: "), mw);
+ TQLabel *hintingLabel=new TQLabel(i18n("Hinting style: "), mw);
layout->addWidget(hintingLabel, 2, 0);
- hintingStyle=new QComboBox(false, mw);
+ hintingStyle=new TQComboBox(false, mw);
layout->addMultiCellWidget(hintingStyle, 2, 2, 1, 3);
for(int s=KXftConfig::Hint::NotSet+1; s<=KXftConfig::Hint::Full; ++s)
hintingStyle->insertItem(KXftConfig::description((KXftConfig::Hint::Style)s));
- QString hintingText(i18n("Hinting is a process used to enhance the quality of fonts at small sizes."));
- QWhatsThis::add(hintingStyle, hintingText);
- QWhatsThis::add(hintingLabel, hintingText);
+ TQString hintingText(i18n("Hinting is a process used to enhance the quality of fonts at small sizes."));
+ TQWhatsThis::add(hintingStyle, hintingText);
+ TQWhatsThis::add(hintingLabel, hintingText);
#endif
load();
enableWidgets();
setMainWidget(mw);
- connect(excludeRange, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(useSubPixel, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(excludeFrom, SIGNAL(valueChanged(double)), SLOT(changed()));
- connect(excludeTo, SIGNAL(valueChanged(double)), SLOT(changed()));
- connect(subPixelType, SIGNAL(activated(const QString &)), SLOT(changed()));
+ connect(excludeRange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(useSubPixel, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(excludeFrom, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(changed()));
+ connect(excludeTo, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(changed()));
+ connect(subPixelType, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
#ifdef HAVE_FONTCONFIG
- connect(hintingStyle, SIGNAL(activated(const QString &)), SLOT(changed()));
+ connect(hintingStyle, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
#endif
}
@@ -375,7 +375,7 @@ bool FontAASettings::save( bool useAA )
xft.setHintStyle(hStyle);
- QString hs(KXftConfig::toStr(hStyle));
+ TQString hs(KXftConfig::toStr(hStyle));
if(!hs.isEmpty() && hs!=kglobals.readEntry("XftHintStyle"))
{
@@ -492,12 +492,12 @@ int FontAASettings::exec()
/**** KFonts ****/
-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
@@ -506,10 +506,10 @@ static QCString desktopConfigName()
return name;
}
-KFonts::KFonts(QWidget *parent, const char *name, const QStringList &)
+KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(FontFactory::instance(), parent, name)
{
- QStringList nameGroupKeyRc;
+ TQStringList nameGroupKeyRc;
nameGroupKeyRc
<< i18n("General") << "General" << "font" << ""
@@ -520,15 +520,15 @@ KFonts::KFonts(QWidget *parent, const char *name, const QStringList &)
<< i18n("Taskbar") << "General" << "taskbarFont" << ""
<< i18n("Desktop") << "FMSettings" << "StandardFont" << desktopConfigName();
- QValueList<QFont> defaultFontList;
+ TQValueList<TQFont> defaultFontList;
// Keep in sync with kdelibs/kdecore/kglobalsettings.cpp
- QFont f0("Sans Serif", 10);
- QFont f1("Monospace", 10);
- QFont f2("Sans Serif", 10);
- QFont f3("Sans Serif", 10, QFont::Bold);
- QFont f4("Sans Serif", 10);
+ TQFont f0("Sans Serif", 10);
+ TQFont f1("Monospace", 10);
+ TQFont f2("Sans Serif", 10);
+ TQFont f3("Sans Serif", 10, TQFont::Bold);
+ TQFont f4("Sans Serif", 10);
f0.setPointSize(10);
f1.setPointSize(10);
@@ -538,7 +538,7 @@ KFonts::KFonts(QWidget *parent, const char *name, const QStringList &)
defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0;
- QValueList<bool> fixedList;
+ TQValueList<bool> fixedList;
fixedList
<< false
@@ -549,7 +549,7 @@ KFonts::KFonts(QWidget *parent, const char *name, const QStringList &)
<< false
<< false;
- QStringList quickHelpList;
+ TQStringList quickHelpList;
quickHelpList
<< i18n("Used for normal text (e.g. button labels, list items).")
@@ -560,29 +560,29 @@ KFonts::KFonts(QWidget *parent, const char *name, const QStringList &)
<< i18n("Used by the taskbar.")
<< i18n("Used for desktop icons.");
- QVBoxLayout * layout =
- new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout * layout =
+ new TQVBoxLayout(this, 0, KDialog::spacingHint());
- QGridLayout * fontUseLayout =
- new QGridLayout(layout, nameGroupKeyRc.count() / 4, 3);
+ TQGridLayout * fontUseLayout =
+ new TQGridLayout(layout, nameGroupKeyRc.count() / 4, 3);
fontUseLayout->setColStretch(0, 0);
fontUseLayout->setColStretch(1, 1);
fontUseLayout->setColStretch(2, 0);
- QValueList<QFont>::ConstIterator defaultFontIt(defaultFontList.begin());
- QValueList<bool>::ConstIterator fixedListIt(fixedList.begin());
- QStringList::ConstIterator quickHelpIt(quickHelpList.begin());
- QStringList::ConstIterator it(nameGroupKeyRc.begin());
+ TQValueList<TQFont>::ConstIterator defaultFontIt(defaultFontList.begin());
+ TQValueList<bool>::ConstIterator fixedListIt(fixedList.begin());
+ TQStringList::ConstIterator quickHelpIt(quickHelpList.begin());
+ TQStringList::ConstIterator it(nameGroupKeyRc.begin());
unsigned int count = 0;
while (it != nameGroupKeyRc.end()) {
- QString name = *it; it++;
- QString group = *it; it++;
- QString key = *it; it++;
- QString file = *it; it++;
+ TQString name = *it; it++;
+ TQString group = *it; it++;
+ TQString key = *it; it++;
+ TQString file = *it; it++;
FontUseItem * i =
new FontUseItem(
@@ -596,10 +596,10 @@ KFonts::KFonts(QWidget *parent, const char *name, const QStringList &)
);
fontUseList.append(i);
- connect(i, SIGNAL(fontSelected(const QFont &)), SLOT(fontSelected()));
+ connect(i, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(fontSelected()));
- QLabel * fontUse = new QLabel(name+":", this);
- QWhatsThis::add(fontUse, *quickHelpIt++);
+ TQLabel * fontUse = new TQLabel(name+":", this);
+ TQWhatsThis::add(fontUse, *quickHelpIt++);
fontUseLayout->addWidget(fontUse, count, 0);
fontUseLayout->addWidget(i, count, 1);
@@ -607,40 +607,40 @@ KFonts::KFonts(QWidget *parent, const char *name, const QStringList &)
++count;
}
- QHBoxLayout *hblay = new QHBoxLayout(layout, KDialog::spacingHint());
+ TQHBoxLayout *hblay = new TQHBoxLayout(layout, KDialog::spacingHint());
hblay->addStretch();
- QPushButton * fontAdjustButton = new QPushButton(i18n("Ad&just All Fonts..."), this);
- QWhatsThis::add(fontAdjustButton, i18n("Click to change all fonts"));
+ TQPushButton * fontAdjustButton = new TQPushButton(i18n("Ad&just All Fonts..."), this);
+ TQWhatsThis::add(fontAdjustButton, i18n("Click to change all fonts"));
hblay->addWidget( fontAdjustButton );
- connect(fontAdjustButton, SIGNAL(clicked()), SLOT(slotApplyFontDiff()));
+ connect(fontAdjustButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyFontDiff()));
layout->addSpacing(KDialog::spacingHint());
- QGridLayout* lay = new QGridLayout(layout, 2, 4, KDialog::spacingHint());
+ TQGridLayout* lay = new TQGridLayout(layout, 2, 4, KDialog::spacingHint());
lay->setColStretch( 3, 10 );
- QLabel* label = new QLabel( i18n( "Use a&nti-aliasing:" ), this );
+ TQLabel* label = new TQLabel( i18n( "Use a&nti-aliasing:" ), this );
lay->addWidget( label, 0, 0 );
- cbAA = new QComboBox( this );
+ cbAA = new TQComboBox( this );
cbAA->insertItem( i18n( "Enabled" )); // change AASetting type if order changes
cbAA->insertItem( i18n( "System settings" ));
cbAA->insertItem( i18n( "Disabled" ));
- QWhatsThis::add(cbAA, i18n("If this option is selected, KDE will smooth the edges of curves in "
+ TQWhatsThis::add(cbAA, i18n("If this option is selected, KDE will smooth the edges of curves in "
"fonts."));
- aaSettingsButton = new QPushButton( i18n( "Configure..." ), this);
- connect(aaSettingsButton, SIGNAL(clicked()), SLOT(slotCfgAa()));
+ aaSettingsButton = new TQPushButton( i18n( "Configure..." ), this);
+ connect(aaSettingsButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCfgAa()));
label->setBuddy( cbAA );
lay->addWidget( cbAA, 0, 1 );
lay->addWidget( aaSettingsButton, 0, 2 );
- connect(cbAA, SIGNAL(activated(int)), SLOT(slotUseAntiAliasing()));
+ connect(cbAA, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUseAntiAliasing()));
- label = new QLabel( i18n( "Force fonts DPI:" ), this );
+ label = new TQLabel( i18n( "Force fonts DPI:" ), this );
lay->addWidget( label, 1, 0 );
- comboForceDpi = new QComboBox( this );
+ comboForceDpi = new TQComboBox( this );
label->setBuddy( comboForceDpi );
comboForceDpi->insertItem( i18n( "Disabled" )); // change DPISetti ng type if order changes
comboForceDpi->insertItem( i18n( "96 DPI" ));
comboForceDpi->insertItem( i18n( "120 DPI" ));
- QString whatsthis = i18n(
+ TQString whatsthis = i18n(
"<p>This option forces a specific DPI value for fonts. It may be useful"
" when the real DPI of the hardware is not detected properly and it"
" is also often misused when poor quality fonts are used that do not"
@@ -651,8 +651,8 @@ KFonts::KFonts(QWidget *parent, const char *name, const QStringList &)
" ServerLocalArgs= in $KDEDIR/share/config/kdm/kdmrc). When fonts do not render"
" properly with real DPI value better fonts should be used or configuration"
" of font hinting should be checked.</p>" );
- QWhatsThis::add(comboForceDpi, whatsthis);
- connect( comboForceDpi, SIGNAL( activated( int )), SLOT( changed()));
+ TQWhatsThis::add(comboForceDpi, whatsthis);
+ connect( comboForceDpi, TQT_SIGNAL( activated( int )), TQT_SLOT( changed()));
lay->addWidget( comboForceDpi, 1, 1 );
layout->addStretch(1);
@@ -727,17 +727,17 @@ void KFonts::save()
if( dpi == DPINone && dpi_original != DPINone ) {
KProcIO proc;
proc << "xrdb" << "-quiet" << "-remove" << "-nocpp";
- proc.writeStdin( QCString( "Xft.dpi" ), true );
+ proc.writeStdin( TQCString( "Xft.dpi" ), true );
proc.closeWhenDone();
proc.start( KProcess::Block );
}
// KDE-1.x support
- KSimpleConfig* config = new KSimpleConfig( QDir::homeDirPath() + "/.kderc" );
+ KSimpleConfig* config = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" );
config->setGroup( "General" );
for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() ) {
if("font"==i->rcKey())
- QSettings().writeEntry("/qt/font", i->font().toString());
+ TQSettings().writeEntry("/qt/font", i->font().toString());
kdDebug(1208) << "write entry " << i->rcKey() << endl;
config->writeEntry( i->rcKey(), i->font() );
}
@@ -772,7 +772,7 @@ void KFonts::save()
void KFonts::slotApplyFontDiff()
{
- QFont font = QFont(fontUseList.first()->font());
+ TQFont font = TQFont(fontUseList.first()->font());
int fontDiffFlags = 0;
int ret = KFontDialog::getFontDiff(font,fontDiffFlags);
diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h
index ca1ab7729..0adb2565d 100644
--- a/kcontrol/fonts/fonts.h
+++ b/kcontrol/fonts/fonts.h
@@ -8,7 +8,7 @@
#ifndef FONTS_H
#define FONTS_H
-#include <qobject.h>
+#include <tqobject.h>
#include <kcmodule.h>
#include <kdialogbase.h>
@@ -27,24 +27,24 @@ class FontUseItem : public KFontRequester
Q_OBJECT
public:
- FontUseItem(QWidget * parent, const QString &name, const QString &grp,
- const QString &key, const QString &rc, const QFont &default_fnt,
+ FontUseItem(TQWidget * parent, const TQString &name, const TQString &grp,
+ const TQString &key, const TQString &rc, const TQFont &default_fnt,
bool fixed = false);
void readFont( bool useDefaults );
void writeFont();
void setDefault();
- void applyFontDiff(const QFont &fnt, int fontDiffFlags);
+ void applyFontDiff(const TQFont &fnt, int fontDiffFlags);
- const QString& rcFile() { return _rcfile; }
- const QString& rcGroup() { return _rcgroup; }
- const QString& rcKey() { return _rckey; }
+ const TQString& rcFile() { return _rcfile; }
+ const TQString& rcGroup() { return _rcgroup; }
+ const TQString& rcKey() { return _rckey; }
private:
- QString _rcfile;
- QString _rcgroup;
- QString _rckey;
- QFont _default;
+ TQString _rcfile;
+ TQString _rcgroup;
+ TQString _rckey;
+ TQFont _default;
};
class FontAASettings : public KDialogBase
@@ -53,7 +53,7 @@ class FontAASettings : public KDialogBase
public:
- FontAASettings(QWidget *parent);
+ FontAASettings(TQWidget *parent);
bool save( bool useAA );
bool load();
@@ -74,15 +74,15 @@ protected slots:
private:
- QCheckBox *excludeRange;
- QCheckBox *useSubPixel;
+ TQCheckBox *excludeRange;
+ TQCheckBox *useSubPixel;
KDoubleNumInput *excludeFrom;
KDoubleNumInput *excludeTo;
- QComboBox *subPixelType;
+ TQComboBox *subPixelType;
#ifdef HAVE_FONTCONFIG
- QComboBox *hintingStyle;
+ TQComboBox *hintingStyle;
#endif
- QLabel *excludeToLabel;
+ TQLabel *excludeToLabel;
bool changesMade;
};
@@ -94,7 +94,7 @@ class KFonts : public KCModule
Q_OBJECT
public:
- KFonts(QWidget *parent, const char *name, const QStringList &);
+ KFonts(TQWidget *parent, const char *name, const TQStringList &);
~KFonts();
virtual void load();
@@ -113,10 +113,10 @@ private:
enum DPISetting { DPINone, DPI96, DPI120 };
AASetting useAA, useAA_original;
DPISetting dpi_original;
- QComboBox *cbAA;
- QComboBox* comboForceDpi;
- QPushButton *aaSettingsButton;
- QPtrList <FontUseItem> fontUseList;
+ TQComboBox *cbAA;
+ TQComboBox* comboForceDpi;
+ TQPushButton *aaSettingsButton;
+ TQPtrList <FontUseItem> fontUseList;
FontAASettings *aaSettings;
};
diff --git a/kcontrol/fonts/kxftconfig.cpp b/kcontrol/fonts/kxftconfig.cpp
index 22621f5e6..682672a7a 100644
--- a/kcontrol/fonts/kxftconfig.cpp
+++ b/kcontrol/fonts/kxftconfig.cpp
@@ -23,14 +23,14 @@
#include <ctype.h>
#include <stdlib.h>
#include <sys/stat.h>
-#include <qregexp.h>
-#include <qfile.h>
-#include <qpaintdevice.h>
+#include <tqregexp.h>
+#include <tqfile.h>
+#include <tqpaintdevice.h>
#include <klocale.h>
#include <klargefile.h>
-#include <qdir.h>
-#include <qsettings.h>
-#include <qfont.h>
+#include <tqdir.h>
+#include <tqsettings.h>
+#include <tqfont.h>
#ifdef HAVE_FONTCONFIG
#include <stdarg.h>
@@ -41,40 +41,40 @@
using namespace std;
-QString KXftConfig::contractHome(QString path)
+TQString KXftConfig::contractHome(TQString path)
{
if (!path.isEmpty() && '/'==path[0])
{
- QString home(QDir::homeDirPath());
+ TQString home(TQDir::homeDirPath());
if(path.startsWith(home))
{
unsigned int len = home.length();
if(path.length() == len || path[len] == '/')
- return path.replace(0, len, QString::fromLatin1("~"));
+ return path.replace(0, len, TQString::fromLatin1("~"));
}
}
return path;
}
-QString KXftConfig::expandHome(QString path)
+TQString KXftConfig::expandHome(TQString path)
{
if(!path.isEmpty() && '~'==path[0])
- return 1==path.length() ? QDir::homeDirPath() : path.replace(0, 1, QDir::homeDirPath());
+ return 1==path.length() ? TQDir::homeDirPath() : path.replace(0, 1, TQDir::homeDirPath());
return path;
}
static int point2Pixel(double point)
{
- return (int)(((point*QPaintDevice::x11AppDpiY())/72.0)+0.5);
+ return (int)(((point*TQPaintDevice::x11AppDpiY())/72.0)+0.5);
}
static int pixel2Point(double pixel)
{
- return (int)(((pixel*72.0)/(double)QPaintDevice::x11AppDpiY())+0.5);
+ return (int)(((pixel*72.0)/(double)TQPaintDevice::x11AppDpiY())+0.5);
}
static bool equal(double d1, double d2)
@@ -82,11 +82,11 @@ static bool equal(double d1, double d2)
return (fabs(d1 - d2) < 0.0001);
}
-static QString dirSyntax(const QString &d)
+static TQString dirSyntax(const TQString &d)
{
if(!d.isNull())
{
- QString ds(d);
+ TQString ds(d);
ds.replace("//", "/");
@@ -101,11 +101,11 @@ static QString dirSyntax(const QString &d)
return d;
}
-static QString xDirSyntax(const QString &d)
+static TQString xDirSyntax(const TQString &d)
{
if(!d.isNull())
{
- QString ds(d);
+ TQString ds(d);
int slashPos=ds.findRev('/');
if(slashPos==(((int)ds.length())-1))
@@ -116,32 +116,32 @@ static QString xDirSyntax(const QString &d)
return d;
}
-static bool check(const QString &path, unsigned int fmt, bool checkW=false)
+static bool check(const TQString &path, unsigned int fmt, bool checkW=false)
{
KDE_struct_stat info;
- QCString pathC(QFile::encodeName(path));
+ TQCString pathC(TQFile::encodeName(path));
return 0==KDE_lstat(pathC, &info) && (info.st_mode&S_IFMT)==fmt && (!checkW || 0==::access(pathC, W_OK));
}
-inline bool fExists(const QString &p)
+inline bool fExists(const TQString &p)
{
return check(p, S_IFREG, false);
}
-inline bool dWritable(const QString &p)
+inline bool dWritable(const TQString &p)
{
return check(p, S_IFDIR, true);
}
-inline bool dExists(const QString &p)
+inline bool dExists(const TQString &p)
{
return check(p, S_IFDIR, false);
}
-static QString getDir(const QString &f)
+static TQString getDir(const TQString &f)
{
- QString d(f);
+ TQString d(f);
int slashPos=d.findRev('/');
@@ -151,16 +151,16 @@ static QString getDir(const QString &f)
return dirSyntax(d);
}
-static time_t getTimeStamp(const QString &item)
+static time_t getTimeStamp(const TQString &item)
{
KDE_struct_stat info;
- return !item.isNull() && 0==KDE_lstat(QFile::encodeName(item), &info) ? info.st_mtime : 0;
+ return !item.isNull() && 0==KDE_lstat(TQFile::encodeName(item), &info) ? info.st_mtime : 0;
}
#ifdef HAVE_FONTCONFIG
-inline QString fileSyntax(const QString &f) { return xDirSyntax(f); }
+inline TQString fileSyntax(const TQString &f) { return xDirSyntax(f); }
//
// Obtain location of config file to use.
//
@@ -174,20 +174,20 @@ inline QString fileSyntax(const QString &f) { return xDirSyntax(f); }
// $HOME/<...>/.fonts.conf
// $HOME/<...>/fonts.conf
//
-QString getConfigFile(bool system)
+TQString getConfigFile(bool system)
{
#if (FC_VERSION>=20300)
static const char * constKdeRootFcFile="00kde.conf";
#endif
FcStrList *list=FcConfigGetConfigFiles(FcConfigGetCurrent());
- QStringList files;
+ TQStringList files;
FcChar8 *file;
- QString home(dirSyntax(QDir::homeDirPath()));
+ TQString home(dirSyntax(TQDir::homeDirPath()));
while((file=FcStrListNext(list)))
{
- QString f((const char *)file);
+ TQString f((const char *)file);
if(fExists(f))
{
@@ -195,7 +195,7 @@ QString getConfigFile(bool system)
files.append(f);
}
#if (FC_VERSION>=20300)
- if(system && dExists(f) && (-1!=f.find(QRegExp("/conf\\.d/?$")) || -1!=f.find(QRegExp("/conf\\.d?$"))) )
+ if(system && dExists(f) && (-1!=f.find(TQRegExp("/conf\\.d/?$")) || -1!=f.find(TQRegExp("/conf\\.d?$"))) )
return dirSyntax(f)+constKdeRootFcFile; // This ones good enough for me!
#endif
}
@@ -204,11 +204,11 @@ QString getConfigFile(bool system)
// Go through list of files, looking for the preferred one...
if(files.count())
{
- QStringList::Iterator it(files.begin()),
+ TQStringList::Iterator it(files.begin()),
end(files.end());
for(; it!=end; ++it)
- if(-1!=(*it).find(QRegExp(system ? "/local\\.conf$" : "/\\.?fonts\\.conf$")))
+ if(-1!=(*it).find(TQRegExp(system ? "/local\\.conf$" : "/\\.?fonts\\.conf$")))
return *it;
return files.front(); // Just return the 1st one...
}
@@ -216,7 +216,7 @@ QString getConfigFile(bool system)
return system ? "/etc/fonts/local.conf" : fileSyntax(home+"/.fonts.conf"); // Hmmm... no known files?
}
-static QString getEntry(QDomElement element, const char *type, unsigned int numAttributes, ...)
+static TQString getEntry(TQDomElement element, const char *type, unsigned int numAttributes, ...)
{
if(numAttributes==element.attributes().length())
{
@@ -239,11 +239,11 @@ static QString getEntry(QDomElement element, const char *type, unsigned int numA
if(ok)
{
- QDomNode n=element.firstChild();
+ TQDomNode n=element.firstChild();
if(!n.isNull())
{
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
if(!e.isNull() && type==e.tagName())
return e.text();
@@ -251,7 +251,7 @@ static QString getEntry(QDomElement element, const char *type, unsigned int numA
}
}
- return QString::null;
+ return TQString::null;
}
static KXftConfig::SubPixel::Type strToType(const char *str)
@@ -379,7 +379,7 @@ static bool readNum(char **ptr, double *num)
return false;
}
-static KXftConfig::ListItem * getFirstItem(QPtrList<KXftConfig::ListItem> &list)
+static KXftConfig::ListItem * getFirstItem(TQPtrList<KXftConfig::ListItem> &list)
{
KXftConfig::ListItem *cur;
@@ -390,7 +390,7 @@ static KXftConfig::ListItem * getFirstItem(QPtrList<KXftConfig::ListItem> &list)
}
#endif
-static KXftConfig::ListItem * getLastItem(QPtrList<KXftConfig::ListItem> &list)
+static KXftConfig::ListItem * getLastItem(TQPtrList<KXftConfig::ListItem> &list)
{
KXftConfig::ListItem *cur;
@@ -401,16 +401,16 @@ static KXftConfig::ListItem * getLastItem(QPtrList<KXftConfig::ListItem> &list)
}
#ifndef HAVE_FONTCONFIG
-static const QString defaultPath("/usr/X11R6/lib/X11/XftConfig");
-static const QString defaultUserFile(".xftconfig");
+static const TQString defaultPath("/usr/X11R6/lib/X11/XftConfig");
+static const TQString defaultUserFile(".xftconfig");
static const char * constSymEnc="\"glyphs-fontspecific\"";
-static const QString constConfigFiles[]=
+static const TQString constConfigFiles[]=
{
defaultPath,
"/etc/X11/XftConfig",
- QString::null
+ TQString::null
};
#endif
@@ -441,7 +441,7 @@ KXftConfig::KXftConfig(int required, bool system)
m_file=defaultPath;
}
else
- m_file= QString(QDir::homeDirPath()+"/"+defaultUserFile);
+ m_file= TQString(TQDir::homeDirPath()+"/"+defaultUserFile);
#endif
#ifndef HAVE_FONTCONFIG
m_symbolFamilies.setAutoDelete(true);
@@ -475,7 +475,7 @@ bool KXftConfig::reset()
m_subPixel.reset();
#ifdef HAVE_FONTCONFIG
- QFile f(m_file);
+ TQFile f(m_file);
if(f.open(IO_ReadOnly))
{
@@ -493,7 +493,7 @@ bool KXftConfig::reset()
if(m_doc.documentElement().isNull())
m_doc.appendChild(m_doc.createElement("fontconfig"));
#else
- QFile f(m_file);
+ TQFile f(m_file);
m_size=0;
delete [] m_data;
@@ -563,8 +563,8 @@ bool KXftConfig::apply()
if(fExists(m_file) && getTimeStamp(m_file)!=m_time)
{
KXftConfig newConfig(m_required, m_system);
- QStringList list;
- QStringList::Iterator it;
+ TQStringList list;
+ TQStringList::Iterator it;
if(m_required&Dirs)
{
@@ -607,7 +607,7 @@ bool KXftConfig::apply()
}
#ifdef HAVE_FONTCONFIG
- FcAtomic *atomic=FcAtomicCreate((const unsigned char *)((const char *)(QFile::encodeName(m_file))));
+ FcAtomic *atomic=FcAtomicCreate((const unsigned char *)((const char *)(TQFile::encodeName(m_file))));
ok=false;
if(atomic)
@@ -642,7 +642,7 @@ bool KXftConfig::apply()
const char qtDocTypeLine[] = "<!DOCTYPE fontconfig>";
const char docTypeLine[] = "<!DOCTYPE fontconfig SYSTEM \"fonts.dtd\">";
- QString str(m_doc.toString());
+ TQString str(m_doc.toString());
int idx;
if(0!=str.find("<?xml"))
@@ -671,7 +671,7 @@ bool KXftConfig::apply()
FcAtomicDestroy(atomic);
}
#else
- std::ofstream f(QFile::encodeName(m_file));
+ std::ofstream f(TQFile::encodeName(m_file));
if(f)
{
@@ -852,22 +852,22 @@ void KXftConfig::setExcludeRange(double from, double to)
}
}
-void KXftConfig::addDir(const QString &d)
+void KXftConfig::addDir(const TQString &d)
{
- QString dir(dirSyntax(d));
+ TQString dir(dirSyntax(d));
if(dExists(dir) && !hasDir(dir))
addItem(m_dirs, dir);
}
-void KXftConfig::removeDir(const QString &d)
+void KXftConfig::removeDir(const TQString &d)
{
- QString dir(dirSyntax(d));
+ TQString dir(dirSyntax(d));
removeItem(m_dirs, dir);
}
-QString KXftConfig::description(SubPixel::Type t)
+TQString KXftConfig::description(SubPixel::Type t)
{
switch(t)
{
@@ -904,7 +904,7 @@ const char * KXftConfig::toStr(SubPixel::Type t)
}
#ifdef HAVE_FONTCONFIG
-QString KXftConfig::description(Hint::Style s)
+TQString KXftConfig::description(Hint::Style s)
{
switch(s)
{
@@ -939,9 +939,9 @@ const char * KXftConfig::toStr(Hint::Style s)
}
#endif
-bool KXftConfig::hasDir(const QString &d)
+bool KXftConfig::hasDir(const TQString &d)
{
- QString dir(dirSyntax(d));
+ TQString dir(dirSyntax(d));
#ifdef HAVE_FONTCONFIG
ListItem *item;
@@ -956,7 +956,7 @@ bool KXftConfig::hasDir(const QString &d)
#endif
}
-KXftConfig::ListItem * KXftConfig::findItem(QPtrList<ListItem> &list, const QString &i)
+KXftConfig::ListItem * KXftConfig::findItem(TQPtrList<ListItem> &list, const TQString &i)
{
ListItem *item;
@@ -967,7 +967,7 @@ KXftConfig::ListItem * KXftConfig::findItem(QPtrList<ListItem> &list, const QStr
return item;
}
-void KXftConfig::clearList(QPtrList<ListItem> &list)
+void KXftConfig::clearList(TQPtrList<ListItem> &list)
{
ListItem *item;
@@ -975,9 +975,9 @@ void KXftConfig::clearList(QPtrList<ListItem> &list)
removeItem(list, item);
}
-QStringList KXftConfig::getList(QPtrList<ListItem> &list)
+TQStringList KXftConfig::getList(TQPtrList<ListItem> &list)
{
- QStringList res;
+ TQStringList res;
ListItem *item;
for(item=list.first(); item; item=list.next())
@@ -987,7 +987,7 @@ QStringList KXftConfig::getList(QPtrList<ListItem> &list)
return res;
}
-void KXftConfig::addItem(QPtrList<ListItem> &list, const QString &i)
+void KXftConfig::addItem(TQPtrList<ListItem> &list, const TQString &i)
{
ListItem *item=findItem(list, i);
@@ -1004,7 +1004,7 @@ void KXftConfig::addItem(QPtrList<ListItem> &list, const QString &i)
item->toBeRemoved=false;
}
-void KXftConfig::removeItem(QPtrList<ListItem> &list, ListItem *item)
+void KXftConfig::removeItem(TQPtrList<ListItem> &list, ListItem *item)
{
if(item)
{
@@ -1019,11 +1019,11 @@ void KXftConfig::removeItem(QPtrList<ListItem> &list, ListItem *item)
void KXftConfig::readContents()
{
#ifdef HAVE_FONTCONFIG
- QDomNode n = m_doc.documentElement().firstChild();
+ TQDomNode n = m_doc.documentElement().firstChild();
while(!n.isNull())
{
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
if(!e.isNull())
if("dir"==e.tagName())
@@ -1033,14 +1033,14 @@ void KXftConfig::readContents()
}
else if("match"==e.tagName())
{
- QString str;
+ TQString str;
switch(e.childNodes().count())
{
case 1:
if(m_required&SubPixelType && "font"==e.attribute("target"))
{
- QDomElement ene=e.firstChild().toElement();
+ TQDomElement ene=e.firstChild().toElement();
if(!ene.isNull() && "edit"==ene.tagName())
if(!(str=getEntry(ene, "const", 2, "name", "rgba", "mode", "assign")).isNull())
@@ -1069,8 +1069,8 @@ void KXftConfig::readContents()
if(m_required&ExcludeRange && "font"==e.attribute("target")) // CPD: Is target "font" or "pattern" ????
{
bool foundFalse=false;
- QDomNode en=e.firstChild();
- QString family;
+ TQDomNode en=e.firstChild();
+ TQString family;
double from=-1.0,
to=-1.0,
pixelFrom=-1.0,
@@ -1078,7 +1078,7 @@ void KXftConfig::readContents()
while(!en.isNull())
{
- QDomElement ene=en.toElement();
+ TQDomElement ene=en.toElement();
if(!ene.isNull())
if("test"==ene.tagName())
@@ -1263,8 +1263,8 @@ void KXftConfig::applyDirs()
for(item=m_dirs.first(); item; item=m_dirs.next())
if(!item->toBeRemoved && item->node.isNull())
{
- QDomElement newNode = m_doc.createElement("dir");
- QDomText text = m_doc.createTextNode(contractHome(xDirSyntax(item->str)));
+ TQDomElement newNode = m_doc.createElement("dir");
+ TQDomText text = m_doc.createTextNode(contractHome(xDirSyntax(item->str)));
newNode.appendChild(text);
@@ -1277,10 +1277,10 @@ void KXftConfig::applyDirs()
void KXftConfig::applySubPixelType()
{
- QDomElement matchNode = m_doc.createElement("match"),
+ TQDomElement matchNode = m_doc.createElement("match"),
typeNode = m_doc.createElement("const"),
editNode = m_doc.createElement("edit");
- QDomText typeText = m_doc.createTextNode(toStr(m_subPixel.type));
+ TQDomText typeText = m_doc.createTextNode(toStr(m_subPixel.type));
matchNode.setAttribute("target", "font");
editNode.setAttribute("mode", "assign");
@@ -1309,10 +1309,10 @@ void KXftConfig::applyHintStyle()
}
else
{
- QDomElement matchNode = m_doc.createElement("match"),
+ TQDomElement matchNode = m_doc.createElement("match"),
typeNode = m_doc.createElement("const"),
editNode = m_doc.createElement("edit");
- QDomText typeText = m_doc.createTextNode(toStr(m_hint.style));
+ TQDomText typeText = m_doc.createTextNode(toStr(m_hint.style));
matchNode.setAttribute("target", "font");
editNode.setAttribute("mode", "assign");
@@ -1330,10 +1330,10 @@ void KXftConfig::applyHintStyle()
void KXftConfig::applyHinting()
{
- QDomElement matchNode = m_doc.createElement("match"),
+ TQDomElement matchNode = m_doc.createElement("match"),
typeNode = m_doc.createElement("bool"),
editNode = m_doc.createElement("edit");
- QDomText typeText = m_doc.createTextNode(m_hinting.set ? "true" : "false");
+ TQDomText typeText = m_doc.createTextNode(m_hinting.set ? "true" : "false");
matchNode.setAttribute("target", "font");
editNode.setAttribute("mode", "assign");
@@ -1362,20 +1362,20 @@ void KXftConfig::applyExcludeRange(bool pixel)
}
else
{
- QString fromString,
+ TQString fromString,
toString;
fromString.setNum(range.from);
toString.setNum(range.to);
- QDomElement matchNode = m_doc.createElement("match"),
+ TQDomElement matchNode = m_doc.createElement("match"),
fromTestNode = m_doc.createElement("test"),
fromNode = m_doc.createElement("double"),
toTestNode = m_doc.createElement("test"),
toNode = m_doc.createElement("double"),
editNode = m_doc.createElement("edit"),
boolNode = m_doc.createElement("bool");
- QDomText fromText = m_doc.createTextNode(fromString),
+ TQDomText fromText = m_doc.createTextNode(fromString),
toText = m_doc.createTextNode(toString),
boolText = m_doc.createTextNode("false");
@@ -1405,17 +1405,17 @@ void KXftConfig::applyExcludeRange(bool pixel)
}
}
-void KXftConfig::removeItems(QPtrList<ListItem> &list)
+void KXftConfig::removeItems(TQPtrList<ListItem> &list)
{
ListItem *item;
- QDomElement docElem = m_doc.documentElement();
+ TQDomElement docElem = m_doc.documentElement();
for(item=list.first(); item; item=list.next())
if(item->toBeRemoved && !item->node.isNull())
docElem.removeChild(item->node);
}
#else
-void KXftConfig::outputDir(std::ofstream &f, const QString &str)
+void KXftConfig::outputDir(std::ofstream &f, const TQString &str)
{
f << "dir \"" << contractHome(xDirSyntax(str)).local8Bit() << "\"" << endl;
}
@@ -1430,7 +1430,7 @@ void KXftConfig::outputNewDirs(std::ofstream &f)
m_dirs.clear();
}
-void KXftConfig::outputSymbolFamily(std::ofstream &f, const QString &str)
+void KXftConfig::outputSymbolFamily(std::ofstream &f, const TQString &str)
{
f << "match any family == \"" << str.local8Bit() << "\" edit encoding = " << constSymEnc << ';' << endl;
}
@@ -1491,10 +1491,10 @@ void KXftConfig::setAntiAliasing( bool set )
void KXftConfig::applyAntiAliasing()
{
- QDomElement matchNode = m_doc.createElement("match"),
+ TQDomElement matchNode = m_doc.createElement("match"),
typeNode = m_doc.createElement("bool"),
editNode = m_doc.createElement("edit");
- QDomText typeText = m_doc.createTextNode(m_antiAliasing.set ? "true" : "false");
+ TQDomText typeText = m_doc.createTextNode(m_antiAliasing.set ? "true" : "false");
matchNode.setAttribute("target", "font");
editNode.setAttribute("mode", "assign");
@@ -1530,14 +1530,14 @@ bool KXftConfig::aliasingEnabled()
void KXftConfig::setAntiAliasing( bool set )
{
- QSettings().writeEntry("/qt/useXft", set);
+ TQSettings().writeEntry("/qt/useXft", set);
if (set)
- QSettings().writeEntry("/qt/enableXft", set);
+ TQSettings().writeEntry("/qt/enableXft", set);
}
bool KXftConfig::getAntiAliasing() const
{
- return QSettings().readBoolEntry("/qt/useXft");
+ return TQSettings().readBoolEntry("/qt/useXft");
}
diff --git a/kcontrol/fonts/kxftconfig.h b/kcontrol/fonts/kxftconfig.h
index 6828f1d88..cb5cd71f5 100644
--- a/kcontrol/fonts/kxftconfig.h
+++ b/kcontrol/fonts/kxftconfig.h
@@ -24,15 +24,15 @@
#include "config.h"
#endif
-#include <qstringlist.h>
-#include <qstring.h>
-#include <qptrlist.h>
+#include <tqstringlist.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
#include <stdio.h>
#include <fstream>
#include <time.h>
#ifdef HAVE_FONTCONFIG
-#include <qdom.h>
+#include <tqdom.h>
#endif
class KXftConfig
@@ -61,12 +61,12 @@ class KXftConfig
struct Item
{
#ifdef HAVE_FONTCONFIG
- Item(QDomNode &n) : node(n), toBeRemoved(false) {}
+ Item(TQDomNode &n) : node(n), toBeRemoved(false) {}
Item() : toBeRemoved(false) {}
virtual void reset() { node.clear(); toBeRemoved=false; }
bool added() { return node.isNull(); }
- QDomNode node;
+ TQDomNode node;
#else
Item(char *s, char *e) : start(s), end(e), toBeRemoved(false) {}
virtual void reset() { start=end=NULL; toBeRemoved=false; }
@@ -82,13 +82,13 @@ class KXftConfig
struct ListItem : public Item
{
#ifdef HAVE_FONTCONFIG
- ListItem(const QString &st, QDomNode &n) : Item(n), str(st) {}
- ListItem(const QString &st) : str(st) {}
+ ListItem(const TQString &st, TQDomNode &n) : Item(n), str(st) {}
+ ListItem(const TQString &st) : str(st) {}
#else
- ListItem(const QString &st, char *s=NULL, char *e=NULL) : Item(s, e), str(st) {}
+ ListItem(const TQString &st, char *s=NULL, char *e=NULL) : Item(s, e), str(st) {}
#endif
- QString str;
+ TQString str;
};
struct SubPixel : public Item
@@ -103,7 +103,7 @@ class KXftConfig
};
#ifdef HAVE_FONTCONFIG
- SubPixel(Type t, QDomNode &n) : Item(n), type(t) {}
+ SubPixel(Type t, TQDomNode &n) : Item(n), type(t) {}
SubPixel(Type t=None) : type(t) {}
#else
SubPixel(Type t=None, char *s=NULL, char *e=NULL) : Item(s, e), type(t) {}
@@ -116,7 +116,7 @@ class KXftConfig
struct Exclude : public Item
{
#ifdef HAVE_FONTCONFIG
- Exclude(double f, double t, QDomNode &n) : Item(n), from(f), to(t) {}
+ Exclude(double f, double t, TQDomNode &n) : Item(n), from(f), to(t) {}
Exclude(double f=0, double t=0) : from(f), to(t) {}
#else
Exclude(double f=0, double t=0, char *s=NULL, char *e=NULL) : Item(s, e), from(f), to(t) {}
@@ -139,7 +139,7 @@ class KXftConfig
Full
};
- Hint(Style s, QDomNode &n) : Item(n), style(s) {}
+ Hint(Style s, TQDomNode &n) : Item(n), style(s) {}
Hint(Style s=NotSet) : style(s) {}
void reset() { Item::reset(); style=NotSet; }
@@ -149,7 +149,7 @@ class KXftConfig
struct Hinting : public Item
{
- Hinting(bool s, QDomNode &n) : Item(n), set(s) {}
+ Hinting(bool s, TQDomNode &n) : Item(n), set(s) {}
Hinting(bool s=true) : set(s) {}
void reset() { Item::reset(); set=true; }
@@ -159,7 +159,7 @@ class KXftConfig
struct AntiAliasing : public Item
{
- AntiAliasing(bool s, QDomNode &n) : Item(n), set(s) {}
+ AntiAliasing(bool s, TQDomNode &n) : Item(n), set(s) {}
AntiAliasing(bool s=true) : set(s) {}
void reset() { Item::reset(); set=true; }
@@ -170,8 +170,8 @@ class KXftConfig
public:
- static QString contractHome(QString path);
- static QString expandHome(QString path);
+ static TQString contractHome(TQString path);
+ static TQString expandHome(TQString path);
//
// Constructor
@@ -193,38 +193,38 @@ class KXftConfig
void setSubPixelType(SubPixel::Type type); // SubPixel::None => turn off sub-pixel hinting
bool getExcludeRange(double &from, double &to);
void setExcludeRange(double from, double to); // from:0, to:0 => turn off exclude range
- void addDir(const QString &d);
- void removeDir(const QString &d);
+ void addDir(const TQString &d);
+ void removeDir(const TQString &d);
void clearDirs() { clearList(m_dirs); }
- QStringList getDirs() { return getList(m_dirs); }
+ TQStringList getDirs() { return getList(m_dirs); }
#ifdef HAVE_FONTCONFIG
bool getHintStyle(Hint::Style &style);
void setHintStyle(Hint::Style style);
#else
- void addSymbolFamily(const QString &f) { addItem(m_symbolFamilies, f); }
- void removeSymbolFamily(const QString &f) { removeItem(m_symbolFamilies, f); }
+ void addSymbolFamily(const TQString &f) { addItem(m_symbolFamilies, f); }
+ void removeSymbolFamily(const TQString &f) { removeItem(m_symbolFamilies, f); }
void clearSymbolFamilies() { clearList(m_symbolFamilies); }
- QStringList getSymbolFamilies() { return getList(m_symbolFamilies); }
+ TQStringList getSymbolFamilies() { return getList(m_symbolFamilies); }
#endif
void setAntiAliasing(bool set);
bool getAntiAliasing() const;
bool changed() { return m_madeChanges; }
- static QString description(SubPixel::Type t);
+ static TQString description(SubPixel::Type t);
static const char * toStr(SubPixel::Type t);
#ifdef HAVE_FONTCONFIG
- static QString description(Hint::Style s);
+ static TQString description(Hint::Style s);
static const char * toStr(Hint::Style s);
#endif
- bool hasDir(const QString &d);
+ bool hasDir(const TQString &d);
private:
- ListItem * findItem(QPtrList<ListItem> &list, const QString &i);
- void clearList(QPtrList<ListItem> &list);
- static QStringList getList(QPtrList<ListItem> &list);
- void addItem(QPtrList<ListItem> &list, const QString &i);
- void removeItem(QPtrList<ListItem> &list, ListItem *item);
- void removeItem(QPtrList<ListItem> &list, const QString &i) { removeItem(list, findItem(list, i)); }
+ ListItem * findItem(TQPtrList<ListItem> &list, const TQString &i);
+ void clearList(TQPtrList<ListItem> &list);
+ static TQStringList getList(TQPtrList<ListItem> &list);
+ void addItem(TQPtrList<ListItem> &list, const TQString &i);
+ void removeItem(TQPtrList<ListItem> &list, ListItem *item);
+ void removeItem(TQPtrList<ListItem> &list, const TQString &i) { removeItem(list, findItem(list, i)); }
void readContents();
#ifdef HAVE_FONTCONFIG
void applyDirs();
@@ -237,11 +237,11 @@ class KXftConfig
void setHinting(bool set);
void applyHinting();
void applyExcludeRange(bool pixel);
- void removeItems(QPtrList<ListItem> &list);
+ void removeItems(TQPtrList<ListItem> &list);
#else
- void outputDir(std::ofstream &f, const QString &str);
+ void outputDir(std::ofstream &f, const TQString &str);
void outputNewDirs(std::ofstream &f);
- void outputSymbolFamily(std::ofstream &f, const QString &str);
+ void outputSymbolFamily(std::ofstream &f, const TQString &str);
void outputNewSymbolFamilies(std::ofstream &f);
void outputSubPixelType(std::ofstream &f, bool ifNew);
void outputExcludeRange(std::ofstream &f, bool ifNew, bool pixel);
@@ -258,13 +258,13 @@ class KXftConfig
AntiAliasing m_antiAliasing;
bool aliasingEnabled();
#else
- QPtrList<ListItem> m_symbolFamilies;
+ TQPtrList<ListItem> m_symbolFamilies;
#endif
- QPtrList<ListItem> m_dirs;
- QString m_file;
+ TQPtrList<ListItem> m_dirs;
+ TQString m_file;
int m_required;
#ifdef HAVE_FONTCONFIG
- QDomDocument m_doc;
+ TQDomDocument m_doc;
#else
int m_size;
char *m_data;
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index 05ea09cac..41ddfe8e3 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -18,11 +18,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
#include <dcopclient.h>
@@ -45,14 +45,14 @@
#include <ksimpleconfig.h>
#include <string>
#include <stdio.h>
-#include <qstring.h>
+#include <tqstring.h>
#include "iccconfig.h"
using namespace std;
/**** DLL Interface ****/
-typedef KGenericFactory<KICCConfig, QWidget> KICCCFactory;
+typedef KGenericFactory<KICCConfig, TQWidget> KICCCFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_iccconfig, KICCCFactory("kcmiccconfig") )
KSimpleConfig *config;
@@ -60,13 +60,13 @@ KSimpleConfig *systemconfig;
/**** KICCConfig ****/
-KICCConfig::KICCConfig(QWidget *parent, const char *name, const QStringList &)
+KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KICCCFactory::instance(), parent, name)
{
- QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
- config = new KSimpleConfig( QString::fromLatin1( "kiccconfigrc" ));
- systemconfig = new KSimpleConfig( QString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
+ systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
KAboutData *about =
new KAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("KDE ICC Profile Control Module"),
@@ -82,23 +82,23 @@ KICCConfig::KICCConfig(QWidget *parent, const char *name, const QStringList &)
setRootOnlyMsg(i18n("<b>The global ICC color profile is a system wide setting, and requires administrator access</b><br>To alter the system's global ICC profile, click on the \"Administrator Mode\" button below."));
setUseRootOnlyMsg(true);
- connect(base->systemEnableSupport, SIGNAL(clicked()), SLOT(changed()));
- connect(base->systemEnableSupport, SIGNAL(toggled(bool)), base->systemIccFile, SLOT(setEnabled(bool)));
- connect(base->enableSupport, SIGNAL(clicked()), SLOT(changed()));
- connect(base->enableSupport, SIGNAL(toggled(bool)), base->iccFile, SLOT(setEnabled(bool)));
- connect(base->enableSupport, SIGNAL(toggled(bool)), base->randrScreenList, SLOT(setEnabled(bool)));
- connect(base->enableSupport, SIGNAL(toggled(bool)), base->iccProfileList, SLOT(setEnabled(bool)));
- connect(base->enableSupport, SIGNAL(toggled(bool)), base->addProfileButton, SLOT(setEnabled(bool)));
- connect(base->enableSupport, SIGNAL(toggled(bool)), base->renameProfileButton, SLOT(setEnabled(bool)));
- connect(base->enableSupport, SIGNAL(toggled(bool)), base->deleteProfileButton, SLOT(setEnabled(bool)));
- connect(base->iccProfileList, SIGNAL(activated(int)), this, SLOT(selectProfile(int)));
- connect(base->randrScreenList, SIGNAL(activated(int)), this, SLOT(selectScreen(int)));
- connect(base->iccFile, SIGNAL(textChanged(const QString&)), SLOT(updateArray()));
- connect(base->systemIccFile, SIGNAL(textChanged(const QString&)), SLOT(changed()));
-
- connect(base->addProfileButton, SIGNAL(clicked()), this, SLOT(addProfile()));
- connect(base->renameProfileButton, SIGNAL(clicked()), this, SLOT(renameProfile()));
- connect(base->deleteProfileButton, SIGNAL(clicked()), this, SLOT(deleteProfile()));
+ connect(base->systemEnableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+ connect(base->systemEnableSupport, TQT_SIGNAL(toggled(bool)), base->systemIccFile, TQT_SLOT(setEnabled(bool)));
+ connect(base->enableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+ connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->iccFile, TQT_SLOT(setEnabled(bool)));
+ connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->randrScreenList, TQT_SLOT(setEnabled(bool)));
+ connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->iccProfileList, TQT_SLOT(setEnabled(bool)));
+ connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->addProfileButton, TQT_SLOT(setEnabled(bool)));
+ connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->renameProfileButton, TQT_SLOT(setEnabled(bool)));
+ connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->deleteProfileButton, TQT_SLOT(setEnabled(bool)));
+ connect(base->iccProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectProfile(int)));
+ connect(base->randrScreenList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectScreen(int)));
+ connect(base->iccFile, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateArray()));
+ connect(base->systemIccFile, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
+
+ connect(base->addProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addProfile()));
+ connect(base->renameProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(renameProfile()));
+ connect(base->deleteProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteProfile()));
load();
@@ -127,7 +127,7 @@ KICCConfig::~KICCConfig()
void KICCConfig::deleteProfile () {
int i;
- QString *iccFileArrayNew;
+ TQString *iccFileArrayNew;
// Delete the profile
config->deleteGroup(base->iccProfileList->currentText());
@@ -146,24 +146,24 @@ void KICCConfig::deleteProfile () {
void KICCConfig::renameProfile () {
int i;
- QString *iccFileArrayNew;
+ TQString *iccFileArrayNew;
// Pop up a text entry box asking for the name of the new profile
bool _ok = false;
bool _end = false;
- QString _new;
- QString _text = i18n("Please enter the new profile name below:");
- QString _error;
+ TQString _new;
+ TQString _text = i18n("Please enter the new profile name below:");
+ TQString _error;
while (!_end) {
- _new = KInputDialog::getText( i18n("ICC Profile Configuration"), _error + _text, QString::null, &_ok, this);
+ _new = KInputDialog::getText( i18n("ICC Profile Configuration"), _error + _text, TQString::null, &_ok, this);
if (!_ok ) {
_end = true;
} else {
- _error = QString();
+ _error = TQString();
if (!_new.isEmpty()) {
if (findProfileIndex(_new) != -1)
- _error = i18n("Error: A profile with that name already exists") + QString("\n");
+ _error = i18n("Error: A profile with that name already exists") + TQString("\n");
else
_end = true;
}
@@ -180,24 +180,24 @@ void KICCConfig::renameProfile () {
void KICCConfig::addProfile () {
int i;
- QString *iccFileArrayNew;
+ TQString *iccFileArrayNew;
// Pop up a text entry box asking for the name of the new profile
bool _ok = false;
bool _end = false;
- QString _new;
- QString _text = i18n("Please enter the new profile name below:");
- QString _error;
+ TQString _new;
+ TQString _text = i18n("Please enter the new profile name below:");
+ TQString _error;
while (!_end) {
- _new = KInputDialog::getText( i18n("ICC Profile Configuration"), _error + _text, QString::null, &_ok, this);
+ _new = KInputDialog::getText( i18n("ICC Profile Configuration"), _error + _text, TQString::null, &_ok, this);
if (!_ok ) {
_end = true;
} else {
- _error = QString();
+ _error = TQString();
if (!_new.isEmpty()) {
if (findProfileIndex(_new) != -1)
- _error = i18n("Error: A profile with that name already exists") + QString("\n");
+ _error = i18n("Error: A profile with that name already exists") + TQString("\n");
else
_end = true;
}
@@ -250,11 +250,11 @@ void KICCConfig::updateDisplayedInformation () {
base->iccFile->setURL(iccFileArray[((base->iccProfileList->currentItem())*(base->randrScreenList->count()))+(base->randrScreenList->currentItem())]);
}
-QString KICCConfig::extractFileName(QString displayName, QString profileName) {
+TQString KICCConfig::extractFileName(TQString displayName, TQString profileName) {
//
}
-int KICCConfig::findProfileIndex(QString profileName) {
+int KICCConfig::findProfileIndex(TQString profileName) {
int i;
for (i=0;i<numberOfProfiles;i++) {
if (base->iccProfileList->text(i) == profileName) {
@@ -264,7 +264,7 @@ int KICCConfig::findProfileIndex(QString profileName) {
return -1;
}
-int KICCConfig::findScreenIndex(QString screenName) {
+int KICCConfig::findScreenIndex(TQString screenName) {
int i;
for (i=0;i<(base->randrScreenList->count());i++) {
if (base->randrScreenList->text(i) == screenName) {
@@ -317,7 +317,7 @@ void KICCConfig::load(bool useDefaults )
// Find all profile names
numberOfProfiles = 0;
cfgProfiles = config->groupList();
- for (QStringList::Iterator i(cfgProfiles.begin()); i != cfgProfiles.end(); ++i) {
+ for (TQStringList::Iterator i(cfgProfiles.begin()); i != cfgProfiles.end(); ++i) {
base->iccProfileList->insertItem((*i), -1);
numberOfProfiles++;
}
@@ -379,7 +379,7 @@ void KICCConfig::save()
config->sync();
systemconfig->sync();
- QString errorstr;
+ TQString errorstr;
if (base->enableSupport->isChecked() == true) {
errorstr = randrsimple->applyIccConfiguration(base->iccProfileList->currentText(), KDE_CONFDIR);
}
@@ -390,7 +390,7 @@ void KICCConfig::save()
errorstr = randrsimple->clearIccConfiguration();
}
if (errorstr != "") {
- KMessageBox::error(this, QString("Unable to apply ICC configuration:\n\r%1").arg(errorstr));
+ KMessageBox::error(this, TQString("Unable to apply ICC configuration:\n\r%1").arg(errorstr));
}
emit changed(false);
@@ -401,7 +401,7 @@ void KICCConfig::defaults()
load( true );
}
-QString KICCConfig::quickHelp() const
+TQString KICCConfig::quickHelp() const
{
return i18n("<h1>ICC Profile Configuration</h1> This module allows you to configure KDE support"
" for ICC profiles. This allows you to easily color correct your monitor"
diff --git a/kcontrol/iccconfig/iccconfig.h b/kcontrol/iccconfig/iccconfig.h
index a12c9a49d..e3b91e34d 100644
--- a/kcontrol/iccconfig/iccconfig.h
+++ b/kcontrol/iccconfig/iccconfig.h
@@ -42,8 +42,8 @@ class KICCConfig : public KCModule, public DCOPObject
public:
- //KICCConfig(QWidget *parent = 0L, const char *name = 0L);
- KICCConfig(QWidget *parent, const char *name, const QStringList &);
+ //KICCConfig(TQWidget *parent = 0L, const char *name = 0L);
+ KICCConfig(TQWidget *parent, const char *name, const TQStringList &);
virtual ~KICCConfig();
ICCConfigBase *base;
@@ -54,7 +54,7 @@ public:
void defaults();
int buttons();
- QString quickHelp() const;
+ TQString quickHelp() const;
k_dcop:
@@ -66,14 +66,14 @@ private:
ScreenInfo *randr_screen_info;
int numberOfProfiles;
int numberOfScreens;
- QStringList cfgScreenInfo;
- QStringList cfgProfiles;
+ TQStringList cfgScreenInfo;
+ TQStringList cfgProfiles;
void updateDisplayedInformation ();
- QString extractFileName(QString displayName, QString profileName);
- QString *iccFileArray;
- int findProfileIndex(QString profileName);
- int findScreenIndex(QString screenName);
- QString m_defaultProfile;
+ TQString extractFileName(TQString displayName, TQString profileName);
+ TQString *iccFileArray;
+ int findProfileIndex(TQString profileName);
+ int findScreenIndex(TQString screenName);
+ TQString m_defaultProfile;
private slots:
void selectProfile (int slotNumber);
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index 4ce1e4d98..84b6efac3 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -11,12 +11,12 @@
#include <stdlib.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qslider.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqslider.h>
#include <kcolorbutton.h>
#include <kconfig.h>
@@ -32,71 +32,71 @@
/**** KIconConfig ****/
-KIconConfig::KIconConfig(QWidget *parent, const char *name)
+KIconConfig::KIconConfig(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
- QGridLayout *top = new QGridLayout(this, 4, 2,
+ TQGridLayout *top = new TQGridLayout(this, 4, 2,
KDialog::marginHint(),
KDialog::spacingHint());
top->setColStretch(0, 1);
top->setColStretch(1, 1);
// Use of Icon at (0,0) - (1, 0)
- QGroupBox *gbox = new QGroupBox(i18n("Use of Icon"), this);
+ TQGroupBox *gbox = new TQGroupBox(i18n("Use of Icon"), this);
top->addMultiCellWidget(gbox, 0, 1, 0, 0);
- QBoxLayout *g_vlay = new QVBoxLayout(gbox,
+ TQBoxLayout *g_vlay = new TQVBoxLayout(gbox,
KDialog::marginHint(),
KDialog::spacingHint());
g_vlay->addSpacing(fontMetrics().lineSpacing());
- mpUsageList = new QListBox(gbox);
- connect(mpUsageList, SIGNAL(highlighted(int)), SLOT(slotUsage(int)));
+ mpUsageList = new TQListBox(gbox);
+ connect(mpUsageList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotUsage(int)));
g_vlay->addWidget(mpUsageList);
KSeparator *sep = new KSeparator( KSeparator::HLine, this );
top->addWidget(sep, 1, 1);
// Preview at (2,0) - (2, 1)
- QGridLayout *g_lay = new QGridLayout(4, 3, KDialog::marginHint(), 0);
+ TQGridLayout *g_lay = new TQGridLayout(4, 3, KDialog::marginHint(), 0);
top->addMultiCellLayout(g_lay, 2, 2, 0, 1);
g_lay->addRowSpacing(0, fontMetrics().lineSpacing());
- QPushButton *push;
+ TQPushButton *push;
mPreviewButton1 = addPreviewIcon(0, i18n("Default"), this, g_lay);
- connect(mPreviewButton1, SIGNAL(clicked()), SLOT(slotEffectSetup0()));
+ connect(mPreviewButton1, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup0()));
mPreviewButton2 = addPreviewIcon(1, i18n("Active"), this, g_lay);
- connect(mPreviewButton2, SIGNAL(clicked()), SLOT(slotEffectSetup1()));
+ connect(mPreviewButton2, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup1()));
mPreviewButton3 = addPreviewIcon(2, i18n("Disabled"), this, g_lay);
- connect(mPreviewButton3, SIGNAL(clicked()), SLOT(slotEffectSetup2()));
+ connect(mPreviewButton3, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup2()));
- m_pTab1 = new QWidget(this, "General Tab");
+ m_pTab1 = new TQWidget(this, "General Tab");
top->addWidget(m_pTab1, 0, 1);
- QGridLayout *grid = new QGridLayout(m_pTab1, 4, 3, 10, 10);
+ TQGridLayout *grid = new TQGridLayout(m_pTab1, 4, 3, 10, 10);
grid->setColStretch(1, 1);
grid->setColStretch(2, 1);
// Size
- QLabel *lbl = new QLabel(i18n("Size:"), m_pTab1);
+ TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1);
lbl->setFixedSize(lbl->sizeHint());
grid->addWidget(lbl, 0, 0, Qt::AlignLeft);
- mpSizeBox = new QComboBox(m_pTab1);
- connect(mpSizeBox, SIGNAL(activated(int)), SLOT(slotSize(int)));
+ mpSizeBox = new TQComboBox(m_pTab1);
+ connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int)));
lbl->setBuddy(mpSizeBox);
grid->addWidget(mpSizeBox, 0, 1, Qt::AlignLeft);
- mpDPCheck = new QCheckBox(i18n("Double-sized pixels"), m_pTab1);
- connect(mpDPCheck, SIGNAL(toggled(bool)), SLOT(slotDPCheck(bool)));
+ mpDPCheck = new TQCheckBox(i18n("Double-sized pixels"), m_pTab1);
+ connect(mpDPCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDPCheck(bool)));
grid->addMultiCellWidget(mpDPCheck, 1, 1, 0, 1, Qt::AlignLeft);
- mpAnimatedCheck = new QCheckBox(i18n("Animate icons"), m_pTab1);
- connect(mpAnimatedCheck, SIGNAL(toggled(bool)), SLOT(slotAnimatedCheck(bool)));
+ mpAnimatedCheck = new TQCheckBox(i18n("Animate icons"), m_pTab1);
+ connect(mpAnimatedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnimatedCheck(bool)));
grid->addMultiCellWidget(mpAnimatedCheck, 2, 2, 0, 1, Qt::AlignLeft);
top->activate();
- mpSystrayConfig = new KSimpleConfig( QString::fromLatin1( "systemtray_panelappletrc" ));
- mpKickerConfig = new KSimpleConfig( QString::fromLatin1( "kickerrc" ));
+ mpSystrayConfig = new KSimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" ));
+ mpKickerConfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
init();
read();
@@ -110,15 +110,15 @@ KIconConfig::~KIconConfig()
delete mpEffect;
}
-QPushButton *KIconConfig::addPreviewIcon(int i, const QString &str, QWidget *parent, QGridLayout *lay)
+TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay)
{
- QLabel *lab = new QLabel(str, parent);
+ TQLabel *lab = new TQLabel(str, parent);
lay->addWidget(lab, 1, i, AlignCenter);
- mpPreview[i] = new QLabel(parent);
+ mpPreview[i] = new TQLabel(parent);
mpPreview[i]->setAlignment(AlignCenter);
mpPreview[i]->setMinimumSize(105, 105);
lay->addWidget(mpPreview[i], 2, i);
- QPushButton *push = new QPushButton(i18n("Set Effect..."), parent);
+ TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent);
lay->addWidget(push, 3, i, AlignCenter);
return push;
}
@@ -166,17 +166,17 @@ void KIconConfig::initDefaults()
mDefaultEffect[0].value = 1.0;
mDefaultEffect[1].value = 1.0;
mDefaultEffect[2].value = 1.0;
- mDefaultEffect[0].color = QColor(144,128,248);
- mDefaultEffect[1].color = QColor(169,156,255);
- mDefaultEffect[2].color = QColor(34,202,0);
- mDefaultEffect[0].color2 = QColor(0,0,0);
- mDefaultEffect[1].color2 = QColor(0,0,0);
- mDefaultEffect[2].color2 = QColor(0,0,0);
+ mDefaultEffect[0].color = TQColor(144,128,248);
+ mDefaultEffect[1].color = TQColor(169,156,255);
+ mDefaultEffect[2].color = TQColor(34,202,0);
+ mDefaultEffect[0].color2 = TQColor(0,0,0);
+ mDefaultEffect[1].color2 = TQColor(0,0,0);
+ mDefaultEffect[2].color2 = TQColor(0,0,0);
const int defDefSizes[] = { 32, 22, 22, 16, 32 };
KIcon::Group i;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for(it=mGroups.begin(), i=KIcon::FirstGroup; it!=mGroups.end(); ++it, i++)
{
mbDP[i] = false;
@@ -229,16 +229,16 @@ void KIconConfig::read()
else
{
for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++)
- mAvSizes[i] = QValueList<int>();
+ mAvSizes[i] = TQValueList<int>();
- mTheme = QString::null;
- mExample = QString::null;
+ mTheme = TQString::null;
+ mExample = TQString::null;
}
initDefaults();
int i, j, effect;
- QStringList::ConstIterator it, it2;
+ TQStringList::ConstIterator it, it2;
for (it=mGroups.begin(), i=0; it!=mGroups.end(); ++it, i++)
{
mbChanged[i] = false;
@@ -250,7 +250,7 @@ void KIconConfig::read()
for (it2=mStates.begin(), j=0; it2!=mStates.end(); ++it2, j++)
{
- QString tmp = mpConfig->readEntry(*it2 + "Effect");
+ TQString tmp = mpConfig->readEntry(*it2 + "Effect");
if (tmp == "togray")
effect = KIconEffect::ToGray;
else if (tmp == "colorize")
@@ -288,40 +288,40 @@ void KIconConfig::apply()
if (mpUsageList->currentText() == i18n("Panel Buttons")) {
mpSizeBox->clear();
- mpSizeBox->insertItem(QString().setNum(16));
- mpSizeBox->insertItem(QString().setNum(22));
- mpSizeBox->insertItem(QString().setNum(32));
- mpSizeBox->insertItem(QString().setNum(48));
- mpSizeBox->insertItem(QString().setNum(64));
- mpSizeBox->insertItem(QString().setNum(128));
+ mpSizeBox->insertItem(TQString().setNum(16));
+ mpSizeBox->insertItem(TQString().setNum(22));
+ mpSizeBox->insertItem(TQString().setNum(32));
+ mpSizeBox->insertItem(TQString().setNum(48));
+ mpSizeBox->insertItem(TQString().setNum(64));
+ mpSizeBox->insertItem(TQString().setNum(128));
for (i=0;i<(mpSizeBox->count());i++) {
- if (mpSizeBox->text(i) == QString().setNum(mQuickLaunchSize)) {
+ if (mpSizeBox->text(i) == TQString().setNum(mQuickLaunchSize)) {
mpSizeBox->setCurrentItem(i);
}
}
}
else if (mpUsageList->currentText() == i18n("System Tray Icons")) {
mpSizeBox->clear();
- mpSizeBox->insertItem(QString().setNum(16));
- mpSizeBox->insertItem(QString().setNum(22));
- mpSizeBox->insertItem(QString().setNum(32));
- mpSizeBox->insertItem(QString().setNum(48));
- mpSizeBox->insertItem(QString().setNum(64));
- mpSizeBox->insertItem(QString().setNum(128));
+ mpSizeBox->insertItem(TQString().setNum(16));
+ mpSizeBox->insertItem(TQString().setNum(22));
+ mpSizeBox->insertItem(TQString().setNum(32));
+ mpSizeBox->insertItem(TQString().setNum(48));
+ mpSizeBox->insertItem(TQString().setNum(64));
+ mpSizeBox->insertItem(TQString().setNum(128));
for (i=0;i<(mpSizeBox->count());i++) {
- if (mpSizeBox->text(i) == QString().setNum(mSysTraySize)) {
+ if (mpSizeBox->text(i) == TQString().setNum(mSysTraySize)) {
mpSizeBox->setCurrentItem(i);
}
}
}
else {
int delta = 1000, dw, index = -1, size = 0, i;
- QValueList<int>::Iterator it;
+ TQValueList<int>::Iterator it;
mpSizeBox->clear();
if (mUsage < KIcon::LastGroup) {
for (it=mAvSizes[mUsage].begin(), i=0; it!=mAvSizes[mUsage].end(); ++it, i++)
{
- mpSizeBox->insertItem(QString().setNum(*it));
+ mpSizeBox->insertItem(TQString().setNum(*it));
dw = abs(mSizes[mUsage] - *it);
if (dw < delta)
{
@@ -357,7 +357,7 @@ void KIconConfig::preview(int i)
viewedGroup = (mUsage == KIcon::LastGroup) ? KIcon::FirstGroup : mUsage;
}
- QPixmap pm;
+ TQPixmap pm;
if (mpUsageList->text(mUsage) == i18n("Panel Buttons")) {
pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mQuickLaunchSize);
}
@@ -367,7 +367,7 @@ void KIconConfig::preview(int i)
else {
pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSizes[viewedGroup]);
}
- QImage img = pm.convertToImage();
+ TQImage img = pm.convertToImage();
if (mbDP[viewedGroup])
{
int w = img.width() * 2;
@@ -410,7 +410,7 @@ void KIconConfig::load( bool useDefaults )
void KIconConfig::save()
{
int i, j;
- QStringList::ConstIterator it, it2;
+ TQStringList::ConstIterator it, it2;
for (it=mGroups.begin(), i=0; it!=mGroups.end(); ++it, i++)
{
mpConfig->setGroup(*it + "Icons");
@@ -419,7 +419,7 @@ void KIconConfig::save()
mpConfig->writeEntry("Animated", mbAnimated[i], true, true);
for (it2=mStates.begin(), j=0; it2!=mStates.end(); ++it2, j++)
{
- QString tmp;
+ TQString tmp;
switch (mEffects[i][j].type)
{
case KIconEffect::ToGray:
@@ -476,10 +476,10 @@ void KIconConfig::save()
}
// Signal kicker to reload icon configuration
- kapp->dcopClient()->send("kicker", "kicker", "configure()", QByteArray());
+ kapp->dcopClient()->send("kicker", "kicker", "configure()", TQByteArray());
// Signal system tray to reload icon configuration
- kapp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", QByteArray());
+ kapp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray());
}
void KIconConfig::defaults()
@@ -544,15 +544,15 @@ void KIconConfig::EffectSetup(int state)
return;
}
- QPixmap pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSizes[viewedGroup]);
- QImage img = pm.convertToImage();
+ TQPixmap pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSizes[viewedGroup]);
+ TQImage img = pm.convertToImage();
if (mbDP[viewedGroup])
{
int w = img.width() * 2;
img = img.smoothScale(w, w);
}
- QString caption;
+ TQString caption;
switch (state)
{
case 0 : caption = i18n("Setup Default Icon Effect"); break;
@@ -562,7 +562,7 @@ void KIconConfig::EffectSetup(int state)
KIconEffectSetupDialog dlg(mEffects[viewedGroup][state], mDefaultEffect[state], caption, img);
- if (dlg.exec() == QDialog::Accepted)
+ if (dlg.exec() == TQDialog::Accepted)
{
if (mUsage == KIcon::LastGroup) {
for (int i=0; i<KIcon::LastGroup; i++)
@@ -633,8 +633,8 @@ void KIconConfig::slotAnimatedCheck(bool check)
KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
const Effect &defaultEffect,
- const QString &caption, const QImage &image,
- QWidget *parent, char *name)
+ const TQString &caption, const TQImage &image,
+ TQWidget *parent, char *name)
: KDialogBase(parent, name, true, caption,
Default|Ok|Cancel, Ok, true),
mEffect(effect),
@@ -643,23 +643,23 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
{
mpEffect = new KIconEffect;
- QLabel *lbl;
- QGroupBox *frame;
- QGridLayout *grid;
+ TQLabel *lbl;
+ TQGroupBox *frame;
+ TQGridLayout *grid;
- QWidget *page = new QWidget(this);
+ TQWidget *page = new TQWidget(this);
setMainWidget(page);
- QGridLayout *top = new QGridLayout(page, 4, 2, 0, spacingHint());
+ TQGridLayout *top = new TQGridLayout(page, 4, 2, 0, spacingHint());
top->setColStretch(0,1);
top->addColSpacing(1,10);
top->setColStretch(2,2);
top->setRowStretch(1,1);
- lbl = new QLabel(i18n("&Effect:"), page);
+ lbl = new TQLabel(i18n("&Effect:"), page);
lbl->setFixedSize(lbl->sizeHint());
top->addWidget(lbl, 0, 0, Qt::AlignLeft);
- mpEffectBox = new QListBox(page);
+ mpEffectBox = new TQListBox(page);
mpEffectBox->insertItem(i18n("No Effect"));
mpEffectBox->insertItem(i18n("To Gray"));
mpEffectBox->insertItem(i18n("Colorize"));
@@ -667,51 +667,51 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
mpEffectBox->insertItem(i18n("Desaturate"));
mpEffectBox->insertItem(i18n("To Monochrome"));
mpEffectBox->setMinimumWidth( 100 );
- connect(mpEffectBox, SIGNAL(highlighted(int)), SLOT(slotEffectType(int)));
+ connect(mpEffectBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotEffectType(int)));
top->addMultiCellWidget(mpEffectBox, 1, 2, 0, 0, Qt::AlignLeft);
lbl->setBuddy(mpEffectBox);
- mpSTCheck = new QCheckBox(i18n("&Semi-transparent"), page);
- connect(mpSTCheck, SIGNAL(toggled(bool)), SLOT(slotSTCheck(bool)));
+ mpSTCheck = new TQCheckBox(i18n("&Semi-transparent"), page);
+ connect(mpSTCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSTCheck(bool)));
top->addWidget(mpSTCheck, 3, 0, Qt::AlignLeft);
- frame = new QGroupBox(i18n("Preview"), page);
+ frame = new TQGroupBox(i18n("Preview"), page);
top->addMultiCellWidget(frame, 0, 1, 1, 1);
- grid = new QGridLayout(frame, 2, 1, marginHint(), spacingHint());
+ grid = new TQGridLayout(frame, 2, 1, marginHint(), spacingHint());
grid->addRowSpacing(0, fontMetrics().lineSpacing());
grid->setRowStretch(1, 1);
- mpPreview = new QLabel(frame);
+ mpPreview = new TQLabel(frame);
mpPreview->setAlignment(AlignCenter);
mpPreview->setMinimumSize(105, 105);
grid->addWidget(mpPreview, 1, 0);
- mpEffectGroup = new QGroupBox(i18n("Effect Parameters"), page);
+ mpEffectGroup = new TQGroupBox(i18n("Effect Parameters"), page);
top->addMultiCellWidget(mpEffectGroup, 2, 3, 1, 1);
- grid = new QGridLayout(mpEffectGroup, 3, 2, marginHint(), spacingHint());
+ grid = new TQGridLayout(mpEffectGroup, 3, 2, marginHint(), spacingHint());
grid->addRowSpacing(0, fontMetrics().lineSpacing());
- mpEffectLabel = new QLabel(i18n("&Amount:"), mpEffectGroup);
+ mpEffectLabel = new TQLabel(i18n("&Amount:"), mpEffectGroup);
grid->addWidget(mpEffectLabel, 1, 0);
- mpEffectSlider = new QSlider(0, 100, 5, 10, QSlider::Horizontal, mpEffectGroup);
+ mpEffectSlider = new TQSlider(0, 100, 5, 10, TQSlider::Horizontal, mpEffectGroup);
mpEffectLabel->setBuddy( mpEffectSlider );
- connect(mpEffectSlider, SIGNAL(valueChanged(int)), SLOT(slotEffectValue(int)));
+ connect(mpEffectSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotEffectValue(int)));
grid->addWidget(mpEffectSlider, 1, 1);
- mpEffectColor = new QLabel(i18n("Co&lor:"), mpEffectGroup);
+ mpEffectColor = new TQLabel(i18n("Co&lor:"), mpEffectGroup);
grid->addWidget(mpEffectColor, 2, 0);
mpEColButton = new KColorButton(mpEffectGroup);
mpEffectColor->setBuddy( mpEColButton );
- connect(mpEColButton, SIGNAL(changed(const QColor &)),
- SLOT(slotEffectColor(const QColor &)));
+ connect(mpEColButton, TQT_SIGNAL(changed(const TQColor &)),
+ TQT_SLOT(slotEffectColor(const TQColor &)));
grid->addWidget(mpEColButton, 2, 1);
- mpEffectColor2 = new QLabel(i18n("&Second color:"), mpEffectGroup);
+ mpEffectColor2 = new TQLabel(i18n("&Second color:"), mpEffectGroup);
grid->addWidget(mpEffectColor2, 3, 0);
mpECol2Button = new KColorButton(mpEffectGroup);
mpEffectColor2->setBuddy( mpECol2Button );
- connect(mpECol2Button, SIGNAL(changed(const QColor &)),
- SLOT(slotEffectColor2(const QColor &)));
+ connect(mpECol2Button, TQT_SIGNAL(changed(const TQColor &)),
+ TQT_SLOT(slotEffectColor2(const TQColor &)));
grid->addWidget(mpECol2Button, 3, 1);
init();
@@ -741,13 +741,13 @@ void KIconEffectSetupDialog::slotEffectValue(int value)
preview();
}
-void KIconEffectSetupDialog::slotEffectColor(const QColor &col)
+void KIconEffectSetupDialog::slotEffectColor(const TQColor &col)
{
mEffect.color = col;
preview();
}
-void KIconEffectSetupDialog::slotEffectColor2(const QColor &col)
+void KIconEffectSetupDialog::slotEffectColor2(const TQColor &col)
{
mEffect.color2 = col;
preview();
@@ -780,8 +780,8 @@ void KIconEffectSetupDialog::slotDefault()
void KIconEffectSetupDialog::preview()
{
- QPixmap pm;
- QImage img = mExample.copy();
+ TQPixmap pm;
+ TQImage img = mExample.copy();
img = mpEffect->apply(img, mEffect.type,
mEffect.value, mEffect.color, mEffect.color2, mEffect.transparant);
pm.convertFromImage(img);
diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h
index 6fa27eee3..13f20b264 100644
--- a/kcontrol/icons/icons.h
+++ b/kcontrol/icons/icons.h
@@ -12,9 +12,9 @@
#ifndef __icons_h__
#define __icons_h__
-#include <qcolor.h>
-#include <qimage.h>
-#include <qvaluelist.h>
+#include <tqcolor.h>
+#include <tqimage.h>
+#include <tqvaluelist.h>
#include <kcmodule.h>
#include <kdialogbase.h>
@@ -43,8 +43,8 @@ struct Effect
{
int type;
float value;
- QColor color;
- QColor color2;
+ TQColor color;
+ TQColor color2;
bool transparant;
};
@@ -57,7 +57,7 @@ class KIconConfig: public KCModule
Q_OBJECT
public:
- KIconConfig(QWidget *parent, const char *name=0);
+ KIconConfig(TQWidget *parent, const char *name=0);
~KIconConfig();
virtual void load();
@@ -80,7 +80,7 @@ private slots:
private:
void preview(int i);
void EffectSetup(int state);
- QPushButton *addPreviewIcon(int i, const QString &str, QWidget *parent, QGridLayout *lay);
+ TQPushButton *addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay);
void init();
void initDefaults();
void read();
@@ -89,14 +89,14 @@ private:
bool mbDP[6], mbChanged[6], mbAnimated[6];
int mSizes[6];
- QValueList<int> mAvSizes[6];
+ TQValueList<int> mAvSizes[6];
Effect mEffects[6][3];
Effect mDefaultEffect[3];
int mUsage;
- QString mTheme, mExample;
- QStringList mGroups, mStates;
+ TQString mTheme, mExample;
+ TQStringList mGroups, mStates;
int mSysTraySize;
int mQuickLaunchSize;
@@ -107,15 +107,15 @@ private:
KSimpleConfig *mpSystrayConfig;
KSimpleConfig *mpKickerConfig;
- typedef QLabel *QLabelPtr;
+ typedef TQLabel *QLabelPtr;
QLabelPtr mpPreview[3];
- QListBox *mpUsageList;
- QComboBox *mpSizeBox;
- QCheckBox *mpDPCheck, *wordWrapCB, *underlineCB, *mpAnimatedCheck;
- QTabWidget *m_pTabWidget;
- QWidget *m_pTab1;
- QPushButton *mPreviewButton1, *mPreviewButton2, *mPreviewButton3;
+ TQListBox *mpUsageList;
+ TQComboBox *mpSizeBox;
+ TQCheckBox *mpDPCheck, *wordWrapCB, *underlineCB, *mpAnimatedCheck;
+ TQTabWidget *m_pTabWidget;
+ TQWidget *m_pTab1;
+ TQPushButton *mPreviewButton1, *mPreviewButton2, *mPreviewButton3;
};
class KIconEffectSetupDialog: public KDialogBase
@@ -124,8 +124,8 @@ class KIconEffectSetupDialog: public KDialogBase
public:
KIconEffectSetupDialog(const Effect &, const Effect &,
- const QString &, const QImage &,
- QWidget *parent=0L, char *name=0L);
+ const TQString &, const TQImage &,
+ TQWidget *parent=0L, char *name=0L);
~KIconEffectSetupDialog();
Effect effect() { return mEffect; }
@@ -135,24 +135,24 @@ protected:
protected slots:
void slotEffectValue(int value);
- void slotEffectColor(const QColor &col);
- void slotEffectColor2(const QColor &col);
+ void slotEffectColor(const TQColor &col);
+ void slotEffectColor2(const TQColor &col);
void slotEffectType(int type);
void slotSTCheck(bool b);
void slotDefault();
private:
KIconEffect *mpEffect;
- QListBox *mpEffectBox;
- QCheckBox *mpSTCheck;
- QSlider *mpEffectSlider;
+ TQListBox *mpEffectBox;
+ TQCheckBox *mpSTCheck;
+ TQSlider *mpEffectSlider;
KColorButton *mpEColButton;
KColorButton *mpECol2Button;
Effect mEffect;
Effect mDefaultEffect;
- QImage mExample;
- QGroupBox *mpEffectGroup;
- QLabel *mpPreview, *mpEffectLabel, *mpEffectColor, *mpEffectColor2;
+ TQImage mExample;
+ TQGroupBox *mpEffectGroup;
+ TQLabel *mpPreview, *mpEffectLabel, *mpEffectColor, *mpEffectColor2;
};
#endif
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index a79ad6ddf..5d7f924a9 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -21,10 +21,10 @@
#include <stdlib.h>
#include <unistd.h>
-#include <qfileinfo.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
+#include <tqfileinfo.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
#include <kdebug.h>
#include <kapplication.h>
@@ -51,21 +51,21 @@
#include "iconthemes.h"
-IconThemesConfig::IconThemesConfig(QWidget *parent, const char *name)
+IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
- QVBoxLayout *topLayout = new QVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *topLayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint());
- QFrame *m_preview=new QFrame(this);
+ TQFrame *m_preview=new TQFrame(this);
m_preview->setMinimumHeight(50);
- QHBoxLayout *lh2=new QHBoxLayout( m_preview );
- m_previewExec=new QLabel(m_preview);
+ TQHBoxLayout *lh2=new TQHBoxLayout( m_preview );
+ m_previewExec=new TQLabel(m_preview);
m_previewExec->setPixmap(DesktopIcon("exec"));
- m_previewFolder=new QLabel(m_preview);
+ m_previewFolder=new TQLabel(m_preview);
m_previewFolder->setPixmap(DesktopIcon("folder"));
- m_previewDocument=new QLabel(m_preview);
+ m_previewDocument=new TQLabel(m_preview);
m_previewDocument->setPixmap(DesktopIcon("document"));
lh2->addStretch(10);
@@ -82,21 +82,21 @@ IconThemesConfig::IconThemesConfig(QWidget *parent, const char *name)
m_iconThemes->addColumn(i18n("Description"));
m_iconThemes->setAllColumnsShowFocus( true );
m_iconThemes->setFullWidth(true);
- connect(m_iconThemes,SIGNAL(selectionChanged(QListViewItem *)),
- SLOT(themeSelected(QListViewItem *)));
+ connect(m_iconThemes,TQT_SIGNAL(selectionChanged(TQListViewItem *)),
+ TQT_SLOT(themeSelected(TQListViewItem *)));
- QPushButton *installButton=new QPushButton( i18n("Install New Theme..."),
+ TQPushButton *installButton=new TQPushButton( i18n("Install New Theme..."),
this, "InstallNewTheme");
- connect(installButton,SIGNAL(clicked()),SLOT(installNewTheme()));
- m_removeButton=new QPushButton( i18n("Remove Theme"),
+ connect(installButton,TQT_SIGNAL(clicked()),TQT_SLOT(installNewTheme()));
+ m_removeButton=new TQPushButton( i18n("Remove Theme"),
this, "RemoveTheme");
- connect(m_removeButton,SIGNAL(clicked()),SLOT(removeSelectedTheme()));
+ connect(m_removeButton,TQT_SIGNAL(clicked()),TQT_SLOT(removeSelectedTheme()));
topLayout->addWidget(
- new QLabel(i18n("Select the icon theme you want to use:"), this));
+ new TQLabel(i18n("Select the icon theme you want to use:"), this));
topLayout->addWidget(m_preview);
topLayout->addWidget(m_iconThemes);
- QHBoxLayout *lg = new QHBoxLayout(topLayout, KDialog::spacingHint());
+ TQHBoxLayout *lg = new TQHBoxLayout(topLayout, KDialog::spacingHint());
lg->addWidget(installButton);
lg->addWidget(m_removeButton);
@@ -111,9 +111,9 @@ IconThemesConfig::~IconThemesConfig()
{
}
-QListViewItem *IconThemesConfig::iconThemeItem(const QString &name)
+TQListViewItem *IconThemesConfig::iconThemeItem(const TQString &name)
{
- QListViewItem *item;
+ TQListViewItem *item;
for ( item=m_iconThemes->firstChild(); item ; item=item->nextSibling() )
if (m_themeNames[item->text(0)]==name) return item;
@@ -124,10 +124,10 @@ void IconThemesConfig::loadThemes()
{
m_iconThemes->clear();
m_themeNames.clear();
- QStringList themelist(KIconTheme::list());
- QString name;
- QString tname;
- QStringList::Iterator it;
+ TQStringList themelist(KIconTheme::list());
+ TQString name;
+ TQString tname;
+ TQStringList::Iterator it;
for (it=themelist.begin(); it != themelist.end(); ++it)
{
KIconTheme icontheme(*it);
@@ -139,9 +139,9 @@ void IconThemesConfig::loadThemes()
// Just in case we have duplicated icon theme names on separate directories
for (int i=2; m_themeNames.find(tname)!=m_themeNames.end() ; i++)
- tname=QString("%1-%2").arg(name).arg(i);
+ tname=TQString("%1-%2").arg(name).arg(i);
- m_iconThemes->insertItem(new QListViewItem(m_iconThemes,name,
+ m_iconThemes->insertItem(new TQListViewItem(m_iconThemes,name,
icontheme.description()));
m_themeNames.insert(name,*it);
@@ -151,17 +151,17 @@ void IconThemesConfig::loadThemes()
void IconThemesConfig::installNewTheme()
{
- KURL themeURL = KURLRequesterDlg::getURL(QString::null, this,
+ KURL themeURL = KURLRequesterDlg::getURL(TQString::null, this,
i18n("Drag or Type Theme URL"));
kdDebug() << themeURL.prettyURL() << endl;
if (themeURL.url().isEmpty()) return;
- QString themeTmpFile;
+ TQString themeTmpFile;
// themeTmpFile contains the name of the downloaded file
if (!KIO::NetAccess::download(themeURL, themeTmpFile, this)) {
- QString sorryText;
+ TQString sorryText;
if (themeURL.isLocalFile())
sorryText = i18n("Unable to find the icon theme archive %1.");
else
@@ -171,9 +171,9 @@ void IconThemesConfig::installNewTheme()
return;
}
- QStringList themesNames = findThemeDirs(themeTmpFile);
+ TQStringList themesNames = findThemeDirs(themeTmpFile);
if (themesNames.isEmpty()) {
- QString invalidArch(i18n("The file is not a valid icon theme archive."));
+ TQString invalidArch(i18n("The file is not a valid icon theme archive."));
KMessageBox::error(this, invalidArch);
KIO::NetAccess::removeTempFile(themeTmpFile);
@@ -182,8 +182,8 @@ void IconThemesConfig::installNewTheme()
if (!installThemes(themesNames, themeTmpFile)) {
//FIXME: make me able to know what is wrong....
- // QStringList instead of bool?
- QString somethingWrong =
+ // TQStringList instead of bool?
+ TQString somethingWrong =
i18n("A problem occurred during the installation process; "
"however, most of the themes in the archive have been installed");
KMessageBox::error(this, somethingWrong);
@@ -194,19 +194,19 @@ void IconThemesConfig::installNewTheme()
KGlobal::instance()->newIconLoader();
loadThemes();
- QListViewItem *item=iconThemeItem(KIconTheme::current());
+ TQListViewItem *item=iconThemeItem(KIconTheme::current());
m_iconThemes->setSelected(item, true);
updateRemoveButton();
}
-bool IconThemesConfig::installThemes(const QStringList &themes, const QString &archiveName)
+bool IconThemesConfig::installThemes(const TQStringList &themes, const TQString &archiveName)
{
bool everythingOk = true;
- QString localThemesDir(locateLocal("icon", "./"));
+ TQString localThemesDir(locateLocal("icon", "./"));
KProgressDialog progressDiag(this, "themeinstallprogress",
i18n("Installing icon themes"),
- QString::null,
+ TQString::null,
true);
progressDiag.setAutoClose(true);
progressDiag.progressBar()->setTotalSteps(themes.count());
@@ -219,7 +219,7 @@ bool IconThemesConfig::installThemes(const QStringList &themes, const QString &a
const KArchiveDirectory* rootDir = archive.directory();
KArchiveDirectory* currentTheme;
- for (QStringList::ConstIterator it = themes.begin();
+ for (TQStringList::ConstIterator it = themes.begin();
it != themes.end();
++it) {
progressDiag.setLabel(
@@ -248,9 +248,9 @@ bool IconThemesConfig::installThemes(const QStringList &themes, const QString &a
return everythingOk;
}
-QStringList IconThemesConfig::findThemeDirs(const QString &archiveName)
+TQStringList IconThemesConfig::findThemeDirs(const TQString &archiveName)
{
- QStringList foundThemes;
+ TQStringList foundThemes;
KTar archive(archiveName);
archive.open(IO_ReadOnly);
@@ -260,8 +260,8 @@ QStringList IconThemesConfig::findThemeDirs(const QString &archiveName)
KArchiveDirectory* subDir = 0L;
// iterate all the dirs looking for an index.theme or index.desktop file
- QStringList entries = themeDir->entries();
- for (QStringList::Iterator it = entries.begin();
+ TQStringList entries = themeDir->entries();
+ for (TQStringList::Iterator it = entries.begin();
it != entries.end();
++it) {
possibleDir = const_cast<KArchiveEntry*>(themeDir->entry(*it));
@@ -279,11 +279,11 @@ QStringList IconThemesConfig::findThemeDirs(const QString &archiveName)
void IconThemesConfig::removeSelectedTheme()
{
- QListViewItem *selected = m_iconThemes->selectedItem();
+ TQListViewItem *selected = m_iconThemes->selectedItem();
if (!selected)
return;
- QString question=i18n("<qt>Are you sure you want to remove the "
+ TQString question=i18n("<qt>Are you sure you want to remove the "
"<strong>%1</strong> icon theme?<br>"
"<br>"
"This will delete the files installed by this theme.</qt>").
@@ -298,15 +298,15 @@ void IconThemesConfig::removeSelectedTheme()
// delete the index file before the async KIO::del so loadThemes() will
// ignore that dir.
- unlink(QFile::encodeName(icontheme.dir()+"/index.theme").data());
- unlink(QFile::encodeName(icontheme.dir()+"/index.desktop").data());
+ unlink(TQFile::encodeName(icontheme.dir()+"/index.theme").data());
+ unlink(TQFile::encodeName(icontheme.dir()+"/index.desktop").data());
KIO::del(KURL( icontheme.dir() ));
KGlobal::instance()->newIconLoader();
loadThemes();
- QListViewItem *item=0L;
+ TQListViewItem *item=0L;
//Fallback to the default if we've deleted the current theme
if (!deletingCurrentTheme)
item=iconThemeItem(KIconTheme::current());
@@ -322,12 +322,12 @@ void IconThemesConfig::removeSelectedTheme()
void IconThemesConfig::updateRemoveButton()
{
- QListViewItem *selected = m_iconThemes->selectedItem();
+ TQListViewItem *selected = m_iconThemes->selectedItem();
bool enabled = false;
if (selected)
{
KIconTheme icontheme(m_themeNames[selected->text(0)]);
- QFileInfo fi(icontheme.dir());
+ TQFileInfo fi(icontheme.dir());
enabled = fi.isWritable();
// Don't let users remove the current theme.
if(m_themeNames[selected->text(0)] == KIconTheme::current() ||
@@ -337,12 +337,12 @@ void IconThemesConfig::updateRemoveButton()
m_removeButton->setEnabled(enabled);
}
-void IconThemesConfig::themeSelected(QListViewItem *item)
+void IconThemesConfig::themeSelected(TQListViewItem *item)
{
#ifdef HAVE_LIBART
KSVGIconEngine engine;
#endif
- QString dirName(m_themeNames[item->text(0)]);
+ TQString dirName(m_themeNames[item->text(0)]);
KIconTheme icontheme(dirName);
if (!icontheme.isValid()) kdDebug() << "notvalid\n";
@@ -363,7 +363,7 @@ void IconThemesConfig::themeSelected(QListViewItem *item)
#endif
}
else
- m_previewExec->setPixmap(QPixmap(icon.path));
+ m_previewExec->setPixmap(TQPixmap(icon.path));
icon=icontheme.iconPath("folder.png",size,KIcon::MatchBest);
if (!icon.isValid()) {
@@ -379,7 +379,7 @@ void IconThemesConfig::themeSelected(QListViewItem *item)
#endif
}
else
- m_previewFolder->setPixmap(QPixmap(icon.path));
+ m_previewFolder->setPixmap(TQPixmap(icon.path));
icon=icontheme.iconPath("txt.png",size,KIcon::MatchBest);
if (!icon.isValid()) {
@@ -395,7 +395,7 @@ void IconThemesConfig::themeSelected(QListViewItem *item)
#endif
}
else
- m_previewDocument->setPixmap(QPixmap(icon.path));
+ m_previewDocument->setPixmap(TQPixmap(icon.path));
emit changed(true);
m_bChanged = true;
@@ -415,7 +415,7 @@ void IconThemesConfig::save()
{
if (!m_bChanged)
return;
- QListViewItem *selected = m_iconThemes->selectedItem();
+ TQListViewItem *selected = m_iconThemes->selectedItem();
if (!selected)
return;
diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h
index d6d1a9e91..622cedb19 100644
--- a/kcontrol/icons/iconthemes.h
+++ b/kcontrol/icons/iconthemes.h
@@ -20,7 +20,7 @@
#define ICONTHEMES_H
#include <kcmodule.h>
-#include <qmap.h>
+#include <tqmap.h>
#include <klistview.h>
class QPushButton;
@@ -34,12 +34,12 @@ class IconThemesConfig : public KCModule
Q_OBJECT
public:
- IconThemesConfig(QWidget *parent = 0L, const char *name = 0L);
+ IconThemesConfig(TQWidget *parent = 0L, const char *name = 0L);
virtual ~IconThemesConfig();
void loadThemes();
- bool installThemes(const QStringList &themes, const QString &archiveName);
- QStringList findThemeDirs(const QString &archiveName);
+ bool installThemes(const TQStringList &themes, const TQString &archiveName);
+ TQStringList findThemeDirs(const TQString &archiveName);
void updateRemoveButton();
@@ -50,21 +50,21 @@ public:
int buttons();
protected slots:
- void themeSelected(QListViewItem *item);
+ void themeSelected(TQListViewItem *item);
void installNewTheme();
void removeSelectedTheme();
private:
- QListViewItem *iconThemeItem(const QString &name);
+ TQListViewItem *iconThemeItem(const TQString &name);
KListView *m_iconThemes;
- QPushButton *m_removeButton;
+ TQPushButton *m_removeButton;
- QLabel *m_previewExec;
- QLabel *m_previewFolder;
- QLabel *m_previewDocument;
- QListViewItem *m_defaultTheme;
- QMap <QString, QString>m_themeNames;
+ TQLabel *m_previewExec;
+ TQLabel *m_previewFolder;
+ TQLabel *m_previewDocument;
+ TQListViewItem *m_defaultTheme;
+ TQMap <TQString, TQString>m_themeNames;
bool m_bChanged;
};
diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp
index fe8c8c1b3..396a6ee4f 100644
--- a/kcontrol/icons/main.cpp
+++ b/kcontrol/icons/main.cpp
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlayout.h>
+#include <tqlayout.h>
#include <kgenericfactory.h>
#include <kaboutdata.h>
@@ -31,25 +31,25 @@
#include "main.h"
/**** DLL Interface ****/
-typedef KGenericFactory<IconModule, QWidget> IconsFactory;
+typedef KGenericFactory<IconModule, TQWidget> IconsFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_icons, IconsFactory("kcmicons") )
/**** IconModule ****/
-IconModule::IconModule(QWidget *parent, const char *name, const QStringList &)
+IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(IconsFactory::instance(), parent, name)
{
- QVBoxLayout *layout = new QVBoxLayout(this);
- tab = new QTabWidget(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
+ tab = new TQTabWidget(this);
layout->addWidget(tab);
tab1 = new IconThemesConfig(this, "themes");
tab->addTab(tab1, i18n("&Theme"));
- connect(tab1, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
+ connect(tab1, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
tab2 = new KIconConfig(this, "effects");
tab->addTab(tab2, i18n("Ad&vanced"));
- connect(tab2, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
+ connect(tab2, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
KAboutData* about = new KAboutData("kcmicons", I18N_NOOP("Icons"), "3.0",
I18N_NOOP("Icons Control Panel Module"),
@@ -88,7 +88,7 @@ void IconModule::moduleChanged(bool state)
emit changed(state);
}
-QString IconModule::quickHelp() const
+TQString IconModule::quickHelp() const
{
return i18n("<h1>Icons</h1>"
"This module allows you to choose the icons for your desktop.<p>"
diff --git a/kcontrol/icons/main.h b/kcontrol/icons/main.h
index 90892351f..f9c1efc27 100644
--- a/kcontrol/icons/main.h
+++ b/kcontrol/icons/main.h
@@ -26,7 +26,7 @@
#define __MAIN_H__
-#include <qtabwidget.h>
+#include <tqtabwidget.h>
#include <kcmodule.h>
class IconModule : public KCModule
@@ -34,18 +34,18 @@ class IconModule : public KCModule
Q_OBJECT
public:
- IconModule(QWidget *parent, const char *name, const QStringList &);
+ IconModule(TQWidget *parent, const char *name, const TQStringList &);
void load();
void save();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
protected slots:
void moduleChanged(bool state);
private:
- QTabWidget *tab;
+ TQTabWidget *tab;
KCModule *tab1;
KCModule *tab2;
diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp
index ea74ed9ac..770b2cdf3 100644
--- a/kcontrol/info/info.cpp
+++ b/kcontrol/info/info.cpp
@@ -27,9 +27,9 @@
be copied to kde/applnk/Settings/Information !!
*/
-#include <qheader.h>
-#include <qwhatsthis.h>
-#include <qlayout.h>
+#include <tqheader.h>
+#include <tqwhatsthis.h>
+#include <tqlayout.h>
#include <kglobalsettings.h>
#include <kiconloader.h>
@@ -45,16 +45,16 @@
DEFAULT_ERRORSTRING will be used...
*/
-static QString *GetInfo_ErrorString; /* should always point to:
+static TQString *GetInfo_ErrorString; /* should always point to:
KInfoListWidget::ErrorString */
static bool sorting_allowed; /* is sorting allowed by user ? */
#if defined(__linux__)
-# define DEFAULT_ERRORSTRING QString::null /* i18n("Maybe the proc-filesystem is not enabled in Linux-Kernel.") */
+# define DEFAULT_ERRORSTRING TQString::null /* i18n("Maybe the proc-filesystem is not enabled in Linux-Kernel.") */
#elif defined(__hpux)
-# define DEFAULT_ERRORSTRING QString::null
+# define DEFAULT_ERRORSTRING TQString::null
#else
#define DEFAULT_ERRORSTRING i18n("Maybe this system is not completely supported yet :-(")
#endif
@@ -71,16 +71,16 @@ static bool sorting_allowed; /* is sorting allowed by user ? */
#define HEXDIGITS (sizeof(int)*8/4) /* 4 Bytes = 32 Bits = 8 Hex-Digits */
-static const QString Value( int val, int numbers=1 )
+static const TQString Value( int val, int numbers=1 )
{
return KGlobal::locale()->formatNumber(val, 0).rightJustify(numbers);
}
-static const QString HexStr(unsigned long val, int digits )
+static const TQString HexStr(unsigned long val, int digits )
{
- QString hexstr;
+ TQString hexstr;
int i;
- hexstr = QString::fromLatin1("0x%1").arg(val, digits, 16/*=HEX*/);
+ hexstr = TQString::fromLatin1("0x%1").arg(val, digits, 16/*=HEX*/);
for (i=hexstr.length()-1; i>0; --i)
if (hexstr[i]==' ')
hexstr[i] = '0';
@@ -119,7 +119,7 @@ static struct _event_table {
{ 0L, 0 }};
-static QListViewItem* XServer_fill_screen_info( QListViewItem *lBox, QListViewItem *last,
+static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListViewItem *last,
Display *dpy, int scr, int default_scr)
{
unsigned width, height;
@@ -128,7 +128,7 @@ static QListViewItem* XServer_fill_screen_info( QListViewItem *lBox, QListViewIt
ndepths,
*depths;
Screen *s = ScreenOfDisplay(dpy,scr); /* opaque structure */
- QListViewItem *item;
+ TQListViewItem *item;
/*
* there are 2.54 centimeters to an inch; so there are 25.4 millimeters.
@@ -141,19 +141,19 @@ static QListViewItem* XServer_fill_screen_info( QListViewItem *lBox, QListViewIt
xres = ((double)(DisplayWidth(dpy,scr) *25.4)/DisplayWidthMM(dpy,scr) );
yres = ((double)(DisplayHeight(dpy,scr)*25.4)/DisplayHeightMM(dpy,scr));
- item = new QListViewItem(lBox,last, i18n("Screen # %1").arg((int)scr,-1),
- (scr==default_scr) ? i18n("(Default Screen)") : QString::null );
+ item = new TQListViewItem(lBox,last, i18n("Screen # %1").arg((int)scr,-1),
+ (scr==default_scr) ? i18n("(Default Screen)") : TQString::null );
item->setExpandable(true);
if (scr==default_scr)
item->setOpen(true);
- last = new QListViewItem(item, i18n("Dimensions"),
+ last = new TQListViewItem(item, i18n("Dimensions"),
i18n("%1 x %2 Pixel (%3 x %4 mm)")
.arg( (int)DisplayWidth(dpy,scr) )
.arg( (int)DisplayHeight(dpy,scr) )
.arg( (int)DisplayWidthMM(dpy,scr) )
.arg( (int)DisplayHeightMM (dpy,scr) ));
- last = new QListViewItem(item, last, i18n("Resolution"),
+ last = new TQListViewItem(item, last, i18n("Resolution"),
i18n("%1 x %2 dpi")
.arg( (int)(xres+0.5) )
.arg( (int)(yres+0.5) ));
@@ -162,39 +162,39 @@ static QListViewItem* XServer_fill_screen_info( QListViewItem *lBox, QListViewIt
depths = 0;
depths = XListDepths (dpy, scr, &ndepths);
if (depths) {
- QString txt;
+ TQString txt;
for (i = 0; i < ndepths; i++) {
txt = txt + Value(depths[i]);
if (i < ndepths - 1)
- txt = txt + QString::fromLatin1(", ");
+ txt = txt + TQString::fromLatin1(", ");
}
- last = new QListViewItem(item, last, i18n("Depths (%1)").arg(ndepths,-1), txt);
+ last = new TQListViewItem(item, last, i18n("Depths (%1)").arg(ndepths,-1), txt);
XFree((char *) depths);
}
- last = new QListViewItem(item, last, i18n("Root Window ID"),
+ last = new TQListViewItem(item, last, i18n("Root Window ID"),
HexStr((unsigned long)RootWindow(dpy,scr),HEXDIGITS));
- last = new QListViewItem(item, last, i18n("Depth of Root Window"),
+ last = new TQListViewItem(item, last, i18n("Depth of Root Window"),
(DisplayPlanes (dpy, scr) == 1)
? i18n("%1 plane").arg(DisplayPlanes(dpy,scr)) /*singular*/
: i18n("%1 planes").arg(DisplayPlanes(dpy,scr)));/*plural*/
- last = new QListViewItem(item, last, i18n("Number of Colormaps"),
+ last = new TQListViewItem(item, last, i18n("Number of Colormaps"),
i18n("minimum %1, maximum %2")
.arg((int)MinCmapsOfScreen(s)).arg((int)MaxCmapsOfScreen(s)));
- last = new QListViewItem(item, last, i18n("Default Colormap"),
+ last = new TQListViewItem(item, last, i18n("Default Colormap"),
Value((int)DefaultColormap(dpy,scr)));
- last = new QListViewItem(item, last, i18n("Default Number of Colormap Cells"),
+ last = new TQListViewItem(item, last, i18n("Default Number of Colormap Cells"),
Value((int)DisplayCells(dpy, scr)));
- last = new QListViewItem(item, last, i18n("Preallocated Pixels"),
+ last = new TQListViewItem(item, last, i18n("Preallocated Pixels"),
i18n("Black %1, White %2")
.arg(KGlobal::locale()->formatNumber(BlackPixel(dpy,scr), 0))
.arg(KGlobal::locale()->formatNumber(WhitePixel(dpy,scr), 0)));
- QString YES(i18n("Yes"));
- QString NO(i18n("No"));
- last = new QListViewItem(item, last, i18n("Options"),
+ TQString YES(i18n("Yes"));
+ TQString NO(i18n("No"));
+ last = new TQListViewItem(item, last, i18n("Options"),
i18n("backing-store: %1, save-unders: %2")
.arg( (DoesBackingStore(s) == NotUseful) ? NO :
((DoesBackingStore(s) == Always) ? YES : i18n("When mapped")) )
@@ -202,17 +202,17 @@ static QListViewItem* XServer_fill_screen_info( QListViewItem *lBox, QListViewIt
XQueryBestSize (dpy, CursorShape, RootWindow(dpy,scr), 65535, 65535,
&width, &height);
- last = new QListViewItem(item, last, i18n("Largest Cursor"),
+ last = new TQListViewItem(item, last, i18n("Largest Cursor"),
(width == 65535 && height == 65535)
- ? i18n("unlimited") : QString::fromLatin1("%1 x %2").arg(width).arg(height));
+ ? i18n("unlimited") : TQString::fromLatin1("%1 x %2").arg(width).arg(height));
- last = new QListViewItem(item, last, i18n("Current Input Event Mask"),
+ last = new TQListViewItem(item, last, i18n("Current Input Event Mask"),
HexStr((unsigned long)EventMaskOfScreen(s),HEXDIGITS));
item = last;
struct _event_table *etp;
for (etp=event_table; etp->name; etp++) {
if (EventMaskOfScreen(s) & etp->value)
- item = new QListViewItem(last, item,
+ item = new TQListViewItem(last, item,
i18n("Event = %1").arg(HexStr(etp->value,HEXDIGITS)),
etp->name );
}
@@ -220,19 +220,19 @@ static QListViewItem* XServer_fill_screen_info( QListViewItem *lBox, QListViewIt
return item;
}
-static const QString Order( int order )
+static const TQString Order( int order )
{
if (order==LSBFirst) return i18n("LSBFirst"); else
if (order==MSBFirst) return i18n("MSBFirst"); else
return i18n("Unknown Order %1").arg(order);
}
-static const QString BitString( unsigned long n )
+static const TQString BitString( unsigned long n )
{
return i18n("1 Bit", "%n Bits", n); // singular & plural form of "%d Bit"
}
-static const QString ByteString( unsigned long n )
+static const TQString ByteString( unsigned long n )
{
/* explanation in BR #52640 (http://bugs.kde.org/show_bug.cgi?id=52640) */
if (n == 1)
@@ -242,7 +242,7 @@ static const QString ByteString( unsigned long n )
.arg(KGlobal::locale()->formatNumber(n,0));
}
-static bool GetInfo_XServer_Generic( QListView *lBox )
+static bool GetInfo_XServer_Generic( TQListView *lBox )
{
/* Many parts of this source are taken from the X11-program "xdpyinfo" */
@@ -252,8 +252,8 @@ static bool GetInfo_XServer_Generic( QListView *lBox )
Display *dpy;
XPixmapFormatValues *pmf;
- QString str,txt;
- QListViewItem *last, *item, *next;
+ TQString str,txt;
+ TQListViewItem *last, *item, *next;
dpy = XOpenDisplay(0);
if (!dpy)
@@ -263,24 +263,24 @@ static bool GetInfo_XServer_Generic( QListView *lBox )
lBox->addColumn(i18n("Value") );
sorting_allowed = false;
- next = new QListViewItem(lBox, i18n("Server Information"));
+ next = new TQListViewItem(lBox, i18n("Server Information"));
next->setPixmap(0, SmallIcon("kcmx"));
next->setOpen(true);
next->setSelectable(false);
next->setExpandable(false);
- last = new QListViewItem(next, i18n("Name of the Display"),
+ last = new TQListViewItem(next, i18n("Name of the Display"),
DisplayString(dpy));
- last = new QListViewItem(next, last, i18n("Vendor String"), QString::fromLatin1(ServerVendor(dpy)));
- last = new QListViewItem(next, last, i18n("Vendor Release Number"),
+ last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::fromLatin1(ServerVendor(dpy)));
+ last = new TQListViewItem(next, last, i18n("Vendor Release Number"),
Value((int)VendorRelease(dpy)));
- last = new QListViewItem(next, last, i18n("Version Number"),
- QString::fromLatin1("%1.%2").arg((int)ProtocolVersion(dpy))
+ last = new TQListViewItem(next, last, i18n("Version Number"),
+ TQString::fromLatin1("%1.%2").arg((int)ProtocolVersion(dpy))
.arg((int)ProtocolRevision(dpy)));
- last = item = new QListViewItem(next, last, i18n("Available Screens"));
+ last = item = new TQListViewItem(next, last, i18n("Available Screens"));
last->setOpen(true);
last->setExpandable(true);
for (i=0; i<ScreenCount(dpy); i++) {
@@ -288,22 +288,22 @@ static bool GetInfo_XServer_Generic( QListView *lBox )
if (i==0) item->setOpen(true);
}
- last = new QListViewItem( next, last, i18n("Supported Extensions") );
+ last = new TQListViewItem( next, last, i18n("Supported Extensions") );
item = last;
int extCount;
char **extensions = XListExtensions( dpy, &extCount );
for ( i = 0; i < extCount; i++ ) {
- item = new QListViewItem( last, item, QString::fromLatin1( extensions[i] ) );
+ item = new TQListViewItem( last, item, TQString::fromLatin1( extensions[i] ) );
}
XFreeExtensionList( extensions );
pmf = XListPixmapFormats(dpy, &n);
- last = item = new QListViewItem(next, last, i18n("Supported Pixmap Formats"));
+ last = item = new TQListViewItem(next, last, i18n("Supported Pixmap Formats"));
if (pmf) {
last->setExpandable(true);
for (i=0; i<n; i++) {
- item = new QListViewItem(last, item,
+ item = new TQListViewItem(last, item,
i18n("Pixmap Format #%1").arg(i+1),
i18n("%1 BPP, Depth: %2, Scanline padding: %3")
.arg(pmf[i].bits_per_pixel)
@@ -315,21 +315,21 @@ static bool GetInfo_XServer_Generic( QListView *lBox )
req_size = XExtendedMaxRequestSize(dpy);
if (!req_size) req_size = XMaxRequestSize(dpy);
- last = new QListViewItem(next, last, i18n("Maximum Request Size"),
+ last = new TQListViewItem(next, last, i18n("Maximum Request Size"),
ByteString(req_size*4));
- last = new QListViewItem(next, last, i18n("Motion Buffer Size"),
+ last = new TQListViewItem(next, last, i18n("Motion Buffer Size"),
ByteString(XDisplayMotionBufferSize(dpy)));
- last = item = new QListViewItem(next, last, i18n("Bitmap"));
+ last = item = new TQListViewItem(next, last, i18n("Bitmap"));
last->setExpandable(true);
- item = new QListViewItem(last, item, i18n("Unit"),
+ item = new TQListViewItem(last, item, i18n("Unit"),
Value(BitmapUnit(dpy)) );
- item = new QListViewItem(last, item, i18n("Order"),
+ item = new TQListViewItem(last, item, i18n("Order"),
Order(BitmapBitOrder(dpy)));
- item = new QListViewItem(last, item, i18n("Padding"),
+ item = new TQListViewItem(last, item, i18n("Padding"),
Value(BitmapPad(dpy)));
- last = new QListViewItem(next, last, i18n("Image Byte Order"),
+ last = new TQListViewItem(next, last, i18n("Image Byte Order"),
Order(ImageByteOrder(dpy)));
XCloseDisplay (dpy);
@@ -356,7 +356,7 @@ void KInfoListWidget::load()
retrieve-function. If the function wants the widget to show
another string, then it change *GetInfo_ErrorString ! */
ErrorString = i18n("No information available about %1.").arg(title)
- + QString::fromLatin1("\n\n") + DEFAULT_ERRORSTRING;
+ + TQString::fromLatin1("\n\n") + DEFAULT_ERRORSTRING;
GetInfo_ErrorString = &ErrorString; /* save the address of ErrorString */
sorting_allowed = true; /* the functions may set that */
@@ -387,7 +387,7 @@ void KInfoListWidget::load()
}
-QString KInfoListWidget::quickHelp() const
+TQString KInfoListWidget::quickHelp() const
{
return i18n("<h1>System Information</h1>"
" All the information modules return information about a certain"
@@ -397,8 +397,8 @@ QString KInfoListWidget::quickHelp() const
}
-KInfoListWidget::KInfoListWidget(const QString &_title, QWidget *parent, const char *name,
- bool _getlistbox(QListView *lbox))
+KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const char *name,
+ bool _getlistbox(TQListView *lbox))
: KCModule(parent, name),
title(_title)
{
@@ -414,16 +414,16 @@ KInfoListWidget::KInfoListWidget(const QString &_title, QWidget *parent, const c
setButtons(KCModule::Help);
getlistbox = _getlistbox;
GetInfo_ErrorString = 0;
- QHBoxLayout *layout = new QHBoxLayout(this, 0, KDialog::spacingHint());
- widgetStack = new QWidgetStack(this);
+ TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
+ widgetStack = new TQWidgetStack(this);
layout->addWidget(widgetStack);
- lBox = new QListView(widgetStack);
+ lBox = new TQListView(widgetStack);
widgetStack->addWidget(lBox, 0);
lBox->setMinimumSize(200,120);
lBox->setFont(KGlobalSettings::generalFont()); /* default font */
lBox->setAllColumnsShowFocus(true);
- QWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) );
- NoInfoText = new QLabel(widgetStack);
+ TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) );
+ NoInfoText = new TQLabel(widgetStack);
widgetStack->addWidget(NoInfoText, 1);
NoInfoText->setAlignment(AlignCenter | WordBreak);
widgetStack->raiseWidget(NoInfoText);
@@ -433,24 +433,24 @@ KInfoListWidget::KInfoListWidget(const QString &_title, QWidget *parent, const c
/* Helper-function to read output from an external program */
-static int GetInfo_ReadfromPipe( QListView *lBox, const char *FileName, bool WithEmptyLines = true )
+static int GetInfo_ReadfromPipe( TQListView *lBox, const char *FileName, bool WithEmptyLines = true )
{
FILE *pipe;
- QListViewItem* olditem = 0L;
- QString s;
+ TQListViewItem* olditem = 0L;
+ TQString s;
if ((pipe = popen(FileName, "r")) == NULL) {
pclose(pipe);
return 0;
}
- QTextStream t(pipe, IO_ReadOnly);
+ TQTextStream t(pipe, IO_ReadOnly);
while (!t.atEnd()) {
s = t.readLine();
if (!WithEmptyLines && s.length()==0)
continue;
- olditem = new QListViewItem(lBox, olditem, s);
+ olditem = new TQListViewItem(lBox, olditem, s);
}
pclose(pipe);
diff --git a/kcontrol/info/info.h b/kcontrol/info/info.h
index c55c1b2a5..723d35df5 100644
--- a/kcontrol/info/info.h
+++ b/kcontrol/info/info.h
@@ -1,16 +1,16 @@
#ifndef _INFO_H_
#define _INFO_H_
-#include <qwidget.h>
-#include <qwidgetstack.h>
-#include <qframe.h>
-#include <qlabel.h>
-#include <qtabdialog.h>
-#include <qpushbutton.h>
-#include <qtimer.h>
-#include <qlistview.h>
-#include <qfile.h>
-#include <qevent.h>
+#include <tqwidget.h>
+#include <tqwidgetstack.h>
+#include <tqframe.h>
+#include <tqlabel.h>
+#include <tqtabdialog.h>
+#include <tqpushbutton.h>
+#include <tqtimer.h>
+#include <tqlistview.h>
+#include <tqfile.h>
+#include <tqevent.h>
#include <kcmodule.h>
#include <kaboutdata.h>
@@ -19,35 +19,35 @@
/* function call-back-prototypes... */
-bool GetInfo_CPU( QListView *lBox );
-bool GetInfo_IRQ( QListView *lBox );
-bool GetInfo_DMA( QListView *lBox );
-bool GetInfo_PCI( QListView *lBox );
-bool GetInfo_IO_Ports( QListView *lBox );
-bool GetInfo_Sound( QListView *lBox );
-bool GetInfo_Devices( QListView *lBox );
-bool GetInfo_SCSI( QListView *lBox );
-bool GetInfo_Partitions( QListView *lBox );
-bool GetInfo_XServer_and_Video( QListView *lBox );
-bool GetInfo_CD_ROM( QListView *lBox ); /* New CD-ROM Info */
-extern bool GetInfo_OpenGL( QListView *lBox );
+bool GetInfo_CPU( TQListView *lBox );
+bool GetInfo_IRQ( TQListView *lBox );
+bool GetInfo_DMA( TQListView *lBox );
+bool GetInfo_PCI( TQListView *lBox );
+bool GetInfo_IO_Ports( TQListView *lBox );
+bool GetInfo_Sound( TQListView *lBox );
+bool GetInfo_Devices( TQListView *lBox );
+bool GetInfo_SCSI( TQListView *lBox );
+bool GetInfo_Partitions( TQListView *lBox );
+bool GetInfo_XServer_and_Video( TQListView *lBox );
+bool GetInfo_CD_ROM( TQListView *lBox ); /* New CD-ROM Info */
+extern bool GetInfo_OpenGL( TQListView *lBox );
class KInfoListWidget : public KCModule
{
public:
- KInfoListWidget(const QString &_title, QWidget *parent, const char *name=0, bool _getlistbox (QListView *)=0);
+ KInfoListWidget(const TQString &_title, TQWidget *parent, const char *name=0, bool _getlistbox (TQListView *)=0);
virtual void load();
- virtual QString quickHelp() const;
+ virtual TQString quickHelp() const;
private:
- QListView *lBox;
- bool (*getlistbox) (QListView *);
- QString title;
+ TQListView *lBox;
+ bool (*getlistbox) (TQListView *);
+ TQString title;
QLabel *NoInfoText;
QString ErrorString;
- QWidgetStack *widgetStack;
+ TQWidgetStack *widgetStack;
};
#endif
diff --git a/kcontrol/info/info_aix.cpp b/kcontrol/info/info_aix.cpp
index 8aaee4f6d..9aa0d3767 100644
--- a/kcontrol/info/info_aix.cpp
+++ b/kcontrol/info/info_aix.cpp
@@ -60,14 +60,14 @@ device_description(struct CuDv *cudv)
}
bool
-list_devices(QListView *lBox, char *criteria)
+list_devices(TQListView *lBox, char *criteria)
{
struct CuDv *cudv; /* Customized Devices */
struct listinfo info;
int i;
char *cudv_desc;
- QString cudv_status;
- QListViewItem *lastitem = NULL;
+ TQString cudv_status;
+ TQListViewItem *lastitem = NULL;
lBox->addColumn(i18n("Name"));
lBox->addColumn(i18n("Status"));
@@ -98,18 +98,18 @@ list_devices(QListView *lBox, char *criteria)
{
switch(cudv[i].status)
{
- case DEFINED: cudv_status = QString("Defined"); break;
- case AVAILABLE: cudv_status = QString("Available"); break;
- case STOPPED: cudv_status = QString("Stopped"); break;
- default: cudv_status = QString("Unknown");
+ case DEFINED: cudv_status = TQString("Defined"); break;
+ case AVAILABLE: cudv_status = TQString("Available"); break;
+ case STOPPED: cudv_status = TQString("Stopped"); break;
+ default: cudv_status = TQString("Unknown");
}
cudv_desc = device_description(&cudv[i]);
- lastitem = new QListViewItem(lBox, lastitem,
- QString(cudv[i].name),
+ lastitem = new TQListViewItem(lBox, lastitem,
+ TQString(cudv[i].name),
cudv_status,
- QString(cudv[i].location),
- QString(cudv_desc ? cudv_desc : "N/A") );
+ TQString(cudv[i].location),
+ TQString(cudv_desc ? cudv_desc : "N/A") );
if (cudv_desc) free(cudv_desc);
}
@@ -271,7 +271,7 @@ struct model _4C_models[] =
*/
bool
-GetInfo_XServer_and_Video( QListView *lBox )
+GetInfo_XServer_and_Video( TQListView *lBox )
{
return GetInfo_XServer_Generic( lBox );
}
@@ -286,14 +286,14 @@ GetInfo_XServer_and_Video( QListView *lBox )
*
*/
bool
-GetInfo_CPU( QListView *lBox )
+GetInfo_CPU( TQListView *lBox )
{
struct utsname info;
struct model *table = _models; /* table of model information */
char model_ID[21] = ""; /* information for table lookup */
char cpu_ID[7] = ""; /* unique CPU ID */
int i;
- QListViewItem *lastitem = NULL;
+ TQListViewItem *lastitem = NULL;
lBox->addColumn(i18n("Information"));
lBox->addColumn(i18n("Value"));
@@ -326,57 +326,57 @@ GetInfo_CPU( QListView *lBox )
}
}
- lastitem = new QListViewItem(lBox, lastitem, QString("CPU ID"), QString(cpu_ID));
- lastitem = new QListViewItem(lBox, lastitem, QString("Node"), QString(info.nodename));
- lastitem = new QListViewItem(lBox, lastitem, QString("OS"), QString(info.sysname) +
- QString(" ") + QString(info.version) + QString(".") + QString(info.release));
+ lastitem = new TQListViewItem(lBox, lastitem, TQString("CPU ID"), TQString(cpu_ID));
+ lastitem = new TQListViewItem(lBox, lastitem, TQString("Node"), TQString(info.nodename));
+ lastitem = new TQListViewItem(lBox, lastitem, TQString("OS"), TQString(info.sysname) +
+ TQString(" ") + TQString(info.version) + TQString(".") + TQString(info.release));
for (i=0; *(table[i].model_ID); i++)
if (strcmp(model_ID, table[i].model_ID) == 0)
{
- lastitem = new QListViewItem(lBox, lastitem, QString("Machine Type"), QString(table[i].machine_type));
- lastitem = new QListViewItem(lBox, lastitem, QString("Architecture"), QString(chip_name[table[i].architecture]));
- lastitem = new QListViewItem(lBox, lastitem, QString("Speed"), QString(table[i].processor_speed) + QString(" Mhz"));
+ lastitem = new TQListViewItem(lBox, lastitem, TQString("Machine Type"), TQString(table[i].machine_type));
+ lastitem = new TQListViewItem(lBox, lastitem, TQString("Architecture"), TQString(chip_name[table[i].architecture]));
+ lastitem = new TQListViewItem(lBox, lastitem, TQString("Speed"), TQString(table[i].processor_speed) + TQString(" Mhz"));
break;
}
return(true);
}
-bool GetInfo_IRQ( QListView * )
+bool GetInfo_IRQ( TQListView * )
{
return false;
}
-bool GetInfo_DMA( QListView * )
+bool GetInfo_DMA( TQListView * )
{
return false;
}
bool
-GetInfo_PCI( QListView *lBox )
+GetInfo_PCI( TQListView *lBox )
{
return list_devices(lBox, (char *)"PdDvLn like '*/pci/*'");
}
-bool GetInfo_IO_Ports( QListView * )
+bool GetInfo_IO_Ports( TQListView * )
{
return false;
}
-bool GetInfo_Sound( QListView * )
+bool GetInfo_Sound( TQListView * )
{
return false;
}
bool
-GetInfo_Devices( QListView *lBox )
+GetInfo_Devices( TQListView *lBox )
{
return list_devices(lBox, (char *)"PdDvLn like '*'");
}
bool
-GetInfo_SCSI( QListView *lBox )
+GetInfo_SCSI( TQListView *lBox )
{
return list_devices(lBox, (char *)"PdDvLn like '*/scsi/*'");
}
@@ -432,17 +432,17 @@ static int get_fs_usage (char *path, long *l_total, long *l_avail)
// Some Ideas taken from garbazo from his source in info_fbsd.cpp
bool
-GetInfo_Partitions ( QListView *lbox )
+GetInfo_Partitions ( TQListView *lbox )
{
#define NUMCOLS 5
- QString Title[NUMCOLS];
+ TQString Title[NUMCOLS];
int n;
struct fstab *fstab_ent;
struct statvfs svfs;
long total,avail;
- QString str;
- QString MB(i18n("MB")+ " "); // International Text for MB=Mega-Byte
+ TQString str;
+ TQString MB(i18n("MB")+ " "); // International Text for MB=Mega-Byte
if (setfsent() != 1) // Try to open fstab
return false;
@@ -467,16 +467,16 @@ GetInfo_Partitions ( QListView *lbox )
svfs.f_basetype[0] = 0;
if(svfs.f_basetype[0]) {
- new QListViewItem(lbox, QString(fstab_ent->fs_spec),
- QString(fstab_ent->fs_file) + QString(" "),
- (svfs.f_basetype[0] ? QString(svfs.f_basetype) : i18n("n/a")),
+ new TQListViewItem(lbox, TQString(fstab_ent->fs_spec),
+ TQString(fstab_ent->fs_file) + TQString(" "),
+ (svfs.f_basetype[0] ? TQString(svfs.f_basetype) : i18n("n/a")),
Value((total+512)/1024,6) + MB,
Value((avail+512)/1024,6) + MB);
}
else {
- new QListViewItem(lbox, QString(fstab_ent->fs_spec),
- QString(fstab_ent->fs_file) + QString(" "),
- (svfs.f_basetype[0] ? QString(svfs.f_basetype) : i18n("n/a")));
+ new TQListViewItem(lbox, TQString(fstab_ent->fs_spec),
+ TQString(fstab_ent->fs_file) + TQString(" "),
+ (svfs.f_basetype[0] ? TQString(svfs.f_basetype) : i18n("n/a")));
}
}
diff --git a/kcontrol/info/info_fbsd.cpp b/kcontrol/info/info_fbsd.cpp
index 6e936801a..3ccd1c086 100644
--- a/kcontrol/info/info_fbsd.cpp
+++ b/kcontrol/info/info_fbsd.cpp
@@ -49,22 +49,22 @@
#include <fstab.h>
#include <string.h>
-#include <qdict.h>
-#include <qfile.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qtextstream.h>
+#include <tqdict.h>
+#include <tqfile.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqtextstream.h>
class Device {
public:
- Device (QString n=QString::null, QString d=QString::null)
+ Device (TQString n=TQString::null, TQString d=TQString::null)
{name=n; description=d;}
- QString name, description;
+ TQString name, description;
};
-void ProcessChildren(QString name);
-QString GetController(const QString &line);
-Device *GetDevice(const QString &line);
+void ProcessChildren(TQString name);
+TQString GetController(const TQString &line);
+Device *GetDevice(const TQString &line);
#ifdef HAVE_DEVINFO_H
extern "C" {
@@ -75,7 +75,7 @@ extern "C" {
}
#endif
-bool GetInfo_CPU (QListView *lBox)
+bool GetInfo_CPU (TQListView *lBox)
{
// Modified 13 July 2000 for SMP by Brad Hughes - bhughes@trolltech.com
@@ -85,7 +85,7 @@ bool GetInfo_CPU (QListView *lBox)
len = sizeof(ncpu);
sysctlbyname("hw.ncpu", &ncpu, &len, NULL, 0);
- QString cpustring;
+ TQString cpustring;
for (int i = ncpu; i > 0; i--) {
/* Stuff for sysctl */
char *buf;
@@ -105,7 +105,7 @@ bool GetInfo_CPU (QListView *lBox)
}
/* Put everything in the listbox */
- new QListViewItem(lBox, cpustring);
+ new TQListViewItem(lBox, cpustring);
/* Clean up after ourselves, this time I mean it ;-) */
delete buf;
@@ -114,7 +114,7 @@ bool GetInfo_CPU (QListView *lBox)
return true;
}
-bool GetInfo_IRQ (QListView *lbox)
+bool GetInfo_IRQ (TQListView *lbox)
{
#ifdef HAVE_DEVINFO_H
/* systat lists the interrupts assigned to devices as well as how many were
@@ -131,7 +131,7 @@ bool GetInfo_IRQ (QListView *lbox)
#endif
}
-bool GetInfo_DMA (QListView *lbox)
+bool GetInfo_DMA (TQListView *lbox)
{
#ifdef HAVE_DEVINFO_H
/* Oh neat, current now has a neat little utility called devinfo */
@@ -144,7 +144,7 @@ bool GetInfo_DMA (QListView *lbox)
#endif
}
-bool GetInfo_IO_Ports (QListView *lbox)
+bool GetInfo_IO_Ports (TQListView *lbox)
{
#ifdef HAVE_DEVINFO_H
/* Oh neat, current now has a neat little utility called devinfo */
@@ -157,21 +157,21 @@ bool GetInfo_IO_Ports (QListView *lbox)
#endif
}
-bool GetInfo_Sound (QListView *lbox)
+bool GetInfo_Sound (TQListView *lbox)
{
- QFile *sndstat = new QFile("/dev/sndstat");
- QTextStream *t;
- QString s;
- QListViewItem *olditem = 0;
+ TQFile *sndstat = new TQFile("/dev/sndstat");
+ TQTextStream *t;
+ TQString s;
+ TQListViewItem *olditem = 0;
if (!sndstat->exists() || !sndstat->open(IO_ReadOnly)) {
s = i18n("Your sound system could not be queried. /dev/sndstat does not exist or is not readable.");
- olditem = new QListViewItem(lbox, olditem, s);
+ olditem = new TQListViewItem(lbox, olditem, s);
} else {
- t = new QTextStream(sndstat);
+ t = new TQTextStream(sndstat);
while (!(s=t->readLine()).isNull()) {
- olditem = new QListViewItem(lbox, olditem, s);
+ olditem = new TQListViewItem(lbox, olditem, s);
}
delete t;
@@ -182,32 +182,32 @@ bool GetInfo_Sound (QListView *lbox)
return true;
}
-bool GetInfo_SCSI (QListView *lbox)
+bool GetInfo_SCSI (TQListView *lbox)
{
FILE *pipe;
- QFile *camcontrol = new QFile("/sbin/camcontrol");
- QTextStream *t;
- QString s;
- QListViewItem *olditem = 0;
+ TQFile *camcontrol = new TQFile("/sbin/camcontrol");
+ TQTextStream *t;
+ TQString s;
+ TQListViewItem *olditem = 0;
if (!camcontrol->exists()) {
s = i18n ("SCSI subsystem could not be queried: /sbin/camcontrol could not be found");
- olditem = new QListViewItem(lbox, olditem, s);
+ olditem = new TQListViewItem(lbox, olditem, s);
} else if ((pipe = popen("/sbin/camcontrol devlist 2>&1", "r")) == NULL) {
s = i18n ("SCSI subsystem could not be queried: /sbin/camcontrol could not be executed");
- olditem = new QListViewItem(lbox, olditem, s);
+ olditem = new TQListViewItem(lbox, olditem, s);
} else {
/* This prints out a list of all the scsi devies, perhaps eventually we could
parse it as opposed to schlepping it into a listbox */
- t = new QTextStream(pipe, IO_ReadOnly);
+ t = new TQTextStream(pipe, IO_ReadOnly);
while (true) {
s = t->readLine();
if ( s.isEmpty() )
break;
- olditem = new QListViewItem(lbox, olditem, s);
+ olditem = new TQListViewItem(lbox, olditem, s);
}
delete t;
@@ -222,25 +222,25 @@ bool GetInfo_SCSI (QListView *lbox)
return true;
}
-bool GetInfo_PCI (QListView *lbox)
+bool GetInfo_PCI (TQListView *lbox)
{
FILE *pipe;
- QFile *pcicontrol;
- QString s, cmd;
- QListViewItem *olditem = 0;
+ TQFile *pcicontrol;
+ TQString s, cmd;
+ TQListViewItem *olditem = 0;
- pcicontrol = new QFile("/usr/sbin/pciconf");
+ pcicontrol = new TQFile("/usr/sbin/pciconf");
if (!pcicontrol->exists()) {
delete pcicontrol;
- pcicontrol = new QFile("/usr/X11R6/bin/scanpci");
+ pcicontrol = new TQFile("/usr/X11R6/bin/scanpci");
if (!pcicontrol->exists()) {
delete pcicontrol;
- pcicontrol = new QFile("/usr/X11R6/bin/pcitweak");
+ pcicontrol = new TQFile("/usr/X11R6/bin/pcitweak");
if (!pcicontrol->exists()) {
- QString s;
+ TQString s;
s = i18n("Could not find any programs with which to query your system's PCI information");
- (void) new QListViewItem(lbox, 0, s);
+ (void) new TQListViewItem(lbox, 0, s);
delete pcicontrol;
return true;
} else {
@@ -256,7 +256,7 @@ bool GetInfo_PCI (QListView *lbox)
if ((pipe = popen(cmd.latin1(), "r")) == NULL) {
s = i18n ("PCI subsystem could not be queried: %1 could not be executed").arg(cmd);
- olditem = new QListViewItem(lbox, olditem, s);
+ olditem = new TQListViewItem(lbox, olditem, s);
} else {
/* This prints out a list of all the pci devies, perhaps eventually we could
@@ -268,23 +268,23 @@ bool GetInfo_PCI (QListView *lbox)
if (!lbox->childCount()) {
s = i18n("The PCI subsystem could not be queried, this may need root privileges.");
- olditem = new QListViewItem(lbox, olditem, s);
+ olditem = new TQListViewItem(lbox, olditem, s);
return true;
}
return true;
}
-bool GetInfo_Partitions (QListView *lbox)
+bool GetInfo_Partitions (TQListView *lbox)
{
struct fstab *fstab_ent;
if (setfsent() != 1) /* Try to open fstab */ {
int s_err = errno;
- QString s;
+ TQString s;
s = i18n("Could not check filesystem info: ");
s += strerror(s_err);
- (void)new QListViewItem(lbox, 0, s);
+ (void)new TQListViewItem(lbox, 0, s);
} else {
lbox->addColumn(i18n("Device"));
lbox->addColumn(i18n("Mount Point"));
@@ -292,7 +292,7 @@ bool GetInfo_Partitions (QListView *lbox)
lbox->addColumn(i18n("Mount Options"));
while ((fstab_ent=getfsent())!=NULL) {
- new QListViewItem(lbox, fstab_ent->fs_spec,
+ new TQListViewItem(lbox, fstab_ent->fs_spec,
fstab_ent->fs_file, fstab_ent->fs_vfstype,
fstab_ent->fs_mntops);
}
@@ -305,19 +305,19 @@ bool GetInfo_Partitions (QListView *lbox)
return true;
}
-bool GetInfo_XServer_and_Video (QListView *lBox)
+bool GetInfo_XServer_and_Video (TQListView *lBox)
{
return GetInfo_XServer_Generic( lBox );
}
-bool GetInfo_Devices (QListView *lbox)
+bool GetInfo_Devices (TQListView *lbox)
{
- QFile *f = new QFile("/var/run/dmesg.boot");
+ TQFile *f = new TQFile("/var/run/dmesg.boot");
if (f->open(IO_ReadOnly)) {
- QTextStream qts(f);
- QDict<QListViewItem> lv_items;
+ TQTextStream qts(f);
+ TQDict<TQListViewItem> lv_items;
Device *dev;
- QString line, controller;
+ TQString line, controller;
lbox->setRootIsDecorated(true);
lbox->addColumn("Device");
lbox->addColumn("Description");
@@ -331,12 +331,12 @@ bool GetInfo_Devices (QListView *lbox)
// Ewww assuing motherboard is the only toplevel controller is rather gross
if (controller == "motherboard") {
if (!lv_items[dev->name]) {
- lv_items.insert(dev->name, new QListViewItem(lbox, dev->name, dev->description) );
+ lv_items.insert(dev->name, new TQListViewItem(lbox, dev->name, dev->description) );
}
} else {
- QListViewItem *parent=lv_items[controller];
+ TQListViewItem *parent=lv_items[controller];
if (parent && !lv_items[dev->name]) {
- lv_items.insert(dev->name, new QListViewItem(parent, dev->name, dev->description) );
+ lv_items.insert(dev->name, new TQListViewItem(parent, dev->name, dev->description) );
}
}
}
@@ -345,32 +345,32 @@ bool GetInfo_Devices (QListView *lbox)
return false;
}
-QString GetController(const QString &line)
+TQString GetController(const TQString &line)
{
if ( ( (line.startsWith("ad")) || (line.startsWith("afd")) || (line.startsWith("acd")) ) && (line.find(":") < 6) ) {
- QString controller = line;
+ TQString controller = line;
controller.remove(0, controller.find(" at ")+4);
if (controller.find("-slave") != -1) {
controller.remove(controller.find("-slave"), controller.length());
} else if (controller.find("-master") != -1) {
controller.remove(controller.find("-master"), controller.length());
} else
- controller=QString::null;
+ controller=TQString::null;
if (!controller.isNull())
return controller;
}
if (line.find(" on ") != -1) {
- QString controller;
+ TQString controller;
controller = line;
controller.remove(0, controller.find(" on ")+4);
if (controller.find(" ") != -1)
controller.remove(controller.find(" "), controller.length());
return controller;
}
- return QString::null;
+ return TQString::null;
}
-Device *GetDevice(const QString &line)
+Device *GetDevice(const TQString &line)
{
Device *dev;
int colon = line.find(":");
@@ -387,9 +387,9 @@ Device *GetDevice(const QString &line)
int print_irq(struct devinfo_rman *rman, void *arg)
{
- QListView *lbox = (QListView *)arg;
+ TQListView *lbox = (TQListView *)arg;
if (strcmp(rman->dm_desc, "Interrupt request lines")==0) {
- (void)new QListViewItem(lbox, 0, rman->dm_desc);
+ (void)new TQListViewItem(lbox, 0, rman->dm_desc);
devinfo_foreach_rman_resource(rman, print_resource, arg);
}
return(0);
@@ -397,9 +397,9 @@ int print_irq(struct devinfo_rman *rman, void *arg)
int print_dma(struct devinfo_rman *rman, void *arg)
{
- QListView *lbox = (QListView *)arg;
+ TQListView *lbox = (TQListView *)arg;
if (strcmp(rman->dm_desc, "DMA request lines")==0) {
- (void)new QListViewItem(lbox, lbox->lastItem(), rman->dm_desc);
+ (void)new TQListViewItem(lbox, lbox->lastItem(), rman->dm_desc);
devinfo_foreach_rman_resource(rman, print_resource, arg);
}
return(0);
@@ -407,14 +407,14 @@ int print_dma(struct devinfo_rman *rman, void *arg)
int print_ioports(struct devinfo_rman *rman, void *arg)
{
- QListView *lbox = (QListView *)arg;
+ TQListView *lbox = (TQListView *)arg;
if (strcmp(rman->dm_desc, "I/O ports")==0) {
- (void)new QListViewItem(lbox, lbox->lastItem(), rman->dm_desc);
+ (void)new TQListViewItem(lbox, lbox->lastItem(), rman->dm_desc);
devinfo_foreach_rman_resource(rman, print_resource, arg);
}
else if (strcmp(rman->dm_desc, "I/O memory addresses")==0) {
- (void)new QListViewItem(lbox, lbox->lastItem(), rman->dm_desc);
+ (void)new TQListViewItem(lbox, lbox->lastItem(), rman->dm_desc);
devinfo_foreach_rman_resource(rman, print_resource, arg);
}
return(0);
@@ -426,11 +426,11 @@ int print_resource(struct devinfo_res *res, void *arg)
struct devinfo_rman *rman;
int hexmode;
- QListView *lbox;
+ TQListView *lbox;
- lbox = (QListView *)arg;
+ lbox = (TQListView *)arg;
- QString s, tmp;
+ TQString s, tmp;
rman = devinfo_handle_to_rman(res->dr_rman);
hexmode = (rman->dm_size > 100) || (rman->dm_size == 0);
@@ -450,7 +450,7 @@ int print_resource(struct devinfo_res *res, void *arg)
}
s += tmp;
- (void)new QListViewItem(lbox, lbox->lastItem(), s);
+ (void)new TQListViewItem(lbox, lbox->lastItem(), s);
return(0);
}
diff --git a/kcontrol/info/info_generic.cpp b/kcontrol/info/info_generic.cpp
index 5ef80dcca..367e1657b 100644
--- a/kcontrol/info/info_generic.cpp
+++ b/kcontrol/info/info_generic.cpp
@@ -31,58 +31,58 @@
*/
-bool GetInfo_CPU( QListView * )
+bool GetInfo_CPU( TQListView * )
{
return false;
}
-bool GetInfo_IRQ( QListView * )
+bool GetInfo_IRQ( TQListView * )
{
return false;
}
-bool GetInfo_DMA( QListView * )
+bool GetInfo_DMA( TQListView * )
{
return false;
}
-bool GetInfo_PCI( QListView * )
+bool GetInfo_PCI( TQListView * )
{
return false;
}
-bool GetInfo_IO_Ports( QListView * )
+bool GetInfo_IO_Ports( TQListView * )
{
return false;
}
-bool GetInfo_Sound( QListView * )
+bool GetInfo_Sound( TQListView * )
{
return false;
}
-bool GetInfo_Devices( QListView * )
+bool GetInfo_Devices( TQListView * )
{
return false;
}
-bool GetInfo_SCSI( QListView * )
+bool GetInfo_SCSI( TQListView * )
{
return false;
}
-bool GetInfo_Partitions( QListView * )
+bool GetInfo_Partitions( TQListView * )
{
return false;
}
-bool GetInfo_XServer_and_Video( QListView *lBox )
+bool GetInfo_XServer_and_Video( TQListView *lBox )
{
return GetInfo_XServer_Generic( lBox );
}
/* Generic GetInfo? ~Jahshan */
-bool GetInfo_CD_ROM(QListView * lBox)
+bool GetInfo_CD_ROM(TQListView * lBox)
{
return false;
}
diff --git a/kcontrol/info/info_hpux.cpp b/kcontrol/info/info_hpux.cpp
index dc0684ab5..82c7cbdad 100644
--- a/kcontrol/info/info_hpux.cpp
+++ b/kcontrol/info/info_hpux.cpp
@@ -25,9 +25,9 @@
#include <sys/vfs.h>
#include <fstab.h>
#include <stdlib.h>
-#include <qfile.h>
-#include <qfontmetrics.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqfontmetrics.h>
+#include <tqtextstream.h>
#define INFO_CPU_AVAILABLE
@@ -306,12 +306,12 @@ static const struct _type_LOOKUPTABLE PA_LOOKUPTABLE[] = {
// Value() is defined in info.cpp !!!
-static bool Find_in_LOOKUPTABLE( QListView *lBox, char *machine )
+static bool Find_in_LOOKUPTABLE( TQListView *lBox, char *machine )
{ char *Machine;
int len;
const struct _type_LOOKUPTABLE *Entry = PA_LOOKUPTABLE;
- QString str;
- QListViewItem* olditem = 0;
+ TQString str;
+ TQListViewItem* olditem = 0;
Machine = machine; // machine is like: "9000/715/D"
@@ -328,10 +328,10 @@ static bool Find_in_LOOKUPTABLE( QListView *lBox, char *machine )
while (Entry->Name[0])
{ if (strncmp(Entry->Name,Machine,len)==0)
{
- olditem = new QListViewItem(lBox, olditem, i18n("PA-RISC Processor"),
- QString(PA_NAME[Entry->parisc_name]));
- olditem = new QListViewItem(lBox, olditem, i18n("PA-RISC Revision"),
- QString("PA-RISC ") + QString(PA_REVISION[Entry->parisc_rev]));
+ olditem = new TQListViewItem(lBox, olditem, i18n("PA-RISC Processor"),
+ TQString(PA_NAME[Entry->parisc_name]));
+ olditem = new TQListViewItem(lBox, olditem, i18n("PA-RISC Revision"),
+ TQString("PA-RISC ") + TQString(PA_REVISION[Entry->parisc_rev]));
return true;
}
else
@@ -348,17 +348,17 @@ static bool Find_in_LOOKUPTABLE( QListView *lBox, char *machine )
*/
-bool GetInfo_CPU( QListView *lBox )
+bool GetInfo_CPU( TQListView *lBox )
{
FILE *pipe;
- QFile *model;
+ TQFile *model;
struct pst_dynamic psd;
struct pst_static pst;
struct pst_processor pro;
struct utsname info;
- QString str,str2;
- QListViewItem* olditem = 0;
+ TQString str,str2;
+ TQListViewItem* olditem = 0;
int maxwidth,i;
if((pstat_getstatic(&pst, sizeof(pst), (size_t)1, 0) == -1) ||
@@ -373,31 +373,31 @@ bool GetInfo_CPU( QListView *lBox )
uname(&info);
- olditem = new QListViewItem(lBox, olditem, i18n("Machine"), info.machine);
+ olditem = new TQListViewItem(lBox, olditem, i18n("Machine"), info.machine);
- model = new QFile(INFO_CPU_MODEL);
+ model = new TQFile(INFO_CPU_MODEL);
if (model->exists())
{ if ((pipe = popen(INFO_CPU_MODEL, "r")))
- { QTextStream *t = new QTextStream(pipe, IO_ReadOnly);
+ { TQTextStream *t = new TQTextStream(pipe, IO_ReadOnly);
str = t->readLine();
- olditem = new QListViewItem(lBox, olditem, i18n("Model"), str);
+ olditem = new TQListViewItem(lBox, olditem, i18n("Model"), str);
delete t;
}
delete pipe;
}
delete model;
- olditem = new QListViewItem(lBox, olditem, i18n("Machine Identification Number"),
- strlen(info.__idnumber) ? QString(info.__idnumber) : i18n("(none)") );
+ olditem = new TQListViewItem(lBox, olditem, i18n("Machine Identification Number"),
+ strlen(info.__idnumber) ? TQString(info.__idnumber) : i18n("(none)") );
if (psd.psd_proc_cnt<=0)
psd.psd_proc_cnt=1; // Minimum one CPU !
- olditem = new QListViewItem(lBox, olditem, i18n("Number of Active Processors"),
+ olditem = new TQListViewItem(lBox, olditem, i18n("Number of Active Processors"),
Value(psd.psd_proc_cnt));
pstat_getprocessor( &pro, sizeof(pro), 1, 0 );
- olditem = new QListViewItem(lBox, olditem, i18n("CPU Clock"),
+ olditem = new TQListViewItem(lBox, olditem, i18n("CPU Clock"),
Value(pro.psp_iticksperclktick/10000) + " " + i18n("MHz"));
switch(sysconf(_SC_CPU_VERSION))
@@ -420,39 +420,39 @@ bool GetInfo_CPU( QListView *lBox )
default: str2 = i18n("(unknown)"); break;
}
- olditem = new QListViewItem(lBox, olditem, i18n("CPU Architecture"), str2);
+ olditem = new TQListViewItem(lBox, olditem, i18n("CPU Architecture"), str2);
Find_in_LOOKUPTABLE( lBox, info.machine );// try to get extended Information.
for (i=PS_PA83_FPU; i<=PS_PA89_FPU; ++i) {
if ((1<<(i-1)) & pro.psp_coprocessor.psc_present) {
- str = QString( (i==PS_PA83_FPU) ? "PS_PA83_FPU":"PS_PA89_FPU" )
- + QString(" (")
- + QString(((1<<(i-1))&pro.psp_coprocessor.psc_enabled) ?
+ str = TQString( (i==PS_PA83_FPU) ? "PS_PA83_FPU":"PS_PA89_FPU" )
+ + TQString(" (")
+ + TQString(((1<<(i-1))&pro.psp_coprocessor.psc_enabled) ?
i18n("enabled") : i18n("disabled") )
- + QString(")");
+ + TQString(")");
- olditem = new QListViewItem(lBox, olditem, i18n("Numerical Coprocessor (FPU)"), str);
+ olditem = new TQListViewItem(lBox, olditem, i18n("Numerical Coprocessor (FPU)"), str);
}
}// for(coprocessor..)
str = Value(((pst.physical_memory*pst.page_size)/1024/1024))
- + QString(" ")
+ + TQString(" ")
+ i18n("MB"); // Mega-Byte
- olditem = new QListViewItem(lBox, olditem, i18n("Total Physical Memory"), str);
+ olditem = new TQListViewItem(lBox, olditem, i18n("Total Physical Memory"), str);
- str = Value(pst.page_size) + QString(" ") + i18n("Bytes");
- olditem = new QListViewItem(lBox, olditem, i18n("Size of One Page"), str);
+ str = Value(pst.page_size) + TQString(" ") + i18n("Bytes");
+ olditem = new TQListViewItem(lBox, olditem, i18n("Size of One Page"), str);
return true;
}
-bool GetInfo_ReadfromFile( QListView *lBox, const char *Name )
+bool GetInfo_ReadfromFile( TQListView *lBox, const char *Name )
{
char buf[2048];
- QFile *file = new QFile(Name);
- QListViewItem* olditem = 0;
+ TQFile *file = new TQFile(Name);
+ TQListViewItem* olditem = 0;
if(!file->open(IO_ReadOnly)) {
delete file;
@@ -461,7 +461,7 @@ bool GetInfo_ReadfromFile( QListView *lBox, const char *Name )
while (file->readLine(buf,sizeof(buf)-1) >= 0)
{ if (strlen(buf))
- olditem = new QListViewItem(lBox, olditem, QString::fromLocal8Bit(buf));
+ olditem = new TQListViewItem(lBox, olditem, TQString::fromLocal8Bit(buf));
}
file->close();
@@ -470,23 +470,23 @@ bool GetInfo_ReadfromFile( QListView *lBox, const char *Name )
}
-bool GetInfo_IRQ( QListView * )
+bool GetInfo_IRQ( TQListView * )
{
return false;
}
-bool GetInfo_DMA( QListView * )
+bool GetInfo_DMA( TQListView * )
{
return false;
}
-bool GetInfo_PCI( QListView *lBox )
+bool GetInfo_PCI( TQListView *lBox )
{
return( GetInfo_ReadfromFile(lBox,INFO_PCI) +
GetInfo_ReadfromFile(lBox,INFO_PCI_EISA) );
}
-bool GetInfo_IO_Ports( QListView *lBox )
+bool GetInfo_IO_Ports( TQListView *lBox )
{
if (GetInfo_ReadfromPipe( lBox, INFO_IOPORTS_1, false ))
return true;
@@ -495,12 +495,12 @@ bool GetInfo_IO_Ports( QListView *lBox )
}
-bool GetInfo_Devices( QListView *lBox )
+bool GetInfo_Devices( TQListView *lBox )
{
return GetInfo_ReadfromPipe( lBox, INFO_DEVICES, false );
}
-bool GetInfo_SCSI( QListView *lBox )
+bool GetInfo_SCSI( TQListView *lBox )
{
return GetInfo_Devices( lBox );
}
@@ -554,17 +554,17 @@ static int get_fs_usage (char *path, long *l_total, long *l_avail)
// Some Ideas taken from garbazo from his source in info_fbsd.cpp
-bool GetInfo_Partitions (QListView *lbox)
+bool GetInfo_Partitions (TQListView *lbox)
{
#define NUMCOLS 5
- QString Title[NUMCOLS];
+ TQString Title[NUMCOLS];
int n;
struct fstab *fstab_ent;
struct statvfs svfs;
long total,avail;
- QString str;
- QString MB(i18n("MB")+ " "); // International Text for MB=Mega-Byte
+ TQString str;
+ TQString MB(i18n("MB")+ " "); // International Text for MB=Mega-Byte
if (setfsent() != 1) // Try to open fstab
return false;
@@ -589,16 +589,16 @@ bool GetInfo_Partitions (QListView *lbox)
svfs.f_basetype[0] = 0;
if(svfs.f_basetype[0]) {
- new QListViewItem(lbox, QString(fstab_ent->fs_spec),
- QString(fstab_ent->fs_file) + QString(" "),
- (svfs.f_basetype[0] ? QString(svfs.f_basetype) : i18n("n/a")),
+ new TQListViewItem(lbox, TQString(fstab_ent->fs_spec),
+ TQString(fstab_ent->fs_file) + TQString(" "),
+ (svfs.f_basetype[0] ? TQString(svfs.f_basetype) : i18n("n/a")),
Value((total+512)/1024,6) + MB,
Value((avail+512)/1024,6) + MB);
}
else {
- new QListViewItem(lbox, QString(fstab_ent->fs_spec),
- QString(fstab_ent->fs_file) + QString(" "),
- (svfs.f_basetype[0] ? QString(svfs.f_basetype) : i18n("n/a")));
+ new TQListViewItem(lbox, TQString(fstab_ent->fs_spec),
+ TQString(fstab_ent->fs_file) + TQString(" "),
+ (svfs.f_basetype[0] ? TQString(svfs.f_basetype) : i18n("n/a")));
}
}
@@ -608,7 +608,7 @@ bool GetInfo_Partitions (QListView *lbox)
}
-bool GetInfo_XServer_and_Video( QListView *lBox )
+bool GetInfo_XServer_and_Video( TQListView *lBox )
{
lBox = lBox;
return GetInfo_XServer_Generic( lBox );
@@ -620,7 +620,7 @@ bool GetInfo_XServer_and_Video( QListView *lBox )
#ifndef HAVE_ALIB_H
-bool GetInfo_Sound( QListView *lBox )
+bool GetInfo_Sound( TQListView *lBox )
{ lBox = lBox;
*GetInfo_ErrorString = i18n("Audio-Support (Alib) was disabled during configuration and compile-time.");
return false;
@@ -640,15 +640,15 @@ static const char formatNames[6][15] = {
#endif
-bool GetInfo_Sound( QListView *lBox )
+bool GetInfo_Sound( TQListView *lBox )
{
Audio *audio;
long status;
char server[80];
int i;
- QString str,str2;
- QListViewItem* olditem = 0;
+ TQString str,str2;
+ TQListViewItem* olditem = 0;
// server = Hostname....
server[0] = 0;
@@ -661,120 +661,120 @@ bool GetInfo_Sound( QListView *lBox )
lBox->addColumn(i18n("Information") );
lBox->addColumn(i18n("Value") );
- olditem = new QListViewItem(lBox, olditem, i18n("Audio Name"), QString(audio->audio_name));
- olditem = new QListViewItem(lBox, olditem, i18n("Vendor"), QString(audio->vendor));
- olditem = new QListViewItem(lBox, olditem, i18n("Alib Version"),
- Value(audio->alib_major_version) + QString(".") +
+ olditem = new TQListViewItem(lBox, olditem, i18n("Audio Name"), TQString(audio->audio_name));
+ olditem = new TQListViewItem(lBox, olditem, i18n("Vendor"), TQString(audio->vendor));
+ olditem = new TQListViewItem(lBox, olditem, i18n("Alib Version"),
+ Value(audio->alib_major_version) + TQString(".") +
Value(audio->alib_minor_version));
- olditem = new QListViewItem(lBox, olditem, i18n("Protocol Revision"),
- Value(audio->proto_major_version) + QString(".") +
+ olditem = new TQListViewItem(lBox, olditem, i18n("Protocol Revision"),
+ Value(audio->proto_major_version) + TQString(".") +
Value(audio->proto_minor_version));
- olditem = new QListViewItem(lBox, olditem, i18n("Vendor Number"),
+ olditem = new TQListViewItem(lBox, olditem, i18n("Vendor Number"),
Value(audio->vnumber));
- olditem = new QListViewItem(lBox, olditem, i18n("Release"),
+ olditem = new TQListViewItem(lBox, olditem, i18n("Release"),
Value(audio->release));
- olditem = new QListViewItem(lBox, olditem, i18n("Byte Order"),
- QString((audio->byte_order==ALSBFirst)? i18n("ALSBFirst (LSB)"):
+ olditem = new TQListViewItem(lBox, olditem, i18n("Byte Order"),
+ TQString((audio->byte_order==ALSBFirst)? i18n("ALSBFirst (LSB)"):
((audio->byte_order==AMSBFirst)? i18n("AMSBFirst (MSB)"):
i18n("Invalid Byteorder.")) ));
- olditem = new QListViewItem(lBox, olditem, i18n("Bit Order"),
- QString((audio->sound_bit_order==ALeastSignificant)?
+ olditem = new TQListViewItem(lBox, olditem, i18n("Bit Order"),
+ TQString((audio->sound_bit_order==ALeastSignificant)?
i18n("ALeastSignificant (LSB)") :
((audio->sound_bit_order==AMostSignificant) ?
i18n("AMostSignificant (MSB)"):i18n("Invalid Bitorder.")) ));
- olditem = new QListViewItem(lBox, olditem, i18n("Data Formats"));
+ olditem = new TQListViewItem(lBox, olditem, i18n("Data Formats"));
for ( i = 0; i < audio->n_data_format; i++ ) {
if (audio->data_format_list[i] <= ADFLin8Offset)
- new QListViewItem(olditem, QString(formatNames[audio->data_format_list[i]]));
+ new TQListViewItem(olditem, TQString(formatNames[audio->data_format_list[i]]));
}
olditem->setOpen(true);
- olditem = new QListViewItem(lBox, olditem, i18n("Sampling Rates"));
+ olditem = new TQListViewItem(lBox, olditem, i18n("Sampling Rates"));
for ( i = 0; i < audio->n_sampling_rate; i++ ) {
- new QListViewItem(olditem, Value(audio->sampling_rate_list[i]));
+ new TQListViewItem(olditem, Value(audio->sampling_rate_list[i]));
}
olditem->setOpen(true);
- olditem = new QListViewItem(lBox, olditem, i18n("Input Sources"));
+ olditem = new TQListViewItem(lBox, olditem, i18n("Input Sources"));
if ( audio->input_sources & AMonoMicrophoneMask )
- new QListViewItem(olditem, i18n("Mono-Microphone"));
+ new TQListViewItem(olditem, i18n("Mono-Microphone"));
if ( audio->input_sources & AMonoAuxiliaryMask )
- new QListViewItem(olditem, i18n("Mono-Auxiliary"));
+ new TQListViewItem(olditem, i18n("Mono-Auxiliary"));
if ( audio->input_sources & ALeftMicrophoneMask )
- new QListViewItem(olditem, i18n("Left-Microphone"));
+ new TQListViewItem(olditem, i18n("Left-Microphone"));
if ( audio->input_sources & ARightMicrophoneMask )
- new QListViewItem(olditem, i18n("Right-Microphone"));
+ new TQListViewItem(olditem, i18n("Right-Microphone"));
if ( audio->input_sources & ALeftAuxiliaryMask )
- new QListViewItem(olditem, i18n("Left-Auxiliary"));
+ new TQListViewItem(olditem, i18n("Left-Auxiliary"));
if ( audio->input_sources & ARightAuxiliaryMask )
- new QListViewItem(olditem, i18n("Right-Auxiliary"));
+ new TQListViewItem(olditem, i18n("Right-Auxiliary"));
olditem->setOpen(true);
- olditem = new QListViewItem(lBox, olditem,i18n("Input Channels"));
+ olditem = new TQListViewItem(lBox, olditem,i18n("Input Channels"));
if ( audio->input_channels & AMonoInputChMask )
- new QListViewItem(olditem, i18n("Mono-Channel"));
+ new TQListViewItem(olditem, i18n("Mono-Channel"));
if ( audio->input_channels & ALeftInputChMask )
- new QListViewItem(olditem, i18n("Left-Channel"));
+ new TQListViewItem(olditem, i18n("Left-Channel"));
if ( audio->input_channels & ARightInputChMask )
- new QListViewItem(olditem, i18n("Right-Channel"));
+ new TQListViewItem(olditem, i18n("Right-Channel"));
olditem->setOpen(true);
- olditem = new QListViewItem(lBox, olditem, i18n("Output Destinations"));
+ olditem = new TQListViewItem(lBox, olditem, i18n("Output Destinations"));
if ( audio->output_destinations & AMonoIntSpeakerMask )
- new QListViewItem(olditem, i18n("Mono-InternalSpeaker"));
+ new TQListViewItem(olditem, i18n("Mono-InternalSpeaker"));
if ( audio->output_destinations & AMonoJackMask )
- new QListViewItem(olditem, i18n("Mono-Jack"));
+ new TQListViewItem(olditem, i18n("Mono-Jack"));
if ( audio->output_destinations & ALeftIntSpeakerMask )
- new QListViewItem(olditem, i18n("Left-InternalSpeaker"));
+ new TQListViewItem(olditem, i18n("Left-InternalSpeaker"));
if ( audio->output_destinations & ARightIntSpeakerMask )
- new QListViewItem(olditem, i18n("Right-InternalSpeaker"));
+ new TQListViewItem(olditem, i18n("Right-InternalSpeaker"));
if ( audio->output_destinations & ALeftJackMask )
- new QListViewItem(olditem, i18n("Left-Jack"));
+ new TQListViewItem(olditem, i18n("Left-Jack"));
if ( audio->output_destinations & ARightJackMask )
- new QListViewItem(olditem, i18n("Right-Jack"));
+ new TQListViewItem(olditem, i18n("Right-Jack"));
olditem->setOpen(true);
- olditem = new QListViewItem(lBox, olditem, i18n("Output Channels"));
+ olditem = new TQListViewItem(lBox, olditem, i18n("Output Channels"));
if ( audio->output_channels & AMonoOutputChMask )
- new QListViewItem(olditem, i18n("Mono-Channel"));
+ new TQListViewItem(olditem, i18n("Mono-Channel"));
if ( audio->output_channels & ALeftOutputChMask )
- new QListViewItem(olditem, i18n("Left-Channel"));
+ new TQListViewItem(olditem, i18n("Left-Channel"));
if ( audio->output_channels & ARightOutputChMask )
- new QListViewItem(olditem, i18n("Right-Channel"));
+ new TQListViewItem(olditem, i18n("Right-Channel"));
olditem->setOpen(true);
- olditem = new QListViewItem(lBox, olditem, i18n("Gain"));
- new QListViewItem(olditem, i18n("Input Gain Limits"),
+ olditem = new TQListViewItem(lBox, olditem, i18n("Gain"));
+ new TQListViewItem(olditem, i18n("Input Gain Limits"),
Value(audio->max_input_gain));
- new QListViewItem(olditem,i18n("Output Gain Limits"),
- Value(audio->min_output_gain) + QString(" ")
+ new TQListViewItem(olditem,i18n("Output Gain Limits"),
+ Value(audio->min_output_gain) + TQString(" ")
+ Value(audio->max_output_gain));
- new QListViewItem(olditem, i18n("Monitor Gain Limits"),
- Value(audio->min_monitor_gain) + QString(" ")
+ new TQListViewItem(olditem, i18n("Monitor Gain Limits"),
+ Value(audio->min_monitor_gain) + TQString(" ")
+ Value(audio->max_monitor_gain));
- new QListViewItem(olditem, i18n("Gain Restricted"),
+ new TQListViewItem(olditem, i18n("Gain Restricted"),
Value(audio->gm_gain_restricted));
olditem->setOpen(true);
- olditem = new QListViewItem(lBox, olditem,i18n("Lock"),
+ olditem = new TQListViewItem(lBox, olditem,i18n("Lock"),
Value(audio->lock));
- olditem = new QListViewItem(lBox, olditem, i18n("Queue Length"),
+ olditem = new TQListViewItem(lBox, olditem, i18n("Queue Length"),
Value(audio->qlen));
- olditem = new QListViewItem(lBox, olditem, i18n("Block Size"),
+ olditem = new TQListViewItem(lBox, olditem, i18n("Block Size"),
Value(audio->block_size));
- olditem = new QListViewItem(lBox, olditem, i18n("Stream Port (decimal)"),
+ olditem = new TQListViewItem(lBox, olditem, i18n("Stream Port (decimal)"),
Value(audio->stream_port));
- olditem = new QListViewItem(lBox, olditem, i18n("Ev Buffer Size"),
+ olditem = new TQListViewItem(lBox, olditem, i18n("Ev Buffer Size"),
Value(audio->ev_buf_size));
- olditem = new QListViewItem(lBox, olditem, i18n("Ext Number"),
+ olditem = new TQListViewItem(lBox, olditem, i18n("Ext Number"),
Value(audio->ext_number));
ACloseAudio( audio, &status );
diff --git a/kcontrol/info/info_linux.cpp b/kcontrol/info/info_linux.cpp
index 9d29e890e..18287c45f 100644
--- a/kcontrol/info/info_linux.cpp
+++ b/kcontrol/info/info_linux.cpp
@@ -36,7 +36,7 @@
# undef INFO_PARTITIONS_FULL_INFO /* no partitions-info */
#endif
-#include <qregexp.h>
+#include <tqregexp.h>
#include <kapplication.h>
#include <kiconloader.h>
@@ -82,13 +82,13 @@
#define MAXCOLUMNWIDTH 600
-bool GetInfo_ReadfromFile(QListView * lbox, const char *FileName,
- const QChar& splitChar,
- QListViewItem * lastitem = 0,
- QListViewItem ** newlastitem = 0)
+bool GetInfo_ReadfromFile(TQListView * lbox, const char *FileName,
+ const TQChar& splitChar,
+ TQListViewItem * lastitem = 0,
+ TQListViewItem ** newlastitem = 0)
{
bool added = false;
- QFile file(FileName);
+ TQFile file(FileName);
if (!file.exists()) {
return false;
@@ -101,11 +101,11 @@ bool GetInfo_ReadfromFile(QListView * lbox, const char *FileName,
*/
return false;
}
- QTextStream stream(&file);
- QString line;
+ TQTextStream stream(&file);
+ TQString line;
while (!stream.atEnd()) {
- QString s1, s2;
+ TQString s1, s2;
line = stream.readLine();
if (!line.isEmpty()) {
if (!splitChar.isNull()) {
@@ -116,7 +116,7 @@ bool GetInfo_ReadfromFile(QListView * lbox, const char *FileName,
else
s1 = line;
}
- lastitem = new QListViewItem(lbox, lastitem, s1, s2);
+ lastitem = new TQListViewItem(lbox, lastitem, s1, s2);
added = true;
}
@@ -130,7 +130,7 @@ bool GetInfo_ReadfromFile(QListView * lbox, const char *FileName,
-bool GetInfo_CPU(QListView * lBox)
+bool GetInfo_CPU(TQListView * lBox)
{
lBox->addColumn(i18n("Information"));
lBox->addColumn(i18n("Value"));
@@ -138,30 +138,30 @@ bool GetInfo_CPU(QListView * lBox)
}
-bool GetInfo_IRQ(QListView * lBox)
+bool GetInfo_IRQ(TQListView * lBox)
{
lBox->setFont(KGlobalSettings::fixedFont());
return GetInfo_ReadfromFile(lBox, INFO_IRQ, 0);
}
-bool GetInfo_DMA(QListView * lBox)
+bool GetInfo_DMA(TQListView * lBox)
{
- QFile file(INFO_DMA);
+ TQFile file(INFO_DMA);
lBox->addColumn(i18n("DMA-Channel"));
lBox->addColumn(i18n("Used By"));
if (file.exists() && file.open(IO_ReadOnly)) {
- QTextStream stream(&file);
- QString line;
- QListViewItem *child=0L;
+ TQTextStream stream(&file);
+ TQString line;
+ TQListViewItem *child=0L;
while (!stream.atEnd()) {
line = stream.readLine();
if (!line.isEmpty()) {
- QRegExp rx("^\\s*(\\S+)\\s*:\\s*(\\S+)");
+ TQRegExp rx("^\\s*(\\S+)\\s*:\\s*(\\S+)");
if (-1 != rx.search(line)) {
- child = new QListViewItem(lBox,child,rx.cap(1),rx.cap(2));
+ child = new TQListViewItem(lBox,child,rx.cap(1),rx.cap(2));
}
}
}
@@ -173,7 +173,7 @@ bool GetInfo_DMA(QListView * lBox)
return true;
}
-bool GetInfo_PCI(QListView * lBox)
+bool GetInfo_PCI(TQListView * lBox)
{
int num;
sorting_allowed = false; /* no sorting by user */
@@ -189,14 +189,14 @@ bool GetInfo_PCI(QListView * lBox)
return GetInfo_ReadfromFile(lBox, INFO_PCI, 0);
}
-bool GetInfo_IO_Ports(QListView * lBox)
+bool GetInfo_IO_Ports(TQListView * lBox)
{
lBox->addColumn(i18n("I/O-Range"));
lBox->addColumn(i18n("Used By"));
return GetInfo_ReadfromFile(lBox, INFO_IOPORTS, ':');
}
-bool GetInfo_Sound(QListView * lBox)
+bool GetInfo_Sound(TQListView * lBox)
{
sorting_allowed = false; /* no sorting by user */
if (GetInfo_ReadfromFile(lBox, INFO_DEV_SNDSTAT, 0))
@@ -209,10 +209,10 @@ bool GetInfo_Sound(QListView * lBox)
return GetInfo_ReadfromFile(lBox, INFO_ASOUND09, 0);
}
-bool GetInfo_Devices(QListView * lBox)
+bool GetInfo_Devices(TQListView * lBox)
{
- QFile file;
- QListViewItem *misc=0L;
+ TQFile file;
+ TQListViewItem *misc=0L;
lBox->setRootIsDecorated(true);
lBox->addColumn(i18n("Devices"));
@@ -221,28 +221,28 @@ bool GetInfo_Devices(QListView * lBox)
file.setName(INFO_DEVICES);
if (file.exists() && file.open(IO_ReadOnly)) {
- QTextStream stream(&file);
- QString line;
- QListViewItem *parent=0L, *child=0L;
+ TQTextStream stream(&file);
+ TQString line;
+ TQListViewItem *parent=0L, *child=0L;
while (!stream.atEnd()) {
line = stream.readLine();
if (!line.isEmpty()) {
if (-1 != line.find("character device",0,false)) {
- parent = new QListViewItem(lBox,parent,i18n("Character Devices"));
+ parent = new TQListViewItem(lBox,parent,i18n("Character Devices"));
parent->setPixmap(0,SmallIcon("chardevice"));
parent->setOpen(true);
} else if (-1 != line.find("block device",0,false)) {
- parent = new QListViewItem(lBox,parent,i18n("Block Devices"));
+ parent = new TQListViewItem(lBox,parent,i18n("Block Devices"));
parent->setPixmap(0,SmallIcon("blockdevice"));
parent->setOpen(true);
} else {
- QRegExp rx("^\\s*(\\S+)\\s+(\\S+)");
+ TQRegExp rx("^\\s*(\\S+)\\s+(\\S+)");
if (-1 != rx.search(line)) {
if (parent) {
- child = new QListViewItem(parent,child,rx.cap(2),rx.cap(1));
+ child = new TQListViewItem(parent,child,rx.cap(2),rx.cap(1));
} else {
- child = new QListViewItem(lBox,parent,rx.cap(2),rx.cap(1));
+ child = new TQListViewItem(lBox,parent,rx.cap(2),rx.cap(1));
}
if (rx.cap(2)=="misc") {
misc=child;
@@ -258,9 +258,9 @@ bool GetInfo_Devices(QListView * lBox)
file.setName(INFO_MISC);
if (misc && file.exists() && file.open(IO_ReadOnly)) {
- QTextStream stream(&file);
- QString line;
- QListViewItem *child=0L;
+ TQTextStream stream(&file);
+ TQString line;
+ TQListViewItem *child=0L;
misc->setText(0,i18n("Miscellaneous Devices"));
misc->setPixmap(0,SmallIcon("memory"));
@@ -269,9 +269,9 @@ bool GetInfo_Devices(QListView * lBox)
while (!stream.atEnd()) {
line = stream.readLine();
if (!line.isEmpty()) {
- QRegExp rx("^\\s*(\\S+)\\s+(\\S+)");
+ TQRegExp rx("^\\s*(\\S+)\\s+(\\S+)");
if (-1 != rx.search(line)) {
- child = new QListViewItem(misc,child,rx.cap(2),"10",rx.cap(1));
+ child = new TQListViewItem(misc,child,rx.cap(2),"10",rx.cap(1));
}
}
}
@@ -281,15 +281,15 @@ bool GetInfo_Devices(QListView * lBox)
return true;
}
-bool GetInfo_SCSI(QListView * lBox)
+bool GetInfo_SCSI(TQListView * lBox)
{
return GetInfo_ReadfromFile(lBox, INFO_SCSI, 0);
}
-static void cleanPassword(QString & str)
+static void cleanPassword(TQString & str)
{
int index = 0;
- QString passwd("password=");
+ TQString passwd("password=");
while (index >= 0)
{
@@ -305,7 +305,7 @@ static void cleanPassword(QString & str)
#ifndef INFO_PARTITIONS_FULL_INFO
-bool GetInfo_Partitions(QListView * lBox)
+bool GetInfo_Partitions(TQListView * lBox)
{
return GetInfo_ReadfromFile(lBox, INFO_PARTITIONS, 0);
}
@@ -341,13 +341,13 @@ bool GetInfo_Partitions(QListView * lBox)
/*
* get raw device bindings and information
*/
-void Get_LinuxRawDevices(QListView *lbox)
+void Get_LinuxRawDevices(TQListView *lbox)
{
int f, i, err;
int new_raw_devs = 1;
struct raw_config_request rq;
- QString devname;
- QString MB(i18n("MB")); /* "MB" = "Mega-Byte" */
+ TQString devname;
+ TQString MB(i18n("MB")); /* "MB" = "Mega-Byte" */
/* try to open the raw device control file */
f = open("/dev/rawctl", O_RDWR);
@@ -371,8 +371,8 @@ void Get_LinuxRawDevices(QListView *lbox)
/* IDE drives */
case 3: first_letter = 'a';
set_ide_name:
- devname = QString("/dev/hd%1%2")
- .arg(QChar(first_letter + minor/64))
+ devname = TQString("/dev/hd%1%2")
+ .arg(TQChar(first_letter + minor/64))
.arg(minor&63);
break;
case 22:first_letter = 'c'; goto set_ide_name;
@@ -388,8 +388,8 @@ void Get_LinuxRawDevices(QListView *lbox)
/* SCSI drives */
case 8: first_letter = 'a';
set_scsi_name:
- devname = QString("/dev/sd%1%2")
- .arg(QChar(first_letter + minor/16))
+ devname = TQString("/dev/sd%1%2")
+ .arg(TQChar(first_letter + minor/16))
.arg(minor&15);
break;
case 65:first_letter = 'q'; goto set_scsi_name;
@@ -397,7 +397,7 @@ void Get_LinuxRawDevices(QListView *lbox)
/* Compaq /dev/cciss devices */
case 104: case 105: case 106:
case 107: case 108: case 109:
- devname = QString("/dev/cciss/c%1d%2")
+ devname = TQString("/dev/cciss/c%1d%2")
.arg((int)rq.block_major-104)
.arg(minor&15);
break;
@@ -405,22 +405,22 @@ void Get_LinuxRawDevices(QListView *lbox)
/* Compaq Intelligent Drive Array (ida) */
case 72: case 73: case 74: case 75:
case 76: case 77: case 78: case 79:
- devname = QString("/dev/ida/c%1d%2")
+ devname = TQString("/dev/ida/c%1d%2")
.arg((int)rq.block_major-72)
.arg(minor&15);
break;
- default: devname = QString("%1/%2")
+ default: devname = TQString("%1/%2")
.arg((int)rq.block_major)
.arg(minor);
}
/* TODO: get device size */
- QString size = "";
+ TQString size = "";
- new QListViewItem(lbox, devname,
- QString(new_raw_devs ? "/dev/raw/raw%1" : "/dev/raw%1").arg(i),
+ new TQListViewItem(lbox, devname,
+ TQString(new_raw_devs ? "/dev/raw/raw%1" : "/dev/raw%1").arg(i),
"raw", size, " ", "");
}
close(f);
@@ -429,11 +429,11 @@ void Get_LinuxRawDevices(QListView *lbox)
#define Get_LinuxRawDevices(x) /* nothing */
#endif
-bool GetInfo_Partitions(QListView * lbox)
+bool GetInfo_Partitions(TQListView * lbox)
{
#define NUMCOLS 6
- QString Title[NUMCOLS];
- QStringList Mounted_Partitions;
+ TQString Title[NUMCOLS];
+ TQStringList Mounted_Partitions;
bool found_in_List;
int n;
@@ -454,8 +454,8 @@ bool GetInfo_Partitions(QListView * lbox)
struct statfs sfs;
LONG_TYPE total, avail;
- QString str, mountopts;
- QString MB(i18n("MB")); /* "MB" = "Mega-Byte" */
+ TQString str, mountopts;
+ TQString MB(i18n("MB")); /* "MB" = "Mega-Byte" */
#ifdef HAVE_FSTAB_H
@@ -467,11 +467,11 @@ bool GetInfo_Partitions(QListView * lbox)
#endif
/* read the list of already mounted file-systems.. */
- QFile *file = new QFile(INFO_MOUNTED_PARTITIONS);
+ TQFile *file = new TQFile(INFO_MOUNTED_PARTITIONS);
if (file->open(IO_ReadOnly)) {
char buf[1024];
while (file->readLine(buf, sizeof( buf )) > 0) {
- str = QString::fromLocal8Bit(buf);
+ str = TQString::fromLocal8Bit(buf);
if (str.length()) {
int p = str.find(' '); /* find first space. */
if (p)
@@ -484,7 +484,7 @@ bool GetInfo_Partitions(QListView * lbox)
delete file;
/* create the header-tables */
- MB = QString(" ") + MB;
+ MB = TQString(" ") + MB;
Title[0] = i18n("Device");
Title[1] = i18n("Mount Point");
Title[2] = i18n("FS Type");
@@ -518,16 +518,16 @@ bool GetInfo_Partitions(QListView * lbox)
mountopts = FS_MNTOPS;
cleanPassword(mountopts);
if (total)
- new QListViewItem(lbox, QString(FS_NAME) + " ",
- QString(FS_FILE) + " ",
- QString(FS_TYPE) + " ",
+ new TQListViewItem(lbox, TQString(FS_NAME) + " ",
+ TQString(FS_FILE) + " ",
+ TQString(FS_TYPE) + " ",
Value((int) (((total / 1024) + 512) / 1024),
6) + MB,
Value((int) (((avail / 1024) + 512) / 1024),
6) + MB, mountopts);
else
- new QListViewItem(lbox, QString(FS_NAME), QString(FS_FILE),
- QString(FS_TYPE), " ", " ", mountopts);
+ new TQListViewItem(lbox, TQString(FS_NAME), TQString(FS_FILE),
+ TQString(FS_TYPE), " ", " ", mountopts);
}
#ifdef HAVE_FSTAB_H
@@ -549,40 +549,40 @@ bool GetInfo_Partitions(QListView * lbox)
-bool GetInfo_XServer_and_Video(QListView * lBox)
+bool GetInfo_XServer_and_Video(TQListView * lBox)
{
return GetInfo_XServer_Generic(lBox);
}
/* GetInfo for CD-ROM Info by Jahshan Bhatti */
-bool GetInfo_CD_ROM(QListView * lBox)
+bool GetInfo_CD_ROM(TQListView * lBox)
{
- QFile file(INFO_CD_ROM);
+ TQFile file(INFO_CD_ROM);
lBox->addColumn(i18n("Information"));
lBox->addColumn(i18n("Value"));
if (file.exists() && file.open(IO_ReadOnly)) {
- QRegExp rx("(.+):\\s+(\\S.*)");
- QTextStream stream(&file);
- QString line;
- QListViewItem *child = NULL;
+ TQRegExp rx("(.+):\\s+(\\S.*)");
+ TQTextStream stream(&file);
+ TQString line;
+ TQListViewItem *child = NULL;
while (!stream.atEnd()) {
line = stream.readLine();
if (!line.isEmpty()) {
if (-1 != rx.search(line)) {
- QString text = rx.cap(1);
- QString value = rx.cap(2);
+ TQString text = rx.cap(1);
+ TQString value = rx.cap(2);
if (!text.contains('#')) {
if (value == "0")
value = KStdGuiItem::no().plainText();
if (value == "1")
value = KStdGuiItem::yes().plainText();
}
- child = new QListViewItem(lBox,child,text,value);
+ child = new TQListViewItem(lBox,child,text,value);
}
} else {
- child = new QListViewItem(lBox,child,QString::null,QString::null);
+ child = new TQListViewItem(lBox,child,TQString::null,TQString::null);
}
}
file.close();
diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp
index 228e32fb0..02fd98b1d 100644
--- a/kcontrol/info/info_netbsd.cpp
+++ b/kcontrol/info/info_netbsd.cpp
@@ -37,10 +37,10 @@
#include <stdlib.h> /* for malloc(3) */
#include <fstab.h>
-#include <qfile.h>
-#include <qfontmetrics.h>
-#include <qstrlist.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqfontmetrics.h>
+#include <tqstrlist.h>
+#include <tqtextstream.h>
#include <kdebug.h>
#include <kio/global.h> /* for KIO::convertSize() */
@@ -52,7 +52,7 @@ typedef struct
const char *title;
} hw_info_mib_list_t;
-bool GetInfo_CPU(QListView *lBox)
+bool GetInfo_CPU(TQListView *lBox)
{
static hw_info_mib_list_t hw_info_mib_list[]= {
{ 1, HW_MODEL, "Model" },
@@ -67,7 +67,7 @@ bool GetInfo_CPU(QListView *lBox)
int mib[2], num;
char *buf;
size_t len;
- QString value;
+ TQString value;
lBox->addColumn(i18n("Information"));
lBox->addColumn(i18n("Value"));
@@ -80,19 +80,19 @@ bool GetInfo_CPU(QListView *lBox)
sysctl(mib,2,NULL,&len,NULL,0);
if ( (buf = (char*)malloc(len)) ) {
sysctl(mib,2,buf,&len,NULL,0);
- value = QString::fromLocal8Bit(buf);
+ value = TQString::fromLocal8Bit(buf);
free(buf);
}
else {
- value = QString("Unknown");
+ value = TQString("Unknown");
}
}
else {
len = sizeof(num);
sysctl(mib,2,&num,&len,NULL,0);
- value = QString::number(num);
+ value = TQString::number(num);
}
- new QListViewItem(lBox, hw_info_mib->title, value);
+ new TQListViewItem(lBox, hw_info_mib->title, value);
}
return true;
@@ -100,29 +100,29 @@ bool GetInfo_CPU(QListView *lBox)
// this is used to find out which devices are currently
// on system
-static bool GetDmesgInfo(QListView *lBox, const char *filter,
- void func(QListView *, QString s))
+static bool GetDmesgInfo(TQListView *lBox, const char *filter,
+ void func(TQListView *, TQString s))
{
- QFile *dmesg = new QFile("/var/run/dmesg.boot");
+ TQFile *dmesg = new TQFile("/var/run/dmesg.boot");
bool usepipe = false;
FILE *pipe = NULL;
- QTextStream *t;
+ TQTextStream *t;
bool seencpu = false;
- QString s;
+ TQString s;
bool found = false;
if (dmesg->exists() && dmesg->open(IO_ReadOnly)) {
- t = new QTextStream(dmesg);
+ t = new TQTextStream(dmesg);
}
else {
delete dmesg;
pipe = popen("/sbin/dmesg", "r");
if (!pipe) return false;
usepipe = true;
- t = new QTextStream(pipe, IO_ReadOnly);
+ t = new TQTextStream(pipe, IO_ReadOnly);
}
- QListViewItem *olditem = NULL;
+ TQListViewItem *olditem = NULL;
while(!(s = t->readLine().local8Bit()).isEmpty()) {
if (!seencpu) {
if (s.contains("cpu"))
@@ -140,7 +140,7 @@ static bool GetDmesgInfo(QListView *lBox, const char *filter,
if (func)
func(lBox, s);
else
- olditem = new QListViewItem(lBox, olditem, s);
+ olditem = new TQListViewItem(lBox, olditem, s);
found = true;
}
}
@@ -158,7 +158,7 @@ static bool GetDmesgInfo(QListView *lBox, const char *filter,
void
-AddIRQLine(QListView *lBox, QString s)
+AddIRQLine(TQListView *lBox, TQString s)
{
int pos, irqnum;
char numstr[3];
@@ -172,10 +172,10 @@ AddIRQLine(QListView *lBox, QString s)
strcpy(numstr, "??");
}
- new QListViewItem(lBox, numstr, s);
+ new TQListViewItem(lBox, numstr, s);
}
-bool GetInfo_IRQ (QListView *lBox)
+bool GetInfo_IRQ (TQListView *lBox)
{
lBox->addColumn(i18n("IRQ"));
lBox->addColumn(i18n("Device"));
@@ -185,36 +185,36 @@ bool GetInfo_IRQ (QListView *lBox)
return true;
}
-bool GetInfo_DMA (QListView *)
+bool GetInfo_DMA (TQListView *)
{
return false;
}
-bool GetInfo_PCI (QListView *lbox)
+bool GetInfo_PCI (TQListView *lbox)
{
if (!GetDmesgInfo(lbox, "at pci", NULL))
- new QListViewItem(lbox, i18n("No PCI devices found."));
+ new TQListViewItem(lbox, i18n("No PCI devices found."));
return true;
}
-bool GetInfo_IO_Ports (QListView *lbox)
+bool GetInfo_IO_Ports (TQListView *lbox)
{
if (!GetDmesgInfo(lbox, "port 0x", NULL))
- new QListViewItem(lbox, i18n("No I/O port devices found."));
+ new TQListViewItem(lbox, i18n("No I/O port devices found."));
return true;
}
-bool GetInfo_Sound (QListView *lbox)
+bool GetInfo_Sound (TQListView *lbox)
{
lbox->setSorting(false);
if (!GetDmesgInfo(lbox, "audio", NULL))
- new QListViewItem(lbox, i18n("No audio devices found."));
+ new TQListViewItem(lbox, i18n("No audio devices found."));
// append information for each audio devices found
- QListViewItem *lvitem = lbox->firstChild();
+ TQListViewItem *lvitem = lbox->firstChild();
for(; lvitem; lvitem = lvitem->nextSibling()) {
- QString s;
+ TQString s;
int pos, len;
const char *start;
char *dev;
@@ -237,21 +237,21 @@ bool GetInfo_Sound (QListView *lbox)
return true;
}
-bool GetInfo_Devices (QListView *lBox)
+bool GetInfo_Devices (TQListView *lBox)
{
(void) GetDmesgInfo(lBox, NULL, NULL);
return true;
}
-bool GetInfo_SCSI (QListView *lbox)
+bool GetInfo_SCSI (TQListView *lbox)
{
if (!GetDmesgInfo(lbox, "scsibus", NULL))
- new QListViewItem(lbox, i18n("No SCSI devices found."));
+ new TQListViewItem(lbox, i18n("No SCSI devices found."));
// remove the 'waiting %d seconds for devices to settle' message
- QListViewItem *lvitem = lbox->firstChild();
+ TQListViewItem *lvitem = lbox->firstChild();
for(; lvitem; lvitem = lvitem->nextSibling()) {
- QString s = lvitem->text(0);
+ TQString s = lvitem->text(0);
if (s.contains("seconds for devices to settle")) {
lbox->removeItem(lvitem);
@@ -262,7 +262,7 @@ bool GetInfo_SCSI (QListView *lbox)
return true;
}
-bool GetInfo_Partitions (QListView *lbox)
+bool GetInfo_Partitions (TQListView *lbox)
{
int num; // number of mounts
// FIXME: older pkgsrc patches checked ST_RDONLY for this declaration
@@ -288,7 +288,7 @@ bool GetInfo_Partitions (QListView *lbox)
// mnt points into a static array (no need to free it)
for(; num--; ++mnt) {
unsigned long long big[2];
- QString vv[5];
+ TQString vv[5];
big[0] = big[1] = mnt->f_bsize; // coerce the product
big[0] *= mnt->f_blocks;
@@ -296,18 +296,18 @@ bool GetInfo_Partitions (QListView *lbox)
// convert to strings
vv[0] = KIO::convertSize(big[0]);
- vv[1] = QString::fromLatin1("%1 (%2%%)")
+ vv[1] = TQString::fromLatin1("%1 (%2%%)")
.arg(KIO::convertSize(big[1]))
.arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0);
// FIXME: these two are large enough to punctuate
- vv[2] = QString::number(mnt->f_files);
- vv[3] = QString::fromLatin1("%1 (%2%%) ")
+ vv[2] = TQString::number(mnt->f_files);
+ vv[3] = TQString::fromLatin1("%1 (%2%%) ")
.arg(mnt->f_ffree)
.arg(mnt->f_files ? mnt->f_ffree*100/mnt->f_files : 0);
- vv[4] = QString::null;
-#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += QString::fromLatin1(#x " ");
+ vv[4] = TQString::null;
+#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::fromLatin1(#x " ");
MNTF(ASYNC)
MNTF(DEFEXPORTED)
MNTF(EXKERB)
@@ -335,7 +335,7 @@ bool GetInfo_Partitions (QListView *lbox)
// put it in the table
// FIXME: there're more data but we have limited args (this is wrong! just add!)
- new QListViewItem(lbox,
+ new TQListViewItem(lbox,
// FIXME: names need pad space
mnt->f_mntfromname,
mnt->f_mntonname,
@@ -347,7 +347,7 @@ bool GetInfo_Partitions (QListView *lbox)
return true;
}
-bool GetInfo_XServer_and_Video (QListView *lBox)
+bool GetInfo_XServer_and_Video (TQListView *lBox)
{
return GetInfo_XServer_Generic( lBox );
}
diff --git a/kcontrol/info/info_openbsd.cpp b/kcontrol/info/info_openbsd.cpp
index 92995fd78..12ec8ee2d 100644
--- a/kcontrol/info/info_openbsd.cpp
+++ b/kcontrol/info/info_openbsd.cpp
@@ -35,10 +35,10 @@
#include <stdio.h> /* for NULL */
#include <stdlib.h> /* for malloc(3) */
-#include <qfile.h>
-#include <qfontmetrics.h>
-#include <qstrlist.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqfontmetrics.h>
+#include <tqstrlist.h>
+#include <tqtextstream.h>
#include <kdebug.h>
@@ -49,7 +49,7 @@ typedef struct
const char *title;
} hw_info_mib_list_t;
-bool GetInfo_CPU(QListView *lBox)
+bool GetInfo_CPU(TQListView *lBox)
{
static hw_info_mib_list_t hw_info_mib_list[]= {
{ 1, HW_MODEL, "Model" },
@@ -63,7 +63,7 @@ bool GetInfo_CPU(QListView *lBox)
int mib[2], num;
char *buf;
size_t len;
- QString value;
+ TQString value;
lBox->addColumn(i18n("Information"));
lBox->addColumn(i18n("Value"));
@@ -76,11 +76,11 @@ bool GetInfo_CPU(QListView *lBox)
sysctl(mib,2,NULL,&len,NULL,0);
if ( (buf = (char*)malloc(len)) ) {
sysctl(mib,2,buf,&len,NULL,0);
- value = QString::fromLocal8Bit(buf);
+ value = TQString::fromLocal8Bit(buf);
free(buf);
}
else {
- value = QString("Unknown");
+ value = TQString("Unknown");
}
}
else {
@@ -88,7 +88,7 @@ bool GetInfo_CPU(QListView *lBox)
sysctl(mib,2,&num,&len,NULL,0);
value.sprintf("%d", num);
}
- new QListViewItem(lBox, hw_info_mib->title, value);
+ new TQListViewItem(lBox, hw_info_mib->title, value);
}
return true;
@@ -96,30 +96,30 @@ bool GetInfo_CPU(QListView *lBox)
// this is used to find out which devices are currently
// on system
-static bool GetDmesgInfo(QListView *lBox, const char *filter,
- void func(QListView *, QString s, void **, bool))
+static bool GetDmesgInfo(TQListView *lBox, const char *filter,
+ void func(TQListView *, TQString s, void **, bool))
{
- QFile *dmesg = new QFile("/var/run/dmesg.boot");
+ TQFile *dmesg = new TQFile("/var/run/dmesg.boot");
bool usepipe=false;
FILE *pipe=NULL;
- QTextStream *t;
+ TQTextStream *t;
bool seencpu=false;
void *opaque=NULL;
- QString s;
+ TQString s;
bool found=false;
if (dmesg->exists() && dmesg->open(IO_ReadOnly)) {
- t = new QTextStream(dmesg);
+ t = new TQTextStream(dmesg);
}
else {
delete dmesg;
pipe = popen("/sbin/dmesg", "r");
if (!pipe) return false;
usepipe = true;
- t = new QTextStream(pipe, IO_ReadOnly);
+ t = new TQTextStream(pipe, IO_ReadOnly);
}
- QListViewItem *olditem = NULL;
+ TQListViewItem *olditem = NULL;
while(!(s = t->readLine()).isNull()) {
if (!seencpu) {
if (s.contains("cpu"))
@@ -136,7 +136,7 @@ static bool GetDmesgInfo(QListView *lBox, const char *filter,
func(lBox, s, &opaque, false);
}
else {
- olditem = new QListViewItem(lBox, olditem, s);
+ olditem = new TQListViewItem(lBox, olditem, s);
}
found = true;
}
@@ -159,22 +159,22 @@ static bool GetDmesgInfo(QListView *lBox, const char *filter,
}
-void AddIRQLine(QListView *lBox, QString s, void **opaque, bool ending)
+void AddIRQLine(TQListView *lBox, TQString s, void **opaque, bool ending)
{
- QStrList *strlist = (QStrList *) *opaque;
+ TQStrList *strlist = (TQStrList *) *opaque;
const char *str;
int pos, irqnum=0;
const char *p;
p = s.latin1();
if (!strlist) {
- strlist = new QStrList();
+ strlist = new TQStrList();
*opaque = (void *) strlist;
}
if (ending) {
str = strlist->first();
for(;str; str = strlist->next()) {
- new QListViewItem(lBox, str);
+ new TQListViewItem(lBox, str);
}
delete strlist;
return;
@@ -191,7 +191,7 @@ void AddIRQLine(QListView *lBox, QString s, void **opaque, bool ending)
strlist->inSort(s.latin1());
}
-bool GetInfo_IRQ (QListView *lBox)
+bool GetInfo_IRQ (TQListView *lBox)
{
lBox->addColumn(i18n("IRQ"));
lBox->addColumn(i18n("Device"));
@@ -199,34 +199,34 @@ bool GetInfo_IRQ (QListView *lBox)
return true;
}
-bool GetInfo_DMA (QListView *)
+bool GetInfo_DMA (TQListView *)
{
return false;
}
-bool GetInfo_PCI (QListView *lbox)
+bool GetInfo_PCI (TQListView *lbox)
{
if (!GetDmesgInfo(lbox, "at pci", NULL))
- new QListViewItem(lbox, i18n("No PCI devices found."));
+ new TQListViewItem(lbox, i18n("No PCI devices found."));
return true;
}
-bool GetInfo_IO_Ports (QListView *lbox)
+bool GetInfo_IO_Ports (TQListView *lbox)
{
if (!GetDmesgInfo(lbox, "port 0x", NULL))
- new QListViewItem(lbox, i18n("No I/O port devices found."));
+ new TQListViewItem(lbox, i18n("No I/O port devices found."));
return true;
}
-bool GetInfo_Sound (QListView *lbox)
+bool GetInfo_Sound (TQListView *lbox)
{
if (!GetDmesgInfo(lbox, "audio", NULL))
- new QListViewItem(lbox, i18n("No audio devices found."));
+ new TQListViewItem(lbox, i18n("No audio devices found."));
// append information on any audio devices found
- QListViewItem *lvitem = lbox->firstChild();
+ TQListViewItem *lvitem = lbox->firstChild();
for(; lvitem; lvitem = lvitem->nextSibling()) {
- QString s;
+ TQString s;
int pos, len;
const char *start, *end;
char *dev;
@@ -250,39 +250,39 @@ bool GetInfo_Sound (QListView *lbox)
return true;
}
-bool GetInfo_Devices (QListView *lBox)
+bool GetInfo_Devices (TQListView *lBox)
{
(void) GetDmesgInfo(lBox, NULL, NULL);
return true;
}
-bool GetInfo_SCSI (QListView *lbox)
+bool GetInfo_SCSI (TQListView *lbox)
{
if (!GetDmesgInfo(lbox, "scsibus", NULL))
- new QListViewItem(lbox, i18n("No SCSI devices found."));
+ new TQListViewItem(lbox, i18n("No SCSI devices found."));
return true;
}
-bool GetInfo_Partitions (QListView *lbox)
+bool GetInfo_Partitions (TQListView *lbox)
{
- QString s;
+ TQString s;
char *line, *orig_line;
const char *device, *mountpoint, *type, *flags;
FILE *pipe = popen("/sbin/mount", "r");
- QTextStream *t;
+ TQTextStream *t;
if (!pipe) {
kdError(0) << i18n("Unable to run /sbin/mount.") << endl;
return false;
}
- t = new QTextStream(pipe, IO_ReadOnly);
+ t = new TQTextStream(pipe, IO_ReadOnly);
lbox->addColumn(i18n("Device"));
lbox->addColumn(i18n("Mount Point"));
lbox->addColumn(i18n("FS Type"));
lbox->addColumn(i18n("Mount Options"));
- QListViewItem *olditem = 0;
+ TQListViewItem *olditem = 0;
while (!(s = t->readLine()).isNull()) {
orig_line = line = strdup(s.latin1());
@@ -296,7 +296,7 @@ bool GetInfo_Partitions (QListView *lbox)
flags = line;
- olditem = new QListViewItem(lbox, olditem, device, mountpoint,
+ olditem = new TQListViewItem(lbox, olditem, device, mountpoint,
type, flags);
free(orig_line);
@@ -307,7 +307,7 @@ bool GetInfo_Partitions (QListView *lbox)
return true;
}
-bool GetInfo_XServer_and_Video (QListView *lBox)
+bool GetInfo_XServer_and_Video (TQListView *lBox)
{
return GetInfo_XServer_Generic( lBox );
}
diff --git a/kcontrol/info/info_osx.cpp b/kcontrol/info/info_osx.cpp
index 25f23c2d9..5f18aebea 100644
--- a/kcontrol/info/info_osx.cpp
+++ b/kcontrol/info/info_osx.cpp
@@ -45,12 +45,12 @@
#include <iostream.h>
-#include <qdict.h>
-#include <qfile.h>
-#include <qfontmetrics.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qtextstream.h>
+#include <tqdict.h>
+#include <tqfile.h>
+#include <tqfontmetrics.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqtextstream.h>
#include <kdebug.h>
@@ -63,10 +63,10 @@
#include <machine/limits.h>
-bool GetInfo_CPU (QListView *lBox)
+bool GetInfo_CPU (TQListView *lBox)
{
- QString cpustring;
+ TQString cpustring;
kern_return_t ret;
struct host_basic_info basic_info;
@@ -81,37 +81,37 @@ bool GetInfo_CPU (QListView *lBox)
kdDebug() << "got Host Info: (" << basic_info.avail_cpus << ") CPUs available" << endl;
const NXArchInfo *archinfo;
archinfo=NXGetArchInfoFromCpuType(basic_info.cpu_type, basic_info.cpu_subtype);
- new QListViewItem(lBox, i18n("Kernel is configured for %1 CPUs").arg(basic_info.max_cpus));
+ new TQListViewItem(lBox, i18n("Kernel is configured for %1 CPUs").arg(basic_info.max_cpus));
for (int i = 1; i <= basic_info.avail_cpus; i++) {
cpustring = i18n("CPU %1: %2").arg(i).arg(archinfo->description);
- new QListViewItem(lBox, cpustring);
+ new TQListViewItem(lBox, cpustring);
}
return true;
}
return false;
}
-bool GetInfo_IRQ (QListView *)
+bool GetInfo_IRQ (TQListView *)
{
return false;
}
-bool GetInfo_DMA (QListView *)
+bool GetInfo_DMA (TQListView *)
{
return false;
}
-bool GetInfo_PCI (QListView *)
+bool GetInfo_PCI (TQListView *)
{
return false;
}
-bool GetInfo_IO_Ports (QListView *)
+bool GetInfo_IO_Ports (TQListView *)
{
return false;
}
-bool GetInfo_Sound (QListView *lBox)
+bool GetInfo_Sound (TQListView *lBox)
{
#ifdef HAVE_COREAUDIO
#define kMaxStringSize 1024
@@ -137,7 +137,7 @@ bool GetInfo_Sound (QListView *lBox)
kdDebug() << "get device name failed, status = " << (int)status << endl;
return false;
}
- new QListViewItem(lBox, i18n("Device Name: %1").arg(deviceName));
+ new TQListViewItem(lBox, i18n("Device Name: %1").arg(deviceName));
/* Manufacturer */
status = AudioDeviceGetProperty(gOutputDeviceID, 1, 0, kAudioDevicePropertyDeviceManufacturer, &propertySize, manufacturer);
@@ -145,7 +145,7 @@ bool GetInfo_Sound (QListView *lBox)
kdDebug() << "get manufacturer failed, status = " << (int)status << endl;
return false;
}
- new QListViewItem(lBox, i18n("Manufacturer: %1").arg(manufacturer));
+ new TQListViewItem(lBox, i18n("Manufacturer: %1").arg(manufacturer));
return true;
} else {
return false;
@@ -155,22 +155,22 @@ bool GetInfo_Sound (QListView *lBox)
#endif
}
-bool GetInfo_SCSI (QListView *lbox)
+bool GetInfo_SCSI (TQListView *lbox)
{
return false;
}
-bool GetInfo_Partitions (QListView *lbox)
+bool GetInfo_Partitions (TQListView *lbox)
{
return false;
}
-bool GetInfo_XServer_and_Video (QListView *lBox)
+bool GetInfo_XServer_and_Video (TQListView *lBox)
{
return GetInfo_XServer_Generic( lBox );
}
-bool GetInfo_Devices (QListView *lbox)
+bool GetInfo_Devices (TQListView *lbox)
{
return false;
}
diff --git a/kcontrol/info/info_sgi.cpp b/kcontrol/info/info_sgi.cpp
index 2cd1a1e30..7961d4e16 100644
--- a/kcontrol/info/info_sgi.cpp
+++ b/kcontrol/info/info_sgi.cpp
@@ -23,59 +23,59 @@
#include <sys/systeminfo.h>
-bool GetInfo_CPU( QListView *lBox )
+bool GetInfo_CPU( TQListView *lBox )
{
- QString str;
+ TQString str;
char buf[256];
sysinfo(SI_ARCHITECTURE, buf, sizeof(buf));
- str = QString::fromLocal8Bit(buf);
- new QListViewItem(lBox, str);
+ str = TQString::fromLocal8Bit(buf);
+ new TQListViewItem(lBox, str);
return true;
}
-bool GetInfo_IRQ( QListView * )
+bool GetInfo_IRQ( TQListView * )
{
return false;
}
-bool GetInfo_DMA( QListView * )
+bool GetInfo_DMA( TQListView * )
{
return false;
}
-bool GetInfo_PCI( QListView * )
+bool GetInfo_PCI( TQListView * )
{
return false;
}
-bool GetInfo_IO_Ports( QListView * )
+bool GetInfo_IO_Ports( TQListView * )
{
return false;
}
-bool GetInfo_Sound( QListView * )
+bool GetInfo_Sound( TQListView * )
{
return false;
}
-bool GetInfo_Devices( QListView * )
+bool GetInfo_Devices( TQListView * )
{
return false;
}
-bool GetInfo_SCSI( QListView * )
+bool GetInfo_SCSI( TQListView * )
{
return false;
}
-bool GetInfo_Partitions( QListView * )
+bool GetInfo_Partitions( TQListView * )
{
return false;
}
-bool GetInfo_XServer_and_Video( QListView *lBox )
+bool GetInfo_XServer_and_Video( TQListView *lBox )
{
return GetInfo_XServer_Generic( lBox );
}
diff --git a/kcontrol/info/info_solaris.cpp b/kcontrol/info/info_solaris.cpp
index 761200e75..9f2b17e1b 100644
--- a/kcontrol/info/info_solaris.cpp
+++ b/kcontrol/info/info_solaris.cpp
@@ -34,7 +34,7 @@
#define INFO_XSERVER_AVAILABLE
-bool GetInfo_CPU( QListView *lBox ) {
+bool GetInfo_CPU( TQListView *lBox ) {
kstat_ctl_t *kctl;
kstat_t *ksp;
@@ -114,7 +114,7 @@ bool GetInfo_CPU( QListView *lBox ) {
}
kdata = (kstat_named_t *) kstat_data_lookup( ksp, "state" );
if( kdata != NULL ) {
- state = QString( kdata->value.c );
+ state = TQString( kdata->value.c );
} else {
state = "???";
}
@@ -124,11 +124,11 @@ bool GetInfo_CPU( QListView *lBox ) {
if( (timetxt = ctime( (time_t *) &state_begin )) != NULL ) {
ptr = strrchr( timetxt, '\n' );
*ptr = '\0';
- state += " since " + QString( timetxt );
+ state += " since " + TQString( timetxt );
}
}
- new QListViewItem( lBox, inst, cputype, fputype, mhz, state );
+ new TQListViewItem( lBox, inst, cputype, fputype, mhz, state );
}
// sorting_allowed = true;
@@ -137,31 +137,31 @@ bool GetInfo_CPU( QListView *lBox ) {
return true;
}
-bool GetInfo_IRQ( QListView * ) {
+bool GetInfo_IRQ( TQListView * ) {
return false;
}
-bool GetInfo_DMA( QListView * ) {
+bool GetInfo_DMA( TQListView * ) {
return false;
}
-bool GetInfo_PCI( QListView * ) {
+bool GetInfo_PCI( TQListView * ) {
return false;
}
-bool GetInfo_IO_Ports( QListView * ) {
+bool GetInfo_IO_Ports( TQListView * ) {
return false;
}
-bool GetInfo_Sound( QListView * ) {
+bool GetInfo_Sound( TQListView * ) {
return false;
}
-bool GetInfo_SCSI( QListView * ) {
+bool GetInfo_SCSI( TQListView * ) {
return false;
}
-bool GetInfo_Partitions( QListView *lBox ) {
+bool GetInfo_Partitions( TQListView *lBox ) {
FILE *mnttab;
struct mnttab mnt;
@@ -268,14 +268,14 @@ bool GetInfo_Partitions( QListView *lBox ) {
*ptr = '\0';
}
- new QListViewItem(
+ new TQListViewItem(
lBox,
mnt.mnt_special,
mnt.mnt_mountp,
mnt.mnt_fstype,
total,
avail,
- QString( timetxt ),
+ TQString( timetxt ),
mnt.mnt_mntopts
);
}
@@ -287,7 +287,7 @@ bool GetInfo_Partitions( QListView *lBox ) {
return true;
}
-bool GetInfo_XServer_and_Video( QListView *lBox ) {
+bool GetInfo_XServer_and_Video( TQListView *lBox ) {
return GetInfo_XServer_Generic( lBox );
}
@@ -313,7 +313,7 @@ bool GetInfo_XServer_and_Video( QListView *lBox ) {
* mktree() -- break up the device path and place its components
* into the tree widget
*/
-QListViewItem *mktree( QListViewItem *top, const char *path ) {
+TQListViewItem *mktree( TQListViewItem *top, const char *path ) {
QListViewItem *parent,
*previous,
@@ -348,7 +348,7 @@ QListViewItem *mktree( QListViewItem *top, const char *path ) {
/*
* we haven't found the node, create a new one
*/
- result = new QListViewItem( parent,
+ result = new TQListViewItem( parent,
previous,
token );
} else {
@@ -453,21 +453,21 @@ int dump_minor_node( di_node_t node, di_minor_t minor, void *arg ) {
char *type;
dev_t dev;
- item = new QListViewItem( (QListViewItem *) arg,
+ item = new TQListViewItem( (TQListViewItem *) arg,
di_minor_name( minor ));
item->setExpandable( true );
item->setOpen( false );
- new QListViewItem( item, i18n( "Spectype:" ),
+ new TQListViewItem( item, i18n( "Spectype:" ),
(di_minor_spectype( minor ) == S_IFCHR)
? i18n( "character special" )
: i18n( "block special" ));
type = di_minor_nodetype( minor );
- new QListViewItem( item, i18n( "Nodetype:" ),
+ new TQListViewItem( item, i18n( "Nodetype:" ),
(type == NULL) ? "NULL" : type );
if( (dev = di_minor_devt( minor )) != DDI_DEV_T_NONE ) {
majmin.sprintf( "%ld/%ld", major( dev ), minor( dev ));
- new QListViewItem( item, i18n( "Major/Minor:" ), majmin );
+ new TQListViewItem( item, i18n( "Major/Minor:" ), majmin );
}
if( di_minor_next( node, minor ) == DI_MINOR_NIL )
@@ -479,7 +479,7 @@ int dump_minor_node( di_node_t node, di_minor_t minor, void *arg ) {
/*
* propvalue() -- return the property value
*/
-QString propvalue( di_prop_t prop ) {
+TQString propvalue( di_prop_t prop ) {
int type;
int i, n;
@@ -518,7 +518,7 @@ QString propvalue( di_prop_t prop ) {
result = "(error)";
} else {
for( i = 0; i < n; i++ ) {
- QString tmp;
+ TQString tmp;
tmp.setNum( intp[i] );
result += tmp;
result += " ";
@@ -542,7 +542,7 @@ QString propvalue( di_prop_t prop ) {
}
result = "0x";
for( i = 0; i < n; i++ ) {
- QString tmp;
+ TQString tmp;
unsigned byte = (unsigned) bytep[i];
tmp.sprintf( "%2.2x", byte );
result += tmp;
@@ -562,7 +562,7 @@ QString propvalue( di_prop_t prop ) {
*/
int dump_node( di_node_t node, void *arg ) {
- QListViewItem *top = (QListViewItem *) arg,
+ QListViewItem *top = (TQListViewItem *) arg,
*parent,
*previous;
char *path;
@@ -578,7 +578,7 @@ int dump_node( di_node_t node, void *arg ) {
* if this is the root node ("/"), initialize the tree
*/
if( strlen( path ) == 1 ) {
- top->setText( 0, QString( di_binding_name( node )));
+ top->setText( 0, TQString( di_binding_name( node )));
top->setPixmap( 0, SmallIcon( "kcmdevices" ));
top->setOpen( true );
top->setSelectable( false );
@@ -605,12 +605,12 @@ int dump_node( di_node_t node, void *arg ) {
* node name and physical device path
*/
drivername = di_driver_name( node );
- previous = new QListViewItem( parent,
+ previous = new TQListViewItem( parent,
i18n( "Driver Name:" ),
(drivername == NULL)
? i18n( "(driver not attached)" )
: drivername );
- previous = new QListViewItem( parent, previous,
+ previous = new TQListViewItem( parent, previous,
i18n( "Binding Name:" ), di_binding_name( node ));
n = di_compatible_names( node, &names );
@@ -624,17 +624,17 @@ int dump_node( di_node_t node, void *arg ) {
}
}
- previous = new QListViewItem( parent, previous,
+ previous = new TQListViewItem( parent, previous,
i18n( "Compatible Names:" ), compatnames );
- previous = new QListViewItem( parent, previous,
- i18n( "Physical Path:" ), QString( path ));
+ previous = new TQListViewItem( parent, previous,
+ i18n( "Physical Path:" ), TQString( path ));
/*
* dump the node's property list (if any)
*/
if( (prop = di_prop_next( node, DI_PROP_NIL )) != DI_PROP_NIL ) {
- previous = new QListViewItem( parent, previous, i18n( "Properties" ));
+ previous = new TQListViewItem( parent, previous, i18n( "Properties" ));
previous->setExpandable( true );
previous->setOpen( false );
do {
@@ -643,12 +643,12 @@ int dump_node( di_node_t node, void *arg ) {
*/
QListViewItem *tmp,
*prev;
- tmp = new QListViewItem( previous, di_prop_name( prop ));
+ tmp = new TQListViewItem( previous, di_prop_name( prop ));
tmp->setExpandable( true );
tmp->setOpen( false );
- prev = new QListViewItem( tmp, i18n( "Type:" ),
+ prev = new TQListViewItem( tmp, i18n( "Type:" ),
prop_type_str( prop ));
- new QListViewItem( tmp, prev, i18n( "Value:" ),
+ new TQListViewItem( tmp, prev, i18n( "Value:" ),
propvalue( prop ));
} while( (prop = di_prop_next( node, prop )) != DI_PROP_NIL );
}
@@ -657,7 +657,7 @@ int dump_node( di_node_t node, void *arg ) {
* if there are minor nodes, expand the tree appropriately
*/
if( di_minor_next( node, DI_MINOR_NIL ) != DI_MINOR_NIL ) {
- previous = new QListViewItem( parent, previous, i18n( "Minor Nodes" ));
+ previous = new TQListViewItem( parent, previous, i18n( "Minor Nodes" ));
previous->setExpandable( true );
previous->setOpen( false );
di_walk_minor( node, NULL, 0, previous, dump_minor_node );
@@ -666,7 +666,7 @@ int dump_node( di_node_t node, void *arg ) {
return( DI_WALK_CONTINUE );
}
-bool GetInfo_Devices( QListView *lBox ) {
+bool GetInfo_Devices( TQListView *lBox ) {
QListViewItem *top;
di_node_t root_node;
@@ -685,7 +685,7 @@ bool GetInfo_Devices( QListView *lBox ) {
lBox->addColumn( i18n( "Device Information" ));
lBox->addColumn( i18n( "Value" ));
- top = new QListViewItem( lBox );
+ top = new TQListViewItem( lBox );
/*
* traverse the device tree
@@ -699,7 +699,7 @@ bool GetInfo_Devices( QListView *lBox ) {
}
#else /* ! HAVE_LIBDEVINFO_H */
-bool GetInfo_Devices( QListView * ) {
+bool GetInfo_Devices( TQListView * ) {
return false;
}
#endif /* ! HAVE_LIBDEVINFO_H */
diff --git a/kcontrol/info/info_svr4.cpp b/kcontrol/info/info_svr4.cpp
index 2509aa062..ba491a50e 100644
--- a/kcontrol/info/info_svr4.cpp
+++ b/kcontrol/info/info_svr4.cpp
@@ -27,13 +27,13 @@
returning false indicates, that information was not available.
*/
-bool GetInfo_ReadfromFile( QListView *lBox, char *Name, char splitchar )
+bool GetInfo_ReadfromFile( TQListView *lBox, char *Name, char splitchar )
{
- QString str;
+ TQString str;
char buf[512];
- QFile *file = new QFile(Name);
- QListViewItem* olditem = 0;
+ TQFile *file = new TQFile(Name);
+ TQListViewItem* olditem = 0;
if(!file->open(IO_ReadOnly)) {
delete file;
@@ -54,12 +54,12 @@ bool GetInfo_ReadfromFile( QListView *lBox, char *Name, char splitchar )
else ++p;
}
- QString s1 = QString::fromLocal8Bit(buf);
- QString s2 = s1.mid(s1.find(splitchar)+1);
+ TQString s1 = TQString::fromLocal8Bit(buf);
+ TQString s2 = s1.mid(s1.find(splitchar)+1);
s1.truncate(s1.find(splitchar));
if(!(s1.isEmpty() || s2.isEmpty()))
- olditem = new QListViewItem(lBox, olditem, s1, s2);
+ olditem = new TQListViewItem(lBox, olditem, s1, s2);
}
}
file->close();
@@ -68,41 +68,41 @@ bool GetInfo_ReadfromFile( QListView *lBox, char *Name, char splitchar )
return true;
}
-bool GetInfo_CPU( QListView *lBox )
+bool GetInfo_CPU( TQListView *lBox )
{
char buf[256];
sysinfo(SI_ARCHITECTURE, buf, sizeof(buf));
- new QListViewItem(lBox, QString::fromLocal8Bit(buf));
+ new TQListViewItem(lBox, TQString::fromLocal8Bit(buf));
return true;
}
-bool GetInfo_IRQ( QListView * )
+bool GetInfo_IRQ( TQListView * )
{
return false;
}
-bool GetInfo_DMA( QListView * )
+bool GetInfo_DMA( TQListView * )
{
return false;
}
-bool GetInfo_PCI( QListView *lBox )
+bool GetInfo_PCI( TQListView *lBox )
{
char buf[256];
sysinfo(SI_BUSTYPES, buf, sizeof(buf));
- new QListViewItem(lBox, QString::fromLocal8Bit(buf));
+ new TQListViewItem(lBox, TQString::fromLocal8Bit(buf));
return true;
}
-bool GetInfo_IO_Ports( QListView * )
+bool GetInfo_IO_Ports( TQListView * )
{
return false;
}
-bool GetInfo_Sound( QListView *lBox )
+bool GetInfo_Sound( TQListView *lBox )
{
if ( GetInfo_ReadfromFile( lBox, INFO_DEV_SNDSTAT, 0 ))
return true;
@@ -110,22 +110,22 @@ bool GetInfo_Sound( QListView *lBox )
return false;
}
-bool GetInfo_Devices( QListView * )
+bool GetInfo_Devices( TQListView * )
{
return false;
}
-bool GetInfo_SCSI( QListView * )
+bool GetInfo_SCSI( TQListView * )
{
return false;
}
-bool GetInfo_Partitions( QListView * )
+bool GetInfo_Partitions( TQListView * )
{
return false;
}
-bool GetInfo_XServer_and_Video( QListView *lBox )
+bool GetInfo_XServer_and_Video( TQListView *lBox )
{
return GetInfo_XServer_Generic( lBox );
}
diff --git a/kcontrol/info/main.cpp b/kcontrol/info/main.cpp
index 7992fbc37..689ac25b7 100644
--- a/kcontrol/info/main.cpp
+++ b/kcontrol/info/main.cpp
@@ -34,7 +34,7 @@
extern "C"
{
- KDE_EXPORT KCModule *create_cpu(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_cpu(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_CPU_AVAILABLE
return new KInfoListWidget(i18n("Processor(s)"), parent, "kcminfo", GetInfo_CPU);
@@ -43,7 +43,7 @@ extern "C"
#endif
}
- KDE_EXPORT KCModule *create_irq(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_irq(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_IRQ_AVAILABLE
return new KInfoListWidget(i18n("Interrupt"), parent, "kcminfo", GetInfo_IRQ);
@@ -52,7 +52,7 @@ extern "C"
#endif
}
- KDE_EXPORT KCModule *create_pci(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_pci(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_PCI_AVAILABLE
return new KInfoListWidget(i18n("PCI"), parent, "kcminfo", GetInfo_PCI);
@@ -61,7 +61,7 @@ extern "C"
#endif
}
- KDE_EXPORT KCModule *create_dma(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_dma(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_DMA_AVAILABLE
return new KInfoListWidget(i18n("DMA-Channel"), parent, "kcminfo", GetInfo_DMA);
@@ -70,7 +70,7 @@ extern "C"
#endif
}
- KDE_EXPORT KCModule *create_ioports(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_ioports(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_IOPORTS_AVAILABLE
return new KInfoListWidget(i18n("I/O-Port"), parent, "kcminfo", GetInfo_IO_Ports);
@@ -79,7 +79,7 @@ extern "C"
#endif
}
- KDE_EXPORT KCModule *create_sound(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_sound(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_SOUND_AVAILABLE
return new KInfoListWidget(i18n("Soundcard"), parent, "kcminfo", GetInfo_Sound);
@@ -88,7 +88,7 @@ extern "C"
#endif
}
- KDE_EXPORT KCModule *create_scsi(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_scsi(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_SCSI_AVAILABLE
return new KInfoListWidget(i18n("SCSI"), parent, "kcminfo", GetInfo_SCSI);
@@ -97,7 +97,7 @@ extern "C"
#endif
}
- KDE_EXPORT KCModule *create_devices(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_devices(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_DEVICES_AVAILABLE
return new KInfoListWidget(i18n("Devices"), parent, "kcminfo", GetInfo_Devices);
@@ -106,7 +106,7 @@ extern "C"
#endif
}
- KDE_EXPORT KCModule *create_partitions(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_partitions(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_PARTITIONS_AVAILABLE
return new KInfoListWidget(i18n("Partitions"), parent, "kcminfo", GetInfo_Partitions);
@@ -115,7 +115,7 @@ extern "C"
#endif
}
- KDE_EXPORT KCModule *create_xserver(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_xserver(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_XSERVER_AVAILABLE
return new KInfoListWidget(i18n("X-Server"), parent, "kcminfo", GetInfo_XServer_and_Video);
@@ -124,12 +124,12 @@ extern "C"
#endif
}
- KDE_EXPORT KCModule *create_memory(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_memory(TQWidget *parent, const char * /*name*/)
{
return new KMemoryWidget(parent, "kcminfo");
}
- KDE_EXPORT KCModule *create_opengl(QWidget *parent, const char * )
+ KDE_EXPORT KCModule *create_opengl(TQWidget *parent, const char * )
{
#ifdef INFO_OPENGL_AVAILABLE
return new KInfoListWidget(i18n("OpenGL"), parent, "kcminfo", GetInfo_OpenGL);
@@ -139,7 +139,7 @@ extern "C"
}
/* create_cdinfo function for CD-ROM Info ~Jahshan */
- KDE_EXPORT KCModule *create_cdinfo(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_cdinfo(TQWidget *parent, const char * /*name*/)
{
#ifdef INFO_CD_ROM_AVAILABLE
return new KInfoListWidget(i18n("CD-ROM Info"), parent, "kcminfo", GetInfo_CD_ROM);
diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp
index 9743087dd..df7bcc6fa 100644
--- a/kcontrol/info/memory.cpp
+++ b/kcontrol/info/memory.cpp
@@ -24,10 +24,10 @@
#include <sys/param.h> /* for BSD */
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qdrawutil.h>
-#include <qtooltip.h>
+#include <tqlayout.h>
+#include <tqpainter.h>
+#include <tqdrawutil.h>
+#include <tqtooltip.h>
#include <kglobal.h>
#include <kdialog.h>
@@ -68,15 +68,15 @@ static t_memsize Memory_Info[MEM_LAST_ENTRY];
/* Implementation */
/******************/
-static QLabel *MemSizeLabel[MEM_LAST_ENTRY][2];
+static TQLabel *MemSizeLabel[MEM_LAST_ENTRY][2];
enum { MEM_RAM_AND_HDD, MEM_RAM, MEM_HDD, MEM_LAST };
-static QWidget *Graph[MEM_LAST];
-static QLabel *GraphLabel[MEM_LAST];
+static TQWidget *Graph[MEM_LAST];
+static TQLabel *GraphLabel[MEM_LAST];
#define SPACING 16
-static QString formatted_unit(t_memsize value)
+static TQString formatted_unit(t_memsize value)
{
if (value > (1024 * 1024))
if (value > (1024 * 1024 * 1024))
@@ -87,7 +87,7 @@ static QString formatted_unit(t_memsize value)
return i18n("%1 KB").arg(KGlobal::locale()->formatNumber(value / 1024.0, 2));
}
-KMemoryWidget::KMemoryWidget(QWidget * parent, const char *name)
+KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
: KCModule(parent, name)
{
@@ -100,8 +100,8 @@ KMemoryWidget::KMemoryWidget(QWidget * parent, const char *name)
about->addAuthor("Helge Deller", 0, "deller@gmx.de");
setAboutData( about );
- QString title, initial_str;
- QLabel *Widget = 0;
+ TQString title, initial_str;
+ TQLabel *Widget = 0;
int i, j;
ram_colors_initialized =
@@ -113,16 +113,16 @@ KMemoryWidget::KMemoryWidget(QWidget * parent, const char *name)
/* default string for no Information... */
Not_Available_Text = i18n("Not available.");
- QVBoxLayout *top = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *top = new TQVBoxLayout(this, 0, KDialog::spacingHint());
- QHBoxLayout *hbox = new QHBoxLayout();
+ TQHBoxLayout *hbox = new TQHBoxLayout();
top->addLayout(hbox);
/* stretch the left side */
hbox->addStretch();
/* first create the Informationtext-Widget */
- QVBoxLayout *vbox = new QVBoxLayout(hbox, 0);
+ TQVBoxLayout *vbox = new TQVBoxLayout(hbox, 0);
for (i = TOTAL_MEM; i < MEM_LAST_ENTRY; ++i) {
switch (i) {
case TOTAL_MEM:
@@ -162,18 +162,18 @@ KMemoryWidget::KMemoryWidget(QWidget * parent, const char *name)
title = "";
break;
};
- Widget = new QLabel(title, this);
+ Widget = new TQLabel(title, this);
Widget->setAlignment(AlignLeft);
vbox->addWidget(Widget, 1);
}
/* then the memory-content-widgets */
for (j = 0; j < 2; j++) {
- vbox = new QVBoxLayout(hbox, 0);
+ vbox = new TQVBoxLayout(hbox, 0);
for (i = TOTAL_MEM; i < MEM_LAST_ENTRY; ++i) {
if (i == SWAP_MEM)
vbox->addSpacing(SPACING);
- Widget = new QLabel(this);
+ Widget = new TQLabel(this);
Widget->setAlignment(AlignRight);
MemSizeLabel[i][j] = Widget;
vbox->addWidget(Widget, 1);
@@ -187,11 +187,11 @@ KMemoryWidget::KMemoryWidget(QWidget * parent, const char *name)
top->addWidget(line);
/* now the Graphics */
- QString hint;
- hbox = new QHBoxLayout(top, 1);
+ TQString hint;
+ hbox = new TQHBoxLayout(top, 1);
for (i = MEM_RAM_AND_HDD; i < MEM_LAST; i++) {
hbox->addSpacing(SPACING);
- vbox = new QVBoxLayout(hbox);
+ vbox = new TQVBoxLayout(hbox);
switch (i) {
case MEM_RAM_AND_HDD:
@@ -221,40 +221,40 @@ KMemoryWidget::KMemoryWidget(QWidget * parent, const char *name)
"through one or more swap partitions and/or swap files.");
break;
default:
- hint = title = QString::null;
+ hint = title = TQString::null;
break;
};
if (hint.length())
hint = "<qt>" + hint + "</qt>";
- Widget = new QLabel("<b>" + title + "</b>", this);
+ Widget = new TQLabel("<b>" + title + "</b>", this);
Widget->setAlignment(AlignCenter);
- QToolTip::add(Widget, hint);
+ TQToolTip::add(Widget, hint);
vbox->addWidget(Widget);
vbox->addSpacing(SPACING / 2);
- QWidget *g = new QWidget(this);
+ TQWidget *g = new TQWidget(this);
g->setMinimumWidth(2 * SPACING);
g->setMinimumHeight(3 * SPACING);
g->setBackgroundMode(NoBackground);
- QToolTip::add(g, hint); // add the tooltip
+ TQToolTip::add(g, hint); // add the tooltip
Graph[i] = g;
vbox->addWidget(g, 2);
vbox->addSpacing(SPACING / 2);
- Widget = new QLabel(this); /* xx MB used. */
+ Widget = new TQLabel(this); /* xx MB used. */
Widget->setAlignment(AlignCenter);
- QToolTip::add(Widget, hint);
+ TQToolTip::add(Widget, hint);
GraphLabel[i] = Widget;
vbox->addWidget(Widget);
}
hbox->addSpacing(SPACING);
- timer = new QTimer(this);
+ timer = new TQTimer(this);
timer->start(100);
- QObject::connect(timer, SIGNAL(timeout()), this,
- SLOT(update_Values()));
+ TQObject::connect(timer, TQT_SIGNAL(timeout()), this,
+ TQT_SLOT(update_Values()));
update();
}
@@ -266,7 +266,7 @@ KMemoryWidget::~KMemoryWidget()
}
-QString KMemoryWidget::quickHelp() const
+TQString KMemoryWidget::quickHelp() const
{
return i18n("<h1>Memory Information</h1>"
" This display shows you the current memory usage of your system."
@@ -280,22 +280,22 @@ bool KMemoryWidget::Display_Graph(int widgetindex,
int count,
t_memsize total,
t_memsize * used,
- QColor * color,
- QString *text)
+ TQColor * color,
+ TQString *text)
{
- QWidget *graph = Graph[widgetindex];
+ TQWidget *graph = Graph[widgetindex];
int width = graph->width();
int height = graph->height();
- QPixmap pm(width, height);
- QPainter paint;
+ TQPixmap pm(width, height);
+ TQPainter paint;
paint.begin(&pm, this);
- QPen pen(QColor(0, 0, 0));
+ TQPen pen(TQColor(0, 0, 0));
if (! ZERO_IF_NO_INFO(total)) {
paint.fillRect(1, 1, width - 2, height - 2,
- QBrush(QColor(128, 128, 128)));
+ TQBrush(TQColor(128, 128, 128)));
paint.setPen(pen);
paint.drawRect(graph->rect());
GraphLabel[widgetindex]->setText(Not_Available_Text);
@@ -329,7 +329,7 @@ bool KMemoryWidget::Display_Graph(int widgetindex,
if (localheight >= SPACING) {
paint.drawText(0, startline-localheight, width, localheight,
AlignCenter | WordBreak,
- QString("%1 %2%").arg(*text).arg(percent));
+ TQString("%1 %2%").arg(*text).arg(percent));
}
}
@@ -342,7 +342,7 @@ bool KMemoryWidget::Display_Graph(int widgetindex,
/* draw surrounding box */
paint.setPen(pen);
- QRect r = graph->rect();
+ TQRect r = graph->rect();
qDrawShadePanel(&paint, r.x(), r.y(), r.width(), r.height(), palette().active(), true, 1);
paint.end();
bitBlt(graph, 0, 0, &pm);
@@ -357,7 +357,7 @@ void KMemoryWidget::update_Values()
{
int i;
bool ok1;
- QLabel *label;
+ TQLabel *label;
t_memsize used[5];
update(); /* get the Information from memory_linux, memory_fbsd */
@@ -402,9 +402,9 @@ void KMemoryWidget::update_Values()
ram_text[0] = i18n("Application Data");
ram_colors[0] = COLOR_USED_MEMORY; /* used+shared */
ram_text[1] = i18n("Disk Buffers");
- ram_colors[1] = QColor(24,131,5); /* buffer */
+ ram_colors[1] = TQColor(24,131,5); /* buffer */
ram_text[2] = i18n("Disk Cache");
- ram_colors[2] = QColor(33,180,7); /* cached */
+ ram_colors[2] = TQColor(33,180,7); /* cached */
ram_text[3] = i18n("Free Physical Memory");
ram_colors[3] = COLOR_FREE_MEMORY; /* free */
}
diff --git a/kcontrol/info/memory.h b/kcontrol/info/memory.h
index 7f6778c75..975b851f5 100644
--- a/kcontrol/info/memory.h
+++ b/kcontrol/info/memory.h
@@ -1,12 +1,12 @@
#ifndef _MEMORY_H_KDEINFO_INCLUDED_
#define _MEMORY_H_KDEINFO_INCLUDED_
-#include <qwidget.h>
-#include <qframe.h>
-#include <qlabel.h>
-#include <qtabdialog.h>
-#include <qpushbutton.h>
-#include <qtimer.h>
+#include <tqwidget.h>
+#include <tqframe.h>
+#include <tqlabel.h>
+#include <tqtabdialog.h>
+#include <tqpushbutton.h>
+#include <tqtimer.h>
#include <kcmodule.h>
#include <kaboutdata.h>
@@ -20,35 +20,35 @@ typedef unsigned long long t_memsize;
typedef unsigned long t_memsize;
#endif
-#define COLOR_USED_MEMORY QColor(255,0,0)
-#define COLOR_USED_SWAP QColor(255,134,64)
-#define COLOR_FREE_MEMORY QColor(127,255,212)
+#define COLOR_USED_MEMORY TQColor(255,0,0)
+#define COLOR_USED_SWAP TQColor(255,134,64)
+#define COLOR_FREE_MEMORY TQColor(127,255,212)
class KMemoryWidget:public KCModule {
Q_OBJECT
public:
- KMemoryWidget(QWidget * parent, const char *name = 0);
+ KMemoryWidget(TQWidget * parent, const char *name = 0);
~KMemoryWidget();
- QString quickHelp() const;
+ TQString quickHelp() const;
private:
- QString Not_Available_Text;
- QTimer *timer;
+ TQString Not_Available_Text;
+ TQTimer *timer;
bool ram_colors_initialized,
swap_colors_initialized,
all_colors_initialized;
- QColor ram_colors[4];
- QString ram_text[4];
+ TQColor ram_colors[4];
+ TQString ram_text[4];
- QColor swap_colors[2];
- QString swap_text[2];
+ TQColor swap_colors[2];
+ TQString swap_text[2];
- QColor all_colors[3];
- QString all_text[3];
+ TQColor all_colors[3];
+ TQString all_text[3];
void update();
@@ -56,8 +56,8 @@ class KMemoryWidget:public KCModule {
int count,
t_memsize total,
t_memsize *used,
- QColor *color,
- QString *text);
+ TQColor *color,
+ TQString *text);
public slots:
void update_Values();
};
diff --git a/kcontrol/info/memory_linux.cpp b/kcontrol/info/memory_linux.cpp
index c393c01e7..175b2a617 100644
--- a/kcontrol/info/memory_linux.cpp
+++ b/kcontrol/info/memory_linux.cpp
@@ -1,7 +1,7 @@
#include <sys/sysinfo.h>
#include <unistd.h>
#include <stdlib.h>
-#include <qfile.h>
+#include <tqfile.h>
void KMemoryWidget::update()
{
@@ -23,7 +23,7 @@ void KMemoryWidget::update()
Memory_Info[SWAP_MEM] = MEMORY(info.totalswap) * mem_unit; // total size of all swap-partitions
Memory_Info[FREESWAP_MEM] = MEMORY(info.freeswap) * mem_unit; // free memory in swap-partitions
- QFile file("/proc/meminfo");
+ TQFile file("/proc/meminfo");
if (file.open(IO_ReadOnly)) {
char buf[512];
while (file.readLine(buf, sizeof(buf) - 1) > 0) {
diff --git a/kcontrol/info/memory_osx.cpp b/kcontrol/info/memory_osx.cpp
index 9c18c4a6e..b1ae7f529 100644
--- a/kcontrol/info/memory_osx.cpp
+++ b/kcontrol/info/memory_osx.cpp
@@ -21,7 +21,7 @@
#include <unistd.h>
#include <stdlib.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <mach/mach_init.h>
#include <mach/mach_host.h>
#include <mach/host_info.h>
diff --git a/kcontrol/info/opengl.cpp b/kcontrol/info/opengl.cpp
index 66266abdf..061e368e6 100644
--- a/kcontrol/info/opengl.cpp
+++ b/kcontrol/info/opengl.cpp
@@ -24,10 +24,10 @@
#define KCMGL_DO_GLU
-#include <qregexp.h>
-#include <qlistview.h>
-#include <qfile.h>
-#include <qstring.h>
+#include <tqregexp.h>
+#include <tqlistview.h>
+#include <tqfile.h>
+#include <tqstring.h>
#include <klocale.h>
#include <kmessagebox.h>
@@ -68,7 +68,7 @@ static struct glinfo {
} gli;
static struct {
- QString module,
+ TQString module,
pci,
vendor,
device,
@@ -76,7 +76,7 @@ static struct {
rev;
} dri_info;
-static int ReadPipe(QString FileName, QStringList &list)
+static int ReadPipe(TQString FileName, TQStringList &list)
{
FILE *pipe;
@@ -85,7 +85,7 @@ static int ReadPipe(QString FileName, QStringList &list)
return 0;
}
- QTextStream t(pipe, IO_ReadOnly);
+ TQTextStream t(pipe, IO_ReadOnly);
while (!t.atEnd()) list.append(t.readLine());
@@ -99,20 +99,20 @@ static int ReadPipe(QString FileName, QStringList &list)
static bool get_dri_device()
{
- QFile file;
+ TQFile file;
file.setName(INFO_DRI);
if (!file.exists() || !file.open(IO_ReadOnly))
return false;
- QTextStream stream(&file);
- QString line = stream.readLine();
+ TQTextStream stream(&file);
+ TQString line = stream.readLine();
if (!line.isEmpty()) {
dri_info.module = line.mid(0, line.find(0x20));
// possible formats, for regression testing
// line = " PCI:01:00:0";
// line = " pci:0000:01:00.0"
- QRegExp rx = QRegExp("\\b[Pp][Cc][Ii][:]([0-9a-fA-F]+[:])?([0-9a-fA-F]+[:][0-9a-fA-F]+[:.][0-9a-fA-F]+)\\b");
+ TQRegExp rx = TQRegExp("\\b[Pp][Cc][Ii][:]([0-9a-fA-F]+[:])?([0-9a-fA-F]+[:][0-9a-fA-F]+[:.][0-9a-fA-F]+)\\b");
if (rx.search(line)>0) {
dri_info.pci = rx.cap(2);
int end = dri_info.pci.findRev(':');
@@ -120,8 +120,8 @@ static bool get_dri_device()
if (end2>end) end=end2;
dri_info.pci[end]='.';
- QString cmd = QString("lspci -m -v -s ") + dri_info.pci;
- QStringList pci_info;
+ TQString cmd = TQString("lspci -m -v -s ") + dri_info.pci;
+ TQStringList pci_info;
int num;
if (((num = ReadPipe(cmd, pci_info)) ||
(num = ReadPipe("/sbin/"+cmd, pci_info)) ||
@@ -129,7 +129,7 @@ static bool get_dri_device()
(num = ReadPipe("/usr/local/sbin/"+cmd, pci_info))) && num>=7) {
for (int i=2; i<=6; i++) {
line = pci_info[i];
- line.remove(QRegExp("[^:]*:[ ]*"));
+ line.remove(TQRegExp("[^:]*:[ ]*"));
switch (i){
case 2: dri_info.vendor = line; break;
case 3: dri_info.device = line; break;
@@ -149,7 +149,7 @@ static bool get_dri_device()
static bool get_dri_device() {
- QStringList pci_info;
+ TQStringList pci_info;
if (ReadPipe("sysctl -n hw.dri.0.name",pci_info)) {
dri_info.module = pci_info[0].mid(0, pci_info[0].find(0x20));
}
@@ -188,14 +188,14 @@ mesa_hack(Display *dpy, int scrnum)
static void
-print_extension_list(const char *ext, QListViewItem *l1)
+print_extension_list(const char *ext, TQListViewItem *l1)
{
int i, j;
if (!ext || !ext[0])
return;
- QString qext = QString::fromLatin1(ext);
- QListViewItem *l2 = NULL;
+ TQString qext = TQString::fromLatin1(ext);
+ TQListViewItem *l2 = NULL;
i = j = 0;
while (1) {
@@ -203,8 +203,8 @@ print_extension_list(const char *ext, QListViewItem *l1)
/* found end of an extension name */
const int len = j - i;
/* print the extension name between ext[i] and ext[j] */
- if (!l2) l2 = new QListViewItem(l1, qext.mid(i, len));
- else l2 = new QListViewItem(l1, l2, qext.mid(i, len));
+ if (!l2) l2 = new TQListViewItem(l1, qext.mid(i, len));
+ else l2 = new TQListViewItem(l1, l2, qext.mid(i, len));
i=j;
if (ext[j] == 0) {
break;
@@ -227,7 +227,7 @@ extern "C" {
#endif
static void
-print_limits(QListViewItem *l1, const char * glExtensions, bool GetProcAddress)
+print_limits(TQListViewItem *l1, const char * glExtensions, bool GetProcAddress)
{
/* TODO
GL_SAMPLE_BUFFERS
@@ -241,18 +241,18 @@ print_limits(QListViewItem *l1, const char * glExtensions, bool GetProcAddress)
struct token_name {
GLuint type; // count and flags, !!! count must be <=2 for now
GLenum token;
- const QString name;
+ const TQString name;
};
struct token_group {
int count;
int type;
const token_name *group;
- const QString descr;
+ const TQString descr;
const char *ext;
};
- QListViewItem *l2 = NULL, *l3 = NULL;
+ TQListViewItem *l2 = NULL, *l3 = NULL;
#if defined(PFNGLGETPROGRAMIVARBPROC)
PFNGLGETPROGRAMIVARBPROC kcm_glGetProgramivARB = NULL;
#endif
@@ -433,8 +433,8 @@ print_limits(QListViewItem *l1, const char * glExtensions, bool GetProcAddress)
for (uint i = 0; i<KCMGL_SIZE(groups); i++) {
if (groups[i].ext && !strstr(glExtensions, groups[i].ext)) continue;
- if (l2) l2 = new QListViewItem(l1, l2, groups[i].descr);
- else l2 = new QListViewItem(l1, groups[i].descr);
+ if (l2) l2 = new TQListViewItem(l1, l2, groups[i].descr);
+ else l2 = new TQListViewItem(l1, groups[i].descr);
l3 = NULL;
const struct token_name *cur_token;
for (cur_token = groups[i].group; cur_token->type; cur_token++) {
@@ -454,13 +454,13 @@ print_limits(QListViewItem *l1, const char * glExtensions, bool GetProcAddress)
else glGetIntegerv(cur_token->token, max);
if (glGetError() == GL_NONE) {
- QString s;
- if (!tfloat && count == 1) s = QString::number(max[0]); else
- if (!tfloat && count == 2) s = QString("%1, %2").arg(max[0]).arg(max[1]); else
- if (tfloat && count == 2) s = QString("%1 - %2").arg(fmax[0],0,'f',6).arg(fmax[1],0,'f',6); else
- if (tfloat && count == 1) s = QString::number(fmax[0],'f',6);
- if (l3) l3 = new QListViewItem(l2, l3, cur_token->name, s);
- else l3 = new QListViewItem(l2, cur_token->name, s);
+ TQString s;
+ if (!tfloat && count == 1) s = TQString::number(max[0]); else
+ if (!tfloat && count == 2) s = TQString("%1, %2").arg(max[0]).arg(max[1]); else
+ if (tfloat && count == 2) s = TQString("%1 - %2").arg(fmax[0],0,'f',6).arg(fmax[1],0,'f',6); else
+ if (tfloat && count == 1) s = TQString::number(fmax[0],'f',6);
+ if (l3) l3 = new TQListViewItem(l2, l3, cur_token->name, s);
+ else l3 = new TQListViewItem(l2, cur_token->name, s);
}
}
@@ -469,71 +469,71 @@ print_limits(QListViewItem *l1, const char * glExtensions, bool GetProcAddress)
}
-static QListViewItem *print_screen_info(QListViewItem *l1, QListViewItem *after)
+static TQListViewItem *print_screen_info(TQListViewItem *l1, TQListViewItem *after)
{
- QListViewItem *l2 = NULL, *l3 = NULL;
+ TQListViewItem *l2 = NULL, *l3 = NULL;
- if (after) l1= new QListViewItem(l1,after,IsDirect ? i18n("Direct Rendering") : i18n("Indirect Rendering"));
- else l1= new QListViewItem(l1,IsDirect ? i18n("Direct Rendering") : i18n("Indirect Rendering"));
+ if (after) l1= new TQListViewItem(l1,after,IsDirect ? i18n("Direct Rendering") : i18n("Indirect Rendering"));
+ else l1= new TQListViewItem(l1,IsDirect ? i18n("Direct Rendering") : i18n("Indirect Rendering"));
if (IsDirect)
if (get_dri_device()) {
- l2 = new QListViewItem(l1, i18n("3D Accelerator"));
+ l2 = new TQListViewItem(l1, i18n("3D Accelerator"));
l2->setOpen(true);
- l3 = new QListViewItem(l2, l3, i18n("Vendor"), dri_info.vendor);
- l3 = new QListViewItem(l2, l3, i18n("Device"), dri_info.device);
- l3 = new QListViewItem(l2, l3, i18n("Subvendor"), dri_info.subvendor);
- l3 = new QListViewItem(l2, l3, i18n("Revision"), dri_info.rev);
+ l3 = new TQListViewItem(l2, l3, i18n("Vendor"), dri_info.vendor);
+ l3 = new TQListViewItem(l2, l3, i18n("Device"), dri_info.device);
+ l3 = new TQListViewItem(l2, l3, i18n("Subvendor"), dri_info.subvendor);
+ l3 = new TQListViewItem(l2, l3, i18n("Revision"), dri_info.rev);
}
- else l2=new QListViewItem(l1, l2, i18n("3D Accelerator"),i18n("unknown"));
- if (l2) l2 = new QListViewItem(l1, l2, i18n("Driver"));
- else l2 = new QListViewItem(l1, i18n("Driver"));
+ else l2=new TQListViewItem(l1, l2, i18n("3D Accelerator"),i18n("unknown"));
+ if (l2) l2 = new TQListViewItem(l1, l2, i18n("Driver"));
+ else l2 = new TQListViewItem(l1, i18n("Driver"));
l2->setOpen(true);
- l3 = new QListViewItem(l2, i18n("Vendor"),gli.glVendor);
- l3 = new QListViewItem(l2, l3, i18n("Renderer"), gli.glRenderer);
- l3 = new QListViewItem(l2, l3, i18n("OpenGL version"), gli.glVersion);
+ l3 = new TQListViewItem(l2, i18n("Vendor"),gli.glVendor);
+ l3 = new TQListViewItem(l2, l3, i18n("Renderer"), gli.glRenderer);
+ l3 = new TQListViewItem(l2, l3, i18n("OpenGL version"), gli.glVersion);
if (IsDirect) {
if (!dri_info.module) dri_info.module = i18n("unknown");
- l3 = new QListViewItem(l2, l3, i18n("Kernel module"), dri_info.module);
+ l3 = new TQListViewItem(l2, l3, i18n("Kernel module"), dri_info.module);
}
- l3 = new QListViewItem(l2, l3, i18n("OpenGL extensions"));
+ l3 = new TQListViewItem(l2, l3, i18n("OpenGL extensions"));
print_extension_list(gli.glExtensions,l3);
- l3 = new QListViewItem(l2, l3, i18n("Implementation specific"));
+ l3 = new TQListViewItem(l2, l3, i18n("Implementation specific"));
print_limits(l3, gli.glExtensions, strstr(gli.clientExtensions, "GLX_ARB_get_proc_address") != NULL);
return l1;
}
-void print_glx_glu(QListViewItem *l1, QListViewItem *l2)
+void print_glx_glu(TQListViewItem *l1, TQListViewItem *l2)
{
- QListViewItem *l3;
+ TQListViewItem *l3;
- l2=new QListViewItem(l1, l2, i18n("GLX"));
- l3 = new QListViewItem(l2, i18n("server GLX vendor"),gli.serverVendor);
- l3 = new QListViewItem(l2, l3, i18n("server GLX version"),gli.serverVersion);
- l3 = new QListViewItem(l2, l3, i18n("server GLX extensions"));
+ l2=new TQListViewItem(l1, l2, i18n("GLX"));
+ l3 = new TQListViewItem(l2, i18n("server GLX vendor"),gli.serverVendor);
+ l3 = new TQListViewItem(l2, l3, i18n("server GLX version"),gli.serverVersion);
+ l3 = new TQListViewItem(l2, l3, i18n("server GLX extensions"));
print_extension_list(gli.serverExtensions,l3);
- l3 = new QListViewItem(l2, l3, i18n("client GLX vendor"),gli.clientVendor);
- l3 = new QListViewItem(l2, l3, i18n("client GLX version"),gli.clientVersion);
- l3 = new QListViewItem(l2, l3, i18n("client GLX extensions"));
+ l3 = new TQListViewItem(l2, l3, i18n("client GLX vendor"),gli.clientVendor);
+ l3 = new TQListViewItem(l2, l3, i18n("client GLX version"),gli.clientVersion);
+ l3 = new TQListViewItem(l2, l3, i18n("client GLX extensions"));
print_extension_list(gli.clientExtensions,l3);
- l3 = new QListViewItem(l2, l3, i18n("GLX extensions"));
+ l3 = new TQListViewItem(l2, l3, i18n("GLX extensions"));
print_extension_list(gli.glxExtensions,l3);
#ifdef KCMGL_DO_GLU
- l2 = new QListViewItem(l1, l2, i18n("GLU"));
- l3 = new QListViewItem(l2, i18n("GLU version"), gli.gluVersion);
- l3 = new QListViewItem(l2, l3, i18n("GLU extensions"));
+ l2 = new TQListViewItem(l1, l2, i18n("GLU"));
+ l3 = new TQListViewItem(l2, i18n("GLU version"), gli.gluVersion);
+ l3 = new TQListViewItem(l2, l3, i18n("GLU extensions"));
print_extension_list(gli.gluExtensions,l3);
#endif
}
-static QListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,QListViewItem *l1, QListViewItem *after)
+static TQListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,TQListViewItem *l1, TQListViewItem *after)
{
Window win;
int attribSingle[] = {
@@ -556,7 +556,7 @@ static QListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,QLi
GLXContext ctx;
XVisualInfo *visinfo;
int width = 100, height = 100;
- QListViewItem *result = after;
+ TQListViewItem *result = after;
root = RootWindow(dpy, scrnum);
@@ -617,9 +617,9 @@ static QListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,QLi
}
-static bool GetInfo_OpenGL_Generic( QListView *lBox )
+static bool GetInfo_OpenGL_Generic( TQListView *lBox )
{
- QListViewItem *l1, *l2 = NULL;
+ TQListViewItem *l1, *l2 = NULL;
char *displayName = NULL;
Display *dpy;
@@ -634,7 +634,7 @@ static bool GetInfo_OpenGL_Generic( QListView *lBox )
lBox->addColumn(i18n("Information") );
lBox->addColumn(i18n("Value") );
- l1 = new QListViewItem(lBox, i18n("Name of the Display"), DisplayString(dpy));
+ l1 = new TQListViewItem(lBox, i18n("Name of the Display"), DisplayString(dpy));
l1->setOpen(true);
l1->setSelectable(false);
l1->setExpandable(false);
@@ -664,7 +664,7 @@ static bool GetInfo_OpenGL_Generic( QListView *lBox )
return true;
}
-bool GetInfo_OpenGL(QListView * lBox)
+bool GetInfo_OpenGL(TQListView * lBox)
{
return GetInfo_OpenGL_Generic(lBox);
}
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index d83b28cb7..a2b5f1b86 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -31,11 +31,11 @@
#include <klistview.h>
#include <kdialog.h>
-#include <qlayout.h>
-#include <qdir.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqdir.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
+#include <tqlabel.h>
#include "themepage.h"
#include "themepage.moc"
@@ -49,15 +49,15 @@ namespace {
}
-ThemePage::ThemePage( QWidget* parent, const char* name )
- : QWidget( parent, name )
+ThemePage::ThemePage( TQWidget* parent, const char* name )
+ : TQWidget( parent, name )
{
- QBoxLayout *layout = new QVBoxLayout( this );
+ TQBoxLayout *layout = new TQVBoxLayout( this );
layout->setAutoAdd( true );
layout->setMargin( KDialog::marginHint() );
layout->setSpacing( KDialog::spacingHint() );
- new QLabel( i18n("Select the cursor theme you want to use:"), this );
+ new TQLabel( i18n("Select the cursor theme you want to use:"), this );
// Create the theme list view
listview = new KListView( this );
@@ -66,8 +66,8 @@ ThemePage::ThemePage( QWidget* parent, const char* name )
listview->addColumn( i18n("Name") );
listview->addColumn( i18n("Description") );
- connect( listview, SIGNAL(selectionChanged(QListViewItem*)),
- SLOT(selectionChanged(QListViewItem*)) );
+ connect( listview, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
+ TQT_SLOT(selectionChanged(TQListViewItem*)) );
insertThemes();
}
@@ -78,7 +78,7 @@ ThemePage::~ThemePage()
}
-void ThemePage::selectionChanged( QListViewItem *item )
+void ThemePage::selectionChanged( TQListViewItem *item )
{
selectedTheme = item->text( DirColumn );
emit changed( selectedTheme != currentTheme );
@@ -130,7 +130,7 @@ void ThemePage::load( bool useDefaults )
currentTheme = whiteCursor ? "SmallWhite" : "SmallBlack";
selectedTheme = currentTheme;
- QListViewItem *item = listview->findItem( currentTheme, DirColumn );
+ TQListViewItem *item = listview->findItem( currentTheme, DirColumn );
item->setSelected( true );
}
@@ -147,22 +147,22 @@ void ThemePage::insertThemes()
item = new KListViewItem( listview, i18n("Small black"),
i18n("Small black cursors"), "SmallBlack" );
- item->setPixmap( 0, QPixmap( arrow_small_black_xpm ) );
+ item->setPixmap( 0, TQPixmap( arrow_small_black_xpm ) );
listview->insertItem( item );
item = new KListViewItem( listview, i18n("Large black"),
i18n("Large black cursors"), "LargeBlack" );
- item->setPixmap( 0, QPixmap( arrow_large_black_xpm ) );
+ item->setPixmap( 0, TQPixmap( arrow_large_black_xpm ) );
listview->insertItem( item );
item = new KListViewItem( listview, i18n("Small white"),
i18n("Small white cursors"), "SmallWhite" );
- item->setPixmap( 0, QPixmap( arrow_small_white_xpm ) );
+ item->setPixmap( 0, TQPixmap( arrow_small_white_xpm ) );
listview->insertItem( item );
item = new KListViewItem( listview, i18n("Large white"),
i18n("Large white cursors"), "LargeWhite" );
- item->setPixmap( 0, QPixmap( arrow_large_white_xpm ) );
+ item->setPixmap( 0, TQPixmap( arrow_large_white_xpm ) );
listview->insertItem( item );
}
@@ -179,8 +179,8 @@ void ThemePage::fixCursorFile()
// Run mkfontdir to update fonts.dir in that dir.
KGlobal::dirs()->addResourceType( "font", "share/fonts/" );
- KIO::mkdir( KURL::fromPathOrURL(QDir::homeDirPath() + "/.fonts/kde-override") );
- QString overrideDir = QDir::homeDirPath() + "/.fonts/kde-override/";
+ KIO::mkdir( KURL::fromPathOrURL(TQDir::homeDirPath() + "/.fonts/kde-override") );
+ TQString overrideDir = TQDir::homeDirPath() + "/.fonts/kde-override/";
KURL installedFont;
installedFont.setPath( overrideDir + "cursor.pcf.gz" );
@@ -200,7 +200,7 @@ void ThemePage::fixCursorFile()
KIO::NetAccess::file_copy( source, installedFont, -1, true );
}
- QString cmd = KGlobal::dirs()->findExe( "mkfontdir" );
+ TQString cmd = KGlobal::dirs()->findExe( "mkfontdir" );
if ( !cmd.isEmpty() )
{
KProcess p;
diff --git a/kcontrol/input/core/themepage.h b/kcontrol/input/core/themepage.h
index 491c11f75..b4c964037 100644
--- a/kcontrol/input/core/themepage.h
+++ b/kcontrol/input/core/themepage.h
@@ -27,7 +27,7 @@ class ThemePage : public QWidget
Q_OBJECT
public:
- ThemePage( QWidget* parent = 0, const char* name = 0 );
+ ThemePage( TQWidget* parent = 0, const char* name = 0 );
~ThemePage();
// Called by the KCM
@@ -40,14 +40,14 @@ class ThemePage : public QWidget
void changed( bool );
private slots:
- void selectionChanged( QListViewItem * );
+ void selectionChanged( TQListViewItem * );
private:
void insertThemes();
void fixCursorFile();
KListView *listview;
- QString currentTheme, selectedTheme;
+ TQString currentTheme, selectedTheme;
};
#endif // __THEMEPAGE_H
diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp
index 1b8132a7e..9fc8daf32 100644
--- a/kcontrol/input/logitechmouse.cpp
+++ b/kcontrol/input/logitechmouse.cpp
@@ -19,15 +19,15 @@
*/
-#include <qdialog.h>
-#include <qpushbutton.h>
-#include <qlabel.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
-#include <qwidget.h>
-#include <qlayout.h>
-#include <qprogressbar.h>
-#include <qtimer.h>
+#include <tqdialog.h>
+#include <tqpushbutton.h>
+#include <tqlabel.h>
+#include <tqradiobutton.h>
+#include <tqbuttongroup.h>
+#include <tqwidget.h>
+#include <tqlayout.h>
+#include <tqprogressbar.h>
+#include <tqtimer.h>
#include <kdebug.h>
#include <kdialog.h>
@@ -41,7 +41,7 @@
#include "logitechmouse.h"
-LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlags, QWidget* parent, const char* name )
+LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlags, TQWidget* parent, const char* name )
: LogitechMouseBase( parent, name, 0 )
{
if ( !name )
@@ -70,8 +70,8 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag
updateResolution();
resolutionSelector->setEnabled( TRUE );
- connect( button400cpi, SIGNAL( clicked() ), parent, SLOT( changed() ) );
- connect( button800cpi, SIGNAL( clicked() ), parent, SLOT( changed() ) );
+ connect( button400cpi, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) );
+ connect( button800cpi, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) );
if ( 4 == resolution() ) {
button800cpi->setChecked( TRUE );
@@ -100,12 +100,12 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag
// if the channel is changed, we need to turn off the timer, otherwise it
// just resets the button to reflect the current status. The timer is
// started again when we applyChanges()
- connect( channel1, SIGNAL( clicked() ), this, SLOT( stopTimerForNow() ) );
- connect( channel1, SIGNAL( clicked() ), parent, SLOT( changed() ) );
+ connect( channel1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopTimerForNow() ) );
+ connect( channel1, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) );
if ( isDualChannelCapable() ) {
channel2->setEnabled( TRUE );
- connect( channel2, SIGNAL( clicked() ), this, SLOT( stopTimerForNow() ) );
- connect( channel2, SIGNAL( clicked() ), parent, SLOT( changed() ) );
+ connect( channel2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopTimerForNow() ) );
+ connect( channel2, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) );
}
updateGUI();
@@ -121,14 +121,14 @@ LogitechMouse::~LogitechMouse()
void LogitechMouse::initCordlessStatusReporting()
{
updateCordlessStatus();
- doUpdate = new QTimer( this ); // will be automatically deleted
- connect( doUpdate, SIGNAL( timeout() ), this, SLOT( updateGUI() ) );
+ doUpdate = new TQTimer( this ); // will be automatically deleted
+ connect( doUpdate, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateGUI() ) );
doUpdate->start( 20000 );
}
void LogitechMouse::updateCordlessStatus()
{
- QByteArray status(8);
+ TQByteArray status(8);
int result = usb_control_msg( m_usbDeviceHandle,
USB_TYPE_VENDOR | USB_ENDPOINT_IN,0x09,
@@ -349,7 +349,7 @@ void LogitechMouse::setChannel2()
}
-QString LogitechMouse::cordlessName()
+TQString LogitechMouse::cordlessName()
{
switch ( m_cordlessNameIndex ) {
case 0x00:
diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h
index 8c7ef06d3..4ea296725 100644
--- a/kcontrol/input/logitechmouse.h
+++ b/kcontrol/input/logitechmouse.h
@@ -22,11 +22,11 @@
#ifndef __LOGITECHMOUSE_H__
#define __LOGITECHMOUSE_H__
-#include <qdialog.h>
-#include <qpushbutton.h>
-#include <qlabel.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <tqdialog.h>
+#include <tqpushbutton.h>
+#include <tqlabel.h>
+#include <tqradiobutton.h>
+#include <tqbuttongroup.h>
#include <kconfig.h>
@@ -49,7 +49,7 @@ class LogitechMouse : public LogitechMouseBase
Q_OBJECT
public:
- LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlags, QWidget* parent = 0, const char* name = 0 );
+ LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlags, TQWidget* parent = 0, const char* name = 0 );
~LogitechMouse();
void applyChanges();
void save(KConfig *config);
@@ -67,14 +67,14 @@ private:
void setLogitechTo400();
void setLogitechTo800();
- QString cordlessName();
+ TQString cordlessName();
Q_UINT8 resolution();
void updateResolution();
Q_UINT8 batteryLevel();
Q_UINT8 channel();
bool isDualChannelCapable();
- QTimer *doUpdate;
+ TQTimer *doUpdate;
struct usb_dev_handle *m_usbDeviceHandle;
bool m_connectStatus; // true if the CONNECT button on the mouse is pressed
@@ -85,7 +85,7 @@ private:
// CONNECT button on the receiver was pressed
Q_UINT8 m_batteryLevel;
Q_UINT8 m_channel;
- Q_UINT8 m_cordlessNameIndex; // this gets convered into a QString in cordlessName()
+ Q_UINT8 m_cordlessNameIndex; // this gets convered into a TQString in cordlessName()
Q_UINT16 m_cordlessSecurity;
Q_UINT16 m_useSecondChannel;
Q_UINT8 m_caseShape;
diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp
index f0a464adc..f42498aab 100644
--- a/kcontrol/input/main.cpp
+++ b/kcontrol/input/main.cpp
@@ -29,7 +29,7 @@
#include <kglobal.h>
#include <kconfig.h>
#include <dcopref.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <X11/Xlib.h>
@@ -41,7 +41,7 @@
extern "C"
{
- KDE_EXPORT KCModule *create_mouse(QWidget *parent, const char *)
+ KDE_EXPORT KCModule *create_mouse(TQWidget *parent, const char *)
{
return new MouseConfig(parent, "kcminput");
}
@@ -55,15 +55,15 @@ extern "C"
#ifdef HAVE_XCURSOR
config->setGroup("Mouse");
- QCString theme = QFile::encodeName(config->readEntry("cursorTheme", QString()));
- QCString size = config->readEntry("cursorSize", QString()).local8Bit();
+ TQCString theme = TQFile::encodeName(config->readEntry("cursorTheme", TQString()));
+ TQCString size = config->readEntry("cursorSize", TQString()).local8Bit();
// Note: If you update this code, update kapplymousetheme as well.
// use a default value for theme only if it's not configured at all, not even in X resources
if( theme.isEmpty()
- && QCString( XGetDefault( qt_xdisplay(), "Xcursor", "theme" )).isEmpty()
- && QCString( XcursorGetTheme( qt_xdisplay())).isEmpty())
+ && TQCString( XGetDefault( qt_xdisplay(), "Xcursor", "theme" )).isEmpty()
+ && TQCString( XcursorGetTheme( qt_xdisplay())).isEmpty())
{
theme = "default";
}
@@ -84,9 +84,9 @@ extern "C"
// variables when launching applications.
DCOPRef klauncher("klauncher");
if( !theme.isEmpty())
- klauncher.send("setLaunchEnv", QCString("XCURSOR_THEME"), theme);
+ klauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), theme);
if( !size.isEmpty())
- klauncher.send("setLaunchEnv", QCString("XCURSOR_SIZE"), size);
+ klauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size);
#endif
delete config;
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index 56e737135..68f376474 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -47,14 +47,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlayout.h>
-#include <qcheckbox.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
#undef Below
#undef Above
-#include <qslider.h>
-#include <qwhatsthis.h>
-#include <qtabwidget.h>
-#include <qradiobutton.h>
+#include <tqslider.h>
+#include <tqwhatsthis.h>
+#include <tqtabwidget.h>
+#include <tqradiobutton.h>
#include <klocale.h>
#include <kdialog.h>
@@ -74,7 +74,7 @@
#undef Below
-MouseConfig::MouseConfig (QWidget * parent, const char *name)
+MouseConfig::MouseConfig (TQWidget * parent, const char *name)
: KCModule(parent, name)
{
@@ -84,15 +84,15 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
" pointing device may be a mouse, trackball, or some other hardware"
" that performs a similar function."));
- QString wtstr;
+ TQString wtstr;
- QBoxLayout *top = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQBoxLayout *top = new TQVBoxLayout(this, 0, KDialog::spacingHint());
- tabwidget = new QTabWidget(this);
+ tabwidget = new TQTabWidget(this);
top->addWidget(tabwidget);
tab1 = new KMouseDlg(this);
- QButtonGroup *group = new QButtonGroup( tab1 );
+ TQButtonGroup *group = new TQButtonGroup( tab1 );
group->setExclusive( true );
group->hide();
group->insert( tab1->singleClick );
@@ -100,8 +100,8 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
tabwidget->addTab(tab1, i18n("&General"));
- connect(tab1->handedBox, SIGNAL(clicked(int)), this, SLOT(changed()));
- connect(tab1->handedBox, SIGNAL(clicked(int)), this, SLOT(slotHandedChanged(int)));
+ connect(tab1->handedBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed()));
+ connect(tab1->handedBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotHandedChanged(int)));
wtstr = i18n("If you are left-handed, you may prefer to swap the"
" functions of the left and right buttons on your pointing device"
@@ -109,9 +109,9 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
" has more than two buttons, only those that function as the"
" left and right buttons are affected. For example, if you have"
" a three-button mouse, the middle button is unaffected.");
- QWhatsThis::add( tab1->handedBox, wtstr );
+ TQWhatsThis::add( tab1->handedBox, wtstr );
- connect(tab1->doubleClick, SIGNAL(clicked()), SLOT(changed()));
+ connect(tab1->doubleClick, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
wtstr = i18n("The default behavior in KDE is to select and activate"
" icons with a single click of the left button on your pointing"
@@ -119,44 +119,44 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
" when you click links in most web browsers. If you would prefer"
" to select with a single click, and activate with a double click,"
" check this option.");
- QWhatsThis::add( tab1->doubleClick, wtstr );
+ TQWhatsThis::add( tab1->doubleClick, wtstr );
wtstr = i18n("Activates and opens a file or folder with a single click.");
- QWhatsThis::add( tab1->singleClick, wtstr );
+ TQWhatsThis::add( tab1->singleClick, wtstr );
- connect(tab1->cbAutoSelect, SIGNAL(clicked()), this, SLOT(changed()));
+ connect(tab1->cbAutoSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
wtstr = i18n("If you check this option, pausing the mouse pointer"
" over an icon on the screen will automatically select that icon."
" This may be useful when single clicks activate icons, and you"
" want only to select the icon without activating it.");
- QWhatsThis::add( tab1->cbAutoSelect, wtstr );
+ TQWhatsThis::add( tab1->cbAutoSelect, wtstr );
-// slAutoSelect = new QSlider(0, 2000, 10, 0, QSlider::Horizontal, tab1);
+// slAutoSelect = new TQSlider(0, 2000, 10, 0, TQSlider::Horizontal, tab1);
tab1->slAutoSelect->setSteps( 125, 125 );
- tab1->slAutoSelect->setTickmarks( QSlider::Below );
+ tab1->slAutoSelect->setTickmarks( TQSlider::Below );
tab1->slAutoSelect->setTickInterval( 250 );
tab1->slAutoSelect->setTracking( true );
wtstr = i18n("If you have checked the option to automatically select"
" icons, this slider allows you to select how long the mouse pointer"
" must be paused over the icon before it is selected.");
- QWhatsThis::add( tab1->slAutoSelect, wtstr );
+ TQWhatsThis::add( tab1->slAutoSelect, wtstr );
wtstr = i18n("Show feedback when clicking an icon");
- QWhatsThis::add( tab1->cbVisualActivate, wtstr );
+ TQWhatsThis::add( tab1->cbVisualActivate, wtstr );
- connect(tab1->slAutoSelect, SIGNAL(valueChanged(int)), this, SLOT(changed()));
- connect(tab1->cbVisualActivate, SIGNAL(clicked()), this, SLOT(changed()));
+ connect(tab1->slAutoSelect, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+ connect(tab1->cbVisualActivate, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
- connect(tab1->cb_pointershape, SIGNAL(clicked()), this, SLOT(changed()));
+ connect(tab1->cb_pointershape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
- connect(tab1->singleClick, SIGNAL(clicked()), this, SLOT(changed()));
- connect(tab1->singleClick, SIGNAL(clicked()), this, SLOT(slotClick()));
+ connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClick()));
- connect( tab1->doubleClick, SIGNAL( clicked() ), this, SLOT( slotClick() ) );
- connect( tab1->cbAutoSelect, SIGNAL( clicked() ), this, SLOT( slotClick() ) );
+ connect( tab1->doubleClick, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClick() ) );
+ connect( tab1->cbAutoSelect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClick() ) );
// Only allow setting reversing scroll polarity if we have scroll buttons
unsigned char map[20];
@@ -170,26 +170,26 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
tab1->cbScrollPolarity->setEnabled( false );
tab1->cbScrollPolarity->hide();
}
- connect(tab1->cbScrollPolarity, SIGNAL(clicked()), this, SLOT(changed()));
- connect(tab1->cbScrollPolarity, SIGNAL(clicked()), this, SLOT(slotScrollPolarityChanged()));
+ connect(tab1->cbScrollPolarity, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(tab1->cbScrollPolarity, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotScrollPolarityChanged()));
// Cursor theme tab
themetab = new ThemePage(this);
- connect(themetab, SIGNAL(changed(bool)), SLOT(changed()));
+ connect(themetab, TQT_SIGNAL(changed(bool)), TQT_SLOT(changed()));
tabwidget->addTab(themetab, i18n("&Cursor Theme"));
// Advanced tab
- tab2 = new QWidget(0, "Advanced Tab");
+ tab2 = new TQWidget(0, "Advanced Tab");
tabwidget->addTab(tab2, i18n("Advanced"));
- QBoxLayout *lay = new QVBoxLayout(tab2, KDialog::marginHint(),
+ TQBoxLayout *lay = new TQVBoxLayout(tab2, KDialog::marginHint(),
KDialog::spacingHint());
accel = new KDoubleNumInput(1, 20, 2, 0.1, 1, tab2);
accel->setLabel(i18n("Pointer acceleration:"));
accel->setSuffix("x");
lay->addWidget(accel);
- connect(accel, SIGNAL(valueChanged(double)), this, SLOT(changed()));
+ connect(accel, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(changed()));
wtstr = i18n("This option allows you to change the relationship"
" between the distance that the mouse pointer moves on the"
@@ -201,15 +201,15 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
" you only make a small movement with the physical device."
" Selecting very high values may result in the mouse pointer"
" flying across the screen, making it hard to control.");
- QWhatsThis::add( accel, wtstr );
+ TQWhatsThis::add( accel, wtstr );
thresh = new KIntNumInput(accel, 20, tab2);
thresh->setLabel(i18n("Pointer threshold:"));
thresh->setRange(0,20,1);
thresh->setSteps(1,1);
lay->addWidget(thresh);
- connect(thresh, SIGNAL(valueChanged(int)), this, SLOT(changed()));
- connect(thresh, SIGNAL(valueChanged(int)), this, SLOT(slotThreshChanged(int)));
+ connect(thresh, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+ connect(thresh, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotThreshChanged(int)));
slotThreshChanged(thresh->value());
wtstr = i18n("The threshold is the smallest distance that the"
@@ -221,7 +221,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
" of control over the mouse pointer. With larger movements of"
" the physical device, you can move the mouse pointer"
" rapidly to different areas on the screen.");
- QWhatsThis::add( thresh, wtstr );
+ TQWhatsThis::add( thresh, wtstr );
// It would be nice if the user had a test field.
// Selecting such values in milliseconds is not intuitive
@@ -231,7 +231,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
doubleClickInterval->setSuffix(i18n(" msec"));
doubleClickInterval->setSteps(100, 100);
lay->addWidget(doubleClickInterval);
- connect(doubleClickInterval, SIGNAL(valueChanged(int)), this, SLOT(changed()));
+ connect(doubleClickInterval, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
wtstr = i18n("The double click interval is the maximal time"
" (in milliseconds) between two mouse clicks which"
@@ -239,7 +239,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
" click happens later than this time interval after"
" the first click, they are recognized as two"
" separate clicks.");
- QWhatsThis::add( doubleClickInterval, wtstr );
+ TQWhatsThis::add( doubleClickInterval, wtstr );
lay->addSpacing(15);
@@ -249,54 +249,54 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
dragStartTime->setSuffix(i18n(" msec"));
dragStartTime->setSteps(100, 100);
lay->addWidget(dragStartTime);
- connect(dragStartTime, SIGNAL(valueChanged(int)), this, SLOT(changed()));
+ connect(dragStartTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
wtstr = i18n("If you click with the mouse (e.g. in a multi-line"
" editor) and begin to move the mouse within the"
" drag start time, a drag operation will be initiated.");
- QWhatsThis::add( dragStartTime, wtstr );
+ TQWhatsThis::add( dragStartTime, wtstr );
dragStartDist = new KIntNumInput(dragStartTime, 20, tab2);
dragStartDist->setLabel(i18n("Drag start distance:"));
dragStartDist->setRange(1, 20, 1);
dragStartDist->setSteps(1,1);
lay->addWidget(dragStartDist);
- connect(dragStartDist, SIGNAL(valueChanged(int)), this, SLOT(changed()));
- connect(dragStartDist, SIGNAL(valueChanged(int)), this, SLOT(slotDragStartDistChanged(int)));
+ connect(dragStartDist, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+ connect(dragStartDist, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDragStartDistChanged(int)));
slotDragStartDistChanged(dragStartDist->value());
wtstr = i18n("If you click with the mouse and begin to move the"
" mouse at least the drag start distance, a drag"
" operation will be initiated.");
- QWhatsThis::add( dragStartDist, wtstr);
+ TQWhatsThis::add( dragStartDist, wtstr);
wheelScrollLines = new KIntNumInput(dragStartDist, 3, tab2);
wheelScrollLines->setLabel(i18n("Mouse wheel scrolls by:"));
wheelScrollLines->setRange(1, 12, 1);
wheelScrollLines->setSteps(1,1);
lay->addWidget(wheelScrollLines);
- connect(wheelScrollLines, SIGNAL(valueChanged(int)), this, SLOT(changed()));
- connect(wheelScrollLines, SIGNAL(valueChanged(int)), SLOT(slotWheelScrollLinesChanged(int)));
+ connect(wheelScrollLines, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+ connect(wheelScrollLines, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWheelScrollLinesChanged(int)));
slotWheelScrollLinesChanged(wheelScrollLines->value());
wtstr = i18n("If you use the wheel of a mouse, this value determines the number of lines to scroll for each wheel movement. Note that if this number exceeds the number of visible lines, it will be ignored and the wheel movement will be handled as a page up/down movement.");
- QWhatsThis::add( wheelScrollLines, wtstr);
+ TQWhatsThis::add( wheelScrollLines, wtstr);
lay->addStretch();
{
- QWidget *mouse = new QWidget(this, "Mouse Navigation");
+ TQWidget *mouse = new TQWidget(this, "Mouse Navigation");
tabwidget->addTab(mouse, i18n("Mouse Navigation"));
- QBoxLayout *vbox = new QVBoxLayout(mouse, KDialog::marginHint(),
+ TQBoxLayout *vbox = new TQVBoxLayout(mouse, KDialog::marginHint(),
KDialog::spacingHint());
- QVBoxLayout *vvbox = new QVBoxLayout(mouse->layout(), KDialog::spacingHint());
+ TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->layout(), KDialog::spacingHint());
- mouseKeys = new QCheckBox(i18n("&Move pointer with keyboard (using the num pad)"), mouse);
+ mouseKeys = new TQCheckBox(i18n("&Move pointer with keyboard (using the num pad)"), mouse);
vvbox->addWidget(mouseKeys);
- QBoxLayout *hbox = new QHBoxLayout(vvbox, KDialog::spacingHint());
+ TQBoxLayout *hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
hbox->addSpacing(24);
mk_delay = new KIntNumInput(mouse);
mk_delay->setLabel(i18n("&Acceleration delay:"), AlignVCenter);
@@ -304,7 +304,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
mk_delay->setRange(1, 1000, 50);
hbox->addWidget(mk_delay);
- hbox = new QHBoxLayout(vvbox, KDialog::spacingHint());
+ hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
hbox->addSpacing(24);
mk_interval = new KIntNumInput(mk_delay, 0, mouse);
mk_interval->setLabel(i18n("R&epeat interval:"), AlignVCenter);
@@ -312,7 +312,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
mk_interval->setRange(1, 1000, 10);
hbox->addWidget(mk_interval);
- hbox = new QHBoxLayout(vvbox, KDialog::spacingHint());
+ hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
hbox->addSpacing(24);
mk_time_to_max = new KIntNumInput(mk_interval, 0, mouse);
mk_time_to_max->setLabel(i18n("Acceleration &time:"), AlignVCenter);
@@ -320,7 +320,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
mk_time_to_max->setSuffix(i18n(" msec"));
hbox->addWidget(mk_time_to_max);
- hbox = new QHBoxLayout(vvbox, KDialog::spacingHint());
+ hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
hbox->addSpacing(24);
mk_max_speed = new KIntNumInput(mk_time_to_max, 0, mouse);
mk_max_speed->setLabel(i18n("Ma&ximum speed:"), AlignVCenter);
@@ -328,20 +328,20 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
mk_max_speed->setSuffix(i18n(" pixel/sec"));
hbox->addWidget(mk_max_speed);
- hbox = new QHBoxLayout(vvbox, KDialog::spacingHint());
+ hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
hbox->addSpacing(24);
mk_curve = new KIntNumInput(mk_max_speed, 0, mouse);
mk_curve->setLabel(i18n("Acceleration &profile:"), AlignVCenter);
mk_curve->setRange(-1000, 1000, 100);
hbox->addWidget(mk_curve);
- connect(mouseKeys, SIGNAL(clicked()), this, SLOT(checkAccess()));
- connect(mouseKeys, SIGNAL(clicked()), this, SLOT(changed()));
- connect(mk_delay, SIGNAL(valueChanged(int)), this, SLOT(changed()));
- connect(mk_interval, SIGNAL(valueChanged(int)), this, SLOT(changed()));
- connect(mk_time_to_max, SIGNAL(valueChanged(int)), this, SLOT(changed()));
- connect(mk_max_speed, SIGNAL(valueChanged(int)), this, SLOT(changed()));
- connect(mk_curve, SIGNAL(valueChanged(int)), this, SLOT(changed()));
+ connect(mouseKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
+ connect(mouseKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(mk_delay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+ connect(mk_interval, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+ connect(mk_time_to_max, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+ connect(mk_max_speed, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+ connect(mk_curve, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
vbox->addStretch();
}
@@ -355,8 +355,8 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
struct device_table {
int idVendor;
int idProduct;
- QString Model;
- QString Name;
+ TQString Model;
+ TQString Name;
int flags;
} device_table[] = {
{ VENDOR_LOGITECH, 0xC00E, "M-BJ58", "Wheel Mouse Optical", HAS_RES },
@@ -377,7 +377,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
{ VENDOR_LOGITECH, 0xC50E, "M-RAG97", "MX1000 Laser Mouse", HAS_SS | HAS_CSR },
{ VENDOR_LOGITECH, 0xC512, "M-RAK89B", "Cordless Desktop Pro LX700", HAS_CSR | USE_CH2 },
{ VENDOR_LOGITECH, 0xC702, "C-UF15", "Receiver for Cordless Presenter", HAS_CSR },
- { 0, 0, QString(), QString(), 0 }
+ { 0, 0, TQString(), TQString(), 0 }
};
usb_init();
@@ -395,7 +395,7 @@ MouseConfig::MouseConfig (QWidget * parent, const char *name)
// OK, we have a device that appears to be one of the ones we support
LogitechMouse *mouse = new LogitechMouse( dev, device_table[n].flags, this, device_table[n].Name.latin1() );
settings->logitechMouseList.append(mouse);
- tabwidget->addTab( (QWidget*)mouse, device_table[n].Name );
+ tabwidget->addTab( (TQWidget*)mouse, device_table[n].Name );
}
}
}
@@ -682,7 +682,7 @@ void MouseSettings::load(KConfig *config)
else
thresholdMove = t;
- QString key = config->readEntry("MouseButtonMapping");
+ TQString key = config->readEntry("MouseButtonMapping");
if (key == "RightHanded")
handed = RIGHT_HANDED;
else if (key == "LeftHanded")
@@ -805,9 +805,9 @@ void MouseSettings::save(KConfig *config)
config->writeEntry("Acceleration",accelRate);
config->writeEntry("Threshold",thresholdMove);
if (handed == RIGHT_HANDED)
- config->writeEntry("MouseButtonMapping",QString("RightHanded"));
+ config->writeEntry("MouseButtonMapping",TQString("RightHanded"));
else
- config->writeEntry("MouseButtonMapping",QString("LeftHanded"));
+ config->writeEntry("MouseButtonMapping",TQString("LeftHanded"));
config->writeEntry( "ReverseScrollPolarity", reverseScrollPolarity );
config->setGroup("KDE");
diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h
index 005c7a2fc..749351f19 100644
--- a/kcontrol/input/mouse.h
+++ b/kcontrol/input/mouse.h
@@ -31,12 +31,12 @@
#ifndef __MOUSECONFIG_H__
#define __MOUSECONFIG_H__
-#include <qbuttongroup.h>
-#include <qdialog.h>
-#include <qlabel.h>
-#include <qlcdnumber.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
+#include <tqbuttongroup.h>
+#include <tqdialog.h>
+#include <tqlabel.h>
+#include <tqlcdnumber.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
#include <kapplication.h>
@@ -85,7 +85,7 @@ public:
#ifdef HAVE_LIBUSB
// TODO: In Qt4, replace with a better container.
- QPtrList <LogitechMouse> logitechMouseList;
+ TQPtrList <LogitechMouse> logitechMouseList;
#endif
};
@@ -93,7 +93,7 @@ class MouseConfig : public KCModule
{
Q_OBJECT
public:
- MouseConfig(QWidget *parent=0, const char* name=0);
+ MouseConfig(TQWidget *parent=0, const char* name=0);
~MouseConfig();
void save();
@@ -129,23 +129,23 @@ private:
KIntNumInput *dragStartDist;
KIntNumInput *wheelScrollLines;
- QButtonGroup *handedBox;
-// QRadioButton *leftHanded, *rightHanded;
-// QCheckBox *doubleClick;
-// QCheckBox *cbAutoSelect;
- QLabel *lDelay;
-// QSlider *slAutoSelect;
-// QCheckBox *cbVisualActivate;
-// QCheckBox *cbCursor;
-// QCheckBox *cbLargeCursor;
-
- QTabWidget *tabwidget;
- QWidget *tab2;
+ TQButtonGroup *handedBox;
+// TQRadioButton *leftHanded, *rightHanded;
+// TQCheckBox *doubleClick;
+// TQCheckBox *cbAutoSelect;
+ TQLabel *lDelay;
+// TQSlider *slAutoSelect;
+// TQCheckBox *cbVisualActivate;
+// TQCheckBox *cbCursor;
+// TQCheckBox *cbLargeCursor;
+
+ TQTabWidget *tabwidget;
+ TQWidget *tab2;
KMouseDlg* tab1;
ThemePage* themetab;
MouseSettings *settings;
- QCheckBox *mouseKeys;
+ TQCheckBox *mouseKeys;
KIntNumInput *mk_delay, *mk_interval, *mk_time_to_max, *mk_max_speed,
*mk_curve;
diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp
index 36108ef36..ceb399648 100644
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@@ -18,11 +18,11 @@
#include <kglobal.h>
-#include <qwidget.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qstring.h>
-#include <qcursor.h>
+#include <tqwidget.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqstring.h>
+#include <tqcursor.h>
#include <kglobal.h>
@@ -91,7 +91,7 @@ class PreviewCursor
PreviewCursor();
~PreviewCursor();
- void load( const QString &, const QString & );
+ void load( const TQString &, const TQString & );
const Picture picture() const { return m_pict; }
const Cursor handle() const { return m_handle; }
const int width() const { return m_width; }
@@ -113,9 +113,9 @@ PreviewCursor::PreviewCursor() :
}
-void PreviewCursor::load( const QString &name, const QString &theme )
+void PreviewCursor::load( const TQString &name, const TQString &theme )
{
- Display *dpy = QPaintDevice::x11AppDisplay();
+ Display *dpy = TQPaintDevice::x11AppDisplay();
if ( m_pict ) XRenderFreePicture( dpy, m_pict );
if ( m_handle ) XFreeCursor( dpy, m_handle );
@@ -176,14 +176,14 @@ void PreviewCursor::load( const QString &name, const QString &theme )
PreviewCursor::~PreviewCursor()
{
- if ( m_handle ) XFreeCursor( QPaintDevice::x11AppDisplay(), m_handle );
- if ( m_pict ) XRenderFreePicture( QPaintDevice::x11AppDisplay(), m_pict );
+ if ( m_handle ) XFreeCursor( TQPaintDevice::x11AppDisplay(), m_handle );
+ if ( m_pict ) XRenderFreePicture( TQPaintDevice::x11AppDisplay(), m_pict );
}
Picture PreviewCursor::createPicture( const XcursorImage* image ) const
{
- Display *dpy = QPaintDevice::x11AppDisplay();
+ Display *dpy = TQPaintDevice::x11AppDisplay();
XImage ximage;
ximage.width = image->width;
@@ -221,7 +221,7 @@ Picture PreviewCursor::createPicture( const XcursorImage* image ) const
void PreviewCursor::cropCursorImage( XcursorImage *&image ) const
{
// Calculate the auto-crop rectangle
- QRect r( QPoint( image->width, image->height ), QPoint() );
+ TQRect r( TQPoint( image->width, image->height ), TQPoint() );
XcursorPixel *pixels = image->pixels;
for ( int y = 0; y < int(image->height); y++ ) {
for ( int x = 0; x < int(image->width); x++ ) {
@@ -262,8 +262,8 @@ void PreviewCursor::cropCursorImage( XcursorImage *&image ) const
-PreviewWidget::PreviewWidget( QWidget *parent, const char *name )
- : QWidget( parent, name )
+PreviewWidget::PreviewWidget( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
cursors = new PreviewCursor* [ numCursors ];
for ( int i = 0; i < numCursors; i++ )
@@ -284,7 +284,7 @@ PreviewWidget::~PreviewWidget()
}
-void PreviewWidget::setTheme( const QString &theme )
+void PreviewWidget::setTheme( const TQString &theme )
{
setUpdatesEnabled( false );
@@ -307,11 +307,11 @@ void PreviewWidget::setTheme( const QString &theme )
}
-void PreviewWidget::paintEvent( QPaintEvent * )
+void PreviewWidget::paintEvent( TQPaintEvent * )
{
- QPixmap buffer( size() );
- QPainter p( &buffer );
- p.fillRect( rect(), colorGroup().brush( QColorGroup::Background ) );
+ TQPixmap buffer( size() );
+ TQPainter p( &buffer );
+ p.fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
Picture dest;
if ( !qt_has_xft || !qt_use_xrender ) {
@@ -339,7 +339,7 @@ void PreviewWidget::paintEvent( QPaintEvent * )
}
-void PreviewWidget::mouseMoveEvent( QMouseEvent *e )
+void PreviewWidget::mouseMoveEvent( TQMouseEvent *e )
{
int pos = e->x() / ( width() / numCursors );
diff --git a/kcontrol/input/xcursor/previewwidget.h b/kcontrol/input/xcursor/previewwidget.h
index 1c1d12c0f..a3db01d88 100644
--- a/kcontrol/input/xcursor/previewwidget.h
+++ b/kcontrol/input/xcursor/previewwidget.h
@@ -27,13 +27,13 @@ class PreviewCursor;
class PreviewWidget : public QWidget
{
public:
- PreviewWidget( QWidget *parent = NULL, const char *name = NULL );
+ PreviewWidget( TQWidget *parent = NULL, const char *name = NULL );
~PreviewWidget();
- void setTheme( const QString & );
+ void setTheme( const TQString & );
- void paintEvent( QPaintEvent * );
- void mouseMoveEvent( QMouseEvent * );
+ void paintEvent( TQPaintEvent * );
+ void mouseMoveEvent( TQMouseEvent * );
private:
PreviewCursor **cursors;
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index 96e3e6871..4fb8b8a69 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -33,15 +33,15 @@
#include <kio/netaccess.h>
#include <ktar.h>
-#include <qlayout.h>
-#include <qdir.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qlabel.h>
-#include <qhbox.h>
-#include <qpainter.h>
-#include <qfileinfo.h>
-#include <qpushbutton.h>
+#include <tqlayout.h>
+#include <tqdir.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
+#include <tqlabel.h>
+#include <tqhbox.h>
+#include <tqpainter.h>
+#include <tqfileinfo.h>
+#include <tqpushbutton.h>
#include <cstdlib> // for getenv()
@@ -68,23 +68,23 @@ namespace {
}
struct ThemeInfo {
- QString path; // Path to the cursor theme
+ TQString path; // Path to the cursor theme
bool writable; // Theme directory is writable
};
-ThemePage::ThemePage( QWidget* parent, const char* name )
- : QWidget( parent, name ), selectedTheme( NULL ), currentTheme( NULL )
+ThemePage::ThemePage( TQWidget* parent, const char* name )
+ : TQWidget( parent, name ), selectedTheme( NULL ), currentTheme( NULL )
{
- QBoxLayout *layout = new QVBoxLayout( this );
+ TQBoxLayout *layout = new TQVBoxLayout( this );
layout->setAutoAdd( true );
layout->setMargin( KDialog::marginHint() );
layout->setSpacing( KDialog::spacingHint() );
- new QLabel( i18n("Select the cursor theme you want to use (hover preview to test cursor):"), this );
+ new TQLabel( i18n("Select the cursor theme you want to use (hover preview to test cursor):"), this );
// Create the preview widget
- preview = new PreviewWidget( new QHBox( this ) );
+ preview = new PreviewWidget( new TQHBox( this ) );
// Create the theme list view
listview = new KListView( this );
@@ -93,26 +93,26 @@ ThemePage::ThemePage( QWidget* parent, const char* name )
listview->addColumn( i18n("Name") );
listview->addColumn( i18n("Description") );
- connect( listview, SIGNAL(selectionChanged(QListViewItem*)),
- SLOT(selectionChanged(QListViewItem*)) );
+ connect( listview, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
+ TQT_SLOT(selectionChanged(TQListViewItem*)) );
themeDirs = getThemeBaseDirs();
insertThemes();
- QHBox *hbox = new QHBox( this );
+ TQHBox *hbox = new TQHBox( this );
hbox->setSpacing( KDialog::spacingHint() );
- installButton = new QPushButton( i18n("Install New Theme..."), hbox );
- removeButton = new QPushButton( i18n("Remove Theme"), hbox );
+ installButton = new TQPushButton( i18n("Install New Theme..."), hbox );
+ removeButton = new TQPushButton( i18n("Remove Theme"), hbox );
- connect( installButton, SIGNAL( clicked() ), SLOT( installClicked() ) );
- connect( removeButton, SIGNAL( clicked() ), SLOT( removeClicked() ) );
+ connect( installButton, TQT_SIGNAL( clicked() ), TQT_SLOT( installClicked() ) );
+ connect( removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeClicked() ) );
// Disable the install button if ~/.icons isn't writable
- QString path = QDir::homeDirPath() + "/.icons";
- QFileInfo icons = QFileInfo( path );
+ TQString path = TQDir::homeDirPath() + "/.icons";
+ TQFileInfo icons = TQFileInfo( path );
if ( ( icons.exists() && !icons.isWritable() ) ||
- ( !icons.exists() && !QFileInfo( QDir::homeDirPath() ).isWritable() ) )
+ ( !icons.exists() && !TQFileInfo( TQDir::homeDirPath() ).isWritable() ) )
installButton->setEnabled( false );
if ( !themeDirs.contains( path ) )
@@ -134,7 +134,7 @@ void ThemePage::save()
KConfig c( "kcminputrc" );
c.setGroup( "Mouse" );
- c.writeEntry( "cursorTheme", selectedTheme != "system" ? selectedTheme : QString::null );
+ c.writeEntry( "cursorTheme", selectedTheme != "system" ? selectedTheme : TQString::null );
KMessageBox::information( this, i18n("You have to restart KDE for these "
"changes to take effect."), i18n("Cursor Settings Changed"),
@@ -163,7 +163,7 @@ void ThemePage::load( bool useDefaults )
currentTheme = "system";
// Find the theme in the listview and select it
- QListViewItem *item = listview->findItem( currentTheme, DirColumn );
+ TQListViewItem *item = listview->findItem( currentTheme, DirColumn );
if( !item )
item = listview->findItem( "system", DirColumn );
selectedTheme = item->text( DirColumn );
@@ -186,7 +186,7 @@ void ThemePage::defaults()
}
-void ThemePage::selectionChanged( QListViewItem *item )
+void ThemePage::selectionChanged( TQListViewItem *item )
{
if ( !item )
{
@@ -209,13 +209,13 @@ void ThemePage::selectionChanged( QListViewItem *item )
void ThemePage::installClicked()
{
// Get the URL for the theme we're going to install
- KURL url = KURLRequesterDlg::getURL( QString::null, this, i18n( "Drag or Type Theme URL" ) );
+ KURL url = KURLRequesterDlg::getURL( TQString::null, this, i18n( "Drag or Type Theme URL" ) );
if ( url.isEmpty() )
return;
- QString tmpFile;
+ TQString tmpFile;
if ( !KIO::NetAccess::download( url, tmpFile, this ) ) {
- QString text;
+ TQString text;
if ( url.isLocalFile() )
text = i18n( "Unable to find the cursor theme archive %1." );
@@ -237,7 +237,7 @@ void ThemePage::installClicked()
void ThemePage::removeClicked()
{
- QString question = i18n( "<qt>Are you sure you want to remove the "
+ TQString question = i18n( "<qt>Are you sure you want to remove the "
"<strong>%1</strong> cursor theme?<br>"
"This will delete all the files installed by this theme.</qt>")
.arg( listview->currentItem()->text( NameColumn ) );
@@ -266,7 +266,7 @@ void ThemePage::removeClicked()
}
-bool ThemePage::installThemes( const QString &file )
+bool ThemePage::installThemes( const TQString &file )
{
KTar archive( file );
@@ -274,10 +274,10 @@ bool ThemePage::installThemes( const QString &file )
return false;
const KArchiveDirectory *archiveDir = archive.directory();
- QStringList themeDirs;
+ TQStringList themeDirs;
- const QStringList entries = archiveDir->entries();
- for ( QStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it )
+ const TQStringList entries = archiveDir->entries();
+ for ( TQStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it )
{
const KArchiveEntry *entry = archiveDir->entry( *it );
if ( entry->isDirectory() && entry->name().lower() != "default" ) {
@@ -290,14 +290,14 @@ bool ThemePage::installThemes( const QString &file )
if ( themeDirs.count() < 1 )
return false;
- const QString destDir = QDir::homeDirPath() + "/.icons/";
+ const TQString destDir = TQDir::homeDirPath() + "/.icons/";
KStandardDirs::makeDir( destDir ); // Make sure the directory exists
- for ( QStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it )
+ for ( TQStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it )
{
// Check if a theme with that name already exists
- if ( QDir( destDir ).exists( *it ) ) {
- const QString question = i18n( "A theme named %1 already exists in your icon "
+ if ( TQDir( destDir ).exists( *it ) ) {
+ const TQString question = i18n( "A theme named %1 already exists in your icon "
"theme folder. Do you want replace it with this one?" ).arg( *it );
int answer = KMessageBox::warningContinueCancel( this, question, i18n( "Overwrite Theme?"), i18n("Replace") );
if ( answer != KMessageBox::Continue )
@@ -314,7 +314,7 @@ bool ThemePage::installThemes( const QString &file )
// result in strange side effects (from the average users point of view). OTOH
// a user might want to do this 'upgrade' a global theme.
- const QString dest = destDir + *it;
+ const TQString dest = destDir + *it;
const KArchiveDirectory *dir = static_cast< const KArchiveDirectory* >( archiveDir->entry( *it ) );
dir->copyTo( dest );
insertTheme( dest );
@@ -327,14 +327,14 @@ bool ThemePage::installThemes( const QString &file )
}
-void ThemePage::insertTheme( const QString &path )
+void ThemePage::insertTheme( const TQString &path )
{
- QString dirName = QDir( path ).dirName();
+ TQString dirName = TQDir( path ).dirName();
// Defaults in case there's no name or comment field.
- QString name = dirName;
- QString desc = i18n( "No description available" );
- QString sample = "left_ptr";
+ TQString name = dirName;
+ TQString desc = i18n( "No description available" );
+ TQString sample = "left_ptr";
KSimpleConfig c( path + "/index.theme", true ); // Open read-only
c.setGroup( "Icon Theme" );
@@ -373,11 +373,11 @@ void ThemePage::insertTheme( const QString &path )
}
-const QStringList ThemePage::getThemeBaseDirs() const
+const TQStringList ThemePage::getThemeBaseDirs() const
{
#if XCURSOR_LIB_MAJOR == 1 && XCURSOR_LIB_MINOR < 1
// These are the default paths Xcursor will scan for cursor themes
- QString path( "~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons" );
+ TQString path( "~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons" );
// If XCURSOR_PATH is set, use that instead of the default path
char *xcursorPath = std::getenv( "XCURSOR_PATH" );
@@ -385,35 +385,35 @@ const QStringList ThemePage::getThemeBaseDirs() const
path = xcursorPath;
#else
// Get the search patch from Xcursor
- QString path = XcursorLibraryPath();
+ TQString path = XcursorLibraryPath();
#endif
// Expand all occurences of ~ to the home dir
- path.replace( "~/", QDir::homeDirPath() + '/' );
- return QStringList::split( ':', path );
+ path.replace( "~/", TQDir::homeDirPath() + '/' );
+ return TQStringList::split( ':', path );
}
-bool ThemePage::isCursorTheme( const QString &theme, const int depth ) const
+bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const
{
// Prevent infinate recursion
if ( depth > 10 )
return false;
// Search each icon theme directory for 'theme'
- for ( QStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it )
+ for ( TQStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it )
{
- QDir dir( *it );
+ TQDir dir( *it );
if ( !dir.exists() )
continue;
- const QStringList subdirs( dir.entryList( QDir::Dirs ) );
+ const TQStringList subdirs( dir.entryList( TQDir::Dirs ) );
if ( subdirs.contains( theme ) )
{
- const QString path = *it + '/' + theme;
- const QString indexfile = path + "/index.theme";
+ const TQString path = *it + '/' + theme;
+ const TQString indexfile = path + "/index.theme";
const bool haveIndexFile = dir.exists( indexfile );
const bool haveCursors = dir.exists( path + "/cursors" );
- QStringList inherit;
+ TQStringList inherit;
// Return true if we have a cursors subdirectory
if ( haveCursors )
@@ -428,7 +428,7 @@ bool ThemePage::isCursorTheme( const QString &theme, const int depth ) const
}
// Recurse through the list of inherited themes
- for ( QStringList::ConstIterator it2 = inherit.begin(); it2 != inherit.end(); ++it2 )
+ for ( TQStringList::ConstIterator it2 = inherit.begin(); it2 != inherit.end(); ++it2 )
{
if ( *it2 == theme ) // Avoid possible DoS
continue;
@@ -448,17 +448,17 @@ void ThemePage::insertThemes()
// Scan each base dir for cursor themes and add them to the listview.
// An icon theme is considered to be a cursor theme if it contains
// a cursors subdirectory or if it inherits a cursor theme.
- for ( QStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it )
+ for ( TQStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it )
{
- QDir dir( *it );
+ TQDir dir( *it );
if ( !dir.exists() )
continue;
- QStringList subdirs( dir.entryList( QDir::Dirs ) );
+ TQStringList subdirs( dir.entryList( TQDir::Dirs ) );
subdirs.remove( "." );
subdirs.remove( ".." );
- for ( QStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it )
+ for ( TQStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it )
{
// Only add the theme if we don't already have a theme with that name
// in the list. Xcursor will use the first theme it finds in that
@@ -467,8 +467,8 @@ void ThemePage::insertThemes()
if ( listview->findItem( *it, DirColumn ) )
continue;
- const QString path = dir.path() + '/' + *it;
- const QString indexfile = path + "/index.theme";
+ const TQString path = dir.path() + '/' + *it;
+ const TQString indexfile = path + "/index.theme";
const bool haveIndexFile = dir.exists( *it + "/index.theme" );
const bool haveCursors = dir.exists( *it + "/cursors" );
@@ -479,9 +479,9 @@ void ThemePage::insertThemes()
// Defaults in case there's no index.theme file or it lacks
// a name and a comment field.
- QString name = *it;
- QString desc = i18n( "No description available" );
- QString sample = "left_ptr";
+ TQString name = *it;
+ TQString desc = i18n( "No description available" );
+ TQString sample = "left_ptr";
// Parse the index.theme file if the theme has one.
if ( haveIndexFile )
@@ -498,8 +498,8 @@ void ThemePage::insertThemes()
if ( !haveCursors )
{
bool result = false;
- QStringList inherit = c.readListEntry( "Inherits" );
- for ( QStringList::ConstIterator it2 = inherit.begin(); it2 != inherit.end(); ++it2 )
+ TQStringList inherit = c.readListEntry( "Inherits" );
+ for ( TQStringList::ConstIterator it2 = inherit.begin(); it2 != inherit.end(); ++it2 )
if ( result = isCursorTheme( *it2 ) )
break;
@@ -518,7 +518,7 @@ void ThemePage::insertThemes()
// Create a ThemeInfo object, and fill in the members
ThemeInfo *info = new ThemeInfo;
info->path = path;
- info->writable = QFileInfo( path ).isWritable();
+ info->writable = TQFileInfo( path ).isWritable();
themeInfo.insert( *it, info );
// Create the listview item and insert it into the list.
@@ -542,10 +542,10 @@ void ThemePage::insertThemes()
}
-QPixmap ThemePage::createIcon( const QString &theme, const QString &sample ) const
+TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample ) const
{
XcursorImage *xcur;
- QPixmap pix;
+ TQPixmap pix;
xcur = XcursorLibraryLoadImage( sample.latin1(), theme.latin1(), iconSize );
if ( !xcur ) xcur = XcursorLibraryLoadImage( "left_ptr", theme.latin1(), iconSize );
@@ -553,7 +553,7 @@ QPixmap ThemePage::createIcon( const QString &theme, const QString &sample ) con
if ( xcur ) {
// Calculate an auto-crop rectangle for the cursor image
// (helps with cursors converted from windows .cur or .ani files)
- QRect r( QPoint( xcur->width, xcur->height ), QPoint() );
+ TQRect r( TQPoint( xcur->width, xcur->height ), TQPoint() );
XcursorPixel *src = xcur->pixels;
for ( int y = 0; y < int( xcur->height ); y++ ) {
@@ -574,7 +574,7 @@ QPixmap ThemePage::createIcon( const QString &theme, const QString &sample ) con
int size = kMax( iconSize, kMax( r.width(), r.height() ) );
// Create the intermediate QImage
- QImage image( size, size, 32 );
+ TQImage image( size, size, 32 );
image.setAlphaBuffer( true );
// Clear the image
@@ -583,13 +583,13 @@ QPixmap ThemePage::createIcon( const QString &theme, const QString &sample ) con
dst[i] = 0;
// Compute the source and destination offsets
- QPoint dstOffset( (image.width() - r.width()) / 2, (image.height() - r.height()) / 2 );
- QPoint srcOffset( r.topLeft() );
+ TQPoint dstOffset( (image.width() - r.width()) / 2, (image.height() - r.height()) / 2 );
+ TQPoint srcOffset( r.topLeft() );
dst = reinterpret_cast<Q_UINT32*>( image.scanLine(dstOffset.y()) ) + dstOffset.x();
src = reinterpret_cast<Q_UINT32*>( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x();
- // Copy the XcursorImage into the QImage, converting it from premultiplied
+ // Copy the XcursorImage into the TQImage, converting it from premultiplied
// to non-premultiplied alpha and cropping it if needed.
for ( int y = 0; y < r.height(); y++ )
{
@@ -614,13 +614,13 @@ QPixmap ThemePage::createIcon( const QString &theme, const QString &sample ) con
// Scale down the image if we need to
if ( image.width() > iconSize || image.height() > iconSize )
- image = image.smoothScale( iconSize, iconSize, QImage::ScaleMin );
+ image = image.smoothScale( iconSize, iconSize, TQImage::ScaleMin );
pix.convertFromImage( image );
XcursorImageDestroy( xcur );
} else {
- QImage image( iconSize, iconSize, 32 );
+ TQImage image( iconSize, iconSize, 32 );
image.setAlphaBuffer( true );
Q_UINT32 *data = reinterpret_cast< Q_UINT32* >( image.bits() );
diff --git a/kcontrol/input/xcursor/themepage.h b/kcontrol/input/xcursor/themepage.h
index 7d4dec675..95ee12fd9 100644
--- a/kcontrol/input/xcursor/themepage.h
+++ b/kcontrol/input/xcursor/themepage.h
@@ -19,7 +19,7 @@
#ifndef __THEMEPAGE_H
#define __THEMEPAGE_H
-#include <qdict.h>
+#include <tqdict.h>
class KListView;
@@ -37,7 +37,7 @@ class ThemePage : public QWidget
Q_OBJECT
public:
- ThemePage( QWidget* parent = 0, const char* name = 0 );
+ ThemePage( TQWidget* parent = 0, const char* name = 0 );
~ThemePage();
// Called by the KCM
@@ -50,25 +50,25 @@ class ThemePage : public QWidget
void changed( bool );
private slots:
- void selectionChanged( QListViewItem * );
+ void selectionChanged( TQListViewItem * );
void installClicked();
void removeClicked();
private:
- bool installThemes( const QString &file );
- void insertTheme( const QString & );
- const QStringList getThemeBaseDirs() const;
- bool isCursorTheme( const QString &theme, const int depth = 0 ) const;
+ bool installThemes( const TQString &file );
+ void insertTheme( const TQString & );
+ const TQStringList getThemeBaseDirs() const;
+ bool isCursorTheme( const TQString &theme, const int depth = 0 ) const;
void insertThemes();
- QPixmap createIcon( const QString &, const QString & ) const;
+ TQPixmap createIcon( const TQString &, const TQString & ) const;
KListView *listview;
PreviewWidget *preview;
- QPushButton *installButton, *removeButton;
- QString selectedTheme;
- QString currentTheme;
- QStringList themeDirs;
- QDict<ThemeInfo> themeInfo;
+ TQPushButton *installButton, *removeButton;
+ TQString selectedTheme;
+ TQString currentTheme;
+ TQStringList themeDirs;
+ TQDict<ThemeInfo> themeInfo;
};
#endif // __THEMEPAGE_H
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
index cb4cfdaea..e2014a1ca 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
@@ -22,15 +22,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qfile.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qtabwidget.h>
-#include <qtextcodec.h>
-#include <qvbox.h>
-#include <qwhatsthis.h>
+#include <tqfile.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqspinbox.h>
+#include <tqtabwidget.h>
+#include <tqtextcodec.h>
+#include <tqvbox.h>
+#include <tqwhatsthis.h>
#include <kconfig.h>
#include <kdebug.h>
@@ -45,22 +45,22 @@
#include "kcmioslaveinfo.h"
-typedef KGenericFactory<KCMIOSlaveInfo, QWidget> SlaveFactory;
+typedef KGenericFactory<KCMIOSlaveInfo, TQWidget> SlaveFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_ioslaveinfo, SlaveFactory("kcmioslaveinfo") )
-KCMIOSlaveInfo::KCMIOSlaveInfo(QWidget *parent, const char *name, const QStringList &)
+KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStringList &)
:KCModule(SlaveFactory::instance(), parent,name),m_ioslavesLb(0),m_tfj(0)
{
- QVBoxLayout *layout=new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
setQuickHelp( i18n("<h1>IO slaves</h1> Gives you an overview of the installed ioslaves."));
setButtons( KCModule::Help );
- QLabel* label=new QLabel(i18n("Available IO slaves:"),this);
- QHBox *hbox=new QHBox(this);
+ TQLabel* label=new TQLabel(i18n("Available IO slaves:"),this);
+ TQHBox *hbox=new TQHBox(this);
m_ioslavesLb=new KListBox(hbox);
m_ioslavesLb->setMinimumSize(fontMetrics().width("blahfaselwhatever----"),10);
- connect( m_ioslavesLb, SIGNAL( selectionChanged( QListBoxItem * ) ), SLOT( showInfo( QListBoxItem * ) ) );
+ connect( m_ioslavesLb, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), TQT_SLOT( showInfo( TQListBoxItem * ) ) );
//TODO make something useful after 2.1 is released
m_info=new KTextBrowser(hbox);
hbox->setSpacing(KDialog::spacingHint());
@@ -70,10 +70,10 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(QWidget *parent, const char *name, const QStringL
hbox->setStretchFactor(m_ioslavesLb,1);
hbox->setStretchFactor(m_info,5);
- QStringList protocols=KProtocolInfo::protocols();
- for (QStringList::Iterator it=protocols.begin(); it!=protocols.end(); ++it)
+ TQStringList protocols=KProtocolInfo::protocols();
+ for (TQStringList::Iterator it=protocols.begin(); it!=protocols.end(); ++it)
{
- QString proto = *it;
+ TQString proto = *it;
m_ioslavesLb->insertItem( SmallIcon( KProtocolInfo::icon( proto )),
proto );
};
@@ -94,13 +94,13 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(QWidget *parent, const char *name, const QStringL
}
-void KCMIOSlaveInfo::slaveHelp( KIO::Job *, const QByteArray &data)
+void KCMIOSlaveInfo::slaveHelp( KIO::Job *, const TQByteArray &data)
{
if ( data.size() == 0 ) { // EOF
int index = helpData.find( "<meta http-equiv=\"Content-Type\"" );
index = helpData.find( "charset=", index ) + 8;
- QString charset = helpData.mid( index, helpData.find( '\"', index ) - index );
- QString text = QTextCodec::codecForName(charset.latin1())->toUnicode( helpData );
+ TQString charset = helpData.mid( index, helpData.find( '\"', index ) - index );
+ TQString text = TQTextCodec::codecForName(charset.latin1())->toUnicode( helpData );
index = text.find( "<div class=\"titlepage\">" );
text = text.mid( index );
index = text.find( "<table width=\"100%\" class=\"bottom-nav\"" );
@@ -116,9 +116,9 @@ void KCMIOSlaveInfo::slotResult(KIO::Job *)
m_tfj = 0;
}
-void KCMIOSlaveInfo::showInfo(const QString& protocol)
+void KCMIOSlaveInfo::showInfo(const TQString& protocol)
{
- QString file = QString("kioslave/%1.docbook").arg( protocol );
+ TQString file = TQString("kioslave/%1.docbook").arg( protocol );
file = KGlobal::locale()->langLookup( file );
if (m_tfj)
{
@@ -129,15 +129,15 @@ void KCMIOSlaveInfo::showInfo(const QString& protocol)
if (!file.isEmpty())
{
helpData.truncate( 0 );
- m_tfj = KIO::get( KURL( QString("help:/kioslave/%1.html").arg( protocol ) ), true, false );
- connect( m_tfj, SIGNAL( data( KIO::Job *, const QByteArray &) ), SLOT( slaveHelp( KIO::Job *, const QByteArray &) ) );
- connect( m_tfj, SIGNAL( result( KIO::Job * ) ), SLOT( slotResult( KIO::Job * ) ) );
+ m_tfj = KIO::get( KURL( TQString("help:/kioslave/%1.html").arg( protocol ) ), true, false );
+ connect( m_tfj, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &) ), TQT_SLOT( slaveHelp( KIO::Job *, const TQByteArray &) ) );
+ connect( m_tfj, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotResult( KIO::Job * ) ) );
return;
}
m_info->setText(i18n("Some info about protocol %1:/ ...").arg(protocol));
}
-void KCMIOSlaveInfo::showInfo(QListBoxItem *item)
+void KCMIOSlaveInfo::showInfo(TQListBoxItem *item)
{
if (item==0)
return;
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.h b/kcontrol/ioslaveinfo/kcmioslaveinfo.h
index 87eda14b4..1aa9dbf6b 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.h
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.h
@@ -24,8 +24,8 @@
#ifndef kcmioslaveinfo_h_included
#define kcmioslaveinfo_h_included
-#include <qlistbox.h>
-#include <qstring.h>
+#include <tqlistbox.h>
+#include <tqstring.h>
#include <kaboutdata.h>
#include <kcmodule.h>
@@ -42,19 +42,19 @@ class KCMIOSlaveInfo : public KCModule
{
Q_OBJECT
public:
- KCMIOSlaveInfo(QWidget *parent = 0L, const char *name = 0L, const QStringList &lits=QStringList() );
+ KCMIOSlaveInfo(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &lits=TQStringList() );
protected:
KListBox *m_ioslavesLb;
KTextBrowser *m_info;
- QCString helpData;
+ TQCString helpData;
KIO::Job *m_tfj;
protected slots:
- void showInfo(const QString& protocol);
- void showInfo(QListBoxItem *item);
- void slaveHelp( KIO::Job *, const QByteArray &data);
+ void showInfo(const TQString& protocol);
+ void showInfo(TQListBoxItem *item);
+ void slaveHelp( KIO::Job *, const TQByteArray &data);
void slotResult( KIO::Job * );
};
diff --git a/kcontrol/joystick/caldialog.cpp b/kcontrol/joystick/caldialog.cpp
index f8340d03c..095f18f41 100644
--- a/kcontrol/joystick/caldialog.cpp
+++ b/kcontrol/joystick/caldialog.cpp
@@ -22,10 +22,10 @@
#include "caldialog.h"
#include "joydevice.h"
-#include <qlabel.h>
-#include <qtimer.h>
-#include <qapplication.h>
-#include <qvbox.h>
+#include <tqlabel.h>
+#include <tqtimer.h>
+#include <tqapplication.h>
+#include <tqvbox.h>
#include <klocale.h>
#include <kmessagebox.h>
@@ -33,17 +33,17 @@
//--------------------------------------------------------------
-CalDialog::CalDialog(QWidget *parent, JoyDevice *joy)
+CalDialog::CalDialog(TQWidget *parent, JoyDevice *joy)
: KDialogBase(parent, "calibrateDialog", true,
i18n("Calibration"),
KDialogBase::Cancel|KDialogBase::User1, KDialogBase::User1, true, KGuiItem(i18n("Next"))),
joydev(joy)
{
- QVBox *main = makeVBoxMainWidget();
+ TQVBox *main = makeVBoxMainWidget();
- text = new QLabel(main);
+ text = new TQLabel(main);
text->setMinimumHeight(200);
- valueLbl = new QLabel(main);
+ valueLbl = new TQLabel(main);
}
//--------------------------------------------------------------
@@ -56,7 +56,7 @@ void CalDialog::calibrate()
// calibrate precision (which min,max delivers the joystick in its center position)
// get values through the normal idle procedure
- QTimer ti;
+ TQTimer ti;
ti.start(2000, true); // single shot in 2 seconds
// normally I'd like to hide the 'Next' button in this step,
@@ -67,15 +67,15 @@ void CalDialog::calibrate()
{
qApp->processEvents(2000);
}
- while ( ti.isActive() && (result() != QDialog::Rejected) );
+ while ( ti.isActive() && (result() != TQDialog::Rejected) );
- if ( result() == QDialog::Rejected ) return; // user cancelled the dialog
+ if ( result() == TQDialog::Rejected ) return; // user cancelled the dialog
joydev->calcPrecision();
int i, lastVal;
int min[2], center[2], max[2];
- QString hint;
+ TQString hint;
for (i = 0; i < joydev->numAxes(); i++)
{
@@ -93,12 +93,12 @@ void CalDialog::calibrate()
"to continue with the next step.</qt>").arg(i+1).arg(hint));
waitButton(i, true, lastVal);
- if ( result() == QDialog::Rejected ) return; // user cancelled the dialog
+ if ( result() == TQDialog::Rejected ) return; // user cancelled the dialog
joydev->resetMinMax(i, lastVal);
if ( result() != -2 ) waitButton(i, false, lastVal);
- if ( result() == QDialog::Rejected ) return; // user cancelled the dialog
+ if ( result() == TQDialog::Rejected ) return; // user cancelled the dialog
min[0] = joydev->axisMin(i);
min[1] = joydev->axisMax(i);
@@ -110,12 +110,12 @@ void CalDialog::calibrate()
"to continue with the next step.</qt>").arg(i+1).arg(hint));
waitButton(i, true, lastVal);
- if ( result() == QDialog::Rejected ) return; // user cancelled the dialog
+ if ( result() == TQDialog::Rejected ) return; // user cancelled the dialog
joydev->resetMinMax(i, lastVal);
if ( result() != -2 ) waitButton(i, false, lastVal);
- if ( result() == QDialog::Rejected ) return; // user cancelled the dialog
+ if ( result() == TQDialog::Rejected ) return; // user cancelled the dialog
center[0] = joydev->axisMin(i);
center[1] = joydev->axisMax(i);
@@ -127,12 +127,12 @@ void CalDialog::calibrate()
"to continue with the next step.</qt>").arg(i+1).arg(hint));
waitButton(i, true, lastVal);
- if ( result() == QDialog::Rejected ) return; // user cancelled the dialog
+ if ( result() == TQDialog::Rejected ) return; // user cancelled the dialog
joydev->resetMinMax(i, lastVal);
if ( result() != -2 ) waitButton(i, false, lastVal);
- if ( result() == QDialog::Rejected ) return; // user cancelled the dialog
+ if ( result() == TQDialog::Rejected ) return; // user cancelled the dialog
max[0] = joydev->axisMin(i);
max[1] = joydev->axisMax(i);
diff --git a/kcontrol/joystick/caldialog.h b/kcontrol/joystick/caldialog.h
index 678a0a2d1..02e151e45 100644
--- a/kcontrol/joystick/caldialog.h
+++ b/kcontrol/joystick/caldialog.h
@@ -34,7 +34,7 @@ class CalDialog : public KDialogBase
Q_OBJECT
public:
- CalDialog(QWidget *parent, JoyDevice *joy);
+ CalDialog(TQWidget *parent, JoyDevice *joy);
void calibrate();
@@ -47,8 +47,8 @@ class CalDialog : public KDialogBase
private:
JoyDevice *joydev;
- QLabel *text;
- QLabel *valueLbl;
+ TQLabel *text;
+ TQLabel *valueLbl;
};
#endif
diff --git a/kcontrol/joystick/joydevice.cpp b/kcontrol/joystick/joydevice.cpp
index 2c1a16ce7..76067ee17 100644
--- a/kcontrol/joystick/joydevice.cpp
+++ b/kcontrol/joystick/joydevice.cpp
@@ -36,7 +36,7 @@
//--------------------------------------------------------------
-JoyDevice::JoyDevice(const QString &devicefile)
+JoyDevice::JoyDevice(const TQString &devicefile)
: devName(devicefile), joyFd(-1), buttons(0), axes(0),
amin(0), amax(0), corr(0), origCorr(0)
{
@@ -44,7 +44,7 @@ JoyDevice::JoyDevice(const QString &devicefile)
//--------------------------------------------------------------
-QString JoyDevice::errText(ErrorCode code) const
+TQString JoyDevice::errText(ErrorCode code) const
{
switch ( code )
{
diff --git a/kcontrol/joystick/joydevice.h b/kcontrol/joystick/joydevice.h
index b84464241..29d4c49ce 100644
--- a/kcontrol/joystick/joydevice.h
+++ b/kcontrol/joystick/joydevice.h
@@ -21,7 +21,7 @@
#ifndef _JOYDEVICE_H_
#define _JOYDEVICE_H_
-#include <qstring.h>
+#include <tqstring.h>
#include <sys/types.h>
#undef __STRICT_ANSI__
@@ -55,24 +55,24 @@ class JoyDevice
};
// devicefile to use, e.g. "/dev/js0"
- JoyDevice(const QString &devicefile);
+ JoyDevice(const TQString &devicefile);
~JoyDevice();
// returns one of the error-codes from above
ErrorCode open();
// return descriptive error text for given error code
- QString errText(ErrorCode code) const;
+ TQString errText(ErrorCode code) const;
int fd() const { return joyFd; }
void close();
ErrorCode restoreCorr();
// return devicefilename from constructor
- const QString &device() const { return devName; }
+ const TQString &device() const { return devName; }
// descriptive text for this device read from the driver
- QString text() const { return descr; }
+ TQString text() const { return descr; }
int numButtons() const { return buttons; }
int numAxes() const { return axes; }
@@ -94,8 +94,8 @@ class JoyDevice
ErrorCode applyCalibration();
private:
- QString devName; // device filename
- QString descr; // descriptive text
+ TQString devName; // device filename
+ TQString descr; // descriptive text
int joyFd;
int buttons;
diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp
index 75115fcb7..3ffc0e1d7 100644
--- a/kcontrol/joystick/joystick.cpp
+++ b/kcontrol/joystick/joystick.cpp
@@ -30,7 +30,7 @@
//---------------------------------------------------------------------------------------------
-typedef KGenericFactory<joystick, QWidget> JoystickFactory;
+typedef KGenericFactory<joystick, TQWidget> JoystickFactory;
K_EXPORT_COMPONENT_FACTORY(kcm_joystick, JoystickFactory("joystick"))
extern "C"
@@ -66,7 +66,7 @@ extern "C"
//---------------------------------------------------------------------------------------------
-joystick::joystick(QWidget *parent, const char *name, const QStringList &)
+joystick::joystick(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(JoystickFactory::instance(), parent, name)
{
setAboutData( new KAboutData("kcmjoystick", I18N_NOOP("KDE Joystick Control Module"), "1.0",
diff --git a/kcontrol/joystick/joystick.h b/kcontrol/joystick/joystick.h
index 819a5f70d..bebb8115d 100644
--- a/kcontrol/joystick/joystick.h
+++ b/kcontrol/joystick/joystick.h
@@ -30,7 +30,7 @@ class joystick: public KCModule
Q_OBJECT
public:
- joystick(QWidget *parent = 0, const char *name = 0, const QStringList &list = QStringList());
+ joystick(TQWidget *parent = 0, const char *name = 0, const TQStringList &list = TQStringList());
virtual void load();
virtual void defaults();
diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp
index a4d42e3f1..cfc293b89 100644
--- a/kcontrol/joystick/joywidget.cpp
+++ b/kcontrol/joystick/joywidget.cpp
@@ -23,16 +23,16 @@
#include "poswidget.h"
#include "caldialog.h"
-#include <qhbox.h>
-#include <qvbox.h>
-#include <qtable.h>
-#include <qlabel.h>
-#include <qcombobox.h>
-#include <qlistbox.h>
-#include <qcheckbox.h>
-#include <qtimer.h>
-#include <qfontmetrics.h>
-#include <qpushbutton.h>
+#include <tqhbox.h>
+#include <tqvbox.h>
+#include <tqtable.h>
+#include <tqlabel.h>
+#include <tqcombobox.h>
+#include <tqlistbox.h>
+#include <tqcheckbox.h>
+#include <tqtimer.h>
+#include <tqfontmetrics.h>
+#include <tqpushbutton.h>
#include <klocale.h>
#include <kdialog.h>
@@ -40,57 +40,57 @@
#include <kiconloader.h>
//--------------------------------------------------------------
-static QString PRESSED = I18N_NOOP("PRESSED");
+static TQString PRESSED = I18N_NOOP("PRESSED");
//--------------------------------------------------------------
-JoyWidget::JoyWidget(QWidget *parent, const char *name)
- : QWidget(parent, name), idle(0), joydev(0)
+JoyWidget::JoyWidget(TQWidget *parent, const char *name)
+ : TQWidget(parent, name), idle(0), joydev(0)
{
- QVBox *mainVbox = new QVBox(parent);
+ TQVBox *mainVbox = new TQVBox(parent);
mainVbox->setSpacing(KDialog::spacingHint());
// create area to show an icon + message if no joystick was detected
{
- messageBox = new QHBox(mainVbox);
+ messageBox = new TQHBox(mainVbox);
messageBox->setSpacing(KDialog::spacingHint());
- QLabel *icon = new QLabel(messageBox);
+ TQLabel *icon = new TQLabel(messageBox);
icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup,
KIcon::SizeMedium, KIcon::DefaultState, 0, true));
icon->setFixedSize(icon->sizeHint());
- message = new QLabel(messageBox);
+ message = new TQLabel(messageBox);
messageBox->hide();
}
- QHBox *devHbox = new QHBox(mainVbox);
- new QLabel(i18n("Device:"), devHbox);
- device = new QComboBox(true, devHbox);
- device->setInsertionPolicy(QComboBox::NoInsertion);
- connect(device, SIGNAL(activated(const QString &)), this, SLOT(deviceChanged(const QString &)));
+ TQHBox *devHbox = new TQHBox(mainVbox);
+ new TQLabel(i18n("Device:"), devHbox);
+ device = new TQComboBox(true, devHbox);
+ device->setInsertionPolicy(TQComboBox::NoInsertion);
+ connect(device, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(deviceChanged(const TQString &)));
devHbox->setStretchFactor(device, 3);
- QHBox *hbox = new QHBox(mainVbox);
+ TQHBox *hbox = new TQHBox(mainVbox);
hbox->setSpacing(KDialog::spacingHint());
- QVBox *vboxLeft = new QVBox(hbox);
+ TQVBox *vboxLeft = new TQVBox(hbox);
vboxLeft->setSpacing(KDialog::spacingHint());
- new QLabel(i18n("Position:"), vboxLeft);
+ new TQLabel(i18n("Position:"), vboxLeft);
xyPos = new PosWidget(vboxLeft);
- trace = new QCheckBox(i18n("Show trace"), mainVbox);
- connect(trace, SIGNAL(toggled(bool)), this, SLOT(traceChanged(bool)));
+ trace = new TQCheckBox(i18n("Show trace"), mainVbox);
+ connect(trace, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(traceChanged(bool)));
- QVBox *vboxMid = new QVBox(hbox);
+ TQVBox *vboxMid = new TQVBox(hbox);
vboxMid->setSpacing(KDialog::spacingHint());
- QVBox *vboxRight = new QVBox(hbox);
+ TQVBox *vboxRight = new TQVBox(hbox);
vboxRight->setSpacing(KDialog::spacingHint());
// calculate the column width we need
- QFontMetrics fm(font());
+ TQFontMetrics fm(font());
int colWidth = QMAX(fm.width(PRESSED), fm.width("-32767")) + 10; // -32767 largest string
- new QLabel(i18n("Buttons:"), vboxMid);
- buttonTbl = new QTable(0, 1, vboxMid);
+ new TQLabel(i18n("Buttons:"), vboxMid);
+ buttonTbl = new TQTable(0, 1, vboxMid);
buttonTbl->setReadOnly(true);
buttonTbl->horizontalHeader()->setLabel(0, i18n("State"));
buttonTbl->horizontalHeader()->setClickEnabled(false);
@@ -99,8 +99,8 @@ JoyWidget::JoyWidget(QWidget *parent, const char *name)
buttonTbl->verticalHeader()->setResizeEnabled(false);
buttonTbl->setColumnWidth(0, colWidth);
- new QLabel(i18n("Axes:"), vboxRight);
- axesTbl = new QTable(0, 1, vboxRight);
+ new TQLabel(i18n("Axes:"), vboxRight);
+ axesTbl = new TQTable(0, 1, vboxRight);
axesTbl->setReadOnly(true);
axesTbl->horizontalHeader()->setLabel(0, i18n("Value"));
axesTbl->horizontalHeader()->setClickEnabled(false);
@@ -110,13 +110,13 @@ JoyWidget::JoyWidget(QWidget *parent, const char *name)
axesTbl->setColumnWidth(0, colWidth);
// calibrate button
- calibrate = new QPushButton(i18n("Calibrate"), mainVbox);
- connect(calibrate, SIGNAL(clicked()), this, SLOT(calibrateDevice()));
+ calibrate = new TQPushButton(i18n("Calibrate"), mainVbox);
+ connect(calibrate, TQT_SIGNAL(clicked()), this, TQT_SLOT(calibrateDevice()));
calibrate->setEnabled(false);
// set up a timer for idle processing of joystick events
- idle = new QTimer(this);
- connect(idle, SIGNAL(timeout()), this, SLOT(checkDevice()));
+ idle = new TQTimer(this);
+ connect(idle, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkDevice()));
// check which devicefiles we have
init();
@@ -170,7 +170,7 @@ void JoyWidget::init()
// we found one
- device->insertItem(QString("%1 (%2)").arg(joy->text()).arg(joy->device()));
+ device->insertItem(TQString("%1 (%2)").arg(joy->text()).arg(joy->device()));
// display values for first device
if ( first )
@@ -186,7 +186,7 @@ void JoyWidget::init()
if ( device->count() == 0 )
{
messageBox->show();
- message->setText(QString("<qt><b>%1</b></qt>").arg(
+ message->setText(TQString("<qt><b>%1</b></qt>").arg(
i18n("No joystick device automatically found on this computer.<br>"
"Checks were done in /dev/js[0-4] and /dev/input/js[0-4]<br>"
"If you know that there is one attached, please enter the correct device file.")));
@@ -212,7 +212,7 @@ void JoyWidget::restoreCurrDev()
else
{
// try to find the current open device in the combobox list
- QListBoxItem *item;
+ TQListBoxItem *item;
item = device->listBox()->findItem(joydev->device(), Qt::Contains);
if ( !item ) // the current open device is one the user entered (not in the list)
@@ -224,11 +224,11 @@ void JoyWidget::restoreCurrDev()
//--------------------------------------------------------------
-void JoyWidget::deviceChanged(const QString &dev)
+void JoyWidget::deviceChanged(const TQString &dev)
{
// find "/dev" in given string
int start, stop;
- QString devName;
+ TQString devName;
if ( (start = dev.find("/dev")) == -1 )
{
@@ -315,7 +315,7 @@ void JoyWidget::checkDevice()
if ( number == 1 ) // y-axis
xyPos->changeY(value);
- axesTbl->setText(number, 0, QString("%1").arg(int(value)));
+ axesTbl->setText(number, 0, TQString("%1").arg(int(value)));
}
}
@@ -348,7 +348,7 @@ void JoyWidget::calibrateDevice()
dlg.calibrate();
// user cancelled somewhere during calibration, therefore the device is in a bad state
- if ( dlg.result() == QDialog::Rejected )
+ if ( dlg.result() == TQDialog::Rejected )
joydev->restoreCorr();
idle->start(0); // continue with event getting
diff --git a/kcontrol/joystick/joywidget.h b/kcontrol/joystick/joywidget.h
index 5f561c0e5..d857229e8 100644
--- a/kcontrol/joystick/joywidget.h
+++ b/kcontrol/joystick/joywidget.h
@@ -21,7 +21,7 @@
#ifndef _JOYWIDGET_H_
#define _JOYWIDGET_H_
-#include <qwidget.h>
+#include <tqwidget.h>
class JoyDevice;
@@ -40,7 +40,7 @@ class JoyWidget : public QWidget
Q_OBJECT
public:
- JoyWidget(QWidget *parent = 0, const char *name = 0);
+ JoyWidget(TQWidget *parent = 0, const char *name = 0);
~JoyWidget();
@@ -53,7 +53,7 @@ class JoyWidget : public QWidget
private slots:
void checkDevice();
- void deviceChanged(const QString &dev);
+ void deviceChanged(const TQString &dev);
void traceChanged(bool);
void calibrateDevice();
@@ -62,16 +62,16 @@ class JoyWidget : public QWidget
void restoreCurrDev(); // restores the content of the combobox to reflect the current open device
private:
- QHBox *messageBox;
- QLabel *message; // in case of no device, show here a message rather than in a dialog
- QComboBox *device;
+ TQHBox *messageBox;
+ TQLabel *message; // in case of no device, show here a message rather than in a dialog
+ TQComboBox *device;
PosWidget *xyPos;
- QTable *buttonTbl;
- QTable *axesTbl;
- QCheckBox *trace;
- QPushButton *calibrate;
+ TQTable *buttonTbl;
+ TQTable *axesTbl;
+ TQCheckBox *trace;
+ TQPushButton *calibrate;
- QTimer *idle;
+ TQTimer *idle;
JoyDevice *joydev;
};
diff --git a/kcontrol/joystick/poswidget.cpp b/kcontrol/joystick/poswidget.cpp
index 54e619d7a..eb24ece23 100644
--- a/kcontrol/joystick/poswidget.cpp
+++ b/kcontrol/joystick/poswidget.cpp
@@ -20,15 +20,15 @@
***************************************************************************/
#include "poswidget.h"
-#include <qpainter.h>
+#include <tqpainter.h>
#define XY_WIDTH 220
#define MARK_WIDTH 10
//-----------------------------------------------------------------
-PosWidget::PosWidget(QWidget *parent, const char *name)
- : QWidget(parent, name, WRepaintNoErase), x(0), y(0), trace(false)
+PosWidget::PosWidget(TQWidget *parent, const char *name)
+ : TQWidget(parent, name, WRepaintNoErase), x(0), y(0), trace(false)
{
setMinimumSize(XY_WIDTH, XY_WIDTH);
setMaximumSize(XY_WIDTH, XY_WIDTH);
@@ -37,9 +37,9 @@ PosWidget::PosWidget(QWidget *parent, const char *name)
//-----------------------------------------------------------------
-void PosWidget::paintEvent(QPaintEvent *)
+void PosWidget::paintEvent(TQPaintEvent *)
{
- QPainter paint(this);
+ TQPainter paint(this);
paint.drawRect(0, 0, width(), height());
paint.setPen(Qt::gray);
@@ -106,7 +106,7 @@ void PosWidget::showTrace(bool t)
void PosWidget::eraseOld()
{
- QPainter paint(this);
+ TQPainter paint(this);
//paint.eraseRect(x - MARK_WIDTH/2, y - MARK_WIDTH/2, MARK_WIDTH + 1, MARK_WIDTH + 1);
diff --git a/kcontrol/joystick/poswidget.h b/kcontrol/joystick/poswidget.h
index 9151da57f..a4d57117e 100644
--- a/kcontrol/joystick/poswidget.h
+++ b/kcontrol/joystick/poswidget.h
@@ -21,7 +21,7 @@
#ifndef _POSWIDGET_H_
#define _POSWIDGET_H_
-#include <qwidget.h>
+#include <tqwidget.h>
/**
Widget to display the joystick-selected (x,y) position
@@ -31,7 +31,7 @@ class PosWidget : public QWidget
Q_OBJECT
public:
- PosWidget(QWidget *parent = 0, const char *name = 0);
+ PosWidget(TQWidget *parent = 0, const char *name = 0);
void changeX(int x);
void changeY(int y);
@@ -42,7 +42,7 @@ class PosWidget : public QWidget
void showTrace(bool t);
protected:
- virtual void paintEvent(QPaintEvent *);
+ virtual void paintEvent(TQPaintEvent *);
private:
void eraseOld();
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp
index 209b264ec..3a07ee567 100644
--- a/kcontrol/kcontrol/aboutwidget.cpp
+++ b/kcontrol/kcontrol/aboutwidget.cpp
@@ -17,11 +17,11 @@
*/
-#include <qpainter.h>
-#include <qwhatsthis.h>
-#include <qregexp.h>
-#include <qlayout.h>
-#include <qfile.h>
+#include <tqpainter.h>
+#include <tqwhatsthis.h>
+#include <tqregexp.h>
+#include <tqlayout.h>
+#include <tqfile.h>
#include <kstandarddirs.h>
#include <klocale.h>
@@ -68,8 +68,8 @@ static const char system_text[] = I18N_NOOP("System:");
static const char release_text[] = I18N_NOOP("Release:");
static const char machine_text[] = I18N_NOOP("Machine:");
-AboutWidget::AboutWidget(QWidget *parent , const char *name, QListViewItem* category, const QString &caption)
- : QHBox(parent, name),
+AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* category, const TQString &caption)
+ : TQHBox(parent, name),
_moduleList(false),
_category(category),
_caption(caption)
@@ -80,16 +80,16 @@ AboutWidget::AboutWidget(QWidget *parent , const char *name, QListViewItem* cate
setMinimumSize(400, 400);
// set qwhatsthis help
- QWhatsThis::add(this, i18n(intro_text));
+ TQWhatsThis::add(this, i18n(intro_text));
_viewer = new KHTMLPart( this, "_viewer" );
- _viewer->widget()->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored );
+ _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
connect( _viewer->browserExtension(),
- SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
- this, SLOT(slotModuleLinkClicked(const KURL&)) );
+ TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
+ this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) );
updatePixmap();
}
-void AboutWidget::setCategory( QListViewItem* category, const QString& icon, const QString &caption )
+void AboutWidget::setCategory( TQListViewItem* category, const TQString& icon, const TQString &caption )
{
_icon = icon;
_caption = caption;
@@ -105,11 +105,11 @@ void AboutWidget::setCategory( QListViewItem* category, const QString& icon, con
void AboutWidget::updatePixmap()
{
- QString file = locate( "data", "kcontrol/about/main.html" );
- QFile f( file );
+ TQString file = locate( "data", "kcontrol/about/main.html" );
+ TQFile f( file );
f.open( IO_ReadOnly );
- QTextStream t( &f );
- QString res = t.read();
+ TQTextStream t( &f );
+ TQString res = t.read();
res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
@@ -118,7 +118,7 @@ void AboutWidget::updatePixmap()
res = res.arg( "" );
- QString title, intro, caption;
+ TQString title, intro, caption;
if (KCGlobal::isInfoCenter())
{
res = res.arg(i18n(kcc_infotext))
@@ -132,7 +132,7 @@ void AboutWidget::updatePixmap()
.arg(i18n(intro_text));
}
- QString content;
+ TQString content;
if (!_moduleList)
{
@@ -151,7 +151,7 @@ void AboutWidget::updatePixmap()
else
{
KIconLoader *loader = KGlobal::instance()->iconLoader();
- QString iconPath;
+ TQString iconPath;
if (!_icon.isEmpty()) {
iconPath = loader->iconPath( _icon, KIcon::Toolbar );
content += "<div id=\"tableTitle\"><img src=\"" + iconPath +" \"</a>&nbsp;" + _caption + "</div>";
@@ -159,11 +159,11 @@ void AboutWidget::updatePixmap()
content += "<table class=\"kc_table\">\n";
// traverse the list
- QListViewItem* pEntry = _category;
+ TQListViewItem* pEntry = _category;
while (pEntry != NULL)
{
- QString szName;
- QString szComment;
+ TQString szName;
+ TQString szComment;
ConfigModule *module = static_cast<ModuleTreeItem*>(pEntry)->module();
/* TODO: work out link */
content += "<tr><td class=\"kc_leftcol\">";
@@ -174,8 +174,8 @@ void AboutWidget::updatePixmap()
iconPath = loader->iconPath( module->icon(), KIcon::Small );
content += "<img src=\"" + iconPath +" \"</a>&nbsp;<a href=\"%1\" class=\"kcm_link\">" + szName + "</a></td><td class=\"kc_rightcol\">" + szComment;
- KURL moduleURL( QString("kcm://%1").arg(QString().sprintf("%p",module)) );
- QString linkURL( moduleURL.url() );
+ KURL moduleURL( TQString("kcm://%1").arg(TQString().sprintf("%p",module)) );
+ TQString linkURL( moduleURL.url() );
content = content.arg( linkURL );
_moduleMap.insert( linkURL, module );
}
diff --git a/kcontrol/kcontrol/aboutwidget.h b/kcontrol/kcontrol/aboutwidget.h
index e0b51fd54..b6ae9857b 100644
--- a/kcontrol/kcontrol/aboutwidget.h
+++ b/kcontrol/kcontrol/aboutwidget.h
@@ -20,9 +20,9 @@
#ifndef __aboutwidget_h__
#define __aboutwidget_h__
-#include <qwidget.h>
-#include <qlistview.h>
-#include <qhbox.h>
+#include <tqwidget.h>
+#include <tqlistview.h>
+#include <tqhbox.h>
class KCModuleInfo;
class QPixmap;
@@ -36,13 +36,13 @@ class AboutWidget : public QHBox
Q_OBJECT
public:
- AboutWidget(QWidget *parent, const char *name=0, QListViewItem* category=0, const QString &caption=QString::null);
+ AboutWidget(TQWidget *parent, const char *name=0, TQListViewItem* category=0, const TQString &caption=TQString::null);
/**
* Set a new category without creating a new AboutWidget if there is
* one visible already (reduces flicker)
*/
- void setCategory( QListViewItem* category, const QString& icon, const QString& caption);
+ void setCategory( TQListViewItem* category, const TQString& icon, const TQString& caption);
signals:
void moduleSelected(ConfigModule *);
@@ -58,11 +58,11 @@ private:
void updatePixmap();
bool _moduleList;
- QListViewItem* _category;
- QString _icon;
- QString _caption;
+ TQListViewItem* _category;
+ TQString _icon;
+ TQString _caption;
KHTMLPart *_viewer;
- QMap<QString,ConfigModule*> _moduleMap;
+ TQMap<TQString,ConfigModule*> _moduleMap;
};
#endif
diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp
index be2587114..598807a2d 100644
--- a/kcontrol/kcontrol/dockcontainer.cpp
+++ b/kcontrol/kcontrol/dockcontainer.cpp
@@ -17,13 +17,13 @@
*/
-#include <qlabel.h>
-#include <qvbox.h>
-#include <qpixmap.h>
-#include <qfont.h>
-#include <qwhatsthis.h>
-#include <qapplication.h>
-#include <qpushbutton.h>
+#include <tqlabel.h>
+#include <tqvbox.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
+#include <tqwhatsthis.h>
+#include <tqapplication.h>
+#include <tqpushbutton.h>
#include <kapplication.h>
#include <kmessagebox.h>
@@ -42,34 +42,34 @@
class ModuleTitle : public QHBox
{
public:
- ModuleTitle( QWidget *parent, const char *name=0 );
+ ModuleTitle( TQWidget *parent, const char *name=0 );
~ModuleTitle() {}
void showTitleFor( ConfigModule *module );
void clear();
protected:
- QLabel *m_icon;
- QLabel *m_name;
+ TQLabel *m_icon;
+ TQLabel *m_name;
};
-ModuleTitle::ModuleTitle( QWidget *parent, const char *name )
- : QHBox( parent, name )
+ModuleTitle::ModuleTitle( TQWidget *parent, const char *name )
+ : TQHBox( parent, name )
{
- QWidget *spacer = new QWidget( this );
+ TQWidget *spacer = new TQWidget( this );
spacer->setFixedWidth( KDialog::marginHint()-KDialog::spacingHint() );
- m_icon = new QLabel( this );
- m_name = new QLabel( this );
+ m_icon = new TQLabel( this );
+ m_name = new TQLabel( this );
- QFont font = m_name->font();
+ TQFont font = m_name->font();
font.setPointSize( font.pointSize()+1 );
font.setBold( true );
m_name->setFont( font );
setSpacing( KDialog::spacingHint() );
- if ( QApplication::reverseLayout() )
+ if ( TQApplication::reverseLayout() )
{
- spacer = new QWidget( this );
+ spacer = new TQWidget( this );
setStretchFactor( spacer, 10 );
}
else
@@ -81,10 +81,10 @@ void ModuleTitle::showTitleFor( ConfigModule *config )
if ( !config )
return;
- QWhatsThis::remove( this );
- QWhatsThis::add( this, config->comment() );
+ TQWhatsThis::remove( this );
+ TQWhatsThis::add( this, config->comment() );
KIconLoader *loader = KGlobal::instance()->iconLoader();
- QPixmap icon = loader->loadIcon( config->icon(), KIcon::NoGroup, 22 );
+ TQPixmap icon = loader->loadIcon( config->icon(), KIcon::NoGroup, 22 );
m_icon->setPixmap( icon );
m_name->setText( config->moduleName() );
@@ -93,20 +93,20 @@ void ModuleTitle::showTitleFor( ConfigModule *config )
void ModuleTitle::clear()
{
- m_icon->setPixmap( QPixmap() );
- m_name->setText( QString::null );
+ m_icon->setPixmap( TQPixmap() );
+ m_name->setText( TQString::null );
kapp->processEvents();
}
-ModuleWidget::ModuleWidget( QWidget *parent, const char *name )
- : QVBox( parent, name )
+ModuleWidget::ModuleWidget( TQWidget *parent, const char *name )
+ : TQVBox( parent, name )
{
- QHBox* titleLine = new QHBox( this, "titleLine");
+ TQHBox* titleLine = new TQHBox( this, "titleLine");
m_title = new ModuleTitle( titleLine, "m_title" );
- QPushButton *helpButton = new QPushButton( titleLine );
+ TQPushButton *helpButton = new TQPushButton( titleLine );
helpButton->setIconSet( SmallIconSet("help") );
- connect (helpButton, SIGNAL( clicked() ), this, SIGNAL( helpRequest() ) );
- m_body = new QVBox( this, "m_body" );
+ connect (helpButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( helpRequest() ) );
+ m_body = new TQVBox( this, "m_body" );
setStretchFactor( m_body, 10 );
}
@@ -117,7 +117,7 @@ ProxyWidget *ModuleWidget::load( ConfigModule *module )
if ( proxy )
{
- proxy->reparent(m_body, 0, QPoint(0,0), false);
+ proxy->reparent(m_body, 0, TQPoint(0,0), false);
proxy->show();
m_title->showTitleFor( module );
}
@@ -125,19 +125,19 @@ ProxyWidget *ModuleWidget::load( ConfigModule *module )
return proxy;
}
-DockContainer::DockContainer(QWidget *parent)
- : QWidgetStack(parent, "DockContainer")
+DockContainer::DockContainer(TQWidget *parent)
+ : TQWidgetStack(parent, "DockContainer")
, _basew(0L)
, _module(0L)
{
- _busyw = new QLabel(i18n("<big><b>Loading...</b></big>"), this);
+ _busyw = new TQLabel(i18n("<big><b>Loading...</b></big>"), this);
_busyw->setAlignment(AlignCenter);
_busyw->setTextFormat(RichText);
_busyw->setGeometry(0,0, width(), height());
addWidget( _busyw );
_modulew = new ModuleWidget( this, "_modulew" );
- connect (_modulew, SIGNAL( helpRequest() ), SLOT( slotHelpRequest() ) );
+ connect (_modulew, TQT_SIGNAL( helpRequest() ), TQT_SLOT( slotHelpRequest() ) );
addWidget( _modulew );
}
@@ -146,7 +146,7 @@ DockContainer::~DockContainer()
deleteModule();
}
-void DockContainer::setBaseWidget(QWidget *widget)
+void DockContainer::setBaseWidget(TQWidget *widget)
{
removeWidget( _basew );
delete _basew;
@@ -163,17 +163,17 @@ void DockContainer::setBaseWidget(QWidget *widget)
ProxyWidget* DockContainer::loadModule( ConfigModule *module )
{
- QApplication::setOverrideCursor( waitCursor );
+ TQApplication::setOverrideCursor( waitCursor );
ProxyWidget *widget = _modulew->load( module );
if (widget)
{
_module = module;
- connect(_module, SIGNAL(childClosed()), SLOT(removeModule()));
- connect(_module, SIGNAL(changed(ConfigModule *)),
- SIGNAL(changedModule(ConfigModule *)));
- connect(widget, SIGNAL(quickHelpChanged()), SLOT(quickHelpChanged()));
+ connect(_module, TQT_SIGNAL(childClosed()), TQT_SLOT(removeModule()));
+ connect(_module, TQT_SIGNAL(changed(ConfigModule *)),
+ TQT_SIGNAL(changedModule(ConfigModule *)));
+ connect(widget, TQT_SIGNAL(quickHelpChanged()), TQT_SLOT(quickHelpChanged()));
raiseWidget( _modulew );
emit newModule(widget->caption(), module->docPath(), widget->quickHelp());
@@ -184,7 +184,7 @@ ProxyWidget* DockContainer::loadModule( ConfigModule *module )
emit newModule(_basew->caption(), "", "");
}
- QApplication::restoreOverrideCursor();
+ TQApplication::restoreOverrideCursor();
return widget;
}
diff --git a/kcontrol/kcontrol/dockcontainer.h b/kcontrol/kcontrol/dockcontainer.h
index 94494cac5..6291d5b00 100644
--- a/kcontrol/kcontrol/dockcontainer.h
+++ b/kcontrol/kcontrol/dockcontainer.h
@@ -20,8 +20,8 @@
#ifndef __dockcontainer_h__
#define __dockcontainer_h__
-#include <qwidgetstack.h>
-#include <qvbox.h>
+#include <tqwidgetstack.h>
+#include <tqvbox.h>
class ConfigModule;
class ModuleTitle;
@@ -33,7 +33,7 @@ class ModuleWidget : public QVBox
Q_OBJECT
public:
- ModuleWidget( QWidget *parent, const char *name );
+ ModuleWidget( TQWidget *parent, const char *name );
~ModuleWidget() {}
ProxyWidget* load( ConfigModule *module );
@@ -43,7 +43,7 @@ class ModuleWidget : public QVBox
protected:
ModuleTitle *m_title;
- QVBox *m_body;
+ TQVBox *m_body;
};
class DockContainer : public QWidgetStack
@@ -51,11 +51,11 @@ class DockContainer : public QWidgetStack
Q_OBJECT
public:
- DockContainer(QWidget *parent=0);
+ DockContainer(TQWidget *parent=0);
virtual ~DockContainer();
- void setBaseWidget(QWidget *widget);
- QWidget *baseWidget() { return _basew; }
+ void setBaseWidget(TQWidget *widget);
+ TQWidget *baseWidget() { return _basew; }
bool dockModule(ConfigModule *module);
ConfigModule *module() { return _module; }
@@ -72,12 +72,12 @@ protected:
ProxyWidget* loadModule( ConfigModule *module );
signals:
- void newModule(const QString &name, const QString& docPath, const QString &quickhelp);
+ void newModule(const TQString &name, const TQString& docPath, const TQString &quickhelp);
void changedModule(ConfigModule *module);
private:
- QWidget *_basew;
- QLabel *_busyw;
+ TQWidget *_basew;
+ TQLabel *_busyw;
ModuleWidget *_modulew;
ConfigModule *_module;
diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp
index 83d2052b2..0a409b7e0 100644
--- a/kcontrol/kcontrol/global.cpp
+++ b/kcontrol/kcontrol/global.cpp
@@ -26,24 +26,24 @@
#include <kapplication.h>
#include <kuser.h>
-#include <qobjectlist.h>
-#include <qaccel.h>
+#include <tqobjectlist.h>
+#include <tqaccel.h>
#include "global.h"
bool KCGlobal::_root = false;
bool KCGlobal::_infocenter = false;
-QStringList KCGlobal::_types;
-QString KCGlobal::_uname = "";
-QString KCGlobal::_hname = "";
-QString KCGlobal::_kdeversion = "";
-QString KCGlobal::_isystem = "";
-QString KCGlobal::_irelease = "";
-QString KCGlobal::_iversion = "";
-QString KCGlobal::_imachine = "";
+TQStringList KCGlobal::_types;
+TQString KCGlobal::_uname = "";
+TQString KCGlobal::_hname = "";
+TQString KCGlobal::_kdeversion = "";
+TQString KCGlobal::_isystem = "";
+TQString KCGlobal::_irelease = "";
+TQString KCGlobal::_iversion = "";
+TQString KCGlobal::_imachine = "";
IndexViewMode KCGlobal::_viewmode = Icon;
KIcon::StdSizes KCGlobal::_iconsize = KIcon::SizeMedium;
-QString KCGlobal::_baseGroup = "";
+TQString KCGlobal::_baseGroup = "";
void KCGlobal::init()
{
@@ -51,7 +51,7 @@ void KCGlobal::init()
buf[0] = '\0';
if (!gethostname(buf, sizeof(buf)))
buf[sizeof(buf)-1] ='\0';
- QString hostname(buf);
+ TQString hostname(buf);
setHostName(hostname);
setUserName(KUser().loginName());
@@ -68,13 +68,13 @@ void KCGlobal::init()
setSystemMachine(info.machine);
}
-void KCGlobal::setType(const QCString& s)
+void KCGlobal::setType(const TQCString& s)
{
- QString string = s.lower();
- _types = QStringList::split(',', string);
+ TQString string = s.lower();
+ _types = TQStringList::split(',', string);
}
-QString KCGlobal::baseGroup()
+TQString KCGlobal::baseGroup()
{
if ( _baseGroup.isEmpty() )
{
@@ -91,26 +91,26 @@ QString KCGlobal::baseGroup()
if (_infocenter)
{
kdWarning() << "No K menu group with X-KDE-BaseGroup=info found ! Defaulting to Settings/Information/" << endl;
- _baseGroup = QString::fromLatin1("Settings/Information/");
+ _baseGroup = TQString::fromLatin1("Settings/Information/");
}
else
{
kdWarning() << "No K menu group with X-KDE-BaseGroup=settings found ! Defaulting to Settings/" << endl;
- _baseGroup = QString::fromLatin1("Settings/");
+ _baseGroup = TQString::fromLatin1("Settings/");
}
}
}
return _baseGroup;
}
-void KCGlobal::repairAccels( QWidget * tw )
+void KCGlobal::repairAccels( TQWidget * tw )
{
- QObjectList * l = tw->queryList( "QAccel" );
- QObjectListIt it( *l ); // iterate over the buttons
- QObject * obj;
+ TQObjectList * l = tw->queryList( "TQAccel" );
+ TQObjectListIt it( *l ); // iterate over the buttons
+ TQObject * obj;
while ( (obj=it.current()) != 0 ) { // for each found object...
++it;
- ((QAccel*)obj)->repairEventFilter();
+ ((TQAccel*)obj)->repairEventFilter();
}
delete l; // delete the list, not the objects
}
diff --git a/kcontrol/kcontrol/global.h b/kcontrol/kcontrol/global.h
index 71fbb55c3..80c588751 100644
--- a/kcontrol/kcontrol/global.h
+++ b/kcontrol/kcontrol/global.h
@@ -22,9 +22,9 @@
#include <kicontheme.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qcstring.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqcstring.h>
enum IndexViewMode {Icon, Tree};
@@ -36,41 +36,41 @@ public:
static bool isInfoCenter() { return _infocenter; }
static bool root() { return _root; }
- static QStringList types() { return _types; }
- static QString userName() { return _uname; }
- static QString hostName() { return _hname; }
- static QString kdeVersion() { return _kdeversion; }
- static QString systemName() { return _isystem; }
- static QString systemRelease() { return _irelease; }
- static QString systemVersion() { return _iversion; }
- static QString systemMachine() { return _imachine; }
+ static TQStringList types() { return _types; }
+ static TQString userName() { return _uname; }
+ static TQString hostName() { return _hname; }
+ static TQString kdeVersion() { return _kdeversion; }
+ static TQString systemName() { return _isystem; }
+ static TQString systemRelease() { return _irelease; }
+ static TQString systemVersion() { return _iversion; }
+ static TQString systemMachine() { return _imachine; }
static IndexViewMode viewMode() { return _viewmode; }
static KIcon::StdSizes iconSize() { return _iconsize; }
- static QString baseGroup();
+ static TQString baseGroup();
static void setIsInfoCenter(bool b) { _infocenter = b; }
static void setRoot(bool r) { _root = r; }
- static void setType(const QCString& s);
- static void setUserName(const QString& n){ _uname = n; }
- static void setHostName(const QString& n){ _hname = n; }
- static void setKDEVersion(const QString& n){ _kdeversion = n; }
- static void setSystemName(const QString& n){ _isystem = n; }
- static void setSystemRelease(const QString& n){ _irelease = n; }
- static void setSystemVersion(const QString& n){ _iversion = n; }
- static void setSystemMachine(const QString& n){ _imachine = n; }
+ static void setType(const TQCString& s);
+ static void setUserName(const TQString& n){ _uname = n; }
+ static void setHostName(const TQString& n){ _hname = n; }
+ static void setKDEVersion(const TQString& n){ _kdeversion = n; }
+ static void setSystemName(const TQString& n){ _isystem = n; }
+ static void setSystemRelease(const TQString& n){ _irelease = n; }
+ static void setSystemVersion(const TQString& n){ _iversion = n; }
+ static void setSystemMachine(const TQString& n){ _imachine = n; }
static void setViewMode(IndexViewMode m) { _viewmode = m; }
static void setIconSize(KIcon::StdSizes s) { _iconsize = s; }
- static void repairAccels( QWidget * tw );
+ static void repairAccels( TQWidget * tw );
private:
static bool _root;
static bool _infocenter;
- static QStringList _types;
- static QString _uname, _hname, _isystem, _irelease, _iversion, _imachine, _kdeversion;
+ static TQStringList _types;
+ static TQString _uname, _hname, _isystem, _irelease, _iversion, _imachine, _kdeversion;
static IndexViewMode _viewmode;
static KIcon::StdSizes _iconsize;
- static QString _baseGroup;
+ static TQString _baseGroup;
};
#endif
diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp
index b53fbc8a9..131a9bd5c 100644
--- a/kcontrol/kcontrol/helpwidget.cpp
+++ b/kcontrol/kcontrol/helpwidget.cpp
@@ -17,7 +17,7 @@
*/
-#include <qwhatsthis.h>
+#include <tqwhatsthis.h>
#include <klocale.h>
#include <kdebug.h>
@@ -28,12 +28,12 @@
#include "global.h"
#include "helpwidget.h"
-HelpWidget::HelpWidget(QWidget *parent) : QWhatsThis(parent)
+HelpWidget::HelpWidget(TQWidget *parent) : TQWhatsThis(parent)
{
setBaseText();
}
-void HelpWidget::setText(const QString& docPath, const QString& text)
+void HelpWidget::setText(const TQString& docPath, const TQString& text)
{
docpath = docPath;
if (text.isEmpty() && docPath.isEmpty())
@@ -59,12 +59,12 @@ void HelpWidget::setBaseText()
"Click <a href = \"kcontrol/index.html\">here</a> to read the general Control Center manual.") );
}
-QString HelpWidget::text() const
+TQString HelpWidget::text() const
{
return helptext;
}
-bool HelpWidget::clicked(const QString & _url)
+bool HelpWidget::clicked(const TQString & _url)
{
if ( _url.isNull() )
return true;
diff --git a/kcontrol/kcontrol/helpwidget.h b/kcontrol/kcontrol/helpwidget.h
index 08e495096..7393a7c13 100644
--- a/kcontrol/kcontrol/helpwidget.h
+++ b/kcontrol/kcontrol/helpwidget.h
@@ -26,18 +26,18 @@ class QWhatsThis;
class HelpWidget : public QWhatsThis
{
public:
- HelpWidget(QWidget *parent);
+ HelpWidget(TQWidget *parent);
- void setText( const QString& docPath, const QString& text);
+ void setText( const TQString& docPath, const TQString& text);
void setBaseText();
- QString text() const;
+ TQString text() const;
- bool clicked(const QString &);
+ bool clicked(const TQString &);
void handbookRequest();
private:
- QString docpath;
- QString helptext;
+ TQString docpath;
+ TQString helptext;
};
#endif
diff --git a/kcontrol/kcontrol/indexwidget.cpp b/kcontrol/kcontrol/indexwidget.cpp
index d427b5707..cf57dc0e4 100644
--- a/kcontrol/kcontrol/indexwidget.cpp
+++ b/kcontrol/kcontrol/indexwidget.cpp
@@ -18,7 +18,7 @@
*/
-#include <qlistview.h>
+#include <tqlistview.h>
#include "indexwidget.h"
@@ -26,8 +26,8 @@
#include "moduletreeview.h"
#include "moduleiconview.h"
-IndexWidget::IndexWidget(ConfigModuleList *modules, QWidget *parent ,const char *name)
- : QWidgetStack(parent, name)
+IndexWidget::IndexWidget(ConfigModuleList *modules, TQWidget *parent ,const char *name)
+ : TQWidgetStack(parent, name)
, _tree(0L)
, _icon(0L)
, _modules(modules)
@@ -44,7 +44,7 @@ void IndexWidget::reload()
_icon->fill();
}
-QListViewItem *IndexWidget::firstTreeViewItem()
+TQListViewItem *IndexWidget::firstTreeViewItem()
{
if (_tree)
return _tree->firstChild();
@@ -53,14 +53,14 @@ QListViewItem *IndexWidget::firstTreeViewItem()
}
-void IndexWidget::resizeEvent(QResizeEvent *e)
+void IndexWidget::resizeEvent(TQResizeEvent *e)
{
- QWidgetStack::resizeEvent( e );
+ TQWidgetStack::resizeEvent( e );
}
void IndexWidget::moduleSelected(ConfigModule *m)
{
- const QObject *obj = sender();
+ const TQObject *obj = sender();
if(!m) return;
emit moduleActivated(m);
@@ -69,19 +69,19 @@ void IndexWidget::moduleSelected(ConfigModule *m)
{
_tree->makeVisible(m);
- _tree->disconnect(SIGNAL(moduleSelected(ConfigModule*)));
+ _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*)));
_tree->makeSelected(m);
- connect(_tree, SIGNAL(moduleSelected(ConfigModule*)),
- this, SLOT(moduleSelected(ConfigModule*)));
+ connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)),
+ this, TQT_SLOT(moduleSelected(ConfigModule*)));
}
else if (obj->inherits("ModuleTreeView") && _icon)
{
_icon->makeVisible(m);
- _icon->disconnect(SIGNAL(moduleSelected(ConfigModule*)));
+ _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*)));
_icon->makeSelected(m);
- connect(_icon, SIGNAL(moduleSelected(ConfigModule*)),
- this, SLOT(moduleSelected(ConfigModule*)));
+ connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)),
+ this, TQT_SLOT(moduleSelected(ConfigModule*)));
}
}
@@ -89,17 +89,17 @@ void IndexWidget::makeSelected(ConfigModule *module)
{
if (_icon)
{
- _icon->disconnect(SIGNAL(moduleSelected(ConfigModule*)));
+ _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*)));
_icon->makeSelected(module);
- connect(_icon, SIGNAL(moduleSelected(ConfigModule*)),
- this, SLOT(moduleSelected(ConfigModule*)));
+ connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)),
+ this, TQT_SLOT(moduleSelected(ConfigModule*)));
}
if (_tree)
{
- _tree->disconnect(SIGNAL(moduleSelected(ConfigModule*)));
+ _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*)));
_tree->makeSelected(module);
- connect(_tree, SIGNAL(moduleSelected(ConfigModule*)),
- this, SLOT(moduleSelected(ConfigModule*)));
+ connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)),
+ this, TQT_SLOT(moduleSelected(ConfigModule*)));
}
}
@@ -121,8 +121,8 @@ void IndexWidget::activateView(IndexViewMode mode)
{
_icon=new ModuleIconView(_modules, this);
_icon->fill();
- connect(_icon, SIGNAL(moduleSelected(ConfigModule*)),
- this, SLOT(moduleSelected(ConfigModule*)));
+ connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)),
+ this, TQT_SLOT(moduleSelected(ConfigModule*)));
}
raiseWidget( _icon );
}
@@ -132,10 +132,10 @@ void IndexWidget::activateView(IndexViewMode mode)
{
_tree=new ModuleTreeView(_modules, this);
_tree->fill();
- connect(_tree, SIGNAL(moduleSelected(ConfigModule*)),
- this, SLOT(moduleSelected(ConfigModule*)));
- connect(_tree, SIGNAL(categorySelected(QListViewItem*)),
- this, SIGNAL(categorySelected(QListViewItem*)));
+ connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)),
+ this, TQT_SLOT(moduleSelected(ConfigModule*)));
+ connect(_tree, TQT_SIGNAL(categorySelected(TQListViewItem*)),
+ this, TQT_SIGNAL(categorySelected(TQListViewItem*)));
}
raiseWidget( _tree );
}
diff --git a/kcontrol/kcontrol/indexwidget.h b/kcontrol/kcontrol/indexwidget.h
index 0a358aa2e..a0591fcd1 100644
--- a/kcontrol/kcontrol/indexwidget.h
+++ b/kcontrol/kcontrol/indexwidget.h
@@ -20,7 +20,7 @@
#ifndef __indexwidget_h__
#define __indexwidget_h__
-#include <qwidgetstack.h>
+#include <tqwidgetstack.h>
#include "global.h"
@@ -34,10 +34,10 @@ class IndexWidget : public QWidgetStack
Q_OBJECT
public:
- IndexWidget(ConfigModuleList *list, QWidget *parent, const char *name=0);
+ IndexWidget(ConfigModuleList *list, TQWidget *parent, const char *name=0);
virtual ~IndexWidget();
- QListViewItem *firstTreeViewItem();
+ TQListViewItem *firstTreeViewItem();
public slots:
void makeVisible(ConfigModule *module);
void makeSelected(ConfigModule *module);
@@ -49,10 +49,10 @@ protected slots:
signals:
void moduleActivated(ConfigModule *module);
- void categorySelected(QListViewItem *);
+ void categorySelected(TQListViewItem *);
protected:
- void resizeEvent(QResizeEvent *e);
+ void resizeEvent(TQResizeEvent *e);
private:
ModuleTreeView *_tree;
diff --git a/kcontrol/kcontrol/kcrootonly.cpp b/kcontrol/kcontrol/kcrootonly.cpp
index 5d3a0ce27..723895de3 100644
--- a/kcontrol/kcontrol/kcrootonly.cpp
+++ b/kcontrol/kcontrol/kcrootonly.cpp
@@ -16,18 +16,18 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
#include <klocale.h>
#include "kcrootonly.h"
-KCRootOnly::KCRootOnly(QWidget *parent, const char *name)
+KCRootOnly::KCRootOnly(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
- QVBoxLayout *layout=new QVBoxLayout(this);
- QLabel *label = new QLabel(i18n("<big>You need super user privileges to run this control module.</big><br>"
+ TQVBoxLayout *layout=new TQVBoxLayout(this);
+ TQLabel *label = new TQLabel(i18n("<big>You need super user privileges to run this control module.</big><br>"
"Click on the \"Administrator Mode\" button below."), this);
layout->addWidget(label);
label->setAlignment(AlignCenter);
diff --git a/kcontrol/kcontrol/kcrootonly.h b/kcontrol/kcontrol/kcrootonly.h
index e04df7c80..b52fab34b 100644
--- a/kcontrol/kcontrol/kcrootonly.h
+++ b/kcontrol/kcontrol/kcrootonly.h
@@ -6,7 +6,7 @@
class KCRootOnly: public KCModule {
public:
- KCRootOnly(QWidget *parent, const char *name);
+ KCRootOnly(TQWidget *parent, const char *name);
};
#endif
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 90e63583c..4a0191dd7 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -32,7 +32,7 @@
* to newInstance().
*/
-#include <qpaintdevicemetrics.h>
+#include <tqpaintdevicemetrics.h>
#include <kcmdlineargs.h>
#include <dcopclient.h>
@@ -61,10 +61,10 @@ KControlApp::KControlApp()
// KUniqueApplication does dcop regitration for us
ModuleIface *modIface = new ModuleIface(toplevel, "moduleIface");
- connect (modIface, SIGNAL(helpClicked()), toplevel, SLOT(slotHelpRequest()));
- connect (modIface, SIGNAL(handbookClicked()), toplevel, SLOT(slotHandbookRequest()));
+ connect (modIface, TQT_SIGNAL(helpClicked()), toplevel, TQT_SLOT(slotHelpRequest()));
+ connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest()));
- QRect desk = KGlobalSettings::desktopGeometry(toplevel);
+ TQRect desk = KGlobalSettings::desktopGeometry(toplevel);
KConfig *config = KGlobal::config();
config->setGroup("General");
// Initial size is:
@@ -73,13 +73,13 @@ KControlApp::KControlApp()
// 800x600 on 72 dpi, 12 pt font
// --> 368 + 6 x dpiX, 312 + 4 x dpiY
// Adjusted for font size
- QPaintDeviceMetrics pdm(toplevel);
+ TQPaintDeviceMetrics pdm(toplevel);
int fontSize = toplevel->fontInfo().pointSize();
if (fontSize == 0)
fontSize = (toplevel->fontInfo().pixelSize() * 72) / pdm.logicalDpiX();
- int x = config->readNumEntry(QString::fromLatin1("InitialWidth %1").arg(desk.width()),
+ int x = config->readNumEntry(TQString::fromLatin1("InitialWidth %1").arg(desk.width()),
QMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) );
- int y = config->readNumEntry(QString::fromLatin1("InitialHeight %1").arg(desk.height()),
+ int y = config->readNumEntry(TQString::fromLatin1("InitialHeight %1").arg(desk.height()),
QMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) );
toplevel->resize(x,y);
}
@@ -90,9 +90,9 @@ KControlApp::~KControlApp()
{
KConfig *config = KGlobal::config();
config->setGroup("General");
- QWidget *desk = QApplication::desktop();
- config->writeEntry(QString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
- config->writeEntry(QString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
+ TQWidget *desk = TQApplication::desktop();
+ config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
+ config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
config->sync();
}
delete toplevel;
@@ -109,7 +109,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
KCONTROL_VERSION, I18N_NOOP("The KDE Info Center"), KAboutData::License_GPL,
I18N_NOOP("(c) 1998-2004, The KDE Control Center Developers"));
- QCString argv_0 = argv[0];
+ TQCString argv_0 = argv[0];
KAboutData *aboutData;
if (argv_0.right(11) == "kinfocenter")
{
diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp
index b58f06c26..6d40a8bf7 100644
--- a/kcontrol/kcontrol/moduleIface.cpp
+++ b/kcontrol/kcontrol/moduleIface.cpp
@@ -23,26 +23,26 @@
#include <kdebug.h>
#include <kconfig.h>
-ModuleIface::ModuleIface(QObject *parent, const char *name)
- : QObject(parent, name), DCOPObject(name) {
+ModuleIface::ModuleIface(TQObject *parent, const char *name)
+ : TQObject(parent, name), DCOPObject(name) {
- _parent = static_cast<QWidget *>(parent);
+ _parent = static_cast<TQWidget *>(parent);
}
ModuleIface::~ModuleIface() {
}
-QFont ModuleIface::getFont() {
+TQFont ModuleIface::getFont() {
return _parent->font();
}
-QPalette ModuleIface::getPalette(){
+TQPalette ModuleIface::getPalette(){
kdDebug(1208) << "Returned Palette" << endl;
return _parent->palette();
}
-QString ModuleIface::getStyle() {
+TQString ModuleIface::getStyle() {
KConfig config( "kdeglobals" );
config.setGroup( "General" );
return config.readEntry("widgetStyle");
diff --git a/kcontrol/kcontrol/moduleIface.h b/kcontrol/kcontrol/moduleIface.h
index 8c034d5cd..17b4b07ad 100644
--- a/kcontrol/kcontrol/moduleIface.h
+++ b/kcontrol/kcontrol/moduleIface.h
@@ -22,23 +22,23 @@
#include <dcopobject.h>
-#include <qfont.h>
-#include <qpalette.h>
-#include <qwidget.h>
+#include <tqfont.h>
+#include <tqpalette.h>
+#include <tqwidget.h>
-class ModuleIface : public QObject, public DCOPObject {
+class ModuleIface : public TQObject, public DCOPObject {
Q_OBJECT
K_DCOP
public:
- ModuleIface(QObject *parent, const char *name);
+ ModuleIface(TQObject *parent, const char *name);
~ModuleIface();
k_dcop:
- QFont getFont();
- QPalette getPalette();
- QString getStyle();
+ TQFont getFont();
+ TQPalette getPalette();
+ TQString getStyle();
void invokeHandbook();
void invokeHelp();
@@ -47,7 +47,7 @@ signals:
void helpClicked();
private:
- QWidget *_parent;
+ TQWidget *_parent;
};
diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp
index 041e6709c..c6df5cb71 100644
--- a/kcontrol/kcontrol/moduleiconview.cpp
+++ b/kcontrol/kcontrol/moduleiconview.cpp
@@ -18,8 +18,8 @@
*/
-#include <qheader.h>
-#include <qcursor.h>
+#include <tqheader.h>
+#include <tqcursor.h>
#include <klocale.h>
#include <kstandarddirs.h>
@@ -34,13 +34,13 @@
#include "global.h"
-ModuleIconView::ModuleIconView(ConfigModuleList *list, QWidget * parent, const char * name)
+ModuleIconView::ModuleIconView(ConfigModuleList *list, TQWidget * parent, const char * name)
: KListView(parent, name)
, _path(KCGlobal::baseGroup())
, _modules(list)
{
setSorting(1, true);
- addColumn(QString::null);
+ addColumn(TQString::null);
// Needed to enforce a cut of the items label rather than
// showing a horizontal scrollbar
@@ -51,15 +51,15 @@ ModuleIconView::ModuleIconView(ConfigModuleList *list, QWidget * parent, const c
// This is intentionally _not_ connected with executed(), since
// honoring doubleclick doesn't make any sense here (changed by
// large user demand)
- connect(this, SIGNAL(clicked(QListViewItem*)),
- this, SLOT(slotItemSelected(QListViewItem*)));
+ connect(this, TQT_SIGNAL(clicked(TQListViewItem*)),
+ this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
}
void ModuleIconView::makeSelected(ConfigModule *m)
{
if (!m) return;
- for (QListViewItem *i = firstChild(); i; i = i->nextSibling())
+ for (TQListViewItem *i = firstChild(); i; i = i->nextSibling())
{
if(static_cast<ModuleIconItem*>(i)->module() == m)
{
@@ -72,7 +72,7 @@ void ModuleIconView::makeSelected(ConfigModule *m)
void ModuleIconView::makeVisible(ConfigModule *m)
{
if (!m) return;
- QString tmp = _modules->findModule(m);
+ TQString tmp = _modules->findModule(m);
if (tmp.isEmpty())
return;
@@ -84,7 +84,7 @@ void ModuleIconView::fill()
{
clear();
- QPixmap icon;
+ TQPixmap icon;
// add our "up" icon if we aren't top level
if (_path != KCGlobal::baseGroup())
{
@@ -94,16 +94,16 @@ void ModuleIconView::fill()
i->setOrderNo(0);
int last_slash = _path.findRev('/', -2);
if (last_slash == -1)
- i->setTag(QString::null);
+ i->setTag(TQString::null);
else
i->setTag(_path.left(last_slash+1));
}
int c = 0;
- QStringList submenus = _modules->submenus(_path);
- for (QStringList::Iterator it = submenus.begin(); it != submenus.end(); ++it )
+ TQStringList submenus = _modules->submenus(_path);
+ for (TQStringList::Iterator it = submenus.begin(); it != submenus.end(); ++it )
{
- QString path = (*it);
+ TQString path = (*it);
KServiceGroup::Ptr group = KServiceGroup::group(path);
if (!group || !group->isValid())
@@ -117,7 +117,7 @@ void ModuleIconView::fill()
}
c = 0;
- QPtrList<ConfigModule> moduleList = _modules->modules(_path);
+ TQPtrList<ConfigModule> moduleList = _modules->modules(_path);
for (ConfigModule *module=moduleList.first(); module != 0; module=moduleList.next())
{
icon = loadIcon( module->icon() );
@@ -127,9 +127,9 @@ void ModuleIconView::fill()
}
}
-void ModuleIconView::slotItemSelected(QListViewItem* item)
+void ModuleIconView::slotItemSelected(TQListViewItem* item)
{
- QApplication::restoreOverrideCursor();
+ TQApplication::restoreOverrideCursor();
if (!item) return;
if (static_cast<ModuleIconItem*>(item)->module())
@@ -144,7 +144,7 @@ void ModuleIconView::slotItemSelected(QListViewItem* item)
}
}
-void ModuleIconView::keyPressEvent(QKeyEvent *e)
+void ModuleIconView::keyPressEvent(TQKeyEvent *e)
{
if( e->key() == Key_Return
|| e->key() == Key_Enter
@@ -159,9 +159,9 @@ void ModuleIconView::keyPressEvent(QKeyEvent *e)
}
}
-QPixmap ModuleIconView::loadIcon( const QString &name )
+TQPixmap ModuleIconView::loadIcon( const TQString &name )
{
- QPixmap icon = DesktopIcon( name, KCGlobal::iconSize() );
+ TQPixmap icon = DesktopIcon( name, KCGlobal::iconSize() );
if(icon.isNull())
icon = DesktopIcon( "folder", KCGlobal::iconSize() );
diff --git a/kcontrol/kcontrol/moduleiconview.h b/kcontrol/kcontrol/moduleiconview.h
index 4f38a1cad..dcacf9770 100644
--- a/kcontrol/kcontrol/moduleiconview.h
+++ b/kcontrol/kcontrol/moduleiconview.h
@@ -29,28 +29,28 @@ class ModuleIconItem : public KListViewItem
{
public:
- ModuleIconItem(QListView *parent, const QString& text, const QPixmap& pm, ConfigModule *m = 0)
+ ModuleIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, ConfigModule *m = 0)
: KListViewItem(parent, text)
- , _tag(QString::null)
+ , _tag(TQString::null)
, _module(m)
{
setPixmap(0, pm);
}
void setConfigModule(ConfigModule* m) { _module = m; }
- void setTag(const QString& t) { _tag = t; }
+ void setTag(const TQString& t) { _tag = t; }
void setOrderNo(int order)
{
- QString s;
+ TQString s;
setText(1, s.sprintf( "%02d", order ) );
}
ConfigModule* module() { return _module; }
- QString tag() { return _tag; }
+ TQString tag() { return _tag; }
private:
- QString _tag;
+ TQString _tag;
ConfigModule *_module;
};
@@ -59,7 +59,7 @@ class ModuleIconView : public KListView
Q_OBJECT
public:
- ModuleIconView(ConfigModuleList *list, QWidget * parent = 0, const char * name = 0);
+ ModuleIconView(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0);
void makeSelected(ConfigModule* module);
void makeVisible(ConfigModule *module);
@@ -69,14 +69,14 @@ signals:
void moduleSelected(ConfigModule*);
protected slots:
- void slotItemSelected(QListViewItem*);
+ void slotItemSelected(TQListViewItem*);
protected:
- void keyPressEvent(QKeyEvent *);
- QPixmap loadIcon( const QString &name );
+ void keyPressEvent(TQKeyEvent *);
+ TQPixmap loadIcon( const TQString &name );
private:
- QString _path;
+ TQString _path;
ConfigModuleList *_modules;
};
diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp
index 02becb29a..ad60eda5a 100644
--- a/kcontrol/kcontrol/modulemenu.cpp
+++ b/kcontrol/kcontrol/modulemenu.cpp
@@ -21,11 +21,11 @@ that is intentional :-]
*/
-#include <qheader.h>
-#include <qstring.h>
-#include <qptrlist.h>
-#include <qpoint.h>
-#include <qcursor.h>
+#include <tqheader.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
+#include <tqpoint.h>
+#include <tqcursor.h>
#include <klocale.h>
#include <kglobal.h>
@@ -40,7 +40,7 @@ that is intentional :-]
#include "global.h"
-ModuleMenu::ModuleMenu(ConfigModuleList *list, QWidget * parent, const char * name)
+ModuleMenu::ModuleMenu(ConfigModuleList *list, TQWidget * parent, const char * name)
: KPopupMenu(parent, name)
, _modules(list)
{
@@ -49,27 +49,27 @@ ModuleMenu::ModuleMenu(ConfigModuleList *list, QWidget * parent, const char * na
fill(this, KCGlobal::baseGroup());
- connect(this, SIGNAL(activated(int)), this, SLOT(moduleSelected(int)));
+ connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int)));
}
-void ModuleMenu::fill(KPopupMenu *parentMenu, const QString &parentPath)
+void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
{
- QStringList subMenus = _modules->submenus(parentPath);
- for(QStringList::ConstIterator it = subMenus.begin();
+ TQStringList subMenus = _modules->submenus(parentPath);
+ for(TQStringList::ConstIterator it = subMenus.begin();
it != subMenus.end(); ++it)
{
- QString path = *it;
+ TQString path = *it;
KServiceGroup::Ptr group = KServiceGroup::group(path);
if (!group)
continue;
// create new menu
KPopupMenu *menu = new KPopupMenu(parentMenu);
- connect(menu, SIGNAL(activated(int)), this, SLOT(moduleSelected(int)));
+ connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int)));
// Item names may contain ampersands. To avoid them being converted to
// accelators, replace them with two ampersands.
- QString name = group->caption();
+ TQString name = group->caption();
name.replace("&", "&&");
parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall)
@@ -79,12 +79,12 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const QString &parentPath)
}
ConfigModule *module;
- QPtrList<ConfigModule> moduleList = _modules->modules(parentPath);
+ TQPtrList<ConfigModule> moduleList = _modules->modules(parentPath);
for (module=moduleList.first(); module != 0; module=moduleList.next())
{
// Item names may contain ampersands. To avoid them being converted to
// accelators, replace them with two ampersands.
- QString name = module->moduleName();
+ TQString name = module->moduleName();
name.replace("&", "&&");
int realid = parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall)
diff --git a/kcontrol/kcontrol/modulemenu.h b/kcontrol/kcontrol/modulemenu.h
index b08140bfc..feac18bd6 100644
--- a/kcontrol/kcontrol/modulemenu.h
+++ b/kcontrol/kcontrol/modulemenu.h
@@ -24,12 +24,12 @@ that is intentional :-]
#define __modulemenu_h__
-#include <qptrlist.h>
-#include <qstringlist.h>
-#include <qintdict.h>
-#include <qstring.h>
-#include <qwidget.h>
-#include <qdict.h>
+#include <tqptrlist.h>
+#include <tqstringlist.h>
+#include <tqintdict.h>
+#include <tqstring.h>
+#include <tqwidget.h>
+#include <tqdict.h>
#include <kpopupmenu.h>
@@ -43,7 +43,7 @@ class ModuleMenu : public KPopupMenu
Q_OBJECT
public:
- ModuleMenu(ConfigModuleList *list, QWidget * parent = 0, const char * name = 0);
+ ModuleMenu(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0);
signals:
void moduleActivated(ConfigModule*);
@@ -52,13 +52,13 @@ private slots:
void moduleSelected(int id);
protected:
- void fill(KPopupMenu *parentMenu, const QString &parentPath);
+ void fill(KPopupMenu *parentMenu, const TQString &parentPath);
private:
int id;
ConfigModuleList *_modules;
- QIntDict<ConfigModule> _moduleDict;
+ TQIntDict<ConfigModule> _moduleDict;
};
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index b6d8a2693..cc8c63af4 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -21,9 +21,9 @@
#include <sys/types.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qvbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqvbox.h>
#include <kapplication.h>
#include <kdebug.h>
#include <kservicegroup.h>
@@ -43,7 +43,7 @@
#include <X11/Xlib.h>
-template class QPtrList<ConfigModule>;
+template class TQPtrList<ConfigModule>;
ConfigModule::ConfigModule(const KService::Ptr &s)
@@ -75,11 +75,11 @@ ProxyWidget *ConfigModule::module()
{
_module = new ProxyWidget(modWidget, moduleName(), "", run_as_root);
- connect(_module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool)));
- connect(_module, SIGNAL(closed()), this, SLOT(clientClosed()));
- connect(_module, SIGNAL(handbookRequest()), this, SIGNAL(handbookRequest()));
- connect(_module, SIGNAL(helpRequest()), this, SIGNAL(helpRequest()));
- connect(_module, SIGNAL(runAsRoot()), this, SLOT(runAsRoot()));
+ connect(_module, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool)));
+ connect(_module, TQT_SIGNAL(closed()), this, TQT_SLOT(clientClosed()));
+ connect(_module, TQT_SIGNAL(handbookRequest()), this, TQT_SIGNAL(handbookRequest()));
+ connect(_module, TQT_SIGNAL(helpRequest()), this, TQT_SIGNAL(helpRequest()));
+ connect(_module, TQT_SIGNAL(runAsRoot()), this, TQT_SLOT(runAsRoot()));
return _module;
}
@@ -142,31 +142,31 @@ void ConfigModule::runAsRoot()
// create an embed widget that will embed the
// kcmshell running as root
- _embedLayout = new QVBoxLayout(_module->parentWidget());
- _embedFrame = new QVBox( _module->parentWidget() );
- _embedFrame->setFrameStyle( QFrame::Box | QFrame::Raised );
- QPalette pal( red );
- pal.setColor( QColorGroup::Background,
+ _embedLayout = new TQVBoxLayout(_module->parentWidget());
+ _embedFrame = new TQVBox( _module->parentWidget() );
+ _embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised );
+ TQPalette pal( red );
+ pal.setColor( TQColorGroup::Background,
_module->parentWidget()->colorGroup().background() );
_embedFrame->setPalette( pal );
_embedFrame->setLineWidth( 2 );
_embedFrame->setMidLineWidth( 2 );
_embedLayout->addWidget(_embedFrame,1);
// cannot reparent anything else inside QXEmbed, so put the busy label separately
- _embedStack = new QWidgetStack(_embedFrame);
+ _embedStack = new TQWidgetStack(_embedFrame);
_embedWidget = new KControlEmbed(_embedStack);
_module->hide();
_embedFrame->show();
- QLabel *_busy = new QLabel(i18n("<big>Loading...</big>"), _embedStack);
+ TQLabel *_busy = new TQLabel(i18n("<big>Loading...</big>"), _embedStack);
_busy->setAlignment(AlignCenter);
_busy->setTextFormat(RichText);
_busy->setGeometry(0,0, _module->width(), _module->height());
_busy->show();
_embedStack->raiseWidget(_busy);
- connect(_embedWidget, SIGNAL( windowEmbedded(WId)), SLOT( embedded()));
+ connect(_embedWidget, TQT_SIGNAL( windowEmbedded(WId)), TQT_SLOT( embedded()));
// prepare the process to run the kcmshell
- QString cmd = service()->exec().stripWhiteSpace();
+ TQString cmd = service()->exec().stripWhiteSpace();
bool kdeshell = false;
if (cmd.left(5) == "kdesu")
{
@@ -186,7 +186,7 @@ void ConfigModule::runAsRoot()
}
// run the process
- QString kdesu = KStandardDirs::findExe("kdesu");
+ TQString kdesu = KStandardDirs::findExe("kdesu");
if (!kdesu.isEmpty())
{
_rootProcess = new KProcess;
@@ -198,13 +198,13 @@ void ConfigModule::runAsRoot()
// We also don't have a way to close the module in that case.
*_rootProcess << "--n"; // Don't keep password.
if (kdeshell) {
- *_rootProcess << QString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "kcmshell")).arg(cmd).arg(_embedWidget->winId()).arg(KGlobal::locale()->language());
+ *_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "kcmshell")).arg(cmd).arg(_embedWidget->winId()).arg(KGlobal::locale()->language());
}
else {
- *_rootProcess << QString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( KGlobal::locale()->language() );
+ *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( KGlobal::locale()->language() );
}
- connect(_rootProcess, SIGNAL(processExited(KProcess*)), this, SLOT(rootExited(KProcess*)));
+ connect(_rootProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(rootExited(KProcess*)));
if ( !_rootProcess->start(KProcess::NotifyOnExit) )
{
@@ -271,7 +271,7 @@ void ConfigModuleList::readDesktopEntries()
readDesktopEntriesRecursive( KCGlobal::baseGroup() );
}
-bool ConfigModuleList::readDesktopEntriesRecursive(const QString &path)
+bool ConfigModuleList::readDesktopEntriesRecursive(const TQString &path)
{
KServiceGroup::Ptr group = KServiceGroup::group(path);
@@ -314,32 +314,32 @@ bool ConfigModuleList::readDesktopEntriesRecursive(const QString &path)
return true;
}
-QPtrList<ConfigModule> ConfigModuleList::modules(const QString &path)
+TQPtrList<ConfigModule> ConfigModuleList::modules(const TQString &path)
{
Menu *menu = subMenus.find(path);
if (menu)
return menu->modules;
- return QPtrList<ConfigModule>();
+ return TQPtrList<ConfigModule>();
}
-QStringList ConfigModuleList::submenus(const QString &path)
+TQStringList ConfigModuleList::submenus(const TQString &path)
{
Menu *menu = subMenus.find(path);
if (menu)
return menu->submenus;
- return QStringList();
+ return TQStringList();
}
-QString ConfigModuleList::findModule(ConfigModule *module)
+TQString ConfigModuleList::findModule(ConfigModule *module)
{
- QDictIterator<Menu> it(subMenus);
+ TQDictIterator<Menu> it(subMenus);
Menu *menu;
for(;(menu = it.current());++it)
{
if (menu->modules.containsRef(module))
return it.currentKey();
}
- return QString::null;
+ return TQString::null;
}
diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h
index f2364698d..ce31c7af0 100644
--- a/kcontrol/kcontrol/modules.h
+++ b/kcontrol/kcontrol/modules.h
@@ -21,8 +21,8 @@
#define MODULES_H
#include <kcmoduleinfo.h>
-#include <qobject.h>
-#include <qdict.h>
+#include <tqobject.h>
+#include <tqdict.h>
#include <qxembed.h>
template<class ConfigModule> class QPtrList;
@@ -36,7 +36,7 @@ class QVBoxLayout;
class QVBox;
class QWidgetStack;
-class ConfigModule : public QObject, public KCModuleInfo
+class ConfigModule : public TQObject, public KCModuleInfo
{
Q_OBJECT
@@ -81,53 +81,53 @@ private:
ProxyWidget *_module;
QXEmbed *_embedWidget;
KProcess *_rootProcess;
- QVBoxLayout *_embedLayout;
- QVBox *_embedFrame;
- QWidgetStack *_embedStack;
+ TQVBoxLayout *_embedLayout;
+ TQVBox *_embedFrame;
+ TQWidgetStack *_embedStack;
};
-class ConfigModuleList : public QPtrList<ConfigModule>
+class ConfigModuleList : public TQPtrList<ConfigModule>
{
public:
ConfigModuleList();
void readDesktopEntries();
- bool readDesktopEntriesRecursive(const QString &path);
+ bool readDesktopEntriesRecursive(const TQString &path);
/**
* Returns all submenus of the submenu identified by path
*/
- QPtrList<ConfigModule> modules(const QString &path);
+ TQPtrList<ConfigModule> modules(const TQString &path);
/**
* Returns all modules of the submenu identified by path
*/
- QStringList submenus(const QString &path);
+ TQStringList submenus(const TQString &path);
/**
* Returns the path of the submenu the module is in
*/
- QString findModule(ConfigModule *module);
+ TQString findModule(ConfigModule *module);
protected:
class Menu
{
public:
- QPtrList<ConfigModule> modules;
- QStringList submenus;
+ TQPtrList<ConfigModule> modules;
+ TQStringList submenus;
};
- QDict<Menu> subMenus;
+ TQDict<Menu> subMenus;
};
class KControlEmbed : public QXEmbed
{
Q_OBJECT
public:
- KControlEmbed( QWidget* w ) : QXEmbed( w ) {}
+ KControlEmbed( TQWidget* w ) : QXEmbed( w ) {}
virtual void windowChanged( WId w ) { if( w ) emit windowEmbedded( w ); }
signals:
void windowEmbedded( WId w );
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index f933cfcef..6f767ab20 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -18,31 +18,31 @@
*/
-#include <qheader.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qbitmap.h>
+#include <tqheader.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqbitmap.h>
#include <klocale.h>
#include <kiconloader.h>
#include <kservicegroup.h>
#include <kdebug.h>
-#include <qwhatsthis.h>
-#include <qbitmap.h>
+#include <tqwhatsthis.h>
+#include <tqbitmap.h>
#include "moduletreeview.h"
#include "moduletreeview.moc"
#include "modules.h"
#include "global.h"
-static QPixmap appIcon(const QString &iconName)
+static TQPixmap appIcon(const TQString &iconName)
{
- QString path;
- QPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, &path, true);
+ TQString path;
+ TQPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, &path, true);
// make sure they are not larger than KIcon::SizeSmall
if (normal.width() > KIcon::SizeSmall || normal.height() > KIcon::SizeSmall)
{
- QImage tmp = normal.convertToImage();
+ TQImage tmp = normal.convertToImage();
tmp = tmp.smoothScale(KIcon::SizeSmall, KIcon::SizeSmall);
normal.convertFromImage(tmp);
}
@@ -53,11 +53,11 @@ class ModuleTreeWhatsThis : public QWhatsThis
{
public:
ModuleTreeWhatsThis( ModuleTreeView* tree)
- : QWhatsThis( tree ), treeView( tree ) {}
+ : TQWhatsThis( tree ), treeView( tree ) {}
~ModuleTreeWhatsThis(){};
- QString text( const QPoint & p) {
+ TQString text( const TQPoint & p) {
ModuleTreeItem* i = (ModuleTreeItem*) treeView->itemAt( p );
if ( i && i->module() ) {
return i->module()->comment();
@@ -71,60 +71,60 @@ private:
ModuleTreeView* treeView;
};
-ModuleTreeView::ModuleTreeView(ConfigModuleList *list, QWidget * parent, const char * name)
+ModuleTreeView::ModuleTreeView(ConfigModuleList *list, TQWidget * parent, const char * name)
: KListView(parent, name)
, _modules(list)
{
- addColumn(QString::null);
- setColumnWidthMode (0, QListView::Maximum);
+ addColumn(TQString::null);
+ setColumnWidthMode (0, TQListView::Maximum);
setAllColumnsShowFocus(true);
- setResizeMode(QListView::AllColumns);
+ setResizeMode(TQListView::AllColumns);
setRootIsDecorated(true);
setHScrollBarMode(AlwaysOff);
header()->hide();
new ModuleTreeWhatsThis( this );
- connect(this, SIGNAL(clicked(QListViewItem*)),
- this, SLOT(slotItemSelected(QListViewItem*)));
+ connect(this, TQT_SIGNAL(clicked(TQListViewItem*)),
+ this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
}
void ModuleTreeView::fill()
{
clear();
- QStringList subMenus = _modules->submenus(KCGlobal::baseGroup());
- for(QStringList::ConstIterator it = subMenus.begin();
+ TQStringList subMenus = _modules->submenus(KCGlobal::baseGroup());
+ for(TQStringList::ConstIterator it = subMenus.begin();
it != subMenus.end(); ++it)
{
- QString path = *it;
+ TQString path = *it;
ModuleTreeItem* menu = new ModuleTreeItem(this);
menu->setGroup(path);
fill(menu, path);
}
ConfigModule *module;
- QPtrList<ConfigModule> moduleList = _modules->modules(KCGlobal::baseGroup());
+ TQPtrList<ConfigModule> moduleList = _modules->modules(KCGlobal::baseGroup());
for (module=moduleList.first(); module != 0; module=moduleList.next())
{
new ModuleTreeItem(this, module);
}
}
-void ModuleTreeView::fill(ModuleTreeItem *parent, const QString &parentPath)
+void ModuleTreeView::fill(ModuleTreeItem *parent, const TQString &parentPath)
{
- QStringList subMenus = _modules->submenus(parentPath);
- for(QStringList::ConstIterator it = subMenus.begin();
+ TQStringList subMenus = _modules->submenus(parentPath);
+ for(TQStringList::ConstIterator it = subMenus.begin();
it != subMenus.end(); ++it)
{
- QString path = *it;
+ TQString path = *it;
ModuleTreeItem* menu = new ModuleTreeItem(parent);
menu->setGroup(path);
fill(menu, path);
}
ConfigModule *module;
- QPtrList<ConfigModule> moduleList = _modules->modules(parentPath);
+ TQPtrList<ConfigModule> moduleList = _modules->modules(parentPath);
for (module=moduleList.first(); module != 0; module=moduleList.next())
{
new ModuleTreeItem(parent, module);
@@ -133,10 +133,10 @@ void ModuleTreeView::fill(ModuleTreeItem *parent, const QString &parentPath)
-QSize ModuleTreeView::sizeHint() const
+TQSize ModuleTreeView::sizeHint() const
{
- return QListView::sizeHint().boundedTo(
- QSize( fontMetrics().maxWidth()*35, QWIDGETSIZE_MAX) );
+ return TQListView::sizeHint().boundedTo(
+ TQSize( fontMetrics().maxWidth()*35, QWIDGETSIZE_MAX) );
}
void ModuleTreeView::makeSelected(ConfigModule *module)
@@ -162,7 +162,7 @@ void ModuleTreeView::updateItem(ModuleTreeItem *item, ConfigModule *module)
}
/*
-void ModuleTreeView::expandItem(QListViewItem *item, QPtrList<QListViewItem> *parentList)
+void ModuleTreeView::expandItem(TQListViewItem *item, TQPtrList<TQListViewItem> *parentList)
{
while (item)
{
@@ -176,14 +176,14 @@ void ModuleTreeView::expandItem(QListViewItem *item, QPtrList<QListViewItem> *pa
*/
void ModuleTreeView::makeVisible(ConfigModule *module)
{
- QString path = _modules->findModule(module);
+ TQString path = _modules->findModule(module);
if (path.startsWith(KCGlobal::baseGroup()))
path = path.mid(KCGlobal::baseGroup().length());
- QStringList groups = QStringList::split('/', path);
+ TQStringList groups = TQStringList::split('/', path);
ModuleTreeItem *item = 0;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for (it=groups.begin(); it != groups.end(); ++it)
{
if (item)
@@ -209,7 +209,7 @@ void ModuleTreeView::makeVisible(ConfigModule *module)
ensureItemVisible(item);
}
-void ModuleTreeView::slotItemSelected(QListViewItem* item)
+void ModuleTreeView::slotItemSelected(TQListViewItem* item)
{
if (!item) return;
@@ -228,9 +228,9 @@ void ModuleTreeView::slotItemSelected(QListViewItem* item)
/*
else
{
- QPtrList<QListViewItem> parents;
+ TQPtrList<TQListViewItem> parents;
- QListViewItem* i = item;
+ TQListViewItem* i = item;
while(i)
{
parents.append(i);
@@ -238,19 +238,19 @@ void ModuleTreeView::slotItemSelected(QListViewItem* item)
}
//int oy1 = item->itemPos();
- //int oy2 = mapFromGlobal(QCursor::pos()).y();
+ //int oy2 = mapFromGlobal(TQCursor::pos()).y();
//int offset = oy2 - oy1;
expandItem(firstChild(), &parents);
- //int x =mapFromGlobal(QCursor::pos()).x();
+ //int x =mapFromGlobal(TQCursor::pos()).x();
//int y = item->itemPos() + offset;
- //QCursor::setPos(mapToGlobal(QPoint(x, y)));
+ //TQCursor::setPos(mapToGlobal(TQPoint(x, y)));
}
*/
}
-void ModuleTreeView::keyPressEvent(QKeyEvent *e)
+void ModuleTreeView::keyPressEvent(TQKeyEvent *e)
{
if (!currentItem()) return;
@@ -258,7 +258,7 @@ void ModuleTreeView::keyPressEvent(QKeyEvent *e)
|| e->key() == Key_Enter
|| e->key() == Key_Space)
{
- //QCursor::setPos(mapToGlobal(QPoint(10, currentItem()->itemPos()+5)));
+ //TQCursor::setPos(mapToGlobal(TQPoint(10, currentItem()->itemPos()+5)));
slotItemSelected(currentItem());
}
else
@@ -266,10 +266,10 @@ void ModuleTreeView::keyPressEvent(QKeyEvent *e)
}
-ModuleTreeItem::ModuleTreeItem(QListViewItem *parent, ConfigModule *module)
- : QListViewItem(parent)
+ModuleTreeItem::ModuleTreeItem(TQListViewItem *parent, ConfigModule *module)
+ : TQListViewItem(parent)
, _module(module)
- , _tag(QString::null)
+ , _tag(TQString::null)
, _maxChildIconWidth(0)
{
if (_module)
@@ -280,10 +280,10 @@ ModuleTreeItem::ModuleTreeItem(QListViewItem *parent, ConfigModule *module)
}
}
-ModuleTreeItem::ModuleTreeItem(QListView *parent, ConfigModule *module)
- : QListViewItem(parent)
+ModuleTreeItem::ModuleTreeItem(TQListView *parent, ConfigModule *module)
+ : TQListViewItem(parent)
, _module(module)
- , _tag(QString::null)
+ , _tag(TQString::null)
, _maxChildIconWidth(0)
{
if (_module)
@@ -294,21 +294,21 @@ ModuleTreeItem::ModuleTreeItem(QListView *parent, ConfigModule *module)
}
}
-ModuleTreeItem::ModuleTreeItem(QListViewItem *parent, const QString& text)
- : QListViewItem(parent, " " + text)
+ModuleTreeItem::ModuleTreeItem(TQListViewItem *parent, const TQString& text)
+ : TQListViewItem(parent, " " + text)
, _module(0)
- , _tag(QString::null)
+ , _tag(TQString::null)
, _maxChildIconWidth(0)
{}
-ModuleTreeItem::ModuleTreeItem(QListView *parent, const QString& text)
- : QListViewItem(parent, " " + text)
+ModuleTreeItem::ModuleTreeItem(TQListView *parent, const TQString& text)
+ : TQListViewItem(parent, " " + text)
, _module(0)
- , _tag(QString::null)
+ , _tag(TQString::null)
, _maxChildIconWidth(0)
{}
-void ModuleTreeItem::setPixmap(int column, const QPixmap& pm)
+void ModuleTreeItem::setPixmap(int column, const TQPixmap& pm)
{
if (!pm.isNull())
{
@@ -317,7 +317,7 @@ void ModuleTreeItem::setPixmap(int column, const QPixmap& pm)
p->regChildIconWidth(pm.width());
}
- QListViewItem::setPixmap(column, pm);
+ TQListViewItem::setPixmap(column, pm);
}
void ModuleTreeItem::regChildIconWidth(int width)
@@ -326,7 +326,7 @@ void ModuleTreeItem::regChildIconWidth(int width)
_maxChildIconWidth = width;
}
-void ModuleTreeItem::paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int align )
+void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align )
{
if (!pixmap(0))
{
@@ -339,23 +339,23 @@ void ModuleTreeItem::paintCell( QPainter * p, const QColorGroup & cg, int column
if (offset > 0)
{
- QPixmap pixmap(offset, offset);
+ TQPixmap pixmap(offset, offset);
pixmap.fill(Qt::color0);
pixmap.setMask(pixmap.createHeuristicMask());
- QBitmap mask( pixmap.size(), true );
+ TQBitmap mask( pixmap.size(), true );
pixmap.setMask( mask );
- QListViewItem::setPixmap(0, pixmap);
+ TQListViewItem::setPixmap(0, pixmap);
}
}
- QListViewItem::paintCell( p, cg, column, width, align );
+ TQListViewItem::paintCell( p, cg, column, width, align );
}
-void ModuleTreeItem::setGroup(const QString &path)
+void ModuleTreeItem::setGroup(const TQString &path)
{
KServiceGroup::Ptr group = KServiceGroup::group(path);
- QString defName = path.left(path.length()-1);
+ TQString defName = path.left(path.length()-1);
int pos = defName.findRev('/');
if (pos >= 0)
defName = defName.mid(pos+1);
diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h
index ecdd2d938..3c16f099e 100644
--- a/kcontrol/kcontrol/moduletreeview.h
+++ b/kcontrol/kcontrol/moduletreeview.h
@@ -20,11 +20,11 @@
#ifndef __moduletreeview_h__
#define __moduletreeview_h__
-#include <qpalette.h>
-#include <qptrlist.h>
-#include <qlistview.h>
+#include <tqpalette.h>
+#include <tqptrlist.h>
+#include <tqlistview.h>
#include <klistview.h>
-#include <qdict.h>
+#include <tqdict.h>
class ConfigModule;
@@ -35,33 +35,33 @@ class ModuleTreeItem : public QListViewItem
{
public:
- ModuleTreeItem(QListViewItem *parent, ConfigModule *module = 0);
- ModuleTreeItem(QListViewItem *parent, const QString& text);
- ModuleTreeItem(QListView *parent, ConfigModule *module = 0);
- ModuleTreeItem(QListView *parent, const QString& text);
+ ModuleTreeItem(TQListViewItem *parent, ConfigModule *module = 0);
+ ModuleTreeItem(TQListViewItem *parent, const TQString& text);
+ ModuleTreeItem(TQListView *parent, ConfigModule *module = 0);
+ ModuleTreeItem(TQListView *parent, const TQString& text);
- void setTag(const QString& tag) { _tag = tag; }
- void setCaption(const QString& caption) { _caption = caption; }
+ void setTag(const TQString& tag) { _tag = tag; }
+ void setCaption(const TQString& caption) { _caption = caption; }
void setModule(ConfigModule *m) { _module = m; }
- QString tag() const { return _tag; };
- QString caption() const { return _caption; };
- QString icon() const { return _icon; };
+ TQString tag() const { return _tag; };
+ TQString caption() const { return _caption; };
+ TQString icon() const { return _icon; };
ConfigModule *module() { return _module; };
void regChildIconWidth(int width);
int maxChildIconWidth() { return _maxChildIconWidth; }
- void setPixmap(int column, const QPixmap& pm);
- void setGroup(const QString &path);
+ void setPixmap(int column, const TQPixmap& pm);
+ void setGroup(const TQString &path);
protected:
- void paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int align );
+ void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align );
private:
ConfigModule *_module;
- QString _tag;
- QString _caption;
+ TQString _tag;
+ TQString _caption;
int _maxChildIconWidth;
- QString _icon;
+ TQString _icon;
};
class ModuleTreeView : public KListView
@@ -69,24 +69,24 @@ class ModuleTreeView : public KListView
Q_OBJECT
public:
- ModuleTreeView(ConfigModuleList *list, QWidget * parent = 0, const char * name = 0);
+ ModuleTreeView(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0);
void makeSelected(ConfigModule* module);
void makeVisible(ConfigModule *module);
void fill();
- QSize sizeHint() const;
+ TQSize sizeHint() const;
signals:
void moduleSelected(ConfigModule*);
- void categorySelected(QListViewItem*);
+ void categorySelected(TQListViewItem*);
protected slots:
- void slotItemSelected(QListViewItem*);
+ void slotItemSelected(TQListViewItem*);
protected:
void updateItem(ModuleTreeItem *item, ConfigModule* module);
- void keyPressEvent(QKeyEvent *);
- void fill(ModuleTreeItem *parent, const QString &parentPath);
+ void keyPressEvent(TQKeyEvent *);
+ void fill(ModuleTreeItem *parent, const TQString &parentPath);
private:
ConfigModuleList *_modules;
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index 6654bfe14..b8f83c5fc 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -20,7 +20,7 @@
#include <unistd.h> // for getuid()
#include <kpushbutton.h>
-#include <qlayout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include <kapplication.h>
#include <kcmodule.h>
@@ -29,25 +29,25 @@
#include <kstdguiitem.h>
#include <dcopclient.h>
-#include <qwhatsthis.h>
-#include <qlabel.h>
+#include <tqwhatsthis.h>
+#include <tqlabel.h>
#include "global.h"
#include "proxywidget.h"
#include "proxywidget.moc"
#include <kdebug.h>
-#include <qtimer.h>
+#include <tqtimer.h>
class WhatsThis : public QWhatsThis
{
public:
WhatsThis( ProxyWidget* parent )
- : QWhatsThis( parent ), proxy( parent ) {}
+ : TQWhatsThis( parent ), proxy( parent ) {}
~WhatsThis(){};
- QString text( const QPoint & ) {
+ TQString text( const TQPoint & ) {
if ( !proxy->quickHelp().isEmpty() )
return proxy->quickHelp();
else
@@ -60,7 +60,7 @@ private:
////////////////////////////////////////////////////////////////////////////////////////////////////////
-static void setVisible(QPushButton *btn, bool vis)
+static void setVisible(TQPushButton *btn, bool vis)
{
if (vis)
btn->show();
@@ -75,21 +75,21 @@ static void setVisible(QPushButton *btn, bool vis)
class RootInfoWidget : public QLabel
{
public:
- RootInfoWidget(QWidget *parent, const char *name);
- void setRootMsg(const QString& s) { setText(s); }
+ RootInfoWidget(TQWidget *parent, const char *name);
+ void setRootMsg(const TQString& s) { setText(s); }
};
-RootInfoWidget::RootInfoWidget(QWidget *parent, const char *name = 0)
- : QLabel(parent, name)
+RootInfoWidget::RootInfoWidget(TQWidget *parent, const char *name = 0)
+ : TQLabel(parent, name)
{
- setFrameShape(QFrame::Box);
- setFrameShadow(QFrame::Raised);
+ setFrameShape(TQFrame::Box);
+ setFrameShadow(TQFrame::Raised);
setText(i18n("<b>Changes in this module require root access.</b><br>"
"Click the \"Administrator Mode\" button to "
"allow modifications in this module."));
- QWhatsThis::add(this, i18n("This module requires special permissions, probably "
+ TQWhatsThis::add(this, i18n("This module requires special permissions, probably "
"for system-wide modifications; therefore, it is "
"required that you provide the root password to be "
"able to change the module's properties. If you "
@@ -103,12 +103,12 @@ RootInfoWidget::RootInfoWidget(QWidget *parent, const char *name = 0)
class ProxyView : public QScrollView
{
public:
- ProxyView(KCModule *client, const QString& title, QWidget *parent, bool run_as_root, const char *name);
+ ProxyView(KCModule *client, const TQString& title, TQWidget *parent, bool run_as_root, const char *name);
private:
- virtual void resizeEvent(QResizeEvent *);
+ virtual void resizeEvent(TQResizeEvent *);
- QWidget *contentWidget;
+ TQWidget *contentWidget;
KCModule *client;
bool scroll;
};
@@ -116,82 +116,82 @@ private:
class ProxyContentWidget : public QWidget
{
public:
- ProxyContentWidget( QWidget* parent ) : QWidget( parent ) {}
+ ProxyContentWidget( TQWidget* parent ) : TQWidget( parent ) {}
~ProxyContentWidget(){}
// this should be really done by qscrollview in AutoOneFit mode!
- QSize sizeHint() const { return minimumSizeHint(); }
+ TQSize sizeHint() const { return minimumSizeHint(); }
};
-ProxyView::ProxyView(KCModule *_client, const QString&, QWidget *parent, bool run_as_root, const char *name)
- : QScrollView(parent, name), client(_client)
+ProxyView::ProxyView(KCModule *_client, const TQString&, TQWidget *parent, bool run_as_root, const char *name)
+ : TQScrollView(parent, name), client(_client)
{
- setResizePolicy(QScrollView::AutoOneFit);
+ setResizePolicy(TQScrollView::AutoOneFit);
setFrameStyle( NoFrame );
contentWidget = new ProxyContentWidget( viewport() );
- QVBoxLayout* vbox = new QVBoxLayout( contentWidget );
+ TQVBoxLayout* vbox = new TQVBoxLayout( contentWidget );
if (run_as_root && _client->useRootOnlyMsg()) // notify the user
{
RootInfoWidget *infoBox = new RootInfoWidget(contentWidget);
vbox->addWidget( infoBox );
- QString msg = _client->rootOnlyMsg();
+ TQString msg = _client->rootOnlyMsg();
if (!msg.isEmpty())
infoBox->setRootMsg(msg);
vbox->setSpacing(KDialog::spacingHint());
}
- client->reparent(contentWidget,0,QPoint(0,0),true);
+ client->reparent(contentWidget,0,TQPoint(0,0),true);
vbox->addWidget( client );
vbox->activate(); // make sure we have a proper minimumSizeHint
addChild(contentWidget);
}
-void ProxyView::resizeEvent(QResizeEvent *e)
+void ProxyView::resizeEvent(TQResizeEvent *e)
{
- QScrollView::resizeEvent(e);
+ TQScrollView::resizeEvent(e);
}
////////////////////////////////////////////////////////////////////////////////////////////////////////
-ProxyWidget::ProxyWidget(KCModule *client, QString title, const char *name,
+ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name,
bool run_as_root)
- : QWidget(0, name)
+ : TQWidget(0, name)
, _client(client)
{
setCaption(title);
if (getuid()==0 ) {
// Make root modules look as similar as possible...
- QCString replyType;
- QByteArray replyData;
+ TQCString replyType;
+ TQByteArray replyData;
- if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", QByteArray(),
+ if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", TQByteArray(),
replyType, replyData))
- if ( replyType == "QPalette") {
- QDataStream reply( replyData, IO_ReadOnly );
- QPalette pal;
+ if ( replyType == "TQPalette") {
+ TQDataStream reply( replyData, IO_ReadOnly );
+ TQPalette pal;
reply >> pal;
setPalette(pal);
}
/* // Doesn't work ...
- if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", QByteArray(),
+ if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", TQByteArray(),
replyType, replyData))
- if ( replyType == "QString") {
- QDataStream reply( replyData, IO_ReadOnly );
- QString style;
+ if ( replyType == "TQString") {
+ TQDataStream reply( replyData, IO_ReadOnly );
+ TQString style;
reply >> style;
setStyle(style);
}
*/
- if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", QByteArray(),
+ if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", TQByteArray(),
replyType, replyData))
- if ( replyType == "QFont") {
- QDataStream reply( replyData, IO_ReadOnly );
- QFont font;
+ if ( replyType == "TQFont") {
+ TQDataStream reply( replyData, IO_ReadOnly );
+ TQFont font;
reply >> font;
setFont(font);
}
@@ -200,8 +200,8 @@ ProxyWidget::ProxyWidget(KCModule *client, QString title, const char *name,
view = new ProxyView(client, title, this, run_as_root, "proxyview");
(void) new WhatsThis( this );
- connect(_client, SIGNAL(changed(bool)), SLOT(clientChanged(bool)));
- connect(_client, SIGNAL(quickHelpChanged()), SIGNAL(quickHelpChanged()));
+ connect(_client, TQT_SIGNAL(changed(bool)), TQT_SLOT(clientChanged(bool)));
+ connect(_client, TQT_SIGNAL(quickHelpChanged()), TQT_SIGNAL(quickHelpChanged()));
_sep = new KSeparator(KSeparator::HLine, this);
@@ -225,18 +225,18 @@ ProxyWidget::ProxyWidget(KCModule *client, QString title, const char *name,
_apply->setEnabled( false );
_reset->setEnabled( false );
- connect(_handbook, SIGNAL(clicked()), SLOT(handbookClicked()));
- connect(_default, SIGNAL(clicked()), SLOT(defaultClicked()));
- connect(_apply, SIGNAL(clicked()), SLOT(applyClicked()));
- connect(_reset, SIGNAL(clicked()), SLOT(resetClicked()));
- connect(_root, SIGNAL(clicked()), SLOT(rootClicked()));
+ connect(_handbook, TQT_SIGNAL(clicked()), TQT_SLOT(handbookClicked()));
+ connect(_default, TQT_SIGNAL(clicked()), TQT_SLOT(defaultClicked()));
+ connect(_apply, TQT_SIGNAL(clicked()), TQT_SLOT(applyClicked()));
+ connect(_reset, TQT_SIGNAL(clicked()), TQT_SLOT(resetClicked()));
+ connect(_root, TQT_SIGNAL(clicked()), TQT_SLOT(rootClicked()));
- QVBoxLayout *top = new QVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint());
top->addWidget(view);
top->addWidget(_sep);
- QHBoxLayout *buttons = new QHBoxLayout(top, 4);
+ TQHBoxLayout *buttons = new TQHBoxLayout(top, 4);
buttons->addWidget(_handbook);
buttons->addWidget(_default);
if (run_as_root)
@@ -259,7 +259,7 @@ ProxyWidget::~ProxyWidget()
delete _client;
}
-QString ProxyWidget::quickHelp() const
+TQString ProxyWidget::quickHelp() const
{
if (_client)
return _client->quickHelp();
@@ -272,7 +272,7 @@ void ProxyWidget::handbookClicked()
if (getuid()!=0)
emit handbookRequest();
else
- kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", QByteArray());
+ kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", TQByteArray());
}
void ProxyWidget::helpClicked()
@@ -280,7 +280,7 @@ void ProxyWidget::helpClicked()
if (getuid()!=0)
emit helpRequest();
else
- kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", QByteArray());
+ kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", TQByteArray());
}
void ProxyWidget::defaultClicked()
diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h
index a06e571de..c1368b447 100644
--- a/kcontrol/kcontrol/proxywidget.h
+++ b/kcontrol/kcontrol/proxywidget.h
@@ -32,7 +32,7 @@ class KCModule;
class KAboutData;
#include "dockcontainer.h"
-#include <qscrollview.h>
+#include <tqscrollview.h>
class ProxyView;
@@ -42,10 +42,10 @@ class ProxyWidget : public QWidget
public:
- ProxyWidget(KCModule *client, QString title, const char *name=0, bool run_as_root = false);
+ ProxyWidget(KCModule *client, TQString title, const char *name=0, bool run_as_root = false);
~ProxyWidget();
- QString quickHelp() const;
+ TQString quickHelp() const;
const KAboutData *aboutData() const;
public slots:
@@ -71,8 +71,8 @@ signals:
private:
- QPushButton *_handbook, *_default, *_apply, *_reset, *_root;
- QFrame *_sep;
+ TQPushButton *_handbook, *_default, *_apply, *_reset, *_root;
+ TQFrame *_sep;
KCModule *_client;
ProxyView *view;
diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp
index 9701d2d20..e4949622d 100644
--- a/kcontrol/kcontrol/searchwidget.cpp
+++ b/kcontrol/kcontrol/searchwidget.cpp
@@ -18,10 +18,10 @@
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qsortedlist.h>
-#include <qregexp.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqsortedlist.h>
+#include <tqregexp.h>
#include <klineedit.h>
#include <kiconloader.h>
@@ -37,8 +37,8 @@
class ModuleItem : public QListBoxPixmap
{
public:
- ModuleItem(ConfigModule *module, QListBox * listbox = 0) :
- QListBoxPixmap(listbox,
+ ModuleItem(ConfigModule *module, TQListBox * listbox = 0) :
+ TQListBoxPixmap(listbox,
KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall),
module->moduleName())
, m_module(module)
@@ -53,7 +53,7 @@ protected:
};
-KeywordListEntry::KeywordListEntry(const QString& name, ConfigModule* module)
+KeywordListEntry::KeywordListEntry(const TQString& name, ConfigModule* module)
: _name(name)
{
if(module)
@@ -66,35 +66,35 @@ void KeywordListEntry::addModule(ConfigModule* module)
_modules.append(module);
}
-SearchWidget::SearchWidget(QWidget *parent , const char *name)
- : QWidget(parent, name)
+SearchWidget::SearchWidget(TQWidget *parent , const char *name)
+ : TQWidget(parent, name)
{
_keywords.setAutoDelete(true);
- QVBoxLayout * l = new QVBoxLayout(this, 0, 2);
+ TQVBoxLayout * l = new TQVBoxLayout(this, 0, 2);
// keyword list
_keyList = new KListBox(this);
- QLabel *keyl = new QLabel(_keyList, i18n("&Keywords:"), this);
+ TQLabel *keyl = new TQLabel(_keyList, i18n("&Keywords:"), this);
l->addWidget(keyl);
l->addWidget(_keyList);
// result list
_resultList = new KListBox(this);
- QLabel *resultl = new QLabel(_resultList, i18n("&Results:"), this);
+ TQLabel *resultl = new TQLabel(_resultList, i18n("&Results:"), this);
l->addWidget(resultl);
l->addWidget(_resultList);
- connect(_keyList, SIGNAL(highlighted(const QString&)),
- this, SLOT(slotKeywordSelected(const QString&)));
+ connect(_keyList, TQT_SIGNAL(highlighted(const TQString&)),
+ this, TQT_SLOT(slotKeywordSelected(const TQString&)));
- connect(_resultList, SIGNAL(selected(QListBoxItem*)),
- this, SLOT(slotModuleSelected(QListBoxItem *)));
- connect(_resultList, SIGNAL(clicked(QListBoxItem *)),
- this, SLOT(slotModuleClicked(QListBoxItem *)));
+ connect(_resultList, TQT_SIGNAL(selected(TQListBoxItem*)),
+ this, TQT_SLOT(slotModuleSelected(TQListBoxItem *)));
+ connect(_resultList, TQT_SIGNAL(clicked(TQListBoxItem *)),
+ this, TQT_SLOT(slotModuleClicked(TQListBoxItem *)));
}
void SearchWidget::populateKeywordList(ConfigModuleList *list)
@@ -108,13 +108,13 @@ void SearchWidget::populateKeywordList(ConfigModuleList *list)
continue;
// get the modules keyword list
- QStringList kw = module->keywords();
+ TQStringList kw = module->keywords();
kw << module->moduleName();
// loop through the keyword list to populate _keywords
- for(QStringList::ConstIterator it = kw.begin(); it != kw.end(); ++it)
+ for(TQStringList::ConstIterator it = kw.begin(); it != kw.end(); ++it)
{
- QString name = (*it).lower();
+ TQString name = (*it).lower();
bool found = false;
// look if _keywords already has an entry for this keyword
@@ -140,35 +140,35 @@ void SearchWidget::populateKeywordList(ConfigModuleList *list)
populateKeyListBox("*");
}
-void SearchWidget::populateKeyListBox(const QString& s)
+void SearchWidget::populateKeyListBox(const TQString& s)
{
_keyList->clear();
- QStringList matches;
+ TQStringList matches;
for(KeywordListEntry *k = _keywords.first(); k != 0; k = _keywords.next())
{
- if ( QRegExp(s, false, true).search(k->moduleName()) >= 0)
+ if ( TQRegExp(s, false, true).search(k->moduleName()) >= 0)
matches.append(k->moduleName().stripWhiteSpace());
}
- for(QStringList::ConstIterator it = matches.begin(); it != matches.end(); it++)
+ for(TQStringList::ConstIterator it = matches.begin(); it != matches.end(); it++)
_keyList->insertItem(*it);
_keyList->sort();
}
-void SearchWidget::populateResultListBox(const QString& s)
+void SearchWidget::populateResultListBox(const TQString& s)
{
_resultList->clear();
- QPtrList<ModuleItem> results;
+ TQPtrList<ModuleItem> results;
for(KeywordListEntry *k = _keywords.first(); k != 0; k = _keywords.next())
{
if (k->moduleName() == s)
{
- QPtrList<ConfigModule> modules = k->modules();
+ TQPtrList<ConfigModule> modules = k->modules();
for(ConfigModule *m = modules.first(); m != 0; m = modules.next())
new ModuleItem(m, _resultList);
@@ -178,27 +178,27 @@ void SearchWidget::populateResultListBox(const QString& s)
_resultList->sort();
}
-void SearchWidget::searchTextChanged(const QString & s)
+void SearchWidget::searchTextChanged(const TQString & s)
{
- QString regexp = s;
+ TQString regexp = s;
regexp += "*";
populateKeyListBox(regexp);
if (_keyList->count()==1)
_keyList->setSelected(0,true);
}
-void SearchWidget::slotKeywordSelected(const QString & s)
+void SearchWidget::slotKeywordSelected(const TQString & s)
{
populateResultListBox(s);
}
-void SearchWidget::slotModuleSelected(QListBoxItem *item)
+void SearchWidget::slotModuleSelected(TQListBoxItem *item)
{
if (item)
emit moduleSelected( static_cast<ModuleItem*>(item)->module() );
}
-void SearchWidget::slotModuleClicked(QListBoxItem *item)
+void SearchWidget::slotModuleClicked(TQListBoxItem *item)
{
if (item)
emit moduleSelected( static_cast<ModuleItem*>(item)->module() );
diff --git a/kcontrol/kcontrol/searchwidget.h b/kcontrol/kcontrol/searchwidget.h
index 99aceb7e8..492de1729 100644
--- a/kcontrol/kcontrol/searchwidget.h
+++ b/kcontrol/kcontrol/searchwidget.h
@@ -21,10 +21,10 @@
#ifndef __searchwidget_h__
#define __searchwidget_h__
-#include <qwidget.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqwidget.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include "modules.h"
@@ -35,16 +35,16 @@ class QListBoxItem;
class KeywordListEntry
{
public:
- KeywordListEntry(const QString& name, ConfigModule* module);
+ KeywordListEntry(const TQString& name, ConfigModule* module);
void addModule(ConfigModule* module);
- QString moduleName() { return _name; }
- QPtrList<ConfigModule> modules() { return _modules; }
+ TQString moduleName() { return _name; }
+ TQPtrList<ConfigModule> modules() { return _modules; }
private:
- QString _name;
- QPtrList<ConfigModule> _modules;
+ TQString _name;
+ TQPtrList<ConfigModule> _modules;
};
@@ -53,26 +53,26 @@ class SearchWidget : public QWidget
Q_OBJECT
public:
- SearchWidget(QWidget *parent, const char *name=0);
+ SearchWidget(TQWidget *parent, const char *name=0);
void populateKeywordList(ConfigModuleList *list);
- void searchTextChanged(const QString &);
+ void searchTextChanged(const TQString &);
signals:
void moduleSelected(ConfigModule *);
protected:
- void populateKeyListBox(const QString& regexp);
- void populateResultListBox(const QString& keyword);
+ void populateKeyListBox(const TQString& regexp);
+ void populateResultListBox(const TQString& keyword);
protected slots:
- void slotKeywordSelected(const QString &);
- void slotModuleSelected(QListBoxItem *item);
- void slotModuleClicked(QListBoxItem *item);
+ void slotKeywordSelected(const TQString &);
+ void slotModuleSelected(TQListBoxItem *item);
+ void slotModuleClicked(TQListBoxItem *item);
private:
KListBox *_keyList, *_resultList;
- QPtrList<KeywordListEntry> _keywords;
+ TQPtrList<KeywordListEntry> _keywords;
};
#endif
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index c7a47e372..aac3427ff 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -30,12 +30,12 @@
#include <kiconloader.h>
#include <klineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qtabwidget.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqtabwidget.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
#include "indexwidget.h"
#include "searchwidget.h"
@@ -52,21 +52,21 @@ TopLevel::TopLevel(const char* name)
: KMainWindow( 0, name, WStyle_ContextHelp )
, _active(0), dummyAbout(0)
{
- setCaption(QString::null);
+ setCaption(TQString::null);
report_bug = 0;
// read settings
KConfig *config = KGlobal::config();
config->setGroup("Index");
- QString viewmode = config->readEntry("ViewMode", "Tree");
+ TQString viewmode = config->readEntry("ViewMode", "Tree");
if (viewmode == "Tree")
KCGlobal::setViewMode(Tree);
else
KCGlobal::setViewMode(Icon);
- QString size = config->readEntry("IconSize", "Medium");
+ TQString size = config->readEntry("IconSize", "Medium");
if (size == "Small")
KCGlobal::setIconSize(KIcon::SizeSmall);
else if (size == "Large")
@@ -81,58 +81,58 @@ TopLevel::TopLevel(const char* name)
_modules->readDesktopEntries();
for ( ConfigModule* m = _modules->first(); m; m = _modules->next() ) {
- connect( m, SIGNAL( handbookRequest() ), this, SLOT( slotHandbookRequest() ) );
- connect( m, SIGNAL( helpRequest() ), this, SLOT( slotHelpRequest() ) );
+ connect( m, TQT_SIGNAL( handbookRequest() ), this, TQT_SLOT( slotHandbookRequest() ) );
+ connect( m, TQT_SIGNAL( helpRequest() ), this, TQT_SLOT( slotHelpRequest() ) );
}
// create the layout box
- _splitter = new QSplitter( QSplitter::Horizontal, this );
+ _splitter = new TQSplitter( TQSplitter::Horizontal, this );
- QFrame* leftFrame = new QFrame ( _splitter );
- QBoxLayout *leftFrameLayout = new QVBoxLayout( leftFrame );
+ TQFrame* leftFrame = new TQFrame ( _splitter );
+ TQBoxLayout *leftFrameLayout = new TQVBoxLayout( leftFrame );
- QFrame* mSearchFrame = new QFrame( leftFrame );
+ TQFrame* mSearchFrame = new TQFrame( leftFrame );
leftFrameLayout->addWidget( mSearchFrame );
- QBoxLayout *searchLayout = new QHBoxLayout( mSearchFrame );
+ TQBoxLayout *searchLayout = new TQHBoxLayout( mSearchFrame );
searchLayout->setSpacing( KDialog::spacingHint() );
searchLayout->setMargin( 6 );
- QPushButton *clearButton = new QPushButton( mSearchFrame );
+ TQPushButton *clearButton = new TQPushButton( mSearchFrame );
clearButton->setIconSet( KApplication::reverseLayout() ?
SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") );
searchLayout->addWidget( clearButton );
- QToolTip::add( clearButton, i18n("Clear search") );
+ TQToolTip::add( clearButton, i18n("Clear search") );
- QLabel *label = new QLabel(i18n("Search:"), mSearchFrame );
+ TQLabel *label = new TQLabel(i18n("Search:"), mSearchFrame );
searchLayout->addWidget( label );
KLineEdit *searchEdit = new KLineEdit( mSearchFrame );
clearButton->setFixedHeight( searchEdit->height() );
- connect( clearButton, SIGNAL( clicked() ), searchEdit, SLOT( clear() ) );
+ connect( clearButton, TQT_SIGNAL( clicked() ), searchEdit, TQT_SLOT( clear() ) );
label->setBuddy( searchEdit );
searchLayout->addWidget( searchEdit );
- connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
- SLOT( slotSearchChanged(const QString &) ) );
+ connect( searchEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
+ TQT_SLOT( slotSearchChanged(const TQString &) ) );
// create the left hand side under search
- _stack = new QWidgetStack( leftFrame );
+ _stack = new TQWidgetStack( leftFrame );
leftFrameLayout->addWidget( _stack );
// index tab
_index = new IndexWidget(_modules, this);
- connect(_index, SIGNAL(moduleActivated(ConfigModule*)),
- this, SLOT(activateModule(ConfigModule*)));
+ connect(_index, TQT_SIGNAL(moduleActivated(ConfigModule*)),
+ this, TQT_SLOT(activateModule(ConfigModule*)));
_stack->addWidget( _index );
- connect(_index, SIGNAL(categorySelected(QListViewItem*)),
- this, SLOT(categorySelected(QListViewItem*)));
+ connect(_index, TQT_SIGNAL(categorySelected(TQListViewItem*)),
+ this, TQT_SLOT(categorySelected(TQListViewItem*)));
// search tab
_search = new SearchWidget(this);
_search->populateKeywordList(_modules);
- connect(_search, SIGNAL(moduleSelected(ConfigModule *)),
- this, SLOT(activateModule(ConfigModule *)));
+ connect(_search, TQT_SIGNAL(moduleSelected(ConfigModule *)),
+ this, TQT_SLOT(activateModule(ConfigModule *)));
_stack->addWidget( _search );
@@ -142,21 +142,21 @@ TopLevel::TopLevel(const char* name)
// help widget
_help = new HelpWidget(_dock);
- _stack->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
+ _stack->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
// Restore sizes
config->setGroup("General");
- QValueList<int> sizes = config->readIntListEntry( "SplitterSizes" );
+ TQValueList<int> sizes = config->readIntListEntry( "SplitterSizes" );
if (!sizes.isEmpty())
_splitter->setSizes(sizes);
// That one does the trick ...
- _splitter->setResizeMode( leftFrame, QSplitter::KeepSize );
+ _splitter->setResizeMode( leftFrame, TQSplitter::KeepSize );
- connect(_dock, SIGNAL(newModule(const QString&, const QString&, const QString&)),
- this, SLOT(newModule(const QString&, const QString&, const QString&)));
- connect(_dock, SIGNAL(changedModule(ConfigModule*)),
- SLOT(changedModule(ConfigModule*)));
+ connect(_dock, TQT_SIGNAL(newModule(const TQString&, const TQString&, const TQString&)),
+ this, TQT_SLOT(newModule(const TQString&, const TQString&, const TQString&)));
+ connect(_dock, TQT_SIGNAL(changedModule(ConfigModule*)),
+ TQT_SLOT(changedModule(ConfigModule*)));
// set the main view
setCentralWidget( _splitter );
@@ -178,8 +178,8 @@ TopLevel::TopLevel(const char* name)
if (KCGlobal::isInfoCenter())
{
AboutWidget *aw = new AboutWidget( this, 0, _index->firstTreeViewItem());
- connect( aw, SIGNAL( moduleSelected( ConfigModule * ) ),
- SLOT( activateModule( ConfigModule * ) ) );
+ connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ),
+ TQT_SLOT( activateModule( ConfigModule * ) ) );
_dock->setBaseWidget( aw );
KWin::setIcons( winId(),
KGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 32 ),
@@ -188,8 +188,8 @@ TopLevel::TopLevel(const char* name)
else
{
AboutWidget *aw = new AboutWidget(this);
- connect( aw, SIGNAL( moduleSelected( ConfigModule * ) ),
- SLOT( activateModule( ConfigModule * ) ) );
+ connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ),
+ TQT_SLOT( activateModule( ConfigModule * ) ) );
_dock->setBaseWidget(aw);
}
}
@@ -234,40 +234,40 @@ bool TopLevel::queryClose()
void TopLevel::setupActions()
{
- KStdAction::quit(this, SLOT(close()), actionCollection());
- KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()),
+ KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+ KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
icon_view = new KRadioAction
- (i18n("&Icon View"), 0, this, SLOT(activateIconView()),
+ (i18n("&Icon View"), 0, this, TQT_SLOT(activateIconView()),
actionCollection(), "activate_iconview");
icon_view->setExclusiveGroup( "viewmode" );
tree_view = new KRadioAction
- (i18n("&Tree View"), 0, this, SLOT(activateTreeView()),
+ (i18n("&Tree View"), 0, this, TQT_SLOT(activateTreeView()),
actionCollection(), "activate_treeview");
tree_view->setExclusiveGroup( "viewmode" );
icon_small = new KRadioAction
- (i18n("&Small"), 0, this, SLOT(activateSmallIcons()),
+ (i18n("&Small"), 0, this, TQT_SLOT(activateSmallIcons()),
actionCollection(), "activate_smallicons");
icon_small->setExclusiveGroup( "iconsize" );
icon_medium = new KRadioAction
- (i18n("&Medium"), 0, this, SLOT(activateMediumIcons()),
+ (i18n("&Medium"), 0, this, TQT_SLOT(activateMediumIcons()),
actionCollection(), "activate_mediumicons");
icon_medium->setExclusiveGroup( "iconsize" );
icon_large = new KRadioAction
- (i18n("&Large"), 0, this, SLOT(activateLargeIcons()),
+ (i18n("&Large"), 0, this, TQT_SLOT(activateLargeIcons()),
actionCollection(), "activate_largeicons");
icon_large->setExclusiveGroup( "iconsize" );
icon_huge = new KRadioAction
- (i18n("&Huge"), 0, this, SLOT(activateHugeIcons()),
+ (i18n("&Huge"), 0, this, TQT_SLOT(activateHugeIcons()),
actionCollection(), "activate_hugeicons");
icon_huge->setExclusiveGroup( "iconsize" );
- about_module = new KAction(i18n("About Current Module"), 0, this, SLOT(aboutModule()), actionCollection(), "help_about_module");
+ about_module = new KAction(i18n("About Current Module"), 0, this, TQT_SLOT(aboutModule()), actionCollection(), "help_about_module");
about_module->setEnabled(false);
// I need to add this so that each module can get a bug reported,
@@ -280,7 +280,7 @@ actionCollection());
report_bug = actionCollection()->action("help_report_bug");
report_bug->setText(i18n("&Report Bug..."));
report_bug->disconnect();
- connect(report_bug, SIGNAL(activated()), SLOT(reportBug()));
+ connect(report_bug, TQT_SIGNAL(activated()), TQT_SLOT(reportBug()));
}
void TopLevel::activateIconView()
@@ -345,7 +345,7 @@ void TopLevel::activateHugeIcons()
_index->reload();
}
-void TopLevel::newModule(const QString &name, const QString& docPath, const QString &quickhelp)
+void TopLevel::newModule(const TQString &name, const TQString& docPath, const TQString &quickhelp)
{
setCaption(name, false);
@@ -366,7 +366,7 @@ void TopLevel::changedModule(ConfigModule *changed)
setCaption(changed->moduleName(), changed->isChanged() );
}
-void TopLevel::categorySelected(QListViewItem *category)
+void TopLevel::categorySelected(TQListViewItem *category)
{
if (_active)
{
@@ -390,13 +390,13 @@ void TopLevel::categorySelected(QListViewItem *category)
}
_dock->removeModule();
about_module->setText( i18n( "About Current Module" ) );
- about_module->setIconSet( QIconSet() );
+ about_module->setIconSet( TQIconSet() );
about_module->setEnabled( false );
// insert the about widget
- QListViewItem *firstItem = category->firstChild();
- QString caption = static_cast<ModuleTreeItem*>(category)->caption();
- QString icon = static_cast<ModuleTreeItem*>(category)->icon();
+ TQListViewItem *firstItem = category->firstChild();
+ TQString caption = static_cast<ModuleTreeItem*>(category)->caption();
+ TQString icon = static_cast<ModuleTreeItem*>(category)->icon();
if( _dock->baseWidget()->isA( "AboutWidget" ) )
{
static_cast<AboutWidget *>( _dock->baseWidget() )->setCategory( firstItem, icon, caption);
@@ -404,8 +404,8 @@ void TopLevel::categorySelected(QListViewItem *category)
else
{
AboutWidget *aw = new AboutWidget( this, 0, firstItem, caption );
- connect( aw, SIGNAL( moduleSelected( ConfigModule * ) ),
- SLOT( activateModule( ConfigModule * ) ) );
+ connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ),
+ TQT_SLOT( activateModule( ConfigModule * ) ) );
_dock->setBaseWidget( aw );
}
}
@@ -445,7 +445,7 @@ void TopLevel::activateModule(ConfigModule *mod)
else
{
about_module->setText(i18n("About Current Module"));
- about_module->setIconSet(QIconSet());
+ about_module->setIconSet(TQIconSet());
about_module->setEnabled(false);
}
}
@@ -456,7 +456,7 @@ void TopLevel::deleteDummyAbout()
dummyAbout = 0;
}
-void TopLevel::slotSearchChanged(const QString& search)
+void TopLevel::slotSearchChanged(const TQString& search)
{
if (search.isEmpty())
_stack->raiseWidget(_index);
@@ -469,7 +469,7 @@ void TopLevel::slotSearchChanged(const QString& search)
void TopLevel::slotHelpRequest()
{
- _help->display(_help->text(), QCursor::pos ( ), _dock);
+ _help->display(_help->text(), TQCursor::pos ( ), _dock);
}
void TopLevel::slotHandbookRequest()
@@ -500,7 +500,7 @@ void TopLevel::reportBug()
}
KBugReport *br = new KBugReport(this, false, dummyAbout);
if (deleteit)
- connect(br, SIGNAL(finished()), SLOT(deleteDummyAbout()));
+ connect(br, TQT_SIGNAL(finished()), TQT_SLOT(deleteDummyAbout()));
else
dummyAbout = 0;
br->show();
@@ -512,7 +512,7 @@ void TopLevel::aboutModule()
dlg.exec();
}
-QString TopLevel::handleAmpersand( QString modulename ) const
+TQString TopLevel::handleAmpersand( TQString modulename ) const
{
if( modulename.contains( '&' )) // double it
{
diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h
index 02e42a49e..2f10cb3bc 100644
--- a/kcontrol/kcontrol/toplevel.h
+++ b/kcontrol/kcontrol/toplevel.h
@@ -22,7 +22,7 @@
#define __TOPLEVEL_H__
#include <kmainwindow.h>
-#include <qlistview.h>
+#include <tqlistview.h>
class QSplitter;
@@ -52,8 +52,8 @@ protected:
protected slots:
void activateModule(ConfigModule *);
- void categorySelected(QListViewItem *category);
- void newModule(const QString &name, const QString& docPath, const QString &quickhelp);
+ void categorySelected(TQListViewItem *category);
+ void newModule(const TQString &name, const TQString& docPath, const TQString &quickhelp);
void activateIconView();
void activateTreeView();
@@ -67,7 +67,7 @@ protected slots:
void deleteDummyAbout();
- void slotSearchChanged(const QString &);
+ void slotSearchChanged(const TQString &);
void slotHandbookRequest();
void slotHelpRequest();
@@ -77,10 +77,10 @@ protected slots:
private:
- QString handleAmpersand( QString ) const;
+ TQString handleAmpersand( TQString ) const;
- QSplitter *_splitter;
- QWidgetStack *_stack;
+ TQSplitter *_splitter;
+ TQWidgetStack *_stack;
DockContainer *_dock;
ModuleTitle *_title;
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index e30d73b6f..f24af2c1e 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -17,12 +17,12 @@
Boston, MA 02110-1301, USA.
*/
-#include <qheader.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qtimer.h>
-#include <qvgroupbox.h>
-#include <qwhatsthis.h>
+#include <tqheader.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqtimer.h>
+#include <tqvgroupbox.h>
+#include <tqwhatsthis.h>
#include <dcopclient.h>
#include <dcopref.h>
@@ -42,11 +42,11 @@
#include "kcmkded.h"
#include "kcmkded.moc"
-typedef KGenericFactory<KDEDConfig, QWidget> KDEDFactory;
+typedef KGenericFactory<KDEDConfig, TQWidget> KDEDFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kded, KDEDFactory( "kcmkded" ) )
-KDEDConfig::KDEDConfig(QWidget* parent, const char* name, const QStringList &) :
+KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) :
KCModule( KDEDFactory::instance(), parent, name )
{
KAboutData *about =
@@ -67,10 +67,10 @@ KDEDConfig::KDEDConfig(QWidget* parent, const char* name, const QStringList &) :
RUNNING = i18n("Running")+" ";
NOT_RUNNING = i18n("Not running")+" ";
- QVBoxLayout *lay = new QVBoxLayout( this, 0, KDialog::spacingHint() );
+ TQVBoxLayout *lay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
- QGroupBox *gb = new QVGroupBox(i18n("Load-on-Demand Services"), this );
- QWhatsThis::add(gb, i18n("This is a list of available KDE services which will "
+ TQGroupBox *gb = new TQVGroupBox(i18n("Load-on-Demand Services"), this );
+ TQWhatsThis::add(gb, i18n("This is a list of available KDE services which will "
"be started on demand. They are only listed for convenience, as you "
"cannot manipulate these services."));
lay->addWidget( gb );
@@ -82,8 +82,8 @@ KDEDConfig::KDEDConfig(QWidget* parent, const char* name, const QStringList &) :
_lvLoD->setAllColumnsShowFocus(true);
_lvLoD->header()->setStretchEnabled(true, 1);
- gb = new QVGroupBox(i18n("Startup Services"), this );
- QWhatsThis::add(gb, i18n("This shows all KDE services that can be loaded "
+ gb = new TQVGroupBox(i18n("Startup Services"), this );
+ TQWhatsThis::add(gb, i18n("This shows all KDE services that can be loaded "
"on KDE startup. Checked services will be invoked on next startup. "
"Be careful with deactivation of unknown services."));
lay->addWidget( gb );
@@ -103,16 +103,16 @@ KDEDConfig::KDEDConfig(QWidget* parent, const char* name, const QStringList &) :
_pbStart->setEnabled( false );
_pbStop->setEnabled( false );
- connect(_pbStart, SIGNAL(clicked()), SLOT(slotStartService()));
- connect(_pbStop, SIGNAL(clicked()), SLOT(slotStopService()));
- connect(_lvStartup, SIGNAL(selectionChanged(QListViewItem*)), SLOT(slotEvalItem(QListViewItem*)) );
+ connect(_pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartService()));
+ connect(_pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(slotStopService()));
+ connect(_lvStartup, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotEvalItem(TQListViewItem*)) );
load();
}
-void setModuleGroup(KConfig *config, const QString &filename)
+void setModuleGroup(KConfig *config, const TQString &filename)
{
- QString module = filename;
+ TQString module = filename;
int i = module.findRev('/');
if (i != -1)
module = module.mid(i+1);
@@ -120,16 +120,16 @@ void setModuleGroup(KConfig *config, const QString &filename)
if (i != -1)
module = module.left(i);
- config->setGroup(QString("Module-%1").arg(module));
+ config->setGroup(TQString("Module-%1").arg(module));
}
-bool KDEDConfig::autoloadEnabled(KConfig *config, const QString &filename)
+bool KDEDConfig::autoloadEnabled(KConfig *config, const TQString &filename)
{
setModuleGroup(config, filename);
return config->readBoolEntry("autoload", true);
}
-void KDEDConfig::setAutoloadEnabled(KConfig *config, const QString &filename, bool b)
+void KDEDConfig::setAutoloadEnabled(KConfig *config, const TQString &filename, bool b)
{
setModuleGroup(config, filename);
return config->writeEntry("autoload", b);
@@ -147,21 +147,21 @@ void KDEDConfig::load( bool useDefaults ) {
_lvStartup->clear();
_lvLoD->clear();
- QStringList files;
+ TQStringList files;
KGlobal::dirs()->findAllResources( "services",
- QString::fromLatin1( "kded/*.desktop" ),
+ TQString::fromLatin1( "kded/*.desktop" ),
true, true, files );
- QListViewItem* item = 0L;
+ TQListViewItem* item = 0L;
CheckListItem* clitem;
- for ( QStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) {
+ for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) {
if ( KDesktopFile::isDesktopFile( *it ) ) {
KDesktopFile file( *it, true, "services" );
if ( file.readBoolEntry("X-KDE-Kded-autoload") ) {
- clitem = new CheckListItem(_lvStartup, QString::null);
- connect(clitem, SIGNAL(changed(QCheckListItem*)), SLOT(slotItemChecked(QCheckListItem*)));
+ clitem = new CheckListItem(_lvStartup, TQString::null);
+ connect(clitem, TQT_SIGNAL(changed(TQCheckListItem*)), TQT_SLOT(slotItemChecked(TQCheckListItem*)));
clitem->setOn(autoloadEnabled(&kdedrc, *it));
item = clitem;
item->setText(1, file.readName());
@@ -170,7 +170,7 @@ void KDEDConfig::load( bool useDefaults ) {
item->setText(4, file.readEntry("X-KDE-Library"));
}
else if ( file.readBoolEntry("X-KDE-Kded-load-on-demand") ) {
- item = new QListViewItem(_lvLoD, file.readName());
+ item = new TQListViewItem(_lvLoD, file.readName());
item->setText(1, file.readComment());
item->setText(2, NOT_RUNNING);
item->setText(4, file.readEntry("X-KDE-Library"));
@@ -183,16 +183,16 @@ void KDEDConfig::load( bool useDefaults ) {
}
void KDEDConfig::save() {
- QCheckListItem* item = 0L;
+ TQCheckListItem* item = 0L;
- QStringList files;
+ TQStringList files;
KGlobal::dirs()->findAllResources( "services",
- QString::fromLatin1( "kded/*.desktop" ),
+ TQString::fromLatin1( "kded/*.desktop" ),
true, true, files );
KConfig kdedrc("kdedrc", false, false);
- for ( QStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) {
+ for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) {
if ( KDesktopFile::isDesktopFile( *it ) ) {
@@ -201,7 +201,7 @@ void KDEDConfig::save() {
if (file.readBoolEntry("X-KDE-Kded-autoload")){
- item = static_cast<QCheckListItem *>(_lvStartup->findItem(file.readEntry("X-KDE-Library"),4));
+ item = static_cast<TQCheckListItem *>(_lvStartup->findItem(file.readEntry("X-KDE-Library"),4));
if (item) {
// we found a match, now compare and see what changed
setAutoloadEnabled(&kdedrc, *it, item->isOn());
@@ -212,7 +212,7 @@ void KDEDConfig::save() {
kdedrc.sync();
DCOPRef( "kded", "kded" ).call( "reconfigure" );
- QTimer::singleShot(0, this, SLOT(slotServiceRunningToggled()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotServiceRunningToggled()));
}
@@ -225,11 +225,11 @@ void KDEDConfig::defaults()
void KDEDConfig::getServiceStatus()
{
QCStringList modules;
- QCString replyType;
- QByteArray replyData;
+ TQCString replyType;
+ TQByteArray replyData;
- if (!kapp->dcopClient()->call( "kded", "kded", "loadedModules()", QByteArray(),
+ if (!kapp->dcopClient()->call( "kded", "kded", "loadedModules()", TQByteArray(),
replyType, replyData ) ) {
_lvLoD->setEnabled( false );
@@ -240,18 +240,18 @@ void KDEDConfig::getServiceStatus()
else {
if ( replyType == "QCStringList" ) {
- QDataStream reply(replyData, IO_ReadOnly);
+ TQDataStream reply(replyData, IO_ReadOnly);
reply >> modules;
}
}
- for( QListViewItemIterator it( _lvLoD); it.current() != 0; ++it )
+ for( TQListViewItemIterator it( _lvLoD); it.current() != 0; ++it )
it.current()->setText(2, NOT_RUNNING);
- for( QListViewItemIterator it( _lvStartup); it.current() != 0; ++it )
+ for( TQListViewItemIterator it( _lvStartup); it.current() != 0; ++it )
it.current()->setText(3, NOT_RUNNING);
for ( QCStringList::Iterator it = modules.begin(); it != modules.end(); ++it )
{
- QListViewItem *item = _lvLoD->findItem(*it, 4);
+ TQListViewItem *item = _lvLoD->findItem(*it, 4);
if ( item )
{
item->setText(2, RUNNING);
@@ -267,14 +267,14 @@ void KDEDConfig::getServiceStatus()
void KDEDConfig::slotReload()
{
- QString current = _lvStartup->currentItem()->text(4);
+ TQString current = _lvStartup->currentItem()->text(4);
load();
- QListViewItem *item = _lvStartup->findItem(current, 4);
+ TQListViewItem *item = _lvStartup->findItem(current, 4);
if (item)
_lvStartup->setCurrentItem(item);
}
-void KDEDConfig::slotEvalItem(QListViewItem * item)
+void KDEDConfig::slotEvalItem(TQListViewItem * item)
{
if (!item)
return;
@@ -304,14 +304,14 @@ void KDEDConfig::slotServiceRunningToggled()
void KDEDConfig::slotStartService()
{
- QCString service = _lvStartup->currentItem()->text(4).latin1();
+ TQCString service = _lvStartup->currentItem()->text(4).latin1();
- QByteArray data, replyData;
- QCString replyType;
- QDataStream arg( data, IO_WriteOnly );
+ TQByteArray data, replyData;
+ TQCString replyType;
+ TQDataStream arg( data, IO_WriteOnly );
arg << service;
- if (kapp->dcopClient()->call( "kded", "kded", "loadModule(QCString)", data, replyType, replyData ) ) {
- QDataStream reply(replyData, IO_ReadOnly);
+ if (kapp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", data, replyType, replyData ) ) {
+ TQDataStream reply(replyData, IO_ReadOnly);
if ( replyType == "bool" )
{
bool result;
@@ -331,13 +331,13 @@ void KDEDConfig::slotStartService()
void KDEDConfig::slotStopService()
{
- QCString service = _lvStartup->currentItem()->text(4).latin1();
+ TQCString service = _lvStartup->currentItem()->text(4).latin1();
kdDebug() << "Stopping: " << service << endl;
- QByteArray data;
- QDataStream arg( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream arg( data, IO_WriteOnly );
arg << service;
- if (kapp->dcopClient()->send( "kded", "kded", "unloadModule(QCString)", data ) ) {
+ if (kapp->dcopClient()->send( "kded", "kded", "unloadModule(TQCString)", data ) ) {
slotServiceRunningToggled();
}
else {
@@ -346,18 +346,18 @@ void KDEDConfig::slotStopService()
}
-void KDEDConfig::slotItemChecked(QCheckListItem*)
+void KDEDConfig::slotItemChecked(TQCheckListItem*)
{
emit changed(true);
}
-CheckListItem::CheckListItem(QListView *parent, const QString &text)
- : QObject(parent),
- QCheckListItem(parent, text, CheckBox)
+CheckListItem::CheckListItem(TQListView *parent, const TQString &text)
+ : TQObject(parent),
+ TQCheckListItem(parent, text, CheckBox)
{ }
void CheckListItem::stateChange(bool on)
{
- QCheckListItem::stateChange(on);
+ TQCheckListItem::stateChange(on);
emit changed(this);
}
diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h
index b945ff52f..9971fd6cd 100644
--- a/kcontrol/kded/kcmkded.h
+++ b/kcontrol/kded/kcmkded.h
@@ -19,7 +19,7 @@
#ifndef KCMKDED_H
#define KCMKDED_H
-#include <qlistview.h>
+#include <tqlistview.h>
#include <kcmodule.h>
@@ -32,7 +32,7 @@ class KDEDConfig : public KCModule
{
Q_OBJECT
public:
- KDEDConfig(QWidget* parent, const char* name= 0L, const QStringList& foo = QStringList());
+ KDEDConfig(TQWidget* parent, const char* name= 0L, const TQStringList& foo = TQStringList());
~KDEDConfig() {};
void load();
@@ -45,31 +45,31 @@ protected slots:
void slotStartService();
void slotStopService();
void slotServiceRunningToggled();
- void slotEvalItem(QListViewItem *item);
- void slotItemChecked(QCheckListItem *item);
+ void slotEvalItem(TQListViewItem *item);
+ void slotItemChecked(TQCheckListItem *item);
void getServiceStatus();
- bool autoloadEnabled(KConfig *config, const QString &filename);
- void setAutoloadEnabled(KConfig *config, const QString &filename, bool b);
+ bool autoloadEnabled(KConfig *config, const TQString &filename);
+ void setAutoloadEnabled(KConfig *config, const TQString &filename, bool b);
private:
KListView *_lvLoD;
KListView *_lvStartup;
- QPushButton *_pbStart;
- QPushButton *_pbStop;
+ TQPushButton *_pbStart;
+ TQPushButton *_pbStop;
- QString RUNNING;
- QString NOT_RUNNING;
+ TQString RUNNING;
+ TQString NOT_RUNNING;
};
-class CheckListItem : public QObject, public QCheckListItem
+class CheckListItem : public TQObject, public QCheckListItem
{
Q_OBJECT
public:
- CheckListItem(QListView* parent, const QString &text);
+ CheckListItem(TQListView* parent, const TQString &text);
~CheckListItem() { }
signals:
- void changed(QCheckListItem*);
+ void changed(TQCheckListItem*);
protected:
virtual void stateChange(bool);
};
diff --git a/kcontrol/kdm/background.cpp b/kcontrol/kdm/background.cpp
index 19c962a1d..b5ce18ff5 100644
--- a/kcontrol/kdm/background.cpp
+++ b/kcontrol/kdm/background.cpp
@@ -23,9 +23,9 @@
#include <unistd.h>
#include <sys/types.h>
-#include <qgroupbox.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
+#include <tqgroupbox.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
#include <kdebug.h>
#include <klocale.h>
@@ -33,19 +33,19 @@
#include "../background/bgsettings.h"
#include "../background/bgdialog.h"
#include "background.h"
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
#include <ksimpleconfig.h>
#include <kdialog.h>
extern KSimpleConfig *config;
-KBackground::KBackground(QWidget *parent, const char *name)
- : QWidget(parent, name)
+KBackground::KBackground(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
{
// Enabling checkbox
- m_pCBEnable = new QCheckBox( i18n("E&nable background"), this );
- QWhatsThis::add( m_pCBEnable,
+ m_pCBEnable = new TQCheckBox( i18n("E&nable background"), this );
+ TQWhatsThis::add( m_pCBEnable,
i18n("If this is checked, KDM will use the settings below for the background."
" If it is disabled, you have to look after the background yourself."
" This is done by running some program (possibly xsetroot) in the script"
@@ -54,14 +54,14 @@ KBackground::KBackground(QWidget *parent, const char *name)
m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/kdm/backgroundrc" ) );
m_background = new BGDialog( this, m_simpleConf, false );
- connect(m_background, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
+ connect(m_background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
// Top layout
- QVBoxLayout *top = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint() );
+ TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint() );
top->addWidget(m_pCBEnable);
top->addWidget(m_background);
top->addStretch();
- connect( m_pCBEnable, SIGNAL(toggled( bool )), SLOT(slotEnableChanged()) );
+ connect( m_pCBEnable, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotEnableChanged()) );
}
KBackground::~KBackground()
diff --git a/kcontrol/kdm/background.h b/kcontrol/kdm/background.h
index bc1e48213..7de6a82dc 100644
--- a/kcontrol/kdm/background.h
+++ b/kcontrol/kdm/background.h
@@ -10,8 +10,8 @@
#ifndef __Bgnd_h_Included__
#define __Bgnd_h_Included__
-#include <qobject.h>
-#include <qwidget.h>
+#include <tqobject.h>
+#include <tqwidget.h>
class KSimpleConfig;
@@ -24,7 +24,7 @@ class KBackground: public QWidget
{
Q_OBJECT
public:
- KBackground(QWidget *parent=0, const char *name=0);
+ KBackground(TQWidget *parent=0, const char *name=0);
~KBackground();
void load();
@@ -40,8 +40,8 @@ private:
void init();
void apply();
- QCheckBox *m_pCBEnable;
- QLabel *m_pMLabel;
+ TQCheckBox *m_pCBEnable;
+ TQLabel *m_pMLabel;
KSimpleConfig *m_simpleConf;
BGDialog *m_background;
};
diff --git a/kcontrol/kdm/kbackedcombobox.cpp b/kcontrol/kdm/kbackedcombobox.cpp
index 97759db5a..1ba598e49 100644
--- a/kcontrol/kdm/kbackedcombobox.cpp
+++ b/kcontrol/kdm/kbackedcombobox.cpp
@@ -19,14 +19,14 @@
#include "kbackedcombobox.h"
-void KBackedComboBox::insertItem( const QString &id, const QString &name )
+void KBackedComboBox::insertItem( const TQString &id, const TQString &name )
{
id2name[id] = name;
name2id[name] = id;
KComboBox::insertItem( name );
}
-void KBackedComboBox::setCurrentId( const QString &id )
+void KBackedComboBox::setCurrentId( const TQString &id )
{
if (id2name.contains( id ))
setCurrentItem( id2name[id] );
@@ -34,7 +34,7 @@ void KBackedComboBox::setCurrentId( const QString &id )
setCurrentItem( 0 );
}
-const QString &KBackedComboBox::currentId() const
+const TQString &KBackedComboBox::currentId() const
{
return name2id[currentText()];
}
diff --git a/kcontrol/kdm/kbackedcombobox.h b/kcontrol/kdm/kbackedcombobox.h
index 3b006f23f..1ec1d2a72 100644
--- a/kcontrol/kdm/kbackedcombobox.h
+++ b/kcontrol/kdm/kbackedcombobox.h
@@ -25,13 +25,13 @@
class KBackedComboBox : public KComboBox {
public:
- KBackedComboBox( QWidget *parent ) : KComboBox( false, parent ) {}
- void insertItem( const QString &id, const QString &name );
- void setCurrentId( const QString &id );
- const QString &currentId() const;
+ KBackedComboBox( TQWidget *parent ) : KComboBox( false, parent ) {}
+ void insertItem( const TQString &id, const TQString &name );
+ void setCurrentId( const TQString &id );
+ const TQString &currentId() const;
private:
- QMap<QString,QString> id2name, name2id;
+ TQMap<TQString,TQString> id2name, name2id;
};
diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp
index 7d1d034ca..58696902b 100644
--- a/kcontrol/kdm/kdm-appear.cpp
+++ b/kcontrol/kdm/kdm-appear.cpp
@@ -23,14 +23,14 @@
#include <sys/types.h>
-#include <qbuttongroup.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
-#include <qwhatsthis.h>
-#include <qvalidator.h>
-#include <qstylefactory.h>
-#include <qstyle.h>
+#include <tqbuttongroup.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqradiobutton.h>
+#include <tqwhatsthis.h>
+#include <tqvalidator.h>
+#include <tqstylefactory.h>
+#include <tqstyle.h>
#include <klocale.h>
#include <klineedit.h>
@@ -49,29 +49,29 @@
extern KSimpleConfig *config;
-KDMAppearanceWidget::KDMAppearanceWidget(QWidget *parent, const char *name)
- : QWidget(parent, name)
+KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
{
- QString wtstr;
+ TQString wtstr;
- QVBoxLayout *vbox = new QVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *vbox = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "vbox");
- QGroupBox *group = new QGroupBox(i18n("Appearance"), this);
+ TQGroupBox *group = new TQGroupBox(i18n("Appearance"), this);
vbox->addWidget(group);
- QGridLayout *grid = new QGridLayout( group, 5, 2, KDialog::marginHint(),
+ TQGridLayout *grid = new TQGridLayout( group, 5, 2, KDialog::marginHint(),
KDialog::spacingHint(), "grid");
grid->addRowSpacing(0, group->fontMetrics().height());
grid->setColStretch(0, 1);
grid->setColStretch(1, 1);
- QHBoxLayout *hlay = new QHBoxLayout( KDialog::spacingHint() );
+ TQHBoxLayout *hlay = new TQHBoxLayout( KDialog::spacingHint() );
grid->addMultiCellLayout(hlay, 1,1, 0,1);
greetstr_lined = new KLineEdit(group);
- QLabel *label = new QLabel(greetstr_lined, i18n("&Greeting:"), group);
+ TQLabel *label = new TQLabel(greetstr_lined, i18n("&Greeting:"), group);
hlay->addWidget(label);
- connect(greetstr_lined, SIGNAL(textChanged(const QString&)),
- SLOT(changed()));
+ connect(greetstr_lined, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(changed()));
hlay->addWidget(greetstr_lined);
wtstr = i18n("This is the \"headline\" for KDM's login window. You may want to "
"put some nice greeting or information about the operating system here.<p>"
@@ -85,24 +85,24 @@ KDMAppearanceWidget::KDMAppearanceWidget(QWidget *parent, const char *name)
"<li>%m -> the machine (hardware) type</li>"
"<li>%% -> a single %</li>"
"</ul>" );
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( greetstr_lined, wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( greetstr_lined, wtstr );
- QGridLayout *hglay = new QGridLayout( 3, 4, KDialog::spacingHint() );
+ TQGridLayout *hglay = new TQGridLayout( 3, 4, KDialog::spacingHint() );
grid->addMultiCellLayout(hglay, 2,4, 0,0);
- label = new QLabel(i18n("Logo area:"), group);
+ label = new TQLabel(i18n("Logo area:"), group);
hglay->addWidget(label, 0, 0);
- QVBoxLayout *vlay = new QVBoxLayout( KDialog::spacingHint() );
+ TQVBoxLayout *vlay = new TQVBoxLayout( KDialog::spacingHint() );
hglay->addMultiCellLayout(vlay, 0,0, 1,2);
- noneRadio = new QRadioButton( i18n("logo area", "&None"), group );
- clockRadio = new QRadioButton( i18n("Show cloc&k"), group );
- logoRadio = new QRadioButton( i18n("Sho&w logo"), group );
- QButtonGroup *buttonGroup = new QButtonGroup( group );
+ noneRadio = new TQRadioButton( i18n("logo area", "&None"), group );
+ clockRadio = new TQRadioButton( i18n("Show cloc&k"), group );
+ logoRadio = new TQRadioButton( i18n("Sho&w logo"), group );
+ TQButtonGroup *buttonGroup = new TQButtonGroup( group );
label->setBuddy( buttonGroup );
- connect( buttonGroup, SIGNAL(clicked(int)), SLOT(slotAreaRadioClicked(int)) );
- connect( buttonGroup, SIGNAL(clicked(int)), SLOT(changed()) );
+ connect( buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotAreaRadioClicked(int)) );
+ connect( buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed()) );
buttonGroup->hide();
buttonGroup->insert(noneRadio, KdmNone);
buttonGroup->insert(clockRadio, KdmClock);
@@ -111,61 +111,61 @@ KDMAppearanceWidget::KDMAppearanceWidget(QWidget *parent, const char *name)
vlay->addWidget(clockRadio);
vlay->addWidget(logoRadio);
wtstr = i18n("You can choose to display a custom logo (see below), a clock or no logo at all.");
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( noneRadio, wtstr );
- QWhatsThis::add( logoRadio, wtstr );
- QWhatsThis::add( clockRadio, wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( noneRadio, wtstr );
+ TQWhatsThis::add( logoRadio, wtstr );
+ TQWhatsThis::add( clockRadio, wtstr );
- logoLabel = new QLabel(i18n("&Logo:"), group);
- logobutton = new QPushButton(group);
+ logoLabel = new TQLabel(i18n("&Logo:"), group);
+ logobutton = new TQPushButton(group);
logoLabel->setBuddy( logobutton );
logobutton->setAutoDefault(false);
logobutton->setAcceptDrops(true);
logobutton->installEventFilter(this); // for drag and drop
- connect(logobutton, SIGNAL(clicked()), SLOT(slotLogoButtonClicked()));
+ connect(logobutton, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogoButtonClicked()));
hglay->addWidget(logoLabel, 1, 0);
hglay->addWidget(logobutton, 1, 1, AlignCenter);
hglay->addRowSpacing(1, 110);
wtstr = i18n("Click here to choose an image that KDM will display. "
"You can also drag and drop an image onto this button "
"(e.g. from Konqueror).");
- QWhatsThis::add( logoLabel, wtstr );
- QWhatsThis::add( logobutton, wtstr );
+ TQWhatsThis::add( logoLabel, wtstr );
+ TQWhatsThis::add( logobutton, wtstr );
hglay->addRowSpacing( 2, KDialog::spacingHint());
hglay->setColStretch( 3, 1);
- hglay = new QGridLayout( 2, 3, KDialog::spacingHint() );
+ hglay = new TQGridLayout( 2, 3, KDialog::spacingHint() );
grid->addLayout(hglay, 2, 1);
- label = new QLabel(i18n("Position:"), group);
+ label = new TQLabel(i18n("Position:"), group);
hglay->addMultiCellWidget(label, 0,1, 0,0, AlignVCenter);
- QValidator *posValidator = new QIntValidator(0, 100, group);
- QLabel *xLineLabel = new QLabel(i18n("&X:"), group);
+ TQValidator *posValidator = new TQIntValidator(0, 100, group);
+ TQLabel *xLineLabel = new TQLabel(i18n("&X:"), group);
hglay->addWidget(xLineLabel, 0, 1);
- xLineEdit = new QLineEdit (group);
- connect( xLineEdit, SIGNAL( textChanged(const QString&) ), SLOT( changed() ));
+ xLineEdit = new TQLineEdit (group);
+ connect( xLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( changed() ));
hglay->addWidget(xLineEdit, 0, 2);
xLineLabel->setBuddy(xLineEdit);
xLineEdit->setValidator(posValidator);
- QLabel *yLineLabel = new QLabel(i18n("&Y:"), group);
+ TQLabel *yLineLabel = new TQLabel(i18n("&Y:"), group);
hglay->addWidget(yLineLabel, 1, 1);
- yLineEdit = new QLineEdit (group);
- connect( yLineEdit, SIGNAL( textChanged(const QString&) ), SLOT( changed() ));
+ yLineEdit = new TQLineEdit (group);
+ connect( yLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( changed() ));
hglay->addWidget(yLineEdit, 1, 2);
yLineLabel->setBuddy(yLineEdit);
yLineEdit->setValidator(posValidator);
wtstr = i18n("Here you specify the relative coordinates (in percent) of the login dialog's <em>center</em>.");
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( xLineLabel, wtstr );
- QWhatsThis::add( xLineEdit, wtstr );
- QWhatsThis::add( yLineLabel, wtstr );
- QWhatsThis::add( yLineEdit, wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( xLineLabel, wtstr );
+ TQWhatsThis::add( xLineEdit, wtstr );
+ TQWhatsThis::add( yLineLabel, wtstr );
+ TQWhatsThis::add( yLineEdit, wtstr );
hglay->setColStretch( 3, 1);
hglay->setRowStretch( 2, 1);
- hglay = new QGridLayout( 2, 3, KDialog::spacingHint() );
+ hglay = new TQGridLayout( 2, 3, KDialog::spacingHint() );
grid->addLayout(hglay, 3, 1);
hglay->setColStretch(3, 1);
@@ -173,57 +173,57 @@ KDMAppearanceWidget::KDMAppearanceWidget(QWidget *parent, const char *name)
guicombo->insertItem( "", i18n("<default>") );
loadGuiStyles(guicombo);
guicombo->listBox()->sort();
- label = new QLabel(guicombo, i18n("GUI s&tyle:"), group);
- connect(guicombo, SIGNAL(activated(int)), SLOT(changed()));
+ label = new TQLabel(guicombo, i18n("GUI s&tyle:"), group);
+ connect(guicombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
hglay->addWidget(label, 0, 0);
hglay->addWidget(guicombo, 0, 1);
wtstr = i18n("You can choose a basic GUI style here that will be "
"used by KDM only.");
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( guicombo, wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( guicombo, wtstr );
colcombo = new KBackedComboBox(group);
colcombo->insertItem( "", i18n("<default>") );
loadColorSchemes(colcombo);
colcombo->listBox()->sort();
- label = new QLabel(colcombo, i18n("&Color scheme:"), group);
- connect(colcombo, SIGNAL(activated(int)), SLOT(changed()));
+ label = new TQLabel(colcombo, i18n("&Color scheme:"), group);
+ connect(colcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
hglay->addWidget(label, 1, 0);
hglay->addWidget(colcombo, 1, 1);
wtstr = i18n("You can choose a basic Color Scheme here that will be "
"used by KDM only.");
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( colcombo, wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( colcombo, wtstr );
echocombo = new KBackedComboBox(group);
echocombo->insertItem("NoEcho", i18n("No Echo"));
echocombo->insertItem("OneStar", i18n("One Star"));
echocombo->insertItem("ThreeStars", i18n("Three Stars"));
- label = new QLabel(echocombo, i18n("Echo &mode:"), group);
- connect(echocombo, SIGNAL(activated(int)), SLOT(changed()));
+ label = new TQLabel(echocombo, i18n("Echo &mode:"), group);
+ connect(echocombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
hglay->addWidget(label, 2, 0);
hglay->addWidget(echocombo, 2, 1);
wtstr = i18n("You can choose whether and how KDM shows your password when you type it.");
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( echocombo, wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( echocombo, wtstr );
// The Language group box
- group = new QGroupBox(0, Vertical, i18n("Locale"), this);
+ group = new TQGroupBox(0, Vertical, i18n("Locale"), this);
vbox->addWidget(group);
langcombo = new KLanguageButton(group);
loadLanguageList(langcombo);
- connect(langcombo, SIGNAL(activated(const QString &)), SLOT(changed()));
- label = new QLabel(langcombo, i18n("Languag&e:"), group);
- QGridLayout *hbox = new QGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
+ connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
+ label = new TQLabel(langcombo, i18n("Languag&e:"), group);
+ TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
hbox->setColStretch(1, 1);
hbox->addWidget(label, 1, 0);
hbox->addWidget(langcombo, 1, 1);
wtstr = i18n("Here you can choose the language used by KDM. This setting does not affect"
" a user's personal settings; that will take effect after login.");
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( langcombo, wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( langcombo, wtstr );
vbox->addStretch(1);
@@ -232,8 +232,8 @@ KDMAppearanceWidget::KDMAppearanceWidget(QWidget *parent, const char *name)
void KDMAppearanceWidget::makeReadOnly()
{
- disconnect( logobutton, SIGNAL(clicked()),
- this, SLOT(slotLogoButtonClicked()) );
+ disconnect( logobutton, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(slotLogoButtonClicked()) );
logobutton->setAcceptDrops(false);
greetstr_lined->setReadOnly(true);
noneRadio->setEnabled(false);
@@ -249,38 +249,38 @@ void KDMAppearanceWidget::makeReadOnly()
void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
{
- QStringList langlist = KGlobal::dirs()->findAllResources("locale",
- QString::fromLatin1("*/entry.desktop"));
+ TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
+ TQString::fromLatin1("*/entry.desktop"));
langlist.sort();
- for ( QStringList::ConstIterator it = langlist.begin();
+ for ( TQStringList::ConstIterator it = langlist.begin();
it != langlist.end(); ++it )
{
- QString fpath = (*it).left((*it).length() - 14);
+ TQString fpath = (*it).left((*it).length() - 14);
int index = fpath.findRev('/');
- QString nid = fpath.mid(index + 1);
+ TQString nid = fpath.mid(index + 1);
KSimpleConfig entry(*it);
- entry.setGroup(QString::fromLatin1("KCM Locale"));
- QString name = entry.readEntry(QString::fromLatin1("Name"), i18n("without name"));
- combo->insertLanguage(nid, name, QString::fromLatin1("l10n/"), QString::null);
+ entry.setGroup(TQString::fromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
+ combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString::null);
}
}
void KDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
{
// XXX: Global + local schemes
- QStringList list = KGlobal::dirs()->
+ TQStringList list = KGlobal::dirs()->
findAllResources("data", "kdisplay/color-schemes/*.kcsrc", false, true);
- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
+ for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
KSimpleConfig config(*it, true);
config.setGroup("Color Scheme");
- QString str;
+ TQString str;
if (!(str = config.readEntry("Name")).isEmpty() ||
!(str = config.readEntry("name")).isEmpty())
{
- QString str2 = (*it).mid( (*it).findRev( '/' ) + 1 ); // strip off path
+ TQString str2 = (*it).mid( (*it).findRev( '/' ) + 1 ); // strip off path
str2.setLength( str2.length() - 6 ); // strip off ".kcsrc
combo->insertItem( str2, str );
}
@@ -290,9 +290,9 @@ void KDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
{
// XXX: Global + local schemes
- QStringList list = KGlobal::dirs()->
+ TQStringList list = KGlobal::dirs()->
findAllResources("data", "kstyle/themes/*.themerc", false, true);
- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
+ for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
KSimpleConfig config(*it, true);
@@ -304,7 +304,7 @@ void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
continue;
config.setGroup("KDE");
- QString str2 = config.readEntry("WidgetStyle");
+ TQString str2 = config.readEntry("WidgetStyle");
if (str2.isNull())
continue;
@@ -313,18 +313,18 @@ void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
}
}
-bool KDMAppearanceWidget::setLogo(QString logo)
+bool KDMAppearanceWidget::setLogo(TQString logo)
{
- QString flogo = logo.isEmpty() ?
- locate("data", QString::fromLatin1("kdm/pics/kdelogo.png") ) :
+ TQString flogo = logo.isEmpty() ?
+ locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) :
logo;
- QImage p(flogo);
+ TQImage p(flogo);
if (p.isNull())
return false;
if (p.width() > 100 || p.height() > 100)
- p = p.smoothScale(100, 100, QImage::ScaleMin);
+ p = p.smoothScale(100, 100, TQImage::ScaleMin);
logobutton->setPixmap(p);
- uint bd = style().pixelMetric( QStyle::PM_ButtonMargin ) * 2;
+ uint bd = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
logobutton->setFixedSize(p.width() + bd, p.height() + bd);
logopath = logo;
return true;
@@ -334,7 +334,7 @@ bool KDMAppearanceWidget::setLogo(QString logo)
void KDMAppearanceWidget::slotLogoButtonClicked()
{
KImageIO::registerFormats();
- KFileDialog dialogue(locate("data", QString::fromLatin1("kdm/pics/")),
+ KFileDialog dialogue(locate("data", TQString::fromLatin1("kdm/pics/")),
KImageIO::pattern( KImageIO::Reading ),
this, 0, true);
dialogue.setOperationMode( KFileDialog::Opening );
@@ -342,7 +342,7 @@ void KDMAppearanceWidget::slotLogoButtonClicked()
KImageFilePreview* imagePreview = new KImageFilePreview( &dialogue );
dialogue.setPreviewWidget( imagePreview );
- if (dialogue.exec() == QDialog::Accepted) {
+ if (dialogue.exec() == TQDialog::Accepted) {
if ( setLogo(dialogue.selectedFile()) ) {
changed();
}
@@ -357,30 +357,30 @@ void KDMAppearanceWidget::slotAreaRadioClicked(int id)
}
-bool KDMAppearanceWidget::eventFilter(QObject *, QEvent *e)
+bool KDMAppearanceWidget::eventFilter(TQObject *, TQEvent *e)
{
- if (e->type() == QEvent::DragEnter) {
- iconLoaderDragEnterEvent((QDragEnterEvent *) e);
+ if (e->type() == TQEvent::DragEnter) {
+ iconLoaderDragEnterEvent((TQDragEnterEvent *) e);
return true;
}
- if (e->type() == QEvent::Drop) {
- iconLoaderDropEvent((QDropEvent *) e);
+ if (e->type() == TQEvent::Drop) {
+ iconLoaderDropEvent((TQDropEvent *) e);
return true;
}
return false;
}
-void KDMAppearanceWidget::iconLoaderDragEnterEvent(QDragEnterEvent *e)
+void KDMAppearanceWidget::iconLoaderDragEnterEvent(TQDragEnterEvent *e)
{
e->accept(KURLDrag::canDecode(e));
}
-KURL *decodeImgDrop(QDropEvent *e, QWidget *wdg);
+KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg);
-void KDMAppearanceWidget::iconLoaderDropEvent(QDropEvent *e)
+void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
{
KURL pixurl;
bool istmp;
@@ -402,7 +402,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(QDropEvent *e)
// By now url should be "file:/..."
if (!setLogo(pixurl.path())) {
KIO::NetAccess::del(pixurl, parentWidget());
- QString msg = i18n("There was an error loading the image:\n"
+ TQString msg = i18n("There was an error loading the image:\n"
"%1\n"
"It will not be saved.")
.arg(pixurl.path());
@@ -445,7 +445,7 @@ void KDMAppearanceWidget::load()
greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to Kubuntu at %n")));
// Regular logo or clock
- QString logoArea = config->readEntry("LogoArea", "Logo" );
+ TQString logoArea = config->readEntry("LogoArea", "Logo" );
if (logoArea == "Clock") {
clockRadio->setChecked(true);
slotAreaRadioClicked(KdmClock);
@@ -469,7 +469,7 @@ void KDMAppearanceWidget::load()
// Check the echo mode
echocombo->setCurrentId(config->readEntry("EchoMode", "OneStar"));
- QStringList sl = config->readListEntry( "GreeterPos" );
+ TQStringList sl = config->readListEntry( "GreeterPos" );
if (sl.count() != 2) {
xLineEdit->setText( "50" );
yLineEdit->setText( "50" );
@@ -499,7 +499,7 @@ void KDMAppearanceWidget::defaults()
langcombo->setCurrentItem( "en_US" );
}
-QString KDMAppearanceWidget::quickHelp() const
+TQString KDMAppearanceWidget::quickHelp() const
{
return i18n("<h1>KDM - Appearance</h1> Here you can configure the basic appearance"
" of the KDM login manager, i.e. a greeting string, an icon etc.<p>"
diff --git a/kcontrol/kdm/kdm-appear.h b/kcontrol/kdm/kdm-appear.h
index 991b6e4e0..dba6af36d 100644
--- a/kcontrol/kdm/kdm-appear.h
+++ b/kcontrol/kdm/kdm-appear.h
@@ -22,10 +22,10 @@
#define __KDMAPPEAR_H__
-#include <qdir.h>
-#include <qimage.h>
-#include <qfileinfo.h>
-#include <qpushbutton.h>
+#include <tqdir.h>
+#include <tqimage.h>
+#include <tqfileinfo.h>
+#include <tqpushbutton.h>
#include <kcolorbutton.h>
#include <kurl.h>
@@ -47,27 +47,27 @@ class KDMAppearanceWidget : public QWidget
Q_OBJECT
public:
- KDMAppearanceWidget(QWidget *parent, const char *name=0);
+ KDMAppearanceWidget(TQWidget *parent, const char *name=0);
void load();
void save();
void defaults();
void makeReadOnly();
- QString quickHelp() const;
+ TQString quickHelp() const;
void loadColorSchemes(KBackedComboBox *combo);
void loadGuiStyles(KBackedComboBox *combo);
void loadLanguageList(KLanguageButton *combo);
- bool eventFilter(QObject *, QEvent *);
+ bool eventFilter(TQObject *, TQEvent *);
signals:
void changed( bool state );
protected:
- void iconLoaderDragEnterEvent(QDragEnterEvent *event);
- void iconLoaderDropEvent(QDropEvent *event);
- bool setLogo(QString logo);
+ void iconLoaderDragEnterEvent(TQDragEnterEvent *event);
+ void iconLoaderDropEvent(TQDropEvent *event);
+ bool setLogo(TQString logo);
private slots:
void slotAreaRadioClicked(int id);
@@ -76,15 +76,15 @@ private slots:
private:
enum { KdmNone, KdmClock, KdmLogo };
- QLabel *logoLabel;
- QPushButton *logobutton;
+ TQLabel *logoLabel;
+ TQPushButton *logobutton;
KLineEdit *greetstr_lined;
- QString logopath;
- QRadioButton *noneRadio;
- QRadioButton *clockRadio;
- QRadioButton *logoRadio;
- QLineEdit *xLineEdit;
- QLineEdit *yLineEdit;
+ TQString logopath;
+ TQRadioButton *noneRadio;
+ TQRadioButton *clockRadio;
+ TQRadioButton *logoRadio;
+ TQLineEdit *xLineEdit;
+ TQLineEdit *yLineEdit;
KBackedComboBox *guicombo;
KBackedComboBox *colcombo;
KBackedComboBox *echocombo;
diff --git a/kcontrol/kdm/kdm-conv.cpp b/kcontrol/kdm/kdm-conv.cpp
index 71d292c5f..155d5b380 100644
--- a/kcontrol/kdm/kdm-conv.cpp
+++ b/kcontrol/kdm/kdm-conv.cpp
@@ -23,13 +23,13 @@
#include <sys/types.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qhgroupbox.h>
-#include <qvgroupbox.h>
-#include <qvbuttongroup.h>
-#include <qwhatsthis.h>
-#include <qheader.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqhgroupbox.h>
+#include <tqvgroupbox.h>
+#include <tqvbuttongroup.h>
+#include <tqwhatsthis.h>
+#include <tqheader.h>
#include <kdialog.h>
#include <ksimpleconfig.h>
@@ -39,122 +39,122 @@
extern KSimpleConfig *config;
-KDMConvenienceWidget::KDMConvenienceWidget(QWidget *parent, const char *name)
- : QWidget(parent, name)
+KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
{
- QString wtstr;
+ TQString wtstr;
- QLabel *paranoia = new QLabel( i18n("<qt><center><font color=red><big><b>Attention!<br>Read help!</b></big></font></center></qt>"), this );
+ TQLabel *paranoia = new TQLabel( i18n("<qt><center><font color=red><big><b>Attention!<br>Read help!</b></big></font></center></qt>"), this );
- QSizePolicy vpref( QSizePolicy::Minimum, QSizePolicy::Fixed );
+ TQSizePolicy vpref( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
- alGroup = new QVGroupBox( i18n("Enable Au&to-Login"), this );
+ alGroup = new TQVGroupBox( i18n("Enable Au&to-Login"), this );
alGroup->setCheckable( true );
alGroup->setSizePolicy( vpref );
- QWhatsThis::add( alGroup, i18n("Turn on the auto-login feature."
+ TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature."
" This applies only to KDM's graphical login."
" Think twice before enabling this!") );
- connect(alGroup, SIGNAL(toggled(bool)), SLOT(slotChanged()));
+ connect(alGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
- QWidget *hlpw1 = new QWidget( alGroup );
+ TQWidget *hlpw1 = new TQWidget( alGroup );
userlb = new KComboBox( hlpw1 );
- u_label = new QLabel( userlb, i18n("Use&r:"), hlpw1 );
- QGridLayout *hlpl1 = new QGridLayout(hlpw1, 2, 2, 0, KDialog::spacingHint());
+ u_label = new TQLabel( userlb, i18n("Use&r:"), hlpw1 );
+ TQGridLayout *hlpl1 = new TQGridLayout(hlpw1, 2, 2, 0, KDialog::spacingHint());
hlpl1->setColStretch(2, 1);
hlpl1->addWidget(u_label, 0, 0);
hlpl1->addWidget(userlb, 0, 1);
- connect(userlb, SIGNAL(highlighted(int)), SLOT(slotChanged()));
+ connect(userlb, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotChanged()));
wtstr = i18n("Select the user to be logged in automatically.");
- QWhatsThis::add( u_label, wtstr );
- QWhatsThis::add( userlb, wtstr );
- delaysb = new QSpinBox( 0, 3600, 5, hlpw1 );
+ TQWhatsThis::add( u_label, wtstr );
+ TQWhatsThis::add( userlb, wtstr );
+ delaysb = new TQSpinBox( 0, 3600, 5, hlpw1 );
delaysb->setSpecialValueText( i18n("delay", "none") );
delaysb->setSuffix( i18n("seconds", " s") );
- d_label = new QLabel( delaysb, i18n("D&elay:"), hlpw1 );
+ d_label = new TQLabel( delaysb, i18n("D&elay:"), hlpw1 );
hlpl1->addWidget(d_label, 1, 0);
hlpl1->addWidget(delaysb, 1, 1);
- connect(delaysb, SIGNAL(valueChanged(int)), SLOT(slotChanged()));
+ connect(delaysb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()));
wtstr = i18n("The delay (in seconds) before the automatic login kicks in. "
"This feature is also known as \"timed login\".");
- QWhatsThis::add( d_label, wtstr );
- QWhatsThis::add( delaysb, wtstr );
- againcb = new QCheckBox( i18n("P&ersistent"), alGroup );
- connect( againcb, SIGNAL(toggled(bool)), SLOT(slotChanged()) );
- QWhatsThis::add( againcb, i18n("Normally, automatic login is performed only "
+ TQWhatsThis::add( d_label, wtstr );
+ TQWhatsThis::add( delaysb, wtstr );
+ againcb = new TQCheckBox( i18n("P&ersistent"), alGroup );
+ connect( againcb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) );
+ TQWhatsThis::add( againcb, i18n("Normally, automatic login is performed only "
"when KDM starts up. If this is checked, automatic login will kick in "
"after finishing a session as well.") );
- autoLockCheck = new QCheckBox( i18n("Loc&k session"), alGroup );
- connect( autoLockCheck, SIGNAL(toggled(bool)), SLOT(slotChanged()) );
- QWhatsThis::add( autoLockCheck, i18n("If checked, the automatically started session "
+ autoLockCheck = new TQCheckBox( i18n("Loc&k session"), alGroup );
+ connect( autoLockCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) );
+ TQWhatsThis::add( autoLockCheck, i18n("If checked, the automatically started session "
"will be locked immediately (provided it is a KDE session). This can "
"be used to obtain a super-fast login restricted to one user.") );
- puGroup = new QVButtonGroup(i18n("Preselect User"), this );
+ puGroup = new TQVButtonGroup(i18n("Preselect User"), this );
puGroup->setSizePolicy( vpref );
- connect(puGroup, SIGNAL(clicked(int)), SLOT(slotPresChanged()));
- connect(puGroup, SIGNAL(clicked(int)), SLOT(slotChanged()));
- npRadio = new QRadioButton(i18n("preselected user", "&None"), puGroup);
- ppRadio = new QRadioButton(i18n("Prev&ious"), puGroup);
- QWhatsThis::add( ppRadio, i18n("Preselect the user that logged in previously. "
+ connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPresChanged()));
+ connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged()));
+ npRadio = new TQRadioButton(i18n("preselected user", "&None"), puGroup);
+ ppRadio = new TQRadioButton(i18n("Prev&ious"), puGroup);
+ TQWhatsThis::add( ppRadio, i18n("Preselect the user that logged in previously. "
"Use this if this computer is usually used several consecutive times by one user.") );
- spRadio = new QRadioButton(i18n("Specif&y"), puGroup);
- QWhatsThis::add( spRadio, i18n("Preselect the user specified in the combo box below. "
+ spRadio = new TQRadioButton(i18n("Specif&y"), puGroup);
+ TQWhatsThis::add( spRadio, i18n("Preselect the user specified in the combo box below. "
"Use this if this computer is predominantly used by a certain user.") );
- QWidget *hlpw = new QWidget(puGroup);
+ TQWidget *hlpw = new TQWidget(puGroup);
puserlb = new KComboBox(true, hlpw);
- pu_label = new QLabel(puserlb, i18n("Us&er:"), hlpw);
- connect(puserlb, SIGNAL(textChanged(const QString &)), SLOT(slotChanged()));
+ pu_label = new TQLabel(puserlb, i18n("Us&er:"), hlpw);
+ connect(puserlb, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged()));
wtstr = i18n("Select the user to be preselected for login. "
"This box is editable, so you can specify an arbitrary non-existent "
"user to mislead possible attackers.");
- QWhatsThis::add( pu_label, wtstr );
- QWhatsThis::add( puserlb, wtstr );
- QBoxLayout *hlpl = new QHBoxLayout(hlpw, 0, KDialog::spacingHint());
+ TQWhatsThis::add( pu_label, wtstr );
+ TQWhatsThis::add( puserlb, wtstr );
+ TQBoxLayout *hlpl = new TQHBoxLayout(hlpw, 0, KDialog::spacingHint());
hlpl->addWidget(pu_label);
hlpl->addWidget(puserlb);
hlpl->addStretch( 1 );
- cbjumppw = new QCheckBox(i18n("Focus pass&word"), puGroup);
- QWhatsThis::add( cbjumppw, i18n("When this option is on, KDM will place the cursor "
+ cbjumppw = new TQCheckBox(i18n("Focus pass&word"), puGroup);
+ TQWhatsThis::add( cbjumppw, i18n("When this option is on, KDM will place the cursor "
"in the password field instead of the user field after preselecting a user. "
"Use this to save one key press per login, if the preselection usually does not need to "
"be changed.") );
- connect(cbjumppw, SIGNAL(toggled(bool)), SLOT(slotChanged()));
+ connect(cbjumppw, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
- npGroup = new QVGroupBox(i18n("Enable Password-&Less Logins"), this );
+ npGroup = new TQVGroupBox(i18n("Enable Password-&Less Logins"), this );
npGroup->setCheckable( true );
- QWhatsThis::add( npGroup, i18n("When this option is checked, the checked users from"
+ TQWhatsThis::add( npGroup, i18n("When this option is checked, the checked users from"
" the list below will be allowed to log in without entering their"
" password. This applies only to KDM's graphical login."
" Think twice before enabling this!") );
- connect(npGroup, SIGNAL(toggled(bool)), SLOT(slotChanged()));
+ connect(npGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
- pl_label = new QLabel(i18n("No password re&quired for:"), npGroup);
+ pl_label = new TQLabel(i18n("No password re&quired for:"), npGroup);
npuserlv = new KListView(npGroup);
pl_label->setBuddy(npuserlv);
- npuserlv->addColumn(QString::null);
+ npuserlv->addColumn(TQString::null);
npuserlv->header()->hide();
- npuserlv->setResizeMode(QListView::LastColumn);
- QWhatsThis::add(npuserlv, i18n("Check all users you want to allow a password-less login for."
+ npuserlv->setResizeMode(TQListView::LastColumn);
+ TQWhatsThis::add(npuserlv, i18n("Check all users you want to allow a password-less login for."
" Entries denoted with '@' are user groups. Checking a group is like checking all users in that group."));
- connect( npuserlv, SIGNAL(clicked( QListViewItem * )),
- SLOT(slotChanged()) );
+ connect( npuserlv, TQT_SIGNAL(clicked( TQListViewItem * )),
+ TQT_SLOT(slotChanged()) );
- btGroup = new QVGroupBox( i18n("Miscellaneous"), this );
+ btGroup = new TQVGroupBox( i18n("Miscellaneous"), this );
- cbarlen = new QCheckBox(i18n("Automatically log in again after &X server crash"), btGroup);
- QWhatsThis::add( cbarlen, i18n("When this option is on, a user will be"
+ cbarlen = new TQCheckBox(i18n("Automatically log in again after &X server crash"), btGroup);
+ TQWhatsThis::add( cbarlen, i18n("When this option is on, a user will be"
" logged in again automatically when their session is interrupted by an"
" X server crash; note that this can open a security hole: if you use"
" a screen locker than KDE's integrated one, this will make"
" circumventing a password-secured screen lock possible.") );
- connect(cbarlen, SIGNAL(toggled(bool)), SLOT(slotChanged()));
+ connect(cbarlen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
- QGridLayout *main = new QGridLayout(this, 5, 2, 10);
+ TQGridLayout *main = new TQGridLayout(this, 5, 2, 10);
main->addWidget(paranoia, 0, 0);
main->addWidget(alGroup, 1, 0);
main->addWidget(puGroup, 2, 0);
@@ -164,23 +164,23 @@ KDMConvenienceWidget::KDMConvenienceWidget(QWidget *parent, const char *name)
main->setColStretch(1, 2);
main->setRowStretch(3, 1);
- connect( userlb, SIGNAL(activated( const QString & )),
- SLOT(slotSetAutoUser( const QString & )) );
- connect( puserlb, SIGNAL(textChanged( const QString & )),
- SLOT(slotSetPreselUser( const QString & )) );
- connect( npuserlv, SIGNAL(clicked( QListViewItem * )),
- SLOT(slotUpdateNoPassUser( QListViewItem * )) );
+ connect( userlb, TQT_SIGNAL(activated( const TQString & )),
+ TQT_SLOT(slotSetAutoUser( const TQString & )) );
+ connect( puserlb, TQT_SIGNAL(textChanged( const TQString & )),
+ TQT_SLOT(slotSetPreselUser( const TQString & )) );
+ connect( npuserlv, TQT_SIGNAL(clicked( TQListViewItem * )),
+ TQT_SLOT(slotUpdateNoPassUser( TQListViewItem * )) );
}
void KDMConvenienceWidget::makeReadOnly()
{
- ((QWidget*)alGroup->child("qt_groupbox_checkbox"))->setEnabled(false);
+ ((TQWidget*)alGroup->child("qt_groupbox_checkbox"))->setEnabled(false);
userlb->setEnabled(false);
delaysb->setEnabled(false);
againcb->setEnabled(false);
autoLockCheck->setEnabled(false);
- ((QWidget*)npGroup->child("qt_groupbox_checkbox"))->setEnabled(false);
+ ((TQWidget*)npGroup->child("qt_groupbox_checkbox"))->setEnabled(false);
npuserlv->setEnabled(false);
cbarlen->setEnabled(false);
npRadio->setEnabled(false);
@@ -243,7 +243,7 @@ void KDMConvenienceWidget::load()
cbarlen->setChecked(config->readBoolEntry( "AutoReLogin", false) );
config->setGroup("X-:*-Greeter");
- QString presstr = config->readEntry( "PreselectUser", "None" );
+ TQString presstr = config->readEntry( "PreselectUser", "None" );
if (presstr == "Previous")
ppRadio->setChecked(true);
else if (presstr == "Default")
@@ -280,22 +280,22 @@ void KDMConvenienceWidget::slotChanged()
emit changed(true);
}
-void KDMConvenienceWidget::slotSetAutoUser( const QString &user )
+void KDMConvenienceWidget::slotSetAutoUser( const TQString &user )
{
autoUser = user;
}
-void KDMConvenienceWidget::slotSetPreselUser( const QString &user )
+void KDMConvenienceWidget::slotSetPreselUser( const TQString &user )
{
preselUser = user;
}
-void KDMConvenienceWidget::slotUpdateNoPassUser( QListViewItem *item )
+void KDMConvenienceWidget::slotUpdateNoPassUser( TQListViewItem *item )
{
if ( !item )
return;
- QCheckListItem *itm = (QCheckListItem *)item;
- QStringList::iterator it = noPassUsers.find( itm->text() );
+ TQCheckListItem *itm = (TQCheckListItem *)item;
+ TQStringList::iterator it = noPassUsers.find( itm->text() );
if (itm->isOn()) {
if (it == noPassUsers.end())
noPassUsers.append( itm->text() );
@@ -316,9 +316,9 @@ void KDMConvenienceWidget::slotClearUsers()
puserlb->insertItem(preselUser);
}
-void KDMConvenienceWidget::slotAddUsers(const QMap<QString,int> &users)
+void KDMConvenienceWidget::slotAddUsers(const TQMap<TQString,int> &users)
{
- QMapConstIterator<QString,int> it;
+ TQMapConstIterator<TQString,int> it;
for (it = users.begin(); it != users.end(); ++it) {
if (it.data() > 0) {
if (it.key() != autoUser)
@@ -327,7 +327,7 @@ void KDMConvenienceWidget::slotAddUsers(const QMap<QString,int> &users)
puserlb->insertItem(it.key());
}
if (it.data() != 0)
- (new QCheckListItem(npuserlv, it.key(), QCheckListItem::CheckBox))->
+ (new TQCheckListItem(npuserlv, it.key(), TQCheckListItem::CheckBox))->
setOn(noPassUsers.find(it.key()) != noPassUsers.end());
}
@@ -342,9 +342,9 @@ void KDMConvenienceWidget::slotAddUsers(const QMap<QString,int> &users)
puserlb->setCurrentItem(preselUser);
}
-void KDMConvenienceWidget::slotDelUsers(const QMap<QString,int> &users)
+void KDMConvenienceWidget::slotDelUsers(const TQMap<TQString,int> &users)
{
- QMapConstIterator<QString,int> it;
+ TQMapConstIterator<TQString,int> it;
for (it = users.begin(); it != users.end(); ++it) {
if (it.data() > 0) {
if (it.key() != autoUser && userlb->listBox())
diff --git a/kcontrol/kdm/kdm-conv.h b/kcontrol/kdm/kdm-conv.h
index c00128629..611ab9797 100644
--- a/kcontrol/kdm/kdm-conv.h
+++ b/kcontrol/kdm/kdm-conv.h
@@ -22,13 +22,13 @@
#ifndef __KDMCONV_H__
#define __KDMCONV_H__
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qimage.h>
-#include <qgroupbox.h>
-#include <qradiobutton.h>
-#include <qcheckbox.h>
-#include <qspinbox.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqimage.h>
+#include <tqgroupbox.h>
+#include <tqradiobutton.h>
+#include <tqcheckbox.h>
+#include <tqspinbox.h>
#include <klistbox.h>
#include <kcombobox.h>
@@ -44,7 +44,7 @@ class KDMConvenienceWidget : public QWidget
Q_OBJECT
public:
- KDMConvenienceWidget(QWidget *parent=0, const char *name=0);
+ KDMConvenienceWidget(TQWidget *parent=0, const char *name=0);
void load();
void save();
@@ -53,8 +53,8 @@ public:
public slots:
void slotClearUsers();
- void slotAddUsers(const QMap<QString,int> &);
- void slotDelUsers(const QMap<QString,int> &);
+ void slotAddUsers(const TQMap<TQString,int> &);
+ void slotDelUsers(const TQMap<TQString,int> &);
signals:
@@ -63,9 +63,9 @@ signals:
private slots:
void slotPresChanged();
void slotChanged();
- void slotSetAutoUser( const QString &user );
- void slotSetPreselUser( const QString &user );
- void slotUpdateNoPassUser( QListViewItem *item );
+ void slotSetAutoUser( const TQString &user );
+ void slotSetPreselUser( const TQString &user );
+ void slotUpdateNoPassUser( TQListViewItem *item );
private:
QGroupBox *alGroup, *puGroup, *npGroup, *btGroup;
diff --git a/kcontrol/kdm/kdm-font.cpp b/kcontrol/kdm/kdm-font.cpp
index 456573b4d..af83176b1 100644
--- a/kcontrol/kdm/kdm-font.cpp
+++ b/kcontrol/kdm/kdm-font.cpp
@@ -21,13 +21,13 @@
#include <sys/types.h>
-#include <qapplication.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
+#include <tqapplication.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
+#include <tqwhatsthis.h>
#include <kdialog.h>
#include <ksimpleconfig.h>
@@ -39,38 +39,38 @@
extern KSimpleConfig *config;
-KDMFontWidget::KDMFontWidget(QWidget *parent, const char *name)
- : QWidget(parent, name)
+KDMFontWidget::KDMFontWidget(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
{
- QGridLayout *ml = new QGridLayout(this, 5, 2, KDialog::marginHint(), KDialog::spacingHint());
- QLabel *label = new QLabel(i18n("&General:"), this);
+ TQGridLayout *ml = new TQGridLayout(this, 5, 2, KDialog::marginHint(), KDialog::spacingHint());
+ TQLabel *label = new TQLabel(i18n("&General:"), this);
stdFontChooser = new KFontRequester(this);
label->setBuddy(stdFontChooser);
- QWhatsThis::add( stdFontChooser, i18n("This changes the font which is used for all the text in the login manager except for the greeting and failure messages.") );
- connect(stdFontChooser, SIGNAL(fontSelected(const QFont&)),this,SLOT(configChanged()));
+ TQWhatsThis::add( stdFontChooser, i18n("This changes the font which is used for all the text in the login manager except for the greeting and failure messages.") );
+ connect(stdFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
ml->addWidget(label, 1, 0);
ml->addWidget(stdFontChooser, 1, 1);
- label = new QLabel(i18n("&Failures:"), this);
+ label = new TQLabel(i18n("&Failures:"), this);
failFontChooser = new KFontRequester(this);
label->setBuddy(failFontChooser);
- QWhatsThis::add( failFontChooser, i18n("This changes the font which is used for failure messages in the login manager.") );
- connect(failFontChooser, SIGNAL(fontSelected(const QFont&)),this,SLOT(configChanged()));
+ TQWhatsThis::add( failFontChooser, i18n("This changes the font which is used for failure messages in the login manager.") );
+ connect(failFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
ml->addWidget(label, 2, 0);
ml->addWidget(failFontChooser, 2, 1);
- label = new QLabel(i18n("Gree&ting:"), this);
+ label = new TQLabel(i18n("Gree&ting:"), this);
greetingFontChooser = new KFontRequester(this);
label->setBuddy(greetingFontChooser);
- QWhatsThis::add( greetingFontChooser, i18n("This changes the font which is used for the login manager's greeting.") );
- connect(greetingFontChooser, SIGNAL(fontSelected(const QFont&)),this,SLOT(configChanged()));
+ TQWhatsThis::add( greetingFontChooser, i18n("This changes the font which is used for the login manager's greeting.") );
+ connect(greetingFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
ml->addWidget(label, 3, 0);
ml->addWidget(greetingFontChooser, 3, 1);
- aacb = new QCheckBox (i18n("Use anti-aliasing for fonts"), this);
- QWhatsThis::add( aacb, i18n("If you check this box and your X-Server has the Xft extension, "
+ aacb = new TQCheckBox (i18n("Use anti-aliasing for fonts"), this);
+ TQWhatsThis::add( aacb, i18n("If you check this box and your X-Server has the Xft extension, "
"fonts will be antialiased (smoothed) in the login dialog.") );
- connect(aacb, SIGNAL(toggled ( bool )),this,SLOT(configChanged()));
+ connect(aacb, TQT_SIGNAL(toggled ( bool )),this,TQT_SLOT(configChanged()));
ml->addMultiCellWidget(aacb, 4, 4, 0, 1);
ml->setRowStretch(5, 10);
}
@@ -90,9 +90,9 @@ void KDMFontWidget::configChanged()
void KDMFontWidget::set_def()
{
- stdFontChooser->setFont(QFont("Sans Serif", 10));
- failFontChooser->setFont(QFont("Sans Serif", 10, QFont::Bold));
- greetingFontChooser->setFont(QFont("Sans Serif", 22));
+ stdFontChooser->setFont(TQFont("Sans Serif", 10));
+ failFontChooser->setFont(TQFont("Sans Serif", 10, TQFont::Bold));
+ greetingFontChooser->setFont(TQFont("Sans Serif", 22));
}
void KDMFontWidget::save()
@@ -114,7 +114,7 @@ void KDMFontWidget::load()
config->setGroup("X-*-Greeter");
// Read the fonts
- QFont font = stdFontChooser->font();
+ TQFont font = stdFontChooser->font();
stdFontChooser->setFont(config->readFontEntry("StdFont", &font));
font = failFontChooser->font();
failFontChooser->setFont(config->readFontEntry("FailFont", &font));
diff --git a/kcontrol/kdm/kdm-font.h b/kcontrol/kdm/kdm-font.h
index 232db3cb4..92488d3e7 100644
--- a/kcontrol/kdm/kdm-font.h
+++ b/kcontrol/kdm/kdm-font.h
@@ -20,7 +20,7 @@
#ifndef __KDMFONT_H__
#define __KDMFONT_H__
-#include <qwidget.h>
+#include <tqwidget.h>
class KFontRequester;
class QCheckBox;
@@ -30,7 +30,7 @@ class KDMFontWidget : public QWidget
Q_OBJECT
public:
- KDMFontWidget(QWidget *parent=0, const char *name=0);
+ KDMFontWidget(TQWidget *parent=0, const char *name=0);
void load();
void save();
diff --git a/kcontrol/kdm/kdm-shut.cpp b/kcontrol/kdm/kdm-shut.cpp
index 2eb88ac51..3b442956a 100644
--- a/kcontrol/kdm/kdm-shut.cpp
+++ b/kcontrol/kdm/kdm-shut.cpp
@@ -21,11 +21,11 @@
#include <sys/types.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
#include <ksimpleconfig.h>
#include <karrowbutton.h>
@@ -40,27 +40,27 @@
extern KSimpleConfig *config;
-KDMSessionsWidget::KDMSessionsWidget(QWidget *parent, const char *name)
- : QWidget(parent, name)
+KDMSessionsWidget::KDMSessionsWidget(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
{
- QString wtstr;
+ TQString wtstr;
- QGroupBox *group0 = new QGroupBox( i18n("Allow Shutdown"), this );
+ TQGroupBox *group0 = new TQGroupBox( i18n("Allow Shutdown"), this );
- sdlcombo = new QComboBox( FALSE, group0 );
- sdllabel = new QLabel (sdlcombo, i18n ("&Local:"), group0);
+ sdlcombo = new TQComboBox( FALSE, group0 );
+ sdllabel = new TQLabel (sdlcombo, i18n ("&Local:"), group0);
sdlcombo->insertItem(i18n("Everybody"), SdAll);
sdlcombo->insertItem(i18n("Only Root"), SdRoot);
sdlcombo->insertItem(i18n("Nobody"), SdNone);
- connect(sdlcombo, SIGNAL(activated(int)), SLOT(changed()));
- sdrcombo = new QComboBox( FALSE, group0 );
- sdrlabel = new QLabel (sdrcombo, i18n ("&Remote:"), group0);
+ connect(sdlcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+ sdrcombo = new TQComboBox( FALSE, group0 );
+ sdrlabel = new TQLabel (sdrcombo, i18n ("&Remote:"), group0);
sdrcombo->insertItem(i18n("Everybody"), SdAll);
sdrcombo->insertItem(i18n("Only Root"), SdRoot);
sdrcombo->insertItem(i18n("Nobody"), SdNone);
- connect(sdrcombo, SIGNAL(activated(int)), SLOT(changed()));
- QWhatsThis::add( group0, i18n("Here you can select who is allowed to shutdown"
+ connect(sdrcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+ TQWhatsThis::add( group0, i18n("Here you can select who is allowed to shutdown"
" the computer using KDM. You can specify different values for local (console) and remote displays. "
"Possible values are:<ul>"
" <li><em>Everybody:</em> everybody can shutdown the computer using KDM</li>"
@@ -68,26 +68,26 @@ KDMSessionsWidget::KDMSessionsWidget(QWidget *parent, const char *name)
" <li><em>Nobody:</em> nobody can shutdown the computer using KDM</li></ul>") );
- QGroupBox *group1 = new QGroupBox( i18n("Commands"), this );
+ TQGroupBox *group1 = new TQGroupBox( i18n("Commands"), this );
shutdown_lined = new KURLRequester(group1);
- QLabel *shutdown_label = new QLabel(shutdown_lined, i18n("H&alt:"), group1);
- connect(shutdown_lined, SIGNAL(textChanged(const QString&)),
- SLOT(changed()));
+ TQLabel *shutdown_label = new TQLabel(shutdown_lined, i18n("H&alt:"), group1);
+ connect(shutdown_lined, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(changed()));
wtstr = i18n("Command to initiate the system halt. Typical value: /sbin/halt");
- QWhatsThis::add( shutdown_label, wtstr );
- QWhatsThis::add( shutdown_lined, wtstr );
+ TQWhatsThis::add( shutdown_label, wtstr );
+ TQWhatsThis::add( shutdown_lined, wtstr );
restart_lined = new KURLRequester(group1);
- QLabel *restart_label = new QLabel(restart_lined, i18n("Reb&oot:"), group1);
- connect(restart_lined, SIGNAL(textChanged(const QString&)),
- SLOT(changed()));
+ TQLabel *restart_label = new TQLabel(restart_lined, i18n("Reb&oot:"), group1);
+ connect(restart_lined, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(changed()));
wtstr = i18n("Command to initiate the system reboot. Typical value: /sbin/reboot");
- QWhatsThis::add( restart_label, wtstr );
- QWhatsThis::add( restart_lined, wtstr );
+ TQWhatsThis::add( restart_label, wtstr );
+ TQWhatsThis::add( restart_lined, wtstr );
- QGroupBox *group4 = new QGroupBox( i18n("Miscellaneous"), this );
+ TQGroupBox *group4 = new TQGroupBox( i18n("Miscellaneous"), this );
bm_combo = new KBackedComboBox( group4 );
bm_combo->insertItem("None", i18n("boot manager", "None"));
@@ -95,16 +95,16 @@ KDMSessionsWidget::KDMSessionsWidget(QWidget *parent, const char *name)
#if defined(__linux__) && ( defined(__i386__) || defined(__amd64__) )
bm_combo->insertItem("Lilo", i18n("Lilo"));
#endif
- QLabel *bm_label = new QLabel( bm_combo, i18n("Boot manager:"), group4 );
- connect(bm_combo, SIGNAL(activated(int)), SLOT(changed()));
+ TQLabel *bm_label = new TQLabel( bm_combo, i18n("Boot manager:"), group4 );
+ connect(bm_combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
wtstr = i18n("Enable boot options in the \"Shutdown...\" dialog.");
- QWhatsThis::add( bm_label, wtstr );
- QWhatsThis::add( bm_combo, wtstr );
+ TQWhatsThis::add( bm_label, wtstr );
+ TQWhatsThis::add( bm_combo, wtstr );
- QBoxLayout *main = new QVBoxLayout( this, 10 );
- QGridLayout *lgroup0 = new QGridLayout( group0, 1, 1, 10);
- QGridLayout *lgroup1 = new QGridLayout( group1, 1, 1, 10);
- QGridLayout *lgroup4 = new QGridLayout( group4, 1, 1, 10);
+ TQBoxLayout *main = new TQVBoxLayout( this, 10 );
+ TQGridLayout *lgroup0 = new TQGridLayout( group0, 1, 1, 10);
+ TQGridLayout *lgroup1 = new TQGridLayout( group1, 1, 1, 10);
+ TQGridLayout *lgroup4 = new TQGridLayout( group4, 1, 1, 10);
main->addWidget(group0);
main->addWidget(group1);
@@ -151,9 +151,9 @@ void KDMSessionsWidget::makeReadOnly()
bm_combo->setEnabled(false);
}
-void KDMSessionsWidget::writeSD(QComboBox *combo)
+void KDMSessionsWidget::writeSD(TQComboBox *combo)
{
- QString what;
+ TQString what;
switch (combo->currentItem()) {
case SdAll: what = "All"; break;
case SdRoot: what = "Root"; break;
@@ -177,9 +177,9 @@ void KDMSessionsWidget::save()
config->writeEntry("BootManager", bm_combo->currentId());
}
-void KDMSessionsWidget::readSD(QComboBox *combo, QString def)
+void KDMSessionsWidget::readSD(TQComboBox *combo, TQString def)
{
- QString str = config->readEntry("AllowShutdown", def);
+ TQString str = config->readEntry("AllowShutdown", def);
SdModes sdMode;
if(str == "All")
sdMode = SdAll;
diff --git a/kcontrol/kdm/kdm-shut.h b/kcontrol/kdm/kdm-shut.h
index 8bad7d5a0..0d603e9eb 100644
--- a/kcontrol/kdm/kdm-shut.h
+++ b/kcontrol/kdm/kdm-shut.h
@@ -21,7 +21,7 @@
#define __KDMSESS_H__
-#include <qstring.h>
+#include <tqstring.h>
class QComboBox;
class QCheckBox;
@@ -33,7 +33,7 @@ class KDMSessionsWidget : public QWidget
Q_OBJECT
public:
- KDMSessionsWidget(QWidget *parent=0, const char *name=0);
+ KDMSessionsWidget(TQWidget *parent=0, const char *name=0);
void load();
void save();
@@ -49,8 +49,8 @@ protected slots:
void changed();
private:
- void readSD (QComboBox *, QString);
- void writeSD (QComboBox *);
+ void readSD (TQComboBox *, TQString);
+ void writeSD (TQComboBox *);
QComboBox *sdlcombo, *sdrcombo;
QLabel *sdllabel, *sdrlabel;
diff --git a/kcontrol/kdm/kdm-users.cpp b/kcontrol/kdm/kdm-users.cpp
index d8a540bd3..ce27f6498 100644
--- a/kcontrol/kdm/kdm-users.cpp
+++ b/kcontrol/kdm/kdm-users.cpp
@@ -20,14 +20,14 @@
#include <unistd.h>
#include <sys/types.h>
-#include <qstyle.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qtooltip.h>
-#include <qvalidator.h>
-#include <qwhatsthis.h>
-#include <qvgroupbox.h>
-#include <qpushbutton.h>
+#include <tqstyle.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqtooltip.h>
+#include <tqvalidator.h>
+#include <tqwhatsthis.h>
+#include <tqvgroupbox.h>
+#include <tqpushbutton.h>
#include <kfiledialog.h>
#include <kimageio.h>
@@ -45,8 +45,8 @@
extern KSimpleConfig *config;
-KDMUsersWidget::KDMUsersWidget(QWidget *parent, const char *name)
- : QWidget(parent, name)
+KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
{
#ifdef __linux__
struct stat st;
@@ -76,130 +76,130 @@ KDMUsersWidget::KDMUsersWidget(QWidget *parent, const char *name)
config->setGroup( "X-*-Greeter" );
m_userPixDir = config->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/';
m_notFirst = false;
- QDir testDir( m_userPixDir );
+ TQDir testDir( m_userPixDir );
if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ) && !geteuid() )
KMessageBox::sorry( this, i18n("Unable to create folder %1").arg( testDir.absPath() ) );
- chmod( QFile::encodeName( m_userPixDir ), 0755 );
+ chmod( TQFile::encodeName( m_userPixDir ), 0755 );
m_defaultText = i18n("<default>");
- QString wtstr;
+ TQString wtstr;
- minGroup = new QGroupBox( 2, Horizontal, i18n("System U&IDs"), this );
- QWhatsThis::add( minGroup, i18n("Users with a UID (numerical user identification) outside this range will not be listed by KDM and this setup dialog."
+ minGroup = new TQGroupBox( 2, Horizontal, i18n("System U&IDs"), this );
+ TQWhatsThis::add( minGroup, i18n("Users with a UID (numerical user identification) outside this range will not be listed by KDM and this setup dialog."
" Note that users with the UID 0 (typically root) are not affected by this and must be"
" explicitly hidden in \"Not hidden\" mode."));
- QSizePolicy sp_ign_fix( QSizePolicy::Ignored, QSizePolicy::Fixed );
- QValidator *valid = new QIntValidator( 0, 999999, minGroup );
- QLabel *minlab = new QLabel( i18n("Below:"), minGroup );
+ TQSizePolicy sp_ign_fix( TQSizePolicy::Ignored, TQSizePolicy::Fixed );
+ TQValidator *valid = new TQIntValidator( 0, 999999, minGroup );
+ TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup );
leminuid = new KLineEdit( minGroup );
minlab->setBuddy( leminuid );
leminuid->setSizePolicy( sp_ign_fix );
leminuid->setValidator( valid );
- connect( leminuid, SIGNAL(textChanged( const QString & )), SLOT(slotChanged()) );
- connect( leminuid, SIGNAL(textChanged( const QString & )), SLOT(slotMinMaxChanged()) );
- QLabel *maxlab = new QLabel( i18n("Above:"), minGroup );
+ connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) );
+ connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) );
+ TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup );
lemaxuid = new KLineEdit( minGroup );
maxlab->setBuddy( lemaxuid );
lemaxuid->setSizePolicy( sp_ign_fix );
lemaxuid->setValidator( valid );
- connect(lemaxuid, SIGNAL(textChanged( const QString & )), SLOT(slotChanged()) );
- connect(lemaxuid, SIGNAL(textChanged( const QString & )), SLOT(slotMinMaxChanged()) );
-
- usrGroup = new QButtonGroup( 5, Qt::Vertical, i18n("Users"), this );
- connect( usrGroup, SIGNAL(clicked( int )), SLOT(slotShowOpts()) );
- connect( usrGroup, SIGNAL(clicked( int )), SLOT(slotChanged()) );
- cbshowlist = new QCheckBox( i18n("Show list"), usrGroup );
- QWhatsThis::add( cbshowlist, i18n("If this option is checked, KDM will show a list of users,"
+ connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) );
+ connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) );
+
+ usrGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("Users"), this );
+ connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotShowOpts()) );
+ connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) );
+ cbshowlist = new TQCheckBox( i18n("Show list"), usrGroup );
+ TQWhatsThis::add( cbshowlist, i18n("If this option is checked, KDM will show a list of users,"
" so users can click on their name or image rather than typing in their login.") );
- cbcomplete = new QCheckBox( i18n("Autocompletion"), usrGroup );
- QWhatsThis::add( cbcomplete, i18n("If this option is checked, KDM will automatically complete"
+ cbcomplete = new TQCheckBox( i18n("Autocompletion"), usrGroup );
+ TQWhatsThis::add( cbcomplete, i18n("If this option is checked, KDM will automatically complete"
" user names while they are typed in the line edit.") );
- cbinverted = new QCheckBox( i18n("Inverse selection"), usrGroup );
- QWhatsThis::add( cbinverted, i18n("This option specifies how the users for \"Show list\" and \"Autocompletion\""
+ cbinverted = new TQCheckBox( i18n("Inverse selection"), usrGroup );
+ TQWhatsThis::add( cbinverted, i18n("This option specifies how the users for \"Show list\" and \"Autocompletion\""
" are selected in the \"Select users and groups\" list: "
"If not checked, select only the checked users. "
"If checked, select all non-system users, except the checked ones."));
- cbusrsrt = new QCheckBox( i18n("Sor&t users"), usrGroup );
- connect( cbusrsrt, SIGNAL(toggled( bool )), SLOT(slotChanged()) );
- QWhatsThis::add( cbusrsrt, i18n("If this is checked, KDM will alphabetically sort the user list."
+ cbusrsrt = new TQCheckBox( i18n("Sor&t users"), usrGroup );
+ connect( cbusrsrt, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotChanged()) );
+ TQWhatsThis::add( cbusrsrt, i18n("If this is checked, KDM will alphabetically sort the user list."
" Otherwise users are listed in the order they appear in the password file.") );
- wstack = new QWidgetStack( this );
- s_label = new QLabel( wstack, i18n("S&elect users and groups:"), this );
+ wstack = new TQWidgetStack( this );
+ s_label = new TQLabel( wstack, i18n("S&elect users and groups:"), this );
optinlv = new KListView( this );
optinlv->addColumn( i18n("Selected Users") );
- optinlv->setResizeMode( QListView::LastColumn );
- QWhatsThis::add( optinlv, i18n("KDM will show all checked users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );
+ optinlv->setResizeMode( TQListView::LastColumn );
+ TQWhatsThis::add( optinlv, i18n("KDM will show all checked users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );
wstack->addWidget( optinlv );
- connect( optinlv, SIGNAL(clicked( QListViewItem * )),
- SLOT(slotUpdateOptIn( QListViewItem * )) );
- connect( optinlv, SIGNAL(clicked( QListViewItem * )),
- SLOT(slotChanged()) );
+ connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )),
+ TQT_SLOT(slotUpdateOptIn( TQListViewItem * )) );
+ connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )),
+ TQT_SLOT(slotChanged()) );
optoutlv = new KListView( this );
optoutlv->addColumn( i18n("Hidden Users") );
- optoutlv->setResizeMode( QListView::LastColumn );
- QWhatsThis::add( optoutlv, i18n("KDM will show all non-checked non-system users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );
+ optoutlv->setResizeMode( TQListView::LastColumn );
+ TQWhatsThis::add( optoutlv, i18n("KDM will show all non-checked non-system users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );
wstack->addWidget( optoutlv );
- connect( optoutlv, SIGNAL(clicked( QListViewItem * )),
- SLOT(slotUpdateOptOut( QListViewItem * )) );
- connect( optoutlv, SIGNAL(clicked( QListViewItem * )),
- SLOT(slotChanged()) );
+ connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )),
+ TQT_SLOT(slotUpdateOptOut( TQListViewItem * )) );
+ connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )),
+ TQT_SLOT(slotChanged()) );
- faceGroup = new QButtonGroup( 5, Qt::Vertical, i18n("User Image Source"), this );
- QWhatsThis::add( faceGroup, i18n("Here you can specify where KDM will obtain the images that represent users."
+ faceGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("User Image Source"), this );
+ TQWhatsThis::add( faceGroup, i18n("Here you can specify where KDM will obtain the images that represent users."
" \"Admin\" represents the global folder; these are the pictures you can set below."
" \"User\" means that KDM should read the user's $HOME/.face.icon file."
" The two selections in the middle define the order of preference if both sources are available.") );
- connect( faceGroup, SIGNAL(clicked( int )), SLOT(slotFaceOpts()) );
- connect( faceGroup, SIGNAL(clicked( int )), SLOT(slotChanged()) );
- rbadmonly = new QRadioButton( i18n("Admin"), faceGroup );
- rbprefadm = new QRadioButton( i18n("Admin, user"), faceGroup );
- rbprefusr = new QRadioButton( i18n("User, admin"), faceGroup );
- rbusronly = new QRadioButton( i18n("User"), faceGroup );
-
- QGroupBox *picGroup = new QVGroupBox( i18n("User Images"), this );
- QWidget *hlpw = new QWidget( picGroup );
+ connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotFaceOpts()) );
+ connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) );
+ rbadmonly = new TQRadioButton( i18n("Admin"), faceGroup );
+ rbprefadm = new TQRadioButton( i18n("Admin, user"), faceGroup );
+ rbprefusr = new TQRadioButton( i18n("User, admin"), faceGroup );
+ rbusronly = new TQRadioButton( i18n("User"), faceGroup );
+
+ TQGroupBox *picGroup = new TQVGroupBox( i18n("User Images"), this );
+ TQWidget *hlpw = new TQWidget( picGroup );
usercombo = new KComboBox( hlpw );
- QWhatsThis::add( usercombo, i18n("The user the image below belongs to.") );
- connect( usercombo, SIGNAL(activated( int )),
- SLOT(slotUserSelected()) );
- QLabel *userlabel = new QLabel( usercombo, i18n("User:"), hlpw );
- userbutton = new QPushButton( hlpw );
+ TQWhatsThis::add( usercombo, i18n("The user the image below belongs to.") );
+ connect( usercombo, TQT_SIGNAL(activated( int )),
+ TQT_SLOT(slotUserSelected()) );
+ TQLabel *userlabel = new TQLabel( usercombo, i18n("User:"), hlpw );
+ userbutton = new TQPushButton( hlpw );
userbutton->setAcceptDrops( true );
userbutton->installEventFilter( this ); // for drag and drop
- uint sz = style().pixelMetric( QStyle::PM_ButtonMargin ) * 2 + 48;
+ uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48;
userbutton->setFixedSize( sz, sz );
- connect( userbutton, SIGNAL(clicked()),
- SLOT(slotUserButtonClicked()) );
- QToolTip::add( userbutton, i18n("Click or drop an image here") );
- QWhatsThis::add( userbutton, i18n("Here you can see the image assigned to the user selected in the combo box above. Click on the image button to select from a list"
+ connect( userbutton, TQT_SIGNAL(clicked()),
+ TQT_SLOT(slotUserButtonClicked()) );
+ TQToolTip::add( userbutton, i18n("Click or drop an image here") );
+ TQWhatsThis::add( userbutton, i18n("Here you can see the image assigned to the user selected in the combo box above. Click on the image button to select from a list"
" of images or drag and drop your own image on to the button (e.g. from Konqueror).") );
- rstuserbutton = new QPushButton( i18n("Unset"), hlpw );
- QWhatsThis::add( rstuserbutton, i18n("Click this button to make KDM use the default image for the selected user.") );
- connect( rstuserbutton, SIGNAL(clicked()),
- SLOT(slotUnsetUserPix()) );
- QGridLayout *hlpl = new QGridLayout( hlpw, 3, 2, 0, KDialog::spacingHint() );
+ rstuserbutton = new TQPushButton( i18n("Unset"), hlpw );
+ TQWhatsThis::add( rstuserbutton, i18n("Click this button to make KDM use the default image for the selected user.") );
+ connect( rstuserbutton, TQT_SIGNAL(clicked()),
+ TQT_SLOT(slotUnsetUserPix()) );
+ TQGridLayout *hlpl = new TQGridLayout( hlpw, 3, 2, 0, KDialog::spacingHint() );
hlpl->addWidget( userlabel, 0, 0 );
// hlpl->addSpacing( KDialog::spacingHint() );
hlpl->addWidget( usercombo, 0, 1 );
hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, AlignHCenter );
hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, AlignHCenter );
- QHBoxLayout *main = new QHBoxLayout( this, 10 );
+ TQHBoxLayout *main = new TQHBoxLayout( this, 10 );
- QVBoxLayout *lLayout = new QVBoxLayout( main, 10 );
+ TQVBoxLayout *lLayout = new TQVBoxLayout( main, 10 );
lLayout->addWidget( minGroup );
lLayout->addWidget( usrGroup );
lLayout->addStretch( 1 );
- QVBoxLayout *mLayout = new QVBoxLayout( main, 10 );
+ TQVBoxLayout *mLayout = new TQVBoxLayout( main, 10 );
mLayout->addWidget( s_label );
mLayout->addWidget( wstack );
mLayout->setStretchFactor( wstack, 1 );
main->setStretchFactor( mLayout, 1 );
- QVBoxLayout *rLayout = new QVBoxLayout( main, 10 );
+ TQVBoxLayout *rLayout = new TQVBoxLayout( main, 10 );
rLayout->addWidget( faceGroup );
rLayout->addWidget( picGroup );
rLayout->addStretch( 1 );
@@ -219,7 +219,7 @@ void KDMUsersWidget::makeReadOnly()
rbprefusr->setEnabled(false);
rbusronly->setEnabled(false);
wstack->setEnabled(false);
- disconnect( userbutton, SIGNAL(clicked()), this, SLOT(slotUserButtonClicked()) );
+ disconnect( userbutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUserButtonClicked()) );
userbutton->setAcceptDrops(false);
rstuserbutton->setEnabled(false);
}
@@ -254,8 +254,8 @@ void KDMUsersWidget::slotFaceOpts()
void KDMUsersWidget::slotUserSelected()
{
- QString user = usercombo->currentText();
- QImage p;
+ TQString user = usercombo->currentText();
+ TQImage p;
if (user != m_defaultText &&
p.load( m_userPixDir + user + ".face.icon" )) {
rstuserbutton->setEnabled( !getuid() );
@@ -263,22 +263,22 @@ void KDMUsersWidget::slotUserSelected()
p.load( m_userPixDir + ".default.face.icon" );
rstuserbutton->setEnabled( false );
}
- userbutton->setPixmap( p.smoothScale( 48, 48, QImage::ScaleMin ) );
+ userbutton->setPixmap( p.smoothScale( 48, 48, TQImage::ScaleMin ) );
}
-void KDMUsersWidget::changeUserPix(const QString &pix)
+void KDMUsersWidget::changeUserPix(const TQString &pix)
{
- QString user( usercombo->currentText() );
+ TQString user( usercombo->currentText() );
if (user == m_defaultText)
{
user = ".default";
- if (KMessageBox::questionYesNo(this, i18n("Save image as default image?"),QString::null,KStdGuiItem::save(),KStdGuiItem::cancel())
+ if (KMessageBox::questionYesNo(this, i18n("Save image as default image?"),TQString::null,KStdGuiItem::save(),KStdGuiItem::cancel())
!= KMessageBox::Yes)
return;
}
- QImage p( pix );
+ TQImage p( pix );
if (p.isNull()) {
KMessageBox::sorry( this,
i18n("There was an error loading the image\n"
@@ -286,21 +286,21 @@ void KDMUsersWidget::changeUserPix(const QString &pix)
return;
}
- p = p.smoothScale( 48, 48, QImage::ScaleMin );
- QString userpix = m_userPixDir + user + ".face.icon";
+ p = p.smoothScale( 48, 48, TQImage::ScaleMin );
+ TQString userpix = m_userPixDir + user + ".face.icon";
if (!p.save( userpix, "PNG" ))
KMessageBox::sorry(this,
i18n("There was an error saving the image:\n%1")
.arg( userpix ) );
else
- chmod( QFile::encodeName( userpix ), 0644 );
+ chmod( TQFile::encodeName( userpix ), 0644 );
slotUserSelected();
}
void KDMUsersWidget::slotUserButtonClicked()
{
- KFileDialog dlg(m_notFirst ? QString::null :
+ KFileDialog dlg(m_notFirst ? TQString::null :
KGlobal::dirs()->resourceDirs("data").last() + "kdm/pics/users",
KImageIO::pattern( KImageIO::Reading ),
this, 0, true);
@@ -310,7 +310,7 @@ void KDMUsersWidget::slotUserButtonClicked()
KImageFilePreview *ip = new KImageFilePreview( &dlg );
dlg.setPreviewWidget( ip );
- if (dlg.exec() != QDialog::Accepted)
+ if (dlg.exec() != TQDialog::Accepted)
return;
m_notFirst = true;
@@ -319,33 +319,33 @@ void KDMUsersWidget::slotUserButtonClicked()
void KDMUsersWidget::slotUnsetUserPix()
{
- QFile::remove( m_userPixDir + usercombo->currentText() + ".face.icon" );
+ TQFile::remove( m_userPixDir + usercombo->currentText() + ".face.icon" );
slotUserSelected();
}
-bool KDMUsersWidget::eventFilter(QObject *, QEvent *e)
+bool KDMUsersWidget::eventFilter(TQObject *, TQEvent *e)
{
- if (e->type() == QEvent::DragEnter) {
- QDragEnterEvent *ee = (QDragEnterEvent *) e;
+ if (e->type() == TQEvent::DragEnter) {
+ TQDragEnterEvent *ee = (TQDragEnterEvent *) e;
ee->accept( KURLDrag::canDecode(ee) );
return true;
}
- if (e->type() == QEvent::Drop) {
- userButtonDropEvent((QDropEvent *) e);
+ if (e->type() == TQEvent::Drop) {
+ userButtonDropEvent((TQDropEvent *) e);
return true;
}
return false;
}
-KURL *decodeImgDrop(QDropEvent *e, QWidget *wdg);
+KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg);
-void KDMUsersWidget::userButtonDropEvent(QDropEvent *e)
+void KDMUsersWidget::userButtonDropEvent(TQDropEvent *e)
{
KURL *url = decodeImgDrop(e, this);
if (url) {
- QString pixpath;
+ TQString pixpath;
KIO::NetAccess::download(*url, pixpath, parentWidget());
changeUserPix( pixpath );
KIO::NetAccess::removeTempFile(pixpath);
@@ -376,12 +376,12 @@ void KDMUsersWidget::save()
}
-void KDMUsersWidget::updateOptList( QListViewItem *item, QStringList &list )
+void KDMUsersWidget::updateOptList( TQListViewItem *item, TQStringList &list )
{
if ( !item )
return;
- QCheckListItem *itm = (QCheckListItem *)item;
- QStringList::iterator it = list.find( itm->text() );
+ TQCheckListItem *itm = (TQCheckListItem *)item;
+ TQStringList::iterator it = list.find( itm->text() );
if (itm->isOn()) {
if (it == list.end())
list.append( itm->text() );
@@ -391,12 +391,12 @@ void KDMUsersWidget::updateOptList( QListViewItem *item, QStringList &list )
}
}
-void KDMUsersWidget::slotUpdateOptIn( QListViewItem *item )
+void KDMUsersWidget::slotUpdateOptIn( TQListViewItem *item )
{
updateOptList( item, selectedUsers );
}
-void KDMUsersWidget::slotUpdateOptOut( QListViewItem *item )
+void KDMUsersWidget::slotUpdateOptOut( TQListViewItem *item )
{
updateOptList( item, hiddenUsers );
}
@@ -409,14 +409,14 @@ void KDMUsersWidget::slotClearUsers()
usercombo->insertItem( m_defaultText );
}
-void KDMUsersWidget::slotAddUsers(const QMap<QString,int> &users)
+void KDMUsersWidget::slotAddUsers(const TQMap<TQString,int> &users)
{
- QMapConstIterator<QString,int> it;
+ TQMapConstIterator<TQString,int> it;
for (it = users.begin(); it != users.end(); ++it) {
- const QString *name = &it.key();
- (new QCheckListItem(optinlv, *name, QCheckListItem::CheckBox))->
+ const TQString *name = &it.key();
+ (new TQCheckListItem(optinlv, *name, TQCheckListItem::CheckBox))->
setOn(selectedUsers.find(*name) != selectedUsers.end());
- (new QCheckListItem(optoutlv, *name, QCheckListItem::CheckBox))->
+ (new TQCheckListItem(optoutlv, *name, TQCheckListItem::CheckBox))->
setOn(hiddenUsers.find(*name) != hiddenUsers.end());
if ((*name)[0] != '@')
usercombo->insertItem(*name);
@@ -427,11 +427,11 @@ void KDMUsersWidget::slotAddUsers(const QMap<QString,int> &users)
usercombo->listBox()->sort();
}
-void KDMUsersWidget::slotDelUsers(const QMap<QString,int> &users)
+void KDMUsersWidget::slotDelUsers(const TQMap<TQString,int> &users)
{
- QMapConstIterator<QString,int> it;
+ TQMapConstIterator<TQString,int> it;
for (it = users.begin(); it != users.end(); ++it) {
- const QString *name = &it.key();
+ const TQString *name = &it.key();
if (usercombo->listBox())
delete usercombo->listBox()->findItem( *name, ExactMatch | CaseSensitive );
delete optinlv->findItem( *name, 0 );
@@ -441,7 +441,7 @@ void KDMUsersWidget::slotDelUsers(const QMap<QString,int> &users)
void KDMUsersWidget::load()
{
- QString str;
+ TQString str;
config->setGroup("X-*-Greeter");
@@ -456,12 +456,12 @@ void KDMUsersWidget::load()
cbinverted->setChecked( config->readEntry( "ShowUsers" ) != "Selected" );
cbusrsrt->setChecked(config->readBoolEntry("SortUsers", true));
- QString ps = config->readEntry( "FaceSource" );
- if (ps == QString::fromLatin1("UserOnly"))
+ TQString ps = config->readEntry( "FaceSource" );
+ if (ps == TQString::fromLatin1("UserOnly"))
rbusronly->setChecked(true);
- else if (ps == QString::fromLatin1("PreferUser"))
+ else if (ps == TQString::fromLatin1("PreferUser"))
rbprefusr->setChecked(true);
- else if (ps == QString::fromLatin1("PreferAdmin"))
+ else if (ps == TQString::fromLatin1("PreferAdmin"))
rbprefadm->setChecked(true);
else
rbadmonly->setChecked(true);
diff --git a/kcontrol/kdm/kdm-users.h b/kcontrol/kdm/kdm-users.h
index b54d96ff8..129f5301d 100644
--- a/kcontrol/kdm/kdm-users.h
+++ b/kcontrol/kdm/kdm-users.h
@@ -20,14 +20,14 @@
#ifndef __KDMUSERS_H__
#define __KDMUSERS_H__
-#include <qwidget.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qimage.h>
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
-#include <qcheckbox.h>
-#include <qwidgetstack.h>
+#include <tqwidget.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqimage.h>
+#include <tqbuttongroup.h>
+#include <tqradiobutton.h>
+#include <tqcheckbox.h>
+#include <tqwidgetstack.h>
#include <klineedit.h>
#include <klistview.h>
@@ -42,19 +42,19 @@ class KDMUsersWidget : public QWidget
Q_OBJECT
public:
- KDMUsersWidget( QWidget *parent = 0, const char *name = 0 );
+ KDMUsersWidget( TQWidget *parent = 0, const char *name = 0 );
void load();
void save();
void defaults();
void makeReadOnly();
- bool eventFilter( QObject *o, QEvent *e );
+ bool eventFilter( TQObject *o, TQEvent *e );
public slots:
void slotClearUsers();
- void slotAddUsers( const QMap<QString,int> & );
- void slotDelUsers( const QMap<QString,int> & );
+ void slotAddUsers( const TQMap<TQString,int> & );
+ void slotDelUsers( const TQMap<TQString,int> & );
signals:
void changed( bool state );
@@ -63,8 +63,8 @@ signals:
private slots:
void slotMinMaxChanged();
void slotShowOpts();
- void slotUpdateOptIn( QListViewItem *item );
- void slotUpdateOptOut( QListViewItem *item );
+ void slotUpdateOptIn( TQListViewItem *item );
+ void slotUpdateOptOut( TQListViewItem *item );
void slotUserSelected();
void slotUnsetUserPix();
void slotFaceOpts();
@@ -72,9 +72,9 @@ private slots:
void slotChanged();
private:
- void updateOptList( QListViewItem *item, QStringList &list );
- void userButtonDropEvent( QDropEvent *e );
- void changeUserPix( const QString & );
+ void updateOptList( TQListViewItem *item, TQStringList &list );
+ void userButtonDropEvent( TQDropEvent *e );
+ void changeUserPix( const TQString & );
QGroupBox *minGroup; // top left
QLineEdit *leminuid, *lemaxuid;
diff --git a/kcontrol/kdm/main.cpp b/kcontrol/kdm/main.cpp
index 12c356e5c..ae99b51f5 100644
--- a/kcontrol/kdm/main.cpp
+++ b/kcontrol/kdm/main.cpp
@@ -23,7 +23,7 @@
#include <config.h>
-#include <qlayout.h>
+#include <tqlayout.h>
#include <kaboutdata.h>
#include <kgenericfactory.h>
@@ -47,10 +47,10 @@
#include <pwd.h>
#include <grp.h>
-typedef KGenericFactory<KDModule, QWidget> KDMFactory;
+typedef KGenericFactory<KDModule, TQWidget> KDMFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kdm, KDMFactory("kdmconfig") )
-KURL *decodeImgDrop(QDropEvent *e, QWidget *wdg)
+KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg)
{
KURL::List uris;
@@ -61,10 +61,10 @@ KURL *decodeImgDrop(QDropEvent *e, QWidget *wdg)
if( KImageIO::canRead(KImageIO::type(url->fileName())) )
return url;
- QStringList qs = QStringList::split('\n', KImageIO::pattern());
+ TQStringList qs = TQStringList::split('\n', KImageIO::pattern());
qs.remove(qs.begin());
- QString msg = i18n( "%1 "
+ TQString msg = i18n( "%1 "
"does not appear to be an image file.\n"
"Please use files with these extensions:\n"
"%2")
@@ -78,7 +78,7 @@ KURL *decodeImgDrop(QDropEvent *e, QWidget *wdg)
KSimpleConfig *config;
-KDModule::KDModule(QWidget *parent, const char *name, const QStringList &)
+KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KDMFactory::instance(), parent, name)
, minshowuid(0)
, maxshowuid(0)
@@ -123,17 +123,17 @@ KDModule::KDModule(QWidget *parent, const char *name, const QStringList &)
KGlobal::locale()->insertCatalogue("kcmbackground");
- QStringList sl;
- QMap<gid_t,QStringList> tgmap;
- QMap<gid_t,QStringList>::Iterator tgmapi;
- QMap<gid_t,QStringList>::ConstIterator tgmapci;
- QMap<QString, QPair<int,QStringList> >::Iterator umapi;
+ TQStringList sl;
+ TQMap<gid_t,TQStringList> tgmap;
+ TQMap<gid_t,TQStringList>::Iterator tgmapi;
+ TQMap<gid_t,TQStringList>::ConstIterator tgmapci;
+ TQMap<TQString, QPair<int,TQStringList> >::Iterator umapi;
struct passwd *ps;
for (setpwent(); (ps = getpwent()); ) {
- QString un( QFile::decodeName( ps->pw_name ) );
+ TQString un( TQFile::decodeName( ps->pw_name ) );
if (usermap.find( un ) == usermap.end()) {
- usermap.insert( un, QPair<int,QStringList>( ps->pw_uid, sl ) );
+ usermap.insert( un, QPair<int,TQStringList>( ps->pw_uid, sl ) );
if ((tgmapi = tgmap.find( ps->pw_gid )) != tgmap.end())
(*tgmapi).append( un );
else
@@ -144,22 +144,22 @@ KDModule::KDModule(QWidget *parent, const char *name, const QStringList &)
struct group *grp;
for (setgrent(); (grp = getgrent()); ) {
- QString gn( QFile::decodeName( grp->gr_name ) );
+ TQString gn( TQFile::decodeName( grp->gr_name ) );
bool delme = false;
if ((tgmapi = tgmap.find( grp->gr_gid )) != tgmap.end()) {
if ((*tgmapi).count() == 1 && (*tgmapi).first() == gn)
delme = true;
else
- for (QStringList::ConstIterator it = (*tgmapi).begin();
+ for (TQStringList::ConstIterator it = (*tgmapi).begin();
it != (*tgmapi).end(); ++it)
usermap[*it].second.append( gn );
tgmap.remove( tgmapi );
}
if (!*grp->gr_mem ||
- (delme && !grp->gr_mem[1] && gn == QFile::decodeName( *grp->gr_mem )))
+ (delme && !grp->gr_mem[1] && gn == TQFile::decodeName( *grp->gr_mem )))
continue;
do {
- QString un( QFile::decodeName( *grp->gr_mem ) );
+ TQString un( TQFile::decodeName( *grp->gr_mem ) );
if ((umapi = usermap.find( un )) != usermap.end()) {
if ((*umapi).second.find( gn ) == (*umapi).second.end())
(*umapi).second.append( gn );
@@ -173,10 +173,10 @@ KDModule::KDModule(QWidget *parent, const char *name, const QStringList &)
kdWarning() << "user(s) '" << tgmapci.data().join(",")
<< "' have unknown GID " << tgmapci.key() << endl;
- config = new KSimpleConfig( QString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
+ config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
- QVBoxLayout *top = new QVBoxLayout(this);
- tab = new QTabWidget(this);
+ TQVBoxLayout *top = new TQVBoxLayout(this);
+ tab = new TQTabWidget(this);
// *****
// _don't_ add a theme configurator until the theming engine is _really_ done!!
@@ -184,34 +184,34 @@ KDModule::KDModule(QWidget *parent, const char *name, const QStringList &)
appearance = new KDMAppearanceWidget(this);
tab->addTab(appearance, i18n("A&ppearance"));
- connect(appearance, SIGNAL(changed(bool)), SIGNAL( changed(bool)));
+ connect(appearance, TQT_SIGNAL(changed(bool)), TQT_SIGNAL( changed(bool)));
font = new KDMFontWidget(this);
tab->addTab(font, i18n("&Font"));
- connect(font, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
+ connect(font, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
background = new KBackground(this);
tab->addTab(background, i18n("&Background"));
- connect(background, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
+ connect(background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
sessions = new KDMSessionsWidget(this);
tab->addTab(sessions, i18n("&Shutdown"));
- connect(sessions, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
+ connect(sessions, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
users = new KDMUsersWidget(this, 0);
tab->addTab(users, i18n("&Users"));
- connect(users, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
- connect(users, SIGNAL(setMinMaxUID(int,int)), SLOT(slotMinMaxUID(int,int)));
- connect(this, SIGNAL(addUsers(const QMap<QString,int> &)), users, SLOT(slotAddUsers(const QMap<QString,int> &)));
- connect(this, SIGNAL(delUsers(const QMap<QString,int> &)), users, SLOT(slotDelUsers(const QMap<QString,int> &)));
- connect(this, SIGNAL(clearUsers()), users, SLOT(slotClearUsers()));
+ connect(users, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+ connect(users, TQT_SIGNAL(setMinMaxUID(int,int)), TQT_SLOT(slotMinMaxUID(int,int)));
+ connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &)));
+ connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &)));
+ connect(this, TQT_SIGNAL(clearUsers()), users, TQT_SLOT(slotClearUsers()));
convenience = new KDMConvenienceWidget(this, 0);
tab->addTab(convenience, i18n("Con&venience"));
- connect(convenience, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
- connect(this, SIGNAL(addUsers(const QMap<QString,int> &)), convenience, SLOT(slotAddUsers(const QMap<QString,int> &)));
- connect(this, SIGNAL(delUsers(const QMap<QString,int> &)), convenience, SLOT(slotDelUsers(const QMap<QString,int> &)));
- connect(this, SIGNAL(clearUsers()), convenience, SLOT(slotClearUsers()));
+ connect(convenience, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+ connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &)));
+ connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &)));
+ connect(this, TQT_SIGNAL(clearUsers()), convenience, TQT_SLOT(slotClearUsers()));
load();
if (getuid() != 0 || !config->checkConfigFilesWritable( true )) {
@@ -272,10 +272,10 @@ void KDModule::propagateUsers()
{
groupmap.clear();
emit clearUsers();
- QMap<QString,int> lusers;
- QMapConstIterator<QString, QPair<int,QStringList> > it;
- QStringList::ConstIterator jt;
- QMap<QString,int>::Iterator gmapi;
+ TQMap<TQString,int> lusers;
+ TQMapConstIterator<TQString, QPair<int,TQStringList> > it;
+ TQStringList::ConstIterator jt;
+ TQMap<TQString,int>::Iterator gmapi;
for (it = usermap.begin(); it != usermap.end(); ++it) {
int uid = it.data().first;
if (!uid || (uid >= minshowuid && uid <= maxshowuid)) {
@@ -295,10 +295,10 @@ void KDModule::propagateUsers()
void KDModule::slotMinMaxUID(int min, int max)
{
if (updateOK) {
- QMap<QString,int> alusers, dlusers;
- QMapConstIterator<QString, QPair<int,QStringList> > it;
- QStringList::ConstIterator jt;
- QMap<QString,int>::Iterator gmapi;
+ TQMap<TQString,int> alusers, dlusers;
+ TQMapConstIterator<TQString, QPair<int,TQStringList> > it;
+ TQStringList::ConstIterator jt;
+ TQMap<TQString,int>::Iterator gmapi;
for (it = usermap.begin(); it != usermap.end(); ++it) {
int uid = it.data().first;
if (!uid) continue;
diff --git a/kcontrol/kdm/main.h b/kcontrol/kdm/main.h
index 5e8da66b8..8bec1a715 100644
--- a/kcontrol/kdm/main.h
+++ b/kcontrol/kdm/main.h
@@ -24,8 +24,8 @@
#ifndef __kdm_main_h
#define __kdm_main_h
-#include <qtabwidget.h>
-#include <qmap.h>
+#include <tqtabwidget.h>
+#include <tqmap.h>
#include <kcmodule.h>
@@ -42,7 +42,7 @@ class KDModule : public KCModule
public:
- KDModule(QWidget *parent, const char *name, const QStringList &);
+ KDModule(TQWidget *parent, const char *name, const TQStringList &);
~KDModule();
void load();
@@ -56,8 +56,8 @@ public slots:
signals:
void clearUsers();
- void addUsers(const QMap<QString,int> &);
- void delUsers(const QMap<QString,int> &);
+ void addUsers(const TQMap<TQString,int> &);
+ void delUsers(const TQMap<TQString,int> &);
private:
@@ -70,8 +70,8 @@ private:
KDMUsersWidget *users;
KDMConvenienceWidget *convenience;
- QMap<QString, QPair<int,QStringList> > usermap;
- QMap<QString,int> groupmap;
+ TQMap<TQString, QPair<int,TQStringList> > usermap;
+ TQMap<TQString,int> groupmap;
int minshowuid, maxshowuid;
bool updateOK;
diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp
index 446cd24ac..a38f46f29 100644
--- a/kcontrol/keys/commandShortcuts.cpp
+++ b/kcontrol/keys/commandShortcuts.cpp
@@ -21,11 +21,11 @@
#include "commandShortcuts.h"
#include "treeview.h"
-#include <qbuttongroup.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
-#include <qwhatsthis.h>
+#include <tqbuttongroup.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqradiobutton.h>
+#include <tqwhatsthis.h>
#include <kactivelabel.h>
#include <kapplication.h>
@@ -36,8 +36,8 @@
#include <klocale.h>
static bool treeFilled = false;
-CommandShortcutsModule::CommandShortcutsModule( QWidget *parent, const char *name )
-: QWidget( parent, name )
+CommandShortcutsModule::CommandShortcutsModule( TQWidget *parent, const char *name )
+: TQWidget( parent, name )
{
treeFilled = false;
initGUI();
@@ -68,7 +68,7 @@ void CommandShortcutsModule::defaults()
m_tree->fill();
}
-QString CommandShortcutsModule::quickHelp() const
+TQString CommandShortcutsModule::quickHelp() const
{
return i18n("<h1>Command Shortcuts</h1> Using key bindings you can configure applications "
"and commands to be triggered when you press a key or a combination of keys.");
@@ -76,62 +76,62 @@ QString CommandShortcutsModule::quickHelp() const
void CommandShortcutsModule::initGUI()
{
- QVBoxLayout* mainLayout = new QVBoxLayout(this, KDialog::marginHint());
+ TQVBoxLayout* mainLayout = new TQVBoxLayout(this, KDialog::marginHint());
mainLayout->addSpacing( KDialog::marginHint() );
KActiveLabel* label = new KActiveLabel(this);
label->setText(i18n("<qt>Below is a list of known commands which you may assign keyboard shortcuts to. "
"To edit, add or remove entries from this list use the "
"<a href=\"launchMenuEditor\">KDE menu editor</a>.</qt>"));
- label->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
- disconnect(label, SIGNAL(linkClicked(const QString &)), label, SLOT(openLink(const QString &)));
- connect(label, SIGNAL(linkClicked(const QString &)), this, SLOT(launchMenuEditor()));
+ label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
+ disconnect(label, TQT_SIGNAL(linkClicked(const TQString &)), label, TQT_SLOT(openLink(const TQString &)));
+ connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor()));
mainLayout->addWidget(label);
m_tree = new AppTreeView(this, "appTreeView");
- m_tree->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+ m_tree->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
mainLayout->setStretchFactor(m_tree, 10);
mainLayout->addWidget(m_tree);
- QWhatsThis::add(m_tree,
+ TQWhatsThis::add(m_tree,
i18n("This is a list of all the desktop applications and commands "
"currently defined on this system. Click to select a command to "
"assign a keyboard shortcut to. Complete management of these "
"entries can be done via the menu editor program."));
- connect(m_tree, SIGNAL(entrySelected(const QString&, const QString &, bool)),
- this, SLOT(commandSelected(const QString&, const QString &, bool)));
- connect(m_tree, SIGNAL(doubleClicked(QListViewItem *, const QPoint &, int)),
- this, SLOT(commandDoubleClicked(QListViewItem *, const QPoint &, int)));
- m_shortcutBox = new QButtonGroup(i18n("Shortcut for Selected Command"), this);
+ connect(m_tree, TQT_SIGNAL(entrySelected(const TQString&, const TQString &, bool)),
+ this, TQT_SLOT(commandSelected(const TQString&, const TQString &, bool)));
+ connect(m_tree, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
+ this, TQT_SLOT(commandDoubleClicked(TQListViewItem *, const TQPoint &, int)));
+ m_shortcutBox = new TQButtonGroup(i18n("Shortcut for Selected Command"), this);
mainLayout->addWidget(m_shortcutBox);
- QHBoxLayout* buttonLayout = new QHBoxLayout(m_shortcutBox, KDialog::marginHint() * 2);
+ TQHBoxLayout* buttonLayout = new TQHBoxLayout(m_shortcutBox, KDialog::marginHint() * 2);
buttonLayout->addSpacing( KDialog::marginHint() );
- m_noneRadio = new QRadioButton(i18n("no key", "&None"), m_shortcutBox);
- QWhatsThis::add(m_noneRadio, i18n("The selected command will not be associated with any key."));
+ m_noneRadio = new TQRadioButton(i18n("no key", "&None"), m_shortcutBox);
+ TQWhatsThis::add(m_noneRadio, i18n("The selected command will not be associated with any key."));
buttonLayout->addWidget(m_noneRadio);
- m_customRadio = new QRadioButton(i18n("C&ustom"), m_shortcutBox);
- QWhatsThis::add(m_customRadio,
+ m_customRadio = new TQRadioButton(i18n("C&ustom"), m_shortcutBox);
+ TQWhatsThis::add(m_customRadio,
i18n("If this option is selected you can create a customized key binding for the"
" selected command using the button to the right.") );
buttonLayout->addWidget(m_customRadio);
m_shortcutButton = new KKeyButton(m_shortcutBox);
- QWhatsThis::add(m_shortcutButton,
+ TQWhatsThis::add(m_shortcutButton,
i18n("Use this button to choose a new shortcut key. Once you click it, "
"you can press the key-combination which you would like to be assigned "
"to the currently selected command."));
buttonLayout->addSpacing(KDialog::spacingHint() * 2);
buttonLayout->addWidget(m_shortcutButton);
- connect(m_shortcutButton, SIGNAL(capturedShortcut(const KShortcut&)),
- this, SLOT(shortcutChanged(const KShortcut&)));
- connect(m_customRadio, SIGNAL(toggled(bool)), m_shortcutButton, SLOT(setEnabled(bool)));
- connect(m_noneRadio, SIGNAL(toggled(bool)), this, SLOT(shortcutRadioToggled(bool)));
+ connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const KShortcut&)),
+ this, TQT_SLOT(shortcutChanged(const KShortcut&)));
+ connect(m_customRadio, TQT_SIGNAL(toggled(bool)), m_shortcutButton, TQT_SLOT(setEnabled(bool)));
+ connect(m_noneRadio, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shortcutRadioToggled(bool)));
buttonLayout->addStretch(1);
}
void CommandShortcutsModule::launchMenuEditor()
{
if ( KApplication::startServiceByDesktopName( "kmenuedit",
- QString::null /*url*/,
+ TQString::null /*url*/,
0 /*error*/,
0 /*dcopservice*/,
0 /*pid*/,
@@ -156,8 +156,8 @@ void CommandShortcutsModule::shortcutRadioToggled(bool remove)
if (remove)
{
- m_shortcutButton->setShortcut(QString::null, false);
- item->setAccel(QString::null);
+ m_shortcutButton->setShortcut(TQString::null, false);
+ item->setAccel(TQString::null);
if (m_changedItems.findRef(item) == -1)
{
m_changedItems.append(item);
@@ -178,7 +178,7 @@ void CommandShortcutsModule::shortcutChanged(const KShortcut& shortcut)
return;
}
- QString accel = shortcut.toString();
+ TQString accel = shortcut.toString();
bool hasAccel = !accel.isEmpty();
m_noneRadio->blockSignals(true);
m_noneRadio->setChecked(!hasAccel);
@@ -194,7 +194,7 @@ void CommandShortcutsModule::shortcutChanged(const KShortcut& shortcut)
emit changed( true );
}
-void CommandShortcutsModule::showing(QWidget* w)
+void CommandShortcutsModule::showing(TQWidget* w)
{
if (w != this || treeFilled)
{
@@ -213,7 +213,7 @@ void CommandShortcutsModule::showing(QWidget* w)
treeFilled = true;
}
-void CommandShortcutsModule::commandSelected(const QString& /* path */, const QString & accel, bool isDirectory)
+void CommandShortcutsModule::commandSelected(const TQString& /* path */, const TQString & accel, bool isDirectory)
{
m_noneRadio->blockSignals(true);
m_shortcutBox->setEnabled(!isDirectory);
@@ -227,7 +227,7 @@ void CommandShortcutsModule::commandSelected(const QString& /* path */, const QS
m_noneRadio->blockSignals(false);
}
-void CommandShortcutsModule::commandDoubleClicked(QListViewItem *item, const QPoint &, int)
+void CommandShortcutsModule::commandDoubleClicked(TQListViewItem *item, const TQPoint &, int)
{
if (!item)
{
diff --git a/kcontrol/keys/commandShortcuts.h b/kcontrol/keys/commandShortcuts.h
index 3bc492f17..504359fed 100644
--- a/kcontrol/keys/commandShortcuts.h
+++ b/kcontrol/keys/commandShortcuts.h
@@ -21,9 +21,9 @@
#ifndef __COMMAND_SHORTCUTS_MODULE_H
#define __COMMAND_SHORTCUTS_MODULE_H
-#include <qtabwidget.h>
+#include <tqtabwidget.h>
#include <kshortcut.h>
-#include <qptrlist.h>
+#include <tqptrlist.h>
class AppTreeView;
class AppTreeItem;
@@ -32,32 +32,32 @@ class QRadioButton;
class KKeyButton;
class QListViewItem;
-typedef QPtrList<AppTreeItem> treeItemList;
-typedef QPtrListIterator<AppTreeItem> treeItemListIterator;
+typedef TQPtrList<AppTreeItem> treeItemList;
+typedef TQPtrListIterator<AppTreeItem> treeItemListIterator;
class CommandShortcutsModule : public QWidget
{
Q_OBJECT
public:
- CommandShortcutsModule( QWidget *parent = 0, const char *name = 0 );
+ CommandShortcutsModule( TQWidget *parent = 0, const char *name = 0 );
~CommandShortcutsModule();
void load();
void save();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
signals:
void changed( bool );
public slots:
- void showing(QWidget*);
+ void showing(TQWidget*);
protected slots:
- void commandSelected(const QString&, const QString &, bool);
+ void commandSelected(const TQString&, const TQString &, bool);
void shortcutChanged(const KShortcut& shortcut);
void shortcutRadioToggled(bool remove);
- void commandDoubleClicked(QListViewItem *item, const QPoint &, int);
+ void commandDoubleClicked(TQListViewItem *item, const TQPoint &, int);
void launchMenuEditor();
protected:
@@ -65,9 +65,9 @@ class CommandShortcutsModule : public QWidget
private:
AppTreeView* m_tree;
- QButtonGroup* m_shortcutBox;
- QRadioButton* m_noneRadio;
- QRadioButton* m_customRadio;
+ TQButtonGroup* m_shortcutBox;
+ TQRadioButton* m_noneRadio;
+ TQRadioButton* m_customRadio;
KKeyButton* m_shortcutButton;
treeItemList m_changedItems;
};
diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h
index 2e1f78643..9b00f08d2 100644
--- a/kcontrol/keys/kaccelaction.h
+++ b/kcontrol/keys/kaccelaction.h
@@ -23,10 +23,10 @@
#ifndef _KACCELACTION_H
#define _KACCELACTION_H
-#include <qmap.h>
-#include <qptrvector.h>
-#include <qstring.h>
-#include <qvaluevector.h>
+#include <tqmap.h>
+#include <tqptrvector.h>
+#include <tqstring.h>
+#include <tqvaluevector.h>
#include <kshortcut.h>
@@ -71,37 +71,37 @@ class KAccelAction
public:
KAccelAction();
KAccelAction( const KAccelAction& );
- KAccelAction( const QString& sName, const QString& sLabel, const QString& sWhatsThis,
+ KAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
const KShortcut& cutDef3, const KShortcut& cutDef4,
- const QObject* pObjSlot, const char* psMethodSlot,
+ const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled );
~KAccelAction();
void clear();
- bool init( const QString& sName, const QString& sLabel, const QString& sWhatsThis,
+ bool init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
const KShortcut& cutDef3, const KShortcut& cutDef4,
- const QObject* pObjSlot, const char* psMethodSlot,
+ const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled );
KAccelAction& operator=( const KAccelAction& );
- const QString& name() const { return m_sName; }
- const QString& label() const { return m_sLabel; }
- const QString& whatsThis() const { return m_sWhatsThis; }
+ const TQString& name() const { return m_sName; }
+ const TQString& label() const { return m_sLabel; }
+ const TQString& whatsThis() const { return m_sWhatsThis; }
const KShortcut& shortcut() const { return m_cut; }
const KShortcut& shortcutDefault() const;
const KShortcut& shortcutDefault3() const { return m_cutDefault3; }
const KShortcut& shortcutDefault4() const { return m_cutDefault4; }
- const QObject* objSlotPtr() const { return m_pObjSlot; }
+ const TQObject* objSlotPtr() const { return m_pObjSlot; }
const char* methodSlotPtr() const { return m_psMethodSlot; }
bool isConfigurable() const { return m_bConfigurable; }
bool isEnabled() const { return m_bEnabled; }
- void setName( const QString& );
- void setLabel( const QString& );
- void setWhatsThis( const QString& );
+ void setName( const TQString& );
+ void setLabel( const TQString& );
+ void setWhatsThis( const TQString& );
bool setShortcut( const KShortcut& rgCuts );
- void setSlot( const QObject* pObjSlot, const char* psMethodSlot );
+ void setSlot( const TQObject* pObjSlot, const char* psMethodSlot );
void setConfigurable( bool );
void setEnabled( bool );
@@ -113,19 +113,19 @@ class KAccelAction
void clearShortcut();
bool contains( const KKeySequence& );
- QString toString() const;
- QString toStringInternal() const;
+ TQString toString() const;
+ TQString toStringInternal() const;
static bool useFourModifierKeys();
static void useFourModifierKeys( bool );
protected:
- QString m_sName,
+ TQString m_sName,
m_sLabel,
m_sWhatsThis;
KShortcut m_cut;
KShortcut m_cutDefault3, m_cutDefault4;
- const QObject* m_pObjSlot;
+ const TQObject* m_pObjSlot;
const char* m_psMethodSlot;
bool m_bConfigurable,
m_bEnabled;
@@ -156,28 +156,28 @@ class KAccelActions
void clear();
bool init( const KAccelActions& );
- bool init( KConfigBase& config, const QString& sGroup );
+ bool init( KConfigBase& config, const TQString& sGroup );
void updateShortcuts( KAccelActions& );
- int actionIndex( const QString& sAction ) const;
+ int actionIndex( const TQString& sAction ) const;
KAccelAction* actionPtr( uint );
const KAccelAction* actionPtr( uint ) const;
- KAccelAction* actionPtr( const QString& sAction );
- const KAccelAction* actionPtr( const QString& sAction ) const;
+ KAccelAction* actionPtr( const TQString& sAction );
+ const KAccelAction* actionPtr( const TQString& sAction ) const;
KAccelAction* actionPtr( KKeySequence cut );
KAccelAction& operator []( uint );
const KAccelAction& operator []( uint ) const;
- KAccelAction* insert( const QString& sAction, const QString& sLabel, const QString& sWhatsThis,
+ KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
- const QObject* pObjSlot = 0, const char* psMethodSlot = 0,
+ const TQObject* pObjSlot = 0, const char* psMethodSlot = 0,
bool bConfigurable = true, bool bEnabled = true );
- KAccelAction* insert( const QString& sName, const QString& sLabel );
- bool remove( const QString& sAction );
+ KAccelAction* insert( const TQString& sName, const TQString& sLabel );
+ bool remove( const TQString& sAction );
- bool readActions( const QString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
- bool writeActions( const QString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+ bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+ bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
bool bWriteAll = false, bool bGlobal = false ) const;
void emitKeycodeChanged();
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 89a32cf5e..09726de63 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -11,12 +11,12 @@
#include <unistd.h>
-#include <qlabel.h>
-#include <qdir.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qcheckbox.h>
-#include <qregexp.h>
+#include <tqlabel.h>
+#include <tqdir.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <klocale.h>
@@ -35,21 +35,21 @@
//----------------------------------------------------------------------------
-KKeyModule::KKeyModule( QWidget *parent, bool isGlobal, bool bSeriesOnly, bool bSeriesNone, const char *name )
- : QWidget( parent, name )
+KKeyModule::KKeyModule( TQWidget *parent, bool isGlobal, bool bSeriesOnly, bool bSeriesNone, const char *name )
+ : TQWidget( parent, name )
{
init( isGlobal, bSeriesOnly, bSeriesNone );
}
-KKeyModule::KKeyModule( QWidget *parent, bool isGlobal, const char *name )
- : QWidget( parent, name )
+KKeyModule::KKeyModule( TQWidget *parent, bool isGlobal, const char *name )
+ : TQWidget( parent, name )
{
init( isGlobal, false, false );
}
void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
{
- QString wtstr;
+ TQString wtstr;
KeyType = isGlobal ? "global" : "standard";
@@ -73,7 +73,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
// Sorting Hack: I'll re-write the module once feature-adding begins again.
if( bSeriesOnly || bSeriesNone ) {
for( uint i = 0; i < actions.size(); i++ ) {
- QString sConfigKey = actions[i].m_sName;
+ TQString sConfigKey = actions[i].m_sName;
//kdDebug(125) << "sConfigKey: " << sConfigKey << endl;
int iLastSpace = sConfigKey.findRev( ' ' );
bool bIsNum = false;
@@ -107,30 +107,30 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
//kdDebug(125) << "KKeyModule::init() - Read current key bindings from config." << endl;
//actions.readActions( KeySet );
- sFileList = new QStringList();
- sList = new QListBox( this );
+ sFileList = new TQStringList();
+ sList = new TQListBox( this );
//readSchemeNames();
sList->setCurrentItem( 0 );
- connect( sList, SIGNAL( highlighted( int ) ),
- SLOT( slotPreviewScheme( int ) ) );
+ connect( sList, TQT_SIGNAL( highlighted( int ) ),
+ TQT_SLOT( slotPreviewScheme( int ) ) );
- QLabel *label = new QLabel( sList, i18n("&Key Scheme"), this );
+ TQLabel *label = new TQLabel( sList, i18n("&Key Scheme"), this );
wtstr = i18n("Here you can see a list of the existing key binding schemes with 'Current scheme'"
" referring to the settings you are using right now. Select a scheme to use, remove or"
" change it.");
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( sList, wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( sList, wtstr );
- addBt = new QPushButton( i18n("&Save Scheme..."), this );
- connect( addBt, SIGNAL( clicked() ), SLOT( slotAdd() ) );
- QWhatsThis::add(addBt, i18n("Click here to add a new key bindings scheme. You will be prompted for a name."));
+ addBt = new TQPushButton( i18n("&Save Scheme..."), this );
+ connect( addBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) );
+ TQWhatsThis::add(addBt, i18n("Click here to add a new key bindings scheme. You will be prompted for a name."));
- removeBt = new QPushButton( i18n("&Remove Scheme"), this );
+ removeBt = new TQPushButton( i18n("&Remove Scheme"), this );
removeBt->setEnabled(FALSE);
- connect( removeBt, SIGNAL( clicked() ), SLOT( slotRemove() ) );
- QWhatsThis::add( removeBt, i18n("Click here to remove the selected key bindings scheme. You can not"
+ connect( removeBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() ) );
+ TQWhatsThis::add( removeBt, i18n("Click here to remove the selected key bindings scheme. You can not"
" remove the standard system wide schemes, 'Current scheme' and 'KDE default'.") );
// Hack to get this setting only displayed once. It belongs in main.cpp instead.
@@ -139,12 +139,12 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
/* Needed to remove because this depended upon non-BC changes in KeyEntry.*/
// If this is the "Global Keys" section of the KDE Control Center:
if( isGlobal && !bSeriesOnly ) {
- preferMetaBt = new QCheckBox( i18n("Prefer 4-modifier defaults"), this );
+ preferMetaBt = new TQCheckBox( i18n("Prefer 4-modifier defaults"), this );
if( !KKeySequence::keyboardHasMetaKey() )
preferMetaBt->setEnabled( false );
preferMetaBt->setChecked( KKeySequence::useFourModifierKeys() );
- connect( preferMetaBt, SIGNAL(clicked()), SLOT(slotPreferMeta()) );
- QWhatsThis::add( preferMetaBt, i18n("If your keyboard has a Meta key, but you would "
+ connect( preferMetaBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotPreferMeta()) );
+ TQWhatsThis::add( preferMetaBt, i18n("If your keyboard has a Meta key, but you would "
"like KDE to prefer the 3-modifier configuration defaults, then this option "
"should be unchecked.") );
} else
@@ -153,11 +153,11 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
KSeparator* line = new KSeparator( KSeparator::HLine, this );
kc = new KeyChooserSpec( actions, this, isGlobal );
- connect( kc, SIGNAL(keyChange()), this, SLOT(slotKeyChange()) );
+ connect( kc, TQT_SIGNAL(keyChange()), this, TQT_SLOT(slotKeyChange()) );
readScheme();
- QGridLayout *topLayout = new QGridLayout( this, 6, 2,
+ TQGridLayout *topLayout = new TQGridLayout( this, 6, 2,
KDialog::marginHint(),
KDialog::spacingHint());
topLayout->addWidget(label, 0, 0);
@@ -179,14 +179,14 @@ KKeyModule::~KKeyModule (){
delete sFileList;
}
-bool KKeyModule::writeSettings( const QString& sGroup, KConfig* pConfig )
+bool KKeyModule::writeSettings( const TQString& sGroup, KConfig* pConfig )
{
kc->commitChanges();
actions.writeActions( sGroup, pConfig, true, false );
return true;
}
-bool KKeyModule::writeSettingsGlobal( const QString& sGroup )
+bool KKeyModule::writeSettingsGlobal( const TQString& sGroup )
{
kc->commitChanges();
actions.writeActions( sGroup, 0, true, true );
@@ -225,15 +225,15 @@ void KKeyModule::defaults()
/*void KKeyModule::slotRemove()
{
- QString kksPath =
+ TQString kksPath =
KGlobal::dirs()->saveLocation("data", "kcmkeys/" + KeyType);
- QDir d( kksPath );
+ TQDir d( kksPath );
if (!d.exists()) // what can we do?
return;
- d.setFilter( QDir::Files );
- d.setSorting( QDir::Name );
+ d.setFilter( TQDir::Files );
+ d.setSorting( TQDir::Name );
d.setNameFilter("*.kksrc");
uint ind = sList->currentItem();
@@ -291,14 +291,14 @@ void KKeyModule::readScheme( int index )
/*void KKeyModule::slotAdd()
{
- QString sName;
+ TQString sName;
if ( sList->currentItem() >= nSysSchemes )
sName = sList->currentText();
SaveScm ss( 0, "save scheme", sName );
bool nameValid;
- QString sFile;
+ TQString sFile;
int exists = -1;
do {
@@ -330,7 +330,7 @@ void KKeyModule::readScheme( int index )
// Make the next letter upper case
- QString s = sFile.mid( ind, 1 );
+ TQString s = sFile.mid( ind, 1 );
s = s.upper();
sFile.replace( ind, 1, s );
@@ -356,13 +356,13 @@ void KKeyModule::readScheme( int index )
} while ( nameValid == FALSE );
- disconnect( sList, SIGNAL( highlighted( int ) ), this,
- SLOT( slotPreviewScheme( int ) ) );
+ disconnect( sList, TQT_SIGNAL( highlighted( int ) ), this,
+ TQT_SLOT( slotPreviewScheme( int ) ) );
- QString kksPath = KGlobal::dirs()->saveLocation("data", "kcmkeys/");
+ TQString kksPath = KGlobal::dirs()->saveLocation("data", "kcmkeys/");
- QDir d( kksPath );
+ TQDir d( kksPath );
if ( !d.exists() )
if ( !d.mkdir( kksPath ) ) {
qWarning("KKeyModule: Could not make directory to store user info.");
@@ -403,8 +403,8 @@ void KKeyModule::readScheme( int index )
slotSave();
- connect( sList, SIGNAL( highlighted( int ) ), this,
- SLOT( slotPreviewScheme( int ) ) );
+ connect( sList, TQT_SIGNAL( highlighted( int ) ), this,
+ TQT_SLOT( slotPreviewScheme( int ) ) );
slotPreviewScheme( sList->currentItem() );
}*/
@@ -426,9 +426,9 @@ void KKeyModule::readScheme( int index )
/*void KKeyModule::readSchemeNames( )
{
- QStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc");
- //QRegExp r( "-kde[34].kksrc$" );
- QRegExp r( "-kde3.kksrc$" );
+ TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc");
+ //TQRegExp r( "-kde[34].kksrc$" );
+ TQRegExp r( "-kde3.kksrc$" );
sList->clear();
sFileList->clear();
@@ -442,7 +442,7 @@ void KKeyModule::readScheme( int index )
nSysSchemes = 2;
// This for system files
- for ( QStringList::ConstIterator it = schemes.begin(); it != schemes.end(); ++it) {
+ for ( TQStringList::ConstIterator it = schemes.begin(); it != schemes.end(); ++it) {
// KPersonalizer relies on .kksrc files containing all the keyboard shortcut
// schemes for various setups. It also requires the KDE defaults to be in
// a .kksrc file. The KDE defaults shouldn't be listed here.
@@ -452,7 +452,7 @@ void KKeyModule::readScheme( int index )
KSimpleConfig config( *it, true );
// TODO: Put 'Name' in "Settings" group
config.setGroup( KeyScheme );
- QString str = config.readEntry( "Name" );
+ TQString str = config.readEntry( "Name" );
sList->insertItem( str );
sFileList->append( *it );
@@ -473,7 +473,7 @@ void KKeyModule::init()
/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
- QString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
+ TQString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
KAccel::useFourModifierKeys( fourMods == "true" );
bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
KGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
@@ -508,7 +508,7 @@ void KKeyModule::init()
// KeyChooserSpec
//-----------------------------------------------------------------
-KeyChooserSpec::KeyChooserSpec( KAccelActions& actions, QWidget* parent, bool bGlobal )
+KeyChooserSpec::KeyChooserSpec( KAccelActions& actions, TQWidget* parent, bool bGlobal )
: KKeyChooser( actions, parent, bGlobal, false, true ), m_bGlobal( bGlobal )
{
//if( global )
diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h
index cba853e4d..f38efe8b0 100644
--- a/kcontrol/keys/keyconfig.h
+++ b/kcontrol/keys/keyconfig.h
@@ -8,13 +8,13 @@
#ifndef __KEYCONFIG_H__
#define __KEYCONFIG_H__
-#include <qpushbutton.h>
-#include <qlistbox.h>
+#include <tqpushbutton.h>
+#include <tqlistbox.h>
#include <kaccel.h>
#include <kkeydialog.h>
//#include <kcmodule.h>
-#include <qdict.h>
+#include <tqdict.h>
class QCheckBox;
@@ -28,8 +28,8 @@ public:
//KAccelActions dict;
KeyChooserSpec *kc;
- KKeyModule( QWidget *parent, bool isGlobal, bool bSeriesOnly, bool bSeriesNone, const char *name = 0 );
- KKeyModule( QWidget *parent, bool isGlobal, const char *name = 0 );
+ KKeyModule( TQWidget *parent, bool isGlobal, bool bSeriesOnly, bool bSeriesNone, const char *name = 0 );
+ KKeyModule( TQWidget *parent, bool isGlobal, const char *name = 0 );
~KKeyModule ();
protected:
@@ -41,8 +41,8 @@ public:
virtual void defaults();
static void init();
- bool writeSettings( const QString& sGroup, KConfig* pConfig );
- bool writeSettingsGlobal( const QString& sGroup );
+ bool writeSettings( const TQString& sGroup, KConfig* pConfig );
+ bool writeSettingsGlobal( const TQString& sGroup );
public slots:
//void slotPreviewScheme( int );
@@ -59,19 +59,19 @@ signals:
//void keysChanged( const KAccelActions* map_P );
protected:
- QListBox *sList;
- QStringList *sFileList;
- QPushButton *addBt;
- QPushButton *removeBt;
- QCheckBox *preferMetaBt;
+ TQListBox *sList;
+ TQStringList *sFileList;
+ TQPushButton *addBt;
+ TQPushButton *removeBt;
+ TQCheckBox *preferMetaBt;
int nSysSchemes;
bool bSeriesOnly;
void readScheme( int index=0 );
- QString KeyType;
- QString KeyScheme;
- QString KeySet;
+ TQString KeyType;
+ TQString KeyScheme;
+ TQString KeySet;
};
@@ -79,7 +79,7 @@ class KeyChooserSpec : public KKeyChooser
{
Q_OBJECT
public:
- KeyChooserSpec( KAccelActions& actions, QWidget* parent,
+ KeyChooserSpec( KAccelActions& actions, TQWidget* parent,
bool bGlobal );
//void updateKeys( const KAccelActions* map_P );
protected:
diff --git a/kcontrol/keys/khotkeys.cpp b/kcontrol/keys/khotkeys.cpp
index 869cab71a..636cd972c 100644
--- a/kcontrol/keys/khotkeys.cpp
+++ b/kcontrol/keys/khotkeys.cpp
@@ -25,11 +25,11 @@ extern "C"
{
static void (*khotkeys_init_2)( void );
static void (*khotkeys_cleanup_2)( void );
- static QString (*khotkeys_get_menu_entry_shortcut_2)( const QString& entry_P );
- static QString (*khotkeys_change_menu_entry_shortcut_2)( const QString& entry_P,
- const QString& shortcut_P );
- static bool (*khotkeys_menu_entry_moved_2)( const QString& new_P, const QString& old_P );
- static void (*khotkeys_menu_entry_deleted_2)( const QString& entry_P );
+ static TQString (*khotkeys_get_menu_entry_shortcut_2)( const TQString& entry_P );
+ static TQString (*khotkeys_change_menu_entry_shortcut_2)( const TQString& entry_P,
+ const TQString& shortcut_P );
+ static bool (*khotkeys_menu_entry_moved_2)( const TQString& new_P, const TQString& old_P );
+ static void (*khotkeys_menu_entry_deleted_2)( const TQString& entry_P );
}
static bool khotkeys_present = false;
@@ -44,16 +44,16 @@ bool KHotKeys::init()
khotkeys_init_2 = ( void (*)(void)) ( lib->symbol( "khotkeys_init" ));
khotkeys_cleanup_2 = ( void (*)(void)) ( lib->symbol( "khotkeys_cleanup" ));
khotkeys_get_menu_entry_shortcut_2 =
- ( QString (*)( const QString& ))
+ ( TQString (*)( const TQString& ))
( lib->symbol( "khotkeys_get_menu_entry_shortcut" ));
khotkeys_change_menu_entry_shortcut_2 =
- ( QString (*)( const QString&, const QString& ))
+ ( TQString (*)( const TQString&, const TQString& ))
( lib->symbol( "khotkeys_change_menu_entry_shortcut" ));
khotkeys_menu_entry_moved_2 =
- ( bool (*)( const QString&, const QString& ))
+ ( bool (*)( const TQString&, const TQString& ))
( lib->symbol( "khotkeys_menu_entry_moved" ));
khotkeys_menu_entry_deleted_2 =
- ( void (*)( const QString& ))
+ ( void (*)( const TQString& ))
( lib->symbol( "khotkeys_menu_entry_deleted" ));
if( khotkeys_init_2
&& khotkeys_cleanup_2
@@ -83,7 +83,7 @@ bool KHotKeys::present()
return khotkeys_present;
}
-QString KHotKeys::getMenuEntryShortcut( const QString& entry_P )
+TQString KHotKeys::getMenuEntryShortcut( const TQString& entry_P )
{
if( !khotkeys_inited )
init();
@@ -92,8 +92,8 @@ QString KHotKeys::getMenuEntryShortcut( const QString& entry_P )
return khotkeys_get_menu_entry_shortcut_2( entry_P );
}
-QString KHotKeys::changeMenuEntryShortcut( const QString& entry_P,
- const QString shortcut_P )
+TQString KHotKeys::changeMenuEntryShortcut( const TQString& entry_P,
+ const TQString shortcut_P )
{
if( !khotkeys_inited )
init();
@@ -102,7 +102,7 @@ QString KHotKeys::changeMenuEntryShortcut( const QString& entry_P,
return khotkeys_change_menu_entry_shortcut_2( entry_P, shortcut_P );
}
-bool KHotKeys::menuEntryMoved( const QString& new_P, const QString& old_P )
+bool KHotKeys::menuEntryMoved( const TQString& new_P, const TQString& old_P )
{
if( !khotkeys_inited )
init();
@@ -111,7 +111,7 @@ bool KHotKeys::menuEntryMoved( const QString& new_P, const QString& old_P )
return khotkeys_menu_entry_moved_2( new_P, old_P );
}
-void KHotKeys::menuEntryDeleted( const QString& entry_P )
+void KHotKeys::menuEntryDeleted( const TQString& entry_P )
{
if( !khotkeys_inited )
init();
diff --git a/kcontrol/keys/khotkeys.h b/kcontrol/keys/khotkeys.h
index 90ea17985..9eab62106 100644
--- a/kcontrol/keys/khotkeys.h
+++ b/kcontrol/keys/khotkeys.h
@@ -21,7 +21,7 @@
#ifndef __khotkeys_public_h__
#define __khotkeys_public_h__
-#include <qstring.h>
+#include <tqstring.h>
// see kdebase/khotkeys/kcontrol for info on these
@@ -31,11 +31,11 @@ public:
static bool init();
static void cleanup();
static bool present();
- static QString getMenuEntryShortcut( const QString& entry_P );
- static QString changeMenuEntryShortcut( const QString& entry_P,
- const QString shortcut_P );
- static bool menuEntryMoved( const QString& new_P, const QString& old_P );
- static void menuEntryDeleted( const QString& entry_P );
+ static TQString getMenuEntryShortcut( const TQString& entry_P );
+ static TQString changeMenuEntryShortcut( const TQString& entry_P,
+ const TQString shortcut_P );
+ static bool menuEntryMoved( const TQString& new_P, const TQString& old_P );
+ static void menuEntryDeleted( const TQString& entry_P );
};
#endif
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index c03c26f91..d3b29fffe 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlayout.h>
+#include <tqlayout.h>
#include <kdebug.h>
#include <klocale.h>
@@ -48,7 +48,7 @@ o Pre-set scheme <Remove Scheme>
Global Shortcuts
*/
-KeyModule::KeyModule( QWidget *parent, const char *name )
+KeyModule::KeyModule( TQWidget *parent, const char *name )
: KCModule( parent, name )
{
setQuickHelp( i18n("<h1>Keyboard Shortcuts</h1> Using shortcuts you can configure certain actions to be"
@@ -69,22 +69,22 @@ KeyModule::~KeyModule()
void KeyModule::initGUI()
{
- m_pTab = new QTabWidget( this );
- QVBoxLayout *l = new QVBoxLayout(this);
+ m_pTab = new TQTabWidget( this );
+ TQVBoxLayout *l = new TQVBoxLayout(this);
l->addWidget(m_pTab);
m_pShortcuts = new ShortcutsModule( this );
m_pTab->addTab( m_pShortcuts, i18n("Shortcut Schemes") );
- connect( m_pShortcuts, SIGNAL(changed(bool)), SIGNAL(changed(bool)) );
+ connect( m_pShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
m_pCommandShortcuts = new CommandShortcutsModule ( this );
m_pTab->addTab( m_pCommandShortcuts, i18n("Command Shortcuts") );
- connect( m_pCommandShortcuts, SIGNAL(changed(bool)), SIGNAL(changed(bool)) );
- connect( m_pTab, SIGNAL(currentChanged(QWidget*)), m_pCommandShortcuts, SLOT(showing(QWidget*)) );
+ connect( m_pCommandShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
+ connect( m_pTab, TQT_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQT_SLOT(showing(TQWidget*)) );
m_pModifiers = new ModifiersModule( this );
m_pTab->addTab( m_pModifiers, i18n("Modifier Keys") );
- connect( m_pModifiers, SIGNAL(changed(bool)), SIGNAL(changed(bool)) );
+ connect( m_pModifiers, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
}
void KeyModule::load()
@@ -120,7 +120,7 @@ void KeyModule::defaults()
m_pModifiers->defaults();
}
-void KeyModule::resizeEvent( QResizeEvent * )
+void KeyModule::resizeEvent( TQResizeEvent * )
{
m_pTab->setGeometry( 0, 0, width(), height() );
}
@@ -129,7 +129,7 @@ void KeyModule::resizeEvent( QResizeEvent * )
extern "C"
{
- KDE_EXPORT KCModule *create_keys(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_keys(TQWidget *parent, const char * /*name*/)
{
// What does this do? Why not insert klipper and kxkb, too? --ellis, 2002/01/15
KGlobal::locale()->insertCatalogue("kwin");
@@ -154,7 +154,7 @@ extern "C"
/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
- QString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
+ TQString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
KAccel::useFourModifierKeys( fourMods == "true" );
bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
KGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
diff --git a/kcontrol/keys/main.h b/kcontrol/keys/main.h
index 5cabba122..f0b18c43d 100644
--- a/kcontrol/keys/main.h
+++ b/kcontrol/keys/main.h
@@ -24,7 +24,7 @@
#ifndef __keys_main_h
#define __keys_main_h
-#include <qtabwidget.h>
+#include <tqtabwidget.h>
#include <kcmodule.h>
class CommandShortcutsModule;
@@ -35,7 +35,7 @@ class KeyModule : public KCModule
{
Q_OBJECT
public:
- KeyModule( QWidget *parent, const char *name );
+ KeyModule( TQWidget *parent, const char *name );
~KeyModule();
void load();
@@ -45,10 +45,10 @@ class KeyModule : public KCModule
protected:
void initGUI();
- void resizeEvent( QResizeEvent* );
+ void resizeEvent( TQResizeEvent* );
private:
- QTabWidget* m_pTab;
+ TQTabWidget* m_pTab;
CommandShortcutsModule* m_pCommandShortcuts;
ShortcutsModule* m_pShortcuts;
ModifiersModule* m_pModifiers;
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 8391c7938..d17e1619e 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -1,10 +1,10 @@
#include "modifiers.h"
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
#include <kapplication.h>
#include <kconfig.h>
@@ -51,8 +51,8 @@ Extra1 [] [] User definable
//1) labels: Shift | Ctrl | Option | Command
//2) swap Ctrl & Command
-ModifiersModule::ModifiersModule( QWidget *parent, const char *name )
-: QWidget( parent, name )
+ModifiersModule::ModifiersModule( TQWidget *parent, const char *name )
+: TQWidget( parent, name )
{
initGUI();
load( false );
@@ -168,31 +168,31 @@ void ModifiersModule::setupMacModifierKeys()
void ModifiersModule::initGUI()
{
- QGridLayout* pLayoutTop = new QGridLayout( this, 6, 2, KDialog::marginHint() );
+ TQGridLayout* pLayoutTop = new TQGridLayout( this, 6, 2, KDialog::marginHint() );
pLayoutTop->setColStretch( 1, 1 );
- QGroupBox* pGroup = new QGroupBox( 2, Qt::Horizontal, i18n("KDE Modifiers"), this );
+ TQGroupBox* pGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("KDE Modifiers"), this );
pLayoutTop->addWidget( pGroup, 0, 0 );
- QLabel* plbl = new QLabel( i18n("Modifier"), pGroup );
- QFont font = plbl->font();
+ TQLabel* plbl = new TQLabel( i18n("Modifier"), pGroup );
+ TQFont font = plbl->font();
font.setUnderline( true );
- font.setWeight( QFont::Bold );
+ font.setWeight( TQFont::Bold );
plbl->setFont( font );
- plbl = new QLabel( i18n("X11-Mod"), pGroup );
+ plbl = new TQLabel( i18n("X11-Mod"), pGroup );
plbl->setFont( font );
- new QLabel( i18n("QAccel", "Shift"), pGroup );
- new QLabel( "shift", pGroup );
+ new TQLabel( i18n("TQAccel", "Shift"), pGroup );
+ new TQLabel( "shift", pGroup );
- m_plblCtrl = new QLabel( i18n("QAccel", "Ctrl"), pGroup );
- new QLabel( "control", pGroup );
+ m_plblCtrl = new TQLabel( i18n("TQAccel", "Ctrl"), pGroup );
+ new TQLabel( "control", pGroup );
- m_plblAlt = new QLabel( i18n("QAccel", "Alt"), pGroup );
- new QLabel( "mod1", pGroup );
+ m_plblAlt = new TQLabel( i18n("TQAccel", "Alt"), pGroup );
+ new TQLabel( "mod1", pGroup );
- m_plblWin = new QLabel( i18n("Win"), pGroup );
- m_plblWinModX = new QLabel( "", pGroup );
+ m_plblWin = new TQLabel( i18n("Win"), pGroup );
+ m_plblWinModX = new TQLabel( "", pGroup );
/*m_pcbWinX = newModXComboBox( pGroup );
int i;
switch( KKeyNative::modX(KKey::WIN) ) {
@@ -204,14 +204,14 @@ void ModifiersModule::initGUI()
}
m_pcbWinX->setCurrentItem( i );*/
- m_pchkMacKeyboard = new QCheckBox( i18n("Macintosh keyboard"), this );
+ m_pchkMacKeyboard = new TQCheckBox( i18n("Macintosh keyboard"), this );
m_pchkMacKeyboard->setChecked( m_bMacKeyboardOrig );
- connect( m_pchkMacKeyboard, SIGNAL(clicked()), SLOT(slotMacKeyboardClicked()) );
+ connect( m_pchkMacKeyboard, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacKeyboardClicked()) );
pLayoutTop->addWidget( m_pchkMacKeyboard, 1, 0 );
- m_pchkMacSwap = new QCheckBox( i18n("MacOS-style modifier usage"), this );
+ m_pchkMacSwap = new TQCheckBox( i18n("MacOS-style modifier usage"), this );
m_pchkMacSwap->setChecked( m_bMacSwapOrig );
- QWhatsThis::add( m_pchkMacSwap,
+ TQWhatsThis::add( m_pchkMacSwap,
i18n("Checking this box will change your X Modifier Mapping to "
"better reflect the standard MacOS modifier key usage. "
"It allows you to use <i>Command+C</i> for <i>Copy</i>, for instance, "
@@ -219,18 +219,18 @@ void ModifiersModule::initGUI()
"<b>Command</b> will be used for application and console commands, "
"<b>Option</b> as a command modifier and for navigating menus and dialogs, "
"and <b>Control</b> for window manager commands.") );
- connect( m_pchkMacSwap, SIGNAL(clicked()), SLOT(slotMacSwapClicked()) );
+ connect( m_pchkMacSwap, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacSwapClicked()) );
pLayoutTop->addWidget( m_pchkMacSwap, 2, 0 );
//------------------
pLayoutTop->addRowSpacing( 3, KDialog::spacingHint() * 3 );
- pGroup = new QGroupBox( 1, Qt::Horizontal, i18n("X Modifier Mapping"), this );
+ pGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("X Modifier Mapping"), this );
pLayoutTop->addWidget( pGroup, 4, 0 );
m_plstXMods = new KListView( pGroup );
m_plstXMods->setSorting( -1 );
- m_plstXMods->setSelectionMode( QListView::NoSelection );
+ m_plstXMods->setSelectionMode( TQListView::NoSelection );
m_plstXMods->setAllColumnsShowFocus( true );
m_plstXMods->addColumn( i18n("X11-Mod") );
@@ -249,7 +249,7 @@ void ModifiersModule::initGUI()
updateWidgets();
}
-/*KComboBox* ModifiersModule::newModXComboBox( QWidget* parent )
+/*KComboBox* ModifiersModule::newModXComboBox( TQWidget* parent )
{
KComboBox* pcb = new KComboBox( parent );
pcb->insertItem( "" );
@@ -285,8 +285,8 @@ void ModifiersModule::updateWidgets()
}
m_pchkMacSwap->setEnabled( true );
} else {
- m_plblCtrl->setText( i18n("QAccel", "Ctrl") );
- m_plblAlt->setText( i18n("QAccel", "Alt") );
+ m_plblCtrl->setText( i18n("TQAccel", "Ctrl") );
+ m_plblAlt->setText( i18n("TQAccel", "Alt") );
m_plblWin->setText( i18n("Win") );
m_pchkMacSwap->setEnabled( false );
}
@@ -325,7 +325,7 @@ void ModifiersModule::updateWidgets()
default: i = 0;
}
if( i != 0 )
- m_plblWinModX->setText( "mod" + QString::number(i) );
+ m_plblWinModX->setText( "mod" + TQString::number(i) );
else
m_plblWinModX->setText( "<" + i18n("None") + ">" );
}
diff --git a/kcontrol/keys/modifiers.h b/kcontrol/keys/modifiers.h
index 60ce76ae9..406d49862 100644
--- a/kcontrol/keys/modifiers.h
+++ b/kcontrol/keys/modifiers.h
@@ -1,7 +1,7 @@
#ifndef __MODIFIERS_MODULE_H
#define __MODIFIERS_MODULE_H
-#include <qwidget.h>
+#include <tqwidget.h>
class QCheckBox;
class QLabel;
@@ -12,7 +12,7 @@ class ModifiersModule : public QWidget
{
Q_OBJECT
public:
- ModifiersModule( QWidget *parent = 0, const char *name = 0 );
+ ModifiersModule( TQWidget *parent = 0, const char *name = 0 );
void load( bool useDefaults );
void save();
@@ -25,13 +25,13 @@ class ModifiersModule : public QWidget
protected:
bool m_bMacKeyboardOrig, m_bMacSwapOrig;
- QString m_sLabelCtrlOrig, m_sLabelAltOrig, m_sLabelWinOrig;
+ TQString m_sLabelCtrlOrig, m_sLabelAltOrig, m_sLabelWinOrig;
- QLabel* m_plblCtrl, * m_plblAlt, * m_plblWin;
- QLabel* m_plblWinModX;
- QCheckBox* m_pchkMacKeyboard;
+ TQLabel* m_plblCtrl, * m_plblAlt, * m_plblWin;
+ TQLabel* m_plblWinModX;
+ TQCheckBox* m_pchkMacKeyboard;
KListView* m_plstXMods;
- QCheckBox* m_pchkMacSwap;
+ TQCheckBox* m_pchkMacSwap;
void initGUI();
// Places the values in the *Orig variables into their
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index 2ceceb46a..9f997b7e5 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -26,10 +26,10 @@
#include <stdlib.h>
-#include <qdir.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qcheckbox.h>
+#include <tqdir.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
+#include <tqcheckbox.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -42,8 +42,8 @@
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
-ShortcutsModule::ShortcutsModule( QWidget *parent, const char *name )
-: QWidget( parent, name )
+ShortcutsModule::ShortcutsModule( TQWidget *parent, const char *name )
+: TQWidget( parent, name )
{
initGUI();
}
@@ -91,7 +91,7 @@ void ShortcutsModule::defaults()
m_pkcApplication->allDefault();
}
-QString ShortcutsModule::quickHelp() const
+TQString ShortcutsModule::quickHelp() const
{
return i18n("<h1>Key Bindings</h1> Using key bindings you can configure certain actions to be"
" triggered when you press a key or a combination of keys, e.g. Ctrl+C is normally bound to"
@@ -104,7 +104,7 @@ QString ShortcutsModule::quickHelp() const
void ShortcutsModule::initGUI()
{
- QString kde_winkeys_env_dir = KGlobal::dirs()->localkdedir() + "/env/";
+ TQString kde_winkeys_env_dir = KGlobal::dirs()->localkdedir() + "/env/";
kdDebug(125) << "A-----------" << endl;
KAccelActions* keys = &m_actionsGeneral;
@@ -128,57 +128,57 @@ void ShortcutsModule::initGUI()
kdDebug(125) << "E-----------" << endl;
kdDebug(125) << "F-----------" << endl;
- QVBoxLayout* pVLayout = new QVBoxLayout( this, KDialog::marginHint() );
+ TQVBoxLayout* pVLayout = new TQVBoxLayout( this, KDialog::marginHint() );
pVLayout->addSpacing( KDialog::marginHint() );
// (o) [Current ] <Remove> ( ) New <Save>
- QHBoxLayout *pHLayout = new QHBoxLayout( pVLayout, KDialog::spacingHint() );
- QButtonGroup* pGroup = new QButtonGroup( this );
+ TQHBoxLayout *pHLayout = new TQHBoxLayout( pVLayout, KDialog::spacingHint() );
+ TQButtonGroup* pGroup = new TQButtonGroup( this );
pGroup->hide();
- m_prbPre = new QRadioButton( "", this );
- connect( m_prbPre, SIGNAL(clicked()), SLOT(slotSchemeCur()) );
+ m_prbPre = new TQRadioButton( "", this );
+ connect( m_prbPre, TQT_SIGNAL(clicked()), TQT_SLOT(slotSchemeCur()) );
pGroup->insert( m_prbPre );
pHLayout->addWidget( m_prbPre );
m_pcbSchemes = new KComboBox( this );
m_pcbSchemes->setMinimumWidth( 100 );
- m_pcbSchemes->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed );
- connect( m_pcbSchemes, SIGNAL(activated(int)), SLOT(slotSelectScheme(int)) );
+ m_pcbSchemes->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
+ connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) );
pHLayout->addWidget( m_pcbSchemes );
pHLayout->addSpacing( KDialog::marginHint() );
- m_pbtnRemove = new QPushButton( i18n("&Remove"), this );
+ m_pbtnRemove = new TQPushButton( i18n("&Remove"), this );
m_pbtnRemove->setEnabled( false );
- connect( m_pbtnRemove, SIGNAL(clicked()), SLOT(slotRemoveScheme()) );
- QWhatsThis::add( m_pbtnRemove, i18n("Click here to remove the selected key bindings scheme. You cannot"
+ connect( m_pbtnRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveScheme()) );
+ TQWhatsThis::add( m_pbtnRemove, i18n("Click here to remove the selected key bindings scheme. You cannot"
" remove the standard system-wide schemes 'Current scheme' and 'KDE default'.") );
pHLayout->addWidget( m_pbtnRemove );
pHLayout->addSpacing( KDialog::marginHint() * 3 );
- m_prbNew = new QRadioButton( i18n("New scheme"), this );
+ m_prbNew = new TQRadioButton( i18n("New scheme"), this );
m_prbNew->setEnabled( false );
pGroup->insert( m_prbNew );
pHLayout->addWidget( m_prbNew );
- m_pbtnSave = new QPushButton( i18n("&Save..."), this );
+ m_pbtnSave = new TQPushButton( i18n("&Save..."), this );
m_pbtnSave->setEnabled( false );
- QWhatsThis::add( m_pbtnSave, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.") );
- connect( m_pbtnSave, SIGNAL(clicked()), SLOT(slotSaveSchemeAs()) );
+ TQWhatsThis::add( m_pbtnSave, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.") );
+ connect( m_pbtnSave, TQT_SIGNAL(clicked()), TQT_SLOT(slotSaveSchemeAs()) );
pHLayout->addWidget( m_pbtnSave );
pHLayout->addStretch( 1 );
- m_pTab = new QTabWidget( this );
+ m_pTab = new TQTabWidget( this );
m_pTab->setMargin( KDialog::marginHint() );
pVLayout->addWidget( m_pTab );
// See if ~/.kde3/env/win-key.sh exists
- QFile f( kde_winkeys_env_dir + "win-key.sh" );
+ TQFile f( kde_winkeys_env_dir + "win-key.sh" );
if ( f.exists() == false ) {
// No, it does not, so Win is a modifier
m_bUseRmWinKeys = true;
@@ -192,24 +192,24 @@ void ShortcutsModule::initGUI()
m_pkcGeneral = new KKeyChooser( m_pListGeneral, this, KKeyChooser::Global, false );
m_pkcGeneral->resize (m_pkcGeneral->sizeHint() );
if (system("xmodmap 1> /dev/null 2> /dev/null") == 0) {
- m_useRmWinKeys = new QCheckBox( i18n("Use Win key as modifier (uncheck to bind Win key to Menu)"), this );
+ m_useRmWinKeys = new TQCheckBox( i18n("Use Win key as modifier (uncheck to bind Win key to Menu)"), this );
m_useRmWinKeys->resize( m_useRmWinKeys->sizeHint() );
m_useRmWinKeys->setChecked( m_bUseRmWinKeys );
pVLayout->addWidget( m_useRmWinKeys, 1, 0 );
- connect( m_useRmWinKeys, SIGNAL(clicked()), SLOT(slotUseRmWinKeysClicked()) );
+ connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) );
}
m_pTab->addTab( m_pkcGeneral, i18n("&Global Shortcuts") );
- connect( m_pkcGeneral, SIGNAL(keyChange()), SLOT(slotKeyChange()) );
+ connect( m_pkcGeneral, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
m_pListSequence = new KAccelShortcutList( m_actionsSequence, true );
m_pkcSequence = new KKeyChooser( m_pListSequence, this, KKeyChooser::Global, false );
m_pTab->addTab( m_pkcSequence, i18n("Shortcut Se&quences") );
- connect( m_pkcSequence, SIGNAL(keyChange()), SLOT(slotKeyChange()) );
+ connect( m_pkcSequence, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
m_pListApplication = new KStdAccel::ShortcutList;
m_pkcApplication = new KKeyChooser( m_pListApplication, this, KKeyChooser::Standard, false );
m_pTab->addTab( m_pkcApplication, i18n("App&lication Shortcuts") );
- connect( m_pkcApplication, SIGNAL(keyChange()), SLOT(slotKeyChange()) );
+ connect( m_pkcApplication, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
kdDebug(125) << "G-----------" << endl;
readSchemeNames();
@@ -225,7 +225,7 @@ void ShortcutsModule::createActionsGeneral()
KAccelActions& actions = m_actionsGeneral;
for( uint i = 0; i < actions.count(); i++ ) {
- QString sConfigKey = actions[i].name();
+ TQString sConfigKey = actions[i].name();
//kdDebug(125) << "sConfigKey: " << sConfigKey << endl;
int iLastSpace = sConfigKey.findRev( ' ' );
bool bIsNum = false;
@@ -236,7 +236,7 @@ void ShortcutsModule::createActionsGeneral()
// << " bIsNum: " << bIsNum << endl;
if( bIsNum && !sConfigKey.contains( ':' ) ) {
actions[i].setConfigurable( false );
- actions[i].setName( QString::null );
+ actions[i].setName( TQString::null );
}
}
}
@@ -246,7 +246,7 @@ void ShortcutsModule::createActionsSequence()
KAccelActions& actions = m_actionsSequence;
for( uint i = 0; i < actions.count(); i++ ) {
- QString sConfigKey = actions[i].name();
+ TQString sConfigKey = actions[i].name();
//kdDebug(125) << "sConfigKey: " << sConfigKey << endl;
int iLastSpace = sConfigKey.findRev( ' ' );
bool bIsNum = false;
@@ -257,14 +257,14 @@ void ShortcutsModule::createActionsSequence()
// << " bIsNum: " << bIsNum << endl;
if( !bIsNum && !sConfigKey.contains( ':' ) ) {
actions[i].setConfigurable( false );
- actions[i].setName( QString::null );
+ actions[i].setName( TQString::null );
}
}
}
void ShortcutsModule::readSchemeNames()
{
- QStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/*.kksrc");
+ TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/*.kksrc");
m_pcbSchemes->clear();
m_rgsSchemeFiles.clear();
@@ -274,7 +274,7 @@ void ShortcutsModule::readSchemeNames()
m_rgsSchemeFiles.append( "cur" );
// This for system files
- for ( QStringList::ConstIterator it = schemes.begin(); it != schemes.end(); ++it) {
+ for ( TQStringList::ConstIterator it = schemes.begin(); it != schemes.end(); ++it) {
// KPersonalizer relies on .kksrc files containing all the keyboard shortcut
// schemes for various setups. It also requires the KDE defaults to be in
// a .kksrc file. The KDE defaults shouldn't be listed here.
@@ -283,14 +283,14 @@ void ShortcutsModule::readSchemeNames()
KSimpleConfig config( *it, true );
config.setGroup( "Settings" );
- QString str = config.readEntry( "Name" );
+ TQString str = config.readEntry( "Name" );
m_pcbSchemes->insertItem( str );
m_rgsSchemeFiles.append( *it );
}
}
-void ShortcutsModule::resizeEvent( QResizeEvent * )
+void ShortcutsModule::resizeEvent( TQResizeEvent * )
{
//m_pTab->setGeometry(0,0,width(),height());
}
@@ -315,7 +315,7 @@ void ShortcutsModule::slotSelectScheme( int )
{
i18n("Your current changes will be lost if you load another scheme before saving this one.");
kdDebug(125) << "ShortcutsModule::slotSelectScheme( " << m_pcbSchemes->currentItem() << " )" << endl;
- QString sFilename = m_rgsSchemeFiles[ m_pcbSchemes->currentItem() ];
+ TQString sFilename = m_rgsSchemeFiles[ m_pcbSchemes->currentItem() ];
if( sFilename == "cur" ) {
// TODO: remove nulls params
@@ -353,7 +353,7 @@ void ShortcutsModule::slotSelectScheme( int )
void ShortcutsModule::slotSaveSchemeAs()
{
- QString sName, sFile;
+ TQString sName, sFile;
bool bNameValid, ok;
int iScheme = -1;
@@ -382,7 +382,7 @@ void ShortcutsModule::slotSaveSchemeAs()
sFile.remove( ind, 1 );
// Make the next letter upper case
- QString s = sFile.mid( ind, 1 );
+ TQString s = sFile.mid( ind, 1 );
s = s.upper();
sFile.replace( ind, 1, s );
}
@@ -404,11 +404,11 @@ void ShortcutsModule::slotSaveSchemeAs()
return;
} while( !bNameValid );
- disconnect( m_pcbSchemes, SIGNAL(activated(int)), this, SLOT(slotSelectScheme(int)) );
+ disconnect( m_pcbSchemes, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectScheme(int)) );
- QString kksPath = KGlobal::dirs()->saveLocation( "data", "kcmkeys/" );
+ TQString kksPath = KGlobal::dirs()->saveLocation( "data", "kcmkeys/" );
- QDir dir( kksPath );
+ TQDir dir( kksPath );
if( !dir.exists() && !dir.mkdir( kksPath ) ) {
qWarning("KShortcutsModule: Could not make directory to store user info.");
return;
@@ -434,13 +434,13 @@ void ShortcutsModule::slotSaveSchemeAs()
saveScheme();
- connect( m_pcbSchemes, SIGNAL(activated(int)), SLOT(slotSelectScheme(int)) );
+ connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) );
slotSelectScheme();
}
void ShortcutsModule::saveScheme()
{
- QString sFilename = m_rgsSchemeFiles[ m_pcbSchemes->currentItem() ];
+ TQString sFilename = m_rgsSchemeFiles[ m_pcbSchemes->currentItem() ];
KSimpleConfig config( sFilename );
m_pkcGeneral->commitChanges();
@@ -458,16 +458,16 @@ void ShortcutsModule::slotRemoveScheme()
void ShortcutsModule::slotUseRmWinKeysClicked()
{
- QString kde_winkeys_env_dir = KGlobal::dirs()->localkdedir() + "/env/";
+ TQString kde_winkeys_env_dir = KGlobal::dirs()->localkdedir() + "/env/";
// See if ~/.kde3/env/win-key.sh exists
- QFile f( kde_winkeys_env_dir + "win-key.sh" );
+ TQFile f( kde_winkeys_env_dir + "win-key.sh" );
if ( f.exists() == false ) {
// No, it does not, so Win is currently a modifier
if (m_useRmWinKeys->isChecked() == false) {
// Create the file
if ( f.open( IO_WriteOnly ) ) {
- QTextStream stream( &f );
+ TQTextStream stream( &f );
stream << "xmodmap -e 'keycode 133=Menu'" << "\n";
stream << "xmodmap -e 'keycode 134=Menu'" << "\n";
f.close();
diff --git a/kcontrol/keys/shortcuts.h b/kcontrol/keys/shortcuts.h
index e51d8cb7a..d45034c9d 100644
--- a/kcontrol/keys/shortcuts.h
+++ b/kcontrol/keys/shortcuts.h
@@ -24,11 +24,11 @@
#ifndef __SHORTCUTS_MODULE_H
#define __SHORTCUTS_MODULE_H
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qtabwidget.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqtabwidget.h>
#include "kaccelaction.h"
#include <kcombobox.h>
#include <kkeydialog.h>
@@ -37,13 +37,13 @@ class ShortcutsModule : public QWidget
{
Q_OBJECT
public:
- ShortcutsModule( QWidget *parent = 0, const char *name = 0 );
+ ShortcutsModule( TQWidget *parent = 0, const char *name = 0 );
~ShortcutsModule();
void load();
void save();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
protected:
void initGUI();
@@ -51,7 +51,7 @@ class ShortcutsModule : public QWidget
void createActionsSequence();
void readSchemeNames();
void saveScheme();
- void resizeEvent(QResizeEvent *e);
+ void resizeEvent(TQResizeEvent *e);
signals:
void changed( bool );
@@ -65,16 +65,16 @@ class ShortcutsModule : public QWidget
void slotUseRmWinKeysClicked();
private:
- QTabWidget* m_pTab;
- QRadioButton *m_prbPre, *m_prbNew;
+ TQTabWidget* m_pTab;
+ TQRadioButton *m_prbPre, *m_prbNew;
KComboBox* m_pcbSchemes;
- QPushButton* m_pbtnSave, * m_pbtnRemove;
+ TQPushButton* m_pbtnSave, * m_pbtnRemove;
int m_nSysSchemes;
- QStringList m_rgsSchemeFiles;
+ TQStringList m_rgsSchemeFiles;
KAccelActions m_actionsGeneral, m_actionsSequence;//, m_actionsApplication;
KShortcutList* m_pListGeneral, * m_pListSequence, * m_pListApplication;
KKeyChooser* m_pkcGeneral, * m_pkcSequence, * m_pkcApplication;
- QCheckBox* m_useRmWinKeys;
+ TQCheckBox* m_useRmWinKeys;
bool m_bUseRmWinKeys;
};
diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp
index 0c2056766..58de8a1f5 100644
--- a/kcontrol/keys/treeview.cpp
+++ b/kcontrol/keys/treeview.cpp
@@ -20,10 +20,10 @@
#include <unistd.h>
-#include <qdir.h>
-#include <qimage.h>
-#include <qstringlist.h>
-#include <qcursor.h>
+#include <tqdir.h>
+#include <tqimage.h>
+#include <tqstringlist.h>
+#include <tqcursor.h>
#include <kstandarddirs.h>
#include <klocale.h>
@@ -34,25 +34,25 @@
#include "treeview.moc"
#include "khotkeys.h"
-AppTreeItem::AppTreeItem(QListViewItem *parent, const QString& storageId)
+AppTreeItem::AppTreeItem(TQListViewItem *parent, const TQString& storageId)
: KListViewItem(parent), m_init(false), m_storageId(storageId) {}
-AppTreeItem::AppTreeItem(QListViewItem *parent, QListViewItem *after, const QString& storageId)
+AppTreeItem::AppTreeItem(TQListViewItem *parent, TQListViewItem *after, const TQString& storageId)
: KListViewItem(parent, after), m_init(false), m_storageId(storageId) {}
-AppTreeItem::AppTreeItem(QListView *parent, const QString& storageId)
+AppTreeItem::AppTreeItem(TQListView *parent, const TQString& storageId)
: KListViewItem(parent), m_init(false), m_storageId(storageId) {}
-AppTreeItem::AppTreeItem(QListView *parent, QListViewItem *after, const QString& storageId)
+AppTreeItem::AppTreeItem(TQListView *parent, TQListViewItem *after, const TQString& storageId)
: KListViewItem(parent, after), m_init(false), m_storageId(storageId) {}
-void AppTreeItem::setName(const QString &name)
+void AppTreeItem::setName(const TQString &name)
{
m_name = name;
setText(0, m_name);
}
-void AppTreeItem::setAccel(const QString &accel)
+void AppTreeItem::setAccel(const TQString &accel)
{
m_accel = accel;
int temp = accel.find(';');
@@ -64,7 +64,7 @@ void AppTreeItem::setAccel(const QString &accel)
else
{
setText(1, m_accel);
- setText(2, QString::null);
+ setText(2, TQString::null);
}
}
@@ -76,16 +76,16 @@ void AppTreeItem::setOpen(bool o)
AppTreeView *tv = static_cast<AppTreeView *>(listView());
tv->fillBranch(m_directoryPath, this);
}
- QListViewItem::setOpen(o);
+ TQListViewItem::setOpen(o);
}
-static QPixmap appIcon(const QString &iconName)
+static TQPixmap appIcon(const TQString &iconName)
{
- QPixmap normal = SmallIcon( iconName );
+ TQPixmap normal = SmallIcon( iconName );
// make sure they are not larger than 20x20
if (normal.width() > 20 || normal.height() > 20)
{
- QImage tmp = normal.convertToImage();
+ TQImage tmp = normal.convertToImage();
tmp = tmp.smoothScale(20, 20);
normal.convertFromImage(tmp);
}
@@ -93,10 +93,10 @@ static QPixmap appIcon(const QString &iconName)
}
-AppTreeView::AppTreeView( QWidget *parent, const char *name )
+AppTreeView::AppTreeView( TQWidget *parent, const char *name )
: KListView(parent, name)
{
- setFrameStyle(QFrame::WinPanel | QFrame::Sunken);
+ setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
setAllColumnsShowFocus(true);
setRootIsDecorated(true);
setSorting(-1);
@@ -109,11 +109,11 @@ AppTreeView::AppTreeView( QWidget *parent, const char *name )
addColumn(i18n("Shortcut"));
addColumn(i18n("Alternate"));
- connect(this, SIGNAL(clicked( QListViewItem* )),
- SLOT(itemSelected( QListViewItem* )));
+ connect(this, TQT_SIGNAL(clicked( TQListViewItem* )),
+ TQT_SLOT(itemSelected( TQListViewItem* )));
- connect(this,SIGNAL(selectionChanged ( QListViewItem * )),
- SLOT(itemSelected( QListViewItem* )));
+ connect(this,TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
+ TQT_SLOT(itemSelected( TQListViewItem* )));
}
AppTreeView::~AppTreeView()
@@ -122,16 +122,16 @@ AppTreeView::~AppTreeView()
void AppTreeView::fill()
{
- QApplication::setOverrideCursor(Qt::WaitCursor);
+ TQApplication::setOverrideCursor(Qt::WaitCursor);
clear();
- fillBranch(QString::null, 0);
- QApplication::restoreOverrideCursor();
+ fillBranch(TQString::null, 0);
+ TQApplication::restoreOverrideCursor();
}
-void AppTreeView::fillBranch(const QString& rPath, AppTreeItem *parent)
+void AppTreeView::fillBranch(const TQString& rPath, AppTreeItem *parent)
{
// get rid of leading slash in the relative path
- QString relPath = rPath;
+ TQString relPath = rPath;
if(relPath[0] == '/')
relPath = relPath.mid(1, relPath.length());
@@ -143,7 +143,7 @@ void AppTreeView::fillBranch(const QString& rPath, AppTreeItem *parent)
KServiceGroup::List list = root->entries(true);
- QListViewItem *after = 0;
+ TQListViewItem *after = 0;
for(KServiceGroup::List::ConstIterator it = list.begin();
it != list.end(); ++it)
@@ -153,7 +153,7 @@ void AppTreeView::fillBranch(const QString& rPath, AppTreeItem *parent)
if (e->isType(KST_KServiceGroup))
{
KServiceGroup::Ptr g(static_cast<KServiceGroup *>(e));
- QString groupCaption = g->caption();
+ TQString groupCaption = g->caption();
// Item names may contain ampersands. To avoid them being converted
// to accelerators, replace them with two ampersands.
@@ -161,9 +161,9 @@ void AppTreeView::fillBranch(const QString& rPath, AppTreeItem *parent)
AppTreeItem *item;
if (parent == 0)
- item = new AppTreeItem(this, after, QString::null);
+ item = new AppTreeItem(this, after, TQString::null);
else
- item = new AppTreeItem(parent, after, QString::null);
+ item = new AppTreeItem(parent, after, TQString::null);
item->setName(groupCaption);
item->setPixmap(0, appIcon(g->icon()));
@@ -174,7 +174,7 @@ void AppTreeView::fillBranch(const QString& rPath, AppTreeItem *parent)
else if (e->isType(KST_KService))
{
KService::Ptr s(static_cast<KService *>(e));
- QString serviceCaption = s->name();
+ TQString serviceCaption = s->name();
// Item names may contain ampersands. To avoid them being converted
// to accelerators, replace them with two ampersands.
@@ -195,7 +195,7 @@ void AppTreeView::fillBranch(const QString& rPath, AppTreeItem *parent)
}
}
-void AppTreeView::itemSelected(QListViewItem *item)
+void AppTreeView::itemSelected(TQListViewItem *item)
{
AppTreeItem *_item = static_cast<AppTreeItem*>(item);
@@ -204,29 +204,29 @@ void AppTreeView::itemSelected(QListViewItem *item)
emit entrySelected(_item->storageId(), _item->accel(), _item->isDirectory());
}
-QStringList AppTreeView::fileList(const QString& rPath)
+TQStringList AppTreeView::fileList(const TQString& rPath)
{
- QString relativePath = rPath;
+ TQString relativePath = rPath;
// truncate "/.directory"
int pos = relativePath.findRev("/.directory");
if (pos > 0) relativePath.truncate(pos);
- QStringList filelist;
+ TQStringList filelist;
// loop through all resource dirs and build a file list
- QStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
- for (QStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
+ TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
+ for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
{
- QDir dir((*it) + "/" + relativePath);
+ TQDir dir((*it) + "/" + relativePath);
if(!dir.exists()) continue;
- dir.setFilter(QDir::Files);
+ dir.setFilter(TQDir::Files);
dir.setNameFilter("*.desktop;*.kdelnk");
// build a list of files
- QStringList files = dir.entryList();
- for (QStringList::ConstIterator it = files.begin(); it != files.end(); ++it) {
+ TQStringList files = dir.entryList();
+ for (TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) {
// does not work?!
//if (filelist.contains(*it)) continue;
@@ -243,27 +243,27 @@ QStringList AppTreeView::fileList(const QString& rPath)
return filelist;
}
-QStringList AppTreeView::dirList(const QString& rPath)
+TQStringList AppTreeView::dirList(const TQString& rPath)
{
- QString relativePath = rPath;
+ TQString relativePath = rPath;
// truncate "/.directory"
int pos = relativePath.findRev("/.directory");
if (pos > 0) relativePath.truncate(pos);
- QStringList dirlist;
+ TQStringList dirlist;
// loop through all resource dirs and build a subdir list
- QStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
- for (QStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
+ TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
+ for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
{
- QDir dir((*it) + "/" + relativePath);
+ TQDir dir((*it) + "/" + relativePath);
if(!dir.exists()) continue;
- dir.setFilter(QDir::Dirs);
+ dir.setFilter(TQDir::Dirs);
// build a list of subdirs
- QStringList subdirs = dir.entryList();
- for (QStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it) {
+ TQStringList subdirs = dir.entryList();
+ for (TQStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it) {
if ((*it) == "." || (*it) == "..") continue;
// does not work?!
// if (dirlist.contains(*it)) continue;
diff --git a/kcontrol/keys/treeview.h b/kcontrol/keys/treeview.h
index d376bc00d..b07384397 100644
--- a/kcontrol/keys/treeview.h
+++ b/kcontrol/keys/treeview.h
@@ -21,7 +21,7 @@
#ifndef __treeview_h__
#define __treeview_h__
-#include <qstring.h>
+#include <tqstring.h>
#include <klistview.h>
class QPopupMenu;
@@ -32,19 +32,19 @@ class AppTreeItem : public KListViewItem
{
public:
- AppTreeItem(QListViewItem *parent, const QString& storageId);
- AppTreeItem(QListViewItem *parent, QListViewItem *after, const QString& storageId);
- AppTreeItem(QListView *parent, const QString& storageId);
- AppTreeItem(QListView *parent, QListViewItem* after, const QString& storageId);
+ AppTreeItem(TQListViewItem *parent, const TQString& storageId);
+ AppTreeItem(TQListViewItem *parent, TQListViewItem *after, const TQString& storageId);
+ AppTreeItem(TQListView *parent, const TQString& storageId);
+ AppTreeItem(TQListView *parent, TQListViewItem* after, const TQString& storageId);
- QString storageId() const { return m_storageId; }
- void setDirectoryPath(const QString& path) { m_directoryPath = path; }
+ TQString storageId() const { return m_storageId; }
+ void setDirectoryPath(const TQString& path) { m_directoryPath = path; }
- QString name() const { return m_name; }
- void setName(const QString &name);
+ TQString name() const { return m_name; }
+ void setName(const TQString &name);
- QString accel() const { return m_accel; }
- void setAccel(const QString &accel);
+ TQString accel() const { return m_accel; }
+ void setAccel(const TQString &accel);
bool isDirectory() const { return !m_directoryPath.isEmpty(); }
@@ -52,10 +52,10 @@ public:
private:
bool m_init : 1;
- QString m_storageId;
- QString m_name;
- QString m_directoryPath;
- QString m_accel;
+ TQString m_storageId;
+ TQString m_name;
+ TQString m_directoryPath;
+ TQString m_accel;
};
class AppTreeView : public KListView
@@ -63,21 +63,21 @@ class AppTreeView : public KListView
friend class AppTreeItem;
Q_OBJECT
public:
- AppTreeView(QWidget *parent=0, const char *name=0);
+ AppTreeView(TQWidget *parent=0, const char *name=0);
~AppTreeView();
void fill();
signals:
- void entrySelected(const QString&, const QString &, bool);
+ void entrySelected(const TQString&, const TQString &, bool);
protected slots:
- void itemSelected(QListViewItem *);
+ void itemSelected(TQListViewItem *);
protected:
- void fillBranch(const QString& relPath, AppTreeItem* parent);
+ void fillBranch(const TQString& relPath, AppTreeItem* parent);
- QStringList fileList(const QString& relativePath);
- QStringList dirList(const QString& relativePath);
+ TQStringList fileList(const TQString& relativePath);
+ TQStringList dirList(const TQString& relativePath);
};
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index 4a6b0b3ee..c525cd337 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -34,11 +34,11 @@
#include "KfiPrint.h"
#include "FcEngine.h"
#endif
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qpainter.h>
-#include <qpaintdevicemetrics.h>
-#include <qsettings.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqpainter.h>
+#include <tqpaintdevicemetrics.h>
+#include <tqsettings.h>
#include <kaboutdata.h>
#include <kgenericfactory.h>
#include <kdiroperator.h>
@@ -59,7 +59,7 @@
#include <kdirlister.h>
#include <kpushbutton.h>
#include <kguiitem.h>
-#include <qsplitter.h>
+#include <tqsplitter.h>
#define CFG_GROUP "Main Settings"
#define CFG_LISTVIEW "ListView"
@@ -68,13 +68,13 @@
#define CFG_SHOW_BITMAP "ShowBitmap"
#define CFG_FONT_SIZE "FontSize"
-typedef KGenericFactory<KFI::CKCmFontInst, QWidget> FontInstallFactory;
+typedef KGenericFactory<KFI::CKCmFontInst, TQWidget> FontInstallFactory;
K_EXPORT_COMPONENT_FACTORY(kcm_fontinst, FontInstallFactory("kcmfontinst"))
namespace KFI
{
-CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&)
+CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
: KCModule(parent, "kfontinst"),
#ifdef HAVE_XFT
itsPreview(NULL),
@@ -97,25 +97,25 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&)
itsEmbeddedAdmin=Misc::root() && (NULL==appName || strcmp("kcontrol", appName) &&
KCmdLineArgs::parsedArgs()->isSet("embed"));
- itsStatusLabel = new QLabel(this);
- itsStatusLabel->setFrameShape(QFrame::Panel);
- itsStatusLabel->setFrameShadow(QFrame::Sunken);
+ itsStatusLabel = new TQLabel(this);
+ itsStatusLabel->setFrameShape(TQFrame::Panel);
+ itsStatusLabel->setFrameShadow(TQFrame::Sunken);
itsStatusLabel->setLineWidth(1);
itsConfig.setGroup(CFG_GROUP);
- QFrame *fontsFrame;
+ TQFrame *fontsFrame;
#ifdef HAVE_XFT
KLibFactory *factory=KLibLoader::self()->factory("libkfontviewpart");
if(factory)
{
- itsSplitter=new QSplitter(this);
- fontsFrame=new QFrame(itsSplitter),
+ itsSplitter=new TQSplitter(this);
+ fontsFrame=new TQFrame(itsSplitter),
itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart");
- itsSplitter->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+ itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
- QValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES));
+ TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES));
if(2!=sizes.count())
{
@@ -128,37 +128,37 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&)
else
{
#endif
- fontsFrame=new QFrame(this);
- fontsFrame->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+ fontsFrame=new TQFrame(this);
+ fontsFrame->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
#ifdef HAVE_XFT
}
#endif
- QGridLayout *fontsLayout=new QGridLayout(fontsFrame, 1, 1, 0, 1);
- QVBoxLayout *layout=new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQGridLayout *fontsLayout=new TQGridLayout(fontsFrame, 1, 1, 0, 1);
+ TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
KToolBar *toolbar=new KToolBar(this);
bool showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false));
fontsFrame->setLineWidth(0);
- toolbar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
+ toolbar->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
toolbar->setMovingEnabled(false);
- QString previousPath=itsConfig.readEntry(CFG_PATH);
+ TQString previousPath=itsConfig.readEntry(CFG_PATH);
- itsDirOp = new KDirOperator(Misc::root() ? QString("fonts:/") : QString("fonts:/")+i18n(KFI_KIO_FONTS_USER),
+ itsDirOp = new KDirOperator(Misc::root() ? TQString("fonts:/") : TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER),
fontsFrame);
itsDirOp->setViewConfig(&itsConfig, "ListView Settings");
- itsDirOp->setMinimumSize(QSize(96, 64));
+ itsDirOp->setMinimumSize(TQSize(96, 64));
setMimeTypes(showBitmap);
itsDirOp->dirLister()->setMainWindow(this);
- itsDirOp->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+ itsDirOp->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1);
KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame);
- connect(button, SIGNAL(clicked()), SLOT(addFonts()));
- button->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+ connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts()));
+ button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
fontsLayout->addWidget(button, 1, 0);
- fontsLayout->addItem(new QSpacerItem(4, 4, QSizePolicy::Expanding, QSizePolicy::Minimum));
+ fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
layout->addWidget(toolbar);
#ifdef HAVE_XFT
@@ -181,15 +181,15 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&)
itsViewMenuAct=dynamic_cast<KActionMenu *>(itsDirOp->actionCollection()->action("view menu"));
topMnu->popupMenu()->clear();
- connect(topMnu->popupMenu(), SIGNAL(aboutToShow()), SLOT(setupMenu()));
+ connect(topMnu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupMenu()));
if((act=itsDirOp->actionCollection()->action("up")))
- act->disconnect(SIGNAL(activated()), itsDirOp, SLOT(cdUp()));
+ act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(cdUp()));
if((act=itsDirOp->actionCollection()->action("home")))
- act->disconnect(SIGNAL(activated()), itsDirOp, SLOT(home()));
+ act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(home()));
if((act=itsDirOp->actionCollection()->action("back")))
- act->disconnect(SIGNAL(activated()), itsDirOp, SLOT(back()));
+ act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(back()));
if((act=itsDirOp->actionCollection()->action("forward")))
- act->disconnect(SIGNAL(activated()), itsDirOp, SLOT(forward()));
+ act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(forward()));
if((act=itsDirOp->actionCollection()->action("reload")))
act->plug(toolbar);
@@ -198,26 +198,26 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&)
if((itsIconAct=dynamic_cast<KRadioAction *>(itsDirOp->actionCollection()->action("short view"))))
{
- disconnect(itsIconAct, SIGNAL(activated()), itsDirOp, SLOT(slotSimpleView()));
- connect(itsIconAct, SIGNAL(activated()), SLOT(iconView()));
+ disconnect(itsIconAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotSimpleView()));
+ connect(itsIconAct, TQT_SIGNAL(activated()), TQT_SLOT(iconView()));
itsIconAct->plug(toolbar);
}
if((itsListAct=dynamic_cast<KRadioAction *>(itsDirOp->actionCollection()->action("detailed view"))))
{
- disconnect(itsListAct, SIGNAL(activated()), itsDirOp, SLOT(slotDetailedView()));
- connect(itsListAct, SIGNAL(activated()), SLOT(listView()));
+ disconnect(itsListAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotDetailedView()));
+ connect(itsListAct, TQT_SIGNAL(activated()), TQT_SLOT(listView()));
itsListAct->plug(toolbar);
}
- itsShowBitmapAct=new KToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, this, SLOT(filterFonts()),
+ itsShowBitmapAct=new KToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, this, TQT_SLOT(filterFonts()),
itsDirOp->actionCollection(), "showbitmap");
itsShowBitmapAct->setChecked(showBitmap);
itsShowBitmapAct->plug(toolbar);
toolbar->insertLineSeparator();
- act=new KAction(i18n("Add Fonts..."), "newfont", 0, this, SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
+ act=new KAction(i18n("Add Fonts..."), "newfont", 0, this, TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
act->plug(toolbar);
topMnu->insert(act);
@@ -226,24 +226,24 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&)
itsDeleteAct->plug(toolbar);
itsDeleteAct->setEnabled(false);
topMnu->insert(itsDeleteAct);
- disconnect(itsDeleteAct, SIGNAL(activated()), itsDirOp, SLOT(deleteSelected()));
- connect(itsDeleteAct, SIGNAL(activated()), this, SLOT(removeFonts()));
+ disconnect(itsDeleteAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(deleteSelected()));
+ connect(itsDeleteAct, TQT_SIGNAL(activated()), this, TQT_SLOT(removeFonts()));
}
toolbar->insertLineSeparator();
- act=new KAction(i18n("Configure..."), "configure", 0, this, SLOT(configure()), itsDirOp->actionCollection(), "configure");
+ act=new KAction(i18n("Configure..."), "configure", 0, this, TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure");
act->plug(toolbar);
#ifdef HAVE_XFT
toolbar->insertLineSeparator();
- act=new KAction(i18n("Print..."), "fileprint", 0, this, SLOT(print()), itsDirOp->actionCollection(), "print");
+ act=new KAction(i18n("Print..."), "fileprint", 0, this, TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
act->plug(toolbar);
#endif
if( (itsSepDirsAct=itsDirOp->actionCollection()->action("separate dirs")) &&
(itsShowHiddenAct=itsDirOp->actionCollection()->action("show hidden")))
{
- //disconnect(itsViewMenuAct->popupMenu(), SIGNAL(aboutToShow()), itsDirOp, SLOT(insertViewDependentActions()));
- connect(itsViewMenuAct->popupMenu(), SIGNAL(aboutToShow()), SLOT(setupViewMenu()));
+ //disconnect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), itsDirOp, TQT_SLOT(insertViewDependentActions()));
+ connect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupViewMenu()));
setupViewMenu();
}
@@ -266,12 +266,12 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&)
itsDirOp->dirLister()->setShowingDotFiles(true);
- connect(itsDirOp, SIGNAL(fileHighlighted(const KFileItem *)), SLOT(fileHighlighted(const KFileItem *)));
- connect(itsDirOp, SIGNAL(finishedLoading()), SLOT(loadingFinished()));
- connect(itsDirOp, SIGNAL(dropped(const KFileItem *, QDropEvent *, const KURL::List &)),
- SLOT(dropped(const KFileItem *, QDropEvent *, const KURL::List &)));
- connect(itsDirOp->dirLister(), SIGNAL(infoMessage(const QString &)), SLOT(infoMessage(const QString &)));
- connect(itsDirOp, SIGNAL(updateInformation(int, int)), SLOT(updateInformation(int, int)));
+ connect(itsDirOp, TQT_SIGNAL(fileHighlighted(const KFileItem *)), TQT_SLOT(fileHighlighted(const KFileItem *)));
+ connect(itsDirOp, TQT_SIGNAL(finishedLoading()), TQT_SLOT(loadingFinished()));
+ connect(itsDirOp, TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)),
+ TQT_SLOT(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)));
+ connect(itsDirOp->dirLister(), TQT_SIGNAL(infoMessage(const TQString &)), TQT_SLOT(infoMessage(const TQString &)));
+ connect(itsDirOp, TQT_SIGNAL(updateInformation(int, int)), TQT_SLOT(updateInformation(int, int)));
}
CKCmFontInst::~CKCmFontInst()
@@ -288,7 +288,7 @@ CKCmFontInst::~CKCmFontInst()
void CKCmFontInst::setMimeTypes(bool showBitmap)
{
- QStringList mimeTypes;
+ TQStringList mimeTypes;
mimeTypes << "application/x-font-ttf"
<< "application/x-font-otf"
@@ -311,7 +311,7 @@ void CKCmFontInst::filterFonts()
itsConfig.sync();
}
-QString CKCmFontInst::quickHelp() const
+TQString CKCmFontInst::quickHelp() const
{
return Misc::root()
? i18n("<h1>Font Installer</h1><p> This module allows you to"
@@ -398,13 +398,13 @@ void CKCmFontInst::fileHighlighted(const KFileItem *item)
void CKCmFontInst::loadingFinished()
{
- QListView *lView=dynamic_cast<QListView *>(itsDirOp->view());
+ TQListView *lView=dynamic_cast<TQListView *>(itsDirOp->view());
if(lView)
lView->sort();
else
{
- QIconView *iView=dynamic_cast<QIconView *>(itsDirOp->view());
+ TQIconView *iView=dynamic_cast<TQIconView *>(itsDirOp->view());
if(iView)
iView->sort();
@@ -414,7 +414,7 @@ void CKCmFontInst::loadingFinished()
void CKCmFontInst::addFonts()
{
- KURL::List list=KFileDialog::getOpenURLs(QString::null, "application/x-font-ttf application/x-font-otf "
+ KURL::List list=KFileDialog::getOpenURLs(TQString::null, "application/x-font-ttf application/x-font-otf "
"application/x-font-ttc application/x-font-type1 "
"application/x-font-pcf application/x-font-bdf",
//"application/x-font-snf application/x-font-speedo",
@@ -431,7 +431,7 @@ void CKCmFontInst::removeFonts()
else
{
KURL::List urls;
- QStringList files;
+ TQStringList files;
KFileItemListIterator it(*(itsDirOp->selectedItems()));
for(; it.current(); ++it)
@@ -464,7 +464,7 @@ void CKCmFontInst::removeFonts()
if(doIt)
{
KIO::DeleteJob *job = KIO::del(urls, false, true);
- connect(job, SIGNAL(result(KIO::Job *)), this, SLOT(delResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(delResult(KIO::Job *)));
job->setWindow(this);
job->setAutoErrorHandlingEnabled(true, this);
}
@@ -508,8 +508,8 @@ void CKCmFontInst::print()
{
static const int constSizes[]={0, 12, 18, 24, 36, 48};
- QStringList items;
- QValueVector<int> sizes;
+ TQStringList items;
+ TQValueVector<int> sizes;
CFcEngine engine;
if(dlg.outputAll())
@@ -537,18 +537,18 @@ void CKCmFontInst::print()
#endif
}
-void CKCmFontInst::dropped(const KFileItem *i, QDropEvent *, const KURL::List &urls)
+void CKCmFontInst::dropped(const KFileItem *i, TQDropEvent *, const KURL::List &urls)
{
if(urls.count())
addFonts(urls, i && i->isDir() ? i->url() : itsDirOp->url());
}
-void CKCmFontInst::infoMessage(const QString &msg)
+void CKCmFontInst::infoMessage(const TQString &msg)
{
itsStatusLabel->setText(msg);
}
-static QString family(const QString &name)
+static TQString family(const TQString &name)
{
int commaPos=name.find(',');
@@ -558,8 +558,8 @@ static QString family(const QString &name)
void CKCmFontInst::updateInformation(int, int fonts)
{
KIO::filesize_t size=0;
- QString text(i18n("One Font", "%n Fonts", fonts));
- QStringList families;
+ TQString text(i18n("One Font", "%n Fonts", fonts));
+ TQStringList families;
if(fonts>0)
{
@@ -567,7 +567,7 @@ void CKCmFontInst::updateInformation(int, int fonts)
for (item=itsDirOp->view()->firstFileItem(); item; item=itsDirOp->view()->nextItem(item))
{
- QString fam(family(item->text()));
+ TQString fam(family(item->text()));
size+=item->size();
if(-1==families.findIndex(fam))
@@ -590,8 +590,8 @@ void CKCmFontInst::delResult(KIO::Job *job)
//
// To speed up font deletion, we dont rescan font list each time - so after this has completed, we need
// to refresh font list before updating the directory listing...
- QByteArray packedArgs;
- QDataStream stream(packedArgs, IO_WriteOnly);
+ TQByteArray packedArgs;
+ TQDataStream stream(packedArgs, IO_WriteOnly);
stream << KFI::SPECIAL_RESCAN;
@@ -636,7 +636,7 @@ void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest)
}
KIO::CopyJob *job=KIO::copy(copy, dest, true);
- connect(job, SIGNAL(result(KIO::Job *)), this, SLOT(jobResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(jobResult(KIO::Job *)));
job->setWindow(this);
job->setAutoErrorHandlingEnabled(true, this);
}
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
index add6c4c36..bbb072a2a 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
@@ -33,7 +33,7 @@
#include "config.h"
#endif
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include <kcmodule.h>
#include <kurl.h>
#include <kconfig.h>
@@ -62,7 +62,7 @@ class CKCmFontInst : public KCModule
public:
- CKCmFontInst(QWidget *parent=NULL, const char *name=NULL, const QStringList &list=QStringList());
+ CKCmFontInst(TQWidget *parent=NULL, const char *name=NULL, const TQStringList &list=TQStringList());
virtual ~CKCmFontInst();
void setMimeTypes(bool showBitmap);
@@ -70,7 +70,7 @@ class CKCmFontInst : public KCModule
public slots:
void filterFonts();
- QString quickHelp() const;
+ TQString quickHelp() const;
void listView();
void iconView();
void setupMenu();
@@ -81,8 +81,8 @@ class CKCmFontInst : public KCModule
void removeFonts();
void configure();
void print();
- void dropped(const KFileItem *i, QDropEvent *e, const KURL::List &urls);
- void infoMessage(const QString &msg);
+ void dropped(const KFileItem *i, TQDropEvent *e, const KURL::List &urls);
+ void infoMessage(const TQString &msg);
void updateInformation(int dirs, int fonts);
void delResult(KIO::Job *job);
void jobResult(KIO::Job *job);
@@ -105,10 +105,10 @@ class CKCmFontInst : public KCModule
#ifdef HAVE_XFT
KParts::ReadOnlyPart *itsPreview;
#endif
- QSplitter *itsSplitter;
+ TQSplitter *itsSplitter;
KConfig itsConfig;
bool itsEmbeddedAdmin;
- QLabel *itsStatusLabel;
+ TQLabel *itsStatusLabel;
};
}
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp
index d814d0c6b..241ac88bf 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp
@@ -26,7 +26,7 @@
// (C) Craig Drummond, 2003, 2004
////////////////////////////////////////////////////////////////////////////////
-#include <qevent.h>
+#include <tqevent.h>
#include <kfileitem.h>
#include <kurldrag.h>
#include "KFileFontIconView.h"
@@ -35,7 +35,7 @@ namespace KFI
{
// CPD: KDE4 should make acceptDrag() virtual there fore can get rid of all these ::contentsX functions...
-void CKFileFontIconView::contentsDragEnterEvent(QDragEnterEvent *e)
+void CKFileFontIconView::contentsDragEnterEvent(TQDragEnterEvent *e)
{
if(acceptDrag(e))
KFileIconView::contentsDragEnterEvent(e);
@@ -43,7 +43,7 @@ void CKFileFontIconView::contentsDragEnterEvent(QDragEnterEvent *e)
e->ignore();
}
-void CKFileFontIconView::contentsDragMoveEvent(QDragMoveEvent *e)
+void CKFileFontIconView::contentsDragMoveEvent(TQDragMoveEvent *e)
{
if(acceptDrag(e))
KFileIconView::contentsDragMoveEvent(e);
@@ -51,7 +51,7 @@ void CKFileFontIconView::contentsDragMoveEvent(QDragMoveEvent *e)
e->ignore();
}
-void CKFileFontIconView::contentsDropEvent(QDropEvent *e)
+void CKFileFontIconView::contentsDropEvent(TQDropEvent *e)
{
contentsDragLeaveEvent(NULL);
@@ -61,28 +61,28 @@ void CKFileFontIconView::contentsDropEvent(QDropEvent *e)
e->ignore();
}
-bool CKFileFontIconView::acceptDrag(QDropEvent *e) const
+bool CKFileFontIconView::acceptDrag(TQDropEvent *e) const
{
#if 0 // Crashes - seems to be called to quick???
bool ok=false;
KURL::List urls;
if(KURLDrag::canDecode(e) && (e->source()!=const_cast<CKFileFontIconView *>(this)) &&
- (QDropEvent::Copy==e->action() || QDropEvent::Move==e->action()) &&
+ (TQDropEvent::Copy==e->action() || TQDropEvent::Move==e->action()) &&
KURLDrag::decode(e, urls) && !urls.isEmpty())
{
KURL::List::Iterator it;
ok=true;
for(it=urls.begin(); ok && it!=urls.end(); ++it)
- if(!CFontEngine::isAFontOrAfm(QFile::encodeName((*it).path())))
+ if(!CFontEngine::isAFontOrAfm(TQFile::encodeName((*it).path())))
ok=false;
}
return ok;
#endif
return KURLDrag::canDecode(e) && (e->source()!= const_cast<CKFileFontIconView*>(this)) &&
- (QDropEvent::Copy==e->action() || QDropEvent::Move==e->action());
+ (TQDropEvent::Copy==e->action() || TQDropEvent::Move==e->action());
}
}
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h
index 936bb5bca..bb5ccfa5a 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h
@@ -38,16 +38,16 @@ class CKFileFontIconView : public KFileIconView
{
public:
- CKFileFontIconView(QWidget *parent, const char *name) : KFileIconView(parent, name) {}
+ CKFileFontIconView(TQWidget *parent, const char *name) : KFileIconView(parent, name) {}
virtual ~CKFileFontIconView() {}
protected:
// DND support
- void contentsDragEnterEvent(QDragEnterEvent *e);
- void contentsDragMoveEvent(QDragMoveEvent *e);
- void contentsDropEvent(QDropEvent *e);
- bool acceptDrag(QDropEvent *e) const;
+ void contentsDragEnterEvent(TQDragEnterEvent *e);
+ void contentsDragMoveEvent(TQDragMoveEvent *e);
+ void contentsDropEvent(TQDropEvent *e);
+ bool acceptDrag(TQDropEvent *e) const;
};
}
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
index 7346ca6c8..1ba7822ec 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
@@ -33,11 +33,11 @@
// 2000, 2001 Carsten Pfeiffer <pfeiffer@kde.org>
//
-#include <qevent.h>
-#include <qkeycode.h>
-#include <qheader.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <tqevent.h>
+#include <tqkeycode.h>
+#include <tqheader.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
#include <kapplication.h>
#include <kfileitem.h>
#include <kglobal.h>
@@ -60,10 +60,10 @@ class CKFileFontView::CKFileFontViewPrivate
CKFileFontViewPrivate() : itsDropItem(0) {}
CFontListViewItem *itsDropItem;
- QTimer itsAutoOpenTimer;
+ TQTimer itsAutoOpenTimer;
};
-CKFileFontView::CKFileFontView(QWidget *parent, const char *name)
+CKFileFontView::CKFileFontView(TQWidget *parent, const char *name)
: KListView(parent, name),
KFileView(),
d(new CKFileFontViewPrivate())
@@ -79,15 +79,15 @@ CKFileFontView::CKFileFontView(QWidget *parent, const char *name)
setAllColumnsShowFocus(true);
setDragEnabled(false);
- connect(header(), SIGNAL(sectionClicked(int)), SLOT(slotSortingChanged(int)));
- connect(this, SIGNAL(returnPressed(QListViewItem *)), SLOT(slotActivate(QListViewItem *)));
- connect(this, SIGNAL(clicked(QListViewItem *, const QPoint&, int)), SLOT(selected( QListViewItem *)));
- connect(this, SIGNAL(doubleClicked(QListViewItem *, const QPoint &, int)), SLOT(slotActivate(QListViewItem *)));
- connect(this, SIGNAL(contextMenuRequested(QListViewItem *, const QPoint &, int)),
- this, SLOT(slotActivateMenu(QListViewItem *, const QPoint &)));
+ connect(header(), TQT_SIGNAL(sectionClicked(int)), TQT_SLOT(slotSortingChanged(int)));
+ connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(slotActivate(TQListViewItem *)));
+ connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), TQT_SLOT(selected( TQListViewItem *)));
+ connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), TQT_SLOT(slotActivate(TQListViewItem *)));
+ connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
+ this, TQT_SLOT(slotActivateMenu(TQListViewItem *, const TQPoint &)));
// DND
- connect(&(d->itsAutoOpenTimer), SIGNAL(timeout()), this, SLOT(slotAutoOpen()));
+ connect(&(d->itsAutoOpenTimer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoOpen()));
setSelectionMode(KFileView::selectionMode());
itsResolver = new KMimeTypeResolver<CFontListViewItem, CKFileFontView>(this);
}
@@ -144,7 +144,7 @@ void CKFileFontView::invertSelection()
KListView::invertSelection();
}
-void CKFileFontView::slotActivateMenu(QListViewItem *item,const QPoint& pos)
+void CKFileFontView::slotActivateMenu(TQListViewItem *item,const TQPoint& pos)
{
if (!item)
sig->activateMenu(0, pos);
@@ -165,7 +165,7 @@ void CKFileFontView::insertItem(KFileItem *i)
{
KFileView::insertItem(i);
- CFontListViewItem *item = new CFontListViewItem((QListView*) this, i);
+ CFontListViewItem *item = new CFontListViewItem((TQListView*) this, i);
setSortingKey(item, i);
@@ -175,7 +175,7 @@ void CKFileFontView::insertItem(KFileItem *i)
itsResolver->m_lstPendingMimeIconItems.append(item);
}
-void CKFileFontView::slotActivate(QListViewItem *item)
+void CKFileFontView::slotActivate(TQListViewItem *item)
{
if (item)
{
@@ -186,7 +186,7 @@ void CKFileFontView::slotActivate(QListViewItem *item)
}
}
-void CKFileFontView::selected(QListViewItem *item)
+void CKFileFontView::selected(TQListViewItem *item)
{
if (item && !(KApplication::keyboardMouseState() & (ShiftButton|ControlButton)) &&
KGlobalSettings::singleClick())
@@ -198,7 +198,7 @@ void CKFileFontView::selected(QListViewItem *item)
}
}
-void CKFileFontView::highlighted( QListViewItem *item )
+void CKFileFontView::highlighted( TQListViewItem *item )
{
if (item)
{
@@ -211,31 +211,31 @@ void CKFileFontView::highlighted( QListViewItem *item )
void CKFileFontView::setSelectionMode(KFile::SelectionMode sm)
{
- disconnect(SIGNAL(selectionChanged()), this);
- disconnect(SIGNAL(selectionChanged(QListViewItem *)), this);
+ disconnect(TQT_SIGNAL(selectionChanged()), this);
+ disconnect(TQT_SIGNAL(selectionChanged(TQListViewItem *)), this);
switch (sm)
{
case KFile::Multi:
- QListView::setSelectionMode(QListView::Multi);
+ TQListView::setSelectionMode(TQListView::Multi);
break;
case KFile::Extended:
- QListView::setSelectionMode(QListView::Extended);
+ TQListView::setSelectionMode(TQListView::Extended);
break;
case KFile::NoSelection:
- QListView::setSelectionMode(QListView::NoSelection);
+ TQListView::setSelectionMode(TQListView::NoSelection);
break;
default: // fall through
case KFile::Single:
- QListView::setSelectionMode(QListView::Single);
+ TQListView::setSelectionMode(TQListView::Single);
break;
}
// for highlighting
if (KFile::Multi==sm || KFile::Extended==sm)
- connect(this, SIGNAL(selectionChanged()), SLOT(slotSelectionChanged()));
+ connect(this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
else
- connect(this, SIGNAL(selectionChanged(QListViewItem *)), SLOT(highlighted(QListViewItem * )));
+ connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), TQT_SLOT(highlighted(TQListViewItem * )));
}
bool CKFileFontView::isSelected(const KFileItem *i) const
@@ -254,7 +254,7 @@ void CKFileFontView::updateView(bool b)
{
if (b)
{
- QListViewItemIterator it((QListView*)this);
+ TQListViewItemIterator it((TQListView*)this);
for (; it.current(); ++it)
{
@@ -281,9 +281,9 @@ void CKFileFontView::updateView(const KFileItem *i)
void CKFileFontView::setSortingKey(CFontListViewItem *item, const KFileItem *i)
{
- QDir::SortSpec spec = KFileView::sorting();
+ TQDir::SortSpec spec = KFileView::sorting();
- if (spec&QDir::Size)
+ if (spec&TQDir::Size)
item->setKey(sortingKey(i->size(), i->isDir(), spec));
else
item->setKey(sortingKey(i->text(), i->isDir(), spec));
@@ -304,44 +304,44 @@ void CKFileFontView::removeItem(const KFileItem *i)
void CKFileFontView::slotSortingChanged(int col)
{
- QDir::SortSpec sort = sorting();
+ TQDir::SortSpec sort = sorting();
int sortSpec = -1;
- bool reversed = col == itsSortingCol && (sort & QDir::Reversed) == 0;
+ bool reversed = col == itsSortingCol && (sort & TQDir::Reversed) == 0;
itsSortingCol = col;
switch(col)
{
case COL_NAME:
- sortSpec = (sort & ~QDir::SortByMask | QDir::Name);
+ sortSpec = (sort & ~TQDir::SortByMask | TQDir::Name);
break;
case COL_SIZE:
- sortSpec = (sort & ~QDir::SortByMask | QDir::Size);
+ sortSpec = (sort & ~TQDir::SortByMask | TQDir::Size);
break;
- // the following columns have no equivalent in QDir, so we set it
- // to QDir::Unsorted and remember the column (itsSortingCol)
+ // the following columns have no equivalent in TQDir, so we set it
+ // to TQDir::Unsorted and remember the column (itsSortingCol)
case COL_TYPE:
- sortSpec = (sort & ~QDir::SortByMask | QDir::Time);
+ sortSpec = (sort & ~TQDir::SortByMask | TQDir::Time);
break;
default:
break;
}
if (reversed)
- sortSpec|=QDir::Reversed;
+ sortSpec|=TQDir::Reversed;
else
- sortSpec&=~QDir::Reversed;
+ sortSpec&=~TQDir::Reversed;
- if (sort & QDir::IgnoreCase)
- sortSpec|=QDir::IgnoreCase;
+ if (sort & TQDir::IgnoreCase)
+ sortSpec|=TQDir::IgnoreCase;
else
- sortSpec&=~QDir::IgnoreCase;
+ sortSpec&=~TQDir::IgnoreCase;
- KFileView::setSorting(static_cast<QDir::SortSpec>(sortSpec));
+ KFileView::setSorting(static_cast<TQDir::SortSpec>(sortSpec));
KFileItem *item;
KFileItemListIterator it(*items());
- if ( sortSpec & QDir::Size )
+ if ( sortSpec & TQDir::Size )
{
for (; (item = it.current()); ++it )
{
@@ -361,23 +361,23 @@ void CKFileFontView::slotSortingChanged(int col)
KListView::sort();
if (!itsBlockSortingSignal)
- sig->changeSorting( static_cast<QDir::SortSpec>( sortSpec ) );
+ sig->changeSorting( static_cast<TQDir::SortSpec>( sortSpec ) );
}
-void CKFileFontView::setSorting(QDir::SortSpec spec)
+void CKFileFontView::setSorting(TQDir::SortSpec spec)
{
- if (spec & QDir::Size)
+ if (spec & TQDir::Size)
itsSortingCol=COL_SIZE;
else
itsSortingCol=COL_NAME;
// inversed, because slotSortingChanged will reverse it
- if (spec & QDir::Reversed)
- spec = (QDir::SortSpec) (spec & ~QDir::Reversed);
+ if (spec & TQDir::Reversed)
+ spec = (TQDir::SortSpec) (spec & ~TQDir::Reversed);
else
- spec = (QDir::SortSpec) (spec | QDir::Reversed);
+ spec = (TQDir::SortSpec) (spec | TQDir::Reversed);
- KFileView::setSorting((QDir::SortSpec) spec);
+ KFileView::setSorting((TQDir::SortSpec) spec);
// don't emit sortingChanged() when called via setSorting()
itsBlockSortingSignal = true; // can't use blockSignals()
@@ -433,7 +433,7 @@ KFileItem * CKFileFontView::prevItem(const KFileItem *fileItem) const
return firstFileItem();
}
-void CKFileFontView::keyPressEvent(QKeyEvent *e)
+void CKFileFontView::keyPressEvent(TQKeyEvent *e)
{
KListView::keyPressEvent(e);
@@ -463,13 +463,13 @@ void CKFileFontView::listingCompleted()
itsResolver->start();
}
-QDragObject *CKFileFontView::dragObject()
+TQDragObject *CKFileFontView::dragObject()
{
// create a list of the URL:s that we want to drag
KURL::List urls;
KFileItemListIterator it(* KFileView::selectedItems());
- QPixmap pixmap;
- QPoint hotspot;
+ TQPixmap pixmap;
+ TQPoint hotspot;
for ( ; it.current(); ++it )
urls.append( (*it)->url() );
@@ -482,7 +482,7 @@ QDragObject *CKFileFontView::dragObject()
hotspot.setX(pixmap.width() / 2);
hotspot.setY(pixmap.height() / 2);
- QDragObject *dragObject=new KURLDrag(urls, widget());
+ TQDragObject *dragObject=new KURLDrag(urls, widget());
if(dragObject)
dragObject->setPixmap(pixmap, hotspot);
@@ -503,7 +503,7 @@ void CKFileFontView::slotAutoOpen()
}
}
-bool CKFileFontView::acceptDrag(QDropEvent *e) const
+bool CKFileFontView::acceptDrag(TQDropEvent *e) const
{
#if 0 // Following doesn't seem to work, why???
bool ok=false;
@@ -511,14 +511,14 @@ bool CKFileFontView::acceptDrag(QDropEvent *e) const
if((e->source()!=const_cast<CKFileFontView *>(this)) &&
- (QDropEvent::Copy==e->action() || QDropEvent::Move==e->action()) &&
+ (TQDropEvent::Copy==e->action() || TQDropEvent::Move==e->action()) &&
KURLDrag::decode(e, urls) && !urls.isEmpty())
{
KURL::List::Iterator it;
ok=true;
for(it=urls.begin(); ok && it!=urls.end(); ++it)
- if(!CFontEngine::isAFontOrAfm(QFile::encodeName((*it).path())))
+ if(!CFontEngine::isAFontOrAfm(TQFile::encodeName((*it).path())))
ok=false;
}
@@ -526,10 +526,10 @@ bool CKFileFontView::acceptDrag(QDropEvent *e) const
#endif
return KURLDrag::canDecode(e) && (e->source()!= const_cast<CKFileFontView*>(this)) &&
- (QDropEvent::Copy==e->action() || QDropEvent::Move==e->action());
+ (TQDropEvent::Copy==e->action() || TQDropEvent::Move==e->action());
}
-void CKFileFontView::contentsDragEnterEvent(QDragEnterEvent *e)
+void CKFileFontView::contentsDragEnterEvent(TQDragEnterEvent *e)
{
if (!acceptDrag(e)) // can we decode this ?
e->ignore(); // No
@@ -554,7 +554,7 @@ void CKFileFontView::contentsDragEnterEvent(QDragEnterEvent *e)
}
}
-void CKFileFontView::contentsDragMoveEvent(QDragMoveEvent *e)
+void CKFileFontView::contentsDragMoveEvent(TQDragMoveEvent *e)
{
if (!acceptDrag(e)) // can we decode this ?
e->ignore(); // No
@@ -583,13 +583,13 @@ void CKFileFontView::contentsDragMoveEvent(QDragMoveEvent *e)
}
}
-void CKFileFontView::contentsDragLeaveEvent(QDragLeaveEvent *)
+void CKFileFontView::contentsDragLeaveEvent(TQDragLeaveEvent *)
{
d->itsDropItem = 0;
d->itsAutoOpenTimer.stop();
}
-void CKFileFontView::contentsDropEvent(QDropEvent *e)
+void CKFileFontView::contentsDropEvent(TQDropEvent *e)
{
d->itsDropItem = 0;
d->itsAutoOpenTimer.stop();
@@ -614,15 +614,15 @@ void CKFileFontView::contentsDropEvent(QDropEvent *e)
}
}
-void CKFileFontView::readConfig(KConfig *kc, const QString &group)
+void CKFileFontView::readConfig(KConfig *kc, const TQString &group)
{
- restoreLayout(kc, group.isEmpty() ? QString("CFileFontView") : group);
+ restoreLayout(kc, group.isEmpty() ? TQString("CFileFontView") : group);
slotSortingChanged(sortColumn());
}
-void CKFileFontView::writeConfig(KConfig *kc, const QString &group)
+void CKFileFontView::writeConfig(KConfig *kc, const TQString &group)
{
- saveLayout(kc, group.isEmpty() ? QString("CFileFontView") : group);
+ saveLayout(kc, group.isEmpty() ? TQString("CFileFontView") : group);
}
/////////////////////////////////////////////////////////////////
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
index a58f9d908..295be9106 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
@@ -52,7 +52,7 @@ class CFontListViewItem : public KListViewItem
{
public:
- CFontListViewItem(QListView *parent, const QString &text, const QPixmap &icon, KFileItem *fi)
+ CFontListViewItem(TQListView *parent, const TQString &text, const TQPixmap &icon, KFileItem *fi)
: KListViewItem(parent, text),
itsInf(fi)
{
@@ -60,14 +60,14 @@ class CFontListViewItem : public KListViewItem
setText(0, text);
}
- CFontListViewItem(QListView *parent, KFileItem *fi)
+ CFontListViewItem(TQListView *parent, KFileItem *fi)
: KListViewItem(parent),
itsInf(fi)
{
init();
}
- CFontListViewItem(QListView *parent, const QString &text, const QPixmap &icon, KFileItem *fi, QListViewItem *after)
+ CFontListViewItem(TQListView *parent, const TQString &text, const TQPixmap &icon, KFileItem *fi, TQListViewItem *after)
: KListViewItem(parent, after),
itsInf(fi)
{
@@ -82,15 +82,15 @@ class CFontListViewItem : public KListViewItem
*/
KFileItem *fileInfo() const { return itsInf; }
- virtual QString key( int /*column*/, bool /*ascending*/ ) const { return itsKey; }
+ virtual TQString key( int /*column*/, bool /*ascending*/ ) const { return itsKey; }
- void setKey( const QString& key ) { itsKey = key; }
+ void setKey( const TQString& key ) { itsKey = key; }
- QRect rect() const
+ TQRect rect() const
{
- QRect r = listView()->itemRect(this);
+ TQRect r = listView()->itemRect(this);
- return QRect(listView()->viewportToContents(r.topLeft()), QSize(r.width(), r.height()));
+ return TQRect(listView()->viewportToContents(r.topLeft()), TQSize(r.width(), r.height()));
}
void init();
@@ -98,7 +98,7 @@ class CFontListViewItem : public KListViewItem
private:
KFileItem *itsInf;
- QString itsKey;
+ TQString itsKey;
class CFontListViewItemPrivate;
@@ -119,10 +119,10 @@ class CKFileFontView : public KListView, public KFileView
public:
- CKFileFontView(QWidget *parent, const char *name);
+ CKFileFontView(TQWidget *parent, const char *name);
virtual ~CKFileFontView();
- virtual QWidget * widget() { return this; }
+ virtual TQWidget * widget() { return this; }
virtual void clearView();
virtual void setAutoUpdate(bool) {} // ### unused. remove in KDE4
virtual void setSelectionMode( KFile::SelectionMode sm );
@@ -142,38 +142,38 @@ class CKFileFontView : public KListView, public KFileView
virtual KFileItem * prevItem(const KFileItem *i) const;
virtual void insertItem( KFileItem *i);
- void readConfig(KConfig *kc, const QString &group);
- void writeConfig(KConfig *kc, const QString &group);
+ void readConfig(KConfig *kc, const TQString &group);
+ void writeConfig(KConfig *kc, const TQString &group);
// implemented to get noticed about sorting changes (for sortingIndicator)
- virtual void setSorting(QDir::SortSpec s);
+ virtual void setSorting(TQDir::SortSpec s);
void ensureItemVisible(const KFileItem *i);
// for KMimeTypeResolver
void mimeTypeDeterminationFinished();
void determineIcon(CFontListViewItem *item);
- QScrollView * scrollWidget() const { return (QScrollView*) this; }
+ TQScrollView * scrollWidget() const { return (TQScrollView*) this; }
signals:
// The user dropped something.
// fileItem points to the item dropped on or can be 0 if the
// user dropped on empty space.
- void dropped(QDropEvent *event, KFileItem *fileItem);
+ void dropped(TQDropEvent *event, KFileItem *fileItem);
// The user dropped the URLs urls.
// url points to the item dropped on or can be empty if the
// user dropped on empty space.
- void dropped(QDropEvent *event, const KURL::List &urls, const KURL &url);
+ void dropped(TQDropEvent *event, const KURL::List &urls, const KURL &url);
protected:
- virtual void keyPressEvent(QKeyEvent *e);
+ virtual void keyPressEvent(TQKeyEvent *e);
// DND support
- QDragObject * dragObject();
- void contentsDragEnterEvent(QDragEnterEvent *e);
- void contentsDragMoveEvent(QDragMoveEvent *e);
- void contentsDragLeaveEvent(QDragLeaveEvent *e);
- void contentsDropEvent(QDropEvent *e);
- bool acceptDrag(QDropEvent *e) const;
+ TQDragObject * dragObject();
+ void contentsDragEnterEvent(TQDragEnterEvent *e);
+ void contentsDragMoveEvent(TQDragMoveEvent *e);
+ void contentsDragLeaveEvent(TQDragLeaveEvent *e);
+ void contentsDropEvent(TQDropEvent *e);
+ bool acceptDrag(TQDropEvent *e) const;
int itsSortingCol;
@@ -184,17 +184,17 @@ class CKFileFontView : public KListView, public KFileView
private slots:
void slotSortingChanged(int c);
- void selected(QListViewItem *item);
- void slotActivate(QListViewItem *item);
- void highlighted(QListViewItem *item);
- void slotActivateMenu(QListViewItem *item, const QPoint& pos);
+ void selected(TQListViewItem *item);
+ void slotActivate(TQListViewItem *item);
+ void highlighted(TQListViewItem *item);
+ void slotActivateMenu(TQListViewItem *item, const TQPoint& pos);
void slotAutoOpen();
private:
- virtual void insertItem(QListViewItem *i) { KListView::insertItem(i); }
+ virtual void insertItem(TQListViewItem *i) { KListView::insertItem(i); }
virtual void setSorting(int i, bool b) { KListView::setSorting(i, b); }
- virtual void setSelected(QListViewItem *i, bool b) { KListView::setSelected(i, b); }
+ virtual void setSelected(TQListViewItem *i, bool b) { KListView::setSelected(i, b); }
inline CFontListViewItem * viewItem( const KFileItem *item ) const
{
diff --git a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
index e902fa1e1..afd9fa204 100644
--- a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
@@ -27,27 +27,27 @@
////////////////////////////////////////////////////////////////////////////////
#include "PrintDialog.h"
-#include <qlayout.h>
-#include <qframe.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqframe.h>
+#include <tqlabel.h>
#include <klocale.h>
namespace KFI
{
-CPrintDialog::CPrintDialog(QWidget *parent)
+CPrintDialog::CPrintDialog(TQWidget *parent)
: KDialogBase(Plain, i18n("Print Font Samples"), Ok|Cancel, Ok, parent, NULL, true, false)
{
- QFrame *page=plainPage();
- QGridLayout *layout=new QGridLayout(page, 1, 1, 0, spacingHint());
+ TQFrame *page=plainPage();
+ TQGridLayout *layout=new TQGridLayout(page, 1, 1, 0, spacingHint());
- layout->addWidget(new QLabel(i18n("Output:"), page), 0, 0);
- itsOutput=new QComboBox(page);
+ layout->addWidget(new TQLabel(i18n("Output:"), page), 0, 0);
+ itsOutput=new TQComboBox(page);
itsOutput->insertItem(i18n("All Fonts"), 0);
itsOutput->insertItem(i18n("Selected Fonts"), 1);
layout->addWidget(itsOutput, 0, 1);
- layout->addWidget(new QLabel(i18n("Font size:"), page), 1, 0);
- itsSize=new QComboBox(page);
+ layout->addWidget(new TQLabel(i18n("Font size:"), page), 1, 0);
+ itsSize=new TQComboBox(page);
itsSize->insertItem(i18n("Waterfall"), 0);
itsSize->insertItem(i18n("12pt"), 1);
itsSize->insertItem(i18n("18pt"), 2);
@@ -55,7 +55,7 @@ CPrintDialog::CPrintDialog(QWidget *parent)
itsSize->insertItem(i18n("36pt"), 4);
itsSize->insertItem(i18n("48pt"), 5);
layout->addWidget(itsSize, 1, 1);
- layout->addItem(new QSpacerItem(2, 2), 2, 1);
+ layout->addItem(new TQSpacerItem(2, 2), 2, 1);
}
bool CPrintDialog::exec(bool select, int size)
@@ -68,7 +68,7 @@ bool CPrintDialog::exec(bool select, int size)
else
itsOutput->setCurrentItem(1);
itsSize->setCurrentItem(size);
- return QDialog::Accepted==QDialog::exec();
+ return TQDialog::Accepted==TQDialog::exec();
}
}
diff --git a/kcontrol/kfontinst/kcmfontinst/PrintDialog.h b/kcontrol/kfontinst/kcmfontinst/PrintDialog.h
index 9be67f6d4..f63118d66 100644
--- a/kcontrol/kfontinst/kcmfontinst/PrintDialog.h
+++ b/kcontrol/kfontinst/kcmfontinst/PrintDialog.h
@@ -30,7 +30,7 @@
////////////////////////////////////////////////////////////////////////////////
#include <kdialogbase.h>
-#include <qcombobox.h>
+#include <tqcombobox.h>
namespace KFI
{
@@ -39,7 +39,7 @@ class CPrintDialog : public KDialogBase
{
public:
- CPrintDialog(QWidget *parent);
+ CPrintDialog(TQWidget *parent);
bool exec(bool select, int size);
int chosenSize() { return itsSize->currentItem(); }
@@ -47,7 +47,7 @@ class CPrintDialog : public KDialogBase
private:
- QComboBox *itsOutput,
+ TQComboBox *itsOutput,
*itsSize;
};
diff --git a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
index 255fca709..8b8a88167 100644
--- a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
@@ -29,10 +29,10 @@
#include "SettingsDialog.h"
#include "KfiConstants.h"
#include "Misc.h"
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qvbox.h>
-#include <qwhatsthis.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqvbox.h>
+#include <tqwhatsthis.h>
#include <klocale.h>
#include <kconfig.h>
#include <kmessagebox.h>
@@ -42,20 +42,20 @@
namespace KFI
{
-CSettingsDialog::CSettingsDialog(QWidget *parent)
+CSettingsDialog::CSettingsDialog(TQWidget *parent)
: KDialogBase(parent, "settingsdialog", true, i18n("Settings"),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true)
{
- QVBox *page = makeVBoxMainWidget();
+ TQVBox *page = makeVBoxMainWidget();
- itsDoX=new QCheckBox(i18n("Configure fonts for legacy X applications"), page);
- QWhatsThis::add(itsDoX, i18n("<p>Modern applications use a system called \"FontConfig\" to obtain the list of fonts. "
+ itsDoX=new TQCheckBox(i18n("Configure fonts for legacy X applications"), page);
+ TQWhatsThis::add(itsDoX, i18n("<p>Modern applications use a system called \"FontConfig\" to obtain the list of fonts. "
"Older applications, such as OpenOffice 1.x, GIMP 1.x, etc. use the previous \"core X fonts\" mechanism for "
"this.</p><p>Selecting this option will inform the installer to create the necessary files so that these "
"older applications can use the fonts you install.</p><p>Please note, however, that this will slow down "
"the installation process.<p>"));
- itsDoGs=new QCheckBox(i18n("Configure fonts for Ghostscript"), page);
- QWhatsThis::add(itsDoGs, i18n("<p>When printing, most applications create what is know as PostScript. This is then sent to a special "
+ itsDoGs=new TQCheckBox(i18n("Configure fonts for Ghostscript"), page);
+ TQWhatsThis::add(itsDoGs, i18n("<p>When printing, most applications create what is know as PostScript. This is then sent to a special "
"application, named Ghostscript, which can interpret the PostScript and send the appropriate instructions "
"to your printer. If your application does not embed whatever fonts it uses into the PostScript, then "
"Ghostscript needs to be informed as to which fonts you have installed, and where they are located.</p>"
@@ -83,10 +83,10 @@ void CSettingsDialog::slotOk()
if( ((!oldDoX && itsDoX->isChecked()) || (!oldDoGs && itsDoGs->isChecked())) &&
KMessageBox::Yes==KMessageBox::questionYesNo(this, i18n("You have enabled a previously disabled option. Would you like the config "
"files updated now? (Normally they are only updated upon installing, or "
- "removing, a font.)"), QString::null, i18n("Update"),i18n("Do Not Update")))
+ "removing, a font.)"), TQString::null, i18n("Update"),i18n("Do Not Update")))
{
- QByteArray packedArgs;
- QDataStream stream(packedArgs, IO_WriteOnly);
+ TQByteArray packedArgs;
+ TQDataStream stream(packedArgs, IO_WriteOnly);
stream << KFI::SPECIAL_RECONFIG;
diff --git a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.h b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.h
index b41820e38..0edac64dd 100644
--- a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.h
+++ b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.h
@@ -40,7 +40,7 @@ class CSettingsDialog : public KDialogBase
{
public:
- CSettingsDialog(QWidget *parent);
+ CSettingsDialog(TQWidget *parent);
private slots:
@@ -48,7 +48,7 @@ class CSettingsDialog : public KDialogBase
private:
- QCheckBox *itsDoX,
+ TQCheckBox *itsDoX,
*itsDoGs;
};
diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
index 31fbaa83e..112e3562b 100644
--- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
+++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
@@ -28,19 +28,19 @@
#include "KFileFont.h"
#include "KfiConstants.h"
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <kgenericfactory.h>
#include <kio/netaccess.h>
-static void addEntry(int face, QString &existing, const QString &add)
+static void addEntry(int face, TQString &existing, const TQString &add)
{
if(face>0)
existing.append(", ");
existing.append(add);
}
-static int strToWeight(const QString &str)
+static int strToWeight(const TQString &str)
{
if(NULL==str)
return FC_WEIGHT_MEDIUM;
@@ -79,7 +79,7 @@ static int strToWeight(const QString &str)
}
#ifndef KFI_FC_NO_WIDTHS
-static int strToWidth(const QString &str)
+static int strToWidth(const TQString &str)
{
if(str.isEmpty())
return FC_WIDTH_NORMAL;
@@ -171,13 +171,13 @@ static const char * getFoundry(const char *notice)
return NULL;
}
-static bool readAfm(const QString &file, QString &full, QString &family, QString &foundry, QString &weight,
+static bool readAfm(const TQString &file, TQString &full, TQString &family, TQString &foundry, TQString &weight,
#ifndef KFI_FC_NO_WIDTHS
- QString &width,
+ TQString &width,
#endif
- QString &spacing, QString &slant)
+ TQString &spacing, TQString &slant)
{
- QFile f(file);
+ TQFile f(file);
bool foundName=false,
foundFamily=false;
int intSpacing=FC_PROPORTIONAL,
@@ -190,8 +190,8 @@ static bool readAfm(const QString &file, QString &full, QString &family, QString
if(f.open(IO_ReadOnly))
{
- QTextStream stream(&f);
- QString line;
+ TQTextStream stream(&f);
+ TQString line;
bool inMetrics=false;
while(!stream.atEnd())
@@ -265,7 +265,7 @@ K_EXPORT_COMPONENT_FACTORY(kfile_font, KFileFontPluginFactory("kfontinst"))
namespace KFI
{
-KFileFontPlugin::KFileFontPlugin(QObject *parent, const char *name, const QStringList& args)
+KFileFontPlugin::KFileFontPlugin(TQObject *parent, const char *name, const TQStringList& args)
: KFilePlugin(parent, name, args)
{
KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
@@ -286,20 +286,20 @@ void KFileFontPlugin::addMimeType(const char *mime)
KFileMimeTypeInfo *info=addMimeTypeInfo(mime);
KFileMimeTypeInfo::GroupInfo *group=addGroupInfo(info, "General", i18n("General"));
- addItemInfo(group, "Full", i18n("Full Name"), QVariant::String);
- addItemInfo(group, "Family", i18n("Family"), QVariant::String);
- addItemInfo(group, "Foundry", i18n("Foundry"), QVariant::String);
- addItemInfo(group, "Weight", i18n("Weight"), QVariant::String);
+ addItemInfo(group, "Full", i18n("Full Name"), TQVariant::String);
+ addItemInfo(group, "Family", i18n("Family"), TQVariant::String);
+ addItemInfo(group, "Foundry", i18n("Foundry"), TQVariant::String);
+ addItemInfo(group, "Weight", i18n("Weight"), TQVariant::String);
#ifndef KFI_FC_NO_WIDTHS
- addItemInfo(group, "Width", i18n("Width"), QVariant::String);
+ addItemInfo(group, "Width", i18n("Width"), TQVariant::String);
#endif
- addItemInfo(group, "Spacing", i18n("Spacing"), QVariant::String);
- addItemInfo(group, "Slant", i18n("Slant"), QVariant::String);
+ addItemInfo(group, "Spacing", i18n("Spacing"), TQVariant::String);
+ addItemInfo(group, "Slant", i18n("Slant"), TQVariant::String);
}
bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
{
- QString full,
+ TQString full,
lastFull,
family,
foundry,
@@ -319,7 +319,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
spacingAll,
slantAll;
KURL url(info.url());
- QString fName;
+ TQString fName;
bool fontsProt = KFI_KIO_FONTS_PROTOCOL == url.protocol(),
fileProt = "file" == url.protocol(),
downloaded = false,
diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.h b/kcontrol/kfontinst/kfile-plugin/KFileFont.h
index b06ab2a57..d33079e0b 100644
--- a/kcontrol/kfontinst/kfile-plugin/KFileFont.h
+++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.h
@@ -39,7 +39,7 @@ class KFileFontPlugin : public KFilePlugin
{
public:
- KFileFontPlugin(QObject *parent, const char *name, const QStringList& args);
+ KFileFontPlugin(TQObject *parent, const char *name, const TQStringList& args);
virtual ~KFileFontPlugin() {}
bool readInfo(KFileMetaInfo& info, uint what = KFileMetaInfo::Fastest);
diff --git a/kcontrol/kfontinst/kfontinst/FontEngine.cpp b/kcontrol/kfontinst/kfontinst/FontEngine.cpp
index ff5dcd623..4fe823c23 100644
--- a/kcontrol/kfontinst/kfontinst/FontEngine.cpp
+++ b/kcontrol/kfontinst/kfontinst/FontEngine.cpp
@@ -35,8 +35,8 @@
#include <stdlib.h>
#include <iostream>
#include <stdio.h>
-#include <qregexp.h>
-#include <qfile.h>
+#include <tqregexp.h>
+#include <tqfile.h>
#include <ft2build.h>
#include FT_SFNT_NAMES_H
#include FT_TRUETYPE_IDS_H
@@ -46,7 +46,7 @@
namespace KFI
{
-bool CFontEngine::openFont(const QString &file, int face)
+bool CFontEngine::openFont(const TQString &file, int face)
{
bool ok=false;
@@ -62,7 +62,7 @@ bool CFontEngine::openFont(const QString &file, int face)
itsItalic=ITALIC_NONE;
itsPath=file;
itsFaceIndex=face;
- itsPsName=QString();
+ itsPsName=TQString();
if(!openFontFt(file) && !itsPsName.isEmpty())
itsType=NONE;
@@ -74,12 +74,12 @@ bool CFontEngine::openFont(const QString &file, int face)
void CFontEngine::closeFont()
{
closeFaceFt();
- itsPath=QString::null;
+ itsPath=TQString::null;
itsFaceIndex=-1;
itsType=NONE;
}
-QString CFontEngine::weightStr(enum EWeight w)
+TQString CFontEngine::weightStr(enum EWeight w)
{
switch(w)
{
@@ -155,12 +155,12 @@ CFontEngine::EWeight CFontEngine::strToWeight(const char *str)
return WEIGHT_MEDIUM; // WEIGHT_UNKNOWN;
}
-static void removeSymbols(QString &str)
+static void removeSymbols(TQString &str)
{
- str.replace(QRegExp("[\\-\\[\\]()]"), " ");
+ str.replace(TQRegExp("[\\-\\[\\]()]"), " ");
int len=str.length();
- QChar space(' ');
+ TQChar space(' ');
for(int c=0; c<len; ++c)
if(str[c].unicode()<0x20 || str[c].unicode()>0x7E)
@@ -210,10 +210,10 @@ static bool lookupName(FT_Face face, int nid, int pid, int eid, FT_SfntName *nam
return false;
}
-static QCString getName(FT_Face face, int nid)
+static TQCString getName(FT_Face face, int nid)
{
FT_SfntName name;
- QCString str;
+ TQCString str;
if(lookupName(face, nid, TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, &name) ||
lookupName(face, nid, TT_PLATFORM_APPLE_UNICODE, -1, &name))
@@ -226,7 +226,7 @@ static QCString getName(FT_Face face, int nid)
return str;
}
-bool CFontEngine::openFontFt(const QString &file)
+bool CFontEngine::openFontFt(const TQString &file)
{
enum ETtfWeight
{
@@ -242,7 +242,7 @@ bool CFontEngine::openFontFt(const QString &file)
TTF_WEIGHT_BLACK = 900 +50
};
- bool status=FT_New_Face(itsFt.library, QFile::encodeName(file), 0, &itsFt.face) ? false : true;
+ bool status=FT_New_Face(itsFt.library, TQFile::encodeName(file), 0, &itsFt.face) ? false : true;
if(status)
itsFt.open=true;
diff --git a/kcontrol/kfontinst/kfontinst/FontEngine.h b/kcontrol/kfontinst/kfontinst/FontEngine.h
index 06218c0ae..c534a5ef5 100644
--- a/kcontrol/kfontinst/kfontinst/FontEngine.h
+++ b/kcontrol/kfontinst/kfontinst/FontEngine.h
@@ -35,8 +35,8 @@
#include <ft2build.h>
#include FT_FREETYPE_H
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
namespace KFI
{
@@ -99,18 +99,18 @@ class CFontEngine
~CFontEngine() { closeFont(); }
static EType getType(const char *fname);
- static QString weightStr(EWeight w);
- static QString italicStr(EItalic i) { return ITALIC_NONE==i ? "r" : ITALIC_ITALIC==i ? "i" : "o"; }
+ static TQString weightStr(EWeight w);
+ static TQString italicStr(EItalic i) { return ITALIC_NONE==i ? "r" : ITALIC_ITALIC==i ? "i" : "o"; }
//
// General functions - these should be used instead of specfic ones below...
//
- bool openFont(const QString &file, int face=0);
+ bool openFont(const TQString &file, int face=0);
void closeFont();
//
- const QString & getFamilyName() { return itsFamily; }
- const QString & getPsName() { return itsPsName; }
+ const TQString & getFamilyName() { return itsFamily; }
+ const TQString & getPsName() { return itsPsName; }
EWeight getWeight() { return itsWeight; }
EItalic getItalic() { return itsItalic; }
EType getType() { return itsType; }
@@ -121,7 +121,7 @@ class CFontEngine
private:
- bool openFontFt(const QString &file);
+ bool openFontFt(const TQString &file);
void closeFaceFt();
private:
@@ -129,7 +129,7 @@ class CFontEngine
EWeight itsWeight;
EType itsType;
EItalic itsItalic;
- QString itsFamily,
+ TQString itsFamily,
itsPsName,
itsPath;
int itsNumFaces,
diff --git a/kcontrol/kfontinst/kfontinst/Fontmap.cpp b/kcontrol/kfontinst/kfontinst/Fontmap.cpp
index 6e0c165e9..476b422bd 100644
--- a/kcontrol/kfontinst/kfontinst/Fontmap.cpp
+++ b/kcontrol/kfontinst/kfontinst/Fontmap.cpp
@@ -32,13 +32,13 @@
#include "FcEngine.h"
#include "KfiConstants.h"
#include <ksavefile.h>
-#include <qtextstream.h>
-#include <qdir.h>
+#include <tqtextstream.h>
+#include <tqdir.h>
#include <ctype.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <qregexp.h>
+#include <tqregexp.h>
#include <fstream>
#include <unistd.h>
@@ -52,7 +52,7 @@ static const char * findSpace(const char *str)
return str;
}
-static bool parseLine(const char *line, QString &ps, QString &fname, bool &isAlias)
+static bool parseLine(const char *line, TQString &ps, TQString &fname, bool &isAlias)
{
static const int constMaxLen = 127;
static const int constFileMaxLen = 1023;
@@ -107,13 +107,13 @@ static bool parseLine(const char *line, QString &ps, QString &fname, bool &isAli
//
// Returns a PS name from an X family name...
// e.g. "Times New Roman" -> "TimesNewRoman"
-static QString createX11PsName(const QString &font)
+static TQString createX11PsName(const TQString &font)
{
- QString newName(font);
+ TQString newName(font);
unsigned int ch;
bool newWord=true;
- newName.replace(QRegExp("\\-"), "_");
+ newName.replace(TQRegExp("\\-"), "_");
for(ch=0; ch<newName.length(); ++ch)
{
@@ -136,7 +136,7 @@ static QString createX11PsName(const QString &font)
}
}
- newName.replace(" ", QString::null);
+ newName.replace(" ", TQString::null);
return newName;
}
@@ -156,10 +156,10 @@ static const char * getItalicStr(KFI::CFontEngine::EItalic it)
//
// Create a full Ps name
-static QString createName(const QString &family, const QString &weight, const char *italic)
+static TQString createName(const TQString &family, const TQString &weight, const char *italic)
{
- QString name;
- QTextOStream str(&name);
+ TQString name;
+ TQTextOStream str(&name);
str << family;
if(!weight.isEmpty() || NULL!=italic)
@@ -174,26 +174,26 @@ static QString createName(const QString &family, const QString &weight, const ch
return name;
}
-static QString getEntry(QStringList &list, const QString &name)
+static TQString getEntry(TQStringList &list, const TQString &name)
{
- QStringList::Iterator it(list.begin()),
+ TQStringList::Iterator it(list.begin()),
end(list.end());
for( ; it!=end; ++it)
if(0==(*it).find('/'+name+' '))
return *it;
- return QString::null;
+ return TQString::null;
}
-inline bool isAlias(const QString &entry)
+inline bool isAlias(const TQString &entry)
{
- return -1==entry.findRev(QRegExp(")\\s*;\\s*$"));
+ return -1==entry.findRev(TQRegExp(")\\s*;\\s*$"));
}
-static void addEntry(QStringList &list, const QString &name, const QString &file, const QString &fmapDir)
+static void addEntry(TQStringList &list, const TQString &name, const TQString &file, const TQString &fmapDir)
{
- QString existing(getEntry(list, name));
+ TQString existing(getEntry(list, name));
bool insert=true;
if(!existing.isEmpty())
@@ -204,8 +204,8 @@ static void addEntry(QStringList &list, const QString &name, const QString &file
if(insert)
{
- QString entry;
- QTextOStream str(&entry);
+ TQString entry;
+ TQTextOStream str(&entry);
str << '/' << name << " (";
@@ -219,16 +219,16 @@ static void addEntry(QStringList &list, const QString &name, const QString &file
}
}
-static void addAliasEntry(QStringList &list, const QString &x11Name, const QString &psName)
+static void addAliasEntry(TQStringList &list, const TQString &x11Name, const TQString &psName)
{
if(x11Name!=psName)
{
- QString existing(getEntry(list, x11Name));
+ TQString existing(getEntry(list, x11Name));
if(existing.isEmpty())
{
- QString entry;
- QTextOStream str(&entry);
+ TQString entry;
+ TQTextOStream str(&entry);
str << '/' << x11Name << " /" << psName << " ;";
list.append(entry);
@@ -236,11 +236,11 @@ static void addAliasEntry(QStringList &list, const QString &x11Name, const QStri
}
}
-static QString locateFile(const char *dir, const char *file, int level=0)
+static TQString locateFile(const char *dir, const char *file, int level=0)
{
if(level<5)
{
- QDir d(dir);
+ TQDir d(dir);
if(d.isReadable())
{
@@ -249,14 +249,14 @@ static QString locateFile(const char *dir, const char *file, int level=0)
if(fList)
{
QFileInfoListIterator it(*fList);
- QFileInfo *fInfo;
- QString str;
+ TQFileInfo *fInfo;
+ TQString str;
for(; NULL!=(fInfo=it.current()); ++it)
if("."!=fInfo->fileName() && ".."!=fInfo->fileName())
if(fInfo->isDir())
{
- if(!(str=locateFile(QFile::encodeName(fInfo->filePath()+"/"), file, level+1)).isEmpty())
+ if(!(str=locateFile(TQFile::encodeName(fInfo->filePath()+"/"), file, level+1)).isEmpty())
return str;
}
else
@@ -266,19 +266,19 @@ static QString locateFile(const char *dir, const char *file, int level=0)
}
}
- return QString::null;
+ return TQString::null;
}
-static QString locateFile(const char *file, const char **dirs)
+static TQString locateFile(const char *file, const char **dirs)
{
int d;
- QString str;
+ TQString str;
for(d=0; dirs[d]; ++d)
if(!(str=locateFile(dirs[d], file)).isEmpty())
return str;
- return QString::null;
+ return TQString::null;
}
#define FONTMAP "Fontmap"
@@ -289,13 +289,13 @@ namespace KFI
namespace Fontmap
{
-bool create(const QString &dir, CFontEngine &fe)
+bool create(const TQString &dir, CFontEngine &fe)
{
bool root(Misc::root()),
added=false;
- QString fmapDir(Misc::dirSyntax(root ? KFI_ROOT_CFG_DIR : dir));
+ TQString fmapDir(Misc::dirSyntax(root ? KFI_ROOT_CFG_DIR : dir));
CFile old(fmapDir);
- QStringList entries;
+ TQStringList entries;
int i;
FcPattern *pat = FcPatternCreate();
FcObjectSet *os = FcObjectSetBuild(FC_FILE, FC_SCALABLE, (void*)0);
@@ -306,13 +306,13 @@ bool create(const QString &dir, CFontEngine &fe)
for (i = 0; i<fs->nfont; i++)
{
- QString fName(Misc::fileSyntax(CFcEngine::getFcString(fs->fonts[i], FC_FILE)));
+ TQString fName(Misc::fileSyntax(CFcEngine::getFcString(fs->fonts[i], FC_FILE)));
FcBool scalable=FcFalse;
if(!fName.isEmpty() && (root || dir.isEmpty() || 0==fName.find(dir)) &&
FcResultMatch==FcPatternGetBool(fs->fonts[i], FC_SCALABLE, 0, &scalable) && scalable)
{
- const QStringList *existing=old.getEntries(fName);
+ const TQStringList *existing=old.getEntries(fName);
if(existing && existing->count())
entries+=(*existing);
@@ -342,7 +342,7 @@ bool create(const QString &dir, CFontEngine &fe)
case CFontEngine::WEIGHT_MEDIUM:
case CFontEngine::WEIGHT_REGULAR:
{
- QString x11Ps(createX11PsName(fe.getFamilyName()));
+ TQString x11Ps(createX11PsName(fe.getFamilyName()));
if(CFontEngine::ITALIC_ITALIC!=fe.getItalic() &&
CFontEngine::ITALIC_OBLIQUE!=fe.getItalic())
@@ -378,11 +378,11 @@ bool create(const QString &dir, CFontEngine &fe)
if(added || entries.count()!=old.getLineCount())
{
KSaveFile out(fmapDir+FONTMAP);
- QTextStream *stream=out.textStream();
+ TQTextStream *stream=out.textStream();
if(stream)
{
- QStringList::Iterator it;
+ TQStringList::Iterator it;
for(it=entries.begin(); it!=entries.end(); ++it)
*stream << *it << endl;
@@ -403,7 +403,7 @@ bool create(const QString &dir, CFontEngine &fe)
NULL
};
- QString gsFile=locateFile(FONTMAP, constGhostscriptDirs);
+ TQString gsFile=locateFile(FONTMAP, constGhostscriptDirs);
if(!gsFile.isEmpty())
{
@@ -411,11 +411,11 @@ bool create(const QString &dir, CFontEngine &fe)
const char *constRLF=".runlibfile";
char line[constMaxLineLen];
- ifstream in(QFile::encodeName(gsFile));
+ ifstream in(TQFile::encodeName(gsFile));
if(in)
{
- QCString fmap(QFile::encodeName(fmapDir+FONTMAP));
+ TQCString fmap(TQFile::encodeName(fmapDir+FONTMAP));
int lineNum=0,
kfiLine=-1,
gsLine=-1,
@@ -492,7 +492,7 @@ bool create(const QString &dir, CFontEngine &fe)
if(added) // Don't re-write GS's Fontmap unless we've actually added something...
{
KSaveFile out(gsFile);
- QTextStream *stream=out.textStream();
+ TQTextStream *stream=out.textStream();
if(stream)
*stream << buffer;
@@ -507,11 +507,11 @@ bool create(const QString &dir, CFontEngine &fe)
return status;
}
-CFile::CFile(const QString &dir)
+CFile::CFile(const TQString &dir)
: itsDir(dir),
itsLineCount(0)
{
- ifstream f(QFile::encodeName(dir+FONTMAP));
+ ifstream f(TQFile::encodeName(dir+FONTMAP));
itsEntries.setAutoDelete(true);
@@ -528,7 +528,7 @@ CFile::CFile(const QString &dir)
if(!f.eof())
{
- QString ps,
+ TQString ps,
fname;
bool isAlias;
@@ -550,14 +550,14 @@ CFile::CFile(const QString &dir)
}
}
-const QStringList * CFile::getEntries(const QString &fname)
+const TQStringList * CFile::getEntries(const TQString &fname)
{
TEntry *entry=findEntry(0==fname.find(itsDir) ? fname.mid(itsDir.length()) : fname, false);
return entry ? &entry->entries : NULL;
}
-CFile::TEntry * CFile::findEntry(const QString &fname, bool isAlias)
+CFile::TEntry * CFile::findEntry(const TQString &fname, bool isAlias)
{
TEntry *entry=NULL;
@@ -568,7 +568,7 @@ CFile::TEntry * CFile::findEntry(const QString &fname, bool isAlias)
return entry;
}
-CFile::TEntry * CFile::getEntry(TEntry **current, const QString &fname, bool isAlias)
+CFile::TEntry * CFile::getEntry(TEntry **current, const TQString &fname, bool isAlias)
{
//
// See if its the current one...
diff --git a/kcontrol/kfontinst/kfontinst/Fontmap.h b/kcontrol/kfontinst/kfontinst/Fontmap.h
index 28d5c9d7e..92d64f5fb 100644
--- a/kcontrol/kfontinst/kfontinst/Fontmap.h
+++ b/kcontrol/kfontinst/kfontinst/Fontmap.h
@@ -29,8 +29,8 @@
// (C) Craig Drummond, 2003, 2004
////////////////////////////////////////////////////////////////////////////////
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
namespace KFI
{
@@ -45,33 +45,33 @@ namespace Fontmap
struct TEntry
{
- TEntry(const QString &fname) : filename(fname) {}
+ TEntry(const TQString &fname) : filename(fname) {}
- QString filename,
+ TQString filename,
psName;
- QStringList entries;
+ TQStringList entries;
};
public:
- CFile(const QString &dir);
+ CFile(const TQString &dir);
- const QStringList * getEntries(const QString &fname);
+ const TQStringList * getEntries(const TQString &fname);
unsigned int getLineCount() { return itsLineCount; }
private:
- TEntry * findEntry(const QString &fname, bool isAlias=false);
- TEntry * getEntry(TEntry **current, const QString &fname, bool isAlias=false);
+ TEntry * findEntry(const TQString &fname, bool isAlias=false);
+ TEntry * getEntry(TEntry **current, const TQString &fname, bool isAlias=false);
private:
- QString itsDir;
- QPtrList<TEntry> itsEntries;
+ TQString itsDir;
+ TQPtrList<TEntry> itsEntries;
unsigned int itsLineCount;
};
- extern bool create(const QString &dir, CFontEngine &fe);
+ extern bool create(const TQString &dir, CFontEngine &fe);
}
}
diff --git a/kcontrol/kfontinst/kfontinst/Main.cpp b/kcontrol/kfontinst/kfontinst/Main.cpp
index 2da9a8997..a2aa5766b 100644
--- a/kcontrol/kfontinst/kfontinst/Main.cpp
+++ b/kcontrol/kfontinst/kfontinst/Main.cpp
@@ -36,7 +36,7 @@
#include "XConfig.h"
#include "kxftconfig.h"
#include <fontconfig/fontconfig.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <stdio.h>
//
@@ -105,8 +105,8 @@ KFI::CXConfig * getXCfg(bool root)
// ...note on some systems (Solaris and HP-UX) only the xfs file will be found
bool xfs=false;
KFI::CXConfig *xcfg=NULL;
- QString xConfigFile=getFile(QFile::encodeName(constXConfigFiles[0]), constXConfigFiles),
- xfsConfigFile=getFile(QFile::encodeName(constXfsConfigFiles[0]), constXfsConfigFiles);
+ TQString xConfigFile=getFile(TQFile::encodeName(constXConfigFiles[0]), constXConfigFiles),
+ xfsConfigFile=getFile(TQFile::encodeName(constXfsConfigFiles[0]), constXfsConfigFiles);
// If found xfs, but not X - then assume that xfs is being used...
if(!xfsConfigFile.isEmpty() && xConfigFile.isEmpty())
@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
usage(argv[0]);
else
{
- QString folder;
+ TQString folder;
if(folderRequired)
{
@@ -261,15 +261,15 @@ int main(int argc, char *argv[])
unsigned int len=folder.length();
// Remove quotes...
- if( (folder[0]==QChar('\'') || folder[0]==QChar('\"')) &&
- (folder[len-1]==QChar('\'') || folder[len-1]==QChar('\"')))
+ if( (folder[0]==TQChar('\'') || folder[0]==TQChar('\"')) &&
+ (folder[len-1]==TQChar('\'') || folder[len-1]==TQChar('\"')))
folder=folder.mid(1, len-2);
folder=KFI::Misc::dirSyntax(folder);
}
if(folderRequired && !KFI::Misc::dExists(folder))
{
- std::cerr << "ERROR: " << QFile::encodeName(folder) << " does not exist!" << std::endl;
+ std::cerr << "ERROR: " << TQFile::encodeName(folder) << " does not exist!" << std::endl;
rv=-2;
}
else
@@ -323,7 +323,7 @@ int main(int argc, char *argv[])
if(0==rv && doGs)
{
KFI::CFontEngine fe;
- rv=KFI::Fontmap::create(root ? QString::null : folder, fe) ? 0 : -6;
+ rv=KFI::Fontmap::create(root ? TQString::null : folder, fe) ? 0 : -6;
}
}
else if(0==rv)
diff --git a/kcontrol/kfontinst/kfontinst/XConfig.cpp b/kcontrol/kfontinst/kfontinst/XConfig.cpp
index aa63e52af..112ab3d3c 100644
--- a/kcontrol/kfontinst/kfontinst/XConfig.cpp
+++ b/kcontrol/kfontinst/kfontinst/XConfig.cpp
@@ -30,11 +30,11 @@
#include "FontEngine.h"
#include "kxftconfig.h"
#include <ksavefile.h>
-#include <qtextstream.h>
+#include <tqtextstream.h>
#include <fstream>
#include <string.h>
-#include <qdir.h>
-#include <qregexp.h>
+#include <tqdir.h>
+#include <tqregexp.h>
#include <klocale.h>
#include <sys/types.h>
#include <signal.h>
@@ -50,7 +50,7 @@ extern "C" unsigned int kfi_getPid(const char *proc, unsigned int ppid);
namespace KFI
{
-CXConfig::CXConfig(EType type, const QString &file)
+CXConfig::CXConfig(EType type, const TQString &file)
: itsType(type),
itsFileName(file),
itsOk(false),
@@ -60,13 +60,13 @@ CXConfig::CXConfig(EType type, const QString &file)
readConfig();
}
-bool CXConfig::configureDir(const QString &dir)
+bool CXConfig::configureDir(const TQString &dir)
{
//
// On systems without mkfontscale, the following will fail, so cant base
// return value upon that - hence only check return value of mkfontdir
- Misc::doCmd("mkfontscale", QFile::encodeName(dir));
- return Misc::doCmd("mkfontdir", QFile::encodeName(dir));
+ Misc::doCmd("mkfontscale", TQFile::encodeName(dir));
+ return Misc::doCmd("mkfontdir", TQFile::encodeName(dir));
}
bool CXConfig::readConfig()
@@ -144,11 +144,11 @@ bool CXConfig::madeChanges()
return false;
}
-void CXConfig::addPath(const QString &dir, bool unscaled)
+void CXConfig::addPath(const TQString &dir, bool unscaled)
{
if(itsWritable)
{
- QString ds(Misc::dirSyntax(dir));
+ TQString ds(Misc::dirSyntax(dir));
if(Misc::dExists(dir))
{
@@ -184,7 +184,7 @@ void CXConfig::refreshPaths(bool xfs)
if(xfsPid)
{
- QString pid;
+ TQString pid;
kill(xfsPid, SIGUSR1);
}
@@ -194,10 +194,10 @@ void CXConfig::refreshPaths(bool xfs)
Misc::doCmd("xset", "fp", "rehash");
}
-CXConfig::TPath * CXConfig::findPath(const QString &dir)
+CXConfig::TPath * CXConfig::findPath(const TQString &dir)
{
TPath *path=NULL;
- QString ds(Misc::dirSyntax(dir));
+ TQString ds(Misc::dirSyntax(dir));
for(path=itsPaths.first(); path; path=itsPaths.next())
if(path->dir==ds)
@@ -206,7 +206,7 @@ CXConfig::TPath * CXConfig::findPath(const QString &dir)
return NULL;
}
-static void processPath(char *str, QString &path, bool &unscaled)
+static void processPath(char *str, TQString &path, bool &unscaled)
{
char *unsc=NULL;
@@ -396,7 +396,7 @@ static char * getItem(char **start, char **end, const char *key, unsigned int &s
bool CXConfig::processX11(bool read)
{
- std::ifstream x11(QFile::encodeName(itsFileName));
+ std::ifstream x11(TQFile::encodeName(itsFileName));
bool ok=false;
if(x11)
@@ -437,7 +437,7 @@ bool CXConfig::processX11(bool read)
while(NULL!=(item=getItem(&pos, &filesEnd, "FontPath", size, !read, buffer)))
if(read) // Then save paths...
{
- QString path;
+ TQString path;
bool unscaled;
processPath(item, path, unscaled);
@@ -487,7 +487,7 @@ bool CXConfig::processX11(bool read)
for(path=itsPaths.first(); path; path=itsPaths.next())
if(TPath::DIR!=path->type || Misc::dExists(path->dir))
{
- QCString cPath(QFile::encodeName(Misc::xDirSyntax(path->dir)));
+ TQCString cPath(TQFile::encodeName(Misc::xDirSyntax(path->dir)));
fputs(" FontPath \t\"", fstream);
fwrite(cPath.data(), 1, cPath.length(), fstream);
@@ -612,7 +612,7 @@ static char * getXfsPath(char *buffer, unsigned int &totalSize, unsigned int off
bool CXConfig::processXfs(bool read)
{
- std::ifstream xfs(QFile::encodeName(itsFileName));
+ std::ifstream xfs(TQFile::encodeName(itsFileName));
bool ok=false;
if(xfs)
@@ -681,7 +681,7 @@ bool CXConfig::processXfs(bool read)
while(NULL!=(path=getXfsPath(cat, size, size-(cat-buffer))))
if(read)
{
- QString str;
+ TQString str;
bool unscaled;
processPath(path, str, unscaled);
@@ -706,7 +706,7 @@ bool CXConfig::processXfs(bool read)
for(p=itsPaths.first(); p; p=itsPaths.next())
if(Misc::dExists(p->dir))
{
- QCString cPath(QFile::encodeName(Misc::xDirSyntax(p->dir)));
+ TQCString cPath(TQFile::encodeName(Misc::xDirSyntax(p->dir)));
if(!first)
{
@@ -744,11 +744,11 @@ bool CXConfig::processXfs(bool read)
}
-CXConfig::TPath::EType CXConfig::TPath::getType(const QString &d)
+CXConfig::TPath::EType CXConfig::TPath::getType(const TQString &d)
{
- QString str(d);
+ TQString str(d);
- str.replace(QRegExp("\\s*"), "");
+ str.replace(TQRegExp("\\s*"), "");
return 0==str.find("unix/:")
? FONT_SERVER
diff --git a/kcontrol/kfontinst/kfontinst/XConfig.h b/kcontrol/kfontinst/kfontinst/XConfig.h
index 5a8ed1624..127b243fa 100644
--- a/kcontrol/kfontinst/kfontinst/XConfig.h
+++ b/kcontrol/kfontinst/kfontinst/XConfig.h
@@ -30,9 +30,9 @@
///////////////////////////////////////////////////////////////////////////////
#include "Misc.h"
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <time.h>
namespace KFI
@@ -53,12 +53,12 @@ class CXConfig
FONT_CONFIG
};
- TPath(const QString &d, bool u=false, EType t=DIR, bool o=true)
+ TPath(const TQString &d, bool u=false, EType t=DIR, bool o=true)
: dir(DIR==t ? Misc::dirSyntax(d) : d), unscaled(u), orig(o), type(t) {}
- static EType getType(const QString &d);
+ static EType getType(const TQString &d);
- QString dir;
+ TQString dir;
bool unscaled,
orig; // Was dir in file when read?
EType type;
@@ -72,16 +72,16 @@ class CXConfig
public:
- CXConfig(EType type, const QString &file);
+ CXConfig(EType type, const TQString &file);
- static bool configureDir(const QString &dir);
+ static bool configureDir(const TQString &dir);
bool ok() { return itsOk; }
bool writable() { return itsWritable; }
bool readConfig();
bool writeConfig();
bool madeChanges();
- void addPath(const QString &dir, bool unscaled=false);
+ void addPath(const TQString &dir, bool unscaled=false);
bool inPath(TPath::EType type);
bool xfsInPath() { return inPath(TPath::FONT_SERVER); }
bool fcInPath() { return inPath(TPath::FONT_CONFIG); }
@@ -96,13 +96,13 @@ class CXConfig
bool processX11(bool read);
bool processXfs(bool read);
- TPath * findPath(const QString &dir);
+ TPath * findPath(const TQString &dir);
private:
EType itsType;
- QPtrList<TPath> itsPaths;
- QString itsFileName,
+ TQPtrList<TPath> itsPaths;
+ TQString itsFileName,
itsInsertPos;
bool itsOk,
itsWritable;
diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp
index e5bc2d6af..ee1d2dc3c 100644
--- a/kcontrol/kfontinst/kio/KioFonts.cpp
+++ b/kcontrol/kfontinst/kio/KioFonts.cpp
@@ -49,13 +49,13 @@
#include <kio/netaccess.h>
#include <kio/slaveinterface.h>
#include <kio/connection.h>
-#include <qtextstream.h>
+#include <tqtextstream.h>
#include <kmimetype.h>
#include <kmessagebox.h>
#include <kprocess.h>
-#include <qdir.h>
-#include <qdatastream.h>
-#include <qregexp.h>
+#include <tqdir.h>
+#include <tqdatastream.h>
+#include <tqregexp.h>
#include <kinstance.h>
#include <klargefile.h>
#include <ktempfile.h>
@@ -76,8 +76,8 @@
#ifdef KFI_FORCE_DEBUG_TO_STDERR
-#include <qtextstream.h>
-QTextOStream ostr(stderr);
+#include <tqtextstream.h>
+TQTextOStream ostr(stderr);
#define KFI_DBUG ostr << "[" << (int)(getpid()) << "] "
#else
@@ -121,32 +121,32 @@ int kdemain(int argc, char **argv)
namespace KFI
{
-inline bool isSysFolder(const QString &sect)
+inline bool isSysFolder(const TQString &sect)
{
return i18n(KFI_KIO_FONTS_SYS)==sect || KFI_KIO_FONTS_SYS==sect;
}
-inline bool isUserFolder(const QString &sect)
+inline bool isUserFolder(const TQString &sect)
{
return i18n(KFI_KIO_FONTS_USER)==sect || KFI_KIO_FONTS_USER==sect;
}
-static QString removeMultipleExtension(const KURL &url)
+static TQString removeMultipleExtension(const KURL &url)
{
- QString fname(url.fileName());
+ TQString fname(url.fileName());
int pos;
- if(-1!=(pos=fname.findRev(QString::fromLatin1(constMultipleExtension))))
+ if(-1!=(pos=fname.findRev(TQString::fromLatin1(constMultipleExtension))))
fname=fname.left(pos);
return fname;
}
-static QString modifyName(const QString &fname)
+static TQString modifyName(const TQString &fname)
{
static const char constSymbols[]={ '-', ' ', ':', 0 };
- QString rv(fname);
+ TQString rv(fname);
int dotPos=rv.findRev('.');
if(-1!=dotPos)
@@ -163,7 +163,7 @@ static QString modifyName(const QString &fname)
return rv;
}
-static int getSize(const QCString &file)
+static int getSize(const TQCString &file)
{
KDE_struct_stat buff;
@@ -185,12 +185,12 @@ static int getSize(const QCString &file)
return -1;
}
-static int getFontSize(const QString &file)
+static int getFontSize(const TQString &file)
{
int size=0;
KURL::List urls;
- QStringList files;
+ TQStringList files;
Misc::getAssociatedUrls(KURL(file), urls);
@@ -205,12 +205,12 @@ static int getFontSize(const QString &file)
files.append((*uIt).path());
}
- QStringList::Iterator it(files.begin()),
+ TQStringList::Iterator it(files.begin()),
end(files.end());
for(; it!=end; ++it)
{
- int s=getSize(QFile::encodeName(*it));
+ int s=getSize(TQFile::encodeName(*it));
if(s>-1)
size+=s;
@@ -219,9 +219,9 @@ static int getFontSize(const QString &file)
return size;
}
-static int getSize(QValueList<FcPattern *> &patterns)
+static int getSize(TQValueList<FcPattern *> &patterns)
{
- QValueList<FcPattern *>::Iterator it,
+ TQValueList<FcPattern *>::Iterator it,
end=patterns.end();
int size=0;
@@ -231,7 +231,7 @@ static int getSize(QValueList<FcPattern *> &patterns)
return size;
}
-static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, const QString &s=QString::null)
+static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s=TQString::null)
{
KIO::UDSAtom atom;
atom.m_uds = ID;
@@ -240,12 +240,12 @@ static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, const QString
entry.append(atom);
}
-static bool createFolderUDSEntry(KIO::UDSEntry &entry, const QString &name, const QString &path, bool sys)
+static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, const TQString &path, bool sys)
{
KFI_DBUG << "createFolderUDSEntry " << name << ' ' << path << ' ' << sys << ' ' << endl;
KDE_struct_stat buff;
- QCString cPath(QFile::encodeName(path));
+ TQCString cPath(TQFile::encodeName(path));
entry.clear();
@@ -262,7 +262,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const QString &name, cons
if(n!= -1)
buffer2[n]='\0';
- addAtom(entry, KIO::UDS_LINK_DEST, 0, QString::fromLocal8Bit(buffer2));
+ addAtom(entry, KIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2));
if(-1==KDE_stat(cPath, &buff))
{
@@ -282,17 +282,17 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const QString &name, cons
addAtom(entry, KIO::UDS_MODIFICATION_TIME, buff.st_mtime);
struct passwd *user = getpwuid(buff.st_uid);
- addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : QString::number(buff.st_uid).latin1());
+ addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1());
struct group *grp = getgrgid(buff.st_gid);
- addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : QString::number(buff.st_gid).latin1());
+ addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime);
addAtom(entry, KIO::UDS_MIME_TYPE, 0, sys
? KFI_KIO_FONTS_PROTOCOL"/system-folder"
: KFI_KIO_FONTS_PROTOCOL"/folder");
addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
- QString url(KFI_KIO_FONTS_PROTOCOL+QString::fromLatin1(":/"));
+ TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
return true;
}
else if (sys && !Misc::root()) // Default system fonts folder does not actually exist yet!
@@ -313,7 +313,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const QString &name, cons
return false;
}
-static bool createFontUDSEntry(KIO::UDSEntry &entry, const QString &name, QValueList<FcPattern *> &patterns, bool sys)
+static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQValueList<FcPattern *> &patterns, bool sys)
{
KFI_DBUG << "createFontUDSEntry " << name << ' ' << patterns.count() << endl;
@@ -331,8 +331,8 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const QString &name, QValue
//
// In case of mixed bitmap/scalable - prefer scalable
- QValueList<FcPattern *> sortedPatterns;
- QValueList<FcPattern *>::Iterator it,
+ TQValueList<FcPattern *> sortedPatterns;
+ TQValueList<FcPattern *>::Iterator it,
end(patterns.end());
FcBool b=FcFalse;
@@ -348,8 +348,8 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const QString &name, QValue
for(it=sortedPatterns.begin(); it!=end; ++it)
{
- QString path(CFcEngine::getFcString(*it, FC_FILE));
- QCString cPath(QFile::encodeName(path));
+ TQString path(CFcEngine::getFcString(*it, FC_FILE));
+ TQCString cPath(TQFile::encodeName(path));
KDE_struct_stat buff;
if(-1!=KDE_lstat(cPath, &buff))
@@ -366,7 +366,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const QString &name, QValue
if(n!= -1)
buffer2[n]='\0';
- addAtom(entry, KIO::UDS_LINK_DEST, 0, QString::fromLocal8Bit(buffer2));
+ addAtom(entry, KIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2));
if(-1==KDE_stat(cPath, &buff))
{
@@ -384,24 +384,24 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const QString &name, QValue
addAtom(entry, KIO::UDS_MODIFICATION_TIME, buff.st_mtime);
struct passwd *user = getpwuid(buff.st_uid);
- addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : QString::number(buff.st_uid).latin1());
+ addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1());
struct group *grp = getgrgid(buff.st_gid);
- addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : QString::number(buff.st_gid).latin1());
+ addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime);
addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name());
addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
- QString url(KFI_KIO_FONTS_PROTOCOL+QString::fromLatin1(":/"));
+ TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
if(!Misc::root())
{
url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER);
- url+=QString::fromLatin1("/");
+ url+=TQString::fromLatin1("/");
}
if(multiple)
- url+=name+QString::fromLatin1(constMultipleExtension);
+ url+=name+TQString::fromLatin1(constMultipleExtension);
else
url+=Misc::getFile(path);
addAtom(entry, KIO::UDS_URL, 0, url);
@@ -423,7 +423,7 @@ static KURL getRedirect(const KURL &u)
// Go from fonts:/System to fonts:/
KURL redirect(u);
- QString path(u.path()),
+ TQString path(u.path()),
sect(CKioFonts::getSect(path));
path.remove(sect);
@@ -439,13 +439,13 @@ static bool nonRootSys(const KURL &u)
return !Misc::root() && isSysFolder(CKioFonts::getSect(u.path()));
}
-static QString getFontFolder(const QString &defaultDir, const QString &root, QStringList &dirs)
+static TQString getFontFolder(const TQString &defaultDir, const TQString &root, TQStringList &dirs)
{
if(dirs.contains(defaultDir))
return defaultDir;
else
{
- QStringList::Iterator it,
+ TQStringList::Iterator it,
end=dirs.end();
bool found=false;
@@ -454,7 +454,7 @@ static QString getFontFolder(const QString &defaultDir, const QString &root, QSt
return *it;
}
- return QString::null;
+ return TQString::null;
}
static bool writeAll(int fd, const char *buf, size_t len)
@@ -479,16 +479,16 @@ static bool checkExt(const char *fname, const char *ext)
: false;
}
-static bool isAAfm(const QString &fname)
+static bool isAAfm(const TQString &fname)
{
- if(checkExt(QFile::encodeName(fname), "afm")) // CPD? Is this a necessary check?
+ if(checkExt(TQFile::encodeName(fname), "afm")) // CPD? Is this a necessary check?
{
- QFile file(fname);
+ TQFile file(fname);
if(file.open(IO_ReadOnly))
{
- QTextStream stream(&file);
- QString line;
+ TQTextStream stream(&file);
+ TQString line;
for(int lc=0; lc<30 && !stream.atEnd(); ++lc)
{
@@ -508,17 +508,17 @@ static bool isAAfm(const QString &fname)
return false;
}
-static bool isAPfm(const QString &fname)
+static bool isAPfm(const TQString &fname)
{
bool ok=false;
// I know extension checking is bad, but Ghostscript's pf2afm requires the pfm file to
// have the .pfm extension...
- if(checkExt(QFile::encodeName(fname), "pfm"))
+ if(checkExt(TQFile::encodeName(fname), "pfm"))
{
//
// OK, the extension matches, so perform a little contents checking...
- FILE *f=fopen(QFile::encodeName(fname).data(), "r");
+ FILE *f=fopen(TQFile::encodeName(fname).data(), "r");
if(f)
{
@@ -561,14 +561,14 @@ static bool isAPfm(const QString &fname)
//
// This function is *only* used for the generation of AFMs from PFMs.
-static bool isAType1(const QString &fname)
+static bool isAType1(const TQString &fname)
{
static const char * constStr="%!PS-AdobeFont-";
static const unsigned int constStrLen=15;
static const unsigned int constPfbOffset=6;
static const unsigned int constPfbLen=constStrLen+constPfbOffset;
- QCString name(QFile::encodeName(fname));
+ TQCString name(TQFile::encodeName(fname));
char buffer[constPfbLen];
bool match=false;
@@ -600,53 +600,53 @@ static bool isAType1(const QString &fname)
return match;
}
-static QString getMatch(const QString &file, const char *extension)
+static TQString getMatch(const TQString &file, const char *extension)
{
- QString f(Misc::changeExt(file, extension));
+ TQString f(Misc::changeExt(file, extension));
- return Misc::fExists(f) ? f : QString::null;
+ return Misc::fExists(f) ? f : TQString::null;
}
inline bool isHidden(const KURL &u)
{
- return QChar('.')==u.fileName()[0];
+ return TQChar('.')==u.fileName()[0];
}
struct FontList
{
struct Path
{
- Path(const QString &p=QString::null) : orig(p) { }
+ Path(const TQString &p=TQString::null) : orig(p) { }
- QString orig,
+ TQString orig,
modified;
bool operator==(const Path &p) const { return p.orig==orig; }
};
- FontList(const QString &n=QString::null, const QString &p=QString::null) : name(n) { if(!p.isEmpty()) paths.append(Path(p)); }
+ FontList(const TQString &n=TQString::null, const TQString &p=TQString::null) : name(n) { if(!p.isEmpty()) paths.append(Path(p)); }
- QString name;
- QValueList<Path> paths;
+ TQString name;
+ TQValueList<Path> paths;
bool operator==(const FontList &f) const { return f.name==name; }
};
//
// This function returns a set of maping of from -> to for copy/move operations
-static bool getFontList(const QStringList &files, QMap<QString, QString> &map)
+static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &map)
{
//
// First of all create a list of font files, and their paths
- QStringList::ConstIterator it=files.begin(),
+ TQStringList::ConstIterator it=files.begin(),
end=files.end();
- QValueList<FontList> list;
+ TQValueList<FontList> list;
for(;it!=end; ++it)
{
- QString name(Misc::getFile(*it)),
+ TQString name(Misc::getFile(*it)),
path(Misc::getDir(*it));
- QValueList<FontList>::Iterator entry=list.find(FontList(name));
+ TQValueList<FontList>::Iterator entry=list.find(FontList(name));
if(entry!=list.end())
{
@@ -657,12 +657,12 @@ static bool getFontList(const QStringList &files, QMap<QString, QString> &map)
list.append(FontList(name, path));
}
- QValueList<FontList>::Iterator fIt(list.begin()),
+ TQValueList<FontList>::Iterator fIt(list.begin()),
fEnd(list.end());
for(; fIt!=fEnd; ++fIt)
{
- QValueList<FontList::Path>::Iterator pBegin((*fIt).paths.begin()),
+ TQValueList<FontList::Path>::Iterator pBegin((*fIt).paths.begin()),
pIt(++pBegin),
pEnd((*fIt).paths.end());
--pBegin;
@@ -705,7 +705,7 @@ static bool getFontList(const QStringList &files, QMap<QString, QString> &map)
return list.count() ? true : false;
}
-CKioFonts::CKioFonts(const QCString &pool, const QCString &app)
+CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app)
: KIO::SlaveBase(KFI_KIO_FONTS_PROTOCOL, pool, app),
itsRoot(Misc::root()),
itsUsingFcFpe(false),
@@ -735,7 +735,7 @@ CKioFonts::CKioFonts(const QCString &pool, const QCString &app)
// 4. If either are not found, then add to local.conf / .fonts.conf
FcStrList *list=FcConfigGetFontDirs(FcInitLoadConfigAndFonts());
- QStringList dirs;
+ TQStringList dirs;
FcChar8 *dir;
while((dir=FcStrListNext(list)))
@@ -745,8 +745,8 @@ CKioFonts::CKioFonts(const QCString &pool, const QCString &app)
if(!itsRoot)
{
- QString home(Misc::dirSyntax(QDir::homeDirPath())),
- defaultDir(Misc::dirSyntax(QDir::homeDirPath()+"/.fonts/")),
+ TQString home(Misc::dirSyntax(TQDir::homeDirPath())),
+ defaultDir(Misc::dirSyntax(TQDir::homeDirPath()+"/.fonts/")),
dir(getFontFolder(defaultDir, home, dirs));
if(dir.isEmpty()) // Then no $HOME/ was found in fontconfigs dirs!
@@ -760,7 +760,7 @@ CKioFonts::CKioFonts(const QCString &pool, const QCString &app)
itsFolders[FOLDER_USER].location=dir;
}
- QString sysDefault("/usr/local/share/fonts/"),
+ TQString sysDefault("/usr/local/share/fonts/"),
sysDir(getFontFolder(sysDefault, "/usr/local/share/", dirs));
if(sysDir.isEmpty())
@@ -804,9 +804,9 @@ CKioFonts::CKioFonts(const QCString &pool, const QCString &app)
}
else
{
- QString str(paths[path]);
+ TQString str(paths[path]);
- str.replace(QRegExp("\\s*"), "");
+ str.replace(TQRegExp("\\s*"), "");
if(0==str.find("unix/:"))
itsUsingXfsFpe=true;
@@ -833,14 +833,14 @@ void CKioFonts::listDir(const KURL &url)
KIO::UDSEntry entry;
int size=0;
- if(itsRoot || QStringList::split('/', url.path(), false).count()!=0)
+ if(itsRoot || TQStringList::split('/', url.path(), false).count()!=0)
{
EFolder folder=getFolder(url);
totalSize(itsFolders[folder].fontMap.count());
if(itsFolders[folder].fontMap.count())
{
- QMap<QString, QValueList<FcPattern *> >::Iterator it=itsFolders[folder].fontMap.begin(),
+ TQMap<TQString, TQValueList<FcPattern *> >::Iterator it=itsFolders[folder].fontMap.begin(),
end=itsFolders[folder].fontMap.end();
for ( ; it != end; ++it)
@@ -874,7 +874,7 @@ void CKioFonts::stat(const KURL &url)
if(updateFontList() && checkUrl(url, true))
{
- QString path(url.path(-1));
+ TQString path(url.path(-1));
if(path.isEmpty())
{
@@ -882,7 +882,7 @@ void CKioFonts::stat(const KURL &url)
return;
}
- QStringList pathList(QStringList::split('/', path, false));
+ TQStringList pathList(TQStringList::split('/', path, false));
KIO::UDSEntry entry;
bool err=false;
@@ -925,7 +925,7 @@ bool CKioFonts::createStatEntry(KIO::UDSEntry &entry, const KURL &url, EFolder f
{
KFI_DBUG << "createStatEntry " << url.path() << endl;
- QMap<QString, QValueList<FcPattern *> >::Iterator it=getMap(url);
+ TQMap<TQString, TQValueList<FcPattern *> >::Iterator it=getMap(url);
if(it!=itsFolders[folder].fontMap.end())
return createFontUDSEntry(entry, it.key(), it.data(), FOLDER_SYS==folder);
@@ -937,7 +937,7 @@ void CKioFonts::get(const KURL &url)
KFI_DBUG << "get " << url.path() << " query:" << url.query() << endl;
bool thumb="1"==metaData("thumbnail");
- QStringList srcFiles;
+ TQStringList srcFiles;
if(updateFontList() && checkUrl(url) && getSourceFiles(url, srcFiles)) // Any error will be logged in getSourceFiles
{
@@ -948,8 +948,8 @@ void CKioFonts::get(const KURL &url)
// read this and just ask Xft/fontconfig for the font data.
if(thumb)
{
- QByteArray array;
- QTextOStream stream(array);
+ TQByteArray array;
+ TQTextOStream stream(array);
emit mimeType("text/plain");
@@ -959,13 +959,13 @@ void CKioFonts::get(const KURL &url)
totalSize(array.size());
data(array);
processedSize(array.size());
- data(QByteArray());
+ data(TQByteArray());
processedSize(array.size());
finished();
return;
}
- QString realPath,
+ TQString realPath,
useMime;
KDE_struct_stat buff;
bool multiple=false;
@@ -982,11 +982,11 @@ void CKioFonts::get(const KURL &url)
if(tar.open(IO_WriteOnly))
{
- QMap<QString, QString> map;
+ TQMap<TQString, TQString> map;
getFontList(srcFiles, map);
- QMap<QString, QString>::Iterator fIt(map.begin()),
+ TQMap<TQString, TQString>::Iterator fIt(map.begin()),
fEnd(map.end());
//
@@ -999,7 +999,7 @@ void CKioFonts::get(const KURL &url)
}
}
- QCString realPathC(QFile::encodeName(realPath));
+ TQCString realPathC(TQFile::encodeName(realPath));
KFI_DBUG << "real: " << realPathC << endl;
if (-2==KDE_stat(realPathC.data(), &buff))
@@ -1024,7 +1024,7 @@ void CKioFonts::get(const KURL &url)
KIO::filesize_t processed=0;
char buffer[MAX_IPC_SIZE];
- QByteArray array;
+ TQByteArray array;
while(1)
{
@@ -1050,7 +1050,7 @@ void CKioFonts::get(const KURL &url)
processedSize(processed);
}
- data(QByteArray());
+ data(TQByteArray());
close(fd);
processedSize(buff.st_size);
@@ -1080,9 +1080,9 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
bool changed=confirmUrl(url),
nrs=nonRootSys(url);
EFolder destFolder(getFolder(url));
- QString dest=itsFolders[destFolder].location+modifyName(url.fileName()),
+ TQString dest=itsFolders[destFolder].location+modifyName(url.fileName()),
passwd;
- QCString destC=QFile::encodeName(dest);
+ TQCString destC=TQFile::encodeName(dest);
KDE_struct_stat buffDest;
bool destExists=(KDE_lstat(destC.data(), &buffDest)!= -1);
@@ -1111,7 +1111,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
// an AFM or PFM file
// 3. If its OK, then get the fonts "name" from
KTempFile tmpFile;
- QCString tmpFileC(QFile::encodeName(tmpFile.name()));
+ TQCString tmpFileC(TQFile::encodeName(tmpFile.name()));
tmpFile.setAutoDelete(true);
@@ -1122,20 +1122,20 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
if(nrs) // Ask root to copy the font...
{
- QCString cmd;
+ TQCString cmd;
if(!Misc::dExists(itsFolders[destFolder].location))
{
cmd+="mkdir ";
- cmd+=QFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
+ cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
cmd+=" && chmod 0755 ";
- cmd+=QFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
+ cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
cmd+=" && ";
}
cmd+="cp -f ";
- cmd+=QFile::encodeName(KProcess::quote(tmpFileC));
+ cmd+=TQFile::encodeName(KProcess::quote(tmpFileC));
cmd+=" ";
- cmd+=QFile::encodeName(KProcess::quote(destC));
+ cmd+=TQFile::encodeName(KProcess::quote(destC));
cmd+=" && chmod 0644 ";
cmd+=destC;
@@ -1177,16 +1177,16 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
}
}
-bool CKioFonts::putReal(const QString &destOrig, const QCString &destOrigC, bool origExists,
+bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bool origExists,
int mode, bool resume)
{
bool markPartial=config()->readBoolEntry("MarkPartial", true);
- QString dest;
+ TQString dest;
if (markPartial)
{
- QString destPart(destOrig+QString::fromLatin1(".part"));
- QCString destPartC(QFile::encodeName(destPart));
+ TQString destPart(destOrig+TQString::fromLatin1(".part"));
+ TQCString destPartC(TQFile::encodeName(destPart));
dest = destPart;
@@ -1218,7 +1218,7 @@ bool CKioFonts::putReal(const QString &destOrig, const QCString &destOrigC, bool
// Catch errors when we try to open the file.
}
- QCString destC(QFile::encodeName(dest));
+ TQCString destC(TQFile::encodeName(dest));
int fd;
@@ -1244,7 +1244,7 @@ bool CKioFonts::putReal(const QString &destOrig, const QCString &destOrigC, bool
// Loop until we got 0 (end of data)
do
{
- QByteArray buffer;
+ TQByteArray buffer;
dataReq(); // Request for data
result = readData(buffer);
@@ -1324,14 +1324,14 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
{
//checkUrl(u) // CPD as per comment in ::put()
- QStringList srcFiles;
+ TQStringList srcFiles;
if(getSourceFiles(src, srcFiles)) // Any error will be logged in getSourceFiles
{
KURL dest(d);
bool changed=confirmUrl(dest);
EFolder destFolder(getFolder(dest));
- QMap<QString, QString> map;
+ TQMap<TQString, TQString> map;
if(!fromFonts)
map[src.path()]=src.fileName();
@@ -1345,28 +1345,28 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
{
if(nonRootSys(dest))
{
- QCString cmd;
+ TQCString cmd;
int size=0;
if(!Misc::dExists(itsFolders[destFolder].location))
{
cmd+="mkdir ";
- cmd+=QFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
+ cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
cmd+=" && chmod 0755 ";
- cmd+=QFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
+ cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
cmd+=" && ";
}
- QMap<QString, QString>::Iterator fIt(map.begin()),
+ TQMap<TQString, TQString>::Iterator fIt(map.begin()),
fEnd(map.end());
for(; fIt!=fEnd; ++fIt)
{
cmd+="cp -f ";
- cmd+=QFile::encodeName(KProcess::quote(fIt.key()));
+ cmd+=TQFile::encodeName(KProcess::quote(fIt.key()));
cmd+=" ";
- cmd+=QFile::encodeName(KProcess::quote(itsFolders[destFolder].location+modifyName(fIt.data())));
- int s=getSize(QFile::encodeName(fIt.key()));
+ cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location+modifyName(fIt.data())));
+ int s=getSize(TQFile::encodeName(fIt.key()));
if(s>0)
size+=s;
if(++fIt!=fEnd)
@@ -1379,7 +1379,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
totalSize(size);
- QString passwd=getRootPasswd();
+ TQString passwd=getRootPasswd();
if(doRootCmd(cmd, passwd))
{
@@ -1396,13 +1396,13 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
}
else
{
- QMap<QString, QString>::Iterator fIt(map.begin()),
+ TQMap<TQString, TQString>::Iterator fIt(map.begin()),
fEnd(map.end());
for(; fIt!=fEnd; ++fIt)
{
- QCString realSrc(QFile::encodeName(fIt.key())),
- realDest(QFile::encodeName(itsFolders[destFolder].location+modifyName(fIt.data())));
+ TQCString realSrc(TQFile::encodeName(fIt.key())),
+ realDest(TQFile::encodeName(itsFolders[destFolder].location+modifyName(fIt.data())));
KDE_struct_stat buffSrc;
if(-1==KDE_stat(realSrc.data(), &buffSrc))
@@ -1437,7 +1437,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
KIO::filesize_t processed = 0;
char buffer[MAX_IPC_SIZE];
- QByteArray array;
+ TQByteArray array;
while(1)
{
@@ -1521,34 +1521,34 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
// Can't rename from/to file:/ -> therefore rename can only be from fonts:/System to fonts:/Personal,
// or vice versa.
- QStringList srcFiles;
+ TQStringList srcFiles;
if(getSourceFiles(src, srcFiles)) // Any error will be logged in getSourceFiles
{
KURL dest(d);
bool changed=confirmUrl(dest);
EFolder destFolder(getFolder(dest));
- QMap<QString, QString> map;
+ TQMap<TQString, TQString> map;
if(confirmMultiple(src, srcFiles, FOLDER_SYS==destFolder ? FOLDER_USER : FOLDER_SYS, OP_MOVE) &&
getFontList(srcFiles, map) &&
checkDestFiles(src, map, dest, destFolder, overwrite))
{
- QMap<QString, QString>::Iterator fIt(map.begin()),
+ TQMap<TQString, TQString>::Iterator fIt(map.begin()),
fEnd(map.end());
bool askPasswd=true,
toSys=FOLDER_SYS==destFolder;
- QCString userId,
+ TQCString userId,
groupId,
- destDir(QFile::encodeName(KProcess::quote(itsFolders[destFolder].location)));
+ destDir(TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location)));
userId.setNum(toSys ? 0 : getuid());
groupId.setNum(toSys ? 0 : getgid());
for(; fIt!=fEnd; ++fIt)
{
- QCString cmd,
- destFile(QFile::encodeName(KProcess::quote(itsFolders[destFolder].location+fIt.data())));
+ TQCString cmd,
+ destFile(TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location+fIt.data())));
if(toSys && !Misc::dExists(itsFolders[destFolder].location))
{
@@ -1558,7 +1558,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
}
cmd+="mv -f ";
- cmd+=QFile::encodeName(KProcess::quote(fIt.key()));
+ cmd+=TQFile::encodeName(KProcess::quote(fIt.key()));
cmd+=" ";
cmd+=destFile;
cmd+=" && chmod -f 0644 ";
@@ -1570,7 +1570,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
cmd+=" ";
cmd+=destFile;
- QString sysDir,
+ TQString sysDir,
userDir;
if(FOLDER_SYS==destFolder)
@@ -1610,28 +1610,28 @@ void CKioFonts::del(const KURL &url, bool)
{
KFI_DBUG << "del " << url.path() << endl;
- QValueList<FcPattern *> *entries;
+ TQValueList<FcPattern *> *entries;
if(checkUrl(url) && checkAllowed(url) &&
updateFontList() && (entries=getEntries(url)) && entries->count() &&
confirmMultiple(url, entries, getFolder(url), OP_DELETE))
{
- QValueList<FcPattern *>::Iterator it,
+ TQValueList<FcPattern *>::Iterator it,
end=entries->end();
CDirList modifiedDirs;
bool clearList=KFI_KIO_NO_CLEAR!=url.query();
if(nonRootSys(url))
{
- QCString cmd("rm -f");
+ TQCString cmd("rm -f");
for(it=entries->begin(); it!=end; ++it)
{
- QString file(CFcEngine::getFcString(*it, FC_FILE));
+ TQString file(CFcEngine::getFcString(*it, FC_FILE));
modifiedDirs.add(Misc::getDir(file));
cmd+=" ";
- cmd+=QFile::encodeName(KProcess::quote(file));
+ cmd+=TQFile::encodeName(KProcess::quote(file));
KURL::List urls;
@@ -1645,7 +1645,7 @@ void CKioFonts::del(const KURL &url, bool)
for(uIt=urls.begin(); uIt!=uEnd; ++uIt)
{
cmd+=" ";
- cmd+=QFile::encodeName(KProcess::quote((*uIt).path()));
+ cmd+=TQFile::encodeName(KProcess::quote((*uIt).path()));
}
}
}
@@ -1662,9 +1662,9 @@ void CKioFonts::del(const KURL &url, bool)
{
for(it=entries->begin(); it!=end; ++it)
{
- QString file(CFcEngine::getFcString(*it, FC_FILE));
+ TQString file(CFcEngine::getFcString(*it, FC_FILE));
- if (0!=unlink(QFile::encodeName(file).data()))
+ if (0!=unlink(TQFile::encodeName(file).data()))
error(EACCES==errno || EPERM==errno
? KIO::ERR_ACCESS_DENIED
: EISDIR==errno
@@ -1685,7 +1685,7 @@ void CKioFonts::del(const KURL &url, bool)
uEnd=urls.end();
for(uIt=urls.begin(); uIt!=uEnd; ++uIt)
- unlink(QFile::encodeName((*uIt).path()).data());
+ unlink(TQFile::encodeName((*uIt).path()).data());
}
}
}
@@ -1732,13 +1732,13 @@ void CKioFonts::modified(EFolder folder, bool clearList, const CDirList &dirs)
clearFontList(); // List of fonts has changed.../
}
-void CKioFonts::special(const QByteArray &a)
+void CKioFonts::special(const TQByteArray &a)
{
KFI_DBUG << "special" << endl;
if(a.size())
{
- QDataStream stream(a, IO_ReadOnly);
+ TQDataStream stream(a, IO_ReadOnly);
int cmd;
stream >> cmd;
@@ -1760,14 +1760,14 @@ void CKioFonts::special(const QByteArray &a)
finished();
break;
default:
- error( KIO::ERR_UNSUPPORTED_ACTION, QString::number(cmd));
+ error( KIO::ERR_UNSUPPORTED_ACTION, TQString::number(cmd));
}
}
else
doModified();
}
-void CKioFonts::createRootRefreshCmd(QCString &cmd, const CDirList &dirs, bool reparseCfg)
+void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool reparseCfg)
{
if(reparseCfg)
reparseConfig();
@@ -1784,7 +1784,7 @@ void CKioFonts::createRootRefreshCmd(QCString &cmd, const CDirList &dirs, bool r
for(; it!=end; ++it)
{
- QCString tmpCmd;
+ TQCString tmpCmd;
if(*it==itsFolders[FOLDER_SYS].location)
{
@@ -1800,7 +1800,7 @@ void CKioFonts::createRootRefreshCmd(QCString &cmd, const CDirList &dirs, bool r
cmd+=" && kfontinst ";
cmd+=tmpCmd;
cmd+=" ";
- cmd+=QFile::encodeName(KProcess::quote(*it));
+ cmd+=TQFile::encodeName(KProcess::quote(*it));
}
}
}
@@ -1809,7 +1809,7 @@ void CKioFonts::createRootRefreshCmd(QCString &cmd, const CDirList &dirs, bool r
cmd+=" && kfontinst ";
cmd+=itsNrsKfiParams;
cmd+=" ";
- cmd+=QFile::encodeName(KProcess::quote(itsFolders[FOLDER_SYS].location));
+ cmd+=TQFile::encodeName(KProcess::quote(itsFolders[FOLDER_SYS].location));
}
}
@@ -1846,7 +1846,7 @@ void CKioFonts::doModified()
for(; it!=end; ++it)
{
- Misc::doCmd("kfontinst", itsKfiParams, QFile::encodeName(*it));
+ Misc::doCmd("kfontinst", itsKfiParams, TQFile::encodeName(*it));
KFI_DBUG << "RUN(root): kfontinst " << itsKfiParams << ' ' << *it << endl;
}
@@ -1859,7 +1859,7 @@ void CKioFonts::doModified()
}
else
{
- QCString cmd;
+ TQCString cmd;
createRootRefreshCmd(cmd, itsFolders[FOLDER_SYS].modified, false);
if(doRootCmd(cmd, false) && itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location))
@@ -1885,7 +1885,7 @@ void CKioFonts::doModified()
for(; it!=end; ++it)
{
- Misc::doCmd("kfontinst", itsKfiParams, QFile::encodeName(*it));
+ Misc::doCmd("kfontinst", itsKfiParams, TQFile::encodeName(*it));
KFI_DBUG << "RUN(non-root): kfontinst " << itsKfiParams << ' ' << *it << endl;
}
}
@@ -1896,14 +1896,14 @@ void CKioFonts::doModified()
}
#define SYS_USER "root"
-QString CKioFonts::getRootPasswd(bool askPasswd)
+TQString CKioFonts::getRootPasswd(bool askPasswd)
{
KFI_DBUG << "getRootPasswd" << endl;
KIO::AuthInfo authInfo;
SuProcess proc(SYS_USER);
bool error=false;
int attempts=0;
- QString errorMsg;
+ TQString errorMsg;
authInfo.url=KURL(KFI_KIO_FONTS_PROTOCOL ":///");
authInfo.username=SYS_USER;
@@ -1923,10 +1923,10 @@ QString CKioFonts::getRootPasswd(bool askPasswd)
}
else
error=proc.checkInstall(authInfo.password.local8Bit()) ? true : false;
- return error ? QString::null : authInfo.password;
+ return error ? TQString::null : authInfo.password;
}
-bool CKioFonts::doRootCmd(const char *cmd, const QString &passwd)
+bool CKioFonts::doRootCmd(const char *cmd, const TQString &passwd)
{
KFI_DBUG << "doRootCmd " << cmd << endl;
@@ -1950,7 +1950,7 @@ bool CKioFonts::confirmUrl(KURL &url)
KFI_DBUG << "confirmUrl " << url.path() << endl;
if(!itsRoot)
{
- QString sect(getSect(url.path()));
+ TQString sect(getSect(url.path()));
if(!isSysFolder(sect) && !isUserFolder(sect))
{
@@ -1971,12 +1971,12 @@ bool CKioFonts::confirmUrl(KURL &url)
if(changeToSystem)
{
itsLastDest=DEST_SYS;
- url.setPath(QChar('/')+i18n(KFI_KIO_FONTS_SYS)+QChar('/')+url.fileName());
+ url.setPath(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+url.fileName());
}
else
{
itsLastDest=DEST_USER;
- url.setPath(QChar('/')+i18n(KFI_KIO_FONTS_USER)+QChar('/')+url.fileName());
+ url.setPath(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+url.fileName());
}
KFI_DBUG << "Changed URL to:" << url.path() << endl;
@@ -2030,25 +2030,25 @@ bool CKioFonts::updateFontList()
if (itsFontList)
{
- QString home(Misc::dirSyntax(QDir::homeDirPath()));
+ TQString home(Misc::dirSyntax(TQDir::homeDirPath()));
for (int i = 0; i < itsFontList->nfont; i++)
{
EFolder folder=FOLDER_SYS;
- QString file(Misc::fileSyntax(CFcEngine::getFcString(itsFontList->fonts[i], FC_FILE)));
+ TQString file(Misc::fileSyntax(CFcEngine::getFcString(itsFontList->fonts[i], FC_FILE)));
if(!file.isEmpty())
{
if(!itsRoot && 0==file.find(home))
folder=FOLDER_USER;
- QValueList<FcPattern *> &patterns=
+ TQValueList<FcPattern *> &patterns=
itsFolders[folder].fontMap[CFcEngine::createName(itsFontList->fonts[i])];
bool use=true;
if(patterns.count()) // Check for duplicates...
{
- QValueList<FcPattern *>::Iterator it,
+ TQValueList<FcPattern *>::Iterator it,
end=patterns.end();
for(it=patterns.begin(); use && it!=end; ++it)
@@ -2076,10 +2076,10 @@ CKioFonts::EFolder CKioFonts::getFolder(const KURL &url)
return itsRoot || isSysFolder(getSect(url.path())) ? FOLDER_SYS : FOLDER_USER;
}
-QMap<QString, QValueList<FcPattern *> >::Iterator CKioFonts::getMap(const KURL &url)
+TQMap<TQString, TQValueList<FcPattern *> >::Iterator CKioFonts::getMap(const KURL &url)
{
EFolder folder(getFolder(url));
- QMap<QString, QValueList<FcPattern *> >::Iterator it=itsFolders[folder].fontMap.find(removeMultipleExtension(url));
+ TQMap<TQString, TQValueList<FcPattern *> >::Iterator it=itsFolders[folder].fontMap.find(removeMultipleExtension(url));
if(it==itsFolders[folder].fontMap.end()) // Perhaps it was fonts:/System/times.ttf ???
{
@@ -2092,9 +2092,9 @@ QMap<QString, QValueList<FcPattern *> >::Iterator CKioFonts::getMap(const KURL &
return it;
}
-QValueList<FcPattern *> * CKioFonts::getEntries(const KURL &url)
+TQValueList<FcPattern *> * CKioFonts::getEntries(const KURL &url)
{
- QMap<QString, QValueList<FcPattern *> >::Iterator it=getMap(url);
+ TQMap<TQString, TQValueList<FcPattern *> >::Iterator it=getMap(url);
if(it!=itsFolders[getFolder(url)].fontMap.end())
return &(it.data());
@@ -2103,14 +2103,14 @@ QValueList<FcPattern *> * CKioFonts::getEntries(const KURL &url)
return NULL;
}
-FcPattern * CKioFonts::getEntry(EFolder folder, const QString &file, bool full)
+FcPattern * CKioFonts::getEntry(EFolder folder, const TQString &file, bool full)
{
- QMap<QString, QValueList<FcPattern *> >::Iterator it,
+ TQMap<TQString, TQValueList<FcPattern *> >::Iterator it,
end=itsFolders[folder].fontMap.end();
for(it=itsFolders[folder].fontMap.begin(); it!=end; ++it)
{
- QValueList<FcPattern *>::Iterator patIt,
+ TQValueList<FcPattern *>::Iterator patIt,
patEnd=it.data().end();
for(patIt=it.data().begin(); patIt!=patEnd; ++patIt)
@@ -2122,9 +2122,9 @@ FcPattern * CKioFonts::getEntry(EFolder folder, const QString &file, bool full)
return NULL;
}
-bool CKioFonts::checkFile(const QString &file)
+bool CKioFonts::checkFile(const TQString &file)
{
- QCString cFile(QFile::encodeName(file));
+ TQCString cFile(TQFile::encodeName(file));
//
// To speed things up, check the files extension 1st...
@@ -2135,7 +2135,7 @@ bool CKioFonts::checkFile(const QString &file)
//
// No exension match, so try querying with FreeType...
int count=0;
- FcPattern *pat=FcFreeTypeQuery((const FcChar8 *)(QFile::encodeName(file).data()), 0, NULL, &count);
+ FcPattern *pat=FcFreeTypeQuery((const FcChar8 *)(TQFile::encodeName(file).data()), 0, NULL, &count);
if(pat)
{
@@ -2148,15 +2148,15 @@ bool CKioFonts::checkFile(const QString &file)
return false;
}
-bool CKioFonts::getSourceFiles(const KURL &src, QStringList &files)
+bool CKioFonts::getSourceFiles(const KURL &src, TQStringList &files)
{
if(KFI_KIO_FONTS_PROTOCOL==src.protocol())
{
- QValueList<FcPattern *> *entries=getEntries(src);
+ TQValueList<FcPattern *> *entries=getEntries(src);
if(entries && entries->count())
{
- QValueList<FcPattern *>::Iterator it,
+ TQValueList<FcPattern *>::Iterator it,
end=entries->end();
for(it=entries->begin(); it!=end; ++it)
@@ -2165,7 +2165,7 @@ bool CKioFonts::getSourceFiles(const KURL &src, QStringList &files)
if(files.count())
{
- QStringList::Iterator sIt,
+ TQStringList::Iterator sIt,
sEnd=files.end();
for(sIt=files.begin(); sIt!=sEnd; ++sIt)
@@ -2195,12 +2195,12 @@ bool CKioFonts::getSourceFiles(const KURL &src, QStringList &files)
if(files.count())
{
- QStringList::Iterator it,
+ TQStringList::Iterator it,
end=files.end();
for(it=files.begin(); it!=end; ++it)
{
- QCString realSrc=QFile::encodeName(*it);
+ TQCString realSrc=TQFile::encodeName(*it);
KDE_struct_stat buffSrc;
if (-1==KDE_stat(realSrc.data(), &buffSrc))
@@ -2241,7 +2241,7 @@ bool CKioFonts::checkDestFile(const KURL &src, const KURL &dest, EFolder destFol
return true;
}
-bool CKioFonts::checkDestFiles(const KURL &src, QMap<QString, QString> &map, const KURL &dest, EFolder destFolder, bool overwrite)
+bool CKioFonts::checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map, const KURL &dest, EFolder destFolder, bool overwrite)
{
//
// Check whether files exist at destination...
@@ -2256,7 +2256,7 @@ bool CKioFonts::checkDestFiles(const KURL &src, QMap<QString, QString> &map, con
if(!overwrite)
{
- QMap<QString, QString>::Iterator fIt(map.begin()),
+ TQMap<TQString, TQString>::Iterator fIt(map.begin()),
fEnd(map.end());
for(; fIt!=fEnd; ++fIt)
@@ -2273,14 +2273,14 @@ bool CKioFonts::checkDestFiles(const KURL &src, QMap<QString, QString> &map, con
//
// Gather the number and names of the font faces located in "files". If there is more than 1 face
// (such as there would be for a TTC font), then ask the user for confirmation of the action.
-bool CKioFonts::confirmMultiple(const KURL &url, const QStringList &files, EFolder folder, EOp op)
+bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFolder folder, EOp op)
{
if(KFI_KIO_FONTS_PROTOCOL!=url.protocol())
return true;
- QStringList::ConstIterator it,
+ TQStringList::ConstIterator it,
end=files.end();
- QStringList fonts;
+ TQStringList fonts;
for(it=files.begin(); it!=files.end(); ++it)
{
@@ -2288,7 +2288,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, const QStringList &files, EFold
if(pat)
{
- QString name(CFcEngine::createName(pat));
+ TQString name(CFcEngine::createName(pat));
if(-1==fonts.findIndex(name))
fonts.append(name);
@@ -2297,12 +2297,12 @@ bool CKioFonts::confirmMultiple(const KURL &url, const QStringList &files, EFold
if(fonts.count()>1)
{
- QString out;
- QStringList::Iterator it,
+ TQString out;
+ TQStringList::Iterator it,
end=fonts.end();
for(it=fonts.begin(); it!=end; ++it)
- out+=QString("<li>")+*it+QString("</li>");
+ out+=TQString("<li>")+*it+TQString("</li>");
if(KMessageBox::No==messageBox(QuestionYesNo,
OP_MOVE==op
@@ -2328,16 +2328,16 @@ bool CKioFonts::confirmMultiple(const KURL &url, const QStringList &files, EFold
return true;
}
-bool CKioFonts::confirmMultiple(const KURL &url, QValueList<FcPattern *> *patterns, EFolder folder, EOp op)
+bool CKioFonts::confirmMultiple(const KURL &url, TQValueList<FcPattern *> *patterns, EFolder folder, EOp op)
{
if(KFI_KIO_FONTS_PROTOCOL!=url.protocol())
return true;
- QStringList files;
+ TQStringList files;
if(patterns && patterns->count())
{
- QValueList<FcPattern *>::Iterator it,
+ TQValueList<FcPattern *>::Iterator it,
end=patterns->end();
for(it=patterns->begin(); it!=end; ++it)
@@ -2351,7 +2351,7 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk)
{
if(KFI_KIO_FONTS_PROTOCOL==u.protocol() && (!rootOk || (rootOk && "/"!=u.path())))
{
- QString sect(getSect(u.path()));
+ TQString sect(getSect(u.path()));
if(itsRoot)
{
@@ -2381,12 +2381,12 @@ bool CKioFonts::checkAllowed(const KURL &u)
{
if (KFI_KIO_FONTS_PROTOCOL==u.protocol())
{
- QString ds(Misc::dirSyntax(u.path()));
+ TQString ds(Misc::dirSyntax(u.path()));
- if(ds==QString(QChar('/')+i18n(KFI_KIO_FONTS_USER)+QChar('/')) ||
- ds==QString(QChar('/')+i18n(KFI_KIO_FONTS_SYS)+QChar('/')) ||
- ds==QString(QChar('/')+QString::fromLatin1(KFI_KIO_FONTS_USER)+QChar('/')) ||
- ds==QString(QChar('/')+QString::fromLatin1(KFI_KIO_FONTS_SYS)+QChar('/')))
+ if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) ||
+ ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) ||
+ ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
+ ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/')))
{
error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".")
.arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \
@@ -2399,7 +2399,7 @@ bool CKioFonts::checkAllowed(const KURL &u)
//
// Create an AFM from a Type 1 (pfa/pfb) font and its PFM file...
-void CKioFonts::createAfm(const QString &file, bool nrs, const QString &passwd)
+void CKioFonts::createAfm(const TQString &file, bool nrs, const TQString &passwd)
{
if(nrs && passwd.isEmpty())
return;
@@ -2409,12 +2409,12 @@ void CKioFonts::createAfm(const QString &file, bool nrs, const QString &passwd)
if(type1 || pfm)
{
- QString afm=getMatch(file, "afm"); // pf2afm wants files with lowercase extension, so just check for lowercase!
+ TQString afm=getMatch(file, "afm"); // pf2afm wants files with lowercase extension, so just check for lowercase!
// -- when a font is installed, the extensio is converted to lowercase anyway...
if(afm.isEmpty()) // No point creating if AFM already exists!
{
- QString pfm,
+ TQString pfm,
t1;
if(type1) // Its a Type1, so look for existing PFM
@@ -2432,16 +2432,16 @@ void CKioFonts::createAfm(const QString &file, bool nrs, const QString &passwd)
if(!t1.isEmpty() && !pfm.isEmpty()) // Do we have both Type1 and PFM?
{
- QString name(t1.left(t1.length()-4)); // pf2afm wants name without extension...
+ TQString name(t1.left(t1.length()-4)); // pf2afm wants name without extension...
if(nrs)
{
- QCString cmd("pf2afm ");
- cmd+=QFile::encodeName(KProcess::quote(name));
+ TQCString cmd("pf2afm ");
+ cmd+=TQFile::encodeName(KProcess::quote(name));
doRootCmd(cmd, passwd);
}
else
- Misc::doCmd("pf2afm", QFile::encodeName(name));
+ Misc::doCmd("pf2afm", TQFile::encodeName(name));
}
}
}
diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h
index abfd6b042..57dc8516a 100644
--- a/kcontrol/kfontinst/kio/KioFonts.h
+++ b/kcontrol/kfontinst/kio/KioFonts.h
@@ -34,10 +34,10 @@
#include <kio/slavebase.h>
#include <kurl.h>
#include <klocale.h>
-#include <qstring.h>
-#include <qcstring.h>
-#include <qmap.h>
-#include <qvaluelist.h>
+#include <tqstring.h>
+#include <tqcstring.h>
+#include <tqmap.h>
+#include <tqvaluelist.h>
#include "Misc.h"
#include "KfiConstants.h"
@@ -80,24 +80,24 @@ class CKioFonts : public KIO::SlaveBase
public:
CDirList() { }
- CDirList(const QString &str) : QStringList(str) { }
+ CDirList(const TQString &str) : TQStringList(str) { }
- void add(const QString &d) { if (!contains(d)) append(d); }
+ void add(const TQString &d) { if (!contains(d)) append(d); }
};
struct TFolder
{
- QString location;
+ TQString location;
CDirList modified;
- QMap<QString, QValueList<FcPattern *> > fontMap; // Maps from "Times New Roman" -> $HOME/.fonts/times.ttf
+ TQMap<TQString, TQValueList<FcPattern *> > fontMap; // Maps from "Times New Roman" -> $HOME/.fonts/times.ttf
};
public:
- CKioFonts(const QCString &pool, const QCString &app);
+ CKioFonts(const TQCString &pool, const TQCString &app);
virtual ~CKioFonts();
- static QString getSect(const QString &f) { return f.section('/', 1, 1); }
+ static TQString getSect(const TQString &f) { return f.section('/', 1, 1); }
void listDir(const KURL &url);
void stat(const KURL &url);
@@ -110,30 +110,30 @@ class CKioFonts : public KIO::SlaveBase
private:
- bool putReal(const QString &destOrig, const QCString &destOrigC, bool origExists, int mode, bool resume);
+ bool putReal(const TQString &destOrig, const TQCString &destOrigC, bool origExists, int mode, bool resume);
void modified(EFolder folder, bool clearList=true, const CDirList &dirs=CDirList());
- void special(const QByteArray &a);
- void createRootRefreshCmd(QCString &cmd, const CDirList &dirs=CDirList(), bool reparseCfg=true);
+ void special(const TQByteArray &a);
+ void createRootRefreshCmd(TQCString &cmd, const CDirList &dirs=CDirList(), bool reparseCfg=true);
void doModified();
- QString getRootPasswd(bool askPasswd=true);
- bool doRootCmd(const char *cmd, const QString &passwd);
+ TQString getRootPasswd(bool askPasswd=true);
+ bool doRootCmd(const char *cmd, const TQString &passwd);
bool doRootCmd(const char *cmd, bool askPasswd=true) { return doRootCmd(cmd, getRootPasswd(askPasswd)); }
bool confirmUrl(KURL &url);
void clearFontList();
bool updateFontList();
EFolder getFolder(const KURL &url);
- QMap<QString, QValueList<FcPattern *> >::Iterator getMap(const KURL &url);
- QValueList<FcPattern *> * getEntries(const KURL &url);
- FcPattern * getEntry(EFolder folder, const QString &file, bool full=false);
- bool checkFile(const QString &file);
- bool getSourceFiles(const KURL &src, QStringList &files);
+ TQMap<TQString, TQValueList<FcPattern *> >::Iterator getMap(const KURL &url);
+ TQValueList<FcPattern *> * getEntries(const KURL &url);
+ FcPattern * getEntry(EFolder folder, const TQString &file, bool full=false);
+ bool checkFile(const TQString &file);
+ bool getSourceFiles(const KURL &src, TQStringList &files);
bool checkDestFile(const KURL &src, const KURL &dest, EFolder destFolder, bool overwrite);
- bool checkDestFiles(const KURL &src, QMap<QString, QString> &map, const KURL &dest, EFolder destFolder, bool overwrite);
- bool confirmMultiple(const KURL &url, const QStringList &files, EFolder folder, EOp op);
- bool confirmMultiple(const KURL &url, QValueList<FcPattern *> *patterns, EFolder folder, EOp op);
+ bool checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map, const KURL &dest, EFolder destFolder, bool overwrite);
+ bool confirmMultiple(const KURL &url, const TQStringList &files, EFolder folder, EOp op);
+ bool confirmMultiple(const KURL &url, TQValueList<FcPattern *> *patterns, EFolder folder, EOp op);
bool checkUrl(const KURL &u, bool rootOk=false);
bool checkAllowed(const KURL &u);
- void createAfm(const QString &file, bool nrs=false, const QString &passwd=QString::null);
+ void createAfm(const TQString &file, bool nrs=false, const TQString &passwd=TQString::null);
void reparseConfig();
private:
@@ -144,7 +144,7 @@ class CKioFonts : public KIO::SlaveBase
itsUsingXfsFpe,
itsHasSys,
itsAddToSysFc;
- QString itsPasswd;
+ TQString itsPasswd;
unsigned int itsFontChanges;
EDest itsLastDest;
time_t itsLastDestTime,
diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp
index 0b3e51767..44d180fd2 100644
--- a/kcontrol/kfontinst/lib/FcEngine.cpp
+++ b/kcontrol/kfontinst/lib/FcEngine.cpp
@@ -1,8 +1,8 @@
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qfontmetrics.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqfontmetrics.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <kurl.h>
#include <kconfig.h>
#include <kglobalsettings.h>
@@ -23,7 +23,7 @@
#define KFI_PREVIEW_STRING_KEY "String"
#ifdef HAVE_XFT
-#define KFI_DISPLAY(pix) (pix ? pix->x11Display() : QPaintDevice::x11AppDisplay())
+#define KFI_DISPLAY(pix) (pix ? pix->x11Display() : TQPaintDevice::x11AppDisplay())
#endif
namespace KFI
@@ -73,25 +73,25 @@ static int fcToQtWeight(int weight)
case FC_WEIGHT_THIN:
return 0;
case FC_WEIGHT_ULTRALIGHT:
- return QFont::Light>>1;
+ return TQFont::Light>>1;
case FC_WEIGHT_LIGHT:
- return QFont::Light;
+ return TQFont::Light;
default:
case FC_WEIGHT_NORMAL:
- return QFont::Normal;
+ return TQFont::Normal;
case FC_WEIGHT_MEDIUM:
#ifdef KFI_HAVE_MEDIUM_WEIGHT
- return (QFont::Normal+QFont::DemiBold)>>1;
+ return (TQFont::Normal+TQFont::DemiBold)>>1;
#endif
- return QFont::Normal;
+ return TQFont::Normal;
case FC_WEIGHT_SEMIBOLD:
- return QFont::DemiBold;
+ return TQFont::DemiBold;
case FC_WEIGHT_BOLD:
- return QFont::Bold;
+ return TQFont::Bold;
case FC_WEIGHT_ULTRABOLD:
- return (QFont::Bold+QFont::Black)>>1;
+ return (TQFont::Bold+TQFont::Black)>>1;
case FC_WEIGHT_HEAVY:
- return QFont::Black;
+ return TQFont::Black;
}
}
@@ -130,24 +130,24 @@ static int fcToQtWidth(int weight)
switch(weight)
{
case FC_WIDTH_ULTRACONDENSED:
- return QFont::UltraCondensed;
+ return TQFont::UltraCondensed;
case FC_WIDTH_EXTRACONDENSED:
- return QFont::ExtraCondensed;
+ return TQFont::ExtraCondensed;
case FC_WIDTH_CONDENSED:
- return QFont::Condensed;
+ return TQFont::Condensed;
case FC_WIDTH_SEMICONDENSED:
- return QFont::SemiCondensed;
+ return TQFont::SemiCondensed;
default:
case FC_WIDTH_NORMAL:
- return QFont::Unstretched;
+ return TQFont::Unstretched;
case FC_WIDTH_SEMIEXPANDED:
- return QFont::SemiExpanded;
+ return TQFont::SemiExpanded;
case FC_WIDTH_EXPANDED:
- return QFont::Expanded;
+ return TQFont::Expanded;
case FC_WIDTH_EXTRAEXPANDED:
- return QFont::ExtraExpanded;
+ return TQFont::ExtraExpanded;
case FC_WIDTH_ULTRAEXPANDED:
- return QFont::UltraExpanded;
+ return TQFont::UltraExpanded;
}
}
#endif
@@ -183,7 +183,7 @@ static int fcSpacing(int spacing)
return FC_CHARCELL;
}
-static int strToWeight(const QString &str, QString &newStr)
+static int strToWeight(const TQString &str, TQString &newStr)
{
if(0==str.find(i18n(KFI_WEIGHT_THIN), 0, false))
{
@@ -261,7 +261,7 @@ static int strToWeight(const QString &str, QString &newStr)
}
#ifndef KFI_FC_NO_WIDTHS
-static int strToWidth(const QString &str, QString &newStr)
+static int strToWidth(const TQString &str, TQString &newStr)
{
if(0==str.find(i18n(KFI_WIDTH_ULTRACONDENSED), 0, false))
{
@@ -314,7 +314,7 @@ static int strToWidth(const QString &str, QString &newStr)
}
#endif
-static int strToSlant(const QString &str)
+static int strToSlant(const TQString &str)
{
if(-1!=str.find(i18n(KFI_SLANT_ITALIC)))
return FC_SLANT_ITALIC;
@@ -323,9 +323,9 @@ static int strToSlant(const QString &str)
return FC_SLANT_ROMAN;
}
-static void drawText(QPainter &painter, int x, int y, int width, const QString &str)
+static void drawText(TQPainter &painter, int x, int y, int width, const TQString &str)
{
- QString s(str);
+ TQString s(str);
bool addedElipses=false;
width-=x*2;
@@ -366,7 +366,7 @@ inline bool equalSlant(int a, int b)
}
#ifdef HAVE_XFT
-static bool drawChar(QPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor *xftCol, const QString &text, int pos,
+static bool drawChar(TQPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor *xftCol, const TQString &text, int pos,
int &x, int &y, int w, int h, int fSize, int offset)
{
XGlyphInfo extents;
@@ -389,7 +389,7 @@ static bool drawChar(QPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor
return false;
}
-static bool drawString(QPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor *xftCol, const QString &text,
+static bool drawString(TQPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor *xftCol, const TQString &text,
int x, int &y, int h, int offset)
{
XGlyphInfo extents;
@@ -406,7 +406,7 @@ static bool drawString(QPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColo
return false;
}
-static bool drawGlyph(QPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor *xftCol, FT_UInt i,
+static bool drawGlyph(TQPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor *xftCol, FT_UInt i,
int &x, int &y, int &w, int &h, int fSize, int offset)
{
XGlyphInfo extents;
@@ -430,10 +430,10 @@ static bool drawGlyph(QPixmap &pix, XftDraw *xftDraw, XftFont *xftFont, XftColor
inline int point2Pixel(int point)
{
- return (point*QPaintDevice::x11AppDpiX()+36)/72;
+ return (point*TQPaintDevice::x11AppDpiX()+36)/72;
}
-static bool hasStr(XftFont *font, QString &str)
+static bool hasStr(XftFont *font, TQString &str)
{
unsigned int slen=str.length(),
ch;
@@ -457,7 +457,7 @@ CFcEngine::~CFcEngine()
FcConfigAppFontClear(FcConfigGetCurrent());
}
-QString CFcEngine::getName(const KURL &url, int faceNo)
+TQString CFcEngine::getName(const KURL &url, int faceNo)
{
if(url!=itsLastUrl || faceNo!=itsIndex)
parseUrl(url, faceNo);
@@ -466,7 +466,7 @@ QString CFcEngine::getName(const KURL &url, int faceNo)
}
#ifdef HAVE_XFT
-bool CFcEngine::draw(const KURL &url, int w, int h, QPixmap &pix, int faceNo, bool thumb)
+bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, bool thumb)
{
bool rv=false;
@@ -493,7 +493,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, QPixmap &pix, int faceNo, bo
pix.resize(w, h);
pix.fill(Qt::white);
- QPainter painter(&pix);
+ TQPainter painter(&pix);
getSizes(&pix);
@@ -519,7 +519,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, QPixmap &pix, int faceNo, bo
if(thumb)
{
- QString text(i18n("AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789"));
+ TQString text(i18n("AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789"));
//
// Calculate size of text...
@@ -569,7 +569,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, QPixmap &pix, int faceNo, bo
}
else
{
- QString lowercase(getLowercaseLetters()),
+ TQString lowercase(getLowercaseLetters()),
uppercase(getUppercaseLetters()),
punctuation(getPunctuation()),
title(itsDescriptiveName.isEmpty()
@@ -614,7 +614,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, QPixmap &pix, int faceNo, bo
y+=8;
}
- QString previewString(getPreviewString());
+ TQString previewString(getPreviewString());
bool stop=false;
if(!drawGlyphs)
@@ -685,20 +685,20 @@ bool CFcEngine::draw(const KURL &url, int w, int h, QPixmap &pix, int faceNo, bo
}
#endif
-QString CFcEngine::getPreviewString()
+TQString CFcEngine::getPreviewString()
{
KConfig cfg(KFI_UI_CFG_FILE);
cfg.setGroup(KFI_PREVIEW_GROUP);
- QString str(cfg.readEntry(KFI_PREVIEW_STRING_KEY));
+ TQString str(cfg.readEntry(KFI_PREVIEW_STRING_KEY));
return str.isEmpty() ? i18n("A sentence that uses all of the letters of the alphabet",
"The quick brown fox jumps over the lazy dog")
: str;
}
-void CFcEngine::setPreviewString(const QString &str)
+void CFcEngine::setPreviewString(const TQString &str)
{
KConfig cfg(KFI_UI_CFG_FILE);
@@ -706,36 +706,36 @@ void CFcEngine::setPreviewString(const QString &str)
cfg.writeEntry(KFI_PREVIEW_STRING_KEY, str);
}
-QString CFcEngine::getUppercaseLetters()
+TQString CFcEngine::getUppercaseLetters()
{
return i18n("All of the letters of the alphabet, uppercase", "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
}
-QString CFcEngine::getLowercaseLetters()
+TQString CFcEngine::getLowercaseLetters()
{
return i18n("All of the letters of the alphabet, lowercase", "abcdefghijklmnopqrstuvwxyz");
}
-QString CFcEngine::getPunctuation()
+TQString CFcEngine::getPunctuation()
{
return i18n("Numbers and characters", "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]");
}
-QString CFcEngine::getFcString(FcPattern *pat, const char *val, int faceNo)
+TQString CFcEngine::getFcString(FcPattern *pat, const char *val, int faceNo)
{
- QString rv;
+ TQString rv;
FcChar8 *fcStr;
if(FcResultMatch==FcPatternGetString(pat, val, faceNo, &fcStr))
- rv=QString::fromUtf8((char *)fcStr);
+ rv=TQString::fromUtf8((char *)fcStr);
return rv;
}
-QString CFcEngine::createName(FcPattern *pat, int faceNo)
+TQString CFcEngine::createName(FcPattern *pat, int faceNo)
{
//CPD: TODO: the names *need* to match up with kfontchooser's...
- QString name(getFcString(pat, FC_FAMILY, faceNo)),
+ TQString name(getFcString(pat, FC_FAMILY, faceNo)),
str;
int intVal;
bool comma=false;
@@ -745,7 +745,7 @@ QString CFcEngine::createName(FcPattern *pat, int faceNo)
str=weightStr(intVal);
if(!str.isEmpty())
{
- name+=QString(", ")+str;
+ name+=TQString(", ")+str;
comma=true;
}
}
@@ -757,10 +757,10 @@ QString CFcEngine::createName(FcPattern *pat, int faceNo)
{
if(!comma)
{
- name+=QChar(',');
+ name+=TQChar(',');
comma=true;
}
- name+=QChar(' ')+str;
+ name+=TQChar(' ')+str;
}
}
@@ -769,14 +769,14 @@ QString CFcEngine::createName(FcPattern *pat, int faceNo)
{
str=widthStr(intVal);
if(!str.isEmpty())
- name+=QChar(' ')+str;
+ name+=TQChar(' ')+str;
}
#endif
return name;
}
-QString CFcEngine::weightStr(int weight, bool emptyNormal)
+TQString CFcEngine::weightStr(int weight, bool emptyNormal)
{
switch(fcWeight(weight))
{
@@ -787,7 +787,7 @@ QString CFcEngine::weightStr(int weight, bool emptyNormal)
case FC_WEIGHT_LIGHT:
return i18n(KFI_WEIGHT_LIGHT);
case FC_WEIGHT_NORMAL:
- return emptyNormal ? QString::null : i18n(KFI_WEIGHT_NORMAL);
+ return emptyNormal ? TQString::null : i18n(KFI_WEIGHT_NORMAL);
case FC_WEIGHT_MEDIUM:
return i18n(KFI_WEIGHT_MEDIUM);
case FC_WEIGHT_DEMIBOLD:
@@ -802,7 +802,7 @@ QString CFcEngine::weightStr(int weight, bool emptyNormal)
}
#ifndef KFI_FC_NO_WIDTHS
-QString CFcEngine::widthStr(int width, bool emptyNormal)
+TQString CFcEngine::widthStr(int width, bool emptyNormal)
{
switch(fcWidth(width))
{
@@ -815,7 +815,7 @@ QString CFcEngine::widthStr(int width, bool emptyNormal)
case FC_WIDTH_SEMICONDENSED:
return i18n(KFI_WIDTH_SEMICONDENSED);
case FC_WIDTH_NORMAL:
- return emptyNormal ? QString::null : i18n(KFI_WIDTH_NORMAL);
+ return emptyNormal ? TQString::null : i18n(KFI_WIDTH_NORMAL);
case FC_WIDTH_SEMIEXPANDED:
return i18n(KFI_WIDTH_SEMIEXPANDED);
case FC_WIDTH_EXPANDED:
@@ -828,7 +828,7 @@ QString CFcEngine::widthStr(int width, bool emptyNormal)
}
#endif
-QString CFcEngine::slantStr(int slant, bool emptyNormal)
+TQString CFcEngine::slantStr(int slant, bool emptyNormal)
{
switch(fcSlant(slant))
{
@@ -837,11 +837,11 @@ QString CFcEngine::slantStr(int slant, bool emptyNormal)
case FC_SLANT_ITALIC:
return i18n(KFI_SLANT_ITALIC);
default:
- return emptyNormal ? QString::null : i18n(KFI_SLANT_ROMAN);
+ return emptyNormal ? TQString::null : i18n(KFI_SLANT_ROMAN);
}
}
-QString CFcEngine::spacingStr(int spacing)
+TQString CFcEngine::spacingStr(int spacing)
{
switch(fcSpacing(spacing))
{
@@ -854,11 +854,11 @@ QString CFcEngine::spacingStr(int spacing)
}
}
-bool CFcEngine::getInfo(const KURL &url, int faceNo, QString &full, QString &family, QString &foundry, QString &weight,
+bool CFcEngine::getInfo(const KURL &url, int faceNo, TQString &full, TQString &family, TQString &foundry, TQString &weight,
#ifndef KFI_FC_NO_WIDTHS
- QString &width,
+ TQString &width,
#endif
- QString &spacing, QString &slant)
+ TQString &spacing, TQString &slant)
{
if(parseUrl(url, faceNo, true))
{
@@ -887,11 +887,11 @@ bool CFcEngine::getInfo(const KURL &url, int faceNo, QString &full, QString &fam
return false;
}
-QFont CFcEngine::getQFont(const QString &name, int size)
+TQFont CFcEngine::getQFont(const TQString &name, int size)
{
parseName(name, 0, false);
- QFont font(itsName, size, fcToQtWeight(itsWeight), fcToQtSlant(itsSlant));
+ TQFont font(itsName, size, fcToQtWeight(itsWeight), fcToQtSlant(itsSlant));
#ifndef KFI_FC_NO_WIDTHS
font.setStretch(fcToQtWidth(itsWidth));
@@ -912,7 +912,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all)
if(KFI_KIO_FONTS_PROTOCOL==url.protocol())
{
KIO::UDSEntry udsEntry;
- QString name;
+ TQString name;
FcInitReinitialize();
if(KIO::NetAccess::stat(url, udsEntry, NULL)) // Need to stat the url to get its font name...
@@ -939,13 +939,13 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all)
else if(url.isLocalFile())
{
// Now lets see if its from the thumbnail job! if so, then file will just contain the URL!
- QFile file(url.path());
+ TQFile file(url.path());
bool isThumbnailUrl=false;
if(file.size()<2048 && file.open(IO_ReadOnly)) // Urls should be less than 2k, and fonts usually above!
{
- QString thumbUrl;
- QTextStream stream(&file);
+ TQString thumbUrl;
+ TQTextStream stream(&file);
thumbUrl=stream.readLine();
isThumbnailUrl=0==thumbUrl.find(KFI_KIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all);
@@ -957,7 +957,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all)
itsName=url.path();
int count;
- FcPattern *pat=FcFreeTypeQuery((const FcChar8 *)(QFile::encodeName(itsName).data()), 0, NULL, &count);
+ FcPattern *pat=FcFreeTypeQuery((const FcChar8 *)(TQFile::encodeName(itsName).data()), 0, NULL, &count);
itsWeight=FC_WEIGHT_NORMAL;
#ifndef KFI_FC_NO_WIDTHS
@@ -984,7 +984,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all)
FcPatternDestroy(pat);
}
else
- itsDescriptiveName=QString::null;
+ itsDescriptiveName=TQString::null;
itsInstalled=false;
itsIndex=faceNo;
@@ -997,7 +997,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all)
return true;
}
-void CFcEngine::parseName(const QString &name, int faceNo, bool all)
+void CFcEngine::parseName(const TQString &name, int faceNo, bool all)
{
int pos;
@@ -1014,7 +1014,7 @@ void CFcEngine::parseName(const QString &name, int faceNo, bool all)
}
else
{
- QString style(name.mid(pos+2));
+ TQString style(name.mid(pos+2));
itsWeight=strToWeight(style, style);
#ifndef KFI_FC_NO_WIDTHS
@@ -1052,7 +1052,7 @@ void CFcEngine::parseName(const QString &name, int faceNo, bool all)
}
#ifdef HAVE_XFT
-XftFont * CFcEngine::getFont(int size, QPixmap *pix)
+XftFont * CFcEngine::getFont(int size, TQPixmap *pix)
{
if(itsInstalled)
return XftFontOpen(KFI_DISPLAY(pix), 0,
@@ -1067,7 +1067,7 @@ XftFont * CFcEngine::getFont(int size, QPixmap *pix)
else
{
FcPattern *pattern = FcPatternBuild(NULL,
- FC_FILE, FcTypeString, QFile::encodeName(itsName).data(),
+ FC_FILE, FcTypeString, TQFile::encodeName(itsName).data(),
FC_INDEX, FcTypeInteger, itsIndex,
FC_PIXEL_SIZE, FcTypeDouble, (double)size,
NULL);
@@ -1075,7 +1075,7 @@ XftFont * CFcEngine::getFont(int size, QPixmap *pix)
}
}
-void CFcEngine::getSizes(QPixmap *pix)
+void CFcEngine::getSizes(TQPixmap *pix)
{
static const int constNumSizes=11;
static const int constNumSizeRanges=2;
@@ -1152,7 +1152,7 @@ void CFcEngine::getSizes(QPixmap *pix)
FcResultMatch==FcPatternGetInteger(f->pattern, FC_WIDTH, 0, &iv) && equalWidth(iv, itsWidth) &&
#endif
FcResultMatch==FcPatternGetString(f->pattern, FC_FAMILY, 0, &str) && str &&
- QString::fromUtf8((char *)str)==itsName)
+ TQString::fromUtf8((char *)str)==itsName)
{
itsSizes.push_back(constSizes[l][i]);
gotSizes=true;
diff --git a/kcontrol/kfontinst/lib/FcEngine.h b/kcontrol/kfontinst/lib/FcEngine.h
index 4a09b8a55..594a9192a 100644
--- a/kcontrol/kfontinst/lib/FcEngine.h
+++ b/kcontrol/kfontinst/lib/FcEngine.h
@@ -5,9 +5,9 @@
#include "config.h"
#endif
-#include <qstring.h>
-#include <qvaluevector.h>
-#include <qfont.h>
+#include <tqstring.h>
+#include <tqvaluevector.h>
+#include <tqfont.h>
#include <kurl.h>
#include <kdeversion.h>
#include <fontconfig/fontconfig.h>
@@ -53,33 +53,33 @@ class KDE_EXPORT CFcEngine
~CFcEngine();
#ifdef HAVE_XFT
- bool draw(const KURL &url, int w, int h, QPixmap &pix, int faceNo, bool thumb);
+ bool draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, bool thumb);
#endif
int getNumIndexes() { return itsIndexCount; } // Only valid after draw has been called!
- QString getName(const KURL &url, int faceNo=0);
- bool getInfo(const KURL &url, int faceNo, QString &full, QString &family, QString &foundry, QString &weight,
+ TQString getName(const KURL &url, int faceNo=0);
+ bool getInfo(const KURL &url, int faceNo, TQString &full, TQString &family, TQString &foundry, TQString &weight,
#ifndef KFI_FC_NO_WIDTHS
- QString &width,
+ TQString &width,
#endif
- QString &spacing, QString &slant);
- QFont getQFont(const QString &name, int size);
+ TQString &spacing, TQString &slant);
+ TQFont getQFont(const TQString &name, int size);
- const QValueVector<int> & sizes() const { return itsSizes; }
+ const TQValueVector<int> & sizes() const { return itsSizes; }
int alphaSize() const { return itsAlphaSize; }
- static QString getPreviewString();
- static void setPreviewString(const QString &str);
- static QString getUppercaseLetters();
- static QString getLowercaseLetters();
- static QString getPunctuation();
- static QString getFcString(FcPattern *pat, const char *val, int faceNo=0);
- static QString createName(FcPattern *pat, int faceNo=0);
- static QString weightStr(int weight, bool emptyNormal=true);
+ static TQString getPreviewString();
+ static void setPreviewString(const TQString &str);
+ static TQString getUppercaseLetters();
+ static TQString getLowercaseLetters();
+ static TQString getPunctuation();
+ static TQString getFcString(FcPattern *pat, const char *val, int faceNo=0);
+ static TQString createName(FcPattern *pat, int faceNo=0);
+ static TQString weightStr(int weight, bool emptyNormal=true);
#ifndef KFI_FC_NO_WIDTHS
- static QString widthStr(int width, bool emptyNormal=true);
+ static TQString widthStr(int width, bool emptyNormal=true);
#endif
- static QString slantStr(int slant, bool emptyNormal=true);
- static QString spacingStr(int spacing);
+ static TQString slantStr(int slant, bool emptyNormal=true);
+ static TQString spacingStr(int spacing);
static const int constScalableSizes[];
static const int constDefaultAlphaSize;
@@ -87,16 +87,16 @@ class KDE_EXPORT CFcEngine
private:
bool parseUrl(const KURL &url, int faceNo, bool all=false);
- void parseName(const QString &name, int faceNo, bool all=false);
+ void parseName(const TQString &name, int faceNo, bool all=false);
#ifdef HAVE_XFT
- XftFont * getFont(int size, QPixmap *pix=NULL);
- void getSizes(QPixmap *pix=NULL);
+ XftFont * getFont(int size, TQPixmap *pix=NULL);
+ void getSizes(TQPixmap *pix=NULL);
#endif
private:
bool itsInstalled;
- QString itsName,
+ TQString itsName,
itsDescriptiveName,
itsFoundry;
int itsIndex,
@@ -108,7 +108,7 @@ class KDE_EXPORT CFcEngine
itsSlant,
itsSpacing,
itsAlphaSize;
- QValueVector<int> itsSizes;
+ TQValueVector<int> itsSizes;
KURL itsLastUrl;
FcBool itsScalable;
};
diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp
index 4606ad0ca..1e779b514 100644
--- a/kcontrol/kfontinst/lib/Misc.cpp
+++ b/kcontrol/kfontinst/lib/Misc.cpp
@@ -27,7 +27,7 @@
////////////////////////////////////////////////////////////////////////////////
#include "Misc.h"
-#include <qfile.h>
+#include <tqfile.h>
#include <kprocess.h>
#include <kstandarddirs.h>
#include <klargefile.h>
@@ -40,14 +40,14 @@ namespace KFI
namespace Misc
{
-QString linkedTo(const QString &i)
+TQString linkedTo(const TQString &i)
{
- QString d;
+ TQString d;
if(isLink(i))
{
char buffer[1000];
- int n=readlink(QFile::encodeName(i), buffer, 1000);
+ int n=readlink(TQFile::encodeName(i), buffer, 1000);
if(n!=-1)
{
@@ -59,11 +59,11 @@ QString linkedTo(const QString &i)
return d;
}
-QString dirSyntax(const QString &d)
+TQString dirSyntax(const TQString &d)
{
if(!d.isEmpty())
{
- QString ds(d);
+ TQString ds(d);
ds.replace("//", "/");
@@ -78,11 +78,11 @@ QString dirSyntax(const QString &d)
return d;
}
-QString xDirSyntax(const QString &d)
+TQString xDirSyntax(const TQString &d)
{
if(!d.isEmpty())
{
- QString ds(d);
+ TQString ds(d);
ds.replace("//", "/");
@@ -96,9 +96,9 @@ QString xDirSyntax(const QString &d)
return d;
}
-QString getDir(const QString &f)
+TQString getDir(const TQString &f)
{
- QString d(f);
+ TQString d(f);
int slashPos=d.findRev('/');
@@ -108,9 +108,9 @@ QString getDir(const QString &f)
return dirSyntax(d);
}
-QString getFile(const QString &f)
+TQString getFile(const TQString &f)
{
- QString d(f);
+ TQString d(f);
int slashPos=d.findRev('/');
@@ -120,7 +120,7 @@ QString getFile(const QString &f)
return d;
}
-bool createDir(const QString &dir)
+bool createDir(const TQString &dir)
{
//
// Clear any umask before dir is created
@@ -131,7 +131,7 @@ bool createDir(const QString &dir)
return status;
}
-bool doCmd(const QString &cmd, const QString &p1, const QString &p2, const QString &p3)
+bool doCmd(const TQString &cmd, const TQString &p1, const TQString &p2, const TQString &p3)
{
KProcess proc;
@@ -149,13 +149,13 @@ bool doCmd(const QString &cmd, const QString &p1, const QString &p2, const QStri
return proc.normalExit() && proc.exitStatus()==0;
}
-QString changeExt(const QString &f, const QString &newExt)
+TQString changeExt(const TQString &f, const TQString &newExt)
{
- QString newStr(f);
+ TQString newStr(f);
int dotPos=newStr.findRev('.');
if(-1==dotPos)
- newStr+=QChar('.')+newExt;
+ newStr+=TQChar('.')+newExt;
else
{
newStr.remove(dotPos+1, newStr.length());
@@ -164,9 +164,9 @@ QString changeExt(const QString &f, const QString &newExt)
return newStr;
}
-void createBackup(const QString &f)
+void createBackup(const TQString &f)
{
- const QString constExt(".bak");
+ const TQString constExt(".bak");
if(!fExists(f+constExt) && fExists(f))
doCmd("cp", "-f", f, f+constExt);
@@ -179,7 +179,7 @@ void createBackup(const QString &f)
//
// Associated: /home/a/courier.afm /home/a/courier.pfm
//
-void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm, QWidget *widget)
+void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm, TQWidget *widget)
{
const char *afm[]={"afm", "AFM", "Afm", "AFm", "AfM", "aFM", "aFm", "afM", NULL},
*pfm[]={"pfm", "PFM", "Pfm", "PFm", "PfM", "pFM", "pFm", "pfM", NULL};
@@ -217,18 +217,18 @@ void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm, QWidge
}
}
-time_t getTimeStamp(const QString &item)
+time_t getTimeStamp(const TQString &item)
{
KDE_struct_stat info;
- return !item.isEmpty() && 0==KDE_lstat(QFile::encodeName(item), &info) ? info.st_mtime : 0;
+ return !item.isEmpty() && 0==KDE_lstat(TQFile::encodeName(item), &info) ? info.st_mtime : 0;
}
-bool check(const QString &path, unsigned int fmt, bool checkW)
+bool check(const TQString &path, unsigned int fmt, bool checkW)
{
KDE_struct_stat info;
- QCString pathC(QFile::encodeName(path));
+ TQCString pathC(TQFile::encodeName(path));
return 0==KDE_lstat(pathC, &info) && (info.st_mode&S_IFMT)==fmt && (!checkW || 0==::access(pathC, W_OK));
}
diff --git a/kcontrol/kfontinst/lib/Misc.h b/kcontrol/kfontinst/lib/Misc.h
index a624f44f9..d20f08358 100644
--- a/kcontrol/kfontinst/lib/Misc.h
+++ b/kcontrol/kfontinst/lib/Misc.h
@@ -33,8 +33,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <time.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <kurl.h>
class QWidget;
@@ -50,25 +50,25 @@ namespace Misc
DIR_PERMS = 0755
};
- extern KDE_EXPORT bool check(const QString &path, unsigned int fmt, bool checkW=false);
- inline KDE_EXPORT bool fExists(const QString &p) { return check(p, S_IFREG, false); }
- inline KDE_EXPORT bool dExists(const QString &p) { return check(p, S_IFDIR, false); }
- inline KDE_EXPORT bool fWritable(const QString &p) { return check(p, S_IFREG, true); }
- inline KDE_EXPORT bool dWritable(const QString &p) { return check(p, S_IFDIR, true); }
- inline KDE_EXPORT bool isLink(const QString &i) { return check(i, S_IFLNK, false); }
- extern KDE_EXPORT QString linkedTo(const QString &i);
- extern KDE_EXPORT QString dirSyntax(const QString &d); // Has trailing slash: /file/path/
- extern KDE_EXPORT QString xDirSyntax(const QString &d); // No trailing slash: /file/path
- inline KDE_EXPORT QString fileSyntax(const QString &f) { return xDirSyntax(f); }
- extern KDE_EXPORT QString getDir(const QString &f);
- extern KDE_EXPORT QString getFile(const QString &f);
- extern KDE_EXPORT bool createDir(const QString &dir);
- extern KDE_EXPORT QString changeExt(const QString &f, const QString &newExt);
- extern KDE_EXPORT bool doCmd(const QString &cmd, const QString &p1=QString::null, const QString &p2=QString::null, const QString &p3=QString::null);
+ extern KDE_EXPORT bool check(const TQString &path, unsigned int fmt, bool checkW=false);
+ inline KDE_EXPORT bool fExists(const TQString &p) { return check(p, S_IFREG, false); }
+ inline KDE_EXPORT bool dExists(const TQString &p) { return check(p, S_IFDIR, false); }
+ inline KDE_EXPORT bool fWritable(const TQString &p) { return check(p, S_IFREG, true); }
+ inline KDE_EXPORT bool dWritable(const TQString &p) { return check(p, S_IFDIR, true); }
+ inline KDE_EXPORT bool isLink(const TQString &i) { return check(i, S_IFLNK, false); }
+ extern KDE_EXPORT TQString linkedTo(const TQString &i);
+ extern KDE_EXPORT TQString dirSyntax(const TQString &d); // Has trailing slash: /file/path/
+ extern KDE_EXPORT TQString xDirSyntax(const TQString &d); // No trailing slash: /file/path
+ inline KDE_EXPORT TQString fileSyntax(const TQString &f) { return xDirSyntax(f); }
+ extern KDE_EXPORT TQString getDir(const TQString &f);
+ extern KDE_EXPORT TQString getFile(const TQString &f);
+ extern KDE_EXPORT bool createDir(const TQString &dir);
+ extern KDE_EXPORT TQString changeExt(const TQString &f, const TQString &newExt);
+ extern KDE_EXPORT bool doCmd(const TQString &cmd, const TQString &p1=TQString::null, const TQString &p2=TQString::null, const TQString &p3=TQString::null);
inline KDE_EXPORT bool root() { return 0==getuid(); }
- extern KDE_EXPORT void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, QWidget *widget=NULL);
- extern KDE_EXPORT void createBackup(const QString &f);
- extern KDE_EXPORT time_t getTimeStamp(const QString &item);
+ extern KDE_EXPORT void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, TQWidget *widget=NULL);
+ extern KDE_EXPORT void createBackup(const TQString &f);
+ extern KDE_EXPORT time_t getTimeStamp(const TQString &item);
}
}
diff --git a/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp b/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
index 86794377b..363ebe064 100644
--- a/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
+++ b/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
@@ -28,9 +28,9 @@
#include "FontThumbnail.h"
#include "KfiConstants.h"
-#include <qimage.h>
-#include <qbitmap.h>
-#include <qpainter.h>
+#include <tqimage.h>
+#include <tqbitmap.h>
+#include <tqpainter.h>
#include <kiconloader.h>
#include <kglobalsettings.h>
#include <klocale.h>
@@ -52,9 +52,9 @@ CFontThumbnail::CFontThumbnail()
KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
}
-bool CFontThumbnail::create(const QString &path, int width, int height, QImage &img)
+bool CFontThumbnail::create(const TQString &path, int width, int height, TQImage &img)
{
- QPixmap pix;
+ TQPixmap pix;
if(itsEngine.draw(KURL(path), width, height, pix, 0, true))
{
diff --git a/kcontrol/kfontinst/thumbnail/FontThumbnail.h b/kcontrol/kfontinst/thumbnail/FontThumbnail.h
index c2d1294e4..456e38b65 100644
--- a/kcontrol/kfontinst/thumbnail/FontThumbnail.h
+++ b/kcontrol/kfontinst/thumbnail/FontThumbnail.h
@@ -42,7 +42,7 @@ class CFontThumbnail : public ThumbCreator
CFontThumbnail();
~CFontThumbnail() {}
- bool create(const QString &path, int width, int height, QImage &img);
+ bool create(const TQString &path, int width, int height, TQImage &img);
Flags flags() const;
private:
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/kfontinst/viewpart/FontPreview.cpp
index ddd8171cb..3679be252 100644
--- a/kcontrol/kfontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp
@@ -29,15 +29,15 @@
#include "FontPreview.h"
#include <kapplication.h>
#include <klocale.h>
-#include <qpainter.h>
-#include <qimage.h>
+#include <tqpainter.h>
+#include <tqimage.h>
#include <stdlib.h>
namespace KFI
{
-CFontPreview::CFontPreview(QWidget *parent, const char *name)
- : QWidget(parent, name),
+CFontPreview::CFontPreview(TQWidget *parent, const char *name)
+ : TQWidget(parent, name),
itsCurrentFace(1),
itsLastWidth(0),
itsLastHeight(0),
@@ -71,7 +71,7 @@ void CFontPreview::showFont()
}
else
{
- QPixmap nullPix;
+ TQPixmap nullPix;
setEraseColor(itsBgndCol);
itsPixmap=nullPix;
@@ -80,9 +80,9 @@ void CFontPreview::showFont()
}
}
-void CFontPreview::paintEvent(QPaintEvent *)
+void CFontPreview::paintEvent(TQPaintEvent *)
{
- QPainter paint(this);
+ TQPainter paint(this);
if(itsPixmap.isNull())
{
@@ -103,14 +103,14 @@ void CFontPreview::paintEvent(QPaintEvent *)
}
}
-QSize CFontPreview::sizeHint() const
+TQSize CFontPreview::sizeHint() const
{
- return QSize(132, 132);
+ return TQSize(132, 132);
}
-QSize CFontPreview::minimumSizeHint() const
+TQSize CFontPreview::minimumSizeHint() const
{
- return QSize(32, 32);
+ return TQSize(32, 32);
}
}
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.h b/kcontrol/kfontinst/viewpart/FontPreview.h
index 673adeb2d..a57e9b9c9 100644
--- a/kcontrol/kfontinst/viewpart/FontPreview.h
+++ b/kcontrol/kfontinst/viewpart/FontPreview.h
@@ -29,11 +29,11 @@
// (C) Craig Drummond, 2001, 2002, 2003, 2004
////////////////////////////////////////////////////////////////////////////////
-#include <qstring.h>
-#include <qpixmap.h>
-#include <qsize.h>
-#include <qwidget.h>
-#include <qcolor.h>
+#include <tqstring.h>
+#include <tqpixmap.h>
+#include <tqsize.h>
+#include <tqwidget.h>
+#include <tqcolor.h>
#include <kurl.h>
#include "FcEngine.h"
@@ -46,12 +46,12 @@ class CFontPreview : public QWidget
public:
- CFontPreview(QWidget *parent, const char *name=NULL);
+ CFontPreview(TQWidget *parent, const char *name=NULL);
virtual ~CFontPreview() {}
- void paintEvent(QPaintEvent *);
- QSize sizeHint() const;
- QSize minimumSizeHint() const;
+ void paintEvent(TQPaintEvent *);
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
void showFont(const KURL &url);
void showFont();
@@ -69,13 +69,13 @@ class CFontPreview : public QWidget
private:
CFcEngine itsEngine;
- QPixmap itsPixmap;
+ TQPixmap itsPixmap;
KURL itsCurrentUrl;
int itsCurrentFace,
itsLastWidth,
itsLastHeight;
- QColor itsBgndCol;
- QString itsFontName;
+ TQColor itsBgndCol;
+ TQString itsFontName;
};
}
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
index aaa3bc5ff..14bda4024 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
@@ -32,18 +32,18 @@
#include "KfiConstants.h"
#include "KfiPrint.h"
#include <klocale.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qframe.h>
-#include <qfile.h>
-#include <qlabel.h>
-#include <qpainter.h>
-#include <qpaintdevicemetrics.h>
-#include <qvalidator.h>
-#include <qregexp.h>
-#include <qsettings.h>
-#include <qstringlist.h>
-#include <qtimer.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqframe.h>
+#include <tqfile.h>
+#include <tqlabel.h>
+#include <tqpainter.h>
+#include <tqpaintdevicemetrics.h>
+#include <tqvalidator.h>
+#include <tqregexp.h>
+#include <tqsettings.h>
+#include <tqstringlist.h>
+#include <tqtimer.h>
#include <kio/netaccess.h>
#include <kinstance.h>
#include <kmessagebox.h>
@@ -58,40 +58,40 @@
static KURL getDest(const KURL &url, bool system)
{
return KURL(KFI::Misc::root()
- ? QString("fonts:/") + url.fileName()
- : QString("fonts:/") + QString(system ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER))
- + QChar('/') + url.fileName());
+ ? TQString("fonts:/") + url.fileName()
+ : TQString("fonts:/") + TQString(system ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER))
+ + TQChar('/') + url.fileName());
}
namespace KFI
{
-CFontViewPart::CFontViewPart(QWidget *parent, const char *name)
+CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
{
bool kcm=0==strcmp(name, "kcmfontinst");
- itsFrame=new QFrame(parent, "frame");
+ itsFrame=new TQFrame(parent, "frame");
- QFrame *previewFrame=new QFrame(itsFrame);
+ TQFrame *previewFrame=new TQFrame(itsFrame);
- itsToolsFrame=new QFrame(itsFrame);
+ itsToolsFrame=new TQFrame(itsFrame);
- QVBoxLayout *layout=new QVBoxLayout(itsFrame, kcm ? 0 : KDialog::marginHint(), kcm ? 0 : KDialog::spacingHint());
- QGridLayout *previewLayout=new QGridLayout(previewFrame, 1, 1, 1, 1);
- QHBoxLayout *toolsLayout=new QHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint());
+ TQVBoxLayout *layout=new TQVBoxLayout(itsFrame, kcm ? 0 : KDialog::marginHint(), kcm ? 0 : KDialog::spacingHint());
+ TQGridLayout *previewLayout=new TQGridLayout(previewFrame, 1, 1, 1, 1);
+ TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint());
- itsFrame->setFrameShape(QFrame::NoFrame);
- itsFrame->setFocusPolicy(QWidget::ClickFocus);
- itsToolsFrame->setFrameShape(QFrame::NoFrame);
- previewFrame->setFrameShadow(kcm ? QFrame::Sunken : QFrame::Raised);
- previewFrame->setFrameShape(QFrame::Panel);
+ itsFrame->setFrameShape(TQFrame::NoFrame);
+ itsFrame->setFocusPolicy(TQWidget::ClickFocus);
+ itsToolsFrame->setFrameShape(TQFrame::NoFrame);
+ previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised);
+ previewFrame->setFrameShape(TQFrame::Panel);
setInstance(new KInstance("kfontview"));
itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview");
- itsPreview->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
- itsFaceLabel=new QLabel(i18n("Face:"), itsToolsFrame);
+ itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ itsFaceLabel=new TQLabel(i18n("Face:"), itsToolsFrame);
itsFaceSelector=new KIntNumInput(1, itsToolsFrame);
- itsInstallButton=new QPushButton(i18n("Install..."), itsToolsFrame, "button");
+ itsInstallButton=new TQPushButton(i18n("Install..."), itsToolsFrame, "button");
itsInstallButton->hide();
previewLayout->addWidget(itsPreview, 0, 0);
layout->addWidget(previewFrame);
@@ -100,17 +100,17 @@ CFontViewPart::CFontViewPart(QWidget *parent, const char *name)
toolsLayout->addWidget(itsFaceSelector);
itsFaceLabel->hide();
itsFaceSelector->hide();
- toolsLayout->addItem(new QSpacerItem(5, 5, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum));
+ toolsLayout->addItem(new TQSpacerItem(5, 5, TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
toolsLayout->addWidget(itsInstallButton);
itsToolsFrame->hide();
- connect(itsPreview, SIGNAL(status(bool)), SLOT(previewStatus(bool)));
- connect(itsInstallButton, SIGNAL(clicked()), SLOT(install()));
- connect(itsFaceSelector, SIGNAL(valueChanged(int)), itsPreview, SLOT(showFace(int)));
+ connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewStatus(bool)));
+ connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install()));
+ connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int)));
itsChangeTextAction=new KAction(i18n("Change Text..."), "text", KShortcut(),
- this, SLOT(changeText()), actionCollection(), "changeText");
+ this, TQT_SLOT(changeText()), actionCollection(), "changeText");
itsChangeTextAction->setEnabled(false);
- itsPrintAction=KStdAction::print(this, SLOT(print()), actionCollection(), "print");
+ itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print");
itsPrintAction->setEnabled(false);
setXMLFile("kfontviewpart.rc");
@@ -143,7 +143,7 @@ bool CFontViewPart::openFile()
{
// NOTE: Cant do the real open here, as dont seem to be able to use KIO::NetAccess functions during initial start-up.
// Bug report 111535 indicates that calling "konqueror <font>" crashes.
- QTimer::singleShot(0, this, SLOT(timeout()));
+ TQTimer::singleShot(0, this, TQT_SLOT(timeout()));
return true;
}
@@ -164,17 +164,17 @@ void CFontViewPart::timeout()
// Not from fonts:/, so try to see if font is already installed...
if(Misc::root())
{
- destUrl=QString("fonts:/")+itsPreview->engine().getName(m_url);
+ destUrl=TQString("fonts:/")+itsPreview->engine().getName(m_url);
itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
}
else
{
- destUrl=QString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+QChar('/')+itsPreview->engine().getName(m_url);
+ destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
if(KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
itsShowInstallButton=false;
else
{
- destUrl=QString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+QChar('/')+itsPreview->engine().getName(m_url);
+ destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
}
}
@@ -255,8 +255,8 @@ void CFontViewPart::install()
void CFontViewPart::changeText()
{
bool status;
- QRegExpValidator validator(QRegExp(".*"), 0L);
- QString oldStr(itsPreview->engine().getPreviewString()),
+ TQRegExpValidator validator(TQRegExp(".*"), 0L);
+ TQString oldStr(itsPreview->engine().getPreviewString()),
newStr(KInputDialog::getText(i18n("Preview String"), i18n("Please enter new string:"),
oldStr, &status, itsFrame,
"preview string dialog", &validator));
@@ -270,7 +270,7 @@ void CFontViewPart::changeText()
void CFontViewPart::print()
{
- QStringList items;
+ TQStringList items;
items.append(itsPreview->engine().getName(m_url));
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/kfontinst/viewpart/FontViewPart.h
index 7ffdbb8f4..565ac3b7a 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.h
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.h
@@ -49,7 +49,7 @@ class CFontViewPart : public KParts::ReadOnlyPart
public:
- CFontViewPart(QWidget *parent=0, const char *name=0);
+ CFontViewPart(TQWidget *parent=0, const char *name=0);
virtual ~CFontViewPart() {}
bool openURL(const KURL &url);
@@ -69,10 +69,10 @@ class CFontViewPart : public KParts::ReadOnlyPart
private:
CFontPreview *itsPreview;
- QPushButton *itsInstallButton;
- QFrame *itsFrame,
+ TQPushButton *itsInstallButton;
+ TQFrame *itsFrame,
*itsToolsFrame;
- QLabel *itsFaceLabel;
+ TQLabel *itsFaceLabel;
KIntNumInput *itsFaceSelector;
KAction *itsChangeTextAction,
*itsPrintAction;
diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
index 52783c1a7..dd695a033 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
@@ -60,15 +60,15 @@ CFontViewPartFactory::~CFontViewPartFactory()
theirInstance=0L;
}
-QObject * CFontViewPartFactory::createObject(QObject *parent, const char *name, const char *, const QStringList &)
+TQObject * CFontViewPartFactory::createObject(TQObject *parent, const char *name, const char *, const TQStringList &)
{
if(parent && !parent->isWidgetType())
{
- kdDebug() << "CFontViewPartFactory: parent does not inherit QWidget" << endl;
+ kdDebug() << "CFontViewPartFactory: parent does not inherit TQWidget" << endl;
return 0L;
}
- return new CFontViewPart((QWidget*) parent, name);
+ return new CFontViewPart((TQWidget*) parent, name);
}
KInstance* CFontViewPartFactory::instance()
diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.h b/kcontrol/kfontinst/viewpart/FontViewPartFactory.h
index 777d07ebe..d5999d8b0 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.h
+++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.h
@@ -45,7 +45,7 @@ class CFontViewPartFactory : public KLibFactory
CFontViewPartFactory();
virtual ~CFontViewPartFactory();
- virtual QObject *createObject(QObject *parent = 0, const char *name = 0, const char *classname = "QObject", const QStringList &args = QStringList());
+ virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList());
static KInstance * instance();
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
index 5ed5cf455..56540171e 100644
--- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
@@ -43,14 +43,14 @@ namespace KFI
{
CFontViewerAppMainWindow::CFontViewerAppMainWindow()
- : KParts::MainWindow((QWidget *)0L)
+ : KParts::MainWindow((TQWidget *)0L)
{
KLibFactory *factory=KLibLoader::self()->factory("libkfontviewpart");
if(factory)
{
- KStdAction::open(this, SLOT(fileOpen()), actionCollection());
- KStdAction::quit(kapp, SLOT(quit()), actionCollection());
+ KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
+ KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart");
@@ -71,7 +71,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
if(!openURL.isEmpty())
itsPreview->openURL(openURL);
- QSize defSize(450, 380);
+ TQSize defSize(450, 380);
KConfigGroupSaver saver(kapp->config(), CFG_GROUP);
resize(kapp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize));
@@ -90,7 +90,7 @@ CFontViewerAppMainWindow::~CFontViewerAppMainWindow()
void CFontViewerAppMainWindow::fileOpen()
{
- KURL url(KFileDialog::getOpenURL(QString::null, "application/x-font-ttf application/x-font-otf "
+ KURL url(KFileDialog::getOpenURL(TQString::null, "application/x-font-ttf application/x-font-otf "
"application/x-font-ttc application/x-font-type1 "
"application/x-font-bdf application/x-font-pcf ",
this, i18n("Select Font to View")));
diff --git a/kcontrol/kfontinst/viewpart/KfiPrint.cpp b/kcontrol/kfontinst/viewpart/KfiPrint.cpp
index 02366922a..5e2d9deeb 100644
--- a/kcontrol/kfontinst/viewpart/KfiPrint.cpp
+++ b/kcontrol/kfontinst/viewpart/KfiPrint.cpp
@@ -28,13 +28,13 @@
#include "KfiPrint.h"
#include "FcEngine.h"
-#include <qpainter.h>
-#include <qpaintdevicemetrics.h>
-#include <qsettings.h>
-#include <qstringlist.h>
+#include <tqpainter.h>
+#include <tqpaintdevicemetrics.h>
+#include <tqsettings.h>
+#include <tqstringlist.h>
#include <kprinter.h>
-#include <qapplication.h>
-#include <qeventloop.h>
+#include <tqapplication.h>
+#include <tqeventloop.h>
#ifdef HAVE_LOCALE_H
#include <locale.h>
#endif
@@ -70,13 +70,13 @@ static bool sufficientSpace(int y, int titleFontHeight, const int *sizes, int pa
return (y+required)<pageHeight;
}
-bool printable(const QString &mime)
+bool printable(const TQString &mime)
{
return "application/x-font-type1"==mime || "application/x-font-ttf"==mime || "application/x-font-otf"==mime ||
"application/x-font-ttc"==mime || "application/x-font-ghostscript"==mime;
}
-void printItems(const QStringList &items, int size, QWidget *parent, CFcEngine &engine)
+void printItems(const TQStringList &items, int size, TQWidget *parent, CFcEngine &engine)
{
#ifdef HAVE_LOCALE_H
char *oldLocale=setlocale(LC_NUMERIC, "C"),
@@ -88,13 +88,13 @@ void printItems(const QStringList &items, int size, QWidget *parent, CFcEngine &
if(printer.setup(parent))
{
- QPainter painter;
- QFont sans("sans", 12, QFont::Bold);
- QSettings settings;
+ TQPainter painter;
+ TQFont sans("sans", 12, TQFont::Bold);
+ TQSettings settings;
bool entryExists,
embedFonts,
set=false;
- QString str(engine.getPreviewString());
+ TQString str(engine.getPreviewString());
//
// Cehck whether the user has enabled font embedding...
@@ -107,7 +107,7 @@ void printItems(const QStringList &items, int size, QWidget *parent, CFcEngine &
printer.setResolution(72);
painter.begin(&printer);
- QPaintDeviceMetrics metrics(painter.device());
+ TQPaintDeviceMetrics metrics(painter.device());
int margin=(int)((2/2.54)*metrics.logicalDpiY()), // 2 cm margins
pageWidth=metrics.width()-(2*margin),
pageHeight=metrics.height()-(2*margin),
@@ -122,7 +122,7 @@ void printItems(const QStringList &items, int size, QWidget *parent, CFcEngine &
painter.setClipping(true);
painter.setClipRect(margin, margin, pageWidth, pageHeight);
- QStringList::ConstIterator it(items.begin()),
+ TQStringList::ConstIterator it(items.begin()),
end(items.end());
for(; it!=end; ++it)
@@ -130,7 +130,7 @@ void printItems(const QStringList &items, int size, QWidget *parent, CFcEngine &
unsigned int s=0;
painter.setFont(sans);
- QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput, 0);
+ TQApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 0);
if(!firstFont && !sufficientSpace(y, painter.fontMetrics().height(), sizes, pageHeight, size))
{
diff --git a/kcontrol/kfontinst/viewpart/KfiPrint.h b/kcontrol/kfontinst/viewpart/KfiPrint.h
index 5b927a57a..01889273a 100644
--- a/kcontrol/kfontinst/viewpart/KfiPrint.h
+++ b/kcontrol/kfontinst/viewpart/KfiPrint.h
@@ -40,8 +40,8 @@ class CFcEngine;
namespace Print
{
-extern void printItems(const QStringList &items, int size, QWidget *parent, CFcEngine &engine);
-extern bool printable(const QString &mime);
+extern void printItems(const TQStringList &items, int size, TQWidget *parent, CFcEngine &engine);
+extern bool printable(const TQString &mime);
}
}
diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp
index 4605cbb09..372104c4a 100644
--- a/kcontrol/kicker/advancedDialog.cpp
+++ b/kcontrol/kicker/advancedDialog.cpp
@@ -17,12 +17,12 @@
* along with this program; if not, write to the Free Software
*/
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qslider.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqslider.h>
#include <kcolorbutton.h>
#include <klocale.h>
@@ -31,7 +31,7 @@
#include "advancedOptions.h"
#include "main.h"
-advancedDialog::advancedDialog(QWidget* parent, const char* name)
+advancedDialog::advancedDialog(TQWidget* parent, const char* name)
: KDialogBase(KDialogBase::Plain,
i18n("Advanced Options"),
Ok|Apply|Cancel,
@@ -40,29 +40,29 @@ advancedDialog::advancedDialog(QWidget* parent, const char* name)
name,
false, false)
{
- connect(this, SIGNAL(applyClicked()),
- this, SLOT(save()));
- connect(this, SIGNAL(okClicked()),
- this, SLOT(save()));
+ connect(this, TQT_SIGNAL(applyClicked()),
+ this, TQT_SLOT(save()));
+ connect(this, TQT_SIGNAL(okClicked()),
+ this, TQT_SLOT(save()));
- QFrame* page = plainPage();
- QVBoxLayout* layout = new QVBoxLayout(page);
+ TQFrame* page = plainPage();
+ TQVBoxLayout* layout = new TQVBoxLayout(page);
m_advancedWidget = new advancedKickerOptions(page);
layout->addWidget(m_advancedWidget);
layout->addStretch();
setMinimumSize( sizeHint() );
- connect(m_advancedWidget->handles, SIGNAL(clicked(int)),
- this, SLOT(changed()));
- connect(m_advancedWidget->hideButtonSize, SIGNAL(valueChanged(int)),
- this, SLOT(changed()));
- connect(m_advancedWidget->tintColorB, SIGNAL(clicked()),
- this, SLOT(changed()));
- connect(m_advancedWidget->tintSlider, SIGNAL(valueChanged(int)),
- this, SLOT(changed()));
- connect(m_advancedWidget->menubarPanelTransparent, SIGNAL(clicked()),
- this, SLOT(changed()));
+ connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)),
+ this, TQT_SLOT(changed()));
+ connect(m_advancedWidget->hideButtonSize, TQT_SIGNAL(valueChanged(int)),
+ this, TQT_SLOT(changed()));
+ connect(m_advancedWidget->tintColorB, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(changed()));
+ connect(m_advancedWidget->tintSlider, TQT_SIGNAL(valueChanged(int)),
+ this, TQT_SLOT(changed()));
+ connect(m_advancedWidget->menubarPanelTransparent, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(changed()));
load();
}
@@ -86,7 +86,7 @@ void advancedDialog::load()
int defaultHideButtonSize = c.readNumEntry("HideButtonSize", 14);
m_advancedWidget->hideButtonSize->setValue(defaultHideButtonSize);
- QColor color = c.readColorEntry( "TintColor", &colorGroup().mid() );
+ TQColor color = c.readColorEntry( "TintColor", &colorGroup().mid() );
m_advancedWidget->tintColorB->setColor( color );
int tintValue = c.readNumEntry( "TintValue", 33 );
m_advancedWidget->tintSlider->setValue( tintValue );
@@ -115,11 +115,11 @@ void advancedDialog::save()
c.writeEntry("MenubarPanelTransparent",
m_advancedWidget->menubarPanelTransparent->isChecked());
- QStringList elist = c.readListEntry("Extensions2");
- for (QStringList::Iterator it = elist.begin(); it != elist.end(); ++it)
+ TQStringList elist = c.readListEntry("Extensions2");
+ for (TQStringList::Iterator it = elist.begin(); it != elist.end(); ++it)
{
// extension id
- QString group(*it);
+ TQString group(*it);
// is there a config group for this extension?
if(!c.hasGroup(group) ||
diff --git a/kcontrol/kicker/advancedDialog.h b/kcontrol/kicker/advancedDialog.h
index bbbcdd109..12a2ef4bd 100644
--- a/kcontrol/kicker/advancedDialog.h
+++ b/kcontrol/kicker/advancedDialog.h
@@ -29,7 +29,7 @@ class advancedDialog : public KDialogBase
Q_OBJECT
public:
- advancedDialog(QWidget* parent, const char* name);
+ advancedDialog(TQWidget* parent, const char* name);
~advancedDialog();
protected slots:
diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp
index 700dbd9ca..a8b7cdb20 100644
--- a/kcontrol/kicker/applettab_impl.cpp
+++ b/kcontrol/kicker/applettab_impl.cpp
@@ -17,15 +17,15 @@
* along with this program; if not, write to the Free Software
*/
-#include <qlayout.h>
-#include <qgroupbox.h>
-#include <qvbuttongroup.h>
-#include <qwhatsthis.h>
-#include <qradiobutton.h>
-#include <qpushbutton.h>
-#include <qtoolbutton.h>
-#include <qvbox.h>
-#include <qfileinfo.h>
+#include <tqlayout.h>
+#include <tqgroupbox.h>
+#include <tqvbuttongroup.h>
+#include <tqwhatsthis.h>
+#include <tqradiobutton.h>
+#include <tqpushbutton.h>
+#include <tqtoolbutton.h>
+#include <tqvbox.h>
+#include <tqfileinfo.h>
#include <kconfig.h>
#include <kglobal.h>
@@ -38,25 +38,25 @@
#include "applettab_impl.h"
#include "applettab_impl.moc"
-AppletTab::AppletTab( QWidget *parent, const char* name )
+AppletTab::AppletTab( TQWidget *parent, const char* name )
: AppletTabBase (parent, name)
{
- connect(level_group, SIGNAL(clicked(int)), SLOT(level_changed(int)));
+ connect(level_group, TQT_SIGNAL(clicked(int)), TQT_SLOT(level_changed(int)));
- connect(lb_trusted, SIGNAL(selectionChanged(QListViewItem*)),
- SLOT(trusted_selection_changed(QListViewItem*)));
+ connect(lb_trusted, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
+ TQT_SLOT(trusted_selection_changed(TQListViewItem*)));
- connect(pb_add, SIGNAL(clicked()), SLOT(add_clicked()));
- connect(pb_remove, SIGNAL(clicked()), SLOT(remove_clicked()));
+ connect(pb_add, TQT_SIGNAL(clicked()), TQT_SLOT(add_clicked()));
+ connect(pb_remove, TQT_SIGNAL(clicked()), TQT_SLOT(remove_clicked()));
- connect(lb_available, SIGNAL(selectionChanged(QListViewItem*)),
- SLOT(available_selection_changed(QListViewItem*)));
+ connect(lb_available, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
+ TQT_SLOT(available_selection_changed(TQListViewItem*)));
pb_add->setEnabled(false);
pb_remove->setEnabled(false);
- QWhatsThis::add( level_group, i18n("Panel applets can be started in two different ways:"
+ TQWhatsThis::add( level_group, i18n("Panel applets can be started in two different ways:"
" internally or externally. While 'internally' is the preferred way to load applets, this can"
" raise stability or security problems when you are using poorly-programmed third-party applets."
" To address these problems, applets can be marked 'trusted'. You might want to configure"
@@ -67,18 +67,18 @@ AppletTab::AppletTab( QWidget *parent, const char* name )
" will be loaded internally, others will be loaded using an external wrapper application.</li>"
" <li><em>Load all applets internally</em></li></ul>") );
- QWhatsThis::add( lb_trusted, i18n("Here you can see a list of applets that are marked"
+ TQWhatsThis::add( lb_trusted, i18n("Here you can see a list of applets that are marked"
" 'trusted', i.e. will be loaded internally by Kicker in any case. To move an applet"
" from the list of available applets to the trusted ones, or vice versa, select it and"
" press the left or right buttons.") );
- QWhatsThis::add( pb_add, i18n("Click here to add the selected applet from the list of available,"
+ TQWhatsThis::add( pb_add, i18n("Click here to add the selected applet from the list of available,"
" untrusted applets to the list of trusted applets.") );
- QWhatsThis::add( pb_remove, i18n("Click here to remove the selected applet from the list of trusted"
+ TQWhatsThis::add( pb_remove, i18n("Click here to remove the selected applet from the list of trusted"
" applets to the list of available, untrusted applets.") );
- QWhatsThis::add( lb_available, i18n("Here you can see a list of available applets that you"
+ TQWhatsThis::add( lb_available, i18n("Here you can see a list of available applets that you"
" currently do not trust. This does not mean you cannot use those applets, but rather that"
" the panel's policy using them depends on your applet security level. To move an applet"
" from the list of available applets to the trusted ones or vice versa, select it and"
@@ -120,17 +120,17 @@ void AppletTab::load( bool useDefaults )
list_group->setEnabled(trusted_rb->isChecked());
- QStringList list = KGlobal::dirs()->findAllResources("applets", "*.desktop");
- for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+ TQStringList list = KGlobal::dirs()->findAllResources("applets", "*.desktop");
+ for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
{
- QFileInfo fi(*it);
+ TQFileInfo fi(*it);
available << fi.baseName();
}
if(c.hasKey("TrustedApplets"))
{
- QStringList list = c.readListEntry("TrustedApplets");
- for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+ TQStringList list = c.readListEntry("TrustedApplets");
+ for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
{
if(available.contains(*it))
l_trusted << (*it);
@@ -140,7 +140,7 @@ void AppletTab::load( bool useDefaults )
l_trusted << "clockapplet" << "ksystemtrayapplet" << "krunapplet" << "quicklauncher"
<< "kminipagerapplet" << "ktaskbarapplet" << "eyesapplet" << "kmixapplet";
- for ( QStringList::Iterator it = available.begin(); it != available.end(); ++it )
+ for ( TQStringList::Iterator it = available.begin(); it != available.end(); ++it )
{
if(!l_trusted.contains(*it))
l_available << (*it);
@@ -170,9 +170,9 @@ void AppletTab::defaults()
load( true );
}
-QString AppletTab::quickHelp() const
+TQString AppletTab::quickHelp() const
{
- return QString::null;
+ return TQString::null;
}
void AppletTab::level_changed(int)
@@ -184,24 +184,24 @@ void AppletTab::level_changed(int)
void AppletTab::updateTrusted()
{
lb_trusted->clear();
- for ( QStringList::Iterator it = l_trusted.begin(); it != l_trusted.end(); ++it )
- (void) new QListViewItem(lb_trusted, (*it));
+ for ( TQStringList::Iterator it = l_trusted.begin(); it != l_trusted.end(); ++it )
+ (void) new TQListViewItem(lb_trusted, (*it));
}
void AppletTab::updateAvailable()
{
lb_available->clear();
- for ( QStringList::Iterator it = l_available.begin(); it != l_available.end(); ++it )
- (void) new QListViewItem(lb_available, (*it));
+ for ( TQStringList::Iterator it = l_available.begin(); it != l_available.end(); ++it )
+ (void) new TQListViewItem(lb_available, (*it));
}
-void AppletTab::trusted_selection_changed(QListViewItem * item)
+void AppletTab::trusted_selection_changed(TQListViewItem * item)
{
pb_remove->setEnabled(item != 0);
setChanged();
}
-void AppletTab::available_selection_changed(QListViewItem * item)
+void AppletTab::available_selection_changed(TQListViewItem * item)
{
pb_add->setEnabled(item != 0);
setChanged();
@@ -209,7 +209,7 @@ void AppletTab::available_selection_changed(QListViewItem * item)
void AppletTab::add_clicked()
{
- QListViewItem *item = lb_available->selectedItem();
+ TQListViewItem *item = lb_available->selectedItem();
if (!item) return;
l_available.remove(item->text(0));
l_trusted.append(item->text(0));
@@ -221,7 +221,7 @@ void AppletTab::add_clicked()
void AppletTab::remove_clicked()
{
- QListViewItem *item = lb_trusted->selectedItem();
+ TQListViewItem *item = lb_trusted->selectedItem();
if (!item) return;
l_trusted.remove(item->text(0));
l_available.append(item->text(0));
diff --git a/kcontrol/kicker/applettab_impl.h b/kcontrol/kicker/applettab_impl.h
index 76c071c1a..715d3a322 100644
--- a/kcontrol/kicker/applettab_impl.h
+++ b/kcontrol/kicker/applettab_impl.h
@@ -21,7 +21,7 @@
#ifndef __applettab_impl_h__
#define __applettab_impl_h__
-#include <qwidget.h>
+#include <tqwidget.h>
#include "applettab.h"
class QGroupBox;
@@ -36,22 +36,22 @@ class AppletTab : public AppletTabBase
Q_OBJECT
public:
- AppletTab( QWidget *parent=0, const char* name=0 );
+ AppletTab( TQWidget *parent=0, const char* name=0 );
void load();
void load(bool useDefaults);
void save();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
signals:
void changed();
protected slots:
void level_changed(int level);
- void trusted_selection_changed(QListViewItem *);
- void available_selection_changed(QListViewItem *);
+ void trusted_selection_changed(TQListViewItem *);
+ void available_selection_changed(TQListViewItem *);
void add_clicked();
void remove_clicked();
@@ -61,7 +61,7 @@ class AppletTab : public AppletTabBase
void updateAddRemoveButton();
private:
- QStringList available, l_available, l_trusted;
+ TQStringList available, l_available, l_trusted;
};
#endif
diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp
index 54ce23937..d1a0b2766 100644
--- a/kcontrol/kicker/extensionInfo.cpp
+++ b/kcontrol/kicker/extensionInfo.cpp
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
*/
-#include <qapplication.h>
+#include <tqapplication.h>
#include <kdebug.h>
#include <kdesktopfile.h>
@@ -25,9 +25,9 @@
#include "extensionInfo.h"
-ExtensionInfo::ExtensionInfo(const QString& desktopFile,
- const QString& configFile,
- const QString& configPath)
+ExtensionInfo::ExtensionInfo(const TQString& desktopFile,
+ const TQString& configFile,
+ const TQString& configPath)
: _configFile(configFile),
_configPath(configPath),
_desktopFile(desktopFile)
@@ -73,13 +73,13 @@ void ExtensionInfo::load()
}
kdDebug()<<"BEFORE X-KDE-PanelExt-Positions parsing"<<endl;
- QStringList allowedPos;
+ TQStringList allowedPos;
allowedPos << "BOTTOM" << "TOP" << "LEFT" << "RIGHT" << "BOTTOM";
allowedPos= df.readListEntry("X-KDE-PanelExt-Positions", allowedPos);
for (unsigned int i=0;i<allowedPos.count();i++)
{
- QString pos = allowedPos[i].upper();
+ TQString pos = allowedPos[i].upper();
kdDebug() << pos << endl;
if (pos == "LEFT")
{
@@ -170,7 +170,7 @@ void ExtensionInfo::configChanged()
_orig_position = _position = position;
}
- int alignment = c.readNumEntry ("Alignment", QApplication::reverseLayout() ? 2 : 0);
+ int alignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0);
if (alignment != _alignment && alignment != _orig_alignment)
{
_orig_alignment = _alignment = alignment;
@@ -197,8 +197,8 @@ void ExtensionInfo::setDefaults()
{
// defaults
_position = 3;
- _alignment = QApplication::reverseLayout() ? 2 : 0;
- _xineramaScreen = QApplication::desktop()->primaryScreen();
+ _alignment = TQApplication::reverseLayout() ? 2 : 0;
+ _xineramaScreen = TQApplication::desktop()->primaryScreen();
_size = 2;
_showLeftHB = false;
_showRightHB = true;
diff --git a/kcontrol/kicker/extensionInfo.h b/kcontrol/kicker/extensionInfo.h
index a8885c651..169322aa4 100644
--- a/kcontrol/kicker/extensionInfo.h
+++ b/kcontrol/kicker/extensionInfo.h
@@ -19,20 +19,20 @@
#ifndef __PANELINFO_H
#define __PANELINFO_H
-#include <qvaluelist.h>
-#include <qlistview.h>
+#include <tqvaluelist.h>
+#include <tqlistview.h>
#include <kpanelextension.h>
class ExtensionInfo;
-typedef QValueList<ExtensionInfo*> ExtensionInfoList;
+typedef TQValueList<ExtensionInfo*> ExtensionInfoList;
class ExtensionInfo
{
public:
- ExtensionInfo(const QString& destopFile,
- const QString& configFile,
- const QString& configPath);
+ ExtensionInfo(const TQString& destopFile,
+ const TQString& configFile,
+ const TQString& configPath);
~ExtensionInfo() {};
void setDefaults();
@@ -40,12 +40,12 @@ class ExtensionInfo
void load();
void configChanged();
- QString _configFile;
- QString _configPath;
- QString _desktopFile;
+ TQString _configFile;
+ TQString _configPath;
+ TQString _desktopFile;
// Configuration settings
- QString _name;
+ TQString _name;
int _position;
int _alignment;
int _xineramaScreen;
diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp
index 95899d9dc..935fa5902 100644
--- a/kcontrol/kicker/hidingconfig.cpp
+++ b/kcontrol/kicker/hidingconfig.cpp
@@ -15,8 +15,8 @@
* along with this program; if not, write to the Free Software
*/
-#include <qlayout.h>
-#include <qtimer.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
#include <klocale.h>
#include <kdebug.h>
@@ -28,10 +28,10 @@
#include "hidingconfig.h"
#include "hidingconfig.moc"
-HidingConfig::HidingConfig(QWidget *parent, const char *name)
+HidingConfig::HidingConfig(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
- QVBoxLayout *layout = new QVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
m_widget = new HidingTab(this);
layout->addWidget(m_widget);
layout->addStretch();
@@ -41,13 +41,13 @@ HidingConfig::HidingConfig(QWidget *parent, const char *name)
//addConfig(KickerSettings::self(), m_widget);
- connect(m_widget, SIGNAL(changed()),
- this, SLOT(changed()));
- connect(KickerConfig::the(), SIGNAL(aboutToNotifyKicker()),
- this, SLOT(aboutToNotifyKicker()));
+ connect(m_widget, TQT_SIGNAL(changed()),
+ this, TQT_SLOT(changed()));
+ connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()),
+ this, TQT_SLOT(aboutToNotifyKicker()));
load();
- QTimer::singleShot(0, this, SLOT(notChanged()));
+ TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
}
void HidingConfig::notChanged()
@@ -90,5 +90,5 @@ void HidingConfig::defaults()
// KConfigDialogManager may queue an changed(false) signal,
// so we make sure, that the module is labeled as changed,
// while we manage some of the widgets ourselves
- QTimer::singleShot(0, this, SLOT(changed()));
+ TQTimer::singleShot(0, this, TQT_SLOT(changed()));
}
diff --git a/kcontrol/kicker/hidingconfig.h b/kcontrol/kicker/hidingconfig.h
index c5b3d66a8..647be9631 100644
--- a/kcontrol/kicker/hidingconfig.h
+++ b/kcontrol/kicker/hidingconfig.h
@@ -27,7 +27,7 @@ class HidingConfig : public KCModule
Q_OBJECT
public:
- HidingConfig(QWidget *parent = 0, const char *name = 0);
+ HidingConfig(TQWidget *parent = 0, const char *name = 0);
void load();
void save();
diff --git a/kcontrol/kicker/hidingtab_impl.cpp b/kcontrol/kicker/hidingtab_impl.cpp
index e637b71c0..4a5a36e67 100644
--- a/kcontrol/kicker/hidingtab_impl.cpp
+++ b/kcontrol/kicker/hidingtab_impl.cpp
@@ -16,10 +16,10 @@
* along with this program; if not, write to the Free Software
*/
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qradiobutton.h>
-#include <qslider.h>
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
+#include <tqradiobutton.h>
+#include <tqslider.h>
#include <kcombobox.h>
#include <kdebug.h>
@@ -33,37 +33,37 @@
#include "hidingtab_impl.moc"
-HidingTab::HidingTab(QWidget *parent, const char* name)
+HidingTab::HidingTab(TQWidget *parent, const char* name)
: HidingTabBase(parent, name),
m_panelInfo(0)
{
// connections
- connect(m_manual,SIGNAL(toggled(bool)), SIGNAL(changed()));
- connect(m_automatic, SIGNAL(toggled(bool)), SIGNAL(changed()));
- connect(m_automatic, SIGNAL(toggled(bool)), SLOT(backgroundModeClicked()));
- connect(m_background,SIGNAL(toggled(bool)), SIGNAL(changed()));
- connect(m_background, SIGNAL(toggled(bool)), SLOT(backgroundModeClicked()));
- connect(m_hideSlider, SIGNAL(valueChanged(int)), SIGNAL(changed()));
- connect(m_delaySpinBox, SIGNAL(valueChanged(int)), SIGNAL(changed()));
- connect(m_animateHiding, SIGNAL(toggled(bool)), SIGNAL(changed()));
- connect(m_delaySpinBox, SIGNAL(valueChanged(int)), SIGNAL(changed()));
- connect(m_autoHideSwitch, SIGNAL(toggled(bool)), SIGNAL(changed()));
- connect(m_backgroundRaise, SIGNAL(toggled(bool)), SIGNAL(changed()));
- connect(m_backgroundPos, SIGNAL(activated(int)), SIGNAL(changed()));
- connect(m_lHB, SIGNAL(toggled(bool)), SIGNAL(changed()));
- connect(m_rHB, SIGNAL(toggled(bool)), SIGNAL(changed()));
-
- connect(KickerConfig::the(), SIGNAL(extensionInfoChanged()),
- SLOT(infoUpdated()));
- connect(KickerConfig::the(), SIGNAL(extensionAdded(ExtensionInfo*)),
- SLOT(extensionAdded(ExtensionInfo*)));
- connect(KickerConfig::the(), SIGNAL(extensionRemoved(ExtensionInfo*)),
- SLOT(extensionRemoved(ExtensionInfo*)));
+ connect(m_manual,TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
+ connect(m_automatic, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
+ connect(m_automatic, TQT_SIGNAL(toggled(bool)), TQT_SLOT(backgroundModeClicked()));
+ connect(m_background,TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
+ connect(m_background, TQT_SIGNAL(toggled(bool)), TQT_SLOT(backgroundModeClicked()));
+ connect(m_hideSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
+ connect(m_delaySpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
+ connect(m_animateHiding, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
+ connect(m_delaySpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
+ connect(m_autoHideSwitch, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
+ connect(m_backgroundRaise, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
+ connect(m_backgroundPos, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
+ connect(m_lHB, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
+ connect(m_rHB, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
+
+ connect(KickerConfig::the(), TQT_SIGNAL(extensionInfoChanged()),
+ TQT_SLOT(infoUpdated()));
+ connect(KickerConfig::the(), TQT_SIGNAL(extensionAdded(ExtensionInfo*)),
+ TQT_SLOT(extensionAdded(ExtensionInfo*)));
+ connect(KickerConfig::the(), TQT_SIGNAL(extensionRemoved(ExtensionInfo*)),
+ TQT_SLOT(extensionRemoved(ExtensionInfo*)));
// position tab tells hiding tab about extension selections and vice versa
- connect(KickerConfig::the(), SIGNAL(positionPanelChanged(int)),
- SLOT(switchPanel(int)));
- connect(m_panelList, SIGNAL(activated(int)),
- KickerConfig::the(), SIGNAL(hidingPanelChanged(int)));
+ connect(KickerConfig::the(), TQT_SIGNAL(positionPanelChanged(int)),
+ TQT_SLOT(switchPanel(int)));
+ connect(m_panelList, TQT_SIGNAL(activated(int)),
+ KickerConfig::the(), TQT_SIGNAL(hidingPanelChanged(int)));
}
void HidingTab::load()
diff --git a/kcontrol/kicker/hidingtab_impl.h b/kcontrol/kicker/hidingtab_impl.h
index 69e39dea0..34bc6a372 100644
--- a/kcontrol/kicker/hidingtab_impl.h
+++ b/kcontrol/kicker/hidingtab_impl.h
@@ -29,7 +29,7 @@ class HidingTab : public HidingTabBase
Q_OBJECT
public:
- HidingTab(QWidget *parent = 0, const char* name = 0);
+ HidingTab(TQWidget *parent = 0, const char* name = 0);
void load();
void save();
diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp
index 7f43f2c05..7475ad7b0 100644
--- a/kcontrol/kicker/lookandfeelconfig.cpp
+++ b/kcontrol/kicker/lookandfeelconfig.cpp
@@ -15,8 +15,8 @@
* along with this program; if not, write to the Free Software
*/
-#include <qlayout.h>
-#include <qtimer.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
#include <klocale.h>
#include <kdebug.h>
@@ -28,10 +28,10 @@
#include "lookandfeelconfig.h"
#include "lookandfeelconfig.moc"
-LookAndFeelConfig::LookAndFeelConfig(QWidget *parent, const char *name)
+LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
- QVBoxLayout *layout = new QVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
m_widget = new LookAndFeelTab(this);
layout->addWidget(m_widget);
layout->addStretch();
@@ -41,13 +41,13 @@ LookAndFeelConfig::LookAndFeelConfig(QWidget *parent, const char *name)
addConfig(KickerSettings::self(), m_widget);
- connect(m_widget, SIGNAL(changed()),
- this, SLOT(changed()));
- connect(KickerConfig::the(), SIGNAL(aboutToNotifyKicker()),
- this, SLOT(aboutToNotifyKicker()));
+ connect(m_widget, TQT_SIGNAL(changed()),
+ this, TQT_SLOT(changed()));
+ connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()),
+ this, TQT_SLOT(aboutToNotifyKicker()));
load();
- QTimer::singleShot(0, this, SLOT(notChanged()));
+ TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
}
void LookAndFeelConfig::notChanged()
@@ -90,5 +90,5 @@ void LookAndFeelConfig::defaults()
// KConfigDialogManager may queue an changed(false) signal,
// so we make sure, that the module is labeled as changed,
// while we manage some of the widgets ourselves
- QTimer::singleShot(0, this, SLOT(changed()));
+ TQTimer::singleShot(0, this, TQT_SLOT(changed()));
}
diff --git a/kcontrol/kicker/lookandfeelconfig.h b/kcontrol/kicker/lookandfeelconfig.h
index 93b331432..7b91cc52f 100644
--- a/kcontrol/kicker/lookandfeelconfig.h
+++ b/kcontrol/kicker/lookandfeelconfig.h
@@ -27,7 +27,7 @@ class LookAndFeelConfig : public KCModule
Q_OBJECT
public:
- LookAndFeelConfig(QWidget *parent = 0, const char *name = 0);
+ LookAndFeelConfig(TQWidget *parent = 0, const char *name = 0);
void load();
void save();
diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp
index ad1c6a8d8..24c640a1d 100644
--- a/kcontrol/kicker/lookandfeeltab_impl.cpp
+++ b/kcontrol/kicker/lookandfeeltab_impl.cpp
@@ -18,10 +18,10 @@
* along with this program; if not, write to the Free Software
*/
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qradiobutton.h>
-#include <qregexp.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqradiobutton.h>
+#include <tqregexp.h>
#include <kcolorbutton.h>
#include <kdebug.h>
@@ -44,25 +44,25 @@
#include <iostream>
using namespace std;
-LookAndFeelTab::LookAndFeelTab( QWidget *parent, const char* name )
+LookAndFeelTab::LookAndFeelTab( TQWidget *parent, const char* name )
: LookAndFeelTabBase(parent, name),
m_advDialog(0)
{
- connect(m_kmenuTile, SIGNAL(activated(int)), SIGNAL(changed()));
- connect(m_desktopTile, SIGNAL(activated(int)), SIGNAL(changed()));
- connect(m_browserTile, SIGNAL(activated(int)), SIGNAL(changed()));
- connect(m_urlTile, SIGNAL(activated(int)), SIGNAL(changed()));
- connect(m_windowListTile, SIGNAL(activated(int)), SIGNAL(changed()));
+ connect(m_kmenuTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
+ connect(m_desktopTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
+ connect(m_browserTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
+ connect(m_urlTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
+ connect(m_windowListTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
- connect(m_kmenuTile, SIGNAL(activated(int)), SLOT(kmenuTileChanged(int)));
- connect(m_desktopTile, SIGNAL(activated(int)), SLOT(desktopTileChanged(int)));
- connect(m_browserTile, SIGNAL(activated(int)), SLOT(browserTileChanged(int)));
- connect(m_urlTile, SIGNAL(activated(int)), SLOT(urlTileChanged(int)));
- connect(m_windowListTile, SIGNAL(activated(int)), SLOT(wlTileChanged(int)));
+ connect(m_kmenuTile, TQT_SIGNAL(activated(int)), TQT_SLOT(kmenuTileChanged(int)));
+ connect(m_desktopTile, TQT_SIGNAL(activated(int)), TQT_SLOT(desktopTileChanged(int)));
+ connect(m_browserTile, TQT_SIGNAL(activated(int)), TQT_SLOT(browserTileChanged(int)));
+ connect(m_urlTile, TQT_SIGNAL(activated(int)), TQT_SLOT(urlTileChanged(int)));
+ connect(m_windowListTile, TQT_SIGNAL(activated(int)), TQT_SLOT(wlTileChanged(int)));
- connect(kcfg_ColorizeBackground, SIGNAL(toggled(bool)), SLOT(browseTheme()));
+ connect(kcfg_ColorizeBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(browseTheme()));
- connect(kcfg_BackgroundTheme->lineEdit(), SIGNAL(lostFocus()), SLOT(browseTheme()));
+ connect(kcfg_BackgroundTheme->lineEdit(), TQT_SIGNAL(lostFocus()), TQT_SLOT(browseTheme()));
kcfg_BackgroundTheme->setFilter(KImageIO::pattern(KImageIO::Reading));
kcfg_BackgroundTheme->setCaption(i18n("Select Image File"));
@@ -74,12 +74,12 @@ void LookAndFeelTab::browseTheme()
browseTheme(kcfg_BackgroundTheme->url());
}
-void LookAndFeelTab::browseTheme(const QString& newtheme)
+void LookAndFeelTab::browseTheme(const TQString& newtheme)
{
if (newtheme.isEmpty())
{
kcfg_BackgroundTheme->clear();
- m_backgroundLabel->setPixmap(QPixmap());
+ m_backgroundLabel->setPixmap(TQPixmap());
emit changed();
return;
}
@@ -92,7 +92,7 @@ void LookAndFeelTab::launchAdvancedDialog()
if (!m_advDialog)
{
m_advDialog = new advancedDialog(this, "advancedDialog");
- connect(m_advDialog, SIGNAL(finished()), this, SLOT(finishAdvancedDialog()));
+ connect(m_advDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(finishAdvancedDialog()));
m_advDialog->show();
}
m_advDialog->setActiveWindow();
@@ -114,13 +114,13 @@ void LookAndFeelTab::enableTransparency(bool useTransparency)
kcfg_ColorizeBackground->setDisabled(useTransparency || !useBgTheme);
}
-void LookAndFeelTab::previewBackground(const QString& themepath, bool isNew)
+void LookAndFeelTab::previewBackground(const TQString& themepath, bool isNew)
{
- QString theme = themepath;
+ TQString theme = themepath;
if (theme[0] != '/')
theme = locate("data", "kicker/" + theme);
- QImage tmpImg(theme);
+ TQImage tmpImg(theme);
if(!tmpImg.isNull())
{
tmpImg = tmpImg.smoothScale(m_backgroundLabel->contentsRect().width(),
@@ -144,7 +144,7 @@ void LookAndFeelTab::previewBackground(const QString& themepath, bool isNew)
i18n("Error loading theme image file.\n\n%1\n%2")
.arg(theme, themepath));
kcfg_BackgroundTheme->clear();
- m_backgroundLabel->setPixmap(QPixmap());
+ m_backgroundLabel->setPixmap(TQPixmap());
}
void LookAndFeelTab::load()
@@ -161,7 +161,7 @@ void LookAndFeelTab::load(bool useDefaults)
config.setGroup("General");
bool use_theme = kcfg_UseBackgroundTheme->isChecked();
- QString theme = kcfg_BackgroundTheme->lineEdit()->text().stripWhiteSpace();
+ TQString theme = kcfg_BackgroundTheme->lineEdit()->text().stripWhiteSpace();
bool transparent = kcfg_Transparent->isChecked();
@@ -174,7 +174,7 @@ void LookAndFeelTab::load(bool useDefaults)
previewBackground(theme, false);
}
- QString tile;
+ TQString tile;
config.setGroup("buttons");
kmenuTileChanged(m_kmenuTile->currentItem());
@@ -319,22 +319,22 @@ void LookAndFeelTab::fillTileCombos()
m_tilename.clear();
m_tilename << "" << "Colorize";
- QStringList list = KGlobal::dirs()->findAllResources("tiles","*_tiny_up.png");
+ TQStringList list = KGlobal::dirs()->findAllResources("tiles","*_tiny_up.png");
int minHeight = 0;
- for (QStringList::Iterator it = list.begin(); it != list.end(); ++it)
+ for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it)
{
- QString tile = (*it);
- QPixmap pix(tile);
- QFileInfo fi(tile);
+ TQString tile = (*it);
+ TQPixmap pix(tile);
+ TQFileInfo fi(tile);
tile = fi.fileName();
tile.truncate(tile.find("_tiny_up.png"));
m_tilename << tile;
// Transform tile to words with title case
// The same is done when generating messages for translation
- QStringList words = QStringList::split(QRegExp("[_ ]"), tile);
- for (QStringList::iterator w = words.begin(); w != words.end(); ++w)
+ TQStringList words = TQStringList::split(TQRegExp("[_ ]"), tile);
+ for (TQStringList::iterator w = words.begin(); w != words.end(); ++w)
(*w)[0] = (*w)[0].upper();
tile = i18n(words.join(" ").utf8());
diff --git a/kcontrol/kicker/lookandfeeltab_impl.h b/kcontrol/kicker/lookandfeeltab_impl.h
index 54ef5b00d..704a359db 100644
--- a/kcontrol/kicker/lookandfeeltab_impl.h
+++ b/kcontrol/kicker/lookandfeeltab_impl.h
@@ -31,25 +31,25 @@ class LookAndFeelTab : public LookAndFeelTabBase
Q_OBJECT
public:
- LookAndFeelTab(QWidget *parent = 0, const char* name = 0);
+ LookAndFeelTab(TQWidget *parent = 0, const char* name = 0);
void load();
void load(bool useDefaults);
void save();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
signals:
void changed();
protected:
void fillTileCombos();
- void previewBackground(const QString& themepath, bool isNew);
+ void previewBackground(const TQString& themepath, bool isNew);
protected slots:
void browseTheme();
- void browseTheme(const QString&);
+ void browseTheme(const TQString&);
void enableTransparency( bool );
void launchAdvancedDialog();
@@ -62,8 +62,8 @@ protected slots:
void wlTileChanged(int i);
private:
- QPixmap theme_preview;
- QStringList m_tilename;
+ TQPixmap theme_preview;
+ TQStringList m_tilename;
advancedDialog *m_advDialog;
};
diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp
index 50be83e89..bfdb3a491 100644
--- a/kcontrol/kicker/lookandfeeltab_kcm.cpp
+++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
*/
-#include <qlayout.h>
+#include <tqlayout.h>
#include <dcopclient.h>
@@ -28,7 +28,7 @@
#include <kaboutdata.h>
#include <kdialog.h>
-LookAndFeelConfig::LookAndFeelConfig(QWidget *parent, const char *name)
+LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
@@ -42,13 +42,13 @@ LookAndFeelConfig::LookAndFeelConfig(QWidget *parent, const char *name)
setAboutData( about );
KickerConfig::initScreenNumber();
- QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
lookandfeeltab = new LookAndFeelTab(this);
layout->addWidget(lookandfeeltab);
layout->addStretch();
- connect(lookandfeeltab, SIGNAL(changed()), SLOT(configChanged()));
+ connect(lookandfeeltab, TQT_SIGNAL(changed()), TQT_SLOT(configChanged()));
load();
}
@@ -81,7 +81,7 @@ void LookAndFeelConfig::defaults()
emit changed(true);
}
-QString LookAndFeelConfig::quickHelp() const
+TQString LookAndFeelConfig::quickHelp() const
{
return i18n("<h1>Panel</h1> Here you can configure the KDE panel (also"
" referred to as 'kicker'). This includes options like the position and"
diff --git a/kcontrol/kicker/lookandfeeltab_kcm.h b/kcontrol/kicker/lookandfeeltab_kcm.h
index 356becf5e..085f87e43 100644
--- a/kcontrol/kicker/lookandfeeltab_kcm.h
+++ b/kcontrol/kicker/lookandfeeltab_kcm.h
@@ -27,12 +27,12 @@ class LookAndFeelConfig : public KCModule
Q_OBJECT
public:
- LookAndFeelConfig(QWidget *parent = 0L, const char *name = 0L);
+ LookAndFeelConfig(TQWidget *parent = 0L, const char *name = 0L);
void load();
void save();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
public slots:
void configChanged();
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index 26ec93b39..e60746db8 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
*/
-#include <qcombobox.h>
+#include <tqcombobox.h>
#include <dcopclient.h>
#include <kaboutdata.h>
@@ -51,8 +51,8 @@ KickerConfig *KickerConfig::the()
return m_self;
}
-KickerConfig::KickerConfig(QWidget *parent, const char *name)
- : QObject(parent, name),
+KickerConfig::KickerConfig(TQWidget *parent, const char *name)
+ : TQObject(parent, name),
DCOPObject("KickerConfig"),
configFileWatch(new KDirWatch(this)),
m_currentPanelIndex(0)
@@ -64,19 +64,19 @@ KickerConfig::KickerConfig(QWidget *parent, const char *name)
init();
kapp->dcopClient()->setNotifications(true);
- connectDCOPSignal("kicker", "kicker", "configSwitchToPanel(QString)",
- "jumpToPanel(QString)", false);
- kapp->dcopClient()->send("kicker", "kicker", "configLaunched()", QByteArray());
-
- connect(this, SIGNAL(hidingPanelChanged(int)),
- this, SLOT(setCurrentPanelIndex(int)));
- connect(this, SIGNAL(positionPanelChanged(int)),
- this, SLOT(setCurrentPanelIndex(int)));
+ connectDCOPSignal("kicker", "kicker", "configSwitchToPanel(TQString)",
+ "jumpToPanel(TQString)", false);
+ kapp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray());
+
+ connect(this, TQT_SIGNAL(hidingPanelChanged(int)),
+ this, TQT_SLOT(setCurrentPanelIndex(int)));
+ connect(this, TQT_SIGNAL(positionPanelChanged(int)),
+ this, TQT_SLOT(setCurrentPanelIndex(int)));
}
KickerConfig::~KickerConfig()
{
- // QValueList::setAutoDelete where for art thou?
+ // TQValueList::setAutoDelete where for art thou?
ExtensionInfoList::iterator it = m_extensionInfo.begin();
while (it != m_extensionInfo.end())
{
@@ -90,7 +90,7 @@ KickerConfig::~KickerConfig()
// this method may get called multiple times during the life of the control panel!
void KickerConfig::init()
{
- disconnect(configFileWatch, SIGNAL(dirty(const QString&)), this, SLOT(configChanged(const QString&)));
+ disconnect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&)));
configFileWatch->stopScan();
for (ExtensionInfoList::iterator it = m_extensionInfo.begin();
it != m_extensionInfo.end();
@@ -99,8 +99,8 @@ void KickerConfig::init()
configFileWatch->removeFile((*it)->_configPath);
}
- QString configname = configName();
- QString configpath = KGlobal::dirs()->findResource("config", configname);
+ TQString configname = configName();
+ TQString configpath = KGlobal::dirs()->findResource("config", configname);
if (configpath.isEmpty())
configpath = locateLocal("config", configname);
KSharedConfig::Ptr config = KSharedConfig::openConfig(configname);
@@ -108,7 +108,7 @@ void KickerConfig::init()
if (m_extensionInfo.isEmpty())
{
// our list is empty, so add the main kicker config
- m_extensionInfo.append(new ExtensionInfo(QString::null, configname, configpath));
+ m_extensionInfo.append(new ExtensionInfo(TQString::null, configname, configpath));
configFileWatch->addFile(configpath);
}
else
@@ -128,7 +128,7 @@ void KickerConfig::init()
setupExtensionInfo(*config, true, true);
- connect(configFileWatch, SIGNAL(dirty(const QString&)), this, SLOT(configChanged(const QString&)));
+ connect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&)));
configFileWatch->startScan();
}
@@ -139,7 +139,7 @@ void KickerConfig::restartKicker()
{
kapp->dcopClient()->attach();
}
- QCString appname;
+ TQCString appname;
appname = "kicker";
kapp->dcopClient()->send(appname, appname, "restart", "");
}
@@ -156,8 +156,8 @@ void KickerConfig::notifyKicker()
kapp->dcopClient()->attach();
}
- QByteArray data;
- QCString appname;
+ TQByteArray data;
+ TQCString appname;
if (m_screenNumber == 0)
{
@@ -174,17 +174,17 @@ void KickerConfig::notifyKicker()
void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool reloadIfExists)
{
config.setGroup("General");
- QStringList elist = config.readListEntry("Extensions2");
+ TQStringList elist = config.readListEntry("Extensions2");
// all of our existing extensions
// we'll remove ones we find which are still there the oldExtensions, and delete
// all the extensions that remain (e.g. are no longer active)
ExtensionInfoList oldExtensions(m_extensionInfo);
- for (QStringList::Iterator it = elist.begin(); it != elist.end(); ++it)
+ for (TQStringList::Iterator it = elist.begin(); it != elist.end(); ++it)
{
// extension id
- QString group(*it);
+ TQString group(*it);
// is there a config group for this extension?
if (!config.hasGroup(group) || group.contains("Extension") < 1)
@@ -195,9 +195,9 @@ void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool re
// set config group
config.setGroup(group);
- QString df = KGlobal::dirs()->findResource("extensions", config.readEntry("DesktopFile"));
- QString configname = config.readEntry("ConfigFile");
- QString configpath = KGlobal::dirs()->findResource("config", configname);
+ TQString df = KGlobal::dirs()->findResource("extensions", config.readEntry("DesktopFile"));
+ TQString configname = config.readEntry("ConfigFile");
+ TQString configpath = KGlobal::dirs()->findResource("config", configname);
if (checkExists)
{
@@ -245,7 +245,7 @@ void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool re
}
}
-void KickerConfig::configChanged(const QString& configPath)
+void KickerConfig::configChanged(const TQString& configPath)
{
if (configPath.endsWith(configName()))
{
@@ -268,7 +268,7 @@ void KickerConfig::configChanged(const QString& configPath)
emit extensionChanged(configPath);
}
-void KickerConfig::populateExtensionInfoList(QComboBox* list)
+void KickerConfig::populateExtensionInfoList(TQComboBox* list)
{
list->clear();
for (ExtensionInfoList::iterator it = m_extensionInfo.begin(); it != m_extensionInfo.end(); ++it)
@@ -300,7 +300,7 @@ void KickerConfig::saveExtentionInfo()
}
}
-void KickerConfig::jumpToPanel(const QString& panelConfig)
+void KickerConfig::jumpToPanel(const TQString& panelConfig)
{
ExtensionInfoList::iterator it = m_extensionInfo.begin();
int index = 0;
@@ -323,7 +323,7 @@ void KickerConfig::jumpToPanel(const QString& panelConfig)
emit positionPanelChanged(index);
}
-QString KickerConfig::configName()
+TQString KickerConfig::configName()
{
if (m_screenNumber == 0)
{
@@ -331,7 +331,7 @@ QString KickerConfig::configName()
}
else
{
- return QString("kicker-screen-%1rc").arg(m_screenNumber);
+ return TQString("kicker-screen-%1rc").arg(m_screenNumber);
}
}
@@ -340,7 +340,7 @@ void KickerConfig::setCurrentPanelIndex(int index)
m_currentPanelIndex = index;
}
-QString KickerConfig::quickHelp() const
+TQString KickerConfig::quickHelp() const
{
return i18n("<h1>Panel</h1> Here you can configure the KDE panel (also"
" referred to as 'kicker'). This includes options like the position and"
@@ -371,7 +371,7 @@ KAboutData *KickerConfig::aboutData()
extern "C"
{
- KDE_EXPORT KCModule *create_kicker(QWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_kicker(TQWidget *parent, const char *name)
{
KCModuleContainer *container = new KCModuleContainer(parent, "kcmkicker");
container->addModule("kicker_config_arrangement");
@@ -381,26 +381,26 @@ extern "C"
return container;
}
- KDE_EXPORT KCModule *create_kicker_arrangement(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
{
KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
"kicker/extensions");
return new PositionConfig(parent, "kcmkicker");
}
- KDE_EXPORT KCModule *create_kicker_hiding(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
{
KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
"kicker/extensions");
return new HidingConfig(parent, "kcmkicker");
}
- KDE_EXPORT KCModule *create_kicker_menus(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_kicker_menus(TQWidget *parent, const char * /*name*/)
{
return new MenuConfig(parent, "kcmkicker");
}
- KDE_EXPORT KCModule *create_kicker_appearance(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
{
KImageIO::registerFormats();
KGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") +
diff --git a/kcontrol/kicker/main.h b/kcontrol/kicker/main.h
index 1797f7637..1af4fbf8d 100644
--- a/kcontrol/kicker/main.h
+++ b/kcontrol/kicker/main.h
@@ -27,7 +27,7 @@ class QComboBox;
class KAboutData;
class KDirWatch;
-class KickerConfig : public QObject, public DCOPObject
+class KickerConfig : public TQObject, public DCOPObject
{
Q_OBJECT
K_DCOP
@@ -36,22 +36,22 @@ public:
static KickerConfig *the();
~KickerConfig();
- void populateExtensionInfoList(QComboBox* list);
+ void populateExtensionInfoList(TQComboBox* list);
void reloadExtensionInfo();
void saveExtentionInfo();
const ExtensionInfoList& extensionsInfo();
- QString configName();
+ TQString configName();
void notifyKicker();
void restartKicker();
- QString quickHelp() const;
+ TQString quickHelp() const;
KAboutData *aboutData();
int currentPanelIndex() const { return m_currentPanelIndex; }
k_dcop:
- void jumpToPanel(const QString& panelConfig);
+ void jumpToPanel(const TQString& panelConfig);
signals:
void positionPanelChanged(int);
@@ -59,8 +59,8 @@ signals:
void extensionInfoChanged();
void extensionAdded(ExtensionInfo*);
void extensionRemoved(ExtensionInfo*);
- void extensionChanged(const QString&);
- void extensionAboutToChange(const QString&);
+ void extensionChanged(const TQString&);
+ void extensionAboutToChange(const TQString&);
void aboutToNotifyKicker();
protected:
@@ -68,11 +68,11 @@ protected:
void setupExtensionInfo(KConfig& c, bool checkExists, bool reloadIfExists = false);
protected slots:
- void configChanged(const QString&);
+ void configChanged(const TQString&);
void setCurrentPanelIndex(int);
private:
- KickerConfig(QWidget *parent = 0, const char *name = 0);
+ KickerConfig(TQWidget *parent = 0, const char *name = 0);
static KickerConfig *m_self;
diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp
index 5bc1964b1..03ca57582 100644
--- a/kcontrol/kicker/menuconfig.cpp
+++ b/kcontrol/kicker/menuconfig.cpp
@@ -15,8 +15,8 @@
* along with this program; if not, write to the Free Software
*/
-#include <qlayout.h>
-#include <qtimer.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
#include <klocale.h>
#include <kdebug.h>
@@ -28,10 +28,10 @@
#include "menuconfig.h"
#include "menuconfig.moc"
-MenuConfig::MenuConfig(QWidget *parent, const char *name)
+MenuConfig::MenuConfig(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
- QVBoxLayout *layout = new QVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
m_widget = new MenuTab(this);
layout->addWidget(m_widget);
layout->addStretch();
@@ -41,13 +41,13 @@ MenuConfig::MenuConfig(QWidget *parent, const char *name)
addConfig(KickerSettings::self(), m_widget);
- connect(m_widget, SIGNAL(changed()),
- this, SLOT(changed()));
- connect(KickerConfig::the(), SIGNAL(aboutToNotifyKicker()),
- this, SLOT(aboutToNotifyKicker()));
+ connect(m_widget, TQT_SIGNAL(changed()),
+ this, TQT_SLOT(changed()));
+ connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()),
+ this, TQT_SLOT(aboutToNotifyKicker()));
load();
- QTimer::singleShot(0, this, SLOT(notChanged()));
+ TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
}
void MenuConfig::notChanged()
@@ -90,5 +90,5 @@ void MenuConfig::defaults()
// KConfigDialogManager may queue an changed(false) signal,
// so we make sure, that the module is labeled as changedm,
// while we manage some of the widgets ourselves
- QTimer::singleShot(0, this, SLOT(changed()));
+ TQTimer::singleShot(0, this, TQT_SLOT(changed()));
}
diff --git a/kcontrol/kicker/menuconfig.h b/kcontrol/kicker/menuconfig.h
index 3d73f1922..490684076 100644
--- a/kcontrol/kicker/menuconfig.h
+++ b/kcontrol/kicker/menuconfig.h
@@ -27,7 +27,7 @@ class MenuConfig : public KCModule
Q_OBJECT
public:
- MenuConfig(QWidget *parent = 0, const char *name = 0);
+ MenuConfig(TQWidget *parent = 0, const char *name = 0);
void load();
void save();
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 935f04684..df06945be 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -15,12 +15,12 @@
* along with this program; if not, write to the Free Software
*/
-#include <qcheckbox.h>
-#include <qdir.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
+#include <tqcheckbox.h>
+#include <tqdir.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -42,19 +42,19 @@
#include "menutab_impl.h"
#include "menutab_impl.moc"
-kSubMenuItem::kSubMenuItem(QListView* parent,
- const QString& visibleName,
- const QString& desktopFile,
- const QPixmap& icon,
+kSubMenuItem::kSubMenuItem(TQListView* parent,
+ const TQString& visibleName,
+ const TQString& desktopFile,
+ const TQPixmap& icon,
bool checked)
- : QCheckListItem(parent, visibleName, QCheckListItem::CheckBox),
+ : TQCheckListItem(parent, visibleName, TQCheckListItem::CheckBox),
m_desktopFile(desktopFile)
{
setPixmap(0, icon);
setOn(checked);
}
-QString kSubMenuItem::desktopFile()
+TQString kSubMenuItem::desktopFile()
{
return m_desktopFile;
}
@@ -64,32 +64,32 @@ void kSubMenuItem::stateChange(bool state)
emit toggled(state);
}
-MenuTab::MenuTab( QWidget *parent, const char* name )
+MenuTab::MenuTab( TQWidget *parent, const char* name )
: MenuTabBase (parent, name),
m_bookmarkMenu(0),
m_quickBrowserMenu(0)
{
// connections
- connect(m_editKMenuButton, SIGNAL(clicked()), SLOT(launchMenuEditor()));
- connect(btnCustomKMenuIcon, SIGNAL(clicked()), SLOT(launchIconEditor()));
- connect(kcfg_KMenuText, SIGNAL(textChanged(QString)), SLOT(kmenuChanged()));
- connect(kcfg_ShowKMenuText, SIGNAL(toggled(bool)), SLOT(kmenuChanged()));
- //connect(kcfg_ButtonFont, SIGNAL(fontSelected(const QFont &)), SLOT(kmenuChanged()));
- connect(maxrecentdocs, SIGNAL(valueChanged(int)), this, SLOT(changed()));
+ connect(m_editKMenuButton, TQT_SIGNAL(clicked()), TQT_SLOT(launchMenuEditor()));
+ connect(btnCustomKMenuIcon, TQT_SIGNAL(clicked()), TQT_SLOT(launchIconEditor()));
+ connect(kcfg_KMenuText, TQT_SIGNAL(textChanged(TQString)), TQT_SLOT(kmenuChanged()));
+ connect(kcfg_ShowKMenuText, TQT_SIGNAL(toggled(bool)), TQT_SLOT(kmenuChanged()));
+ //connect(kcfg_ButtonFont, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(kmenuChanged()));
+ connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
KIconLoader * ldr = KGlobal::iconLoader();
- QPixmap kmenu_icon;
+ TQPixmap kmenu_icon;
m_kmenu_icon = KickerSettings::customKMenuIcon();
if (m_kmenu_icon.isNull() == true) {
- m_kmenu_icon = QString("kmenu");
+ m_kmenu_icon = TQString("kmenu");
}
kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall);
btnCustomKMenuIcon->setPixmap(kmenu_icon);
KConfig *config;
- config = new KConfig(QString::fromLatin1("kdeglobals"), false, false);
- config->setGroup(QString::fromLatin1("RecentDocuments"));
- maxrecentdocs->setValue(config->readNumEntry(QString::fromLatin1("MaxEntries"), 10));
+ config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
+ config->setGroup(TQString::fromLatin1("RecentDocuments"));
+ maxrecentdocs->setValue(config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10));
m_browserGroupLayout->setColStretch( 1, 1 );
m_pRecentOrderGroupLayout->setColStretch( 1, 1 );
@@ -113,29 +113,29 @@ void MenuTab::load( bool useDefaults )
// show the bookmark menu?
m_bookmarkMenu = new kSubMenuItem(m_subMenus,
i18n("Bookmarks"),
- QString::null,
+ TQString::null,
SmallIcon("bookmark"),
c->readBoolEntry("UseBookmarks", false));
- connect(m_bookmarkMenu, SIGNAL(toggled(bool)), SIGNAL(changed()));
+ connect(m_bookmarkMenu, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
// show the quick menus menu?
m_quickBrowserMenu = new kSubMenuItem(m_subMenus,
i18n("Quick Browser"),
- QString::null,
+ TQString::null,
SmallIcon("kdisknav"),
c->readBoolEntry("UseBrowser", false));
- connect(m_quickBrowserMenu, SIGNAL(toggled(bool)), SIGNAL(changed()));
+ connect(m_quickBrowserMenu, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
- QStringList ext_default;
+ TQStringList ext_default;
ext_default << "prefmenu.desktop" << "systemmenu.desktop";
- QStringList ext = c->readListEntry("Extensions", ext_default);
- QStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/menuext");
+ TQStringList ext = c->readListEntry("Extensions", ext_default);
+ TQStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/menuext");
kSubMenuItem* menuItem(0);
- for (QStringList::ConstIterator dit=dirs.begin(); dit!=dirs.end(); ++dit)
+ for (TQStringList::ConstIterator dit=dirs.begin(); dit!=dirs.end(); ++dit)
{
- QDir d(*dit, "*.desktop");
- QStringList av = d.entryList();
- for (QStringList::ConstIterator it=av.begin(); it!=av.end(); ++it)
+ TQDir d(*dit, "*.desktop");
+ TQStringList av = d.entryList();
+ for (TQStringList::ConstIterator it=av.begin(); it!=av.end(); ++it)
{
KDesktopFile df(d.absFilePath(*it), true);
menuItem = new kSubMenuItem(m_subMenus,
@@ -143,7 +143,7 @@ void MenuTab::load( bool useDefaults )
*it,
SmallIcon(df.readIcon()),
qFind(ext.begin(), ext.end(), *it) != ext.end());
- connect(menuItem, SIGNAL(toggled(bool)), SIGNAL(changed()));
+ connect(menuItem, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
}
}
@@ -159,8 +159,8 @@ void MenuTab::save()
c->setGroup("menus");
- QStringList ext;
- QListViewItem *item(0);
+ TQStringList ext;
+ TQListViewItem *item(0);
for (item = m_subMenus->firstChild(); item; item = item->nextSibling())
{
bool isOn = static_cast<kSubMenuItem*>(item)->isOn();
@@ -188,8 +188,8 @@ void MenuTab::save()
// Save recent documents
KConfig *config;
- config = new KConfig(QString::fromLatin1("kdeglobals"), false, false);
- config->setGroup(QString::fromLatin1("RecentDocuments"));
+ config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
+ config->setGroup(TQString::fromLatin1("RecentDocuments"));
config->writeEntry("MaxEntries", maxrecentdocs->value());
config->sync();
@@ -206,7 +206,7 @@ void MenuTab::defaults()
void MenuTab::launchMenuEditor()
{
if ( KApplication::startServiceByDesktopName( "kmenuedit",
- QString::null /*url*/,
+ TQString::null /*url*/,
0 /*error*/,
0 /*dcopservice*/,
0 /*pid*/,
@@ -223,13 +223,13 @@ void MenuTab::launchMenuEditor()
void MenuTab::launchIconEditor()
{
KIconDialog dlg(this);
- QString newIcon = dlg.selectIcon(KIcon::Small, KIcon::Application);
+ TQString newIcon = dlg.selectIcon(KIcon::Small, KIcon::Application);
if (newIcon.isEmpty())
return;
m_kmenu_icon = newIcon;
KIconLoader * ldr = KGlobal::iconLoader();
- QPixmap kmenu_icon;
+ TQPixmap kmenu_icon;
kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall);
btnCustomKMenuIcon->setPixmap(kmenu_icon);
m_kmenu_button_changed = true;
diff --git a/kcontrol/kicker/menutab_impl.h b/kcontrol/kicker/menutab_impl.h
index 71c669048..3d0e09748 100644
--- a/kcontrol/kicker/menutab_impl.h
+++ b/kcontrol/kicker/menutab_impl.h
@@ -18,23 +18,23 @@
#ifndef __menutab_impl_h__
#define __menutab_impl_h__
-#include <qlistview.h>
+#include <tqlistview.h>
#include "menutab.h"
-class kSubMenuItem : public QObject, public QCheckListItem
+class kSubMenuItem : public TQObject, public QCheckListItem
{
Q_OBJECT
public:
- kSubMenuItem(QListView* parent,
- const QString& visibleName,
- const QString& desktopFile,
- const QPixmap& icon,
+ kSubMenuItem(TQListView* parent,
+ const TQString& visibleName,
+ const TQString& desktopFile,
+ const TQPixmap& icon,
bool checked);
~kSubMenuItem() {}
- QString desktopFile();
+ TQString desktopFile();
signals:
void toggled(bool);
@@ -42,7 +42,7 @@ class kSubMenuItem : public QObject, public QCheckListItem
protected:
void stateChange(bool state);
- QString m_desktopFile;
+ TQString m_desktopFile;
};
class MenuTab : public MenuTabBase
@@ -50,7 +50,7 @@ class MenuTab : public MenuTabBase
Q_OBJECT
public:
- MenuTab( QWidget *parent=0, const char* name=0 );
+ MenuTab( TQWidget *parent=0, const char* name=0 );
void load();
void load( bool useDefaults );
@@ -68,7 +68,7 @@ public slots:
protected:
kSubMenuItem *m_bookmarkMenu;
kSubMenuItem *m_quickBrowserMenu;
- QString m_kmenu_icon;
+ TQString m_kmenu_icon;
bool m_kmenu_button_changed;
};
diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp
index 86a94ed21..6e5dcdeb2 100644
--- a/kcontrol/kicker/positionconfig.cpp
+++ b/kcontrol/kicker/positionconfig.cpp
@@ -15,8 +15,8 @@
* along with this program; if not, write to the Free Software
*/
-#include <qlayout.h>
-#include <qtimer.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
#include <klocale.h>
#include <kdebug.h>
@@ -28,10 +28,10 @@
#include "positionconfig.h"
#include "positionconfig.moc"
-PositionConfig::PositionConfig(QWidget *parent, const char *name)
+PositionConfig::PositionConfig(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
- QVBoxLayout *layout = new QVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
m_widget = new PositionTab(this);
layout->addWidget(m_widget);
layout->addStretch();
@@ -41,13 +41,13 @@ PositionConfig::PositionConfig(QWidget *parent, const char *name)
//addConfig(KickerSettings::self(), m_widget);
- connect(m_widget, SIGNAL(changed()),
- this, SLOT(changed()));
- connect(KickerConfig::the(), SIGNAL(aboutToNotifyKicker()),
- this, SLOT(aboutToNotifyKicker()));
+ connect(m_widget, TQT_SIGNAL(changed()),
+ this, TQT_SLOT(changed()));
+ connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()),
+ this, TQT_SLOT(aboutToNotifyKicker()));
load();
- QTimer::singleShot(0, this, SLOT(notChanged()));
+ TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
}
void PositionConfig::notChanged()
@@ -90,5 +90,5 @@ void PositionConfig::defaults()
// KConfigDialogManager may queue an changed(false) signal,
// so we make sure, that the module is labeled as changed,
// while we manage some of the widgets ourselves
- QTimer::singleShot(0, this, SLOT(changed()));
+ TQTimer::singleShot(0, this, TQT_SLOT(changed()));
}
diff --git a/kcontrol/kicker/positionconfig.h b/kcontrol/kicker/positionconfig.h
index 8fc1c885f..bf29473b4 100644
--- a/kcontrol/kicker/positionconfig.h
+++ b/kcontrol/kicker/positionconfig.h
@@ -27,7 +27,7 @@ class PositionConfig : public KCModule
Q_OBJECT
public:
- PositionConfig(QWidget *parent = 0, const char *name = 0);
+ PositionConfig(TQWidget *parent = 0, const char *name = 0);
void load();
void save();
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index 22f38e0a1..5bc9e2eb1 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -18,14 +18,14 @@
#include <stdlib.h>
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qslider.h>
-#include <qtooltip.h>
-#include <qtimer.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
+#include <tqslider.h>
+#include <tqtooltip.h>
+#include <tqtimer.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -50,7 +50,7 @@ extern const int maxX = 150;
extern const int maxY = 114;
extern const int margin = 1;
-PositionTab::PositionTab(QWidget *parent, const char* name)
+PositionTab::PositionTab(TQWidget *parent, const char* name)
: PositionTabBase(parent, name),
m_pretendPanel(0),
m_desktopPreview(0),
@@ -58,103 +58,103 @@ PositionTab::PositionTab(QWidget *parent, const char* name)
m_panelPos(PosBottom),
m_panelAlign(AlignLeft)
{
- QPixmap monitor(locate("data", "kcontrol/pics/monitor.png"));
+ TQPixmap monitor(locate("data", "kcontrol/pics/monitor.png"));
m_monitorImage->setPixmap(monitor);
m_monitorImage->setFixedSize(m_monitorImage->sizeHint());
- m_pretendDesktop = new QWidget(m_monitorImage, "pretendBG");
+ m_pretendDesktop = new TQWidget(m_monitorImage, "pretendBG");
m_pretendDesktop->setGeometry(offsetX, offsetY, maxX, maxY);
- m_pretendPanel = new QFrame(m_monitorImage, "pretendPanel");
+ m_pretendPanel = new TQFrame(m_monitorImage, "pretendPanel");
m_pretendPanel->setGeometry(offsetX + margin, maxY + offsetY - 10,
maxX - margin, 10 - margin);
- m_pretendPanel->setFrameShape(QFrame::MenuBarPanel);
+ m_pretendPanel->setFrameShape(TQFrame::MenuBarPanel);
/*
* set the tooltips on the buttons properly for RTL langs
*/
if (kapp->reverseLayout())
{
- QToolTip::add(locationTopRight, i18n("Top left"));
- QToolTip::add(locationTop, i18n("Top center"));
- QToolTip::add(locationTopLeft, i18n("Top right" ) );
- QToolTip::add(locationRightTop, i18n("Left top"));
- QToolTip::add(locationRight, i18n("Left center"));
- QToolTip::add(locationRightBottom, i18n("Left bottom"));
- QToolTip::add(locationBottomRight, i18n("Bottom left"));
- QToolTip::add(locationBottom, i18n("Bottom center"));
- QToolTip::add(locationBottomLeft, i18n("Bottom right"));
- QToolTip::add(locationLeftTop, i18n("Right top"));
- QToolTip::add(locationLeft, i18n("Right center"));
- QToolTip::add(locationLeftBottom, i18n("Right bottom"));
+ TQToolTip::add(locationTopRight, i18n("Top left"));
+ TQToolTip::add(locationTop, i18n("Top center"));
+ TQToolTip::add(locationTopLeft, i18n("Top right" ) );
+ TQToolTip::add(locationRightTop, i18n("Left top"));
+ TQToolTip::add(locationRight, i18n("Left center"));
+ TQToolTip::add(locationRightBottom, i18n("Left bottom"));
+ TQToolTip::add(locationBottomRight, i18n("Bottom left"));
+ TQToolTip::add(locationBottom, i18n("Bottom center"));
+ TQToolTip::add(locationBottomLeft, i18n("Bottom right"));
+ TQToolTip::add(locationLeftTop, i18n("Right top"));
+ TQToolTip::add(locationLeft, i18n("Right center"));
+ TQToolTip::add(locationLeftBottom, i18n("Right bottom"));
}
else
{
- QToolTip::add(locationTopLeft, i18n("Top left"));
- QToolTip::add(locationTop, i18n("Top center"));
- QToolTip::add(locationTopRight, i18n("Top right" ) );
- QToolTip::add(locationLeftTop, i18n("Left top"));
- QToolTip::add(locationLeft, i18n("Left center"));
- QToolTip::add(locationLeftBottom, i18n("Left bottom"));
- QToolTip::add(locationBottomLeft, i18n("Bottom left"));
- QToolTip::add(locationBottom, i18n("Bottom center"));
- QToolTip::add(locationBottomRight, i18n("Bottom right"));
- QToolTip::add(locationRightTop, i18n("Right top"));
- QToolTip::add(locationRight, i18n("Right center"));
- QToolTip::add(locationRightBottom, i18n("Right bottom"));
+ TQToolTip::add(locationTopLeft, i18n("Top left"));
+ TQToolTip::add(locationTop, i18n("Top center"));
+ TQToolTip::add(locationTopRight, i18n("Top right" ) );
+ TQToolTip::add(locationLeftTop, i18n("Left top"));
+ TQToolTip::add(locationLeft, i18n("Left center"));
+ TQToolTip::add(locationLeftBottom, i18n("Left bottom"));
+ TQToolTip::add(locationBottomLeft, i18n("Bottom left"));
+ TQToolTip::add(locationBottom, i18n("Bottom center"));
+ TQToolTip::add(locationBottomRight, i18n("Bottom right"));
+ TQToolTip::add(locationRightTop, i18n("Right top"));
+ TQToolTip::add(locationRight, i18n("Right center"));
+ TQToolTip::add(locationRightBottom, i18n("Right bottom"));
}
// connections
- connect(m_locationGroup, SIGNAL(clicked(int)), SIGNAL(changed()));
- connect(m_xineramaScreenComboBox, SIGNAL(highlighted(int)), SIGNAL(changed()));
+ connect(m_locationGroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed()));
+ connect(m_xineramaScreenComboBox, TQT_SIGNAL(highlighted(int)), TQT_SIGNAL(changed()));
- connect(m_identifyButton,SIGNAL(clicked()),SLOT(showIdentify()));
+ connect(m_identifyButton,TQT_SIGNAL(clicked()),TQT_SLOT(showIdentify()));
- for(int s=0; s < QApplication::desktop()->numScreens(); s++)
+ for(int s=0; s < TQApplication::desktop()->numScreens(); s++)
{ /* populate the combobox for the available screens */
- m_xineramaScreenComboBox->insertItem(QString::number(s+1));
+ m_xineramaScreenComboBox->insertItem(TQString::number(s+1));
}
m_xineramaScreenComboBox->insertItem(i18n("All Screens"));
// hide the xinerama chooser widgets if there is no need for them
- if (QApplication::desktop()->numScreens() < 2)
+ if (TQApplication::desktop()->numScreens() < 2)
{
m_identifyButton->hide();
m_xineramaScreenComboBox->hide();
m_xineramaScreenLabel->hide();
}
- connect(m_percentSlider, SIGNAL(valueChanged(int)), SIGNAL(changed()));
- connect(m_percentSpinBox, SIGNAL(valueChanged(int)), SIGNAL(changed()));
- connect(m_expandCheckBox, SIGNAL(clicked()), SIGNAL(changed()));
+ connect(m_percentSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
+ connect(m_percentSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
+ connect(m_expandCheckBox, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()));
- connect(m_sizeGroup, SIGNAL(clicked(int)), SIGNAL(changed()));
- connect(m_customSlider, SIGNAL(valueChanged(int)), SIGNAL(changed()));
- connect(m_customSpinbox, SIGNAL(valueChanged(int)), SIGNAL(changed()));
+ connect(m_sizeGroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed()));
+ connect(m_customSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
+ connect(m_customSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
m_desktopPreview = new KVirtualBGRenderer(0);
- connect(m_desktopPreview, SIGNAL(imageDone(int)),
- SLOT(slotBGPreviewReady(int)));
-
- connect(KickerConfig::the(), SIGNAL(extensionInfoChanged()),
- SLOT(infoUpdated()));
- connect(KickerConfig::the(), SIGNAL(extensionAdded(ExtensionInfo*)),
- SLOT(extensionAdded(ExtensionInfo*)));
- connect(KickerConfig::the(), SIGNAL(extensionRemoved(ExtensionInfo*)),
- SLOT(extensionRemoved(ExtensionInfo*)));
- connect(KickerConfig::the(), SIGNAL(extensionChanged(const QString&)),
- SLOT(extensionChanged(const QString&)));
- connect(KickerConfig::the(), SIGNAL(extensionAboutToChange(const QString&)),
- SLOT(extensionAboutToChange(const QString&)));
+ connect(m_desktopPreview, TQT_SIGNAL(imageDone(int)),
+ TQT_SLOT(slotBGPreviewReady(int)));
+
+ connect(KickerConfig::the(), TQT_SIGNAL(extensionInfoChanged()),
+ TQT_SLOT(infoUpdated()));
+ connect(KickerConfig::the(), TQT_SIGNAL(extensionAdded(ExtensionInfo*)),
+ TQT_SLOT(extensionAdded(ExtensionInfo*)));
+ connect(KickerConfig::the(), TQT_SIGNAL(extensionRemoved(ExtensionInfo*)),
+ TQT_SLOT(extensionRemoved(ExtensionInfo*)));
+ connect(KickerConfig::the(), TQT_SIGNAL(extensionChanged(const TQString&)),
+ TQT_SLOT(extensionChanged(const TQString&)));
+ connect(KickerConfig::the(), TQT_SIGNAL(extensionAboutToChange(const TQString&)),
+ TQT_SLOT(extensionAboutToChange(const TQString&)));
// position tab tells hiding tab about extension selections and vice versa
- connect(KickerConfig::the(), SIGNAL(hidingPanelChanged(int)),
- SLOT(jumpToPanel(int)));
- connect(m_panelList, SIGNAL(activated(int)),
- KickerConfig::the(), SIGNAL(positionPanelChanged(int)));
-
- connect(m_panelSize, SIGNAL(activated(int)),
- SLOT(sizeChanged(int)));
- connect(m_panelSize, SIGNAL(activated(int)),
- SIGNAL(changed()));
+ connect(KickerConfig::the(), TQT_SIGNAL(hidingPanelChanged(int)),
+ TQT_SLOT(jumpToPanel(int)));
+ connect(m_panelList, TQT_SIGNAL(activated(int)),
+ KickerConfig::the(), TQT_SIGNAL(positionPanelChanged(int)));
+
+ connect(m_panelSize, TQT_SIGNAL(activated(int)),
+ TQT_SLOT(sizeChanged(int)));
+ connect(m_panelSize, TQT_SIGNAL(activated(int)),
+ TQT_SIGNAL(changed()));
}
PositionTab::~PositionTab()
@@ -191,9 +191,9 @@ void PositionTab::defaults()
m_percentSlider->setValue( 100 ); // use all space available
m_percentSpinBox->setValue( 100 ); // use all space available
m_expandCheckBox->setChecked( true ); // expand as required
- m_xineramaScreenComboBox->setCurrentItem(QApplication::desktop()->primaryScreen());
+ m_xineramaScreenComboBox->setCurrentItem(TQApplication::desktop()->primaryScreen());
- if (QApplication::reverseLayout())
+ if (TQApplication::reverseLayout())
{
// RTL lang aligns right
m_panelAlign = AlignRight;
@@ -220,7 +220,7 @@ void PositionTab::sizeChanged(int which)
void PositionTab::movePanel(int whichButton)
{
- QPushButton* pushed = reinterpret_cast<QPushButton*>(m_locationGroup->find(whichButton));
+ TQPushButton* pushed = reinterpret_cast<TQPushButton*>(m_locationGroup->find(whichButton));
if (pushed == locationTopLeft)
{
@@ -490,7 +490,7 @@ void PositionTab::slotBGPreviewReady(int)
m_pretendDesktop->setBackgroundPixmap(m_desktopPreview->pixmap());
#if 0
KPixmap pm;
- if (QPixmap::defaultDepth() < 15)
+ if (TQPixmap::defaultDepth() < 15)
{
pm.convertFromImage(*m_desktopPreview->image(), KPixmap::LowColor);
}
@@ -559,12 +559,12 @@ void PositionTab::switchPanel(int panelItem)
m_sizeGroup->setEnabled(m_panelInfo->_resizeable);
m_panelPos = m_panelInfo->_position;
m_panelAlign = m_panelInfo->_alignment;
- if(m_panelInfo->_xineramaScreen >= 0 && m_panelInfo->_xineramaScreen < QApplication::desktop()->numScreens())
+ if(m_panelInfo->_xineramaScreen >= 0 && m_panelInfo->_xineramaScreen < TQApplication::desktop()->numScreens())
m_xineramaScreenComboBox->setCurrentItem(m_panelInfo->_xineramaScreen);
else if(m_panelInfo->_xineramaScreen == -2) /* the All Screens option: qt uses -1 for default, so -2 for all */
m_xineramaScreenComboBox->setCurrentItem(m_xineramaScreenComboBox->count()-1);
else
- m_xineramaScreenComboBox->setCurrentItem(QApplication::desktop()->primaryScreen());
+ m_xineramaScreenComboBox->setCurrentItem(TQApplication::desktop()->primaryScreen());
setPositionButtons();
@@ -633,7 +633,7 @@ void PositionTab::infoUpdated()
switchPanel(0);
}
-void PositionTab::extensionAboutToChange(const QString& configPath)
+void PositionTab::extensionAboutToChange(const TQString& configPath)
{
ExtensionInfo* extension = (KickerConfig::the()->extensionsInfo())[m_panelList->currentItem()];
if (extension && extension->_configPath == configPath)
@@ -642,7 +642,7 @@ void PositionTab::extensionAboutToChange(const QString& configPath)
}
}
-void PositionTab::extensionChanged(const QString& configPath)
+void PositionTab::extensionChanged(const TQString& configPath)
{
ExtensionInfo* extension = (KickerConfig::the()->extensionsInfo())[m_panelList->currentItem()];
if (extension && extension->_configPath == configPath)
@@ -684,26 +684,26 @@ void PositionTab::storeInfo()
void PositionTab::showIdentify()
{
- for(int s=0; s < QApplication::desktop()->numScreens();s++)
+ for(int s=0; s < TQApplication::desktop()->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(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);
diff --git a/kcontrol/kicker/positiontab_impl.h b/kcontrol/kicker/positiontab_impl.h
index 6c7cdc5ea..6bfcf5ad4 100644
--- a/kcontrol/kicker/positiontab_impl.h
+++ b/kcontrol/kicker/positiontab_impl.h
@@ -32,7 +32,7 @@ class PositionTab : public PositionTabBase
Q_OBJECT
public:
- PositionTab(QWidget *parent, const char* name = 0);
+ PositionTab(TQWidget *parent, const char* name = 0);
~PositionTab();
enum positions { PosLeft = 0, PosRight, PosTop, PosBottom };
@@ -56,15 +56,15 @@ protected slots:
void showIdentify();
void extensionAdded(ExtensionInfo*);
void extensionRemoved(ExtensionInfo* info);
- void extensionChanged(const QString&);
- void extensionAboutToChange(const QString&);
+ void extensionChanged(const TQString&);
+ void extensionAboutToChange(const TQString&);
void sizeChanged(int);
void switchPanel(int);
void jumpToPanel(int);
private:
- QFrame* m_pretendPanel;
- QWidget* m_pretendDesktop;
+ TQFrame* m_pretendPanel;
+ TQWidget* m_pretendDesktop;
KVirtualBGRenderer* m_desktopPreview;
ExtensionInfo* m_panelInfo;
diff --git a/kcontrol/kio/cache.cpp b/kcontrol/kio/cache.cpp
index 8b730ae77..d98cba302 100644
--- a/kcontrol/kio/cache.cpp
+++ b/kcontrol/kio/cache.cpp
@@ -19,13 +19,13 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qwhatsthis.h>
-#include <qpushbutton.h>
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqwhatsthis.h>
+#include <tqpushbutton.h>
+#include <tqbuttongroup.h>
+#include <tqradiobutton.h>
#include <kdebug.h>
#include <klocale.h>
@@ -38,10 +38,10 @@
#include "cache.h"
#include "cache_ui.h"
-KCacheConfigDialog::KCacheConfigDialog( QWidget* parent )
+KCacheConfigDialog::KCacheConfigDialog( TQWidget* parent )
:KCModule( parent, "kcmkio" )
{
- QVBoxLayout* mainLayout = new QVBoxLayout(this, 0, 0);
+ TQVBoxLayout* mainLayout = new TQVBoxLayout(this, 0, 0);
m_dlg = new CacheDlgUI(this);
mainLayout->addWidget(m_dlg);
mainLayout->addStretch();
@@ -66,10 +66,10 @@ void KCacheConfigDialog::load()
m_dlg->rbCacheIfPossible->setChecked( true );
// Config changed notifications...
- connect ( m_dlg->cbUseCache, SIGNAL(toggled(bool)), SLOT(configChanged()) );
- connect ( m_dlg->bgCachePolicy, SIGNAL(clicked (int)), SLOT(configChanged()) );
- connect ( m_dlg->sbMaxCacheSize, SIGNAL(valueChanged(int)), SLOT(configChanged()) );
- connect ( m_dlg->pbClearCache, SIGNAL(clicked()), SLOT(slotClearCache()) );
+ connect ( m_dlg->cbUseCache, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()) );
+ connect ( m_dlg->bgCachePolicy, TQT_SIGNAL(clicked (int)), TQT_SLOT(configChanged()) );
+ connect ( m_dlg->sbMaxCacheSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(configChanged()) );
+ connect ( m_dlg->pbClearCache, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearCache()) );
emit changed( false );
}
@@ -100,7 +100,7 @@ void KCacheConfigDialog::defaults()
m_dlg->sbMaxCacheSize->setValue( DEFAULT_MAX_CACHE_SIZE );
}
-QString KCacheConfigDialog::quickHelp() const
+TQString KCacheConfigDialog::quickHelp() const
{
return i18n( "<h1>Cache</h1><p>This module lets you configure your cache settings.</p>"
"<p>The cache is an internal memory in Konqueror where recently "
diff --git a/kcontrol/kio/cache.h b/kcontrol/kio/cache.h
index d2d12e5e2..07ff0a6c8 100644
--- a/kcontrol/kio/cache.h
+++ b/kcontrol/kio/cache.h
@@ -31,13 +31,13 @@ class KCacheConfigDialog : public KCModule
Q_OBJECT
public:
- KCacheConfigDialog( QWidget* parent = 0 );
+ KCacheConfigDialog( TQWidget* parent = 0 );
~KCacheConfigDialog() {};
virtual void load();
virtual void save();
virtual void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
protected slots:
void configChanged();
diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/kio/fakeuaprovider.cpp
index 08949c27b..00a87567e 100644
--- a/kcontrol/kio/fakeuaprovider.cpp
+++ b/kcontrol/kio/fakeuaprovider.cpp
@@ -27,16 +27,16 @@
#include "fakeuaprovider.h"
#define UA_PTOS(x) (*it)->property(x).toString()
-#define QFL(x) QString::fromLatin1(x)
+#define QFL(x) TQString::fromLatin1(x)
FakeUASProvider::FakeUASProvider()
{
m_bIsDirty = true;
}
-FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const QString& uaStr )
+FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString& uaStr )
{
- QStringList split;
+ TQStringList split;
int pos = (uaStr).find("::");
if ( pos == -1 )
@@ -50,7 +50,7 @@ FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const QString&
}
else
{
- split = QStringList::split("::", uaStr);
+ split = TQStringList::split("::", uaStr);
}
if ( m_lstIdentity.contains(split[1]) )
@@ -76,7 +76,7 @@ void FakeUASProvider::loadFromDesktopFiles()
void FakeUASProvider::parseDescription()
{
- QString tmp;
+ TQString tmp;
KTrader::OfferList::ConstIterator it = m_providers.begin();
KTrader::OfferList::ConstIterator lastItem = m_providers.end();
@@ -90,24 +90,24 @@ void FakeUASProvider::parseDescription()
struct utsname utsn;
uname( &utsn );
- tmp.replace( QFL("appSysName"), QString(utsn.sysname) );
- tmp.replace( QFL("appSysRelease"), QString(utsn.release) );
- tmp.replace( QFL("appMachineType"), QString(utsn.machine) );
+ tmp.replace( QFL("appSysName"), TQString(utsn.sysname) );
+ tmp.replace( QFL("appSysRelease"), TQString(utsn.release) );
+ tmp.replace( QFL("appMachineType"), TQString(utsn.machine) );
- QStringList languageList = KGlobal::locale()->languageList();
+ TQStringList languageList = KGlobal::locale()->languageList();
if ( languageList.count() )
{
- QStringList::Iterator it = languageList.find( QString::fromLatin1("C") );
+ TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
if( it != languageList.end() )
{
- if( languageList.contains( QString::fromLatin1("en") ) > 0 )
+ if( languageList.contains( TQString::fromLatin1("en") ) > 0 )
languageList.remove( it );
else
- (*it) = QString::fromLatin1("en");
+ (*it) = TQString::fromLatin1("en");
}
}
- tmp.replace( QFL("appLanguage"), QString("%1").arg(languageList.join(", ")) );
+ tmp.replace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) );
tmp.replace( QFL("appPlatform"), QFL("X11") );
}
@@ -117,12 +117,12 @@ void FakeUASProvider::parseDescription()
m_lstIdentity << tmp;
- tmp = QString("%1 %2").arg(UA_PTOS("X-KDE-UA-SYSNAME")).arg(UA_PTOS("X-KDE-UA-SYSRELEASE"));
+ tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-SYSNAME")).arg(UA_PTOS("X-KDE-UA-SYSRELEASE"));
if ( tmp.stripWhiteSpace().isEmpty() )
- tmp = QString("%1 %2").arg(UA_PTOS("X-KDE-UA-"
+ tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-"
"NAME")).arg(UA_PTOS("X-KDE-UA-VERSION"));
else
- tmp = QString("%1 %2 on %3").arg(UA_PTOS("X-KDE-UA-"
+ tmp = TQString("%1 %2 on %3").arg(UA_PTOS("X-KDE-UA-"
"NAME")).arg(UA_PTOS("X-KDE-UA-VERSION")).arg(tmp);
m_lstAlias << tmp;
@@ -131,44 +131,44 @@ void FakeUASProvider::parseDescription()
m_bIsDirty = false;
}
-QString FakeUASProvider::aliasStr( const QString& name )
+TQString FakeUASProvider::aliasStr( const TQString& name )
{
int id = userAgentStringList().findIndex(name);
if ( id == -1 )
- return QString::null;
+ return TQString::null;
else
return m_lstAlias[id];
}
-QString FakeUASProvider::agentStr( const QString& name )
+TQString FakeUASProvider::agentStr( const TQString& name )
{
int id = userAgentAliasList().findIndex(name);
if ( id == -1 )
- return QString::null;
+ return TQString::null;
else
return m_lstIdentity[id];
}
-QStringList FakeUASProvider::userAgentStringList()
+TQStringList FakeUASProvider::userAgentStringList()
{
if ( m_bIsDirty )
{
loadFromDesktopFiles();
if ( !m_providers.count() )
- return QStringList();
+ return TQStringList();
parseDescription();
}
return m_lstIdentity;
}
-QStringList FakeUASProvider::userAgentAliasList ()
+TQStringList FakeUASProvider::userAgentAliasList ()
{
if ( m_bIsDirty )
{
loadFromDesktopFiles();
if ( !m_providers.count() )
- return QStringList();
+ return TQStringList();
parseDescription();
}
return m_lstAlias;
diff --git a/kcontrol/kio/fakeuaprovider.h b/kcontrol/kio/fakeuaprovider.h
index fedf155bf..3e9f600dd 100644
--- a/kcontrol/kio/fakeuaprovider.h
+++ b/kcontrol/kio/fakeuaprovider.h
@@ -36,11 +36,11 @@ public:
FakeUASProvider();
~FakeUASProvider(){};
- StatusCode createNewUAProvider( const QString& );
- QString aliasStr( const QString& );
- QString agentStr( const QString& );
- QStringList userAgentStringList();
- QStringList userAgentAliasList();
+ StatusCode createNewUAProvider( const TQString& );
+ TQString aliasStr( const TQString& );
+ TQString agentStr( const TQString& );
+ TQStringList userAgentStringList();
+ TQStringList userAgentAliasList();
bool isListDirty() const { return m_bIsDirty; }
void setListDirty( bool dirty ) { m_bIsDirty = dirty; }
@@ -50,8 +50,8 @@ protected:
private:
KTrader::OfferList m_providers;
- QStringList m_lstIdentity;
- QStringList m_lstAlias;
+ TQStringList m_lstIdentity;
+ TQStringList m_lstAlias;
bool m_bIsDirty;
};
#endif
diff --git a/kcontrol/kio/kcookiesmain.cpp b/kcontrol/kio/kcookiesmain.cpp
index f25a28011..8233f0d20 100644
--- a/kcontrol/kio/kcookiesmain.cpp
+++ b/kcontrol/kio/kcookiesmain.cpp
@@ -3,8 +3,8 @@
// First version of cookies configuration by Waldo Bastian <bastian@kde.org>
// This dialog box created by David Faure <faure@kde.org>
-#include <qlayout.h>
-#include <qtabwidget.h>
+#include <tqlayout.h>
+#include <tqtabwidget.h>
#include <klocale.h>
#include <kapplication.h>
@@ -16,14 +16,14 @@
#include "kcookiespolicies.h"
#include "kcookiesmanagement.h"
-KCookiesMain::KCookiesMain(QWidget *parent)
+KCookiesMain::KCookiesMain(TQWidget *parent)
: KCModule(parent, "kcmkio")
{
management = 0;
bool managerOK = true;
DCOPReply reply = DCOPRef( "kded", "kded" ).call( "loadModule",
- QCString( "kcookiejar" ) );
+ TQCString( "kcookiejar" ) );
if( !reply.isValid() )
{
@@ -34,19 +34,19 @@ KCookiesMain::KCookiesMain(QWidget *parent)
"are stored on your computer."));
}
- QVBoxLayout *layout = new QVBoxLayout(this);
- tab = new QTabWidget(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
+ tab = new TQTabWidget(this);
layout->addWidget(tab);
policies = new KCookiesPolicies(this);
tab->addTab(policies, i18n("&Policy"));
- connect(policies, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
+ connect(policies, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
if( managerOK )
{
management = new KCookiesManagement(this);
tab->addTab(management, i18n("&Management"));
- connect(management, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
+ connect(management, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
}
}
@@ -78,7 +78,7 @@ void KCookiesMain::defaults()
management->defaults();
}
-QString KCookiesMain::quickHelp() const
+TQString KCookiesMain::quickHelp() const
{
return i18n("<h1>Cookies</h1> Cookies contain information that Konqueror"
" (or other KDE applications using the HTTP protocol) stores on your"
diff --git a/kcontrol/kio/kcookiesmain.h b/kcontrol/kio/kcookiesmain.h
index fef111100..802f89c17 100644
--- a/kcontrol/kio/kcookiesmain.h
+++ b/kcontrol/kio/kcookiesmain.h
@@ -17,7 +17,7 @@ class KCookiesMain : public KCModule
{
Q_OBJECT
public:
- KCookiesMain(QWidget *parent = 0L);
+ KCookiesMain(TQWidget *parent = 0L);
~KCookiesMain();
KCookiesPolicies* policyDlg() { return policies; }
@@ -25,11 +25,11 @@ public:
virtual void load();
virtual void save();
virtual void defaults();
- virtual QString quickHelp() const;
+ virtual TQString quickHelp() const;
private:
- QTabWidget* tab;
+ TQTabWidget* tab;
KCookiesPolicies* policies;
KCookiesManagement* management;
};
diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp
index 58e983439..f2cd45c42 100644
--- a/kcontrol/kio/kcookiesmanagement.cpp
+++ b/kcontrol/kio/kcookiesmanagement.cpp
@@ -19,15 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qtimer.h>
-#include <qdatetime.h>
-#include <qtoolbutton.h>
+#include <tqapplication.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqgroupbox.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
+#include <tqtimer.h>
+#include <tqdatetime.h>
+#include <tqtoolbutton.h>
#include <kidna.h>
#include <kdebug.h>
@@ -49,24 +49,24 @@
struct CookieProp
{
- QString host;
- QString name;
- QString value;
- QString domain;
- QString path;
- QString expireDate;
- QString secure;
+ TQString host;
+ TQString name;
+ TQString value;
+ TQString domain;
+ TQString path;
+ TQString expireDate;
+ TQString secure;
bool allLoaded;
};
-CookieListViewItem::CookieListViewItem(QListView *parent, QString dom)
- :QListViewItem(parent)
+CookieListViewItem::CookieListViewItem(TQListView *parent, TQString dom)
+ :TQListViewItem(parent)
{
init( 0, dom );
}
-CookieListViewItem::CookieListViewItem(QListViewItem *parent, CookieProp *cookie)
- :QListViewItem(parent)
+CookieListViewItem::CookieListViewItem(TQListViewItem *parent, CookieProp *cookie)
+ :TQListViewItem(parent)
{
init( cookie );
}
@@ -76,7 +76,7 @@ CookieListViewItem::~CookieListViewItem()
delete mCookie;
}
-void CookieListViewItem::init( CookieProp* cookie, QString domain,
+void CookieListViewItem::init( CookieProp* cookie, TQString domain,
bool cookieLoaded )
{
mCookie = cookie;
@@ -91,38 +91,38 @@ CookieProp* CookieListViewItem::leaveCookie()
return ret;
}
-QString CookieListViewItem::text(int f) const
+TQString CookieListViewItem::text(int f) const
{
if (mCookie)
- return f == 0 ? QString::null : KIDNA::toUnicode(mCookie->host);
+ return f == 0 ? TQString::null : KIDNA::toUnicode(mCookie->host);
else
- return f == 0 ? KIDNA::toUnicode(mDomain) : QString::null;
+ return f == 0 ? KIDNA::toUnicode(mDomain) : TQString::null;
}
-KCookiesManagement::KCookiesManagement(QWidget *parent)
+KCookiesManagement::KCookiesManagement(TQWidget *parent)
: KCModule(parent, "kcmkio")
{
// Toplevel layout
- QVBoxLayout* mainLayout = new QVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout* mainLayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint());
dlg = new KCookiesManagementDlgUI (this);
- dlg->tbClearSearchLine->setIconSet(SmallIconSet(QApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
+ dlg->tbClearSearchLine->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
dlg->kListViewSearchLine->setListView(dlg->lvCookies);
mainLayout->addWidget(dlg);
dlg->lvCookies->setSorting(0);
- connect(dlg->lvCookies, SIGNAL(expanded(QListViewItem*)), SLOT(getCookies(QListViewItem*)) );
- connect(dlg->lvCookies, SIGNAL(selectionChanged(QListViewItem*)), SLOT(showCookieDetails(QListViewItem*)) );
+ connect(dlg->lvCookies, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(getCookies(TQListViewItem*)) );
+ connect(dlg->lvCookies, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(showCookieDetails(TQListViewItem*)) );
- connect(dlg->pbDelete, SIGNAL(clicked()), SLOT(deleteCookie()));
- connect(dlg->pbDeleteAll, SIGNAL(clicked()), SLOT(deleteAllCookies()));
- connect(dlg->pbReload, SIGNAL(clicked()), SLOT(getDomains()));
- connect(dlg->pbPolicy, SIGNAL(clicked()), SLOT(doPolicy()));
+ connect(dlg->pbDelete, TQT_SIGNAL(clicked()), TQT_SLOT(deleteCookie()));
+ connect(dlg->pbDeleteAll, TQT_SIGNAL(clicked()), TQT_SLOT(deleteAllCookies()));
+ connect(dlg->pbReload, TQT_SIGNAL(clicked()), TQT_SLOT(getDomains()));
+ connect(dlg->pbPolicy, TQT_SIGNAL(clicked()), TQT_SLOT(doPolicy()));
- connect(dlg->lvCookies, SIGNAL(doubleClicked (QListViewItem *)), SLOT(doPolicy()));
+ connect(dlg->lvCookies, TQT_SIGNAL(doubleClicked (TQListViewItem *)), TQT_SLOT(doPolicy()));
deletedCookies.setAutoDelete(true);
m_bDeleteAll = false;
mainWidget = parent;
@@ -147,8 +147,8 @@ void KCookiesManagement::save()
{
if(!DCOPRef("kded", "kcookiejar").send("deleteAllCookies"))
{
- QString caption = i18n ("DCOP Communication Error");
- QString message = i18n ("Unable to delete all the cookies as requested.");
+ TQString caption = i18n ("DCOP Communication Error");
+ TQString message = i18n ("Unable to delete all the cookies as requested.");
KMessageBox::sorry (this, message,caption);
return;
}
@@ -156,19 +156,19 @@ void KCookiesManagement::save()
}
// Certain groups of cookies were deleted...
- QStringList::Iterator dIt = deletedDomains.begin();
+ TQStringList::Iterator dIt = deletedDomains.begin();
while( dIt != deletedDomains.end() )
{
- QByteArray call;
- QByteArray reply;
- QCString replyType;
- QDataStream callStream(call, IO_WriteOnly);
+ TQByteArray call;
+ TQByteArray reply;
+ TQCString replyType;
+ TQDataStream callStream(call, IO_WriteOnly);
callStream << *dIt;
if( !DCOPRef("kded", "kcookiejar").send("deleteCookiesFromDomain", (*dIt)) )
{
- QString caption = i18n ("DCOP Communication Error");
- QString message = i18n ("Unable to delete cookies as requested.");
+ TQString caption = i18n ("DCOP Communication Error");
+ TQString message = i18n ("Unable to delete cookies as requested.");
KMessageBox::sorry (this, message,caption);
return;
}
@@ -178,12 +178,12 @@ void KCookiesManagement::save()
// Individual cookies were deleted...
bool success = true; // Maybe we can go on...
- QDictIterator<CookiePropList> cookiesDom(deletedCookies);
+ TQDictIterator<CookiePropList> cookiesDom(deletedCookies);
while(cookiesDom.current())
{
CookiePropList *list = cookiesDom.current();
- QPtrListIterator<CookieProp> cookie(*list);
+ TQPtrListIterator<CookieProp> cookie(*list);
while(*cookie)
{
@@ -236,7 +236,7 @@ void KCookiesManagement::clearCookieDetails()
dlg->leSecure->clear();
}
-QString KCookiesManagement::quickHelp() const
+TQString KCookiesManagement::quickHelp() const
{
return i18n("<h1>Cookies Management Quick Help</h1>" );
}
@@ -247,14 +247,14 @@ void KCookiesManagement::getDomains()
if( !reply.isValid() )
{
- QString caption = i18n ("Information Lookup Failure");
- QString message = i18n ("Unable to retrieve information about the "
+ TQString caption = i18n ("Information Lookup Failure");
+ TQString message = i18n ("Unable to retrieve information about the "
"cookies stored on your computer.");
KMessageBox::sorry (this, message, caption);
return;
}
- QStringList domains = reply;
+ TQStringList domains = reply;
if ( dlg->lvCookies->childCount() )
{
@@ -263,7 +263,7 @@ void KCookiesManagement::getDomains()
}
CookieListViewItem *dom;
- for(QStringList::Iterator dIt = domains.begin(); dIt != domains.end(); dIt++)
+ for(TQStringList::Iterator dIt = domains.begin(); dIt != domains.end(); dIt++)
{
dom = new CookieListViewItem(dlg->lvCookies, *dIt);
dom->setExpandable(true);
@@ -273,25 +273,25 @@ void KCookiesManagement::getDomains()
dlg->pbDeleteAll->setEnabled(dlg->lvCookies->childCount());
}
-void KCookiesManagement::getCookies(QListViewItem *cookieDom)
+void KCookiesManagement::getCookies(TQListViewItem *cookieDom)
{
CookieListViewItem* ckd = static_cast<CookieListViewItem*>(cookieDom);
if ( ckd->cookiesLoaded() )
return;
- QValueList<int> fields;
+ TQValueList<int> fields;
fields << 0 << 1 << 2 << 3;
DCOPReply reply = DCOPRef ("kded", "kcookiejar").call ("findCookies",
- DCOPArg(fields, "QValueList<int>"),
+ DCOPArg(fields, "TQValueList<int>"),
ckd->domain(),
- QString::null,
- QString::null,
- QString::null);
+ TQString::null,
+ TQString::null,
+ TQString::null);
if(reply.isValid())
{
- QStringList fieldVal = reply;
- QStringList::Iterator fIt = fieldVal.begin();
+ TQStringList fieldVal = reply;
+ TQStringList::Iterator fIt = fieldVal.begin();
while(fIt != fieldVal.end())
{
@@ -310,11 +310,11 @@ void KCookiesManagement::getCookies(QListViewItem *cookieDom)
bool KCookiesManagement::cookieDetails(CookieProp *cookie)
{
- QValueList<int> fields;
+ TQValueList<int> fields;
fields << 4 << 5 << 7;
DCOPReply reply = DCOPRef ("kded", "kcookiejar").call ("findCookies",
- DCOPArg(fields, "QValueList<int>"),
+ DCOPArg(fields, "TQValueList<int>"),
cookie->domain,
cookie->host,
cookie->path,
@@ -322,9 +322,9 @@ bool KCookiesManagement::cookieDetails(CookieProp *cookie)
if( !reply.isValid() )
return false;
- QStringList fieldVal = reply;
+ TQStringList fieldVal = reply;
- QStringList::Iterator c = fieldVal.begin();
+ TQStringList::Iterator c = fieldVal.begin();
cookie->value = *c++;
unsigned tmp = (*c++).toUInt();
@@ -332,7 +332,7 @@ bool KCookiesManagement::cookieDetails(CookieProp *cookie)
cookie->expireDate = i18n("End of session");
else
{
- QDateTime expDate;
+ TQDateTime expDate;
expDate.setTime_t(tmp);
cookie->expireDate = KGlobal::locale()->formatDateTime(expDate);
}
@@ -343,7 +343,7 @@ bool KCookiesManagement::cookieDetails(CookieProp *cookie)
return true;
}
-void KCookiesManagement::showCookieDetails(QListViewItem* item)
+void KCookiesManagement::showCookieDetails(TQListViewItem* item)
{
kdDebug () << "::showCookieDetails... " << endl;
CookieProp *cookie = static_cast<CookieListViewItem*>(item)->cookie();
@@ -379,7 +379,7 @@ void KCookiesManagement::doPolicy()
{
CookieProp *cookie = item->cookie();
- QString domain = cookie->domain;
+ TQString domain = cookie->domain;
if( domain.isEmpty() )
{
@@ -402,7 +402,7 @@ void KCookiesManagement::doPolicy()
}
-void KCookiesManagement::deleteCookie(QListViewItem* deleteItem)
+void KCookiesManagement::deleteCookie(TQListViewItem* deleteItem)
{
CookieListViewItem *item = static_cast<CookieListViewItem*>( deleteItem );
if( item->cookie() )
@@ -433,7 +433,7 @@ void KCookiesManagement::deleteCookie()
{
deleteCookie(dlg->lvCookies->currentItem());
- QListViewItem* currentItem = dlg->lvCookies->currentItem();
+ TQListViewItem* currentItem = dlg->lvCookies->currentItem();
if ( currentItem )
{
@@ -461,7 +461,7 @@ void KCookiesManagement::deleteAllCookies()
}
else
{
- QListViewItem* item = dlg->lvCookies->firstChild();
+ TQListViewItem* item = dlg->lvCookies->firstChild();
while (item)
{
diff --git a/kcontrol/kio/kcookiesmanagement.h b/kcontrol/kio/kcookiesmanagement.h
index 636be0ed3..cd7f4c62a 100644
--- a/kcontrol/kio/kcookiesmanagement.h
+++ b/kcontrol/kio/kcookiesmanagement.h
@@ -24,9 +24,9 @@
#ifndef __KCOOKIESMANAGEMENT_H
#define __KCOOKIESMANAGEMENT_H
-#include <qdict.h>
-#include <qstringlist.h>
-#include <qlistview.h>
+#include <tqdict.h>
+#include <tqstringlist.h>
+#include <tqlistview.h>
#include <kcmodule.h>
@@ -39,23 +39,23 @@ struct CookieProp;
class CookieListViewItem : public QListViewItem
{
public:
- CookieListViewItem(QListView *parent, QString dom);
- CookieListViewItem(QListViewItem *parent, CookieProp *cookie);
+ CookieListViewItem(TQListView *parent, TQString dom);
+ CookieListViewItem(TQListViewItem *parent, CookieProp *cookie);
~CookieListViewItem();
- QString domain() const { return mDomain; }
+ TQString domain() const { return mDomain; }
CookieProp* cookie() const { return mCookie; }
CookieProp* leaveCookie();
void setCookiesLoaded() { mCookiesLoaded = true; }
bool cookiesLoaded() const { return mCookiesLoaded; }
- virtual QString text(int f) const;
+ virtual TQString text(int f) const;
private:
void init( CookieProp* cookie,
- QString domain = QString::null,
+ TQString domain = TQString::null,
bool cookieLoaded=false );
CookieProp *mCookie;
- QString mDomain;
+ TQString mDomain;
bool mCookiesLoaded;
};
@@ -64,25 +64,25 @@ class KCookiesManagement : public KCModule
Q_OBJECT
public:
- KCookiesManagement(QWidget *parent = 0 );
+ KCookiesManagement(TQWidget *parent = 0 );
~KCookiesManagement();
virtual void load();
virtual void save();
virtual void defaults();
- virtual QString quickHelp() const;
+ virtual TQString quickHelp() const;
private slots:
void deleteCookie();
void deleteAllCookies();
void getDomains();
- void getCookies(QListViewItem*);
- void showCookieDetails(QListViewItem*);
+ void getCookies(TQListViewItem*);
+ void showCookieDetails(TQListViewItem*);
void doPolicy();
private:
void reset ();
- void deleteCookie(QListViewItem*);
+ void deleteCookie(TQListViewItem*);
bool cookieDetails(CookieProp *cookie);
void clearCookieDetails();
bool policyenabled();
@@ -90,12 +90,12 @@ private:
private:
bool m_bDeleteAll;
- QWidget* mainWidget;
+ TQWidget* mainWidget;
KCookiesManagementDlgUI* dlg;
- QStringList deletedDomains;
- typedef QPtrList<CookieProp> CookiePropList;
- QDict<CookiePropList> deletedCookies;
+ TQStringList deletedDomains;
+ typedef TQPtrList<CookieProp> CookiePropList;
+ TQDict<CookiePropList> deletedCookies;
};
#endif // __KCOOKIESMANAGEMENT_H
diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp
index 7ee302ec1..63f4dd21a 100644
--- a/kcontrol/kio/kcookiespolicies.cpp
+++ b/kcontrol/kio/kcookiespolicies.cpp
@@ -22,15 +22,15 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qheader.h>
-#include <qvbox.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qwhatsthis.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qtoolbutton.h>
-#include <qvbuttongroup.h>
+#include <tqheader.h>
+#include <tqvbox.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqwhatsthis.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqtoolbutton.h>
+#include <tqvbuttongroup.h>
#include <kiconloader.h>
#include <kidna.h>
@@ -46,18 +46,18 @@
#include "kcookiespolicies.h"
#include "kcookiespoliciesdlg_ui.h"
-KCookiesPolicies::KCookiesPolicies(QWidget *parent)
+KCookiesPolicies::KCookiesPolicies(TQWidget *parent)
:KCModule(parent, "kcmkio")
{
- QVBoxLayout *mainLayout = new QVBoxLayout(this, 0, 0);
+ TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 0, 0);
dlg = new KCookiesPolicyDlgUI (this);
dlg->lvDomainPolicy->header()->setStretchEnabled(true, 0);
dlg->lvDomainPolicy->setColumnWidthMode(0, KListView::Manual);
dlg->lvDomainPolicy->setColumnWidthMode(1, KListView::Maximum);
- dlg->tbClearSearchLine->setIconSet(SmallIconSet(QApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
+ dlg->tbClearSearchLine->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
dlg->kListViewSearchLine->setListView(dlg->lvDomainPolicy);
- QValueList<int> columns;
+ TQValueList<int> columns;
columns.append(0);
dlg->kListViewSearchLine->setSearchColumns(columns);
@@ -107,7 +107,7 @@ void KCookiesPolicies::autoAcceptSessionCookies ( bool enable )
dlg->gbDomainSpecific->setEnabled( !enable );
}
-void KCookiesPolicies::addNewPolicy(const QString& domain)
+void KCookiesPolicies::addNewPolicy(const TQString& domain)
{
PolicyDlg pdlg (i18n("New Cookie Policy"), this);
pdlg.setEnableHostEdit (true, domain);
@@ -119,13 +119,13 @@ void KCookiesPolicies::addNewPolicy(const QString& domain)
if (pdlg.exec() && !pdlg.domain().isEmpty())
{
- QString domain = KIDNA::toUnicode(pdlg.domain());
+ TQString domain = KIDNA::toUnicode(pdlg.domain());
int advice = pdlg.advice();
if ( !handleDuplicate(domain, advice) )
{
const char* strAdvice = KCookieAdvice::adviceToStr(advice);
- QListViewItem* index = new QListViewItem (dlg->lvDomainPolicy,
+ TQListViewItem* index = new TQListViewItem (dlg->lvDomainPolicy,
domain, i18n(strAdvice));
m_pDomainPolicy.insert (index, strAdvice);
configChanged();
@@ -136,17 +136,17 @@ void KCookiesPolicies::addNewPolicy(const QString& domain)
void KCookiesPolicies::addPressed()
{
- addNewPolicy (QString::null);
+ addNewPolicy (TQString::null);
}
void KCookiesPolicies::changePressed()
{
- QListViewItem* index = dlg->lvDomainPolicy->currentItem();
+ TQListViewItem* index = dlg->lvDomainPolicy->currentItem();
if (!index)
return;
- QString oldDomain = index->text(0);
+ TQString oldDomain = index->text(0);
PolicyDlg pdlg (i18n("Change Cookie Policy"), this);
pdlg.setPolicy (KCookieAdvice::strToAdvice(m_pDomainPolicy[index]));
@@ -154,7 +154,7 @@ void KCookiesPolicies::changePressed()
if( pdlg.exec() && !pdlg.domain().isEmpty())
{
- QString newDomain = KIDNA::toUnicode(pdlg.domain());
+ TQString newDomain = KIDNA::toUnicode(pdlg.domain());
int advice = pdlg.advice();
if (newDomain == oldDomain || !handleDuplicate(newDomain, advice))
{
@@ -166,14 +166,14 @@ void KCookiesPolicies::changePressed()
}
}
-bool KCookiesPolicies::handleDuplicate( const QString& domain, int advice )
+bool KCookiesPolicies::handleDuplicate( const TQString& domain, int advice )
{
- QListViewItem* item = dlg->lvDomainPolicy->firstChild();
+ TQListViewItem* item = dlg->lvDomainPolicy->firstChild();
while ( item != 0 )
{
if ( item->text(0) == domain )
{
- QString msg = i18n("<qt>A policy already exists for"
+ TQString msg = i18n("<qt>A policy already exists for"
"<center><b>%1</b></center>"
"Do you want to replace it?</qt>").arg(domain);
int res = KMessageBox::warningContinueCancel(this, msg,
@@ -197,8 +197,8 @@ bool KCookiesPolicies::handleDuplicate( const QString& domain, int advice )
void KCookiesPolicies::deletePressed()
{
- QListViewItem* nextItem = 0L;
- QListViewItem* item = dlg->lvDomainPolicy->firstChild ();
+ TQListViewItem* nextItem = 0L;
+ TQListViewItem* item = dlg->lvDomainPolicy->firstChild ();
while (item != 0L)
{
@@ -241,21 +241,21 @@ void KCookiesPolicies::updateButtons()
dlg->pbDeleteAll->setEnabled ( hasItems );
}
-void KCookiesPolicies::updateDomainList(const QStringList &domainConfig)
+void KCookiesPolicies::updateDomainList(const TQStringList &domainConfig)
{
dlg->lvDomainPolicy->clear();
- QStringList::ConstIterator it = domainConfig.begin();
+ TQStringList::ConstIterator it = domainConfig.begin();
for (; it != domainConfig.end(); ++it)
{
- QString domain;
+ TQString domain;
KCookieAdvice::Value advice = KCookieAdvice::Dunno;
splitDomainAdvice(*it, domain, advice);
if (!domain.isEmpty())
{
- QListViewItem* index = new QListViewItem( dlg->lvDomainPolicy, KIDNA::toUnicode(domain),
+ TQListViewItem* index = new TQListViewItem( dlg->lvDomainPolicy, KIDNA::toUnicode(domain),
i18n(KCookieAdvice::adviceToStr(advice)) );
m_pDomainPolicy[index] = KCookieAdvice::adviceToStr(advice);
}
@@ -264,7 +264,7 @@ void KCookiesPolicies::updateDomainList(const QStringList &domainConfig)
void KCookiesPolicies::selectionChanged ()
{
- QListViewItem* item = dlg->lvDomainPolicy->firstChild ();
+ TQListViewItem* item = dlg->lvDomainPolicy->firstChild ();
d_itemsSelected = 0;
@@ -323,40 +323,40 @@ void KCookiesPolicies::load()
}
// Connect the main swicth :) Enable/disable cookie support
- connect( dlg->cbEnableCookies, SIGNAL( toggled(bool) ),
- SLOT( cookiesEnabled(bool) ) );
- connect( dlg->cbEnableCookies, SIGNAL( toggled(bool) ),
- SLOT( configChanged() ) );
+ connect( dlg->cbEnableCookies, TQT_SIGNAL( toggled(bool) ),
+ TQT_SLOT( cookiesEnabled(bool) ) );
+ connect( dlg->cbEnableCookies, TQT_SIGNAL( toggled(bool) ),
+ TQT_SLOT( configChanged() ) );
// Connect the preference check boxes...
- connect ( dlg->cbRejectCrossDomainCookies, SIGNAL(clicked()),
- SLOT(configChanged()));
- connect ( dlg->cbAutoAcceptSessionCookies, SIGNAL(toggled(bool)),
- SLOT(configChanged()));
- connect ( dlg->cbIgnoreCookieExpirationDate, SIGNAL(toggled(bool)),
- SLOT(configChanged()));
-
- connect ( dlg->cbAutoAcceptSessionCookies, SIGNAL(toggled(bool)),
- SLOT(autoAcceptSessionCookies(bool)));
- connect ( dlg->cbIgnoreCookieExpirationDate, SIGNAL(toggled(bool)),
- SLOT(ignoreCookieExpirationDate(bool)));
+ connect ( dlg->cbRejectCrossDomainCookies, TQT_SIGNAL(clicked()),
+ TQT_SLOT(configChanged()));
+ connect ( dlg->cbAutoAcceptSessionCookies, TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(configChanged()));
+ connect ( dlg->cbIgnoreCookieExpirationDate, TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(configChanged()));
+
+ connect ( dlg->cbAutoAcceptSessionCookies, TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(autoAcceptSessionCookies(bool)));
+ connect ( dlg->cbIgnoreCookieExpirationDate, TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(ignoreCookieExpirationDate(bool)));
// Connect the default cookie policy radio buttons...
- connect(dlg->bgDefault, SIGNAL(clicked(int)), SLOT(configChanged()));
+ connect(dlg->bgDefault, TQT_SIGNAL(clicked(int)), TQT_SLOT(configChanged()));
// Connect signals from the domain specific policy listview.
- connect( dlg->lvDomainPolicy, SIGNAL(selectionChanged()),
- SLOT(selectionChanged()) );
- connect( dlg->lvDomainPolicy, SIGNAL(doubleClicked (QListViewItem *)),
- SLOT(changePressed() ) );
- connect( dlg->lvDomainPolicy, SIGNAL(returnPressed ( QListViewItem * )),
- SLOT(changePressed() ) );
+ connect( dlg->lvDomainPolicy, TQT_SIGNAL(selectionChanged()),
+ TQT_SLOT(selectionChanged()) );
+ connect( dlg->lvDomainPolicy, TQT_SIGNAL(doubleClicked (TQListViewItem *)),
+ TQT_SLOT(changePressed() ) );
+ connect( dlg->lvDomainPolicy, TQT_SIGNAL(returnPressed ( TQListViewItem * )),
+ TQT_SLOT(changePressed() ) );
// Connect the buttons...
- connect( dlg->pbNew, SIGNAL(clicked()), SLOT( addPressed() ) );
- connect( dlg->pbChange, SIGNAL( clicked() ), SLOT( changePressed() ) );
- connect( dlg->pbDelete, SIGNAL( clicked() ), SLOT( deletePressed() ) );
- connect( dlg->pbDeleteAll, SIGNAL( clicked() ), SLOT( deleteAllPressed() ) );
+ connect( dlg->pbNew, TQT_SIGNAL(clicked()), TQT_SLOT( addPressed() ) );
+ connect( dlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) );
+ connect( dlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) );
+ connect( dlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) );
}
void KCookiesPolicies::save()
@@ -377,7 +377,7 @@ void KCookiesPolicies::save()
state = dlg->cbIgnoreCookieExpirationDate->isChecked();
cfg.writeEntry( "IgnoreExpirationDate", state );
- QString advice;
+ TQString advice;
if (dlg->rbPolicyAccept->isChecked())
advice = KCookieAdvice::adviceToStr(KCookieAdvice::Accept);
else if (dlg->rbPolicyReject->isChecked())
@@ -387,12 +387,12 @@ void KCookiesPolicies::save()
cfg.writeEntry("CookieGlobalAdvice", advice);
- QStringList domainConfig;
- QListViewItem *at = dlg->lvDomainPolicy->firstChild();
+ TQStringList domainConfig;
+ TQListViewItem *at = dlg->lvDomainPolicy->firstChild();
while( at )
{
- domainConfig.append(QString::fromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at]));
+ domainConfig.append(TQString::fromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at]));
at = at->nextSibling();
}
@@ -431,7 +431,7 @@ void KCookiesPolicies::defaults()
updateButtons();
}
-void KCookiesPolicies::splitDomainAdvice (const QString& cfg, QString &domain,
+void KCookiesPolicies::splitDomainAdvice (const TQString& cfg, TQString &domain,
KCookieAdvice::Value &advice)
{
int sepPos = cfg.findRev(':');
@@ -444,7 +444,7 @@ void KCookiesPolicies::splitDomainAdvice (const QString& cfg, QString &domain,
advice = KCookieAdvice::strToAdvice( cfg.mid( sepPos+1 ) );
}
-QString KCookiesPolicies::quickHelp() const
+TQString KCookiesPolicies::quickHelp() const
{
return i18n("<h1>Cookies</h1> Cookies contain information that Konqueror"
" (or any other KDE application using the HTTP protocol) stores"
diff --git a/kcontrol/kio/kcookiespolicies.h b/kcontrol/kio/kcookiespolicies.h
index 5b2eaf086..b6f1de2e0 100644
--- a/kcontrol/kio/kcookiespolicies.h
+++ b/kcontrol/kio/kcookiespolicies.h
@@ -26,7 +26,7 @@
#ifndef __KCOOKIESPOLICIES_H
#define __KCOOKIESPOLICIES_H
-#include <qmap.h>
+#include <tqmap.h>
#include <kcmodule.h>
#include "policydlg.h"
@@ -41,15 +41,15 @@ class KCookiesPolicies : public KCModule
Q_OBJECT
public:
- KCookiesPolicies(QWidget *parent = 0);
+ KCookiesPolicies(TQWidget *parent = 0);
~KCookiesPolicies();
virtual void load();
virtual void save();
virtual void defaults();
- virtual QString quickHelp() const;
+ virtual TQString quickHelp() const;
- void addNewPolicy(const QString& domain);
+ void addNewPolicy(const TQString& domain);
protected slots:
void autoAcceptSessionCookies ( bool );
@@ -66,16 +66,16 @@ protected slots:
void addPressed();
private:
- void updateDomainList(const QStringList& list);
- bool handleDuplicate( const QString& domain, int );
- void splitDomainAdvice (const QString& configStr, QString &domain,
+ void updateDomainList(const TQStringList& list);
+ bool handleDuplicate( const TQString& domain, int );
+ void splitDomainAdvice (const TQString& configStr, TQString &domain,
KCookieAdvice::Value &advice);
private:
int d_itemsSelected;
bool d_configChanged;
KCookiesPolicyDlgUI* dlg;
- QMap<QListViewItem*, const char*> m_pDomainPolicy;
+ TQMap<TQListViewItem*, const char*> m_pDomainPolicy;
};
#endif // __KCOOKIESPOLICIES_H
diff --git a/kcontrol/kio/kenvvarproxydlg.cpp b/kcontrol/kio/kenvvarproxydlg.cpp
index eaad2b1b6..22accb4e9 100644
--- a/kcontrol/kio/kenvvarproxydlg.cpp
+++ b/kcontrol/kio/kenvvarproxydlg.cpp
@@ -21,11 +21,11 @@
#include <stdlib.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qwhatsthis.h>
-#include <qpushbutton.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqwhatsthis.h>
+#include <tqpushbutton.h>
#include <kdebug.h>
#include <klocale.h>
@@ -42,16 +42,16 @@
#define NO_PROXY "NO_PROXY,no_proxy"
-static QString getProxyEnv(const QString& var)
+static TQString getProxyEnv(const TQString& var)
{
- return QString::fromLocal8Bit(::getenv(var.local8Bit().data()));
+ return TQString::fromLocal8Bit(::getenv(var.local8Bit().data()));
}
-static bool autoDetectProxySetting(const QString& type, QString& proxyEnv)
+static bool autoDetectProxySetting(const TQString& type, TQString& proxyEnv)
{
- QStringList list = QStringList::split( ',', type);
- QStringList::ConstIterator it = list.begin();
- QStringList::ConstIterator end = list.end();
+ TQStringList list = TQStringList::split( ',', type);
+ TQStringList::ConstIterator it = list.begin();
+ TQStringList::ConstIterator end = list.end();
for(; it != end; ++it)
{
@@ -65,7 +65,7 @@ static bool autoDetectProxySetting(const QString& type, QString& proxyEnv)
return false;
}
-KEnvVarProxyDlg::KEnvVarProxyDlg( QWidget* parent, const char* name )
+KEnvVarProxyDlg::KEnvVarProxyDlg( TQWidget* parent, const char* name )
:KProxyDialogBase( parent, name, true,
i18n( "Variable Proxy Configuration" ) )
{
@@ -83,9 +83,9 @@ void KEnvVarProxyDlg::init()
{
m_bHasValidData = false;
- connect( mDlg->cbShowValue, SIGNAL( clicked() ), SLOT( showValuePressed() ) );
- connect( mDlg->pbVerify, SIGNAL( clicked() ), SLOT( verifyPressed() ) );
- connect( mDlg->pbDetect, SIGNAL( clicked() ), SLOT( autoDetectPressed() ) );
+ connect( mDlg->cbShowValue, TQT_SIGNAL( clicked() ), TQT_SLOT( showValuePressed() ) );
+ connect( mDlg->pbVerify, TQT_SIGNAL( clicked() ), TQT_SLOT( verifyPressed() ) );
+ connect( mDlg->pbDetect, TQT_SIGNAL( clicked() ), TQT_SLOT( autoDetectPressed() ) );
}
void KEnvVarProxyDlg::setProxyData( const KProxyData& data )
@@ -103,7 +103,7 @@ void KEnvVarProxyDlg::setProxyData( const KProxyData& data )
mEnvVarsMap["ftp"] = data.proxyList["ftp"];
// Setup NO Proxy For...
- QString noProxyFor = data.noProxyFor.join("");
+ TQString noProxyFor = data.noProxyFor.join("");
if (!getProxyEnv(noProxyFor).isEmpty())
mEnvVarsMap["noProxy"] = noProxyFor;
@@ -133,10 +133,10 @@ void KEnvVarProxyDlg::verifyPressed()
{
if ( !validate() )
{
- QString msg = i18n("You must specify at least one valid proxy "
+ TQString msg = i18n("You must specify at least one valid proxy "
"environment variable.");
- QString details = i18n("<qt>Make sure you entered the actual environment "
+ TQString details = i18n("<qt>Make sure you entered the actual environment "
"variable name rather than its value. For "
"example, if the environment variable is <br><b>"
"HTTP_PROXY=http://localhost:3128</b><br> you need "
@@ -163,24 +163,24 @@ void KEnvVarProxyDlg::autoDetectPressed()
setHighLight (mDlg->lbNoProxy, false);
// Detect HTTP proxy settings...
- found |= autoDetectProxySetting (QString::fromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]);
+ found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]);
// Detect HTTPS proxy settings...
- found |= autoDetectProxySetting (QString::fromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]);
+ found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]);
// Detect FTP proxy settings...
- found |= autoDetectProxySetting (QString::fromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]);
+ found |= autoDetectProxySetting (TQString::fromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]);
// Detect the NO_PROXY settings...
- found |= autoDetectProxySetting (QString::fromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]);
+ found |= autoDetectProxySetting (TQString::fromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]);
if ( !found )
{
- QString msg = i18n("Did not detect any environment variables "
+ TQString msg = i18n("Did not detect any environment variables "
"commonly used to set system wide proxy "
"information.");
- QString details = i18n("<qt>To learn about the variable names the "
+ TQString details = i18n("<qt>To learn about the variable names the "
"automatic detection process searches for, "
"press OK, click on the quick help button "
"on the window title bar of the "
@@ -197,7 +197,7 @@ void KEnvVarProxyDlg::autoDetectPressed()
void KEnvVarProxyDlg::updateVariables()
{
- QString text = mDlg->leHttp->text();
+ TQString text = mDlg->leHttp->text();
if (mEnvVarsMap["http"] != text)
mEnvVarsMap["http"] = text;
@@ -258,22 +258,22 @@ bool KEnvVarProxyDlg::validate(bool erase)
bool notFound = getProxyEnv(mEnvVarsMap["http"]).isEmpty();
m_bHasValidData |= !notFound;
setHighLight (mDlg->lbHttp, notFound);
- if(notFound && erase) mEnvVarsMap["http"] = QString::null;
+ if(notFound && erase) mEnvVarsMap["http"] = TQString::null;
notFound = getProxyEnv(mEnvVarsMap["https"]).isEmpty();
m_bHasValidData |= !notFound;
setHighLight (mDlg->lbHttps, notFound);
- if(notFound && erase) mEnvVarsMap["https"] = QString::null;
+ if(notFound && erase) mEnvVarsMap["https"] = TQString::null;
notFound = getProxyEnv(mEnvVarsMap["ftp"]).isEmpty();
m_bHasValidData |= !notFound;
setHighLight (mDlg->lbFtp, notFound);
- if(notFound && erase) mEnvVarsMap["ftp"] = QString::null;
+ if(notFound && erase) mEnvVarsMap["ftp"] = TQString::null;
notFound = getProxyEnv(mEnvVarsMap["noProxy"]).isEmpty();
m_bHasValidData |= !notFound;
setHighLight (mDlg->lbNoProxy, notFound);
- if(notFound && erase) mEnvVarsMap["noProxy"] = QString::null;
+ if(notFound && erase) mEnvVarsMap["noProxy"] = TQString::null;
return m_bHasValidData;
}
@@ -282,10 +282,10 @@ void KEnvVarProxyDlg::slotOk()
{
if(!validate(true))
{
- QString msg = i18n("You must specify at least one valid proxy "
+ TQString msg = i18n("You must specify at least one valid proxy "
"environment variable.");
- QString details = i18n("<qt>Make sure you entered the actual environment "
+ TQString details = i18n("<qt>Make sure you entered the actual environment "
"variable name rather than its value. For "
"example, if the environment variable is <br><b>"
"HTTP_PROXY=http://localhost:3128</b><br> you need "
diff --git a/kcontrol/kio/kenvvarproxydlg.h b/kcontrol/kio/kenvvarproxydlg.h
index bf4c073a6..3ddbc989f 100644
--- a/kcontrol/kio/kenvvarproxydlg.h
+++ b/kcontrol/kio/kenvvarproxydlg.h
@@ -21,7 +21,7 @@
#ifndef KENVVAR_PROXY_DIALOG_H
#define KENVVAR_PROXY_DIALOG_H
-#include <qmap.h>
+#include <tqmap.h>
#include "kproxydlgbase.h"
@@ -32,7 +32,7 @@ class KEnvVarProxyDlg : public KProxyDialogBase
Q_OBJECT
public:
- KEnvVarProxyDlg( QWidget* parent = 0, const char* name = 0 );
+ KEnvVarProxyDlg( TQWidget* parent = 0, const char* name = 0 );
~KEnvVarProxyDlg();
virtual const KProxyData data() const;
@@ -52,6 +52,6 @@ protected:
private:
EnvVarProxyDlgUI* mDlg;
- QMap<QString, QString> mEnvVarsMap;
+ TQMap<TQString, TQString> mEnvVarsMap;
};
#endif
diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/kio/kmanualproxydlg.cpp
index 9a3df6afb..92e8a98e6 100644
--- a/kcontrol/kio/kmanualproxydlg.cpp
+++ b/kcontrol/kio/kmanualproxydlg.cpp
@@ -19,12 +19,12 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qcheckbox.h>
-#include <qwhatsthis.h>
-#include <qpushbutton.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqspinbox.h>
+#include <tqcheckbox.h>
+#include <tqwhatsthis.h>
+#include <tqpushbutton.h>
#include <kdebug.h>
#include <klocale.h>
@@ -42,7 +42,7 @@
#include "kmanualproxydlg.h"
-KManualProxyDlg::KManualProxyDlg( QWidget* parent, const char* name )
+KManualProxyDlg::KManualProxyDlg( TQWidget* parent, const char* name )
:KProxyDialogBase( parent, name, true,
i18n("Manual Proxy Configuration") )
{
@@ -50,7 +50,7 @@ KManualProxyDlg::KManualProxyDlg( QWidget* parent, const char* name )
setMainWidget( mDlg );
mDlg->pbCopyDown->setPixmap( BarIcon("down", KIcon::SizeSmall) );
- QSizePolicy sizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed,
+ TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed,
mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() );
mDlg->pbCopyDown->setSizePolicy( sizePolicy );
@@ -63,19 +63,19 @@ void KManualProxyDlg::init()
mDlg->sbHttps->setRange( 0, MAX_PORT_VALUE );
mDlg->sbFtp->setRange( 0, MAX_PORT_VALUE );
- connect( mDlg->pbNew, SIGNAL( clicked() ), SLOT( newPressed() ) );
- connect( mDlg->pbChange, SIGNAL( clicked() ), SLOT( changePressed() ) );
- connect( mDlg->pbDelete, SIGNAL( clicked() ), SLOT( deletePressed() ) );
- connect( mDlg->pbDeleteAll, SIGNAL( clicked() ), SLOT( deleteAllPressed() ) );
+ connect( mDlg->pbNew, TQT_SIGNAL( clicked() ), TQT_SLOT( newPressed() ) );
+ connect( mDlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) );
+ connect( mDlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) );
+ connect( mDlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) );
- connect( mDlg->lbExceptions, SIGNAL(selectionChanged()), SLOT(updateButtons()) );
- connect( mDlg->lbExceptions, SIGNAL(doubleClicked (QListBoxItem *)), SLOT(changePressed()));
+ connect( mDlg->lbExceptions, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButtons()) );
+ connect( mDlg->lbExceptions, TQT_SIGNAL(doubleClicked (TQListBoxItem *)), TQT_SLOT(changePressed()));
- connect( mDlg->cbSameProxy, SIGNAL( toggled(bool) ), SLOT( sameProxy(bool) ) );
- connect( mDlg->pbCopyDown, SIGNAL( clicked() ), SLOT( copyDown() ) );
+ connect( mDlg->cbSameProxy, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( sameProxy(bool) ) );
+ connect( mDlg->pbCopyDown, TQT_SIGNAL( clicked() ), TQT_SLOT( copyDown() ) );
- connect( mDlg->leHttp, SIGNAL(textChanged(const QString&)), SLOT(textChanged(const QString&)) );
- connect( mDlg->sbHttp, SIGNAL(valueChanged(int)), SLOT(valueChanged (int)) );
+ connect( mDlg->leHttp, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textChanged(const TQString&)) );
+ connect( mDlg->sbHttp, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(valueChanged (int)) );
}
void KManualProxyDlg::setProxyData( const KProxyData &data )
@@ -142,7 +142,7 @@ void KManualProxyDlg::setProxyData( const KProxyData &data )
}
}
- QStringList::ConstIterator it = data.noProxyFor.begin();
+ TQStringList::ConstIterator it = data.noProxyFor.begin();
for( ; it != data.noProxyFor.end(); ++it )
{
// "no_proxy" is a keyword used by the environment variable
@@ -182,7 +182,7 @@ const KProxyData KManualProxyDlg::data() const
if ( mDlg->lbExceptions->count() )
{
- QListBoxItem* item = mDlg->lbExceptions->firstItem();
+ TQListBoxItem* item = mDlg->lbExceptions->firstItem();
for( ; item != 0L; item = item->next() )
data.noProxyFor << item->text();
}
@@ -210,7 +210,7 @@ void KManualProxyDlg::sameProxy( bool enable )
mOldHttpsPort = mDlg->sbHttps->value();
int port = mDlg->sbHttp->value();
- QString text = mDlg->leHttp->text();
+ TQString text = mDlg->leHttp->text();
mDlg->leFtp->setText (text);
mDlg->leHttps->setText (text);
@@ -276,7 +276,7 @@ bool KManualProxyDlg::validate()
return (count > 0);
}
-void KManualProxyDlg::textChanged(const QString& text)
+void KManualProxyDlg::textChanged(const TQString& text)
{
if (!mDlg->cbSameProxy->isChecked())
return;
@@ -332,17 +332,17 @@ void KManualProxyDlg::slotOk()
}
}
-bool KManualProxyDlg::handleDuplicate( const QString& site )
+bool KManualProxyDlg::handleDuplicate( const TQString& site )
{
- QListBoxItem* item = mDlg->lbExceptions->firstItem();
+ TQListBoxItem* item = mDlg->lbExceptions->firstItem();
while ( item != 0 )
{
if ( item->text().findRev( site ) != -1 &&
item != mDlg->lbExceptions->selectedItem() )
{
- QString msg = i18n("You entered a duplicate address. "
+ TQString msg = i18n("You entered a duplicate address. "
"Please try again.");
- QString details = i18n("<qt><center><b>%1</b></center> "
+ TQString details = i18n("<qt><center><b>%1</b></center> "
"is already in the list.</qt>").arg(site);
KMessageBox::detailedError( this, msg, details, i18n("Duplicate Entry") );
return true;
@@ -355,14 +355,14 @@ bool KManualProxyDlg::handleDuplicate( const QString& site )
void KManualProxyDlg::newPressed()
{
- QString result;
+ TQString result;
if( getException(result, i18n("New Exception")) && !handleDuplicate(result) )
mDlg->lbExceptions->insertItem( result );
}
void KManualProxyDlg::changePressed()
{
- QString result;
+ TQString result;
if( getException( result, i18n("Change Exception"),
mDlg->lbExceptions->currentText() ) &&
!handleDuplicate( result ) )
@@ -392,11 +392,11 @@ void KManualProxyDlg::updateButtons()
mDlg->pbChange->setEnabled( itemSelected );
}
-QString KManualProxyDlg::urlFromInput(const KLineEdit* edit,
- const QSpinBox* spin) const
+TQString KManualProxyDlg::urlFromInput(const KLineEdit* edit,
+ const TQSpinBox* spin) const
{
if (!edit)
- return QString::null;
+ return TQString::null;
KURL u( edit->text() );
@@ -406,11 +406,11 @@ QString KManualProxyDlg::urlFromInput(const KLineEdit* edit,
return u.url();
}
-bool KManualProxyDlg::isValidURL( const QString& _url, KURL* result ) const
+bool KManualProxyDlg::isValidURL( const TQString& _url, KURL* result ) const
{
KURL url (_url);
- QStringList filters;
+ TQStringList filters;
filters << "kshorturifilter" << "localdomainurifilter";
// If the typed URL is malformed, and the filters cannot filter it
@@ -419,7 +419,7 @@ bool KManualProxyDlg::isValidURL( const QString& _url, KURL* result ) const
!url.hasHost() )
return false;
- QString host (url.host());
+ TQString host (url.host());
// We only check for a relevant subset of characters that are
// not allowed in <authority> component of a URL.
@@ -432,11 +432,11 @@ bool KManualProxyDlg::isValidURL( const QString& _url, KURL* result ) const
return true;
}
-void KManualProxyDlg::showErrorMsg( const QString& caption,
- const QString& message )
+void KManualProxyDlg::showErrorMsg( const TQString& caption,
+ const TQString& message )
{
- QString cap( caption );
- QString msg( message );
+ TQString cap( caption );
+ TQString msg( message );
if ( cap.isNull() )
cap = i18n("Invalid Entry");
@@ -444,7 +444,7 @@ void KManualProxyDlg::showErrorMsg( const QString& caption,
if ( msg.isNull() )
msg = i18n("The address you have entered is not valid.");
- QString details = i18n("<qt>Make sure none of the addresses or URLs you "
+ TQString details = i18n("<qt>Make sure none of the addresses or URLs you "
"specified contain invalid or wildcard characters "
"such as spaces, asterisks (*), or question marks(?).<p>"
"<u>Examples of VALID entries:</u><br/>"
@@ -457,11 +457,11 @@ void KManualProxyDlg::showErrorMsg( const QString& caption,
KMessageBox::detailedError( this, msg, details, cap );
}
-bool KManualProxyDlg::getException ( QString& result,
- const QString& caption,
- const QString& value )
+bool KManualProxyDlg::getException ( TQString& result,
+ const TQString& caption,
+ const TQString& value )
{
- QString label;
+ TQString label;
// Specify the appropriate message...
if ( mDlg->cbReverseProxy->isChecked() )
@@ -471,7 +471,7 @@ bool KManualProxyDlg::getException ( QString& result,
label = i18n("Enter the address or URL that should be excluded from "
"using the above proxy settings:");
- QString whatsThis = i18n("<qt>Enter a valid address or url.<p>"
+ TQString whatsThis = i18n("<qt>Enter a valid address or url.<p>"
"<b><u>NOTE:</u></b> Wildcard matching such as "
"<code>*.kde.org</code> is not supported. If you want "
"to match any host in the <code>.kde.org</code> domain, "
@@ -480,7 +480,7 @@ bool KManualProxyDlg::getException ( QString& result,
bool ok;
result = KInputDialog::text( caption, label, value, &ok, 0, 0, 0,
- QString::null, whatsThis );
+ TQString::null, whatsThis );
// If the user pressed cancel, do nothing...
if (!ok)
diff --git a/kcontrol/kio/kmanualproxydlg.h b/kcontrol/kio/kmanualproxydlg.h
index a21e3775c..ee8682e28 100644
--- a/kcontrol/kio/kmanualproxydlg.h
+++ b/kcontrol/kio/kmanualproxydlg.h
@@ -33,7 +33,7 @@ class KManualProxyDlg : public KProxyDialogBase
Q_OBJECT
public:
- KManualProxyDlg( QWidget* parent = 0, const char* name = 0 );
+ KManualProxyDlg( TQWidget* parent = 0, const char* name = 0 );
~KManualProxyDlg() {};
virtual void setProxyData( const KProxyData &data );
@@ -49,7 +49,7 @@ protected slots:
void copyDown();
void sameProxy( bool );
void valueChanged (int value);
- void textChanged (const QString&);
+ void textChanged (const TQString&);
void newPressed();
void updateButtons();
@@ -58,20 +58,20 @@ protected slots:
void deleteAllPressed();
private:
- QString urlFromInput( const KLineEdit* edit, const QSpinBox* spin ) const;
- bool isValidURL( const QString&, KURL* = 0 ) const;
- bool handleDuplicate( const QString& );
- bool getException ( QString&, const QString&,
- const QString& value = QString::null );
- void showErrorMsg( const QString& caption = QString::null,
- const QString& message = QString::null );
+ TQString urlFromInput( const KLineEdit* edit, const TQSpinBox* spin ) const;
+ bool isValidURL( const TQString&, KURL* = 0 ) const;
+ bool handleDuplicate( const TQString& );
+ bool getException ( TQString&, const TQString&,
+ const TQString& value = TQString::null );
+ void showErrorMsg( const TQString& caption = TQString::null,
+ const TQString& message = TQString::null );
private:
ManualProxyDlgUI* mDlg;
int mOldFtpPort;
int mOldHttpsPort;
- QString mOldFtpText;
- QString mOldHttpsText;
+ TQString mOldFtpText;
+ TQString mOldHttpsText;
};
#endif
diff --git a/kcontrol/kio/kproxydlg.cpp b/kcontrol/kio/kproxydlg.cpp
index c7f9d7d20..bbe7a76bd 100644
--- a/kcontrol/kio/kproxydlg.cpp
+++ b/kcontrol/kio/kproxydlg.cpp
@@ -19,14 +19,14 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qregexp.h>
-#include <qcheckbox.h>
-#include <qwhatsthis.h>
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
-#include <qtabwidget.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqregexp.h>
+#include <tqcheckbox.h>
+#include <tqwhatsthis.h>
+#include <tqbuttongroup.h>
+#include <tqradiobutton.h>
+#include <tqtabwidget.h>
#include <klocale.h>
#include <klineedit.h>
@@ -40,12 +40,12 @@
#include "kproxydlg.h"
#include "kproxydlg_ui.h"
-KProxyOptions::KProxyOptions (QWidget* parent )
+KProxyOptions::KProxyOptions (TQWidget* parent )
:KCModule (parent, "kcmkio")
{
- QVBoxLayout *layout = new QVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
- mTab = new QTabWidget(this);
+ mTab = new TQTabWidget(this);
layout->addWidget(mTab);
mProxy = new KProxyDialog(mTab);
@@ -54,9 +54,9 @@ KProxyOptions::KProxyOptions (QWidget* parent )
mTab->addTab(mProxy, i18n("&Proxy"));
mTab->addTab(mSocks, i18n("&SOCKS"));
- connect(mProxy, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
- connect(mSocks, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
- connect(mTab, SIGNAL(currentChanged(QWidget *)), SIGNAL(quickHelpChanged()));
+ connect(mProxy, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+ connect(mSocks, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+ connect(mTab, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SIGNAL(quickHelpChanged()));
}
KProxyOptions::~KProxyOptions()
@@ -81,9 +81,9 @@ void KProxyOptions::defaults()
mSocks->defaults();
}
-QString KProxyOptions::quickHelp() const
+TQString KProxyOptions::quickHelp() const
{
- QWidget *w = mTab->currentPage();
+ TQWidget *w = mTab->currentPage();
if (w && w->inherits("KCModule"))
{
@@ -91,14 +91,14 @@ QString KProxyOptions::quickHelp() const
return m->quickHelp();
}
- return QString::null;
+ return TQString::null;
}
-KProxyDialog::KProxyDialog( QWidget* parent)
+KProxyDialog::KProxyDialog( TQWidget* parent)
:KCModule( parent, "kcmkio" )
{
- QVBoxLayout* mainLayout = new QVBoxLayout( this, KDialog::marginHint(),
+ TQVBoxLayout* mainLayout = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
mDlg = new KProxyDialogUI( this );
@@ -106,27 +106,27 @@ KProxyDialog::KProxyDialog( QWidget* parent)
mainLayout->addStretch();
// signals and slots connections
- connect( mDlg->rbNoProxy, SIGNAL( toggled(bool) ),
- SLOT( slotUseProxyChanged() ) );
+ connect( mDlg->rbNoProxy, TQT_SIGNAL( toggled(bool) ),
+ TQT_SLOT( slotUseProxyChanged() ) );
- connect( mDlg->rbAutoDiscover, SIGNAL( toggled(bool) ),
- SLOT( slotChanged() ) );
- connect( mDlg->rbAutoScript, SIGNAL( toggled(bool) ),
- SLOT( slotChanged() ) );
+ connect( mDlg->rbAutoDiscover, TQT_SIGNAL( toggled(bool) ),
+ TQT_SLOT( slotChanged() ) );
+ connect( mDlg->rbAutoScript, TQT_SIGNAL( toggled(bool) ),
+ TQT_SLOT( slotChanged() ) );
- connect( mDlg->rbPrompt, SIGNAL( toggled(bool) ),
- SLOT( slotChanged() ) );
- connect( mDlg->rbPresetLogin, SIGNAL( toggled(bool) ),
- SLOT( slotChanged() ) );
+ connect( mDlg->rbPrompt, TQT_SIGNAL( toggled(bool) ),
+ TQT_SLOT( slotChanged() ) );
+ connect( mDlg->rbPresetLogin, TQT_SIGNAL( toggled(bool) ),
+ TQT_SLOT( slotChanged() ) );
- connect( mDlg->cbPersConn, SIGNAL( toggled(bool) ),
- SLOT( slotChanged() ) );
+ connect( mDlg->cbPersConn, TQT_SIGNAL( toggled(bool) ),
+ TQT_SLOT( slotChanged() ) );
- connect( mDlg->location, SIGNAL( textChanged(const QString&) ),
- SLOT( slotChanged() ) );
+ connect( mDlg->location, TQT_SIGNAL( textChanged(const TQString&) ),
+ TQT_SLOT( slotChanged() ) );
- connect( mDlg->pbEnvSetup, SIGNAL( clicked() ), SLOT( setupEnvProxy() ) );
- connect( mDlg->pbManSetup, SIGNAL( clicked() ), SLOT( setupManProxy() ) );
+ connect( mDlg->pbEnvSetup, TQT_SIGNAL( clicked() ), TQT_SLOT( setupEnvProxy() ) );
+ connect( mDlg->pbManSetup, TQT_SIGNAL( clicked() ), TQT_SLOT( setupManProxy() ) );
load();
}
@@ -150,7 +150,7 @@ void KProxyDialog::load()
mData->proxyList["ftp"] = proto.proxyFor( "ftp" );
mData->proxyList["script"] = proto.proxyConfigScript();
mData->useReverseProxy = proto.useReverseProxy();
- mData->noProxyFor = QStringList::split( QRegExp("[',''\t'' ']"),
+ mData->noProxyFor = TQStringList::split( TQRegExp("[',''\t'' ']"),
proto.noProxyForRaw() );
mDlg->gbAuth->setEnabled( useProxy );
@@ -306,7 +306,7 @@ void KProxyDialog::setupManProxy()
dlgManual.setProxyData( *mData );
- if ( dlgManual.exec() == QDialog::Accepted )
+ if ( dlgManual.exec() == TQDialog::Accepted )
{
*mData = dlgManual.data();
mDlg->rbManual->setChecked(true);
@@ -320,7 +320,7 @@ void KProxyDialog::setupEnvProxy()
dlgEnv.setProxyData( *mData );
- if ( dlgEnv.exec() == QDialog::Accepted )
+ if ( dlgEnv.exec() == TQDialog::Accepted )
{
*mData = dlgEnv.data();
mDlg->rbEnvVar->setChecked(true);
@@ -343,7 +343,7 @@ void KProxyDialog::slotUseProxyChanged()
emit changed( true );
}
-QString KProxyDialog::quickHelp() const
+TQString KProxyDialog::quickHelp() const
{
return i18n( "<h1>Proxy</h1>"
"<p>A proxy server is an intermediate program that sits between "
@@ -357,9 +357,9 @@ QString KProxyDialog::quickHelp() const
"<p><u>Note:</u> Some proxy servers provide both services.</p>" );
}
-void KProxyDialog::showInvalidMessage( const QString& _msg )
+void KProxyDialog::showInvalidMessage( const TQString& _msg )
{
- QString msg;
+ TQString msg;
if( !_msg.isEmpty() )
msg = _msg;
diff --git a/kcontrol/kio/kproxydlg.h b/kcontrol/kio/kproxydlg.h
index bbac5641d..d8ef1db9e 100644
--- a/kcontrol/kio/kproxydlg.h
+++ b/kcontrol/kio/kproxydlg.h
@@ -22,7 +22,7 @@
#ifndef _KPROXYDIALOG_H
#define _KPROXYDIALOG_H
-#include <qstring.h>
+#include <tqstring.h>
#include <kcmodule.h>
@@ -36,18 +36,18 @@ class KProxyOptions : public KCModule
Q_OBJECT
public:
- KProxyOptions( QWidget* parent = 0 );
+ KProxyOptions( TQWidget* parent = 0 );
~KProxyOptions();
virtual void load();
virtual void save();
virtual void defaults();
- virtual QString quickHelp() const;
+ virtual TQString quickHelp() const;
private:
KCModule* mProxy;
KCModule* mSocks;
- QTabWidget* mTab;
+ TQTabWidget* mTab;
};
class KProxyDialog : public KCModule
@@ -55,13 +55,13 @@ class KProxyDialog : public KCModule
Q_OBJECT
public:
- KProxyDialog( QWidget* parent = 0 );
+ KProxyDialog( TQWidget* parent = 0 );
~KProxyDialog();
virtual void load();
virtual void save();
virtual void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
private slots:
void slotChanged();
@@ -71,7 +71,7 @@ private slots:
void setupEnvProxy();
private:
- void showInvalidMessage( const QString& _msg = QString::null );
+ void showInvalidMessage( const TQString& _msg = TQString::null );
private:
KProxyDialogUI* mDlg;
diff --git a/kcontrol/kio/kproxydlgbase.cpp b/kcontrol/kio/kproxydlgbase.cpp
index c901037e3..e95625713 100644
--- a/kcontrol/kio/kproxydlgbase.cpp
+++ b/kcontrol/kio/kproxydlgbase.cpp
@@ -56,19 +56,19 @@ void KProxyData::init()
}
-KProxyDialogBase::KProxyDialogBase( QWidget* parent, const char* name,
- bool modal, const QString &caption )
+KProxyDialogBase::KProxyDialogBase( TQWidget* parent, const char* name,
+ bool modal, const TQString &caption )
:KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok, true )
{
m_bHasValidData = false;
}
-void KProxyDialogBase::setHighLight (QWidget* widget, bool highlight)
+void KProxyDialogBase::setHighLight (TQWidget* widget, bool highlight)
{
if (!widget)
return;
- QFont f = widget->font();
+ TQFont f = widget->font();
f.setBold( highlight );
widget->setFont( f );
}
diff --git a/kcontrol/kio/kproxydlgbase.h b/kcontrol/kio/kproxydlgbase.h
index 7c39f31c0..06ffa8753 100644
--- a/kcontrol/kio/kproxydlgbase.h
+++ b/kcontrol/kio/kproxydlgbase.h
@@ -22,9 +22,9 @@
#ifndef KPROXY_DIALOG_BASE_H
#define KPROXY_DIALOG_BASE_H
-#include <qmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqmap.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <kdialogbase.h>
#include <kprotocolmanager.h>
@@ -40,9 +40,9 @@ public:
bool useReverseProxy;
bool showEnvVarValue;
- QStringList noProxyFor;
+ TQStringList noProxyFor;
KProtocolManager::ProxyType type;
- QMap<QString, QString> proxyList;
+ TQMap<TQString, TQString> proxyList;
private:
void init();
@@ -52,8 +52,8 @@ private:
class KProxyDialogBase : public KDialogBase
{
public:
- KProxyDialogBase( QWidget* parent = 0, const char* name = 0,
- bool modal = false, const QString &caption = QString::null);
+ KProxyDialogBase( TQWidget* parent = 0, const char* name = 0,
+ bool modal = false, const TQString &caption = TQString::null);
virtual ~KProxyDialogBase() {};
@@ -62,7 +62,7 @@ public:
virtual void setProxyData (const KProxyData&)=0;
protected:
- void setHighLight (QWidget* widget = 0, bool highlight = false);
+ void setHighLight (TQWidget* widget = 0, bool highlight = false);
bool m_bHasValidData;
};
#endif
diff --git a/kcontrol/kio/ksaveioconfig.cpp b/kcontrol/kio/ksaveioconfig.cpp
index a251c0aed..50d56d86e 100644
--- a/kcontrol/kio/ksaveioconfig.cpp
+++ b/kcontrol/kio/ksaveioconfig.cpp
@@ -82,7 +82,7 @@ void KSaveIOConfig::reparseConfiguration ()
void KSaveIOConfig::setReadTimeout( int _timeout )
{
KConfig* cfg = config ();
- cfg->setGroup( QString::null );
+ cfg->setGroup( TQString::null );
cfg->writeEntry("ReadTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
cfg->sync();
}
@@ -90,7 +90,7 @@ void KSaveIOConfig::setReadTimeout( int _timeout )
void KSaveIOConfig::setConnectTimeout( int _timeout )
{
KConfig* cfg = config ();
- cfg->setGroup( QString::null );
+ cfg->setGroup( TQString::null );
cfg->writeEntry("ConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
cfg->sync();
}
@@ -98,7 +98,7 @@ void KSaveIOConfig::setConnectTimeout( int _timeout )
void KSaveIOConfig::setProxyConnectTimeout( int _timeout )
{
KConfig* cfg = config ();
- cfg->setGroup( QString::null );
+ cfg->setGroup( TQString::null );
cfg->writeEntry("ProxyConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
cfg->sync();
}
@@ -106,7 +106,7 @@ void KSaveIOConfig::setProxyConnectTimeout( int _timeout )
void KSaveIOConfig::setResponseTimeout( int _timeout )
{
KConfig* cfg = config ();
- cfg->setGroup( QString::null );
+ cfg->setGroup( TQString::null );
cfg->writeEntry("ResponseTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
cfg->sync();
}
@@ -115,7 +115,7 @@ void KSaveIOConfig::setResponseTimeout( int _timeout )
void KSaveIOConfig::setMarkPartial( bool _mode )
{
KConfig* cfg = config ();
- cfg->setGroup( QString::null );
+ cfg->setGroup( TQString::null );
cfg->writeEntry( "MarkPartial", _mode );
cfg->sync();
}
@@ -123,7 +123,7 @@ void KSaveIOConfig::setMarkPartial( bool _mode )
void KSaveIOConfig::setMinimumKeepSize( int _size )
{
KConfig* cfg = config ();
- cfg->setGroup( QString::null );
+ cfg->setGroup( TQString::null );
cfg->writeEntry( "MinimumKeepSize", _size );
cfg->sync();
}
@@ -131,7 +131,7 @@ void KSaveIOConfig::setMinimumKeepSize( int _size )
void KSaveIOConfig::setAutoResume( bool _mode )
{
KConfig* cfg = config ();
- cfg->setGroup( QString::null );
+ cfg->setGroup( TQString::null );
cfg->writeEntry( "AutoResume", _mode );
cfg->sync();
}
@@ -153,7 +153,7 @@ void KSaveIOConfig::setMaxCacheSize( int cache_size )
void KSaveIOConfig::setCacheControl(KIO::CacheControl policy)
{
KConfig* cfg = http_config ();
- QString tmp = KIO::getCacheControlString(policy);
+ TQString tmp = KIO::getCacheControlString(policy);
cfg->writeEntry("cache", tmp);
cfg->sync();
}
@@ -189,7 +189,7 @@ void KSaveIOConfig::setProxyAuthMode(KProtocolManager::ProxyAuthMode mode)
cfg->sync();
}
-void KSaveIOConfig::setNoProxyFor( const QString& _noproxy )
+void KSaveIOConfig::setNoProxyFor( const TQString& _noproxy )
{
KConfig* cfg = config ();
cfg->setGroup( "Proxy Settings" );
@@ -197,8 +197,8 @@ void KSaveIOConfig::setNoProxyFor( const QString& _noproxy )
cfg->sync();
}
-void KSaveIOConfig::setProxyFor( const QString& protocol,
- const QString& _proxy )
+void KSaveIOConfig::setProxyFor( const TQString& protocol,
+ const TQString& _proxy )
{
KConfig* cfg = config ();
cfg->setGroup( "Proxy Settings" );
@@ -206,7 +206,7 @@ void KSaveIOConfig::setProxyFor( const QString& protocol,
cfg->sync();
}
-void KSaveIOConfig::setProxyConfigScript( const QString& _url )
+void KSaveIOConfig::setProxyConfigScript( const TQString& _url )
{
KConfig* cfg = config ();
cfg->setGroup( "Proxy Settings" );
@@ -217,7 +217,7 @@ void KSaveIOConfig::setProxyConfigScript( const QString& _url )
void KSaveIOConfig::setPersistentProxyConnection( bool enable )
{
KConfig* cfg = config ();
- cfg->setGroup( QString::null );
+ cfg->setGroup( TQString::null );
cfg->writeEntry( "PersistentProxyConnection", enable );
cfg->sync();
}
@@ -225,33 +225,33 @@ void KSaveIOConfig::setPersistentProxyConnection( bool enable )
void KSaveIOConfig::setPersistentConnections( bool enable )
{
KConfig* cfg = config ();
- cfg->setGroup( QString::null );
+ cfg->setGroup( TQString::null );
cfg->writeEntry( "PersistentConnections", enable );
cfg->sync();
}
-void KSaveIOConfig::updateRunningIOSlaves (QWidget *parent)
+void KSaveIOConfig::updateRunningIOSlaves (TQWidget *parent)
{
// Inform all running io-slaves about the changes...
// if we cannot update, ioslaves inform the end user...
- if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", QString::null))
+ if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString::null))
{
- QString caption = i18n("Update Failed");
- QString message = i18n("You have to restart the running applications "
+ TQString caption = i18n("Update Failed");
+ TQString message = i18n("You have to restart the running applications "
"for these changes to take effect.");
KMessageBox::information (parent, message, caption);
return;
}
}
-void KSaveIOConfig::updateProxyScout( QWidget * parent )
+void KSaveIOConfig::updateProxyScout( TQWidget * parent )
{
// Inform the proxyscout kded module about changes
// if we cannot update, ioslaves inform the end user...
if (!DCOPRef("kded", "proxyscout").send("reset"))
{
- QString caption = i18n("Update Failed");
- QString message = i18n("You have to restart KDE "
+ TQString caption = i18n("Update Failed");
+ TQString message = i18n("You have to restart KDE "
"for these changes to take effect.");
KMessageBox::information (parent, message, caption);
return;
diff --git a/kcontrol/kio/ksaveioconfig.h b/kcontrol/kio/ksaveioconfig.h
index 3a6528ed2..2bf107131 100644
--- a/kcontrol/kio/ksaveioconfig.h
+++ b/kcontrol/kio/ksaveioconfig.h
@@ -60,11 +60,11 @@ public:
static void setProxyAuthMode( KProtocolManager::ProxyAuthMode );
- static void setProxyConfigScript( const QString& );
+ static void setProxyConfigScript( const TQString& );
- static void setProxyFor( const QString&, const QString& );
+ static void setProxyFor( const TQString&, const TQString& );
- static void setNoProxyFor( const QString& );
+ static void setNoProxyFor( const TQString& );
/** Miscelaneous Settings */
@@ -80,10 +80,10 @@ public:
/** Update all running io-slaves */
- static void updateRunningIOSlaves (QWidget * parent = 0L);
+ static void updateRunningIOSlaves (TQWidget * parent = 0L);
/** Update proxy scout */
- static void updateProxyScout( QWidget * parent = 0L );
+ static void updateProxyScout( TQWidget * parent = 0L );
protected:
static KConfig* config ();
diff --git a/kcontrol/kio/main.cpp b/kcontrol/kio/main.cpp
index dfe2eb0f8..96821defa 100644
--- a/kcontrol/kio/main.cpp
+++ b/kcontrol/kio/main.cpp
@@ -20,10 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qfile.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qtabwidget.h>
+#include <tqfile.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqtabwidget.h>
#include <kcmoduleloader.h>
#include <klocale.h>
@@ -40,44 +40,44 @@
extern "C"
{
- KDE_EXPORT KCModule *create_cookie(QWidget *parent, const char /**name*/)
+ KDE_EXPORT KCModule *create_cookie(TQWidget *parent, const char /**name*/)
{
return new KCookiesMain(parent);
}
- KDE_EXPORT KCModule *create_smb(QWidget *parent, const char /**name*/)
+ KDE_EXPORT KCModule *create_smb(TQWidget *parent, const char /**name*/)
{
return new SMBRoOptions(parent);
}
- KDE_EXPORT KCModule *create_useragent(QWidget *parent, const char /**name*/)
+ KDE_EXPORT KCModule *create_useragent(TQWidget *parent, const char /**name*/)
{
return new UserAgentDlg(parent);
}
- KDE_EXPORT KCModule *create_proxy(QWidget *parent, const char /**name*/)
+ KDE_EXPORT KCModule *create_proxy(TQWidget *parent, const char /**name*/)
{
return new KProxyOptions(parent);
}
- KDE_EXPORT KCModule *create_cache(QWidget *parent, const char /**name*/)
+ KDE_EXPORT KCModule *create_cache(TQWidget *parent, const char /**name*/)
{
return new KCacheConfigDialog( parent );
}
- KDE_EXPORT KCModule *create_netpref(QWidget *parent, const char /**name*/)
+ KDE_EXPORT KCModule *create_netpref(TQWidget *parent, const char /**name*/)
{
return new KIOPreferences(parent);
}
- KDE_EXPORT KCModule *create_lanbrowser(QWidget *parent, const char *)
+ KDE_EXPORT KCModule *create_lanbrowser(TQWidget *parent, const char *)
{
return new LanBrowser(parent);
}
}
-LanBrowser::LanBrowser(QWidget *parent)
+LanBrowser::LanBrowser(TQWidget *parent)
:KCModule(parent,"kcmkio")
,layout(this)
,tabs(this)
@@ -103,27 +103,27 @@ LanBrowser::LanBrowser(QWidget *parent)
smbPage = create_smb(&tabs, 0);
tabs.addTab(smbPage, i18n("&Windows Shares"));
- connect(smbPage,SIGNAL(changed(bool)), SLOT( changed() ));
+ connect(smbPage,TQT_SIGNAL(changed(bool)), TQT_SLOT( changed() ));
lisaPage = KCModuleLoader::loadModule("kcmlisa", KCModuleLoader::None, &tabs);
if (lisaPage)
{
tabs.addTab(lisaPage,i18n("&LISa Daemon"));
- connect(lisaPage,SIGNAL(changed()), SLOT( changed() ));
+ connect(lisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
}
// resLisaPage = KCModuleLoader::loadModule("kcmreslisa", &tabs);
// if (resLisaPage)
// {
// tabs.addTab(resLisaPage,i18n("R&esLISa Daemon"));
-// connect(resLisaPage,SIGNAL(changed()), SLOT( changed() ));
+// connect(resLisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
// }
kioLanPage = KCModuleLoader::loadModule("kcmkiolan", KCModuleLoader::None, &tabs);
if (kioLanPage)
{
tabs.addTab(kioLanPage,i18n("lan:/ Iosla&ve"));
- connect(kioLanPage,SIGNAL(changed()), SLOT( changed() ));
+ connect(kioLanPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
}
setButtons(Apply|Help);
diff --git a/kcontrol/kio/main.h b/kcontrol/kio/main.h
index d2499c5e4..70a64c44a 100644
--- a/kcontrol/kio/main.h
+++ b/kcontrol/kio/main.h
@@ -30,13 +30,13 @@ class LanBrowser:public KCModule
{
Q_OBJECT
public:
- LanBrowser(QWidget *parent=0);
+ LanBrowser(TQWidget *parent=0);
virtual void load();
virtual void save();
private:
- QVBoxLayout layout;
- QTabWidget tabs;
+ TQVBoxLayout layout;
+ TQTabWidget tabs;
KCModule *smbPage;
KCModule *lisaPage;
// KCModule *resLisaPage;
diff --git a/kcontrol/kio/netpref.cpp b/kcontrol/kio/netpref.cpp
index 6aa20c4e7..1c1de3316 100644
--- a/kcontrol/kio/netpref.cpp
+++ b/kcontrol/kio/netpref.cpp
@@ -1,7 +1,7 @@
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qwhatsthis.h>
-#include <qvgroupbox.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqwhatsthis.h>
+#include <tqvgroupbox.h>
#include <kio/ioslave_defaults.h>
#include <knuminput.h>
@@ -14,13 +14,13 @@
#define MAX_TIMEOUT_VALUE 3600
-KIOPreferences::KIOPreferences( QWidget* parent )
+KIOPreferences::KIOPreferences( TQWidget* parent )
:KCModule( parent, "kcmkio" )
{
- QVBoxLayout* mainLayout = new QVBoxLayout( this, 0,
+ TQVBoxLayout* mainLayout = new TQVBoxLayout( this, 0,
KDialog::spacingHint() );
- gb_Timeout = new QVGroupBox( i18n("Timeout Values"), this, "gb_Timeout" );
- QWhatsThis::add( gb_Timeout, i18n("Here you can set timeout values. "
+ gb_Timeout = new TQVGroupBox( i18n("Timeout Values"), this, "gb_Timeout" );
+ TQWhatsThis::add( gb_Timeout, i18n("Here you can set timeout values. "
"You might want to tweak them if your "
"connection is very slow. The maximum "
"allowed value is %1 seconds.").arg(MAX_TIMEOUT_VALUE));
@@ -29,43 +29,43 @@ KIOPreferences::KIOPreferences( QWidget* parent )
sb_socketRead = new KIntNumInput( gb_Timeout, "sb_socketRead" );
sb_socketRead->setSuffix( i18n( " sec" ) );
sb_socketRead->setLabel( i18n( "Soc&ket read:" ), AlignVCenter);
- connect(sb_socketRead, SIGNAL(valueChanged ( int )),
- this, SLOT(configChanged()));
+ connect(sb_socketRead, TQT_SIGNAL(valueChanged ( int )),
+ this, TQT_SLOT(configChanged()));
sb_proxyConnect = new KIntNumInput( sb_socketRead, 0, gb_Timeout,
10, "sb_proxyConnect" );
sb_proxyConnect->setSuffix( i18n( " sec" ) );
sb_proxyConnect->setLabel( i18n( "Pro&xy connect:" ), AlignVCenter);
- connect(sb_proxyConnect, SIGNAL(valueChanged ( int )),
- this, SLOT(configChanged()));
+ connect(sb_proxyConnect, TQT_SIGNAL(valueChanged ( int )),
+ this, TQT_SLOT(configChanged()));
sb_serverConnect = new KIntNumInput( sb_proxyConnect, 0, gb_Timeout,
10, "sb_serverConnect" );
sb_serverConnect->setSuffix( i18n( " sec" ) );
sb_serverConnect->setLabel( i18n("Server co&nnect:"), AlignVCenter);
- connect(sb_serverConnect, SIGNAL(valueChanged ( int )),
- this, SLOT(configChanged()));
+ connect(sb_serverConnect, TQT_SIGNAL(valueChanged ( int )),
+ this, TQT_SLOT(configChanged()));
sb_serverResponse = new KIntNumInput( sb_serverConnect, 0, gb_Timeout,
10, "sb_serverResponse" );
sb_serverResponse->setSuffix( i18n( " sec" ) );
sb_serverResponse->setLabel( i18n("&Server response:"), AlignVCenter);
- connect(sb_serverResponse, SIGNAL(valueChanged ( int )),
- this, SLOT(configChanged()));
-
- gb_Ftp = new QVGroupBox( i18n( "FTP Options" ), this, "gb_Ftp" );
- cb_ftpEnablePasv = new QCheckBox( i18n( "Enable passive &mode (PASV)" ), gb_Ftp );
- QWhatsThis::add(cb_ftpEnablePasv, i18n( "Enables FTP's \"passive\" mode. This is required to allow FTP to work from behind firewalls." ));
- cb_ftpMarkPartial = new QCheckBox( i18n( "Mark &partially uploaded files" ), gb_Ftp );
- QWhatsThis::add(cb_ftpMarkPartial, i18n( "<p>Marks partially uploaded FTP files.</p>"
+ connect(sb_serverResponse, TQT_SIGNAL(valueChanged ( int )),
+ this, TQT_SLOT(configChanged()));
+
+ gb_Ftp = new TQVGroupBox( i18n( "FTP Options" ), this, "gb_Ftp" );
+ cb_ftpEnablePasv = new TQCheckBox( i18n( "Enable passive &mode (PASV)" ), gb_Ftp );
+ TQWhatsThis::add(cb_ftpEnablePasv, i18n( "Enables FTP's \"passive\" mode. This is required to allow FTP to work from behind firewalls." ));
+ cb_ftpMarkPartial = new TQCheckBox( i18n( "Mark &partially uploaded files" ), gb_Ftp );
+ TQWhatsThis::add(cb_ftpMarkPartial, i18n( "<p>Marks partially uploaded FTP files.</p>"
"<p>When this option is enabled, partially uploaded files "
"will have a \".part\" extension. This extension will be removed "
"once the transfer is complete.</p>"));
mainLayout->addWidget( gb_Ftp );
- connect(cb_ftpEnablePasv, SIGNAL(toggled(bool)), SLOT(configChanged()));
- connect(cb_ftpMarkPartial, SIGNAL(toggled(bool)), SLOT(configChanged()));
+ connect(cb_ftpEnablePasv, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()));
+ connect(cb_ftpMarkPartial, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()));
mainLayout->addStretch();
@@ -126,7 +126,7 @@ void KIOPreferences::defaults()
emit changed(true);
}
-QString KIOPreferences::quickHelp() const
+TQString KIOPreferences::quickHelp() const
{
return i18n("<h1>Network Preferences</h1>Here you can define"
" the behavior of KDE programs when using Internet"
diff --git a/kcontrol/kio/netpref.h b/kcontrol/kio/netpref.h
index 2e269d4cd..ff8a7ffcf 100644
--- a/kcontrol/kio/netpref.h
+++ b/kcontrol/kio/netpref.h
@@ -17,23 +17,23 @@ class KIOPreferences : public KCModule
Q_OBJECT
public:
- KIOPreferences( QWidget* parent = 0);
+ KIOPreferences( TQWidget* parent = 0);
~KIOPreferences();
void load();
void save();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
protected slots:
void configChanged() { emit changed(true); }
private:
- QVGroupBox* gb_Ftp;
- QVGroupBox* gb_Timeout;
- QCheckBox* cb_ftpEnablePasv;
- QCheckBox* cb_ftpMarkPartial;
+ TQVGroupBox* gb_Ftp;
+ TQVGroupBox* gb_Timeout;
+ TQCheckBox* cb_ftpEnablePasv;
+ TQCheckBox* cb_ftpMarkPartial;
KIntNumInput* sb_socketRead;
KIntNumInput* sb_proxyConnect;
diff --git a/kcontrol/kio/policydlg.cpp b/kcontrol/kio/policydlg.cpp
index 8e59c4bb0..463806266 100644
--- a/kcontrol/kio/policydlg.cpp
+++ b/kcontrol/kio/policydlg.cpp
@@ -16,11 +16,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qvalidator.h>
+#include <tqpushbutton.h>
+#include <tqwhatsthis.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqvalidator.h>
#include <klineedit.h>
#include <kcombobox.h>
@@ -33,12 +33,12 @@
class DomainLineValidator : public QValidator
{
public:
- DomainLineValidator(QObject *parent)
- :QValidator(parent, "domainValidator")
+ DomainLineValidator(TQObject *parent)
+ :TQValidator(parent, "domainValidator")
{
}
- State validate(QString &input, int &) const
+ State validate(TQString &input, int &) const
{
if (input.isEmpty() || (input == "."))
return Intermediate;
@@ -56,7 +56,7 @@ public:
};
-PolicyDlg::PolicyDlg (const QString& caption, QWidget *parent,
+PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent,
const char *name)
: KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, true)
{
@@ -67,14 +67,14 @@ PolicyDlg::PolicyDlg (const QString& caption, QWidget *parent,
m_dlgUI->cbPolicy->setMinimumWidth( m_dlgUI->cbPolicy->fontMetrics().maxWidth() * 25 );
enableButtonOK( false );
- connect(m_dlgUI->leDomain, SIGNAL(textChanged(const QString&)),
- SLOT(slotTextChanged(const QString&)));
+ connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(slotTextChanged(const TQString&)));
setFixedSize (sizeHint());
m_dlgUI->leDomain->setFocus ();
}
-void PolicyDlg::setEnableHostEdit( bool state, const QString& host )
+void PolicyDlg::setEnableHostEdit( bool state, const TQString& host )
{
if ( !host.isEmpty() )
m_dlgUI->leDomain->setText( host );
@@ -95,12 +95,12 @@ int PolicyDlg::advice () const
return m_dlgUI->cbPolicy->currentItem() + 1;
}
-QString PolicyDlg::domain () const
+TQString PolicyDlg::domain () const
{
return m_dlgUI->leDomain->text();
}
-void PolicyDlg::slotTextChanged( const QString& text )
+void PolicyDlg::slotTextChanged( const TQString& text )
{
enableButtonOK( text.length() > 1 );
}
diff --git a/kcontrol/kio/policydlg.h b/kcontrol/kio/policydlg.h
index dcdca5136..815b4d01d 100644
--- a/kcontrol/kio/policydlg.h
+++ b/kcontrol/kio/policydlg.h
@@ -19,7 +19,7 @@
#ifndef _POLICYDLG_H
#define _POLICYDLG_H
-#include <qstring.h>
+#include <tqstring.h>
#include <kdialogbase.h>
@@ -47,16 +47,16 @@ public:
}
}
- static KCookieAdvice::Value strToAdvice (const QString& advice)
+ static KCookieAdvice::Value strToAdvice (const TQString& advice)
{
if (advice.isEmpty())
return KCookieAdvice::Dunno;
- if (advice.find (QString::fromLatin1("accept"), 0, false) == 0)
+ if (advice.find (TQString::fromLatin1("accept"), 0, false) == 0)
return KCookieAdvice::Accept;
- else if (advice.find (QString::fromLatin1("reject"), 0, false) == 0)
+ else if (advice.find (TQString::fromLatin1("reject"), 0, false) == 0)
return KCookieAdvice::Reject;
- else if (advice.find (QString::fromLatin1("ask"), 0, false) == 0)
+ else if (advice.find (TQString::fromLatin1("ask"), 0, false) == 0)
return KCookieAdvice::Ask;
return KCookieAdvice::Dunno;
@@ -68,18 +68,18 @@ class PolicyDlg : public KDialogBase
Q_OBJECT
public:
- PolicyDlg (const QString& caption, QWidget *parent = 0,
+ PolicyDlg (const TQString& caption, TQWidget *parent = 0,
const char *name = 0);
~PolicyDlg (){};
int advice() const;
- QString domain() const;
+ TQString domain() const;
- void setEnableHostEdit( bool, const QString& host = QString::null );
+ void setEnableHostEdit( bool, const TQString& host = TQString::null );
void setPolicy (int policy);
protected slots:
- void slotTextChanged( const QString& );
+ void slotTextChanged( const TQString& );
private:
PolicyDlgUI* m_dlgUI;
diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp
index dc075c793..90dfd9170 100644
--- a/kcontrol/kio/smbrodlg.cpp
+++ b/kcontrol/kio/smbrodlg.cpp
@@ -18,9 +18,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qtextcodec.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqtextcodec.h>
#include <klocale.h>
#include <kconfig.h>
@@ -35,49 +35,49 @@
#endif
-SMBRoOptions::SMBRoOptions(QWidget *parent)
+SMBRoOptions::SMBRoOptions(TQWidget *parent)
: KCModule(parent, "kcmkio")
{
- QGridLayout *layout = new QGridLayout(this,2,-1,KDialog::marginHint(),
+ TQGridLayout *layout = new TQGridLayout(this,2,-1,KDialog::marginHint(),
KDialog::spacingHint());
- QLabel *label=new QLabel(i18n("This is the configuration for the samba client only, not the server."),this);
+ TQLabel *label=new TQLabel(i18n("This is the configuration for the samba client only, not the server."),this);
layout->addMultiCellWidget(label,0,0,0,1);
- m_userLe=new QLineEdit(this);
- label=new QLabel(m_userLe,i18n("Default user name:"),this);
+ m_userLe=new TQLineEdit(this);
+ label=new TQLabel(m_userLe,i18n("Default user name:"),this);
layout->addWidget(label,1,0);
layout->addWidget(m_userLe,1,1);
- m_passwordLe=new QLineEdit(this);
- m_passwordLe->setEchoMode(QLineEdit::Password);
- label=new QLabel(m_passwordLe,i18n("Default password:"),this);
+ m_passwordLe=new TQLineEdit(this);
+ m_passwordLe->setEchoMode(TQLineEdit::Password);
+ label=new TQLabel(m_passwordLe,i18n("Default password:"),this);
layout->addWidget(label,2,0);
layout->addWidget(m_passwordLe,2,1);
-/* m_workgroupLe=new QLineEdit(this);
- label=new QLabel(m_workgroupLe,i18n("Workgroup:"),this);
+/* m_workgroupLe=new TQLineEdit(this);
+ label=new TQLabel(m_workgroupLe,i18n("Workgroup:"),this);
layout->addWidget(label,3,0);
layout->addWidget(m_workgroupLe,3,1);
- m_showHiddenShares=new QCheckBox(i18n("Show hidden shares"),this);
+ m_showHiddenShares=new TQCheckBox(i18n("Show hidden shares"),this);
layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1);
m_encodingList = new KComboBox( false, this );
- QStringList _strList = KGlobal::charsets()->availableEncodingNames();
+ TQStringList _strList = KGlobal::charsets()->availableEncodingNames();
m_encodingList->insertStringList( _strList );
- label = new QLabel( m_encodingList, i18n( "MS Windows encoding:" ), this );
+ label = new TQLabel( m_encodingList, i18n( "MS Windows encoding:" ), this );
layout->addWidget( label, 3, 0 );
layout->addWidget( m_encodingList, 3, 1 );
*/
- layout->addWidget(new QWidget(this),4,0);
+ layout->addWidget(new TQWidget(this),4,0);
-// connect(m_showHiddenShares, SIGNAL(toggled(bool)), this, SLOT(changed()));
- connect(m_userLe, SIGNAL(textChanged(const QString&)), this, SLOT(changed()));
- connect(m_passwordLe, SIGNAL(textChanged(const QString&)), this, SLOT(changed()));
-// connect(m_workgroupLe, SIGNAL(textChanged(const QString&)), this, SLOT(changed()));
-// connect( m_encodingList, SIGNAL( activated( const QString & ) ), this , SLOT( changed() ) );
+// connect(m_showHiddenShares, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed()));
+ connect(m_userLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed()));
+ connect(m_passwordLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed()));
+// connect(m_workgroupLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed()));
+// connect( m_encodingList, TQT_SIGNAL( activated( const TQString & ) ), this , TQT_SLOT( changed() ) );
layout->setRowStretch(4, 1);
@@ -93,29 +93,29 @@ void SMBRoOptions::load()
{
KConfig *cfg = new KConfig("kioslaverc");
- QString tmp;
+ TQString tmp;
cfg->setGroup( "Browser Settings/SMBro" );
m_userLe->setText(cfg->readEntry("User"));
// m_workgroupLe->setText(cfg->readEntry("Workgroup"));
// m_showHiddenShares->setChecked(cfg->readBoolEntry("ShowHiddenShares",false));
-// QStringList _strList = KGlobal::charsets()->availableEncodingNames();
-// QString m_encoding = QTextCodec::codecForLocale()->name();
+// TQStringList _strList = KGlobal::charsets()->availableEncodingNames();
+// TQString m_encoding = TQTextCodec::codecForLocale()->name();
// m_encodingList->setCurrentItem( _strList.findIndex( cfg->readEntry( "Encoding", m_encoding.lower() ) ) );
// unscramble
- QString scrambled = cfg->readEntry( "Password" );
- QString password = "";
+ TQString scrambled = cfg->readEntry( "Password" );
+ TQString password = "";
for (uint i=0; i<scrambled.length()/3; i++)
{
- QChar qc1 = scrambled[i*3];
- QChar qc2 = scrambled[i*3+1];
- QChar qc3 = scrambled[i*3+2];
+ TQChar qc1 = scrambled[i*3];
+ TQChar qc2 = scrambled[i*3+1];
+ TQChar qc3 = scrambled[i*3+2];
unsigned int a1 = qc1.latin1() - '0';
unsigned int a2 = qc2.latin1() - 'A';
unsigned int a3 = qc3.latin1() - '0';
unsigned int num = ((a1 & 0x3F) << 10) | ((a2& 0x1F) << 5) | (a3 & 0x1F);
- password[i] = QChar((uchar)((num - 17) ^ 173)); // restore
+ password[i] = TQChar((uchar)((num - 17) ^ 173)); // restore
}
m_passwordLe->setText(password);
@@ -135,11 +135,11 @@ void SMBRoOptions::save()
//taken from Nicola Brodu's smb ioslave
//it's not really secure, but at
//least better than storing the plain password
- QString password(m_passwordLe->text());
- QString scrambled;
+ TQString password(m_passwordLe->text());
+ TQString scrambled;
for (uint i=0; i<password.length(); i++)
{
- QChar c = password[i];
+ TQChar c = password[i];
unsigned int num = (c.unicode() ^ 173) + 17;
unsigned int a1 = (num & 0xFC00) >> 10;
unsigned int a2 = (num & 0x3E0) >> 5;
@@ -166,7 +166,7 @@ void SMBRoOptions::changed()
emit KCModule::changed(true);
}
-QString SMBRoOptions::quickHelp() const
+TQString SMBRoOptions::quickHelp() const
{
return i18n("<h1>Windows Shares</h1>Konqueror is able to access shared "
"windows filesystems if properly configured. If there is a "
diff --git a/kcontrol/kio/smbrodlg.h b/kcontrol/kio/smbrodlg.h
index d72972516..b1696e1e2 100644
--- a/kcontrol/kio/smbrodlg.h
+++ b/kcontrol/kio/smbrodlg.h
@@ -21,9 +21,9 @@
#ifndef __SMBRODLG_H
#define __SMBRODLG_H
-#include <qwidget.h>
-#include <qlineedit.h>
-#include <qcheckbox.h>
+#include <tqwidget.h>
+#include <tqlineedit.h>
+#include <tqcheckbox.h>
#include <kcmodule.h>
@@ -33,22 +33,22 @@ class SMBRoOptions : public KCModule
{
Q_OBJECT
public:
- SMBRoOptions(QWidget *parent = 0);
+ SMBRoOptions(TQWidget *parent = 0);
~SMBRoOptions();
virtual void load();
virtual void save();
virtual void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
private slots:
void changed();
private:
- QLineEdit *m_userLe;
- QLineEdit *m_passwordLe;
-// QLineEdit *m_workgroupLe; //currently unused, Alex
-// QCheckBox *m_showHiddenShares; //currently unused, Alex
+ TQLineEdit *m_userLe;
+ TQLineEdit *m_passwordLe;
+// TQLineEdit *m_workgroupLe; //currently unused, Alex
+// TQCheckBox *m_showHiddenShares; //currently unused, Alex
// KComboBox *m_encodingList; //currently unused
};
diff --git a/kcontrol/kio/socks.cpp b/kcontrol/kio/socks.cpp
index 9c6678a5d..fd1ce7d8e 100644
--- a/kcontrol/kio/socks.cpp
+++ b/kcontrol/kio/socks.cpp
@@ -20,10 +20,10 @@
*/
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qvbuttongroup.h>
-#include <qcheckbox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqvbuttongroup.h>
+#include <tqcheckbox.h>
#include <kfiledialog.h>
#include <klistview.h>
@@ -34,7 +34,7 @@
#include "socks.h"
#include <kaboutdata.h>
-KSocksConfig::KSocksConfig(QWidget *parent)
+KSocksConfig::KSocksConfig(TQWidget *parent)
: KCModule(parent, "kcmkio")
{
@@ -48,30 +48,30 @@ KSocksConfig::KSocksConfig(QWidget *parent)
setAboutData( about );
- QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
base = new SocksBase(this);
layout->add(base);
- connect(base->_c_enableSocks, SIGNAL(clicked()), this, SLOT(enableChanged()));
- connect(base->bg, SIGNAL(clicked(int)), this, SLOT(methodChanged(int)));
+ connect(base->_c_enableSocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
+ connect(base->bg, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(methodChanged(int)));
// The custom library
- connect(base->_c_customPath, SIGNAL(openFileDialog(KURLRequester *)), this, SLOT(chooseCustomLib(KURLRequester *)));
- connect(base->_c_customPath, SIGNAL(textChanged(const QString&)),
- this, SLOT(customPathChanged(const QString&)));
+ connect(base->_c_customPath, TQT_SIGNAL(openFileDialog(KURLRequester *)), this, TQT_SLOT(chooseCustomLib(KURLRequester *)));
+ connect(base->_c_customPath, TQT_SIGNAL(textChanged(const TQString&)),
+ this, TQT_SLOT(customPathChanged(const TQString&)));
// Additional libpaths
- connect(base->_c_newPath, SIGNAL(openFileDialog(KURLRequester *)), this, SLOT(chooseCustomLib(KURLRequester *)));
- connect(base->_c_newPath, SIGNAL(returnPressed(const QString&)),
- this, SLOT(addThisLibrary(const QString&)));
- connect(base->_c_newPath, SIGNAL(textChanged(const QString&)),
- this, SLOT(libTextChanged(const QString&)));
- connect(base->_c_add, SIGNAL(clicked()), this, SLOT(addLibrary()));
- connect(base->_c_remove, SIGNAL(clicked()), this, SLOT(removeLibrary()));
- connect(base->_c_libs, SIGNAL(selectionChanged()), this, SLOT(libSelection()));
+ connect(base->_c_newPath, TQT_SIGNAL(openFileDialog(KURLRequester *)), this, TQT_SLOT(chooseCustomLib(KURLRequester *)));
+ connect(base->_c_newPath, TQT_SIGNAL(returnPressed(const TQString&)),
+ this, TQT_SLOT(addThisLibrary(const TQString&)));
+ connect(base->_c_newPath, TQT_SIGNAL(textChanged(const TQString&)),
+ this, TQT_SLOT(libTextChanged(const TQString&)));
+ connect(base->_c_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(addLibrary()));
+ connect(base->_c_remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeLibrary()));
+ connect(base->_c_libs, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(libSelection()));
// The "Test" button
- connect(base->_c_test, SIGNAL(clicked()), this, SLOT(testClicked()));
+ connect(base->_c_test, TQT_SIGNAL(clicked()), this, TQT_SLOT(testClicked()));
// The config backend
load();
@@ -110,7 +110,7 @@ void KSocksConfig::methodChanged(int id)
}
-void KSocksConfig::customPathChanged(const QString&)
+void KSocksConfig::customPathChanged(const TQString&)
{
emit changed(true);
}
@@ -140,7 +140,7 @@ void KSocksConfig::testClicked()
void KSocksConfig::chooseCustomLib(KURLRequester * url)
{
url->setMode( KFile::Directory );
-/* QString newFile = KFileDialog::getOpenFileName();
+/* TQString newFile = KFileDialog::getOpenFileName();
if (newFile.length() > 0) {
base->_c_customPath->setURL(newFile);
emit changed(true);
@@ -149,7 +149,7 @@ void KSocksConfig::chooseCustomLib(KURLRequester * url)
-void KSocksConfig::libTextChanged(const QString& lib)
+void KSocksConfig::libTextChanged(const TQString& lib)
{
if (lib.length() > 0)
base-> _c_add->setEnabled(true);
@@ -157,10 +157,10 @@ void KSocksConfig::libTextChanged(const QString& lib)
}
-void KSocksConfig::addThisLibrary(const QString& lib)
+void KSocksConfig::addThisLibrary(const TQString& lib)
{
if (lib.length() > 0) {
- new QListViewItem(base->_c_libs, lib);
+ new TQListViewItem(base->_c_libs, lib);
base->_c_newPath->clear();
base->_c_add->setEnabled(false);
base->_c_newPath->setFocus();
@@ -177,7 +177,7 @@ void KSocksConfig::addLibrary()
void KSocksConfig::removeLibrary()
{
- QListViewItem *thisitem = base->_c_libs->selectedItem();
+ TQListViewItem *thisitem = base->_c_libs->selectedItem();
base->_c_libs->takeItem(thisitem);
delete thisitem;
base->_c_libs->clearSelection();
@@ -207,17 +207,17 @@ void KSocksConfig::load()
}
base->_c_customPath->setURL(config.readPathEntry("SOCKS_lib"));
- QListViewItem *thisitem;
+ TQListViewItem *thisitem;
while ((thisitem = base->_c_libs->firstChild())) {
base->_c_libs->takeItem(thisitem);
delete thisitem;
}
- QStringList libs = config.readPathListEntry("SOCKS_lib_path");
- for(QStringList::Iterator it = libs.begin();
+ TQStringList libs = config.readPathListEntry("SOCKS_lib_path");
+ for(TQStringList::Iterator it = libs.begin();
it != libs.end();
++it ) {
- new QListViewItem(base->_c_libs, *it);
+ new TQListViewItem(base->_c_libs, *it);
}
base->_c_libs->clearSelection();
base->_c_remove->setEnabled(false);
@@ -232,9 +232,9 @@ void KSocksConfig::save()
config.writeEntry("SOCKS_enable",base-> _c_enableSocks->isChecked(), true, true);
config.writeEntry("SOCKS_method", base->bg->id(base->bg->selected()), true, true);
config.writePathEntry("SOCKS_lib", base->_c_customPath->url(), true, true);
- QListViewItem *thisitem = base->_c_libs->firstChild();
+ TQListViewItem *thisitem = base->_c_libs->firstChild();
- QStringList libs;
+ TQStringList libs;
while (thisitem) {
libs << thisitem->text(0);
thisitem = thisitem->itemBelow();
@@ -254,7 +254,7 @@ void KSocksConfig::defaults()
base->_c_customLabel->setEnabled(false);
base->_c_customPath->setEnabled(false);
base->_c_customPath->setURL("");
- QListViewItem *thisitem;
+ TQListViewItem *thisitem;
while ((thisitem = base->_c_libs->firstChild())) {
base->_c_libs->takeItem(thisitem);
delete thisitem;
@@ -265,7 +265,7 @@ void KSocksConfig::defaults()
emit changed(true);
}
-QString KSocksConfig::quickHelp() const
+TQString KSocksConfig::quickHelp() const
{
return i18n("<h1>SOCKS</h1><p>This module allows you to configure KDE support"
" for a SOCKS server or proxy.</p><p>SOCKS is a protocol to traverse firewalls"
diff --git a/kcontrol/kio/socks.h b/kcontrol/kio/socks.h
index 1d950f607..69f4ab4fd 100644
--- a/kcontrol/kio/socks.h
+++ b/kcontrol/kio/socks.h
@@ -37,7 +37,7 @@ class KSocksConfig : public KCModule
{
Q_OBJECT
public:
- KSocksConfig(QWidget *parent);
+ KSocksConfig(TQWidget *parent);
virtual ~KSocksConfig();
SocksBase *base;
@@ -47,7 +47,7 @@ public:
void defaults();
int buttons();
- QString quickHelp() const;
+ TQString quickHelp() const;
public slots:
void configChanged();
@@ -57,10 +57,10 @@ private slots:
void methodChanged(int id);
void testClicked();
void chooseCustomLib(KURLRequester *url);
- void customPathChanged(const QString&);
+ void customPathChanged(const TQString&);
void addLibrary();
- void libTextChanged(const QString& lib);
- void addThisLibrary(const QString& lib);
+ void libTextChanged(const TQString& lib);
+ void addThisLibrary(const TQString& lib);
void removeLibrary();
void libSelection();
diff --git a/kcontrol/kio/uagentproviderdlg.cpp b/kcontrol/kio/uagentproviderdlg.cpp
index 3b71b29f4..9e945948d 100644
--- a/kcontrol/kio/uagentproviderdlg.cpp
+++ b/kcontrol/kio/uagentproviderdlg.cpp
@@ -16,11 +16,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlistbox.h>
-#include <qwhatsthis.h>
-#include <qpushbutton.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlistbox.h>
+#include <tqwhatsthis.h>
+#include <tqpushbutton.h>
#include <kdebug.h>
#include <klocale.h>
@@ -32,7 +32,7 @@
#include "uagentproviderdlg.h"
#include "uagentproviderdlg_ui.h"
-UALineEdit::UALineEdit( QWidget *parent, const char *name )
+UALineEdit::UALineEdit( TQWidget *parent, const char *name )
:KLineEdit( parent, name )
{
// For now do not accept any drops since they might contain
@@ -41,10 +41,10 @@ UALineEdit::UALineEdit( QWidget *parent, const char *name )
setAcceptDrops( false );
}
-void UALineEdit::keyPressEvent( QKeyEvent* e )
+void UALineEdit::keyPressEvent( TQKeyEvent* e )
{
int key = e->key();
- QString keycode = e->text();
+ TQString keycode = e->text();
if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period ||
(cursorPosition() > 0 && key == Qt::Key_Minus) ||
(!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) )
@@ -55,13 +55,13 @@ void UALineEdit::keyPressEvent( QKeyEvent* e )
e->accept();
}
-UAProviderDlg::UAProviderDlg( const QString& caption, QWidget *parent,
+UAProviderDlg::UAProviderDlg( const TQString& caption, TQWidget *parent,
FakeUASProvider* provider, const char *name )
:KDialog(parent, name, true), m_provider(provider)
{
setCaption ( caption );
- QVBoxLayout* mainLayout = new QVBoxLayout(this, 0, 0);
+ TQVBoxLayout* mainLayout = new TQVBoxLayout(this, 0, 0);
dlg = new UAProviderDlgUI (this);
mainLayout->addWidget(dlg);
@@ -82,14 +82,14 @@ UAProviderDlg::~UAProviderDlg()
void UAProviderDlg::init()
{
- connect( dlg->pbOk, SIGNAL(clicked()), SLOT(accept()) );
- connect( dlg->pbCancel, SIGNAL(clicked()), SLOT(reject()) );
+ connect( dlg->pbOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
+ connect( dlg->pbCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
- connect( dlg->leSite, SIGNAL(textChanged(const QString&)),
- SLOT(slotTextChanged( const QString&)) );
+ connect( dlg->leSite, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(slotTextChanged( const TQString&)) );
- connect( dlg->cbAlias, SIGNAL(activated(const QString&)),
- SLOT(slotActivated(const QString&)) );
+ connect( dlg->cbAlias, TQT_SIGNAL(activated(const TQString&)),
+ TQT_SLOT(slotActivated(const TQString&)) );
dlg->cbAlias->clear();
dlg->cbAlias->insertStringList( m_provider->userAgentAliasList() );
@@ -99,7 +99,7 @@ void UAProviderDlg::init()
dlg->leSite->setFocus();
}
-void UAProviderDlg::slotActivated( const QString& text )
+void UAProviderDlg::slotActivated( const TQString& text )
{
if ( text.isEmpty() )
dlg->leIdentity->setText( "" );
@@ -109,17 +109,17 @@ void UAProviderDlg::slotActivated( const QString& text )
dlg->pbOk->setEnabled( (!dlg->leSite->text().isEmpty() && !text.isEmpty()) );
}
-void UAProviderDlg::slotTextChanged( const QString& text )
+void UAProviderDlg::slotTextChanged( const TQString& text )
{
dlg->pbOk->setEnabled( (!text.isEmpty() && !dlg->cbAlias->currentText().isEmpty()) );
}
-void UAProviderDlg::setSiteName( const QString& text )
+void UAProviderDlg::setSiteName( const TQString& text )
{
dlg->leSite->setText( text );
}
-void UAProviderDlg::setIdentity( const QString& text )
+void UAProviderDlg::setIdentity( const TQString& text )
{
int id = dlg->cbAlias->listBox()->index( dlg->cbAlias->listBox()->findItem(text) );
dlg->cbAlias->setCurrentItem( id );
@@ -128,20 +128,20 @@ void UAProviderDlg::setIdentity( const QString& text )
dlg->cbAlias->setFocus();
}
-QString UAProviderDlg::siteName()
+TQString UAProviderDlg::siteName()
{
- QString site_name=dlg->leSite->text().lower();
+ TQString site_name=dlg->leSite->text().lower();
site_name = site_name.remove( "https://" );
site_name = site_name.remove( "http://" );
return site_name;
}
-QString UAProviderDlg::identity()
+TQString UAProviderDlg::identity()
{
return dlg->cbAlias->currentText();
}
-QString UAProviderDlg::alias()
+TQString UAProviderDlg::alias()
{
return dlg->leIdentity->text();
}
diff --git a/kcontrol/kio/uagentproviderdlg.h b/kcontrol/kio/uagentproviderdlg.h
index 67b38d42e..3e60edb54 100644
--- a/kcontrol/kio/uagentproviderdlg.h
+++ b/kcontrol/kio/uagentproviderdlg.h
@@ -32,10 +32,10 @@ class UALineEdit : public KLineEdit
Q_OBJECT
public:
- UALineEdit( QWidget *parent, const char *name=0 );
+ UALineEdit( TQWidget *parent, const char *name=0 );
protected:
- virtual void keyPressEvent( QKeyEvent * );
+ virtual void keyPressEvent( TQKeyEvent * );
};
class UAProviderDlg : public KDialog
@@ -43,20 +43,20 @@ class UAProviderDlg : public KDialog
Q_OBJECT
public:
- UAProviderDlg( const QString& caption, QWidget *parent = 0,
+ UAProviderDlg( const TQString& caption, TQWidget *parent = 0,
FakeUASProvider* provider = 0, const char *name = 0 );
~UAProviderDlg();
- void setSiteName( const QString& );
- void setIdentity( const QString& );
+ void setSiteName( const TQString& );
+ void setIdentity( const TQString& );
- QString siteName();
- QString identity();
- QString alias();
+ TQString siteName();
+ TQString identity();
+ TQString alias();
protected slots:
- void slotActivated( const QString& );
- void slotTextChanged( const QString& );
+ void slotActivated( const TQString& );
+ void slotTextChanged( const TQString& );
protected:
void init();
diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp
index b8256b946..c34d5cadc 100644
--- a/kcontrol/kio/useragentdlg.cpp
+++ b/kcontrol/kio/useragentdlg.cpp
@@ -22,14 +22,14 @@
Boston, MA 02110-1301, USA.
*/
-#include <qvbox.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qlineedit.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qpushbutton.h>
-#include <qvbuttongroup.h>
+#include <tqvbox.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqlineedit.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
+#include <tqpushbutton.h>
+#include <tqvbuttongroup.h>
#include <kdebug.h>
#include <kconfig.h>
@@ -46,32 +46,32 @@
#include "useragentdlg.h"
#include "useragentdlg_ui.h"
-UserAgentDlg::UserAgentDlg( QWidget * parent )
+UserAgentDlg::UserAgentDlg( TQWidget * parent )
:KCModule( parent, "kcmkio" )
{
- QVBoxLayout *mainLayout = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
dlg = new UserAgentDlgUI (this);
mainLayout->addWidget(dlg);
dlg->lvDomainPolicyList->setSorting(0);
- connect( dlg->cbSendUAString, SIGNAL(clicked()), SLOT(configChanged()) );
+ connect( dlg->cbSendUAString, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) );
- connect( dlg->gbDefaultId, SIGNAL(clicked(int)),
- SLOT(changeDefaultUAModifiers(int)));
+ connect( dlg->gbDefaultId, TQT_SIGNAL(clicked(int)),
+ TQT_SLOT(changeDefaultUAModifiers(int)));
- connect( dlg->lvDomainPolicyList, SIGNAL(selectionChanged()),
- SLOT(selectionChanged()) );
- connect( dlg->lvDomainPolicyList, SIGNAL(doubleClicked (QListViewItem *)),
- SLOT(changePressed()) );
- connect( dlg->lvDomainPolicyList, SIGNAL( returnPressed ( QListViewItem * ) ),
- SLOT( changePressed() ));
+ connect( dlg->lvDomainPolicyList, TQT_SIGNAL(selectionChanged()),
+ TQT_SLOT(selectionChanged()) );
+ connect( dlg->lvDomainPolicyList, TQT_SIGNAL(doubleClicked (TQListViewItem *)),
+ TQT_SLOT(changePressed()) );
+ connect( dlg->lvDomainPolicyList, TQT_SIGNAL( returnPressed ( TQListViewItem * ) ),
+ TQT_SLOT( changePressed() ));
- connect( dlg->pbNew, SIGNAL(clicked()), SLOT( addPressed() ) );
- connect( dlg->pbChange, SIGNAL( clicked() ), SLOT( changePressed() ) );
- connect( dlg->pbDelete, SIGNAL( clicked() ), SLOT( deletePressed() ) );
- connect( dlg->pbDeleteAll, SIGNAL( clicked() ), SLOT( deleteAllPressed() ) );
+ connect( dlg->pbNew, TQT_SIGNAL(clicked()), TQT_SLOT( addPressed() ) );
+ connect( dlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) );
+ connect( dlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) );
+ connect( dlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) );
load();
}
@@ -90,23 +90,23 @@ void UserAgentDlg::load()
m_config = new KConfig("kio_httprc", false, false);
m_provider = new FakeUASProvider();
- QStringList list = m_config->groupList();
- for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+ TQStringList list = m_config->groupList();
+ for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
{
if ( (*it) == "<default>")
continue;
- QString domain = *it;
+ TQString domain = *it;
m_config->setGroup(*it);
- QString agentStr = m_config->readEntry("UserAgent");
+ TQString agentStr = m_config->readEntry("UserAgent");
if (!agentStr.isEmpty())
{
- QString realName = m_provider->aliasStr(agentStr);
- (void) new QListViewItem( dlg->lvDomainPolicyList, domain.lower(), realName, agentStr );
+ TQString realName = m_provider->aliasStr(agentStr);
+ (void) new TQListViewItem( dlg->lvDomainPolicyList, domain.lower(), realName, agentStr );
}
}
// Update buttons and checkboxes...
- m_config->setGroup(QString::null);
+ m_config->setGroup(TQString::null);
bool b = m_config->readBoolEntry("SendUserAgent", true);
dlg->cbSendUAString->setChecked( b );
m_ua_keys = m_config->readEntry("UserAgentKeys", DEFAULT_USER_AGENT_KEYS).lower();
@@ -148,28 +148,28 @@ void UserAgentDlg::defaults()
void UserAgentDlg::save()
{
- QStringList deleteList;
+ TQStringList deleteList;
// This is tricky because we have to take care to delete entries
// as well.
- QStringList list = m_config->groupList();
- for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+ TQStringList list = m_config->groupList();
+ for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
{
if ( (*it) == "<default>")
continue;
- QString domain = *it;
+ TQString domain = *it;
m_config->setGroup(*it);
if (m_config->hasKey("UserAgent"))
deleteList.append(*it);
}
- QListViewItem* it = dlg->lvDomainPolicyList->firstChild();
+ TQListViewItem* it = dlg->lvDomainPolicyList->firstChild();
while(it)
{
- QString domain = it->text(0);
+ TQString domain = it->text(0);
if (domain[0] == '.')
domain = domain.mid(1);
- QString userAgent = it->text(2);
+ TQString userAgent = it->text(2);
m_config->setGroup(domain);
m_config->writeEntry("UserAgent", userAgent);
deleteList.remove(domain);
@@ -177,7 +177,7 @@ void UserAgentDlg::save()
it = it->nextSibling();
}
- m_config->setGroup(QString::null);
+ m_config->setGroup(TQString::null);
m_config->writeEntry("SendUserAgent", dlg->cbSendUAString->isChecked());
m_config->writeEntry("UserAgentKeys", m_ua_keys );
m_config->sync();
@@ -187,7 +187,7 @@ void UserAgentDlg::save()
{
// Remove entries from local file.
KSimpleConfig cfg("kio_httprc");
- for ( QStringList::Iterator it = deleteList.begin();
+ for ( TQStringList::Iterator it = deleteList.begin();
it != deleteList.end(); ++it )
{
cfg.setGroup(*it);
@@ -198,12 +198,12 @@ void UserAgentDlg::save()
m_config->reparseConfiguration();
// Check everything is gone, reset to blank otherwise.
- for ( QStringList::Iterator it = deleteList.begin();
+ for ( TQStringList::Iterator it = deleteList.begin();
it != deleteList.end(); ++it )
{
m_config->setGroup(*it);
if (m_config->hasKey("UserAgent"))
- m_config->writeEntry("UserAgent", QString::null);
+ m_config->writeEntry("UserAgent", TQString::null);
}
m_config->sync();
}
@@ -213,16 +213,16 @@ void UserAgentDlg::save()
emit changed( false );
}
-bool UserAgentDlg::handleDuplicate( const QString& site,
- const QString& identity,
- const QString& alias )
+bool UserAgentDlg::handleDuplicate( const TQString& site,
+ const TQString& identity,
+ const TQString& alias )
{
- QListViewItem* item = dlg->lvDomainPolicyList->firstChild();
+ TQListViewItem* item = dlg->lvDomainPolicyList->firstChild();
while ( item != 0 )
{
if ( item->text(0) == site )
{
- QString msg = i18n("<qt><center>Found an existing identification for"
+ TQString msg = i18n("<qt><center>Found an existing identification for"
"<br/><b>%1</b><br/>"
"Do you want to replace it?</center>"
"</qt>").arg(site);
@@ -247,11 +247,11 @@ void UserAgentDlg::addPressed()
{
UAProviderDlg pdlg ( i18n("Add Identification"), this, m_provider );
- if ( pdlg.exec() == QDialog::Accepted )
+ if ( pdlg.exec() == TQDialog::Accepted )
{
if ( !handleDuplicate( pdlg.siteName(), pdlg.identity(), pdlg.alias() ) )
{
- QListViewItem* index = new QListViewItem( dlg->lvDomainPolicyList,
+ TQListViewItem* index = new TQListViewItem( dlg->lvDomainPolicyList,
pdlg.siteName(),
pdlg.identity(),
pdlg.alias() );
@@ -266,18 +266,18 @@ void UserAgentDlg::changePressed()
{
UAProviderDlg pdlg ( i18n("Modify Identification"), this, m_provider );
- QListViewItem *index = dlg->lvDomainPolicyList->currentItem();
+ TQListViewItem *index = dlg->lvDomainPolicyList->currentItem();
if(!index)
return;
- QString old_site = index->text(0);
+ TQString old_site = index->text(0);
pdlg.setSiteName( old_site );
pdlg.setIdentity( index->text(1) );
- if ( pdlg.exec() == QDialog::Accepted )
+ if ( pdlg.exec() == TQDialog::Accepted )
{
- QString new_site = pdlg.siteName();
+ TQString new_site = pdlg.siteName();
if ( new_site == old_site ||
!handleDuplicate( new_site, pdlg.identity(), pdlg.alias() ) )
{
@@ -291,8 +291,8 @@ void UserAgentDlg::changePressed()
void UserAgentDlg::deletePressed()
{
- QListViewItem* item;
- QListViewItem* nextItem = 0;
+ TQListViewItem* item;
+ TQListViewItem* nextItem = 0;
item = dlg->lvDomainPolicyList->firstChild ();
@@ -353,7 +353,7 @@ void UserAgentDlg::changeDefaultUAModifiers( int )
dlg->cbOSVersion->setEnabled(m_ua_keys.contains('o'));
- QString modVal = KProtocolManager::defaultUserAgent( m_ua_keys );
+ TQString modVal = KProtocolManager::defaultUserAgent( m_ua_keys );
if ( dlg->leDefaultId->text() != modVal )
{
dlg->leDefaultId->setSqueezedText(modVal);
@@ -363,7 +363,7 @@ void UserAgentDlg::changeDefaultUAModifiers( int )
void UserAgentDlg::selectionChanged ()
{
- QListViewItem* item;
+ TQListViewItem* item;
d_itemsSelected = 0;
item = dlg->lvDomainPolicyList->firstChild ();
@@ -378,7 +378,7 @@ void UserAgentDlg::selectionChanged ()
updateButtons ();
}
-QString UserAgentDlg::quickHelp() const
+TQString UserAgentDlg::quickHelp() const
{
return i18n( "<h1>Browser Identification</h1> "
"The browser-identification module allows you to have full "
diff --git a/kcontrol/kio/useragentdlg.h b/kcontrol/kio/useragentdlg.h
index 56534e142..f5b20ac0d 100644
--- a/kcontrol/kio/useragentdlg.h
+++ b/kcontrol/kio/useragentdlg.h
@@ -36,13 +36,13 @@ class UserAgentDlg : public KCModule
Q_OBJECT
public:
- UserAgentDlg ( QWidget * parent = 0) ;
+ UserAgentDlg ( TQWidget * parent = 0) ;
~UserAgentDlg();
virtual void load();
virtual void save();
virtual void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
private slots:
void updateButtons();
@@ -57,7 +57,7 @@ private slots:
void changeDefaultUAModifiers( int );
private:
- bool handleDuplicate( const QString&, const QString&, const QString& );
+ bool handleDuplicate( const TQString&, const TQString&, const TQString& );
enum {
SHOW_OS = 0,
@@ -68,7 +68,7 @@ private:
};
// Useragent modifiers...
- QString m_ua_keys;
+ TQString m_ua_keys;
// Fake user-agent modifiers...
FakeUASProvider* m_provider;
diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp
index 8cd4d16a5..edfa28e48 100644
--- a/kcontrol/knotify/knotify.cpp
+++ b/kcontrol/knotify/knotify.cpp
@@ -18,12 +18,12 @@
*/
-#include <qbuttongroup.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
-#include <qslider.h>
-#include <qvbox.h>
+#include <tqbuttongroup.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqradiobutton.h>
+#include <tqslider.h>
+#include <tqvbox.h>
#include <dcopclient.h>
@@ -42,12 +42,12 @@
static const int COL_FILENAME = 1;
-typedef KGenericFactory<KCMKNotify, QWidget> NotifyFactory;
+typedef KGenericFactory<KCMKNotify, TQWidget> NotifyFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_knotify, NotifyFactory("kcmnotify") )
using namespace KNotify;
-KCMKNotify::KCMKNotify(QWidget *parent, const char *name, const QStringList & )
+KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList & )
: KCModule(NotifyFactory::instance(), parent, name),
m_playerSettings( 0L )
{
@@ -64,25 +64,25 @@ KCMKNotify::KCMKNotify(QWidget *parent, const char *name, const QStringList & )
"any additional visual or audible alert."
"</ul>"));
- QVBoxLayout *layout = new QVBoxLayout( this, 0, KDialog::spacingHint() );
+ TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n( "Event source:" ), this );
+ TQLabel *label = new TQLabel( i18n( "Event source:" ), this );
m_appCombo = new KComboBox( false, this, "app combo" );
- QHBoxLayout *hbox = new QHBoxLayout( layout );
+ TQHBoxLayout *hbox = new TQHBoxLayout( layout );
hbox->addWidget( label );
hbox->addWidget( m_appCombo, 10 );
m_notifyWidget = new KNotifyWidget( this, "knotify widget", true );
- connect( m_notifyWidget, SIGNAL( changed( bool )), SIGNAL( changed(bool)));
+ connect( m_notifyWidget, TQT_SIGNAL( changed( bool )), TQT_SIGNAL( changed(bool)));
layout->addWidget( m_notifyWidget );
- connect( m_appCombo, SIGNAL( activated( const QString& ) ),
- SLOT( slotAppActivated( const QString& )) );
+ connect( m_appCombo, TQT_SIGNAL( activated( const TQString& ) ),
+ TQT_SLOT( slotAppActivated( const TQString& )) );
- connect( m_notifyWidget->m_playerButton, SIGNAL( clicked() ),
- SLOT( slotPlayerSettings()));
+ connect( m_notifyWidget->m_playerButton, TQT_SIGNAL( clicked() ),
+ TQT_SLOT( slotPlayerSettings()));
KAboutData* ab = new KAboutData(
"kcmknotify", I18N_NOOP("KNotify"), "3.0",
@@ -109,7 +109,7 @@ KCMKNotify::~KCMKNotify()
}
}
-Application * KCMKNotify::applicationByDescription( const QString& text )
+Application * KCMKNotify::applicationByDescription( const TQString& text )
{
// not really efficient, but this is not really time-critical
ApplicationList& allApps = m_notifyWidget->allApps();
@@ -123,7 +123,7 @@ Application * KCMKNotify::applicationByDescription( const QString& text )
return 0L;
}
-void KCMKNotify::slotAppActivated( const QString& text )
+void KCMKNotify::slotAppActivated( const TQString& text )
{
Application *app = applicationByDescription( text );
if ( app )
@@ -162,10 +162,10 @@ void KCMKNotify::load( bool useDefaults )
m_appCombo->clear();
m_notifyWidget->clear();
- QStringList fullpaths =
+ TQStringList fullpaths =
KGlobal::dirs()->findAllResources("data", "*/eventsrc", false, true );
- QStringList::ConstIterator it = fullpaths.begin();
+ TQStringList::ConstIterator it = fullpaths.begin();
for ( ; it != fullpaths.end(); ++it)
m_notifyWidget->addApplicationEvents( *it );
@@ -176,7 +176,7 @@ void KCMKNotify::load( bool useDefaults )
KConfig config( "knotifyrc", true, false );
config.setReadDefaults( useDefaults );
config.setGroup( "Misc" );
- QString select = config.readEntry( "LastConfiguredApp" );
+ TQString select = config.readEntry( "LastConfiguredApp" );
if( select.isEmpty())
select = "knotify"; // default to system notifications
bool selected = false;
@@ -215,13 +215,13 @@ void KCMKNotify::save()
///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
-PlayerSettingsDialog::PlayerSettingsDialog( QWidget *parent, bool modal )
+PlayerSettingsDialog::PlayerSettingsDialog( TQWidget *parent, bool modal )
: KDialogBase( parent, "player settings dialog", modal,
i18n("Player Settings"), Ok|Apply|Cancel, Ok, true )
{
- QFrame *frame = makeMainWidget();
+ TQFrame *frame = makeMainWidget();
- QVBoxLayout *topLayout = new QVBoxLayout( frame, 0,
+ TQVBoxLayout *topLayout = new TQVBoxLayout( frame, 0,
KDialog::spacingHint() );
m_ui = new PlayerSettingsUI(frame);
@@ -231,10 +231,10 @@ PlayerSettingsDialog::PlayerSettingsDialog( QWidget *parent, bool modal )
dataChanged = false;
enableButton(Apply, false);
- connect( m_ui->cbExternal, SIGNAL( toggled( bool ) ), this, SLOT( externalToggled( bool ) ) );
- connect( m_ui->grpPlayers, SIGNAL( clicked( int ) ), this, SLOT( slotChanged() ) );
- connect( m_ui->volumeSlider, SIGNAL( valueChanged ( int ) ), this, SLOT( slotChanged() ) );
- connect( m_ui->reqExternal, SIGNAL( textChanged( const QString& ) ), this, SLOT( slotChanged() ) );
+ connect( m_ui->cbExternal, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( externalToggled( bool ) ) );
+ connect( m_ui->grpPlayers, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChanged() ) );
+ connect( m_ui->volumeSlider, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
+ connect( m_ui->reqExternal, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotChanged() ) );
}
void PlayerSettingsDialog::load( bool useDefaults )
diff --git a/kcontrol/knotify/knotify.h b/kcontrol/knotify/knotify.h
index 2ee2f3ef6..1b1f5e34c 100644
--- a/kcontrol/knotify/knotify.h
+++ b/kcontrol/knotify/knotify.h
@@ -23,7 +23,7 @@
#ifndef _KNOTIFY_H
#define _KNOTIFY_H
-#include <qstring.h>
+#include <tqstring.h>
#include <kcmodule.h>
#include <kdialogbase.h>
@@ -49,7 +49,7 @@ class KCMKNotify : public KCModule
Q_OBJECT
public:
- KCMKNotify(QWidget *parent, const char *name, const QStringList &);
+ KCMKNotify(TQWidget *parent, const char *name, const TQStringList &);
virtual ~KCMKNotify();
virtual void defaults();
@@ -60,11 +60,11 @@ public slots:
virtual void load();
private slots:
- void slotAppActivated( const QString& app );
+ void slotAppActivated( const TQString& app );
void slotPlayerSettings();
private:
- KNotify::Application *applicationByDescription( const QString& text );
+ KNotify::Application *applicationByDescription( const TQString& text );
KComboBox *m_appCombo;
KNotify::KNotifyWidget *m_notifyWidget;
@@ -77,7 +77,7 @@ class PlayerSettingsDialog : public KDialogBase
Q_OBJECT
public:
- PlayerSettingsDialog( QWidget *parent, bool modal );
+ PlayerSettingsDialog( TQWidget *parent, bool modal );
void load( bool useDefaults );
void save();
diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index 4bb782eeb..af6c12cc4 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -18,13 +18,13 @@
// Behaviour options for konqueror
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qvbox.h>
-#include <qvbuttongroup.h>
-#include <qvgroupbox.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqvbox.h>
+#include <tqvbuttongroup.h>
+#include <tqvgroupbox.h>
+#include <tqwhatsthis.h>
#include <dcopclient.h>
@@ -38,43 +38,43 @@
#include "behaviour.h"
-KBehaviourOptions::KBehaviourOptions(KConfig *config, QString group, QWidget *parent, const char * )
+KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget *parent, const char * )
: KCModule(parent, "kcmkonq"), g_pConfig(config), groupname(group)
{
- QLabel * label;
+ TQLabel * label;
setQuickHelp( i18n("<h1>Konqueror Behavior</h1> You can configure how Konqueror behaves as a file manager here."));
- QVBoxLayout *lay = new QVBoxLayout( this, 0, KDialog::spacingHint() );
+ TQVBoxLayout *lay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
- QVGroupBox * miscGb = new QVGroupBox(i18n("Misc Options"), this);
+ TQVGroupBox * miscGb = new TQVGroupBox(i18n("Misc Options"), this);
lay->addWidget( miscGb );
- QHBox *hbox = new QHBox(miscGb);
- QVBox *vbox = new QVBox(hbox);
+ TQHBox *hbox = new TQHBox(miscGb);
+ TQVBox *vbox = new TQVBox(hbox);
// ----
- winPixmap = new QLabel(hbox);
- winPixmap->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken );
- winPixmap->setPixmap(QPixmap(locate("data",
+ winPixmap = new TQLabel(hbox);
+ winPixmap->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
+ winPixmap->setPixmap(TQPixmap(locate("data",
"kcontrol/pics/onlyone.png")));
winPixmap->setFixedSize( winPixmap->sizeHint() );
// ----
- cbNewWin = new QCheckBox(i18n("Open folders in separate &windows"), vbox);
- QWhatsThis::add( cbNewWin, i18n("If this option is checked, Konqueror will open a new window when "
+ cbNewWin = new TQCheckBox(i18n("Open folders in separate &windows"), vbox);
+ TQWhatsThis::add( cbNewWin, i18n("If this option is checked, Konqueror will open a new window when "
"you open a folder, rather than showing that folder's contents in the current window."));
- connect(cbNewWin, SIGNAL(clicked()), this, SLOT(changed()));
- connect(cbNewWin, SIGNAL(toggled(bool)), SLOT(updateWinPixmap(bool)));
+ connect(cbNewWin, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(cbNewWin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateWinPixmap(bool)));
// ----
- cbListProgress = new QCheckBox( i18n( "&Show network operations in a single window" ), vbox );
- connect(cbListProgress, SIGNAL(clicked()), this, SLOT(changed()));
+ cbListProgress = new TQCheckBox( i18n( "&Show network operations in a single window" ), vbox );
+ connect(cbListProgress, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
- QWhatsThis::add( cbListProgress, i18n("Checking this option will group the"
+ TQWhatsThis::add( cbListProgress, i18n("Checking this option will group the"
" progress information for all network file transfers into a single window"
" with a list. When the option is not checked, all transfers appear in a"
" separate window.") );
@@ -82,83 +82,83 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, QString group, QWidget *pa
// --
- cbShowTips = new QCheckBox( i18n( "Show file &tips" ), vbox );
- connect(cbShowTips, SIGNAL(clicked()), this, SLOT(changed()));
+ cbShowTips = new TQCheckBox( i18n( "Show file &tips" ), vbox );
+ connect(cbShowTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
- QWhatsThis::add( cbShowTips, i18n("Here you can control if, when moving the mouse over a file, you want to see a "
+ TQWhatsThis::add( cbShowTips, i18n("Here you can control if, when moving the mouse over a file, you want to see a "
"small popup window with additional information about that file"));
- connect(cbShowTips, SIGNAL(toggled(bool)), SLOT(slotShowTips(bool)));
+ connect(cbShowTips, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotShowTips(bool)));
/*
- //connect(cbShowTips, SIGNAL(toggled(bool)), sbToolTip, SLOT(setEnabled(bool)));
- //connect(cbShowTips, SIGNAL(toggled(bool)), fileTips, SLOT(setEnabled(bool)));
+ //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), sbToolTip, TQT_SLOT(setEnabled(bool)));
+ //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), fileTips, TQT_SLOT(setEnabled(bool)));
fileTips->setBuddy(sbToolTip);
- QString tipstr = i18n("If you move the mouse over a file, you usually see a small popup window that shows some "
+ TQString tipstr = i18n("If you move the mouse over a file, you usually see a small popup window that shows some "
"additional information about that file. Here, you can set how many items of information "
"are displayed");
- QWhatsThis::add( fileTips, tipstr );
- QWhatsThis::add( sbToolTip, tipstr );
+ TQWhatsThis::add( fileTips, tipstr );
+ TQWhatsThis::add( sbToolTip, tipstr );
*/
- QHBox *hboxpreview = new QHBox(vbox);
- QWidget* spacer = new QWidget( hboxpreview );
+ TQHBox *hboxpreview = new TQHBox(vbox);
+ TQWidget* spacer = new TQWidget( hboxpreview );
spacer->setMinimumSize( 20, 0 );
- spacer->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Minimum );
+ spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
- cbShowPreviewsInTips = new QCheckBox( i18n( "Show &previews in file tips" ), hboxpreview );
- connect(cbShowPreviewsInTips, SIGNAL(clicked()), this, SLOT(changed()));
+ cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview );
+ connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
- QWhatsThis::add( cbShowPreviewsInTips, i18n("Here you can control if you want the "
+ TQWhatsThis::add( cbShowPreviewsInTips, i18n("Here you can control if you want the "
"popup window to contain a larger preview for the file, when moving the mouse over it."));
- cbRenameDirectlyIcon = new QCheckBox(i18n("Rename icons in&line"), vbox);
- QWhatsThis::add(cbRenameDirectlyIcon, i18n("Checking this option will allow files to be "
+ cbRenameDirectlyIcon = new TQCheckBox(i18n("Rename icons in&line"), vbox);
+ TQWhatsThis::add(cbRenameDirectlyIcon, i18n("Checking this option will allow files to be "
"renamed by clicking directly on the icon name. "));
- connect(cbRenameDirectlyIcon, SIGNAL(clicked()), this, SLOT(changed()));
+ connect(cbRenameDirectlyIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
- QHBoxLayout *hlay = new QHBoxLayout( lay );
+ TQHBoxLayout *hlay = new TQHBoxLayout( lay );
- label = new QLabel(i18n("Home &URL:"), this);
+ label = new TQLabel(i18n("Home &URL:"), this);
hlay->addWidget( label );
homeURL = new KURLRequester(this);
homeURL->setMode(KFile::Directory);
homeURL->setCaption(i18n("Select Home Folder"));
hlay->addWidget( homeURL );
- connect(homeURL, SIGNAL(textChanged(const QString &)), this, SLOT(changed()));
+ connect(homeURL, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
label->setBuddy(homeURL);
- QString homestr = i18n("This is the URL (e.g. a folder or a web page) where "
+ TQString homestr = i18n("This is the URL (e.g. a folder or a web page) where "
"Konqueror will jump to when the \"Home\" button is pressed. "
"This is usually your home folder, symbolized by a 'tilde' (~).");
- QWhatsThis::add( label, homestr );
- QWhatsThis::add( homeURL, homestr );
+ TQWhatsThis::add( label, homestr );
+ TQWhatsThis::add( homeURL, homestr );
- lay->addItem(new QSpacerItem(0,20,QSizePolicy::Fixed,QSizePolicy::Fixed));
+ lay->addItem(new TQSpacerItem(0,20,TQSizePolicy::Fixed,TQSizePolicy::Fixed));
- cbShowDeleteCommand = new QCheckBox( i18n( "Show 'Delete' context me&nu entries which bypass the trashcan" ), this );
+ cbShowDeleteCommand = new TQCheckBox( i18n( "Show 'Delete' context me&nu entries which bypass the trashcan" ), this );
lay->addWidget( cbShowDeleteCommand );
- connect(cbShowDeleteCommand, SIGNAL(clicked()), this, SLOT(changed()));
+ connect(cbShowDeleteCommand, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
- QWhatsThis::add( cbShowDeleteCommand, i18n("Check this if you want 'Delete' menu commands to be displayed "
+ TQWhatsThis::add( cbShowDeleteCommand, i18n("Check this if you want 'Delete' menu commands to be displayed "
"on the desktop and in the file manager's context menus. "
"You can always delete files by holding the Shift key "
"while calling 'Move to Trash'."));
- QButtonGroup *bg = new QVButtonGroup( i18n("Ask Confirmation For"), this );
+ TQButtonGroup *bg = new TQVButtonGroup( i18n("Ask Confirmation For"), this );
bg->layout()->setSpacing( KDialog::spacingHint() );
- QWhatsThis::add( bg, i18n("This option tells Konqueror whether to ask"
+ TQWhatsThis::add( bg, i18n("This option tells Konqueror whether to ask"
" for a confirmation when you \"delete\" a file."
" <ul><li><em>Move To Trash:</em> moves the file to your trash folder,"
" from where it can be recovered very easily.</li>"
" <li><em>Delete:</em> simply deletes the file.</li>"
" </li></ul>") );
- connect(bg, SIGNAL( clicked( int ) ), SLOT( changed() ));
+ connect(bg, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( changed() ));
- cbMoveToTrash = new QCheckBox( i18n("&Move to trash"), bg );
+ cbMoveToTrash = new TQCheckBox( i18n("&Move to trash"), bg );
- cbDelete = new QCheckBox( i18n("D&elete"), bg );
+ cbDelete = new TQCheckBox( i18n("D&elete"), bg );
lay->addWidget(bg);
@@ -234,7 +234,7 @@ void KBehaviourOptions::save()
g_pConfig->setGroup( groupname );
g_pConfig->writeEntry( "AlwaysNewWin", cbNewWin->isChecked() );
- g_pConfig->writePathEntry( "HomeURL", homeURL->url().isEmpty()? QString("~") : homeURL->url() );
+ g_pConfig->writePathEntry( "HomeURL", homeURL->url().isEmpty()? TQString("~") : homeURL->url() );
g_pConfig->writeEntry( "ShowFileTips", cbShowTips->isChecked() );
g_pConfig->writeEntry( "ShowPreviewsInFileTips", cbShowPreviewsInTips->isChecked() );
@@ -265,7 +265,7 @@ void KBehaviourOptions::save()
}
// Send signal to konqueror
- QByteArray data;
+ TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
@@ -275,10 +275,10 @@ void KBehaviourOptions::save()
void KBehaviourOptions::updateWinPixmap(bool b)
{
if (b)
- winPixmap->setPixmap(QPixmap(locate("data",
+ winPixmap->setPixmap(TQPixmap(locate("data",
"kcontrol/pics/overlapping.png")));
else
- winPixmap->setPixmap(QPixmap(locate("data",
+ winPixmap->setPixmap(TQPixmap(locate("data",
"kcontrol/pics/onlyone.png")));
}
diff --git a/kcontrol/konq/behaviour.h b/kcontrol/konq/behaviour.h
index 9db3a36ba..2cfcb95fb 100644
--- a/kcontrol/konq/behaviour.h
+++ b/kcontrol/konq/behaviour.h
@@ -37,7 +37,7 @@ class KBehaviourOptions : public KCModule
{
Q_OBJECT
public:
- KBehaviourOptions(KConfig *config, QString group, QWidget *parent=0, const char *name=0);
+ KBehaviourOptions(KConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
~KBehaviourOptions();
virtual void load();
virtual void load( bool useDefaults );
@@ -51,25 +51,25 @@ protected slots:
private:
KConfig *g_pConfig;
- QString groupname;
+ TQString groupname;
- QCheckBox *cbNewWin;
- QCheckBox *cbListProgress;
+ TQCheckBox *cbNewWin;
+ TQCheckBox *cbListProgress;
- QLabel *winPixmap;
+ TQLabel *winPixmap;
KURLRequester *homeURL;
- QVButtonGroup *bgOneProcess;
- //QLabel *fileTips;
- //QSpinBox *sbToolTip;
- QCheckBox *cbShowTips;
- QCheckBox *cbShowPreviewsInTips;
- QCheckBox *cbRenameDirectlyIcon;
+ TQVButtonGroup *bgOneProcess;
+ //TQLabel *fileTips;
+ //TQSpinBox *sbToolTip;
+ TQCheckBox *cbShowTips;
+ TQCheckBox *cbShowPreviewsInTips;
+ TQCheckBox *cbRenameDirectlyIcon;
- QCheckBox *cbMoveToTrash;
- QCheckBox *cbDelete;
- QCheckBox *cbShowDeleteCommand;
+ TQCheckBox *cbMoveToTrash;
+ TQCheckBox *cbDelete;
+ TQCheckBox *cbShowDeleteCommand;
};
#endif // __BEHAVIOUR_H__
diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp
index 5ab82579d..cb1b5c47e 100644
--- a/kcontrol/konq/browser.cpp
+++ b/kcontrol/konq/browser.cpp
@@ -16,9 +16,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlayout.h>
-#include <qtabwidget.h>
-#include <qfile.h>
+#include <tqlayout.h>
+#include <tqtabwidget.h>
+#include <tqfile.h>
#include <klocale.h>
#include <kdialog.h>
@@ -30,11 +30,11 @@
#include "previews.h"
#include "browser.h"
-KBrowserOptions::KBrowserOptions(KConfig *config, QString group, QWidget *parent, const char *name)
+KBrowserOptions::KBrowserOptions(KConfig *config, TQString group, TQWidget *parent, const char *name)
: KCModule( parent, "kcmkonq" )
{
- QVBoxLayout *layout = new QVBoxLayout(this);
- QTabWidget *tab = new QTabWidget(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
+ TQTabWidget *tab = new TQTabWidget(this);
layout->addWidget(tab);
appearance = new KonqFontOptions(config, group, false, tab, name);
@@ -57,14 +57,14 @@ KBrowserOptions::KBrowserOptions(KConfig *config, QString group, QWidget *parent
tab->addTab(kuick, i18n("&Quick Copy && Move"));
}
- connect(appearance, SIGNAL(changed(bool)), this, SIGNAL(changed(bool)));
- connect(behavior, SIGNAL(changed(bool)), this, SIGNAL(changed(bool)));
- connect(previews, SIGNAL(changed(bool)), this, SIGNAL(changed(bool)));
+ connect(appearance, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+ connect(behavior, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+ connect(previews, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
if (kuick)
- connect(kuick, SIGNAL(changed(bool)), this, SIGNAL(changed(bool)));
+ connect(kuick, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
- connect(tab, SIGNAL(currentChanged(QWidget *)),
- this, SIGNAL(quickHelpChanged()));
+ connect(tab, TQT_SIGNAL(currentChanged(TQWidget *)),
+ this, TQT_SIGNAL(quickHelpChanged()));
m_tab = tab;
}
@@ -95,15 +95,15 @@ void KBrowserOptions::save()
kuick->save();
}
-QString KBrowserOptions::quickHelp() const
+TQString KBrowserOptions::quickHelp() const
{
- QWidget *w = m_tab->currentPage();
+ TQWidget *w = m_tab->currentPage();
if (w->inherits("KCModule"))
{
KCModule *m = static_cast<KCModule *>(w);
return m->quickHelp();
}
- return QString::null;
+ return TQString::null;
}
#include "browser.moc"
diff --git a/kcontrol/konq/browser.h b/kcontrol/konq/browser.h
index 26727de1b..f8856fd74 100644
--- a/kcontrol/konq/browser.h
+++ b/kcontrol/konq/browser.h
@@ -31,12 +31,12 @@ class KBrowserOptions : public KCModule
{
Q_OBJECT
public:
- KBrowserOptions(KConfig *config, QString group, QWidget *parent=0, const char *name=0);
+ KBrowserOptions(KConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
virtual void load();
virtual void save();
virtual void defaults();
- virtual QString quickHelp() const;
+ virtual TQString quickHelp() const;
private:
@@ -44,7 +44,7 @@ private:
KCModule *behavior;
KCModule *previews;
KCModule *kuick;
- QTabWidget *m_tab;
+ TQTabWidget *m_tab;
};
#endif
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index c2478b587..98275995c 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -17,12 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qgroupbox.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qcheckbox.h>
-#include <qslider.h>
+#include <tqlabel.h>
+#include <tqgroupbox.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqslider.h>
#include <kapplication.h>
#include <kglobal.h>
@@ -40,7 +40,7 @@
extern "C"
{
- KDE_EXPORT KCModule *create_virtualdesktops(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/)
{
return new KDesktopConfig(parent, "kcmkonq");
}
@@ -51,7 +51,7 @@ extern "C"
// be able to TAB through those line edits fast. So don't send me mails
// asking why I did not implement a more intelligent/smaller GUI.
-KDesktopConfig::KDesktopConfig(QWidget *parent, const char * /*name*/)
+KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
: KCModule(parent, "kcmkonq")
{
@@ -59,24 +59,24 @@ KDesktopConfig::KDesktopConfig(QWidget *parent, const char * /*name*/)
Q_ASSERT(maxDesktops % 2 == 0);
- QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
// number group
- QGroupBox *number_group = new QGroupBox(this);
+ TQGroupBox *number_group = new TQGroupBox(this);
- QHBoxLayout *lay = new QHBoxLayout(number_group,
+ TQHBoxLayout *lay = new TQHBoxLayout(number_group,
KDialog::marginHint(),
KDialog::spacingHint());
- QLabel *label = new QLabel(i18n("N&umber of desktops: "), number_group);
+ TQLabel *label = new TQLabel(i18n("N&umber of desktops: "), number_group);
_numInput = new KIntNumInput(4, number_group);
_numInput->setRange(1, maxDesktops, 1, true);
- connect(_numInput, SIGNAL(valueChanged(int)), SLOT(slotValueChanged(int)));
- connect(_numInput, SIGNAL(valueChanged(int)), SLOT( changed() ));
+ connect(_numInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
+ connect(_numInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
label->setBuddy( _numInput );
- QString wtstr = i18n( "Here you can set how many virtual desktops you want on your KDE desktop. Move the slider to change the value." );
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( _numInput, wtstr );
+ TQString wtstr = i18n( "Here you can set how many virtual desktops you want on your KDE desktop. Move the slider to change the value." );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( _numInput, wtstr );
lay->addWidget(label);
lay->addWidget(_numInput);
@@ -85,25 +85,25 @@ KDesktopConfig::KDesktopConfig(QWidget *parent, const char * /*name*/)
layout->addWidget(number_group);
// name group
- QGroupBox *name_group = new QGroupBox(i18n("Desktop &Names"), this);
+ TQGroupBox *name_group = new TQGroupBox(i18n("Desktop &Names"), this);
name_group->setColumnLayout(4, Horizontal);
for(int i = 0; i < (maxDesktops/2); i++)
{
- _nameLabel[i] = new QLabel(i18n("Desktop %1:").arg(i+1), name_group);
+ _nameLabel[i] = new TQLabel(i18n("Desktop %1:").arg(i+1), name_group);
_nameInput[i] = new KLineEdit(name_group);
- _nameLabel[i+(maxDesktops/2)] = new QLabel(i18n("Desktop %1:").arg(i+(maxDesktops/2)+1), name_group);
+ _nameLabel[i+(maxDesktops/2)] = new TQLabel(i18n("Desktop %1:").arg(i+(maxDesktops/2)+1), name_group);
_nameInput[i+(maxDesktops/2)] = new KLineEdit(name_group);
- QWhatsThis::add( _nameLabel[i], i18n( "Here you can enter the name for desktop %1" ).arg( i+1 ) );
- QWhatsThis::add( _nameInput[i], i18n( "Here you can enter the name for desktop %1" ).arg( i+1 ) );
- QWhatsThis::add( _nameLabel[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) );
- QWhatsThis::add( _nameInput[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) );
-
- connect(_nameInput[i], SIGNAL(textChanged(const QString&)),
- SLOT( changed() ));
- connect(_nameInput[i+(maxDesktops/2)], SIGNAL(textChanged(const QString&)),
- SLOT( changed() ));
+ TQWhatsThis::add( _nameLabel[i], i18n( "Here you can enter the name for desktop %1" ).arg( i+1 ) );
+ TQWhatsThis::add( _nameInput[i], i18n( "Here you can enter the name for desktop %1" ).arg( i+1 ) );
+ TQWhatsThis::add( _nameLabel[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) );
+ TQWhatsThis::add( _nameInput[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) );
+
+ connect(_nameInput[i], TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT( changed() ));
+ connect(_nameInput[i+(maxDesktops/2)], TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT( changed() ));
}
for(int i = 1; i < maxDesktops; i++)
@@ -111,8 +111,8 @@ KDesktopConfig::KDesktopConfig(QWidget *parent, const char * /*name*/)
layout->addWidget(name_group);
- _wheelOption = new QCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this);
- connect(_wheelOption,SIGNAL(toggled(bool)), SLOT( changed() ));
+ _wheelOption = new TQCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this);
+ connect(_wheelOption,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
layout->addWidget(_wheelOption);
layout->addStretch(1);
@@ -135,7 +135,7 @@ void KDesktopConfig::load( bool useDefaults )
if (qt_xdisplay())
konq_screen_number = DefaultScreen(qt_xdisplay());
- QCString groupname;
+ TQCString groupname;
if (konq_screen_number == 0)
groupname = "Desktops";
else
@@ -148,8 +148,8 @@ void KDesktopConfig::load( bool useDefaults )
kwinconfig->setGroup("Desktops");
for(int i = 1; i <= maxDesktops; i++)
{
- QString key_name(QString("Name_") + QString::number(i));
- QString name = QString::fromUtf8(info.desktopName(i));
+ TQString key_name(TQString("Name_") + TQString::number(i));
+ TQString name = TQString::fromUtf8(info.desktopName(i));
if (name.isEmpty()) // Get name from configuration if none is set in the WM.
{
name = kwinconfig->readEntry(key_name, i18n("Desktop %1").arg(i));
@@ -166,7 +166,7 @@ void KDesktopConfig::load( bool useDefaults )
delete kwinconfig;
kwinconfig = 0;
- QString configfile;
+ TQString configfile;
if (konq_screen_number == 0)
configfile = "kdesktoprc";
else
@@ -210,7 +210,7 @@ void KDesktopConfig::save()
if (qt_xdisplay())
konq_screen_number = DefaultScreen(qt_xdisplay());
- QCString appname;
+ TQCString appname;
if (konq_screen_number == 0)
appname = "kdesktop";
else
@@ -224,7 +224,7 @@ void KDesktopConfig::save()
// Tell kdesktop about the new config file
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
- QByteArray data;
+ TQByteArray data;
kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
diff --git a/kcontrol/konq/desktop.h b/kcontrol/konq/desktop.h
index 291d5dd8f..548af65b0 100644
--- a/kcontrol/konq/desktop.h
+++ b/kcontrol/konq/desktop.h
@@ -35,7 +35,7 @@ class KDesktopConfig : public KCModule
Q_OBJECT
public:
- KDesktopConfig(QWidget *parent = 0L, const char *name = 0L);
+ KDesktopConfig(TQWidget *parent = 0L, const char *name = 0L);
void load();
void load( bool useDefaults );
@@ -47,9 +47,9 @@ class KDesktopConfig : public KCModule
private:
KIntNumInput *_numInput;
- QLabel *_nameLabel[maxDesktops];
+ TQLabel *_nameLabel[maxDesktops];
KLineEdit *_nameInput[maxDesktops];
- QCheckBox *_wheelOption;
+ TQCheckBox *_wheelOption;
bool _wheelOptionImmutable;
bool _labelImmutable[maxDesktops];
};
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index e8052bfb0..7a7f50a76 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -22,14 +22,14 @@
#include "desktopbehavior_impl.h"
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qcombobox.h>
-#include <qpushbutton.h>
-#include <qbuttongroup.h>
-#include <qtabwidget.h>
-#include <qwhatsthis.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqcombobox.h>
+#include <tqpushbutton.h>
+#include <tqbuttongroup.h>
+#include <tqtabwidget.h>
+#include <tqwhatsthis.h>
#include <klistview.h>
#include <kservice.h>
#include <klocale.h>
@@ -46,13 +46,13 @@
const int customMenu1ID = 5;
const int customMenu2ID = 6;
-DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, QWidget *parent, const char * )
+DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, TQWidget *parent, const char * )
: KCModule( parent, "kcmkonq" )
{
- QVBoxLayout* layout = new QVBoxLayout(this);
+ TQVBoxLayout* layout = new TQVBoxLayout(this);
m_behavior = new DesktopBehavior(config, this);
layout->addWidget(m_behavior);
- connect(m_behavior, SIGNAL(changed()), this, SLOT(changed()));
+ connect(m_behavior, TQT_SIGNAL(changed()), this, TQT_SLOT(changed()));
}
void DesktopBehaviorModule::changed()
@@ -63,59 +63,59 @@ void DesktopBehaviorModule::changed()
class DesktopBehaviorPreviewItem : public QCheckListItem
{
public:
- DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, QListView *parent,
+ DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, TQListView *parent,
const KService::Ptr &plugin, bool on)
- : QCheckListItem(parent, plugin->name(), CheckBox),
+ : TQCheckListItem(parent, plugin->name(), CheckBox),
m_rootOpts(rootOpts)
{
m_pluginName = plugin->desktopEntryName();
setOn(on);
}
- DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, QListView *parent,
+ DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, TQListView *parent,
bool on)
- : QCheckListItem(parent, i18n("Sound Files"), CheckBox),
+ : TQCheckListItem(parent, i18n("Sound Files"), CheckBox),
m_rootOpts(rootOpts)
{
m_pluginName = "audio/";
setOn(on);
}
- const QString &pluginName() const { return m_pluginName; }
+ const TQString &pluginName() const { return m_pluginName; }
protected:
virtual void stateChange( bool ) { m_rootOpts->changed(); }
private:
DesktopBehavior *m_rootOpts;
- QString m_pluginName;
+ TQString m_pluginName;
};
class DesktopBehaviorMediaItem : public QCheckListItem
{
public:
- DesktopBehaviorMediaItem(DesktopBehavior *rootOpts, QListView *parent,
- const QString name, const QString mimetype, bool on)
- : QCheckListItem(parent, name, CheckBox),
+ DesktopBehaviorMediaItem(DesktopBehavior *rootOpts, TQListView *parent,
+ const TQString name, const TQString mimetype, bool on)
+ : TQCheckListItem(parent, name, CheckBox),
m_rootOpts(rootOpts),m_mimeType(mimetype){setOn(on);}
- const QString &mimeType() const { return m_mimeType; }
+ const TQString &mimeType() const { return m_mimeType; }
protected:
virtual void stateChange( bool ) { m_rootOpts->changed(); }
private:
DesktopBehavior *m_rootOpts;
- QString m_mimeType;
+ TQString m_mimeType;
};
static const int choiceCount=7;
static const char * s_choices[7] = { "", "WindowListMenu", "DesktopMenu", "AppMenu", "BookmarksMenu", "CustomMenu1", "CustomMenu2" };
-DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char * )
+DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * )
: DesktopBehaviorBase( parent, "kcmkonq" ), g_pConfig(config)
{
- QString strMouseButton1, strMouseButton3, strButtonTxt1, strButtonTxt3;
+ TQString strMouseButton1, strMouseButton3, strButtonTxt1, strButtonTxt3;
/*
* The text on this form depends on the mouse setting, which can be right
@@ -124,14 +124,14 @@ DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char *
*/
bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded);
- m_bHasMedia = KProtocolInfo::isKnownProtocol(QString::fromLatin1("media"));
+ m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media"));
- connect(desktopMenuGroup, SIGNAL(clicked(int)), this, SIGNAL(changed()));
- connect(iconsEnabledBox, SIGNAL(clicked()), this, SLOT(enableChanged()));
- connect(showHiddenBox, SIGNAL(clicked()), this, SIGNAL(changed()));
- connect(vrootBox, SIGNAL(clicked()), this, SIGNAL(changed()));
- connect(autoLineupIconsBox, SIGNAL(clicked()), this, SIGNAL(changed()));
- connect(toolTipBox, SIGNAL(clicked()), this, SIGNAL(changed()));
+ connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed()));
+ connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
+ connect(showHiddenBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
+ connect(vrootBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
+ connect(autoLineupIconsBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
+ connect(toolTipBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
strMouseButton1 = i18n("&Left button:");
strButtonTxt1 = i18n( "You can choose what happens when"
@@ -150,10 +150,10 @@ DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char *
leftLabel->setText( strMouseButton1 );
leftLabel->setBuddy( leftComboBox );
fillMenuCombo( leftComboBox );
- connect(leftEditButton, SIGNAL(clicked()), this, SLOT(editButtonPressed()));
- connect(leftComboBox, SIGNAL(activated(int)), this, SIGNAL(changed()));
- connect(leftComboBox, SIGNAL(activated(int)), this, SLOT(comboBoxChanged()));
- QString wtstr = strButtonTxt1 +
+ connect(leftEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed()));
+ connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()));
+ connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged()));
+ TQString wtstr = strButtonTxt1 +
i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>"
" <li><em>Window list menu:</em> a menu showing all windows on all"
" virtual desktops pops up. You can click on the desktop name to switch"
@@ -167,14 +167,14 @@ DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char *
" <li><em>Application menu:</em> the \"K\" menu pops up. This might be"
" useful for quickly accessing applications if you like to keep the"
" panel (also known as \"Kicker\") hidden from view.</li></ul>");
- QWhatsThis::add( leftLabel, wtstr );
- QWhatsThis::add( leftComboBox, wtstr );
+ TQWhatsThis::add( leftLabel, wtstr );
+ TQWhatsThis::add( leftComboBox, wtstr );
middleLabel->setBuddy( middleComboBox );
fillMenuCombo( middleComboBox );
- connect(middleEditButton, SIGNAL(clicked()), this, SLOT(editButtonPressed()));
- connect(middleComboBox, SIGNAL(activated(int)), this, SIGNAL(changed()));
- connect(middleComboBox, SIGNAL(activated(int)), this, SLOT(comboBoxChanged()));
+ connect(middleEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed()));
+ connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()));
+ connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged()));
wtstr = i18n("You can choose what happens when"
" you click the middle button of your pointing device on the desktop:"
" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>"
@@ -190,15 +190,15 @@ DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char *
" <li><em>Application menu:</em> the \"K\" menu pops up. This might be"
" useful for quickly accessing applications if you like to keep the"
" panel (also known as \"Kicker\") hidden from view.</li></ul>");
- QWhatsThis::add( middleLabel, wtstr );
- QWhatsThis::add( middleComboBox, wtstr );
+ TQWhatsThis::add( middleLabel, wtstr );
+ TQWhatsThis::add( middleComboBox, wtstr );
rightLabel->setText( strMouseButton3 );
rightLabel->setBuddy( rightComboBox );
fillMenuCombo( rightComboBox );
- connect(rightEditButton, SIGNAL(clicked()), this, SLOT(editButtonPressed()));
- connect(rightComboBox, SIGNAL(activated(int)), this, SIGNAL(changed()));
- connect(rightComboBox, SIGNAL(activated(int)), this, SLOT(comboBoxChanged()));
+ connect(rightEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed()));
+ connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()));
+ connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged()));
wtstr = strButtonTxt3 +
i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>"
" <li><em>Window list menu:</em> a menu showing all windows on all"
@@ -213,12 +213,12 @@ DesktopBehavior::DesktopBehavior(KConfig *config, QWidget *parent, const char *
" <li><em>Application menu:</em> the \"K\" menu pops up. This might be"
" useful for quickly accessing applications if you like to keep the"
" panel (also known as \"Kicker\") hidden from view.</li></ul>");
- QWhatsThis::add( rightLabel, wtstr );
- QWhatsThis::add( rightComboBox, wtstr );
+ TQWhatsThis::add( rightLabel, wtstr );
+ TQWhatsThis::add( rightComboBox, wtstr );
if (m_bHasMedia)
{
- connect(enableMediaBox, SIGNAL(clicked()), this, SLOT(enableChanged()));
+ connect(enableMediaBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
}
else
{
@@ -233,10 +233,10 @@ void DesktopBehavior::fillMediaListView()
mediaListView->clear();
mediaListView->setRootIsDecorated(false);
KMimeType::List mimetypes = KMimeType::allMimeTypes();
- QValueListIterator<KMimeType::Ptr> it2(mimetypes.begin());
+ TQValueListIterator<KMimeType::Ptr> it2(mimetypes.begin());
g_pConfig->setGroup( "Media" );
enableMediaBox->setChecked(g_pConfig->readBoolEntry("enabled",false));
- QString excludedMedia=g_pConfig->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted");
+ TQString excludedMedia=g_pConfig->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted");
for (; it2 != mimetypes.end(); ++it2) {
if ( ((*it2)->name().startsWith("media/")) )
{
@@ -254,7 +254,7 @@ void DesktopBehavior::saveMediaListView()
g_pConfig->setGroup( "Media" );
g_pConfig->writeEntry("enabled",enableMediaBox->isChecked());
- QStringList exclude;
+ TQStringList exclude;
for (DesktopBehaviorMediaItem *it=static_cast<DesktopBehaviorMediaItem *>(mediaListView->firstChild());
it; it=static_cast<DesktopBehaviorMediaItem *>(it->nextSibling()))
{
@@ -264,7 +264,7 @@ void DesktopBehavior::saveMediaListView()
}
-void DesktopBehavior::fillMenuCombo( QComboBox * combo )
+void DesktopBehavior::fillMenuCombo( TQComboBox * combo )
{
combo->insertItem( i18n("No Action") );
combo->insertItem( i18n("Window List Menu") );
@@ -289,7 +289,7 @@ void DesktopBehavior::load( bool useDefaults )
//bool bVertAlign = g_pConfig->readBoolEntry("VertAlign", DEFAULT_VERT_ALIGN);
KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
previewListView->clear();
- QStringList previews = g_pConfig->readListEntry("Preview");
+ TQStringList previews = g_pConfig->readListEntry("Preview");
for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName()));
new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/"));
@@ -314,7 +314,7 @@ void DesktopBehavior::load( bool useDefaults )
//
g_pConfig->setGroup( "Mouse Buttons" );
- QString s;
+ TQString s;
s = g_pConfig->readEntry( "Left", "" );
for ( int c = 0 ; c < choiceCount ; c ++ )
if (s == s_choices[c])
@@ -344,7 +344,7 @@ void DesktopBehavior::save()
{
g_pConfig->setGroup( "Desktop Icons" );
g_pConfig->writeEntry("ShowHidden", showHiddenBox->isChecked());
- QStringList previews;
+ TQStringList previews;
for ( DesktopBehaviorPreviewItem *item = static_cast<DesktopBehaviorPreviewItem *>( previewListView->firstChild() );
item;
item = static_cast<DesktopBehaviorPreviewItem *>( item->nextSibling() ) )
@@ -380,10 +380,10 @@ void DesktopBehavior::save()
// Tell kdesktop about the new config file
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
- QByteArray data;
+ TQByteArray data;
int konq_screen_number = KApplication::desktop()->primaryScreen();
- QCString appname;
+ TQCString appname;
if (konq_screen_number == 0)
appname = "kdesktop";
else
@@ -432,7 +432,7 @@ void DesktopBehavior::editButtonPressed()
if (sender() == rightEditButton)
i = rightComboBox->currentItem();
- QString cfgFile;
+ TQString cfgFile;
if (i == customMenu1ID)
cfgFile = "kdesktop_custom_menu1";
if (i == customMenu2ID)
@@ -453,7 +453,7 @@ void DesktopBehavior::editButtonPressed()
}
}
-QString DesktopBehavior::quickHelp() const
+TQString DesktopBehavior::quickHelp() const
{
return i18n("<h1>Behavior</h1>\n"
"This module allows you to choose various options\n"
diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h
index 0417e8994..851df09f2 100644
--- a/kcontrol/konq/desktopbehavior_impl.h
+++ b/kcontrol/konq/desktopbehavior_impl.h
@@ -29,12 +29,12 @@ class DesktopBehavior : public DesktopBehaviorBase
{
Q_OBJECT
public:
- DesktopBehavior(KConfig *config, QWidget *parent = 0L, const char *name = 0L );
+ DesktopBehavior(KConfig *config, TQWidget *parent = 0L, const char *name = 0L );
virtual void load();
virtual void load( bool useDefaults );
virtual void save();
virtual void defaults();
- virtual QString quickHelp() const;
+ virtual TQString quickHelp() const;
friend class DesktopBehaviorPreviewItem;
friend class DesktopBehaviorMediaItem;
@@ -53,7 +53,7 @@ private:
void saveMediaListView();
// Combo for the menus
- void fillMenuCombo( QComboBox * combo );
+ void fillMenuCombo( TQComboBox * combo );
typedef enum { NOTHING = 0, WINDOWLISTMENU, DESKTOPMENU, APPMENU, BOOKMARKSMENU=12 } menuChoice;
bool m_bHasMedia;
@@ -64,7 +64,7 @@ class DesktopBehaviorModule : public KCModule
Q_OBJECT
public:
- DesktopBehaviorModule(KConfig *config, QWidget *parent = 0L, const char *name = 0L );
+ DesktopBehaviorModule(KConfig *config, TQWidget *parent = 0L, const char *name = 0L );
virtual void load() { m_behavior->load(); emit KCModule::changed( false ); }
virtual void save() { m_behavior->save(); emit KCModule::changed( false ); }
virtual void defaults() { m_behavior->defaults(); emit KCModule::changed( true ); }
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index 66cc3962c..98c804adc 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -19,10 +19,10 @@
#include <assert.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
#include <dcopclient.h>
@@ -40,16 +40,16 @@
//-----------------------------------------------------------------------------
-KonqFontOptions::KonqFontOptions(KConfig *config, QString group, bool desktop, QWidget *parent, const char* /*name*/)
+KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop, TQWidget *parent, const char* /*name*/)
: KCModule( parent, "kcmkonq" ), g_pConfig(config), groupname(group), m_bDesktop(desktop)
{
- QLabel *label;
- QString wtstr;
+ TQLabel *label;
+ TQString wtstr;
int row = 0;
int LASTLINE = m_bDesktop ? 8 : 10; // this can be different :)
#define LASTCOLUMN 2
- QGridLayout *lay = new QGridLayout(this,LASTLINE+1,LASTCOLUMN+1, 0,
+ TQGridLayout *lay = new TQGridLayout(this,LASTLINE+1,LASTCOLUMN+1, 0,
KDialog::spacingHint());
lay->setRowStretch(LASTLINE,10);
lay->setColStretch(LASTCOLUMN,10);
@@ -57,132 +57,132 @@ KonqFontOptions::KonqFontOptions(KConfig *config, QString group, bool desktop, Q
row++;
m_pStandard = new KFontCombo( this );
- label = new QLabel( m_pStandard, i18n("&Standard font:"), this );
+ label = new TQLabel( m_pStandard, i18n("&Standard font:"), this );
lay->addWidget(label,row,0);
lay->addMultiCellWidget(m_pStandard,row,row,1,1);
wtstr = i18n("This is the font used to display text in Konqueror windows.");
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( m_pStandard, wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( m_pStandard, wtstr );
row++;
- connect( m_pStandard, SIGNAL( activated(const QString&) ),
- SLOT( slotStandardFont(const QString&) ) );
- connect( m_pStandard, SIGNAL( activated(const QString&) ),
- SLOT(changed() ) );
- connect( m_pStandard, SIGNAL( textChanged(const QString&) ),
- SLOT( slotStandardFont(const QString&) ) );
- connect( m_pStandard, SIGNAL( textChanged(const QString&) ),
- SLOT(changed() ) );
-
- m_pSize = new QSpinBox( 4,18,1,this );
- label = new QLabel( m_pSize, i18n("Font si&ze:"), this );
+ connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ),
+ TQT_SLOT( slotStandardFont(const TQString&) ) );
+ connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ),
+ TQT_SLOT(changed() ) );
+ connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ),
+ TQT_SLOT( slotStandardFont(const TQString&) ) );
+ connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ),
+ TQT_SLOT(changed() ) );
+
+ m_pSize = new TQSpinBox( 4,18,1,this );
+ label = new TQLabel( m_pSize, i18n("Font si&ze:"), this );
lay->addWidget(label,row,0);
lay->addMultiCellWidget(m_pSize,row,row,1,1);
- connect( m_pSize, SIGNAL( valueChanged(int) ),
- this, SLOT( slotFontSize(int) ) );
+ connect( m_pSize, TQT_SIGNAL( valueChanged(int) ),
+ this, TQT_SLOT( slotFontSize(int) ) );
row+=2;
wtstr = i18n("This is the font size used to display text in Konqueror windows.");
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( m_pSize, wtstr );
- int hAlign = QApplication::reverseLayout() ? AlignRight : AlignLeft;
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( m_pSize, wtstr );
+ int hAlign = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
//
#define COLOR_BUTTON_COL 1
m_pNormalText = new KColorButton( normalTextColor, this );
- label = new QLabel( m_pNormalText, i18n("Normal te&xt color:"), this );
+ label = new TQLabel( m_pNormalText, i18n("Normal te&xt color:"), this );
lay->addWidget(label,row,0);
lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,hAlign);
wtstr = i18n("This is the color used to display text in Konqueror windows.");
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( m_pNormalText, wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( m_pNormalText, wtstr );
- connect( m_pNormalText, SIGNAL( changed( const QColor & ) ),
- SLOT( slotNormalTextColorChanged( const QColor & ) ) );
+ connect( m_pNormalText, TQT_SIGNAL( changed( const TQColor & ) ),
+ TQT_SLOT( slotNormalTextColorChanged( const TQColor & ) ) );
/*
row++;
- label = new QLabel( i18n("Highlighted text color:"), this );
+ label = new TQLabel( i18n("Highlighted text color:"), this );
lay->addWidget(label,row,0);
m_pHighlightedText = new KColorButton( highlightedTextColor, this );
lay->addWidget(m_pHighlightedText,row,COLOR_BUTTON_COL,hAlign);
wtstr = i18n("This is the color used to display selected text in Konqueror windows.");
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( m_pHighlightedText, wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( m_pHighlightedText, wtstr );
- connect( m_pHighlightedText, SIGNAL( changed( const QColor & ) ),
- SLOT( slotHighlightedTextColorChanged( const QColor & ) ) );
+ connect( m_pHighlightedText, TQT_SIGNAL( changed( const TQColor & ) ),
+ TQT_SLOT( slotHighlightedTextColorChanged( const TQColor & ) ) );
*/
row++;
if ( m_bDesktop )
{
- m_cbTextBackground = new QCheckBox( i18n("&Text background color:"), this );
+ m_cbTextBackground = new TQCheckBox( i18n("&Text background color:"), this );
lay->addWidget(m_cbTextBackground,row,0);
- connect( m_cbTextBackground, SIGNAL( clicked() ),
- SLOT( slotTextBackgroundClicked() ) );
+ connect( m_cbTextBackground, TQT_SIGNAL( clicked() ),
+ TQT_SLOT( slotTextBackgroundClicked() ) );
m_pTextBackground = new KColorButton( textBackgroundColor, this );
lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,hAlign);
wtstr = i18n("This is the color used behind the text for the icons on the desktop.");
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( m_pTextBackground, wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( m_pTextBackground, wtstr );
- connect( m_pTextBackground, SIGNAL( changed( const QColor & ) ),
- SLOT( slotTextBackgroundColorChanged( const QColor & ) ) );
+ connect( m_pTextBackground, TQT_SIGNAL( changed( const TQColor & ) ),
+ TQT_SLOT( slotTextBackgroundColorChanged( const TQColor & ) ) );
row++;
}
else
{
- m_pNbLines = new QSpinBox( 1, 10, 1, this );
- QLabel* label = new QLabel( m_pNbLines, i18n("H&eight for icon text:"), this );
+ m_pNbLines = new TQSpinBox( 1, 10, 1, this );
+ TQLabel* label = new TQLabel( m_pNbLines, i18n("H&eight for icon text:"), this );
lay->addWidget( label, row, 0 );
lay->addWidget( m_pNbLines, row, 1 );
- connect( m_pNbLines, SIGNAL( valueChanged(int) ),
- this, SLOT( changed() ) );
- connect( m_pNbLines, SIGNAL( valueChanged(int) ),
- SLOT( slotPNbLinesChanged(int)) );
+ connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ),
+ this, TQT_SLOT( changed() ) );
+ connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ),
+ TQT_SLOT( slotPNbLinesChanged(int)) );
- QString thwt = i18n("This is the maximum number of lines that can be"
+ TQString thwt = i18n("This is the maximum number of lines that can be"
" used to draw icon text. Long file names are"
" truncated at the end of the last line.");
- QWhatsThis::add( label, thwt );
- QWhatsThis::add( m_pNbLines, thwt );
+ TQWhatsThis::add( label, thwt );
+ TQWhatsThis::add( m_pNbLines, thwt );
row++;
// width for the items in multicolumn icon view
- m_pNbWidth = new QSpinBox( 1, 100000, 1, this );
+ m_pNbWidth = new TQSpinBox( 1, 100000, 1, this );
- label = new QLabel( m_pNbWidth, i18n("&Width for icon text:"), this );
+ label = new TQLabel( m_pNbWidth, i18n("&Width for icon text:"), this );
lay->addWidget( label, row, 0 );
lay->addWidget( m_pNbWidth, row, 1 );
- connect( m_pNbWidth, SIGNAL( valueChanged(int) ),
- this, SLOT( changed() ) );
- connect( m_pNbWidth, SIGNAL( valueChanged(int) ),
- SLOT( slotPNbWidthChanged(int)) );
+ connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ),
+ this, TQT_SLOT( changed() ) );
+ connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ),
+ TQT_SLOT( slotPNbWidthChanged(int)) );
thwt = i18n( "This is the maximum width for the icon text when konqueror "
"is used in multi column view mode." );
- QWhatsThis::add( label, thwt );
- QWhatsThis::add( m_pNbWidth, thwt );
+ TQWhatsThis::add( label, thwt );
+ TQWhatsThis::add( m_pNbWidth, thwt );
row++;
}
- cbUnderline = new QCheckBox(i18n("&Underline filenames"), this);
+ cbUnderline = new TQCheckBox(i18n("&Underline filenames"), this);
lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,hAlign);
- connect(cbUnderline, SIGNAL(clicked()), this, SLOT(changed()));
+ connect(cbUnderline, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
- QWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames"
+ TQWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames"
" being underlined, so that they look like links on a web page. Note:"
" to complete the analogy, make sure that single click activation is"
" enabled in the mouse control module.") );
@@ -191,11 +191,11 @@ KonqFontOptions::KonqFontOptions(KConfig *config, QString group, bool desktop, Q
{
row++;
- m_pSizeInBytes = new QCheckBox(i18n("Display file sizes in b&ytes"), this);
+ m_pSizeInBytes = new TQCheckBox(i18n("Display file sizes in b&ytes"), this);
lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,hAlign );
- connect( m_pSizeInBytes, SIGNAL(clicked()), this, SLOT(changed()) );
+ connect( m_pSizeInBytes, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()) );
- QWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes"
+ TQWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes"
" being displayed in bytes. Otherwise file sizes are"
" being displayed in kilobytes or megabytes if appropriate.") );
}
@@ -213,7 +213,7 @@ void KonqFontOptions::slotFontSize(int i)
changed();
}
-void KonqFontOptions::slotStandardFont(const QString& n )
+void KonqFontOptions::slotStandardFont(const TQString& n )
{
m_stdName = n;
}
@@ -239,12 +239,12 @@ void KonqFontOptions::load( bool useDefaults )
g_pConfig->setGroup(groupname);
- QFont stdFont = g_pConfig->readFontEntry( "StandardFont" );
+ TQFont stdFont = g_pConfig->readFontEntry( "StandardFont" );
m_stdName = stdFont.family();
m_fSize = stdFont.pointSize();
- // we have to use QFontInfo, in case the font was specified with a pixel size
+ // we have to use TQFontInfo, in case the font was specified with a pixel size
if ( m_fSize == -1 )
- m_fSize = QFontInfo(stdFont).pointSize();
+ m_fSize = TQFontInfo(stdFont).pointSize();
normalTextColor = KGlobalSettings::textColor();
normalTextColor = g_pConfig->readColorEntry( "NormalTextColor", &normalTextColor );
@@ -308,13 +308,13 @@ void KonqFontOptions::save()
{
g_pConfig->setGroup(groupname);
- QFont stdFont( m_stdName, m_fSize );
+ TQFont stdFont( m_stdName, m_fSize );
g_pConfig->writeEntry( "StandardFont", stdFont );
g_pConfig->writeEntry( "NormalTextColor", normalTextColor );
//g_pConfig->writeEntry( "HighlightedTextColor", highlightedTextColor );
if ( m_bDesktop )
- g_pConfig->writeEntry( "ItemTextBackground", m_cbTextBackground->isChecked() ? textBackgroundColor : QColor());
+ g_pConfig->writeEntry( "ItemTextBackground", m_cbTextBackground->isChecked() ? textBackgroundColor : TQColor());
else
{
g_pConfig->writeEntry( "TextHeight", m_pNbLines->value() );
@@ -329,14 +329,14 @@ void KonqFontOptions::save()
// Send signal to konqueror
// Warning. In case something is added/changed here, keep kfmclient in sync
- QByteArray data;
+ TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
// Tell kdesktop about the new config file
int konq_screen_number = KApplication::desktop()->primaryScreen();
- QCString appname;
+ TQCString appname;
if (konq_screen_number == 0)
appname = "kdesktop";
else
@@ -350,7 +350,7 @@ void KonqFontOptions::slotTextBackgroundClicked()
changed();
}
-void KonqFontOptions::slotNormalTextColorChanged( const QColor &col )
+void KonqFontOptions::slotNormalTextColorChanged( const TQColor &col )
{
if ( normalTextColor != col )
{
@@ -360,7 +360,7 @@ void KonqFontOptions::slotNormalTextColorChanged( const QColor &col )
}
/*
-void KonqFontOptions::slotHighlightedTextColorChanged( const QColor &col )
+void KonqFontOptions::slotHighlightedTextColorChanged( const TQColor &col )
{
if ( highlightedTextColor != col )
{
@@ -370,7 +370,7 @@ void KonqFontOptions::slotHighlightedTextColorChanged( const QColor &col )
}
*/
-void KonqFontOptions::slotTextBackgroundColorChanged( const QColor &col )
+void KonqFontOptions::slotTextBackgroundColorChanged( const TQColor &col )
{
if ( textBackgroundColor != col )
{
@@ -379,7 +379,7 @@ void KonqFontOptions::slotTextBackgroundColorChanged( const QColor &col )
}
}
-QString KonqFontOptions::quickHelp() const
+TQString KonqFontOptions::quickHelp() const
{
return i18n("<h1>Appearance</h1> You can configure how Konqueror looks as a file manager here.");
}
diff --git a/kcontrol/konq/fontopts.h b/kcontrol/konq/fontopts.h
index 18473c18d..8b77f9c75 100644
--- a/kcontrol/konq/fontopts.h
+++ b/kcontrol/konq/fontopts.h
@@ -34,8 +34,8 @@
#ifndef __KONQFONT_OPTIONS_H__
#define __KONQFONT_OPTIONS_H__
-#include <qstringlist.h>
-#include <qspinbox.h>
+#include <tqstringlist.h>
+#include <tqspinbox.h>
#include <kcmodule.h>
@@ -53,8 +53,8 @@ class KonqFontOptions : public KCModule
{
Q_OBJECT
public:
- KonqFontOptions(KConfig *config, QString group, bool desktop, QWidget *parent=0, const char *name=0);
- QString quickHelp() const;
+ KonqFontOptions(KConfig *config, TQString group, bool desktop, TQWidget *parent=0, const char *name=0);
+ TQString quickHelp() const;
virtual void load();
virtual void load( bool readDefaults );
@@ -63,12 +63,12 @@ public:
public slots:
void slotFontSize(int i);
- void slotStandardFont(const QString& n);
+ void slotStandardFont(const TQString& n);
void slotTextBackgroundClicked();
- void slotNormalTextColorChanged( const QColor &col );
- //void slotHighlightedTextColorChanged( const QColor &col );
- void slotTextBackgroundColorChanged( const QColor &col );
+ void slotNormalTextColorChanged( const TQColor &col );
+ //void slotHighlightedTextColorChanged( const TQColor &col );
+ void slotTextBackgroundColorChanged( const TQColor &col );
private slots:
void slotPNbLinesChanged(int value);
@@ -80,33 +80,33 @@ private:
private:
KConfig *g_pConfig;
- QString groupname;
+ TQString groupname;
bool m_bDesktop;
/*
- QRadioButton* m_pSmall;
- QRadioButton* m_pMedium;
- QRadioButton* m_pLarge;
+ TQRadioButton* m_pSmall;
+ TQRadioButton* m_pMedium;
+ TQRadioButton* m_pLarge;
*/
KFontCombo* m_pStandard;
- QSpinBox* m_pSize;
+ TQSpinBox* m_pSize;
int m_fSize;
- QString m_stdName;
+ TQString m_stdName;
KColorButton* m_pBg;
KColorButton* m_pNormalText;
//KColorButton* m_pHighlightedText;
- QCheckBox* m_cbTextBackground;
+ TQCheckBox* m_cbTextBackground;
KColorButton* m_pTextBackground;
- QColor normalTextColor;
- //QColor highlightedTextColor;
- QColor textBackgroundColor;
-
- QSpinBox* m_pNbLines;
- QSpinBox* m_pNbWidth;
- QCheckBox* cbUnderline;
- QCheckBox* m_pSizeInBytes;
+ TQColor normalTextColor;
+ //TQColor highlightedTextColor;
+ TQColor textBackgroundColor;
+
+ TQSpinBox* m_pNbLines;
+ TQSpinBox* m_pNbWidth;
+ TQCheckBox* cbUnderline;
+ TQCheckBox* m_pSizeInBytes;
};
#endif
diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp
index dc9a08380..e79fbd9ce 100644
--- a/kcontrol/konq/main.cpp
+++ b/kcontrol/konq/main.cpp
@@ -33,10 +33,10 @@
#include <kconfig.h>
#include <kapplication.h>
-static QCString configname()
+static TQCString configname()
{
int desktop = KApplication::desktop()->primaryScreen();
- QCString name;
+ TQCString name;
if (desktop == 0)
name = "kdesktoprc";
else
@@ -48,48 +48,48 @@ static QCString configname()
extern "C"
{
- KDE_EXPORT KCModule *create_browser(QWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_browser(TQWidget *parent, const char *name)
{
KConfig *config = new KConfig("konquerorrc", false, true);
return new KBrowserOptions(config, "FMSettings", parent, name);
}
- KDE_EXPORT KCModule *create_behavior(QWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_behavior(TQWidget *parent, const char *name)
{
KConfig *config = new KConfig("konquerorrc", false, true);
return new KBehaviourOptions(config, "FMSettings", parent, name);
}
- KDE_EXPORT KCModule *create_appearance(QWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_appearance(TQWidget *parent, const char *name)
{
KConfig *config = new KConfig("konquerorrc", false, true);
return new KonqFontOptions(config, "FMSettings", false, parent, name);
}
- KDE_EXPORT KCModule *create_previews(QWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_previews(TQWidget *parent, const char *name)
{
return new KPreviewOptions(parent, name);
}
- KDE_EXPORT KCModule *create_dbehavior(QWidget *parent, const char* /*name*/)
+ KDE_EXPORT KCModule *create_dbehavior(TQWidget *parent, const char* /*name*/)
{
KConfig *config = new KConfig(configname(), false, false);
return new DesktopBehaviorModule(config, parent);
}
- KDE_EXPORT KCModule *create_dappearance(QWidget *parent, const char* /*name*/)
+ KDE_EXPORT KCModule *create_dappearance(TQWidget *parent, const char* /*name*/)
{
KConfig *config = new KConfig(configname(), false, false);
return new KonqFontOptions(config, "FMSettings", true, parent);
}
- KDE_EXPORT KCModule *create_dpath(QWidget *parent, const char* /*name*/)
+ KDE_EXPORT KCModule *create_dpath(TQWidget *parent, const char* /*name*/)
{
//KConfig *config = new KConfig(configname(), false, false);
return new DesktopPathConfig(parent);
}
- KDE_EXPORT KCModule *create_ddesktop(QWidget *parent, const char* /*name*/)
+ KDE_EXPORT KCModule *create_ddesktop(TQWidget *parent, const char* /*name*/)
{
return new KDesktopConfig(parent, "VirtualDesktops");
}
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 20d9a4499..0e3ea0861 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -19,10 +19,10 @@
// File previews configuration
//
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
#include <dcopclient.h>
@@ -42,12 +42,12 @@
class PreviewCheckListItem : public QCheckListItem
{
public:
- PreviewCheckListItem( QListView *parent, const QString &text )
- : QCheckListItem( parent, text, CheckBoxController )
+ PreviewCheckListItem( TQListView *parent, const TQString &text )
+ : TQCheckListItem( parent, text, CheckBoxController )
{}
- PreviewCheckListItem( QListViewItem *parent, const QString &text )
- : QCheckListItem( parent, text, CheckBox )
+ PreviewCheckListItem( TQListViewItem *parent, const TQString &text )
+ : TQCheckListItem( parent, text, CheckBox )
{}
protected:
@@ -57,12 +57,12 @@ class PreviewCheckListItem : public QCheckListItem
}
};
-KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ )
+KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ )
: KCModule( parent, "kcmkonq" )
{
- QVBoxLayout *lay = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *lay = new TQVBoxLayout(this, 0, KDialog::spacingHint());
- lay->addWidget( new QLabel( i18n("<p>Allow previews, \"Folder Icons Reflect Contents\", and "
+ lay->addWidget( new TQLabel( i18n("<p>Allow previews, \"Folder Icons Reflect Contents\", and "
"retrieval of meta-data on protocols:</p>"), this ) );
setQuickHelp( i18n("<h1>Preview Options</h1> Here you can modify the behavior "
@@ -81,7 +81,7 @@ KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ )
listView->addColumn( i18n( "Select Protocols" ) );
listView->setFullWidth( true );
- QHBoxLayout *hbox = new QHBoxLayout( lay );
+ TQHBoxLayout *hbox = new TQHBoxLayout( lay );
hbox->addWidget( listView );
hbox->addStretch();
@@ -90,9 +90,9 @@ KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ )
PreviewCheckListItem *inetItems = new PreviewCheckListItem( listView,
i18n( "Internet Protocols" ) );
- QStringList protocolList = KProtocolInfo::protocols();
+ TQStringList protocolList = KProtocolInfo::protocols();
protocolList.sort();
- QStringList::Iterator it = protocolList.begin();
+ TQStringList::Iterator it = protocolList.begin();
KURL url;
url.setPath("/");
@@ -102,7 +102,7 @@ KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ )
url.setProtocol( *it );
if ( KProtocolInfo::supportsListing( url ) )
{
- QCheckListItem *item;
+ TQCheckListItem *item;
if ( KProtocolInfo::protocolClass( *it ) == ":local" )
item = new PreviewCheckListItem( localItems, ( *it ) );
else
@@ -115,13 +115,13 @@ KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ )
listView->setOpen( localItems, true );
listView->setOpen( inetItems, true );
- QWhatsThis::add( listView,
+ TQWhatsThis::add( listView,
i18n("This option makes it possible to choose when the file previews, "
"smart folder icons, and meta-data in the File Manager should be activated.\n"
"In the list of protocols that appear, select which ones are fast "
"enough for you to allow previews to be generated.") );
- QLabel *label = new QLabel( i18n( "&Maximum file size:" ), this );
+ TQLabel *label = new TQLabel( i18n( "&Maximum file size:" ), this );
lay->addWidget( label );
m_maxSize = new KDoubleNumInput( this );
@@ -130,24 +130,24 @@ KPreviewOptions::KPreviewOptions( QWidget *parent, const char */*name*/ )
m_maxSize->setPrecision( 1 );
label->setBuddy( m_maxSize );
lay->addWidget( m_maxSize );
- connect( m_maxSize, SIGNAL( valueChanged(double) ), SLOT( changed() ) );
+ connect( m_maxSize, TQT_SIGNAL( valueChanged(double) ), TQT_SLOT( changed() ) );
- m_boostSize = new QCheckBox(i18n("&Increase size of previews relative to icons"), this);
- connect( m_boostSize, SIGNAL( toggled(bool) ), SLOT( changed() ) );
+ m_boostSize = new TQCheckBox(i18n("&Increase size of previews relative to icons"), this);
+ connect( m_boostSize, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) );
lay->addWidget(m_boostSize);
- m_useFileThumbnails = new QCheckBox(i18n("&Use thumbnails embedded in files"), this);
- connect( m_useFileThumbnails, SIGNAL( toggled(bool) ), SLOT( changed() ) );
+ m_useFileThumbnails = new TQCheckBox(i18n("&Use thumbnails embedded in files"), this);
+ connect( m_useFileThumbnails, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) );
lay->addWidget(m_useFileThumbnails);
- QWhatsThis::add( m_useFileThumbnails,
+ TQWhatsThis::add( m_useFileThumbnails,
i18n("Select this to use thumbnails that are found inside some "
"file types (e.g. JPEG). This will increase speed and reduce "
"disk usage. Deselect it if you have files that have been processed "
"by programs which create inaccurate thumbnails, such as ImageMagick.") );
- lay->addWidget( new QWidget(this), 10 );
+ lay->addWidget( new TQWidget(this), 10 );
load();
}
@@ -160,10 +160,10 @@ void KPreviewOptions::load(bool useDefaults)
// *** load and apply to GUI ***
KGlobal::config()->setReadDefaults(useDefaults);
KConfigGroup group( KGlobal::config(), "PreviewSettings" );
- QPtrListIterator<QCheckListItem> it( m_items );
+ TQPtrListIterator<TQCheckListItem> it( m_items );
for ( ; it.current() ; ++it ) {
- QString protocol( it.current()->text() );
+ TQString protocol( it.current()->text() );
if ( ( protocol == "file" ) && ( !group.hasKey ( protocol ) ) )
// file should be enabled in case is not defined because if not so
// than preview's lost when size is changed from default one
@@ -192,9 +192,9 @@ void KPreviewOptions::defaults()
void KPreviewOptions::save()
{
KConfigGroup group( KGlobal::config(), "PreviewSettings" );
- QPtrListIterator<QCheckListItem> it( m_items );
+ TQPtrListIterator<TQCheckListItem> it( m_items );
for ( ; it.current() ; ++it ) {
- QString protocol( it.current()->text() );
+ TQString protocol( it.current()->text() );
group.writeEntry( protocol, it.current()->isOn(), true, true );
}
// config key is in bytes, numinput is in MB
@@ -205,7 +205,7 @@ void KPreviewOptions::save()
// Send signal to konqueror
// Warning. In case something is added/changed here, keep kfmclient in sync
- QByteArray data;
+ TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h
index b91e7b563..0e8d112f2 100644
--- a/kcontrol/konq/previews.h
+++ b/kcontrol/konq/previews.h
@@ -31,7 +31,7 @@ Configuration of the maximum image size
*/
-#include <qstring.h>
+#include <tqstring.h>
#include <kcmodule.h>
@@ -44,7 +44,7 @@ class KPreviewOptions : public KCModule
{
Q_OBJECT
public:
- KPreviewOptions( QWidget *parent = 0L, const char *name = 0L );
+ KPreviewOptions( TQWidget *parent = 0L, const char *name = 0L );
virtual void load();
virtual void save();
virtual void defaults();
@@ -56,10 +56,10 @@ public slots:
void changed();
private:
- QPtrList<QCheckListItem> m_items;
+ TQPtrList<TQCheckListItem> m_items;
KDoubleNumInput *m_maxSize;
- QCheckBox *m_boostSize;
- QCheckBox *m_useFileThumbnails;
+ TQCheckBox *m_boostSize;
+ TQCheckBox *m_useFileThumbnails;
};
#endif
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index 1a14c68e3..f4111cfda 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -14,12 +14,12 @@
#include <config.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qvgroupbox.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqvgroupbox.h>
+#include <tqwhatsthis.h>
#include <dcopclient.h>
@@ -43,10 +43,10 @@
//-----------------------------------------------------------------------------
-DesktopPathConfig::DesktopPathConfig(QWidget *parent, const char * )
+DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
: KCModule( parent, "kcmkonq" )
{
- QLabel * tmpLabel;
+ TQLabel * tmpLabel;
#undef RO_LASTROW
#undef RO_LASTCOL
@@ -54,7 +54,7 @@ DesktopPathConfig::DesktopPathConfig(QWidget *parent, const char * )
#define RO_LASTCOL 2
int row = 0;
- QGridLayout *lay = new QGridLayout(this, RO_LASTROW+1, RO_LASTCOL+1,
+ TQGridLayout *lay = new TQGridLayout(this, RO_LASTROW+1, RO_LASTCOL+1,
0, KDialog::spacingHint());
lay->setRowStretch(RO_LASTROW,10); // last line grows
@@ -71,48 +71,48 @@ DesktopPathConfig::DesktopPathConfig(QWidget *parent, const char * )
// Desktop Paths
row++;
- tmpLabel = new QLabel(i18n("Des&ktop path:"), this);
+ tmpLabel = new TQLabel(i18n("Des&ktop path:"), this);
lay->addWidget(tmpLabel, row, 0);
urDesktop = new KURLRequester(this);
urDesktop->setMode( KFile::Directory );
tmpLabel->setBuddy( urDesktop );
lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL);
- connect(urDesktop, SIGNAL(textChanged(const QString &)), this, SLOT(changed()));
- QString wtstr = i18n("This folder contains all the files"
+ connect(urDesktop, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ TQString wtstr = i18n("This folder contains all the files"
" which you see on your desktop. You can change the location of this"
" folder if you want to, and the contents will move automatically"
" to the new location as well.");
- QWhatsThis::add( tmpLabel, wtstr );
- QWhatsThis::add( urDesktop, wtstr );
+ TQWhatsThis::add( tmpLabel, wtstr );
+ TQWhatsThis::add( urDesktop, wtstr );
row++;
- tmpLabel = new QLabel(i18n("A&utostart path:"), this);
+ tmpLabel = new TQLabel(i18n("A&utostart path:"), this);
lay->addWidget(tmpLabel, row, 0);
urAutostart = new KURLRequester(this);
urAutostart->setMode( KFile::Directory );
tmpLabel->setBuddy( urAutostart );
lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL);
- connect(urAutostart, SIGNAL(textChanged(const QString &)), this, SLOT(changed()));
+ connect(urAutostart, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
wtstr = i18n("This folder contains applications or"
" links to applications (shortcuts) that you want to have started"
" automatically whenever KDE starts. You can change the location of this"
" folder if you want to, and the contents will move automatically"
" to the new location as well.");
- QWhatsThis::add( tmpLabel, wtstr );
- QWhatsThis::add( urAutostart, wtstr );
+ TQWhatsThis::add( tmpLabel, wtstr );
+ TQWhatsThis::add( urAutostart, wtstr );
row++;
- tmpLabel = new QLabel(i18n("D&ocuments path:"), this);
+ tmpLabel = new TQLabel(i18n("D&ocuments path:"), this);
lay->addWidget(tmpLabel, row, 0);
urDocument = new KURLRequester(this);
urDocument->setMode( KFile::Directory );
tmpLabel->setBuddy( urDocument );
lay->addMultiCellWidget(urDocument, row, row, 1, RO_LASTCOL);
- connect(urDocument, SIGNAL(textChanged(const QString &)), this, SLOT(changed()));
+ connect(urDocument, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
wtstr = i18n("This folder will be used by default to "
"load or save documents from or to.");
- QWhatsThis::add( tmpLabel, wtstr );
- QWhatsThis::add( urDocument, wtstr );
+ TQWhatsThis::add( tmpLabel, wtstr );
+ TQWhatsThis::add( urDocument, wtstr );
// -- Bottom --
Q_ASSERT( row == RO_LASTROW-1 ); // if it fails here, check the row++ and RO_LASTROW above
@@ -133,10 +133,10 @@ void DesktopPathConfig::load( bool useDefaults )
config.setGroup("Paths");
urAutostart->setURL( config.readPathEntry( "Autostart" , KGlobalSettings::autostartPath() ));
- KConfig xdguserconfig( QDir::homeDirPath()+"/.config/user-dirs.dirs" );
+ KConfig xdguserconfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" );
- urDesktop->setURL( xdguserconfig.readPathEntry( "XDG_DESKTOP_DIR" , QDir::homeDirPath() + "/Desktop" ).remove( "\"" ));
- urDocument->setURL( xdguserconfig.readPathEntry( "XDG_DOCUMENTS_DIR", QDir::homeDirPath()).remove( "\"" ));
+ urDesktop->setURL( xdguserconfig.readPathEntry( "XDG_DESKTOP_DIR" , TQDir::homeDirPath() + "/Desktop" ).remove( "\"" ));
+ urDocument->setURL( xdguserconfig.readPathEntry( "XDG_DOCUMENTS_DIR", TQDir::homeDirPath()).remove( "\"" ));
emit changed( useDefaults );
}
@@ -149,7 +149,7 @@ void DesktopPathConfig::defaults()
void DesktopPathConfig::save()
{
KConfig *config = KGlobal::config();
- KConfig *xdgconfig = new KConfig( QDir::homeDirPath()+"/.config/user-dirs.dirs" );
+ KConfig *xdgconfig = new KConfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" );
KConfigGroupSaver cgs( config, "Paths" );
bool pathChanged = false;
@@ -178,7 +178,7 @@ void DesktopPathConfig::save()
// * Not inside destination -> move first
// !!!
kdDebug() << "desktopURL=" << desktopURL.url() << endl;
- QString urlDesktop = urDesktop->url();
+ TQString urlDesktop = urDesktop->url();
if ( !urlDesktop.endsWith( "/" ))
urlDesktop+="/";
@@ -227,8 +227,8 @@ void DesktopPathConfig::save()
if ( !newDocumentURL.equals( documentURL, true ) )
{
bool pathOk = true;
- QString path = urDocument->url();
- if (!QDir(path).exists())
+ TQString path = urDocument->url();
+ if (!TQDir(path).exists())
{
if (!KStandardDirs::makeDir(path))
{
@@ -257,10 +257,10 @@ void DesktopPathConfig::save()
// Tell kdesktop about the new config file
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
- QByteArray data;
+ TQByteArray data;
int konq_screen_number = KApplication::desktop()->primaryScreen();
- QCString appname;
+ TQCString appname;
if (konq_screen_number == 0)
appname = "kdesktop";
else
@@ -268,7 +268,7 @@ void DesktopPathConfig::save()
kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
}
-bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const QString & type )
+bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQString & type )
{
if (!src.isLocalFile() || !dest.isLocalFile())
return true;
@@ -278,14 +278,14 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const QStr
arg(type).arg(src.path()).arg(dest.path()), i18n("Confirmation Required"),i18n("Move"),KStdGuiItem::cancel() )
== KMessageBox::Yes )
{
- bool destExists = QFile::exists(dest.path());
+ bool destExists = TQFile::exists(dest.path());
if (destExists)
{
m_copyToDest = dest;
m_copyFromSrc = src;
KIO::ListJob* job = KIO::listDir( src );
- connect( job, SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ),
- this, SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) );
+ connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ),
+ this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) );
qApp->enter_loop();
if (m_ok)
@@ -296,7 +296,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const QStr
else
{
KIO::Job * job = KIO::move( src, dest );
- connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
// wait for job
qApp->enter_loop();
}
@@ -324,7 +324,7 @@ void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& li
}
KIO::Job * moveJob = KIO::move( file.url(), m_copyToDest );
- connect( moveJob, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) );
+ connect( moveJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
qApp->enter_loop();
}
qApp->exit_loop();
diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h
index 3a7b7ee3f..482c4a765 100644
--- a/kcontrol/konq/rootopts.h
+++ b/kcontrol/konq/rootopts.h
@@ -13,7 +13,7 @@
#define __ROOT_OPTIONS_H
-#include <qstring.h>
+#include <tqstring.h>
#include <kcmodule.h>
#include <kio/global.h>
@@ -37,7 +37,7 @@ class DesktopPathConfig : public KCModule
{
Q_OBJECT
public:
- DesktopPathConfig(QWidget *parent = 0L, const char *name = 0L );
+ DesktopPathConfig(TQWidget *parent = 0L, const char *name = 0L );
virtual void load();
virtual void load( bool useDefaults );
virtual void save();
@@ -52,7 +52,7 @@ private:
KURLRequester *urAutostart;
KURLRequester *urDocument;
- bool moveDir( const KURL & src, const KURL & dest, const QString & type );
+ bool moveDir( const KURL & src, const KURL & dest, const TQString & type );
bool m_ok;
KURL m_copyToDest; // used when the destination directory already exists
KURL m_copyFromSrc;
diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp
index 93a576043..681863cb6 100644
--- a/kcontrol/konqhtml/advancedTabDialog.cpp
+++ b/kcontrol/konqhtml/advancedTabDialog.cpp
@@ -17,12 +17,12 @@
* along with this program; if not, write to the Free Software
*/
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qslider.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqslider.h>
#include <kapplication.h>
#include <dcopclient.h>
@@ -34,7 +34,7 @@
#include "advancedTabOptions.h"
#include "main.h"
-advancedTabDialog::advancedTabDialog(QWidget* parent, KConfig* config, const char* name)
+advancedTabDialog::advancedTabDialog(TQWidget* parent, KConfig* config, const char* name)
: KDialogBase(KDialogBase::Plain,
i18n("Advanced Options"),
KDialogBase::Ok |
@@ -46,25 +46,25 @@ advancedTabDialog::advancedTabDialog(QWidget* parent, KConfig* config, const cha
true, true),
m_pConfig(config)
{
- connect(this, SIGNAL(applyClicked()),
- this, SLOT(save()));
- connect(this, SIGNAL(okClicked()),
- this, SLOT(save()));
+ connect(this, TQT_SIGNAL(applyClicked()),
+ this, TQT_SLOT(save()));
+ connect(this, TQT_SIGNAL(okClicked()),
+ this, TQT_SLOT(save()));
actionButton(Apply)->setEnabled(false);
- QFrame* page = plainPage();
- QVBoxLayout* layout = new QVBoxLayout(page);
+ TQFrame* page = plainPage();
+ TQVBoxLayout* layout = new TQVBoxLayout(page);
m_advancedWidget = new advancedTabOptions(page);
layout->addWidget(m_advancedWidget);
layout->addSpacing( 20 );
layout->addStretch();
- connect(m_advancedWidget->m_pNewTabsInBackground, SIGNAL(clicked()), this, SLOT(changed()));
- connect(m_advancedWidget->m_pOpenAfterCurrentPage, SIGNAL(clicked()), this, SLOT(changed()));
- connect(m_advancedWidget->m_pTabConfirm, SIGNAL(clicked()), this, SLOT(changed()));
- connect(m_advancedWidget->m_pTabCloseActivatePrevious, SIGNAL(clicked()), this, SLOT(changed()));
- connect(m_advancedWidget->m_pPermanentCloseButton, SIGNAL(clicked()), this, SLOT(changed()));
- connect(m_advancedWidget->m_pKonquerorTabforExternalURL, SIGNAL(clicked()), this, SLOT(changed()));
- connect(m_advancedWidget->m_pPopupsWithinTabs, SIGNAL(clicked()), this, SLOT(changed()));
+ connect(m_advancedWidget->m_pNewTabsInBackground, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(m_advancedWidget->m_pOpenAfterCurrentPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(m_advancedWidget->m_pTabConfirm, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(m_advancedWidget->m_pTabCloseActivatePrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(m_advancedWidget->m_pPermanentCloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(m_advancedWidget->m_pKonquerorTabforExternalURL, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(m_advancedWidget->m_pPopupsWithinTabs, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
load();
}
@@ -105,7 +105,7 @@ void advancedTabDialog::save()
if ( m_advancedWidget->m_pTabConfirm->isChecked() ) m_pConfig->deleteEntry( "MultipleTabConfirm" );
else m_pConfig->writeEntry( "MultipleTabConfirm", true );
- QByteArray data;
+ TQByteArray data;
if ( !KApplication::kApplication()->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
KApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
diff --git a/kcontrol/konqhtml/advancedTabDialog.h b/kcontrol/konqhtml/advancedTabDialog.h
index 728e8928b..3e340b5b8 100644
--- a/kcontrol/konqhtml/advancedTabDialog.h
+++ b/kcontrol/konqhtml/advancedTabDialog.h
@@ -29,7 +29,7 @@ class advancedTabDialog : public KDialogBase
Q_OBJECT
public:
- advancedTabDialog(QWidget* parent, KConfig *config, const char* name);
+ advancedTabDialog(TQWidget* parent, KConfig *config, const char* name);
~advancedTabDialog();
protected slots:
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index 15cbd036a..0c15acebe 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -1,9 +1,9 @@
-#include <qfontdatabase.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qvgroupbox.h>
-#include <qwhatsthis.h>
+#include <tqfontdatabase.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqvgroupbox.h>
+#include <tqwhatsthis.h>
#include <dcopclient.h>
@@ -25,7 +25,7 @@
#include "appearance.moc"
-KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget *parent, const char *)
+KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget *parent, const char *)
: KCModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group),
fSize( 10 ), fMinSize( HTML_DEFAULT_MIN_FONT_SIZE )
@@ -34,37 +34,37 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget *
"which fonts Konqueror should use to display the web "
"pages you view."));
- QString wtstr;
+ TQString wtstr;
- QGridLayout *lay = new QGridLayout(this, 1 ,1 , 0, KDialog::spacingHint());
+ TQGridLayout *lay = new TQGridLayout(this, 1 ,1 , 0, KDialog::spacingHint());
int r = 0;
int E = 0, M = 1, W = 3; //CT 3 (instead 2) allows smaller color buttons
- QGroupBox* gb = new QGroupBox( 1, QGroupBox::Horizontal, i18n("Font Si&ze"), this );
+ TQGroupBox* gb = new TQGroupBox( 1, TQGroupBox::Horizontal, i18n("Font Si&ze"), this );
lay->addMultiCellWidget(gb, r, r, E, W);
- QWhatsThis::add( gb, i18n("This is the relative font size Konqueror uses to display web sites.") );
+ TQWhatsThis::add( gb, i18n("This is the relative font size Konqueror uses to display web sites.") );
m_minSize = new KIntNumInput( fMinSize, gb );
m_minSize->setLabel( i18n( "M&inimum font size:" ) );
m_minSize->setRange( 2, 30 );
- connect( m_minSize, SIGNAL( valueChanged( int ) ), this, SLOT( slotMinimumFontSize( int ) ) );
- connect( m_minSize, SIGNAL( valueChanged( int ) ), this, SLOT( changed() ) );
- QWhatsThis::add( m_minSize, i18n( "Konqueror will never display text smaller than "
+ connect( m_minSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotMinimumFontSize( int ) ) );
+ connect( m_minSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changed() ) );
+ TQWhatsThis::add( m_minSize, i18n( "Konqueror will never display text smaller than "
"this size,<br>overriding any other settings" ) );
m_MedSize = new KIntNumInput( m_minSize, fSize, gb );
m_MedSize->setLabel( i18n( "&Medium font size:" ) );
m_MedSize->setRange( 2, 30 );
- connect( m_MedSize, SIGNAL( valueChanged( int ) ), this, SLOT( slotFontSize( int ) ) );
- connect( m_MedSize, SIGNAL( valueChanged( int ) ), this, SLOT( changed() ) );
- QWhatsThis::add( m_MedSize,
+ connect( m_MedSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotFontSize( int ) ) );
+ connect( m_MedSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changed() ) );
+ TQWhatsThis::add( m_MedSize,
i18n("This is the relative font size Konqueror uses "
"to display web sites.") );
- QStringList emptyList;
+ TQStringList emptyList;
- QLabel* label = new QLabel( i18n("S&tandard font:"), this );
+ TQLabel* label = new TQLabel( i18n("S&tandard font:"), this );
lay->addWidget( label , ++r, E);
m_pFonts[0] = new KFontCombo( emptyList, this );
@@ -73,19 +73,19 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget *
lay->addMultiCellWidget(m_pFonts[0], r, r, M, W);
wtstr = i18n("This is the font used to display normal text in a web page.");
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( m_pFonts[0], wtstr );
-
- connect( m_pFonts[0], SIGNAL( activated(const QString&) ),
- SLOT( slotStandardFont(const QString&) ) );
- connect( m_pFonts[0], SIGNAL( activated(const QString&) ),
- SLOT(changed() ) );
- connect( m_pFonts[0]->lineEdit(), SIGNAL( textChanged(const QString&) ),
- SLOT( slotStandardFont(const QString&) ) );
- connect( m_pFonts[0], SIGNAL( textChanged(const QString&) ),
- SLOT(changed() ) );
-
- label = new QLabel( i18n( "&Fixed font:"), this );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( m_pFonts[0], wtstr );
+
+ connect( m_pFonts[0], TQT_SIGNAL( activated(const TQString&) ),
+ TQT_SLOT( slotStandardFont(const TQString&) ) );
+ connect( m_pFonts[0], TQT_SIGNAL( activated(const TQString&) ),
+ TQT_SLOT(changed() ) );
+ connect( m_pFonts[0]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
+ TQT_SLOT( slotStandardFont(const TQString&) ) );
+ connect( m_pFonts[0], TQT_SIGNAL( textChanged(const TQString&) ),
+ TQT_SLOT(changed() ) );
+
+ label = new TQLabel( i18n( "&Fixed font:"), this );
lay->addWidget( label, ++r, E );
m_pFonts[1] = new KFontCombo( emptyList, this );
@@ -94,19 +94,19 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget *
lay->addMultiCellWidget(m_pFonts[1], r, r, M, W);
wtstr = i18n("This is the font used to display fixed-width (i.e. non-proportional) text.");
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( m_pFonts[1], wtstr );
-
- connect( m_pFonts[1], SIGNAL( activated(const QString&) ),
- SLOT( slotFixedFont(const QString&) ) );
- connect( m_pFonts[1], SIGNAL( activated(const QString&) ),
- SLOT(changed() ) );
- connect( m_pFonts[1]->lineEdit(), SIGNAL( textChanged(const QString&) ),
- SLOT( slotFixedFont(const QString&) ) );
- connect( m_pFonts[1], SIGNAL( textChanged(const QString&) ),
- SLOT(changed() ) );
-
- label = new QLabel( i18n( "S&erif font:" ), this );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( m_pFonts[1], wtstr );
+
+ connect( m_pFonts[1], TQT_SIGNAL( activated(const TQString&) ),
+ TQT_SLOT( slotFixedFont(const TQString&) ) );
+ connect( m_pFonts[1], TQT_SIGNAL( activated(const TQString&) ),
+ TQT_SLOT(changed() ) );
+ connect( m_pFonts[1]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
+ TQT_SLOT( slotFixedFont(const TQString&) ) );
+ connect( m_pFonts[1], TQT_SIGNAL( textChanged(const TQString&) ),
+ TQT_SLOT(changed() ) );
+
+ label = new TQLabel( i18n( "S&erif font:" ), this );
lay->addWidget( label, ++r, E );
m_pFonts[2] = new KFontCombo( emptyList, this );
@@ -115,19 +115,19 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget *
lay->addMultiCellWidget( m_pFonts[2], r, r, M, W );
wtstr= i18n( "This is the font used to display text that is marked up as serif." );
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( m_pFonts[2], wtstr );
-
- connect( m_pFonts[2], SIGNAL( activated( const QString& ) ),
- SLOT( slotSerifFont( const QString& ) ) );
- connect( m_pFonts[2], SIGNAL( activated( const QString& ) ),
- SLOT( changed() ) );
- connect( m_pFonts[2]->lineEdit(), SIGNAL( textChanged(const QString&) ),
- SLOT( slotSerifFont(const QString&) ) );
- connect( m_pFonts[2], SIGNAL( textChanged(const QString&) ),
- SLOT(changed() ) );
-
- label = new QLabel( i18n( "Sa&ns serif font:" ), this );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( m_pFonts[2], wtstr );
+
+ connect( m_pFonts[2], TQT_SIGNAL( activated( const TQString& ) ),
+ TQT_SLOT( slotSerifFont( const TQString& ) ) );
+ connect( m_pFonts[2], TQT_SIGNAL( activated( const TQString& ) ),
+ TQT_SLOT( changed() ) );
+ connect( m_pFonts[2]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
+ TQT_SLOT( slotSerifFont(const TQString&) ) );
+ connect( m_pFonts[2], TQT_SIGNAL( textChanged(const TQString&) ),
+ TQT_SLOT(changed() ) );
+
+ label = new TQLabel( i18n( "Sa&ns serif font:" ), this );
lay->addWidget( label, ++r, E );
m_pFonts[3] = new KFontCombo( emptyList, this );
@@ -136,20 +136,20 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget *
lay->addMultiCellWidget( m_pFonts[3], r, r, M, W );
wtstr= i18n( "This is the font used to display text that is marked up as sans-serif." );
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( m_pFonts[3], wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( m_pFonts[3], wtstr );
- connect( m_pFonts[3], SIGNAL( activated( const QString& ) ),
- SLOT( slotSansSerifFont( const QString& ) ) );
- connect( m_pFonts[3], SIGNAL( activated( const QString& ) ),
- SLOT( changed() ) );
- connect( m_pFonts[3]->lineEdit(), SIGNAL( textChanged(const QString&) ),
- SLOT( slotSansSerifFont(const QString&) ) );
- connect( m_pFonts[3], SIGNAL( textChanged(const QString&) ),
- SLOT(changed() ) );
+ connect( m_pFonts[3], TQT_SIGNAL( activated( const TQString& ) ),
+ TQT_SLOT( slotSansSerifFont( const TQString& ) ) );
+ connect( m_pFonts[3], TQT_SIGNAL( activated( const TQString& ) ),
+ TQT_SLOT( changed() ) );
+ connect( m_pFonts[3]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
+ TQT_SLOT( slotSansSerifFont(const TQString&) ) );
+ connect( m_pFonts[3], TQT_SIGNAL( textChanged(const TQString&) ),
+ TQT_SLOT(changed() ) );
- label = new QLabel( i18n( "C&ursive font:" ), this );
+ label = new TQLabel( i18n( "C&ursive font:" ), this );
lay->addWidget( label, ++r, E );
m_pFonts[4] = new KFontCombo( emptyList, this );
@@ -158,20 +158,20 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget *
lay->addMultiCellWidget( m_pFonts[4], r, r, M, W );
wtstr= i18n( "This is the font used to display text that is marked up as italic." );
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( m_pFonts[4], wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( m_pFonts[4], wtstr );
- connect( m_pFonts[4], SIGNAL( activated( const QString& ) ),
- SLOT( slotCursiveFont( const QString& ) ) );
- connect( m_pFonts[4], SIGNAL( activated( const QString& ) ),
- SLOT( changed() ) );
- connect( m_pFonts[4]->lineEdit(), SIGNAL( textChanged(const QString&) ),
- SLOT( slotCursiveFont(const QString&) ) );
- connect( m_pFonts[4], SIGNAL( textChanged(const QString&) ),
- SLOT(changed() ) );
+ connect( m_pFonts[4], TQT_SIGNAL( activated( const TQString& ) ),
+ TQT_SLOT( slotCursiveFont( const TQString& ) ) );
+ connect( m_pFonts[4], TQT_SIGNAL( activated( const TQString& ) ),
+ TQT_SLOT( changed() ) );
+ connect( m_pFonts[4]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
+ TQT_SLOT( slotCursiveFont(const TQString&) ) );
+ connect( m_pFonts[4], TQT_SIGNAL( textChanged(const TQString&) ),
+ TQT_SLOT(changed() ) );
- label = new QLabel( i18n( "Fantas&y font:" ), this );
+ label = new TQLabel( i18n( "Fantas&y font:" ), this );
lay->addWidget( label, ++r, E );
m_pFonts[5] = new KFontCombo( emptyList, this );
@@ -180,37 +180,37 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget *
lay->addMultiCellWidget( m_pFonts[5], r, r, M, W );
wtstr= i18n( "This is the font used to display text that is marked up as a fantasy font." );
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( m_pFonts[5], wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( m_pFonts[5], wtstr );
- connect( m_pFonts[5], SIGNAL( activated( const QString& ) ),
- SLOT( slotFantasyFont( const QString& ) ) );
- connect( m_pFonts[5], SIGNAL( activated( const QString& ) ),
- SLOT( changed() ) );
- connect( m_pFonts[5]->lineEdit(), SIGNAL( textChanged(const QString&) ),
- SLOT( slotFantasyFont(const QString&) ) );
- connect( m_pFonts[5], SIGNAL( textChanged(const QString&) ),
- SLOT(changed() ) );
+ connect( m_pFonts[5], TQT_SIGNAL( activated( const TQString& ) ),
+ TQT_SLOT( slotFantasyFont( const TQString& ) ) );
+ connect( m_pFonts[5], TQT_SIGNAL( activated( const TQString& ) ),
+ TQT_SLOT( changed() ) );
+ connect( m_pFonts[5]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
+ TQT_SLOT( slotFantasyFont(const TQString&) ) );
+ connect( m_pFonts[5], TQT_SIGNAL( textChanged(const TQString&) ),
+ TQT_SLOT(changed() ) );
- label = new QLabel( i18n( "Font &size adjustment for this encoding:" ), this );
+ label = new TQLabel( i18n( "Font &size adjustment for this encoding:" ), this );
lay->addWidget( label, ++r, M );
- m_pFontSizeAdjust = new QSpinBox( -5, 5, 1, this );
+ m_pFontSizeAdjust = new TQSpinBox( -5, 5, 1, this );
label->setBuddy( m_pFontSizeAdjust );
lay->addMultiCellWidget( m_pFontSizeAdjust, r, r, M+1, W );
- connect( m_pFontSizeAdjust, SIGNAL( valueChanged( int ) ),
- SLOT( slotFontSizeAdjust( int ) ) );
- connect( m_pFontSizeAdjust, SIGNAL( valueChanged( int ) ),
- SLOT( changed() ) );
+ connect( m_pFontSizeAdjust, TQT_SIGNAL( valueChanged( int ) ),
+ TQT_SLOT( slotFontSizeAdjust( int ) ) );
+ connect( m_pFontSizeAdjust, TQT_SIGNAL( valueChanged( int ) ),
+ TQT_SLOT( changed() ) );
- label = new QLabel( i18n( "Default encoding:"), this );
+ label = new TQLabel( i18n( "Default encoding:"), this );
//++r;
//lay->addMultiCellWidget( label, r, r, E, E+1);
lay->addWidget( label, ++r, E);
- m_pEncoding = new QComboBox( false, this );
+ m_pEncoding = new TQComboBox( false, this );
label->setBuddy( m_pEncoding );
encodings = KGlobal::charsets()->availableEncodingNames();
encodings.prepend(i18n("Use Language Encoding"));
@@ -219,17 +219,17 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, QWidget *
wtstr = i18n( "Select the default encoding to be used; normally, you will be fine with 'Use language encoding' "
"and should not have to change this.");
- QWhatsThis::add( label, wtstr );
- QWhatsThis::add( m_pEncoding, wtstr );
+ TQWhatsThis::add( label, wtstr );
+ TQWhatsThis::add( m_pEncoding, wtstr );
- connect( m_pEncoding, SIGNAL( activated(const QString& ) ),
- SLOT( slotEncoding(const QString&) ) );
- connect( m_pEncoding, SIGNAL( activated(const QString& ) ),
- SLOT( changed() ) );
+ connect( m_pEncoding, TQT_SIGNAL( activated(const TQString& ) ),
+ TQT_SLOT( slotEncoding(const TQString&) ) );
+ connect( m_pEncoding, TQT_SIGNAL( activated(const TQString& ) ),
+ TQT_SLOT( changed() ) );
++r; lay->setRowStretch(r, 8);
- QFontDatabase db;
+ TQFontDatabase db;
m_families = db.families();
@@ -268,47 +268,47 @@ void KAppearanceOptions::slotMinimumFontSize( int i )
}
-void KAppearanceOptions::slotStandardFont(const QString& n )
+void KAppearanceOptions::slotStandardFont(const TQString& n )
{
fonts[0] = n;
}
-void KAppearanceOptions::slotFixedFont(const QString& n )
+void KAppearanceOptions::slotFixedFont(const TQString& n )
{
fonts[1] = n;
}
-void KAppearanceOptions::slotSerifFont( const QString& n )
+void KAppearanceOptions::slotSerifFont( const TQString& n )
{
fonts[2] = n;
}
-void KAppearanceOptions::slotSansSerifFont( const QString& n )
+void KAppearanceOptions::slotSansSerifFont( const TQString& n )
{
fonts[3] = n;
}
-void KAppearanceOptions::slotCursiveFont( const QString& n )
+void KAppearanceOptions::slotCursiveFont( const TQString& n )
{
fonts[4] = n;
}
-void KAppearanceOptions::slotFantasyFont( const QString& n )
+void KAppearanceOptions::slotFantasyFont( const TQString& n )
{
fonts[5] = n;
}
void KAppearanceOptions::slotFontSizeAdjust( int value )
{
- fonts[6] = QString::number( value );
+ fonts[6] = TQString::number( value );
}
-void KAppearanceOptions::slotEncoding(const QString& n)
+void KAppearanceOptions::slotEncoding(const TQString& n)
{
encodingName = n;
}
@@ -336,23 +336,23 @@ void KAppearanceOptions::load( bool useDefaults )
if (fSize < fMinSize)
fSize = fMinSize;
- defaultFonts = QStringList();
+ defaultFonts = TQStringList();
defaultFonts.append( READ_ENTRY( "StandardFont", KGlobalSettings::generalFont().family() ) );
defaultFonts.append( READ_ENTRY( "FixedFont", KGlobalSettings::fixedFont().family() ) );
defaultFonts.append( READ_ENTRY( "SerifFont", HTML_DEFAULT_VIEW_SERIF_FONT ) );
defaultFonts.append( READ_ENTRY( "SansSerifFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT ) );
defaultFonts.append( READ_ENTRY( "CursiveFont", HTML_DEFAULT_VIEW_CURSIVE_FONT ) );
defaultFonts.append( READ_ENTRY( "FantasyFont", HTML_DEFAULT_VIEW_FANTASY_FONT ) );
- defaultFonts.append( QString("0") ); // default font size adjustment
+ defaultFonts.append( TQString("0") ); // default font size adjustment
if (m_pConfig->hasKey("Fonts"))
fonts = m_pConfig->readListEntry( "Fonts" );
else
fonts = khtmlrc.readListEntry( "Fonts" );
while (fonts.count() < 7)
- fonts.append(QString::null);
+ fonts.append(TQString::null);
- encodingName = READ_ENTRY( "DefaultEncoding", QString::null );
+ encodingName = READ_ENTRY( "DefaultEncoding", TQString::null );
//kdDebug(0) << "encoding = " << encodingName << endl;
updateGUI();
@@ -373,14 +373,14 @@ void KAppearanceOptions::updateGUI()
{
//kdDebug() << "KAppearanceOptions::updateGUI " << charset << endl;
for ( int f = 0; f < 6; f++ ) {
- QString ff = fonts[f];
+ TQString ff = fonts[f];
if (ff.isEmpty())
ff = defaultFonts[f];
m_pFonts[f]->setCurrentFont(ff);
}
int i = 0;
- for ( QStringList::Iterator it = encodings.begin(); it != encodings.end(); ++it, ++i )
+ for ( TQStringList::Iterator it = encodings.begin(); it != encodings.end(); ++it, ++i )
if ( encodingName == *it )
m_pEncoding->setCurrentItem( i );
if(encodingName.isEmpty())
@@ -407,7 +407,7 @@ void KAppearanceOptions::save()
m_pConfig->writeEntry( "DefaultEncoding", encodingName );
m_pConfig->sync();
- QByteArray data;
+ TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
diff --git a/kcontrol/konqhtml/appearance.h b/kcontrol/konqhtml/appearance.h
index dd16626bd..8b01f4055 100644
--- a/kcontrol/konqhtml/appearance.h
+++ b/kcontrol/konqhtml/appearance.h
@@ -11,8 +11,8 @@
#ifndef __APPEARANCE_H__
#define __APPEARANCE_H__
-#include <qwidget.h>
-#include <qmap.h>
+#include <tqwidget.h>
+#include <tqmap.h>
#include <kcmodule.h>
@@ -23,7 +23,7 @@ class KAppearanceOptions : public KCModule
{
Q_OBJECT
public:
- KAppearanceOptions(KConfig *config, QString group, QWidget *parent=0, const char *name=0);
+ KAppearanceOptions(KConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
~KAppearanceOptions();
virtual void load();
@@ -34,13 +34,13 @@ public:
public slots:
void slotFontSize( int );
void slotMinimumFontSize( int );
- void slotStandardFont(const QString& n);
- void slotFixedFont(const QString& n);
- void slotSerifFont( const QString& n );
- void slotSansSerifFont( const QString& n );
- void slotCursiveFont( const QString& n );
- void slotFantasyFont( const QString& n );
- void slotEncoding( const QString& n);
+ void slotStandardFont(const TQString& n);
+ void slotFixedFont(const TQString& n);
+ void slotSerifFont( const TQString& n );
+ void slotSansSerifFont( const TQString& n );
+ void slotCursiveFont( const TQString& n );
+ void slotFantasyFont( const TQString& n );
+ void slotEncoding( const TQString& n);
void slotFontSizeAdjust( int value );
private:
@@ -49,22 +49,22 @@ private:
private:
KConfig *m_pConfig;
- QString m_groupname;
- QStringList m_families;
+ TQString m_groupname;
+ TQStringList m_families;
KIntNumInput* m_minSize;
KIntNumInput* m_MedSize;
KIntNumInput* m_pageDPI;
KFontCombo* m_pFonts[6];
- QComboBox* m_pEncoding;
- QSpinBox *m_pFontSizeAdjust;
+ TQComboBox* m_pEncoding;
+ TQSpinBox *m_pFontSizeAdjust;
int fSize;
int fMinSize;
- QStringList encodings;
- QStringList fonts;
- QStringList defaultFonts;
- QString encodingName;
+ TQStringList encodings;
+ TQStringList fonts;
+ TQStringList defaultFonts;
+ TQString encodingName;
};
#endif // __APPEARANCE_H__
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index a55221f43..29dccb14b 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -19,9 +19,9 @@
*/
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqwhatsthis.h>
#include <kconfig.h>
#include <klistview.h>
@@ -32,13 +32,13 @@
#include "policies.h"
#include "policydlg.h"
-DomainListView::DomainListView(KConfig *config,const QString &title,
- QWidget *parent,const char *name) :
- QGroupBox(title, parent, name), config(config) {
+DomainListView::DomainListView(KConfig *config,const TQString &title,
+ TQWidget *parent,const char *name) :
+ TQGroupBox(title, parent, name), config(config) {
setColumnLayout(0, Qt::Vertical);
layout()->setSpacing(0);
layout()->setMargin(0);
- QGridLayout* thisLayout = new QGridLayout(layout());
+ TQGridLayout* thisLayout = new TQGridLayout(layout());
thisLayout->setAlignment(Qt::AlignTop);
thisLayout->setSpacing(KDialog::spacingHint());
thisLayout->setMargin(KDialog::marginHint());
@@ -46,44 +46,44 @@ DomainListView::DomainListView(KConfig *config,const QString &title,
domainSpecificLV = new KListView(this);
domainSpecificLV->addColumn(i18n("Host/Domain"));
domainSpecificLV->addColumn(i18n("Policy"), 100);
- connect(domainSpecificLV,SIGNAL(doubleClicked(QListViewItem *)), SLOT(changePressed()));
- connect(domainSpecificLV,SIGNAL(returnPressed(QListViewItem *)), SLOT(changePressed()));
- connect(domainSpecificLV, SIGNAL( executed( QListViewItem *)), SLOT( updateButton()));
- connect(domainSpecificLV, SIGNAL(selectionChanged()), SLOT(updateButton()));
+ connect(domainSpecificLV,TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(changePressed()));
+ connect(domainSpecificLV,TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(changePressed()));
+ connect(domainSpecificLV, TQT_SIGNAL( executed( TQListViewItem *)), TQT_SLOT( updateButton()));
+ connect(domainSpecificLV, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButton()));
thisLayout->addMultiCellWidget(domainSpecificLV, 0, 5, 0, 0);
- addDomainPB = new QPushButton(i18n("&New..."), this);
+ addDomainPB = new TQPushButton(i18n("&New..."), this);
thisLayout->addWidget(addDomainPB, 0, 1);
- connect(addDomainPB, SIGNAL(clicked()), SLOT(addPressed()));
+ connect(addDomainPB, TQT_SIGNAL(clicked()), TQT_SLOT(addPressed()));
- changeDomainPB = new QPushButton( i18n("Chan&ge..."), this);
+ changeDomainPB = new TQPushButton( i18n("Chan&ge..."), this);
thisLayout->addWidget(changeDomainPB, 1, 1);
- connect(changeDomainPB, SIGNAL(clicked()), this, SLOT(changePressed()));
+ connect(changeDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(changePressed()));
- deleteDomainPB = new QPushButton(i18n("De&lete"), this);
+ deleteDomainPB = new TQPushButton(i18n("De&lete"), this);
thisLayout->addWidget(deleteDomainPB, 2, 1);
- connect(deleteDomainPB, SIGNAL(clicked()), this, SLOT(deletePressed()));
+ connect(deleteDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(deletePressed()));
- importDomainPB = new QPushButton(i18n("&Import..."), this);
+ importDomainPB = new TQPushButton(i18n("&Import..."), this);
thisLayout->addWidget(importDomainPB, 3, 1);
- connect(importDomainPB, SIGNAL(clicked()), this, SLOT(importPressed()));
+ connect(importDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(importPressed()));
importDomainPB->setEnabled(false);
importDomainPB->hide();
- exportDomainPB = new QPushButton(i18n("&Export..."), this);
+ exportDomainPB = new TQPushButton(i18n("&Export..."), this);
thisLayout->addWidget(exportDomainPB, 4, 1);
- connect(exportDomainPB, SIGNAL(clicked()), this, SLOT(exportPressed()));
+ connect(exportDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(exportPressed()));
exportDomainPB->setEnabled(false);
exportDomainPB->hide();
- QSpacerItem* spacer = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding);
+ TQSpacerItem* spacer = new TQSpacerItem(20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding);
thisLayout->addItem(spacer, 5, 1);
- QWhatsThis::add( addDomainPB, i18n("Click on this button to manually add a host or domain "
+ TQWhatsThis::add( addDomainPB, i18n("Click on this button to manually add a host or domain "
"specific policy.") );
- QWhatsThis::add( changeDomainPB, i18n("Click on this button to change the policy for the "
+ TQWhatsThis::add( changeDomainPB, i18n("Click on this button to change the policy for the "
"host or domain selected in the list box.") );
- QWhatsThis::add( deleteDomainPB, i18n("Click on this button to delete the policy for the "
+ TQWhatsThis::add( deleteDomainPB, i18n("Click on this button to delete the policy for the "
"host or domain selected in the list box.") );
updateButton();
}
@@ -98,7 +98,7 @@ DomainListView::~DomainListView() {
void DomainListView::updateButton()
{
- QListViewItem *index = domainSpecificLV->currentItem();
+ TQListViewItem *index = domainSpecificLV->currentItem();
bool enable = ( index != 0 );
changeDomainPB->setEnabled( enable );
deleteDomainPB->setEnabled( enable );
@@ -113,7 +113,7 @@ void DomainListView::addPressed()
PolicyDialog pDlg(pol, this);
setupPolicyDlg(AddButton,pDlg,pol);
if( pDlg.exec() ) {
- QListViewItem* index = new QListViewItem( domainSpecificLV, pDlg.domain(),
+ TQListViewItem* index = new TQListViewItem( domainSpecificLV, pDlg.domain(),
pDlg.featureEnabledPolicyText() );
pol->setDomain(pDlg.domain());
domainPolicies.insert(index, pol);
@@ -127,7 +127,7 @@ void DomainListView::addPressed()
void DomainListView::changePressed()
{
- QListViewItem *index = domainSpecificLV->currentItem();
+ TQListViewItem *index = domainSpecificLV->currentItem();
if ( index == 0 )
{
KMessageBox::information( 0, i18n("You must first select a policy to be changed." ) );
@@ -156,7 +156,7 @@ void DomainListView::changePressed()
void DomainListView::deletePressed()
{
- QListViewItem *index = domainSpecificLV->currentItem();
+ TQListViewItem *index = domainSpecificLV->currentItem();
if ( index == 0 )
{
KMessageBox::information( 0, i18n("You must first select a policy to delete." ) );
@@ -183,37 +183,37 @@ void DomainListView::exportPressed()
// PENDING(kalle) Implement this.
}
-void DomainListView::initialize(const QStringList &domainList)
+void DomainListView::initialize(const TQStringList &domainList)
{
domainSpecificLV->clear();
domainPolicies.clear();
// JavaPolicies pol(m_pConfig,m_groupname,false);
- for (QStringList::ConstIterator it = domainList.begin();
+ for (TQStringList::ConstIterator it = domainList.begin();
it != domainList.end(); ++it) {
- QString domain = *it;
+ TQString domain = *it;
Policies *pol = createPolicies();
pol->setDomain(domain);
pol->load();
- QString policy;
+ TQString policy;
if (pol->isFeatureEnabledPolicyInherited())
policy = i18n("Use Global");
else if (pol->isFeatureEnabled())
policy = i18n("Accept");
else
policy = i18n("Reject");
- QListViewItem *index =
- new QListViewItem( domainSpecificLV, domain, policy );
+ TQListViewItem *index =
+ new TQListViewItem( domainSpecificLV, domain, policy );
domainPolicies[index] = pol;
}
}
-void DomainListView::save(const QString &group, const QString &domainListKey) {
- QStringList domainList;
+void DomainListView::save(const TQString &group, const TQString &domainListKey) {
+ TQStringList domainList;
DomainPolicyMap::Iterator it = domainPolicies.begin();
for (; it != domainPolicies.end(); ++it) {
- QListViewItem *current = it.key();
+ TQListViewItem *current = it.key();
Policies *pol = it.data();
pol->save();
domainList.append(current->text(0));
diff --git a/kcontrol/konqhtml/domainlistview.h b/kcontrol/konqhtml/domainlistview.h
index 3fb3f102e..b0f5ab2fb 100644
--- a/kcontrol/konqhtml/domainlistview.h
+++ b/kcontrol/konqhtml/domainlistview.h
@@ -22,8 +22,8 @@
#ifndef __DOMAINLISTVIEW_H__
#define __DOMAINLISTVIEW_H__
-#include <qgroupbox.h>
-#include <qmap.h>
+#include <tqgroupbox.h>
+#include <tqmap.h>
class QListViewItem;
class QPushButton;
@@ -51,7 +51,7 @@ class PolicyDialog;
*
* @author Leo Savernik
*/
-class DomainListView : public QGroupBox {
+class DomainListView : public TQGroupBox {
Q_OBJECT
public:
/** Enumerates the available buttons.
@@ -67,7 +67,7 @@ public:
* @param parent parent widget
* @param name internal name for debugging
*/
- DomainListView(KConfig *config,const QString &title,QWidget *parent,
+ DomainListView(KConfig *config,const TQString &title,TQWidget *parent,
const char *name = 0);
virtual ~DomainListView();
@@ -87,31 +87,31 @@ public:
*
* Note: The add button already contains a default "what's this" text.
*/
- QPushButton *addButton() const { return addDomainPB; }
+ TQPushButton *addButton() const { return addDomainPB; }
/**
* returns the change push-button.
*
* Note: The change button already contains a default "what's this" text.
*/
- QPushButton *changeButton() const { return changeDomainPB; }
+ TQPushButton *changeButton() const { return changeDomainPB; }
/**
* returns the delete push-button.
*
* Note: The delete button already contains a default "what's this" text.
*/
- QPushButton *deleteButton() const { return deleteDomainPB; }
+ TQPushButton *deleteButton() const { return deleteDomainPB; }
/**
* returns the import push-button.
*/
- QPushButton *importButton() const { return importDomainPB; }
+ TQPushButton *importButton() const { return importDomainPB; }
/**
* returns the export push-button.
*/
- QPushButton *exportButton() const { return exportDomainPB; }
+ TQPushButton *exportButton() const { return exportDomainPB; }
/**
* Initializes the list view with the given list of domains as well
@@ -121,7 +121,7 @@ public:
*
* @param domainList given list of domains
*/
- void initialize(const QStringList &domainList);
+ void initialize(const TQStringList &domainList);
/**
* saves the current state of all domains to the configuration object.
@@ -129,7 +129,7 @@ public:
* @param domainListKey the name of the key which the list of domains
* is stored under.
*/
- void save(const QString &group, const QString &domainListKey);
+ void save(const TQString &group, const TQString &domainListKey);
signals:
@@ -195,13 +195,13 @@ protected:
KListView *domainSpecificLV;
- QPushButton* addDomainPB;
- QPushButton* changeDomainPB;
- QPushButton* deleteDomainPB;
- QPushButton* importDomainPB;
- QPushButton* exportDomainPB;
+ TQPushButton* addDomainPB;
+ TQPushButton* changeDomainPB;
+ TQPushButton* deleteDomainPB;
+ TQPushButton* importDomainPB;
+ TQPushButton* exportDomainPB;
- typedef QMap<QListViewItem*, Policies *> DomainPolicyMap;
+ typedef TQMap<TQListViewItem*, Policies *> DomainPolicyMap;
DomainPolicyMap domainPolicies;
};
diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp
index a1a68b63e..79ab4d45a 100644
--- a/kcontrol/konqhtml/filteropts.cpp
+++ b/kcontrol/konqhtml/filteropts.cpp
@@ -23,23 +23,23 @@
#include <kfiledialog.h>
#include <dcopclient.h>
-#include <qlayout.h>
-#include <qlistbox.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
-#include <qhbox.h>
-#include <qvbox.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qcheckbox.h>
-#include <qwhatsthis.h>
-#include <qregexp.h>
+#include <tqlayout.h>
+#include <tqlistbox.h>
+#include <tqpushbutton.h>
+#include <tqgroupbox.h>
+#include <tqhbox.h>
+#include <tqvbox.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqcheckbox.h>
+#include <tqwhatsthis.h>
+#include <tqregexp.h>
#include "filteropts.h"
#include "filteropts.moc"
-KCMFilter::KCMFilter(KConfig *config, QString group,
- QWidget *parent, const char * )
+KCMFilter::KCMFilter(KConfig *config, TQString group,
+ TQWidget *parent, const char * )
: KCModule( parent, "kcmkonqhtml" ),
mConfig( config ),
mGroupname( group ),
@@ -47,53 +47,53 @@ KCMFilter::KCMFilter(KConfig *config, QString group,
{
setButtons(Default|Apply);
- QVBoxLayout *topLayout = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
- mEnableCheck = new QCheckBox(i18n("Enable filters"), this);
+ mEnableCheck = new TQCheckBox(i18n("Enable filters"), this);
topLayout->addWidget( mEnableCheck );
- mKillCheck = new QCheckBox(i18n("Hide filtered images"), this);
+ mKillCheck = new TQCheckBox(i18n("Hide filtered images"), this);
topLayout->addWidget( mKillCheck );
- QGroupBox *topBox = new QGroupBox( 1, Horizontal, i18n("URL Expressions to Filter"), this );
+ TQGroupBox *topBox = new TQGroupBox( 1, Horizontal, i18n("URL Expressions to Filter"), this );
topLayout->addWidget( topBox );
- mListBox = new QListBox( topBox );
- mListBox->setSelectionMode(QListBox::Extended);
- new QLabel( i18n("Expression (e.g. http://www.site.com/ad/*):"), topBox);
- mString = new QLineEdit( topBox );
+ mListBox = new TQListBox( topBox );
+ mListBox->setSelectionMode(TQListBox::Extended);
+ new TQLabel( i18n("Expression (e.g. http://www.site.com/ad/*):"), topBox);
+ mString = new TQLineEdit( topBox );
- QHBox *buttonBox = new QHBox( topBox );
+ TQHBox *buttonBox = new TQHBox( topBox );
buttonBox->setSpacing( KDialog::spacingHint() );
- mInsertButton = new QPushButton( i18n("Insert"), buttonBox );
- connect( mInsertButton, SIGNAL( clicked() ), SLOT( insertFilter() ) );
- mUpdateButton = new QPushButton( i18n("Update"), buttonBox );
- connect( mUpdateButton, SIGNAL( clicked() ), SLOT( updateFilter() ) );
- mRemoveButton = new QPushButton( i18n("Remove"), buttonBox );
- connect( mRemoveButton, SIGNAL( clicked() ), SLOT( removeFilter() ) );
+ mInsertButton = new TQPushButton( i18n("Insert"), buttonBox );
+ connect( mInsertButton, TQT_SIGNAL( clicked() ), TQT_SLOT( insertFilter() ) );
+ mUpdateButton = new TQPushButton( i18n("Update"), buttonBox );
+ connect( mUpdateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateFilter() ) );
+ mRemoveButton = new TQPushButton( i18n("Remove"), buttonBox );
+ connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeFilter() ) );
- mImportButton = new QPushButton(i18n("Import..."),buttonBox);
- connect( mImportButton, SIGNAL( clicked() ), SLOT( importFilters() ) );
- mExportButton = new QPushButton(i18n("Export..."),buttonBox);
- connect( mExportButton, SIGNAL( clicked() ), SLOT( exportFilters() ) );
+ mImportButton = new TQPushButton(i18n("Import..."),buttonBox);
+ connect( mImportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( importFilters() ) );
+ mExportButton = new TQPushButton(i18n("Export..."),buttonBox);
+ connect( mExportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( exportFilters() ) );
- connect( mEnableCheck, SIGNAL( clicked()), this, SLOT( slotEnableChecked()));
- connect( mKillCheck, SIGNAL( clicked()), this, SLOT( slotKillChecked()));
- connect( mListBox, SIGNAL( selectionChanged ()),this, SLOT( slotItemSelected()));
+ connect( mEnableCheck, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotEnableChecked()));
+ connect( mKillCheck, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotKillChecked()));
+ connect( mListBox, TQT_SIGNAL( selectionChanged ()),this, TQT_SLOT( slotItemSelected()));
/*
* Whats this items
*/
- QWhatsThis::add( mEnableCheck, i18n("Enable or disable AdBlocK filters. When enabled a set of expressions "
+ TQWhatsThis::add( mEnableCheck, i18n("Enable or disable AdBlocK filters. When enabled a set of expressions "
"to be blocked should be defined in the filter list for blocking to "
"take effect."));
- QWhatsThis::add( mKillCheck, i18n("When enabled blocked images will be removed from the page completely "
+ TQWhatsThis::add( mKillCheck, i18n("When enabled blocked images will be removed from the page completely "
"otherwise a placeholder 'blocked' image will be used."));
- QWhatsThis::add( mListBox, i18n("This is the list of URL filters that will be applied to all linked "
+ TQWhatsThis::add( mListBox, i18n("This is the list of URL filters that will be applied to all linked "
"images and frames. The filters are processed in order so place "
"more generic filters towards the top of the list."));
- QWhatsThis::add( mString, i18n("Enter an expression to filter. Expressions can be defined as either "
+ TQWhatsThis::add( mString, i18n("Enter an expression to filter. Expressions can be defined as either "
"a filename style wildcard e.g. http://www.site.com/ads* or as a full "
"regular expression by surrounding the string with '/' e.g. "
" //(ad|banner)\\./"));
@@ -154,15 +154,15 @@ void KCMFilter::updateButton()
void KCMFilter::importFilters()
{
- QString inFile = KFileDialog::getOpenFileName();
+ TQString inFile = KFileDialog::getOpenFileName();
if (inFile.length() > 0)
{
- QFile f(inFile);
+ TQFile f(inFile);
if ( f.open( IO_ReadOnly ) )
{
- QTextStream ts( &f );
- QStringList paths;
- QString line;
+ TQTextStream ts( &f );
+ TQStringList paths;
+ TQString line;
while (!ts.atEnd())
{
line = ts.readLine();
@@ -175,14 +175,14 @@ void KCMFilter::importFilters()
{
if (line.length()>2 && line[0]=='/' && line[line.length()-1] == '/')
{
- QString inside = line.mid(1, line.length()-2);
- QRegExp rx(inside);
+ TQString inside = line.mid(1, line.length()-2);
+ TQRegExp rx(inside);
if (!rx.isValid())
continue;
}
else
{
- QRegExp rx(line);
+ TQRegExp rx(line);
rx.setWildcard(true);
if (!rx.isValid())
continue;
@@ -202,14 +202,14 @@ void KCMFilter::importFilters()
void KCMFilter::exportFilters()
{
- QString outFile = KFileDialog::getSaveFileName();
+ TQString outFile = KFileDialog::getSaveFileName();
if (outFile.length() > 0)
{
- QFile f(outFile);
+ TQFile f(outFile);
if ( f.open( IO_WriteOnly ) )
{
- QTextStream ts( &f );
- ts.setEncoding( QTextStream::UnicodeUTF8 );
+ TQTextStream ts( &f );
+ ts.setEncoding( TQTextStream::UnicodeUTF8 );
ts << "[AdBlock]" << endl;
uint i;
@@ -237,13 +237,13 @@ void KCMFilter::save()
uint i;
for( i = 0; i < mListBox->count(); ++i )
{
- QString key = "Filter-" + QString::number(i);
+ TQString key = "Filter-" + TQString::number(i);
mConfig->writeEntry(key, mListBox->text(i));
}
mConfig->writeEntry("Count",mListBox->count());
mConfig->sync();
- DCOPClient::mainClient()->send("konqueror*","KonquerorIface","reparseConfiguration()",QByteArray());
+ DCOPClient::mainClient()->send("konqueror*","KonquerorIface","reparseConfiguration()",TQByteArray());
}
void KCMFilter::load()
@@ -253,7 +253,7 @@ void KCMFilter::load()
void KCMFilter::load( bool useDefaults )
{
- QStringList paths;
+ TQStringList paths;
mConfig->setReadDefaults( useDefaults );
@@ -261,12 +261,12 @@ void KCMFilter::load( bool useDefaults )
mEnableCheck->setChecked( mConfig->readBoolEntry("Enabled",false));
mKillCheck->setChecked( mConfig->readBoolEntry("Shrink",false));
- QMap<QString,QString> entryMap = mConfig->entryMap( mGroupname );
- QMap<QString,QString>::ConstIterator it;
+ TQMap<TQString,TQString> entryMap = mConfig->entryMap( mGroupname );
+ TQMap<TQString,TQString>::ConstIterator it;
int num = mConfig->readNumEntry("Count",0);
for (int i=0; i<num; ++i)
{
- QString key = "Filter-" + QString::number(i);
+ TQString key = "Filter-" + TQString::number(i);
it = entryMap.find(key);
if (it != entryMap.end())
paths.append(it.data());
@@ -319,7 +319,7 @@ void KCMFilter::updateFilter()
updateButton();
}
-QString KCMFilter::quickHelp() const
+TQString KCMFilter::quickHelp() const
{
return i18n("<h1>Konqueror AdBlocK</h1> Konqueror AdBlocK allows you to create a list of filters"
" that are checked against linked images and frames. URL's that match are either discarded or"
diff --git a/kcontrol/konqhtml/filteropts.h b/kcontrol/konqhtml/filteropts.h
index 28fcaa652..6957bedc4 100644
--- a/kcontrol/konqhtml/filteropts.h
+++ b/kcontrol/konqhtml/filteropts.h
@@ -32,14 +32,14 @@ class KCMFilter : public KCModule
{
Q_OBJECT
public:
- KCMFilter( KConfig* config, QString group, QWidget* parent = 0, const char* name = 0 );
+ KCMFilter( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
~KCMFilter();
void load();
void load( bool useDefaults );
void save();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
public slots:
@@ -56,18 +56,18 @@ protected slots:
private:
void updateButton();
- QListBox *mListBox;
- QLineEdit *mString;
- QCheckBox *mEnableCheck;
- QCheckBox *mKillCheck;
- QPushButton *mInsertButton;
- QPushButton *mUpdateButton;
- QPushButton *mRemoveButton;
- QPushButton *mImportButton;
- QPushButton *mExportButton;
+ TQListBox *mListBox;
+ TQLineEdit *mString;
+ TQCheckBox *mEnableCheck;
+ TQCheckBox *mKillCheck;
+ TQPushButton *mInsertButton;
+ TQPushButton *mUpdateButton;
+ TQPushButton *mRemoveButton;
+ TQPushButton *mImportButton;
+ TQPushButton *mExportButton;
KConfig *mConfig;
- QString mGroupname;
+ TQString mGroupname;
int mSelCount;
};
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index 44738e293..3cca58732 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -5,11 +5,11 @@
// (c) David Faure 1998
// (c) 2001 Waldo Bastian <bastian@kde.org>
-#include <qlayout.h>//CT - 12Nov1998
-#include <qwhatsthis.h>
-#include <qvgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
+#include <tqlayout.h>//CT - 12Nov1998
+#include <tqwhatsthis.h>
+#include <tqvgroupbox.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
#include "htmlopts.h"
#include "advancedTabDialog.h"
@@ -31,11 +31,11 @@ enum UnderlineLinkType { UnderlineAlways=0, UnderlineNever=1, UnderlineHover=2 }
enum AnimationsType { AnimationsAlways=0, AnimationsNever=1, AnimationsLoopOnce=2 };
//-----------------------------------------------------------------------------
-KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, QWidget *parent, const char *)
+KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *parent, const char *)
: KCModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group)
{
int row = 0;
- QGridLayout *lay = new QGridLayout(this, 10, 2, 0, KDialog::spacingHint());
+ TQGridLayout *lay = new TQGridLayout(this, 10, 2, 0, KDialog::spacingHint());
// Bookmarks
setQuickHelp( i18n("<h1>Konqueror Browser</h1> Here you can configure Konqueror's browser "
@@ -46,105 +46,105 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, QWidget *pare
"the web pages it loads. It is usually not necessary to "
"change anything here."));
- QVGroupBox *bgBookmarks = new QVGroupBox( i18n("Boo&kmarks"), this );
- m_pAdvancedAddBookmarkCheckBox = new QCheckBox(i18n( "Ask for name and folder when adding bookmarks" ), bgBookmarks);
- QWhatsThis::add( m_pAdvancedAddBookmarkCheckBox, i18n( "If this box is checked, Konqueror will allow you to"
+ TQVGroupBox *bgBookmarks = new TQVGroupBox( i18n("Boo&kmarks"), this );
+ m_pAdvancedAddBookmarkCheckBox = new TQCheckBox(i18n( "Ask for name and folder when adding bookmarks" ), bgBookmarks);
+ TQWhatsThis::add( m_pAdvancedAddBookmarkCheckBox, i18n( "If this box is checked, Konqueror will allow you to"
" change the title of the bookmark and choose a folder in which to store it when you add a new bookmark." ) );
- connect(m_pAdvancedAddBookmarkCheckBox, SIGNAL(clicked()), SLOT(slotChanged()));
+ connect(m_pAdvancedAddBookmarkCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
- m_pOnlyMarkedBookmarksCheckBox = new QCheckBox(i18n( "Show only marked bookmarks in bookmark toolbar" ), bgBookmarks);
- QWhatsThis::add( m_pOnlyMarkedBookmarksCheckBox, i18n( "If this box is checked, Konqueror will show only those"
+ m_pOnlyMarkedBookmarksCheckBox = new TQCheckBox(i18n( "Show only marked bookmarks in bookmark toolbar" ), bgBookmarks);
+ TQWhatsThis::add( m_pOnlyMarkedBookmarksCheckBox, i18n( "If this box is checked, Konqueror will show only those"
" bookmarks in the bookmark toolbar which you have marked to do so in the bookmark editor." ) );
- connect(m_pOnlyMarkedBookmarksCheckBox, SIGNAL(clicked()), SLOT(slotChanged()));
+ connect(m_pOnlyMarkedBookmarksCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
lay->addMultiCellWidget( bgBookmarks, row, row, 0, 1 );
row++;
// Form completion
- QVGroupBox *bgForm = new QVGroupBox( i18n("Form Com&pletion"), this );
- m_pFormCompletionCheckBox = new QCheckBox(i18n( "Enable completion of &forms" ), bgForm);
- QWhatsThis::add( m_pFormCompletionCheckBox, i18n( "If this box is checked, Konqueror will remember"
+ TQVGroupBox *bgForm = new TQVGroupBox( i18n("Form Com&pletion"), this );
+ m_pFormCompletionCheckBox = new TQCheckBox(i18n( "Enable completion of &forms" ), bgForm);
+ TQWhatsThis::add( m_pFormCompletionCheckBox, i18n( "If this box is checked, Konqueror will remember"
" the data you enter in web forms and suggest it in similar fields for all forms." ) );
- connect(m_pFormCompletionCheckBox, SIGNAL(clicked()), SLOT(slotChanged()));
+ connect(m_pFormCompletionCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
m_pMaxFormCompletionItems = new KIntNumInput( bgForm );
m_pMaxFormCompletionItems->setLabel( i18n( "&Maximum completions:" ) );
m_pMaxFormCompletionItems->setRange( 0, 100 );
- QWhatsThis::add( m_pMaxFormCompletionItems,
+ TQWhatsThis::add( m_pMaxFormCompletionItems,
i18n( "Here you can select how many values Konqueror will remember for a form field." ) );
- connect(m_pMaxFormCompletionItems, SIGNAL(valueChanged(int)), SLOT(slotChanged()));
+ connect(m_pMaxFormCompletionItems, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()));
lay->addMultiCellWidget( bgForm, row, row, 0, 1 );
row++;
// Tabbed Browsing
- QGroupBox *bgTabbedBrowsing = new QGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this );
- QVBoxLayout *laygroup = new QVBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint() );
+ TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this );
+ TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint() );
- m_pShowMMBInTabs = new QCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing );
- QWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, "
+ m_pShowMMBInTabs = new TQCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing );
+ TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, "
"such as choosing a link or a folder with the middle mouse button.") );
- connect(m_pShowMMBInTabs, SIGNAL(clicked()), SLOT(slotChanged()));
+ connect(m_pShowMMBInTabs, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
laygroup->addWidget(m_pShowMMBInTabs);
- m_pDynamicTabbarHide = new QCheckBox( i18n( "Hide the tab bar when only one tab is open" ), bgTabbedBrowsing );
- QWhatsThis::add( m_pDynamicTabbarHide, i18n("This will display the tab bar only if there are two or more tabs. Otherwise it will always be displayed.") );
- connect(m_pDynamicTabbarHide, SIGNAL(clicked()), SLOT(slotChanged()));
+ m_pDynamicTabbarHide = new TQCheckBox( i18n( "Hide the tab bar when only one tab is open" ), bgTabbedBrowsing );
+ TQWhatsThis::add( m_pDynamicTabbarHide, i18n("This will display the tab bar only if there are two or more tabs. Otherwise it will always be displayed.") );
+ connect(m_pDynamicTabbarHide, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
laygroup->addWidget(m_pDynamicTabbarHide);
- QHBoxLayout *laytab = new QHBoxLayout(laygroup, KDialog::spacingHint());
- QPushButton *advancedTabButton = new QPushButton( i18n( "Advanced Options"), bgTabbedBrowsing );
+ TQHBoxLayout *laytab = new TQHBoxLayout(laygroup, KDialog::spacingHint());
+ TQPushButton *advancedTabButton = new TQPushButton( i18n( "Advanced Options"), bgTabbedBrowsing );
laytab->addWidget(advancedTabButton);
laytab->addStretch();
- connect(advancedTabButton, SIGNAL(clicked()), this, SLOT(launchAdvancedTabDialog()));
+ connect(advancedTabButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(launchAdvancedTabDialog()));
lay->addMultiCellWidget( bgTabbedBrowsing, row, row, 0, 1 );
row++;
// Mouse behavior
- QVGroupBox *bgMouse = new QVGroupBox( i18n("Mouse Beha&vior"), this );
+ TQVGroupBox *bgMouse = new TQVGroupBox( i18n("Mouse Beha&vior"), this );
- m_cbCursor = new QCheckBox(i18n("Chan&ge cursor over links"), bgMouse );
- QWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change "
+ m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse );
+ TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change "
"(usually to a hand) if it is moved over a hyperlink.") );
- connect(m_cbCursor, SIGNAL(clicked()), SLOT(slotChanged()));
+ connect(m_cbCursor, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
- m_pOpenMiddleClick = new QCheckBox( i18n ("M&iddle click opens URL in selection" ), bgMouse );
- QWhatsThis::add( m_pOpenMiddleClick, i18n (
+ m_pOpenMiddleClick = new TQCheckBox( i18n ("M&iddle click opens URL in selection" ), bgMouse );
+ TQWhatsThis::add( m_pOpenMiddleClick, i18n (
"If this box is checked, you can open the URL in the selection by middle clicking on a "
"Konqueror view." ) );
- connect(m_pOpenMiddleClick, SIGNAL(clicked()), SLOT(slotChanged()));
+ connect(m_pOpenMiddleClick, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
- m_pBackRightClick = new QCheckBox( i18n( "Right click goes &back in history" ), bgMouse );
- QWhatsThis::add( m_pBackRightClick, i18n(
+ m_pBackRightClick = new TQCheckBox( i18n( "Right click goes &back in history" ), bgMouse );
+ TQWhatsThis::add( m_pBackRightClick, i18n(
"If this box is checked, you can go back in history by right clicking on a Konqueror view. "
"To access the context menu, press the right mouse button and move." ) );
- connect(m_pBackRightClick, SIGNAL(clicked()), SLOT(slotChanged()));
+ connect(m_pBackRightClick, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
lay->addMultiCellWidget( bgMouse, row, row, 0, 1 );
row++;
// Misc
- m_pAutoLoadImagesCheckBox = new QCheckBox( i18n( "A&utomatically load images"), this );
- QWhatsThis::add( m_pAutoLoadImagesCheckBox, i18n( "If this box is checked, Konqueror will automatically load any images that are embedded in a web page. Otherwise, it will display placeholders for the images, and you can then manually load the images by clicking on the image button.<br>Unless you have a very slow network connection, you will probably want to check this box to enhance your browsing experience." ) );
- connect(m_pAutoLoadImagesCheckBox, SIGNAL(clicked()), SLOT(slotChanged()));
+ m_pAutoLoadImagesCheckBox = new TQCheckBox( i18n( "A&utomatically load images"), this );
+ TQWhatsThis::add( m_pAutoLoadImagesCheckBox, i18n( "If this box is checked, Konqueror will automatically load any images that are embedded in a web page. Otherwise, it will display placeholders for the images, and you can then manually load the images by clicking on the image button.<br>Unless you have a very slow network connection, you will probably want to check this box to enhance your browsing experience." ) );
+ connect(m_pAutoLoadImagesCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
lay->addMultiCellWidget( m_pAutoLoadImagesCheckBox, row, row, 0, 1 );
row++;
- m_pUnfinishedImageFrameCheckBox = new QCheckBox( i18n( "Dra&w frame around not completely loaded images"), this );
- QWhatsThis::add( m_pUnfinishedImageFrameCheckBox, i18n( "If this box is checked, Konqueror will draw a frame as placeholder around not yet fully loaded images that are embedded in a web page.<br>Especially if you have a slow network connection, you will probably want to check this box to enhance your browsing experience." ) );
- connect(m_pUnfinishedImageFrameCheckBox, SIGNAL(clicked()), SLOT(slotChanged()));
+ m_pUnfinishedImageFrameCheckBox = new TQCheckBox( i18n( "Dra&w frame around not completely loaded images"), this );
+ TQWhatsThis::add( m_pUnfinishedImageFrameCheckBox, i18n( "If this box is checked, Konqueror will draw a frame as placeholder around not yet fully loaded images that are embedded in a web page.<br>Especially if you have a slow network connection, you will probably want to check this box to enhance your browsing experience." ) );
+ connect(m_pUnfinishedImageFrameCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
lay->addMultiCellWidget( m_pUnfinishedImageFrameCheckBox, row, row, 0, 1 );
row++;
- m_pAutoRedirectCheckBox = new QCheckBox( i18n( "Allow automatic delayed &reloading/redirecting"), this );
- QWhatsThis::add( m_pAutoRedirectCheckBox,
+ m_pAutoRedirectCheckBox = new TQCheckBox( i18n( "Allow automatic delayed &reloading/redirecting"), this );
+ TQWhatsThis::add( m_pAutoRedirectCheckBox,
i18n( "Some web pages request an automatic reload or redirection after a certain period of time. By unchecking this box Konqueror will ignore these requests." ) );
- connect(m_pAutoRedirectCheckBox, SIGNAL(clicked()), SLOT(slotChanged()));
+ connect(m_pAutoRedirectCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
lay->addMultiCellWidget( m_pAutoRedirectCheckBox, row, row, 0, 1 );
row++;
@@ -155,8 +155,8 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, QWidget *pare
lay->addMultiCellWidget(sep, row, row, 0, 1);
row++;
- QLabel *label = new QLabel( i18n("Und&erline links:"), this);
- m_pUnderlineCombo = new QComboBox( false, this );
+ TQLabel *label = new TQLabel( i18n("Und&erline links:"), this);
+ m_pUnderlineCombo = new TQComboBox( false, this );
label->setBuddy(m_pUnderlineCombo);
m_pUnderlineCombo->insertItem(i18n("underline","Enabled"), UnderlineAlways);
m_pUnderlineCombo->insertItem(i18n("underline","Disabled"), UnderlineNever);
@@ -164,19 +164,19 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, QWidget *pare
lay->addWidget(label, row, 0);
lay->addWidget(m_pUnderlineCombo, row, 1);
row++;
- QString whatsThis = i18n("Controls how Konqueror handles underlining hyperlinks:<br>"
+ TQString whatsThis = i18n("Controls how Konqueror handles underlining hyperlinks:<br>"
"<ul><li><b>Enabled</b>: Always underline links</li>"
"<li><b>Disabled</b>: Never underline links</li>"
"<li><b>Only on Hover</b>: Underline when the mouse is moved over the link</li>"
"</ul><br><i>Note: The site's CSS definitions can override this value</i>");
- QWhatsThis::add( label, whatsThis);
- QWhatsThis::add( m_pUnderlineCombo, whatsThis);
- connect(m_pUnderlineCombo, SIGNAL(activated(int)), SLOT(slotChanged()));
+ TQWhatsThis::add( label, whatsThis);
+ TQWhatsThis::add( m_pUnderlineCombo, whatsThis);
+ connect(m_pUnderlineCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
- label = new QLabel( i18n("A&nimations:"), this);
- m_pAnimationsCombo = new QComboBox( false, this );
+ label = new TQLabel( i18n("A&nimations:"), this);
+ m_pAnimationsCombo = new TQComboBox( false, this );
label->setBuddy(m_pAnimationsCombo);
m_pAnimationsCombo->insertItem(i18n("animations","Enabled"), AnimationsAlways);
m_pAnimationsCombo->insertItem(i18n("animations","Disabled"), AnimationsNever);
@@ -188,9 +188,9 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, QWidget *pare
"<ul><li><b>Enabled</b>: Show all animations completely.</li>"
"<li><b>Disabled</b>: Never show animations, show the start image only.</li>"
"<li><b>Show only once</b>: Show all animations completely but do not repeat them.</li>");
- QWhatsThis::add( label, whatsThis);
- QWhatsThis::add( m_pAnimationsCombo, whatsThis);
- connect(m_pAnimationsCombo, SIGNAL(activated(int)), SLOT(slotChanged()));
+ TQWhatsThis::add( label, whatsThis);
+ TQWhatsThis::add( m_pAnimationsCombo, whatsThis);
+ connect(m_pAnimationsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
lay->setRowStretch(row, 1);
@@ -229,7 +229,7 @@ void KMiscHTMLOptions::load( bool useDefaults )
bool hoverLinks = READ_BOOL("HoverLinks", true);
bool bAutoLoadImages = READ_BOOL( "AutoLoadImages", true );
bool bUnfinishedImageFrame = READ_BOOL( "UnfinishedImageFrame", true );
- QString strAnimations = READ_ENTRY( "ShowAnimations" ).lower();
+ TQString strAnimations = READ_ENTRY( "ShowAnimations" ).lower();
bool bAutoRedirect = m_pConfig->readBoolEntry( "AutoDelayedActions", true );
@@ -340,7 +340,7 @@ void KMiscHTMLOptions::save()
config.writeEntry("FilteredToolbar", m_pOnlyMarkedBookmarksCheckBox->isChecked());
config.sync();
- QByteArray data;
+ TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h
index 15f5a2511..823e245c9 100644
--- a/kcontrol/konqhtml/htmlopts.h
+++ b/kcontrol/konqhtml/htmlopts.h
@@ -8,10 +8,10 @@
#ifndef __KMISCHTML_OPTIONS_H
#define __KMISCHTML_OPTIONS_H
-#include <qstrlist.h>
-#include <qcheckbox.h>
-#include <qlineedit.h>
-#include <qcombobox.h>
+#include <tqstrlist.h>
+#include <tqcheckbox.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
//-----------------------------------------------------------------------------
@@ -23,7 +23,7 @@
// ... there is room for others :))
-#include <qstring.h>
+#include <tqstring.h>
#include <kconfig.h>
#include <kcmodule.h>
class QRadioButton;
@@ -34,7 +34,7 @@ class KMiscHTMLOptions : public KCModule
Q_OBJECT
public:
- KMiscHTMLOptions(KConfig *config, QString group, QWidget *parent = 0L, const char *name = 0L );
+ KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L );
~KMiscHTMLOptions();
virtual void load();
virtual void load( bool useDefaults );
@@ -47,21 +47,21 @@ private slots:
private:
KConfig* m_pConfig;
- QString m_groupname;
+ TQString m_groupname;
- QComboBox* m_pUnderlineCombo;
- QComboBox* m_pAnimationsCombo;
- QCheckBox* m_cbCursor;
- QCheckBox* m_pAutoLoadImagesCheckBox;
- QCheckBox* m_pUnfinishedImageFrameCheckBox;
- QCheckBox* m_pAutoRedirectCheckBox;
- QCheckBox* m_pOpenMiddleClick;
- QCheckBox* m_pBackRightClick;
- QCheckBox* m_pShowMMBInTabs;
- QCheckBox* m_pFormCompletionCheckBox;
- QCheckBox* m_pDynamicTabbarHide;
- QCheckBox* m_pAdvancedAddBookmarkCheckBox;
- QCheckBox* m_pOnlyMarkedBookmarksCheckBox;
+ TQComboBox* m_pUnderlineCombo;
+ TQComboBox* m_pAnimationsCombo;
+ TQCheckBox* m_cbCursor;
+ TQCheckBox* m_pAutoLoadImagesCheckBox;
+ TQCheckBox* m_pUnfinishedImageFrameCheckBox;
+ TQCheckBox* m_pAutoRedirectCheckBox;
+ TQCheckBox* m_pOpenMiddleClick;
+ TQCheckBox* m_pBackRightClick;
+ TQCheckBox* m_pShowMMBInTabs;
+ TQCheckBox* m_pFormCompletionCheckBox;
+ TQCheckBox* m_pDynamicTabbarHide;
+ TQCheckBox* m_pAdvancedAddBookmarkCheckBox;
+ TQCheckBox* m_pOnlyMarkedBookmarksCheckBox;
KIntNumInput* m_pMaxFormCompletionItems;
};
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp
index 3cb538a9f..af168ed1f 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -20,10 +20,10 @@
#include <khtml_settings.h>
#include <knuminput.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qvgroupbox.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
+#include <tqvgroupbox.h>
+#include <tqlabel.h>
#include "htmlopts.h"
#include "policydlg.h"
@@ -31,13 +31,13 @@
// == class JavaPolicies =====
-JavaPolicies::JavaPolicies(KConfig* config, const QString &group, bool global,
- const QString &domain) :
+JavaPolicies::JavaPolicies(KConfig* config, const TQString &group, bool global,
+ const TQString &domain) :
Policies(config,group,global,domain,"java.","EnableJava") {
}
-JavaPolicies::JavaPolicies() : Policies(0,QString::null,false,
- QString::null,QString::null,QString::null) {
+JavaPolicies::JavaPolicies() : Policies(0,TQString::null,false,
+ TQString::null,TQString::null,TQString::null) {
}
JavaPolicies::~JavaPolicies() {
@@ -45,8 +45,8 @@ JavaPolicies::~JavaPolicies() {
// == class KJavaOptions =====
-KJavaOptions::KJavaOptions( KConfig* config, QString group,
- QWidget *parent, const char *name )
+KJavaOptions::KJavaOptions( KConfig* config, TQString group,
+ TQWidget *parent, const char *name )
: KCModule( parent, name ),
_removeJavaScriptDomainAdvice(false),
m_pConfig( config ),
@@ -54,90 +54,90 @@ KJavaOptions::KJavaOptions( KConfig* config, QString group,
java_global_policies(config,group,true),
_removeJavaDomainSettings(false)
{
- QVBoxLayout* toplevel = new QVBoxLayout( this, 10, 5 );
+ TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10, 5 );
/***************************************************************************
********************* Global Settings *************************************
**************************************************************************/
- QVGroupBox* globalGB = new QVGroupBox( i18n( "Global Settings" ), this );
+ TQVGroupBox* globalGB = new TQVGroupBox( i18n( "Global Settings" ), this );
toplevel->addWidget( globalGB );
- enableJavaGloballyCB = new QCheckBox( i18n( "Enable Ja&va globally" ), globalGB );
- connect( enableJavaGloballyCB, SIGNAL( clicked() ), this, SLOT( slotChanged() ) );
- connect( enableJavaGloballyCB, SIGNAL( clicked() ), this, SLOT( toggleJavaControls() ) );
+ enableJavaGloballyCB = new TQCheckBox( i18n( "Enable Ja&va globally" ), globalGB );
+ connect( enableJavaGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
+ connect( enableJavaGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( toggleJavaControls() ) );
/***************************************************************************
***************** Domain Specific Settings ********************************
**************************************************************************/
domainSpecific = new JavaDomainListView(m_pConfig,m_groupname,this,this);
- connect(domainSpecific,SIGNAL(changed(bool)),SLOT(slotChanged()));
+ connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(slotChanged()));
toplevel->addWidget( domainSpecific, 2 );
/***************************************************************************
***************** Java Runtime Settings ***********************************
**************************************************************************/
- QVGroupBox* javartGB = new QVGroupBox( i18n( "Java Runtime Settings" ), this );
+ TQVGroupBox* javartGB = new TQVGroupBox( i18n( "Java Runtime Settings" ), this );
toplevel->addWidget( javartGB );
- QWidget* checkboxes = new QWidget( javartGB );
- QGridLayout* grid = new QGridLayout( checkboxes, 2, 2 );
+ TQWidget* checkboxes = new TQWidget( javartGB );
+ TQGridLayout* grid = new TQGridLayout( checkboxes, 2, 2 );
- javaSecurityManagerCB = new QCheckBox( i18n("&Use security manager" ), checkboxes );
+ javaSecurityManagerCB = new TQCheckBox( i18n("&Use security manager" ), checkboxes );
grid->addWidget( javaSecurityManagerCB, 0, 0 );
- connect( javaSecurityManagerCB, SIGNAL(toggled( bool )), this, SLOT(slotChanged()) );
+ connect( javaSecurityManagerCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
- useKioCB = new QCheckBox( i18n("Use &KIO"), checkboxes );
+ useKioCB = new TQCheckBox( i18n("Use &KIO"), checkboxes );
grid->addWidget( useKioCB, 0, 1 );
- connect( useKioCB, SIGNAL(toggled( bool )), this, SLOT(slotChanged()) );
+ connect( useKioCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
- enableShutdownCB = new QCheckBox( i18n("Shu&tdown applet server when inactive"), checkboxes );
+ enableShutdownCB = new TQCheckBox( i18n("Shu&tdown applet server when inactive"), checkboxes );
grid->addWidget( enableShutdownCB, 1, 0 );
- connect( enableShutdownCB, SIGNAL(toggled( bool )), this, SLOT(slotChanged()) );
- connect( enableShutdownCB, SIGNAL(clicked()), this, SLOT(toggleJavaControls()) );
+ connect( enableShutdownCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
+ connect( enableShutdownCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleJavaControls()) );
- QHBox* secondsHB = new QHBox( javartGB );
+ TQHBox* secondsHB = new TQHBox( javartGB );
serverTimeoutSB = new KIntNumInput( secondsHB );
serverTimeoutSB->setRange( 0, 1000, 5 );
serverTimeoutSB->setLabel( i18n("App&let server timeout:"), AlignLeft );
serverTimeoutSB->setSuffix(i18n(" sec"));
- connect(serverTimeoutSB, SIGNAL(valueChanged(int)),this,SLOT(slotChanged()));
+ connect(serverTimeoutSB, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChanged()));
- QHBox* pathHB = new QHBox( javartGB );
+ TQHBox* pathHB = new TQHBox( javartGB );
pathHB->setSpacing( 10 );
- QLabel* pathLA = new QLabel( i18n( "&Path to Java executable, or 'java':" ),
+ TQLabel* pathLA = new TQLabel( i18n( "&Path to Java executable, or 'java':" ),
pathHB );
pathED = new KURLRequester( pathHB );
- connect( pathED, SIGNAL(textChanged( const QString& )), this, SLOT(slotChanged()) );
+ connect( pathED, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotChanged()) );
pathLA->setBuddy( pathED );
- QHBox* addArgHB = new QHBox( javartGB );
+ TQHBox* addArgHB = new TQHBox( javartGB );
addArgHB->setSpacing( 10 );
- QLabel* addArgLA = new QLabel( i18n( "Additional Java a&rguments:" ), addArgHB );
- addArgED = new QLineEdit( addArgHB );
- connect( addArgED, SIGNAL(textChanged( const QString& )), this, SLOT(slotChanged()) );
+ TQLabel* addArgLA = new TQLabel( i18n( "Additional Java a&rguments:" ), addArgHB );
+ addArgED = new TQLineEdit( addArgHB );
+ connect( addArgED, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotChanged()) );
addArgLA->setBuddy( addArgED );
/***************************************************************************
********************** WhatsThis? items ***********************************
**************************************************************************/
- QWhatsThis::add( enableJavaGloballyCB, i18n("Enables the execution of scripts written in Java "
+ TQWhatsThis::add( enableJavaGloballyCB, i18n("Enables the execution of scripts written in Java "
"that can be contained in HTML pages. "
"Note that, as with any browser, enabling active contents can be a security problem.") );
- QString wtstr = i18n("This box contains the domains and hosts you have set "
+ TQString wtstr = i18n("This box contains the domains and hosts you have set "
"a specific Java policy for. This policy will be used "
"instead of the default policy for enabling or disabling Java applets on pages sent by these "
"domains or hosts. <p>Select a policy and use the controls on "
"the right to modify it.");
- QWhatsThis::add( domainSpecific->listView(), wtstr );
+ TQWhatsThis::add( domainSpecific->listView(), wtstr );
#if 0
- QWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains "
+ TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains "
"the Java policies. These policies will be merged "
"with the existing ones. Duplicate entries are ignored.") );
- QWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the Java policy to a zipped "
+ TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the Java policy to a zipped "
"file. The file, named <b>java_policy.tgz</b>, will be "
"saved to a location of your choice." ) );
#endif
- QWhatsThis::add( domainSpecific, i18n("Here you can set specific Java policies for any particular "
+ TQWhatsThis::add( domainSpecific, i18n("Here you can set specific Java policies for any particular "
"host or domain. To add a new policy, simply click the <i>New...</i> "
"button and supply the necessary information requested by the "
"dialog box. To change an existing policy, click on the <i>Change...</i> "
@@ -150,7 +150,7 @@ KJavaOptions::KJavaOptions( KConfig* config, QString group,
"you to save and retrieve them from a zipped file.") );
#endif
- QWhatsThis::add( javaSecurityManagerCB, i18n( "Enabling the security manager will cause the jvm to run with a Security "
+ TQWhatsThis::add( javaSecurityManagerCB, i18n( "Enabling the security manager will cause the jvm to run with a Security "
"Manager in place. This will keep applets from being able to read and "
"write to your file system, creating arbitrary sockets, and other actions "
"which could be used to compromise your system. Disable this option at your "
@@ -158,23 +158,23 @@ KJavaOptions::KJavaOptions( KConfig* config, QString group,
"policytool utility to give code downloaded from certain sites more "
"permissions." ) );
- QWhatsThis::add( useKioCB, i18n( "Enabling this will cause the jvm to use KIO for network transport ") );
+ TQWhatsThis::add( useKioCB, i18n( "Enabling this will cause the jvm to use KIO for network transport ") );
- QWhatsThis::add( pathED, i18n("Enter the path to the java executable. If you want to use the jre in "
+ TQWhatsThis::add( pathED, i18n("Enter the path to the java executable. If you want to use the jre in "
"your path, simply leave it as 'java'. If you need to use a different jre, "
"enter the path to the java executable (e.g. /usr/lib/jdk/bin/java), "
"or the path to the directory that contains 'bin/java' (e.g. /opt/IBMJava2-13).") );
- QWhatsThis::add( addArgED, i18n("If you want special arguments to be passed to the virtual machine, enter them here.") );
+ TQWhatsThis::add( addArgED, i18n("If you want special arguments to be passed to the virtual machine, enter them here.") );
- QString shutdown = i18n("When all the applets have been destroyed, the applet server should shut down. "
+ TQString shutdown = i18n("When all the applets have been destroyed, the applet server should shut down. "
"However, starting the jvm takes a lot of time. If you would like to "
"keep the java process running while you are "
"browsing, you can set the timeout value to whatever you like. To keep "
"the java process running for the whole time that the konqueror process is, "
"leave the Shutdown Applet Server checkbox unchecked.");
- QWhatsThis::add( serverTimeoutSB, shutdown);
- QWhatsThis::add( enableShutdownCB, shutdown);
+ TQWhatsThis::add( serverTimeoutSB, shutdown);
+ TQWhatsThis::add( enableShutdownCB, shutdown);
// Finally do the loading
load();
}
@@ -196,9 +196,9 @@ void KJavaOptions::load(bool useDefaults)
bool bServerShutdown = m_pConfig->readBoolEntry( "ShutdownAppletServer", true );
int serverTimeout = m_pConfig->readNumEntry( "AppletServerTimeout", 60 );
#if defined(PATH_JAVA)
- QString sJavaPath = m_pConfig->readPathEntry( "JavaPath", PATH_JAVA );
+ TQString sJavaPath = m_pConfig->readPathEntry( "JavaPath", PATH_JAVA );
#else
- QString sJavaPath = m_pConfig->readPathEntry( "JavaPath", "/usr/bin/java" );
+ TQString sJavaPath = m_pConfig->readPathEntry( "JavaPath", "/usr/bin/java" );
#endif
if( sJavaPath == "/usr/lib/jdk" )
@@ -278,8 +278,8 @@ void KJavaOptions::toggleJavaControls()
// == class JavaDomainListView =====
-JavaDomainListView::JavaDomainListView(KConfig *config,const QString &group,
- KJavaOptions *options,QWidget *parent,const char *name)
+JavaDomainListView::JavaDomainListView(KConfig *config,const TQString &group,
+ KJavaOptions *options,TQWidget *parent,const char *name)
: DomainListView(config,i18n( "Doma&in-Specific" ), parent, name),
group(group), options(options) {
}
@@ -287,20 +287,20 @@ JavaDomainListView::JavaDomainListView(KConfig *config,const QString &group,
JavaDomainListView::~JavaDomainListView() {
}
-void JavaDomainListView::updateDomainListLegacy(const QStringList &domainConfig)
+void JavaDomainListView::updateDomainListLegacy(const TQStringList &domainConfig)
{
domainSpecificLV->clear();
JavaPolicies pol(config,group,false);
pol.defaults();
- for ( QStringList::ConstIterator it = domainConfig.begin();
+ for ( TQStringList::ConstIterator it = domainConfig.begin();
it != domainConfig.end(); ++it)
{
- QString domain;
+ TQString domain;
KHTMLSettings::KJavaScriptAdvice javaAdvice;
KHTMLSettings::KJavaScriptAdvice javaScriptAdvice;
KHTMLSettings::splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
if (javaAdvice != KHTMLSettings::KJavaScriptDunno) {
- QListViewItem* index = new QListViewItem( domainSpecificLV, domain,
+ TQListViewItem* index = new TQListViewItem( domainSpecificLV, domain,
i18n(KHTMLSettings::adviceToStr(javaAdvice)) );
pol.setDomain(domain);
pol.setFeatureEnabled(javaAdvice != KHTMLSettings::KJavaScriptReject);
@@ -311,7 +311,7 @@ void JavaDomainListView::updateDomainListLegacy(const QStringList &domainConfig)
void JavaDomainListView::setupPolicyDlg(PushButton trigger,PolicyDialog &pDlg,
Policies *pol) {
- QString caption;
+ TQString caption;
switch (trigger) {
case AddButton: caption = i18n( "New Java Policy" );
pol->setFeatureEnabled(!options->enableJavaGloballyCB->isChecked());
diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h
index 638b3a921..7e1fd0899 100644
--- a/kcontrol/konqhtml/javaopts.h
+++ b/kcontrol/konqhtml/javaopts.h
@@ -48,10 +48,10 @@ public:
* @param domain name of the domain this instance is used to configure the
* policies for (case insensitive, ignored if global == true)
*/
- JavaPolicies(KConfig* config, const QString &group, bool global,
- const QString &domain = QString::null);
+ JavaPolicies(KConfig* config, const TQString &group, bool global,
+ const TQString &domain = TQString::null);
- /** empty constructur to make QMap happy
+ /** empty constructur to make TQMap happy
* don't use for constructing a policies instance.
* @internal
*/
@@ -65,13 +65,13 @@ public:
class JavaDomainListView : public DomainListView {
Q_OBJECT
public:
- JavaDomainListView(KConfig *config,const QString &group,KJavaOptions *opt,
- QWidget *parent,const char *name = 0);
+ JavaDomainListView(KConfig *config,const TQString &group,KJavaOptions *opt,
+ TQWidget *parent,const char *name = 0);
virtual ~JavaDomainListView();
/** remnant for importing pre KDE 3.2 settings
*/
- void updateDomainListLegacy(const QStringList &domainConfig);
+ void updateDomainListLegacy(const TQStringList &domainConfig);
protected:
virtual JavaPolicies *createPolicies();
@@ -80,7 +80,7 @@ protected:
Policies *copy);
private:
- QString group;
+ TQString group;
KJavaOptions *options;
};
@@ -89,7 +89,7 @@ class KJavaOptions : public KCModule
Q_OBJECT
public:
- KJavaOptions( KConfig* config, QString group, QWidget* parent = 0, const char* name = 0 );
+ KJavaOptions( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
virtual void load();
virtual void load( bool useDefaults );
@@ -105,15 +105,15 @@ private slots:
private:
KConfig* m_pConfig;
- QString m_groupname;
+ TQString m_groupname;
JavaPolicies java_global_policies;
- QCheckBox* enableJavaGloballyCB;
- QCheckBox* javaSecurityManagerCB;
- QCheckBox* useKioCB;
- QCheckBox* enableShutdownCB;
+ TQCheckBox* enableJavaGloballyCB;
+ TQCheckBox* javaSecurityManagerCB;
+ TQCheckBox* useKioCB;
+ TQCheckBox* enableShutdownCB;
KIntNumInput* serverTimeoutSB;
- QLineEdit* addArgED;
+ TQLineEdit* addArgED;
KURLRequester* pathED;
bool _removeJavaDomainSettings;
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index b6522f767..ae73fc686 100644
--- a/kcontrol/konqhtml/jsopts.cpp
+++ b/kcontrol/konqhtml/jsopts.cpp
@@ -11,9 +11,9 @@
// Big changes to accommodate per-domain settings
// (c) Leo Savernik 2002-2003
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qvgroupbox.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
+#include <tqvgroupbox.h>
#include <kconfig.h>
#include <klistview.h>
#include <kdebug.h>
@@ -34,42 +34,42 @@
// == class KJavaScriptOptions =====
-KJavaScriptOptions::KJavaScriptOptions( KConfig* config, QString group, QWidget *parent,
+KJavaScriptOptions::KJavaScriptOptions( KConfig* config, TQString group, TQWidget *parent,
const char *name ) :
KCModule( parent, name ),
_removeJavaScriptDomainAdvice(false),
m_pConfig( config ), m_groupname( group ),
- js_global_policies(config,group,true,QString::null),
+ js_global_policies(config,group,true,TQString::null),
_removeECMADomainSettings(false)
{
- QVBoxLayout* toplevel = new QVBoxLayout( this, 10, 5 );
+ TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10, 5 );
// the global checkbox
- QGroupBox* globalGB = new QGroupBox( 2, Vertical, i18n( "Global Settings" ), this );
+ TQGroupBox* globalGB = new TQGroupBox( 2, Vertical, i18n( "Global Settings" ), this );
toplevel->addWidget( globalGB );
- enableJavaScriptGloballyCB = new QCheckBox( i18n( "Ena&ble JavaScript globally" ), globalGB );
- QWhatsThis::add( enableJavaScriptGloballyCB, i18n("Enables the execution of scripts written in ECMA-Script "
+ enableJavaScriptGloballyCB = new TQCheckBox( i18n( "Ena&ble JavaScript globally" ), globalGB );
+ TQWhatsThis::add( enableJavaScriptGloballyCB, i18n("Enables the execution of scripts written in ECMA-Script "
"(also known as JavaScript) that can be contained in HTML pages. "
"Note that, as with any browser, enabling scripting languages can be a security problem.") );
- connect( enableJavaScriptGloballyCB, SIGNAL( clicked() ), SLOT( changed() ) );
- connect( enableJavaScriptGloballyCB, SIGNAL( clicked() ), this, SLOT( slotChangeJSEnabled() ) );
+ connect( enableJavaScriptGloballyCB, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) );
+ connect( enableJavaScriptGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChangeJSEnabled() ) );
- reportErrorsCB = new QCheckBox( i18n( "Report &errors" ), globalGB );
- QWhatsThis::add( reportErrorsCB, i18n("Enables the reporting of errors that occur when JavaScript "
+ reportErrorsCB = new TQCheckBox( i18n( "Report &errors" ), globalGB );
+ TQWhatsThis::add( reportErrorsCB, i18n("Enables the reporting of errors that occur when JavaScript "
"code is executed.") );
- connect( reportErrorsCB, SIGNAL( clicked() ), SLOT( changed() ) );
+ connect( reportErrorsCB, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) );
- jsDebugWindow = new QCheckBox( i18n( "Enable debu&gger" ), globalGB );
- QWhatsThis::add( jsDebugWindow, i18n( "Enables builtin JavaScript debugger." ) );
- connect( jsDebugWindow, SIGNAL( clicked() ), SLOT( changed() ) );
+ jsDebugWindow = new TQCheckBox( i18n( "Enable debu&gger" ), globalGB );
+ TQWhatsThis::add( jsDebugWindow, i18n( "Enables builtin JavaScript debugger." ) );
+ connect( jsDebugWindow, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) );
// the domain-specific listview
domainSpecific = new JSDomainListView(m_pConfig,m_groupname,this,this);
- connect(domainSpecific,SIGNAL(changed(bool)),SLOT(changed()));
+ connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(changed()));
toplevel->addWidget( domainSpecific, 2 );
- QWhatsThis::add( domainSpecific, i18n("Here you can set specific JavaScript policies for any particular "
+ TQWhatsThis::add( domainSpecific, i18n("Here you can set specific JavaScript policies for any particular "
"host or domain. To add a new policy, simply click the <i>New...</i> "
"button and supply the necessary information requested by the "
"dialog box. To change an existing policy, click on the <i>Change...</i> "
@@ -79,17 +79,17 @@ KJavaScriptOptions::KJavaScriptOptions( KConfig* config, QString group, QWidget
"button allows you to easily share your policies with other people by allowing "
"you to save and retrieve them from a zipped file.") );
- QString wtstr = i18n("This box contains the domains and hosts you have set "
+ TQString wtstr = i18n("This box contains the domains and hosts you have set "
"a specific JavaScript policy for. This policy will be used "
"instead of the default policy for enabling or disabling JavaScript on pages sent by these "
"domains or hosts. <p>Select a policy and use the controls on "
"the right to modify it.");
- QWhatsThis::add( domainSpecific->listView(), wtstr );
+ TQWhatsThis::add( domainSpecific->listView(), wtstr );
- QWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains "
+ TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains "
"the JavaScript policies. These policies will be merged "
"with the existing ones. Duplicate entries are ignored.") );
- QWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the JavaScript policy to a zipped "
+ TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the JavaScript policy to a zipped "
"file. The file, named <b>javascript_policy.tgz</b>, will be "
"saved to a location of your choice." ) );
@@ -97,7 +97,7 @@ KJavaScriptOptions::KJavaScriptOptions( KConfig* config, QString group, QWidget
js_policies_frame = new JSPoliciesFrame(&js_global_policies,
i18n("Global JavaScript Policies"),this);
toplevel->addWidget(js_policies_frame);
- connect(js_policies_frame, SIGNAL(changed()), SLOT(changed()));
+ connect(js_policies_frame, TQT_SIGNAL(changed()), TQT_SLOT(changed()));
// Finally do the loading
load();
@@ -165,8 +165,8 @@ void KJavaScriptOptions::slotChangeJSEnabled() {
// == class JSDomainListView =====
-JSDomainListView::JSDomainListView(KConfig *config,const QString &group,
- KJavaScriptOptions *options, QWidget *parent,const char *name)
+JSDomainListView::JSDomainListView(KConfig *config,const TQString &group,
+ KJavaScriptOptions *options, TQWidget *parent,const char *name)
: DomainListView(config,i18n( "Do&main-Specific" ), parent, name),
group(group), options(options) {
}
@@ -174,20 +174,20 @@ JSDomainListView::JSDomainListView(KConfig *config,const QString &group,
JSDomainListView::~JSDomainListView() {
}
-void JSDomainListView::updateDomainListLegacy(const QStringList &domainConfig)
+void JSDomainListView::updateDomainListLegacy(const TQStringList &domainConfig)
{
domainSpecificLV->clear();
JSPolicies pol(config,group,false);
pol.defaults();
- for (QStringList::ConstIterator it = domainConfig.begin();
+ for (TQStringList::ConstIterator it = domainConfig.begin();
it != domainConfig.end(); ++it) {
- QString domain;
+ TQString domain;
KHTMLSettings::KJavaScriptAdvice javaAdvice;
KHTMLSettings::KJavaScriptAdvice javaScriptAdvice;
KHTMLSettings::splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
if (javaScriptAdvice != KHTMLSettings::KJavaScriptDunno) {
- QListViewItem *index =
- new QListViewItem( domainSpecificLV, domain,
+ TQListViewItem *index =
+ new TQListViewItem( domainSpecificLV, domain,
i18n(KHTMLSettings::adviceToStr(javaScriptAdvice)) );
pol.setDomain(domain);
@@ -200,7 +200,7 @@ void JSDomainListView::updateDomainListLegacy(const QStringList &domainConfig)
void JSDomainListView::setupPolicyDlg(PushButton trigger,PolicyDialog &pDlg,
Policies *pol) {
JSPolicies *jspol = static_cast<JSPolicies *>(pol);
- QString caption;
+ TQString caption;
switch (trigger) {
case AddButton:
caption = i18n( "New JavaScript Policy" );
diff --git a/kcontrol/konqhtml/jsopts.h b/kcontrol/konqhtml/jsopts.h
index 41f5c87fd..01db6508f 100644
--- a/kcontrol/konqhtml/jsopts.h
+++ b/kcontrol/konqhtml/jsopts.h
@@ -35,13 +35,13 @@ class KJavaScriptOptions;
class JSDomainListView : public DomainListView {
Q_OBJECT
public:
- JSDomainListView(KConfig *config,const QString &group,KJavaScriptOptions *opt,
- QWidget *parent,const char *name = 0);
+ JSDomainListView(KConfig *config,const TQString &group,KJavaScriptOptions *opt,
+ TQWidget *parent,const char *name = 0);
virtual ~JSDomainListView();
/** remnant for importing pre KDE 3.2 settings
*/
- void updateDomainListLegacy(const QStringList &domainConfig);
+ void updateDomainListLegacy(const TQStringList &domainConfig);
protected:
virtual JSPolicies *createPolicies();
@@ -50,7 +50,7 @@ protected:
Policies *copy);
private:
- QString group;
+ TQString group;
KJavaScriptOptions *options;
};
@@ -58,7 +58,7 @@ class KJavaScriptOptions : public KCModule
{
Q_OBJECT
public:
- KJavaScriptOptions( KConfig* config, QString group, QWidget* parent = 0, const char* name = 0 );
+ KJavaScriptOptions( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
virtual void load();
virtual void load( bool useDefaults );
@@ -73,11 +73,11 @@ private slots:
private:
KConfig *m_pConfig;
- QString m_groupname;
+ TQString m_groupname;
JSPolicies js_global_policies;
- QCheckBox *enableJavaScriptGloballyCB;
- QCheckBox *reportErrorsCB;
- QCheckBox *jsDebugWindow;
+ TQCheckBox *enableJavaScriptGloballyCB;
+ TQCheckBox *reportErrorsCB;
+ TQCheckBox *jsDebugWindow;
JSPoliciesFrame *js_policies_frame;
bool _removeECMADomainSettings;
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index d4afbbd1d..5196af8dd 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -19,11 +19,11 @@
*/
-#include <qbuttongroup.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
-#include <qwhatsthis.h>
+#include <tqbuttongroup.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqradiobutton.h>
+#include <tqwhatsthis.h>
#include <kconfig.h>
#include <kdebug.h>
@@ -33,13 +33,13 @@
// == class JSPolicies ==
-JSPolicies::JSPolicies(KConfig* config,const QString &group,
- bool global,const QString &domain) :
+JSPolicies::JSPolicies(KConfig* config,const TQString &group,
+ bool global,const TQString &domain) :
Policies(config,group,global,domain,"javascript.","EnableJavaScript") {
}
-JSPolicies::JSPolicies() : Policies(0,QString::null,false,
- QString::null,QString::null,QString::null) {
+JSPolicies::JSPolicies() : Policies(0,TQString::null,false,
+ TQString::null,TQString::null,TQString::null) {
}
JSPolicies::~JSPolicies() {
@@ -48,7 +48,7 @@ JSPolicies::~JSPolicies() {
void JSPolicies::load() {
Policies::load();
- QString key;
+ TQString key;
// enableJavaScriptDebugCB->setChecked( m_pConfig->readBoolEntry("EnableJavaScriptDebug",false));
// enableDebugOutputCB->setChecked( m_pConfig->readBoolEntry("EnableJSDebugOutput") );
@@ -89,7 +89,7 @@ void JSPolicies::defaults() {
void JSPolicies::save() {
Policies::save();
- QString key;
+ TQString key;
key = prefix + "WindowOpenPolicy";
if (window_open != INHERIT_POLICY)
config->writeEntry(key, window_open);
@@ -125,9 +125,9 @@ void JSPolicies::save() {
// == class JSPoliciesFrame ==
-JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const QString &title,
- QWidget* parent) :
- QGroupBox(title, parent, "jspoliciesframe"),
+JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
+ TQWidget* parent) :
+ TQGroupBox(title, parent, "jspoliciesframe"),
policies(policies) {
bool is_per_domain = !policies->isGlobal();
@@ -135,57 +135,57 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const QString &title,
setColumnLayout(0, Qt::Vertical);
layout()->setSpacing(0);
layout()->setMargin(0);
- QGridLayout *this_layout = new QGridLayout(layout(),5,10+is_per_domain*2);
+ TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2);
this_layout->setAlignment(Qt::AlignTop);
this_layout->setSpacing(3);
this_layout->setMargin(11);
- QString wtstr; // what's this description
+ TQString wtstr; // what's this description
int colIdx; // column index
// === window.open ================================
colIdx = 0;
- QLabel *label = new QLabel(i18n("Open new windows:"),this);
+ TQLabel *label = new TQLabel(i18n("Open new windows:"),this);
this_layout->addWidget(label,0,colIdx++);
- js_popup = new QButtonGroup(this);
+ js_popup = new TQButtonGroup(this);
js_popup->setExclusive(true);
js_popup->setHidden(true);
- QRadioButton* policy_btn;
+ TQRadioButton* policy_btn;
if (is_per_domain) {
- policy_btn = new QRadioButton(i18n("Use global"), this);
- QWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
+ policy_btn = new TQRadioButton(i18n("Use global"), this);
+ TQWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
js_popup->insert(policy_btn,INHERIT_POLICY);
this_layout->addWidget(policy_btn,0,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
}/*end if*/
- policy_btn = new QRadioButton(i18n("Allow"), this);
- QWhatsThis::add(policy_btn,i18n("Accept all popup window requests."));
+ policy_btn = new TQRadioButton(i18n("Allow"), this);
+ TQWhatsThis::add(policy_btn,i18n("Accept all popup window requests."));
js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAllow);
this_layout->addWidget(policy_btn,0,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
- policy_btn = new QRadioButton(i18n("Ask"), this);
- QWhatsThis::add(policy_btn,i18n("Prompt every time a popup window is requested."));
+ policy_btn = new TQRadioButton(i18n("Ask"), this);
+ TQWhatsThis::add(policy_btn,i18n("Prompt every time a popup window is requested."));
js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAsk);
this_layout->addWidget(policy_btn,0,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
- policy_btn = new QRadioButton(i18n("Deny"), this);
- QWhatsThis::add(policy_btn,i18n("Reject all popup window requests."));
+ policy_btn = new TQRadioButton(i18n("Deny"), this);
+ TQWhatsThis::add(policy_btn,i18n("Reject all popup window requests."));
js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenDeny);
this_layout->addWidget(policy_btn,0,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
- policy_btn = new QRadioButton(i18n("Smart"), this);
- QWhatsThis::add(policy_btn, i18n("Accept popup window requests only when "
+ policy_btn = new TQRadioButton(i18n("Smart"), this);
+ TQWhatsThis::add(policy_btn, i18n("Accept popup window requests only when "
"links are activated through an explicit "
"mouse click or keyboard operation."));
js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenSmart);
this_layout->addWidget(policy_btn,0,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
wtstr = i18n("If you disable this, Konqueror will stop "
"interpreting the <i>window.open()</i> "
@@ -196,116 +196,116 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const QString &title,
"also break certain sites that require <i>"
"window.open()</i> for proper operation. Use "
"this feature carefully.");
- QWhatsThis::add(label, wtstr);
- connect(js_popup, SIGNAL(clicked(int)), SLOT(setWindowOpenPolicy(int)));
+ TQWhatsThis::add(label, wtstr);
+ connect(js_popup, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowOpenPolicy(int)));
// === window.resizeBy/resizeTo ================================
colIdx = 0;
- label = new QLabel(i18n("Resize window:"),this);
+ label = new TQLabel(i18n("Resize window:"),this);
this_layout->addWidget(label,1,colIdx++);
- js_resize = new QButtonGroup(this);
+ js_resize = new TQButtonGroup(this);
js_resize->setExclusive(true);
js_resize->setHidden(true);
if (is_per_domain) {
- policy_btn = new QRadioButton(i18n("Use global"), this);
- QWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
+ policy_btn = new TQRadioButton(i18n("Use global"), this);
+ TQWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
js_resize->insert(policy_btn,INHERIT_POLICY);
this_layout->addWidget(policy_btn,1,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
}/*end if*/
- policy_btn = new QRadioButton(i18n("Allow"), this);
- QWhatsThis::add(policy_btn,i18n("Allow scripts to change the window size."));
+ policy_btn = new TQRadioButton(i18n("Allow"), this);
+ TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window size."));
js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeAllow);
this_layout->addWidget(policy_btn,1,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
- policy_btn = new QRadioButton(i18n("Ignore"), this);
- QWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the window size. "
+ policy_btn = new TQRadioButton(i18n("Ignore"), this);
+ TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the window size. "
"The web page will <i>think</i> it changed the "
"size but the actual window is not affected."));
js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeIgnore);
this_layout->addWidget(policy_btn,1,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
wtstr = i18n("Some websites change the window size on their own by using "
"<i>window.resizeBy()</i> or <i>window.resizeTo()</i>. "
"This option specifies the treatment of such "
"attempts.");
- QWhatsThis::add(label, wtstr);
- connect(js_resize, SIGNAL(clicked(int)), SLOT(setWindowResizePolicy(int)));
+ TQWhatsThis::add(label, wtstr);
+ connect(js_resize, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowResizePolicy(int)));
// === window.moveBy/moveTo ================================
colIdx = 0;
- label = new QLabel(i18n("Move window:"),this);
+ label = new TQLabel(i18n("Move window:"),this);
this_layout->addWidget(label,2,colIdx++);
- js_move = new QButtonGroup(this);
+ js_move = new TQButtonGroup(this);
js_move->setExclusive(true);
js_move->setHidden(true);
if (is_per_domain) {
- policy_btn = new QRadioButton(i18n("Use global"), this);
- QWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
+ policy_btn = new TQRadioButton(i18n("Use global"), this);
+ TQWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
js_move->insert(policy_btn,INHERIT_POLICY);
this_layout->addWidget(policy_btn,2,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
}/*end if*/
- policy_btn = new QRadioButton(i18n("Allow"), this);
- QWhatsThis::add(policy_btn,i18n("Allow scripts to change the window position."));
+ policy_btn = new TQRadioButton(i18n("Allow"), this);
+ TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window position."));
js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveAllow);
this_layout->addWidget(policy_btn,2,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
- policy_btn = new QRadioButton(i18n("Ignore"), this);
- QWhatsThis::add(policy_btn,i18n("Ignore attempts of scripts to change the window position. "
+ policy_btn = new TQRadioButton(i18n("Ignore"), this);
+ TQWhatsThis::add(policy_btn,i18n("Ignore attempts of scripts to change the window position. "
"The web page will <i>think</i> it moved the "
"window but the actual position is not affected."));
js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveIgnore);
this_layout->addWidget(policy_btn,2,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
wtstr = i18n("Some websites change the window position on their own by using "
"<i>window.moveBy()</i> or <i>window.moveTo()</i>. "
"This option specifies the treatment of such "
"attempts.");
- QWhatsThis::add(label, wtstr);
- connect(js_move, SIGNAL(clicked(int)), SLOT(setWindowMovePolicy(int)));
+ TQWhatsThis::add(label, wtstr);
+ connect(js_move, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowMovePolicy(int)));
// === window.focus ================================
colIdx = 0;
- label = new QLabel(i18n("Focus window:"),this);
+ label = new TQLabel(i18n("Focus window:"),this);
this_layout->addWidget(label,3,colIdx++);
- js_focus = new QButtonGroup(this);
+ js_focus = new TQButtonGroup(this);
js_focus->setExclusive(true);
js_focus->setHidden(true);
if (is_per_domain) {
- policy_btn = new QRadioButton(i18n("Use global"), this);
- QWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
+ policy_btn = new TQRadioButton(i18n("Use global"), this);
+ TQWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
js_focus->insert(policy_btn,INHERIT_POLICY);
this_layout->addWidget(policy_btn,3,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
}/*end if*/
- policy_btn = new QRadioButton(i18n("Allow"), this);
- QWhatsThis::add( policy_btn,i18n("Allow scripts to focus the window.") );
+ policy_btn = new TQRadioButton(i18n("Allow"), this);
+ TQWhatsThis::add( policy_btn,i18n("Allow scripts to focus the window.") );
js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusAllow);
this_layout->addWidget(policy_btn,3,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
- policy_btn = new QRadioButton(i18n("Ignore"), this);
- QWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to focus the window. "
+ policy_btn = new TQRadioButton(i18n("Ignore"), this);
+ TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to focus the window. "
"The web page will <i>think</i> it brought "
"the focus to the window but the actual "
"focus will remain unchanged.") );
js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusIgnore);
this_layout->addWidget(policy_btn,3,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
wtstr = i18n("Some websites set the focus to their browser window on their "
"own by using <i>window.focus()</i>. This usually leads to "
@@ -313,68 +313,68 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const QString &title,
"action the user was dedicated to at that time. "
"This option specifies the treatment of such "
"attempts.");
- QWhatsThis::add(label, wtstr);
- connect(js_focus, SIGNAL(clicked(int)), SLOT(setWindowFocusPolicy(int)));
+ TQWhatsThis::add(label, wtstr);
+ connect(js_focus, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowFocusPolicy(int)));
// === window.status ================================
colIdx = 0;
- label = new QLabel(i18n("Modify status bar text:"),this);
+ label = new TQLabel(i18n("Modify status bar text:"),this);
this_layout->addWidget(label,4,colIdx++);
- js_statusbar = new QButtonGroup(this);
+ js_statusbar = new TQButtonGroup(this);
js_statusbar->setExclusive(true);
js_statusbar->setHidden(true);
if (is_per_domain) {
- policy_btn = new QRadioButton(i18n("Use global"), this);
- QWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
+ policy_btn = new TQRadioButton(i18n("Use global"), this);
+ TQWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
js_statusbar->insert(policy_btn,INHERIT_POLICY);
this_layout->addWidget(policy_btn,4,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
}/*end if*/
- policy_btn = new QRadioButton(i18n("Allow"), this);
- QWhatsThis::add(policy_btn,i18n("Allow scripts to change the text of the status bar."));
+ policy_btn = new TQRadioButton(i18n("Allow"), this);
+ TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the text of the status bar."));
js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusAllow);
this_layout->addWidget(policy_btn,4,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
- policy_btn = new QRadioButton(i18n("Ignore"), this);
- QWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the status bar text. "
+ policy_btn = new TQRadioButton(i18n("Ignore"), this);
+ TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the status bar text. "
"The web page will <i>think</i> it changed "
"the text but the actual text will remain "
"unchanged.") );
js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusIgnore);
this_layout->addWidget(policy_btn,4,colIdx++);
- this_layout->addItem(new QSpacerItem(10,0),0,colIdx++);
+ this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
wtstr = i18n("Some websites change the status bar text by setting "
"<i>window.status</i> or <i>window.defaultStatus</i>, "
"thus sometimes preventing displaying the real URLs of hyperlinks. "
"This option specifies the treatment of such "
"attempts.");
- QWhatsThis::add(label, wtstr);
- connect(js_statusbar, SIGNAL(clicked(int)), SLOT(setWindowStatusPolicy(int)));
+ TQWhatsThis::add(label, wtstr);
+ connect(js_statusbar, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowStatusPolicy(int)));
}
JSPoliciesFrame::~JSPoliciesFrame() {
}
void JSPoliciesFrame::refresh() {
- QRadioButton *button;
- button = static_cast<QRadioButton *>(js_popup->find(
+ TQRadioButton *button;
+ button = static_cast<TQRadioButton *>(js_popup->find(
policies->window_open));
if (button != 0) button->setChecked(true);
- button = static_cast<QRadioButton *>(js_resize->find(
+ button = static_cast<TQRadioButton *>(js_resize->find(
policies->window_resize));
if (button != 0) button->setChecked(true);
- button = static_cast<QRadioButton *>(js_move->find(
+ button = static_cast<TQRadioButton *>(js_move->find(
policies->window_move));
if (button != 0) button->setChecked(true);
- button = static_cast<QRadioButton *>(js_focus->find(
+ button = static_cast<TQRadioButton *>(js_focus->find(
policies->window_focus));
if (button != 0) button->setChecked(true);
- button = static_cast<QRadioButton *>(js_statusbar->find(
+ button = static_cast<TQRadioButton *>(js_statusbar->find(
policies->window_status));
if (button != 0) button->setChecked(true);
}
diff --git a/kcontrol/konqhtml/jspolicies.h b/kcontrol/konqhtml/jspolicies.h
index a955abc96..29f73c090 100644
--- a/kcontrol/konqhtml/jspolicies.h
+++ b/kcontrol/konqhtml/jspolicies.h
@@ -22,8 +22,8 @@
#ifndef __JSPOLICIES_H__
#define __JSPOLICIES_H__
-#include <qgroupbox.h>
-#include <qstring.h>
+#include <tqgroupbox.h>
+#include <tqstring.h>
#include <khtml_settings.h>
@@ -63,11 +63,11 @@ public:
* @param domain name of the domain this instance is used to configure the
* policies for (case insensitive, ignored if global == true)
*/
- JSPolicies(KConfig* config, const QString &group, bool global,
- const QString &domain = QString::null);
+ JSPolicies(KConfig* config, const TQString &group, bool global,
+ const TQString &domain = TQString::null);
/**
- * dummy constructor to make QMap happy.
+ * dummy constructor to make TQMap happy.
*
* Never construct an object by using this.
* @internal
@@ -201,7 +201,7 @@ private:
*
* @author Leo Savernik
*/
-class JSPoliciesFrame : public QGroupBox {
+class JSPoliciesFrame : public TQGroupBox {
Q_OBJECT
public:
/**
@@ -211,8 +211,8 @@ public:
* @param title title for group box
* @param parent parent widget
*/
- JSPoliciesFrame(JSPolicies *policies, const QString &title,
- QWidget* parent = 0);
+ JSPoliciesFrame(JSPolicies *policies, const TQString &title,
+ TQWidget* parent = 0);
virtual ~JSPoliciesFrame();
@@ -258,11 +258,11 @@ private slots:
private:
JSPolicies *policies;
- QButtonGroup *js_popup;
- QButtonGroup *js_resize;
- QButtonGroup *js_move;
- QButtonGroup *js_focus;
- QButtonGroup *js_statusbar;
+ TQButtonGroup *js_popup;
+ TQButtonGroup *js_resize;
+ TQButtonGroup *js_move;
+ TQButtonGroup *js_focus;
+ TQButtonGroup *js_statusbar;
};
diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp
index e6c9a95ba..ca175e8e9 100644
--- a/kcontrol/konqhtml/khttpoptdlg.cpp
+++ b/kcontrol/konqhtml/khttpoptdlg.cpp
@@ -1,37 +1,37 @@
// File khttpoptdlg.cpp by Jacek Konieczny <jajcus@zeus.posl.gliwice.pl>
// Port to KControl by David Faure <faure@kde.org>
-#include <qlayout.h> //CT
+#include <tqlayout.h> //CT
#include <klocale.h>
#include <kglobal.h>
#include "khttpoptdlg.h"
-KHTTPOptions::KHTTPOptions(KConfig *config, QString group, QWidget *parent, const char *name)
+KHTTPOptions::KHTTPOptions(KConfig *config, TQString group, TQWidget *parent, const char *name)
: KCModule( parent, name ), m_pConfig(config), m_groupname(group)
{
- QVBoxLayout *lay = new QVBoxLayout(this, 10, 5);
+ TQVBoxLayout *lay = new TQVBoxLayout(this, 10, 5);
- lay->addWidget( new QLabel(i18n("Accept languages:"), this) );
+ lay->addWidget( new TQLabel(i18n("Accept languages:"), this) );
- le_languages = new QLineEdit(this);
+ le_languages = new TQLineEdit(this);
lay->addWidget( le_languages );
- connect(le_languages, SIGNAL(textChanged(const QString&)),
- this, SLOT(slotChanged()));
+ connect(le_languages, TQT_SIGNAL(textChanged(const TQString&)),
+ this, TQT_SLOT(slotChanged()));
lay->addSpacing(10);
- lay->addWidget( new QLabel(i18n("Accept character sets:"), this) );
+ lay->addWidget( new TQLabel(i18n("Accept character sets:"), this) );
- le_charsets = new QLineEdit(this);
+ le_charsets = new TQLineEdit(this);
lay->addWidget( le_charsets );
- connect(le_charsets, SIGNAL(textChanged(const QString&)),
- this, SLOT(slotChanged()));
+ connect(le_charsets, TQT_SIGNAL(textChanged(const TQString&)),
+ this, TQT_SLOT(slotChanged()));
lay->addStretch(10);
- // defaultCharsets = QString("utf-8 ")+klocale->charset()+" iso-8859-1";
- defaultCharsets = QString("utf-8 ")+" iso-8859-1"; // TODO
+ // defaultCharsets = TQString("utf-8 ")+klocale->charset()+" iso-8859-1";
+ defaultCharsets = TQString("utf-8 ")+" iso-8859-1"; // TODO
// finaly read the options
load();
@@ -44,7 +44,7 @@ void KHTTPOptions::load()
void KHTTPOptions::load( bool useDefaults )
{
- QString tmp;
+ TQString tmp;
m_pConfig->setReadDefaults( useDefaults );
diff --git a/kcontrol/konqhtml/khttpoptdlg.h b/kcontrol/konqhtml/khttpoptdlg.h
index 36e3650b4..f758be15c 100644
--- a/kcontrol/konqhtml/khttpoptdlg.h
+++ b/kcontrol/konqhtml/khttpoptdlg.h
@@ -2,10 +2,10 @@
#ifndef __KHTTPOPTDLG_H
#define __KHTTPOPTDLG_H
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qcheckbox.h>
-#include <qstring.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
+#include <tqcheckbox.h>
+#include <tqstring.h>
#include <kcmodule.h>
#include <kconfig.h>
@@ -19,7 +19,7 @@ class KHTTPOptions : public KCModule
{
Q_OBJECT
public:
- KHTTPOptions(KConfig *config, QString group, QWidget *parent = 0L, const char *name = 0L);
+ KHTTPOptions(KConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L);
virtual void load();
virtual void load( bool useDefaults );
@@ -29,17 +29,17 @@ Q_OBJECT
private:
KConfig *m_pConfig;
- QString m_groupname;
+ TQString m_groupname;
// Acceptable languages "LANG" - locale selected languages
- QLabel *lb_languages;
- QLineEdit *le_languages;
+ TQLabel *lb_languages;
+ TQLineEdit *le_languages;
// Acceptable charsets "CHARSET" - locale selected charset
- QLabel *lb_charsets;
- QLineEdit *le_charsets;
+ TQLabel *lb_charsets;
+ TQLineEdit *le_charsets;
- QString defaultCharsets;
+ TQString defaultCharsets;
private slots:
void slotChanged();
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp
index b1d459b00..28654869e 100644
--- a/kcontrol/konqhtml/main.cpp
+++ b/kcontrol/konqhtml/main.cpp
@@ -27,8 +27,8 @@
#include <kapplication.h>
#include <dcopclient.h>
-#include <qtabwidget.h>
-#include <qlayout.h>
+#include <tqtabwidget.h>
+#include <tqlayout.h>
#include "jsopts.h"
#include "javaopts.h"
@@ -43,31 +43,31 @@
extern "C"
{
- KDE_EXPORT KCModule *create_khtml_behavior(QWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_khtml_behavior(TQWidget *parent, const char *name)
{
KConfig *c = new KConfig( "konquerorrc", false, false );
return new KMiscHTMLOptions(c, "HTML Settings", parent, name);
}
- KDE_EXPORT KCModule *create_khtml_fonts(QWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_khtml_fonts(TQWidget *parent, const char *name)
{
KConfig *c = new KConfig( "konquerorrc", false, false );
return new KAppearanceOptions(c, "HTML Settings", parent, name);
}
- KDE_EXPORT KCModule *create_khtml_java_js(QWidget *parent, const char* /*name*/)
+ KDE_EXPORT KCModule *create_khtml_java_js(TQWidget *parent, const char* /*name*/)
{
KConfig *c = new KConfig( "konquerorrc", false, false );
return new KJSParts(c, parent, "kcmkonqhtml");
}
- KDE_EXPORT KCModule *create_khtml_plugins(QWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_khtml_plugins(TQWidget *parent, const char *name)
{
KConfig *c = new KConfig( "konquerorrc", false, false );
return new KPluginOptions(c, "Java/JavaScript Settings", parent, name);
}
- KDE_EXPORT KCModule *create_khtml_filter(QWidget *parent, const char *name )
+ KDE_EXPORT KCModule *create_khtml_filter(TQWidget *parent, const char *name )
{
KConfig *c = new KConfig( "khtmlrc", false, false );
return new KCMFilter(c, "Filter Settings", parent, name);
@@ -75,7 +75,7 @@ extern "C"
}
-KJSParts::KJSParts(KConfig *config, QWidget *parent, const char *name)
+KJSParts::KJSParts(KConfig *config, TQWidget *parent, const char *name)
: KCModule(parent, name), mConfig(config)
{
KAboutData *about =
@@ -97,18 +97,18 @@ KJSParts::KJSParts(KConfig *config, QWidget *parent, const char *name)
setAboutData( about );
- QVBoxLayout *layout = new QVBoxLayout(this);
- tab = new QTabWidget(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
+ tab = new TQTabWidget(this);
layout->addWidget(tab);
// ### the groupname is duplicated in KJSParts::save
java = new KJavaOptions( config, "Java/JavaScript Settings", this, name );
tab->addTab( java, i18n( "&Java" ) );
- connect( java, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) );
+ connect( java, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
javascript = new KJavaScriptOptions( config, "Java/JavaScript Settings", this, name );
tab->addTab( javascript, i18n( "Java&Script" ) );
- connect( javascript, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) );
+ connect( javascript, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
}
KJSParts::~KJSParts()
@@ -141,7 +141,7 @@ void KJSParts::save()
// Send signal to konqueror
// Warning. In case something is added/changed here, keep kfmclient in sync
- QByteArray data;
+ TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
@@ -154,7 +154,7 @@ void KJSParts::defaults()
java->defaults();
}
-QString KJSParts::quickHelp() const
+TQString KJSParts::quickHelp() const
{
return i18n("<h2>JavaScript</h2>On this page, you can configure "
"whether JavaScript programs embedded in web pages should "
diff --git a/kcontrol/konqhtml/main.h b/kcontrol/konqhtml/main.h
index 20f461fa2..db89be8ab 100644
--- a/kcontrol/konqhtml/main.h
+++ b/kcontrol/konqhtml/main.h
@@ -39,17 +39,17 @@ class KJSParts : public KCModule
public:
- KJSParts(KConfig *config,QWidget *parent, const char *name);
+ KJSParts(KConfig *config,TQWidget *parent, const char *name);
virtual ~KJSParts();
void load();
void save();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
private:
- QTabWidget *tab;
+ TQTabWidget *tab;
KJavaScriptOptions *javascript;
KJavaOptions *java;
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index f31af3c40..d5cd4cc2b 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -7,12 +7,12 @@
#include <stdlib.h>
#include <unistd.h>
-#include <qlayout.h>
-#include <qprogressdialog.h>
-#include <qregexp.h>
-#include <qslider.h>
-#include <qvgroupbox.h>
-#include <qwhatsthis.h>
+#include <tqlayout.h>
+#include <tqprogressdialog.h>
+#include <tqregexp.h>
+#include <tqslider.h>
+#include <tqvgroupbox.h>
+#include <tqwhatsthis.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -33,8 +33,8 @@
// == class PluginPolicies =====
-PluginPolicies::PluginPolicies(KConfig* config, const QString &group, bool global,
- const QString &domain) :
+PluginPolicies::PluginPolicies(KConfig* config, const TQString &group, bool global,
+ const TQString &domain) :
Policies(config,group,global,domain,"plugins.","EnablePlugins") {
}
@@ -43,7 +43,7 @@ PluginPolicies::~PluginPolicies() {
// == class KPluginOptions =====
-KPluginOptions::KPluginOptions( KConfig* config, QString group, QWidget *parent,
+KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *parent,
const char *)
: KCModule( parent, "kcmkonqhtml" ),
m_pConfig( config ),
@@ -51,36 +51,36 @@ KPluginOptions::KPluginOptions( KConfig* config, QString group, QWidget *parent,
m_nspluginscan (0),
global_policies(config,group,true)
{
- QVBoxLayout* toplevel = new QVBoxLayout( this, 0, KDialog::spacingHint() );
+ TQVBoxLayout* toplevel = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
/**************************************************************************
******************** Global Settings *************************************
*************************************************************************/
- QVGroupBox* globalGB = new QVGroupBox( i18n( "Global Settings" ), this );
+ TQVGroupBox* globalGB = new TQVGroupBox( i18n( "Global Settings" ), this );
toplevel->addWidget( globalGB );
- enablePluginsGloballyCB = new QCheckBox( i18n( "&Enable plugins globally" ), globalGB );
- enableHTTPOnly = new QCheckBox( i18n( "Only allow &HTTP and HTTPS URLs for plugins" ), globalGB );
- enableUserDemand = new QCheckBox( i18n( "&Load plugins on demand only" ), globalGB );
- priorityLabel = new QLabel(i18n("CPU priority for plugins: %1").arg(QString::null), globalGB);
- priority = new QSlider(5, 100, 5, 100, Horizontal, globalGB);
- connect( enablePluginsGloballyCB, SIGNAL( clicked() ), this, SLOT( slotChanged() ) );
- connect( enablePluginsGloballyCB, SIGNAL( clicked() ), this, SLOT( slotTogglePluginsEnabled() ) );
- connect( enableHTTPOnly, SIGNAL( clicked() ), this, SLOT( slotChanged() ) );
- connect( enableUserDemand, SIGNAL( clicked() ), this, SLOT( slotChanged() ) );
- connect( priority, SIGNAL( valueChanged(int) ), this, SLOT( slotChanged() ) );
- connect( priority, SIGNAL( valueChanged(int) ), this, SLOT( updatePLabel(int) ) );
-
- QFrame *hrule = new QFrame(globalGB);
- hrule->setFrameStyle(QFrame::HLine | QFrame::Sunken);
- hrule->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed);
+ enablePluginsGloballyCB = new TQCheckBox( i18n( "&Enable plugins globally" ), globalGB );
+ enableHTTPOnly = new TQCheckBox( i18n( "Only allow &HTTP and HTTPS URLs for plugins" ), globalGB );
+ enableUserDemand = new TQCheckBox( i18n( "&Load plugins on demand only" ), globalGB );
+ priorityLabel = new TQLabel(i18n("CPU priority for plugins: %1").arg(TQString::null), globalGB);
+ priority = new TQSlider(5, 100, 5, 100, Horizontal, globalGB);
+ connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
+ connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTogglePluginsEnabled() ) );
+ connect( enableHTTPOnly, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
+ connect( enableUserDemand, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
+ connect( priority, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) );
+ connect( priority, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( updatePLabel(int) ) );
+
+ TQFrame *hrule = new TQFrame(globalGB);
+ hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
+ hrule->setSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed);
/**************************************************************************
********************* Domain-specific Settings ***************************
*************************************************************************/
- QPushButton *domainSpecPB = new QPushButton(i18n("Domain-Specific Settin&gs"),
+ TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"),
globalGB);
- domainSpecPB->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
- connect(domainSpecPB,SIGNAL(clicked()),SLOT(slotShowDomainDlg()));
+ domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
+ connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg()));
domainSpecificDlg = new KDialogBase(KDialogBase::Swallow,
i18n("Domain-Specific Policies"),KDialogBase::Close,
@@ -88,30 +88,30 @@ KPluginOptions::KPluginOptions( KConfig* config, QString group, QWidget *parent,
domainSpecific = new PluginDomainListView(config,group,this,domainSpecificDlg);
domainSpecific->setMinimumSize(320,200);
- connect(domainSpecific,SIGNAL(changed(bool)),SLOT(slotChanged()));
+ connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(slotChanged()));
domainSpecificDlg->setMainWidget(domainSpecific);
/**************************************************************************
********************** WhatsThis? items **********************************
*************************************************************************/
- QWhatsThis::add( enablePluginsGloballyCB, i18n("Enables the execution of plugins "
+ TQWhatsThis::add( enablePluginsGloballyCB, i18n("Enables the execution of plugins "
"that can be contained in HTML pages, e.g. Macromedia Flash. "
"Note that, as with any browser, enabling active contents can be a security problem.") );
- QString wtstr = i18n("This box contains the domains and hosts you have set "
+ TQString wtstr = i18n("This box contains the domains and hosts you have set "
"a specific plugin policy for. This policy will be used "
"instead of the default policy for enabling or disabling plugins on pages sent by these "
"domains or hosts. <p>Select a policy and use the controls on "
"the right to modify it.");
- QWhatsThis::add( domainSpecific->listView(), wtstr );
- QWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains "
+ TQWhatsThis::add( domainSpecific->listView(), wtstr );
+ TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains "
"the plugin policies. These policies will be merged "
"with the existing ones. Duplicate entries are ignored.") );
- QWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the plugin policy to a zipped "
+ TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the plugin policy to a zipped "
"file. The file, named <b>plugin_policy.tgz</b>, will be "
"saved to a location of your choice." ) );
- QWhatsThis::add( domainSpecific, i18n("Here you can set specific plugin policies for any particular "
+ TQWhatsThis::add( domainSpecific, i18n("Here you can set specific plugin policies for any particular "
"host or domain. To add a new policy, simply click the <i>New...</i> "
"button and supply the necessary information requested by the "
"dialog box. To change an existing policy, click on the <i>Change...</i> "
@@ -126,7 +126,7 @@ KPluginOptions::KPluginOptions( KConfig* config, QString group, QWidget *parent,
/*****************************************************************************/
- QVGroupBox* netscapeGB = new QVGroupBox( i18n( "Netscape Plugins" ), this );
+ TQVGroupBox* netscapeGB = new TQVGroupBox( i18n( "Netscape Plugins" ), this );
toplevel->addWidget( netscapeGB );
// create Designer made widget
@@ -134,8 +134,8 @@ KPluginOptions::KPluginOptions( KConfig* config, QString group, QWidget *parent,
m_widget->dirEdit->setMode(KFile::ExistingOnly | KFile::LocalOnly | KFile::Directory);
// setup widgets
- connect( m_widget->scanAtStartup, SIGNAL(clicked()), SLOT(change()) );
- connect( m_widget->scanButton, SIGNAL(clicked()), SLOT(scan()) );
+ connect( m_widget->scanAtStartup, TQT_SIGNAL(clicked()), TQT_SLOT(change()) );
+ connect( m_widget->scanButton, TQT_SIGNAL(clicked()), TQT_SLOT(scan()) );
m_changed = false;
@@ -153,7 +153,7 @@ KPluginOptions::~KPluginOptions()
void KPluginOptions::updatePLabel(int p) {
- QString level;
+ TQString level;
p = (100 - p)/5;
if (p > 15) {
level = i18n("lowest priority", "lowest");
@@ -229,7 +229,7 @@ void KPluginOptions::save()
m_pConfig->sync(); // I need a sync here, otherwise "apply" won't work
// instantly
- QByteArray data;
+ TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
@@ -252,7 +252,7 @@ void KPluginOptions::save()
change( false );
}
-QString KPluginOptions::quickHelp() const
+TQString KPluginOptions::quickHelp() const
{
return i18n("<h1>Konqueror Plugins</h1> The Konqueror web browser can use Netscape"
" plugins to show special content, just like the Navigator does. Please note that"
@@ -282,7 +282,7 @@ void KPluginOptions::scan()
int ret = KMessageBox::warningYesNoCancel( this,
i18n("Do you want to apply your changes "
"before the scan? Otherwise the "
- "changes will be lost."), QString::null, KStdGuiItem::save(), KStdGuiItem::discard() );
+ "changes will be lost."), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() );
if ( ret==KMessageBox::Cancel ) {
m_widget->scanButton->setEnabled(true);
return;
@@ -292,7 +292,7 @@ void KPluginOptions::scan()
}
m_nspluginscan = new KProcIO;
- QString scanExe = KGlobal::dirs()->findExe("nspluginscan");
+ TQString scanExe = KGlobal::dirs()->findExe("nspluginscan");
if (!scanExe) {
kdDebug() << "can't find nspluginviewer" << endl;
delete m_nspluginscan;
@@ -306,24 +306,24 @@ void KPluginOptions::scan()
}
// find nspluginscan executable
- m_progress = new QProgressDialog( i18n("Scanning for plugins"), i18n("Cancel"), 100, this );
+ m_progress = new TQProgressDialog( i18n("Scanning for plugins"), i18n("Cancel"), 100, this );
m_progress->setProgress( 5 );
// start nspluginscan
*m_nspluginscan << scanExe << "--verbose";
kdDebug() << "Running nspluginscan" << endl;
- connect(m_nspluginscan, SIGNAL(readReady(KProcIO*)),
- this, SLOT(progress(KProcIO*)));
- connect(m_nspluginscan, SIGNAL(processExited(KProcess *)),
- this, SLOT(scanDone()));
- connect(m_progress, SIGNAL(cancelled()), this, SLOT(scanDone()));
+ connect(m_nspluginscan, TQT_SIGNAL(readReady(KProcIO*)),
+ this, TQT_SLOT(progress(KProcIO*)));
+ connect(m_nspluginscan, TQT_SIGNAL(processExited(KProcess *)),
+ this, TQT_SLOT(scanDone()));
+ connect(m_progress, TQT_SIGNAL(cancelled()), this, TQT_SLOT(scanDone()));
m_nspluginscan->start();
}
void KPluginOptions::progress(KProcIO *proc)
{
- QString line;
+ TQString line;
while(proc->readln(line) > 0)
;
m_progress->setProgress(line.stripWhiteSpace().toInt());
@@ -345,28 +345,28 @@ void KPluginOptions::scanDone()
void KPluginOptions::dirInit()
{
m_widget->dirEdit->setCaption(i18n("Select Plugin Scan Folder"));
- connect( m_widget->dirNew, SIGNAL(clicked()), SLOT(dirNew()));
- connect( m_widget->dirRemove, SIGNAL(clicked()), SLOT(dirRemove()));
- connect( m_widget->dirUp, SIGNAL(clicked()), SLOT(dirUp()));
- connect( m_widget->dirDown, SIGNAL(clicked()), SLOT(dirDown()) );
- connect( m_widget->useArtsdsp, SIGNAL(clicked()),SLOT(change()));
+ connect( m_widget->dirNew, TQT_SIGNAL(clicked()), TQT_SLOT(dirNew()));
+ connect( m_widget->dirRemove, TQT_SIGNAL(clicked()), TQT_SLOT(dirRemove()));
+ connect( m_widget->dirUp, TQT_SIGNAL(clicked()), TQT_SLOT(dirUp()));
+ connect( m_widget->dirDown, TQT_SIGNAL(clicked()), TQT_SLOT(dirDown()) );
+ connect( m_widget->useArtsdsp, TQT_SIGNAL(clicked()),TQT_SLOT(change()));
connect( m_widget->dirEdit,
- SIGNAL(textChanged(const QString&)),
- SLOT(dirEdited(const QString &)) );
+ TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(dirEdited(const TQString &)) );
connect( m_widget->dirList,
- SIGNAL(executed(QListBoxItem*)),
- SLOT(dirSelect(QListBoxItem*)) );
+ TQT_SIGNAL(executed(TQListBoxItem*)),
+ TQT_SLOT(dirSelect(TQListBoxItem*)) );
connect( m_widget->dirList,
- SIGNAL(selectionChanged(QListBoxItem*)),
- SLOT(dirSelect(QListBoxItem*)) );
+ TQT_SIGNAL(selectionChanged(TQListBoxItem*)),
+ TQT_SLOT(dirSelect(TQListBoxItem*)) );
}
void KPluginOptions::dirLoad( KConfig *config, bool useDefault )
{
- QStringList paths;
+ TQStringList paths;
// read search paths
@@ -409,8 +409,8 @@ void KPluginOptions::dirLoad( KConfig *config, bool useDefault )
void KPluginOptions::dirSave( KConfig *config )
{
// create stringlist
- QStringList paths;
- QListBoxItem *item = m_widget->dirList->firstItem();
+ TQStringList paths;
+ TQListBoxItem *item = m_widget->dirList->firstItem();
for ( ; item!=0; item=item->next() )
if ( !item->text().isEmpty() )
paths << item->text();
@@ -422,7 +422,7 @@ void KPluginOptions::dirSave( KConfig *config )
}
-void KPluginOptions::dirSelect( QListBoxItem *item )
+void KPluginOptions::dirSelect( TQListBoxItem *item )
{
m_widget->dirEdit->setEnabled( item!=0 );
m_widget->dirRemove->setEnabled( item!=0 );
@@ -430,16 +430,16 @@ void KPluginOptions::dirSelect( QListBoxItem *item )
unsigned cur = m_widget->dirList->index(m_widget->dirList->selectedItem());
m_widget->dirDown->setEnabled( item!=0 && cur<m_widget->dirList->count()-1 );
m_widget->dirUp->setEnabled( item!=0 && cur>0 );
- m_widget->dirEdit->setURL( item!=0 ? item->text() : QString::null );
+ m_widget->dirEdit->setURL( item!=0 ? item->text() : TQString::null );
}
void KPluginOptions::dirNew()
{
- m_widget->dirList->insertItem( QString::null, 0 );
+ m_widget->dirList->insertItem( TQString::null, 0 );
m_widget->dirList->setCurrentItem( 0 );
dirSelect( m_widget->dirList->selectedItem() );
- m_widget->dirEdit->setURL(QString::null);
+ m_widget->dirEdit->setURL(TQString::null);
m_widget->dirEdit->setFocus();
change();
}
@@ -447,7 +447,7 @@ void KPluginOptions::dirNew()
void KPluginOptions::dirRemove()
{
- m_widget->dirEdit->setURL(QString::null);
+ m_widget->dirEdit->setURL(TQString::null);
delete m_widget->dirList->selectedItem();
m_widget->dirRemove->setEnabled( false );
m_widget->dirUp->setEnabled( false );
@@ -461,7 +461,7 @@ void KPluginOptions::dirUp()
{
unsigned cur = m_widget->dirList->index(m_widget->dirList->selectedItem());
if ( cur>0 ) {
- QString txt = m_widget->dirList->text(cur-1);
+ TQString txt = m_widget->dirList->text(cur-1);
m_widget->dirList->removeItem( cur-1 );
m_widget->dirList->insertItem( txt, cur );
@@ -476,7 +476,7 @@ void KPluginOptions::dirDown()
{
unsigned cur = m_widget->dirList->index(m_widget->dirList->selectedItem());
if ( cur < m_widget->dirList->count()-1 ) {
- QString txt = m_widget->dirList->text(cur+1);
+ TQString txt = m_widget->dirList->text(cur+1);
m_widget->dirList->removeItem( cur+1 );
m_widget->dirList->insertItem( txt, cur );
@@ -487,7 +487,7 @@ void KPluginOptions::dirDown()
}
-void KPluginOptions::dirEdited(const QString &txt )
+void KPluginOptions::dirEdited(const TQString &txt )
{
if ( m_widget->dirList->currentText() != txt ) {
m_widget->dirList->blockSignals(true);
@@ -510,28 +510,28 @@ void KPluginOptions::pluginLoad( KConfig* /*config*/ )
{
kdDebug() << "-> KPluginOptions::fillPluginList" << endl;
m_widget->pluginList->clear();
- QRegExp version(";version=[^:]*:");
+ TQRegExp version(";version=[^:]*:");
// open the cache file
- QFile cachef( locate("data", "nsplugins/cache") );
+ TQFile cachef( locate("data", "nsplugins/cache") );
if ( !cachef.exists() || !cachef.open(IO_ReadOnly) ) {
kdDebug() << "Could not load plugin cache file!" << endl;
return;
}
- QTextStream cache(&cachef);
+ TQTextStream cache(&cachef);
// root object
- QListViewItem *root = new QListViewItem( m_widget->pluginList, i18n("Netscape Plugins") );
+ TQListViewItem *root = new TQListViewItem( m_widget->pluginList, i18n("Netscape Plugins") );
root->setOpen( true );
root->setSelectable( false );
root->setExpandable( true );
root->setPixmap(0, SmallIcon("netscape"));
// read in cache
- QString line, plugin;
- QListViewItem *next = 0;
- QListViewItem *lastMIME = 0;
+ TQString line, plugin;
+ TQListViewItem *next = 0;
+ TQListViewItem *lastMIME = 0;
while ( !cache.atEnd() ) {
line = cache.readLine();
@@ -545,7 +545,7 @@ void KPluginOptions::pluginLoad( KConfig* /*config*/ )
//kdDebug() << "plugin=" << plugin << endl;
// add plugin root item
- next = new QListViewItem( root, i18n("Plugin"), plugin );
+ next = new TQListViewItem( root, i18n("Plugin"), plugin );
next->setOpen( false );
next->setSelectable( false );
next->setExpandable( true );
@@ -555,24 +555,24 @@ void KPluginOptions::pluginLoad( KConfig* /*config*/ )
continue;
}
- QStringList desc = QStringList::split(':', line, TRUE);
- QString mime = desc[0].stripWhiteSpace();
- QString name = desc[2];
- QString suffixes = desc[1];
+ TQStringList desc = TQStringList::split(':', line, TRUE);
+ TQString mime = desc[0].stripWhiteSpace();
+ TQString name = desc[2];
+ TQString suffixes = desc[1];
if (!mime.isEmpty()) {
//kdDebug() << "mime=" << mime << " desc=" << name << " suffix=" << suffixes << endl;
- lastMIME = new QListViewItem( next, lastMIME, i18n("MIME type"), mime );
+ lastMIME = new TQListViewItem( next, lastMIME, i18n("MIME type"), mime );
lastMIME->setOpen( false );
lastMIME->setSelectable( false );
lastMIME->setExpandable( true );
- QListViewItem *last = new QListViewItem( lastMIME, 0, i18n("Description"), name );
+ TQListViewItem *last = new TQListViewItem( lastMIME, 0, i18n("Description"), name );
last->setOpen( false );
last->setSelectable( false );
last->setExpandable( false );
- last = new QListViewItem( lastMIME, last, i18n("Suffixes"), suffixes );
+ last = new TQListViewItem( lastMIME, last, i18n("Suffixes"), suffixes );
last->setOpen( false );
last->setSelectable( false );
last->setExpandable( false );
@@ -590,22 +590,22 @@ void KPluginOptions::pluginSave( KConfig* /*config*/ )
// == class PluginDomainDialog =====
-PluginDomainDialog::PluginDomainDialog(QWidget *parent) :
- QWidget(parent,"PluginDomainDialog") {
+PluginDomainDialog::PluginDomainDialog(TQWidget *parent) :
+ TQWidget(parent,"PluginDomainDialog") {
setCaption(i18n("Domain-Specific Policies"));
- thisLayout = new QVBoxLayout(this);
+ thisLayout = new TQVBoxLayout(this);
thisLayout->addSpacing(6);
- QFrame *hrule = new QFrame(this);
- hrule->setFrameStyle(QFrame::HLine | QFrame::Sunken);
+ TQFrame *hrule = new TQFrame(this);
+ hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
thisLayout->addWidget(hrule);
thisLayout->addSpacing(6);
- QBoxLayout *hl = new QHBoxLayout(this,0,6);
+ TQBoxLayout *hl = new TQHBoxLayout(this,0,6);
hl->addStretch(10);
- QPushButton *closePB = new KPushButton(KStdGuiItem::close(),this);
- connect(closePB,SIGNAL(clicked()),SLOT(slotClose()));
+ TQPushButton *closePB = new KPushButton(KStdGuiItem::close(),this);
+ connect(closePB,TQT_SIGNAL(clicked()),TQT_SLOT(slotClose()));
hl->addWidget(closePB);
thisLayout->addLayout(hl);
}
@@ -613,7 +613,7 @@ PluginDomainDialog::PluginDomainDialog(QWidget *parent) :
PluginDomainDialog::~PluginDomainDialog() {
}
-void PluginDomainDialog::setMainWidget(QWidget *widget) {
+void PluginDomainDialog::setMainWidget(TQWidget *widget) {
thisLayout->insertWidget(0,widget);
}
@@ -623,8 +623,8 @@ void PluginDomainDialog::slotClose() {
// == class PluginDomainListView =====
-PluginDomainListView::PluginDomainListView(KConfig *config,const QString &group,
- KPluginOptions *options,QWidget *parent,const char *name)
+PluginDomainListView::PluginDomainListView(KConfig *config,const TQString &group,
+ KPluginOptions *options,TQWidget *parent,const char *name)
: DomainListView(config,i18n( "Doma&in-Specific" ), parent, name),
group(group), options(options) {
}
@@ -634,7 +634,7 @@ PluginDomainListView::~PluginDomainListView() {
void PluginDomainListView::setupPolicyDlg(PushButton trigger,PolicyDialog &pDlg,
Policies *pol) {
- QString caption;
+ TQString caption;
switch (trigger) {
case AddButton:
caption = i18n( "New Plugin Policy" );
diff --git a/kcontrol/konqhtml/pluginopts.h b/kcontrol/konqhtml/pluginopts.h
index 46142dcf7..60c89b57e 100644
--- a/kcontrol/konqhtml/pluginopts.h
+++ b/kcontrol/konqhtml/pluginopts.h
@@ -11,7 +11,7 @@
#ifndef __PLUGINOPTS_H__
#define __PLUGINOPTS_H__
-#include <qwidget.h>
+#include <tqwidget.h>
#include "domainlistview.h"
#include "policies.h"
@@ -44,8 +44,8 @@ public:
* @param domain name of the domain this instance is used to configure the
* policies for (case insensitive, ignored if global == true)
*/
- PluginPolicies(KConfig* config, const QString &group, bool global,
- const QString &domain = QString::null);
+ PluginPolicies(KConfig* config, const TQString &group, bool global,
+ const TQString &domain = TQString::null);
virtual ~PluginPolicies();
};
@@ -55,8 +55,8 @@ public:
class PluginDomainListView : public DomainListView {
Q_OBJECT
public:
- PluginDomainListView(KConfig *config,const QString &group,KPluginOptions *opt,
- QWidget *parent,const char *name = 0);
+ PluginDomainListView(KConfig *config,const TQString &group,KPluginOptions *opt,
+ TQWidget *parent,const char *name = 0);
virtual ~PluginDomainListView();
protected:
@@ -66,28 +66,28 @@ protected:
Policies *copy);
private:
- QString group;
+ TQString group;
KPluginOptions *options;
};
/**
* dialog for embedding a PluginDomainListView widget
*/
-class PluginDomainDialog : public QWidget {
+class PluginDomainDialog : public TQWidget {
Q_OBJECT
public:
- PluginDomainDialog(QWidget *parent);
+ PluginDomainDialog(TQWidget *parent);
virtual ~PluginDomainDialog();
- void setMainWidget(QWidget *widget);
+ void setMainWidget(TQWidget *widget);
private slots:
virtual void slotClose();
private:
PluginDomainListView *domainSpecific;
- QBoxLayout *thisLayout;
+ TQBoxLayout *thisLayout;
};
class KPluginOptions : public KCModule
@@ -95,14 +95,14 @@ class KPluginOptions : public KCModule
Q_OBJECT
public:
- KPluginOptions( KConfig* config, QString group, QWidget* parent = 0, const char* name = 0 );
+ KPluginOptions( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
~KPluginOptions();
virtual void load();
virtual void load( bool useDefaults );
virtual void save();
virtual void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
private slots:
void slotChanged();
@@ -112,9 +112,9 @@ private slots:
private:
KConfig* m_pConfig;
- QString m_groupname;
+ TQString m_groupname;
- QCheckBox *enablePluginsGloballyCB, *enableHTTPOnly, *enableUserDemand;
+ TQCheckBox *enablePluginsGloballyCB, *enableHTTPOnly, *enableUserDemand;
protected slots:
@@ -129,10 +129,10 @@ private:
private:
NSConfigWidget *m_widget;
bool m_changed;
- QProgressDialog *m_progress;
+ TQProgressDialog *m_progress;
KProcIO* m_nspluginscan;
- QSlider *priority;
- QLabel *priorityLabel;
+ TQSlider *priority;
+ TQLabel *priorityLabel;
PluginPolicies global_policies;
PluginDomainListView *domainSpecific;
KDialogBase *domainSpecificDlg;
@@ -148,8 +148,8 @@ private:
void dirRemove();
void dirUp();
void dirDown();
- void dirEdited(const QString &);
- void dirSelect( QListBoxItem * );
+ void dirEdited(const TQString &);
+ void dirSelect( TQListBoxItem * );
/******************************************************************************/
protected:
diff --git a/kcontrol/konqhtml/policies.cpp b/kcontrol/konqhtml/policies.cpp
index 153c80888..524bd4d15 100644
--- a/kcontrol/konqhtml/policies.cpp
+++ b/kcontrol/konqhtml/policies.cpp
@@ -26,14 +26,14 @@
// == class Policies ==
-Policies::Policies(KConfig* config,const QString &group,
- bool global,const QString &domain, const QString &prefix,
- const QString &feature_key) :
+Policies::Policies(KConfig* config,const TQString &group,
+ bool global,const TQString &domain, const TQString &prefix,
+ const TQString &feature_key) :
is_global(global), config(config), groupname(group),
prefix(prefix), feature_key(feature_key) {
if (is_global) {
- this->prefix = QString::null; // global keys have no prefix
+ this->prefix = TQString::null; // global keys have no prefix
}/*end if*/
setDomain(domain);
}
@@ -41,7 +41,7 @@ Policies::Policies(KConfig* config,const QString &group,
Policies::~Policies() {
}
-void Policies::setDomain(const QString &domain) {
+void Policies::setDomain(const TQString &domain) {
if (is_global) return;
this->domain = domain.lower();
groupname = this->domain; // group is domain in this case
@@ -50,7 +50,7 @@ void Policies::setDomain(const QString &domain) {
void Policies::load() {
config->setGroup(groupname);
- QString key = prefix + feature_key;
+ TQString key = prefix + feature_key;
if (config->hasKey(key))
feature_enabled = config->readBoolEntry(key);
else
@@ -64,7 +64,7 @@ void Policies::defaults() {
void Policies::save() {
config->setGroup(groupname);
- QString key = prefix + feature_key;
+ TQString key = prefix + feature_key;
if (feature_enabled != INHERIT_POLICY)
config->writeEntry(key, (bool)feature_enabled);
else
diff --git a/kcontrol/konqhtml/policies.h b/kcontrol/konqhtml/policies.h
index b5643c0bd..a9814396a 100644
--- a/kcontrol/konqhtml/policies.h
+++ b/kcontrol/konqhtml/policies.h
@@ -22,7 +22,7 @@
#ifndef __POLICIES_H__
#define __POLICIES_H__
-#include <qstring.h>
+#include <tqstring.h>
class KConfig;
@@ -54,9 +54,9 @@ public:
* @param feature_key key of the "feature enabled" policy. The final
* key the policy is stored under will be prefix + featureKey.
*/
- Policies(KConfig* config, const QString &group, bool global,
- const QString &domain, const QString &prefix,
- const QString &feature_key);
+ Policies(KConfig* config, const TQString &group, bool global,
+ const TQString &domain, const TQString &prefix,
+ const TQString &feature_key);
virtual ~Policies();
@@ -70,7 +70,7 @@ public:
/** sets a new domain for this policy
* @param domain domain name, will be converted to lowercase
*/
- void setDomain(const QString &domain);
+ void setDomain(const TQString &domain);
/**
* Returns whether the "feature enabled" policy is inherited.
@@ -124,10 +124,10 @@ protected:
bool is_global;
KConfig *config;
- QString groupname;
- QString domain;
- QString prefix;
- QString feature_key;
+ TQString groupname;
+ TQString domain;
+ TQString prefix;
+ TQString feature_key;
};
#endif // __POLICIES_H__
diff --git a/kcontrol/konqhtml/policydlg.cpp b/kcontrol/konqhtml/policydlg.cpp
index 801068d3a..4f1529ed8 100644
--- a/kcontrol/konqhtml/policydlg.cpp
+++ b/kcontrol/konqhtml/policydlg.cpp
@@ -2,48 +2,48 @@
// (C) 2002 Leo Savernik <l.savernik@aon.at>
// Generalizing the policy dialog
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qwhatsthis.h>
-#include <qcombobox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqwhatsthis.h>
+#include <tqcombobox.h>
#include <klocale.h>
#include <kbuttonbox.h>
#include <kmessagebox.h>
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
#include "policydlg.h"
#include "policies.h"
-PolicyDialog::PolicyDialog( Policies *policies, QWidget *parent, const char *name )
- : KDialogBase(parent, name, true, QString::null, Ok|Cancel, Ok, true),
+PolicyDialog::PolicyDialog( Policies *policies, TQWidget *parent, const char *name )
+ : KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true),
policies(policies)
{
- QFrame *main = makeMainWidget();
+ TQFrame *main = makeMainWidget();
insertIdx = 1; // index where to insert additional panels
- topl = new QVBoxLayout(main, 0, spacingHint());
+ topl = new TQVBoxLayout(main, 0, spacingHint());
- QGridLayout *grid = new QGridLayout(topl, 2, 2);
+ TQGridLayout *grid = new TQGridLayout(topl, 2, 2);
grid->setColStretch(1, 1);
- QLabel *l = new QLabel(i18n("&Host or domain name:"), main);
+ TQLabel *l = new TQLabel(i18n("&Host or domain name:"), main);
grid->addWidget(l, 0, 0);
- le_domain = new QLineEdit(main);
+ le_domain = new TQLineEdit(main);
l->setBuddy( le_domain );
grid->addWidget(le_domain, 0, 1);
- connect( le_domain,SIGNAL(textChanged( const QString & )),
- SLOT(slotTextChanged( const QString &)));
+ connect( le_domain,TQT_SIGNAL(textChanged( const TQString & )),
+ TQT_SLOT(slotTextChanged( const TQString &)));
- QWhatsThis::add(le_domain, i18n("Enter the name of a host (like www.kde.org) "
+ TQWhatsThis::add(le_domain, i18n("Enter the name of a host (like www.kde.org) "
"or a domain, starting with a dot (like .kde.org or .org)") );
- l_feature_policy = new QLabel(main);
+ l_feature_policy = new TQLabel(main);
grid->addWidget(l_feature_policy, 1, 0);
- cb_feature_policy = new QComboBox(main);
+ cb_feature_policy = new TQComboBox(main);
l_feature_policy->setBuddy( cb_feature_policy );
policy_values << i18n("Use Global") << i18n("Accept") << i18n("Reject");
cb_feature_policy->insertStringList(policy_values);
@@ -58,12 +58,12 @@ PolicyDialog::FeatureEnabledPolicy PolicyDialog::featureEnabledPolicy() const {
return (FeatureEnabledPolicy)cb_feature_policy->currentItem();
}
-void PolicyDialog::slotTextChanged( const QString &text)
+void PolicyDialog::slotTextChanged( const TQString &text)
{
enableButtonOK(!text.isEmpty());
}
-void PolicyDialog::setDisableEdit( bool state, const QString& text )
+void PolicyDialog::setDisableEdit( bool state, const TQString& text )
{
le_domain->setText( text );
@@ -85,24 +85,24 @@ void PolicyDialog::refresh() {
cb_feature_policy->setCurrentItem(pol);
}
-void PolicyDialog::setFeatureEnabledLabel(const QString &text) {
+void PolicyDialog::setFeatureEnabledLabel(const TQString &text) {
l_feature_policy->setText(text);
}
-void PolicyDialog::setFeatureEnabledWhatsThis(const QString &text) {
- QWhatsThis::add(cb_feature_policy, text);
+void PolicyDialog::setFeatureEnabledWhatsThis(const TQString &text) {
+ TQWhatsThis::add(cb_feature_policy, text);
}
-void PolicyDialog::addPolicyPanel(QWidget *panel) {
+void PolicyDialog::addPolicyPanel(TQWidget *panel) {
topl->insertWidget(insertIdx++,panel);
}
-QString PolicyDialog::featureEnabledPolicyText() const {
+TQString PolicyDialog::featureEnabledPolicyText() const {
int pol = cb_feature_policy->currentItem();
if (pol >= 0 && pol < 3) // Keep in sync with FeatureEnabledPolicy
return policy_values[pol];
else
- return QString::null;
+ return TQString::null;
}
void PolicyDialog::accept()
@@ -122,7 +122,7 @@ void PolicyDialog::accept()
} else {
policies->setFeatureEnabled(true);
}
- QDialog::accept();
+ TQDialog::accept();
}
#include "policydlg.moc"
diff --git a/kcontrol/konqhtml/policydlg.h b/kcontrol/konqhtml/policydlg.h
index 6922aa736..bfb63e4f2 100644
--- a/kcontrol/konqhtml/policydlg.h
+++ b/kcontrol/konqhtml/policydlg.h
@@ -7,8 +7,8 @@
#include <kdialogbase.h>
-#include <qlineedit.h>
-#include <qstringlist.h>
+#include <tqlineedit.h>
+#include <tqstringlist.h>
class QLabel;
class QComboBox;
@@ -47,7 +47,7 @@ public:
* @param parent parent widget this belongs to
* @param name internal name
*/
- PolicyDialog(Policies *policies, QWidget *parent = 0, const char *name = 0 );
+ PolicyDialog(Policies *policies, TQWidget *parent = 0, const char *name = 0 );
virtual ~PolicyDialog() {};
@@ -61,12 +61,12 @@ public:
* @return the textual representation of the current "feature enabled"
* policy
*/
- QString featureEnabledPolicyText() const;
+ TQString featureEnabledPolicyText() const;
/*
* @return the hostname for which the policy is being set
*/
- QString domain() const { return le_domain->text(); }
+ TQString domain() const { return le_domain->text(); }
/*
* Sets the line-edit to be enabled/disabled.
@@ -77,20 +77,20 @@ public:
* @param state @p true to enable the line-edit, otherwise disabled.
* @param text the text to be set in the line-edit. Default is NULL.
*/
- void setDisableEdit( bool /*state*/, const QString& text = QString::null );
+ void setDisableEdit( bool /*state*/, const TQString& text = TQString::null );
/**
* Sets the label for the "feature enabled" policy
* @param text label text
*/
- void setFeatureEnabledLabel(const QString &text);
+ void setFeatureEnabledLabel(const TQString &text);
/**
* Sets the "What's This" text for the "feature enabled" policy
* combo box.
* @param text what's-this text
*/
- void setFeatureEnabledWhatsThis(const QString &text);
+ void setFeatureEnabledWhatsThis(const TQString &text);
/**
* Syncs the controls with the current content of the
@@ -108,23 +108,23 @@ public:
* @param panel pointer to widget to insert. The dialog takes ownership
* of it, but does not reparent it.
*/
- void addPolicyPanel(QWidget *panel);
+ void addPolicyPanel(TQWidget *panel);
protected slots:
virtual void accept();
- void slotTextChanged( const QString &text);
+ void slotTextChanged( const TQString &text);
private:
Policies *policies;
- QVBoxLayout *topl;
+ TQVBoxLayout *topl;
int insertIdx;
- QLineEdit *le_domain;
- QLabel *l_feature_policy;
- QComboBox *cb_feature_policy;
- QWidget *panel;
- QStringList policy_values;
- QPushButton *okButton;
+ TQLineEdit *le_domain;
+ TQLabel *l_feature_policy;
+ TQComboBox *cb_feature_policy;
+ TQWidget *panel;
+ TQStringList policy_values;
+ TQPushButton *okButton;
};
#endif
diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 19b547366..64ecc45d9 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -15,10 +15,10 @@
* *
***************************************************************************/
-#include <qcheckbox.h>
-#include <qlayout.h>
-#include <qstringlist.h>
-#include <qtabwidget.h>
+#include <tqcheckbox.h>
+#include <tqlayout.h>
+#include <tqstringlist.h>
+#include <tqtabwidget.h>
#include <dcopclient.h>
@@ -33,10 +33,10 @@
#include "sessioneditor.h"
#include "kcmkonsole.h"
-typedef KGenericFactory<KCMKonsole, QWidget> ModuleFactory;
+typedef KGenericFactory<KCMKonsole, TQWidget> ModuleFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_konsole, ModuleFactory("kcmkonsole") )
-KCMKonsole::KCMKonsole(QWidget * parent, const char *name, const QStringList&)
+KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&)
:KCModule(ModuleFactory::instance(), parent, name)
{
@@ -45,7 +45,7 @@ KCMKonsole::KCMKonsole(QWidget * parent, const char *name, const QStringList&)
"configured using the RMB) and you can edit the schemas and sessions "
"available to Konsole."));
- QVBoxLayout *topLayout = new QVBoxLayout(this);
+ TQVBoxLayout *topLayout = new TQVBoxLayout(this);
dialog = new KCMKonsoleDialog(this);
dialog->line_spacingSB->setRange(0, 8, 1, false);
dialog->line_spacingSB->setSpecialValueText(i18n("normal line spacing", "Normal"));
@@ -60,24 +60,24 @@ KCMKonsole::KCMKonsole(QWidget * parent, const char *name, const QStringList&)
ab->addAuthor("Andrea Rizzi",0, "rizzi@kde.org");
setAboutData( ab );
- connect(dialog->terminalSizeHintCB,SIGNAL(toggled(bool)), SLOT( changed() ));
- connect(dialog->warnCB,SIGNAL(toggled(bool)), SLOT( changed() ));
- connect(dialog->ctrldragCB,SIGNAL(toggled(bool)), SLOT( changed() ));
- connect(dialog->cutToBeginningOfLineCB,SIGNAL(toggled(bool)), SLOT( changed() ));
- connect(dialog->allowResizeCB,SIGNAL(toggled(bool)), SLOT( changed() ));
- connect(dialog->bidiCB,SIGNAL(toggled(bool)), SLOT( changed() ));
- connect(dialog->xonXoffCB,SIGNAL(toggled(bool)), SLOT( changed() ));
- connect(dialog->blinkingCB,SIGNAL(toggled(bool)), SLOT( changed() ));
- connect(dialog->frameCB,SIGNAL(toggled(bool)), SLOT( changed() ));
- connect(dialog->line_spacingSB,SIGNAL(valueChanged(int)), SLOT( changed() ));
- connect(dialog->matchTabWinTitleCB,SIGNAL(toggled(bool)), SLOT( changed() ));
- connect(dialog->silence_secondsSB,SIGNAL(valueChanged(int)), SLOT( changed() ));
- connect(dialog->word_connectorLE,SIGNAL(textChanged(const QString &)), SLOT( changed() ));
- connect(dialog->SchemaEditor1, SIGNAL(changed()), SLOT( changed() ));
- connect(dialog->SessionEditor1, SIGNAL(changed()), SLOT( changed() ));
- connect(dialog->SchemaEditor1, SIGNAL(schemaListChanged(const QStringList &,const QStringList &)),
- dialog->SessionEditor1, SLOT(schemaListChanged(const QStringList &,const QStringList &)));
- connect(dialog->SessionEditor1, SIGNAL(getList()), dialog->SchemaEditor1, SLOT(getList()));
+ connect(dialog->terminalSizeHintCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+ connect(dialog->warnCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+ connect(dialog->ctrldragCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+ connect(dialog->cutToBeginningOfLineCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+ connect(dialog->allowResizeCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+ connect(dialog->bidiCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+ connect(dialog->xonXoffCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+ connect(dialog->blinkingCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+ connect(dialog->frameCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+ connect(dialog->line_spacingSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
+ connect(dialog->matchTabWinTitleCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+ connect(dialog->silence_secondsSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
+ connect(dialog->word_connectorLE,TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT( changed() ));
+ connect(dialog->SchemaEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
+ connect(dialog->SessionEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
+ connect(dialog->SchemaEditor1, TQT_SIGNAL(schemaListChanged(const TQStringList &,const TQStringList &)),
+ dialog->SessionEditor1, TQT_SLOT(schemaListChanged(const TQStringList &,const TQStringList &)));
+ connect(dialog->SessionEditor1, TQT_SIGNAL(getList()), dialog->SchemaEditor1, TQT_SLOT(getList()));
}
void KCMKonsole::load()
@@ -152,9 +152,9 @@ void KCMKonsole::save()
emit changed(false);
DCOPClient *dcc = kapp->dcopClient();
- dcc->send("konsole-*", "konsole", "reparseConfiguration()", QByteArray());
- dcc->send("kdesktop", "default", "configure()", QByteArray());
- dcc->send("klauncher", "klauncher", "reparseConfiguration()", QByteArray());
+ dcc->send("konsole-*", "konsole", "reparseConfiguration()", TQByteArray());
+ dcc->send("kdesktop", "default", "configure()", TQByteArray());
+ dcc->send("klauncher", "klauncher", "reparseConfiguration()", TQByteArray());
if (xonXoffOrig != xonXoffNew)
{
diff --git a/kcontrol/konsole/kcmkonsole.h b/kcontrol/konsole/kcmkonsole.h
index ae6ee069b..bf93d1cfb 100644
--- a/kcontrol/konsole/kcmkonsole.h
+++ b/kcontrol/konsole/kcmkonsole.h
@@ -31,7 +31,7 @@ class KCMKonsole
Q_OBJECT
public:
- KCMKonsole (QWidget *parent = 0, const char *name = 0, const QStringList& = 0);
+ KCMKonsole (TQWidget *parent = 0, const char *name = 0, const TQStringList& = 0);
void load();
void load(bool useDefaults);
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index f7591bee8..17eaadc3c 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -23,43 +23,43 @@
#include <dcopclient.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qwmatrix.h>
-#include <qcombobox.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
+#include <tqwmatrix.h>
+#include <tqcombobox.h>
#include <kdebug.h>
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
#include <kstandarddirs.h>
//#include <errno.h>
-#include <qslider.h>
+#include <tqslider.h>
#include <klocale.h>
#include <kfiledialog.h>
#include <kinputdialog.h>
-#include <qtoolbutton.h>
+#include <tqtoolbutton.h>
#include <kmessagebox.h>
#include <ksharedpixmap.h>
#include <kimageeffect.h>
-#include <qimage.h>
+#include <tqimage.h>
// SchemaListBoxText is a list box text item with schema filename
class SchemaListBoxText : public QListBoxText
{
public:
- SchemaListBoxText(const QString &title, const QString &filename): QListBoxText(title)
+ SchemaListBoxText(const TQString &title, const TQString &filename): TQListBoxText(title)
{
m_filename = filename;
};
- const QString filename() { return m_filename; };
+ const TQString filename() { return m_filename; };
private:
- QString m_filename;
+ TQString m_filename;
};
-SchemaEditor::SchemaEditor(QWidget * parent, const char *name)
+SchemaEditor::SchemaEditor(TQWidget * parent, const char *name)
:SchemaDialog(parent, name)
{
schMod= false;
@@ -75,14 +75,14 @@ SchemaEditor::SchemaEditor(QWidget * parent, const char *name)
defaultSchema = "";
spix = new KSharedPixmap;
- connect(spix, SIGNAL(done(bool)), SLOT(previewLoaded(bool)));
+ connect(spix, TQT_SIGNAL(done(bool)), TQT_SLOT(previewLoaded(bool)));
DCOPClient *client = kapp->dcopClient();
if (!client->isAttached())
client->attach();
- QByteArray data;
+ TQByteArray data;
- QDataStream args(data, IO_WriteOnly);
+ TQDataStream args(data, IO_WriteOnly);
args << 1;
client->send("kdesktop", "KBackgroundIface", "setExport(int)", data);
@@ -94,36 +94,36 @@ SchemaEditor::SchemaEditor(QWidget * parent, const char *name)
KGlobal::locale()->insertCatalogue("konsole"); // For schema translations
- connect(imageBrowse, SIGNAL(clicked()), this, SLOT(imageSelect()));
- connect(saveButton, SIGNAL(clicked()), this, SLOT(saveCurrent()));
- connect(removeButton, SIGNAL(clicked()), this, SLOT(removeCurrent()));
- connect(colorCombo, SIGNAL(activated(int)), this, SLOT(slotColorChanged(int)));
- connect(typeCombo, SIGNAL(activated(int)), this, SLOT(slotTypeChanged(int)));
- connect(schemaList, SIGNAL(highlighted(int)), this, SLOT(readSchema(int)));
- connect(shadeColor, SIGNAL(changed(const QColor&)), this, SLOT(updatePreview()));
- connect(shadeSlide, SIGNAL(valueChanged(int)), this, SLOT(updatePreview()));
- connect(transparencyCheck, SIGNAL(toggled(bool)), this, SLOT(updatePreview()));
- connect(backgndLine, SIGNAL(returnPressed()), this, SLOT(updatePreview()));
-
- connect(titleLine, SIGNAL(textChanged(const QString&)), this, SLOT(schemaModified()));
- connect(shadeColor, SIGNAL(changed(const QColor&)), this, SLOT(schemaModified()));
- connect(shadeSlide, SIGNAL(valueChanged(int)), this, SLOT(schemaModified()));
- connect(transparencyCheck, SIGNAL(toggled(bool)), this, SLOT(schemaModified()));
- connect(modeCombo, SIGNAL(activated(int)), this, SLOT(schemaModified()));
- connect(backgndLine, SIGNAL(returnPressed()), this, SLOT(schemaModified()));
- connect(transparentCheck, SIGNAL(toggled(bool)), this, SLOT(schemaModified()));
- connect(boldCheck, SIGNAL(toggled(bool)), this, SLOT(schemaModified()));
- connect(colorButton, SIGNAL(changed(const QColor&)), this, SLOT(schemaModified()));
- connect(backgndLine, SIGNAL(textChanged(const QString&)), this, SLOT(schemaModified()));
-
- connect(defaultSchemaCB, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+ connect(imageBrowse, TQT_SIGNAL(clicked()), this, TQT_SLOT(imageSelect()));
+ connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent()));
+ connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent()));
+ connect(colorCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotColorChanged(int)));
+ connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTypeChanged(int)));
+ connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
+ connect(shadeColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updatePreview()));
+ connect(shadeSlide, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updatePreview()));
+ connect(transparencyCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updatePreview()));
+ connect(backgndLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(updatePreview()));
+
+ connect(titleLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(schemaModified()));
+ connect(shadeColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(schemaModified()));
+ connect(shadeSlide, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(schemaModified()));
+ connect(transparencyCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified()));
+ connect(modeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(schemaModified()));
+ connect(backgndLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(schemaModified()));
+ connect(transparentCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified()));
+ connect(boldCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified()));
+ connect(colorButton, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(schemaModified()));
+ connect(backgndLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(schemaModified()));
+
+ connect(defaultSchemaCB, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()));
removeButton->setEnabled( schemaList->currentItem() );
}
-QString SchemaEditor::schema()
+TQString SchemaEditor::schema()
{
- QString filename = defaultSchema;
+ TQString filename = defaultSchema;
int i = schemaList->currentItem();
if (defaultSchemaCB->isChecked() && i>=0)
@@ -133,7 +133,7 @@ QString SchemaEditor::schema()
}
-void SchemaEditor::setSchema(QString sch)
+void SchemaEditor::setSchema(TQString sch)
{
defaultSchema = sch;
sch = locate("data", "konsole/"+sch);
@@ -163,21 +163,21 @@ void SchemaEditor::updatePreview()
if (transparencyCheck->isChecked()) {
if (loaded) {
float rx = (100.0 - shadeSlide->value()) / 100;
- QImage ima(pix.convertToImage());
+ TQImage ima(pix.convertToImage());
ima = KImageEffect::fade(ima, rx, shadeColor->color());
- QPixmap pm;
+ TQPixmap pm;
pm.convertFromImage(ima);
previewPixmap->setPixmap(pm);
previewPixmap->setScaledContents(true);
}
else //try to reload
{
- if(!spix->loadFromShared(QString("DESKTOP1")))
+ if(!spix->loadFromShared(TQString("DESKTOP1")))
kdDebug(0) << "cannot load" << endl;
}
} else {
- QPixmap pm;
+ TQPixmap pm;
pm.load(backgndLine->text());
if ( pm.isNull() ) {
previewPixmap->clear();
@@ -192,11 +192,11 @@ void SchemaEditor::updatePreview()
void SchemaEditor::previewLoaded(bool l)
{
if (l) {
- QWMatrix mat;
+ TQWMatrix mat;
pix =
spix->xForm(mat.
- scale(180.0 / spix->QPixmap::width(),
- 100.0 / spix->QPixmap::height()));
+ scale(180.0 / spix->TQPixmap::width(),
+ 100.0 / spix->TQPixmap::height()));
kdDebug(0) << "Loaded" << endl;
loaded = true;
if (transparencyCheck->isChecked()) {
@@ -226,19 +226,19 @@ void SchemaEditor::show()
}
-void SchemaEditor::loadAllSchema(QString currentFile)
+void SchemaEditor::loadAllSchema(TQString currentFile)
{
- QStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.schema");
- QStringList::ConstIterator it;
- disconnect(schemaList, SIGNAL(highlighted(int)), this, SLOT(readSchema(int)));
+ TQStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.schema");
+ TQStringList::ConstIterator it;
+ disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
schemaList->clear();
- QListBoxItem* currentItem = 0;
+ TQListBoxItem* currentItem = 0;
for (it = list.begin(); it != list.end(); ++it) {
- QString name = (*it);
+ TQString name = (*it);
- QString title = readSchemaTitle(name);
+ TQString title = readSchemaTitle(name);
// Only insert new items so that local items override global
if (schemaList->findItem(title, ExactMatch) == 0) {
@@ -253,17 +253,17 @@ void SchemaEditor::loadAllSchema(QString currentFile)
schemaList->sort();
schemaList->setCurrentItem(0); // select the first added item correctly too
schemaList->setCurrentItem(currentItem);
- connect(schemaList, SIGNAL(highlighted(int)), this, SLOT(readSchema(int)));
+ connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
schemaListChanged();
}
void SchemaEditor::imageSelect()
{
- QString start;
+ TQString start;
start = backgndLine->text();
if (start.isEmpty())
{
- QStringList list=KGlobal::dirs()->resourceDirs("wallpaper");
+ TQStringList list=KGlobal::dirs()->resourceDirs("wallpaper");
if(list.count()>0)
start= list.last();
}
@@ -310,7 +310,7 @@ void SchemaEditor::removeCurrent()
int i = schemaList->currentItem();
if(i==-1)
return;
- QString base = ((SchemaListBoxText *) schemaList->item(i))->filename();
+ TQString base = ((SchemaListBoxText *) schemaList->item(i))->filename();
// Query if system schemas should be removed
if (locateLocal("data", "konsole/" + base.section('/', -1)) != base) {
@@ -322,12 +322,12 @@ void SchemaEditor::removeCurrent()
return;
}
- QString base_filename = base.section('/',-1);
+ TQString base_filename = base.section('/',-1);
if(base_filename==schema())
setSchema("");
- if (!QFile::remove(base))
+ if (!TQFile::remove(base))
KMessageBox::error(this,
i18n("Cannot remove the schema.\nMaybe it is a system schema.\n"),
i18n("Error Removing Schema"));
@@ -345,7 +345,7 @@ void SchemaEditor::saveCurrent()
colorCombo->setCurrentItem(0);
slotColorChanged(0);
- QString fullpath;
+ TQString fullpath;
if (schemaList->currentText() == titleLine->text()) {
int i = schemaList->currentItem();
fullpath = ((SchemaListBoxText *) schemaList->item(i))->filename().section('/',-1);
@@ -363,25 +363,25 @@ void SchemaEditor::saveCurrent()
if (fullpath[0] != '/')
fullpath = KGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
- QFile f(fullpath);
+ TQFile f(fullpath);
if (f.open(IO_WriteOnly)) {
- QTextStream t(&f);
- t.setEncoding( QTextStream::UnicodeUTF8 );
+ TQTextStream t(&f);
+ t.setEncoding( TQTextStream::UnicodeUTF8 );
t << "# schema for konsole autogenerated with the schema editor" << endl;
t << endl;
t << "title " << titleLine->text() << endl; // Use title line as schema title
t << endl;
if (transparencyCheck->isChecked()) {
- QColor c = shadeColor->color();
- QString tra;
+ TQColor c = shadeColor->color();
+ TQString tra;
tra.sprintf("transparency %1.2f %3d %3d %3d",
1.0 * (100 - shadeSlide->value()) / 100, c.red(), c.green(), c.blue());
t << tra << endl;
}
if (!backgndLine->text().isEmpty()) {
- QString smode;
+ TQString smode;
int mode;
mode = modeCombo->currentItem();
if (mode == 0)
@@ -391,7 +391,7 @@ void SchemaEditor::saveCurrent()
if (mode == 2)
smode = "full";
- QString image;
+ TQString image;
image.sprintf("image %s %s",
(const char *) smode.latin1(),
(const char *) backgndLine->text().utf8());
@@ -408,7 +408,7 @@ void SchemaEditor::saveCurrent()
t << "# V V--color--V V V" << endl;
for (int i = 0; i < 20; i++) {
- QString scol;
+ TQString scol;
if (type[i] == 0)
scol.sprintf("color %2d %3d %3d %3d %2d %1d # %s", i,
color[i].red(), color[i].green(), color[i].blue(),
@@ -451,7 +451,7 @@ void SchemaEditor::schemaModified()
}
}
-QString SchemaEditor::readSchemaTitle(const QString & file)
+TQString SchemaEditor::readSchemaTitle(const TQString & file)
{
/*
Code taken from konsole/konsole/schema.cpp
@@ -459,7 +459,7 @@ QString SchemaEditor::readSchemaTitle(const QString & file)
*/
- QString fPath = locate("data", "konsole/" + file);
+ TQString fPath = locate("data", "konsole/" + file);
if (fPath.isNull())
fPath = locate("data", file);
@@ -467,7 +467,7 @@ QString SchemaEditor::readSchemaTitle(const QString & file)
if (fPath.isNull())
return 0;
- FILE *sysin = fopen(QFile::encodeName(fPath), "r");
+ FILE *sysin = fopen(TQFile::encodeName(fPath), "r");
if (!sysin)
return 0;
@@ -485,7 +485,7 @@ QString SchemaEditor::readSchemaTitle(const QString & file)
void SchemaEditor::schemaListChanged()
{
- QStringList titles, filenames;
+ TQStringList titles, filenames;
SchemaListBoxText *item;
for (int index = 0; index < (int) schemaList->count(); index++) {
@@ -528,17 +528,17 @@ void SchemaEditor::readSchema(int num)
}
if(schMod) {
- disconnect(schemaList, SIGNAL(highlighted(int)), this, SLOT(readSchema(int)));
+ disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
schemaList->setCurrentItem(oldSchema);
querySave();
schemaList->setCurrentItem(num);
- connect(schemaList, SIGNAL(highlighted(int)), this, SLOT(readSchema(int)));
+ connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
schMod=false;
}
}
- QString fPath = locate("data", "konsole/" +
+ TQString fPath = locate("data", "konsole/" +
((SchemaListBoxText *) schemaList->item(num))->filename());
if (fPath.isNull())
@@ -552,10 +552,10 @@ void SchemaEditor::readSchema(int num)
return;
}
- removeButton->setEnabled( QFileInfo (fPath).isWritable () );
+ removeButton->setEnabled( TQFileInfo (fPath).isWritable () );
defaultSchemaCB->setChecked(fPath.section('/',-1) == defaultSchema.section('/',-1));
- FILE *sysin = fopen(QFile::encodeName(fPath), "r");
+ FILE *sysin = fopen(TQFile::encodeName(fPath), "r");
if (!sysin) {
KMessageBox::error(this, i18n("Cannot load the schema."),
i18n("Error Loading Schema"));
@@ -593,7 +593,7 @@ void SchemaEditor::readSchema(int num)
else
continue;
- QString qline(line);
+ TQString qline(line);
backgndLine->setText(locate("wallpaper", qline.mid( qline.find(" ",7)+1 ) ));
modeCombo->setCurrentItem(attr - 2);
@@ -610,7 +610,7 @@ void SchemaEditor::readSchema(int num)
transparencyCheck->setChecked(true);
shadeSlide->setValue((int)(100 - rx * 100));
- shadeColor->setColor(QColor(rr, rg, rb));
+ shadeColor->setColor(TQColor(rr, rg, rb));
}
if (!strncmp(line,"rcolor",6)) {
@@ -628,7 +628,7 @@ void SchemaEditor::readSchema(int num)
continue;
if (!(0 <= bo && bo <= 1 ))
continue;
- color[fi] = QColor();
+ color[fi] = TQColor();
color[fi].setHsv(ch,cs,cv);
transparent[fi] = tr;
bold[fi] = bo;
@@ -650,7 +650,7 @@ void SchemaEditor::readSchema(int num)
continue;
if (!(0 <= bo && bo <= 1))
continue;
- color[fi] = QColor(cr, cg, cb);
+ color[fi] = TQColor(cr, cg, cb);
transparent[fi] = tr;
bold[fi] = bo;
type[fi] = 0;
diff --git a/kcontrol/konsole/schemaeditor.h b/kcontrol/konsole/schemaeditor.h
index 550f51762..9b17f169d 100644
--- a/kcontrol/konsole/schemaeditor.h
+++ b/kcontrol/konsole/schemaeditor.h
@@ -23,7 +23,7 @@
#endif
#include <kapplication.h>
-#include <qwidget.h>
+#include <tqwidget.h>
class QPixmap;
class KSharedPixmap;
@@ -35,18 +35,18 @@ class SchemaEditor : public SchemaDialog
Q_OBJECT
public:
/** constructor */
- SchemaEditor(QWidget* parent=0, const char *name=0);
+ SchemaEditor(TQWidget* parent=0, const char *name=0);
/** destructor */
~SchemaEditor();
- QString schema();
- void setSchema(QString);
+ TQString schema();
+ void setSchema(TQString);
bool isModified() const { return schMod; }
void querySave();
signals:
void changed();
- void schemaListChanged(const QStringList &titles, const QStringList &filenames);
+ void schemaListChanged(const TQStringList &titles, const TQStringList &filenames);
public slots:
void slotColorChanged(int);
@@ -60,23 +60,23 @@ class SchemaEditor : public SchemaDialog
private slots:
void show();
void schemaModified();
- void loadAllSchema(QString currentFile="");
+ void loadAllSchema(TQString currentFile="");
void updatePreview();
private:
bool schMod;
- QMemArray<QColor> color;
- QMemArray<int> type; // 0= custom, 1= sysfg, 2=sysbg, 3=rcolor
- QMemArray<bool> transparent;
- QMemArray<bool> bold;
- QPixmap pix;
+ TQMemArray<TQColor> color;
+ TQMemArray<int> type; // 0= custom, 1= sysfg, 2=sysbg, 3=rcolor
+ TQMemArray<bool> transparent;
+ TQMemArray<bool> bold;
+ TQPixmap pix;
KSharedPixmap *spix;
- QString defaultSchema;
+ TQString defaultSchema;
bool loaded;
bool schemaLoaded;
bool change;
int oldSchema;
int oldSlot;
- QString readSchemaTitle(const QString& filename);
+ TQString readSchemaTitle(const TQString& filename);
void schemaListChanged();
};
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index 8542adfcb..5cb1c9746 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -18,8 +18,8 @@
#include "sessioneditor.h"
#include "sessioneditor.moc"
-#include <qlineedit.h>
-#include <qcombobox.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
#include <kdebug.h>
#include <kstandarddirs.h>
@@ -38,18 +38,18 @@
class SessionListBoxText : public QListBoxText
{
public:
- SessionListBoxText(const QString &title, const QString &filename): QListBoxText(title)
+ SessionListBoxText(const TQString &title, const TQString &filename): TQListBoxText(title)
{
m_filename = filename;
};
- const QString filename() { return m_filename; };
+ const TQString filename() { return m_filename; };
private:
- QString m_filename;
+ TQString m_filename;
};
-SessionEditor::SessionEditor(QWidget * parent, const char *name)
+SessionEditor::SessionEditor(TQWidget * parent, const char *name)
:SessionDialog(parent, name)
{
sesMod=false;
@@ -60,20 +60,20 @@ SessionEditor::SessionEditor(QWidget * parent, const char *name)
KGlobal::iconLoader()->addAppDir( "konsole" );
directoryLine->setMode(KFile::Directory);
- connect(sessionList, SIGNAL(highlighted(int)), this, SLOT(readSession(int)));
- connect(saveButton, SIGNAL(clicked()), this, SLOT(saveCurrent()));
- connect(removeButton, SIGNAL(clicked()), this, SLOT(removeCurrent()));
+ connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int)));
+ connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent()));
+ connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent()));
- connect(nameLine, SIGNAL(textChanged(const QString&)), this, SLOT(sessionModified()));
- connect(directoryLine, SIGNAL(textChanged(const QString&)), this, SLOT(sessionModified()));
- connect(executeLine, SIGNAL(textChanged(const QString&)), this, SLOT(sessionModified()));
- connect(termLine, SIGNAL(textChanged(const QString&)), this, SLOT(sessionModified()));
+ connect(nameLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
+ connect(directoryLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
+ connect(executeLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
+ connect(termLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
- connect(previewIcon, SIGNAL(iconChanged(QString)), this, SLOT(sessionModified()));
+ connect(previewIcon, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(sessionModified()));
- connect(fontCombo, SIGNAL(activated(int)), this, SLOT(sessionModified()));
- connect(keytabCombo, SIGNAL(activated(int)), this, SLOT(sessionModified()));
- connect(schemaCombo, SIGNAL(activated(int)), this, SLOT(sessionModified()));
+ connect(fontCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified()));
+ connect(keytabCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified()));
+ connect(schemaCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified()));
}
SessionEditor::~SessionEditor()
@@ -97,22 +97,22 @@ void SessionEditor::show()
void SessionEditor::loadAllKeytab()
{
- QStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
+ TQStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
keytabCombo->clear();
keytabFilename.clear();
keytabCombo->insertItem(i18n("XTerm (XFree 4.x.x)"),0);
- keytabFilename.append(new QString(""));
+ keytabFilename.append(new TQString(""));
int i=1;
- for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
+ for(TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
{
- QString name = (*it);
- QString title = readKeymapTitle(name);
+ TQString name = (*it);
+ TQString title = readKeymapTitle(name);
name = name.section('/',-1);
name = name.section('.',0);
- keytabFilename.append(new QString(name));
+ keytabFilename.append(new TQString(name));
if (title.isNull() || title.isEmpty())
title=i18n("untitled");
@@ -123,18 +123,18 @@ void SessionEditor::loadAllKeytab()
}
}
-QString SessionEditor::readKeymapTitle(const QString & file)
+TQString SessionEditor::readKeymapTitle(const TQString & file)
{
- QString fPath = locate("data", "konsole/" + file);
+ TQString fPath = locate("data", "konsole/" + file);
if (fPath.isNull())
fPath = locate("data", file);
- removeButton->setEnabled( QFileInfo (fPath).isWritable () );
+ removeButton->setEnabled( TQFileInfo (fPath).isWritable () );
if (fPath.isNull())
return 0;
- FILE *sysin = fopen(QFile::encodeName(fPath), "r");
+ FILE *sysin = fopen(TQFile::encodeName(fPath), "r");
if (!sysin)
return 0;
@@ -146,7 +146,7 @@ QString SessionEditor::readKeymapTitle(const QString & file)
fclose(sysin);
if(line[len-1] == '"')
line[len-1] = '\000';
- QString temp;
+ TQString temp;
if(line[9] == '"')
temp=i18n(line+10);
else
@@ -157,19 +157,19 @@ QString SessionEditor::readKeymapTitle(const QString & file)
return 0;
}
-void SessionEditor::loadAllSession(QString currentFile)
+void SessionEditor::loadAllSession(TQString currentFile)
{
- QStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.desktop", false, true);
+ TQStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.desktop", false, true);
sessionList->clear();
- QListBoxItem* currentItem = 0;
- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {
+ TQListBoxItem* currentItem = 0;
+ for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {
- QString name = (*it);
+ TQString name = (*it);
KSimpleConfig* co = new KSimpleConfig(name,true);
co->setDesktopGroup();
- QString sesname = co->readEntry("Name",i18n("Unnamed"));
+ TQString sesname = co->readEntry("Name",i18n("Unnamed"));
delete co;
sessionList->insertItem(new SessionListBoxText(sesname, name));
@@ -186,21 +186,21 @@ void SessionEditor::loadAllSession(QString currentFile)
void SessionEditor::readSession(int num)
{
int i,counter;
- QString str;
+ TQString str;
KSimpleConfig* co;
if(sesMod) {
- disconnect(sessionList, SIGNAL(highlighted(int)), this, SLOT(readSession(int)));
+ disconnect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int)));
sessionList->setCurrentItem(oldSession);
querySave();
sessionList->setCurrentItem(num);
- connect(sessionList, SIGNAL(highlighted(int)), this, SLOT(readSession(int)));
+ connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int)));
sesMod=false;
}
if( sessionList->item(num) )
{
- removeButton->setEnabled( QFileInfo ( ((SessionListBoxText *)sessionList->item(num))->filename() ).isWritable () );
+ removeButton->setEnabled( TQFileInfo ( ((SessionListBoxText *)sessionList->item(num))->filename() ).isWritable () );
co = new KSimpleConfig( ((SessionListBoxText *)sessionList->item(num))->filename(),true);
co->setDesktopGroup();
@@ -225,7 +225,7 @@ void SessionEditor::readSession(int num)
str = co->readEntry("KeyTab","");
i=0;
counter=0;
- for (QString *it = keytabFilename.first(); it != 0; it = keytabFilename.next()) {
+ for (TQString *it = keytabFilename.first(); it != 0; it = keytabFilename.next()) {
if (str == (*it))
i = counter;
counter++;
@@ -235,7 +235,7 @@ void SessionEditor::readSession(int num)
str = co->readEntry("Schema","");
i=0;
counter=0;
- for (QString *it = schemaFilename.first(); it != 0; it = schemaFilename.next()) {
+ for (TQString *it = schemaFilename.first(); it != 0; it = schemaFilename.next()) {
if (str == (*it))
i = counter;
counter++;
@@ -261,19 +261,19 @@ void SessionEditor::querySave()
}
}
-void SessionEditor::schemaListChanged(const QStringList &titles, const QStringList &filenames)
+void SessionEditor::schemaListChanged(const TQStringList &titles, const TQStringList &filenames)
{
- const QString text = schemaCombo->currentText();
+ const TQString text = schemaCombo->currentText();
schemaCombo->clear();
schemaFilename.clear();
schemaCombo->insertItem(i18n("Konsole Default"),0);
- schemaFilename.append(new QString(""));
+ schemaFilename.append(new TQString(""));
schemaCombo->insertStringList(titles, 1);
- for (QStringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it)
- schemaFilename.append(new QString(*it));
+ for (TQStringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it)
+ schemaFilename.append(new TQString(*it));
// Restore current item
int item = 0;
@@ -289,14 +289,14 @@ void SessionEditor::saveCurrent()
{
// Verify Execute entry is valid; otherwise Konsole will ignore it.
// This code is take from konsole.cpp; if you change one, change both.
- QString exec = executeLine->text();
+ TQString exec = executeLine->text();
if ( !exec.isEmpty() ) // If Execute field is empty, default shell is used.
{
if ( exec.startsWith( "su -c \'" ) )
exec = exec.mid( 7, exec.length() - 8 );
exec = KRun::binaryName( exec, false );
exec = KShell::tildeExpand( exec );
- QString pexec = KGlobal::dirs()->findExe( exec );
+ TQString pexec = KGlobal::dirs()->findExe( exec );
if ( pexec.isEmpty() )
{
@@ -311,7 +311,7 @@ void SessionEditor::saveCurrent()
}
- QString fullpath;
+ TQString fullpath;
if (sessionList->currentText() == nameLine->text()) {
fullpath = ( ((SessionListBoxText *)sessionList->item( sessionList->currentItem() ))->filename() ).section('/',-1);
}
@@ -351,7 +351,7 @@ void SessionEditor::saveCurrent()
void SessionEditor::removeCurrent()
{
- QString base = ((SessionListBoxText *)sessionList->item( sessionList->currentItem() ))->filename();
+ TQString base = ((SessionListBoxText *)sessionList->item( sessionList->currentItem() ))->filename();
// Query if system sessions should be removed
if (locateLocal("data", "konsole/" + base.section('/', -1)) != base) {
@@ -363,7 +363,7 @@ void SessionEditor::removeCurrent()
return;
}
- if (!QFile::remove(base)) {
+ if (!TQFile::remove(base)) {
KMessageBox::error(this,
i18n("Cannot remove the session.\nMaybe it is a system session.\n"),
i18n("Error Removing Session"));
diff --git a/kcontrol/konsole/sessioneditor.h b/kcontrol/konsole/sessioneditor.h
index 15d1aee2b..638b6b0e6 100644
--- a/kcontrol/konsole/sessioneditor.h
+++ b/kcontrol/konsole/sessioneditor.h
@@ -22,10 +22,10 @@
#include <config.h>
#endif
-#include <qptrlist.h>
-#include <qstringlist.h>
+#include <tqptrlist.h>
+#include <tqstringlist.h>
#include <kapplication.h>
-#include <qwidget.h>
+#include <tqwidget.h>
#include "sessiondialog.h"
@@ -33,7 +33,7 @@ class SessionEditor : public SessionDialog
{
Q_OBJECT
public:
- SessionEditor(QWidget* parent=0, const char *name=0);
+ SessionEditor(TQWidget* parent=0, const char *name=0);
~SessionEditor();
bool isModified() const { return sesMod; }
@@ -44,7 +44,7 @@ class SessionEditor : public SessionDialog
void getList();
public slots:
- void schemaListChanged(const QStringList &titles, const QStringList &filenames);
+ void schemaListChanged(const TQStringList &titles, const TQStringList &filenames);
private slots:
void readSession(int);
@@ -55,14 +55,14 @@ class SessionEditor : public SessionDialog
private:
void show();
void loadAllKeytab();
- void loadAllSession(QString currentFile="");
- QString readKeymapTitle(const QString& filename);
+ void loadAllSession(TQString currentFile="");
+ TQString readKeymapTitle(const TQString& filename);
bool sesMod;
int oldSession;
bool loaded;
- QPtrList<QString> keytabFilename;
- QPtrList<QString> schemaFilename;
+ TQPtrList<TQString> keytabFilename;
+ TQPtrList<TQString> schemaFilename;
};
#endif
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index cd8f08905..73c98df04 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -22,10 +22,10 @@
#include <unistd.h>
#undef Unsorted
-#include <qbuffer.h>
-#include <qdir.h>
-#include <qsettings.h>
-#include <qtooltip.h>
+#include <tqbuffer.h>
+#include <tqdir.h>
+#include <tqsettings.h>
+#include <tqtooltip.h>
#include <dcopclient.h>
@@ -75,45 +75,45 @@ inline const char * userGtkrc(int version)
// -----------------------------------------------------------------------------
static void applyGtkStyles(bool active, int version)
{
- QString gtkkde = locateLocal("config", 2==version?"gtkrc-2.0":"gtkrc");
- QCString gtkrc = getenv(gtkEnvVar(version));
- QStringList list = QStringList::split(':', QFile::decodeName(gtkrc));
+ TQString gtkkde = locateLocal("config", 2==version?"gtkrc-2.0":"gtkrc");
+ TQCString gtkrc = getenv(gtkEnvVar(version));
+ TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc));
if (list.count() == 0)
{
- list.append(QString::fromLatin1(sysGtkrc(version)));
- list.append(QDir::homeDirPath()+userGtkrc(version));
+ list.append(TQString::fromLatin1(sysGtkrc(version)));
+ list.append(TQDir::homeDirPath()+userGtkrc(version));
}
list.remove(gtkkde);
list.append(gtkkde);
if (!active)
- ::unlink(QFile::encodeName(gtkkde));
+ ::unlink(TQFile::encodeName(gtkkde));
// Pass env. var to kdeinit.
- QCString name = gtkEnvVar(version);
- QCString value = QFile::encodeName(list.join(":"));
- QByteArray params;
- QDataStream stream(params, IO_WriteOnly);
+ TQCString name = gtkEnvVar(version);
+ TQCString value = TQFile::encodeName(list.join(":"));
+ 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);
}
// -----------------------------------------------------------------------------
-static void applyQtColors( KConfig& kglobals, QSettings& settings, QPalette& newPal )
+static void applyQtColors( KConfig& kglobals, TQSettings& settings, TQPalette& newPal )
{
- QStringList actcg, inactcg, discg;
+ TQStringList actcg, inactcg, discg;
/* export kde color settings */
int i;
- for (i = 0; i < QColorGroup::NColorRoles; i++)
- actcg << newPal.color(QPalette::Active,
- (QColorGroup::ColorRole) i).name();
- for (i = 0; i < QColorGroup::NColorRoles; i++)
- inactcg << newPal.color(QPalette::Inactive,
- (QColorGroup::ColorRole) i).name();
- for (i = 0; i < QColorGroup::NColorRoles; i++)
- discg << newPal.color(QPalette::Disabled,
- (QColorGroup::ColorRole) i).name();
+ for (i = 0; i < TQColorGroup::NColorRoles; i++)
+ actcg << newPal.color(TQPalette::Active,
+ (TQColorGroup::ColorRole) i).name();
+ for (i = 0; i < TQColorGroup::NColorRoles; i++)
+ inactcg << newPal.color(TQPalette::Inactive,
+ (TQColorGroup::ColorRole) i).name();
+ for (i = 0; i < TQColorGroup::NColorRoles; i++)
+ discg << newPal.color(TQPalette::Disabled,
+ (TQColorGroup::ColorRole) i).name();
while (!settings.writeEntry("/qt/Palette/active", actcg)) ;
settings.writeEntry("/qt/Palette/inactive", inactcg);
@@ -123,10 +123,10 @@ static void applyQtColors( KConfig& kglobals, QSettings& settings, QPalette& new
kglobals.setGroup("WM");
// active colors
- QColor clr = newPal.active().background();
+ TQColor clr = newPal.active().background();
clr = kglobals.readColorEntry("activeBackground", &clr);
settings.writeEntry("/qt/KWinPalette/activeBackground", clr.name());
- if (QPixmap::defaultDepth() > 8)
+ if (TQPixmap::defaultDepth() > 8)
clr = clr.dark(110);
clr = kglobals.readColorEntry("activeBlend", &clr);
settings.writeEntry("/qt/KWinPalette/activeBlend", clr.name());
@@ -143,7 +143,7 @@ static void applyQtColors( KConfig& kglobals, QSettings& settings, QPalette& new
clr = newPal.inactive().background();
clr = kglobals.readColorEntry("inactiveBackground", &clr);
settings.writeEntry("/qt/KWinPalette/inactiveBackground", clr.name());
- if (QPixmap::defaultDepth() > 8)
+ if (TQPixmap::defaultDepth() > 8)
clr = clr.dark(110);
clr = kglobals.readColorEntry("inactiveBlend", &clr);
settings.writeEntry("/qt/KWinPalette/inactiveBlend", clr.name());
@@ -162,33 +162,33 @@ static void applyQtColors( KConfig& kglobals, QSettings& settings, QPalette& new
// -----------------------------------------------------------------------------
-static void applyQtSettings( KConfig& kglobals, QSettings& settings )
+static void applyQtSettings( KConfig& kglobals, TQSettings& settings )
{
/* export kde's plugin library path to qtrc */
- QMap <QString, bool> pathDb;
+ TQMap <TQString, bool> pathDb;
// OK, this isn't fun at all.
// KApp adds paths ending with /, QApp those without slash, and if
// one gives it something that is other way around, it will complain and scare
// users. So we need to know whether a path being added is from KApp, and in this case
- // end it with.. So keep a QMap to bool, specifying whether the path is KDE-specified..
+ // end it with.. So keep a TQMap to bool, specifying whether the path is KDE-specified..
- QString qversion = qVersion();
+ TQString qversion = qVersion();
if ( qversion.contains( '.' ) > 1 )
qversion.truncate( qversion.findRev( '.' ) );
if ( qversion.contains( '-' ) )
qversion.truncate( qversion.findRev( '-' ) );
- QStringList kdeAdded =
+ TQStringList kdeAdded =
settings.readListEntry("/qt/KDE/kdeAddedLibraryPaths");
- QString libPathKey =
- QString("/qt/%1/libraryPath").arg( qversion );
+ TQString libPathKey =
+ TQString("/qt/%1/libraryPath").arg( qversion );
//Read qt library path..
- QStringList plugins = settings.readListEntry(libPathKey, ':');
- for (QStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
+ TQStringList plugins = settings.readListEntry(libPathKey, ':');
+ for (TQStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
{
- QString path = *it;
+ TQString path = *it;
if (path.endsWith("/"))
path.truncate(path.length()-1);
@@ -196,10 +196,10 @@ static void applyQtSettings( KConfig& kglobals, QSettings& settings )
}
//Get rid of old KDE-added ones...
- for (QStringList::ConstIterator it = kdeAdded.begin(); it != kdeAdded.end(); ++it)
+ for (TQStringList::ConstIterator it = kdeAdded.begin(); it != kdeAdded.end(); ++it)
{
//Normalize..
- QString path = *it;
+ TQString path = *it;
if (path.endsWith("/"))
path.truncate(path.length()-1);
@@ -212,9 +212,9 @@ static void applyQtSettings( KConfig& kglobals, QSettings& settings )
//Merge in KDE ones..
plugins = KGlobal::dirs()->resourceDirs( "qtplugins" );
- for (QStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
+ for (TQStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
{
- QString path = *it;
+ TQString path = *it;
if (path.endsWith("/"))
path.truncate(path.length()-1);
@@ -225,16 +225,16 @@ static void applyQtSettings( KConfig& kglobals, QSettings& settings )
pathDb[path]=true;
}
- QStringList paths;
- for (QMap <QString, bool>::ConstIterator it = pathDb.begin();
+ TQStringList paths;
+ for (TQMap <TQString, bool>::ConstIterator it = pathDb.begin();
it != pathDb.end(); ++it)
{
- QString path = it.key();
+ TQString path = it.key();
bool fromKDE = it.data();
char new_path[PATH_MAX+1];
- if (realpath(QFile::encodeName(path), new_path))
- path = QFile::decodeName(new_path);
+ if (realpath(TQFile::encodeName(path), new_path))
+ path = TQFile::decodeName(new_path);
if (fromKDE)
{
@@ -252,7 +252,7 @@ static void applyQtSettings( KConfig& kglobals, QSettings& settings )
/* export widget style */
kglobals.setGroup("General");
- QString style = kglobals.readEntry("widgetStyle", KStyle::defaultStyle() );
+ TQString style = kglobals.readEntry("widgetStyle", KStyle::defaultStyle() );
if (!style.isEmpty())
settings.writeEntry("/qt/style", style);
@@ -272,27 +272,27 @@ static void applyQtSettings( KConfig& kglobals, QSettings& settings )
bool fadeTooltips = kglobals.readBoolEntry("EffectFadeTooltip", false);
bool animateCombobox = kglobals.readBoolEntry("EffectAnimateCombo", false);
- QStringList guieffects;
+ TQStringList guieffects;
if (effectsEnabled) {
- guieffects << QString("general");
+ guieffects << TQString("general");
if (fadeMenus)
- guieffects << QString("fademenu");
+ guieffects << TQString("fademenu");
if (animateCombobox)
- guieffects << QString("animatecombo");
+ guieffects << TQString("animatecombo");
if (fadeTooltips)
- guieffects << QString("fadetooltip");
+ guieffects << TQString("fadetooltip");
}
else
- guieffects << QString("none");
+ guieffects << TQString("none");
settings.writeEntry("/qt/GUIEffects", guieffects);
}
// -----------------------------------------------------------------------------
-static void addColorDef(QString& s, const char* n, const QColor& col)
+static void addColorDef(TQString& s, const char* n, const TQColor& col)
{
- QString tmp;
+ TQString tmp;
tmp.sprintf("#define %s #%02x%02x%02x\n",
n, col.red(), col.green(), col.blue());
@@ -303,11 +303,11 @@ static void addColorDef(QString& s, const char* n, const QColor& col)
// -----------------------------------------------------------------------------
-static void copyFile(QFile& tmp, QString const& filename, bool )
+static void copyFile(TQFile& tmp, TQString const& filename, bool )
{
- QFile f( filename );
+ TQFile f( filename );
if ( f.open(IO_ReadOnly) ) {
- QCString buf( 8192 );
+ TQCString buf( 8192 );
while ( !f.atEnd() ) {
int read = f.readBlock( buf.data(), buf.size() );
if ( read > 0 )
@@ -319,16 +319,16 @@ static void copyFile(QFile& tmp, QString const& filename, bool )
// -----------------------------------------------------------------------------
-static QString item( int i ) {
- return QString::number( i / 255.0, 'f', 3 );
+static TQString item( int i ) {
+ return TQString::number( i / 255.0, 'f', 3 );
}
-static QString color( const QColor& col )
+static TQString color( const TQColor& col )
{
- return QString( "{ %1, %2, %3 }" ).arg( item( col.red() ) ).arg( item( col.green() ) ).arg( item( col.blue() ) );
+ return TQString( "{ %1, %2, %3 }" ).arg( item( col.red() ) ).arg( item( col.green() ) ).arg( item( col.blue() ) );
}
-static void createGtkrc( bool exportColors, const QColorGroup& cg, int version )
+static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version )
{
// lukas: why does it create in ~/.kde/share/config ???
// pfeiffer: so that we don't overwrite the user's gtkrc.
@@ -337,8 +337,8 @@ static void createGtkrc( bool exportColors, const QColorGroup& cg, int version )
if ( saveFile.status() != 0 || saveFile.textStream() == 0L )
return;
- QTextStream& t = *saveFile.textStream();
- t.setEncoding( QTextStream::Locale );
+ TQTextStream& t = *saveFile.textStream();
+ t.setEncoding( TQTextStream::Locale );
t << i18n(
"# created by KDE, %1\n"
@@ -347,7 +347,7 @@ static void createGtkrc( bool exportColors, const QColorGroup& cg, int version )
"# Appearance & Themes -> Colors in the Control Center and disable the checkbox\n"
"# \"Apply colors to non-KDE applications\"\n"
"#\n"
- "#\n").arg(QDateTime::currentDateTime().toString());
+ "#\n").arg(TQDateTime::currentDateTime().toString());
t << "style \"default\"" << endl;
t << "{" << endl;
@@ -392,7 +392,7 @@ static void createGtkrc( bool exportColors, const QColorGroup& cg, int version )
// tooltips don't have the standard background color
t << "style \"ToolTip\"" << endl;
t << "{" << endl;
- QColorGroup group = QToolTip::palette().active();
+ TQColorGroup group = TQToolTip::palette().active();
t << " bg[NORMAL] = " << color( group.background() ) << endl;
t << " base[NORMAL] = " << color( group.base() ) << endl;
t << " text[NORMAL] = " << color( group.text() ) << endl;
@@ -422,7 +422,7 @@ static void createGtkrc( bool exportColors, const QColorGroup& cg, int version )
void runRdb( uint flags )
{
// Obtain the application palette that is about to be set.
- QPalette newPal = KApplication::createApplicationPalette();
+ TQPalette newPal = KApplication::createApplicationPalette();
bool exportColors = flags & KRdbExportColors;
bool exportQtColors = flags & KRdbExportQtColors;
bool exportQtSettings = flags & KRdbExportQtSettings;
@@ -439,19 +439,19 @@ void runRdb( uint flags )
exit(0);
}
- QFile &tmp = *(tmpFile.file());
+ TQFile &tmp = *(tmpFile.file());
// Export colors to non-(KDE/Qt) apps (e.g. Motif, GTK+ apps)
if (exportColors)
{
KGlobal::dirs()->addResourceType("appdefaults", KStandardDirs::kde_default("data") + "kdisplay/app-defaults/");
- QColorGroup cg = newPal.active();
+ TQColorGroup cg = newPal.active();
KGlobal::locale()->insertCatalogue("krdb");
createGtkrc( true, cg, 1 );
createGtkrc( true, cg, 2 );
- QString preproc;
- QColor backCol = cg.background();
+ TQString preproc;
+ TQColor backCol = cg.background();
addColorDef(preproc, "FOREGROUND" , cg.foreground());
addColorDef(preproc, "BACKGROUND" , backCol);
addColorDef(preproc, "HIGHLIGHT" , backCol.light(100+(2*KGlobalSettings::contrast()+4)*16/1));
@@ -468,30 +468,30 @@ void runRdb( uint flags )
tmp.writeBlock( preproc.latin1(), preproc.length() );
- QStringList list;
+ TQStringList list;
- QStringList adPaths = KGlobal::dirs()->findDirs("appdefaults", "");
- for (QStringList::ConstIterator it = adPaths.begin(); it != adPaths.end(); ++it) {
- QDir dSys( *it );
+ TQStringList adPaths = KGlobal::dirs()->findDirs("appdefaults", "");
+ for (TQStringList::ConstIterator it = adPaths.begin(); it != adPaths.end(); ++it) {
+ TQDir dSys( *it );
if ( dSys.exists() ) {
- dSys.setFilter( QDir::Files );
- dSys.setSorting( QDir::Name );
+ dSys.setFilter( TQDir::Files );
+ dSys.setSorting( TQDir::Name );
dSys.setNameFilter("*.ad");
list += dSys.entryList();
}
}
- for (QStringList::ConstIterator it = list.begin(); it != list.end(); it++)
+ for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++)
copyFile(tmp, locate("appdefaults", *it ), true);
}
// Merge ~/.Xresources or fallback to ~/.Xdefaults
- QString homeDir = QDir::homeDirPath();
- QString xResources = homeDir + "/.Xresources";
+ TQString homeDir = TQDir::homeDirPath();
+ TQString xResources = homeDir + "/.Xresources";
// very primitive support for ~/.Xresources by appending it
- if ( QFile::exists( xResources ) )
+ if ( TQFile::exists( xResources ) )
copyFile(tmp, xResources, true);
else
copyFile(tmp, homeDir + "/.Xdefaults", true);
@@ -499,9 +499,9 @@ void runRdb( uint flags )
// Export the Xcursor theme & size settings
KConfig mousecfg( "kcminputrc" );
mousecfg.setGroup( "Mouse" );
- QString theme = mousecfg.readEntry("cursorTheme", QString());
- QString size = mousecfg.readEntry("cursorSize", QString());
- QString contents;
+ TQString theme = mousecfg.readEntry("cursorTheme", TQString());
+ TQString size = mousecfg.readEntry("cursorSize", TQString());
+ TQString contents;
if (!theme.isNull())
contents = "Xcursor.theme: " + theme + '\n';
@@ -524,7 +524,7 @@ void runRdb( uint flags )
if (kglobals.hasKey("XftHintStyle"))
{
- QString hintStyle = kglobals.readEntry("XftHintStyle", "hintfull");
+ TQString hintStyle = kglobals.readEntry("XftHintStyle", "hintfull");
contents += "Xft.hinting: ";
if(hintStyle.isEmpty())
contents += "-1\n";
@@ -540,7 +540,7 @@ void runRdb( uint flags )
if (kglobals.hasKey("XftSubPixel"))
{
- QString subPixel = kglobals.readEntry("XftSubPixel", "none");
+ TQString subPixel = kglobals.readEntry("XftSubPixel", "none");
if(!subPixel.isEmpty())
contents += "Xft.rgba: " + subPixel + '\n';
}
@@ -572,7 +572,7 @@ void runRdb( uint flags )
/* Qt exports */
if ( exportQtColors || exportQtSettings )
{
- QSettings* settings = new QSettings;
+ TQSettings* settings = new QSettings;
if ( exportQtColors )
applyQtColors( kglobals, *settings, newPal ); // For kcmcolors
@@ -581,7 +581,7 @@ void runRdb( uint flags )
applyQtSettings( kglobals, *settings ); // For kcmstyle
delete settings;
- QApplication::flushX();
+ TQApplication::flushX();
// We let KIPC take care of ourselves, as we are in a KDE app with
// QApp::setDesktopSettingsAware(false);
@@ -590,23 +590,23 @@ void runRdb( uint flags )
// Qt-only apps without adversely affecting ourselves.
// Cheat and use the current timestamp, since we just saved to qtrc.
- QDateTime settingsstamp = QDateTime::currentDateTime();
+ TQDateTime settingsstamp = TQDateTime::currentDateTime();
static Atom qt_settings_timestamp = 0;
if (!qt_settings_timestamp) {
- QString atomname("_QT_SETTINGS_TIMESTAMP_");
+ TQString atomname("_QT_SETTINGS_TIMESTAMP_");
atomname += XDisplayName( 0 ); // Use the $DISPLAY envvar.
qt_settings_timestamp = XInternAtom( qt_xdisplay(), atomname.latin1(), False);
}
- QBuffer stamp;
- QDataStream s(stamp.buffer(), IO_WriteOnly);
+ TQBuffer stamp;
+ TQDataStream s(stamp.buffer(), IO_WriteOnly);
s << settingsstamp;
XChangeProperty( qt_xdisplay(), qt_xrootwin(), qt_settings_timestamp,
qt_settings_timestamp, 8, PropModeReplace,
(unsigned char*) stamp.buffer().data(),
stamp.buffer().size() );
- QApplication::flushX();
+ TQApplication::flushX();
}
}
diff --git a/kcontrol/kthememanager/knewthemedlg.cpp b/kcontrol/kthememanager/knewthemedlg.cpp
index 1514ed453..8ba59b680 100644
--- a/kcontrol/kthememanager/knewthemedlg.cpp
+++ b/kcontrol/kthememanager/knewthemedlg.cpp
@@ -19,17 +19,17 @@
#include "knewthemedlg.h"
#include "newthemewidget.h"
-#include <qlineedit.h>
-#include <qtextedit.h>
+#include <tqlineedit.h>
+#include <tqtextedit.h>
#include <klocale.h>
-KNewThemeDlg::KNewThemeDlg( QWidget * parent, const char * name )
+KNewThemeDlg::KNewThemeDlg( TQWidget * parent, const char * name )
: KDialogBase(parent, name, true, i18n("New Theme"), Ok|Cancel, Ok)
{
m_base = new NewThemeWidget( this, "new_theme_base" );
setMainWidget( m_base );
- connect( m_base->leName, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotThemeNameChanged( const QString & ) ) );
+ connect( m_base->leName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotThemeNameChanged( const TQString & ) ) );
slotThemeNameChanged( m_base->leName->text() );
}
@@ -38,57 +38,57 @@ KNewThemeDlg::~KNewThemeDlg()
delete m_base;
}
-void KNewThemeDlg::slotThemeNameChanged( const QString &_text )
+void KNewThemeDlg::slotThemeNameChanged( const TQString &_text )
{
enableButtonOK( !_text.isEmpty() );
}
-QString KNewThemeDlg::getName() const
+TQString KNewThemeDlg::getName() const
{
return m_base->leName->text();
}
-QString KNewThemeDlg::getAuthor() const
+TQString KNewThemeDlg::getAuthor() const
{
return m_base->leAuthor->text();
}
-QString KNewThemeDlg::getEmail() const
+TQString KNewThemeDlg::getEmail() const
{
return m_base->leEmail->text();
}
-QString KNewThemeDlg::getHomepage() const
+TQString KNewThemeDlg::getHomepage() const
{
return m_base->leHomepage->text();
}
-QString KNewThemeDlg::getComment() const
+TQString KNewThemeDlg::getComment() const
{
return m_base->teComment->text();
}
-QString KNewThemeDlg::getVersion() const
+TQString KNewThemeDlg::getVersion() const
{
return m_base->leVersion->text();
}
-void KNewThemeDlg::setAuthor( const QString & author )
+void KNewThemeDlg::setAuthor( const TQString & author )
{
m_base->leAuthor->setText( author );
}
-void KNewThemeDlg::setEmail( const QString & email )
+void KNewThemeDlg::setEmail( const TQString & email )
{
m_base->leEmail->setText( email );
}
-void KNewThemeDlg::setVersion( const QString & version )
+void KNewThemeDlg::setVersion( const TQString & version )
{
m_base->leVersion->setText( version );
}
-void KNewThemeDlg::setName( const QString & name )
+void KNewThemeDlg::setName( const TQString & name )
{
m_base->leName->setText( name );
}
diff --git a/kcontrol/kthememanager/knewthemedlg.h b/kcontrol/kthememanager/knewthemedlg.h
index 52fd0816f..5a0df045a 100644
--- a/kcontrol/kthememanager/knewthemedlg.h
+++ b/kcontrol/kthememanager/knewthemedlg.h
@@ -19,7 +19,7 @@
#ifndef KNEWTHEMEDLG_H
#define KNEWTHEMEDLG_H
-#include <qstring.h>
+#include <tqstring.h>
#include <kdialogbase.h>
@@ -34,25 +34,25 @@ class KNewThemeDlg: public KDialogBase
{
Q_OBJECT
public:
- KNewThemeDlg( QWidget * parent = 0, const char * name = 0);
+ KNewThemeDlg( TQWidget * parent = 0, const char * name = 0);
~KNewThemeDlg();
- QString getName() const;
- QString getAuthor() const;
- QString getEmail() const;
- QString getHomepage() const;
- QString getComment() const;
- QString getVersion() const;
-
- void setName( const QString & name );
- void setAuthor( const QString & author );
- void setEmail( const QString & email );
- void setVersion( const QString & version );
+ TQString getName() const;
+ TQString getAuthor() const;
+ TQString getEmail() const;
+ TQString getHomepage() const;
+ TQString getComment() const;
+ TQString getVersion() const;
+
+ void setName( const TQString & name );
+ void setAuthor( const TQString & author );
+ void setEmail( const TQString & email );
+ void setVersion( const TQString & version );
private:
NewThemeWidget * m_base;
private slots:
- void slotThemeNameChanged( const QString &_text );
+ void slotThemeNameChanged( const TQString &_text );
};
#endif
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index 241aac132..b78a354be 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -18,13 +18,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "ktheme.h"
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qimage.h>
-#include <qpixmap.h>
-#include <qregexp.h>
-#include <qtextstream.h>
-#include <qdir.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqimage.h>
+#include <tqpixmap.h>
+#include <tqregexp.h>
+#include <tqtextstream.h>
+#include <tqdir.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -43,26 +43,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <ktar.h>
#include <kstyle.h>
-KTheme::KTheme( QWidget *parent, const QString & xmlFile )
+KTheme::KTheme( TQWidget *parent, const TQString & xmlFile )
: m_parent(parent)
{
- QFile file( xmlFile );
+ TQFile file( xmlFile );
file.open( IO_ReadOnly );
m_dom.setContent( file.readAll() );
file.close();
//kdDebug() << m_dom.toString( 2 ) << endl;
- setName( QFileInfo( file ).baseName() );
+ setName( TQFileInfo( file ).baseName() );
m_kgd = KGlobal::dirs();
}
-KTheme::KTheme( QWidget *parent, bool create )
+KTheme::KTheme( TQWidget *parent, bool create )
: m_parent(parent)
{
if ( create )
{
- m_dom = QDomDocument( "ktheme" );
+ m_dom = TQDomDocument( "ktheme" );
m_root = m_dom.createElement( "ktheme" );
m_root.setAttribute( "version", SYNTAX_VERSION );
@@ -79,7 +79,7 @@ KTheme::~KTheme()
{
}
-void KTheme::setName( const QString & name )
+void KTheme::setName( const TQString & name )
{
m_name = name;
}
@@ -88,24 +88,24 @@ bool KTheme::load( const KURL & url )
{
kdDebug() << "Loading theme from URL: " << url << endl;
- QString tmpFile;
+ TQString tmpFile;
if ( !KIO::NetAccess::download( url, tmpFile, 0L ) )
return false;
kdDebug() << "Theme is in temp file: " << tmpFile << endl;
// set theme's name
- setName( QFileInfo( url.fileName() ).baseName() );
+ setName( TQFileInfo( url.fileName() ).baseName() );
// unpack the tarball
- QString location = m_kgd->saveLocation( "themes", m_name + "/" );
+ TQString location = m_kgd->saveLocation( "themes", m_name + "/" );
KTar tar( tmpFile );
tar.open( IO_ReadOnly );
tar.directory()->copyTo( location );
tar.close();
// create the DOM
- QFile file( location + m_name + ".xml" );
+ TQFile file( location + m_name + ".xml" );
file.open( IO_ReadOnly );
m_dom.setContent( file.readAll() );
file.close();
@@ -116,7 +116,7 @@ bool KTheme::load( const KURL & url )
return true;
}
-QString KTheme::createYourself( bool pack )
+TQString KTheme::createYourself( bool pack )
{
// start with empty dir for orig theme
if ( !pack )
@@ -137,35 +137,35 @@ QString KTheme::createYourself( bool pack )
for ( uint i=0; i < numDesktops-1; i++ )
{
- QDomElement desktopElem = m_dom.createElement( "desktop" );
+ TQDomElement desktopElem = m_dom.createElement( "desktop" );
desktopElem.setAttribute( "number", i );
desktopElem.setAttribute( "common", common );
- desktopConf.setGroup( "Desktop" + QString::number( i ) );
+ desktopConf.setGroup( "Desktop" + TQString::number( i ) );
- QDomElement modeElem = m_dom.createElement( "mode" );
+ TQDomElement modeElem = m_dom.createElement( "mode" );
modeElem.setAttribute( "id", desktopConf.readEntry( "BackgroundMode", "Flat" ) );
desktopElem.appendChild( modeElem );
- QDomElement c1Elem = m_dom.createElement( "color1" );
+ TQDomElement c1Elem = m_dom.createElement( "color1" );
c1Elem.setAttribute( "rgb", desktopConf.readColorEntry( "Color1" ).name() );
desktopElem.appendChild( c1Elem );
- QDomElement c2Elem = m_dom.createElement( "color2" );
+ TQDomElement c2Elem = m_dom.createElement( "color2" );
c2Elem.setAttribute( "rgb", desktopConf.readColorEntry( "Color2" ).name() );
desktopElem.appendChild( c2Elem );
- QDomElement blendElem = m_dom.createElement( "blending" );
- blendElem.setAttribute( "mode", desktopConf.readEntry( "BlendMode", QString( "NoBlending" ) ) );
- blendElem.setAttribute( "balance", desktopConf.readEntry( "BlendBalance", QString::number( 100 ) ) );
+ TQDomElement blendElem = m_dom.createElement( "blending" );
+ blendElem.setAttribute( "mode", desktopConf.readEntry( "BlendMode", TQString( "NoBlending" ) ) );
+ blendElem.setAttribute( "balance", desktopConf.readEntry( "BlendBalance", TQString::number( 100 ) ) );
blendElem.setAttribute( "reverse", desktopConf.readBoolEntry( "ReverseBlending", false ) );
desktopElem.appendChild( blendElem );
- QDomElement patElem = m_dom.createElement( "pattern" );
+ TQDomElement patElem = m_dom.createElement( "pattern" );
patElem.setAttribute( "name", desktopConf.readEntry( "Pattern" ) );
desktopElem.appendChild( patElem );
- QDomElement wallElem = m_dom.createElement( "wallpaper" );
+ TQDomElement wallElem = m_dom.createElement( "wallpaper" );
wallElem.setAttribute( "url", processFilePath( "desktop", desktopConf.readPathEntry( "Wallpaper" ) ) );
wallElem.setAttribute( "mode", desktopConf.readEntry( "WallpaperMode" ) );
desktopElem.appendChild( wallElem );
@@ -180,13 +180,13 @@ QString KTheme::createYourself( bool pack )
// 11. Screensaver
desktopConf.setGroup( "ScreenSaver" );
- QDomElement saverElem = m_dom.createElement( "screensaver" );
+ TQDomElement saverElem = m_dom.createElement( "screensaver" );
saverElem.setAttribute( "name", desktopConf.readEntry( "Saver" ) );
m_root.appendChild( saverElem );
// 3. Icons
globalConf->setGroup( "Icons" );
- QDomElement iconElem = m_dom.createElement( "icons" );
+ TQDomElement iconElem = m_dom.createElement( "icons" );
iconElem.setAttribute( "name", globalConf->readEntry( "Theme",KIconTheme::current() ) );
createIconElems( "DesktopIcons", "desktop", iconElem, globalConf );
createIconElems( "MainToolbarIcons", "mainToolbar", iconElem, globalConf );
@@ -198,7 +198,7 @@ QString KTheme::createYourself( bool pack )
// 4. Sounds
// 4.1 Global sounds
KConfig * soundConf = new KConfig( "knotify.eventsrc", true );
- QStringList stdEvents;
+ TQStringList stdEvents;
stdEvents << "cannotopenfile" << "catastrophe" << "exitkde" << "fatalerror"
<< "notification" << "printerror" << "startkde" << "warning"
<< "messageCritical" << "messageInformation" << "messageWarning"
@@ -206,7 +206,7 @@ QString KTheme::createYourself( bool pack )
// 4.2 KWin sounds
KConfig * kwinSoundConf = new KConfig( "kwin.eventsrc", true );
- QStringList kwinEvents;
+ TQStringList kwinEvents;
kwinEvents << "activate" << "close" << "delete" <<
"desktop1" << "desktop2" << "desktop3" << "desktop4" <<
"desktop5" << "desktop6" << "desktop7" << "desktop8" <<
@@ -215,7 +215,7 @@ QString KTheme::createYourself( bool pack )
"resizeend" << "resizestart" << "shadedown" << "shadeup" <<
"transdelete" << "transnew" << "unmaximize" << "unminimize";
- QDomElement soundsElem = m_dom.createElement( "sounds" );
+ TQDomElement soundsElem = m_dom.createElement( "sounds" );
createSoundList( stdEvents, "global", soundsElem, soundConf );
createSoundList( kwinEvents, "kwin", soundsElem, kwinSoundConf );
m_root.appendChild( soundsElem );
@@ -224,24 +224,24 @@ QString KTheme::createYourself( bool pack )
// 5. Colors
- QDomElement colorsElem = m_dom.createElement( "colors" );
+ TQDomElement colorsElem = m_dom.createElement( "colors" );
globalConf->setGroup( "KDE" );
colorsElem.setAttribute( "contrast", globalConf->readNumEntry( "contrast", 7 ) );
- QStringList stdColors;
+ TQStringList stdColors;
stdColors << "background" << "selectBackground" << "foreground" << "windowForeground"
<< "windowBackground" << "selectForeground" << "buttonBackground"
<< "buttonForeground" << "linkColor" << "visitedLinkColor" << "alternateBackground";
globalConf->setGroup( "General" );
- for ( QStringList::Iterator it = stdColors.begin(); it != stdColors.end(); ++it )
+ for ( TQStringList::Iterator it = stdColors.begin(); it != stdColors.end(); ++it )
createColorElem( ( *it ), "global", colorsElem, globalConf );
- QStringList kwinColors;
+ TQStringList kwinColors;
kwinColors << "activeForeground" << "inactiveBackground" << "inactiveBlend" << "activeBackground"
<< "activeBlend" << "inactiveForeground" << "activeTitleBtnBg" << "inactiveTitleBtnBg"
<< "frame" << "inactiveFrame" << "handle" << "inactiveHandle";
globalConf->setGroup( "WM" );
- for ( QStringList::Iterator it = kwinColors.begin(); it != kwinColors.end(); ++it )
+ for ( TQStringList::Iterator it = kwinColors.begin(); it != kwinColors.end(); ++it )
createColorElem( ( *it ), "kwin", colorsElem, globalConf );
m_root.appendChild( colorsElem );
@@ -249,7 +249,7 @@ QString KTheme::createYourself( bool pack )
// 6. Cursors
KConfig* mouseConf = new KConfig( "kcminputrc", true );
mouseConf->setGroup( "Mouse" );
- QDomElement cursorsElem = m_dom.createElement( "cursors" );
+ TQDomElement cursorsElem = m_dom.createElement( "cursors" );
cursorsElem.setAttribute( "name", mouseConf->readEntry( "cursorTheme" ) );
m_root.appendChild( cursorsElem );
delete mouseConf;
@@ -257,17 +257,17 @@ QString KTheme::createYourself( bool pack )
// 7. KWin
kwinConf.setGroup( "Style" );
- QDomElement wmElem = m_dom.createElement( "wm" );
+ TQDomElement wmElem = m_dom.createElement( "wm" );
wmElem.setAttribute( "name", kwinConf.readEntry( "PluginLib" ) );
wmElem.setAttribute( "type", "builtin" ); // TODO support pixmap themes when the kwin client gets ported
if ( kwinConf.readBoolEntry( "CustomButtonPositions" ) )
{
- QDomElement buttonsElem = m_dom.createElement( "buttons" );
+ TQDomElement buttonsElem = m_dom.createElement( "buttons" );
buttonsElem.setAttribute( "left", kwinConf.readEntry( "ButtonsOnLeft" ) );
buttonsElem.setAttribute( "right", kwinConf.readEntry( "ButtonsOnRight" ) );
wmElem.appendChild( buttonsElem );
}
- QDomElement borderElem = m_dom.createElement( "border" );
+ TQDomElement borderElem = m_dom.createElement( "border" );
borderElem.setAttribute( "size", kwinConf.readNumEntry( "BorderSize", 1 ) );
wmElem.appendChild( borderElem );
m_root.appendChild( wmElem );
@@ -275,12 +275,12 @@ QString KTheme::createYourself( bool pack )
// 8. Konqueror
KConfig konqConf( "konquerorrc", true );
konqConf.setGroup( "Settings" );
- QDomElement konqElem = m_dom.createElement( "konqueror" );
- QDomElement konqWallElem = m_dom.createElement( "wallpaper" );
- QString bgImagePath = konqConf.readPathEntry( "BgImage" );
+ TQDomElement konqElem = m_dom.createElement( "konqueror" );
+ TQDomElement konqWallElem = m_dom.createElement( "wallpaper" );
+ TQString bgImagePath = konqConf.readPathEntry( "BgImage" );
konqWallElem.setAttribute( "url", processFilePath( "konqueror", bgImagePath ) );
konqElem.appendChild( konqWallElem );
- QDomElement konqBgColorElem = m_dom.createElement( "bgcolor" );
+ TQDomElement konqBgColorElem = m_dom.createElement( "bgcolor" );
konqBgColorElem.setAttribute( "rgb", konqConf.readColorEntry( "BgColor" ).name() );
konqElem.appendChild( konqBgColorElem );
m_root.appendChild( konqElem );
@@ -289,31 +289,31 @@ QString KTheme::createYourself( bool pack )
KConfig kickerConf( "kickerrc", true );
kickerConf.setGroup( "General" );
- QDomElement panelElem = m_dom.createElement( "panel" );
+ TQDomElement panelElem = m_dom.createElement( "panel" );
if ( kickerConf.readBoolEntry( "UseBackgroundTheme" ) )
{
- QDomElement backElem = m_dom.createElement( "background" );
- QString kbgPath = kickerConf.readPathEntry( "BackgroundTheme" );
+ TQDomElement backElem = m_dom.createElement( "background" );
+ TQString kbgPath = kickerConf.readPathEntry( "BackgroundTheme" );
backElem.setAttribute( "url", processFilePath( "panel", kbgPath ) );
backElem.setAttribute( "colorize", kickerConf.readBoolEntry( "ColorizeBackground" ) );
panelElem.appendChild( backElem );
}
- QDomElement transElem = m_dom.createElement( "transparent" );
+ TQDomElement transElem = m_dom.createElement( "transparent" );
transElem.setAttribute( "value", kickerConf.readBoolEntry( "Transparent" ) );
panelElem.appendChild( transElem );
- QDomElement posElem = m_dom.createElement( "position" );
+ TQDomElement posElem = m_dom.createElement( "position" );
posElem.setAttribute( "value", kickerConf.readEntry( "Position" ) );
panelElem.appendChild( posElem );
- QDomElement showLeftHideButtonElem = m_dom.createElement( "showlefthidebutton" );
+ TQDomElement showLeftHideButtonElem = m_dom.createElement( "showlefthidebutton" );
showLeftHideButtonElem.setAttribute( "value", kickerConf.readBoolEntry( "ShowLeftHideButton" ) );
panelElem.appendChild( showLeftHideButtonElem );
- QDomElement showRightHideButtonElem = m_dom.createElement( "showrighthidebutton" );
+ TQDomElement showRightHideButtonElem = m_dom.createElement( "showrighthidebutton" );
showRightHideButtonElem.setAttribute( "value", kickerConf.readBoolEntry( "ShowRightHideButton" ) );
panelElem.appendChild( showRightHideButtonElem );
@@ -323,13 +323,13 @@ QString KTheme::createYourself( bool pack )
// 10. Widget style
globalConf->setGroup( "General" );
- QDomElement widgetsElem = m_dom.createElement( "widgets" );
+ TQDomElement widgetsElem = m_dom.createElement( "widgets" );
widgetsElem.setAttribute( "name", globalConf->readEntry( "widgetStyle",KStyle::defaultStyle() ) );
m_root.appendChild( widgetsElem );
// 12.
- QDomElement fontsElem = m_dom.createElement( "fonts" );
- QStringList fonts;
+ TQDomElement fontsElem = m_dom.createElement( "fonts" );
+ TQStringList fonts;
fonts << "General" << "font"
<< "General" << "fixed"
<< "General" << "toolBarFont"
@@ -338,10 +338,10 @@ QString KTheme::createYourself( bool pack )
<< "General" << "taskbarFont"
<< "FMSettings" << "StandardFont";
- for ( QStringList::Iterator it = fonts.begin(); it != fonts.end(); ++it ) {
- QString group = *it; ++it;
- QString key = *it;
- QString value;
+ for ( TQStringList::Iterator it = fonts.begin(); it != fonts.end(); ++it ) {
+ TQString group = *it; ++it;
+ TQString key = *it;
+ TQString value;
if ( group == "FMSettings" ) {
desktopConf.setGroup( group );
@@ -351,7 +351,7 @@ QString KTheme::createYourself( bool pack )
globalConf->setGroup( group );
value = globalConf->readEntry( key );
}
- QDomElement fontElem = m_dom.createElement( key );
+ TQDomElement fontElem = m_dom.createElement( key );
fontElem.setAttribute( "object", group );
fontElem.setAttribute( "value", value );
fontsElem.appendChild( fontElem );
@@ -359,14 +359,14 @@ QString KTheme::createYourself( bool pack )
m_root.appendChild( fontsElem );
// Save the XML
- QFile file( m_kgd->saveLocation( "themes", m_name + "/" ) + m_name + ".xml" );
+ TQFile file( m_kgd->saveLocation( "themes", m_name + "/" ) + m_name + ".xml" );
if ( file.open( IO_WriteOnly ) ) {
- QTextStream stream( &file );
+ TQTextStream stream( &file );
m_dom.save( stream, 2 );
file.close();
}
- QString result;
+ TQString result;
if ( pack )
{
// Pack the whole theme
@@ -375,7 +375,7 @@ QString KTheme::createYourself( bool pack )
kdDebug() << "Packing everything under: " << m_kgd->saveLocation( "themes", m_name + "/" ) << endl;
- if ( tar.addLocalDirectory( m_kgd->saveLocation( "themes", m_name + "/" ), QString::null ) )
+ if ( tar.addLocalDirectory( m_kgd->saveLocation( "themes", m_name + "/" ), TQString::null ) )
result = tar.fileName();
tar.close();
@@ -390,18 +390,18 @@ void KTheme::apply()
{
kdDebug() << "Going to apply theme: " << m_name << endl;
- QString themeDir = m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/";
+ TQString themeDir = m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/";
kdDebug() << "Theme dir: " << themeDir << endl;
// 2. Background theme
- QDomNodeList desktopList = m_dom.elementsByTagName( "desktop" );
+ TQDomNodeList desktopList = m_dom.elementsByTagName( "desktop" );
KConfig desktopConf( "kdesktoprc" );
desktopConf.setGroup( "Background Common" );
for ( uint i = 0; i <= desktopList.count(); i++ )
{
- QDomElement desktopElem = desktopList.item( i ).toElement();
+ TQDomElement desktopElem = desktopList.item( i ).toElement();
if ( !desktopElem.isNull() )
{
// TODO optimize, don't write several times the common section
@@ -409,10 +409,10 @@ void KTheme::apply()
desktopConf.writeEntry( "CommonDesktop", common );
desktopConf.writeEntry( "DeskNum", desktopElem.attribute( "number", "0" ).toUInt() );
- desktopConf.setGroup( QString( "Desktop%1" ).arg( i ) );
+ desktopConf.setGroup( TQString( "Desktop%1" ).arg( i ) );
desktopConf.writeEntry( "BackgroundMode", getProperty( desktopElem, "mode", "id" ) );
- desktopConf.writeEntry( "Color1", QColor( getProperty( desktopElem, "color1", "rgb" ) ) );
- desktopConf.writeEntry( "Color2", QColor( getProperty( desktopElem, "color2", "rgb" ) ) );
+ desktopConf.writeEntry( "Color1", TQColor( getProperty( desktopElem, "color1", "rgb" ) ) );
+ desktopConf.writeEntry( "Color2", TQColor( getProperty( desktopElem, "color2", "rgb" ) ) );
desktopConf.writeEntry( "BlendMode", getProperty( desktopElem, "blending", "mode" ) );
desktopConf.writeEntry( "BlendBalance", getProperty( desktopElem, "blending", "balance" ) );
desktopConf.writeEntry( "ReverseBlending",
@@ -428,7 +428,7 @@ void KTheme::apply()
}
// 11. Screensaver
- QDomElement saverElem = m_dom.elementsByTagName( "screensaver" ).item( 0 ).toElement();
+ TQDomElement saverElem = m_dom.elementsByTagName( "screensaver" ).item( 0 ).toElement();
if ( !saverElem.isNull() )
{
@@ -445,18 +445,18 @@ void KTheme::apply()
// FIXME Xinerama
// 3. Icons
- QDomElement iconElem = m_dom.elementsByTagName( "icons" ).item( 0 ).toElement();
+ TQDomElement iconElem = m_dom.elementsByTagName( "icons" ).item( 0 ).toElement();
if ( !iconElem.isNull() )
{
KConfig * iconConf = KGlobal::config();
iconConf->setGroup( "Icons" );
iconConf->writeEntry( "Theme", iconElem.attribute( "name", "crystalsvg" ), true, true );
- QDomNodeList iconList = iconElem.childNodes();
+ TQDomNodeList iconList = iconElem.childNodes();
for ( uint i = 0; i < iconList.count(); i++ )
{
- QDomElement iconSubElem = iconList.item( i ).toElement();
- QString object = iconSubElem.attribute( "object" );
+ TQDomElement iconSubElem = iconList.item( i ).toElement();
+ TQString object = iconSubElem.attribute( "object" );
if ( object == "desktop" )
iconConf->setGroup( "DesktopIcons" );
else if ( object == "mainToolbar" )
@@ -468,10 +468,10 @@ void KTheme::apply()
else if ( object == "toolbar" )
iconConf->setGroup( "ToolbarIcons" );
- QString iconName = iconSubElem.tagName();
+ TQString iconName = iconSubElem.tagName();
if ( iconName.contains( "Color" ) )
{
- QColor iconColor = QColor( iconSubElem.attribute( "rgb" ) );
+ TQColor iconColor = TQColor( iconSubElem.attribute( "rgb" ) );
iconConf->writeEntry( iconName, iconColor, true, true );
}
else if ( iconName.contains( "Value" ) || iconName == "Size" )
@@ -489,16 +489,16 @@ void KTheme::apply()
}
// 4. Sounds
- QDomElement soundsElem = m_dom.elementsByTagName( "sounds" ).item( 0 ).toElement();
+ TQDomElement soundsElem = m_dom.elementsByTagName( "sounds" ).item( 0 ).toElement();
if ( !soundsElem.isNull() )
{
KConfig soundConf( "knotify.eventsrc" );
KConfig kwinSoundConf( "kwin.eventsrc" );
- QDomNodeList eventList = soundsElem.elementsByTagName( "event" );
+ TQDomNodeList eventList = soundsElem.elementsByTagName( "event" );
for ( uint i = 0; i < eventList.count(); i++ )
{
- QDomElement eventElem = eventList.item( i ).toElement();
- QString object = eventElem.attribute( "object" );
+ TQDomElement eventElem = eventList.item( i ).toElement();
+ TQString object = eventElem.attribute( "object" );
if ( object == "global" )
{
@@ -521,28 +521,28 @@ void KTheme::apply()
}
// 5. Colors
- QDomElement colorsElem = m_dom.elementsByTagName( "colors" ).item( 0 ).toElement();
+ TQDomElement colorsElem = m_dom.elementsByTagName( "colors" ).item( 0 ).toElement();
if ( !colorsElem.isNull() )
{
- QDomNodeList colorList = colorsElem.childNodes();
+ TQDomNodeList colorList = colorsElem.childNodes();
KConfig * colorConf = KGlobal::config();
- QString sCurrentScheme = locateLocal("data", "kdisplay/color-schemes/thememgr.kcsrc");
+ TQString sCurrentScheme = locateLocal("data", "kdisplay/color-schemes/thememgr.kcsrc");
KSimpleConfig *colorScheme = new KSimpleConfig( sCurrentScheme );
colorScheme->setGroup("Color Scheme" );
for ( uint i = 0; i < colorList.count(); i++ )
{
- QDomElement colorElem = colorList.item( i ).toElement();
- QString object = colorElem.attribute( "object" );
+ TQDomElement colorElem = colorList.item( i ).toElement();
+ TQString object = colorElem.attribute( "object" );
if ( object == "global" )
colorConf->setGroup( "General" );
else if ( object == "kwin" )
colorConf->setGroup( "WM" );
- QString colName = colorElem.tagName();
- QColor curColor = QColor( colorElem.attribute( "rgb" ) );
+ TQString colName = colorElem.tagName();
+ TQColor curColor = TQColor( colorElem.attribute( "rgb" ) );
colorConf->writeEntry( colName, curColor, true, true ); // kdeglobals
colorScheme->writeEntry( colName, curColor ); // thememgr.kcsrc
}
@@ -558,7 +558,7 @@ void KTheme::apply()
}
// 6.Cursors
- QDomElement cursorsElem = m_dom.elementsByTagName( "cursors" ).item( 0 ).toElement();
+ TQDomElement cursorsElem = m_dom.elementsByTagName( "cursors" ).item( 0 ).toElement();
if ( !cursorsElem.isNull() )
{
@@ -569,17 +569,17 @@ void KTheme::apply()
}
// 7. KWin
- QDomElement wmElem = m_dom.elementsByTagName( "wm" ).item( 0 ).toElement();
+ TQDomElement wmElem = m_dom.elementsByTagName( "wm" ).item( 0 ).toElement();
if ( !wmElem.isNull() )
{
KConfig kwinConf( "kwinrc" );
kwinConf.setGroup( "Style" );
- QString type = wmElem.attribute( "type" );
+ TQString type = wmElem.attribute( "type" );
if ( type == "builtin" )
kwinConf.writeEntry( "PluginLib", wmElem.attribute( "name" ) );
//else // TODO support custom themes
- QDomNodeList buttons = wmElem.elementsByTagName ("buttons");
+ TQDomNodeList buttons = wmElem.elementsByTagName ("buttons");
if ( buttons.count() > 0 )
{
kwinConf.writeEntry( "CustomButtonPositions", true );
@@ -597,27 +597,27 @@ void KTheme::apply()
}
// 8. Konqueror
- QDomElement konqElem = m_dom.elementsByTagName( "konqueror" ).item( 0 ).toElement();
+ TQDomElement konqElem = m_dom.elementsByTagName( "konqueror" ).item( 0 ).toElement();
if ( !konqElem.isNull() )
{
KConfig konqConf( "konquerorrc" );
konqConf.setGroup( "Settings" );
konqConf.writeEntry( "BgImage", unprocessFilePath( "konqueror", getProperty( konqElem, "wallpaper", "url" ) ) );
- konqConf.writeEntry( "BgColor", QColor( getProperty( konqElem, "bgcolor", "rgb" ) ) );
+ konqConf.writeEntry( "BgColor", TQColor( getProperty( konqElem, "bgcolor", "rgb" ) ) );
konqConf.sync();
client->send("konqueror*", "KonquerorIface", "reparseConfiguration()", ""); // FIXME seems not to work :(
}
// 9. Kicker
- QDomElement panelElem = m_dom.elementsByTagName( "panel" ).item( 0 ).toElement();
+ TQDomElement panelElem = m_dom.elementsByTagName( "panel" ).item( 0 ).toElement();
if ( !panelElem.isNull() )
{
KConfig kickerConf( "kickerrc" );
kickerConf.setGroup( "General" );
- QString kickerBgUrl = getProperty( panelElem, "background", "url" );
+ TQString kickerBgUrl = getProperty( panelElem, "background", "url" );
if ( !kickerBgUrl.isEmpty() )
{
kickerConf.writeEntry( "UseBackgroundTheme", true );
@@ -639,7 +639,7 @@ void KTheme::apply()
}
// 10. Widget style
- QDomElement widgetsElem = m_dom.elementsByTagName( "widgets" ).item( 0 ).toElement();
+ TQDomElement widgetsElem = m_dom.elementsByTagName( "widgets" ).item( 0 ).toElement();
if ( !widgetsElem.isNull() )
{
@@ -651,20 +651,20 @@ void KTheme::apply()
}
// 12. Fonts
- QDomElement fontsElem = m_dom.elementsByTagName( "fonts" ).item( 0 ).toElement();
+ TQDomElement fontsElem = m_dom.elementsByTagName( "fonts" ).item( 0 ).toElement();
if ( !fontsElem.isNull() )
{
KConfig * fontsConf = KGlobal::config();
- KConfig * kde1xConf = new KSimpleConfig( QDir::homeDirPath() + "/.kderc" );
+ KConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" );
kde1xConf->setGroup( "General" );
- QDomNodeList fontList = fontsElem.childNodes();
+ TQDomNodeList fontList = fontsElem.childNodes();
for ( uint i = 0; i < fontList.count(); i++ )
{
- QDomElement fontElem = fontList.item( i ).toElement();
- QString fontName = fontElem.tagName();
- QString fontValue = fontElem.attribute( "value" );
- QString fontObject = fontElem.attribute( "object" );
+ TQDomElement fontElem = fontList.item( i ).toElement();
+ TQString fontName = fontElem.tagName();
+ TQString fontValue = fontElem.attribute( "value" );
+ TQString fontObject = fontElem.attribute( "object" );
if ( fontObject == "FMSettings" ) {
desktopConf.setGroup( fontObject );
@@ -685,51 +685,51 @@ void KTheme::apply()
}
-bool KTheme::remove( const QString & name )
+bool KTheme::remove( const TQString & name )
{
kdDebug() << "Going to remove theme: " << name << endl;
return KIO::NetAccess::del( KGlobal::dirs()->saveLocation( "themes", name + "/" ), 0L );
}
-void KTheme::setProperty( const QString & name, const QString & value, QDomElement parent )
+void KTheme::setProperty( const TQString & name, const TQString & value, TQDomElement parent )
{
- QDomElement tmp = m_dom.createElement( name );
+ TQDomElement tmp = m_dom.createElement( name );
tmp.setAttribute( "value", value );
parent.appendChild( tmp );
}
-QString KTheme::getProperty( const QString & name ) const
+TQString KTheme::getProperty( const TQString & name ) const
{
- QDomNodeList _list = m_dom.elementsByTagName( name );
+ TQDomNodeList _list = m_dom.elementsByTagName( name );
if ( _list.count() != 0 )
return _list.item( 0 ).toElement().attribute( "value" );
else
{
kdWarning() << "Found no such property: " << name << endl;
- return QString::null;
+ return TQString::null;
}
}
-QString KTheme::getProperty( QDomElement parent, const QString & tag,
- const QString & attr ) const
+TQString KTheme::getProperty( TQDomElement parent, const TQString & tag,
+ const TQString & attr ) const
{
- QDomNodeList _list = parent.elementsByTagName( tag );
+ TQDomNodeList _list = parent.elementsByTagName( tag );
if ( _list.count() != 0 )
return _list.item( 0 ).toElement().attribute( attr );
else
{
- kdWarning() << QString( "No such property found: %1->%2->%3" )
+ kdWarning() << TQString( "No such property found: %1->%2->%3" )
.arg( parent.tagName() ).arg( tag ).arg( attr ) << endl;
- return QString::null;
+ return TQString::null;
}
}
-void KTheme::createIconElems( const QString & group, const QString & object,
- QDomElement parent, KConfig * cfg )
+void KTheme::createIconElems( const TQString & group, const TQString & object,
+ TQDomElement parent, KConfig * cfg )
{
cfg->setGroup( group );
- QStringList elemNames;
+ TQStringList elemNames;
elemNames << "Animated" << "DoublePixels" << "Size"
<< "ActiveColor" << "ActiveColor2" << "ActiveEffect"
<< "ActiveSemiTransparent" << "ActiveValue"
@@ -737,12 +737,12 @@ void KTheme::createIconElems( const QString & group, const QString & object,
<< "DefaultSemiTransparent" << "DefaultValue"
<< "DisabledColor" << "DisabledColor2" << "DisabledEffect"
<< "DisabledSemiTransparent" << "DisabledValue";
- for ( QStringList::ConstIterator it = elemNames.begin(); it != elemNames.end(); ++it ) {
+ for ( TQStringList::ConstIterator it = elemNames.begin(); it != elemNames.end(); ++it ) {
if ( (*it).contains( "Color" ) )
createColorElem( *it, object, parent, cfg );
else
{
- QDomElement tmpCol = m_dom.createElement( *it );
+ TQDomElement tmpCol = m_dom.createElement( *it );
tmpCol.setAttribute( "object", object );
if ( (*it).contains( "Value" ) || *it == "Size" )
@@ -758,33 +758,33 @@ void KTheme::createIconElems( const QString & group, const QString & object,
}
}
-void KTheme::createColorElem( const QString & name, const QString & object,
- QDomElement parent, KConfig * cfg )
+void KTheme::createColorElem( const TQString & name, const TQString & object,
+ TQDomElement parent, KConfig * cfg )
{
- QColor color = cfg->readColorEntry( name );
+ TQColor color = cfg->readColorEntry( name );
if ( color.isValid() )
{
- QDomElement tmpCol = m_dom.createElement( name );
+ TQDomElement tmpCol = m_dom.createElement( name );
tmpCol.setAttribute( "rgb", color.name() );
tmpCol.setAttribute( "object", object );
parent.appendChild( tmpCol );
}
}
-void KTheme::createSoundList( const QStringList & events, const QString & object,
- QDomElement parent, KConfig * cfg )
+void KTheme::createSoundList( const TQStringList & events, const TQString & object,
+ TQDomElement parent, KConfig * cfg )
{
- for ( QStringList::ConstIterator it = events.begin(); it != events.end(); ++it )
+ for ( TQStringList::ConstIterator it = events.begin(); it != events.end(); ++it )
{
- QString group = ( *it );
+ TQString group = ( *it );
if ( cfg->hasGroup( group ) )
{
cfg->setGroup( group );
- QString soundURL = cfg->readPathEntry( "soundfile" );
+ TQString soundURL = cfg->readPathEntry( "soundfile" );
int pres = cfg->readNumEntry( "presentation", 0 );
if ( !soundURL.isEmpty() && ( ( pres & 1 ) == 1 ) )
{
- QDomElement eventElem = m_dom.createElement( "event" );
+ TQDomElement eventElem = m_dom.createElement( "event" );
eventElem.setAttribute( "object", object );
eventElem.setAttribute( "name", group );
eventElem.setAttribute( "url", processFilePath( "sounds", soundURL ) );
@@ -794,9 +794,9 @@ void KTheme::createSoundList( const QStringList & events, const QString & object
}
}
-QString KTheme::processFilePath( const QString & section, const QString & path )
+TQString KTheme::processFilePath( const TQString & section, const TQString & path )
{
- QFileInfo fi( path );
+ TQFileInfo fi( path );
if ( fi.isRelative() )
fi.setFile( findResource( section, path ) );
@@ -826,60 +826,60 @@ QString KTheme::processFilePath( const QString & section, const QString & path )
else
kdWarning() << "Unsupported theme resource type" << endl;
- return QString::null; // an error occured or the resource doesn't exist
+ return TQString::null; // an error occured or the resource doesn't exist
}
-QString KTheme::unprocessFilePath( const QString & section, QString path )
+TQString KTheme::unprocessFilePath( const TQString & section, TQString path )
{
if ( path.startsWith( "theme:/" ) )
- return path.replace( QRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" );
+ return path.replace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" );
- if ( QFile::exists( path ) )
+ if ( TQFile::exists( path ) )
return path;
else // try to find it in the system
return findResource( section, path );
}
-void KTheme::setAuthor( const QString & author )
+void KTheme::setAuthor( const TQString & author )
{
setProperty( "author", author, m_general );
}
-void KTheme::setEmail( const QString & email )
+void KTheme::setEmail( const TQString & email )
{
setProperty( "email", email, m_general );
}
-void KTheme::setHomepage( const QString & homepage )
+void KTheme::setHomepage( const TQString & homepage )
{
setProperty( "homepage", homepage, m_general );
}
-void KTheme::setComment( const QString & comment )
+void KTheme::setComment( const TQString & comment )
{
setProperty( "comment", comment, m_general );
}
-void KTheme::setVersion( const QString & version )
+void KTheme::setVersion( const TQString & version )
{
setProperty( "version", version, m_general );
}
void KTheme::addPreview()
{
- QString file = m_kgd->saveLocation( "themes", m_name + "/" ) + m_name + ".preview.png";
+ TQString file = m_kgd->saveLocation( "themes", m_name + "/" ) + m_name + ".preview.png";
kdDebug() << "Adding preview: " << file << endl;
- QPixmap snapshot = QPixmap::grabWindow( qt_xrootwin() );
+ TQPixmap snapshot = TQPixmap::grabWindow( qt_xrootwin() );
snapshot.save( file, "PNG" );
}
-bool KTheme::copyFile( const QString & from, const QString & to )
+bool KTheme::copyFile( const TQString & from, const TQString & to )
{
// we overwrite b/c of restoring the "original" theme
return KIO::NetAccess::file_copy( from, to, -1, true /*overwrite*/ );
}
-QString KTheme::findResource( const QString & section, const QString & path )
+TQString KTheme::findResource( const TQString & section, const TQString & path )
{
if ( section == "desktop" )
return m_kgd->findResource( "wallpaper", path );
@@ -892,6 +892,6 @@ QString KTheme::findResource( const QString & section, const QString & path )
else
{
kdWarning() << "Requested unknown resource: " << section << endl;
- return QString::null;
+ return TQString::null;
}
}
diff --git a/kcontrol/kthememanager/ktheme.h b/kcontrol/kthememanager/ktheme.h
index 1401b49e7..0ec3c94cf 100644
--- a/kcontrol/kthememanager/ktheme.h
+++ b/kcontrol/kthememanager/ktheme.h
@@ -19,11 +19,11 @@
#ifndef KTHEME_H
#define KTHEME_H
-#include <qdom.h>
-#include <qguardedptr.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qwidget.h>
+#include <tqdom.h>
+#include <tqguardedptr.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqwidget.h>
#include <kurl.h>
@@ -47,14 +47,14 @@ public:
* Constructs KTheme using an installed theme
* @param xmlFile The theme's XML file
*/
- KTheme( QWidget *parent, const QString & xmlFile );
+ KTheme( TQWidget *parent, const TQString & xmlFile );
/**
* Constructs an empty theme, to be used with
* #createYourself()
* @param create Whether to start the DOM tree
*/
- KTheme( QWidget *parent, bool create = false );
+ KTheme( TQWidget *parent, bool create = false );
/**
* Destructor
@@ -74,7 +74,7 @@ public:
* @param pack Whether to also pack the theme in tar.gz format
* @return The path to the newly created tarball with theme (if @p pack == true)
*/
- QString createYourself( bool pack = false );
+ TQString createYourself( bool pack = false );
/**
* Apply the theme to the system, ie. set the config variables and
@@ -87,41 +87,41 @@ public:
* @param name The name of the theme
* @return true on success
*/
- static bool remove( const QString & name );
+ static bool remove( const TQString & name );
/**
* @return the theme name
*/
- QString name() const { return m_name; }
+ TQString name() const { return m_name; }
/**
* Set the theme name
*/
- void setName( const QString & name );
+ void setName( const TQString & name );
- QString author() const {
+ TQString author() const {
return getProperty( "author" );
}
- void setAuthor( const QString & author );
+ void setAuthor( const TQString & author );
- QString email() const {
+ TQString email() const {
return getProperty( "email" );
}
- void setEmail( const QString & email );
+ void setEmail( const TQString & email );
- QString homepage() const {
+ TQString homepage() const {
return getProperty( "homepage" );
}
- void setHomepage( const QString & homepage );
+ void setHomepage( const TQString & homepage );
- QString comment() const {
+ TQString comment() const {
return getProperty( "comment" );
}
- void setComment ( const QString & comment );
+ void setComment ( const TQString & comment );
- QString version() const {
+ TQString version() const {
return getProperty( "version" );
}
- void setVersion ( const QString & version );
+ void setVersion ( const TQString & version );
/**
* Creates a preview file called theme_name.preview.png
@@ -134,13 +134,13 @@ private:
* Create a property with @p name, value @p value
* and append it to @p parent element
*/
- void setProperty( const QString & name,
- const QString & value,
- QDomElement parent );
+ void setProperty( const TQString & name,
+ const TQString & value,
+ TQDomElement parent );
/**
* Get a simple property from the "general" section of the DOM tree
*/
- QString getProperty( const QString & name ) const;
+ TQString getProperty( const TQString & name ) const;
/**
* Get a property from the DOM tree, based on:
@@ -148,8 +148,8 @@ private:
* @param tag From the this tag
* @param attr From this attribute
*/
- QString getProperty( QDomElement parent, const QString & tag,
- const QString & attr ) const;
+ TQString getProperty( TQDomElement parent, const TQString & tag,
+ const TQString & attr ) const;
/**
* Creates a list of "icon" elements based on:
@@ -158,16 +158,16 @@ private:
* @param parent Parent element to append to
* @param cfg The KConfig object to work with
*/
- void createIconElems( const QString & group, const QString & object,
- QDomElement parent, KConfig * cfg );
+ void createIconElems( const TQString & group, const TQString & object,
+ TQDomElement parent, KConfig * cfg );
/**
* Creates a color DOM element @p name, with a specifier @p object,
* appends it to @p parent; used when creating themes
* @param cfg The KConfig object to work with
*/
- void createColorElem( const QString & name, const QString & object,
- QDomElement parent, KConfig * cfg );
+ void createColorElem( const TQString & name, const TQString & object,
+ TQDomElement parent, KConfig * cfg );
/**
* Creates a list of "event" elements based on:
* @param events The list of events to work on
@@ -175,50 +175,50 @@ private:
* @param parent Parent element to append to
* @param cfg The KConfig object to work with
*/
- void createSoundList( const QStringList & events, const QString & object,
- QDomElement parent, KConfig * cfg );
+ void createSoundList( const TQStringList & events, const TQString & object,
+ TQDomElement parent, KConfig * cfg );
/**
* Tries to find out absolute path to a resource and copy it to the theme's temp dir;
* used when creating themes
* @param section The theme section to work on, corresponds to toplevel XML tags
* @param path The original path, relative or absolute
- * @return an internal path suitable for writing into the XML file or QString::null
+ * @return an internal path suitable for writing into the XML file or TQString::null
* in case the resource couldn't be found
*/
- QString processFilePath( const QString & section, const QString & path );
+ TQString processFilePath( const TQString & section, const TQString & path );
/**
* Converts an internal theme:/ representation of a resource
* to a real path
*/
- QString unprocessFilePath( const QString & section, QString path );
+ TQString unprocessFilePath( const TQString & section, TQString path );
/**
* Wrapper around KIO::NetAccess::file_copy
*/
- bool copyFile( const QString & from, const QString & to );
+ bool copyFile( const TQString & from, const TQString & to );
/**
* Wrapper around KGlobal::dirs()->findResource()
* @param section Section to work on (desktop, sounds, panel etc)
* @param path The file to find
*/
- QString findResource( const QString & section, const QString & path );
+ TQString findResource( const TQString & section, const TQString & path );
/// name of the theme
- QString m_name;
+ TQString m_name;
/// DOM holding the theme
- QDomDocument m_dom;
+ TQDomDocument m_dom;
/// the DOM root element
- QDomElement m_root;
+ TQDomElement m_root;
/// "general" section
- QDomElement m_general;
+ TQDomElement m_general;
KStandardDirs * m_kgd;
- QGuardedPtr<QWidget> m_parent;
+ TQGuardedPtr<TQWidget> m_parent;
};
#endif
diff --git a/kcontrol/kthememanager/kthemedlg.ui.h b/kcontrol/kthememanager/kthemedlg.ui.h
index 53f296a1c..85d22cb9d 100644
--- a/kcontrol/kthememanager/kthemedlg.ui.h
+++ b/kcontrol/kthememanager/kthemedlg.ui.h
@@ -8,7 +8,7 @@
*****************************************************************************/
#include <krun.h>
-void KThemeDlg::startKonqui( const QString & url )
+void KThemeDlg::startKonqui( const TQString & url )
{
(void) new KRun(url);
}
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index d5efc65cd..2668bd87c 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -16,12 +16,12 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpixmap.h>
-#include <qpushbutton.h>
-#include <qtoolbutton.h>
-#include <qtooltip.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpixmap.h>
+#include <tqpushbutton.h>
+#include <tqtoolbutton.h>
+#include <tqtooltip.h>
#include <kaboutdata.h>
#include <kapplication.h>
@@ -42,7 +42,7 @@
#include "knewthemedlg.h"
#include "config.h"
-kthememanager::kthememanager( QWidget *parent, const char *name )
+kthememanager::kthememanager( TQWidget *parent, const char *name )
: KCModule( parent, name ), m_theme( 0 ), m_origTheme( 0 )
{
@@ -61,33 +61,33 @@ kthememanager::kthememanager( QWidget *parent, const char *name )
setAcceptDrops( true );
init();
- QBoxLayout *top = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQBoxLayout *top = new TQVBoxLayout(this, 0, KDialog::spacingHint());
dlg = new KThemeDlg(this);
top->addWidget( dlg );
- dlg->lvThemes->setColumnWidthMode( 0, QListView::Maximum );
+ dlg->lvThemes->setColumnWidthMode( 0, TQListView::Maximum );
- connect( ( QObject * )dlg->btnInstall, SIGNAL( clicked() ),
- this, SLOT( slotInstallTheme() ) );
+ connect( ( TQObject * )dlg->btnInstall, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( slotInstallTheme() ) );
- connect( ( QObject * )dlg->btnRemove, SIGNAL( clicked() ),
- this, SLOT( slotRemoveTheme() ) );
+ connect( ( TQObject * )dlg->btnRemove, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( slotRemoveTheme() ) );
- connect( ( QObject * )dlg->btnCreate, SIGNAL( clicked() ),
- this, SLOT( slotCreateTheme() ) );
+ connect( ( TQObject * )dlg->btnCreate, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( slotCreateTheme() ) );
- connect( ( QObject * )dlg->lvThemes, SIGNAL( clicked( QListViewItem * ) ),
- this, SLOT( slotThemeChanged( QListViewItem * ) ) );
+ connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ),
+ this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) );
- connect( ( QObject * )dlg->lvThemes, SIGNAL( currentChanged( QListViewItem * ) ),
- this, SLOT( slotThemeChanged( QListViewItem * ) ) );
+ connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( currentChanged( TQListViewItem * ) ),
+ this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) );
- connect( this, SIGNAL( filesDropped( const KURL::List& ) ),
- this, SLOT( updateButton() ) );
+ connect( this, TQT_SIGNAL( filesDropped( const KURL::List& ) ),
+ this, TQT_SLOT( updateButton() ) );
- connect( ( QObject * )dlg->lvThemes, SIGNAL( clicked( QListViewItem * ) ),
- this, SLOT( updateButton() ) );
+ connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ),
+ this, TQT_SLOT( updateButton() ) );
m_origTheme = new KTheme( this, true ); // stores the defaults to get back to
m_origTheme->setName( ORIGINAL_THEME );
@@ -112,10 +112,10 @@ void kthememanager::init()
void kthememanager::updateButton()
{
- QListViewItem * cur = dlg->lvThemes->currentItem();
+ TQListViewItem * cur = dlg->lvThemes->currentItem();
bool enable = (cur != 0);
if (enable) {
- enable = QFile(KGlobal::dirs()->saveLocation( "themes", cur->text( 0 ) + "/"+ cur->text( 0 )+ ".xml" ,false)).exists() ;
+ enable = TQFile(KGlobal::dirs()->saveLocation( "themes", cur->text( 0 ) + "/"+ cur->text( 0 )+ ".xml" ,false)).exists() ;
}
dlg->btnRemove->setEnabled(enable);
}
@@ -135,8 +135,8 @@ void kthememanager::load(bool useDefaults)
conf.setReadDefaults( useDefaults );
conf.setGroup( "General" );
- QString themeName = conf.readEntry( "CurrentTheme" );
- QListViewItem * cur = dlg->lvThemes->findItem( themeName, 0 );
+ TQString themeName = conf.readEntry( "CurrentTheme" );
+ TQListViewItem * cur = dlg->lvThemes->findItem( themeName, 0 );
if ( cur )
{
dlg->lvThemes->setSelected( cur, true );
@@ -154,11 +154,11 @@ void kthememanager::defaults()
void kthememanager::save()
{
- QListViewItem * cur = dlg->lvThemes->currentItem();
+ TQListViewItem * cur = dlg->lvThemes->currentItem();
if ( cur )
{
- QString themeName = cur->text( 0 );
+ TQString themeName = cur->text( 0 );
m_theme = new KTheme( this, KGlobal::dirs()->findResource( "themes", themeName + "/" + themeName + ".xml") );
m_theme->apply();
@@ -178,33 +178,33 @@ void kthememanager::save()
void kthememanager::listThemes()
{
dlg->lvThemes->clear();
- dlg->lbPreview->setPixmap( QPixmap() );
+ dlg->lbPreview->setPixmap( TQPixmap() );
- QStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
+ TQStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
- QStringList::const_iterator it;
+ TQStringList::const_iterator it;
for ( it = themes.begin(); it != themes.end(); ++it )
{
KTheme theme( this, ( *it ) );
- QString name = theme.name();
+ TQString name = theme.name();
if ( name != ORIGINAL_THEME ) // skip the "original" theme
- ( void ) new QListViewItem( dlg->lvThemes, name, theme.comment() );
+ ( void ) new TQListViewItem( dlg->lvThemes, name, theme.comment() );
}
kdDebug() << "Available themes: " << themes << endl;
}
-float kthememanager::getThemeVersion( const QString & themeName )
+float kthememanager::getThemeVersion( const TQString & themeName )
{
- QStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
+ TQStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
- QStringList::const_iterator it;
+ TQStringList::const_iterator it;
for ( it = themes.begin(); it != themes.end(); ++it )
{
KTheme theme( 0L, ( *it ) );
- QString name = theme.name();
+ TQString name = theme.name();
bool ok = false;
float version = theme.version().toFloat( &ok );
if ( name == themeName && ok )
@@ -224,7 +224,7 @@ void kthememanager::addNewTheme( const KURL & url )
{
if ( url.isValid() )
{
- QString themeName = QFileInfo( url.fileName() ).baseName();
+ TQString themeName = TQFileInfo( url.fileName() ).baseName();
if ( getThemeVersion( themeName ) != -1 ) // theme exists already
{
KTheme::remove( themeName ); // remove first
@@ -246,11 +246,11 @@ void kthememanager::addNewTheme( const KURL & url )
void kthememanager::slotRemoveTheme()
{
// get the selected item from the listview
- QListViewItem * cur = dlg->lvThemes->currentItem();
+ TQListViewItem * cur = dlg->lvThemes->currentItem();
// ask and remove it
if ( cur )
{
- QString themeName = cur->text( 0 );
+ TQString themeName = cur->text( 0 );
if ( KMessageBox::warningContinueCancel( this, "<qt>" + i18n( "Do you really want to remove the theme <b>%1</b>?" ).arg( themeName ),
i18n( "Remove Theme" ), KGuiItem( i18n( "&Remove" ), "editdelete" ) )
== KMessageBox::Continue )
@@ -262,7 +262,7 @@ void kthememanager::slotRemoveTheme()
}
}
-bool kthememanager::themeExist(const QString &_themeName)
+bool kthememanager::themeExist(const TQString &_themeName)
{
return ( dlg->lvThemes->findItem( _themeName, 0 )!=0 );
}
@@ -279,10 +279,10 @@ void kthememanager::slotCreateTheme()
dlg.setEmail( es.getSetting( KEMailSettings::EmailAddress ) );
dlg.setVersion( "0.1" );
- if ( dlg.exec() == QDialog::Accepted )
+ if ( dlg.exec() == TQDialog::Accepted )
{
- QString themeName = dlg.getName();
+ TQString themeName = dlg.getName();
if ( themeExist(themeName) )
{
KMessageBox::information( this, i18n( "Theme %1 already exists." ).arg( themeName ) );
@@ -301,7 +301,7 @@ void kthememanager::slotCreateTheme()
m_theme->setComment( dlg.getComment().replace( "\n", "" ) );
m_theme->setVersion( dlg.getVersion() );
- QString result = m_theme->createYourself( true );
+ TQString result = m_theme->createYourself( true );
m_theme->addPreview();
if ( !result.isEmpty() )
@@ -318,30 +318,30 @@ void kthememanager::slotCreateTheme()
}
}
-void kthememanager::slotThemeChanged( QListViewItem * item )
+void kthememanager::slotThemeChanged( TQListViewItem * item )
{
if ( item )
{
- QString themeName = item->text(0);
+ TQString themeName = item->text(0);
kdDebug() << "Activated theme: " << themeName << endl;
- QString themeDir = KGlobal::dirs()->findResourceDir( "themes", themeName + "/" + themeName + ".xml") + themeName + "/";
+ TQString themeDir = KGlobal::dirs()->findResourceDir( "themes", themeName + "/" + themeName + ".xml") + themeName + "/";
- QString pixFile = themeDir + themeName + ".preview.png";
+ TQString pixFile = themeDir + themeName + ".preview.png";
- if ( QFile::exists( pixFile ) )
+ if ( TQFile::exists( pixFile ) )
{
updatePreview( pixFile );
}
else
{
- dlg->lbPreview->setPixmap( QPixmap() );
+ dlg->lbPreview->setPixmap( TQPixmap() );
dlg->lbPreview->setText( i18n( "This theme does not contain a preview." ) );
}
KTheme theme( this, themeDir + themeName + ".xml" );
- QToolTip::remove( dlg->lbPreview );
- QToolTip::add( dlg->lbPreview, "<qt>" + i18n( "Author: %1<br>Email: %2<br>Version: %3<br>Homepage: %4" )
+ TQToolTip::remove( dlg->lbPreview );
+ TQToolTip::add( dlg->lbPreview, "<qt>" + i18n( "Author: %1<br>Email: %2<br>Version: %3<br>Homepage: %4" )
.arg( theme.author() ).arg( theme.email() )
.arg( theme.version() ).arg( theme.homepage() ) + "</qt>");
@@ -349,12 +349,12 @@ void kthememanager::slotThemeChanged( QListViewItem * item )
}
}
-void kthememanager::dragEnterEvent( QDragEnterEvent * ev )
+void kthememanager::dragEnterEvent( TQDragEnterEvent * ev )
{
ev->accept( KURLDrag::canDecode( ev ) );
}
-void kthememanager::dropEvent( QDropEvent * ev )
+void kthememanager::dropEvent( TQDropEvent * ev )
{
KURL::List urls;
if ( KURLDrag::decode( ev, urls ) )
@@ -401,21 +401,21 @@ void kthememanager::queryLNFModules()
dlg->btnSaver->setIconSet( il->loadIconSet( "kscreensaver", KIcon::Desktop, 32 ) );
}
-void kthememanager::updatePreview( const QString & pixFile )
+void kthememanager::updatePreview( const TQString & pixFile )
{
kdDebug() << "Preview is in file: " << pixFile << endl;
- QImage preview( pixFile, "PNG" );
+ TQImage preview( pixFile, "PNG" );
if (preview.width()>dlg->lbPreview->contentsRect().width() ||
preview.height()>dlg->lbPreview->contentsRect().height() )
- preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), QImage::ScaleMin );
- QPixmap pix;
+ preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQImage::ScaleMin );
+ TQPixmap pix;
pix.convertFromImage( preview );
dlg->lbPreview->setPixmap( pix );
}
extern "C"
{
- KDE_EXPORT KCModule *create_kthememanager(QWidget *parent, const char *)
+ KDE_EXPORT KCModule *create_kthememanager(TQWidget *parent, const char *)
{
KGlobal::locale()->insertCatalogue( "kthememanager" );
return new kthememanager( parent, "kthememanager" );
diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h
index 972251f6a..cbb0a1db5 100644
--- a/kcontrol/kthememanager/kthememanager.h
+++ b/kcontrol/kthememanager/kthememanager.h
@@ -39,7 +39,7 @@ class KIconViewItem;
class KThemeDetailsItem: public KIconViewItem
{
public:
- KThemeDetailsItem( KIconView * parent, const QString & text, const QPixmap & icon, const QString & execString )
+ KThemeDetailsItem( KIconView * parent, const TQString & text, const TQPixmap & icon, const TQString & execString )
: KIconViewItem( parent, text, icon ) { m_exec = execString; }
virtual ~KThemeDetailsItem() { };
@@ -47,7 +47,7 @@ public:
( void ) new KRun( m_exec );
}
private:
- QString m_exec;
+ TQString m_exec;
};
*/
@@ -63,7 +63,7 @@ class kthememanager: public KCModule
{
Q_OBJECT
public:
- kthememanager( QWidget *parent=0, const char *name=0 );
+ kthememanager( TQWidget *parent=0, const char *name=0 );
virtual ~kthememanager();
/**
@@ -81,8 +81,8 @@ public:
virtual void defaults();
protected:
- void dragEnterEvent ( QDragEnterEvent * ev );
- void dropEvent ( QDropEvent * ev );
+ void dragEnterEvent ( TQDragEnterEvent * ev );
+ void dropEvent ( TQDropEvent * ev );
signals:
/**
@@ -109,7 +109,7 @@ private slots:
/**
* Update the theme's info and preview
*/
- void slotThemeChanged( QListViewItem * item );
+ void slotThemeChanged( TQListViewItem * item );
/**
* Invoked when one drag and drops @p urls onto the kcm
@@ -139,15 +139,15 @@ private:
* @param themeName The theme name
* @return The theme's version number or -1 if not installed
*/
- static float getThemeVersion( const QString & themeName );
+ static float getThemeVersion( const TQString & themeName );
void queryLNFModules();
/**
* Updates the preview widget
*/
- void updatePreview( const QString & pixFile );
- bool themeExist(const QString &_themeName);
+ void updatePreview( const TQString & pixFile );
+ bool themeExist(const TQString &_themeName);
KThemeDlg * dlg;
KTheme * m_theme;
diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp
index 24623a7ea..ba6193107 100644
--- a/kcontrol/launch/kcmlaunch.cpp
+++ b/kcontrol/launch/kcmlaunch.cpp
@@ -15,12 +15,12 @@
* along with this program; if not, write to the Free Software
*/
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
#include <dcopclient.h>
@@ -32,22 +32,22 @@
#include "kcmlaunch.h"
-typedef KGenericFactory<LaunchConfig, QWidget> LaunchFactory;
+typedef KGenericFactory<LaunchConfig, TQWidget> LaunchFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_launch, LaunchFactory("kcmlaunch") )
-LaunchConfig::LaunchConfig(QWidget * parent, const char * name, const QStringList &)
+LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringList &)
: KCModule(LaunchFactory::instance(), parent, name)
{
- QVBoxLayout* Form1Layout = new QVBoxLayout( this, 0,
+ TQVBoxLayout* Form1Layout = new TQVBoxLayout( this, 0,
KDialog::spacingHint() );
setQuickHelp( i18n ( "<h1>Launch Feedback</h1>"
" You can configure the application-launch feedback here."));
- QGroupBox* GroupBox1 = new QGroupBox( this, "GroupBox1" );
+ TQGroupBox* GroupBox1 = new TQGroupBox( this, "GroupBox1" );
GroupBox1->setTitle( i18n( "Bus&y Cursor" ) );
- QWhatsThis::add(GroupBox1, i18n(
+ TQWhatsThis::add(GroupBox1, i18n(
"<h1>Busy Cursor</h1>\n"
"KDE offers a busy cursor for application startup notification.\n"
"To enable the busy cursor, select one kind of visual feedback\n"
@@ -60,22 +60,22 @@ LaunchConfig::LaunchConfig(QWidget * parent, const char * name, const QStringLis
GroupBox1->layout()->setSpacing( 0 );
GroupBox1->layout()->setMargin( 0 );
Form1Layout->addWidget( GroupBox1 );
- QGridLayout* GroupBox1Layout = new QGridLayout( GroupBox1->layout(), 3, 2 );
+ TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->layout(), 3, 2 );
GroupBox1Layout->setSpacing( 6 );
GroupBox1Layout->setMargin( 11 );
GroupBox1Layout->setColStretch( 1, 1 );
- cb_busyCursor = new QComboBox( GroupBox1, "cb_busyCursor" );
+ cb_busyCursor = new TQComboBox( GroupBox1, "cb_busyCursor" );
cb_busyCursor->insertItem( i18n( "No Busy Cursor" ), 0 );
cb_busyCursor->insertItem( i18n( "Passive Busy Cursor" ), 1 );
cb_busyCursor->insertItem( i18n( "Blinking Cursor" ), 2 );
cb_busyCursor->insertItem( i18n( "Bouncing Cursor" ), 3 );
GroupBox1Layout->addWidget( cb_busyCursor, 0, 0 );
- connect( cb_busyCursor, SIGNAL( activated(int) ),
- SLOT ( slotBusyCursor(int)));
- connect( cb_busyCursor, SIGNAL( activated(int) ), SLOT( checkChanged() ) );
+ connect( cb_busyCursor, TQT_SIGNAL( activated(int) ),
+ TQT_SLOT ( slotBusyCursor(int)));
+ connect( cb_busyCursor, TQT_SIGNAL( activated(int) ), TQT_SLOT( checkChanged() ) );
- lbl_cursorTimeout = new QLabel( GroupBox1, "TextLabel1" );
+ lbl_cursorTimeout = new TQLabel( GroupBox1, "TextLabel1" );
lbl_cursorTimeout->setText( i18n( "&Startup indication timeout:" ) );
GroupBox1Layout->addWidget( lbl_cursorTimeout, 2, 0 );
sb_cursorTimeout = new KIntNumInput( GroupBox1, "sb_cursorTimeout" );
@@ -83,12 +83,12 @@ LaunchConfig::LaunchConfig(QWidget * parent, const char * name, const QStringLis
sb_cursorTimeout->setSuffix( i18n(" sec") );
GroupBox1Layout->addWidget( sb_cursorTimeout, 2, 1 );
lbl_cursorTimeout->setBuddy( sb_cursorTimeout );
- connect( sb_cursorTimeout, SIGNAL( valueChanged(int) ),
- SLOT( checkChanged() ) );
+ connect( sb_cursorTimeout, TQT_SIGNAL( valueChanged(int) ),
+ TQT_SLOT( checkChanged() ) );
- QGroupBox* GroupBox2 = new QGroupBox( this, "GroupBox2" );
+ TQGroupBox* GroupBox2 = new TQGroupBox( this, "GroupBox2" );
GroupBox2->setTitle( i18n( "Taskbar &Notification" ) );
- QWhatsThis::add(GroupBox2, i18n("<H1>Taskbar Notification</H1>\n"
+ TQWhatsThis::add(GroupBox2, i18n("<H1>Taskbar Notification</H1>\n"
"You can enable a second method of startup notification which is\n"
"used by the taskbar where a button with a rotating hourglass appears,\n"
"symbolizing that your started application is loading.\n"
@@ -100,19 +100,19 @@ LaunchConfig::LaunchConfig(QWidget * parent, const char * name, const QStringLis
GroupBox2->layout()->setSpacing( 0 );
GroupBox2->layout()->setMargin( 0 );
Form1Layout->addWidget( GroupBox2 );
- QGridLayout* GroupBox2Layout = new QGridLayout( GroupBox2->layout(), 2, 2 );
+ TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->layout(), 2, 2 );
GroupBox2Layout->setSpacing( 6 );
GroupBox2Layout->setMargin( 11 );
GroupBox2Layout->setColStretch( 1, 1 );
- cb_taskbarButton = new QCheckBox( GroupBox2, "cb_taskbarButton" );
+ cb_taskbarButton = new TQCheckBox( GroupBox2, "cb_taskbarButton" );
cb_taskbarButton->setText( i18n( "Enable &taskbar notification" ) );
GroupBox2Layout->addMultiCellWidget( cb_taskbarButton, 0, 0, 0, 1 );
- connect( cb_taskbarButton, SIGNAL( toggled(bool) ),
- SLOT( slotTaskbarButton(bool)));
- connect( cb_taskbarButton, SIGNAL( toggled(bool) ), SLOT( checkChanged()));
+ connect( cb_taskbarButton, TQT_SIGNAL( toggled(bool) ),
+ TQT_SLOT( slotTaskbarButton(bool)));
+ connect( cb_taskbarButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( checkChanged()));
- lbl_taskbarTimeout = new QLabel( GroupBox2, "TextLabel2" );
+ lbl_taskbarTimeout = new TQLabel( GroupBox2, "TextLabel2" );
lbl_taskbarTimeout->setText( i18n( "Start&up indication timeout:" ) );
GroupBox2Layout->addWidget( lbl_taskbarTimeout, 1, 0 );
sb_taskbarTimeout = new KIntNumInput( GroupBox2, "sb_taskbarTimeout" );
@@ -120,8 +120,8 @@ LaunchConfig::LaunchConfig(QWidget * parent, const char * name, const QStringLis
sb_taskbarTimeout->setSuffix( i18n(" sec") );
GroupBox2Layout->addWidget( sb_taskbarTimeout, 1, 1 );
lbl_taskbarTimeout->setBuddy( sb_taskbarTimeout );
- connect( sb_taskbarTimeout, SIGNAL( valueChanged(int) ),
- SLOT( checkChanged() ) );
+ connect( sb_taskbarTimeout, TQT_SIGNAL( valueChanged(int) ),
+ TQT_SLOT( checkChanged() ) );
Form1Layout->addStretch();
@@ -214,7 +214,7 @@ LaunchConfig::save()
if (!kapp->dcopClient()->isAttached())
kapp->dcopClient()->attach();
- QByteArray data;
+ TQByteArray data;
kapp->dcopClient()->send( "kicker", "Panel", "restart()", data );
kapp->dcopClient()->send( "kdesktop", "", "configure()", data );
}
diff --git a/kcontrol/launch/kcmlaunch.h b/kcontrol/launch/kcmlaunch.h
index c69bef943..6c89c0974 100644
--- a/kcontrol/launch/kcmlaunch.h
+++ b/kcontrol/launch/kcmlaunch.h
@@ -32,7 +32,7 @@ class LaunchConfig : public KCModule
public:
- LaunchConfig(QWidget * parent = 0, const char * name = 0, const QStringList &list = QStringList() );
+ LaunchConfig(TQWidget * parent = 0, const char * name = 0, const TQStringList &list = TQStringList() );
virtual ~LaunchConfig();
@@ -60,10 +60,10 @@ class LaunchConfig : public KCModule
private:
- QLabel * lbl_cursorTimeout;
- QLabel * lbl_taskbarTimeout;
- QComboBox * cb_busyCursor;
- QCheckBox * cb_taskbarButton;
+ TQLabel * lbl_cursorTimeout;
+ TQLabel * lbl_taskbarTimeout;
+ TQComboBox * cb_busyCursor;
+ TQCheckBox * cb_taskbarButton;
KIntNumInput * sb_cursorTimeout;
KIntNumInput * sb_taskbarTimeout;
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index 0a24b4a59..39210741f 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -23,13 +23,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlistbox.h>
-#include <qpushbutton.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlistbox.h>
+#include <tqpushbutton.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
#include <kdebug.h>
#include <kdialog.h>
@@ -43,50 +43,50 @@
#include "toplevel.h"
KLocaleConfig::KLocaleConfig(KLocale *locale,
- QWidget *parent, const char *name)
- : QWidget (parent, name),
+ TQWidget *parent, const char *name)
+ : TQWidget (parent, name),
m_locale(locale)
{
- QGridLayout *lay = new QGridLayout(this, 4, 3,
+ TQGridLayout *lay = new TQGridLayout(this, 4, 3,
KDialog::marginHint(),
KDialog::spacingHint());
- m_labCountry = new QLabel(this, I18N_NOOP("Country or region:"));
+ m_labCountry = new TQLabel(this, I18N_NOOP("Country or region:"));
m_comboCountry = new KLanguageButton( this );
m_labCountry->setBuddy(m_comboCountry);
- connect( m_comboCountry, SIGNAL(activated(const QString &)),
- this, SLOT(changedCountry(const QString &)) );
+ connect( m_comboCountry, TQT_SIGNAL(activated(const TQString &)),
+ this, TQT_SLOT(changedCountry(const TQString &)) );
- m_labLang = new QLabel(this, I18N_NOOP("Languages:"));
+ m_labLang = new TQLabel(this, I18N_NOOP("Languages:"));
m_labLang->setAlignment( AlignTop );
- m_languages = new QListBox(this);
- connect(m_languages, SIGNAL(selectionChanged()),
- SLOT(slotCheckButtons()));
+ m_languages = new TQListBox(this);
+ connect(m_languages, TQT_SIGNAL(selectionChanged()),
+ TQT_SLOT(slotCheckButtons()));
- QWidget * vb = new QWidget(this);
- QVBoxLayout * boxlay = new QVBoxLayout(vb, 0, KDialog::spacingHint());
- m_addLanguage = new KLanguageButton(QString::null, vb, I18N_NOOP("Add Language"));
+ TQWidget * vb = new TQWidget(this);
+ TQVBoxLayout * boxlay = new TQVBoxLayout(vb, 0, KDialog::spacingHint());
+ m_addLanguage = new KLanguageButton(TQString::null, vb, I18N_NOOP("Add Language"));
boxlay->add(m_addLanguage);
- connect(m_addLanguage, SIGNAL(activated(const QString &)),
- SLOT(slotAddLanguage(const QString &)));
- m_removeLanguage = new QPushButton(vb, I18N_NOOP("Remove Language"));
- m_upButton = new QPushButton(vb, I18N_NOOP("Move Up"));
- m_downButton = new QPushButton(vb, I18N_NOOP("Move Down"));
+ connect(m_addLanguage, TQT_SIGNAL(activated(const TQString &)),
+ TQT_SLOT(slotAddLanguage(const TQString &)));
+ m_removeLanguage = new TQPushButton(vb, I18N_NOOP("Remove Language"));
+ m_upButton = new TQPushButton(vb, I18N_NOOP("Move Up"));
+ m_downButton = new TQPushButton(vb, I18N_NOOP("Move Down"));
boxlay->add(m_removeLanguage);
boxlay->add(m_upButton);
boxlay->add(m_downButton);
- connect(m_removeLanguage, SIGNAL(clicked()),
- SLOT(slotRemoveLanguage()));
- connect(m_upButton, SIGNAL(clicked()),
- SLOT(slotLanguageUp()));
- connect(m_downButton, SIGNAL(clicked()),
- SLOT(slotLanguageDown()));
+ connect(m_removeLanguage, TQT_SIGNAL(clicked()),
+ TQT_SLOT(slotRemoveLanguage()));
+ connect(m_upButton, TQT_SIGNAL(clicked()),
+ TQT_SLOT(slotLanguageUp()));
+ connect(m_downButton, TQT_SIGNAL(clicked()),
+ TQT_SLOT(slotLanguageDown()));
boxlay->insertStretch(-1);
// #### HPB: This should be implemented for KDE 3
- // new QLabel(this, I18N_NOOP("Encoding:"));
- //QComboBox * cb = new QComboBox( this );
+ // new TQLabel(this, I18N_NOOP("Encoding:"));
+ //TQComboBox * cb = new TQComboBox( this );
//cb->insertStringList( KGlobal::charsets()->descriptiveEncodingNames() );
lay->addMultiCellWidget(m_labCountry, 0, 0, 0, 1);
@@ -101,19 +101,19 @@ KLocaleConfig::KLocaleConfig(KLocale *locale,
lay->setColStretch(2, 1);
// Added jriddell 2007-01-08, for Kubuntu Language Selector spec
- QHBoxLayout* languageSelectorLayout = new QHBoxLayout();
- installLanguage = new QPushButton(i18n("Install New Language"), this);
+ TQHBoxLayout* languageSelectorLayout = new TQHBoxLayout();
+ installLanguage = new TQPushButton(i18n("Install New Language"), this);
languageSelectorLayout->addWidget(installLanguage);
- uninstallLanguage = new QPushButton(i18n("Uninstall Language"), this);
+ uninstallLanguage = new TQPushButton(i18n("Uninstall Language"), this);
languageSelectorLayout->addWidget(uninstallLanguage);
- selectLanguage = new QPushButton(i18n("Select System Language"), this);
+ selectLanguage = new TQPushButton(i18n("Select System Language"), this);
languageSelectorLayout->addWidget(selectLanguage);
languageSelectorLayout->addStretch();
lay->addMultiCellLayout(languageSelectorLayout, 3, 3, 0, 2);
- connect( installLanguage, SIGNAL(clicked()), this, SLOT(slotInstallLanguage()) );
- connect( uninstallLanguage, SIGNAL(clicked()), this, SLOT(slotUninstallLanguage()) );
- connect( selectLanguage, SIGNAL(clicked()), this, SLOT(slotSelectLanguage()) );
+ connect( installLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallLanguage()) );
+ connect( uninstallLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallLanguage()) );
+ connect( selectLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectLanguage()) );
}
@@ -123,8 +123,8 @@ void KLocaleConfig::slotInstallLanguage()
*proc << "kdesu";
*proc << "qt-language-selector --mode install";
- QApplication::connect(proc, SIGNAL(processExited(KProcess *)),
- this, SLOT(slotLanguageSelectorExited(KProcess *)));
+ TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
+ this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
setEnabled(false);
proc->start();
}
@@ -135,8 +135,8 @@ void KLocaleConfig::slotUninstallLanguage()
*proc << "kdesu";
*proc << "qt-language-selector --mode uninstall";
- QApplication::connect(proc, SIGNAL(processExited(KProcess *)),
- this, SLOT(slotLanguageSelectorExited(KProcess *)));
+ TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
+ this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
setEnabled(false);
proc->start();
}
@@ -147,8 +147,8 @@ void KLocaleConfig::slotSelectLanguage()
*proc << "kdesu";
*proc << "qt-language-selector --mode select";
- QApplication::connect(proc, SIGNAL(processExited(KProcess *)),
- this, SLOT(slotLanguageSelectorExited(KProcess *)));
+ TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
+ this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
setEnabled(false);
proc->start();
}
@@ -160,9 +160,9 @@ void KLocaleConfig::slotLanguageSelectorExited(KProcess *)
setEnabled(true);
}
-void KLocaleConfig::slotAddLanguage(const QString & code)
+void KLocaleConfig::slotAddLanguage(const TQString & code)
{
- QStringList languageList = m_locale->languageList();
+ TQStringList languageList = m_locale->languageList();
int pos = m_languages->currentItem();
if ( pos < 0 )
@@ -176,7 +176,7 @@ void KLocaleConfig::slotAddLanguage(const QString & code)
if ( oldPos != -1 && oldPos < pos )
--pos;
- QStringList::Iterator it = languageList.at( pos );
+ TQStringList::Iterator it = languageList.at( pos );
languageList.insert( it, code );
@@ -189,10 +189,10 @@ void KLocaleConfig::slotAddLanguage(const QString & code)
void KLocaleConfig::slotRemoveLanguage()
{
- QStringList languageList = m_locale->languageList();
+ TQStringList languageList = m_locale->languageList();
int pos = m_languages->currentItem();
- QStringList::Iterator it = languageList.at( pos );
+ TQStringList::Iterator it = languageList.at( pos );
if ( it != languageList.end() )
{
@@ -208,15 +208,15 @@ void KLocaleConfig::slotRemoveLanguage()
void KLocaleConfig::slotLanguageUp()
{
- QStringList languageList = m_locale->languageList();
+ TQStringList languageList = m_locale->languageList();
int pos = m_languages->currentItem();
- QStringList::Iterator it1 = languageList.at( pos - 1 );
- QStringList::Iterator it2 = languageList.at( pos );
+ TQStringList::Iterator it1 = languageList.at( pos - 1 );
+ TQStringList::Iterator it2 = languageList.at( pos );
if ( it1 != languageList.end() && it2 != languageList.end() )
{
- QString str = *it1;
+ TQString str = *it1;
*it1 = *it2;
*it2 = str;
@@ -230,15 +230,15 @@ void KLocaleConfig::slotLanguageUp()
void KLocaleConfig::slotLanguageDown()
{
- QStringList languageList = m_locale->languageList();
+ TQStringList languageList = m_locale->languageList();
int pos = m_languages->currentItem();
- QStringList::Iterator it1 = languageList.at( pos );
- QStringList::Iterator it2 = languageList.at( pos + 1 );
+ TQStringList::Iterator it1 = languageList.at( pos );
+ TQStringList::Iterator it2 = languageList.at( pos + 1 );
if ( it1 != languageList.end() && it2 != languageList.end() )
{
- QString str = *it1;
+ TQString str = *it1;
*it1 = *it2;
*it2 = str;
@@ -259,49 +259,49 @@ void KLocaleConfig::loadLanguageList()
// clear the list
m_addLanguage->clear();
- QStringList first = languageList();
+ TQStringList first = languageList();
- QStringList prilang;
+ TQStringList prilang;
// add the primary languages for the country to the list
- for ( QStringList::ConstIterator it = first.begin();
+ for ( TQStringList::ConstIterator it = first.begin();
it != first.end();
++it )
{
- QString str = locate("locale", QString::fromLatin1("%1/entry.desktop")
+ TQString str = locate("locale", TQString::fromLatin1("%1/entry.desktop")
.arg(*it));
if (!str.isNull())
prilang << str;
}
// add all languages to the list
- QStringList alllang = KGlobal::dirs()->findAllResources("locale",
- QString::fromLatin1("*/entry.desktop"),
+ TQStringList alllang = KGlobal::dirs()->findAllResources("locale",
+ TQString::fromLatin1("*/entry.desktop"),
false, true);
- QStringList langlist = prilang;
+ TQStringList langlist = prilang;
if (langlist.count() > 0)
- langlist << QString::null; // separator
+ langlist << TQString::null; // separator
langlist += alllang;
int menu_index = -2;
- QString submenu; // we are working on this menu
- for ( QStringList::ConstIterator it = langlist.begin();
+ TQString submenu; // we are working on this menu
+ for ( TQStringList::ConstIterator it = langlist.begin();
it != langlist.end(); ++it )
{
if ((*it).isNull())
{
m_addLanguage->insertSeparator();
- submenu = QString::fromLatin1("other");
+ submenu = TQString::fromLatin1("other");
m_addLanguage->insertSubmenu(m_locale->translate("Other"),
- submenu, QString::null, -1);
+ submenu, TQString::null, -1);
menu_index = -2; // first entries should _not_ be sorted
continue;
}
KSimpleConfig entry(*it);
entry.setGroup("KCM Locale");
- QString name = entry.readEntry("Name",
+ TQString name = entry.readEntry("Name",
m_locale->translate("without name"));
- QString tag = *it;
+ TQString tag = *it;
int index = tag.findRev('/');
tag = tag.left(index);
index = tag.findRev('/');
@@ -319,20 +319,20 @@ void KLocaleConfig::loadCountryList()
KLocale *lsave = KGlobal::_locale;
KGlobal::_locale = m_locale;
- QString sub = QString::fromLatin1("l10n/");
+ TQString sub = TQString::fromLatin1("l10n/");
// clear the list
m_comboCountry->clear();
- QStringList regionlist = KGlobal::dirs()->findAllResources("locale",
- sub + QString::fromLatin1("*.desktop"),
+ TQStringList regionlist = KGlobal::dirs()->findAllResources("locale",
+ sub + TQString::fromLatin1("*.desktop"),
false, true );
- for ( QStringList::ConstIterator it = regionlist.begin();
+ for ( TQStringList::ConstIterator it = regionlist.begin();
it != regionlist.end();
++it )
{
- QString tag = *it;
+ TQString tag = *it;
int index;
index = tag.findRev('/');
@@ -345,42 +345,42 @@ void KLocaleConfig::loadCountryList()
KSimpleConfig entry(*it);
entry.setGroup("KCM Locale");
- QString name = entry.readEntry("Name",
+ TQString name = entry.readEntry("Name",
m_locale->translate("without name"));
- QString map( locate( "locale",
- QString::fromLatin1( "l10n/%1.png" )
+ TQString map( locate( "locale",
+ TQString::fromLatin1( "l10n/%1.png" )
.arg(tag) ) );
- QIconSet icon;
+ TQIconSet icon;
if ( !map.isNull() )
icon = KGlobal::iconLoader()->loadIconSet(map, KIcon::Small);
m_comboCountry->insertSubmenu( icon, name, tag, sub, -2 );
}
// add all languages to the list
- QStringList countrylist = KGlobal::dirs()->findAllResources
- ("locale", sub + QString::fromLatin1("*/entry.desktop"), false, true);
+ TQStringList countrylist = KGlobal::dirs()->findAllResources
+ ("locale", sub + TQString::fromLatin1("*/entry.desktop"), false, true);
- for ( QStringList::ConstIterator it = countrylist.begin();
+ for ( TQStringList::ConstIterator it = countrylist.begin();
it != countrylist.end(); ++it )
{
KSimpleConfig entry(*it);
entry.setGroup("KCM Locale");
- QString name = entry.readEntry("Name",
+ TQString name = entry.readEntry("Name",
m_locale->translate("without name"));
- QString submenu = entry.readEntry("Region");
+ TQString submenu = entry.readEntry("Region");
- QString tag = *it;
+ TQString tag = *it;
int index = tag.findRev('/');
tag.truncate(index);
index = tag.findRev('/');
tag = tag.mid(index + 1);
int menu_index = submenu.isEmpty() ? -1 : -2;
- QString flag( locate( "locale",
- QString::fromLatin1( "l10n/%1/flag.png" )
+ TQString flag( locate( "locale",
+ TQString::fromLatin1( "l10n/%1/flag.png" )
.arg(tag) ) );
- QIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) );
+ TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) );
m_comboCountry->insertItem( icon, name, tag, submenu, menu_index );
}
@@ -388,15 +388,15 @@ void KLocaleConfig::loadCountryList()
KGlobal::_locale = lsave;
}
-void KLocaleConfig::readLocale(const QString &path, QString &name,
- const QString &sub) const
+void KLocaleConfig::readLocale(const TQString &path, TQString &name,
+ const TQString &sub) const
{
// temperary use of our locale as the global locale
KLocale *lsave = KGlobal::_locale;
KGlobal::_locale = m_locale;
// read the name
- QString filepath = QString::fromLatin1("%1%2/entry.desktop")
+ TQString filepath = TQString::fromLatin1("%1%2/entry.desktop")
.arg(sub)
.arg(path);
@@ -416,7 +416,7 @@ void KLocaleConfig::save()
config->writeEntry("Country", m_locale->country(), true, true);
if ( m_locale->languageList().isEmpty() )
- config->writeEntry("Language", QString::fromLatin1(""), true, true);
+ config->writeEntry("Language", TQString::fromLatin1(""), true, true);
else
config->writeEntry("Language",
m_locale->languageList(), ':', true, true);
@@ -439,13 +439,13 @@ void KLocaleConfig::slotLocaleChanged()
// update language widget
m_languages->clear();
- QStringList languageList = m_locale->languageList();
- for ( QStringList::Iterator it = languageList.begin();
+ TQStringList languageList = m_locale->languageList();
+ for ( TQStringList::Iterator it = languageList.begin();
it != languageList.end();
++it )
{
- QString name;
- readLocale(*it, name, QString::null);
+ TQString name;
+ readLocale(*it, name, TQString::null);
m_languages->insertItem(name);
}
@@ -458,29 +458,29 @@ void KLocaleConfig::slotTranslate()
{
kdDebug() << "slotTranslate()" << endl;
- QToolTip::add(m_comboCountry, m_locale->translate
+ TQToolTip::add(m_comboCountry, m_locale->translate
( "This is where you live. KDE will use the defaults for "
"this country or region.") );
- QToolTip::add(m_addLanguage, m_locale->translate
+ TQToolTip::add(m_addLanguage, m_locale->translate
( "This will add a language to the list. If the language is already "
"in the list, the old one will be moved instead." ) );
- QToolTip::add(m_removeLanguage, m_locale->translate
+ TQToolTip::add(m_removeLanguage, m_locale->translate
( "This will remove the highlighted language from the list." ) );
- QToolTip::add(m_languages, m_locale->translate
+ TQToolTip::add(m_languages, m_locale->translate
( "KDE programs will be displayed in the first available language in "
"this list.\nIf none of the languages are available, US English "
"will be used.") );
- QString str;
+ TQString str;
str = m_locale->translate
( "Here you can choose your country or region. The settings "
"for languages, numbers etc. will automatically switch to the "
"corresponding values." );
- QWhatsThis::add( m_labCountry, str );
- QWhatsThis::add( m_comboCountry, str );
+ TQWhatsThis::add( m_labCountry, str );
+ TQWhatsThis::add( m_comboCountry, str );
str = m_locale->translate
( "Here you can choose the languages that will be used by KDE. If the "
@@ -490,16 +490,16 @@ void KLocaleConfig::slotTranslate()
"languages from the place you got KDE from.<p>"
"Note that some applications may not be translated to your languages; "
"in this case, they will automatically fall back to US English." );
- QWhatsThis::add( m_labLang, str );
- QWhatsThis::add( m_languages, str );
- QWhatsThis::add( m_addLanguage, str );
- QWhatsThis::add( m_removeLanguage, str );
+ TQWhatsThis::add( m_labLang, str );
+ TQWhatsThis::add( m_languages, str );
+ TQWhatsThis::add( m_addLanguage, str );
+ TQWhatsThis::add( m_removeLanguage, str );
}
-QStringList KLocaleConfig::languageList() const
+TQStringList KLocaleConfig::languageList() const
{
- QString fileName = locate("locale",
- QString::fromLatin1("l10n/%1/entry.desktop")
+ TQString fileName = locate("locale",
+ TQString::fromLatin1("l10n/%1/entry.desktop")
.arg(m_locale->country()));
KSimpleConfig entry(fileName);
@@ -508,19 +508,19 @@ QStringList KLocaleConfig::languageList() const
return entry.readListEntry("Languages");
}
-void KLocaleConfig::changedCountry(const QString & code)
+void KLocaleConfig::changedCountry(const TQString & code)
{
m_locale->setCountry(code);
// change to the preferred languages in that country, installed only
- QStringList languages = languageList();
- QStringList newLanguageList;
- for ( QStringList::Iterator it = languages.begin();
+ TQStringList languages = languageList();
+ TQStringList newLanguageList;
+ for ( TQStringList::Iterator it = languages.begin();
it != languages.end();
++it )
{
- QString name;
- readLocale(*it, name, QString::null);
+ TQString name;
+ readLocale(*it, name, TQString::null);
if (!name.isEmpty())
newLanguageList += *it;
diff --git a/kcontrol/locale/kcmlocale.h b/kcontrol/locale/kcmlocale.h
index 46f954730..b5b191ccf 100644
--- a/kcontrol/locale/kcmlocale.h
+++ b/kcontrol/locale/kcmlocale.h
@@ -25,8 +25,8 @@
#ifndef KCMLOCALE_H
#define KCMLOCALE_H
-#include <qwidget.h>
-#include <qstringlist.h>
+#include <tqwidget.h>
+#include <tqstringlist.h>
class KAddButton;
class KLanguageButton;
@@ -43,7 +43,7 @@ class KLocaleConfig : public QWidget
public:
KLocaleConfig( KLocale *_locale,
- QWidget *parent = 0, const char *name = 0);
+ TQWidget *parent = 0, const char *name = 0);
void save();
@@ -65,11 +65,11 @@ private slots:
void loadLanguageList();
void loadCountryList();
- void changedCountry(const QString & code);
- void readLocale(const QString &path, QString &name,
- const QString &sub) const;
+ void changedCountry(const TQString & code);
+ void readLocale(const TQString &path, TQString &name,
+ const TQString &sub) const;
- void slotAddLanguage(const QString & id);
+ void slotAddLanguage(const TQString & id);
void slotRemoveLanguage();
void slotLanguageUp();
void slotLanguageDown();
@@ -81,24 +81,24 @@ private slots:
void slotLanguageSelectorExited(KProcess *);
private:
- QStringList languageList() const;
+ TQStringList languageList() const;
KLocale *m_locale;
KLanguageButton *m_comboCountry;
- QLabel *m_labCountry;
- QLabel *m_labLang;
+ TQLabel *m_labCountry;
+ TQLabel *m_labLang;
- QListBox * m_languages;
+ TQListBox * m_languages;
KLanguageButton * m_addLanguage;
- QPushButton * m_removeLanguage;
- QPushButton * m_upButton;
- QPushButton * m_downButton;
+ TQPushButton * m_removeLanguage;
+ TQPushButton * m_upButton;
+ TQPushButton * m_downButton;
- QPushButton* installLanguage;
- QPushButton* uninstallLanguage;
- QPushButton* selectLanguage;
+ TQPushButton* installLanguage;
+ TQPushButton* uninstallLanguage;
+ TQPushButton* selectLanguage;
};
#endif
diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp
index e78ae966c..bf4cc8b32 100644
--- a/kcontrol/locale/klocalesample.cpp
+++ b/kcontrol/locale/klocalesample.cpp
@@ -23,11 +23,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qdatetime.h>
-#include <qlabel.h>
-#include <qwhatsthis.h>
-#include <qlayout.h>
-#include <qtimer.h>
+#include <tqdatetime.h>
+#include <tqlabel.h>
+#include <tqwhatsthis.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
#include <stdio.h>
@@ -37,48 +37,48 @@
#include "klocalesample.moc"
KLocaleSample::KLocaleSample(KLocale *locale,
- QWidget *parent, const char*name)
- : QWidget(parent, name),
+ TQWidget *parent, const char*name)
+ : TQWidget(parent, name),
m_locale(locale)
{
- QGridLayout *lay = new QGridLayout(this, 5, 2);
+ TQGridLayout *lay = new TQGridLayout(this, 5, 2);
lay->setAutoAdd(TRUE);
// Whatever the color scheme is, we want black text
- QColorGroup a = palette().active();
- a.setColor(QColorGroup::Foreground, Qt::black);
- QPalette pal(a, a, a);
+ TQColorGroup a = palette().active();
+ a.setColor(TQColorGroup::Foreground, Qt::black);
+ TQPalette pal(a, a, a);
- m_labNumber = new QLabel(this, I18N_NOOP("Numbers:"));
+ m_labNumber = new TQLabel(this, I18N_NOOP("Numbers:"));
m_labNumber->setPalette(pal);
- m_numberSample = new QLabel(this);
+ m_numberSample = new TQLabel(this);
m_numberSample->setPalette(pal);
- m_labMoney = new QLabel(this, I18N_NOOP("Money:"));
+ m_labMoney = new TQLabel(this, I18N_NOOP("Money:"));
m_labMoney->setPalette(pal);
- m_moneySample = new QLabel(this);
+ m_moneySample = new TQLabel(this);
m_moneySample->setPalette(pal);
- m_labDate = new QLabel(this, I18N_NOOP("Date:"));
+ m_labDate = new TQLabel(this, I18N_NOOP("Date:"));
m_labDate->setPalette(pal);
- m_dateSample = new QLabel(this);
+ m_dateSample = new TQLabel(this);
m_dateSample->setPalette(pal);
- m_labDateShort = new QLabel(this, I18N_NOOP("Short date:"));
+ m_labDateShort = new TQLabel(this, I18N_NOOP("Short date:"));
m_labDateShort->setPalette(pal);
- m_dateShortSample = new QLabel(this);
+ m_dateShortSample = new TQLabel(this);
m_dateShortSample->setPalette(pal);
- m_labTime = new QLabel(this, I18N_NOOP("Time:"));
+ m_labTime = new TQLabel(this, I18N_NOOP("Time:"));
m_labTime->setPalette(pal);
- m_timeSample = new QLabel(this);
+ m_timeSample = new TQLabel(this);
m_timeSample->setPalette(pal);
lay->setColStretch(0, 1);
lay->setColStretch(1, 3);
- QTimer *timer = new QTimer(this, "clock_timer");
- connect(timer, SIGNAL(timeout()), this, SLOT(slotUpdateTime()));
+ TQTimer *timer = new TQTimer(this, "clock_timer");
+ connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateTime()));
timer->start(1000);
}
@@ -88,7 +88,7 @@ KLocaleSample::~KLocaleSample()
void KLocaleSample::slotUpdateTime()
{
- QDateTime dt = QDateTime::currentDateTime();
+ TQDateTime dt = TQDateTime::currentDateTime();
m_dateSample->setText(m_locale->formatDate(dt.date(), false));
m_dateShortSample->setText(m_locale->formatDate(dt.date(), true));
@@ -98,35 +98,35 @@ void KLocaleSample::slotUpdateTime()
void KLocaleSample::slotLocaleChanged()
{
m_numberSample->setText(m_locale->formatNumber(1234567.89) +
- QString::fromLatin1(" / ") +
+ TQString::fromLatin1(" / ") +
m_locale->formatNumber(-1234567.89));
m_moneySample->setText(m_locale->formatMoney(123456789.00) +
- QString::fromLatin1(" / ") +
+ TQString::fromLatin1(" / ") +
m_locale->formatMoney(-123456789.00));
slotUpdateTime();
- QString str;
+ TQString str;
str = m_locale->translate("This is how numbers will be displayed.");
- QWhatsThis::add( m_labNumber, str );
- QWhatsThis::add( m_numberSample, str );
+ TQWhatsThis::add( m_labNumber, str );
+ TQWhatsThis::add( m_numberSample, str );
str = m_locale->translate("This is how monetary values will be displayed.");
- QWhatsThis::add( m_labMoney, str );
- QWhatsThis::add( m_moneySample, str );
+ TQWhatsThis::add( m_labMoney, str );
+ TQWhatsThis::add( m_moneySample, str );
str = m_locale->translate("This is how date values will be displayed.");
- QWhatsThis::add( m_labDate, str );
- QWhatsThis::add( m_dateSample, str );
+ TQWhatsThis::add( m_labDate, str );
+ TQWhatsThis::add( m_dateSample, str );
str = m_locale->translate("This is how date values will be displayed using "
"a short notation.");
- QWhatsThis::add( m_labDateShort, str );
- QWhatsThis::add( m_dateShortSample, str );
+ TQWhatsThis::add( m_labDateShort, str );
+ TQWhatsThis::add( m_dateShortSample, str );
str = m_locale->translate("This is how the time will be displayed.");
- QWhatsThis::add( m_labTime, str );
- QWhatsThis::add( m_timeSample, str );
+ TQWhatsThis::add( m_labTime, str );
+ TQWhatsThis::add( m_timeSample, str );
}
diff --git a/kcontrol/locale/klocalesample.h b/kcontrol/locale/klocalesample.h
index bf1cd7462..dbdce0b5c 100644
--- a/kcontrol/locale/klocalesample.h
+++ b/kcontrol/locale/klocalesample.h
@@ -25,7 +25,7 @@
#ifndef __KLOCALESAMPLE_H__
#define __KLOCALESAMPLE_H__
-#include <qwidget.h>
+#include <tqwidget.h>
class QLabel;
class QResizeEvent;
@@ -37,7 +37,7 @@ class KLocaleSample : public QWidget
Q_OBJECT
public:
KLocaleSample(KLocale *_locale,
- QWidget *parent = 0, const char*name = 0);
+ TQWidget *parent = 0, const char*name = 0);
virtual ~KLocaleSample();
public slots:
@@ -48,11 +48,11 @@ protected slots:
private:
KLocale *m_locale;
- QLabel *m_numberSample, *m_labNumber;
- QLabel *m_moneySample, *m_labMoney;
- QLabel *m_timeSample, *m_labTime;
- QLabel *m_dateSample, *m_labDate;
- QLabel *m_dateShortSample, *m_labDateShort;
+ TQLabel *m_numberSample, *m_labNumber;
+ TQLabel *m_moneySample, *m_labMoney;
+ TQLabel *m_timeSample, *m_labTime;
+ TQLabel *m_dateSample, *m_labDate;
+ TQLabel *m_dateShortSample, *m_labDateShort;
};
#endif
diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp
index 504ce393c..9fa1ad708 100644
--- a/kcontrol/locale/localemon.cpp
+++ b/kcontrol/locale/localemon.cpp
@@ -21,16 +21,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qobjectlist.h>
-#include <qwhatsthis.h>
-#include <qlayout.h>
-#include <qvgroupbox.h>
-#include <qvbox.h>
-#include <qregexp.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
+#include <tqobjectlist.h>
+#include <tqwhatsthis.h>
+#include <tqlayout.h>
+#include <tqvgroupbox.h>
+#include <tqvbox.h>
+#include <tqregexp.h>
#include <knuminput.h>
#include <kdialog.h>
@@ -42,77 +42,77 @@
#include "localemon.moc"
KLocaleConfigMoney::KLocaleConfigMoney(KLocale *locale,
- QWidget *parent, const char*name)
- : QWidget(parent, name),
+ TQWidget *parent, const char*name)
+ : TQWidget(parent, name),
m_locale(locale)
{
// Money
- QGridLayout *lay = new QGridLayout(this, 6, 2,
+ TQGridLayout *lay = new TQGridLayout(this, 6, 2,
KDialog::marginHint(),
KDialog::spacingHint());
- m_labMonCurSym = new QLabel(this, I18N_NOOP("Currency symbol:"));
+ m_labMonCurSym = new TQLabel(this, I18N_NOOP("Currency symbol:"));
lay->addWidget(m_labMonCurSym, 0, 0);
- m_edMonCurSym = new QLineEdit(this);
+ m_edMonCurSym = new TQLineEdit(this);
lay->addWidget(m_edMonCurSym, 0, 1);
- connect( m_edMonCurSym, SIGNAL( textChanged(const QString &) ),
- SLOT( slotMonCurSymChanged(const QString &) ) );
+ connect( m_edMonCurSym, TQT_SIGNAL( textChanged(const TQString &) ),
+ TQT_SLOT( slotMonCurSymChanged(const TQString &) ) );
- m_labMonDecSym = new QLabel(this, I18N_NOOP("Decimal symbol:"));
+ m_labMonDecSym = new TQLabel(this, I18N_NOOP("Decimal symbol:"));
lay->addWidget(m_labMonDecSym, 1, 0);
- m_edMonDecSym = new QLineEdit(this);
+ m_edMonDecSym = new TQLineEdit(this);
lay->addWidget(m_edMonDecSym, 1, 1);
- connect( m_edMonDecSym, SIGNAL( textChanged(const QString &) ),
- SLOT( slotMonDecSymChanged(const QString &) ) );
+ connect( m_edMonDecSym, TQT_SIGNAL( textChanged(const TQString &) ),
+ TQT_SLOT( slotMonDecSymChanged(const TQString &) ) );
- m_labMonThoSep = new QLabel(this, I18N_NOOP("Thousands separator:"));
+ m_labMonThoSep = new TQLabel(this, I18N_NOOP("Thousands separator:"));
lay->addWidget(m_labMonThoSep, 2, 0);
- m_edMonThoSep = new QLineEdit(this);
+ m_edMonThoSep = new TQLineEdit(this);
lay->addWidget(m_edMonThoSep, 2, 1);
- connect( m_edMonThoSep, SIGNAL( textChanged(const QString &) ),
- SLOT( slotMonThoSepChanged(const QString &) ) );
+ connect( m_edMonThoSep, TQT_SIGNAL( textChanged(const TQString &) ),
+ TQT_SLOT( slotMonThoSepChanged(const TQString &) ) );
- m_labMonFraDig = new QLabel(this, I18N_NOOP("Fract digits:"));
+ m_labMonFraDig = new TQLabel(this, I18N_NOOP("Fract digits:"));
lay->addWidget(m_labMonFraDig, 3, 0);
m_inMonFraDig = new KIntNumInput(this);
m_inMonFraDig->setRange(0, 10, 1, false);
lay->addWidget(m_inMonFraDig, 3, 1);
- connect( m_inMonFraDig, SIGNAL( valueChanged(int) ),
- SLOT( slotMonFraDigChanged(int) ) );
+ connect( m_inMonFraDig, TQT_SIGNAL( valueChanged(int) ),
+ TQT_SLOT( slotMonFraDigChanged(int) ) );
- QWidget *vbox = new QVBox(this);
+ TQWidget *vbox = new TQVBox(this);
lay->addMultiCellWidget(vbox, 4, 4, 0, 1);
- QVGroupBox *vgrp;
- vgrp = new QVGroupBox( vbox, I18N_NOOP("Positive") );
- m_chMonPosPreCurSym = new QCheckBox(vgrp, I18N_NOOP("Prefix currency symbol"));
- connect( m_chMonPosPreCurSym, SIGNAL( clicked() ),
- SLOT( slotMonPosPreCurSymChanged() ) );
-
- QHBox *hbox;
- hbox = new QHBox( vgrp );
- m_labMonPosMonSignPos = new QLabel(hbox, I18N_NOOP("Sign position:"));
- m_cmbMonPosMonSignPos = new QComboBox(hbox, "signpos");
- connect( m_cmbMonPosMonSignPos, SIGNAL( activated(int) ),
- SLOT( slotMonPosMonSignPosChanged(int) ) );
-
- vgrp = new QVGroupBox( vbox, I18N_NOOP("Negative") );
- m_chMonNegPreCurSym = new QCheckBox(vgrp, I18N_NOOP("Prefix currency symbol"));
- connect( m_chMonNegPreCurSym, SIGNAL( clicked() ),
- SLOT( slotMonNegPreCurSymChanged() ) );
-
- hbox = new QHBox( vgrp );
- m_labMonNegMonSignPos = new QLabel(hbox, I18N_NOOP("Sign position:"));
- m_cmbMonNegMonSignPos = new QComboBox(hbox, "signpos");
- connect( m_cmbMonNegMonSignPos, SIGNAL( activated(int) ),
- SLOT( slotMonNegMonSignPosChanged(int) ) );
+ TQVGroupBox *vgrp;
+ vgrp = new TQVGroupBox( vbox, I18N_NOOP("Positive") );
+ m_chMonPosPreCurSym = new TQCheckBox(vgrp, I18N_NOOP("Prefix currency symbol"));
+ connect( m_chMonPosPreCurSym, TQT_SIGNAL( clicked() ),
+ TQT_SLOT( slotMonPosPreCurSymChanged() ) );
+
+ TQHBox *hbox;
+ hbox = new TQHBox( vgrp );
+ m_labMonPosMonSignPos = new TQLabel(hbox, I18N_NOOP("Sign position:"));
+ m_cmbMonPosMonSignPos = new TQComboBox(hbox, "signpos");
+ connect( m_cmbMonPosMonSignPos, TQT_SIGNAL( activated(int) ),
+ TQT_SLOT( slotMonPosMonSignPosChanged(int) ) );
+
+ vgrp = new TQVGroupBox( vbox, I18N_NOOP("Negative") );
+ m_chMonNegPreCurSym = new TQCheckBox(vgrp, I18N_NOOP("Prefix currency symbol"));
+ connect( m_chMonNegPreCurSym, TQT_SIGNAL( clicked() ),
+ TQT_SLOT( slotMonNegPreCurSymChanged() ) );
+
+ hbox = new TQHBox( vgrp );
+ m_labMonNegMonSignPos = new TQLabel(hbox, I18N_NOOP("Sign position:"));
+ m_cmbMonNegMonSignPos = new TQComboBox(hbox, "signpos");
+ connect( m_cmbMonNegMonSignPos, TQT_SIGNAL( activated(int) ),
+ TQT_SLOT( slotMonNegMonSignPosChanged(int) ) );
// insert some items
int i = 5;
while (i--)
{
- m_cmbMonPosMonSignPos->insertItem(QString::null);
- m_cmbMonNegMonSignPos->insertItem(QString::null);
+ m_cmbMonPosMonSignPos->insertItem(TQString::null);
+ m_cmbMonNegMonSignPos->insertItem(TQString::null);
}
lay->setColStretch(1, 1);
@@ -131,32 +131,32 @@ void KLocaleConfigMoney::save()
KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale",
- QString::fromLatin1("l10n/%1/entry.desktop")
+ TQString::fromLatin1("l10n/%1/entry.desktop")
.arg(m_locale->country())), true);
ent.setGroup("KCM Locale");
- QString str;
+ TQString str;
int i;
bool b;
- str = ent.readEntry("CurrencySymbol", QString::fromLatin1("$"));
+ str = ent.readEntry("CurrencySymbol", TQString::fromLatin1("$"));
config->deleteEntry("CurrencySymbol", false, true);
if (str != m_locale->currencySymbol())
config->writeEntry("CurrencySymbol",
m_locale->currencySymbol(), true, true);
- str = ent.readEntry("MonetaryDecimalSymbol", QString::fromLatin1("."));
+ str = ent.readEntry("MonetaryDecimalSymbol", TQString::fromLatin1("."));
config->deleteEntry("MonetaryDecimalSymbol", false, true);
if (str != m_locale->monetaryDecimalSymbol())
config->writeEntry("MonetaryDecimalSymbol",
m_locale->monetaryDecimalSymbol(), true, true);
- str = ent.readEntry("MonetaryThousandsSeparator", QString::fromLatin1(","));
- str.replace(QString::fromLatin1("$0"), QString::null);
+ str = ent.readEntry("MonetaryThousandsSeparator", TQString::fromLatin1(","));
+ str.replace(TQString::fromLatin1("$0"), TQString::null);
config->deleteEntry("MonetaryThousandsSeparator", false, true);
if (str != m_locale->monetaryThousandsSeparator())
config->writeEntry("MonetaryThousandsSeparator",
- QString::fromLatin1("$0%1$0")
+ TQString::fromLatin1("$0%1$0")
.arg(m_locale->monetaryThousandsSeparator()),
true, true);
@@ -209,19 +209,19 @@ void KLocaleConfigMoney::slotLocaleChanged()
m_cmbMonNegMonSignPos->setCurrentItem( m_locale->negativeMonetarySignPosition() );
}
-void KLocaleConfigMoney::slotMonCurSymChanged(const QString &t)
+void KLocaleConfigMoney::slotMonCurSymChanged(const TQString &t)
{
m_locale->setCurrencySymbol(t);
emit localeChanged();
}
-void KLocaleConfigMoney::slotMonDecSymChanged(const QString &t)
+void KLocaleConfigMoney::slotMonDecSymChanged(const TQString &t)
{
m_locale->setMonetaryDecimalSymbol(t);
emit localeChanged();
}
-void KLocaleConfigMoney::slotMonThoSepChanged(const QString &t)
+void KLocaleConfigMoney::slotMonThoSepChanged(const TQString &t)
{
m_locale->setMonetaryThousandsSeparator(t);
emit localeChanged();
@@ -259,12 +259,12 @@ void KLocaleConfigMoney::slotMonNegMonSignPosChanged(int i)
void KLocaleConfigMoney::slotTranslate()
{
- QObjectList list;
+ TQObjectList list;
list.append(m_cmbMonPosMonSignPos);
list.append(m_cmbMonNegMonSignPos);
- QComboBox *wc;
- for (QObjectListIt li(list) ; (wc = (QComboBox *)li.current()) != 0; ++li)
+ TQComboBox *wc;
+ for (TQObjectListIt li(list) ; (wc = (TQComboBox *)li.current()) != 0; ++li)
{
wc->changeItem(m_locale->translate("Parentheses Around"), 0);
wc->changeItem(m_locale->translate("Before Quantity Money"), 1);
@@ -273,58 +273,58 @@ void KLocaleConfigMoney::slotTranslate()
wc->changeItem(m_locale->translate("After Money"), 4);
}
- QString str;
+ TQString str;
str = m_locale->translate( "Here you can enter your usual currency "
"symbol, e.g. $ or DM."
"<p>Please note that the Euro symbol may not be "
"available on your system, depending on the "
"distribution you use." );
- QWhatsThis::add( m_labMonCurSym, str );
- QWhatsThis::add( m_edMonCurSym, str );
+ TQWhatsThis::add( m_labMonCurSym, str );
+ TQWhatsThis::add( m_edMonCurSym, str );
str = m_locale->translate( "Here you can define the decimal separator used "
"to display monetary values."
"<p>Note that the decimal separator used to "
"display other numbers has to be defined "
"separately (see the 'Numbers' tab)." );
- QWhatsThis::add( m_labMonDecSym, str );
- QWhatsThis::add( m_edMonDecSym, str );
+ TQWhatsThis::add( m_labMonDecSym, str );
+ TQWhatsThis::add( m_edMonDecSym, str );
str = m_locale->translate( "Here you can define the thousands separator "
"used to display monetary values."
"<p>Note that the thousands separator used to "
"display other numbers has to be defined "
"separately (see the 'Numbers' tab)." );
- QWhatsThis::add( m_labMonThoSep, str );
- QWhatsThis::add( m_edMonThoSep, str );
+ TQWhatsThis::add( m_labMonThoSep, str );
+ TQWhatsThis::add( m_edMonThoSep, str );
str = m_locale->translate( "This determines the number of fract digits for "
"monetary values, i.e. the number of digits you "
"find <em>behind</em> the decimal separator. "
"Correct value is 2 for almost all people." );
- QWhatsThis::add( m_labMonFraDig, str );
- QWhatsThis::add( m_inMonFraDig, str );
+ TQWhatsThis::add( m_labMonFraDig, str );
+ TQWhatsThis::add( m_inMonFraDig, str );
str = m_locale->translate( "If this option is checked, the currency sign "
"will be prefixed (i.e. to the left of the "
"value) for all positive monetary values. If "
"not, it will be postfixed (i.e. to the right)." );
- QWhatsThis::add( m_chMonPosPreCurSym, str );
+ TQWhatsThis::add( m_chMonPosPreCurSym, str );
str = m_locale->translate( "If this option is checked, the currency sign "
"will be prefixed (i.e. to the left of the "
"value) for all negative monetary values. If "
"not, it will be postfixed (i.e. to the right)." );
- QWhatsThis::add( m_chMonNegPreCurSym, str );
+ TQWhatsThis::add( m_chMonNegPreCurSym, str );
str = m_locale->translate( "Here you can select how a positive sign will be "
"positioned. This only affects monetary values." );
- QWhatsThis::add( m_labMonPosMonSignPos, str );
- QWhatsThis::add( m_cmbMonPosMonSignPos, str );
+ TQWhatsThis::add( m_labMonPosMonSignPos, str );
+ TQWhatsThis::add( m_cmbMonPosMonSignPos, str );
str = m_locale->translate( "Here you can select how a negative sign will "
"be positioned. This only affects monetary "
"values." );
- QWhatsThis::add( m_labMonNegMonSignPos, str );
- QWhatsThis::add( m_cmbMonNegMonSignPos, str );
+ TQWhatsThis::add( m_labMonNegMonSignPos, str );
+ TQWhatsThis::add( m_cmbMonNegMonSignPos, str );
}
diff --git a/kcontrol/locale/localemon.h b/kcontrol/locale/localemon.h
index e772af4d3..0ec90f392 100644
--- a/kcontrol/locale/localemon.h
+++ b/kcontrol/locale/localemon.h
@@ -25,7 +25,7 @@
#ifndef __KLOCALECONFIGMON_H__
#define __KLOCALECONFIGMON_H__
-#include <qwidget.h>
+#include <tqwidget.h>
class QCheckBox;
class QComboBox;
@@ -40,7 +40,7 @@ class KLocaleConfigMoney : public QWidget
Q_OBJECT
public:
- KLocaleConfigMoney(KLocale *locale, QWidget *parent = 0, const char *name = 0);
+ KLocaleConfigMoney(KLocale *locale, TQWidget *parent = 0, const char *name = 0);
virtual ~KLocaleConfigMoney();
void save();
@@ -60,9 +60,9 @@ signals:
private slots:
// Money
- void slotMonCurSymChanged(const QString &t);
- void slotMonDecSymChanged(const QString &t);
- void slotMonThoSepChanged(const QString &t);
+ void slotMonCurSymChanged(const TQString &t);
+ void slotMonDecSymChanged(const TQString &t);
+ void slotMonThoSepChanged(const TQString &t);
void slotMonFraDigChanged(int value);
void slotMonPosPreCurSymChanged();
void slotMonNegPreCurSymChanged();
@@ -73,21 +73,21 @@ private:
KLocale *m_locale;
// Money
- QLabel *m_labMonCurSym;
- QLineEdit *m_edMonCurSym;
- QLabel *m_labMonDecSym;
- QLineEdit *m_edMonDecSym;
- QLabel *m_labMonThoSep;
- QLineEdit *m_edMonThoSep;
- QLabel *m_labMonFraDig;
+ TQLabel *m_labMonCurSym;
+ TQLineEdit *m_edMonCurSym;
+ TQLabel *m_labMonDecSym;
+ TQLineEdit *m_edMonDecSym;
+ TQLabel *m_labMonThoSep;
+ TQLineEdit *m_edMonThoSep;
+ TQLabel *m_labMonFraDig;
KIntNumInput * m_inMonFraDig;
- QCheckBox *m_chMonPosPreCurSym;
- QCheckBox *m_chMonNegPreCurSym;
- QLabel *m_labMonPosMonSignPos;
- QComboBox *m_cmbMonPosMonSignPos;
- QLabel *m_labMonNegMonSignPos;
- QComboBox *m_cmbMonNegMonSignPos;
+ TQCheckBox *m_chMonPosPreCurSym;
+ TQCheckBox *m_chMonNegPreCurSym;
+ TQLabel *m_labMonPosMonSignPos;
+ TQComboBox *m_cmbMonPosMonSignPos;
+ TQLabel *m_labMonNegMonSignPos;
+ TQComboBox *m_cmbMonNegMonSignPos;
};
#endif
diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp
index 9e5445ded..537cc99ab 100644
--- a/kcontrol/locale/localenum.cpp
+++ b/kcontrol/locale/localenum.cpp
@@ -21,11 +21,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qregexp.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
+#include <tqregexp.h>
#include <kdialog.h>
#include <ksimpleconfig.h>
@@ -36,43 +36,43 @@
#include "localenum.moc"
KLocaleConfigNumber::KLocaleConfigNumber(KLocale *locale,
- QWidget *parent, const char*name)
- : QWidget(parent, name),
+ TQWidget *parent, const char*name)
+ : TQWidget(parent, name),
m_locale(locale)
{
- QGridLayout *lay = new QGridLayout(this, 5, 2,
+ TQGridLayout *lay = new TQGridLayout(this, 5, 2,
KDialog::marginHint(),
KDialog::spacingHint());
lay->setAutoAdd(TRUE);
- m_labDecSym = new QLabel(this, I18N_NOOP("&Decimal symbol:"));
- m_edDecSym = new QLineEdit(this);
- connect( m_edDecSym, SIGNAL( textChanged(const QString &) ),
- this, SLOT( slotDecSymChanged(const QString &) ) );
+ m_labDecSym = new TQLabel(this, I18N_NOOP("&Decimal symbol:"));
+ m_edDecSym = new TQLineEdit(this);
+ connect( m_edDecSym, TQT_SIGNAL( textChanged(const TQString &) ),
+ this, TQT_SLOT( slotDecSymChanged(const TQString &) ) );
m_labDecSym->setBuddy(m_edDecSym);
- m_labThoSep = new QLabel(this, I18N_NOOP("Tho&usands separator:"));
- m_edThoSep = new QLineEdit(this);
- connect( m_edThoSep, SIGNAL( textChanged(const QString &) ),
- this, SLOT( slotThoSepChanged(const QString &) ) );
+ m_labThoSep = new TQLabel(this, I18N_NOOP("Tho&usands separator:"));
+ m_edThoSep = new TQLineEdit(this);
+ connect( m_edThoSep, TQT_SIGNAL( textChanged(const TQString &) ),
+ this, TQT_SLOT( slotThoSepChanged(const TQString &) ) );
m_labThoSep->setBuddy(m_edThoSep);
- m_labMonPosSign = new QLabel(this, I18N_NOOP("Positive si&gn:"));
- m_edMonPosSign = new QLineEdit(this);
- connect( m_edMonPosSign, SIGNAL( textChanged(const QString &) ),
- this, SLOT( slotMonPosSignChanged(const QString &) ) );
+ m_labMonPosSign = new TQLabel(this, I18N_NOOP("Positive si&gn:"));
+ m_edMonPosSign = new TQLineEdit(this);
+ connect( m_edMonPosSign, TQT_SIGNAL( textChanged(const TQString &) ),
+ this, TQT_SLOT( slotMonPosSignChanged(const TQString &) ) );
m_labMonPosSign->setBuddy(m_edMonPosSign);
- m_labMonNegSign = new QLabel(this, I18N_NOOP("&Negative sign:"));
- m_edMonNegSign = new QLineEdit(this);
- connect( m_edMonNegSign, SIGNAL( textChanged(const QString &) ),
- this, SLOT( slotMonNegSignChanged(const QString &) ) );
+ m_labMonNegSign = new TQLabel(this, I18N_NOOP("&Negative sign:"));
+ m_edMonNegSign = new TQLineEdit(this);
+ connect( m_edMonNegSign, TQT_SIGNAL( textChanged(const TQString &) ),
+ this, TQT_SLOT( slotMonNegSignChanged(const TQString &) ) );
m_labMonNegSign->setBuddy(m_edMonNegSign);
lay->setColStretch(1, 1);
- connect(this, SIGNAL(localeChanged()),
- SLOT(slotLocaleChanged()));
+ connect(this, TQT_SIGNAL(localeChanged()),
+ TQT_SLOT(slotLocaleChanged()));
}
KLocaleConfigNumber::~KLocaleConfigNumber()
@@ -89,26 +89,26 @@ void KLocaleConfigNumber::save()
KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale",
- QString::fromLatin1("l10n/%1/entry.desktop")
+ TQString::fromLatin1("l10n/%1/entry.desktop")
.arg(m_locale->country())), true);
ent.setGroup("KCM Locale");
- QString str;
+ TQString str;
str = ent.readEntry("DecimalSymbol",
- QString::fromLatin1("."));
+ TQString::fromLatin1("."));
config->deleteEntry("DecimalSymbol", false, true);
if (str != m_locale->decimalSymbol())
config->writeEntry("DecimalSymbol",
m_locale->decimalSymbol(), true, true);
str = ent.readEntry("ThousandsSeparator",
- QString::fromLatin1(","));
+ TQString::fromLatin1(","));
config->deleteEntry("ThousandsSeparator", false, true);
- str.replace(QString::fromLatin1("$0"), QString::null);
+ str.replace(TQString::fromLatin1("$0"), TQString::null);
if (str != m_locale->thousandsSeparator())
config->writeEntry("ThousandsSeparator",
- QString::fromLatin1("$0%1$0")
+ TQString::fromLatin1("$0%1$0")
.arg(m_locale->thousandsSeparator()), true, true);
str = ent.readEntry("PositiveSign");
@@ -116,7 +116,7 @@ void KLocaleConfigNumber::save()
if (str != m_locale->positiveSign())
config->writeEntry("PositiveSign", m_locale->positiveSign(), true, true);
- str = ent.readEntry("NegativeSign", QString::fromLatin1("-"));
+ str = ent.readEntry("NegativeSign", TQString::fromLatin1("-"));
config->deleteEntry("NegativeSign", false, true);
if (str != m_locale->negativeSign())
config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true);
@@ -134,25 +134,25 @@ void KLocaleConfigNumber::slotLocaleChanged()
m_edMonNegSign->setText( m_locale->negativeSign() );
}
-void KLocaleConfigNumber::slotDecSymChanged(const QString &t)
+void KLocaleConfigNumber::slotDecSymChanged(const TQString &t)
{
m_locale->setDecimalSymbol(t);
emit localeChanged();
}
-void KLocaleConfigNumber::slotThoSepChanged(const QString &t)
+void KLocaleConfigNumber::slotThoSepChanged(const TQString &t)
{
m_locale->setThousandsSeparator(t);
emit localeChanged();
}
-void KLocaleConfigNumber::slotMonPosSignChanged(const QString &t)
+void KLocaleConfigNumber::slotMonPosSignChanged(const TQString &t)
{
m_locale->setPositiveSign(t);
emit localeChanged();
}
-void KLocaleConfigNumber::slotMonNegSignChanged(const QString &t)
+void KLocaleConfigNumber::slotMonNegSignChanged(const TQString &t)
{
m_locale->setNegativeSign(t);
emit localeChanged();
@@ -160,7 +160,7 @@ void KLocaleConfigNumber::slotMonNegSignChanged(const QString &t)
void KLocaleConfigNumber::slotTranslate()
{
- QString str;
+ TQString str;
str = m_locale->translate( "Here you can define the decimal separator used "
"to display numbers (i.e. a dot or a comma in "
@@ -168,27 +168,27 @@ void KLocaleConfigNumber::slotTranslate()
"Note that the decimal separator used to "
"display monetary values has to be set "
"separately (see the 'Money' tab)." );
- QWhatsThis::add( m_labDecSym, str );
- QWhatsThis::add( m_edDecSym, str );
+ TQWhatsThis::add( m_labDecSym, str );
+ TQWhatsThis::add( m_edDecSym, str );
str = m_locale->translate( "Here you can define the thousands separator "
"used to display numbers.<p>"
"Note that the thousands separator used to "
"display monetary values has to be set "
"separately (see the 'Money' tab)." );
- QWhatsThis::add( m_labThoSep, str );
- QWhatsThis::add( m_edThoSep, str );
+ TQWhatsThis::add( m_labThoSep, str );
+ TQWhatsThis::add( m_edThoSep, str );
str = m_locale->translate( "Here you can specify text used to prefix "
"positive numbers. Most people leave this "
"blank." );
- QWhatsThis::add( m_labMonPosSign, str );
- QWhatsThis::add( m_edMonPosSign, str );
+ TQWhatsThis::add( m_labMonPosSign, str );
+ TQWhatsThis::add( m_edMonPosSign, str );
str = m_locale->translate( "Here you can specify text used to prefix "
"negative numbers. This should not be empty, so "
"you can distinguish positive and negative "
"numbers. It is normally set to minus (-)." );
- QWhatsThis::add( m_labMonNegSign, str );
- QWhatsThis::add( m_edMonNegSign, str );
+ TQWhatsThis::add( m_labMonNegSign, str );
+ TQWhatsThis::add( m_edMonNegSign, str );
}
diff --git a/kcontrol/locale/localenum.h b/kcontrol/locale/localenum.h
index da75dc708..c0e8ef511 100644
--- a/kcontrol/locale/localenum.h
+++ b/kcontrol/locale/localenum.h
@@ -25,7 +25,7 @@
#ifndef __KLOCALECONFIGNUM_H__
#define __KLOCALECONFIGNUM_H__
-#include <qwidget.h>
+#include <tqwidget.h>
class QCheckBox;
class QComboBox;
@@ -40,7 +40,7 @@ class KLocaleConfigNumber : public QWidget
public:
KLocaleConfigNumber( KLocale *_locale,
- QWidget *parent=0, const char *name=0);
+ TQWidget *parent=0, const char *name=0);
virtual ~KLocaleConfigNumber( );
void save();
@@ -60,23 +60,23 @@ signals:
private slots:
// Numbers
- void slotMonPosSignChanged(const QString &t);
- void slotMonNegSignChanged(const QString &t);
- void slotDecSymChanged(const QString &t);
- void slotThoSepChanged(const QString &t);
+ void slotMonPosSignChanged(const TQString &t);
+ void slotMonNegSignChanged(const TQString &t);
+ void slotDecSymChanged(const TQString &t);
+ void slotThoSepChanged(const TQString &t);
private:
KLocale *m_locale;
// Numbers
- QLabel *m_labDecSym;
- QLineEdit *m_edDecSym;
- QLabel *m_labThoSep;
- QLineEdit *m_edThoSep;
- QLabel *m_labMonPosSign;
- QLineEdit *m_edMonPosSign;
- QLabel *m_labMonNegSign;
- QLineEdit *m_edMonNegSign;
+ TQLabel *m_labDecSym;
+ TQLineEdit *m_edDecSym;
+ TQLabel *m_labThoSep;
+ TQLineEdit *m_edThoSep;
+ TQLabel *m_labMonPosSign;
+ TQLineEdit *m_edMonPosSign;
+ TQLabel *m_labMonNegSign;
+ TQLineEdit *m_edMonNegSign;
};
#endif
diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp
index 97f97ba2f..1cf6b949b 100644
--- a/kcontrol/locale/localeother.cpp
+++ b/kcontrol/locale/localeother.cpp
@@ -21,10 +21,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qcombobox.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qprinter.h>
+#include <tqcombobox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqprinter.h>
#include <kdialog.h>
#include <klocale.h>
@@ -36,33 +36,33 @@
KLocaleConfigOther::KLocaleConfigOther(KLocale *locale,
- QWidget *parent, const char*name)
- : QWidget(parent, name),
+ TQWidget *parent, const char*name)
+ : TQWidget(parent, name),
m_locale(locale)
{
// Other
- QGridLayout *lay = new QGridLayout(this, 3, 2,
+ TQGridLayout *lay = new TQGridLayout(this, 3, 2,
KDialog::marginHint(),
KDialog::spacingHint());
- m_labPageSize = new QLabel(this, I18N_NOOP("Paper format:"));
+ m_labPageSize = new TQLabel(this, I18N_NOOP("Paper format:"));
lay->addWidget(m_labPageSize, 0, 0);
- m_combPageSize = new QComboBox(this);
+ m_combPageSize = new TQComboBox(this);
lay->addWidget(m_combPageSize, 0, 1);
- connect( m_combPageSize, SIGNAL( activated(int) ),
- SLOT( slotPageSizeChanged(int) ) );
+ connect( m_combPageSize, TQT_SIGNAL( activated(int) ),
+ TQT_SLOT( slotPageSizeChanged(int) ) );
- m_labMeasureSystem = new QLabel(this, I18N_NOOP("Measure system:"));
+ m_labMeasureSystem = new TQLabel(this, I18N_NOOP("Measure system:"));
lay->addWidget(m_labMeasureSystem, 1, 0);
- m_combMeasureSystem = new QComboBox(this);
+ m_combMeasureSystem = new TQComboBox(this);
lay->addWidget(m_combMeasureSystem, 1, 1);
- connect( m_combMeasureSystem, SIGNAL( activated(int) ),
- SLOT( slotMeasureSystemChanged(int) ) );
+ connect( m_combMeasureSystem, TQT_SIGNAL( activated(int) ),
+ TQT_SLOT( slotMeasureSystemChanged(int) ) );
- m_combPageSize->insertItem(QString::null);
- m_combPageSize->insertItem(QString::null);
- m_combMeasureSystem->insertItem(QString::null);
- m_combMeasureSystem->insertItem(QString::null);
+ m_combPageSize->insertItem(TQString::null);
+ m_combPageSize->insertItem(TQString::null);
+ m_combMeasureSystem->insertItem(TQString::null);
+ m_combMeasureSystem->insertItem(TQString::null);
lay->setColStretch(1, 1);
lay->addRowSpacing(2, 0);
@@ -80,13 +80,13 @@ void KLocaleConfigOther::save()
KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale",
- QString::fromLatin1("l10n/%1/entry.desktop")
+ TQString::fromLatin1("l10n/%1/entry.desktop")
.arg(m_locale->country())), true);
ent.setGroup("KCM Locale");
// ### HPB: Add code here
int i;
- i = ent.readNumEntry("PageSize", (int)QPrinter::A4);
+ i = ent.readNumEntry("PageSize", (int)TQPrinter::A4);
config->deleteEntry("PageSize", false, true);
if (i != m_locale->pageSize())
config->writeEntry("PageSize",
@@ -108,7 +108,7 @@ void KLocaleConfigOther::slotLocaleChanged()
int pageSize = m_locale->pageSize();
int i = 0; // default to A4
- if ( pageSize == (int)QPrinter::Letter )
+ if ( pageSize == (int)TQPrinter::Letter )
i = 1;
m_combPageSize->setCurrentItem(i);
}
@@ -126,10 +126,10 @@ void KLocaleConfigOther::slotTranslate()
void KLocaleConfigOther::slotPageSizeChanged(int i)
{
- QPrinter::PageSize pageSize = QPrinter::A4;
+ TQPrinter::PageSize pageSize = TQPrinter::A4;
if ( i == 1 )
- pageSize = QPrinter::Letter;
+ pageSize = TQPrinter::Letter;
m_locale->setPageSize((int)pageSize);
emit localeChanged();
diff --git a/kcontrol/locale/localeother.h b/kcontrol/locale/localeother.h
index 1c6ec0b48..a4d2dc1ba 100644
--- a/kcontrol/locale/localeother.h
+++ b/kcontrol/locale/localeother.h
@@ -24,7 +24,7 @@
#ifndef __KLOCALECONFIGOTHER_H__
#define __KLOCALECONFIGOTHER_H__
-#include <qwidget.h>
+#include <tqwidget.h>
class QLabel;
class QComboBox;
@@ -36,7 +36,7 @@ class KLocaleConfigOther : public QWidget
Q_OBJECT
public:
- KLocaleConfigOther(KLocale *locale, QWidget *parent = 0, const char *name = 0);
+ KLocaleConfigOther(KLocale *locale, TQWidget *parent = 0, const char *name = 0);
virtual ~KLocaleConfigOther();
void save();
@@ -61,10 +61,10 @@ private slots:
private:
KLocale *m_locale;
- QLabel *m_labMeasureSystem;
- QComboBox *m_combMeasureSystem;
- QLabel *m_labPageSize;
- QComboBox *m_combPageSize;
+ TQLabel *m_labMeasureSystem;
+ TQComboBox *m_combMeasureSystem;
+ TQLabel *m_labPageSize;
+ TQComboBox *m_combPageSize;
};
#endif
diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp
index ea077ac89..2519ea794 100644
--- a/kcontrol/locale/localetime.cpp
+++ b/kcontrol/locale/localetime.cpp
@@ -21,12 +21,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qcombobox.h>
-#include <qvaluevector.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
+#include <tqcombobox.h>
+#include <tqvaluevector.h>
#include <kdialog.h>
#include <ksimpleconfig.h>
@@ -41,12 +41,12 @@
class StringPair
{
public:
- QChar storeName;
- QString userName;
+ TQChar storeName;
+ TQString userName;
- static StringPair find( const QValueList <StringPair> &list, const QChar &c)
+ static StringPair find( const TQValueList <StringPair> &list, const TQChar &c)
{
- for ( QValueList<StringPair>::ConstIterator it = list.begin();
+ for ( TQValueList<StringPair>::ConstIterator it = list.begin();
it != list.end();
++it )
if ((*it).storeName==c) return (*it);
@@ -80,7 +80,7 @@ bool operator>= (const StringPair &p1, const StringPair &p2)
return ! (p1.userName>=p2.userName);
}
-StringPair KLocaleConfigTime::buildStringPair(const QChar &c, const QString &s) const
+StringPair KLocaleConfigTime::buildStringPair(const TQChar &c, const TQString &s) const
{
StringPair pair;
pair.storeName=c;
@@ -88,9 +88,9 @@ StringPair KLocaleConfigTime::buildStringPair(const QChar &c, const QString &s)
return pair;
}
-QValueList<StringPair> KLocaleConfigTime::timeMap() const
+TQValueList<StringPair> KLocaleConfigTime::timeMap() const
{
- QValueList < StringPair > list;
+ TQValueList < StringPair > list;
list+=buildStringPair('H',m_locale->translate("HH"));
list+=buildStringPair('k',m_locale->translate("hH"));
list+=buildStringPair('I',m_locale->translate("PH"));
@@ -104,9 +104,9 @@ QValueList<StringPair> KLocaleConfigTime::timeMap() const
return list;
}
-QValueList <StringPair> KLocaleConfigTime::dateMap() const
+TQValueList <StringPair> KLocaleConfigTime::dateMap() const
{
- QValueList < StringPair > list;
+ TQValueList < StringPair > list;
list+=buildStringPair('Y',m_locale->translate("YYYY"));
list+=buildStringPair('y',m_locale->translate("YY"));
list+=buildStringPair('n',m_locale->translate("mM"));
@@ -123,19 +123,19 @@ QValueList <StringPair> KLocaleConfigTime::dateMap() const
return list;
}
-QString KLocaleConfigTime::userToStore(const QValueList<StringPair> & list,
- const QString & userFormat) const
+TQString KLocaleConfigTime::userToStore(const TQValueList<StringPair> & list,
+ const TQString & userFormat) const
{
- QString result;
+ TQString result;
for ( uint pos = 0; pos < userFormat.length(); ++pos )
{
bool bFound = false;
- for ( QValueList<StringPair>::ConstIterator it = list.begin();
+ for ( TQValueList<StringPair>::ConstIterator it = list.begin();
it != list.end() && !bFound;
++it )
{
- QString s = (*it).userName;
+ TQString s = (*it).userName;
if ( userFormat.mid( pos, s.length() ) == s )
{
@@ -150,7 +150,7 @@ QString KLocaleConfigTime::userToStore(const QValueList<StringPair> & list,
if ( !bFound )
{
- QChar c = userFormat.at( pos );
+ TQChar c = userFormat.at( pos );
if ( c == '%' )
result += c;
@@ -161,15 +161,15 @@ QString KLocaleConfigTime::userToStore(const QValueList<StringPair> & list,
return result;
}
-QString KLocaleConfigTime::storeToUser(const QValueList<StringPair> & list,
- const QString & storeFormat) const
+TQString KLocaleConfigTime::storeToUser(const TQValueList<StringPair> & list,
+ const TQString & storeFormat) const
{
- QString result;
+ TQString result;
bool escaped = false;
for ( uint pos = 0; pos < storeFormat.length(); ++pos )
{
- QChar c = storeFormat.at(pos);
+ TQChar c = storeFormat.at(pos);
if ( escaped )
{
StringPair it = StringPair::find( list, c );
@@ -190,51 +190,51 @@ QString KLocaleConfigTime::storeToUser(const QValueList<StringPair> & list,
}
KLocaleConfigTime::KLocaleConfigTime(KLocale *_locale,
- QWidget *parent, const char*name)
- : QWidget(parent, name),
+ TQWidget *parent, const char*name)
+ : TQWidget(parent, name),
m_locale(_locale)
{
// Time
- QGridLayout *lay = new QGridLayout(this, 7, 2,
+ TQGridLayout *lay = new TQGridLayout(this, 7, 2,
KDialog::marginHint(),
KDialog::spacingHint());
lay->setAutoAdd(TRUE);
- m_labCalendarSystem = new QLabel(this, I18N_NOOP("Calendar system:"));
- m_comboCalendarSystem = new QComboBox(false, this);
- connect(m_comboCalendarSystem, SIGNAL(activated(int)),
- this, SLOT(slotCalendarSystemChanged(int)));
- QStringList tmpCalendars;
- tmpCalendars << QString::null << QString::null;
+ m_labCalendarSystem = new TQLabel(this, I18N_NOOP("Calendar system:"));
+ m_comboCalendarSystem = new TQComboBox(false, this);
+ connect(m_comboCalendarSystem, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(slotCalendarSystemChanged(int)));
+ TQStringList tmpCalendars;
+ tmpCalendars << TQString::null << TQString::null;
m_comboCalendarSystem->insertStringList(tmpCalendars);
- m_labTimeFmt = new QLabel(this, I18N_NOOP("Time format:"));
- m_comboTimeFmt = new QComboBox(true, this);
+ m_labTimeFmt = new TQLabel(this, I18N_NOOP("Time format:"));
+ m_comboTimeFmt = new TQComboBox(true, this);
//m_edTimeFmt = m_comboTimeFmt->lineEdit();
- //m_edTimeFmt = new QLineEdit(this);
- connect( m_comboTimeFmt, SIGNAL( textChanged(const QString &) ),
- this, SLOT( slotTimeFmtChanged(const QString &) ) );
+ //m_edTimeFmt = new TQLineEdit(this);
+ connect( m_comboTimeFmt, TQT_SIGNAL( textChanged(const TQString &) ),
+ this, TQT_SLOT( slotTimeFmtChanged(const TQString &) ) );
- m_labDateFmt = new QLabel(this, I18N_NOOP("Date format:"));
- m_comboDateFmt = new QComboBox(true, this);
- connect( m_comboDateFmt, SIGNAL( textChanged(const QString &) ),
- this, SLOT( slotDateFmtChanged(const QString &) ) );
+ m_labDateFmt = new TQLabel(this, I18N_NOOP("Date format:"));
+ m_comboDateFmt = new TQComboBox(true, this);
+ connect( m_comboDateFmt, TQT_SIGNAL( textChanged(const TQString &) ),
+ this, TQT_SLOT( slotDateFmtChanged(const TQString &) ) );
- m_labDateFmtShort = new QLabel(this, I18N_NOOP("Short date format:"));
- m_comboDateFmtShort = new QComboBox(true, this);
- connect( m_comboDateFmtShort, SIGNAL( textChanged(const QString &) ),
- this, SLOT( slotDateFmtShortChanged(const QString &) ) );
+ m_labDateFmtShort = new TQLabel(this, I18N_NOOP("Short date format:"));
+ m_comboDateFmtShort = new TQComboBox(true, this);
+ connect( m_comboDateFmtShort, TQT_SIGNAL( textChanged(const TQString &) ),
+ this, TQT_SLOT( slotDateFmtShortChanged(const TQString &) ) );
- m_labWeekStartDay = new QLabel(this, I18N_NOOP("First day of the week:"));
- m_comboWeekStartDay = new QComboBox(false, this);
- connect (m_comboWeekStartDay, SIGNAL(activated(int)),
- this, SLOT(slotWeekStartDayChanged(int)));
+ m_labWeekStartDay = new TQLabel(this, I18N_NOOP("First day of the week:"));
+ m_comboWeekStartDay = new TQComboBox(false, this);
+ connect (m_comboWeekStartDay, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(slotWeekStartDayChanged(int)));
updateWeekDayNames();
- m_chDateMonthNamePossessive = new QCheckBox(this, I18N_NOOP("Use declined form of month name"));
- connect( m_chDateMonthNamePossessive, SIGNAL( clicked() ),
- SLOT( slotDateMonthNamePossChanged() ) );
+ m_chDateMonthNamePossessive = new TQCheckBox(this, I18N_NOOP("Use declined form of month name"));
+ connect( m_chDateMonthNamePossessive, TQT_SIGNAL( clicked() ),
+ TQT_SLOT( slotDateMonthNamePossChanged() ) );
lay->setColStretch(1, 1);
}
@@ -253,28 +253,28 @@ void KLocaleConfigTime::save()
KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale",
- QString::fromLatin1("l10n/%1/entry.desktop")
+ TQString::fromLatin1("l10n/%1/entry.desktop")
.arg(m_locale->country())), true);
ent.setGroup("KCM Locale");
- QString str;
+ TQString str;
- str = ent.readEntry("CalendarSystem", QString::fromLatin1("gregorian"));
+ str = ent.readEntry("CalendarSystem", TQString::fromLatin1("gregorian"));
config->deleteEntry("CalendarSystem", false, true);
if (str != m_locale->calendarType())
config->writeEntry("CalendarSystem", m_locale->calendarType(), true, true);
- str = ent.readEntry("TimeFormat", QString::fromLatin1("%H:%M:%S"));
+ str = ent.readEntry("TimeFormat", TQString::fromLatin1("%H:%M:%S"));
config->deleteEntry("TimeFormat", false, true);
if (str != m_locale->timeFormat())
config->writeEntry("TimeFormat", m_locale->timeFormat(), true, true);
- str = ent.readEntry("DateFormat", QString::fromLatin1("%A %d %B %Y"));
+ str = ent.readEntry("DateFormat", TQString::fromLatin1("%A %d %B %Y"));
config->deleteEntry("DateFormat", false, true);
if (str != m_locale->dateFormat())
config->writeEntry("DateFormat", m_locale->dateFormat(), true, true);
- str = ent.readEntry("DateFormatShort", QString::fromLatin1("%Y-%m-%d"));
+ str = ent.readEntry("DateFormatShort", TQString::fromLatin1("%Y-%m-%d"));
config->deleteEntry("DateFormatShort", false, true);
if (str != m_locale->dateFormatShort())
config->writeEntry("DateFormatShort",
@@ -302,26 +302,26 @@ void KLocaleConfigTime::save()
KGlobal::_locale = lsave;
}
-void KLocaleConfigTime::showEvent( QShowEvent *e )
+void KLocaleConfigTime::showEvent( TQShowEvent *e )
{
// This option makes sense only for languages where nouns are declined
if ( !m_locale->nounDeclension() )
m_chDateMonthNamePossessive->hide();
- QWidget::showEvent( e );
+ TQWidget::showEvent( e );
}
void KLocaleConfigTime::slotCalendarSystemChanged(int calendarSystem)
{
kdDebug() << "CalendarSystem: " << calendarSystem << endl;
- typedef QValueVector<QString> CalendarVector;
+ typedef TQValueVector<TQString> CalendarVector;
CalendarVector calendars(4);
calendars[0] = "gregorian";
calendars[1] = "hijri";
calendars[2] = "hebrew";
calendars[3] = "jalali";
- QString calendarType;
+ TQString calendarType;
bool ok;
calendarType = calendars.at(calendarSystem, &ok);
if ( !ok )
@@ -335,14 +335,14 @@ void KLocaleConfigTime::slotCalendarSystemChanged(int calendarSystem)
void KLocaleConfigTime::slotLocaleChanged()
{
- typedef QValueVector<QString> CalendarVector;
+ typedef TQValueVector<TQString> CalendarVector;
CalendarVector calendars(4);
calendars[0] = "gregorian";
calendars[1] = "hijri";
calendars[2] = "hebrew";
calendars[3] = "jalali";
- QString calendarType = m_locale->calendarType();
+ TQString calendarType = m_locale->calendarType();
int calendarSystem = 0;
CalendarVector::iterator it = qFind(calendars.begin(), calendars.end(),
@@ -371,11 +371,11 @@ calendarType);
kdDebug(173) << storeToUser(timeMap(),
m_locale->timeFormat()) << endl;
kdDebug(173) << userToStore(timeMap(),
- QString::fromLatin1("HH:MM:SS AMPM test")) << endl;
+ TQString::fromLatin1("HH:MM:SS AMPM test")) << endl;
}
-void KLocaleConfigTime::slotTimeFmtChanged(const QString &t)
+void KLocaleConfigTime::slotTimeFmtChanged(const TQString &t)
{
// m_locale->setTimeFormat(t);
m_locale->setTimeFormat( userToStore( timeMap(), t ) );
@@ -383,14 +383,14 @@ void KLocaleConfigTime::slotTimeFmtChanged(const QString &t)
emit localeChanged();
}
-void KLocaleConfigTime::slotDateFmtChanged(const QString &t)
+void KLocaleConfigTime::slotDateFmtChanged(const TQString &t)
{
// m_locale->setDateFormat(t);
m_locale->setDateFormat( userToStore( dateMap(), t ) );
emit localeChanged();
}
-void KLocaleConfigTime::slotDateFmtShortChanged(const QString &t)
+void KLocaleConfigTime::slotDateFmtShortChanged(const TQString &t)
{
//m_locale->setDateFormatShort(t);
m_locale->setDateFormatShort( userToStore( dateMap(), t ) );
@@ -414,11 +414,11 @@ void KLocaleConfigTime::slotDateMonthNamePossChanged()
void KLocaleConfigTime::slotTranslate()
{
- QString str;
+ TQString str;
- QString sep = QString::fromLatin1("\n");
+ TQString sep = TQString::fromLatin1("\n");
- QString old;
+ TQString old;
// clear() and insertStringList also changes the current item, so
// we better use save and restore here..
@@ -427,7 +427,7 @@ void KLocaleConfigTime::slotTranslate()
str = i18n("some reasonable time formats for the language",
"HH:MM:SS\n"
"pH:MM:SS AMPM");
- m_comboTimeFmt->insertStringList(QStringList::split(sep, str));
+ m_comboTimeFmt->insertStringList(TQStringList::split(sep, str));
m_comboTimeFmt->setEditText(old);
old = m_comboDateFmt->currentText();
@@ -435,7 +435,7 @@ void KLocaleConfigTime::slotTranslate()
str = i18n("some reasonable date formats for the language",
"WEEKDAY MONTH dD YYYY\n"
"SHORTWEEKDAY MONTH dD YYYY");
- m_comboDateFmt->insertStringList(QStringList::split(sep, str));
+ m_comboDateFmt->insertStringList(TQStringList::split(sep, str));
m_comboDateFmt->setEditText(old);
old = m_comboDateFmtShort->currentText();
@@ -444,13 +444,13 @@ void KLocaleConfigTime::slotTranslate()
"YYYY-MM-DD\n"
"dD.mM.YYYY\n"
"DD.MM.YYYY");
- m_comboDateFmtShort->insertStringList(QStringList::split(sep, str));
+ m_comboDateFmtShort->insertStringList(TQStringList::split(sep, str));
m_comboDateFmtShort->setEditText(old);
updateWeekDayNames();
while ( m_comboCalendarSystem->count() < 4 )
- m_comboCalendarSystem->insertItem(QString::null);
+ m_comboCalendarSystem->insertItem(TQString::null);
m_comboCalendarSystem->changeItem
(m_locale->translate("Calendar System Gregorian", "Gregorian"), 0);
m_comboCalendarSystem->changeItem
@@ -480,10 +480,10 @@ void KLocaleConfigTime::slotTranslate()
"given time value. Noon is treated as \"pm\" and midnight as \"am\"."
"</td></tr>"
"</table>");
- QWhatsThis::add( m_labTimeFmt, str );
- QWhatsThis::add( m_comboTimeFmt, str );
+ TQWhatsThis::add( m_labTimeFmt, str );
+ TQWhatsThis::add( m_comboTimeFmt, str );
- QString datecodes = m_locale->translate(
+ TQString datecodes = m_locale->translate(
"<table>"
"<tr><td><b>YYYY</b></td><td>The year with century as a decimal number."
"</td></tr>"
@@ -507,27 +507,27 @@ void KLocaleConfigTime::slotTranslate()
str = m_locale->translate
( "<p>The text in this textbox will be used to format long "
"dates. The sequences below will be replaced:</p>") + datecodes;
- QWhatsThis::add( m_labDateFmt, str );
- QWhatsThis::add( m_comboDateFmt, str );
+ TQWhatsThis::add( m_labDateFmt, str );
+ TQWhatsThis::add( m_comboDateFmt, str );
str = m_locale->translate
( "<p>The text in this textbox will be used to format short "
"dates. For instance, this is used when listing files. "
"The sequences below will be replaced:</p>") + datecodes;
- QWhatsThis::add( m_labDateFmtShort, str );
- QWhatsThis::add( m_comboDateFmtShort, str );
+ TQWhatsThis::add( m_labDateFmtShort, str );
+ TQWhatsThis::add( m_comboDateFmtShort, str );
str = m_locale->translate
("<p>This option determines which day will be considered as "
"the first one of the week.</p>");
- QWhatsThis::add( m_comboWeekStartDay, str );
+ TQWhatsThis::add( m_comboWeekStartDay, str );
if ( m_locale->nounDeclension() )
{
str = m_locale->translate
("<p>This option determines whether possessive form of month "
"names should be used in dates.</p>");
- QWhatsThis::add( m_chDateMonthNamePossessive, str );
+ TQWhatsThis::add( m_chDateMonthNamePossessive, str );
}
}
@@ -537,7 +537,7 @@ void KLocaleConfigTime::updateWeekDayNames()
for ( int i = 1; ; ++i )
{
- QString str = calendar->weekDayName(i);
+ TQString str = calendar->weekDayName(i);
bool outsideComboList = m_comboWeekStartDay->count() < i;
if ( str.isNull() )
diff --git a/kcontrol/locale/localetime.h b/kcontrol/locale/localetime.h
index c77f00cd3..26f65579c 100644
--- a/kcontrol/locale/localetime.h
+++ b/kcontrol/locale/localetime.h
@@ -24,9 +24,9 @@
#ifndef __KLOCALECONFIGTIME_H__
#define __KLOCALECONFIGTIME_H__
-#include <qwidget.h>
+#include <tqwidget.h>
-#include <qmap.h>
+#include <tqmap.h>
class QCheckBox;
class QComboBox;
@@ -41,13 +41,13 @@ class KLocaleConfigTime : public QWidget
Q_OBJECT
public:
- KLocaleConfigTime( KLocale *_locale, QWidget *parent=0, const char *name=0);
+ KLocaleConfigTime( KLocale *_locale, TQWidget *parent=0, const char *name=0);
virtual ~KLocaleConfigTime( );
void save();
protected:
- void showEvent( QShowEvent *e );
+ void showEvent( TQShowEvent *e );
public slots:
/**
@@ -64,9 +64,9 @@ signals:
private slots:
// Time & dates
- void slotTimeFmtChanged(const QString &t);
- void slotDateFmtChanged(const QString &t);
- void slotDateFmtShortChanged(const QString &t);
+ void slotTimeFmtChanged(const TQString &t);
+ void slotDateFmtChanged(const TQString &t);
+ void slotDateFmtShortChanged(const TQString &t);
void slotWeekStartDayChanged(int firstDay);
void slotDateMonthNamePossChanged();
void slotCalendarSystemChanged(int calendarSystem);
@@ -74,29 +74,29 @@ private slots:
private:
void updateWeekDayNames();
- QValueList<StringPair> timeMap() const;
- QValueList<StringPair> dateMap() const;
+ TQValueList<StringPair> timeMap() const;
+ TQValueList<StringPair> dateMap() const;
- QString storeToUser(const QValueList<StringPair> & map,
- const QString & storeFormat) const;
- QString userToStore(const QValueList<StringPair> & map,
- const QString & userFormat) const;
- StringPair buildStringPair(const QChar &storeName, const QString &userName) const;
+ TQString storeToUser(const TQValueList<StringPair> & map,
+ const TQString & storeFormat) const;
+ TQString userToStore(const TQValueList<StringPair> & map,
+ const TQString & userFormat) const;
+ StringPair buildStringPair(const TQChar &storeName, const TQString &userName) const;
KLocale *m_locale;
// Time & dates
- QLabel *m_labTimeFmt;
- QComboBox *m_comboTimeFmt;
- QLabel *m_labDateFmt;
- QComboBox * m_comboDateFmt;
- QLabel *m_labDateFmtShort;
- QComboBox * m_comboDateFmtShort;
- QLabel * m_labWeekStartDay;
- QComboBox * m_comboWeekStartDay;
- QCheckBox *m_chDateMonthNamePossessive;
- QLabel * m_labCalendarSystem;
- QComboBox * m_comboCalendarSystem;
+ TQLabel *m_labTimeFmt;
+ TQComboBox *m_comboTimeFmt;
+ TQLabel *m_labDateFmt;
+ TQComboBox * m_comboDateFmt;
+ TQLabel *m_labDateFmtShort;
+ TQComboBox * m_comboDateFmtShort;
+ TQLabel * m_labWeekStartDay;
+ TQComboBox * m_comboWeekStartDay;
+ TQCheckBox *m_chDateMonthNamePossessive;
+ TQLabel * m_labCalendarSystem;
+ TQComboBox * m_comboCalendarSystem;
};
#endif
diff --git a/kcontrol/locale/main.cpp b/kcontrol/locale/main.cpp
index 7a861495b..74febe07e 100644
--- a/kcontrol/locale/main.cpp
+++ b/kcontrol/locale/main.cpp
@@ -30,7 +30,7 @@ extern "C" {
/*
extern "C" {
- KCModule *create_locale(QWidget *parent, const char* name) {
+ KCModule *create_locale(TQWidget *parent, const char* name) {
KLocale::setMainCatalogue("kcmlocale");
return new KLocaleApplication(parent, "kcmlocale");
}
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index 4ba70e1ed..de47ce661 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -20,13 +20,13 @@
*/
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qobjectlist.h>
-#include <qpushbutton.h>
-#include <qtabwidget.h>
-#include <qvgroupbox.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqobjectlist.h>
+#include <tqpushbutton.h>
+#include <tqtabwidget.h>
+#include <tqvgroupbox.h>
#include <kaboutdata.h>
#include <kconfig.h>
@@ -45,8 +45,8 @@
#include "kcmlocale.h"
#include "toplevel.moc"
-KLocaleApplication::KLocaleApplication(QWidget *parent, const char* /*name*/,
- const QStringList &args)
+KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/,
+ const TQStringList &args)
: KCModule( KLocaleFactory::instance(), parent, args)
{
KAboutData* aboutData = new KAboutData("kcmlocale",
@@ -59,89 +59,89 @@ KLocaleApplication::KLocaleApplication(QWidget *parent, const char* /*name*/,
0, 0, "bieker@kde.org");
setAboutData( aboutData );
- m_nullConfig = new KConfig(QString::null, false, false);
- m_globalConfig = new KConfig(QString::null, false, true);
+ m_nullConfig = new KConfig(TQString::null, false, false);
+ m_globalConfig = new KConfig(TQString::null, false, true);
- m_locale = new KLocale(QString::fromLatin1("kcmlocale"), m_nullConfig);
- QVBoxLayout *l = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ m_locale = new KLocale(TQString::fromLatin1("kcmlocale"), m_nullConfig);
+ TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint());
l->setAutoAdd(TRUE);
- m_tab = new QTabWidget(this);
+ m_tab = new TQTabWidget(this);
m_localemain = new KLocaleConfig(m_locale, this);
- m_tab->addTab( m_localemain, QString::null);
+ m_tab->addTab( m_localemain, TQString::null);
m_localenum = new KLocaleConfigNumber(m_locale, this);
- m_tab->addTab( m_localenum, QString::null );
+ m_tab->addTab( m_localenum, TQString::null );
m_localemon = new KLocaleConfigMoney(m_locale, this);
- m_tab->addTab( m_localemon, QString::null );
+ m_tab->addTab( m_localemon, TQString::null );
m_localetime = new KLocaleConfigTime(m_locale, this);
- m_tab->addTab( m_localetime, QString::null );
+ m_tab->addTab( m_localetime, TQString::null );
m_localeother = new KLocaleConfigOther(m_locale, this);
- m_tab->addTab( m_localeother, QString::null );
+ m_tab->addTab( m_localeother, TQString::null );
// Examples
- m_gbox = new QVGroupBox(this);
+ m_gbox = new TQVGroupBox(this);
m_sample = new KLocaleSample(m_locale, m_gbox);
// getting signals from childs
- connect(m_localemain, SIGNAL(localeChanged()),
- this, SIGNAL(localeChanged()));
- connect(m_localemain, SIGNAL(languageChanged()),
- this, SIGNAL(languageChanged()));
+ connect(m_localemain, TQT_SIGNAL(localeChanged()),
+ this, TQT_SIGNAL(localeChanged()));
+ connect(m_localemain, TQT_SIGNAL(languageChanged()),
+ this, TQT_SIGNAL(languageChanged()));
// run the slots on the childs
- connect(this, SIGNAL(localeChanged()),
- m_localemain, SLOT(slotLocaleChanged()));
- connect(this, SIGNAL(localeChanged()),
- m_localenum, SLOT(slotLocaleChanged()));
- connect(this, SIGNAL(localeChanged()),
- m_localemon, SLOT(slotLocaleChanged()));
- connect(this, SIGNAL(localeChanged()),
- m_localetime, SLOT(slotLocaleChanged()));
- connect(this, SIGNAL(localeChanged()),
- m_localeother, SLOT(slotLocaleChanged()));
+ connect(this, TQT_SIGNAL(localeChanged()),
+ m_localemain, TQT_SLOT(slotLocaleChanged()));
+ connect(this, TQT_SIGNAL(localeChanged()),
+ m_localenum, TQT_SLOT(slotLocaleChanged()));
+ connect(this, TQT_SIGNAL(localeChanged()),
+ m_localemon, TQT_SLOT(slotLocaleChanged()));
+ connect(this, TQT_SIGNAL(localeChanged()),
+ m_localetime, TQT_SLOT(slotLocaleChanged()));
+ connect(this, TQT_SIGNAL(localeChanged()),
+ m_localeother, TQT_SLOT(slotLocaleChanged()));
// keep the example up to date
// NOTE: this will make the sample be updated 6 times the first time
// because combo boxes++ emits the change signal not only when the user changes
// it, but also when it's changed by the program.
- connect(m_localenum, SIGNAL(localeChanged()),
- m_sample, SLOT(slotLocaleChanged()));
- connect(m_localemon, SIGNAL(localeChanged()),
- m_sample, SLOT(slotLocaleChanged()));
- connect(m_localetime, SIGNAL(localeChanged()),
- m_sample, SLOT(slotLocaleChanged()));
+ connect(m_localenum, TQT_SIGNAL(localeChanged()),
+ m_sample, TQT_SLOT(slotLocaleChanged()));
+ connect(m_localemon, TQT_SIGNAL(localeChanged()),
+ m_sample, TQT_SLOT(slotLocaleChanged()));
+ connect(m_localetime, TQT_SIGNAL(localeChanged()),
+ m_sample, TQT_SLOT(slotLocaleChanged()));
// No examples for this yet
- //connect(m_localeother, SIGNAL(slotLocaleChanged()),
- //m_sample, SLOT(slotLocaleChanged()));
- connect(this, SIGNAL(localeChanged()),
- m_sample, SLOT(slotLocaleChanged()));
+ //connect(m_localeother, TQT_SIGNAL(slotLocaleChanged()),
+ //m_sample, TQT_SLOT(slotLocaleChanged()));
+ connect(this, TQT_SIGNAL(localeChanged()),
+ m_sample, TQT_SLOT(slotLocaleChanged()));
// make sure we always have translated interface
- connect(this, SIGNAL(languageChanged()),
- this, SLOT(slotTranslate()));
- connect(this, SIGNAL(languageChanged()),
- m_localemain, SLOT(slotTranslate()));
- connect(this, SIGNAL(languageChanged()),
- m_localenum, SLOT(slotTranslate()));
- connect(this, SIGNAL(languageChanged()),
- m_localemon, SLOT(slotTranslate()));
- connect(this, SIGNAL(languageChanged()),
- m_localetime, SLOT(slotTranslate()));
- connect(this, SIGNAL(languageChanged()),
- m_localeother, SLOT(slotTranslate()));
+ connect(this, TQT_SIGNAL(languageChanged()),
+ this, TQT_SLOT(slotTranslate()));
+ connect(this, TQT_SIGNAL(languageChanged()),
+ m_localemain, TQT_SLOT(slotTranslate()));
+ connect(this, TQT_SIGNAL(languageChanged()),
+ m_localenum, TQT_SLOT(slotTranslate()));
+ connect(this, TQT_SIGNAL(languageChanged()),
+ m_localemon, TQT_SLOT(slotTranslate()));
+ connect(this, TQT_SIGNAL(languageChanged()),
+ m_localetime, TQT_SLOT(slotTranslate()));
+ connect(this, TQT_SIGNAL(languageChanged()),
+ m_localeother, TQT_SLOT(slotTranslate()));
// mark it as changed when we change it.
- connect(m_localemain, SIGNAL(localeChanged()),
- SLOT(slotChanged()));
- connect(m_localenum, SIGNAL(localeChanged()),
- SLOT(slotChanged()));
- connect(m_localemon, SIGNAL(localeChanged()),
- SLOT(slotChanged()));
- connect(m_localetime, SIGNAL(localeChanged()),
- SLOT(slotChanged()));
- connect(m_localeother, SIGNAL(localeChanged()),
- SLOT(slotChanged()));
+ connect(m_localemain, TQT_SIGNAL(localeChanged()),
+ TQT_SLOT(slotChanged()));
+ connect(m_localenum, TQT_SIGNAL(localeChanged()),
+ TQT_SLOT(slotChanged()));
+ connect(m_localemon, TQT_SIGNAL(localeChanged()),
+ TQT_SLOT(slotChanged()));
+ connect(m_localetime, TQT_SIGNAL(localeChanged()),
+ TQT_SLOT(slotChanged()));
+ connect(m_localeother, TQT_SIGNAL(localeChanged()),
+ TQT_SLOT(slotChanged()));
load();
}
@@ -162,7 +162,7 @@ void KLocaleApplication::load( bool useDefaults )
{
m_globalConfig->setReadDefaults( useDefaults );
m_globalConfig->reparseConfiguration();
- *m_locale = KLocale(QString::fromLatin1("kcmlocale"), m_globalConfig);
+ *m_locale = KLocale(TQString::fromLatin1("kcmlocale"), m_globalConfig);
emit localeChanged();
emit languageChanged();
@@ -180,7 +180,7 @@ void KLocaleApplication::save()
"language of all programs, you will have to "
"logout first."),
m_locale->translate("Applying Language Settings"),
- QString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms"));
+ TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms"));
// restore the old global locale
KGlobal::_locale = lsave;
@@ -211,7 +211,7 @@ void KLocaleApplication::defaults()
load( true );
}
-QString KLocaleApplication::quickHelp() const
+TQString KLocaleApplication::quickHelp() const
{
return m_locale->translate("<h1>Country/Region & Language</h1>\n"
"<p>From here you can configure language, numeric, and time \n"
@@ -224,11 +224,11 @@ QString KLocaleApplication::quickHelp() const
void KLocaleApplication::slotTranslate()
{
- // The untranslated string for QLabel are stored in
+ // The untranslated string for TQLabel are stored in
// the name() so we use that when retranslating
- QObject *wc;
- QObjectList *list = queryList("QWidget");
- QObjectListIt it(*list);
+ TQObject *wc;
+ TQObjectList *list = queryList("TQWidget");
+ TQObjectListIt it(*list);
while ( (wc = it.current()) != 0 )
{
++it;
@@ -243,16 +243,16 @@ void KLocaleApplication::slotTranslate()
if (::qstrcmp(wc->name(), "unnamed") == 0)
continue;
- if (::qstrcmp(wc->className(), "QLabel") == 0)
- ((QLabel *)wc)->setText( m_locale->translate( wc->name() ) );
- else if (::qstrcmp(wc->className(), "QGroupBox") == 0 ||
- ::qstrcmp(wc->className(), "QVGroupBox") == 0)
- ((QGroupBox *)wc)->setTitle( m_locale->translate( wc->name() ) );
- else if (::qstrcmp(wc->className(), "QPushButton") == 0 ||
+ if (::qstrcmp(wc->className(), "TQLabel") == 0)
+ ((TQLabel *)wc)->setText( m_locale->translate( wc->name() ) );
+ else if (::qstrcmp(wc->className(), "TQGroupBox") == 0 ||
+ ::qstrcmp(wc->className(), "TQVGroupBox") == 0)
+ ((TQGroupBox *)wc)->setTitle( m_locale->translate( wc->name() ) );
+ else if (::qstrcmp(wc->className(), "TQPushButton") == 0 ||
::qstrcmp(wc->className(), "KMenuButton") == 0)
- ((QPushButton *)wc)->setText( m_locale->translate( wc->name() ) );
- else if (::qstrcmp(wc->className(), "QCheckBox") == 0)
- ((QCheckBox *)wc)->setText( m_locale->translate( wc->name() ) );
+ ((TQPushButton *)wc)->setText( m_locale->translate( wc->name() ) );
+ else if (::qstrcmp(wc->className(), "TQCheckBox") == 0)
+ ((TQCheckBox *)wc)->setText( m_locale->translate( wc->name() ) );
}
delete list;
diff --git a/kcontrol/locale/toplevel.h b/kcontrol/locale/toplevel.h
index 746f22a69..cd27cd441 100644
--- a/kcontrol/locale/toplevel.h
+++ b/kcontrol/locale/toplevel.h
@@ -45,14 +45,14 @@ class KLocaleApplication : public KCModule
Q_OBJECT
public:
- KLocaleApplication(QWidget *parent, const char *name, const QStringList &);
+ KLocaleApplication(TQWidget *parent, const char *name, const TQStringList &);
virtual ~KLocaleApplication();
virtual void load();
virtual void load(bool useDefault);
virtual void save();
virtual void defaults();
- virtual QString quickHelp() const;
+ virtual TQString quickHelp() const;
signals:
void languageChanged();
@@ -68,20 +68,20 @@ public slots:
private:
KLocale *m_locale;
- QTabWidget *m_tab;
+ TQTabWidget *m_tab;
KLocaleConfig *m_localemain;
KLocaleConfigNumber *m_localenum;
KLocaleConfigMoney *m_localemon;
KLocaleConfigTime *m_localetime;
KLocaleConfigOther *m_localeother;
- QGroupBox *m_gbox;
+ TQGroupBox *m_gbox;
KLocaleSample *m_sample;
KConfig * m_globalConfig;
KConfig * m_nullConfig;
};
-typedef KGenericFactory<KLocaleApplication, QWidget > KLocaleFactory;
+typedef KGenericFactory<KLocaleApplication, TQWidget > KLocaleFactory;
#endif
diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp
index 97bb9f42b..5bc340f7b 100644
--- a/kcontrol/nics/nic.cpp
+++ b/kcontrol/nics/nic.cpp
@@ -35,11 +35,11 @@
#include <kgenericfactory.h>
#include <kglobal.h>
-#include <qlayout.h>
-#include <qlistview.h>
-#include <qpushbutton.h>
-#include <qtabwidget.h>
-#include <qtimer.h>
+#include <tqlayout.h>
+#include <tqlistview.h>
+#include <tqpushbutton.h>
+#include <tqtabwidget.h>
+#include <tqtimer.h>
#include "nic.h"
@@ -64,31 +64,31 @@
#include <ifaddrs.h>
#include <netdb.h>
- QString flags_tos (unsigned int flags);
+ TQString flags_tos (unsigned int flags);
#endif
-typedef KGenericFactory<KCMNic, QWidget> KCMNicFactory;
+typedef KGenericFactory<KCMNic, TQWidget> KCMNicFactory;
K_EXPORT_COMPONENT_FACTORY (kcm_nic, KCMNicFactory("kcmnic"))
struct MyNIC
{
- QString name;
- QString addr;
- QString netmask;
- QString state;
- QString type;
- QString HWaddr;
+ TQString name;
+ TQString addr;
+ TQString netmask;
+ TQString state;
+ TQString type;
+ TQString HWaddr;
};
-typedef QPtrList<MyNIC> NICList;
+typedef TQPtrList<MyNIC> NICList;
NICList* findNICs();
-KCMNic::KCMNic(QWidget *parent, const char * name, const QStringList &)
+KCMNic::KCMNic(TQWidget *parent, const char * name, const TQStringList &)
:KCModule(KCMNicFactory::instance(), parent,name)
{
- QVBoxLayout *box=new QVBoxLayout(this, 0, KDialog::spacingHint());
- m_list=new QListView(this);
+ TQVBoxLayout *box=new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ m_list=new TQListView(this);
box->addWidget(m_list);
m_list->addColumn(i18n("Name"));
m_list->addColumn(i18n("IP Address"));
@@ -97,14 +97,14 @@ KCMNic::KCMNic(QWidget *parent, const char * name, const QStringList &)
m_list->addColumn(i18n("State"));
m_list->addColumn(i18n("HWaddr"));
m_list->setAllColumnsShowFocus(true);
- QHBoxLayout *hbox=new QHBoxLayout(box);
- m_updateButton=new QPushButton(i18n("&Update"),this);
+ TQHBoxLayout *hbox=new TQHBoxLayout(box);
+ m_updateButton=new TQPushButton(i18n("&Update"),this);
hbox->addWidget(m_updateButton);
hbox->addStretch(1);
- QTimer* timer=new QTimer(this);
+ TQTimer* timer=new TQTimer(this);
timer->start(60000);
- connect(m_updateButton,SIGNAL(clicked()),this,SLOT(update()));
- connect(timer,SIGNAL(timeout()),this,SLOT(update()));
+ connect(m_updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(update()));
+ connect(timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update()));
update();
KAboutData *about =
new KAboutData(I18N_NOOP("kcminfo"),
@@ -123,17 +123,17 @@ void KCMNic::update()
NICList *nics=findNICs();
nics->setAutoDelete(true);
for (MyNIC* tmp=nics->first(); tmp!=0; tmp=nics->next())
- new QListViewItem(m_list,tmp->name, tmp->addr, tmp->netmask, tmp->type, tmp->state, tmp->HWaddr);
+ new TQListViewItem(m_list,tmp->name, tmp->addr, tmp->netmask, tmp->type, tmp->state, tmp->HWaddr);
delete nics;
}
-static QString HWaddr2String( char *hwaddr )
+static TQString HWaddr2String( char *hwaddr )
{
- QString ret;
+ TQString ret;
int i;
for (i=0; i<6; i++, hwaddr++) {
int v = (*hwaddr & 0xff);
- QString num = QString("%1").arg(v,0,16);
+ TQString num = TQString("%1").arg(v,0,16);
if (num.length() < 2)
num.prepend("0");
if (i>0)
@@ -145,8 +145,8 @@ static QString HWaddr2String( char *hwaddr )
NICList* findNICs()
{
- QString upMessage( i18n("State of network card is connected", "Up") );
- QString downMessage( i18n("State of network card is disconnected", "Down") );
+ TQString upMessage( i18n("State of network card is connected", "Up") );
+ TQString downMessage( i18n("State of network card is disconnected", "Down") );
NICList* nl=new NICList;
nl->setAutoDelete(true);
@@ -289,30 +289,30 @@ NICList* findNICs()
#if defined(HAVE_GETNAMEINFO) && defined(HAVE_GETIFADDRS)
-QString flags_tos (unsigned int flags)
+TQString flags_tos (unsigned int flags)
{
- QString tmp;
+ TQString tmp;
if (flags & IFF_POINTOPOINT) {
tmp += i18n("Point to Point");
}
if (flags & IFF_BROADCAST) {
if (tmp.length()) {
- tmp += QString::fromLatin1(", ");
+ tmp += TQString::fromLatin1(", ");
}
tmp += i18n("Broadcast");
}
if (flags & IFF_MULTICAST) {
if (tmp.length()) {
- tmp += QString::fromLatin1(", ");
+ tmp += TQString::fromLatin1(", ");
}
tmp += i18n("Multicast");
}
if (flags & IFF_LOOPBACK) {
if (tmp.length()) {
- tmp += QString::fromLatin1(", ");
+ tmp += TQString::fromLatin1(", ");
}
tmp += i18n("Loopback");
}
diff --git a/kcontrol/nics/nic.h b/kcontrol/nics/nic.h
index c7711701a..87938cf8f 100644
--- a/kcontrol/nics/nic.h
+++ b/kcontrol/nics/nic.h
@@ -31,14 +31,14 @@ class KCMNic:public KCModule
{
Q_OBJECT
public:
- KCMNic(QWidget *parent=0, const char * name=0, const QStringList &list = QStringList( ));
+ KCMNic(TQWidget *parent=0, const char * name=0, const TQStringList &list = TQStringList( ));
protected slots:
void update();
protected:
- QListView *m_list;
- QPushButton *m_updateButton;
+ TQListView *m_list;
+ TQPushButton *m_updateButton;
};
#endif
diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp
index be4b57387..b85dca5d8 100644
--- a/kcontrol/performance/kcmperformance.cpp
+++ b/kcontrol/performance/kcmperformance.cpp
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlayout.h>
-#include <qtabwidget.h>
+#include <tqlayout.h>
+#include <tqtabwidget.h>
#include <klocale.h>
#include <kdialog.h>
@@ -28,12 +28,12 @@
extern "C"
{
- KDE_EXPORT KCModule* create_performance( QWidget* parent_P, const char* name_P )
+ KDE_EXPORT KCModule* create_performance( TQWidget* parent_P, const char* name_P )
{
return new KCMPerformance::Config( parent_P, name_P );
}
- KDE_EXPORT KCModule* create_konqueror( QWidget* parent_P, const char* name_P )
+ KDE_EXPORT KCModule* create_konqueror( TQWidget* parent_P, const char* name_P )
{
return new KCMPerformance::KonquerorConfig( parent_P, name_P );
}
@@ -42,21 +42,21 @@ extern "C"
namespace KCMPerformance
{
-Config::Config( QWidget* parent_P, const char* )
+Config::Config( TQWidget* parent_P, const char* )
: KCModule( parent_P, "kcmperformance" )
{
setQuickHelp( i18n( "<h1>KDE Performance</h1>"
" You can configure settings that improve KDE performance here." ));
- QVBoxLayout *topLayout = new QVBoxLayout( this );
- QTabWidget* tabs = new QTabWidget( this );
+ TQVBoxLayout *topLayout = new TQVBoxLayout( this );
+ TQTabWidget* tabs = new TQTabWidget( this );
konqueror_widget = new Konqueror( tabs );
konqueror_widget->layout()->setMargin( KDialog::marginHint() );
- connect( konqueror_widget, SIGNAL( changed()), SLOT( changed()));
+ connect( konqueror_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed()));
tabs->addTab( konqueror_widget, i18n( "Konqueror" ));
system_widget = new SystemWidget( tabs );
system_widget->layout()->setMargin( KDialog::marginHint() );
- connect( system_widget, SIGNAL( changed()), SLOT( changed()));
+ connect( system_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed()));
tabs->addTab( system_widget, i18n( "System" ));
topLayout->add( tabs );
load();
@@ -85,7 +85,7 @@ void Config::defaults()
load( true );
}
-KonquerorConfig::KonquerorConfig( QWidget* parent_P, const char* )
+KonquerorConfig::KonquerorConfig( TQWidget* parent_P, const char* )
: KCModule( parent_P, "kcmperformance" )
{
setQuickHelp( i18n( "<h1>Konqueror Performance</h1>"
@@ -93,9 +93,9 @@ KonquerorConfig::KonquerorConfig( QWidget* parent_P, const char* )
" These include options for reusing already running instances"
" and for keeping instances preloaded." ));
- QVBoxLayout *topLayout = new QVBoxLayout( this );
+ TQVBoxLayout *topLayout = new TQVBoxLayout( this );
widget = new Konqueror( this );
- connect( widget, SIGNAL( changed()), SLOT( changed()));
+ connect( widget, TQT_SIGNAL( changed()), TQT_SLOT( changed()));
topLayout->add( widget );
load();
}
diff --git a/kcontrol/performance/kcmperformance.h b/kcontrol/performance/kcmperformance.h
index 13c3f9465..bb924b880 100644
--- a/kcontrol/performance/kcmperformance.h
+++ b/kcontrol/performance/kcmperformance.h
@@ -32,7 +32,7 @@ class Config
{
Q_OBJECT
public:
- Config( QWidget* parent_P, const char* name_P );
+ Config( TQWidget* parent_P, const char* name_P );
virtual void load();
virtual void load( bool useDefaults );
virtual void save();
@@ -47,7 +47,7 @@ class KonquerorConfig
{
Q_OBJECT
public:
- KonquerorConfig( QWidget* parent_P, const char* name_P );
+ KonquerorConfig( TQWidget* parent_P, const char* name_P );
virtual void load();
virtual void load( bool useDefaults );
virtual void save();
diff --git a/kcontrol/performance/konqueror.cpp b/kcontrol/performance/konqueror.cpp
index 02dde4cce..909f989bd 100644
--- a/kcontrol/performance/konqueror.cpp
+++ b/kcontrol/performance/konqueror.cpp
@@ -20,23 +20,23 @@
#include <dcopref.h>
#include <kconfig.h>
-#include <qwhatsthis.h>
-#include <qradiobutton.h>
-#include <qspinbox.h>
-#include <qlabel.h>
-#include <qcheckbox.h>
+#include <tqwhatsthis.h>
+#include <tqradiobutton.h>
+#include <tqspinbox.h>
+#include <tqlabel.h>
+#include <tqcheckbox.h>
#include <klocale.h>
namespace KCMPerformance
{
-Konqueror::Konqueror( QWidget* parent_P )
+Konqueror::Konqueror( TQWidget* parent_P )
: Konqueror_ui( parent_P )
{
- QWhatsThis::add( rb_never_reuse,
+ TQWhatsThis::add( rb_never_reuse,
i18n( "Disables the minimization of memory usage and allows you "
"to make each browsing activity independent from the others" ));
- QWhatsThis::add( rb_file_browsing_reuse,
+ TQWhatsThis::add( rb_file_browsing_reuse,
i18n( "With this option activated, only one instance of Konqueror "
"used for file browsing will exist in the memory of your computer "
"at any moment, "
@@ -44,43 +44,43 @@ Konqueror::Konqueror( QWidget* parent_P )
"thus reducing resource requirements."
"<p>Be aware that this also means that, if something goes wrong, "
"all your file browsing windows will be closed simultaneously" ));
- QWhatsThis::add( rb_always_reuse,
+ TQWhatsThis::add( rb_always_reuse,
i18n( "With this option activated, only one instance of Konqueror "
"will exist in the memory of your computer at any moment, "
"no matter how many browsing windows you open, "
"thus reducing resource requirements."
"<p>Be aware that this also means that, if something goes wrong, "
"all your browsing windows will be closed simultaneously." ));
- connect( rb_never_reuse, SIGNAL( clicked()), SIGNAL( changed()));
- connect( rb_file_browsing_reuse, SIGNAL( clicked()), SIGNAL( changed()));
- connect( rb_always_reuse, SIGNAL( clicked()), SIGNAL( changed()));
+ connect( rb_never_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
+ connect( rb_file_browsing_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
+ connect( rb_always_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
rb_file_browsing_reuse->setChecked( true );
- QString tmp =
+ TQString tmp =
i18n( "If non-zero, this option allows keeping Konqueror instances "
"in memory after all their windows have been closed, up to the "
"number specified in this option."
"<p>When a new Konqueror instance is needed, one of these preloaded "
"instances will be reused instead, improving responsiveness at "
"the expense of the memory required by the preloaded instances." );
- QWhatsThis::add( sb_preload_count, tmp );
- QWhatsThis::add( lb_preload_count, tmp );
- QWhatsThis::add( cb_preload_on_startup,
+ TQWhatsThis::add( sb_preload_count, tmp );
+ TQWhatsThis::add( lb_preload_count, tmp );
+ TQWhatsThis::add( cb_preload_on_startup,
i18n( "If enabled, an instance of Konqueror will be preloaded after the ordinary KDE "
"startup sequence."
"<p>This will make the first Konqueror window open faster, but "
"at the expense of longer KDE startup times (but you will be able to work "
"while it is loading, so you may not even notice that it is taking longer)." ));
- QWhatsThis::add( cb_always_have_preloaded,
+ TQWhatsThis::add( cb_always_have_preloaded,
i18n( "If enabled, KDE will always try to have one preloaded Konqueror instance ready; "
"preloading a new instance in the background whenever there is not one available, "
"so that windows will always open quickly."
"<p><b>Warning:</b> In some cases, it is actually possible that this will "
"reduce perceived performance." ));
- connect( sb_preload_count, SIGNAL( valueChanged( int )), SLOT( preload_count_changed( int )));
- connect( sb_preload_count, SIGNAL( valueChanged( int )), SIGNAL( changed()));
- connect( cb_preload_on_startup, SIGNAL( clicked()), SIGNAL( changed()));
- connect( cb_always_have_preloaded, SIGNAL( clicked()), SIGNAL( changed()));
+ connect( sb_preload_count, TQT_SIGNAL( valueChanged( int )), TQT_SLOT( preload_count_changed( int )));
+ connect( sb_preload_count, TQT_SIGNAL( valueChanged( int )), TQT_SIGNAL( changed()));
+ connect( cb_preload_on_startup, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
+ connect( cb_always_have_preloaded, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
defaults();
}
diff --git a/kcontrol/performance/konqueror.h b/kcontrol/performance/konqueror.h
index bc17d2e4e..e948f6b7a 100644
--- a/kcontrol/performance/konqueror.h
+++ b/kcontrol/performance/konqueror.h
@@ -29,7 +29,7 @@ class Konqueror
{
Q_OBJECT
public:
- Konqueror( QWidget* parent_P = NULL );
+ Konqueror( TQWidget* parent_P = NULL );
void load(bool useDefaults);
void save();
void defaults();
@@ -38,7 +38,7 @@ class Konqueror
private slots:
void preload_count_changed( int );
private:
- QString allowed_parts;
+ TQString allowed_parts;
};
} // namespace
diff --git a/kcontrol/performance/system.cpp b/kcontrol/performance/system.cpp
index 97b5c5709..4a9ee001a 100644
--- a/kcontrol/performance/system.cpp
+++ b/kcontrol/performance/system.cpp
@@ -19,18 +19,18 @@
#include "system.h"
#include <kconfig.h>
-#include <qwhatsthis.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
+#include <tqwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
#include <klocale.h>
namespace KCMPerformance
{
-SystemWidget::SystemWidget( QWidget* parent_P )
+SystemWidget::SystemWidget( TQWidget* parent_P )
: System_ui( parent_P )
{
- QString tmp =
+ TQString tmp =
i18n( "<p>During startup KDE needs to perform a check of its system configuration"
" (mimetypes, installed applications, etc.), and in case the configuration"
" has changed since the last time, the system configuration cache (KSyCoCa)"
@@ -49,9 +49,9 @@ SystemWidget::SystemWidget( QWidget* parent_P )
" handler will refuse to provide backtrace for the bugreport with this option"
" turned on (you will need to reproduce it again with this option turned off,"
" or turn on the developer mode for the crash handler).</p>" );
- QWhatsThis::add( cb_disable_kbuildsycoca, tmp );
- QWhatsThis::add( label_kbuildsycoca, tmp );
- connect( cb_disable_kbuildsycoca, SIGNAL( clicked()), SIGNAL( changed()));
+ TQWhatsThis::add( cb_disable_kbuildsycoca, tmp );
+ TQWhatsThis::add( label_kbuildsycoca, tmp );
+ connect( cb_disable_kbuildsycoca, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
defaults();
}
diff --git a/kcontrol/performance/system.h b/kcontrol/performance/system.h
index d788b2073..1358c8e79 100644
--- a/kcontrol/performance/system.h
+++ b/kcontrol/performance/system.h
@@ -31,7 +31,7 @@ class SystemWidget
{
Q_OBJECT
public:
- SystemWidget( QWidget* parent_P = NULL );
+ SystemWidget( TQWidget* parent_P = NULL );
void load( bool useDefaults );
void save();
void defaults();
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index cad01a169..bbf5e088a 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -30,9 +30,9 @@
#include <krecentdocument.h>
#include <kstandarddirs.h>
-#include <qstringlist.h>
-#include <qfile.h>
-#include <qdir.h>
+#include <tqstringlist.h>
+#include <tqfile.h>
+#include <tqdir.h>
KPrivacyManager::KPrivacyManager()
{
@@ -52,22 +52,22 @@ bool KPrivacyManager::clearThumbnails()
// http://freedesktop.org/Standards/Home
// http://triq.net/~jens/thumbnail-spec/index.html
- QDir thumbnailDir( QDir::homeDirPath() + "/.thumbnails/normal");
- thumbnailDir.setFilter( QDir::Files );
- QStringList entries = thumbnailDir.entryList();
- for( QStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it)
+ TQDir thumbnailDir( TQDir::homeDirPath() + "/.thumbnails/normal");
+ thumbnailDir.setFilter( TQDir::Files );
+ TQStringList entries = thumbnailDir.entryList();
+ for( TQStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it)
if(!thumbnailDir.remove(*it)) m_error = true;
if(m_error) return m_error;
- thumbnailDir.setPath(QDir::homeDirPath() + "/.thumbnails/large");
+ thumbnailDir.setPath(TQDir::homeDirPath() + "/.thumbnails/large");
entries = thumbnailDir.entryList();
- for( QStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it)
+ for( TQStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it)
if(!thumbnailDir.remove(*it)) m_error = true;
if(m_error) return m_error;
- thumbnailDir.setPath(QDir::homeDirPath() + "/.thumbnails/fail");
+ thumbnailDir.setPath(TQDir::homeDirPath() + "/.thumbnails/fail");
entries = thumbnailDir.entryList();
- for( QStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it)
+ for( TQStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it)
if(!thumbnailDir.remove(*it)) m_error = true;
return m_error;
@@ -103,7 +103,7 @@ bool KPrivacyManager::clearSavedClipboardContents()
bool KPrivacyManager::clearFormCompletion() const
{
- QFile completionFile(locateLocal("data", "khtml/formcompletions"));
+ TQFile completionFile(locateLocal("data", "khtml/formcompletions"));
return completionFile.remove();
}
@@ -128,7 +128,7 @@ bool KPrivacyManager::clearQuickStartMenu() const
bool KPrivacyManager::clearWebHistory()
{
- QStringList args("--preload");
+ TQStringList args("--preload");
// preload Konqueror if it is not running
if(!isApplicationRegistered("konqueror"))
@@ -138,24 +138,24 @@ bool KPrivacyManager::clearWebHistory()
}
return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
- "notifyClear(QCString)", "" );
+ "notifyClear(TQCString)", "" );
}
bool KPrivacyManager::clearFavIcons()
{
- QDir favIconDir(KGlobal::dirs()->saveLocation( "cache", "favicons/" ));
- favIconDir.setFilter( QDir::Files );
+ TQDir favIconDir(KGlobal::dirs()->saveLocation( "cache", "favicons/" ));
+ favIconDir.setFilter( TQDir::Files );
- QStringList entries = favIconDir.entryList();
+ TQStringList entries = favIconDir.entryList();
// erase all files in favicon directory
- for( QStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it)
+ for( TQStringList::Iterator it = entries.begin() ; it != entries.end() ; ++it)
if(!favIconDir.remove(*it)) m_error = true;
return m_error;
}
-bool KPrivacyManager::isApplicationRegistered(const QString &appName)
+bool KPrivacyManager::isApplicationRegistered(const TQString &appName)
{
QCStringList regApps = kapp->dcopClient()->registeredApplications();
diff --git a/kcontrol/privacy/kprivacymanager.h b/kcontrol/privacy/kprivacymanager.h
index 114618577..6d950c903 100644
--- a/kcontrol/privacy/kprivacymanager.h
+++ b/kcontrol/privacy/kprivacymanager.h
@@ -21,7 +21,7 @@
#ifndef KPRIVACYMANAGER_H
#define KPRIVACYMANAGER_H
-#include <qobject.h>
+#include <tqobject.h>
/**
@author Ralf Hoelzer
@@ -47,7 +47,7 @@ public:
bool clearFavIcons();
private:
- bool isApplicationRegistered(const QString &appName);
+ bool isApplicationRegistered(const TQString &appName);
bool m_error;
};
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index c0287ceba..c5d24397c 100644
--- a/kcontrol/privacy/privacy.cpp
+++ b/kcontrol/privacy/privacy.cpp
@@ -18,13 +18,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qcheckbox.h>
-#include <qlayout.h>
-#include <qptrlist.h>
-#include <qpushbutton.h>
-#include <qtabwidget.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqlayout.h>
+#include <tqptrlist.h>
+#include <tqpushbutton.h>
+#include <tqtabwidget.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
#include <kaboutdata.h>
#include <kconfig.h>
@@ -37,7 +37,7 @@
#include "privacy.h"
-Privacy::Privacy(QWidget *parent, const char *name)
+Privacy::Privacy(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
setQuickHelp( i18n("The privacy module allows a user to erase traces which KDE leaves on "
@@ -56,10 +56,10 @@ Privacy::Privacy(QWidget *parent, const char *name)
m_privacymanager = new KPrivacyManager();
- QBoxLayout *top = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQBoxLayout *top = new TQVBoxLayout(this, 0, KDialog::spacingHint());
// add this once the P3P stuff is finished
- //QTabWidget *privacyTabs = new QTabWidget(this, "privacytabs");
+ //TQTabWidget *privacyTabs = new TQTabWidget(this, "privacytabs");
cleaningDialog = new KCMPrivacyDialog(this);
//p3pSettings = new KPrivacySettings(this);
@@ -78,7 +78,7 @@ Privacy::Privacy(QWidget *parent, const char *name)
sw->setRootIsDecorated(true);
sw->setTooltipColumn(1);
- sw->setColumnWidthMode(0, QListView::Maximum);
+ sw->setColumnWidthMode(0, TQListView::Maximum);
@@ -88,29 +88,29 @@ Privacy::Privacy(QWidget *parent, const char *name)
generalCLI->setOpen(true);
webbrowsingCLI->setOpen(true);
- clearThumbnails = new QCheckListItem(generalCLI,
- i18n("Thumbnail Cache"),QCheckListItem::CheckBox);
- clearRunCommandHistory = new QCheckListItem(generalCLI,
- i18n("Run Command History"),QCheckListItem::CheckBox);
- clearAllCookies = new QCheckListItem(webbrowsingCLI,
- i18n("Cookies"),QCheckListItem::CheckBox);
- clearSavedClipboardContents = new QCheckListItem(generalCLI,
- i18n("Saved Clipboard Contents"),QCheckListItem::CheckBox);
- clearWebHistory = new QCheckListItem(webbrowsingCLI,
- i18n("Web History"),QCheckListItem::CheckBox);
- clearWebCache = new QCheckListItem(webbrowsingCLI,
- i18n("Web Cache"),QCheckListItem::CheckBox);
- clearFormCompletion = new QCheckListItem(webbrowsingCLI,
- i18n("Form Completion Entries"),QCheckListItem::CheckBox);
- clearRecentDocuments = new QCheckListItem(generalCLI,
- i18n("Recent Documents"),QCheckListItem::CheckBox);
- clearQuickStartMenu = new QCheckListItem(generalCLI,
- i18n("Quick Start Menu"),QCheckListItem::CheckBox);
- clearFavIcons = new QCheckListItem(webbrowsingCLI,
- i18n("Favorite Icons"),QCheckListItem::CheckBox);
-
- QWhatsThis::add(sw, i18n("Check all cleanup actions you would like to perform. These will be executed by pressing the button below"));
- QWhatsThis::add(cleaningDialog->cleanupButton, i18n("Immediately performs the cleanup actions selected above"));
+ clearThumbnails = new TQCheckListItem(generalCLI,
+ i18n("Thumbnail Cache"),TQCheckListItem::CheckBox);
+ clearRunCommandHistory = new TQCheckListItem(generalCLI,
+ i18n("Run Command History"),TQCheckListItem::CheckBox);
+ clearAllCookies = new TQCheckListItem(webbrowsingCLI,
+ i18n("Cookies"),TQCheckListItem::CheckBox);
+ clearSavedClipboardContents = new TQCheckListItem(generalCLI,
+ i18n("Saved Clipboard Contents"),TQCheckListItem::CheckBox);
+ clearWebHistory = new TQCheckListItem(webbrowsingCLI,
+ i18n("Web History"),TQCheckListItem::CheckBox);
+ clearWebCache = new TQCheckListItem(webbrowsingCLI,
+ i18n("Web Cache"),TQCheckListItem::CheckBox);
+ clearFormCompletion = new TQCheckListItem(webbrowsingCLI,
+ i18n("Form Completion Entries"),TQCheckListItem::CheckBox);
+ clearRecentDocuments = new TQCheckListItem(generalCLI,
+ i18n("Recent Documents"),TQCheckListItem::CheckBox);
+ clearQuickStartMenu = new TQCheckListItem(generalCLI,
+ i18n("Quick Start Menu"),TQCheckListItem::CheckBox);
+ clearFavIcons = new TQCheckListItem(webbrowsingCLI,
+ i18n("Favorite Icons"),TQCheckListItem::CheckBox);
+
+ TQWhatsThis::add(sw, i18n("Check all cleanup actions you would like to perform. These will be executed by pressing the button below"));
+ TQWhatsThis::add(cleaningDialog->cleanupButton, i18n("Immediately performs the cleanup actions selected above"));
clearThumbnails->setText(1, i18n("Clears all cached thumbnails"));
clearRunCommandHistory->setText(1, i18n("Clears the history of commands run through the Run Command tool on the desktop"));
@@ -123,7 +123,7 @@ Privacy::Privacy(QWidget *parent, const char *name)
clearQuickStartMenu->setText(1, i18n("Clears the entries from the list of recently started applications"));
clearFavIcons->setText(1, i18n("Clears the FavIcons cached from visited websites"));
- connect(sw, SIGNAL(selectionChanged()), SLOT(changed()));
+ connect(sw, TQT_SIGNAL(selectionChanged()), TQT_SLOT(changed()));
// store all entries in a list for easy access later on
checklist.append(clearThumbnails);
@@ -137,9 +137,9 @@ Privacy::Privacy(QWidget *parent, const char *name)
checklist.append(clearQuickStartMenu);
checklist.append(clearFavIcons);
- connect(cleaningDialog->cleanupButton, SIGNAL(clicked()), SLOT(cleanup()));
- connect(cleaningDialog->selectAllButton, SIGNAL(clicked()), SLOT(selectAll()));
- connect(cleaningDialog->selectNoneButton, SIGNAL(clicked()), SLOT(selectNone()));
+ connect(cleaningDialog->cleanupButton, TQT_SIGNAL(clicked()), TQT_SLOT(cleanup()));
+ connect(cleaningDialog->selectAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectAll()));
+ connect(cleaningDialog->selectNoneButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectNone()));
load();
}
@@ -227,7 +227,7 @@ void Privacy::save()
void Privacy::selectAll()
{
- QCheckListItem *item;
+ TQCheckListItem *item;
for ( item = checklist.first(); item; item = checklist.next() )
item->setOn(true);
@@ -237,7 +237,7 @@ void Privacy::selectAll()
void Privacy::selectNone()
{
- QCheckListItem *item;
+ TQCheckListItem *item;
for ( item = checklist.first(); item; item = checklist.next() )
item->setOn(false);
@@ -253,14 +253,14 @@ void Privacy::cleanup()
cleaningDialog->statusTextEdit->clear();
cleaningDialog->statusTextEdit->setText(i18n("Starting cleanup..."));
- QCheckListItem *item;
+ TQCheckListItem *item;
bool error = false;
for ( item = checklist.first(); item; item = checklist.next() )
{
if(item->isOn())
{
- QString statusText = i18n("Clearing %1...").arg(item->text());
+ TQString statusText = i18n("Clearing %1...").arg(item->text());
cleaningDialog->statusTextEdit->append(statusText);
if(item == clearThumbnails)
@@ -295,7 +295,7 @@ void Privacy::cleanup()
if(error)
{
- QString errorText = i18n("Clearing of %1 failed").arg(item->text());
+ TQString errorText = i18n("Clearing of %1 failed").arg(item->text());
cleaningDialog->statusTextEdit->append(errorText);
}
}
@@ -309,7 +309,7 @@ void Privacy::cleanup()
extern "C"
{
- KDE_EXPORT KCModule *create_privacy(QWidget *parent, const char * /*name*/)
+ KDE_EXPORT KCModule *create_privacy(TQWidget *parent, const char * /*name*/)
{
KGlobal::locale()->insertCatalogue("privacy");
return new Privacy(parent, "Privacy");
diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h
index fcec193c7..69b061f4c 100644
--- a/kcontrol/privacy/privacy.h
+++ b/kcontrol/privacy/privacy.h
@@ -33,7 +33,7 @@ class Privacy: public KCModule
Q_OBJECT
public:
- Privacy( QWidget *parent=0, const char *name=0 );
+ Privacy( TQWidget *parent=0, const char *name=0 );
~Privacy();
virtual void load();
@@ -51,22 +51,22 @@ private:
KPrivacySettings *p3pSettings;
KPrivacyManager *m_privacymanager;
- QPtrList<QCheckListItem> checklist;
+ TQPtrList<TQCheckListItem> checklist;
KListViewItem *generalCLI;
KListViewItem *webbrowsingCLI;
- QCheckListItem *clearThumbnails;
- QCheckListItem *clearRunCommandHistory;
- QCheckListItem *clearAllCookies;
- QCheckListItem *clearSavedClipboardContents;
- QCheckListItem *clearWebHistory;
- QCheckListItem *clearWebCache;
- QCheckListItem *clearFormCompletion;
- QCheckListItem *clearRecentDocuments;
- QCheckListItem *clearQuickStartMenu;
- QCheckListItem *clearFavIcons;
- //QCheckListItem *clearFileDialogHistory;
+ TQCheckListItem *clearThumbnails;
+ TQCheckListItem *clearRunCommandHistory;
+ TQCheckListItem *clearAllCookies;
+ TQCheckListItem *clearSavedClipboardContents;
+ TQCheckListItem *clearWebHistory;
+ TQCheckListItem *clearWebCache;
+ TQCheckListItem *clearFormCompletion;
+ TQCheckListItem *clearRecentDocuments;
+ TQCheckListItem *clearQuickStartMenu;
+ TQCheckListItem *clearFavIcons;
+ //TQCheckListItem *clearFileDialogHistory;
};
diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp
index 681610c66..e97cf4836 100644
--- a/kcontrol/randr/configdialog.cpp
+++ b/kcontrol/randr/configdialog.cpp
@@ -17,13 +17,13 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlistview.h>
-#include <qpushbutton.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qvbuttongroup.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlistview.h>
+#include <tqpushbutton.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
+#include <tqvbuttongroup.h>
#include <assert.h>
#include <kiconloader.h>
@@ -42,9 +42,9 @@ ConfigDialog::ConfigDialog(KGlobalAccel *accel,
Ok, 0L, "config dialog" )
{
if ( isApplet )
- setHelp( QString::null, "krandrtray" );
+ setHelp( TQString::null, "krandrtray" );
- QFrame *w = 0L; // the parent for the widgets
+ TQFrame *w = 0L; // the parent for the widgets
w = addVBoxPage( i18n("Global &Shortcuts") );
keysWidget = new KKeyChooser( accel, w );
@@ -60,8 +60,8 @@ void ConfigDialog::show()
{
if ( !isVisible() ) {
KWinModule module(0, KWinModule::INFO_DESKTOP);
- QSize s1 = sizeHint();
- QSize s2 = module.workArea().size();
+ TQSize s1 = sizeHint();
+ TQSize s2 = module.workArea().size();
int w = s1.width();
int h = s1.height();
diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h
index c307a8aaa..dab9a7bb8 100644
--- a/kcontrol/randr/configdialog.h
+++ b/kcontrol/randr/configdialog.h
@@ -20,12 +20,12 @@
#ifndef CONFIGDIALOG_H
#define CONFIGDIALOG_H
-#include <qcheckbox.h>
-#include <qevent.h>
-#include <qgroupbox.h>
-#include <qheader.h>
-#include <qradiobutton.h>
-#include <qvbox.h>
+#include <tqcheckbox.h>
+#include <tqevent.h>
+#include <tqgroupbox.h>
+#include <tqheader.h>
+#include <tqradiobutton.h>
+#include <tqvbox.h>
#include <kdialogbase.h>
#include <keditlistbox.h>
@@ -59,30 +59,30 @@ private:
class ListView : public KListView
{
public:
- ListView( ConfigDialog* configWidget, QWidget *parent, const char *name )
+ ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name )
: KListView( parent, name ), _configWidget( configWidget ),
_regExpEditor(0L) {}
- // QListView has a weird idea of a sizeHint...
- virtual QSize sizeHint () const {
+ // TQListView has a weird idea of a sizeHint...
+ virtual TQSize sizeHint () const {
int w = minimumSizeHint().width();
int h = header()->height();
h += viewport()->sizeHint().height();
h += horizontalScrollBar()->height();
- QListViewItem *item = firstChild();
+ TQListViewItem *item = firstChild();
while ( item ) {
h += item->totalHeight();
item = item->nextSibling();
}
- return QSize( w, h );
+ return TQSize( w, h );
}
protected:
- virtual void rename( QListViewItem* item, int c );
+ virtual void rename( TQListViewItem* item, int c );
private:
ConfigDialog* _configWidget;
- QDialog* _regExpEditor;
+ TQDialog* _regExpEditor;
};
#endif // CONFIGDIALOG_H
diff --git a/kcontrol/randr/krandrbindings.cpp b/kcontrol/randr/krandrbindings.cpp
index bb694a9bd..4857651a1 100644
--- a/kcontrol/randr/krandrbindings.cpp
+++ b/kcontrol/randr/krandrbindings.cpp
@@ -19,16 +19,16 @@
*/
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4, this, SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) )
#else
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4 )
+ keys->insert( name, i18n(name), TQString::null, key3, key4 )
#endif
#define WIN KKey::QtWIN
keys->insert( "Program:krandrtray", i18n("Display Control") );
- DEF( I18N_NOOP("Switch Displays"), KShortcut::KShortcut(QString("XF86Display")), KShortcut::KShortcut(QString("XF86Display")), slotCycleDisplays() );
+ DEF( I18N_NOOP("Switch Displays"), KShortcut::KShortcut(TQString("XF86Display")), KShortcut::KShortcut(TQString("XF86Display")), slotCycleDisplays() );
#undef DEF
#undef WIN
diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp
index d1d7ec73f..087585d3f 100644
--- a/kcontrol/randr/krandrmodule.cpp
+++ b/kcontrol/randr/krandrmodule.cpp
@@ -16,16 +16,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qdesktopwidget.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
-#include <qvbox.h>
-#include <qvbuttongroup.h>
-#include <qwhatsthis.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqdesktopwidget.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqradiobutton.h>
+#include <tqvbox.h>
+#include <tqvbuttongroup.h>
+#include <tqwhatsthis.h>
#include <kcmodule.h>
#include <kcombobox.h>
@@ -42,7 +42,7 @@
#include <X11/extensions/Xrandr.h>
// DLL Interface for kcontrol
-typedef KGenericFactory<KRandRModule, QWidget > KSSFactory;
+typedef KGenericFactory<KRandRModule, TQWidget > KSSFactory;
K_EXPORT_COMPONENT_FACTORY (kcm_randr, KSSFactory("krandr") )
extern "C"
@@ -73,22 +73,22 @@ void KRandRModule::performApplyOnStartup()
}
}
-KRandRModule::KRandRModule(QWidget *parent, const char *name, const QStringList&)
+KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringList&)
: KCModule(parent, name)
, m_changed(false)
{
if (!isValid()) {
- QVBoxLayout *topLayout = new QVBoxLayout(this);
- topLayout->addWidget(new QLabel(i18n("<qt>Your X server does not support resizing and rotating the display. Please update to version 4.3 or greater. You need the X Resize And Rotate extension (RANDR) version 1.1 or greater to use this feature.</qt>"), this));
+ TQVBoxLayout *topLayout = new TQVBoxLayout(this);
+ topLayout->addWidget(new TQLabel(i18n("<qt>Your X server does not support resizing and rotating the display. Please update to version 4.3 or greater. You need the X Resize And Rotate extension (RANDR) version 1.1 or greater to use this feature.</qt>"), this));
kdWarning() << "Error: " << errorCode() << endl;
return;
}
- QVBoxLayout* topLayout = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
- QHBox* screenBox = new QHBox(this);
+ TQHBox* screenBox = new TQHBox(this);
topLayout->addWidget(screenBox);
- QLabel *screenLabel = new QLabel(i18n("Settings for screen:"), screenBox);
+ TQLabel *screenLabel = new TQLabel(i18n("Settings for screen:"), screenBox);
m_screenSelector = new KComboBox(screenBox);
for (int s = 0; s < numScreens(); s++) {
@@ -97,45 +97,45 @@ KRandRModule::KRandRModule(QWidget *parent, const char *name, const QStringList&
m_screenSelector->setCurrentItem(currentScreenIndex());
screenLabel->setBuddy( m_screenSelector );
- QWhatsThis::add(m_screenSelector, i18n("The screen whose settings you would like to change can be selected using this drop-down list."));
+ TQWhatsThis::add(m_screenSelector, i18n("The screen whose settings you would like to change can be selected using this drop-down list."));
- connect(m_screenSelector, SIGNAL(activated(int)), SLOT(slotScreenChanged(int)));
+ connect(m_screenSelector, TQT_SIGNAL(activated(int)), TQT_SLOT(slotScreenChanged(int)));
if (numScreens() <= 1)
m_screenSelector->setEnabled(false);
- QHBox* sizeBox = new QHBox(this);
+ TQHBox* sizeBox = new TQHBox(this);
topLayout->addWidget(sizeBox);
- QLabel *sizeLabel = new QLabel(i18n("Screen size:"), sizeBox);
+ TQLabel *sizeLabel = new TQLabel(i18n("Screen size:"), sizeBox);
m_sizeCombo = new KComboBox(sizeBox);
- QWhatsThis::add(m_sizeCombo, i18n("The size, otherwise known as the resolution, of your screen can be selected from this drop-down list."));
- connect(m_sizeCombo, SIGNAL(activated(int)), SLOT(slotSizeChanged(int)));
+ TQWhatsThis::add(m_sizeCombo, i18n("The size, otherwise known as the resolution, of your screen can be selected from this drop-down list."));
+ connect(m_sizeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSizeChanged(int)));
sizeLabel->setBuddy( m_sizeCombo );
- QHBox* refreshBox = new QHBox(this);
+ TQHBox* refreshBox = new TQHBox(this);
topLayout->addWidget(refreshBox);
- QLabel *rateLabel = new QLabel(i18n("Refresh rate:"), refreshBox);
+ TQLabel *rateLabel = new TQLabel(i18n("Refresh rate:"), refreshBox);
m_refreshRates = new KComboBox(refreshBox);
- QWhatsThis::add(m_refreshRates, i18n("The refresh rate of your screen can be selected from this drop-down list."));
- connect(m_refreshRates, SIGNAL(activated(int)), SLOT(slotRefreshChanged(int)));
+ TQWhatsThis::add(m_refreshRates, i18n("The refresh rate of your screen can be selected from this drop-down list."));
+ connect(m_refreshRates, TQT_SIGNAL(activated(int)), TQT_SLOT(slotRefreshChanged(int)));
rateLabel->setBuddy( m_refreshRates );
- m_rotationGroup = new QButtonGroup(2, Qt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this);
+ m_rotationGroup = new TQButtonGroup(2, Qt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this);
topLayout->addWidget(m_rotationGroup);
m_rotationGroup->setRadioButtonExclusive(true);
- QWhatsThis::add(m_rotationGroup, i18n("The options in this section allow you to change the rotation of your screen."));
+ TQWhatsThis::add(m_rotationGroup, i18n("The options in this section allow you to change the rotation of your screen."));
- m_applyOnStartup = new QCheckBox(i18n("Apply settings on KDE startup"), this);
+ m_applyOnStartup = new TQCheckBox(i18n("Apply settings on KDE startup"), this);
topLayout->addWidget(m_applyOnStartup);
- QWhatsThis::add(m_applyOnStartup, i18n("If this option is enabled the size and orientation settings will be used when KDE starts."));
- connect(m_applyOnStartup, SIGNAL(clicked()), SLOT(setChanged()));
+ TQWhatsThis::add(m_applyOnStartup, i18n("If this option is enabled the size and orientation settings will be used when KDE starts."));
+ connect(m_applyOnStartup, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged()));
- QHBox* syncBox = new QHBox(this);
- syncBox->layout()->addItem(new QSpacerItem(20, 1, QSizePolicy::Maximum));
- m_syncTrayApp = new QCheckBox(i18n("Allow tray application to change startup settings"), syncBox);
+ TQHBox* syncBox = new TQHBox(this);
+ syncBox->layout()->addItem(new TQSpacerItem(20, 1, TQSizePolicy::Maximum));
+ m_syncTrayApp = new TQCheckBox(i18n("Allow tray application to change startup settings"), syncBox);
topLayout->addWidget(syncBox);
- QWhatsThis::add(m_syncTrayApp, i18n("If this option is enabled, options set by the system tray applet will be saved and loaded when KDE starts instead of being temporary."));
- connect(m_syncTrayApp, SIGNAL(clicked()), SLOT(setChanged()));
+ TQWhatsThis::add(m_syncTrayApp, i18n("If this option is enabled, options set by the system tray applet will be saved and loaded when KDE starts instead of being temporary."));
+ connect(m_syncTrayApp, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged()));
topLayout->addStretch(1);
@@ -143,7 +143,7 @@ KRandRModule::KRandRModule(QWidget *parent, const char *name, const QStringList&
load();
m_syncTrayApp->setEnabled(m_applyOnStartup->isChecked());
- slotScreenChanged(QApplication::desktop()->primaryScreen());
+ slotScreenChanged(TQApplication::desktop()->primaryScreen());
setButtons(KCModule::Apply);
}
@@ -152,13 +152,13 @@ void KRandRModule::addRotationButton(int thisRotation, bool checkbox)
{
Q_ASSERT(m_rotationGroup);
if (!checkbox) {
- QRadioButton* thisButton = new QRadioButton(RandRScreen::rotationName(thisRotation), m_rotationGroup);
+ TQRadioButton* thisButton = new TQRadioButton(RandRScreen::rotationName(thisRotation), m_rotationGroup);
thisButton->setEnabled(thisRotation & currentScreen()->rotations());
- connect(thisButton, SIGNAL(clicked()), SLOT(slotRotationChanged()));
+ connect(thisButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRotationChanged()));
} else {
- QCheckBox* thisButton = new QCheckBox(RandRScreen::rotationName(thisRotation), m_rotationGroup);
+ TQCheckBox* thisButton = new TQCheckBox(RandRScreen::rotationName(thisRotation), m_rotationGroup);
thisButton->setEnabled(thisRotation & currentScreen()->rotations());
- connect(thisButton, SIGNAL(clicked()), SLOT(slotRotationChanged()));
+ connect(thisButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRotationChanged()));
}
}
@@ -243,11 +243,11 @@ void KRandRModule::populateRefreshRates()
{
m_refreshRates->clear();
- QStringList rr = currentScreen()->refreshRates(currentScreen()->proposedSize());
+ TQStringList rr = currentScreen()->refreshRates(currentScreen()->proposedSize());
m_refreshRates->setEnabled(rr.count());
- for (QStringList::Iterator it = rr.begin(); it != rr.end(); ++it)
+ for (TQStringList::Iterator it = rr.begin(); it != rr.end(); ++it)
m_refreshRates->insertItem(*it);
}
diff --git a/kcontrol/randr/krandrmodule.h b/kcontrol/randr/krandrmodule.h
index b542299e8..a8a00a464 100644
--- a/kcontrol/randr/krandrmodule.h
+++ b/kcontrol/randr/krandrmodule.h
@@ -30,7 +30,7 @@ class KRandRModule : public KCModule, public KRandrSimpleAPI
Q_OBJECT
public:
- KRandRModule(QWidget *parent, const char *name, const QStringList& _args);
+ KRandRModule(TQWidget *parent, const char *name, const TQStringList& _args);
virtual void load();
virtual void load(bool useDefaults);
@@ -55,10 +55,10 @@ protected:
KComboBox* m_screenSelector;
KComboBox* m_sizeCombo;
- QButtonGroup* m_rotationGroup;
+ TQButtonGroup* m_rotationGroup;
KComboBox* m_refreshRates;
- QCheckBox* m_applyOnStartup;
- QCheckBox* m_syncTrayApp;
+ TQCheckBox* m_applyOnStartup;
+ TQCheckBox* m_syncTrayApp;
bool m_oldApply;
bool m_oldSyncTrayApp;
diff --git a/kcontrol/randr/krandrpassivepopup.cpp b/kcontrol/randr/krandrpassivepopup.cpp
index 858014014..5cf6fa6b2 100644
--- a/kcontrol/randr/krandrpassivepopup.cpp
+++ b/kcontrol/randr/krandrpassivepopup.cpp
@@ -25,14 +25,14 @@
// widgets moves (needed because after a resolution switch Kicker will
// reposition itself, causing normal KPassivePopup to stay at weird places)
-KRandrPassivePopup::KRandrPassivePopup( QWidget *parent, const char *name, WFlags f )
+KRandrPassivePopup::KRandrPassivePopup( TQWidget *parent, const char *name, WFlags f )
: KPassivePopup( parent, name, f )
{
- connect( &update_timer, SIGNAL( timeout()), SLOT( slotPositionSelf()));
+ connect( &update_timer, TQT_SIGNAL( timeout()), TQT_SLOT( slotPositionSelf()));
}
-KRandrPassivePopup* KRandrPassivePopup::message( const QString &caption, const QString &text,
- const QPixmap &icon, QWidget *parent, const char *name, int timeout )
+KRandrPassivePopup* KRandrPassivePopup::message( const TQString &caption, const TQString &text,
+ const TQPixmap &icon, TQWidget *parent, const char *name, int timeout )
{
KRandrPassivePopup *pop = new KRandrPassivePopup( parent, name );
pop->setAutoDelete( true );
@@ -43,7 +43,7 @@ KRandrPassivePopup* KRandrPassivePopup::message( const QString &caption, const Q
return pop;
}
-void KRandrPassivePopup::startWatchingWidget( QWidget* widget_P )
+void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P )
{
static Atom wm_state = XInternAtom( qt_xdisplay() , "WM_STATE", False );
Window win = widget_P->winId();
@@ -60,7 +60,7 @@ void KRandrPassivePopup::startWatchingWidget( QWidget* widget_P )
break;
win = parent;
- QWidget* widget = QWidget::find( win );
+ TQWidget* widget = TQWidget::find( win );
if( widget != NULL )
{
widget->installEventFilter( this );
@@ -91,11 +91,11 @@ void KRandrPassivePopup::startWatchingWidget( QWidget* widget_P )
kapp->installX11EventFilter( this );
}
-bool KRandrPassivePopup::eventFilter( QObject* o, QEvent* e )
+bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e )
{
- if( e->type() == QEvent::Move && o->isWidgetType()
- && watched_widgets.contains( static_cast< QWidget* >( o )))
- QTimer::singleShot( 0, this, SLOT( slotPositionSelf()));
+ if( e->type() == TQEvent::Move && o->isWidgetType()
+ && watched_widgets.contains( static_cast< TQWidget* >( o )))
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotPositionSelf()));
return false;
}
diff --git a/kcontrol/randr/krandrpassivepopup.h b/kcontrol/randr/krandrpassivepopup.h
index 6e86c336c..3b1d4b4f6 100644
--- a/kcontrol/randr/krandrpassivepopup.h
+++ b/kcontrol/randr/krandrpassivepopup.h
@@ -20,8 +20,8 @@
#define __RANDRPASSIVEPOPUP_H__
#include <kpassivepopup.h>
-#include <qvaluelist.h>
-#include <qtimer.h>
+#include <tqvaluelist.h>
+#include <tqtimer.h>
#include <X11/Xlib.h>
class KRandrPassivePopup
@@ -29,19 +29,19 @@ class KRandrPassivePopup
{
Q_OBJECT
public:
- static KRandrPassivePopup *message( const QString &caption, const QString &text,
- const QPixmap &icon, QWidget *parent, const char *name=0, int timeout = -1 );
+ static KRandrPassivePopup *message( const TQString &caption, const TQString &text,
+ const TQPixmap &icon, TQWidget *parent, const char *name=0, int timeout = -1 );
protected:
- virtual bool eventFilter( QObject* o, QEvent* e );
+ virtual bool eventFilter( TQObject* o, TQEvent* e );
virtual bool x11Event( XEvent* e );
private slots:
void slotPositionSelf();
private:
- KRandrPassivePopup( QWidget *parent=0, const char *name=0, WFlags f=0 );
- void startWatchingWidget( QWidget* w );
- QValueList< QWidget* > watched_widgets;
- QValueList< Window > watched_windows;
- QTimer update_timer;
+ KRandrPassivePopup( TQWidget *parent=0, const char *name=0, WFlags f=0 );
+ void startWatchingWidget( TQWidget* w );
+ TQValueList< TQWidget* > watched_widgets;
+ TQValueList< Window > watched_windows;
+ TQTimer update_timer;
};
#endif
diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index bee4a5e10..4424e4036 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qtimer.h>
-#include <qtooltip.h>
+#include <tqtimer.h>
+#include <tqtooltip.h>
#include <kaction.h>
#include <kapplication.h>
@@ -46,15 +46,15 @@
#define OUTPUT_ON (1 << 3)
#define OUTPUT_ALL (0xf)
-KRandRSystemTray::KRandRSystemTray(QWidget* parent, const char *name)
+KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
: KSystemTray(parent, name)
, m_popupUp(false)
, m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection()))
{
setPixmap(KSystemTray::loadSizedIcon("randr", width()));
setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
- connect(this, SIGNAL(quitSelected()), this, SLOT(_quit()));
- QToolTip::add(this, i18n("Screen resize & rotate"));
+ connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
+ TQToolTip::add(this, i18n("Screen resize & rotate"));
my_parent = parent;
//printf("Reading configuration...\n\r");
@@ -66,10 +66,10 @@ KRandRSystemTray::KRandRSystemTray(QWidget* parent, const char *name)
globalKeys->setEnabled(true);
globalKeys->updateConnections();
- connect(kapp, SIGNAL(settingsChanged(int)), SLOT(slotSettingsChanged(int)));
+ connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
#if (QT_VERSION-0 >= 0x030200) // XRANDR support
-// connect(this, SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), SLOT( desktopResized()));
+// connect(this, TQT_SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), TQT_SLOT( desktopResized()));
#endif
randr_display = XOpenDisplay(NULL);
@@ -81,7 +81,7 @@ KRandRSystemTray::KRandRSystemTray(QWidget* parent, const char *name)
t_config = new KSimpleConfig("kiccconfigrc");
- QString cur_profile;
+ TQString cur_profile;
cur_profile = getCurrentProfile();
if (cur_profile != "") {
applyIccConfiguration(cur_profile, NULL);
@@ -89,14 +89,14 @@ KRandRSystemTray::KRandRSystemTray(QWidget* parent, const char *name)
}
/*!
- * \b SLOT which called if krandrtray is exited by the user. In this case the user
+ * \b TQT_SLOT which called if krandrtray is exited by the user. In this case the user
* is asked through a yes/no box if "KRandRTray should start automatically on log in" and the
* result is written to the KDE configfile.
*/
void KRandRSystemTray::_quit (){
r_config = new KSimpleConfig("krandrtrayrc");
- QString tmp1 = i18n ("Start KRandRTray automatically when you log in?");
+ TQString tmp1 = i18n ("Start KRandRTray automatically when you log in?");
int tmp2 = KMessageBox::questionYesNo ( 0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start"));
r_config->setGroup("General");
r_config->writeEntry ("Autostart", tmp2 == KMessageBox::Yes);
@@ -105,12 +105,12 @@ void KRandRSystemTray::_quit (){
exit(0);
}
-void KRandRSystemTray::resizeEvent ( QResizeEvent * )
+void KRandRSystemTray::resizeEvent ( TQResizeEvent * )
{
// Honor Free Desktop specifications that allow for arbitrary system tray icon sizes
- QPixmap origpixmap;
- QPixmap scaledpixmap;
- QImage newIcon;
+ TQPixmap origpixmap;
+ TQPixmap scaledpixmap;
+ TQImage newIcon;
origpixmap = KSystemTray::loadSizedIcon( "randr", width() );
newIcon = origpixmap;
newIcon = newIcon.smoothScale(width(), height());
@@ -118,7 +118,7 @@ void KRandRSystemTray::resizeEvent ( QResizeEvent * )
setPixmap(scaledpixmap);
}
-void KRandRSystemTray::mousePressEvent(QMouseEvent* e)
+void KRandRSystemTray::mousePressEvent(TQMouseEvent* e)
{
// Popup the context menu with left-click
if (e->button() == LeftButton) {
@@ -203,11 +203,11 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
/*lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1));
menu->setItemEnabled(lastIndex, false);*/
} else {
- KPopupMenu* subMenu = new KPopupMenu(menu, QString("screen%1").arg(s+1).latin1());
+ KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").arg(s+1).latin1());
m_screenPopups.append(subMenu);
populateMenu(subMenu);
lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu);
- connect(subMenu, SIGNAL(activated(int)), SLOT(slotScreenActivated()));
+ connect(subMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotScreenActivated()));
}
}
@@ -218,34 +218,34 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
addOutputMenu(menu);
// Find any user ICC profiles
- QStringList cfgProfiles;
+ TQStringList cfgProfiles;
cfgProfiles = t_config->groupList();
if (cfgProfiles.isEmpty() == false) {
menu->insertTitle(SmallIcon("kcoloredit"), i18n("Color Profile"));
}
- for (QStringList::Iterator t(cfgProfiles.begin()); t != cfgProfiles.end(); ++t) {
+ for (TQStringList::Iterator t(cfgProfiles.begin()); t != cfgProfiles.end(); ++t) {
lastIndex = menu->insertItem(*t);
if (t_config->readEntry("CurrentProfile") == (*t)) {
menu->setItemChecked(lastIndex, true);
}
menu->setItemEnabled(lastIndex, t_config->readBoolEntry("EnableICC", false));
- menu->connectItem(lastIndex, this, SLOT(slotColorProfileChanged(int)));
+ menu->connectItem(lastIndex, this, TQT_SLOT(slotColorProfileChanged(int)));
}
menu->insertTitle(SmallIcon("randr"), i18n("Global Configuation"));
KAction *actColors = new KAction( i18n( "Configure Color Profiles..." ),
- SmallIconSet( "configure" ), KShortcut(), this, SLOT( slotColorConfig() ),
+ SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotColorConfig() ),
actionCollection() );
actColors->plug( menu );
// KAction *actPrefs = new KAction( i18n( "Configure Display..." ),
-// SmallIconSet( "configure" ), KShortcut(), this, SLOT( slotPrefs() ),
+// SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotPrefs() ),
// actionCollection() );
// actPrefs->plug( menu );
KAction *actSKeys = new KAction( i18n( "Configure Shortcut Keys..." ),
- SmallIconSet( "configure" ), KShortcut(), this, SLOT( slotSKeys() ),
+ SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotSKeys() ),
actionCollection() );
actSKeys->plug( menu );
@@ -286,7 +286,7 @@ void KRandRSystemTray::configChanged()
first = false;
- QString cur_profile;
+ TQString cur_profile;
cur_profile = getCurrentProfile();
if (cur_profile != "") {
applyIccConfiguration(cur_profile, NULL);
@@ -363,7 +363,7 @@ void KRandRSystemTray::populateMenu(KPopupMenu* menu)
menu->setItemChecked(lastIndex, true);
menu->setItemParameter(lastIndex, highestIndex);
- menu->connectItem(lastIndex, this, SLOT(slotResolutionChanged(int)));
+ menu->connectItem(lastIndex, this, TQT_SLOT(slotResolutionChanged(int)));
}
delete [] sizeSort;
sizeSort = 0L;
@@ -381,25 +381,25 @@ void KRandRSystemTray::populateMenu(KPopupMenu* menu)
menu->setItemChecked(lastIndex, true);
menu->setItemParameter(lastIndex, 1 << i);
- menu->connectItem(lastIndex, this, SLOT(slotOrientationChanged(int)));
+ menu->connectItem(lastIndex, this, TQT_SLOT(slotOrientationChanged(int)));
}
}
}
- QStringList rr = currentScreen()->refreshRates(currentScreen()->proposedSize());
+ TQStringList rr = currentScreen()->refreshRates(currentScreen()->proposedSize());
if (rr.count())
menu->insertTitle(SmallIcon("clock"), i18n("Refresh Rate"));
int i = 0;
- for (QStringList::Iterator it = rr.begin(); it != rr.end(); ++it, i++) {
+ for (TQStringList::Iterator it = rr.begin(); it != rr.end(); ++it, i++) {
lastIndex = menu->insertItem(*it);
if (currentScreen()->proposedRefreshRate() == i)
menu->setItemChecked(lastIndex, true);
menu->setItemParameter(lastIndex, i);
- menu->connectItem(lastIndex, this, SLOT(slotRefreshRateChanged(int)));
+ menu->connectItem(lastIndex, this, TQT_SLOT(slotRefreshRateChanged(int)));
}
}
@@ -488,7 +488,7 @@ void KRandRSystemTray::slotSKeys()
{
ConfigDialog *dlg = new ConfigDialog(globalKeys, true);
- if ( dlg->exec() == QDialog::Accepted ) {
+ if ( dlg->exec() == TQDialog::Accepted ) {
dlg->commitShortcuts();
globalKeys->writeSettings(0, true);
globalKeys->updateConnections();
@@ -709,7 +709,7 @@ void KRandRSystemTray::addOutputMenu(KPopupMenu* menu)
lastIndex = menu->insertItem(i18n("%1 (Active)").arg(output_name));
menu->setItemChecked(lastIndex, true);
- menu->connectItem(lastIndex, this, SLOT(slotOutputChanged(int)));
+ menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int)));
menu->setItemParameter(lastIndex, i);
connected_displays++;
@@ -732,7 +732,7 @@ void KRandRSystemTray::addOutputMenu(KPopupMenu* menu)
lastIndex = menu->insertItem(i18n("%1 (Connected, Inactive)").arg(output_name));
menu->setItemChecked(lastIndex, false);
- menu->connectItem(lastIndex, this, SLOT(slotOutputChanged(int)));
+ menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int)));
menu->setItemParameter(lastIndex, i);
connected_displays++;
@@ -756,7 +756,7 @@ void KRandRSystemTray::addOutputMenu(KPopupMenu* menu)
lastIndex = menu->insertItem(i18n("%1 (Disconnected, Inactive)").arg(output_name));
menu->setItemChecked(lastIndex, false);
menu->setItemEnabled(lastIndex, false);
- menu->connectItem(lastIndex, this, SLOT(slotOutputChanged(int)));
+ menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int)));
menu->setItemParameter(lastIndex, i);
}
@@ -764,7 +764,7 @@ void KRandRSystemTray::addOutputMenu(KPopupMenu* menu)
if (connected_displays < 2) {
menu->setItemEnabled(lastIndex, false);
}
- menu->connectItem(lastIndex, this, SLOT(slotCycleDisplays()));
+ menu->connectItem(lastIndex, this, TQT_SLOT(slotCycleDisplays()));
}
}
diff --git a/kcontrol/randr/krandrtray.h b/kcontrol/randr/krandrtray.h
index 640a38697..f0d8d7367 100644
--- a/kcontrol/randr/krandrtray.h
+++ b/kcontrol/randr/krandrtray.h
@@ -19,7 +19,7 @@
#ifndef KRANDRTRAY_H
#define KRANDRTRAY_H
-#include <qptrlist.h>
+#include <tqptrlist.h>
#include <ksystemtray.h>
#include <kglobalaccel.h>
@@ -34,7 +34,7 @@ class KRandRSystemTray : public KSystemTray, public KRandrSimpleAPI
Q_OBJECT
public:
- KRandRSystemTray(QWidget* parent = 0, const char *name = 0);
+ KRandRSystemTray(TQWidget* parent = 0, const char *name = 0);
KGlobalAccel *globalKeys;
virtual void contextMenuAboutToShow(KPopupMenu* menu);
@@ -58,8 +58,8 @@ protected slots:
void slotColorProfileChanged(int parameter);
protected:
- void mousePressEvent( QMouseEvent *e );
- void resizeEvent ( QResizeEvent * );
+ void mousePressEvent( TQMouseEvent *e );
+ void resizeEvent ( TQResizeEvent * );
private:
void populateMenu(KPopupMenu* menu);
@@ -70,11 +70,11 @@ private:
bool m_popupUp;
KHelpMenu* m_help;
- QPtrList<KPopupMenu> m_screenPopups;
+ TQPtrList<KPopupMenu> m_screenPopups;
Display *randr_display;
ScreenInfo *randr_screen_info;
- QWidget* my_parent;
+ TQWidget* my_parent;
int last_known_x;
int last_known_y;
diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp
index a88e2448f..fd31f7800 100644
--- a/kcontrol/samba/kcmsambaimports.cpp
+++ b/kcontrol/samba/kcmsambaimports.cpp
@@ -23,20 +23,20 @@
#include "kcmsambaimports.h"
#include "kcmsambaimports.moc"
-#include <qlayout.h>
-#include <qwhatsthis.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
#include <klocale.h>
#include <kdialog.h>
#include <stdio.h>
-ImportsView::ImportsView(QWidget * parent, KConfig *config, const char * name )
- : QWidget (parent, name)
+ImportsView::ImportsView(TQWidget * parent, KConfig *config, const char * name )
+ : TQWidget (parent, name)
,configFile(config)
,list(this)
{
- QBoxLayout *topLayout = new QVBoxLayout(this, KDialog::marginHint(),
+ TQBoxLayout *topLayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint());
topLayout->setAutoAdd(true);
@@ -47,7 +47,7 @@ ImportsView::ImportsView(QWidget * parent, KConfig *config, const char * name )
list.addColumn(i18n("Resource"), 200);
list.addColumn(i18n("Mounted Under"), 190);
- QWhatsThis::add( this, i18n("This list shows the Samba and NFS shared"
+ TQWhatsThis::add( this, i18n("This list shows the Samba and NFS shared"
" resources mounted on your system from other hosts. The \"Type\""
" column tells you whether the mounted resource is a Samba or an NFS"
" type of resource. The \"Resource\" column shows the descriptive name"
@@ -56,7 +56,7 @@ ImportsView::ImportsView(QWidget * parent, KConfig *config, const char * name )
" resource is mounted.") );
timer.start(10000);
- QObject::connect(&timer, SIGNAL(timeout()), this, SLOT(updateList()));
+ TQObject::connect(&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateList()));
updateList();
}
@@ -65,7 +65,7 @@ void ImportsView::updateList()
list.clear();
char *e;
char buf[250];
- QCString s(""),strSource, strMount, strType;
+ TQCString s(""),strSource, strMount, strType;
FILE *f=popen("mount","r");
if (f==0) return;
do
@@ -85,7 +85,7 @@ void ImportsView::updateList()
int pos(strMount.find(" type "));
if (pos==-1) pos=strMount.find(" read/");
strMount=strMount.left(pos);
- new QListViewItem(&list,strType,strSource,strMount);
+ new TQListViewItem(&list,strType,strSource,strMount);
};
};
}
diff --git a/kcontrol/samba/kcmsambaimports.h b/kcontrol/samba/kcmsambaimports.h
index 5cd1c5e92..56ddb5f36 100644
--- a/kcontrol/samba/kcmsambaimports.h
+++ b/kcontrol/samba/kcmsambaimports.h
@@ -24,22 +24,22 @@
#ifndef kcmsambaimports_h_included
#define kcmsambaimports_h_included
-#include <qtimer.h>
-#include <qlistview.h>
+#include <tqtimer.h>
+#include <tqlistview.h>
#include <kconfig.h>
class ImportsView: public QWidget
{
Q_OBJECT
public:
- ImportsView(QWidget *parent, KConfig *config=0, const char * name=0);
+ ImportsView(TQWidget *parent, KConfig *config=0, const char * name=0);
virtual ~ImportsView() {};
void saveSettings() {};
void loadSettings() {};
private:
KConfig *configFile;
- QListView list;
- QTimer timer;
+ TQListView list;
+ TQTimer timer;
private slots:
void updateList();
};
diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp
index c4f01b464..224bc6fa2 100644
--- a/kcontrol/samba/kcmsambalog.cpp
+++ b/kcontrol/samba/kcmsambalog.cpp
@@ -21,9 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qfile.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
+#include <tqfile.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
#include <kmessagebox.h>
#include <kdialog.h>
@@ -34,8 +34,8 @@
#define LOG_SCREEN_XY_OFFSET 10
-LogView::LogView(QWidget *parent,KConfig *config, const char *name)
-: QWidget (parent, name)
+LogView::LogView(TQWidget *parent,KConfig *config, const char *name)
+: TQWidget (parent, name)
,configFile(config)
,filesCount(0)
,connectionsCount(0)
@@ -48,50 +48,50 @@ LogView::LogView(QWidget *parent,KConfig *config, const char *name)
,showFileClose(i18n("Show closed files"),this)
,updateButton(i18n("&Update"),this)
{
- QVBoxLayout *mainLayout=new QVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *mainLayout=new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint());
- QHBoxLayout *leLayout=new QHBoxLayout(mainLayout);
+ TQHBoxLayout *leLayout=new TQHBoxLayout(mainLayout);
leLayout->addWidget(&label);
leLayout->addWidget(&logFileName,1);
mainLayout->addWidget(&viewHistory,1);
- QGridLayout *subLayout=new QGridLayout(mainLayout,2,2);
+ TQGridLayout *subLayout=new TQGridLayout(mainLayout,2,2);
subLayout->addWidget(&showConnOpen,0,0);
subLayout->addWidget(&showConnClose,1,0);
subLayout->addWidget(&showFileOpen,0,1);
subLayout->addWidget(&showFileClose,1,1);
mainLayout->addWidget(&updateButton,0,Qt::AlignLeft);
- QWhatsThis::add( &logFileName, i18n("This page presents the contents of"
+ TQWhatsThis::add( &logFileName, i18n("This page presents the contents of"
" your samba log file in a friendly layout. Check that the correct log"
" file for your computer is listed here. If you need to, correct the name"
" or location of the log file, and then click the \"Update\" button.") );
- QWhatsThis::add( &showConnOpen, i18n("Check this option if you want to"
+ TQWhatsThis::add( &showConnOpen, i18n("Check this option if you want to"
" view the details for connections opened to your computer.") );
- QWhatsThis::add( &showConnClose, i18n("Check this option if you want to"
+ TQWhatsThis::add( &showConnClose, i18n("Check this option if you want to"
" view the events when connections to your computer were closed.") );
- QWhatsThis::add( &showFileOpen, i18n("Check this option if you want to"
+ TQWhatsThis::add( &showFileOpen, i18n("Check this option if you want to"
" see the files which were opened on your computer by remote users."
" Note that file open/close events are not logged unless the samba"
" log level is set to at least 2 (you cannot set the log level"
" using this module).") );
- QWhatsThis::add( &showFileClose, i18n("Check this option if you want to"
+ TQWhatsThis::add( &showFileClose, i18n("Check this option if you want to"
" see the events when files opened by remote users were closed."
" Note that file open/close events are not logged unless the samba"
" log level is set to at least 2 (you cannot set the log level"
" using this module).") );
- QWhatsThis::add( &updateButton, i18n("Click here to refresh the information"
+ TQWhatsThis::add( &updateButton, i18n("Click here to refresh the information"
" on this page. The log file (shown above) will be read to obtain the"
" events logged by samba.") );
logFileName.setURL("/var/log/samba.log");
viewHistory.setAllColumnsShowFocus(TRUE);
- viewHistory.setFocusPolicy(QWidget::ClickFocus);
+ viewHistory.setFocusPolicy(TQWidget::ClickFocus);
viewHistory.setShowSortIndicator(true);
viewHistory.addColumn(i18n("Date & Time"),130);
@@ -99,7 +99,7 @@ LogView::LogView(QWidget *parent,KConfig *config, const char *name)
viewHistory.addColumn(i18n("Service/File"),210);
viewHistory.addColumn(i18n("Host/User"),150);
- QWhatsThis::add( &viewHistory, i18n("This list shows details of the events"
+ TQWhatsThis::add( &viewHistory, i18n("This list shows details of the events"
" logged by samba. Note that events at the file level are not logged"
" unless you have configured the log level for samba to 2 or greater.<p>"
" As with many other lists in KDE, you can click on a column heading"
@@ -113,7 +113,7 @@ LogView::LogView(QWidget *parent,KConfig *config, const char *name)
showFileOpen.setChecked(FALSE);
showFileClose.setChecked(FALSE);
- connect(&updateButton,SIGNAL(clicked()),this,SLOT(updateList()));
+ connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList()));
emit contentsChanged(&viewHistory,0,0);
label.setMinimumSize(label.sizeHint());
@@ -158,10 +158,10 @@ void LogView::saveSettings()
//caution ! high optimized code :-)
void LogView::updateList()
{
- QFile logFile(logFileName.url());
+ TQFile logFile(logFileName.url());
if (logFile.open(IO_ReadOnly))
{
- QApplication::setOverrideCursor(waitCursor);
+ TQApplication::setOverrideCursor(waitCursor);
viewHistory.clear();
filesCount=0;
connectionsCount=0;
@@ -242,11 +242,11 @@ void LogView::updateList()
};
logFile.close();
emit contentsChanged(&viewHistory, filesCount, connectionsCount);
- QApplication::restoreOverrideCursor();
+ TQApplication::restoreOverrideCursor();
}
else
{
- QString tmp = i18n("Could not open file %1").arg(logFileName.url());
+ TQString tmp = i18n("Could not open file %1").arg(logFileName.url());
KMessageBox::error(this,tmp);
};
}
diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h
index 03e22f872..d0b427d48 100644
--- a/kcontrol/samba/kcmsambalog.h
+++ b/kcontrol/samba/kcmsambalog.h
@@ -23,12 +23,12 @@
#ifndef kcmsambalog_h_included
#define kcmsambalog_h_included
-#include <qlabel.h>
-#include <qcstring.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
-#include <qlistview.h>
-#include <qevent.h>
+#include <tqlabel.h>
+#include <tqcstring.h>
+#include <tqcheckbox.h>
+#include <tqpushbutton.h>
+#include <tqlistview.h>
+#include <tqevent.h>
#include <kconfig.h>
#include <kurlrequester.h>
@@ -39,7 +39,7 @@ class LogView: public QWidget
{
Q_OBJECT
public:
- LogView(QWidget *parent=0, KConfig *config=0, const char *name=0);
+ LogView(TQWidget *parent=0, KConfig *config=0, const char *name=0);
virtual ~LogView() {};
void saveSettings();
void loadSettings();
@@ -47,26 +47,26 @@ class LogView: public QWidget
KConfig *configFile;
int filesCount, connectionsCount;
KURLRequester logFileName;
- QLabel label;
- QListView viewHistory;
- QCheckBox showConnOpen, showConnClose, showFileOpen, showFileClose;
- QPushButton updateButton;
+ TQLabel label;
+ TQListView viewHistory;
+ TQCheckBox showConnOpen, showConnClose, showFileOpen, showFileClose;
+ TQPushButton updateButton;
private slots:
void updateList();
signals:
- void contentsChanged(QListView* list, int nrOfFiles, int nrOfConnections);
+ void contentsChanged(TQListView* list, int nrOfFiles, int nrOfConnections);
};
class QListViewItemX:public QListViewItem
{
public:
//a faster constructor saves a lot time
- QListViewItemX( QListView * parent,
+ QListViewItemX( TQListView * parent,
const char *c0, const char *c1 = 0,
const char *c2 = 0, const char *c3 = 0,
const char *c4 = 0, const char *c5 = 0,
const char *c6 = 0, const char *c7 = 0 )
- :QListViewItem(parent)
+ :TQListViewItem(parent)
{
setText( 0, c0 );
setText( 1, c1 );
diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp
index ebdd1c092..4da2045cb 100644
--- a/kcontrol/samba/kcmsambastatistics.cpp
+++ b/kcontrol/samba/kcmsambastatistics.cpp
@@ -23,44 +23,44 @@
#include "kcmsambastatistics.h"
#include "kcmsambastatistics.moc"
-#include <qlayout.h>
-#include <qlistview.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qpushbutton.h>
-#include <qregexp.h>
+#include <tqlayout.h>
+#include <tqlistview.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqpushbutton.h>
+#include <tqregexp.h>
#include <kglobal.h>
#include <klocale.h>
#include <kdebug.h>
#include <kdialog.h>
-StatisticsView::StatisticsView(QWidget *parent,KConfig *config, const char *name)
- :QWidget (parent, name)
+StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *name)
+ :TQWidget (parent, name)
,configFile(config)
,dataList(0)
,connectionsCount(0)
,filesCount(0)
,calcCount(0)
{
- viewStatistics = new QListView( this );
- connectionsL = new QLabel( i18n( "Connections: 0" ), this );
- filesL = new QLabel( i18n( "File accesses: 0" ), this );
- eventCb = new QComboBox( false, this );
- eventL = new QLabel( eventCb, i18n( "Event: " ), this );
- serviceLe = new QLineEdit( this );
- serviceL = new QLabel( serviceLe, i18n( "Service/File:" ), this );
- hostLe = new QLineEdit( this );
- hostL = new QLabel( hostLe, i18n( "Host/User:" ), this );
- calcButton = new QPushButton( i18n( "&Search" ), this );
- clearButton = new QPushButton( i18n( "Clear Results" ), this );
- expandedInfoCb = new QCheckBox( i18n( "Show expanded service info" ), this );
- expandedUserCb = new QCheckBox( i18n( "Show expanded host info" ), this );
+ viewStatistics = new TQListView( this );
+ connectionsL = new TQLabel( i18n( "Connections: 0" ), this );
+ filesL = new TQLabel( i18n( "File accesses: 0" ), this );
+ eventCb = new TQComboBox( false, this );
+ eventL = new TQLabel( eventCb, i18n( "Event: " ), this );
+ serviceLe = new TQLineEdit( this );
+ serviceL = new TQLabel( serviceLe, i18n( "Service/File:" ), this );
+ hostLe = new TQLineEdit( this );
+ hostL = new TQLabel( hostLe, i18n( "Host/User:" ), this );
+ calcButton = new TQPushButton( i18n( "&Search" ), this );
+ clearButton = new TQPushButton( i18n( "Clear Results" ), this );
+ expandedInfoCb = new TQCheckBox( i18n( "Show expanded service info" ), this );
+ expandedUserCb = new TQCheckBox( i18n( "Show expanded host info" ), this );
viewStatistics->setAllColumnsShowFocus(TRUE);
- viewStatistics->setFocusPolicy(QWidget::ClickFocus);
+ viewStatistics->setFocusPolicy(TQWidget::ClickFocus);
viewStatistics->setShowSortIndicator(true);
viewStatistics->addColumn(i18n("Nr"),30);
@@ -93,14 +93,14 @@ StatisticsView::StatisticsView(QWidget *parent,KConfig *config, const char *name
expandedInfoCb->setMinimumSize(expandedInfoCb->sizeHint());
expandedUserCb->setMinimumSize(expandedUserCb->sizeHint());
- QVBoxLayout *topLayout=new QVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *topLayout=new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint());
topLayout->addWidget(viewStatistics,1);
- QGridLayout *subLayout=new QGridLayout(topLayout,4,3);
+ TQGridLayout *subLayout=new TQGridLayout(topLayout,4,3);
subLayout->setColStretch(1,1);
subLayout->setColStretch(2,1);
- QHBoxLayout *twoButtonsLayout=new QHBoxLayout;
+ TQHBoxLayout *twoButtonsLayout=new QHBoxLayout;
twoButtonsLayout->addWidget(calcButton,1);
twoButtonsLayout->addWidget(clearButton,1);
@@ -116,12 +116,12 @@ StatisticsView::StatisticsView(QWidget *parent,KConfig *config, const char *name
subLayout->addWidget(expandedInfoCb,3,1);
subLayout->addWidget(expandedUserCb,3,2);
- connect(clearButton,SIGNAL(clicked()),this,SLOT(clearStatistics()));
- connect(calcButton,SIGNAL(clicked()),this,SLOT(calculate()));
+ connect(clearButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearStatistics()));
+ connect(calcButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(calculate()));
setListInfo(0,0,0);
}
-void StatisticsView::setListInfo(QListView *list, int nrOfFiles, int nrOfConnections)
+void StatisticsView::setListInfo(TQListView *list, int nrOfFiles, int nrOfConnections)
{
dataList=list;
filesCount=nrOfFiles;
@@ -134,7 +134,7 @@ void StatisticsView::setListInfo(QListView *list, int nrOfFiles, int nrOfConnect
void StatisticsView::calculate()
{
if (dataList==0) return;
- QApplication::setOverrideCursor(waitCursor);
+ TQApplication::setOverrideCursor(waitCursor);
int connCount(0);
if (eventCb->currentText()==i18n("Connection"))
connCount=1;
@@ -142,16 +142,16 @@ void StatisticsView::calculate()
if ((expandedInfoCb->isChecked()) || (expandedUserCb->isChecked()))
{
SambaLog sLog;
- QRegExp rService(serviceLe->text(),FALSE,TRUE);
- QRegExp rHost(hostLe->text(),FALSE,TRUE);
- QString item2, item3;
- QListViewItem* item=dataList->firstChild();
+ TQRegExp rService(serviceLe->text(),FALSE,TRUE);
+ TQRegExp rHost(hostLe->text(),FALSE,TRUE);
+ TQString item2, item3;
+ TQListViewItem* item=dataList->firstChild();
while (item!=0)
{
if (connCount)
{
- if ((QString(item->text(1)).contains(i18n("CONNECTION OPENED")))
- && (QString(item->text(2)).contains(rService)) && (QString(item->text(3)).contains(rHost)))
+ if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED")))
+ && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
{
if (expandedInfoCb->isChecked()) item2=item->text(2);
else item2=serviceLe->text();
@@ -163,8 +163,8 @@ void StatisticsView::calculate()
}
else
{
- if ((QString(item->text(1)).contains(i18n("FILE OPENED")))
- && (QString(item->text(2)).contains(rService)) && (QString(item->text(3)).contains(rHost)))
+ if ((TQString(item->text(1)).contains(i18n("FILE OPENED")))
+ && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
{
if (expandedInfoCb->isChecked()) item2=item->text(2);
else item2=serviceLe->text();
@@ -181,11 +181,11 @@ void StatisticsView::calculate()
for (SmallLogItem *tmpStr=tmpItem->accessed.first();tmpStr!=0;tmpStr=tmpItem->accessed.next())
{
calcCount++;
- QString number("");
+ TQString number("");
number.sprintf("%6d",calcCount);
- QString hits("");
+ TQString hits("");
hits.sprintf("%7d",tmpStr->count);
- new QListViewItem(viewStatistics,number,eventCb->currentText(),tmpItem->name,tmpStr->name,hits);
+ new TQListViewItem(viewStatistics,number,eventCb->currentText(),tmpItem->name,tmpStr->name,hits);
};
};
}
@@ -194,32 +194,32 @@ void StatisticsView::calculate()
{
calcCount++;
int count(0);
- QRegExp rService(serviceLe->text(),FALSE,TRUE);
- QRegExp rHost(hostLe->text(),FALSE,TRUE);
- QListViewItem* item=dataList->firstChild();
+ TQRegExp rService(serviceLe->text(),FALSE,TRUE);
+ TQRegExp rHost(hostLe->text(),FALSE,TRUE);
+ TQListViewItem* item=dataList->firstChild();
while (item!=0)
{
if (connCount)
{
- if ((QString(item->text(1)).contains(i18n("CONNECTION OPENED")))
- && (QString(item->text(2)).contains(rService)) && (QString(item->text(3)).contains(rHost)))
+ if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED")))
+ && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
count++;
}
else
{
- if ((QString(item->text(1)).contains(i18n("FILE OPENED")))
- && (QString(item->text(2)).contains(rService)) && (QString(item->text(3)).contains(rHost)))
+ if ((TQString(item->text(1)).contains(i18n("FILE OPENED")))
+ && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
count++;
};
item=item->nextSibling();
};
- QString number("");
+ TQString number("");
number.sprintf("%6d",calcCount);
- QString hits("");
+ TQString hits("");
hits.sprintf("%7d",count);
- new QListViewItem(viewStatistics,number,eventCb->currentText(),serviceLe->text(),hostLe->text(),hits);
+ new TQListViewItem(viewStatistics,number,eventCb->currentText(),serviceLe->text(),hostLe->text(),hits);
};
- QApplication::restoreOverrideCursor();
+ TQApplication::restoreOverrideCursor();
}
void StatisticsView::clearStatistics()
@@ -240,7 +240,7 @@ void SambaLog::printItems()
kdDebug() << "------ end of printing ------" << endl << endl;
}
-LogItem* SambaLog::itemInList(QString name)
+LogItem* SambaLog::itemInList(TQString name)
{
LogItem* tmpItem(items.first());
LogItem* foundItem(0);
@@ -252,7 +252,7 @@ LogItem* SambaLog::itemInList(QString name)
return foundItem;
}
-void SambaLog::addItem(QString share, QString user)
+void SambaLog::addItem(TQString share, TQString user)
{
//cout<<" adding connection: -"<<share<<"- -"<<user<<"-"<<endl;
LogItem* tmp(itemInList(share));
@@ -267,7 +267,7 @@ void SambaLog::addItem(QString share, QString user)
};
}
-SmallLogItem* LogItem::itemInList(QString name)
+SmallLogItem* LogItem::itemInList(TQString name)
{
SmallLogItem* tmpItem(accessed.first());
SmallLogItem* foundItem(0);
@@ -279,7 +279,7 @@ SmallLogItem* LogItem::itemInList(QString name)
return foundItem;
}
-void LogItem::addItem (QString host)
+void LogItem::addItem (TQString host)
{
SmallLogItem* tmp(itemInList(host));
if (tmp!=0)
diff --git a/kcontrol/samba/kcmsambastatistics.h b/kcontrol/samba/kcmsambastatistics.h
index 66a9474ab..958e45a55 100644
--- a/kcontrol/samba/kcmsambastatistics.h
+++ b/kcontrol/samba/kcmsambastatistics.h
@@ -23,8 +23,8 @@
#ifndef kcmsambastatistics_h_included
#define kcmsambastatistics_h_included
-#include <qwidget.h>
-#include <qptrlist.h>
+#include <tqwidget.h>
+#include <tqptrlist.h>
class QListView;
class QLabel;
@@ -39,8 +39,8 @@ class SmallLogItem
{
public:
SmallLogItem():name(""),count(0){};
- SmallLogItem(QString n):name(n),count(1){};
- QString name;
+ SmallLogItem(TQString n):name(n),count(1){};
+ TQString name;
int count;
};
@@ -48,17 +48,17 @@ class LogItem
{
public:
LogItem():name(""), accessed(),count(0) {};
- LogItem(QString n, QString a):name(n), accessed(), count(1)
+ LogItem(TQString n, TQString a):name(n), accessed(), count(1)
{
accessed.setAutoDelete(TRUE);
accessed.append(new SmallLogItem(a));
};
- QString name;
- //QStrList accessedBy;
- QPtrList<SmallLogItem> accessed;
+ TQString name;
+ //TQStrList accessedBy;
+ TQPtrList<SmallLogItem> accessed;
int count;
- SmallLogItem* itemInList(QString name);
- void addItem (QString host);
+ SmallLogItem* itemInList(TQString name);
+ void addItem (TQString host);
};
class SambaLog
@@ -68,36 +68,36 @@ class SambaLog
{
items.setAutoDelete(TRUE);
};
- QPtrList<LogItem> items;
- void addItem (QString share, QString host);
+ TQPtrList<LogItem> items;
+ void addItem (TQString share, TQString host);
void printItems();
private:
- LogItem* itemInList(QString name);
+ LogItem* itemInList(TQString name);
};
class StatisticsView: public QWidget
{
Q_OBJECT
public:
- StatisticsView(QWidget *parent=0, KConfig *config=0, const char *name=0);
+ StatisticsView(TQWidget *parent=0, KConfig *config=0, const char *name=0);
virtual ~StatisticsView() {};
void saveSettings() {};
void loadSettings() {};
public slots:
- void setListInfo(QListView *list, int nrOfFiles, int nrOfConnections);
+ void setListInfo(TQListView *list, int nrOfFiles, int nrOfConnections);
private:
KConfig *configFile;
- QListView *dataList;
- QListView* viewStatistics;
- QLabel* connectionsL, *filesL;
- QComboBox* eventCb;
- QLabel* eventL;
- QLineEdit* serviceLe;
- QLabel* serviceL;
- QLineEdit* hostLe;
- QLabel* hostL;
- QPushButton* calcButton, *clearButton;
- QCheckBox* expandedInfoCb, *expandedUserCb;
+ TQListView *dataList;
+ TQListView* viewStatistics;
+ TQLabel* connectionsL, *filesL;
+ TQComboBox* eventCb;
+ TQLabel* eventL;
+ TQLineEdit* serviceLe;
+ TQLabel* serviceL;
+ TQLineEdit* hostLe;
+ TQLabel* hostL;
+ TQPushButton* calcButton, *clearButton;
+ TQCheckBox* expandedInfoCb, *expandedUserCb;
int connectionsCount, filesCount, calcCount;
private slots:
void clearStatistics();
diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp
index b5bc6599f..c94bc5129 100644
--- a/kcontrol/samba/ksmbstatus.cpp
+++ b/kcontrol/samba/ksmbstatus.cpp
@@ -22,7 +22,7 @@
#include <string.h>
#include <time.h>
-#include <qlayout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include <kdialog.h>
@@ -32,10 +32,10 @@
#define Before(ttf,in) in.left(in.find(ttf))
-#define After(ttf,in) (in.contains(ttf)?QString(in.mid(in.find(ttf)+QString(ttf).length())):QString(""))
+#define After(ttf,in) (in.contains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString(""))
-NetMon::NetMon( QWidget * parent, KConfig *config, const char * name )
- : QWidget(parent, name)
+NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name )
+ : TQWidget(parent, name)
,configFile(config)
,showmountProc(0)
,strShare("")
@@ -49,12 +49,12 @@ NetMon::NetMon( QWidget * parent, KConfig *config, const char * name )
,iMachine(0)
,iPid(0)
{
- QBoxLayout *topLayout = new QVBoxLayout(this, KDialog::marginHint(),
+ TQBoxLayout *topLayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint());
topLayout->setAutoAdd(true);
- list=new QListView(this,"Hello");
- version=new QLabel(this);
+ list=new TQListView(this,"Hello");
+ version=new TQLabel(this);
list->setAllColumnsShowFocus(true);
list->setMinimumSize(425,200);
@@ -68,22 +68,22 @@ NetMon::NetMon( QWidget * parent, KConfig *config, const char * name )
list->addColumn(i18n("PID"));
list->addColumn(i18n("Open Files"));
- timer = new QTimer(this);
+ timer = new TQTimer(this);
timer->start(15000);
- QObject::connect(timer, SIGNAL(timeout()), this, SLOT(update()));
+ TQObject::connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(update()));
update();
}
void NetMon::processNFSLine(char *bufline, int)
{
- QCString line(bufline);
+ TQCString line(bufline);
if (line.contains(":/"))
- new QListViewItem(list,"NFS",After(":",line),Before(":/",line));
+ new TQListViewItem(list,"NFS",After(":",line),Before(":/",line));
}
void NetMon::processSambaLine(char *bufline, int)
{
- QCString line(bufline);
+ TQCString line(bufline);
rownumber++;
if (rownumber == 2)
version->setText(bufline); // second line = samba version
@@ -107,7 +107,7 @@ void NetMon::processSambaLine(char *bufline, int)
line=line.mid(iMachine,line.length());
strMachine=line;
- new QListViewItem(list,"SMB",strShare,strMachine, strUser,strGroup,strPid/*,strSince*/);
+ new TQListViewItem(list,"SMB",strShare,strMachine, strUser,strGroup,strPid/*,strSince*/);
}
else if (readingpart==connexions)
readingpart=locked_files;
@@ -167,7 +167,7 @@ void NetMon::update()
list->clear();
/* Re-read the Contents ... */
- QString path(::getenv("PATH"));
+ TQString path(::getenv("PATH"));
path += "/bin:/sbin:/usr/bin:/usr/sbin";
rownumber=0;
@@ -175,8 +175,8 @@ void NetMon::update()
nrpid=0;
process->setEnvironment("PATH", path);
connect(process,
- SIGNAL(receivedStdout(KProcess *, char *, int)),
- SLOT(slotReceivedData(KProcess *, char *, int)));
+ TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
+ TQT_SLOT(slotReceivedData(KProcess *, char *, int)));
*process << "smbstatus";
if (!process->start(KProcess::Block,KProcess::Stdout))
version->setText(i18n("Error: Unable to run smbstatus"));
@@ -185,11 +185,11 @@ void NetMon::update()
else
{
// ok -> count the number of locked files for each pid
- for (QListViewItem *row=list->firstChild();row!=0;row=row->itemBelow())
+ for (TQListViewItem *row=list->firstChild();row!=0;row=row->itemBelow())
{
// cerr<<"NetMon::update: this should be the pid: "<<row->text(5)<<endl;
int pid=row->text(5).toInt();
- row->setText(6,QString("%1").arg((lo)[pid]));
+ row->setText(6,TQString("%1").arg((lo)[pid]));
}
}
delete process;
@@ -200,12 +200,12 @@ void NetMon::update()
showmountProc=new KProcess();
showmountProc->setEnvironment("PATH", path);
*showmountProc<<"showmount"<<"-a"<<"localhost";
- connect(showmountProc,SIGNAL(receivedStdout(KProcess *, char *, int)),SLOT(slotReceivedData(KProcess *, char *, int)));
+ connect(showmountProc,TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),TQT_SLOT(slotReceivedData(KProcess *, char *, int)));
//without this timer showmount hangs up to 5 minutes
//if the portmapper daemon isn't running
- QTimer::singleShot(5000,this,SLOT(killShowmount()));
+ TQTimer::singleShot(5000,this,TQT_SLOT(killShowmount()));
//kdDebug()<<"starting kill timer with 5 seconds"<<endl;
- connect(showmountProc,SIGNAL(processExited(KProcess*)),this,SLOT(killShowmount()));
+ connect(showmountProc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(killShowmount()));
if (!showmountProc->start(KProcess::NotifyOnExit,KProcess::Stdout)) // run showmount
{
delete showmountProc;
diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h
index 9d60e30c2..4f7185fa4 100644
--- a/kcontrol/samba/ksmbstatus.h
+++ b/kcontrol/samba/ksmbstatus.h
@@ -19,11 +19,11 @@
#ifndef ksmbstatus_h_included
#define ksmbstatus_h_included
-#include <qtimer.h>
-#include <qlabel.h>
+#include <tqtimer.h>
+#include <tqlabel.h>
#include <kprocess.h>
-#include <qcstring.h>
-#include <qlistview.h>
+#include <tqcstring.h>
+#include <tqlistview.h>
#include <kconfig.h>
#define SCREEN_XY_OFFSET 20
@@ -36,16 +36,16 @@ class NetMon : public QWidget
{
Q_OBJECT
public:
- NetMon(QWidget *parent, KConfig * config=0, const char * name=0);
+ NetMon(TQWidget *parent, KConfig * config=0, const char * name=0);
void saveSettings() {};
void loadSettings() {};
private:
KConfig *configFile;
KProcess *showmountProc;
- QListView *list;
- QLabel *version;
- QTimer *timer;
- QListViewItem *killrow;
+ TQListView *list;
+ TQLabel *version;
+ TQTimer *timer;
+ TQListViewItem *killrow;
int rownumber;
enum {header, connexions, locked_files, finished, nfs} readingpart;
int lo[65536];
@@ -53,7 +53,7 @@ private:
void processNFSLine(char *bufline, int linelen);
void processSambaLine(char *bufline, int linelen);
- QCString strShare, strUser, strGroup, strMachine, strSince, strPid;
+ TQCString strShare, strUser, strGroup, strMachine, strSince, strPid;
int iUser, iGroup, iMachine, iPid;
private slots:
diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp
index f6df8f91b..88d95680a 100644
--- a/kcontrol/samba/main.cpp
+++ b/kcontrol/samba/main.cpp
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlayout.h>
-#include <qtabwidget.h>
+#include <tqlayout.h>
+#include <tqtabwidget.h>
#include <kaboutdata.h>
#include <kcmodule.h>
@@ -32,24 +32,24 @@
class SambaContainer:public KCModule
{
public:
- SambaContainer(QWidget *parent=0, const char * name=0, const QStringList &list = QStringList() );
+ SambaContainer(TQWidget *parent=0, const char * name=0, const TQStringList &list = TQStringList() );
virtual ~SambaContainer();
virtual void load();
virtual void save();
private:
KConfig config;
- QTabWidget tabs;
+ TQTabWidget tabs;
NetMon status;
ImportsView imports;
LogView logView;
StatisticsView statisticsView;
};
-typedef KGenericFactory<SambaContainer, QWidget > SambaFactory;
+typedef KGenericFactory<SambaContainer, TQWidget > SambaFactory;
K_EXPORT_COMPONENT_FACTORY (kcm_samba, SambaFactory("kcmsamba") )
-SambaContainer::SambaContainer(QWidget *parent, const char* name, const QStringList&)
+SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStringList&)
:KCModule(SambaFactory::instance(), parent,name)
,config("kcmsambarc",false,true)
,tabs(this)
@@ -58,13 +58,13 @@ SambaContainer::SambaContainer(QWidget *parent, const char* name, const QStringL
,logView(&tabs,&config)
,statisticsView(&tabs,&config)
{
- QVBoxLayout *layout = new QVBoxLayout( this, 0, KDialog::spacingHint() );
+ TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
layout->addWidget(&tabs);
tabs.addTab(&status,i18n("&Exports"));
tabs.addTab(&imports,i18n("&Imports"));
tabs.addTab(&logView,i18n("&Log"));
tabs.addTab(&statisticsView,i18n("&Statistics"));
- connect(&logView,SIGNAL(contentsChanged(QListView* , int, int)),&statisticsView,SLOT(setListInfo(QListView *, int, int)));
+ connect(&logView,TQT_SIGNAL(contentsChanged(TQListView* , int, int)),&statisticsView,TQT_SLOT(setListInfo(TQListView *, int, int)));
setButtons(Help);
load();
diff --git a/kcontrol/screensaver/advanceddialog.cpp b/kcontrol/screensaver/advanceddialog.cpp
index 273888960..4a48eedfe 100644
--- a/kcontrol/screensaver/advanceddialog.cpp
+++ b/kcontrol/screensaver/advanceddialog.cpp
@@ -1,10 +1,10 @@
#include <klocale.h>
#include <kstandarddirs.h>
-#include <qcombobox.h>
+#include <tqcombobox.h>
#include <kdebug.h>
-#include <qwhatsthis.h>
-#include <qstring.h>
+#include <tqwhatsthis.h>
+#include <tqstring.h>
#include <config.h>
@@ -14,7 +14,7 @@
#include "advanceddialog.moc"
-KScreenSaverAdvancedDialog::KScreenSaverAdvancedDialog(QWidget *parent, const char* name)
+KScreenSaverAdvancedDialog::KScreenSaverAdvancedDialog(TQWidget *parent, const char* name)
: KDialogBase( parent, name, true, i18n( "Advanced Options" ),
Ok | Cancel, Ok, true )
{
@@ -24,17 +24,17 @@ KScreenSaverAdvancedDialog::KScreenSaverAdvancedDialog(QWidget *parent, const ch
readSettings();
- connect(dialog->qcbPriority, SIGNAL(activated(int)),
- this, SLOT(slotPriorityChanged(int)));
+ connect(dialog->qcbPriority, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(slotPriorityChanged(int)));
- connect(dialog->qcbTopLeft, SIGNAL(activated(int)),
- this, SLOT(slotChangeTopLeftCorner(int)));
- connect(dialog->qcbTopRight, SIGNAL(activated(int)),
- this, SLOT(slotChangeTopLeftCorner(int)));
- connect(dialog->qcbBottomLeft, SIGNAL(activated(int)),
- this, SLOT(slotChangeTopLeftCorner(int)));
- connect(dialog->qcbBottomRight, SIGNAL(activated(int)),
- this, SLOT(slotChangeTopLeftCorner(int)));
+ connect(dialog->qcbTopLeft, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(slotChangeTopLeftCorner(int)));
+ connect(dialog->qcbTopRight, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(slotChangeTopLeftCorner(int)));
+ connect(dialog->qcbBottomLeft, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(slotChangeTopLeftCorner(int)));
+ connect(dialog->qcbBottomRight, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(slotChangeTopLeftCorner(int)));
#ifndef HAVE_SETPRIORITY
dialog->qgbPriority->setEnabled(false);
@@ -140,22 +140,22 @@ void KScreenSaverAdvancedDialog::slotChangeTopLeftCorner(int)
/* =================================================================================================== */
-AdvancedDialog::AdvancedDialog(QWidget *parent, const char *name) : AdvancedDialogImpl(parent, name)
+AdvancedDialog::AdvancedDialog(TQWidget *parent, const char *name) : AdvancedDialogImpl(parent, name)
{
- monitorLabel->setPixmap(QPixmap(locate("data", "kcontrol/pics/monitor.png")));
- QWhatsThis::add(qcbPriority, "<qt>" + i18n("Specify the priority that the screensaver will run at. A higher priority may mean that the screensaver runs faster, though may reduce the speed that other programs run at while the screensaver is active.") + "</qt>");
- QString qsTopLeft("<qt>" + i18n("The action to take when the mouse cursor is located in the top left corner of the screen for 15 seconds.") + "</qt>");
- QString qsTopRight("<qt>" + i18n("The action to take when the mouse cursor is located in the top right corner of the screen for 15 seconds.") + "</qt>");
- QString qsBottomLeft("<qt>" + i18n("The action to take when the mouse cursor is located in the bottom left corner of the screen for 15 seconds.") + "</qt>");
- QString qsBottomRight("<qt>" + i18n("The action to take when the mouse cursor is located in the bottom right corner of the screen for 15 seconds.") + "</qt>");
- QWhatsThis::add(qlTopLeft, qsTopLeft);
- QWhatsThis::add(qcbTopLeft, qsTopLeft);
- QWhatsThis::add(qlTopRight, qsTopRight);
- QWhatsThis::add(qcbTopRight, qsTopRight);
- QWhatsThis::add(qlBottomLeft, qsBottomLeft);
- QWhatsThis::add(qcbBottomLeft, qsBottomLeft);
- QWhatsThis::add(qlBottomRight, qsBottomRight);
- QWhatsThis::add(qcbBottomRight, qsBottomRight);
+ monitorLabel->setPixmap(TQPixmap(locate("data", "kcontrol/pics/monitor.png")));
+ TQWhatsThis::add(qcbPriority, "<qt>" + i18n("Specify the priority that the screensaver will run at. A higher priority may mean that the screensaver runs faster, though may reduce the speed that other programs run at while the screensaver is active.") + "</qt>");
+ TQString qsTopLeft("<qt>" + i18n("The action to take when the mouse cursor is located in the top left corner of the screen for 15 seconds.") + "</qt>");
+ TQString qsTopRight("<qt>" + i18n("The action to take when the mouse cursor is located in the top right corner of the screen for 15 seconds.") + "</qt>");
+ TQString qsBottomLeft("<qt>" + i18n("The action to take when the mouse cursor is located in the bottom left corner of the screen for 15 seconds.") + "</qt>");
+ TQString qsBottomRight("<qt>" + i18n("The action to take when the mouse cursor is located in the bottom right corner of the screen for 15 seconds.") + "</qt>");
+ TQWhatsThis::add(qlTopLeft, qsTopLeft);
+ TQWhatsThis::add(qcbTopLeft, qsTopLeft);
+ TQWhatsThis::add(qlTopRight, qsTopRight);
+ TQWhatsThis::add(qcbTopRight, qsTopRight);
+ TQWhatsThis::add(qlBottomLeft, qsBottomLeft);
+ TQWhatsThis::add(qcbBottomLeft, qsBottomLeft);
+ TQWhatsThis::add(qlBottomRight, qsBottomRight);
+ TQWhatsThis::add(qcbBottomRight, qsBottomRight);
}
AdvancedDialog::~AdvancedDialog()
@@ -163,12 +163,12 @@ AdvancedDialog::~AdvancedDialog()
}
-void AdvancedDialog::setMode(QComboBox *box, int i)
+void AdvancedDialog::setMode(TQComboBox *box, int i)
{
box->setCurrentItem(i);
}
-int AdvancedDialog::mode(QComboBox *box)
+int AdvancedDialog::mode(TQComboBox *box)
{
return box->currentItem();
}
diff --git a/kcontrol/screensaver/advanceddialog.h b/kcontrol/screensaver/advanceddialog.h
index 813c9fc82..8322dd3e2 100644
--- a/kcontrol/screensaver/advanceddialog.h
+++ b/kcontrol/screensaver/advanceddialog.h
@@ -2,25 +2,25 @@
#define ADVANCEDDIALOG_H
#include <kdialogbase.h>
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kconfig.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qgroupbox.h>
-#include <qobject.h>
-#include <qcheckbox.h>
-#include <qslider.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
+#include <tqgroupbox.h>
+#include <tqobject.h>
+#include <tqcheckbox.h>
+#include <tqslider.h>
#include "advanceddialogimpl.h"
class AdvancedDialog : public AdvancedDialogImpl
{
public:
- AdvancedDialog(QWidget *parent = 0, const char *name = 0);
+ AdvancedDialog(TQWidget *parent = 0, const char *name = 0);
~AdvancedDialog();
- void setMode(QComboBox *box, int i);
- int mode(QComboBox *box);
+ void setMode(TQComboBox *box, int i);
+ int mode(TQComboBox *box);
};
/* =================================================================================================== */
@@ -29,7 +29,7 @@ class KScreenSaverAdvancedDialog : public KDialogBase
{
Q_OBJECT
public:
- KScreenSaverAdvancedDialog(QWidget *parent, const char* name = 0);
+ KScreenSaverAdvancedDialog(TQWidget *parent, const char* name = 0);
public slots:
void slotOk();
@@ -44,11 +44,11 @@ protected slots:
private:
void readSettings();
- QCheckBox *m_topLeftCorner;
- QCheckBox *m_bottomLeftCorner;
- QCheckBox *m_topRightCorner;
- QCheckBox *m_bottomRightCorner;
- QSlider *mPrioritySlider;
+ TQCheckBox *m_topLeftCorner;
+ TQCheckBox *m_bottomLeftCorner;
+ TQCheckBox *m_topRightCorner;
+ TQCheckBox *m_bottomRightCorner;
+ TQSlider *mPrioritySlider;
bool mChanged;
int mPriority;
diff --git a/kcontrol/screensaver/kssmonitor.h b/kcontrol/screensaver/kssmonitor.h
index 72122e979..93f05653d 100644
--- a/kcontrol/screensaver/kssmonitor.h
+++ b/kcontrol/screensaver/kssmonitor.h
@@ -6,10 +6,10 @@
class KSSMonitor : public KSWidget
{
public:
- KSSMonitor( QWidget *parent ) : KSWidget( parent ) {}
+ KSSMonitor( TQWidget *parent ) : KSWidget( parent ) {}
// we don't want no steenking palette change
- virtual void setPalette( const QPalette & ) {}
+ virtual void setPalette( const TQPalette & ) {}
};
#endif
diff --git a/kcontrol/screensaver/kswidget.cpp b/kcontrol/screensaver/kswidget.cpp
index 58f28ff31..d13d131dc 100644
--- a/kcontrol/screensaver/kswidget.cpp
+++ b/kcontrol/screensaver/kswidget.cpp
@@ -7,7 +7,7 @@
#include <GL/glx.h>
#endif
-KSWidget::KSWidget( QWidget* parent, const char* name, int f )
+KSWidget::KSWidget( TQWidget* parent, const char* name, int f )
: QXEmbed( parent, name, f ), colormap( None )
{
// use visual with support for double-buffering, for opengl
diff --git a/kcontrol/screensaver/kswidget.h b/kcontrol/screensaver/kswidget.h
index 56d731955..11ec33a74 100644
--- a/kcontrol/screensaver/kswidget.h
+++ b/kcontrol/screensaver/kswidget.h
@@ -8,7 +8,7 @@ class KSWidget : public QXEmbed
{
Q_OBJECT
public:
- KSWidget( QWidget *parent = NULL, const char* name = NULL, int flags = 0 );
+ KSWidget( TQWidget *parent = NULL, const char* name = NULL, int flags = 0 );
virtual ~KSWidget();
private:
Colormap colormap;
diff --git a/kcontrol/screensaver/saverconfig.cpp b/kcontrol/screensaver/saverconfig.cpp
index a32d61e0e..bf8cdc54a 100644
--- a/kcontrol/screensaver/saverconfig.cpp
+++ b/kcontrol/screensaver/saverconfig.cpp
@@ -7,7 +7,7 @@ SaverConfig::SaverConfig()
{
}
-bool SaverConfig::read(const QString &file)
+bool SaverConfig::read(const TQString &file)
{
KDesktopFile config(file, true);
if( !config.tryExec())
diff --git a/kcontrol/screensaver/saverconfig.h b/kcontrol/screensaver/saverconfig.h
index 1327dfdaa..82be8e01f 100644
--- a/kcontrol/screensaver/saverconfig.h
+++ b/kcontrol/screensaver/saverconfig.h
@@ -1,29 +1,29 @@
#ifndef SAVERCONFIG_H
#define SAVERCONFIG_H
-#include <qstring.h>
+#include <tqstring.h>
class SaverConfig
{
public:
SaverConfig();
- bool read(const QString &file);
+ bool read(const TQString &file);
- QString exec() const { return mExec; }
- QString setup() const { return mSetup; }
- QString saver() const { return mSaver; }
- QString name() const { return mName; }
- QString file() const { return mFile; }
- QString category() const { return mCategory; }
+ TQString exec() const { return mExec; }
+ TQString setup() const { return mSetup; }
+ TQString saver() const { return mSaver; }
+ TQString name() const { return mName; }
+ TQString file() const { return mFile; }
+ TQString category() const { return mCategory; }
protected:
- QString mExec;
- QString mSetup;
- QString mSaver;
- QString mName;
- QString mFile;
- QString mCategory;
+ TQString mExec;
+ TQString mSetup;
+ TQString mSaver;
+ TQString mName;
+ TQString mFile;
+ TQString mCategory;
};
#endif
diff --git a/kcontrol/screensaver/saverlist.cpp b/kcontrol/screensaver/saverlist.cpp
index 6b27973e0..ccd525d9f 100644
--- a/kcontrol/screensaver/saverlist.cpp
+++ b/kcontrol/screensaver/saverlist.cpp
@@ -4,7 +4,7 @@
class SaverConfig;
class QPtrCollection;
-int SaverList::compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2)
+int SaverList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2)
{
SaverConfig *s1 = (SaverConfig *)item1;
SaverConfig *s2 = (SaverConfig *)item2;
diff --git a/kcontrol/screensaver/saverlist.h b/kcontrol/screensaver/saverlist.h
index e6f36be18..0030d6761 100644
--- a/kcontrol/screensaver/saverlist.h
+++ b/kcontrol/screensaver/saverlist.h
@@ -1,14 +1,14 @@
#ifndef SAVERLIST_H
#define SAVERLIST_H
-#include <qptrlist.h>
+#include <tqptrlist.h>
#include "saverconfig.h"
-class SaverList : public QPtrList<SaverConfig>
+class SaverList : public TQPtrList<SaverConfig>
{
protected:
- virtual int compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2);
+ virtual int compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2);
};
#endif
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index a40c51919..f80cc19e9 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -17,16 +17,16 @@
#include <sys/types.h>
#include <sys/wait.h>
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qheader.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlistview.h>
-#include <qpushbutton.h>
-#include <qslider.h>
-#include <qtimer.h>
-#include <qwhatsthis.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqheader.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlistview.h>
+#include <tqpushbutton.h>
+#include <tqslider.h>
+#include <tqtimer.h>
+#include <tqwhatsthis.h>
#include <dcopclient.h>
@@ -48,7 +48,7 @@
#include <fixx11h.h>
-template class QPtrList<SaverConfig>;
+template class TQPtrList<SaverConfig>;
const uint widgetEventMask = // X event mask
(uint)(
@@ -59,18 +59,18 @@ const uint widgetEventMask = // X event mask
//===========================================================================
// DLL Interface for kcontrol
-typedef KGenericFactory<KScreenSaver, QWidget > KSSFactory;
+typedef KGenericFactory<KScreenSaver, TQWidget > KSSFactory;
K_EXPORT_COMPONENT_FACTORY (kcm_screensaver, KSSFactory("kcmscreensaver") )
-static QString findExe(const QString &exe) {
- QString result = locate("exe", exe);
+static TQString findExe(const TQString &exe) {
+ TQString result = locate("exe", exe);
if (result.isEmpty())
result = KStandardDirs::findExe(exe);
return result;
}
-KScreenSaver::KScreenSaver(QWidget *parent, const char *name, const QStringList&)
+KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringList&)
: KCModule(KSSFactory::instance(), parent, name)
{
mSetupProc = 0;
@@ -99,7 +99,7 @@ KScreenSaver::KScreenSaver(QWidget *parent, const char *name, const QStringList&
setButtons( KCModule::Help | KCModule::Default | KCModule::Apply );
// Add KDE specific screensaver path
- QString relPath="System/ScreenSavers/";
+ TQString relPath="System/ScreenSavers/";
KServiceGroup::Ptr servGroup = KServiceGroup::baseGroup( "screensavers" );
if (servGroup)
{
@@ -114,108 +114,108 @@ KScreenSaver::KScreenSaver(QWidget *parent, const char *name, const QStringList&
readSettings( false );
mSetupProc = new KProcess;
- connect(mSetupProc, SIGNAL(processExited(KProcess *)),
- this, SLOT(slotSetupDone(KProcess *)));
+ connect(mSetupProc, TQT_SIGNAL(processExited(KProcess *)),
+ this, TQT_SLOT(slotSetupDone(KProcess *)));
mPreviewProc = new KProcess;
- connect(mPreviewProc, SIGNAL(processExited(KProcess *)),
- this, SLOT(slotPreviewExited(KProcess *)));
+ connect(mPreviewProc, TQT_SIGNAL(processExited(KProcess *)),
+ this, TQT_SLOT(slotPreviewExited(KProcess *)));
- QBoxLayout *topLayout = new QHBoxLayout(this, 0, KDialog::spacingHint());
+ TQBoxLayout *topLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
// left column
- QVBoxLayout *leftColumnLayout =
- new QVBoxLayout(topLayout, KDialog::spacingHint());
- QBoxLayout *vLayout =
- new QVBoxLayout(leftColumnLayout, KDialog::spacingHint());
+ TQVBoxLayout *leftColumnLayout =
+ new TQVBoxLayout(topLayout, KDialog::spacingHint());
+ TQBoxLayout *vLayout =
+ new TQVBoxLayout(leftColumnLayout, KDialog::spacingHint());
- mSaverGroup = new QGroupBox(i18n("Screen Saver"), this );
+ mSaverGroup = new TQGroupBox(i18n("Screen Saver"), this );
mSaverGroup->setColumnLayout( 0, Qt::Horizontal );
vLayout->addWidget(mSaverGroup);
vLayout->setStretchFactor( mSaverGroup, 10 );
- QBoxLayout *groupLayout = new QVBoxLayout( mSaverGroup->layout(),
+ TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(),
KDialog::spacingHint() );
- mSaverListView = new QListView( mSaverGroup );
+ mSaverListView = new TQListView( mSaverGroup );
mSaverListView->setMinimumHeight( 120 );
- mSaverListView->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+ mSaverListView->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
mSaverListView->addColumn("");
mSaverListView->header()->hide();
mSelected = -1;
groupLayout->addWidget( mSaverListView, 10 );
- connect( mSaverListView, SIGNAL(doubleClicked ( QListViewItem *)), this, SLOT( slotSetup()));
- QWhatsThis::add( mSaverListView, i18n("Select the screen saver to use.") );
+ connect( mSaverListView, TQT_SIGNAL(doubleClicked ( TQListViewItem *)), this, TQT_SLOT( slotSetup()));
+ TQWhatsThis::add( mSaverListView, i18n("Select the screen saver to use.") );
- QBoxLayout* hlay = new QHBoxLayout(groupLayout, KDialog::spacingHint());
- mSetupBt = new QPushButton( i18n("&Setup..."), mSaverGroup );
- connect( mSetupBt, SIGNAL( clicked() ), SLOT( slotSetup() ) );
+ TQBoxLayout* hlay = new TQHBoxLayout(groupLayout, KDialog::spacingHint());
+ mSetupBt = new TQPushButton( i18n("&Setup..."), mSaverGroup );
+ connect( mSetupBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSetup() ) );
mSetupBt->setEnabled(false);
hlay->addWidget( mSetupBt );
- QWhatsThis::add( mSetupBt, i18n("Configure the screen saver's options, if any.") );
+ TQWhatsThis::add( mSetupBt, i18n("Configure the screen saver's options, if any.") );
- mTestBt = new QPushButton( i18n("&Test"), mSaverGroup );
- connect( mTestBt, SIGNAL( clicked() ), SLOT( slotTest() ) );
+ mTestBt = new TQPushButton( i18n("&Test"), mSaverGroup );
+ connect( mTestBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotTest() ) );
mTestBt->setEnabled(false);
hlay->addWidget( mTestBt );
- QWhatsThis::add( mTestBt, i18n("Show a full screen preview of the screen saver.") );
+ TQWhatsThis::add( mTestBt, i18n("Show a full screen preview of the screen saver.") );
- mSettingsGroup = new QGroupBox( i18n("Settings"), this );
+ mSettingsGroup = new TQGroupBox( i18n("Settings"), this );
mSettingsGroup->setColumnLayout( 0, Qt::Vertical );
leftColumnLayout->addWidget( mSettingsGroup );
- groupLayout = new QVBoxLayout( mSettingsGroup->layout(),
+ groupLayout = new TQVBoxLayout( mSettingsGroup->layout(),
KDialog::spacingHint() );
- mEnabledCheckBox = new QCheckBox(i18n(
+ mEnabledCheckBox = new TQCheckBox(i18n(
"Start a&utomatically"), mSettingsGroup);
mEnabledCheckBox->setChecked(mEnabled);
- QWhatsThis::add( mEnabledCheckBox, i18n(
+ TQWhatsThis::add( mEnabledCheckBox, i18n(
"Automatically start the screen saver after a period of inactivity.") );
- connect(mEnabledCheckBox, SIGNAL(toggled(bool)),
- this, SLOT(slotEnable(bool)));
+ connect(mEnabledCheckBox, TQT_SIGNAL(toggled(bool)),
+ this, TQT_SLOT(slotEnable(bool)));
groupLayout->addWidget(mEnabledCheckBox);
- QBoxLayout *hbox = new QHBoxLayout();
+ TQBoxLayout *hbox = new TQHBoxLayout();
groupLayout->addLayout(hbox);
hbox->addSpacing(30);
- mActivateLbl = new QLabel(i18n("After:"), mSettingsGroup);
+ mActivateLbl = new TQLabel(i18n("After:"), mSettingsGroup);
mActivateLbl->setEnabled(mEnabled);
hbox->addWidget(mActivateLbl);
- mWaitEdit = new QSpinBox(mSettingsGroup);
+ mWaitEdit = new TQSpinBox(mSettingsGroup);
mWaitEdit->setSteps(1, 10);
mWaitEdit->setRange(1, INT_MAX);
mWaitEdit->setSuffix(i18n(" min"));
mWaitEdit->setValue(mTimeout/60);
mWaitEdit->setEnabled(mEnabled);
- connect(mWaitEdit, SIGNAL(valueChanged(int)),
- this, SLOT(slotTimeoutChanged(int)));
+ connect(mWaitEdit, TQT_SIGNAL(valueChanged(int)),
+ this, TQT_SLOT(slotTimeoutChanged(int)));
mActivateLbl->setBuddy(mWaitEdit);
hbox->addWidget(mWaitEdit);
hbox->addStretch(1);
- QString wtstr = i18n(
+ TQString wtstr = i18n(
"The period of inactivity "
"after which the screen saver should start.");
- QWhatsThis::add( mActivateLbl, wtstr );
- QWhatsThis::add( mWaitEdit, wtstr );
+ TQWhatsThis::add( mActivateLbl, wtstr );
+ TQWhatsThis::add( mWaitEdit, wtstr );
- mLockCheckBox = new QCheckBox( i18n(
+ mLockCheckBox = new TQCheckBox( i18n(
"&Require password to stop"), mSettingsGroup );
mLockCheckBox->setEnabled( mEnabled );
mLockCheckBox->setChecked( mLock );
- connect( mLockCheckBox, SIGNAL( toggled( bool ) ),
- this, SLOT( slotLock( bool ) ) );
+ connect( mLockCheckBox, TQT_SIGNAL( toggled( bool ) ),
+ this, TQT_SLOT( slotLock( bool ) ) );
groupLayout->addWidget(mLockCheckBox);
- QWhatsThis::add( mLockCheckBox, i18n(
+ TQWhatsThis::add( mLockCheckBox, i18n(
"Prevent potential unauthorized use by requiring a password"
" to stop the screen saver.") );
- hbox = new QHBoxLayout();
+ hbox = new TQHBoxLayout();
groupLayout->addLayout(hbox);
hbox->addSpacing(30);
- mLockLbl = new QLabel(i18n("After:"), mSettingsGroup);
+ mLockLbl = new TQLabel(i18n("After:"), mSettingsGroup);
mLockLbl->setEnabled(mEnabled && mLock);
- QWhatsThis::add( mLockLbl, i18n(
+ TQWhatsThis::add( mLockLbl, i18n(
"The amount of time, after the screen saver has started, to ask for the unlock password.") );
hbox->addWidget(mLockLbl);
- mWaitLockEdit = new QSpinBox(mSettingsGroup);
+ mWaitLockEdit = new TQSpinBox(mSettingsGroup);
mWaitLockEdit->setSteps(1, 10);
mWaitLockEdit->setRange(1, 300);
mWaitLockEdit->setSuffix(i18n(" sec"));
@@ -230,38 +230,38 @@ KScreenSaver::KScreenSaver(QWidget *parent, const char *name, const QStringList&
mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
}
- connect(mWaitLockEdit, SIGNAL(valueChanged(int)),
- this, SLOT(slotLockTimeoutChanged(int)));
+ connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)),
+ this, TQT_SLOT(slotLockTimeoutChanged(int)));
mLockLbl->setBuddy(mWaitLockEdit);
hbox->addWidget(mWaitLockEdit);
hbox->addStretch(1);
- QString wltstr = i18n(
+ TQString wltstr = i18n(
"Choose the period "
"after which the display will be locked. ");
- QWhatsThis::add( mLockLbl, wltstr );
- QWhatsThis::add( mWaitLockEdit, wltstr );
+ TQWhatsThis::add( mLockLbl, wltstr );
+ TQWhatsThis::add( mWaitLockEdit, wltstr );
// right column
- QBoxLayout* rightColumnLayout =
- new QVBoxLayout(topLayout, KDialog::spacingHint());
+ TQBoxLayout* rightColumnLayout =
+ new TQVBoxLayout(topLayout, KDialog::spacingHint());
- mMonitorLabel = new QLabel( this );
+ mMonitorLabel = new TQLabel( this );
mMonitorLabel->setAlignment( AlignCenter );
- mMonitorLabel->setPixmap( QPixmap(locate("data",
+ mMonitorLabel->setPixmap( TQPixmap(locate("data",
"kcontrol/pics/monitor.png")));
rightColumnLayout->addWidget(mMonitorLabel, 0);
- QWhatsThis::add( mMonitorLabel, i18n("A preview of the selected screen saver.") );
+ TQWhatsThis::add( mMonitorLabel, i18n("A preview of the selected screen saver.") );
- QBoxLayout* advancedLayout = new QHBoxLayout( rightColumnLayout, 3 );
- advancedLayout->addWidget( new QWidget( this ) );
- QPushButton* advancedBt = new QPushButton(
+ TQBoxLayout* advancedLayout = new TQHBoxLayout( rightColumnLayout, 3 );
+ advancedLayout->addWidget( new TQWidget( this ) );
+ TQPushButton* advancedBt = new TQPushButton(
i18n( "Advanced &Options" ), this, "advancedBtn" );
- advancedBt->setSizePolicy( QSizePolicy(
- QSizePolicy::Fixed, QSizePolicy::Fixed) );
- connect( advancedBt, SIGNAL( clicked() ),
- this, SLOT( slotAdvanced() ) );
+ advancedBt->setSizePolicy( TQSizePolicy(
+ TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
+ connect( advancedBt, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( slotAdvanced() ) );
advancedLayout->addWidget( advancedBt );
- advancedLayout->addWidget( new QWidget( this ) );
+ advancedLayout->addWidget( new TQWidget( this ) );
rightColumnLayout->addStretch();
@@ -275,8 +275,8 @@ KScreenSaver::KScreenSaver(QWidget *parent, const char *name, const QStringList&
// finding the savers can take some time, so defer loading until
// we've started up.
mNumLoaded = 0;
- mLoadTimer = new QTimer( this );
- connect( mLoadTimer, SIGNAL(timeout()), SLOT(findSavers()) );
+ mLoadTimer = new TQTimer( this );
+ connect( mLoadTimer, TQT_SIGNAL(timeout()), TQT_SLOT(findSavers()) );
mLoadTimer->start( 100 );
mChanged = false;
emit changed(false);
@@ -296,7 +296,7 @@ KScreenSaver::KScreenSaver(QWidget *parent, const char *name, const QStringList&
//---------------------------------------------------------------------------
//
-void KScreenSaver::resizeEvent( QResizeEvent * )
+void KScreenSaver::resizeEvent( TQResizeEvent * )
{
if (mMonitor)
@@ -308,7 +308,7 @@ void KScreenSaver::resizeEvent( QResizeEvent * )
//---------------------------------------------------------------------------
//
-void KScreenSaver::mousePressEvent( QMouseEvent *)
+void KScreenSaver::mousePressEvent( TQMouseEvent *)
{
if ( mTesting )
slotStopTest();
@@ -316,7 +316,7 @@ void KScreenSaver::mousePressEvent( QMouseEvent *)
//---------------------------------------------------------------------------
//
-void KScreenSaver::keyPressEvent( QKeyEvent *)
+void KScreenSaver::keyPressEvent( TQKeyEvent *)
{
if ( mTesting )
slotStopTest();
@@ -356,7 +356,7 @@ void KScreenSaver::load( bool useDefaults )
//if no saver was selected, the "Reset" and the "Enable screensaver", it is only called when starting and when pressing reset, aleXXX
// mSelected = -1;
int i = 0;
- QListViewItem *selectedItem = 0;
+ TQListViewItem *selectedItem = 0;
for (SaverConfig* saver = mSaverList.first(); saver != 0; saver = mSaverList.next()) {
if (saver->file() == mSaver)
{
@@ -467,7 +467,7 @@ void KScreenSaver::findSavers()
if ( !mNumLoaded ) {
mSaverFileList = KGlobal::dirs()->findAllResources("scrsav",
"*.desktop", false, true);
- new QListViewItem ( mSaverListView, i18n("Loading...") );
+ new TQListViewItem ( mSaverListView, i18n("Loading...") );
if ( mSaverFileList.isEmpty() )
mLoadTimer->stop();
else
@@ -477,7 +477,7 @@ void KScreenSaver::findSavers()
for ( int i = 0; i < 5 &&
(unsigned)mNumLoaded < mSaverFileList.count();
i++, mNumLoaded++ ) {
- QString file = mSaverFileList[mNumLoaded];
+ TQString file = mSaverFileList[mNumLoaded];
SaverConfig *saver = new SaverConfig;
if (saver->read(file)) {
mSaverList.append(saver);
@@ -486,7 +486,7 @@ void KScreenSaver::findSavers()
}
if ( (unsigned)mNumLoaded == mSaverFileList.count() ) {
- QListViewItem *selectedItem = 0;
+ TQListViewItem *selectedItem = 0;
int categoryCount = 0;
int indx = 0;
@@ -498,17 +498,17 @@ void KScreenSaver::findSavers()
mSaverListView->clear();
for ( SaverConfig *s = mSaverList.first(); s != 0; s = mSaverList.next())
{
- QListViewItem *item;
+ TQListViewItem *item;
if (s->category().isEmpty())
- item = new QListViewItem ( mSaverListView, s->name(), "2" + s->name() );
+ item = new TQListViewItem ( mSaverListView, s->name(), "2" + s->name() );
else
{
- QListViewItem *categoryItem = mSaverListView->findItem( s->category(), 0 );
+ TQListViewItem *categoryItem = mSaverListView->findItem( s->category(), 0 );
if ( !categoryItem ) {
- categoryItem = new QListViewItem ( mSaverListView, s->category(), "1" + s->category() );
+ categoryItem = new TQListViewItem ( mSaverListView, s->category(), "1" + s->category() );
categoryItem->setPixmap ( 0, SmallIcon ( "kscreensaver" ) );
}
- item = new QListViewItem ( categoryItem, s->name(), s->name() );
+ item = new TQListViewItem ( categoryItem, s->name(), s->name() );
categoryCount++;
}
if (s->file() == mSaver) {
@@ -519,10 +519,10 @@ void KScreenSaver::findSavers()
}
// Delete categories with only one item
- QListViewItemIterator it ( mSaverListView );
+ TQListViewItemIterator it ( mSaverListView );
for ( ; it.current(); it++ )
if ( it.current()->childCount() == 1 ) {
- QListViewItem *item = it.current()->firstChild();
+ TQListViewItem *item = it.current()->firstChild();
it.current()->takeItem( item );
mSaverListView->insertItem ( item );
delete it.current();
@@ -541,8 +541,8 @@ void KScreenSaver::findSavers()
mTestBt->setEnabled(true);
}
- connect( mSaverListView, SIGNAL( currentChanged( QListViewItem * ) ),
- this, SLOT( slotScreenSaver( QListViewItem * ) ) );
+ connect( mSaverListView, TQT_SIGNAL( currentChanged( TQListViewItem * ) ),
+ this, TQT_SLOT( slotScreenSaver( TQListViewItem * ) ) );
setMonitor();
}
@@ -587,12 +587,12 @@ void KScreenSaver::slotPreviewExited(KProcess *)
if (mSelected >= 0) {
mPreviewProc->clearArguments();
- QString saver = mSaverList.at(mSelected)->saver();
- QTextStream ts(&saver, IO_ReadOnly);
+ TQString saver = mSaverList.at(mSelected)->saver();
+ TQTextStream ts(&saver, IO_ReadOnly);
- QString word;
+ TQString word;
ts >> word;
- QString path = findExe(word);
+ TQString path = findExe(word);
if (!path.isEmpty())
{
@@ -632,7 +632,7 @@ void KScreenSaver::slotEnable(bool e)
//---------------------------------------------------------------------------
//
-void KScreenSaver::slotScreenSaver(QListViewItem *item)
+void KScreenSaver::slotScreenSaver(TQListViewItem *item)
{
if (!item)
return;
@@ -690,15 +690,15 @@ void KScreenSaver::slotSetup()
mSetupProc->clearArguments();
- QString saver = mSaverList.at(mSelected)->setup();
+ TQString saver = mSaverList.at(mSelected)->setup();
if( saver.isEmpty())
return;
- QTextStream ts(&saver, IO_ReadOnly);
+ TQTextStream ts(&saver, IO_ReadOnly);
- QString word;
+ TQString word;
ts >> word;
bool kxsconfig = word == "kxsconfig";
- QString path = findExe(word);
+ TQString path = findExe(word);
if (!path.isEmpty())
{
@@ -758,12 +758,12 @@ void KScreenSaver::slotTest()
}
mTestProc->clearArguments();
- QString saver = mSaverList.at(mSelected)->saver();
- QTextStream ts(&saver, IO_ReadOnly);
+ TQString saver = mSaverList.at(mSelected)->saver();
+ TQTextStream ts(&saver, IO_ReadOnly);
- QString word;
+ TQString word;
ts >> word;
- QString path = findExe(word);
+ TQString path = findExe(word);
if (!path.isEmpty())
{
@@ -772,7 +772,7 @@ void KScreenSaver::slotTest()
if (!mTestWin)
{
mTestWin = new TestWin();
- mTestWin->setBackgroundMode(QWidget::NoBackground);
+ mTestWin->setBackgroundMode(TQWidget::NoBackground);
mTestWin->setGeometry(0, 0, kapp->desktop()->width(),
kapp->desktop()->height());
}
diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h
index 28d05b73c..2b67cca3b 100644
--- a/kcontrol/screensaver/scrnsave.h
+++ b/kcontrol/screensaver/scrnsave.h
@@ -9,7 +9,7 @@
#ifndef __SCRNSAVE_H__
#define __SCRNSAVE_H__
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kcmodule.h>
#include "kssmonitor.h"
@@ -35,7 +35,7 @@ class KScreenSaver : public KCModule
{
Q_OBJECT
public:
- KScreenSaver(QWidget *parent, const char *name, const QStringList &);
+ KScreenSaver(TQWidget *parent, const char *name, const TQStringList &);
~KScreenSaver();
virtual void load();
@@ -48,7 +48,7 @@ public:
protected slots:
void slotEnable( bool );
- void slotScreenSaver( QListViewItem* );
+ void slotScreenSaver( TQListViewItem* );
void slotSetup();
void slotAdvanced();
void slotTest();
@@ -68,9 +68,9 @@ protected:
void getSaverNames();
void setMonitor();
void setDefaults();
- void resizeEvent( QResizeEvent * );
- void mousePressEvent(QMouseEvent *);
- void keyPressEvent(QKeyEvent *);
+ void resizeEvent( TQResizeEvent * );
+ void mousePressEvent(TQMouseEvent *);
+ void keyPressEvent(TQKeyEvent *);
protected:
TestWin *mTestWin;
@@ -78,22 +78,22 @@ protected:
KProcess *mSetupProc;
KProcess *mPreviewProc;
KSSMonitor *mMonitor;
- QPushButton *mSetupBt;
- QPushButton *mTestBt;
- QListView *mSaverListView;
+ TQPushButton *mSetupBt;
+ TQPushButton *mTestBt;
+ TQListView *mSaverListView;
QSpinBox *mWaitEdit;
- QSpinBox *mWaitLockEdit;
- QCheckBox *mLockCheckBox;
- QCheckBox *mStarsCheckBox;
- QCheckBox *mEnabledCheckBox;
- QLabel *mMonitorLabel;
- QLabel *mActivateLbl;
- QLabel *mLockLbl;
- QStringList mSaverFileList;
+ TQSpinBox *mWaitLockEdit;
+ TQCheckBox *mLockCheckBox;
+ TQCheckBox *mStarsCheckBox;
+ TQCheckBox *mEnabledCheckBox;
+ TQLabel *mMonitorLabel;
+ TQLabel *mActivateLbl;
+ TQLabel *mLockLbl;
+ TQStringList mSaverFileList;
SaverList mSaverList;
- QTimer *mLoadTimer;
- QGroupBox *mSaverGroup;
- QGroupBox *mSettingsGroup;
+ TQTimer *mLoadTimer;
+ TQGroupBox *mSaverGroup;
+ TQGroupBox *mSettingsGroup;
int mSelected;
int mPrevSelected;
@@ -106,7 +106,7 @@ protected:
int mLockTimeout;
bool mLock;
bool mEnabled;
- QString mSaver;
+ TQString mSaver;
bool mImmutable;
};
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index e56c72617..0a1ea39ef 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
#include <dcopclient.h>
@@ -43,11 +43,11 @@
#include "smartcard.h"
-KSmartcardConfig::KSmartcardConfig(QWidget *parent, const char *name)
+KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
: KCModule(parent, name),DCOPObject(name)
{
- QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
config = new KConfig("ksmartcardrc", false, false);
DCOPClient *dc = KApplication::kApplication()->dcopClient();
@@ -72,26 +72,26 @@ KSmartcardConfig::KSmartcardConfig(QWidget *parent, const char *name)
_popUpKardChooser = new KPopupMenu(this,"KpopupKardChooser");
_popUpKardChooser->insertItem(i18n("Change Module..."),
this,
- SLOT(slotLaunchChooser()));
+ TQT_SLOT(slotLaunchChooser()));
// The config backend
- connect(base->launchManager, SIGNAL(clicked()), SLOT( changed() ));
- connect(base->beepOnInsert, SIGNAL(clicked()), SLOT( changed() ));
- connect(base->enableSupport, SIGNAL(clicked()), SLOT( changed() ));
+ connect(base->launchManager, TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
+ connect(base->beepOnInsert, TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
+ connect(base->enableSupport, TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
- connect(base->enablePolling, SIGNAL(clicked()), SLOT( changed() ));
+ connect(base->enablePolling, TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
connect(base->_readerHostsListView,
- SIGNAL(rightButtonPressed(QListViewItem *,const QPoint &,int)),
+ TQT_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)),
this,
- SLOT(slotShowPopup(QListViewItem *,const QPoint &,int)));
+ TQT_SLOT(slotShowPopup(TQListViewItem *,const TQPoint &,int)));
if (!connectDCOPSignal("",
"",
- "signalReaderListChanged(QStringList)",
- "loadReadersTab(QStringList)",
+ "signalReaderListChanged(TQStringList)",
+ "loadReadersTab(TQStringList)",
FALSE))
kdDebug()<<"Error connecting to DCOP server" <<endl;
@@ -99,8 +99,8 @@ KSmartcardConfig::KSmartcardConfig(QWidget *parent, const char *name)
if (!connectDCOPSignal("",
"",
- "signalCardStateChanged(QString,bool,QString)",
- "updateReadersState (QString,bool,QString) ",
+ "signalCardStateChanged(TQString,bool,TQString)",
+ "updateReadersState (TQString,bool,TQString) ",
FALSE))
kdDebug()<<"Error connecting to DCOP server" <<endl;
@@ -131,7 +131,7 @@ void KSmartcardConfig::slotLaunchChooser(){
}
-void KSmartcardConfig::slotShowPopup(QListViewItem * item ,const QPoint & _point,int i)
+void KSmartcardConfig::slotShowPopup(TQListViewItem * item ,const TQPoint & _point,int i)
{
//The popup only appears in cards, not in the slots1
@@ -141,9 +141,9 @@ void KSmartcardConfig::slotShowPopup(QListViewItem * item ,const QPoint & _point
}
-void KSmartcardConfig::updateReadersState (QString readerName,
+void KSmartcardConfig::updateReadersState (TQString readerName,
bool isCardPresent,
- QString atr) {
+ TQString atr) {
KListViewItem * tID=(KListViewItem *) base->_readerHostsListView->findItem(readerName, 0);
if (tID==0) return;
@@ -165,13 +165,13 @@ void KSmartcardConfig::updateReadersState (QString readerName,
-void KSmartcardConfig::loadReadersTab( QStringList lr){
+void KSmartcardConfig::loadReadersTab( TQStringList lr){
//Prepare data for dcop calls
- QByteArray data, retval;
- QCString rettype;
- QDataStream arg(data, IO_WriteOnly);
- QCString modName = "kardsvc";
+ TQByteArray data, retval;
+ TQCString rettype;
+ TQDataStream arg(data, IO_WriteOnly);
+ TQCString modName = "kardsvc";
arg << modName;
// New view items
@@ -189,7 +189,7 @@ void KSmartcardConfig::loadReadersTab( QStringList lr){
// New view items
KListViewItem * temp;
- kapp->dcopClient()->call("kded", "kded", "unloadModule(QCString)",
+ kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
data, rettype, retval);
(void) new KListViewItem(base->_readerHostsListView,
@@ -208,21 +208,21 @@ void KSmartcardConfig::loadReadersTab( QStringList lr){
return;
}
- for (QStringList::Iterator _slot=lr.begin();_slot!=lr.end();++_slot){
+ for (TQStringList::Iterator _slot=lr.begin();_slot!=lr.end();++_slot){
temp= new KListViewItem(base->_readerHostsListView,*_slot);
- QByteArray dataATR;
- QDataStream argATR(dataATR,IO_WriteOnly);
+ TQByteArray dataATR;
+ TQDataStream argATR(dataATR,IO_WriteOnly);
argATR << *_slot;
- kapp->dcopClient()->call("kded", "kardsvc", "getCardATR(QString)",
+ kapp->dcopClient()->call("kded", "kardsvc", "getCardATR(TQString)",
dataATR, rettype, retval);
- QString cardATR;
- QDataStream retReaderATR(retval, IO_ReadOnly);
+ TQString cardATR;
+ TQDataStream retReaderATR(retval, IO_ReadOnly);
retReaderATR>>cardATR;
if (cardATR.isNull()){
@@ -242,7 +242,7 @@ void KSmartcardConfig::loadReadersTab( QStringList lr){
void KSmartcardConfig::getSupportingModule( KListViewItem * ant,
- QString & cardATR) const{
+ TQString & cardATR) const{
if (cardATR.isNull()){
@@ -252,12 +252,12 @@ void KSmartcardConfig::getSupportingModule( KListViewItem * ant,
}
- QString modName=_cardDB->getModuleName(cardATR);
+ TQString modName=_cardDB->getModuleName(cardATR);
if (!modName.isNull()){
- QStringList mng= QStringList::split(",",modName);
- QString type=mng[0];
- QString subType=mng[1];
- QString subSubType=mng[2];
+ TQStringList mng= TQStringList::split(",",modName);
+ TQString type=mng[0];
+ TQString subType=mng[1];
+ TQString subSubType=mng[2];
KListViewItem * hil =new KListViewItem(ant,
i18n("Managed by: "),
type,
@@ -282,10 +282,10 @@ void KSmartcardConfig::load(bool useDefaults )
{
//Prepare data for dcop calls
- QByteArray data, retval;
- QCString rettype;
- QDataStream arg(data, IO_WriteOnly);
- QCString modName = "kardsvc";
+ TQByteArray data, retval;
+ TQCString rettype;
+ TQDataStream arg(data, IO_WriteOnly);
+ TQCString modName = "kardsvc";
arg << modName;
//Update the toggle buttons with the current configuration
@@ -306,9 +306,9 @@ void KSmartcardConfig::load(bool useDefaults )
// We call kardsvc to retrieve the current readers
kapp->dcopClient()->call("kded", "kardsvc", "getSlotList ()",
data, rettype, retval);
- QStringList readers;
+ TQStringList readers;
readers.clear();
- QDataStream retReader(retval, IO_ReadOnly);
+ TQDataStream retReader(retval, IO_ReadOnly);
retReader>>readers;
//And we update the panel
@@ -328,16 +328,16 @@ if (_ok) {
config->writeEntry("Launch Manager", base->launchManager->isChecked());
- QByteArray data, retval;
- QCString rettype;
- QDataStream arg(data, IO_WriteOnly);
- QCString modName = "kardsvc";
+ TQByteArray data, retval;
+ TQCString rettype;
+ TQDataStream arg(data, IO_WriteOnly);
+ TQCString modName = "kardsvc";
arg << modName;
// Start or stop the server as needed
if (base->enableSupport->isChecked()) {
- kapp->dcopClient()->call("kded", "kded", "loadModule(QCString)",
+ kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
data, rettype, retval);
config->sync();
@@ -347,7 +347,7 @@ if (_ok) {
- kapp->dcopClient()->call("kded", "kded", "unloadModule(QCString)",
+ kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
data, rettype, retval);
}
@@ -363,7 +363,7 @@ void KSmartcardConfig::defaults()
-QString KSmartcardConfig::quickHelp() const
+TQString KSmartcardConfig::quickHelp() const
{
return i18n("<h1>smartcard</h1> This module allows you to configure KDE support"
" for smartcards. These can be used for various tasks such as storing"
@@ -372,7 +372,7 @@ QString KSmartcardConfig::quickHelp() const
extern "C"
{
- KDE_EXPORT KCModule *create_smartcard(QWidget *parent, const char *)
+ KDE_EXPORT KCModule *create_smartcard(TQWidget *parent, const char *)
{
return new KSmartcardConfig(parent, "kcmsmartcard");
}
@@ -384,12 +384,12 @@ extern "C"
delete config;
if (start) {
- QByteArray data, retval;
- QCString rettype;
- QDataStream arg(data, IO_WriteOnly);
- QCString modName = "kardsvc";
+ TQByteArray data, retval;
+ TQCString rettype;
+ TQDataStream arg(data, IO_WriteOnly);
+ TQCString modName = "kardsvc";
arg << modName;
- kapp->dcopClient()->call("kded", "kded", "loadModule(QCString)",
+ kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
data, rettype, retval);
}
}
diff --git a/kcontrol/smartcard/smartcard.h b/kcontrol/smartcard/smartcard.h
index 63f7e1e11..31fcea349 100644
--- a/kcontrol/smartcard/smartcard.h
+++ b/kcontrol/smartcard/smartcard.h
@@ -44,7 +44,7 @@ class KSmartcardConfig : public KCModule, public DCOPObject
public:
- KSmartcardConfig(QWidget *parent = 0L, const char *name = 0L);
+ KSmartcardConfig(TQWidget *parent = 0L, const char *name = 0L);
virtual ~KSmartcardConfig();
SmartcardBase *base;
@@ -55,19 +55,19 @@ public:
void defaults();
int buttons();
- QString quickHelp() const;
+ TQString quickHelp() const;
k_dcop:
- void updateReadersState (QString readerName,
+ void updateReadersState (TQString readerName,
bool isCardPresent,
- QString atr);
- void loadReadersTab (QStringList lr);
+ TQString atr);
+ void loadReadersTab (TQStringList lr);
private slots:
- void slotShowPopup(QListViewItem * item ,const QPoint & _point,int i);
+ void slotShowPopup(TQListViewItem * item ,const TQPoint & _point,int i);
void slotLaunchChooser();
@@ -80,7 +80,7 @@ private:
KPopupMenu * _popUpKardChooser;
void getSupportingModule( KListViewItem * ant,
- QString & cardATR) const ;
+ TQString & cardATR) const ;
};
diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp
index 9de1334b0..e1d22cf51 100644
--- a/kcontrol/smserver/kcmsmserver.cpp
+++ b/kcontrol/smserver/kcmsmserver.cpp
@@ -18,10 +18,10 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*/
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqlayout.h>
+#include <tqradiobutton.h>
#include <dcopclient.h>
@@ -33,10 +33,10 @@
#include "kcmsmserver.h"
#include "smserverconfigimpl.h"
-typedef KGenericFactory<SMServerConfig, QWidget > SMSFactory;
+typedef KGenericFactory<SMServerConfig, TQWidget > SMSFactory;
K_EXPORT_COMPONENT_FACTORY (kcm_smserver, SMSFactory("kcmsmserver") )
-SMServerConfig::SMServerConfig( QWidget *parent, const char* name, const QStringList & )
+SMServerConfig::SMServerConfig( TQWidget *parent, const char* name, const TQStringList & )
: KCModule (SMSFactory::instance(), parent, name)
{
setQuickHelp( i18n("<h1>Session Manager</h1>"
@@ -46,9 +46,9 @@ SMServerConfig::SMServerConfig( QWidget *parent, const char* name, const QString
" and whether the computer should be automatically shut down after session"
" exit by default."));
- QVBoxLayout *topLayout = new QVBoxLayout(this);
+ TQVBoxLayout *topLayout = new TQVBoxLayout(this);
dialog = new SMServerConfigImpl(this);
- connect(dialog, SIGNAL(changed()), SLOT(changed()));
+ connect(dialog, TQT_SIGNAL(changed()), TQT_SLOT(changed()));
dialog->show();
topLayout->add(dialog);
@@ -71,7 +71,7 @@ void SMServerConfig::load(bool useDefaults )
dialog->offerShutdownCheck->setChecked(en);
dialog->sdGroup->setEnabled(en);
- QString s = c->readEntry( "loginMode" );
+ TQString s = c->readEntry( "loginMode" );
if ( s == "default" )
dialog->emptySessionRadio->setChecked(true);
else if ( s == "restoreSavedSession" )
@@ -103,7 +103,7 @@ void SMServerConfig::save()
c->setGroup("General");
c->writeEntry( "confirmLogout", dialog->confirmLogoutCheck->isChecked());
c->writeEntry( "offerShutdown", dialog->offerShutdownCheck->isChecked());
- QString s = "restorePreviousLogout";
+ TQString s = "restorePreviousLogout";
if ( dialog->emptySessionRadio->isChecked() )
s = "default";
else if ( dialog->savedSessionRadio->isChecked() )
@@ -121,7 +121,7 @@ void SMServerConfig::save()
delete c;
// update the k menu if necessary
- QByteArray data;
+ TQByteArray data;
kapp->dcopClient()->send( "kicker", "kicker", "configure()", data );
}
diff --git a/kcontrol/smserver/kcmsmserver.h b/kcontrol/smserver/kcmsmserver.h
index 4f51ab3d5..c1ea4a362 100644
--- a/kcontrol/smserver/kcmsmserver.h
+++ b/kcontrol/smserver/kcmsmserver.h
@@ -31,7 +31,7 @@ class SMServerConfig : public KCModule
Q_OBJECT
public:
- SMServerConfig( QWidget *parent=0, const char* name=0, const QStringList &list=QStringList() );
+ SMServerConfig( TQWidget *parent=0, const char* name=0, const TQStringList &list=TQStringList() );
void load();
void load(bool useDefaults);
diff --git a/kcontrol/smserver/smserverconfigimpl.cpp b/kcontrol/smserver/smserverconfigimpl.cpp
index 9a2afbd90..d9507a9d8 100644
--- a/kcontrol/smserver/smserverconfigimpl.cpp
+++ b/kcontrol/smserver/smserverconfigimpl.cpp
@@ -18,7 +18,7 @@
#include "smserverconfigimpl.h"
#include "smserverconfigimpl.moc"
-SMServerConfigImpl::SMServerConfigImpl(QWidget *parent, const char *name ) : SMServerConfigDlg(parent,name) {
+SMServerConfigImpl::SMServerConfigImpl(TQWidget *parent, const char *name ) : SMServerConfigDlg(parent,name) {
}
SMServerConfigImpl::~SMServerConfigImpl(){
diff --git a/kcontrol/smserver/smserverconfigimpl.h b/kcontrol/smserver/smserverconfigimpl.h
index d928c48ec..b516617cf 100644
--- a/kcontrol/smserver/smserverconfigimpl.h
+++ b/kcontrol/smserver/smserverconfigimpl.h
@@ -18,7 +18,7 @@
#ifndef SMSERVERCONFIGIMPL_H
#define SMSERVERCONFIGIMPL_H
-#include <qwidget.h>
+#include <tqwidget.h>
#include "smserverconfigdlg.h"
/**
@@ -28,7 +28,7 @@
class SMServerConfigImpl : public SMServerConfigDlg {
Q_OBJECT
public:
- SMServerConfigImpl(QWidget *parent=0, const char *name=0);
+ SMServerConfigImpl(TQWidget *parent=0, const char *name=0);
~SMServerConfigImpl();
public slots: // Public slots
/** No descriptions */
diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp
index d4e781844..6416f9e9c 100644
--- a/kcontrol/spellchecking/spellchecking.cpp
+++ b/kcontrol/spellchecking/spellchecking.cpp
@@ -15,8 +15,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlayout.h>
-#include <qvgroupbox.h>
+#include <tqlayout.h>
+#include <tqvgroupbox.h>
#include <dcopclient.h>
@@ -27,21 +27,21 @@
#include "spellchecking.h"
-typedef KGenericFactory<KSpellCheckingConfig, QWidget > SpellFactory;
+typedef KGenericFactory<KSpellCheckingConfig, TQWidget > SpellFactory;
K_EXPORT_COMPONENT_FACTORY (kcm_spellchecking, SpellFactory("kcmspellchecking") )
-KSpellCheckingConfig::KSpellCheckingConfig(QWidget *parent, const char *name, const QStringList &):
+KSpellCheckingConfig::KSpellCheckingConfig(TQWidget *parent, const char *name, const TQStringList &):
KCModule(SpellFactory::instance(), parent, name)
{
- QBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint());
- QGroupBox *box = new QVGroupBox( i18n("Spell Checking Settings"), this );
+ TQBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ TQGroupBox *box = new TQVGroupBox( i18n("Spell Checking Settings"), this );
box->layout()->setSpacing( KDialog::spacingHint() );
layout->addWidget(box);
spellConfig = new KSpellConfig(box, 0L ,0L, false );
layout->addStretch(1);
- connect(spellConfig,SIGNAL(configChanged()), SLOT( changed() ));
+ connect(spellConfig,TQT_SIGNAL(configChanged()), TQT_SLOT( changed() ));
setQuickHelp( i18n("<h1>Spell Checker</h1><p>This control module allows you to configure the KDE spell checking system. You can configure:<ul><li> which spell checking program to use<li> which types of spelling errors are identified<li> which dictionary is used by default.</ul><br>The KDE spell checking system (KSpell) provides support for two common spell checking utilities: ASpell and ISpell. This allows you to share dictionaries between KDE applications and non-KDE applications.</p>"));
@@ -55,7 +55,7 @@ void KSpellCheckingConfig::load()
void KSpellCheckingConfig::save()
{
spellConfig->writeGlobalSettings();
- QByteArray data;
+ TQByteArray data;
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
diff --git a/kcontrol/spellchecking/spellchecking.h b/kcontrol/spellchecking/spellchecking.h
index f709a873d..130bf5e51 100644
--- a/kcontrol/spellchecking/spellchecking.h
+++ b/kcontrol/spellchecking/spellchecking.h
@@ -28,7 +28,7 @@ class KSpellCheckingConfig : public KCModule
Q_OBJECT
public:
- KSpellCheckingConfig(QWidget *parent, const char *name, const QStringList &);
+ KSpellCheckingConfig(TQWidget *parent, const char *name, const TQStringList &);
void load();
void save();
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 098990afd..f351d3f2c 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -24,22 +24,22 @@
#include "config.h"
#endif
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
#include <kcombobox.h>
-#include <qlistbox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qslider.h>
-#include <qstylefactory.h>
-#include <qtabwidget.h>
-#include <qvbox.h>
-#include <qfile.h>
-#include <qsettings.h>
-#include <qobjectlist.h>
-#include <qpixmapcache.h>
-#include <qwhatsthis.h>
-#include <qpushbutton.h>
+#include <tqlistbox.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqslider.h>
+#include <tqstylefactory.h>
+#include <tqtabwidget.h>
+#include <tqvbox.h>
+#include <tqfile.h>
+#include <tqsettings.h>
+#include <tqobjectlist.h>
+#include <tqpixmapcache.h>
+#include <tqwhatsthis.h>
+#include <tqpushbutton.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -73,7 +73,7 @@
// Danimo: Why do we use the old interface?!
extern "C"
{
- KDE_EXPORT KCModule *create_style(QWidget *parent, const char*)
+ KDE_EXPORT KCModule *create_style(TQWidget *parent, const char*)
{
KGlobal::locale()->insertCatalogue("kcmstyle");
return new KCMStyle(parent, "kcmstyle");
@@ -93,8 +93,8 @@ extern "C"
// Write some Qt root property.
#ifndef __osf__ // this crashes under Tru64 randomly -- will fix later
- QByteArray properties;
- QDataStream d(properties, IO_WriteOnly);
+ TQByteArray properties;
+ TQDataStream d(properties, IO_WriteOnly);
d.setVersion( 3 ); // Qt2 apps need this.
d << kapp->palette() << KGlobalSettings::generalFont();
Atom a = XInternAtom(qt_xdisplay(), "_QT_DESKTOP_PROPERTIES", false);
@@ -110,12 +110,12 @@ extern "C"
}
/*
-typedef KGenericFactory<KWidgetSettingsModule, QWidget> GeneralFactory;
+typedef KGenericFactory<KWidgetSettingsModule, TQWidget> GeneralFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kcmstyle, GeneralFactory )
*/
-KCMStyle::KCMStyle( QWidget* parent, const char* name )
+KCMStyle::KCMStyle( TQWidget* parent, const char* name )
: KCModule( parent, name ), appliedStyle(NULL)
{
setQuickHelp( i18n("<h1>Style</h1>"
@@ -142,52 +142,52 @@ KCMStyle::KCMStyle( QWidget* parent, const char* name )
setAboutData( about );
// Setup pages and mainLayout
- mainLayout = new QVBoxLayout( this );
- tabWidget = new QTabWidget( this );
+ mainLayout = new TQVBoxLayout( this );
+ tabWidget = new TQTabWidget( this );
mainLayout->addWidget( tabWidget );
- page1 = new QWidget( tabWidget );
- page1Layout = new QVBoxLayout( page1, KDialog::marginHint(), KDialog::spacingHint() );
- page2 = new QWidget( tabWidget );
- page2Layout = new QVBoxLayout( page2, KDialog::marginHint(), KDialog::spacingHint() );
- page3 = new QWidget( tabWidget );
- page3Layout = new QVBoxLayout( page3, KDialog::marginHint(), KDialog::spacingHint() );
+ page1 = new TQWidget( tabWidget );
+ page1Layout = new TQVBoxLayout( page1, KDialog::marginHint(), KDialog::spacingHint() );
+ page2 = new TQWidget( tabWidget );
+ page2Layout = new TQVBoxLayout( page2, KDialog::marginHint(), KDialog::spacingHint() );
+ page3 = new TQWidget( tabWidget );
+ page3Layout = new TQVBoxLayout( page3, KDialog::marginHint(), KDialog::spacingHint() );
// Add Page1 (Style)
// -----------------
- gbWidgetStyle = new QGroupBox( i18n("Widget Style"), page1, "gbWidgetStyle" );
+ gbWidgetStyle = new TQGroupBox( i18n("Widget Style"), page1, "gbWidgetStyle" );
gbWidgetStyle->setColumnLayout( 0, Qt::Vertical );
gbWidgetStyle->layout()->setMargin( KDialog::marginHint() );
gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() );
- gbWidgetStyleLayout = new QVBoxLayout( gbWidgetStyle->layout() );
+ gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() );
gbWidgetStyleLayout->setAlignment( Qt::AlignTop );
- hbLayout = new QHBoxLayout( KDialog::spacingHint(), "hbLayout" );
+ hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" );
cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" );
cbStyle->setEditable( FALSE );
hbLayout->addWidget( cbStyle );
- pbConfigStyle = new QPushButton( i18n("Con&figure..."), gbWidgetStyle );
- pbConfigStyle->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Minimum );
+ pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle );
+ pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
pbConfigStyle->setEnabled( FALSE );
hbLayout->addWidget( pbConfigStyle );
gbWidgetStyleLayout->addLayout( hbLayout );
- lblStyleDesc = new QLabel( gbWidgetStyle );
+ lblStyleDesc = new TQLabel( gbWidgetStyle );
lblStyleDesc->setTextFormat(Qt::RichText);
gbWidgetStyleLayout->addWidget( lblStyleDesc );
- cbIconsOnButtons = new QCheckBox( i18n("Sho&w icons on buttons"), gbWidgetStyle );
+ cbIconsOnButtons = new TQCheckBox( i18n("Sho&w icons on buttons"), gbWidgetStyle );
gbWidgetStyleLayout->addWidget( cbIconsOnButtons );
- cbEnableTooltips = new QCheckBox( i18n("E&nable tooltips"), gbWidgetStyle );
+ cbEnableTooltips = new TQCheckBox( i18n("E&nable tooltips"), gbWidgetStyle );
gbWidgetStyleLayout->addWidget( cbEnableTooltips );
- cbTearOffHandles = new QCheckBox( i18n("Show tear-off handles in &popup menus"), gbWidgetStyle );
+ cbTearOffHandles = new TQCheckBox( i18n("Show tear-off handles in &popup menus"), gbWidgetStyle );
gbWidgetStyleLayout->addWidget( cbTearOffHandles );
cbTearOffHandles->hide(); // reenable when the corresponding Qt method is virtual and properly reimplemented
- QGroupBox *gbPreview = new QGroupBox( i18n( "Preview" ), page1 );
+ TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 );
gbPreview->setColumnLayout( 0, Vertical );
gbPreview->layout()->setMargin( 0 );
gbPreview->layout()->setSpacing( KDialog::spacingHint() );
@@ -199,84 +199,84 @@ KCMStyle::KCMStyle( QWidget* parent, const char* name )
page1Layout->addWidget( gbPreview );
// Connect all required stuff
- connect( cbStyle, SIGNAL(activated(int)), this, SLOT(styleChanged()) );
- connect( cbStyle, SIGNAL(activated(int)), this, SLOT(updateConfigButton()));
- connect( pbConfigStyle, SIGNAL(clicked()), this, SLOT(styleSpecificConfig()));
+ connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(styleChanged()) );
+ connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateConfigButton()));
+ connect( pbConfigStyle, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleSpecificConfig()));
// Add Page2 (Effects)
// -------------------
- cbEnableEffects = new QCheckBox( i18n("&Enable GUI effects"), page2 );
- containerFrame = new QFrame( page2 );
- containerFrame->setFrameStyle( QFrame::NoFrame | QFrame::Plain );
+ cbEnableEffects = new TQCheckBox( i18n("&Enable GUI effects"), page2 );
+ containerFrame = new TQFrame( page2 );
+ containerFrame->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain );
containerFrame->setMargin(0);
- containerLayout = new QGridLayout( containerFrame, 1, 1, // rows, columns
+ containerLayout = new TQGridLayout( containerFrame, 1, 1, // rows, columns
KDialog::marginHint(), KDialog::spacingHint() );
- comboComboEffect = new QComboBox( FALSE, containerFrame );
+ comboComboEffect = new TQComboBox( FALSE, containerFrame );
comboComboEffect->insertItem( i18n("Disable") );
comboComboEffect->insertItem( i18n("Animate") );
- lblComboEffect = new QLabel( i18n("Combobo&x effect:"), containerFrame );
+ lblComboEffect = new TQLabel( i18n("Combobo&x effect:"), containerFrame );
lblComboEffect->setBuddy( comboComboEffect );
containerLayout->addWidget( lblComboEffect, 0, 0 );
containerLayout->addWidget( comboComboEffect, 0, 1 );
- comboTooltipEffect = new QComboBox( FALSE, containerFrame );
+ comboTooltipEffect = new TQComboBox( FALSE, containerFrame );
comboTooltipEffect->insertItem( i18n("Disable") );
comboTooltipEffect->insertItem( i18n("Animate") );
comboTooltipEffect->insertItem( i18n("Fade") );
- lblTooltipEffect = new QLabel( i18n("&Tool tip effect:"), containerFrame );
+ lblTooltipEffect = new TQLabel( i18n("&Tool tip effect:"), containerFrame );
lblTooltipEffect->setBuddy( comboTooltipEffect );
containerLayout->addWidget( lblTooltipEffect, 1, 0 );
containerLayout->addWidget( comboTooltipEffect, 1, 1 );
- comboRubberbandEffect = new QComboBox( FALSE, containerFrame );
+ comboRubberbandEffect = new TQComboBox( FALSE, containerFrame );
comboRubberbandEffect->insertItem( i18n("Disable") );
comboRubberbandEffect->insertItem( i18n("Make translucent") );
- lblRubberbandEffect = new QLabel( i18n("&Rubberband effect:"), containerFrame );
+ lblRubberbandEffect = new TQLabel( i18n("&Rubberband effect:"), containerFrame );
lblRubberbandEffect->setBuddy( comboRubberbandEffect );
containerLayout->addWidget( lblRubberbandEffect, 2, 0 );
containerLayout->addWidget( comboRubberbandEffect, 2, 1 );
- comboMenuEffect = new QComboBox( FALSE, containerFrame );
+ comboMenuEffect = new TQComboBox( FALSE, containerFrame );
comboMenuEffect->insertItem( i18n("Disable") );
comboMenuEffect->insertItem( i18n("Animate") );
comboMenuEffect->insertItem( i18n("Fade") );
comboMenuEffect->insertItem( i18n("Make Translucent") );
- lblMenuEffect = new QLabel( i18n("&Menu effect:"), containerFrame );
+ lblMenuEffect = new TQLabel( i18n("&Menu effect:"), containerFrame );
lblMenuEffect->setBuddy( comboMenuEffect );
containerLayout->addWidget( lblMenuEffect, 3, 0 );
containerLayout->addWidget( comboMenuEffect, 3, 1 );
- comboMenuHandle = new QComboBox( FALSE, containerFrame );
+ comboMenuHandle = new TQComboBox( FALSE, containerFrame );
comboMenuHandle->insertItem( i18n("Disable") );
comboMenuHandle->insertItem( i18n("Application Level") );
// comboMenuHandle->insertItem( i18n("Enable") );
- lblMenuHandle = new QLabel( i18n("Me&nu tear-off handles:"), containerFrame );
+ lblMenuHandle = new TQLabel( i18n("Me&nu tear-off handles:"), containerFrame );
lblMenuHandle->setBuddy( comboMenuHandle );
containerLayout->addWidget( lblMenuHandle, 4, 0 );
containerLayout->addWidget( comboMenuHandle, 4, 1 );
- cbMenuShadow = new QCheckBox( i18n("Menu &drop shadow"), containerFrame );
+ cbMenuShadow = new TQCheckBox( i18n("Menu &drop shadow"), containerFrame );
containerLayout->addWidget( cbMenuShadow, 5, 0 );
// Push the [label combo] to the left.
- comboSpacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
+ comboSpacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
containerLayout->addItem( comboSpacer, 1, 2 );
// Separator.
- QFrame* hline = new QFrame ( page2 );
- hline->setFrameStyle( QFrame::HLine | QFrame::Sunken );
+ TQFrame* hline = new TQFrame ( page2 );
+ hline->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
// Now implement the Menu Transparency container.
- menuContainer = new QFrame( page2 );
- menuContainer->setFrameStyle( QFrame::NoFrame | QFrame::Plain );
+ menuContainer = new TQFrame( page2 );
+ menuContainer->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain );
menuContainer->setMargin(0);
- menuContainerLayout = new QGridLayout( menuContainer, 1, 1, // rows, columns
+ menuContainerLayout = new TQGridLayout( menuContainer, 1, 1, // rows, columns
KDialog::marginHint(), KDialog::spacingHint() );
menuPreview = new MenuPreview( menuContainer, /* opacity */ 90, MenuPreview::Blend );
- comboMenuEffectType = new QComboBox( FALSE, menuContainer );
+ comboMenuEffectType = new TQComboBox( FALSE, menuContainer );
comboMenuEffectType->insertItem( i18n("Software Tint") );
comboMenuEffectType->insertItem( i18n("Software Blend") );
#ifdef HAVE_XRENDER
@@ -284,25 +284,25 @@ KCMStyle::KCMStyle( QWidget* parent, const char* name )
#endif
// So much stuffing around for a simple slider..
- sliderBox = new QVBox( menuContainer );
+ sliderBox = new TQVBox( menuContainer );
sliderBox->setSpacing( KDialog::spacingHint() );
sliderBox->setMargin( 0 );
- slOpacity = new QSlider( 0, 100, 5, /*opacity*/ 90, Qt::Horizontal, sliderBox );
- slOpacity->setTickmarks( QSlider::Below );
+ slOpacity = new TQSlider( 0, 100, 5, /*opacity*/ 90, Qt::Horizontal, sliderBox );
+ slOpacity->setTickmarks( TQSlider::Below );
slOpacity->setTickInterval( 10 );
- QHBox* box1 = new QHBox( sliderBox );
+ TQHBox* box1 = new TQHBox( sliderBox );
box1->setSpacing( KDialog::spacingHint() );
box1->setMargin( 0 );
- QLabel* lbl = new QLabel( i18n("0%"), box1 );
+ TQLabel* lbl = new TQLabel( i18n("0%"), box1 );
lbl->setAlignment( AlignLeft );
- lbl = new QLabel( i18n("50%"), box1 );
+ lbl = new TQLabel( i18n("50%"), box1 );
lbl->setAlignment( AlignHCenter );
- lbl = new QLabel( i18n("100%"), box1 );
+ lbl = new TQLabel( i18n("100%"), box1 );
lbl->setAlignment( AlignRight );
- lblMenuEffectType = new QLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer );
+ lblMenuEffectType = new TQLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer );
lblMenuEffectType->setAlignment( AlignBottom | AlignLeft );
- lblMenuOpacity = new QLabel( slOpacity, i18n("Menu &opacity:"), menuContainer );
+ lblMenuOpacity = new TQLabel( slOpacity, i18n("Menu &opacity:"), menuContainer );
lblMenuOpacity->setAlignment( AlignBottom | AlignLeft );
menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 );
@@ -317,28 +317,28 @@ KCMStyle::KCMStyle( QWidget* parent, const char* name )
page2Layout->addWidget( hline );
page2Layout->addWidget( menuContainer );
- QSpacerItem* sp1 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
+ TQSpacerItem* sp1 = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
page2Layout->addItem( sp1 );
// Data flow stuff.
- connect( cbEnableEffects, SIGNAL(toggled(bool)), containerFrame, SLOT(setEnabled(bool)) );
- connect( cbEnableEffects, SIGNAL(toggled(bool)), this, SLOT(menuEffectChanged(bool)) );
- connect( slOpacity, SIGNAL(valueChanged(int)),menuPreview, SLOT(setOpacity(int)) );
- connect( comboMenuEffect, SIGNAL(activated(int)), this, SLOT(menuEffectChanged()) );
- connect( comboMenuEffect, SIGNAL(highlighted(int)), this, SLOT(menuEffectChanged()) );
- connect( comboMenuEffectType, SIGNAL(activated(int)), this, SLOT(menuEffectTypeChanged()) );
- connect( comboMenuEffectType, SIGNAL(highlighted(int)), this, SLOT(menuEffectTypeChanged()) );
+ connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), containerFrame, TQT_SLOT(setEnabled(bool)) );
+ connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(menuEffectChanged(bool)) );
+ connect( slOpacity, TQT_SIGNAL(valueChanged(int)),menuPreview, TQT_SLOT(setOpacity(int)) );
+ connect( comboMenuEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectChanged()) );
+ connect( comboMenuEffect, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectChanged()) );
+ connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectTypeChanged()) );
+ connect( comboMenuEffectType, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectTypeChanged()) );
// Add Page3 (Miscellaneous)
// -------------------------
- cbHoverButtons = new QCheckBox( i18n("High&light buttons under mouse"), page3 );
- cbTransparentToolbars = new QCheckBox( i18n("Transparent tool&bars when moving"), page3 );
+ cbHoverButtons = new TQCheckBox( i18n("High&light buttons under mouse"), page3 );
+ cbTransparentToolbars = new TQCheckBox( i18n("Transparent tool&bars when moving"), page3 );
- QWidget * dummy = new QWidget( page3 );
+ TQWidget * dummy = new TQWidget( page3 );
- QHBoxLayout* box2 = new QHBoxLayout( dummy, 0, KDialog::spacingHint() );
- lbl = new QLabel( i18n("Text pos&ition:"), dummy );
- comboToolbarIcons = new QComboBox( FALSE, dummy );
+ TQHBoxLayout* box2 = new TQHBoxLayout( dummy, 0, KDialog::spacingHint() );
+ lbl = new TQLabel( i18n("Text pos&ition:"), dummy );
+ comboToolbarIcons = new TQComboBox( FALSE, dummy );
comboToolbarIcons->insertItem( i18n("Icons Only") );
comboToolbarIcons->insertItem( i18n("Text Only") );
comboToolbarIcons->insertItem( i18n("Text Alongside Icons") );
@@ -347,7 +347,7 @@ KCMStyle::KCMStyle( QWidget* parent, const char* name )
box2->addWidget( lbl );
box2->addWidget( comboToolbarIcons );
- QSpacerItem* sp2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
+ TQSpacerItem* sp2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
box2->addItem( sp2 );
page3Layout->addWidget( cbHoverButtons );
@@ -355,32 +355,32 @@ KCMStyle::KCMStyle( QWidget* parent, const char* name )
page3Layout->addWidget( dummy );
// Layout page3.
- QSpacerItem* sp3 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
+ TQSpacerItem* sp3 = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
page3Layout->addItem( sp3 );
// Load settings
load();
// Do all the setDirty connections.
- connect(cbStyle, SIGNAL(activated(int)), this, SLOT(setStyleDirty()));
+ connect(cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
// Page2
- connect( cbEnableEffects, SIGNAL(toggled(bool)), this, SLOT(setEffectsDirty()));
- connect( cbEnableEffects, SIGNAL(toggled(bool)), this, SLOT(setStyleDirty()));
- connect( comboTooltipEffect, SIGNAL(activated(int)), this, SLOT(setEffectsDirty()));
- connect( comboRubberbandEffect, SIGNAL(activated(int)), this, SLOT(setStyleDirty()));
- connect( comboComboEffect, SIGNAL(activated(int)), this, SLOT(setEffectsDirty()));
- connect( comboMenuEffect, SIGNAL(activated(int)), this, SLOT(setStyleDirty()));
- connect( comboMenuHandle, SIGNAL(activated(int)), this, SLOT(setStyleDirty()));
- connect( comboMenuEffectType, SIGNAL(activated(int)), this, SLOT(setStyleDirty()));
- connect( slOpacity, SIGNAL(valueChanged(int)),this, SLOT(setStyleDirty()));
- connect( cbMenuShadow, SIGNAL(toggled(bool)), this, SLOT(setStyleDirty()));
+ connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty()));
+ connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStyleDirty()));
+ connect( comboTooltipEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty()));
+ connect( comboRubberbandEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
+ connect( comboComboEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty()));
+ connect( comboMenuEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
+ connect( comboMenuHandle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
+ connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
+ connect( slOpacity, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty()));
+ connect( cbMenuShadow, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStyleDirty()));
// Page3
- connect( cbHoverButtons, SIGNAL(toggled(bool)), this, SLOT(setToolbarsDirty()));
- connect( cbTransparentToolbars, SIGNAL(toggled(bool)), this, SLOT(setToolbarsDirty()));
- connect( cbEnableTooltips, SIGNAL(toggled(bool)), this, SLOT(setEffectsDirty()));
- connect( cbIconsOnButtons, SIGNAL(toggled(bool)), this, SLOT(setEffectsDirty()));
- connect( cbTearOffHandles, SIGNAL(toggled(bool)), this, SLOT(setEffectsDirty()));
- connect( comboToolbarIcons, SIGNAL(activated(int)), this, SLOT(setToolbarsDirty()));
+ connect( cbHoverButtons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToolbarsDirty()));
+ connect( cbTransparentToolbars, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToolbarsDirty()));
+ connect( cbEnableTooltips, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty()));
+ connect( cbIconsOnButtons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty()));
+ connect( cbTearOffHandles, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty()));
+ connect( comboToolbarIcons, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setToolbarsDirty()));
addWhatsThis();
@@ -414,13 +414,13 @@ void KCMStyle::updateConfigButton()
void KCMStyle::styleSpecificConfig()
{
- QString libname = styleEntries[currentStyle()]->configPage;
+ TQString libname = styleEntries[currentStyle()]->configPage;
// Use KLibLoader to get the library, handling
// any errors that arise
KLibLoader* loader = KLibLoader::self();
- KLibrary* library = loader->library( QFile::encodeName(libname) );
+ KLibrary* library = loader->library( TQFile::encodeName(libname) );
if (!library)
{
KMessageBox::detailedError(this,
@@ -445,24 +445,24 @@ void KCMStyle::styleSpecificConfig()
StyleConfigDialog* dial = new StyleConfigDialog(this, styleEntries[currentStyle()]->name);
dial->enableButtonSeparator(true);
- typedef QWidget*(* factoryRoutine)( QWidget* parent );
+ typedef TQWidget*(* factoryRoutine)( TQWidget* parent );
//Get the factory, and make the widget.
factoryRoutine factory = (factoryRoutine)(allocPtr); //Grmbl. So here I am on my
//"never use C casts" moralizing streak, and I find that one can't go void* -> function ptr
//even with a reinterpret_cast.
- QWidget* pluginConfig = factory( dial );
+ TQWidget* pluginConfig = factory( dial );
//Insert it in...
dial->setMainWidget( pluginConfig );
//..and connect it to the wrapper
- connect(pluginConfig, SIGNAL(changed(bool)), dial, SLOT(setDirty(bool)));
- connect(dial, SIGNAL(defaults()), pluginConfig, SLOT(defaults()));
- connect(dial, SIGNAL(save()), pluginConfig, SLOT(save()));
+ connect(pluginConfig, TQT_SIGNAL(changed(bool)), dial, TQT_SLOT(setDirty(bool)));
+ connect(dial, TQT_SIGNAL(defaults()), pluginConfig, TQT_SLOT(defaults()));
+ connect(dial, TQT_SIGNAL(save()), pluginConfig, TQT_SLOT(save()));
- if (dial->exec() == QDialog::Accepted && dial->isDirty() ) {
+ if (dial->exec() == TQDialog::Accepted && dial->isDirty() ) {
// Force re-rendering of the preview, to apply settings
switchStyle(currentStyle(), true);
@@ -526,7 +526,7 @@ void KCMStyle::save()
}
}
- QString warn_string( i18n("<qt>Selected style: <b>%1</b><br><br>"
+ TQString warn_string( i18n("<qt>Selected style: <b>%1</b><br><br>"
"One or more effects that you have chosen could not be applied because the selected "
"style does not support them; they have therefore been disabled.<br>"
"<br>" ).arg( cbStyle->currentText()) );
@@ -567,7 +567,7 @@ void KCMStyle::save()
config.writeEntry( "EffectFadeTooltip", item == 2 );
item = comboRubberbandEffect->currentItem();
{
- QSettings settings; // Only for KStyle stuff
+ TQSettings settings; // Only for KStyle stuff
settings.writeEntry("/KStyle/Settings/SemiTransparentRubberband", item == 1);
}
item = comboMenuHandle->currentItem();
@@ -577,7 +577,7 @@ void KCMStyle::save()
config.writeEntry( "EffectFadeMenu", item == 2 );
// Handle KStyle's menu effects
- QString engine("Disabled");
+ TQString engine("Disabled");
if (item == 3 && cbEnableEffects->isChecked()) // Make Translucent
switch( comboMenuEffectType->currentItem())
{
@@ -587,8 +587,8 @@ void KCMStyle::save()
case 0: engine = "SoftwareTint"; break;
}
- { // Braces force a QSettings::sync()
- QSettings settings; // Only for KStyle stuff
+ { // Braces force a TQSettings::sync()
+ TQSettings settings; // Only for KStyle stuff
settings.writeEntry("/KStyle/Settings/MenuTransparencyEngine", engine);
settings.writeEntry("/KStyle/Settings/MenuOpacity", slOpacity->value()/100.0);
settings.writeEntry("/KStyle/Settings/MenuDropShadow",
@@ -605,7 +605,7 @@ void KCMStyle::save()
config.setGroup("Toolbar style");
config.writeEntry( "Highlighting", cbHoverButtons->isChecked(), true, true );
config.writeEntry( "TransparentMoving", cbTransparentToolbars->isChecked(), true, true );
- QString tbIcon;
+ TQString tbIcon;
switch( comboToolbarIcons->currentItem() )
{
case 1: tbIcon = "TextOnly"; break;
@@ -646,7 +646,7 @@ void KCMStyle::save()
}
//update kicker to re-used tooltips kicker parameter otherwise, it overwritted
//by style tooltips parameters.
- QByteArray data;
+ TQByteArray data;
kapp->dcopClient()->send( "kicker", "kicker", "configure()", data );
// Clean up
@@ -657,11 +657,11 @@ void KCMStyle::save()
}
-bool KCMStyle::findStyle( const QString& str, int& combobox_item )
+bool KCMStyle::findStyle( const TQString& str, int& combobox_item )
{
StyleEntry* se = styleEntries.find(str.lower());
- QString name = se ? se->name : str;
+ TQString name = se ? se->name : str;
combobox_item = 0;
@@ -715,9 +715,9 @@ void KCMStyle::loadStyle( KConfig& config )
styleEntries.clear();
styleEntries.setAutoDelete(true);
- QString strWidgetStyle;
- QStringList list = KGlobal::dirs()->findAllResources("themes", "*.themerc", true, true);
- for (QStringList::iterator it = list.begin(); it != list.end(); ++it)
+ TQString strWidgetStyle;
+ TQStringList list = KGlobal::dirs()->findAllResources("themes", "*.themerc", true, true);
+ for (TQStringList::iterator it = list.begin(); it != list.end(); ++it)
{
KSimpleConfig config( *it, true );
if ( !(config.hasGroup("KDE") && config.hasGroup("Misc")) )
@@ -734,7 +734,7 @@ void KCMStyle::loadStyle( KConfig& config )
config.setGroup("Misc");
entry->name = config.readEntry("Name");
entry->desc = config.readEntry("Comment", i18n("No description available."));
- entry->configPage = config.readEntry("ConfigPage", QString::null);
+ entry->configPage = config.readEntry("ConfigPage", TQString::null);
// Check if this style should be shown
config.setGroup("Desktop Entry");
@@ -745,14 +745,14 @@ void KCMStyle::loadStyle( KConfig& config )
}
// Obtain all style names
- QStringList allStyles = QStyleFactory::keys();
+ TQStringList allStyles = TQStyleFactory::keys();
// Get translated names, remove all hidden style entries.
- QStringList styles;
+ TQStringList styles;
StyleEntry* entry;
- for (QStringList::iterator it = allStyles.begin(); it != allStyles.end(); it++)
+ for (TQStringList::iterator it = allStyles.begin(); it != allStyles.end(); it++)
{
- QString id = (*it).lower();
+ TQString id = (*it).lower();
// Find the entry.
if ( (entry = styleEntries.find(id)) != 0 )
{
@@ -777,27 +777,27 @@ void KCMStyle::loadStyle( KConfig& config )
// Find out which style is currently being used
config.setGroup( "General" );
- QString defaultStyle = KStyle::defaultStyle();
- QString cfgStyle = config.readEntry( "widgetStyle", defaultStyle );
+ TQString defaultStyle = KStyle::defaultStyle();
+ TQString cfgStyle = config.readEntry( "widgetStyle", defaultStyle );
// Select the current style
// Do not use cbStyle->listBox() as this may be NULL for some styles when
// they use QPopupMenus for the drop-down list!
// ##### Since Trolltech likes to seemingly copy & paste code,
- // QStringList::findItem() doesn't have a Qt::StringComparisonMode field.
+ // TQStringList::findItem() doesn't have a Qt::StringComparisonMode field.
// We roll our own (yuck)
cfgStyle = cfgStyle.lower();
int item = 0;
for( int i = 0; i < cbStyle->count(); i++ )
{
- QString id = nameToStyleKey[cbStyle->text(i)];
+ TQString id = nameToStyleKey[cbStyle->text(i)];
item = i;
if ( id == cfgStyle ) // ExactMatch
break;
else if ( id.contains( cfgStyle ) )
break;
- else if ( id.contains( QApplication::style().className() ) )
+ else if ( id.contains( TQApplication::style().className() ) )
break;
item = 0;
}
@@ -808,7 +808,7 @@ void KCMStyle::loadStyle( KConfig& config )
switchStyle( currentStyle() ); // make resets visible
}
-QString KCMStyle::currentStyle()
+TQString KCMStyle::currentStyle()
{
return nameToStyleKey[cbStyle->currentText()];
}
@@ -820,19 +820,19 @@ void KCMStyle::styleChanged()
}
-void KCMStyle::switchStyle(const QString& styleName, bool force)
+void KCMStyle::switchStyle(const TQString& styleName, bool force)
{
// Don't flicker the preview if the same style is chosen in the cb
if (!force && appliedStyle && appliedStyle->name() == styleName)
return;
// Create an instance of the new style...
- QStyle* style = QStyleFactory::create(styleName);
+ TQStyle* style = TQStyleFactory::create(styleName);
if (!style)
return;
// Prevent Qt from wrongly caching radio button images
- QPixmapCache::clear();
+ TQPixmapCache::clear();
setStyleRecursive( stylePreview, style );
@@ -844,18 +844,18 @@ void KCMStyle::switchStyle(const QString& styleName, bool force)
// Set the correct style description
StyleEntry* entry = styleEntries.find( styleName );
- QString desc;
+ TQString desc;
desc = i18n("Description: %1").arg( entry ? entry->desc : i18n("No description available.") );
lblStyleDesc->setText( desc );
}
-void KCMStyle::setStyleRecursive(QWidget* w, QStyle* s)
+void KCMStyle::setStyleRecursive(TQWidget* w, TQStyle* s)
{
// Don't let broken styles kill the palette
// for other styles being previewed. (e.g SGI style)
w->unsetPalette();
- QPalette newPalette(KApplication::createApplicationPalette());
+ TQPalette newPalette(KApplication::createApplicationPalette());
s->polish( newPalette );
w->setPalette(newPalette);
@@ -863,18 +863,18 @@ void KCMStyle::setStyleRecursive(QWidget* w, QStyle* s)
w->setStyle(s);
// Recursively update all children.
- const QObjectList *children = w->children();
+ const TQObjectList *children = w->children();
if (!children)
return;
// Apply the style to each child widget.
- QPtrListIterator<QObject> childit(*children);
- QObject *child;
+ TQPtrListIterator<TQObject> childit(*children);
+ TQObject *child;
while ((child = childit.current()) != 0)
{
++childit;
if (child->isWidgetType())
- setStyleRecursive((QWidget *) child, s);
+ setStyleRecursive((TQWidget *) child, s);
}
}
@@ -902,7 +902,7 @@ void KCMStyle::loadEffects( KConfig& config )
else
comboTooltipEffect->setCurrentItem( 0 );
- QSettings settings;
+ TQSettings settings;
bool semiTransparentRubberband = settings.readBoolEntry("/KStyle/Settings/SemiTransparentRubberband", false);
comboRubberbandEffect->setCurrentItem( semiTransparentRubberband ? 1 : 0 );
@@ -917,7 +917,7 @@ void KCMStyle::loadEffects( KConfig& config )
// KStyle Menu transparency and drop-shadow options...
- QString effectEngine = settings.readEntry("/KStyle/Settings/MenuTransparencyEngine", "Disabled");
+ TQString effectEngine = settings.readEntry("/KStyle/Settings/MenuTransparencyEngine", "Disabled");
#ifdef HAVE_XRENDER
if (effectEngine == "XRender") {
@@ -1007,7 +1007,7 @@ void KCMStyle::loadMisc( KConfig& config )
cbHoverButtons->setChecked(config.readBoolEntry("Highlighting", true));
cbTransparentToolbars->setChecked(config.readBoolEntry("TransparentMoving", true));
- QString tbIcon = config.readEntry("IconText", "IconOnly");
+ TQString tbIcon = config.readEntry("IconText", "IconOnly");
if (tbIcon == "TextOnly")
comboToolbarIcons->setCurrentItem(1);
else if (tbIcon == "IconTextRight")
@@ -1028,58 +1028,58 @@ void KCMStyle::loadMisc( KConfig& config )
void KCMStyle::addWhatsThis()
{
// Page1
- QWhatsThis::add( cbStyle, i18n("Here you can choose from a list of"
+ TQWhatsThis::add( cbStyle, i18n("Here you can choose from a list of"
" predefined widget styles (e.g. the way buttons are drawn) which"
" may or may not be combined with a theme (additional information"
" like a marble texture or a gradient).") );
- QWhatsThis::add( stylePreview, i18n("This area shows a preview of the currently selected style "
+ TQWhatsThis::add( stylePreview, i18n("This area shows a preview of the currently selected style "
"without having to apply it to the whole desktop.") );
// Page2
- QWhatsThis::add( page2, i18n("This page allows you to enable various widget style effects. "
+ TQWhatsThis::add( page2, i18n("This page allows you to enable various widget style effects. "
"For best performance, it is advisable to disable all effects.") );
- QWhatsThis::add( cbEnableEffects, i18n( "If you check this box, you can select several effects "
+ TQWhatsThis::add( cbEnableEffects, i18n( "If you check this box, you can select several effects "
"for different widgets like combo boxes, menus or tooltips.") );
- QWhatsThis::add( comboComboEffect, i18n( "<p><b>Disable: </b>do not use any combo box effects.</p>\n"
+ TQWhatsThis::add( comboComboEffect, i18n( "<p><b>Disable: </b>do not use any combo box effects.</p>\n"
"<b>Animate: </b>Do some animation.") );
- QWhatsThis::add( comboTooltipEffect, i18n( "<p><b>Disable: </b>do not use any tooltip effects.</p>\n"
+ TQWhatsThis::add( comboTooltipEffect, i18n( "<p><b>Disable: </b>do not use any tooltip effects.</p>\n"
"<p><b>Animate: </b>Do some animation.</p>\n"
"<b>Fade: </b>Fade in tooltips using alpha-blending.") );
- QWhatsThis::add( comboRubberbandEffect, i18n( "<p><b>Disable: </b>do not use any rubberband effects.</p>\n"
+ TQWhatsThis::add( comboRubberbandEffect, i18n( "<p><b>Disable: </b>do not use any rubberband effects.</p>\n"
"<b>Make Translucent: </b>Draw a translucent rubberband.") );
- QWhatsThis::add( comboMenuEffect, i18n( "<p><b>Disable: </b>do not use any menu effects.</p>\n"
+ TQWhatsThis::add( comboMenuEffect, i18n( "<p><b>Disable: </b>do not use any menu effects.</p>\n"
"<p><b>Animate: </b>Do some animation.</p>\n"
"<p><b>Fade: </b>Fade in menus using alpha-blending.</p>\n"
"<b>Make Translucent: </b>Alpha-blend menus for a see-through effect. (KDE styles only)") );
- QWhatsThis::add( cbMenuShadow, i18n( "When enabled, all popup menus will have a drop-shadow, otherwise "
+ TQWhatsThis::add( cbMenuShadow, i18n( "When enabled, all popup menus will have a drop-shadow, otherwise "
"drop-shadows will not be displayed. At present, only KDE styles can have this "
"effect enabled.") );
- QWhatsThis::add( comboMenuEffectType, i18n( "<p><b>Software Tint: </b>Alpha-blend using a flat color.</p>\n"
+ TQWhatsThis::add( comboMenuEffectType, i18n( "<p><b>Software Tint: </b>Alpha-blend using a flat color.</p>\n"
"<p><b>Software Blend: </b>Alpha-blend using an image.</p>\n"
"<b>XRender Blend: </b>Use the XFree RENDER extension for image blending (if available). "
"This method may be slower than the Software routines on non-accelerated displays, "
"but may however improve performance on remote displays.</p>\n") );
- QWhatsThis::add( slOpacity, i18n("By adjusting this slider you can control the menu effect opacity.") );
+ TQWhatsThis::add( slOpacity, i18n("By adjusting this slider you can control the menu effect opacity.") );
// Page3
- QWhatsThis::add( page3, i18n("<b>Note:</b> that all widgets in this combobox "
+ TQWhatsThis::add( page3, i18n("<b>Note:</b> that all widgets in this combobox "
"do not apply to Qt-only applications.") );
- QWhatsThis::add( cbHoverButtons, i18n("If this option is selected, toolbar buttons will change "
+ TQWhatsThis::add( cbHoverButtons, i18n("If this option is selected, toolbar buttons will change "
"their color when the mouse cursor is moved over them." ) );
- QWhatsThis::add( cbTransparentToolbars, i18n("If you check this box, the toolbars will be "
+ TQWhatsThis::add( cbTransparentToolbars, i18n("If you check this box, the toolbars will be "
"transparent when moving them around.") );
- QWhatsThis::add( cbEnableTooltips, i18n( "If you check this option, the KDE application "
+ TQWhatsThis::add( cbEnableTooltips, i18n( "If you check this option, the KDE application "
"will offer tooltips when the cursor remains over items in the toolbar." ) );
- QWhatsThis::add( comboToolbarIcons, i18n( "<p><b>Icons only:</b> Shows only icons on toolbar buttons. "
+ TQWhatsThis::add( comboToolbarIcons, i18n( "<p><b>Icons only:</b> Shows only icons on toolbar buttons. "
"Best option for low resolutions.</p>"
"<p><b>Text only: </b>Shows only text on toolbar buttons.</p>"
"<p><b>Text alongside icons: </b> Shows icons and text on toolbar buttons. "
"Text is aligned alongside the icon.</p>"
"<b>Text under icons: </b> Shows icons and text on toolbar buttons. "
"Text is aligned below the icon.") );
- QWhatsThis::add( cbIconsOnButtons, i18n( "If you enable this option, KDE Applications will "
+ TQWhatsThis::add( cbIconsOnButtons, i18n( "If you enable this option, KDE Applications will "
"show small icons alongside some important buttons.") );
- QWhatsThis::add( cbTearOffHandles, i18n( "If you enable this option some pop-up menus will "
+ TQWhatsThis::add( cbTearOffHandles, i18n( "If you enable this option some pop-up menus will "
"show so called tear-off handles. If you click them, you get the menu "
"inside a widget. This can be very helpful when performing "
"the same action multiple times.") );
diff --git a/kcontrol/style/kcmstyle.h b/kcontrol/style/kcmstyle.h
index 6f6da6d1c..17d3cfdfa 100644
--- a/kcontrol/style/kcmstyle.h
+++ b/kcontrol/style/kcmstyle.h
@@ -27,8 +27,8 @@
#ifndef __KCMSTYLE_H
#define __KCMSTYLE_H
-#include <qstring.h>
-#include <qtimer.h>
+#include <tqstring.h>
+#include <tqtimer.h>
#include <kcmodule.h>
@@ -53,9 +53,9 @@ class StyleConfigDialog;
class WidgetPreview;
struct StyleEntry {
- QString name;
- QString desc;
- QString configPage;
+ TQString name;
+ TQString desc;
+ TQString configPage;
bool hidden;
};
@@ -64,7 +64,7 @@ class KCMStyle : public KCModule
Q_OBJECT
public:
- KCMStyle( QWidget* parent = 0, const char* name = 0 );
+ KCMStyle( TQWidget* parent = 0, const char* name = 0 );
~KCMStyle();
virtual void load();
@@ -73,9 +73,9 @@ public:
virtual void defaults();
protected:
- bool findStyle( const QString& str, int& combobox_item );
- void switchStyle(const QString& styleName, bool force = false);
- void setStyleRecursive(QWidget* w, QStyle* s);
+ bool findStyle( const TQString& str, int& combobox_item );
+ void switchStyle(const TQString& styleName, bool force = false);
+ void setStyleRecursive(TQWidget* w, TQStyle* s);
void loadStyle( KConfig& config );
void loadEffects( KConfig& config );
@@ -96,68 +96,68 @@ protected slots:
void menuEffectTypeChanged();
private:
- QString currentStyle();
+ TQString currentStyle();
bool m_bEffectsDirty, m_bStyleDirty, m_bToolbarsDirty;
- QDict<StyleEntry> styleEntries;
- QMap <QString,QString> nameToStyleKey;
+ TQDict<StyleEntry> styleEntries;
+ TQMap <TQString,TQString> nameToStyleKey;
- QVBoxLayout* mainLayout;
- QTabWidget* tabWidget;
- QWidget *page1, *page2, *page3;
- QVBoxLayout* page1Layout;
- QVBoxLayout* page2Layout;
- QVBoxLayout* page3Layout;
+ TQVBoxLayout* mainLayout;
+ TQTabWidget* tabWidget;
+ TQWidget *page1, *page2, *page3;
+ TQVBoxLayout* page1Layout;
+ TQVBoxLayout* page2Layout;
+ TQVBoxLayout* page3Layout;
// Page1 widgets
- QGroupBox* gbWidgetStyle;
- QVBoxLayout* gbWidgetStyleLayout;
- QHBoxLayout* hbLayout;
+ TQGroupBox* gbWidgetStyle;
+ TQVBoxLayout* gbWidgetStyleLayout;
+ TQHBoxLayout* hbLayout;
KComboBox* cbStyle;
- QPushButton* pbConfigStyle;
- QLabel* lblStyleDesc;
+ TQPushButton* pbConfigStyle;
+ TQLabel* lblStyleDesc;
StylePreview* stylePreview;
- QStyle* appliedStyle;
- QPalette palette;
+ TQStyle* appliedStyle;
+ TQPalette palette;
// Page2 widgets
- QCheckBox* cbEnableEffects;
-
- QFrame* containerFrame;
- QGridLayout* containerLayout;
- QComboBox* comboTooltipEffect;
- QComboBox* comboRubberbandEffect;
- QComboBox* comboComboEffect;
- QComboBox* comboMenuEffect;
- QComboBox* comboMenuHandle;
-
- QLabel* lblTooltipEffect;
- QLabel* lblRubberbandEffect;
- QLabel* lblComboEffect;
- QLabel* lblMenuEffect;
- QLabel* lblMenuHandle;
- QSpacerItem* comboSpacer;
-
- QFrame* menuContainer;
- QGridLayout* menuContainerLayout;
+ TQCheckBox* cbEnableEffects;
+
+ TQFrame* containerFrame;
+ TQGridLayout* containerLayout;
+ TQComboBox* comboTooltipEffect;
+ TQComboBox* comboRubberbandEffect;
+ TQComboBox* comboComboEffect;
+ TQComboBox* comboMenuEffect;
+ TQComboBox* comboMenuHandle;
+
+ TQLabel* lblTooltipEffect;
+ TQLabel* lblRubberbandEffect;
+ TQLabel* lblComboEffect;
+ TQLabel* lblMenuEffect;
+ TQLabel* lblMenuHandle;
+ TQSpacerItem* comboSpacer;
+
+ TQFrame* menuContainer;
+ TQGridLayout* menuContainerLayout;
MenuPreview* menuPreview;
- QVBox* sliderBox;
- QSlider* slOpacity;
- QComboBox* comboMenuEffectType;
- QLabel* lblMenuEffectType;
- QLabel* lblMenuOpacity;
- QCheckBox* cbMenuShadow;
+ TQVBox* sliderBox;
+ TQSlider* slOpacity;
+ TQComboBox* comboMenuEffectType;
+ TQLabel* lblMenuEffectType;
+ TQLabel* lblMenuOpacity;
+ TQCheckBox* cbMenuShadow;
// Page3 widgets
- QGroupBox* gbVisualAppearance;
+ TQGroupBox* gbVisualAppearance;
- QCheckBox* cbHoverButtons;
- QCheckBox* cbTransparentToolbars;
- QCheckBox* cbEnableTooltips;
- QComboBox* comboToolbarIcons;
+ TQCheckBox* cbHoverButtons;
+ TQCheckBox* cbTransparentToolbars;
+ TQCheckBox* cbEnableTooltips;
+ TQComboBox* comboToolbarIcons;
- QCheckBox* cbIconsOnButtons;
- QCheckBox* cbTearOffHandles;
+ TQCheckBox* cbIconsOnButtons;
+ TQCheckBox* cbTearOffHandles;
};
#endif // __KCMSTYLE_H
diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp
index 28e0ce424..0350ab969 100644
--- a/kcontrol/style/keramik/keramikconf.cpp
+++ b/kcontrol/style/keramik/keramikconf.cpp
@@ -21,9 +21,9 @@ DEALINGS IN THE SOFTWARE.
*/
-#include <qcheckbox.h>
-#include <qlayout.h>
-#include <qsettings.h>
+#include <tqcheckbox.h>
+#include <tqlayout.h>
+#include <tqsettings.h>
#include <kdialog.h>
#include <kglobal.h>
#include <klocale.h>
@@ -32,28 +32,28 @@ DEALINGS IN THE SOFTWARE.
extern "C"
{
- KDE_EXPORT QWidget* allocate_kstyle_config(QWidget* parent)
+ KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent)
{
return new KeramikStyleConfig(parent);
}
}
-KeramikStyleConfig::KeramikStyleConfig(QWidget* parent): QWidget(parent)
+KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
{
//Should have no margins here, the dialog provides them
- QVBoxLayout* layout = new QVBoxLayout(this, 0, 0);
+ TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
KGlobal::locale()->insertCatalogue("kstyle_keramik_config");
- //highlightLineEdits = new QCheckBox(i18n("Highlight active lineedits"), this);
- highlightScrollBar = new QCheckBox(i18n("Highlight scroll bar handles"), this);
- animateProgressBar = new QCheckBox(i18n("Animate progress bars"), this);
+ //highlightLineEdits = new TQCheckBox(i18n("Highlight active lineedits"), this);
+ highlightScrollBar = new TQCheckBox(i18n("Highlight scroll bar handles"), this);
+ animateProgressBar = new TQCheckBox(i18n("Animate progress bars"), this);
//layout->add(highlightLineEdits);
layout->add(highlightScrollBar);
layout->add(animateProgressBar);
layout->addStretch(1);
- QSettings s;
+ TQSettings s;
//origHlLineEdit = s.readBoolEntry("/keramik/Settings/highlightLineEdits", false);
//highlightLineEdits->setChecked(origHlLineEdit);
@@ -63,9 +63,9 @@ KeramikStyleConfig::KeramikStyleConfig(QWidget* parent): QWidget(parent)
origAnimProgressBar = s.readBoolEntry("/keramik/Settings/animateProgressBar", false);
animateProgressBar->setChecked(origAnimProgressBar);
- //connect(highlightLineEdits, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
- connect(highlightScrollBar, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
- connect(animateProgressBar, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
+ //connect(highlightLineEdits, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
+ connect(highlightScrollBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
+ connect(animateProgressBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
}
KeramikStyleConfig::~KeramikStyleConfig()
@@ -76,7 +76,7 @@ KeramikStyleConfig::~KeramikStyleConfig()
void KeramikStyleConfig::save()
{
- QSettings s;
+ TQSettings s;
//s.writeEntry("/keramik/Settings/highlightLineEdits", highlightLineEdits->isChecked());
s.writeEntry("/keramik/Settings/highlightScrollBar", highlightScrollBar->isChecked());
s.writeEntry("/keramik/Settings/animateProgressBar", animateProgressBar->isChecked());
diff --git a/kcontrol/style/keramik/keramikconf.h b/kcontrol/style/keramik/keramikconf.h
index f482fdb14..727284d7e 100644
--- a/kcontrol/style/keramik/keramikconf.h
+++ b/kcontrol/style/keramik/keramikconf.h
@@ -30,7 +30,7 @@ class KeramikStyleConfig: public QWidget
{
Q_OBJECT
public:
- KeramikStyleConfig(QWidget* parent);
+ KeramikStyleConfig(TQWidget* parent);
~KeramikStyleConfig();
//This signal and the next two slots are the plugin
@@ -49,9 +49,9 @@ protected slots:
protected:
//We store settings directly in widgets to
//avoid the hassle of sync'ing things
- //QCheckBox* highlightLineEdits;
- QCheckBox* animateProgressBar;
- QCheckBox* highlightScrollBar;
+ //TQCheckBox* highlightLineEdits;
+ TQCheckBox* animateProgressBar;
+ TQCheckBox* highlightScrollBar;
//Original settings, for accurate dirtiness tracking
//bool origHlLineEdit;
diff --git a/kcontrol/style/main.cpp b/kcontrol/style/main.cpp
index 543685502..252cee0fd 100644
--- a/kcontrol/style/main.cpp
+++ b/kcontrol/style/main.cpp
@@ -5,12 +5,12 @@
#include "kcmstyle.h"
extern "C" {
- KCModule *create_style(QWidget *parent, const char *) {
+ KCModule *create_style(TQWidget *parent, const char *) {
return new KCMStyle(parent, "kcmstyle");
}
}
/*
-typedef KGenericFactory<KWidgetSettingsModule, QWidget> GeneralFactory;
+typedef KGenericFactory<KWidgetSettingsModule, TQWidget> GeneralFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_style, GeneralFactory )
*/
diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp
index a8a74c981..112f2c241 100644
--- a/kcontrol/style/menupreview.cpp
+++ b/kcontrol/style/menupreview.cpp
@@ -19,8 +19,8 @@
#include "menupreview.h"
-#include <qpainter.h>
-#include <qimage.h>
+#include <tqpainter.h>
+#include <tqimage.h>
#include <kpixmap.h>
#include <kpixmapeffect.h>
@@ -29,8 +29,8 @@
#include <kiconloader.h>
-MenuPreview::MenuPreview( QWidget* parent, int opacity, PreviewMode pvm )
- : QWidget( parent, 0, WStyle_Customize | WRepaintNoErase ),
+MenuPreview::MenuPreview( TQWidget* parent, int opacity, PreviewMode pvm )
+ : TQWidget( parent, 0, WStyle_Customize | WRepaintNoErase ),
pixBackground(NULL), pixOverlay(NULL), pixBlended(NULL)
{
setFixedSize(150, 150);
@@ -68,13 +68,13 @@ void MenuPreview::createPixmaps()
if (pixBlended)
pixBlended->resize( w, h );
- QColorGroup cg = colorGroup();
- QColor c1 = cg.background();
- QColor c2 = cg.mid();
+ TQColorGroup cg = colorGroup();
+ TQColor c1 = cg.background();
+ TQColor c2 = cg.mid();
if (pixBackground) {
// Paint checkerboard
- QPainter p;
+ TQPainter p;
p.begin(pixBackground);
for(int x=0; x < pixBackground->width(); x+=5)
for(int y=0; y < pixBackground->height(); y+=5)
@@ -83,7 +83,7 @@ void MenuPreview::createPixmaps()
((y % 2) ? c2 : c1 ) : // See the grid? ;-)
((y % 2) ? c1 : c2 ) );
KIconLoader* icl = KGlobal::iconLoader();
- QPixmap pix = icl->loadIcon("go", KIcon::Desktop, KIcon::SizeLarge, KIcon::ActiveState);
+ TQPixmap pix = icl->loadIcon("go", KIcon::Desktop, KIcon::SizeLarge, KIcon::ActiveState);
p.drawPixmap( (width()-2-pix.width())/2, (height()-2-pix.height())/2, pix );
}
@@ -100,13 +100,13 @@ void MenuPreview::blendPixmaps()
if (pixBlended && pixBackground)
{
if (mode == Blend && pixOverlay) {
- QImage src = pixOverlay->convertToImage();
- QImage dst = pixBackground->convertToImage();
+ TQImage src = pixOverlay->convertToImage();
+ TQImage dst = pixBackground->convertToImage();
KImageEffect::blend(src, dst, menuOpacity);
pixBlended->convertFromImage( dst );
} else if (mode == Tint) {
- QColor clr = colorGroup().button();
- QImage dst = pixBackground->convertToImage();
+ TQColor clr = colorGroup().button();
+ TQImage dst = pixBackground->convertToImage();
KImageEffect::blend(clr, dst, menuOpacity);
pixBlended->convertFromImage( dst );
}
@@ -134,14 +134,14 @@ void MenuPreview::setPreviewMode( PreviewMode pvm )
}
}
-void MenuPreview::paintEvent( QPaintEvent* /* pe */ )
+void MenuPreview::paintEvent( TQPaintEvent* /* pe */ )
{
// Paint the frame and blended pixmap
- QColorGroup cg = colorGroup();
+ TQColorGroup cg = colorGroup();
int x2 = width()-1;
int y2 = height()-1;
- QPainter p(this);
+ TQPainter p(this);
p.setPen(cg.dark());
p.drawLine(0, 0, x2, 0);
p.drawLine(0, 0, 0, y2);
@@ -154,10 +154,10 @@ void MenuPreview::paintEvent( QPaintEvent* /* pe */ )
else if (mode != NoEffect && pixBlended)
p.drawPixmap(1, 1, *pixBlended, 0, 0, --x2, --y2);
- QRect r = rect();
+ TQRect r = rect();
r.moveBy(6,3);
p.setPen( cg.text() );
- p.drawText( r, AlignTop | AlignLeft, QString::number((int)(menuOpacity*100))+i18n("%") );
+ p.drawText( r, AlignTop | AlignLeft, TQString::number((int)(menuOpacity*100))+i18n("%") );
}
#include "menupreview.moc"
diff --git a/kcontrol/style/menupreview.h b/kcontrol/style/menupreview.h
index 2b7cb8bc8..ad22e77af 100644
--- a/kcontrol/style/menupreview.h
+++ b/kcontrol/style/menupreview.h
@@ -20,7 +20,7 @@
#ifndef __MENUPREVIEW_H
#define __MENUPREVIEW_H
-#include <qwidget.h>
+#include <tqwidget.h>
class KPixmap;
@@ -35,7 +35,7 @@ public:
Blend
};
- MenuPreview( QWidget* parent, int opacity, PreviewMode pvm );
+ MenuPreview( TQWidget* parent, int opacity, PreviewMode pvm );
~MenuPreview();
public slots:
@@ -43,7 +43,7 @@ public slots:
void setPreviewMode( PreviewMode pvm );
protected:
- void paintEvent( QPaintEvent* pe );
+ void paintEvent( TQPaintEvent* pe );
private:
void createPixmaps();
diff --git a/kcontrol/style/styleconfdialog.cpp b/kcontrol/style/styleconfdialog.cpp
index 6638b620d..1623a3a21 100644
--- a/kcontrol/style/styleconfdialog.cpp
+++ b/kcontrol/style/styleconfdialog.cpp
@@ -21,7 +21,7 @@
#include "styleconfdialog.h"
#include <klocale.h>
-StyleConfigDialog::StyleConfigDialog(QWidget* parent, QString styleName):
+StyleConfigDialog::StyleConfigDialog(TQWidget* parent, TQString styleName):
KDialogBase(parent, "StyleConfigDialog",
true, /*modal*/
i18n("Configure %1").arg(styleName),
@@ -29,8 +29,8 @@ StyleConfigDialog::StyleConfigDialog(QWidget* parent, QString styleName):
KDialogBase::Cancel)
{
m_dirty = false;
- connect( this, SIGNAL( defaultClicked() ), this, SIGNAL( defaults() ));
- connect( this, SIGNAL( okClicked() ), this, SIGNAL( save() ));
+ connect( this, TQT_SIGNAL( defaultClicked() ), this, TQT_SIGNAL( defaults() ));
+ connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SIGNAL( save() ));
}
bool StyleConfigDialog::isDirty() const
diff --git a/kcontrol/style/styleconfdialog.h b/kcontrol/style/styleconfdialog.h
index ab299225a..6555adee6 100644
--- a/kcontrol/style/styleconfdialog.h
+++ b/kcontrol/style/styleconfdialog.h
@@ -28,7 +28,7 @@ class StyleConfigDialog: public KDialogBase
{
Q_OBJECT
public:
- StyleConfigDialog(QWidget* parent, QString styleName);
+ StyleConfigDialog(TQWidget* parent, TQString styleName);
bool isDirty() const;
diff --git a/kcontrol/style/stylepreview.ui.h b/kcontrol/style/stylepreview.ui.h
index 09b50a0ce..076197955 100644
--- a/kcontrol/style/stylepreview.ui.h
+++ b/kcontrol/style/stylepreview.ui.h
@@ -27,38 +27,38 @@
** a constructor, and a destroy() slot in place of a destructor.
*****************************************************************************/
-#include <qobjectlist.h>
+#include <tqobjectlist.h>
void StylePreview::init()
{
// Ensure that the user can't toy with the child widgets.
// Method borrowed from Qt's qtconfig.
- QObjectList* l = queryList("QWidget");
- QObjectListIt it(*l);
- QObject* obj;
+ TQObjectList* l = queryList("TQWidget");
+ TQObjectListIt it(*l);
+ TQObject* obj;
while ((obj = it.current()) != 0)
{
++it;
obj->installEventFilter(this);
- ((QWidget*)obj)->setFocusPolicy(NoFocus);
+ ((TQWidget*)obj)->setFocusPolicy(NoFocus);
}
delete l;
}
-bool StylePreview::eventFilter( QObject* /* obj */, QEvent* ev )
+bool StylePreview::eventFilter( TQObject* /* obj */, TQEvent* ev )
{
switch( ev->type() )
{
- case QEvent::MouseButtonPress:
- case QEvent::MouseButtonRelease:
- case QEvent::MouseButtonDblClick:
- case QEvent::MouseMove:
- case QEvent::KeyPress:
- case QEvent::KeyRelease:
- case QEvent::Enter:
- case QEvent::Leave:
- case QEvent::Wheel:
- case QEvent::ContextMenu:
+ case TQEvent::MouseButtonPress:
+ case TQEvent::MouseButtonRelease:
+ case TQEvent::MouseButtonDblClick:
+ case TQEvent::MouseMove:
+ case TQEvent::KeyPress:
+ case TQEvent::KeyRelease:
+ case TQEvent::Enter:
+ case TQEvent::Leave:
+ case TQEvent::Wheel:
+ case TQEvent::ContextMenu:
return TRUE; // ignore
default:
break;
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index 08139b607..a13963e09 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -16,11 +16,11 @@
* along with this program; if not, write to the Free Software
*/
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qlayout.h>
-#include <qtimer.h>
-#include <qvaluelist.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
+#include <tqvaluelist.h>
#include <dcopclient.h>
@@ -31,7 +31,7 @@
#include <kgenericfactory.h>
#include <kwin.h>
#include <kcolorbutton.h>
-#include <qlabel.h>
+#include <tqlabel.h>
#define protected public
#include "kcmtaskbarui.h"
@@ -41,10 +41,10 @@
#include "kcmtaskbar.h"
#include "kcmtaskbar.moc"
-typedef KGenericFactory<TaskbarConfig, QWidget > TaskBarFactory;
+typedef KGenericFactory<TaskbarConfig, TQWidget > TaskBarFactory;
K_EXPORT_COMPONENT_FACTORY (kcm_taskbar, TaskBarFactory("kcmtaskbar") )
-TaskbarAppearance::TaskbarAppearance(QString name,
+TaskbarAppearance::TaskbarAppearance(TQString name,
bool drawButtons,
bool haloText,
bool showButtonOnHover)
@@ -77,10 +77,10 @@ void TaskbarAppearance::alterSettings() const
}
// These are the strings that are actually stored in the config file.
-const QStringList& TaskbarConfig::actionList()
+const TQStringList& TaskbarConfig::actionList()
{
- static QStringList list(
- QStringList() << I18N_NOOP("Show Task List") << I18N_NOOP("Show Operations Menu")
+ static TQStringList list(
+ TQStringList() << I18N_NOOP("Show Task List") << I18N_NOOP("Show Operations Menu")
<< I18N_NOOP("Activate, Raise or Minimize Task")
<< I18N_NOOP("Activate Task") << I18N_NOOP("Raise Task")
<< I18N_NOOP("Lower Task") << I18N_NOOP("Minimize Task")
@@ -90,38 +90,38 @@ const QStringList& TaskbarConfig::actionList()
}
// Get a translated version of the above string list.
-QStringList TaskbarConfig::i18nActionList()
+TQStringList TaskbarConfig::i18nActionList()
{
- QStringList i18nList;
- for( QStringList::ConstIterator it = actionList().begin(); it != actionList().end(); ++it ) {
+ TQStringList i18nList;
+ for( TQStringList::ConstIterator it = actionList().begin(); it != actionList().end(); ++it ) {
i18nList << i18n((*it).latin1());
}
return i18nList;
}
// These are the strings that are actually stored in the config file.
-const QStringList& TaskbarConfig::groupModeList()
+const TQStringList& TaskbarConfig::groupModeList()
{
- static QStringList list(
- QStringList() << I18N_NOOP("Never") << I18N_NOOP("When Taskbar Full")
+ static TQStringList list(
+ TQStringList() << I18N_NOOP("Never") << I18N_NOOP("When Taskbar Full")
<< I18N_NOOP("Always"));
return list;
}
// Get a translated version of the above string list.
-QStringList TaskbarConfig::i18nGroupModeList()
+TQStringList TaskbarConfig::i18nGroupModeList()
{
- QStringList i18nList;
- for( QStringList::ConstIterator it = groupModeList().begin(); it != groupModeList().end(); ++it ) {
+ TQStringList i18nList;
+ for( TQStringList::ConstIterator it = groupModeList().begin(); it != groupModeList().end(); ++it ) {
i18nList << i18n((*it).latin1());
}
return i18nList;
}
-TaskbarConfig::TaskbarConfig(QWidget *parent, const char* name, const QStringList&)
+TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringList&)
: KCModule(TaskBarFactory::instance(), parent, name)
{
- QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
m_widget = new TaskbarConfigUI(this);
layout->addWidget(m_widget);
@@ -137,8 +137,8 @@ TaskbarConfig::TaskbarConfig(QWidget *parent, const char* name, const QStringLis
m_widget->appearance->insertItem((*it).name());
}
- connect(m_widget->appearance, SIGNAL(activated(int)),
- this, SLOT(appearanceChanged(int)));
+ connect(m_widget->appearance, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(appearanceChanged(int)));
addConfig(TaskBarSettings::self(), m_widget);
setQuickHelp(i18n("<h1>Taskbar</h1> You can configure the taskbar here."
@@ -146,15 +146,15 @@ TaskbarConfig::TaskbarConfig(QWidget *parent, const char* name, const QStringLis
" windows at once or only those on the current desktop."
" You can also configure whether or not the Window List button will be displayed."));
- QStringList list = i18nActionList();
+ TQStringList list = i18nActionList();
m_widget->kcfg_LeftButtonAction->insertStringList(list);
m_widget->kcfg_MiddleButtonAction->insertStringList(list);
m_widget->kcfg_RightButtonAction->insertStringList(list);
m_widget->kcfg_GroupTasks->insertStringList(i18nGroupModeList());
- connect(m_widget->kcfg_GroupTasks, SIGNAL(activated(int)),
- this, SLOT(slotUpdateComboBox()));
- connect(m_widget->kcfg_UseCustomColors, SIGNAL(stateChanged(int)), this, SLOT(slotUpdateCustomColors()));
+ connect(m_widget->kcfg_GroupTasks, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(slotUpdateComboBox()));
+ connect(m_widget->kcfg_UseCustomColors, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotUpdateCustomColors()));
slotUpdateCustomColors();
updateAppearanceCombo();
@@ -166,12 +166,12 @@ TaskbarConfig::TaskbarConfig(QWidget *parent, const char* name, const QStringLis
m_widget->spacer2->changeSize(0, 0);
}
- if (!QApplication::desktop()->isVirtualDesktop() ||
- QApplication::desktop()->numScreens() == 1) // No Ximerama
+ if (!TQApplication::desktop()->isVirtualDesktop() ||
+ TQApplication::desktop()->numScreens() == 1) // No Ximerama
{
m_widget->showAllScreens->hide();
}
- connect( m_widget->showAllScreens, SIGNAL( stateChanged( int )), SLOT( changed()));
+ connect( m_widget->showAllScreens, TQT_SIGNAL( stateChanged( int )), TQT_SLOT( changed()));
KAboutData *about = new KAboutData(I18N_NOOP("kcmtaskbar"),
I18N_NOOP("KDE Taskbar Control Module"),
@@ -184,7 +184,7 @@ TaskbarConfig::TaskbarConfig(QWidget *parent, const char* name, const QStringLis
setAboutData(about);
load();
- QTimer::singleShot(0, this, SLOT(notChanged()));
+ TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
}
void TaskbarConfig::slotUpdateCustomColors()
@@ -212,7 +212,7 @@ void TaskbarConfig::slotUpdateComboBox()
}
else
{
- QString action = i18nActionList()[pos];
+ TQString action = i18nActionList()[pos];
m_widget->kcfg_LeftButtonAction->changeItem(action,pos);
m_widget->kcfg_MiddleButtonAction->changeItem(action,pos);
m_widget->kcfg_RightButtonAction->changeItem(action,pos);
@@ -274,7 +274,7 @@ void TaskbarConfig::save()
KCModule::save();
- QByteArray data;
+ TQByteArray data;
kapp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data);
}
diff --git a/kcontrol/taskbar/kcmtaskbar.h b/kcontrol/taskbar/kcmtaskbar.h
index 6fd28e92d..877f26daf 100644
--- a/kcontrol/taskbar/kcmtaskbar.h
+++ b/kcontrol/taskbar/kcmtaskbar.h
@@ -19,7 +19,7 @@
#ifndef __kcmtaskbar_h__
#define __kcmtaskbar_h__
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include <kcmodule.h>
@@ -28,20 +28,20 @@ class TaskbarConfigUI;
class TaskbarAppearance
{
public:
- typedef QValueList<TaskbarAppearance> List;
+ typedef TQValueList<TaskbarAppearance> List;
TaskbarAppearance();
- TaskbarAppearance(QString name,
+ TaskbarAppearance(TQString name,
bool drawButtons,
bool haloText,
bool showButtonOnHover);
bool matchesSettings() const;
void alterSettings() const;
- QString name() const { return m_name; }
+ TQString name() const { return m_name; }
private:
- QString m_name;
+ TQString m_name;
bool m_drawButtons;
bool m_haloText;
bool m_showButtonOnHover;
@@ -52,8 +52,8 @@ class TaskbarConfig : public KCModule
Q_OBJECT
public:
- TaskbarConfig(QWidget *parent = 0, const char* name = 0,
- const QStringList &list = QStringList());
+ TaskbarConfig(TQWidget *parent = 0, const char* name = 0,
+ const TQStringList &list = TQStringList());
public slots:
void load();
@@ -69,10 +69,10 @@ protected slots:
private:
TaskbarAppearance::List m_appearances;
void updateAppearanceCombo();
- static const QStringList& actionList();
- static QStringList i18nActionList();
- static const QStringList& groupModeList();
- static QStringList i18nGroupModeList();
+ static const TQStringList& actionList();
+ static TQStringList i18nActionList();
+ static const TQStringList& groupModeList();
+ static TQStringList i18nGroupModeList();
TaskbarConfigUI *m_widget;
};
diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp
index 24cb1f1bd..f3a5a85df 100644
--- a/kcontrol/usbview/kcmusb.cpp
+++ b/kcontrol/usbview/kcmusb.cpp
@@ -8,13 +8,13 @@
* *
***************************************************************************/
-#include <qgroupbox.h>
-#include <qheader.h>
-#include <qlayout.h>
-#include <qlistview.h>
-#include <qsplitter.h>
-#include <qtextview.h>
-#include <qtimer.h>
+#include <tqgroupbox.h>
+#include <tqheader.h>
+#include <tqlayout.h>
+#include <tqlistview.h>
+#include <tqsplitter.h>
+#include <tqtextview.h>
+#include <tqtimer.h>
#include <kaboutdata.h>
#include <kdialog.h>
@@ -23,10 +23,10 @@
#include "usbdevices.h"
#include "kcmusb.moc"
-typedef KGenericFactory<USBViewer, QWidget > USBFactory;
+typedef KGenericFactory<USBViewer, TQWidget > USBFactory;
K_EXPORT_COMPONENT_FACTORY (kcm_usb, USBFactory("kcmusb") )
-USBViewer::USBViewer(QWidget *parent, const char *name, const QStringList &)
+USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(USBFactory::instance(), parent, name)
{
setButtons(Help);
@@ -34,38 +34,38 @@ USBViewer::USBViewer(QWidget *parent, const char *name, const QStringList &)
setQuickHelp( i18n("<h1>USB Devices</h1> This module allows you to see"
" the devices attached to your USB bus(es)."));
- QVBoxLayout *vbox = new QVBoxLayout(this, 0, KDialog::spacingHint());
- QGroupBox *gbox = new QGroupBox(i18n("USB Devices"), this);
+ TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ TQGroupBox *gbox = new TQGroupBox(i18n("USB Devices"), this);
gbox->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(gbox);
- QVBoxLayout *vvbox = new QVBoxLayout(gbox->layout(), KDialog::spacingHint());
+ TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint());
- QSplitter *splitter = new QSplitter(gbox);
+ TQSplitter *splitter = new TQSplitter(gbox);
vvbox->addWidget(splitter);
- _devices = new QListView(splitter);
+ _devices = new TQListView(splitter);
_devices->addColumn(i18n("Device"));
_devices->setRootIsDecorated(true);
_devices->header()->hide();
_devices->setMinimumWidth(200);
- _devices->setColumnWidthMode(0, QListView::Maximum);
+ _devices->setColumnWidthMode(0, TQListView::Maximum);
- QValueList<int> sizes;
+ TQValueList<int> sizes;
sizes.append(200);
splitter->setSizes(sizes);
- _details = new QTextView(splitter);
+ _details = new TQTextView(splitter);
- splitter->setResizeMode(_devices, QSplitter::KeepSize);
+ splitter->setResizeMode(_devices, TQSplitter::KeepSize);
- QTimer *refreshTimer = new QTimer(this);
+ TQTimer *refreshTimer = new TQTimer(this);
// 1 sec seems to be a good compromise between latency and polling load.
refreshTimer->start(1000);
- connect(refreshTimer, SIGNAL(timeout()), SLOT(refresh()));
- connect(_devices, SIGNAL(selectionChanged(QListViewItem*)),
- this, SLOT(selectionChanged(QListViewItem*)));
+ connect(refreshTimer, TQT_SIGNAL(timeout()), TQT_SLOT(refresh()));
+ connect(_devices, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
+ this, TQT_SLOT(selectionChanged(TQListViewItem*)));
KAboutData *about =
new KAboutData(I18N_NOOP("kcmusb"), I18N_NOOP("KDE USB Viewer"),
@@ -97,12 +97,12 @@ static Q_UINT32 key_parent( USBDevice &dev )
return dev.bus()*256 + dev.parent();
}
-static void delete_recursive( QListViewItem *item, const QIntDict<QListViewItem> &new_items )
+static void delete_recursive( TQListViewItem *item, const TQIntDict<TQListViewItem> &new_items )
{
if (!item)
return;
- QListViewItemIterator it( item );
+ TQListViewItemIterator it( item );
while ( it.current() ) {
if (!new_items.find(it.current()->text(1).toUInt())) {
delete_recursive( it.current()->firstChild(), new_items);
@@ -114,7 +114,7 @@ static void delete_recursive( QListViewItem *item, const QIntDict<QListViewItem>
void USBViewer::refresh()
{
- QIntDict<QListViewItem> new_items;
+ TQIntDict<TQListViewItem> new_items;
if (!USBDevice::parse("/proc/bus/usb/devices"))
USBDevice::parseSys("/sys/bus/usb/devices");
@@ -126,33 +126,33 @@ void USBViewer::refresh()
{
found = false;
- QPtrListIterator<USBDevice> it(USBDevice::devices());
+ TQPtrListIterator<USBDevice> it(USBDevice::devices());
for ( ; it.current(); ++it)
if (it.current()->level() == level)
{
Q_UINT32 k = key(*it.current());
if (level == 0)
{
- QListViewItem *item = _items.find(k);
+ TQListViewItem *item = _items.find(k);
if (!item) {
- item = new QListViewItem(_devices,
+ item = new TQListViewItem(_devices,
it.current()->product(),
- QString::number(k));
+ TQString::number(k));
}
new_items.insert(k, item);
found = true;
}
else
{
- QListViewItem *parent = new_items.find(key_parent(*it.current()));
+ TQListViewItem *parent = new_items.find(key_parent(*it.current()));
if (parent)
{
- QListViewItem *item = _items.find(k);
+ TQListViewItem *item = _items.find(k);
if (!item) {
- item = new QListViewItem(parent,
+ item = new TQListViewItem(parent,
it.current()->product(),
- QString::number(k) );
+ TQString::number(k) );
}
new_items.insert(k, item);
parent->setOpen(true);
@@ -174,7 +174,7 @@ void USBViewer::refresh()
}
-void USBViewer::selectionChanged(QListViewItem *item)
+void USBViewer::selectionChanged(TQListViewItem *item)
{
if (item)
{
diff --git a/kcontrol/usbview/kcmusb.h b/kcontrol/usbview/kcmusb.h
index 275431078..472b289b4 100644
--- a/kcontrol/usbview/kcmusb.h
+++ b/kcontrol/usbview/kcmusb.h
@@ -12,7 +12,7 @@
#ifndef _KCMUSB_H
#define _KCMUSB_H
-#include <qintdict.h>
+#include <tqintdict.h>
#include <kcmodule.h>
@@ -27,20 +27,20 @@ class USBViewer : public KCModule
public:
- USBViewer(QWidget *parent = 0L, const char *name = 0L, const QStringList &list=QStringList() );
+ USBViewer(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &list=TQStringList() );
void load();
protected slots:
- void selectionChanged(QListViewItem *item);
+ void selectionChanged(TQListViewItem *item);
void refresh();
private:
- QIntDict<QListViewItem> _items;
- QListView *_devices;
- QTextView *_details;
+ TQIntDict<TQListViewItem> _items;
+ TQListView *_devices;
+ TQTextView *_details;
};
diff --git a/kcontrol/usbview/usbdb.cpp b/kcontrol/usbview/usbdb.cpp
index 89cf973ba..c786ca40e 100644
--- a/kcontrol/usbview/usbdb.cpp
+++ b/kcontrol/usbview/usbdb.cpp
@@ -13,8 +13,8 @@
#include <iostream>
-#include <qfile.h>
-#include <qregexp.h>
+#include <tqfile.h>
+#include <tqregexp.h>
#include <kstandarddirs.h>
@@ -26,11 +26,11 @@
USBDB::USBDB()
{
#ifndef USBIDS_FILE
- QString db = "/usr/share/hwdata/usb.ids"; /* on Fedora */
- if (!QFile::exists(db))
+ TQString db = "/usr/share/hwdata/usb.ids"; /* on Fedora */
+ if (!TQFile::exists(db))
db = locate("data", "kcmusb/usb.ids");
#else
- QString db = USBIDS_FILE;
+ TQString db = USBIDS_FILE;
#endif
if (db.isEmpty())
return;
@@ -38,19 +38,19 @@ USBDB::USBDB()
_classes.setAutoDelete(true);
_ids.setAutoDelete(true);
- QFile f(db);
+ TQFile f(db);
if (f.open(IO_ReadOnly))
{
- QTextStream ts(&f);
+ TQTextStream ts(&f);
- QString line, name;
+ TQString line, name;
int id=0, subid=0, protid=0;
- QRegExp vendor("[0-9a-fA-F]+ ");
- QRegExp product("\\s+[0-9a-fA-F]+ ");
- QRegExp cls("C [0-9a-fA-F][0-9a-fA-F]");
- QRegExp subclass("\\s+[0-9a-fA-F][0-9a-fA-F] ");
- QRegExp prot("\\s+[0-9a-fA-F][0-9a-fA-F] ");
+ TQRegExp vendor("[0-9a-fA-F]+ ");
+ TQRegExp product("\\s+[0-9a-fA-F]+ ");
+ TQRegExp cls("C [0-9a-fA-F][0-9a-fA-F]");
+ TQRegExp subclass("\\s+[0-9a-fA-F][0-9a-fA-F] ");
+ TQRegExp prot("\\s+[0-9a-fA-F][0-9a-fA-F] ");
while (!ts.eof())
{
line = ts.readLine();
@@ -65,34 +65,34 @@ USBDB::USBDB()
{
id = line.mid(2,2).toInt(0, 16);
name = line.mid(4).stripWhiteSpace();
- _classes.insert(QString("%1").arg(id), new QString(name));
+ _classes.insert(TQString("%1").arg(id), new TQString(name));
}
else if (prot.search(line) == 0 && prot.matchedLength() > 5)
{
line = line.stripWhiteSpace();
protid = line.left(2).toInt(0, 16);
name = line.mid(4).stripWhiteSpace();
- _classes.insert(QString("%1-%2-%3").arg(id).arg(subid).arg(protid), new QString(name));
+ _classes.insert(TQString("%1-%2-%3").arg(id).arg(subid).arg(protid), new TQString(name));
}
else if (subclass.search(line) == 0 && subclass.matchedLength() > 4)
{
line = line.stripWhiteSpace();
subid = line.left(2).toInt(0, 16);
name = line.mid(4).stripWhiteSpace();
- _classes.insert(QString("%1-%2").arg(id).arg(subid), new QString(name));
+ _classes.insert(TQString("%1-%2").arg(id).arg(subid), new TQString(name));
}
else if (vendor.search(line) == 0 && vendor.matchedLength() == 5)
{
id = line.left(4).toInt(0,16);
name = line.mid(6);
- _ids.insert(QString("%1").arg(id), new QString(name));
+ _ids.insert(TQString("%1").arg(id), new TQString(name));
}
else if (product.search(line) == 0 && product.matchedLength() > 5 )
{
line = line.stripWhiteSpace();
subid = line.left(4).toInt(0,16);
name = line.mid(6);
- _ids.insert(QString("%1-%2").arg(id).arg(subid), new QString(name));
+ _ids.insert(TQString("%1-%2").arg(id).arg(subid), new TQString(name));
}
}
@@ -102,49 +102,49 @@ USBDB::USBDB()
}
-QString USBDB::vendor(int id)
+TQString USBDB::vendor(int id)
{
- QString *s = _ids[QString("%1").arg(id)];
+ TQString *s = _ids[TQString("%1").arg(id)];
if ((id!= 0) && s)
{
return *s;
}
- return QString::null;
+ return TQString::null;
}
-QString USBDB::device(int vendor, int id)
+TQString USBDB::device(int vendor, int id)
{
- QString *s = _ids[QString("%1-%2").arg(vendor).arg(id)];
+ TQString *s = _ids[TQString("%1-%2").arg(vendor).arg(id)];
if ((id != 0) && (vendor != 0) && s)
return *s;
- return QString::null;
+ return TQString::null;
}
-QString USBDB::cls(int cls)
+TQString USBDB::cls(int cls)
{
- QString *s = _classes[QString("%1").arg(cls)];
+ TQString *s = _classes[TQString("%1").arg(cls)];
if (s)
return *s;
- return QString::null;
+ return TQString::null;
}
-QString USBDB::subclass(int cls, int sub)
+TQString USBDB::subclass(int cls, int sub)
{
- QString *s = _classes[QString("%1-%2").arg(cls).arg(sub)];
+ TQString *s = _classes[TQString("%1-%2").arg(cls).arg(sub)];
if (s)
return *s;
- return QString::null;
+ return TQString::null;
}
-QString USBDB::protocol(int cls, int sub, int prot)
+TQString USBDB::protocol(int cls, int sub, int prot)
{
- QString *s = _classes[QString("%1-%2-%2").arg(cls).arg(sub).arg(prot)];
+ TQString *s = _classes[TQString("%1-%2-%2").arg(cls).arg(sub).arg(prot)];
if (s)
return *s;
- return QString::null;
+ return TQString::null;
}
diff --git a/kcontrol/usbview/usbdb.h b/kcontrol/usbview/usbdb.h
index 2b4226937..0b8c9f550 100644
--- a/kcontrol/usbview/usbdb.h
+++ b/kcontrol/usbview/usbdb.h
@@ -13,7 +13,7 @@
#define __USB_DB_H__
-#include <qdict.h>
+#include <tqdict.h>
class USBDB
@@ -22,16 +22,16 @@ public:
USBDB();
- QString vendor(int id);
- QString device(int vendor, int id);
+ TQString vendor(int id);
+ TQString device(int vendor, int id);
- QString cls(int cls);
- QString subclass(int cls, int sub);
- QString protocol(int cls, int sub, int prot);
+ TQString cls(int cls);
+ TQString subclass(int cls, int sub);
+ TQString protocol(int cls, int sub, int prot);
private:
- QDict<QString> _classes, _ids;
+ TQDict<TQString> _classes, _ids;
};
diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp
index 3d557a7ed..466fd9a98 100644
--- a/kcontrol/usbview/usbdevices.cpp
+++ b/kcontrol/usbview/usbdevices.cpp
@@ -15,9 +15,9 @@
#include <unistd.h>
#include <stdio.h>
-#include <qfile.h>
-#include <qdir.h>
-#include <qregexp.h>
+#include <tqfile.h>
+#include <tqdir.h>
+#include <tqregexp.h>
#include <klocale.h>
#include <kmessagebox.h>
@@ -32,7 +32,7 @@
#include <sys/param.h>
#endif
-QPtrList<USBDevice> USBDevice::_devices;
+TQPtrList<USBDevice> USBDevice::_devices;
USBDB *USBDevice::_db;
@@ -50,26 +50,26 @@ USBDevice::USBDevice()
_db = new USBDB;
}
-static QString catFile(QString fname)
+static TQString catFile(TQString fname)
{
char buffer[256];
- QString result;
- int fd = ::open(QFile::encodeName(fname), O_RDONLY);
+ TQString result;
+ int fd = ::open(TQFile::encodeName(fname), O_RDONLY);
if (fd<0)
- return QString::null;
+ return TQString::null;
if (fd >= 0)
{
ssize_t count;
while ((count = ::read(fd, buffer, 256)) > 0)
- result.append(QString(buffer).left(count));
+ result.append(TQString(buffer).left(count));
::close(fd);
}
return result.stripWhiteSpace();
}
-void USBDevice::parseSysDir(int bus, int parent, int level, QString dname)
+void USBDevice::parseSysDir(int bus, int parent, int level, TQString dname)
{
_level = level;
_parent = parent;
@@ -80,7 +80,7 @@ void USBDevice::parseSysDir(int bus, int parent, int level, QString dname)
_device = catFile(dname + "/devnum").toUInt();
if (_device == 1)
- _product += QString(" (%1)").arg(_bus);
+ _product += TQString(" (%1)").arg(_bus);
_vendorID = catFile(dname + "/idVendor").toUInt(0, 16);
_prodID = catFile(dname + "/idProduct").toUInt(0, 16);
@@ -97,12 +97,12 @@ void USBDevice::parseSysDir(int bus, int parent, int level, QString dname)
_verMajor = int(version);
_verMinor = int(10*(version - floor(version)));
- QDir dir(dname);
- dir.setNameFilter(QString("%1-*").arg(bus));
- dir.setFilter(QDir::Dirs);
- QStringList list = dir.entryList();
+ TQDir dir(dname);
+ dir.setNameFilter(TQString("%1-*").arg(bus));
+ dir.setFilter(TQDir::Dirs);
+ TQStringList list = dir.entryList();
- for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+ for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
if ((*it).contains(':'))
continue;
@@ -111,7 +111,7 @@ void USBDevice::parseSysDir(int bus, int parent, int level, QString dname)
}
}
-void USBDevice::parseLine(QString line)
+void USBDevice::parseLine(TQString line)
{
if (line.startsWith("T:"))
sscanf(line.local8Bit().data(),
@@ -123,7 +123,7 @@ void USBDevice::parseLine(QString line)
_product = line.mid(12);
/* add bus number to root devices */
if (_device==1)
- _product += QString(" (%1)").arg(_bus);
+ _product += TQString(" (%1)").arg(_bus);
}
else if (line.startsWith("S: SerialNumber"))
_serial = line.mid(17);
@@ -151,27 +151,27 @@ void USBDevice::parseLine(QString line)
USBDevice *USBDevice::find(int bus, int device)
{
- QPtrListIterator<USBDevice> it(_devices);
+ TQPtrListIterator<USBDevice> it(_devices);
for ( ; it.current(); ++it)
if (it.current()->bus() == bus && it.current()->device() == device)
return it.current();
return 0;
}
-QString USBDevice::product()
+TQString USBDevice::product()
{
if (!_product.isEmpty())
return _product;
- QString pname = _db->device(_vendorID, _prodID);
+ TQString pname = _db->device(_vendorID, _prodID);
if (!pname.isEmpty())
return pname;
return i18n("Unknown");
}
-QString USBDevice::dump()
+TQString USBDevice::dump()
{
- QString r;
+ TQString r;
r = "<qml><h2><center>" + product() + "</center></h2><br/><hl/>";
@@ -182,41 +182,41 @@ QString USBDevice::dump()
r += "<br/><table>";
- QString c = QString("<td>%1</td>").arg(_class);
- QString cname = _db->cls(_class);
+ TQString c = TQString("<td>%1</td>").arg(_class);
+ TQString cname = _db->cls(_class);
if (!cname.isEmpty())
c += "<td>(" + i18n(cname.latin1()) +")</td>";
r += i18n("<tr><td><i>Class</i></td>%1</tr>").arg(c);
- QString sc = QString("<td>%1</td>").arg(_sub);
- QString scname = _db->subclass(_class, _sub);
+ TQString sc = TQString("<td>%1</td>").arg(_sub);
+ TQString scname = _db->subclass(_class, _sub);
if (!scname.isEmpty())
sc += "<td>(" + i18n(scname.latin1()) +")</td>";
r += i18n("<tr><td><i>Subclass</i></td>%1</tr>").arg(sc);
- QString pr = QString("<td>%1</td>").arg(_prot);
- QString prname = _db->protocol(_class, _sub, _prot);
+ TQString pr = TQString("<td>%1</td>").arg(_prot);
+ TQString prname = _db->protocol(_class, _sub, _prot);
if (!prname.isEmpty())
pr += "<td>(" + prname +")</td>";
r += i18n("<tr><td><i>Protocol</i></td>%1</tr>").arg(pr);
#ifndef Q_OS_FREEBSD
r += i18n("<tr><td><i>USB Version</i></td><td>%1.%2</td></tr>")
.arg(_verMajor,0,16)
- .arg(QString::number(_verMinor,16).prepend('0').right(2));
+ .arg(TQString::number(_verMinor,16).prepend('0').right(2));
#endif
r += "<tr><td></td></tr>";
- QString v = QString::number(_vendorID,16);
- QString name = _db->vendor(_vendorID);
+ TQString v = TQString::number(_vendorID,16);
+ TQString name = _db->vendor(_vendorID);
if (!name.isEmpty())
v += "<td>(" + name +")</td>";
r += i18n("<tr><td><i>Vendor ID</i></td><td>0x%1</td></tr>").arg(v);
- QString p = QString::number(_prodID,16);
- QString pname = _db->device(_vendorID, _prodID);
+ TQString p = TQString::number(_prodID,16);
+ TQString pname = _db->device(_vendorID, _prodID);
if (!pname.isEmpty())
p += "<td>(" + pname +")</td>";
r += i18n("<tr><td><i>Product ID</i></td><td>0x%1</td></tr>").arg(p);
r += i18n("<tr><td><i>Revision</i></td><td>%1.%2</td></tr>")
.arg(_revMajor,0,16)
- .arg(QString::number(_revMinor,16).prepend('0').right(2));
+ .arg(TQString::number(_revMinor,16).prepend('0').right(2));
r += "<tr><td></td></tr>";
r += i18n("<tr><td><i>Speed</i></td><td>%1 Mbit/s</td></tr>").arg(_speed);
@@ -228,7 +228,7 @@ QString USBDevice::dump()
r += i18n("<tr><td><i>Power Consumption</i></td><td>self powered</td></tr>");
r += i18n("<tr><td><i>Attached Devicenodes</i></td><td>%1</td></tr>").arg(*_devnodes.at(0));
if ( _devnodes.count() > 1 )
- for ( QStringList::Iterator it = _devnodes.at(1); it != _devnodes.end(); ++it )
+ for ( TQStringList::Iterator it = _devnodes.at(1); it != _devnodes.end(); ++it )
r += "<tr><td></td><td>" + *it + "</td></tr>";
#else
r += i18n("<tr><td><i>Max. Packet Size</i></td><td>%1</td></tr>").arg(_maxPacketSize);
@@ -250,18 +250,18 @@ QString USBDevice::dump()
#ifndef Q_OS_FREEBSD
-bool USBDevice::parse(QString fname)
+bool USBDevice::parse(TQString fname)
{
_devices.clear();
- QString result;
+ TQString result;
// read in the complete file
//
- // Note: we can't use a QTextStream, as the files in /proc
+ // Note: we can't use a TQTextStream, as the files in /proc
// are pseudo files with zero length
char buffer[256];
- int fd = ::open(QFile::encodeName(fname), O_RDONLY);
+ int fd = ::open(TQFile::encodeName(fname), O_RDONLY);
if (fd<0)
return false;
@@ -269,7 +269,7 @@ bool USBDevice::parse(QString fname)
{
ssize_t count;
while ((count = ::read(fd, buffer, 256)) > 0)
- result.append(QString(buffer).left(count));
+ result.append(TQString(buffer).left(count));
::close(fd);
}
@@ -277,10 +277,10 @@ bool USBDevice::parse(QString fname)
// read in the device infos
USBDevice *device = 0;
int start=0, end;
- result.replace(QRegExp("^\n"),"");
+ result.replace(TQRegExp("^\n"),"");
while ((end = result.find('\n', start)) > 0)
{
- QString line = result.mid(start, end-start);
+ TQString line = result.mid(start, end-start);
if (line.startsWith("T:"))
device = new USBDevice();
@@ -293,17 +293,17 @@ bool USBDevice::parse(QString fname)
return true;
}
-bool USBDevice::parseSys(QString dname)
+bool USBDevice::parseSys(TQString dname)
{
- QDir d(dname);
+ TQDir d(dname);
d.setNameFilter("usb*");
- QStringList list = d.entryList();
+ TQStringList list = d.entryList();
- for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+ for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
USBDevice* device = new USBDevice();
int bus = 0;
- QRegExp bus_reg("[a-z]*([0-9]+)");
+ TQRegExp bus_reg("[a-z]*([0-9]+)");
if (bus_reg.search(*it) != -1)
bus = bus_reg.cap(1).toInt();
@@ -332,10 +332,10 @@ void USBDevice::collectData( int fd, int level, usb_device_info &di, int parent)
_bus = di.udi_bus;
_device = di.udi_addr;
- _product = QString::fromLatin1(di.udi_product);
+ _product = TQString::fromLatin1(di.udi_product);
if ( _device == 1 )
- _product += " " + QString::number( _bus );
- _manufacturer = QString::fromLatin1(di.udi_vendor);
+ _product += " " + TQString::number( _bus );
+ _manufacturer = TQString::fromLatin1(di.udi_vendor);
_prodID = di.udi_productNo;
_vendorID = di.udi_vendorNo;
_class = di.udi_class;
@@ -387,13 +387,13 @@ void USBDevice::collectData( int fd, int level, usb_device_info &di, int parent)
-bool USBDevice::parse(QString fname)
+bool USBDevice::parse(TQString fname)
{
static bool showErrorMessage = true;
bool error = false;
_devices.clear();
- QFile controller("/dev/usb0");
+ TQFile controller("/dev/usb0");
int i = 1;
while ( controller.exists() )
{
@@ -418,7 +418,7 @@ bool USBDevice::parse(QString fname)
} else {
error = true;
}
- controller.setName( QString::fromLocal8Bit("/dev/usb%1").arg(i++) );
+ controller.setName( TQString::fromLocal8Bit("/dev/usb%1").arg(i++) );
}
if ( showErrorMessage && error ) {
diff --git a/kcontrol/usbview/usbdevices.h b/kcontrol/usbview/usbdevices.h
index 853df02b3..23717ee65 100644
--- a/kcontrol/usbview/usbdevices.h
+++ b/kcontrol/usbview/usbdevices.h
@@ -13,8 +13,8 @@
#define __USB_DEVICES_H__
-#include <qstring.h>
-#include <qptrlist.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
#ifdef Q_OS_FREEBSD
#include <dev/usb/usb.h>
@@ -29,45 +29,45 @@ public:
USBDevice();
- void parseLine(QString line);
- void parseSysDir(int bus, int parent, int level, QString line);
+ void parseLine(TQString line);
+ void parseSysDir(int bus, int parent, int level, TQString line);
int level() { return _level; };
int device() { return _device; };
int parent() { return _parent; };
int bus() { return _bus; };
- QString product();
+ TQString product();
- QString dump();
+ TQString dump();
- static QPtrList<USBDevice> &devices() { return _devices; };
+ static TQPtrList<USBDevice> &devices() { return _devices; };
static USBDevice *find(int bus, int device);
- static bool parse(QString fname);
- static bool parseSys(QString fname);
+ static bool parse(TQString fname);
+ static bool parseSys(TQString fname);
private:
- static QPtrList<USBDevice> _devices;
+ static TQPtrList<USBDevice> _devices;
static USBDB *_db;
int _bus, _level, _parent, _port, _count, _device, _channels, _power;
float _speed;
- QString _manufacturer, _product, _serial;
+ TQString _manufacturer, _product, _serial;
int _bwTotal, _bwUsed, _bwPercent, _bwIntr, _bwIso;
bool _hasBW;
unsigned int _verMajor, _verMinor, _class, _sub, _prot, _maxPacketSize, _configs;
- QString _className;
+ TQString _className;
unsigned int _vendorID, _prodID, _revMajor, _revMinor;
#ifdef Q_OS_FREEBSD
void collectData( int fd, int level, usb_device_info &di, int parent );
- QStringList _devnodes;
+ TQStringList _devnodes;
#endif
};
diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp
index 87089b321..b178e07e3 100644
--- a/kcontrol/view1394/view1394.cpp
+++ b/kcontrol/view1394/view1394.cpp
@@ -18,11 +18,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qlistview.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqlistview.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <kdialog.h>
#include <kglobal.h>
@@ -58,7 +58,7 @@ int my_reset_handler(raw1394handle_t handle, unsigned int )
}
-View1394::View1394(QWidget *parent, const char *name)
+View1394::View1394(TQWidget *parent, const char *name)
:KCModule(parent,name)
,m_insideRescanBus(false)
{
@@ -79,15 +79,15 @@ View1394::View1394(QWidget *parent, const char *name)
setButtons( KCModule::Help );
m_ouiDb=new OuiDb();
- QVBoxLayout *box=new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *box=new TQVBoxLayout(this, 0, KDialog::spacingHint());
m_view=new View1394Widget(this);
for (int i=2; i<8; i++)
m_view->m_listview->setColumnAlignment(i, AlignHCenter);
m_view->m_listview->setColumnAlignment(8, AlignRight);
m_view->m_listview->setColumnAlignment(9, AlignRight);
box->addWidget(m_view);
- connect(m_view->m_busResetPb, SIGNAL(clicked()), this, SLOT(generateBusReset()));
- connect(&m_rescanTimer, SIGNAL(timeout()), this, SLOT(rescanBus()));
+ connect(m_view->m_busResetPb, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateBusReset()));
+ connect(&m_rescanTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(rescanBus()));
m_notifiers.setAutoDelete(true);
rescanBus();
}
@@ -143,7 +143,7 @@ bool View1394::readConfigRom(raw1394handle_t handle, nodeid_t nodeid, quadlet_t&
void View1394::callRaw1394EventLoop(int fd)
{
- for (QValueList<raw1394handle_t>::iterator it= m_handles.begin(); it!=m_handles.end(); ++it)
+ for (TQValueList<raw1394handle_t>::iterator it= m_handles.begin(); it!=m_handles.end(); ++it)
if (raw1394_get_fd(*it)==fd)
{
raw1394_loop_iterate(*it);
@@ -162,7 +162,7 @@ void View1394::rescanBus()
// static int depth=0;
// depth++;
m_notifiers.clear();
- for (QValueList<raw1394handle_t>::iterator it=m_handles.begin(); it!=m_handles.end(); ++it)
+ for (TQValueList<raw1394handle_t>::iterator it=m_handles.begin(); it!=m_handles.end(); ++it)
raw1394_destroy_handle(*it);
m_handles.clear();
m_view->m_listview->clear();
@@ -188,12 +188,12 @@ void View1394::rescanBus()
}
raw1394_set_userdata(handle, this);
raw1394_set_bus_reset_handler(handle, my_reset_handler);
- QSocketNotifier *notif=new QSocketNotifier(raw1394_get_fd(handle),QSocketNotifier::Read);
- connect(notif, SIGNAL(activated(int)), this, SLOT(callRaw1394EventLoop(int)));
+ TQSocketNotifier *notif=new TQSocketNotifier(raw1394_get_fd(handle),TQSocketNotifier::Read);
+ connect(notif, TQT_SIGNAL(activated(int)), this, TQT_SLOT(callRaw1394EventLoop(int)));
m_notifiers.append(notif);
m_handles.append(handle);
- QListViewItem *card=new QListViewItem(m_view->m_listview,i18n("Port %1:\"%2\"").arg(i).arg(p_info[i].name));
+ TQListViewItem *card=new TQListViewItem(m_view->m_listview,i18n("Port %1:\"%2\"").arg(i).arg(p_info[i].name));
int num_of_nodes=raw1394_get_nodecount(handle);
int localNodeId=raw1394_get_local_id(handle);
@@ -206,34 +206,34 @@ void View1394::rescanBus()
quadlet_t cap=0;
bool success=readConfigRom(handle, j, firstQuad, cap, guid);
- QString nodeStr=i18n("Node %1").arg(j);
+ TQString nodeStr=i18n("Node %1").arg(j);
if (!success)
{
- new QListViewItem(card,nodeStr, i18n("Not ready"));
+ new TQListViewItem(card,nodeStr, i18n("Not ready"));
continue;
}
if (((firstQuad>>24) & 0xff)==1) //minimal config rom
{
- QString guidStr=QString::number(firstQuad,16);
+ TQString guidStr=TQString::number(firstQuad,16);
guidStr="0x"+guidStr.rightJustify(6,'0');
- new QListViewItem(card,nodeStr, guidStr);
+ new TQListViewItem(card,nodeStr, guidStr);
}
else //general config rom
{
- QString guidStr;
+ TQString guidStr;
char buf[32];
snprintf(buf, 32, "%"PRIX64, guid);
guidStr=buf;
guidStr="0x"+guidStr.rightJustify(16,'0');
- QString local=((j | 0xffc0) == localNodeId)?"X":"";
- QString irmStr=(cap & 0x80000000) ? "X":"";
- QString cmStr=(cap & 0x40000000) ? "X":"";
- QString isStr=(cap & 0x20000000) ? "X":"";
- QString bmStr=(cap & 0x10000000) ? "X":"";
- QString pmStr=(cap & 0x08000000) ? "X":"";
- QString accStr=QString::number((cap &0x00ff0000)>>16);
+ TQString local=((j | 0xffc0) == localNodeId)?"X":"";
+ TQString irmStr=(cap & 0x80000000) ? "X":"";
+ TQString cmStr=(cap & 0x40000000) ? "X":"";
+ TQString isStr=(cap & 0x20000000) ? "X":"";
+ TQString bmStr=(cap & 0x10000000) ? "X":"";
+ TQString pmStr=(cap & 0x08000000) ? "X":"";
+ TQString accStr=TQString::number((cap &0x00ff0000)>>16);
int speed=( cap & 0x00000007);
- QString speedStr;
+ TQString speedStr;
switch(speed)
{
case(3):
@@ -250,7 +250,7 @@ void View1394::rescanBus()
speedStr="100";
break;
}
- QListViewItem* node=new QListViewItem(card);
+ TQListViewItem* node=new TQListViewItem(card);
node->setText(0,nodeStr);
node->setText(1, guidStr);
node->setText(2,local);
@@ -272,21 +272,21 @@ void View1394::rescanBus()
void View1394::generateBusReset()
{
- for (QValueList<raw1394handle_t>::iterator it=m_handles.begin(); it!=m_handles.end(); ++it)
+ for (TQValueList<raw1394handle_t>::iterator it=m_handles.begin(); it!=m_handles.end(); ++it)
raw1394_reset_bus(*it);
}
OuiDb::OuiDb()
{
- QString filename=locate("data","kcmview1394/oui.db");
+ TQString filename=locate("data","kcmview1394/oui.db");
if (filename.isEmpty())
return;
- QFile f(filename);
+ TQFile f(filename);
if (!f.open(IO_ReadOnly))
return;
- QByteArray ba=f.readAll();
+ TQByteArray ba=f.readAll();
int bytesLeft=ba.size();
char* data=ba.data();
while(bytesLeft>8)
@@ -306,12 +306,12 @@ OuiDb::OuiDb()
f.close();
}
-QString OuiDb::vendor(octlet_t guid)
+TQString OuiDb::vendor(octlet_t guid)
{
guid=(guid & 0xffffff0000000000LL)>>40;
- QString key=QString::number((unsigned int)(guid),16);
+ TQString key=TQString::number((unsigned int)(guid),16);
key=key.rightJustify(6, '0').upper();
- QString v=m_vendorIds[key];
+ TQString v=m_vendorIds[key];
if (v.isEmpty())
v=i18n("Unknown");
return v;
@@ -324,7 +324,7 @@ QString OuiDb::vendor(octlet_t guid)
extern "C"
{
- KDE_EXPORT KCModule *create_view1394(QWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_view1394(TQWidget *parent, const char *name)
{
KGlobal::locale()->insertCatalogue("kcmview1394");
return new View1394(parent, name);
diff --git a/kcontrol/view1394/view1394.h b/kcontrol/view1394/view1394.h
index b328363b4..24a68de8a 100644
--- a/kcontrol/view1394/view1394.h
+++ b/kcontrol/view1394/view1394.h
@@ -23,11 +23,11 @@
#include <kcmodule.h>
-#include <qmap.h>
-#include <qsocketnotifier.h>
-#include <qstring.h>
-#include <qtimer.h>
-#include <qvaluelist.h>
+#include <tqmap.h>
+#include <tqsocketnotifier.h>
+#include <tqstring.h>
+#include <tqtimer.h>
+#include <tqvaluelist.h>
#include "view1394widget.h"
@@ -37,16 +37,16 @@ class OuiDb
{
public:
OuiDb();
- QString vendor(octlet_t guid);
+ TQString vendor(octlet_t guid);
private:
- QMap<QString, QString> m_vendorIds;
+ TQMap<TQString, TQString> m_vendorIds;
};
class View1394: public KCModule
{
Q_OBJECT
public:
- View1394(QWidget *parent = 0L, const char *name = 0L);
+ View1394(TQWidget *parent = 0L, const char *name = 0L);
virtual ~View1394();
public slots: // Public slots
@@ -55,11 +55,11 @@ class View1394: public KCModule
private:
View1394Widget *m_view;
- QValueList<raw1394handle_t> m_handles;
- QPtrList<QSocketNotifier> m_notifiers;
+ TQValueList<raw1394handle_t> m_handles;
+ TQPtrList<TQSocketNotifier> m_notifiers;
bool readConfigRom(raw1394handle_t handle, nodeid_t nodeid, quadlet_t& firstQuad, quadlet_t& cap, octlet_t& guid);
bool m_insideRescanBus;
- QTimer m_rescanTimer;
+ TQTimer m_rescanTimer;
OuiDb *m_ouiDb;
private slots:
void callRaw1394EventLoop(int fd);
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp
index 229672f6e..df9cbb6a6 100644
--- a/kcontrol/xinerama/kcmxinerama.cpp
+++ b/kcontrol/xinerama/kcmxinerama.cpp
@@ -31,16 +31,16 @@
#include <kmessagebox.h>
#include <kwin.h>
-#include <qcheckbox.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qcombobox.h>
-#include <qtable.h>
-#include <qcolor.h>
-#include <qpushbutton.h>
+#include <tqcheckbox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqcombobox.h>
+#include <tqtable.h>
+#include <tqcolor.h>
+#include <tqpushbutton.h>
-KCMXinerama::KCMXinerama(QWidget *parent, const char *name)
+KCMXinerama::KCMXinerama(TQWidget *parent, const char *name)
: KCModule(parent, name) {
_indicators.setAutoDelete(true);
@@ -59,48 +59,48 @@ KCMXinerama::KCMXinerama(QWidget *parent, const char *name)
config = new KConfig("kdeglobals", false, false);
ksplashrc = new KConfig("ksplashrc", false, false);
- connect(&_timer, SIGNAL(timeout()), this, SLOT(clearIndicator()));
+ connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearIndicator()));
- QGridLayout *grid = new QGridLayout(this, 1, 1, KDialog::marginHint(),
+ TQGridLayout *grid = new TQGridLayout(this, 1, 1, KDialog::marginHint(),
KDialog::spacingHint());
// Setup the panel
- _displays = QApplication::desktop()->numScreens();
+ _displays = TQApplication::desktop()->numScreens();
- if (QApplication::desktop()->isVirtualDesktop()) {
- QStringList dpyList;
+ if (TQApplication::desktop()->isVirtualDesktop()) {
+ TQStringList dpyList;
xw = new XineramaWidget(this);
grid->addWidget(xw, 0, 0);
- QString label = i18n("Display %1");
+ TQString label = i18n("Display %1");
xw->headTable->setNumRows(_displays);
for (int i = 0; i < _displays; i++) {
- QString l = label.arg(i+1);
- QRect geom = QApplication::desktop()->screenGeometry(i);
+ TQString l = label.arg(i+1);
+ TQRect geom = TQApplication::desktop()->screenGeometry(i);
xw->_unmanagedDisplay->insertItem(l);
xw->_ksplashDisplay->insertItem(l);
dpyList.append(l);
- xw->headTable->setText(i, 0, QString::number(geom.x()));
- xw->headTable->setText(i, 1, QString::number(geom.y()));
- xw->headTable->setText(i, 2, QString::number(geom.width()));
- xw->headTable->setText(i, 3, QString::number(geom.height()));
+ xw->headTable->setText(i, 0, TQString::number(geom.x()));
+ xw->headTable->setText(i, 1, TQString::number(geom.y()));
+ xw->headTable->setText(i, 2, TQString::number(geom.width()));
+ xw->headTable->setText(i, 3, TQString::number(geom.height()));
}
xw->_unmanagedDisplay->insertItem(i18n("Display Containing the Pointer"));
xw->headTable->setRowLabels(dpyList);
- connect(xw->_ksplashDisplay, SIGNAL(activated(int)),
- this, SLOT(windowIndicator(int)));
- connect(xw->_unmanagedDisplay, SIGNAL(activated(int)),
- this, SLOT(windowIndicator(int)));
- connect(xw->_identify, SIGNAL(clicked()),
- this, SLOT(indicateWindows()));
+ connect(xw->_ksplashDisplay, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(windowIndicator(int)));
+ connect(xw->_unmanagedDisplay, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(windowIndicator(int)));
+ connect(xw->_identify, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(indicateWindows()));
- connect(xw, SIGNAL(configChanged()), this, SLOT(changed()));
+ connect(xw, TQT_SIGNAL(configChanged()), this, TQT_SLOT(changed()));
} else { // no Xinerama
- QLabel *ql = new QLabel(i18n("<qt><p>This module is only for configuring systems with a single desktop spread across multiple monitors. You do not appear to have this configuration.</p></qt>"), this);
+ TQLabel *ql = new TQLabel(i18n("<qt><p>This module is only for configuring systems with a single desktop spread across multiple monitors. You do not appear to have this configuration.</p></qt>"), this);
grid->addWidget(ql, 0, 0);
}
@@ -129,7 +129,7 @@ void KCMXinerama::load() {
}
void KCMXinerama::load(bool useDefaults) {
- if (QApplication::desktop()->isVirtualDesktop()) {
+ if (TQApplication::desktop()->isVirtualDesktop()) {
int item = 0;
config->setReadDefaults( useDefaults );
config->setGroup("Windows");
@@ -138,17 +138,17 @@ void KCMXinerama::load(bool useDefaults) {
xw->_enablePlacement->setChecked(config->readBoolEntry(KWIN_XINERAMA_PLACEMENT, true));
xw->_enableMaximize->setChecked(config->readBoolEntry(KWIN_XINERAMA_MAXIMIZE, true));
xw->_enableFullscreen->setChecked(config->readBoolEntry(KWIN_XINERAMA_FULLSCREEN, true));
- item = config->readNumEntry("Unmanaged", QApplication::desktop()->primaryScreen());
+ item = config->readNumEntry("Unmanaged", TQApplication::desktop()->primaryScreen());
if ((item < 0 || item >= _displays) && (item != -3))
- xw->_unmanagedDisplay->setCurrentItem(QApplication::desktop()->primaryScreen());
+ xw->_unmanagedDisplay->setCurrentItem(TQApplication::desktop()->primaryScreen());
else if (item == -3) // pointer warp
xw->_unmanagedDisplay->setCurrentItem(_displays);
else xw->_unmanagedDisplay->setCurrentItem(item);
ksplashrc->setGroup("Xinerama");
- item = ksplashrc->readNumEntry("KSplashScreen", QApplication::desktop()->primaryScreen());
+ item = ksplashrc->readNumEntry("KSplashScreen", TQApplication::desktop()->primaryScreen());
if (item < 0 || item >= _displays)
- xw->_ksplashDisplay->setCurrentItem(QApplication::desktop()->primaryScreen());
+ xw->_ksplashDisplay->setCurrentItem(TQApplication::desktop()->primaryScreen());
else xw->_ksplashDisplay->setCurrentItem(item);
emit changed(useDefaults);
@@ -159,7 +159,7 @@ void KCMXinerama::load(bool useDefaults) {
void KCMXinerama::save() {
- if (QApplication::desktop()->isVirtualDesktop()) {
+ if (TQApplication::desktop()->isVirtualDesktop()) {
config->setGroup("Windows");
config->writeEntry(KWIN_XINERAMA,
xw->_enableXinerama->isChecked());
@@ -215,18 +215,18 @@ void KCMXinerama::windowIndicator(int dpy) {
_timer.start(1500, true);
}
-QWidget *KCMXinerama::indicator(int dpy) {
- QLabel *si = new QLabel(QString::number(dpy+1), 0, "Screen Indicator", WX11BypassWM );
+TQWidget *KCMXinerama::indicator(int dpy) {
+ TQLabel *si = new TQLabel(TQString::number(dpy+1), 0, "Screen Indicator", WX11BypassWM );
- QFont fnt = KGlobalSettings::generalFont();
+ TQFont fnt = KGlobalSettings::generalFont();
fnt.setPixelSize(100);
si->setFont(fnt);
- si->setFrameStyle(QFrame::Panel);
- si->setFrameShadow(QFrame::Plain);
+ si->setFrameStyle(TQFrame::Panel);
+ si->setFrameShadow(TQFrame::Plain);
si->setAlignment(Qt::AlignCenter);
- QPoint screenCenter(QApplication::desktop()->screenGeometry(dpy).center());
- QRect targetGeometry(QPoint(0,0), si->sizeHint());
+ TQPoint screenCenter(TQApplication::desktop()->screenGeometry(dpy).center());
+ TQRect targetGeometry(TQPoint(0,0), si->sizeHint());
targetGeometry.moveCenter(screenCenter);
si->setGeometry(targetGeometry);
si->show();
@@ -239,13 +239,13 @@ void KCMXinerama::clearIndicator() {
}
extern "C" {
- KDE_EXPORT KCModule *create_xinerama(QWidget *parent, const char *name) {
+ KDE_EXPORT KCModule *create_xinerama(TQWidget *parent, const char *name) {
KGlobal::locale()->insertCatalogue("kcmxinerama");
return new KCMXinerama(parent, name);
}
KDE_EXPORT bool test_xinerama() {
- return QApplication::desktop()->isVirtualDesktop();
+ return TQApplication::desktop()->isVirtualDesktop();
}
}
diff --git a/kcontrol/xinerama/kcmxinerama.h b/kcontrol/xinerama/kcmxinerama.h
index 07b835fbc..76efb21d7 100644
--- a/kcontrol/xinerama/kcmxinerama.h
+++ b/kcontrol/xinerama/kcmxinerama.h
@@ -22,8 +22,8 @@
#define _KCM_XINERAMA_H
#include <kcmodule.h>
-#include <qptrlist.h>
-#include <qtimer.h>
+#include <tqptrlist.h>
+#include <tqtimer.h>
#include "xineramawidget.h"
@@ -33,7 +33,7 @@ class QWidget;
class KCMXinerama : public KCModule {
Q_OBJECT
public:
- KCMXinerama(QWidget *parent = 0L, const char *name = 0L);
+ KCMXinerama(TQWidget *parent = 0L, const char *name = 0L);
virtual ~KCMXinerama();
void load();
@@ -48,11 +48,11 @@ public slots:
void indicateWindows();
private:
- QWidget* indicator(int dpy);
+ TQWidget* indicator(int dpy);
KConfig *config, *ksplashrc;
XineramaWidget *xw;
- QTimer _timer;
- QPtrList<QWidget> _indicators;
+ TQTimer _timer;
+ TQPtrList<TQWidget> _indicators;
int _displays;
diff --git a/kdcop/kdcoplistview.cpp b/kdcop/kdcoplistview.cpp
index 07e0b9fb8..cc727072b 100644
--- a/kdcop/kdcoplistview.cpp
+++ b/kdcop/kdcoplistview.cpp
@@ -7,12 +7,12 @@
#include "kdcoplistview.h"
#include "kdcoplistview.moc"
#include <kdebug.h>
-#include <qdragobject.h>
-#include <qstringlist.h>
-#include <qregexp.h>
+#include <tqdragobject.h>
+#include <tqstringlist.h>
+#include <tqregexp.h>
-KDCOPListView::KDCOPListView ( QWidget *parent, const char *name)
+KDCOPListView::KDCOPListView ( TQWidget *parent, const char *name)
: KListView(parent, name)
{
kdDebug() << "Building new list." << endl;
@@ -25,21 +25,21 @@ KDCOPListView::~KDCOPListView ()
}
-QDragObject *KDCOPListView::dragObject()
+TQDragObject *KDCOPListView::dragObject()
{
kdDebug() << "Drag object called... " << endl;
if(!currentItem())
return 0;
else
- return new QTextDrag(encode(this->selectedItem()), this);
+ return new TQTextDrag(encode(this->selectedItem()), this);
}
-void KDCOPListView::setMode( const QString &theMode )
+void KDCOPListView::setMode( const TQString &theMode )
{
mode = theMode;
}
-QString KDCOPListView::encode(QListViewItem *theCode)
+TQString KDCOPListView::encode(TQListViewItem *theCode)
{
DCOPBrowserItem * item = static_cast<DCOPBrowserItem *>(theCode);
@@ -49,18 +49,18 @@ QString KDCOPListView::encode(QListViewItem *theCode)
DCOPBrowserFunctionItem * fitem =
static_cast<DCOPBrowserFunctionItem *>(item);
- QString function = QString::fromUtf8(fitem->function());
- QString application = QString::fromUtf8(fitem->app());
- QString object = QString::fromUtf8(fitem->object());
+ TQString function = TQString::fromUtf8(fitem->function());
+ TQString application = TQString::fromUtf8(fitem->app());
+ TQString object = TQString::fromUtf8(fitem->object());
kdDebug() << function << endl;
- QString returnType = function.section(' ', 0,0);
- QString returnCode = "";
- QString normalisedSignature;
- QStringList types;
- QStringList names;
+ TQString returnType = function.section(' ', 0,0);
+ TQString returnCode = "";
+ TQString normalisedSignature;
+ TQStringList types;
+ TQStringList names;
- QString unNormalisedSignature(function);
+ TQString unNormalisedSignature(function);
int s = unNormalisedSignature.find(' ');
@@ -81,9 +81,9 @@ QString KDCOPListView::encode(QListViewItem *theCode)
}
if (left > 0 && left + 1 < right - 1)
{
- types = QStringList::split
+ types = TQStringList::split
(',', unNormalisedSignature.mid(left + 1, right - left - 1));
- for (QStringList::Iterator it = types.begin(); it != types.end(); ++it)
+ for (TQStringList::Iterator it = types.begin(); it != types.end(); ++it)
{
(*it) = (*it).stripWhiteSpace();
int s = (*it).find(' ');
@@ -97,16 +97,16 @@ QString KDCOPListView::encode(QListViewItem *theCode)
if ( mode == "C++")
{
- QString args;
+ TQString args;
for( unsigned int i = 0; i < names.count(); i++)
{
args += types[i] + " " + names[i] + ";\n";
}
- QString dcopRef = "DCOPRef m_" + application + object
+ TQString dcopRef = "DCOPRef m_" + application + object
+ "(\""+ application + "\",\"" + object +"\");\n";
- QString stringNames = names.join(",");
- QString stringTypes = types.join(",");
+ TQString stringNames = names.join(",");
+ TQString stringTypes = types.join(",");
if( returnType != "void")
returnType += " return" + returnType + " =";
else
@@ -128,7 +128,7 @@ QString KDCOPListView::encode(QListViewItem *theCode)
}
else if (mode == "Python")
{
- QString setup;
+ TQString setup;
setup = "m_"
+ application + object
+ " = dcop.DCOPObject( \""
@@ -150,8 +150,8 @@ QString KDCOPListView::encode(QListViewItem *theCode)
return returnCode;
}
-QString KDCOPListView::getCurrentCode() const
+TQString KDCOPListView::getCurrentCode() const
{
// fixing warning
- return QString::null;
+ return TQString::null;
}
diff --git a/kdcop/kdcoplistview.h b/kdcop/kdcoplistview.h
index 4a14620cc..9f56c2936 100644
--- a/kdcop/kdcoplistview.h
+++ b/kdcop/kdcoplistview.h
@@ -16,15 +16,15 @@ class KDCOPListView : public KListView
Q_OBJECT
public:
- KDCOPListView ( QWidget * parent = 0, const char * name = 0 );
+ KDCOPListView ( TQWidget * parent = 0, const char * name = 0 );
virtual ~KDCOPListView();
- QDragObject *dragObject();
- void setMode(const QString &mode);
- QString getCurrentCode() const;
+ TQDragObject *dragObject();
+ void setMode(const TQString &mode);
+ TQString getCurrentCode() const;
private:
- QString encode(QListViewItem *code);
- QString mode;
+ TQString encode(TQListViewItem *code);
+ TQString mode;
};
@@ -34,8 +34,8 @@ class DCOPBrowserItem : public QListViewItem
enum Type { Application, Interface, Function };
- DCOPBrowserItem(QListView * parent, Type type);
- DCOPBrowserItem(QListViewItem * parent, Type type);
+ DCOPBrowserItem(TQListView * parent, Type type);
+ DCOPBrowserItem(TQListViewItem * parent, Type type);
virtual ~DCOPBrowserItem() {}
@@ -46,15 +46,15 @@ class DCOPBrowserItem : public QListViewItem
Type type_;
};
-class DCOPBrowserApplicationItem : public QObject, public DCOPBrowserItem
+class DCOPBrowserApplicationItem : public TQObject, public DCOPBrowserItem
{
Q_OBJECT
public:
- DCOPBrowserApplicationItem(QListView * parent, const QCString & app);
+ DCOPBrowserApplicationItem(TQListView * parent, const TQCString & app);
virtual ~DCOPBrowserApplicationItem() {}
- QCString app() const { return app_; }
+ TQCString app() const { return app_; }
virtual void setOpen(bool o);
@@ -64,31 +64,31 @@ class DCOPBrowserApplicationItem : public QObject, public DCOPBrowserItem
private:
- QCString app_;
+ TQCString app_;
private slots:
/**
* Theses two slots are used to get the icon of the application
*/
- void retreiveIcon(int callId, const QCString& replyType, const QByteArray &replyData);
- void slotGotWindowName(int callId, const QCString& replyType, const QByteArray &replyData);
+ void retreiveIcon(int callId, const TQCString& replyType, const TQByteArray &replyData);
+ void slotGotWindowName(int callId, const TQCString& replyType, const TQByteArray &replyData);
};
-class DCOPBrowserInterfaceItem : public QObject, public DCOPBrowserItem
+class DCOPBrowserInterfaceItem : public TQObject, public DCOPBrowserItem
{
public:
DCOPBrowserInterfaceItem
(
DCOPBrowserApplicationItem * parent,
- const QCString & app,
- const QCString & object,
+ const TQCString & app,
+ const TQCString & object,
bool def
);
virtual ~DCOPBrowserInterfaceItem() {}
- QCString app() const { return app_; }
- QCString object() const { return object_; }
+ TQCString app() const { return app_; }
+ TQCString object() const { return object_; }
virtual void setOpen(bool o);
@@ -98,8 +98,8 @@ class DCOPBrowserInterfaceItem : public QObject, public DCOPBrowserItem
private:
- QCString app_;
- QCString object_;
+ TQCString app_;
+ TQCString object_;
};
@@ -110,24 +110,24 @@ class DCOPBrowserFunctionItem : public DCOPBrowserItem
DCOPBrowserFunctionItem
(
DCOPBrowserInterfaceItem * parent,
- const QCString & app,
- const QCString & object,
- const QCString & function
+ const TQCString & app,
+ const TQCString & object,
+ const TQCString & function
);
virtual ~DCOPBrowserFunctionItem() {}
- QCString app() const { return app_; }
- QCString object() const { return object_; }
- QCString function() const { return function_; }
+ TQCString app() const { return app_; }
+ TQCString object() const { return object_; }
+ TQCString function() const { return function_; }
virtual void setOpen(bool o);
private:
- QCString app_;
- QCString object_;
- QCString function_;
+ TQCString app_;
+ TQCString object_;
+ TQCString function_;
};
#endif
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index 506fb22ef..b7b21bd7f 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -26,26 +26,26 @@
#include <kcolorbutton.h>
#include <klistviewsearchline.h>
-#include <qtimer.h>
-#include <qwidgetstack.h>
-#include <qlabel.h>
-#include <qsplitter.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qlineedit.h>
-#include <qvalidator.h>
-#include <qpushbutton.h>
-#include <qkeycode.h>
-#include <qpixmap.h>
-#include <qcursor.h>
-#include <qsize.h>
-#include <qrect.h>
-#include <qclipboard.h>
-#include <qdatetime.h>
+#include <tqtimer.h>
+#include <tqwidgetstack.h>
+#include <tqlabel.h>
+#include <tqsplitter.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqlineedit.h>
+#include <tqvalidator.h>
+#include <tqpushbutton.h>
+#include <tqkeycode.h>
+#include <tqpixmap.h>
+#include <tqcursor.h>
+#include <tqsize.h>
+#include <tqrect.h>
+#include <tqclipboard.h>
+#include <tqdatetime.h>
#include <dcopref.h>
-#include <qvbox.h>
-#include <qimage.h>
-#include <qheader.h>
+#include <tqvbox.h>
+#include <tqimage.h>
+#include <tqheader.h>
#include <kdebug.h>
#include <kkeydialog.h>
@@ -63,14 +63,14 @@ class DCOPBrowserFunctionItem;
class KMultiIntEdit : public QVBox
{
public:
- KMultiIntEdit(QWidget *parent , const char * name=0) : QVBox(parent,name) {}
- void addField(int key, const QString & caption )
+ KMultiIntEdit(TQWidget *parent , const char * name=0) : TQVBox(parent,name) {}
+ void addField(int key, const TQString & caption )
{
- QHBox *l=new QHBox(this);
- new QLabel(caption + ": ", l);
+ TQHBox *l=new TQHBox(this);
+ new TQLabel(caption + ": ", l);
KLineEdit* e = new KLineEdit( l );
m_widgets.insert(key, e ) ;
- e->setValidator( new QIntValidator( e ) );
+ e->setValidator( new TQIntValidator( e ) );
}
int field(int key)
{
@@ -80,21 +80,21 @@ public:
}
private:
- QMap<int,KLineEdit*> m_widgets;
+ TQMap<int,KLineEdit*> m_widgets;
};
//------------------------------
DCOPBrowserItem::DCOPBrowserItem
-(QListView * parent, DCOPBrowserItem::Type type)
- : QListViewItem(parent),
+(TQListView * parent, DCOPBrowserItem::Type type)
+ : TQListViewItem(parent),
type_(type)
{
}
DCOPBrowserItem::DCOPBrowserItem
-(QListViewItem * parent, DCOPBrowserItem::Type type)
- : QListViewItem(parent),
+(TQListViewItem * parent, DCOPBrowserItem::Type type)
+ : TQListViewItem(parent),
type_(type)
{
}
@@ -108,13 +108,13 @@ DCOPBrowserItem::type() const
// ------------------------------------------------------------------------
DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
-(QListView * parent, const QCString & app)
+(TQListView * parent, const TQCString & app)
: DCOPBrowserItem(parent, Application),
app_(app)
{
setExpandable(true);
- setText(0, QString::fromUtf8(app_));
- setPixmap(0, KGlobal::iconLoader()->loadIcon( QString::fromLatin1( "exec" ), KIcon::Small ));
+ setText(0, TQString::fromUtf8(app_));
+ setPixmap(0, KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), KIcon::Small ));
/* Get the icon: we use the icon from a mainwindow in that class.
@@ -127,21 +127,21 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
* All calls are async to don't block the GUI if the clients does not reply immediatly
*/
- QRegExp rx( "([^\\-]+)"); // remove the possible processus id
+ TQRegExp rx( "([^\\-]+)"); // remove the possible processus id
rx.search(app_); // konqueror-123 => konqueror-mainwindow#1
- QString mainWindowName= rx.cap(1) + "-mainwindow#1" ;
+ TQString mainWindowName= rx.cap(1) + "-mainwindow#1" ;
- QByteArray data;
- int callId=kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data, this, SLOT(retreiveIcon(int, const QCString&, const QByteArray&)));
+ TQByteArray data;
+ int callId=kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data, this, TQT_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
if(!callId)
{
//maybe there is another mainwindow registered with another name.
- QByteArray data;
- QDataStream arg(data, IO_WriteOnly);
- arg << QCString( "MainWindow" );
+ TQByteArray data;
+ TQDataStream arg(data, IO_WriteOnly);
+ arg << TQCString( "MainWindow" );
- kapp->dcopClient()->callAsync( app_, "qt", "find(QCString)", data, this, SLOT(slotGotWindowName(int, const QCString&, const QByteArray& )));
+ kapp->dcopClient()->callAsync( app_, "qt", "find(TQCString)", data, this, TQT_SLOT(slotGotWindowName(int, const TQCString&, const TQByteArray& )));
}
}
@@ -178,31 +178,31 @@ DCOPBrowserApplicationItem::populate()
KApplication::restoreOverrideCursor();
}
-void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const QCString& /*replyType*/, const QByteArray &replyData)
+void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const TQCString& /*replyType*/, const TQByteArray &replyData)
{
- QDataStream reply(replyData, IO_ReadOnly);
+ TQDataStream reply(replyData, IO_ReadOnly);
QCStringList mainswindows;
reply >> mainswindows;
- QStringList sl=QStringList::split("/",mainswindows.first() );
+ TQStringList sl=TQStringList::split("/",mainswindows.first() );
if(sl.count() >= 1)
{
- QString mainWindowName=sl[1];
+ TQString mainWindowName=sl[1];
if(!mainWindowName.isEmpty())
{
- QByteArray data;
+ TQByteArray data;
kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data,
- this, SLOT(retreiveIcon(int, const QCString&, const QByteArray&)));
+ this, TQT_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
}
}
}
-void DCOPBrowserApplicationItem::retreiveIcon(int /*callId*/,const QCString& /*replyType*/, const QByteArray &replyData)
+void DCOPBrowserApplicationItem::retreiveIcon(int /*callId*/,const TQCString& /*replyType*/, const TQByteArray &replyData)
{
- QDataStream reply(replyData, IO_ReadOnly);
- QPixmap returnQPixmap;
+ TQDataStream reply(replyData, IO_ReadOnly);
+ TQPixmap returnQPixmap;
reply >> returnQPixmap;
if(!returnQPixmap.isNull())
- setPixmap(0, QPixmap(returnQPixmap.convertToImage().smoothScale(16,16)) );
+ setPixmap(0, TQPixmap(returnQPixmap.convertToImage().smoothScale(16,16)) );
else
kdDebug() << "Unable to retreive the icon" << endl;
}
@@ -212,8 +212,8 @@ void DCOPBrowserApplicationItem::retreiveIcon(int /*callId*/,const QCString& /*r
DCOPBrowserInterfaceItem::DCOPBrowserInterfaceItem
(
DCOPBrowserApplicationItem * parent,
- const QCString & app,
- const QCString & object,
+ const TQCString & app,
+ const TQCString & object,
bool def
)
: DCOPBrowserItem(parent, Interface),
@@ -223,9 +223,9 @@ DCOPBrowserInterfaceItem::DCOPBrowserInterfaceItem
setExpandable(true);
if (def)
- setText(0, i18n("%1 (default)").arg(QString::fromUtf8(object_)));
+ setText(0, i18n("%1 (default)").arg(TQString::fromUtf8(object_)));
else
- setText(0, QString::fromUtf8(object_));
+ setText(0, TQString::fromUtf8(object_));
}
void
@@ -258,9 +258,9 @@ DCOPBrowserInterfaceItem::populate()
DCOPBrowserFunctionItem::DCOPBrowserFunctionItem
(
DCOPBrowserInterfaceItem * parent,
- const QCString & app,
- const QCString & object,
- const QCString & function
+ const TQCString & app,
+ const TQCString & object,
+ const TQCString & function
)
: DCOPBrowserItem(parent, Function),
app_(app),
@@ -268,7 +268,7 @@ DCOPBrowserFunctionItem::DCOPBrowserFunctionItem
function_(function)
{
setExpandable(false);
- setText(0, QString::fromUtf8(function_));
+ setText(0, TQString::fromUtf8(function_));
}
void
@@ -279,7 +279,7 @@ DCOPBrowserFunctionItem::setOpen(bool o)
// ------------------------------------------------------------------------
-KDCOPWindow::KDCOPWindow(QWidget *parent, const char * name)
+KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
: KMainWindow(parent, name)
{
dcopClient = kapp->dcopClient();
@@ -299,25 +299,25 @@ KDCOPWindow::KDCOPWindow(QWidget *parent, const char * name)
connect
(
mainView->lv,
- SIGNAL(doubleClicked(QListViewItem *)),
- SLOT(slotCallFunction(QListViewItem *))
+ TQT_SIGNAL(doubleClicked(TQListViewItem *)),
+ TQT_SLOT(slotCallFunction(TQListViewItem *))
);
connect
(
mainView->lv,
- SIGNAL(currentChanged(QListViewItem *)),
- SLOT(slotCurrentChanged(QListViewItem *))
+ TQT_SIGNAL(currentChanged(TQListViewItem *)),
+ TQT_SLOT(slotCurrentChanged(TQListViewItem *))
);
// set up the actions
- KStdAction::quit( this, SLOT( close() ), actionCollection() );
- KStdAction::copy( this, SLOT( slotCopy()), actionCollection() );
- KStdAction::keyBindings( guiFactory(), SLOT( configureShortcuts() ), actionCollection() );
+ KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
+ KStdAction::copy( this, TQT_SLOT( slotCopy()), actionCollection() );
+ KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
- (void) new KAction( i18n( "&Reload" ), "reload", KStdAccel::shortcut(KStdAccel::Reload), this, SLOT( slotReload() ), actionCollection(), "reload" );
+ (void) new KAction( i18n( "&Reload" ), "reload", KStdAccel::shortcut(KStdAccel::Reload), this, TQT_SLOT( slotReload() ), actionCollection(), "reload" );
exeaction =
new KAction
@@ -326,7 +326,7 @@ KDCOPWindow::KDCOPWindow(QWidget *parent, const char * name)
"exec",
CTRL + Key_E,
this,
- SLOT(slotCallFunction()),
+ TQT_SLOT(slotCallFunction()),
actionCollection(),
"execute"
);
@@ -337,37 +337,37 @@ KDCOPWindow::KDCOPWindow(QWidget *parent, const char * name)
langmode = new KSelectAction ( i18n("Language Mode"),
CTRL + Key_M,
this,
- SLOT(slotMode()),
+ TQT_SLOT(slotMode()),
actionCollection(),
"langmode");
langmode->setEditable(false);
- langmode->setItems(QStringList::split(",", "Shell,C++,Python"));
+ langmode->setItems(TQStringList::split(",", "Shell,C++,Python"));
langmode->setToolTip(i18n("Set the current language export."));
langmode->setCurrentItem(0);
slotMode();
connect
(
dcopClient,
- SIGNAL(applicationRegistered(const QCString &)),
- SLOT(slotApplicationRegistered(const QCString &))
+ TQT_SIGNAL(applicationRegistered(const TQCString &)),
+ TQT_SLOT(slotApplicationRegistered(const TQCString &))
);
connect
(
dcopClient,
- SIGNAL(applicationRemoved(const QCString &)),
- SLOT(slotApplicationUnregistered(const QCString &))
+ TQT_SIGNAL(applicationRemoved(const TQCString &)),
+ TQT_SLOT(slotApplicationUnregistered(const TQCString &))
);
dcopClient->setNotifications(true);
createGUI();
setCaption(i18n("DCOP Browser"));
mainView->lb_replyData->hide();
- QTimer::singleShot(0, this, SLOT(slotFillApplications()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotFillApplications()));
}
-void KDCOPWindow::slotCurrentChanged( QListViewItem* i )
+void KDCOPWindow::slotCurrentChanged( TQListViewItem* i )
{
DCOPBrowserItem* item = (DCOPBrowserItem*)i;
@@ -388,7 +388,7 @@ void KDCOPWindow::slotReload()
slotFillApplications();
}
-void KDCOPWindow::slotCallFunction( QListViewItem* it )
+void KDCOPWindow::slotCallFunction( TQListViewItem* it )
{
if(it == 0)
return;
@@ -400,10 +400,10 @@ void KDCOPWindow::slotCallFunction( QListViewItem* it )
DCOPBrowserFunctionItem * fitem =
static_cast<DCOPBrowserFunctionItem *>(item);
- QString unNormalisedSignature = QString::fromUtf8(fitem->function());
- QString normalisedSignature;
- QStringList types;
- QStringList names;
+ TQString unNormalisedSignature = TQString::fromUtf8(fitem->function());
+ TQString normalisedSignature;
+ TQStringList types;
+ TQStringList names;
if (!getParameters(unNormalisedSignature, normalisedSignature, types, names))
{
@@ -413,26 +413,26 @@ void KDCOPWindow::slotCallFunction( QListViewItem* it )
return;
}
- QByteArray data;
- QByteArray replyData;
+ TQByteArray data;
+ TQByteArray replyData;
- QCString replyType;
+ TQCString replyType;
- QDataStream arg(data, IO_WriteOnly);
+ TQDataStream arg(data, IO_WriteOnly);
KDialogBase mydialog( this, "KDCOP Parameter Entry", true,
- QString::null, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );
+ TQString::null, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );
mydialog.setCaption
( i18n("Call Function %1").arg( fitem->function() ) );
- QFrame *frame = mydialog.makeMainWidget();
+ TQFrame *frame = mydialog.makeMainWidget();
- QLabel* h1 = new QLabel( i18n( "Name" ), frame );
- QLabel* h2 = new QLabel( i18n( "Type" ), frame );
- QLabel* h3 = new QLabel( i18n( "Value" ), frame );
+ TQLabel* h1 = new TQLabel( i18n( "Name" ), frame );
+ TQLabel* h2 = new TQLabel( i18n( "Type" ), frame );
+ TQLabel* h3 = new TQLabel( i18n( "Value" ), frame );
- QGridLayout* grid = new QGridLayout( frame, types.count() + 2, 3,
+ TQGridLayout* grid = new TQGridLayout( frame, types.count() + 2, 3,
0, KDialog::spacingHint() );
grid->addWidget( h1, 0, 0 );
@@ -445,154 +445,154 @@ void KDCOPWindow::slotCallFunction( QListViewItem* it )
{
int i = 0;
- QPtrList<QWidget> wl;
+ TQPtrList<TQWidget> wl;
- for (QStringList::ConstIterator it = types.begin(); it != types.end(); ++it)
+ for (TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it)
{
i++;
- const QString type = *it;
+ const TQString type = *it;
- const QString name = i-1 < (int)names.count() ? names[i-1] : QString::null;
+ const TQString name = i-1 < (int)names.count() ? names[i-1] : TQString::null;
if( type == "int" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "int", frame );
+ TQLabel* l = new TQLabel( "int", frame );
grid->addWidget( l, i, 1 );
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new QIntValidator( e ) );
+ e->setValidator( new TQIntValidator( e ) );
}
else if ( type == "unsigned" || type == "uint" || type == "unsigned int"
|| type == "Q_UINT32" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "unsigned int", frame );
+ TQLabel* l = new TQLabel( "unsigned int", frame );
grid->addWidget( l, i, 1 );
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- QIntValidator* iv = new QIntValidator( e );
+ TQIntValidator* iv = new TQIntValidator( e );
iv->setBottom( 0 );
e->setValidator( iv );
}
else if ( type == "long" || type == "long int" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "long", frame );
+ TQLabel* l = new TQLabel( "long", frame );
grid->addWidget( l, i, 1 );
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new QIntValidator( e ) );
+ e->setValidator( new TQIntValidator( e ) );
}
else if ( type == "ulong" || type == "unsigned long" || type == "unsigned long int"
|| type == "Q_UINT64" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "unsigned long", frame );
+ TQLabel* l = new TQLabel( "unsigned long", frame );
grid->addWidget( l, i, 1 );
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new QIntValidator( e ) );
+ e->setValidator( new TQIntValidator( e ) );
}
else if ( type == "short" || type == "short int" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "long", frame );
+ TQLabel* l = new TQLabel( "long", frame );
grid->addWidget( l, i, 1 );
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new QIntValidator( e ) );
+ e->setValidator( new TQIntValidator( e ) );
}
else if ( type == "ushort" || type == "unsigned short" || type == "unsigned short int" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "unsigned short", frame );
+ TQLabel* l = new TQLabel( "unsigned short", frame );
grid->addWidget( l, i, 1 );
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new QIntValidator( e ) );
+ e->setValidator( new TQIntValidator( e ) );
}
else if ( type == "float" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "float", frame );
+ TQLabel* l = new TQLabel( "float", frame );
grid->addWidget( l, i, 1 );
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new QDoubleValidator( e ) );
+ e->setValidator( new TQDoubleValidator( e ) );
}
else if ( type == "double" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "double", frame );
+ TQLabel* l = new TQLabel( "double", frame );
grid->addWidget( l, i, 1 );
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new QDoubleValidator( e ) );
+ e->setValidator( new TQDoubleValidator( e ) );
}
else if ( type == "bool" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "bool", frame );
+ TQLabel* l = new TQLabel( "bool", frame );
grid->addWidget( l, i, 1 );
- QCheckBox* c = new QCheckBox( frame );
+ TQCheckBox* c = new TQCheckBox( frame );
grid->addWidget( c, i, 2 );
wl.append( c );
}
- else if ( type == "QString" )
+ else if ( type == "TQString" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "QString", frame );
+ TQLabel* l = new TQLabel( "TQString", frame );
grid->addWidget( l, i, 1 );
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
}
- else if ( type == "QCString" )
+ else if ( type == "TQCString" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "QString", frame );
+ TQLabel* l = new TQLabel( "TQString", frame );
grid->addWidget( l, i, 1 );
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
}
- else if ( type == "QStringList" )
+ else if ( type == "TQStringList" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "QStringList", frame );
+ TQLabel* l = new TQLabel( "TQStringList", frame );
grid->addWidget( l, i, 1 );
KEditListBox* e = new KEditListBox ( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
}
- else if ( type == "QValueList<QCString>" )
+ else if ( type == "TQValueList<TQCString>" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "QValueList<QCString>", frame );
+ TQLabel* l = new TQLabel( "TQValueList<TQCString>", frame );
grid->addWidget( l, i, 1 );
KEditListBox* e = new KEditListBox ( frame );
grid->addWidget( e, i, 2 );
@@ -600,29 +600,29 @@ void KDCOPWindow::slotCallFunction( QListViewItem* it )
}
else if ( type == "KURL" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "KURL", frame );
+ TQLabel* l = new TQLabel( "KURL", frame );
grid->addWidget( l, i, 1 );
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
}
- else if ( type == "QColor" )
+ else if ( type == "TQColor" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "QColor", frame );
+ TQLabel* l = new TQLabel( "TQColor", frame );
grid->addWidget( l, i, 1 );
KColorButton* e = new KColorButton( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
}
- else if ( type == "QSize" )
+ else if ( type == "TQSize" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "QSize", frame );
+ TQLabel* l = new TQLabel( "TQSize", frame );
grid->addWidget( l, i, 1 );
KMultiIntEdit* e = new KMultiIntEdit( frame );
e->addField( 1, i18n("Width") );
@@ -630,11 +630,11 @@ void KDCOPWindow::slotCallFunction( QListViewItem* it )
grid->addWidget( e, i, 2 );
wl.append( e );
}
- else if ( type == "QPoint" )
+ else if ( type == "TQPoint" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "QPoint", frame );
+ TQLabel* l = new TQLabel( "TQPoint", frame );
grid->addWidget( l, i, 1 );
KMultiIntEdit* e = new KMultiIntEdit( frame );
e->addField( 1, i18n("X") );
@@ -642,11 +642,11 @@ void KDCOPWindow::slotCallFunction( QListViewItem* it )
grid->addWidget( e, i, 2 );
wl.append( e );
}
- else if ( type == "QRect" )
+ else if ( type == "TQRect" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "QRect", frame );
+ TQLabel* l = new TQLabel( "TQRect", frame );
grid->addWidget( l, i, 1 );
KMultiIntEdit* e = new KMultiIntEdit( frame );
e->addField( 1, i18n("Left") );
@@ -656,11 +656,11 @@ void KDCOPWindow::slotCallFunction( QListViewItem* it )
grid->addWidget( e, i, 2 );
wl.append( e );
}
- else if( type == "QPixmap" )
+ else if( type == "TQPixmap" )
{
- QLabel* n = new QLabel( name, frame );
+ TQLabel* n = new TQLabel( name, frame );
grid->addWidget( n, i, 0 );
- QLabel* l = new QLabel( "QPixmap", frame );
+ TQLabel* l = new TQLabel( "TQPixmap", frame );
grid->addWidget( l, i, 1 );
KURLRequester* e = new KURLRequester( frame );
grid->addWidget( e, i, 2 );
@@ -680,16 +680,16 @@ void KDCOPWindow::slotCallFunction( QListViewItem* it )
int ret = mydialog.exec();
- if (QDialog::Accepted != ret)
+ if (TQDialog::Accepted != ret)
return;
// extract the arguments
i = 0;
- for (QStringList::ConstIterator it = types.begin(); it != types.end(); ++it)
+ for (TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it)
{
- QString type = *it;
+ TQString type = *it;
if ( type == "int" )
{
@@ -739,59 +739,59 @@ void KDCOPWindow::slotCallFunction( QListViewItem* it )
}
else if( type == "bool" )
{
- QCheckBox* c = (QCheckBox*)wl.at( i );
+ TQCheckBox* c = (TQCheckBox*)wl.at( i );
arg << c->isChecked();
}
- else if( type == "QCString" )
+ else if( type == "TQCString" )
{
KLineEdit* e = (KLineEdit*)wl.at( i );
- arg << QCString( e->text().local8Bit() );
+ arg << TQCString( e->text().local8Bit() );
}
- else if( type == "QString" )
+ else if( type == "TQString" )
{
KLineEdit* e = (KLineEdit*)wl.at( i );
arg << e->text();
}
- else if( type == "QStringList" )
+ else if( type == "TQStringList" )
{
KEditListBox* e = (KEditListBox*)wl.at( i );
arg << e->items();
}
- else if( type == "QValueList<QCString>" )
+ else if( type == "TQValueList<TQCString>" )
{
KEditListBox* e = (KEditListBox*)wl.at( i );
for (int i = 0; i < e->count(); i++)
- arg << QCString( e->text(i).local8Bit() );
+ arg << TQCString( e->text(i).local8Bit() );
}
else if( type == "KURL" )
{
KLineEdit* e = (KLineEdit*)wl.at( i );
arg << KURL( e->text() );
}
- else if( type == "QColor" )
+ else if( type == "TQColor" )
{
KColorButton* e = (KColorButton*)wl.at( i );
arg << e->color();
}
- else if( type == "QSize" )
+ else if( type == "TQSize" )
{
KMultiIntEdit* e = (KMultiIntEdit*)wl.at( i );
- arg << QSize(e->field(1) , e->field(2)) ;
+ arg << TQSize(e->field(1) , e->field(2)) ;
}
- else if( type == "QPoint" )
+ else if( type == "TQPoint" )
{
KMultiIntEdit* e = (KMultiIntEdit*)wl.at( i );
- arg << QPoint(e->field(1) , e->field(2)) ;
+ arg << TQPoint(e->field(1) , e->field(2)) ;
}
- else if( type == "QRect" )
+ else if( type == "TQRect" )
{
KMultiIntEdit* e = (KMultiIntEdit*)wl.at( i );
- arg << QRect(e->field(1) , e->field(2) , e->field(3) , e->field(4)) ;
+ arg << TQRect(e->field(1) , e->field(2) , e->field(3) , e->field(4)) ;
}
- else if( type == "QPixmap" )
+ else if( type == "TQPixmap" )
{
KURLRequester* e= (KURLRequester*)wl.at( i );
- arg << QPixmap(e->url());
+ arg << TQPixmap(e->url());
}
else
{
@@ -832,7 +832,7 @@ void KDCOPWindow::slotCallFunction( QListViewItem* it )
statusBar()->message(i18n("DCOP call failed"));
- QString msg = i18n("<p>DCOP call failed.</p>%1");
+ TQString msg = i18n("<p>DCOP call failed.</p>%1");
bool appRegistered = dcopClient->isApplicationRegistered(fitem->app());
@@ -864,10 +864,10 @@ void KDCOPWindow::slotCallFunction( QListViewItem* it )
}
else
{
- QString coolSignature =
- QString::fromUtf8(fitem->app())
+ TQString coolSignature =
+ TQString::fromUtf8(fitem->app())
+ "."
- + QString::fromUtf8(fitem->object())
+ + TQString::fromUtf8(fitem->object())
+ "."
+ normalisedSignature ;
@@ -875,19 +875,19 @@ void KDCOPWindow::slotCallFunction( QListViewItem* it )
if (replyType != "void" && replyType != "ASYNC" && !replyType.isEmpty() )
{
- QDataStream reply(replyData, IO_ReadOnly);
+ TQDataStream reply(replyData, IO_ReadOnly);
if (demarshal(replyType, reply, mainView->lb_replyData))
{
mainView->l_replyType->setText
(
i18n("<strong>%1</strong>")
- .arg(QString::fromUtf8(replyType))
+ .arg(TQString::fromUtf8(replyType))
);
mainView->lb_replyData->show();
}
else
{
- mainView->l_replyType->setText(i18n("Unknown type %1.").arg(QString::fromUtf8(replyType)));
+ mainView->l_replyType->setText(i18n("Unknown type %1.").arg(TQString::fromUtf8(replyType)));
mainView->lb_replyData->hide();
}
}
@@ -905,7 +905,7 @@ void KDCOPWindow::slotFillApplications()
KApplication::setOverrideCursor(waitCursor);
QCStringList apps = dcopClient->registeredApplications();
- QCString appId = dcopClient->appId();
+ TQCString appId = dcopClient->appId();
mainView->lv->clear();
@@ -922,25 +922,25 @@ void KDCOPWindow::slotFillApplications()
bool KDCOPWindow::demarshal
(
- QCString & replyType,
- QDataStream & reply,
+ TQCString & replyType,
+ TQDataStream & reply,
QListBox *theList
)
{
- QStringList ret;
- QPixmap pret;
+ TQStringList ret;
+ TQPixmap pret;
bool isValid = true;
theList->clear();
ret.clear();
- if ( replyType == "QVariant" )
+ if ( replyType == "TQVariant" )
{
// read data type from stream
Q_INT32 type;
reply >> type;
// change replyType to real typename
- replyType = QVariant::typeToName( (QVariant::Type)type );
+ replyType = TQVariant::typeToName( (TQVariant::Type)type );
// demarshal data with a recursive call
return demarshal(replyType, reply, theList);
@@ -949,66 +949,66 @@ bool KDCOPWindow::demarshal
{
int i;
reply >> i;
- ret << QString::number(i);
+ ret << TQString::number(i);
}
else if ( replyType == "uint" || replyType == "unsigned int"
|| replyType == "Q_UINT32" )
{
uint i;
reply >> i;
- ret << QString::number(i);
+ ret << TQString::number(i);
}
else if ( replyType == "long" || replyType == "long int" )
{
long l;
reply >> l;
- ret << QString::number(l);
+ ret << TQString::number(l);
}
else if ( replyType == "ulong" || replyType == "unsigned long" || replyType == "unsigned long int" )
{
ulong l;
reply >> l;
- ret << QString::number(l);
+ ret << TQString::number(l);
}
else if ( replyType == "Q_UINT64" )
{
Q_UINT64 i;
reply >> i;
- ret << QString::number(i);
+ ret << TQString::number(i);
}
else if ( replyType == "float" )
{
float f;
reply >> f;
- ret << QString::number(f);
+ ret << TQString::number(f);
}
else if ( replyType == "double" )
{
double d;
reply >> d;
- ret << QString::number(d);
+ ret << TQString::number(d);
}
else if (replyType == "bool")
{
bool b;
reply >> b;
- ret << (b ? QString::fromUtf8("true") : QString::fromUtf8("false"));
+ ret << (b ? TQString::fromUtf8("true") : TQString::fromUtf8("false"));
}
- else if (replyType == "QString")
+ else if (replyType == "TQString")
{
- QString s;
+ TQString s;
reply >> s;
ret << s;
}
- else if (replyType == "QStringList")
+ else if (replyType == "TQStringList")
{
reply >> ret;
}
- else if (replyType == "QCString")
+ else if (replyType == "TQCString")
{
- QCString r;
+ TQCString r;
reply >> r;
- ret << QString::fromUtf8(r);
+ ret << TQString::fromUtf8(r);
}
else if (replyType == "QCStringList")
{
@@ -1024,67 +1024,67 @@ bool KDCOPWindow::demarshal
reply >> r;
ret << r.prettyURL();
}
- else if (replyType == "QSize")
+ else if (replyType == "TQSize")
{
- QSize r;
+ TQSize r;
reply >> r;
- ret << QString::number(r.width()) + "x" + QString::number(r.height());
+ ret << TQString::number(r.width()) + "x" + TQString::number(r.height());
}
- else if (replyType == "QPoint")
+ else if (replyType == "TQPoint")
{
- QPoint r;
+ TQPoint r;
reply >> r;
- ret << "(" + QString::number(r.x()) + "," + QString::number(r.y()) + ")";
+ ret << "(" + TQString::number(r.x()) + "," + TQString::number(r.y()) + ")";
}
- else if (replyType == "QRect")
+ else if (replyType == "TQRect")
{
- QRect r;
+ TQRect r;
reply >> r;
- ret << QString::number(r.x()) + "x" + QString::number(r.y()) + "+" + QString::number(r.height()) + "+" + QString::number(r.width());
+ ret << TQString::number(r.x()) + "x" + TQString::number(r.y()) + "+" + TQString::number(r.height()) + "+" + TQString::number(r.width());
}
- else if (replyType == "QFont")
+ else if (replyType == "TQFont")
{
- QFont r;
+ TQFont r;
reply >> r;
ret << r.rawName();
}
- else if (replyType == "QCursor")
+ else if (replyType == "TQCursor")
{
- QCursor r;
+ TQCursor r;
reply >> r;
//theList->insertItem(r, 1);
- ret << "Cursor #" + QString::number(r.shape());
+ ret << "Cursor #" + TQString::number(r.shape());
}
- else if (replyType == "QPixmap")
+ else if (replyType == "TQPixmap")
{
- QPixmap r;
+ TQPixmap r;
reply >> r;
theList->insertItem(r, 1);
}
- else if (replyType == "QColor")
+ else if (replyType == "TQColor")
{
- QColor r;
+ TQColor r;
reply >> r;
- QString color = r.name();
- QPixmap p(15,15);
+ TQString color = r.name();
+ TQPixmap p(15,15);
p.fill(r);
theList->insertItem(p,color, 1);
}
- else if (replyType == "QDateTime")
+ else if (replyType == "TQDateTime")
{
- QDateTime r;
+ TQDateTime r;
reply >> r;
ret << r.toString();
}
- else if (replyType == "QDate")
+ else if (replyType == "TQDate")
{
- QDate r;
+ TQDate r;
reply >> r;
ret << r.toString();
}
- else if (replyType == "QTime")
+ else if (replyType == "TQTime")
{
- QTime r;
+ TQTime r;
reply >> r;
ret << r.toString();
}
@@ -1093,12 +1093,12 @@ bool KDCOPWindow::demarshal
DCOPRef r;
reply >> r;
if (!r.app().isEmpty() && !r.obj().isEmpty())
- ret << QString("DCOPRef(%1, %2)").arg(r.app(), r.obj());
+ ret << TQString("DCOPRef(%1, %2)").arg(r.app(), r.obj());
}
else
{
ret <<
- i18n("Do not know how to demarshal %1").arg(QString::fromUtf8(replyType));
+ i18n("Do not know how to demarshal %1").arg(TQString::fromUtf8(replyType));
isValid = false;
}
@@ -1108,9 +1108,9 @@ bool KDCOPWindow::demarshal
}
void
-KDCOPWindow::slotApplicationRegistered(const QCString & appName)
+KDCOPWindow::slotApplicationRegistered(const TQCString & appName)
{
- QListViewItemIterator it(mainView->lv);
+ TQListViewItemIterator it(mainView->lv);
for (; it.current(); ++it)
{
@@ -1121,7 +1121,7 @@ KDCOPWindow::slotApplicationRegistered(const QCString & appName)
return;
}
- QCString appId = dcopClient->appId();
+ TQCString appId = dcopClient->appId();
if (appName != appId && appName.left(9) != "anonymous")
{
@@ -1130,9 +1130,9 @@ KDCOPWindow::slotApplicationRegistered(const QCString & appName)
}
void
-KDCOPWindow::slotApplicationUnregistered(const QCString & appName)
+KDCOPWindow::slotApplicationUnregistered(const TQCString & appName)
{
- QListViewItemIterator it(mainView->lv);
+ TQListViewItemIterator it(mainView->lv);
for (; it.current(); ++it)
{
@@ -1150,13 +1150,13 @@ KDCOPWindow::slotApplicationUnregistered(const QCString & appName)
bool
KDCOPWindow::getParameters
(
- const QString & _unNormalisedSignature,
- QString & normalisedSignature,
- QStringList & types,
- QStringList & names
+ const TQString & _unNormalisedSignature,
+ TQString & normalisedSignature,
+ TQStringList & types,
+ TQStringList & names
)
{
- QString unNormalisedSignature(_unNormalisedSignature);
+ TQString unNormalisedSignature(_unNormalisedSignature);
int s = unNormalisedSignature.find(' ');
@@ -1176,16 +1176,16 @@ KDCOPWindow::getParameters
return false;
}
- QStringList intTypes;
+ TQStringList intTypes;
intTypes << "int" << "unsigned" << "long" << "bool" ;
if (left > 0 && left + 1 < right - 1)
{
types =
- QStringList::split
+ TQStringList::split
(',', unNormalisedSignature.mid(left + 1, right - left - 1));
- for (QStringList::Iterator it = types.begin(); it != types.end(); ++it)
+ for (TQStringList::Iterator it = types.begin(); it != types.end(); ++it)
{
(*it) = (*it).simplifyWhiteSpace();
@@ -1211,18 +1211,18 @@ void KDCOPWindow::slotCopy()
// below list view. If there is nothing selected from
// the below menu then tell the tree to copy its current
// selection as text.
- QClipboard *clipboard = QApplication::clipboard();
+ QClipboard *clipboard = TQApplication::clipboard();
if (mainView->lb_replyData->count()!= 0)
{
//if (!mainView->lb_replyData->pixmap(mainView->lb_replyData->currentItem())->isNull())
//{
kdDebug() << "Is pixmap" << endl;
- // QPixmap p;
+ // TQPixmap p;
// p = *mainView->lb_replyData->pixmap(mainView->lb_replyData->currentItem());
// clipboard->setPixmap(p);
//}
- QString t = mainView->lb_replyData->text(mainView->lb_replyData->currentItem());
+ TQString t = mainView->lb_replyData->text(mainView->lb_replyData->currentItem());
if (!t.isNull())
clipboard->setText(t);
}
diff --git a/kdcop/kdcopwindow.h b/kdcop/kdcopwindow.h
index 18e4ecfb6..f13c3eb70 100644
--- a/kdcop/kdcopwindow.h
+++ b/kdcop/kdcopwindow.h
@@ -25,15 +25,15 @@ class KDCOPWindow : public KMainWindow
public:
- KDCOPWindow( QWidget* parent = 0, const char* name = 0 );
+ KDCOPWindow( TQWidget* parent = 0, const char* name = 0 );
protected slots:
- void slotCurrentChanged( QListViewItem* item );
+ void slotCurrentChanged( TQListViewItem* item );
void slotCallFunction();
- void slotCallFunction( QListViewItem* item );
- void slotApplicationRegistered(const QCString &);
- void slotApplicationUnregistered(const QCString &);
+ void slotCallFunction( TQListViewItem* item );
+ void slotApplicationRegistered(const TQCString &);
+ void slotApplicationUnregistered(const TQCString &);
void slotFillApplications();
void slotCopy();
void slotMode();
@@ -44,19 +44,19 @@ class KDCOPWindow : public KMainWindow
bool getParameters
(
- const QString & unNormalisedSignature,
- QString & normalisedSignature,
- QStringList & types,
- QStringList & names
+ const TQString & unNormalisedSignature,
+ TQString & normalisedSignature,
+ TQStringList & types,
+ TQStringList & names
);
- bool demarshal(QCString & replyType, QDataStream & reply, QListBox *theList);
+ bool demarshal(TQCString & replyType, TQDataStream & reply, TQListBox *theList);
DCOPClient * dcopClient;
KAction * exeaction;
KSelectAction * langmode;
kdcopview * mainView;
- QVBoxLayout * mainLayout;
+ TQVBoxLayout * mainLayout;
};
diff --git a/kdebugdialog/kabstractdebugdialog.cpp b/kdebugdialog/kabstractdebugdialog.cpp
index 76dca8f61..bdf267dd1 100644
--- a/kdebugdialog/kabstractdebugdialog.cpp
+++ b/kdebugdialog/kabstractdebugdialog.cpp
@@ -20,12 +20,12 @@
#include "kabstractdebugdialog.h"
#include <kconfig.h>
#include <kpushbutton.h>
-#include <qlayout.h>
+#include <tqlayout.h>
#include <kapplication.h>
#include <klocale.h>
#include <kstdguiitem.h>
-KAbstractDebugDialog::KAbstractDebugDialog( QWidget *parent, const char *name, bool modal )
+KAbstractDebugDialog::KAbstractDebugDialog( TQWidget *parent, const char *name, bool modal )
: KDialog( parent, name, modal )
{
pConfig = new KConfig( "kdebugrc" );
@@ -36,14 +36,14 @@ KAbstractDebugDialog::~KAbstractDebugDialog()
delete pConfig;
}
-void KAbstractDebugDialog::buildButtons( QVBoxLayout * topLayout )
+void KAbstractDebugDialog::buildButtons( TQVBoxLayout * topLayout )
{
- QHBoxLayout *hbox = new QHBoxLayout( KDialog::spacingHint() );
+ TQHBoxLayout *hbox = new TQHBoxLayout( KDialog::spacingHint() );
topLayout->addLayout( hbox );
pHelpButton = new KPushButton( KStdGuiItem::help(), this );
hbox->addWidget( pHelpButton );
hbox->addStretch(10);
- QSpacerItem *spacer = new QSpacerItem(40, 0);
+ TQSpacerItem *spacer = new TQSpacerItem(40, 0);
hbox->addItem(spacer);
pOKButton = new KPushButton( KStdGuiItem::ok(), this );
hbox->addWidget( pOKButton );
@@ -64,10 +64,10 @@ void KAbstractDebugDialog::buildButtons( QVBoxLayout * topLayout )
pApplyButton->setFixedWidth( w4 );
pCancelButton->setFixedWidth( w4 );
- connect( pHelpButton, SIGNAL( clicked() ), SLOT( slotShowHelp() ) );
- connect( pOKButton, SIGNAL( clicked() ), SLOT( accept() ) );
- connect( pApplyButton, SIGNAL( clicked() ), SLOT( slotApply() ) );
- connect( pCancelButton, SIGNAL( clicked() ), SLOT( reject() ) );
+ connect( pHelpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotShowHelp() ) );
+ connect( pOKButton, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) );
+ connect( pApplyButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotApply() ) );
+ connect( pCancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) );
}
void KAbstractDebugDialog::slotShowHelp()
diff --git a/kdebugdialog/kabstractdebugdialog.h b/kdebugdialog/kabstractdebugdialog.h
index d31fb53aa..84fac7380 100644
--- a/kdebugdialog/kabstractdebugdialog.h
+++ b/kdebugdialog/kabstractdebugdialog.h
@@ -30,11 +30,11 @@ class KAbstractDebugDialog : public KDialog
{
Q_OBJECT
public:
- KAbstractDebugDialog( QWidget *parent=0, const char *name=0, bool modal=true );
+ KAbstractDebugDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
virtual ~KAbstractDebugDialog();
- virtual void buildButtons(QVBoxLayout * topLayout);
+ virtual void buildButtons(TQVBoxLayout * topLayout);
virtual void save() = 0;
KConfig * config() { return pConfig; }
diff --git a/kdebugdialog/kdebugdialog.cpp b/kdebugdialog/kdebugdialog.cpp
index ae0ef0eaa..2660356fc 100644
--- a/kdebugdialog/kdebugdialog.cpp
+++ b/kdebugdialog/kdebugdialog.cpp
@@ -22,13 +22,13 @@
#include "config.h"
#endif
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qcombobox.h>
-#include <qlabel.h>
-#include <qgroupbox.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
+#include <tqlabel.h>
+#include <tqgroupbox.h>
+#include <tqcheckbox.h>
+#include <tqpushbutton.h>
#include <kdebug.h>
#include <kglobal.h>
#include <klocale.h>
@@ -40,29 +40,29 @@
#include "kdebugdialog.h"
-KDebugDialog::KDebugDialog( QStringList areaList, QWidget *parent, const char *name, bool modal )
+KDebugDialog::KDebugDialog( TQStringList areaList, TQWidget *parent, const char *name, bool modal )
: KAbstractDebugDialog( parent, name, modal )
{
setCaption(i18n("Debug Settings"));
- QVBoxLayout *topLayout = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+ TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
if( topLayout == 0 ) { return; } // can this happen ?
- QLabel * tmpLabel = new QLabel( i18n("Debug area:"), this );
+ TQLabel * tmpLabel = new TQLabel( i18n("Debug area:"), this );
tmpLabel->setFixedHeight( fontMetrics().lineSpacing() );
topLayout->addWidget( tmpLabel );
// Build combo of debug areas
- pDebugAreas = new QComboBox( false, this );
+ pDebugAreas = new TQComboBox( false, this );
pDebugAreas->setFixedHeight( pDebugAreas->sizeHint().height() );
pDebugAreas->insertStringList( areaList );
topLayout->addWidget( pDebugAreas );
- QGridLayout *gbox = new QGridLayout( 2, 2, KDialog::marginHint() );
+ TQGridLayout *gbox = new TQGridLayout( 2, 2, KDialog::marginHint() );
if( gbox == 0 ) { return; }
topLayout->addLayout( gbox );
- QStringList destList;
+ TQStringList destList;
destList.append( i18n("File") );
destList.append( i18n("Message Box") );
destList.append( i18n("Shell") );
@@ -72,105 +72,105 @@ KDebugDialog::KDebugDialog( QStringList areaList, QWidget *parent, const char *n
//
// Upper left frame
//
- pInfoGroup = new QGroupBox( i18n("Information"), this );
+ pInfoGroup = new TQGroupBox( i18n("Information"), this );
gbox->addWidget( pInfoGroup, 0, 0 );
- QVBoxLayout *vbox = new QVBoxLayout( pInfoGroup, KDialog::spacingHint() );
+ TQVBoxLayout *vbox = new TQVBoxLayout( pInfoGroup, KDialog::spacingHint() );
vbox->addSpacing( fontMetrics().lineSpacing() );
- pInfoLabel1 = new QLabel( i18n("Output to:"), pInfoGroup );
+ pInfoLabel1 = new TQLabel( i18n("Output to:"), pInfoGroup );
vbox->addWidget( pInfoLabel1 );
- pInfoCombo = new QComboBox( false, pInfoGroup );
- connect(pInfoCombo, SIGNAL(activated(int)),
- this, SLOT(slotDestinationChanged(int)));
+ pInfoCombo = new TQComboBox( false, pInfoGroup );
+ connect(pInfoCombo, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(slotDestinationChanged(int)));
vbox->addWidget( pInfoCombo );
pInfoCombo->insertStringList( destList );
- pInfoLabel2 = new QLabel( i18n("Filename:"), pInfoGroup );
+ pInfoLabel2 = new TQLabel( i18n("Filename:"), pInfoGroup );
vbox->addWidget( pInfoLabel2 );
- pInfoFile = new QLineEdit( pInfoGroup );
+ pInfoFile = new TQLineEdit( pInfoGroup );
vbox->addWidget( pInfoFile );
/*
- pInfoLabel3 = new QLabel( i18n("Show only area(s):"), pInfoGroup );
+ pInfoLabel3 = new TQLabel( i18n("Show only area(s):"), pInfoGroup );
vbox->addWidget( pInfoLabel3 );
- pInfoShow = new QLineEdit( pInfoGroup );
+ pInfoShow = new TQLineEdit( pInfoGroup );
vbox->addWidget( pInfoShow );
*/
//
// Upper right frame
//
- pWarnGroup = new QGroupBox( i18n("Warning"), this );
+ pWarnGroup = new TQGroupBox( i18n("Warning"), this );
gbox->addWidget( pWarnGroup, 0, 1 );
- vbox = new QVBoxLayout( pWarnGroup, KDialog::spacingHint() );
+ vbox = new TQVBoxLayout( pWarnGroup, KDialog::spacingHint() );
vbox->addSpacing( fontMetrics().lineSpacing() );
- pWarnLabel1 = new QLabel( i18n("Output to:"), pWarnGroup );
+ pWarnLabel1 = new TQLabel( i18n("Output to:"), pWarnGroup );
vbox->addWidget( pWarnLabel1 );
- pWarnCombo = new QComboBox( false, pWarnGroup );
- connect(pWarnCombo, SIGNAL(activated(int)),
- this, SLOT(slotDestinationChanged(int)));
+ pWarnCombo = new TQComboBox( false, pWarnGroup );
+ connect(pWarnCombo, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(slotDestinationChanged(int)));
vbox->addWidget( pWarnCombo );
pWarnCombo->insertStringList( destList );
- pWarnLabel2 = new QLabel( i18n("Filename:"), pWarnGroup );
+ pWarnLabel2 = new TQLabel( i18n("Filename:"), pWarnGroup );
vbox->addWidget( pWarnLabel2 );
- pWarnFile = new QLineEdit( pWarnGroup );
+ pWarnFile = new TQLineEdit( pWarnGroup );
vbox->addWidget( pWarnFile );
/*
- pWarnLabel3 = new QLabel( i18n("Show only area(s):"), pWarnGroup );
+ pWarnLabel3 = new TQLabel( i18n("Show only area(s):"), pWarnGroup );
vbox->addWidget( pWarnLabel3 );
- pWarnShow = new QLineEdit( pWarnGroup );
+ pWarnShow = new TQLineEdit( pWarnGroup );
vbox->addWidget( pWarnShow );
*/
//
// Lower left frame
//
- pErrorGroup = new QGroupBox( i18n("Error"), this );
+ pErrorGroup = new TQGroupBox( i18n("Error"), this );
gbox->addWidget( pErrorGroup, 1, 0 );
- vbox = new QVBoxLayout( pErrorGroup, KDialog::spacingHint() );
+ vbox = new TQVBoxLayout( pErrorGroup, KDialog::spacingHint() );
vbox->addSpacing( fontMetrics().lineSpacing() );
- pErrorLabel1 = new QLabel( i18n("Output to:"), pErrorGroup );
+ pErrorLabel1 = new TQLabel( i18n("Output to:"), pErrorGroup );
vbox->addWidget( pErrorLabel1 );
- pErrorCombo = new QComboBox( false, pErrorGroup );
- connect(pErrorCombo, SIGNAL(activated(int)),
- this, SLOT(slotDestinationChanged(int)));
+ pErrorCombo = new TQComboBox( false, pErrorGroup );
+ connect(pErrorCombo, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(slotDestinationChanged(int)));
vbox->addWidget( pErrorCombo );
pErrorCombo->insertStringList( destList );
- pErrorLabel2 = new QLabel( i18n("Filename:"), pErrorGroup );
+ pErrorLabel2 = new TQLabel( i18n("Filename:"), pErrorGroup );
vbox->addWidget( pErrorLabel2 );
- pErrorFile = new QLineEdit( pErrorGroup );
+ pErrorFile = new TQLineEdit( pErrorGroup );
vbox->addWidget( pErrorFile );
/*
- pErrorLabel3 = new QLabel( i18n("Show only area(s):"), pErrorGroup );
+ pErrorLabel3 = new TQLabel( i18n("Show only area(s):"), pErrorGroup );
vbox->addWidget( pErrorLabel3 );
- pErrorShow = new QLineEdit( pErrorGroup );
+ pErrorShow = new TQLineEdit( pErrorGroup );
vbox->addWidget( pErrorShow );
*/
//
// Lower right frame
//
- pFatalGroup = new QGroupBox( i18n("Fatal Error"), this );
+ pFatalGroup = new TQGroupBox( i18n("Fatal Error"), this );
gbox->addWidget( pFatalGroup, 1, 1 );
- vbox = new QVBoxLayout( pFatalGroup, KDialog::spacingHint() );
+ vbox = new TQVBoxLayout( pFatalGroup, KDialog::spacingHint() );
vbox->addSpacing( fontMetrics().lineSpacing() );
- pFatalLabel1 = new QLabel( i18n("Output to:"), pFatalGroup );
+ pFatalLabel1 = new TQLabel( i18n("Output to:"), pFatalGroup );
vbox->addWidget( pFatalLabel1 );
- pFatalCombo = new QComboBox( false, pFatalGroup );
- connect(pFatalCombo, SIGNAL(activated(int)),
- this, SLOT(slotDestinationChanged(int)));
+ pFatalCombo = new TQComboBox( false, pFatalGroup );
+ connect(pFatalCombo, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(slotDestinationChanged(int)));
vbox->addWidget( pFatalCombo );
pFatalCombo->insertStringList( destList );
- pFatalLabel2 = new QLabel( i18n("Filename:"), pFatalGroup );
+ pFatalLabel2 = new TQLabel( i18n("Filename:"), pFatalGroup );
vbox->addWidget( pFatalLabel2 );
- pFatalFile = new QLineEdit( pFatalGroup );
+ pFatalFile = new TQLineEdit( pFatalGroup );
vbox->addWidget( pFatalFile );
/*
- pFatalLabel3 = new QLabel( i18n("Show only area(s):"), pFatalGroup );
+ pFatalLabel3 = new TQLabel( i18n("Show only area(s):"), pFatalGroup );
vbox->addWidget( pFatalLabel3 );
- pFatalShow = new QLineEdit( pFatalGroup );
+ pFatalShow = new TQLineEdit( pFatalGroup );
vbox->addWidget( pFatalShow );
*/
- pAbortFatal = new QCheckBox( i18n("Abort on fatal errors"), this );
+ pAbortFatal = new TQCheckBox( i18n("Abort on fatal errors"), this );
topLayout->addWidget(pAbortFatal);
topLayout->addStretch();
@@ -179,8 +179,8 @@ KDebugDialog::KDebugDialog( QStringList areaList, QWidget *parent, const char *n
buildButtons( topLayout );
- connect( pDebugAreas, SIGNAL( activated( const QString &) ),
- SLOT( slotDebugAreaChanged( const QString & ) ) );
+ connect( pDebugAreas, TQT_SIGNAL( activated( const TQString &) ),
+ TQT_SLOT( slotDebugAreaChanged( const TQString & ) ) );
// Get initial values ("initial" is understood by the slot)
slotDebugAreaChanged( "0 initial" );
@@ -193,13 +193,13 @@ KDebugDialog::~KDebugDialog()
{
}
-void KDebugDialog::slotDebugAreaChanged( const QString & text )
+void KDebugDialog::slotDebugAreaChanged( const TQString & text )
{
// Save settings from previous page
if ( text != "0 initial" ) // except on first call
save();
- QString data = text.simplifyWhiteSpace();
+ TQString data = text.simplifyWhiteSpace();
int space = data.find(" ");
if (space == -1)
kdError() << "No space:" << data << endl;
@@ -210,7 +210,7 @@ void KDebugDialog::slotDebugAreaChanged( const QString & text )
kdError() << "The first part wasn't a number : " << data << endl;
/* Fill dialog fields with values from config data */
- pConfig->setGroup( QString::number( number ) ); // Group name = debug area code
+ pConfig->setGroup( TQString::number( number ) ); // Group name = debug area code
pInfoCombo->setCurrentItem( pConfig->readNumEntry( "InfoOutput", 2 ) );
pInfoFile->setText( pConfig->readPathEntry( "InfoFilename","kdebug.dbg" ) );
//pInfoShow->setText( pConfig->readEntry( "InfoShow" ) );
@@ -243,7 +243,7 @@ void KDebugDialog::save()
//pConfig->writeEntry( "FatalShow", pFatalShow->text() );
pConfig->writeEntry( "AbortFatal", pAbortFatal->isChecked() );
- QByteArray data;
+ TQByteArray data;
if (!kapp->dcopClient()->send("*", "KDebug", "notifyKDebugConfigChanged()", data))
{
kdError() << "Unable to send DCOP message" << endl;
diff --git a/kdebugdialog/kdebugdialog.h b/kdebugdialog/kdebugdialog.h
index d0c22fbc1..86a6fcc84 100644
--- a/kdebugdialog/kdebugdialog.h
+++ b/kdebugdialog/kdebugdialog.h
@@ -42,47 +42,47 @@ class KDebugDialog : public KAbstractDebugDialog
Q_OBJECT
public:
- KDebugDialog( QStringList areaList, QWidget *parent=0, const char *name=0, bool modal=true );
+ KDebugDialog( TQStringList areaList, TQWidget *parent=0, const char *name=0, bool modal=true );
virtual ~KDebugDialog();
void save();
protected slots:
- void slotDebugAreaChanged( const QString & );
+ void slotDebugAreaChanged( const TQString & );
void slotDestinationChanged(int);
private:
- QComboBox* pDebugAreas;
- QGroupBox* pInfoGroup;
- QLabel* pInfoLabel1;
- QComboBox* pInfoCombo;
- QLabel* pInfoLabel2;
- QLineEdit* pInfoFile;
- QLabel* pInfoLabel3;
- QLineEdit* pInfoShow;
- QGroupBox* pWarnGroup;
- QLabel* pWarnLabel1;
- QComboBox* pWarnCombo;
- QLabel* pWarnLabel2;
- QLineEdit* pWarnFile;
- QLabel* pWarnLabel3;
- QLineEdit* pWarnShow;
- QGroupBox* pErrorGroup;
- QLabel* pErrorLabel1;
- QComboBox* pErrorCombo;
- QLabel* pErrorLabel2;
- QLineEdit* pErrorFile;
- QLabel* pErrorLabel3;
- QLineEdit* pErrorShow;
- QGroupBox* pFatalGroup;
- QLabel* pFatalLabel1;
- QComboBox* pFatalCombo;
- QLabel* pFatalLabel2;
- QLineEdit* pFatalFile;
- QLabel* pFatalLabel3;
- QLineEdit* pFatalShow;
+ TQComboBox* pDebugAreas;
+ TQGroupBox* pInfoGroup;
+ TQLabel* pInfoLabel1;
+ TQComboBox* pInfoCombo;
+ TQLabel* pInfoLabel2;
+ TQLineEdit* pInfoFile;
+ TQLabel* pInfoLabel3;
+ TQLineEdit* pInfoShow;
+ TQGroupBox* pWarnGroup;
+ TQLabel* pWarnLabel1;
+ TQComboBox* pWarnCombo;
+ TQLabel* pWarnLabel2;
+ TQLineEdit* pWarnFile;
+ TQLabel* pWarnLabel3;
+ TQLineEdit* pWarnShow;
+ TQGroupBox* pErrorGroup;
+ TQLabel* pErrorLabel1;
+ TQComboBox* pErrorCombo;
+ TQLabel* pErrorLabel2;
+ TQLineEdit* pErrorFile;
+ TQLabel* pErrorLabel3;
+ TQLineEdit* pErrorShow;
+ TQGroupBox* pFatalGroup;
+ TQLabel* pFatalLabel1;
+ TQComboBox* pFatalCombo;
+ TQLabel* pFatalLabel2;
+ TQLineEdit* pFatalFile;
+ TQLabel* pFatalLabel3;
+ TQLineEdit* pFatalShow;
- QCheckBox* pAbortFatal;
+ TQCheckBox* pAbortFatal;
private:
// Disallow assignment and copy-construction
diff --git a/kdebugdialog/klistdebugdialog.cpp b/kdebugdialog/klistdebugdialog.cpp
index 8dade2895..7ddb2b559 100644
--- a/kdebugdialog/klistdebugdialog.cpp
+++ b/kdebugdialog/klistdebugdialog.cpp
@@ -22,55 +22,55 @@
#include <kconfig.h>
#include <kapplication.h>
#include <kdebug.h>
-#include <qlayout.h>
-#include <qscrollview.h>
-#include <qvbox.h>
+#include <tqlayout.h>
+#include <tqscrollview.h>
+#include <tqvbox.h>
#include <klocale.h>
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
#include <klineedit.h>
#include <dcopclient.h>
-KListDebugDialog::KListDebugDialog( QStringList areaList, QWidget *parent, const char *name, bool modal )
+KListDebugDialog::KListDebugDialog( TQStringList areaList, TQWidget *parent, const char *name, bool modal )
: KAbstractDebugDialog( parent, name, modal ),
m_areaList( areaList )
{
setCaption(i18n("Debug Settings"));
- QVBoxLayout *lay = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+ TQVBoxLayout *lay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
m_incrSearch = new KLineEdit( this );
lay->addWidget( m_incrSearch );
- connect( m_incrSearch, SIGNAL( textChanged( const QString& ) ),
- SLOT( generateCheckBoxes( const QString& ) ) );
+ connect( m_incrSearch, TQT_SIGNAL( textChanged( const TQString& ) ),
+ TQT_SLOT( generateCheckBoxes( const TQString& ) ) );
- QScrollView * scrollView = new QScrollView( this );
- scrollView->setResizePolicy( QScrollView::AutoOneFit );
+ TQScrollView * scrollView = new TQScrollView( this );
+ scrollView->setResizePolicy( TQScrollView::AutoOneFit );
lay->addWidget( scrollView );
- m_box = new QVBox( scrollView->viewport() );
+ m_box = new TQVBox( scrollView->viewport() );
scrollView->addChild( m_box );
- generateCheckBoxes( QString::null );
+ generateCheckBoxes( TQString::null );
- QHBoxLayout* selectButs = new QHBoxLayout( lay );
- QPushButton* all = new QPushButton( i18n("&Select All"), this );
- QPushButton* none = new QPushButton( i18n("&Deselect All"), this );
+ TQHBoxLayout* selectButs = new TQHBoxLayout( lay );
+ TQPushButton* all = new TQPushButton( i18n("&Select All"), this );
+ TQPushButton* none = new TQPushButton( i18n("&Deselect All"), this );
selectButs->addWidget( all );
selectButs->addWidget( none );
- connect( all, SIGNAL( clicked() ), this, SLOT( selectAll() ) );
- connect( none, SIGNAL( clicked() ), this, SLOT( deSelectAll() ) );
+ connect( all, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectAll() ) );
+ connect( none, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deSelectAll() ) );
buildButtons( lay );
resize( 350, 400 );
}
-void KListDebugDialog::generateCheckBoxes( const QString& filter )
+void KListDebugDialog::generateCheckBoxes( const TQString& filter )
{
- QPtrListIterator<QCheckBox> cb_it ( boxes );
+ TQPtrListIterator<TQCheckBox> cb_it ( boxes );
for( ; cb_it.current() ; ++cb_it )
{
- if( (*cb_it)->state() != QButton::NoChange )
+ if( (*cb_it)->state() != TQButton::NoChange )
m_changes.insert( (*cb_it)->name(), (*cb_it)->isChecked() ? 2 : 4 );
}
@@ -78,20 +78,20 @@ void KListDebugDialog::generateCheckBoxes( const QString& filter )
boxes.clear();
boxes.setAutoDelete( false );
- QWidget* taborder = m_incrSearch;
- QStringList::Iterator it = m_areaList.begin();
+ TQWidget* taborder = m_incrSearch;
+ TQStringList::Iterator it = m_areaList.begin();
for ( ; it != m_areaList.end() ; ++it )
{
- QString data = (*it).simplifyWhiteSpace();
+ TQString data = (*it).simplifyWhiteSpace();
if ( filter.isEmpty() || data.lower().contains( filter.lower() ) )
{
int space = data.find(" ");
if (space == -1)
kdError() << "No space:" << data << endl;
- QString areaNumber = data.left(space);
+ TQString areaNumber = data.left(space);
//kdDebug() << areaNumber << endl;
- QCheckBox * cb = new QCheckBox( data, m_box, areaNumber.latin1() );
+ TQCheckBox * cb = new TQCheckBox( data, m_box, areaNumber.latin1() );
cb->show();
boxes.append( cb );
setTabOrder( taborder, cb );
@@ -104,7 +104,7 @@ void KListDebugDialog::generateCheckBoxes( const QString& filter )
void KListDebugDialog::selectAll()
{
- QPtrListIterator<QCheckBox> it ( boxes );
+ TQPtrListIterator<TQCheckBox> it ( boxes );
for ( ; it.current() ; ++it ) {
(*it)->setChecked( true );
m_changes.insert( (*it)->name(), 2 );
@@ -113,7 +113,7 @@ void KListDebugDialog::selectAll()
void KListDebugDialog::deSelectAll()
{
- QPtrListIterator<QCheckBox> it ( boxes );
+ TQPtrListIterator<TQCheckBox> it ( boxes );
for ( ; it.current() ; ++it ) {
(*it)->setChecked( false );
m_changes.insert( (*it)->name(), 4 );
@@ -122,7 +122,7 @@ void KListDebugDialog::deSelectAll()
void KListDebugDialog::load()
{
- QPtrListIterator<QCheckBox> it ( boxes );
+ TQPtrListIterator<TQCheckBox> it ( boxes );
for ( ; it.current() ; ++it )
{
pConfig->setGroup( (*it)->name() ); // Group name = debug area code = cb's name
@@ -154,11 +154,11 @@ void KListDebugDialog::load()
void KListDebugDialog::save()
{
- QPtrListIterator<QCheckBox> it ( boxes );
+ TQPtrListIterator<TQCheckBox> it ( boxes );
for ( ; it.current() ; ++it )
{
pConfig->setGroup( (*it)->name() ); // Group name = debug area code = cb's name
- if ( (*it)->state() != QButton::NoChange )
+ if ( (*it)->state() != TQButton::NoChange )
{
int setting = (*it)->isChecked() ? 2 : 4;
pConfig->writeEntry( "InfoOutput", setting );
@@ -167,7 +167,7 @@ void KListDebugDialog::save()
//sync done by main.cpp
// send DCOP message to all clients
- QByteArray data;
+ TQByteArray data;
if (!kapp->dcopClient()->send("*", "KDebug", "notifyKDebugConfigChanged()", data))
{
kdError() << "Unable to send DCOP message" << endl;
@@ -176,13 +176,13 @@ void KListDebugDialog::save()
m_changes.clear();
}
-void KListDebugDialog::activateArea( QCString area, bool activate )
+void KListDebugDialog::activateArea( TQCString area, bool activate )
{
- QPtrListIterator<QCheckBox> it ( boxes );
+ TQPtrListIterator<TQCheckBox> it ( boxes );
for ( ; it.current() ; ++it )
{
if ( area == (*it)->name() // debug area code = cb's name
- || (*it)->text().find( QString::fromLatin1(area) ) != -1 ) // area name included in cb text
+ || (*it)->text().find( TQString::fromLatin1(area) ) != -1 ) // area name included in cb text
{
(*it)->setChecked( activate );
return;
diff --git a/kdebugdialog/klistdebugdialog.h b/kdebugdialog/klistdebugdialog.h
index 97ab73ce6..99c826259 100644
--- a/kdebugdialog/klistdebugdialog.h
+++ b/kdebugdialog/klistdebugdialog.h
@@ -21,9 +21,9 @@
#define KLISTDEBUGDIALOG__H
#include "kabstractdebugdialog.h"
-#include <qcheckbox.h>
-#include <qptrlist.h>
-#include <qstringlist.h>
+#include <tqcheckbox.h>
+#include <tqptrlist.h>
+#include <tqstringlist.h>
class QVBox;
class KLineEdit;
@@ -40,10 +40,10 @@ class KListDebugDialog : public KAbstractDebugDialog
Q_OBJECT
public:
- KListDebugDialog( QStringList areaList, QWidget *parent=0, const char *name=0, bool modal=true );
+ KListDebugDialog( TQStringList areaList, TQWidget *parent=0, const char *name=0, bool modal=true );
virtual ~KListDebugDialog() {}
- void activateArea( QCString area, bool activate );
+ void activateArea( TQCString area, bool activate );
virtual void save();
@@ -51,15 +51,15 @@ protected slots:
void selectAll();
void deSelectAll();
- void generateCheckBoxes( const QString& filter );
+ void generateCheckBoxes( const TQString& filter );
private:
void load();
- QPtrList<QCheckBox> boxes;
- QStringList m_areaList;
- QVBox *m_box;
+ TQPtrList<TQCheckBox> boxes;
+ TQStringList m_areaList;
+ TQVBox *m_box;
KLineEdit *m_incrSearch;
- QMap<QCString, int> m_changes;
+ TQMap<TQCString, int> m_changes;
};
#endif
diff --git a/kdebugdialog/main.cpp b/kdebugdialog/main.cpp
index dfee01db9..61d977ee8 100644
--- a/kdebugdialog/main.cpp
+++ b/kdebugdialog/main.cpp
@@ -22,31 +22,31 @@
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <kstandarddirs.h>
-#include <qtextstream.h>
+#include <tqtextstream.h>
#include <klocale.h>
#include <kdebug.h>
#include <kuniqueapplication.h>
#include <kconfig.h>
-#include <qfile.h>
+#include <tqfile.h>
-QStringList readAreaList()
+TQStringList readAreaList()
{
- QStringList lst;
+ TQStringList lst;
lst.append( "0 (generic)" );
- QString confAreasFile = locate( "config", "kdebug.areas" );
- QFile file( confAreasFile );
+ TQString confAreasFile = locate( "config", "kdebug.areas" );
+ TQFile file( confAreasFile );
if (!file.open(IO_ReadOnly)) {
kdWarning() << "Couldn't open " << confAreasFile << endl;
file.close();
}
else
{
- QString data;
+ TQString data;
- QTextStream *ts = new QTextStream(&file);
- ts->setEncoding( QTextStream::Latin1 );
+ TQTextStream *ts = new TQTextStream(&file);
+ ts->setEncoding( TQTextStream::Latin1 );
while (!ts->eof()) {
data = ts->readLine().simplifyWhiteSpace();
@@ -88,7 +88,7 @@ int main(int argc, char ** argv)
KUniqueApplication app;
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
- QStringList areaList ( readAreaList() );
+ TQStringList areaList ( readAreaList() );
KAbstractDebugDialog * dialog;
if (args->isSet("fullmode"))
dialog = new KDebugDialog(areaList, 0L);
@@ -113,7 +113,7 @@ int main(int argc, char ** argv)
/* Show dialog */
int nRet = dialog->exec();
- if( nRet == QDialog::Accepted )
+ if( nRet == TQDialog::Accepted )
{
dialog->save();
dialog->config()->sync();
diff --git a/kdepasswd/kcm/chfacedlg.cpp b/kdepasswd/kcm/chfacedlg.cpp
index 1894ac814..c5f700338 100644
--- a/kdepasswd/kcm/chfacedlg.cpp
+++ b/kdepasswd/kcm/chfacedlg.cpp
@@ -25,14 +25,14 @@
* @author Braden MacDonald
*/
-#include <qstring.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qpushbutton.h>
-#include <qdir.h>
-#include <qcheckbox.h>
+#include <tqstring.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
+#include <tqpushbutton.h>
+#include <tqdir.h>
+#include <tqcheckbox.h>
#include <kdialogbase.h>
#include <klocale.h>
@@ -52,35 +52,35 @@
/**
* TODO: It would be nice if the widget were in a .ui
*/
-ChFaceDlg::ChFaceDlg(const QString& picsdir, QWidget *parent, const char *name, bool modal)
+ChFaceDlg::ChFaceDlg(const TQString& picsdir, TQWidget *parent, const char *name, bool modal)
: KDialogBase( parent, name, modal, i18n("Change your Face"), Ok|Cancel, Ok, true )
{
- QWidget *page = new QWidget(this);
+ TQWidget *page = new TQWidget(this);
setMainWidget( page );
- QVBoxLayout *top = new QVBoxLayout(page, 0, spacingHint());
+ TQVBoxLayout *top = new TQVBoxLayout(page, 0, spacingHint());
- QLabel *header = new QLabel( i18n("Select a new face:"), page );
+ TQLabel *header = new TQLabel( i18n("Select a new face:"), page );
top->addWidget( header );
m_FacesWidget = new KIconView( page );
- m_FacesWidget->setSelectionMode( QIconView::Single );
+ m_FacesWidget->setSelectionMode( TQIconView::Single );
m_FacesWidget->setItemsMovable( false );
m_FacesWidget->setMinimumSize( 400, 200 );
- connect( m_FacesWidget, SIGNAL( selectionChanged( QIconViewItem * ) ), SLOT( slotFaceWidgetSelectionChanged( QIconViewItem * ) ) );
+ connect( m_FacesWidget, TQT_SIGNAL( selectionChanged( TQIconViewItem * ) ), TQT_SLOT( slotFaceWidgetSelectionChanged( TQIconViewItem * ) ) );
- connect( m_FacesWidget, SIGNAL( doubleClicked( QIconViewItem *, const QPoint & ) ), SLOT( slotOk() ) );
+ connect( m_FacesWidget, TQT_SIGNAL( doubleClicked( TQIconViewItem *, const TQPoint & ) ), TQT_SLOT( slotOk() ) );
top->addWidget( m_FacesWidget );
// Buttons to get more pics
- QHBoxLayout * morePics = new QHBoxLayout( 0, 0, spacingHint() );
- QPushButton *browseBtn = new QPushButton( i18n("Custom &Image..."), page );
- connect( browseBtn, SIGNAL( clicked() ), SLOT( slotGetCustomImage() ) );
+ TQHBoxLayout * morePics = new TQHBoxLayout( 0, 0, spacingHint() );
+ TQPushButton *browseBtn = new TQPushButton( i18n("Custom &Image..."), page );
+ connect( browseBtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotGetCustomImage() ) );
morePics->addWidget( browseBtn );
#if 0
- QPushButton *acquireBtn = new QPushButton( i18n("&Acquire Image..."), page );
+ TQPushButton *acquireBtn = new TQPushButton( i18n("&Acquire Image..."), page );
acquireBtn->setEnabled( false );
morePics->addWidget( acquireBtn );
#endif
@@ -88,36 +88,36 @@ ChFaceDlg::ChFaceDlg(const QString& picsdir, QWidget *parent, const char *name,
top->addLayout( morePics );
// Filling the icon view
- QDir facesDir( picsdir );
+ TQDir facesDir( picsdir );
if ( facesDir.exists() )
{
- QStringList picslist = facesDir.entryList( QDir::Files );
- for ( QStringList::Iterator it = picslist.begin(); it != picslist.end(); ++it )
- new QIconViewItem( m_FacesWidget, (*it).section(".",0,0), QPixmap( picsdir + *it ) );
+ TQStringList picslist = facesDir.entryList( TQDir::Files );
+ for ( TQStringList::Iterator it = picslist.begin(); it != picslist.end(); ++it )
+ new TQIconViewItem( m_FacesWidget, (*it).section(".",0,0), TQPixmap( picsdir + *it ) );
}
facesDir.setPath( KCFGUserAccount::userFaceDir() );
if ( facesDir.exists() )
{
- QStringList picslist = facesDir.entryList( QDir::Files );
- for ( QStringList::Iterator it = picslist.begin(); it != picslist.end(); ++it )
- new QIconViewItem( m_FacesWidget, "/"+(*it) == KCFGUserAccount::customFaceFile() ?
+ TQStringList picslist = facesDir.entryList( TQDir::Files );
+ for ( TQStringList::Iterator it = picslist.begin(); it != picslist.end(); ++it )
+ new TQIconViewItem( m_FacesWidget, "/"+(*it) == KCFGUserAccount::customFaceFile() ?
i18n("(Custom)") : (*it).section(".",0,0),
- QPixmap( KCFGUserAccount::userFaceDir() + *it ) );
+ TQPixmap( KCFGUserAccount::userFaceDir() + *it ) );
}
- m_FacesWidget->setResizeMode( QIconView::Adjust );
+ m_FacesWidget->setResizeMode( TQIconView::Adjust );
//m_FacesWidget->setGridX( FACE_PIX_SIZE - 10 );
m_FacesWidget->arrangeItemsInGrid();
enableButtonOK( false );
- //connect( this, SIGNAL( okClicked() ), SLOT( slotSaveCustomImage() ) );
+ //connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotSaveCustomImage() ) );
resize( 420, 400 );
}
-void ChFaceDlg::addCustomPixmap( QString imPath, bool saveCopy )
+void ChFaceDlg::addCustomPixmap( TQString imPath, bool saveCopy )
{
- QImage pix( imPath );
+ TQImage pix( imPath );
// TODO: save pix to TMPDIR/userinfo-tmp,
// then scale and copy *that* to ~/.faces
@@ -128,24 +128,24 @@ void ChFaceDlg::addCustomPixmap( QString imPath, bool saveCopy )
}
if ( (pix.width() > KCFGUserAccount::faceSize())
|| (pix.height() > KCFGUserAccount::faceSize()) )
- pix = pix.scale( KCFGUserAccount::faceSize(), KCFGUserAccount::faceSize(), QImage::ScaleMin );// Should be no bigger than certain size.
+ pix = pix.scale( KCFGUserAccount::faceSize(), KCFGUserAccount::faceSize(), TQImage::ScaleMin );// Should be no bigger than certain size.
if ( saveCopy )
{
// If we should save a copy:
- QDir userfaces( KCFGUserAccount::userFaceDir() );
+ TQDir userfaces( KCFGUserAccount::userFaceDir() );
if ( !userfaces.exists( ) )
userfaces.mkdir( userfaces.absPath() );
pix.save( userfaces.absPath() + "/.userinfo-tmp" , "PNG" );
- KonqOperations::copy( this, KonqOperations::COPY, KURL::List( KURL( userfaces.absPath() + "/.userinfo-tmp" ) ), KURL( userfaces.absPath() + "/" + QFileInfo(imPath).fileName().section(".",0,0) ) );
+ KonqOperations::copy( this, KonqOperations::COPY, KURL::List( KURL( userfaces.absPath() + "/.userinfo-tmp" ) ), KURL( userfaces.absPath() + "/" + TQFileInfo(imPath).fileName().section(".",0,0) ) );
#if 0
if ( !pix.save( userfaces.absPath() + "/" + imPath , "PNG" ) )
KMessageBox::sorry(this, i18n("There was an error saving the image:\n%1").arg( userfaces.absPath() ) );
#endif
}
- QIconViewItem* newface = new QIconViewItem( m_FacesWidget, QFileInfo(imPath).fileName().section(".",0,0) , pix );
+ TQIconViewItem* newface = new TQIconViewItem( m_FacesWidget, TQFileInfo(imPath).fileName().section(".",0,0) , pix );
newface->setKey( KCFGUserAccount::customKey() );// Add custom items to end
m_FacesWidget->ensureItemVisible( newface );
m_FacesWidget->setCurrentItem( newface );
@@ -153,9 +153,9 @@ void ChFaceDlg::addCustomPixmap( QString imPath, bool saveCopy )
void ChFaceDlg::slotGetCustomImage( )
{
- QCheckBox* checkWidget = new QCheckBox( i18n("&Save copy in custom faces folder for future use"), 0 );
+ TQCheckBox* checkWidget = new TQCheckBox( i18n("&Save copy in custom faces folder for future use"), 0 );
- KFileDialog *dlg = new KFileDialog( QDir::homeDirPath(), KImageIO::pattern( KImageIO::Reading ),
+ KFileDialog *dlg = new KFileDialog( TQDir::homeDirPath(), KImageIO::pattern( KImageIO::Reading ),
this, 0, true, checkWidget);
dlg->setOperationMode( KFileDialog::Opening );
@@ -164,7 +164,7 @@ void ChFaceDlg::slotGetCustomImage( )
KImageFilePreview *ip = new KImageFilePreview( dlg );
dlg->setPreviewWidget( ip );
- if (dlg->exec() == QDialog::Accepted)
+ if (dlg->exec() == TQDialog::Accepted)
addCustomPixmap( dlg->selectedFile(), checkWidget->isChecked() );
// Because we give it a parent we have to close it ourselves.
dlg->close(true);
@@ -175,7 +175,7 @@ void ChFaceDlg::slotSaveCustomImage()
{
if ( m_FacesWidget->currentItem()->key() == USER_CUSTOM_KEY)
{
- QDir userfaces( QDir::homeDirPath() + USER_FACES_DIR );
+ TQDir userfaces( TQDir::homeDirPath() + USER_FACES_DIR );
if ( !userfaces.exists( ) )
userfaces.mkdir( userfaces.absPath() );
diff --git a/kdepasswd/kcm/chfacedlg.h b/kdepasswd/kcm/chfacedlg.h
index 1802ccd92..085153264 100644
--- a/kdepasswd/kcm/chfacedlg.h
+++ b/kdepasswd/kcm/chfacedlg.h
@@ -28,7 +28,7 @@
#ifndef CHFACEDLG_H
#define CHFACEDLG_H
-#include <qobject.h>
+#include <tqobject.h>
#include <kiconview.h> // declaration below
@@ -42,26 +42,26 @@ class ChFaceDlg : public KDialogBase
public:
- ChFaceDlg(const QString& picsdirs, QWidget *parent=0, const char *name=0, bool modal=true);
+ ChFaceDlg(const TQString& picsdirs, TQWidget *parent=0, const char *name=0, bool modal=true);
- QPixmap getFaceImage() const
+ TQPixmap getFaceImage() const
{
if(m_FacesWidget->currentItem())
return *(m_FacesWidget->currentItem()->pixmap());
else
- return QPixmap();
+ return TQPixmap();
}
private slots:
- void slotFaceWidgetSelectionChanged( QIconViewItem *item )
+ void slotFaceWidgetSelectionChanged( TQIconViewItem *item )
{ enableButtonOK( !item->pixmap()->isNull() ); }
void slotGetCustomImage();
//void slotSaveCustomImage();
private:
- void addCustomPixmap( QString imPath, bool saveCopy );
+ void addCustomPixmap( TQString imPath, bool saveCopy );
KIconView *m_FacesWidget;
};
diff --git a/kdepasswd/kcm/chfnprocess.cpp b/kdepasswd/kcm/chfnprocess.cpp
index ec39a152a..4f6af0add 100644
--- a/kdepasswd/kcm/chfnprocess.cpp
+++ b/kdepasswd/kcm/chfnprocess.cpp
@@ -16,7 +16,7 @@
#include <unistd.h>
#include <stdlib.h>
-#include <qcstring.h>
+#include <tqcstring.h>
#include <kdesu/process.h>
#include <kdebug.h>
@@ -52,7 +52,7 @@ int ChfnProcess::ConverseChfn(const char *pass)
{
int status=-1;
- QCString line;
+ TQCString line;
while(1)
{
line = readLine();
diff --git a/kdepasswd/kcm/chfnprocess.h b/kdepasswd/kcm/chfnprocess.h
index f8bb4e0cf..4f129b643 100644
--- a/kdepasswd/kcm/chfnprocess.h
+++ b/kdepasswd/kcm/chfnprocess.h
@@ -11,7 +11,7 @@
#ifndef CHFNPROC_H
#define CHFNPROC_H
-#include <qcstring.h>
+#include <tqcstring.h>
#include <kdesu/process.h>
class ChfnProcess : public PtyProcess
@@ -22,12 +22,12 @@ public:
int exec(const char *pass, const char *name);
- QCString error() { return m_Error; }
+ TQCString error() { return m_Error; }
private:
int ConverseChfn(const char *pass);
- QCString m_Error;
+ TQCString m_Error;
};
#endif
diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp
index d49304484..a3a25c0f3 100644
--- a/kdepasswd/kcm/main.cpp
+++ b/kdepasswd/kcm/main.cpp
@@ -20,15 +20,15 @@
*
*/
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qbuttongroup.h>
-#include <qevent.h>
-#include <qpixmap.h>
-#include <qcstring.h>
-#include <qstringlist.h>
-#include <qlayout.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
+#include <tqbuttongroup.h>
+#include <tqevent.h>
+#include <tqpixmap.h>
+#include <tqcstring.h>
+#include <tqstringlist.h>
+#include <tqlayout.h>
#include <kpushbutton.h>
#include <kguiitem.h>
@@ -52,31 +52,31 @@
#include "chfacedlg.h"
#include "main.h"
-typedef KGenericFactory<KCMUserAccount, QWidget> Factory;
+typedef KGenericFactory<KCMUserAccount, TQWidget> Factory;
K_EXPORT_COMPONENT_FACTORY( kcm_useraccount, Factory("useraccount") )
-KCMUserAccount::KCMUserAccount( QWidget *parent, const char *name,
- const QStringList &)
+KCMUserAccount::KCMUserAccount( TQWidget *parent, const char *name,
+ const TQStringList &)
: KCModule( parent, name)
{
- QVBoxLayout *topLayout = new QVBoxLayout(this);
+ TQVBoxLayout *topLayout = new TQVBoxLayout(this);
_mw = new MainWidget(this);
topLayout->addWidget( _mw );
- connect( _mw->btnChangeFace, SIGNAL(clicked()), SLOT(slotFaceButtonClicked()));
- connect( _mw->btnChangePassword, SIGNAL(clicked()), SLOT(slotChangePassword()));
+ connect( _mw->btnChangeFace, TQT_SIGNAL(clicked()), TQT_SLOT(slotFaceButtonClicked()));
+ connect( _mw->btnChangePassword, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangePassword()));
_mw->btnChangePassword->setGuiItem( KGuiItem( i18n("Change &Password..."), "password" ));
- connect( _mw->leRealname, SIGNAL(textChanged(const QString&)), SLOT(changed()));
- connect( _mw->leOrganization, SIGNAL(textChanged(const QString&)), SLOT(changed()));
- connect( _mw->leEmail, SIGNAL(textChanged(const QString&)), SLOT(changed()));
- connect( _mw->leSMTP, SIGNAL(textChanged(const QString&)), SLOT(changed()));
+ connect( _mw->leRealname, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
+ connect( _mw->leOrganization, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
+ connect( _mw->leEmail, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
+ connect( _mw->leSMTP, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
_ku = new KUser();
_kes = new KEMailSettings();
_mw->lblUsername->setText( _ku->loginName() );
- _mw->lblUID->setText( QString().number(_ku->uid()) );
+ _mw->lblUID->setText( TQString().number(_ku->uid()) );
KAboutData *about = new KAboutData(I18N_NOOP("kcm_useraccount"),
I18N_NOOP("Password & User Information"), 0, 0,
@@ -108,7 +108,7 @@ KCMUserAccount::KCMUserAccount( QWidget *parent, const char *name,
void KCMUserAccount::slotChangePassword()
{
KProcess *proc = new KProcess;
- QString bin = KGlobal::dirs()->findExe("kdepasswd");
+ TQString bin = KGlobal::dirs()->findExe("kdepasswd");
if ( !bin )
{
kdDebug() << "kcm_useraccount: kdepasswd was not found." << endl;
@@ -146,22 +146,22 @@ void KCMUserAccount::load()
_mw->leOrganization->setText( _kes->getSetting( KEMailSettings::Organization ));
_mw->leSMTP->setText( _kes->getSetting( KEMailSettings::OutServer ));
- QString _userPicsDir = KCFGUserAccount::faceDir() +
+ TQString _userPicsDir = KCFGUserAccount::faceDir() +
KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces/";
- QString fs = KCFGUserAccount::faceSource();
- if (fs == QString::fromLatin1("UserOnly"))
+ TQString fs = KCFGUserAccount::faceSource();
+ if (fs == TQString::fromLatin1("UserOnly"))
_facePerm = userOnly;
- else if (fs == QString::fromLatin1("PreferUser"))
+ else if (fs == TQString::fromLatin1("PreferUser"))
_facePerm = userFirst;
- else if (fs == QString::fromLatin1("PreferAdmin"))
+ else if (fs == TQString::fromLatin1("PreferAdmin"))
_facePerm = adminFirst;
else
_facePerm = adminOnly; // Admin Only
if ( _facePerm == adminFirst )
{ // If the administrator's choice takes preference
- _facePixmap = QPixmap( _userPicsDir + _ku->loginName() + ".face.icon" );
+ _facePixmap = TQPixmap( _userPicsDir + _ku->loginName() + ".face.icon" );
if ( _facePixmap.isNull() )
_facePerm = userFirst;
@@ -172,23 +172,23 @@ void KCMUserAccount::load()
if ( _facePerm >= userFirst )
{
// If the user's choice takes preference
- _facePixmap = QPixmap( KCFGUserAccount::faceFile() );
+ _facePixmap = TQPixmap( KCFGUserAccount::faceFile() );
// The user has no face, should we check for the admin's setting?
if ( _facePixmap.isNull() && _facePerm == userFirst )
- _facePixmap = QPixmap( _userPicsDir + _ku->loginName() + ".face.icon" );
+ _facePixmap = TQPixmap( _userPicsDir + _ku->loginName() + ".face.icon" );
if ( _facePixmap.isNull() )
- _facePixmap = QPixmap( _userPicsDir + KCFGUserAccount::defaultFile() );
+ _facePixmap = TQPixmap( _userPicsDir + KCFGUserAccount::defaultFile() );
_mw->btnChangeFace->setPixmap( _facePixmap );
}
else if ( _facePerm <= adminOnly )
{
// Admin only
- _facePixmap = QPixmap( _userPicsDir + _ku->loginName() + ".face.icon" );
+ _facePixmap = TQPixmap( _userPicsDir + _ku->loginName() + ".face.icon" );
if ( _facePixmap.isNull() )
- _facePixmap = QPixmap( _userPicsDir + KCFGUserAccount::defaultFile() );
+ _facePixmap = TQPixmap( _userPicsDir + KCFGUserAccount::defaultFile() );
_mw->btnChangeFace->setPixmap( _facePixmap );
}
@@ -209,7 +209,7 @@ void KCMUserAccount::save()
/* Save realname to /etc/passwd */
if ( _mw->leRealname->isModified() )
{
- QCString password;
+ TQCString password;
int ret = KPasswordDialog::getPassword( password, i18n("Please enter "
"your password in order to save your settings:"));
@@ -247,7 +247,7 @@ void KCMUserAccount::save()
}
-void KCMUserAccount::changeFace(const QPixmap &pix)
+void KCMUserAccount::changeFace(const TQPixmap &pix)
{
if ( _facePerm < userFirst )
return; // If the user isn't allowed to change their face, don't!
@@ -273,7 +273,7 @@ void KCMUserAccount::slotFaceButtonClicked()
ChFaceDlg* pDlg = new ChFaceDlg( KGlobal::dirs()->resourceDirs("data").last() +
"/kdm/pics/users/" );
- if ( pDlg->exec() == QDialog::Accepted && !pDlg->getFaceImage().isNull() )
+ if ( pDlg->exec() == TQDialog::Accepted && !pDlg->getFaceImage().isNull() )
changeFace( pDlg->getFaceImage() );
delete pDlg;
@@ -284,16 +284,16 @@ void KCMUserAccount::slotFaceButtonClicked()
* The function was called after checking event type and
* the code is now below that if statement
*/
-bool KCMUserAccount::eventFilter(QObject *, QEvent *e)
+bool KCMUserAccount::eventFilter(TQObject *, TQEvent *e)
{
- if (e->type() == QEvent::DragEnter)
+ if (e->type() == TQEvent::DragEnter)
{
- QDragEnterEvent *ee = (QDragEnterEvent *) e;
+ TQDragEnterEvent *ee = (TQDragEnterEvent *) e;
ee->accept( KURLDrag::canDecode(ee) );
return true;
}
- if (e->type() == QEvent::Drop)
+ if (e->type() == TQEvent::Drop)
{
if ( _facePerm < userFirst )
{
@@ -302,12 +302,12 @@ bool KCMUserAccount::eventFilter(QObject *, QEvent *e)
return true;
}
- KURL *url = decodeImgDrop( (QDropEvent *) e, this);
+ KURL *url = decodeImgDrop( (TQDropEvent *) e, this);
if (url)
{
- QString pixPath;
+ TQString pixPath;
KIO::NetAccess::download(*url, pixPath, this);
- changeFace( QPixmap( pixPath ) );
+ changeFace( TQPixmap( pixPath ) );
KIO::NetAccess::removeTempFile(pixPath);
delete url;
}
@@ -316,7 +316,7 @@ bool KCMUserAccount::eventFilter(QObject *, QEvent *e)
return false;
}
-inline KURL *KCMUserAccount::decodeImgDrop(QDropEvent *e, QWidget *wdg)
+inline KURL *KCMUserAccount::decodeImgDrop(TQDropEvent *e, TQWidget *wdg)
{
KURL::List uris;
@@ -328,10 +328,10 @@ inline KURL *KCMUserAccount::decodeImgDrop(QDropEvent *e, QWidget *wdg)
if( KImageIO::canRead(KImageIO::type(url->fileName())) )
return url;
- QStringList qs = QStringList::split('\n', KImageIO::pattern());
+ TQStringList qs = TQStringList::split('\n', KImageIO::pattern());
qs.remove(qs.begin());
- QString msg = i18n( "%1 does not appear to be an image file.\n"
+ TQString msg = i18n( "%1 does not appear to be an image file.\n"
"Please use files with these extensions:\n"
"%2").arg(url->fileName()).arg(qs.join("\n"));
KMessageBox::sorry( wdg, msg);
diff --git a/kdepasswd/kcm/main.h b/kdepasswd/kcm/main.h
index 2ee475bc9..29562a226 100644
--- a/kdepasswd/kcm/main.h
+++ b/kdepasswd/kcm/main.h
@@ -39,8 +39,8 @@ class KCMUserAccount : public KCModule
Q_OBJECT
public:
- KCMUserAccount(QWidget* parent, const char* name = "KCMUserAccount",
- const QStringList& list=QStringList());
+ KCMUserAccount(TQWidget* parent, const char* name = "KCMUserAccount",
+ const TQStringList& list=TQStringList());
~KCMUserAccount();
/**
@@ -57,7 +57,7 @@ public:
/**
* For the face button
*/
- bool eventFilter(QObject *, QEvent *e);
+ bool eventFilter(TQObject *, TQEvent *e);
private slots:
void slotChangePassword();
@@ -65,14 +65,14 @@ private slots:
void slotFaceButtonClicked();
private:
- void changeFace(const QPixmap& pix);
- inline KURL* decodeImgDrop(QDropEvent *e, QWidget *wdg);
+ void changeFace(const TQPixmap& pix);
+ inline KURL* decodeImgDrop(TQDropEvent *e, TQWidget *wdg);
KEMailSettings *_kes;
KUser *_ku;
MainWidget *_mw;
FacePerm _facePerm;
- QPixmap _facePixmap;
+ TQPixmap _facePixmap;
};
diff --git a/kdepasswd/kdepasswd.cpp b/kdepasswd/kdepasswd.cpp
index c76169508..ae75554dd 100644
--- a/kdepasswd/kdepasswd.cpp
+++ b/kdepasswd/kdepasswd.cpp
@@ -47,7 +47,7 @@ int main(int argc, char **argv)
KUniqueApplication app;
KUser ku;
- QCString user;
+ TQCString user;
bool bRoot = ku.isSuperUser();
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
return 0;
}
- QCString oldpass;
+ TQCString oldpass;
if (!bRoot)
{
int result = KDEpasswd1Dialog::getPassword(oldpass);
diff --git a/kdepasswd/passwd.cpp b/kdepasswd/passwd.cpp
index 903b2830f..89bbbdf82 100644
--- a/kdepasswd/passwd.cpp
+++ b/kdepasswd/passwd.cpp
@@ -23,7 +23,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <qcstring.h>
+#include <tqcstring.h>
#include <kdebug.h>
#include <kstandarddirs.h>
@@ -32,7 +32,7 @@
#include "passwd.h"
-PasswdProcess::PasswdProcess(QCString user)
+PasswdProcess::PasswdProcess(TQCString user)
{
struct passwd *pw;
@@ -112,7 +112,7 @@ int PasswdProcess::exec(const char *oldpass, const char *newpass,
int PasswdProcess::ConversePasswd(const char *oldpass, const char *newpass,
int check)
{
- QCString line, errline;
+ TQCString line, errline;
int state = 0;
while (state != 7)
@@ -259,7 +259,7 @@ int PasswdProcess::ConversePasswd(const char *oldpass, const char *newpass,
}
-bool PasswdProcess::isPrompt(QCString line, const char *word)
+bool PasswdProcess::isPrompt(TQCString line, const char *word)
{
unsigned i, j, colon;
unsigned int lineLength(line.length());
diff --git a/kdepasswd/passwd.h b/kdepasswd/passwd.h
index a0c27a5a9..72590740d 100644
--- a/kdepasswd/passwd.h
+++ b/kdepasswd/passwd.h
@@ -9,7 +9,7 @@
#ifndef __Passwd_h_Included__
#define __Passwd_h_Included__
-#include <qcstring.h>
+#include <tqcstring.h>
#include <kdesu/process.h>
/**
@@ -20,7 +20,7 @@ class PasswdProcess
: public PtyProcess
{
public:
- PasswdProcess(QCString user=0);
+ PasswdProcess(TQCString user=0);
~PasswdProcess();
enum Errors { PasswdNotFound=1, PasswordIncorrect, PasswordNotGood };
@@ -28,14 +28,14 @@ public:
int checkCurrent(const char *oldpass);
int exec(const char *oldpass, const char *newpass, int check=0);
- QCString error() { return m_Error; }
+ TQCString error() { return m_Error; }
private:
- bool isPrompt(QCString line, const char *word=0L);
+ bool isPrompt(TQCString line, const char *word=0L);
int ConversePasswd(const char *oldpass, const char *newpass,
int check);
- QCString m_User, m_Error;
+ TQCString m_User, m_Error;
bool bOtherUser;
};
diff --git a/kdepasswd/passwddlg.cpp b/kdepasswd/passwddlg.cpp
index 5a3b48917..c6764a4e9 100644
--- a/kdepasswd/passwddlg.cpp
+++ b/kdepasswd/passwddlg.cpp
@@ -35,7 +35,7 @@ bool KDEpasswd1Dialog::checkPassword(const char *password)
{
case -1:
{
- QString msg = QString::fromLocal8Bit(proc.error());
+ TQString msg = TQString::fromLocal8Bit(proc.error());
if (!msg.isEmpty())
msg = "<p>\"<i>" + msg + "</i>\"";
msg = "<qt>" + i18n("Conversation with 'passwd' failed.") + msg;
@@ -66,7 +66,7 @@ bool KDEpasswd1Dialog::checkPassword(const char *password)
// static
-int KDEpasswd1Dialog::getPassword(QCString &password)
+int KDEpasswd1Dialog::getPassword(TQCString &password)
{
KDEpasswd1Dialog *dlg = new KDEpasswd1Dialog();
int res = dlg->exec();
@@ -78,7 +78,7 @@ int KDEpasswd1Dialog::getPassword(QCString &password)
-KDEpasswd2Dialog::KDEpasswd2Dialog(const char *oldpass, QCString user)
+KDEpasswd2Dialog::KDEpasswd2Dialog(const char *oldpass, TQCString user)
: KPasswordDialog(NewPassword, false, 0)
{
m_Pass = oldpass;
@@ -132,7 +132,7 @@ bool KDEpasswd2Dialog::checkPassword(const char *password)
case 0:
{
hide();
- QString msg = QString::fromLocal8Bit(proc.error());
+ TQString msg = TQString::fromLocal8Bit(proc.error());
if (!msg.isEmpty())
msg = "<p>\"<i>" + msg + "</i>\"";
msg = "<qt>" + i18n("Your password has been changed.") + msg;
@@ -142,7 +142,7 @@ bool KDEpasswd2Dialog::checkPassword(const char *password)
case PasswdProcess::PasswordNotGood:
{
- QString msg = QString::fromLocal8Bit(proc.error());
+ TQString msg = TQString::fromLocal8Bit(proc.error());
if (!msg.isEmpty())
msg = "<p>\"<i>" + msg + "</i>\"";
msg = "<qt>" + i18n("Your password has not been changed.") + msg;
@@ -153,7 +153,7 @@ bool KDEpasswd2Dialog::checkPassword(const char *password)
}
default:
- QString msg = QString::fromLocal8Bit(proc.error());
+ TQString msg = TQString::fromLocal8Bit(proc.error());
if (!msg.isEmpty())
msg = "<p>\"<i>" + msg + "</i>\"";
msg = "<qt>" + i18n("Conversation with 'passwd' failed.") + msg;
diff --git a/kdepasswd/passwddlg.h b/kdepasswd/passwddlg.h
index 78ce4297a..853a8ac19 100644
--- a/kdepasswd/passwddlg.h
+++ b/kdepasswd/passwddlg.h
@@ -20,7 +20,7 @@ public:
KDEpasswd1Dialog();
~KDEpasswd1Dialog();
- static int getPassword(QCString &password);
+ static int getPassword(TQCString &password);
protected:
bool checkPassword(const char *password);
@@ -33,7 +33,7 @@ class KDEpasswd2Dialog
Q_OBJECT
public:
- KDEpasswd2Dialog(const char *oldpass, QCString user);
+ KDEpasswd2Dialog(const char *oldpass, TQCString user);
~KDEpasswd2Dialog();
protected:
@@ -41,7 +41,7 @@ protected:
private:
const char *m_Pass;
- QCString m_User;
+ TQCString m_User;
};
diff --git a/kdeprint/descriptions/sortthem.cpp b/kdeprint/descriptions/sortthem.cpp
index e9e49c058..9adc284b1 100644
--- a/kdeprint/descriptions/sortthem.cpp
+++ b/kdeprint/descriptions/sortthem.cpp
@@ -1,14 +1,14 @@
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <stdlib.h>
#include <stdio.h>
int main(int argc, char **argv) {
-QStringList have;
+TQStringList have;
char buf[1024];
diff --git a/kdeprint/kdeprint_part/printpart.cpp b/kdeprint/kdeprint_part/printpart.cpp
index 535c0e7e0..c8d6ccb15 100644
--- a/kdeprint/kdeprint_part/printpart.cpp
+++ b/kdeprint/kdeprint_part/printpart.cpp
@@ -28,14 +28,14 @@
#include <kaboutdata.h>
#include <kdebug.h>
#include <kparts/genericfactory.h>
-#include <qwidget.h>
+#include <tqwidget.h>
typedef KParts::GenericFactory<PrintPart> PrintPartFactory;
K_EXPORT_COMPONENT_FACTORY( libkdeprint_part, PrintPartFactory )
-PrintPart::PrintPart(QWidget *parentWidget, const char * /*widgetName*/ ,
- QObject *parent, const char *name,
- const QStringList & /*args*/ )
+PrintPart::PrintPart(TQWidget *parentWidget, const char * /*widgetName*/ ,
+ TQObject *parent, const char *name,
+ const TQStringList & /*args*/ )
: KParts::ReadOnlyPart(parent, name)
{
setInstance(PrintPartFactory::instance());
@@ -43,7 +43,7 @@ PrintPart::PrintPart(QWidget *parentWidget, const char * /*widgetName*/ ,
m_extension = new PrintPartExtension(this);
m_view = new KMMainView(parentWidget, "MainView", actionCollection());
- m_view->setFocusPolicy(QWidget::ClickFocus);
+ m_view->setFocusPolicy(TQWidget::ClickFocus);
m_view->enableToolbar(false);
setWidget(m_view);
diff --git a/kdeprint/kdeprint_part/printpart.h b/kdeprint/kdeprint_part/printpart.h
index afba3c277..c84fed1cc 100644
--- a/kdeprint/kdeprint_part/printpart.h
+++ b/kdeprint/kdeprint_part/printpart.h
@@ -31,9 +31,9 @@ class PrintPart : public KParts::ReadOnlyPart
{
Q_OBJECT
public:
- PrintPart(QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name,
- const QStringList & );
+ PrintPart(TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name,
+ const TQStringList & );
virtual ~PrintPart();
static KAboutData *createAboutData();
diff --git a/kdeprint/kdeprintfax/conffax.cpp b/kdeprint/kdeprintfax/conffax.cpp
index c88184595..2351c9c69 100644
--- a/kdeprint/kdeprintfax/conffax.cpp
+++ b/kdeprint/kdeprintfax/conffax.cpp
@@ -20,11 +20,11 @@
#include "conffax.h"
-#include <qcombobox.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qprinter.h>
+#include <tqcombobox.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqprinter.h>
#include <kglobal.h>
#include <kconfig.h>
@@ -33,24 +33,24 @@
#include <stdlib.h>
-ConfFax::ConfFax(QWidget *parent, const char *name)
-: QWidget(parent, name)
+ConfFax::ConfFax(TQWidget *parent, const char *name)
+: TQWidget(parent, name)
{
- m_resolution = new QComboBox(this);
+ m_resolution = new TQComboBox(this);
m_resolution->setMinimumHeight(25);
- m_pagesize = new QComboBox(this);
+ m_pagesize = new TQComboBox(this);
m_pagesize->setMinimumHeight(25);
m_resolution->insertItem(i18n("High (204x196 dpi)"));
m_resolution->insertItem(i18n("Low (204x98 dpi)"));
m_pagesize->insertItem(i18n("A4"));
m_pagesize->insertItem(i18n("Letter"));
m_pagesize->insertItem(i18n("Legal"));
- QLabel *m_resolutionlabel = new QLabel(i18n("&Resolution:"), this);
+ QLabel *m_resolutionlabel = new TQLabel(i18n("&Resolution:"), this);
m_resolutionlabel->setBuddy(m_resolution);
- QLabel *m_pagesizelabel = new QLabel(i18n("&Paper size:"), this);
+ QLabel *m_pagesizelabel = new TQLabel(i18n("&Paper size:"), this);
m_pagesizelabel->setBuddy(m_pagesize);
- QGridLayout *l0 = new QGridLayout(this, 3, 2, 10, 10);
+ QGridLayout *l0 = new TQGridLayout(this, 3, 2, 10, 10);
l0->setColStretch(1, 1);
l0->setRowStretch(2, 1);
l0->addWidget(m_resolutionlabel, 0, 0);
@@ -63,7 +63,7 @@ void ConfFax::load()
{
KConfig *conf = KGlobal::config();
conf->setGroup("Fax");
- QString v = conf->readEntry("Page", KGlobal::locale()->pageSize() == QPrinter::A4 ? "a4" : "letter");
+ QString v = conf->readEntry("Page", KGlobal::locale()->pageSize() == TQPrinter::A4 ? "a4" : "letter");
if (v == "letter") m_pagesize->setCurrentItem(1);
else if (v == "legal") m_pagesize->setCurrentItem(2);
else m_pagesize->setCurrentItem(0);
diff --git a/kdeprint/kdeprintfax/conffax.h b/kdeprint/kdeprintfax/conffax.h
index ffcd125ae..888ef5825 100644
--- a/kdeprint/kdeprintfax/conffax.h
+++ b/kdeprint/kdeprintfax/conffax.h
@@ -21,14 +21,14 @@
#ifndef CONFFAX_H
#define CONFFAX_H
-#include <qwidget.h>
+#include <tqwidget.h>
class QComboBox;
class ConfFax : public QWidget
{
public:
- ConfFax(QWidget *parent = 0, const char *name = 0);
+ ConfFax(TQWidget *parent = 0, const char *name = 0);
void load();
void save();
diff --git a/kdeprint/kdeprintfax/conffilters.cpp b/kdeprint/kdeprintfax/conffilters.cpp
index ab828c582..fc33f88b1 100644
--- a/kdeprint/kdeprintfax/conffilters.cpp
+++ b/kdeprint/kdeprintfax/conffilters.cpp
@@ -21,13 +21,13 @@
#include "conffilters.h"
#include "filterdlg.h"
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qregexp.h>
-#include <qheader.h>
+#include <tqpushbutton.h>
+#include <tqlayout.h>
+#include <tqtooltip.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqregexp.h>
+#include <tqheader.h>
#include <klocale.h>
#include <klistview.h>
@@ -35,41 +35,41 @@
#include <kstandarddirs.h>
#include <kmessagebox.h>
-ConfFilters::ConfFilters(QWidget *parent, const char *name)
-: QWidget(parent, name)
+ConfFilters::ConfFilters(TQWidget *parent, const char *name)
+: TQWidget(parent, name)
{
m_filters = new KListView(this);
m_filters->addColumn(i18n("Mime Type"));
m_filters->addColumn(i18n("Command"));
- m_filters->setFrameStyle(QFrame::WinPanel|QFrame::Sunken);
+ m_filters->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
m_filters->setLineWidth(1);
m_filters->setSorting(-1);
m_filters->header()->setStretchEnabled(true, 1);
- connect(m_filters, SIGNAL(doubleClicked(QListViewItem*)), SLOT(slotChange()));
+ connect(m_filters, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(slotChange()));
- m_add = new QPushButton(this);
+ m_add = new TQPushButton(this);
m_add->setPixmap(BarIcon("filenew"));
- m_remove = new QPushButton(this);
+ m_remove = new TQPushButton(this);
m_remove->setIconSet(BarIconSet("remove"));
- m_change = new QPushButton(this);
+ m_change = new TQPushButton(this);
m_change->setIconSet(BarIconSet("filter"));
- m_up = new QPushButton(this);
+ m_up = new TQPushButton(this);
m_up->setIconSet(BarIconSet("up"));
- m_down = new QPushButton(this);
+ m_down = new TQPushButton(this);
m_down->setIconSet(BarIconSet("down"));
- connect(m_add, SIGNAL(clicked()), SLOT(slotAdd()));
- connect(m_change, SIGNAL(clicked()), SLOT(slotChange()));
- connect(m_remove, SIGNAL(clicked()), SLOT(slotRemove()));
- connect(m_up, SIGNAL(clicked()), SLOT(slotUp()));
- connect(m_down, SIGNAL(clicked()), SLOT(slotDown()));
- QToolTip::add(m_add, i18n("Add filter"));
- QToolTip::add(m_change, i18n("Modify filter"));
- QToolTip::add(m_remove, i18n("Remove filter"));
- QToolTip::add(m_up, i18n("Move filter up"));
- QToolTip::add(m_down, i18n("Move filter down"));
-
- QHBoxLayout *l0 = new QHBoxLayout(this, 10, 10);
- QVBoxLayout *l1 = new QVBoxLayout(0, 0, 0);
+ connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()));
+ connect(m_change, TQT_SIGNAL(clicked()), TQT_SLOT(slotChange()));
+ connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
+ connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp()));
+ connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown()));
+ TQToolTip::add(m_add, i18n("Add filter"));
+ TQToolTip::add(m_change, i18n("Modify filter"));
+ TQToolTip::add(m_remove, i18n("Remove filter"));
+ TQToolTip::add(m_up, i18n("Move filter up"));
+ TQToolTip::add(m_down, i18n("Move filter down"));
+
+ QHBoxLayout *l0 = new TQHBoxLayout(this, 10, 10);
+ QVBoxLayout *l1 = new TQVBoxLayout(0, 0, 0);
l0->addWidget(m_filters, 1);
l0->addLayout(l1, 0);
l1->addWidget(m_add);
@@ -80,7 +80,7 @@ ConfFilters::ConfFilters(QWidget *parent, const char *name)
l1->addWidget(m_down);
l1->addStretch(1);
updateButton();
- connect(m_filters, SIGNAL(selectionChanged ()),SLOT(updateButton()));
+ connect(m_filters, TQT_SIGNAL(selectionChanged ()),TQT_SLOT(updateButton()));
}
void ConfFilters::load()
@@ -95,11 +95,11 @@ void ConfFilters::load()
while (!t.eof())
{
line = t.readLine().stripWhiteSpace();
- if ((p=line.find(QRegExp("\\s"))) != -1)
+ if ((p=line.find(TQRegExp("\\s"))) != -1)
{
QString mime(line.left(p)), cmd(line.right(line.length()-p-1).stripWhiteSpace());
if (!mime.isEmpty() && !cmd.isEmpty())
- item = new QListViewItem(m_filters, item, mime, cmd);
+ item = new TQListViewItem(m_filters, item, mime, cmd);
}
}
}
@@ -126,7 +126,7 @@ void ConfFilters::slotAdd()
if (FilterDlg::doIt(this, &mime, &cmd))
if (!mime.isEmpty() && !cmd.isEmpty())
{
- new QListViewItem(m_filters, m_filters->currentItem(), mime, cmd);
+ new TQListViewItem(m_filters, m_filters->currentItem(), mime, cmd);
updateButton();
}
else
diff --git a/kdeprint/kdeprintfax/conffilters.h b/kdeprint/kdeprintfax/conffilters.h
index 38f564b1f..ce3d64156 100644
--- a/kdeprint/kdeprintfax/conffilters.h
+++ b/kdeprint/kdeprintfax/conffilters.h
@@ -21,15 +21,15 @@
#ifndef CONFFILTERS_H
#define CONFFILTERS_H
-#include <qwidget.h>
-#include <qpushbutton.h>
+#include <tqwidget.h>
+#include <tqpushbutton.h>
class KListView;
class ConfFilters : public QWidget
{
Q_OBJECT
public:
- ConfFilters(QWidget *parent = 0, const char *name = 0);
+ ConfFilters(TQWidget *parent = 0, const char *name = 0);
void load();
void save();
diff --git a/kdeprint/kdeprintfax/confgeneral.cpp b/kdeprint/kdeprintfax/confgeneral.cpp
index 3f592e694..757c54af7 100644
--- a/kdeprint/kdeprintfax/confgeneral.cpp
+++ b/kdeprint/kdeprintfax/confgeneral.cpp
@@ -20,10 +20,10 @@
#include "confgeneral.h"
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
#include <kglobal.h>
#include <kconfig.h>
@@ -32,26 +32,26 @@
#include <stdlib.h>
-ConfGeneral::ConfGeneral(QWidget *parent, const char *name)
-: QWidget(parent, name)
+ConfGeneral::ConfGeneral(TQWidget *parent, const char *name)
+: TQWidget(parent, name)
{
- m_name = new QLineEdit(this);
- m_company = new QLineEdit(this);
- m_number = new QLineEdit(this);
- QLabel *m_namelabel = new QLabel(i18n("&Name:"), this);
+ m_name = new TQLineEdit(this);
+ m_company = new TQLineEdit(this);
+ m_number = new TQLineEdit(this);
+ QLabel *m_namelabel = new TQLabel(i18n("&Name:"), this);
m_namelabel->setBuddy(m_name);
- QLabel *m_companylabel = new QLabel(i18n("&Company:"), this);
+ QLabel *m_companylabel = new TQLabel(i18n("&Company:"), this);
m_companylabel->setBuddy(m_company);
- QLabel *m_numberlabel = new QLabel(i18n("N&umber:"), this);
+ QLabel *m_numberlabel = new TQLabel(i18n("N&umber:"), this);
m_numberlabel->setBuddy(m_number);
KSeparator *sep = new KSeparator( this );
- m_replace_int_char = new QCheckBox( i18n( "Replace international prefix '+' with:" ), this );
- m_replace_int_char_val = new QLineEdit( this );
+ m_replace_int_char = new TQCheckBox( i18n( "Replace international prefix '+' with:" ), this );
+ m_replace_int_char_val = new TQLineEdit( this );
m_replace_int_char_val->setEnabled( false );
- connect( m_replace_int_char, SIGNAL( toggled( bool ) ), m_replace_int_char_val, SLOT( setEnabled( bool ) ) );
+ connect( m_replace_int_char, TQT_SIGNAL( toggled( bool ) ), m_replace_int_char_val, TQT_SLOT( setEnabled( bool ) ) );
- QGridLayout *l0 = new QGridLayout(this, 6, 2, 10, 10);
+ QGridLayout *l0 = new TQGridLayout(this, 6, 2, 10, 10);
l0->setColStretch(1, 1);
l0->setRowStretch(5, 1);
l0->addWidget(m_namelabel, 0, 0);
@@ -61,7 +61,7 @@ ConfGeneral::ConfGeneral(QWidget *parent, const char *name)
l0->addWidget(m_company, 1, 1);
l0->addWidget(m_number, 2, 1);
l0->addMultiCellWidget( sep, 3, 3, 0, 1 );
- QHBoxLayout *l1 = new QHBoxLayout( this, 0, 10 );
+ TQHBoxLayout *l1 = new TQHBoxLayout( this, 0, 10 );
l0->addMultiCellLayout( l1, 4, 4, 0, 1 );
l1->addWidget( m_replace_int_char );
l1->addWidget( m_replace_int_char_val );
diff --git a/kdeprint/kdeprintfax/confgeneral.h b/kdeprint/kdeprintfax/confgeneral.h
index 5f88106d8..46c54c2a5 100644
--- a/kdeprint/kdeprintfax/confgeneral.h
+++ b/kdeprint/kdeprintfax/confgeneral.h
@@ -21,7 +21,7 @@
#ifndef CONFGENERAL_H
#define CONFGENERAL_H
-#include <qwidget.h>
+#include <tqwidget.h>
class QLineEdit;
class QCheckBox;
@@ -29,15 +29,15 @@ class QCheckBox;
class ConfGeneral : public QWidget
{
public:
- ConfGeneral(QWidget *parent = 0, const char *name = 0);
+ ConfGeneral(TQWidget *parent = 0, const char *name = 0);
void load();
void save();
private:
QLineEdit *m_name, *m_company, *m_number;
- QCheckBox *m_replace_int_char;
- QLineEdit *m_replace_int_char_val;
+ TQCheckBox *m_replace_int_char;
+ TQLineEdit *m_replace_int_char_val;
};
#endif
diff --git a/kdeprint/kdeprintfax/configdlg.cpp b/kdeprint/kdeprintfax/configdlg.cpp
index 669d8c200..3ede8cab7 100644
--- a/kdeprint/kdeprintfax/configdlg.cpp
+++ b/kdeprint/kdeprintfax/configdlg.cpp
@@ -24,11 +24,11 @@
#include "confsystem.h"
#include "conffilters.h"
-#include <qvbox.h>
+#include <tqvbox.h>
#include <klocale.h>
#include <kiconloader.h>
-ConfigDlg::ConfigDlg(QWidget *parent, const char *name)
+ConfigDlg::ConfigDlg(TQWidget *parent, const char *name)
: KDialogBase(IconList, i18n("Configuration"), Ok|Cancel, Ok, parent, name, true)
{
QVBox *page1 = addVBoxPage(i18n("Personal"), i18n("Personal Settings"), DesktopIcon("kdmconfig"));
@@ -62,7 +62,7 @@ void ConfigDlg::save()
m_filters->save();
}
-bool ConfigDlg::configure(QWidget *parent)
+bool ConfigDlg::configure(TQWidget *parent)
{
ConfigDlg dlg(parent);
dlg.load();
diff --git a/kdeprint/kdeprintfax/configdlg.h b/kdeprint/kdeprintfax/configdlg.h
index f4bba762d..1e312b57b 100644
--- a/kdeprint/kdeprintfax/configdlg.h
+++ b/kdeprint/kdeprintfax/configdlg.h
@@ -31,10 +31,10 @@ class ConfFilters;
class ConfigDlg : public KDialogBase
{
public:
- static bool configure(QWidget *parent = 0);
+ static bool configure(TQWidget *parent = 0);
protected:
- ConfigDlg(QWidget *parent = 0, const char *name = 0);
+ ConfigDlg(TQWidget *parent = 0, const char *name = 0);
void load();
void save();
diff --git a/kdeprint/kdeprintfax/confsystem.cpp b/kdeprint/kdeprintfax/confsystem.cpp
index 02ee7e66d..51ea326c8 100644
--- a/kdeprint/kdeprintfax/confsystem.cpp
+++ b/kdeprint/kdeprintfax/confsystem.cpp
@@ -21,10 +21,10 @@
#include "confsystem.h"
#include "defcmds.h"
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcombobox.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcombobox.h>
#include <kglobal.h>
#include <kconfig.h>
@@ -38,43 +38,43 @@
#define MGETTY_ID 2
#define OTHER_ID 3
-ConfSystem::ConfSystem(QWidget *parent, const char *name)
-: QWidget(parent, name)
+ConfSystem::ConfSystem(TQWidget *parent, const char *name)
+: TQWidget(parent, name)
{
- m_system = new QComboBox(this);
+ m_system = new TQComboBox(this);
m_system->insertItem("EFax");
m_system->insertItem("HylaFax");
m_system->insertItem("Mgetty-sendfax");
m_system->insertItem( "Other" );
- m_command = new QLineEdit(this);
- QLabel *syslabel = new QLabel(i18n("F&ax system:"), this);
- QLabel *cmdlabel = new QLabel(i18n("Co&mmand:"), this);
+ m_command = new TQLineEdit(this);
+ QLabel *syslabel = new TQLabel(i18n("F&ax system:"), this);
+ QLabel *cmdlabel = new TQLabel(i18n("Co&mmand:"), this);
syslabel->setBuddy(m_system);
cmdlabel->setBuddy(m_command);
- connect(m_system, SIGNAL(activated(int)), SLOT(slotSystemChanged(int)));
+ connect(m_system, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSystemChanged(int)));
m_current = 0;
m_system->setCurrentItem(m_current);
- QWidget *m_dummy1 = new QWidget(this), *m_dummy2 = new QWidget(this);
- m_server = new QLineEdit(m_dummy1);
- m_device = new QComboBox(m_dummy2);
- QLabel *srvlabel = new QLabel(i18n("Fax &server (if any):"), m_dummy1);
- QLabel *devlabel = new QLabel(i18n("&Fax/Modem device:"), m_dummy2);
+ QWidget *m_dummy1 = new TQWidget(this), *m_dummy2 = new TQWidget(this);
+ m_server = new TQLineEdit(m_dummy1);
+ m_device = new TQComboBox(m_dummy2);
+ QLabel *srvlabel = new TQLabel(i18n("Fax &server (if any):"), m_dummy1);
+ QLabel *devlabel = new TQLabel(i18n("&Fax/Modem device:"), m_dummy2);
srvlabel->setBuddy(m_server);
devlabel->setBuddy(m_device);
m_device->insertItem(i18n("Standard Modem Port"));
for (int i=0; i<10; i++)
m_device->insertItem(i18n("Serial Port #%1").arg(i));
m_device->insertItem( i18n( "Other" ) );
- connect( m_device, SIGNAL( activated( int ) ), SLOT( slotDeviceChanged( int ) ) );
- m_device_edit = new QLineEdit( m_dummy2 );
+ connect( m_device, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotDeviceChanged( int ) ) );
+ m_device_edit = new TQLineEdit( m_dummy2 );
slotDeviceChanged( 0 );
KSeparator *sep = new KSeparator(this);
sep->setMinimumHeight(10);
- QVBoxLayout *l0 = new QVBoxLayout(this, 10, 10);
- QGridLayout *l1 = new QGridLayout(0, 2, 2, 0, 10);
+ QVBoxLayout *l0 = new TQVBoxLayout(this, 10, 10);
+ QGridLayout *l1 = new TQGridLayout(0, 2, 2, 0, 10);
l0->addLayout(l1);
l1->setColStretch(1, 1);
l1->addWidget(syslabel, 0, 0);
@@ -85,10 +85,10 @@ ConfSystem::ConfSystem(QWidget *parent, const char *name)
l0->addWidget(m_dummy1);
l0->addWidget(m_dummy2);
l0->addStretch(1);
- QHBoxLayout *l4 = new QHBoxLayout(m_dummy1, 0, 10);
+ QHBoxLayout *l4 = new TQHBoxLayout(m_dummy1, 0, 10);
l4->addWidget(srvlabel, 0);
l4->addWidget(m_server, 1);
- QGridLayout *l5 = new QGridLayout( m_dummy2, 2, 2, 0, 10 );
+ QGridLayout *l5 = new TQGridLayout( m_dummy2, 2, 2, 0, 10 );
l5->setColStretch( 1, 1 );
l5->addWidget(devlabel, 0, 0);
l5->addWidget(m_device, 0, 1);
@@ -102,7 +102,7 @@ void ConfSystem::load()
m_commands << conf->readPathEntry("EFax", defaultCommand(efax_default_cmd));
m_commands << conf->readPathEntry("HylaFax", defaultCommand(hylafax_default_cmd));
m_commands << conf->readPathEntry("Mgetty", defaultCommand(mgetty_default_cmd));
- m_commands << conf->readPathEntry( "Other", QString::null );
+ m_commands << conf->readPathEntry( "Other", TQString::null );
QString v = conf->readEntry("System", "efax");
if (v == "mgetty") m_current = MGETTY_ID;
else if (v == "hylafax") m_current = HYLAFAX_ID;
@@ -158,10 +158,10 @@ void ConfSystem::save()
}
conf->setGroup("Fax");
if ( m_device->currentItem() != ( m_device->count()-1 ) )
- conf->writeEntry("Device", m_device->currentItem() == 0 ? QString("modem") : QString("ttyS%1").arg(m_device->currentItem()-1));
+ conf->writeEntry("Device", m_device->currentItem() == 0 ? TQString("modem") : TQString("ttyS%1").arg(m_device->currentItem()-1));
else
{
- QString dev = m_device_edit->text();
+ TQString dev = m_device_edit->text();
// strip leading "/dev/"
if ( dev.startsWith( "/dev/" ) )
dev = dev.mid( 5 );
diff --git a/kdeprint/kdeprintfax/confsystem.h b/kdeprint/kdeprintfax/confsystem.h
index 202e5f7a0..4e83d6ff9 100644
--- a/kdeprint/kdeprintfax/confsystem.h
+++ b/kdeprint/kdeprintfax/confsystem.h
@@ -21,8 +21,8 @@
#ifndef CONFSYSTEM_H
#define CONFSYSTEM_H
-#include <qwidget.h>
-#include <qstringlist.h>
+#include <tqwidget.h>
+#include <tqstringlist.h>
class QLineEdit;
class QComboBox;
@@ -31,7 +31,7 @@ class ConfSystem : public QWidget
{
Q_OBJECT
public:
- ConfSystem(QWidget *parent = 0, const char *name = 0);
+ ConfSystem(TQWidget *parent = 0, const char *name = 0);
void load();
void save();
diff --git a/kdeprint/kdeprintfax/defcmds.cpp b/kdeprint/kdeprintfax/defcmds.cpp
index b9fc8beee..09631b51d 100644
--- a/kdeprint/kdeprintfax/defcmds.cpp
+++ b/kdeprint/kdeprintfax/defcmds.cpp
@@ -19,10 +19,10 @@
#include "defcmds.h"
-#include <qregexp.h>
+#include <tqregexp.h>
#include <kstandarddirs.h>
-QString defaultCommand(const QString& cmd)
+TQString defaultCommand(const TQString& cmd)
{
QString str(cmd);
QRegExp r("%exe_(\\w+)");
diff --git a/kdeprint/kdeprintfax/defcmds.h b/kdeprint/kdeprintfax/defcmds.h
index cf9131e86..f76094709 100644
--- a/kdeprint/kdeprintfax/defcmds.h
+++ b/kdeprint/kdeprintfax/defcmds.h
@@ -21,12 +21,12 @@
#ifndef DEFCMDS_H
#define DEFCMDS_H
-#include <qstring.h>
+#include <tqstring.h>
#define efax_default_cmd "%exe_fax %user_{NAME=\"@@\"} %dev_{DEV=@@} PAGE=%page %from_{FROM=\"@@\"} %res_{?\?-l} send %number %files"
#define hylafax_default_cmd "%exe_sendfax %cover_{?\?-n} %server_h %res_{-m?\?-l} %subject_r %time_a %enterprise_x %comment_c %email_f %from_W %page_s -d %name_{@@@}%number %files"
#define mgetty_default_cmd "%exe_faxspool %user_F %email_f %name_D %time_t %number %files %res_{?\?-n} %cover_{?\?-C -}"
-QString defaultCommand(const QString& cmd);
+TQString defaultCommand(const TQString& cmd);
#endif
diff --git a/kdeprint/kdeprintfax/faxab.cpp b/kdeprint/kdeprintfax/faxab.cpp
index 28ba4e5c8..ebd6b9cb2 100644
--- a/kdeprint/kdeprintfax/faxab.cpp
+++ b/kdeprint/kdeprintfax/faxab.cpp
@@ -20,11 +20,11 @@
#include "faxab.h"
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
#include <kpushbutton.h>
#include <klistview.h>
-#include <qheader.h>
+#include <tqheader.h>
#include <klocale.h>
#include <kabc/stdaddressbook.h>
#include <kmessagebox.h>
@@ -34,26 +34,26 @@
#include <kglobal.h>
#include <kconfig.h>
-FaxAB::FaxAB(QWidget *parent, const char *name)
+FaxAB::FaxAB(TQWidget *parent, const char *name)
: KDialog(parent, name, true)
{
m_list = new KListView( this );
m_list->addColumn( i18n( "Name" ) );
m_list->addColumn( i18n( "Fax Number" ) );
m_list->header()->setStretchEnabled( true, 0 );
- QLabel *m_listlabel = new QLabel(i18n("Entries:"), this);
+ QLabel *m_listlabel = new TQLabel(i18n("Entries:"), this);
m_ok = new KPushButton(KStdGuiItem::ok(), this);
QPushButton *m_cancel = new KPushButton(KStdGuiItem::cancel(), this);
QPushButton *m_ab = new KPushButton(KGuiItem(i18n("&Edit Addressbook"), "contents"), this);
- connect(m_ok, SIGNAL(clicked()), SLOT(accept()));
- connect(m_cancel, SIGNAL(clicked()), SLOT(reject()));
- connect(m_ab, SIGNAL(clicked()), SLOT(slotEditAb()));
+ connect(m_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
+ connect(m_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+ connect(m_ab, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditAb()));
m_ok->setDefault(true);
- QVBoxLayout *l0 = new QVBoxLayout(this, 10, 10);
+ QVBoxLayout *l0 = new TQVBoxLayout(this, 10, 10);
l0->addWidget( m_listlabel );
l0->addWidget( m_list );
- QHBoxLayout *l2 = new QHBoxLayout(0, 0, 10);
+ QHBoxLayout *l2 = new TQHBoxLayout(0, 0, 10);
l0->addLayout(l2, 0);
l2->addWidget(m_ab, 0);
l2->addStretch(1);
@@ -62,11 +62,11 @@ FaxAB::FaxAB(QWidget *parent, const char *name)
KConfig *conf = KGlobal::config();
conf->setGroup( "General" );
- QSize defsize( 400, 200 );
+ TQSize defsize( 400, 200 );
resize( conf->readSizeEntry( "ABSize", &defsize ) );
initialize();
- connect(KABC::StdAddressBook::self(), SIGNAL(addressBookChanged(AddressBook*)), SLOT(slotAbChanged(AddressBook*)));
+ connect(KABC::StdAddressBook::self(), TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT(slotAbChanged(AddressBook*)));
}
FaxAB::~FaxAB()
@@ -86,7 +86,7 @@ void FaxAB::initialize()
{
KABC::PhoneNumber::List numbers = (*it).phoneNumbers();
KABC::PhoneNumber::List faxNumbers;
- for (QValueList<KABC::PhoneNumber>::Iterator nit=numbers.begin(); nit!=numbers.end(); ++nit)
+ for (TQValueList<KABC::PhoneNumber>::Iterator nit=numbers.begin(); nit!=numbers.end(); ++nit)
{
if (((*nit).type() & KABC::PhoneNumber::Fax) && !(*nit).number().isEmpty())
faxNumbers << ( *nit );
@@ -102,7 +102,7 @@ void FaxAB::initialize()
entry.m_name = ( *it ).formattedName();
else
{
- QString key = ( *it ).familyName();
+ TQString key = ( *it ).familyName();
if ( !( *it ).givenName().isEmpty() )
{
if ( !key.isEmpty() )
@@ -119,9 +119,9 @@ void FaxAB::initialize()
if (m_entries.count() > 0)
{
- for (QMap<QString,FaxABEntry>::ConstIterator it=m_entries.begin(); it!=m_entries.end(); ++it)
+ for (TQMap<TQString,FaxABEntry>::ConstIterator it=m_entries.begin(); it!=m_entries.end(); ++it)
{
- QCheckListItem *item = new QCheckListItem( m_list, it.key(), QCheckListItem::CheckBox );
+ TQCheckListItem *item = new TQCheckListItem( m_list, it.key(), TQCheckListItem::CheckBox );
item->setText( 1, ( *it ).m_number.number() );
item->setText( 2, ( *it ).m_enterprise );
}
@@ -142,7 +142,7 @@ void FaxAB::slotAbChanged(AddressBook*)
initialize();
}
-bool FaxAB::getEntry(QStringList& number, QStringList& name, QStringList& enterprise, QWidget *parent)
+bool FaxAB::getEntry(TQStringList& number, TQStringList& name, TQStringList& enterprise, TQWidget *parent)
{
FaxAB kab(parent);
if (!kab.isValid())
@@ -152,7 +152,7 @@ bool FaxAB::getEntry(QStringList& number, QStringList& name, QStringList& enterp
}
if (kab.exec())
{
- QListViewItemIterator it( kab.m_list, QListViewItemIterator::Checked );
+ TQListViewItemIterator it( kab.m_list, TQListViewItemIterator::Checked );
while ( it.current() )
{
number << it.current()->text( 1 );
@@ -174,18 +174,18 @@ bool FaxAB::getEntry(QStringList& number, QStringList& name, QStringList& enterp
return false;
}
-bool FaxAB::getEntryByNumber(const QString& number, QString& name, QString& enterprise)
+bool FaxAB::getEntryByNumber(const TQString& number, TQString& name, TQString& enterprise)
{
KABC::AddressBook *bk = KABC::StdAddressBook::self();
for (KABC::AddressBook::Iterator it=bk->begin(); it!=bk->end(); ++it)
{
KABC::PhoneNumber::List numbers = (*it).phoneNumbers();
QStringList filteredNumbers;
- for (QValueList<KABC::PhoneNumber>::Iterator nit=numbers.begin(); nit!=numbers.end(); ++nit)
+ for (TQValueList<KABC::PhoneNumber>::Iterator nit=numbers.begin(); nit!=numbers.end(); ++nit)
{
if (((*nit).type() & KABC::PhoneNumber::Fax) )
{
- QString strippedNumber;
+ TQString strippedNumber;
for (uint i = 0; i < (*nit).number().length(); ++i)
if ((*nit).number()[i].isDigit() || ( *nit ).number()[ i ] == '+')
strippedNumber.append((*nit).number()[i]);
diff --git a/kdeprint/kdeprintfax/faxab.h b/kdeprint/kdeprintfax/faxab.h
index c72662055..03c5532fe 100644
--- a/kdeprint/kdeprintfax/faxab.h
+++ b/kdeprint/kdeprintfax/faxab.h
@@ -22,8 +22,8 @@
#define FAXAB_H
#include <kdialog.h>
-#include <qmap.h>
-#include <qstringlist.h>
+#include <tqmap.h>
+#include <tqstringlist.h>
#include <kabc/phonenumber.h>
class KListView;
@@ -34,12 +34,12 @@ class FaxAB : public KDialog
{
Q_OBJECT
public:
- FaxAB(QWidget *parent = 0, const char *name = 0);
+ FaxAB(TQWidget *parent = 0, const char *name = 0);
~FaxAB();
bool isValid();
- static bool getEntry(QStringList& number, QStringList& name, QStringList& enterprise, QWidget *parent = 0);
- static bool getEntryByNumber(const QString& number, QString& name, QString& enterprise);
+ static bool getEntry(TQStringList& number, TQStringList& name, TQStringList& enterprise, TQWidget *parent = 0);
+ static bool getEntryByNumber(const TQString& number, TQString& name, TQString& enterprise);
protected slots:
void slotEditAb();
@@ -51,14 +51,14 @@ protected:
private:
struct FaxABEntry
{
- QString m_name;
+ TQString m_name;
KABC::PhoneNumber m_number;
- QString m_enterprise;
+ TQString m_enterprise;
};
KListView* m_list;
- QMap<QString,FaxABEntry> m_entries;
- QPushButton* m_ok;
+ TQMap<TQString,FaxABEntry> m_entries;
+ TQPushButton* m_ok;
};
#endif
diff --git a/kdeprint/kdeprintfax/faxctrl.cpp b/kdeprint/kdeprintfax/faxctrl.cpp
index 4cb5f3bc7..bbd8fce59 100644
--- a/kdeprint/kdeprintfax/faxctrl.cpp
+++ b/kdeprint/kdeprintfax/faxctrl.cpp
@@ -23,17 +23,17 @@
#include "defcmds.h"
#include <ktextedit.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <kpushbutton.h>
-#include <qlayout.h>
-#include <qregexp.h>
+#include <tqlayout.h>
+#include <tqregexp.h>
#include <kprinter.h>
-#include <qsimplerichtext.h>
-#include <qpainter.h>
-#include <qpaintdevicemetrics.h>
-#include <qvaluestack.h>
-#include <qstylesheet.h>
+#include <tqsimplerichtext.h>
+#include <tqpainter.h>
+#include <tqpaintdevicemetrics.h>
+#include <tqvaluestack.h>
+#include <tqstylesheet.h>
#include <kprocess.h>
#include <kglobal.h>
@@ -57,51 +57,51 @@
/** \brief Return a string for the page size.
*
- * @param size the page size, which is actually of type @c QPrinter::PageSize
+ * @param size the page size, which is actually of type @c TQPrinter::PageSize
* @return a pointer to a static string for the name of the page size.
*/
char const* pageSizeText(int size)
{
switch(size)
{
- case QPrinter::A4: return "a4";
- case QPrinter::Legal: return "legal";
- case QPrinter::Letter: return "letter";
+ case TQPrinter::A4: return "a4";
+ case TQPrinter::Legal: return "legal";
+ case TQPrinter::Letter: return "letter";
default: return "letter";
}
}
/** \brief Return the default page size.
*/
-static QString pageSize()
+static TQString pageSize()
{
KConfig *conf = KGlobal::config();
conf->setGroup("Fax");
return conf->readEntry("Page", pageSizeText(KGlobal::locale()->pageSize()));
}
-static QString stripNumber( const QString& s )
+static TQString stripNumber( const TQString& s )
{
KConfig *conf = KGlobal::config();
conf->setGroup( "Personal" );
// removes any non-numeric character, except ('+','*','#') (hope it's supported by faxing tools)
- QString strip_s = s;
- strip_s.replace( QRegExp( "[^\\d+*#]" ), "" );
+ TQString strip_s = s;
+ strip_s.replace( TQRegExp( "[^\\d+*#]" ), "" );
if ( strip_s.find( '+' ) != -1 && conf->readBoolEntry( "ReplaceIntChar", false ) )
strip_s.replace( "+", conf->readEntry( "ReplaceIntCharVal" ) );
return strip_s;
}
-static QString tagList( int n, ... )
+static TQString tagList( int n, ... )
{
- QString t;
+ TQString t;
va_list ap;
va_start( ap, n );
for ( int i=0; i<n; i++ )
{
- QString tag = va_arg( ap, const char* );
+ TQString tag = va_arg( ap, const char* );
tag.append( "(_(\\w|\\{[^\\}]*\\}))?" );
if ( t.isEmpty() )
t = tag;
@@ -130,9 +130,9 @@ static QString tagList( int n, ... )
* @param value the Boolean value to control the processing
* @return the new value of the tag
*/
-static QString processTag( const QString& match, bool value)
+static TQString processTag( const TQString& match, bool value)
{
- QString v;
+ TQString v;
int p = match.find( '_' );
if ( p != -1 && match[ p+1 ] == '{' )
{
@@ -159,9 +159,9 @@ static QString processTag( const QString& match, bool value)
return v;
}
-static QString processTag( const QString& match, const QString& value )
+static TQString processTag( const TQString& match, const TQString& value )
{
- QString v;
+ TQString v;
int p = match.find( '_' );
if ( p != -1 )
{
@@ -183,25 +183,25 @@ static QString processTag( const QString& match, const QString& value )
return v;
}
-static bool isTag( const QString& m, const QString& t )
+static bool isTag( const TQString& m, const TQString& t )
{
return ( m == t || m.startsWith( t+"_" ) );
}
-static QString replaceTags( const QString& s, const QString& tags, KdeprintFax *fax = NULL, const KdeprintFax::FaxItem& item = KdeprintFax::FaxItem() )
+static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFax *fax = NULL, const KdeprintFax::FaxItem& item = KdeprintFax::FaxItem() )
{
// unquote variables (they will be replaced with quoted values later)
- QValueStack<bool> stack;
+ TQValueStack<bool> stack;
KConfig *conf = KGlobal::config();
- QString cmd = s;
+ TQString cmd = s;
bool issinglequote=false;
bool isdoublequote=false;
- QRegExp re_noquote("(\\$\\(|\\)|\\(|\"|'|\\\\|`|"+tags+")");
- QRegExp re_singlequote("('|"+tags+")");
- QRegExp re_doublequote("(\\$\\(|\"|\\\\|`|"+tags+")");
+ TQRegExp re_noquote("(\\$\\(|\\)|\\(|\"|'|\\\\|`|"+tags+")");
+ TQRegExp re_singlequote("('|"+tags+")");
+ TQRegExp re_doublequote("(\\$\\(|\"|\\\\|`|"+tags+")");
for ( int i = re_noquote.search(cmd);
i != -1;
i = (issinglequote?re_singlequote.search(cmd,i)
@@ -245,7 +245,7 @@ static QString replaceTags( const QString& s, const QString& tags, KdeprintFax *
{
// Replace all `...` with safer $(...)
cmd.replace (i, 1, "$(");
- QRegExp re_backticks("(`|\\\\`|\\\\\\\\|\\\\\\$)");
+ TQRegExp re_backticks("(`|\\\\`|\\\\\\\\|\\\\\\$)");
for ( int i2=re_backticks.search(cmd,i+2);
i2!=-1;
i2=re_backticks.search(cmd,i2)
@@ -266,7 +266,7 @@ static QString replaceTags( const QString& s, const QString& tags, KdeprintFax *
}
else
{
- QString match, v;
+ TQString match, v;
// get match
if (issinglequote)
@@ -291,7 +291,7 @@ static QString replaceTags( const QString& s, const QString& tags, KdeprintFax *
if (v.isEmpty())
v = getenv("FAXSERVER");
if (v.isEmpty())
- v = QString::fromLatin1("localhost");
+ v = TQString::fromLatin1("localhost");
v = processTag( match, v );
}
else if (isTag( match, "%page" ))
@@ -351,15 +351,15 @@ static QString replaceTags( const QString& s, const QString& tags, KdeprintFax *
return cmd;
}
-FaxCtrl::FaxCtrl(QWidget *parent, const char *name)
-: QObject(parent, name)
+FaxCtrl::FaxCtrl(TQWidget *parent, const char *name)
+: TQObject(parent, name)
{
m_process = new KProcess();
m_process->setUseShell(true);
- connect(m_process, SIGNAL(receivedStdout(KProcess*,char*,int)), SLOT(slotReceivedStdout(KProcess*,char*,int)));
- connect(m_process, SIGNAL(receivedStderr(KProcess*,char*,int)), SLOT(slotReceivedStdout(KProcess*,char*,int)));
- connect(m_process, SIGNAL(processExited(KProcess*)), SLOT(slotProcessExited(KProcess*)));
- connect(this, SIGNAL(faxSent(bool)), SLOT(cleanTempFiles()));
+ connect(m_process, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)));
+ connect(m_process, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)));
+ connect(m_process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*)));
+ connect(this, TQT_SIGNAL(faxSent(bool)), TQT_SLOT(cleanTempFiles()));
m_logview = 0;
}
@@ -378,7 +378,7 @@ bool FaxCtrl::send(KdeprintFax *f)
// replace tags common to all fax "operations"
m_command = replaceTags( m_command, tagList( 11, "%dev", "%server", "%page", "%res", "%user", "%from", "%email", "%comment", "%time", "%subject", "%cover" ), f );
- m_log = QString::null;
+ m_log = TQString::null;
m_filteredfiles.clear();
cleanTempFiles();
m_files = f->files();
@@ -394,7 +394,7 @@ void FaxCtrl::slotReceivedStdout(KProcess*, char *buffer, int len)
{
QCString str(buffer, len);
kdDebug() << "Received stdout: " << str << endl;
- addLog(QString(str));
+ addLog(TQString(str));
}
void FaxCtrl::slotProcessExited(KProcess*)
@@ -424,18 +424,18 @@ void FaxCtrl::slotProcessExited(KProcess*)
}
}
-QString FaxCtrl::faxCommand()
+TQString FaxCtrl::faxCommand()
{
KConfig *conf = KGlobal::config();
conf->setGroup("System");
QString sys = conf->readPathEntry("System", "efax");
- QString cmd;
+ TQString cmd;
if (sys == "hylafax")
cmd = conf->readPathEntry("HylaFax", hylafax_default_cmd);
else if (sys == "mgetty")
cmd = conf->readPathEntry("Mgetty", mgetty_default_cmd);
else if ( sys == "other" )
- cmd = conf->readPathEntry( "Other", QString::null );
+ cmd = conf->readPathEntry( "Other", TQString::null );
else
cmd = conf->readPathEntry("EFax", efax_default_cmd);
if (cmd.startsWith("%exe_"))
@@ -449,7 +449,7 @@ void FaxCtrl::sendFax()
{
// replace %files tag
QString filestr;
- for (QStringList::ConstIterator it=m_filteredfiles.begin(); it!=m_filteredfiles.end(); ++it)
+ for (TQStringList::ConstIterator it=m_filteredfiles.begin(); it!=m_filteredfiles.end(); ++it)
filestr += (quote(*it)+" ");
m_command.replace("%files", filestr);
}
@@ -461,7 +461,7 @@ void FaxCtrl::sendFax()
addLogTitle( i18n( "Sending fax to %1 (%2)" ).arg( item.number ).arg( item.name ) );
- QString cmd = replaceTags( m_command, tagList( 4, "%number", "%name", "%enterprise", "%rawnumber" ), NULL, item );
+ TQString cmd = replaceTags( m_command, tagList( 4, "%number", "%name", "%enterprise", "%rawnumber" ), NULL, item );
m_process->clearArguments();
*m_process << cmd;
addLog(i18n("Sending to fax using: %1").arg(cmd));
@@ -491,7 +491,7 @@ void FaxCtrl::filter()
m_tempfiles.append(tmp);
m_process->clearArguments();
*m_process << locate("data","kdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","kdeprintfax/faxfilters"))
- << QString::fromLatin1("--mime=%1").arg(mimeType)
+ << TQString::fromLatin1("--mime=%1").arg(mimeType)
<< "-p" << pageSize()
<< KProcess::quote(m_files[0]) << KProcess::quote(tmp);
if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput))
@@ -514,31 +514,31 @@ bool FaxCtrl::abort()
return false;
}
-void FaxCtrl::viewLog(QWidget *)
+void FaxCtrl::viewLog(TQWidget *)
{
if (!m_logview)
{
- QWidget *topView = new QWidget(0, "LogView", WType_TopLevel|WStyle_DialogBorder|WDestructiveClose);
+ QWidget *topView = new TQWidget(0, "LogView", WType_TopLevel|WStyle_DialogBorder|WDestructiveClose);
m_logview = new KTextEdit(topView);
m_logview->setTextFormat( Qt::LogText );
- m_logview->setWordWrap( QTextEdit::WidgetWidth );
+ m_logview->setWordWrap( TQTextEdit::WidgetWidth );
m_logview->setPaper( Qt::white );
//m_logview->setReadOnly(true);
- //m_logview->setWordWrap(QTextEdit::NoWrap);
+ //m_logview->setWordWrap(TQTextEdit::NoWrap);
QPushButton *m_clear = new KPushButton(KStdGuiItem::clear(), topView);
QPushButton *m_close = new KPushButton(KStdGuiItem::close(), topView);
- QPushButton *m_print = new KPushButton( KStdGuiItem::print(), topView );
- QPushButton *m_save = new KPushButton( KStdGuiItem::saveAs(), topView );
+ TQPushButton *m_print = new KPushButton( KStdGuiItem::print(), topView );
+ TQPushButton *m_save = new KPushButton( KStdGuiItem::saveAs(), topView );
m_close->setDefault(true);
- connect(m_clear, SIGNAL(clicked()), SLOT(slotClearLog()));
- connect(m_close, SIGNAL(clicked()), SLOT(slotCloseLog()));
- connect(m_logview, SIGNAL(destroyed()), SLOT(slotCloseLog()));
- connect( m_print, SIGNAL( clicked() ), SLOT( slotPrintLog() ) );
- connect( m_save, SIGNAL( clicked() ), SLOT( slotSaveLog() ) );
+ connect(m_clear, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearLog()));
+ connect(m_close, TQT_SIGNAL(clicked()), TQT_SLOT(slotCloseLog()));
+ connect(m_logview, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCloseLog()));
+ connect( m_print, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPrintLog() ) );
+ connect( m_save, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSaveLog() ) );
- QVBoxLayout *l0 = new QVBoxLayout(topView, 10, 10);
+ QVBoxLayout *l0 = new TQVBoxLayout(topView, 10, 10);
l0->addWidget(m_logview);
- QHBoxLayout *l1 = new QHBoxLayout(0, 0, 10);
+ QHBoxLayout *l1 = new TQHBoxLayout(0, 0, 10);
l0->addLayout(l1);
l1->addStretch(1);
l1->addWidget( m_save );
@@ -557,16 +557,16 @@ void FaxCtrl::viewLog(QWidget *)
}
}
-void FaxCtrl::addLogTitle( const QString& s )
+void FaxCtrl::addLogTitle( const TQString& s )
{
- QString t( s );
+ TQString t( s );
t.prepend( '\n' ).append( '\n' );
addLog( t, true );
}
-void FaxCtrl::addLog(const QString& s, bool isTitle)
+void FaxCtrl::addLog(const TQString& s, bool isTitle)
{
- QString t = QStyleSheet::escape(s);
+ TQString t = TQStyleSheet::escape(s);
if ( isTitle )
t.prepend( "<font color=red><b>" ).append( "</b></font>" );
m_log.append( t + '\n' );
@@ -574,7 +574,7 @@ void FaxCtrl::addLog(const QString& s, bool isTitle)
m_logview->append(t);
}
-QString FaxCtrl::faxSystem()
+TQString FaxCtrl::faxSystem()
{
KConfig *conf = KGlobal::config();
conf->setGroup("System");
@@ -585,14 +585,14 @@ QString FaxCtrl::faxSystem()
void FaxCtrl::cleanTempFiles()
{
- for (QStringList::ConstIterator it=m_tempfiles.begin(); it!=m_tempfiles.end(); ++it)
- QFile::remove(*it);
+ for (TQStringList::ConstIterator it=m_tempfiles.begin(); it!=m_tempfiles.end(); ++it)
+ TQFile::remove(*it);
m_tempfiles.clear();
}
void FaxCtrl::slotClearLog()
{
- m_log = QString::null;
+ m_log = TQString::null;
if (m_logview)
m_logview->clear();
}
@@ -604,7 +604,7 @@ void FaxCtrl::slotCloseLog()
{
QTextEdit *view = m_logview;
m_logview = 0;
- if (obj && obj->inherits("QPushButton"))
+ if (obj && obj->inherits("TQPushButton"))
delete view->parentWidget();
kdDebug() << "slotClose()" << endl;
}
@@ -619,17 +619,17 @@ void FaxCtrl::slotPrintLog()
printer.setDocFileName( "faxlog" );
if ( printer.setup( m_logview->topLevelWidget(), i18n( "Fax Log" ) ) )
{
- QPainter painter( &printer );
- QPaintDeviceMetrics metric( &printer );
- QRect body( 0, 0, metric.width(), metric.height() ), view( body );
- //QString txt = m_logview->text();
- QString txt = m_log;
+ TQPainter painter( &printer );
+ TQPaintDeviceMetrics metric( &printer );
+ TQRect body( 0, 0, metric.width(), metric.height() ), view( body );
+ //TQString txt = m_logview->text();
+ TQString txt = m_log;
txt.replace( '\n', "<br>" );
txt.prepend( "<h2>" + i18n( "KDEPrint Fax Tool Log" ) + "</h2>" );
kdDebug() << "Log: " << txt << endl;
- QSimpleRichText richText( txt, m_logview->font() );
+ TQSimpleRichText richText( txt, m_logview->font() );
richText.setWidth( &painter, body.width() );
do
@@ -649,13 +649,13 @@ void FaxCtrl::slotSaveLog()
{
if ( m_logview )
{
- QString filename = KFileDialog::getSaveFileName( QString::null, QString::null, m_logview );
+ TQString filename = KFileDialog::getSaveFileName( TQString::null, TQString::null, m_logview );
if ( !filename.isEmpty() )
{
- QFile f( filename );
+ TQFile f( filename );
if ( f.open( IO_WriteOnly ) )
{
- QTextStream t( &f );
+ TQTextStream t( &f );
t << i18n( "KDEPrint Fax Tool Log" ) << endl;
t << m_logview->text() << endl;
f.close();
diff --git a/kdeprint/kdeprintfax/faxctrl.h b/kdeprint/kdeprintfax/faxctrl.h
index d3d8086a9..0b8ed1de0 100644
--- a/kdeprint/kdeprintfax/faxctrl.h
+++ b/kdeprint/kdeprintfax/faxctrl.h
@@ -21,9 +21,9 @@
#ifndef FAXCTRL_H
#define FAXCTRL_H
-#include <qobject.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include "kdeprintfax.h"
@@ -34,17 +34,17 @@ class FaxCtrl : public QObject
{
Q_OBJECT
public:
- FaxCtrl(QWidget *parent = 0, const char *name = 0);
+ FaxCtrl(TQWidget *parent = 0, const char *name = 0);
~FaxCtrl();
bool send(KdeprintFax *f);
bool abort();
- void viewLog(QWidget *parent = 0);
- QString faxSystem();
- QString faxCommand();
+ void viewLog(TQWidget *parent = 0);
+ TQString faxSystem();
+ TQString faxCommand();
signals:
- void message(const QString&);
+ void message(const TQString&);
void faxSent(bool);
protected slots:
@@ -59,8 +59,8 @@ protected slots:
protected:
void filter();
void sendFax();
- void addLog(const QString&, bool = false);
- void addLogTitle( const QString& );
+ void addLog(const TQString&, bool = false);
+ void addLogTitle( const TQString& );
private:
KProcess *m_process;
diff --git a/kdeprint/kdeprintfax/filterdlg.cpp b/kdeprint/kdeprintfax/filterdlg.cpp
index 563c37a7d..ea9a88ce9 100644
--- a/kdeprint/kdeprintfax/filterdlg.cpp
+++ b/kdeprint/kdeprintfax/filterdlg.cpp
@@ -21,23 +21,23 @@
#include "filterdlg.h"
#include "filterdlg.moc"
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
#include <klocale.h>
-FilterDlg::FilterDlg(QWidget *parent, const char *name)
+FilterDlg::FilterDlg(TQWidget *parent, const char *name)
: KDialogBase(parent, name, true, i18n("Filter Parameters"), Ok|Cancel, Ok)
{
- QWidget *w = new QWidget(this);
+ QWidget *w = new TQWidget(this);
- m_mime = new QLineEdit(w);
- m_cmd = new QLineEdit(w);
- QLabel *m_mimelabel = new QLabel(i18n("MIME type:"), w);
- QLabel *m_cmdlabel = new QLabel(i18n("Command:"), w);
+ m_mime = new TQLineEdit(w);
+ m_cmd = new TQLineEdit(w);
+ QLabel *m_mimelabel = new TQLabel(i18n("MIME type:"), w);
+ QLabel *m_cmdlabel = new TQLabel(i18n("Command:"), w);
- QGridLayout *l0 = new QGridLayout(w, 2, 2, 10, 5);
+ QGridLayout *l0 = new TQGridLayout(w, 2, 2, 10, 5);
l0->setColStretch(1, 1);
l0->addWidget(m_mimelabel, 0, 0);
l0->addWidget(m_cmdlabel, 1, 0);
@@ -47,8 +47,8 @@ FilterDlg::FilterDlg(QWidget *parent, const char *name)
setMainWidget(w);
m_mime->setFocus();
resize(300, 100);
- connect(m_mime, SIGNAL(textChanged ( const QString & )),this, SLOT(slotTextFilterChanged()));
- connect(m_cmd, SIGNAL(textChanged ( const QString & )),this, SLOT(slotTextFilterChanged()));
+ connect(m_mime, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(slotTextFilterChanged()));
+ connect(m_cmd, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(slotTextFilterChanged()));
slotTextFilterChanged();
}
@@ -57,7 +57,7 @@ void FilterDlg::slotTextFilterChanged( )
enableButtonOK(!m_mime->text().isEmpty() && !m_cmd->text().isEmpty());
}
-bool FilterDlg::doIt(QWidget *parent, QString *mime, QString *cmd)
+bool FilterDlg::doIt(TQWidget *parent, TQString *mime, TQString *cmd)
{
FilterDlg dlg(parent);
if (mime) dlg.m_mime->setText(*mime);
diff --git a/kdeprint/kdeprintfax/filterdlg.h b/kdeprint/kdeprintfax/filterdlg.h
index f1010a2c6..e080393ae 100644
--- a/kdeprint/kdeprintfax/filterdlg.h
+++ b/kdeprint/kdeprintfax/filterdlg.h
@@ -29,9 +29,9 @@ class FilterDlg : public KDialogBase
{
Q_OBJECT
public:
- FilterDlg(QWidget *parent = 0, const char *name = 0);
+ FilterDlg(TQWidget *parent = 0, const char *name = 0);
- static bool doIt(QWidget *parent = 0, QString* mime = 0, QString *cmd = 0);
+ static bool doIt(TQWidget *parent = 0, TQString* mime = 0, TQString *cmd = 0);
protected slots:
void slotTextFilterChanged();
private:
diff --git a/kdeprint/kdeprintfax/kdeprintfax.cpp b/kdeprint/kdeprintfax/kdeprintfax.cpp
index e10416bef..a5f66992b 100644
--- a/kdeprint/kdeprintfax/kdeprintfax.cpp
+++ b/kdeprint/kdeprintfax/kdeprintfax.cpp
@@ -23,15 +23,15 @@
#include "faxctrl.h"
#include "configdlg.h"
-#include <qcheckbox.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qtextedit.h>
-#include <qdatetimeedit.h>
-#include <qcombobox.h>
-#include <qtooltip.h>
+#include <tqcheckbox.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqtextedit.h>
+#include <tqdatetimeedit.h>
+#include <tqcombobox.h>
+#include <tqtooltip.h>
#include <kapplication.h>
#include <kstdaction.h>
@@ -40,7 +40,7 @@
#include <kaction.h>
#include <klistbox.h>
#include <klistview.h>
-#include <qheader.h>
+#include <tqheader.h>
#include <klocale.h>
#include <kiconloader.h>
#include <kio/netaccess.h>
@@ -57,29 +57,29 @@
#include <kurldrag.h>
#include <kdebug.h>
-KdeprintFax::KdeprintFax(QWidget *parent, const char *name)
+KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
: KMainWindow(parent, name)
{
m_faxctrl = new FaxCtrl(this);
m_quitAfterSend = false;
- connect(m_faxctrl, SIGNAL(message(const QString&)), SLOT(slotMessage(const QString&)));
- connect(m_faxctrl, SIGNAL(faxSent(bool)), SLOT(slotFaxSent(bool)));
+ connect(m_faxctrl, TQT_SIGNAL(message(const TQString&)), TQT_SLOT(slotMessage(const TQString&)));
+ connect(m_faxctrl, TQT_SIGNAL(faxSent(bool)), TQT_SLOT(slotFaxSent(bool)));
- QWidget *mainw = new QWidget(this);
+ QWidget *mainw = new TQWidget(this);
setCentralWidget(mainw);
m_files = new KListBox(mainw);
- connect( m_files, SIGNAL( currentChanged( QListBoxItem* ) ), SLOT( slotCurrentChanged() ) );
+ connect( m_files, TQT_SIGNAL( currentChanged( TQListBoxItem* ) ), TQT_SLOT( slotCurrentChanged() ) );
m_upbtn = new KPushButton( mainw );
m_upbtn->setIconSet( SmallIconSet( "up" ) );
- QToolTip::add( m_upbtn, i18n( "Move up" ) );
- connect( m_upbtn, SIGNAL( clicked() ), SLOT( slotMoveUp() ) );
+ TQToolTip::add( m_upbtn, i18n( "Move up" ) );
+ connect( m_upbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveUp() ) );
m_upbtn->setEnabled( false );
m_downbtn = new KPushButton( mainw );
m_downbtn->setIconSet( SmallIconSet( "down" ) );
- QToolTip::add( m_downbtn, i18n( "Move down" ) );
- connect( m_downbtn, SIGNAL( clicked() ), SLOT( slotMoveDown() ) );
+ TQToolTip::add( m_downbtn, i18n( "Move down" ) );
+ connect( m_downbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveDown() ) );
m_downbtn->setEnabled( false );
- QLabel *m_filelabel = new QLabel(i18n("F&iles:"), mainw);
+ QLabel *m_filelabel = new TQLabel(i18n("F&iles:"), mainw);
m_filelabel->setBuddy(m_files);
KSeparator*m_line = new KSeparator( KSeparator::HLine, mainw);
KSeparator *m_line2 = new KSeparator( KSeparator::HLine, mainw );
@@ -88,54 +88,54 @@ KdeprintFax::KdeprintFax(QWidget *parent, const char *name)
m_numbers->addColumn( i18n("Name") );
m_numbers->addColumn( i18n("Enterprise") );
m_numbers->header()->setStretchEnabled( true );
- m_numbers->setSelectionMode( QListView::Extended );
- connect( m_numbers, SIGNAL( selectionChanged() ), SLOT( slotFaxSelectionChanged() ) );
- connect( m_numbers, SIGNAL( executed( QListViewItem* ) ), SLOT( slotFaxExecuted( QListViewItem* ) ) );
+ m_numbers->setSelectionMode( TQListView::Extended );
+ connect( m_numbers, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotFaxSelectionChanged() ) );
+ connect( m_numbers, TQT_SIGNAL( executed( TQListViewItem* ) ), TQT_SLOT( slotFaxExecuted( TQListViewItem* ) ) );
m_newbtn = new KPushButton( mainw );
m_newbtn->setPixmap( SmallIcon( "edit" ) );
- QToolTip::add( m_newbtn, i18n( "Add fax number" ) );
- connect( m_newbtn, SIGNAL( clicked() ), SLOT( slotFaxAdd() ) );
+ TQToolTip::add( m_newbtn, i18n( "Add fax number" ) );
+ connect( m_newbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxAdd() ) );
m_abbtn = new KPushButton( mainw );
m_abbtn->setPixmap( SmallIcon( "kaddressbook" ) );
- QToolTip::add( m_abbtn, i18n( "Add fax number from addressbook" ) );
- connect( m_abbtn, SIGNAL( clicked() ), SLOT( slotKab() ) );
+ TQToolTip::add( m_abbtn, i18n( "Add fax number from addressbook" ) );
+ connect( m_abbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotKab() ) );
m_delbtn = new KPushButton( mainw );
m_delbtn->setIconSet( SmallIconSet( "edittrash" ) );
- QToolTip::add( m_delbtn, i18n( "Remove fax number" ) );
+ TQToolTip::add( m_delbtn, i18n( "Remove fax number" ) );
m_delbtn->setEnabled( false );
- connect( m_delbtn, SIGNAL( clicked() ), SLOT( slotFaxRemove() ) );
- QLabel *m_commentlabel = new QLabel(i18n("&Comment:"), mainw);
+ connect( m_delbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxRemove() ) );
+ QLabel *m_commentlabel = new TQLabel(i18n("&Comment:"), mainw);
KSystemTray *m_tray = new KSystemTray(this);
m_tray->setPixmap(SmallIcon("kdeprintfax"));
m_tray->show();
- m_comment = new QTextEdit(mainw);
+ m_comment = new TQTextEdit(mainw);
// I don't understand why anyone would want to turn off word wrap. It makes
// the text hard to read and write. It provides no benefit. Therefore,
// I commented out the next line. [Ray Lischner]
-// m_comment->setWordWrap(QTextEdit::NoWrap);
+// m_comment->setWordWrap(TQTextEdit::NoWrap);
m_comment->setLineWidth(1);
m_commentlabel->setBuddy(m_comment);
- QLabel *m_timelabel = new QLabel(i18n("Sched&ule:"), mainw);
- m_timecombo = new QComboBox(mainw);
+ QLabel *m_timelabel = new TQLabel(i18n("Sched&ule:"), mainw);
+ m_timecombo = new TQComboBox(mainw);
m_timecombo->insertItem(i18n("Now"));
m_timecombo->insertItem(i18n("At Specified Time"));
m_timecombo->setCurrentItem(0);
m_timelabel->setBuddy(m_timecombo);
m_time = new QTimeEdit(mainw);
- m_time->setTime(QTime::currentTime());
+ m_time->setTime(TQTime::currentTime());
m_time->setEnabled(false);
- connect(m_timecombo, SIGNAL(activated(int)), SLOT(slotTimeComboActivated(int)));
- m_cover = new QCheckBox(i18n("Send Co&ver Sheet"), mainw);
- connect(m_cover, SIGNAL(toggled(bool)), SLOT(slotCoverToggled(bool)));
- m_subject = new QLineEdit( mainw );
- QLabel *m_subjectlabel = new QLabel( i18n( "Su&bject:" ), mainw );
+ connect(m_timecombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTimeComboActivated(int)));
+ m_cover = new TQCheckBox(i18n("Send Co&ver Sheet"), mainw);
+ connect(m_cover, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCoverToggled(bool)));
+ m_subject = new TQLineEdit( mainw );
+ TQLabel *m_subjectlabel = new TQLabel( i18n( "Su&bject:" ), mainw );
m_subjectlabel->setBuddy( m_subject );
- QGridLayout *l0 = new QGridLayout(mainw, 10, 2, 10, 5);
+ QGridLayout *l0 = new TQGridLayout(mainw, 10, 2, 10, 5);
l0->setColStretch(1,1);
l0->addWidget(m_filelabel, 0, 0, Qt::AlignLeft|Qt::AlignTop);
- QHBoxLayout *l2 = new QHBoxLayout( 0, 0, 10 );
- QVBoxLayout *l3 = new QVBoxLayout( 0, 0, 5 );
+ TQHBoxLayout *l2 = new TQHBoxLayout( 0, 0, 10 );
+ TQVBoxLayout *l3 = new TQVBoxLayout( 0, 0, 5 );
l0->addLayout( l2, 0, 1 );
l2->addWidget( m_files );
l2->addLayout( l3 );
@@ -145,8 +145,8 @@ KdeprintFax::KdeprintFax(QWidget *parent, const char *name)
l3->addStretch( 1 );
l0->addMultiCellWidget(m_line, 1, 1, 0, 1);
l0->addRowSpacing(1, 10);
- QHBoxLayout *l5 = new QHBoxLayout( 0, 0, 10 );
- QVBoxLayout *l6 = new QVBoxLayout( 0, 0, 5 );
+ TQHBoxLayout *l5 = new TQHBoxLayout( 0, 0, 10 );
+ TQVBoxLayout *l6 = new TQVBoxLayout( 0, 0, 5 );
l0->addMultiCellLayout( l5, 2, 4, 0, 1 );
l5->addWidget( m_numbers );
l5->addLayout( l6 );
@@ -162,7 +162,7 @@ KdeprintFax::KdeprintFax(QWidget *parent, const char *name)
l0->addWidget(m_commentlabel, 8, 0, Qt::AlignTop|Qt::AlignLeft);
l0->addWidget(m_comment, 8, 1);
l0->addWidget(m_timelabel, 9, 0);
- QHBoxLayout *l1 = new QHBoxLayout(0, 0, 5);
+ QHBoxLayout *l1 = new TQHBoxLayout(0, 0, 5);
l0->addLayout(l1, 9, 1);
l1->addWidget(m_timecombo, 1);
l1->addWidget(m_time, 0);
@@ -188,23 +188,23 @@ KdeprintFax::~KdeprintFax()
void KdeprintFax::initActions()
{
- new KAction(i18n("&Add File..."), "filenew", Qt::Key_Insert, this, SLOT(slotAdd()), actionCollection(), "file_add");
- new KAction(i18n("&Remove File"), "remove", Qt::Key_Delete, this, SLOT(slotRemove()), actionCollection(), "file_remove");
- new KAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, this, SLOT(slotFax()), actionCollection(), "fax_send");
- new KAction(i18n("A&bort"), "stop", Qt::Key_Escape, this, SLOT(slotAbort()), actionCollection(), "fax_stop");
- new KAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, this, SLOT(slotKab()), actionCollection(), "fax_ab");
- new KAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, this, SLOT(slotViewLog()), actionCollection(), "fax_log");
- new KAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, this, SLOT(slotView()), actionCollection(), "file_view");
- new KAction( i18n( "&New Fax Recipient..." ), "edit", Qt::CTRL+Qt::Key_N, this, SLOT( slotFaxAdd() ), actionCollection(), "fax_add" );
+ new KAction(i18n("&Add File..."), "filenew", Qt::Key_Insert, this, TQT_SLOT(slotAdd()), actionCollection(), "file_add");
+ new KAction(i18n("&Remove File"), "remove", Qt::Key_Delete, this, TQT_SLOT(slotRemove()), actionCollection(), "file_remove");
+ new KAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, this, TQT_SLOT(slotFax()), actionCollection(), "fax_send");
+ new KAction(i18n("A&bort"), "stop", Qt::Key_Escape, this, TQT_SLOT(slotAbort()), actionCollection(), "fax_stop");
+ new KAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, this, TQT_SLOT(slotKab()), actionCollection(), "fax_ab");
+ new KAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, this, TQT_SLOT(slotViewLog()), actionCollection(), "fax_log");
+ new KAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, this, TQT_SLOT(slotView()), actionCollection(), "file_view");
+ new KAction( i18n( "&New Fax Recipient..." ), "edit", Qt::CTRL+Qt::Key_N, this, TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" );
- KStdAction::quit(this, SLOT(slotQuit()), actionCollection());
+ KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection());
setStandardToolBarMenuEnabled(true);
- KStdAction::showMenubar(this, SLOT(slotToggleMenuBar()), actionCollection());
- KStdAction::preferences(this, SLOT(slotConfigure()), actionCollection());
- KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()),
+ KStdAction::showMenubar(this, TQT_SLOT(slotToggleMenuBar()), actionCollection());
+ KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection());
+ KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
actionCollection()->action("fax_stop")->setEnabled(false);
- connect(actionCollection()->action("file_remove"), SIGNAL(enabled(bool)), actionCollection()->action("file_view"), SLOT(setEnabled(bool)));
+ connect(actionCollection()->action("file_remove"), TQT_SIGNAL(enabled(bool)), actionCollection()->action("file_view"), TQT_SLOT(setEnabled(bool)));
actionCollection()->action("file_remove")->setEnabled(false);
createGUI();
@@ -218,7 +218,7 @@ void KdeprintFax::slotToggleMenuBar()
void KdeprintFax::slotAdd()
{
- KURL url = KFileDialog::getOpenURL(QString::null, QString::null, this);
+ KURL url = KFileDialog::getOpenURL(TQString::null, TQString::null, this);
if (!url.isEmpty())
addURL(url);
}
@@ -267,7 +267,7 @@ void KdeprintFax::slotKab()
if (FaxAB::getEntry(number, name, enterprise, this))
{
for ( unsigned int i = 0; i<number.count(); i++ )
- new QListViewItem( m_numbers, number[ i ], name[ i ], enterprise[ i ] );
+ new TQListViewItem( m_numbers, number[ i ], name[ i ], enterprise[ i ] );
}
}
@@ -284,11 +284,11 @@ void KdeprintFax::addURL(KURL url)
KMessageBox::error(this, i18n("Unable to retrieve %1.").arg(url.prettyURL()));
}
-void KdeprintFax::setPhone(QString phone)
+void KdeprintFax::setPhone(TQString phone)
{
- QString name, enterprise;
+ TQString name, enterprise;
FaxAB::getEntryByNumber(phone, name, enterprise);
- new QListViewItem( m_numbers, phone, name, enterprise );
+ new TQListViewItem( m_numbers, phone, name, enterprise );
}
void KdeprintFax::sendFax( bool quitAfterSend )
@@ -297,12 +297,12 @@ void KdeprintFax::sendFax( bool quitAfterSend )
m_quitAfterSend = quitAfterSend;
}
-void KdeprintFax::dragEnterEvent(QDragEnterEvent *e)
+void KdeprintFax::dragEnterEvent(TQDragEnterEvent *e)
{
e->accept(KURLDrag::canDecode(e));
}
-void KdeprintFax::dropEvent(QDropEvent *e)
+void KdeprintFax::dropEvent(TQDropEvent *e)
{
KURL::List l;
if (KURLDrag::decode(e, l))
@@ -312,7 +312,7 @@ void KdeprintFax::dropEvent(QDropEvent *e)
}
}
-QStringList KdeprintFax::files()
+TQStringList KdeprintFax::files()
{
QStringList l;
for (uint i=0; i<m_files->count(); i++)
@@ -327,9 +327,9 @@ int KdeprintFax::faxCount() const
}
/*
-QListViewItem* KdeprintFax::faxItem( int i ) const
+TQListViewItem* KdeprintFax::faxItem( int i ) const
{
- QListViewItem *item = m_numbers->firstChild();
+ TQListViewItem *item = m_numbers->firstChild();
while ( i && item && item->nextSibling() )
{
item = item->nextSibling();
@@ -340,29 +340,29 @@ QListViewItem* KdeprintFax::faxItem( int i ) const
return item;
}
-QString KdeprintFax::number( int i ) const
+TQString KdeprintFax::number( int i ) const
{
- QListViewItem *item = faxItem( i );
- return ( item ? item->text( 0 ) : QString::null );
+ TQListViewItem *item = faxItem( i );
+ return ( item ? item->text( 0 ) : TQString::null );
}
-QString KdeprintFax::name( int i ) const
+TQString KdeprintFax::name( int i ) const
{
- QListViewItem *item = faxItem( i );
- return ( item ? item->text( 1 ) : QString::null );
+ TQListViewItem *item = faxItem( i );
+ return ( item ? item->text( 1 ) : TQString::null );
}
-QString KdeprintFax::enterprise( int i ) const
+TQString KdeprintFax::enterprise( int i ) const
{
- QListViewItem *item = faxItem( i );
- return ( item ? item->text( 2 ) : QString::null );
+ TQListViewItem *item = faxItem( i );
+ return ( item ? item->text( 2 ) : TQString::null );
}
*/
KdeprintFax::FaxItemList KdeprintFax::faxList() const
{
FaxItemList list;
- QListViewItemIterator it( m_numbers );
+ TQListViewItemIterator it( m_numbers );
while ( it.current() )
{
FaxItem item;
@@ -375,7 +375,7 @@ KdeprintFax::FaxItemList KdeprintFax::faxList() const
return list;
}
-QString KdeprintFax::comment() const
+TQString KdeprintFax::comment() const
{
return m_comment->text();
}
@@ -385,12 +385,12 @@ bool KdeprintFax::cover() const
return m_cover->isChecked();
}
-QString KdeprintFax::subject() const
+TQString KdeprintFax::subject() const
{
return m_subject->text();
}
-void KdeprintFax::slotMessage(const QString& msg)
+void KdeprintFax::slotMessage(const TQString& msg)
{
m_msglabel->setText(msg);
}
@@ -407,7 +407,7 @@ void KdeprintFax::slotFaxSent(bool status)
else {
if (!status)
KMessageBox::error(this, i18n("Fax error: see log message for more information."));
- slotMessage(QString::null);
+ slotMessage(TQString::null);
}
}
@@ -429,7 +429,7 @@ void KdeprintFax::updateState()
if ( !m_cover->isEnabled() )
m_cover->setChecked(false);
m_comment->setEnabled(cmd.find("%comment") != -1 && m_cover->isChecked());
- //m_comment->setPaper(m_comment->isEnabled() ? colorGroup().brush(QColorGroup::Base) : colorGroup().brush(QColorGroup::Background));
+ //m_comment->setPaper(m_comment->isEnabled() ? colorGroup().brush(TQColorGroup::Base) : colorGroup().brush(TQColorGroup::Background));
if (!m_comment->isEnabled())
{
m_comment->setText("");
@@ -465,10 +465,10 @@ void KdeprintFax::slotTimeComboActivated(int ID)
m_time->setEnabled(ID == 1);
}
-QString KdeprintFax::time() const
+TQString KdeprintFax::time() const
{
if (!m_time->isEnabled())
- return QString::null;
+ return TQString::null;
return m_time->time().toString("hh:mm");
}
@@ -477,7 +477,7 @@ void KdeprintFax::slotMoveUp()
int index = m_files->currentItem();
if ( index > 0 )
{
- QListBoxItem *item = m_files->item( index );
+ TQListBoxItem *item = m_files->item( index );
m_files->takeItem( item );
m_files->insertItem( item, index-1 );
m_files->setCurrentItem( index-1 );
@@ -489,7 +489,7 @@ void KdeprintFax::slotMoveDown()
int index = m_files->currentItem();
if ( index >= 0 && index < ( int )m_files->count()-1 )
{
- QListBoxItem *item = m_files->item( index );
+ TQListBoxItem *item = m_files->item( index );
m_files->takeItem( item );
m_files->insertItem( item, index+1 );
m_files->setCurrentItem( index+1 );
@@ -514,14 +514,14 @@ void KdeprintFax::slotCurrentChanged()
void KdeprintFax::slotFaxSelectionChanged()
{
- QListViewItemIterator it( m_numbers, QListViewItemIterator::Selected );
+ TQListViewItemIterator it( m_numbers, TQListViewItemIterator::Selected );
m_delbtn->setEnabled( it.current() != NULL );
}
void KdeprintFax::slotFaxRemove()
{
- QListViewItemIterator it( m_numbers, QListViewItemIterator::Selected );
- QPtrList<QListViewItem> items;
+ TQListViewItemIterator it( m_numbers, TQListViewItemIterator::Selected );
+ TQPtrList<TQListViewItem> items;
items.setAutoDelete( true );
while ( it.current() )
{
@@ -535,18 +535,18 @@ void KdeprintFax::slotFaxRemove()
void KdeprintFax::slotFaxAdd()
{
- QString number, name, enterprise;
+ TQString number, name, enterprise;
if ( manualFaxDialog( number, name, enterprise ) )
{
- new QListViewItem( m_numbers, number, name, enterprise );
+ new TQListViewItem( m_numbers, number, name, enterprise );
}
}
-void KdeprintFax::slotFaxExecuted( QListViewItem *item )
+void KdeprintFax::slotFaxExecuted( TQListViewItem *item )
{
if ( item )
{
- QString number = item->text( 0 ), name = item->text( 1 ), enterprise = item->text( 2 );
+ TQString number = item->text( 0 ), name = item->text( 1 ), enterprise = item->text( 2 );
if ( manualFaxDialog( number, name, enterprise ) )
{
item->setText( 0, number );
@@ -556,22 +556,22 @@ void KdeprintFax::slotFaxExecuted( QListViewItem *item )
}
}
-bool KdeprintFax::manualFaxDialog( QString& number, QString& name, QString& enterprise )
+bool KdeprintFax::manualFaxDialog( TQString& number, TQString& name, TQString& enterprise )
{
/* dialog construction */
KDialogBase dlg( this, "manualFaxDialog", true, i18n( "Fax Number" ), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );
- QWidget *mainw = new QWidget( &dlg );
- QLabel *lab0 = new QLabel( i18n( "Enter recipient fax properties." ), mainw );
- QLabel *lab1 = new QLabel( i18n( "&Number:" ), mainw );
- QLabel *lab2 = new QLabel( i18n( "N&ame:" ), mainw );
- QLabel *lab3 = new QLabel( i18n( "&Enterprise:" ), mainw );
- QLineEdit *edit_number = new QLineEdit( number, mainw );
- QLineEdit *edit_name = new QLineEdit( name, mainw );
- QLineEdit *edit_enterprise = new QLineEdit( enterprise, mainw );
+ TQWidget *mainw = new TQWidget( &dlg );
+ TQLabel *lab0 = new TQLabel( i18n( "Enter recipient fax properties." ), mainw );
+ TQLabel *lab1 = new TQLabel( i18n( "&Number:" ), mainw );
+ TQLabel *lab2 = new TQLabel( i18n( "N&ame:" ), mainw );
+ TQLabel *lab3 = new TQLabel( i18n( "&Enterprise:" ), mainw );
+ TQLineEdit *edit_number = new TQLineEdit( number, mainw );
+ TQLineEdit *edit_name = new TQLineEdit( name, mainw );
+ TQLineEdit *edit_enterprise = new TQLineEdit( enterprise, mainw );
lab1->setBuddy( edit_number );
lab2->setBuddy( edit_name );
lab3->setBuddy( edit_enterprise );
- QGridLayout *l0 = new QGridLayout( mainw, 5, 2, 0, 5 );
+ TQGridLayout *l0 = new TQGridLayout( mainw, 5, 2, 0, 5 );
l0->setColStretch( 1, 1 );
l0->addMultiCellWidget( lab0, 0, 0, 0, 1 );
l0->setRowSpacing( 1, 10 );
diff --git a/kdeprint/kdeprintfax/kdeprintfax.h b/kdeprint/kdeprintfax/kdeprintfax.h
index 795521e82..95f64d443 100644
--- a/kdeprint/kdeprintfax/kdeprintfax.h
+++ b/kdeprint/kdeprintfax/kdeprintfax.h
@@ -42,28 +42,28 @@ class KdeprintFax : public KMainWindow
public:
struct FaxItem
{
- QString number;
- QString name;
- QString enterprise;
+ TQString number;
+ TQString name;
+ TQString enterprise;
};
- typedef QValueList<FaxItem> FaxItemList;
- typedef QValueList<FaxItem>::ConstIterator FaxItemListIterator;
+ typedef TQValueList<FaxItem> FaxItemList;
+ typedef TQValueList<FaxItem>::ConstIterator FaxItemListIterator;
- KdeprintFax(QWidget *parent = 0, const char *name = 0);
+ KdeprintFax(TQWidget *parent = 0, const char *name = 0);
~KdeprintFax();
void addURL(KURL url);
- void setPhone(QString phone);
+ void setPhone(TQString phone);
void sendFax( bool quitAfterSend );
- QStringList files();
+ TQStringList files();
int faxCount() const;
- //QString number( int i = 0 ) const;
- //QString name( int i = 0 ) const;
- //QString enterprise( int i = 0 ) const;
+ //TQString number( int i = 0 ) const;
+ //TQString name( int i = 0 ) const;
+ //TQString enterprise( int i = 0 ) const;
FaxItemList faxList() const;
- QString comment() const;
- QString time() const;
- QString subject() const;
+ TQString comment() const;
+ TQString time() const;
+ TQString subject() const;
bool cover() const;
protected slots:
@@ -73,7 +73,7 @@ protected slots:
void slotRemove();
void slotFax();
void slotAbort();
- void slotMessage(const QString&);
+ void slotMessage(const TQString&);
void slotFaxSent(bool);
void slotViewLog();
void slotConfigure();
@@ -86,16 +86,16 @@ protected slots:
void slotFaxSelectionChanged();
void slotFaxRemove();
void slotFaxAdd();
- void slotFaxExecuted( QListViewItem* );
+ void slotFaxExecuted( TQListViewItem* );
void slotCoverToggled(bool toggle);
protected:
void initActions();
- void dragEnterEvent(QDragEnterEvent*);
- void dropEvent(QDropEvent*);
+ void dragEnterEvent(TQDragEnterEvent*);
+ void dropEvent(TQDropEvent*);
void updateState();
- bool manualFaxDialog( QString& number, QString& name, QString& enterprise );
- //QListViewItem* faxItem( int i = 0 ) const;
+ bool manualFaxDialog( TQString& number, TQString& name, TQString& enterprise );
+ //TQListViewItem* faxItem( int i = 0 ) const;
private:
KListBox *m_files;
@@ -107,8 +107,8 @@ private:
QLabel *m_msglabel;
QTimeEdit *m_time;
QComboBox *m_timecombo;
- QPushButton *m_upbtn, *m_downbtn;
- QPushButton *m_newbtn, *m_abbtn, *m_delbtn;
+ TQPushButton *m_upbtn, *m_downbtn;
+ TQPushButton *m_newbtn, *m_abbtn, *m_delbtn;
bool m_quitAfterSend;
};
diff --git a/kdeprint/kdeprintfax/main.cpp b/kdeprint/kdeprintfax/main.cpp
index a4dd3030f..c1a92fd12 100644
--- a/kdeprint/kdeprintfax/main.cpp
+++ b/kdeprint/kdeprintfax/main.cpp
@@ -20,13 +20,13 @@
#include "kdeprintfax.h"
-#include <qfile.h>
+#include <tqfile.h>
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <klocale.h>
#include <kapplication.h>
-QString debugFlag;
+TQString debugFlag;
int oneShotFlag = false;
static const char description[] =
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
for (int i=0;i<args->count();i++)
w->addURL(args->url(i));
- QString phone = args->getOption( "phone" );
+ TQString phone = args->getOption( "phone" );
if( !phone.isEmpty() ) {
w->setPhone( phone );
}
diff --git a/kdeprint/kjobviewer/kjobviewer.cpp b/kdeprint/kjobviewer/kjobviewer.cpp
index 12a7aef1a..6039da9a0 100644
--- a/kdeprint/kjobviewer/kjobviewer.cpp
+++ b/kdeprint/kjobviewer/kjobviewer.cpp
@@ -23,7 +23,7 @@
#include <kdeprint/kmmanager.h>
#include <stdlib.h>
-#include <qpixmap.h>
+#include <tqpixmap.h>
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <kmessagebox.h>
@@ -39,22 +39,22 @@ class JobTray : public KSystemTray
{
public:
JobTray(KJobViewerApp *parent, const char *name = 0)
- : KSystemTray(0, name), m_app(parent) { connect( this, SIGNAL( quitSelected() ), kapp, SLOT( quit() ) ); }
+ : KSystemTray(0, name), m_app(parent) { connect( this, TQT_SIGNAL( quitSelected() ), kapp, TQT_SLOT( quit() ) ); }
protected:
- void mousePressEvent(QMouseEvent*);
+ void mousePressEvent(TQMouseEvent*);
private:
KJobViewerApp *m_app;
};
-void JobTray::mousePressEvent(QMouseEvent *e)
+void JobTray::mousePressEvent(TQMouseEvent *e)
{
if (e->button() == Qt::RightButton)
KSystemTray::mousePressEvent(e);
else if (m_app->m_views.count() > 0)
{
KPopupMenu menu;
- QDictIterator<KMJobViewer> it(m_app->m_views);
- QPtrList<KMJobViewer> list;
+ TQDictIterator<KMJobViewer> it(m_app->m_views);
+ TQPtrList<KMJobViewer> list;
list.setAutoDelete(false);
for (; it.current(); ++it)
{
@@ -117,7 +117,7 @@ void KJobViewerApp::initialize()
if (!m_timer)
{
m_timer = KMTimer::self();
- connect(m_timer,SIGNAL(timeout()),SLOT(slotTimer()));
+ connect(m_timer,TQT_SIGNAL(timeout()),TQT_SLOT(slotTimer()));
}
if (prname.isEmpty() && all)
@@ -146,10 +146,10 @@ void KJobViewerApp::initialize()
{
kdDebug() << "creating new view: " << prname << endl;
view = new KMJobViewer();
- connect(view, SIGNAL(jobsShown(KMJobViewer*,bool)), SLOT(slotJobsShown(KMJobViewer*,bool)));
- connect(view, SIGNAL(printerChanged(KMJobViewer*,const QString&)), SLOT(slotPrinterChanged(KMJobViewer*,const QString&)));
- connect(view, SIGNAL(refreshClicked()), SLOT(slotTimer()));
- connect(view, SIGNAL(viewerDestroyed(KMJobViewer*)), SLOT(slotViewerDestroyed(KMJobViewer*)));
+ connect(view, TQT_SIGNAL(jobsShown(KMJobViewer*,bool)), TQT_SLOT(slotJobsShown(KMJobViewer*,bool)));
+ connect(view, TQT_SIGNAL(printerChanged(KMJobViewer*,const TQString&)), TQT_SLOT(slotPrinterChanged(KMJobViewer*,const TQString&)));
+ connect(view, TQT_SIGNAL(refreshClicked()), TQT_SLOT(slotTimer()));
+ connect(view, TQT_SIGNAL(viewerDestroyed(KMJobViewer*)), TQT_SLOT(slotViewerDestroyed(KMJobViewer*)));
m_views.insert(prname, view);
}
@@ -193,12 +193,12 @@ void KJobViewerApp::slotTimer()
// Refresh views. The first time, job list is reloaded,
// other views will simply use reloaded job list
bool trigger(true);
- QDictIterator<KMJobViewer> it(m_views);
+ TQDictIterator<KMJobViewer> it(m_views);
for (; it.current(); ++it, trigger=false)
it.current()->refresh(trigger);
}
-void KJobViewerApp::slotPrinterChanged(KMJobViewer *view, const QString& prname)
+void KJobViewerApp::slotPrinterChanged(KMJobViewer *view, const TQString& prname)
{
KMJobViewer *other = m_views.find(prname);
if (other)
diff --git a/kdeprint/kjobviewer/kjobviewer.h b/kdeprint/kjobviewer/kjobviewer.h
index 389f160a4..022194d1a 100644
--- a/kdeprint/kjobviewer/kjobviewer.h
+++ b/kdeprint/kjobviewer/kjobviewer.h
@@ -22,7 +22,7 @@
#include <kuniqueapplication.h>
#include <kdeprint/kpreloadobject.h>
-#include <qdict.h>
+#include <tqdict.h>
class KMJobViewer;
class KMTimer;
@@ -45,11 +45,11 @@ protected:
protected slots:
void slotJobsShown(KMJobViewer*, bool);
void slotTimer();
- void slotPrinterChanged(KMJobViewer*, const QString&);
+ void slotPrinterChanged(KMJobViewer*, const TQString&);
void slotViewerDestroyed(KMJobViewer*);
private:
- QDict<KMJobViewer> m_views;
+ TQDict<KMJobViewer> m_views;
JobTray *m_tray;
KMTimer *m_timer;
};
diff --git a/kdeprint/kprinter/main.cpp b/kdeprint/kprinter/main.cpp
index 1d88ace83..dd49103c5 100644
--- a/kdeprint/kprinter/main.cpp
+++ b/kdeprint/kprinter/main.cpp
@@ -19,7 +19,7 @@
#include "printwrapper.h"
-#include <qtimer.h>
+#include <tqtimer.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
#include <klocale.h>
@@ -49,7 +49,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
KApplication app;
PrintWrapper *wrap = new PrintWrapper;
app.setMainWidget(wrap);
- QTimer::singleShot(10,wrap,SLOT(slotPrint()));
+ TQTimer::singleShot(10,wrap,TQT_SLOT(slotPrint()));
int result = app.exec();
delete wrap;
diff --git a/kdeprint/kprinter/printwrapper.cpp b/kdeprint/kprinter/printwrapper.cpp
index a9f566c72..f5e67f96e 100644
--- a/kdeprint/kprinter/printwrapper.cpp
+++ b/kdeprint/kprinter/printwrapper.cpp
@@ -23,14 +23,14 @@
#include <signal.h>
#include <sys/time.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <stdlib.h>
#include <kmessagebox.h>
-#include <qfile.h>
-#include <qtimer.h>
-#include <qregexp.h>
-#include <qsocketnotifier.h>
+#include <tqfile.h>
+#include <tqtimer.h>
+#include <tqregexp.h>
+#include <tqsocketnotifier.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
@@ -47,14 +47,14 @@
#include <kdeprint/kprintdialog.h>
void signal_handler(int);
-QString tempFile;
+TQString tempFile;
bool fromStdin = false;
char job_output = 0; // 0: dialog, 1: console, 2: none
char readchar = '\0';
bool dataread = false;
bool docopy = false;
-void showmsgdialog(const QString& msg, int type = 0)
+void showmsgdialog(const TQString& msg, int type = 0)
{
switch (type)
{
@@ -64,13 +64,13 @@ void showmsgdialog(const QString& msg, int type = 0)
}
}
-void showmsgconsole(const QString& msg, int type = 0)
+void showmsgconsole(const TQString& msg, int type = 0)
{
- QString errmsg = QString::fromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error"))));
+ QString errmsg = TQString::fromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error"))));
kdDebug() << errmsg << msg << endl;
}
-void showmsg(const QString& msg, int type = 0)
+void showmsg(const TQString& msg, int type = 0)
{
switch (job_output) {
case 0: showmsgdialog(msg,type); break;
@@ -79,7 +79,7 @@ void showmsg(const QString& msg, int type = 0)
}
}
-void errormsg(const QString& msg)
+void errormsg(const TQString& msg)
{
showmsg(msg,2);
exit(1);
@@ -87,20 +87,20 @@ void errormsg(const QString& msg)
void signal_handler(int s)
{
- QFile::remove(tempFile);
+ TQFile::remove(tempFile);
exit(s);
}
-QString copyfile( const QString& filename )
+TQString copyfile( const TQString& filename )
{
kdDebug( 500 ) << "Copying file " << filename << endl;
- QString result;
- QFile f( filename );
+ TQString result;
+ TQFile f( filename );
if ( f.open( IO_ReadOnly ) )
{
KTempFile temp;
temp.setAutoDelete( false );
- QFile *tf = temp.file();
+ TQFile *tf = temp.file();
if ( tf )
{
char buffer[ 0xFFFF ];
@@ -129,7 +129,7 @@ QString copyfile( const QString& filename )
//******************************************************************************************************
PrintWrapper::PrintWrapper()
-: QWidget(), force_stdin(false), check_stdin(true)
+: TQWidget(), force_stdin(false), check_stdin(true)
{
}
@@ -144,11 +144,11 @@ void PrintWrapper::slotPrint()
// read variables from command line
QString printer = args->getOption("d");
QString title = args->getOption("t");
- int ncopies = QString(args->getOption("n")).toInt();
+ int ncopies = TQString(args->getOption("n")).toInt();
QString job_mode = args->getOption("j");
QString system = args->getOption("system");
QCStringList optlist = args->getOptionList("o");
- QMap<QString,QString> opts;
+ TQMap<TQString,TQString> opts;
KURL::List files;
QStringList filestoprint;
force_stdin = args->isSet("stdin");
@@ -164,8 +164,8 @@ void PrintWrapper::slotPrint()
// parse options
for (QCStringList::ConstIterator it=optlist.begin(); it!=optlist.end(); ++it)
{
- QStringList l = QStringList::split('=',QString(*it),false);
- if (l.count() >= 1) opts[l[0]] = (l.count() == 2 ? l[1] : QString::null);
+ QStringList l = TQStringList::split('=',TQString(*it),false);
+ if (l.count() >= 1) opts[l[0]] = (l.count() == 2 ? l[1] : TQString::null);
}
// read file list
@@ -262,11 +262,11 @@ void PrintWrapper::slotPrint()
dlg = KPrintDialog::printerDialog(&kprinter, 0);
if (dlg)
{
- connect(dlg, SIGNAL(printRequested(KPrinter*)), SLOT(slotPrintRequested(KPrinter*)));
+ connect(dlg, TQT_SIGNAL(printRequested(KPrinter*)), TQT_SLOT(slotPrintRequested(KPrinter*)));
if( check_stdin )
{
- notif = new QSocketNotifier( 0, QSocketNotifier::Read, this );
- connect( notif, SIGNAL( activated( int )), this, SLOT( slotGotStdin()));
+ notif = new TQSocketNotifier( 0, TQSocketNotifier::Read, this );
+ connect( notif, TQT_SIGNAL( activated( int )), this, TQT_SLOT( slotGotStdin()));
kdDebug( 500 ) << "waiting for input on stdin" << endl;
}
dlg->exec();
@@ -276,7 +276,7 @@ void PrintWrapper::slotPrint()
errormsg(i18n("Unable to construct the print dialog."));
}
- QTimer::singleShot(10,kapp,SLOT(quit()));
+ TQTimer::singleShot(10,kapp,TQT_SLOT(quit()));
}
void hack( KPrintDialog* dlg );
@@ -297,11 +297,11 @@ void PrintWrapper::slotGotStdin()
void PrintWrapper::slotPrintRequested(KPrinter *kprinter)
{
// re-initialize docName
- kprinter->setDocName(QString::null);
+ kprinter->setDocName(TQString::null);
// download files if needed
- QStringList files = QStringList::split("@@", kprinter->option("kde-filelist"), false), filestoprint;
- for (QStringList::ConstIterator it=files.begin(); it!=files.end(); ++it)
+ QStringList files = TQStringList::split("@@", kprinter->option("kde-filelist"), false), filestoprint;
+ for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it)
{
QString tmpFile;
KURL url = KURL::fromPathOrURL(*it);
@@ -342,10 +342,10 @@ void PrintWrapper::slotPrintRequested(KPrinter *kprinter)
signal(SIGTERM, signal_handler);
# endif
- tempFile = locateLocal("tmp","kprinter_")+QString::number(getpid());
+ tempFile = locateLocal("tmp","kprinter_")+TQString::number(getpid());
filestoprint.append(tempFile);
fromStdin = true;
- FILE *fout = fopen(QFile::encodeName(filestoprint[0]),"w");
+ FILE *fout = fopen(TQFile::encodeName(filestoprint[0]),"w");
if (!fout) errormsg(i18n("Unable to open temporary file."));
char buffer[8192];
int s;
@@ -362,15 +362,15 @@ void PrintWrapper::slotPrintRequested(KPrinter *kprinter)
if (s <= 0)
{
showmsg(i18n("Stdin is empty, no job sent."), 2);
- QFile::remove(filestoprint[0]);
+ TQFile::remove(filestoprint[0]);
return;
}
}
else if ( docopy )
{
- for ( QStringList::Iterator it=filestoprint.begin(); it!=filestoprint.end(); ++it )
+ for ( TQStringList::Iterator it=filestoprint.begin(); it!=filestoprint.end(); ++it )
{
- QString tmp = copyfile( *it );
+ TQString tmp = copyfile( *it );
if ( tmp.isEmpty() )
{
errormsg( i18n( "Unable to copy file %1." ).arg( *it ) );
diff --git a/kdeprint/kprinter/printwrapper.h b/kdeprint/kprinter/printwrapper.h
index 6c4eed45d..54d25368f 100644
--- a/kdeprint/kprinter/printwrapper.h
+++ b/kdeprint/kprinter/printwrapper.h
@@ -20,7 +20,7 @@
#ifndef PRINTWRAPPER_H
#define PRINTWRAPPER_H
-#include <qwidget.h>
+#include <tqwidget.h>
class KPrinter;
class KPrintDialog;
@@ -43,7 +43,7 @@ private:
bool force_stdin;
bool check_stdin;
KPrintDialog* dlg;
- QSocketNotifier* notif;
+ TQSocketNotifier* notif;
};
#endif
diff --git a/kdeprint/printmgr/kcmprintmgr.cpp b/kdeprint/printmgr/kcmprintmgr.cpp
index 0ffe98ecc..7a986e0bf 100644
--- a/kdeprint/printmgr/kcmprintmgr.cpp
+++ b/kdeprint/printmgr/kcmprintmgr.cpp
@@ -20,17 +20,17 @@
#include "kcmprintmgr.h"
#include "kdeprint/kmmainview.h"
-#include <qlayout.h>
+#include <tqlayout.h>
#include <kgenericfactory.h>
#include <kaboutdata.h>
#include <kdebug.h>
#include <klocale.h>
-typedef KGenericFactory<KCMPrintMgr, QWidget> KPrintMgrFactory;
+typedef KGenericFactory<KCMPrintMgr, TQWidget> KPrintMgrFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_printmgr, KPrintMgrFactory("kcmprintmgr") )
-KCMPrintMgr::KCMPrintMgr(QWidget *parent, const char *name, const QStringList &)
+KCMPrintMgr::KCMPrintMgr(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KPrintMgrFactory::instance(),parent,name)
{
setButtons(KCModule::Ok);
@@ -43,7 +43,7 @@ KCMPrintMgr::KCMPrintMgr(QWidget *parent, const char *name, const QStringList &)
m_mainview = new KMMainView(this,"MainView");
- QVBoxLayout *main_ = new QVBoxLayout(this, 0, 0);
+ QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 0);
main_->addWidget(m_mainview);
main_->activate();
@@ -55,7 +55,7 @@ KCMPrintMgr::KCMPrintMgr(QWidget *parent, const char *name, const QStringList &)
setAboutData(about);
}
-QString KCMPrintMgr::quickHelp() const
+TQString KCMPrintMgr::quickHelp() const
{
return i18n("<h1>Printers</h1>The KDE printing manager is part of KDEPrint which "
"is the interface to the real print subsystem of your Operating System (OS). "
diff --git a/kdeprint/printmgr/kcmprintmgr.h b/kdeprint/printmgr/kcmprintmgr.h
index 7aa43ef58..126930931 100644
--- a/kdeprint/printmgr/kcmprintmgr.h
+++ b/kdeprint/printmgr/kcmprintmgr.h
@@ -27,10 +27,10 @@ class KMMainView;
class KCMPrintMgr : public KCModule
{
public:
- KCMPrintMgr(QWidget *parent, const char *name, const QStringList &);
+ KCMPrintMgr(TQWidget *parent, const char *name, const TQStringList &);
~KCMPrintMgr();
- QString quickHelp() const;
+ TQString quickHelp() const;
private:
KMMainView *m_mainview;
diff --git a/kdeprint/slave/kio_print.cpp b/kdeprint/slave/kio_print.cpp
index 6857ef2e6..4613edeb8 100644
--- a/kdeprint/slave/kio_print.cpp
+++ b/kdeprint/slave/kio_print.cpp
@@ -24,8 +24,8 @@
#include <kdeprint/kmjob.h>
#include <kdeprint/driver.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <klocale.h>
#include <kdebug.h>
#include <kinstance.h>
@@ -39,8 +39,8 @@
#include <kaboutdata.h>
#include <kprocess.h>
#include <ktempfile.h>
-#include <qfile.h>
-#include <qdom.h>
+#include <tqfile.h>
+#include <tqdom.h>
#include <stdio.h>
#include <stdlib.h>
@@ -53,7 +53,7 @@ extern "C"
int KDE_EXPORT kdemain(int argc, char **argv);
}
-void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const QString& s = QString::null)
+void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString::null)
{
KIO::UDSAtom atom;
atom.m_uds = ID;
@@ -62,7 +62,7 @@ void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const QString& s = Q
entry.append(atom);
}
-static void createDirEntry(KIO::UDSEntry& entry, const QString& name, const QString& url, const QString& mime)
+static void createDirEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime)
{
entry.clear();
addAtom(entry, KIO::UDS_NAME, 0, name);
@@ -75,7 +75,7 @@ static void createDirEntry(KIO::UDSEntry& entry, const QString& name, const QStr
//addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
}
-static void createFileEntry(KIO::UDSEntry& entry, const QString& name, const QString& url, const QString& mime)
+static void createFileEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime)
{
entry.clear();
addAtom(entry, KIO::UDS_NAME, 0, name);
@@ -87,14 +87,14 @@ static void createFileEntry(KIO::UDSEntry& entry, const QString& name, const QSt
addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
}
-QString buildMenu(const QStringList& items, const QStringList& links, int active)
+TQString buildMenu(const TQStringList& items, const TQStringList& links, int active)
{
if (items.count() == 0 || items.count() != links.count())
- return QString("<td height=20 class=\"menu\">&nbsp;</td>");
+ return TQString("<td height=20 class=\"menu\">&nbsp;</td>");
QString s;
int index = 0;
- for (QStringList::ConstIterator it1=items.begin(), it2=links.begin(); it1!=items.end() && it2!=links.end(); ++it1, ++it2, index++)
+ for (TQStringList::ConstIterator it1=items.begin(), it2=links.begin(); it1!=items.end() && it2!=links.end(); ++it1, ++it2, index++)
{
if (index == active)
s.append("<td height=20 class=\"menuactive\">&nbsp; ").append(*it1).append("&nbsp;</td>");
@@ -106,27 +106,27 @@ QString buildMenu(const QStringList& items, const QStringList& links, int active
return s;
}
-QString buildOptionRow(DrBase *opt, bool f)
+TQString buildOptionRow(DrBase *opt, bool f)
{
QString s("<tr class=\"%1\"><td width=\"41%\">%1</td><td width=\"59%\">%1</td></tr>\n");
s = s.arg(f ? "contentwhite" : "contentyellow").arg(opt->get("text")).arg(opt->prettyText());
return s;
}
-QString buildGroupTable(DrGroup *grp, bool showHeader = true)
+TQString buildGroupTable(DrGroup *grp, bool showHeader = true)
{
QString s("<tr class=\"top\"><td colspan=\"2\">%1</td></tr>\n");
if (showHeader)
s = s.arg(grp->get("text"));
else
- s = QString::null;
+ s = TQString::null;
- QPtrListIterator<DrBase> oit(grp->options());
+ TQPtrListIterator<DrBase> oit(grp->options());
bool f(false);
for (; oit.current(); ++oit, f = !f)
s.append(buildOptionRow(oit.current(), f));
- QPtrListIterator<DrGroup> git(grp->groups());
+ TQPtrListIterator<DrGroup> git(grp->groups());
for (; git.current(); ++git)
s.append(buildGroupTable(git.current()));
@@ -157,7 +157,7 @@ int kdemain(int argc, char **argv)
return 0;
}
-KIO_Print::KIO_Print(const QCString& pool, const QCString& app)
+KIO_Print::KIO_Print(const TQCString& pool, const TQCString& app)
: KIO::SlaveBase("print", pool, app)
{
}
@@ -170,7 +170,7 @@ void KIO_Print::listDir(const KURL& url)
return;
}
- QStringList path = QStringList::split('/', url.path(), false);
+ QStringList path = TQStringList::split('/', url.path(), false);
PRINT_DEBUG << "listing " << url.path() << endl;
QString group = path[0].lower();
@@ -205,7 +205,7 @@ void KIO_Print::listDir(const KURL& url)
return;
}
- QPtrListIterator<KMPrinter> it(*(KMManager::self()->printerList()));
+ TQPtrListIterator<KMPrinter> it(*(KMManager::self()->printerList()));
for (;it.current();++it)
{
if (!(it.current()->type() & mask) || !it.current()->instanceName().isEmpty())
@@ -252,7 +252,7 @@ void KIO_Print::listRoot()
listEntry(entry, false);
// Management entry
- //createFileEntry(entry, i18n("Manager"), "print:/manager", "print/manager", QString::null, S_IFDIR);
+ //createFileEntry(entry, i18n("Manager"), "print:/manager", "print/manager", TQString::null, S_IFDIR);
createDirEntry(entry, i18n("Manager"), "print:/manager", "print/manager");
listEntry(entry, false);
@@ -270,7 +270,7 @@ void KIO_Print::listDirDB( const KURL& url )
{
PRINT_DEBUG << "listDirDB: " << url << endl;
- QStringList pathComps = QStringList::split( '/', url.path(), false );
+ TQStringList pathComps = TQStringList::split( '/', url.path(), false );
KURL remUrl;
remUrl.setProtocol( "http" );
@@ -298,10 +298,10 @@ void KIO_Print::listDirDB( const KURL& url )
if ( getDBFile( remUrl ) )
{
- QDomDocument doc;
+ TQDomDocument doc;
if ( doc.setContent( &m_httpBuffer, false ) )
{
- QDomNodeList l;
+ TQDomNodeList l;
KIO::UDSEntry entry;
switch ( pathComps.size() )
{
@@ -309,7 +309,7 @@ void KIO_Print::listDirDB( const KURL& url )
l = doc.documentElement().elementsByTagName( "make" );
for ( unsigned int i=0; i<l.count(); i++ )
{
- QString make = l.item( i ).toElement().text();
+ TQString make = l.item( i ).toElement().text();
KURL makeUrl = url;
makeUrl.addPath( "/" + make );
createDirEntry( entry, make, makeUrl.url(), "print/folder" );
@@ -321,10 +321,10 @@ void KIO_Print::listDirDB( const KURL& url )
l = doc.documentElement().elementsByTagName( "printer" );
for ( unsigned int i=0; i<l.count(); i++ )
{
- QString ID, name;
- for ( QDomNode n=l.item( i ).firstChild(); !n.isNull(); n=n.nextSibling() )
+ TQString ID, name;
+ for ( TQDomNode n=l.item( i ).firstChild(); !n.isNull(); n=n.nextSibling() )
{
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
if ( e.tagName() == "id" )
ID = e.text();
else if ( e.tagName() == "model" )
@@ -344,7 +344,7 @@ void KIO_Print::listDirDB( const KURL& url )
l = doc.documentElement().elementsByTagName( "driver" );
for ( unsigned int i=0; i<l.count(); i++ )
{
- QString driver = l.item( i ).toElement().text();
+ TQString driver = l.item( i ).toElement().text();
KURL driverUrl = url;
driverUrl.addPath( "/" + driver );
createFileEntry( entry, driver, driverUrl.url(), "print/driver" );
@@ -382,7 +382,7 @@ void KIO_Print::stat(const KURL& url)
}
PRINT_DEBUG << "stat: " << url.url() << endl;
- QStringList path = QStringList::split('/', url.encodedPathAndQuery(-1), false);
+ QStringList path = TQStringList::split('/', url.encodedPathAndQuery(-1), false);
KIO::UDSEntry entry;
QString mime;
bool err(false);
@@ -434,7 +434,7 @@ void KIO_Print::statDB( const KURL& url )
{
PRINT_DEBUG << "statDB: " << url << endl;
KIO::UDSEntry entry;
- QStringList pathComps = QStringList::split( '/', url.path(), false );
+ TQStringList pathComps = TQStringList::split( '/', url.path(), false );
if ( pathComps.size() == 3 )
createFileEntry( entry, i18n( "Printer driver" ), url.url(), "print/driver" );
else
@@ -455,10 +455,10 @@ bool KIO_Print::getDBFile( const KURL& src )
/* start the transfer job */
KIO::TransferJob *job = KIO::get( src, false, false );
- connect( job, SIGNAL( result( KIO::Job* ) ), SLOT( slotResult( KIO::Job* ) ) );
- connect( job, SIGNAL( data( KIO::Job*, const QByteArray& ) ), SLOT( slotData( KIO::Job*, const QByteArray& ) ) );
- connect( job, SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ), SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) );
- connect( job, SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ), SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( slotResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ), TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) );
+ connect( job, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ), TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
kapp->enter_loop();
m_httpBuffer.close();
@@ -472,7 +472,7 @@ void KIO_Print::getDB( const KURL& url )
{
PRINT_DEBUG << "downloading PPD file for " << url.url() << endl;
- QStringList pathComps = QStringList::split( '/', url.path(), false );
+ TQStringList pathComps = TQStringList::split( '/', url.path(), false );
if ( pathComps.size() != 3 )
error( KIO::ERR_MALFORMED_URL, url.url() );
else
@@ -513,7 +513,7 @@ void KIO_Print::slotResult( KIO::Job *j )
kapp->exit_loop();
}
-void KIO_Print::slotData( KIO::Job *j, const QByteArray& d )
+void KIO_Print::slotData( KIO::Job *j, const TQByteArray& d )
{
PRINT_DEBUG << "HTTP data received (size=" << d.size() << ")" << endl;
if ( d.size() > 0 )
@@ -546,7 +546,7 @@ void KIO_Print::get(const KURL& url)
return;
}
- QStringList elems = QStringList::split('/', url.encodedPathAndQuery(), false);
+ QStringList elems = TQStringList::split('/', url.encodedPathAndQuery(), false);
QString group(elems[0].lower()), printer(KURL::decode_string(elems[1])), path, query;
KMPrinter *mprinter(0);
@@ -568,7 +568,7 @@ void KIO_Print::get(const KURL& url)
query = group.mid(p+1);
if (!query.isEmpty() && query != "jobs" && query != "completed_jobs")
{
- error(KIO::ERR_MALFORMED_URL, QString::null);
+ error(KIO::ERR_MALFORMED_URL, TQString::null);
return;
}
PRINT_DEBUG << "listing jobs for all printers" << endl;
@@ -635,7 +635,7 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer)
mimeType("text/html");
QString content;
- if (!loadTemplate(QString::fromLatin1("printer.template"), content))
+ if (!loadTemplate(TQString::fromLatin1("printer.template"), content))
{
error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("printer.template"));
return;
@@ -644,10 +644,10 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer)
content = content
.arg(i18n("Properties of %1").arg(printer->printerName()))
.arg(i18n("Properties of %1").arg(printer->printerName()))
- .arg(buildMenu(QStringList::split('|', i18n("General|Driver|Active jobs|Completed jobs"), false),
- QStringList::split('|', "?general|?driver|?jobs|?completed_jobs", true),
+ .arg(buildMenu(TQStringList::split('|', i18n("General|Driver|Active jobs|Completed jobs"), false),
+ TQStringList::split('|', "?general|?driver|?jobs|?completed_jobs", true),
0))
- .arg(QString::null)
+ .arg(TQString::null)
.arg(printer->pixmap())
.arg(printer->name())
.arg(i18n("General Properties"))
@@ -676,7 +676,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer)
mimeType("text/html");
QString content;
- if (!loadTemplate(QString::fromLatin1("class.template"), content))
+ if (!loadTemplate(TQString::fromLatin1("class.template"), content))
{
error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("class.template"));
return;
@@ -684,9 +684,9 @@ void KIO_Print::showClassInfo(KMPrinter *printer)
QString memberContent("<ul>\n");
QStringList members(printer->members());
- for (QStringList::ConstIterator it=members.begin(); it!=members.end(); ++it)
+ for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it)
{
- memberContent.append(QString::fromLatin1("<li><a href=\"print:/printers/%1\">%2</a></li>\n").arg(*it).arg(*it));
+ memberContent.append(TQString::fromLatin1("<li><a href=\"print:/printers/%1\">%2</a></li>\n").arg(*it).arg(*it));
}
memberContent.append("</ul>\n");
@@ -695,10 +695,10 @@ void KIO_Print::showClassInfo(KMPrinter *printer)
content = content
.arg(i18n("Properties of %1").arg(printer->printerName()))
.arg(i18n("Properties of %1").arg(printer->printerName()))
- .arg(buildMenu(QStringList::split('|', i18n("General|Active jobs|Completed jobs"), false),
- QStringList::split('|', "?general|?jobs|?completed_jobs", true),
+ .arg(buildMenu(TQStringList::split('|', i18n("General|Active jobs|Completed jobs"), false),
+ TQStringList::split('|', "?general|?jobs|?completed_jobs", true),
0))
- .arg(QString::null)
+ .arg(TQString::null)
.arg(printer->pixmap())
.arg(printer->name())
.arg(i18n("General Properties"))
@@ -719,25 +719,25 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer)
mimeType("text/html");
QString content;
- if (!loadTemplate(QString::fromLatin1("pseudo.template"), content))
+ if (!loadTemplate(TQString::fromLatin1("pseudo.template"), content))
{
error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
return;
}
QString reqContent("<ul>\n");
- QStringList requirements = QStringList::split(",", printer->option("kde-special-require"), false);
- for (QStringList::ConstIterator it=requirements.begin(); it!=requirements.end(); ++it)
+ QStringList requirements = TQStringList::split(",", printer->option("kde-special-require"), false);
+ for (TQStringList::ConstIterator it=requirements.begin(); it!=requirements.end(); ++it)
reqContent += ("<li>" + (*it) + "</li>\n");
reqContent.append("</ul>\n");
content = content
.arg(i18n("Properties of %1").arg(printer->printerName()))
.arg(i18n("Properties of %1").arg(printer->printerName()))
- .arg(buildMenu(QStringList::split('|', i18n("General"), false),
- QStringList::split('|', "?general", true),
+ .arg(buildMenu(TQStringList::split('|', i18n("General"), false),
+ TQStringList::split('|', "?general", true),
0))
- .arg(QString::null)
+ .arg(TQString::null)
.arg(printer->pixmap())
.arg(printer->name())
.arg(i18n("General Properties"))
@@ -753,9 +753,9 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer)
finished();
}
-bool KIO_Print::loadTemplate(const QString& filename, QString& buffer)
+bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer)
{
- QFile f(locate("data", QString::fromLatin1("kdeprint/template/")+filename));
+ QFile f(locate("data", TQString::fromLatin1("kdeprint/template/")+filename));
if (f.exists() && f.open(IO_ReadOnly))
{
QTextStream t(&f);
@@ -764,12 +764,12 @@ bool KIO_Print::loadTemplate(const QString& filename, QString& buffer)
}
else
{
- buffer = QString::null;
+ buffer = TQString::null;
return false;
}
}
-void KIO_Print::showData(const QString& pathname)
+void KIO_Print::showData(const TQString& pathname)
{
PRINT_DEBUG << "sending data: " << pathname << endl;
QFile f(pathname);
@@ -792,7 +792,7 @@ void KIO_Print::showData(const QString& pathname)
* - $KDEDIR/share/apps/kdeprint/template/
* - as a desktop icon
*/
-QString KIO_Print::locateData(const QString& item)
+TQString KIO_Print::locateData(const TQString& item)
{
QString path = locate("data", "kdeprint/template/"+item);
if (path.isEmpty())
@@ -811,7 +811,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed)
mgr->addPrinter(prt->printerName(), type);
else
{
- QPtrListIterator<KMPrinter> pit(*(KMManager::self()->printerList()));
+ TQPtrListIterator<KMPrinter> pit(*(KMManager::self()->printerList()));
for (; pit.current(); ++pit)
if (pit.current()->isVirtual() || pit.current()->isSpecial())
continue;
@@ -820,7 +820,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed)
}
QString content;
- if (!loadTemplate(QString::fromLatin1("jobs.template"), content))
+ if (!loadTemplate(TQString::fromLatin1("jobs.template"), content))
{
error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
return;
@@ -832,13 +832,13 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed)
.arg(i18n("Jobs of %1").arg(prt->printerName()))
.arg(i18n("Jobs of %1").arg(prt->printerName()))
.arg(prt->isClass () ?
- buildMenu(QStringList::split('|', i18n("General|Active jobs|Completed jobs"), false),
- QStringList::split('|', "?general|?jobs|?completed_jobs", true),
+ buildMenu(TQStringList::split('|', i18n("General|Active jobs|Completed jobs"), false),
+ TQStringList::split('|', "?general|?jobs|?completed_jobs", true),
(completed ? 2 : 1)) :
- buildMenu(QStringList::split('|', i18n("General|Driver|Active jobs|Completed jobs"), false),
- QStringList::split('|', "?general|?driver|?jobs|?completed_jobs", true),
+ buildMenu(TQStringList::split('|', i18n("General|Driver|Active jobs|Completed jobs"), false),
+ TQStringList::split('|', "?general|?driver|?jobs|?completed_jobs", true),
(completed ? 3 : 2)))
- .arg(QString::null)
+ .arg(TQString::null)
.arg(prt->pixmap())
.arg(prt->printerName());
}
@@ -846,8 +846,8 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed)
{
content = content
.arg(i18n("All jobs"))
- .arg(buildMenu(QStringList::split('|', i18n("Active jobs|Completed jobs"), false),
- QStringList::split('|', "?jobs|?completed_jobs", true),
+ .arg(buildMenu(TQStringList::split('|', i18n("Active jobs|Completed jobs"), false),
+ TQStringList::split('|', "?jobs|?completed_jobs", true),
(completed ? 1 : 0)))
.arg("fileprint")
.arg(i18n("All jobs"));
@@ -855,7 +855,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed)
content = content.arg(i18n("ID")).arg(i18n("Owner")).arg(i18n("Printer")).arg(i18n("Name")).arg(i18n("State"));
QString jobContent, cellContent("<td>%1</td>\n");
- QPtrListIterator<KMJob> it(mgr->jobList());
+ TQPtrListIterator<KMJob> it(mgr->jobList());
bool flag(true);
for (; it.current(); ++it, flag = !flag)
{
@@ -874,7 +874,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed)
mgr->removePrinter(prt->printerName(), type);
else
{
- QPtrListIterator<KMPrinter> pit(*(KMManager::self()->printerList()));
+ TQPtrListIterator<KMPrinter> pit(*(KMManager::self()->printerList()));
for (; pit.current(); ++pit)
if (pit.current()->isVirtual() || pit.current()->isSpecial())
continue;
@@ -891,7 +891,7 @@ void KIO_Print::showDriver(KMPrinter *prt)
mimeType("text/html");
QString content;
- if (!loadTemplate(QString::fromLatin1("driver.template"), content))
+ if (!loadTemplate(TQString::fromLatin1("driver.template"), content))
{
error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
return;
@@ -901,17 +901,17 @@ void KIO_Print::showDriver(KMPrinter *prt)
content = content
.arg(i18n("Driver of %1").arg(prt->printerName()))
.arg(i18n("Driver of %1").arg(prt->printerName()))
- .arg(buildMenu(QStringList::split('|', i18n("General|Driver|Active jobs|Completed jobs"), false),
- QStringList::split('|', "?general|?driver|?jobs|?completed_jobs", true),
+ .arg(buildMenu(TQStringList::split('|', i18n("General|Driver|Active jobs|Completed jobs"), false),
+ TQStringList::split('|', "?general|?driver|?jobs|?completed_jobs", true),
1))
- .arg(QString::null)
+ .arg(TQString::null)
.arg(prt->pixmap())
.arg(prt->printerName() + "&nbsp;(" + (driver ? driver->get("text") : i18n("No driver found")) + ")");
if (driver)
content = content.arg(buildGroupTable(driver, false));
else
- content = content.arg(QString::null);
+ content = content.arg(TQString::null);
data(content.local8Bit());
finished();
diff --git a/kdeprint/slave/kio_print.h b/kdeprint/slave/kio_print.h
index 3fa20bbf1..7f622cb6b 100644
--- a/kdeprint/slave/kio_print.h
+++ b/kdeprint/slave/kio_print.h
@@ -22,19 +22,19 @@
#include <kio/slavebase.h>
#include <kio/global.h>
-#include <qstring.h>
-#include <qbuffer.h>
+#include <tqstring.h>
+#include <tqbuffer.h>
class KMPrinter;
namespace KIO {
class Job;
}
-class KIO_Print : public QObject, public KIO::SlaveBase
+class KIO_Print : public TQObject, public KIO::SlaveBase
{
Q_OBJECT
public:
- KIO_Print(const QCString& pool, const QCString& app);
+ KIO_Print(const TQCString& pool, const TQCString& app);
void listDir(const KURL& url);
void get(const KURL& url);
@@ -42,7 +42,7 @@ public:
protected slots:
void slotResult( KIO::Job* );
- void slotData( KIO::Job*, const QByteArray& );
+ void slotData( KIO::Job*, const TQByteArray& );
void slotTotalSize( KIO::Job*, KIO::filesize_t );
void slotProcessedSize( KIO::Job*, KIO::filesize_t );
@@ -55,16 +55,16 @@ private:
void showClassInfo(KMPrinter*);
void showPrinterInfo(KMPrinter*);
void showSpecialInfo(KMPrinter*);
- void showData(const QString&);
- QString locateData(const QString&);
+ void showData(const TQString&);
+ TQString locateData(const TQString&);
void showJobs(KMPrinter *p = 0, bool completed = false);
void showDriver(KMPrinter*);
- bool loadTemplate(const QString& filename, QString& buffer);
+ bool loadTemplate(const TQString& filename, TQString& buffer);
- QBuffer m_httpBuffer;
+ TQBuffer m_httpBuffer;
int m_httpError;
- QString m_httpErrorTxt;
+ TQString m_httpErrorTxt;
};
#endif
diff --git a/kdesktop/KBackgroundIface.h b/kdesktop/KBackgroundIface.h
index bd2a6ba05..47818021a 100644
--- a/kdesktop/KBackgroundIface.h
+++ b/kdesktop/KBackgroundIface.h
@@ -6,7 +6,7 @@
#define __KBackgroundIface_h__
#include <dcopobject.h>
-#include <qcolor.h>
+#include <tqcolor.h>
class KBackgroundIface : virtual public DCOPObject
{
@@ -38,17 +38,17 @@ k_dcop:
* @param desk desktop number, or 0 for the current visible desktop.
* @param wallpaper The (local) path to the wallpaper.
* @param mode The tiling mode. */
- virtual void setWallpaper(int desk, QString wallpaper, int mode) = 0;
+ virtual void setWallpaper(int desk, TQString wallpaper, int mode) = 0;
/** Change the wallpaper.
* @param wallpaper The (local) path to the wallpaper.
* @param mode The tiling mode. */
- virtual void setWallpaper(QString wallpaper, int mode) = 0;
+ virtual void setWallpaper(TQString wallpaper, int mode) = 0;
/** Set color.
* @param c The color.
* @param isColorA true for foreground and false for background color. */
- virtual void setColor(const QColor &c, bool isColorA) = 0;
+ virtual void setColor(const TQColor &c, bool isColorA) = 0;
/** Change the wallpaper in "multi mode". */
virtual void changeWallpaper() = 0;
@@ -59,17 +59,17 @@ k_dcop:
/** Return the current wallpaper for specified desk.
* @param desk desktop number, or 0 for the current visible desktop.
*/
- virtual QString currentWallpaper( int desk ) = 0;
+ virtual TQString currentWallpaper( int desk ) = 0;
/** Return the wallpaper list for specified desk.
* @param desk desktop number, or 0 for the current visible desktop.
*/
- virtual QStringList wallpaperList(int desk) = 0;
+ virtual TQStringList wallpaperList(int desk) = 0;
/** Return the wallpaper files for specified desk.
* @param desk desktop number, or 0 for the current visible desktop.
*/
- virtual QStringList wallpaperFiles(int desk) = 0;
+ virtual TQStringList wallpaperFiles(int desk) = 0;
};
#endif // __KBackgroundIface_h__
diff --git a/kdesktop/KDesktopIface.h b/kdesktop/KDesktopIface.h
index bbd1852ab..1aa90e538 100644
--- a/kdesktop/KDesktopIface.h
+++ b/kdesktop/KDesktopIface.h
@@ -2,7 +2,7 @@
#ifndef __KDesktopIface_h__
#define __KDesktopIface_h__
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include <dcopobject.h>
#include <dcopref.h>
@@ -44,7 +44,7 @@ k_dcop:
/**
* @return the urls of selected icons
*/
- virtual QStringList selectedURLs() = 0;
+ virtual TQStringList selectedURLs() = 0;
/**
* Re-read KDesktop's configuration
@@ -58,7 +58,7 @@ k_dcop:
* Display the "Run Command" dialog (minicli) and prefill
* @since 3.4
*/
- virtual void popupExecuteCommand(const QString& command) = 0;
+ virtual void popupExecuteCommand(const TQString& command) = 0;
/**
* Get the background dcop interface (KBackgroundIface)
*/
@@ -106,7 +106,7 @@ k_dcop:
* slot for kicker; called when the number or size of panels change the available
* space for desktop icons
*/
- virtual void desktopIconsAreaChanged(const QRect &area, int screen) = 0;
+ virtual void desktopIconsAreaChanged(const TQRect &area, int screen) = 0;
};
#endif
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc
index c3317708c..6d106a484 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cc
@@ -18,8 +18,8 @@
#include <assert.h>
-#include <qtimer.h>
-#include <qscrollview.h>
+#include <tqtimer.h>
+#include <tqscrollview.h>
#include <kiconloader.h>
#include <kconfig.h>
@@ -47,9 +47,9 @@
#include "pixmapserver.h"
-template class QPtrVector<KBackgroundRenderer>;
-template class QPtrVector<KBackgroundCacheEntry>;
-template class QMemArray<int>;
+template class TQPtrVector<KBackgroundRenderer>;
+template class TQPtrVector<KBackgroundCacheEntry>;
+template class TQMemArray<int>;
static Atom prop_root;
static bool properties_inited = false;
@@ -59,7 +59,7 @@ extern KDesktopApp *myApp;
/**** KBackgroundManager ****/
-KBackgroundManager::KBackgroundManager(QWidget *desktop, KWinModule* kwinModule)
+KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* kwinModule)
: DCOPObject("KBackgroundIface")
{
if( !properties_inited )
@@ -91,36 +91,36 @@ KBackgroundManager::KBackgroundManager(QWidget *desktop, KWinModule* kwinModule)
m_Cache[i]->hash = 0;
m_Cache[i]->exp_from = -1;
m_Renderer.insert (i, new KVirtualBGRenderer(i,m_pConfig));
- connect(m_Renderer[i], SIGNAL(imageDone(int)), SLOT(slotImageDone(int)));
+ connect(m_Renderer[i], TQT_SIGNAL(imageDone(int)), TQT_SLOT(slotImageDone(int)));
m_Renderer[i]->enableTiling( true ); // optimize
}
#ifdef COMPOSITE
m_tPixmap = new KPixmap(kapp->desktop()->size());
- m_tPixmap->fill(QColor(0, 0x0));
- connect(myApp, SIGNAL(cmBackgroundChanged( bool )),
- SLOT(slotCmBackgroundChanged( bool )));
+ m_tPixmap->fill(TQColor(0, 0x0));
+ connect(myApp, TQT_SIGNAL(cmBackgroundChanged( bool )),
+ TQT_SLOT(slotCmBackgroundChanged( bool )));
#endif
configure();
- m_pTimer = new QTimer(this);
- connect(m_pTimer, SIGNAL(timeout()), SLOT(slotTimeout()));
+ m_pTimer = new TQTimer(this);
+ connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
m_pTimer->start( 60000 );
- connect(m_pKwinmodule, SIGNAL(currentDesktopChanged(int)),
- SLOT(slotChangeDesktop(int)));
- connect(m_pKwinmodule, SIGNAL(numberOfDesktopsChanged(int)),
- SLOT(slotChangeNumberOfDesktops(int)));
- connect(m_pKwinmodule, SIGNAL(currentDesktopViewportChanged(int, const QPoint&)),
- SLOT(slotChangeViewport(int, const QPoint&)));
+ connect(m_pKwinmodule, TQT_SIGNAL(currentDesktopChanged(int)),
+ TQT_SLOT(slotChangeDesktop(int)));
+ connect(m_pKwinmodule, TQT_SIGNAL(numberOfDesktopsChanged(int)),
+ TQT_SLOT(slotChangeNumberOfDesktops(int)));
+ connect(m_pKwinmodule, TQT_SIGNAL(currentDesktopViewportChanged(int, const TQPoint&)),
+ TQT_SLOT(slotChangeViewport(int, const TQPoint&)));
#if (QT_VERSION-0 >= 0x030200)
- connect( kapp->desktop(), SIGNAL( resized( int )), SLOT( desktopResized())); // RANDR support
+ connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
#endif
- QSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
+ TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
m_numberOfViewports = s.width() * s.height();
if (m_numberOfViewports < 1) {
m_numberOfViewports = 1;
@@ -245,7 +245,7 @@ void KBackgroundManager::configure()
slotChangeDesktop(0);
// Redraw all desktops so that applications relying on exported data, e.g. kpager, continue to work properly
- QSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
+ TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
m_numberOfViewports = s.width() * s.height();
if (m_numberOfViewports < 1) {
m_numberOfViewports = 1;
@@ -266,7 +266,7 @@ int KBackgroundManager::realDesktop()
int KBackgroundManager::effectiveDesktop()
{
- QSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
+ TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
m_numberOfViewports = s.width() * s.height();
if (m_numberOfViewports > 1) {
@@ -274,7 +274,7 @@ int KBackgroundManager::effectiveDesktop()
return 0;
}
else {
- QPoint vx(m_pKwinmodule->currentViewport(m_pKwinmodule->currentDesktop()));
+ TQPoint vx(m_pKwinmodule->currentViewport(m_pKwinmodule->currentDesktop()));
return (realDesktop() * m_numberOfViewports) + ((vx.x() * vx.y()) - 1);
}
}
@@ -289,7 +289,7 @@ int KBackgroundManager::effectiveDesktop()
*/
void KBackgroundManager::slotChangeNumberOfDesktops(int num)
{
- QSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
+ TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
m_numberOfViewports = s.width() * s.height();
if (m_numberOfViewports < 1) {
m_numberOfViewports = 1;
@@ -325,7 +325,7 @@ void KBackgroundManager::slotChangeNumberOfDesktops(int num)
m_Cache[i]->hash = 0;
m_Cache[i]->exp_from = -1;
m_Renderer.insert(i, new KVirtualBGRenderer(i,m_pConfig));
- connect(m_Renderer[i], SIGNAL(imageDone(int)), SLOT(slotImageDone(int)));
+ connect(m_Renderer[i], TQT_SIGNAL(imageDone(int)), TQT_SLOT(slotImageDone(int)));
m_Renderer[i]->enableTiling( true ); // optimize
}
}
@@ -338,7 +338,7 @@ void KBackgroundManager::slotChangeNumberOfDesktops(int num)
*/
void KBackgroundManager::slotChangeDesktop(int desk)
{
- QSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
+ TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
m_numberOfViewports = s.width() * s.height();
if (m_numberOfViewports < 1) {
m_numberOfViewports = 1;
@@ -396,9 +396,9 @@ void KBackgroundManager::slotChangeDesktop(int desk)
* Desk is in KWin convention: [1..desks], instead of [0..desks-1].
* 0 repaints the current viewport.
*/
-void KBackgroundManager::slotChangeViewport(int desk, const QPoint& viewport)
+void KBackgroundManager::slotChangeViewport(int desk, const TQPoint& viewport)
{
- QSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
+ TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
m_numberOfViewports = s.width() * s.height();
if (m_numberOfViewports < 1) {
m_numberOfViewports = 1;
@@ -436,7 +436,7 @@ void KBackgroundManager::slotChangeViewport(int desk, const QPoint& viewport)
continue;
// kdDebug() << "slotChangeDesktop i=" << i << endl;
- //KPixmap * viewport_background = new KPixmap(QPixmap(m_Cache[i]->pixmap->width()*s.width(), m_Cache[i]->pixmap->height()*s.height()));
+ //KPixmap * viewport_background = new KPixmap(TQPixmap(m_Cache[i]->pixmap->width()*s.width(), m_Cache[i]->pixmap->height()*s.height()));
//setPixmap(viewport_background, m_Cache[i]->hash, i);
//delete viewport_background;
@@ -516,7 +516,7 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
if (m_pDesktop)
{
- QScrollView* sv = dynamic_cast<QScrollView*>( m_pDesktop );
+ TQScrollView* sv = dynamic_cast<TQScrollView*>( m_pDesktop );
if ( sv ) {
// Qt eats repaint events in this case :-((
sv->viewport()->update();
@@ -527,7 +527,7 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
if( !root_cleared )
{ // clear the root window pixmap set by kdm
root_cleared = true;
- QTimer::singleShot( 0, this, SLOT( clearRoot()));
+ TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot()));
// but make the pixmap visible until m_pDesktop is visible
KApplication::desktop()->screen()->setErasePixmap(*ep);
KApplication::desktop()->screen()->erase();
@@ -556,7 +556,7 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
void KBackgroundManager::clearRoot()
{
- KApplication::desktop()->screen()->setErasePixmap( QPixmap());
+ KApplication::desktop()->screen()->setErasePixmap( TQPixmap());
KApplication::desktop()->screen()->erase();
}
@@ -582,7 +582,7 @@ void KBackgroundManager::renderBackground(int desk)
void KBackgroundManager::slotImageDone(int desk)
{
bool t_useViewports = 1;
- QSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
+ TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
m_numberOfViewports = s.width() * s.height();
if (m_numberOfViewports < 1) {
m_numberOfViewports = 1;
@@ -598,7 +598,7 @@ void KBackgroundManager::slotImageDone(int desk)
bool current = (r->hash() == m_Renderer[effectiveDesktop()]->hash());
if (current)
{
- //KPixmap * viewport_background = new KPixmap(QPixmap(pm->width()*s.width(), pm->height()*s.height()));
+ //KPixmap * viewport_background = new KPixmap(TQPixmap(pm->width()*s.width(), pm->height()*s.height()));
//printf("slotImageDone(): x: %d y: %d\n\r", viewport_background->size().width(), viewport_background->size().height());
//setPixmap(viewport_background, r->hash(), desk);
//delete viewport_background;
@@ -608,7 +608,7 @@ void KBackgroundManager::slotImageDone(int desk)
{
m_bBgInitDone = true;
emit initDone();
- QTimer::singleShot( 30000, this, SLOT( saveImages()));
+ TQTimer::singleShot( 30000, this, TQT_SLOT( saveImages()));
do_cleanup = false;
}
}
@@ -639,9 +639,9 @@ void KBackgroundManager::saveImages()
}
/*
- * Size in bytes of a QPixmap. For use in the pixmap cache.
+ * Size in bytes of a TQPixmap. For use in the pixmap cache.
*/
-int KBackgroundManager::pixmapSize(QPixmap *pm)
+int KBackgroundManager::pixmapSize(TQPixmap *pm)
{
return (pm->width() * pm->height()) * ((pm->depth() + 7) / 8);
}
@@ -721,7 +721,7 @@ bool KBackgroundManager::freeCache(int size)
/*
- * Try to add a pixmap to the pixmap cache. We don't use QPixmapCache here
+ * Try to add a pixmap to the pixmap cache. We don't use TQPixmapCache here
* because if we're exporting pixmaps, this needs special care.
*/
void KBackgroundManager::addCache(KPixmap *pm, int hash, int desk)
@@ -749,7 +749,7 @@ void KBackgroundManager::addCache(KPixmap *pm, int hash, int desk)
*/
void KBackgroundManager::slotTimeout()
{
- QMemArray<int> running(m_Renderer.size());
+ TQMemArray<int> running(m_Renderer.size());
running.fill(0);
int NumDesks = m_Renderer.size();
@@ -798,7 +798,7 @@ int KBackgroundManager::validateDesk(int desk)
// DCOP exported
// Return current wallpaper for specified desk.
// 0 is for the current visible desktop.
-QString KBackgroundManager::currentWallpaper(int desk)
+TQString KBackgroundManager::currentWallpaper(int desk)
{
//TODO Is the behaviour of this function appropriate for multiple screens?
KBackgroundRenderer *r = m_Renderer[validateDesk(desk)]->renderer(0);
@@ -833,7 +833,7 @@ void KBackgroundManager::setCommon(int common)
}
// DCOP exported
-void KBackgroundManager::setWallpaper(QString wallpaper, int mode)
+void KBackgroundManager::setWallpaper(TQString wallpaper, int mode)
{
if (mode < 0 || mode >= KBackgroundSettings::lastWallpaperMode) {
kdDebug() << "Invalid background mode " << mode << " passed to " << k_funcinfo << "\n";
@@ -853,7 +853,7 @@ void KBackgroundManager::setWallpaper(QString wallpaper, int mode)
slotChangeDesktop(0);
}
-void KBackgroundManager::setWallpaper(QString wallpaper)
+void KBackgroundManager::setWallpaper(TQString wallpaper)
{
//TODO Is the behaviour of this function appropriate for multiple screens?
KBackgroundRenderer *r = m_Renderer[effectiveDesktop()]->renderer(0);
@@ -866,7 +866,7 @@ void KBackgroundManager::setWallpaper(QString wallpaper)
// DCOP exported
// Returns the filenames of all wallpaper entries for specified desk
// 0 is for current visible desktop.
-QStringList KBackgroundManager::wallpaperFiles(int desk)
+TQStringList KBackgroundManager::wallpaperFiles(int desk)
{
//TODO Is the behaviour of this function appropriate for multiple screens?
KBackgroundRenderer *r = m_Renderer[validateDesk(desk)]->renderer(0);
@@ -877,7 +877,7 @@ QStringList KBackgroundManager::wallpaperFiles(int desk)
// DCOP exported
// Returns the list of wallpaper entries (viewable in background slide
// show window) for specified desk. 0 is for current visible desktop.
-QStringList KBackgroundManager::wallpaperList(int desk)
+TQStringList KBackgroundManager::wallpaperList(int desk)
{
//TODO Is the behaviour of this function appropriate for multiple screens?
KBackgroundRenderer *r = m_Renderer[validateDesk(desk)]->renderer(0);;
@@ -895,7 +895,7 @@ void KBackgroundManager::setCache( int bLimit, int size )
}
// DCOP exported
-void KBackgroundManager::setWallpaper(int desk, QString wallpaper, int mode)
+void KBackgroundManager::setWallpaper(int desk, TQString wallpaper, int mode)
{
if (mode < 0 || mode >= KBackgroundSettings::lastWallpaperMode) {
kdDebug() << "Invalid background mode " << mode << " passed to " << k_funcinfo << "\n";
@@ -947,7 +947,7 @@ void KBackgroundManager::desktopResized()
if (m_tPixmap)
delete m_tPixmap;
m_tPixmap = new KPixmap(kapp->desktop()->size());
- m_tPixmap->fill(QColor(0, 0x0));
+ m_tPixmap->fill(TQColor(0, 0x0));
#endif
m_Hash = 0;
@@ -958,7 +958,7 @@ void KBackgroundManager::desktopResized()
repaintBackground();
// Redraw all desktops so that applications relying on exported data, e.g. kpager, continue to work properly
- QSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
+ TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
m_numberOfViewports = s.width() * s.height();
if (m_numberOfViewports < 1) {
m_numberOfViewports = 1;
@@ -969,7 +969,7 @@ void KBackgroundManager::desktopResized()
}
// DCOP exported
-void KBackgroundManager::setColor(const QColor & c, bool isColorA)
+void KBackgroundManager::setColor(const TQColor & c, bool isColorA)
{
//TODO Is the behaviour of this function appropriate for multiple screens?
for (unsigned i=0; i < m_Renderer[effectiveDesktop()]->numRenderers(); ++i)
@@ -1016,7 +1016,7 @@ void KBackgroundManager::setBackgroundEnabled( const bool enable )
#ifdef COMPOSITE
void KBackgroundManager::slotCmBackgroundChanged( bool )
{
- m_tPixmap->fill(QColor(0, 0x0));
+ m_tPixmap->fill(TQColor(0, 0x0));
m_Hash = 0;
slotChangeDesktop(0);
}
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h
index 455e3a3ad..8396f161a 100644
--- a/kdesktop/bgmanager.h
+++ b/kdesktop/bgmanager.h
@@ -10,8 +10,8 @@
#ifndef __BGManager_h_Included__
#define __BGManager_h_Included__
-#include <qstring.h>
-#include <qptrvector.h>
+#include <tqstring.h>
+#include <tqptrvector.h>
#include <KBackgroundIface.h>
@@ -50,13 +50,13 @@ struct KBackgroundCacheEntry
*/
class KBackgroundManager
- : public QObject,
+ : public TQObject,
virtual public KBackgroundIface
{
Q_OBJECT
public:
- KBackgroundManager(QWidget *desktop, KWinModule* kwinModule);
+ KBackgroundManager(TQWidget *desktop, KWinModule* kwinModule);
~KBackgroundManager();
void configure();
@@ -65,15 +65,15 @@ public:
void setExport(int);
bool isExport() { return m_bExport; };
void setCache(int, int);
- void setWallpaper(int desk, QString wallpaper, int mode);
- void setWallpaper(QString wallpaper, int mode);
- void setWallpaper(QString wallpaper);
+ void setWallpaper(int desk, TQString wallpaper, int mode);
+ void setWallpaper(TQString wallpaper, int mode);
+ void setWallpaper(TQString wallpaper);
void changeWallpaper();
- QString currentWallpaper(int desk);
- void setColor(const QColor & c, bool isColorA = true);
+ TQString currentWallpaper(int desk);
+ void setColor(const TQColor & c, bool isColorA = true);
void setBackgroundEnabled(const bool enable);
- QStringList wallpaperList(int desk);
- QStringList wallpaperFiles(int desk);
+ TQStringList wallpaperList(int desk);
+ TQStringList wallpaperFiles(int desk);
signals:
void initDone();
@@ -82,7 +82,7 @@ private slots:
void slotTimeout();
void slotImageDone(int desk);
void slotChangeDesktop(int);
- void slotChangeViewport(int, const QPoint&);
+ void slotChangeViewport(int, const TQPoint&);
void slotChangeNumberOfDesktops(int);
void repaintBackground();
void desktopResized();
@@ -105,7 +105,7 @@ private:
void renderBackground(int desk);
void exportBackground(int pixmap, int desk);
- int pixmapSize(QPixmap *pm);
+ int pixmapSize(TQPixmap *pm);
int cacheSize();
void removeCache(int desk);
bool freeCache(int size);
@@ -121,15 +121,15 @@ private:
int m_Serial, m_Hash, m_Current;
KConfig *m_pConfig;
- QWidget *m_pDesktop;
- QTimer *m_pTimer;
+ TQWidget *m_pDesktop;
+ TQTimer *m_pTimer;
#ifdef COMPOSITE
KPixmap *m_tPixmap;
#endif
- QPtrVector<KVirtualBGRenderer> m_Renderer;
- QPtrVector<KBackgroundCacheEntry> m_Cache;
+ TQPtrVector<KVirtualBGRenderer> m_Renderer;
+ TQPtrVector<KBackgroundCacheEntry> m_Cache;
KWinModule *m_pKwinmodule;
KPixmapServer *m_pPixmapServer;
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 18cb69fb4..54513e962 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -33,9 +33,9 @@
#include <kcolordrag.h>
#include <kurldrag.h>
-#include <qdir.h>
-#include <qevent.h>
-#include <qtooltip.h>
+#include <tqdir.h>
+#include <tqevent.h>
+#include <tqtooltip.h>
#include <netwm.h>
#include <dcopclient.h>
@@ -63,31 +63,31 @@
//#include <kaccelbase.h>
extern int kdesktop_screen_number;
-extern QCString kdesktop_name, kicker_name, kwin_name;
+extern TQCString kdesktop_name, kicker_name, kwin_name;
-KRootWidget::KRootWidget() : QObject()
+KRootWidget::KRootWidget() : TQObject()
{
kapp->desktop()->installEventFilter(this);
kapp->desktop()->setAcceptDrops( true );
}
-bool KRootWidget::eventFilter ( QObject *, QEvent * e )
+bool KRootWidget::eventFilter ( TQObject *, TQEvent * e )
{
- if (e->type() == QEvent::MouseButtonPress)
+ if (e->type() == TQEvent::MouseButtonPress)
{
- QMouseEvent *me = static_cast<QMouseEvent *>(e);
+ TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
KRootWm::self()->mousePressed( me->globalPos(), me->button() );
return true;
}
- else if (e->type() == QEvent::Wheel)
+ else if (e->type() == TQEvent::Wheel)
{
- QWheelEvent *we = static_cast<QWheelEvent *>(e);
+ TQWheelEvent *we = static_cast<TQWheelEvent *>(e);
emit wheelRolled(we->delta());
return true;
}
- else if ( e->type() == QEvent::DragEnter )
+ else if ( e->type() == TQEvent::DragEnter )
{
- QDragEnterEvent* de = static_cast<QDragEnterEvent *>( e );
+ TQDragEnterEvent* de = static_cast<TQDragEnterEvent *>( e );
bool b = !KGlobal::config()->isImmutable() && !KGlobal::dirs()->isRestrictedResource( "wallpaper" );
bool imageURL = false;
@@ -102,16 +102,16 @@ bool KRootWidget::eventFilter ( QObject *, QEvent * e )
imageURL = true;
}
- b = b && ( KColorDrag::canDecode( de ) || QImageDrag::canDecode( de ) || imageURL );
+ b = b && ( KColorDrag::canDecode( de ) || TQImageDrag::canDecode( de ) || imageURL );
de->accept( b );
return true;
}
- else if ( e->type() == QEvent::Drop )
+ else if ( e->type() == TQEvent::Drop )
{
- QDropEvent* de = static_cast<QDropEvent*>( e );
+ TQDropEvent* de = static_cast<TQDropEvent*>( e );
if ( KColorDrag::canDecode( de ) )
emit colorDropEvent( de );
- else if ( QImageDrag::canDecode( de ) )
+ else if ( TQImageDrag::canDecode( de ) )
emit imageDropEvent( de );
else if ( KURLDrag::canDecode( de ) ) {
KURL::List list;
@@ -132,7 +132,7 @@ const char* KDesktop::m_wheelDirectionStrings[2] = { "Forward", "Reverse" };
KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) :
DCOPObject( "KDesktopIface" ),
- QWidget( 0L, "desktop", WResizeNoErase | ( x_root_hack ? (WStyle_Customize | WStyle_NoBorder) : 0) ),
+ TQWidget( 0L, "desktop", WResizeNoErase | ( x_root_hack ? (WStyle_Customize | WStyle_NoBorder) : 0) ),
// those two WStyle_ break kdesktop when the root-hack isn't used (no Dnd)
startup_id( NULL ), m_waitForKicker(0)
{
@@ -149,8 +149,8 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) :
m_pKwinmodule = new KWinModule( this );
kapp->dcopClient()->setNotifications(true);
- kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(QRect, int)",
- "KDesktopIface", "desktopIconsAreaChanged(QRect, int)", false);
+ kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)",
+ "KDesktopIface", "desktopIconsAreaChanged(TQRect, int)", false);
// Dont repaint on configuration changes during construction
m_bInit = true;
@@ -172,31 +172,31 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) :
}
- setGeometry( QApplication::desktop()->geometry() );
+ setGeometry( TQApplication::desktop()->geometry() );
lower();
- connect( kapp, SIGNAL( shutDown() ),
- this, SLOT( slotShutdown() ) );
+ connect( kapp, TQT_SIGNAL( shutDown() ),
+ this, TQT_SLOT( slotShutdown() ) );
- connect(kapp, SIGNAL(settingsChanged(int)),
- this, SLOT(slotSettingsChanged(int)));
+ connect(kapp, TQT_SIGNAL(settingsChanged(int)),
+ this, TQT_SLOT(slotSettingsChanged(int)));
kapp->addKipcEventMask(KIPC::SettingsChanged);
kapp->addKipcEventMask(KIPC::IconChanged);
- connect(kapp, SIGNAL(iconChanged(int)), this, SLOT(slotIconChanged(int)));
+ connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(slotIconChanged(int)));
- connect(KSycoca::self(), SIGNAL(databaseChanged()),
- this, SLOT(slotDatabaseChanged()));
+ connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()),
+ this, TQT_SLOT(slotDatabaseChanged()));
m_pIconView = 0;
m_pRootWidget = 0;
bgMgr = 0;
initRoot();
- QTimer::singleShot(0, this, SLOT( slotStart() ));
+ TQTimer::singleShot(0, this, TQT_SLOT( slotStart() ));
#if (QT_VERSION-0 >= 0x030200) // XRANDR support
- connect( kapp->desktop(), SIGNAL( resized( int )), SLOT( desktopResized()));
+ connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
#endif
}
@@ -219,8 +219,8 @@ KDesktop::initRoot()
m_pIconView = 0;
{ // trigger creation of QToolTipManager, it does XSelectInput() on the root window
- QWidget w;
- QToolTip::add( &w, "foo" );
+ TQWidget w;
+ TQToolTip::add( &w, "foo" );
}
// NOTE: If mouse clicks stop working again, it's most probably something doing XSelectInput()
// on the root window after this, and setting it to some fixed value instead of adding its mask.
@@ -229,21 +229,21 @@ KDesktop::initRoot()
XSelectInput(dpy, root, attrs.your_event_mask | ButtonPressMask);
m_pRootWidget = new KRootWidget;
- connect(m_pRootWidget, SIGNAL(wheelRolled(int)), this, SLOT(slotSwitchDesktops(int)));
- connect(m_pRootWidget, SIGNAL(colorDropEvent(QDropEvent*)), this, SLOT(handleColorDropEvent(QDropEvent*)) );
- connect(m_pRootWidget, SIGNAL(imageDropEvent(QDropEvent*)), this, SLOT(handleImageDropEvent(QDropEvent*)) );
- connect(m_pRootWidget, SIGNAL(newWallpaper(const KURL&)), this, SLOT(slotNewWallpaper(const KURL&)) );
+ connect(m_pRootWidget, TQT_SIGNAL(wheelRolled(int)), this, TQT_SLOT(slotSwitchDesktops(int)));
+ connect(m_pRootWidget, TQT_SIGNAL(colorDropEvent(TQDropEvent*)), this, TQT_SLOT(handleColorDropEvent(TQDropEvent*)) );
+ connect(m_pRootWidget, TQT_SIGNAL(imageDropEvent(TQDropEvent*)), this, TQT_SLOT(handleImageDropEvent(TQDropEvent*)) );
+ connect(m_pRootWidget, TQT_SIGNAL(newWallpaper(const KURL&)), this, TQT_SLOT(slotNewWallpaper(const KURL&)) );
// Geert Jansen: backgroundmanager belongs here
// TODO tell KBackgroundManager if we change widget()
bgMgr = new KBackgroundManager( m_pIconView, m_pKwinmodule );
bgMgr->setExport(1);
- connect( bgMgr, SIGNAL( initDone()), SLOT( backgroundInitDone()));
+ connect( bgMgr, TQT_SIGNAL( initDone()), TQT_SLOT( backgroundInitDone()));
if (!m_bInit)
{
delete KRootWm::self();
KRootWm* krootwm = new KRootWm( this ); // handler for root menu (used by kdesktop on RMB click)
- keys->setSlot("Lock Session", krootwm, SLOT(slotLock()));
+ keys->setSlot("Lock Session", krootwm, TQT_SLOT(slotLock()));
keys->updateConnections();
}
}
@@ -254,21 +254,21 @@ KDesktop::initRoot()
delete m_pRootWidget;
m_pRootWidget = 0;
m_pIconView = new KDIconView( this, 0 );
- connect( m_pIconView, SIGNAL( imageDropEvent( QDropEvent * ) ),
- this, SLOT( handleImageDropEvent( QDropEvent * ) ) );
- connect( m_pIconView, SIGNAL( colorDropEvent( QDropEvent * ) ),
- this, SLOT( handleColorDropEvent( QDropEvent * ) ) );
- connect( m_pIconView, SIGNAL( newWallpaper( const KURL & ) ),
- this, SLOT( slotNewWallpaper( const KURL & ) ) );
- connect( m_pIconView, SIGNAL( wheelRolled( int ) ),
- this, SLOT( slotSwitchDesktops( int ) ) );
+ connect( m_pIconView, TQT_SIGNAL( imageDropEvent( TQDropEvent * ) ),
+ this, TQT_SLOT( handleImageDropEvent( TQDropEvent * ) ) );
+ connect( m_pIconView, TQT_SIGNAL( colorDropEvent( TQDropEvent * ) ),
+ this, TQT_SLOT( handleColorDropEvent( TQDropEvent * ) ) );
+ connect( m_pIconView, TQT_SIGNAL( newWallpaper( const KURL & ) ),
+ this, TQT_SLOT( slotNewWallpaper( const KURL & ) ) );
+ connect( m_pIconView, TQT_SIGNAL( wheelRolled( int ) ),
+ this, TQT_SLOT( slotSwitchDesktops( int ) ) );
// All the QScrollView/QWidget-specific stuff should go here, so that we can use
// another qscrollview/widget instead of the iconview and use the same code
- m_pIconView->setVScrollBarMode( QScrollView::AlwaysOff );
- m_pIconView->setHScrollBarMode( QScrollView::AlwaysOff );
+ m_pIconView->setVScrollBarMode( TQScrollView::AlwaysOff );
+ m_pIconView->setHScrollBarMode( TQScrollView::AlwaysOff );
m_pIconView->setDragAutoScroll( false );
- m_pIconView->setFrameStyle( QFrame::NoFrame );
+ m_pIconView->setFrameStyle( TQFrame::NoFrame );
m_pIconView->viewport()->setBackgroundMode( X11ParentRelative );
m_pIconView->setFocusPolicy( StrongFocus );
m_pIconView->viewport()->setFocusPolicy( StrongFocus );
@@ -279,23 +279,23 @@ KDesktop::initRoot()
// TODO tell KBackgroundManager if we change widget()
bgMgr = new KBackgroundManager( m_pIconView, m_pKwinmodule );
bgMgr->setExport(1);
- connect( bgMgr, SIGNAL( initDone()), SLOT( backgroundInitDone()));
+ connect( bgMgr, TQT_SIGNAL( initDone()), TQT_SLOT( backgroundInitDone()));
// make sure it is initialized before we first call updateWorkArea()
m_pIconView->initConfig( m_bInit );
// set the size of the area for desktop icons placement
{
- QByteArray data, result;
- QDataStream arg(data, IO_WriteOnly);
+ TQByteArray data, result;
+ TQDataStream arg(data, IO_WriteOnly);
arg << kdesktop_screen_number;
- QCString replyType;
- QRect area;
+ TQCString replyType;
+ TQRect area;
if ( kapp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
data, replyType, result, false, 2000) )
{
- QDataStream res(result, IO_ReadOnly);
+ TQDataStream res(result, IO_ReadOnly);
res >> area;
m_pIconView->updateWorkArea(area);
@@ -305,8 +305,8 @@ KDesktop::initRoot()
{
// if we failed to get the information from kicker wait a little - probably
// this is the KDE startup and kicker is simply not running yet
- m_waitForKicker = new QTimer(this);
- connect(m_waitForKicker, SIGNAL(timeout()), this, SLOT(slotNoKicker()));
+ m_waitForKicker = new TQTimer(this);
+ connect(m_waitForKicker, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotNoKicker()));
m_waitForKicker->start(15000, true);
}
else // we are not called from the ctor, so kicker should already run
@@ -321,12 +321,12 @@ KDesktop::initRoot()
m_pIconView->start();
delete KRootWm::self();
KRootWm* krootwm = new KRootWm( this ); // handler for root menu (used by kdesktop on RMB click)
- keys->setSlot("Lock Session", krootwm, SLOT(slotLock()));
+ keys->setSlot("Lock Session", krootwm, TQT_SLOT(slotLock()));
keys->updateConnections();
}
} else {
DCOPRef r( "ksmserver", "ksmserver" );
- r.send( "resumeStartup", QCString( "kdesktop" ));
+ r.send( "resumeStartup", TQCString( "kdesktop" ));
}
KWin::setType( winId(), NET::Desktop );
@@ -349,7 +349,7 @@ KDesktop::backgroundInitDone()
// avoid flicker
if (m_bDesktopEnabled)
{
- const QPixmap *bg = QApplication::desktop()->screen()->backgroundPixmap();
+ const TQPixmap *bg = TQApplication::desktop()->screen()->backgroundPixmap();
if ( bg )
m_pIconView->setErasePixmap( *bg );
@@ -358,7 +358,7 @@ KDesktop::backgroundInitDone()
}
DCOPRef r( "ksmserver", "ksmserver" );
- r.send( "resumeStartup", QCString( "kdesktop" ));
+ r.send( "resumeStartup", TQCString( "kdesktop" ));
}
void
@@ -394,9 +394,9 @@ KDesktop::slotStart()
keys->readSettings();
keys->updateConnections();
- connect(kapp, SIGNAL(appearanceChanged()), SLOT(slotConfigure()));
+ connect(kapp, TQT_SIGNAL(appearanceChanged()), TQT_SLOT(slotConfigure()));
- QTimer::singleShot(300, this, SLOT( slotUpAndRunning() ));
+ TQTimer::singleShot(300, this, TQT_SLOT( slotUpAndRunning() ));
}
void
@@ -405,10 +405,10 @@ KDesktop::runAutoStart()
// now let's execute all the stuff in the autostart folder.
// the stuff will actually be really executed when the event loop is
// entered, since KRun internally uses a QTimer
- QDir dir( KGlobalSettings::autostartPath() );
- QStringList entries = dir.entryList( QDir::Files );
- QStringList::Iterator it = entries.begin();
- QStringList::Iterator end = entries.end();
+ TQDir dir( KGlobalSettings::autostartPath() );
+ TQStringList entries = dir.entryList( TQDir::Files );
+ TQStringList::Iterator it = entries.begin();
+ TQStringList::Iterator end = entries.end();
for (; it != end; ++it )
{
// Don't execute backup files
@@ -489,7 +489,7 @@ void KDesktop::popupExecuteCommand()
popupExecuteCommand("");
}
-void KDesktop::popupExecuteCommand(const QString& command)
+void KDesktop::popupExecuteCommand(const TQString& command)
{
if (m_bInit)
return;
@@ -518,7 +518,7 @@ void KDesktop::popupExecuteCommand(const QString& command)
} else {
NETRootInfo i( qt_xdisplay(), NET::Supported );
if( !i.isSupported( NET::WM2FullPlacement )) {
- QRect rect = KGlobalSettings::desktopGeometry(QCursor::pos());
+ TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
m_miniCli->move(rect.x() + (rect.width() - m_miniCli->width())/2,
rect.y() + (rect.height() - m_miniCli->height())/2);
}
@@ -576,11 +576,11 @@ void KDesktop::unselectAll()
m_pIconView->selectAll( false );
}
-QStringList KDesktop::selectedURLs()
+TQStringList KDesktop::selectedURLs()
{
if (m_pIconView)
return m_pIconView->selectedURLs();
- return QStringList();
+ return TQStringList();
}
void KDesktop::refreshIcons()
@@ -689,7 +689,7 @@ void KDesktop::slotSetVRoot()
return;
if (KWin::windowInfo(winId()).mappingState() == NET::Withdrawn) {
- QTimer::singleShot(100, this, SLOT(slotSetVRoot()));
+ TQTimer::singleShot(100, this, TQT_SLOT(slotSetVRoot()));
return;
}
@@ -728,12 +728,12 @@ void KDesktop::slotShutdown()
}
// don't hide when someone presses Alt-F4 on us
-void KDesktop::closeEvent(QCloseEvent *e)
+void KDesktop::closeEvent(TQCloseEvent *e)
{
e->ignore();
}
-void KDesktop::desktopIconsAreaChanged(const QRect &area, int screen)
+void KDesktop::desktopIconsAreaChanged(const TQRect &area, int screen)
{
// hurra! kicker is alive
if ( m_waitForKicker ) m_waitForKicker->stop();
@@ -768,14 +768,14 @@ void KDesktop::slotSwitchDesktops(int delta)
}
}
-void KDesktop::handleColorDropEvent(QDropEvent * e)
+void KDesktop::handleColorDropEvent(TQDropEvent * e)
{
KPopupMenu popup;
popup.insertItem(SmallIconSet("colors"),i18n("Set as Primary Background Color"), 1);
popup.insertItem(SmallIconSet("colors"),i18n("Set as Secondary Background Color"), 2);
int result = popup.exec(e->pos());
- QColor c;
+ TQColor c;
KColorDrag::decode(e, c);
switch (result) {
case 1: bgMgr->setColor(c, true); break;
@@ -785,7 +785,7 @@ void KDesktop::handleColorDropEvent(QDropEvent * e)
bgMgr->setWallpaper(0,0);
}
-void KDesktop::handleImageDropEvent(QDropEvent * e)
+void KDesktop::handleImageDropEvent(TQDropEvent * e)
{
KPopupMenu popup;
if ( m_pIconView )
@@ -799,7 +799,7 @@ void KDesktop::handleImageDropEvent(QDropEvent * e)
if (result == 1)
{
bool ok = true;
- QString filename = KInputDialog::getText(QString::null, i18n("Enter a name for the image below:"), QString::null, &ok, m_pIconView);
+ TQString filename = KInputDialog::getText(TQString::null, i18n("Enter a name for the image below:"), TQString::null, &ok, m_pIconView);
if (!ok)
{
@@ -815,9 +815,9 @@ void KDesktop::handleImageDropEvent(QDropEvent * e)
filename += ".png";
}
- QImage i;
- QImageDrag::decode(e, i);
- KTempFile tmpFile(QString::null, filename);
+ TQImage i;
+ TQImageDrag::decode(e, i);
+ KTempFile tmpFile(TQString::null, filename);
i.save(tmpFile.name(), "PNG");
// We pass 0 as parent window because passing the desktop is not a good idea
KURL src;
@@ -829,8 +829,8 @@ void KDesktop::handleImageDropEvent(QDropEvent * e)
}
else if (result == 2)
{
- QImage i;
- QImageDrag::decode(e, i);
+ TQImage i;
+ TQImageDrag::decode(e, i);
KTempFile tmpFile(KGlobal::dirs()->saveLocation("wallpaper"), ".png");
i.save(tmpFile.name(), "PNG");
kdDebug(1204) << "KDesktop::contentsDropEvent " << tmpFile.name() << endl;
@@ -847,9 +847,9 @@ void KDesktop::slotNewWallpaper(const KURL &url)
else
{
// Figure out extension
- QString fileName = url.fileName();
- QFileInfo fileInfo( fileName );
- QString ext = fileInfo.extension();
+ TQString fileName = url.fileName();
+ TQFileInfo fileInfo( fileName );
+ TQString ext = fileInfo.extension();
// Store tempfile in a place where it will still be available after a reboot
KTempFile tmpFile( KGlobal::dirs()->saveLocation("wallpaper"), "." + ext );
KURL localURL; localURL.setPath( tmpFile.name() );
@@ -948,16 +948,16 @@ void KDesktop::desktopResized()
m_pIconView->resize(kapp->desktop()->size());
// get new desktopIconsArea from kicker
- QByteArray data, result;
- QDataStream arg(data, IO_WriteOnly);
+ TQByteArray data, result;
+ TQDataStream arg(data, IO_WriteOnly);
arg << kdesktop_screen_number;
- QCString replyType;
- QRect area;
+ TQCString replyType;
+ TQRect area;
if ( kapp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
data, replyType, result, false, 2000) )
{
- QDataStream res(result, IO_ReadOnly);
+ TQDataStream res(result, IO_ReadOnly);
res >> area;
}
else
@@ -976,14 +976,14 @@ void KDesktop::switchDesktops( int delta )
m_bWheelSwitchesWorkspace = old;
}
-bool KDesktop::event(QEvent * e)
+bool KDesktop::event(TQEvent * e)
{
- if ( e->type() == QEvent::WindowDeactivate)
+ if ( e->type() == TQEvent::WindowDeactivate)
{
if (m_pIconView)
m_pIconView->clearSelection();
}
- return QWidget::event(e);
+ return TQWidget::event(e);
}
#include "desktop.moc"
diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h
index 0407fbe4f..0ad57ce7b 100644
--- a/kdesktop/desktop.h
+++ b/kdesktop/desktop.h
@@ -22,8 +22,8 @@
#include "KDesktopIface.h"
-#include <qwidget.h>
-#include <qstringlist.h>
+#include <tqwidget.h>
+#include <tqstringlist.h>
#include <kapplication.h> // for logout parameters
@@ -45,11 +45,11 @@ class KRootWidget : public QObject
Q_OBJECT
public:
KRootWidget();
- bool eventFilter( QObject *, QEvent * e );
+ bool eventFilter( TQObject *, TQEvent * e );
signals:
void wheelRolled( int delta );
- void colorDropEvent( QDropEvent* e );
- void imageDropEvent( QDropEvent* e );
+ void colorDropEvent( TQDropEvent* e );
+ void imageDropEvent( TQDropEvent* e );
void newWallpaper( const KURL& url );
};
@@ -58,7 +58,7 @@ signals:
* It handles the background, the screensaver and all the rest of the global stuff.
* The icon view is a child widget of KDesktop.
*/
-class KDesktop : public QWidget, virtual public KDesktopIface
+class KDesktop : public TQWidget, virtual public KDesktopIface
{
Q_OBJECT
@@ -75,11 +75,11 @@ public:
virtual void selectAll();
virtual void unselectAll();
virtual void refreshIcons();
- virtual QStringList selectedURLs();
+ virtual TQStringList selectedURLs();
virtual void configure();
virtual void popupExecuteCommand();
- virtual void popupExecuteCommand(const QString& content);
+ virtual void popupExecuteCommand(const TQString& content);
virtual void refresh();
virtual void logout();
virtual void clearCommandHistory();
@@ -87,7 +87,7 @@ public:
virtual void switchDesktops( int delta );
- virtual void desktopIconsAreaChanged(const QRect &area, int screen);
+ virtual void desktopIconsAreaChanged(const TQRect &area, int screen);
void logout( KApplication::ShutdownConfirm confirm, KApplication::ShutdownType sdtype );
@@ -141,8 +141,8 @@ private slots:
void slotSetVRoot();
/** Connected to KDIconView */
- void handleImageDropEvent( QDropEvent * );
- void handleColorDropEvent( QDropEvent * );
+ void handleImageDropEvent( TQDropEvent * );
+ void handleColorDropEvent( TQDropEvent * );
void slotNewWallpaper(const KURL &url);
/** Connected to KDIconView and KRootWidget */
@@ -155,14 +155,14 @@ protected:
void initConfig();
void initRoot();
- virtual void closeEvent(QCloseEvent *e);
+ virtual void closeEvent(TQCloseEvent *e);
virtual bool isVRoot() { return set_vroot; }
virtual void setVRoot( bool enable );
virtual bool isIconsEnabled() { return m_bDesktopEnabled; }
virtual void setIconsEnabled( bool enable );
- virtual bool event ( QEvent * e );
+ virtual bool event ( TQEvent * e );
private slots:
void desktopResized();
@@ -195,7 +195,7 @@ private:
/** Whether or not to switch desktops when mouse wheel is rolled */
bool m_bWheelSwitchesWorkspace;
- QTimer *m_waitForKicker;
+ TQTimer *m_waitForKicker;
/** Default mouse wheel direction (Fwd means mwheel up switches to
lower desktop)
diff --git a/kdesktop/init.cc b/kdesktop/init.cc
index c0c2502d5..27441b170 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cc
@@ -29,9 +29,9 @@
#include <kdebug.h>
#include <kdesktopsettings.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qregexp.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqregexp.h>
#include <sys/stat.h>
#include <sys/types.h>
@@ -52,20 +52,20 @@ extern int kdesktop_screen_number;
* @param _showMsg show a message box if we created the dir
* @return true if the dir was just created (e.g. so that we can populate it)
*/
-static bool testDir( const QString &_name )
+static bool testDir( const TQString &_name )
{
DIR *dp;
- dp = opendir( QFile::encodeName(_name) );
+ dp = opendir( TQFile::encodeName(_name) );
if ( dp == NULL )
{
- QString m = _name;
+ TQString m = _name;
if ( m.endsWith( "/" ) )
m.truncate( m.length() - 1 );
- QCString path = QFile::encodeName(m);
+ TQCString path = TQFile::encodeName(m);
bool ok = ::mkdir( path, S_IRWXU ) == 0;
if ( !ok && errno == EEXIST ) {
- int ret = KMessageBox::warningYesNo( 0, i18n("%1 is a file, but KDE needs it to be a directory; move it to %2.orig and create directory?").arg(m).arg(m), QString::null, i18n("Move It"), i18n("Do Not Move") );
+ int ret = KMessageBox::warningYesNo( 0, i18n("%1 is a file, but KDE needs it to be a directory; move it to %2.orig and create directory?").arg(m).arg(m), TQString::null, i18n("Move It"), i18n("Do Not Move") );
if ( ret == KMessageBox::Yes ) {
if ( ::rename( path, path + ".orig" ) == 0 ) {
ok = ::mkdir( path, S_IRWXU ) == 0;
@@ -97,32 +97,32 @@ static bool testDir( const QString &_name )
* @param dir destination directory
* @param force if false, don't copy if destination file already exists
*/
-static void copyDirectoryFile(const QString &fileName, const QString& dir, bool force)
+static void copyDirectoryFile(const TQString &fileName, const TQString& dir, bool force)
{
- if (force || !QFile::exists(dir + "/.directory")) {
- QString cmd = "cp ";
- cmd += KProcess::quote(locate("data", QString("kdesktop/") + fileName));
+ if (force || !TQFile::exists(dir + "/.directory")) {
+ TQString cmd = "cp ";
+ cmd += KProcess::quote(locate("data", TQString("kdesktop/") + fileName));
cmd += " ";
cmd += KProcess::quote(dir+"/.directory");
- system( QFile::encodeName(cmd) );
+ system( TQFile::encodeName(cmd) );
}
}
-static void copyFile( const QString& src, const QString& dest )
+static void copyFile( const TQString& src, const TQString& dest )
{
- QCString cmd = "cp ";
- cmd += QFile::encodeName(KProcess::quote(src));
+ TQCString cmd = "cp ";
+ cmd += TQFile::encodeName(KProcess::quote(src));
cmd += " ";
- cmd += QFile::encodeName(KProcess::quote(dest));
+ cmd += TQFile::encodeName(KProcess::quote(dest));
system( cmd );
}
-static QString realDesktopPath()
+static TQString realDesktopPath()
{
- QString desktopPath = KGlobalSettings::desktopPath();
+ TQString desktopPath = KGlobalSettings::desktopPath();
if (kdesktop_screen_number != 0) {
- QString dn = "Desktop";
- dn += QString::number(kdesktop_screen_number);
+ TQString dn = "Desktop";
+ dn += TQString::number(kdesktop_screen_number);
desktopPath.replace("Desktop", dn);
}
return desktopPath;
@@ -139,12 +139,12 @@ static void copyDesktopLinks()
if (!config->readBoolEntry("CopyDesktopLinks", true))
return;
- QStringList list =
+ TQStringList list =
KGlobal::dirs()->findAllResources("appdata", "DesktopLinks/*", false, true);
- QString desktopPath = realDesktopPath();
+ TQString desktopPath = realDesktopPath();
- for (QStringList::ConstIterator it = list.begin(); it != list.end(); it++) {
+ for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++) {
KDesktopFile desk( *it );
if (desk.readBoolEntry("Hidden"))
continue;
@@ -191,7 +191,7 @@ void testLocalInstallation()
{
const bool newRelease = isNewRelease();
- const QString desktopPath = realDesktopPath();
+ const TQString desktopPath = realDesktopPath();
const bool emptyDesktop = testDir( desktopPath );
// Do not force copying that one (it would lose the icon positions)
@@ -205,13 +205,13 @@ void testLocalInstallation()
copyDesktopLinks();
// Take care of creating or updating trash.desktop
- const QString trashDir = KGlobal::dirs()->localxdgdatadir() + "Trash";
- const bool firstTimeWithNewTrash = !QFile::exists( trashDir );
- const QString trashDesktopPath = desktopPath + "/trash.desktop";
- const bool trashDesktopExists = QFile::exists( trashDesktopPath );
+ const TQString trashDir = KGlobal::dirs()->localxdgdatadir() + "Trash";
+ const bool firstTimeWithNewTrash = !TQFile::exists( trashDir );
+ const TQString trashDesktopPath = desktopPath + "/trash.desktop";
+ const bool trashDesktopExists = TQFile::exists( trashDesktopPath );
const bool installNewTrashi18n = newRelease && trashDesktopExists; // not if deleted by user
if ( emptyDesktop || firstTimeWithNewTrash || installNewTrashi18n ) {
- QString oldIcon, oldEmptyIcon;
+ TQString oldIcon, oldEmptyIcon;
if ( trashDesktopExists ) {
KDesktopFile trashDesktop( trashDesktopPath, true );
oldIcon = trashDesktop.readIcon();
@@ -227,8 +227,8 @@ void testLocalInstallation()
}
if ( firstTimeWithNewTrash ) { // migrate pre-kde-3.4 trash contents
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)2;
KIO::Job* job = KIO::special( "trash:/", packedArgs );
(void)KIO::NetAccess::synchronousRun( job, 0 );
@@ -236,9 +236,9 @@ void testLocalInstallation()
// OK the only thing missing is to convert the icon position...
KSimpleConfig cfg( locateLocal("appdata", "IconPositions") );
if ( cfg.hasGroup( "IconPosition::Trash" ) && !cfg.hasGroup( "IconPosition::trash.desktop" ) ) {
- const QMap<QString, QString> entries = cfg.entryMap( "IconPosition::Trash" );
+ const TQMap<TQString, TQString> entries = cfg.entryMap( "IconPosition::Trash" );
cfg.setGroup( "IconPosition::trash.desktop" );
- for( QMap<QString,QString>::ConstIterator it = entries.begin(); it != entries.end(); ++it ) {
+ for( TQMap<TQString,TQString>::ConstIterator it = entries.begin(); it != entries.end(); ++it ) {
cfg.writeEntry( it.key(), it.data() );
}
}
diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cc
index 675dab098..1d39a093d 100644
--- a/kdesktop/kcustommenu.cc
+++ b/kdesktop/kcustommenu.cc
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qimage.h>
-#include <qregexp.h>
+#include <tqimage.h>
+#include <tqregexp.h>
#include <kconfig.h>
#include <kiconloader.h>
@@ -29,11 +29,11 @@
class KCustomMenu::KCustomMenuPrivate
{
public:
- QMap<int,KService::Ptr> entryMap;
+ TQMap<int,KService::Ptr> entryMap;
};
-KCustomMenu::KCustomMenu(const QString &configfile, QWidget *parent)
- : QPopupMenu(parent, "kcustom_menu")
+KCustomMenu::KCustomMenu(const TQString &configfile, TQWidget *parent)
+ : TQPopupMenu(parent, "kcustom_menu")
{
d = new KCustomMenuPrivate;
@@ -41,7 +41,7 @@ KCustomMenu::KCustomMenu(const QString &configfile, QWidget *parent)
int count = cfg.readNumEntry("NrOfItems");
for(int i = 0; i < count; i++)
{
- QString entry = cfg.readEntry(QString("Item%1").arg(i+1));
+ TQString entry = cfg.readEntry(TQString("Item%1").arg(i+1));
if (entry.isEmpty())
continue;
@@ -57,7 +57,7 @@ KCustomMenu::KCustomMenu(const QString &configfile, QWidget *parent)
insertMenuItem( menuItem, -1 );
}
- connect(this, SIGNAL(activated(int)), this, SLOT(slotActivated(int)));
+ connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
}
KCustomMenu::~KCustomMenu()
@@ -78,31 +78,31 @@ KCustomMenu::slotActivated(int id)
void
KCustomMenu::insertMenuItem(KService::Ptr & s, int nId, int nIndex/*= -1*/)
{
- QString serviceName = s->name();
+ TQString serviceName = s->name();
// item names may contain ampersands. To avoid them being converted
// to accelators, replace them with two ampersands.
serviceName.replace("&", "&&");
- QPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
+ TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
0, KIcon::DefaultState, 0L, true);
- QPixmap active = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
+ TQPixmap active = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
0, KIcon::ActiveState, 0L, true);
// make sure they are not larger than 16x16
if (normal.width() > 16 || normal.height() > 16) {
- QImage tmp = normal.convertToImage();
+ TQImage tmp = normal.convertToImage();
tmp = tmp.smoothScale(16, 16);
normal.convertFromImage(tmp);
}
if (active.width() > 16 || active.height() > 16) {
- QImage tmp = active.convertToImage();
+ TQImage tmp = active.convertToImage();
tmp = tmp.smoothScale(16, 16);
active.convertFromImage(tmp);
}
- QIconSet iconset;
- iconset.setPixmap(normal, QIconSet::Small, QIconSet::Normal);
- iconset.setPixmap(active, QIconSet::Small, QIconSet::Active);
+ TQIconSet iconset;
+ iconset.setPixmap(normal, TQIconSet::Small, TQIconSet::Normal);
+ iconset.setPixmap(active, TQIconSet::Small, TQIconSet::Active);
int newId = insertItem(iconset, serviceName, nId, nIndex);
d->entryMap.insert(newId, s);
diff --git a/kdesktop/kcustommenu.h b/kdesktop/kcustommenu.h
index 3a678ae7a..602a09584 100644
--- a/kdesktop/kcustommenu.h
+++ b/kdesktop/kcustommenu.h
@@ -20,7 +20,7 @@
#ifndef __kcustommenu_h__
#define __kcustommenu_h__
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
#include <kservice.h>
/*
@@ -34,7 +34,7 @@ public:
/**
* Create a custome menu described by @p configfile.
*/
- KCustomMenu(const QString &configfile, QWidget *parent=0);
+ KCustomMenu(const TQString &configfile, TQWidget *parent=0);
/**
* Destructor
diff --git a/kdesktop/kdesktopbindings.cpp b/kdesktop/kdesktopbindings.cpp
index c50eb7c30..4e46a2013 100644
--- a/kdesktop/kdesktopbindings.cpp
+++ b/kdesktop/kdesktopbindings.cpp
@@ -1,13 +1,13 @@
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4, this, SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) )
# define DEF2( name, key3, key4, receiver, slot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4, receiver, slot );
+ keys->insert( name, i18n(name), TQString::null, key3, key4, receiver, slot );
#else
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4 )
+ keys->insert( name, i18n(name), TQString::null, key3, key4 )
# define DEF2( name, key3, key4, receiver, slot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4 )
+ keys->insert( name, i18n(name), TQString::null, key3, key4 )
#endif
#define WIN KKey::QtWIN
@@ -28,7 +28,7 @@
if (kapp->authorize("lock_screen"))
{
#endif
- DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+Qt::Key_L, WIN+Qt::Key_ScrollLock, KRootWm::self(), SLOT(slotLock()) );
+ DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+Qt::Key_L, WIN+Qt::Key_ScrollLock, KRootWm::self(), TQT_SLOT(slotLock()) );
#ifndef NOSLOTS
}
if (kapp->authorize("logout"))
diff --git a/kdesktop/kdesktopshadowsettings.cpp b/kdesktop/kdesktopshadowsettings.cpp
index 8ebdc89a8..474d645b1 100644
--- a/kdesktop/kdesktopshadowsettings.cpp
+++ b/kdesktop/kdesktopshadowsettings.cpp
@@ -21,7 +21,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <qcolor.h>
+#include <tqcolor.h>
#include <kdebug.h>
#include "kdesktopshadowsettings.h"
@@ -30,7 +30,7 @@
KDesktopShadowSettings::KDesktopShadowSettings(KConfig *cfg) :
KShadowSettings(),
- m_textColor(QColor(255,255,255)),
+ m_textColor(TQColor(255,255,255)),
_UID(0L)
{
setConfig(cfg);
diff --git a/kdesktop/kdesktopshadowsettings.h b/kdesktop/kdesktopshadowsettings.h
index 7ee3b1451..f97e703ca 100644
--- a/kdesktop/kdesktopshadowsettings.h
+++ b/kdesktop/kdesktopshadowsettings.h
@@ -23,7 +23,7 @@
#ifndef __FX_DATA_DESKTOP
#define __FX_DATA_DESKTOP
-#include <qcolor.h>
+#include <tqcolor.h>
#include <kstandarddirs.h>
#include <kconfig.h>
@@ -77,13 +77,13 @@ class KDesktopShadowSettings : public KShadowSettings
* Returns the text color as definied in the configuraiton
* @return the text color as definied in the configuraiton
*/
- QColor &textColor(){ return m_textColor; };
+ TQColor &textColor(){ return m_textColor; };
/**
* Returns the shadow color as definied in the configuraiton
* @return the shadow color as definied in the configuraiton
*/
- QColor &bgColor() { return m_bgColor; };
+ TQColor &bgColor() { return m_bgColor; };
/**
* Returns true if the shadow engine is enabled.
@@ -105,8 +105,8 @@ class KDesktopShadowSettings : public KShadowSettings
private:
KConfig *config;
- QColor m_textColor;
- QColor m_bgColor;
+ TQColor m_textColor;
+ TQColor m_bgColor;
bool m_isEnabled;
// uid of the object. Use this to determine the oportunity of a new
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index b143dc231..caa68feb9 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -48,10 +48,10 @@
#include <fixx11h.h>
-#include <qclipboard.h>
-#include <qdir.h>
-#include <qevent.h>
-#include <qregexp.h>
+#include <tqclipboard.h>
+#include <tqdir.h>
+#include <tqevent.h>
+#include <tqregexp.h>
#include <unistd.h>
@@ -64,11 +64,11 @@ extern int kdesktop_screen_number;
// -----------------------------------------------------------------------------
-QRect KDIconView::desktopRect()
+TQRect KDIconView::desktopRect()
{
return ( kdesktop_screen_number == 0 )
- ? QApplication::desktop()->geometry() // simple case, or xinerama
- : QApplication::desktop()->screenGeometry( kdesktop_screen_number ); // multi-head
+ ? TQApplication::desktop()->geometry() // simple case, or xinerama
+ : TQApplication::desktop()->screenGeometry( kdesktop_screen_number ); // multi-head
}
// -----------------------------------------------------------------------------
@@ -80,8 +80,8 @@ void KDIconView::saveIconPosition(KSimpleConfig *config, int x, int y)
config->writeEntry("Yabs", y);
// save also mentioning desktop size
- QRect desk = desktopRect();
- QString sizeStr = QString( "_%1x%2" ).arg(desk.width()).arg(desk.height());
+ TQRect desk = desktopRect();
+ TQString sizeStr = TQString( "_%1x%2" ).arg(desk.width()).arg(desk.height());
config->writeEntry("Xabs" + sizeStr, x);
config->writeEntry("Yabs" + sizeStr, y);
@@ -92,8 +92,8 @@ void KDIconView::saveIconPosition(KSimpleConfig *config, int x, int y)
void KDIconView::readIconPosition(KSimpleConfig *config, int &x, int &y)
{
// check if we have the position for the current desktop size
- QRect desk = desktopRect();
- QString sizeStr = QString( "_%1x%2" ).arg(desk.width()).arg(desk.height());
+ TQRect desk = desktopRect();
+ TQString sizeStr = TQString( "_%1x%2" ).arg(desk.width()).arg(desk.height());
x = config->readNumEntry("Xabs" + sizeStr, -99999);
@@ -112,9 +112,9 @@ void KDIconView::readIconPosition(KSimpleConfig *config, int &x, int &y)
// desktopIconsArea, the relative position do not make sense
// workaround: use desktopRect() as the allowed size
- QRect desk = desktopRect();
- QString X_w = QString("X %1").arg(desk.width() );
- QString Y_h = QString("Y %1").arg(desk.height());
+ TQRect desk = desktopRect();
+ TQString X_w = TQString("X %1").arg(desk.width() );
+ TQString Y_h = TQString("Y %1").arg(desk.height());
x = config->readNumEntry(X_w, -99999);
if ( x != -99999 ) x = config->readNumEntry("X");
@@ -129,7 +129,7 @@ void KDIconView::readIconPosition(KSimpleConfig *config, int &x, int &y)
// -----------------------------------------------------------------------------
-KDIconView::KDIconView( QWidget *parent, const char* name )
+KDIconView::KDIconView( TQWidget *parent, const char* name )
: KonqIconViewWidget( parent, name, WResizeNoErase, true ),
m_actionCollection( this, "KDIconView::m_actionCollection" ),
m_accel( 0L ),
@@ -155,33 +155,33 @@ KDIconView::KDIconView( QWidget *parent, const char* name )
// Initialise the shadow data objects...
m_shadowEngine = new KShadowEngine(new KDesktopShadowSettings(KGlobal::config()));
- connect( QApplication::clipboard(), SIGNAL(dataChanged()),
- this, SLOT(slotClipboardDataChanged()) );
+ connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()),
+ this, TQT_SLOT(slotClipboardDataChanged()) );
setURL( desktopURL() ); // sets m_url
m_desktopDirs = KGlobal::dirs()->findDirs( "appdata", "Desktop" );
initDotDirectories();
- connect( this, SIGNAL( executed( QIconViewItem * ) ),
- SLOT( slotExecuted( QIconViewItem * ) ) );
- connect( this, SIGNAL( returnPressed( QIconViewItem * ) ),
- SLOT( slotReturnPressed( QIconViewItem * ) ) );
- connect( this, SIGNAL( mouseButtonPressed(int, QIconViewItem*, const QPoint&)),
- SLOT( slotMouseButtonPressed(int, QIconViewItem*, const QPoint&)) );
- connect( this, SIGNAL( mouseButtonClicked(int, QIconViewItem*, const QPoint&)),
- SLOT( slotMouseButtonClickedKDesktop(int, QIconViewItem*, const QPoint&)) );
- connect( this, SIGNAL( contextMenuRequested(QIconViewItem*, const QPoint&)),
- SLOT( slotContextMenuRequested(QIconViewItem*, const QPoint&)) );
+ connect( this, TQT_SIGNAL( executed( TQIconViewItem * ) ),
+ TQT_SLOT( slotExecuted( TQIconViewItem * ) ) );
+ connect( this, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ),
+ TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
+ connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)),
+ TQT_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) );
+ connect( this, TQT_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)),
+ TQT_SLOT( slotMouseButtonClickedKDesktop(int, TQIconViewItem*, const TQPoint&)) );
+ connect( this, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)),
+ TQT_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) );
- connect( this, SIGNAL( enableAction( const char * , bool ) ),
- SLOT( slotEnableAction( const char * , bool ) ) );
+ connect( this, TQT_SIGNAL( enableAction( const char * , bool ) ),
+ TQT_SLOT( slotEnableAction( const char * , bool ) ) );
// Hack: KonqIconViewWidget::slotItemRenamed is not virtual :-(
- disconnect( this, SIGNAL(itemRenamed(QIconViewItem *, const QString &)),
- this, SLOT(slotItemRenamed(QIconViewItem *, const QString &)) );
- connect( this, SIGNAL(itemRenamed(QIconViewItem *, const QString &)),
- this, SLOT(slotItemRenamed(QIconViewItem *, const QString &)) );
+ disconnect( this, TQT_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)),
+ this, TQT_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
+ connect( this, TQT_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)),
+ this, TQT_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
if (!m_bEditableDesktopIcons)
{
@@ -203,15 +203,15 @@ KDIconView::~KDIconView()
void KDIconView::initDotDirectories()
{
- QStringList dirs = m_desktopDirs;
+ TQStringList dirs = m_desktopDirs;
KURL u = desktopURL();
if (u.isLocalFile())
dirs.prepend(u.path());
- QString prefix = iconPositionGroupPrefix();
- QString dotFileName = locateLocal("appdata", "IconPositions");
+ TQString prefix = iconPositionGroupPrefix();
+ TQString dotFileName = locateLocal("appdata", "IconPositions");
if (kdesktop_screen_number != 0)
- dotFileName += "_Desktop" + QString::number(kdesktop_screen_number);
+ dotFileName += "_Desktop" + TQString::number(kdesktop_screen_number);
if (m_dotDirectory && !m_bEditableDesktopIcons)
m_dotDirectory->rollback(false); // Don't save positions
@@ -222,29 +222,29 @@ void KDIconView::initDotDirectories()
// If we don't allow editable desktop icons, empty m_dotDirectory
if (!m_bEditableDesktopIcons)
{
- QStringList groups = m_dotDirectory->groupList();
- QStringList::ConstIterator gIt = groups.begin();
- QStringList::ConstIterator gEnd = groups.end();
+ TQStringList groups = m_dotDirectory->groupList();
+ TQStringList::ConstIterator gIt = groups.begin();
+ TQStringList::ConstIterator gEnd = groups.end();
for (; gIt != gEnd; ++gIt )
{
m_dotDirectory->deleteGroup(*gIt, true);
}
}
- QRect desk = desktopRect();
- QString X_w = QString( "X %1" ).arg( desk.width() );
- QString Y_h = QString( "Y %1" ).arg( desk.height() );
- for ( QStringList::ConstIterator it = dirs.begin() ; it != dirs.end() ; ++it )
+ TQRect desk = desktopRect();
+ TQString X_w = TQString( "X %1" ).arg( desk.width() );
+ TQString Y_h = TQString( "Y %1" ).arg( desk.height() );
+ for ( TQStringList::ConstIterator it = dirs.begin() ; it != dirs.end() ; ++it )
{
kdDebug(1204) << "KDIconView::initDotDirectories found dir " << *it << endl;
- QString dotFileName = *it + "/.directory";
+ TQString dotFileName = *it + "/.directory";
- if (QFile::exists(dotFileName))
+ if (TQFile::exists(dotFileName))
{
KSimpleConfig dotDir(dotFileName, true); // Read only
- QStringList groups = dotDir.groupList();
- QStringList::ConstIterator gIt = groups.begin();
- QStringList::ConstIterator gEnd = groups.end();
+ TQStringList groups = dotDir.groupList();
+ TQStringList::ConstIterator gIt = groups.begin();
+ TQStringList::ConstIterator gEnd = groups.end();
for (; gIt != gEnd; ++gIt )
{
if ( (*gIt).startsWith(prefix) )
@@ -284,7 +284,7 @@ void KDIconView::initConfig( bool init )
setMaySetWallpaper(!config->isImmutable() && !KGlobal::dirs()->isRestrictedResource("wallpaper"));
m_bShowDot = KDesktopSettings::showHidden();
m_bVertAlign = KDesktopSettings::vertAlign();
- QStringList oldPreview = previewSettings();
+ TQStringList oldPreview = previewSettings();
setPreviewSettings( KDesktopSettings::preview() );
// read arrange configuration
@@ -292,13 +292,13 @@ void KDIconView::initConfig( bool init )
m_bSortDirectoriesFirst = KDesktopSettings::directoriesFirst();
m_itemsAlwaysFirst = KDesktopSettings::alwaysFirstItems(); // Distributor plug-in
- if (KProtocolInfo::isKnownProtocol(QString::fromLatin1("media")))
+ if (KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media")))
m_enableMedia=KDesktopSettings::mediaEnabled();
else
m_enableMedia=false;
- QString tmpList=KDesktopSettings::exclude();
+ TQString tmpList=KDesktopSettings::exclude();
kdDebug(1204)<<"m_excludeList"<<tmpList<<endl;
- m_excludedMedia=QStringList::split(",",tmpList,false);
+ m_excludedMedia=TQStringList::split(",",tmpList,false);
kdDebug(1204)<<" m_excludeList / item count:" <<m_excludedMedia.count()<<endl;
if ( m_dirLister ) // only when called while running - not on first startup
{
@@ -316,7 +316,7 @@ void KDIconView::initConfig( bool init )
if ( previewSettings().count() )
{
- for ( QStringList::ConstIterator it = oldPreview.begin(); it != oldPreview.end(); ++it)
+ for ( TQStringList::ConstIterator it = oldPreview.begin(); it != oldPreview.end(); ++it)
if ( !previewSettings().contains( *it ) ){
kdDebug(1204) << "Disabling preview for " << *it << endl;
if ( *it == "audio/" )
@@ -331,7 +331,7 @@ void KDIconView::initConfig( bool init )
}
}
}
- startImagePreview( QStringList(), true );
+ startImagePreview( TQStringList(), true );
}
else
{
@@ -357,16 +357,16 @@ void KDIconView::start()
m_bNeedSave = false;
- connect( m_dirLister, SIGNAL( clear() ), this, SLOT( slotClear() ) );
- connect( m_dirLister, SIGNAL( started(const KURL&) ),
- this, SLOT( slotStarted(const KURL&) ) );
- connect( m_dirLister, SIGNAL( completed() ), this, SLOT( slotCompleted() ) );
- connect( m_dirLister, SIGNAL( newItems( const KFileItemList & ) ),
- this, SLOT( slotNewItems( const KFileItemList & ) ) );
- connect( m_dirLister, SIGNAL( deleteItem( KFileItem * ) ),
- this, SLOT( slotDeleteItem( KFileItem * ) ) );
- connect( m_dirLister, SIGNAL( refreshItems( const KFileItemList & ) ),
- this, SLOT( slotRefreshItems( const KFileItemList & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( clear() ), this, TQT_SLOT( slotClear() ) );
+ connect( m_dirLister, TQT_SIGNAL( started(const KURL&) ),
+ this, TQT_SLOT( slotStarted(const KURL&) ) );
+ connect( m_dirLister, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) );
+ connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ),
+ this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
+ this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
+ connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ),
+ this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) );
// Start the directory lister !
m_dirLister->setShowingDotFiles( m_bShowDot );
@@ -414,35 +414,35 @@ void KDIconView::createActions()
{
if (m_bEditableDesktopIcons)
{
- KAction *undo = KStdAction::undo( KonqUndoManager::self(), SLOT( undo() ), &m_actionCollection, "undo" );
- connect( KonqUndoManager::self(), SIGNAL( undoAvailable( bool ) ),
- undo, SLOT( setEnabled( bool ) ) );
- connect( KonqUndoManager::self(), SIGNAL( undoTextChanged( const QString & ) ),
- undo, SLOT( setText( const QString & ) ) );
+ KAction *undo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), &m_actionCollection, "undo" );
+ connect( KonqUndoManager::self(), TQT_SIGNAL( undoAvailable( bool ) ),
+ undo, TQT_SLOT( setEnabled( bool ) ) );
+ connect( KonqUndoManager::self(), TQT_SIGNAL( undoTextChanged( const TQString & ) ),
+ undo, TQT_SLOT( setText( const TQString & ) ) );
undo->setEnabled( KonqUndoManager::self()->undoAvailable() );
- KAction* paCut = KStdAction::cut( this, SLOT( slotCut() ), &m_actionCollection, "cut" );
+ KAction* paCut = KStdAction::cut( this, TQT_SLOT( slotCut() ), &m_actionCollection, "cut" );
KShortcut cutShortCut = paCut->shortcut();
cutShortCut.remove( KKey( SHIFT + Key_Delete ) ); // used for deleting files
paCut->setShortcut( cutShortCut );
- KStdAction::copy( this, SLOT( slotCopy() ), &m_actionCollection, "copy" );
- KStdAction::paste( this, SLOT( slotPaste() ), &m_actionCollection, "paste" );
- KAction *pasteTo = KStdAction::paste( this, SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
+ KStdAction::copy( this, TQT_SLOT( slotCopy() ), &m_actionCollection, "copy" );
+ KStdAction::paste( this, TQT_SLOT( slotPaste() ), &m_actionCollection, "paste" );
+ KAction *pasteTo = KStdAction::paste( this, TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
pasteTo->setEnabled( false ); // only enabled during popupMenu()
KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload);
- new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, SLOT( refreshIcons() ), &m_actionCollection, "reload" );
+ new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" );
- (void) new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, this, SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
- (void) new KAction( i18n( "&Properties" ), ALT+Key_Return, this, SLOT( slotProperties() ), &m_actionCollection, "properties" );
+ (void) new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, this, TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
+ (void) new KAction( i18n( "&Properties" ), ALT+Key_Return, this, TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" );
KAction* trash = new KAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" );
- connect( trash, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
- this, SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) );
+ connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
+ this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) );
KConfig config("kdeglobals", true, false);
config.setGroup( "KDE" );
- (void) new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, this, SLOT( slotDelete() ), &m_actionCollection, "del" );
+ (void) new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, this, TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
// Initial state of the actions (cut/copy/paste/...)
slotSelectionChanged();
@@ -464,10 +464,10 @@ void KDIconView::rearrangeIcons()
sort(); // calls arrangeItemsInGrid() which does not honor iconArea()
if ( m_autoAlign )
- lineupIcons( m_bVertAlign ? QIconView::TopToBottom : QIconView::LeftToRight ); // also saves position
+ lineupIcons( m_bVertAlign ? TQIconView::TopToBottom : TQIconView::LeftToRight ); // also saves position
else
{
- KonqIconViewWidget::lineupIcons(m_bVertAlign ? QIconView::TopToBottom : QIconView::LeftToRight);
+ KonqIconViewWidget::lineupIcons(m_bVertAlign ? TQIconView::TopToBottom : TQIconView::LeftToRight);
saveIconPositions();
}
}
@@ -486,8 +486,8 @@ void KDIconView::setAutoAlign( bool b )
// Auto line-up icons
if ( b ) {
if (!KRootWm::self()->startup) lineupIcons(); else KRootWm::self()->startup = false;
- connect( this, SIGNAL( iconMoved() ),
- this, SLOT( lineupIcons() ) );
+ connect( this, TQT_SIGNAL( iconMoved() ),
+ this, TQT_SLOT( lineupIcons() ) );
}
else {
// change maxItemWidth, because when grid-align was active, it changed this for the grid
@@ -495,8 +495,8 @@ void KDIconView::setAutoAlign( bool b )
setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
setFont( font() ); // Force calcRect()
- disconnect( this, SIGNAL( iconMoved() ),
- this, SLOT( lineupIcons() ) );
+ disconnect( this, TQT_SIGNAL( iconMoved() ),
+ this, TQT_SLOT( lineupIcons() ) );
}
}
@@ -510,7 +510,7 @@ void KDIconView::startDirLister()
// Gather the list of directories to merge into the desktop
// (the main URL is desktopURL(), no need for it in the m_mergeDirs list)
m_mergeDirs.clear();
- for ( QStringList::ConstIterator it = m_desktopDirs.begin() ; it != m_desktopDirs.end() ; ++it )
+ for ( TQStringList::ConstIterator it = m_desktopDirs.begin() ; it != m_desktopDirs.end() ; ++it )
{
kdDebug(1204) << "KDIconView::desktopResized found merge dir " << *it << endl;
KURL u;
@@ -523,9 +523,9 @@ void KDIconView::startDirLister()
configureMedia();
}
-void KDIconView::lineupIcons(QIconView::Arrangement align)
+void KDIconView::lineupIcons(TQIconView::Arrangement align)
{
- m_bVertAlign = ( align == QIconView::TopToBottom );
+ m_bVertAlign = ( align == TQIconView::TopToBottom );
setArrangement( m_bVertAlign ? TopToBottom : LeftToRight );
if ( m_autoAlign )
@@ -541,11 +541,11 @@ void KDIconView::lineupIcons(QIconView::Arrangement align)
}
// Only used for DCOP
-QStringList KDIconView::selectedURLs()
+TQStringList KDIconView::selectedURLs()
{
- QStringList seq;
+ TQStringList seq;
- QIconViewItem *it = firstItem();
+ TQIconViewItem *it = firstItem();
for (; it; it = it->nextItem() )
if ( it->isSelected() ) {
KFileItem *fItem = ((KFileIVI *)it)->item();
@@ -573,10 +573,10 @@ void KDIconView::recheckDesktopURL()
KURL KDIconView::desktopURL()
{
// Support both paths and URLs
- QString desktopPath = KGlobalSettings::desktopPath();
+ TQString desktopPath = KGlobalSettings::desktopPath();
if (kdesktop_screen_number != 0) {
- QString dn = "Desktop";
- dn += QString::number(kdesktop_screen_number);
+ TQString dn = "Desktop";
+ dn += TQString::number(kdesktop_screen_number);
desktopPath.replace("Desktop", dn);
}
@@ -589,21 +589,21 @@ KURL KDIconView::desktopURL()
Q_ASSERT( desktopURL.isValid() );
if ( !desktopURL.isValid() ) { // should never happen
KURL u;
- u.setPath( QDir::homeDirPath() + "/" + "Desktop" + "/" );
+ u.setPath( TQDir::homeDirPath() + "/" + "Desktop" + "/" );
return u;
}
return desktopURL;
}
-void KDIconView::contentsMousePressEvent( QMouseEvent *e )
+void KDIconView::contentsMousePressEvent( TQMouseEvent *e )
{
if (!m_dirLister) return;
//kdDebug(1204) << "KDIconView::contentsMousePressEvent" << endl;
- // QIconView, as of Qt 2.2, doesn't emit mouseButtonPressed for LMB on background
+ // TQIconView, as of Qt 2.2, doesn't emit mouseButtonPressed for LMB on background
if ( e->button() == LeftButton && KRootWm::self()->hasLeftButtonMenu() )
{
- QIconViewItem *item = findItem( e->pos() );
+ TQIconViewItem *item = findItem( e->pos() );
if ( !item )
{
// Left click menu
@@ -614,17 +614,17 @@ void KDIconView::contentsMousePressEvent( QMouseEvent *e )
KonqIconViewWidget::contentsMousePressEvent( e );
}
-void KDIconView::mousePressEvent( QMouseEvent *e )
+void KDIconView::mousePressEvent( TQMouseEvent *e )
{
KRootWm::self()->mousePressed( e->globalPos(), e->button() );
}
-void KDIconView::wheelEvent( QWheelEvent* e )
+void KDIconView::wheelEvent( TQWheelEvent* e )
{
if (!m_dirLister) return;
//kdDebug(1204) << "KDIconView::wheelEvent" << endl;
- QIconViewItem *item = findItem( e->pos() );
+ TQIconViewItem *item = findItem( e->pos() );
if ( !item )
{
emit wheelRolled( e->delta() );
@@ -644,7 +644,7 @@ void KDIconView::slotProperties()
(void) new KPropertiesDialog( selectedFiles );
}
-void KDIconView::slotContextMenuRequested(QIconViewItem *_item, const QPoint& _global)
+void KDIconView::slotContextMenuRequested(TQIconViewItem *_item, const TQPoint& _global)
{
if (_item)
{
@@ -653,16 +653,16 @@ void KDIconView::slotContextMenuRequested(QIconViewItem *_item, const QPoint& _g
}
}
-void KDIconView::slotMouseButtonPressed(int _button, QIconViewItem* _item, const QPoint& _global)
+void KDIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item, const TQPoint& _global)
{
//kdDebug(1204) << "KDIconView::slotMouseButtonPressed" << endl;
if (!m_dirLister) return;
- m_lastDeletedIconPos = QPoint(); // user action -> not renaming an icon
+ m_lastDeletedIconPos = TQPoint(); // user action -> not renaming an icon
if(!_item)
KRootWm::self()->mousePressed( _global, _button );
}
-void KDIconView::slotMouseButtonClickedKDesktop(int _button, QIconViewItem* _item, const QPoint&)
+void KDIconView::slotMouseButtonClickedKDesktop(int _button, TQIconViewItem* _item, const TQPoint&)
{
if (!m_dirLister) return;
//kdDebug(1204) << "KDIconView::slotMouseButtonClickedKDesktop" << endl;
@@ -672,7 +672,7 @@ void KDIconView::slotMouseButtonClickedKDesktop(int _button, QIconViewItem* _ite
// -----------------------------------------------------------------------------
-void KDIconView::slotReturnPressed( QIconViewItem *item )
+void KDIconView::slotReturnPressed( TQIconViewItem *item )
{
if (item && item->isSelected())
slotExecuted(item);
@@ -680,10 +680,10 @@ void KDIconView::slotReturnPressed( QIconViewItem *item )
// -----------------------------------------------------------------------------
-void KDIconView::slotExecuted( QIconViewItem *item )
+void KDIconView::slotExecuted( TQIconViewItem *item )
{
kapp->propagateSessionManager();
- m_lastDeletedIconPos = QPoint(); // user action -> not renaming an icon
+ m_lastDeletedIconPos = TQPoint(); // user action -> not renaming an icon
if (item) {
visualActivate(item);
((KFileIVI*)item)->returnPressed();
@@ -735,11 +735,11 @@ bool KDIconView::deleteGlobalDesktopFiles()
if (!desktop_URL.isLocalFile())
return false; // Dunno how to do this.
- QString desktopPath = desktop_URL.path();
+ TQString desktopPath = desktop_URL.path();
bool itemsLeft = false;
- QIconViewItem *it = 0;
- QIconViewItem *nextIt = firstItem();
+ TQIconViewItem *it = 0;
+ TQIconViewItem *nextIt = firstItem();
for (; (it = nextIt); )
{
nextIt = it->nextItem();
@@ -790,7 +790,7 @@ void KDIconView::slotDelete()
// This method is called when right-clicking over one or more items
// Not to be confused with the global popup-menu, KRootWm, when doing RMB on the desktop
-void KDIconView::popupMenu( const QPoint &_global, const KFileItemList& _items )
+void KDIconView::popupMenu( const TQPoint &_global, const KFileItemList& _items )
{
if (!kapp->authorize("action/kdesktop_rmb")) return;
if (!m_dirLister) return;
@@ -838,7 +838,7 @@ void KDIconView::slotNewMenuActivated()
void KDIconView::slotEnableAction( const char * name, bool enabled )
{
//kdDebug(1204) << "slotEnableAction " << name << " enabled=" << enabled << endl;
- QCString sName( name );
+ TQCString sName( name );
// No such actions here... konqpopupmenu provides them.
if ( sName == "properties" || sName == "editMimeType" )
return;
@@ -861,21 +861,21 @@ bool KDIconView::isDesktopFile( KFileItem * _item ) const
if ( !S_ISREG( _item->mode() ) )
return false;
- QString t( _item->url().path() );
+ TQString t( _item->url().path() );
// only if readable
- if ( access( QFile::encodeName(t), R_OK ) != 0 )
+ if ( access( TQFile::encodeName(t), R_OK ) != 0 )
return false;
// return true if desktop file
- return ( _item->mimetype() == QString::fromLatin1("application/x-desktop") );
+ return ( _item->mimetype() == TQString::fromLatin1("application/x-desktop") );
}
-QString KDIconView::stripDesktopExtension( const QString & text )
+TQString KDIconView::stripDesktopExtension( const TQString & text )
{
- if (text.right(7) == QString::fromLatin1(".kdelnk"))
+ if (text.right(7) == TQString::fromLatin1(".kdelnk"))
return text.left(text.length() - 7);
- else if (text.right(8) == QString::fromLatin1(".desktop"))
+ else if (text.right(8) == TQString::fromLatin1(".desktop"))
return text.left(text.length() - 8);
return text;
}
@@ -883,7 +883,7 @@ QString KDIconView::stripDesktopExtension( const QString & text )
bool KDIconView::makeFriendlyText( KFileIVI *fileIVI )
{
KFileItem *item = fileIVI->item();
- QString desktopFile;
+ TQString desktopFile;
if ( item->isDir() && item->isLocalFile() )
{
KURL u( item->url() );
@@ -908,7 +908,7 @@ bool KDIconView::makeFriendlyText( KFileIVI *fileIVI )
if (cfg.readBoolEntry( "NoDisplay", false ))
return false;
- QStringList tmpList;
+ TQStringList tmpList;
if (cfg.hasKey("OnlyShowIn"))
{
if (!cfg.readListEntry("OnlyShowIn", ';').contains("KDE"))
@@ -925,7 +925,7 @@ bool KDIconView::makeFriendlyText( KFileIVI *fileIVI )
return false;
}
- QString name = cfg.readEntry("Name");
+ TQString name = cfg.readEntry("Name");
if ( !name.isEmpty() )
fileIVI->setText( name );
else
@@ -950,10 +950,10 @@ void KDIconView::slotNewItems( const KFileItemList & entries )
// delay updates until all new items have been created
setUpdatesEnabled( false );
- QRect area = iconArea();
- setIconArea( QRect( 0, 0, -1, -1 ) );
+ TQRect area = iconArea();
+ setIconArea( TQRect( 0, 0, -1, -1 ) );
- QString desktopPath;
+ TQString desktopPath;
KURL desktop_URL = desktopURL();
if (desktop_URL.isLocalFile())
desktopPath = desktop_URL.path();
@@ -967,11 +967,11 @@ void KDIconView::slotNewItems( const KFileItemList & entries )
KURL url = it.current()->url();
if (!desktopPath.isEmpty() && url.isLocalFile() && !url.path().startsWith(desktopPath))
{
- QString fileName = url.fileName();
- if (QFile::exists(desktopPath + fileName))
+ TQString fileName = url.fileName();
+ if (TQFile::exists(desktopPath + fileName))
continue; // Don't duplicate entry
- QString mostLocal = locate("appdata", "Desktop/"+fileName);
+ TQString mostLocal = locate("appdata", "Desktop/"+fileName);
if (!mostLocal.isEmpty() && (mostLocal != url.path()))
continue; // Don't duplicate entry
}
@@ -992,13 +992,13 @@ void KDIconView::slotNewItems( const KFileItemList & entries )
{
kdDebug(1214) << "slotNewItems : using popupmenu position " << m_nextItemPos.x() << "," << m_nextItemPos.y() << endl;
fileIVI->move( m_nextItemPos.x(), m_nextItemPos.y() );
- m_nextItemPos = QPoint();
+ m_nextItemPos = TQPoint();
}
else
{
kdDebug(1214) << "slotNewItems : trying to read position from .directory file"<<endl;
- QString group = iconPositionGroupPrefix();
- QString filename = url.fileName();
+ TQString group = iconPositionGroupPrefix();
+ TQString filename = url.fileName();
if ( filename.endsWith(".part") && !m_dotDirectory->hasGroup( group + filename ) )
filename = filename.left( filename.length() - 5 );
group.append( filename );
@@ -1012,9 +1012,9 @@ void KDIconView::slotNewItems( const KFileItemList & entries )
kdDebug(1214)<<"slotNewItems() x: "<<x<<" y: "<<y<<endl;
- QRect oldPos = fileIVI->rect();
+ TQRect oldPos = fileIVI->rect();
fileIVI->move( x, y );
- if ( !firstRun && !isFreePosition( fileIVI ) ) // if we can't put it there, then let QIconView decide
+ if ( !firstRun && !isFreePosition( fileIVI ) ) // if we can't put it there, then let TQIconView decide
{
kdDebug(1214)<<"slotNewItems() pos was not free :-("<<endl;
fileIVI->move( oldPos.x(), oldPos.y() );
@@ -1058,7 +1058,7 @@ void KDIconView::slotRefreshItems( const KFileItemList & entries )
for (; rit.current(); ++rit)
{
bool found = false;
- QIconViewItem *it = firstItem();
+ TQIconViewItem *it = firstItem();
for ( ; it ; it = it->nextItem() )
{
KFileIVI * fileIVI = static_cast<KFileIVI *>(it);
@@ -1088,7 +1088,7 @@ void KDIconView::slotRefreshItems( const KFileItemList & entries )
}
if ( bNeedPreviewJob && previewSettings().count() )
{
- startImagePreview( QStringList(), false );
+ startImagePreview( TQStringList(), false );
}
else
{
@@ -1102,7 +1102,7 @@ void KDIconView::slotRefreshItems( const KFileItemList & entries )
void KDIconView::refreshIcons()
{
- QIconViewItem *it = firstItem();
+ TQIconViewItem *it = firstItem();
for ( ; it ; it = it->nextItem() )
{
KFileIVI * fileIVI = static_cast<KFileIVI *>(it);
@@ -1130,7 +1130,7 @@ void KDIconView::FilesRemoved( const KURL::List & fileList )
void KDIconView::refreshTrashIcon()
{
- QIconViewItem *it = firstItem();
+ TQIconViewItem *it = firstItem();
for ( ; it ; it = it->nextItem() )
{
KFileIVI * fileIVI = static_cast<KFileIVI *>(it);
@@ -1152,14 +1152,14 @@ void KDIconView::slotDeleteItem( KFileItem * _fileitem )
{
kdDebug(1204) << "KDIconView::slotDeleteItems" << endl;
// we need to find out the KFileIVI containing the fileitem
- QIconViewItem *it = firstItem();
+ TQIconViewItem *it = firstItem();
while ( it ) {
KFileIVI * fileIVI = static_cast<KFileIVI *>(it);
if ( fileIVI->item() == _fileitem ) { // compare the pointers
// Delete this item.
//kdDebug(1204) << fileIVI->text() << endl;
- QString group = iconPositionGroupPrefix();
+ TQString group = iconPositionGroupPrefix();
group.append( fileIVI->item()->url().fileName() );
if ( m_dotDirectory->hasGroup( group ) )
m_dotDirectory->deleteGroup( group );
@@ -1187,7 +1187,7 @@ void KDIconView::slotCompleted()
setRootItem( m_dirLister->rootItem() );
if ( previewSettings().count() )
- startImagePreview( QStringList(), true );
+ startImagePreview( TQStringList(), true );
else
{
stopImagePreview();
@@ -1221,14 +1221,14 @@ void KDIconView::slotClipboardDataChanged()
// This is very related to KonqDirPart::slotClipboardDataChanged
KURL::List lst;
- QMimeSource *data = QApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) && data->provides( "text/uri-list" ) )
if ( KonqDrag::decodeIsCutSelection( data ) )
(void) KURLDrag::decode( data, lst );
disableIcons( lst );
- QString actionText = KIO::pasteActionText();
+ TQString actionText = KIO::pasteActionText();
bool paste = !actionText.isEmpty();
if ( paste ) {
KAction* pasteAction = m_actionCollection.action( "paste" );
@@ -1238,7 +1238,7 @@ void KDIconView::slotClipboardDataChanged()
slotEnableAction( "paste", paste );
}
-void KDIconView::renameDesktopFile(const QString &path, const QString &name)
+void KDIconView::renameDesktopFile(const TQString &path, const TQString &name)
{
KDesktopFile cfg( path, false );
@@ -1255,10 +1255,10 @@ void KDIconView::renameDesktopFile(const QString &path, const QString &name)
cfg.sync();
}
-void KDIconView::slotItemRenamed(QIconViewItem* _item, const QString &name)
+void KDIconView::slotItemRenamed(TQIconViewItem* _item, const TQString &name)
{
kdDebug(1204) << "KDIconView::slotItemRenamed(item, \"" << name << "\" )" << endl;
- QString newName(name);
+ TQString newName(name);
if ( _item)
{
KFileIVI *fileItem = static_cast< KFileIVI* >( _item );
@@ -1266,7 +1266,7 @@ void KDIconView::slotItemRenamed(QIconViewItem* _item, const QString &name)
m_lastDeletedIconPos = fileItem->pos();
if ( fileItem->item() && !fileItem->item()->isLink() )
{
- QString desktopFile( fileItem->item()->url().path() );
+ TQString desktopFile( fileItem->item()->url().path() );
if (!desktopFile.isEmpty())
{
// first and foremost, we make sure that this is a .desktop file
@@ -1285,7 +1285,7 @@ void KDIconView::slotItemRenamed(QIconViewItem* _item, const QString &name)
bDesktopFile = true;
}
- if (QFile(desktopFile).exists() && bDesktopFile)
+ if (TQFile(desktopFile).exists() && bDesktopFile)
{
renameDesktopFile(desktopFile, name);
return;
@@ -1296,7 +1296,7 @@ void KDIconView::slotItemRenamed(QIconViewItem* _item, const QString &name)
KonqIconViewWidget::slotItemRenamed(_item, newName);
}
-void KDIconView::slotAboutToCreate(const QPoint &pos, const QValueList<KIO::CopyInfo> &files)
+void KDIconView::slotAboutToCreate(const TQPoint &pos, const TQValueList<KIO::CopyInfo> &files)
{
if (pos.isNull())
return;
@@ -1307,9 +1307,9 @@ void KDIconView::slotAboutToCreate(const QPoint &pos, const QValueList<KIO::Copy
m_lastDropPos = pos;
}
- QString dir = url().path(-1); // Strip trailing /
+ TQString dir = url().path(-1); // Strip trailing /
- QValueList<KIO::CopyInfo>::ConstIterator it = files.begin();
+ TQValueList<KIO::CopyInfo>::ConstIterator it = files.begin();
int gridX = gridXValue();
int gridY = 120; // 120 pixels should be enough for everyone (tm)
@@ -1323,9 +1323,9 @@ void KDIconView::slotAboutToCreate(const QPoint &pos, const QValueList<KIO::Copy
int dX = m_lastDropPos.x() - m_dropPos.x();
int dY = m_lastDropPos.y() - m_dropPos.y();
if ((QABS(dX) > QABS(dY)) || (m_lastDropPos.x() + 2*gridX > width()))
- m_lastDropPos = QPoint(m_dropPos.x(), m_lastDropPos.y() + gridY);
+ m_lastDropPos = TQPoint(m_dropPos.x(), m_lastDropPos.y() + gridY);
else
- m_lastDropPos = QPoint(m_lastDropPos.x() + gridX, m_lastDropPos.y());
+ m_lastDropPos = TQPoint(m_lastDropPos.x() + gridX, m_lastDropPos.y());
}
}
m_dotDirectory->sync();
@@ -1333,27 +1333,27 @@ void KDIconView::slotAboutToCreate(const QPoint &pos, const QValueList<KIO::Copy
// -----------------------------------------------------------------------------
-void KDIconView::showEvent( QShowEvent *e )
+void KDIconView::showEvent( TQShowEvent *e )
{
- //HACK to avoid QIconView calling arrangeItemsInGrid (Simon)
- //EVEN MORE HACK: unfortunately, QScrollView has no concept of
+ //HACK to avoid TQIconView calling arrangeItemsInGrid (Simon)
+ //EVEN MORE HACK: unfortunately, TQScrollView has no concept of
//TopToBottom, therefore, it always adds LeftToRight. So, if any of
- //the icons have a setting, we'll use QScrollView.. but otherwise,
+ //the icons have a setting, we'll use TQScrollView.. but otherwise,
//we use the iconview
//kdDebug(1204)<<"showEvent() m_hasExistingPos: "<<(m_hasExistingPos?(int)1:(int)0)<<endl;
if (m_hasExistingPos)
- QScrollView::showEvent( e );
+ TQScrollView::showEvent( e );
else
KIconView::showEvent( e );
}
-void KDIconView::contentsDropEvent( QDropEvent * e )
+void KDIconView::contentsDropEvent( TQDropEvent * e )
{
- kdDebug(1204)<<"void KDIconView::contentsDropEvent( QDropEvent * e )\n";
+ kdDebug(1204)<<"void KDIconView::contentsDropEvent( TQDropEvent * e )\n";
// mind: if it's a filedrag which itself is an image, libkonq is called. There's a popup for drops as well
// that contains the same line "Set as Wallpaper" in void KonqOperations::asyncDrop
bool isColorDrag = KColorDrag::canDecode(e);
- bool isImageDrag = QImageDrag::canDecode(e);
+ bool isImageDrag = TQImageDrag::canDecode(e);
bool isUrlDrag = KURLDrag::canDecode(e);
bool isImmutable = KGlobal::config()->isImmutable();
@@ -1383,13 +1383,13 @@ void KDIconView::contentsDropEvent( QDropEvent * e )
// Check if any items have been moved outside the desktop area.
// If we find any, move them right back in there. (#40418)
- QRect desk = desktopRect();
+ TQRect desk = desktopRect();
bool adjustedAnyItems = false;
- for( QIconViewItem *item = firstItem(); item; item = item->nextItem() )
+ for( TQIconViewItem *item = firstItem(); item; item = item->nextItem() )
{
if( !desk.contains( item->rect(), true ))
{
- QRect r = item->rect();
+ TQRect r = item->rect();
if( r.top() < 0 )
r.moveTop( 0 );
@@ -1412,7 +1412,7 @@ void KDIconView::contentsDropEvent( QDropEvent * e )
viewport()->update();
}
- if (QIconDrag::canDecode(e)) {
+ if (TQIconDrag::canDecode(e)) {
emit iconMoved();
if ( !m_autoAlign ) // if autoAlign, positions were saved in lineupIcons
saveIconPositions();
@@ -1420,18 +1420,18 @@ void KDIconView::contentsDropEvent( QDropEvent * e )
}
// don't scroll when someone uses his nifty mouse wheel
-void KDIconView::viewportWheelEvent( QWheelEvent * e )
+void KDIconView::viewportWheelEvent( TQWheelEvent * e )
{
e->accept();
}
-void KDIconView::updateWorkArea( const QRect &wr )
+void KDIconView::updateWorkArea( const TQRect &wr )
{
m_gotIconsArea = true; // now we have it!
if ( iconArea() == wr ) return; // nothing changed; avoid repaint/saveIconPosition ...
- QRect oldArea = iconArea();
+ TQRect oldArea = iconArea();
setIconArea( wr );
kdDebug(1204) << "KDIconView::updateWorkArea wr: " << wr.x() << "," << wr.y()
@@ -1443,7 +1443,7 @@ void KDIconView::updateWorkArea( const QRect &wr )
int dummy = 0; //lineupIcons();
else {
bool needRepaint = false;
- QIconViewItem* item;
+ TQIconViewItem* item;
int dx, dy;
dx = wr.left() - oldArea.left();
@@ -1469,7 +1469,7 @@ void KDIconView::updateWorkArea( const QRect &wr )
}
for ( item = firstItem(); item; item = item->nextItem() ) {
- QRect r( item->rect() );
+ TQRect r( item->rect() );
int dx = 0, dy = 0;
if ( r.bottom() > wr.bottom() )
dy = wr.bottom() - r.bottom() - 1;
@@ -1491,18 +1491,18 @@ void KDIconView::updateWorkArea( const QRect &wr )
void KDIconView::setupSortKeys()
{
// can't use sorting in KFileIVI::setKey()
- setProperty("sortDirectoriesFirst", QVariant(false, 0));
+ setProperty("sortDirectoriesFirst", TQVariant(false, 0));
- for (QIconViewItem *it = firstItem(); it; it = it->nextItem())
+ for (TQIconViewItem *it = firstItem(); it; it = it->nextItem())
{
- QString strKey;
+ TQString strKey;
if (!m_itemsAlwaysFirst.isEmpty())
{
- QString strFileName = static_cast<KFileIVI *>( it )->item()->url().fileName();
+ TQString strFileName = static_cast<KFileIVI *>( it )->item()->url().fileName();
int nFind = m_itemsAlwaysFirst.findIndex(strFileName);
if (nFind >= 0)
- strKey = "0" + QString::number(nFind);
+ strKey = "0" + TQString::number(nFind);
}
if (strKey.isEmpty())
@@ -1523,7 +1523,7 @@ void KDIconView::setupSortKeys()
strKey = static_cast<KFileIVI *>( it )->item()->mimetype() + '~' + it->text().lower();
break;
case Date:
- QDateTime dayt;
+ TQDateTime dayt;
dayt.setTime_t( static_cast<KFileIVI *>( it )->
item()->time( KIO::UDS_MODIFICATION_TIME ) );
strKey = dayt.toString( "yyyyMMddhhmmss" );
@@ -1545,10 +1545,10 @@ void KDIconView::setupSortKeys()
}
}
-bool KDIconView::isFreePosition( const QIconViewItem *item ) const
+bool KDIconView::isFreePosition( const TQIconViewItem *item ) const
{
- QRect r = item->rect();
- QIconViewItem *it = firstItem();
+ TQRect r = item->rect();
+ TQIconViewItem *it = firstItem();
for (; it; it = it->nextItem() )
{
if ( !it->rect().isValid() || it == item )
@@ -1561,9 +1561,9 @@ bool KDIconView::isFreePosition( const QIconViewItem *item ) const
return true;
}
-bool KDIconView::isFreePosition( const QIconViewItem *item ,const QRect& rect) const
+bool KDIconView::isFreePosition( const TQIconViewItem *item ,const TQRect& rect) const
{
- QIconViewItem *it = firstItem();
+ TQIconViewItem *it = firstItem();
for (; it; it = it->nextItem() )
{
if ( !rect.isValid() || it == item )
@@ -1576,12 +1576,12 @@ bool KDIconView::isFreePosition( const QIconViewItem *item ,const QRect& rect) c
return true;
}
-void KDIconView::setLastIconPosition( const QPoint &_pos )
+void KDIconView::setLastIconPosition( const TQPoint &_pos )
{
m_lastDeletedIconPos = _pos;
}
-void KDIconView::moveToFreePosition(QIconViewItem *item )
+void KDIconView::moveToFreePosition(TQIconViewItem *item )
{
bool success;
// It may be that a file has been renamed. In this case,
@@ -1595,17 +1595,17 @@ void KDIconView::moveToFreePosition(QIconViewItem *item )
{
kdDebug(1214) << "Moving " << item->text() << " to position of last deleted icon." << endl;
item->move( m_lastDeletedIconPos );
- m_lastDeletedIconPos = QPoint();
+ m_lastDeletedIconPos = TQPoint();
return;
}
//try to find a free place to put the item, honouring the m_bVertAlign property
- QRect rect=item->rect();
+ TQRect rect=item->rect();
if (m_bVertAlign)
{
kdDebug(1214)<<"moveToFreePosition for vertical alignment"<<endl;
- rect.moveTopLeft(QPoint(spacing(),spacing()));
+ rect.moveTopLeft(TQPoint(spacing(),spacing()));
do
{
success=false;
@@ -1624,7 +1624,7 @@ void KDIconView::moveToFreePosition(QIconViewItem *item )
if (!success)
{
- rect.moveTopLeft(QPoint(rect.right()+spacing(),spacing()));
+ rect.moveTopLeft(TQPoint(rect.right()+spacing(),spacing()));
} else break;
}
while (item->rect().right()<width());
@@ -1645,8 +1645,8 @@ void KDIconView::saveIconPositions()
if (!m_bEditableDesktopIcons)
return; // Don't save position
- QString prefix = iconPositionGroupPrefix();
- QIconViewItem *it = firstItem();
+ TQString prefix = iconPositionGroupPrefix();
+ TQIconViewItem *it = firstItem();
if ( !it )
return; // No more icons. Maybe we're closing and they've been removed already
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index a92d39712..715a0eb5e 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -45,7 +45,7 @@ class KDIconView : public KonqIconViewWidget, public KDirNotify
Q_OBJECT
public:
- KDIconView( QWidget *parent, const char* name = 0L );
+ KDIconView( TQWidget *parent, const char* name = 0L );
~KDIconView();
virtual void initConfig( bool init );
@@ -67,11 +67,11 @@ public:
*/
void rearrangeIcons();
- void lineupIcons(QIconView::Arrangement);
+ void lineupIcons(TQIconView::Arrangement);
void setAutoAlign( bool b );
- QStringList selectedURLs();
+ TQStringList selectedURLs();
/**
* Save the icon positions
@@ -86,13 +86,13 @@ public:
/**
* Called when the desktop icons area has changed
*/
- void updateWorkArea( const QRect &wr );
+ void updateWorkArea( const TQRect &wr );
/**
* Reimplemented from KonqIconViewWidget (for image drops)
*/
virtual void setWallpaper(const KURL &url) { emit newWallpaper( url ); }
- void setLastIconPosition( const QPoint & );
+ void setLastIconPosition( const TQPoint & );
static KURL desktopURL();
@@ -106,15 +106,15 @@ public:
protected slots:
// slots connected to the icon view
- void slotReturnPressed( QIconViewItem *item );
- void slotExecuted( QIconViewItem *item );
- void slotMouseButtonPressed(int _button, QIconViewItem* _item, const QPoint& _global);
- void slotMouseButtonClickedKDesktop(int _button, QIconViewItem* _item, const QPoint& _global);
- void slotContextMenuRequested(QIconViewItem* _item, const QPoint& _global);
+ void slotReturnPressed( TQIconViewItem *item );
+ void slotExecuted( TQIconViewItem *item );
+ void slotMouseButtonPressed(int _button, TQIconViewItem* _item, const TQPoint& _global);
+ void slotMouseButtonClickedKDesktop(int _button, TQIconViewItem* _item, const TQPoint& _global);
+ void slotContextMenuRequested(TQIconViewItem* _item, const TQPoint& _global);
void slotEnableAction( const char * name, bool enabled );
- void slotAboutToCreate(const QPoint &pos, const QValueList<KIO::CopyInfo> &files);
+ void slotAboutToCreate(const TQPoint &pos, const TQValueList<KIO::CopyInfo> &files);
- void slotItemRenamed(QIconViewItem*, const QString &name);
+ void slotItemRenamed(TQIconViewItem*, const TQString &name);
// slots connected to the directory lister
void slotStarted( const KURL& url );
@@ -137,8 +137,8 @@ protected slots:
// For communication with KDesktop
signals:
- void colorDropEvent( QDropEvent *e );
- void imageDropEvent( QDropEvent *e );
+ void colorDropEvent( TQDropEvent *e );
+ void imageDropEvent( TQDropEvent *e );
void newWallpaper( const KURL & );
void iconMoved();
void wheelRolled( int delta );
@@ -159,28 +159,28 @@ protected:
void initDotDirectories();
bool makeFriendlyText( KFileIVI *fileIVI );
- static QString stripDesktopExtension( const QString & text );
+ static TQString stripDesktopExtension( const TQString & text );
bool isDesktopFile( KFileItem * _item ) const;
- bool isFreePosition( const QIconViewItem *item ) const;
- bool isFreePosition( const QIconViewItem *item, const QRect& rect ) const;
- void moveToFreePosition(QIconViewItem *item );
+ bool isFreePosition( const TQIconViewItem *item ) const;
+ bool isFreePosition( const TQIconViewItem *item, const TQRect& rect ) const;
+ void moveToFreePosition(TQIconViewItem *item );
bool deleteGlobalDesktopFiles();
- static void renameDesktopFile(const QString &path, const QString &name);
+ static void renameDesktopFile(const TQString &path, const TQString &name);
- void popupMenu( const QPoint &_global, const KFileItemList& _items );
- virtual void showEvent( QShowEvent *e );
- virtual void contentsDropEvent( QDropEvent *e );
- virtual void viewportWheelEvent( QWheelEvent * );
- virtual void contentsMousePressEvent( QMouseEvent *e );
- virtual void mousePressEvent( QMouseEvent *e );
- virtual void wheelEvent( QWheelEvent* e );
+ void popupMenu( const TQPoint &_global, const KFileItemList& _items );
+ virtual void showEvent( TQShowEvent *e );
+ virtual void contentsDropEvent( TQDropEvent *e );
+ virtual void viewportWheelEvent( TQWheelEvent * );
+ virtual void contentsMousePressEvent( TQMouseEvent *e );
+ virtual void mousePressEvent( TQMouseEvent *e );
+ virtual void wheelEvent( TQWheelEvent* e );
private:
void refreshTrashIcon();
- static QRect desktopRect();
+ static TQRect desktopRect();
static void saveIconPosition(KSimpleConfig *config, int x, int y);
static void readIconPosition(KSimpleConfig *config, int &x, int &y);
@@ -213,18 +213,18 @@ private:
KURL::List m_mergeDirs;
/** The list of dirs to be merged into the desktop, in addition to desktopURL **/
- QStringList m_desktopDirs;
+ TQStringList m_desktopDirs;
/** The desktop's .directory, used for storing icon positions */
KSimpleConfig *m_dotDirectory;
/** Position of last deleted icon - used when renaming a file */
- QPoint m_lastDeletedIconPos;
+ TQPoint m_lastDeletedIconPos;
/** Sorting */
SortCriterion m_eSortCriterion;
bool m_bSortDirectoriesFirst;
- QStringList m_itemsAlwaysFirst;
+ TQStringList m_itemsAlwaysFirst;
/**
* The shadow object
@@ -233,20 +233,20 @@ private:
/** Position where to move the next item.
* It is set to the KRootWm position when "new file" is chosen. */
- QPoint m_nextItemPos;
+ TQPoint m_nextItemPos;
/** Position where the last drop occurred */
- QPoint m_dropPos;
+ TQPoint m_dropPos;
/** Position for the last dropped item */
- QPoint m_lastDropPos;
+ TQPoint m_lastDropPos;
/** URL of the items which is being RMB'ed - when only one */
KURL m_popupURL;
/** media list management */
bool m_enableMedia;
- QStringList m_excludedMedia;
+ TQStringList m_excludedMedia;
// did we already get the correct desktopIconsArea (from kicker)
// needed when we want to line up icons on a grid
diff --git a/kdesktop/kfileividesktop.cpp b/kdesktop/kfileividesktop.cpp
index f9ea12a51..90c6a213d 100644
--- a/kdesktop/kfileividesktop.cpp
+++ b/kdesktop/kfileividesktop.cpp
@@ -23,11 +23,11 @@
#include <stdio.h>
-#include <qcolor.h>
-#include <qpalette.h>
-#include <qstring.h>
-#include <qpainter.h>
-#include <qstyle.h>
+#include <tqcolor.h>
+#include <tqpalette.h>
+#include <tqstring.h>
+#include <tqpainter.h>
+#include <tqstyle.h>
#include <kwordwrap.h>
#include <kiconview.h>
#include <kdebug.h>
@@ -61,7 +61,7 @@ KFileIVIDesktop::~KFileIVIDesktop()
delete m_normalImage;
}
-void KFileIVIDesktop::calcRect( const QString& _text )
+void KFileIVIDesktop::calcRect( const TQString& _text )
{
KIconViewItem::calcRect( _text );
@@ -71,8 +71,8 @@ void KFileIVIDesktop::calcRect( const QString& _text )
return;
int spread = shadowThickness();
- QRect itemTextRect = textRect();
- QRect itemRect = rect();
+ TQRect itemTextRect = textRect();
+ TQRect itemRect = rect();
itemTextRect.setBottom( itemTextRect.bottom() + spread );
itemTextRect.setRight( itemTextRect.right() + spread );
@@ -83,11 +83,11 @@ void KFileIVIDesktop::calcRect( const QString& _text )
setItemRect( itemRect );
}
-void KFileIVIDesktop::paintItem( QPainter *p, const QColorGroup &cg)
+void KFileIVIDesktop::paintItem( TQPainter *p, const TQColorGroup &cg)
{
- QColorGroup colors = updateColors(cg);
+ TQColorGroup colors = updateColors(cg);
- QIconView* view = iconView();
+ TQIconView* view = iconView();
Q_ASSERT( view );
if ( !view )
@@ -119,7 +119,7 @@ void KFileIVIDesktop::paintItem( QPainter *p, const QColorGroup &cg)
bool KFileIVIDesktop::shouldUpdateShadow(bool selected)
{
unsigned long uid = (static_cast<KDesktopShadowSettings *> (m_shadow->shadowSettings()))->UID();
- QString wrapped = wordWrap()->wrappedString();
+ TQString wrapped = wordWrap()->wrappedString();
if (wrapped != oldText){
oldText = wrapped;
@@ -136,11 +136,11 @@ bool KFileIVIDesktop::shouldUpdateShadow(bool selected)
-void KFileIVIDesktop::drawShadowedText( QPainter *p, const QColorGroup &cg )
+void KFileIVIDesktop::drawShadowedText( TQPainter *p, const TQColorGroup &cg )
{
int textX = textRect( FALSE ).x() + 4;
int textY = textRect( FALSE ).y();
- int align = ((KIconView *) iconView())->itemTextPos() == QIconView::Bottom
+ int align = ((KIconView *) iconView())->itemTextPos() == TQIconView::Bottom
? AlignHCenter : AlignAuto;
bool rebuild = shouldUpdateShadow(isSelected());
@@ -150,17 +150,17 @@ void KFileIVIDesktop::drawShadowedText( QPainter *p, const QColorGroup &cg )
p->setFont(iconView()->font());
paintFontUpdate(p);
- QColor shadow;
- QColor text;
+ TQColor shadow;
+ TQColor text;
int spread = shadowThickness();
if ( isSelected() && settings->selectionType() != KShadowSettings::InverseVideoOnSelection ) {
text = cg.highlightedText();
- QRect rect = textRect( false );
+ TQRect rect = textRect( false );
rect.setRight( rect.right() - spread );
rect.setBottom( rect.bottom() - spread + 1 );
- p->setBrush( QBrush( cg.highlight() ) );
- p->setPen( QPen( cg.highlight() ) );
+ p->setBrush( TQBrush( cg.highlight() ) );
+ p->setPen( TQPen( cg.highlight() ) );
p->drawRoundRect( rect,
1000 / rect.width(),
1000 / rect.height() );
@@ -201,16 +201,16 @@ void KFileIVIDesktop::drawShadowedText( QPainter *p, const QColorGroup &cg )
}
-QImage *KFileIVIDesktop::buildShadow( QPainter *p, const int align,
- QColor &shadowColor )
+TQImage *KFileIVIDesktop::buildShadow( TQPainter *p, const int align,
+ TQColor &shadowColor )
{
- QPainter pixPainter;
+ TQPainter pixPainter;
int spread = shadowThickness();
- QPixmap textPixmap(textRect( FALSE ).width() + spread * 2 + 2,
+ TQPixmap textPixmap(textRect( FALSE ).width() + spread * 2 + 2,
textRect( FALSE ).height() + spread * 2 + 2);
- textPixmap.fill(QColor(0,0,0));
+ textPixmap.fill(TQColor(0,0,0));
textPixmap.setMask( textPixmap.createHeuristicMask(TRUE) );
pixPainter.begin(&textPixmap);
@@ -219,7 +219,7 @@ QImage *KFileIVIDesktop::buildShadow( QPainter *p, const int align,
wordWrap()->drawText( &pixPainter, spread, spread, align | KWordWrap::Truncate );
pixPainter.end();
- return new QImage(m_shadow->makeShadow(textPixmap, shadowColor));
+ return new TQImage(m_shadow->makeShadow(textPixmap, shadowColor));
}
int KFileIVIDesktop::shadowThickness() const
diff --git a/kdesktop/kfileividesktop.h b/kdesktop/kfileividesktop.h
index c245a6800..32166d9d1 100644
--- a/kdesktop/kfileividesktop.h
+++ b/kdesktop/kfileividesktop.h
@@ -24,10 +24,10 @@
#ifndef KFILE_IVI_DESKTOP
#define KFILE_IVI_DESKTOP
-#include <qcolor.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qstring.h>
+#include <tqcolor.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
+#include <tqstring.h>
#include <kfileivi.h>
/*
@@ -69,7 +69,7 @@ class KFileIVIDesktop : public KFileIVI
* Reimplements KIconView::calcRect to take the shadow metrics
* into account
*/
- virtual void calcRect( const QString& _text );
+ virtual void calcRect( const TQString& _text );
/**
* Paints this item. Takes care of using the normal or alpha
@@ -77,7 +77,7 @@ class KFileIVIDesktop : public KFileIVI
* @param p the painter for drawing the item
* @param cg the base color group
*/
- virtual void paintItem(QPainter *p, const QColorGroup &cg);
+ virtual void paintItem(TQPainter *p, const TQColorGroup &cg);
/**
@@ -85,7 +85,7 @@ class KFileIVIDesktop : public KFileIVI
* @param p the painter for drawing the item
* @param cg the base color group
*/
- virtual void drawShadowedText(QPainter *p, const QColorGroup &cg);
+ virtual void drawShadowedText(TQPainter *p, const TQColorGroup &cg);
/**
* Builds the shadow. As the algorithm is pretty slow (at pixel level),
@@ -94,14 +94,14 @@ class KFileIVIDesktop : public KFileIVI
* @param align the shadow alignment
* @param shadowColor the shadow color
*/
- virtual QImage *buildShadow(QPainter *p, const int align, QColor &shadowColor);
+ virtual TQImage *buildShadow(TQPainter *p, const int align, TQColor &shadowColor);
protected:
- void setNormalImage(QImage *newImage) { delete m_normalImage; m_normalImage = newImage; };
- void setSelectedImage(QImage *newImage) { delete m_selectedImage; m_selectedImage = newImage; };
+ void setNormalImage(TQImage *newImage) { delete m_normalImage; m_normalImage = newImage; };
+ void setSelectedImage(TQImage *newImage) { delete m_selectedImage; m_selectedImage = newImage; };
- QImage *normalImage() { return m_normalImage; };
- QImage *selectedImage() { return m_selectedImage; };
+ TQImage *normalImage() { return m_normalImage; };
+ TQImage *selectedImage() { return m_selectedImage; };
private:
bool shouldUpdateShadow(bool selected);
@@ -109,10 +109,10 @@ class KFileIVIDesktop : public KFileIVI
KShadowEngine *m_shadow;
- QImage *m_selectedImage;
- QImage *m_normalImage;
+ TQImage *m_selectedImage;
+ TQImage *m_normalImage;
- QString oldText;
+ TQString oldText;
unsigned long _selectedUID;
unsigned long _normalUID;
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 145360b65..7e83f6779 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -50,7 +50,7 @@
#include <kmenubar.h>
#include <kmessagebox.h>
#include <kuser.h>
-#include <qfile.h>
+#include <tqfile.h>
#include "krootwm.h"
#include "kdiconview.h"
@@ -66,9 +66,9 @@
KRootWm * KRootWm::s_rootWm = 0;
-extern QCString kdesktop_name, kicker_name, kwin_name;
+extern TQCString kdesktop_name, kicker_name, kwin_name;
-KRootWm::KRootWm(KDesktop* _desktop) : QObject(_desktop)
+KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop)
{
s_rootWm = this;
m_actionCollection = new KActionCollection(_desktop, this, "KRootWm::m_actionCollection");
@@ -85,10 +85,10 @@ KRootWm::KRootWm(KDesktop* _desktop) : QObject(_desktop)
if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
{
menuNew = new KNewMenu( m_actionCollection, "new_menu" );
- connect(menuNew->popupMenu(), SIGNAL( aboutToShow() ),
- this, SLOT( slotFileNewAboutToShow() ) );
- connect( menuNew, SIGNAL( activated() ),
- m_pDesktop->iconView(), SLOT( slotNewMenuActivated() ) );
+ connect(menuNew->popupMenu(), TQT_SIGNAL( aboutToShow() ),
+ this, TQT_SLOT( slotFileNewAboutToShow() ) );
+ connect( menuNew, TQT_SIGNAL( activated() ),
+ m_pDesktop->iconView(), TQT_SLOT( slotNewMenuActivated() ) );
}
if (kapp->authorizeKAction("bookmarks"))
@@ -110,8 +110,8 @@ KRootWm::KRootWm(KDesktop* _desktop) : QObject(_desktop)
// so we create them here
desktopMenu = new QPopupMenu;
windowListMenu = new KWindowListMenu;
- connect( windowListMenu, SIGNAL( aboutToShow() ),
- this, SLOT( slotWindowListAboutToShow() ) );
+ connect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
+ this, TQT_SLOT( slotWindowListAboutToShow() ) );
// Create the actions
#if 0
@@ -130,77 +130,77 @@ KRootWm::KRootWm(KDesktop* _desktop) : QObject(_desktop)
if (kapp->authorize("run_command"))
{
- new KAction(i18n("Run Command..."), "run", 0, m_pDesktop, SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
+ new KAction(i18n("Run Command..."), "run", 0, m_pDesktop, TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
}
if (!KGlobal::config()->isImmutable())
{
- new KAction(i18n("Configure Desktop..."), "configure", 0, this, SLOT( slotConfigureDesktop() ),
+ new KAction(i18n("Configure Desktop..."), "configure", 0, this, TQT_SLOT( slotConfigureDesktop() ),
m_actionCollection, "configdesktop" );
- new KAction(i18n("Disable Desktop Menu"), 0, this, SLOT( slotToggleDesktopMenu() ),
+ new KAction(i18n("Disable Desktop Menu"), 0, this, TQT_SLOT( slotToggleDesktopMenu() ),
m_actionCollection, "togglemenubar" );
}
- new KAction(i18n("Unclutter Windows"), 0, this, SLOT( slotUnclutterWindows() ),
+ new KAction(i18n("Unclutter Windows"), 0, this, TQT_SLOT( slotUnclutterWindows() ),
m_actionCollection, "unclutter" );
- new KAction(i18n("Cascade Windows"), 0, this, SLOT( slotCascadeWindows() ),
+ new KAction(i18n("Cascade Windows"), 0, this, TQT_SLOT( slotCascadeWindows() ),
m_actionCollection, "cascade" );
// arrange menu actions
if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
{
- new KAction(i18n("By Name (Case Sensitive)"), 0, this, SLOT( slotArrangeByNameCS() ),
+ new KAction(i18n("By Name (Case Sensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCS() ),
m_actionCollection, "sort_ncs");
- new KAction(i18n("By Name (Case Insensitive)"), 0, this, SLOT( slotArrangeByNameCI() ),
+ new KAction(i18n("By Name (Case Insensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCI() ),
m_actionCollection, "sort_nci");
- new KAction(i18n("By Size"), 0, this, SLOT( slotArrangeBySize() ),
+ new KAction(i18n("By Size"), 0, this, TQT_SLOT( slotArrangeBySize() ),
m_actionCollection, "sort_size");
- new KAction(i18n("By Type"), 0, this, SLOT( slotArrangeByType() ),
+ new KAction(i18n("By Type"), 0, this, TQT_SLOT( slotArrangeByType() ),
m_actionCollection, "sort_type");
- new KAction(i18n("By Date"), 0, this, SLOT( slotArrangeByDate() ),
+ new KAction(i18n("By Date"), 0, this, TQT_SLOT( slotArrangeByDate() ),
m_actionCollection, "sort_date");
KToggleAction *aSortDirsFirst = new KToggleAction( i18n("Directories First"), 0, m_actionCollection, "sort_directoriesfirst" );
- connect( aSortDirsFirst, SIGNAL( toggled( bool ) ),
- this, SLOT( slotToggleDirFirst( bool ) ) );
+ connect( aSortDirsFirst, TQT_SIGNAL( toggled( bool ) ),
+ this, TQT_SLOT( slotToggleDirFirst( bool ) ) );
new KAction(i18n("Line Up Horizontally"), 0,
- this, SLOT( slotLineupIconsHoriz() ),
+ this, TQT_SLOT( slotLineupIconsHoriz() ),
m_actionCollection, "lineupHoriz" );
new KAction(i18n("Line Up Vertically"), 0,
- this, SLOT( slotLineupIconsVert() ),
+ this, TQT_SLOT( slotLineupIconsVert() ),
m_actionCollection, "lineupVert" );
KToggleAction *aAutoAlign = new KToggleAction(i18n("Align to Grid"), 0,
m_actionCollection, "realign" );
- connect( aAutoAlign, SIGNAL( toggled( bool ) ),
- this, SLOT( slotToggleAutoAlign( bool ) ) );
+ connect( aAutoAlign, TQT_SIGNAL( toggled( bool ) ),
+ this, TQT_SLOT( slotToggleAutoAlign( bool ) ) );
KToggleAction *aLockIcons = new KToggleAction(i18n("Lock in Place"), 0, m_actionCollection, "lock_icons");
- connect( aLockIcons, SIGNAL( toggled( bool ) ),
- this, SLOT( slotToggleLockIcons( bool ) ) );
+ connect( aLockIcons, TQT_SIGNAL( toggled( bool ) ),
+ this, TQT_SLOT( slotToggleLockIcons( bool ) ) );
}
if (m_bDesktopEnabled)
{
- new KAction(i18n("Refresh Desktop"), "desktop", 0, this, SLOT( slotRefreshDesktop() ),
+ new KAction(i18n("Refresh Desktop"), "desktop", 0, this, TQT_SLOT( slotRefreshDesktop() ),
m_actionCollection, "refresh" );
}
// Icons in sync with kicker
if (kapp->authorize("lock_screen"))
{
- new KAction(i18n("Lock Session"), "lock", 0, this, SLOT( slotLock() ),
+ new KAction(i18n("Lock Session"), "lock", 0, this, TQT_SLOT( slotLock() ),
m_actionCollection, "lock" );
}
if (kapp->authorize("logout"))
{
new KAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "exit", 0,
- this, SLOT( slotLogout() ), m_actionCollection, "logout" );
+ this, TQT_SLOT( slotLogout() ), m_actionCollection, "logout" );
}
if (kapp->authorize("start_new_session") && DM().isSwitchable())
{
new KAction(i18n("Start New Session"), "fork", 0, this,
- SLOT( slotNewSession() ), m_actionCollection, "newsession" );
+ TQT_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
if (kapp->authorize("lock_screen"))
{
new KAction(i18n("Lock Current && Start New Session"), "lock", 0, this,
- SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
+ TQT_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
}
}
@@ -226,7 +226,7 @@ void KRootWm::initConfig()
// read configuration for clicks on root window
static const char * const s_choices[choiceCount] = { "", "WindowListMenu", "DesktopMenu", "AppMenu", "CustomMenu1", "CustomMenu2", "BookmarksMenu" };
leftButtonChoice = middleButtonChoice = rightButtonChoice = NOTHING;
- QString s = KDesktopSettings::left();
+ TQString s = KDesktopSettings::left();
for ( int c = 0 ; c < choiceCount ; c ++ )
if (s == s_choices[c])
{ leftButtonChoice = (menuChoice) c; break; }
@@ -279,8 +279,8 @@ void KRootWm::buildMenus()
}
// create Arrange menu
- QPopupMenu *pArrangeMenu = 0;
- QPopupMenu *pLineupMenu = 0;
+ TQPopupMenu *pArrangeMenu = 0;
+ TQPopupMenu *pLineupMenu = 0;
KAction *action;
help = new KHelpMenu(0, 0, false);
help->menu()->removeItem( KHelpMenu::menuAboutApp );
@@ -307,8 +307,8 @@ void KRootWm::buildMenus()
if (m_actionCollection->action("newsession"))
{
sessionsMenu = new QPopupMenu;
- connect( sessionsMenu, SIGNAL(aboutToShow()), SLOT(slotPopulateSessions()) );
- connect( sessionsMenu, SIGNAL(activated(int)), SLOT(slotSessionActivated(int)) );
+ connect( sessionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotPopulateSessions()) );
+ connect( sessionsMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSessionActivated(int)) );
}
if (menuBar) {
@@ -415,7 +415,7 @@ void KRootWm::buildMenus()
if (m_bDesktopEnabled && m_actionCollection->action("realign"))
{
- QPopupMenu* pIconOperationsMenu = new QPopupMenu;
+ TQPopupMenu* pIconOperationsMenu = new QPopupMenu;
pIconOperationsMenu->insertItem(i18n("Sort Icons"), pArrangeMenu);
pIconOperationsMenu->insertSeparator();
@@ -430,7 +430,7 @@ void KRootWm::buildMenus()
desktopMenu->insertItem(SmallIconSet("icons"), i18n("Icons"), pIconOperationsMenu);
}
- QPopupMenu* pWindowOperationsMenu = new QPopupMenu;
+ TQPopupMenu* pWindowOperationsMenu = new QPopupMenu;
m_actionCollection->action("cascade")->plug( pWindowOperationsMenu );
m_actionCollection->action("unclutter")->plug( pWindowOperationsMenu );
desktopMenu->insertItem(SmallIconSet("window_list"), i18n("Windows"), pWindowOperationsMenu);
@@ -472,7 +472,7 @@ void KRootWm::buildMenus()
desktopMenu->removeItem(lastSep);
}
- connect( desktopMenu, SIGNAL( aboutToShow() ), this, SLOT( slotFileNewAboutToShow() ) );
+ connect( desktopMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotFileNewAboutToShow() ) );
if (menuBar) {
menuBar->insertItem(i18n("File"), file);
@@ -529,7 +529,7 @@ void KRootWm::slotWindowListAboutToShow()
windowListMenu->init();
}
-void KRootWm::activateMenu( menuChoice choice, const QPoint& global )
+void KRootWm::activateMenu( menuChoice choice, const TQPoint& global )
{
switch ( choice )
{
@@ -574,7 +574,7 @@ void KRootWm::activateMenu( menuChoice choice, const QPoint& global )
}
}
-void KRootWm::mousePressed( const QPoint& _global, int _button )
+void KRootWm::mousePressed( const TQPoint& _global, int _button )
{
if (!desktopMenu) return; // initialisation not yet done
switch ( _button ) {
@@ -599,38 +599,38 @@ void KRootWm::mousePressed( const QPoint& _global, int _button )
void KRootWm::slotWindowList() {
// kdDebug() << "KRootWm::slotWindowList" << endl;
// Popup at the center of the screen, this is from keyboard shortcut.
- QDesktopWidget* desktop = KApplication::desktop();
- QRect r;
+ TQDesktopWidget* desktop = KApplication::desktop();
+ TQRect r;
if (desktop->numScreens() < 2)
r = desktop->geometry();
else
- r = desktop->screenGeometry( desktop->screenNumber(QCursor::pos()));
+ r = desktop->screenGeometry( desktop->screenNumber(TQCursor::pos()));
windowListMenu->init();
- disconnect( windowListMenu, SIGNAL( aboutToShow() ),
- this, SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice
+ disconnect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
+ this, TQT_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice
// windowListMenu->rect() is not valid before showing, use sizeHint()
- windowListMenu->popup(r.center() - QRect( QPoint( 0, 0 ), windowListMenu->sizeHint()).center());
+ windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->sizeHint()).center());
windowListMenu->selectActiveWindow(); // make the popup more useful
- connect( windowListMenu, SIGNAL( aboutToShow() ),
- this, SLOT( slotWindowListAboutToShow() ) );
+ connect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
+ this, TQT_SLOT( slotWindowListAboutToShow() ) );
}
void KRootWm::slotSwitchUser() {
// kdDebug() << "KRootWm::slotSwitchUser" << endl;
if (!sessionsMenu)
return;
- QDesktopWidget* desktop = KApplication::desktop();
- QRect r;
+ TQDesktopWidget* desktop = KApplication::desktop();
+ TQRect r;
if (desktop->numScreens() < 2)
r = desktop->geometry();
else
- r = desktop->screenGeometry( desktop->screenNumber(QCursor::pos()));
+ r = desktop->screenGeometry( desktop->screenNumber(TQCursor::pos()));
slotPopulateSessions();
- disconnect( sessionsMenu, SIGNAL( aboutToShow() ),
- this, SLOT( slotPopulateSessions() ) ); // avoid calling init() twice
- sessionsMenu->popup(r.center() - QRect( QPoint( 0, 0 ), sessionsMenu->sizeHint()).center());
- connect( sessionsMenu, SIGNAL( aboutToShow() ),
- SLOT( slotPopulateSessions() ) );
+ disconnect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
+ this, TQT_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice
+ sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->sizeHint()).center());
+ connect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
+ TQT_SLOT( slotPopulateSessions() ) );
}
void KRootWm::slotArrangeByNameCS()
@@ -681,14 +681,14 @@ void KRootWm::slotArrangeByType()
void KRootWm::slotLineupIconsHoriz() {
if (m_bDesktopEnabled)
{
- m_pDesktop->iconView()->lineupIcons(QIconView::LeftToRight);
+ m_pDesktop->iconView()->lineupIcons(TQIconView::LeftToRight);
}
}
void KRootWm::slotLineupIconsVert() {
if (m_bDesktopEnabled)
{
- m_pDesktop->iconView()->lineupIcons(QIconView::TopToBottom);
+ m_pDesktop->iconView()->lineupIcons(TQIconView::TopToBottom);
}
}
@@ -716,8 +716,8 @@ void KRootWm::slotRefreshDesktop() {
}
}
-QStringList KRootWm::configModules() {
- QStringList args;
+TQStringList KRootWm::configModules() {
+ TQStringList args;
args << "kde-background.desktop" << "kde-desktopbehavior.desktop" << "kde-desktop.desktop"
<< "kde-screensaver.desktop" << "kde-display.desktop";
return args;
@@ -726,11 +726,11 @@ QStringList KRootWm::configModules() {
void KRootWm::slotConfigureDesktop() {
if (!m_configDialog)
{
- m_configDialog = new KCMultiDialog( (QWidget*)0, "configureDialog" );
- connect(m_configDialog, SIGNAL(finished()), this, SLOT(slotConfigClosed()));
+ m_configDialog = new KCMultiDialog( (TQWidget*)0, "configureDialog" );
+ connect(m_configDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotConfigClosed()));
- QStringList modules = configModules();
- for (QStringList::const_iterator it = modules.constBegin(); it != modules.constEnd(); ++it)
+ TQStringList modules = configModules();
+ for (TQStringList::const_iterator it = modules.constBegin(); it != modules.constEnd(); ++it)
{
if (kapp->authorizeControlModule(*it))
{
@@ -755,7 +755,7 @@ void KRootWm::slotToggleDesktopMenu()
KDesktopSettings::setShowMenubar( !(m_bShowMenuBar && menuBar) );
KDesktopSettings::writeConfig();
- QByteArray data;
+ TQByteArray data;
kapp->dcopClient()->send( kdesktop_name, "KDesktopIface", "configure()", data);
// for the standalone menubar setting
kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
diff --git a/kdesktop/krootwm.h b/kdesktop/krootwm.h
index 3363fbf42..8bbf83817 100644
--- a/kdesktop/krootwm.h
+++ b/kdesktop/krootwm.h
@@ -23,8 +23,8 @@
#ifndef __krootwm_h__
#define __krootwm_h__
-#include <qpixmap.h>
-#include <qobject.h>
+#include <tqpixmap.h>
+#include <tqobject.h>
// we need Window but do not want to include X.h since it
// #defines way too many constants
@@ -59,7 +59,7 @@ enum {
/**
* This class is the handler for the menus (root popup menu and desktop menubar)
*/
-class KRootWm: public QObject {
+class KRootWm: public TQObject {
Q_OBJECT
public:
@@ -67,7 +67,7 @@ public:
~KRootWm();
bool startup;
- void mousePressed( const QPoint& _global, int _button );
+ void mousePressed( const TQPoint& _global, int _button );
bool hasLeftButtonMenu() { return leftButtonChoice != NOTHING; }
/**
@@ -83,7 +83,7 @@ public:
/**
* The position of the (usually RMB) click that opened the 'desktop' menu
*/
- QPoint desktopMenuPosition() const { return m_desktopMenuPosition; }
+ TQPoint desktopMenuPosition() const { return m_desktopMenuPosition; }
/**
* Read and apply configuration
@@ -93,7 +93,7 @@ public:
/**
* List of config modules used by Configure Desktop
*/
- static QStringList configModules();
+ static TQStringList configModules();
public slots:
void slotArrangeByNameCS();
@@ -126,10 +126,10 @@ private:
// The five root menus :
KWindowListMenu* windowListMenu;
- QPopupMenu* desktopMenu;
+ TQPopupMenu* desktopMenu;
// the appMenu is (will be) provided by kicker
- QPopupMenu* customMenu1;
- QPopupMenu* customMenu2;
+ TQPopupMenu* customMenu1;
+ TQPopupMenu* customMenu2;
KCMultiDialog* m_configDialog;
// Configuration for the root menus :
@@ -142,9 +142,9 @@ private:
KActionMenu* bookmarks;
KBookmarkMenu* bookmarkMenu;
KActionCollection * m_actionCollection;
- QPoint m_desktopMenuPosition;
+ TQPoint m_desktopMenuPosition;
- void activateMenu( menuChoice choice, const QPoint& global );
+ void activateMenu( menuChoice choice, const TQPoint& global );
void buildMenus();
bool m_bShowMenuBar;
@@ -153,14 +153,14 @@ private:
bool m_bDesktopEnabled;
KMenuBar *menuBar;
- QPopupMenu *file;
- QPopupMenu *desk;
+ TQPopupMenu *file;
+ TQPopupMenu *desk;
KHelpMenu *help;
- QPixmap defaultPixmap;
+ TQPixmap defaultPixmap;
void doNewSession( bool lock );
- QPopupMenu *sessionsMenu;
+ TQPopupMenu *sessionsMenu;
static KRootWm * s_rootWm;
diff --git a/kdesktop/kshadowengine.cpp b/kdesktop/kshadowengine.cpp
index 12d0319d3..893eac8e0 100644
--- a/kdesktop/kshadowengine.cpp
+++ b/kdesktop/kshadowengine.cpp
@@ -22,7 +22,7 @@
*/
#include "kshadowengine.h"
-#include <qcolor.h>
+#include <tqcolor.h>
#include "kshadowsettings.h"
KShadowEngine::KShadowEngine() :
@@ -54,9 +54,9 @@ KShadowSettings *KShadowEngine::shadowSettings()
return m_shadowSettings;
}
-QImage KShadowEngine::makeShadow(const QPixmap& textPixmap, const QColor &bgColor)
+TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgColor)
{
- QImage result;
+ TQImage result;
// create a new image for for the shaddow
int w = textPixmap.width();
@@ -74,7 +74,7 @@ QImage KShadowEngine::makeShadow(const QPixmap& textPixmap, const QColor &bgColo
/*
* This is the source pixmap
*/
- QImage img = textPixmap.convertToImage().convertDepth(32);
+ TQImage img = textPixmap.convertToImage().convertDepth(32);
/*
* Resize the image if necessary
@@ -121,7 +121,7 @@ QImage KShadowEngine::makeShadow(const QPixmap& textPixmap, const QColor &bgColo
// Multiplication factor for pixels diagonal to the text
#define DIAGONAL_FACTOR 1.0
-double KShadowEngine::defaultDecay(QImage& source, int i, int j)
+double KShadowEngine::defaultDecay(TQImage& source, int i, int j)
{
if ((i < 1) || (j < 1) || (i > source.width() - 2) || (j > source.height() - 2))
return 0;
@@ -140,19 +140,19 @@ double KShadowEngine::defaultDecay(QImage& source, int i, int j)
return alphaShadow;
}
-double KShadowEngine::doubleLinearDecay(QImage& source, int i, int j)
+double KShadowEngine::doubleLinearDecay(TQImage& source, int i, int j)
{
//printf("img: %p, %d %d\n", (char *) &source, i, j);
return defaultDecay( source, i, j ); // for now
}
-double KShadowEngine::radialDecay(QImage& source, int i, int j)
+double KShadowEngine::radialDecay(TQImage& source, int i, int j)
{
//printf("img: %p, %d %d\n", (char *) &source, i, j);
return defaultDecay( source, i, j ); // for now
}
-double KShadowEngine::noDecay(QImage& source, int i, int j)
+double KShadowEngine::noDecay(TQImage& source, int i, int j)
{
// create a new image for for the shaddow
int w = source.width();
diff --git a/kdesktop/kshadowengine.h b/kdesktop/kshadowengine.h
index 3649ea3f4..33391e464 100644
--- a/kdesktop/kshadowengine.h
+++ b/kdesktop/kshadowengine.h
@@ -24,9 +24,9 @@
#ifndef __FX_SHADOW
#define __FX_SHADOW
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qcolor.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
+#include <tqcolor.h>
class KShadowSettings;
@@ -77,7 +77,7 @@ class KShadowEngine
* @param bgColor the background color
* @return the resulting image
*/
- QImage makeShadow(const QPixmap& textPixmap, const QColor &bgColor);
+ TQImage makeShadow(const TQPixmap& textPixmap, const TQColor &bgColor);
private:
// No static objects in libs, and no static deleters in kdefx...
@@ -88,24 +88,24 @@ class KShadowEngine
/*
* a simple algorithm with 3 pixels thickness
*/
- double defaultDecay(QImage& source, int x, int y);
+ double defaultDecay(TQImage& source, int x, int y);
/*
* a slower algorithm where the influence of a pixel
* is qGray(px)/(abs(dx) + abs(dy) +1).
*/
- double doubleLinearDecay(QImage& source, int x, int y);
+ double doubleLinearDecay(TQImage& source, int x, int y);
/*
* a very slow algorithm where the influence of a pixel
* is qGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1).
*/
- double radialDecay(QImage& source, int x, int y);
+ double radialDecay(TQImage& source, int x, int y);
/*
* a nice/fast algorithm proposed by Bernardo Hung
*/
- double noDecay(QImage& source, int x, int y);
+ double noDecay(TQImage& source, int x, int y);
void *d;
};
diff --git a/kdesktop/kshadowsettings.cpp b/kdesktop/kshadowsettings.cpp
index 9c935d30f..4d6bce5c3 100644
--- a/kdesktop/kshadowsettings.cpp
+++ b/kdesktop/kshadowsettings.cpp
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include "kshadowsettings.h"
KShadowSettings::KShadowSettings()
@@ -30,7 +30,7 @@ KShadowSettings::KShadowSettings()
}
// load/save methods
-void KShadowSettings::fromString(const QString &val)
+void KShadowSettings::fromString(const TQString &val)
{
setOffsetX(val.section(',', OFFSET_X, OFFSET_X).toInt());
setOffsetY(val.section(',', OFFSET_Y, OFFSET_Y).toInt());
@@ -41,9 +41,9 @@ void KShadowSettings::fromString(const QString &val)
setSelectionType((SelectionType)val.section(',', SELECTION_TYPE, SELECTION_TYPE).toInt());
}
-QString KShadowSettings::toString() const
+TQString KShadowSettings::toString() const
{
- QString result;
+ TQString result;
result.sprintf("%d,%d,%f,%f,%d,%d,%d",
offsetX(),
offsetY(),
diff --git a/kdesktop/kshadowsettings.h b/kdesktop/kshadowsettings.h
index 9b707a853..1af544898 100644
--- a/kdesktop/kshadowsettings.h
+++ b/kdesktop/kshadowsettings.h
@@ -22,12 +22,12 @@
#ifndef __FX_DATA
#define __FX_DATA
-#define SHADOW_CONFIG_ENTRY QString("ShadowParameters")
-#define SHADOW_TEXT_COLOR QString("ShadowTextColor")
-#define SHADOW_TEXT_BACKGROUND QString("ShadowTextBackground")
+#define SHADOW_CONFIG_ENTRY TQString("ShadowParameters")
+#define SHADOW_TEXT_COLOR TQString("ShadowTextColor")
+#define SHADOW_TEXT_BACKGROUND TQString("ShadowTextBackground")
// fallback configuration string
-#define DEFAULT_SHADOW_CONFIGURATION QString("0,0,4.0,120.0,2,1,1,0,0,0")
+#define DEFAULT_SHADOW_CONFIGURATION TQString("0,0,4.0,120.0,2,1,1,0,0,0")
/**
* This class is the implementation of a structure for the
@@ -90,13 +90,13 @@ class KShadowSettings
* @param the string to load from (comma-separated values)
* @see ConfigurationOrder
*/
- virtual void fromString(const QString &s);
+ virtual void fromString(const TQString &s);
/**
* Saves the configuration to a string.
* @return the configuration (comma-separated values)
* @see ConfigurationOrder
*/
- virtual QString toString() const;
+ virtual TQString toString() const;
// get methods
/**
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index e7010f06d..7d5897ac7 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -30,7 +30,7 @@
#include <kurifilter.h>
#include <kio/job.h>
-#include <qscrollview.h>
+#include <tqscrollview.h>
#include "kwebdesktop.h"
#include <kmimetype.h>
#include <kparts/componentfactory.h>
@@ -52,18 +52,18 @@ KWebDesktopRun::KWebDesktopRun( KWebDesktop* webDesktop, const KURL & url )
{
kdDebug() << "KWebDesktopRun::KWebDesktopRun starting get" << endl;
KIO::Job * job = KIO::get(m_url, false, false);
- connect( job, SIGNAL( result( KIO::Job *)),
- this, SLOT( slotFinished(KIO::Job *)));
- connect( job, SIGNAL( mimetype( KIO::Job *, const QString &)),
- this, SLOT( slotMimetype(KIO::Job *, const QString &)));
+ connect( job, TQT_SIGNAL( result( KIO::Job *)),
+ this, TQT_SLOT( slotFinished(KIO::Job *)));
+ connect( job, TQT_SIGNAL( mimetype( KIO::Job *, const TQString &)),
+ this, TQT_SLOT( slotMimetype(KIO::Job *, const TQString &)));
}
-void KWebDesktopRun::slotMimetype( KIO::Job *job, const QString &_type )
+void KWebDesktopRun::slotMimetype( KIO::Job *job, const TQString &_type )
{
KIO::SimpleJob *sjob = static_cast<KIO::SimpleJob *>(job);
// Update our URL in case of a redirection
m_url = sjob->url();
- QString type = _type; // necessary copy if we plan to use it
+ TQString type = _type; // necessary copy if we plan to use it
sjob->putOnHold();
kdDebug() << "slotMimetype : " << type << endl;
@@ -105,12 +105,12 @@ int main( int argc, char **argv )
args->usage();
return 1;
}
- const int width = QCString(args->arg(0)).toInt();
- const int height = QCString(args->arg(1)).toInt();
- QCString imageFile = args->arg(2);
- QString url;
+ const int width = TQCString(args->arg(0)).toInt();
+ const int height = TQCString(args->arg(1)).toInt();
+ TQCString imageFile = args->arg(2);
+ TQString url;
if (args->count() == 4)
- url = QString::fromLocal8Bit(args->arg(3));
+ url = TQString::fromLocal8Bit(args->arg(3));
KWebDesktop *webDesktop = new KWebDesktop( 0, imageFile, width, height );
@@ -138,13 +138,13 @@ void KWebDesktop::slotCompleted()
{
kdDebug() << "KWebDesktop::slotCompleted" << endl;
// Dump image to m_imageFile
- QPixmap snapshot = QPixmap::grabWidget( m_part->widget() );
+ TQPixmap snapshot = TQPixmap::grabWidget( m_part->widget() );
snapshot.save( m_imageFile, "PNG" );
// And terminate the app.
kapp->quit();
}
-KParts::ReadOnlyPart* KWebDesktop::createPart( const QString& mimeType )
+KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType )
{
delete m_part;
m_part = 0;
@@ -161,26 +161,26 @@ KParts::ReadOnlyPart* KWebDesktop::createPart( const QString& mimeType )
htmlPart->setJScriptEnabled(false);
htmlPart->setJavaEnabled(false);
- ((QScrollView *)htmlPart->widget())->setHScrollBarMode( QScrollView::AlwaysOff );
- ((QScrollView *)htmlPart->widget())->setVScrollBarMode( QScrollView::AlwaysOff );
+ ((TQScrollView *)htmlPart->widget())->setHScrollBarMode( TQScrollView::AlwaysOff );
+ ((TQScrollView *)htmlPart->widget())->setVScrollBarMode( TQScrollView::AlwaysOff );
- connect( htmlPart, SIGNAL( completed() ), this, SLOT( slotCompleted() ) );
+ connect( htmlPart, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) );
m_part = htmlPart;
} else {
// Try to find an appropriate viewer component
m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>
- ( mimeType, QString::null, 0, 0, this, 0 );
+ ( mimeType, TQString::null, 0, 0, this, 0 );
if ( !m_part )
kdWarning() << "No handler found for " << mimeType << endl;
else {
kdDebug() << "Loaded " << m_part->className() << endl;
- connect( m_part, SIGNAL( completed() ),
- this, SLOT( slotCompleted() ) );
+ connect( m_part, TQT_SIGNAL( completed() ),
+ this, TQT_SLOT( slotCompleted() ) );
}
}
if ( m_part ) {
- connect( m_part, SIGNAL( canceled(const QString &) ),
- this, SLOT( slotCompleted() ) );
+ connect( m_part, TQT_SIGNAL( canceled(const TQString &) ),
+ this, TQT_SLOT( slotCompleted() ) );
}
return m_part;
}
diff --git a/kdesktop/kwebdesktop/kwebdesktop.h b/kdesktop/kwebdesktop/kwebdesktop.h
index d364f8022..7ec81338e 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.h
+++ b/kdesktop/kwebdesktop/kwebdesktop.h
@@ -19,8 +19,8 @@
#ifndef KWEBDESKTOP_H
#define KWEBDESKTOP_H
-#include <qobject.h>
-#include <qcstring.h>
+#include <tqobject.h>
+#include <tqcstring.h>
#include <kparts/browserextension.h>
#include <khtml_part.h>
@@ -30,22 +30,22 @@ class KWebDesktop : public QObject
{
Q_OBJECT
public:
- KWebDesktop( QObject* parent, const QCString & imageFile, int width, int height )
- : QObject( parent ),
+ KWebDesktop( TQObject* parent, const TQCString & imageFile, int width, int height )
+ : TQObject( parent ),
m_part( 0 ),
m_imageFile( imageFile ),
m_width( width ),
m_height( height ) {}
~KWebDesktop();
- KParts::ReadOnlyPart* createPart( const QString& mimeType );
+ KParts::ReadOnlyPart* createPart( const TQString& mimeType );
private slots:
void slotCompleted();
private:
KParts::ReadOnlyPart* m_part;
- QCString m_imageFile;
+ TQCString m_imageFile;
int m_width;
int m_height;
};
@@ -59,7 +59,7 @@ public:
~KWebDesktopRun() {}
protected slots:
- void slotMimetype( KIO::Job *job, const QString &_type );
+ void slotMimetype( KIO::Job *job, const TQString &_type );
void slotFinished( KIO::Job * job );
private:
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc
index f351fe2e7..b51791d98 100644
--- a/kdesktop/lock/autologout.cc
+++ b/kdesktop/lock/autologout.cc
@@ -17,39 +17,39 @@
#include <kmessagebox.h>
#include <kdialog.h>
-#include <qlayout.h>
-#include <qmessagebox.h>
-#include <qlabel.h>
-#include <qstyle.h>
-#include <qapplication.h>
-#include <qdialog.h>
-#include <qprogressbar.h>
+#include <tqlayout.h>
+#include <tqmessagebox.h>
+#include <tqlabel.h>
+#include <tqstyle.h>
+#include <tqapplication.h>
+#include <tqdialog.h>
+#include <tqprogressbar.h>
#define COUNTDOWN 30
-AutoLogout::AutoLogout(LockProcess *parent) : QDialog(parent, "password dialog", true, WX11BypassWM)
+AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog", true, WX11BypassWM)
{
- frame = new QFrame(this);
- frame->setFrameStyle(QFrame::Panel | QFrame::Raised);
+ frame = new TQFrame(this);
+ frame->setFrameStyle(TQFrame::Panel | TQFrame::Raised);
frame->setLineWidth(2);
- QLabel *pixLabel = new QLabel( frame, "pixlabel" );
+ TQLabel *pixLabel = new TQLabel( frame, "pixlabel" );
pixLabel->setPixmap(DesktopIcon("exit"));
- QLabel *greetLabel = new QLabel(i18n("<nobr><qt><b>Automatic Log Out</b></qt><nobr>"), frame);
- QLabel *infoLabel = new QLabel(i18n("<qt>To prevent being logged out, resume using this session by moving the mouse or pressing a key.</qt>"), frame);
+ TQLabel *greetLabel = new TQLabel(i18n("<nobr><qt><b>Automatic Log Out</b></qt><nobr>"), frame);
+ TQLabel *infoLabel = new TQLabel(i18n("<qt>To prevent being logged out, resume using this session by moving the mouse or pressing a key.</qt>"), frame);
- mStatusLabel = new QLabel("<b> </b>", frame);
- mStatusLabel->setAlignment(QLabel::AlignCenter);
+ mStatusLabel = new TQLabel("<b> </b>", frame);
+ mStatusLabel->setAlignment(TQLabel::AlignCenter);
- QLabel *mProgressLabel = new QLabel("Time Remaining:", frame);
- mProgressRemaining = new QProgressBar(frame);
+ TQLabel *mProgressLabel = new TQLabel("Time Remaining:", frame);
+ mProgressRemaining = new TQProgressBar(frame);
mProgressRemaining->setPercentageVisible(false);
- QVBoxLayout *unlockDialogLayout = new QVBoxLayout( this );
+ TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
unlockDialogLayout->addWidget( frame );
- frameLayout = new QGridLayout(frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint());
+ frameLayout = new TQGridLayout(frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint());
frameLayout->addMultiCellWidget(pixLabel, 0, 2, 0, 0, Qt::AlignCenter | Qt::AlignTop);
frameLayout->addWidget(greetLabel, 0, 1);
frameLayout->addWidget(mStatusLabel, 1, 1);
@@ -66,7 +66,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : QDialog(parent, "password dialog",
mCountdownTimerId = startTimer(1000/25);
- connect(qApp, SIGNAL(activity()), SLOT(slotActivity()));
+ connect(qApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()));
}
AutoLogout::~AutoLogout()
@@ -82,7 +82,7 @@ void AutoLogout::updateInfo(int timeout)
mProgressRemaining->setProgress(timeout);
}
-void AutoLogout::timerEvent(QTimerEvent *ev)
+void AutoLogout::timerEvent(TQTimerEvent *ev)
{
if (ev->timerId() == mCountdownTimerId)
{
@@ -108,8 +108,8 @@ void AutoLogout::logout()
void AutoLogout::show()
{
- QDialog::show();
- QApplication::flushX();
+ TQDialog::show();
+ TQApplication::flushX();
}
#include "autologout.moc"
diff --git a/kdesktop/lock/autologout.h b/kdesktop/lock/autologout.h
index e48716575..20c7afc6c 100644
--- a/kdesktop/lock/autologout.h
+++ b/kdesktop/lock/autologout.h
@@ -9,9 +9,9 @@
#ifndef __TIMEOUT_H__
#define __TIMEOUT_H__
-#include <qstringlist.h>
+#include <tqstringlist.h>
-#include <qlayout.h>
+#include <tqlayout.h>
class LockProcess;
class QFrame;
@@ -30,20 +30,20 @@ public:
virtual void show();
protected:
- virtual void timerEvent(QTimerEvent *);
+ virtual void timerEvent(TQTimerEvent *);
private slots:
void slotActivity();
private:
void updateInfo(int);
- QFrame *frame;
- QGridLayout *frameLayout;
- QLabel *mStatusLabel;
+ TQFrame *frame;
+ TQGridLayout *frameLayout;
+ TQLabel *mStatusLabel;
int mCountdownTimerId;
int mRemaining;
- QTimer countDownTimer;
- QProgressBar *mProgressRemaining;
+ TQTimer countDownTimer;
+ TQProgressBar *mProgressRemaining;
void logout();
};
diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc
index 66b54c0bc..2249dc46e 100644
--- a/kdesktop/lock/infodlg.cc
+++ b/kdesktop/lock/infodlg.cc
@@ -25,18 +25,18 @@
#include <dcopref.h>
#include <kmessagebox.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qmessagebox.h>
-#include <qsimplerichtext.h>
-#include <qlabel.h>
-#include <qstringlist.h>
-#include <qfontmetrics.h>
-#include <qstyle.h>
-#include <qapplication.h>
-#include <qlistview.h>
-#include <qheader.h>
-#include <qcheckbox.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqmessagebox.h>
+#include <tqsimplerichtext.h>
+#include <tqlabel.h>
+#include <tqstringlist.h>
+#include <tqfontmetrics.h>
+#include <tqstyle.h>
+#include <tqapplication.h>
+#include <tqlistview.h>
+#include <tqheader.h>
+#include <tqcheckbox.h>
#include <ctype.h>
#include <unistd.h>
@@ -59,28 +59,28 @@
// Simple dialog for displaying an unlock status or recurring error message
//
InfoDlg::InfoDlg(LockProcess *parent)
- : QDialog(parent, "information dialog", true, WX11BypassWM),
+ : TQDialog(parent, "information dialog", true, WX11BypassWM),
mUnlockingFailed(false)
{
- frame = new QFrame( this );
- frame->setFrameStyle( QFrame::Panel | QFrame::Raised );
+ frame = new TQFrame( this );
+ frame->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
frame->setLineWidth( 2 );
- mpixLabel = new QLabel( frame, "pixlabel" );
+ mpixLabel = new TQLabel( frame, "pixlabel" );
mpixLabel->setPixmap(DesktopIcon("unlock"));
KUser user;
- mStatusLabel = new QLabel( "<b> </b>", frame );
- mStatusLabel->setAlignment( QLabel::AlignCenter );
+ mStatusLabel = new TQLabel( "<b> </b>", frame );
+ mStatusLabel->setAlignment( TQLabel::AlignCenter );
- QVBoxLayout *unlockDialogLayout = new QVBoxLayout( this );
+ TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
unlockDialogLayout->addWidget( frame );
- QHBoxLayout *layStatus = new QHBoxLayout( 0, 0, KDialog::spacingHint());
+ TQHBoxLayout *layStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
layStatus->addWidget( mStatusLabel );
- frameLayout = new QGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
+ frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, AlignTop );
frameLayout->addLayout( layStatus, 1, 1 );
@@ -92,7 +92,7 @@ InfoDlg::~InfoDlg()
hide();
}
-void InfoDlg::updateLabel(QString &txt)
+void InfoDlg::updateLabel(TQString &txt)
{
mStatusLabel->setPaletteForegroundColor(Qt::black);
mStatusLabel->setText("<b>" + txt + "</b>");
@@ -125,8 +125,8 @@ void InfoDlg::setErrorIcon()
void InfoDlg::show()
{
- QDialog::show();
- QApplication::flushX();
+ TQDialog::show();
+ TQApplication::flushX();
}
#include "infodlg.moc"
diff --git a/kdesktop/lock/infodlg.h b/kdesktop/lock/infodlg.h
index ffe8364c2..b0e98150f 100644
--- a/kdesktop/lock/infodlg.h
+++ b/kdesktop/lock/infodlg.h
@@ -8,8 +8,8 @@
#ifndef __INFODLG_H__
#define __INFODLG_H__
-#include <qdialog.h>
-#include <qstringlist.h>
+#include <tqdialog.h>
+#include <tqstringlist.h>
class QFrame;
class QGridLayout;
@@ -31,7 +31,7 @@ public:
~InfoDlg();
virtual void show();
- void updateLabel( QString &txt );
+ void updateLabel( TQString &txt );
void setUnlockIcon();
void setKDEIcon();
void setInfoIcon();
@@ -39,14 +39,14 @@ public:
void setErrorIcon();
private:
- QFrame *frame;
- QGridLayout *frameLayout;
- QLabel *mStatusLabel;
- QLabel *mpixLabel;
+ TQFrame *frame;
+ TQGridLayout *frameLayout;
+ TQLabel *mStatusLabel;
+ TQLabel *mpixLabel;
int mCapsLocked;
bool mUnlockingFailed;
- QStringList layoutsList;
- QStringList::iterator currLayout;
+ TQStringList layoutsList;
+ TQStringList::iterator currLayout;
int sPid, sFd;
};
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 8006cf29d..2efe56a8a 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -29,18 +29,18 @@
#include <dcopref.h>
#include <kmessagebox.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qmessagebox.h>
-#include <qsimplerichtext.h>
-#include <qlabel.h>
-#include <qstringlist.h>
-#include <qfontmetrics.h>
-#include <qstyle.h>
-#include <qapplication.h>
-#include <qlistview.h>
-#include <qheader.h>
-#include <qcheckbox.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqmessagebox.h>
+#include <tqsimplerichtext.h>
+#include <tqlabel.h>
+#include <tqstringlist.h>
+#include <tqfontmetrics.h>
+#include <tqstyle.h>
+#include <tqapplication.h>
+#include <tqlistview.h>
+#include <tqheader.h>
+#include <tqcheckbox.h>
#include <ctype.h>
#include <unistd.h>
@@ -65,27 +65,27 @@
// Simple dialog for entering a password.
//
PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
- : QDialog(parent, "password dialog", true, WX11BypassWM),
+ : TQDialog(parent, "password dialog", true, WX11BypassWM),
mPlugin( plugin ),
mCapsLocked(-1),
mUnlockingFailed(false)
{
- frame = new QFrame( this );
- frame->setFrameStyle( QFrame::Panel | QFrame::Raised );
+ frame = new TQFrame( this );
+ frame->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
frame->setLineWidth( 2 );
- QLabel *pixLabel = new QLabel( frame, "pixlabel" );
+ TQLabel *pixLabel = new TQLabel( frame, "pixlabel" );
pixLabel->setPixmap(DesktopIcon("lock"));
KUser user;
- QLabel *greetLabel = new QLabel( user.fullName().isEmpty() ?
+ TQLabel *greetLabel = new TQLabel( user.fullName().isEmpty() ?
i18n("<nobr><b>The session is locked</b><br>") :
i18n("<nobr><b>The session was locked by %1</b><br>").arg( user.fullName() ), frame );
- mStatusLabel = new QLabel( "<b> </b>", frame );
- mStatusLabel->setAlignment( QLabel::AlignCenter );
+ mStatusLabel = new TQLabel( "<b> </b>", frame );
+ mStatusLabel->setAlignment( TQLabel::AlignCenter );
- mLayoutButton = new QPushButton( frame );
+ mLayoutButton = new TQPushButton( frame );
mLayoutButton->setFlat( true );
KSeparator *sep = new KSeparator( KSeparator::HLine, frame );
@@ -94,24 +94,24 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
ok = new KPushButton( i18n("Unl&ock"), frame );
cancel = new KPushButton( KStdGuiItem::cancel(), frame );
- greet = plugin->info->create( this, 0, this, mLayoutButton, QString::null,
+ greet = plugin->info->create( this, 0, this, mLayoutButton, TQString::null,
KGreeterPlugin::Authenticate, KGreeterPlugin::ExUnlock );
- QVBoxLayout *unlockDialogLayout = new QVBoxLayout( this );
+ TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
unlockDialogLayout->addWidget( frame );
- QHBoxLayout *layStatus = new QHBoxLayout( 0, 0, KDialog::spacingHint());
+ TQHBoxLayout *layStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
layStatus->addWidget( mStatusLabel );
layStatus->addWidget( mLayoutButton );
- QHBoxLayout *layButtons = new QHBoxLayout( 0, 0, KDialog::spacingHint());
+ TQHBoxLayout *layButtons = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
layButtons->addWidget( mNewSessButton );
layButtons->addStretch();
layButtons->addWidget( ok );
layButtons->addWidget( cancel );
- frameLayout = new QGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
+ frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, AlignTop );
frameLayout->addWidget( greetLabel, 0, 1 );
frameLayout->addItem( greet->getLayoutItem(), 1, 1 );
@@ -123,10 +123,10 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
setTabOrder( cancel, mNewSessButton );
setTabOrder( mNewSessButton, mLayoutButton );
- connect(mLayoutButton, SIGNAL(clicked()), this, SLOT(layoutClicked()));
- connect(cancel, SIGNAL(clicked()), SLOT(reject()));
- connect(ok, SIGNAL(clicked()), SLOT(slotOK()));
- connect(mNewSessButton, SIGNAL(clicked()), SLOT(slotSwitchUser()));
+ connect(mLayoutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(layoutClicked()));
+ connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+ connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK()));
+ connect(mNewSessButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSwitchUser()));
if (!DM().isSwitchable() || !kapp->authorize("switch_user"))
mNewSessButton->hide();
@@ -135,14 +135,14 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
mFailedTimerId = 0;
mTimeoutTimerId = startTimer(PASSDLG_HIDE_TIMEOUT);
- connect(qApp, SIGNAL(activity()), SLOT(slotActivity()) );
+ connect(qApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
greet->start();
DCOPRef kxkb("kxkb", "kxkb");
if( !kxkb.isNull() ) {
layoutsList = kxkb.call("getLayoutsList");
- QString currentLayout = kxkb.call("getCurrentLayout");
+ TQString currentLayout = kxkb.call("getCurrentLayout");
if( !currentLayout.isEmpty() && layoutsList.count() > 1 ) {
currLayout = layoutsList.find(currentLayout);
if (currLayout == layoutsList.end())
@@ -175,11 +175,11 @@ void PasswordDlg::layoutClicked()
}
-void PasswordDlg::setLayoutText( const QString &txt )
+void PasswordDlg::setLayoutText( const TQString &txt )
{
mLayoutButton->setText( txt );
- QSize sz = mLayoutButton->fontMetrics().size( 0, txt );
- int mrg = mLayoutButton->style().pixelMetric( QStyle::PM_ButtonMargin ) * 2;
+ TQSize sz = mLayoutButton->fontMetrics().size( 0, txt );
+ int mrg = mLayoutButton->style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
mLayoutButton->setFixedSize( sz.width() + mrg, sz.height() + mrg );
}
@@ -206,7 +206,7 @@ void PasswordDlg::updateLabel()
//
// Handle timer events.
//
-void PasswordDlg::timerEvent(QTimerEvent *ev)
+void PasswordDlg::timerEvent(TQTimerEvent *ev)
{
if (ev->timerId() == mTimeoutTimerId)
{
@@ -227,9 +227,9 @@ void PasswordDlg::timerEvent(QTimerEvent *ev)
}
}
-bool PasswordDlg::eventFilter(QObject *, QEvent *ev)
+bool PasswordDlg::eventFilter(TQObject *, TQEvent *ev)
{
- if (ev->type() == QEvent::KeyPress || ev->type() == QEvent::KeyRelease)
+ if (ev->type() == TQEvent::KeyPress || ev->type() == TQEvent::KeyRelease)
capsLocked();
return false;
}
@@ -371,14 +371,14 @@ void PasswordDlg::handleVerify()
if (!GRecvArr( &arr ))
break;
if (!greet->textMessage( arr, false ))
- static_cast< LockProcess* >(parent())->msgBox( QMessageBox::Information, QString::fromLocal8Bit( arr ) );
+ static_cast< LockProcess* >(parent())->msgBox( TQMessageBox::Information, TQString::fromLocal8Bit( arr ) );
::free( arr );
continue;
case ConvPutError:
if (!GRecvArr( &arr ))
break;
if (!greet->textMessage( arr, true ))
- static_cast< LockProcess* >(parent())->msgBox( QMessageBox::Warning, QString::fromLocal8Bit( arr ) );
+ static_cast< LockProcess* >(parent())->msgBox( TQMessageBox::Warning, TQString::fromLocal8Bit( arr ) );
::free( arr );
continue;
}
@@ -411,7 +411,7 @@ void PasswordDlg::gplugReturnBinary( const char *data )
handleVerify();
}
-void PasswordDlg::gplugSetUser( const QString & )
+void PasswordDlg::gplugSetUser( const TQString & )
{
// ignore ...
}
@@ -419,7 +419,7 @@ void PasswordDlg::gplugSetUser( const QString & )
void PasswordDlg::cantCheck()
{
greet->failed();
- static_cast< LockProcess* >(parent())->msgBox( QMessageBox::Critical,
+ static_cast< LockProcess* >(parent())->msgBox( TQMessageBox::Critical,
i18n("Cannot unlock the session because the authentication system failed to work;\n"
"you must kill kdesktop_lock (pid %1) manually.").arg(getpid()) );
greet->revive();
@@ -466,24 +466,24 @@ void PasswordDlg::gplugActivity()
slotActivity();
}
-void PasswordDlg::gplugMsgBox( QMessageBox::Icon type, const QString &text )
+void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
{
- QDialog dialog( this, 0, true, WX11BypassWM );
- QFrame *winFrame = new QFrame( &dialog );
- winFrame->setFrameStyle( QFrame::WinPanel | QFrame::Raised );
+ TQDialog dialog( this, 0, true, WX11BypassWM );
+ TQFrame *winFrame = new TQFrame( &dialog );
+ winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
winFrame->setLineWidth( 2 );
- QVBoxLayout *vbox = new QVBoxLayout( &dialog );
+ TQVBoxLayout *vbox = new TQVBoxLayout( &dialog );
vbox->addWidget( winFrame );
- QLabel *label1 = new QLabel( winFrame );
- label1->setPixmap( QMessageBox::standardIcon( type ) );
- QLabel *label2 = new QLabel( text, winFrame );
+ TQLabel *label1 = new TQLabel( winFrame );
+ label1->setPixmap( TQMessageBox::standardIcon( type ) );
+ TQLabel *label2 = new TQLabel( text, winFrame );
KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
button->setDefault( true );
- button->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
- connect( button, SIGNAL( clicked() ), SLOT( accept() ) );
+ button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+ connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) );
- QGridLayout *grid = new QGridLayout( winFrame, 2, 2, 10 );
+ TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 );
grid->addWidget( label1, 0, 0, Qt::AlignCenter );
grid->addWidget( label2, 0, 1, Qt::AlignCenter );
grid->addMultiCellWidget( button, 1,1, 0,1, Qt::AlignCenter );
@@ -499,8 +499,8 @@ void PasswordDlg::slotOK()
void PasswordDlg::show()
{
- QDialog::show();
- QApplication::flushX();
+ TQDialog::show();
+ TQApplication::flushX();
}
void PasswordDlg::slotStartNewSession()
@@ -513,16 +513,16 @@ void PasswordDlg::slotStartNewSession()
killTimer(mTimeoutTimerId);
mTimeoutTimerId = 0;
- QDialog *dialog = new QDialog( this, "warnbox", true, WX11BypassWM );
- QFrame *winFrame = new QFrame( dialog );
- winFrame->setFrameStyle( QFrame::WinPanel | QFrame::Raised );
+ TQDialog *dialog = new TQDialog( this, "warnbox", true, WX11BypassWM );
+ TQFrame *winFrame = new TQFrame( dialog );
+ winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
winFrame->setLineWidth( 2 );
- QVBoxLayout *vbox = new QVBoxLayout( dialog );
+ TQVBoxLayout *vbox = new TQVBoxLayout( dialog );
vbox->addWidget( winFrame );
- QLabel *label1 = new QLabel( winFrame );
- label1->setPixmap( QMessageBox::standardIcon( QMessageBox::Warning ) );
- QString qt_text =
+ TQLabel *label1 = new TQLabel( winFrame );
+ label1->setPixmap( TQMessageBox::standardIcon( TQMessageBox::Warning ) );
+ TQString qt_text =
i18n("You have chosen to open another desktop session "
"instead of resuming the current one.<br>"
"The current session will be hidden "
@@ -535,23 +535,23 @@ void PasswordDlg::slotStartNewSession()
"Additionally, the KDE Panel and Desktop menus have "
"actions for switching between sessions.")
.arg(7).arg(8);
- QLabel *label2 = new QLabel( qt_text, winFrame );
+ TQLabel *label2 = new TQLabel( qt_text, winFrame );
KPushButton *okbutton = new KPushButton( KGuiItem(i18n("&Start New Session"), "fork"), winFrame );
okbutton->setDefault( true );
- connect( okbutton, SIGNAL( clicked() ), dialog, SLOT( accept() ) );
+ connect( okbutton, TQT_SIGNAL( clicked() ), dialog, TQT_SLOT( accept() ) );
KPushButton *cbutton = new KPushButton( KStdGuiItem::cancel(), winFrame );
- connect( cbutton, SIGNAL( clicked() ), dialog, SLOT( reject() ) );
+ connect( cbutton, TQT_SIGNAL( clicked() ), dialog, TQT_SLOT( reject() ) );
- QBoxLayout *mbox = new QVBoxLayout( winFrame, KDialog::marginHint(), KDialog::spacingHint() );
+ TQBoxLayout *mbox = new TQVBoxLayout( winFrame, KDialog::marginHint(), KDialog::spacingHint() );
- QGridLayout *grid = new QGridLayout( mbox, 2, 2, 2 * KDialog::spacingHint() );
+ TQGridLayout *grid = new TQGridLayout( mbox, 2, 2, 2 * KDialog::spacingHint() );
grid->setMargin( KDialog::marginHint() );
grid->addWidget( label1, 0, 0, Qt::AlignCenter );
grid->addWidget( label2, 0, 1, Qt::AlignCenter );
- QCheckBox *cb = new QCheckBox( i18n("&Do not ask again"), winFrame );
+ TQCheckBox *cb = new TQCheckBox( i18n("&Do not ask again"), winFrame );
grid->addMultiCellWidget( cb, 1,1, 0,1 );
- QBoxLayout *hbox = new QHBoxLayout( mbox, KDialog::spacingHint() );
+ TQBoxLayout *hbox = new TQHBoxLayout( mbox, KDialog::spacingHint() );
hbox->addStretch( 1 );
hbox->addWidget( okbutton );
hbox->addStretch( 1 );
@@ -563,8 +563,8 @@ void PasswordDlg::slotStartNewSession()
int pref_height = 0;
// Calculate a proper size for the text.
{
- QSimpleRichText rt(qt_text, dialog->font());
- QRect rect = KGlobalSettings::desktopGeometry(dialog);
+ TQSimpleRichText rt(qt_text, dialog->font());
+ TQRect rect = KGlobalSettings::desktopGeometry(dialog);
pref_width = rect.width() / 3;
rt.setWidth(pref_width);
@@ -593,13 +593,13 @@ void PasswordDlg::slotStartNewSession()
pref_width = used_width;
}
}
- label2->setFixedSize(QSize(pref_width+10, pref_height));
+ label2->setFixedSize(TQSize(pref_width+10, pref_height));
int ret = static_cast< LockProcess* >( parent())->execDialog( dialog );
delete dialog;
- if (ret == QDialog::Accepted) {
+ if (ret == TQDialog::Accepted) {
if (cb->isChecked())
KMessageBox::saveDontShowAgainContinue( ":confirmNewSession" );
DM().startReserve();
@@ -608,11 +608,11 @@ void PasswordDlg::slotStartNewSession()
mTimeoutTimerId = startTimer(PASSDLG_HIDE_TIMEOUT);
}
-class LockListViewItem : public QListViewItem {
+class LockListViewItem : public TQListViewItem {
public:
- LockListViewItem( QListView *parent,
- const QString &sess, const QString &loc, int _vt )
- : QListViewItem( parent )
+ LockListViewItem( TQListView *parent,
+ const TQString &sess, const TQString &loc, int _vt )
+ : TQListViewItem( parent )
, vt( _vt )
{
setText( 0, sess );
@@ -627,33 +627,33 @@ void PasswordDlg::slotSwitchUser()
int p = 0;
DM dm;
- QDialog dialog( this, "sessbox", true, WX11BypassWM );
- QFrame *winFrame = new QFrame( &dialog );
- winFrame->setFrameStyle( QFrame::WinPanel | QFrame::Raised );
+ TQDialog dialog( this, "sessbox", true, WX11BypassWM );
+ TQFrame *winFrame = new TQFrame( &dialog );
+ winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
winFrame->setLineWidth( 2 );
- QBoxLayout *vbox = new QVBoxLayout( &dialog );
+ TQBoxLayout *vbox = new TQVBoxLayout( &dialog );
vbox->addWidget( winFrame );
- QBoxLayout *hbox = new QHBoxLayout( winFrame, KDialog::marginHint(), KDialog::spacingHint() );
+ TQBoxLayout *hbox = new TQHBoxLayout( winFrame, KDialog::marginHint(), KDialog::spacingHint() );
- QBoxLayout *vbox1 = new QVBoxLayout( hbox, KDialog::spacingHint() );
- QBoxLayout *vbox2 = new QVBoxLayout( hbox, KDialog::spacingHint() );
+ TQBoxLayout *vbox1 = new TQVBoxLayout( hbox, KDialog::spacingHint() );
+ TQBoxLayout *vbox2 = new TQVBoxLayout( hbox, KDialog::spacingHint() );
KPushButton *btn;
SessList sess;
if (dm.localSessions( sess )) {
- lv = new QListView( winFrame );
- connect( lv, SIGNAL(doubleClicked(QListViewItem *, const QPoint&, int)), SLOT(slotSessionActivated()) );
- connect( lv, SIGNAL(doubleClicked(QListViewItem *, const QPoint&, int)), &dialog, SLOT(reject()) );
+ lv = new TQListView( winFrame );
+ connect( lv, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), TQT_SLOT(slotSessionActivated()) );
+ connect( lv, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), &dialog, TQT_SLOT(reject()) );
lv->setAllColumnsShowFocus( true );
lv->addColumn( i18n("Session") );
lv->addColumn( i18n("Location") );
- lv->setColumnWidthMode( 0, QListView::Maximum );
- lv->setColumnWidthMode( 1, QListView::Maximum );
- QListViewItem *itm = 0;
- QString user, loc;
+ lv->setColumnWidthMode( 0, TQListView::Maximum );
+ lv->setColumnWidthMode( 1, TQListView::Maximum );
+ TQListViewItem *itm = 0;
+ TQString user, loc;
int ns = 0;
for (SessList::ConstIterator it = sess.begin(); it != sess.end(); ++it) {
DM::sess2Str2( *it, user, loc );
@@ -667,17 +667,17 @@ void PasswordDlg::slotSwitchUser()
ns++;
}
int fw = lv->frameWidth() * 2;
- QSize hds( lv->header()->sizeHint() );
+ TQSize hds( lv->header()->sizeHint() );
lv->setMinimumWidth( fw + hds.width() +
- (ns > 10 ? style().pixelMetric(QStyle::PM_ScrollBarExtent) : 0 ) );
+ (ns > 10 ? style().pixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) );
lv->setFixedHeight( fw + hds.height() +
itm->height() * (ns < 6 ? 6 : ns > 10 ? 10 : ns) );
lv->header()->adjustHeaderSize();
vbox1->addWidget( lv );
btn = new KPushButton( KGuiItem(i18n("session", "&Activate"), "fork"), winFrame );
- connect( btn, SIGNAL(clicked()), SLOT(slotSessionActivated()) );
- connect( btn, SIGNAL(clicked()), &dialog, SLOT(reject()) );
+ connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSessionActivated()) );
+ connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(reject()) );
vbox2->addWidget( btn );
vbox2->addStretch( 2 );
}
@@ -685,8 +685,8 @@ void PasswordDlg::slotSwitchUser()
if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
{
btn = new KPushButton( KGuiItem(i18n("Start &New Session"), "fork"), winFrame );
- connect( btn, SIGNAL(clicked()), SLOT(slotStartNewSession()) );
- connect( btn, SIGNAL(clicked()), &dialog, SLOT(reject()) );
+ connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartNewSession()) );
+ connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(reject()) );
if (!p)
btn->setEnabled( false );
vbox2->addWidget( btn );
@@ -694,7 +694,7 @@ void PasswordDlg::slotSwitchUser()
}
btn = new KPushButton( KStdGuiItem::cancel(), winFrame );
- connect( btn, SIGNAL(clicked()), &dialog, SLOT(reject()) );
+ connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(reject()) );
vbox2->addWidget( btn );
static_cast< LockProcess* >(parent())->execDialog( &dialog );
diff --git a/kdesktop/lock/lockdlg.h b/kdesktop/lock/lockdlg.h
index 4bb468c03..592acd7ce 100644
--- a/kdesktop/lock/lockdlg.h
+++ b/kdesktop/lock/lockdlg.h
@@ -11,8 +11,8 @@
#include <kgreeterplugin.h>
-#include <qdialog.h>
-#include <qstringlist.h>
+#include <tqdialog.h>
+#include <tqstringlist.h>
struct GreeterPluginHandle;
class LockProcess;
@@ -27,7 +27,7 @@ class QListView;
// Simple dialog for entering a password.
// It does not handle password validation.
//
-class PasswordDlg : public QDialog, public KGreeterPluginHandler
+class PasswordDlg : public TQDialog, public KGreeterPluginHandler
{
Q_OBJECT
@@ -39,14 +39,14 @@ public:
// from KGreetPluginHandler
virtual void gplugReturnText( const char *text, int tag );
virtual void gplugReturnBinary( const char *data );
- virtual void gplugSetUser( const QString & );
+ virtual void gplugSetUser( const TQString & );
virtual void gplugStart();
virtual void gplugActivity();
- virtual void gplugMsgBox( QMessageBox::Icon type, const QString &text );
+ virtual void gplugMsgBox( TQMessageBox::Icon type, const TQString &text );
protected:
- virtual void timerEvent(QTimerEvent *);
- virtual bool eventFilter(QObject *, QEvent *);
+ virtual void timerEvent(TQTimerEvent *);
+ virtual bool eventFilter(TQObject *, TQEvent *);
private slots:
void slotSwitchUser();
@@ -57,7 +57,7 @@ private slots:
void slotActivity();
private:
- void setLayoutText( const QString &txt );
+ void setLayoutText( const TQString &txt );
void capsLocked();
void updateLabel();
int Reader (void *buf, int count);
@@ -73,19 +73,19 @@ private:
void cantCheck();
GreeterPluginHandle *mPlugin;
KGreeterPlugin *greet;
- QFrame *frame;
- QGridLayout *frameLayout;
- QLabel *mStatusLabel;
+ TQFrame *frame;
+ TQGridLayout *frameLayout;
+ TQLabel *mStatusLabel;
KPushButton *mNewSessButton, *ok, *cancel;
- QPushButton *mLayoutButton;
+ TQPushButton *mLayoutButton;
int mFailedTimerId;
int mTimeoutTimerId;
int mCapsLocked;
bool mUnlockingFailed;
- QStringList layoutsList;
- QStringList::iterator currLayout;
+ TQStringList layoutsList;
+ TQStringList::iterator currLayout;
int sPid, sFd;
- QListView *lv;
+ TQListView *lv;
};
#endif
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 968eca7d7..d589232a1 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -40,17 +40,17 @@
#include <kpixmapeffect.h>
#include <kpixmap.h>
-#include <qframe.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcursor.h>
-#include <qtimer.h>
-#include <qfile.h>
-#include <qsocketnotifier.h>
-#include <qvaluevector.h>
-#include <qtooltip.h>
-
-#include <qdatetime.h>
+#include <tqframe.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcursor.h>
+#include <tqtimer.h>
+#include <tqfile.h>
+#include <tqsocketnotifier.h>
+#include <tqvaluevector.h>
+#include <tqtooltip.h>
+
+#include <tqdatetime.h>
#include <stdlib.h>
#include <assert.h>
@@ -125,7 +125,7 @@ static void segv_handler(int)
// starting screensaver hacks, and password entry.f
//
LockProcess::LockProcess(bool child, bool useBlankOnly)
- : QWidget(0L, "saver window", WX11BypassWM),
+ : TQWidget(0L, "saver window", WX11BypassWM),
mOpenGLVisual(0),
child_saver(child),
mParent(0),
@@ -155,8 +155,8 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
mRootWidth = rootAttr.width;
mRootHeight = rootAttr.height;
{ // trigger creation of QToolTipManager, it does XSelectInput() on the root window
- QWidget w;
- QToolTip::add( &w, "foo" );
+ TQWidget w;
+ TQToolTip::add( &w, "foo" );
}
XSelectInput( qt_xdisplay(), qt_xrootwin(),
SubstructureNotifyMask | rootAttr.your_event_mask );
@@ -167,7 +167,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
"System/ScreenSavers/");
// Add KDE specific screensaver path
- QString relPath="System/ScreenSavers/";
+ TQString relPath="System/ScreenSavers/";
KServiceGroup::Ptr servGroup = KServiceGroup::baseGroup( "screensavers");
if (servGroup)
{
@@ -182,15 +182,15 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
gXA_VROOT = XInternAtom (qt_xdisplay(), "__SWM_VROOT", False);
gXA_SCREENSAVER_VERSION = XInternAtom (qt_xdisplay(), "_SCREENSAVER_VERSION", False);
- connect(&mHackProc, SIGNAL(processExited(KProcess *)),
- SLOT(hackExited(KProcess *)));
+ connect(&mHackProc, TQT_SIGNAL(processExited(KProcess *)),
+ TQT_SLOT(hackExited(KProcess *)));
- connect(&mSuspendTimer, SIGNAL(timeout()), SLOT(suspend()));
+ connect(&mSuspendTimer, TQT_SIGNAL(timeout()), TQT_SLOT(suspend()));
- QStringList dmopt =
- QStringList::split(QChar(','),
- QString::fromLatin1( ::getenv( "XDM_MANAGED" )));
- for (QStringList::ConstIterator it = dmopt.begin(); it != dmopt.end(); ++it)
+ TQStringList dmopt =
+ TQStringList::split(TQChar(','),
+ TQString::fromLatin1( ::getenv( "XDM_MANAGED" )));
+ for (TQStringList::ConstIterator it = dmopt.begin(); it != dmopt.end(); ++it)
if ((*it).startsWith("method="))
mMethod = (*it).mid(7);
@@ -203,7 +203,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
DPMSInfo(qt_xdisplay(), &state, &on);
if (on)
{
- connect(&mCheckDPMS, SIGNAL(timeout()), SLOT(checkDPMSActive()));
+ connect(&mCheckDPMS, TQT_SIGNAL(timeout()), TQT_SLOT(checkDPMSActive()));
// we can save CPU if we stop it as quickly as possible
// but we waste CPU if we check too often -> so take 10s
mCheckDPMS.start(10000);
@@ -212,7 +212,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
#endif
#if (QT_VERSION-0 >= 0x030200) // XRANDR support
- connect( kapp->desktop(), SIGNAL( resized( int )), SLOT( desktopResized()));
+ connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
#endif
greetPlugin.library = 0;
@@ -250,7 +250,7 @@ static void sighup_handler(int)
::write( signal_pipe[1], &tmp, 1);
}
-void LockProcess::timerEvent(QTimerEvent *ev)
+void LockProcess::timerEvent(TQTimerEvent *ev)
{
if (mAutoLogout && ev->timerId() == mAutoLogoutTimerId)
{
@@ -271,7 +271,7 @@ void LockProcess::setupPipe()
mPipe_fd = open(FIFO_FILE, O_RDONLY | O_NONBLOCK);
if (mPipe_fd > -1) {
mPipeOpen = true;
- QTimer::singleShot( PIPE_CHECK_INTERVAL, this, SLOT(checkPipe()) );
+ TQTimer::singleShot( PIPE_CHECK_INTERVAL, this, TQT_SLOT(checkPipe()) );
}
mknod(FIFO_FILE_OUT, S_IFIFO|0600, 0);
@@ -287,7 +287,7 @@ void LockProcess::checkPipe()
{
char readbuf[128];
int numread;
- QString to_display;
+ TQString to_display;
const char * pin_entry;
if (mPipeOpen == true) {
@@ -318,7 +318,7 @@ void LockProcess::checkPipe()
}
mDialogControlLock = false;
// Display info message dialog
- QTimer::singleShot( PIPE_CHECK_INTERVAL, this, SLOT(checkPipe()) );
+ TQTimer::singleShot( PIPE_CHECK_INTERVAL, this, TQT_SLOT(checkPipe()) );
InfoDlg inDlg( this );
inDlg.updateLabel(to_display);
inDlg.setUnlockIcon();
@@ -339,7 +339,7 @@ void LockProcess::checkPipe()
}
mDialogControlLock = false;
// Display info message dialog
- QTimer::singleShot( PIPE_CHECK_INTERVAL, this, SLOT(checkPipe()) );
+ TQTimer::singleShot( PIPE_CHECK_INTERVAL, this, TQT_SLOT(checkPipe()) );
InfoDlg inDlg( this );
inDlg.updateLabel(to_display);
if (readbuf[0] == 'K') inDlg.setKDEIcon();
@@ -363,7 +363,7 @@ void LockProcess::checkPipe()
}
mDialogControlLock = false;
// Display query dialog
- QTimer::singleShot( PIPE_CHECK_INTERVAL, this, SLOT(checkPipe()) );
+ TQTimer::singleShot( PIPE_CHECK_INTERVAL, this, TQT_SLOT(checkPipe()) );
QueryDlg qryDlg( this );
qryDlg.updateLabel(to_display);
qryDlg.setUnlockIcon();
@@ -381,7 +381,7 @@ void LockProcess::checkPipe()
return;
}
}
- QTimer::singleShot( PIPE_CHECK_INTERVAL, this, SLOT(checkPipe()) );
+ TQTimer::singleShot( PIPE_CHECK_INTERVAL, this, TQT_SLOT(checkPipe()) );
}
}
@@ -414,9 +414,9 @@ void LockProcess::setupSignals()
sigaction(SIGHUP, &act, 0L);
pipe(signal_pipe);
- QSocketNotifier* notif = new QSocketNotifier(signal_pipe[0],
- QSocketNotifier::Read, this );
- connect( notif, SIGNAL(activated(int)), SLOT(signalPipeSignal()));
+ TQSocketNotifier* notif = new TQSocketNotifier(signal_pipe[0],
+ TQSocketNotifier::Read, this );
+ connect( notif, TQT_SIGNAL(activated(int)), TQT_SLOT(signalPipeSignal()));
}
@@ -444,7 +444,7 @@ bool LockProcess::lock()
mBusy = true;
if (startLock())
{
- QTimer::singleShot(1000, this, SLOT(slotDeadTimePassed()));
+ TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
return true;
}
stopSaver();
@@ -464,7 +464,7 @@ bool LockProcess::defaultSave()
mLocked = false;
if (startSaver()) {
if (mLockGrace >= 0)
- QTimer::singleShot(mLockGrace, this, SLOT(startLock()));
+ TQTimer::singleShot(mLockGrace, this, TQT_SLOT(startLock()));
return true;
}
return false;
@@ -527,7 +527,7 @@ void LockProcess::configure()
mPlugins = KDesktopSettings::pluginsUnlock();
if (mPlugins.isEmpty())
- mPlugins = QStringList("classic");
+ mPlugins = TQStringList("classic");
mPluginOptions = KDesktopSettings::pluginOptions();
}
@@ -539,15 +539,15 @@ void LockProcess::readSaver()
{
if (!mSaver.isEmpty())
{
- QString file = locate("scrsav", mSaver);
+ TQString file = locate("scrsav", mSaver);
bool opengl = kapp->authorize("opengl_screensavers");
bool manipulatescreen = kapp->authorize("manipulatescreen_screensavers");
KDesktopFile config(file, true);
if (config.readEntry("X-KDE-Type").utf8())
{
- QString saverType = config.readEntry("X-KDE-Type").utf8();
- QStringList saverTypes = QStringList::split(";", saverType);
+ TQString saverType = config.readEntry("X-KDE-Type").utf8();
+ TQStringList saverTypes = TQStringList::split(";", saverType);
for (uint i = 0; i < saverTypes.count(); i++)
{
if ((saverTypes[i] == "ManipulateScreen") && !manipulatescreen)
@@ -652,7 +652,7 @@ void LockProcess::createSaverWindow()
// set NoBackground so that the saver can capture the current
// screen state if necessary
- setBackgroundMode(QWidget::NoBackground);
+ setBackgroundMode(TQWidget::NoBackground);
setCursor( blankCursor );
setGeometry(0, 0, mRootWidth, mRootHeight);
@@ -677,8 +677,8 @@ void LockProcess::desktopResized()
// This slot needs to be able to execute very rapidly so as to prevent the user's desktop from ever
// being displayed, so we finish the hack restarting/display prettying operations in a separate timed slot
if (resizeTimer == NULL) {
- resizeTimer = new QTimer( this );
- connect( resizeTimer, SIGNAL(timeout()), this, SLOT(doDesktopResizeFinish()) );
+ resizeTimer = new TQTimer( this );
+ connect( resizeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doDesktopResizeFinish()) );
}
resizeTimer->start( 100, TRUE ); // 100 millisecond single shot timer; should allow display switching operations to finish before hack is started
}
@@ -817,7 +817,7 @@ void LockProcess::removeVRoot(Window win)
//
bool LockProcess::grabKeyboard()
{
- int rv = XGrabKeyboard( qt_xdisplay(), QApplication::desktop()->winId(),
+ int rv = XGrabKeyboard( qt_xdisplay(), TQApplication::desktop()->winId(),
True, GrabModeAsync, GrabModeAsync, CurrentTime );
return (rv == GrabSuccess);
@@ -832,7 +832,7 @@ bool LockProcess::grabKeyboard()
//
bool LockProcess::grabMouse()
{
- int rv = XGrabPointer( qt_xdisplay(), QApplication::desktop()->winId(),
+ int rv = XGrabPointer( qt_xdisplay(), TQApplication::desktop()->winId(),
True, GRABEVENTS, GrabModeAsync, GrabModeAsync, None,
blankCursor.handle(), CurrentTime );
@@ -898,8 +898,8 @@ bool LockProcess::startSaver()
saveVRoot();
if (mParent) {
- QSocketNotifier *notifier = new QSocketNotifier(mParent, QSocketNotifier::Read, this, "notifier");
- connect(notifier, SIGNAL( activated (int)), SLOT( quitSaver()));
+ TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, this, "notifier");
+ connect(notifier, TQT_SIGNAL( activated (int)), TQT_SLOT( quitSaver()));
}
createSaverWindow();
move(0, 0);
@@ -929,26 +929,26 @@ void LockProcess::stopSaver()
DM().setLock( false );
ungrabInput();
const char *out = "GOAWAY!";
- for (QValueList<int>::ConstIterator it = child_sockets.begin(); it != child_sockets.end(); ++it)
+ for (TQValueList<int>::ConstIterator it = child_sockets.begin(); it != child_sockets.end(); ++it)
write(*it, out, sizeof(out));
}
}
// private static
-QVariant LockProcess::getConf(void *ctx, const char *key, const QVariant &dflt)
+TQVariant LockProcess::getConf(void *ctx, const char *key, const TQVariant &dflt)
{
LockProcess *that = (LockProcess *)ctx;
- QString fkey = QString::fromLatin1( key ) + '=';
- for (QStringList::ConstIterator it = that->mPluginOptions.begin();
+ TQString fkey = TQString::fromLatin1( key ) + '=';
+ for (TQStringList::ConstIterator it = that->mPluginOptions.begin();
it != that->mPluginOptions.end(); ++it)
if ((*it).startsWith( fkey ))
return (*it).mid( fkey.length() );
return dflt;
}
-void LockProcess::cantLock( const QString &txt)
+void LockProcess::cantLock( const TQString &txt)
{
- msgBox( QMessageBox::Critical, i18n("Will not lock the session, as unlocking would be impossible:\n") + txt );
+ msgBox( TQMessageBox::Critical, i18n("Will not lock the session, as unlocking would be impossible:\n") + txt );
}
#if 0 // placeholders for later
@@ -962,9 +962,9 @@ i18n("<i>kcheckpass</i> is unable to operate. Possibly it is not SetUID root.");
//
bool LockProcess::startLock()
{
- for (QStringList::ConstIterator it = mPlugins.begin(); it != mPlugins.end(); ++it) {
+ for (TQStringList::ConstIterator it = mPlugins.begin(); it != mPlugins.end(); ++it) {
GreeterPluginHandle plugin;
- QString path = KLibLoader::self()->findLibrary(
+ TQString path = KLibLoader::self()->findLibrary(
((*it)[0] == '/' ? *it : "kgreet_" + *it ).latin1() );
if (path.isEmpty()) {
kdWarning(1204) << "GreeterPlugin " << *it << " does not exist" << endl;
@@ -1018,10 +1018,10 @@ bool LockProcess::startHack()
mHackProc.clearArguments();
- QTextStream ts(&mSaverExec, IO_ReadOnly);
- QString word;
+ TQTextStream ts(&mSaverExec, IO_ReadOnly);
+ TQString word;
ts >> word;
- QString path = KStandardDirs::findExe(word);
+ TQString path = KStandardDirs::findExe(word);
if (!path.isEmpty())
{
@@ -1089,8 +1089,8 @@ void LockProcess::suspend()
if(!mSuspended)
{
mHackProc.kill(SIGSTOP);
- QApplication::syncX();
- mSavedScreen = QPixmap::grabWindow( winId());
+ TQApplication::syncX();
+ mSavedScreen = TQPixmap::grabWindow( winId());
}
mSuspended = true;
}
@@ -1103,7 +1103,7 @@ void LockProcess::resume( bool force )
{
XForceScreenSaver(qt_xdisplay(), ScreenSaverReset );
bitBlt( this, 0, 0, &mSavedScreen );
- QApplication::syncX();
+ TQApplication::syncX();
mHackProc.kill(SIGCONT);
}
mSuspended = false;
@@ -1124,7 +1124,7 @@ bool LockProcess::checkPass()
int ret = execDialog( &passDlg );
if (mForceReject == true) {
- ret = QDialog::Rejected;
+ ret = TQDialog::Rejected;
}
mForceReject = false;
@@ -1138,7 +1138,7 @@ bool LockProcess::checkPass()
SubstructureNotifyMask | rootAttr.your_event_mask );
}
- return ret == QDialog::Accepted;
+ return ret == TQDialog::Accepted;
}
else {
return 0;
@@ -1161,13 +1161,13 @@ static void fakeFocusIn( WId window )
XSendEvent( qt_xdisplay(), window, False, NoEventMask, &ev );
}
-int LockProcess::execDialog( QDialog *dlg )
+int LockProcess::execDialog( TQDialog *dlg )
{
currentDialog=dlg;
dlg->adjustSize();
- QRect rect = dlg->geometry();
- rect.moveCenter(KGlobalSettings::desktopGeometry(QCursor::pos()).center());
+ TQRect rect = dlg->geometry();
+ rect.moveCenter(KGlobalSettings::desktopGeometry(TQCursor::pos()).center());
dlg->move( rect.topLeft() );
if (mDialogs.isEmpty())
@@ -1193,14 +1193,14 @@ int LockProcess::execDialog( QDialog *dlg )
void LockProcess::preparePopup()
{
- QWidget *dlg = (QWidget *)sender();
+ TQWidget *dlg = (TQWidget *)sender();
mDialogs.prepend( dlg );
fakeFocusIn( dlg->winId() );
}
void LockProcess::cleanupPopup()
{
- QWidget *dlg = (QWidget *)sender();
+ TQWidget *dlg = (TQWidget *)sender();
mDialogs.remove( dlg );
fakeFocusIn( mDialogs.first()->winId() );
}
@@ -1208,7 +1208,7 @@ void LockProcess::cleanupPopup()
void LockProcess::doFunctionKeyBroadcast() {
// Provide a clean, pretty display switch by hiding the password dialog here
mBusy=true;
- QTimer::singleShot(1000, this, SLOT(slotDeadTimePassed()));
+ TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
if (mkeyCode == XKeysymToKeycode(qt_xdisplay(), XF86XK_Display)) {
while (mDialogControlLock == true) sleep(1);
mDialogControlLock = true;
@@ -1244,7 +1244,7 @@ bool LockProcess::x11Event(XEvent *event)
(event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_AudioRaiseVolume)) || \
(event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_AudioLowerVolume))) {
mkeyCode = event->xkey.keycode;
- QTimer::singleShot( 100, this, SLOT(doFunctionKeyBroadcast()) );
+ TQTimer::singleShot( 100, this, TQT_SLOT(doFunctionKeyBroadcast()) );
return true;
}
}
@@ -1330,7 +1330,7 @@ void LockProcess::stayOnTop()
// and stack others below it
Window* stack = new Window[ mDialogs.count() + 1 ];
int count = 0;
- for( QValueList< QWidget* >::ConstIterator it = mDialogs.begin();
+ for( TQValueList< TQWidget* >::ConstIterator it = mDialogs.begin();
it != mDialogs.end();
++it )
stack[ count++ ] = (*it)->winId();
@@ -1404,23 +1404,23 @@ void LockProcess::unlockXF86()
}
#endif
-void LockProcess::msgBox( QMessageBox::Icon type, const QString &txt )
+void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
{
- QDialog box( 0, "messagebox", true, WX11BypassWM );
- QFrame *winFrame = new QFrame( &box );
- winFrame->setFrameStyle( QFrame::WinPanel | QFrame::Raised );
+ TQDialog box( 0, "messagebox", true, WX11BypassWM );
+ TQFrame *winFrame = new TQFrame( &box );
+ winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
winFrame->setLineWidth( 2 );
- QLabel *label1 = new QLabel( winFrame );
- label1->setPixmap( QMessageBox::standardIcon( type ) );
- QLabel *label2 = new QLabel( txt, winFrame );
+ TQLabel *label1 = new TQLabel( winFrame );
+ label1->setPixmap( TQMessageBox::standardIcon( type ) );
+ TQLabel *label2 = new TQLabel( txt, winFrame );
KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
button->setDefault( true );
- button->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
- connect( button, SIGNAL( clicked() ), &box, SLOT( accept() ) );
+ button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+ connect( button, TQT_SIGNAL( clicked() ), &box, TQT_SLOT( accept() ) );
- QVBoxLayout *vbox = new QVBoxLayout( &box );
+ TQVBoxLayout *vbox = new TQVBoxLayout( &box );
vbox->addWidget( winFrame );
- QGridLayout *grid = new QGridLayout( winFrame, 2, 2, 10 );
+ TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 );
grid->addWidget( label1, 0, 0, Qt::AlignCenter );
grid->addWidget( label2, 0, 1, Qt::AlignCenter );
grid->addMultiCellWidget( button, 1,1, 0,1, Qt::AlignCenter );
diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
index e99034c71..cdbeb0da1 100644
--- a/kdesktop/lock/lockprocess.h
+++ b/kdesktop/lock/lockprocess.h
@@ -14,11 +14,11 @@
#include <kprocess.h>
#include <kpixmap.h>
-#include <qwidget.h>
-#include <qtimer.h>
-#include <qvaluestack.h>
-#include <qmessagebox.h>
-#include <qpixmap.h>
+#include <tqwidget.h>
+#include <tqtimer.h>
+#include <tqvaluestack.h>
+#include <tqmessagebox.h>
+#include <tqpixmap.h>
#include <X11/Xlib.h>
@@ -53,11 +53,11 @@ public:
bool dontLock();
- void setChildren(QValueList<int> children) { child_sockets = children; }
+ void setChildren(TQValueList<int> children) { child_sockets = children; }
void setParent(int fd) { mParent = fd; }
- void msgBox( QMessageBox::Icon type, const QString &txt );
- int execDialog( QDialog* dlg );
+ void msgBox( TQMessageBox::Icon type, const TQString &txt );
+ int execDialog( TQDialog* dlg );
public slots:
void quitSaver();
@@ -70,7 +70,7 @@ public slots:
protected:
virtual bool x11Event(XEvent *);
- virtual void timerEvent(QTimerEvent *);
+ virtual void timerEvent(TQTimerEvent *);
private slots:
void hackExited(KProcess *);
@@ -92,7 +92,7 @@ private:
bool grabMouse();
bool grabInput();
void ungrabInput();
- void cantLock(const QString &reason);
+ void cantLock(const TQString &reason);
bool startSaver();
void stopSaver();
bool startHack();
@@ -104,7 +104,7 @@ private:
void lockXF86();
void unlockXF86();
void resume( bool force );
- static QVariant getConf(void *ctx, const char *key, const QVariant &dflt);
+ static TQVariant getConf(void *ctx, const char *key, const TQVariant &dflt);
bool mLocked;
int mLockGrace;
@@ -113,30 +113,30 @@ private:
KProcess mHackProc;
int mRootWidth;
int mRootHeight;
- QString mSaverExec;
- QString mSaver;
+ TQString mSaverExec;
+ TQString mSaver;
bool mOpenGLVisual;
bool child_saver;
- QValueList<int> child_sockets;
+ TQValueList<int> child_sockets;
int mParent;
bool mUseBlankOnly;
bool mSuspended;
- QTimer mSuspendTimer;
+ TQTimer mSuspendTimer;
bool mVisibility;
bool mDPMSDepend;
- QTimer mCheckDPMS;
- QValueStack< QWidget* > mDialogs;
+ TQTimer mCheckDPMS;
+ TQValueStack< TQWidget* > mDialogs;
bool mRestoreXF86Lock;
bool mForbidden;
- QStringList mPlugins, mPluginOptions;
- QString mMethod;
+ TQStringList mPlugins, mPluginOptions;
+ TQString mMethod;
GreeterPluginHandle greetPlugin;
- QPixmap mSavedScreen;
+ TQPixmap mSavedScreen;
int mAutoLogoutTimerId;
int mAutoLogoutTimeout;
bool mAutoLogout;
bool mInfoMessageDisplayed;
- QDialog *currentDialog;
+ TQDialog *currentDialog;
bool mDialogControlLock;
bool mForceReject;
@@ -145,7 +145,7 @@ private:
bool mPipeOpen_out;
int mPipe_fd_out;
- QTimer *resizeTimer;
+ TQTimer *resizeTimer;
unsigned int mkeyCode;
};
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index b55e67ea6..6e032bebb 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -76,7 +76,7 @@ int main( int argc, char **argv )
bool child = false;
int parent_connection = 0; // socket to the parent saver
- QValueList<int> child_sockets;
+ TQValueList<int> child_sockets;
if (KGlobalSettings::isMultiHead())
{
@@ -91,7 +91,7 @@ int main( int argc, char **argv )
int number_of_screens = ScreenCount(dpy);
starting_screen = kdesktop_screen_number = DefaultScreen(dpy);
int pos;
- QCString display_name = XDisplayString(dpy);
+ TQCString display_name = XDisplayString(dpy);
XCloseDisplay(dpy);
kdDebug() << "screen " << number_of_screens << " " << kdesktop_screen_number << " " << display_name << " " << starting_screen << endl;
dpy = 0;
@@ -99,7 +99,7 @@ int main( int argc, char **argv )
if ((pos = display_name.findRev('.')) != -1)
display_name.remove(pos, 10);
- QCString env;
+ TQCString env;
if (number_of_screens != 1) {
for (int i = 0; i < number_of_screens; i++) {
if (i != starting_screen) {
diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc
index 7bdedf0e8..d4ad06e88 100644
--- a/kdesktop/lock/querydlg.cc
+++ b/kdesktop/lock/querydlg.cc
@@ -25,18 +25,18 @@
#include <dcopref.h>
#include <kmessagebox.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qmessagebox.h>
-#include <qsimplerichtext.h>
-#include <qlabel.h>
-#include <qstringlist.h>
-#include <qfontmetrics.h>
-#include <qstyle.h>
-#include <qapplication.h>
-#include <qlistview.h>
-#include <qheader.h>
-#include <qcheckbox.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqmessagebox.h>
+#include <tqsimplerichtext.h>
+#include <tqlabel.h>
+#include <tqstringlist.h>
+#include <tqfontmetrics.h>
+#include <tqstyle.h>
+#include <tqapplication.h>
+#include <tqlistview.h>
+#include <tqheader.h>
+#include <tqcheckbox.h>
#include <ctype.h>
#include <unistd.h>
@@ -59,49 +59,49 @@
// Simple dialog for displaying a password/PIN entry dialog
//
QueryDlg::QueryDlg(LockProcess *parent)
- : QDialog(parent, "query dialog", true, WX11BypassWM),
+ : TQDialog(parent, "query dialog", true, WX11BypassWM),
mUnlockingFailed(false)
{
- frame = new QFrame( this );
- frame->setFrameStyle( QFrame::Panel | QFrame::Raised );
+ frame = new TQFrame( this );
+ frame->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
frame->setLineWidth( 2 );
- mpixLabel = new QLabel( frame, "pixlabel" );
+ mpixLabel = new TQLabel( frame, "pixlabel" );
mpixLabel->setPixmap(DesktopIcon("unlock"));
KUser user;
- mStatusLabel = new QLabel( "<b> </b>", frame );
- //mStatusLabel->setAlignment( QLabel::AlignCenter );
- mStatusLabel->setAlignment( QLabel::AlignLeft );
+ mStatusLabel = new TQLabel( "<b> </b>", frame );
+ //mStatusLabel->setAlignment( TQLabel::AlignCenter );
+ mStatusLabel->setAlignment( TQLabel::AlignLeft );
KSeparator *sep = new KSeparator( KSeparator::HLine, frame );
ok = new KPushButton( i18n("Unl&ock"), frame );
- QVBoxLayout *unlockDialogLayout = new QVBoxLayout( this );
+ TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
unlockDialogLayout->addWidget( frame );
- QHBoxLayout *layStatus = new QHBoxLayout( 0, 0, KDialog::spacingHint());
+ TQHBoxLayout *layStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
layStatus->addWidget( mStatusLabel );
- QHBoxLayout *layPin = new QHBoxLayout( 0, 0, KDialog::spacingHint());
+ TQHBoxLayout *layPin = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
pin_box = new KPasswordEdit( this, "pin_box" );
layPin->addWidget( pin_box );
pin_box->setFocus();
- QHBoxLayout *layButtons = new QHBoxLayout( 0, 0, KDialog::spacingHint());
+ TQHBoxLayout *layButtons = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
layButtons->addStretch();
layButtons->addWidget( ok );
- frameLayout = new QGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
+ frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, AlignTop );
frameLayout->addLayout( layStatus, 0, 1 );
frameLayout->addLayout( layPin, 2, 1 );
frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 );
frameLayout->addMultiCellLayout( layButtons, 4, 4, 0, 1 );
- connect(ok, SIGNAL(clicked()), SLOT(slotOK()));
+ connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK()));
installEventFilter(this);
}
@@ -121,7 +121,7 @@ const char * QueryDlg::getEntry()
return pin_box->password();
}
-void QueryDlg::updateLabel(QString &txt)
+void QueryDlg::updateLabel(TQString &txt)
{
mStatusLabel->setPaletteForegroundColor(Qt::black);
mStatusLabel->setText("<b>" + txt + "</b>");
@@ -139,8 +139,8 @@ void QueryDlg::setWarningIcon()
void QueryDlg::show()
{
- QDialog::show();
- QApplication::flushX();
+ TQDialog::show();
+ TQApplication::flushX();
}
#include "querydlg.moc"
diff --git a/kdesktop/lock/querydlg.h b/kdesktop/lock/querydlg.h
index caf73c180..d3f8f4be7 100644
--- a/kdesktop/lock/querydlg.h
+++ b/kdesktop/lock/querydlg.h
@@ -8,8 +8,8 @@
#ifndef __QUERYDLG_H__
#define __QUERYDLG_H__
-#include <qdialog.h>
-#include <qstringlist.h>
+#include <tqdialog.h>
+#include <tqstringlist.h>
#include <kpassdlg.h>
@@ -33,7 +33,7 @@ public:
~QueryDlg();
virtual void show();
- void updateLabel( QString &txt );
+ void updateLabel( TQString &txt );
void setUnlockIcon();
void setWarningIcon();
const char * getEntry();
@@ -42,14 +42,14 @@ private slots:
void slotOK();
private:
- QFrame *frame;
- QGridLayout *frameLayout;
- QLabel *mStatusLabel;
- QLabel *mpixLabel;
+ TQFrame *frame;
+ TQGridLayout *frameLayout;
+ TQLabel *mStatusLabel;
+ TQLabel *mpixLabel;
int mCapsLocked;
bool mUnlockingFailed;
- QStringList layoutsList;
- QStringList::iterator currLayout;
+ TQStringList layoutsList;
+ TQStringList::iterator currLayout;
int sPid, sFd;
KPushButton *ok;
KPasswordEdit *pin_box;
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
index a8b9ddeea..43c39f19f 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cc
@@ -15,7 +15,7 @@
#include <kservicegroup.h>
#include <kdebug.h>
#include <klocale.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <dcopclient.h>
#include <assert.h>
@@ -35,7 +35,7 @@ extern xautolock_corner_t xautolock_corners[ 4 ];
//
SaverEngine::SaverEngine()
: DCOPObject("KScreensaverIface"),
- QWidget(),
+ TQWidget(),
mBlankOnly(false)
{
// Save X screensaver parameters
@@ -46,8 +46,8 @@ SaverEngine::SaverEngine()
mXAutoLock = 0;
mEnabled = false;
- connect(&mLockProcess, SIGNAL(processExited(KProcess *)),
- SLOT(lockProcessExited()));
+ connect(&mLockProcess, TQT_SIGNAL(processExited(KProcess *)),
+ TQT_SLOT(lockProcessExited()));
configure();
}
@@ -92,12 +92,12 @@ void SaverEngine::lock()
void SaverEngine::processLockTransactions()
{
- for( QValueVector< DCOPClientTransaction* >::ConstIterator it = mLockTransactions.begin();
+ for( TQValueVector< DCOPClientTransaction* >::ConstIterator it = mLockTransactions.begin();
it != mLockTransactions.end();
++it )
{
- QCString replyType = "void";
- QByteArray arr;
+ TQCString replyType = "void";
+ TQByteArray arr;
kapp->dcopClient()->endTransaction( *it, replyType, arr );
}
mLockTransactions.clear();
@@ -153,7 +153,7 @@ bool SaverEngine::enable( bool e )
{
if ( !mXAutoLock ) {
mXAutoLock = new XAutoLock();
- connect(mXAutoLock, SIGNAL(timeout()), SLOT(idleTimeout()));
+ connect(mXAutoLock, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout()));
}
mXAutoLock->setTimeout(mTimeout);
mXAutoLock->setDPMS(true);
@@ -241,14 +241,14 @@ bool SaverEngine::startLockProcess( LockType lock_type )
return true;
kdDebug(1204) << "SaverEngine: starting saver" << endl;
- emitDCOPSignal("KDE_start_screensaver()", QByteArray());
+ emitDCOPSignal("KDE_start_screensaver()", TQByteArray());
if (mLockProcess.isRunning())
{
stopLockProcess();
}
mLockProcess.clearArguments();
- QString path = KStandardDirs::findExe( "kdesktop_lock" );
+ TQString path = KStandardDirs::findExe( "kdesktop_lock" );
if( path.isEmpty())
{
kdDebug( 1204 ) << "Can't find kdesktop_lock!" << endl;
@@ -258,16 +258,16 @@ bool SaverEngine::startLockProcess( LockType lock_type )
switch( lock_type )
{
case ForceLock:
- mLockProcess << QString( "--forcelock" );
+ mLockProcess << TQString( "--forcelock" );
break;
case DontLock:
- mLockProcess << QString( "--dontlock" );
+ mLockProcess << TQString( "--dontlock" );
break;
default:
break;
}
if (mBlankOnly)
- mLockProcess << QString( "--blank" );
+ mLockProcess << TQString( "--blank" );
if (mLockProcess.start() == false )
{
@@ -296,7 +296,7 @@ void SaverEngine::stopLockProcess()
return;
}
kdDebug(1204) << "SaverEngine: stopping lock" << endl;
- emitDCOPSignal("KDE_stop_screensaver()", QByteArray());
+ emitDCOPSignal("KDE_stop_screensaver()", TQByteArray());
mLockProcess.kill();
@@ -318,7 +318,7 @@ void SaverEngine::lockProcessExited()
kdDebug(1204) << "SaverEngine: lock exited" << endl;
if( mState == Waiting )
return;
- emitDCOPSignal("KDE_stop_screensaver()", QByteArray());
+ emitDCOPSignal("KDE_stop_screensaver()", TQByteArray());
if (mEnabled)
{
if (mXAutoLock)
diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h
index 0eb67f9d6..72131a05c 100644
--- a/kdesktop/lockeng.h
+++ b/kdesktop/lockeng.h
@@ -8,9 +8,9 @@
#ifndef __LOCKENG_H__
#define __LOCKENG_H__
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kprocess.h>
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
#include "KScreensaverIface.h"
#include "xautolock.h"
#include "xautolock_c.h"
@@ -23,7 +23,7 @@ class DCOPClientTransaction;
* hacks, and password entry.
*/
class SaverEngine
- : public QWidget,
+ : public TQWidget,
virtual public KScreensaverIface
{
Q_OBJECT
@@ -106,7 +106,7 @@ protected:
int mXExposures;
bool mBlankOnly; // only use the blanker, not the defined saver
- QValueVector< DCOPClientTransaction* > mLockTransactions;
+ TQValueVector< DCOPClientTransaction* > mLockTransactions;
};
#endif
diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index 3a9c4911a..695392165 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -76,7 +76,7 @@ KDesktopApp *myApp = NULL;
// -----------------------------------------------------------------------------
int kdesktop_screen_number = 0;
-QCString kdesktop_name, kicker_name, kwin_name;
+TQCString kdesktop_name, kicker_name, kwin_name;
static void crashHandler(int sigId)
{
@@ -125,14 +125,14 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
int number_of_screens = ScreenCount(dpy);
kdesktop_screen_number = DefaultScreen(dpy);
int pos;
- QCString display_name = XDisplayString(dpy);
+ TQCString display_name = XDisplayString(dpy);
XCloseDisplay(dpy);
dpy = 0;
if ((pos = display_name.findRev('.')) != -1)
display_name.remove(pos, 10);
- QCString env;
+ TQCString env;
if (number_of_screens != 1) {
for (int i = 0; i < number_of_screens; i++) {
if (i != kdesktop_screen_number && fork() == 0) {
@@ -192,7 +192,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
cl->attach();
DCOPRef r( "ksmserver", "ksmserver" );
r.setDCOPClient( cl );
- r.send( "suspendStartup", QCString( "kdesktop" ));
+ r.send( "suspendStartup", TQCString( "kdesktop" ));
delete cl;
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
@@ -237,7 +237,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
}
}
}
- // The QApplication ctor used is normally intended for applications not using Qt
+ // The TQApplication ctor used is normally intended for applications not using Qt
// as the primary toolkit (e.g. Motif apps also using Qt), with some slightly
// unpleasant side effects (e.g. #83974). This code checks if qt-copy patch #0078
// is applied, which allows turning this off.
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 2cf225bcc..caef6197a 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -35,17 +35,17 @@
#include <string.h>
#include <errno.h>
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qbitmap.h>
-#include <qfile.h>
-#include <qslider.h>
-#include <qlayout.h>
-#include <qgroupbox.h>
-#include <qcheckbox.h>
-#include <qregexp.h>
-#include <qwhatsthis.h>
-#include <qstylesheet.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
+#include <tqbitmap.h>
+#include <tqfile.h>
+#include <tqslider.h>
+#include <tqlayout.h>
+#include <tqgroupbox.h>
+#include <tqcheckbox.h>
+#include <tqregexp.h>
+#include <tqwhatsthis.h>
+#include <tqstylesheet.h>
#include <dcopclient.h>
#include <klocale.h>
@@ -75,7 +75,7 @@
#define KDESU_ERR strerror(errno)
-Minicli::Minicli( QWidget *parent, const char *name)
+Minicli::Minicli( TQWidget *parent, const char *name)
:KDialog( parent, name, false, WType_TopLevel ),
m_autoCheckedRunInTerm(false)
{
@@ -84,7 +84,7 @@ Minicli::Minicli( QWidget *parent, const char *name)
setPlainCaption( i18n("Run Command") );
KWin::setIcons( winId(), DesktopIcon("run"), SmallIcon("run") );
- QVBoxLayout* mainLayout = new QVBoxLayout( this, 0, KDialog::spacingHint() );
+ TQVBoxLayout* mainLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
m_dlg = new MinicliDlgUI (this);
mainLayout->addWidget(m_dlg);
@@ -116,7 +116,7 @@ Minicli::Minicli( QWidget *parent, const char *name)
m_filterData = new KURIFilterData();
// Create a timer object...
- m_parseTimer = new QTimer(this);
+ m_parseTimer = new TQTimer(this);
m_FocusWidget = 0;
@@ -131,29 +131,29 @@ Minicli::Minicli( QWidget *parent, const char *name)
m_histfilesystemAutocomplete = 0;
m_pURLCompletion = new KURLCompletion();
//m_pURLCompletion->setCompletionMode( KGlobalSettings::completionMode() );
- connect( m_pURLCompletion, SIGNAL( match(const QString&) ), SLOT( slotMatch(const QString&) ));
+ connect( m_pURLCompletion, TQT_SIGNAL( match(const TQString&) ), TQT_SLOT( slotMatch(const TQString&) ));
// Main widget buttons...
- connect( m_dlg->pbRun, SIGNAL(clicked()), this, SLOT(accept()) );
- connect( m_dlg->pbCancel, SIGNAL(clicked()), this, SLOT(reject()) );
- connect( m_dlg->pbOptions, SIGNAL(clicked()), SLOT(slotAdvanced()) );
- connect( m_parseTimer, SIGNAL(timeout()), SLOT(slotParseTimer()) );
+ connect( m_dlg->pbRun, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
+ connect( m_dlg->pbCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
+ connect( m_dlg->pbOptions, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdvanced()) );
+ connect( m_parseTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotParseTimer()) );
- connect( m_dlg->cbCommand, SIGNAL( textChanged( const QString& ) ),
- SLOT( slotCmdChanged(const QString&) ) );
+ connect( m_dlg->cbCommand, TQT_SIGNAL( textChanged( const TQString& ) ),
+ TQT_SLOT( slotCmdChanged(const TQString&) ) );
- connect( m_dlg->cbCommand, SIGNAL( returnPressed() ),
- m_dlg->pbRun, SLOT( animateClick() ) );
+ connect( m_dlg->cbCommand, TQT_SIGNAL( returnPressed() ),
+ m_dlg->pbRun, TQT_SLOT( animateClick() ) );
// Advanced group box...
- connect(m_dlg->cbPriority, SIGNAL(toggled(bool)), SLOT(slotChangeScheduler(bool)));
- connect(m_dlg->slPriority, SIGNAL(valueChanged(int)), SLOT(slotPriority(int)));
- connect(m_dlg->cbRealtime, SIGNAL(toggled(bool)), SLOT(slotRealtime(bool)));
- connect(m_dlg->cbAutocomplete, SIGNAL(toggled(bool)), SLOT(slotAutocompleteToggled(bool)));
- connect(m_dlg->cbAutohistory, SIGNAL(toggled(bool)), SLOT(slotAutohistoryToggled(bool)));
- connect(m_dlg->cbRunAsOther, SIGNAL(toggled(bool)), SLOT(slotChangeUid(bool)));
- connect(m_dlg->leUsername, SIGNAL(lostFocus()), SLOT(updateAuthLabel()));
- connect(m_dlg->cbRunInTerminal, SIGNAL(toggled(bool)), SLOT(slotTerminal(bool)));
+ connect(m_dlg->cbPriority, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeScheduler(bool)));
+ connect(m_dlg->slPriority, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotPriority(int)));
+ connect(m_dlg->cbRealtime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRealtime(bool)));
+ connect(m_dlg->cbAutocomplete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutocompleteToggled(bool)));
+ connect(m_dlg->cbAutohistory, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutohistoryToggled(bool)));
+ connect(m_dlg->cbRunAsOther, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeUid(bool)));
+ connect(m_dlg->leUsername, TQT_SIGNAL(lostFocus()), TQT_SLOT(updateAuthLabel()));
+ connect(m_dlg->cbRunInTerminal, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTerminal(bool)));
m_dlg->slPriority->setValue(50);
@@ -166,7 +166,7 @@ Minicli::~Minicli()
delete m_pURLCompletion;
}
-void Minicli::setCommand(const QString& command)
+void Minicli::setCommand(const TQString& command)
{
m_dlg->cbCommand->lineEdit()->setText(command);
m_dlg->cbCommand->lineEdit()->deselect();
@@ -176,9 +176,9 @@ void Minicli::setCommand(const QString& command)
}
}
-QSize Minicli::sizeHint() const
+TQSize Minicli::sizeHint() const
{
- int maxWidth = qApp->desktop()->screenGeometry((QWidget*)this).width();
+ int maxWidth = qApp->desktop()->screenGeometry((TQWidget*)this).width();
if (maxWidth < 603)
{
// a sensible max for smaller screens
@@ -189,7 +189,7 @@ QSize Minicli::sizeHint() const
maxWidth = maxWidth * 2 / 5;
}
- return QSize(maxWidth, -1);
+ return TQSize(maxWidth, -1);
}
void Minicli::show()
@@ -200,7 +200,7 @@ void Minicli::show()
void Minicli::loadConfig()
{
- QStringList histList = KDesktopSettings::history();
+ TQStringList histList = KDesktopSettings::history();
int maxHistory = KDesktopSettings::historyLength();
m_terminalAppList = KDesktopSettings::terminalApps();
@@ -226,7 +226,7 @@ void Minicli::loadConfig()
m_dlg->cbAutocomplete->setDisabled( false );
}
- QStringList compList = KDesktopSettings::completionItems();
+ TQStringList compList = KDesktopSettings::completionItems();
if( compList.isEmpty() )
m_dlg->cbCommand->completionObject()->setItems( histList );
else
@@ -247,12 +247,12 @@ void Minicli::loadConfig()
// Provide username completions. Use saner and configurable maximum values.
int maxEntries = KDesktopSettings::maxUsernameCompletions();
- QStringList users;
+ TQStringList users;
struct passwd *pw;
setpwent();
for (int count=0; ((pw = getpwent()) != 0L) && (count < maxEntries); count++)
- users << QString::fromLocal8Bit(pw->pw_name);
+ users << TQString::fromLocal8Bit(pw->pw_name);
endpwent();
KCompletion *completion = new KCompletion;
@@ -284,11 +284,11 @@ void Minicli::clearHistory()
void Minicli::accept()
{
- QString cmd = m_dlg->cbCommand->currentText().stripWhiteSpace();
+ TQString cmd = m_dlg->cbCommand->currentText().stripWhiteSpace();
if (!cmd.isEmpty() && (cmd[0].isNumber() || (cmd[0] == '(')) &&
- (QRegExp("[a-zA-Z\\]\\[]").search(cmd) == -1))
+ (TQRegExp("[a-zA-Z\\]\\[]").search(cmd) == -1))
{
- QString result = calculate(cmd);
+ TQString result = calculate(cmd);
if (!result.isEmpty())
m_dlg->cbCommand->setCurrentText(result);
return;
@@ -301,7 +301,7 @@ void Minicli::accept()
m_dlg->cbCommand->addToHistory( m_dlg->cbCommand->currentText().stripWhiteSpace() );
reset();
saveConfig();
- QDialog::accept();
+ TQDialog::accept();
if ( logout )
{
@@ -313,7 +313,7 @@ void Minicli::accept()
void Minicli::reject()
{
reset();
- QDialog::reject();
+ TQDialog::reject();
}
void Minicli::reset()
@@ -345,15 +345,15 @@ void Minicli::reset()
m_dlg->lePassword->erase();
m_FocusWidget = 0;
- m_iconName = QString::null;
- m_prevIconName = QString::null;
+ m_iconName = TQString::null;
+ m_prevIconName = TQString::null;
m_prevCached = false;
updateAuthLabel();
setIcon();
}
-void Minicli::keyPressEvent( QKeyEvent* e )
+void Minicli::keyPressEvent( TQKeyEvent* e )
{
if ( e->key() == Qt::Key_Escape )
{
@@ -362,19 +362,19 @@ void Minicli::keyPressEvent( QKeyEvent* e )
return;
}
- QDialog::keyPressEvent( e );
+ TQDialog::keyPressEvent( e );
}
-QString Minicli::terminalCommand (const QString& cmd, const QString& args)
+TQString Minicli::terminalCommand (const TQString& cmd, const TQString& args)
{
- QString terminal = KDesktopSettings::terminalApplication().stripWhiteSpace();
+ TQString terminal = KDesktopSettings::terminalApplication().stripWhiteSpace();
if (terminal.endsWith("konsole"))
terminal += " --noclose";
if( args.isEmpty() )
- terminal += QString(" -e /bin/sh -c \"%1\"").arg(cmd);
+ terminal += TQString(" -e /bin/sh -c \"%1\"").arg(cmd);
else
- terminal += QString(" -e /bin/sh -c \"%1 %2\"").arg(cmd).arg(args);
+ terminal += TQString(" -e /bin/sh -c \"%1 %2\"").arg(cmd).arg(args);
if (!m_terminalAppList.contains(cmd))
m_terminalAppList << cmd;
@@ -393,14 +393,14 @@ int Minicli::runCommand()
if ( m_dlg->cbCommand->currentText().isEmpty() )
return 1;
- QString cmd;
+ TQString cmd;
KURL uri = m_filterData->uri();
if ( uri.isLocalFile() && !uri.hasRef() && uri.query().isEmpty() )
cmd = uri.path();
else
cmd = uri.url();
- QCString asn;
+ TQCString asn;
if( qApp->desktop()->isVirtualDesktop())
{
asn = KStartupInfo::createNewStartupId();
@@ -422,7 +422,7 @@ int Minicli::runCommand()
if( needsKDEsu() )
{
- QCString user;
+ TQCString user;
struct passwd *pw;
if (m_dlg->cbRunAsOther)
@@ -470,7 +470,7 @@ int Minicli::runCommand()
}
}
- QApplication::flushX();
+ TQApplication::flushX();
int pid = fork();
@@ -494,7 +494,7 @@ int Minicli::runCommand()
proc.setScheduler(m_iScheduler);
}
- QCString command;
+ TQCString command;
if (useTerminal)
command = terminalCommand( cmd, m_filterData->argsAndOptions() ).local8Bit();
@@ -519,7 +519,7 @@ int Minicli::runCommand()
}
else
{
- QString exec;
+ TQString exec;
// yes, this is a hack, but there is no way of doing it
// through SuProcess without providing the user password
@@ -527,7 +527,7 @@ int Minicli::runCommand()
{
// from kdesu_stub.c
int val = 20 - (int) (((double) m_iPriority) * 40 / 100 + 0.5);
- cmd = "nice -n " + QString::number( val ) + " " + cmd;
+ cmd = "nice -n " + TQString::number( val ) + " " + cmd;
}
if (useTerminal)
@@ -579,7 +579,7 @@ int Minicli::runCommand()
KMessageBox::sorry( this, i18n("<center><b>%1</b></center>\n"
"You do not have permission to execute "
"this command.")
- .arg( QStyleSheet::convertFromPlainText(cmd) ));
+ .arg( TQStyleSheet::convertFromPlainText(cmd) ));
return 1;
}
}
@@ -606,7 +606,7 @@ int Minicli::runCommand()
KMessageBox::sorry( this, i18n("<center><b>%1</b></center>\n"
"Could not run the specified command.")
- .arg( QStyleSheet::convertFromPlainText(cmd) ));
+ .arg( TQStyleSheet::convertFromPlainText(cmd) ));
return 1;
}
}
@@ -627,15 +627,15 @@ void Minicli::notifyServiceStarted(KService::Ptr service)
{
// Inform other applications (like the quickstarter applet)
// that an application was started
- QByteArray params;
- QDataStream stream(params, IO_WriteOnly);
+ TQByteArray params;
+ TQDataStream stream(params, IO_WriteOnly);
stream << "minicli" << service->storageId();
kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl;
KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
- "serviceStartedByStorageId(QString,QString)", params);
+ "serviceStartedByStorageId(TQString,TQString)", params);
}
-void Minicli::slotCmdChanged(const QString& text)
+void Minicli::slotCmdChanged(const TQString& text)
{
bool isEmpty = text.isEmpty();
m_dlg->pbRun->setEnabled( !isEmpty );
@@ -649,7 +649,7 @@ void Minicli::slotCmdChanged(const QString& text)
slotTerminal(false);
// Reset the icon if needed...
- const QPixmap pixmap = DesktopIcon("kmenu");
+ const TQPixmap pixmap = DesktopIcon("kmenu");
if ( pixmap.serialNumber() != m_dlg->lbRunIcon->pixmap()->serialNumber())
m_dlg->lbRunIcon->setPixmap(pixmap);
@@ -662,7 +662,7 @@ void Minicli::slotCmdChanged(const QString& text)
m_urlCompletionStarted = true; // flag for slotMatch()
if ((text.startsWith( "/" ) || text.startsWith( "~" ) || (text.contains("://", false) != 0)) && (text.contains("http://", false) == 0)) {
- QString completion = m_pURLCompletion->makeCompletion( text );
+ TQString completion = m_pURLCompletion->makeCompletion( text );
}
}
@@ -670,10 +670,10 @@ void Minicli::slotCmdChanged(const QString& text)
}
// Handle match() from m_pURLCompletion
-void Minicli::slotMatch( const QString &match )
+void Minicli::slotMatch( const TQString &match )
{
- QString current_text;
- QStringList histList = KDesktopSettings::history();
+ TQString current_text;
+ TQStringList histList = KDesktopSettings::history();
int maxHistory = KDesktopSettings::historyLength();
int maxAutocompletion = KDesktopSettings::miniCLIAutocompletionLength();
@@ -687,7 +687,7 @@ void Minicli::slotMatch( const QString &match )
if (m_filesystemAutocomplete == true) {
bool block = m_dlg->cbCommand->signalsBlocked();
m_dlg->cbCommand->blockSignals( true );
- QStringList items = m_pURLCompletion->allMatches();
+ TQStringList items = m_pURLCompletion->allMatches();
items.sort();
if (m_histfilesystemAutocomplete == true) {
// Add the history to the list
@@ -741,7 +741,7 @@ void Minicli::slotParseTimer()
void Minicli::parseLine( bool final )
{
- QString cmd = m_dlg->cbCommand->currentText().stripWhiteSpace();
+ TQString cmd = m_dlg->cbCommand->currentText().stripWhiteSpace();
m_filterData->setData( cmd );
if( final )
@@ -779,25 +779,25 @@ void Minicli::parseLine( bool final )
void Minicli::setIcon ()
{
if( m_iconName.isEmpty() || m_iconName == "unknown" || m_iconName == "kde" )
- m_iconName = QString::fromLatin1("kmenu");
+ m_iconName = TQString::fromLatin1("kmenu");
- QPixmap icon = DesktopIcon( m_iconName );
+ TQPixmap icon = DesktopIcon( m_iconName );
if ( m_iconName == "www" )
{
// Not using KIconEffect::overlay as that requires the same size
// for the icon and the overlay, also the overlay definately doesn't
// have a more that one-bit alpha channel here
- QPixmap overlay( locate ( "icon", KMimeType::favIconForURL( m_filterData->uri() ) + ".png" ) );
+ TQPixmap overlay( locate ( "icon", KMimeType::favIconForURL( m_filterData->uri() ) + ".png" ) );
if ( !overlay.isNull() )
{
int x = icon.width() - overlay.width();
int y = icon.height() - overlay.height();
if ( icon.mask() )
{
- QBitmap mask = *icon.mask();
+ TQBitmap mask = *icon.mask();
bitBlt( &mask, x, y,
- overlay.mask() ? const_cast<QBitmap *>(overlay.mask()) : &overlay,
+ overlay.mask() ? const_cast<TQBitmap *>(overlay.mask()) : &overlay,
0, 0, overlay.width(), overlay.height(),
overlay.mask() ? OrROP : SetROP );
icon.setMask(mask);
@@ -824,9 +824,9 @@ void Minicli::updateAuthLabel()
m_prevChecked = m_dlg->cbRunAsOther->isChecked();
m_prevCached = true;
}
- if (m_dlg->leUsername->text() != QString::fromLatin1("root"))
- m_dlg->lePassword->setText(QString::null);
- m_dlg->leUsername->setText(QString::fromLatin1("root"));
+ if (m_dlg->leUsername->text() != TQString::fromLatin1("root"))
+ m_dlg->lePassword->setText(TQString::null);
+ m_dlg->leUsername->setText(TQString::fromLatin1("root"));
m_dlg->cbRunAsOther->setChecked(true);
m_dlg->cbRunAsOther->setEnabled(false);
m_dlg->leUsername->setEnabled(false);
@@ -871,7 +871,7 @@ void Minicli::slotTerminal(bool enable)
if (enable)
{
m_prevIconName = m_iconName;
- m_iconName = QString::fromLatin1( "konsole" );
+ m_iconName = TQString::fromLatin1( "konsole" );
setIcon();
}
else if (!m_prevIconName.isEmpty())
@@ -921,7 +921,7 @@ void Minicli::slotRealtime(bool enabled)
i18n("Running a realtime application can be very dangerous. "
"If the application misbehaves, the system might hang "
"unrecoverably.\nAre you sure you want to continue?"),
- i18n("Warning - Run Command"), KGuiItem(i18n("&Run Realtime")),QString::null,KMessageBox::Notify|KMessageBox::PlainCaption)
+ i18n("Warning - Run Command"), KGuiItem(i18n("&Run Realtime")),TQString::null,KMessageBox::Notify|KMessageBox::PlainCaption)
!= KMessageBox::Continue )
{
m_iScheduler = StubProcess::SchedNormal;
@@ -944,7 +944,7 @@ void Minicli::slotAutocompleteToggled(bool enabled)
m_filesystemAutocomplete = false;
}
- QString current_text = m_dlg->cbCommand->currentText();
+ TQString current_text = m_dlg->cbCommand->currentText();
m_dlg->cbCommand->setCurrentText( current_text ); // Force an update of the autocompletion list
}
@@ -964,7 +964,7 @@ void Minicli::slotAutohistoryToggled(bool enabled)
m_dlg->cbAutocomplete->setDisabled ( false );
}
- QString current_text = m_dlg->cbCommand->currentText();
+ TQString current_text = m_dlg->cbCommand->currentText();
m_dlg->cbCommand->setCurrentText( current_text ); // Force an update of the autocompletion list
}
@@ -982,19 +982,19 @@ void Minicli::slotPriority(int priority)
updateAuthLabel();
}
-QString Minicli::calculate(const QString &exp)
+TQString Minicli::calculate(const TQString &exp)
{
- QString result, cmd;
- const QString bc = KStandardDirs::findExe("bc");
+ TQString result, cmd;
+ const TQString bc = KStandardDirs::findExe("bc");
if ( !bc.isEmpty() )
- cmd = QString("echo %1 | %2").arg(KProcess::quote(QString("scale=8; ")+exp), KProcess::quote(bc));
+ cmd = TQString("echo %1 | %2").arg(KProcess::quote(TQString("scale=8; ")+exp), KProcess::quote(bc));
else
- cmd = QString("echo $((%1))").arg(exp);
- FILE *fs = popen(QFile::encodeName(cmd).data(), "r");
+ cmd = TQString("echo $((%1))").arg(exp);
+ FILE *fs = popen(TQFile::encodeName(cmd).data(), "r");
if (fs)
{
{ // scope for QTextStream
- QTextStream ts(fs, IO_ReadOnly);
+ TQTextStream ts(fs, IO_ReadOnly);
result = ts.read().stripWhiteSpace();
}
pclose(fs);
@@ -1002,7 +1002,7 @@ QString Minicli::calculate(const QString &exp)
return result;
}
-void Minicli::fontChange( const QFont & )
+void Minicli::fontChange( const TQFont & )
{
adjustSize();
}
diff --git a/kdesktop/minicli.h b/kdesktop/minicli.h
index a4215582f..f70035464 100644
--- a/kdesktop/minicli.h
+++ b/kdesktop/minicli.h
@@ -31,8 +31,8 @@
#ifndef MINICLI_H
#define MINICLI_H
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <kdialog.h>
#include <kservice.h>
@@ -49,16 +49,16 @@ class Minicli : public KDialog
Q_OBJECT
public:
- Minicli( QWidget *parent=0, const char *name=0 );
+ Minicli( TQWidget *parent=0, const char *name=0 );
virtual ~Minicli();
- void setCommand(const QString& command);
+ void setCommand(const TQString& command);
void reset();
void saveConfig();
void clearHistory();
virtual void show();
- virtual QSize sizeHint() const;
+ virtual TQSize sizeHint() const;
protected slots:
virtual void accept();
@@ -68,8 +68,8 @@ protected slots:
protected:
void loadConfig();
bool needsKDEsu();
- virtual void keyPressEvent( QKeyEvent* );
- virtual void fontChange( const QFont & );
+ virtual void keyPressEvent( TQKeyEvent* );
+ virtual void fontChange( const TQFont & );
private slots:
void slotAdvanced();
@@ -81,35 +81,35 @@ private slots:
void slotTerminal(bool);
void slotChangeUid(bool);
void slotChangeScheduler(bool);
- void slotCmdChanged(const QString&);
- void slotMatch( const QString&);
+ void slotCmdChanged(const TQString&);
+ void slotMatch( const TQString&);
private:
void setIcon();
int runCommand();
void parseLine( bool final );
- QString terminalCommand (const QString&, const QString&);
- QString calculate(const QString &exp);
+ TQString terminalCommand (const TQString&, const TQString&);
+ TQString calculate(const TQString &exp);
void notifyServiceStarted(KService::Ptr service);
int m_iPriority;
int m_iScheduler;
- QString m_iconName;
- QString m_prevIconName;
- QStringList m_terminalAppList;
- QStringList m_middleFilters;
- QStringList m_finalFilters;
+ TQString m_iconName;
+ TQString m_prevIconName;
+ TQStringList m_terminalAppList;
+ TQStringList m_middleFilters;
+ TQStringList m_finalFilters;
- QTimer* m_parseTimer;
- QWidget* m_FocusWidget;
+ TQTimer* m_parseTimer;
+ TQWidget* m_FocusWidget;
MinicliDlgUI* m_dlg;
KURIFilterData* m_filterData;
// Cached values
- QString m_prevUser;
- QString m_prevPass;
+ TQString m_prevUser;
+ TQString m_prevPass;
bool m_prevChecked;
bool m_prevCached;
bool m_autoCheckedRunInTerm;
diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cc
index ba66ef966..bc869d341 100644
--- a/kdesktop/pixmapserver.cc
+++ b/kdesktop/pixmapserver.cc
@@ -37,7 +37,7 @@
KPixmapServer::KPixmapServer()
- : QWidget(0L, "shpixmap comm window")
+ : TQWidget(0L, "shpixmap comm window")
{
kapp->installX11EventFilter(this);
pixmap = XInternAtom(qt_xdisplay(), "PIXMAP", false);
@@ -56,7 +56,7 @@ KPixmapServer::~KPixmapServer()
}
-void KPixmapServer::add(QString name, QPixmap *pm, bool overwrite)
+void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite)
{
if (m_Names.contains(name))
{
@@ -65,7 +65,7 @@ void KPixmapServer::add(QString name, QPixmap *pm, bool overwrite)
else return;
}
- QString str = QString("KDESHPIXMAP:%1").arg(name);
+ TQString str = TQString("KDESHPIXMAP:%1").arg(name);
Atom sel = XInternAtom(qt_xdisplay(), str.latin1(), false);
KPixmapInode pi;
pi.handle = pm->handle();
@@ -92,7 +92,7 @@ void KPixmapServer::add(QString name, QPixmap *pm, bool overwrite)
}
-void KPixmapServer::remove(QString name)
+void KPixmapServer::remove(TQString name)
{
// Remove the name
NameIterator it = m_Names.find(name);
@@ -119,9 +119,9 @@ void KPixmapServer::remove(QString name)
}
-QStringList KPixmapServer::list()
+TQStringList KPixmapServer::list()
{
- QStringList lst;
+ TQStringList lst;
NameIterator it;
for (it=m_Names.begin(); it!=m_Names.end(); it++)
lst += it.key();
@@ -129,7 +129,7 @@ QStringList KPixmapServer::list()
}
-void KPixmapServer::setOwner(QString name)
+void KPixmapServer::setOwner(TQString name)
{
NameIterator it = m_Names.find(name);
if (it == m_Names.end())
diff --git a/kdesktop/pixmapserver.h b/kdesktop/pixmapserver.h
index e0f871988..009b70fc8 100644
--- a/kdesktop/pixmapserver.h
+++ b/kdesktop/pixmapserver.h
@@ -10,10 +10,10 @@
#ifndef __PixmapServer_h_Included__
#define __PixmapServer_h_Included__
-#include <qwindowdefs.h>
+#include <tqwindowdefs.h>
-#include <qwidget.h>
-#include <qmap.h>
+#include <tqwidget.h>
+#include <tqmap.h>
#include <X11/X.h>
#include <X11/Xlib.h>
@@ -30,7 +30,7 @@ struct KPixmapInode
struct KPixmapData
{
- QPixmap *pixmap;
+ TQPixmap *pixmap;
int usecount;
int refcount;
};
@@ -38,7 +38,7 @@ struct KPixmapData
struct KSelectionInode
{
Qt::HANDLE handle;
- QString name;
+ TQString name;
};
/**
@@ -70,7 +70,7 @@ public:
* @param pm A pointer to the pixmap.
* @param overwrite Should an pixmap with the same name be overwritten?
*/
- void add(QString name, QPixmap *pm, bool overwrite=true);
+ void add(TQString name, TQPixmap *pm, bool overwrite=true);
/**
* Remove a pixmap from the server. This will delete the pixmap after
@@ -78,21 +78,21 @@ public:
*
* @param name The name of the shared pixmap.
*/
- void remove(QString name);
+ void remove(TQString name);
/**
* List all pixmaps currently served by this server.
*
- * @return A QStringList containing all the shared pixmaps.
+ * @return A TQStringList containing all the shared pixmaps.
*/
- QStringList list();
+ TQStringList list();
/**
* Re-set ownership of the selection providing the shared pixmap.
*
* @param name The name of the shared pixmap.
*/
- void setOwner(QString name);
+ void setOwner(TQString name);
signals:
/**
@@ -101,7 +101,7 @@ signals:
* this server, though it can be served by another. You can re-aqcuire
* the selection by calling setOwner().
*/
- void selectionCleared(QString name);
+ void selectionCleared(TQString name);
protected:
bool x11Event(XEvent *);
@@ -109,15 +109,15 @@ protected:
private:
Atom pixmap;
- QMap<QString,KPixmapInode> m_Names;
- QMap<Atom,KSelectionInode> m_Selections;
- QMap<HANDLE,KPixmapData> m_Data;
- QMap<Atom,HANDLE> m_Active;
+ TQMap<TQString,KPixmapInode> m_Names;
+ TQMap<Atom,KSelectionInode> m_Selections;
+ TQMap<HANDLE,KPixmapData> m_Data;
+ TQMap<Atom,HANDLE> m_Active;
- typedef QMap<QString,KPixmapInode>::Iterator NameIterator;
- typedef QMap<Atom,KSelectionInode>::Iterator SelectionIterator;
- typedef QMap<HANDLE,KPixmapData>::Iterator DataIterator;
- typedef QMap<Atom,HANDLE>::Iterator AtomIterator;
+ typedef TQMap<TQString,KPixmapInode>::Iterator NameIterator;
+ typedef TQMap<Atom,KSelectionInode>::Iterator SelectionIterator;
+ typedef TQMap<HANDLE,KPixmapData>::Iterator DataIterator;
+ typedef TQMap<Atom,HANDLE>::Iterator AtomIterator;
};
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 7f0549ff4..720dd4bba 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -23,10 +23,10 @@
#include "klaunchsettings.h"
#include <kiconloader.h>
-#include <qcursor.h>
+#include <tqcursor.h>
#include <kapplication.h>
-#include <qimage.h>
-#include <qbitmap.h>
+#include <tqimage.h>
+#include <tqbitmap.h>
#include <kconfig.h>
#include <X11/Xlib.h>
@@ -40,14 +40,14 @@ enum kde_startup_status_enum { StartupPre, StartupIn, StartupDone };
static kde_startup_status_enum kde_startup_status = StartupPre;
static Atom kde_splash_progress;
-StartupId::StartupId( QWidget* parent, const char* name )
- : QWidget( parent, name ),
+StartupId::StartupId( TQWidget* parent, const char* name )
+ : TQWidget( parent, name ),
startup_info( KStartupInfo::CleanOnCantDetect ),
startup_widget( NULL ),
blinking( true ),
bouncing( false )
{
- hide(); // is QWidget only because of x11Event()
+ hide(); // is TQWidget only because of x11Event()
if( kde_startup_status == StartupPre )
{
kde_splash_progress = XInternAtom( qt_xdisplay(), "_KDE_SPLASH_PROGRESS", False );
@@ -56,16 +56,16 @@ StartupId::StartupId( QWidget* parent, const char* name )
XSelectInput( qt_xdisplay(), qt_xrootwin(), attrs.your_event_mask | SubstructureNotifyMask);
kapp->installX11EventFilter( this );
}
- connect( &update_timer, SIGNAL( timeout()), SLOT( update_startupid()));
+ connect( &update_timer, TQT_SIGNAL( timeout()), TQT_SLOT( update_startupid()));
connect( &startup_info,
- SIGNAL( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )),
- SLOT( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )));
+ TQT_SIGNAL( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )),
+ TQT_SLOT( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )));
connect( &startup_info,
- SIGNAL( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )),
- SLOT( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )));
+ TQT_SIGNAL( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )),
+ TQT_SLOT( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )));
connect( &startup_info,
- SIGNAL( gotRemoveStartup( const KStartupInfoId&, const KStartupInfoData& )),
- SLOT( gotRemoveStartup( const KStartupInfoId& )));
+ TQT_SIGNAL( gotRemoveStartup( const KStartupInfoId&, const KStartupInfoData& )),
+ TQT_SLOT( gotRemoveStartup( const KStartupInfoId& )));
}
StartupId::~StartupId()
@@ -82,7 +82,7 @@ void StartupId::configure()
void StartupId::gotNewStartup( const KStartupInfoId& id_P, const KStartupInfoData& data_P )
{
- QString icon = data_P.findIcon();
+ TQString icon = data_P.findIcon();
current_startup = id_P;
startups[ id_P ] = icon;
start_startupid( icon );
@@ -92,7 +92,7 @@ void StartupId::gotStartupChange( const KStartupInfoId& id_P, const KStartupInfo
{
if( current_startup == id_P )
{
- QString icon = data_P.findIcon();
+ TQString icon = data_P.findIcon();
if( !icon.isEmpty() && icon != startups[ current_startup ] )
{
startups[ id_P ] = icon;
@@ -129,10 +129,10 @@ bool StartupId::x11Event( XEvent* e )
if( startups.count() == 0 )
start_startupid( KDE_STARTUP_ICON );
// 60(?) sec timeout - shouldn't be hopefully needed anyway, ksmserver should have it too
- QTimer::singleShot( 60000, this, SLOT( finishKDEStartup()));
+ TQTimer::singleShot( 60000, this, TQT_SLOT( finishKDEStartup()));
}
else if( strcmp( s, "session ready" ) == 0 && kde_startup_status < StartupDone )
- QTimer::singleShot( 2000, this, SLOT( finishKDEStartup()));
+ TQTimer::singleShot( 2000, this, TQT_SLOT( finishKDEStartup()));
}
return false;
}
@@ -153,16 +153,16 @@ void StartupId::stop_startupid()
for( int i = 0;
i < NUM_BLINKING_PIXMAPS;
++i )
- pixmaps[ i ] = QPixmap(); // null
+ pixmaps[ i ] = TQPixmap(); // null
update_timer.stop();
}
-static QPixmap scalePixmap( const QPixmap& pm, int w, int h )
+static TQPixmap scalePixmap( const TQPixmap& pm, int w, int h )
{
#if QT_VERSION >= 0x030200
- QPixmap result( 20, 20, pm.depth() );
- result.setMask( QBitmap( 20, 20, true ) );
- QPixmap scaled( pm.convertToImage().smoothScale( w, h ) );
+ TQPixmap result( 20, 20, pm.depth() );
+ result.setMask( TQBitmap( 20, 20, true ) );
+ TQPixmap scaled( pm.convertToImage().smoothScale( w, h ) );
copyBlt( &result, (20 - w) / 2, (20 - h) / 2, &scaled, 0, 0, w, h );
return result;
#else
@@ -172,20 +172,20 @@ static QPixmap scalePixmap( const QPixmap& pm, int w, int h )
#endif
}
-void StartupId::start_startupid( const QString& icon_P )
+void StartupId::start_startupid( const TQString& icon_P )
{
- const QColor startup_colors[ StartupId::NUM_BLINKING_PIXMAPS ]
+ const TQColor startup_colors[ StartupId::NUM_BLINKING_PIXMAPS ]
= { Qt::black, Qt::darkGray, Qt::lightGray, Qt::white, Qt::white };
- QPixmap icon_pixmap = KGlobal::iconLoader()->loadIcon( icon_P, KIcon::Small, 0,
+ TQPixmap icon_pixmap = KGlobal::iconLoader()->loadIcon( icon_P, KIcon::Small, 0,
KIcon::DefaultState, 0, true ); // return null pixmap if not found
if( icon_pixmap.isNull())
icon_pixmap = SmallIcon( "exec" );
if( startup_widget == NULL )
{
- startup_widget = new QWidget( NULL, NULL, WX11BypassWM );
+ startup_widget = new TQWidget( NULL, NULL, WX11BypassWM );
XSetWindowAttributes attr;
attr.save_under = True; // useful saveunder if possible to avoid redrawing
XChangeWindowAttributes( qt_xdisplay(), startup_widget->winId(), CWSaveUnder, &attr );
@@ -200,7 +200,7 @@ void StartupId::start_startupid( const QString& icon_P )
i < NUM_BLINKING_PIXMAPS;
++i )
{
- pixmaps[ i ] = QPixmap( window_w, window_h );
+ pixmaps[ i ] = TQPixmap( window_w, window_h );
pixmaps[ i ].fill( startup_colors[ i ] );
bitBlt( &pixmaps[ i ], 0, 0, &icon_pixmap );
}
@@ -255,7 +255,7 @@ void StartupId::update_startupid()
else if( bouncing )
{
yoffset = frame_to_yoffset[ frame ];
- QPixmap pm = pixmaps[ frame_to_pixmap[ frame ] ];
+ TQPixmap pm = pixmaps[ frame_to_pixmap[ frame ] ];
startup_widget->setBackgroundPixmap( pm );
if ( pm.mask() != NULL )
startup_widget->setMask( *pm.mask() );
@@ -274,7 +274,7 @@ void StartupId::update_startupid()
update_timer.start( 100, true );
return;
}
- QPoint c_pos( x, y );
+ TQPoint c_pos( x, y );
int cursor_size = 0;
#ifdef HAVE_XCURSOR
cursor_size = XcursorGetDefaultSize( qt_xdisplay());
@@ -295,7 +295,7 @@ void StartupId::update_startupid()
startup_widget->show();
XRaiseWindow( qt_xdisplay(), startup_widget->winId());
update_timer.start( bouncing ? 30 : 100, true );
- QApplication::flushX();
+ TQApplication::flushX();
}
#include "startupid.moc"
diff --git a/kdesktop/startupid.h b/kdesktop/startupid.h
index 986c45c3f..941e4165c 100644
--- a/kdesktop/startupid.h
+++ b/kdesktop/startupid.h
@@ -22,11 +22,11 @@
#include <sys/types.h>
-#include <qwidget.h>
-#include <qpixmap.h>
-#include <qstring.h>
-#include <qtimer.h>
-#include <qmap.h>
+#include <tqwidget.h>
+#include <tqpixmap.h>
+#include <tqstring.h>
+#include <tqtimer.h>
+#include <tqmap.h>
#include <kstartupinfo.h>
class QStyle;
@@ -36,12 +36,12 @@ class StartupId
{
Q_OBJECT
public:
- StartupId( QWidget* parent = 0, const char* name = 0 );
+ StartupId( TQWidget* parent = 0, const char* name = 0 );
virtual ~StartupId();
void configure();
protected:
virtual bool x11Event( XEvent* e );
- void start_startupid( const QString& icon );
+ void start_startupid( const TQString& icon );
void stop_startupid();
protected slots:
void update_startupid();
@@ -51,16 +51,16 @@ class StartupId
void finishKDEStartup();
protected:
KStartupInfo startup_info;
- QWidget* startup_widget;
- QTimer update_timer;
- QMap< KStartupInfoId, QString > startups; // QString == pixmap
+ TQWidget* startup_widget;
+ TQTimer update_timer;
+ TQMap< KStartupInfoId, TQString > startups; // TQString == pixmap
KStartupInfoId current_startup;
bool blinking;
bool bouncing;
unsigned int color_index;
unsigned int frame;
enum { NUM_BLINKING_PIXMAPS = 5 };
- QPixmap pixmaps[ NUM_BLINKING_PIXMAPS ];
+ TQPixmap pixmaps[ NUM_BLINKING_PIXMAPS ];
};
#endif
diff --git a/kdesktop/xautolock.cc b/kdesktop/xautolock.cc
index d8f4bbfbe..b69325f17 100644
--- a/kdesktop/xautolock.cc
+++ b/kdesktop/xautolock.cc
@@ -174,7 +174,7 @@ void XAutoLock::setTrigger( time_t t )
//
// Process new windows and check the mouse.
//
-void XAutoLock::timerEvent(QTimerEvent *ev)
+void XAutoLock::timerEvent(TQTimerEvent *ev)
{
if (ev->timerId() != mTimerId)
{
@@ -258,14 +258,14 @@ bool XAutoLock::x11Event( XEvent* ev )
// don't futher process key events that were received only because XAutoLock wants them
if( ev->type == KeyPress && !ev->xkey.send_event
&& !xautolock_useXidle && !xautolock_useMit
- && !QWidget::find( ev->xkey.window ))
+ && !TQWidget::find( ev->xkey.window ))
return true;
return false;
}
bool XAutoLock::ignoreWindow( WId w )
{
- if( w != qt_xrootwin() && QWidget::find( w ))
+ if( w != qt_xrootwin() && TQWidget::find( w ))
return true;
return false;
}
diff --git a/kdesktop/xautolock.h b/kdesktop/xautolock.h
index aa618f252..35b53207a 100644
--- a/kdesktop/xautolock.h
+++ b/kdesktop/xautolock.h
@@ -8,7 +8,7 @@
#ifndef __XAUTOLOCK_H__
#define __XAUTOLOCK_H__
-#include <qwidget.h>
+#include <tqwidget.h>
#include <X11/Xlib.h>
@@ -62,7 +62,7 @@ signals:
void timeout();
protected:
- virtual void timerEvent(QTimerEvent *ev);
+ virtual void timerEvent(TQTimerEvent *ev);
virtual bool x11Event( XEvent* );
protected:
diff --git a/kdesu/kdesu/kdesu.cpp b/kdesu/kdesu/kdesu.cpp
index 3e7b7a77b..af2986b06 100644
--- a/kdesu/kdesu/kdesu.cpp
+++ b/kdesu/kdesu/kdesu.cpp
@@ -19,11 +19,11 @@
#include <sys/wait.h>
#endif
-#include <qstring.h>
-#include <qfileinfo.h>
-#include <qglobal.h>
-#include <qfile.h>
-#include <qdir.h>
+#include <tqstring.h>
+#include <tqfileinfo.h>
+#include <tqglobal.h>
+#include <tqfile.h>
+#include <tqdir.h>
#include <dcopclient.h>
@@ -47,7 +47,7 @@
#define ERR strerror(errno)
-QCString command;
+TQCString command;
const char *Version = "1.0";
// NOTE: if you change the position of the -u switch, be sure to adjust it
@@ -70,11 +70,11 @@ static KCmdLineOptions options[] = {
};
-QCString dcopNetworkId()
+TQCString dcopNetworkId()
{
- QCString result;
+ TQCString result;
result.resize(1025);
- QFile file(DCOPClient::dcopServerFile());
+ TQFile file(DCOPClient::dcopServerFile());
if (!file.open(IO_ReadOnly))
return "";
int i = file.readLine(result.data(), 1024);
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
KCmdLineArgs::addCmdLineOptions(options);
KApplication::disableAutoDcopRegistration();
// kdesu doesn't process SM events, so don't even connect to ksmserver
- QCString session_manager = getenv( "SESSION_MANAGER" );
+ TQCString session_manager = getenv( "SESSION_MANAGER" );
unsetenv( "SESSION_MANAGER" );
KApplication app;
// but propagate it to the started app
@@ -155,7 +155,7 @@ static int startApp()
exit(1);
}
- QString icon;
+ TQString icon;
if ( args->isSet("i"))
icon = args->getOption("i");
@@ -164,8 +164,8 @@ static int startApp()
prompt = false;
// Get target uid
- QCString user = args->getOption("u");
- QCString auth_user = user;
+ TQCString user = args->getOption("u");
+ TQCString auth_user = user;
struct passwd *pw = getpwnam(user);
if (pw == 0L)
{
@@ -175,7 +175,7 @@ static int startApp()
bool change_uid = (getuid() != pw->pw_uid);
// If file is writeable, do not change uid
- QString file = QFile::decodeName(args->getOption("f"));
+ TQString file = TQFile::decodeName(args->getOption("f"));
if (change_uid && !file.isEmpty())
{
if (file.at(0) != '/')
@@ -189,7 +189,7 @@ static int startApp()
exit(1);
}
}
- QFileInfo fi(file);
+ TQFileInfo fi(file);
if (!fi.exists())
{
kdError(1206) << "File does not exist: " << file << "\n";
@@ -199,7 +199,7 @@ static int startApp()
}
// Get priority/scheduler
- QCString tmp = args->getOption("p");
+ TQCString tmp = args->getOption("p");
bool ok;
int priority = tmp.toInt(&ok);
if (!ok || (priority < 0) || (priority > 100))
@@ -222,10 +222,10 @@ static int startApp()
command = args->getOption("c");
for (int i=0; i<args->count(); i++)
{
- QString arg = QFile::decodeName(args->arg(i));
+ TQString arg = TQFile::decodeName(args->arg(i));
KRun::shellQuote(arg);
command += " ";
- command += QFile::encodeName(arg);
+ command += TQFile::encodeName(arg);
}
}
else
@@ -238,10 +238,10 @@ static int startApp()
command = args->arg(0);
for (int i=1; i<args->count(); i++)
{
- QString arg = QFile::decodeName(args->arg(i));
+ TQString arg = TQFile::decodeName(args->arg(i));
KRun::shellQuote(arg);
command += " ";
- command += QFile::encodeName(arg);
+ command += TQFile::encodeName(arg);
}
}
@@ -279,7 +279,7 @@ static int startApp()
bool withIgnoreButton = args->isSet("ignorebutton");
QCStringList env;
- QCString options;
+ TQCString options;
env << ( "DESKTOP_STARTUP_ID=" + kapp->startupId());
if (pw->pw_uid)
@@ -288,21 +288,21 @@ static int startApp()
// root uses KDEROOTHOME
// Translate the KDEHOME of this user to the new user.
- QString kdeHome = KGlobal::dirs()->relativeLocation("home", KGlobal::dirs()->localkdedir());
+ TQString kdeHome = KGlobal::dirs()->relativeLocation("home", KGlobal::dirs()->localkdedir());
if (kdeHome[0] != '/')
kdeHome.prepend("~/");
else
- kdeHome=QString::null; // Use default
+ kdeHome=TQString::null; // Use default
- env << ("KDEHOME="+ QFile::encodeName(kdeHome));
+ env << ("KDEHOME="+ TQFile::encodeName(kdeHome));
}
KUser u;
- env << (QCString) ("KDESU_USER=" + u.loginName().local8Bit());
+ env << (TQCString) ("KDESU_USER=" + u.loginName().local8Bit());
if (!new_dcop)
{
- QCString ksycoca = "KDESYCOCA="+QFile::encodeName(locateLocal("cache", "ksycoca"));
+ TQCString ksycoca = "KDESYCOCA="+TQFile::encodeName(locateLocal("cache", "ksycoca"));
env << ksycoca;
options += "xf"; // X-only, dcop forwarding enabled.
@@ -341,7 +341,7 @@ static int startApp()
int needpw = proc.checkNeedPassword();
if (needpw < 0)
{
- QString err = i18n("Su returned with an error.\n");
+ TQString err = i18n("Su returned with an error.\n");
KMessageBox::error(0L, err);
exit(1);
}
@@ -352,7 +352,7 @@ static int startApp()
}
// Start the dialog
- QCString password;
+ TQCString password;
if (needpw)
{
KStartupInfoId id;
@@ -365,10 +365,10 @@ static int startApp()
dlg.addLine(i18n("Command:"), command);
if ((priority != 50) || (scheduler != SuProcess::SchedNormal))
{
- QString prio;
+ TQString prio;
if (scheduler == SuProcess::SchedRealtime)
prio += i18n("realtime: ");
- prio += QString("%1/100").arg(priority);
+ prio += TQString("%1/100").arg(priority);
if (prompt)
dlg.addLine(i18n("Priority:"), prio);
}
diff --git a/kdesu/kdesu/sudlg.cpp b/kdesu/kdesu/sudlg.cpp
index d68937372..f2ec71723 100644
--- a/kdesu/kdesu/sudlg.cpp
+++ b/kdesu/kdesu/sudlg.cpp
@@ -5,7 +5,7 @@
*/
#include <config.h>
-#include <qstring.h>
+#include <tqstring.h>
#include <kconfig.h>
#include <kdebug.h>
#include <klocale.h>
@@ -14,12 +14,12 @@
#include <kdesu/su.h>
#include "sudlg.h"
-KDEsuDialog::KDEsuDialog(QCString user, QCString auth_user, bool enableKeep,const QString& icon, bool withIgnoreButton)
+KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton)
: KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon)
{
KConfig* config = KGlobal::config();
config->setGroup("super-user-command");
- QString superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND);
+ TQString superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND);
if ( superUserCommand != "sudo" && superUserCommand != "su" ) {
kdWarning() << "unknown super user command" << endl;
superUserCommand = "su";
@@ -28,7 +28,7 @@ KDEsuDialog::KDEsuDialog(QCString user, QCString auth_user, bool enableKeep,cons
m_User = auth_user;
setCaption(i18n("Run as %1").arg(user));
- QString prompt;
+ TQString prompt;
if (superUserCommand == "sudo" && m_User == "root") {
prompt = i18n("Please enter your password." );
} else {
diff --git a/kdesu/kdesu/sudlg.h b/kdesu/kdesu/sudlg.h
index 5f5340fc2..4277ca67c 100644
--- a/kdesu/kdesu/sudlg.h
+++ b/kdesu/kdesu/sudlg.h
@@ -15,7 +15,7 @@ class KDEsuDialog
Q_OBJECT
public:
- KDEsuDialog(QCString user, QCString auth_user, bool enableKeep, const QString& icon , bool withIgnoreButton=false);
+ KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon , bool withIgnoreButton=false);
~KDEsuDialog();
enum ResultCodes { AsUser = 10 };
@@ -25,7 +25,7 @@ protected:
void slotUser1();
private:
- QCString m_User;
+ TQCString m_User;
};
diff --git a/kdesu/kdesud/handler.cpp b/kdesu/kdesud/handler.cpp
index f18a874da..1d52a58ac 100644
--- a/kdesu/kdesud/handler.cpp
+++ b/kdesu/kdesud/handler.cpp
@@ -18,7 +18,7 @@
#include <sys/socket.h>
#include <sys/types.h>
-#include <qcstring.h>
+#include <tqcstring.h>
#include <kdebug.h>
#include <kdesu/su.h>
@@ -86,7 +86,7 @@ int ConnectionHandler::handle()
// Do we have a complete command yet?
int n;
- QCString newbuf;
+ TQCString newbuf;
while ((n = m_Buf.find('\n')) != -1)
{
newbuf = m_Buf.left(n+1);
@@ -100,10 +100,10 @@ int ConnectionHandler::handle()
return 0;
}
-QCString ConnectionHandler::makeKey(int _namespace, QCString s1,
- QCString s2, QCString s3)
+TQCString ConnectionHandler::makeKey(int _namespace, TQCString s1,
+ TQCString s2, TQCString s3)
{
- QCString res;
+ TQCString res;
res.setNum(_namespace);
res += "*";
res += s1 + "*" + s2 + "*" + s3;
@@ -114,7 +114,7 @@ void ConnectionHandler::sendExitCode()
{
if (!m_needExitCode)
return;
- QCString buf;
+ TQCString buf;
buf.setNum(m_exitCode);
buf.prepend("OK ");
buf.append("\n");
@@ -122,9 +122,9 @@ void ConnectionHandler::sendExitCode()
send(m_Fd, buf.data(), buf.length(), 0);
}
-void ConnectionHandler::respond(int ok, QCString s)
+void ConnectionHandler::respond(int ok, TQCString s)
{
- QCString buf;
+ TQCString buf;
switch (ok) {
case Res_OK:
@@ -152,7 +152,7 @@ void ConnectionHandler::respond(int ok, QCString s)
* close the socket in the main accept loop.
*/
-int ConnectionHandler::doCommand(QCString buf)
+int ConnectionHandler::doCommand(TQCString buf)
{
if ((uid_t) peerUid() != getuid())
{
@@ -161,7 +161,7 @@ int ConnectionHandler::doCommand(QCString buf)
return -1;
}
- QCString key, command, pass, name, user, value, env_check;
+ TQCString key, command, pass, name, user, value, env_check;
Data_entry data;
Lexer *l = new Lexer(buf);
@@ -221,7 +221,7 @@ int ConnectionHandler::doCommand(QCString buf)
case Lexer::Tok_exec: // "EXEC command:string user:string [options:string (env:string)*]\n"
{
- QCString options;
+ TQCString options;
QCStringList env;
tok = l->lex();
if (tok != Lexer::Tok_str)
@@ -242,7 +242,7 @@ int ConnectionHandler::doCommand(QCString buf)
{
if (tok != Lexer::Tok_str)
goto parse_error;
- QCString env_str = l->lval();
+ TQCString env_str = l->lval();
env.append(env_str);
if (strncmp(env_str, "DESKTOP_STARTUP_ID=", strlen("DESKTOP_STARTUP_ID=")) != 0)
env_check += "*"+env_str;
@@ -250,7 +250,7 @@ int ConnectionHandler::doCommand(QCString buf)
}
}
- QCString auth_user;
+ TQCString auth_user;
if ((m_Scheduler != SuProcess::SchedNormal) || (m_Priority > 50))
auth_user = "root";
else
diff --git a/kdesu/kdesud/handler.h b/kdesu/kdesud/handler.h
index acfada51b..785d1179f 100644
--- a/kdesu/kdesud/handler.h
+++ b/kdesu/kdesud/handler.h
@@ -9,7 +9,7 @@
#include <sys/types.h>
-#include <qcstring.h>
+#include <tqcstring.h>
#include "secure.h"
/**
@@ -35,13 +35,13 @@ public:
private:
enum Results { Res_OK, Res_NO };
- int doCommand(QCString buf);
- void respond(int ok, QCString s=0);
- QCString makeKey(int namspace, QCString s1, QCString s2=0, QCString s3=0);
+ int doCommand(TQCString buf);
+ void respond(int ok, TQCString s=0);
+ TQCString makeKey(int namspace, TQCString s1, TQCString s2=0, TQCString s3=0);
int m_Fd, m_Timeout;
int m_Priority, m_Scheduler;
- QCString m_Buf, m_Pass, m_Host;
+ TQCString m_Buf, m_Pass, m_Host;
public:
int m_exitCode;
bool m_hasExitCode;
diff --git a/kdesu/kdesud/kdesud.cpp b/kdesu/kdesud/kdesud.cpp
index d81b6a0c9..3e9462698 100644
--- a/kdesu/kdesud/kdesud.cpp
+++ b/kdesu/kdesud/kdesud.cpp
@@ -56,9 +56,9 @@
#include <sys/select.h> // Needed on some systems.
#endif
-#include <qptrvector.h>
-#include <qfile.h>
-#include <qregexp.h>
+#include <tqptrvector.h>
+#include <tqfile.h>
+#include <tqregexp.h>
#include <kinstance.h>
#include <kdebug.h>
@@ -87,7 +87,7 @@
Repository *repo;
const char *Version = "1.01";
-QCString sock;
+TQCString sock;
Display *x11Display;
int pipeOfDeath[2];
@@ -157,7 +157,7 @@ int create_socket()
ksocklen_t addrlen;
struct stat s;
- QCString display(getenv("DISPLAY"));
+ TQCString display(getenv("DISPLAY"));
if (display.isEmpty())
{
kdWarning(1205) << "$DISPLAY is not set\n";
@@ -165,9 +165,9 @@ int create_socket()
}
// strip the screen number from the display
- display.replace(QRegExp("\\.[0-9]+$"), "");
+ display.replace(TQRegExp("\\.[0-9]+$"), "");
- sock = QFile::encodeName(locateLocal("socket", QString("kdesud_%1").arg(display)));
+ sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(display)));
int stat_err=lstat(sock, &s);
if(!stat_err && S_ISLNK(s.st_mode)) {
kdWarning(1205) << "Someone is running a symlink attack on you\n";
@@ -294,7 +294,7 @@ int main(int argc, char *argv[])
maxfd = QMAX(maxfd, x11Fd);
repo = new Repository;
- QPtrVector<ConnectionHandler> handler;
+ TQPtrVector<ConnectionHandler> handler;
handler.setAutoDelete(true);
pipe(pipeOfDeath);
diff --git a/kdesu/kdesud/lexer.cpp b/kdesu/kdesud/lexer.cpp
index a05251a58..d9fbf4639 100644
--- a/kdesu/kdesud/lexer.cpp
+++ b/kdesu/kdesud/lexer.cpp
@@ -8,11 +8,11 @@
*/
#include <ctype.h>
-#include <qcstring.h>
+#include <tqcstring.h>
#include "lexer.h"
-Lexer::Lexer(const QCString &input)
+Lexer::Lexer(const TQCString &input)
{
m_Input = input;
in = 0;
@@ -25,7 +25,7 @@ Lexer::~Lexer()
m_Output.fill('x');
}
-QCString &Lexer::lval()
+TQCString &Lexer::lval()
{
return m_Output;
}
diff --git a/kdesu/kdesud/lexer.h b/kdesu/kdesud/lexer.h
index e678d746e..835cc375b 100644
--- a/kdesu/kdesud/lexer.h
+++ b/kdesu/kdesud/lexer.h
@@ -15,14 +15,14 @@ class QCString;
class Lexer {
public:
- Lexer(const QCString &input);
+ Lexer(const TQCString &input);
~Lexer();
/** Read next token. */
int lex();
/** Return the token's value. */
- QCString &lval();
+ TQCString &lval();
enum Tokens {
Tok_none, Tok_exec=256, Tok_pass, Tok_delCmd,
@@ -33,8 +33,8 @@ public:
};
private:
- QCString m_Input;
- QCString m_Output;
+ TQCString m_Input;
+ TQCString m_Output;
int in;
};
diff --git a/kdesu/kdesud/repo.cpp b/kdesu/kdesud/repo.cpp
index 783a9baca..cdbbcaed1 100644
--- a/kdesu/kdesud/repo.cpp
+++ b/kdesu/kdesud/repo.cpp
@@ -7,9 +7,9 @@
#include <time.h>
#include <assert.h>
-#include <qcstring.h>
-#include <qmap.h>
-#include <qvaluestack.h>
+#include <tqcstring.h>
+#include <tqmap.h>
+#include <tqvaluestack.h>
#include <kdebug.h>
#include "repo.h"
@@ -25,7 +25,7 @@ Repository::~Repository()
{}
-void Repository::add(const QCString &key, Data_entry &data)
+void Repository::add(const TQCString &key, Data_entry &data)
{
RepoIterator it = repo.find(key);
if (it != repo.end())
@@ -38,7 +38,7 @@ void Repository::add(const QCString &key, Data_entry &data)
repo.insert(key, data);
}
-int Repository::remove(const QCString &key)
+int Repository::remove(const TQCString &key)
{
if( key.isEmpty() )
return -1;
@@ -52,12 +52,12 @@ int Repository::remove(const QCString &key)
return 0;
}
-int Repository::removeSpecialKey(const QCString &key)
+int Repository::removeSpecialKey(const TQCString &key)
{
int found = -1;
if ( !key.isEmpty() )
{
- QValueStack<QCString> rm_keys;
+ TQValueStack<TQCString> rm_keys;
for (RepoCIterator it=repo.begin(); it!=repo.end(); ++it)
{
if ( key.find( it.data().group ) == 0 &&
@@ -76,12 +76,12 @@ int Repository::removeSpecialKey(const QCString &key)
return found;
}
-int Repository::removeGroup(const QCString &group)
+int Repository::removeGroup(const TQCString &group)
{
int found = -1;
if ( !group.isEmpty() )
{
- QValueStack<QCString> rm_keys;
+ TQValueStack<TQCString> rm_keys;
for (RepoCIterator it=repo.begin(); it!=repo.end(); ++it)
{
if (it.data().group == group)
@@ -99,7 +99,7 @@ int Repository::removeGroup(const QCString &group)
return found;
}
-int Repository::hasGroup(const QCString &group) const
+int Repository::hasGroup(const TQCString &group) const
{
if ( !group.isEmpty() )
{
@@ -113,14 +113,14 @@ int Repository::hasGroup(const QCString &group) const
return -1;
}
-QCString Repository::findKeys(const QCString &group, const char *sep ) const
+TQCString Repository::findKeys(const TQCString &group, const char *sep ) const
{
- QCString list="";
+ TQCString list="";
if( !group.isEmpty() )
{
kdDebug(1205) << "Looking for matching key with group key: " << group << endl;
int pos;
- QCString key;
+ TQCString key;
RepoCIterator it;
for (it=repo.begin(); it!=repo.end(); ++it)
{
@@ -149,7 +149,7 @@ QCString Repository::findKeys(const QCString &group, const char *sep ) const
return list;
}
-QCString Repository::find(const QCString &key) const
+TQCString Repository::find(const TQCString &key) const
{
if( key.isEmpty() )
return 0;
@@ -168,7 +168,7 @@ int Repository::expire()
return 0;
unsigned t;
- QValueStack<QCString> keys;
+ TQValueStack<TQCString> keys;
head_time = (unsigned) -1;
RepoIterator it;
for (it=repo.begin(); it!=repo.end(); ++it)
diff --git a/kdesu/kdesud/repo.h b/kdesu/kdesud/repo.h
index fde8cd250..24c156a34 100644
--- a/kdesu/kdesud/repo.h
+++ b/kdesu/kdesud/repo.h
@@ -8,8 +8,8 @@
#define __Repo_h_included__
-#include <qmap.h>
-#include <qcstring.h>
+#include <tqmap.h>
+#include <tqcstring.h>
/**
@@ -17,8 +17,8 @@
*/
struct Data_entry
{
- QCString value;
- QCString group;
+ TQCString value;
+ TQCString group;
unsigned int timeout;
};
@@ -37,31 +37,31 @@ public:
int expire();
/** Add a data element */
- void add(const QCString& key, Data_entry& data);
+ void add(const TQCString& key, Data_entry& data);
/** Delete a data element. */
- int remove(const QCString& key);
+ int remove(const TQCString& key);
/** Delete all data entries having the given group. */
- int removeGroup(const QCString& group);
+ int removeGroup(const TQCString& group);
/** Delete all data entries based on key. */
- int removeSpecialKey(const QCString& key );
+ int removeSpecialKey(const TQCString& key );
/** Checks for the existence of the specified group. */
- int hasGroup(const QCString &group) const;
+ int hasGroup(const TQCString &group) const;
/** Return a data value. */
- QCString find(const QCString& key) const;
+ TQCString find(const TQCString& key) const;
/** Returns the key values for the given group. */
- QCString findKeys(const QCString& group, const char *sep= "-") const;
+ TQCString findKeys(const TQCString& group, const char *sep= "-") const;
private:
- QMap<QCString,Data_entry> repo;
- typedef QMap<QCString,Data_entry>::Iterator RepoIterator;
- typedef QMap<QCString,Data_entry>::ConstIterator RepoCIterator;
+ TQMap<TQCString,Data_entry> repo;
+ typedef TQMap<TQCString,Data_entry>::Iterator RepoIterator;
+ typedef TQMap<TQCString,Data_entry>::ConstIterator RepoCIterator;
unsigned head_time;
};
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index 2dafb5789..48d22729a 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -24,11 +24,11 @@
#include <stdlib.h>
#include <iostream>
-#include <qptrlist.h>
-#include <qfile.h>
-#include <qdatastream.h>
-#include <qregexp.h>
-#include <qtimer.h>
+#include <tqptrlist.h>
+#include <tqfile.h>
+#include <tqdatastream.h>
+#include <tqregexp.h>
+#include <tqtimer.h>
#include <kmessagebox.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -41,7 +41,7 @@
#include "widgets.h"
#include <klocale.h>
-#include <qdialog.h>
+#include <tqdialog.h>
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <kfiledialog.h>
@@ -108,24 +108,24 @@ class WinIdEmbedder: public QObject
{
public:
WinIdEmbedder(bool printID, WId winId):
- QObject(qApp), print(printID), id(winId)
+ TQObject(qApp), print(printID), id(winId)
{
if (qApp)
qApp->installEventFilter(this);
}
protected:
- bool eventFilter(QObject *o, QEvent *e);
+ bool eventFilter(TQObject *o, TQEvent *e);
private:
bool print;
WId id;
};
-bool WinIdEmbedder::eventFilter(QObject *o, QEvent *e)
+bool WinIdEmbedder::eventFilter(TQObject *o, TQEvent *e)
{
- if (e->type() == QEvent::Show && o->isWidgetType()
+ if (e->type() == TQEvent::Show && o->isWidgetType()
&& o->inherits("KDialog"))
{
- QWidget *w = static_cast<QWidget*>(o);
+ TQWidget *w = static_cast<TQWidget*>(o);
if (print)
cout << "winId: " << w->winId() << endl;
#ifdef Q_WS_X11
@@ -135,17 +135,17 @@ bool WinIdEmbedder::eventFilter(QObject *o, QEvent *e)
deleteLater(); // WinIdEmbedder is not needed anymore after the first dialog was shown
return false;
}
- return QObject::eventFilter(o, e);
+ return TQObject::eventFilter(o, e);
}
-static void outputStringList(QStringList list, bool separateOutput)
+static void outputStringList(TQStringList list, bool separateOutput)
{
if ( separateOutput) {
- for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
+ for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
cout << (*it).local8Bit().data() << endl;
}
} else {
- for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
+ for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
cout << (*it).local8Bit().data() << " ";
}
cout << endl;
@@ -154,16 +154,16 @@ static void outputStringList(QStringList list, bool separateOutput)
static int directCommand(KCmdLineArgs *args)
{
- QString title;
+ TQString title;
bool separateOutput = FALSE;
bool printWId = args->isSet("print-winid");
bool embed = args->isSet("embed");
- QString defaultEntry;
+ TQString defaultEntry;
// --title text
KCmdLineArgs *qtargs = KCmdLineArgs::parsedArgs("qt"); // --title is a qt option
if(qtargs->isSet("title")) {
- title = QFile::decodeName(qtargs->getOption("title"));
+ title = TQFile::decodeName(qtargs->getOption("title"));
}
// --separate-output
@@ -185,7 +185,7 @@ static int directCommand(KCmdLineArgs *args)
// --yesno and other message boxes
KMessageBox::DialogType type = (KMessageBox::DialogType) 0;
- QCString option;
+ TQCString option;
if (args->isSet("yesno")) {
option = "yesno";
type = KMessageBox::QuestionYesNo;
@@ -223,11 +223,11 @@ static int directCommand(KCmdLineArgs *args)
{
KConfig* dontagaincfg = NULL;
// --dontagain
- QString dontagain; // QString::null
+ TQString dontagain; // TQString::null
if (args->isSet("dontagain"))
{
- QString value = args->getOption("dontagain");
- QStringList values = QStringList::split( ':', value );
+ TQString value = args->getOption("dontagain");
+ TQStringList values = TQStringList::split( ':', value );
if( values.count() == 2 )
{
dontagaincfg = new KConfig( values[ 0 ] );
@@ -239,11 +239,11 @@ static int directCommand(KCmdLineArgs *args)
}
int ret;
- QString text = QString::fromLocal8Bit(args->getOption( option ));
+ TQString text = TQString::fromLocal8Bit(args->getOption( option ));
int pos;
- while ((pos = text.find( QString::fromLatin1("\\n") )) >= 0)
+ while ((pos = text.find( TQString::fromLatin1("\\n") )) >= 0)
{
- text.replace(pos, 2, QString::fromLatin1("\n"));
+ text.replace(pos, 2, TQString::fromLatin1("\n"));
}
if ( type == KMessageBox::WarningContinueCancel ) {
@@ -264,13 +264,13 @@ static int directCommand(KCmdLineArgs *args)
// --inputbox text [init]
if (args->isSet("inputbox"))
{
- QString result;
- QString init;
+ TQString result;
+ TQString init;
if (args->count() > 0)
- init = QString::fromLocal8Bit(args->arg(0));
+ init = TQString::fromLocal8Bit(args->arg(0));
- bool retcode = Widgets::inputBox(0, title, QString::fromLocal8Bit(args->getOption("inputbox")), init, result);
+ bool retcode = Widgets::inputBox(0, title, TQString::fromLocal8Bit(args->getOption("inputbox")), init, result);
cout << result.local8Bit().data() << endl;
return retcode ? 0 : 1;
}
@@ -279,8 +279,8 @@ static int directCommand(KCmdLineArgs *args)
// --password text
if (args->isSet("password"))
{
- QCString result;
- bool retcode = Widgets::passwordBox(0, title, QString::fromLocal8Bit(args->getOption("password")), result);
+ TQCString result;
+ bool retcode = Widgets::passwordBox(0, title, TQString::fromLocal8Bit(args->getOption("password")), result);
cout << result.data() << endl;
return retcode ? 0 : 1;
}
@@ -290,19 +290,19 @@ static int directCommand(KCmdLineArgs *args)
{
int duration = 0;
if (args->count() > 0)
- duration = 1000 * QString::fromLocal8Bit(args->arg(0)).toInt();
+ duration = 1000 * TQString::fromLocal8Bit(args->arg(0)).toInt();
if (duration == 0)
duration = 10000;
KPassivePopup *popup = KPassivePopup::message( KPassivePopup::Balloon, // style
title,
- QString::fromLocal8Bit( args->getOption("passivepopup") ),
+ TQString::fromLocal8Bit( args->getOption("passivepopup") ),
0, // icon
- (QWidget*)0UL, // parent
+ (TQWidget*)0UL, // parent
0, // name
duration );
- QTimer *timer = new QTimer();
- QObject::connect( timer, SIGNAL( timeout() ), kapp, SLOT( quit() ) );
- QObject::connect( popup, SIGNAL( clicked() ), kapp, SLOT( quit() ) );
+ TQTimer *timer = new TQTimer();
+ TQObject::connect( timer, TQT_SIGNAL( timeout() ), kapp, TQT_SLOT( quit() ) );
+ TQObject::connect( popup, TQT_SIGNAL( clicked() ), kapp, TQT_SLOT( quit() ) );
timer->start( duration, TRUE );
#ifdef Q_WS_X11
@@ -314,7 +314,7 @@ static int directCommand(KCmdLineArgs *args)
x = KApplication::desktop()->width() + x - w;
if ( (m & YNegative) )
y = KApplication::desktop()->height() + y - h;
- popup->setAnchor( QPoint(x, y) );
+ popup->setAnchor( TQPoint(x, y) );
}
#endif
kapp->exec();
@@ -328,11 +328,11 @@ static int directCommand(KCmdLineArgs *args)
int h = 0;
if (args->count() == 2) {
- w = QString::fromLocal8Bit(args->arg(0)).toInt();
- h = QString::fromLocal8Bit(args->arg(1)).toInt();
+ w = TQString::fromLocal8Bit(args->arg(0)).toInt();
+ h = TQString::fromLocal8Bit(args->arg(1)).toInt();
}
- return Widgets::textBox(0, w, h, title, QString::fromLocal8Bit(args->getOption("textbox")));
+ return Widgets::textBox(0, w, h, title, TQString::fromLocal8Bit(args->getOption("textbox")));
}
// --textinputbox file [width] [height]
@@ -342,19 +342,19 @@ static int directCommand(KCmdLineArgs *args)
int h = 200;
if (args->count() == 4) {
- w = QString::fromLocal8Bit(args->arg(2)).toInt();
- h = QString::fromLocal8Bit(args->arg(3)).toInt();
+ w = TQString::fromLocal8Bit(args->arg(2)).toInt();
+ h = TQString::fromLocal8Bit(args->arg(3)).toInt();
}
- QStringList list;
- list.append(QString::fromLocal8Bit(args->getOption("textinputbox")));
+ TQStringList list;
+ list.append(TQString::fromLocal8Bit(args->getOption("textinputbox")));
if (args->count() >= 1) {
for (int i = 0; i < args->count(); i++)
- list.append(QString::fromLocal8Bit(args->arg(i)));
+ list.append(TQString::fromLocal8Bit(args->arg(i)));
}
- QCString result;
+ TQCString result;
int ret = Widgets::textInputBox(0, w, h, title, list, result);
cout << result.data() << endl;
return ret;
@@ -362,16 +362,16 @@ static int directCommand(KCmdLineArgs *args)
// --combobox <text> [tag item] [tag item] ..."
if (args->isSet("combobox")) {
- QStringList list;
+ TQStringList list;
if (args->count() >= 2) {
for (int i = 0; i < args->count(); i++) {
- list.append(QString::fromLocal8Bit(args->arg(i)));
+ list.append(TQString::fromLocal8Bit(args->arg(i)));
}
- QString text = QString::fromLocal8Bit(args->getOption("combobox"));
+ TQString text = TQString::fromLocal8Bit(args->getOption("combobox"));
if (args->isSet("default")) {
defaultEntry = args->getOption("default");
}
- QString result;
+ TQString result;
bool retcode = Widgets::comboBox(0, title, text, list, defaultEntry, result);
cout << result.local8Bit().data() << endl;
return retcode ? 0 : 1;
@@ -381,16 +381,16 @@ static int directCommand(KCmdLineArgs *args)
// --menu text [tag item] [tag item] ...
if (args->isSet("menu")) {
- QStringList list;
+ TQStringList list;
if (args->count() >= 2) {
for (int i = 0; i < args->count(); i++) {
- list.append(QString::fromLocal8Bit(args->arg(i)));
+ list.append(TQString::fromLocal8Bit(args->arg(i)));
}
- QString text = QString::fromLocal8Bit(args->getOption("menu"));
+ TQString text = TQString::fromLocal8Bit(args->getOption("menu"));
if (args->isSet("default")) {
defaultEntry = args->getOption("default");
}
- QString result;
+ TQString result;
bool retcode = Widgets::listBox(0, title, text, list, defaultEntry, result);
if (1 == retcode) { // OK was selected
cout << result.local8Bit().data() << endl;
@@ -402,14 +402,14 @@ static int directCommand(KCmdLineArgs *args)
// --checklist text [tag item status] [tag item status] ...
if (args->isSet("checklist")) {
- QStringList list;
+ TQStringList list;
if (args->count() >= 3) {
for (int i = 0; i < args->count(); i++) {
- list.append(QString::fromLocal8Bit(args->arg(i)));
+ list.append(TQString::fromLocal8Bit(args->arg(i)));
}
- QString text = QString::fromLocal8Bit(args->getOption("checklist"));
- QStringList result;
+ TQString text = TQString::fromLocal8Bit(args->getOption("checklist"));
+ TQStringList result;
bool retcode = Widgets::checkList(0, title, text, list, separateOutput, result);
@@ -425,14 +425,14 @@ static int directCommand(KCmdLineArgs *args)
// --radiolist text width height menuheight [tag item status]
if (args->isSet("radiolist")) {
- QStringList list;
+ TQStringList list;
if (args->count() >= 3) {
for (int i = 0; i < args->count(); i++) {
- list.append(QString::fromLocal8Bit(args->arg(i)));
+ list.append(TQString::fromLocal8Bit(args->arg(i)));
}
- QString text = QString::fromLocal8Bit(args->getOption("radiolist"));
- QString result;
+ TQString text = TQString::fromLocal8Bit(args->getOption("radiolist"));
+ TQString result;
bool retcode = Widgets::radioBox(0, title, text, list, result);
cout << result.local8Bit().data() << endl;
exit( retcode ? 0 : 1 );
@@ -442,11 +442,11 @@ static int directCommand(KCmdLineArgs *args)
// getopenfilename [startDir] [filter]
if (args->isSet("getopenfilename")) {
- QString startDir;
- QString filter;
- startDir = QString::fromLocal8Bit(args->getOption("getopenfilename"));
+ TQString startDir;
+ TQString filter;
+ startDir = TQString::fromLocal8Bit(args->getOption("getopenfilename"));
if (args->count() >= 1) {
- filter = QString::fromLocal8Bit(args->arg(0));
+ filter = TQString::fromLocal8Bit(args->arg(0));
}
KFileDialog dlg(startDir, filter, 0, "filedialog", true);
dlg.setOperationMode( KFileDialog::Opening );
@@ -462,13 +462,13 @@ static int directCommand(KCmdLineArgs *args)
dlg.exec();
if (args->isSet("multiple")) {
- QStringList result = dlg.selectedFiles();
+ TQStringList result = dlg.selectedFiles();
if ( !result.isEmpty() ) {
outputStringList( result, separateOutput );
return 0;
}
} else {
- QString result = dlg.selectedFile();
+ TQString result = dlg.selectedFile();
if (!result.isEmpty()) {
cout << result.local8Bit().data() << endl;
return 0;
@@ -481,19 +481,19 @@ static int directCommand(KCmdLineArgs *args)
// getsaveurl [startDir] [filter]
// getsavefilename [startDir] [filter]
if ( (args->isSet("getsavefilename") ) || (args->isSet("getsaveurl") ) ) {
- QString startDir;
- QString filter;
+ TQString startDir;
+ TQString filter;
if ( args->isSet("getsavefilename") ) {
- startDir = QString::fromLocal8Bit(args->getOption("getsavefilename"));
+ startDir = TQString::fromLocal8Bit(args->getOption("getsavefilename"));
} else {
- startDir = QString::fromLocal8Bit(args->getOption("getsaveurl"));
+ startDir = TQString::fromLocal8Bit(args->getOption("getsaveurl"));
}
if (args->count() >= 1) {
- filter = QString::fromLocal8Bit(args->arg(0));
+ filter = TQString::fromLocal8Bit(args->arg(0));
}
// copied from KFileDialog::getSaveFileName(), so we can add geometry
bool specialDir = ( startDir.at(0) == ':' );
- KFileDialog dlg( specialDir ? startDir : QString::null, filter, 0, "filedialog", true );
+ KFileDialog dlg( specialDir ? startDir : TQString::null, filter, 0, "filedialog", true );
if ( !specialDir )
dlg.setSelection( startDir );
dlg.setOperationMode( KFileDialog::Saving );
@@ -510,7 +510,7 @@ static int directCommand(KCmdLineArgs *args)
return 0;
}
} else { // getsavefilename
- QString result = dlg.selectedFile();
+ TQString result = dlg.selectedFile();
if (!result.isEmpty()) {
KRecentDocument::add(result);
cout << result.local8Bit().data() << endl;
@@ -522,11 +522,11 @@ static int directCommand(KCmdLineArgs *args)
// getexistingdirectory [startDir]
if (args->isSet("getexistingdirectory")) {
- QString startDir;
- startDir = QString::fromLocal8Bit(args->getOption("getexistingdirectory"));
- QString result;
+ TQString startDir;
+ startDir = TQString::fromLocal8Bit(args->getOption("getexistingdirectory"));
+ TQString result;
#ifdef Q_WS_WIN
- result = QFileDialog::getExistingDirectory(startDir, 0, "getExistingDirectory",
+ result = TQFileDialog::getExistingDirectory(startDir, 0, "getExistingDirectory",
title, true, true);
#else
KURL url;
@@ -539,7 +539,7 @@ static int directCommand(KCmdLineArgs *args)
if ( !title.isNull() )
myDialog.setCaption( title );
- if ( myDialog.exec() == QDialog::Accepted )
+ if ( myDialog.exec() == TQDialog::Accepted )
url = myDialog.url();
if ( url.isValid() )
@@ -554,11 +554,11 @@ static int directCommand(KCmdLineArgs *args)
// getopenurl [startDir] [filter]
if (args->isSet("getopenurl")) {
- QString startDir;
- QString filter;
- startDir = QString::fromLocal8Bit(args->getOption("getopenurl"));
+ TQString startDir;
+ TQString filter;
+ startDir = TQString::fromLocal8Bit(args->getOption("getopenurl"));
if (args->count() >= 1) {
- filter = QString::fromLocal8Bit(args->arg(0));
+ filter = TQString::fromLocal8Bit(args->arg(0));
}
KFileDialog dlg(startDir, filter, 0, "filedialog", true);
dlg.setOperationMode( KFileDialog::Opening );
@@ -591,35 +591,35 @@ static int directCommand(KCmdLineArgs *args)
// geticon [group] [context]
if (args->isSet("geticon")) {
- QString groupStr, contextStr;
- groupStr = QString::fromLocal8Bit(args->getOption("geticon"));
+ TQString groupStr, contextStr;
+ groupStr = TQString::fromLocal8Bit(args->getOption("geticon"));
if (args->count() >= 1) {
- contextStr = QString::fromLocal8Bit(args->arg(0));
+ contextStr = TQString::fromLocal8Bit(args->arg(0));
}
KIcon::Group group = KIcon::NoGroup;
- if ( groupStr == QString::fromLatin1( "Desktop" ) )
+ if ( groupStr == TQString::fromLatin1( "Desktop" ) )
group = KIcon::Desktop;
- else if ( groupStr == QString::fromLatin1( "Toolbar" ) )
+ else if ( groupStr == TQString::fromLatin1( "Toolbar" ) )
group = KIcon::Toolbar;
- else if ( groupStr == QString::fromLatin1( "MainToolbar" ) )
+ else if ( groupStr == TQString::fromLatin1( "MainToolbar" ) )
group = KIcon::MainToolbar;
- else if ( groupStr == QString::fromLatin1( "Small" ) )
+ else if ( groupStr == TQString::fromLatin1( "Small" ) )
group = KIcon::Small;
- else if ( groupStr == QString::fromLatin1( "Panel" ) )
+ else if ( groupStr == TQString::fromLatin1( "Panel" ) )
group = KIcon::Panel;
- else if ( groupStr == QString::fromLatin1( "User" ) )
+ else if ( groupStr == TQString::fromLatin1( "User" ) )
group = KIcon::User;
KIcon::Context context = KIcon::Any;
// From kicontheme.cpp
- if ( contextStr == QString::fromLatin1( "Devices" ) )
+ if ( contextStr == TQString::fromLatin1( "Devices" ) )
context = KIcon::Device;
- else if ( contextStr == QString::fromLatin1( "MimeTypes" ) )
+ else if ( contextStr == TQString::fromLatin1( "MimeTypes" ) )
context = KIcon::MimeType;
- else if ( contextStr == QString::fromLatin1( "FileSystems" ) )
+ else if ( contextStr == TQString::fromLatin1( "FileSystems" ) )
context = KIcon::FileSystem;
- else if ( contextStr == QString::fromLatin1( "Applications" ) )
+ else if ( contextStr == TQString::fromLatin1( "Applications" ) )
context = KIcon::Application;
- else if ( contextStr == QString::fromLatin1( "Actions" ) )
+ else if ( contextStr == TQString::fromLatin1( "Actions" ) )
context = KIcon::Action;
KIconDialog dlg(0, "icon dialog");
@@ -629,7 +629,7 @@ static int directCommand(KCmdLineArgs *args)
dlg.setCaption(title);
Widgets::handleXGeometry(&dlg);
- QString result = dlg.openDialog();
+ TQString result = dlg.openDialog();
if (!result.isEmpty()) {
cout << result.local8Bit().data() << endl;
@@ -647,10 +647,10 @@ static int directCommand(KCmdLineArgs *args)
close(1);
int totalsteps = 100;
- QString text = QString::fromLocal8Bit(args->getOption("progressbar"));
+ TQString text = TQString::fromLocal8Bit(args->getOption("progressbar"));
if (args->count() == 1)
- totalsteps = QString::fromLocal8Bit(args->arg(0)).toInt();
+ totalsteps = TQString::fromLocal8Bit(args->arg(0)).toInt();
return Widgets::progressBar(0, title, text, totalsteps) ? 1 : 0;
}
diff --git a/kdialog/klistboxdialog.cpp b/kdialog/klistboxdialog.cpp
index 7ddbf509c..d7abfb694 100644
--- a/kdialog/klistboxdialog.cpp
+++ b/kdialog/klistboxdialog.cpp
@@ -17,34 +17,34 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
-#include <qlabel.h>
-#include <qlistbox.h>
-#include <qvbox.h>
+#include <tqlabel.h>
+#include <tqlistbox.h>
+#include <tqvbox.h>
#include "klistboxdialog.h"
#include "klistboxdialog.moc"
#include "klocale.h"
-KListBoxDialog::KListBoxDialog(QString text, QWidget *parent)
- : KDialogBase( parent, 0, true, QString::null, Ok|Cancel, Ok, true )
+KListBoxDialog::KListBoxDialog(TQString text, TQWidget *parent)
+ : KDialogBase( parent, 0, true, TQString::null, Ok|Cancel, Ok, true )
{
- QVBox *page = makeVBoxMainWidget();
+ TQVBox *page = makeVBoxMainWidget();
- label = new QLabel(text, page);
+ label = new TQLabel(text, page);
label->setAlignment(AlignCenter);
- table = new QListBox(page);
+ table = new TQListBox(page);
table->setFocus();
}
-void KListBoxDialog::insertItem(const QString& item)
+void KListBoxDialog::insertItem(const TQString& item)
{
table->insertItem(item);
table->setCurrentItem(0);
}
-void KListBoxDialog::setCurrentItem(const QString& item)
+void KListBoxDialog::setCurrentItem(const TQString& item)
{
for ( int i=0; i < (int) table->count(); i++ ) {
if ( table->text(i) == item ) {
diff --git a/kdialog/klistboxdialog.h b/kdialog/klistboxdialog.h
index 35a326da7..fb73383f1 100644
--- a/kdialog/klistboxdialog.h
+++ b/kdialog/klistboxdialog.h
@@ -29,19 +29,19 @@ class KListBoxDialog : public KDialogBase
public:
- KListBoxDialog(QString text, QWidget *parent=0);
+ KListBoxDialog(TQString text, TQWidget *parent=0);
~KListBoxDialog() {};
- QListBox &getTable() { return *table; };
+ TQListBox &getTable() { return *table; };
- void insertItem( const QString& text );
- void setCurrentItem ( const QString& text );
+ void insertItem( const TQString& text );
+ void setCurrentItem ( const TQString& text );
int currentItem();
protected:
- QListBox *table;
- QLabel *label;
+ TQListBox *table;
+ TQLabel *label;
};
diff --git a/kdialog/progressdialog.cpp b/kdialog/progressdialog.cpp
index fa145f83e..498e333af 100644
--- a/kdialog/progressdialog.cpp
+++ b/kdialog/progressdialog.cpp
@@ -21,7 +21,7 @@
#include "kdebug.h"
#include "widgets.h"
-ProgressDialog::ProgressDialog(QWidget* parent, const QString& caption, const QString& text, int totalSteps)
+ProgressDialog::ProgressDialog(TQWidget* parent, const TQString& caption, const TQString& text, int totalSteps)
: DCOPObject( "ProgressDialog" ), KProgressDialog(parent, 0, caption, text, false)
{
setAutoClose( false );
@@ -54,7 +54,7 @@ int ProgressDialog::progress() const
return progressBar()->progress();
}
-void ProgressDialog::setLabel(const QString& label)
+void ProgressDialog::setLabel(const TQString& label)
{
KProgressDialog::setLabel( label );
}
diff --git a/kdialog/progressdialog.h b/kdialog/progressdialog.h
index 4b7d90754..cdfca1ccb 100644
--- a/kdialog/progressdialog.h
+++ b/kdialog/progressdialog.h
@@ -27,7 +27,7 @@ class ProgressDialog : public KProgressDialog, virtual public ProgressDialogIfac
Q_OBJECT
public:
- ProgressDialog(QWidget* parent = 0, const QString& caption = QString::null, const QString& text = QString::null, int totalSteps = 100);
+ ProgressDialog(TQWidget* parent = 0, const TQString& caption = TQString::null, const TQString& text = TQString::null, int totalSteps = 100);
void setTotalSteps( int );
int totalSteps() const;
@@ -35,7 +35,7 @@ class ProgressDialog : public KProgressDialog, virtual public ProgressDialogIfac
void setProgress( int );
int progress() const;
- void setLabel(const QString&);
+ void setLabel(const TQString&);
void showCancelButton(bool show);
bool wasCancelled() const;
diff --git a/kdialog/progressdialogiface.h b/kdialog/progressdialogiface.h
index 2974cb9a9..068e5de38 100644
--- a/kdialog/progressdialogiface.h
+++ b/kdialog/progressdialogiface.h
@@ -14,7 +14,7 @@ class ProgressDialogIface : virtual public DCOPObject
virtual void setProgress( int ) =0;
virtual int progress() const =0;
- virtual void setLabel( const QString& ) =0;
+ virtual void setLabel( const TQString& ) =0;
virtual void showCancelButton ( bool ) =0;
virtual bool wasCancelled() const =0;
diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp
index 41f5e452f..a2064a5ba 100644
--- a/kdialog/widgets.cpp
+++ b/kdialog/widgets.cpp
@@ -30,16 +30,16 @@
#include <kdebug.h>
#include <kapplication.h>
-#include <qlabel.h>
+#include <tqlabel.h>
#include <ktextedit.h>
-#include <qvbox.h>
-#include <qfile.h>
+#include <tqvbox.h>
+#include <tqfile.h>
#if defined Q_WS_X11 && ! defined K_WS_QTONLY
#include <netwm.h>
#endif
-void Widgets::handleXGeometry(QWidget * dlg)
+void Widgets::handleXGeometry(TQWidget * dlg)
{
#ifdef Q_WS_X11
if ( ! kapp->geometryArgument().isEmpty()) {
@@ -56,16 +56,16 @@ void Widgets::handleXGeometry(QWidget * dlg)
#endif
}
-bool Widgets::inputBox(QWidget *parent, const QString& title, const QString& text, const QString& init, QString &result)
+bool Widgets::inputBox(TQWidget *parent, const TQString& title, const TQString& text, const TQString& init, TQString &result)
{
bool ok;
- QString str = KInputDialog::text( title, text, init, &ok, parent, 0, 0, QString::null );
+ TQString str = KInputDialog::text( title, text, init, &ok, parent, 0, 0, TQString::null );
if ( ok )
result = str;
return ok;
}
-bool Widgets::passwordBox(QWidget *parent, const QString& title, const QString& text, QCString &result)
+bool Widgets::passwordBox(TQWidget *parent, const TQString& title, const TQString& text, TQCString &result)
{
KPasswordDialog dlg( KPasswordDialog::Password, false, 0, parent );
@@ -75,13 +75,13 @@ bool Widgets::passwordBox(QWidget *parent, const QString& title, const QString&
handleXGeometry(&dlg);
- bool retcode = (dlg.exec() == QDialog::Accepted);
+ bool retcode = (dlg.exec() == TQDialog::Accepted);
if ( retcode )
result = dlg.password();
return retcode;
}
-int Widgets::textBox(QWidget *parent, int width, int height, const QString& title, const QString& file)
+int Widgets::textBox(TQWidget *parent, int width, int height, const TQString& title, const TQString& file)
{
// KTextBox dlg(parent, 0, TRUE, width, height, file);
KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok, KDialogBase::Ok );
@@ -90,23 +90,23 @@ int Widgets::textBox(QWidget *parent, int width, int height, const QString& titl
KTextEdit *edit = new KTextEdit( dlg.makeVBoxMainWidget() );
edit->setReadOnly(TRUE);
- QFile f(file);
+ TQFile f(file);
if (!f.open(IO_ReadOnly))
{
kdError() << i18n("kdialog: could not open file ") << file << endl;
return -1;
}
- QTextStream s(&f);
+ TQTextStream s(&f);
while (!s.eof())
edit->append(s.readLine());
- edit->moveCursor(QTextEdit::MoveHome, false);
+ edit->moveCursor(TQTextEdit::MoveHome, false);
f.close();
if ( width > 0 && height > 0 )
- dlg.setInitialSize( QSize( width, height ) );
+ dlg.setInitialSize( TQSize( width, height ) );
handleXGeometry(&dlg);
dlg.setCaption(title);
@@ -114,17 +114,17 @@ int Widgets::textBox(QWidget *parent, int width, int height, const QString& titl
return 0;
}
-int Widgets::textInputBox(QWidget *parent, int width, int height, const QString& title, const QStringList& args, QCString &result)
+int Widgets::textInputBox(TQWidget *parent, int width, int height, const TQString& title, const TQStringList& args, TQCString &result)
{
// KTextBox dlg(parent, 0, TRUE, width, height, file);
KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok, KDialogBase::Ok );
kapp->setTopWidget( &dlg );
- QVBox* vbox = dlg.makeVBoxMainWidget();
+ TQVBox* vbox = dlg.makeVBoxMainWidget();
if( args.count() > 0 )
{
- QLabel *label = new QLabel(vbox);
+ TQLabel *label = new TQLabel(vbox);
label->setText(args[0]);
}
@@ -137,7 +137,7 @@ int Widgets::textInputBox(QWidget *parent, int width, int height, const QString&
edit->setText( args[1] );
if ( width > 0 && height > 0 )
- dlg.setInitialSize( QSize( width, height ) );
+ dlg.setInitialSize( TQSize( width, height ) );
handleXGeometry(&dlg);
dlg.setCaption(title);
@@ -146,17 +146,17 @@ int Widgets::textInputBox(QWidget *parent, int width, int height, const QString&
return 0;
}
-bool Widgets::comboBox(QWidget *parent, const QString& title, const QString& text, const QStringList& args,
- const QString& defaultEntry, QString &result)
+bool Widgets::comboBox(TQWidget *parent, const TQString& title, const TQString& text, const TQStringList& args,
+ const TQString& defaultEntry, TQString &result)
{
KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok|KDialogBase::Cancel,
KDialogBase::Ok );
kapp->setTopWidget( &dlg );
dlg.setCaption(title);
- QVBox* vbox = dlg.makeVBoxMainWidget();
+ TQVBox* vbox = dlg.makeVBoxMainWidget();
- QLabel label (vbox);
+ TQLabel label (vbox);
label.setText (text);
KComboBox combo (vbox);
combo.insertStringList (args);
@@ -164,7 +164,7 @@ bool Widgets::comboBox(QWidget *parent, const QString& title, const QString& tex
handleXGeometry(&dlg);
- bool retcode = (dlg.exec() == QDialog::Accepted);
+ bool retcode = (dlg.exec() == TQDialog::Accepted);
if (retcode)
result = combo.currentText();
@@ -172,8 +172,8 @@ bool Widgets::comboBox(QWidget *parent, const QString& title, const QString& tex
return retcode;
}
-bool Widgets::listBox(QWidget *parent, const QString& title, const QString& text, const QStringList& args,
- const QString& defaultEntry, QString &result)
+bool Widgets::listBox(TQWidget *parent, const TQString& title, const TQString& text, const TQStringList& args,
+ const TQString& defaultEntry, TQString &result)
{
KListBoxDialog box(text,parent);
@@ -187,23 +187,23 @@ bool Widgets::listBox(QWidget *parent, const QString& title, const QString& text
handleXGeometry(&box);
- bool retcode = (box.exec() == QDialog::Accepted);
+ bool retcode = (box.exec() == TQDialog::Accepted);
if ( retcode )
result = args[ box.currentItem()*2 ];
return retcode;
}
-bool Widgets::checkList(QWidget *parent, const QString& title, const QString& text, const QStringList& args, bool separateOutput, QStringList &result)
+bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString& text, const TQStringList& args, bool separateOutput, TQStringList &result)
{
- QStringList entries, tags;
- QString rs;
+ TQStringList entries, tags;
+ TQString rs;
result.clear();
KListBoxDialog box(text,parent);
- QListBox &table = box.getTable();
+ TQListBox &table = box.getTable();
kapp->setTopWidget( &box );
box.setCaption(title);
@@ -218,12 +218,12 @@ bool Widgets::checkList(QWidget *parent, const QString& title, const QString& te
table.setCurrentItem(0); // This is to circumvent a Qt bug
for (unsigned int i=0; i+2<args.count(); i += 3) {
- table.setSelected( i/3, args[i+2] == QString::fromLatin1("on") );
+ table.setSelected( i/3, args[i+2] == TQString::fromLatin1("on") );
}
handleXGeometry(&box);
- bool retcode = (box.exec() == QDialog::Accepted);
+ bool retcode = (box.exec() == TQDialog::Accepted);
if ( retcode ) {
if (separateOutput) {
@@ -233,7 +233,7 @@ bool Widgets::checkList(QWidget *parent, const QString& title, const QString& te
} else {
for (unsigned int i=0; i<table.count(); i++)
if (table.isSelected(i))
- rs += QString::fromLatin1("\"") + tags[i] + QString::fromLatin1("\" ");
+ rs += TQString::fromLatin1("\"") + tags[i] + TQString::fromLatin1("\" ");
result.append(rs);
}
}
@@ -241,13 +241,13 @@ bool Widgets::checkList(QWidget *parent, const QString& title, const QString& te
}
-bool Widgets::radioBox(QWidget *parent, const QString& title, const QString& text, const QStringList& args, QString &result)
+bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString& text, const TQStringList& args, TQString &result)
{
- QStringList entries, tags;
+ TQStringList entries, tags;
KListBoxDialog box(text,parent);
- QListBox &table = box.getTable();
+ TQListBox &table = box.getTable();
kapp->setTopWidget( &box );
box.setCaption(title);
@@ -260,18 +260,18 @@ bool Widgets::radioBox(QWidget *parent, const QString& title, const QString& tex
table.insertStringList(entries);
for (unsigned int i=0; i+2<args.count(); i += 3) {
- table.setSelected( i/3, args[i+2] == QString::fromLatin1("on") );
+ table.setSelected( i/3, args[i+2] == TQString::fromLatin1("on") );
}
handleXGeometry(&box);
- bool retcode = (box.exec() == QDialog::Accepted);
+ bool retcode = (box.exec() == TQDialog::Accepted);
if ( retcode )
result = tags[ table.currentItem() ];
return retcode;
}
-bool Widgets::progressBar(QWidget *parent, const QString& title, const QString& text, int totalSteps)
+bool Widgets::progressBar(TQWidget *parent, const TQString& title, const TQString& text, int totalSteps)
{
ProgressDialog dlg( parent, title, text, totalSteps );
kapp->setTopWidget( &dlg );
diff --git a/kdialog/widgets.h b/kdialog/widgets.h
index 8808b810c..e6576d36e 100644
--- a/kdialog/widgets.h
+++ b/kdialog/widgets.h
@@ -21,22 +21,22 @@
#ifndef _WIDGETS_H_
#define _WIDGETS_H_
-#include <qwidget.h>
-#include <qstring.h>
+#include <tqwidget.h>
+#include <tqstring.h>
namespace Widgets
{
- bool inputBox(QWidget *parent, const QString& title, const QString& text, const QString& init, QString &result);
- bool passwordBox(QWidget *parent, const QString& title, const QString& text, QCString &result);
- int textBox(QWidget *parent, int width, int height, const QString& title, const QString& file);
- int textInputBox(QWidget *parent, int width, int height, const QString& title, const QStringList& args, QCString &result);
- bool listBox(QWidget *parent, const QString& title, const QString& text, const QStringList& args, const QString &defaultEntry, QString &result);
- bool checkList(QWidget *parent, const QString& title, const QString& text, const QStringList& args, bool separateOutput, QStringList &result);
- bool radioBox(QWidget *parent, const QString& title, const QString& text, const QStringList& args, QString &result);
- bool comboBox(QWidget *parent, const QString& title, const QString& text, const QStringList& args, const QString& defaultEntry, QString &result);
- bool progressBar(QWidget *parent, const QString& title, const QString& text, int totalSteps);
+ bool inputBox(TQWidget *parent, const TQString& title, const TQString& text, const TQString& init, TQString &result);
+ bool passwordBox(TQWidget *parent, const TQString& title, const TQString& text, TQCString &result);
+ int textBox(TQWidget *parent, int width, int height, const TQString& title, const TQString& file);
+ int textInputBox(TQWidget *parent, int width, int height, const TQString& title, const TQStringList& args, TQCString &result);
+ bool listBox(TQWidget *parent, const TQString& title, const TQString& text, const TQStringList& args, const TQString &defaultEntry, TQString &result);
+ bool checkList(TQWidget *parent, const TQString& title, const TQString& text, const TQStringList& args, bool separateOutput, TQStringList &result);
+ bool radioBox(TQWidget *parent, const TQString& title, const TQString& text, const TQStringList& args, TQString &result);
+ bool comboBox(TQWidget *parent, const TQString& title, const TQString& text, const TQStringList& args, const TQString& defaultEntry, TQString &result);
+ bool progressBar(TQWidget *parent, const TQString& title, const TQString& text, int totalSteps);
- void handleXGeometry(QWidget * dlg);
+ void handleXGeometry(TQWidget * dlg);
}
diff --git a/kdm/kfrontend/kchooser.cpp b/kdm/kfrontend/kchooser.cpp
index 6d0b20350..df602efea 100644
--- a/kdm/kfrontend/kchooser.cpp
+++ b/kdm/kfrontend/kchooser.cpp
@@ -32,20 +32,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <klocale.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qpopupmenu.h>
-#include <qsocketnotifier.h>
-#include <qlistview.h>
-#include <qlineedit.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
+#include <tqpopupmenu.h>
+#include <tqsocketnotifier.h>
+#include <tqlistview.h>
+#include <tqlineedit.h>
#include <stdlib.h> // for free()
-class ChooserListViewItem : public QListViewItem {
+class ChooserListViewItem : public TQListViewItem {
public:
- ChooserListViewItem( QListView* parent, int _id, const QString& nam, const QString& sts )
- : QListViewItem( parent, nam, sts ) { id = _id; };
+ ChooserListViewItem( TQListView* parent, int _id, const TQString& nam, const TQString& sts )
+ : TQListViewItem( parent, nam, sts ) { id = _id; };
int id;
};
@@ -56,49 +56,49 @@ ChooserDlg::ChooserDlg()
{
completeMenu( LOGIN_REMOTE_ONLY, ex_greet, i18n("&Local Login"), ALT+Key_L );
- QBoxLayout *vbox = new QVBoxLayout( this, 10, 10 );
+ TQBoxLayout *vbox = new TQVBoxLayout( this, 10, 10 );
- QLabel *title = new QLabel( i18n("XDMCP Host Menu"), this );
+ TQLabel *title = new TQLabel( i18n("XDMCP Host Menu"), this );
title->setAlignment( AlignCenter );
vbox->addWidget( title );
- host_view = new QListView( this, "hosts" );
+ host_view = new TQListView( this, "hosts" );
host_view->addColumn( i18n("Hostname") );
host_view->setColumnWidth( 0, fontMetrics().width( "login.crap.net" ) );
host_view->addColumn( i18n("Status") );
host_view->setMinimumWidth( fontMetrics().width( "login.crap.com Display not authorized to connect this server" ) );
- host_view->setResizeMode( QListView::LastColumn );
+ host_view->setResizeMode( TQListView::LastColumn );
host_view->setAllColumnsShowFocus( true );
vbox->addWidget( host_view );
- iline = new QLineEdit( this );
+ iline = new TQLineEdit( this );
iline->setEnabled( TRUE );
- QLabel *itxt = new QLabel( iline, i18n("Hos&t:"), this );
- QPushButton *addButton = new QPushButton( i18n("A&dd"), this );
- connect( addButton, SIGNAL(clicked()), SLOT(addHostname()) );
- QBoxLayout *hibox = new QHBoxLayout( vbox, 10 );
+ TQLabel *itxt = new TQLabel( iline, i18n("Hos&t:"), this );
+ TQPushButton *addButton = new TQPushButton( i18n("A&dd"), this );
+ connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addHostname()) );
+ TQBoxLayout *hibox = new TQHBoxLayout( vbox, 10 );
hibox->addWidget( itxt );
hibox->addWidget( iline );
hibox->addWidget( addButton );
// Buttons
- QPushButton *acceptButton = new QPushButton( i18n("&Accept"), this );
+ TQPushButton *acceptButton = new TQPushButton( i18n("&Accept"), this );
acceptButton->setDefault( true );
- QPushButton *pingButton = new QPushButton( i18n("&Refresh"), this );
+ TQPushButton *pingButton = new TQPushButton( i18n("&Refresh"), this );
- QBoxLayout *hbox = new QHBoxLayout( vbox, 20 );
+ TQBoxLayout *hbox = new TQHBoxLayout( vbox, 20 );
hbox->addWidget( acceptButton );
hbox->addWidget( pingButton );
hbox->addStretch( 1 );
if (optMenu) {
- QPushButton *menuButton = new QPushButton( i18n("&Menu"), this );
+ TQPushButton *menuButton = new TQPushButton( i18n("&Menu"), this );
menuButton->setPopup( optMenu );
hbox->addWidget( menuButton );
hbox->addStretch( 1 );
}
-// QPushButton *helpButton = new QPushButton( i18n("&Help"), this );
+// TQPushButton *helpButton = new TQPushButton( i18n("&Help"), this );
// hbox->addWidget( helpButton );
#ifdef WITH_KDM_XCONSOLE
@@ -106,13 +106,13 @@ ChooserDlg::ChooserDlg()
vbox->addWidget( consoleView );
#endif
- sn = new QSocketNotifier( rfd, QSocketNotifier::Read, this );
- connect( sn, SIGNAL(activated( int )), SLOT(slotReadPipe()) );
+ sn = new TQSocketNotifier( rfd, TQSocketNotifier::Read, this );
+ connect( sn, TQT_SIGNAL(activated( int )), TQT_SLOT(slotReadPipe()) );
- connect( pingButton, SIGNAL(clicked()), SLOT(pingHosts()) );
- connect( acceptButton, SIGNAL(clicked()), SLOT(accept()) );
-// connect( helpButton, SIGNAL(clicked()), SLOT(slotHelp()) );
- connect( host_view, SIGNAL(doubleClicked(QListViewItem *)), SLOT(accept()) );
+ connect( pingButton, TQT_SIGNAL(clicked()), TQT_SLOT(pingHosts()) );
+ connect( acceptButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
+// connect( helpButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()) );
+ connect( host_view, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(accept()) );
adjustGeometry();
}
@@ -153,7 +153,7 @@ void ChooserDlg::accept()
}
return;
} else /*if (focusWidget() == host_view)*/ {
- QListViewItem *item = host_view->currentItem();
+ TQListViewItem *item = host_view->currentItem();
if (item) {
GSendInt( G_Ready );
GSendInt( ((ChooserListViewItem *)item)->id );
@@ -166,21 +166,21 @@ void ChooserDlg::reject()
{
}
-QString ChooserDlg::recvStr()
+TQString ChooserDlg::recvStr()
{
char *arr = GRecvStr();
if (arr) {
- QString str = QString::fromLatin1( arr );
+ TQString str = TQString::fromLatin1( arr );
free( arr );
return str;
} else
return i18n("<unknown>");
}
-QListViewItem *ChooserDlg::findItem( int id )
+TQListViewItem *ChooserDlg::findItem( int id )
{
- QListViewItem *itm;
- for (QListViewItemIterator it( host_view ); (itm = it.current()); ++it)
+ TQListViewItem *itm;
+ for (TQListViewItemIterator it( host_view ); (itm = it.current()); ++it)
if (((ChooserListViewItem *)itm)->id == id)
return itm;
return 0;
@@ -189,7 +189,7 @@ QListViewItem *ChooserDlg::findItem( int id )
void ChooserDlg::slotReadPipe()
{
int id;
- QString nam, sts;
+ TQString nam, sts;
int cmd = GRecvInt();
switch (cmd) {
@@ -203,7 +203,7 @@ void ChooserDlg::slotReadPipe()
host_view->insertItem(
new ChooserListViewItem( host_view, id, nam, sts ) );
else {
- QListViewItem *itm = findItem( id );
+ TQListViewItem *itm = findItem( id );
itm->setText( 0, nam );
itm->setText( 1, sts );
}
@@ -212,7 +212,7 @@ void ChooserDlg::slotReadPipe()
delete findItem( GRecvInt() );
break;
case G_Ch_BadHost:
- KFMsgBox::box( this, QMessageBox::Warning, i18n("Unknown host %1").arg( recvStr() ) );
+ KFMsgBox::box( this, TQMessageBox::Warning, i18n("Unknown host %1").arg( recvStr() ) );
break;
case G_Ch_Exit:
done( ex_exit );
diff --git a/kdm/kfrontend/kchooser.h b/kdm/kfrontend/kchooser.h
index 93ede2694..354b3f1ef 100644
--- a/kdm/kfrontend/kchooser.h
+++ b/kdm/kfrontend/kchooser.h
@@ -48,12 +48,12 @@ class ChooserDlg : public KGDialog {
void reject();
private:
- QString recvStr();
- QListViewItem *findItem( int id );
+ TQString recvStr();
+ TQListViewItem *findItem( int id );
- QListView *host_view;
- QLineEdit *iline;
- QSocketNotifier *sn;
+ TQListView *host_view;
+ TQLineEdit *iline;
+ TQSocketNotifier *sn;
};
#endif /* KCHOOSER_H */
diff --git a/kdm/kfrontend/kconsole.cpp b/kdm/kfrontend/kconsole.cpp
index b101712da..6c2ab09ab 100644
--- a/kdm/kfrontend/kconsole.cpp
+++ b/kdm/kfrontend/kconsole.cpp
@@ -59,9 +59,9 @@ extern "C" {
#include <klocale.h>
#include <kpty.h>
-#include <qsocketnotifier.h>
+#include <tqsocketnotifier.h>
-KConsole::KConsole( QWidget *_parent )
+KConsole::KConsole( TQWidget *_parent )
: inherited( _parent )
, pty( 0 )
, notifier( 0 )
@@ -128,8 +128,8 @@ KConsole::OpenConsole()
fd = pty->masterFd();
gotcon:
- notifier = new QSocketNotifier( fd, QSocketNotifier::Read, this );
- connect( notifier, SIGNAL(activated( int )), SLOT(slotData()) );
+ notifier = new TQSocketNotifier( fd, TQSocketNotifier::Read, this );
+ connect( notifier, TQT_SIGNAL(activated( int )), TQT_SLOT(slotData()) );
return 1;
}
@@ -161,14 +161,14 @@ KConsole::slotData()
bool as = !verticalScrollBar()->isVisible() ||
(verticalScrollBar()->value() ==
verticalScrollBar()->maxValue());
- QString str( QString::fromLocal8Bit( buffer, n ).remove( '\r' ) );
+ TQString str( TQString::fromLocal8Bit( buffer, n ).remove( '\r' ) );
int pos, opos;
for (opos = 0; (pos = str.find( '\n', opos )) >= 0; opos = pos + 1) {
if (paragraphs() == 100)
removeParagraph( 0 );
if (!leftover.isEmpty()) {
append( leftover + str.mid( opos, pos - opos ) );
- leftover = QString::null;
+ leftover = TQString::null;
} else
append( str.mid( opos, pos - opos ) );
}
diff --git a/kdm/kfrontend/kconsole.h b/kdm/kfrontend/kconsole.h
index 8a3515173..cbf025626 100644
--- a/kdm/kfrontend/kconsole.h
+++ b/kdm/kfrontend/kconsole.h
@@ -24,17 +24,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef KCONSOLE_H
#define KCONSOLE_H
-#include <qtextedit.h>
+#include <tqtextedit.h>
class QSocketNotifier;
class KPty;
-class KConsole : public QTextEdit {
+class KConsole : public TQTextEdit {
Q_OBJECT
- typedef QTextEdit inherited;
+ typedef TQTextEdit inherited;
public:
- KConsole( QWidget *_parent = 0 );
+ KConsole( TQWidget *_parent = 0 );
~KConsole();
private slots:
@@ -45,8 +45,8 @@ class KConsole : public QTextEdit {
void CloseConsole();
KPty *pty;
- QSocketNotifier *notifier;
- QString leftover;
+ TQSocketNotifier *notifier;
+ TQString leftover;
int fd;
};
diff --git a/kdm/kfrontend/kdm_greet.c b/kdm/kfrontend/kdm_greet.c
index 6abc2c057..53d164f45 100644
--- a/kdm/kfrontend/kdm_greet.c
+++ b/kdm/kfrontend/kdm_greet.c
@@ -764,7 +764,7 @@ main( int argc ATTR_UNUSED, char **argv )
init_config();
- /* for QSettings */
+ /* for TQSettings */
srand( time( 0 ) );
for (i = 0; i < 10000; i++) {
sprintf( qtrc, "/tmp/%010d", rand() );
diff --git a/kdm/kfrontend/kdmclock.cpp b/kdm/kfrontend/kdmclock.cpp
index 88bc33aaa..88cd53970 100644
--- a/kdm/kfrontend/kdmclock.cpp
+++ b/kdm/kfrontend/kdmclock.cpp
@@ -27,17 +27,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//#include <kapplication.h>
//#include <kconfig.h>
-#include <qdatetime.h>
-#include <qpixmap.h>
-#include <qpainter.h>
-#include <qtimer.h>
+#include <tqdatetime.h>
+#include <tqpixmap.h>
+#include <tqpainter.h>
+#include <tqtimer.h>
-KdmClock::KdmClock( QWidget *parent, const char *name )
+KdmClock::KdmClock( TQWidget *parent, const char *name )
: inherited( parent, name )
{
// start timer
- QTimer *timer = new QTimer( this );
- connect( timer, SIGNAL(timeout()), SLOT(timeout()) );
+ TQTimer *timer = new TQTimer( this );
+ connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) );
timer->start( 1000 );
// reading rc file
@@ -50,7 +50,7 @@ KdmClock::KdmClock( QWidget *parent, const char *name )
mBorder = false;//config->readNumEntry( "border", FALSE );
//config->setGroup( "Font" );
- mFont.setFamily( QString::fromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ );
+ mFont.setFamily( TQString::fromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ );
mFont.setPointSize( 51/*config->readNumEntry( "Point Size", 51)*/ );
mFont.setWeight( 75/*config->readNumEntry( "Weight", 75)*/ );
mFont.setItalic( TRUE/*config->readNumEntry( "Italic",TRUE )*/ );
@@ -80,7 +80,7 @@ KdmClock::KdmClock( QWidget *parent, const char *name )
}
-void KdmClock::showEvent( QShowEvent * )
+void KdmClock::showEvent( TQShowEvent * )
{
repaint();
}
@@ -91,25 +91,25 @@ void KdmClock::timeout()
repaint();
}
-void KdmClock::paintEvent( QPaintEvent * )
+void KdmClock::paintEvent( TQPaintEvent * )
{
if (!isVisible())
return;
- QPainter p( this );
+ TQPainter p( this );
drawFrame( &p );
- QPixmap pm( contentsRect().size() );
- QPainter paint;
+ TQPixmap pm( contentsRect().size() );
+ TQPainter paint;
paint.begin( &pm );
paint.fillRect( contentsRect(), mBackgroundBrush );
// get current time
- QTime time = QTime::currentTime();
+ TQTime time = TQTime::currentTime();
/*
if (mDigital) {
- QString buf;
+ TQString buf;
if (mSecond)
buf.sprintf( "%02d:%02d:%02d", time.hour(), time.minute(),
time.second() );
@@ -121,13 +121,13 @@ void KdmClock::paintEvent( QPaintEvent * )
paint.drawText( contentsRect(),AlignHCenter|AlignVCenter, buf,-1,0,0 );
} else {
*/
- QPointArray pts;
- QPoint cp = contentsRect().center() - QPoint( 2,2 );
+ TQPointArray pts;
+ TQPoint cp = contentsRect().center() - TQPoint( 2,2 );
int d = QMIN( contentsRect().width()-15,contentsRect().height()-15 );
paint.setPen( foregroundColor() );
paint.setBrush( foregroundColor() );
- QWMatrix matrix;
+ TQWMatrix matrix;
matrix.translate( cp.x(), cp.y() );
matrix.scale( d/1000.0F, d/1000.0F );
diff --git a/kdm/kfrontend/kdmclock.h b/kdm/kfrontend/kdmclock.h
index 92ce97733..91fa181ea 100644
--- a/kdm/kfrontend/kdmclock.h
+++ b/kdm/kfrontend/kdmclock.h
@@ -24,25 +24,25 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _KDM_CLOCK_H_
#define _KDM_CLOCK_H_
-#include <qframe.h>
+#include <tqframe.h>
-class KdmClock : public QFrame {
+class KdmClock : public TQFrame {
Q_OBJECT
- typedef QFrame inherited;
+ typedef TQFrame inherited;
public:
- KdmClock( QWidget *parent=0, const char *name=0 );
+ KdmClock( TQWidget *parent=0, const char *name=0 );
protected:
- virtual void showEvent( QShowEvent * );
- virtual void paintEvent( QPaintEvent * );
+ virtual void showEvent( TQShowEvent * );
+ virtual void paintEvent( TQPaintEvent * );
private slots:
void timeout();
private:
- QBrush mBackgroundBrush;
- QFont mFont;
+ TQBrush mBackgroundBrush;
+ TQFont mFont;
bool mSecond;
bool mDigital;
bool mDate;
diff --git a/kdm/kfrontend/kdmconfig.cpp b/kdm/kfrontend/kdmconfig.cpp
index 5d8d24e91..6f4c14031 100644
--- a/kdm/kfrontend/kdmconfig.cpp
+++ b/kdm/kfrontend/kdmconfig.cpp
@@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
CONF_GREET_DEFS
-QString _stsFile;
+TQString _stsFile;
bool _isLocal;
bool _authorized;
@@ -43,7 +43,7 @@ static QString
GetCfgQStr( int id )
{
char *tmp = GetCfgStr( id );
- QString qs = QString::fromUtf8( tmp );
+ TQString qs = TQString::fromUtf8( tmp );
free( tmp );
return qs;
}
@@ -53,9 +53,9 @@ GetCfgQStrList( int id )
{
int i, len;
char **tmp = GetCfgStrArr( id, &len );
- QStringList qsl;
+ TQStringList qsl;
for (i = 0; i < len - 1; i++) {
- qsl.append( QString::fromUtf8( tmp[i] ) );
+ qsl.append( TQString::fromUtf8( tmp[i] ) );
free( tmp[i] );
}
free( tmp );
@@ -64,26 +64,26 @@ GetCfgQStrList( int id )
// Based on kconfigbase.cpp
static QFont
-Str2Font( const QString &aValue )
+Str2Font( const TQString &aValue )
{
uint nFontBits;
- QFont aRetFont;
- QString chStr;
+ TQFont aRetFont;
+ TQString chStr;
- QStringList sl = QStringList::split( QString::fromLatin1(","), aValue );
+ TQStringList sl = TQStringList::split( TQString::fromLatin1(","), aValue );
if (sl.count() == 1) {
/* X11 font spec */
- aRetFont = QFont( aValue );
+ aRetFont = TQFont( aValue );
aRetFont.setRawMode( true );
} else if (sl.count() == 10) {
/* qt3 font spec */
aRetFont.fromString( aValue );
} else if (sl.count() == 6) {
/* backward compatible kde2 font spec */
- aRetFont = QFont( sl[0], sl[1].toInt(), sl[4].toUInt() );
+ aRetFont = TQFont( sl[0], sl[1].toInt(), sl[4].toUInt() );
- aRetFont.setStyleHint( (QFont::StyleHint)sl[2].toUInt() );
+ aRetFont.setStyleHint( (TQFont::StyleHint)sl[2].toUInt() );
nFontBits = sl[5].toUInt();
aRetFont.setItalic( (nFontBits & 0x01) != 0 );
@@ -92,9 +92,9 @@ Str2Font( const QString &aValue )
aRetFont.setFixedPitch( (nFontBits & 0x08) != 0 );
aRetFont.setRawMode( (nFontBits & 0x20) != 0 );
}
- aRetFont.setStyleStrategy( (QFont::StyleStrategy)
- (QFont::PreferMatch |
- (_antiAliasing ? QFont::PreferAntialias : QFont::NoAntialias)) );
+ aRetFont.setStyleStrategy( (TQFont::StyleStrategy)
+ (TQFont::PreferMatch |
+ (_antiAliasing ? TQFont::PreferAntialias : TQFont::NoAntialias)) );
return aRetFont;
}
@@ -117,8 +117,8 @@ void init_config( void )
hostname[sizeof(hostname)-1] = '\0';
struct utsname tuname;
uname( &tuname );
- QString gst = _greetString;
- _greetString = QString::null;
+ TQString gst = _greetString;
+ _greetString = TQString::null;
int i, j, l = gst.length();
for (i = 0; i < l; i++) {
if (gst[i] == '%') {
@@ -138,7 +138,7 @@ void init_config( void )
case 'm': ptr = tuname.machine; break;
default: _greetString += i18n("[fix kdmrc!]"); continue;
}
- _greetString += QString::fromLocal8Bit( ptr );
+ _greetString += TQString::fromLocal8Bit( ptr );
} else
_greetString += gst[i];
}
@@ -147,7 +147,7 @@ void init_config( void )
/* out-of-place utility function */
void
-decodeSess( dpySpec *sess, QString &user, QString &loc )
+decodeSess( dpySpec *sess, TQString &user, TQString &loc )
{
if (sess->flags & isTTY) {
user =
@@ -156,9 +156,9 @@ decodeSess( dpySpec *sess, QString &user, QString &loc )
loc =
#ifdef HAVE_VTS
sess->vt ?
- QString("vt%1").arg( sess->vt ) :
+ TQString("vt%1").arg( sess->vt ) :
#endif
- QString::fromLatin1( *sess->from ? sess->from : sess->display );
+ TQString::fromLatin1( *sess->from ? sess->from : sess->display );
} else {
user =
!sess->user ?
@@ -170,8 +170,8 @@ decodeSess( dpySpec *sess, QString &user, QString &loc )
loc =
#ifdef HAVE_VTS
sess->vt ?
- QString("%1, vt%2").arg( sess->display ).arg( sess->vt ) :
+ TQString("%1, vt%2").arg( sess->display ).arg( sess->vt ) :
#endif
- QString::fromLatin1( sess->display );
+ TQString::fromLatin1( sess->display );
}
}
diff --git a/kdm/kfrontend/kdmconfig.h b/kdm/kfrontend/kdmconfig.h
index 3077a2ce0..f5420bcc4 100644
--- a/kdm/kfrontend/kdmconfig.h
+++ b/kdm/kfrontend/kdmconfig.h
@@ -32,11 +32,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef __cplusplus
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qfont.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqfont.h>
-extern QString _stsFile;
+extern TQString _stsFile;
extern bool _isLocal;
extern bool _authorized;
@@ -44,7 +44,7 @@ CONF_GREET_CPP_DECLS
// this file happens to be included everywhere, so just put it here
struct dpySpec;
-void decodeSess( dpySpec *sess, QString &user, QString &loc );
+void decodeSess( dpySpec *sess, TQString &user, TQString &loc );
extern "C"
#endif
diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp
index 74f62550e..dcd8a4cf1 100644
--- a/kdm/kfrontend/kdmshutdown.cpp
+++ b/kdm/kfrontend/kdmshutdown.cpp
@@ -37,20 +37,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kconfig.h>
#include <kiconloader.h>
-#include <qcombobox.h>
-#include <qvbuttongroup.h>
-#include <qstyle.h>
-#include <qlayout.h>
-#include <qaccel.h>
-#include <qpopupmenu.h>
-#include <qcheckbox.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qdatetime.h>
-#include <qlistview.h>
-#include <qheader.h>
-#include <qdatetime.h>
-#include <qregexp.h>
+#include <tqcombobox.h>
+#include <tqvbuttongroup.h>
+#include <tqstyle.h>
+#include <tqlayout.h>
+#include <tqaccel.h>
+#include <tqpopupmenu.h>
+#include <tqcheckbox.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqdatetime.h>
+#include <tqlistview.h>
+#include <tqheader.h>
+#include <tqdatetime.h>
+#include <tqregexp.h>
#define KDmh KDialog::marginHint()
#define KDsh KDialog::spacingHint()
@@ -60,9 +60,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
int KDMShutdownBase::curPlugin = -1;
PluginList KDMShutdownBase::pluginList;
-KDMShutdownBase::KDMShutdownBase( int _uid, QWidget *_parent )
+KDMShutdownBase::KDMShutdownBase( int _uid, TQWidget *_parent )
: inherited( _parent )
- , box( new QVBoxLayout( this, KDmh, KDsh ) )
+ , box( new TQVBoxLayout( this, KDmh, KDsh ) )
#ifdef HAVE_VTS
, willShut( true )
#endif
@@ -84,15 +84,15 @@ KDMShutdownBase::~KDMShutdownBase()
}
void
-KDMShutdownBase::complete( QWidget *prevWidget )
+KDMShutdownBase::complete( TQWidget *prevWidget )
{
- QSizePolicy fp( QSizePolicy::Fixed, QSizePolicy::Fixed );
+ TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
if (uid &&
((willShut && _allowShutdown == SHUT_ROOT) ||
(mayNuke && _allowNuke == SHUT_ROOT)))
{
- rootlab = new QLabel( i18n("Root authorization required."), this );
+ rootlab = new TQLabel( i18n("Root authorization required."), this );
box->addWidget( rootlab );
if (curPlugin < 0) {
curPlugin = 0;
@@ -104,14 +104,14 @@ KDMShutdownBase::complete( QWidget *prevWidget )
KGreeterPlugin::Shutdown );
verify->selectPlugin( curPlugin );
box->addLayout( verify->getLayout() );
- QAccel *accel = new QAccel( this );
+ TQAccel *accel = new TQAccel( this );
accel->insertItem( ALT+Key_A, 0 );
- connect( accel, SIGNAL(activated( int )), SLOT(slotActivatePlugMenu()) );
+ connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActivatePlugMenu()) );
}
box->addWidget( new KSeparator( KSeparator::HLine, this ) );
- QBoxLayout *hlay = new QHBoxLayout( box, KDsh );
+ TQBoxLayout *hlay = new TQHBoxLayout( box, KDsh );
hlay->addStretch( 1 );
if (mayOk) {
okButton = new KPushButton( KStdGuiItem::ok(), this );
@@ -119,7 +119,7 @@ KDMShutdownBase::complete( QWidget *prevWidget )
okButton->setDefault( true );
hlay->addWidget( okButton );
hlay->addStretch( 1 );
- connect( okButton, SIGNAL(clicked()), SLOT(accept()) );
+ connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
}
if (maySched) {
KPushButton *schedButton =
@@ -127,7 +127,7 @@ KDMShutdownBase::complete( QWidget *prevWidget )
schedButton->setSizePolicy( fp );
hlay->addWidget( schedButton );
hlay->addStretch( 1 );
- connect( schedButton, SIGNAL(clicked()), SLOT(slotSched()) );
+ connect( schedButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) );
}
cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
cancelButton->setSizePolicy( fp );
@@ -135,7 +135,7 @@ KDMShutdownBase::complete( QWidget *prevWidget )
cancelButton->setDefault( true );
hlay->addWidget( cancelButton );
hlay->addStretch( 1 );
- connect( cancelButton, SIGNAL(clicked()), SLOT(reject()) );
+ connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
updateNeedRoot();
}
@@ -144,11 +144,11 @@ void
KDMShutdownBase::slotActivatePlugMenu()
{
if (needRoot) {
- QPopupMenu *cmnu = verify->getPlugMenu();
+ TQPopupMenu *cmnu = verify->getPlugMenu();
if (!cmnu)
return;
- QSize sh( cmnu->sizeHint() / 2 );
- cmnu->exec( geometry().center() - QPoint( sh.width(), sh.height() ) );
+ TQSize sh( cmnu->sizeHint() / 2 );
+ cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
}
}
@@ -218,7 +218,7 @@ KDMShutdownBase::verifyRetry()
}
void
-KDMShutdownBase::verifySetUser( const QString & )
+KDMShutdownBase::verifySetUser( const TQString & )
{
}
@@ -239,25 +239,25 @@ doShutdown( int type, const char *os )
-KDMShutdown::KDMShutdown( int _uid, QWidget *_parent )
+KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
: inherited( _uid, _parent )
{
- QSizePolicy fp( QSizePolicy::Fixed, QSizePolicy::Fixed );
+ TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
- QHBoxLayout *hlay = new QHBoxLayout( box, KDsh );
+ TQHBoxLayout *hlay = new TQHBoxLayout( box, KDsh );
- howGroup = new QVButtonGroup( i18n("Shutdown Type"), this );
+ howGroup = new TQVButtonGroup( i18n("Shutdown Type"), this );
hlay->addWidget( howGroup, 0, AlignTop );
- QRadioButton *rb;
+ TQRadioButton *rb;
rb = new KDMRadioButton( i18n("&Turn off computer"), howGroup );
rb->setChecked( true );
rb->setFocus();
restart_rb = new KDMRadioButton( i18n("&Restart computer"), howGroup );
- connect( rb, SIGNAL(doubleClicked()), SLOT(accept()) );
- connect( restart_rb, SIGNAL(doubleClicked()), SLOT(accept()) );
+ connect( rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) );
+ connect( restart_rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) );
GSet( 1 );
GSendInt( G_ListBootOpts );
@@ -265,40 +265,40 @@ KDMShutdown::KDMShutdown( int _uid, QWidget *_parent )
char **tlist = GRecvStrArr( 0 );
int defaultTarget = GRecvInt();
oldTarget = GRecvInt();
- QWidget *hlp = new QWidget( howGroup );
- targets = new QComboBox( hlp );
+ TQWidget *hlp = new TQWidget( howGroup );
+ targets = new TQComboBox( hlp );
for (int i = 0; tlist[i]; i++)
- targets->insertItem( QString::fromLocal8Bit( tlist[i] ) );
+ targets->insertItem( TQString::fromLocal8Bit( tlist[i] ) );
freeStrArr( tlist );
targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget );
- QHBoxLayout *hb = new QHBoxLayout( hlp, 0, KDsh );
- int spc = kapp->style().pixelMetric( QStyle::PM_ExclusiveIndicatorWidth )
+ TQHBoxLayout *hb = new TQHBoxLayout( hlp, 0, KDsh );
+ int spc = kapp->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth )
+ howGroup->insideSpacing();
hb->addSpacing( spc );
hb->addWidget( targets );
- connect( targets, SIGNAL(activated( int )), SLOT(slotTargetChanged()) );
+ connect( targets, TQT_SIGNAL(activated( int )), TQT_SLOT(slotTargetChanged()) );
}
GSet( 0 );
howGroup->setSizePolicy( fp );
- schedGroup = new QGroupBox( i18n("Scheduling"), this );
+ schedGroup = new TQGroupBox( i18n("Scheduling"), this );
hlay->addWidget( schedGroup, 0, AlignTop );
- le_start = new QLineEdit( schedGroup );
- QLabel *lab1 = new QLabel( le_start, i18n("&Start:"), schedGroup );
+ le_start = new TQLineEdit( schedGroup );
+ TQLabel *lab1 = new TQLabel( le_start, i18n("&Start:"), schedGroup );
- le_timeout = new QLineEdit( schedGroup );
- QLabel *lab2 = new QLabel( le_timeout, i18n("T&imeout:"), schedGroup );
+ le_timeout = new TQLineEdit( schedGroup );
+ TQLabel *lab2 = new TQLabel( le_timeout, i18n("T&imeout:"), schedGroup );
- cb_force = new QCheckBox( i18n("&Force after timeout"), schedGroup );
+ cb_force = new TQCheckBox( i18n("&Force after timeout"), schedGroup );
if (_allowNuke != SHUT_NONE) {
- connect( cb_force, SIGNAL(clicked()), SLOT(slotWhenChanged()) );
+ connect( cb_force, TQT_SIGNAL(clicked()), TQT_SLOT(slotWhenChanged()) );
mayNuke = true;
} else
cb_force->setEnabled( false );
- QGridLayout *grid = new QGridLayout( schedGroup, 0, 0, KDmh, KDsh );
+ TQGridLayout *grid = new TQGridLayout( schedGroup, 0, 0, KDmh, KDsh );
grid->addRowSpacing( 0, schedGroup->fontMetrics().height() - 5 );
grid->addWidget( lab1, 1, 0, AlignRight );
grid->addWidget( le_start, 1, 1 );
@@ -326,7 +326,7 @@ get_date( const char *str )
KProcIO prc;
prc << "/bin/date" << "+%s" << "-d" << str;
prc.start( KProcess::Block, false );
- QString dstr;
+ TQString dstr;
if (prc.readln( dstr, false, 0 ) < 0)
return -1;
return dstr.toInt();
@@ -388,7 +388,7 @@ KDMShutdown::accepted()
}
void
-KDMShutdown::scheduleShutdown( QWidget *_parent )
+KDMShutdown::scheduleShutdown( TQWidget *_parent )
{
GSet( 1 );
GSendInt( G_QueryShutdown );
@@ -415,30 +415,30 @@ KDMShutdown::scheduleShutdown( QWidget *_parent )
}
-KDMRadioButton::KDMRadioButton( const QString &label, QWidget *parent )
+KDMRadioButton::KDMRadioButton( const TQString &label, TQWidget *parent )
: inherited( label, parent )
{
}
void
-KDMRadioButton::mouseDoubleClickEvent( QMouseEvent * )
+KDMRadioButton::mouseDoubleClickEvent( TQMouseEvent * )
{
emit doubleClicked();
}
KDMDelayedPushButton::KDMDelayedPushButton( const KGuiItem &item,
- QWidget *parent,
+ TQWidget *parent,
const char *name )
: inherited( item, parent, name )
, pop( 0 )
{
- connect( this, SIGNAL(pressed()), SLOT(slotPressed()) );
- connect( this, SIGNAL(released()), SLOT(slotReleased()) );
- connect( &popt, SIGNAL(timeout()), SLOT(slotTimeout()) );
+ connect( this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()) );
+ connect( this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()) );
+ connect( &popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
}
-void KDMDelayedPushButton::setPopup( QPopupMenu *p )
+void KDMDelayedPushButton::setPopup( TQPopupMenu *p )
{
pop = p;
setIsMenuButton( p != 0 );
@@ -447,7 +447,7 @@ void KDMDelayedPushButton::setPopup( QPopupMenu *p )
void KDMDelayedPushButton::slotPressed()
{
if (pop)
- popt.start( QApplication::startDragTime() );
+ popt.start( TQApplication::startDragTime() );
}
void KDMDelayedPushButton::slotReleased()
@@ -462,41 +462,41 @@ void KDMDelayedPushButton::slotTimeout()
setDown( false );
}
-KDMSlimShutdown::KDMSlimShutdown( QWidget *_parent )
+KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
: inherited( _parent )
, targetList( 0 )
{
bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false);
- QVBoxLayout* vbox = new QVBoxLayout( this );
- QHBoxLayout *hbox = new QHBoxLayout( this, KDmh, KDsh );
- QFrame* lfrm = new QFrame( this );
- QHBoxLayout* hbuttonbox;
+ TQVBoxLayout* vbox = new TQVBoxLayout( this );
+ TQHBoxLayout *hbox = new TQHBoxLayout( this, KDmh, KDsh );
+ TQFrame* lfrm = new TQFrame( this );
+ TQHBoxLayout* hbuttonbox;
if(doUbuntuLogout)
{
- lfrm->setFrameStyle( QFrame::StyledPanel | QFrame::Raised );
- lfrm->setLineWidth( style().pixelMetric( QStyle::PM_DefaultFrameWidth, lfrm ) );
+ lfrm->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
+ lfrm->setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) );
// we need to set the minimum size for the logout box, since it
// gets too small if there isn't all options available
lfrm->setMinimumSize(300,120);
vbox->addWidget( lfrm );
- vbox = new QVBoxLayout( lfrm, 2 * KDialog::marginHint(),
+ vbox = new TQVBoxLayout( lfrm, 2 * KDialog::marginHint(),
2 * KDialog::spacingHint() );
// first line of buttons
- hbuttonbox = new QHBoxLayout( vbox, 8 * KDialog::spacingHint() );
+ hbuttonbox = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() );
hbuttonbox->setAlignment( Qt::AlignHCenter );
// Reboot
FlatButton* btnReboot = new FlatButton( lfrm );
btnReboot->setTextLabel( i18n("&Restart"), false );
btnReboot->setPixmap( DesktopIcon( "reload") );
- int i = btnReboot->textLabel().find( QRegExp("\\&"), 0 ); // i == 1
+ int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ;
hbuttonbox->addWidget ( btnReboot);
- connect(btnReboot, SIGNAL(clicked()), SLOT(slotReboot()));
+ connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
// Copied completely from the standard restart/shutdown dialog
GSet( 1 );
@@ -505,17 +505,17 @@ KDMSlimShutdown::KDMSlimShutdown( QWidget *_parent )
targetList = GRecvStrArr( 0 );
/*int def =*/ GRecvInt();
int cur = GRecvInt();
- QPopupMenu *targets = new QPopupMenu( this );
+ TQPopupMenu *targets = new TQPopupMenu( this );
btnReboot->setPopupDelay(300); // visually add dropdown
for (int i = 0; targetList[i]; i++) {
- QString t( QString::fromLocal8Bit( targetList[i] ) );
+ TQString t( TQString::fromLocal8Bit( targetList[i] ) );
targets->insertItem( i == cur ?
i18n("current option in boot loader",
"%1 (current)").arg( t ) :
t, i );
}
btnReboot->setPopup( targets );
- connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) );
+ connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) );
}
GSet( 0 );
// Copied completely from the standard restart/shutdown dialog
@@ -524,46 +524,46 @@ KDMSlimShutdown::KDMSlimShutdown( QWidget *_parent )
FlatButton* btnHalt = new FlatButton( lfrm );
btnHalt->setTextLabel( i18n("&Turn Off"), false );
btnHalt->setPixmap( DesktopIcon( "exit") );
- i = btnHalt->textLabel().find( QRegExp("\\&"), 0 ); // i == 1
+ i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ;
hbuttonbox->addWidget ( btnHalt );
- connect(btnHalt, SIGNAL(clicked()), SLOT(slotHalt()));
+ connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
// cancel buttonbox
- QHBoxLayout* hbuttonbox2 = new QHBoxLayout( vbox, 8 * KDialog::spacingHint() );
+ TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() );
hbuttonbox2->setAlignment( Qt::AlignRight );
// Back to kdm
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm );
hbuttonbox2->addWidget( btnBack );
- connect(btnBack, SIGNAL(clicked()), SLOT(reject()));
+ connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
}
else
{
- lfrm->setFrameStyle( QFrame::Panel | QFrame::Sunken );
+ lfrm->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
hbox->addWidget( lfrm, AlignCenter );
- QLabel *icon = new QLabel( lfrm );
- icon->setPixmap( QPixmap( locate( "data", "kdm/pics/shutdown.jpg" ) ) );
- QVBoxLayout *iconlay = new QVBoxLayout( lfrm );
+ TQLabel *icon = new TQLabel( lfrm );
+ icon->setPixmap( TQPixmap( locate( "data", "kdm/pics/shutdown.jpg" ) ) );
+ TQVBoxLayout *iconlay = new TQVBoxLayout( lfrm );
iconlay->addWidget( icon );
- QVBoxLayout *buttonlay = new QVBoxLayout( hbox, KDsh );
+ TQVBoxLayout *buttonlay = new TQVBoxLayout( hbox, KDsh );
buttonlay->addStretch( 1 );
KPushButton *btnHalt = new
KPushButton( KGuiItem( i18n("&Turn Off Computer"), "exit" ), this );
buttonlay->addWidget( btnHalt );
- connect( btnHalt, SIGNAL(clicked()), SLOT(slotHalt()) );
+ connect( btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()) );
buttonlay->addSpacing( KDialog::spacingHint() );
KDMDelayedPushButton *btnReboot = new
KDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this );
buttonlay->addWidget( btnReboot );
- connect( btnReboot, SIGNAL(clicked()), SLOT(slotReboot()) );
+ connect( btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()) );
GSet( 1 );
GSendInt( G_ListBootOpts );
@@ -571,16 +571,16 @@ KDMSlimShutdown::KDMSlimShutdown( QWidget *_parent )
targetList = GRecvStrArr( 0 );
/*int def =*/ GRecvInt();
int cur = GRecvInt();
- QPopupMenu *targets = new QPopupMenu( this );
+ TQPopupMenu *targets = new TQPopupMenu( this );
for (int i = 0; targetList[i]; i++) {
- QString t( QString::fromLocal8Bit( targetList[i] ) );
+ TQString t( TQString::fromLocal8Bit( targetList[i] ) );
targets->insertItem( i == cur ?
i18n("current option in boot loader",
"%1 (current)").arg( t ) :
t, i );
}
btnReboot->setPopup( targets );
- connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) );
+ connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) );
}
GSet( 0 );
@@ -590,7 +590,7 @@ KDMSlimShutdown::KDMSlimShutdown( QWidget *_parent )
KPushButton *btnSched = new
KPushButton( KGuiItem( i18n("&Schedule...") ), this );
buttonlay->addWidget( btnSched );
- connect( btnSched, SIGNAL(clicked()), SLOT(slotSched()) );
+ connect( btnSched, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) );
buttonlay->addStretch( 1 );
}
@@ -601,7 +601,7 @@ KDMSlimShutdown::KDMSlimShutdown( QWidget *_parent )
KPushButton *btnBack = new KPushButton( KStdGuiItem::cancel(), this );
buttonlay->addWidget( btnBack );
- connect( btnBack, SIGNAL(clicked()), SLOT(reject()) );
+ connect( btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
buttonlay->addSpacing( KDialog::spacingHint() );
@@ -673,7 +673,7 @@ KDMSlimShutdown::externShutdown( int type, const char *os, int uid )
KSMPushButton::KSMPushButton( const KGuiItem &item,
- QWidget *parent,
+ TQWidget *parent,
const char *name)
: KPushButton( item, parent, name),
m_pressed(false)
@@ -682,7 +682,7 @@ KSMPushButton::KSMPushButton( const KGuiItem &item,
setAutoDefault ( false );
}
-void KSMPushButton::keyPressEvent( QKeyEvent* e )
+void KSMPushButton::keyPressEvent( TQKeyEvent* e )
{
switch ( e->key() )
{
@@ -700,11 +700,11 @@ void KSMPushButton::keyPressEvent( QKeyEvent* e )
e->ignore();
}
- QPushButton::keyPressEvent(e);
+ TQPushButton::keyPressEvent(e);
}
-void KSMPushButton::keyReleaseEvent( QKeyEvent* e )
+void KSMPushButton::keyReleaseEvent( TQKeyEvent* e )
{
switch ( e->key() )
{
@@ -728,8 +728,8 @@ void KSMPushButton::keyReleaseEvent( QKeyEvent* e )
}
}
-FlatButton::FlatButton( QWidget *parent, const char *name )
- : QToolButton( parent, name/*, WNoAutoErase*/ ),
+FlatButton::FlatButton( TQWidget *parent, const char *name )
+ : TQToolButton( parent, name/*, WNoAutoErase*/ ),
m_pressed(false)
{
init();
@@ -743,12 +743,12 @@ void FlatButton::init()
setUsesTextLabel(true);
setUsesBigPixmap(true);
setAutoRaise(true);
- setTextPosition( QToolButton::Under );
- setFocusPolicy(QWidget::StrongFocus);
+ setTextPosition( TQToolButton::Under );
+ setFocusPolicy(TQWidget::StrongFocus);
}
-void FlatButton::keyPressEvent( QKeyEvent* e )
+void FlatButton::keyPressEvent( TQKeyEvent* e )
{
switch ( e->key() )
{
@@ -766,10 +766,10 @@ void FlatButton::keyPressEvent( QKeyEvent* e )
e->ignore();
}
- QToolButton::keyPressEvent(e);
+ TQToolButton::keyPressEvent(e);
}
-void FlatButton::keyReleaseEvent( QKeyEvent* e )
+void FlatButton::keyReleaseEvent( TQKeyEvent* e )
{
switch ( e->key() )
{
@@ -796,14 +796,14 @@ void FlatButton::keyReleaseEvent( QKeyEvent* e )
KDMConfShutdown::KDMConfShutdown( int _uid, dpySpec *sess, int type, const char *os,
- QWidget *_parent )
+ TQWidget *_parent )
: inherited( _uid, _parent )
{
#ifdef HAVE_VTS
if (type == SHUT_CONSOLE)
willShut = false;
#endif
- box->addWidget( new QLabel( QString( "<qt><center><b><nobr>"
+ box->addWidget( new TQLabel( TQString( "<qt><center><b><nobr>"
"%1%2"
"</nobr></b></center><br></qt>" )
.arg( (type == SHUT_HALT) ?
@@ -815,8 +815,8 @@ KDMConfShutdown::KDMConfShutdown( int _uid, dpySpec *sess, int type, const char
i18n("Restart Computer") )
.arg( os ?
i18n("<br>(Next boot: %1)")
- .arg( QString::fromLocal8Bit( os ) ) :
- QString::null ),
+ .arg( TQString::fromLocal8Bit( os ) ) :
+ TQString::null ),
this ) );
if (sess) {
@@ -825,23 +825,23 @@ KDMConfShutdown::KDMConfShutdown( int _uid, dpySpec *sess, int type, const char
mayNuke = doesNuke = true;
if (_allowNuke == SHUT_NONE)
mayOk = false;
- QLabel *lab = new QLabel( mayOk ?
+ TQLabel *lab = new TQLabel( mayOk ?
i18n("Abort active sessions:") :
i18n("No permission to abort active sessions:"),
this );
box->addWidget( lab );
- QListView *lv = new QListView( this );
- lv->setSelectionMode( QListView::NoSelection );
+ TQListView *lv = new TQListView( this );
+ lv->setSelectionMode( TQListView::NoSelection );
lv->setAllColumnsShowFocus( true );
lv->header()->setResizeEnabled( false );
lv->addColumn( i18n("Session") );
lv->addColumn( i18n("Location") );
- QListViewItem *itm;
+ TQListViewItem *itm;
int ns = 0;
- QString user, loc;
+ TQString user, loc;
do {
decodeSess( sess, user, loc );
- itm = new QListViewItem( lv, user, loc );
+ itm = new TQListViewItem( lv, user, loc );
sess = sess->next, ns++;
} while (sess);
int fw = lv->frameWidth() * 2;
@@ -856,7 +856,7 @@ KDMConfShutdown::KDMConfShutdown( int _uid, dpySpec *sess, int type, const char
KDMCancelShutdown::KDMCancelShutdown( int how, int start, int timeout,
int force, int uid, const char *os,
- QWidget *_parent )
+ TQWidget *_parent )
: inherited( -1, _parent )
{
if (force == SHUT_FORCE) {
@@ -865,13 +865,13 @@ KDMCancelShutdown::KDMCancelShutdown( int how, int start, int timeout,
else if (_allowNuke == SHUT_ROOT)
mayNuke = doesNuke = true;
}
- QLabel *lab = new QLabel( mayOk ?
+ TQLabel *lab = new TQLabel( mayOk ?
i18n("Abort pending shutdown:") :
i18n("No permission to abort pending shutdown:"),
this );
box->addWidget( lab );
- QDateTime qdt;
- QString strt, end;
+ TQDateTime qdt;
+ TQString strt, end;
if (start < time( 0 ))
strt = i18n("now");
else {
@@ -884,7 +884,7 @@ KDMCancelShutdown::KDMCancelShutdown( int how, int start, int timeout,
qdt.setTime_t( timeout );
end = qdt.toString( LocalDate );
}
- QString trg =
+ TQString trg =
i18n("Owner: %1"
"\nType: %2%5"
"\nStart: %3"
@@ -899,8 +899,8 @@ KDMCancelShutdown::KDMCancelShutdown( int how, int start, int timeout,
i18n("restart computer") )
.arg( strt ).arg( end )
.arg( os ?
- i18n("\nNext boot: %1").arg( QString::fromLocal8Bit( os ) ) :
- QString::null );
+ i18n("\nNext boot: %1").arg( TQString::fromLocal8Bit( os ) ) :
+ TQString::null );
if (timeout != TO_INF)
trg += i18n("\nAfter timeout: %1")
.arg( force == SHUT_FORCE ?
@@ -908,7 +908,7 @@ KDMCancelShutdown::KDMCancelShutdown( int how, int start, int timeout,
force == SHUT_FORCEMY ?
i18n("abort own sessions") :
i18n("cancel shutdown") );
- lab = new QLabel( trg, this );
+ lab = new TQLabel( trg, this );
box->addWidget( lab );
complete( 0 );
}
diff --git a/kdm/kfrontend/kdmshutdown.h b/kdm/kfrontend/kdmshutdown.h
index 98877fcbb..88b06128a 100644
--- a/kdm/kfrontend/kdmshutdown.h
+++ b/kdm/kfrontend/kdmshutdown.h
@@ -31,9 +31,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kpushbutton.h>
-#include <qradiobutton.h>
-#include <qtoolbutton.h>
-#include <qpixmap.h>
+#include <tqradiobutton.h>
+#include <tqtoolbutton.h>
+#include <tqpixmap.h>
class QLabel;
class KPushButton;
@@ -43,14 +43,14 @@ class QComboBox;
class QCheckBox;
class QLineEdit;
-enum { Authed = QDialog::Accepted + 1, Schedule };
+enum { Authed = TQDialog::Accepted + 1, Schedule };
class KDMShutdownBase : public FDialog, public KGVerifyHandler {
Q_OBJECT
typedef FDialog inherited;
public:
- KDMShutdownBase( int _uid, QWidget *_parent );
+ KDMShutdownBase( int _uid, TQWidget *_parent );
virtual ~KDMShutdownBase();
protected slots:
@@ -61,9 +61,9 @@ class KDMShutdownBase : public FDialog, public KGVerifyHandler {
protected:
void updateNeedRoot();
- void complete( QWidget *prevWidget );
+ void complete( TQWidget *prevWidget );
- QVBoxLayout *box;
+ TQVBoxLayout *box;
#ifdef HAVE_VTS
bool willShut;
#else
@@ -77,7 +77,7 @@ class KDMShutdownBase : public FDialog, public KGVerifyHandler {
private:
KPushButton *okButton, *cancelButton;
- QLabel *rootlab;
+ TQLabel *rootlab;
KGStdVerify *verify;
int needRoot, uid;
@@ -89,7 +89,7 @@ class KDMShutdownBase : public FDialog, public KGVerifyHandler {
virtual void verifyOk();
virtual void verifyFailed();
virtual void verifyRetry();
- virtual void verifySetUser( const QString &user );
+ virtual void verifySetUser( const TQString &user );
};
@@ -98,8 +98,8 @@ class KDMShutdown : public KDMShutdownBase {
typedef KDMShutdownBase inherited;
public:
- KDMShutdown( int _uid, QWidget *_parent = 0 );
- static void scheduleShutdown( QWidget *_parent = 0 );
+ KDMShutdown( int _uid, TQWidget *_parent = 0 );
+ static void scheduleShutdown( TQWidget *_parent = 0 );
protected slots:
virtual void accept();
@@ -112,26 +112,26 @@ class KDMShutdown : public KDMShutdownBase {
void slotWhenChanged();
private:
- QButtonGroup *howGroup;
- QGroupBox *schedGroup;
- QRadioButton *restart_rb;
- QLineEdit *le_start, *le_timeout;
- QCheckBox *cb_force;
- QComboBox *targets;
+ TQButtonGroup *howGroup;
+ TQGroupBox *schedGroup;
+ TQRadioButton *restart_rb;
+ TQLineEdit *le_start, *le_timeout;
+ TQCheckBox *cb_force;
+ TQComboBox *targets;
int oldTarget;
int sch_st, sch_to;
};
-class KDMRadioButton : public QRadioButton {
+class KDMRadioButton : public TQRadioButton {
Q_OBJECT
- typedef QRadioButton inherited;
+ typedef TQRadioButton inherited;
public:
- KDMRadioButton( const QString &label, QWidget *parent );
+ KDMRadioButton( const TQString &label, TQWidget *parent );
private:
- virtual void mouseDoubleClickEvent( QMouseEvent * );
+ virtual void mouseDoubleClickEvent( TQMouseEvent * );
signals:
void doubleClicked();
@@ -143,8 +143,8 @@ class KDMDelayedPushButton : public KPushButton {
typedef KPushButton inherited;
public:
- KDMDelayedPushButton( const KGuiItem &item, QWidget *parent, const char *name = 0 );
- void setPopup( QPopupMenu *pop );
+ KDMDelayedPushButton( const KGuiItem &item, TQWidget *parent, const char *name = 0 );
+ void setPopup( TQPopupMenu *pop );
private slots:
void slotTimeout();
@@ -152,8 +152,8 @@ class KDMDelayedPushButton : public KPushButton {
void slotReleased();
private:
- QPopupMenu *pop;
- QTimer popt;
+ TQPopupMenu *pop;
+ TQTimer popt;
};
class KDMSlimShutdown : public FDialog {
@@ -161,7 +161,7 @@ class KDMSlimShutdown : public FDialog {
typedef FDialog inherited;
public:
- KDMSlimShutdown( QWidget *_parent = 0 );
+ KDMSlimShutdown( TQWidget *_parent = 0 );
~KDMSlimShutdown();
static void externShutdown( int type, const char *os, int uid );
@@ -183,7 +183,7 @@ class KDMConfShutdown : public KDMShutdownBase {
public:
KDMConfShutdown( int _uid, struct dpySpec *sess, int type, const char *os,
- QWidget *_parent = 0 );
+ TQWidget *_parent = 0 );
};
class KDMCancelShutdown : public KDMShutdownBase {
@@ -192,7 +192,7 @@ class KDMCancelShutdown : public KDMShutdownBase {
public:
KDMCancelShutdown( int how, int start, int timeout, int force, int uid,
- const char *os, QWidget *_parent );
+ const char *os, TQWidget *_parent );
};
class KSMPushButton : public KPushButton
@@ -201,11 +201,11 @@ class KSMPushButton : public KPushButton
public:
- KSMPushButton( const KGuiItem &item, QWidget *parent, const char *name = 0 );
+ KSMPushButton( const KGuiItem &item, TQWidget *parent, const char *name = 0 );
protected:
- virtual void keyPressEvent(QKeyEvent*e);
- virtual void keyReleaseEvent(QKeyEvent*e);
+ virtual void keyPressEvent(TQKeyEvent*e);
+ virtual void keyReleaseEvent(TQKeyEvent*e);
private:
@@ -219,12 +219,12 @@ class FlatButton : public QToolButton
public:
- FlatButton( QWidget *parent = 0, const char *name = 0 );
+ FlatButton( TQWidget *parent = 0, const char *name = 0 );
~FlatButton();
protected:
- virtual void keyPressEvent(QKeyEvent*e);
- virtual void keyReleaseEvent(QKeyEvent*e);
+ virtual void keyPressEvent(TQKeyEvent*e);
+ virtual void keyReleaseEvent(TQKeyEvent*e);
private slots:
@@ -232,8 +232,8 @@ class FlatButton : public QToolButton
void init();
bool m_pressed;
- QString m_text;
- QPixmap m_pixmap;
+ TQString m_text;
+ TQPixmap m_pixmap;
};
diff --git a/kdm/kfrontend/kfdialog.cpp b/kdm/kfrontend/kfdialog.cpp
index e3bb9d9c8..62a4acb22 100644
--- a/kdm/kfrontend/kfdialog.cpp
+++ b/kdm/kfrontend/kfdialog.cpp
@@ -29,24 +29,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kpushbutton.h>
#include <kstdguiitem.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qapplication.h>
-#include <qcursor.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqapplication.h>
+#include <tqcursor.h>
-FDialog::FDialog( QWidget *parent, bool framed )
+FDialog::FDialog( TQWidget *parent, bool framed )
: inherited( parent, 0, true/*, framed ? 0 : WStyle_NoBorder*/ )
{
if (framed) {
- winFrame = new QFrame( this, 0, WNoAutoErase );
- winFrame->setFrameStyle( QFrame::WinPanel | QFrame::Raised );
+ winFrame = new TQFrame( this, 0, WNoAutoErase );
+ winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
winFrame->setLineWidth( 2 );
} else
winFrame = 0;
}
void
-FDialog::resizeEvent( QResizeEvent *e )
+FDialog::resizeEvent( TQResizeEvent *e )
{
inherited::resizeEvent( e );
if (winFrame) {
@@ -58,14 +58,14 @@ FDialog::resizeEvent( QResizeEvent *e )
void
FDialog::adjustGeometry()
{
- QDesktopWidget *dsk = qApp->desktop();
+ TQDesktopWidget *dsk = qApp->desktop();
if (_greeterScreen < 0)
_greeterScreen = _greeterScreen == -2 ?
- dsk->screenNumber( QPoint( dsk->width() - 1, 0 ) ) :
- dsk->screenNumber( QPoint( 0, 0 ) );
+ dsk->screenNumber( TQPoint( dsk->width() - 1, 0 ) ) :
+ dsk->screenNumber( TQPoint( 0, 0 ) );
- QRect scr = dsk->screenGeometry( _greeterScreen );
+ TQRect scr = dsk->screenGeometry( _greeterScreen );
if (!winFrame)
setFixedSize( scr.size() );
else {
@@ -76,11 +76,11 @@ FDialog::adjustGeometry()
if (parentWidget())
return;
- QRect grt( rect() );
+ TQRect grt( rect() );
if (winFrame) {
unsigned x = 50, y = 50;
sscanf( _greeterPos, "%u,%u", &x, &y );
- grt.moveCenter( QPoint( scr.x() + scr.width() * x / 100,
+ grt.moveCenter( TQPoint( scr.x() + scr.width() * x / 100,
scr.y() + scr.height() * y / 100 ) );
int di;
if ((di = scr.right() - grt.right()) < 0)
@@ -94,13 +94,13 @@ FDialog::adjustGeometry()
setGeometry( grt );
}
- if (dsk->screenNumber( QCursor::pos() ) != _greeterScreen)
- QCursor::setPos( grt.center() );
+ if (dsk->screenNumber( TQCursor::pos() ) != _greeterScreen)
+ TQCursor::setPos( grt.center() );
}
struct WinList {
struct WinList *next;
- QWidget *win;
+ TQWidget *win;
};
int
@@ -125,24 +125,24 @@ FDialog::exec()
}
void
-FDialog::box( QWidget *parent, QMessageBox::Icon type, const QString &text )
+FDialog::box( TQWidget *parent, TQMessageBox::Icon type, const TQString &text )
{
KFMsgBox dlg( parent, type, text.stripWhiteSpace() );
dlg.exec();
}
-KFMsgBox::KFMsgBox( QWidget *parent, QMessageBox::Icon type, const QString &text )
+KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &text )
: inherited( parent )
{
- QLabel *label1 = new QLabel( this );
- label1->setPixmap( QMessageBox::standardIcon( type ) );
- QLabel *label2 = new QLabel( text, this );
+ TQLabel *label1 = new TQLabel( this );
+ label1->setPixmap( TQMessageBox::standardIcon( type ) );
+ TQLabel *label2 = new TQLabel( text, this );
KPushButton *button = new KPushButton( KStdGuiItem::ok(), this );
button->setDefault( true );
- button->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
- connect( button, SIGNAL(clicked()), SLOT(accept()) );
+ button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+ connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
- QGridLayout *grid = new QGridLayout( this, 2, 2, 10 );
+ TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 );
grid->addWidget( label1, 0, 0, Qt::AlignCenter );
grid->addWidget( label2, 0, 1, Qt::AlignCenter );
grid->addMultiCellWidget( button, 1,1, 0,1, Qt::AlignCenter );
diff --git a/kdm/kfrontend/kfdialog.h b/kdm/kfrontend/kfdialog.h
index 7ab456f22..3f0524b84 100644
--- a/kdm/kfrontend/kfdialog.h
+++ b/kdm/kfrontend/kfdialog.h
@@ -26,38 +26,38 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef FDIALOG_H
#define FDIALOG_H
-#include <qdialog.h>
-#include <qmessagebox.h>
+#include <tqdialog.h>
+#include <tqmessagebox.h>
class QFrame;
-class FDialog : public QDialog {
- typedef QDialog inherited;
+class FDialog : public TQDialog {
+ typedef TQDialog inherited;
public:
- FDialog( QWidget *parent = 0, bool framed = true );
+ FDialog( TQWidget *parent = 0, bool framed = true );
virtual int exec();
- static void box( QWidget *parent, QMessageBox::Icon type,
- const QString &text );
-#define errorbox QMessageBox::Critical
-#define sorrybox QMessageBox::Warning
-#define infobox QMessageBox::Information
- void MsgBox( QMessageBox::Icon typ, const QString &msg ) { box( this, typ, msg ); }
+ static void box( TQWidget *parent, TQMessageBox::Icon type,
+ const TQString &text );
+#define errorbox TQMessageBox::Critical
+#define sorrybox TQMessageBox::Warning
+#define infobox TQMessageBox::Information
+ void MsgBox( TQMessageBox::Icon typ, const TQString &msg ) { box( this, typ, msg ); }
protected:
- virtual void resizeEvent( QResizeEvent *e );
+ virtual void resizeEvent( TQResizeEvent *e );
void adjustGeometry();
private:
- QFrame *winFrame;
+ TQFrame *winFrame;
};
class KFMsgBox : public FDialog {
typedef FDialog inherited;
public:
- KFMsgBox( QWidget *parent, QMessageBox::Icon type, const QString &text );
+ KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &text );
};
#endif /* FDIALOG_H */
diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp
index a5bb667ef..70b510645 100644
--- a/kdm/kfrontend/kgapp.cpp
+++ b/kdm/kfrontend/kgapp.cpp
@@ -37,10 +37,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
-#include <qtimer.h>
-#include <qstring.h>
-#include <qcursor.h>
-#include <qpalette.h>
+#include <tqtimer.h>
+#include <tqstring.h>
+#include <tqcursor.h>
+#include <tqpalette.h>
#include <stdlib.h> // free(), exit()
#include <unistd.h> // alarm()
@@ -75,7 +75,7 @@ GreeterApp::GreeterApp()
}
void
-GreeterApp::timerEvent( QTimerEvent * )
+GreeterApp::timerEvent( TQTimerEvent * )
{
alarm( 0 );
if (!PingServer( qt_xdisplay() ))
@@ -145,13 +145,13 @@ kg_main( const char *argv0 )
app.setStyle( _GUIStyle );
// Load up the systemwide ICC profile
- QString iccConfigFile = QString(KDE_CONFDIR);
+ TQString iccConfigFile = TQString(KDE_CONFDIR);
iccConfigFile += "/kicc/kiccconfigrc";
KSimpleConfig iccconfig(iccConfigFile, true);
if (iccconfig.readBoolEntry("EnableICC", false) == true) {
- QString iccCommand = QString("/usr/bin/xcalib ");
+ TQString iccCommand = TQString("/usr/bin/xcalib ");
iccCommand += iccconfig.readEntry("ICCFile");
- iccCommand += QString(" &");
+ iccCommand += TQString(" &");
system(iccCommand.ascii());
}
@@ -170,7 +170,7 @@ kg_main( const char *argv0 )
if (!_grabServer) {
if (_useBackground) {
proc = new KProcess;
- *proc << QCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "krootimage";
+ *proc << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "krootimage";
*proc << _backgroundCfg;
proc->start();
}
diff --git a/kdm/kfrontend/kgapp.h b/kdm/kfrontend/kgapp.h
index 9174cd5c8..f01ba1baa 100644
--- a/kdm/kfrontend/kgapp.h
+++ b/kdm/kfrontend/kgapp.h
@@ -37,7 +37,7 @@ class GreeterApp : public KApplication {
virtual bool x11EventFilter( XEvent * );
protected:
- virtual void timerEvent( QTimerEvent * );
+ virtual void timerEvent( TQTimerEvent * );
signals:
void activity();
diff --git a/kdm/kfrontend/kgdialog.cpp b/kdm/kfrontend/kgdialog.cpp
index 636b20dec..1981eea83 100644
--- a/kdm/kfrontend/kgdialog.cpp
+++ b/kdm/kfrontend/kgdialog.cpp
@@ -30,11 +30,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <klocale.h>
-#include <qaccel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qpopupmenu.h>
-#include <qapplication.h>
+#include <tqaccel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqpopupmenu.h>
+#include <tqapplication.h>
#include <stdlib.h>
@@ -50,50 +50,50 @@ KGDialog::KGDialog( bool themed ) : inherited( 0, !themed )
void
#ifdef XDMCP
-KGDialog::completeMenu( int _switchIf, int _switchCode, const QString &_switchMsg, int _switchAccel )
+KGDialog::completeMenu( int _switchIf, int _switchCode, const TQString &_switchMsg, int _switchAccel )
#else
KGDialog::completeMenu()
#endif
{
#ifdef HAVE_VTS
if (_isLocal) {
- dpyMenu = new QPopupMenu( this );
+ dpyMenu = new TQPopupMenu( this );
int id = inserten( i18n("Sw&itch User"), ALT+Key_I, dpyMenu );
- connect( dpyMenu, SIGNAL(activated( int )),
- SLOT(slotDisplaySelected( int )) );
- connect( dpyMenu, SIGNAL(aboutToShow()),
- SLOT(slotPopulateDisplays()) );
- QAccel *accel = new QAccel( this );
+ connect( dpyMenu, TQT_SIGNAL(activated( int )),
+ TQT_SLOT(slotDisplaySelected( int )) );
+ connect( dpyMenu, TQT_SIGNAL(aboutToShow()),
+ TQT_SLOT(slotPopulateDisplays()) );
+ TQAccel *accel = new TQAccel( this );
accel->insertItem( ALT+CTRL+Key_Insert, id );
- connect( accel, SIGNAL(activated( int )), SLOT(slotActivateMenu( int )) );
+ connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActivateMenu( int )) );
}
#endif
if (_allowClose)
inserten( _isLocal ? i18n("R&estart X Server") : i18n("Clos&e Connection"),
- ALT+Key_E, SLOT(slotExit()) );
+ ALT+Key_E, TQT_SLOT(slotExit()) );
#ifdef XDMCP
if (_isLocal && _loginMode != _switchIf) {
switchCode = _switchCode;
- inserten( _switchMsg, _switchAccel, SLOT(slotSwitch()) );
+ inserten( _switchMsg, _switchAccel, TQT_SLOT(slotSwitch()) );
}
#endif
if (_hasConsole)
- inserten( i18n("Co&nsole Login"), ALT+Key_N, SLOT(slotConsole()) );
+ inserten( i18n("Co&nsole Login"), ALT+Key_N, TQT_SLOT(slotConsole()) );
if (_allowShutdown != SHUT_NONE) {
- inserten( i18n("&Shutdown..."), ALT+Key_S, SLOT(slotShutdown( int )) );
- QAccel *accel = new QAccel( this );
+ inserten( i18n("&Shutdown..."), ALT+Key_S, TQT_SLOT(slotShutdown( int )) );
+ TQAccel *accel = new TQAccel( this );
accel->insertItem( ALT+CTRL+Key_Delete );
- connect( accel, SIGNAL(activated( int )), SLOT(slotShutdown( int )) );
- accel = new QAccel( this );
+ connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) );
+ accel = new TQAccel( this );
accel->insertItem( SHIFT+ALT+CTRL+Key_PageUp, SHUT_REBOOT );
- connect( accel, SIGNAL(activated( int )), SLOT(slotShutdown( int )) );
- accel = new QAccel( this );
+ connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) );
+ accel = new TQAccel( this );
accel->insertItem( SHIFT+ALT+CTRL+Key_PageDown, SHUT_HALT );
- connect( accel, SIGNAL(activated( int )), SLOT(slotShutdown( int )) );
+ connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) );
}
}
@@ -101,7 +101,7 @@ void
KGDialog::ensureMenu()
{
if (!optMenu) {
- optMenu = new QPopupMenu( this );
+ optMenu = new TQPopupMenu( this );
optMenu->setCheckable( false );
needSep = false;
} else if (needSep) {
@@ -111,19 +111,19 @@ KGDialog::ensureMenu()
}
void
-KGDialog::inserten( const QString& txt, int accel, const char *member )
+KGDialog::inserten( const TQString& txt, int accel, const char *member )
{
ensureMenu();
optMenu->insertItem( txt, this, member, accel );
}
int
-KGDialog::inserten( const QString& txt, int accel, QPopupMenu *cmnu )
+KGDialog::inserten( const TQString& txt, int accel, TQPopupMenu *cmnu )
{
ensureMenu();
int id = optMenu->insertItem( txt, cmnu );
optMenu->setAccel( accel, id );
- optMenu->connectItem( id, this, SLOT(slotActivateMenu( int )) );
+ optMenu->connectItem( id, this, TQT_SLOT(slotActivateMenu( int )) );
optMenu->setItemParameter( id, id );
return id;
}
@@ -131,9 +131,9 @@ KGDialog::inserten( const QString& txt, int accel, QPopupMenu *cmnu )
void
KGDialog::slotActivateMenu( int id )
{
- QPopupMenu *cmnu = optMenu->findItem( id )->popup();
- QSize sh( cmnu->sizeHint() / 2 );
- cmnu->exec( geometry().center() - QPoint( sh.width(), sh.height() ) );
+ TQPopupMenu *cmnu = optMenu->findItem( id )->popup();
+ TQSize sh( cmnu->sizeHint() / 2 );
+ cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
}
void
@@ -149,7 +149,7 @@ KGDialog::slotSwitch()
{
#ifdef XDMCP
// workaround for Qt bug
- QTimer::singleShot( 0, this, SLOT(slotReallySwitch()) );
+ TQTimer::singleShot( 0, this, TQT_SLOT(slotReallySwitch()) );
#endif
}
@@ -220,7 +220,7 @@ KGDialog::slotPopulateDisplays()
#ifdef HAVE_VTS
dpyMenu->clear();
dpySpec *sessions = fetchSessions( lstPassive | lstTTY );
- QString user, loc;
+ TQString user, loc;
for (dpySpec *sess = sessions; sess; sess = sess->next) {
decodeSess( sess, user, loc );
int id = dpyMenu->insertItem(
diff --git a/kdm/kfrontend/kgdialog.h b/kdm/kfrontend/kgdialog.h
index 05a4be5cf..f42a506ea 100644
--- a/kdm/kfrontend/kgdialog.h
+++ b/kdm/kfrontend/kgdialog.h
@@ -57,15 +57,15 @@ class KGDialog : public FDialog {
protected:
#ifdef XDMCP
- void completeMenu( int _switchIf, int _switchCode, const QString &_switchMsg, int _switchAccel );
+ void completeMenu( int _switchIf, int _switchCode, const TQString &_switchMsg, int _switchAccel );
#else
void completeMenu();
#endif
- void inserten( const QString& txt, int accel, const char *member );
- int inserten( const QString& txt, int accel, QPopupMenu *cmnu );
+ void inserten( const TQString& txt, int accel, const char *member );
+ int inserten( const TQString& txt, int accel, TQPopupMenu *cmnu );
bool needSep;
- QPopupMenu *optMenu;
+ TQPopupMenu *optMenu;
KGVerify *verify;
#ifdef WITH_KDM_XCONSOLE
KConsole *consoleView;
@@ -79,7 +79,7 @@ class KGDialog : public FDialog {
void ensureMenu();
#ifdef HAVE_VTS
- QPopupMenu *dpyMenu;
+ TQPopupMenu *dpyMenu;
#endif
int switchCode;
};
diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp
index 407b3d879..aa18afc6c 100644
--- a/kdm/kfrontend/kgreeter.cpp
+++ b/kdm/kfrontend/kgreeter.cpp
@@ -39,24 +39,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <ksimpleconfig.h>
#include <kstringhandler.h>
-#undef Unsorted // x headers suck - make qdir.h work with --enable-final
-#include <qdir.h>
-#include <qfile.h>
-#include <qbuffer.h>
-#include <qmemarray.h>
-#include <qimage.h>
-#include <qmovie.h>
-#include <qpopupmenu.h>
-#include <qtimer.h>
-#include <qheader.h>
-#include <qstyle.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qtooltip.h>
-#include <qaccel.h>
-#include <qstring.h>
-#include <qeventloop.h>
+#undef Unsorted // x headers suck - make tqdir.h work with --enable-final
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqbuffer.h>
+#include <tqmemarray.h>
+#include <tqimage.h>
+#include <tqmovie.h>
+#include <tqpopupmenu.h>
+#include <tqtimer.h>
+#include <tqheader.h>
+#include <tqstyle.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
+#include <tqtooltip.h>
+#include <tqaccel.h>
+#include <tqstring.h>
+#include <tqeventloop.h>
#include <pwd.h>
#include <grp.h>
@@ -69,32 +69,32 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class UserListView : public KListView {
public:
- UserListView( QWidget *parent = 0, const char *name = 0 )
+ UserListView( TQWidget *parent = 0, const char *name = 0 )
: KListView( parent, name )
, cachedSizeHint( -1, 0 )
{
- setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored );
+ setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored );
header()->hide();
- addColumn( QString::null );
+ addColumn( TQString::null );
setColumnAlignment( 0, AlignVCenter );
- setResizeMode( QListView::LastColumn );
+ setResizeMode( TQListView::LastColumn );
}
- mutable QSize cachedSizeHint;
+ mutable TQSize cachedSizeHint;
protected:
- virtual QSize sizeHint() const
+ virtual TQSize sizeHint() const
{
if (!cachedSizeHint.isValid()) {
constPolish();
uint maxw = 0;
- for (QListViewItem *itm = firstChild(); itm; itm = itm->nextSibling()) {
+ for (TQListViewItem *itm = firstChild(); itm; itm = itm->nextSibling()) {
uint thisw = itm->width( fontMetrics(), this, 0 );
if (thisw > maxw)
maxw = thisw;
}
cachedSizeHint.setWidth(
- style().pixelMetric( QStyle::PM_ScrollBarExtent ) +
+ style().pixelMetric( TQStyle::PM_ScrollBarExtent ) +
frameWidth() * 2 + maxw );
}
return cachedSizeHint;
@@ -122,19 +122,19 @@ KGreeter::KGreeter( bool framed )
if (_userList) {
userView = new UserListView( this );
- connect( userView, SIGNAL(clicked( QListViewItem * )),
- SLOT(slotUserClicked( QListViewItem * )) );
- connect( userView, SIGNAL(doubleClicked( QListViewItem * )),
- SLOT(accept()) );
+ connect( userView, TQT_SIGNAL(clicked( TQListViewItem * )),
+ TQT_SLOT(slotUserClicked( TQListViewItem * )) );
+ connect( userView, TQT_SIGNAL(doubleClicked( TQListViewItem * )),
+ TQT_SLOT(accept()) );
}
if (_userCompletion)
userList = new QStringList;
if (userView || userList)
insertUsers();
- sessMenu = new QPopupMenu( this );
- connect( sessMenu, SIGNAL(activated( int )),
- SLOT(slotSessionSelected( int )) );
+ sessMenu = new TQPopupMenu( this );
+ connect( sessMenu, TQT_SIGNAL(activated( int )),
+ TQT_SLOT(slotSessionSelected( int )) );
insertSessions();
if (curPlugin < 0) {
@@ -153,8 +153,8 @@ KGreeter::~KGreeter()
class UserListViewItem : public KListViewItem {
public:
- UserListViewItem( UserListView *parent, const QString &text,
- const QPixmap &pixmap, const QString &username )
+ UserListViewItem( UserListView *parent, const TQString &text,
+ const TQPixmap &pixmap, const TQString &username )
: KListViewItem( parent )
, login( username )
{
@@ -164,15 +164,15 @@ class UserListViewItem : public KListViewItem {
parent->cachedSizeHint.setWidth( -1 );
}
- QString login;
+ TQString login;
};
#define FILE_LIMIT_ICON 20
#define FILE_LIMIT_IMAGE 200
void
-KGreeter::insertUser( const QImage &default_pix,
- const QString &username, struct passwd *ps )
+KGreeter::insertUser( const TQImage &default_pix,
+ const TQString &username, struct passwd *ps )
{
if (setegid( ps->pw_gid ))
return;
@@ -193,12 +193,12 @@ KGreeter::insertUser( const QImage &default_pix,
if (_faceSource != FACE_USER_ONLY &&
_faceSource != FACE_ADMIN_ONLY)
nd = 1;
- QImage p;
+ TQImage p;
do {
dp ^= 1;
- QCString fn = !dp ?
- QCString( ps->pw_dir ) + '/' :
- QFile::encodeName( _faceDir + '/' + username );
+ TQCString fn = !dp ?
+ TQCString( ps->pw_dir ) + '/' :
+ TQFile::encodeName( _faceDir + '/' + username );
fn += ".face.icon";
int fd, ico;
if ((fd = open( fn.data(), O_RDONLY | O_NONBLOCK )) < 0) {
@@ -208,7 +208,7 @@ KGreeter::insertUser( const QImage &default_pix,
ico = 0;
} else
ico = 1;
- QFile f;
+ TQFile f;
f.open( IO_ReadOnly, fd );
int fs = f.size();
if (fs > (ico ? FILE_LIMIT_ICON : FILE_LIMIT_IMAGE) * 1000) {
@@ -216,40 +216,40 @@ KGreeter::insertUser( const QImage &default_pix,
fn.data(), ico ? FILE_LIMIT_ICON : FILE_LIMIT_IMAGE );
continue;
}
- QByteArray fc( fs );
+ TQByteArray fc( fs );
int rfs = f.readBlock( fc.data(), fs );
::close( fd );
fc.resize( rfs > 0 ? rfs : 0 );
- QBuffer buf( fc );
+ TQBuffer buf( fc );
buf.open( IO_ReadOnly );
- QImageIO ir;
+ TQImageIO ir;
ir.setIODevice( &buf );
if (!ir.read()) {
LogInfo( "%s is no valid image\n", fn.data() );
continue;
}
p = ir.image();
- QSize ns( 48, 48 );
+ TQSize ns( 48, 48 );
if (p.size() != ns)
- p = p.convertDepth( 32 ).smoothScale( ns, QImage::ScaleMin );
+ p = p.convertDepth( 32 ).smoothScale( ns, TQImage::ScaleMin );
goto gotit;
} while (--nd >= 0);
p = default_pix;
gotit:
- QString realname = KStringHandler::from8Bit( ps->pw_gecos );
+ TQString realname = KStringHandler::from8Bit( ps->pw_gecos );
realname.truncate( realname.find( ',' ) );
if (realname.isEmpty() || realname == username)
- new UserListViewItem( userView, username, QPixmap( p ), username );
+ new UserListViewItem( userView, username, TQPixmap( p ), username );
else {
realname.append( "\n" ).append( username );
- new UserListViewItem( userView, realname, QPixmap( p ), username );
+ new UserListViewItem( userView, realname, TQPixmap( p ), username );
}
seteuid( 0 );
setegid( 0 );
}
-class KCStringList : public QValueList<QCString> {
+class KCStringList : public TQValueList<TQCString> {
public:
bool contains( const char *str ) const
{
@@ -270,7 +270,7 @@ class UserList {
KCStringList users;
private:
- QValueList<gid_t> groups;
+ TQValueList<gid_t> groups;
};
UserList::UserList( char **in )
@@ -296,19 +296,19 @@ KGreeter::insertUsers()
if (!(ps = getpwnam( "nobody" )))
return;
- QImage default_pix;
+ TQImage default_pix;
if (userView) {
if (!default_pix.load( _faceDir + "/.default.face.icon" ))
if (!default_pix.load( _faceDir + "/.default.face" ))
LogError( "Can't open default user face\n" );
- QSize ns( 48, 48 );
+ TQSize ns( 48, 48 );
if (default_pix.size() != ns)
default_pix =
- default_pix.convertDepth( 32 ).smoothScale( ns, QImage::ScaleMin );
+ default_pix.convertDepth( 32 ).smoothScale( ns, TQImage::ScaleMin );
}
if (_showUsers == SHOW_ALL) {
UserList noUsers( _noUsers );
- QDict<int> dupes( 1000 );
+ TQDict<int> dupes( 1000 );
for (setpwent(); (ps = getpwent()) != 0;) {
if (*ps->pw_dir && *ps->pw_shell &&
(ps->pw_uid >= (unsigned)_lowUserId ||
@@ -317,7 +317,7 @@ KGreeter::insertUsers()
!noUsers.hasUser( ps->pw_name ) &&
!noUsers.hasGroup( ps->pw_gid ))
{
- QString username( QFile::decodeName( ps->pw_name ) );
+ TQString username( TQFile::decodeName( ps->pw_name ) );
if (!dupes.find( username )) {
dupes.insert( username, (int *)-1 );
insertUser( default_pix, username, ps );
@@ -327,7 +327,7 @@ KGreeter::insertUsers()
} else {
UserList users( _users );
if (users.hasGroups()) {
- QDict<int> dupes( 1000 );
+ TQDict<int> dupes( 1000 );
for (setpwent(); (ps = getpwent()) != 0;) {
if (*ps->pw_dir && *ps->pw_shell &&
(ps->pw_uid >= (unsigned)_lowUserId ||
@@ -336,7 +336,7 @@ KGreeter::insertUsers()
(users.hasUser( ps->pw_name ) ||
users.hasGroup( ps->pw_gid )))
{
- QString username( QFile::decodeName( ps->pw_name ) );
+ TQString username( TQFile::decodeName( ps->pw_name ) );
if (!dupes.find( username )) {
dupes.insert( username, (int *)-1 );
insertUser( default_pix, username, ps );
@@ -348,7 +348,7 @@ KGreeter::insertUsers()
for (; it != users.users.end(); ++it)
if ((ps = getpwnam( (*it).data() )) &&
(ps->pw_uid || _showRoot))
- insertUser( default_pix, QFile::decodeName( *it ), ps );
+ insertUser( default_pix, TQFile::decodeName( *it ), ps );
}
}
endpwent();
@@ -361,7 +361,7 @@ KGreeter::insertUsers()
}
void
-KGreeter::putSession( const QString &type, const QString &name, bool hid, const char *exe )
+KGreeter::putSession( const TQString &type, const TQString &name, bool hid, const char *exe )
{
int prio = exe ? (!strcmp( exe, "default" ) ? 0 :
!strcmp( exe, "failsafe" ) ? 3 : 2) : 2;
@@ -377,10 +377,10 @@ void
KGreeter::insertSessions()
{
for (char **dit = _sessionsDirs; *dit; ++dit) {
- QStringList ents = QDir( *dit ).entryList();
- for (QStringList::ConstIterator it = ents.begin(); it != ents.end(); ++it)
+ TQStringList ents = TQDir( *dit ).entryList();
+ for (TQStringList::ConstIterator it = ents.begin(); it != ents.end(); ++it)
if ((*it).endsWith( ".desktop" )) {
- KSimpleConfig dsk( QString( *dit ).append( '/' ).append( *it ) );
+ KSimpleConfig dsk( TQString( *dit ).append( '/' ).append( *it ) );
dsk.setGroup( "Desktop Entry" );
putSession( (*it).left( (*it).length() - 8 ),
dsk.readEntry( "Name" ),
@@ -406,7 +406,7 @@ void
KGreeter::slotUserEntered()
{
if (userView) {
- QListViewItem *item;
+ TQListViewItem *item;
for (item = userView->firstChild(); item; item = item->nextSibling())
if (((UserListViewItem *)item)->login == curUser) {
userView->setSelected( item, true );
@@ -419,11 +419,11 @@ KGreeter::slotUserEntered()
if (isVisible())
slotLoadPrevWM();
else
- QTimer::singleShot( 0, this, SLOT(slotLoadPrevWM()) );
+ TQTimer::singleShot( 0, this, TQT_SLOT(slotLoadPrevWM()) );
}
void
-KGreeter::slotUserClicked( QListViewItem *item )
+KGreeter::slotUserClicked( TQListViewItem *item )
{
if (item) {
curUser = ((UserListViewItem *)item)->login;
@@ -475,7 +475,7 @@ KGreeter::slotLoadPrevWM()
{
int len, i, b;
unsigned long crc, by;
- QCString name;
+ TQCString name;
char *sess;
if (verify->coreLock) {
@@ -537,7 +537,7 @@ void // protected
KGreeter::pluginSetup()
{
int field = 0;
- QString ent, pn( verify->pluginName() ), dn( dName + '_' + pn );
+ TQString ent, pn( verify->pluginName() ), dn( dName + '_' + pn );
if (_preselUser != PRESEL_PREV)
stsFile->deleteEntry( verify->entitiesLocal() ? dName : dn, false );
@@ -548,9 +548,9 @@ KGreeter::pluginSetup()
else
ent = _preselUser == PRESEL_PREV ?
stsFile->readEntry( dn ) :
- verify->getConf( 0, (pn + ".DefaultEntity").latin1(), QVariant() ).toString();
+ verify->getConf( 0, (pn + ".DefaultEntity").latin1(), TQVariant() ).toString();
field = verify->entitiesFielded() ?
- verify->getConf( 0, (pn + ".FocusField").latin1(), QVariant( 0 ) ).toInt() :
+ verify->getConf( 0, (pn + ".FocusField").latin1(), TQVariant( 0 ) ).toInt() :
_focusPasswd;
}
verify->presetEntity( ent, field );
@@ -568,7 +568,7 @@ KGreeter::verifyPluginChanged( int id )
void
KGreeter::verifyClear()
{
- curUser = QString::null;
+ curUser = TQString::null;
slotUserEntered();
slotSessionSelected( -1 );
}
@@ -602,7 +602,7 @@ KGreeter::verifyFailed()
}
void
-KGreeter::verifySetUser( const QString &user )
+KGreeter::verifySetUser( const TQString &user )
{
curUser = user;
slotUserEntered();
@@ -613,25 +613,25 @@ KStdGreeter::KStdGreeter()
, clock( 0 )
, pixLabel( 0 )
{
- QBoxLayout *main_box;
+ TQBoxLayout *main_box;
#ifdef WITH_KDM_XCONSOLE
if (consoleView) {
- QBoxLayout *ex_box = new QVBoxLayout( this, 10, 10 );
- main_box = new QHBoxLayout( ex_box, 10 );
+ TQBoxLayout *ex_box = new TQVBoxLayout( this, 10, 10 );
+ main_box = new TQHBoxLayout( ex_box, 10 );
ex_box->addWidget( consoleView );
} else
#endif
- main_box = new QHBoxLayout( this, 10, 10 );
+ main_box = new TQHBoxLayout( this, 10, 10 );
if (userView)
main_box->addWidget( userView );
- QBoxLayout *inner_box = new QVBoxLayout( main_box, 10 );
+ TQBoxLayout *inner_box = new TQVBoxLayout( main_box, 10 );
if (!_authorized && _authComplain) {
- QLabel *complainLabel = new QLabel(
+ TQLabel *complainLabel = new TQLabel(
i18n("Warning: this is an unsecured session"), this );
- QToolTip::add( complainLabel,
+ TQToolTip::add( complainLabel,
i18n("This display requires no X authorization.\n"
"This means that anybody can connect to it,\n"
"open windows on it or intercept your input.") );
@@ -641,7 +641,7 @@ KStdGreeter::KStdGreeter()
inner_box->addWidget( complainLabel );
}
if (!_greetString.isEmpty()) {
- QLabel *welcomeLabel = new QLabel( _greetString, this );
+ TQLabel *welcomeLabel = new TQLabel( _greetString, this );
welcomeLabel->setAlignment( AlignCenter );
welcomeLabel->setFont( _greetFont );
inner_box->addWidget( welcomeLabel );
@@ -653,19 +653,19 @@ KStdGreeter::KStdGreeter()
break;
case LOGO_LOGO:
{
- QMovie movie( _logo );
- kapp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput | QEventLoop::ExcludeSocketNotifiers, 100 );
- QPixmap pixmap;
+ TQMovie movie( _logo );
+ kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 100 );
+ TQPixmap pixmap;
if (!movie.framePixmap().isNull() || pixmap.load( _logo )) {
- pixLabel = new QLabel( this );
+ pixLabel = new TQLabel( this );
if (!movie.framePixmap().isNull()) {
pixLabel->setMovie( movie );
if (!movie.framePixmap().hasAlpha())
- pixLabel->setFrameStyle( QFrame::Panel | QFrame::Sunken );
+ pixLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
} else {
pixLabel->setPixmap( pixmap );
if (!pixmap.hasAlpha())
- pixLabel->setFrameStyle( QFrame::Panel | QFrame::Sunken );
+ pixLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
}
pixLabel->setIndent( 0 );
}
@@ -685,13 +685,13 @@ KStdGreeter::KStdGreeter()
main_box->addWidget( pixLabel, 0, AlignCenter );
}
- goButton = new QPushButton( i18n("L&ogin"), this );
+ goButton = new TQPushButton( i18n("L&ogin"), this );
goButton->setDefault( true );
- connect( goButton, SIGNAL(clicked()), SLOT(accept()) );
- menuButton = new QPushButton( i18n("&Menu"), this );
+ connect( goButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
+ menuButton = new TQPushButton( i18n("&Menu"), this );
//helpButton
- QWidget *prec;
+ TQWidget *prec;
if (userView)
prec = userView;
#ifdef WITH_KDM_XCONSOLE
@@ -701,17 +701,17 @@ KStdGreeter::KStdGreeter()
else
prec = menuButton;
KGStdVerify *sverify =
- new KGStdVerify( this, this, prec, QString::null,
+ new KGStdVerify( this, this, prec, TQString::null,
pluginList, KGreeterPlugin::Authenticate,
KGreeterPlugin::Login );
inner_box->addLayout( sverify->getLayout() );
- QPopupMenu *plugMenu = sverify->getPlugMenu();
+ TQPopupMenu *plugMenu = sverify->getPlugMenu();
sverify->selectPlugin( curPlugin );
verify = sverify;
inner_box->addWidget( new KSeparator( KSeparator::HLine, this ) );
- QBoxLayout *hbox2 = new QHBoxLayout( inner_box, 10 );
+ TQBoxLayout *hbox2 = new TQHBoxLayout( inner_box, 10 );
hbox2->addWidget( goButton );
hbox2->addStretch( 1 );
hbox2->addWidget( menuButton );
@@ -796,8 +796,8 @@ KThemedGreeter::KThemedGreeter()
return;
}
- connect( themer, SIGNAL(activated( const QString & )),
- SLOT(slotThemeActivated( const QString & )) );
+ connect( themer, TQT_SIGNAL(activated( const TQString & )),
+ TQT_SLOT(slotThemeActivated( const TQString & )) );
console_rect = themer->findNode( "xconsole" ); // kdm ext
userlist_rect = themer->findNode( "userlist" );
@@ -830,7 +830,7 @@ KThemedGreeter::KThemedGreeter()
// }
// clock = new KdmClock( this, "clock" );
- QWidget *prec;
+ TQWidget *prec;
if (userView)
prec = userView;
#ifdef WITH_KDM_XCONSOLE
@@ -840,10 +840,10 @@ KThemedGreeter::KThemedGreeter()
else
prec = 0;
KGThemedVerify *tverify =
- new KGThemedVerify( this, themer, this, prec, QString::null,
+ new KGThemedVerify( this, themer, this, prec, TQString::null,
pluginList, KGreeterPlugin::Authenticate,
KGreeterPlugin::Login );
- QPopupMenu *plugMenu = tverify->getPlugMenu();
+ TQPopupMenu *plugMenu = tverify->getPlugMenu();
tverify->selectPlugin( curPlugin );
verify = tverify;
@@ -853,9 +853,9 @@ KThemedGreeter::KThemedGreeter()
itm->hide( true );
else {
session_button = itm;
- QAccel *accel = new QAccel( this );
+ TQAccel *accel = new TQAccel( this );
accel->insertItem( ALT+Key_T, 0 );
- connect( accel, SIGNAL(activated( int )), SLOT(slotSessMenu()) );
+ connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotSessMenu()) );
}
} else {
if (sessMenu->count() > 1) {
@@ -876,9 +876,9 @@ KThemedGreeter::KThemedGreeter()
#endif
system_button = themer->findNode( "system_button" );
- QAccel *accel = new QAccel( this );
+ TQAccel *accel = new TQAccel( this );
accel->insertItem( ALT+Key_M, 0 );
- connect( accel, SIGNAL(activated( int )), SLOT(slotActionMenu()) );
+ connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActionMenu()) );
pluginSetup();
@@ -886,7 +886,7 @@ KThemedGreeter::KThemedGreeter()
}
bool
-KThemedGreeter::event( QEvent *e )
+KThemedGreeter::event( TQEvent *e )
{
if (themer)
themer->widgetEvent( e );
@@ -924,7 +924,7 @@ KThemedGreeter::verifyRetry()
// goButton->setEnabled( true );
}
-QString KThemedGreeter::timedUser = QString::null;
+TQString KThemedGreeter::timedUser = TQString::null;
int KThemedGreeter::timedDelay = -1;
void
@@ -958,7 +958,7 @@ KThemedGreeter::updateStatus( bool fail, bool caps, int timedleft )
}
void
-KThemedGreeter::slotThemeActivated( const QString &id )
+KThemedGreeter::slotThemeActivated( const TQString &id )
{
if (id == "login_button")
accept();
@@ -984,7 +984,7 @@ KThemedGreeter::slotActionMenu()
}
void
-KThemedGreeter::keyPressEvent( QKeyEvent *e )
+KThemedGreeter::keyPressEvent( TQKeyEvent *e )
{
inherited::keyPressEvent( e );
if (!(e->state() & KeyButtonMask) &&
diff --git a/kdm/kfrontend/kgreeter.h b/kdm/kfrontend/kgreeter.h
index 32191fafe..c81e4eaed 100644
--- a/kdm/kfrontend/kgreeter.h
+++ b/kdm/kfrontend/kgreeter.h
@@ -43,12 +43,12 @@ class QPopupMenu;
class QListViewItem;
struct SessType {
- QString name, type;
+ TQString name, type;
bool hid;
int prio;
SessType() {}
- SessType( const QString &n, const QString &t, bool h, int p ) :
+ SessType( const TQString &n, const TQString &t, bool h, int p ) :
name( n ), type( t ), hid( h ), prio( p ) {}
bool operator<( const SessType &st ) {
return hid != st.hid ? hid < st.hid :
@@ -68,25 +68,25 @@ class KGreeter : public KGDialog, public KGVerifyHandler {
public slots:
void accept();
void reject();
- void slotUserClicked( QListViewItem * );
+ void slotUserClicked( TQListViewItem * );
void slotSessionSelected( int );
void slotUserEntered();
protected:
void installUserList();
- void insertUser( const QImage &, const QString &, struct passwd * );
+ void insertUser( const TQImage &, const TQString &, struct passwd * );
void insertUsers();
- void putSession( const QString &, const QString &, bool, const char * );
+ void putSession( const TQString &, const TQString &, bool, const char * );
void insertSessions();
virtual void pluginSetup();
void setPrevWM( int );
- QString curUser, dName;
+ TQString curUser, dName;
KSimpleConfig *stsFile;
UserListView *userView;
- QStringList *userList;
- QPopupMenu *sessMenu;
- QValueVector<SessType> sessionTypes;
+ TQStringList *userList;
+ TQPopupMenu *sessMenu;
+ TQValueVector<SessType> sessionTypes;
int nNormals, nSpecials;
int curPrev, curSel;
bool prevValid;
@@ -104,7 +104,7 @@ class KGreeter : public KGDialog, public KGVerifyHandler {
virtual void verifyOk();
virtual void verifyFailed();
// virtual void verifyRetry();
- virtual void verifySetUser( const QString &user );
+ virtual void verifySetUser( const TQString &user );
};
class KStdGreeter : public KGreeter {
@@ -119,9 +119,9 @@ class KStdGreeter : public KGreeter {
private:
KdmClock *clock;
- QLabel *pixLabel;
- QPushButton *goButton;
- QPushButton *menuButton;
+ TQLabel *pixLabel;
+ TQPushButton *goButton;
+ TQPushButton *menuButton;
public: // from KGVerifyHandler
virtual void verifyFailed();
@@ -135,19 +135,19 @@ class KThemedGreeter : public KGreeter {
public:
KThemedGreeter();
bool isOK() { return themer != 0; }
- static QString timedUser;
+ static TQString timedUser;
static int timedDelay;
public slots:
- void slotThemeActivated( const QString &id );
+ void slotThemeActivated( const TQString &id );
void slotSessMenu();
void slotActionMenu();
protected:
virtual void updateStatus( bool fail, bool caps, int timedleft );
virtual void pluginSetup();
- virtual void keyPressEvent( QKeyEvent * );
- virtual bool event( QEvent *e );
+ virtual void keyPressEvent( TQKeyEvent * );
+ virtual bool event( TQEvent *e );
private:
// KdmClock *clock;
diff --git a/kdm/kfrontend/kgverify.cpp b/kdm/kfrontend/kgverify.cpp
index f9bb77ff8..ff8804f4d 100644
--- a/kdm/kfrontend/kgverify.cpp
+++ b/kdm/kfrontend/kgverify.cpp
@@ -38,11 +38,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kstdguiitem.h>
#include <kpushbutton.h>
-#include <qregexp.h>
-#include <qpopupmenu.h>
-#include <qlayout.h>
-#include <qfile.h>
-#include <qlabel.h>
+#include <tqregexp.h>
+#include <tqpopupmenu.h>
+#include <tqlayout.h>
+#include <tqfile.h>
+#include <tqlabel.h>
#include <pwd.h>
#include <sys/types.h>
@@ -67,8 +67,8 @@ void KGVerifyHandler::updateStatus( bool, bool, int )
}
KGVerify::KGVerify( KGVerifyHandler *_handler, KdmThemer *_themer,
- QWidget *_parent, QWidget *_predecessor,
- const QString &_fixedUser,
+ TQWidget *_parent, TQWidget *_predecessor,
+ const TQString &_fixedUser,
const PluginList &_pluginList,
KGreeterPlugin::Function _func,
KGreeterPlugin::Context _ctx )
@@ -91,8 +91,8 @@ KGVerify::KGVerify( KGVerifyHandler *_handler, KdmThemer *_themer,
, failed( false )
, isClear( true )
{
- connect( &timer, SIGNAL(timeout()), SLOT(slotTimeout()) );
- connect( kapp, SIGNAL(activity()), SLOT(slotActivity()) );
+ connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
+ connect( kapp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
_parent->installEventFilter( this );
}
@@ -103,16 +103,16 @@ KGVerify::~KGVerify()
delete greet;
}
-QPopupMenu *
+TQPopupMenu *
KGVerify::getPlugMenu()
{
// assert( !cont );
if (!plugMenu) {
uint np = pluginList.count();
if (np > 1) {
- plugMenu = new QPopupMenu( parent );
- connect( plugMenu, SIGNAL(activated( int )),
- SLOT(slotPluginSelected( int )) );
+ plugMenu = new TQPopupMenu( parent );
+ connect( plugMenu, TQT_SIGNAL(activated( int )),
+ TQT_SLOT(slotPluginSelected( int )) );
for (uint i = 0; i < np; i++)
plugMenu->insertItem( i18n(greetPlugins[pluginList[i]].info->name), pluginList[i] );
}
@@ -144,28 +144,28 @@ KGVerify::isClassic() const
return !strcmp( greetPlugins[pluginList[curPlugin]].info->method, "classic" );
}
-QString // public
+TQString // public
KGVerify::pluginName() const
{
- QString name( greetPlugins[pluginList[curPlugin]].library->fileName() );
+ TQString name( greetPlugins[pluginList[curPlugin]].library->fileName() );
uint st = name.findRev( '/' ) + 1;
uint en = name.find( '.', st );
- if (en - st > 7 && QConstString( name.unicode() + st, 7 ).string() == "kgreet_")
+ if (en - st > 7 && TQConstString( name.unicode() + st, 7 ).string() == "kgreet_")
st += 7;
return name.mid( st, en - st );
}
static void
-showWidgets( QLayoutItem *li )
+showWidgets( TQLayoutItem *li )
{
- QWidget *w;
- QLayout *l;
+ TQWidget *w;
+ TQLayout *l;
if ((w = li->widget()))
w->show();
else if ((l = li->layout())) {
- QLayoutIterator it = l->iterator();
- for (QLayoutItem *itm = it.current(); itm; itm = ++it)
+ TQLayoutIterator it = l->iterator();
+ for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
showWidgets( itm );
}
}
@@ -187,14 +187,14 @@ KGVerify::selectPlugin( int id )
}
void // public
-KGVerify::loadUsers( const QStringList &users )
+KGVerify::loadUsers( const TQStringList &users )
{
Debug( "%s->loadUsers(...)\n", pName.data() );
greet->loadUsers( users );
}
void // public
-KGVerify::presetEntity( const QString &entity, int field )
+KGVerify::presetEntity( const TQString &entity, int field )
{
presEnt = entity;
presFld = field;
@@ -249,17 +249,17 @@ KGVerify::performAutoLogin()
handleVerify();
}
-QString // public
+TQString // public
KGVerify::getEntity() const
{
Debug( "%s->getEntity()\n", pName.data() );
- QString ent = greet->getEntity();
+ TQString ent = greet->getEntity();
Debug( " entity: %s\n", ent.latin1() );
return ent;
}
void
-KGVerify::setUser( const QString &user )
+KGVerify::setUser( const TQString &user )
{
// assert( fixedEntity.isEmpty() );
curUser = user;
@@ -349,7 +349,7 @@ KGVerify::doReject( bool initial )
handler->verifyClear();
Debug( "%s->clear()\n", pName.data() );
greet->clear();
- curUser = QString::null;
+ curUser = TQString::null;
if (!scheduleAutoLogin( initial )) {
isClear = !(isClear && applyPreset());
if (running) {
@@ -428,8 +428,8 @@ KGVerify::slotActivity()
void // private static
-KGVerify::VMsgBox( QWidget *parent, const QString &user,
- QMessageBox::Icon type, const QString &mesg )
+KGVerify::VMsgBox( TQWidget *parent, const TQString &user,
+ TQMessageBox::Icon type, const TQString &mesg )
{
FDialog::box( parent, type, user.isEmpty() ?
mesg : i18n("Authenticating %1...\n\n").arg( user ) + mesg );
@@ -447,10 +447,10 @@ static const char *msgs[]= {
};
void // private static
-KGVerify::VErrBox( QWidget *parent, const QString &user, const char *msg )
+KGVerify::VErrBox( TQWidget *parent, const TQString &user, const char *msg )
{
- QMessageBox::Icon icon;
- QString mesg;
+ TQMessageBox::Icon icon;
+ TQString mesg;
if (!msg) {
mesg = i18n("A critical error occurred.\n"
@@ -458,8 +458,8 @@ KGVerify::VErrBox( QWidget *parent, const QString &user, const char *msg )
"or contact your system administrator.");
icon = errorbox;
} else {
- mesg = QString::fromLocal8Bit( msg );
- QString mesg1 = mesg + '.';
+ mesg = TQString::fromLocal8Bit( msg );
+ TQString mesg1 = mesg + '.';
for (uint i = 0; i < as(msgs); i++)
if (mesg1 == msgs[i]) {
mesg = i18n(msgs[i]);
@@ -471,10 +471,10 @@ KGVerify::VErrBox( QWidget *parent, const QString &user, const char *msg )
}
void // private static
-KGVerify::VInfoBox( QWidget *parent, const QString &user, const char *msg )
+KGVerify::VInfoBox( TQWidget *parent, const TQString &user, const char *msg )
{
- QString mesg = QString::fromLocal8Bit( msg );
- QRegExp rx( "^Warning: your account will expire in (\\d+) day" );
+ TQString mesg = TQString::fromLocal8Bit( msg );
+ TQRegExp rx( "^Warning: your account will expire in (\\d+) day" );
if (rx.search( mesg ) >= 0) {
int expire = rx.cap( 1 ).toInt();
mesg = expire ?
@@ -495,11 +495,11 @@ KGVerify::VInfoBox( QWidget *parent, const QString &user, const char *msg )
}
bool // public static
-KGVerify::handleFailVerify( QWidget *parent )
+KGVerify::handleFailVerify( TQWidget *parent )
{
Debug( "handleFailVerify ...\n" );
char *msg = GRecvStr();
- QString user = QString::fromLocal8Bit( msg );
+ TQString user = TQString::fromLocal8Bit( msg );
free( msg );
for (;;) {
@@ -513,9 +513,9 @@ KGVerify::handleFailVerify( QWidget *parent )
case V_CHTOK_AUTH:
Debug( " V_CHTOK_AUTH\n" );
{
- QStringList pgs( _pluginsLogin );
+ TQStringList pgs( _pluginsLogin );
pgs += _pluginsShutdown;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for (it = pgs.begin(); it != pgs.end(); ++it)
if (*it == "classic" || *it == "modern") {
pgs = *it;
@@ -569,7 +569,7 @@ KGVerify::handleFailVerify( QWidget *parent )
void // private
KGVerify::handleVerify()
{
- QString user;
+ TQString user;
Debug( "handleVerify ...\n" );
for (;;) {
@@ -612,7 +612,7 @@ KGVerify::handleVerify()
case V_PUT_USER:
Debug( " V_PUT_USER\n" );
msg = GRecvStr();
- curUser = user = QString::fromLocal8Bit( msg );
+ curUser = user = TQString::fromLocal8Bit( msg );
// greet needs this to be able to return something useful from
// getEntity(). but the backend is still unable to tell a domain ...
Debug( " %s->setUser(%\"s)\n", pName.data(), user.latin1() );
@@ -640,7 +640,7 @@ KGVerify::handleVerify()
case V_CHTOK:
Debug( " V_CHTOK\n" );
nfunc = KGreeterPlugin::ChAuthTok;
- user = QString::null;
+ user = TQString::null;
dchtok:
{
timer.stop();
@@ -686,7 +686,7 @@ KGVerify::handleVerify()
Debug( " V_OK\n" );
if (!fixedEntity.isEmpty()) {
Debug( " %s->getEntity()\n", pName.data() );
- QString ent = greet->getEntity();
+ TQString ent = greet->getEntity();
Debug( " entity %\"s\n", ent.latin1() );
if (ent != fixedEntity) {
Debug( "%s->failed()\n", pName.data() );
@@ -725,7 +725,7 @@ KGVerify::handleVerify()
greet->start();
if (!cont)
return;
- user = QString::null;
+ user = TQString::null;
}
}
@@ -759,7 +759,7 @@ KGVerify::gplugReturnBinary( const char *data )
}
void
-KGVerify::gplugSetUser( const QString &user )
+KGVerify::gplugSetUser( const TQString &user )
{
Debug( "%s: gplugSetUser(%\"s)\n", pName.data(), user.latin1() );
curUser = user;
@@ -790,19 +790,19 @@ KGVerify::gplugActivity()
}
void
-KGVerify::gplugMsgBox( QMessageBox::Icon type, const QString &text )
+KGVerify::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
{
Debug( "%s: gplugMsgBox(%d, %\"s)\n", pName.data(), type, text.latin1() );
MsgBox( type, text );
}
bool
-KGVerify::eventFilter( QObject *o, QEvent *e )
+KGVerify::eventFilter( TQObject *o, TQEvent *e )
{
switch (e->type()) {
- case QEvent::KeyPress:
+ case TQEvent::KeyPress:
if (timedLeft) {
- QKeyEvent *ke = (QKeyEvent *)e;
+ TQKeyEvent *ke = (TQKeyEvent *)e;
if (ke->key() == Key_Return || ke->key() == Key_Enter) {
if (deadTicks <= 0) {
timedLeft = 0;
@@ -812,7 +812,7 @@ KGVerify::eventFilter( QObject *o, QEvent *e )
}
}
/* fall through */
- case QEvent::KeyRelease:
+ case TQEvent::KeyRelease:
updateLockStatus();
/* fall through */
default:
@@ -835,7 +835,7 @@ KGVerify::updateLockStatus()
}
void
-KGVerify::MsgBox( QMessageBox::Icon typ, const QString &msg )
+KGVerify::MsgBox( TQMessageBox::Icon typ, const TQString &msg )
{
timer.suspend();
FDialog::box( parent, typ, msg );
@@ -843,14 +843,14 @@ KGVerify::MsgBox( QMessageBox::Icon typ, const QString &msg )
}
-QVariant // public static
-KGVerify::getConf( void *, const char *key, const QVariant &dflt )
+TQVariant // public static
+KGVerify::getConf( void *, const char *key, const TQVariant &dflt )
{
if (!qstrcmp( key, "EchoMode" ))
- return QVariant( _echoMode );
+ return TQVariant( _echoMode );
else {
- QString fkey = QString::fromLatin1( key ) + '=';
- for (QStringList::ConstIterator it = _pluginOptions.begin();
+ TQString fkey = TQString::fromLatin1( key ) + '=';
+ for (TQStringList::ConstIterator it = _pluginOptions.begin();
it != _pluginOptions.end(); ++it)
if ((*it).startsWith( fkey ))
return (*it).mid( fkey.length() );
@@ -858,16 +858,16 @@ KGVerify::getConf( void *, const char *key, const QVariant &dflt )
}
}
-QValueVector<GreeterPluginHandle> KGVerify::greetPlugins;
+TQValueVector<GreeterPluginHandle> KGVerify::greetPlugins;
PluginList
-KGVerify::init( const QStringList &plugins )
+KGVerify::init( const TQStringList &plugins )
{
PluginList pluginList;
- for (QStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) {
+ for (TQStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) {
GreeterPluginHandle plugin;
- QString path = KLibLoader::self()->findLibrary(
+ TQString path = KLibLoader::self()->findLibrary(
((*it)[0] == '/' ? *it : "kgreet_" + *it ).latin1() );
if (path.isEmpty()) {
LogError( "GreeterPlugin %s does not exist\n", (*it).latin1() );
@@ -888,7 +888,7 @@ KGVerify::init( const QStringList &plugins )
continue;
}
plugin.info = (kgreeterplugin_info*)plugin.library->symbol( "kgreeterplugin_info" );
- if (!plugin.info->init( QString::null, getConf, 0 )) {
+ if (!plugin.info->init( TQString::null, getConf, 0 )) {
LogError( "GreeterPlugin %s (%s) refuses to serve\n",
(*it).latin1(), path.latin1() );
plugin.library->unload();
@@ -913,8 +913,8 @@ KGVerify::done()
}
-KGStdVerify::KGStdVerify( KGVerifyHandler *_handler, QWidget *_parent,
- QWidget *_predecessor, const QString &_fixedUser,
+KGStdVerify::KGStdVerify( KGVerifyHandler *_handler, TQWidget *_parent,
+ TQWidget *_predecessor, const TQString &_fixedUser,
const PluginList &_pluginList,
KGreeterPlugin::Function _func,
KGreeterPlugin::Context _ctx )
@@ -925,7 +925,7 @@ KGStdVerify::KGStdVerify( KGVerifyHandler *_handler, QWidget *_parent,
grid = new QGridLayout;
grid->setAlignment( AlignCenter );
- failedLabel = new QLabel( parent );
+ failedLabel = new TQLabel( parent );
failedLabel->setFont( _failFont );
grid->addWidget( failedLabel, 1, 0, AlignCenter );
@@ -1011,8 +1011,8 @@ KGStdVerify::updateStatus()
KGThemedVerify::KGThemedVerify( KGVerifyHandler *_handler,
KdmThemer *_themer,
- QWidget *_parent, QWidget *_predecessor,
- const QString &_fixedUser,
+ TQWidget *_parent, TQWidget *_predecessor,
+ const TQString &_fixedUser,
const PluginList &_pluginList,
KGreeterPlugin::Function _func,
KGreeterPlugin::Context _ctx )
@@ -1030,7 +1030,7 @@ void // public
KGThemedVerify::selectPlugin( int id )
{
inherited::selectPlugin( id );
- QLayoutItem *l;
+ TQLayoutItem *l;
KdmItem *n;
if (themer && (l = greet->getLayoutItem())) {
if (!(n = themer->findNode( "talker" )))
@@ -1071,14 +1071,14 @@ KGThemedVerify::updateStatus()
}
-KGChTok::KGChTok( QWidget *_parent, const QString &user,
+KGChTok::KGChTok( TQWidget *_parent, const TQString &user,
const PluginList &pluginList, int curPlugin,
KGreeterPlugin::Function func,
KGreeterPlugin::Context ctx )
: inherited( _parent )
, verify( 0 )
{
- QSizePolicy fp( QSizePolicy::Fixed, QSizePolicy::Fixed );
+ TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
okButton = new KPushButton( KStdGuiItem::ok(), this );
okButton->setSizePolicy( fp );
okButton->setDefault( true );
@@ -1088,25 +1088,25 @@ KGChTok::KGChTok( QWidget *_parent, const QString &user,
verify = new KGStdVerify( this, this, cancelButton, user, pluginList, func, ctx );
verify->selectPlugin( curPlugin );
- QVBoxLayout *box = new QVBoxLayout( this, 10 );
+ TQVBoxLayout *box = new TQVBoxLayout( this, 10 );
- box->addWidget( new QLabel( i18n("Changing authentication token"), this ), 0, AlignHCenter );
+ box->addWidget( new TQLabel( i18n("Changing authentication token"), this ), 0, AlignHCenter );
box->addLayout( verify->getLayout() );
box->addWidget( new KSeparator( KSeparator::HLine, this ) );
- QHBoxLayout *hlay = new QHBoxLayout( box );
+ TQHBoxLayout *hlay = new TQHBoxLayout( box );
hlay->addStretch( 1 );
hlay->addWidget( okButton );
hlay->addStretch( 1 );
hlay->addWidget( cancelButton );
hlay->addStretch( 1 );
- connect( okButton, SIGNAL(clicked()), SLOT(accept()) );
- connect( cancelButton, SIGNAL(clicked()), SLOT(reject()) );
+ connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
+ connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
- QTimer::singleShot( 0, verify, SLOT(start()) );
+ TQTimer::singleShot( 0, verify, TQT_SLOT(start()) );
}
KGChTok::~KGChTok()
@@ -1148,7 +1148,7 @@ KGChTok::verifyRetry()
}
void
-KGChTok::verifySetUser( const QString & )
+KGChTok::verifySetUser( const TQString & )
{
// cannot happen
}
@@ -1160,7 +1160,7 @@ QXTimer::QXTimer()
: inherited( 0 )
, left( -1 )
{
- connect( &timer, SIGNAL(timeout()), SLOT(slotTimeout()) );
+ connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
}
void
diff --git a/kdm/kfrontend/kgverify.h b/kdm/kfrontend/kgverify.h
index a0d285e3d..ef2ed2469 100644
--- a/kdm/kfrontend/kgverify.h
+++ b/kdm/kfrontend/kgverify.h
@@ -29,17 +29,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "kgreeterplugin.h"
#include "kfdialog.h"
-#include <qlayout.h>
-#include <qtimer.h>
-#include <qvaluevector.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
+#include <tqvaluevector.h>
#include <sys/time.h>
#include <time.h>
// helper class, nuke when qt supports suspend()/resume()
-class QXTimer : public QObject {
+class QXTimer : public TQObject {
Q_OBJECT
- typedef QObject inherited;
+ typedef TQObject inherited;
public:
QXTimer();
@@ -55,7 +55,7 @@ class QXTimer : public QObject {
void slotTimeout();
private:
- QTimer timer;
+ TQTimer timer;
struct timeval stv;
long left;
};
@@ -67,7 +67,7 @@ class KGVerifyHandler {
virtual void verifyOk() = 0;
virtual void verifyFailed() = 0;
virtual void verifyRetry() = 0;
- virtual void verifySetUser( const QString &user ) = 0;
+ virtual void verifySetUser( const TQString &user ) = 0;
virtual void updateStatus( bool fail, bool caps, int left ); // for themed only
};
@@ -83,29 +83,29 @@ struct GreeterPluginHandle {
kgreeterplugin_info *info;
};
-typedef QValueVector<int> PluginList;
+typedef TQValueVector<int> PluginList;
-class KGVerify : public QObject, public KGreeterPluginHandler {
+class KGVerify : public TQObject, public KGreeterPluginHandler {
Q_OBJECT
- typedef QObject inherited;
+ typedef TQObject inherited;
public:
KGVerify( KGVerifyHandler *handler, KdmThemer *themer,
- QWidget *parent, QWidget *predecessor,
- const QString &fixedEntity, const PluginList &pluginList,
+ TQWidget *parent, TQWidget *predecessor,
+ const TQString &fixedEntity, const PluginList &pluginList,
KGreeterPlugin::Function func, KGreeterPlugin::Context ctx );
virtual ~KGVerify();
- QPopupMenu *getPlugMenu();
- void loadUsers( const QStringList &users );
- void presetEntity( const QString &entity, int field );
- QString getEntity() const;
- void setUser( const QString &user );
+ TQPopupMenu *getPlugMenu();
+ void loadUsers( const TQStringList &users );
+ void presetEntity( const TQString &entity, int field );
+ TQString getEntity() const;
+ void setUser( const TQString &user );
/* virtual */ void selectPlugin( int id );
bool entitiesLocal() const;
bool entitiesFielded() const;
bool entityPresettable() const;
bool isClassic() const;
- QString pluginName() const;
+ TQString pluginName() const;
void setEnabled( bool on );
void abort();
void suspend();
@@ -115,42 +115,42 @@ class KGVerify : public QObject, public KGreeterPluginHandler {
int coreLock;
- static bool handleFailVerify( QWidget *parent );
- static PluginList init( const QStringList &plugins );
+ static bool handleFailVerify( TQWidget *parent );
+ static PluginList init( const TQStringList &plugins );
static void done();
public slots:
void start();
protected:
- bool eventFilter( QObject *, QEvent * );
- void MsgBox( QMessageBox::Icon typ, const QString &msg );
+ bool eventFilter( TQObject *, TQEvent * );
+ void MsgBox( TQMessageBox::Icon typ, const TQString &msg );
void setTimer();
void updateLockStatus();
virtual void updateStatus() = 0;
void handleVerify();
QXTimer timer;
- QString fixedEntity, presEnt, curUser;
+ TQString fixedEntity, presEnt, curUser;
PluginList pluginList;
KGVerifyHandler *handler;
KdmThemer *themer;
- QWidget *parent, *predecessor;
+ TQWidget *parent, *predecessor;
KGreeterPlugin *greet;
- QPopupMenu *plugMenu;
+ TQPopupMenu *plugMenu;
int curPlugin, presFld, timedLeft, deadTicks;
- QCString pName;
+ TQCString pName;
KGreeterPlugin::Function func;
KGreeterPlugin::Context ctx;
bool capsLocked;
bool enabled, running, suspended, failed, delayed, cont;
bool authTok, isClear, timeable;
- static void VMsgBox( QWidget *parent, const QString &user, QMessageBox::Icon type, const QString &mesg );
- static void VErrBox( QWidget *parent, const QString &user, const char *msg );
- static void VInfoBox( QWidget *parent, const QString &user, const char *msg );
+ static void VMsgBox( TQWidget *parent, const TQString &user, TQMessageBox::Icon type, const TQString &mesg );
+ static void VErrBox( TQWidget *parent, const TQString &user, const char *msg );
+ static void VInfoBox( TQWidget *parent, const TQString &user, const char *msg );
- static QValueVector<GreeterPluginHandle> greetPlugins;
+ static TQValueVector<GreeterPluginHandle> greetPlugins;
private:
bool applyPreset();
@@ -166,12 +166,12 @@ class KGVerify : public QObject, public KGreeterPluginHandler {
public: // from KGreetPluginHandler
virtual void gplugReturnText( const char *text, int tag );
virtual void gplugReturnBinary( const char *data );
- virtual void gplugSetUser( const QString &user );
+ virtual void gplugSetUser( const TQString &user );
virtual void gplugStart();
virtual void gplugActivity();
- virtual void gplugMsgBox( QMessageBox::Icon type, const QString &text );
+ virtual void gplugMsgBox( TQMessageBox::Icon type, const TQString &text );
- static QVariant getConf( void *ctx, const char *key, const QVariant &dflt );
+ static TQVariant getConf( void *ctx, const char *key, const TQVariant &dflt );
};
class KGStdVerify : public KGVerify {
@@ -179,20 +179,20 @@ class KGStdVerify : public KGVerify {
typedef KGVerify inherited;
public:
- KGStdVerify( KGVerifyHandler *handler, QWidget *parent,
- QWidget *predecessor, const QString &fixedEntity,
+ KGStdVerify( KGVerifyHandler *handler, TQWidget *parent,
+ TQWidget *predecessor, const TQString &fixedEntity,
const PluginList &pluginList,
KGreeterPlugin::Function func, KGreeterPlugin::Context ctx );
virtual ~KGStdVerify();
- QLayout *getLayout() const { return grid; }
+ TQLayout *getLayout() const { return grid; }
void selectPlugin( int id );
protected:
void updateStatus();
private:
- QGridLayout *grid;
- QLabel *failedLabel;
+ TQGridLayout *grid;
+ TQLabel *failedLabel;
int failedLabelState;
private slots:
@@ -205,8 +205,8 @@ class KGThemedVerify : public KGVerify {
public:
KGThemedVerify( KGVerifyHandler *handler, KdmThemer *themer,
- QWidget *parent, QWidget *predecessor,
- const QString &fixedEntity,
+ TQWidget *parent, TQWidget *predecessor,
+ const TQString &fixedEntity,
const PluginList &pluginList,
KGreeterPlugin::Function func,
KGreeterPlugin::Context ctx );
@@ -225,7 +225,7 @@ class KGChTok : public FDialog, public KGVerifyHandler {
typedef FDialog inherited;
public:
- KGChTok( QWidget *parent, const QString &user,
+ KGChTok( TQWidget *parent, const TQString &user,
const PluginList &pluginList, int curPlugin,
KGreeterPlugin::Function func, KGreeterPlugin::Context ctx );
~KGChTok();
@@ -242,7 +242,7 @@ class KGChTok : public FDialog, public KGVerifyHandler {
virtual void verifyOk();
virtual void verifyFailed();
virtual void verifyRetry();
- virtual void verifySetUser( const QString &user );
+ virtual void verifySetUser( const TQString &user );
};
#endif /* KGVERIFY_H */
diff --git a/kdm/kfrontend/krootimage.cpp b/kdm/kfrontend/krootimage.cpp
index c630d9fa7..67b575c5f 100644
--- a/kdm/kfrontend/krootimage.cpp
+++ b/kdm/kfrontend/krootimage.cpp
@@ -25,7 +25,7 @@ Boston, MA 02110-1301, USA.
#include <ksimpleconfig.h>
#include <klocale.h>
-#include <qfile.h>
+#include <tqfile.h>
#include "krootimage.h"
@@ -46,10 +46,10 @@ static KCmdLineOptions options[] = {
MyApplication::MyApplication( const char *conf )
: KApplication(),
- renderer( 0, new KSimpleConfig( QFile::decodeName( conf ) ) )
+ renderer( 0, new KSimpleConfig( TQFile::decodeName( conf ) ) )
{
- connect( &timer, SIGNAL(timeout()), SLOT(slotTimeout()) );
- connect( &renderer, SIGNAL(imageDone( int )), this, SLOT(renderDone()) );
+ connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
+ connect( &renderer, TQT_SIGNAL(imageDone( int )), this, TQT_SLOT(renderDone()) );
renderer.enableTiling( true ); // optimize
renderer.changeWallpaper(); // cannot do it when we're killed, so do it now
timer.start( 60000 );
diff --git a/kdm/kfrontend/krootimage.h b/kdm/kfrontend/krootimage.h
index 608cfa3a1..3168994ba 100644
--- a/kdm/kfrontend/krootimage.h
+++ b/kdm/kfrontend/krootimage.h
@@ -24,7 +24,7 @@ Boston, MA 02110-1301, USA.
#include <kapplication.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include <bgrender.h>
@@ -42,7 +42,7 @@ class MyApplication : public KApplication
private:
KVirtualBGRenderer renderer;
- QTimer timer;
+ TQTimer timer;
};
#endif
diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp
index 48c0d1faf..38af9d0aa 100644
--- a/kdm/kfrontend/themer/kdmitem.cpp
+++ b/kdm/kfrontend/themer/kdmitem.cpp
@@ -31,16 +31,16 @@
#include <kglobal.h>
#include <kdebug.h>
-#include <qframe.h>
-#include <qwidget.h>
-#include <qlayout.h>
-#include <qimage.h>
+#include <tqframe.h>
+#include <tqwidget.h>
+#include <tqlayout.h>
+#include <tqimage.h>
#ifdef DRAW_OUTLINE
-# include <qpainter.h>
+# include <tqpainter.h>
#endif
-KdmItem::KdmItem( KdmItem *parent, const QDomNode &node, const char *name )
- : QObject( parent, name )
+KdmItem::KdmItem( KdmItem *parent, const TQDomNode &node, const char *name )
+ : TQObject( parent, name )
, boxManager( 0 )
, fixedManager( 0 )
, image( 0 )
@@ -68,23 +68,23 @@ KdmItem::KdmItem( KdmItem *parent, const QDomNode &node, const char *name )
}
// Read the mandatory Pos tag. Other tags such as normal, prelighted,
// etc.. are read under specific implementations.
- QDomNodeList childList = node.childNodes();
+ TQDomNodeList childList = node.childNodes();
for (uint nod = 0; nod < childList.count(); nod++) {
- QDomNode child = childList.item( nod );
- QDomElement el = child.toElement();
- QString tagName = el.tagName(), attr;
+ TQDomNode child = childList.item( nod );
+ TQDomElement el = child.toElement();
+ TQString tagName = el.tagName(), attr;
if (tagName == "pos") {
- parseAttribute( el.attribute( "x", QString::null ), pos.x, pos.xType );
- parseAttribute( el.attribute( "y", QString::null ), pos.y, pos.yType );
- parseAttribute( el.attribute( "width", QString::null ), pos.width, pos.wType );
- parseAttribute( el.attribute( "height", QString::null ), pos.height, pos.hType );
+ parseAttribute( el.attribute( "x", TQString::null ), pos.x, pos.xType );
+ parseAttribute( el.attribute( "y", TQString::null ), pos.y, pos.yType );
+ parseAttribute( el.attribute( "width", TQString::null ), pos.width, pos.wType );
+ parseAttribute( el.attribute( "height", TQString::null ), pos.height, pos.hType );
pos.anchor = el.attribute( "anchor", "nw" );
}
}
- QDomNode tnode = node;
- id = tnode.toElement().attribute( "id", QString::number( (ulong)this, 16 ) );
+ TQDomNode tnode = node;
+ id = tnode.toElement().attribute( "id", TQString::number( (ulong)this, 16 ) );
// Tell 'parent' to add 'me' to its children
KdmItem *parentItem = static_cast<KdmItem *>( parent );
@@ -115,7 +115,7 @@ KdmItem::show( bool force )
if (isShown != InitialHidden && !force)
return;
- QValueList<KdmItem *>::Iterator it;
+ TQValueList<KdmItem *>::Iterator it;
for (it = m_children.begin(); it != m_children.end(); ++it)
(*it)->show();
@@ -139,7 +139,7 @@ KdmItem::hide( bool force )
return; // no need for further action
}
- QValueList<KdmItem *>::Iterator it;
+ TQValueList<KdmItem *>::Iterator it;
for (it = m_children.begin(); it != m_children.end(); ++it)
(*it)->hide();
@@ -158,18 +158,18 @@ KdmItem::inheritFromButton( KdmItem *button )
if (button)
buttonParent = button;
- QValueList<KdmItem *>::Iterator it;
+ TQValueList<KdmItem *>::Iterator it;
for (it = m_children.begin(); it != m_children.end(); ++it)
(*it)->inheritFromButton( button );
}
KdmItem *
-KdmItem::findNode( const QString &_id ) const
+KdmItem::findNode( const TQString &_id ) const
{
if (id == _id)
return const_cast<KdmItem *>( this );
- QValueList<KdmItem *>::ConstIterator it;
+ TQValueList<KdmItem *>::ConstIterator it;
for (it = m_children.begin(); it != m_children.end(); ++it) {
KdmItem *t = (*it)->findNode( _id );
if (t)
@@ -180,7 +180,7 @@ KdmItem::findNode( const QString &_id ) const
}
void
-KdmItem::setWidget( QWidget *widget )
+KdmItem::setWidget( TQWidget *widget )
{
// delete myWidget; -- themer->widget() owns the widgets
@@ -191,13 +191,13 @@ KdmItem::setWidget( QWidget *widget )
myWidget->show();
// Remove borders so that it blends nicely with the theme background
- QFrame* frame = ::qt_cast<QFrame *>( widget );
+ TQFrame* frame = ::qt_cast<TQFrame *>( widget );
if (frame)
- frame->setFrameStyle( QFrame::NoFrame );
+ frame->setFrameStyle( TQFrame::NoFrame );
myWidget->setGeometry(area);
- connect( myWidget, SIGNAL(destroyed()), SLOT(widgetGone()) );
+ connect( myWidget, TQT_SIGNAL(destroyed()), TQT_SLOT(widgetGone()) );
}
void
@@ -207,16 +207,16 @@ KdmItem::widgetGone()
}
void
-KdmItem::setLayoutItem( QLayoutItem *item )
+KdmItem::setLayoutItem( TQLayoutItem *item )
{
myLayoutItem = item;
// XXX hiding not supported - it think it's pointless here
if (myLayoutItem->widget())
- connect( myLayoutItem->widget(), SIGNAL(destroyed()),
- SLOT(layoutItemGone()) );
+ connect( myLayoutItem->widget(), TQT_SIGNAL(destroyed()),
+ TQT_SLOT(layoutItemGone()) );
else if (myLayoutItem->layout())
- connect( myLayoutItem->layout(), SIGNAL(destroyed()),
- SLOT(layoutItemGone()) );
+ connect( myLayoutItem->layout(), TQT_SIGNAL(destroyed()),
+ TQT_SLOT(layoutItemGone()) );
}
void
@@ -227,7 +227,7 @@ KdmItem::layoutItemGone()
/* This is called as a result of KdmLayout::update, and directly on the root */
void
-KdmItem::setGeometry( const QRect &newGeometry, bool force )
+KdmItem::setGeometry( const TQRect &newGeometry, bool force )
{
kdDebug() << " KdmItem::setGeometry " << id << newGeometry << endl;
// check if already 'in place'
@@ -253,7 +253,7 @@ KdmItem::setGeometry( const QRect &newGeometry, bool force )
}
void
-KdmItem::paint( QPainter *p, const QRect &rect )
+KdmItem::paint( TQPainter *p, const TQRect &rect )
{
if (isHidden())
return;
@@ -262,7 +262,7 @@ KdmItem::paint( QPainter *p, const QRect &rect )
return;
if (area.intersects( rect )) {
- QRect contentsRect = area.intersect( rect );
+ TQRect contentsRect = area.intersect( rect );
contentsRect.moveBy( QMIN( 0, -area.x() ), QMIN( 0, -area.y() ) );
drawContents( p, contentsRect );
}
@@ -277,7 +277,7 @@ KdmItem::paint( QPainter *p, const QRect &rect )
return;
// Dispatch paint events to children
- QValueList<KdmItem *>::Iterator it;
+ TQValueList<KdmItem *>::Iterator it;
for (it = m_children.begin(); it != m_children.end(); ++it)
(*it)->paint( p, rect );
}
@@ -316,7 +316,7 @@ KdmItem::mouseEvent( int x, int y, bool pressed, bool released )
}
if (!buttonParent) {
- QValueList<KdmItem *>::Iterator it;
+ TQValueList<KdmItem *>::Iterator it;
for (it = m_children.begin(); it != m_children.end(); ++it)
(*it)->mouseEvent( x, y, pressed, released );
}
@@ -329,7 +329,7 @@ void
KdmItem::statusChanged()
{
if (buttonParent == this) {
- QValueList<KdmItem *>::Iterator it;
+ TQValueList<KdmItem *>::Iterator it;
for (it = m_children.begin(); it != m_children.end(); ++it) {
(*it)->state = state;
(*it)->statusChanged();
@@ -348,14 +348,14 @@ KdmItem::sizeHint()
return myLayoutItem->sizeHint();
int w = pos.wType == DTpixel ? kAbs( pos.width ) : -1,
h = pos.hType == DTpixel ? kAbs( pos.height ) : -1;
- return QSize( w, h );
+ return TQSize( w, h );
}
QRect
-KdmItem::placementHint( const QRect &parentRect )
+KdmItem::placementHint( const TQRect &parentRect )
{
- QSize hintedSize = sizeHint();
- QSize boxHint;
+ TQSize hintedSize = sizeHint();
+ TQSize boxHint;
int x = parentRect.left(),
y = parentRect.top(),
@@ -435,7 +435,7 @@ KdmItem::placementHint( const QRect &parentRect )
x += dx;
// Note: no clipping to parent because this broke many themes!
- return QRect( x, y, w, h );
+ return TQRect( x, y, w, h );
}
// END protected inheritable
@@ -457,12 +457,12 @@ KdmItem::addChildItem( KdmItem *item )
}
// signal bounce from child to parent
- connect( item, SIGNAL(needUpdate( int, int, int, int )), SIGNAL(needUpdate( int, int, int, int )) );
- connect( item, SIGNAL(activated( const QString & )), SIGNAL(activated( const QString & )) );
+ connect( item, TQT_SIGNAL(needUpdate( int, int, int, int )), TQT_SIGNAL(needUpdate( int, int, int, int )) );
+ connect( item, TQT_SIGNAL(activated( const TQString & )), TQT_SIGNAL(activated( const TQString & )) );
}
void
-KdmItem::parseAttribute( const QString &s, int &val, enum DataType &dType )
+KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType )
{
if (s.isEmpty())
return;
@@ -473,13 +473,13 @@ KdmItem::parseAttribute( const QString &s, int &val, enum DataType &dType )
val = 0;
} else if ((p = s.find( '%' )) >= 0) { // percent value
dType = DTpercent;
- QString sCopy = s;
+ TQString sCopy = s;
sCopy.remove( p, 1 );
sCopy.replace( ',', '.' );
val = (int)sCopy.toDouble();
} else { // int value
dType = DTpixel;
- QString sCopy = s;
+ TQString sCopy = s;
if (sCopy.at( 0 ) == '-') {
sCopy.remove( 0, 1 );
dType = DTnpixel;
@@ -490,7 +490,7 @@ KdmItem::parseAttribute( const QString &s, int &val, enum DataType &dType )
}
void
-KdmItem::parseFont( const QString &s, QFont &font )
+KdmItem::parseFont( const TQString &s, TQFont &font )
{
int splitAt = s.findRev( ' ' );
if (splitAt < 1)
@@ -502,19 +502,19 @@ KdmItem::parseFont( const QString &s, QFont &font )
}
void
-KdmItem::parseColor( const QString &s, QColor &color )
+KdmItem::parseColor( const TQString &s, TQColor &color )
{
if (s.at( 0 ) != '#')
return;
bool ok;
- QString sCopy = s;
+ TQString sCopy = s;
int hexColor = sCopy.remove( 0, 1 ).toInt( &ok, 16 );
if (ok)
color.setRgb( hexColor );
}
void
-KdmItem::setBoxLayout( const QDomNode &node )
+KdmItem::setBoxLayout( const TQDomNode &node )
{
if (!boxManager)
boxManager = new KdmLayoutBox( node );
@@ -522,7 +522,7 @@ KdmItem::setBoxLayout( const QDomNode &node )
}
void
-KdmItem::setFixedLayout( const QDomNode &node )
+KdmItem::setFixedLayout( const TQDomNode &node )
{
if (!fixedManager)
fixedManager = new KdmLayoutFixed( node );
diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h
index 66feedd02..9105f8b93 100644
--- a/kdm/kfrontend/themer/kdmitem.h
+++ b/kdm/kfrontend/themer/kdmitem.h
@@ -22,10 +22,10 @@
#ifndef KDMITEM_H
#define KDMITEM_H
-#include <qobject.h>
-#include <qvaluelist.h>
-#include <qrect.h>
-#include <qdom.h>
+#include <tqobject.h>
+#include <tqvaluelist.h>
+#include <tqrect.h>
+#include <tqdom.h>
class KdmItem;
class KdmLayoutBox;
@@ -80,7 +80,7 @@ class QLayoutItem;
* - TODO: send a selective redraw signal also merging children's areas
*/
-class KdmItem : public QObject {
+class KdmItem : public TQObject {
Q_OBJECT
friend class KdmThemer;
@@ -89,7 +89,7 @@ public:
/**
* Item constructor and destructor
*/
- KdmItem( KdmItem *parent, const QDomNode &node = QDomNode(), const char *name = 0 );
+ KdmItem( KdmItem *parent, const TQDomNode &node = TQDomNode(), const char *name = 0 );
virtual ~KdmItem();
/**
@@ -97,14 +97,14 @@ public:
* or boxed ones). Note that this will generate repaint signals
* when needed. The default implementation should fit all needs.
*/
- virtual void setGeometry( const QRect &newGeometry, bool force );
+ virtual void setGeometry( const TQRect &newGeometry, bool force );
/**
* Paint the item and its children using the given painter.
* This is the compositing core function. It buffers paint operations
* to speed up rendering of dynamic objects.
*/
- void paint( QPainter *painter, const QRect &boundaries );
+ void paint( TQPainter *painter, const TQRect &boundaries );
/**
* Update representation of contents and repaint.
@@ -124,45 +124,45 @@ public:
* @param parentGeometry the geometry of the caller item or a
* null rect if the geometry of the parent is not yet defined.
*/
- virtual QRect placementHint( const QRect &parentGeometry );
+ virtual TQRect placementHint( const TQRect &parentGeometry );
/**
* Create the box layout manager; next children will be
* managed by the box layouter
*/
- void setBoxLayout( const QDomNode &node = QDomNode() );
+ void setBoxLayout( const TQDomNode &node = TQDomNode() );
/**
* Create the fixed layout manager; next children will be
* in fixed position relative to this item
*/
- void setFixedLayout( const QDomNode &node = QDomNode() );
+ void setFixedLayout( const TQDomNode &node = TQDomNode() );
- QString type() const { return itemType; }
- void setType( const QString &t ) { itemType = t; }
- void setBaseDir( const QString &bd ) { basedir = bd; }
+ TQString type() const { return itemType; }
+ void setType( const TQString &t ) { itemType = t; }
+ void setBaseDir( const TQString &bd ) { basedir = bd; }
- QString baseDir() const
+ TQString baseDir() const
{
if (basedir.isEmpty() && parent())
return static_cast<KdmItem *>( parent()->qt_cast( "KdmItem" ) )->baseDir();
return basedir;
}
- KdmItem *findNode( const QString &id ) const;
- virtual void setWidget( QWidget *widget );
- virtual void setLayoutItem( QLayoutItem *item );
+ KdmItem *findNode( const TQString &id ) const;
+ virtual void setWidget( TQWidget *widget );
+ virtual void setLayoutItem( TQLayoutItem *item );
virtual void hide( bool force = false );
virtual void show( bool force = false );
bool isHidden() const { return isShown != Shown; }
bool isExplicitlyHidden() const { return isShown == ExplicitlyHidden; }
- QRect rect() const { return area; }
+ TQRect rect() const { return area; }
signals:
void needUpdate( int x, int y, int w, int h );
- void activated( const QString &id );
+ void activated( const TQString &id );
protected slots:
void widgetGone();
@@ -175,7 +175,7 @@ protected:
* @return (-1,-1) if no size can be determined (so it should
* default to parent's size).
*/
- virtual QSize sizeHint();
+ virtual TQSize sizeHint();
/**
* Low level graphical function to paint the item.
@@ -185,7 +185,7 @@ protected:
* @param painter the painter to draw the item with
* @param region the part of the the image to render
*/
- virtual void drawContents( QPainter *painter, const QRect &region ) = 0;
+ virtual void drawContents( TQPainter *painter, const TQRect &region ) = 0;
/**
* Called when item changes its 'state' variable. This must
@@ -209,7 +209,7 @@ protected:
} properties;
// This is the placement of the item
- QRect area;
+ TQRect area;
// This struct is filled in by KdmItem base class
enum DataType { DTnone, DTpixel, DTnpixel, DTpercent, DTbox };
@@ -219,7 +219,7 @@ protected:
int y;
int width;
int height;
- QString anchor;
+ TQString anchor;
} pos;
/* For internal use ONLY
@@ -232,14 +232,14 @@ protected:
* Parse type and value of an attribute (pos tag), a font or a
* color.
*/
- void parseAttribute( const QString &, int &, enum DataType & );
- void parseFont( const QString &, QFont & );
- void parseColor( const QString &, QColor & );
+ void parseAttribute( const TQString &, int &, enum DataType & );
+ void parseFont( const TQString &, TQFont & );
+ void parseColor( const TQString &, TQColor & );
void inheritFromButton( KdmItem *button );
- QString itemType, id;
- QValueList<KdmItem *> m_children;
+ TQString itemType, id;
+ TQValueList<KdmItem *> m_children;
// Layouting related variables
enum { MNone = 0, MFixed = 1, MBox = 2 } currentManager;
@@ -247,13 +247,13 @@ protected:
KdmLayoutFixed *fixedManager;
// Compositing related variables
- QImage *image;
+ TQImage *image;
// defines the directory the theme is in (may be present in the parent)
- QString basedir;
+ TQString basedir;
- QWidget *myWidget;
- QLayoutItem *myLayoutItem;
+ TQWidget *myWidget;
+ TQLayoutItem *myLayoutItem;
enum { InitialHidden, ExplicitlyHidden, Shown } isShown;
diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp
index 41d7e4254..297b7cc48 100644
--- a/kdm/kfrontend/themer/kdmlabel.cpp
+++ b/kdm/kfrontend/themer/kdmlabel.cpp
@@ -27,10 +27,10 @@
#include <kmacroexpander.h>
#include <kdebug.h>
-#include <qdatetime.h>
-#include <qpainter.h>
-#include <qfontmetrics.h>
-#include <qtimer.h>
+#include <tqdatetime.h>
+#include <tqpainter.h>
+#include <tqfontmetrics.h>
+#include <tqtimer.h>
#include <unistd.h>
#include <sys/utsname.h>
@@ -38,7 +38,7 @@
# include <sys/systeminfo.h>
#endif
-KdmLabel::KdmLabel( KdmItem *parent, const QDomNode &node, const char *name )
+KdmLabel::KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name )
: KdmItem( parent, node, name )
{
itemType = "label";
@@ -49,23 +49,23 @@ KdmLabel::KdmLabel( KdmItem *parent, const QDomNode &node, const char *name )
label.prelight.present = false;
label.maximumWidth = -1;
- const QString locale = KGlobal::locale()->language();
+ const TQString locale = KGlobal::locale()->language();
// Read LABEL ID
- QDomNode n = node;
- QDomElement elLab = n.toElement();
+ TQDomNode n = node;
+ TQDomElement elLab = n.toElement();
// ID types: clock, pam-error, pam-message, pam-prompt,
// pam-warning, timed-label
label.id = elLab.attribute( "id", "" );
label.hasId = !(label.id).isEmpty();
// Read LABEL TAGS
- QDomNodeList childList = node.childNodes();
+ TQDomNodeList childList = node.childNodes();
bool stockUsed = false;
for (uint nod = 0; nod < childList.count(); nod++) {
- QDomNode child = childList.item( nod );
- QDomElement el = child.toElement();
- QString tagName = el.tagName();
+ TQDomNode child = childList.item( nod );
+ TQDomElement el = child.toElement();
+ TQString tagName = el.tagName();
if (tagName == "pos")
label.maximumWidth = el.attribute( "max-width", "-1" ).toInt();
@@ -83,7 +83,7 @@ KdmLabel::KdmLabel( KdmItem *parent, const QDomNode &node, const char *name )
} else if (tagName == "text" && el.attributes().count() == 0 && !stockUsed) {
label.text = el.text();
} else if (tagName == "text" && !stockUsed) {
- QString lang = el.attribute( "xml:lang", "" );
+ TQString lang = el.attribute( "xml:lang", "" );
if (lang == locale)
label.text = el.text();
} else if (tagName == "stock") {
@@ -95,15 +95,15 @@ KdmLabel::KdmLabel( KdmItem *parent, const QDomNode &node, const char *name )
// Check if this is a timer label
label.isTimer = label.text.find( "%c" ) >= 0;
if (label.isTimer) {
- timer = new QTimer( this );
+ timer = new TQTimer( this );
timer->start( 1000 );
- connect( timer, SIGNAL(timeout()), SLOT(update()) );
+ connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(update()) );
}
cText = lookupText( label.text );
}
void
-KdmLabel::setText( const QString &txt )
+KdmLabel::setText( const TQString &txt )
{
label.text = txt;
update();
@@ -119,7 +119,7 @@ KdmLabel::sizeHint()
else if (state == Sprelight && label.prelight.present)
l = &label.prelight;
// get the hint from font metrics
- QSize hint = QFontMetrics( l->font ).size( AlignLeft | SingleLine, cText );
+ TQSize hint = TQFontMetrics( l->font ).size( AlignLeft | SingleLine, cText );
// clip the result using the max-width label(pos) parameter
if (label.maximumWidth > 0 && hint.width() > label.maximumWidth)
hint.setWidth( label.maximumWidth );
@@ -127,7 +127,7 @@ KdmLabel::sizeHint()
}
void
-KdmLabel::drawContents( QPainter *p, const QRect &/*r*/ )
+KdmLabel::drawContents( TQPainter *p, const TQRect &/*r*/ )
{
// choose the correct label class
struct LabelStruct::LabelClass *l = &label.normal;
@@ -157,7 +157,7 @@ KdmLabel::statusChanged()
void
KdmLabel::update()
{
- QString text = lookupText( label.text );
+ TQString text = lookupText( label.text );
if (text != cText) {
cText = text;
needUpdate();
@@ -186,10 +186,10 @@ static const struct {
};
QString
-KdmLabel::lookupStock( const QString &stock )
+KdmLabel::lookupStock( const TQString &stock )
{
//FIXME add key accels!
- QString type( stock.lower() );
+ TQString type( stock.lower() );
for (uint i = 0; i < sizeof(stocks)/sizeof(stocks[0]); i++)
if (type == stocks[i].type)
@@ -200,30 +200,30 @@ KdmLabel::lookupStock( const QString &stock )
}
QString
-KdmLabel::lookupText( const QString &t )
+KdmLabel::lookupText( const TQString &t )
{
- QString text = t;
+ TQString text = t;
text.replace( '_', '&' );
// text.remove( '_' ); // FIXME add key accels, remove underscores for now
- QMap<QChar,QString> m;
+ TQMap<TQChar,TQString> m;
struct utsname uts;
uname( &uts );
- m['n'] = QString::fromLocal8Bit( uts.nodename );
+ m['n'] = TQString::fromLocal8Bit( uts.nodename );
char buf[256];
buf[sizeof(buf) - 1] = '\0';
- m['h'] = gethostname( buf, sizeof(buf) - 1 ) ? "localhost" : QString::fromLocal8Bit( buf );
+ m['h'] = gethostname( buf, sizeof(buf) - 1 ) ? "localhost" : TQString::fromLocal8Bit( buf );
#ifdef HAVE_GETDOMAINNAME
- m['o'] = getdomainname( buf, sizeof(buf) - 1 ) ? "localdomain" : QString::fromLocal8Bit( buf );
+ m['o'] = getdomainname( buf, sizeof(buf) - 1 ) ? "localdomain" : TQString::fromLocal8Bit( buf );
#elif defined(HAVE_SYSINFO)
- m['o'] = (unsigned)sysinfo( SI_SRPC_DOMAIN, buf, sizeof(buf) ) > sizeof(buf) ? "localdomain" : QString::fromLocal8Bit( buf );
+ m['o'] = (unsigned)sysinfo( SI_SRPC_DOMAIN, buf, sizeof(buf) ) > sizeof(buf) ? "localdomain" : TQString::fromLocal8Bit( buf );
#endif
- m['d'] = QString::number( KThemedGreeter::timedDelay );
+ m['d'] = TQString::number( KThemedGreeter::timedDelay );
m['s'] = KThemedGreeter::timedUser;
// xgettext:no-c-format
KGlobal::locale()->setDateFormat( i18n("date format", "%a %d %B") );
- m['c'] = KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(), false, false );
+ m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false, false );
return KMacroExpander::expandMacros( text, m );
}
diff --git a/kdm/kfrontend/themer/kdmlabel.h b/kdm/kfrontend/themer/kdmlabel.h
index b80d0189a..93801d594 100644
--- a/kdm/kfrontend/themer/kdmlabel.h
+++ b/kdm/kfrontend/themer/kdmlabel.h
@@ -24,8 +24,8 @@
#include "kdmitem.h"
-#include <qcolor.h>
-#include <qfont.h>
+#include <tqcolor.h>
+#include <tqfont.h>
class QTimer;
@@ -37,45 +37,45 @@ class KdmLabel : public KdmItem {
Q_OBJECT
public:
- KdmLabel( KdmItem *parent, const QDomNode &node, const char *name = 0 );
- void setText( const QString &txt );
+ KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name = 0 );
+ void setText( const TQString &txt );
protected:
// reimplemented; returns the minimum size of rendered text
- virtual QSize sizeHint();
+ virtual TQSize sizeHint();
// draw the label
- virtual void drawContents( QPainter *p, const QRect &r );
+ virtual void drawContents( TQPainter *p, const TQRect &r );
// handle switching between normal / active / prelight configurations
virtual void statusChanged();
struct LabelStruct {
- QString text;
+ TQString text;
bool isTimer;
bool hasId;
- QString id;
+ TQString id;
struct LabelClass {
- QColor color;
- QFont font;
+ TQColor color;
+ TQFont font;
bool present;
} normal, active, prelight;
int maximumWidth;
} label;
- QTimer *timer;
+ TQTimer *timer;
public slots:
void update();
private:
/* Method to lookup the caption associated with an item */
- QString lookupStock( const QString &stock );
+ TQString lookupStock( const TQString &stock );
/* Lookup variables in the text */
- QString lookupText( const QString &t );
+ TQString lookupText( const TQString &t );
- QString cText;
+ TQString cText;
};
#endif
diff --git a/kdm/kfrontend/themer/kdmlayout.cpp b/kdm/kfrontend/themer/kdmlayout.cpp
index ed93be264..00ca693ae 100644
--- a/kdm/kfrontend/themer/kdmlayout.cpp
+++ b/kdm/kfrontend/themer/kdmlayout.cpp
@@ -24,16 +24,16 @@
#include <kdebug.h>
-#include <qdom.h>
-#include <qrect.h>
+#include <tqdom.h>
+#include <tqrect.h>
-KdmLayoutFixed::KdmLayoutFixed( const QDomNode &/*node*/ )
+KdmLayoutFixed::KdmLayoutFixed( const TQDomNode &/*node*/ )
{
//Parsing FIXED parameters on 'node' [NONE!]
}
void
-KdmLayoutFixed::update( const QRect &parentGeometry, bool force )
+KdmLayoutFixed::update( const TQRect &parentGeometry, bool force )
{
kdDebug() << "KdmLayoutFixed::update " << parentGeometry << endl;
@@ -43,15 +43,15 @@ KdmLayoutFixed::update( const QRect &parentGeometry, bool force )
return;
}
// For each child in list I ask their hinted size and set it!
- for (QValueList<KdmItem *>::ConstIterator it = m_children.begin(); it != m_children.end(); ++it)
+ for (TQValueList<KdmItem *>::ConstIterator it = m_children.begin(); it != m_children.end(); ++it)
(*it)->setGeometry( (*it)->placementHint( parentGeometry ), force );
}
-KdmLayoutBox::KdmLayoutBox( const QDomNode &node )
+KdmLayoutBox::KdmLayoutBox( const TQDomNode &node )
{
//Parsing BOX parameters
- QDomNode n = node;
- QDomElement el = n.toElement();
+ TQDomNode n = node;
+ TQDomElement el = n.toElement();
box.isVertical = el.attribute( "orientation", "vertical" ) != "horizontal";
box.xpadding = el.attribute( "xpadding", "0" ).toInt();
box.ypadding = el.attribute( "ypadding", "0" ).toInt();
@@ -62,7 +62,7 @@ KdmLayoutBox::KdmLayoutBox( const QDomNode &node )
}
void
-KdmLayoutBox::update( const QRect &parentGeometry, bool force )
+KdmLayoutBox::update( const TQRect &parentGeometry, bool force )
{
kdDebug() << this << " update " << parentGeometry << endl;
@@ -78,7 +78,7 @@ KdmLayoutBox::update( const QRect &parentGeometry, bool force )
// kdDebug() << this << " hintedSize " << hintedSize << endl;
//XXX why was this asymmetric? it broke things big time.
- QRect childrenRect = /*box.isVertical ? QRect( parentGeometry.topLeft(), hintedSize ) :*/ parentGeometry;
+ TQRect childrenRect = /*box.isVertical ? TQRect( parentGeometry.topLeft(), hintedSize ) :*/ parentGeometry;
// Begin cutting the parent rectangle to attach children on the right place
childrenRect.addCoords( box.xpadding, box.ypadding, -box.xpadding, -box.ypadding );
@@ -87,21 +87,21 @@ KdmLayoutBox::update( const QRect &parentGeometry, bool force )
// For each child in list ...
if (box.homogeneous) {
int ccnt = 0;
- for (QValueList<KdmItem *>::ConstIterator it = m_children.begin(); it != m_children.end(); ++it)
+ for (TQValueList<KdmItem *>::ConstIterator it = m_children.begin(); it != m_children.end(); ++it)
if (!(*it)->isExplicitlyHidden())
ccnt++;
int height = (childrenRect.height() - (ccnt - 1) * box.spacing) / ccnt;
int width = (childrenRect.width() - (ccnt - 1) * box.spacing) / ccnt;
- for (QValueList<KdmItem *>::ConstIterator it = m_children.begin(); it != m_children.end(); ++it) {
+ for (TQValueList<KdmItem *>::ConstIterator it = m_children.begin(); it != m_children.end(); ++it) {
if ((*it)->isExplicitlyHidden())
continue;
if (box.isVertical) {
- QRect temp( childrenRect.left(), childrenRect.top(), childrenRect.width(), height );
+ TQRect temp( childrenRect.left(), childrenRect.top(), childrenRect.width(), height );
(*it)->setGeometry( temp, force );
childrenRect.setTop( childrenRect.top() + height + box.spacing );
} else {
- QRect temp( childrenRect.left(), childrenRect.top(), width, childrenRect.height() );
+ TQRect temp( childrenRect.left(), childrenRect.top(), width, childrenRect.height() );
kdDebug() << "placement " << *it << " " << temp << " " << (*it)->placementHint( temp ) << endl;
temp = (*it)->placementHint( temp );
(*it)->setGeometry( temp, force );
@@ -109,11 +109,11 @@ KdmLayoutBox::update( const QRect &parentGeometry, bool force )
}
}
} else {
- for (QValueList<KdmItem *>::ConstIterator it = m_children.begin(); it != m_children.end(); ++it) {
+ for (TQValueList<KdmItem *>::ConstIterator it = m_children.begin(); it != m_children.end(); ++it) {
if ((*it)->isExplicitlyHidden())
continue;
- QRect temp = childrenRect, itemRect;
+ TQRect temp = childrenRect, itemRect;
if (box.isVertical) {
temp.setHeight( 0 );
itemRect = (*it)->placementHint( temp );
@@ -140,8 +140,8 @@ KdmLayoutBox::sizeHint()
{
// Sum up area taken by children
int w = 0, h = 0;
- for (QValueList<KdmItem *>::ConstIterator it = m_children.begin(); it != m_children.end(); ++it) {
- QSize s = (*it)->placementHint( QRect() ).size();
+ for (TQValueList<KdmItem *>::ConstIterator it = m_children.begin(); it != m_children.end(); ++it) {
+ TQSize s = (*it)->placementHint( TQRect() ).size();
if (box.isVertical) {
if (s.width() > w)
w = s.width();
@@ -162,6 +162,6 @@ KdmLayoutBox::sizeHint()
w += box.spacing * (m_children.count() - 1);
// Make hint at least equal to minimum size (if set)
- return QSize( w < box.minwidth ? box.minwidth : w,
+ return TQSize( w < box.minwidth ? box.minwidth : w,
h < box.minheight ? box.minheight : h );
}
diff --git a/kdm/kfrontend/themer/kdmlayout.h b/kdm/kfrontend/themer/kdmlayout.h
index 2e00675fb..491b20393 100644
--- a/kdm/kfrontend/themer/kdmlayout.h
+++ b/kdm/kfrontend/themer/kdmlayout.h
@@ -27,8 +27,8 @@
* but can be treated like a usual widget
*/
-#include <qvaluelist.h>
-#include <qsize.h>
+#include <tqvaluelist.h>
+#include <tqsize.h>
class KdmItem;
@@ -48,20 +48,20 @@ public:
// Updates the layout of all items knowing that the parent
// has the @p parentGeometry geometry
-// virtual void update( const QRect &parentGeometry ) = 0;
+// virtual void update( const TQRect &parentGeometry ) = 0;
protected:
- QValueList<KdmItem *> m_children;
+ TQValueList<KdmItem *> m_children;
};
class KdmLayoutFixed : public KdmLayout {
public:
- KdmLayoutFixed( const QDomNode &node );
+ KdmLayoutFixed( const TQDomNode &node );
// Updates the layout of all boxed items knowing that the parent
// has the @p parentGeometry geometry
- void update( const QRect &parentGeometry, bool force );
+ void update( const TQRect &parentGeometry, bool force );
};
/**
@@ -72,15 +72,15 @@ public:
class KdmLayoutBox : public KdmLayout {
public:
- KdmLayoutBox( const QDomNode &node );
+ KdmLayoutBox( const TQDomNode &node );
// Updates the layout of all boxed items knowing that they
// should fit into @p parentGeometry container
- void update( const QRect &parentGeometry, bool force );
+ void update( const TQRect &parentGeometry, bool force );
// Computes the size hint of the box, telling which is the
// smallest size inside which boxed items will fit
- QSize sizeHint();
+ TQSize sizeHint();
private:
struct {
@@ -92,7 +92,7 @@ private:
int minheight;
bool homogeneous;
} box;
-// QSize hintedSize;
+// TQSize hintedSize;
};
#endif
diff --git a/kdm/kfrontend/themer/kdmpixmap.cpp b/kdm/kfrontend/themer/kdmpixmap.cpp
index 337c19ced..07077e4a1 100644
--- a/kdm/kfrontend/themer/kdmpixmap.cpp
+++ b/kdm/kfrontend/themer/kdmpixmap.cpp
@@ -30,11 +30,11 @@
#include <kdebug.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qimage.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
-KdmPixmap::KdmPixmap( KdmItem *parent, const QDomNode &node, const char *name )
+KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name )
: KdmItem( parent, node, name )
{
itemType = "pixmap";
@@ -47,15 +47,15 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const QDomNode &node, const char *name )
// Read PIXMAP ID
// it rarely happens that a pixmap can be a button too!
- QDomNode n = node;
- QDomElement elPix = n.toElement();
+ TQDomNode n = node;
+ TQDomElement elPix = n.toElement();
// Read PIXMAP TAGS
- QDomNodeList childList = node.childNodes();
+ TQDomNodeList childList = node.childNodes();
for (uint nod = 0; nod < childList.count(); nod++) {
- QDomNode child = childList.item( nod );
- QDomElement el = child.toElement();
- QString tagName = el.tagName();
+ TQDomNode child = childList.item( nod );
+ TQDomElement el = child.toElement();
+ TQString tagName = el.tagName();
if (tagName == "normal") {
loadPixmap( el.attribute( "file", "" ), pixmap.normal.pixmap, pixmap.normal.fullpath );
@@ -91,7 +91,7 @@ KdmPixmap::sizeHint()
}
void
-KdmPixmap::setGeometry( const QRect &newGeometry, bool force )
+KdmPixmap::setGeometry( const TQRect &newGeometry, bool force )
{
KdmItem::setGeometry( newGeometry, force );
pixmap.active.readyPixmap.resize( 0, 0 );
@@ -101,7 +101,7 @@ KdmPixmap::setGeometry( const QRect &newGeometry, bool force )
void
-KdmPixmap::loadPixmap( const QString &fileName, QPixmap &map, QString &fullName )
+KdmPixmap::loadPixmap( const TQString &fileName, TQPixmap &map, TQString &fullName )
{
if (fileName.isEmpty())
return;
@@ -112,24 +112,24 @@ KdmPixmap::loadPixmap( const QString &fileName, QPixmap &map, QString &fullName
if (!fullName.endsWith( ".svg" )) // we delay it for svgs
if (!map.load( fullName ))
- fullName = QString::null;
+ fullName = TQString::null;
}
void
-KdmPixmap::renderSvg( PixmapStruct::PixmapClass *pClass, const QRect &area )
+KdmPixmap::renderSvg( PixmapStruct::PixmapClass *pClass, const TQRect &area )
{
#ifdef HAVE_LIBART
// Special stuff for SVG icons
KSVGIconEngine *svgEngine = new KSVGIconEngine();
if (svgEngine->load( area.width(), area.height(), pClass->fullpath )) {
- QImage *t = svgEngine->image();
+ TQImage *t = svgEngine->image();
pClass->pixmap = *t;
pClass->readyPixmap.resize( 0, 0 );
delete t;
} else {
kdWarning() << "failed to load " << pClass->fullpath << endl;
- pClass->fullpath = QString::null;
+ pClass->fullpath = TQString::null;
}
delete svgEngine;
@@ -140,7 +140,7 @@ KdmPixmap::renderSvg( PixmapStruct::PixmapClass *pClass, const QRect &area )
}
void
-KdmPixmap::drawContents( QPainter *p, const QRect &r )
+KdmPixmap::drawContents( TQPainter *p, const TQRect &r )
{
// choose the correct pixmap class
PixmapStruct::PixmapClass *pClass = &pixmap.normal;
@@ -176,7 +176,7 @@ KdmPixmap::drawContents( QPainter *p, const QRect &r )
if (pClass->readyPixmap.isNull()) {
- QImage scaledImage;
+ TQImage scaledImage;
// use the loaded pixmap or a scaled version if needed
@@ -187,7 +187,7 @@ KdmPixmap::drawContents( QPainter *p, const QRect &r )
scaledImage = pClass->pixmap.convertToImage();
} else {
kdDebug() << "convertFromImage\n";
- QImage tempImage = pClass->pixmap.convertToImage();
+ TQImage tempImage = pClass->pixmap.convertToImage();
scaledImage = tempImage.smoothScale( area.width(), area.height() );
}
} else
diff --git a/kdm/kfrontend/themer/kdmpixmap.h b/kdm/kfrontend/themer/kdmpixmap.h
index eb621a0a5..479ef0f8d 100644
--- a/kdm/kfrontend/themer/kdmpixmap.h
+++ b/kdm/kfrontend/themer/kdmpixmap.h
@@ -24,8 +24,8 @@
#include "kdmitem.h"
-//#include <qrect.h>
-#include <qpixmap.h>
+//#include <tqrect.h>
+#include <tqpixmap.h>
/*
* KdmPixmap. A pixmap element
@@ -35,26 +35,26 @@ class KdmPixmap : public KdmItem {
Q_OBJECT
public:
- KdmPixmap( KdmItem *parent, const QDomNode &node, const char *name = 0 );
+ KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name = 0 );
protected:
// reimplemented; returns the size of loaded pixmap
- virtual QSize sizeHint();
+ virtual TQSize sizeHint();
// draw the pixmap
- virtual void drawContents( QPainter *p, const QRect &r );
+ virtual void drawContents( TQPainter *p, const TQRect &r );
// handle switching between normal / active / prelight configurations
virtual void statusChanged();
- virtual void setGeometry( const QRect &newGeometry, bool force );
+ virtual void setGeometry( const TQRect &newGeometry, bool force );
struct PixmapStruct {
struct PixmapClass {
- QString fullpath;
- QPixmap pixmap;
- QPixmap readyPixmap;
- QColor tint;
+ TQString fullpath;
+ TQPixmap pixmap;
+ TQPixmap readyPixmap;
+ TQColor tint;
float alpha; //TODO added: not in greeter.dtd
bool present;
} normal, active, prelight;
@@ -62,8 +62,8 @@ protected:
private:
// Method to load the pixmap given by the theme
- void loadPixmap( const QString &fileName, QPixmap &p, QString &path );
- void renderSvg( PixmapStruct::PixmapClass *pClass, const QRect &area );
+ void loadPixmap( const TQString &fileName, TQPixmap &p, TQString &path );
+ void renderSvg( PixmapStruct::PixmapClass *pClass, const TQRect &area );
};
#endif
diff --git a/kdm/kfrontend/themer/kdmrect.cpp b/kdm/kfrontend/themer/kdmrect.cpp
index 478c5c8b3..961809a37 100644
--- a/kdm/kfrontend/themer/kdmrect.cpp
+++ b/kdm/kfrontend/themer/kdmrect.cpp
@@ -25,12 +25,12 @@
#include <kimageeffect.h>
#include <kdebug.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qwidget.h>
-#include <qlayout.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqwidget.h>
+#include <tqlayout.h>
-KdmRect::KdmRect( KdmItem *parent, const QDomNode &node, const char *name )
+KdmRect::KdmRect( KdmItem *parent, const TQDomNode &node, const char *name )
: KdmItem( parent, node, name )
{
itemType = "rect";
@@ -46,28 +46,28 @@ KdmRect::KdmRect( KdmItem *parent, const QDomNode &node, const char *name )
return;
// Read RECT ID
- QDomNode n = node;
- QDomElement elRect = n.toElement();
+ TQDomNode n = node;
+ TQDomElement elRect = n.toElement();
// Read RECT TAGS
- QDomNodeList childList = node.childNodes();
+ TQDomNodeList childList = node.childNodes();
for (uint nod = 0; nod < childList.count(); nod++) {
- QDomNode child = childList.item( nod );
- QDomElement el = child.toElement();
- QString tagName = el.tagName();
+ TQDomNode child = childList.item( nod );
+ TQDomElement el = child.toElement();
+ TQString tagName = el.tagName();
if (tagName == "normal") {
- parseColor( el.attribute( "color", QString::null ), rect.normal.color );
+ parseColor( el.attribute( "color", TQString::null ), rect.normal.color );
rect.normal.alpha = el.attribute( "alpha", "1.0" ).toFloat();
parseFont( el.attribute( "font", "Sans 14" ), rect.normal.font );
} else if (tagName == "active") {
rect.active.present = true;
- parseColor( el.attribute( "color", QString::null ), rect.active.color );
+ parseColor( el.attribute( "color", TQString::null ), rect.active.color );
rect.active.alpha = el.attribute( "alpha", "1.0" ).toFloat();
parseFont( el.attribute( "font", "Sans 14" ), rect.active.font );
} else if (tagName == "prelight") {
rect.prelight.present = true;
- parseColor( el.attribute( "color", QString::null ), rect.prelight.color );
+ parseColor( el.attribute( "color", TQString::null ), rect.prelight.color );
rect.prelight.alpha = el.attribute( "alpha", "1.0" ).toFloat();
parseFont( el.attribute( "font", "Sans 14" ), rect.prelight.font );
} else if (tagName == "border")
@@ -76,7 +76,7 @@ KdmRect::KdmRect( KdmItem *parent, const QDomNode &node, const char *name )
}
void
-KdmRect::drawContents( QPainter *p, const QRect &r )
+KdmRect::drawContents( TQPainter *p, const TQRect &r )
{
// choose the correct rect class
RectStruct::RectClass *rClass = &rect.normal;
@@ -89,13 +89,13 @@ KdmRect::drawContents( QPainter *p, const QRect &r )
return;
if (rClass->alpha == 1)
- p->fillRect( area, QBrush( rClass->color ) );
+ p->fillRect( area, TQBrush( rClass->color ) );
else {
- QRect backRect = r;
+ TQRect backRect = r;
backRect.moveBy( area.x(), area.y() );
- QPixmap backPixmap( backRect.size() );
- bitBlt( &backPixmap, QPoint( 0, 0 ), p->device(), backRect );
- QImage backImage = backPixmap.convertToImage();
+ TQPixmap backPixmap( backRect.size() );
+ bitBlt( &backPixmap, TQPoint( 0, 0 ), p->device(), backRect );
+ TQImage backImage = backPixmap.convertToImage();
KImageEffect::blend( rClass->color, backImage, rClass->alpha );
p->drawImage( backRect.x(), backRect.y(), backImage );
// area.moveBy(1,1);
@@ -116,35 +116,35 @@ KdmRect::statusChanged()
/*
void
-KdmRect::setAttribs( QWidget *widget )
+KdmRect::setAttribs( TQWidget *widget )
{
widget->setFont( rect.normal.font );
}
void
-KdmRect::recursiveSetAttribs( QLayoutItem *li )
+KdmRect::recursiveSetAttribs( TQLayoutItem *li )
{
- QWidget *w;
- QLayout *l;
+ TQWidget *w;
+ TQLayout *l;
if ((w = li->widget()))
setAttribs( w );
else if ((l = li->layout())) {
- QLayoutIterator it = l->iterator();
- for (QLayoutItem *itm = it.current(); itm; itm = ++it)
+ TQLayoutIterator it = l->iterator();
+ for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
recursiveSetAttribs( itm );
}
}
void
-KdmRect::setWidget( QWidget *widget )
+KdmRect::setWidget( TQWidget *widget )
{
KdmItem::setWidget( widget );
setAttribs( widget );
}
void
-KdmRect::setLayoutItem( QLayoutItem *item )
+KdmRect::setLayoutItem( TQLayoutItem *item )
{
KdmItem::setLayoutItem( item );
recursiveSetAttribs( item );
diff --git a/kdm/kfrontend/themer/kdmrect.h b/kdm/kfrontend/themer/kdmrect.h
index 2e89a6a52..7e4776233 100644
--- a/kdm/kfrontend/themer/kdmrect.h
+++ b/kdm/kfrontend/themer/kdmrect.h
@@ -24,8 +24,8 @@
#include "kdmitem.h"
-#include <qcolor.h>
-#include <qfont.h>
+#include <tqcolor.h>
+#include <tqfont.h>
/*
* KdmRect: A themed rectangular element
@@ -35,11 +35,11 @@ class KdmRect : public KdmItem {
Q_OBJECT
public:
- KdmRect( KdmItem *parent, const QDomNode &node, const char *name = 0 );
+ KdmRect( KdmItem *parent, const TQDomNode &node, const char *name = 0 );
protected:
// draw the rect
- virtual void drawContents( QPainter *p, const QRect &r );
+ virtual void drawContents( TQPainter *p, const TQRect &r );
// handle switching between normal / active / prelight configurations
virtual void statusChanged();
@@ -47,19 +47,19 @@ protected:
struct RectStruct {
struct RectClass {
float alpha;
- QColor color;
+ TQColor color;
bool present;
- QFont font;
+ TQFont font;
} normal, active, prelight;
bool hasBorder;
} rect;
-// virtual void setWidget( QWidget *widget );
-// virtual void setLayoutItem( QLayoutItem *item );
+// virtual void setWidget( TQWidget *widget );
+// virtual void setLayoutItem( TQLayoutItem *item );
private:
- void setAttribs( QWidget *widget );
- void recursiveSetAttribs( QLayoutItem *item );
+ void setAttribs( TQWidget *widget );
+ void recursiveSetAttribs( TQLayoutItem *item );
};
#endif
diff --git a/kdm/kfrontend/themer/kdmthemer.cpp b/kdm/kfrontend/themer/kdmthemer.cpp
index 65eebabf4..aca43e45d 100644
--- a/kdm/kfrontend/themer/kdmthemer.cpp
+++ b/kdm/kfrontend/themer/kdmthemer.cpp
@@ -34,21 +34,21 @@
#include <ksimpleconfig.h>
#include <kdebug.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-//#include <qtimer.h> // animation timer - TODO
-#include <qobjectlist.h>
-#include <qpainter.h>
-#include <qwidget.h>
-#include <qregion.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+//#include <tqtimer.h> // animation timer - TODO
+#include <tqobjectlist.h>
+#include <tqpainter.h>
+#include <tqwidget.h>
+#include <tqregion.h>
#include <unistd.h>
/*
* KdmThemer. The main theming interface
*/
-KdmThemer::KdmThemer( const QString &_filename, const QString &mode, QWidget *parent )
- : QObject( parent )
+KdmThemer::KdmThemer( const TQString &_filename, const TQString &mode, TQWidget *parent )
+ : TQObject( parent )
, rootItem( 0 )
, backBuffer( 0 )
{
@@ -56,13 +56,13 @@ KdmThemer::KdmThemer( const QString &_filename, const QString &mode, QWidget *pa
m_currentMode = mode;
// read the XML file and create DOM tree
- QString filename = _filename;
- if (!::access( QFile::encodeName( filename + "/GdmGreeterTheme.desktop" ), R_OK )) {
+ TQString filename = _filename;
+ if (!::access( TQFile::encodeName( filename + "/GdmGreeterTheme.desktop" ), R_OK )) {
KSimpleConfig cfg( filename + "/GdmGreeterTheme.desktop" );
cfg.setGroup( "GdmGreeterTheme" );
filename += '/' + cfg.readEntry( "Greeter" );
}
- QFile opmlFile( filename );
+ TQFile opmlFile( filename );
if (!opmlFile.open( IO_ReadOnly )) {
FDialog::box( widget(), errorbox, i18n( "Cannot open theme file %1" ).arg(filename) );
return;
@@ -72,22 +72,22 @@ KdmThemer::KdmThemer( const QString &_filename, const QString &mode, QWidget *pa
return;
}
// Set the root (screen) item
- rootItem = new KdmRect( 0, QDomNode(), "kdm root" );
- connect( rootItem, SIGNAL(needUpdate( int, int, int, int )),
- widget(), SLOT(update( int, int, int, int )) );
+ rootItem = new KdmRect( 0, TQDomNode(), "kdm root" );
+ connect( rootItem, TQT_SIGNAL(needUpdate( int, int, int, int )),
+ widget(), TQT_SLOT(update( int, int, int, int )) );
- rootItem->setBaseDir( QFileInfo( filename ).dirPath( true ) );
+ rootItem->setBaseDir( TQFileInfo( filename ).dirPath( true ) );
// generate all the items defined in the theme
generateItems( rootItem );
- connect( rootItem, SIGNAL(activated( const QString & )), SIGNAL(activated( const QString & )) );
+ connect( rootItem, TQT_SIGNAL(activated( const TQString & )), TQT_SIGNAL(activated( const TQString & )) );
/* *TODO*
// Animation timer
- QTimer *time = new QTimer( this );
+ TQTimer *time = new TQTimer( this );
time->start( 500 );
- connect( time, SIGNAL(timeout()), SLOT(update()) )
+ connect( time, TQT_SIGNAL(timeout()), TQT_SLOT(update()) )
*/
}
@@ -97,14 +97,14 @@ KdmThemer::~KdmThemer()
delete backBuffer;
}
-inline QWidget *
+inline TQWidget *
KdmThemer::widget()
{
- return static_cast<QWidget *>(parent());
+ return static_cast<TQWidget *>(parent());
}
KdmItem *
-KdmThemer::findNode( const QString &item ) const
+KdmThemer::findNode( const TQString &item ) const
{
return rootItem->findNode( item );
}
@@ -112,53 +112,53 @@ KdmThemer::findNode( const QString &item ) const
void
KdmThemer::updateGeometry( bool force )
{
- rootItem->setGeometry( QRect( QPoint(), widget()->size() ), force );
+ rootItem->setGeometry( TQRect( TQPoint(), widget()->size() ), force );
}
// BEGIN other functions
void
-KdmThemer::widgetEvent( QEvent *e )
+KdmThemer::widgetEvent( TQEvent *e )
{
if (!rootItem)
return;
switch (e->type()) {
- case QEvent::MouseMove:
+ case TQEvent::MouseMove:
{
- QMouseEvent *me = static_cast<QMouseEvent *>(e);
+ TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
rootItem->mouseEvent( me->x(), me->y() );
}
break;
- case QEvent::MouseButtonPress:
+ case TQEvent::MouseButtonPress:
{
- QMouseEvent *me = static_cast<QMouseEvent *>(e);
+ TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
rootItem->mouseEvent( me->x(), me->y(), true );
}
break;
- case QEvent::MouseButtonRelease:
+ case TQEvent::MouseButtonRelease:
{
- QMouseEvent *me = static_cast<QMouseEvent *>(e);
+ TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
rootItem->mouseEvent( me->x(), me->y(), false, true );
}
break;
- case QEvent::Show:
+ case TQEvent::Show:
rootItem->show();
break;
- case QEvent::Resize:
+ case TQEvent::Resize:
updateGeometry( false );
showStructure( rootItem );
break;
- case QEvent::Paint:
+ case TQEvent::Paint:
{
- QRect paintRect = static_cast<QPaintEvent *>(e)->rect();
+ TQRect paintRect = static_cast<TQPaintEvent *>(e)->rect();
kdDebug() << "paint on: " << paintRect << endl;
if (!backBuffer)
- backBuffer = new QPixmap( widget()->size() );
+ backBuffer = new TQPixmap( widget()->size() );
if (backBuffer->size() != widget()->size())
backBuffer->resize( widget()->size() );
- QPainter p;
+ TQPainter p;
p.begin( backBuffer );
rootItem->paint( &p, paintRect );
p.end();
@@ -173,25 +173,25 @@ KdmThemer::widgetEvent( QEvent *e )
/*
void
-KdmThemer::pixmap( const QRect &r, QPixmap *px )
+KdmThemer::pixmap( const TQRect &r, TQPixmap *px )
{
- bitBlt( px, QPoint( 0, 0 ), widget(), r );
+ bitBlt( px, TQPoint( 0, 0 ), widget(), r );
}
*/
void
-KdmThemer::generateItems( KdmItem *parent, const QDomNode &node )
+KdmThemer::generateItems( KdmItem *parent, const TQDomNode &node )
{
if (!parent)
return;
- QDomNodeList subnodeList; //List of subnodes of this node
+ TQDomNodeList subnodeList; //List of subnodes of this node
/*
* Get the child nodes
*/
if (node.isNull()) { // It's the first node, get its child nodes
- QDomElement theme = domTree.documentElement();
+ TQDomElement theme = domTree.documentElement();
// Get its tag, and check it's correct ("greeter")
if (theme.tagName() != "greeter") {
@@ -207,15 +207,15 @@ KdmThemer::generateItems( KdmItem *parent, const QDomNode &node )
* Go through each of the child nodes
*/
for (uint nod = 0; nod < subnodeList.count(); nod++) {
- QDomNode subnode = subnodeList.item( nod );
- QDomElement el = subnode.toElement();
- QString tagName = el.tagName();
+ TQDomNode subnode = subnodeList.item( nod );
+ TQDomElement el = subnode.toElement();
+ TQString tagName = el.tagName();
if (tagName == "item") {
if (!willDisplay( subnode ))
continue;
// It's a new item. Draw it
- QString type = el.attribute( "type" );
+ TQString type = el.attribute( "type" );
KdmItem *newItem = 0;
@@ -255,26 +255,26 @@ KdmThemer::generateItems( KdmItem *parent, const QDomNode &node )
}
}
-bool KdmThemer::willDisplay( const QDomNode &node )
+bool KdmThemer::willDisplay( const TQDomNode &node )
{
- QDomNode showNode = node.namedItem( "show" );
+ TQDomNode showNode = node.namedItem( "show" );
// No "show" node means this item can be displayed at all times
if (showNode.isNull())
return true;
- QDomElement el = showNode.toElement();
+ TQDomElement el = showNode.toElement();
- QString modes = el.attribute( "modes" );
+ TQString modes = el.attribute( "modes" );
if (!modes.isNull()) {
- QStringList modeList = QStringList::split( ",", modes );
+ TQStringList modeList = TQStringList::split( ",", modes );
// If current mode isn't in this list, do not display item
if (modeList.find( m_currentMode ) == modeList.end())
return false;
}
- QString type = el.attribute( "type" );
+ TQString type = el.attribute( "type" );
if (type == "config" || type == "suspend")
return false; // not implemented (yet)
if (type == "timed")
@@ -295,21 +295,21 @@ bool KdmThemer::willDisplay( const QDomNode &node )
}
void
-KdmThemer::showStructure( QObject *obj )
+KdmThemer::showStructure( TQObject *obj )
{
- const QObjectList *wlist = obj->children();
+ const TQObjectList *wlist = obj->children();
static int counter = 0;
if (counter == 0)
kdDebug() << "\n\n<======= Widget tree =================" << endl;
if (wlist) {
counter++;
- QObjectListIterator it( *wlist );
- QObject *object;
+ TQObjectListIterator it( *wlist );
+ TQObject *object;
while ((object = it.current()) != 0) {
++it;
- QString node;
+ TQString node;
for (int i = 1; i < counter; i++)
node += "-";
diff --git a/kdm/kfrontend/themer/kdmthemer.h b/kdm/kfrontend/themer/kdmthemer.h
index 34baffbb7..cd93c3c8c 100644
--- a/kdm/kfrontend/themer/kdmthemer.h
+++ b/kdm/kfrontend/themer/kdmthemer.h
@@ -22,8 +22,8 @@
#ifndef KDMTHEMER_H
#define KDMTHEMER_H
-#include <qobject.h>
-#include <qdom.h>
+#include <tqobject.h>
+#include <tqdom.h>
class KdmThemer;
class KdmItem;
@@ -47,7 +47,7 @@ class QEvent;
*/
-class KdmThemer : public QObject {
+class KdmThemer : public TQObject {
Q_OBJECT
public:
@@ -55,41 +55,41 @@ public:
* Construct and destruct the interface
*/
- KdmThemer( const QString &path, const QString &mode, QWidget *parent );
+ KdmThemer( const TQString &path, const TQString &mode, TQWidget *parent );
~KdmThemer();
bool isOK() { return rootItem != 0; }
/*
* Gives a sizeHint to the widget (parent size)
*/
- //QSize sizeHint() const{ return parentWidget()->size(); }
+ //TQSize sizeHint() const{ return parentWidget()->size(); }
/*
* Takes a shot of the current widget
*/
-// void pixmap( const QRect &r, QPixmap *px );
+// void pixmap( const TQRect &r, TQPixmap *px );
virtual // just to put the reference in the vmt
- KdmItem *findNode( const QString & ) const;
+ KdmItem *findNode( const TQString & ) const;
void updateGeometry( bool force ); // force = true for external calls
// must be called by parent widget
- void widgetEvent( QEvent *e );
+ void widgetEvent( TQEvent *e );
signals:
- void activated( const QString &id );
+ void activated( const TQString &id );
private:
/*
* Our display mode (e.g. console, remote, ...)
*/
- QString m_currentMode;
+ TQString m_currentMode;
/*
* The config file being used
*/
- QDomDocument domTree;
+ TQDomDocument domTree;
/*
* Stores the root of the theme
@@ -99,24 +99,24 @@ private:
/*
* The backbuffer
*/
- QPixmap *backBuffer;
+ TQPixmap *backBuffer;
// methods
/*
* Test whether item needs to be displayed
*/
- bool willDisplay( const QDomNode &node );
+ bool willDisplay( const TQDomNode &node );
/*
* Parses the XML file looking for the
* item list and adds those to the themer
*/
- void generateItems( KdmItem *parent = 0, const QDomNode &node = QDomNode() );
+ void generateItems( KdmItem *parent = 0, const TQDomNode &node = TQDomNode() );
- void showStructure( QObject *obj );
+ void showStructure( TQObject *obj );
- QWidget *widget();
+ TQWidget *widget();
};
diff --git a/kdmlib/dmctl.cpp b/kdmlib/dmctl.cpp
index cd20ee4ab..58d4f8379 100644
--- a/kdmlib/dmctl.cpp
+++ b/kdmlib/dmctl.cpp
@@ -24,7 +24,7 @@
#include <klocale.h>
#include <dcopclient.h>
-#include <qregexp.h>
+#include <tqregexp.h>
#include <X11/Xauth.h>
#include <X11/Xlib.h>
@@ -90,7 +90,7 @@ DM::DM() : fd( -1 )
break;
case OldKDM:
{
- QString tf( ctl );
+ TQString tf( ctl );
tf.truncate( tf.find( ',' ) );
fd = ::open( tf.latin1(), O_WRONLY );
}
@@ -107,7 +107,7 @@ DM::~DM()
bool
DM::exec( const char *cmd )
{
- QCString buf;
+ TQCString buf;
return exec( cmd, buf );
}
@@ -125,7 +125,7 @@ DM::exec( const char *cmd )
* from KDM.
*/
bool
-DM::exec( const char *cmd, QCString &buf )
+DM::exec( const char *cmd, TQCString &buf )
{
bool ret = false;
int tl;
@@ -175,7 +175,7 @@ DM::canShutdown()
if (DMType == OldKDM)
return strstr( ctl, ",maysd" ) != 0;
- QCString re;
+ TQCString re;
if (DMType == GDM)
return exec( "QUERY_LOGOUT_ACTION\n", re ) && re.find("HALT") >= 0;
@@ -186,14 +186,14 @@ DM::canShutdown()
void
DM::shutdown( KApplication::ShutdownType shutdownType,
KApplication::ShutdownMode shutdownMode, /* NOT Default */
- const QString &bootOption )
+ const TQString &bootOption )
{
if (shutdownType == KApplication::ShutdownTypeNone)
return;
bool cap_ask;
if (DMType == NewKDM) {
- QCString re;
+ TQCString re;
cap_ask = exec( "caps\n", re ) && re.find( "\tshutdown ask" ) >= 0;
} else {
if (!bootOption.isEmpty())
@@ -203,7 +203,7 @@ DM::shutdown( KApplication::ShutdownType shutdownType,
if (!cap_ask && shutdownMode == KApplication::ShutdownModeInteractive)
shutdownMode = KApplication::ShutdownModeForceNow;
- QCString cmd;
+ TQCString cmd;
if (DMType == GDM) {
cmd.append( shutdownMode == KApplication::ShutdownModeForceNow ?
"SET_LOGOUT_ACTION " : "SET_SAFE_LOGOUT_ACTION " );
@@ -226,16 +226,16 @@ DM::shutdown( KApplication::ShutdownType shutdownType,
}
bool
-DM::bootOptions( QStringList &opts, int &defopt, int &current )
+DM::bootOptions( TQStringList &opts, int &defopt, int &current )
{
if (DMType != NewKDM)
return false;
- QCString re;
+ TQCString re;
if (!exec( "listbootoptions\n", re ))
return false;
- opts = QStringList::split( '\t', QString::fromLocal8Bit( re.data() ) );
+ opts = TQStringList::split( '\t', TQString::fromLocal8Bit( re.data() ) );
if (opts.size() < 4)
return false;
@@ -247,8 +247,8 @@ DM::bootOptions( QStringList &opts, int &defopt, int &current )
if (!ok)
return false;
- opts = QStringList::split( ' ', opts[1] );
- for (QStringList::Iterator it = opts.begin(); it != opts.end(); ++it)
+ opts = TQStringList::split( ' ', opts[1] );
+ for (TQStringList::Iterator it = opts.begin(); it != opts.end(); ++it)
(*it).replace( "\\s", " " );
return true;
@@ -270,7 +270,7 @@ DM::isSwitchable()
if (DMType == GDM)
return exec( "QUERY_VT\n" );
- QCString re;
+ TQCString re;
return exec( "caps\n", re ) && re.find( "\tlocal" ) >= 0;
}
@@ -284,7 +284,7 @@ DM::numReserve()
if (DMType == OldKDM)
return strstr( ctl, ",rsvd" ) ? 1 : -1;
- QCString re;
+ TQCString re;
int p;
if (!(exec( "caps\n", re ) && (p = re.find( "\treserve " )) >= 0))
@@ -307,14 +307,14 @@ DM::localSessions( SessList &list )
if (DMType == OldKDM)
return false;
- QCString re;
+ TQCString re;
if (DMType == GDM) {
if (!exec( "CONSOLE_SERVERS\n", re ))
return false;
- QStringList sess = QStringList::split( QChar(';'), re.data() + 3 );
- for (QStringList::ConstIterator it = sess.begin(); it != sess.end(); ++it) {
- QStringList ts = QStringList::split( QChar(','), *it, true );
+ TQStringList sess = TQStringList::split( TQChar(';'), re.data() + 3 );
+ for (TQStringList::ConstIterator it = sess.begin(); it != sess.end(); ++it) {
+ TQStringList ts = TQStringList::split( TQChar(','), *it, true );
SessEnt se;
se.display = ts[0];
se.user = ts[1];
@@ -327,9 +327,9 @@ DM::localSessions( SessList &list )
} else {
if (!exec( "list\talllocal\n", re ))
return false;
- QStringList sess = QStringList::split( QChar('\t'), re.data() + 3 );
- for (QStringList::ConstIterator it = sess.begin(); it != sess.end(); ++it) {
- QStringList ts = QStringList::split( QChar(','), *it, true );
+ TQStringList sess = TQStringList::split( TQChar('\t'), re.data() + 3 );
+ for (TQStringList::ConstIterator it = sess.begin(); it != sess.end(); ++it) {
+ TQStringList ts = TQStringList::split( TQChar(','), *it, true );
SessEnt se;
se.display = ts[0];
if (ts[1][0] == '@')
@@ -347,11 +347,11 @@ DM::localSessions( SessList &list )
}
void
-DM::sess2Str2( const SessEnt &se, QString &user, QString &loc )
+DM::sess2Str2( const SessEnt &se, TQString &user, TQString &loc )
{
if (se.tty) {
user = i18n("user: ...", "%1: TTY login").arg( se.user );
- loc = se.vt ? QString("vt%1").arg( se.vt ) : se.display ;
+ loc = se.vt ? TQString("vt%1").arg( se.vt ) : se.display ;
} else {
user =
se.user.isEmpty() ?
@@ -366,7 +366,7 @@ DM::sess2Str2( const SessEnt &se, QString &user, QString &loc )
.arg( se.user ).arg( se.session );
loc =
se.vt ?
- QString("%1, vt%2").arg( se.display ).arg( se.vt ) :
+ TQString("%1, vt%2").arg( se.display ).arg( se.vt ) :
se.display;
}
}
@@ -374,7 +374,7 @@ DM::sess2Str2( const SessEnt &se, QString &user, QString &loc )
QString
DM::sess2Str( const SessEnt &se )
{
- QString user, loc;
+ TQString user, loc;
sess2Str2( se, user, loc );
return i18n("session (location)", "%1 (%2)").arg( user ).arg( loc );
@@ -384,9 +384,9 @@ bool
DM::switchVT( int vt )
{
if (DMType == GDM)
- return exec( QString("SET_VT %1\n").arg(vt).latin1() );
+ return exec( TQString("SET_VT %1\n").arg(vt).latin1() );
- return exec( QString("activate\tvt%1\n").arg(vt).latin1() );
+ return exec( TQString("activate\tvt%1\n").arg(vt).latin1() );
}
void
@@ -404,7 +404,7 @@ DM::GDMAuthenticate()
int dnl;
Xauth *xau;
- dpy = DisplayString( QPaintDevice::x11AppDisplay() );
+ dpy = DisplayString( TQPaintDevice::x11AppDisplay() );
if (!dpy) {
dpy = ::getenv( "DISPLAY" );
if (!dpy)
@@ -424,9 +424,9 @@ DM::GDMAuthenticate()
xau->data_length == 16 &&
xau->name_length == 18 && !memcmp( xau->name, "MIT-MAGIC-COOKIE-1", 18 ))
{
- QString cmd( "AUTH_LOCAL " );
+ TQString cmd( "AUTH_LOCAL " );
for (int i = 0; i < 16; i++)
- cmd += QString::number( (uchar)xau->data[i], 16 ).rightJustify( 2, '0');
+ cmd += TQString::number( (uchar)xau->data[i], 16 ).rightJustify( 2, '0');
cmd += "\n";
if (exec( cmd.latin1() )) {
XauDisposeAuth( xau );
diff --git a/kdmlib/dmctl.h b/kdmlib/dmctl.h
index aadc89bdb..da5aa2b0b 100644
--- a/kdmlib/dmctl.h
+++ b/kdmlib/dmctl.h
@@ -24,12 +24,12 @@
#include <kapplication.h>
struct SessEnt {
- QString display, from, user, session;
+ TQString display, from, user, session;
int vt;
bool self:1, tty:1;
};
-typedef QValueList<SessEnt> SessList;
+typedef TQValueList<SessEnt> SessList;
class DM {
@@ -42,7 +42,7 @@ public:
bool canShutdown();
void shutdown( KApplication::ShutdownType shutdownType,
KApplication::ShutdownMode shutdownMode,
- const QString &bootOption = QString::null );
+ const TQString &bootOption = TQString::null );
void setLock( bool on );
@@ -53,15 +53,15 @@ public:
bool switchVT( int vt );
void lockSwitchVT( int vt );
- bool bootOptions( QStringList &opts, int &dflt, int &curr );
+ bool bootOptions( TQStringList &opts, int &dflt, int &curr );
- static QString sess2Str( const SessEnt &se );
- static void sess2Str2( const SessEnt &se, QString &user, QString &loc );
+ static TQString sess2Str( const SessEnt &se );
+ static void sess2Str2( const SessEnt &se, TQString &user, TQString &loc );
private:
int fd;
- bool exec( const char *cmd, QCString &ret );
+ bool exec( const char *cmd, TQCString &ret );
bool exec( const char *cmd );
void GDMAuthenticate();
@@ -74,7 +74,7 @@ public:
bool canShutdown() { return false; }
void shutdown( KApplication::ShutdownType shutdownType,
KApplication::ShutdownMode shutdownMode,
- const QString &bootOption = QString::null ) {}
+ const TQString &bootOption = TQString::null ) {}
void setLock( bool ) {}
@@ -84,7 +84,7 @@ public:
bool localSessions( SessList &list ) { return false; }
void switchVT( int vt ) {}
- bool bootOptions( QStringList &opts, int &dflt, int &curr );
+ bool bootOptions( TQStringList &opts, int &dflt, int &curr );
#endif // Q_WS_X11
diff --git a/kdmlib/kgreet_classic.cpp b/kdmlib/kgreet_classic.cpp
index b38e979d0..fd2e65bd8 100644
--- a/kdmlib/kgreet_classic.cpp
+++ b/kdmlib/kgreet_classic.cpp
@@ -31,26 +31,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kpassdlg.h>
#include <kuser.h>
-#include <qregexp.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqregexp.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
class KDMPasswordEdit : public KPasswordEdit {
public:
- KDMPasswordEdit( QWidget *parent ) : KPasswordEdit( parent, 0 ) {}
- KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, QWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
+ KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}
+ KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
protected:
- virtual void contextMenuEvent( QContextMenuEvent * ) {}
+ virtual void contextMenuEvent( TQContextMenuEvent * ) {}
};
static int echoMode;
KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
KdmThemer *themer,
- QWidget *parent, QWidget *pred,
- const QString &_fixedEntity,
+ TQWidget *parent, TQWidget *pred,
+ const TQString &_fixedEntity,
Function _func, Context _ctx ) :
- QObject(),
+ TQObject(),
KGreeterPlugin( _handler ),
fixedUser( _fixedEntity ),
func( _func ),
@@ -60,7 +60,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
running( false )
{
KdmItem *user_entry = 0, *pw_entry = 0;
- QGridLayout *grid = 0;
+ TQGridLayout *grid = 0;
int line = 0;
layoutItem = 0;
@@ -71,7 +71,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
themer = 0;
if (!themer)
- layoutItem = grid = new QGridLayout( 0, 0, 10 );
+ layoutItem = grid = new TQGridLayout( 0, 0, 10 );
loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
loginEdit = 0;
@@ -82,10 +82,10 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
if (fixedUser.isEmpty()) {
loginEdit = new KLineEdit( parent );
loginEdit->setContextMenuEnabled( false );
- connect( loginEdit, SIGNAL(lostFocus()), SLOT(slotLoginLostFocus()) );
- connect( loginEdit, SIGNAL(lostFocus()), SLOT(slotActivity()) );
- connect( loginEdit, SIGNAL(textChanged( const QString & )), SLOT(slotActivity()) );
- connect( loginEdit, SIGNAL(selectionChanged()), SLOT(slotActivity()) );
+ connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) );
+ connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+ connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) );
+ connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) );
if (pred) {
parent->setTabOrder( pred, loginEdit );
pred = loginEdit;
@@ -94,23 +94,23 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
loginEdit->adjustSize();
user_entry->setWidget( loginEdit );
} else {
- loginLabel = new QLabel( loginEdit, i18n("&Username:"), parent );
+ loginLabel = new TQLabel( loginEdit, i18n("&Username:"), parent );
grid->addWidget( loginLabel, line, 0 );
grid->addWidget( loginEdit, line++, 1 );
}
} else if (ctx != Login && ctx != Shutdown && grid) {
- loginLabel = new QLabel( i18n("Username:"), parent );
+ loginLabel = new TQLabel( i18n("Username:"), parent );
grid->addWidget( loginLabel, line, 0 );
- grid->addWidget( new QLabel( fixedUser, parent ), line++, 1 );
+ grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 );
}
if (echoMode == -1)
passwdEdit = new KDMPasswordEdit( parent );
else
passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
parent );
- connect( passwdEdit, SIGNAL(textChanged( const QString & )),
- SLOT(slotActivity()) );
- connect( passwdEdit, SIGNAL(lostFocus()), SLOT(slotActivity()) );
+ connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
+ TQT_SLOT(slotActivity()) );
+ connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
if (pred) {
parent->setTabOrder( pred, passwdEdit );
pred = passwdEdit;
@@ -119,7 +119,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
passwdEdit->adjustSize();
pw_entry->setWidget( passwdEdit );
} else {
- passwdLabel = new QLabel( passwdEdit,
+ passwdLabel = new TQLabel( passwdEdit,
func == Authenticate ?
i18n("&Password:") :
i18n("Current &password:"),
@@ -140,8 +140,8 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
passwd1Edit = new KDMPasswordEdit( parent );
passwd2Edit = new KDMPasswordEdit( parent );
}
- passwd1Label = new QLabel( passwd1Edit, i18n("&New password:"), parent );
- passwd2Label = new QLabel( passwd2Edit, i18n("Con&firm password:"), parent );
+ passwd1Label = new TQLabel( passwd1Edit, i18n("&New password:"), parent );
+ passwd2Label = new TQLabel( passwd2Edit, i18n("Con&firm password:"), parent );
if (pred) {
parent->setTabOrder( pred, passwd1Edit );
parent->setTabOrder( passwd1Edit, passwd2Edit );
@@ -166,14 +166,14 @@ KClassicGreeter::~KClassicGreeter()
delete passwdEdit;
return;
}
- QLayoutIterator it = static_cast<QLayout *>(layoutItem)->iterator();
- for (QLayoutItem *itm = it.current(); itm; itm = ++it)
+ TQLayoutIterator it = static_cast<TQLayout *>(layoutItem)->iterator();
+ for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget();
delete layoutItem;
}
void // virtual
-KClassicGreeter::loadUsers( const QStringList &users )
+KClassicGreeter::loadUsers( const TQStringList &users )
{
KCompletion *userNamesCompletion = new KCompletion;
userNamesCompletion->setItems( users );
@@ -183,7 +183,7 @@ KClassicGreeter::loadUsers( const QStringList &users )
}
void // virtual
-KClassicGreeter::presetEntity( const QString &entity, int field )
+KClassicGreeter::presetEntity( const TQString &entity, int field )
{
loginEdit->setText( entity );
if (field == 1)
@@ -200,14 +200,14 @@ KClassicGreeter::presetEntity( const QString &entity, int field )
curUser = entity;
}
-QString // virtual
+TQString // virtual
KClassicGreeter::getEntity() const
{
return fixedUser.isEmpty() ? loginEdit->text() : fixedUser;
}
void // virtual
-KClassicGreeter::setUser( const QString &user )
+KClassicGreeter::setUser( const TQString &user )
{
// assert( fixedUser.isEmpty() );
curUser = user;
@@ -259,7 +259,7 @@ bool // virtual
KClassicGreeter::textMessage( const char *text, bool err )
{
if (!err &&
- QString( text ).find( QRegExp( "^Changing password for [^ ]+$" ) ) >= 0)
+ TQString( text ).find( TQRegExp( "^Changing password for [^ ]+$" ) ) >= 0)
return true;
return false;
}
@@ -273,21 +273,21 @@ KClassicGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
else if (!authTok)
exp = 1;
else {
- QString pr( prompt );
- if (pr.find( QRegExp( "\\bpassword\\b", false ) ) >= 0) {
- if (pr.find( QRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b",
+ TQString pr( prompt );
+ if (pr.find( TQRegExp( "\\bpassword\\b", false ) ) >= 0) {
+ if (pr.find( TQRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b",
false ) ) >= 0)
exp = 3;
- else if (pr.find( QRegExp( "\\bnew\\b", false ) ) >= 0)
+ else if (pr.find( TQRegExp( "\\bnew\\b", false ) ) >= 0)
exp = 2;
- else { // QRegExp( "\\b(old|current)\\b", false ) is too strict
+ else { // TQRegExp( "\\b(old|current)\\b", false ) is too strict
handler->gplugReturnText( "",
KGreeterPluginHandler::IsOldPassword |
KGreeterPluginHandler::IsSecret );
return;
}
} else {
- handler->gplugMsgBox( QMessageBox::Critical,
+ handler->gplugMsgBox( TQMessageBox::Critical,
i18n("Unrecognized prompt \"%1\"")
.arg( prompt ) );
handler->gplugReturnText( 0, 0 );
@@ -422,7 +422,7 @@ KClassicGreeter::clear()
if (loginEdit) {
loginEdit->clear();
loginEdit->setFocus();
- curUser = QString::null;
+ curUser = TQString::null;
} else
passwdEdit->setFocus();
}
@@ -472,11 +472,11 @@ KClassicGreeter::slotActivity()
// factory
-static bool init( const QString &,
- QVariant (*getConf)( void *, const char *, const QVariant & ),
+static bool init( const TQString &,
+ TQVariant (*getConf)( void *, const char *, const TQVariant & ),
void *ctx )
{
- echoMode = getConf( ctx, "EchoMode", QVariant( -1 ) ).toInt();
+ echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
KGlobal::locale()->insertCatalogue( "kgreet_classic" );
return true;
}
@@ -488,8 +488,8 @@ static void done( void )
static KGreeterPlugin *
create( KGreeterPluginHandler *handler, KdmThemer *themer,
- QWidget *parent, QWidget *predecessor,
- const QString &fixedEntity,
+ TQWidget *parent, TQWidget *predecessor,
+ const TQString &fixedEntity,
KGreeterPlugin::Function func,
KGreeterPlugin::Context ctx )
{
diff --git a/kdmlib/kgreet_classic.h b/kdmlib/kgreet_classic.h
index 64d39799a..788df8493 100644
--- a/kdmlib/kgreet_classic.h
+++ b/kdmlib/kgreet_classic.h
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "kgreeterplugin.h"
-#include <qobject.h>
+#include <tqobject.h>
class KLineEdit;
class KPasswordEdit;
@@ -36,20 +36,20 @@ class KSimpleConfig;
class QGridLayout;
class QLabel;
-class KClassicGreeter : public QObject, public KGreeterPlugin {
+class KClassicGreeter : public TQObject, public KGreeterPlugin {
Q_OBJECT
public:
KClassicGreeter( KGreeterPluginHandler *handler,
KdmThemer *themer,
- QWidget *parent, QWidget *predecessor,
- const QString &fixedEntitiy,
+ TQWidget *parent, TQWidget *predecessor,
+ const TQString &fixedEntitiy,
Function func, Context ctx );
~KClassicGreeter();
- virtual void loadUsers( const QStringList &users );
- virtual void presetEntity( const QString &entity, int field );
- virtual QString getEntity() const;
- virtual void setUser( const QString &user );
+ virtual void loadUsers( const TQStringList &users );
+ virtual void presetEntity( const TQString &entity, int field );
+ virtual TQString getEntity() const;
+ virtual void setUser( const TQString &user );
virtual void setEnabled( bool on );
virtual bool textMessage( const char *message, bool error );
virtual void textPrompt( const char *prompt, bool echo, bool nonBlocking );
@@ -73,11 +73,11 @@ class KClassicGreeter : public QObject, public KGreeterPlugin {
void setActive2( bool enable );
void returnData();
- QLabel *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label;
+ TQLabel *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label;
KLineEdit *loginEdit;
KPasswordEdit *passwdEdit, *passwd1Edit, *passwd2Edit;
KSimpleConfig *stsFile;
- QString fixedUser, curUser;
+ TQString fixedUser, curUser;
Function func;
Context ctx;
int exp, pExp, has;
diff --git a/kdmlib/kgreet_winbind.cpp b/kdmlib/kgreet_winbind.cpp
index eeef08b01..5f6530707 100644
--- a/kdmlib/kgreet_winbind.cpp
+++ b/kdmlib/kgreet_winbind.cpp
@@ -34,27 +34,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kuser.h>
#include <kprocio.h>
-#include <qregexp.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqregexp.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
#include <stdlib.h>
class KDMPasswordEdit : public KPasswordEdit {
public:
- KDMPasswordEdit( QWidget *parent ) : KPasswordEdit( parent, 0 ) {}
- KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, QWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
+ KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}
+ KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
protected:
- virtual void contextMenuEvent( QContextMenuEvent * ) {}
+ virtual void contextMenuEvent( TQContextMenuEvent * ) {}
};
static int echoMode;
static char separator;
-static QStringList staticDomains;
-static QString defaultDomain;
+static TQStringList staticDomains;
+static TQString defaultDomain;
static void
-splitEntity( const QString &ent, QString &dom, QString &usr )
+splitEntity( const TQString &ent, TQString &dom, TQString &usr )
{
int pos = ent.find( separator );
if (pos < 0)
@@ -65,10 +65,10 @@ splitEntity( const QString &ent, QString &dom, QString &usr )
KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
KdmThemer *themer,
- QWidget *parent, QWidget *pred,
- const QString &_fixedEntity,
+ TQWidget *parent, TQWidget *pred,
+ const TQString &_fixedEntity,
Function _func, Context _ctx ) :
- QObject(),
+ TQObject(),
KGreeterPlugin( _handler ),
func( _func ),
ctx( _ctx ),
@@ -77,7 +77,7 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
running( false )
{
KdmItem *user_entry = 0, *pw_entry = 0, *domain_entry = 0;
- QGridLayout *grid = 0;
+ TQGridLayout *grid = 0;
int line = 0;
layoutItem = 0;
@@ -89,7 +89,7 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
themer = 0;
if (!themer)
- layoutItem = grid = new QGridLayout( 0, 0, 10 );
+ layoutItem = grid = new TQGridLayout( 0, 0, 10 );
domainLabel = loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
domainCombo = 0;
@@ -103,12 +103,12 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
if (func != ChAuthTok) {
if (fixedUser.isEmpty()) {
domainCombo = new KComboBox( parent );
- connect( domainCombo, SIGNAL(activated( const QString & )),
- SLOT(slotChangedDomain( const QString & )) );
- connect( domainCombo, SIGNAL(activated( const QString & )),
- SLOT(slotLoginLostFocus()) );
- connect( domainCombo, SIGNAL(activated( const QString & )),
- SLOT(slotActivity()) );
+ connect( domainCombo, TQT_SIGNAL(activated( const TQString & )),
+ TQT_SLOT(slotChangedDomain( const TQString & )) );
+ connect( domainCombo, TQT_SIGNAL(activated( const TQString & )),
+ TQT_SLOT(slotLoginLostFocus()) );
+ connect( domainCombo, TQT_SIGNAL(activated( const TQString & )),
+ TQT_SLOT(slotActivity()) );
// should handle loss of focus
loginEdit = new KLineEdit( parent );
loginEdit->setContextMenuEnabled( false );
@@ -124,42 +124,42 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
user_entry->setWidget( loginEdit );
domain_entry->setWidget( domainCombo );
} else {
- domainLabel = new QLabel( domainCombo, i18n("&Domain:"), parent );
- loginLabel = new QLabel( loginEdit, i18n("&Username:"), parent );
+ domainLabel = new TQLabel( domainCombo, i18n("&Domain:"), parent );
+ loginLabel = new TQLabel( loginEdit, i18n("&Username:"), parent );
grid->addWidget( domainLabel, line, 0 );
grid->addWidget( domainCombo, line++, 1 );
grid->addWidget( loginLabel, line, 0 );
grid->addWidget( loginEdit, line++, 1 );
}
- connect( loginEdit, SIGNAL(lostFocus()), SLOT(slotLoginLostFocus()) );
- connect( loginEdit, SIGNAL(lostFocus()), SLOT(slotActivity()) );
- connect( loginEdit, SIGNAL(textChanged( const QString & )), SLOT(slotActivity()) );
- connect( loginEdit, SIGNAL(selectionChanged()), SLOT(slotActivity()) );
- connect(&mDomainListTimer, SIGNAL(timeout()), SLOT(slotStartDomainList()));
+ connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) );
+ connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+ connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) );
+ connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) );
+ connect(&mDomainListTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotStartDomainList()));
domainCombo->insertStringList( staticDomains );
- QTimer::singleShot(0, this, SLOT(slotStartDomainList()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotStartDomainList()));
} else if (ctx != Login && ctx != Shutdown && grid) {
- domainLabel = new QLabel( i18n("Domain:"), parent );
+ domainLabel = new TQLabel( i18n("Domain:"), parent );
grid->addWidget( domainLabel, line, 0 );
- grid->addWidget( new QLabel( fixedDomain, parent ), line++, 1 );
- loginLabel = new QLabel( i18n("Username:"), parent );
+ grid->addWidget( new TQLabel( fixedDomain, parent ), line++, 1 );
+ loginLabel = new TQLabel( i18n("Username:"), parent );
grid->addWidget( loginLabel, line, 0 );
- grid->addWidget( new QLabel( fixedUser, parent ), line++, 1 );
+ grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 );
}
if (echoMode == -1)
passwdEdit = new KDMPasswordEdit( parent );
else
passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
parent );
- connect( passwdEdit, SIGNAL(textChanged( const QString & )),
- SLOT(slotActivity()) );
- connect( passwdEdit, SIGNAL(lostFocus()), SLOT(slotActivity()) );
+ connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
+ TQT_SLOT(slotActivity()) );
+ connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
if (!grid) {
passwdEdit->adjustSize();
pw_entry->setWidget( passwdEdit );
} else {
- passwdLabel = new QLabel( passwdEdit,
+ passwdLabel = new TQLabel( passwdEdit,
func == Authenticate ?
i18n("&Password:") :
i18n("Current &password:"),
@@ -185,8 +185,8 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
passwd1Edit = new KDMPasswordEdit( parent );
passwd2Edit = new KDMPasswordEdit( parent );
}
- passwd1Label = new QLabel( passwd1Edit, i18n("&New password:"), parent );
- passwd2Label = new QLabel( passwd2Edit, i18n("Con&firm password:"), parent );
+ passwd1Label = new TQLabel( passwd1Edit, i18n("&New password:"), parent );
+ passwd2Label = new TQLabel( passwd2Edit, i18n("Con&firm password:"), parent );
if (pred) {
parent->setTabOrder( pred, passwd1Edit );
parent->setTabOrder( passwd1Edit, passwd2Edit );
@@ -212,26 +212,26 @@ KWinbindGreeter::~KWinbindGreeter()
delete domainCombo;
return;
}
- QLayoutIterator it = static_cast<QLayout *>(layoutItem)->iterator();
- for (QLayoutItem *itm = it.current(); itm; itm = ++it)
+ TQLayoutIterator it = static_cast<TQLayout *>(layoutItem)->iterator();
+ for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget();
delete layoutItem;
delete m_domainLister;
}
void
-KWinbindGreeter::slotChangedDomain( const QString &dom )
+KWinbindGreeter::slotChangedDomain( const TQString &dom )
{
if (!loginEdit->completionObject())
return;
- QStringList users;
+ TQStringList users;
if (dom == "<local>") {
- for (QStringList::ConstIterator it = allUsers.begin(); it != allUsers.end(); ++it)
+ for (TQStringList::ConstIterator it = allUsers.begin(); it != allUsers.end(); ++it)
if ((*it).find( separator ) < 0)
users << *it;
} else {
- QString st( dom + separator );
- for (QStringList::ConstIterator it = allUsers.begin(); it != allUsers.end(); ++it)
+ TQString st( dom + separator );
+ for (TQStringList::ConstIterator it = allUsers.begin(); it != allUsers.end(); ++it)
if ((*it).startsWith( st ))
users << (*it).mid( st.length() );
}
@@ -239,7 +239,7 @@ KWinbindGreeter::slotChangedDomain( const QString &dom )
}
void // virtual
-KWinbindGreeter::loadUsers( const QStringList &users )
+KWinbindGreeter::loadUsers( const TQStringList &users )
{
allUsers = users;
KCompletion *userNamesCompletion = new KCompletion;
@@ -250,9 +250,9 @@ KWinbindGreeter::loadUsers( const QStringList &users )
}
void // virtual
-KWinbindGreeter::presetEntity( const QString &entity, int field )
+KWinbindGreeter::presetEntity( const TQString &entity, int field )
{
- QString dom, usr;
+ TQString dom, usr;
splitEntity( entity, dom, usr );
domainCombo->setCurrentItem( dom, true );
slotChangedDomain( dom );
@@ -271,10 +271,10 @@ KWinbindGreeter::presetEntity( const QString &entity, int field )
curUser = entity;
}
-QString // virtual
+TQString // virtual
KWinbindGreeter::getEntity() const
{
- QString dom, usr;
+ TQString dom, usr;
if (fixedUser.isEmpty())
dom = domainCombo->currentText(), usr = loginEdit->text();
else
@@ -283,11 +283,11 @@ KWinbindGreeter::getEntity() const
}
void // virtual
-KWinbindGreeter::setUser( const QString &user )
+KWinbindGreeter::setUser( const TQString &user )
{
// assert (fixedUser.isEmpty());
curUser = user;
- QString dom, usr;
+ TQString dom, usr;
splitEntity( user, dom, usr );
domainCombo->setCurrentItem( dom, true );
slotChangedDomain( dom );
@@ -340,7 +340,7 @@ bool // virtual
KWinbindGreeter::textMessage( const char *text, bool err )
{
if (!err &&
- QString( text ).find( QRegExp( "^Changing password for [^ ]+$" ) ) >= 0)
+ TQString( text ).find( TQRegExp( "^Changing password for [^ ]+$" ) ) >= 0)
return true;
return false;
}
@@ -354,19 +354,19 @@ KWinbindGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
else if (!authTok)
exp = 1;
else {
- QString pr( prompt );
- if (pr.find( QRegExp( "\\b(old|current)\\b", false ) ) >= 0) {
+ TQString pr( prompt );
+ if (pr.find( TQRegExp( "\\b(old|current)\\b", false ) ) >= 0) {
handler->gplugReturnText( "",
KGreeterPluginHandler::IsOldPassword |
KGreeterPluginHandler::IsSecret );
return;
- } else if (pr.find( QRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b",
+ } else if (pr.find( TQRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b",
false ) ) >= 0)
exp = 3;
- else if (pr.find( QRegExp( "\\bnew\\b", false ) ) >= 0)
+ else if (pr.find( TQRegExp( "\\bnew\\b", false ) ) >= 0)
exp = 2;
else {
- handler->gplugMsgBox( QMessageBox::Critical,
+ handler->gplugMsgBox( TQMessageBox::Critical,
i18n("Unrecognized prompt \"%1\"")
.arg( prompt ) );
handler->gplugReturnText( 0, 0 );
@@ -505,7 +505,7 @@ KWinbindGreeter::clear()
slotChangedDomain( defaultDomain );
loginEdit->clear();
loginEdit->setFocus();
- curUser = QString::null;
+ curUser = TQString::null;
} else
passwdEdit->setFocus();
}
@@ -538,7 +538,7 @@ KWinbindGreeter::slotLoginLostFocus()
{
if (!running)
return;
- QString ent( getEntity() );
+ TQString ent( getEntity() );
if (exp > 0) {
if (curUser == ent)
return;
@@ -563,8 +563,8 @@ KWinbindGreeter::slotStartDomainList()
mDomainListing.clear();
m_domainLister = new KProcIO;
- connect(m_domainLister, SIGNAL(readReady(KProcIO*)), SLOT(slotReadDomainList()));
- connect(m_domainLister, SIGNAL(processExited(KProcess*)), SLOT(slotEndDomainList()));
+ connect(m_domainLister, TQT_SIGNAL(readReady(KProcIO*)), TQT_SLOT(slotReadDomainList()));
+ connect(m_domainLister, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotEndDomainList()));
(*m_domainLister) << "wbinfo" << "--own-domain" << "--trusted-domains";
m_domainLister->setComm (KProcess::Stdout);
@@ -574,7 +574,7 @@ KWinbindGreeter::slotStartDomainList()
void
KWinbindGreeter::slotReadDomainList()
{
- QString line;
+ TQString line;
while ( m_domainLister->readln( line ) != -1 ) {
mDomainListing.append(line);
@@ -587,17 +587,17 @@ KWinbindGreeter::slotEndDomainList()
delete m_domainLister;
m_domainLister = 0;
- QStringList domainList;
+ TQStringList domainList;
domainList = staticDomains;
- for (QStringList::const_iterator it = mDomainListing.begin();
+ for (TQStringList::const_iterator it = mDomainListing.begin();
it != mDomainListing.end(); ++it) {
if (!domainList.contains(*it))
domainList.append(*it);
}
- QString current = domainCombo->currentText();
+ TQString current = domainCombo->currentText();
for (int i = 0; i < domainList.count(); ++i) {
if (i < domainCombo->count())
@@ -619,21 +619,21 @@ KWinbindGreeter::slotEndDomainList()
// factory
-static bool init( const QString &,
- QVariant (*getConf)( void *, const char *, const QVariant & ),
+static bool init( const TQString &,
+ TQVariant (*getConf)( void *, const char *, const TQVariant & ),
void *ctx )
{
- echoMode = getConf( ctx, "EchoMode", QVariant( -1 ) ).toInt();
- staticDomains = QStringList::split( ':', getConf( ctx, "winbind.Domains", QVariant( "" ) ).toString() );
+ echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
+ staticDomains = TQStringList::split( ':', getConf( ctx, "winbind.Domains", TQVariant( "" ) ).toString() );
if (!staticDomains.contains("<local>"))
staticDomains << "<local>";
- defaultDomain = getConf( ctx, "winbind.DefaultDomain", QVariant( staticDomains.first() ) ).toString();
- QString sepstr = getConf( ctx, "winbind.Separator", QVariant( QString::null ) ).toString();
+ defaultDomain = getConf( ctx, "winbind.DefaultDomain", TQVariant( staticDomains.first() ) ).toString();
+ TQString sepstr = getConf( ctx, "winbind.Separator", TQVariant( TQString::null ) ).toString();
if (sepstr.isNull()) {
FILE *sepfile = popen( "wbinfo --separator 2>/dev/null", "r" );
if (sepfile) {
- QTextIStream( sepfile ) >> sepstr;
+ TQTextIStream( sepfile ) >> sepstr;
if (pclose( sepfile ))
sepstr = "\\";
} else
@@ -649,13 +649,13 @@ static void done( void )
KGlobal::locale()->removeCatalogue( "kgreet_winbind" );
// avoid static deletion problems ... hopefully
staticDomains.clear();
- defaultDomain = QString::null;
+ defaultDomain = TQString::null;
}
static KGreeterPlugin *
create( KGreeterPluginHandler *handler, KdmThemer *themer,
- QWidget *parent, QWidget *predecessor,
- const QString &fixedEntity,
+ TQWidget *parent, TQWidget *predecessor,
+ const TQString &fixedEntity,
KGreeterPlugin::Function func,
KGreeterPlugin::Context ctx )
{
diff --git a/kdmlib/kgreet_winbind.h b/kdmlib/kgreet_winbind.h
index 7fc6a1c77..7137d8638 100644
--- a/kdmlib/kgreet_winbind.h
+++ b/kdmlib/kgreet_winbind.h
@@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "kgreeterplugin.h"
-#include <qobject.h>
-#include <qtimer.h>
+#include <tqobject.h>
+#include <tqtimer.h>
class KComboBox;
class KLineEdit;
@@ -40,20 +40,20 @@ class QLabel;
class KdmThemer;
class KProcIO;
-class KWinbindGreeter : public QObject, public KGreeterPlugin {
+class KWinbindGreeter : public TQObject, public KGreeterPlugin {
Q_OBJECT
public:
KWinbindGreeter( KGreeterPluginHandler *handler,
KdmThemer *themer,
- QWidget *parent, QWidget *predecessor,
- const QString &fixedEntitiy,
+ TQWidget *parent, TQWidget *predecessor,
+ const TQString &fixedEntitiy,
Function func, Context ctx );
~KWinbindGreeter();
- virtual void loadUsers( const QStringList &users );
- virtual void presetEntity( const QString &entity, int field );
- virtual QString getEntity() const;
- virtual void setUser( const QString &user );
+ virtual void loadUsers( const TQStringList &users );
+ virtual void presetEntity( const TQString &entity, int field );
+ virtual TQString getEntity() const;
+ virtual void setUser( const TQString &user );
virtual void setEnabled( bool on );
virtual bool textMessage( const char *message, bool error );
virtual void textPrompt( const char *prompt, bool echo, bool nonBlocking );
@@ -70,7 +70,7 @@ class KWinbindGreeter : public QObject, public KGreeterPlugin {
public slots:
void slotLoginLostFocus();
- void slotChangedDomain( const QString &dom );
+ void slotChangedDomain( const TQString &dom );
void slotActivity();
void slotStartDomainList();
void slotReadDomainList();
@@ -81,15 +81,15 @@ class KWinbindGreeter : public QObject, public KGreeterPlugin {
void setActive2( bool enable );
void returnData();
- QLabel *domainLabel, *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label;
+ TQLabel *domainLabel, *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label;
KComboBox *domainCombo;
KLineEdit *loginEdit;
KPasswordEdit *passwdEdit, *passwd1Edit, *passwd2Edit;
KSimpleConfig *stsFile;
- QString fixedDomain, fixedUser, curUser;
- QStringList allUsers, mDomainListing;
+ TQString fixedDomain, fixedUser, curUser;
+ TQStringList allUsers, mDomainListing;
KProcIO* m_domainLister;
- QTimer mDomainListTimer;
+ TQTimer mDomainListTimer;
Function func;
Context ctx;
diff --git a/kdmlib/kgreeterplugin.h b/kdmlib/kgreeterplugin.h
index e7677415c..25680f312 100644
--- a/kdmlib/kgreeterplugin.h
+++ b/kdmlib/kgreeterplugin.h
@@ -24,8 +24,8 @@
#ifndef KGREETERPLUGIN_H
#define KGREETERPLUGIN_H
-#include <qvariant.h>
-#include <qmessagebox.h>
+#include <tqvariant.h>
+#include <tqmessagebox.h>
#include <kdemacros.h>
class KdmThemer;
@@ -58,7 +58,7 @@ public:
* user changes.
* @param user the user logging in
*/
- virtual void gplugSetUser( const QString &user ) = 0;
+ virtual void gplugSetUser( const TQString &user ) = 0;
/**
* Start processing.
*/
@@ -76,7 +76,7 @@ public:
* @param type message severity
* @param text message text
*/
- virtual void gplugMsgBox( QMessageBox::Icon type, const QString &text ) = 0;
+ virtual void gplugMsgBox( TQMessageBox::Icon type, const TQString &text ) = 0;
};
/**
@@ -122,7 +122,7 @@ public:
* Will be called only when not running.
* @param users the users to load.
*/
- virtual void loadUsers( const QStringList &users ) = 0;
+ virtual void loadUsers( const TQStringList &users ) = 0;
/**
* Preload the talker with an (opaque to the greeter) entity.
@@ -134,13 +134,13 @@ public:
* the password field with anything, disabling it, and placing the
* cursor in the user name field.
*/
- virtual void presetEntity( const QString &entity, int field ) = 0;
+ virtual void presetEntity( const TQString &entity, int field ) = 0;
/**
* Obtain the actually logged in entity.
* Will be called only after succeeded() was called.
*/
- virtual QString getEntity() const = 0;
+ virtual TQString getEntity() const = 0;
/**
* "Push" a user into the talker. That can be a click into the user list
@@ -149,7 +149,7 @@ public:
* @param user the user to set. Note that this is a UNIX login, not a
* canonical entity
*/
- virtual void setUser( const QString &user ) = 0;
+ virtual void setUser( const TQString &user ) = 0;
/**
* En-/disable any widgets contained in the talker.
@@ -277,14 +277,14 @@ public:
virtual void clear() = 0;
/**
- * Obtain the QLayoutItem containg the widget(s) to actually handle the
- * conversation. See QLayout and QWidgetItem for possible implementations.
+ * Obtain the TQLayoutItem containg the widget(s) to actually handle the
+ * conversation. See TQLayout and TQWidgetItem for possible implementations.
*/
- QLayoutItem *getLayoutItem() const { return layoutItem; }
+ TQLayoutItem *getLayoutItem() const { return layoutItem; }
protected:
KGreeterPluginHandler *handler;
- QLayoutItem *layoutItem;
+ TQLayoutItem *layoutItem;
};
struct KDE_EXPORT kgreeterplugin_info {
@@ -345,9 +345,9 @@ struct KDE_EXPORT kgreeterplugin_info {
* @param ctx context pointer for @p getConf
* @return if false, unload the plugin again (don't call done() first)
*/
- bool (*init)( const QString &method,
- QVariant (*getConf)( void *ctx, const char *key,
- const QVariant &dflt ),
+ bool (*init)( const TQString &method,
+ TQVariant (*getConf)( void *ctx, const char *key,
+ const TQVariant &dflt ),
void *ctx );
/**
@@ -392,8 +392,8 @@ struct KDE_EXPORT kgreeterplugin_info {
*/
KGreeterPlugin *(*create)( KGreeterPluginHandler *handler,
KdmThemer *themer,
- QWidget *parent, QWidget *predecessor,
- const QString &fixedEntity,
+ TQWidget *parent, TQWidget *predecessor,
+ const TQString &fixedEntity,
KGreeterPlugin::Function func,
KGreeterPlugin::Context ctx );
};
diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp
index c5f9e4553..95e4045ac 100644
--- a/kfind/kdatecombo.cpp
+++ b/kfind/kdatecombo.cpp
@@ -4,7 +4,7 @@
*
***********************************************************************/
-#include <qtimer.h>
+#include <tqtimer.h>
#include <kglobal.h>
#include <klocale.h>
@@ -16,18 +16,18 @@
#include "kdatecombo.moc"
-KDateCombo::KDateCombo(QWidget *parent, const char *name ) : QComboBox(FALSE, parent,name)
+KDateCombo::KDateCombo(TQWidget *parent, const char *name ) : TQComboBox(FALSE, parent,name)
{
- QDate date = QDate::currentDate();
+ TQDate date = TQDate::currentDate();
initObject(date, parent, name);
}
-KDateCombo::KDateCombo(const QDate & date, QWidget *parent, const char *name) : QComboBox(FALSE, parent,name)
+KDateCombo::KDateCombo(const TQDate & date, TQWidget *parent, const char *name) : TQComboBox(FALSE, parent,name)
{
initObject(date, parent, name);
}
-void KDateCombo::initObject(const QDate & date, QWidget *, const char *)
+void KDateCombo::initObject(const TQDate & date, TQWidget *, const char *)
{
clearValidator();
popupFrame = new KPopupFrame(this, "popupFrame");
@@ -38,7 +38,7 @@ void KDateCombo::initObject(const QDate & date, QWidget *, const char *)
popupFrame->setMainWidget(datePicker);
setDate(date);
- connect(datePicker, SIGNAL(dateSelected(QDate)), this, SLOT(dateEnteredEvent(QDate)));
+ connect(datePicker, TQT_SIGNAL(dateSelected(TQDate)), this, TQT_SLOT(dateEnteredEvent(TQDate)));
}
KDateCombo::~KDateCombo()
@@ -47,22 +47,22 @@ KDateCombo::~KDateCombo()
delete popupFrame;
}
-QString KDateCombo::date2String(const QDate & date)
+TQString KDateCombo::date2String(const TQDate & date)
{
return(KGlobal::locale()->formatDate(date, true));
}
-QDate & KDateCombo::string2Date(const QString & str, QDate *qd)
+TQDate & KDateCombo::string2Date(const TQString & str, TQDate *qd)
{
return *qd = KGlobal::locale()->readDate(str);
}
-QDate & KDateCombo::getDate(QDate *currentDate)
+TQDate & KDateCombo::getDate(TQDate *currentDate)
{
return string2Date(currentText(), currentDate);
}
-bool KDateCombo::setDate(const QDate & newDate)
+bool KDateCombo::setDate(const TQDate & newDate)
{
if (newDate.isValid())
{
@@ -74,7 +74,7 @@ bool KDateCombo::setDate(const QDate & newDate)
return FALSE;
}
-void KDateCombo::dateEnteredEvent(QDate newDate)
+void KDateCombo::dateEnteredEvent(TQDate newDate)
{
if (!newDate.isValid())
newDate = datePicker->date();
@@ -82,36 +82,36 @@ void KDateCombo::dateEnteredEvent(QDate newDate)
setDate(newDate);
}
-void KDateCombo::mousePressEvent (QMouseEvent * e)
+void KDateCombo::mousePressEvent (TQMouseEvent * e)
{
- if (e->button() & QMouseEvent::LeftButton)
+ if (e->button() & TQMouseEvent::LeftButton)
{
if (rect().contains( e->pos()))
{
- QDate tempDate;
+ TQDate tempDate;
getDate(& tempDate);
datePicker->setDate(tempDate);
- popupFrame->popup(mapToGlobal(QPoint(0, height())));
+ popupFrame->popup(mapToGlobal(TQPoint(0, height())));
//datePicker->setFocus();
}
}
}
-bool KDateCombo::eventFilter (QObject*, QEvent* e)
+bool KDateCombo::eventFilter (TQObject*, TQEvent* e)
{
- if ( e->type() == QEvent::MouseButtonPress )
+ if ( e->type() == TQEvent::MouseButtonPress )
{
- QMouseEvent *me = (QMouseEvent *)e;
- QPoint p = mapFromGlobal( me->globalPos() );
+ TQMouseEvent *me = (TQMouseEvent *)e;
+ TQPoint p = mapFromGlobal( me->globalPos() );
if (rect().contains( p ) )
{
- QTimer::singleShot(10, this, SLOT(dateEnteredEvent()));
+ TQTimer::singleShot(10, this, TQT_SLOT(dateEnteredEvent()));
return true;
}
}
- else if ( e->type() == QEvent::KeyRelease )
+ else if ( e->type() == TQEvent::KeyRelease )
{
- QKeyEvent *k = (QKeyEvent *)e;
+ TQKeyEvent *k = (TQKeyEvent *)e;
//Press return == pick selected date and close the combo
if((k->key()==Qt::Key_Return)||(k->key()==Qt::Key_Enter))
{
diff --git a/kfind/kdatecombo.h b/kfind/kdatecombo.h
index 12f66174a..ab714a3ba 100644
--- a/kfind/kdatecombo.h
+++ b/kfind/kdatecombo.h
@@ -7,9 +7,9 @@
#ifndef KDATECOMBO_H
#define KDATECOMBO_H
-#include <qwidget.h>
-#include <qcombobox.h>
-#include <qdatetime.h>
+#include <tqwidget.h>
+#include <tqcombobox.h>
+#include <tqdatetime.h>
/**
*@author Beppe Grimaldi
@@ -18,32 +18,32 @@
class KDatePicker;
class KPopupFrame;
-class KDateCombo : public QComboBox {
+class KDateCombo : public TQComboBox {
Q_OBJECT
public:
- KDateCombo(QWidget *parent=0, const char *name=0);
- KDateCombo(const QDate & date, QWidget *parent=0, const char *name=0);
+ KDateCombo(TQWidget *parent=0, const char *name=0);
+ KDateCombo(const TQDate & date, TQWidget *parent=0, const char *name=0);
~KDateCombo();
- QDate & getDate(QDate *currentDate);
- bool setDate(const QDate & newDate);
+ TQDate & getDate(TQDate *currentDate);
+ bool setDate(const TQDate & newDate);
private:
KPopupFrame * popupFrame;
KDatePicker * datePicker;
- void initObject(const QDate & date, QWidget *parent, const char *name);
+ void initObject(const TQDate & date, TQWidget *parent, const char *name);
- QString date2String(const QDate &);
- QDate & string2Date(const QString &, QDate * );
+ TQString date2String(const TQDate &);
+ TQDate & string2Date(const TQString &, TQDate * );
protected:
- bool eventFilter (QObject*, QEvent*);
- virtual void mousePressEvent (QMouseEvent * e);
+ bool eventFilter (TQObject*, TQEvent*);
+ virtual void mousePressEvent (TQMouseEvent * e);
protected slots:
- void dateEnteredEvent(QDate d=QDate());
+ void dateEnteredEvent(TQDate d=TQDate());
};
#endif
diff --git a/kfind/kfind.cpp b/kfind/kfind.cpp
index 93c646a91..8908b26c8 100644
--- a/kfind/kfind.cpp
+++ b/kfind/kfind.cpp
@@ -26,15 +26,15 @@
**********************************************************************/
#include <kpushbutton.h>
-#include <qlayout.h>
-#include <qvbox.h>
+#include <tqlayout.h>
+#include <tqvbox.h>
#include <kdialog.h>
#include <kdebug.h>
#include <klocale.h>
#include <kseparator.h>
-#include <qlineedit.h>
-#include <qcheckbox.h>
+#include <tqlineedit.h>
+#include <tqcheckbox.h>
#include <kstdguiitem.h>
#include "kftabdlg.h"
@@ -42,11 +42,11 @@
#include "kfind.moc"
-Kfind::Kfind(QWidget *parent, const char *name)
- : QWidget( parent, name )
+Kfind::Kfind(TQWidget *parent, const char *name)
+ : TQWidget( parent, name )
{
kdDebug() << "Kfind::Kfind " << this << endl;
- QBoxLayout * mTopLayout = new QBoxLayout( this, QBoxLayout::LeftToRight,
+ TQBoxLayout * mTopLayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight,
KDialog::marginHint(), KDialog::spacingHint() );
// create tabwidget
@@ -58,30 +58,30 @@ Kfind::Kfind(QWidget *parent, const char *name)
* pixel for me which is visually distracting (GS).
// create separator
KSeparator * mActionSep = new KSeparator( this );
- mActionSep->setFocusPolicy( QWidget::ClickFocus );
- mActionSep->setOrientation( QFrame::VLine );
+ mActionSep->setFocusPolicy( TQWidget::ClickFocus );
+ mActionSep->setOrientation( TQFrame::VLine );
mTopLayout->addWidget(mActionSep);
*/
// create button box
- QVBox * mButtonBox = new QVBox( this );
- QVBoxLayout *lay = (QVBoxLayout*)mButtonBox->layout();
+ TQVBox * mButtonBox = new TQVBox( this );
+ TQVBoxLayout *lay = (TQVBoxLayout*)mButtonBox->layout();
lay->addStretch(1);
mTopLayout->addWidget(mButtonBox);
mSearch = new KPushButton( KGuiItem(i18n("&Find"), "find"), mButtonBox );
mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4);
- connect( mSearch, SIGNAL(clicked()), this, SLOT( startSearch() ) );
+ connect( mSearch, TQT_SIGNAL(clicked()), this, TQT_SLOT( startSearch() ) );
mStop = new KPushButton( KGuiItem(i18n("Stop"), "stop"), mButtonBox );
- connect( mStop, SIGNAL(clicked()), this, SLOT( stopSearch() ) );
+ connect( mStop, TQT_SIGNAL(clicked()), this, TQT_SLOT( stopSearch() ) );
mSave = new KPushButton( KStdGuiItem::saveAs(), mButtonBox );
- connect( mSave, SIGNAL(clicked()), this, SLOT( saveResults() ) );
+ connect( mSave, TQT_SIGNAL(clicked()), this, TQT_SLOT( saveResults() ) );
KPushButton * mClose = new KPushButton( KStdGuiItem::close(), mButtonBox );
- connect( mClose, SIGNAL(clicked()), this, SIGNAL( destroyMe() ) );
+ connect( mClose, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( destroyMe() ) );
// react to search requests from widget
- connect( tabWidget, SIGNAL(startSearch()), this, SLOT( startSearch() ) );
+ connect( tabWidget, TQT_SIGNAL(startSearch()), this, TQT_SLOT( startSearch() ) );
mSearch->setEnabled(true); // Enable "Search"
mStop->setEnabled(false); // Disable "Stop"
@@ -164,7 +164,7 @@ void Kfind::setFocus()
tabWidget->setFocus();
}
-void Kfind::saveState( QDataStream *stream )
+void Kfind::saveState( TQDataStream *stream )
{
query->kill();
*stream << tabWidget->nameBox->currentText();
@@ -174,9 +174,9 @@ void Kfind::saveState( QDataStream *stream )
*stream << (int)( tabWidget->subdirsCb->isChecked() ? 0 : 1 );
}
-void Kfind::restoreState( QDataStream *stream )
+void Kfind::restoreState( TQDataStream *stream )
{
- QString namesearched, dirsearched,containing;
+ TQString namesearched, dirsearched,containing;
int typeIdx;
int subdirs;
*stream >> namesearched;
diff --git a/kfind/kfind.h b/kfind/kfind.h
index 9bc5d35e5..35fcb4b65 100644
--- a/kfind/kfind.h
+++ b/kfind/kfind.h
@@ -7,7 +7,7 @@
#ifndef KFIND_H
#define KFIND_H
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kfileitem.h>
#include <kdirlister.h>
@@ -23,7 +23,7 @@ class Kfind: public QWidget
Q_OBJECT
public:
- Kfind(QWidget * parent = 0, const char * name = 0);
+ Kfind(TQWidget * parent = 0, const char * name = 0);
~Kfind();
void setURL( const KURL &url );
@@ -31,8 +31,8 @@ public:
void setQuery(KQuery * q) { query = q; }
void searchFinished();
- void saveState( QDataStream *stream );
- void restoreState( QDataStream *stream );
+ void saveState( TQDataStream *stream );
+ void restoreState( TQDataStream *stream );
public slots:
void startSearch();
diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp
index 4efafd2de..aeb6d2708 100644
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@@ -4,8 +4,8 @@
*
**********************************************************************/
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
#include <klocale.h>
#include <kglobal.h>
@@ -23,14 +23,14 @@
#include "kfinddlg.h"
#include "kfinddlg.moc"
-KfindDlg::KfindDlg(const KURL & url, QWidget *parent, const char *name)
- : KDialogBase( Plain, QString::null,
+KfindDlg::KfindDlg(const KURL & url, TQWidget *parent, const char *name)
+ : KDialogBase( Plain, TQString::null,
User1 | User2 | Apply | Close | Help, Apply,
parent, name, true, false,
KGuiItem(i18n("Stop"), "stop"),
KStdGuiItem::saveAs())
{
- QWidget::setCaption( i18n("Find Files/Folders" ) );
+ TQWidget::setCaption( i18n("Find Files/Folders" ) );
setButtonBoxOrientation(Vertical);
enableButton(Apply, true); // Enable "Find"
@@ -41,7 +41,7 @@ KfindDlg::KfindDlg(const KURL & url, QWidget *parent, const char *name)
isResultReported = false;
- QFrame *frame = plainPage();
+ TQFrame *frame = plainPage();
// create tabwidget
tabWidget = new KfindTabWidget( frame, "dialog");
@@ -54,28 +54,28 @@ KfindDlg::KfindDlg(const KURL & url, QWidget *parent, const char *name)
mStatusBar->insertFixedItem(i18n("AMiddleLengthText..."), 0, true);
setStatusMsg(i18n("Ready."));
mStatusBar->setItemAlignment(0, AlignLeft | AlignVCenter);
- mStatusBar->insertItem(QString::null, 1, 1, true);
+ mStatusBar->insertItem(TQString::null, 1, 1, true);
mStatusBar->setItemAlignment(1, AlignLeft | AlignVCenter);
- QVBoxLayout *vBox = new QVBoxLayout(frame);
+ TQVBoxLayout *vBox = new TQVBoxLayout(frame);
vBox->addWidget(tabWidget, 0);
vBox->addWidget(win, 1);
vBox->addWidget(mStatusBar, 0);
- connect(this, SIGNAL(applyClicked()),
- this, SLOT(startSearch()));
- connect(this, SIGNAL(user1Clicked()),
- this, SLOT(stopSearch()));
- connect(this, SIGNAL(user2Clicked()),
- win, SLOT(saveResults()));
+ connect(this, TQT_SIGNAL(applyClicked()),
+ this, TQT_SLOT(startSearch()));
+ connect(this, TQT_SIGNAL(user1Clicked()),
+ this, TQT_SLOT(stopSearch()));
+ connect(this, TQT_SIGNAL(user2Clicked()),
+ win, TQT_SLOT(saveResults()));
- connect(win ,SIGNAL(resultSelected(bool)),
- this,SIGNAL(resultSelected(bool)));
+ connect(win ,TQT_SIGNAL(resultSelected(bool)),
+ this,TQT_SIGNAL(resultSelected(bool)));
query = new KQuery(frame);
- connect(query, SIGNAL(addFile(const KFileItem*,const QString&)),
- SLOT(addFile(const KFileItem*,const QString&)));
- connect(query, SIGNAL(result(int)), SLOT(slotResult(int)));
+ connect(query, TQT_SIGNAL(addFile(const KFileItem*,const TQString&)),
+ TQT_SLOT(addFile(const KFileItem*,const TQString&)));
+ connect(query, TQT_SIGNAL(result(int)), TQT_SLOT(slotResult(int)));
dirwatch=NULL;
}
@@ -85,18 +85,18 @@ KfindDlg::~KfindDlg()
stopSearch();
}
-void KfindDlg::closeEvent(QCloseEvent *)
+void KfindDlg::closeEvent(TQCloseEvent *)
{
stopSearch();
slotClose();
}
-void KfindDlg::setProgressMsg(const QString &msg)
+void KfindDlg::setProgressMsg(const TQString &msg)
{
mStatusBar->changeItem(msg, 1);
}
-void KfindDlg::setStatusMsg(const QString &msg)
+void KfindDlg::setStatusMsg(const TQString &msg)
{
mStatusBar->changeItem(msg, 0);
}
@@ -121,8 +121,8 @@ void KfindDlg::startSearch()
if(dirwatch!=NULL)
delete dirwatch;
dirwatch=new KDirWatch();
- connect(dirwatch, SIGNAL(created(const QString&)), this, SLOT(slotNewItems(const QString&)));
- connect(dirwatch, SIGNAL(deleted(const QString&)), this, SLOT(slotDeleteItem(const QString&)));
+ connect(dirwatch, TQT_SIGNAL(created(const TQString&)), this, TQT_SLOT(slotNewItems(const TQString&)));
+ connect(dirwatch, TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(slotDeleteItem(const TQString&)));
dirwatch->addDir(query->url().path(),true);
#if 0
@@ -140,8 +140,8 @@ void KfindDlg::startSearch()
//Getting a list of all subdirs
if(tabWidget->isSearchRecursive() && (dirwatch->internalMethod() == KDirWatch::FAM))
{
- QStringList subdirs=getAllSubdirs(query->url().path());
- for(QStringList::Iterator it = subdirs.begin(); it != subdirs.end(); ++it)
+ TQStringList subdirs=getAllSubdirs(query->url().path());
+ for(TQStringList::Iterator it = subdirs.begin(); it != subdirs.end(); ++it)
dirwatch->addDir(*it,true);
}
#endif
@@ -203,7 +203,7 @@ void KfindDlg::slotResult(int errorCode)
}
-void KfindDlg::addFile(const KFileItem* item, const QString& matchingLine)
+void KfindDlg::addFile(const KFileItem* item, const TQString& matchingLine)
{
win->insertItem(*item,matchingLine);
@@ -214,7 +214,7 @@ void KfindDlg::addFile(const KFileItem* item, const QString& matchingLine)
}
int count = win->childCount();
- QString str = i18n("one file found", "%n files found", count);
+ TQString str = i18n("one file found", "%n files found", count);
setProgressMsg(str);
}
@@ -234,11 +234,11 @@ void KfindDlg::about ()
dlg.exec ();
}
-void KfindDlg::slotDeleteItem(const QString& file)
+void KfindDlg::slotDeleteItem(const TQString& file)
{
- kdDebug()<<QString("Will remove one item: %1").arg(file)<<endl;
- QListViewItem *iter;
- QString iterwithpath;
+ kdDebug()<<TQString("Will remove one item: %1").arg(file)<<endl;
+ TQListViewItem *iter;
+ TQString iterwithpath;
iter=win->firstChild();
while( iter ) {
@@ -253,16 +253,16 @@ void KfindDlg::slotDeleteItem(const QString& file)
}
}
-void KfindDlg::slotNewItems( const QString& file )
+void KfindDlg::slotNewItems( const TQString& file )
{
- kdDebug()<<QString("Will add this item")<<endl;
- QStringList newfiles;
- QListViewItem *checkiter;
- QString checkiterwithpath;
+ kdDebug()<<TQString("Will add this item")<<endl;
+ TQStringList newfiles;
+ TQListViewItem *checkiter;
+ TQString checkiterwithpath;
if(file.find(query->url().path(+1))==0)
{
- kdDebug()<<QString("Can be added, path OK")<<endl;
+ kdDebug()<<TQString("Can be added, path OK")<<endl;
checkiter=win->firstChild();
while( checkiter ) {
checkiterwithpath=query->url().path(+1)+checkiter->text(1)+checkiter->text(0);
@@ -270,19 +270,19 @@ void KfindDlg::slotNewItems( const QString& file )
return;
checkiter = checkiter->nextSibling();
}
- query->slotListEntries(QStringList(file));
+ query->slotListEntries(TQStringList(file));
}
}
-QStringList KfindDlg::getAllSubdirs(QDir d)
+TQStringList KfindDlg::getAllSubdirs(TQDir d)
{
- QStringList dirs;
- QStringList subdirs;
+ TQStringList dirs;
+ TQStringList subdirs;
- d.setFilter( QDir::Dirs );
+ d.setFilter( TQDir::Dirs );
dirs = d.entryList();
- for(QStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it)
+ for(TQStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it)
{
if((*it==".")||(*it==".."))
continue;
diff --git a/kfind/kfinddlg.h b/kfind/kfinddlg.h
index dd1aa718c..be889007b 100644
--- a/kfind/kfinddlg.h
+++ b/kfind/kfinddlg.h
@@ -25,29 +25,29 @@ class KfindDlg: public KDialogBase
Q_OBJECT
public:
- KfindDlg(const KURL & url, QWidget * parent = 0, const char * name = 0);
+ KfindDlg(const KURL & url, TQWidget * parent = 0, const char * name = 0);
~KfindDlg();
void copySelection();
- void setStatusMsg(const QString &);
- void setProgressMsg(const QString &);
+ void setStatusMsg(const TQString &);
+ void setProgressMsg(const TQString &);
private:
- void closeEvent(QCloseEvent *);
- /*Return a QStringList of all subdirs of d*/
- QStringList getAllSubdirs(QDir d);
+ void closeEvent(TQCloseEvent *);
+ /*Return a TQStringList of all subdirs of d*/
+ TQStringList getAllSubdirs(TQDir d);
public slots:
void startSearch();
void stopSearch();
void newSearch();
- void addFile(const KFileItem* item, const QString& matchingLine);
+ void addFile(const KFileItem* item, const TQString& matchingLine);
void setFocus();
void slotResult(int);
// void slotSearchDone();
void about ();
- void slotDeleteItem(const QString&);
- void slotNewItems( const QString& );
+ void slotDeleteItem(const TQString&);
+ void slotNewItems( const TQString& );
signals:
void haveResults(bool);
diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp
index 4f5d8043f..92082019f 100644
--- a/kfind/kfindpart.cpp
+++ b/kfind/kfindpart.cpp
@@ -25,7 +25,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <qdir.h>
+#include <tqdir.h>
#include <kinstance.h>
class KonqDirPart;
@@ -33,9 +33,9 @@ class KonqDirPart;
typedef KParts::GenericFactory<KFindPart> KFindFactory;
K_EXPORT_COMPONENT_FACTORY( libkfindpart, KFindFactory )
-KFindPart::KFindPart( QWidget * parentWidget, const char *widgetName,
- QObject *parent, const char *name ,
- const QStringList & /*args*/ )
+KFindPart::KFindPart( TQWidget * parentWidget, const char *widgetName,
+ TQObject *parent, const char *name ,
+ const TQStringList & /*args*/ )
: KonqDirPart (parent, name )/*KParts::ReadOnlyPart*/
{
setInstance( KFindFactory::instance() );
@@ -46,25 +46,25 @@ KFindPart::KFindPart( QWidget * parentWidget, const char *widgetName,
m_kfindWidget = new Kfind( parentWidget, widgetName );
m_kfindWidget->setMaximumHeight(m_kfindWidget->minimumSizeHint().height());
const KFileItem *item = ((KonqDirPart*)parent)->currentItem();
- kdDebug() << "Kfind: currentItem: " << ( item ? item->url().path().local8Bit() : QString("null") ) << endl;
- QDir d;
+ kdDebug() << "Kfind: currentItem: " << ( item ? item->url().path().local8Bit() : TQString("null") ) << endl;
+ TQDir d;
if( item && d.exists( item->url().path() ))
m_kfindWidget->setURL( item->url() );
setWidget( m_kfindWidget );
- connect( m_kfindWidget, SIGNAL(started()),
- this, SLOT(slotStarted()) );
- connect( m_kfindWidget, SIGNAL(destroyMe()),
- this, SLOT(slotDestroyMe()) );
- connect(m_kfindWidget->dirlister,SIGNAL(deleteItem(KFileItem*)), this, SLOT(removeFile(KFileItem*)));
- connect(m_kfindWidget->dirlister,SIGNAL(newItems(const KFileItemList&)), this, SLOT(newFiles(const KFileItemList&)));
+ connect( m_kfindWidget, TQT_SIGNAL(started()),
+ this, TQT_SLOT(slotStarted()) );
+ connect( m_kfindWidget, TQT_SIGNAL(destroyMe()),
+ this, TQT_SLOT(slotDestroyMe()) );
+ connect(m_kfindWidget->dirlister,TQT_SIGNAL(deleteItem(KFileItem*)), this, TQT_SLOT(removeFile(KFileItem*)));
+ connect(m_kfindWidget->dirlister,TQT_SIGNAL(newItems(const KFileItemList&)), this, TQT_SLOT(newFiles(const KFileItemList&)));
//setXMLFile( "kfind.rc" );
query = new KQuery(this);
- connect(query, SIGNAL(addFile(const KFileItem *, const QString&)),
- SLOT(addFile(const KFileItem *, const QString&)));
- connect(query, SIGNAL(result(int)),
- SLOT(slotResult(int)));
+ connect(query, TQT_SIGNAL(addFile(const KFileItem *, const TQString&)),
+ TQT_SLOT(addFile(const KFileItem *, const TQString&)));
+ connect(query, TQT_SIGNAL(result(int)),
+ TQT_SLOT(slotResult(int)));
m_kfindWidget->setQuery(query);
m_bShowsResult = false;
@@ -96,7 +96,7 @@ void KFindPart::slotStarted()
emit clear();
}
-void KFindPart::addFile(const KFileItem *item, const QString& /*matchingLine*/)
+void KFindPart::addFile(const KFileItem *item, const TQString& /*matchingLine*/)
{
// item is deleted by caller
// we need to clone it
@@ -173,7 +173,7 @@ void KFindPart::slotDestroyMe()
emit findClosed();
}
-void KFindPart::saveState( QDataStream& stream )
+void KFindPart::saveState( TQDataStream& stream )
{
KonqDirPart::saveState(stream);
@@ -188,7 +188,7 @@ void KFindPart::saveState( QDataStream& stream )
}
}
-void KFindPart::restoreState( QDataStream& stream )
+void KFindPart::restoreState( TQDataStream& stream )
{
KonqDirPart::restoreState(stream);
int nbitems;
diff --git a/kfind/kfindpart.h b/kfind/kfindpart.h
index 29b133b99..9c20d0eae 100644
--- a/kfind/kfindpart.h
+++ b/kfind/kfindpart.h
@@ -24,7 +24,7 @@
#include <kparts/part.h>
#include <kfileitem.h>
#include <kdebug.h>
-#include <qptrlist.h>
+#include <tqptrlist.h>
#include <konq_dirpart.h>
class KQuery;
@@ -44,8 +44,8 @@ class KFindPart : public KonqDirPart//KParts::ReadOnlyPart
Q_OBJECT
Q_PROPERTY( bool showsResult READ showsResult )
public:
- KFindPart( QWidget * parentWidget, const char *widgetName,
- QObject *parent, const char *name, const QStringList & /*args*/ );
+ KFindPart( TQWidget * parentWidget, const char *widgetName,
+ TQObject *parent, const char *name, const TQStringList & /*args*/ );
virtual ~KFindPart();
static KAboutData *createAboutData();
@@ -56,8 +56,8 @@ public:
bool showsResult() const { return m_bShowsResult; }
- virtual void saveState( QDataStream &stream );
- virtual void restoreState( QDataStream &stream );
+ virtual void saveState( TQDataStream &stream );
+ virtual void restoreState( TQDataStream &stream );
// "Cut" icons : disable those whose URL is in lst, enable the rest //added for konqdirpart
virtual void disableIcons( const KURL::List & ){};
@@ -76,7 +76,7 @@ signals:
protected slots:
void slotStarted();
void slotDestroyMe();
- void addFile(const KFileItem *item, const QString& matchingLine);
+ void addFile(const KFileItem *item, const TQString& matchingLine);
/* An item has been removed, so update konqueror's view */
void removeFile(KFileItem *item);
void slotResult(int errorCode);
@@ -98,7 +98,7 @@ private:
/**
* The internal storage of file items
*/
- QPtrList<KFileItem> m_lstFileItems;
+ TQPtrList<KFileItem> m_lstFileItems;
};
#endif
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index 7f8f73f96..3d7615afd 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -4,17 +4,17 @@
*
**********************************************************************/
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qwhatsthis.h>
-#include <qtooltip.h>
-#include <qcombobox.h>
-#include <qspinbox.h>
-#include <qpushbutton.h>
-#include <qapplication.h>
+#include <tqbuttongroup.h>
+#include <tqradiobutton.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqwhatsthis.h>
+#include <tqtooltip.h>
+#include <tqcombobox.h>
+#include <tqspinbox.h>
+#include <tqpushbutton.h>
+#include <tqapplication.h>
#include <kcalendarsystem.h>
#include <kglobal.h>
@@ -31,15 +31,15 @@
#include "kftabdlg.h"
// Static utility functions
-static void save_pattern(QComboBox *, const QString &, const QString &);
+static void save_pattern(TQComboBox *, const TQString &, const TQString &);
#define SPECIAL_TYPES 7
-class KSortedMimeTypeList : public QPtrList<KMimeType>
+class KSortedMimeTypeList : public TQPtrList<KMimeType>
{
public:
KSortedMimeTypeList() { };
- int compareItems(QPtrCollection::Item s1, QPtrCollection::Item s2)
+ int compareItems(TQPtrCollection::Item s1, TQPtrCollection::Item s2)
{
KMimeType *item1 = (KMimeType *) s1;
KMimeType *item2 = (KMimeType *) s2;
@@ -49,27 +49,27 @@ public:
}
};
-KfindTabWidget::KfindTabWidget(QWidget *parent, const char *name)
- : QTabWidget( parent, name ), regExpDialog(0)
+KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
+ : TQTabWidget( parent, name ), regExpDialog(0)
{
// This validator will be used for all numeric edit fields
//KDigitValidator *digitV = new KDigitValidator(this);
// ************ Page One ************
- pages[0] = new QWidget( this, "page1" );
+ pages[0] = new TQWidget( this, "page1" );
nameBox = new KComboBox(TRUE, pages[0], "combo1");
- nameBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); // allow smaller than widest entry
- QLabel * namedL = new QLabel(nameBox, i18n("&Named:"), pages[0], "named");
- QToolTip::add( namedL, i18n("You can use wildcard matching and \";\" for separating multiple names") );
+ nameBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry
+ TQLabel * namedL = new TQLabel(nameBox, i18n("&Named:"), pages[0], "named");
+ TQToolTip::add( namedL, i18n("You can use wildcard matching and \";\" for separating multiple names") );
dirBox = new KComboBox(TRUE, pages[0], "combo2");
- dirBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); // allow smaller than widest entry
- QLabel * lookinL = new QLabel(dirBox, i18n("Look &in:"), pages[0], "named");
- subdirsCb = new QCheckBox(i18n("Include &subfolders"), pages[0]);
- caseSensCb = new QCheckBox(i18n("Case s&ensitive search"), pages[0]);
- browseB = new QPushButton(i18n("&Browse..."), pages[0]);
- useLocateCb = new QCheckBox(i18n("&Use files index"), pages[0]);
+ dirBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry
+ TQLabel * lookinL = new TQLabel(dirBox, i18n("Look &in:"), pages[0], "named");
+ subdirsCb = new TQCheckBox(i18n("Include &subfolders"), pages[0]);
+ caseSensCb = new TQCheckBox(i18n("Case s&ensitive search"), pages[0]);
+ browseB = new TQPushButton(i18n("&Browse..."), pages[0]);
+ useLocateCb = new TQCheckBox(i18n("&Use files index"), pages[0]);
// Setup
@@ -83,10 +83,10 @@ KfindTabWidget::KfindTabWidget(QWidget *parent, const char *name)
nameBox->setFocus();
dirBox->setDuplicatesEnabled(FALSE);
- nameBox->setInsertionPolicy(QComboBox::AtTop);
- dirBox->setInsertionPolicy(QComboBox::AtTop);
+ nameBox->setInsertionPolicy(TQComboBox::AtTop);
+ dirBox->setInsertionPolicy(TQComboBox::AtTop);
- const QString nameWhatsThis
+ const TQString nameWhatsThis
= i18n("<qt>Enter the filename you are looking for. <br>"
"Alternatives may be separated by a semicolon \";\".<br>"
"<br>"
@@ -105,21 +105,21 @@ KfindTabWidget::KfindTabWidget(QWidget *parent, const char *name)
"having one character in between</li>"
"<li><b>My Document.kwd</b> finds a file of exactly that name</li>"
"</ul></qt>");
- QWhatsThis::add(nameBox,nameWhatsThis);
- QWhatsThis::add(namedL,nameWhatsThis);
- const QString whatsfileindex
+ TQWhatsThis::add(nameBox,nameWhatsThis);
+ TQWhatsThis::add(namedL,nameWhatsThis);
+ const TQString whatsfileindex
= i18n("<qt>This lets you use the files' index created by the <i>slocate</i> "
"package to speed-up the search; remember to update the index from time to time "
"(using <i>updatedb</i>)."
"</qt>");
- QWhatsThis::add(useLocateCb,whatsfileindex);
+ TQWhatsThis::add(useLocateCb,whatsfileindex);
// Layout
- QGridLayout *grid = new QGridLayout( pages[0], 3, 2,
+ TQGridLayout *grid = new TQGridLayout( pages[0], 3, 2,
KDialog::marginHint(),
KDialog::spacingHint() );
- QBoxLayout *subgrid = new QVBoxLayout( -1 , "subgrid" );
+ TQBoxLayout *subgrid = new TQVBoxLayout( -1 , "subgrid" );
grid->addWidget( namedL, 0, 0 );
grid->addMultiCellWidget( nameBox, 0, 0, 1, 2 );
grid->addWidget( lookinL, 1, 0 );
@@ -134,21 +134,21 @@ KfindTabWidget::KfindTabWidget(QWidget *parent, const char *name)
// Signals
- connect( browseB, SIGNAL(clicked()),
- this, SLOT(getDirectory()) );
+ connect( browseB, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(getDirectory()) );
- connect( nameBox, SIGNAL(activated(int)),
- this, SIGNAL(startSearch()));
+ connect( nameBox, TQT_SIGNAL(activated(int)),
+ this, TQT_SIGNAL(startSearch()));
// ************ Page Two
- pages[1] = new QWidget( this, "page2" );
+ pages[1] = new TQWidget( this, "page2" );
- findCreated = new QCheckBox(i18n("Find all files created or &modified:"), pages[1]);
- bg = new QButtonGroup();
- rb[0] = new QRadioButton(i18n("&between"), pages[1] );
- rb[1] = new QRadioButton(i18n("&during the previous"), pages[1] );
- QLabel * andL = new QLabel(i18n("and"), pages[1], "and");
+ findCreated = new TQCheckBox(i18n("Find all files created or &modified:"), pages[1]);
+ bg = new TQButtonGroup();
+ rb[0] = new TQRadioButton(i18n("&between"), pages[1] );
+ rb[1] = new TQRadioButton(i18n("&during the previous"), pages[1] );
+ TQLabel * andL = new TQLabel(i18n("and"), pages[1], "and");
betweenType = new KComboBox(FALSE, pages[1], "comboBetweenType");
betweenType->insertItem(i18n("minute(s)"));
betweenType->insertItem(i18n("hour(s)"));
@@ -158,22 +158,22 @@ KfindTabWidget::KfindTabWidget(QWidget *parent, const char *name)
betweenType->setCurrentItem(1);
- QDate dt = KGlobal::locale()->calendar()->addYears(QDate::currentDate(), -1);
+ TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
fromDate = new KDateCombo(dt, pages[1], "fromDate");
toDate = new KDateCombo(pages[1], "toDate");
- timeBox = new QSpinBox(1, 60, 1, pages[1], "timeBox");
+ timeBox = new TQSpinBox(1, 60, 1, pages[1], "timeBox");
sizeBox =new KComboBox(FALSE, pages[1], "sizeBox");
- QLabel * sizeL =new QLabel(sizeBox,i18n("File &size is:"), pages[1],"size");
- sizeEdit=new QSpinBox(0, INT_MAX, 1, pages[1], "sizeEdit" );
+ TQLabel * sizeL =new TQLabel(sizeBox,i18n("File &size is:"), pages[1],"size");
+ sizeEdit=new TQSpinBox(0, INT_MAX, 1, pages[1], "sizeEdit" );
sizeEdit->setValue(1);
sizeUnitBox =new KComboBox(FALSE, pages[1], "sizeUnitBox");
m_usernameBox = new KComboBox( true, pages[1], "m_combo1");
- QLabel *usernameLabel= new QLabel(m_usernameBox,i18n("Files owned by &user:"),pages[1]);
+ TQLabel *usernameLabel= new TQLabel(m_usernameBox,i18n("Files owned by &user:"),pages[1]);
m_groupBox = new KComboBox( true, pages[1], "m_combo2");
- QLabel *groupLabel= new QLabel(m_groupBox,i18n("Owned by &group:"),pages[1]);
+ TQLabel *groupLabel= new TQLabel(m_groupBox,i18n("Owned by &group:"),pages[1]);
sizeBox ->insertItem( i18n("(none)") );
sizeBox ->insertItem( i18n("At Least") );
@@ -191,19 +191,19 @@ KfindTabWidget::KfindTabWidget(QWidget *parent, const char *name)
m_usernameBox->setDuplicatesEnabled(FALSE);
m_groupBox->setDuplicatesEnabled(FALSE);
- m_usernameBox->setInsertionPolicy(QComboBox::AtTop);
- m_groupBox->setInsertionPolicy(QComboBox::AtTop);
+ m_usernameBox->setInsertionPolicy(TQComboBox::AtTop);
+ m_groupBox->setInsertionPolicy(TQComboBox::AtTop);
// Setup
- timeBox->setButtonSymbols(QSpinBox::PlusMinus);
+ timeBox->setButtonSymbols(TQSpinBox::PlusMinus);
rb[0]->setChecked(true);
bg->insert( rb[0] );
bg->insert( rb[1] );
// Layout
- QGridLayout *grid1 = new QGridLayout( pages[1], 5, 6,
+ TQGridLayout *grid1 = new TQGridLayout( pages[1], 5, 6,
KDialog::marginHint(),
KDialog::spacingHint() );
@@ -235,52 +235,52 @@ KfindTabWidget::KfindTabWidget(QWidget *parent, const char *name)
grid1->setRowStretch(6,1);
// Connect
- connect( findCreated, SIGNAL(toggled(bool)), SLOT(fixLayout()) );
- connect( bg, SIGNAL(clicked(int)), this, SLOT(fixLayout()) );
- connect( sizeBox, SIGNAL(highlighted(int)), this, SLOT(slotSizeBoxChanged(int)));
+ connect( findCreated, TQT_SIGNAL(toggled(bool)), TQT_SLOT(fixLayout()) );
+ connect( bg, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(fixLayout()) );
+ connect( sizeBox, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotSizeBoxChanged(int)));
// ************ Page Three
- pages[2] = new QWidget( this, "page3" );
+ pages[2] = new TQWidget( this, "page3" );
typeBox =new KComboBox(FALSE, pages[2], "typeBox");
- typeBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); // allow smaller than widest entry
- QLabel * typeL =new QLabel(typeBox, i18n("File &type:"), pages[2], "type");
+ typeBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry
+ TQLabel * typeL =new TQLabel(typeBox, i18n("File &type:"), pages[2], "type");
textEdit=new KLineEdit(pages[2], "textEdit" );
- QLabel * textL =new QLabel(textEdit, i18n("C&ontaining text:"), pages[2], "text");
+ TQLabel * textL =new TQLabel(textEdit, i18n("C&ontaining text:"), pages[2], "text");
- connect( textEdit, SIGNAL(returnPressed(const QString &)), SIGNAL( startSearch()));
+ connect( textEdit, TQT_SIGNAL(returnPressed(const TQString &)), TQT_SIGNAL( startSearch()));
- const QString containingtext
+ const TQString containingtext
= i18n("<qt>If specified, only files that contain this text"
" are found. Note that not all file types from the list"
" above are supported. Please refer to the documentation"
" for a list of supported file types."
"</qt>");
- QToolTip::add(textEdit,containingtext);
- QWhatsThis::add(textL,containingtext);
+ TQToolTip::add(textEdit,containingtext);
+ TQWhatsThis::add(textL,containingtext);
- caseContextCb =new QCheckBox(i18n("Case s&ensitive"), pages[2]);
- binaryContextCb =new QCheckBox(i18n("Include &binary files"), pages[2]);
- regexpContentCb =new QCheckBox(i18n("Regular e&xpression"), pages[2]);
+ caseContextCb =new TQCheckBox(i18n("Case s&ensitive"), pages[2]);
+ binaryContextCb =new TQCheckBox(i18n("Include &binary files"), pages[2]);
+ regexpContentCb =new TQCheckBox(i18n("Regular e&xpression"), pages[2]);
- const QString binaryTooltip
+ const TQString binaryTooltip
= i18n("<qt>This lets you search in any type of file, "
"even those that usually do not contain text (for example "
"program files and images).</qt>");
- QToolTip::add(binaryContextCb,binaryTooltip);
+ TQToolTip::add(binaryContextCb,binaryTooltip);
- QPushButton* editRegExp = 0;
+ TQPushButton* editRegExp = 0;
if ( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) {
// The editor is available, so lets use it.
- editRegExp = new QPushButton(i18n("&Edit..."), pages[2], "editRegExp");
+ editRegExp = new TQPushButton(i18n("&Edit..."), pages[2], "editRegExp");
}
metainfokeyEdit=new KLineEdit(pages[2], "textEdit" );
metainfoEdit=new KLineEdit(pages[2], "textEdit" );
- QLabel * textMetaInfo = new QLabel(metainfoEdit, i18n("fo&r:"), pages[2], "text");
- QLabel * textMetaKey = new QLabel(metainfokeyEdit, i18n("Search &metainfo sections:"), pages[2], "text");
+ TQLabel * textMetaInfo = new TQLabel(metainfoEdit, i18n("fo&r:"), pages[2], "text");
+ TQLabel * textMetaKey = new TQLabel(metainfokeyEdit, i18n("Search &metainfo sections:"), pages[2], "text");
// Setup
typeBox->insertItem(i18n("All Files & Folders"));
@@ -306,9 +306,9 @@ KfindTabWidget::KfindTabWidget(QWidget *parent, const char *name)
if ( editRegExp ) {
// The editor was available, so lets use it.
- connect( regexpContentCb, SIGNAL(toggled(bool) ), editRegExp, SLOT(setEnabled(bool)) );
+ connect( regexpContentCb, TQT_SIGNAL(toggled(bool) ), editRegExp, TQT_SLOT(setEnabled(bool)) );
editRegExp->setEnabled(false);
- connect( editRegExp, SIGNAL(clicked()), this, SLOT( slotEditRegExp() ) );
+ connect( editRegExp, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotEditRegExp() ) );
}
else
regexpContentCb->hide();
@@ -317,7 +317,7 @@ KfindTabWidget::KfindTabWidget(QWidget *parent, const char *name)
tmp = sizeEdit->fontMetrics().width(" 00000 ");
sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height());
- QGridLayout *grid2 = new QGridLayout( pages[2], 5, 4,
+ TQGridLayout *grid2 = new TQGridLayout( pages[2], 5, 4,
KDialog::marginHint(),
KDialog::spacingHint() );
grid2->addWidget( typeL, 0, 0 );
@@ -346,7 +346,7 @@ KfindTabWidget::KfindTabWidget(QWidget *parent, const char *name)
// Setup
- const QString whatsmetainfo
+ const TQString whatsmetainfo
= i18n("<qt>Search within files' specific comments/metainfo<br>"
"These are some examples:<br>"
"<ul>"
@@ -354,17 +354,17 @@ KfindTabWidget::KfindTabWidget(QWidget *parent, const char *name)
"<li><b>Images (png...)</b> Search images with a special resolution, comment...</li>"
"</ul>"
"</qt>");
- const QString whatsmetainfokey
+ const TQString whatsmetainfokey
= i18n("<qt>If specified, search only in this field<br>"
"<ul>"
"<li><b>Audio files (mp3...)</b> This can be Title, Album...</li>"
"<li><b>Images (png...)</b> Search only in Resolution, Bitdepth...</li>"
"</ul>"
"</qt>");
- QWhatsThis::add(textMetaInfo,whatsmetainfo);
- QToolTip::add(metainfoEdit,whatsmetainfo);
- QWhatsThis::add(textMetaKey,whatsmetainfokey);
- QToolTip::add(metainfokeyEdit,whatsmetainfokey);
+ TQWhatsThis::add(textMetaInfo,whatsmetainfo);
+ TQToolTip::add(metainfoEdit,whatsmetainfo);
+ TQWhatsThis::add(textMetaKey,whatsmetainfokey);
+ TQToolTip::add(metainfokeyEdit,whatsmetainfokey);
fixLayout();
@@ -383,7 +383,7 @@ void KfindTabWidget::setURL( const KURL & url )
KConfig *conf = KGlobal::config();
conf->setGroup("History");
m_url = url;
- QStringList sl = conf->readPathListEntry("Directories");
+ TQStringList sl = conf->readPathListEntry("Directories");
dirBox->clear(); // make sure there is no old Stuff in there
if(!sl.isEmpty()) {
@@ -397,9 +397,9 @@ void KfindTabWidget::setURL( const KURL & url )
dirBox->setCurrentItem(indx);
}
else {
- QDir m_dir("/lib");
+ TQDir m_dir("/lib");
dirBox ->insertItem( m_url.prettyURL() );
- dirBox ->insertItem( "file:" + QDir::homeDirPath() );
+ dirBox ->insertItem( "file:" + TQDir::homeDirPath() );
dirBox ->insertItem( "file:/" );
dirBox ->insertItem( "file:/usr" );
if (m_dir.exists())
@@ -461,7 +461,7 @@ void KfindTabWidget::loadHistory()
// Load pattern history
KConfig *conf = KGlobal::config();
conf->setGroup("History");
- QStringList sl = conf->readListEntry("Patterns");
+ TQStringList sl = conf->readListEntry("Patterns");
if(!sl.isEmpty())
nameBox->insertStringList(sl);
else
@@ -479,9 +479,9 @@ void KfindTabWidget::loadHistory()
dirBox->setCurrentItem(indx);
}
else {
- QDir m_dir("/lib");
+ TQDir m_dir("/lib");
dirBox ->insertItem( m_url.prettyURL() );
- dirBox ->insertItem( "file:" + QDir::homeDirPath() );
+ dirBox ->insertItem( "file:" + TQDir::homeDirPath() );
dirBox ->insertItem( "file:/" );
dirBox ->insertItem( "file:/usr" );
if (m_dir.exists())
@@ -496,7 +496,7 @@ void KfindTabWidget::loadHistory()
void KfindTabWidget::slotEditRegExp()
{
if ( ! regExpDialog )
- regExpDialog = KParts::ComponentFactory::createInstanceFromQuery<QDialog>( "KRegExpEditor/KRegExpEditor", QString::null, this );
+ regExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString::null, this );
KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( regExpDialog->qt_cast( "KRegExpEditorInterface" ) );
if ( !iface )
@@ -522,10 +522,10 @@ void KfindTabWidget::slotSizeBoxChanged(int index)
void KfindTabWidget::setDefaults()
{
- QDate dt = KGlobal::locale()->calendar()->addYears(QDate::currentDate(), -1);
+ TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
fromDate ->setDate(dt);
- toDate ->setDate(QDate::currentDate());
+ toDate ->setDate(TQDate::currentDate());
timeBox->setValue(1);
betweenType->setCurrentItem(1);
@@ -555,15 +555,15 @@ bool KfindTabWidget::isDateValid()
// If we can not parse either of the dates or
// "from" date is bigger than "to" date return FALSE.
- QDate hi1, hi2;
+ TQDate hi1, hi2;
- QString str;
+ TQString str;
if ( ! fromDate->getDate(&hi1).isValid() ||
! toDate->getDate(&hi2).isValid() )
str = i18n("The date is not valid.");
else if ( hi1 > hi2 )
str = i18n("Invalid date range.");
- else if ( QDate::currentDate() < hi1 )
+ else if ( TQDate::currentDate() < hi1 )
str = i18n("Unable to search dates in the future.");
if (!str.isNull()) {
@@ -590,7 +590,7 @@ void KfindTabWidget::setQuery(KQuery *query)
if (!itemAlreadyContained)
dirBox->insertItem(dirBox->currentText().stripWhiteSpace(),0);
- QString regex = nameBox->currentText().isEmpty() ? "*" : nameBox->currentText();
+ TQString regex = nameBox->currentText().isEmpty() ? "*" : nameBox->currentText();
query->setRegExp(regex, caseSensCb->isChecked());
itemAlreadyContained=false;
for (int idx=0; idx<nameBox->count(); idx++)
@@ -640,13 +640,13 @@ void KfindTabWidget::setQuery(KQuery *query)
query->setSizeRange(sizeBox->currentItem(),size,0);
// dates
- QDateTime epoch;
+ TQDateTime epoch;
epoch.setTime_t(0);
// Add date predicate
if (findCreated->isChecked()) { // Modified
if (rb[0]->isChecked()) { // Between dates
- QDate q1, q2;
+ TQDate q1, q2;
fromDate->getDate(&q1);
toDate->getDate(&q2);
@@ -712,7 +712,7 @@ void KfindTabWidget::setQuery(KQuery *query)
}
else
{
- query->setMimeType( QString::null );
+ query->setMimeType( TQString::null );
}
//Metainfo
@@ -725,17 +725,17 @@ void KfindTabWidget::setQuery(KQuery *query)
binaryContextCb->isChecked(), regexpContentCb->isChecked());
}
-QString KfindTabWidget::date2String(const QDate & date) {
+TQString KfindTabWidget::date2String(const TQDate & date) {
return(KGlobal::locale()->formatDate(date, true));
}
-QDate &KfindTabWidget::string2Date(const QString & str, QDate *qd) {
+TQDate &KfindTabWidget::string2Date(const TQString & str, TQDate *qd) {
return *qd = KGlobal::locale()->readDate(str);
}
void KfindTabWidget::getDirectory()
{
- QString result =
+ TQString result =
KFileDialog::getExistingDirectory( dirBox->text(dirBox->currentItem()).stripWhiteSpace(),
this );
@@ -806,10 +806,10 @@ bool KfindTabWidget::isSearchRecursive()
/**
Digit validator. Allows only digits to be typed.
**/
-KDigitValidator::KDigitValidator( QWidget * parent, const char *name )
- : QValidator( parent, name )
+KDigitValidator::KDigitValidator( TQWidget * parent, const char *name )
+ : TQValidator( parent, name )
{
- r = new QRegExp("^[0-9]*$");
+ r = new TQRegExp("^[0-9]*$");
}
KDigitValidator::~KDigitValidator()
@@ -817,31 +817,31 @@ KDigitValidator::~KDigitValidator()
delete r;
}
-QValidator::State KDigitValidator::validate( QString & input, int & ) const
+TQValidator::State KDigitValidator::validate( TQString & input, int & ) const
{
if (r->search(input) < 0) {
// Beep on user if he enters non-digit
- QApplication::beep();
- return QValidator::Invalid;
+ TQApplication::beep();
+ return TQValidator::Invalid;
}
else
- return QValidator::Acceptable;
+ return TQValidator::Acceptable;
}
//*******************************************************
// Static utility functions
//*******************************************************
-static void save_pattern(QComboBox *obj,
- const QString & group, const QString & entry)
+static void save_pattern(TQComboBox *obj,
+ const TQString & group, const TQString & entry)
{
- // QComboBox allows insertion of items more than specified by
+ // TQComboBox allows insertion of items more than specified by
// maxCount() (QT bug?). This API call will truncate list if needed.
obj->setMaxCount(15);
// make sure the current item is saved first so it will be the
// default when started next time
- QStringList sl;
- QString cur = obj->currentText();
+ TQStringList sl;
+ TQString cur = obj->currentText();
sl.append(cur);
for (int i = 0; i < obj->count(); i++) {
if( cur != obj->text(i) ) {
@@ -854,13 +854,13 @@ static void save_pattern(QComboBox *obj,
conf->writePathEntry(entry, sl);
}
-QSize KfindTabWidget::sizeHint() const
+TQSize KfindTabWidget::sizeHint() const
{
// #44662: avoid a huge default size when the comboboxes have very large items
// Like in minicli, we changed the combobox size policy so that they can resize down,
// and then we simply provide a reasonable size hint for the whole window, depending
// on the screen width.
- QSize sz = QTabWidget::sizeHint();
+ TQSize sz = TQTabWidget::sizeHint();
KfindTabWidget* me = const_cast<KfindTabWidget*>( this );
const int screenWidth = qApp->desktop()->screenGeometry(me).width();
if ( sz.width() > screenWidth / 2 )
diff --git a/kfind/kftabdlg.h b/kfind/kftabdlg.h
index 3ead70c99..179819dff 100644
--- a/kfind/kftabdlg.h
+++ b/kfind/kftabdlg.h
@@ -7,8 +7,8 @@
#ifndef KFTABDLG_H
#define KFTABDLG_H
-#include <qtabwidget.h>
-#include <qvalidator.h> // for KDigitValidator
+#include <tqtabwidget.h>
+#include <tqvalidator.h> // for KDigitValidator
#include <kurl.h>
#include <kmimetype.h>
@@ -34,7 +34,7 @@ class KfindTabWidget: public QTabWidget
Q_OBJECT
public:
- KfindTabWidget(QWidget * parent = 0, const char *name=0);
+ KfindTabWidget(TQWidget * parent = 0, const char *name=0);
virtual ~KfindTabWidget();
void initMimeTypes();
void initSpecialMimeTypes();
@@ -49,7 +49,7 @@ public:
void setURL( const KURL & url );
- virtual QSize sizeHint() const;
+ virtual TQSize sizeHint() const;
public slots:
void setFocus();
@@ -65,58 +65,58 @@ signals:
protected:
public:
- QComboBox *nameBox;
- QComboBox *dirBox;
+ TQComboBox *nameBox;
+ TQComboBox *dirBox;
// for first page
- QCheckBox *subdirsCb;
- QCheckBox *useLocateCb;
+ TQCheckBox *subdirsCb;
+ TQCheckBox *useLocateCb;
// for third page
- QComboBox *typeBox;
- QLineEdit * textEdit;
- QCheckBox *caseSensCb;
- QComboBox *m_usernameBox;
- QComboBox *m_groupBox;
+ TQComboBox *typeBox;
+ TQLineEdit * textEdit;
+ TQCheckBox *caseSensCb;
+ TQComboBox *m_usernameBox;
+ TQComboBox *m_groupBox;
//for fourth page
- QLineEdit *metainfoEdit;
- QLineEdit *metainfokeyEdit;
+ TQLineEdit *metainfoEdit;
+ TQLineEdit *metainfokeyEdit;
private:
bool isDateValid();
- QString date2String(const QDate &);
- QDate &string2Date(const QString &, QDate * );
+ TQString date2String(const TQDate &);
+ TQDate &string2Date(const TQString &, TQDate * );
- QWidget *pages[3];
+ TQWidget *pages[3];
//1st page
- QPushButton *browseB;
+ TQPushButton *browseB;
KfDirDialog *dirselector;
//2nd page
- QCheckBox *findCreated;
- QComboBox *betweenType;
- QButtonGroup *bg;
- QRadioButton *rb[2];
+ TQCheckBox *findCreated;
+ TQComboBox *betweenType;
+ TQButtonGroup *bg;
+ TQRadioButton *rb[2];
KDateCombo * fromDate;
KDateCombo * toDate;
- QSpinBox *timeBox;
+ TQSpinBox *timeBox;
//3rd page
- QComboBox *sizeBox;
- QComboBox *sizeUnitBox;
- QSpinBox *sizeEdit;
- QCheckBox *caseContextCb;
- QCheckBox *binaryContextCb;
- QCheckBox *regexpContentCb;
- QDialog *regExpDialog;
+ TQComboBox *sizeBox;
+ TQComboBox *sizeUnitBox;
+ TQSpinBox *sizeEdit;
+ TQCheckBox *caseContextCb;
+ TQCheckBox *binaryContextCb;
+ TQCheckBox *regexpContentCb;
+ TQDialog *regExpDialog;
KURL m_url;
KMimeType::List m_types;
- QStringList m_ImageTypes;
- QStringList m_VideoTypes;
- QStringList m_AudioTypes;
+ TQStringList m_ImageTypes;
+ TQStringList m_VideoTypes;
+ TQStringList m_AudioTypes;
};
class KDigitValidator : public QValidator
@@ -124,13 +124,13 @@ class KDigitValidator : public QValidator
Q_OBJECT
public:
- KDigitValidator(QWidget * parent, const char *name = 0 );
+ KDigitValidator(TQWidget * parent, const char *name = 0 );
~KDigitValidator();
- QValidator::State validate(QString & input, int &) const;
+ TQValidator::State validate(TQString & input, int &) const;
private:
- QRegExp *r;
+ TQRegExp *r;
};
#endif
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index 9eca22f19..2ee69aa14 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -14,12 +14,12 @@
#include <sys/stat.h>
#include <time.h>
-#include <qtextstream.h>
-#include <qfileinfo.h>
-#include <qdir.h>
-#include <qclipboard.h>
-#include <qpixmap.h>
-#include <qdragobject.h>
+#include <tqtextstream.h>
+#include <tqfileinfo.h>
+#include <tqdir.h>
+#include <tqclipboard.h>
+#include <tqpixmap.h>
+#include <tqdragobject.h>
#include <kfiledialog.h>
#include <klocale.h>
@@ -34,7 +34,7 @@
#include <kpopupmenu.h>
#include <kio/netaccess.h>
#include <kurldrag.h>
-#include <qptrlist.h>
+#include <tqptrlist.h>
#include <kdebug.h>
#include <kiconloader.h>
@@ -42,7 +42,7 @@
#include "kfwin.moc"
-template class QPtrList<KfFileLVI>;
+template class TQPtrList<KfFileLVI>;
// Permission strings
static const char* perm[4] = {
@@ -55,17 +55,17 @@ static const char* perm[4] = {
#define WO 2
#define NA 3
-KfFileLVI::KfFileLVI(KfindWindow* lv, const KFileItem &item, const QString& matchingLine)
- : QListViewItem(lv),
+KfFileLVI::KfFileLVI(KfindWindow* lv, const KFileItem &item, const TQString& matchingLine)
+ : TQListViewItem(lv),
fileitem(item)
{
- fileInfo = new QFileInfo(item.url().path());
+ fileInfo = new TQFileInfo(item.url().path());
- QString size = KGlobal::locale()->formatNumber(item.size(), 0);
+ TQString size = KGlobal::locale()->formatNumber(item.size(), 0);
- QDateTime dt;
+ TQDateTime dt;
dt.setTime_t(item.time(KIO::UDS_MODIFICATION_TIME));
- QString date = KGlobal::locale()->formatDateTime(dt);
+ TQString date = KGlobal::locale()->formatDateTime(dt);
int perm_index;
if(fileInfo->isReadable())
@@ -90,26 +90,26 @@ KfFileLVI::~KfFileLVI()
delete fileInfo;
}
-QString KfFileLVI::key(int column, bool) const
+TQString KfFileLVI::key(int column, bool) const
{
switch (column) {
case 2:
// Returns size in bytes. Used for sorting
- return QString().sprintf("%010d", fileInfo->size());
+ return TQString().sprintf("%010d", fileInfo->size());
case 3:
// Returns time in secs from 1/1/1970. Used for sorting
- return QString().sprintf("%010ld", fileitem.time(KIO::UDS_MODIFICATION_TIME));
+ return TQString().sprintf("%010ld", fileitem.time(KIO::UDS_MODIFICATION_TIME));
}
return text(column);
}
-KfindWindow::KfindWindow( QWidget *parent, const char *name )
+KfindWindow::KfindWindow( TQWidget *parent, const char *name )
: KListView( parent, name )
,m_baseDir("")
,m_menu(0)
{
- setSelectionMode( QListView::Extended );
+ setSelectionMode( TQListView::Extended );
setShowSortIndicator( TRUE );
addColumn(i18n("Name"));
@@ -131,24 +131,24 @@ KfindWindow::KfindWindow( QWidget *parent, const char *name )
resetColumns(true);
- connect( this, SIGNAL(selectionChanged()),
- this, SLOT( selectionHasChanged() ));
+ connect( this, TQT_SIGNAL(selectionChanged()),
+ this, TQT_SLOT( selectionHasChanged() ));
- connect(this, SIGNAL(contextMenu(KListView *, QListViewItem*,const QPoint&)),
- this, SLOT(slotContextMenu(KListView *,QListViewItem*,const QPoint&)));
+ connect(this, TQT_SIGNAL(contextMenu(KListView *, TQListViewItem*,const TQPoint&)),
+ this, TQT_SLOT(slotContextMenu(KListView *,TQListViewItem*,const TQPoint&)));
- connect(this, SIGNAL(executed(QListViewItem*)),
- this, SLOT(slotExecute(QListViewItem*)));
+ connect(this, TQT_SIGNAL(executed(TQListViewItem*)),
+ this, TQT_SLOT(slotExecute(TQListViewItem*)));
setDragEnabled(true);
}
-QString KfindWindow::reducedDir(const QString& fullDir)
+TQString KfindWindow::reducedDir(const TQString& fullDir)
{
if (fullDir.find(m_baseDir)==0)
{
- QString tmp=fullDir.mid(m_baseDir.length());
+ TQString tmp=fullDir.mid(m_baseDir.length());
return tmp;
};
return fullDir;
@@ -156,7 +156,7 @@ QString KfindWindow::reducedDir(const QString& fullDir)
void KfindWindow::beginSearch(const KURL& baseUrl)
{
- kdDebug()<<QString("beginSearch in: %1").arg(baseUrl.path())<<endl;
+ kdDebug()<<TQString("beginSearch in: %1").arg(baseUrl.path())<<endl;
m_baseDir=baseUrl.path(+1);
haveSelection = false;
clear();
@@ -166,7 +166,7 @@ void KfindWindow::endSearch()
{
}
-void KfindWindow::insertItem(const KFileItem &item, const QString& matchingLine)
+void KfindWindow::insertItem(const KFileItem &item, const TQString& matchingLine)
{
new KfFileLVI(this, item, matchingLine);
}
@@ -174,7 +174,7 @@ void KfindWindow::insertItem(const KFileItem &item, const QString& matchingLine)
// copy to clipboard aka X11 selection
void KfindWindow::copySelection()
{
- QDragObject *drag_obj = dragObject();
+ TQDragObject *drag_obj = dragObject();
if (drag_obj)
{
@@ -185,21 +185,21 @@ void KfindWindow::copySelection()
void KfindWindow::saveResults()
{
- QListViewItem *item;
+ TQListViewItem *item;
- KFileDialog *dlg = new KFileDialog(QString::null, QString::null, this,
+ KFileDialog *dlg = new KFileDialog(TQString::null, TQString::null, this,
"filedialog", true);
dlg->setOperationMode (KFileDialog::Saving);
dlg->setCaption(i18n("Save Results As"));
- QStringList list;
+ TQStringList list;
list << "text/plain" << "text/html";
dlg->setOperationMode(KFileDialog::Saving);
- dlg->setMimeFilter(list, QString("text/plain"));
+ dlg->setMimeFilter(list, TQString("text/plain"));
dlg->exec();
@@ -210,19 +210,19 @@ void KfindWindow::saveResults()
if (!u.isValid() || !u.isLocalFile())
return;
- QString filename = u.path();
+ TQString filename = u.path();
- QFile file(filename);
+ TQFile file(filename);
if ( !file.open(IO_WriteOnly) )
KMessageBox::error(parentWidget(),
i18n("Unable to save results."));
else {
- QTextStream stream( &file );
- stream.setEncoding( QTextStream::Locale );
+ TQTextStream stream( &file );
+ stream.setEncoding( TQTextStream::Locale );
if ( mimeType->name() == "text/html") {
- stream << QString::fromLatin1("<HTML><HEAD>\n"
+ stream << TQString::fromLatin1("<HTML><HEAD>\n"
"<!DOCTYPE %1>\n"
"<TITLE>%2</TITLE></HEAD>\n"
"<BODY><H1>%3</H1>"
@@ -234,21 +234,21 @@ void KfindWindow::saveResults()
item = firstChild();
while(item != NULL)
{
- QString path=((KfFileLVI*)item)->fileitem.url().url();
- QString pretty=((KfFileLVI*)item)->fileitem.url().htmlURL();
- stream << QString::fromLatin1("<DT><A HREF=\"") << path
- << QString::fromLatin1("\">") << pretty
- << QString::fromLatin1("</A>\n");
+ TQString path=((KfFileLVI*)item)->fileitem.url().url();
+ TQString pretty=((KfFileLVI*)item)->fileitem.url().htmlURL();
+ stream << TQString::fromLatin1("<DT><A HREF=\"") << path
+ << TQString::fromLatin1("\">") << pretty
+ << TQString::fromLatin1("</A>\n");
item = item->nextSibling();
}
- stream << QString::fromLatin1("</DL><P></BODY></HTML>\n");
+ stream << TQString::fromLatin1("</DL><P></BODY></HTML>\n");
}
else {
item = firstChild();
while(item != NULL)
{
- QString path=((KfFileLVI*)item)->fileitem.url().url();
+ TQString path=((KfFileLVI*)item)->fileitem.url().url();
stream << path << endl;
item = item->nextSibling();
}
@@ -267,7 +267,7 @@ void KfindWindow::selectionHasChanged()
{
emit resultSelected(true);
- QListViewItem *item = firstChild();
+ TQListViewItem *item = firstChild();
while(item != 0L)
{
if(isSelected(item)) {
@@ -285,13 +285,13 @@ void KfindWindow::selectionHasChanged()
void KfindWindow::deleteFiles()
{
- QString tmp = i18n("Do you really want to delete the selected file?",
+ TQString tmp = i18n("Do you really want to delete the selected file?",
"Do you really want to delete the %n selected files?",selectedItems().count());
if (KMessageBox::warningContinueCancel(parentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Cancel)
return;
// Iterate on all selected elements
- QPtrList<QListViewItem> selected = selectedItems();
+ TQPtrList<TQListViewItem> selected = selectedItems();
for ( uint i = 0; i < selected.count(); i++ ) {
KfFileLVI *item = (KfFileLVI *) selected.at(i);
KFileItem file = item->fileitem;
@@ -313,7 +313,7 @@ void KfindWindow::openFolder()
{
KFileItem fileitem = ((KfFileLVI *)currentItem())->fileitem;
KURL url = fileitem.url();
- url.setFileName(QString::null);
+ url.setFileName(TQString::null);
(void) new KRun(url);
}
@@ -323,7 +323,7 @@ void KfindWindow::openBinding()
((KfFileLVI*)currentItem())->fileitem.run();
}
-void KfindWindow::slotExecute(QListViewItem* item)
+void KfindWindow::slotExecute(TQListViewItem* item)
{
if (item==0)
return;
@@ -331,17 +331,17 @@ void KfindWindow::slotExecute(QListViewItem* item)
}
// Resizes KListView to occupy all visible space
-void KfindWindow::resizeEvent(QResizeEvent *e)
+void KfindWindow::resizeEvent(TQResizeEvent *e)
{
KListView::resizeEvent(e);
resetColumns(false);
clipper()->repaint();
}
-QDragObject * KfindWindow::dragObject()
+TQDragObject * KfindWindow::dragObject()
{
KURL::List uris;
- QPtrList<QListViewItem> selected = selectedItems();
+ TQPtrList<TQListViewItem> selected = selectedItems();
// create a list of URIs from selection
for ( uint i = 0; i < selected.count(); i++ )
@@ -356,9 +356,9 @@ QDragObject * KfindWindow::dragObject()
if ( uris.count() <= 0 )
return 0;
- QUriDrag *ud = new KURLDrag( uris, (QWidget *) this, "kfind uridrag" );
+ TQUriDrag *ud = new KURLDrag( uris, (TQWidget *) this, "kfind uridrag" );
- const QPixmap *pix = currentItem()->pixmap(0);
+ const TQPixmap *pix = currentItem()->pixmap(0);
if ( pix && !pix->isNull() )
ud->setPixmap( *pix );
@@ -367,12 +367,12 @@ QDragObject * KfindWindow::dragObject()
void KfindWindow::resetColumns(bool init)
{
- QFontMetrics fm = fontMetrics();
+ TQFontMetrics fm = fontMetrics();
if (init)
{
setColumnWidth(2, QMAX(fm.width(columnText(2)), fm.width("0000000")) + 15);
- QString sampleDate =
- KGlobal::locale()->formatDateTime(QDateTime::currentDateTime());
+ TQString sampleDate =
+ KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
setColumnWidth(3, QMAX(fm.width(columnText(3)), fm.width(sampleDate)) + 15);
setColumnWidth(4, QMAX(fm.width(columnText(4)), fm.width(i18n(perm[RO]))) + 15);
setColumnWidth(5, QMAX(fm.width(columnText(5)), fm.width("some text")) + 15);
@@ -390,7 +390,7 @@ void KfindWindow::resetColumns(bool init)
setColumnWidth(1, dir_w);
}
-void KfindWindow::slotContextMenu(KListView *,QListViewItem *item,const QPoint&p)
+void KfindWindow::slotContextMenu(KListView *,TQListViewItem *item,const TQPoint&p)
{
if (!item) return;
int count = selectedItems().count();
@@ -409,21 +409,21 @@ void KfindWindow::slotContextMenu(KListView *,QListViewItem *item,const QPoint&p
{
//menu = new KPopupMenu(item->text(0), this);
m_menu->insertTitle(item->text(0));
- m_menu->insertItem(SmallIcon("fileopen"),i18n("Menu item", "Open"), this, SLOT(openBinding()));
- m_menu->insertItem(SmallIcon("window_new"),i18n("Open Folder"), this, SLOT(openFolder()));
+ m_menu->insertItem(SmallIcon("fileopen"),i18n("Menu item", "Open"), this, TQT_SLOT(openBinding()));
+ m_menu->insertItem(SmallIcon("window_new"),i18n("Open Folder"), this, TQT_SLOT(openFolder()));
m_menu->insertSeparator();
- m_menu->insertItem(SmallIcon("editcopy"),i18n("Copy"), this, SLOT(copySelection()));
- m_menu->insertItem(SmallIcon("editdelete"),i18n("Delete"), this, SLOT(deleteFiles()));
+ m_menu->insertItem(SmallIcon("editcopy"),i18n("Copy"), this, TQT_SLOT(copySelection()));
+ m_menu->insertItem(SmallIcon("editdelete"),i18n("Delete"), this, TQT_SLOT(deleteFiles()));
m_menu->insertSeparator();
- m_menu->insertItem(i18n("Open With..."), this, SLOT(slotOpenWith()));
+ m_menu->insertItem(i18n("Open With..."), this, TQT_SLOT(slotOpenWith()));
m_menu->insertSeparator();
- m_menu->insertItem(i18n("Properties"), this, SLOT(fileProperties()));
+ m_menu->insertItem(i18n("Properties"), this, TQT_SLOT(fileProperties()));
}
else
{
m_menu->insertTitle(i18n("Selected Files"));
- m_menu->insertItem(SmallIcon("editcopy"),i18n("Copy"), this, SLOT(copySelection()));
- m_menu->insertItem(SmallIcon("editdelete"),i18n("Delete"), this, SLOT(deleteFiles()));
+ m_menu->insertItem(SmallIcon("editcopy"),i18n("Copy"), this, TQT_SLOT(copySelection()));
+ m_menu->insertItem(SmallIcon("editdelete"),i18n("Delete"), this, TQT_SLOT(deleteFiles()));
}
m_menu->popup(p, 1);
}
diff --git a/kfind/kfwin.h b/kfind/kfwin.h
index 0d55c8f6a..4d5a2d9dd 100644
--- a/kfind/kfwin.h
+++ b/kfind/kfwin.h
@@ -20,12 +20,12 @@ class KfindWindow;
class KfFileLVI : public QListViewItem
{
public:
- KfFileLVI(KfindWindow* lv, const KFileItem &item,const QString& matchingLine);
+ KfFileLVI(KfindWindow* lv, const KFileItem &item,const TQString& matchingLine);
~KfFileLVI();
- QString key(int column, bool) const;
+ TQString key(int column, bool) const;
- QFileInfo *fileInfo;
+ TQFileInfo *fileInfo;
KFileItem fileitem;
};
@@ -33,18 +33,18 @@ class KfindWindow: public KListView
{
Q_OBJECT
public:
- KfindWindow( QWidget * parent = 0, const char * name = 0 );
+ KfindWindow( TQWidget * parent = 0, const char * name = 0 );
void beginSearch(const KURL& baseUrl);
void endSearch();
- void insertItem(const KFileItem &item, const QString& matchingLine);
+ void insertItem(const KFileItem &item, const TQString& matchingLine);
- QString reducedDir(const QString& fullDir);
+ TQString reducedDir(const TQString& fullDir);
public slots:
void copySelection();
- void slotContextMenu(KListView *,QListViewItem *item,const QPoint&p);
+ void slotContextMenu(KListView *,TQListViewItem *item,const TQPoint&p);
private slots:
void deleteFiles();
@@ -53,19 +53,19 @@ private slots:
void saveResults();
void openBinding();
void selectionHasChanged();
- void slotExecute(QListViewItem*);
+ void slotExecute(TQListViewItem*);
void slotOpenWith();
protected:
- virtual void resizeEvent(QResizeEvent *e);
+ virtual void resizeEvent(TQResizeEvent *e);
- virtual QDragObject *dragObject();
+ virtual TQDragObject *dragObject();
signals:
void resultSelected(bool);
private:
- QString m_baseDir;
+ TQString m_baseDir;
KPopupMenu *m_menu;
bool haveSelection;
bool m_pressed;
diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp
index 92b867567..4231f1aab 100644
--- a/kfind/kquery.cpp
+++ b/kfind/kquery.cpp
@@ -1,6 +1,6 @@
#include <stdlib.h>
-#include <qfileinfo.h>
+#include <tqfileinfo.h>
#include <kdebug.h>
#include <kfileitem.h>
#include <kfilemetainfo.h>
@@ -12,8 +12,8 @@
#include "kquery.h"
-KQuery::KQuery(QObject *parent, const char * name)
- : QObject(parent, name),
+KQuery::KQuery(TQObject *parent, const char * name)
+ : TQObject(parent, name),
m_sizemode(0), m_sizeboundary1(0), m_sizeboundary2(0),
m_timeFrom(0), m_timeTo(0),
job(0), m_insideCheckEntries(false), m_result(0)
@@ -21,9 +21,9 @@ KQuery::KQuery(QObject *parent, const char * name)
m_regexps.setAutoDelete(true);
m_fileItems.setAutoDelete(true);
processLocate = new KProcess(this);
- connect(processLocate,SIGNAL(receivedStdout(KProcess*, char*, int)),this,SLOT(slotreceivedSdtout(KProcess*,char*,int)));
- connect(processLocate,SIGNAL(receivedStderr(KProcess*, char*, int)),this,SLOT(slotreceivedSdterr(KProcess*,char*,int)));
- connect(processLocate,SIGNAL(processExited(KProcess*)),this,SLOT(slotendProcessLocate(KProcess*)));
+ connect(processLocate,TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdtout(KProcess*,char*,int)));
+ connect(processLocate,TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdterr(KProcess*,char*,int)));
+ connect(processLocate,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(slotendProcessLocate(KProcess*)));
// Files with these mime types can be ignored, even if
// findFormatByFileContent() in some cases may claim that
@@ -87,10 +87,10 @@ void KQuery::start()
else
job = KIO::listDir( m_url, false );
- connect(job, SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)),
- SLOT(slotListEntries(KIO::Job *, const KIO::UDSEntryList &)));
- connect(job, SIGNAL(result(KIO::Job *)), SLOT(slotResult(KIO::Job *)));
- connect(job, SIGNAL(canceled(KIO::Job *)), SLOT(slotCanceled(KIO::Job *)));
+ connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)),
+ TQT_SLOT(slotListEntries(KIO::Job *, const KIO::UDSEntryList &)));
+ connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(canceled(KIO::Job *)), TQT_SLOT(slotCanceled(KIO::Job *)));
}
void KQuery::slotResult( KIO::Job * _job )
@@ -129,7 +129,7 @@ void KQuery::checkEntries()
if (m_insideCheckEntries)
return;
m_insideCheckEntries=true;
- metaKeyRx=new QRegExp(m_metainfokey,true,true);
+ metaKeyRx=new TQRegExp(m_metainfokey,true,true);
KFileItem * file = 0;
while ((file=m_fileItems.dequeue()))
{
@@ -143,13 +143,13 @@ void KQuery::checkEntries()
}
/* List of files found using slocate */
-void KQuery::slotListEntries( QStringList list )
+void KQuery::slotListEntries( TQStringList list )
{
KFileItem * file = 0;
- metaKeyRx=new QRegExp(m_metainfokey,true,true);
+ metaKeyRx=new TQRegExp(m_metainfokey,true,true);
- QStringList::Iterator it = list.begin();
- QStringList::Iterator end = list.end();
+ TQStringList::Iterator it = list.begin();
+ TQStringList::Iterator end = list.end();
for (; it != end; ++it)
{
@@ -164,7 +164,7 @@ void KQuery::slotListEntries( QStringList list )
/* Check if file meets the find's requirements*/
void KQuery::processQuery( KFileItem* file)
{
- QRegExp *filename_match;
+ TQRegExp *filename_match;
if ( file->name() == "." || file->name() == ".." )
return;
@@ -250,21 +250,21 @@ void KQuery::processQuery( KFileItem* file)
if ((!m_metainfo.isEmpty()) && (!m_metainfokey.isEmpty()))
{
bool foundmeta=false;
- QString filename = file->url().path();
+ TQString filename = file->url().path();
if(filename.startsWith("/dev/"))
return;
KFileMetaInfo metadatas(filename);
KFileMetaInfoItem metaitem;
- QStringList metakeys;
- QString strmetakeycontent;
+ TQStringList metakeys;
+ TQString strmetakeycontent;
if(metadatas.isEmpty())
return;
metakeys=metadatas.supportedKeys();
- for ( QStringList::Iterator it = metakeys.begin(); it != metakeys.end(); ++it )
+ for ( TQStringList::Iterator it = metakeys.begin(); it != metakeys.end(); ++it )
{
if (!metaKeyRx->exactMatch(*it))
continue;
@@ -281,7 +281,7 @@ void KQuery::processQuery( KFileItem* file)
}
// match contents...
- QString matchingLine;
+ TQString matchingLine;
if (!m_context.isEmpty())
{
@@ -296,11 +296,11 @@ void KQuery::processQuery( KFileItem* file)
// FIXME: doesn't work with non local files
- QString filename;
- QTextStream* stream=0;
- QFile qf;
- QRegExp xmlTags;
- QByteArray zippedXmlFileContent;
+ TQString filename;
+ TQTextStream* stream=0;
+ TQFile qf;
+ TQRegExp xmlTags;
+ TQByteArray zippedXmlFileContent;
// KWord's and OpenOffice.org's files are zipped...
if( ooo_mimetypes.findIndex(file->mimetype()) != -1 ||
@@ -326,8 +326,8 @@ void KQuery::processQuery( KFileItem* file)
zippedXmlFileContent = zipfileEntry->data();
xmlTags.setPattern("<.*>");
xmlTags.setMinimal(true);
- stream = new QTextStream(zippedXmlFileContent, IO_ReadOnly);
- stream->setEncoding(QTextStream::UnicodeUTF8);
+ stream = new TQTextStream(zippedXmlFileContent, IO_ReadOnly);
+ stream->setEncoding(TQTextStream::UnicodeUTF8);
isZippedOfficeDocument = true;
} else {
kdWarning() << "Cannot open supposed ZIP file " << file->url() << endl;
@@ -348,13 +348,13 @@ void KQuery::processQuery( KFileItem* file)
return;
qf.setName(filename);
qf.open(IO_ReadOnly);
- stream=new QTextStream(&qf);
- stream->setEncoding(QTextStream::Locale);
+ stream=new TQTextStream(&qf);
+ stream->setEncoding(TQTextStream::Locale);
}
while ( ! stream->atEnd() )
{
- QString str = stream->readLine();
+ TQString str = stream->readLine();
matchingLineNumber++;
if (str.isNull()) break;
@@ -365,7 +365,7 @@ void KQuery::processQuery( KFileItem* file)
{
if (m_regexp.search(str)>=0)
{
- matchingLine=QString::number(matchingLineNumber)+": "+str;
+ matchingLine=TQString::number(matchingLineNumber)+": "+str;
found = true;
break;
}
@@ -375,7 +375,7 @@ void KQuery::processQuery( KFileItem* file)
if ((!str.isNull()) && (!m_context.isNull())) {
if (str.find(m_context, 0, m_casesensitive) != -1)
{
- matchingLine=QString::number(matchingLineNumber)+": "+str;
+ matchingLine=TQString::number(matchingLineNumber)+": "+str;
found = true;
break;
}
@@ -394,7 +394,7 @@ void KQuery::processQuery( KFileItem* file)
emit addFile(file,matchingLine);
}
-void KQuery::setContext(const QString & context, bool casesensitive,
+void KQuery::setContext(const TQString & context, bool casesensitive,
bool search_binary, bool useRegexp)
{
m_context = context;
@@ -407,13 +407,13 @@ void KQuery::setContext(const QString & context, bool casesensitive,
m_regexp.setPattern(m_context);
}
-void KQuery::setMetaInfo(const QString &metainfo, const QString &metainfokey)
+void KQuery::setMetaInfo(const TQString &metainfo, const TQString &metainfokey)
{
m_metainfo=metainfo;
m_metainfokey=metainfokey;
}
-void KQuery::setMimeType(const QStringList &mimetype)
+void KQuery::setMimeType(const TQStringList &mimetype)
{
m_mimetype = mimetype;
}
@@ -436,28 +436,28 @@ void KQuery::setTimeRange(time_t from, time_t to)
m_timeTo = to;
}
-void KQuery::setUsername(QString username)
+void KQuery::setUsername(TQString username)
{
m_username = username;
}
-void KQuery::setGroupname(QString groupname)
+void KQuery::setGroupname(TQString groupname)
{
m_groupname = groupname;
}
-void KQuery::setRegExp(const QString &regexp, bool caseSensitive)
+void KQuery::setRegExp(const TQString &regexp, bool caseSensitive)
{
- QRegExp *regExp;
- QRegExp sep(";");
- QStringList strList=QStringList::split( sep, regexp, false);
-// QRegExp globChars ("[\\*\\?\\[\\]]", TRUE, FALSE);
+ TQRegExp *regExp;
+ TQRegExp sep(";");
+ TQStringList strList=TQStringList::split( sep, regexp, false);
+// TQRegExp globChars ("[\\*\\?\\[\\]]", TRUE, FALSE);
m_regexps.clear();
// m_regexpsContainsGlobs.clear();
- for ( QStringList::ConstIterator it = strList.begin(); it != strList.end(); ++it ) {
- regExp = new QRegExp((*it),caseSensitive,true);
+ for ( TQStringList::ConstIterator it = strList.begin(); it != strList.end(); ++it ) {
+ regExp = new TQRegExp((*it),caseSensitive,true);
// m_regexpsContainsGlobs.append(regExp->pattern().contains(globChars));
m_regexps.append(regExp);
}
@@ -480,7 +480,7 @@ void KQuery::setUseFileIndex(bool useLocate)
void KQuery::slotreceivedSdterr(KProcess* ,char* str,int)
{
- KMessageBox::error(NULL, QString(str), i18n("Error while using locate"));
+ KMessageBox::error(NULL, TQString(str), i18n("Error while using locate"));
}
void KQuery::slotreceivedSdtout(KProcess*,char* str,int l)
@@ -496,8 +496,8 @@ void KQuery::slotreceivedSdtout(KProcess*,char* str,int l)
void KQuery::slotendProcessLocate(KProcess*)
{
- QString qstr;
- QStringList strlist;
+ TQString qstr;
+ TQStringList strlist;
int i,j,k;
if((bufferLocateLength==0)||(bufferLocate==NULL))
diff --git a/kfind/kquery.h b/kfind/kquery.h
index c7e81fcfe..a599cdbf1 100644
--- a/kfind/kquery.h
+++ b/kfind/kquery.h
@@ -3,11 +3,11 @@
#include <time.h>
-#include <qobject.h>
-#include <qregexp.h>
-#include <qptrqueue.h>
-#include <qdir.h>
-#include <qstringlist.h>
+#include <tqobject.h>
+#include <tqregexp.h>
+#include <tqptrqueue.h>
+#include <tqdir.h>
+#include <tqstringlist.h>
#include <kio/job.h>
#include <kurl.h>
@@ -20,21 +20,21 @@ class KQuery : public QObject
Q_OBJECT
public:
- KQuery(QObject *parent = 0, const char * name = 0);
+ KQuery(TQObject *parent = 0, const char * name = 0);
~KQuery();
void setSizeRange( int mode, KIO::filesize_t value1, KIO::filesize_t value2 );
void setTimeRange( time_t from, time_t to );
- void setRegExp( const QString &regexp, bool caseSensitive );
+ void setRegExp( const TQString &regexp, bool caseSensitive );
void setRecursive( bool recursive );
void setPath(const KURL & url );
void setFileType( int filetype );
- void setMimeType( const QStringList & mimetype );
- void setContext( const QString & context, bool casesensitive,
+ void setMimeType( const TQStringList & mimetype );
+ void setContext( const TQString & context, bool casesensitive,
bool search_binary, bool useRegexp );
- void setUsername( QString username );
- void setGroupname( QString groupname );
- void setMetaInfo(const QString &metainfo, const QString &metainfokey);
+ void setUsername( TQString username );
+ void setGroupname( TQString groupname );
+ void setMetaInfo(const TQString &metainfo, const TQString &metainfokey);
void setUseFileIndex(bool);
void start();
@@ -47,7 +47,7 @@ class KQuery : public QObject
public slots:
/* List of files found using slocate */
- void slotListEntries(QStringList);
+ void slotListEntries(TQStringList);
protected slots:
/* List of files found using KIO */
void slotListEntries(KIO::Job *, const KIO::UDSEntryList &);
@@ -58,7 +58,7 @@ class KQuery : public QObject
void slotendProcessLocate(KProcess*);
signals:
- void addFile(const KFileItem *filename, const QString& matchingLine);
+ void addFile(const KFileItem *filename, const TQString& matchingLine);
void result(int);
private:
@@ -71,32 +71,32 @@ class KQuery : public QObject
KURL m_url;
time_t m_timeFrom;
time_t m_timeTo;
- QRegExp m_regexp;// regexp for file content
+ TQRegExp m_regexp;// regexp for file content
bool m_recursive;
- QStringList m_mimetype;
- QString m_context;
- QString m_username;
- QString m_groupname;
- QString m_metainfo;
- QString m_metainfokey;
+ TQStringList m_mimetype;
+ TQString m_context;
+ TQString m_username;
+ TQString m_groupname;
+ TQString m_metainfo;
+ TQString m_metainfokey;
bool m_casesensitive;
bool m_search_binary;
bool m_regexpForContent;
bool m_useLocate;
char* bufferLocate;
int bufferLocateLength;
- QStringList locateList;
+ TQStringList locateList;
KProcess *processLocate;
- QPtrList<QRegExp> m_regexps;// regexps for file name
-// QValueList<bool> m_regexpsContainsGlobs; // what should this be good for ? Alex
+ TQPtrList<TQRegExp> m_regexps;// regexps for file name
+// TQValueList<bool> m_regexpsContainsGlobs; // what should this be good for ? Alex
KIO::ListJob *job;
bool m_insideCheckEntries;
- QPtrQueue<KFileItem> m_fileItems;
- QRegExp* metaKeyRx;
+ TQPtrQueue<KFileItem> m_fileItems;
+ TQRegExp* metaKeyRx;
int m_result;
- QStringList ignore_mimetypes;
- QStringList ooo_mimetypes; // OpenOffice.org mimetypes
- QStringList koffice_mimetypes;
+ TQStringList ignore_mimetypes;
+ TQStringList ooo_mimetypes; // OpenOffice.org mimetypes
+ TQStringList koffice_mimetypes;
};
#endif
diff --git a/kfind/main.cpp b/kfind/main.cpp
index a92f0ddcd..eb19ef041 100644
--- a/kfind/main.cpp
+++ b/kfind/main.cpp
@@ -1,5 +1,5 @@
-#include <qdir.h>
-#include <qfile.h>
+#include <tqdir.h>
+#include <tqfile.h>
#include <kapplication.h>
#include <klocale.h>
@@ -53,9 +53,9 @@ int main( int argc, char ** argv )
if (args->count() > 0)
url = args->url(0);
if (url.isEmpty())
- url = QDir::currentDirPath();
+ url = TQDir::currentDirPath();
if (url.isEmpty())
- url = QDir::homeDirPath();
+ url = TQDir::homeDirPath();
args->clear();
KfindDlg kfinddlg(url, 0, "dialog");
diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp
index 77966451b..716c4d99e 100644
--- a/khelpcenter/docentry.cpp
+++ b/khelpcenter/docentry.cpp
@@ -1,5 +1,5 @@
-#include <qregexp.h>
-#include <qfileinfo.h>
+#include <tqregexp.h>
+#include <tqfileinfo.h>
#include <kdebug.h>
#include <kdesktopfile.h>
@@ -18,8 +18,8 @@ DocEntry::DocEntry()
init();
}
-DocEntry::DocEntry( const QString &name, const QString &url,
- const QString &icon )
+DocEntry::DocEntry( const TQString &name, const TQString &url,
+ const TQString &icon )
{
init();
@@ -37,32 +37,32 @@ void DocEntry::init()
mNextSibling = 0;
}
-void DocEntry::setName( const QString &name )
+void DocEntry::setName( const TQString &name )
{
mName = name;
}
-QString DocEntry::name() const
+TQString DocEntry::name() const
{
return mName;
}
-void DocEntry::setSearch( const QString &search )
+void DocEntry::setSearch( const TQString &search )
{
mSearch = search;
}
-QString DocEntry::search() const
+TQString DocEntry::search() const
{
return mSearch;
}
-void DocEntry::setIcon( const QString &icon )
+void DocEntry::setIcon( const TQString &icon )
{
mIcon = icon;
}
-QString DocEntry::icon() const
+TQString DocEntry::icon() const
{
if ( !mIcon.isEmpty() ) return mIcon;
@@ -72,67 +72,67 @@ QString DocEntry::icon() const
else return "document2";
}
-void DocEntry::setUrl( const QString &url )
+void DocEntry::setUrl( const TQString &url )
{
mUrl = url;
}
-QString DocEntry::url() const
+TQString DocEntry::url() const
{
if ( !mUrl.isEmpty() ) return mUrl;
- if ( identifier().isEmpty() ) return QString::null;
+ if ( identifier().isEmpty() ) return TQString::null;
return "khelpcenter:" + identifier();
}
-void DocEntry::setInfo( const QString &info )
+void DocEntry::setInfo( const TQString &info )
{
mInfo = info;
}
-QString DocEntry::info() const
+TQString DocEntry::info() const
{
return mInfo;
}
-void DocEntry::setLang( const QString &lang )
+void DocEntry::setLang( const TQString &lang )
{
mLang = lang;
}
-QString DocEntry::lang() const
+TQString DocEntry::lang() const
{
return mLang;
}
-void DocEntry::setIdentifier( const QString &identifier )
+void DocEntry::setIdentifier( const TQString &identifier )
{
mIdentifier = identifier;
}
-QString DocEntry::identifier() const
+TQString DocEntry::identifier() const
{
if ( mIdentifier.isEmpty() ) mIdentifier = KApplication::randomString( 15 );
return mIdentifier;
}
-void DocEntry::setIndexer( const QString &indexer )
+void DocEntry::setIndexer( const TQString &indexer )
{
mIndexer = indexer;
}
-QString DocEntry::indexer() const
+TQString DocEntry::indexer() const
{
return mIndexer;
}
-void DocEntry::setIndexTestFile( const QString &indexTestFile )
+void DocEntry::setIndexTestFile( const TQString &indexTestFile )
{
mIndexTestFile = indexTestFile;
}
-QString DocEntry::indexTestFile() const
+TQString DocEntry::indexTestFile() const
{
return mIndexTestFile;
}
@@ -147,27 +147,27 @@ int DocEntry::weight() const
return mWeight;
}
-void DocEntry::setSearchMethod( const QString &method )
+void DocEntry::setSearchMethod( const TQString &method )
{
mSearchMethod = method;
}
-QString DocEntry::searchMethod() const
+TQString DocEntry::searchMethod() const
{
return mSearchMethod;
}
-void DocEntry::setDocumentType( const QString &str )
+void DocEntry::setDocumentType( const TQString &str )
{
mDocumentType = str;
}
-QString DocEntry::documentType() const
+TQString DocEntry::documentType() const
{
return mDocumentType;
}
-QString DocEntry::khelpcenterSpecial() const
+TQString DocEntry::khelpcenterSpecial() const
{
return mKhelpcenterSpecial;
}
@@ -202,7 +202,7 @@ bool DocEntry::isDirectory() const
return mDirectory;
}
-bool DocEntry::readFromFile( const QString &fileName )
+bool DocEntry::readFromFile( const TQString &fileName )
{
KDesktopFile file( fileName );
@@ -215,7 +215,7 @@ bool DocEntry::readFromFile( const QString &fileName )
mLang = file.readEntry( "Lang", "en" );
mIdentifier = file.readEntry( "X-DOC-Identifier" );
if ( mIdentifier.isEmpty() ) {
- QFileInfo fi( fileName );
+ TQFileInfo fi( fileName );
mIdentifier = fi.baseName( true );
}
mIndexer = file.readEntry( "X-DOC-Indexer" );
@@ -233,9 +233,9 @@ bool DocEntry::readFromFile( const QString &fileName )
return true;
}
-bool DocEntry::indexExists( const QString &indexDir )
+bool DocEntry::indexExists( const TQString &indexDir )
{
- QString testFile;
+ TQString testFile;
if ( mIndexTestFile.isEmpty() ) {
testFile = identifier() + ".exists";
} else {
@@ -244,7 +244,7 @@ bool DocEntry::indexExists( const QString &indexDir )
if ( !testFile.startsWith( "/" ) ) testFile = indexDir + "/" + testFile;
- return QFile::exists( testFile );
+ return TQFile::exists( testFile );
}
bool DocEntry::docExists() const
diff --git a/khelpcenter/docentry.h b/khelpcenter/docentry.h
index a2ba6b9c4..d86cde9d2 100644
--- a/khelpcenter/docentry.h
+++ b/khelpcenter/docentry.h
@@ -1,53 +1,53 @@
#ifndef DOCENTRY_H
#define DOCENTRY_H
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
namespace KHC {
class DocEntry
{
public:
- typedef QValueList<DocEntry *> List;
+ typedef TQValueList<DocEntry *> List;
DocEntry();
- DocEntry( const QString &name, const QString &url = QString::null,
- const QString &icon = QString::null );
+ DocEntry( const TQString &name, const TQString &url = TQString::null,
+ const TQString &icon = TQString::null );
- void setName( const QString & );
- QString name() const;
+ void setName( const TQString & );
+ TQString name() const;
- void setSearch( const QString & );
- QString search() const;
+ void setSearch( const TQString & );
+ TQString search() const;
- void setIcon( const QString & );
- QString icon() const;
+ void setIcon( const TQString & );
+ TQString icon() const;
- void setUrl( const QString & );
- QString url() const;
+ void setUrl( const TQString & );
+ TQString url() const;
- void setInfo( const QString & );
- QString info() const;
+ void setInfo( const TQString & );
+ TQString info() const;
- void setLang( const QString & );
- QString lang() const;
+ void setLang( const TQString & );
+ TQString lang() const;
- void setIdentifier( const QString & );
- QString identifier() const;
+ void setIdentifier( const TQString & );
+ TQString identifier() const;
- void setIndexer( const QString & );
- QString indexer() const;
+ void setIndexer( const TQString & );
+ TQString indexer() const;
- void setIndexTestFile( const QString & );
- QString indexTestFile() const;
+ void setIndexTestFile( const TQString & );
+ TQString indexTestFile() const;
void setWeight( int );
int weight() const;
- void setSearchMethod( const QString & );
- QString searchMethod() const;
+ void setSearchMethod( const TQString & );
+ TQString searchMethod() const;
void enableSearch( bool enabled );
bool searchEnabled() const;
@@ -55,15 +55,15 @@ class DocEntry
void setSearchEnabledDefault( bool enabled );
bool searchEnabledDefault() const;
- void setDocumentType( const QString & );
- QString documentType() const;
+ void setDocumentType( const TQString & );
+ TQString documentType() const;
void setDirectory( bool );
bool isDirectory() const;
- bool readFromFile( const QString &fileName );
+ bool readFromFile( const TQString &fileName );
- bool indexExists( const QString &indexDir );
+ bool indexExists( const TQString &indexDir );
bool docExists() const;
@@ -78,7 +78,7 @@ class DocEntry
void setNextSibling( DocEntry * );
DocEntry *nextSibling();
- QString khelpcenterSpecial() const;
+ TQString khelpcenterSpecial() const;
bool isSearchable();
@@ -88,23 +88,23 @@ class DocEntry
void init();
private:
- QString mName;
- QString mSearch;
- QString mIcon;
- QString mUrl;
- QString mInfo;
- QString mLang;
- mutable QString mIdentifier;
- QString mIndexer;
- QString mIndexTestFile;
+ TQString mName;
+ TQString mSearch;
+ TQString mIcon;
+ TQString mUrl;
+ TQString mInfo;
+ TQString mLang;
+ mutable TQString mIdentifier;
+ TQString mIndexer;
+ TQString mIndexTestFile;
int mWeight;
- QString mSearchMethod;
+ TQString mSearchMethod;
bool mSearchEnabled;
bool mSearchEnabledDefault;
- QString mDocumentType;
+ TQString mDocumentType;
bool mDirectory;
- QString mKhelpcenterSpecial;
+ TQString mKhelpcenterSpecial;
List mChildren;
DocEntry *mParent;
diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp
index 591d4d4a4..4d6dd6fad 100644
--- a/khelpcenter/docmetainfo.cpp
+++ b/khelpcenter/docmetainfo.cpp
@@ -1,4 +1,4 @@
-#include <qregexp.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <kstandarddirs.h>
@@ -48,14 +48,14 @@ DocMetaInfo::~DocMetaInfo()
mSelf = 0;
}
-DocEntry *DocMetaInfo::addDocEntry( const QString &fileName )
+DocEntry *DocMetaInfo::addDocEntry( const TQString &fileName )
{
- QFileInfo fi( fileName );
+ TQFileInfo fi( fileName );
if ( !fi.exists() ) return 0;
- QString extension = fi.extension();
- QStringList extensions = QStringList::split( '.', extension );
- QString lang;
+ TQString extension = fi.extension();
+ TQStringList extensions = TQStringList::split( '.', extension );
+ TQString lang;
if ( extensions.count() >= 2 ) {
lang = extensions[ extensions.count() - 2 ];
}
@@ -76,7 +76,7 @@ DocEntry *DocMetaInfo::addDocEntry( const QString &fileName )
if ( entry->searchMethod().lower() == "htdig" ) {
mHtmlSearch->setupDocEntry( entry );
}
- QString indexer = entry->indexer();
+ TQString indexer = entry->indexer();
indexer.replace( "%f", fileName );
entry->setIndexer( indexer );
addDocEntry( entry );
@@ -103,18 +103,18 @@ DocEntry::List DocMetaInfo::searchEntries()
return mSearchEntries;
}
-QString DocMetaInfo::languageName( const QString &langcode )
+TQString DocMetaInfo::languageName( const TQString &langcode )
{
if ( langcode == "en" ) return i18n("English");
- QString cfgfile = locate( "locale",
- QString::fromLatin1( "%1/entry.desktop" ).arg( langcode ) );
+ TQString cfgfile = locate( "locale",
+ TQString::fromLatin1( "%1/entry.desktop" ).arg( langcode ) );
kdDebug() << "-- langcode: " << langcode << " cfgfile: " << cfgfile << endl;
KSimpleConfig cfg( cfgfile );
cfg.setGroup( "KCM Locale" );
- QString name = cfg.readEntry( "Name", langcode );
+ TQString name = cfg.readEntry( "Name", langcode );
return name;
}
@@ -127,14 +127,14 @@ void DocMetaInfo::scanMetaInfo( bool force )
kdDebug( 1400 ) << "LANGS: " << mLanguages.join( " " ) << endl;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for( it = mLanguages.begin(); it != mLanguages.end(); ++it ) {
mLanguageNames.insert( *it, languageName( *it ) );
}
KConfig config( "khelpcenterrc" );
config.setGroup( "General" );
- QStringList metaInfos = config.readListEntry( "MetaInfoDirs" );
+ TQStringList metaInfos = config.readListEntry( "MetaInfoDirs" );
if ( metaInfos.isEmpty() ) {
KStandardDirs* kstd = KGlobal::dirs();
@@ -149,19 +149,19 @@ void DocMetaInfo::scanMetaInfo( bool force )
mLoaded = true;
}
-DocEntry *DocMetaInfo::scanMetaInfoDir( const QString &dirName,
+DocEntry *DocMetaInfo::scanMetaInfoDir( const TQString &dirName,
DocEntry *parent )
{
- QDir dir( dirName );
+ TQDir dir( dirName );
if ( !dir.exists() ) return 0;
const QFileInfoList *entryList = dir.entryInfoList();
QFileInfoListIterator it( *entryList );
- QFileInfo *fi;
+ TQFileInfo *fi;
for( ; ( fi = it.current() ); ++it ) {
DocEntry *entry = 0;
if ( fi->isDir() && fi->fileName() != "." && fi->fileName() != ".." ) {
- DocEntry *dirEntry = addDirEntry( QDir( fi->absFilePath() ), parent );
+ DocEntry *dirEntry = addDirEntry( TQDir( fi->absFilePath() ), parent );
entry = scanMetaInfoDir( fi->absFilePath(), dirEntry );
} else if ( fi->extension( false ) == "desktop" ) {
entry = addDocEntry( fi->absFilePath() );
@@ -172,7 +172,7 @@ DocEntry *DocMetaInfo::scanMetaInfoDir( const QString &dirName,
return 0;
}
-DocEntry *DocMetaInfo::addDirEntry( const QDir &dir, DocEntry *parent )
+DocEntry *DocMetaInfo::addDirEntry( const TQDir &dir, DocEntry *parent )
{
DocEntry *dirEntry = addDocEntry( dir.absPath() + "/.directory" );
diff --git a/khelpcenter/docmetainfo.h b/khelpcenter/docmetainfo.h
index fbca60792..9b6871fa7 100644
--- a/khelpcenter/docmetainfo.h
+++ b/khelpcenter/docmetainfo.h
@@ -1,11 +1,11 @@
#ifndef DOCMETAINFO_H
#define DOCMETAINFO_H
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qdir.h>
-#include <qmap.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
+#include <tqdir.h>
+#include <tqmap.h>
#include "docentry.h"
@@ -29,7 +29,7 @@ class DocMetaInfo
void scanMetaInfo( bool force = false );
- DocEntry *addDocEntry( const QString &fileName );
+ DocEntry *addDocEntry( const TQString &fileName );
void addDocEntry( DocEntry * );
@@ -44,11 +44,11 @@ class DocMetaInfo
void endProcess( DocEntry *entry, DocEntryTraverser *traverser );
void endTraverseEntries( DocEntryTraverser * );
- static QString languageName( const QString &langcode );
+ static TQString languageName( const TQString &langcode );
protected:
- DocEntry *scanMetaInfoDir( const QString &filename, DocEntry *parent );
- DocEntry *addDirEntry( const QDir &dir, DocEntry *parent );
+ DocEntry *scanMetaInfoDir( const TQString &filename, DocEntry *parent );
+ DocEntry *addDirEntry( const TQDir &dir, DocEntry *parent );
void traverseEntry( DocEntry *, DocEntryTraverser * );
private:
@@ -63,9 +63,9 @@ class DocMetaInfo
DocEntry mRootEntry;
- QStringList mLanguages;
+ TQStringList mLanguages;
- QMap<QString,QString> mLanguageNames;
+ TQMap<TQString,TQString> mLanguageNames;
HTMLSearch *mHtmlSearch;
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index fb7b5e525..7aa25aa36 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -28,14 +28,14 @@
#include <klocale.h>
#include <knuminput.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qspinbox.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqspinbox.h>
using namespace KHC;
-FontDialog::FontDialog( QWidget *parent, const char *name )
+FontDialog::FontDialog( TQWidget *parent, const char *name )
: KDialogBase( parent, name, true, i18n( "Font Configuration" ),
Ok | Cancel )
{
@@ -56,20 +56,20 @@ void FontDialog::slotOk()
void FontDialog::setupFontSizesBox()
{
- QGroupBox *gb = new QGroupBox( i18n( "Sizes" ), mainWidget() );
+ TQGroupBox *gb = new TQGroupBox( i18n( "Sizes" ), mainWidget() );
- QGridLayout *layout = new QGridLayout( gb );
+ TQGridLayout *layout = new TQGridLayout( gb );
layout->setSpacing( KDialog::spacingHint() );
layout->setMargin( KDialog::marginHint() * 2 );
- QLabel *lMinFontSize = new QLabel( i18n( "M&inimum font size:" ), gb );
+ TQLabel *lMinFontSize = new TQLabel( i18n( "M&inimum font size:" ), gb );
layout->addWidget( lMinFontSize, 0, 0 );
m_minFontSize = new KIntNumInput( gb );
layout->addWidget( m_minFontSize, 0, 1 );
m_minFontSize->setRange( 1, 20 );
lMinFontSize->setBuddy( m_minFontSize );
- QLabel *lMedFontSize = new QLabel( i18n( "M&edium font size:" ), gb );
+ TQLabel *lMedFontSize = new TQLabel( i18n( "M&edium font size:" ), gb );
layout->addWidget( lMedFontSize, 1, 0 );
m_medFontSize = new KIntNumInput( gb );
layout->addWidget( m_medFontSize, 1, 1 );
@@ -79,43 +79,43 @@ void FontDialog::setupFontSizesBox()
void FontDialog::setupFontTypesBox()
{
- QGroupBox *gb = new QGroupBox( i18n( "Fonts" ), mainWidget() );
+ TQGroupBox *gb = new TQGroupBox( i18n( "Fonts" ), mainWidget() );
- QGridLayout *layout = new QGridLayout( gb );
+ TQGridLayout *layout = new TQGridLayout( gb );
layout->setSpacing( KDialog::spacingHint() );
layout->setMargin( KDialog::marginHint() * 2 );
- QLabel *lStandardFont = new QLabel( i18n( "S&tandard font:" ), gb );
+ TQLabel *lStandardFont = new TQLabel( i18n( "S&tandard font:" ), gb );
layout->addWidget( lStandardFont, 0, 0 );
m_standardFontCombo = new KFontCombo( gb );
layout->addWidget( m_standardFontCombo, 0, 1 );
lStandardFont->setBuddy( m_standardFontCombo );
- QLabel *lFixedFont = new QLabel( i18n( "F&ixed font:" ), gb );
+ TQLabel *lFixedFont = new TQLabel( i18n( "F&ixed font:" ), gb );
layout->addWidget( lFixedFont, 1, 0 );
m_fixedFontCombo = new KFontCombo( gb );
layout->addWidget( m_fixedFontCombo, 1, 1 );
lFixedFont->setBuddy( m_fixedFontCombo );
- QLabel *lSerifFont = new QLabel( i18n( "S&erif font:" ), gb );
+ TQLabel *lSerifFont = new TQLabel( i18n( "S&erif font:" ), gb );
layout->addWidget( lSerifFont, 2, 0 );
m_serifFontCombo = new KFontCombo( gb );
layout->addWidget( m_serifFontCombo, 2, 1 );
lSerifFont->setBuddy( m_serifFontCombo );
- QLabel *lSansSerifFont = new QLabel( i18n( "S&ans serif font:" ), gb );
+ TQLabel *lSansSerifFont = new TQLabel( i18n( "S&ans serif font:" ), gb );
layout->addWidget( lSansSerifFont, 3, 0 );
m_sansSerifFontCombo = new KFontCombo( gb );
layout->addWidget( m_sansSerifFontCombo, 3, 1 );
lSansSerifFont->setBuddy( m_sansSerifFontCombo );
- QLabel *lItalicFont = new QLabel( i18n( "&Italic font:" ), gb );
+ TQLabel *lItalicFont = new TQLabel( i18n( "&Italic font:" ), gb );
layout->addWidget( lItalicFont, 4, 0 );
m_italicFontCombo = new KFontCombo( gb );
layout->addWidget( m_italicFontCombo, 4, 1 );
lItalicFont->setBuddy( m_italicFontCombo );
- QLabel *lFantasyFont = new QLabel( i18n( "&Fantasy font:" ), gb );
+ TQLabel *lFantasyFont = new TQLabel( i18n( "&Fantasy font:" ), gb );
layout->addWidget( lFantasyFont, 5, 0 );
m_fantasyFontCombo = new KFontCombo( gb );
layout->addWidget( m_fantasyFontCombo, 5, 1 );
@@ -124,24 +124,24 @@ void FontDialog::setupFontTypesBox()
void FontDialog::setupFontEncodingBox()
{
- QGroupBox *gb = new QGroupBox( i18n( "Encoding" ), mainWidget() );
+ TQGroupBox *gb = new TQGroupBox( i18n( "Encoding" ), mainWidget() );
- QGridLayout *layout = new QGridLayout( gb );
+ TQGridLayout *layout = new TQGridLayout( gb );
layout->setSpacing( KDialog::spacingHint() );
layout->setMargin( KDialog::marginHint() * 2 );
- QLabel *lDefaultEncoding = new QLabel( i18n( "&Default encoding:" ), gb );
+ TQLabel *lDefaultEncoding = new TQLabel( i18n( "&Default encoding:" ), gb );
layout->addWidget( lDefaultEncoding, 0, 0 );
m_defaultEncoding = new KComboBox( false, gb );
layout->addWidget( m_defaultEncoding, 0, 1 );
- QStringList encodings = KGlobal::charsets()->availableEncodingNames();
+ TQStringList encodings = KGlobal::charsets()->availableEncodingNames();
encodings.prepend( i18n( "Use Language Encoding" ) );
m_defaultEncoding->insertStringList( encodings );
lDefaultEncoding->setBuddy( m_defaultEncoding );
- QLabel *lFontSizeAdjustement = new QLabel( i18n( "&Font size adjustment:" ), gb );
+ TQLabel *lFontSizeAdjustement = new TQLabel( i18n( "&Font size adjustment:" ), gb );
layout->addWidget( lFontSizeAdjustement, 1, 0 );
- m_fontSizeAdjustement = new QSpinBox( -5, 5, 1, gb );
+ m_fontSizeAdjustement = new TQSpinBox( -5, 5, 1, gb );
layout->addWidget( m_fontSizeAdjustement, 1, 1 );
lFontSizeAdjustement->setBuddy( m_fontSizeAdjustement );
}
@@ -155,7 +155,7 @@ void FontDialog::load()
m_minFontSize->setValue( cfg->readNumEntry( "MinimumFontSize", HTML_DEFAULT_MIN_FONT_SIZE ) );
m_medFontSize->setValue( cfg->readNumEntry( "MediumFontSize", 10 ) );
- QStringList fonts = cfg->readListEntry( "Fonts" );
+ TQStringList fonts = cfg->readListEntry( "Fonts" );
if ( fonts.isEmpty() )
fonts << KGlobalSettings::generalFont().family()
<< KGlobalSettings::fixedFont().family()
@@ -189,19 +189,19 @@ void FontDialog::save()
cfg->writeEntry( "MinimumFontSize", m_minFontSize->value() );
cfg->writeEntry( "MediumFontSize", m_medFontSize->value() );
- QStringList fonts;
+ TQStringList fonts;
fonts << m_standardFontCombo->currentText()
<< m_fixedFontCombo->currentText()
<< m_serifFontCombo->currentText()
<< m_sansSerifFontCombo->currentText()
<< m_italicFontCombo->currentText()
<< m_fantasyFontCombo->currentText()
- << QString::number( m_fontSizeAdjustement->value() );
+ << TQString::number( m_fontSizeAdjustement->value() );
cfg->writeEntry( "Fonts", fonts );
if ( m_defaultEncoding->currentText() == i18n( "Use Language Encoding" ) )
- cfg->writeEntry( "DefaultEncoding", QString::null );
+ cfg->writeEntry( "DefaultEncoding", TQString::null );
else
cfg->writeEntry( "DefaultEncoding", m_defaultEncoding->currentText() );
}
diff --git a/khelpcenter/fontdialog.h b/khelpcenter/fontdialog.h
index fc468cd28..4a46fcd10 100644
--- a/khelpcenter/fontdialog.h
+++ b/khelpcenter/fontdialog.h
@@ -35,7 +35,7 @@ class FontDialog : public KDialogBase
{
Q_OBJECT
public:
- FontDialog( QWidget *parent, const char *name = 0 );
+ FontDialog( TQWidget *parent, const char *name = 0 );
protected slots:
virtual void slotOk();
@@ -57,7 +57,7 @@ class FontDialog : public KDialogBase
KFontCombo *m_italicFontCombo;
KFontCombo *m_fantasyFontCombo;
KComboBox *m_defaultEncoding;
- QSpinBox *m_fontSizeAdjustement;
+ TQSpinBox *m_fontSizeAdjustement;
};
}
diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp
index e31c9d433..b9f394289 100644
--- a/khelpcenter/formatter.cpp
+++ b/khelpcenter/formatter.cpp
@@ -26,8 +26,8 @@
#include <kconfig.h>
#include <kstandarddirs.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
using namespace KHC;
@@ -44,7 +44,7 @@ bool Formatter::readTemplates()
{
KConfig *cfg = KGlobal::config();
cfg->setGroup( "Templates" );
- QString mainTemplate = cfg->readEntry( "MainTemplate" );
+ TQString mainTemplate = cfg->readEntry( "MainTemplate" );
if ( mainTemplate.isEmpty() ) {
mainTemplate = locate( "appdata", "maintemplate" );
@@ -55,20 +55,20 @@ bool Formatter::readTemplates()
return false;
}
- QFile f( mainTemplate );
+ TQFile f( mainTemplate );
if ( !f.open( IO_ReadOnly ) ) {
kdWarning() << "Unable to open main template file '" << mainTemplate
<< "'." << endl;
return false;
}
- QTextStream ts( &f );
- QString line;
+ TQTextStream ts( &f );
+ TQString line;
enum State { IDLE, SINGLELINE, MULTILINE };
State state = IDLE;
- QString symbol;
- QString endMarker;
- QString value;
+ TQString symbol;
+ TQString endMarker;
+ TQString value;
while( !( line = ts.readLine() ).isNull() ) {
switch ( state ) {
case IDLE:
@@ -107,18 +107,18 @@ bool Formatter::readTemplates()
f.close();
#if 0
- QMap<QString,QString>::ConstIterator it;
+ TQMap<TQString,TQString>::ConstIterator it;
for( it = mSymbols.begin(); it != mSymbols.end(); ++it ) {
kdDebug() << "KEY: " << it.key() << endl;
kdDebug() << "VALUE: " << it.data() << endl;
}
#endif
- QStringList requiredSymbols;
+ TQStringList requiredSymbols;
requiredSymbols << "HEADER" << "FOOTER";
bool success = true;
- QStringList::ConstIterator it2;
+ TQStringList::ConstIterator it2;
for( it2 = requiredSymbols.begin(); it2 != requiredSymbols.end(); ++it2 ) {
if ( !mSymbols.contains( *it2 ) ) {
success = false;
@@ -132,9 +132,9 @@ bool Formatter::readTemplates()
return success;
}
-QString Formatter::header( const QString &title )
+TQString Formatter::header( const TQString &title )
{
- QString s;
+ TQString s;
if ( mHasTemplate ) {
s = mSymbols[ "HEADER" ];
s.replace( "--TITLE:--", title );
@@ -144,7 +144,7 @@ QString Formatter::header( const QString &title )
return s;
}
-QString Formatter::footer()
+TQString Formatter::footer()
{
if ( mHasTemplate ) {
return mSymbols[ "FOOTER" ];
@@ -153,33 +153,33 @@ QString Formatter::footer()
}
}
-QString Formatter::separator()
+TQString Formatter::separator()
{
// return "<table width=100%><tr><td bgcolor=\"#7B8962\">&nbsp;"
// "</td></tr></table>";
return "<hr>";
}
-QString Formatter::docTitle( const QString &title )
+TQString Formatter::docTitle( const TQString &title )
{
return "<h3><font color=\"red\">" + title + "</font></h3>";
}
-QString Formatter::sectionHeader( const QString &section )
+TQString Formatter::sectionHeader( const TQString &section )
{
return "<h2><font color=\"blue\">" + section + "</font></h2>";
}
-QString Formatter::processResult( const QString &data )
+TQString Formatter::processResult( const TQString &data )
{
- QString result;
+ TQString result;
enum { Header, BodyTag, Body, Footer };
int state = Header;
for( uint i = 0; i < data.length(); ++i ) {
- QChar c = data[i];
+ TQChar c = data[i];
switch ( state ) {
case Header:
if ( c == '<' && data.mid( i, 5 ).lower() == "<body" ) {
@@ -209,12 +209,12 @@ QString Formatter::processResult( const QString &data )
else return result;
}
-QString Formatter::paragraph( const QString &str )
+TQString Formatter::paragraph( const TQString &str )
{
return "<p>" + str + "</p>";
}
-QString Formatter::title( const QString &title )
+TQString Formatter::title( const TQString &title )
{
return "<h2>" + title + "</h2>";
}
diff --git a/khelpcenter/formatter.h b/khelpcenter/formatter.h
index 97e03c171..9710a0dca 100644
--- a/khelpcenter/formatter.h
+++ b/khelpcenter/formatter.h
@@ -20,8 +20,8 @@
#ifndef KHC_FORMATTER_H
#define KHC_FORMATTER_H
-#include <qstring.h>
-#include <qmap.h>
+#include <tqstring.h>
+#include <tqmap.h>
namespace KHC {
@@ -33,19 +33,19 @@ class Formatter
bool readTemplates();
- virtual QString header( const QString &title );
- virtual QString footer();
- virtual QString separator();
- virtual QString docTitle( const QString & );
- virtual QString sectionHeader( const QString & );
- virtual QString paragraph( const QString & );
- virtual QString title( const QString & );
+ virtual TQString header( const TQString &title );
+ virtual TQString footer();
+ virtual TQString separator();
+ virtual TQString docTitle( const TQString & );
+ virtual TQString sectionHeader( const TQString & );
+ virtual TQString paragraph( const TQString & );
+ virtual TQString title( const TQString & );
- virtual QString processResult( const QString & );
+ virtual TQString processResult( const TQString & );
private:
bool mHasTemplate;
- QMap<QString,QString> mSymbols;
+ TQMap<TQString,TQString> mSymbols;
};
}
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index 6d19aac53..dc596372e 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -30,7 +30,7 @@
#include <kstandarddirs.h>
#include <kstatusbar.h>
-#include <qheader.h>
+#include <tqheader.h>
#include <sys/stat.h>
@@ -39,7 +39,7 @@ using namespace KHC;
class SectionItem : public KListViewItem
{
public:
- SectionItem( QListViewItem *parent, const QString &text )
+ SectionItem( TQListViewItem *parent, const TQString &text )
: KListViewItem( parent, text )
{
setOpen( false );
@@ -49,7 +49,7 @@ class SectionItem : public KListViewItem
{
KListViewItem::setOpen(open);
- setPixmap( 0, SmallIcon( QString::fromLatin1( open ? "contents" : "contents2" ) ) );
+ setPixmap( 0, SmallIcon( TQString::fromLatin1( open ? "contents" : "contents2" ) ) );
}
};
@@ -57,29 +57,29 @@ class SectionItem : public KListViewItem
class EntryItem : public KListViewItem
{
public:
- EntryItem( SectionItem *parent, const QString &term, const QString &id )
+ EntryItem( SectionItem *parent, const TQString &term, const TQString &id )
: KListViewItem( parent, term ),
m_id( id )
{
}
- QString id() const { return m_id; }
+ TQString id() const { return m_id; }
private:
- QString m_id;
+ TQString m_id;
};
-Glossary::Glossary( QWidget *parent ) : KListView( parent )
+Glossary::Glossary( TQWidget *parent ) : KListView( parent )
{
m_initialized = false;
- connect( this, SIGNAL( clicked( QListViewItem * ) ),
- this, SLOT( treeItemSelected( QListViewItem * ) ) );
- connect( this, SIGNAL( returnPressed( QListViewItem * ) ),
- this, SLOT( treeItemSelected( QListViewItem * ) ) );
+ connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ),
+ this, TQT_SLOT( treeItemSelected( TQListViewItem * ) ) );
+ connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
+ this, TQT_SLOT( treeItemSelected( TQListViewItem * ) ) );
- setFrameStyle( QFrame::Panel | QFrame::Sunken );
- addColumn( QString::null );
+ setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
+ addColumn( TQString::null );
header()->hide();
setAllColumnsShowFocus( true );
setRootIsDecorated( true );
@@ -92,7 +92,7 @@ Glossary::Glossary( QWidget *parent ) : KListView( parent )
m_cacheFile = locateLocal( "cache", "help/glossary.xml" );
- m_sourceFile = View::View::langLookup( QString::fromLatin1( "khelpcenter/glossary/index.docbook" ) );
+ m_sourceFile = View::View::langLookup( TQString::fromLatin1( "khelpcenter/glossary/index.docbook" ) );
m_config = kapp->config();
m_config->setGroup( "Glossary" );
@@ -117,14 +117,14 @@ Glossary::~Glossary()
m_glossEntries.clear();
}
-const GlossaryEntry &Glossary::entry( const QString &id ) const
+const GlossaryEntry &Glossary::entry( const TQString &id ) const
{
return *m_glossEntries[ id ];
}
Glossary::CacheStatus Glossary::cacheStatus() const
{
- if ( !QFile::exists( m_cacheFile ) ||
+ if ( !TQFile::exists( m_cacheFile ) ||
m_config->readPathEntry( "CachedGlossary" ) != m_sourceFile ||
m_config->readNumEntry( "CachedGlossaryTimestamp" ) != glossaryCTime() )
return NeedRebuild;
@@ -135,7 +135,7 @@ Glossary::CacheStatus Glossary::cacheStatus() const
int Glossary::glossaryCTime() const
{
struct stat stat_buf;
- stat( QFile::encodeName( m_sourceFile ).data(), &stat_buf );
+ stat( TQFile::encodeName( m_sourceFile ).data(), &stat_buf );
return stat_buf.st_ctime;
}
@@ -147,13 +147,13 @@ void Glossary::rebuildGlossaryCache()
mainWindow->statusBar()->message( i18n( "Rebuilding cache..." ) );
KProcess *meinproc = new KProcess;
- connect( meinproc, SIGNAL( processExited( KProcess * ) ),
- this, SLOT( meinprocExited( KProcess * ) ) );
+ connect( meinproc, TQT_SIGNAL( processExited( KProcess * ) ),
+ this, TQT_SLOT( meinprocExited( KProcess * ) ) );
- *meinproc << locate( "exe", QString::fromLatin1( "meinproc" ) );
- *meinproc << QString::fromLatin1( "--output" ) << m_cacheFile;
- *meinproc << QString::fromLatin1( "--stylesheet" )
- << locate( "data", QString::fromLatin1( "khelpcenter/glossary.xslt" ) );
+ *meinproc << locate( "exe", TQString::fromLatin1( "meinproc" ) );
+ *meinproc << TQString::fromLatin1( "--output" ) << m_cacheFile;
+ *meinproc << TQString::fromLatin1( "--stylesheet" )
+ << locate( "data", TQString::fromLatin1( "khelpcenter/glossary.xslt" ) );
*meinproc << m_sourceFile;
meinproc->start( KProcess::NotifyOnExit );
@@ -163,7 +163,7 @@ void Glossary::meinprocExited( KProcess *meinproc )
{
delete meinproc;
- if ( !QFile::exists( m_cacheFile ) )
+ if ( !TQFile::exists( m_cacheFile ) )
return;
m_config->writePathEntry( "CachedGlossary", m_sourceFile );
@@ -181,36 +181,36 @@ void Glossary::meinprocExited( KProcess *meinproc )
void Glossary::buildGlossaryTree()
{
- QFile cacheFile(m_cacheFile);
+ TQFile cacheFile(m_cacheFile);
if ( !cacheFile.open( IO_ReadOnly ) )
return;
- QDomDocument doc;
+ TQDomDocument doc;
if ( !doc.setContent( &cacheFile ) )
return;
- QDomNodeList sectionNodes = doc.documentElement().elementsByTagName( QString::fromLatin1( "section" ) );
+ TQDomNodeList sectionNodes = doc.documentElement().elementsByTagName( TQString::fromLatin1( "section" ) );
for ( unsigned int i = 0; i < sectionNodes.count(); i++ ) {
- QDomElement sectionElement = sectionNodes.item( i ).toElement();
- QString title = sectionElement.attribute( QString::fromLatin1( "title" ) );
+ TQDomElement sectionElement = sectionNodes.item( i ).toElement();
+ TQString title = sectionElement.attribute( TQString::fromLatin1( "title" ) );
SectionItem *topicSection = new SectionItem( m_byTopicItem, title );
- QDomNodeList entryNodes = sectionElement.elementsByTagName( QString::fromLatin1( "entry" ) );
+ TQDomNodeList entryNodes = sectionElement.elementsByTagName( TQString::fromLatin1( "entry" ) );
for ( unsigned int j = 0; j < entryNodes.count(); j++ ) {
- QDomElement entryElement = entryNodes.item( j ).toElement();
+ TQDomElement entryElement = entryNodes.item( j ).toElement();
- QString entryId = entryElement.attribute( QString::fromLatin1( "id" ) );
+ TQString entryId = entryElement.attribute( TQString::fromLatin1( "id" ) );
if ( entryId.isNull() )
continue;
- QDomElement termElement = childElement( entryElement, QString::fromLatin1( "term" ) );
- QString term = termElement.text().simplifyWhiteSpace();
+ TQDomElement termElement = childElement( entryElement, TQString::fromLatin1( "term" ) );
+ TQString term = termElement.text().simplifyWhiteSpace();
EntryItem *entry = new EntryItem(topicSection, term, entryId );
m_idDict.insert( entryId, entry );
SectionItem *alphabSection = 0L;
- for ( QListViewItemIterator it( m_alphabItem ); it.current(); it++ )
+ for ( TQListViewItemIterator it( m_alphabItem ); it.current(); it++ )
if ( it.current()->text( 0 ) == term[ 0 ].upper() ) {
alphabSection = static_cast<SectionItem *>( it.current() );
break;
@@ -221,19 +221,19 @@ void Glossary::buildGlossaryTree()
new EntryItem( alphabSection, term, entryId );
- QDomElement definitionElement = childElement( entryElement, QString::fromLatin1( "definition" ) );
- QString definition = definitionElement.text().simplifyWhiteSpace();
+ TQDomElement definitionElement = childElement( entryElement, TQString::fromLatin1( "definition" ) );
+ TQString definition = definitionElement.text().simplifyWhiteSpace();
GlossaryEntryXRef::List seeAlso;
- QDomElement referencesElement = childElement( entryElement, QString::fromLatin1( "references" ) );
- QDomNodeList referenceNodes = referencesElement.elementsByTagName( QString::fromLatin1( "reference" ) );
+ TQDomElement referencesElement = childElement( entryElement, TQString::fromLatin1( "references" ) );
+ TQDomNodeList referenceNodes = referencesElement.elementsByTagName( TQString::fromLatin1( "reference" ) );
if ( referenceNodes.count() > 0 )
for ( unsigned int k = 0; k < referenceNodes.count(); k++ ) {
- QDomElement referenceElement = referenceNodes.item( k ).toElement();
+ TQDomElement referenceElement = referenceNodes.item( k ).toElement();
- QString term = referenceElement.attribute( QString::fromLatin1( "term" ) );
- QString id = referenceElement.attribute( QString::fromLatin1( "id" ) );
+ TQString term = referenceElement.attribute( TQString::fromLatin1( "term" ) );
+ TQString id = referenceElement.attribute( TQString::fromLatin1( "id" ) );
seeAlso += GlossaryEntryXRef( term, id );
}
@@ -243,7 +243,7 @@ void Glossary::buildGlossaryTree()
}
}
-void Glossary::treeItemSelected( QListViewItem *item )
+void Glossary::treeItemSelected( TQListViewItem *item )
{
if ( !item )
return;
@@ -254,40 +254,40 @@ void Glossary::treeItemSelected( QListViewItem *item )
item->setOpen( !item->isOpen() );
}
-QDomElement Glossary::childElement( const QDomElement &element, const QString &name )
+TQDomElement Glossary::childElement( const TQDomElement &element, const TQString &name )
{
- QDomElement e;
+ TQDomElement e;
for ( e = element.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement() )
if ( e.tagName() == name )
break;
return e;
}
-QString Glossary::entryToHtml( const GlossaryEntry &entry )
+TQString Glossary::entryToHtml( const GlossaryEntry &entry )
{
- QFile htmlFile( locate("data", "khelpcenter/glossary.html.in" ) );
+ TQFile htmlFile( locate("data", "khelpcenter/glossary.html.in" ) );
if (!htmlFile.open(IO_ReadOnly))
- return QString( "<html><head></head><body><h3>%1</h3>%2</body></html>" )
+ return TQString( "<html><head></head><body><h3>%1</h3>%2</body></html>" )
.arg( i18n( "Error" ) )
.arg( i18n( "Unable to show selected glossary entry: unable to open "
"file 'glossary.html.in'!" ) );
- QString seeAlso;
+ TQString seeAlso;
if (!entry.seeAlso().isEmpty()) {
seeAlso = i18n("See also: ");
GlossaryEntryXRef::List seeAlsos = entry.seeAlso();
GlossaryEntryXRef::List::ConstIterator it = seeAlsos.begin();
GlossaryEntryXRef::List::ConstIterator end = seeAlsos.end();
for (; it != end; ++it) {
- seeAlso += QString::fromLatin1("<a href=\"glossentry:");
+ seeAlso += TQString::fromLatin1("<a href=\"glossentry:");
seeAlso += (*it).id();
- seeAlso += QString::fromLatin1("\">") + (*it).term();
- seeAlso += QString::fromLatin1("</a>, ");
+ seeAlso += TQString::fromLatin1("\">") + (*it).term();
+ seeAlso += TQString::fromLatin1("</a>, ");
}
seeAlso = seeAlso.left(seeAlso.length() - 2);
}
- QTextStream htmlStream(&htmlFile);
+ TQTextStream htmlStream(&htmlFile);
return htmlStream.read()
.arg( i18n( "KDE Glossary" ) )
.arg( entry.term() )
@@ -301,7 +301,7 @@ QString Glossary::entryToHtml( const GlossaryEntry &entry )
.arg( View::langLookup( "khelpcenter/kdelogo2.png" ) );
}
-void Glossary::slotSelectGlossEntry( const QString &id )
+void Glossary::slotSelectGlossEntry( const TQString &id )
{
EntryItem *newItem = m_idDict.find( id );
if ( newItem == 0 )
diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h
index 56a4425c3..79ed7fb93 100644
--- a/khelpcenter/glossary.h
+++ b/khelpcenter/glossary.h
@@ -22,9 +22,9 @@
#include <klistview.h>
-#include <qdict.h>
-#include <qdom.h>
-#include <qstringlist.h>
+#include <tqdict.h>
+#include <tqdom.h>
+#include <tqstringlist.h>
class KConfig;
class KProcess;
@@ -35,41 +35,41 @@ namespace KHC {
class GlossaryEntryXRef
{
- friend QDataStream &operator>>( QDataStream &, GlossaryEntryXRef & );
+ friend TQDataStream &operator>>( TQDataStream &, GlossaryEntryXRef & );
public:
- typedef QValueList<GlossaryEntryXRef> List;
+ typedef TQValueList<GlossaryEntryXRef> List;
GlossaryEntryXRef() {}
- GlossaryEntryXRef( const QString &term, const QString &id ) :
+ GlossaryEntryXRef( const TQString &term, const TQString &id ) :
m_term( term ),
m_id( id )
{
}
- QString term() const { return m_term; }
- QString id() const { return m_id; }
+ TQString term() const { return m_term; }
+ TQString id() const { return m_id; }
private:
- QString m_term;
- QString m_id;
+ TQString m_term;
+ TQString m_id;
};
-inline QDataStream &operator<<( QDataStream &stream, const GlossaryEntryXRef &e )
+inline TQDataStream &operator<<( TQDataStream &stream, const GlossaryEntryXRef &e )
{
return stream << e.term() << e.id();
}
-inline QDataStream &operator>>( QDataStream &stream, GlossaryEntryXRef &e )
+inline TQDataStream &operator>>( TQDataStream &stream, GlossaryEntryXRef &e )
{
return stream >> e.m_term >> e.m_id;
}
class GlossaryEntry
{
- friend QDataStream &operator>>( QDataStream &, GlossaryEntry & );
+ friend TQDataStream &operator>>( TQDataStream &, GlossaryEntry & );
public:
GlossaryEntry() {}
- GlossaryEntry( const QString &term, const QString &definition,
+ GlossaryEntry( const TQString &term, const TQString &definition,
const GlossaryEntryXRef::List &seeAlso ) :
m_term( term ),
m_definition( definition ),
@@ -77,22 +77,22 @@ class GlossaryEntry
{
}
- QString term() const { return m_term; }
- QString definition() const { return m_definition; }
+ TQString term() const { return m_term; }
+ TQString definition() const { return m_definition; }
GlossaryEntryXRef::List seeAlso() const { return m_seeAlso; }
private:
- QString m_term;
- QString m_definition;
+ TQString m_term;
+ TQString m_definition;
GlossaryEntryXRef::List m_seeAlso;
};
-inline QDataStream &operator<<( QDataStream &stream, const GlossaryEntry &e )
+inline TQDataStream &operator<<( TQDataStream &stream, const GlossaryEntry &e )
{
return stream << e.term() << e.definition() << e.seeAlso();
}
-inline QDataStream &operator>>( QDataStream &stream, GlossaryEntry &e )
+inline TQDataStream &operator>>( TQDataStream &stream, GlossaryEntry &e )
{
return stream >> e.m_term >> e.m_definition >> e.m_seeAlso;
}
@@ -101,24 +101,24 @@ class Glossary : public KListView
{
Q_OBJECT
public:
- Glossary( QWidget *parent );
+ Glossary( TQWidget *parent );
virtual ~Glossary();
- const GlossaryEntry &entry( const QString &id ) const;
+ const GlossaryEntry &entry( const TQString &id ) const;
- static QString entryToHtml( const GlossaryEntry &entry );
+ static TQString entryToHtml( const GlossaryEntry &entry );
virtual void show();
public slots:
- void slotSelectGlossEntry( const QString &id );
+ void slotSelectGlossEntry( const TQString &id );
signals:
void entrySelected( const GlossaryEntry &entry );
private slots:
void meinprocExited( KProcess *meinproc );
- void treeItemSelected( QListViewItem *item );
+ void treeItemSelected( TQListViewItem *item );
private:
enum CacheStatus { NeedRebuild, CacheOk };
@@ -127,16 +127,16 @@ class Glossary : public KListView
int glossaryCTime() const;
void rebuildGlossaryCache();
void buildGlossaryTree();
- QDomElement childElement( const QDomElement &e, const QString &name );
+ TQDomElement childElement( const TQDomElement &e, const TQString &name );
KConfig *m_config;
- QListViewItem *m_byTopicItem;
- QListViewItem *m_alphabItem;
- QString m_sourceFile;
- QString m_cacheFile;
+ TQListViewItem *m_byTopicItem;
+ TQListViewItem *m_alphabItem;
+ TQString m_sourceFile;
+ TQString m_cacheFile;
CacheStatus m_status;
- QDict<GlossaryEntry> m_glossEntries;
- QDict<EntryItem> m_idDict;
+ TQDict<GlossaryEntry> m_glossEntries;
+ TQDict<EntryItem> m_idDict;
bool m_initialized;
};
diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp
index 9162d7640..9a90831f7 100644
--- a/khelpcenter/history.cpp
+++ b/khelpcenter/history.cpp
@@ -41,7 +41,7 @@ History &History::self()
return *m_instance;
}
-History::History() : QObject(),
+History::History() : TQObject(),
m_goBuffer( 0 )
{
m_entries.setAutoDelete( true );
@@ -56,31 +56,31 @@ void History::setupActions( KActionCollection *coll )
QPair<KGuiItem, KGuiItem> backForward = KStdGuiItem::backAndForward();
m_backAction = new KToolBarPopupAction( backForward.first, ALT+Key_Left,
- this, SLOT( back() ), coll, "back" );
- connect( m_backAction->popupMenu(), SIGNAL( activated( int ) ),
- SLOT( backActivated( int ) ) );
- connect( m_backAction->popupMenu(), SIGNAL( aboutToShow() ),
- SLOT( fillBackMenu() ) );
+ this, TQT_SLOT( back() ), coll, "back" );
+ connect( m_backAction->popupMenu(), TQT_SIGNAL( activated( int ) ),
+ TQT_SLOT( backActivated( int ) ) );
+ connect( m_backAction->popupMenu(), TQT_SIGNAL( aboutToShow() ),
+ TQT_SLOT( fillBackMenu() ) );
m_backAction->setEnabled( false );
m_forwardAction = new KToolBarPopupAction( backForward.second, ALT+Key_Right,
- this, SLOT( forward() ), coll,
+ this, TQT_SLOT( forward() ), coll,
"forward" );
- connect( m_forwardAction->popupMenu(), SIGNAL( activated( int ) ),
- SLOT( forwardActivated( int ) ) );
- connect( m_forwardAction->popupMenu(), SIGNAL( aboutToShow() ),
- SLOT( fillForwardMenu() ) );
+ connect( m_forwardAction->popupMenu(), TQT_SIGNAL( activated( int ) ),
+ TQT_SLOT( forwardActivated( int ) ) );
+ connect( m_forwardAction->popupMenu(), TQT_SIGNAL( aboutToShow() ),
+ TQT_SLOT( fillForwardMenu() ) );
m_forwardAction->setEnabled( false );
}
void History::installMenuBarHook( KMainWindow *mainWindow )
{
- QPopupMenu *goMenu = dynamic_cast<QPopupMenu *>(
+ TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>(
mainWindow->guiFactory()->container( "go_web", mainWindow ) );
if ( goMenu ) {
- connect( goMenu, SIGNAL( aboutToShow() ), SLOT( fillGoMenu() ) );
- connect( goMenu, SIGNAL( activated( int ) ),
- SLOT( goMenuActivated( int ) ) );
+ connect( goMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( fillGoMenu() ) );
+ connect( goMenu, TQT_SIGNAL( activated( int ) ),
+ TQT_SLOT( goMenuActivated( int ) ) );
m_goMenuIndex = goMenu->count();
}
}
@@ -123,7 +123,7 @@ void History::updateCurrentEntry( View *view )
Entry *current = m_entries.current();
- QDataStream stream( current->buffer, IO_WriteOnly );
+ TQDataStream stream( current->buffer, IO_WriteOnly );
view->browserExtension()->saveState( stream );
current->view = view;
@@ -178,7 +178,7 @@ void History::goHistoryActivated( int steps )
if ( m_goBuffer )
return;
m_goBuffer = steps;
- QTimer::singleShot( 0, this, SLOT( goHistoryDelayed() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( goHistoryDelayed() ) );
}
void History::goHistoryDelayed()
@@ -231,7 +231,7 @@ void History::goHistory( int steps )
Entry h( *current );
h.buffer.detach();
- QDataStream stream( h.buffer, IO_ReadOnly );
+ TQDataStream stream( h.buffer, IO_ReadOnly );
h.view->closeURL();
updateCurrentEntry( h.view );
@@ -242,14 +242,14 @@ void History::goHistory( int steps )
void History::fillBackMenu()
{
- QPopupMenu *menu = m_backAction->popupMenu();
+ TQPopupMenu *menu = m_backAction->popupMenu();
menu->clear();
fillHistoryPopup( menu, true, false, false );
}
void History::fillForwardMenu()
{
- QPopupMenu *menu = m_forwardAction->popupMenu();
+ TQPopupMenu *menu = m_forwardAction->popupMenu();
menu->clear();
fillHistoryPopup( menu, false, true, false );
}
@@ -257,7 +257,7 @@ void History::fillForwardMenu()
void History::fillGoMenu()
{
KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() );
- QPopupMenu *goMenu = dynamic_cast<QPopupMenu *>( mainWindow->guiFactory()->container( QString::fromLatin1( "go" ), mainWindow ) );
+ TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
if ( !goMenu || m_goMenuIndex == -1 )
return;
@@ -290,7 +290,7 @@ void History::fillGoMenu()
void History::goMenuActivated( int id )
{
KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() );
- QPopupMenu *goMenu = dynamic_cast<QPopupMenu *>( mainWindow->guiFactory()->container( QString::fromLatin1( "go" ), mainWindow ) );
+ TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
if ( !goMenu )
return;
@@ -306,12 +306,12 @@ void History::goMenuActivated( int id )
}
}
-void History::fillHistoryPopup( QPopupMenu *popup, bool onlyBack, bool onlyForward, bool checkCurrentItem, uint startPos )
+void History::fillHistoryPopup( TQPopupMenu *popup, bool onlyBack, bool onlyForward, bool checkCurrentItem, uint startPos )
{
Q_ASSERT ( popup ); // kill me if this 0... :/
Entry * current = m_entries.current();
- QPtrListIterator<Entry> it( m_entries );
+ TQPtrListIterator<Entry> it( m_entries );
if (onlyBack || onlyForward)
{
it += m_entries.at(); // Jump to current item
@@ -322,7 +322,7 @@ void History::fillHistoryPopup( QPopupMenu *popup, bool onlyBack, bool onlyForwa
uint i = 0;
while ( it.current() )
{
- QString text = it.current()->title;
+ TQString text = it.current()->title;
text = KStringHandler::csqueeze(text, 50); //CT: squeeze
text.replace( "&", "&&" );
if ( checkCurrentItem && it.current() == current )
diff --git a/khelpcenter/history.h b/khelpcenter/history.h
index 2198016b7..3a32b3e3f 100644
--- a/khelpcenter/history.h
+++ b/khelpcenter/history.h
@@ -22,8 +22,8 @@
#include <kurl.h>
-#include <qobject.h>
-#include <qptrlist.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
class KActionCollection;
class KMainWindow;
@@ -45,8 +45,8 @@ class History : public QObject
View *view;
KURL url;
- QString title;
- QByteArray buffer;
+ TQString title;
+ TQByteArray buffer;
bool search;
};
@@ -85,11 +85,11 @@ class History : public QObject
bool canGoBack() const;
bool canGoForward() const;
- void fillHistoryPopup( QPopupMenu *, bool, bool, bool, uint = 0 );
+ void fillHistoryPopup( TQPopupMenu *, bool, bool, bool, uint = 0 );
static History *m_instance;
- QPtrList<Entry> m_entries;
+ TQPtrList<Entry> m_entries;
int m_goBuffer;
diff --git a/khelpcenter/htmlsearch.cpp b/khelpcenter/htmlsearch.cpp
index 9c469ae88..3a130883a 100644
--- a/khelpcenter/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch.cpp
@@ -35,9 +35,9 @@ void HTMLSearch::setupDocEntry( KHC::DocEntry *entry )
// entry->dump();
}
-QString HTMLSearch::defaultSearch( KHC::DocEntry *entry )
+TQString HTMLSearch::defaultSearch( KHC::DocEntry *entry )
{
- QString htsearch = "cgi:";
+ TQString htsearch = "cgi:";
htsearch += mConfig->readPathEntry( "htsearch" );
htsearch += "?words=%k&method=and&format=-desc&config=";
htsearch += entry->identifier();
@@ -45,15 +45,15 @@ QString HTMLSearch::defaultSearch( KHC::DocEntry *entry )
return htsearch;
}
-QString HTMLSearch::defaultIndexer( KHC::DocEntry * )
+TQString HTMLSearch::defaultIndexer( KHC::DocEntry * )
{
- QString indexer = mConfig->readPathEntry( "indexer" );
+ TQString indexer = mConfig->readPathEntry( "indexer" );
indexer += " --indexdir=%i %f";
return indexer;
}
-QString HTMLSearch::defaultIndexTestFile( KHC::DocEntry *entry )
+TQString HTMLSearch::defaultIndexTestFile( KHC::DocEntry *entry )
{
return entry->identifier() + ".exists";
}
diff --git a/khelpcenter/htmlsearch.h b/khelpcenter/htmlsearch.h
index 84fb91813..6a98b5ec3 100644
--- a/khelpcenter/htmlsearch.h
+++ b/khelpcenter/htmlsearch.h
@@ -1,8 +1,8 @@
#ifndef KHC_HTMLSEARCH_H
#define KHC_HTMLSEARCH_H
-#include <qobject.h>
-#include <qstring.h>
+#include <tqobject.h>
+#include <tqstring.h>
class KConfig;
@@ -19,9 +19,9 @@ class HTMLSearch : public QObject
void setupDocEntry( KHC::DocEntry * );
- QString defaultSearch( KHC::DocEntry * );
- QString defaultIndexer( KHC::DocEntry * );
- QString defaultIndexTestFile( KHC::DocEntry * );
+ TQString defaultSearch( KHC::DocEntry * );
+ TQString defaultIndexer( KHC::DocEntry * );
+ TQString defaultIndexTestFile( KHC::DocEntry * );
private:
KConfig *mConfig;
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index 02d09d142..c47300190 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -1,5 +1,5 @@
-#include <qregexp.h>
-#include <qdir.h>
+#include <tqregexp.h>
+#include <tqdir.h>
#include <assert.h>
#include <kapplication.h>
@@ -15,31 +15,31 @@
HTMLSearch::HTMLSearch()
- : QObject(), _proc(0)
+ : TQObject(), _proc(0)
{
}
-QString HTMLSearch::dataPath(const QString& _lang)
+TQString HTMLSearch::dataPath(const TQString& _lang)
{
- return kapp->dirs()->saveLocation("data", QString("khelpcenter/%1").arg(_lang));
+ return kapp->dirs()->saveLocation("data", TQString("khelpcenter/%1").arg(_lang));
}
-void HTMLSearch::scanDir(const QString& dir)
+void HTMLSearch::scanDir(const TQString& dir)
{
assert( dir.at( dir.length() - 1 ) == '/' );
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
if ( KStandardDirs::exists( dir + "index.docbook" ) ) {
_files.append(dir + "index.docbook");
progress->setFilesScanned(++_filesScanned);
} else {
- QDir d(dir, "*.html", QDir::Name|QDir::IgnoreCase, QDir::Files | QDir::Readable);
- QStringList const &list = d.entryList();
- QString adir = d.canonicalPath () + "/";
- QString file;
+ TQDir d(dir, "*.html", TQDir::Name|TQDir::IgnoreCase, TQDir::Files | TQDir::Readable);
+ TQStringList const &list = d.entryList();
+ TQString adir = d.canonicalPath () + "/";
+ TQString file;
for (it=list.begin(); it != list.end(); ++it)
{
file = adir + *it;
@@ -50,8 +50,8 @@ void HTMLSearch::scanDir(const QString& dir)
}
}
- QDir d2(dir, QString::null, QDir::Name|QDir::IgnoreCase, QDir::Dirs);
- QStringList const &dlist = d2.entryList();
+ TQDir d2(dir, TQString::null, TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs);
+ TQStringList const &dlist = d2.entryList();
for (it=dlist.begin(); it != dlist.end(); ++it)
if (*it != "." && *it != "..")
{
@@ -61,9 +61,9 @@ void HTMLSearch::scanDir(const QString& dir)
}
-bool HTMLSearch::saveFilesList(const QString& _lang)
+bool HTMLSearch::saveFilesList(const TQString& _lang)
{
- QStringList dirs;
+ TQStringList dirs;
// throw away old files list
_files.clear();
@@ -80,8 +80,8 @@ bool HTMLSearch::saveFilesList(const QString& _lang)
// TODO: Man and Info!!
// add local urls
- QStringList add = config->readListEntry("Paths");
- QStringList::Iterator it;
+ TQStringList add = config->readListEntry("Paths");
+ TQStringList::Iterator it;
for (it = add.begin(); it != add.end(); ++it) {
if ( ( *it ).at( ( *it ).length() - 1 ) != '/' )
( *it ) += '/';
@@ -99,20 +99,20 @@ bool HTMLSearch::saveFilesList(const QString& _lang)
}
-bool HTMLSearch::createConfig(const QString& _lang)
+bool HTMLSearch::createConfig(const TQString& _lang)
{
- QString fname = dataPath(_lang) + "/htdig.conf";
+ TQString fname = dataPath(_lang) + "/htdig.conf";
// locate the common dir
- QString wrapper = locate("data", QString("khelpcenter/%1/wrapper.html").arg(_lang));
+ TQString wrapper = locate("data", TQString("khelpcenter/%1/wrapper.html").arg(_lang));
if (wrapper.isEmpty())
- wrapper = locate("data", QString("khelpcenter/en/wrapper.html"));
+ wrapper = locate("data", TQString("khelpcenter/en/wrapper.html"));
if (wrapper.isEmpty())
return false;
wrapper = wrapper.left(wrapper.length() - 12);
// locate the image dir
- QString images = locate("data", "khelpcenter/pics/star.png");
+ TQString images = locate("data", "khelpcenter/pics/star.png");
if (images.isEmpty())
return false;
images = images.left(images.length() - 8);
@@ -120,7 +120,7 @@ bool HTMLSearch::createConfig(const QString& _lang)
// This is an example replacement for the default bad_words file
// distributed with ht://Dig. It was compiled by Marjolein Katsma
// <HSH@taxon.demon.nl>.
- QString bad_words = i18n( "List of words to exclude from index",
+ TQString bad_words = i18n( "List of words to exclude from index",
"above:about:according:across:actually:\n"
"adj:after:afterwards:again:against:all:\n"
"almost:alone:along:already:also:although:\n"
@@ -175,14 +175,14 @@ bool HTMLSearch::createConfig(const QString& _lang)
"would:wouldnt:yes:yet:you:youd:youll:your:\n"
"youre:yours:yourself:yourselves:youve" );
- QFile f;
+ TQFile f;
f.setName( dataPath(_lang) + "/bad_words" );
if (f.open(IO_WriteOnly))
{
- QTextStream ts( &f );
- QStringList words = QStringList::split ( QRegExp ( "[\n:]" ),
+ TQTextStream ts( &f );
+ TQStringList words = TQStringList::split ( TQRegExp ( "[\n:]" ),
bad_words, false);
- for ( QStringList::ConstIterator it = words.begin();
+ for ( TQStringList::ConstIterator it = words.begin();
it != words.end(); ++it )
ts << *it << endl;
f.close();
@@ -193,7 +193,7 @@ bool HTMLSearch::createConfig(const QString& _lang)
{
kdDebug() << "Writing config for " << _lang << " to " << fname << endl;
- QTextStream ts(&f);
+ TQTextStream ts(&f);
ts << "database_dir:\t\t" << dataPath(_lang) << endl;
ts << "start_url:\t\t`" << dataPath(_lang) << "/files`" << endl;
@@ -221,7 +221,7 @@ bool HTMLSearch::createConfig(const QString& _lang)
#define CHUNK_SIZE 15
-bool HTMLSearch::generateIndex(QString _lang, QWidget *parent)
+bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
{
if (_lang == "C")
_lang = "en";
@@ -243,7 +243,7 @@ bool HTMLSearch::generateIndex(QString _lang, QWidget *parent)
// run htdig ------------------------------------------------------
KConfig *config = new KConfig("khelpcenterrc", true);
KConfigGroupSaver saver(config, "htdig");
- QString exe = config->readPathEntry("htdig", kapp->dirs()->findExe("htdig"));
+ TQString exe = config->readPathEntry("htdig", kapp->dirs()->findExe("htdig"));
if (exe.isEmpty())
{
@@ -258,7 +258,7 @@ bool HTMLSearch::generateIndex(QString _lang, QWidget *parent)
progress->setFilesToDig(_filesToDig);
_filesDigged = 0;
- QDir d; d.mkdir(dataPath(_lang));
+ TQDir d; d.mkdir(dataPath(_lang));
while (!done)
{
@@ -276,19 +276,19 @@ bool HTMLSearch::generateIndex(QString _lang, QWidget *parent)
kdDebug() << "Running htdig" << endl;
- connect(_proc, SIGNAL(receivedStdout(KProcess *,char*,int)),
- this, SLOT(htdigStdout(KProcess *,char*,int)));
+ connect(_proc, TQT_SIGNAL(receivedStdout(KProcess *,char*,int)),
+ this, TQT_SLOT(htdigStdout(KProcess *,char*,int)));
- connect(_proc, SIGNAL(processExited(KProcess *)),
- this, SLOT(htdigExited(KProcess *)));
+ connect(_proc, TQT_SIGNAL(processExited(KProcess *)),
+ this, TQT_SLOT(htdigExited(KProcess *)));
_htdigRunning = true;
// write out file
- QFile f(dataPath(_lang)+"/files");
+ TQFile f(dataPath(_lang)+"/files");
if (f.open(IO_WriteOnly))
{
- QTextStream ts(&f);
+ TQTextStream ts(&f);
for (int i=0; i<CHUNK_SIZE; ++i, ++count)
if (count < _filesToDig) {
@@ -340,8 +340,8 @@ bool HTMLSearch::generateIndex(QString _lang, QWidget *parent)
kdDebug() << "Running htmerge" << endl;
- connect(_proc, SIGNAL(processExited(KProcess *)),
- this, SLOT(htmergeExited(KProcess *)));
+ connect(_proc, TQT_SIGNAL(processExited(KProcess *)),
+ this, TQT_SLOT(htmergeExited(KProcess *)));
_htmergeRunning = true;
@@ -372,7 +372,7 @@ bool HTMLSearch::generateIndex(QString _lang, QWidget *parent)
void HTMLSearch::htdigStdout(KProcess *, char *buffer, int len)
{
- QString line = QString(buffer).left(len);
+ TQString line = TQString(buffer).left(len);
int cnt=0, index=-1;
while ( (index = line.find("file://", index+1)) > 0)
@@ -407,7 +407,7 @@ void HTMLSearch::htmergeExited(KProcess *)
void HTMLSearch::htsearchStdout(KProcess *, char *buffer, int len)
{
- _searchResult += QString::fromLocal8Bit(buffer,len);
+ _searchResult += TQString::fromLocal8Bit(buffer,len);
}
@@ -419,35 +419,35 @@ void HTMLSearch::htsearchExited(KProcess *)
}
-QString HTMLSearch::search(QString _lang, QString words, QString method, int matches,
- QString format, QString sort)
+TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int matches,
+ TQString format, TQString sort)
{
if (_lang == "C")
_lang = "en";
createConfig(_lang);
- QString result = dataPath(_lang)+"/result.html";
+ TQString result = dataPath(_lang)+"/result.html";
// run htsearch ----------------------------------------------------
KConfig *config = new KConfig("khelpcenterrc", true);
KConfigGroupSaver saver(config, "htdig");
- QString exe = config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch"));
+ TQString exe = config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch"));
if (exe.isEmpty())
{
delete config;
- return QString::null;
+ return TQString::null;
}
_proc = new KProcess();
*_proc << exe << "-c" << dataPath(_lang)+"/htdig.conf" <<
- QString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5").arg(words).arg(method).arg(matches).arg(format).arg(sort);
+ TQString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5").arg(words).arg(method).arg(matches).arg(format).arg(sort);
kdDebug() << "Running htsearch" << endl;
- connect(_proc, SIGNAL(receivedStdout(KProcess *,char*,int)),
- this, SLOT(htsearchStdout(KProcess *,char*,int)));
- connect(_proc, SIGNAL(processExited(KProcess *)),
- this, SLOT(htsearchExited(KProcess *)));
+ connect(_proc, TQT_SIGNAL(receivedStdout(KProcess *,char*,int)),
+ this, TQT_SLOT(htsearchStdout(KProcess *,char*,int)));
+ connect(_proc, TQT_SIGNAL(processExited(KProcess *)),
+ this, TQT_SLOT(htsearchExited(KProcess *)));
_htsearchRunning = true;
_searchResult = "";
@@ -461,20 +461,20 @@ QString HTMLSearch::search(QString _lang, QString words, QString method, int mat
kdDebug() << "Error running htsearch... returning now" << endl;
delete _proc;
delete config;
- return QString::null;
+ return TQString::null;
}
delete _proc;
// modify the search result
_searchResult = _searchResult.replace("http://localhost/", "file:/");
- _searchResult = _searchResult.replace("Content-type: text/html", QString::null);
+ _searchResult = _searchResult.replace("Content-type: text/html", TQString::null);
// dump the search result
- QFile f(result);
+ TQFile f(result);
if (f.open(IO_WriteOnly))
{
- QTextStream ts(&f);
+ TQTextStream ts(&f);
ts << _searchResult << endl;
@@ -483,5 +483,5 @@ QString HTMLSearch::search(QString _lang, QString words, QString method, int mat
return result;
}
delete config;
- return QString::null;
+ return TQString::null;
}
diff --git a/khelpcenter/htmlsearch/htmlsearch.h b/khelpcenter/htmlsearch/htmlsearch.h
index f5568218c..2f4031782 100644
--- a/khelpcenter/htmlsearch/htmlsearch.h
+++ b/khelpcenter/htmlsearch/htmlsearch.h
@@ -2,8 +2,8 @@
#define __HTMLSEARCH_H__
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
class QWidget;
@@ -24,10 +24,10 @@ public:
HTMLSearch();
- bool generateIndex(QString lang, QWidget *parent=0);
+ bool generateIndex(TQString lang, TQWidget *parent=0);
- QString search(QString lang, QString words, QString method="and", int matches=10,
- QString format="builtin-long", QString sort="score");
+ TQString search(TQString lang, TQString words, TQString method="and", int matches=10,
+ TQString format="builtin-long", TQString sort="score");
protected slots:
@@ -41,21 +41,21 @@ protected slots:
protected:
- QString dataPath(const QString& lang);
+ TQString dataPath(const TQString& lang);
- bool saveFilesList(const QString& lang);
- void scanDir(const QString& dir);
+ bool saveFilesList(const TQString& lang);
+ void scanDir(const TQString& dir);
- bool createConfig(const QString& lang);
+ bool createConfig(const TQString& lang);
private:
- QStringList _files;
+ TQStringList _files;
KProcess *_proc;
int _filesToDig, _filesDigged, _filesScanned;
volatile bool _htdigRunning, _htmergeRunning, _htsearchRunning;
- QString _searchResult;
+ TQString _searchResult;
ProgressDialog *progress;
};
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 20ab149b4..9dfc5e350 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -18,13 +18,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlayout.h>
+#include <tqlayout.h>
#include <kstandarddirs.h>
#include <klocale.h>
#include <kurllabel.h>
#include <kapplication.h>
-#include <qcheckbox.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqwhatsthis.h>
#include <kfiledialog.h>
#include <kprocess.h>
#include "klangcombo.h"
@@ -34,119 +34,119 @@
#include "kcmhtmlsearch.moc"
-KHTMLSearchConfig::KHTMLSearchConfig(QWidget *parent, const char *name)
+KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
: KCModule(parent, name), indexProc(0)
{
- QVBoxLayout *vbox = new QVBoxLayout(this, 5);
+ TQVBoxLayout *vbox = new TQVBoxLayout(this, 5);
- QGroupBox *gb = new QGroupBox(i18n("ht://dig"), this);
+ TQGroupBox *gb = new TQGroupBox(i18n("ht://dig"), this);
vbox->addWidget(gb);
- QGridLayout *grid = new QGridLayout(gb, 3,2, 6,6);
+ TQGridLayout *grid = new TQGridLayout(gb, 3,2, 6,6);
grid->addRowSpacing(0, gb->fontMetrics().lineSpacing());
- QLabel *l = new QLabel(i18n("The fulltext search feature makes use of the "
+ TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the "
"ht://dig HTML search engine. "
"You can get ht://dig at the"), gb);
- l->setAlignment(QLabel::WordBreak);
+ l->setAlignment(TQLabel::WordBreak);
l->setMinimumSize(l->sizeHint());
grid->addMultiCellWidget(l, 1, 1, 0, 1);
- QWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) );
+ TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) );
KURLLabel *url = new KURLLabel(gb);
url->setURL("http://www.htdig.org");
url->setText(i18n("ht://dig home page"));
- url->setAlignment(QLabel::AlignHCenter);
+ url->setAlignment(TQLabel::AlignHCenter);
grid->addMultiCellWidget(url, 2,2, 0, 1);
- connect(url, SIGNAL(leftClickedURL(const QString&)),
- this, SLOT(urlClicked(const QString&)));
+ connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
+ this, TQT_SLOT(urlClicked(const TQString&)));
- gb = new QGroupBox(i18n("Program Locations"), this);
+ gb = new TQGroupBox(i18n("Program Locations"), this);
vbox->addWidget(gb);
- grid = new QGridLayout(gb, 4,2, 6,6);
+ grid = new TQGridLayout(gb, 4,2, 6,6);
grid->addRowSpacing(0, gb->fontMetrics().lineSpacing());
htdigBin = new KURLRequester(gb);
- l = new QLabel(htdigBin, i18n("ht&dig"), gb);
+ l = new TQLabel(htdigBin, i18n("ht&dig"), gb);
l->setBuddy( htdigBin );
grid->addWidget(l, 1,0);
grid->addWidget(htdigBin, 1,1);
- connect(htdigBin->lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(configChanged()));
- QString wtstr = i18n( "Enter the path to your htdig program here, e.g. /usr/local/bin/htdig" );
- QWhatsThis::add( htdigBin, wtstr );
- QWhatsThis::add( l, wtstr );
+ connect(htdigBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
+ TQString wtstr = i18n( "Enter the path to your htdig program here, e.g. /usr/local/bin/htdig" );
+ TQWhatsThis::add( htdigBin, wtstr );
+ TQWhatsThis::add( l, wtstr );
htsearchBin = new KURLRequester(gb);
- l = new QLabel(htsearchBin, i18n("ht&search"), gb);
+ l = new TQLabel(htsearchBin, i18n("ht&search"), gb);
l->setBuddy( htsearchBin );
grid->addWidget(l, 2,0);
grid->addWidget(htsearchBin, 2,1);
- connect(htsearchBin->lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(configChanged()));
+ connect(htsearchBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
wtstr = i18n( "Enter the path to your htsearch program here, e.g. /usr/local/bin/htsearch" );
- QWhatsThis::add( htsearchBin, wtstr );
- QWhatsThis::add( l, wtstr );
+ TQWhatsThis::add( htsearchBin, wtstr );
+ TQWhatsThis::add( l, wtstr );
htmergeBin = new KURLRequester(gb);
- l = new QLabel(htmergeBin, i18n("ht&merge"), gb);
+ l = new TQLabel(htmergeBin, i18n("ht&merge"), gb);
l->setBuddy( htmergeBin );
grid->addWidget(l, 3,0);
grid->addWidget(htmergeBin, 3,1);
- connect(htmergeBin->lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(configChanged()));
+ connect(htmergeBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
wtstr = i18n( "Enter the path to your htmerge program here, e.g. /usr/local/bin/htmerge" );
- QWhatsThis::add( htmergeBin, wtstr );
- QWhatsThis::add( l, wtstr );
+ TQWhatsThis::add( htmergeBin, wtstr );
+ TQWhatsThis::add( l, wtstr );
- QHBoxLayout *hbox = new QHBoxLayout(vbox);
+ TQHBoxLayout *hbox = new TQHBoxLayout(vbox);
- gb = new QGroupBox(i18n("Scope"), this);
+ gb = new TQGroupBox(i18n("Scope"), this);
hbox->addWidget(gb);
- QWhatsThis::add( gb, i18n( "Here you can select which parts of the documentation should be included in the fulltext search index. Available options are the KDE Help pages, the installed man pages, and the installed info pages. You can select any number of these." ) );
+ TQWhatsThis::add( gb, i18n( "Here you can select which parts of the documentation should be included in the fulltext search index. Available options are the KDE Help pages, the installed man pages, and the installed info pages. You can select any number of these." ) );
- QVBoxLayout *vvbox = new QVBoxLayout(gb, 6,2);
+ TQVBoxLayout *vvbox = new TQVBoxLayout(gb, 6,2);
vvbox->addSpacing(gb->fontMetrics().lineSpacing());
- indexKDE = new QCheckBox(i18n("&KDE help"), gb);
+ indexKDE = new TQCheckBox(i18n("&KDE help"), gb);
vvbox->addWidget(indexKDE);
- connect(indexKDE, SIGNAL(clicked()), this, SLOT(configChanged()));
+ connect(indexKDE, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- indexMan = new QCheckBox(i18n("&Man pages"), gb);
+ indexMan = new TQCheckBox(i18n("&Man pages"), gb);
vvbox->addWidget(indexMan);
indexMan->setEnabled(false),
- connect(indexMan, SIGNAL(clicked()), this, SLOT(configChanged()));
+ connect(indexMan, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- indexInfo = new QCheckBox(i18n("&Info pages"), gb);
+ indexInfo = new TQCheckBox(i18n("&Info pages"), gb);
vvbox->addWidget(indexInfo);
indexInfo->setEnabled(false);
- connect(indexInfo, SIGNAL(clicked()), this, SLOT(configChanged()));
+ connect(indexInfo, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- gb = new QGroupBox(i18n("Additional Search Paths"), this);
+ gb = new TQGroupBox(i18n("Additional Search Paths"), this);
hbox->addWidget(gb);
- QWhatsThis::add( gb, i18n( "Here you can add additional paths to search for documentation. To add a path, click on the <em>Add...</em> button and select the folder from where additional documentation should be searched. You can remove folders by clicking on the <em>Delete</em> button." ) );
+ TQWhatsThis::add( gb, i18n( "Here you can add additional paths to search for documentation. To add a path, click on the <em>Add...</em> button and select the folder from where additional documentation should be searched. You can remove folders by clicking on the <em>Delete</em> button." ) );
- grid = new QGridLayout(gb, 4,3, 6,2);
+ grid = new TQGridLayout(gb, 4,3, 6,2);
grid->addRowSpacing(0, gb->fontMetrics().lineSpacing());
- addButton = new QPushButton(i18n("Add..."), gb);
+ addButton = new TQPushButton(i18n("Add..."), gb);
grid->addWidget(addButton, 1,0);
- delButton = new QPushButton(i18n("Delete"), gb);
+ delButton = new TQPushButton(i18n("Delete"), gb);
grid->addWidget(delButton, 2,0);
searchPaths = new KListBox(gb);
grid->addMultiCellWidget(searchPaths, 1,3, 1,1);
grid->setRowStretch(2,2);
- gb = new QGroupBox(i18n("Language Settings"), this);
+ gb = new TQGroupBox(i18n("Language Settings"), this);
vbox->addWidget(gb);
- QWhatsThis::add(gb, i18n("Here you can select the language you want to create the index for."));
+ TQWhatsThis::add(gb, i18n("Here you can select the language you want to create the index for."));
language = new KLanguageCombo(gb);
- l = new QLabel(language, i18n("&Language"), gb);
- vvbox = new QVBoxLayout(gb, 6,2);
+ l = new TQLabel(language, i18n("&Language"), gb);
+ vvbox = new TQVBoxLayout(gb, 6,2);
vvbox->addSpacing(gb->fontMetrics().lineSpacing());
- hbox = new QHBoxLayout(vvbox, 6);
+ hbox = new TQHBoxLayout(vvbox, 6);
hbox->addWidget(l);
hbox->addWidget(language,1);
hbox->addStretch(1);
@@ -155,16 +155,16 @@ KHTMLSearchConfig::KHTMLSearchConfig(QWidget *parent, const char *name)
vbox->addStretch(1);
- runButton = new QPushButton(i18n("Generate Index..."), this);
- QWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) );
+ runButton = new TQPushButton(i18n("Generate Index..."), this);
+ TQWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) );
runButton->setFixedSize(runButton->sizeHint());
vbox->addWidget(runButton, AlignRight);
- connect(runButton, SIGNAL(clicked()), this, SLOT(generateIndex()));
+ connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex()));
- connect(addButton, SIGNAL(clicked()), this, SLOT(addClicked()));
- connect(delButton, SIGNAL(clicked()), this, SLOT(delClicked()));
- connect(searchPaths, SIGNAL(highlighted(const QString &)),
- this, SLOT(pathSelected(const QString &)));
+ connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addClicked()));
+ connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delClicked()));
+ connect(searchPaths, TQT_SIGNAL(highlighted(const TQString &)),
+ this, TQT_SLOT(pathSelected(const TQString &)));
checkButtons();
@@ -178,17 +178,17 @@ void KHTMLSearchConfig::loadLanguages()
language->clear();
// add all languages to the list
- QStringList langs = KGlobal::dirs()->findAllResources("locale",
- QString::fromLatin1("*/entry.desktop"));
+ TQStringList langs = KGlobal::dirs()->findAllResources("locale",
+ TQString::fromLatin1("*/entry.desktop"));
langs.sort();
- for (QStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it)
+ for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it)
{
KSimpleConfig entry(*it);
- entry.setGroup(QString::fromLatin1("KCM Locale"));
- QString name = entry.readEntry(QString::fromLatin1("Name"), KGlobal::locale()->translate("without name"));
+ entry.setGroup(TQString::fromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::fromLatin1("Name"), KGlobal::locale()->translate("without name"));
- QString path = *it;
+ TQString path = *it;
int index = path.findRev('/');
path = path.left(index);
index = path.findRev('/');
@@ -198,13 +198,13 @@ void KHTMLSearchConfig::loadLanguages()
}
-QString KHTMLSearchConfig::quickHelp() const
+TQString KHTMLSearchConfig::quickHelp() const
{
return i18n( "<h1>Help Index</h1> This configuration module lets you configure the ht://dig engine which can be used for fulltext search in the KDE documentation as well as other system documentation like man and info pages." );
}
-void KHTMLSearchConfig::pathSelected(const QString &)
+void KHTMLSearchConfig::pathSelected(const TQString &)
{
checkButtons();
}
@@ -219,7 +219,7 @@ void KHTMLSearchConfig::checkButtons()
void KHTMLSearchConfig::addClicked()
{
- QString dir = KFileDialog::getExistingDirectory();
+ TQString dir = KFileDialog::getExistingDirectory();
if (!dir.isEmpty())
{
@@ -265,14 +265,14 @@ void KHTMLSearchConfig::load()
indexMan->setChecked(config->readBoolEntry("Man", false));
indexInfo->setChecked(config->readBoolEntry("Info", false));
- QStringList l = config->readPathListEntry("Paths");
+ TQStringList l = config->readPathListEntry("Paths");
searchPaths->clear();
- QStringList::Iterator it;
+ TQStringList::Iterator it;
for (it=l.begin(); it != l.end(); ++it)
searchPaths->insertItem(*it);
config->setGroup("Locale");
- QString lang = config->readEntry("Search Language", KGlobal::locale()->language());
+ TQString lang = config->readEntry("Search Language", KGlobal::locale()->language());
language->setCurrentItem(lang);
emit changed(false);
@@ -293,7 +293,7 @@ void KHTMLSearchConfig::save()
config->writeEntry("Man", indexMan->isChecked());
config->writeEntry("Info", indexInfo->isChecked());
- QStringList l;
+ TQStringList l;
for (uint i=0; i<searchPaths->count(); ++i)
l.append(searchPaths->text(i));
config->writePathEntry("Paths", l);
@@ -326,7 +326,7 @@ void KHTMLSearchConfig::defaults()
}
-void KHTMLSearchConfig::urlClicked(const QString &url)
+void KHTMLSearchConfig::urlClicked(const TQString &url)
{
kapp->invokeBrowser(url);
}
@@ -336,7 +336,7 @@ void KHTMLSearchConfig::generateIndex()
{
save();
- QString exe = kapp->dirs()->findExe("khtmlindex");
+ TQString exe = kapp->dirs()->findExe("khtmlindex");
if (exe.isEmpty())
return;
@@ -345,8 +345,8 @@ void KHTMLSearchConfig::generateIndex()
indexProc = new KProcess;
*indexProc << exe << "--lang" << language->currentTag();
- connect(indexProc, SIGNAL(processExited(KProcess *)),
- this, SLOT(indexTerminated(KProcess *)));
+ connect(indexProc, TQT_SIGNAL(processExited(KProcess *)),
+ this, TQT_SLOT(indexTerminated(KProcess *)));
runButton->setEnabled(false);
@@ -362,7 +362,7 @@ void KHTMLSearchConfig::indexTerminated(KProcess *)
extern "C"
{
- KDE_EXPORT KCModule *create_htmlsearch(QWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_htmlsearch(TQWidget *parent, const char *name)
{
KGlobal::locale()->insertCatalogue("kcmhtmlsearch");
return new KHTMLSearchConfig(parent, name);
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h
index 630f5aeda..bf6e91bbc 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.h
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h
@@ -39,14 +39,14 @@ class KHTMLSearchConfig : public KCModule
public:
- KHTMLSearchConfig(QWidget *parent = 0L, const char *name = 0L);
+ KHTMLSearchConfig(TQWidget *parent = 0L, const char *name = 0L);
virtual ~KHTMLSearchConfig();
void load();
void save();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
int buttons();
@@ -56,8 +56,8 @@ protected slots:
void configChanged();
void addClicked();
void delClicked();
- void pathSelected(const QString &);
- void urlClicked(const QString&);
+ void pathSelected(const TQString &);
+ void urlClicked(const TQString&);
void generateIndex();
void indexTerminated(KProcess *proc);
@@ -69,8 +69,8 @@ private:
void loadLanguages();
KURLRequester *htdigBin, *htsearchBin, *htmergeBin;
- QCheckBox *indexKDE, *indexMan, *indexInfo;
- QPushButton *addButton, *delButton, *runButton;
+ TQCheckBox *indexKDE, *indexMan, *indexInfo;
+ TQPushButton *addButton, *delButton, *runButton;
KListBox *searchPaths;
KLanguageCombo *language;
diff --git a/khelpcenter/htmlsearch/klangcombo.cpp b/khelpcenter/htmlsearch/klangcombo.cpp
index 0b41ea1e9..308109d12 100644
--- a/khelpcenter/htmlsearch/klangcombo.cpp
+++ b/khelpcenter/htmlsearch/klangcombo.cpp
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qiconset.h>
+#include <tqiconset.h>
#include <kstandarddirs.h>
@@ -32,21 +32,21 @@ KLanguageCombo::~KLanguageCombo ()
{
}
-KLanguageCombo::KLanguageCombo (QWidget * parent, const char *name)
+KLanguageCombo::KLanguageCombo (TQWidget * parent, const char *name)
: KTagComboBox(parent, name)
{
}
-void KLanguageCombo::insertLanguage(const QString& path, const QString& name, const QString& sub, const QString &submenu, int index)
+void KLanguageCombo::insertLanguage(const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu, int index)
{
- QString output = name + QString::fromLatin1(" (") + path + QString::fromLatin1(")");
- QPixmap flag(locate("locale", sub + path + QString::fromLatin1("/flag.png")));
- insertItem(QIconSet(flag), output, path, submenu, index);
+ TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")");
+ TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png")));
+ insertItem(TQIconSet(flag), output, path, submenu, index);
}
-void KLanguageCombo::changeLanguage(const QString& name, int i)
+void KLanguageCombo::changeLanguage(const TQString& name, int i)
{
if (i < 0 || i >= count()) return;
- QString output = name + QString::fromLatin1(" (") + tag(i) + QString::fromLatin1(")");
+ TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")");
changeItem(output, i);
}
diff --git a/khelpcenter/htmlsearch/klangcombo.h b/khelpcenter/htmlsearch/klangcombo.h
index 1c556ae64..4ca6e2f3b 100644
--- a/khelpcenter/htmlsearch/klangcombo.h
+++ b/khelpcenter/htmlsearch/klangcombo.h
@@ -37,11 +37,11 @@ class KLanguageCombo : public KTagComboBox
Q_OBJECT
public:
- KLanguageCombo(QWidget *parent=0, const char *name=0);
+ KLanguageCombo(TQWidget *parent=0, const char *name=0);
~KLanguageCombo();
- void insertLanguage(const QString& path, const QString& name, const QString& sub = QString::null, const QString &submenu = QString::null, int index = -1);
- void changeLanguage(const QString& name, int i);
+ void insertLanguage(const TQString& path, const TQString& name, const TQString& sub = TQString::null, const TQString &submenu = TQString::null, int index = -1);
+ void changeLanguage(const TQString& name, int i);
};
#endif
diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp
index eea4c149f..871f5c9cf 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.cpp
+++ b/khelpcenter/htmlsearch/ktagcombobox.cpp
@@ -22,8 +22,8 @@
*/
#define INCLUDE_MENUITEM_DEF 1
-#include <qpainter.h>
-#include <qpopupmenu.h>
+#include <tqpainter.h>
+#include <tqpopupmenu.h>
#include <kdebug.h>
@@ -36,8 +36,8 @@ KTagComboBox::~KTagComboBox ()
delete tags;
}
-KTagComboBox::KTagComboBox (QWidget * parent, const char *name)
- : QComboBox(parent, name),
+KTagComboBox::KTagComboBox (TQWidget * parent, const char *name)
+ : TQComboBox(parent, name),
popup(0),
old_popup(0)
{
@@ -48,10 +48,10 @@ KTagComboBox::KTagComboBox (QWidget * parent, const char *name)
void KTagComboBox::popupMenu()
{
- popup->popup( mapToGlobal( QPoint(0,0) ), current );
+ popup->popup( mapToGlobal( TQPoint(0,0) ), current );
}
-void KTagComboBox::keyPressEvent( QKeyEvent *e )
+void KTagComboBox::keyPressEvent( TQKeyEvent *e )
{
int c;
@@ -73,7 +73,7 @@ void KTagComboBox::keyPressEvent( QKeyEvent *e )
emit activated( c );
}
-void KTagComboBox::mousePressEvent( QMouseEvent * )
+void KTagComboBox::mousePressEvent( TQMouseEvent * )
{
popupMenu();
}
@@ -97,11 +97,11 @@ void KTagComboBox::clear()
delete old_popup;
old_popup = popup;
- popup = new QPopupMenu(this);
- connect( popup, SIGNAL(activated(int)),
- SLOT(internalActivate(int)) );
- connect( popup, SIGNAL(highlighted(int)),
- SLOT(internalHighlight(int)) );
+ popup = new TQPopupMenu(this);
+ connect( popup, TQT_SIGNAL(activated(int)),
+ TQT_SLOT(internalActivate(int)) );
+ connect( popup, TQT_SIGNAL(highlighted(int)),
+ TQT_SLOT(internalHighlight(int)) );
}
int KTagComboBox::count() const
@@ -109,7 +109,7 @@ int KTagComboBox::count() const
return tags->count();
}
-static inline void checkInsertPos(QPopupMenu *popup, const QString & str, int &index)
+static inline void checkInsertPos(TQPopupMenu *popup, const TQString & str, int &index)
{
if (index == -2) index = popup->count();
if (index != -1) return;
@@ -131,14 +131,14 @@ static inline void checkInsertPos(QPopupMenu *popup, const QString & str, int &i
index = a; // it doesn't really matter ... a == b here.
}
-static inline QPopupMenu *checkInsertIndex(QPopupMenu *popup, const QStringList *tags, const QString &submenu)
+static inline TQPopupMenu *checkInsertIndex(TQPopupMenu *popup, const TQStringList *tags, const TQString &submenu)
{
int pos = tags->findIndex(submenu);
- QPopupMenu *pi = 0;
+ TQPopupMenu *pi = 0;
if (pos != -1)
{
- QMenuItem *p = popup->findItem(pos);
+ TQMenuItem *p = popup->findItem(pos);
pi = p?p->popup():0;
}
if (!pi) pi = popup;
@@ -146,50 +146,50 @@ static inline QPopupMenu *checkInsertIndex(QPopupMenu *popup, const QStringList
return pi;
}
-void KTagComboBox::insertItem(const QIconSet& icon, const QString &text, const QString &tag, const QString &submenu, int index )
+void KTagComboBox::insertItem(const TQIconSet& icon, const TQString &text, const TQString &tag, const TQString &submenu, int index )
{
- QPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
+ TQPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
checkInsertPos(pi, text, index);
pi->insertItem(icon, text, count(), index);
tags->append(tag);
}
-void KTagComboBox::insertItem(const QString &text, const QString &tag, const QString &submenu, int index )
+void KTagComboBox::insertItem(const TQString &text, const TQString &tag, const TQString &submenu, int index )
{
- QPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
+ TQPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
checkInsertPos(pi, text, index);
pi->insertItem(text, count(), index);
tags->append(tag);
}
-void KTagComboBox::insertSeparator(const QString &submenu, int index)
+void KTagComboBox::insertSeparator(const TQString &submenu, int index)
{
- QPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
+ TQPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
pi->insertSeparator(index);
- tags->append(QString::null);
+ tags->append(TQString::null);
}
-void KTagComboBox::insertSubmenu(const QString &text, const QString &tag, const QString &submenu, int index)
+void KTagComboBox::insertSubmenu(const TQString &text, const TQString &tag, const TQString &submenu, int index)
{
- QPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
- QPopupMenu *p = new QPopupMenu(pi);
+ TQPopupMenu *pi = checkInsertIndex(popup, tags, submenu);
+ TQPopupMenu *p = new TQPopupMenu(pi);
checkInsertPos(pi, text, index);
pi->insertItem(text, p, count(), index);
tags->append(tag);
- connect( p, SIGNAL(activated(int)),
- SLOT(internalActivate(int)) );
- connect( p, SIGNAL(highlighted(int)),
- SLOT(internalHighlight(int)) );
+ connect( p, TQT_SIGNAL(activated(int)),
+ TQT_SLOT(internalActivate(int)) );
+ connect( p, TQT_SIGNAL(highlighted(int)),
+ TQT_SLOT(internalHighlight(int)) );
}
-void KTagComboBox::paintEvent( QPaintEvent * ev)
+void KTagComboBox::paintEvent( TQPaintEvent * ev)
{
- QComboBox::paintEvent(ev);
+ TQComboBox::paintEvent(ev);
- QPainter p (this);
+ TQPainter p (this);
// Text
- QRect clip(2, 2, width() - 4, height() - 4);
+ TQRect clip(2, 2, width() - 4, height() - 4);
#if 0
if ( hasFocus() && style().guiStyle() != MotifStyle )
p.setPen( colorGroup().highlightedText() );
@@ -197,29 +197,29 @@ void KTagComboBox::paintEvent( QPaintEvent * ev)
p.drawText(clip, AlignCenter | SingleLine, popup->text( current ));
// Icon
- QIconSet *icon = popup->iconSet( this->current );
+ TQIconSet *icon = popup->iconSet( this->current );
if (icon) {
- QPixmap pm = icon->pixmap();
+ TQPixmap pm = icon->pixmap();
p.drawPixmap( 4, (height()-pm.height())/2, pm );
}
}
-bool KTagComboBox::containsTag( const QString &str ) const
+bool KTagComboBox::containsTag( const TQString &str ) const
{
return tags->contains(str) > 0;
}
-QString KTagComboBox::currentTag() const
+TQString KTagComboBox::currentTag() const
{
return *tags->at(currentItem());
}
-QString KTagComboBox::tag(int i) const
+TQString KTagComboBox::tag(int i) const
{
if (i < 0 || i >= count())
{
kdDebug() << "KTagComboBox::tag(), unknown tag " << i << endl;
- return QString::null;
+ return TQString::null;
}
return *tags->at(i);
}
@@ -236,7 +236,7 @@ void KTagComboBox::setCurrentItem(int i)
repaint();
}
-void KTagComboBox::setCurrentItem(const QString &code)
+void KTagComboBox::setCurrentItem(const TQString &code)
{
int i = tags->findIndex(code);
if (code.isNull())
@@ -245,8 +245,8 @@ void KTagComboBox::setCurrentItem(const QString &code)
setCurrentItem(i);
}
-void KTagComboBox::setFont( const QFont &font )
+void KTagComboBox::setFont( const TQFont &font )
{
- QComboBox::setFont( font );
+ TQComboBox::setFont( font );
popup->setFont( font );
}
diff --git a/khelpcenter/htmlsearch/ktagcombobox.h b/khelpcenter/htmlsearch/ktagcombobox.h
index 28aad2dc8..a246e2140 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.h
+++ b/khelpcenter/htmlsearch/ktagcombobox.h
@@ -25,13 +25,13 @@
#ifndef __KTAGCOMBOBOX_H__
#define __KTAGCOMBOBOX_H__
-#include <qcombobox.h>
+#include <tqcombobox.h>
class QPopupMenu;
/*
* This class should be just like qcombobox, but it should be possible
- * to have have a QIconSet for each entry, and each entry should have a tag.
+ * to have have a TQIconSet for each entry, and each entry should have a tag.
*
* It has also support for sub menues.
*/
@@ -40,13 +40,13 @@ class KTagComboBox : public QComboBox
Q_OBJECT
public:
- KTagComboBox(QWidget *parent=0, const char *name=0);
+ KTagComboBox(TQWidget *parent=0, const char *name=0);
~KTagComboBox();
- void insertItem(const QIconSet& icon, const QString &text, const QString &tag, const QString &submenu = QString::null, int index=-1 );
- void insertItem(const QString &text, const QString &tag, const QString &submenu = QString::null, int index=-1 );
- void insertSeparator(const QString &submenu = QString::null, int index=-1 );
- void insertSubmenu(const QString &text, const QString &tag, const QString &submenu = QString::null, int index=-1);
+ void insertItem(const TQIconSet& icon, const TQString &text, const TQString &tag, const TQString &submenu = TQString::null, int index=-1 );
+ void insertItem(const TQString &text, const TQString &tag, const TQString &submenu = TQString::null, int index=-1 );
+ void insertSeparator(const TQString &submenu = TQString::null, int index=-1 );
+ void insertSubmenu(const TQString &text, const TQString &tag, const TQString &submenu = TQString::null, int index=-1);
int count() const;
void clear();
@@ -54,19 +54,19 @@ public:
/*
* Tag of the selected item
*/
- QString currentTag() const;
- QString tag ( int i ) const;
- bool containsTag (const QString &str ) const;
+ TQString currentTag() const;
+ TQString tag ( int i ) const;
+ bool containsTag (const TQString &str ) const;
/*
* Set the current item
*/
int currentItem() const;
void setCurrentItem(int i);
- void setCurrentItem(const QString &code);
+ void setCurrentItem(const TQString &code);
// widget stuff
- virtual void setFont( const QFont & );
+ virtual void setFont( const TQFont & );
signals:
void activated( int index );
@@ -77,15 +77,15 @@ private slots:
void internalHighlight( int );
protected:
- void paintEvent( QPaintEvent * );
- void mousePressEvent( QMouseEvent * );
- void keyPressEvent( QKeyEvent *e );
+ void paintEvent( TQPaintEvent * );
+ void mousePressEvent( TQMouseEvent * );
+ void keyPressEvent( TQKeyEvent *e );
void popupMenu();
private:
// work space for the new class
- QStringList *tags;
- QPopupMenu *popup, *old_popup;
+ TQStringList *tags;
+ TQPopupMenu *popup, *old_popup;
int current;
};
diff --git a/khelpcenter/htmlsearch/progressdialog.cpp b/khelpcenter/htmlsearch/progressdialog.cpp
index 497c90324..e7eafedb1 100644
--- a/khelpcenter/htmlsearch/progressdialog.cpp
+++ b/khelpcenter/htmlsearch/progressdialog.cpp
@@ -1,5 +1,5 @@
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
#include <klocale.h>
@@ -10,35 +10,35 @@
#include "progressdialog.moc"
-ProgressDialog::ProgressDialog(QWidget *parent, const char *name)
+ProgressDialog::ProgressDialog(TQWidget *parent, const char *name)
: KDialogBase(KDialogBase::Plain, i18n("Generating Index"), Cancel, Cancel,
parent, name, false)
{
- QGridLayout *grid = new QGridLayout(plainPage(), 5,3, spacingHint());
+ TQGridLayout *grid = new TQGridLayout(plainPage(), 5,3, spacingHint());
- QLabel *l = new QLabel(i18n("Scanning for files"), plainPage());
+ TQLabel *l = new TQLabel(i18n("Scanning for files"), plainPage());
grid->addMultiCellWidget(l, 0,0, 1,2);
- filesScanned = new QLabel(plainPage());
+ filesScanned = new TQLabel(plainPage());
grid->addWidget(filesScanned, 1,2);
setFilesScanned(0);
- check1 = new QLabel(plainPage());
+ check1 = new TQLabel(plainPage());
grid->addWidget(check1, 0,0);
- l = new QLabel(i18n("Extracting search terms"), plainPage());
+ l = new TQLabel(i18n("Extracting search terms"), plainPage());
grid->addMultiCellWidget(l, 2,2, 1,2);
bar = new KProgress(plainPage());
grid->addWidget(bar, 3,2);
- check2 = new QLabel(plainPage());
+ check2 = new TQLabel(plainPage());
grid->addWidget(check2, 2,0);
- l = new QLabel(i18n("Generating index..."), plainPage());
+ l = new TQLabel(i18n("Generating index..."), plainPage());
grid->addMultiCellWidget(l, 4,4, 1,2);
- check3 = new QLabel(plainPage());
+ check3 = new TQLabel(plainPage());
grid->addWidget(check3, 4,0);
setState(0);
@@ -67,8 +67,8 @@ void ProgressDialog::setFilesDigged(int n)
void ProgressDialog::setState(int n)
{
- QPixmap unchecked = QPixmap(locate("data", "khelpcenter/pics/unchecked.xpm"));
- QPixmap checked = QPixmap(locate("data", "khelpcenter/pics/checked.xpm"));
+ TQPixmap unchecked = TQPixmap(locate("data", "khelpcenter/pics/unchecked.xpm"));
+ TQPixmap checked = TQPixmap(locate("data", "khelpcenter/pics/checked.xpm"));
check1->setPixmap( n > 0 ? checked : unchecked);
check2->setPixmap( n > 1 ? checked : unchecked);
diff --git a/khelpcenter/htmlsearch/progressdialog.h b/khelpcenter/htmlsearch/progressdialog.h
index 9c18f2d01..4152e7537 100644
--- a/khelpcenter/htmlsearch/progressdialog.h
+++ b/khelpcenter/htmlsearch/progressdialog.h
@@ -16,7 +16,7 @@ class ProgressDialog : public KDialogBase
public:
- ProgressDialog(QWidget *parent=0, const char *name=0);
+ ProgressDialog(TQWidget *parent=0, const char *name=0);
void setFilesScanned(int s);
void setFilesToDig(int d);
@@ -26,7 +26,7 @@ public:
private:
- QLabel *filesScanned, *check1, *check2, *check3;
+ TQLabel *filesScanned, *check1, *check2, *check3;
KProgress *bar;
};
diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp
index 999deb274..ea6dff669 100644
--- a/khelpcenter/htmlsearchconfig.cpp
+++ b/khelpcenter/htmlsearchconfig.cpp
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlayout.h>
-#include <qwhatsthis.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
#include <kdebug.h>
#include <kstandarddirs.h>
@@ -35,74 +35,74 @@
namespace KHC {
-HtmlSearchConfig::HtmlSearchConfig(QWidget *parent, const char *name)
- : QWidget(parent, name)
+HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
{
- QVBoxLayout *vbox = new QVBoxLayout(this, 5);
+ TQVBoxLayout *vbox = new TQVBoxLayout(this, 5);
- QGroupBox *gb = new QGroupBox(i18n("ht://dig"), this);
+ TQGroupBox *gb = new TQGroupBox(i18n("ht://dig"), this);
vbox->addWidget(gb);
- QGridLayout *grid = new QGridLayout(gb, 3,2, 6,6);
+ TQGridLayout *grid = new TQGridLayout(gb, 3,2, 6,6);
grid->addRowSpacing(0, gb->fontMetrics().lineSpacing());
- QLabel *l = new QLabel(i18n("The fulltext search feature makes use of the "
+ TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the "
"ht://dig HTML search engine. "
"You can get ht://dig at the"), gb);
- l->setAlignment(QLabel::WordBreak);
+ l->setAlignment(TQLabel::WordBreak);
l->setMinimumSize(l->sizeHint());
grid->addMultiCellWidget(l, 1, 1, 0, 1);
- QWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) );
+ TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) );
KURLLabel *url = new KURLLabel(gb);
url->setURL("http://www.htdig.org");
url->setText(i18n("ht://dig home page"));
- url->setAlignment(QLabel::AlignHCenter);
+ url->setAlignment(TQLabel::AlignHCenter);
grid->addMultiCellWidget(url, 2,2, 0, 1);
- connect(url, SIGNAL(leftClickedURL(const QString&)),
- this, SLOT(urlClicked(const QString&)));
+ connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
+ this, TQT_SLOT(urlClicked(const TQString&)));
- gb = new QGroupBox(i18n("Program Locations"), this);
+ gb = new TQGroupBox(i18n("Program Locations"), this);
vbox->addWidget(gb);
- grid = new QGridLayout(gb, 4,2, 6,6);
+ grid = new TQGridLayout(gb, 4,2, 6,6);
grid->addRowSpacing(0, gb->fontMetrics().lineSpacing());
mHtsearchUrl = new KURLRequester(gb);
- l = new QLabel(mHtsearchUrl, i18n("htsearch:"), gb);
+ l = new TQLabel(mHtsearchUrl, i18n("htsearch:"), gb);
l->setBuddy( mHtsearchUrl );
grid->addWidget(l, 1,0);
grid->addWidget(mHtsearchUrl, 1,1);
- connect( mHtsearchUrl->lineEdit(), SIGNAL( textChanged( const QString & ) ),
- SIGNAL( changed() ) );
- QString wtstr = i18n( "Enter the URL of the htsearch CGI program." );
- QWhatsThis::add( mHtsearchUrl, wtstr );
- QWhatsThis::add( l, wtstr );
+ connect( mHtsearchUrl->lineEdit(), TQT_SIGNAL( textChanged( const TQString & ) ),
+ TQT_SIGNAL( changed() ) );
+ TQString wtstr = i18n( "Enter the URL of the htsearch CGI program." );
+ TQWhatsThis::add( mHtsearchUrl, wtstr );
+ TQWhatsThis::add( l, wtstr );
mIndexerBin = new KURLRequester(gb);
- l = new QLabel(mIndexerBin, i18n("Indexer:"), gb);
+ l = new TQLabel(mIndexerBin, i18n("Indexer:"), gb);
l->setBuddy( mIndexerBin );
grid->addWidget(l, 2,0);
grid->addWidget(mIndexerBin, 2,1);
- connect( mIndexerBin->lineEdit(), SIGNAL( textChanged( const QString & ) ),
- SIGNAL( changed() ) );
+ connect( mIndexerBin->lineEdit(), TQT_SIGNAL( textChanged( const TQString & ) ),
+ TQT_SIGNAL( changed() ) );
wtstr = i18n( "Enter the path to your htdig indexer program here." );
- QWhatsThis::add( mIndexerBin, wtstr );
- QWhatsThis::add( l, wtstr );
+ TQWhatsThis::add( mIndexerBin, wtstr );
+ TQWhatsThis::add( l, wtstr );
mDbDir = new KURLRequester(gb);
mDbDir->setMode( KFile::Directory | KFile::LocalOnly );
- l = new QLabel(mDbDir, i18n("htdig database:"), gb);
+ l = new TQLabel(mDbDir, i18n("htdig database:"), gb);
l->setBuddy( mDbDir );
grid->addWidget(l, 3,0);
grid->addWidget(mDbDir, 3,1);
- connect( mDbDir->lineEdit(), SIGNAL( textChanged( const QString & ) ),
- SIGNAL( changed() ) );
+ connect( mDbDir->lineEdit(), TQT_SIGNAL( textChanged( const TQString & ) ),
+ TQT_SIGNAL( changed() ) );
wtstr = i18n( "Enter the path to the htdig database folder." );
- QWhatsThis::add( mDbDir, wtstr );
- QWhatsThis::add( l, wtstr );
+ TQWhatsThis::add( mDbDir, wtstr );
+ TQWhatsThis::add( l, wtstr );
}
HtmlSearchConfig::~HtmlSearchConfig()
@@ -142,7 +142,7 @@ void HtmlSearchConfig::defaults()
mDbDir->lineEdit()->setText("/opt/www/htdig/db/" );
}
-void HtmlSearchConfig::urlClicked(const QString &url)
+void HtmlSearchConfig::urlClicked(const TQString &url)
{
kapp->invokeBrowser(url);
}
diff --git a/khelpcenter/htmlsearchconfig.h b/khelpcenter/htmlsearchconfig.h
index bd3b2f27f..ef74cce5d 100644
--- a/khelpcenter/htmlsearchconfig.h
+++ b/khelpcenter/htmlsearchconfig.h
@@ -21,7 +21,7 @@
#ifndef KHC_HTMLSEARCHCONFIG_H
#define KHC_HTMLSEARCHCONFIG_H
-#include <qwidget.h>
+#include <tqwidget.h>
class KURLRequester;
class KConfig;
@@ -32,7 +32,7 @@ class HtmlSearchConfig : public QWidget
{
Q_OBJECT
public:
- HtmlSearchConfig(QWidget *parent = 0L, const char *name = 0L);
+ HtmlSearchConfig(TQWidget *parent = 0L, const char *name = 0L);
virtual ~HtmlSearchConfig();
void load( KConfig * );
@@ -44,7 +44,7 @@ class HtmlSearchConfig : public QWidget
void changed();
protected slots:
- void urlClicked(const QString&);
+ void urlClicked(const TQString&);
private:
KURLRequester *mHtsearchUrl;
diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp
index 61f44a109..a23cce174 100644
--- a/khelpcenter/infotree.cpp
+++ b/khelpcenter/infotree.cpp
@@ -32,8 +32,8 @@
#include <kstandarddirs.h>
#include <kurl.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <stdlib.h> // for getenv()
@@ -42,7 +42,7 @@ using namespace KHC;
class InfoCategoryItem : public NavigatorItem
{
public:
- InfoCategoryItem( NavigatorItem *parent, const QString &text );
+ InfoCategoryItem( NavigatorItem *parent, const TQString &text );
virtual void setOpen( bool open );
};
@@ -50,10 +50,10 @@ class InfoCategoryItem : public NavigatorItem
class InfoNodeItem : public NavigatorItem
{
public:
- InfoNodeItem( InfoCategoryItem *parent, const QString &text );
+ InfoNodeItem( InfoCategoryItem *parent, const TQString &text );
};
-InfoCategoryItem::InfoCategoryItem( NavigatorItem *parent, const QString &text )
+InfoCategoryItem::InfoCategoryItem( NavigatorItem *parent, const TQString &text )
: NavigatorItem( new DocEntry( text ), parent )
{
setAutoDeleteDocEntry( true );
@@ -69,14 +69,14 @@ void InfoCategoryItem::setOpen( bool open )
else setPixmap( 0, SmallIcon( "contents2" ) );
}
-InfoNodeItem::InfoNodeItem( InfoCategoryItem *parent, const QString &text )
+InfoNodeItem::InfoNodeItem( InfoCategoryItem *parent, const TQString &text )
: NavigatorItem( new DocEntry( text ), parent )
{
setAutoDeleteDocEntry( true );
// kdDebug( 1400 ) << "Created info node item: " << text << endl;
}
-InfoTree::InfoTree( QObject *parent, const char *name )
+InfoTree::InfoTree( TQObject *parent, const char *name )
: TreeBuilder( parent, name ),
m_parentItem( 0 )
{
@@ -97,7 +97,7 @@ void InfoTree::build( NavigatorItem *parent )
KConfig *cfg = kapp->config();
cfg->setGroup( "Info pages" );
- QStringList infoDirFiles = cfg->readListEntry( "Search paths" );
+ TQStringList infoDirFiles = cfg->readListEntry( "Search paths" );
// Default paths taken fron kdebase/kioslave/info/kde-info2html.conf
if ( infoDirFiles.isEmpty() ) {
infoDirFiles << "/usr/share/info";
@@ -110,35 +110,35 @@ void InfoTree::build( NavigatorItem *parent )
infoDirFiles << "/usr/X11R6/lib/xemacs/info";
}
- QString infoPath = ::getenv( "INFOPATH" );
+ TQString infoPath = ::getenv( "INFOPATH" );
if ( !infoPath.isEmpty() )
- infoDirFiles += QStringList::split( ':', infoPath );
+ infoDirFiles += TQStringList::split( ':', infoPath );
- QStringList::ConstIterator it = infoDirFiles.begin();
- QStringList::ConstIterator end = infoDirFiles.end();
+ TQStringList::ConstIterator it = infoDirFiles.begin();
+ TQStringList::ConstIterator end = infoDirFiles.end();
for ( ; it != end; ++it ) {
- QString infoDirFileName = *it + "/dir";
- if ( QFile::exists( infoDirFileName ) )
+ TQString infoDirFileName = *it + "/dir";
+ if ( TQFile::exists( infoDirFileName ) )
parseInfoDirFile( infoDirFileName );
}
m_alphabItem->sortChildItems( 0, true /* ascending */ );
}
-void InfoTree::parseInfoDirFile( const QString &infoDirFileName )
+void InfoTree::parseInfoDirFile( const TQString &infoDirFileName )
{
kdDebug( 1400 ) << "Parsing info dir file " << infoDirFileName << endl;
- QFile infoDirFile( infoDirFileName );
+ TQFile infoDirFile( infoDirFileName );
if ( !infoDirFile.open( IO_ReadOnly ) )
return;
- QTextStream stream( &infoDirFile );
+ TQTextStream stream( &infoDirFile );
// Skip introduction blurb.
while ( !stream.eof() && !stream.readLine().startsWith( "* Menu:" ) );
while ( !stream.eof() ) {
- QString s = stream.readLine();
+ TQString s = stream.readLine();
if ( s.stripWhiteSpace().isEmpty() )
continue;
@@ -151,8 +151,8 @@ void InfoTree::parseInfoDirFile( const QString &infoDirFileName )
const int closeBrace = s.find( ")", openBrace );
const int dot = s.find( ".", closeBrace );
- QString appName = s.mid( 2, colon - 2 );
- QString url = "info:/" + s.mid( openBrace + 1, closeBrace - openBrace - 1 );
+ TQString appName = s.mid( 2, colon - 2 );
+ TQString url = "info:/" + s.mid( openBrace + 1, closeBrace - openBrace - 1 );
if ( dot - closeBrace > 1 )
url += "/" + s.mid( closeBrace + 1, dot - closeBrace - 1 );
else
@@ -162,7 +162,7 @@ void InfoTree::parseInfoDirFile( const QString &infoDirFileName )
item->entry()->setUrl( url );
InfoCategoryItem *alphabSection = 0;
- for ( QListViewItem* it=m_alphabItem->firstChild(); it; it=it->nextSibling() ) {
+ for ( TQListViewItem* it=m_alphabItem->firstChild(); it; it=it->nextSibling() ) {
if ( it->text( 0 ) == appName[ 0 ].upper() ) {
alphabSection = static_cast<InfoCategoryItem *>( it );
break;
diff --git a/khelpcenter/infotree.h b/khelpcenter/infotree.h
index a7f2c5c5d..e5516a3d2 100644
--- a/khelpcenter/infotree.h
+++ b/khelpcenter/infotree.h
@@ -31,12 +31,12 @@ namespace KHC
{
Q_OBJECT
public:
- InfoTree( QObject *parent, const char *name = 0 );
+ InfoTree( TQObject *parent, const char *name = 0 );
virtual void build( NavigatorItem *parentItem );
private:
- void parseInfoDirFile( const QString &fileName );
+ void parseInfoDirFile( const TQString &fileName );
NavigatorItem *m_parentItem;
NavigatorItem *m_alphabItem;
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index 3c122b3b3..c3b3e3094 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -41,30 +41,30 @@
#include <kmessagebox.h>
#include <klistview.h>
#include <klineedit.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qdir.h>
-#include <qtabwidget.h>
-#include <qprogressbar.h>
-#include <qfile.h>
-#include <qlabel.h>
-#include <qvbox.h>
-#include <qtextedit.h>
-#include <qregexp.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqdir.h>
+#include <tqtabwidget.h>
+#include <tqprogressbar.h>
+#include <tqfile.h>
+#include <tqlabel.h>
+#include <tqvbox.h>
+#include <tqtextedit.h>
+#include <tqregexp.h>
#include <unistd.h>
#include <sys/types.h>
using namespace KHC;
-IndexDirDialog::IndexDirDialog( QWidget *parent )
+IndexDirDialog::IndexDirDialog( TQWidget *parent )
: KDialogBase( parent, 0, true, i18n("Change Index Folder"), Ok | Cancel )
{
- QFrame *topFrame = makeMainWidget();
+ TQFrame *topFrame = makeMainWidget();
- QBoxLayout *urlLayout = new QHBoxLayout( topFrame );
+ TQBoxLayout *urlLayout = new TQHBoxLayout( topFrame );
- QLabel *label = new QLabel( i18n("Index folder:"), topFrame );
+ TQLabel *label = new TQLabel( i18n("Index folder:"), topFrame );
urlLayout->addWidget( label );
mIndexUrlRequester = new KURLRequester( topFrame );
@@ -73,11 +73,11 @@ IndexDirDialog::IndexDirDialog( QWidget *parent )
urlLayout->addWidget( mIndexUrlRequester );
mIndexUrlRequester->setURL( Prefs::indexDirectory() );
- connect(mIndexUrlRequester->lineEdit(),SIGNAL(textChanged ( const QString & )), this, SLOT(slotUrlChanged( const QString &)));
+ connect(mIndexUrlRequester->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(slotUrlChanged( const TQString &)));
slotUrlChanged( mIndexUrlRequester->lineEdit()->text() );
}
-void IndexDirDialog::slotUrlChanged( const QString &_url )
+void IndexDirDialog::slotUrlChanged( const TQString &_url )
{
enableButtonOK( !_url.isEmpty() );
}
@@ -90,43 +90,43 @@ void IndexDirDialog::slotOk()
}
-IndexProgressDialog::IndexProgressDialog( QWidget *parent )
+IndexProgressDialog::IndexProgressDialog( TQWidget *parent )
: KDialog( parent, "IndexProgressDialog", true ),
mFinished( true )
{
setCaption( i18n("Build Search Indices") );
- QBoxLayout *topLayout = new QVBoxLayout( this );
+ TQBoxLayout *topLayout = new TQVBoxLayout( this );
topLayout->setMargin( marginHint() );
topLayout->setSpacing( spacingHint() );
- mLabel = new QLabel( this );
+ mLabel = new TQLabel( this );
mLabel->setAlignment( AlignHCenter );
topLayout->addWidget( mLabel );
- mProgressBar = new QProgressBar( this );
+ mProgressBar = new TQProgressBar( this );
topLayout->addWidget( mProgressBar );
- mLogLabel = new QLabel( i18n("Index creation log:"), this );
+ mLogLabel = new TQLabel( i18n("Index creation log:"), this );
topLayout->addWidget( mLogLabel );
- mLogView = new QTextEdit( this );
+ mLogView = new TQTextEdit( this );
mLogView->setTextFormat( LogText );
mLogView->setMinimumHeight( 200 );
topLayout->addWidget( mLogView, 1 );
- QBoxLayout *buttonLayout = new QHBoxLayout( topLayout );
+ TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout );
buttonLayout->addStretch( 1 );
- mDetailsButton = new QPushButton( this );
- connect( mDetailsButton, SIGNAL( clicked() ), SLOT( toggleDetails() ) );
+ mDetailsButton = new TQPushButton( this );
+ connect( mDetailsButton, TQT_SIGNAL( clicked() ), TQT_SLOT( toggleDetails() ) );
buttonLayout->addWidget( mDetailsButton );
hideDetails();
- mEndButton = new QPushButton( this );
- connect( mEndButton, SIGNAL( clicked() ), SLOT( slotEnd() ) );
+ mEndButton = new TQPushButton( this );
+ connect( mEndButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEnd() ) );
buttonLayout->addWidget( mEndButton );
setFinished( false );
@@ -154,7 +154,7 @@ void IndexProgressDialog::advanceProgress()
mProgressBar->setProgress( mProgressBar->progress() + 1 );
}
-void IndexProgressDialog::setLabelText( const QString &text )
+void IndexProgressDialog::setLabelText( const TQString &text )
{
mLabel->setText( text );
}
@@ -178,7 +178,7 @@ void IndexProgressDialog::setFinished( bool finished )
}
}
-void IndexProgressDialog::appendLog( const QString &text )
+void IndexProgressDialog::appendLog( const TQString &text )
{
mLogView->append( text );
}
@@ -202,7 +202,7 @@ void IndexProgressDialog::toggleDetails()
mLogLabel->show();
mLogView->show();
mDetailsButton->setText( i18n("Details <<") );
- QSize size = cfg->readSizeEntry( "size" );
+ TQSize size = cfg->readSizeEntry( "size" );
if ( !size.isEmpty() ) resize( size );
} else {
cfg->writeEntry( "size", size() );
@@ -220,7 +220,7 @@ void IndexProgressDialog::hideDetails()
}
-KCMHelpCenter::KCMHelpCenter( KHC::SearchEngine *engine, QWidget *parent,
+KCMHelpCenter::KCMHelpCenter( KHC::SearchEngine *engine, TQWidget *parent,
const char *name)
: DCOPObject( "kcmhelpcenter" ),
KDialogBase( parent, name, false, i18n("Build Search Index"),
@@ -228,7 +228,7 @@ KCMHelpCenter::KCMHelpCenter( KHC::SearchEngine *engine, QWidget *parent,
mEngine( engine ), mProgressDialog( 0 ), mCurrentEntry( 0 ), mCmdFile( 0 ),
mProcess( 0 ), mIsClosing( false ), mRunAsRoot( false )
{
- QWidget *widget = makeMainWidget();
+ TQWidget *widget = makeMainWidget();
setupMainWidget( widget );
@@ -246,8 +246,8 @@ KCMHelpCenter::KCMHelpCenter( KHC::SearchEngine *engine, QWidget *parent,
if ( !success ) kdError() << "connect DCOP signal failed" << endl;
success = kapp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
- 0, "buildIndexError(QString)", "kcmhelpcenter",
- "slotIndexError(QString)", false );
+ 0, "buildIndexError(TQString)", "kcmhelpcenter",
+ "slotIndexError(TQString)", false );
if ( !success ) kdError() << "connect DCOP signal failed" << endl;
resize( configDialogSize( "IndexDialog" ) );
@@ -258,19 +258,19 @@ KCMHelpCenter::~KCMHelpCenter()
saveDialogSize( "IndexDialog" );
}
-void KCMHelpCenter::setupMainWidget( QWidget *parent )
+void KCMHelpCenter::setupMainWidget( TQWidget *parent )
{
- QVBoxLayout *topLayout = new QVBoxLayout( parent );
+ TQVBoxLayout *topLayout = new TQVBoxLayout( parent );
topLayout->setSpacing( KDialog::spacingHint() );
- QString helpText =
+ TQString helpText =
i18n("To be able to search a document, there needs to exist a search\n"
"index. The status column of the list below shows, if an index\n"
"for a document exists.\n") +
i18n("To create an index check the box in the list and press the\n"
"\"Build Index\" button.\n");
- QLabel *label = new QLabel( helpText, parent );
+ TQLabel *label = new TQLabel( helpText, parent );
topLayout->addWidget( label );
mListView = new KListView( parent );
@@ -279,22 +279,22 @@ void KCMHelpCenter::setupMainWidget( QWidget *parent )
mListView->addColumn( i18n("Status") );
mListView->setColumnAlignment( 1, AlignCenter );
topLayout->addWidget( mListView );
- connect( mListView, SIGNAL( clicked( QListViewItem * ) ),
- SLOT( checkSelection() ) );
+ connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ),
+ TQT_SLOT( checkSelection() ) );
- QBoxLayout *urlLayout = new QHBoxLayout( topLayout );
+ TQBoxLayout *urlLayout = new TQHBoxLayout( topLayout );
- QLabel *urlLabel = new QLabel( i18n("Index folder:"), parent );
+ TQLabel *urlLabel = new TQLabel( i18n("Index folder:"), parent );
urlLayout->addWidget( urlLabel );
- mIndexDirLabel = new QLabel( parent );
+ mIndexDirLabel = new TQLabel( parent );
urlLayout->addWidget( mIndexDirLabel, 1 );
- QPushButton *button = new QPushButton( i18n("Change..."), parent );
- connect( button, SIGNAL( clicked() ), SLOT( showIndexDirDialog() ) );
+ TQPushButton *button = new TQPushButton( i18n("Change..."), parent );
+ connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showIndexDirDialog() ) );
urlLayout->addWidget( button );
- QBoxLayout *buttonLayout = new QHBoxLayout( topLayout );
+ TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout );
buttonLayout->addStretch( 1 );
}
@@ -307,7 +307,7 @@ bool KCMHelpCenter::save()
{
kdDebug(1401) << "KCMHelpCenter::save()" << endl;
- if ( !QFile::exists( Prefs::indexDirectory() ) ) {
+ if ( !TQFile::exists( Prefs::indexDirectory() ) ) {
KMessageBox::sorry( this,
i18n("<qt>The folder <b>%1</b> does not exist; unable to create index.</qt>")
.arg( Prefs::indexDirectory() ) );
@@ -341,10 +341,10 @@ void KCMHelpCenter::load()
void KCMHelpCenter::updateStatus()
{
- QListViewItemIterator it( mListView );
+ TQListViewItemIterator it( mListView );
while ( it.current() != 0 ) {
ScopeItem *item = static_cast<ScopeItem *>( it.current() );
- QString status;
+ TQString status;
if ( item->entry()->indexExists( Prefs::indexDirectory() ) ) {
status = i18n("OK");
item->setOn( false );
@@ -372,12 +372,12 @@ bool KCMHelpCenter::buildIndex()
mIndexQueue.clear();
- QFontMetrics fm( font() );
+ TQFontMetrics fm( font() );
int maxWidth = 0;
mCmdFile = new KTempFile;
mCmdFile->setAutoDelete( true );
- QTextStream *ts = mCmdFile->textStream();
+ TQTextStream *ts = mCmdFile->textStream();
if ( !ts ) {
kdError() << "Error opening command file." << endl;
deleteCmdFile();
@@ -388,13 +388,13 @@ bool KCMHelpCenter::buildIndex()
bool hasError = false;
- QListViewItemIterator it( mListView );
+ TQListViewItemIterator it( mListView );
while ( it.current() != 0 ) {
ScopeItem *item = static_cast<ScopeItem *>( it.current() );
if ( item->isOn() ) {
DocEntry *entry = item->entry();
- QString docText = i18n("Document '%1' (%2):\n")
+ TQString docText = i18n("Document '%1' (%2):\n")
.arg( entry->identifier() )
.arg( entry->name() );
if ( entry->documentType().isEmpty() ) {
@@ -409,16 +409,16 @@ bool KCMHelpCenter::buildIndex()
.arg( entry->documentType() ) );
hasError = true;
} else {
- QString indexer = handler->indexCommand( entry->identifier() );
+ TQString indexer = handler->indexCommand( entry->identifier() );
if ( indexer.isEmpty() ) {
KMessageBox::sorry( this, docText +
i18n("No indexing command specified for document type '%1'.")
.arg( entry->documentType() ) );
hasError = true;
} else {
- indexer.replace( QRegExp( "%i" ), entry->identifier() );
- indexer.replace( QRegExp( "%d" ), Prefs::indexDirectory() );
- indexer.replace( QRegExp( "%p" ), entry->url() );
+ indexer.replace( TQRegExp( "%i" ), entry->identifier() );
+ indexer.replace( TQRegExp( "%d" ), Prefs::indexDirectory() );
+ indexer.replace( TQRegExp( "%p" ), entry->url() );
kdDebug() << "INDEXER: " << indexer << endl;
*ts << indexer << endl;
@@ -441,14 +441,14 @@ bool KCMHelpCenter::buildIndex()
}
mCurrentEntry = mIndexQueue.begin();
- QString name = (*mCurrentEntry)->name();
+ TQString name = (*mCurrentEntry)->name();
if ( !mProgressDialog ) {
mProgressDialog = new IndexProgressDialog( this );
- connect( mProgressDialog, SIGNAL( cancelled() ),
- SLOT( cancelBuildIndex() ) );
- connect( mProgressDialog, SIGNAL( closed() ),
- SLOT( slotProgressClosed() ) );
+ connect( mProgressDialog, TQT_SIGNAL( cancelled() ),
+ TQT_SLOT( cancelBuildIndex() ) );
+ connect( mProgressDialog, TQT_SIGNAL( closed() ),
+ TQT_SLOT( slotProgressClosed() ) );
}
mProgressDialog->setLabelText( name );
mProgressDialog->setTotalSteps( mIndexQueue.count() );
@@ -475,12 +475,12 @@ void KCMHelpCenter::startIndexProcess()
*mProcess << mCmdFile->name();
*mProcess << Prefs::indexDirectory();
- connect( mProcess, SIGNAL( processExited( KProcess * ) ),
- SLOT( slotIndexFinished( KProcess * ) ) );
- connect( mProcess, SIGNAL( receivedStdout( KProcess *, char *, int ) ),
- SLOT( slotReceivedStdout(KProcess *, char *, int ) ) );
- connect( mProcess, SIGNAL( receivedStderr( KProcess *, char *, int ) ),
- SLOT( slotReceivedStderr( KProcess *, char *, int ) ) );
+ connect( mProcess, TQT_SIGNAL( processExited( KProcess * ) ),
+ TQT_SLOT( slotIndexFinished( KProcess * ) ) );
+ connect( mProcess, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
+ TQT_SLOT( slotReceivedStdout(KProcess *, char *, int ) ) );
+ connect( mProcess, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
+ TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) );
if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
kdError() << "KCMHelpcenter::startIndexProcess(): Failed to start process."
@@ -543,8 +543,8 @@ void KCMHelpCenter::slotIndexFinished( KProcess *proc )
mProgressDialog->setFinished( true );
}
- mStdOut = QString();
- mStdErr = QString();
+ mStdOut = TQString();
+ mStdErr = TQString();
if ( mIsClosing ) {
if ( !mProgressDialog->isVisible() ) {
@@ -578,7 +578,7 @@ void KCMHelpCenter::slotIndexProgress()
advanceProgress();
}
-void KCMHelpCenter::slotIndexError( const QString &str )
+void KCMHelpCenter::slotIndexError( const TQString &str )
{
if( !mProcess )
return;
@@ -601,7 +601,7 @@ void KCMHelpCenter::advanceProgress()
mProgressDialog->advanceProgress();
mCurrentEntry++;
if ( mCurrentEntry != mIndexQueue.end() ) {
- QString name = (*mCurrentEntry)->name();
+ TQString name = (*mCurrentEntry)->name();
mProgressDialog->setLabelText( name );
}
}
@@ -609,7 +609,7 @@ void KCMHelpCenter::advanceProgress()
void KCMHelpCenter::slotReceivedStdout( KProcess *, char *buffer, int buflen )
{
- QString text = QString::fromLocal8Bit( buffer, buflen );
+ TQString text = TQString::fromLocal8Bit( buffer, buflen );
int pos = text.findRev( '\n' );
if ( pos < 0 ) {
mStdOut.append( text );
@@ -623,7 +623,7 @@ void KCMHelpCenter::slotReceivedStdout( KProcess *, char *buffer, int buflen )
void KCMHelpCenter::slotReceivedStderr( KProcess *, char *buffer, int buflen )
{
- QString text = QString::fromLocal8Bit( buffer, buflen );
+ TQString text = TQString::fromLocal8Bit( buffer, buflen );
int pos = text.findRev( '\n' );
if ( pos < 0 ) {
mStdErr.append( text );
@@ -654,7 +654,7 @@ void KCMHelpCenter::slotProgressClosed()
void KCMHelpCenter::showIndexDirDialog()
{
IndexDirDialog dlg( this );
- if ( dlg.exec() == QDialog::Accepted ) {
+ if ( dlg.exec() == TQDialog::Accepted ) {
load();
}
}
@@ -663,7 +663,7 @@ void KCMHelpCenter::checkSelection()
{
int count = 0;
- QListViewItemIterator it( mListView );
+ TQListViewItemIterator it( mListView );
while ( it.current() != 0 ) {
ScopeItem *item = static_cast<ScopeItem *>( it.current() );
if ( item->isOn() ) {
diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h
index 8a7b1f4c5..3ff7b6054 100644
--- a/khelpcenter/kcmhelpcenter.h
+++ b/khelpcenter/kcmhelpcenter.h
@@ -49,11 +49,11 @@ class IndexDirDialog : public KDialogBase
{
Q_OBJECT
public:
- IndexDirDialog( QWidget *parent );
+ IndexDirDialog( TQWidget *parent );
protected slots:
void slotOk();
- void slotUrlChanged( const QString &_url);
+ void slotUrlChanged( const TQString &_url);
private:
KURLRequester *mIndexUrlRequester;
};
@@ -62,16 +62,16 @@ class IndexProgressDialog : public KDialog
{
Q_OBJECT
public:
- IndexProgressDialog( QWidget *parent );
+ IndexProgressDialog( TQWidget *parent );
~IndexProgressDialog();
void setTotalSteps( int );
void advanceProgress();
- void setLabelText( const QString & );
+ void setLabelText( const TQString & );
void setMinimumLabelWidth( int width );
void setFinished( bool );
- void appendLog( const QString &text );
+ void appendLog( const TQString &text );
signals:
void closed();
@@ -85,12 +85,12 @@ class IndexProgressDialog : public KDialog
void toggleDetails();
private:
- QLabel *mLabel;
- QProgressBar *mProgressBar;
- QLabel *mLogLabel;
- QTextEdit *mLogView;
- QPushButton *mDetailsButton;
- QPushButton *mEndButton;
+ TQLabel *mLabel;
+ TQProgressBar *mProgressBar;
+ TQLabel *mLogLabel;
+ TQTextEdit *mLogView;
+ TQPushButton *mDetailsButton;
+ TQPushButton *mEndButton;
bool mFinished;
};
@@ -100,14 +100,14 @@ class KCMHelpCenterIface : virtual public DCOPObject
K_DCOP
k_dcop:
virtual void slotIndexProgress() = 0;
- virtual void slotIndexError( const QString & ) = 0;
+ virtual void slotIndexError( const TQString & ) = 0;
};
class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
{
Q_OBJECT
public:
- KCMHelpCenter( KHC::SearchEngine *, QWidget *parent = 0,
+ KCMHelpCenter( KHC::SearchEngine *, TQWidget *parent = 0,
const char *name = 0 );
~KCMHelpCenter();
@@ -125,7 +125,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
void cancelBuildIndex();
void slotIndexFinished( KProcess * );
void slotIndexProgress();
- void slotIndexError( const QString & );
+ void slotIndexError( const TQString & );
void slotReceivedStdout(KProcess *proc, char *buffer, int buflen);
void slotReceivedStderr(KProcess *proc, char *buffer, int buflen);
void slotProgressClosed();
@@ -137,7 +137,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
void checkSelection();
protected:
- void setupMainWidget( QWidget *parent );
+ void setupMainWidget( TQWidget *parent );
void updateStatus();
void startIndexProcess();
@@ -150,19 +150,19 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
KHC::SearchEngine *mEngine;
KListView *mListView;
- QLabel *mIndexDirLabel;
- QPushButton *mBuildButton;
+ TQLabel *mIndexDirLabel;
+ TQPushButton *mBuildButton;
IndexProgressDialog *mProgressDialog;
- QValueList<KHC::DocEntry *> mIndexQueue;
- QValueList<KHC::DocEntry *>::ConstIterator mCurrentEntry;
+ TQValueList<KHC::DocEntry *> mIndexQueue;
+ TQValueList<KHC::DocEntry *>::ConstIterator mCurrentEntry;
KConfig *mConfig;
KAboutData *mAboutData;
KHC::HtmlSearchConfig *mHtmlSearchTab;
- QWidget *mScopeTab;
+ TQWidget *mScopeTab;
KTempFile *mCmdFile;
@@ -170,8 +170,8 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
bool mIsClosing;
- QString mStdOut;
- QString mStdErr;
+ TQString mStdOut;
+ TQString mStdErr;
bool mRunAsRoot;
};
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index ef7c239cc..8da4e8f34 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -33,10 +33,10 @@
#include <kstandarddirs.h>
#include <kconfig.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qdir.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqdir.h>
+#include <tqtextstream.h>
#include <unistd.h>
#include <stdlib.h>
@@ -44,7 +44,7 @@
using namespace KHC;
-IndexBuilder::IndexBuilder(const QString& cmdFile)
+IndexBuilder::IndexBuilder(const TQString& cmdFile)
{
m_cmdFile = cmdFile;
kdDebug(1402) << "IndexBuilder()" << endl;
@@ -52,14 +52,14 @@ IndexBuilder::IndexBuilder(const QString& cmdFile)
void IndexBuilder::buildIndices()
{
- QFile f( m_cmdFile );
+ TQFile f( m_cmdFile );
if ( !f.open( IO_ReadOnly ) ) {
kdError() << "Unable to open file '" << m_cmdFile << "'" << endl;
exit( 1 );
}
kdDebug(1402) << "Opened file '" << m_cmdFile << "'" << endl;
- QTextStream ts( &f );
- QString line = ts.readLine();
+ TQTextStream ts( &f );
+ TQString line = ts.readLine();
while ( !line.isNull() ) {
kdDebug(1402) << "LINE: " << line << endl;
mCmdQueue.append( line );
@@ -73,30 +73,30 @@ void IndexBuilder::processCmdQueue()
{
kdDebug(1402) << "IndexBuilder::processCmdQueue()" << endl;
- QStringList::Iterator it = mCmdQueue.begin();
+ TQStringList::Iterator it = mCmdQueue.begin();
if ( it == mCmdQueue.end() ) {
quit();
return;
}
- QString cmd = *it;
+ TQString cmd = *it;
kdDebug(1402) << "PROCESS: " << cmd << endl;
KProcess *proc = new KProcess;
proc->setRunPrivileged( true );
- QStringList args = QStringList::split( " ", cmd );
+ TQStringList args = TQStringList::split( " ", cmd );
*proc << args;
- connect( proc, SIGNAL( processExited( KProcess * ) ),
- SLOT( slotProcessExited( KProcess * ) ) );
- connect( proc, SIGNAL( receivedStdout(KProcess *, char *, int ) ),
- SLOT( slotReceivedStdout(KProcess *, char *, int ) ) );
- connect( proc, SIGNAL( receivedStderr(KProcess *, char *, int ) ),
- SLOT( slotReceivedStderr(KProcess *, char *, int ) ) );
+ connect( proc, TQT_SIGNAL( processExited( KProcess * ) ),
+ TQT_SLOT( slotProcessExited( KProcess * ) ) );
+ connect( proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int ) ),
+ TQT_SLOT( slotReceivedStdout(KProcess *, char *, int ) ) );
+ connect( proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int ) ),
+ TQT_SLOT( slotReceivedStderr(KProcess *, char *, int ) ) );
mCmdQueue.remove( it );
@@ -126,31 +126,31 @@ void IndexBuilder::slotProcessExited( KProcess *proc )
void IndexBuilder::slotReceivedStdout( KProcess *, char *buffer, int buflen )
{
- QString text = QString::fromLocal8Bit( buffer, buflen );
+ TQString text = TQString::fromLocal8Bit( buffer, buflen );
std::cout << text.local8Bit().data() << std::flush;
}
void IndexBuilder::slotReceivedStderr( KProcess *, char *buffer, int buflen )
{
- QString text = QString::fromLocal8Bit( buffer, buflen );
+ TQString text = TQString::fromLocal8Bit( buffer, buflen );
std::cerr << text.local8Bit().data() << std::flush;
}
-void IndexBuilder::sendErrorSignal( const QString &error )
+void IndexBuilder::sendErrorSignal( const TQString &error )
{
kdDebug(1402) << "IndexBuilder::sendErrorSignal()" << endl;
- QByteArray params;
- QDataStream stream( params, IO_WriteOnly );
+ TQByteArray params;
+ TQDataStream stream( params, IO_WriteOnly );
stream << error;
- kapp->dcopClient()->emitDCOPSignal("buildIndexError(QString)", params );
+ kapp->dcopClient()->emitDCOPSignal("buildIndexError(TQString)", params );
}
void IndexBuilder::sendProgressSignal()
{
kdDebug(1402) << "IndexBuilder::sendProgressSignal()" << endl;
- kapp->dcopClient()->emitDCOPSignal("buildIndexProgress()", QByteArray() );
+ kapp->dcopClient()->emitDCOPSignal("buildIndexProgress()", TQByteArray() );
}
void IndexBuilder::quit()
@@ -192,13 +192,13 @@ int main( int argc, char **argv )
return 1;
}
- QString cmdFile = args->arg( 0 );
- QString indexDir = args->arg( 1 );
+ TQString cmdFile = args->arg( 0 );
+ TQString indexDir = args->arg( 1 );
kdDebug(1402) << "cmdFile: " << cmdFile << endl;
kdDebug(1402) << "indexDir: " << indexDir << endl;
- QFile file( indexDir + "/testaccess" );
+ TQFile file( indexDir + "/testaccess" );
if ( !file.open( IO_WriteOnly ) || file.putch( ' ' ) < 0 ) {
kdDebug(1402) << "access denied" << endl;
return 2;
@@ -211,7 +211,7 @@ int main( int argc, char **argv )
IndexBuilder builder(cmdFile);
- QTimer::singleShot(0, &builder, SLOT(buildIndices()));
+ TQTimer::singleShot(0, &builder, TQT_SLOT(buildIndices()));
return app.exec();
}
diff --git a/khelpcenter/khc_indexbuilder.h b/khelpcenter/khc_indexbuilder.h
index 4bd5415a2..96ca25890 100644
--- a/khelpcenter/khc_indexbuilder.h
+++ b/khelpcenter/khc_indexbuilder.h
@@ -23,8 +23,8 @@
#include <kuniqueapplication.h>
-#include <qobject.h>
-#include <qtimer.h>
+#include <tqobject.h>
+#include <tqtimer.h>
class KProcess;
@@ -34,10 +34,10 @@ class IndexBuilder : public QObject
{
Q_OBJECT
public:
- IndexBuilder(const QString& cmdFile);
+ IndexBuilder(const TQString& cmdFile);
void sendProgressSignal();
- void sendErrorSignal( const QString &error );
+ void sendErrorSignal( const TQString &error );
void quit();
void processCmdQueue();
@@ -49,9 +49,9 @@ class IndexBuilder : public QObject
void slotReceivedStderr( KProcess *, char *buffer, int buflen );
private:
- QString m_cmdFile;
- QTimer mTimer;
- QStringList mCmdQueue;
+ TQString m_cmdFile;
+ TQTimer mTimer;
+ TQStringList mCmdQueue;
};
}
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index 4082b39d0..0e54d9236 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -42,9 +42,9 @@
#include <kstdaccel.h>
#include <kdialogbase.h>
-#include <qsplitter.h>
-#include <qtextedit.h>
-#include <qlayout.h>
+#include <tqsplitter.h>
+#include <tqtextedit.h>
+#include <tqlayout.h>
#include <stdlib.h>
#include <assert.h>
@@ -54,15 +54,15 @@ using namespace KHC;
class LogDialog : public KDialogBase
{
public:
- LogDialog( QWidget *parent = 0 )
+ LogDialog( TQWidget *parent = 0 )
: KDialogBase( Plain, i18n("Search Error Log"), Ok, Ok, parent, 0,
false )
{
- QFrame *topFrame = plainPage();
+ TQFrame *topFrame = plainPage();
- QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+ TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
- mTextView = new QTextEdit( topFrame );
+ mTextView = new TQTextEdit( topFrame );
mTextView->setTextFormat( LogText );
topLayout->addWidget( mTextView );
@@ -74,13 +74,13 @@ class LogDialog : public KDialogBase
saveDialogSize( "logdialog" );
}
- void setLog( const QString &log )
+ void setLog( const TQString &log )
{
mTextView->setText( log );
}
private:
- QTextEdit *mTextView;
+ TQTextEdit *mTextView;
};
@@ -88,44 +88,44 @@ MainWindow::MainWindow()
: KMainWindow(0, "MainWindow"), DCOPObject( "KHelpCenterIface" ),
mLogDialog( 0 )
{
- mSplitter = new QSplitter( this );
+ mSplitter = new TQSplitter( this );
mDoc = new View( mSplitter, 0, this, 0, KHTMLPart::DefaultGUI, actionCollection() );
- connect( mDoc, SIGNAL( setWindowCaption( const QString & ) ),
- SLOT( setCaption( const QString & ) ) );
- connect( mDoc, SIGNAL( setStatusBarText( const QString & ) ),
- SLOT( statusBarMessage( const QString & ) ) );
- connect( mDoc, SIGNAL( onURL( const QString & ) ),
- SLOT( statusBarMessage( const QString & ) ) );
- connect( mDoc, SIGNAL( started( KIO::Job * ) ),
- SLOT( slotStarted( KIO::Job * ) ) );
- connect( mDoc, SIGNAL( completed() ),
- SLOT( documentCompleted() ) );
- connect( mDoc, SIGNAL( searchResultCacheAvailable() ),
- SLOT( enableLastSearchAction() ) );
-
- connect( mDoc, SIGNAL( selectionChanged() ),
- SLOT( enableCopyTextAction() ) );
+ connect( mDoc, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
+ TQT_SLOT( setCaption( const TQString & ) ) );
+ connect( mDoc, TQT_SIGNAL( setStatusBarText( const TQString & ) ),
+ TQT_SLOT( statusBarMessage( const TQString & ) ) );
+ connect( mDoc, TQT_SIGNAL( onURL( const TQString & ) ),
+ TQT_SLOT( statusBarMessage( const TQString & ) ) );
+ connect( mDoc, TQT_SIGNAL( started( KIO::Job * ) ),
+ TQT_SLOT( slotStarted( KIO::Job * ) ) );
+ connect( mDoc, TQT_SIGNAL( completed() ),
+ TQT_SLOT( documentCompleted() ) );
+ connect( mDoc, TQT_SIGNAL( searchResultCacheAvailable() ),
+ TQT_SLOT( enableLastSearchAction() ) );
+
+ connect( mDoc, TQT_SIGNAL( selectionChanged() ),
+ TQT_SLOT( enableCopyTextAction() ) );
statusBar()->insertItem(i18n("Preparing Index"), 0, 1);
statusBar()->setItemAlignment(0, AlignLeft | AlignVCenter);
connect( mDoc->browserExtension(),
- SIGNAL( openURLRequest( const KURL &,
+ TQT_SIGNAL( openURLRequest( const KURL &,
const KParts::URLArgs & ) ),
- SLOT( slotOpenURLRequest( const KURL &,
+ TQT_SLOT( slotOpenURLRequest( const KURL &,
const KParts::URLArgs & ) ) );
mNavigator = new Navigator( mDoc, mSplitter, "nav" );
- connect( mNavigator, SIGNAL( itemSelected( const QString & ) ),
- SLOT( viewUrl( const QString & ) ) );
- connect( mNavigator, SIGNAL( glossSelected( const GlossaryEntry & ) ),
- SLOT( slotGlossSelected( const GlossaryEntry & ) ) );
+ connect( mNavigator, TQT_SIGNAL( itemSelected( const TQString & ) ),
+ TQT_SLOT( viewUrl( const TQString & ) ) );
+ connect( mNavigator, TQT_SIGNAL( glossSelected( const GlossaryEntry & ) ),
+ TQT_SLOT( slotGlossSelected( const GlossaryEntry & ) ) );
mSplitter->moveToFirst(mNavigator);
- mSplitter->setResizeMode(mNavigator, QSplitter::KeepSize);
+ mSplitter->setResizeMode(mNavigator, TQSplitter::KeepSize);
setCentralWidget( mSplitter );
- QValueList<int> sizes;
+ TQValueList<int> sizes;
sizes << 220 << 580;
mSplitter->setSizes(sizes);
setGeometry(366, 0, 800, 600);
@@ -150,10 +150,10 @@ MainWindow::MainWindow()
History::self().installMenuBarHook( this );
- connect( &History::self(), SIGNAL( goInternalUrl( const KURL & ) ),
- mNavigator, SLOT( openInternalUrl( const KURL & ) ) );
- connect( &History::self(), SIGNAL( goUrl( const KURL & ) ),
- mNavigator, SLOT( selectItem( const KURL & ) ) );
+ connect( &History::self(), TQT_SIGNAL( goInternalUrl( const KURL & ) ),
+ mNavigator, TQT_SLOT( openInternalUrl( const KURL & ) ) );
+ connect( &History::self(), TQT_SIGNAL( goUrl( const KURL & ) ),
+ mNavigator, TQT_SLOT( selectItem( const KURL & ) ) );
statusBarMessage(i18n("Ready"));
enableCopyTextAction();
@@ -187,7 +187,7 @@ void MainWindow::readConfig()
{
KConfig *config = KGlobal::config();
config->setGroup( "MainWindowState" );
- QValueList<int> sizes = config->readIntListEntry( "Splitter" );
+ TQValueList<int> sizes = config->readIntListEntry( "Splitter" );
if ( sizes.count() == 2 ) {
mSplitter->setSizes( sizes );
}
@@ -208,48 +208,48 @@ void MainWindow::writeConfig()
void MainWindow::setupActions()
{
- KStdAction::quit( this, SLOT( close() ), actionCollection() );
- KStdAction::print( this, SLOT( print() ), actionCollection(),
+ KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
+ KStdAction::print( this, TQT_SLOT( print() ), actionCollection(),
"printFrame" );
- KAction *prevPage = new KAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, SLOT( prevPage() ),
+ KAction *prevPage = new KAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQT_SLOT( prevPage() ),
actionCollection(), "prevPage" );
prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) );
- KAction *nextPage = new KAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, SLOT( nextPage() ),
+ KAction *nextPage = new KAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, TQT_SLOT( nextPage() ),
actionCollection(), "nextPage" );
nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) );
- KAction *home = KStdAction::home( this, SLOT( slotShowHome() ), actionCollection() );
+ KAction *home = KStdAction::home( this, TQT_SLOT( slotShowHome() ), actionCollection() );
home->setText(i18n("Table of &Contents"));
home->setToolTip(i18n("Table of contents"));
home->setWhatsThis(i18n("Go back to the table of contents"));
- mCopyText = KStdAction::copy( this, SLOT(slotCopySelectedText()), actionCollection(), "copy_text");
+ mCopyText = KStdAction::copy( this, TQT_SLOT(slotCopySelectedText()), actionCollection(), "copy_text");
mLastSearchAction = new KAction( i18n("&Last Search Result"), 0, this,
- SLOT( slotLastSearch() ),
+ TQT_SLOT( slotLastSearch() ),
actionCollection(), "lastsearch" );
mLastSearchAction->setEnabled( false );
new KAction( i18n("Build Search Index..."), 0, mNavigator,
- SLOT( showIndexDialog() ), actionCollection(), "build_index" );
- KStdAction::keyBindings( guiFactory(), SLOT( configureShortcuts() ),
+ TQT_SLOT( showIndexDialog() ), actionCollection(), "build_index" );
+ KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ),
actionCollection() );
KConfig *cfg = KGlobal::config();
cfg->setGroup( "Debug" );
if ( cfg->readBoolEntry( "SearchErrorLog", false ) ) {
new KAction( i18n("Show Search Error Log"), 0, this,
- SLOT( showSearchStderr() ), actionCollection(),
+ TQT_SLOT( showSearchStderr() ), actionCollection(),
"show_search_stderr" );
}
History::self().setupActions( actionCollection() );
- new KAction( i18n( "Configure Fonts..." ), KShortcut(), this, SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" );
- new KAction( i18n( "Increase Font Sizes" ), "viewmag+", KShortcut(), this, SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" );
- new KAction( i18n( "Decrease Font Sizes" ), "viewmag-", KShortcut(), this, SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" );
+ new KAction( i18n( "Configure Fonts..." ), KShortcut(), this, TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" );
+ new KAction( i18n( "Increase Font Sizes" ), "viewmag+", KShortcut(), this, TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" );
+ new KAction( i18n( "Decrease Font Sizes" ), "viewmag-", KShortcut(), this, TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" );
}
void MainWindow::slotCopySelectedText()
@@ -265,8 +265,8 @@ void MainWindow::print()
void MainWindow::slotStarted(KIO::Job *job)
{
if (job)
- connect(job, SIGNAL(infoMessage( KIO::Job *, const QString &)),
- SLOT(slotInfoMessage(KIO::Job *, const QString &)));
+ connect(job, TQT_SIGNAL(infoMessage( KIO::Job *, const TQString &)),
+ TQT_SLOT(slotInfoMessage(KIO::Job *, const TQString &)));
History::self().updateActions();
}
@@ -286,7 +286,7 @@ void MainWindow::slotOpenURLRequest( const KURL &url,
viewUrl( url, args );
}
-void MainWindow::viewUrl( const QString &url )
+void MainWindow::viewUrl( const TQString &url )
{
viewUrl( KURL( url ) );
}
@@ -295,7 +295,7 @@ void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args )
{
stop();
- QString proto = url.protocol().lower();
+ TQString proto = url.protocol().lower();
if ( proto == "khelpcenter" ) {
History::self().createEntry();
@@ -325,8 +325,8 @@ void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args )
mDoc->browserExtension()->setURLArgs( args );
- if ( proto == QString::fromLatin1("glossentry") ) {
- QString decodedEntryId = KURL::decode_string( url.encodedPathAndQuery() );
+ if ( proto == TQString::fromLatin1("glossentry") ) {
+ TQString decodedEntryId = KURL::decode_string( url.encodedPathAndQuery() );
slotGlossSelected( mNavigator->glossEntry( decodedEntryId ) );
mNavigator->slotSelectGlossEntry( decodedEntryId );
} else {
@@ -342,22 +342,22 @@ void MainWindow::documentCompleted()
History::self().updateActions();
}
-void MainWindow::slotInfoMessage(KIO::Job *, const QString &m)
+void MainWindow::slotInfoMessage(KIO::Job *, const TQString &m)
{
statusBarMessage(m);
}
-void MainWindow::statusBarMessage(const QString &m)
+void MainWindow::statusBarMessage(const TQString &m)
{
statusBar()->changeItem(m, 0);
}
-void MainWindow::openUrl( const QString &url )
+void MainWindow::openUrl( const TQString &url )
{
openUrl( KURL( url ) );
}
-void MainWindow::openUrl( const QString &url, const QCString& startup_id )
+void MainWindow::openUrl( const TQString &url, const TQCString& startup_id )
{
KStartupInfo::setNewStartupId( this, startup_id );
openUrl( KURL( url ) );
@@ -419,7 +419,7 @@ void MainWindow::enableLastSearchAction()
void MainWindow::showSearchStderr()
{
- QString log = mNavigator->searchEngine()->errorLog();
+ TQString log = mNavigator->searchEngine()->errorLog();
if ( !mLogDialog ) {
mLogDialog = new LogDialog( this );
@@ -458,7 +458,7 @@ void MainWindow::updateZoomActions()
void MainWindow::slotConfigureFonts()
{
FontDialog dlg( this );
- if ( dlg.exec() == QDialog::Accepted )
+ if ( dlg.exec() == TQDialog::Accepted )
mDoc->slotReload();
}
diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h
index aba2d3421..9970b61fd 100644
--- a/khelpcenter/mainwindow.h
+++ b/khelpcenter/mainwindow.h
@@ -1,7 +1,7 @@
#ifndef __mainwindow_h__
#define __mainwindow_h__
-#include <qptrlist.h>
+#include <tqptrlist.h>
#include <kmainwindow.h>
#include <kio/job.h>
@@ -31,14 +31,14 @@ class MainWindow : public KMainWindow, public DCOPObject
~MainWindow();
k_dcop:
- void openUrl( const QString &url );
- void openUrl( const QString &url, const QCString& startup_id );
+ void openUrl( const TQString &url );
+ void openUrl( const TQString &url, const TQCString& startup_id );
void showHome();
void lastSearch();
public slots:
void print();
- void statusBarMessage(const QString &m);
+ void statusBarMessage(const TQString &m);
void slotShowHome();
void slotLastSearch();
void showSearchStderr();
@@ -50,7 +50,7 @@ class MainWindow : public KMainWindow, public DCOPObject
/**
Show document corresponding to given URL in viewer part.
*/
- void viewUrl( const QString & );
+ void viewUrl( const TQString & );
/**
Open document corresponding to given URL, i.e. show it in the viewer part
@@ -77,7 +77,7 @@ class MainWindow : public KMainWindow, public DCOPObject
private slots:
void slotGlossSelected(const GlossaryEntry &entry);
void slotStarted(KIO::Job *job);
- void slotInfoMessage(KIO::Job *, const QString &);
+ void slotInfoMessage(KIO::Job *, const TQString &);
void goInternalUrl( const KURL & );
/**
This function is called when the user clicks on a link in the viewer part.
@@ -93,7 +93,7 @@ class MainWindow : public KMainWindow, public DCOPObject
private:
void updateZoomActions();
- QSplitter *mSplitter;
+ TQSplitter *mSplitter;
View *mDoc;
Navigator *mNavigator;
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index 652bf899d..48ae76dd0 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -23,19 +23,19 @@
#include <sys/stat.h>
#include <unistd.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qpixmap.h>
-#include <qstring.h>
-#include <qlabel.h>
-#include <qheader.h>
-#include <qdom.h>
-#include <qtextstream.h>
-#include <qregexp.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qtooltip.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqpixmap.h>
+#include <tqstring.h>
+#include <tqlabel.h>
+#include <tqheader.h>
+#include <tqdom.h>
+#include <tqtextstream.h>
+#include <tqregexp.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
+#include <tqtooltip.h>
#include <kaction.h>
#include <kapplication.h>
@@ -76,8 +76,8 @@
using namespace KHC;
-Navigator::Navigator( View *view, QWidget *parent, const char *name )
- : QWidget( parent, name ), mIndexDialog( 0 ),
+Navigator::Navigator( View *view, TQWidget *parent, const char *name )
+ : TQWidget( parent, name ), mIndexDialog( 0 ),
mView( view ), mSelected( false )
{
KConfig *config = kapp->config();
@@ -85,43 +85,43 @@ Navigator::Navigator( View *view, QWidget *parent, const char *name )
mShowMissingDocs = config->readBoolEntry("ShowMissingDocs",false);
mSearchEngine = new SearchEngine( view );
- connect( mSearchEngine, SIGNAL( searchFinished() ),
- SLOT( slotSearchFinished() ) );
+ connect( mSearchEngine, TQT_SIGNAL( searchFinished() ),
+ TQT_SLOT( slotSearchFinished() ) );
DocMetaInfo::self()->scanMetaInfo();
- QBoxLayout *topLayout = new QVBoxLayout( this );
+ TQBoxLayout *topLayout = new TQVBoxLayout( this );
- mSearchFrame = new QFrame( this );
+ mSearchFrame = new TQFrame( this );
topLayout->addWidget( mSearchFrame );
- QBoxLayout *searchLayout = new QHBoxLayout( mSearchFrame );
+ TQBoxLayout *searchLayout = new TQHBoxLayout( mSearchFrame );
searchLayout->setSpacing( KDialog::spacingHint() );
searchLayout->setMargin( 6 );
- QPushButton *clearButton = new QPushButton( mSearchFrame );
+ TQPushButton *clearButton = new TQPushButton( mSearchFrame );
clearButton->setIconSet( KApplication::reverseLayout() ?
SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") );
searchLayout->addWidget( clearButton );
- connect( clearButton, SIGNAL( clicked() ), SLOT( clearSearch() ) );
- QToolTip::add( clearButton, i18n("Clear search") );
+ connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( clearSearch() ) );
+ TQToolTip::add( clearButton, i18n("Clear search") );
- mSearchEdit = new QLineEdit( mSearchFrame );
+ mSearchEdit = new TQLineEdit( mSearchFrame );
searchLayout->addWidget( mSearchEdit );
- connect( mSearchEdit, SIGNAL( returnPressed() ), SLOT( slotSearch() ) );
- connect( mSearchEdit, SIGNAL( textChanged( const QString & ) ),
- SLOT( checkSearchButton() ) );
+ connect( mSearchEdit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotSearch() ) );
+ connect( mSearchEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
+ TQT_SLOT( checkSearchButton() ) );
- mSearchButton = new QPushButton( i18n("&Search"), mSearchFrame );
+ mSearchButton = new TQPushButton( i18n("&Search"), mSearchFrame );
searchLayout->addWidget( mSearchButton );
- connect( mSearchButton, SIGNAL( clicked() ), SLOT( slotSearch() ) );
+ connect( mSearchButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSearch() ) );
clearButton->setFixedHeight( mSearchButton->height() );
- mTabWidget = new QTabWidget( this );
+ mTabWidget = new TQTabWidget( this );
topLayout->addWidget( mTabWidget );
- connect( mTabWidget, SIGNAL( currentChanged( QWidget * ) ),
- SLOT( slotTabChanged( QWidget * ) ) );
+ connect( mTabWidget, TQT_SIGNAL( currentChanged( TQWidget * ) ),
+ TQT_SLOT( slotTabChanged( TQWidget * ) ) );
setupContentsTab();
setupGlossaryTab();
@@ -160,29 +160,29 @@ bool Navigator::showMissingDocs() const
void Navigator::setupContentsTab()
{
mContentsTree = new KListView( mTabWidget );
- mContentsTree->setFrameStyle(QFrame::Panel | QFrame::Sunken);
- mContentsTree->addColumn(QString::null);
+ mContentsTree->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
+ mContentsTree->addColumn(TQString::null);
mContentsTree->setAllColumnsShowFocus(true);
mContentsTree->header()->hide();
mContentsTree->setRootIsDecorated(false);
mContentsTree->setSorting(-1, false);
- connect(mContentsTree, SIGNAL(clicked(QListViewItem*)),
- SLOT(slotItemSelected(QListViewItem*)));
- connect(mContentsTree, SIGNAL(returnPressed(QListViewItem*)),
- SLOT(slotItemSelected(QListViewItem*)));
+ connect(mContentsTree, TQT_SIGNAL(clicked(TQListViewItem*)),
+ TQT_SLOT(slotItemSelected(TQListViewItem*)));
+ connect(mContentsTree, TQT_SIGNAL(returnPressed(TQListViewItem*)),
+ TQT_SLOT(slotItemSelected(TQListViewItem*)));
mTabWidget->addTab(mContentsTree, i18n("&Contents"));
}
void Navigator::setupSearchTab()
{
mSearchWidget = new SearchWidget( mSearchEngine, mTabWidget );
- connect( mSearchWidget, SIGNAL( searchResult( const QString & ) ),
- SLOT( slotShowSearchResult( const QString & ) ) );
- connect( mSearchWidget, SIGNAL( scopeCountChanged( int ) ),
- SLOT( checkSearchButton() ) );
- connect( mSearchWidget, SIGNAL( showIndexDialog() ),
- SLOT( showIndexDialog() ) );
+ connect( mSearchWidget, TQT_SIGNAL( searchResult( const TQString & ) ),
+ TQT_SLOT( slotShowSearchResult( const TQString & ) ) );
+ connect( mSearchWidget, TQT_SIGNAL( scopeCountChanged( int ) ),
+ TQT_SLOT( checkSearchButton() ) );
+ connect( mSearchWidget, TQT_SIGNAL( showIndexDialog() ),
+ TQT_SLOT( showIndexDialog() ) );
mTabWidget->addTab( mSearchWidget, i18n("Search Options"));
}
@@ -190,8 +190,8 @@ void Navigator::setupSearchTab()
void Navigator::setupGlossaryTab()
{
mGlossaryTree = new Glossary( mTabWidget );
- connect( mGlossaryTree, SIGNAL( entrySelected( const GlossaryEntry & ) ),
- this, SIGNAL( glossSelected( const GlossaryEntry & ) ) );
+ connect( mGlossaryTree, TQT_SIGNAL( entrySelected( const GlossaryEntry & ) ),
+ this, TQT_SIGNAL( glossSelected( const GlossaryEntry & ) ) );
mTabWidget->addTab( mGlossaryTree, i18n( "G&lossary" ) );
}
@@ -211,7 +211,7 @@ void Navigator::insertPlugins()
#endif
}
-void Navigator::insertParentAppDocs( const QString &name, NavigatorItem *topItem )
+void Navigator::insertParentAppDocs( const TQString &name, NavigatorItem *topItem )
{
kdDebug(1400) << "Requested plugin documents for ID " << name << endl;
@@ -223,30 +223,30 @@ void Navigator::insertParentAppDocs( const QString &name, NavigatorItem *topItem
KServiceGroup::List::ConstIterator it = entries.begin();
KServiceGroup::List::ConstIterator end = entries.end();
for ( ; it != end; ++it ) {
- QString desktopFile = ( *it )->entryPath();
- if ( QDir::isRelativePath( desktopFile ) )
+ TQString desktopFile = ( *it )->entryPath();
+ if ( TQDir::isRelativePath( desktopFile ) )
desktopFile = locate( "apps", desktopFile );
createItemFromDesktopFile( topItem, desktopFile );
}
}
-void Navigator::insertIOSlaveDocs( const QString &name, NavigatorItem *topItem )
+void Navigator::insertIOSlaveDocs( const TQString &name, NavigatorItem *topItem )
{
kdDebug(1400) << "Requested IOSlave documents for ID " << name << endl;
#if KDE_IS_VERSION( 3, 1, 90 )
- QStringList list = KProtocolInfo::protocols();
+ TQStringList list = KProtocolInfo::protocols();
list.sort();
NavigatorItem *prevItem = 0;
- for ( QStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
+ for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
{
- QString docPath = KProtocolInfo::docPath(*it);
+ TQString docPath = KProtocolInfo::docPath(*it);
if ( !docPath.isNull() )
{
// First parameter is ignored if second is an absolute path
KURL url(KURL("help:/"), docPath);
- QString icon = KProtocolInfo::icon(*it);
+ TQString icon = KProtocolInfo::icon(*it);
if ( icon.isEmpty() ) icon = "document2";
DocEntry *entry = new DocEntry( *it, url.url(), icon );
NavigatorItem *item = new NavigatorItem( entry, topItem, prevItem );
@@ -261,25 +261,25 @@ void Navigator::insertIOSlaveDocs( const QString &name, NavigatorItem *topItem )
void Navigator::insertAppletDocs( NavigatorItem *topItem )
{
- QDir appletDir( locate( "data", QString::fromLatin1( "kicker/applets/" ) ) );
- appletDir.setNameFilter( QString::fromLatin1( "*.desktop" ) );
+ TQDir appletDir( locate( "data", TQString::fromLatin1( "kicker/applets/" ) ) );
+ appletDir.setNameFilter( TQString::fromLatin1( "*.desktop" ) );
- QStringList files = appletDir.entryList( QDir::Files | QDir::Readable );
- QStringList::ConstIterator it = files.begin();
- QStringList::ConstIterator end = files.end();
+ TQStringList files = appletDir.entryList( TQDir::Files | TQDir::Readable );
+ TQStringList::ConstIterator it = files.begin();
+ TQStringList::ConstIterator end = files.end();
for ( ; it != end; ++it )
createItemFromDesktopFile( topItem, appletDir.absPath() + "/" + *it );
}
void Navigator::createItemFromDesktopFile( NavigatorItem *topItem,
- const QString &file )
+ const TQString &file )
{
KDesktopFile desktopFile( file );
- QString docPath = desktopFile.readDocPath();
+ TQString docPath = desktopFile.readDocPath();
if ( !docPath.isNull() ) {
// First parameter is ignored if second is an absolute path
KURL url(KURL("help:/"), docPath);
- QString icon = desktopFile.readIcon();
+ TQString icon = desktopFile.readIcon();
if ( icon.isEmpty() ) icon = "document2";
DocEntry *entry = new DocEntry( desktopFile.readName(), url.url(), icon );
NavigatorItem *item = new NavigatorItem( entry, topItem );
@@ -316,7 +316,7 @@ void Navigator::selectItem( const KURL &url )
if (url.hasRef())
{
alternativeURL.setQuery("anchor="+url.ref());
- alternativeURL.setRef(QString::null);
+ alternativeURL.setRef(TQString::null);
}
// If the navigator already has the given URL selected, do nothing.
@@ -332,14 +332,14 @@ void Navigator::selectItem( const KURL &url )
// First, populate the NavigatorAppItems if we don't want the home page
if ( url != homeURL() ) {
- for ( QListViewItem *item = mContentsTree->firstChild(); item;
+ for ( TQListViewItem *item = mContentsTree->firstChild(); item;
item = item->nextSibling() ) {
NavigatorAppItem *appItem = dynamic_cast<NavigatorAppItem *>( item );
if ( appItem ) appItem->populate( true /* recursive */ );
}
}
- QListViewItemIterator it( mContentsTree );
+ TQListViewItemIterator it( mContentsTree );
while ( it.current() ) {
NavigatorItem *item = static_cast<NavigatorItem *>( it.current() );
KURL itemUrl( item->entry()->url() );
@@ -367,7 +367,7 @@ void Navigator::clearSelection()
mSelected = false;
}
-void Navigator::slotItemSelected( QListViewItem *currentItem )
+void Navigator::slotItemSelected( TQListViewItem *currentItem )
{
if ( !currentItem ) return;
@@ -397,7 +397,7 @@ void Navigator::slotItemSelected( QListViewItem *currentItem )
kdDebug( 1400 ) << "slotItemSelected(): Trying to build TOC for "
<< item->entry()->name() << endl;
tocTree->setApplication( url.directory() );
- QString doc = View::langLookup( url.path() );
+ TQString doc = View::langLookup( url.path() );
// Enforce the original .docbook version, in case langLookup returns a
// cached version
if ( !doc.isNull() ) {
@@ -438,26 +438,26 @@ void Navigator::showOverview( NavigatorItem *item, const KURL &url )
{
mView->beginInternal( url );
- QString fileName = locate( "data", "khelpcenter/index.html.in" );
+ TQString fileName = locate( "data", "khelpcenter/index.html.in" );
if ( fileName.isEmpty() )
return;
- QFile file( fileName );
+ TQFile file( fileName );
if ( !file.open( IO_ReadOnly ) )
return;
- QTextStream stream( &file );
- QString res = stream.read();
+ TQTextStream stream( &file );
+ TQString res = stream.read();
- QString title,name,content;
+ TQString title,name,content;
uint childCount;
if ( item ) {
title = item->entry()->name();
name = item->entry()->name();
- QString info = item->entry()->info();
+ TQString info = item->entry()->info();
if ( !info.isEmpty() ) content = "<p>" + info + "</p>\n";
childCount = item->childCount();
@@ -469,7 +469,7 @@ void Navigator::showOverview( NavigatorItem *item, const KURL &url )
}
if ( childCount > 0 ) {
- QListViewItem *child;
+ TQListViewItem *child;
if ( item ) child = item->firstChild();
else child = mContentsTree->firstChild();
@@ -487,11 +487,11 @@ void Navigator::showOverview( NavigatorItem *item, const KURL &url )
mView->end();
}
-QString Navigator::createChildrenList( QListViewItem *child )
+TQString Navigator::createChildrenList( TQListViewItem *child )
{
++mDirLevel;
- QString t;
+ TQString t;
t += "<ul>\n";
@@ -534,10 +534,10 @@ void Navigator::slotSearch()
if ( mSearchEngine->isRunning() ) return;
- QString words = mSearchEdit->text();
- QString method = mSearchWidget->method();
+ TQString words = mSearchEdit->text();
+ TQString method = mSearchWidget->method();
int pages = mSearchWidget->pages();
- QString scope = mSearchWidget->scope();
+ TQString scope = mSearchWidget->scope();
kdDebug(1400) << "Navigator::slotSearch() words: " << words << endl;
kdDebug(1400) << "Navigator::slotSearch() scope: " << scope << endl;
@@ -546,7 +546,7 @@ void Navigator::slotSearch()
// disable search Button during searches
mSearchButton->setEnabled(false);
- QApplication::setOverrideCursor(waitCursor);
+ TQApplication::setOverrideCursor(waitCursor);
if ( !mSearchEngine->search( words, method, pages, scope ) ) {
slotSearchFinished();
@@ -554,9 +554,9 @@ void Navigator::slotSearch()
}
}
-void Navigator::slotShowSearchResult( const QString &url )
+void Navigator::slotShowSearchResult( const TQString &url )
{
- QString u = url;
+ TQString u = url;
u.replace( "%k", mSearchEdit->text() );
emit itemSelected( u );
@@ -565,7 +565,7 @@ void Navigator::slotShowSearchResult( const QString &url )
void Navigator::slotSearchFinished()
{
mSearchButton->setEnabled(true);
- QApplication::restoreOverrideCursor();
+ TQApplication::restoreOverrideCursor();
kdDebug( 1400 ) << "Search finished." << endl;
}
@@ -591,10 +591,10 @@ bool Navigator::checkSearchIndex()
if ( mIndexDialog && mIndexDialog->isShown() ) return true;
- QString text = i18n( "A search index does not yet exist. Do you want "
+ TQString text = i18n( "A search index does not yet exist. Do you want "
"to create the index now?" );
- int result = KMessageBox::questionYesNo( this, text, QString::null,
+ int result = KMessageBox::questionYesNo( this, text, TQString::null,
i18n("Create"),
i18n("Do Not Create"),
"indexcreation" );
@@ -606,12 +606,12 @@ bool Navigator::checkSearchIndex()
return true;
}
-void Navigator::slotTabChanged( QWidget *wid )
+void Navigator::slotTabChanged( TQWidget *wid )
{
if ( wid == mSearchWidget ) checkSearchIndex();
}
-void Navigator::slotSelectGlossEntry( const QString &id )
+void Navigator::slotSelectGlossEntry( const TQString &id )
{
mGlossaryTree->slotSelectGlossEntry( id );
}
@@ -633,8 +633,8 @@ void Navigator::showIndexDialog()
{
if ( !mIndexDialog ) {
mIndexDialog = new KCMHelpCenter( mSearchEngine, this );
- connect( mIndexDialog, SIGNAL( searchIndexUpdated() ), mSearchWidget,
- SLOT( updateScopeList() ) );
+ connect( mIndexDialog, TQT_SIGNAL( searchIndexUpdated() ), mSearchWidget,
+ TQT_SLOT( updateScopeList() ) );
}
mIndexDialog->show();
mIndexDialog->raise();
@@ -664,7 +664,7 @@ void Navigator::writeConfig()
void Navigator::clearSearch()
{
- mSearchEdit->setText( QString::null );
+ mSearchEdit->setText( TQString::null );
}
#include "navigator.moc"
diff --git a/khelpcenter/navigator.h b/khelpcenter/navigator.h
index 5e28c0460..92430585f 100644
--- a/khelpcenter/navigator.h
+++ b/khelpcenter/navigator.h
@@ -26,13 +26,13 @@
#include <klistview.h>
#include <kurl.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qtimer.h>
-#include <qptrlist.h>
-#include <qtabwidget.h>
-#include <qlistview.h>
-#include <qdict.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqtimer.h>
+#include <tqptrlist.h>
+#include <tqtabwidget.h>
+#include <tqlistview.h>
+#include <tqdict.h>
class QPushButton;
@@ -56,7 +56,7 @@ class Navigator : public QWidget
{
Q_OBJECT
public:
- Navigator(View *, QWidget *parent=0, const char *name=0);
+ Navigator(View *, TQWidget *parent=0, const char *name=0);
virtual ~Navigator();
KURL homeURL();
@@ -64,16 +64,16 @@ class Navigator : public QWidget
SearchEngine *searchEngine() const;
Formatter *formatter() const;
- const GlossaryEntry &glossEntry(const QString &term) const { return mGlossaryTree->entry( term ); }
+ const GlossaryEntry &glossEntry(const TQString &term) const { return mGlossaryTree->entry( term ); }
- void insertParentAppDocs( const QString &name, NavigatorItem *parent );
+ void insertParentAppDocs( const TQString &name, NavigatorItem *parent );
void insertAppletDocs( NavigatorItem *parent );
NavigatorItem *insertScrollKeeperDocs( NavigatorItem *parentItem,
NavigatorItem *after );
void insertInfoDocs( NavigatorItem *parentItem );
- void insertIOSlaveDocs(const QString &, NavigatorItem*parent);
+ void insertIOSlaveDocs(const TQString &, NavigatorItem*parent);
- void createItemFromDesktopFile( NavigatorItem *item, const QString &name );
+ void createItemFromDesktopFile( NavigatorItem *item, const TQString &name );
bool showMissingDocs() const;
@@ -86,20 +86,20 @@ class Navigator : public QWidget
public slots:
void openInternalUrl( const KURL &url );
- void slotItemSelected(QListViewItem* index);
+ void slotItemSelected(TQListViewItem* index);
void slotSearch();
- void slotShowSearchResult( const QString & );
- void slotSelectGlossEntry( const QString &id );
+ void slotShowSearchResult( const TQString & );
+ void slotSelectGlossEntry( const TQString &id );
void selectItem( const KURL &url );
void showIndexDialog();
signals:
- void itemSelected(const QString& itemURL);
+ void itemSelected(const TQString& itemURL);
void glossSelected(const GlossaryEntry &entry);
protected slots:
void slotSearchFinished();
- void slotTabChanged( QWidget * );
+ void slotTabChanged( TQWidget * );
void checkSearchButton();
bool checkSearchIndex();
@@ -107,7 +107,7 @@ class Navigator : public QWidget
void clearSearch();
protected:
- QString createChildrenList( QListViewItem *child );
+ TQString createChildrenList( TQListViewItem *child );
private:
void setupContentsTab();
@@ -124,13 +124,13 @@ class Navigator : public QWidget
SearchWidget *mSearchWidget;
KCMHelpCenter *mIndexDialog;
- QTabWidget *mTabWidget;
+ TQTabWidget *mTabWidget;
- QFrame *mSearchFrame;
- QLineEdit *mSearchEdit;
- QPushButton *mSearchButton;
+ TQFrame *mSearchFrame;
+ TQLineEdit *mSearchEdit;
+ TQPushButton *mSearchButton;
- QPtrList<NavigatorItem> manualItems, pluginItems;
+ TQPtrList<NavigatorItem> manualItems, pluginItems;
bool mShowMissingDocs;
diff --git a/khelpcenter/navigatorappitem.cpp b/khelpcenter/navigatorappitem.cpp
index ca1dabe1f..f22a0064d 100644
--- a/khelpcenter/navigatorappitem.cpp
+++ b/khelpcenter/navigatorappitem.cpp
@@ -26,8 +26,8 @@
using namespace KHC;
-NavigatorAppItem::NavigatorAppItem( DocEntry *entry, QListView *parent,
- const QString &relPath )
+NavigatorAppItem::NavigatorAppItem( DocEntry *entry, TQListView *parent,
+ const TQString &relPath )
: NavigatorItem( entry, parent ),
mRelpath( relPath ),
mPopulated( false )
@@ -35,8 +35,8 @@ NavigatorAppItem::NavigatorAppItem( DocEntry *entry, QListView *parent,
setExpandable( true );
}
-NavigatorAppItem::NavigatorAppItem( DocEntry *entry, QListViewItem *parent,
- const QString &relPath )
+NavigatorAppItem::NavigatorAppItem( DocEntry *entry, TQListViewItem *parent,
+ const TQString &relPath )
: NavigatorItem( entry, parent ),
mRelpath( relPath ),
mPopulated( false )
@@ -44,23 +44,23 @@ NavigatorAppItem::NavigatorAppItem( DocEntry *entry, QListViewItem *parent,
setExpandable( true );
}
-NavigatorAppItem::NavigatorAppItem( DocEntry *entry, QListView *parent,
- QListViewItem *after )
+NavigatorAppItem::NavigatorAppItem( DocEntry *entry, TQListView *parent,
+ TQListViewItem *after )
: NavigatorItem( entry, parent, after ),
mPopulated( false )
{
setExpandable( true );
}
-NavigatorAppItem::NavigatorAppItem( DocEntry *entry, QListViewItem *parent,
- QListViewItem *after )
+NavigatorAppItem::NavigatorAppItem( DocEntry *entry, TQListViewItem *parent,
+ TQListViewItem *after )
: NavigatorItem( entry, parent, after ),
mPopulated( false )
{
setExpandable( true );
}
-void NavigatorAppItem::setRelpath( const QString &relpath )
+void NavigatorAppItem::setRelpath( const TQString &relpath )
{
mRelpath = relpath;
}
@@ -75,7 +75,7 @@ void NavigatorAppItem::setOpen(bool open)
<< mRelpath << ")" << endl;
populate();
}
- QListViewItem::setOpen(open);
+ TQListViewItem::setOpen(open);
}
void NavigatorAppItem::populate( bool recursive )
@@ -97,7 +97,7 @@ void NavigatorAppItem::populate( bool recursive )
KService::Ptr s;
NavigatorItem *item;
KServiceGroup::Ptr g;
- QString url;
+ TQString url;
switch ( e->sycocaType() ) {
case KST_KService:
@@ -132,16 +132,16 @@ void NavigatorAppItem::populate( bool recursive )
mPopulated = true;
}
-QString NavigatorAppItem::documentationURL( KService *s )
+TQString NavigatorAppItem::documentationURL( KService *s )
{
- QString docPath = s->property( "DocPath" ).toString();
+ TQString docPath = s->property( "DocPath" ).toString();
if ( docPath.isEmpty() )
- return QString::null;
+ return TQString::null;
if ( docPath.startsWith( "file:") || docPath.startsWith( "http:" ) )
return docPath;
- return QString( "help:/" ) + docPath;
+ return TQString( "help:/" ) + docPath;
}
// vim:ts=2:sw=2:et
diff --git a/khelpcenter/navigatorappitem.h b/khelpcenter/navigatorappitem.h
index 8690c52e5..95b9e51b6 100644
--- a/khelpcenter/navigatorappitem.h
+++ b/khelpcenter/navigatorappitem.h
@@ -29,26 +29,26 @@ namespace KHC {
class NavigatorAppItem : public NavigatorItem
{
public:
- NavigatorAppItem( DocEntry *entry, QListView *parent,
- const QString &relPath );
- NavigatorAppItem( DocEntry *entry, QListViewItem *parent,
- const QString &relPath );
+ NavigatorAppItem( DocEntry *entry, TQListView *parent,
+ const TQString &relPath );
+ NavigatorAppItem( DocEntry *entry, TQListViewItem *parent,
+ const TQString &relPath );
- NavigatorAppItem( DocEntry *entry, QListView *parent,
- QListViewItem *after );
- NavigatorAppItem( DocEntry *entry, QListViewItem *parent,
- QListViewItem *after );
+ NavigatorAppItem( DocEntry *entry, TQListView *parent,
+ TQListViewItem *after );
+ NavigatorAppItem( DocEntry *entry, TQListViewItem *parent,
+ TQListViewItem *after );
- void setRelpath( const QString & );
+ void setRelpath( const TQString & );
virtual void setOpen(bool);
void populate( bool recursive = false );
protected:
- QString documentationURL( KService *s );
+ TQString documentationURL( KService *s );
private:
- QString mRelpath;
+ TQString mRelpath;
bool mPopulated;
};
diff --git a/khelpcenter/navigatoritem.cpp b/khelpcenter/navigatoritem.cpp
index d2ad548b9..045e23542 100644
--- a/khelpcenter/navigatoritem.cpp
+++ b/khelpcenter/navigatoritem.cpp
@@ -28,28 +28,28 @@
using namespace KHC;
-NavigatorItem::NavigatorItem( DocEntry *entry, QListView *parent,
- QListViewItem *after )
- : QListViewItem( parent, after )
+NavigatorItem::NavigatorItem( DocEntry *entry, TQListView *parent,
+ TQListViewItem *after )
+ : TQListViewItem( parent, after )
{
init( entry );
}
-NavigatorItem::NavigatorItem( DocEntry *entry, QListViewItem *parent,
- QListViewItem *after )
- : QListViewItem( parent, after )
+NavigatorItem::NavigatorItem( DocEntry *entry, TQListViewItem *parent,
+ TQListViewItem *after )
+ : TQListViewItem( parent, after )
{
init( entry );
}
-NavigatorItem::NavigatorItem( DocEntry *entry, QListView *parent )
- : QListViewItem( parent )
+NavigatorItem::NavigatorItem( DocEntry *entry, TQListView *parent )
+ : TQListViewItem( parent )
{
init( entry );
}
-NavigatorItem::NavigatorItem( DocEntry *entry, QListViewItem *parent )
- : QListViewItem( parent )
+NavigatorItem::NavigatorItem( DocEntry *entry, TQListViewItem *parent )
+ : TQListViewItem( parent )
{
init( entry );
}
@@ -94,7 +94,7 @@ TOC *NavigatorItem::createTOC()
void NavigatorItem::setOpen( bool open )
{
- QListViewItem::setOpen( open );
+ TQListViewItem::setOpen( open );
if ( entry()->icon().isEmpty() || entry()->icon() == "contents2" ) {
if ( open && childCount() > 0 ) setPixmap( 0, SmallIcon( "contents" ) );
diff --git a/khelpcenter/navigatoritem.h b/khelpcenter/navigatoritem.h
index 4337a47f9..50d2465c4 100644
--- a/khelpcenter/navigatoritem.h
+++ b/khelpcenter/navigatoritem.h
@@ -20,7 +20,7 @@
#ifndef KHC_NAVIGATORITEM_H
#define KHC_NAVIGATORITEM_H
-#include <qlistview.h>
+#include <tqlistview.h>
namespace KHC {
@@ -30,13 +30,13 @@ class DocEntry;
class NavigatorItem : public QListViewItem
{
public:
- NavigatorItem( DocEntry *entry, QListView *parent );
- NavigatorItem( DocEntry *entry, QListViewItem *parent );
+ NavigatorItem( DocEntry *entry, TQListView *parent );
+ NavigatorItem( DocEntry *entry, TQListViewItem *parent );
- NavigatorItem( DocEntry *entry, QListView *parent,
- QListViewItem *after );
- NavigatorItem( DocEntry *entry, QListViewItem *parent,
- QListViewItem *after );
+ NavigatorItem( DocEntry *entry, TQListView *parent,
+ TQListViewItem *after );
+ NavigatorItem( DocEntry *entry, TQListViewItem *parent,
+ TQListViewItem *after );
~NavigatorItem();
diff --git a/khelpcenter/plugintraverser.cpp b/khelpcenter/plugintraverser.cpp
index 3f7609627..82e8f2e26 100644
--- a/khelpcenter/plugintraverser.cpp
+++ b/khelpcenter/plugintraverser.cpp
@@ -28,11 +28,11 @@
#include <kdebug.h>
#include <kiconloader.h>
-#include <qlistview.h>
+#include <tqlistview.h>
using namespace KHC;
-PluginTraverser::PluginTraverser( Navigator *navigator, QListView *parent )
+PluginTraverser::PluginTraverser( Navigator *navigator, TQListView *parent )
: DocEntryTraverser(),
mListView( parent ),
mParentItem( 0 ),
diff --git a/khelpcenter/plugintraverser.h b/khelpcenter/plugintraverser.h
index be37017a5..7d1f4b4a1 100644
--- a/khelpcenter/plugintraverser.h
+++ b/khelpcenter/plugintraverser.h
@@ -32,7 +32,7 @@ namespace KHC {
class PluginTraverser : public DocEntryTraverser
{
public:
- PluginTraverser( Navigator *navigator, QListView *parent );
+ PluginTraverser( Navigator *navigator, TQListView *parent );
PluginTraverser( Navigator *navigator, NavigatorItem *parent );
virtual void process( DocEntry *entry );
@@ -40,7 +40,7 @@ namespace KHC {
virtual DocEntryTraverser *createChild( DocEntry *entry );
private:
- QListView *mListView;
+ TQListView *mListView;
NavigatorItem *mParentItem;
NavigatorItem *mCurrentItem;
diff --git a/khelpcenter/scopeitem.h b/khelpcenter/scopeitem.h
index 33152060f..9b828a54f 100644
--- a/khelpcenter/scopeitem.h
+++ b/khelpcenter/scopeitem.h
@@ -1,7 +1,7 @@
#ifndef SCOPEITEM_H
#define SCOPEITEM_H
-#include <qlistview.h>
+#include <tqlistview.h>
#include "docmetainfo.h"
@@ -10,12 +10,12 @@ namespace KHC {
class ScopeItem : public QCheckListItem
{
public:
- ScopeItem( QListView *parent, DocEntry *entry )
- : QCheckListItem( parent, entry->name(), QCheckListItem::CheckBox ),
+ ScopeItem( TQListView *parent, DocEntry *entry )
+ : TQCheckListItem( parent, entry->name(), TQCheckListItem::CheckBox ),
mEntry( entry ), mObserver( 0 ) {}
- ScopeItem( QListViewItem *parent, DocEntry *entry )
- : QCheckListItem( parent, entry->name(), QCheckListItem::CheckBox ),
+ ScopeItem( TQListViewItem *parent, DocEntry *entry )
+ : TQCheckListItem( parent, entry->name(), TQCheckListItem::CheckBox ),
mEntry( entry ), mObserver( 0 ) {}
DocEntry *entry()const { return mEntry; }
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index b2a363eab..20a4b0851 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -30,14 +30,14 @@
#include <klocale.h>
#include <kprocio.h>
-#include <qdom.h>
-#include <qfile.h>
-#include <qregexp.h>
+#include <tqdom.h>
+#include <tqfile.h>
+#include <tqregexp.h>
using namespace KHC;
-ScrollKeeperTreeBuilder::ScrollKeeperTreeBuilder( QObject *parent, const char *name )
- : QObject( parent, name )
+ScrollKeeperTreeBuilder::ScrollKeeperTreeBuilder( TQObject *parent, const char *name )
+ : TQObject( parent, name )
{
loadConfig();
}
@@ -54,27 +54,27 @@ void ScrollKeeperTreeBuilder::loadConfig()
NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent,
NavigatorItem *after )
{
- QString lang = KGlobal::locale()->language();
+ TQString lang = KGlobal::locale()->language();
kdDebug(1400) << "ScrollKeeper language: " << lang << endl;
KProcIO proc;
proc << "scrollkeeper-get-content-list";
proc << lang;
- connect(&proc,SIGNAL(readReady(KProcIO *)),SLOT(getContentsList(KProcIO *)));
+ connect(&proc,TQT_SIGNAL(readReady(KProcIO *)),TQT_SLOT(getContentsList(KProcIO *)));
if (!proc.start(KProcess::Block)) {
kdDebug(1400) << "Could not execute scrollkeeper-get-content-list" << endl;
return 0;
}
- if (!QFile::exists(mContentsList)) {
+ if (!TQFile::exists(mContentsList)) {
kdDebug(1400) << "Scrollkeeper contents file '" << mContentsList
<< "' does not exist." << endl;
return 0;
}
- QDomDocument doc("ScrollKeeperContentsList");
- QFile f(mContentsList);
+ TQDomDocument doc("ScrollKeeperContentsList");
+ TQFile f(mContentsList);
if ( !f.open( IO_ReadOnly ) )
return 0;
if ( !doc.setContent( &f ) ) {
@@ -86,13 +86,13 @@ NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent,
// Create top-level item
mItems.append(parent);
- QDomElement docElem = doc.documentElement();
+ TQDomElement docElem = doc.documentElement();
NavigatorItem *result = 0;
- QDomNode n = docElem.firstChild();
+ TQDomNode n = docElem.firstChild();
while( !n.isNull() ) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
if( !e.isNull() ) {
if (e.tagName() == "sect") {
NavigatorItem *createdItem;
@@ -108,7 +108,7 @@ NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent,
void ScrollKeeperTreeBuilder::getContentsList( KProcIO *proc )
{
- QString filename;
+ TQString filename;
proc->readln( filename, true );
mContentsList = filename;
@@ -116,7 +116,7 @@ void ScrollKeeperTreeBuilder::getContentsList( KProcIO *proc )
int ScrollKeeperTreeBuilder::insertSection( NavigatorItem *parent,
NavigatorItem *after,
- const QDomNode &sectNode,
+ const TQDomNode &sectNode,
NavigatorItem *&sectItem )
{
DocEntry *entry = new DocEntry( "", "", "contents2" );
@@ -126,9 +126,9 @@ int ScrollKeeperTreeBuilder::insertSection( NavigatorItem *parent,
int numDocs = 0; // Number of docs created in this section
- QDomNode n = sectNode.firstChild();
+ TQDomNode n = sectNode.firstChild();
while( !n.isNull() ) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
if( !e.isNull() ) {
if ( e.tagName() == "title" ) {
entry->setName( e.text() );
@@ -154,18 +154,18 @@ int ScrollKeeperTreeBuilder::insertSection( NavigatorItem *parent,
}
void ScrollKeeperTreeBuilder::insertDoc( NavigatorItem *parent,
- const QDomNode &docNode )
+ const TQDomNode &docNode )
{
DocEntry *entry = new DocEntry( "", "", "document2" );
NavigatorItem *docItem = new NavigatorItem( entry, parent );
docItem->setAutoDeleteDocEntry( true );
mItems.append( docItem );
- QString url;
+ TQString url;
- QDomNode n = docNode.firstChild();
+ TQDomNode n = docNode.firstChild();
while( !n.isNull() ) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
if( !e.isNull() ) {
if ( e.tagName() == "doctitle" ) {
entry->setName( e.text() );
@@ -173,14 +173,14 @@ void ScrollKeeperTreeBuilder::insertDoc( NavigatorItem *parent,
} else if ( e.tagName() == "docsource" ) {
url.append( e.text() );
} else if ( e.tagName() == "docformat" ) {
- QString mimeType = e.text();
+ TQString mimeType = e.text();
if ( mimeType == "text/html") {
// Let the HTML part figure out how to get the doc
} else if ( mimeType == "text/xml" ) {
if ( url.left( 5 ) == "file:" ) url = url.mid( 5 );
url.prepend( "ghelp:" );
#if 0
- url.replace( QRegExp( ".xml$" ), ".html" );
+ url.replace( TQRegExp( ".xml$" ), ".html" );
#endif
} else if ( mimeType == "text/sgml" ) {
// GNOME docs use this type. We don't have a real viewer for this.
diff --git a/khelpcenter/scrollkeepertreebuilder.h b/khelpcenter/scrollkeepertreebuilder.h
index 522e7b8f9..aec8351e8 100644
--- a/khelpcenter/scrollkeepertreebuilder.h
+++ b/khelpcenter/scrollkeepertreebuilder.h
@@ -20,8 +20,8 @@
#ifndef KHC_SCROLLKEEPERTREEBUILDER_H
#define KHC_SCROLLKEEPERTREEBUILDER_H
-#include <qobject.h>
-#include <qptrlist.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
#include "navigatoritem.h"
@@ -35,7 +35,7 @@ class ScrollKeeperTreeBuilder : public QObject
{
Q_OBJECT
public:
- ScrollKeeperTreeBuilder( QObject *parent, const char *name = 0 );
+ ScrollKeeperTreeBuilder( TQObject *parent, const char *name = 0 );
NavigatorItem *build( NavigatorItem *parent, NavigatorItem *after );
@@ -45,12 +45,12 @@ class ScrollKeeperTreeBuilder : public QObject
private:
void loadConfig();
int insertSection( NavigatorItem *parent, NavigatorItem *after,
- const QDomNode &sectNode, NavigatorItem *&created );
- void insertDoc( NavigatorItem *parent, const QDomNode &docNode );
+ const TQDomNode &sectNode, NavigatorItem *&created );
+ void insertDoc( NavigatorItem *parent, const TQDomNode &docNode );
bool mShowEmptyDirs;
- QString mContentsList;
- QPtrList<NavigatorItem> mItems;
+ TQString mContentsList;
+ TQPtrList<NavigatorItem> mItems;
};
}
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index 2156ee244..b779afc8e 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -1,6 +1,6 @@
#include "stdlib.h"
-#include <qstylesheet.h>
+#include <tqstylesheet.h>
#include <kapplication.h>
#include <kconfig.h>
#include <kdebug.h>
@@ -25,7 +25,7 @@ SearchTraverser::SearchTraverser( SearchEngine *engine, int level ) :
{
#if 0
kdDebug() << "SearchTraverser(): " << mLevel
- << " 0x" << QString::number( int( this ), 16 ) << endl;
+ << " 0x" << TQString::number( int( this ), 16 ) << endl;
#endif
}
@@ -33,10 +33,10 @@ SearchTraverser::~SearchTraverser()
{
#if 0
kdDebug() << "~SearchTraverser(): " << mLevel
- << " 0x" << QString::number( int( this ), 16 ) << endl;
+ << " 0x" << TQString::number( int( this ), 16 ) << endl;
#endif
- QString section;
+ TQString section;
if ( parentEntry() ) {
section = parentEntry()->name();
} else {
@@ -71,7 +71,7 @@ void SearchTraverser::startProcess( DocEntry *entry )
SearchHandler *handler = mEngine->handler( entry->documentType() );
if ( !handler ) {
- QString txt;
+ TQString txt;
if ( entry->documentType().isEmpty() ) {
txt = i18n("Error: No document type specified.");
} else {
@@ -92,22 +92,22 @@ void SearchTraverser::startProcess( DocEntry *entry )
void SearchTraverser::connectHandler( SearchHandler *handler )
{
- QMap<SearchHandler *,int>::Iterator it;
+ TQMap<SearchHandler *,int>::Iterator it;
it = mConnectCount.find( handler );
int count = 0;
if ( it != mConnectCount.end() ) count = *it;
if ( count == 0 ) {
- connect( handler, SIGNAL( searchError( SearchHandler *, DocEntry *, const QString & ) ),
- SLOT( showSearchError( SearchHandler *, DocEntry *, const QString & ) ) );
- connect( handler, SIGNAL( searchFinished( SearchHandler *, DocEntry *, const QString & ) ),
- SLOT( showSearchResult( SearchHandler *, DocEntry *, const QString & ) ) );
+ connect( handler, TQT_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ),
+ TQT_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) );
+ connect( handler, TQT_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ),
+ TQT_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) );
}
mConnectCount[ handler ] = ++count;
}
void SearchTraverser::disconnectHandler( SearchHandler *handler )
{
- QMap<SearchHandler *,int>::Iterator it;
+ TQMap<SearchHandler *,int>::Iterator it;
it = mConnectCount.find( handler );
if ( it == mConnectCount.end() ) {
kdError() << "SearchTraverser::disconnectHandler() handler not connected."
@@ -116,10 +116,10 @@ void SearchTraverser::disconnectHandler( SearchHandler *handler )
int count = *it;
--count;
if ( count == 0 ) {
- disconnect( handler, SIGNAL( searchError( SearchHandler *, DocEntry *, const QString & ) ),
- this, SLOT( showSearchError( SearchHandler *, DocEntry *, const QString & ) ) );
- disconnect( handler, SIGNAL( searchFinished( SearchHandler *, DocEntry *, const QString & ) ),
- this, SLOT( showSearchResult( SearchHandler *, DocEntry *, const QString & ) ) );
+ disconnect( handler, TQT_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ),
+ this, TQT_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) );
+ disconnect( handler, TQT_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ),
+ this, TQT_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) );
}
mConnectCount[ handler ] = count;
}
@@ -161,7 +161,7 @@ void SearchTraverser::deleteTraverser()
}
}
-void SearchTraverser::showSearchError( SearchHandler *handler, DocEntry *entry, const QString &error )
+void SearchTraverser::showSearchError( SearchHandler *handler, DocEntry *entry, const TQString &error )
{
// kdDebug() << "SearchTraverser::showSearchError(): " << entry->name()
// << endl;
@@ -176,7 +176,7 @@ void SearchTraverser::showSearchError( SearchHandler *handler, DocEntry *entry,
mNotifyee->endProcess( entry, this );
}
-void SearchTraverser::showSearchResult( SearchHandler *handler, DocEntry *entry, const QString &result )
+void SearchTraverser::showSearchResult( SearchHandler *handler, DocEntry *entry, const TQString &result )
{
// kdDebug() << "SearchTraverser::showSearchResult(): " << entry->name()
// << endl;
@@ -201,7 +201,7 @@ void SearchTraverser::finishTraversal()
SearchEngine::SearchEngine( View *destination )
- : QObject(),
+ : TQObject(),
mProc( 0 ), mSearchRunning( false ), mView( destination ),
mRootTraverser( 0 )
{
@@ -215,21 +215,21 @@ SearchEngine::~SearchEngine()
bool SearchEngine::initSearchHandlers()
{
- QStringList resources = KGlobal::dirs()->findAllResources(
+ TQStringList resources = KGlobal::dirs()->findAllResources(
"appdata", "searchhandlers/*.desktop" );
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for( it = resources.begin(); it != resources.end(); ++it ) {
- QString filename = *it;
+ TQString filename = *it;
kdDebug() << "SearchEngine::initSearchHandlers(): " << filename << endl;
SearchHandler *handler = SearchHandler::initFromFile( filename );
if ( !handler || !handler->checkPaths() ) {
- QString txt = i18n("Unable to initialize SearchHandler from file '%1'.")
+ TQString txt = i18n("Unable to initialize SearchHandler from file '%1'.")
.arg( filename );
kdWarning() << txt << endl;
// KMessageBox::sorry( mView->widget(), txt );
} else {
- QStringList documentTypes = handler->documentTypes();
- QStringList::ConstIterator it;
+ TQStringList documentTypes = handler->documentTypes();
+ TQStringList::ConstIterator it;
for( it = documentTypes.begin(); it != documentTypes.end(); ++it ) {
mHandlers.insert( *it, handler );
}
@@ -237,7 +237,7 @@ bool SearchEngine::initSearchHandlers()
}
if ( mHandlers.isEmpty() ) {
- QString txt = i18n("No valid search handler found.");
+ TQString txt = i18n("No valid search handler found.");
kdWarning() << txt << endl;
// KMessageBox::sorry( mView->widget(), txt );
return false;
@@ -251,7 +251,7 @@ void SearchEngine::searchStdout(KProcess *, char *buffer, int len)
if ( !buffer || len == 0 )
return;
- QString bufferStr;
+ TQString bufferStr;
char *p;
p = (char*) malloc( sizeof(char) * (len+1) );
p = strncpy( p, buffer, len );
@@ -267,7 +267,7 @@ void SearchEngine::searchStderr(KProcess *, char *buffer, int len)
if ( !buffer || len == 0 )
return;
- mStderr.append( QString::fromUtf8( buffer, len ) );
+ mStderr.append( TQString::fromUtf8( buffer, len ) );
}
void SearchEngine::searchExited(KProcess *)
@@ -276,8 +276,8 @@ void SearchEngine::searchExited(KProcess *)
mSearchRunning = false;
}
-bool SearchEngine::search( QString words, QString method, int matches,
- QString scope )
+bool SearchEngine::search( TQString words, TQString method, int matches,
+ TQString scope )
{
if ( mSearchRunning ) return false;
@@ -288,14 +288,14 @@ bool SearchEngine::search( QString words, QString method, int matches,
mScope = scope;
// Saner variables to store search parameters:
- mWordList = QStringList::split( " ", words );
+ mWordList = TQStringList::split( " ", words );
mMaxResults = matches;
if ( method == "or" ) mOperation = Or;
else mOperation = And;
KConfig *cfg = KGlobal::config();
cfg->setGroup( "Search" );
- QString commonSearchProgram = cfg->readPathEntry( "CommonProgram" );
+ TQString commonSearchProgram = cfg->readPathEntry( "CommonProgram" );
bool useCommon = cfg->readBoolEntry( "UseCommonProgram", false );
if ( commonSearchProgram.isEmpty() || !useCommon ) {
@@ -303,7 +303,7 @@ bool SearchEngine::search( QString words, QString method, int matches,
return false;
}
- QString txt = i18n("Search Results for '%1':").arg( QStyleSheet::escape(words) );
+ TQString txt = i18n("Search Results for '%1':").arg( TQStyleSheet::escape(words) );
mStderr = "<b>" + txt + "</b>\n";
@@ -320,7 +320,7 @@ bool SearchEngine::search( QString words, QString method, int matches,
return true;
} else {
- QString lang = KGlobal::locale()->language().left(2);
+ TQString lang = KGlobal::locale()->language().left(2);
if ( lang.lower() == "c" || lang.lower() == "posix" )
lang = "en";
@@ -334,7 +334,7 @@ bool SearchEngine::search( QString words, QString method, int matches,
// replace whitespace with a '+'
mWords = mWords.stripWhiteSpace();
mWords = mWords.simplifyWhiteSpace();
- mWords.replace(QRegExp("\\s"), "+");
+ mWords.replace(TQRegExp("\\s"), "+");
commonSearchProgram = substituteSearchQuery( commonSearchProgram );
@@ -342,22 +342,22 @@ bool SearchEngine::search( QString words, QString method, int matches,
mProc = new KProcess();
- QStringList cmd = QStringList::split( " ", commonSearchProgram );
- QStringList::ConstIterator it;
+ TQStringList cmd = TQStringList::split( " ", commonSearchProgram );
+ TQStringList::ConstIterator it;
for( it = cmd.begin(); it != cmd.end(); ++it ) {
- QString arg = *it;
+ TQString arg = *it;
if ( arg.left( 1 ) == "\"" && arg.right( 1 ) =="\"" ) {
arg = arg.mid( 1, arg.length() - 2 );
}
*mProc << arg.utf8();
}
- connect( mProc, SIGNAL( receivedStdout( KProcess *, char *, int ) ),
- SLOT( searchStdout( KProcess *, char *, int ) ) );
- connect( mProc, SIGNAL( receivedStderr( KProcess *, char *, int ) ),
- SLOT( searchStderr( KProcess *, char *, int ) ) );
- connect( mProc, SIGNAL( processExited( KProcess * ) ),
- SLOT( searchExited( KProcess * ) ) );
+ connect( mProc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
+ TQT_SLOT( searchStdout( KProcess *, char *, int ) ) );
+ connect( mProc, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
+ TQT_SLOT( searchStderr( KProcess *, char *, int ) ) );
+ connect( mProc, TQT_SIGNAL( processExited( KProcess * ) ),
+ TQT_SLOT( searchExited( KProcess * ) ) );
mSearchRunning = true;
mSearchResult = "";
@@ -392,11 +392,11 @@ bool SearchEngine::search( QString words, QString method, int matches,
return true;
}
-QString SearchEngine::substituteSearchQuery( const QString &query )
+TQString SearchEngine::substituteSearchQuery( const TQString &query )
{
- QString result = query;
+ TQString result = query;
result.replace( "%k", mWords );
- result.replace( "%n", QString::number( mMatches ) );
+ result.replace( "%n", TQString::number( mMatches ) );
result.replace( "%m", mMethod );
result.replace( "%l", mLang );
result.replace( "%s", mScope );
@@ -404,15 +404,15 @@ QString SearchEngine::substituteSearchQuery( const QString &query )
return result;
}
-QString SearchEngine::substituteSearchQuery( const QString &query,
- const QString &identifier, const QStringList &words, int maxResults,
- Operation operation, const QString &lang )
+TQString SearchEngine::substituteSearchQuery( const TQString &query,
+ const TQString &identifier, const TQStringList &words, int maxResults,
+ Operation operation, const TQString &lang )
{
- QString result = query;
+ TQString result = query;
result.replace( "%i", identifier );
result.replace( "%w", words.join( "+" ) );
- result.replace( "%m", QString::number( maxResults ) );
- QString o;
+ result.replace( "%m", TQString::number( maxResults ) );
+ TQString o;
if ( operation == Or ) o = "or";
else o = "and";
result.replace( "%o", o );
@@ -440,12 +440,12 @@ void SearchEngine::finishSearch()
emit searchFinished();
}
-QString SearchEngine::errorLog() const
+TQString SearchEngine::errorLog() const
{
return mStderr;
}
-void SearchEngine::logError( DocEntry *entry, const QString &msg )
+void SearchEngine::logError( DocEntry *entry, const TQString &msg )
{
mStderr += entry->identifier() + ": " + msg;
}
@@ -455,16 +455,16 @@ bool SearchEngine::isRunning() const
return mSearchRunning;
}
-SearchHandler *SearchEngine::handler( const QString &documentType ) const
+SearchHandler *SearchEngine::handler( const TQString &documentType ) const
{
- QMap<QString,SearchHandler *>::ConstIterator it;
+ TQMap<TQString,SearchHandler *>::ConstIterator it;
it = mHandlers.find( documentType );
if ( it == mHandlers.end() ) return 0;
else return *it;
}
-QStringList SearchEngine::words() const
+TQStringList SearchEngine::words() const
{
return mWordList;
}
diff --git a/khelpcenter/searchengine.h b/khelpcenter/searchengine.h
index 1528fe6d0..1bf390a07 100644
--- a/khelpcenter/searchengine.h
+++ b/khelpcenter/searchengine.h
@@ -1,9 +1,9 @@
#ifndef SEARCHENGINE_H
#define SEARCHENGINE_H
-#include <qobject.h>
-#include <qptrlist.h>
-#include <qstring.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
#include <kpixmap.h>
#include <kio/job.h>
@@ -22,7 +22,7 @@ class SearchEngine;
class View;
class SearchHandler;
-class SearchTraverser : public QObject, public DocEntryTraverser
+class SearchTraverser : public TQObject, public DocEntryTraverser
{
Q_OBJECT
public:
@@ -46,8 +46,8 @@ class SearchTraverser : public QObject, public DocEntryTraverser
void disconnectHandler( SearchHandler *handler );
protected slots:
- void showSearchResult( SearchHandler *, DocEntry *, const QString &result );
- void showSearchError( SearchHandler *, DocEntry *, const QString &error );
+ void showSearchResult( SearchHandler *, DocEntry *, const TQString &result );
+ void showSearchError( SearchHandler *, DocEntry *, const TQString &error );
private:
const int mMaxLevel;
@@ -56,11 +56,11 @@ class SearchTraverser : public QObject, public DocEntryTraverser
int mLevel;
DocEntry *mEntry;
- QString mJobData;
+ TQString mJobData;
- QString mResult;
+ TQString mResult;
- QMap<SearchHandler *, int> mConnectCount;
+ TQMap<SearchHandler *, int> mConnectCount;
};
@@ -75,35 +75,35 @@ class SearchEngine : public QObject
bool initSearchHandlers();
- bool search( QString words, QString method = "and", int matches = 5,
- QString scope = "" );
+ bool search( TQString words, TQString method = "and", int matches = 5,
+ TQString scope = "" );
Formatter *formatter() const;
View *view() const;
- QString substituteSearchQuery( const QString &query );
+ TQString substituteSearchQuery( const TQString &query );
- static QString substituteSearchQuery( const QString &query,
- const QString &identifier, const QStringList &words, int maxResults,
- Operation operation, const QString &lang );
+ static TQString substituteSearchQuery( const TQString &query,
+ const TQString &identifier, const TQStringList &words, int maxResults,
+ Operation operation, const TQString &lang );
void finishSearch();
/**
Append error message to error log.
*/
- void logError( DocEntry *entry, const QString &msg );
+ void logError( DocEntry *entry, const TQString &msg );
/**
Return error log.
*/
- QString errorLog() const;
+ TQString errorLog() const;
bool isRunning() const;
- SearchHandler *handler( const QString &documentType ) const;
+ SearchHandler *handler( const TQString &documentType ) const;
- QStringList words() const;
+ TQStringList words() const;
int maxResults() const;
Operation operation() const;
@@ -124,25 +124,25 @@ class SearchEngine : public QObject
private:
KProcess *mProc;
bool mSearchRunning;
- QString mSearchResult;
+ TQString mSearchResult;
- QString mStderr;
+ TQString mStderr;
View *mView;
- QString mWords;
+ TQString mWords;
int mMatches;
- QString mMethod;
- QString mLang;
- QString mScope;
+ TQString mMethod;
+ TQString mLang;
+ TQString mScope;
- QStringList mWordList;
+ TQStringList mWordList;
int mMaxResults;
Operation mOperation;
DocEntryTraverser *mRootTraverser;
- QMap<QString, SearchHandler *> mHandlers;
+ TQMap<TQString, SearchHandler *> mHandlers;
};
}
diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp
index a25d2fe49..9c34d7399 100644
--- a/khelpcenter/searchhandler.cpp
+++ b/khelpcenter/searchhandler.cpp
@@ -40,7 +40,7 @@ SearchHandler::SearchHandler()
mLang = KGlobal::locale()->language().left( 2 );
}
-SearchHandler *SearchHandler::initFromFile( const QString &filename )
+SearchHandler *SearchHandler::initFromFile( const TQString &filename )
{
SearchHandler *handler = new SearchHandler;
@@ -54,14 +54,14 @@ SearchHandler *SearchHandler::initFromFile( const QString &filename )
return handler;
}
-QStringList SearchHandler::documentTypes() const
+TQStringList SearchHandler::documentTypes() const
{
return mDocumentTypes;
}
-QString SearchHandler::indexCommand( const QString &identifier )
+TQString SearchHandler::indexCommand( const TQString &identifier )
{
- QString cmd = mIndexCommand;
+ TQString cmd = mIndexCommand;
cmd.replace( "%i", identifier );
cmd.replace( "%d", Prefs::indexDirectory() );
cmd.replace( "%l", mLang );
@@ -79,9 +79,9 @@ bool SearchHandler::checkPaths() const
return true;
}
-bool SearchHandler::checkBinary( const QString &cmd ) const
+bool SearchHandler::checkBinary( const TQString &cmd ) const
{
- QString binary;
+ TQString binary;
int pos = cmd.find( ' ' );
if ( pos < 0 ) binary = cmd;
@@ -90,36 +90,36 @@ bool SearchHandler::checkBinary( const QString &cmd ) const
return !KStandardDirs::findExe( binary ).isEmpty();
}
-void SearchHandler::search( DocEntry *entry, const QStringList &words,
+void SearchHandler::search( DocEntry *entry, const TQStringList &words,
int maxResults,
SearchEngine::Operation operation )
{
kdDebug() << "SearchHandler::search(): " << entry->identifier() << endl;
if ( !mSearchCommand.isEmpty() ) {
- QString cmdString = SearchEngine::substituteSearchQuery( mSearchCommand,
+ TQString cmdString = SearchEngine::substituteSearchQuery( mSearchCommand,
entry->identifier(), words, maxResults, operation, mLang );
kdDebug() << "SearchHandler::search() CMD: " << cmdString << endl;
KProcess *proc = new KProcess();
- QStringList cmd = QStringList::split( " ", cmdString );
- QStringList::ConstIterator it;
+ TQStringList cmd = TQStringList::split( " ", cmdString );
+ TQStringList::ConstIterator it;
for( it = cmd.begin(); it != cmd.end(); ++it ) {
- QString arg = *it;
+ TQString arg = *it;
if ( arg.left( 1 ) == "\"" && arg.right( 1 ) =="\"" ) {
arg = arg.mid( 1, arg.length() - 2 );
}
*proc << arg.utf8();
}
- connect( proc, SIGNAL( receivedStdout( KProcess *, char *, int ) ),
- SLOT( searchStdout( KProcess *, char *, int ) ) );
- connect( proc, SIGNAL( receivedStderr( KProcess *, char *, int ) ),
- SLOT( searchStderr( KProcess *, char *, int ) ) );
- connect( proc, SIGNAL( processExited( KProcess * ) ),
- SLOT( searchExited( KProcess * ) ) );
+ connect( proc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
+ TQT_SLOT( searchStdout( KProcess *, char *, int ) ) );
+ connect( proc, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
+ TQT_SLOT( searchStderr( KProcess *, char *, int ) ) );
+ connect( proc, TQT_SIGNAL( processExited( KProcess * ) ),
+ TQT_SLOT( searchExited( KProcess * ) ) );
SearchJob *searchJob = new SearchJob;
searchJob->mEntry = entry;
@@ -129,27 +129,27 @@ void SearchHandler::search( DocEntry *entry, const QStringList &words,
mProcessJobs.insert( proc, searchJob );
if ( !proc->start( KProcess::NotifyOnExit, KProcess::All ) ) {
- QString txt = i18n("Error executing search command '%1'.").arg( cmdString );
+ TQString txt = i18n("Error executing search command '%1'.").arg( cmdString );
emit searchFinished( this, entry, txt );
}
} else if ( !mSearchUrl.isEmpty() ) {
- QString urlString = SearchEngine::substituteSearchQuery( mSearchUrl,
+ TQString urlString = SearchEngine::substituteSearchQuery( mSearchUrl,
entry->identifier(), words, maxResults, operation, mLang );
kdDebug() << "SearchHandler::search() URL: " << urlString << endl;
KIO::TransferJob *job = KIO::get( KURL( urlString ) );
- connect( job, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotJobResult( KIO::Job * ) ) );
- connect( job, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
- SLOT( slotJobData( KIO::Job *, const QByteArray & ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotJobResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
+ TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) );
SearchJob *searchJob = new SearchJob;
searchJob->mEntry = entry;
searchJob->mKioJob = job;
mKioJobs.insert( job, searchJob );
} else {
- QString txt = i18n("No search command or URL specified.");
+ TQString txt = i18n("No search command or URL specified.");
emit searchFinished( this, entry, txt );
return;
}
@@ -160,13 +160,13 @@ void SearchHandler::searchStdout( KProcess *proc, char *buffer, int len )
if ( !buffer || len == 0 )
return;
- QString bufferStr;
+ TQString bufferStr;
char *p;
p = (char*) malloc( sizeof(char) * ( len + 1 ) );
p = strncpy( p, buffer, len );
p[len] = '\0';
- QMap<KProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
+ TQMap<KProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
if ( it != mProcessJobs.end() ) {
(*it)->mResult += bufferStr.fromUtf8( p );
}
@@ -179,9 +179,9 @@ void SearchHandler::searchStderr( KProcess *proc, char *buffer, int len )
if ( !buffer || len == 0 )
return;
- QMap<KProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
+ TQMap<KProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
if ( it != mProcessJobs.end() ) {
- (*it)->mError += QString::fromUtf8( buffer, len );
+ (*it)->mError += TQString::fromUtf8( buffer, len );
}
}
@@ -189,11 +189,11 @@ void SearchHandler::searchExited( KProcess *proc )
{
// kdDebug() << "SearchHandler::searchExited()" << endl;
- QString result;
- QString error;
+ TQString result;
+ TQString error;
DocEntry *entry = 0;
- QMap<KProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
+ TQMap<KProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
if ( it != mProcessJobs.end() ) {
SearchJob *j = *it;
entry = j->mEntry;
@@ -215,10 +215,10 @@ void SearchHandler::searchExited( KProcess *proc )
void SearchHandler::slotJobResult( KIO::Job *job )
{
- QString result;
+ TQString result;
DocEntry *entry = 0;
- QMap<KIO::Job *, SearchJob *>::ConstIterator it = mKioJobs.find( job );
+ TQMap<KIO::Job *, SearchJob *>::ConstIterator it = mKioJobs.find( job );
if ( it != mKioJobs.end() ) {
SearchJob *j = *it;
@@ -236,11 +236,11 @@ void SearchHandler::slotJobResult( KIO::Job *job )
}
}
-void SearchHandler::slotJobData( KIO::Job *job, const QByteArray &data )
+void SearchHandler::slotJobData( KIO::Job *job, const TQByteArray &data )
{
// kdDebug() << "SearchHandler::slotJobData()" << endl;
- QMap<KIO::Job *, SearchJob *>::ConstIterator it = mKioJobs.find( job );
+ TQMap<KIO::Job *, SearchJob *>::ConstIterator it = mKioJobs.find( job );
if ( it != mKioJobs.end() ) {
(*it)->mResult += data.data();
}
diff --git a/khelpcenter/searchhandler.h b/khelpcenter/searchhandler.h
index 3b0979bd4..13a6a56c1 100644
--- a/khelpcenter/searchhandler.h
+++ b/khelpcenter/searchhandler.h
@@ -22,8 +22,8 @@
#include "searchengine.h"
-#include <qobject.h>
-#include <qstringlist.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
namespace KIO {
class Job;
@@ -41,34 +41,34 @@ class SearchJob
KProcess *mProcess;
KIO::Job *mKioJob;
- QString mCmd;
+ TQString mCmd;
- QString mResult;
- QString mError;
+ TQString mResult;
+ TQString mError;
};
class SearchHandler : public QObject
{
Q_OBJECT
public:
- static SearchHandler *initFromFile( const QString &filename );
+ static SearchHandler *initFromFile( const TQString &filename );
- void search( DocEntry *, const QStringList &words,
+ void search( DocEntry *, const TQStringList &words,
int maxResults = 10,
SearchEngine::Operation operation = SearchEngine::And );
- QString indexCommand( const QString &identifier );
+ TQString indexCommand( const TQString &identifier );
- QStringList documentTypes() const;
+ TQStringList documentTypes() const;
bool checkPaths() const;
signals:
- void searchFinished( SearchHandler *, DocEntry *, const QString & );
- void searchError( SearchHandler *, DocEntry *, const QString & );
+ void searchFinished( SearchHandler *, DocEntry *, const TQString & );
+ void searchError( SearchHandler *, DocEntry *, const TQString & );
protected:
- bool checkBinary( const QString &cmd ) const;
+ bool checkBinary( const TQString &cmd ) const;
protected slots:
void searchStdout( KProcess *proc, char *buffer, int buflen );
@@ -76,20 +76,20 @@ class SearchHandler : public QObject
void searchExited( KProcess *proc );
void slotJobResult( KIO::Job *job );
- void slotJobData( KIO::Job *, const QByteArray &data );
+ void slotJobData( KIO::Job *, const TQByteArray &data );
private:
SearchHandler();
- QString mLang;
+ TQString mLang;
- QString mSearchCommand;
- QString mSearchUrl;
- QString mIndexCommand;
- QStringList mDocumentTypes;
+ TQString mSearchCommand;
+ TQString mSearchUrl;
+ TQString mIndexCommand;
+ TQStringList mDocumentTypes;
- QMap<KProcess *,SearchJob *> mProcessJobs;
- QMap<KIO::Job *,SearchJob *> mKioJobs;
+ TQMap<KProcess *,SearchJob *> mProcessJobs;
+ TQMap<KIO::Job *,SearchJob *> mKioJobs;
};
}
diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp
index a8f140969..bae623133 100644
--- a/khelpcenter/searchwidget.cpp
+++ b/khelpcenter/searchwidget.cpp
@@ -23,10 +23,10 @@
#include <unistd.h>
#include <errno.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qcombobox.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
+#include <tqcombobox.h>
+#include <tqlayout.h>
#include <ksimpleconfig.h>
#include <kapplication.h>
@@ -44,68 +44,68 @@
namespace KHC {
-SearchWidget::SearchWidget( SearchEngine *engine, QWidget *parent )
- : QWidget( parent ), DCOPObject( "SearchWidget" ), mEngine( engine ),
+SearchWidget::SearchWidget( SearchEngine *engine, TQWidget *parent )
+ : TQWidget( parent ), DCOPObject( "SearchWidget" ), mEngine( engine ),
mScopeCount( 0 )
{
- QBoxLayout *topLayout = new QVBoxLayout( this, 2, 2 );
+ TQBoxLayout *topLayout = new TQVBoxLayout( this, 2, 2 );
- QBoxLayout *hLayout = new QHBoxLayout( topLayout );
+ TQBoxLayout *hLayout = new TQHBoxLayout( topLayout );
- mMethodCombo = new QComboBox( this );
+ mMethodCombo = new TQComboBox( this );
mMethodCombo->insertItem( i18n("and") );
mMethodCombo->insertItem( i18n("or") );
- QLabel *l = new QLabel( mMethodCombo, i18n("&Method:"), this );
+ TQLabel *l = new TQLabel( mMethodCombo, i18n("&Method:"), this );
hLayout->addWidget( l );
hLayout->addWidget( mMethodCombo );
- hLayout = new QHBoxLayout( topLayout );
+ hLayout = new TQHBoxLayout( topLayout );
- mPagesCombo = new QComboBox( this );
+ mPagesCombo = new TQComboBox( this );
mPagesCombo->insertItem( "5" );
mPagesCombo->insertItem( "10" );
mPagesCombo->insertItem( "25" );
mPagesCombo->insertItem( "50" );
mPagesCombo->insertItem( "1000" );
- l = new QLabel( mPagesCombo, i18n("Max. &results:"), this );
+ l = new TQLabel( mPagesCombo, i18n("Max. &results:"), this );
hLayout->addWidget( l );
hLayout->addWidget( mPagesCombo );
- hLayout = new QHBoxLayout( topLayout );
+ hLayout = new TQHBoxLayout( topLayout );
- mScopeCombo = new QComboBox( this );
+ mScopeCombo = new TQComboBox( this );
for (int i=0; i < ScopeNum; ++i ) {
mScopeCombo->insertItem( scopeSelectionLabel( i ) );
}
- connect( mScopeCombo, SIGNAL( activated( int ) ),
- SLOT( scopeSelectionChanged( int ) ) );
+ connect( mScopeCombo, TQT_SIGNAL( activated( int ) ),
+ TQT_SLOT( scopeSelectionChanged( int ) ) );
- l = new QLabel( mScopeCombo, i18n("&Scope selection:"), this );
+ l = new TQLabel( mScopeCombo, i18n("&Scope selection:"), this );
hLayout->addWidget( l );
hLayout->addWidget( mScopeCombo );
- mScopeListView = new QListView( this );
+ mScopeListView = new TQListView( this );
mScopeListView->setRootIsDecorated( true );
mScopeListView->addColumn( i18n("Scope") );
topLayout->addWidget( mScopeListView, 1 );
- QPushButton *indexButton = new QPushButton( i18n("Build Search &Index..."),
+ TQPushButton *indexButton = new TQPushButton( i18n("Build Search &Index..."),
this );
- connect( indexButton, SIGNAL( clicked() ), SIGNAL( showIndexDialog() ) );
+ connect( indexButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( showIndexDialog() ) );
topLayout->addWidget( indexButton );
// FIXME: Use SearchHandler on double-clicked document
#if 0
- connect( mScopeListView, SIGNAL( doubleClicked( QListViewItem * ) ),
- SLOT( scopeDoubleClicked( QListViewItem * ) ) );
+ connect( mScopeListView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
+ TQT_SLOT( scopeDoubleClicked( TQListViewItem * ) ) );
#endif
- connect( mScopeListView, SIGNAL( clicked( QListViewItem * ) ),
- SLOT( scopeClicked( QListViewItem * ) ) );
+ connect( mScopeListView, TQT_SIGNAL( clicked( TQListViewItem * ) ),
+ TQT_SLOT( scopeClicked( TQListViewItem * ) ) );
}
@@ -128,7 +128,7 @@ void SearchWidget::readConfig( KConfig *cfg )
if ( scopeSelection == ScopeCustom ) {
cfg->setGroup( "Custom Search Scope" );
- QListViewItemIterator it( mScopeListView );
+ TQListViewItemIterator it( mScopeListView );
while( it.current() ) {
if ( it.current()->rtti() == ScopeItem::rttiId() ) {
ScopeItem *item = static_cast<ScopeItem *>( it.current() );
@@ -152,7 +152,7 @@ void SearchWidget::writeConfig( KConfig *cfg )
if ( mScopeCombo->currentItem() == ScopeCustom ) {
cfg->setGroup( "Custom Search Scope" );
- QListViewItemIterator it( mScopeListView );
+ TQListViewItemIterator it( mScopeListView );
while( it.current() ) {
if ( it.current()->rtti() == ScopeItem::rttiId() ) {
ScopeItem *item = static_cast<ScopeItem *>( it.current() );
@@ -165,7 +165,7 @@ void SearchWidget::writeConfig( KConfig *cfg )
void SearchWidget::slotSwitchBoxes()
{
- QListViewItemIterator it( mScopeListView );
+ TQListViewItemIterator it( mScopeListView );
while( it.current() ) {
if ( it.current()->rtti() == ScopeItem::rttiId() ) {
ScopeItem *item = static_cast<ScopeItem *>( it.current() );
@@ -179,7 +179,7 @@ void SearchWidget::slotSwitchBoxes()
void SearchWidget::scopeSelectionChanged( int id )
{
- QListViewItemIterator it( mScopeListView );
+ TQListViewItemIterator it( mScopeListView );
while( it.current() ) {
if ( it.current()->rtti() == ScopeItem::rttiId() ) {
ScopeItem *item = static_cast<ScopeItem *>( it.current() );
@@ -207,9 +207,9 @@ void SearchWidget::scopeSelectionChanged( int id )
checkScope();
}
-QString SearchWidget::method()
+TQString SearchWidget::method()
{
- QString m = "and";
+ TQString m = "and";
if ( mMethodCombo->currentItem() == 1)
m = "or";
@@ -223,11 +223,11 @@ int SearchWidget::pages()
return p;
}
-QString SearchWidget::scope()
+TQString SearchWidget::scope()
{
- QString scope;
+ TQString scope;
- QListViewItemIterator it( mScopeListView );
+ TQListViewItemIterator it( mScopeListView );
while( it.current() ) {
if ( it.current()->rtti() == ScopeItem::rttiId() ) {
ScopeItem *item = static_cast<ScopeItem *>( it.current() );
@@ -275,11 +275,11 @@ class ScopeTraverser : public DocEntryTraverser
return this;
} else {
ScopeTraverser *t = new ScopeTraverser( mWidget, mLevel + 1 );
- QListViewItem *item = 0;
+ TQListViewItem *item = 0;
if ( mParentItem ) {
- item = new QListViewItem( mParentItem, entry->name() );
+ item = new TQListViewItem( mParentItem, entry->name() );
} else {
- item = new QListViewItem( mWidget->listView(), entry->name() );
+ item = new TQListViewItem( mWidget->listView(), entry->name() );
}
item->setOpen( true );
t->mParentItem = item;
@@ -302,7 +302,7 @@ class ScopeTraverser : public DocEntryTraverser
private:
SearchWidget *mWidget;
int mLevel;
- QListViewItem *mParentItem;
+ TQListViewItem *mParentItem;
static int mNestingLevel;
};
@@ -326,26 +326,26 @@ void SearchWidget::updateScopeList()
checkScope();
}
-void SearchWidget::scopeDoubleClicked( QListViewItem *item )
+void SearchWidget::scopeDoubleClicked( TQListViewItem *item )
{
if ( !item || item->rtti() != ScopeItem::rttiId() ) return;
ScopeItem *scopeItem = static_cast<ScopeItem *>( item );
- QString searchUrl = scopeItem->entry()->search();
+ TQString searchUrl = scopeItem->entry()->search();
kdDebug() << "DoubleClick: " << searchUrl << endl;
emit searchResult( searchUrl );
}
-void SearchWidget::scopeClicked( QListViewItem * )
+void SearchWidget::scopeClicked( TQListViewItem * )
{
checkScope();
mScopeCombo->setCurrentItem( ScopeCustom );
}
-QString SearchWidget::scopeSelectionLabel( int id ) const
+TQString SearchWidget::scopeSelectionLabel( int id ) const
{
switch( id ) {
case ScopeCustom:
@@ -365,7 +365,7 @@ void SearchWidget::checkScope()
{
mScopeCount = 0;
- QListViewItemIterator it( mScopeListView );
+ TQListViewItemIterator it( mScopeListView );
while( it.current() ) {
if ( it.current()->rtti() == ScopeItem::rttiId() ) {
ScopeItem *item = static_cast<ScopeItem *>( it.current() );
diff --git a/khelpcenter/searchwidget.h b/khelpcenter/searchwidget.h
index 1200bcfab..158cfb3ad 100644
--- a/khelpcenter/searchwidget.h
+++ b/khelpcenter/searchwidget.h
@@ -21,7 +21,7 @@
#ifndef __searchwidget_h__
#define __searchwidget_h__
-#include <qwidget.h>
+#include <tqwidget.h>
#include <dcopobject.h>
@@ -42,7 +42,7 @@ namespace KHC {
class ScopeItem;
class SearchEngine;
-class SearchWidget : public QWidget, public DCOPObject
+class SearchWidget : public TQWidget, public DCOPObject
{
Q_OBJECT
K_DCOP
@@ -51,18 +51,18 @@ class SearchWidget : public QWidget, public DCOPObject
ASYNC searchIndexUpdated(); // called from kcmhelpcenter
public:
- SearchWidget ( SearchEngine *, QWidget *parent = 0 );
+ SearchWidget ( SearchEngine *, TQWidget *parent = 0 );
~SearchWidget();
- QString method();
+ TQString method();
int pages();
- QString scope();
+ TQString scope();
- QListView *listView() { return mScopeListView; }
+ TQListView *listView() { return mScopeListView; }
enum { ScopeDefault, ScopeAll, ScopeNone, ScopeCustom, ScopeNum };
- QString scopeSelectionLabel( int ) const;
+ TQString scopeSelectionLabel( int ) const;
void readConfig( KConfig * );
void writeConfig( KConfig * );
@@ -72,7 +72,7 @@ class SearchWidget : public QWidget, public DCOPObject
SearchEngine *engine() const { return mEngine; }
signals:
- void searchResult( const QString &url );
+ void searchResult( const TQString &url );
void scopeCountChanged( int );
void showIndexDialog();
@@ -85,18 +85,18 @@ class SearchWidget : public QWidget, public DCOPObject
void checkScope();
protected slots:
- void scopeDoubleClicked( QListViewItem * );
- void scopeClicked( QListViewItem * );
+ void scopeDoubleClicked( TQListViewItem * );
+ void scopeClicked( TQListViewItem * );
private:
void loadLanguages();
SearchEngine *mEngine;
- QComboBox *mMethodCombo;
- QComboBox *mPagesCombo;
- QComboBox *mScopeCombo;
- QListView *mScopeListView;
+ TQComboBox *mMethodCombo;
+ TQComboBox *mPagesCombo;
+ TQComboBox *mScopeCombo;
+ TQListView *mScopeListView;
int mScopeCount;
};
diff --git a/khelpcenter/testmetainfo.cpp b/khelpcenter/testmetainfo.cpp
index 65ffd871c..5e0a4e208 100644
--- a/khelpcenter/testmetainfo.cpp
+++ b/khelpcenter/testmetainfo.cpp
@@ -1,4 +1,4 @@
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include <kaboutdata.h>
#include <kapplication.h>
@@ -14,7 +14,7 @@ using namespace KHC;
class MyTraverser : public DocEntryTraverser
{
public:
- MyTraverser( const QString &indent = "" ) : mIndent( indent ) {}
+ MyTraverser( const TQString &indent = "" ) : mIndent( indent ) {}
void process( DocEntry *entry )
{
@@ -34,7 +34,7 @@ class MyTraverser : public DocEntryTraverser
}
private:
- QString mIndent;
+ TQString mIndent;
};
class LinearTraverser : public DocEntryTraverser
@@ -61,7 +61,7 @@ class LinearTraverser : public DocEntryTraverser
class AsyncTraverser : public DocEntryTraverser
{
public:
- AsyncTraverser( const QString &indent = "" ) : mIndent( indent )
+ AsyncTraverser( const TQString &indent = "" ) : mIndent( indent )
{
// kdDebug() << "AsyncTraverser()" << endl;
}
@@ -83,7 +83,7 @@ class AsyncTraverser : public DocEntryTraverser
}
private:
- QString mIndent;
+ TQString mIndent;
};
int main(int argc,char **argv)
@@ -95,7 +95,7 @@ int main(int argc,char **argv)
kdDebug() << "Scanning Meta Info" << endl;
- QStringList langs;
+ TQStringList langs;
langs << "en";
// langs << "de";
diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp
index 6b2beadc9..7bda95b8c 100644
--- a/khelpcenter/toc.cpp
+++ b/khelpcenter/toc.cpp
@@ -27,8 +27,8 @@
#include <kstandarddirs.h>
#include <kdebug.h>
-#include <qdir.h>
-#include <qfileinfo.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
#include <sys/stat.h>
@@ -37,7 +37,7 @@ using namespace KHC;
class TOCItem : public NavigatorItem
{
public:
- TOCItem( TOC *parent, QListViewItem *parentItem, QListViewItem *after, const QString &text );
+ TOCItem( TOC *parent, TQListViewItem *parentItem, TQListViewItem *after, const TQString &text );
const TOC *toc() const { return m_toc; }
@@ -48,25 +48,25 @@ class TOCItem : public NavigatorItem
class TOCChapterItem : public TOCItem
{
public:
- TOCChapterItem( TOC *toc, NavigatorItem *parent, QListViewItem *after, const QString &title,
- const QString &name );
+ TOCChapterItem( TOC *toc, NavigatorItem *parent, TQListViewItem *after, const TQString &title,
+ const TQString &name );
- virtual QString url();
+ virtual TQString url();
private:
- QString m_name;
+ TQString m_name;
};
class TOCSectionItem : public TOCItem
{
public:
- TOCSectionItem( TOC *toc, TOCChapterItem *parent, QListViewItem *after, const QString &title,
- const QString &name );
+ TOCSectionItem( TOC *toc, TOCChapterItem *parent, TQListViewItem *after, const TQString &title,
+ const TQString &name );
- virtual QString url();
+ virtual TQString url();
private:
- QString m_name;
+ TQString m_name;
};
TOC::TOC( NavigatorItem *parentItem )
@@ -74,13 +74,13 @@ TOC::TOC( NavigatorItem *parentItem )
m_parentItem = parentItem;
}
-void TOC::build( const QString &file )
+void TOC::build( const TQString &file )
{
- QFileInfo fileInfo( file );
- QString fileName = fileInfo.absFilePath();
- const QStringList resourceDirs = KGlobal::dirs()->resourceDirs( "html" );
- QStringList::ConstIterator it = resourceDirs.begin();
- QStringList::ConstIterator end = resourceDirs.end();
+ TQFileInfo fileInfo( file );
+ TQString fileName = fileInfo.absFilePath();
+ const TQStringList resourceDirs = KGlobal::dirs()->resourceDirs( "html" );
+ TQStringList::ConstIterator it = resourceDirs.begin();
+ TQStringList::ConstIterator end = resourceDirs.end();
for ( ; it != end; ++it ) {
if ( fileName.startsWith( *it ) ) {
fileName.remove( 0, ( *it ).length() );
@@ -88,7 +88,7 @@ void TOC::build( const QString &file )
}
}
- QString cacheFile = fileName.replace( QDir::separator(), "__" );
+ TQString cacheFile = fileName.replace( TQDir::separator(), "__" );
m_cacheFile = locateLocal( "cache", "help/" + cacheFile );
m_sourceFile = file;
@@ -100,7 +100,7 @@ void TOC::build( const QString &file )
TOC::CacheStatus TOC::cacheStatus() const
{
- if ( !QFile::exists( m_cacheFile ) ||
+ if ( !TQFile::exists( m_cacheFile ) ||
sourceFileCTime() != cachedCTime() )
return NeedRebuild;
@@ -110,22 +110,22 @@ TOC::CacheStatus TOC::cacheStatus() const
int TOC::sourceFileCTime() const
{
struct stat stat_buf;
- stat( QFile::encodeName( m_sourceFile ).data(), &stat_buf );
+ stat( TQFile::encodeName( m_sourceFile ).data(), &stat_buf );
return stat_buf.st_ctime;
}
int TOC::cachedCTime() const
{
- QFile f( m_cacheFile );
+ TQFile f( m_cacheFile );
if ( !f.open( IO_ReadOnly ) )
return 0;
- QDomDocument doc;
+ TQDomDocument doc;
if ( !doc.setContent( &f ) )
return 0;
- QDomComment timestamp = doc.documentElement().lastChild().toComment();
+ TQDomComment timestamp = doc.documentElement().lastChild().toComment();
return timestamp.data().stripWhiteSpace().toInt();
}
@@ -133,8 +133,8 @@ int TOC::cachedCTime() const
void TOC::buildCache()
{
KProcess *meinproc = new KProcess;
- connect( meinproc, SIGNAL( processExited( KProcess * ) ),
- this, SLOT( meinprocExited( KProcess * ) ) );
+ connect( meinproc, TQT_SIGNAL( processExited( KProcess * ) ),
+ this, TQT_SLOT( meinprocExited( KProcess * ) ) );
*meinproc << locate( "exe", "meinproc" );
*meinproc << "--stylesheet" << locate( "data", "khelpcenter/table-of-contents.xslt" );
@@ -153,20 +153,20 @@ void TOC::meinprocExited( KProcess *meinproc )
delete meinproc;
- QFile f( m_cacheFile );
+ TQFile f( m_cacheFile );
if ( !f.open( IO_ReadWrite ) )
return;
- QDomDocument doc;
+ TQDomDocument doc;
if ( !doc.setContent( &f ) )
return;
- QDomComment timestamp = doc.createComment( QString::number( sourceFileCTime() ) );
+ TQDomComment timestamp = doc.createComment( TQString::number( sourceFileCTime() ) );
doc.documentElement().appendChild( timestamp );
f.at( 0 );
- QTextStream stream( &f );
- stream.setEncoding( QTextStream::UnicodeUTF8 );
+ TQTextStream stream( &f );
+ stream.setEncoding( TQTextStream::UnicodeUTF8 );
stream << doc.toString();
f.close();
@@ -176,33 +176,33 @@ void TOC::meinprocExited( KProcess *meinproc )
void TOC::fillTree()
{
- QFile f( m_cacheFile );
+ TQFile f( m_cacheFile );
if ( !f.open( IO_ReadOnly ) )
return;
- QDomDocument doc;
+ TQDomDocument doc;
if ( !doc.setContent( &f ) )
return;
TOCChapterItem *chapItem = 0;
- QDomNodeList chapters = doc.documentElement().elementsByTagName( "chapter" );
+ TQDomNodeList chapters = doc.documentElement().elementsByTagName( "chapter" );
for ( unsigned int chapterCount = 0; chapterCount < chapters.count(); chapterCount++ ) {
- QDomElement chapElem = chapters.item( chapterCount ).toElement();
- QDomElement chapTitleElem = childElement( chapElem, QString::fromLatin1( "title" ) );
- QString chapTitle = chapTitleElem.text().simplifyWhiteSpace();
- QDomElement chapRefElem = childElement( chapElem, QString::fromLatin1( "anchor" ) );
- QString chapRef = chapRefElem.text().stripWhiteSpace();
+ TQDomElement chapElem = chapters.item( chapterCount ).toElement();
+ TQDomElement chapTitleElem = childElement( chapElem, TQString::fromLatin1( "title" ) );
+ TQString chapTitle = chapTitleElem.text().simplifyWhiteSpace();
+ TQDomElement chapRefElem = childElement( chapElem, TQString::fromLatin1( "anchor" ) );
+ TQString chapRef = chapRefElem.text().stripWhiteSpace();
chapItem = new TOCChapterItem( this, m_parentItem, chapItem, chapTitle, chapRef );
TOCSectionItem *sectItem = 0;
- QDomNodeList sections = chapElem.elementsByTagName( "section" );
+ TQDomNodeList sections = chapElem.elementsByTagName( "section" );
for ( unsigned int sectCount = 0; sectCount < sections.count(); sectCount++ ) {
- QDomElement sectElem = sections.item( sectCount ).toElement();
- QDomElement sectTitleElem = childElement( sectElem, QString::fromLatin1( "title" ) );
- QString sectTitle = sectTitleElem.text().simplifyWhiteSpace();
- QDomElement sectRefElem = childElement( sectElem, QString::fromLatin1( "anchor" ) );
- QString sectRef = sectRefElem.text().stripWhiteSpace();
+ TQDomElement sectElem = sections.item( sectCount ).toElement();
+ TQDomElement sectTitleElem = childElement( sectElem, TQString::fromLatin1( "title" ) );
+ TQString sectTitle = sectTitleElem.text().simplifyWhiteSpace();
+ TQDomElement sectRefElem = childElement( sectElem, TQString::fromLatin1( "anchor" ) );
+ TQString sectRef = sectRefElem.text().stripWhiteSpace();
sectItem = new TOCSectionItem( this, chapItem, sectItem, sectTitle, sectRef );
}
@@ -211,16 +211,16 @@ void TOC::fillTree()
m_parentItem->setOpen( true );
}
-QDomElement TOC::childElement( const QDomElement &element, const QString &name )
+TQDomElement TOC::childElement( const TQDomElement &element, const TQString &name )
{
- QDomElement e;
+ TQDomElement e;
for ( e = element.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement() )
if ( e.tagName() == name )
break;
return e;
}
-void TOC::slotItemSelected( QListViewItem *item )
+void TOC::slotItemSelected( TQListViewItem *item )
{
TOCItem *tocItem;
if ( ( tocItem = dynamic_cast<TOCItem *>( item ) ) )
@@ -229,15 +229,15 @@ void TOC::slotItemSelected( QListViewItem *item )
item->setOpen( !item->isOpen() );
}
-TOCItem::TOCItem( TOC *toc, QListViewItem *parentItem, QListViewItem *after, const QString &text )
+TOCItem::TOCItem( TOC *toc, TQListViewItem *parentItem, TQListViewItem *after, const TQString &text )
: NavigatorItem( new DocEntry( text ), parentItem, after )
{
setAutoDeleteDocEntry( true );
m_toc = toc;
}
-TOCChapterItem::TOCChapterItem( TOC *toc, NavigatorItem *parent, QListViewItem *after,
- const QString &title, const QString &name )
+TOCChapterItem::TOCChapterItem( TOC *toc, NavigatorItem *parent, TQListViewItem *after,
+ const TQString &title, const TQString &name )
: TOCItem( toc, parent, after, title ),
m_name( name )
{
@@ -245,13 +245,13 @@ TOCChapterItem::TOCChapterItem( TOC *toc, NavigatorItem *parent, QListViewItem *
entry()->setUrl(url());
}
-QString TOCChapterItem::url()
+TQString TOCChapterItem::url()
{
return "help:" + toc()->application() + "/" + m_name + ".html";
}
-TOCSectionItem::TOCSectionItem( TOC *toc, TOCChapterItem *parent, QListViewItem *after,
- const QString &title, const QString &name )
+TOCSectionItem::TOCSectionItem( TOC *toc, TOCChapterItem *parent, TQListViewItem *after,
+ const TQString &title, const TQString &name )
: TOCItem( toc, parent, after, title ),
m_name( name )
{
@@ -259,7 +259,7 @@ TOCSectionItem::TOCSectionItem( TOC *toc, TOCChapterItem *parent, QListViewItem
entry()->setUrl(url());
}
-QString TOCSectionItem::url()
+TQString TOCSectionItem::url()
{
if ( static_cast<TOCSectionItem *>( parent()->firstChild() ) == this )
return static_cast<TOCChapterItem *>( parent() )->url() + "#" + m_name;
diff --git a/khelpcenter/toc.h b/khelpcenter/toc.h
index 09971adbd..6d01fd2ba 100644
--- a/khelpcenter/toc.h
+++ b/khelpcenter/toc.h
@@ -22,9 +22,9 @@
#include "navigatoritem.h"
-#include <qdom.h>
-#include <qlistview.h>
-#include <qobject.h>
+#include <tqdom.h>
+#include <tqlistview.h>
+#include <tqobject.h>
class KProcess;
@@ -36,17 +36,17 @@ class TOC : public QObject
public:
TOC( NavigatorItem *parentItem );
- QString application() const { return m_application; }
- void setApplication( const QString &application ) { m_application = application; }
+ TQString application() const { return m_application; }
+ void setApplication( const TQString &application ) { m_application = application; }
public slots:
- void build( const QString &file );
+ void build( const TQString &file );
signals:
- void itemSelected( const QString &url );
+ void itemSelected( const TQString &url );
private slots:
- void slotItemSelected( QListViewItem *item );
+ void slotItemSelected( TQListViewItem *item );
void meinprocExited( KProcess *meinproc );
private:
@@ -55,13 +55,13 @@ class TOC : public QObject
CacheStatus cacheStatus() const;
int sourceFileCTime() const;
int cachedCTime() const;
- QDomElement childElement( const QDomElement &e, const QString &name );
+ TQDomElement childElement( const TQDomElement &e, const TQString &name );
void buildCache();
void fillTree();
- QString m_application;
- QString m_cacheFile;
- QString m_sourceFile;
+ TQString m_application;
+ TQString m_cacheFile;
+ TQString m_sourceFile;
NavigatorItem *m_parentItem;
};
diff --git a/khelpcenter/treebuilder.cpp b/khelpcenter/treebuilder.cpp
index e0320fadb..a9b4a0bb6 100644
--- a/khelpcenter/treebuilder.cpp
+++ b/khelpcenter/treebuilder.cpp
@@ -21,12 +21,12 @@
using namespace KHC;
-TreeBuilder::TreeBuilder( QObject *parent, const char *name )
- : QObject( parent, name )
+TreeBuilder::TreeBuilder( TQObject *parent, const char *name )
+ : TQObject( parent, name )
{
}
-void TreeBuilder::selectURL( const QString & )
+void TreeBuilder::selectURL( const TQString & )
{
}
diff --git a/khelpcenter/treebuilder.h b/khelpcenter/treebuilder.h
index 2ba2bd5c1..99516d1ec 100644
--- a/khelpcenter/treebuilder.h
+++ b/khelpcenter/treebuilder.h
@@ -20,7 +20,7 @@
#ifndef TREEBUILDER_H
#define TREEBUILDER_H
-#include "qobject.h"
+#include "tqobject.h"
#include <kurl.h>
@@ -32,12 +32,12 @@ class TreeBuilder : public QObject
{
Q_OBJECT
public:
- TreeBuilder( QObject *parent, const char *name = 0 );
+ TreeBuilder( TQObject *parent, const char *name = 0 );
virtual void build( NavigatorItem *item ) = 0;
public slots:
- virtual void selectURL( const QString &url );
+ virtual void selectURL( const TQString &url );
signals:
void urlSelected( const KURL &url );
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index 36a12c9ca..64e6238ed 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -15,13 +15,13 @@
#include <kpopupmenu.h>
#include <kstandarddirs.h>
-#include <qfileinfo.h>
-#include <qclipboard.h>
+#include <tqfileinfo.h>
+#include <tqclipboard.h>
using namespace KHC;
-View::View( QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name, KHTMLPart::GUIProfile prof, KActionCollection *col )
+View::View( TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name, KHTMLPart::GUIProfile prof, KActionCollection *col )
: KHTMLPart( parentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col)
{
setJScriptEnabled(false);
@@ -35,19 +35,19 @@ View::View( QWidget *parentWidget, const char *widgetName,
m_zoomStepping = 10;
- connect( this, SIGNAL( setWindowCaption( const QString & ) ),
- this, SLOT( setTitle( const QString & ) ) );
- connect( this, SIGNAL( popupMenu( const QString &, const QPoint& ) ),
- this, SLOT( showMenu( const QString &, const QPoint& ) ) );
+ connect( this, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
+ this, TQT_SLOT( setTitle( const TQString & ) ) );
+ connect( this, TQT_SIGNAL( popupMenu( const TQString &, const TQPoint& ) ),
+ this, TQT_SLOT( showMenu( const TQString &, const TQPoint& ) ) );
- QString css = langLookup("common/kde-default.css");
+ TQString css = langLookup("common/kde-default.css");
if (!css.isEmpty())
{
- QFile css_file(css);
+ TQFile css_file(css);
if (css_file.open(IO_ReadOnly))
{
- QTextStream s(&css_file);
- QString stylesheet = s.read();
+ TQTextStream s(&css_file);
+ TQString stylesheet = s.read();
preloadStyleSheet("help:/common/kde-default.css", stylesheet);
}
}
@@ -76,14 +76,14 @@ bool View::openURL( const KURL &url )
return KHTMLPart::openURL( url );
}
-void View::saveState( QDataStream &stream )
+void View::saveState( TQDataStream &stream )
{
stream << mState;
if ( mState == Docu )
KHTMLPart::saveState( stream );
}
-void View::restoreState( QDataStream &stream )
+void View::restoreState( TQDataStream &stream )
{
stream >> mState;
if ( mState == Docu )
@@ -94,11 +94,11 @@ void View::restoreState( QDataStream &stream )
void View::showAboutPage()
{
- QString file = locate( "data", "khelpcenter/intro.html.in" );
+ TQString file = locate( "data", "khelpcenter/intro.html.in" );
if ( file.isEmpty() )
return;
- QFile f( file );
+ TQFile f( file );
if ( !f.open( IO_ReadOnly ) )
return;
@@ -107,9 +107,9 @@ void View::showAboutPage()
emit started( 0 );
- QTextStream t( &f );
+ TQTextStream t( &f );
- QString res = t.read();
+ TQString res = t.read();
res = res.arg( i18n("Conquer your Desktop!") )
.arg( langLookup( "khelpcenter/konq.css" ) )
@@ -143,29 +143,29 @@ void View::showAboutPage()
emit completed();
}
-QString View::langLookup( const QString &fname )
+TQString View::langLookup( const TQString &fname )
{
- QStringList search;
+ TQStringList search;
// assemble the local search paths
- const QStringList localDoc = KGlobal::dirs()->resourceDirs("html");
+ const TQStringList localDoc = KGlobal::dirs()->resourceDirs("html");
// look up the different languages
for (int id=localDoc.count()-1; id >= 0; --id)
{
- QStringList langs = KGlobal::locale()->languageList();
+ TQStringList langs = KGlobal::locale()->languageList();
langs.append( "en" );
langs.remove( "C" );
- QStringList::ConstIterator lang;
+ TQStringList::ConstIterator lang;
for (lang = langs.begin(); lang != langs.end(); ++lang)
- search.append(QString("%1%2/%3").arg(localDoc[id]).arg(*lang).arg(fname));
+ search.append(TQString("%1%2/%3").arg(localDoc[id]).arg(*lang).arg(fname));
}
// try to locate the file
- QStringList::Iterator it;
+ TQStringList::Iterator it;
for (it = search.begin(); it != search.end(); ++it)
{
- QFileInfo info(*it);
+ TQFileInfo info(*it);
if (info.exists() && info.isFile() && info.isReadable())
return *it;
@@ -174,7 +174,7 @@ QString View::langLookup( const QString &fname )
// css etc) then look in other languages first.
if ( ( *it ).endsWith( "docbook" ) )
{
- QString file = (*it).left((*it).findRev('/')) + "/index.docbook";
+ TQString file = (*it).left((*it).findRev('/')) + "/index.docbook";
info.setFile(file);
if (info.exists() && info.isFile() && info.isReadable())
{
@@ -183,10 +183,10 @@ QString View::langLookup( const QString &fname )
}
}
- return QString::null;
+ return TQString::null;
}
-void View::setTitle( const QString &title )
+void View::setTitle( const TQString &title )
{
mTitle = title;
}
@@ -199,7 +199,7 @@ void View::beginSearchResult()
mSearchResult = "";
}
-void View::writeSearchResult( const QString &str )
+void View::writeSearchResult( const TQString &str )
{
write( str );
mSearchResult += str;
@@ -243,7 +243,7 @@ void View::slotDecFontSizes()
setZoomFactor( zoomFactor() - m_zoomStepping );
}
-void View::showMenu( const QString& url, const QPoint& pos)
+void View::showMenu( const TQString& url, const TQPoint& pos)
{
KPopupMenu* pop = new KPopupMenu(view());
if (url.isEmpty())
@@ -266,7 +266,7 @@ void View::showMenu( const QString& url, const QPoint& pos)
}
else
{
- pop->insertItem(i18n("Copy Link Address"), this, SLOT(slotCopyLink()));
+ pop->insertItem(i18n("Copy Link Address"), this, TQT_SLOT(slotCopyLink()));
mCopyURL = completeURL(url).url();
}
@@ -276,7 +276,7 @@ void View::showMenu( const QString& url, const QPoint& pos)
void View::slotCopyLink()
{
- QApplication::clipboard()->setText(mCopyURL);
+ TQApplication::clipboard()->setText(mCopyURL);
}
bool View::prevPage(bool checkOnly)
@@ -322,25 +322,25 @@ bool View::nextPage(bool checkOnly)
return true;
}
-bool View::eventFilter( QObject *o, QEvent *e )
+bool View::eventFilter( TQObject *o, TQEvent *e )
{
- if ( e->type() != QEvent::KeyPress ||
+ if ( e->type() != TQEvent::KeyPress ||
htmlDocument().links().length() == 0 )
return KHTMLPart::eventFilter( o, e );
- QKeyEvent *ke = static_cast<QKeyEvent *>( e );
+ TQKeyEvent *ke = static_cast<TQKeyEvent *>( e );
if ( ke->state() & Qt::ShiftButton && ke->key() == Key_Space ) {
// If we're on the first page, it does not make sense to go back.
if ( baseURL().path().endsWith( "/index.html" ) )
return KHTMLPart::eventFilter( o, e );
- const QScrollBar * const scrollBar = view()->verticalScrollBar();
+ const TQScrollBar * const scrollBar = view()->verticalScrollBar();
if ( scrollBar->value() == scrollBar->minValue() ) {
if (prevPage())
return true;
}
} else if ( ke->key() == Key_Space ) {
- const QScrollBar * const scrollBar = view()->verticalScrollBar();
+ const TQScrollBar * const scrollBar = view()->verticalScrollBar();
if ( scrollBar->value() == scrollBar->maxValue() ) {
if (nextPage())
return true;
@@ -360,12 +360,12 @@ KURL View::urlFromLinkNode( const DOM::Node &n ) const
if ( !href.protocol().isNull() )
return href;
- QString path = baseURL().path();
+ TQString path = baseURL().path();
path.truncate( path.findRev( '/' ) + 1 );
path += href.url();
KURL url = baseURL();
- url.setRef( QString::null );
+ url.setRef( TQString::null );
url.setEncodedPathAndQuery( path );
return url;
diff --git a/khelpcenter/view.h b/khelpcenter/view.h
index 9eb1d86b7..3af2a15b8 100644
--- a/khelpcenter/view.h
+++ b/khelpcenter/view.h
@@ -20,26 +20,26 @@ class View : public KHTMLPart
{
Q_OBJECT
public:
- View( QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name, KHTMLPart::GUIProfile prof,
+ View( TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name, KHTMLPart::GUIProfile prof,
KActionCollection *col );
~View();
virtual bool openURL( const KURL &url );
- virtual void saveState( QDataStream &stream );
- virtual void restoreState( QDataStream &stream );
+ virtual void saveState( TQDataStream &stream );
+ virtual void restoreState( TQDataStream &stream );
enum State { Docu, About, Search };
int state() const { return mState; }
- QString title() const { return mTitle; }
+ TQString title() const { return mTitle; }
- static QString langLookup( const QString &fname );
+ static TQString langLookup( const TQString &fname );
void beginSearchResult();
- void writeSearchResult( const QString & );
+ void writeSearchResult( const TQString & );
void endSearchResult();
void beginInternal( const KURL & );
@@ -64,27 +64,27 @@ class View : public KHTMLPart
void searchResultCacheAvailable();
protected:
- bool eventFilter( QObject *o, QEvent *e );
+ bool eventFilter( TQObject *o, TQEvent *e );
private slots:
- void setTitle( const QString &title );
- void showMenu( const QString& url, const QPoint& pos);
+ void setTitle( const TQString &title );
+ void showMenu( const TQString& url, const TQPoint& pos);
private:
void showAboutPage();
KURL urlFromLinkNode( const DOM::Node &n ) const;
int mState;
- QString mTitle;
+ TQString mTitle;
- QString mSearchResult;
+ TQString mSearchResult;
KURL mInternalUrl;
int m_zoomStepping;
Formatter *mFormatter;
KActionCollection *mActionCollection;
- QString mCopyURL;
+ TQString mCopyURL;
};
}
diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp
index 612977aed..3391ca1aa 100644
--- a/khotkeys/app/app.cpp
+++ b/khotkeys/app/app.cpp
@@ -39,7 +39,7 @@ namespace KHotKeys
KHotKeysApp::KHotKeysApp()
: KUniqueApplication( false, true ), // no styles
- delete_helper( new QObject )
+ delete_helper( new TQObject )
{
init_global_data( true, delete_helper ); // grab keys
// CHECKME triggery a dalsi vytvaret az tady za inicializaci
@@ -51,9 +51,9 @@ KHotKeysApp::~KHotKeysApp()
{
// CHECKME triggery a dalsi rusit uz tady pred cleanupem
delete actions_root;
-// Many global data should be destroyed while the QApplication object still
+// Many global data should be destroyed while the TQApplication object still
// exists, and therefore 'this' cannot be the parent, as ~Object
-// for 'this' would be called after ~QApplication - use proxy object
+// for 'this' would be called after ~TQApplication - use proxy object
delete delete_helper;
}
@@ -96,7 +96,7 @@ int KDE_EXPORT kdemain( int argc, char** argv )
{
{
// multiheaded hotkeys
- QCString multiHead = getenv("KDE_MULTIHEAD");
+ TQCString multiHead = getenv("KDE_MULTIHEAD");
if (multiHead.lower() == "true") {
Display *dpy = XOpenDisplay(NULL);
if (! dpy) {
@@ -108,14 +108,14 @@ int KDE_EXPORT kdemain( int argc, char** argv )
int number_of_screens = ScreenCount(dpy);
khotkeys_screen_number = DefaultScreen(dpy);
int pos;
- QCString displayname = XDisplayString(dpy);
+ TQCString displayname = XDisplayString(dpy);
XCloseDisplay(dpy);
dpy = 0;
if ((pos = displayname.findRev('.')) != -1)
displayname.remove(pos, 10);
- QCString env;
+ TQCString env;
if (number_of_screens != 1) {
for (int i = 0; i < number_of_screens; i++) {
if (i != khotkeys_screen_number && fork() == 0) {
@@ -137,7 +137,7 @@ int KDE_EXPORT kdemain( int argc, char** argv )
}
}
- QCString appname;
+ TQCString appname;
if (khotkeys_screen_number == 0)
appname = "khotkeys";
else
diff --git a/khotkeys/app/app.h b/khotkeys/app/app.h
index 6166276cb..e23edfcb1 100644
--- a/khotkeys/app/app.h
+++ b/khotkeys/app/app.h
@@ -31,7 +31,7 @@ class KHotKeysApp
virtual ~KHotKeysApp();
private:
Action_data_group* actions_root;
- QObject* delete_helper;
+ TQObject* delete_helper;
};
//***************************************************************************
diff --git a/khotkeys/app/kded.cpp b/khotkeys/app/kded.cpp
index 08c9bb487..3ebb55575 100644
--- a/khotkeys/app/kded.cpp
+++ b/khotkeys/app/kded.cpp
@@ -34,7 +34,7 @@
#include <voices.h>
extern "C"
-KDE_EXPORT KDEDModule *create_khotkeys( const QCString& obj )
+KDE_EXPORT KDEDModule *create_khotkeys( const TQCString& obj )
{
return new KHotKeys::KHotKeysModule( obj );
}
@@ -44,7 +44,7 @@ namespace KHotKeys
// KhotKeysModule
-KHotKeysModule::KHotKeysModule( const QCString& obj )
+KHotKeysModule::KHotKeysModule( const TQCString& obj )
: KDEDModule( obj )
{
for( int i = 0;
@@ -53,8 +53,8 @@ KHotKeysModule::KHotKeysModule( const QCString& obj )
{
if( kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
{
- QByteArray data, replyData;
- QCString reply;
+ TQByteArray data, replyData;
+ TQCString reply;
// wait for it to finish
kapp->dcopClient()->call( "khotkeys*", "khotkeys", "quit()", data, reply, replyData );
sleep( 1 );
diff --git a/khotkeys/app/kded.h b/khotkeys/app/kded.h
index f136cd6a0..c0a1526ee 100644
--- a/khotkeys/app/kded.h
+++ b/khotkeys/app/kded.h
@@ -28,7 +28,7 @@ class KHotKeysModule
ASYNC reread_configuration();
ASYNC quit();
public:
- KHotKeysModule( const QCString& obj );
+ KHotKeysModule( const TQCString& obj );
virtual ~KHotKeysModule();
private:
Action_data_group* actions_root;
diff --git a/khotkeys/arts/soundrecorder_arts.cpp b/khotkeys/arts/soundrecorder_arts.cpp
index 2b1563787..e600e1730 100644
--- a/khotkeys/arts/soundrecorder_arts.cpp
+++ b/khotkeys/arts/soundrecorder_arts.cpp
@@ -32,7 +32,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#define FS 11025
@@ -42,7 +42,7 @@
extern "C"
KDE_EXPORT
-KHotKeys::SoundRecorder* khotkeys_soundrecorder_create( QObject* parent, const char* name )
+KHotKeys::SoundRecorder* khotkeys_soundrecorder_create( TQObject* parent, const char* name )
{
return new KHotKeys::SoundRecorderArts( parent, name );
}
@@ -51,7 +51,7 @@ namespace KHotKeys
{
-SoundRecorderArts::SoundRecorderArts(QObject *parent, const char *name)
+SoundRecorderArts::SoundRecorderArts(TQObject *parent, const char *name)
: SoundRecorder(parent, name) ,
m_dis(new KArtsDispatcher( this) ),
m_server( new KArtsServer( this ) ) ,
@@ -61,7 +61,7 @@ SoundRecorderArts::SoundRecorderArts(QObject *parent, const char *name)
( void ) check;
m_recStream->usePolling( false );
- connect( m_recStream, SIGNAL(data (QByteArray &)), this, SLOT(slotDataReceived(QByteArray& )));
+ connect( m_recStream, TQT_SIGNAL(data (TQByteArray &)), this, TQT_SLOT(slotDataReceived(TQByteArray& )));
}
SoundRecorderArts::~SoundRecorderArts()
@@ -80,7 +80,7 @@ void SoundRecorderArts::start()
void SoundRecorderArts::stop()
{
m_recStream->stop();
- QTimer::singleShot(400,this,SLOT(slotEmitSignal()));
+ TQTimer::singleShot(400,this,TQT_SLOT(slotEmitSignal()));
}
void SoundRecorderArts::abort()
@@ -95,7 +95,7 @@ Sound SoundRecorderArts::sound()
Sound s;
uint BytePS=BITS/8;
uint length=m_data.size()/BytePS;
- QMemArray<Q_INT32> da(length);
+ TQMemArray<Q_INT32> da(length);
s.max=0;
s._fs=FS;
for(uint f=0;f<length; f++)
@@ -119,7 +119,7 @@ Sound SoundRecorderArts::sound()
return s;
}
-void SoundRecorderArts::slotDataReceived(QByteArray & data)
+void SoundRecorderArts::slotDataReceived(TQByteArray & data)
{
uint pos=m_data.size();
m_data.resize(pos + data.size());
diff --git a/khotkeys/arts/soundrecorder_arts.h b/khotkeys/arts/soundrecorder_arts.h
index da11ce04b..72e901832 100644
--- a/khotkeys/arts/soundrecorder_arts.h
+++ b/khotkeys/arts/soundrecorder_arts.h
@@ -22,7 +22,7 @@
#define RECORDER_ARTS_H
#include "soundrecorder.h"
-#include <qmemarray.h>
+#include <tqmemarray.h>
#include "sound.h"
class KAudioRecordStream ;
@@ -40,7 +40,7 @@ class SoundRecorderArts : public SoundRecorder
{
Q_OBJECT
public:
- SoundRecorderArts(QObject *parent = 0, const char *name = 0);
+ SoundRecorderArts(TQObject *parent = 0, const char *name = 0);
virtual ~SoundRecorderArts();
virtual void start();
@@ -49,12 +49,12 @@ public:
virtual Sound sound();
private slots:
- void slotDataReceived(QByteArray &data);
+ void slotDataReceived(TQByteArray &data);
void slotEmitSignal();
private:
- QByteArray m_data;
- QObject *m_dis;
+ TQByteArray m_data;
+ TQObject *m_dis;
KArtsServer *m_server;
KAudioRecordStream *m_recStream;
};
diff --git a/khotkeys/arts/voicerecorder_arts.cpp b/khotkeys/arts/voicerecorder_arts.cpp
index 39cd38cfa..8b5c752ad 100644
--- a/khotkeys/arts/voicerecorder_arts.cpp
+++ b/khotkeys/arts/voicerecorder_arts.cpp
@@ -8,8 +8,8 @@
****************************************************************************/
-#include <qcolor.h>
-#include <qevent.h>
+#include <tqcolor.h>
+#include <tqevent.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -26,7 +26,7 @@
extern "C"
KDE_EXPORT
-void khotkeys_voicerecorder_arts_play( const QString& file )
+void khotkeys_voicerecorder_arts_play( const TQString& file )
{
KHotKeys::VoiceRecorder::arts_play_fun check = khotkeys_voicerecorder_arts_play; // check the type matches
( void ) check;
diff --git a/khotkeys/kcontrol/action_group_tab.cpp b/khotkeys/kcontrol/action_group_tab.cpp
index fbe681555..8a297b933 100644
--- a/khotkeys/kcontrol/action_group_tab.cpp
+++ b/khotkeys/kcontrol/action_group_tab.cpp
@@ -16,8 +16,8 @@
#include "action_group_tab.h"
-#include <qlineedit.h>
-#include <qcheckbox.h>
+#include <tqlineedit.h>
+#include <tqcheckbox.h>
#include <klocale.h>
#include <kmessagebox.h>
@@ -31,23 +31,23 @@
namespace KHotKeys
{
-Action_group_tab::Action_group_tab( QWidget* parent_P , const char* name_P )
+Action_group_tab::Action_group_tab( TQWidget* parent_P , const char* name_P )
: Action_group_tab_ui( parent_P, name_P )
{
clear_data();
// KHotKeys::Module::changed()
- connect( action_name_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
- connect( disable_checkbox, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( comment_multilineedit, SIGNAL( textChanged()),
- module, SLOT( changed()));
+ connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
+ connect( disable_checkbox, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( comment_multilineedit, TQT_SIGNAL( textChanged()),
+ module, TQT_SLOT( changed()));
}
void Action_group_tab::clear_data()
{
- disconnect( action_name_lineedit, SIGNAL( textChanged( const QString& )), this,
- SLOT( action_group_name_changed( const QString& )));
+ disconnect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), this,
+ TQT_SLOT( action_group_name_changed( const TQString& )));
action_name_lineedit->clear();
action_name_lineedit->setReadOnly( false );
disable_checkbox->setChecked( false );
@@ -71,20 +71,20 @@ void Action_group_tab::set_data( const Action_data_group* data_P )
else
disable_checkbox->setText( i18n( "&Disable" ));
comment_multilineedit->setText( data_P->comment());
- connect( action_name_lineedit, SIGNAL( textChanged( const QString& )), this,
- SLOT( action_group_name_changed( const QString& )));
+ connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), this,
+ TQT_SLOT( action_group_name_changed( const TQString& )));
system_group = data_P->system_group();
}
Action_data_group* Action_group_tab::get_data( Action_data_group* parent_P,
Condition_list* conditions_P ) const
{
- QString name = action_name_lineedit->text();
+ TQString name = action_name_lineedit->text();
return new Action_data_group( parent_P, name, comment_multilineedit->text(), conditions_P,
system_group, !disable_checkbox->isChecked());
}
-void Action_group_tab::action_group_name_changed( const QString& name_P )
+void Action_group_tab::action_group_name_changed( const TQString& name_P )
{
module->action_name_changed( name_P );
}
diff --git a/khotkeys/kcontrol/action_group_tab.h b/khotkeys/kcontrol/action_group_tab.h
index aa5237073..970f16379 100644
--- a/khotkeys/kcontrol/action_group_tab.h
+++ b/khotkeys/kcontrol/action_group_tab.h
@@ -25,14 +25,14 @@ class Action_group_tab
{
Q_OBJECT
public:
- Action_group_tab( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Action_group_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Action_data_group* data_P );
Action_data_group* get_data( Action_data_group* parent_P,
Condition_list* conditions_P ) const;
public slots:
void clear_data();
protected slots:
- virtual void action_group_name_changed( const QString& name_P );
+ virtual void action_group_name_changed( const TQString& name_P );
protected:
Action_data_group::system_group_t system_group;
};
diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp
index c12a2df86..b32daca1f 100644
--- a/khotkeys/kcontrol/action_list_widget.cpp
+++ b/khotkeys/kcontrol/action_list_widget.cpp
@@ -17,10 +17,10 @@
#include "action_list_widget.h"
#include <assert.h>
-#include <qpopupmenu.h>
-#include <qpushbutton.h>
-#include <qheader.h>
-#include <qlineedit.h>
+#include <tqpopupmenu.h>
+#include <tqpushbutton.h>
+#include <tqheader.h>
+#include <tqlineedit.h>
#include <klocale.h>
#include <kdebug.h>
@@ -39,16 +39,16 @@ namespace KHotKeys
// Action_list_widget
-Action_list_widget::Action_list_widget( QWidget* parent_P, const char* name_P )
+Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P )
: Action_list_widget_ui( parent_P, name_P ), selected_item( NULL )
{
- QPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work
+ TQPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work
popup->insertItem( i18n( "Command/URL..." ), TYPE_COMMAND_URL_ACTION );
popup->insertItem( i18n( "K-Menu Entry..." ), TYPE_MENUENTRY_ACTION );
popup->insertItem( i18n( "DCOP Call..." ), TYPE_DCOP_ACTION );
popup->insertItem( i18n( "Keyboard Input..." ), TYPE_KEYBOARD_INPUT_ACTION );
popup->insertItem( i18n( "Activate Window..." ), TYPE_ACTIVATE_WINDOW_ACTION );
- connect( popup, SIGNAL( activated( int )), SLOT( new_selected( int )));
+ connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
new_button->setPopup( popup );
actions_listview->header()->hide();
actions_listview->addColumn( "" );
@@ -58,20 +58,20 @@ Action_list_widget::Action_list_widget( QWidget* parent_P, const char* name_P )
modify_button->setEnabled( false );
delete_button->setEnabled( false );
clear_data();
- connect( actions_listview, SIGNAL( doubleClicked ( QListViewItem *, const QPoint &, int ) ),
- this, SLOT( modify_pressed() ) );
+ connect( actions_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+ this, TQT_SLOT( modify_pressed() ) );
// KHotKeys::Module::changed()
- connect( new_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( copy_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( modify_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( delete_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( comment_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
+ connect( new_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( copy_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( modify_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( delete_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
}
Action_list_widget::~Action_list_widget()
@@ -105,7 +105,7 @@ Action_list* Action_list_widget::get_data( Action_data* data_P ) const
{
// CHECKME TODO hmm, tady to bude chtit asi i children :(
Action_list* list = new Action_list( comment_lineedit->text());
- for( QListViewItem* pos = actions_listview->firstChild();
+ for( TQListViewItem* pos = actions_listview->firstChild();
pos != NULL;
pos = pos->nextSibling())
list->append( static_cast< Action_list_item* >( pos )->action()->copy( data_P ));
@@ -168,7 +168,7 @@ void Action_list_widget::modify_pressed()
edit_listview_item( selected_item );
}
-void Action_list_widget::current_changed( QListViewItem* item_P )
+void Action_list_widget::current_changed( TQListViewItem* item_P )
{
// if( item_P == selected_item )
// return;
@@ -180,7 +180,7 @@ void Action_list_widget::current_changed( QListViewItem* item_P )
}
Action_list_item* Action_list_widget::create_listview_item( Action* action_P,
- QListView* parent1_P, QListViewItem* parent2_P, QListViewItem* after_P, bool copy_P )
+ TQListView* parent1_P, TQListViewItem* parent2_P, TQListViewItem* after_P, bool copy_P )
{
Action* new_win = copy_P ? action_P->copy( NULL ) : action_P;
// CHECKME uz by nemelo byt treba
@@ -229,9 +229,9 @@ void Action_list_widget::edit_listview_item( Action_list_item* item_P )
// Action_list_item
-QString Action_list_item::text( int column_P ) const
+TQString Action_list_item::text( int column_P ) const
{
- return column_P == 0 ? action()->description() : QString::null;
+ return column_P == 0 ? action()->description() : TQString::null;
}
Action_list_item::~Action_list_item()
diff --git a/khotkeys/kcontrol/action_list_widget.h b/khotkeys/kcontrol/action_list_widget.h
index f1f965db6..b49a1315a 100644
--- a/khotkeys/kcontrol/action_list_widget.h
+++ b/khotkeys/kcontrol/action_list_widget.h
@@ -11,7 +11,7 @@
#ifndef _ACTION_LIST_WIDGET_H_
#define _ACTION_LIST_WIDGET_H_
-#include <qlistview.h>
+#include <tqlistview.h>
#include <actions.h>
#include <kdialogbase.h>
@@ -36,15 +36,15 @@ class Action_list_widget
{
Q_OBJECT
public:
- Action_list_widget( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Action_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
virtual ~Action_list_widget();
void set_data( const Action_list* data_P );
Action_list* get_data( Action_data* data_P ) const;
public slots:
void clear_data();
protected:
- Action_list_item* create_listview_item( Action* action_P, QListView* parent1_P,
- QListViewItem* parent2_P, QListViewItem* after_P, bool copy_P );
+ Action_list_item* create_listview_item( Action* action_P, TQListView* parent1_P,
+ TQListViewItem* parent2_P, TQListViewItem* after_P, bool copy_P );
void edit_listview_item( Action_list_item* item_P );
enum type_t { TYPE_COMMAND_URL_ACTION, TYPE_MENUENTRY_ACTION, TYPE_DCOP_ACTION,
TYPE_KEYBOARD_INPUT_ACTION, TYPE_ACTIVATE_WINDOW_ACTION };
@@ -53,7 +53,7 @@ class Action_list_widget
virtual void copy_pressed();
virtual void delete_pressed();
virtual void modify_pressed();
- virtual void current_changed( QListViewItem* item_P );
+ virtual void current_changed( TQListViewItem* item_P );
protected:
Action_list_item* selected_item;
};
@@ -64,12 +64,12 @@ class Action_list_item
: public QListViewItem
{
public:
- Action_list_item( QListView* parent_P, Action* action_P );
- Action_list_item( QListViewItem* parent_P, Action* action_P );
- Action_list_item( QListView* parent_P, QListViewItem* after_P, Action* action_P );
- Action_list_item( QListViewItem* parent_P, QListViewItem* after_P, Action* action_P );
+ Action_list_item( TQListView* parent_P, Action* action_P );
+ Action_list_item( TQListViewItem* parent_P, Action* action_P );
+ Action_list_item( TQListView* parent_P, TQListViewItem* after_P, Action* action_P );
+ Action_list_item( TQListViewItem* parent_P, TQListViewItem* after_P, Action* action_P );
virtual ~Action_list_item();
- virtual QString text( int column_P ) const;
+ virtual TQString text( int column_P ) const;
Action* action() const;
void set_action( Action* action_P );
protected:
@@ -155,28 +155,28 @@ class Activate_window_action_dialog
// Action_list_item
inline
-Action_list_item::Action_list_item( QListView* parent_P, Action* action_P )
- : QListViewItem( parent_P ), _action( action_P )
+Action_list_item::Action_list_item( TQListView* parent_P, Action* action_P )
+ : TQListViewItem( parent_P ), _action( action_P )
{
}
inline
-Action_list_item::Action_list_item( QListViewItem* parent_P, Action* action_P )
- : QListViewItem( parent_P ), _action( action_P )
+Action_list_item::Action_list_item( TQListViewItem* parent_P, Action* action_P )
+ : TQListViewItem( parent_P ), _action( action_P )
{
}
inline
-Action_list_item::Action_list_item( QListView* parent_P, QListViewItem* after_P,
+Action_list_item::Action_list_item( TQListView* parent_P, TQListViewItem* after_P,
Action* action_P )
- : QListViewItem( parent_P, after_P ), _action( action_P )
+ : TQListViewItem( parent_P, after_P ), _action( action_P )
{
}
inline
-Action_list_item::Action_list_item( QListViewItem* parent_P, QListViewItem* after_P,
+Action_list_item::Action_list_item( TQListViewItem* parent_P, TQListViewItem* after_P,
Action* action_P )
- : QListViewItem( parent_P, after_P ), _action( action_P )
+ : TQListViewItem( parent_P, after_P ), _action( action_P )
{
}
diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp
index 4d0534e9d..5048289df 100644
--- a/khotkeys/kcontrol/actions_listview_widget.cpp
+++ b/khotkeys/kcontrol/actions_listview_widget.cpp
@@ -16,11 +16,11 @@
#include "actions_listview_widget.h"
-#include <qheader.h>
+#include <tqheader.h>
#include <klocale.h>
#include <kdebug.h>
-#include <qdragobject.h>
+#include <tqdragobject.h>
#include <khlistview.h>
#include <actions.h>
@@ -31,7 +31,7 @@
namespace KHotKeys
{
-Actions_listview_widget::Actions_listview_widget( QWidget* parent_P, const char* name_P )
+Actions_listview_widget::Actions_listview_widget( TQWidget* parent_P, const char* name_P )
: Actions_listview_widget_ui( parent_P, name_P ), recent_item( NULL ),
saved_current_item( NULL )
{
@@ -39,14 +39,14 @@ Actions_listview_widget::Actions_listview_widget( QWidget* parent_P, const char*
actions_listview->header()->hide();
actions_listview->addColumn( "" );
actions_listview->setRootIsDecorated( true ); // CHECKME
- connect( actions_listview, SIGNAL( current_changed( QListViewItem* )),
- SLOT( current_changed( QListViewItem* )));
- connect( actions_listview, SIGNAL( moved( QListViewItem*, QListViewItem*, QListViewItem* )),
- SLOT( item_moved( QListViewItem*, QListViewItem*, QListViewItem* )));
+ connect( actions_listview, TQT_SIGNAL( current_changed( TQListViewItem* )),
+ TQT_SLOT( current_changed( TQListViewItem* )));
+ connect( actions_listview, TQT_SIGNAL( moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )),
+ TQT_SLOT( item_moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )));
// KHotKeys::Module::changed()
}
-void Actions_listview_widget::action_name_changed( const QString& )
+void Actions_listview_widget::action_name_changed( const TQString& )
{
current_action()->widthChanged( 0 );
actions_listview->repaintItem( current_action());
@@ -63,7 +63,7 @@ void Actions_listview_widget::set_action_data( Action_data_base* data_P, bool re
saved_current_item->set_data( data_P );
}
-void Actions_listview_widget::current_changed( QListViewItem* item_P )
+void Actions_listview_widget::current_changed( TQListViewItem* item_P )
{
kdDebug( 1217 ) << "current_changed:" << item_P << endl;
set_current_action( static_cast< Action_listview_item* >( item_P ));
@@ -86,7 +86,7 @@ void Actions_listview_widget::set_current_action( Action_listview_item* item_P )
void Actions_listview_widget::new_action( Action_data_base* data_P )
{
- QListViewItem* parent = NULL;
+ TQListViewItem* parent = NULL;
if( current_action() != NULL )
{
if( dynamic_cast< Action_data_group* >( current_action()->data()) != NULL )
@@ -104,9 +104,9 @@ void Actions_listview_widget::new_action( Action_data_base* data_P )
void Actions_listview_widget::delete_action()
{
-// while( QListViewItem* child = current_action()->firstChild())
+// while( TQListViewItem* child = current_action()->firstChild())
// delete child;
-// QListViewItem* nw = current_action()->itemAbove();
+// TQListViewItem* nw = current_action()->itemAbove();
// if( nw == NULL )
// nw = current_action()->itemBelow();
delete saved_current_item;
@@ -121,7 +121,7 @@ void Actions_listview_widget::delete_action()
// saved_current_item = NULL;
}
-void Actions_listview_widget::item_moved( QListViewItem* item_P, QListViewItem*, QListViewItem* )
+void Actions_listview_widget::item_moved( TQListViewItem* item_P, TQListViewItem*, TQListViewItem* )
{
Action_listview_item* item = static_cast< Action_listview_item* >( item_P );
Action_listview_item* parent = static_cast< Action_listview_item* >( item->parent());
@@ -154,8 +154,8 @@ void Actions_listview_widget::build_up_recursively( Action_data_group* parent_P,
}
}
-Action_listview_item* Actions_listview_widget::create_item( QListViewItem* parent_P,
- QListViewItem* after_P, Action_data_base* data_P )
+Action_listview_item* Actions_listview_widget::create_item( TQListViewItem* parent_P,
+ TQListViewItem* after_P, Action_data_base* data_P )
{
if( parent_P != NULL )
return new Action_listview_item( parent_P, after_P, data_P );
@@ -165,7 +165,7 @@ Action_listview_item* Actions_listview_widget::create_item( QListViewItem* paren
// Actions_listview
-Actions_listview::Actions_listview( QWidget* parent_P, const char* name_P )
+Actions_listview::Actions_listview( TQWidget* parent_P, const char* name_P )
: KHListView( parent_P, name_P ), _widget( static_cast< Actions_listview_widget* >( parent_P->parent()))
{
// this relies on the way designer creates the .cpp file from .ui (yes, I'm lazy)
@@ -177,9 +177,9 @@ Actions_listview::Actions_listview( QWidget* parent_P, const char* name_P )
// Action_listview_item
-QString Action_listview_item::text( int column_P ) const
+TQString Action_listview_item::text( int column_P ) const
{
- return column_P == 0 ? data()->name() : QString::null;
+ return column_P == 0 ? data()->name() : TQString::null;
}
// CHECKME poradne tohle zkontrolovat po tom prekopani
diff --git a/khotkeys/kcontrol/actions_listview_widget.h b/khotkeys/kcontrol/actions_listview_widget.h
index 4b0d937a3..b2d35c693 100644
--- a/khotkeys/kcontrol/actions_listview_widget.h
+++ b/khotkeys/kcontrol/actions_listview_widget.h
@@ -30,25 +30,25 @@ class Actions_listview_widget
{
Q_OBJECT
public:
- Actions_listview_widget( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Actions_listview_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
Action_listview_item* current_action() const;
void set_current_action( Action_listview_item* item );
Action_data_base* current_action_data() const;
void set_action_data( Action_data_base* data_P, bool recent_action_P = false );
- void action_name_changed( const QString& name_P );
+ void action_name_changed( const TQString& name_P );
void clear();
void build_up();
void new_action( Action_data_base* data_P );
void delete_action();
private:
- Action_listview_item* create_item( QListViewItem* parent_P, QListViewItem* after_P, Action_data_base* data_P );
+ Action_listview_item* create_item( TQListViewItem* parent_P, TQListViewItem* after_P, Action_data_base* data_P );
void build_up_recursively( Action_data_group* parent_P,
Action_listview_item* item_parent_P );
Action_listview_item* recent_item;
Action_listview_item* saved_current_item;
private slots:
- void item_moved( QListViewItem* item_P, QListViewItem* was_after_P, QListViewItem* after_P );
- void current_changed( QListViewItem* item_P );
+ void item_moved( TQListViewItem* item_P, TQListViewItem* was_after_P, TQListViewItem* after_P );
+ void current_changed( TQListViewItem* item_P );
signals:
void current_action_changed();
};
@@ -58,7 +58,7 @@ class Actions_listview
{
Q_OBJECT
public:
- Actions_listview( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Actions_listview( TQWidget* parent_P = NULL, const char* name_P = NULL );
Actions_listview_widget* widget();
private:
Actions_listview_widget* _widget;
@@ -69,12 +69,12 @@ class Action_listview_item
: public QListViewItem
{
public:
- virtual QString text( int column_P ) const;
+ virtual TQString text( int column_P ) const;
Action_data_base* data() const;
void set_data( Action_data_base* data_P );
- Action_listview_item( QListView* parent_P, QListViewItem* after_P,
+ Action_listview_item( TQListView* parent_P, TQListViewItem* after_P,
Action_data_base* data_P );
- Action_listview_item( QListViewItem* parent_P, QListViewItem* after_P,
+ Action_listview_item( TQListViewItem* parent_P, TQListViewItem* after_P,
Action_data_base* data_P );
protected:
Action_data_base* _data; // CHECKME doesn't own !!!
@@ -117,18 +117,18 @@ Actions_listview_widget* Actions_listview::widget()
// Action_listview_item
inline
-Action_listview_item::Action_listview_item( QListView* parent_P, QListViewItem* after_P,
+Action_listview_item::Action_listview_item( TQListView* parent_P, TQListViewItem* after_P,
Action_data_base* data_P )
- : QListViewItem( parent_P, after_P ), _data( data_P )
+ : TQListViewItem( parent_P, after_P ), _data( data_P )
{
if( dynamic_cast< Action_data_group* >( data_P ))
setExpandable( true );
}
inline
-Action_listview_item::Action_listview_item( QListViewItem* parent_P, QListViewItem* after_P,
+Action_listview_item::Action_listview_item( TQListViewItem* parent_P, TQListViewItem* after_P,
Action_data_base* data_P )
- : QListViewItem( parent_P, after_P ), _data( data_P )
+ : TQListViewItem( parent_P, after_P ), _data( data_P )
{
if( dynamic_cast< Action_data_group* >( data_P ))
setExpandable( true );
diff --git a/khotkeys/kcontrol/command_url_widget.cpp b/khotkeys/kcontrol/command_url_widget.cpp
index 936ceca99..133913360 100644
--- a/khotkeys/kcontrol/command_url_widget.cpp
+++ b/khotkeys/kcontrol/command_url_widget.cpp
@@ -16,11 +16,11 @@
#include "command_url_widget.h"
-#include <qpushbutton.h>
-#include <qlineedit.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
#include <klineedit.h>
-#include <qcheckbox.h>
-#include <qgroupbox.h>
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
#include <kurlrequester.h>
#include <actions.h>
@@ -32,13 +32,13 @@
namespace KHotKeys
{
-Command_url_widget::Command_url_widget( QWidget* parent_P, const char* name_P )
+Command_url_widget::Command_url_widget( TQWidget* parent_P, const char* name_P )
: Command_url_widget_ui( parent_P, name_P )
{
clear_data();
// KHotKeys::Module::changed()
- connect( command_url_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
+ connect( command_url_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
}
void Command_url_widget::clear_data()
diff --git a/khotkeys/kcontrol/command_url_widget.h b/khotkeys/kcontrol/command_url_widget.h
index cc7e7430d..af9a9dc2a 100644
--- a/khotkeys/kcontrol/command_url_widget.h
+++ b/khotkeys/kcontrol/command_url_widget.h
@@ -24,7 +24,7 @@ class Command_url_widget
{
Q_OBJECT
public:
- Command_url_widget( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Command_url_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Command_url_action* data_P );
Command_url_action* get_data( Action_data* data_P ) const;
public slots:
diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp
index 407798d58..0cce085ec 100644
--- a/khotkeys/kcontrol/condition_list_widget.cpp
+++ b/khotkeys/kcontrol/condition_list_widget.cpp
@@ -17,10 +17,10 @@
#include "condition_list_widget.h"
#include <assert.h>
-#include <qpushbutton.h>
-#include <qheader.h>
-#include <qlineedit.h>
-#include <qpopupmenu.h>
+#include <tqpushbutton.h>
+#include <tqheader.h>
+#include <tqlineedit.h>
+#include <tqpopupmenu.h>
#include <kdebug.h>
#include <klocale.h>
@@ -39,20 +39,20 @@ namespace KHotKeys
// Condition_list_widget
-Condition_list_widget::Condition_list_widget( QWidget* parent_P, const char* name_P )
+Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* name_P )
: Condition_list_widget_ui( parent_P, name_P ), selected_item( NULL )
{
conditions.setAutoDelete( true );
- QPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work
+ TQPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work
popup->insertItem( i18n( "Active Window..." ), TYPE_ACTIVE_WINDOW );
popup->insertItem( i18n( "Existing Window..." ), TYPE_EXISTING_WINDOW );
popup->insertItem( i18n( "Not_condition", "Not" ), TYPE_NOT );
popup->insertItem( i18n( "And_condition", "And" ), TYPE_AND );
popup->insertItem( i18n( "Or_condition", "Or" ), TYPE_OR );
- connect( conditions_listview, SIGNAL( doubleClicked ( QListViewItem *, const QPoint &, int ) ),
- this, SLOT( modify_pressed() ) );
+ connect( conditions_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+ this, TQT_SLOT( modify_pressed() ) );
- connect( popup, SIGNAL( activated( int )), SLOT( new_selected( int )));
+ connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
new_button->setPopup( popup );
conditions_listview->header()->hide();
conditions_listview->addColumn( "" );
@@ -64,16 +64,16 @@ Condition_list_widget::Condition_list_widget( QWidget* parent_P, const char* nam
delete_button->setEnabled( false );
clear_data();
// KHotKeys::Module::changed()
- connect( new_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( copy_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( modify_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( delete_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( comment_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
+ connect( new_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( copy_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( modify_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( delete_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
}
Condition_list_widget::~Condition_list_widget()
@@ -106,7 +106,7 @@ void Condition_list_widget::set_data( const Condition_list* data_P )
}
void Condition_list_widget::insert_listview_items( const Condition_list_base* parent_P,
- QListView* parent1_P, Condition_list_item* parent2_P )
+ TQListView* parent1_P, Condition_list_item* parent2_P )
{
Condition_list_item* prev = NULL;
for( Condition_list_base::Iterator it( *parent_P );
@@ -132,10 +132,10 @@ Condition_list* Condition_list_widget::get_data( Action_data_base* data_P ) cons
}
void Condition_list_widget::get_listview_items( Condition_list_base* list_P,
- QListViewItem* first_item_P ) const
+ TQListViewItem* first_item_P ) const
{
list_P->clear();
- for( QListViewItem* pos = first_item_P;
+ for( TQListViewItem* pos = first_item_P;
pos != NULL;
pos = pos->nextSibling())
{
@@ -156,7 +156,7 @@ void Condition_list_widget::new_selected( int type_P )
if( tmp && tmp->accepts_children())
{
int ret = KMessageBox::questionYesNoCancel( NULL,
- i18n( "A group is selected.\nAdd the new condition in this selected group?" ), QString::null, i18n("Add in Group"), i18n("Ignore Group"));
+ i18n( "A group is selected.\nAdd the new condition in this selected group?" ), TQString::null, i18n("Add in Group"), i18n("Ignore Group"));
if( ret == KMessageBox::Cancel )
return;
else if( ret == KMessageBox::Yes )
@@ -239,7 +239,7 @@ void Condition_list_widget::modify_pressed()
edit_listview_item( selected_item );
}
-void Condition_list_widget::current_changed( QListViewItem* item_P )
+void Condition_list_widget::current_changed( TQListViewItem* item_P )
{
// if( item_P == selected_item )
// return;
@@ -263,7 +263,7 @@ void Condition_list_widget::current_changed( QListViewItem* item_P )
}
Condition_list_item* Condition_list_widget::create_listview_item( Condition* condition_P,
- QListView* parent1_P, Condition_list_item* parent2_P, QListViewItem* after_P, bool copy_P )
+ TQListView* parent1_P, Condition_list_item* parent2_P, TQListViewItem* after_P, bool copy_P )
{
#ifdef KHOTKEYS_DEBUG
kdDebug( 1217 ) << "Condition_list_widget::create_listview_item():" << endl;
@@ -339,9 +339,9 @@ void Condition_list_widget::edit_listview_item( Condition_list_item* item_P )
// Condition_list_item
-QString Condition_list_item::text( int column_P ) const
+TQString Condition_list_item::text( int column_P ) const
{
- return column_P == 0 ? condition()->description() : QString::null;
+ return column_P == 0 ? condition()->description() : TQString::null;
}
// Active_window_condition_dialog
diff --git a/khotkeys/kcontrol/condition_list_widget.h b/khotkeys/kcontrol/condition_list_widget.h
index e24739763..9dd441ae3 100644
--- a/khotkeys/kcontrol/condition_list_widget.h
+++ b/khotkeys/kcontrol/condition_list_widget.h
@@ -11,8 +11,8 @@
#ifndef _CONDITIONS_LIST_WIDGET_H_
#define _CONDITIONS_LIST_WIDGET_H_
-#include <qlistview.h>
-#include <qptrlist.h>
+#include <tqlistview.h>
+#include <tqptrlist.h>
#include <kdialogbase.h>
@@ -32,15 +32,15 @@ class Condition_list_widget
{
Q_OBJECT
public:
- Condition_list_widget( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Condition_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
virtual ~Condition_list_widget();
void set_data( const Condition_list* data_P );
Condition_list* get_data( Action_data_base* data_P ) const;
public slots:
void clear_data();
protected:
- Condition_list_item* create_listview_item( Condition* condition_P, QListView* parent1_P,
- Condition_list_item* parent2_P, QListViewItem* after_P, bool copy_P );
+ Condition_list_item* create_listview_item( Condition* condition_P, TQListView* parent1_P,
+ Condition_list_item* parent2_P, TQListViewItem* after_P, bool copy_P );
void edit_listview_item( Condition_list_item* item_P );
enum type_t { TYPE_ACTIVE_WINDOW, TYPE_EXISTING_WINDOW, TYPE_NOT, TYPE_AND, TYPE_OR };
protected slots:
@@ -48,13 +48,13 @@ class Condition_list_widget
virtual void copy_pressed();
virtual void delete_pressed();
virtual void modify_pressed();
- virtual void current_changed( QListViewItem* item_P );
+ virtual void current_changed( TQListViewItem* item_P );
private:
void insert_listview_items( const Condition_list_base* parent_P,
- QListView* parent1_P, Condition_list_item* parent2_P );
- void get_listview_items( Condition_list_base* list_P, QListViewItem* first_item_P ) const;
+ TQListView* parent1_P, Condition_list_item* parent2_P );
+ void get_listview_items( Condition_list_base* list_P, TQListViewItem* first_item_P ) const;
Condition_list_item* selected_item;
- QPtrList< Condition > conditions;
+ TQPtrList< Condition > conditions;
};
typedef Condition_list_widget Condition_list_tab;
@@ -63,12 +63,12 @@ class Condition_list_item
: public QListViewItem
{
public:
- Condition_list_item( QListView* parent_P, Condition* condition_P );
- Condition_list_item( QListViewItem* parent_P, Condition* condition_P );
- Condition_list_item( QListView* parent_P, QListViewItem* after_P, Condition* condition_P );
- Condition_list_item( QListViewItem* parent_P, QListViewItem* after_P,
+ Condition_list_item( TQListView* parent_P, Condition* condition_P );
+ Condition_list_item( TQListViewItem* parent_P, Condition* condition_P );
+ Condition_list_item( TQListView* parent_P, TQListViewItem* after_P, Condition* condition_P );
+ Condition_list_item( TQListViewItem* parent_P, TQListViewItem* after_P,
Condition* condition_P );
- virtual QString text( int column_P ) const;
+ virtual TQString text( int column_P ) const;
Condition* condition() const;
void set_condition( Condition* condition_P );
protected:
@@ -116,28 +116,28 @@ class Existing_window_condition_dialog
// Condition_list_item
inline
-Condition_list_item::Condition_list_item( QListView* parent_P, Condition* condition_P )
- : QListViewItem( parent_P ), _condition( condition_P )
+Condition_list_item::Condition_list_item( TQListView* parent_P, Condition* condition_P )
+ : TQListViewItem( parent_P ), _condition( condition_P )
{
}
inline
-Condition_list_item::Condition_list_item( QListViewItem* parent_P, Condition* condition_P )
- : QListViewItem( parent_P ), _condition( condition_P )
+Condition_list_item::Condition_list_item( TQListViewItem* parent_P, Condition* condition_P )
+ : TQListViewItem( parent_P ), _condition( condition_P )
{
}
inline
-Condition_list_item::Condition_list_item( QListView* parent_P, QListViewItem* after_P,
+Condition_list_item::Condition_list_item( TQListView* parent_P, TQListViewItem* after_P,
Condition* condition_P )
- : QListViewItem( parent_P, after_P ), _condition( condition_P )
+ : TQListViewItem( parent_P, after_P ), _condition( condition_P )
{
}
inline
-Condition_list_item::Condition_list_item( QListViewItem* parent_P, QListViewItem* after_P,
+Condition_list_item::Condition_list_item( TQListViewItem* parent_P, TQListViewItem* after_P,
Condition* condition_P )
- : QListViewItem( parent_P, after_P ), _condition( condition_P )
+ : TQListViewItem( parent_P, after_P ), _condition( condition_P )
{
}
diff --git a/khotkeys/kcontrol/dcop_widget.cpp b/khotkeys/kcontrol/dcop_widget.cpp
index 6cc8773a1..a410109fd 100644
--- a/khotkeys/kcontrol/dcop_widget.cpp
+++ b/khotkeys/kcontrol/dcop_widget.cpp
@@ -16,8 +16,8 @@
#include "dcop_widget.h"
-#include <qlineedit.h>
-#include <qpushbutton.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
#include <krun.h>
#include <kmessagebox.h>
@@ -30,20 +30,20 @@
namespace KHotKeys
{
-Dcop_widget::Dcop_widget( QWidget* parent_P, const char* name_P )
+Dcop_widget::Dcop_widget( TQWidget* parent_P, const char* name_P )
: Dcop_widget_ui( parent_P, name_P )
{
clear_data();
try_button->setText( i18n( "to try", "&Try" )); // Qt designer can't do this
// KHotKeys::Module::changed()
- connect( remote_app_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
- connect( remote_object_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
- connect( called_function_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
- connect( arguments_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
+ connect( remote_app_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
+ connect( remote_object_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
+ connect( called_function_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
+ connect( arguments_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
}
void Dcop_widget::clear_data()
diff --git a/khotkeys/kcontrol/dcop_widget.h b/khotkeys/kcontrol/dcop_widget.h
index 83cb6fabe..43523f00d 100644
--- a/khotkeys/kcontrol/dcop_widget.h
+++ b/khotkeys/kcontrol/dcop_widget.h
@@ -24,7 +24,7 @@ class Dcop_widget
{
Q_OBJECT
public:
- Dcop_widget( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Dcop_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Dcop_action* data_P );
Dcop_action* get_data( Action_data* data_P ) const;
public slots:
diff --git a/khotkeys/kcontrol/general_settings_tab.cpp b/khotkeys/kcontrol/general_settings_tab.cpp
index 77a262a31..cf2337446 100644
--- a/khotkeys/kcontrol/general_settings_tab.cpp
+++ b/khotkeys/kcontrol/general_settings_tab.cpp
@@ -16,19 +16,19 @@
#include "general_settings_tab.h"
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
#include "kcmkhotkeys.h"
namespace KHotKeys
{
-General_settings_tab::General_settings_tab( QWidget* parent_P, const char* name_P )
+General_settings_tab::General_settings_tab( TQWidget* parent_P, const char* name_P )
: General_settings_tab_ui( parent_P, name_P )
{
// KHotKeys::Module::changed()
- connect( disable_daemon_checkbox, SIGNAL( clicked()),
- module, SLOT( changed()));
+ connect( disable_daemon_checkbox, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
}
void General_settings_tab::import_clicked()
diff --git a/khotkeys/kcontrol/general_settings_tab.h b/khotkeys/kcontrol/general_settings_tab.h
index 5140b1110..8bcd5cd21 100644
--- a/khotkeys/kcontrol/general_settings_tab.h
+++ b/khotkeys/kcontrol/general_settings_tab.h
@@ -21,7 +21,7 @@ class General_settings_tab
{
Q_OBJECT
public:
- General_settings_tab( QWidget* parent = NULL, const char* name = NULL );
+ General_settings_tab( TQWidget* parent = NULL, const char* name = NULL );
void read_data();
void write_data() const;
public slots:
diff --git a/khotkeys/kcontrol/general_tab.cpp b/khotkeys/kcontrol/general_tab.cpp
index 8c7025e69..dcc4301b5 100644
--- a/khotkeys/kcontrol/general_tab.cpp
+++ b/khotkeys/kcontrol/general_tab.cpp
@@ -16,9 +16,9 @@
#include "general_tab.h"
-#include <qlineedit.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
+#include <tqlineedit.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
#include <klocale.h>
#include <kdebug.h>
@@ -33,7 +33,7 @@
namespace KHotKeys
{
-General_tab::General_tab( QWidget* parent_P, const char* name_P )
+General_tab::General_tab( TQWidget* parent_P, const char* name_P )
: General_tab_ui( parent_P, name_P )
{
for( Tab_widget::action_type_t i = Tab_widget::TYPE_FIRST;
@@ -73,22 +73,22 @@ General_tab::General_tab( QWidget* parent_P, const char* name_P )
}
clear_data();
// KHotKeys::Module::changed()
- connect( action_name_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
- connect( disable_checkbox, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( comment_multilineedit, SIGNAL( textChanged()),
- module, SLOT( changed()));
- connect( action_type_combo, SIGNAL( activated( int )),
- module, SLOT( changed()));
+ connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
+ connect( disable_checkbox, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( comment_multilineedit, TQT_SIGNAL( textChanged()),
+ module, TQT_SLOT( changed()));
+ connect( action_type_combo, TQT_SIGNAL( activated( int )),
+ module, TQT_SLOT( changed()));
}
void General_tab::clear_data()
{
- disconnect( action_name_lineedit, SIGNAL( textChanged( const QString& )),
- this, SLOT( action_name_changed( const QString& )));
- disconnect( action_type_combo, SIGNAL( activated( int )),
- this, SIGNAL( action_type_changed( int ))); // CHECKME neodpoji to sloty od nej ?
+ disconnect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ this, TQT_SLOT( action_name_changed( const TQString& )));
+ disconnect( action_type_combo, TQT_SIGNAL( activated( int )),
+ this, TQT_SIGNAL( action_type_changed( int ))); // CHECKME neodpoji to sloty od nej ?
action_name_lineedit->clear();
disable_checkbox->setChecked( false );
disable_checkbox->setText( i18n( "&Disable" ));
@@ -113,20 +113,20 @@ void General_tab::set_data( const Action_data* data_P )
comment_multilineedit->setText( data_P->comment());
action_type_combo->setCurrentItem( Tab_widget::type( data_P ));
// module->set_action_type( data_P->type());
- connect( action_name_lineedit, SIGNAL( textChanged( const QString& )),
- SLOT( action_name_changed( const QString& )));
- connect( action_type_combo, SIGNAL( activated( int )),
- SIGNAL( action_type_changed( int )));
+ connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ TQT_SLOT( action_name_changed( const TQString& )));
+ connect( action_type_combo, TQT_SIGNAL( activated( int )),
+ TQT_SIGNAL( action_type_changed( int )));
}
-void General_tab::get_data( QString& name_O, QString& comment_O, bool& enabled_O )
+void General_tab::get_data( TQString& name_O, TQString& comment_O, bool& enabled_O )
{
name_O = action_name_lineedit->text();
comment_O = comment_multilineedit->text();
enabled_O = !disable_checkbox->isChecked();
}
-void General_tab::action_name_changed( const QString& name_P )
+void General_tab::action_name_changed( const TQString& name_P )
{
module->action_name_changed( name_P );
}
diff --git a/khotkeys/kcontrol/general_tab.h b/khotkeys/kcontrol/general_tab.h
index f9096b3ad..58f670a68 100644
--- a/khotkeys/kcontrol/general_tab.h
+++ b/khotkeys/kcontrol/general_tab.h
@@ -27,15 +27,15 @@ class General_tab
{
Q_OBJECT
public:
- General_tab( QWidget* parent_P = NULL, const char* name_P = NULL );
+ General_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Action_data* data_P );
- void get_data( QString& name_O, QString& comment_O, bool& enabled_O );
+ void get_data( TQString& name_O, TQString& comment_O, bool& enabled_O );
public slots:
void clear_data();
signals:
void action_type_changed( int type_P );
protected slots:
- void action_name_changed( const QString& name_P );
+ void action_name_changed( const TQString& name_P );
};
//***************************************************************************
diff --git a/khotkeys/kcontrol/gesture_triggers_tab.cpp b/khotkeys/kcontrol/gesture_triggers_tab.cpp
index bfcad0295..b00f60963 100644
--- a/khotkeys/kcontrol/gesture_triggers_tab.cpp
+++ b/khotkeys/kcontrol/gesture_triggers_tab.cpp
@@ -16,8 +16,8 @@
#include "gesture_triggers_tab.h"
-#include <qpushbutton.h>
-#include <qlineedit.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
#include <triggers.h>
#include <actions.h>
@@ -30,28 +30,28 @@
namespace KHotKeys
{
-Gesture_triggers_tab::Gesture_triggers_tab( QWidget* parent_P, const char* name_P )
+Gesture_triggers_tab::Gesture_triggers_tab( TQWidget* parent_P, const char* name_P )
: Gesture_triggers_tab_ui( parent_P, name_P )
{
clear_data();
// KHotKeys::Module::changed()
- connect( gesture_edit_button1, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( gesture_edit_button2, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( gesture_edit_button3, SIGNAL( clicked()),
- module, SLOT( changed()));
+ connect( gesture_edit_button1, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( gesture_edit_button2, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( gesture_edit_button3, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
}
void Gesture_triggers_tab::clear_data()
{
- gesture1 = gesture2 = gesture3 = QString::null;
+ gesture1 = gesture2 = gesture3 = TQString::null;
gesture_lineedit1->clear();
gesture_lineedit2->clear();
gesture_lineedit3->clear();
- gesture_drawer1->setData( QString::null );
- gesture_drawer2->setData( QString::null );
- gesture_drawer3->setData( QString::null );
+ gesture_drawer1->setData( TQString::null );
+ gesture_drawer2->setData( TQString::null );
+ gesture_drawer3->setData( TQString::null );
}
void Gesture_triggers_tab::set_data( const Trigger_list* triggers_P )
@@ -70,7 +70,7 @@ void Gesture_triggers_tab::set_data( const Trigger_list* triggers_P )
}
else
trig = NULL;
- gesture1 = trig ? trig->gesturecode() : QString::null;
+ gesture1 = trig ? trig->gesturecode() : TQString::null;
gesture_lineedit1->setText( gesture1 );
gesture_drawer1->setData( gesture1 );
++it;
@@ -81,7 +81,7 @@ void Gesture_triggers_tab::set_data( const Trigger_list* triggers_P )
}
else
trig = NULL;
- gesture2 = trig ? trig->gesturecode() : QString::null;
+ gesture2 = trig ? trig->gesturecode() : TQString::null;
gesture_lineedit2->setText( gesture2 );
gesture_drawer2->setData( gesture2 );
++it;
@@ -92,7 +92,7 @@ void Gesture_triggers_tab::set_data( const Trigger_list* triggers_P )
}
else
trig = NULL;
- gesture3 = trig ? trig->gesturecode() : QString::null;
+ gesture3 = trig ? trig->gesturecode() : TQString::null;
gesture_lineedit3->setText( gesture3 );
gesture_drawer3->setData( gesture3 );
}
@@ -135,20 +135,20 @@ void Gesture_triggers_tab::edit_gesture_pressed3()
// Gesture_edit_dialog
-Gesture_edit_dialog::Gesture_edit_dialog( const QString& gesture_P )
+Gesture_edit_dialog::Gesture_edit_dialog( const TQString& gesture_P )
: KDialogBase( NULL, NULL, true, "", Ok | Cancel ), // CHECKME caption
_gesture( gesture_P ), _page( NULL )
{
_page = new GestureRecordPage( _gesture,
this, "GestureRecordPage");
-// connect(_page, SIGNAL(gestureRecorded(bool)), // allow clearing the gesture
-// this, SLOT(enableButtonOK(bool)));
+// connect(_page, TQT_SIGNAL(gestureRecorded(bool)), // allow clearing the gesture
+// this, TQT_SLOT(enableButtonOK(bool)));
setMainWidget( _page );
}
-QString Gesture_edit_dialog::edit_gesture()
+TQString Gesture_edit_dialog::edit_gesture()
{
if( exec())
return _page->getGesture();
diff --git a/khotkeys/kcontrol/gesture_triggers_tab.h b/khotkeys/kcontrol/gesture_triggers_tab.h
index 1bdaaf694..c11787d03 100644
--- a/khotkeys/kcontrol/gesture_triggers_tab.h
+++ b/khotkeys/kcontrol/gesture_triggers_tab.h
@@ -13,7 +13,7 @@
#include <gesture_triggers_tab_ui.h>
-#include <qstring.h>
+#include <tqstring.h>
#include <kdialogbase.h>
@@ -28,7 +28,7 @@ class Gesture_triggers_tab
{
Q_OBJECT
public:
- Gesture_triggers_tab( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Gesture_triggers_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Trigger_list* triggers_P );
Trigger_list* get_data( Action_data* data_P ) const;
protected:
@@ -38,7 +38,7 @@ class Gesture_triggers_tab
public slots:
void clear_data();
private:
- QString gesture1, gesture2, gesture3;
+ TQString gesture1, gesture2, gesture3;
};
class GestureRecordPage;
@@ -48,11 +48,11 @@ class Gesture_edit_dialog
{
Q_OBJECT
public:
- Gesture_edit_dialog( const QString& gesture_P );
- QString edit_gesture();
+ Gesture_edit_dialog( const TQString& gesture_P );
+ TQString edit_gesture();
private:
// CHECKME accept() ?
- QString _gesture;
+ TQString _gesture;
GestureRecordPage *_page;
};
diff --git a/khotkeys/kcontrol/gesturedrawer.cpp b/khotkeys/kcontrol/gesturedrawer.cpp
index 646d2e469..817eeab89 100644
--- a/khotkeys/kcontrol/gesturedrawer.cpp
+++ b/khotkeys/kcontrol/gesturedrawer.cpp
@@ -9,19 +9,19 @@
****************************************************************************/
-#include <qcolor.h>
-#include <qpainter.h>
+#include <tqcolor.h>
+#include <tqpainter.h>
#include "gesturedrawer.h"
namespace KHotKeys
{
-GestureDrawer::GestureDrawer(QWidget *parent, const char *name)
- : QFrame(parent, name), _data(QString::null)
+GestureDrawer::GestureDrawer(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), _data(TQString::null)
{
setBackgroundColor( colorGroup().base());
- setFrameStyle(QFrame::Panel | QFrame::Sunken);
+ setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
setMinimumSize(30, 30);
}
@@ -29,31 +29,31 @@ GestureDrawer::~GestureDrawer()
{
}
-void GestureDrawer::setData(const QString &data)
+void GestureDrawer::setData(const TQString &data)
{
_data = data;
repaint();
}
-void GestureDrawer::paintEvent(QPaintEvent *ev)
+void GestureDrawer::paintEvent(TQPaintEvent *ev)
{
// Iterate through the data points and draw a line to each of them
Q_UINT32 startCell = 0;
Q_UINT32 endCell = 0;
- QPoint startPoint;
- QPoint endPoint;
+ TQPoint startPoint;
+ TQPoint endPoint;
- QPainter p(this);
+ TQPainter p(this);
if (_data.length() > 0)
{
- startCell = QString(_data[0]).toUInt();
+ startCell = TQString(_data[0]).toUInt();
}
for (Q_UINT32 index = 1; index < _data.length(); ++index)
{
- endCell = QString(_data[index]).toUInt();
+ endCell = TQString(_data[index]).toUInt();
startPoint = lookupCellCoords(startCell);
endPoint = lookupCellCoords(endCell);
@@ -63,7 +63,7 @@ void GestureDrawer::paintEvent(QPaintEvent *ev)
// Draw something to show the starting point
p.drawRect(startPoint.x()-2, startPoint.y()-2, 4, 4);
p.fillRect(startPoint.x()-2, startPoint.y()-2, 4, 4,
- QBrush(black));
+ TQBrush(black));
}
p.drawLine(startPoint, endPoint);
@@ -74,10 +74,10 @@ void GestureDrawer::paintEvent(QPaintEvent *ev)
p.end();
- QFrame::paintEvent(ev);
+ TQFrame::paintEvent(ev);
}
-QPoint GestureDrawer::lookupCellCoords(Q_UINT32 cell)
+TQPoint GestureDrawer::lookupCellCoords(Q_UINT32 cell)
{
// First divide the widget into thirds, horizontally and vertically
Q_UINT32 w = width();
@@ -89,38 +89,38 @@ QPoint GestureDrawer::lookupCellCoords(Q_UINT32 cell)
switch(cell)
{
case 1:
- return QPoint(wThird/2, 2*hThird+hThird/2);
+ return TQPoint(wThird/2, 2*hThird+hThird/2);
case 2:
- return QPoint(wThird+wThird/2, 2*hThird+hThird/2);
+ return TQPoint(wThird+wThird/2, 2*hThird+hThird/2);
case 3:
- return QPoint(2*wThird+wThird/2, 2*hThird+hThird/2);
+ return TQPoint(2*wThird+wThird/2, 2*hThird+hThird/2);
case 4:
- return QPoint(wThird/2, hThird+hThird/2);
+ return TQPoint(wThird/2, hThird+hThird/2);
case 5:
- return QPoint(wThird+wThird/2, hThird+hThird/2);
+ return TQPoint(wThird+wThird/2, hThird+hThird/2);
case 6:
- return QPoint(2*wThird+wThird/2, hThird+hThird/2);
+ return TQPoint(2*wThird+wThird/2, hThird+hThird/2);
case 7:
- return QPoint(wThird/2, hThird/2);
+ return TQPoint(wThird/2, hThird/2);
case 8:
- return QPoint(wThird+wThird/2, hThird/2);
+ return TQPoint(wThird+wThird/2, hThird/2);
case 9:
- return QPoint(2*wThird+wThird/2, hThird/2);
+ return TQPoint(2*wThird+wThird/2, hThird/2);
}
- return QPoint(0, 0);
+ return TQPoint(0, 0);
}
-void GestureDrawer::drawArrowHead(QPoint &start, QPoint &end,
- QPainter &p)
+void GestureDrawer::drawArrowHead(TQPoint &start, TQPoint &end,
+ TQPainter &p)
{
int deltaX = end.x() - start.x();
int deltaY = end.y() - start.y();
@@ -134,8 +134,8 @@ void GestureDrawer::drawArrowHead(QPoint &start, QPoint &end,
else
offset = 3;
- p.drawLine(QPoint(end.x()+offset, end.y()+2), end);
- p.drawLine(QPoint(end.x()+offset, end.y()-2), end);
+ p.drawLine(TQPoint(end.x()+offset, end.y()+2), end);
+ p.drawLine(TQPoint(end.x()+offset, end.y()-2), end);
}
else if (deltaX == 0)
{
@@ -146,8 +146,8 @@ void GestureDrawer::drawArrowHead(QPoint &start, QPoint &end,
else
offset = +3;
- p.drawLine(QPoint(end.x()+2, end.y()+offset), end);
- p.drawLine(QPoint(end.x()-2, end.y()+offset), end);
+ p.drawLine(TQPoint(end.x()+2, end.y()+offset), end);
+ p.drawLine(TQPoint(end.x()-2, end.y()+offset), end);
}
else
{
diff --git a/khotkeys/kcontrol/gesturedrawer.h b/khotkeys/kcontrol/gesturedrawer.h
index bcc8ba7e8..50fe5db67 100644
--- a/khotkeys/kcontrol/gesturedrawer.h
+++ b/khotkeys/kcontrol/gesturedrawer.h
@@ -12,12 +12,12 @@
#ifndef GESTURE_DRAWER_H
#define GESTURE_DRAWER_H
-#include <qframe.h>
-#include <qstring.h>
-#include <qevent.h>
-#include <qpoint.h>
-#include <qwidget.h>
-#include <qsize.h>
+#include <tqframe.h>
+#include <tqstring.h>
+#include <tqevent.h>
+#include <tqpoint.h>
+#include <tqwidget.h>
+#include <tqsize.h>
namespace KHotKeys
{
@@ -26,23 +26,23 @@ class GestureDrawer : public QFrame
{
Q_OBJECT
public:
- GestureDrawer(QWidget *parent, const char *name);
+ GestureDrawer(TQWidget *parent, const char *name);
~GestureDrawer();
- void setData(const QString &data);
+ void setData(const TQString &data);
- virtual QSize sizeHint() const { return QSize(30, 30); }
+ virtual TQSize sizeHint() const { return TQSize(30, 30); }
protected:
- void paintEvent(QPaintEvent *ev);
+ void paintEvent(TQPaintEvent *ev);
private:
- QPoint lookupCellCoords(Q_UINT32 cell);
- void drawArrowHead(QPoint &start, QPoint &end,
- QPainter &p);
+ TQPoint lookupCellCoords(Q_UINT32 cell);
+ void drawArrowHead(TQPoint &start, TQPoint &end,
+ TQPainter &p);
- QString _data;
+ TQString _data;
};
} // namespace KHotKeys
diff --git a/khotkeys/kcontrol/gesturerecorder.cpp b/khotkeys/kcontrol/gesturerecorder.cpp
index d14614c77..58a177910 100644
--- a/khotkeys/kcontrol/gesturerecorder.cpp
+++ b/khotkeys/kcontrol/gesturerecorder.cpp
@@ -9,19 +9,19 @@
****************************************************************************/
-#include <qcolor.h>
-#include <qevent.h>
+#include <tqcolor.h>
+#include <tqevent.h>
#include "gesturerecorder.h"
namespace KHotKeys
{
-GestureRecorder::GestureRecorder(QWidget *parent, const char *name)
- : QFrame(parent, name), _mouseButtonDown(false)
+GestureRecorder::GestureRecorder(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), _mouseButtonDown(false)
{
setBackgroundColor( colorGroup().base());
- setFrameStyle(QFrame::Sunken | QFrame::Panel);
+ setFrameStyle(TQFrame::Sunken | TQFrame::Panel);
setLineWidth(2);
setMidLineWidth(0);
}
@@ -30,34 +30,34 @@ GestureRecorder::~GestureRecorder()
{
}
-void GestureRecorder::mousePressEvent(QMouseEvent *ev)
+void GestureRecorder::mousePressEvent(TQMouseEvent *ev)
{
- if (ev->button() == QMouseEvent::LeftButton)
+ if (ev->button() == TQMouseEvent::LeftButton)
{
_mouseButtonDown = true;
stroke.reset();
- QPoint pos = ev->pos();
+ TQPoint pos = ev->pos();
stroke.record(pos.x(), pos.y());
}
}
-void GestureRecorder::mouseReleaseEvent(QMouseEvent *ev)
+void GestureRecorder::mouseReleaseEvent(TQMouseEvent *ev)
{
- if ((ev->button() == QMouseEvent::LeftButton) && (_mouseButtonDown))
+ if ((ev->button() == TQMouseEvent::LeftButton) && (_mouseButtonDown))
{
- QPoint pos = ev->pos();
+ TQPoint pos = ev->pos();
stroke.record(pos.x(), pos.y());
- QString data( stroke.translate());
+ TQString data( stroke.translate());
if( !data.isEmpty())
emit recorded(data);
}
}
-void GestureRecorder::mouseMoveEvent(QMouseEvent *ev)
+void GestureRecorder::mouseMoveEvent(TQMouseEvent *ev)
{
if (_mouseButtonDown)
{
- QPoint pos = ev->pos();
+ TQPoint pos = ev->pos();
stroke.record(pos.x(), pos.y());
}
}
diff --git a/khotkeys/kcontrol/gesturerecorder.h b/khotkeys/kcontrol/gesturerecorder.h
index 707243d81..a995a5531 100644
--- a/khotkeys/kcontrol/gesturerecorder.h
+++ b/khotkeys/kcontrol/gesturerecorder.h
@@ -12,8 +12,8 @@
#ifndef GESTURE_RECORDER_H
#define GESTURE_RECORDER_H
-#include <qframe.h>
-#include <qstring.h>
+#include <tqframe.h>
+#include <tqstring.h>
#include <gestures.h>
@@ -27,16 +27,16 @@ class GestureRecorder : public QFrame
Q_OBJECT
public:
- GestureRecorder(QWidget *parent, const char *name);
+ GestureRecorder(TQWidget *parent, const char *name);
~GestureRecorder();
protected:
- void mousePressEvent(QMouseEvent *);
- void mouseReleaseEvent(QMouseEvent *);
- void mouseMoveEvent(QMouseEvent *);
+ void mousePressEvent(TQMouseEvent *);
+ void mouseReleaseEvent(TQMouseEvent *);
+ void mouseMoveEvent(TQMouseEvent *);
signals:
- void recorded(const QString &data);
+ void recorded(const TQString &data);
private:
bool _mouseButtonDown;
diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp
index e24beaaf3..af2fb8cdc 100644
--- a/khotkeys/kcontrol/gesturerecordpage.cpp
+++ b/khotkeys/kcontrol/gesturerecordpage.cpp
@@ -9,9 +9,9 @@
****************************************************************************/
-#include <qwidget.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
+#include <tqwidget.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
#include <klocale.h>
#include <kmessagebox.h>
@@ -23,14 +23,14 @@
namespace KHotKeys
{
-GestureRecordPage::GestureRecordPage(const QString &gesture,
- QWidget *parent, const char *name)
- : QVBox(parent, name),
+GestureRecordPage::GestureRecordPage(const TQString &gesture,
+ TQWidget *parent, const char *name)
+ : TQVBox(parent, name),
_recorder(NULL), _resetButton(NULL),
- _tryOne(NULL), _tryTwo(NULL), _tryThree(NULL), _gest(QString::null),
+ _tryOne(NULL), _tryTwo(NULL), _tryThree(NULL), _gest(TQString::null),
_tryCount(1)
{
- QString message;
+ TQString message;
message = i18n("Draw the gesture you would like to record below. Press "
"and hold the left mouse button while drawing, and release "
@@ -42,28 +42,28 @@ GestureRecordPage::GestureRecordPage(const QString &gesture,
"restart. If you want to force a restart, use the reset "
"button below.\n\nDraw here:");
- QLabel *label = new QLabel(message, this, "label");
- label->setAlignment(QLabel::AlignLeft | QLabel::WordBreak |
- QLabel::AlignVCenter);
+ TQLabel *label = new TQLabel(message, this, "label");
+ label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak |
+ TQLabel::AlignVCenter);
_recorder = new GestureRecorder(this, "recorder");
_recorder->setMinimumHeight(150);
setStretchFactor(_recorder, 1);
- connect(_recorder, SIGNAL(recorded(const QString &)),
- this, SLOT(slotRecorded(const QString &)));
+ connect(_recorder, TQT_SIGNAL(recorded(const TQString &)),
+ this, TQT_SLOT(slotRecorded(const TQString &)));
- QHBox *hBox = new QHBox(this, "hbox");
+ TQHBox *hBox = new TQHBox(this, "hbox");
_tryOne = new GestureDrawer(hBox, "tryOne");
_tryTwo = new GestureDrawer(hBox, "tryTwo");
_tryThree = new GestureDrawer(hBox, "tryThree");
- QWidget *spacer = new QWidget(hBox, "spacer");
+ TQWidget *spacer = new TQWidget(hBox, "spacer");
hBox->setStretchFactor(spacer, 1);
- _resetButton = new QPushButton(i18n("&Reset"), hBox, "resetButton");
- connect(_resetButton, SIGNAL(clicked()),
- this, SLOT(slotResetClicked()));
+ _resetButton = new TQPushButton(i18n("&Reset"), hBox, "resetButton");
+ connect(_resetButton, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(slotResetClicked()));
@@ -82,7 +82,7 @@ GestureRecordPage::~GestureRecordPage()
{
}
-void GestureRecordPage::slotRecorded(const QString &data)
+void GestureRecordPage::slotRecorded(const TQString &data)
{
switch (_tryCount)
{
@@ -131,11 +131,11 @@ void GestureRecordPage::slotRecorded(const QString &data)
void GestureRecordPage::slotResetClicked()
{
- _gest = QString::null;
+ _gest = TQString::null;
- _tryOne->setData(QString::null);
- _tryTwo->setData(QString::null);
- _tryThree->setData(QString::null);
+ _tryOne->setData(TQString::null);
+ _tryTwo->setData(TQString::null);
+ _tryThree->setData(TQString::null);
_tryCount = 1;
diff --git a/khotkeys/kcontrol/gesturerecordpage.h b/khotkeys/kcontrol/gesturerecordpage.h
index 2636b47b3..1b95b86fe 100644
--- a/khotkeys/kcontrol/gesturerecordpage.h
+++ b/khotkeys/kcontrol/gesturerecordpage.h
@@ -12,7 +12,7 @@
#ifndef GESTURE_RECORD_PAGE_H
#define GESTURE_RECORD_PAGE_H
-#include <qvbox.h>
+#include <tqvbox.h>
#include "gesturedrawer.h"
@@ -31,14 +31,14 @@ class GestureRecordPage : public QVBox
Q_OBJECT
public:
- GestureRecordPage(const QString &gesture,
- QWidget *parent, const char *name);
+ GestureRecordPage(const TQString &gesture,
+ TQWidget *parent, const char *name);
~GestureRecordPage();
- const QString &getGesture() const { return _gest; }
+ const TQString &getGesture() const { return _gest; }
protected slots:
- void slotRecorded(const QString &data);
+ void slotRecorded(const TQString &data);
void slotResetClicked();
signals:
@@ -46,12 +46,12 @@ class GestureRecordPage : public QVBox
private:
GestureRecorder *_recorder;
- QPushButton *_resetButton;
+ TQPushButton *_resetButton;
GestureDrawer *_tryOne;
GestureDrawer *_tryTwo;
GestureDrawer *_tryThree;
- QString _gest;
+ TQString _gest;
Q_UINT32 _tryCount;
};
diff --git a/khotkeys/kcontrol/gestures_settings_tab.cpp b/khotkeys/kcontrol/gestures_settings_tab.cpp
index e3c71c66a..2b5a8ff42 100644
--- a/khotkeys/kcontrol/gestures_settings_tab.cpp
+++ b/khotkeys/kcontrol/gestures_settings_tab.cpp
@@ -17,9 +17,9 @@
#include "gestures_settings_tab.h"
#include <klocale.h>
-#include <qcombobox.h>
+#include <tqcombobox.h>
#include <knuminput.h>
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
#include "kcmkhotkeys.h"
#include "windowdef_list_widget.h"
@@ -27,7 +27,7 @@
namespace KHotKeys
{
-Gestures_settings_tab::Gestures_settings_tab( QWidget* parent_P, const char* name_P )
+Gestures_settings_tab::Gestures_settings_tab( TQWidget* parent_P, const char* name_P )
: Gestures_settings_tab_ui( parent_P, name_P )
{
mouse_button_combo->insertItem( i18n( "Button 2 (middle)" ), 0 );
@@ -39,12 +39,12 @@ Gestures_settings_tab::Gestures_settings_tab( QWidget* parent_P, const char* nam
mouse_button_combo->insertItem( i18n( "Button 8 (if available)" ), 6 );
mouse_button_combo->insertItem( i18n( "Button 9 (if available)" ), 7 );
// KHotKeys::Module::changed()
- connect( mouse_gestures_globally, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( mouse_button_combo, SIGNAL( activated( int )),
- module, SLOT( changed()));
- connect( timeout_input, SIGNAL( valueChanged( int )),
- module, SLOT( changed()));
+ connect( mouse_gestures_globally, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( mouse_button_combo, TQT_SIGNAL( activated( int )),
+ module, TQT_SLOT( changed()));
+ connect( timeout_input, TQT_SIGNAL( valueChanged( int )),
+ module, TQT_SLOT( changed()));
}
void Gestures_settings_tab::read_data()
diff --git a/khotkeys/kcontrol/gestures_settings_tab.h b/khotkeys/kcontrol/gestures_settings_tab.h
index a02126d8f..813209439 100644
--- a/khotkeys/kcontrol/gestures_settings_tab.h
+++ b/khotkeys/kcontrol/gestures_settings_tab.h
@@ -21,7 +21,7 @@ class Gestures_settings_tab
{
Q_OBJECT
public:
- Gestures_settings_tab( QWidget* parent = NULL, const char* name = NULL );
+ Gestures_settings_tab( TQWidget* parent = NULL, const char* name = NULL );
void read_data();
void write_data() const;
public slots:
diff --git a/khotkeys/kcontrol/info_tab.cpp b/khotkeys/kcontrol/info_tab.cpp
index 7363d27a1..7a2e0c916 100644
--- a/khotkeys/kcontrol/info_tab.cpp
+++ b/khotkeys/kcontrol/info_tab.cpp
@@ -16,15 +16,15 @@
#include "info_tab.h"
-#include <qpushbutton.h>
-#include <qlabel.h>
+#include <tqpushbutton.h>
+#include <tqlabel.h>
#include <klocale.h>
namespace KHotKeys
{
-Info_tab::Info_tab( QWidget* parent_P, const char* name_P )
+Info_tab::Info_tab( TQWidget* parent_P, const char* name_P )
: Info_tab_ui( parent_P, name_P )
{
clear_data();
diff --git a/khotkeys/kcontrol/info_tab.h b/khotkeys/kcontrol/info_tab.h
index 72628fe75..32212ae98 100644
--- a/khotkeys/kcontrol/info_tab.h
+++ b/khotkeys/kcontrol/info_tab.h
@@ -21,7 +21,7 @@ class Info_tab
{
Q_OBJECT
public:
- Info_tab( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Info_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
public slots:
void clear_data();
};
diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp
index 3468690e2..67dc2ee6e 100644
--- a/khotkeys/kcontrol/init.cpp
+++ b/khotkeys/kcontrol/init.cpp
@@ -31,13 +31,13 @@ extern "C"
// Non-xinerama multhead support in KDE is just a hack
// involving forking apps per-screen. Don't bother with
// kded modules in such case.
- QCString multiHead = getenv("KDE_MULTIHEAD");
+ TQCString multiHead = getenv("KDE_MULTIHEAD");
if (multiHead.lower() == "true")
kapp->kdeinitExec( "khotkeys" );
else
{
DCOPRef ref( "kded", "kded" );
- if( !ref.call( "loadModule", QCString( "khotkeys" )))
+ if( !ref.call( "loadModule", TQCString( "khotkeys" )))
{
kdWarning( 1217 ) << "Loading of khotkeys module failed." << endl;
kapp->kdeinitExec( "khotkeys" );
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 8ffc1ff19..5d540d4c9 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -19,8 +19,8 @@
#include <unistd.h>
#include <stdlib.h>
-#include <qlayout.h>
-#include <qsplitter.h>
+#include <tqlayout.h>
+#include <tqsplitter.h>
#include <kcmodule.h>
#include <kaboutdata.h>
@@ -48,7 +48,7 @@
extern "C"
{
- KDE_EXPORT KCModule* create_khotkeys( QWidget* parent_P, const char* name_P )
+ KDE_EXPORT KCModule* create_khotkeys( TQWidget* parent_P, const char* name_P )
{
// sleep( 20 ); // CHECKME DEBUG
KGlobal::locale()->insertCatalogue("khotkeys");
@@ -61,7 +61,7 @@ extern "C"
namespace KHotKeys
{
-Module::Module( QWidget* parent_P, const char* )
+Module::Module( TQWidget* parent_P, const char* )
: KCModule( parent_P, "khotkeys" ), _actions_root( NULL ), _current_action_data( NULL ),
listview_is_changed( false ), deleting_action( false )
{
@@ -69,21 +69,21 @@ Module::Module( QWidget* parent_P, const char* )
module = this;
init_global_data( false, this ); // don't grab keys
init_arts();
- QVBoxLayout* vbox = new QVBoxLayout( this );
+ TQVBoxLayout* vbox = new TQVBoxLayout( this );
vbox->setSpacing( 6 );
vbox->setMargin( 11 );
- QSplitter* splt = new QSplitter( this );
+ TQSplitter* splt = new TQSplitter( this );
actions_listview_widget = new Actions_listview_widget( splt );
tab_widget = new Tab_widget( splt );
vbox->addWidget( splt );
buttons_widget = new Main_buttons_widget( this );
vbox->addWidget( buttons_widget );
- connect( actions_listview_widget, SIGNAL( current_action_changed()),
- SLOT( listview_current_action_changed()));
- connect( buttons_widget, SIGNAL( new_action_pressed()), SLOT( new_action()));
- connect( buttons_widget, SIGNAL( new_action_group_pressed()), SLOT( new_action_group()));
- connect( buttons_widget, SIGNAL( delete_action_pressed()), SLOT( delete_action()));
- connect( buttons_widget, SIGNAL( global_settings_pressed()), SLOT( global_settings()));
+ connect( actions_listview_widget, TQT_SIGNAL( current_action_changed()),
+ TQT_SLOT( listview_current_action_changed()));
+ connect( buttons_widget, TQT_SIGNAL( new_action_pressed()), TQT_SLOT( new_action()));
+ connect( buttons_widget, TQT_SIGNAL( new_action_group_pressed()), TQT_SLOT( new_action_group()));
+ connect( buttons_widget, TQT_SIGNAL( delete_action_pressed()), TQT_SLOT( delete_action()));
+ connect( buttons_widget, TQT_SIGNAL( global_settings_pressed()), TQT_SLOT( global_settings()));
// listview_current_action_changed(); // init
KAboutData* about = new KAboutData("kcmkhotkeys", I18N_NOOP("KHotKeys"), KHOTKEYS_VERSION,
@@ -124,7 +124,7 @@ void Module::save()
settings.write_settings();
if( daemon_disabled())
{
- QByteArray data;
+ TQByteArray data;
kapp->dcopClient()->send( "khotkeys*", "khotkeys", "quit()", data );
kdDebug( 1217 ) << "disabling khotkeys daemon" << endl;
}
@@ -137,7 +137,7 @@ void Module::save()
}
else
{
- QByteArray data;
+ TQByteArray data;
kapp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data );
kdDebug( 1217 ) << "telling khotkeys daemon to reread configuration" << endl;
}
@@ -146,12 +146,12 @@ void Module::save()
}
-QString Module::quickHelp() const
+TQString Module::quickHelp() const
{
return i18n( "" ); // TODO CHECKME
}
-void Module::action_name_changed( const QString& name_P )
+void Module::action_name_changed( const TQString& name_P )
{
current_action_data()->set_name( name_P );
actions_listview_widget->action_name_changed( name_P );
@@ -272,7 +272,7 @@ void Module::set_gestures_exclude( Windowdef_list* windows )
void Module::import()
{
- QString file = KFileDialog::getOpenFileName( QString::null, "*.khotkeys", topLevelWidget(),
+ TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", topLevelWidget(),
i18n( "Select File with Actions to Be Imported" ));
if( file.isEmpty())
return;
diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h
index 3061fa9ec..b406df8fe 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.h
+++ b/khotkeys/kcontrol/kcmkhotkeys.h
@@ -32,16 +32,16 @@ class Module
{
Q_OBJECT
public:
- Module( QWidget *parent_P, const char *name_P );
+ Module( TQWidget *parent_P, const char *name_P );
virtual ~Module();
virtual void load();
virtual void save();
// virtual void defaults(); not used
- QString quickHelp() const;
+ TQString quickHelp() const;
int buttons();
void set_current_action_data( Action_data_base* data_P );
Action_data_base* current_action_data();
- void action_name_changed( const QString& name_P );
+ void action_name_changed( const TQString& name_P );
Action_data_group* actions_root() const;
void set_gestures_disabled( bool set );
bool gestures_disabled() const;
diff --git a/khotkeys/kcontrol/keyboard_input_widget.cpp b/khotkeys/kcontrol/keyboard_input_widget.cpp
index 3d60d8e13..4d5727482 100644
--- a/khotkeys/kcontrol/keyboard_input_widget.cpp
+++ b/khotkeys/kcontrol/keyboard_input_widget.cpp
@@ -16,9 +16,9 @@
#include "keyboard_input_widget.h"
-#include <qgroupbox.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
+#include <tqgroupbox.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
#include <ktextedit.h>
@@ -31,21 +31,21 @@
namespace KHotKeys
{
-Keyboard_input_widget::Keyboard_input_widget( QWidget* parent_P, const char* name_P )
+Keyboard_input_widget::Keyboard_input_widget( TQWidget* parent_P, const char* name_P )
: Keyboard_input_widget_ui( parent_P, name_P )
{
clear_data();
// KHotKeys::Module::changed()
- connect( action_window_radio, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( active_window_radio, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( specific_window_radio, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( keyboard_input_multilineedit, SIGNAL( textChanged()),
- module, SLOT( changed()));
- connect( modify_button, SIGNAL( clicked()),
- module, SLOT( changed()));
+ connect( action_window_radio, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( active_window_radio, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( specific_window_radio, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( keyboard_input_multilineedit, TQT_SIGNAL( textChanged()),
+ module, TQT_SLOT( changed()));
+ connect( modify_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
}
void Keyboard_input_widget::clear_data()
diff --git a/khotkeys/kcontrol/keyboard_input_widget.h b/khotkeys/kcontrol/keyboard_input_widget.h
index 7c1f15b95..32690f44e 100644
--- a/khotkeys/kcontrol/keyboard_input_widget.h
+++ b/khotkeys/kcontrol/keyboard_input_widget.h
@@ -24,7 +24,7 @@ class Keyboard_input_widget
{
Q_OBJECT
public:
- Keyboard_input_widget( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Keyboard_input_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Keyboard_input_action* data_P );
Keyboard_input_action* get_data( Action_data* data_P ) const;
public slots:
diff --git a/khotkeys/kcontrol/main_buttons_widget.cpp b/khotkeys/kcontrol/main_buttons_widget.cpp
index fb8718a1c..3532cc13f 100644
--- a/khotkeys/kcontrol/main_buttons_widget.cpp
+++ b/khotkeys/kcontrol/main_buttons_widget.cpp
@@ -16,28 +16,28 @@
#include "main_buttons_widget.h"
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
#include "kcmkhotkeys.h"
namespace KHotKeys
{
-Main_buttons_widget::Main_buttons_widget( QWidget* parent_P, const char* name_P )
+Main_buttons_widget::Main_buttons_widget( TQWidget* parent_P, const char* name_P )
: Main_buttons_widget_ui( parent_P, name_P )
{
- connect( new_action_button, SIGNAL( clicked()), SIGNAL( new_action_pressed()));
- connect( new_action_group_button, SIGNAL( clicked()), SIGNAL( new_action_group_pressed()));
- connect( delete_action_button, SIGNAL( clicked()), SIGNAL( delete_action_pressed()));
- connect( global_settings_button, SIGNAL( clicked()), SIGNAL( global_settings_pressed()));
+ connect( new_action_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( new_action_pressed()));
+ connect( new_action_group_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( new_action_group_pressed()));
+ connect( delete_action_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( delete_action_pressed()));
+ connect( global_settings_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( global_settings_pressed()));
enable_delete( false );
// KHotKeys::Module::changed()
- connect( new_action_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( new_action_group_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( delete_action_button, SIGNAL( clicked()),
- module, SLOT( changed()));
+ connect( new_action_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( new_action_group_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( delete_action_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
setMaximumHeight( sizeHint().height()); // it gets too high and I have no idea why
}
diff --git a/khotkeys/kcontrol/main_buttons_widget.h b/khotkeys/kcontrol/main_buttons_widget.h
index cd13b3cbc..e4410d9d0 100644
--- a/khotkeys/kcontrol/main_buttons_widget.h
+++ b/khotkeys/kcontrol/main_buttons_widget.h
@@ -21,7 +21,7 @@ class Main_buttons_widget
{
Q_OBJECT
public:
- Main_buttons_widget( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Main_buttons_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void enable_delete( bool enable_P );
signals:
void new_action_pressed();
diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp
index dd0035dfa..78de7dee6 100644
--- a/khotkeys/kcontrol/menuedit.cpp
+++ b/khotkeys/kcontrol/menuedit.cpp
@@ -23,9 +23,9 @@
#include <kaccel.h>
#include <kapplication.h>
#include <dcopclient.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
+#include <tqlayout.h>
#include <kkeydialog.h>
#include <settings.h>
@@ -34,7 +34,7 @@
namespace KHotKeys
{
-static QObject* owner = NULL;
+static TQObject* owner = NULL;
void khotkeys_init()
{
@@ -53,7 +53,7 @@ void khotkeys_cleanup()
}
Menuentry_shortcut_action_data* khotkeys_get_menu_entry_internal2(
- const Action_data_group* data_P, const QString& entry_P )
+ const Action_data_group* data_P, const TQString& entry_P )
{
if( !data_P->enabled( false ))
return NULL;
@@ -97,19 +97,19 @@ Action_data_group* khotkeys_get_menu_root( Action_data_group* data_P )
}
Menuentry_shortcut_action_data* khotkeys_get_menu_entry_internal( Action_data_group* data_P,
- const QString& entry_P )
+ const TQString& entry_P )
{
return khotkeys_get_menu_entry_internal2( khotkeys_get_menu_root( data_P ), entry_P );
}
-QString khotkeys_get_menu_shortcut( Menuentry_shortcut_action_data* data_P )
+TQString khotkeys_get_menu_shortcut( Menuentry_shortcut_action_data* data_P )
{
if( data_P->trigger() != NULL )
return data_P->trigger()->shortcut().toString();
return "";
}
-void khotkeys_get_all_shortcuts_internal(const Action_data_group* data_P, QStringList &result)
+void khotkeys_get_all_shortcuts_internal(const Action_data_group* data_P, TQStringList &result)
{
if( !data_P->enabled( false ))
return;
@@ -133,9 +133,9 @@ void khotkeys_get_all_shortcuts_internal(const Action_data_group* data_P, QStrin
}
-QStringList khotkeys_get_all_shortcuts( )
+TQStringList khotkeys_get_all_shortcuts( )
{
- QStringList result;
+ TQStringList result;
Settings settings;
settings.read_settings( true );
@@ -145,7 +145,7 @@ QStringList khotkeys_get_all_shortcuts( )
}
-KService::Ptr khotkeys_find_menu_entry_internal(const Action_data_group* data_P, const QString &shortcut_P)
+KService::Ptr khotkeys_find_menu_entry_internal(const Action_data_group* data_P, const TQString &shortcut_P)
{
if( !data_P->enabled( false ))
return 0;
@@ -177,7 +177,7 @@ KService::Ptr khotkeys_find_menu_entry_internal(const Action_data_group* data_P,
}
-KService::Ptr khotkeys_find_menu_entry( const QString& shortcut_P )
+KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P )
{
Settings settings;
settings.read_settings( true );
@@ -188,7 +188,7 @@ KService::Ptr khotkeys_find_menu_entry( const QString& shortcut_P )
void khotkeys_send_reread_config()
{
- QByteArray data;
+ TQByteArray data;
if( !kapp->dcopClient()->isAttached())
kapp->dcopClient()->attach();
if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
@@ -198,13 +198,13 @@ void khotkeys_send_reread_config()
}
else
{
- QByteArray data;
+ TQByteArray data;
kapp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data );
kdDebug( 1217 ) << "telling khotkeys daemon to reread configuration" << endl;
}
}
-QString khotkeys_get_menu_entry_shortcut( const QString& entry_P )
+TQString khotkeys_get_menu_entry_shortcut( const TQString& entry_P )
{
Settings settings;
settings.read_settings( true );
@@ -215,12 +215,12 @@ QString khotkeys_get_menu_entry_shortcut( const QString& entry_P )
delete settings.actions;
return "";
}
- QString shortcut = khotkeys_get_menu_shortcut( entry );
+ TQString shortcut = khotkeys_get_menu_shortcut( entry );
delete settings.actions;
return shortcut;
}
-bool khotkeys_menu_entry_moved( const QString& new_P, const QString& old_P )
+bool khotkeys_menu_entry_moved( const TQString& new_P, const TQString& old_P )
{
Settings settings;
settings.read_settings( true );
@@ -232,7 +232,7 @@ bool khotkeys_menu_entry_moved( const QString& new_P, const QString& old_P )
return false;
}
Action_data_group* parent = entry->parent();
- QString new_name = new_P;
+ TQString new_name = new_P;
if( entry->name().startsWith( i18n( "K Menu - " )))
new_name = i18n( "K Menu - " ) + new_P;
Menuentry_shortcut_action_data* new_entry = new Menuentry_shortcut_action_data( parent,
@@ -246,7 +246,7 @@ bool khotkeys_menu_entry_moved( const QString& new_P, const QString& old_P )
return true;
}
-void khotkeys_menu_entry_deleted( const QString& entry_P )
+void khotkeys_menu_entry_deleted( const TQString& entry_P )
{
Settings settings;
settings.read_settings( true );
@@ -263,8 +263,8 @@ void khotkeys_menu_entry_deleted( const QString& entry_P )
khotkeys_send_reread_config();
}
-QString khotkeys_change_menu_entry_shortcut( const QString& entry_P,
- const QString& shortcut_P )
+TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
+ const TQString& shortcut_P )
{
Settings settings;
settings.read_settings( true );
@@ -286,7 +286,7 @@ QString khotkeys_change_menu_entry_shortcut( const QString& entry_P,
delete entry;
entry = entry_tmp;
}
- QString shortcut = "";
+ TQString shortcut = "";
// make sure the shortcut is valid
shortcut = (KShortcut( shortcut_P )).toStringInternal();
if( !shortcut.isEmpty())
@@ -327,33 +327,33 @@ void khotkeys_cleanup()
KHotKeys::khotkeys_cleanup();
}
-QString khotkeys_get_menu_entry_shortcut( const QString& entry_P )
+TQString khotkeys_get_menu_entry_shortcut( const TQString& entry_P )
{
return KHotKeys::khotkeys_get_menu_entry_shortcut( entry_P );
}
-bool khotkeys_menu_entry_moved( const QString& new_P, const QString& old_P )
+bool khotkeys_menu_entry_moved( const TQString& new_P, const TQString& old_P )
{
return KHotKeys::khotkeys_menu_entry_moved( new_P, old_P );
}
-void khotkeys_menu_entry_deleted( const QString& entry_P )
+void khotkeys_menu_entry_deleted( const TQString& entry_P )
{
KHotKeys::khotkeys_menu_entry_deleted( entry_P );
}
-QString khotkeys_change_menu_entry_shortcut( const QString& entry_P,
- const QString& shortcut_P )
+TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
+ const TQString& shortcut_P )
{
return KHotKeys::khotkeys_change_menu_entry_shortcut( entry_P, shortcut_P );
}
-QStringList khotkeys_get_all_shortcuts( )
+TQStringList khotkeys_get_all_shortcuts( )
{
return KHotKeys::khotkeys_get_all_shortcuts();
}
-KService::Ptr khotkeys_find_menu_entry( const QString& shortcut_P )
+KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P )
{
return KHotKeys::khotkeys_find_menu_entry( shortcut_P );
}
diff --git a/khotkeys/kcontrol/menuedit.h b/khotkeys/kcontrol/menuedit.h
index 0986d1cca..325a3050e 100644
--- a/khotkeys/kcontrol/menuedit.h
+++ b/khotkeys/kcontrol/menuedit.h
@@ -11,7 +11,7 @@
#ifndef _MENUEDIT_H_
#define _MENUEDIT_H_
-#include <qstring.h>
+#include <tqstring.h>
#include <kdialogbase.h>
#include <kaccel.h>
#include <kservice.h>
@@ -27,18 +27,18 @@ KDE_EXPORT void khotkeys_init( void );
KDE_EXPORT void khotkeys_cleanup( void );
// return keyboard shortcut ( e.g. "ALT+T" ) for given menu entry ( e.g.
// "System/Konsole.desktop"
-KDE_EXPORT QString khotkeys_get_menu_entry_shortcut( const QString& entry_P );
+KDE_EXPORT TQString khotkeys_get_menu_entry_shortcut( const TQString& entry_P );
// changes assigned shortcut to menu entry a updates config file
-KDE_EXPORT QString khotkeys_change_menu_entry_shortcut( const QString& entry_P,
- const QString& shortcut_P );
+KDE_EXPORT TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
+ const TQString& shortcut_P );
// menu entry was moved in K Menu
-KDE_EXPORT bool khotkeys_menu_entry_moved( const QString& new_P, const QString& old_P );
+KDE_EXPORT bool khotkeys_menu_entry_moved( const TQString& new_P, const TQString& old_P );
// menu entry was removed
-KDE_EXPORT void khotkeys_menu_entry_deleted( const QString& entry_P );
+KDE_EXPORT void khotkeys_menu_entry_deleted( const TQString& entry_P );
// List of all hotkeys in use
-KDE_EXPORT QStringList khotkeys_get_all_shortcuts( );
+KDE_EXPORT TQStringList khotkeys_get_all_shortcuts( );
// Find menu entry that uses shortcut
-KDE_EXPORT KService::Ptr khotkeys_find_menu_entry( const QString& shortcut_P );
+KDE_EXPORT KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P );
} // extern "C"
#endif
diff --git a/khotkeys/kcontrol/menuentry_widget.cpp b/khotkeys/kcontrol/menuentry_widget.cpp
index 2bad5597c..9b313d20d 100644
--- a/khotkeys/kcontrol/menuentry_widget.cpp
+++ b/khotkeys/kcontrol/menuentry_widget.cpp
@@ -16,10 +16,10 @@
#include "menuentry_widget.h"
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qcheckbox.h>
-#include <qgroupbox.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
#include <kdebug.h>
@@ -32,13 +32,13 @@
namespace KHotKeys
{
-Menuentry_widget::Menuentry_widget( QWidget* parent_P, const char* name_P )
+Menuentry_widget::Menuentry_widget( TQWidget* parent_P, const char* name_P )
: Menuentry_widget_ui( parent_P, name_P )
{
clear_data();
// KHotKeys::Module::changed()
- connect( menuentry_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
+ connect( menuentry_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
}
void Menuentry_widget::clear_data()
diff --git a/khotkeys/kcontrol/menuentry_widget.h b/khotkeys/kcontrol/menuentry_widget.h
index 0c871ec79..f4b61677d 100644
--- a/khotkeys/kcontrol/menuentry_widget.h
+++ b/khotkeys/kcontrol/menuentry_widget.h
@@ -24,7 +24,7 @@ class Menuentry_widget
{
Q_OBJECT
public:
- Menuentry_widget( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Menuentry_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Menuentry_action* data_P );
Menuentry_action* get_data( Action_data* data_P ) const;
public slots:
diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp
index 2a484529a..243543519 100644
--- a/khotkeys/kcontrol/tab_widget.cpp
+++ b/khotkeys/kcontrol/tab_widget.cpp
@@ -51,16 +51,16 @@
namespace KHotKeys
{
-Tab_widget::Tab_widget( QWidget* parent_P, const char* name_P )
- : QTabWidget( parent_P, name_P )
+Tab_widget::Tab_widget( TQWidget* parent_P, const char* name_P )
+ : TQTabWidget( parent_P, name_P )
{
pages[ TAB_INFO ] = new Info_tab;
pages[ TAB_GENERAL_SETTINGS ] = new General_settings_tab;
pages[ TAB_GESTURES_SETTINGS ] = new Gestures_settings_tab;
General_tab* general_tab;
pages[ TAB_GENERAL ] = general_tab = new General_tab;
- connect( general_tab, SIGNAL( action_type_changed( int )),
- SLOT( set_action_type_slot( int )));
+ connect( general_tab, TQT_SIGNAL( action_type_changed( int )),
+ TQT_SLOT( set_action_type_slot( int )));
pages[ TAB_GROUP_GENERAL ] = new Action_group_tab;
pages[ TAB_CONDITIONS ] = new Condition_list_tab;
pages[ TAB_ACTIONS ] = new Action_list_tab;
@@ -76,7 +76,7 @@ Tab_widget::Tab_widget( QWidget* parent_P, const char* name_P )
for( tab_pos_t i = TAB_FIRST;
i < TAB_END;
++i )
- connect( this, SIGNAL( clear_pages_signal()), pages[ i ], SLOT( clear_data()));
+ connect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data()));
#ifdef HAVE_ARTS
if( haveArts())
show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS, TAB_VOICE_SETTINGS ));
@@ -127,7 +127,7 @@ void Tab_widget::save_current_action_changes()
}
else if( current_type == DATA )
{
- QString name, comment;
+ TQString name, comment;
bool enabled;
static_cast< General_tab* >( pages[ TAB_GENERAL ] )->get_data( name, comment, enabled );
switch( current_data_type )
@@ -441,18 +441,18 @@ void Tab_widget::show_pages( const Pages_set& pages_P )
{
removePage( pages[ i ] );
if( pages_P.is_set( i )) // don't clear page contents if it stays visible
- disconnect( this, SIGNAL( clear_pages_signal()), pages[ i ], SLOT( clear_data()));
+ disconnect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data()));
}
clear_pages();
// reconnect all pages to this signal
- disconnect( this, SIGNAL( clear_pages_signal()), NULL, NULL );
+ disconnect( this, TQT_SIGNAL( clear_pages_signal()), NULL, NULL );
for( tab_pos_t i = TAB_FIRST;
i < TAB_END;
++i )
{
if( pages_P.is_set( i ))
addTab( pages[ i ], i18n( tab_labels[ i ] ));
- connect( this, SIGNAL( clear_pages_signal()), pages[ i ], SLOT( clear_data()));
+ connect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data()));
}
show();
}
diff --git a/khotkeys/kcontrol/tab_widget.h b/khotkeys/kcontrol/tab_widget.h
index eedaa541a..84fd6af84 100644
--- a/khotkeys/kcontrol/tab_widget.h
+++ b/khotkeys/kcontrol/tab_widget.h
@@ -11,7 +11,7 @@
#ifndef _TAB_WIDGET_H_
#define _TAB_WIDGET_H_
-#include <qtabwidget.h>
+#include <tqtabwidget.h>
#include <actions.h>
@@ -35,7 +35,7 @@ class Tab_widget
TYPE_ACTIVATE_WINDOW_SHORTCUT,
TYPE_END
};
- Tab_widget( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Tab_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
virtual ~Tab_widget();
void set_action_type( action_type_t type_P, bool force_P = false );
void save_current_action_changes();
@@ -54,7 +54,7 @@ class Tab_widget
TAB_GENERAL, TAB_GROUP_GENERAL,
TAB_TRIGGERS, TAB_SHORTCUT_TRIGGER, TAB_GESTURE_TRIGGER, TAB_ACTIONS, TAB_COMMAND_URL,
TAB_MENUENTRY, TAB_DCOP, TAB_KEYBOARD_INPUT, TAB_WINDOW, TAB_CONDITIONS, TAB_VOICE_SETTINGS, TAB_END };
- QWidget* pages[ TAB_END ];
+ TQWidget* pages[ TAB_END ];
enum tab_show_type_t { NONE, DATA, GROUP };
tab_show_type_t current_type;
action_type_t current_data_type;
diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index 8c4a13fda..39ff6933f 100644
--- a/khotkeys/kcontrol/triggers_tab.cpp
+++ b/khotkeys/kcontrol/triggers_tab.cpp
@@ -17,12 +17,12 @@
#include "triggers_tab.h"
#include <assert.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qpopupmenu.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qheader.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqpopupmenu.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqheader.h>
#include <kdebug.h>
#include <klocale.h>
@@ -44,10 +44,10 @@ namespace KHotKeys
// Triggers_tab
-Triggers_tab::Triggers_tab( QWidget* parent_P, const char* name_P )
+Triggers_tab::Triggers_tab( TQWidget* parent_P, const char* name_P )
: Triggers_tab_ui( parent_P, name_P ), selected_item( NULL )
{
- QPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work
+ TQPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work
popup->insertItem( i18n( "Shortcut Trigger..." ), TYPE_SHORTCUT_TRIGGER );
popup->insertItem( i18n( "Gesture Trigger..." ), TYPE_GESTURE_TRIGGER );
popup->insertItem( i18n( "Window Trigger..." ), TYPE_WINDOW_TRIGGER );
@@ -55,9 +55,9 @@ Triggers_tab::Triggers_tab( QWidget* parent_P, const char* name_P )
if( haveArts())
popup->insertItem( i18n( "Voice Trigger..." ), TYPE_VOICE_TRIGGER );
#endif
- connect( popup, SIGNAL( activated( int )), SLOT( new_selected( int )));
- connect( triggers_listview, SIGNAL( doubleClicked ( QListViewItem *, const QPoint &, int ) ),
- this, SLOT( modify_pressed() ) );
+ connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
+ connect( triggers_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+ this, TQT_SLOT( modify_pressed() ) );
new_button->setPopup( popup );
copy_button->setEnabled( false );
@@ -69,16 +69,16 @@ Triggers_tab::Triggers_tab( QWidget* parent_P, const char* name_P )
triggers_listview->setForceSelect( true );
clear_data();
// KHotKeys::Module::changed()
- connect( new_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( copy_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( modify_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( delete_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( comment_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
+ connect( new_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( copy_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( modify_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( delete_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
}
Triggers_tab::~Triggers_tab()
@@ -111,7 +111,7 @@ void Triggers_tab::set_data( const Trigger_list* data_P )
Trigger_list* Triggers_tab::get_data( Action_data* data_P ) const
{
Trigger_list* list = new Trigger_list( comment_lineedit->text());
- for( QListViewItem* pos = triggers_listview->firstChild();
+ for( TQListViewItem* pos = triggers_listview->firstChild();
pos != NULL;
pos = pos->nextSibling())
list->append( static_cast< Trigger_list_item* >( pos )->trigger()->copy( data_P ));
@@ -129,14 +129,14 @@ void Triggers_tab::new_selected( int type_P )
break;
case TYPE_GESTURE_TRIGGER: // Gesture trigger
dlg = new Gesture_trigger_dialog(
- new Gesture_trigger( NULL, QString::null )); // CHECKME NULL ?
+ new Gesture_trigger( NULL, TQString::null )); // CHECKME NULL ?
break;
case TYPE_WINDOW_TRIGGER: // Window trigger
dlg = new Window_trigger_dialog( new Window_trigger( NULL, new Windowdef_list( "" ),
0 )); // CHECKME NULL ?
break;
case TYPE_VOICE_TRIGGER: // Voice trigger
- dlg = new Voice_trigger_dialog( new Voice_trigger(NULL,QString::null,VoiceSignature(),VoiceSignature())); // CHECKME NULL ?
+ dlg = new Voice_trigger_dialog( new Voice_trigger(NULL,TQString::null,VoiceSignature(),VoiceSignature())); // CHECKME NULL ?
break;
}
if( dlg != NULL )
@@ -169,7 +169,7 @@ void Triggers_tab::modify_pressed()
edit_listview_item( selected_item );
}
-void Triggers_tab::current_changed( QListViewItem* item_P )
+void Triggers_tab::current_changed( TQListViewItem* item_P )
{
// if( item_P == selected_item )
// return;
@@ -181,7 +181,7 @@ void Triggers_tab::current_changed( QListViewItem* item_P )
}
Trigger_list_item* Triggers_tab::create_listview_item( Trigger* trigger_P,
- QListView* parent_P, QListViewItem* after_P, bool copy_P )
+ TQListView* parent_P, TQListViewItem* after_P, bool copy_P )
{
Trigger* new_trg = copy_P ? trigger_P->copy( NULL ) : trigger_P; // CHECKME NULL ?
// CHECKME uz by nemelo byt treba if( after_P == NULL )
@@ -212,26 +212,26 @@ void Triggers_tab::edit_listview_item( Trigger_list_item* item_P )
// Trigger_list_item
-QString Trigger_list_item::text( int column_P ) const
+TQString Trigger_list_item::text( int column_P ) const
{
- return column_P == 0 ? trigger()->description() : QString::null;
+ return column_P == 0 ? trigger()->description() : TQString::null;
}
// Shortcut_trigger_widget
-Shortcut_trigger_widget::Shortcut_trigger_widget( QWidget* parent_P, const char* )
- : QWidget( parent_P )
+Shortcut_trigger_widget::Shortcut_trigger_widget( TQWidget* parent_P, const char* )
+ : TQWidget( parent_P )
{
- QVBoxLayout* lay = new QVBoxLayout( this, 11, 6 );
- QLabel* lbl = new QLabel( i18n( "Select keyboard shortcut:" ), this );
+ TQVBoxLayout* lay = new TQVBoxLayout( this, 11, 6 );
+ TQLabel* lbl = new TQLabel( i18n( "Select keyboard shortcut:" ), this );
lay->addWidget( lbl );
lay->addSpacing( 10 );
bt = new KKeyButton( this );
lay->addWidget( bt, 0 , Qt::AlignHCenter );
lay->addStretch();
clear_data();
- connect( bt, SIGNAL( capturedShortcut( const KShortcut& )),
- this, SLOT( capturedShortcut( const KShortcut& )));
+ connect( bt, TQT_SIGNAL( capturedShortcut( const KShortcut& )),
+ this, TQT_SLOT( capturedShortcut( const KShortcut& )));
}
void Shortcut_trigger_widget::clear_data()
@@ -320,8 +320,8 @@ Gesture_trigger_dialog::Gesture_trigger_dialog( Gesture_trigger* trigger_P )
_page = new GestureRecordPage( _trigger->gesturecode(),
this, "GestureRecordPage");
- connect(_page, SIGNAL(gestureRecorded(bool)),
- this, SLOT(enableButtonOK(bool)));
+ connect(_page, TQT_SIGNAL(gestureRecorded(bool)),
+ this, TQT_SLOT(enableButtonOK(bool)));
setMainWidget( _page );
}
@@ -341,9 +341,9 @@ Voice_trigger_dialog::Voice_trigger_dialog( Voice_trigger* trigger_P )
: KDialogBase( NULL, NULL, true, "", Ok | Cancel ), // CHECKME caption
_trigger( trigger_P ), _page( NULL )
{
- _page = new VoiceRecordPage( _trigger ? _trigger->voicecode() : QString::null , this, "VoiceRecordPage");
+ _page = new VoiceRecordPage( _trigger ? _trigger->voicecode() : TQString::null , this, "VoiceRecordPage");
- connect(_page, SIGNAL(voiceRecorded(bool)), this, SLOT(enableButtonOK(bool)));
+ connect(_page, TQT_SIGNAL(voiceRecorded(bool)), this, TQT_SLOT(enableButtonOK(bool)));
setMainWidget( _page );
}
diff --git a/khotkeys/kcontrol/triggers_tab.h b/khotkeys/kcontrol/triggers_tab.h
index 57cce3e3e..824b31173 100644
--- a/khotkeys/kcontrol/triggers_tab.h
+++ b/khotkeys/kcontrol/triggers_tab.h
@@ -30,22 +30,22 @@ class Action_data;
class Trigger_list_item;
class KHotKeysShortcutList;
-// A listbox here would do too, but unlike QListView, QListBox now even cannot be subclassed
+// A listbox here would do too, but unlike TQListView, TQListBox now even cannot be subclassed
// to behave sanely WRT selecting and the current item
class Triggers_tab
: public Triggers_tab_ui
{
Q_OBJECT
public:
- Triggers_tab( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Triggers_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
virtual ~Triggers_tab();
void set_data( const Trigger_list* data_P );
Trigger_list* get_data( Action_data* data_P ) const;
public slots:
void clear_data();
protected:
- Trigger_list_item* create_listview_item( Trigger* trigger_P, QListView* parent_P,
- QListViewItem* after_P, bool copy_P );
+ Trigger_list_item* create_listview_item( Trigger* trigger_P, TQListView* parent_P,
+ TQListViewItem* after_P, bool copy_P );
void edit_listview_item( Trigger_list_item* item_P );
Trigger_list_item* selected_item;
enum type_t { TYPE_SHORTCUT_TRIGGER, TYPE_GESTURE_TRIGGER, TYPE_WINDOW_TRIGGER, TYPE_VOICE_TRIGGER };
@@ -54,17 +54,17 @@ class Triggers_tab
virtual void copy_pressed();
virtual void delete_pressed();
virtual void modify_pressed();
- virtual void current_changed( QListViewItem* item_P );
+ virtual void current_changed( TQListViewItem* item_P );
};
class Trigger_list_item
: public QListViewItem
{
public:
- Trigger_list_item( QListView* parent_P, Trigger* trigger_P );
- Trigger_list_item( QListView* parent_P, QListViewItem* after_P, Trigger* trigger_P );
+ Trigger_list_item( TQListView* parent_P, Trigger* trigger_P );
+ Trigger_list_item( TQListView* parent_P, TQListViewItem* after_P, Trigger* trigger_P );
virtual ~Trigger_list_item();
- virtual QString text( int column_P ) const;
+ virtual TQString text( int column_P ) const;
Trigger* trigger() const;
void set_trigger( Trigger* trigger_P );
protected:
@@ -84,7 +84,7 @@ class Shortcut_trigger_widget
{
Q_OBJECT
public:
- Shortcut_trigger_widget( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Shortcut_trigger_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Shortcut_trigger* trigger_P );
Shortcut_trigger* get_data( Action_data* data_P ) const;
public slots:
@@ -163,15 +163,15 @@ class Voice_trigger_dialog
// Trigger_list_item
inline
-Trigger_list_item::Trigger_list_item( QListView* parent_P, Trigger* trigger_P )
- : QListViewItem( parent_P ), _trigger( trigger_P )
+Trigger_list_item::Trigger_list_item( TQListView* parent_P, Trigger* trigger_P )
+ : TQListViewItem( parent_P ), _trigger( trigger_P )
{
}
inline
-Trigger_list_item::Trigger_list_item( QListView* parent_P, QListViewItem* after_P,
+Trigger_list_item::Trigger_list_item( TQListView* parent_P, TQListViewItem* after_P,
Trigger* trigger_P )
- : QListViewItem( parent_P, after_P ), _trigger( trigger_P )
+ : TQListViewItem( parent_P, after_P ), _trigger( trigger_P )
{
}
diff --git a/khotkeys/kcontrol/voice_settings_tab.cpp b/khotkeys/kcontrol/voice_settings_tab.cpp
index 684ca0cdf..612498536 100644
--- a/khotkeys/kcontrol/voice_settings_tab.cpp
+++ b/khotkeys/kcontrol/voice_settings_tab.cpp
@@ -11,9 +11,9 @@
#include "voice_settings_tab.h"
#include <klocale.h>
-#include <qcombobox.h>
+#include <tqcombobox.h>
#include <knuminput.h>
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
#include <kkeybutton.h>
#include <kkeydialog.h>
@@ -23,10 +23,10 @@
namespace KHotKeys
{
-Voice_settings_tab::Voice_settings_tab( QWidget* parent_P, const char* name_P )
+Voice_settings_tab::Voice_settings_tab( TQWidget* parent_P, const char* name_P )
: Voice_settings_tab_ui( parent_P, name_P )
{
- connect( keyButton , SIGNAL(capturedShortcut (const KShortcut &)) , this, SLOT(slotCapturedKey( const KShortcut& )));
+ connect( keyButton , TQT_SIGNAL(capturedShortcut (const KShortcut &)) , this, TQT_SLOT(slotCapturedKey( const KShortcut& )));
}
void Voice_settings_tab::read_data()
diff --git a/khotkeys/kcontrol/voice_settings_tab.h b/khotkeys/kcontrol/voice_settings_tab.h
index 7b7abd3c5..68e37af3a 100644
--- a/khotkeys/kcontrol/voice_settings_tab.h
+++ b/khotkeys/kcontrol/voice_settings_tab.h
@@ -23,7 +23,7 @@ class Voice_settings_tab
{
Q_OBJECT
public:
- Voice_settings_tab( QWidget* parent = NULL, const char* name = NULL );
+ Voice_settings_tab( TQWidget* parent = NULL, const char* name = NULL );
void read_data();
void write_data() const;
public slots:
diff --git a/khotkeys/kcontrol/voicerecorder.cpp b/khotkeys/kcontrol/voicerecorder.cpp
index 92458c2ee..31578298d 100644
--- a/khotkeys/kcontrol/voicerecorder.cpp
+++ b/khotkeys/kcontrol/voicerecorder.cpp
@@ -8,8 +8,8 @@
****************************************************************************/
-#include <qcolor.h>
-#include <qevent.h>
+#include <tqcolor.h>
+#include <tqevent.h>
#include "voicerecorder.h"
#include "soundrecorder.h"
@@ -20,8 +20,8 @@
#include <klineedit.h>
#include <klocale.h>
#include <ktempfile.h>
-#include <qlabel.h>
-#include <qpainter.h>
+#include <tqlabel.h>
+#include <tqpainter.h>
#include <kmessagebox.h>
#include <klibloader.h>
#include <kstandarddirs.h>
@@ -45,14 +45,14 @@ bool VoiceRecorder::init( KLibrary* lib )
return arts_play != NULL;
}
-VoiceRecorder::VoiceRecorder(const Sound& sound_P, const QString &voiceId, QWidget *parent, const char *name)
+VoiceRecorder::VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWidget *parent, const char *name)
: Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(this)) , _state(sNotModified), _tempFile(0L) , _voiceId(voiceId)
{
_sound=sound_P;
buttonPlay->setEnabled(sound_P.size() > 50);
buttonStop->setEnabled(false);
- connect (_recorder , SIGNAL(recorded(const Sound& )) , this , SLOT(slotSoundRecorded(const Sound& ) ));
+ connect (_recorder , TQT_SIGNAL(recorded(const Sound& )) , this , TQT_SLOT(slotSoundRecorded(const Sound& ) ));
//if(voiceid_P.isEmpty())
emit recorded(false);
@@ -89,14 +89,14 @@ void VoiceRecorder::slotPlayPressed()
return;
/*if(!_modified)
{
- QString fileName = locateLocal( "appdata", _original_voiuceid + ".wav" );
+ TQString fileName = locateLocal( "appdata", _original_voiuceid + ".wav" );
arts_play( fileName );
}
else
{*/
if(!_tempFile)
{
- _tempFile=new KTempFile(QString::null,".wav");
+ _tempFile=new KTempFile(TQString::null,".wav");
_tempFile->setAutoDelete(true);
}
_sound.save(_tempFile->name());
@@ -118,7 +118,7 @@ void VoiceRecorder::slotSoundRecorded(const Sound &sound)
bool correct=drawSound() && sound.size()>50;
if(correct)
{
- QString vm=voice_handler->isNewSoundFarEnough( VoiceSignature(sound), _voiceId);
+ TQString vm=voice_handler->isNewSoundFarEnough( VoiceSignature(sound), _voiceId);
if(!vm.isNull())
{
KMessageBox::sorry (this, i18n("The word you recorded is too close to the existing reference '%1'. Please record another word.").arg(vm) );
@@ -140,14 +140,14 @@ void VoiceRecorder::slotSoundRecorded(const Sound &sound)
{
if(voiceId().isEmpty())
return VoiceSignature();
- QString fileName = locateLocal( "appdata", voiceId() + ".wav" );
+ TQString fileName = locateLocal( "appdata", voiceId() + ".wav" );
_sound.save( fileName );
return VoiceSignature(_sound);
}*/
bool VoiceRecorder::drawSound()
{
- label->setText(QString::null);
+ label->setText(TQString::null);
uint length=_sound.size();
if(length < 2)
@@ -155,20 +155,20 @@ bool VoiceRecorder::drawSound()
int width=label->width();
int height=label->height();
- QPixmap pix(width,height);
- pix.fill(QColor(255,255,255));
- QPainter p;
+ TQPixmap pix(width,height);
+ pix.fill(TQColor(255,255,255));
+ TQPainter p;
p.begin(&pix);
- p.setPen(QPen(QColor("green"),1));
+ p.setPen(TQPen(TQColor("green"),1));
p.drawLine(0,height/2,width,height/2);
- p.setPen(QPen(QColor("red"),1));
+ p.setPen(TQPen(TQColor("red"),1));
uint lx=0;
uint ly=height/2;
- /*** DRAW THE SIGNAL ******/
+ /*** DRAW THE TQT_SIGNAL ******/
for(uint f=1; f<length; f++)
{
uint nx=f*width/length;
@@ -179,7 +179,7 @@ bool VoiceRecorder::drawSound()
unsigned int start=0 , stop=0;
bool res=KHotKeys::VoiceSignature::window(_sound,&start,&stop);
- p.setPen(QPen(QColor("blue"),1));
+ p.setPen(TQPen(TQColor("blue"),1));
if(res)
{
p.drawLine(start*width/length ,0,start*width/length ,height);
diff --git a/khotkeys/kcontrol/voicerecorder.h b/khotkeys/kcontrol/voicerecorder.h
index 579f53893..c1ac57b85 100644
--- a/khotkeys/kcontrol/voicerecorder.h
+++ b/khotkeys/kcontrol/voicerecorder.h
@@ -11,9 +11,9 @@
#ifndef VOICE_RECORDER_H
#define VOICE_RECORDER_H
-#include <qframe.h>
+#include <tqframe.h>
#include "ui/voice_input_widget_ui.h"
-#include <qmemarray.h>
+#include <tqmemarray.h>
#include "sound.h"
class QMouseEvent;
@@ -33,7 +33,7 @@ class VoiceRecorder : public Voice_input_widget_ui
Q_OBJECT
public:
- VoiceRecorder(const Sound& sound_P, const QString &voiceId, QWidget *parent, const char *name);
+ VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWidget *parent, const char *name);
~VoiceRecorder();
Sound sound() const;
@@ -46,7 +46,7 @@ class VoiceRecorder : public Voice_input_widget_ui
}
static bool init( KLibrary* lib );
- typedef void (*arts_play_fun)( const QString& file );
+ typedef void (*arts_play_fun)( const TQString& file );
protected slots:
void slotStopPressed();
@@ -64,7 +64,7 @@ class VoiceRecorder : public Voice_input_widget_ui
Sound _sound;
State _state;
KTempFile *_tempFile;
- QString _voiceId;
+ TQString _voiceId;
static arts_play_fun arts_play;
};
diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp
index 385d78dda..fec07e22f 100644
--- a/khotkeys/kcontrol/voicerecordpage.cpp
+++ b/khotkeys/kcontrol/voicerecordpage.cpp
@@ -8,9 +8,9 @@
****************************************************************************/
-#include <qwidget.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
+#include <tqwidget.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
#include <klineedit.h>
#include <kstandarddirs.h>
@@ -25,29 +25,29 @@
namespace KHotKeys
{
-VoiceRecordPage::VoiceRecordPage( const QString &voiceid_P, QWidget *parent, const char *name)
- : QVBox(parent, name) , _original_voiceId(voiceid_P)
+VoiceRecordPage::VoiceRecordPage( const TQString &voiceid_P, TQWidget *parent, const char *name)
+ : TQVBox(parent, name) , _original_voiceId(voiceid_P)
{
_message = i18n("Enter a code for the sound (e.g. the word you are saying) and record the same word twice.");
- _label = new QLabel(_message, this, "label");
- _label->setAlignment(QLabel::AlignLeft | QLabel::WordBreak |
- QLabel::AlignVCenter);
+ _label = new TQLabel(_message, this, "label");
+ _label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak |
+ TQLabel::AlignVCenter);
_lineEdit = new KLineEdit( this );
_lineEdit->setText(voiceid_P);
Sound s;
- if(voiceid_P!=QString::null)
+ if(voiceid_P!=TQString::null)
{
- QString fileName = locateLocal( "data", "khotkeys/" + voiceid_P + "1.wav" );
+ TQString fileName = locateLocal( "data", "khotkeys/" + voiceid_P + "1.wav" );
s.load(fileName);
}
_recorder1 = new VoiceRecorder(s, voiceid_P, this, "recorder");
- if(voiceid_P!=QString::null)
+ if(voiceid_P!=TQString::null)
{
- QString fileName = locateLocal( "data", "khotkeys/" + voiceid_P + "2.wav" );
+ TQString fileName = locateLocal( "data", "khotkeys/" + voiceid_P + "2.wav" );
s.load(fileName);
}
_recorder2 = new VoiceRecorder(s, voiceid_P, this, "recorder");
@@ -55,13 +55,13 @@ VoiceRecordPage::VoiceRecordPage( const QString &voiceid_P, QWidget *parent, con
//_recorder->setMinimumHeight(150);
//setStretchFactor(_recorder, 1);
- QWidget *spacer = new QWidget(this, "spacer");
+ TQWidget *spacer = new TQWidget(this, "spacer");
setStretchFactor(spacer, 1);
- connect(_recorder1, SIGNAL(recorded(bool)) , this, SLOT(slotChanged()));
- connect(_recorder2, SIGNAL(recorded(bool)) , this, SLOT(slotChanged()));
- connect(_lineEdit , SIGNAL( textChanged (const QString&)) , this , SLOT(slotChanged()));
+ connect(_recorder1, TQT_SIGNAL(recorded(bool)) , this, TQT_SLOT(slotChanged()));
+ connect(_recorder2, TQT_SIGNAL(recorded(bool)) , this, TQT_SLOT(slotChanged()));
+ connect(_lineEdit , TQT_SIGNAL( textChanged (const TQString&)) , this , TQT_SLOT(slotChanged()));
}
@@ -98,7 +98,7 @@ void VoiceRecordPage::slotChanged()
|| (_recorder1->state()==VoiceRecorder::sModified && _recorder2->state()==VoiceRecorder::sModified ) ) );
}
-QString VoiceRecordPage::getVoiceId() const
+TQString VoiceRecordPage::getVoiceId() const
{
return _lineEdit->text();
}
@@ -106,7 +106,7 @@ QString VoiceRecordPage::getVoiceId() const
VoiceSignature VoiceRecordPage::getVoiceSignature(int ech) const
{
VoiceRecorder *recorder= (ech==1) ? _recorder1 : _recorder2 ;
- QString fileName = locateLocal( "data", "khotkeys/" + getVoiceId() + QString::number(ech) + ".wav" );
+ TQString fileName = locateLocal( "data", "khotkeys/" + getVoiceId() + TQString::number(ech) + ".wav" );
Sound s=recorder->sound();
s.save(fileName);
return VoiceSignature(s);
diff --git a/khotkeys/kcontrol/voicerecordpage.h b/khotkeys/kcontrol/voicerecordpage.h
index 13389b9dc..a4a7e4d71 100644
--- a/khotkeys/kcontrol/voicerecordpage.h
+++ b/khotkeys/kcontrol/voicerecordpage.h
@@ -11,7 +11,7 @@
#ifndef VOICE_RECORD_PAGE_H
#define VOICE_RECORD_PAGE_H
-#include <qvbox.h>
+#include <tqvbox.h>
@@ -34,10 +34,10 @@ class VoiceRecordPage : public QVBox
Q_OBJECT
public:
- VoiceRecordPage(const QString &voiceip_P, QWidget *parent, const char *name);
+ VoiceRecordPage(const TQString &voiceip_P, TQWidget *parent, const char *name);
~VoiceRecordPage();
- QString getVoiceId() const ;
+ TQString getVoiceId() const ;
VoiceSignature getVoiceSignature(int) const;
bool isModifiedSignature(int) const;
@@ -51,10 +51,10 @@ class VoiceRecordPage : public QVBox
VoiceRecorder *_recorder1;
VoiceRecorder *_recorder2;
KLineEdit *_lineEdit;
- QLabel *_label;
- QString _message;
+ TQLabel *_label;
+ TQString _message;
- QString _original_voiceId;
+ TQString _original_voiceId;
};
diff --git a/khotkeys/kcontrol/window_trigger_widget.cpp b/khotkeys/kcontrol/window_trigger_widget.cpp
index 882112cce..c897cf14a 100644
--- a/khotkeys/kcontrol/window_trigger_widget.cpp
+++ b/khotkeys/kcontrol/window_trigger_widget.cpp
@@ -16,7 +16,7 @@
#include "window_trigger_widget.h"
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
#include <triggers.h>
#include <actions.h>
@@ -28,19 +28,19 @@
namespace KHotKeys
{
-Window_trigger_widget::Window_trigger_widget( QWidget* parent_P, const char* name_P )
+Window_trigger_widget::Window_trigger_widget( TQWidget* parent_P, const char* name_P )
: Window_trigger_widget_ui( parent_P, name_P )
{
clear_data();
// KHotKeys::Module::changed()
- connect( window_appears_checkbox, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( window_disappears_checkbox, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( window_activates_checkbox, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( window_deactivates_checkbox, SIGNAL( clicked()),
- module, SLOT( changed()));
+ connect( window_appears_checkbox, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( window_disappears_checkbox, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( window_activates_checkbox, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( window_deactivates_checkbox, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
}
void Window_trigger_widget::clear_data()
diff --git a/khotkeys/kcontrol/window_trigger_widget.h b/khotkeys/kcontrol/window_trigger_widget.h
index 02f54df1d..c012a0bca 100644
--- a/khotkeys/kcontrol/window_trigger_widget.h
+++ b/khotkeys/kcontrol/window_trigger_widget.h
@@ -24,7 +24,7 @@ class Window_trigger_widget
{
Q_OBJECT
public:
- Window_trigger_widget( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Window_trigger_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Window_trigger* trigger_P );
Window_trigger* get_data( Action_data* data_P ) const;
public slots:
diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp
index e4dffc9c4..c0bfb1529 100644
--- a/khotkeys/kcontrol/windowdef_list_widget.cpp
+++ b/khotkeys/kcontrol/windowdef_list_widget.cpp
@@ -17,10 +17,10 @@
#include "windowdef_list_widget.h"
#include <assert.h>
-#include <qpushbutton.h>
-#include <qheader.h>
-#include <qlineedit.h>
-#include <qpopupmenu.h>
+#include <tqpushbutton.h>
+#include <tqheader.h>
+#include <tqlineedit.h>
+#include <tqpopupmenu.h>
#include <kdebug.h>
#include <klocale.h>
@@ -37,16 +37,16 @@ namespace KHotKeys
// Windowdef_list_widget
-Windowdef_list_widget::Windowdef_list_widget( QWidget* parent_P, const char* name_P )
+Windowdef_list_widget::Windowdef_list_widget( TQWidget* parent_P, const char* name_P )
: Windowdef_list_widget_ui( parent_P, name_P ), autodetect_object( NULL ),
autodetect_slot( NULL ), selected_item( NULL )
{
- QPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work
+ TQPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work
popup->insertItem( i18n( "Simple Window..." ), TYPE_WINDOWDEF_SIMPLE );
- connect( popup, SIGNAL( activated( int )), SLOT( new_selected( int )));
+ connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
- connect( windows_listview, SIGNAL( doubleClicked ( QListViewItem *, const QPoint &, int ) ),
- this, SLOT( modify_pressed() ) );
+ connect( windows_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+ this, TQT_SLOT( modify_pressed() ) );
new_button->setPopup( popup );
windows_listview->header()->hide();
windows_listview->addColumn( "" );
@@ -57,16 +57,16 @@ Windowdef_list_widget::Windowdef_list_widget( QWidget* parent_P, const char* nam
delete_button->setEnabled( false );
clear_data();
// KHotKeys::Module::changed()
- connect( new_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( copy_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( modify_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( delete_button, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( comment_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
+ connect( new_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( copy_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( modify_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( delete_button, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
}
Windowdef_list_widget::~Windowdef_list_widget()
@@ -100,7 +100,7 @@ Windowdef_list* Windowdef_list_widget::get_data() const
{
// CHECKME TODO hmm, tady to bude chtit asi i children :(
Windowdef_list* list = new Windowdef_list( comment_lineedit->text());
- for( QListViewItem* pos = windows_listview->firstChild();
+ for( TQListViewItem* pos = windows_listview->firstChild();
pos != NULL;
pos = pos->nextSibling())
list->append( static_cast< Windowdef_list_item* >( pos )->window()->copy());
@@ -148,7 +148,7 @@ void Windowdef_list_widget::modify_pressed()
edit_listview_item( selected_item );
}
-void Windowdef_list_widget::current_changed( QListViewItem* item_P )
+void Windowdef_list_widget::current_changed( TQListViewItem* item_P )
{
// if( item_P == selected_item )
// return;
@@ -160,7 +160,7 @@ void Windowdef_list_widget::current_changed( QListViewItem* item_P )
}
Windowdef_list_item* Windowdef_list_widget::create_listview_item( Windowdef* window_P,
- QListView* parent1_P, QListViewItem* parent2_P, QListViewItem* after_P, bool copy_P )
+ TQListView* parent1_P, TQListViewItem* parent2_P, TQListViewItem* after_P, bool copy_P )
{
Windowdef* new_win = copy_P ? window_P->copy() : window_P;
// CHECKME uz by nemelo byt treba
@@ -199,9 +199,9 @@ void Windowdef_list_widget::edit_listview_item( Windowdef_list_item* item_P )
// Windowdef_list_item
-QString Windowdef_list_item::text( int column_P ) const
+TQString Windowdef_list_item::text( int column_P ) const
{
- return column_P == 0 ? window()->description() : QString::null;
+ return column_P == 0 ? window()->description() : TQString::null;
}
Windowdef_list_item::~Windowdef_list_item()
@@ -211,7 +211,7 @@ Windowdef_list_item::~Windowdef_list_item()
// Windowdef_simple_dialog
-Windowdef_simple_dialog::Windowdef_simple_dialog( Windowdef_simple* window_P, QObject* obj_P,
+Windowdef_simple_dialog::Windowdef_simple_dialog( Windowdef_simple* window_P, TQObject* obj_P,
const char* slot_P )
: KDialogBase( NULL, NULL, true, i18n( "Window Details" ), Ok | Cancel ), window( NULL )
{
diff --git a/khotkeys/kcontrol/windowdef_list_widget.h b/khotkeys/kcontrol/windowdef_list_widget.h
index 8a69fc5eb..b49146a85 100644
--- a/khotkeys/kcontrol/windowdef_list_widget.h
+++ b/khotkeys/kcontrol/windowdef_list_widget.h
@@ -11,7 +11,7 @@
#ifndef _WINDOWDEF_LIST_WIDGET_H_
#define _WINDOWDEF_LIST_WIDGET_H_
-#include <qlistview.h>
+#include <tqlistview.h>
#include <kdialogbase.h>
@@ -32,16 +32,16 @@ class Windowdef_list_widget
{
Q_OBJECT
public:
- Windowdef_list_widget( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Windowdef_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
virtual ~Windowdef_list_widget();
void set_data( const Windowdef_list* data_P );
Windowdef_list* get_data() const;
- void set_autodetect( QObject* obj_P, const char* slot_P );
+ void set_autodetect( TQObject* obj_P, const char* slot_P );
public slots:
void clear_data();
protected:
- Windowdef_list_item* create_listview_item( Windowdef* window_P, QListView* parent1_P,
- QListViewItem* parent2_P, QListViewItem* after_P, bool copy_P );
+ Windowdef_list_item* create_listview_item( Windowdef* window_P, TQListView* parent1_P,
+ TQListViewItem* parent2_P, TQListViewItem* after_P, bool copy_P );
void edit_listview_item( Windowdef_list_item* item_P );
enum type_t { TYPE_WINDOWDEF_SIMPLE };
protected slots:
@@ -49,9 +49,9 @@ class Windowdef_list_widget
virtual void copy_pressed();
virtual void delete_pressed();
virtual void modify_pressed();
- virtual void current_changed( QListViewItem* item_P );
+ virtual void current_changed( TQListViewItem* item_P );
protected:
- QObject* autodetect_object;
+ TQObject* autodetect_object;
const char* autodetect_slot;
Windowdef_list_item* selected_item;
};
@@ -62,12 +62,12 @@ class Windowdef_list_item
: public QListViewItem
{
public:
- Windowdef_list_item( QListView* parent_P, Windowdef* window_P );
- Windowdef_list_item( QListViewItem* parent_P, Windowdef* window_P );
- Windowdef_list_item( QListView* parent_P, QListViewItem* after_P, Windowdef* window_P );
- Windowdef_list_item( QListViewItem* parent_P, QListViewItem* after_P, Windowdef* window_P );
+ Windowdef_list_item( TQListView* parent_P, Windowdef* window_P );
+ Windowdef_list_item( TQListViewItem* parent_P, Windowdef* window_P );
+ Windowdef_list_item( TQListView* parent_P, TQListViewItem* after_P, Windowdef* window_P );
+ Windowdef_list_item( TQListViewItem* parent_P, TQListViewItem* after_P, Windowdef* window_P );
virtual ~Windowdef_list_item();
- virtual QString text( int column_P ) const;
+ virtual TQString text( int column_P ) const;
Windowdef* window() const;
void set_window( Windowdef* window_P );
protected:
@@ -86,7 +86,7 @@ class Windowdef_simple_dialog
{
Q_OBJECT
public:
- Windowdef_simple_dialog( Windowdef_simple* window_P, QObject* obj_P, const char* slot_P );
+ Windowdef_simple_dialog( Windowdef_simple* window_P, TQObject* obj_P, const char* slot_P );
virtual Windowdef* edit_windowdef();
protected:
virtual void accept();
@@ -101,7 +101,7 @@ class Windowdef_simple_dialog
// Windowdef_list_widget
inline
-void Windowdef_list_widget::set_autodetect( QObject* obj_P, const char* slot_P )
+void Windowdef_list_widget::set_autodetect( TQObject* obj_P, const char* slot_P )
{
autodetect_object = obj_P;
autodetect_slot = slot_P;
@@ -110,28 +110,28 @@ void Windowdef_list_widget::set_autodetect( QObject* obj_P, const char* slot_P )
// Windowdef_list_item
inline
-Windowdef_list_item::Windowdef_list_item( QListView* parent_P, Windowdef* window_P )
- : QListViewItem( parent_P ), _window( window_P )
+Windowdef_list_item::Windowdef_list_item( TQListView* parent_P, Windowdef* window_P )
+ : TQListViewItem( parent_P ), _window( window_P )
{
}
inline
-Windowdef_list_item::Windowdef_list_item( QListViewItem* parent_P, Windowdef* window_P )
- : QListViewItem( parent_P ), _window( window_P )
+Windowdef_list_item::Windowdef_list_item( TQListViewItem* parent_P, Windowdef* window_P )
+ : TQListViewItem( parent_P ), _window( window_P )
{
}
inline
-Windowdef_list_item::Windowdef_list_item( QListView* parent_P, QListViewItem* after_P,
+Windowdef_list_item::Windowdef_list_item( TQListView* parent_P, TQListViewItem* after_P,
Windowdef* window_P )
- : QListViewItem( parent_P, after_P ), _window( window_P )
+ : TQListViewItem( parent_P, after_P ), _window( window_P )
{
}
inline
-Windowdef_list_item::Windowdef_list_item( QListViewItem* parent_P, QListViewItem* after_P,
+Windowdef_list_item::Windowdef_list_item( TQListViewItem* parent_P, TQListViewItem* after_P,
Windowdef* window_P )
- : QListViewItem( parent_P, after_P ), _window( window_P )
+ : TQListViewItem( parent_P, after_P ), _window( window_P )
{
}
diff --git a/khotkeys/kcontrol/windowdef_simple_widget.cpp b/khotkeys/kcontrol/windowdef_simple_widget.cpp
index f0749e476..f79d81ea1 100644
--- a/khotkeys/kcontrol/windowdef_simple_widget.cpp
+++ b/khotkeys/kcontrol/windowdef_simple_widget.cpp
@@ -16,10 +16,10 @@
#include "windowdef_simple_widget.h"
-#include <qlineedit.h>
-#include <qcombobox.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
+#include <tqcheckbox.h>
+#include <tqpushbutton.h>
#include <kdebug.h>
#include <windows.h>
@@ -31,37 +31,37 @@
namespace KHotKeys
{
-Windowdef_simple_widget::Windowdef_simple_widget( QWidget* parent_P, const char* name_P )
+Windowdef_simple_widget::Windowdef_simple_widget( TQWidget* parent_P, const char* name_P )
: Windowdef_simple_widget_ui( parent_P, name_P )
{
window_title_lineedit->setEnabled( false );
window_class_lineedit->setEnabled( false );
window_role_lineedit->setEnabled( false );
- connect( autodetect_button, SIGNAL( clicked()), SLOT( autodetect_clicked()));
+ connect( autodetect_button, TQT_SIGNAL( clicked()), TQT_SLOT( autodetect_clicked()));
clear_data();
// KHotKeys::Module::changed()
- connect( window_title_combo, SIGNAL( activated( int )),
- module, SLOT( changed()));
- connect( window_title_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
- connect( window_class_combo, SIGNAL( activated( int )),
- module, SLOT( changed()));
- connect( window_class_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
- connect( window_role_combo, SIGNAL( activated( int )),
- module, SLOT( changed()));
- connect( window_role_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
- connect( type_normal_checkbox, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( type_dialog_checkbox, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( type_dock_checkbox, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( type_desktop_checkbox, SIGNAL( clicked()),
- module, SLOT( changed()));
- connect( comment_lineedit, SIGNAL( textChanged( const QString& )),
- module, SLOT( changed()));
+ connect( window_title_combo, TQT_SIGNAL( activated( int )),
+ module, TQT_SLOT( changed()));
+ connect( window_title_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
+ connect( window_class_combo, TQT_SIGNAL( activated( int )),
+ module, TQT_SLOT( changed()));
+ connect( window_class_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
+ connect( window_role_combo, TQT_SIGNAL( activated( int )),
+ module, TQT_SLOT( changed()));
+ connect( window_role_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
+ connect( type_normal_checkbox, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( type_dialog_checkbox, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( type_dock_checkbox, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( type_desktop_checkbox, TQT_SIGNAL( clicked()),
+ module, TQT_SLOT( changed()));
+ connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
+ module, TQT_SLOT( changed()));
}
void Windowdef_simple_widget::clear_data()
@@ -142,11 +142,11 @@ void Windowdef_simple_widget::window_title_combo_changed( int item_P )
window_title_lineedit->setEnabled( item_P != 0 );
}
-void Windowdef_simple_widget::set_autodetect( QObject* obj_P, const char* slot_P )
+void Windowdef_simple_widget::set_autodetect( TQObject* obj_P, const char* slot_P )
{
- disconnect( SIGNAL( autodetect_signal()));
+ disconnect( TQT_SIGNAL( autodetect_signal()));
if( obj_P != NULL )
- connect( this, SIGNAL( autodetect_signal()), obj_P, slot_P );
+ connect( this, TQT_SIGNAL( autodetect_signal()), obj_P, slot_P );
}
void Windowdef_simple_widget::autodetect_clicked()
@@ -157,7 +157,7 @@ void Windowdef_simple_widget::autodetect_clicked()
void Windowdef_simple_widget::autodetect()
{
- WindowSelector* sel = new WindowSelector( this, SLOT( autodetect_window_selected( WId )));
+ WindowSelector* sel = new WindowSelector( this, TQT_SLOT( autodetect_window_selected( WId )));
sel->select();
}
diff --git a/khotkeys/kcontrol/windowdef_simple_widget.h b/khotkeys/kcontrol/windowdef_simple_widget.h
index e6777b6ee..26db6fd87 100644
--- a/khotkeys/kcontrol/windowdef_simple_widget.h
+++ b/khotkeys/kcontrol/windowdef_simple_widget.h
@@ -24,10 +24,10 @@ class Windowdef_simple_widget
{
Q_OBJECT
public:
- Windowdef_simple_widget( QWidget* parent_P = NULL, const char* name_P = NULL );
+ Windowdef_simple_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
void set_data( const Windowdef_simple* data_P );
Windowdef_simple* get_data() const;
- void set_autodetect( QObject* obj_P, const char* slot_P );
+ void set_autodetect( TQObject* obj_P, const char* slot_P );
public slots:
void clear_data();
protected:
diff --git a/khotkeys/kcontrol/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp
index a754b422d..d6e562df3 100644
--- a/khotkeys/kcontrol/windowselector.cpp
+++ b/khotkeys/kcontrol/windowselector.cpp
@@ -18,7 +18,7 @@
#include "voices.h"
-#include <qcursor.h>
+#include <tqcursor.h>
#include <kdebug.h>
#include <kapplication.h>
#include <X11/Xlib.h>
@@ -27,14 +27,14 @@
namespace KHotKeys
{
-WindowSelector::WindowSelector( QObject* receiver_P, const char* slot_P )
+WindowSelector::WindowSelector( TQObject* receiver_P, const char* slot_P )
{
- connect( this, SIGNAL( selected_signal( WId )), receiver_P, slot_P );
+ connect( this, TQT_SIGNAL( selected_signal( WId )), receiver_P, slot_P );
}
void WindowSelector::select()
{
- kapp->desktop()->grabMouse( QCursor( crossCursor ));
+ kapp->desktop()->grabMouse( TQCursor( crossCursor ));
kapp->installX11EventFilter( this );
}
diff --git a/khotkeys/kcontrol/windowselector.h b/khotkeys/kcontrol/windowselector.h
index 3a28853ed..4f52312ea 100644
--- a/khotkeys/kcontrol/windowselector.h
+++ b/khotkeys/kcontrol/windowselector.h
@@ -11,7 +11,7 @@
#ifndef _WINDOWSELECTOR_H_
#define _WINDOWSELECTOR_H_
-#include <qwidget.h>
+#include <tqwidget.h>
namespace KHotKeys
{
@@ -21,7 +21,7 @@ class WindowSelector
{
Q_OBJECT
public:
- WindowSelector( QObject* receiver, const char* slot );
+ WindowSelector( TQObject* receiver, const char* slot );
void select();
protected:
virtual bool x11Event( XEvent* e );
diff --git a/khotkeys/shared/action_data.cpp b/khotkeys/shared/action_data.cpp
index 96e3e5559..472259268 100644
--- a/khotkeys/shared/action_data.cpp
+++ b/khotkeys/shared/action_data.cpp
@@ -25,8 +25,8 @@ namespace KHotKeys
// Action_data_base
-Action_data_base::Action_data_base( Action_data_group* parent_P, const QString& name_P,
- const QString& comment_P, Condition_list* conditions_P, bool enabled_P )
+Action_data_base::Action_data_base( Action_data_group* parent_P, const TQString& name_P,
+ const TQString& comment_P, Condition_list* conditions_P, bool enabled_P )
: _parent( parent_P ), _conditions( conditions_P ), _name( name_P ), _comment( comment_P ),
_enabled( enabled_P )
{
@@ -39,7 +39,7 @@ Action_data_base::Action_data_base( Action_data_group* parent_P, const QString&
Action_data_base::Action_data_base( KConfig& cfg_P, Action_data_group* parent_P )
: _parent( parent_P )
{
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
_name = cfg_P.readEntry( "Name" );
_comment = cfg_P.readEntry( "Comment" );
_enabled = cfg_P.readBoolEntry( "Enabled", true );
@@ -64,7 +64,7 @@ void Action_data_base::cfg_write( KConfig& cfg_P ) const
cfg_P.writeEntry( "Name", name());
cfg_P.writeEntry( "Comment", comment());
cfg_P.writeEntry( "Enabled", enabled( true ));
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
cfg_P.setGroup( save_cfg_group + "Conditions" );
assert( conditions() != NULL );
conditions()->cfg_write( cfg_P );
@@ -74,7 +74,7 @@ void Action_data_base::cfg_write( KConfig& cfg_P ) const
Action_data_base* Action_data_base::create_cfg_read( KConfig& cfg_P, Action_data_group* parent_P )
{
- QString type = cfg_P.readEntry( "Type" );
+ TQString type = cfg_P.readEntry( "Type" );
if( type == "ACTION_DATA_GROUP" )
{
if( cfg_P.readBoolEntry( "AllowMerge", false ))
@@ -169,7 +169,7 @@ void Action_data_group::update_triggers()
Action_data::Action_data( KConfig& cfg_P, Action_data_group* parent_P )
: Action_data_base( cfg_P, parent_P )
{
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
cfg_P.setGroup( save_cfg_group + "Triggers" );
_triggers = new Trigger_list( cfg_P, this );
cfg_P.setGroup( save_cfg_group + "Actions" );
@@ -188,7 +188,7 @@ Action_data::~Action_data()
void Action_data::cfg_write( KConfig& cfg_P ) const
{
Action_data_base::cfg_write( cfg_P );
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
cfg_P.setGroup( save_cfg_group + "Triggers" );
triggers()->cfg_write( cfg_P );
cfg_P.setGroup( save_cfg_group + "Actions" );
@@ -286,8 +286,8 @@ void Generic_action_data::cfg_write( KConfig& cfg_P ) const
// Command_url_shortcut_action_data
Command_url_shortcut_action_data::Command_url_shortcut_action_data( Action_data_group* parent_P,
- const QString& name_P, const QString& comment_P,
- const KShortcut& shortcut_P, const QString& command_url_P, bool enabled_P )
+ const TQString& name_P, const TQString& comment_P,
+ const KShortcut& shortcut_P, const TQString& command_url_P, bool enabled_P )
: Simple_action_data< Shortcut_trigger, Command_url_action >( parent_P, name_P,
comment_P, enabled_P )
{
@@ -306,8 +306,8 @@ void Simple_action_data< Shortcut_trigger, Command_url_action >
// Menuentry_shortcut_action_data
Menuentry_shortcut_action_data::Menuentry_shortcut_action_data( Action_data_group* parent_P,
- const QString& name_P, const QString& comment_P,
- const KShortcut& shortcut_P, const QString& menuentry_P, bool enabled_P )
+ const TQString& name_P, const TQString& comment_P,
+ const KShortcut& shortcut_P, const TQString& menuentry_P, bool enabled_P )
: Simple_action_data< Shortcut_trigger, Menuentry_action >( parent_P, name_P,
comment_P, enabled_P )
{
diff --git a/khotkeys/shared/action_data.h b/khotkeys/shared/action_data.h
index 9d6018c2c..4de5e715b 100644
--- a/khotkeys/shared/action_data.h
+++ b/khotkeys/shared/action_data.h
@@ -12,8 +12,8 @@
#define _ACTION_DATA_H_
#include <assert.h>
-#include <qstring.h>
-#include <qptrlist.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
#include <kdebug.h>
@@ -34,8 +34,8 @@ class Action_data_group;
class KDE_EXPORT Action_data_base
{
public:
- Action_data_base( Action_data_group* parent_P, const QString& name_P,
- const QString& comment_P, Condition_list* condition_P, bool enabled_P );
+ Action_data_base( Action_data_group* parent_P, const TQString& name_P,
+ const TQString& comment_P, Condition_list* condition_P, bool enabled_P );
Action_data_base( KConfig& cfg_P, Action_data_group* parent_P );
virtual ~Action_data_base();
virtual void cfg_write( KConfig& cfg_P ) const = 0;
@@ -44,9 +44,9 @@ class KDE_EXPORT Action_data_base
void reparent( Action_data_group* new_parent_P );
virtual void update_triggers() = 0;
bool conditions_match() const;
- const QString& name() const;
- void set_name( const QString& name_P );
- const QString& comment() const;
+ const TQString& name() const;
+ void set_name( const TQString& name_P );
+ const TQString& comment() const;
bool enabled( bool ignore_group_P ) const;
static Action_data_base* create_cfg_read( KConfig& cfg_P, Action_data_group* parent_P );
static bool cfg_is_enabled( KConfig& cfg_P );
@@ -55,8 +55,8 @@ class KDE_EXPORT Action_data_base
private:
Action_data_group* _parent;
Condition_list* _conditions;
- QString _name;
- QString _comment;
+ TQString _name;
+ TQString _comment;
bool _enabled; // is not really important, only used in conf. module and when reading cfg. file
KHOTKEYS_DISABLE_COPY( Action_data_base );
};
@@ -67,20 +67,20 @@ class KDE_EXPORT Action_data_group
public:
enum system_group_t { SYSTEM_NONE, SYSTEM_MENUENTRIES,
SYSTEM_ROOT, /* last one*/ SYSTEM_MAX }; // don't remove entries
- Action_data_group( Action_data_group* parent_P, const QString& name_P,
- const QString& comment_P, Condition_list* conditions_P, system_group_t system_group_P,
+ Action_data_group( Action_data_group* parent_P, const TQString& name_P,
+ const TQString& comment_P, Condition_list* conditions_P, system_group_t system_group_P,
bool enabled_P );
Action_data_group( KConfig& cfg_P, Action_data_group* parent_P );
virtual ~Action_data_group();
virtual void update_triggers();
virtual void cfg_write( KConfig& cfg_P ) const;
- typedef QPtrListIterator< Action_data_base > Iterator; // CHECKME neni const :(
+ typedef TQPtrListIterator< Action_data_base > Iterator; // CHECKME neni const :(
Iterator first_child() const;
bool is_system_group() const;
system_group_t system_group() const;
using Action_data_base::set_conditions; // make public
protected:
- QPtrList< Action_data_base > list;
+ TQPtrList< Action_data_base > list;
system_group_t _system_group; // e.g. menuedit entries, can't be deleted or renamed
friend class Action_data_base; // CHECKME
void add_child( Action_data_base* child_P );
@@ -93,8 +93,8 @@ class KDE_EXPORT Action_data
{
typedef Action_data_base base;
public:
- Action_data( Action_data_group* parent_P, const QString& name_P,
- const QString& comment_P, Trigger_list* triggers_P, Condition_list* conditions_P,
+ Action_data( Action_data_group* parent_P, const TQString& name_P,
+ const TQString& comment_P, Trigger_list* triggers_P, Condition_list* conditions_P,
Action_list* actions_P, bool enabled_P = true );
Action_data( KConfig& cfg_P, Action_data_group* parent_P );
virtual ~Action_data();
@@ -126,8 +126,8 @@ class KDE_EXPORT Generic_action_data
{
typedef Action_data base;
public:
- Generic_action_data( Action_data_group* parent_P, const QString& name_P,
- const QString& comment_P, Trigger_list* triggers_P, Condition_list* conditions_P,
+ Generic_action_data( Action_data_group* parent_P, const TQString& name_P,
+ const TQString& comment_P, Trigger_list* triggers_P, Condition_list* conditions_P,
Action_list* actions_P, bool enabled_P = true );
Generic_action_data( KConfig& cfg_P, Action_data_group* parent_P );
virtual void cfg_write( KConfig& cfg_P ) const;
@@ -146,8 +146,8 @@ class KDE_EXPORT Simple_action_data
{
typedef Action_data base;
public:
- Simple_action_data( Action_data_group* parent_P, const QString& name_P,
- const QString& comment_P, bool enabled_P = true );
+ Simple_action_data( Action_data_group* parent_P, const TQString& name_P,
+ const TQString& comment_P, bool enabled_P = true );
Simple_action_data( KConfig& cfg_P, Action_data_group* parent_P );
const A* action() const;
const T* trigger() const;
@@ -162,10 +162,10 @@ class KDE_EXPORT Command_url_shortcut_action_data
{
typedef Simple_action_data< Shortcut_trigger, Command_url_action > base;
public:
- Command_url_shortcut_action_data( Action_data_group* parent_P, const QString& name_P,
- const QString& comment_P, bool enabled_P = true );
- Command_url_shortcut_action_data( Action_data_group* parent_P, const QString& name_P,
- const QString& comment_P, const KShortcut& shortcut_P, const QString& command_url_P,
+ Command_url_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P,
+ const TQString& comment_P, bool enabled_P = true );
+ Command_url_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P,
+ const TQString& comment_P, const KShortcut& shortcut_P, const TQString& command_url_P,
bool enabled_P = true );
Command_url_shortcut_action_data( KConfig& cfg_P, Action_data_group* parent_P );
};
@@ -175,10 +175,10 @@ class KDE_EXPORT Menuentry_shortcut_action_data
{
typedef Simple_action_data< Shortcut_trigger, Menuentry_action > base;
public:
- Menuentry_shortcut_action_data( Action_data_group* parent_P, const QString& name_P,
- const QString& comment_P, bool enabled_P = true );
- Menuentry_shortcut_action_data( Action_data_group* parent_P, const QString& name_P,
- const QString& comment_P, const KShortcut& shortcut_P, const QString& command_url_P,
+ Menuentry_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P,
+ const TQString& comment_P, bool enabled_P = true );
+ Menuentry_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P,
+ const TQString& comment_P, const KShortcut& shortcut_P, const TQString& command_url_P,
bool enabled_P = true );
Menuentry_shortcut_action_data( KConfig& cfg_P, Action_data_group* parent_P );
};
@@ -194,8 +194,8 @@ class KDE_EXPORT Keyboard_input_gesture_action_data
{
typedef Action_data base;
public:
- Keyboard_input_gesture_action_data( Action_data_group* parent_P, const QString& name_P,
- const QString& comment_P, bool enabled_P = true );
+ Keyboard_input_gesture_action_data( Action_data_group* parent_P, const TQString& name_P,
+ const TQString& comment_P, bool enabled_P = true );
Keyboard_input_gesture_action_data( KConfig& cfg_P, Action_data_group* parent_P );
const Keyboard_input_action* action() const;
// CHECKME kontrola, ze se dava jen jedna akce ?
@@ -233,19 +233,19 @@ Action_data_group* Action_data_base::parent() const
}
inline
-void Action_data_base::set_name( const QString& name_P )
+void Action_data_base::set_name( const TQString& name_P )
{
_name = name_P;
}
inline
-const QString& Action_data_base::name() const
+const TQString& Action_data_base::name() const
{
return _name;
}
inline
-const QString& Action_data_base::comment() const
+const TQString& Action_data_base::comment() const
{
return _comment;
}
@@ -253,8 +253,8 @@ const QString& Action_data_base::comment() const
// Action_data_group
inline
-Action_data_group::Action_data_group( Action_data_group* parent_P, const QString& name_P,
- const QString& comment_P, Condition_list* conditions_P, system_group_t system_group_P,
+Action_data_group::Action_data_group( Action_data_group* parent_P, const TQString& name_P,
+ const TQString& comment_P, Condition_list* conditions_P, system_group_t system_group_P,
bool enabled_P )
: Action_data_base( parent_P, name_P, comment_P, conditions_P, enabled_P ),
_system_group( system_group_P )
@@ -302,8 +302,8 @@ void Action_data_group::remove_child( Action_data_base* child_P )
// Action_data
inline
-Action_data::Action_data( Action_data_group* parent_P, const QString& name_P,
- const QString& comment_P, Trigger_list* triggers_P, Condition_list* conditions_P,
+Action_data::Action_data( Action_data_group* parent_P, const TQString& name_P,
+ const TQString& comment_P, Trigger_list* triggers_P, Condition_list* conditions_P,
Action_list* actions_P, bool enabled_P )
: Action_data_base( parent_P, name_P, comment_P, conditions_P, enabled_P ),
_triggers( triggers_P ), _actions( actions_P )
@@ -327,8 +327,8 @@ const Action_list* Action_data::actions() const
// Generic_action_data
inline
-Generic_action_data::Generic_action_data( Action_data_group* parent_P, const QString& name_P,
- const QString& comment_P, Trigger_list* triggers_P, Condition_list* conditions_P,
+Generic_action_data::Generic_action_data( Action_data_group* parent_P, const TQString& name_P,
+ const TQString& comment_P, Trigger_list* triggers_P, Condition_list* conditions_P,
Action_list* actions_P, bool enabled_P )
: Action_data( parent_P, name_P, comment_P, triggers_P, conditions_P, actions_P, enabled_P )
{
@@ -345,7 +345,7 @@ Generic_action_data::Generic_action_data( KConfig& cfg_P, Action_data_group* par
template< typename T, typename A >
inline
Simple_action_data< T, A >::Simple_action_data( Action_data_group* parent_P,
- const QString& name_P, const QString& comment_P, bool enabled_P )
+ const TQString& name_P, const TQString& comment_P, bool enabled_P )
: Action_data( parent_P, name_P, comment_P, NULL,
new Condition_list( "", this ), NULL, enabled_P )
{
@@ -394,7 +394,7 @@ const T* Simple_action_data< T, A >::trigger() const
inline
Command_url_shortcut_action_data::Command_url_shortcut_action_data( Action_data_group* parent_P,
- const QString& name_P, const QString& comment_P, bool enabled_P )
+ const TQString& name_P, const TQString& comment_P, bool enabled_P )
: Simple_action_data< Shortcut_trigger, Command_url_action >( parent_P, name_P,
comment_P, enabled_P )
{
@@ -411,7 +411,7 @@ Command_url_shortcut_action_data::Command_url_shortcut_action_data( KConfig& cfg
inline
Menuentry_shortcut_action_data::Menuentry_shortcut_action_data( Action_data_group* parent_P,
- const QString& name_P, const QString& comment_P, bool enabled_P )
+ const TQString& name_P, const TQString& comment_P, bool enabled_P )
: Simple_action_data< Shortcut_trigger, Menuentry_action >( parent_P, name_P,
comment_P, enabled_P )
{
@@ -428,7 +428,7 @@ Menuentry_shortcut_action_data::Menuentry_shortcut_action_data( KConfig& cfg_P,
inline
Keyboard_input_gesture_action_data::Keyboard_input_gesture_action_data(
- Action_data_group* parent_P, const QString& name_P, const QString& comment_P, bool enabled_P )
+ Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, bool enabled_P )
: Action_data( parent_P, name_P, comment_P, NULL,
new Condition_list( "", this ), NULL, enabled_P )
{
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp
index 144a277af..e37ef395f 100644
--- a/khotkeys/shared/actions.cpp
+++ b/khotkeys/shared/actions.cpp
@@ -42,7 +42,7 @@ namespace KHotKeys
Action* Action::create_cfg_read( KConfig& cfg_P, Action_data* data_P )
{
- QString type = cfg_P.readEntry( "Type" );
+ TQString type = cfg_P.readEntry( "Type" );
if( type == "COMMAND_URL" )
return new Command_url_action( cfg_P, data_P );
if( type == "MENUENTRY" )
@@ -65,16 +65,16 @@ void Action::cfg_write( KConfig& cfg_P ) const
// Action_list
Action_list::Action_list( KConfig& cfg_P, Action_data* data_P )
- : QPtrList< Action >()
+ : TQPtrList< Action >()
{
setAutoDelete( true );
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
int cnt = cfg_P.readNumEntry( "ActionsCount", 0 );
for( int i = 0;
i < cnt;
++i )
{
- cfg_P.setGroup( save_cfg_group + QString::number( i ));
+ cfg_P.setGroup( save_cfg_group + TQString::number( i ));
Action* action = Action::create_cfg_read( cfg_P, data_P );
if( action )
append( action );
@@ -84,13 +84,13 @@ Action_list::Action_list( KConfig& cfg_P, Action_data* data_P )
void Action_list::cfg_write( KConfig& cfg_P ) const
{
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
int i = 0;
for( Iterator it( *this );
it;
++it, ++i )
{
- cfg_P.setGroup( save_cfg_group + QString::number( i ));
+ cfg_P.setGroup( save_cfg_group + TQString::number( i ));
it.current()->cfg_write( cfg_P );
}
cfg_P.setGroup( save_cfg_group );
@@ -117,7 +117,7 @@ void Command_url_action::execute()
if( command_url().isEmpty())
return;
KURIFilterData uri;
- QString cmd = command_url();
+ TQString cmd = command_url();
static bool sm_ready = false;
if( !sm_ready )
{
@@ -176,7 +176,7 @@ void Command_url_action::execute()
timeout.start( 1000, true ); // 1sec timeout
}
-QString Command_url_action::description() const
+TQString Command_url_action::description() const
{
return i18n( "Command/URL : " ) + command_url();
}
@@ -212,10 +212,10 @@ void Menuentry_action::execute()
timeout.start( 1000, true ); // 1sec timeout
}
-QString Menuentry_action::description() const
+TQString Menuentry_action::description() const
{
(void) service();
- return i18n( "Menuentry : " ) + (_service ? _service->name() : QString::null);
+ return i18n( "Menuentry : " ) + (_service ? _service->name() : TQString::null);
}
Action* Menuentry_action::copy( Action_data* data_P ) const
@@ -248,8 +248,8 @@ void Dcop_action::execute()
{
if( app.isEmpty() || obj.isEmpty() || call.isEmpty())
return;
- QStringList args_list;
- QString args_str = args;
+ TQStringList args_list;
+ TQString args_str = args;
while( !args_str.isEmpty())
{
unsigned int pos = 0;
@@ -257,8 +257,8 @@ void Dcop_action::execute()
++pos;
if( args_str[ pos ] == '\"' || args_str[ pos ] == '\'' )
{
- QString val = "";
- QChar sep = args_str[ pos ];
+ TQString val = "";
+ TQChar sep = args_str[ pos ];
bool skip = false;
++pos;
for(;
@@ -297,7 +297,7 @@ void Dcop_action::execute()
proc.start( KProcess::DontCare );
}
-QString Dcop_action::description() const
+TQString Dcop_action::description() const
{
return i18n( "DCOP : " ) + remote_application() + "::" + remote_object() + "::"
+ called_function();
@@ -317,7 +317,7 @@ Keyboard_input_action::Keyboard_input_action( KConfig& cfg_P, Action_data* data_
_input = cfg_P.readEntry( "Input" );
if( cfg_P.readBoolEntry( "IsDestinationWindow" ))
{
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
cfg_P.setGroup( save_cfg_group + "DestinationWindow" );
_dest_window = new Windowdef_list( cfg_P );
_active_window = false; // ignored with _dest_window set anyway
@@ -343,7 +343,7 @@ void Keyboard_input_action::cfg_write( KConfig& cfg_P ) const
if( dest_window() != NULL )
{
cfg_P.writeEntry( "IsDestinationWindow", true );
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
cfg_P.setGroup( save_cfg_group + "DestinationWindow" );
dest_window()->cfg_write( cfg_P );
cfg_P.setGroup( save_cfg_group );
@@ -374,23 +374,23 @@ void Keyboard_input_action::execute()
int last_index = -1, start = 0;
while(( last_index = input().find( ':', last_index + 1 )) != -1 ) // find next ';'
{
- QString key = input().mid( start, last_index - start ).stripWhiteSpace();
+ TQString key = input().mid( start, last_index - start ).stripWhiteSpace();
if( key == "Enter" && KKey( key ).keyCodeQt() == 0 )
key = "Return"; // CHECKE hack
keyboard_handler->send_macro_key( KKey( key ), w );
start = last_index + 1;
}
// and the last one
- QString key = input().mid( start, input().length()).stripWhiteSpace();
+ TQString key = input().mid( start, input().length()).stripWhiteSpace();
if( key == "Enter" && KKey( key ).keyCodeQt() == 0 )
key = "Return";
keyboard_handler->send_macro_key( KKey( key ), w ); // the rest
XFlush( qt_xdisplay());
}
-QString Keyboard_input_action::description() const
+TQString Keyboard_input_action::description() const
{
- QString tmp = input();
+ TQString tmp = input();
tmp.replace( '\n', ' ' );
tmp.truncate( 30 );
return i18n( "Keyboard input : " ) + tmp;
@@ -407,7 +407,7 @@ Action* Keyboard_input_action::copy( Action_data* data_P ) const
Activate_window_action::Activate_window_action( KConfig& cfg_P, Action_data* data_P )
: Action( cfg_P, data_P )
{
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
cfg_P.setGroup( save_cfg_group + "Window" );
_window = new Windowdef_list( cfg_P );
cfg_P.setGroup( save_cfg_group );
@@ -422,7 +422,7 @@ void Activate_window_action::cfg_write( KConfig& cfg_P ) const
{
base::cfg_write( cfg_P );
cfg_P.writeEntry( "Type", "ACTIVATE_WINDOW" ); // overwrites value set in base::cfg_write()
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
cfg_P.setGroup( save_cfg_group + "Window" );
window()->cfg_write( cfg_P );
cfg_P.setGroup( save_cfg_group );
@@ -437,7 +437,7 @@ void Activate_window_action::execute()
windows_handler->activate_window( win_id );
}
-QString Activate_window_action::description() const
+TQString Activate_window_action::description() const
{
return i18n( "Activate window : " ) + window()->comment();
}
diff --git a/khotkeys/shared/actions.h b/khotkeys/shared/actions.h
index 5295d5be9..828bbdb70 100644
--- a/khotkeys/shared/actions.h
+++ b/khotkeys/shared/actions.h
@@ -12,9 +12,9 @@
#define _ACTIONS_H_
-#include <qstring.h>
-#include <qptrlist.h>
-#include <qtimer.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
+#include <tqtimer.h>
#include <kservice.h>
@@ -37,7 +37,7 @@ class KDE_EXPORT Action
Action( KConfig& cfg_P, Action_data* data_P );
virtual ~Action();
virtual void execute() = 0;
- virtual QString description() const = 0;
+ virtual TQString description() const = 0;
virtual void cfg_write( KConfig& cfg_P ) const;
virtual Action* copy( Action_data* data_P ) const = 0;
static Action* create_cfg_read( KConfig& cfg_P, Action_data* data_P );
@@ -47,16 +47,16 @@ class KDE_EXPORT Action
};
class KDE_EXPORT Action_list
- : public QPtrList< Action >
+ : public TQPtrList< Action >
{
public:
- Action_list( const QString& comment_P ); // CHECKME nebo i data ?
+ Action_list( const TQString& comment_P ); // CHECKME nebo i data ?
Action_list( KConfig& cfg_P, Action_data* data_P );
void cfg_write( KConfig& cfg_P ) const;
- typedef QPtrListIterator< Action > Iterator;
- const QString& comment() const;
+ typedef TQPtrListIterator< Action > Iterator;
+ const TQString& comment() const;
private:
- QString _comment;
+ TQString _comment;
KHOTKEYS_DISABLE_COPY( Action_list );
};
@@ -65,17 +65,17 @@ class KDE_EXPORT Command_url_action
{
typedef Action base;
public:
- Command_url_action( Action_data* data_P, const QString& command_url_P );
+ Command_url_action( Action_data* data_P, const TQString& command_url_P );
Command_url_action( KConfig& cfg_P, Action_data* data_P );
virtual void cfg_write( KConfig& cfg_P ) const;
virtual void execute();
- virtual QString description() const;
- const QString& command_url() const;
+ virtual TQString description() const;
+ const TQString& command_url() const;
virtual Action* copy( Action_data* data_P ) const;
protected:
- QTimer timeout;
+ TQTimer timeout;
private:
- QString _command_url;
+ TQString _command_url;
};
class KDE_EXPORT Menuentry_action
@@ -83,11 +83,11 @@ class KDE_EXPORT Menuentry_action
{
typedef Command_url_action base;
public:
- Menuentry_action( Action_data* data_P, const QString& menuentry_P );
+ Menuentry_action( Action_data* data_P, const TQString& menuentry_P );
Menuentry_action( KConfig& cfg_P, Action_data* data_P );
virtual void cfg_write( KConfig& cfg_P ) const;
virtual void execute();
- virtual QString description() const;
+ virtual TQString description() const;
virtual Action* copy( Action_data* data_P ) const;
KService::Ptr service() const;
private:
@@ -99,22 +99,22 @@ class KDE_EXPORT Dcop_action
{
typedef Action base;
public:
- Dcop_action( Action_data* data_P, const QString& app_P, const QString& obj_P,
- const QString& call_P, const QString& args_P );
+ Dcop_action( Action_data* data_P, const TQString& app_P, const TQString& obj_P,
+ const TQString& call_P, const TQString& args_P );
Dcop_action( KConfig& cfg_P, Action_data* data_P );
virtual void cfg_write( KConfig& cfg_P ) const;
virtual void execute();
- const QString& remote_application() const;
- const QString& remote_object() const;
- const QString& called_function() const;
- const QString& arguments() const;
- virtual QString description() const;
+ const TQString& remote_application() const;
+ const TQString& remote_object() const;
+ const TQString& called_function() const;
+ const TQString& arguments() const;
+ virtual TQString description() const;
virtual Action* copy( Action_data* data_P ) const;
private:
- QString app; // CHECKME QCString ?
- QString obj;
- QString call;
- QString args;
+ TQString app; // CHECKME TQCString ?
+ TQString obj;
+ TQString call;
+ TQString args;
};
class KDE_EXPORT Keyboard_input_action
@@ -122,22 +122,22 @@ class KDE_EXPORT Keyboard_input_action
{
typedef Action base;
public:
- Keyboard_input_action( Action_data* data_P, const QString& input_P,
+ Keyboard_input_action( Action_data* data_P, const TQString& input_P,
const Windowdef_list* dest_window_P, bool active_window_P );
Keyboard_input_action( KConfig& cfg_P, Action_data* data_P );
virtual ~Keyboard_input_action();
virtual void cfg_write( KConfig& cfg_P ) const;
virtual void execute();
- const QString& input() const;
+ const TQString& input() const;
// send to specific window: dest_window != NULL
// send to active window: dest_window == NULL && activeWindow() == true
// send to action window: dest_window == NULL && activeWindow() == false
const Windowdef_list* dest_window() const;
bool activeWindow() const;
- virtual QString description() const;
+ virtual TQString description() const;
virtual Action* copy( Action_data* data_P ) const;
private:
- QString _input;
+ TQString _input;
const Windowdef_list* _dest_window;
bool _active_window;
};
@@ -153,7 +153,7 @@ class KDE_EXPORT Activate_window_action
virtual void cfg_write( KConfig& cfg_P ) const;
virtual void execute();
const Windowdef_list* window() const;
- virtual QString description() const;
+ virtual TQString description() const;
virtual Action* copy( Action_data* data_P ) const;
private:
const Windowdef_list* _window;
@@ -185,14 +185,14 @@ Action::~Action()
// Action_list
inline
-Action_list::Action_list( const QString& comment_P )
- : QPtrList< Action >(), _comment( comment_P )
+Action_list::Action_list( const TQString& comment_P )
+ : TQPtrList< Action >(), _comment( comment_P )
{
setAutoDelete( true );
}
inline
-const QString& Action_list::comment() const
+const TQString& Action_list::comment() const
{
return _comment;
}
@@ -200,13 +200,13 @@ const QString& Action_list::comment() const
// Command_url_action
inline
-Command_url_action::Command_url_action( Action_data* data_P, const QString& command_url_P )
+Command_url_action::Command_url_action( Action_data* data_P, const TQString& command_url_P )
: Action( data_P ), _command_url( command_url_P )
{
}
inline
-const QString& Command_url_action::command_url() const
+const TQString& Command_url_action::command_url() const
{
return _command_url;
}
@@ -214,7 +214,7 @@ const QString& Command_url_action::command_url() const
// Menuentry_action
inline
-Menuentry_action::Menuentry_action( Action_data* data_P, const QString& menuentry_P )
+Menuentry_action::Menuentry_action( Action_data* data_P, const TQString& menuentry_P )
: Command_url_action( data_P, menuentry_P )
{
}
@@ -228,32 +228,32 @@ Menuentry_action::Menuentry_action( KConfig& cfg_P, Action_data* data_P )
// DCOP_action
inline
-Dcop_action::Dcop_action( Action_data* data_P, const QString& app_P, const QString& obj_P,
- const QString& call_P, const QString& args_P )
+Dcop_action::Dcop_action( Action_data* data_P, const TQString& app_P, const TQString& obj_P,
+ const TQString& call_P, const TQString& args_P )
: Action( data_P ), app( app_P ), obj( obj_P ), call( call_P ), args( args_P )
{
}
inline
-const QString& Dcop_action::remote_application() const
+const TQString& Dcop_action::remote_application() const
{
return app;
}
inline
-const QString& Dcop_action::remote_object() const
+const TQString& Dcop_action::remote_object() const
{
return obj;
}
inline
-const QString& Dcop_action::called_function() const
+const TQString& Dcop_action::called_function() const
{
return call;
}
inline
-const QString& Dcop_action::arguments() const
+const TQString& Dcop_action::arguments() const
{
return args;
}
@@ -261,14 +261,14 @@ const QString& Dcop_action::arguments() const
// Keyboard_input_action
inline
-Keyboard_input_action::Keyboard_input_action( Action_data* data_P, const QString& input_P,
+Keyboard_input_action::Keyboard_input_action( Action_data* data_P, const TQString& input_P,
const Windowdef_list* dest_window_P, bool active_window_P )
: Action( data_P ), _input( input_P ), _dest_window( dest_window_P ), _active_window( active_window_P )
{
}
inline
-const QString& Keyboard_input_action::input() const
+const TQString& Keyboard_input_action::input() const
{
return _input;
}
diff --git a/khotkeys/shared/conditions.cpp b/khotkeys/shared/conditions.cpp
index 01d236934..fb819f6c7 100644
--- a/khotkeys/shared/conditions.cpp
+++ b/khotkeys/shared/conditions.cpp
@@ -51,7 +51,7 @@ Condition::Condition( KConfig&, Condition_list_base* parent_P )
Condition* Condition::create_cfg_read( KConfig& cfg_P, Condition_list_base* parent_P )
{
- QString type = cfg_P.readEntry( "Type" );
+ TQString type = cfg_P.readEntry( "Type" );
if( type == "ACTIVE_WINDOW" )
return new Active_window_condition( cfg_P, parent_P );
if( type == "EXISTING_WINDOW" )
@@ -99,7 +99,7 @@ void Condition::debug( int depth_P )
kdDebug( 1217 ) << tmp << description() << ":(" << this << ")" << endl;
}
-void Condition::debug_list( const QPtrList< Condition >& list_P, int depth_P )
+void Condition::debug_list( const TQPtrList< Condition >& list_P, int depth_P )
{
char tmp[ 1024 ];
int i;
@@ -108,7 +108,7 @@ void Condition::debug_list( const QPtrList< Condition >& list_P, int depth_P )
++i )
tmp[ i ] = ' ';
tmp[ i ] = '\0';
- for( QPtrListIterator< Condition > it( list_P );
+ for( TQPtrListIterator< Condition > it( list_P );
it;
++it )
(*it)->debug( depth_P + 1 );
@@ -121,13 +121,13 @@ void Condition::debug_list( const QPtrList< Condition >& list_P, int depth_P )
Condition_list_base::Condition_list_base( KConfig& cfg_P, Condition_list_base* parent_P )
: Condition( parent_P )
{
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
int cnt = cfg_P.readNumEntry( "ConditionsCount", 0 );
for( int i = 0;
i < cnt;
++i )
{
- cfg_P.setGroup( save_cfg_group + QString::number( i ));
+ cfg_P.setGroup( save_cfg_group + TQString::number( i ));
(void) Condition::create_cfg_read( cfg_P, this );
}
cfg_P.setGroup( save_cfg_group );
@@ -145,13 +145,13 @@ Condition_list_base::~Condition_list_base()
void Condition_list_base::cfg_write( KConfig& cfg_P ) const
{
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
int i = 0;
for( Iterator it( *this );
it;
++it, ++i )
{
- cfg_P.setGroup( save_cfg_group + QString::number( i ));
+ cfg_P.setGroup( save_cfg_group + TQString::number( i ));
it.current()->cfg_write( cfg_P );
}
cfg_P.setGroup( save_cfg_group );
@@ -230,10 +230,10 @@ void Condition_list::set_data( Action_data_base* data_P )
data = data_P;
}
-const QString Condition_list::description() const
+const TQString Condition_list::description() const
{
assert( false );
- return QString::null;
+ return TQString::null;
}
Condition_list* Condition_list::copy( Condition_list_base* ) const
@@ -247,7 +247,7 @@ Condition_list* Condition_list::copy( Condition_list_base* ) const
Active_window_condition::Active_window_condition( KConfig& cfg_P, Condition_list_base* parent_P )
: Condition( cfg_P, parent_P )
{
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
cfg_P.setGroup( save_cfg_group + "Window" );
_window = new Windowdef_list( cfg_P );
cfg_P.setGroup( save_cfg_group );
@@ -257,8 +257,8 @@ Active_window_condition::Active_window_condition( KConfig& cfg_P, Condition_list
void Active_window_condition::init()
{
- connect( windows_handler, SIGNAL( active_window_changed( WId )),
- this, SLOT( active_window_changed( WId )));
+ connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )),
+ this, TQT_SLOT( active_window_changed( WId )));
}
bool Active_window_condition::match() const
@@ -276,7 +276,7 @@ void Active_window_condition::set_match()
void Active_window_condition::cfg_write( KConfig& cfg_P ) const
{
base::cfg_write( cfg_P );
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
cfg_P.setGroup( save_cfg_group + "Window" );
window()->cfg_write( cfg_P );
cfg_P.setGroup( save_cfg_group );
@@ -292,7 +292,7 @@ Condition* Active_window_condition::copy( Condition_list_base* parent_P ) const
return new Active_window_condition( window()->copy(), parent_P );
}
-const QString Active_window_condition::description() const
+const TQString Active_window_condition::description() const
{
return i18n( "Active window: " ) + window()->comment();
}
@@ -313,7 +313,7 @@ Active_window_condition::~Active_window_condition()
Existing_window_condition::Existing_window_condition( KConfig& cfg_P, Condition_list_base* parent_P )
: Condition( cfg_P, parent_P )
{
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
cfg_P.setGroup( save_cfg_group + "Window" );
_window = new Windowdef_list( cfg_P );
cfg_P.setGroup( save_cfg_group );
@@ -323,8 +323,8 @@ Existing_window_condition::Existing_window_condition( KConfig& cfg_P, Condition_
void Existing_window_condition::init()
{
- connect( windows_handler, SIGNAL( window_added( WId )), this, SLOT( window_added( WId )));
- connect( windows_handler, SIGNAL( window_removed( WId )), this, SLOT( window_removed( WId )));
+ connect( windows_handler, TQT_SIGNAL( window_added( WId )), this, TQT_SLOT( window_added( WId )));
+ connect( windows_handler, TQT_SIGNAL( window_removed( WId )), this, TQT_SLOT( window_removed( WId )));
}
bool Existing_window_condition::match() const
@@ -345,7 +345,7 @@ void Existing_window_condition::set_match( WId w_P )
void Existing_window_condition::cfg_write( KConfig& cfg_P ) const
{
base::cfg_write( cfg_P );
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
cfg_P.setGroup( save_cfg_group + "Window" );
window()->cfg_write( cfg_P );
cfg_P.setGroup( save_cfg_group );
@@ -361,7 +361,7 @@ Condition* Existing_window_condition::copy( Condition_list_base* parent_P ) cons
return new Existing_window_condition( window()->copy(), parent_P );
}
-const QString Existing_window_condition::description() const
+const TQString Existing_window_condition::description() const
{
return i18n( "Existing window: " ) + window()->comment();
}
@@ -409,7 +409,7 @@ Not_condition* Not_condition::copy( Condition_list_base* parent_P ) const
return ret;
}
-const QString Not_condition::description() const
+const TQString Not_condition::description() const
{
return i18n( "Not_condition", "Not" );
}
@@ -453,7 +453,7 @@ And_condition* And_condition::copy( Condition_list_base* parent_P ) const
return ret;
}
-const QString And_condition::description() const
+const TQString And_condition::description() const
{
return i18n( "And_condition", "And" );
}
@@ -494,7 +494,7 @@ Or_condition* Or_condition::copy( Condition_list_base* parent_P ) const
return ret;
}
-const QString Or_condition::description() const
+const TQString Or_condition::description() const
{
return i18n( "Or_condition", "Or" );
}
diff --git a/khotkeys/shared/conditions.h b/khotkeys/shared/conditions.h
index 59133f4d3..bc0ca5d6e 100644
--- a/khotkeys/shared/conditions.h
+++ b/khotkeys/shared/conditions.h
@@ -11,9 +11,9 @@
#ifndef _CONDITIONS_H_
#define _CONDITIONS_H_
-#include <qobject.h>
-#include <qptrlist.h>
-#include <qstring.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
#include "khotkeysglobal.h"
#include "windows.h"
@@ -39,7 +39,7 @@ class KDE_EXPORT Condition
virtual bool match() const = 0;
virtual void updated() const; // called when the condition changes
virtual void cfg_write( KConfig& cfg_P ) const = 0;
- virtual const QString description() const = 0;
+ virtual const TQString description() const = 0;
virtual Condition* copy( Condition_list_base* parent_P ) const = 0;
const Condition_list_base* parent() const;
Condition_list_base* parent();
@@ -50,18 +50,18 @@ class KDE_EXPORT Condition
};
class KDE_EXPORT Condition_list_base
- : public Condition, public QPtrList< Condition > // inheritance ?
+ : public Condition, public TQPtrList< Condition > // inheritance ?
{
typedef Condition base;
public:
Condition_list_base( Condition_list_base* parent_P );
- Condition_list_base( const QPtrList< Condition >& children_P,
+ Condition_list_base( const TQPtrList< Condition >& children_P,
Condition_list_base* parent_P );
Condition_list_base( KConfig& cfg_P, Condition_list_base* parent_P );
virtual ~Condition_list_base();
virtual void cfg_write( KConfig& cfg_P ) const;
virtual bool accepts_children() const;
- typedef QPtrListIterator< Condition > Iterator;
+ typedef TQPtrListIterator< Condition > Iterator;
};
class KDE_EXPORT Condition_list
@@ -69,23 +69,23 @@ class KDE_EXPORT Condition_list
{
typedef Condition_list_base base;
public:
- Condition_list( const QString& comment_P, Action_data_base* data_P );
+ Condition_list( const TQString& comment_P, Action_data_base* data_P );
Condition_list( KConfig& cfg_P, Action_data_base* data_P );
void cfg_write( KConfig& cfg_P ) const;
Condition_list* copy( Action_data_base* data_P ) const;
virtual bool match() const;
- const QString& comment() const;
+ const TQString& comment() const;
void set_data( Action_data_base* data_P );
virtual void updated() const;
virtual Condition_list* copy( Condition_list_base* parent_P ) const;
- virtual const QString description() const;
+ virtual const TQString description() const;
private:
- QString _comment;
+ TQString _comment;
Action_data_base* data;
};
class KDE_EXPORT Active_window_condition
- : public QObject, public Condition
+ : public TQObject, public Condition
{
Q_OBJECT
typedef Condition base;
@@ -101,7 +101,7 @@ class KDE_EXPORT Active_window_condition
#else
virtual Condition* copy( Condition_list_base* parent_P ) const;
#endif
- virtual const QString description() const;
+ virtual const TQString description() const;
public slots:
void active_window_changed( WId );
private:
@@ -112,7 +112,7 @@ class KDE_EXPORT Active_window_condition
};
class KDE_EXPORT Existing_window_condition
- : public QObject, public Condition
+ : public TQObject, public Condition
{
Q_OBJECT
typedef Condition base;
@@ -128,7 +128,7 @@ class KDE_EXPORT Existing_window_condition
#else
virtual Condition* copy( Condition_list_base* parent_P ) const;
#endif
- virtual const QString description() const;
+ virtual const TQString description() const;
public slots:
void window_added( WId w_P );
void window_removed( WId w_P );
@@ -149,7 +149,7 @@ class KDE_EXPORT Not_condition
virtual bool match() const;
virtual void cfg_write( KConfig& cfg_P ) const;
virtual Not_condition* copy( Condition_list_base* parent_P ) const;
- virtual const QString description() const;
+ virtual const TQString description() const;
const Condition* condition() const;
virtual bool accepts_children() const;
};
@@ -164,7 +164,7 @@ class KDE_EXPORT And_condition
virtual bool match() const;
virtual void cfg_write( KConfig& cfg_P ) const;
virtual And_condition* copy( Condition_list_base* parent_P ) const;
- virtual const QString description() const;
+ virtual const TQString description() const;
};
class KDE_EXPORT Or_condition
@@ -177,7 +177,7 @@ class KDE_EXPORT Or_condition
virtual bool match() const;
virtual void cfg_write( KConfig& cfg_P ) const;
virtual Or_condition* copy( Condition_list_base* parent_P ) const;
- virtual const QString description() const;
+ virtual const TQString description() const;
};
//***************************************************************************
@@ -202,27 +202,27 @@ Condition_list_base* Condition::parent()
inline
Condition_list_base::Condition_list_base( Condition_list_base* parent_P )
- : Condition( parent_P ), QPtrList< Condition >()
+ : Condition( parent_P ), TQPtrList< Condition >()
{
}
inline
-Condition_list_base::Condition_list_base( const QPtrList< Condition >& children_P,
+Condition_list_base::Condition_list_base( const TQPtrList< Condition >& children_P,
Condition_list_base* parent_P )
- : Condition( parent_P ), QPtrList< Condition >( children_P )
+ : Condition( parent_P ), TQPtrList< Condition >( children_P )
{
}
// Condition_list
inline
-Condition_list::Condition_list( const QString& comment_P, Action_data_base* data_P )
+Condition_list::Condition_list( const TQString& comment_P, Action_data_base* data_P )
: Condition_list_base( NULL ), _comment( comment_P ), data( data_P )
{
}
inline
-const QString& Condition_list::comment() const
+const TQString& Condition_list::comment() const
{
return _comment;
}
diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp
index 11cc44e22..60b1d93b4 100644
--- a/khotkeys/shared/gestures.cpp
+++ b/khotkeys/shared/gestures.cpp
@@ -43,15 +43,15 @@ namespace KHotKeys
Gesture* gesture_handler;
-Gesture::Gesture( bool /*enabled_P*/, QObject* parent_P )
+Gesture::Gesture( bool /*enabled_P*/, TQObject* parent_P )
: _enabled( false ), recording( false ), button( 0 ), exclude( NULL )
{
(void) new DeleteObject( this, parent_P );
assert( gesture_handler == NULL );
gesture_handler = this;
- connect( &nostroke_timer, SIGNAL( timeout()), SLOT( stroke_timeout()));
- connect( windows_handler, SIGNAL( active_window_changed( WId )),
- SLOT( active_window_changed( WId )));
+ connect( &nostroke_timer, TQT_SIGNAL( timeout()), TQT_SLOT( stroke_timeout()));
+ connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )),
+ TQT_SLOT( active_window_changed( WId )));
}
Gesture::~Gesture()
@@ -103,23 +103,23 @@ void Gesture::active_window_changed( WId )
update_grab();
}
-void Gesture::register_handler( QObject* receiver_P, const char* slot_P )
+void Gesture::register_handler( TQObject* receiver_P, const char* slot_P )
{
if( handlers.contains( receiver_P ))
return;
handlers[ receiver_P ] = true;
- connect( this, SIGNAL( handle_gesture( const QString&, WId )),
+ connect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )),
receiver_P, slot_P );
if( handlers.count() == 1 )
update_grab();
}
-void Gesture::unregister_handler( QObject* receiver_P, const char* slot_P )
+void Gesture::unregister_handler( TQObject* receiver_P, const char* slot_P )
{
if( !handlers.contains( receiver_P ))
return;
handlers.remove( receiver_P );
- disconnect( this, SIGNAL( handle_gesture( const QString&, WId )),
+ disconnect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )),
receiver_P, slot_P );
if( handlers.count() == 0 )
update_grab();
@@ -150,7 +150,7 @@ bool Gesture::x11Event( XEvent* ev_P )
recording = false;
nostroke_timer.stop();
stroke.record( ev_P->xbutton.x, ev_P->xbutton.y );
- QString gesture( stroke.translate());
+ TQString gesture( stroke.translate());
if( gesture.isEmpty())
{
kdDebug( 1217 ) << "GESTURE: replay" << endl;
diff --git a/khotkeys/shared/gestures.h b/khotkeys/shared/gestures.h
index 4c210528a..d423be8a6 100644
--- a/khotkeys/shared/gestures.h
+++ b/khotkeys/shared/gestures.h
@@ -11,8 +11,8 @@
#ifndef _GESTURES_H_
#define _GESTURES_H_
-#include <qwidget.h>
-#include <qtimer.h>
+#include <tqwidget.h>
+#include <tqtimer.h>
#include <X11/Xlib.h>
#include <fixx11h.h>
@@ -63,25 +63,25 @@ class KDE_EXPORT Stroke
};
class KDE_EXPORT Gesture
- : public QWidget // not QObject because of x11EventFilter()
+ : public TQWidget // not TQObject because of x11EventFilter()
{
Q_OBJECT
public:
- Gesture( bool enabled_P, QObject* parent_P );
+ Gesture( bool enabled_P, TQObject* parent_P );
virtual ~Gesture();
void enable( bool enable_P );
void set_mouse_button( unsigned int button_P );
void set_timeout( int time_P );
void set_exclude( Windowdef_list* windows_P );
- void register_handler( QObject* receiver_P, const char* slot_P );
- void unregister_handler( QObject* receiver_P, const char* slot_P );
+ void register_handler( TQObject* receiver_P, const char* slot_P );
+ void unregister_handler( TQObject* receiver_P, const char* slot_P );
protected:
virtual bool x11Event( XEvent* ev_P );
private slots:
void stroke_timeout();
void active_window_changed( WId window_P );
signals:
- void handle_gesture( const QString &gesture, WId window );
+ void handle_gesture( const TQString &gesture, WId window );
private:
void update_grab();
void grab_mouse( bool grab_P );
@@ -89,27 +89,27 @@ class KDE_EXPORT Gesture
bool _enabled;
Stroke stroke;
int start_x, start_y;
- QTimer nostroke_timer;
+ TQTimer nostroke_timer;
bool recording;
unsigned int button;
int timeout;
WId gesture_window;
Windowdef_list* exclude;
- QMap< QObject*, bool > handlers; // bool is just a dummy
+ TQMap< TQObject*, bool > handlers; // bool is just a dummy
};
-// Gesture class must be QWidget derived because of x11Event()
-// but it should be QObject owned -> use a QObject proxy that will delete it
+// Gesture class must be TQWidget derived because of x11Event()
+// but it should be TQObject owned -> use a TQObject proxy that will delete it
class DeleteObject
: public QObject
{
Q_OBJECT
public:
- DeleteObject( QWidget* widget_P, QObject* parent_P )
- : QObject( parent_P ), widget( widget_P ) {}
+ DeleteObject( TQWidget* widget_P, TQObject* parent_P )
+ : TQObject( parent_P ), widget( widget_P ) {}
virtual ~DeleteObject() { delete widget; }
private:
- QWidget* widget;
+ TQWidget* widget;
};
diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp
index 021dedf93..f9bfec6d3 100644
--- a/khotkeys/shared/input.cpp
+++ b/khotkeys/shared/input.cpp
@@ -17,13 +17,13 @@
#include "input.h"
#include <assert.h>
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kglobalaccel.h>
#include <kdebug.h>
#include <kapplication.h>
#include <kdeversion.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include <kkeynative.h>
#include "khotkeysglobal.h"
@@ -38,8 +38,8 @@ namespace KHotKeys
// Kbd
-Kbd::Kbd( bool grabbing_enabled_P, QObject* parent_P )
- : QObject( parent_P )
+Kbd::Kbd( bool grabbing_enabled_P, TQObject* parent_P )
+ : TQObject( parent_P )
{
assert( keyboard_handler == NULL );
keyboard_handler = this;
@@ -77,7 +77,7 @@ void Kbd::activate_receiver( Kbd_receiver* receiver_P )
if( rcv.active )
return;
rcv.active = true;
- for( QValueList< KShortcut >::ConstIterator it( rcv.shortcuts.begin());
+ for( TQValueList< KShortcut >::ConstIterator it( rcv.shortcuts.begin());
it != rcv.shortcuts.end();
++it )
grab_shortcut( *it );
@@ -89,7 +89,7 @@ void Kbd::deactivate_receiver( Kbd_receiver* receiver_P )
if( !rcv.active )
return;
rcv.active = false;
- for( QValueList< KShortcut >::ConstIterator it( rcv.shortcuts.begin());
+ for( TQValueList< KShortcut >::ConstIterator it( rcv.shortcuts.begin());
it != rcv.shortcuts.end();
++it )
ungrab_shortcut( *it );
@@ -104,14 +104,14 @@ void Kbd::grab_shortcut( const KShortcut& shortcut_P )
grabs[ shortcut_P ] = 1;
#if 0
// CHECKME ugly ugly hack
- QString name = ' ' + QString::number( keycode_P );
+ TQString name = ' ' + TQString::number( keycode_P );
kga->insertItem( "", name, keycode_P );
- kga->connectItem( name, this, SLOT( key_slot( int )));
+ kga->connectItem( name, this, TQT_SLOT( key_slot( int )));
#endif
- QString name = ' ' + shortcut_P.toStringInternal();
- kga->insert( name, name, QString::null, shortcut_P, shortcut_P,
- this, SLOT( key_slot( QString )));
- QTimer::singleShot( 0, this, SLOT( update_connections()));
+ TQString name = ' ' + shortcut_P.toStringInternal();
+ kga->insert( name, name, TQString::null, shortcut_P, shortcut_P,
+ this, TQT_SLOT( key_slot( TQString )));
+ TQTimer::singleShot( 0, this, TQT_SLOT( update_connections()));
}
}
@@ -123,13 +123,13 @@ void Kbd::ungrab_shortcut( const KShortcut& shortcut_P )
{
#if 0
// CHECKME workaround for KGlobalAccel::disconnectItem() not working
- kga->setItemEnabled( ' ' + QString::number( keycode_P ), false );
- // kga->disconnectItem( ' ' + QString::number( keycode_P ), NULL, NULL );
- kga->removeItem( ' ' + QString::number( keycode_P ));
+ kga->setItemEnabled( ' ' + TQString::number( keycode_P ), false );
+ // kga->disconnectItem( ' ' + TQString::number( keycode_P ), NULL, NULL );
+ kga->removeItem( ' ' + TQString::number( keycode_P ));
#endif
kga->remove( ' ' + shortcut_P.toStringInternal());
grabs.remove( shortcut_P );
- QTimer::singleShot( 0, this, SLOT( update_connections()));
+ TQTimer::singleShot( 0, this, TQT_SLOT( update_connections()));
}
}
@@ -138,13 +138,13 @@ void Kbd::update_connections()
kga->updateConnections();
}
-void Kbd::key_slot( QString key_P )
+void Kbd::key_slot( TQString key_P )
{
kdDebug( 1217 ) << "Key pressed:" << key_P << endl;
KShortcut shortcut( key_P );
if( !grabs.contains( shortcut ))
return;
- for( QMap< Kbd_receiver*, Receiver_data >::ConstIterator it = receivers.begin();
+ for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = receivers.begin();
it != receivers.end();
++it )
if( ( *it ).shortcuts.contains( shortcut ) && ( *it ).active
diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h
index 1983bcf0b..22df89284 100644
--- a/khotkeys/shared/input.h
+++ b/khotkeys/shared/input.h
@@ -11,11 +11,11 @@
#ifndef _INPUT_H_
#define _INPUT_H_
-#include <qobject.h>
-#include <qwindowdefs.h>
-#include <qmap.h>
-#include <qwidget.h>
-#include <qvaluelist.h>
+#include <tqobject.h>
+#include <tqwindowdefs.h>
+#include <tqmap.h>
+#include <tqwidget.h>
+#include <tqvaluelist.h>
#include <kshortcut.h>
#include <X11/X.h>
@@ -37,7 +37,7 @@ class Kbd
{
Q_OBJECT
public:
- Kbd( bool grabbing_enabled_P, QObject* parent_P );
+ Kbd( bool grabbing_enabled_P, TQObject* parent_P );
virtual ~Kbd();
void insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P );
void remove_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P );
@@ -49,17 +49,17 @@ class Kbd
void grab_shortcut( const KShortcut& shortcut_P );
void ungrab_shortcut( const KShortcut& shortcut_P );
private slots:
- void key_slot( QString key_P );
+ void key_slot( TQString key_P );
void update_connections();
private:
struct Receiver_data
{
Receiver_data();
- QValueList< KShortcut > shortcuts;
+ TQValueList< KShortcut > shortcuts;
bool active;
};
- QMap< Kbd_receiver*, Receiver_data > receivers;
- QMap< KShortcut, int > grabs;
+ TQMap< Kbd_receiver*, Receiver_data > receivers;
+ TQMap< KShortcut, int > grabs;
KGlobalAccel* kga;
};
diff --git a/khotkeys/shared/khlistbox.cpp b/khotkeys/shared/khlistbox.cpp
index 694fb658b..ff6d96221 100644
--- a/khotkeys/shared/khlistbox.cpp
+++ b/khotkeys/shared/khlistbox.cpp
@@ -21,19 +21,19 @@
namespace KHotKeys
{
-KHListBox::KHListBox( QWidget* parent_P, const char* name_P )
- : QListBox( parent_P, name_P ), saved_current_item( NULL ),
+KHListBox::KHListBox( TQWidget* parent_P, const char* name_P )
+ : TQListBox( parent_P, name_P ), saved_current_item( NULL ),
in_clear( false ), force_select( false )
{
- connect( this, SIGNAL( selectionChanged( QListBoxItem* )),
- SLOT( slot_selection_changed( QListBoxItem* )));
- connect( this, SIGNAL( currentChanged( QListBoxItem* )),
- SLOT( slot_current_changed( QListBoxItem* )));
+ connect( this, TQT_SIGNAL( selectionChanged( TQListBoxItem* )),
+ TQT_SLOT( slot_selection_changed( TQListBoxItem* )));
+ connect( this, TQT_SIGNAL( currentChanged( TQListBoxItem* )),
+ TQT_SLOT( slot_current_changed( TQListBoxItem* )));
// CHECKME grrr
- connect( this, SIGNAL( selectionChanged()),
- SLOT( slot_selection_changed()));
- connect( &insert_select_timer, SIGNAL( timeout()),
- SLOT( slot_insert_select()));
+ connect( this, TQT_SIGNAL( selectionChanged()),
+ TQT_SLOT( slot_selection_changed()));
+ connect( &insert_select_timer, TQT_SIGNAL( timeout()),
+ TQT_SLOT( slot_insert_select()));
}
void KHListBox::slot_selection_changed()
@@ -44,7 +44,7 @@ void KHListBox::slot_selection_changed()
setSelected( saved_current_item, true );
}
-void KHListBox::slot_selection_changed( QListBoxItem* item_P )
+void KHListBox::slot_selection_changed( TQListBoxItem* item_P )
{
if( item_P == saved_current_item )
return;
@@ -53,7 +53,7 @@ void KHListBox::slot_selection_changed( QListBoxItem* item_P )
emit current_changed( saved_current_item );
}
-void KHListBox::slot_current_changed( QListBoxItem* item_P )
+void KHListBox::slot_current_changed( TQListBoxItem* item_P )
{
insert_select_timer.stop();
if( item_P == saved_current_item )
@@ -67,19 +67,19 @@ void KHListBox::slot_current_changed( QListBoxItem* item_P )
void KHListBox::clear()
{
in_clear = true;
- QListBox::clear();
+ TQListBox::clear();
in_clear = false;
slot_selection_changed( NULL );
}
// neni virtual :(( a vubec nefunguje
-void KHListBox::insertItem( QListBoxItem* item_P )
+void KHListBox::insertItem( TQListBoxItem* item_P )
{
bool set = false;
if( !in_clear )
set = count() == 0;
- QListBox::insertItem( item_P );
+ TQListBox::insertItem( item_P );
if( set && force_select )
{
bool block = signalsBlocked();
@@ -90,7 +90,7 @@ void KHListBox::insertItem( QListBoxItem* item_P )
}
}
-// items are often inserted using the QListBoxItem constructor,
+// items are often inserted using the TQListBoxItem constructor,
// which means that a derived class are not yet fully created
void KHListBox::slot_insert_select()
{
diff --git a/khotkeys/shared/khlistbox.h b/khotkeys/shared/khlistbox.h
index 95bd32963..ddb988c36 100644
--- a/khotkeys/shared/khlistbox.h
+++ b/khotkeys/shared/khlistbox.h
@@ -11,7 +11,7 @@
#ifndef _KHLISTBOX_H_
#define _KHLISTBOX_H_
-#include <qtimer.h>
+#include <tqtimer.h>
#include <klistbox.h>
@@ -24,23 +24,23 @@ class KHListBox
Q_OBJECT
Q_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect )
public:
- KHListBox( QWidget* parent_P, const char* name_P = NULL );
+ KHListBox( TQWidget* parent_P, const char* name_P = NULL );
virtual void clear();
- virtual void insertItem( QListBoxItem* item_P );
+ virtual void insertItem( TQListBoxItem* item_P );
bool forceSelect() const;
void setForceSelect( bool force_P );
signals:
- void current_changed( QListBoxItem* item_P );
+ void current_changed( TQListBoxItem* item_P );
private slots:
- void slot_selection_changed( QListBoxItem* item_P );
+ void slot_selection_changed( TQListBoxItem* item_P );
void slot_selection_changed();
- void slot_current_changed( QListBoxItem* item_P );
+ void slot_current_changed( TQListBoxItem* item_P );
void slot_insert_select();
private:
- QListBoxItem* saved_current_item;
+ TQListBoxItem* saved_current_item;
bool in_clear;
bool force_select;
- QTimer insert_select_timer;
+ TQTimer insert_select_timer;
};
//***************************************************************************
diff --git a/khotkeys/shared/khlistview.cpp b/khotkeys/shared/khlistview.cpp
index 45a1d04f9..2afa9db17 100644
--- a/khotkeys/shared/khlistview.cpp
+++ b/khotkeys/shared/khlistview.cpp
@@ -21,19 +21,19 @@
namespace KHotKeys
{
-KHListView::KHListView( QWidget* parent_P, const char* name_P )
+KHListView::KHListView( TQWidget* parent_P, const char* name_P )
: KListView( parent_P, name_P ), saved_current_item( NULL ),
in_clear( false ), ignore( false ), force_select( false )
{
- connect( this, SIGNAL( selectionChanged( QListViewItem* )),
- SLOT( slot_selection_changed( QListViewItem* )));
- connect( this, SIGNAL( currentChanged( QListViewItem* )),
- SLOT( slot_current_changed( QListViewItem* )));
+ connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem* )),
+ TQT_SLOT( slot_selection_changed( TQListViewItem* )));
+ connect( this, TQT_SIGNAL( currentChanged( TQListViewItem* )),
+ TQT_SLOT( slot_current_changed( TQListViewItem* )));
// CHECKME grrr
- connect( this, SIGNAL( selectionChanged()),
- SLOT( slot_selection_changed()));
- connect( &insert_select_timer, SIGNAL( timeout()),
- SLOT( slot_insert_select()));
+ connect( this, TQT_SIGNAL( selectionChanged()),
+ TQT_SLOT( slot_selection_changed()));
+ connect( &insert_select_timer, TQT_SIGNAL( timeout()),
+ TQT_SLOT( slot_insert_select()));
}
void KHListView::slot_selection_changed()
@@ -46,7 +46,7 @@ void KHListView::slot_selection_changed()
setSelected( saved_current_item, true );
}
-void KHListView::slot_selection_changed( QListViewItem* item_P )
+void KHListView::slot_selection_changed( TQListViewItem* item_P )
{
if( ignore )
return;
@@ -57,7 +57,7 @@ void KHListView::slot_selection_changed( QListViewItem* item_P )
emit current_changed( saved_current_item );
}
-void KHListView::slot_current_changed( QListViewItem* item_P )
+void KHListView::slot_current_changed( TQListViewItem* item_P )
{
if( ignore )
return;
@@ -77,7 +77,7 @@ void KHListView::clear()
slot_selection_changed( NULL );
}
-void KHListView::insertItem( QListViewItem* item_P )
+void KHListView::insertItem( TQListViewItem* item_P )
{
bool set = false;
if( !in_clear )
@@ -100,7 +100,7 @@ void KHListView::clearSelection()
slot_current_changed( currentItem());
}
-// items are often inserted using the QListViewItem constructor,
+// items are often inserted using the TQListViewItem constructor,
// which means that a derived class are not yet fully created
void KHListView::slot_insert_select()
{
@@ -109,7 +109,7 @@ void KHListView::slot_insert_select()
slot_current_changed( currentItem());
}
-void KHListView::contentsDropEvent( QDropEvent* e )
+void KHListView::contentsDropEvent( TQDropEvent* e )
{
bool save_ignore = ignore;
ignore = true;
diff --git a/khotkeys/shared/khlistview.h b/khotkeys/shared/khlistview.h
index 69986299d..c475b2d6c 100644
--- a/khotkeys/shared/khlistview.h
+++ b/khotkeys/shared/khlistview.h
@@ -11,7 +11,7 @@
#ifndef _KHLISTVIEW_H_
#define _KHLISTVIEW_H_
-#include <qtimer.h>
+#include <tqtimer.h>
#include <klistview.h>
#include <kdemacros.h>
@@ -25,27 +25,27 @@ class KDE_EXPORT KHListView
Q_OBJECT
Q_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect )
public:
- KHListView( QWidget* parent_P, const char* name_P = NULL );
+ KHListView( TQWidget* parent_P, const char* name_P = NULL );
virtual void clear();
- virtual void insertItem( QListViewItem* item_P );
+ virtual void insertItem( TQListViewItem* item_P );
virtual void clearSelection();
bool forceSelect() const;
void setForceSelect( bool force_P );
signals:
- void current_changed( QListViewItem* item_P );
+ void current_changed( TQListViewItem* item_P );
protected:
- virtual void contentsDropEvent (QDropEvent*);
+ virtual void contentsDropEvent (TQDropEvent*);
private slots:
- void slot_selection_changed( QListViewItem* item_P );
+ void slot_selection_changed( TQListViewItem* item_P );
void slot_selection_changed();
- void slot_current_changed( QListViewItem* item_P );
+ void slot_current_changed( TQListViewItem* item_P );
void slot_insert_select();
private:
- QListViewItem* saved_current_item;
+ TQListViewItem* saved_current_item;
bool in_clear;
bool ignore;
bool force_select;
- QTimer insert_select_timer;
+ TQTimer insert_select_timer;
};
//***************************************************************************
diff --git a/khotkeys/shared/khotkeysglobal.cpp b/khotkeys/shared/khotkeysglobal.cpp
index 2b430fc8c..4c6b8360c 100644
--- a/khotkeys/shared/khotkeysglobal.cpp
+++ b/khotkeys/shared/khotkeysglobal.cpp
@@ -35,7 +35,7 @@ Kbd* keyboard_handler;
Windows* windows_handler;
static bool _khotkeys_active = false;
-void init_global_data( bool active_P, QObject* owner_P )
+void init_global_data( bool active_P, TQObject* owner_P )
{
assert( keyboard_handler == NULL );
assert( windows_handler == NULL );
@@ -59,15 +59,15 @@ bool khotkeys_active()
// does the opposite of KStandardDirs::findResource() i.e. e.g.
// "/opt/kde2/share/applnk/System/konsole.desktop" -> "System/konsole.desktop"
-QString get_menu_entry_from_path( const QString& path_P )
+TQString get_menu_entry_from_path( const TQString& path_P )
{
- QStringList dirs = KGlobal::dirs()->resourceDirs( "apps" );
- for( QStringList::ConstIterator it = dirs.begin();
+ TQStringList dirs = KGlobal::dirs()->resourceDirs( "apps" );
+ for( TQStringList::ConstIterator it = dirs.begin();
it != dirs.end();
++it )
if( path_P.find( *it ) == 0 )
{
- QString ret = path_P;
+ TQString ret = path_P;
ret.remove( 0, (*it).length());
if( ret[ 0 ] == '/' )
ret.remove( 0, 1 );
diff --git a/khotkeys/shared/khotkeysglobal.h b/khotkeys/shared/khotkeysglobal.h
index 873473e0f..9ca469584 100644
--- a/khotkeys/shared/khotkeysglobal.h
+++ b/khotkeys/shared/khotkeysglobal.h
@@ -18,7 +18,7 @@
//#define KHOTKEYS_DEBUG
//#endif
-#include <qstring.h>
+#include <tqstring.h>
#include <klocale.h>
@@ -41,9 +41,9 @@ extern Windows* windows_handler;
KDE_EXPORT bool khotkeys_active();
KDE_EXPORT void khotkeys_set_active( bool active_P );
-QString get_menu_entry_from_path( const QString& path_P );
+TQString get_menu_entry_from_path( const TQString& path_P );
-KDE_EXPORT void init_global_data( bool active_P, QObject* owner_P );
+KDE_EXPORT void init_global_data( bool active_P, TQObject* owner_P );
const char* const MENU_EDITOR_ENTRIES_GROUP_NAME = I18N_NOOP( "Menu Editor entries" );
diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp
index 829c8521a..fdab2be56 100644
--- a/khotkeys/shared/settings.cpp
+++ b/khotkeys/shared/settings.cpp
@@ -60,7 +60,7 @@ bool Settings::read_settings( KConfig& cfg_P, bool include_disabled_P, ImportTyp
already_imported = cfg_P.readListEntry( "AlreadyImported" );
else
{
- QString import_id = cfg_P.readEntry( "ImportId" );
+ TQString import_id = cfg_P.readEntry( "ImportId" );
if( !import_id.isEmpty())
{
if( already_imported.contains( import_id ))
@@ -122,8 +122,8 @@ void Settings::write_settings()
{
KConfig cfg( KHOTKEYS_CONFIG_FILE, false );
// CHECKME smazat stare sekce ?
- QStringList groups = cfg.groupList();
- for( QStringList::ConstIterator it = groups.begin();
+ TQStringList groups = cfg.groupList();
+ for( TQStringList::ConstIterator it = groups.begin();
it != groups.end();
++it )
cfg.deleteGroup( *it );
@@ -157,7 +157,7 @@ void Settings::write_settings()
int Settings::write_actions_recursively_v2( KConfig& cfg_P, Action_data_group* parent_P, bool enabled_P )
{
int enabled_cnt = 0;
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
int cnt = 0;
for( Action_data_group::Iterator it = parent_P->first_child();
it;
@@ -166,7 +166,7 @@ int Settings::write_actions_recursively_v2( KConfig& cfg_P, Action_data_group* p
++cnt;
if( enabled_P && (*it)->enabled( true ))
++enabled_cnt;
- cfg_P.setGroup( save_cfg_group + "_" + QString::number( cnt ));
+ cfg_P.setGroup( save_cfg_group + "_" + TQString::number( cnt ));
( *it )->cfg_write( cfg_P );
Action_data_group* grp = dynamic_cast< Action_data_group* >( *it );
if( grp != NULL )
@@ -186,13 +186,13 @@ void Settings::read_settings_v2( KConfig& cfg_P, bool include_disabled_P )
void Settings::read_actions_recursively_v2( KConfig& cfg_P, Action_data_group* parent_P,
bool include_disabled_P )
{
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
int cnt = cfg_P.readNumEntry( "DataCount" );
for( int i = 1;
i <= cnt;
++i )
{
- cfg_P.setGroup( save_cfg_group + "_" + QString::number( i ));
+ cfg_P.setGroup( save_cfg_group + "_" + TQString::number( i ));
if( include_disabled_P || Action_data_base::cfg_is_enabled( cfg_P ))
{
Action_data_base* new_action = Action_data_base::create_cfg_read( cfg_P, parent_P );
@@ -226,17 +226,17 @@ void Settings::read_settings_v1( KConfig& cfg_P )
sect <= sections;
++sect )
{
- QString group = QString( "Section%1" ).arg( sect );
+ TQString group = TQString( "Section%1" ).arg( sect );
if( !cfg_P.hasGroup( group ))
continue;
cfg_P.setGroup( group );
- QString name = cfg_P.readEntry( "Name" );
+ TQString name = cfg_P.readEntry( "Name" );
if( name.isNull() )
continue;
- QString shortcut = cfg_P.readEntry( "Shortcut" );
+ TQString shortcut = cfg_P.readEntry( "Shortcut" );
if( shortcut.isNull() )
continue;
- QString run = cfg_P.readEntry( "Run" );
+ TQString run = cfg_P.readEntry( "Run" );
if( run.isNull() )
continue;
bool menuentry = cfg_P.readBoolEntry( "MenuEntry", false );
diff --git a/khotkeys/shared/settings.h b/khotkeys/shared/settings.h
index cf05dcd31..fa6754160 100644
--- a/khotkeys/shared/settings.h
+++ b/khotkeys/shared/settings.h
@@ -48,7 +48,7 @@ class KDE_EXPORT Settings
void read_actions_recursively_v2( KConfig& cfg_P, Action_data_group* parent_P,
bool include_disabled_P );
private:
- QStringList already_imported;
+ TQStringList already_imported;
KHOTKEYS_DISABLE_COPY( Settings );
};
diff --git a/khotkeys/shared/sound.cpp b/khotkeys/shared/sound.cpp
index e8d4191eb..c90eb2e02 100644
--- a/khotkeys/shared/sound.cpp
+++ b/khotkeys/shared/sound.cpp
@@ -19,8 +19,8 @@
***************************************************************************/
#include "sound.h"
-#include <qfile.h>
-#include <qdatastream.h>
+#include <tqfile.h>
+#include <tqdatastream.h>
#include <kdebug.h>
@@ -47,18 +47,18 @@ Sound::~Sound()
#define ABS(X) ( (X>0) ? X : -X )
-void Sound::load(const QString& filename)
+void Sound::load(const TQString& filename)
{
kdDebug() << k_funcinfo << filename << endl;
- data=QMemArray<Q_INT32>();
- QFile file(filename);
+ data=TQMemArray<Q_INT32>();
+ TQFile file(filename);
if(!file.open(IO_ReadOnly))
{
kdWarning() << k_funcinfo <<"unable to open file" << endl;
return;
}
- QDataStream stream(&file);
- stream.setByteOrder( QDataStream::LittleEndian );
+ TQDataStream stream(&file);
+ stream.setByteOrder( TQDataStream::LittleEndian );
Q_INT32 magic;
MAGIC("RIFF");
@@ -74,7 +74,7 @@ void Sound::load(const QString& filename)
READ_FROM_STREAM(Q_UINT16,BlockAlign);
READ_FROM_STREAM(Q_UINT16,BitsPerSample);
MAGIC("data");
- READ_FROM_STREAM(QByteArray,SoundData);
+ READ_FROM_STREAM(TQByteArray,SoundData);
NumberOfChannels=1; //Wav i play are broken
file.close();
@@ -105,27 +105,27 @@ void Sound::load(const QString& filename)
}
/* static int q=0;
- QString name="test" + QString::number(q++) + ".wav";
+ TQString name="test" + TQString::number(q++) + ".wav";
save(name);*/
}
#define SMAGIC(CH) { stream << ( Q_INT32) ( (CH)[0] | (CH)[1]<<8 | (CH)[2]<< 16 | (CH)[3] << 24 ) ; }
-void Sound::save(const QString& filename) const
+void Sound::save(const TQString& filename) const
{
kdDebug( 1217 ) << k_funcinfo << filename << " - " << data.size() << endl;
- QFile file(filename);
+ TQFile file(filename);
if(!file.open(IO_WriteOnly))
{
kdWarning() << k_funcinfo <<"unable to open file" << endl;
return;
}
- QDataStream stream(&file);
- stream.setByteOrder( QDataStream::LittleEndian );
+ TQDataStream stream(&file);
+ stream.setByteOrder( TQDataStream::LittleEndian );
- QByteArray SoundData(data.size()*2);
+ TQByteArray SoundData(data.size()*2);
for(unsigned long int f=0;f<data.size();f++)
{
@@ -159,7 +159,7 @@ void Sound::save(const QString& filename) const
//READ_FROM_STREAM(Q_UINT16,BitsPerSample);
stream << (Q_UINT16)(16);
SMAGIC("data");
- //READ_FROM_STREAM(QByteArray,SoundData);
+ //READ_FROM_STREAM(TQByteArray,SoundData);
stream << SoundData;
file.close();
@@ -170,10 +170,10 @@ void Sound::save(const QString& filename) const
#if 0
-void Sound::load(const QString& filename)
+void Sound::load(const TQString& filename)
{
cout << "saout \n";
- data=QMemArray<long unsigned int>();
+ data=TQMemArray<long unsigned int>();
static const int BUFFER_LEN = 4096;
//code from libtunepimp
diff --git a/khotkeys/shared/sound.h b/khotkeys/shared/sound.h
index 1a38f182f..2c2d97d93 100644
--- a/khotkeys/shared/sound.h
+++ b/khotkeys/shared/sound.h
@@ -20,8 +20,8 @@
#ifndef SOUND_H
#define SOUND_H
-#include <qmemarray.h>
-#include <qstring.h>
+#include <tqmemarray.h>
+#include <tqstring.h>
#include <kdemacros.h>
/**
@@ -32,8 +32,8 @@ public:
Sound();
~Sound();
- void load(const QString &filename);
- void save(const QString &filename) const;
+ void load(const TQString &filename);
+ void save(const TQString &filename) const;
unsigned int size() const
{
@@ -50,7 +50,7 @@ public:
return _fs;
}
- QMemArray<Q_INT32> data;
+ TQMemArray<Q_INT32> data;
Q_UINT32 max;
uint _fs;
};
diff --git a/khotkeys/shared/soundrecorder.cpp b/khotkeys/shared/soundrecorder.cpp
index fc2031113..266bbc7ce 100644
--- a/khotkeys/shared/soundrecorder.cpp
+++ b/khotkeys/shared/soundrecorder.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include <klibloader.h>
#include "khotkeysglobal.h"
@@ -47,7 +47,7 @@ bool SoundRecorder::init( KLibrary* lib )
return create_fun != NULL;
}
-SoundRecorder* SoundRecorder::create( QObject* parent, const char* name )
+SoundRecorder* SoundRecorder::create( TQObject* parent, const char* name )
{
#ifdef HAVE_ARTS
if( create_fun != NULL )
@@ -56,7 +56,7 @@ SoundRecorder* SoundRecorder::create( QObject* parent, const char* name )
return new SoundRecorder( parent, name );
}
-SoundRecorder::SoundRecorder(QObject *parent, const char *name) : QObject(parent, name) {}
+SoundRecorder::SoundRecorder(TQObject *parent, const char *name) : TQObject(parent, name) {}
SoundRecorder::~SoundRecorder()
{
diff --git a/khotkeys/shared/soundrecorder.h b/khotkeys/shared/soundrecorder.h
index d9539c4c5..c00f73527 100644
--- a/khotkeys/shared/soundrecorder.h
+++ b/khotkeys/shared/soundrecorder.h
@@ -20,7 +20,7 @@
#ifndef RECORDER_H
#define RECORDER_H
-#include <qobject.h>
+#include <tqobject.h>
#include "sound.h"
#include <kdemacros.h>
@@ -38,7 +38,7 @@ class KDE_EXPORT SoundRecorder : public QObject
{
Q_OBJECT
public:
- static SoundRecorder* create( QObject* parent = 0, const char* name = 0 );
+ static SoundRecorder* create( TQObject* parent = 0, const char* name = 0 );
virtual ~SoundRecorder();
virtual void start();
@@ -51,8 +51,8 @@ signals:
void recorded(const Sound&);
protected:
- SoundRecorder(QObject *parent = 0, const char *name = 0);
- typedef SoundRecorder* (*create_ptr)( QObject*, const char* );
+ SoundRecorder(TQObject *parent = 0, const char *name = 0);
+ typedef SoundRecorder* (*create_ptr)( TQObject*, const char* );
private:
static create_ptr create_fun;
};
diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp
index 1febedfa9..7cac2b98c 100644
--- a/khotkeys/shared/triggers.cpp
+++ b/khotkeys/shared/triggers.cpp
@@ -46,7 +46,7 @@ void Trigger::cfg_write( KConfig& cfg_P ) const
Trigger* Trigger::create_cfg_read( KConfig& cfg_P, Action_data* data_P )
{
- QString type = cfg_P.readEntry( "Type" );
+ TQString type = cfg_P.readEntry( "Type" );
if( type == "SHORTCUT" || type == "SINGLE_SHORTCUT" )
return new Shortcut_trigger( cfg_P, data_P );
if( type == "WINDOW" )
@@ -63,17 +63,17 @@ Trigger* Trigger::create_cfg_read( KConfig& cfg_P, Action_data* data_P )
// Trigger_list
Trigger_list::Trigger_list( KConfig& cfg_P, Action_data* data_P )
- : QPtrList< Trigger >()
+ : TQPtrList< Trigger >()
{
setAutoDelete( true );
_comment = cfg_P.readEntry( "Comment" );
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
int cnt = cfg_P.readNumEntry( "TriggersCount", 0 );
for( int i = 0;
i < cnt;
++i )
{
- cfg_P.setGroup( save_cfg_group + QString::number( i ));
+ cfg_P.setGroup( save_cfg_group + TQString::number( i ));
Trigger* trigger = Trigger::create_cfg_read( cfg_P, data_P );
if( trigger )
append( trigger );
@@ -84,13 +84,13 @@ Trigger_list::Trigger_list( KConfig& cfg_P, Action_data* data_P )
void Trigger_list::cfg_write( KConfig& cfg_P ) const
{
cfg_P.writeEntry( "Comment", comment());
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
int i = 0;
for( Iterator it( *this );
it;
++it, ++i )
{
- cfg_P.setGroup( save_cfg_group + QString::number( i ));
+ cfg_P.setGroup( save_cfg_group + TQString::number( i ));
it.current()->cfg_write( cfg_P );
}
cfg_P.setGroup( save_cfg_group );
@@ -147,7 +147,7 @@ Shortcut_trigger* Shortcut_trigger::copy( Action_data* data_P ) const
return new Shortcut_trigger( data_P ? data_P : data, shortcut());
}
-const QString Shortcut_trigger::description() const
+const TQString Shortcut_trigger::description() const
{
// CHECKME vice mods
return i18n( "Shortcut trigger: " ) + _shortcut.toString();
@@ -179,7 +179,7 @@ Window_trigger::Window_trigger( KConfig& cfg_P, Action_data* data_P )
: Trigger( cfg_P, data_P ), active( false )
{
// kdDebug( 1217 ) << "Window_trigger" << endl;
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
cfg_P.setGroup( save_cfg_group + "Windows" );
_windows = new Windowdef_list( cfg_P );
cfg_P.setGroup( save_cfg_group );
@@ -197,13 +197,13 @@ Window_trigger::~Window_trigger()
void Window_trigger::init()
{
kdDebug( 1217 ) << "Window_trigger::init()" << endl;
- connect( windows_handler, SIGNAL( window_added( WId )), this, SLOT( window_added( WId )));
- connect( windows_handler, SIGNAL( window_removed( WId )), this, SLOT( window_removed( WId )));
+ connect( windows_handler, TQT_SIGNAL( window_added( WId )), this, TQT_SLOT( window_added( WId )));
+ connect( windows_handler, TQT_SIGNAL( window_removed( WId )), this, TQT_SLOT( window_removed( WId )));
if( window_actions & ( WINDOW_ACTIVATES | WINDOW_DEACTIVATES /*| WINDOW_DISAPPEARS*/ ))
- connect( windows_handler, SIGNAL( active_window_changed( WId )),
- this, SLOT( active_window_changed( WId )));
- connect( windows_handler, SIGNAL( window_changed( WId, unsigned int )),
- this, SLOT( window_changed( WId, unsigned int )));
+ connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )),
+ this, TQT_SLOT( active_window_changed( WId )));
+ connect( windows_handler, TQT_SIGNAL( window_changed( WId, unsigned int )),
+ this, TQT_SLOT( window_changed( WId, unsigned int )));
}
void Window_trigger::activate( bool activate_P )
@@ -293,7 +293,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P )
void Window_trigger::cfg_write( KConfig& cfg_P ) const
{
base::cfg_write( cfg_P );
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
cfg_P.setGroup( save_cfg_group + "Windows" );
windows()->cfg_write( cfg_P );
cfg_P.setGroup( save_cfg_group );
@@ -313,14 +313,14 @@ Trigger* Window_trigger::copy( Action_data* data_P ) const
return ret;
}
-const QString Window_trigger::description() const
+const TQString Window_trigger::description() const
{
return i18n( "Window trigger: " ) + windows()->comment();
}
// Gesture_trigger
-Gesture_trigger::Gesture_trigger( Action_data* data_P, const QString &gesturecode_P )
+Gesture_trigger::Gesture_trigger( Action_data* data_P, const TQString &gesturecode_P )
: Trigger( data_P ), _gesturecode( gesturecode_P )
{
}
@@ -333,7 +333,7 @@ Gesture_trigger::Gesture_trigger( KConfig& cfg_P, Action_data* data_P )
Gesture_trigger::~Gesture_trigger()
{
- gesture_handler->unregister_handler( this, SLOT( handle_gesture( const QString&, WId )));
+ gesture_handler->unregister_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId )));
}
void Gesture_trigger::cfg_write( KConfig& cfg_P ) const
@@ -349,12 +349,12 @@ Trigger* Gesture_trigger::copy( Action_data* data_P ) const
return new Gesture_trigger( data_P ? data_P : data, gesturecode());
}
-const QString Gesture_trigger::description() const
+const TQString Gesture_trigger::description() const
{
return i18n( "Gesture trigger: " ) + gesturecode();
}
-void Gesture_trigger::handle_gesture( const QString &gesture_P, WId window_P )
+void Gesture_trigger::handle_gesture( const TQString &gesture_P, WId window_P )
{
if( gesturecode() == gesture_P )
{
@@ -366,15 +366,15 @@ void Gesture_trigger::handle_gesture( const QString &gesture_P, WId window_P )
void Gesture_trigger::activate( bool activate_P )
{
if( activate_P )
- gesture_handler->register_handler( this, SLOT( handle_gesture( const QString&, WId )));
+ gesture_handler->register_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId )));
else
- gesture_handler->unregister_handler( this, SLOT( handle_gesture( const QString&, WId )));
+ gesture_handler->unregister_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId )));
}
// Voice_trigger
- Voice_trigger::Voice_trigger( Action_data* data_P, const QString &Voicecode_P, const VoiceSignature& signature1_P, const VoiceSignature& signature2_P )
+ Voice_trigger::Voice_trigger( Action_data* data_P, const TQString &Voicecode_P, const VoiceSignature& signature1_P, const VoiceSignature& signature2_P )
: Trigger( data_P ), _voicecode( Voicecode_P )
{
_voicesignature[0]=signature1_P;
@@ -409,7 +409,7 @@ Trigger* Voice_trigger::copy( Action_data* data_P ) const
return new Voice_trigger( data_P ? data_P : data, voicecode(), voicesignature(1) , voicesignature(2) );
}
-const QString Voice_trigger::description() const
+const TQString Voice_trigger::description() const
{
return i18n( "Voice trigger: " ) + voicecode();
}
diff --git a/khotkeys/shared/triggers.h b/khotkeys/shared/triggers.h
index 2f921beff..9a8fe6bee 100644
--- a/khotkeys/shared/triggers.h
+++ b/khotkeys/shared/triggers.h
@@ -11,9 +11,9 @@
#ifndef _TRIGGERS_H_
#define _TRIGGERS_H_
-#include <qptrlist.h>
-#include <qtimer.h>
-#include <qmap.h>
+#include <tqptrlist.h>
+#include <tqtimer.h>
+#include <tqmap.h>
#include <kdemacros.h>
#include "khotkeysglobal.h"
@@ -37,7 +37,7 @@ class KDE_EXPORT Trigger
virtual ~Trigger();
virtual void cfg_write( KConfig& cfg_P ) const = 0;
virtual Trigger* copy( Action_data* data_P ) const = 0;
- virtual const QString description() const = 0;
+ virtual const TQString description() const = 0;
static Trigger* create_cfg_read( KConfig& cfg_P, Action_data* data_P );
virtual void activate( bool activate_P ) = 0;
protected:
@@ -46,18 +46,18 @@ class KDE_EXPORT Trigger
};
class KDE_EXPORT Trigger_list
- : public QPtrList< Trigger >
+ : public TQPtrList< Trigger >
{
public:
- Trigger_list( const QString& comment_P ); // CHECKME nebo i data ?
+ Trigger_list( const TQString& comment_P ); // CHECKME nebo i data ?
Trigger_list( KConfig& cfg_P, Action_data* data_P );
void activate( bool activate_P );
void cfg_write( KConfig& cfg_P ) const;
- typedef QPtrListIterator< Trigger > Iterator;
- const QString& comment() const;
+ typedef TQPtrListIterator< Trigger > Iterator;
+ const TQString& comment() const;
Trigger_list* copy( Action_data* data_P ) const;
private:
- QString _comment;
+ TQString _comment;
KHOTKEYS_DISABLE_COPY( Trigger_list );
};
@@ -71,7 +71,7 @@ class KDE_EXPORT Shortcut_trigger
virtual ~Shortcut_trigger();
virtual void cfg_write( KConfig& cfg_P ) const;
virtual Shortcut_trigger* copy( Action_data* data_P ) const;
- virtual const QString description() const;
+ virtual const TQString description() const;
const KShortcut& shortcut() const;
virtual bool handle_key( const KShortcut& shortcut_P );
virtual void activate( bool activate_P );
@@ -80,7 +80,7 @@ class KDE_EXPORT Shortcut_trigger
};
class KDE_EXPORT Window_trigger
- : public QObject, public Trigger
+ : public TQObject, public Trigger
{
Q_OBJECT
typedef Trigger base;
@@ -101,7 +101,7 @@ class KDE_EXPORT Window_trigger
#else
virtual Trigger* copy( Action_data* data_P ) const;
#endif
- virtual const QString description() const;
+ virtual const TQString description() const;
const Windowdef_list* windows() const;
bool triggers_on( window_action_t w_action_P ) const;
virtual void activate( bool activate_P );
@@ -109,7 +109,7 @@ class KDE_EXPORT Window_trigger
Windowdef_list* _windows;
int window_actions;
void init();
- typedef QMap< WId, bool > Windows_map;
+ typedef TQMap< WId, bool > Windows_map;
Windows_map existing_windows;
WId last_active_window;
protected slots:
@@ -122,45 +122,45 @@ class KDE_EXPORT Window_trigger
};
class KDE_EXPORT Gesture_trigger
- : public QObject, public Trigger
+ : public TQObject, public Trigger
{
Q_OBJECT
typedef Trigger base;
public:
- Gesture_trigger( Action_data* data_P, const QString& gesture_P );
+ Gesture_trigger( Action_data* data_P, const TQString& gesture_P );
Gesture_trigger( KConfig& cfg_P, Action_data* data_P );
virtual ~Gesture_trigger();
virtual void cfg_write( KConfig& cfg_P ) const;
virtual Trigger* copy( Action_data* data_P ) const;
- virtual const QString description() const;
- const QString& gesturecode() const;
+ virtual const TQString description() const;
+ const TQString& gesturecode() const;
virtual void activate( bool activate_P );
protected slots:
- void handle_gesture( const QString& gesture_P, WId window_P );
+ void handle_gesture( const TQString& gesture_P, WId window_P );
private:
- QString _gesturecode;
+ TQString _gesturecode;
};
class KDE_EXPORT Voice_trigger
- : public QObject, public Trigger
+ : public TQObject, public Trigger
{
Q_OBJECT
typedef Trigger base;
public:
- Voice_trigger( Action_data* data_P, const QString& Voice_P, const VoiceSignature & signature1_P, const VoiceSignature & signature2_P );
+ Voice_trigger( Action_data* data_P, const TQString& Voice_P, const VoiceSignature & signature1_P, const VoiceSignature & signature2_P );
Voice_trigger( KConfig& cfg_P, Action_data* data_P );
virtual ~Voice_trigger();
virtual void cfg_write( KConfig& cfg_P ) const;
virtual Trigger* copy( Action_data* data_P ) const;
- virtual const QString description() const;
- const QString& voicecode() const;
+ virtual const TQString description() const;
+ const TQString& voicecode() const;
virtual void activate( bool activate_P );
VoiceSignature voicesignature( int ech ) const;
public slots:
void handle_Voice( );
private:
- QString _voicecode;
+ TQString _voicecode;
VoiceSignature _voicesignature[2];
};
@@ -191,14 +191,14 @@ Trigger::~Trigger()
// Trigger_list
inline
-Trigger_list::Trigger_list( const QString& comment_P )
- : QPtrList< Trigger >(), _comment( comment_P )
+Trigger_list::Trigger_list( const TQString& comment_P )
+ : TQPtrList< Trigger >(), _comment( comment_P )
{
setAutoDelete( true );
}
inline
-const QString& Trigger_list::comment() const
+const TQString& Trigger_list::comment() const
{
return _comment;
}
@@ -237,14 +237,14 @@ bool Window_trigger::triggers_on( window_action_t w_action_P ) const
// Gesture_trigger
inline
-const QString& Gesture_trigger::gesturecode() const
+const TQString& Gesture_trigger::gesturecode() const
{
return _gesturecode;
}
// Voice_trigger
inline
-const QString& Voice_trigger::voicecode() const
+const TQString& Voice_trigger::voicecode() const
{
return _voicecode;
}
diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp
index e0dc95613..a6515fecf 100644
--- a/khotkeys/shared/voices.cpp
+++ b/khotkeys/shared/voices.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <kxerrorhandler.h>
#include <kkeynative.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include <kglobalaccel.h>
@@ -39,8 +39,8 @@ namespace KHotKeys
Voice* voice_handler;
-Voice::Voice( bool enabled_P, QObject* parent_P )
- : QObject( parent_P) ,_enabled( enabled_P ), _recording( false ), _recorder(0)
+Voice::Voice( bool enabled_P, TQObject* parent_P )
+ : TQObject( parent_P) ,_enabled( enabled_P ), _recording( false ), _recorder(0)
{
assert( voice_handler == NULL );
voice_handler = this;
@@ -95,7 +95,7 @@ void Voice::record_start()
if(!_recorder)
{
_recorder= SoundRecorder::create(this);
- connect(_recorder, SIGNAL(recorded(const Sound& )), this, SLOT(slot_sound_recorded(const Sound& )));
+ connect(_recorder, TQT_SIGNAL(recorded(const Sound& )), this, TQT_SLOT(slot_sound_recorded(const Sound& )));
}
_recorder->start();
@@ -125,7 +125,7 @@ void Voice::slot_sound_recorded(const Sound &sound_P)
double minimum=800000;
double second_minimum=80000;
int got_count=0;
- QValueList<Voice_trigger*>::Iterator it;
+ TQValueList<Voice_trigger*>::Iterator it;
for ( it = _references.begin(); it != _references.end(); ++it )
{
for(int ech=1; ech<=2 ; ech++)
@@ -208,7 +208,7 @@ void Voice::set_shortcut( const KShortcut &shortcut)
_kga = new KGlobalAccel( this );
_kga->remove("voice");
- _kga->insert( "voice", i18n("Voice"), QString::null, shortcut, 0, this, SLOT(slot_key_pressed())) ;
+ _kga->insert( "voice", i18n("Voice"), TQString::null, shortcut, 0, this, TQT_SLOT(slot_key_pressed())) ;
_kga->updateConnections();
}
@@ -223,8 +223,8 @@ void Voice::slot_key_pressed()
record_start();
if(!_timer)
{
- _timer=new QTimer(this);
- connect(_timer, SIGNAL(timeout()) , this, SLOT(slot_timeout()));
+ _timer=new TQTimer(this);
+ connect(_timer, TQT_SIGNAL(timeout()) , this, TQT_SLOT(slot_timeout()));
}
_timer->start(1000*20,true);
@@ -244,14 +244,14 @@ void Voice::slot_timeout()
}
-QString Voice::isNewSoundFarEnough(const VoiceSignature& signature, const QString &currentTrigger)
+TQString Voice::isNewSoundFarEnough(const VoiceSignature& signature, const TQString &currentTrigger)
{
Voice_trigger *trig=0L;
Voice_trigger *sec_trig=0L;
double minimum=800000;
double second_minimum=80000;
int got_count=0;
- QValueList<Voice_trigger*>::Iterator it;
+ TQValueList<Voice_trigger*>::Iterator it;
for ( it = _references.begin(); it != _references.end(); ++it )
{
Voice_trigger *t=*it;
@@ -283,12 +283,12 @@ QString Voice::isNewSoundFarEnough(const VoiceSignature& signature, const QStrin
kdDebug(1217) << k_funcinfo << "**** " << trig->voicecode() << " : " << minimum << endl;
bool selected=trig && ((got_count==1 && minimum < REJECT_FACTOR_DIFF*0.7 ) || ( minimum < REJECT_FACTOR_DIFF && trig==sec_trig ) );
- return selected ? trig->voicecode() : QString::null;
+ return selected ? trig->voicecode() : TQString::null;
}
-bool Voice::doesVoiceCodeExists(const QString &vc)
+bool Voice::doesVoiceCodeExists(const TQString &vc)
{
- QValueList<Voice_trigger*>::Iterator it;
+ TQValueList<Voice_trigger*>::Iterator it;
for ( it = _references.begin(); it != _references.end(); ++it )
{
Voice_trigger *t=*it;
diff --git a/khotkeys/shared/voices.h b/khotkeys/shared/voices.h
index b0193e7c2..89329ba5d 100644
--- a/khotkeys/shared/voices.h
+++ b/khotkeys/shared/voices.h
@@ -11,7 +11,7 @@
#ifndef VOICES_H_
#define VOICES_H_
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kshortcut.h>
class Sound;
@@ -32,7 +32,7 @@ class KDE_EXPORT Voice : public QObject
{
Q_OBJECT
public:
- Voice( bool enabled_P, QObject* parent_P );
+ Voice( bool enabled_P, TQObject* parent_P );
virtual ~Voice();
void enable( bool enable_P );
@@ -43,12 +43,12 @@ class KDE_EXPORT Voice : public QObject
void set_shortcut( const KShortcut &k);
/**
- * return QString::null is a new signature is far enough from others signature
+ * return TQString::null is a new signature is far enough from others signature
* otherwise, return the stringn which match.
*/
- QString isNewSoundFarEnough(const VoiceSignature& s, const QString& currentTrigger);
+ TQString isNewSoundFarEnough(const VoiceSignature& s, const TQString& currentTrigger);
- bool doesVoiceCodeExists(const QString &s);
+ bool doesVoiceCodeExists(const TQString &s);
public slots:
void record_start();
@@ -60,19 +60,19 @@ class KDE_EXPORT Voice : public QObject
void slot_timeout();
signals:
- void handle_voice( const QString &voice );
+ void handle_voice( const TQString &voice );
private:
bool _enabled;
bool _recording;
- QValueList<Voice_trigger *> _references;
+ TQValueList<Voice_trigger *> _references;
SoundRecorder *_recorder;
KShortcut _shortcut;
KGlobalAccel *_kga;
- QTimer *_timer;
+ TQTimer *_timer;
};
diff --git a/khotkeys/shared/voicesignature.cpp b/khotkeys/shared/voicesignature.cpp
index c77c278b3..773f28731 100644
--- a/khotkeys/shared/voicesignature.cpp
+++ b/khotkeys/shared/voicesignature.cpp
@@ -29,7 +29,7 @@
#include <kdebug.h>
-#include <qdatetime.h>
+#include <tqdatetime.h>
#undef Complex
@@ -109,10 +109,10 @@ static inline double hamming(uint n, uint size)
}
-static QMemArray<double> fft(const Sound& sound, unsigned int start, unsigned int stop)
+static TQMemArray<double> fft(const Sound& sound, unsigned int start, unsigned int stop)
{
if(start>=stop || sound.size() == 0)
- return QMemArray<double>();
+ return TQMemArray<double>();
//We need a sample with a size of a power of two
uint size=stop-start;
@@ -146,7 +146,7 @@ static QMemArray<double> fft(const Sound& sound, unsigned int start, unsigned in
}
//Generate an array to work in
- QMemArray<Complex> samples(size);
+ TQMemArray<Complex> samples(size);
//Fill it with samples in the "reversed carry" order
int rev_carry = 0;
@@ -188,7 +188,7 @@ static QMemArray<double> fft(const Sound& sound, unsigned int start, unsigned in
}
}
- QMemArray<double> result(size);
+ TQMemArray<double> result(size);
for(uint f=0;f<size;f++)
{
result[f]=samples[f].Mod() / size;
@@ -200,10 +200,10 @@ static QMemArray<double> fft(const Sound& sound, unsigned int start, unsigned in
-QMemArray<double> VoiceSignature::fft(const Sound& sound, unsigned int start, unsigned int stop)
+TQMemArray<double> VoiceSignature::fft(const Sound& sound, unsigned int start, unsigned int stop)
{
return KHotKeys::fft(sound, start, stop);
- /*QMemArray<double> result(8000);
+ /*TQMemArray<double> result(8000);
for(int f=0; f<8000;f++)
{
Complex c(0);
@@ -276,7 +276,7 @@ bool VoiceSignature::window(const Sound& sound, unsigned int *_start, unsigned i
VoiceSignature::VoiceSignature(const Sound& sound)
{
static uint temp_wind=0, temp_fft=0, temp_moy=0;
- QTime t;
+ TQTime t;
t.start();
unsigned int start , stop;
@@ -296,7 +296,7 @@ VoiceSignature::VoiceSignature(const Sound& sound)
unsigned int w_stop =MIN(stop , start+ (int)((wind+1.0+WINDOW_SUPER)*length/WINDOW_NUMBER));
- QMemArray<double> fourrier=fft(sound, w_start,w_stop);
+ TQMemArray<double> fourrier=fft(sound, w_start,w_stop);
temp_fft+=t.restart();
@@ -394,24 +394,24 @@ int VoiceSignature::size2()
return FOUR_NUMBER;
}
-QMap<int, QMap<int, double> > VoiceSignature::pond;
+TQMap<int, TQMap<int, double> > VoiceSignature::pond;
-void VoiceSignature::write(KConfigBase *cfg, const QString &key) const
+void VoiceSignature::write(KConfigBase *cfg, const TQString &key) const
{
- QStringList sl;
+ TQStringList sl;
for(int x=0;x<WINDOW_NUMBER;x++)
for(int y=0;y<FOUR_NUMBER;y++)
{
- sl.append( QString::number(data[x][y]) );
+ sl.append( TQString::number(data[x][y]) );
}
cfg->writeEntry(key,sl);
}
-void VoiceSignature::read(KConfigBase *cfg, const QString &key)
+void VoiceSignature::read(KConfigBase *cfg, const TQString &key)
{
- QStringList sl=cfg->readListEntry(key);
+ TQStringList sl=cfg->readListEntry(key);
for(int x=0;x<WINDOW_NUMBER;x++)
for(int y=0;y<FOUR_NUMBER;y++)
{
diff --git a/khotkeys/shared/voicesignature.h b/khotkeys/shared/voicesignature.h
index b4857efd2..82556864f 100644
--- a/khotkeys/shared/voicesignature.h
+++ b/khotkeys/shared/voicesignature.h
@@ -21,8 +21,8 @@
#define SIGNATURE_H
-#include <qmemarray.h>
-#include <qmap.h>
+#include <tqmemarray.h>
+#include <tqmap.h>
#include <kdemacros.h>
class Sound;
@@ -73,9 +73,9 @@ public:
VoiceSignature(){}
~VoiceSignature();
- QMap<int, QMap<int, double> > data;
+ TQMap<int, TQMap<int, double> > data;
- static QMap<int, QMap<int, double> > pond;
+ static TQMap<int, TQMap<int, double> > pond;
static float diff(const VoiceSignature &s1, const VoiceSignature &s2);
@@ -84,11 +84,11 @@ public:
static int size2();
- static QMemArray<double> fft(const Sound& sound, unsigned int start, unsigned int stop);
+ static TQMemArray<double> fft(const Sound& sound, unsigned int start, unsigned int stop);
static bool window(const Sound& sound, unsigned int *start, unsigned int *stop);
- void write(KConfigBase *cfg, const QString &key) const;
- void read(KConfigBase *cfg, const QString &key);
+ void write(KConfigBase *cfg, const TQString &key) const;
+ void read(KConfigBase *cfg, const TQString &key);
inline bool isNull() const
{
diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp
index d269ef2fe..b8e86f694 100644
--- a/khotkeys/shared/windows.cpp
+++ b/khotkeys/shared/windows.cpp
@@ -17,7 +17,7 @@
#include "windows.h"
#include <assert.h>
-#include <qregexp.h>
+#include <tqregexp.h>
#include <kconfig.h>
#include <kdebug.h>
@@ -37,18 +37,18 @@ namespace KHotKeys
// Windows
-Windows::Windows( bool enable_signal_P, QObject* parent_P )
- : QObject( parent_P ), signals_enabled( enable_signal_P ),
+Windows::Windows( bool enable_signal_P, TQObject* parent_P )
+ : TQObject( parent_P ), signals_enabled( enable_signal_P ),
kwin_module( new KWinModule( this )), _action_window( 0 )
{
assert( windows_handler == NULL );
windows_handler = this;
if( signals_enabled )
{
- connect( kwin_module, SIGNAL( windowAdded( WId )), SLOT( window_added_slot( WId )));
- connect( kwin_module, SIGNAL( windowRemoved( WId )), SLOT( window_removed_slot( WId )));
- connect( kwin_module, SIGNAL( activeWindowChanged( WId )),
- SLOT( active_window_changed_slot( WId )));
+ connect( kwin_module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( window_added_slot( WId )));
+ connect( kwin_module, TQT_SIGNAL( windowRemoved( WId )), TQT_SLOT( window_removed_slot( WId )));
+ connect( kwin_module, TQT_SIGNAL( activeWindowChanged( WId )),
+ TQT_SLOT( active_window_changed_slot( WId )));
}
}
@@ -91,18 +91,18 @@ void Windows::window_changed_slot( WId window_P, unsigned int flags_P )
emit window_changed( window_P, flags_P );
}
-QString Windows::get_window_role( WId id_P )
+TQString Windows::get_window_role( WId id_P )
{
// TODO this is probably just a hack
return KWin::readNameProperty( id_P, qt_window_role );
}
-QString Windows::get_window_class( WId id_P )
+TQString Windows::get_window_class( WId id_P )
{
XClassHint hints_ret;
if( XGetClassHint( qt_xdisplay(), id_P, &hints_ret ) == 0 ) // 0 means error
return "";
- QString ret( hints_ret.res_name );
+ TQString ret( hints_ret.res_name );
ret += ' ';
ret += hints_ret.res_class;
XFree( hints_ret.res_name );
@@ -127,7 +127,7 @@ void Windows::set_action_window( WId window_P )
WId Windows::find_window( const Windowdef_list* window_P )
{
- for( QValueList< WId >::ConstIterator it = kwin_module->windows().begin();
+ for( TQValueList< WId >::ConstIterator it = kwin_module->windows().begin();
it != kwin_module->windows().end();
++it )
{
@@ -214,7 +214,7 @@ Windowdef::Windowdef( KConfig& cfg_P )
Windowdef* Windowdef::create_cfg_read( KConfig& cfg_P )
{
- QString type = cfg_P.readEntry( "Type" );
+ TQString type = cfg_P.readEntry( "Type" );
if( type == "SIMPLE" )
return new Windowdef_simple( cfg_P );
kdWarning( 1217 ) << "Unknown Windowdef type read from cfg file\n";
@@ -224,17 +224,17 @@ Windowdef* Windowdef::create_cfg_read( KConfig& cfg_P )
// Windowdef_list
Windowdef_list::Windowdef_list( KConfig& cfg_P )
- : QPtrList< Windowdef >()
+ : TQPtrList< Windowdef >()
{
setAutoDelete( true );
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
_comment = cfg_P.readEntry( "Comment" );
int cnt = cfg_P.readNumEntry( "WindowsCount", 0 );
for( int i = 0;
i < cnt;
++i )
{
- cfg_P.setGroup( save_cfg_group + QString::number( i ));
+ cfg_P.setGroup( save_cfg_group + TQString::number( i ));
Windowdef* window = Windowdef::create_cfg_read( cfg_P );
if( window )
append( window );
@@ -244,13 +244,13 @@ Windowdef_list::Windowdef_list( KConfig& cfg_P )
void Windowdef_list::cfg_write( KConfig& cfg_P ) const
{
- QString save_cfg_group = cfg_P.group();
+ TQString save_cfg_group = cfg_P.group();
int i = 0;
for( Iterator it( *this );
it;
++it, ++i )
{
- cfg_P.setGroup( save_cfg_group + QString::number( i ));
+ cfg_P.setGroup( save_cfg_group + TQString::number( i ));
it.current()->cfg_write( cfg_P );
}
cfg_P.setGroup( save_cfg_group );
@@ -283,9 +283,9 @@ bool Windowdef_list::match( const Window_data& window_P ) const
// Windowdef_simple
-Windowdef_simple::Windowdef_simple( const QString& comment_P, const QString& title_P,
- substr_type_t title_type_P, const QString& wclass_P, substr_type_t wclass_type_P,
- const QString& role_P, substr_type_t role_type_P, int window_types_P )
+Windowdef_simple::Windowdef_simple( const TQString& comment_P, const TQString& title_P,
+ substr_type_t title_type_P, const TQString& wclass_P, substr_type_t wclass_type_P,
+ const TQString& role_P, substr_type_t role_type_P, int window_types_P )
: Windowdef( comment_P ), _title( title_P ), title_type( title_type_P ),
_wclass( wclass_P ), wclass_type( wclass_type_P ), _role( role_P ),
role_type( role_type_P ), _window_types( window_types_P )
@@ -331,7 +331,7 @@ bool Windowdef_simple::match( const Window_data& window_P )
return true;
}
-bool Windowdef_simple::is_substr_match( const QString& str1_P, const QString& str2_P,
+bool Windowdef_simple::is_substr_match( const TQString& str1_P, const TQString& str2_P,
substr_type_t type_P )
{
switch( type_P )
@@ -344,7 +344,7 @@ bool Windowdef_simple::is_substr_match( const QString& str1_P, const QString& st
return str1_P == str2_P;
case REGEXP :
{
- QRegExp rg( str2_P );
+ TQRegExp rg( str2_P );
return rg.search( str1_P ) >= 0;
}
case CONTAINS_NOT :
@@ -353,7 +353,7 @@ bool Windowdef_simple::is_substr_match( const QString& str1_P, const QString& st
return str1_P != str2_P;
case REGEXP_NOT :
{
- QRegExp rg( str2_P );
+ TQRegExp rg( str2_P );
return rg.search( str1_P ) < 0;
}
}
@@ -366,7 +366,7 @@ Windowdef* Windowdef_simple::copy() const
wclass_match_type(), role(), role_match_type(), window_types());
}
-const QString Windowdef_simple::description() const
+const TQString Windowdef_simple::description() const
{
return i18n( "Window simple: " ) + comment();
}
diff --git a/khotkeys/shared/windows.h b/khotkeys/shared/windows.h
index f048ce6b9..d145efa87 100644
--- a/khotkeys/shared/windows.h
+++ b/khotkeys/shared/windows.h
@@ -13,9 +13,9 @@
#include <sys/types.h>
-#include <qobject.h>
-#include <qstring.h>
-#include <qptrlist.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
#include <netwm_def.h>
@@ -39,10 +39,10 @@ class KDE_EXPORT Windows
{
Q_OBJECT
public:
- Windows( bool enable_signals_P, QObject* parent_P );
+ Windows( bool enable_signals_P, TQObject* parent_P );
virtual ~Windows();
- QString get_window_class( WId id_P );
- QString get_window_role( WId id_P );
+ TQString get_window_class( WId id_P );
+ TQString get_window_role( WId id_P );
WId active_window();
void set_action_window( WId window );
WId action_window();
@@ -70,42 +70,42 @@ class KDE_EXPORT Windows
struct KDE_EXPORT Window_data
{
Window_data( WId id_P );
- QString title; // _NET_WM_NAME or WM_NAME
- QString role; // WM_WINDOW_ROLE
- QString wclass; // WM_CLASS
+ TQString title; // _NET_WM_NAME or WM_NAME
+ TQString role; // WM_WINDOW_ROLE
+ TQString wclass; // WM_CLASS
NET::WindowType type;
};
class KDE_EXPORT Windowdef
{
public:
- Windowdef( const QString& comment_P );
+ Windowdef( const TQString& comment_P );
Windowdef( KConfig& cfg_P );
virtual ~Windowdef();
- const QString& comment() const;
+ const TQString& comment() const;
virtual bool match( const Window_data& window_P ) = 0;
static Windowdef* create_cfg_read( KConfig& cfg_P/*, Action_data_base* data_P*/ );
virtual void cfg_write( KConfig& cfg_P ) const = 0;
virtual Windowdef* copy( /*Action_data_base* data_P*/ ) const = 0;
- virtual const QString description() const = 0;
+ virtual const TQString description() const = 0;
private:
- QString _comment;
+ TQString _comment;
KHOTKEYS_DISABLE_COPY( Windowdef ); // CHECKME asi pak udelat i pro vsechny potomky, at se nezapomene
};
class KDE_EXPORT Windowdef_list
- : public QPtrList< Windowdef >
+ : public TQPtrList< Windowdef >
{
public:
- Windowdef_list( const QString& comment_P );
+ Windowdef_list( const TQString& comment_P );
Windowdef_list( KConfig& cfg_P/*, Action_data_base* data_P*/ );
void cfg_write( KConfig& cfg_P ) const;
bool match( const Window_data& window_P ) const;
Windowdef_list* copy( /*Action_data_base* data_P*/ ) const;
- typedef QPtrListIterator< Windowdef > Iterator;
- const QString& comment() const;
+ typedef TQPtrListIterator< Windowdef > Iterator;
+ const TQString& comment() const;
private:
- QString _comment;
+ TQString _comment;
KHOTKEYS_DISABLE_COPY( Windowdef_list );
};
@@ -133,32 +133,32 @@ class KDE_EXPORT Windowdef_simple
// WINDOW_TYPE_MENU = ( 1 << NET::Menu ),
WINDOW_TYPE_DIALOG = ( 1 << NET::Dialog )
};
- Windowdef_simple( const QString& comment_P, const QString& title_P,
- substr_type_t title_type_P, const QString& wclass_P, substr_type_t wclass_type_P,
- const QString& role_P, substr_type_t role_type_P, int window_types_P );
+ Windowdef_simple( const TQString& comment_P, const TQString& title_P,
+ substr_type_t title_type_P, const TQString& wclass_P, substr_type_t wclass_type_P,
+ const TQString& role_P, substr_type_t role_type_P, int window_types_P );
Windowdef_simple( KConfig& cfg_P );
virtual bool match( const Window_data& window_P );
virtual void cfg_write( KConfig& cfg_P ) const;
- const QString& title() const;
+ const TQString& title() const;
substr_type_t title_match_type() const;
- const QString& wclass() const;
+ const TQString& wclass() const;
substr_type_t wclass_match_type() const;
- const QString& role() const;
+ const TQString& role() const;
substr_type_t role_match_type() const;
int window_types() const;
bool type_match( window_type_t type_P ) const;
bool type_match( NET::WindowType type_P ) const;
virtual Windowdef* copy( /*Action_data_base* data_P*/ ) const;
- virtual const QString description() const;
+ virtual const TQString description() const;
protected:
- bool is_substr_match( const QString& str1_P, const QString& str2_P,
+ bool is_substr_match( const TQString& str1_P, const TQString& str2_P,
substr_type_t type_P );
private:
- QString _title;
+ TQString _title;
substr_type_t title_type;
- QString _wclass;
+ TQString _wclass;
substr_type_t wclass_type;
- QString _role;
+ TQString _role;
substr_type_t role_type;
int _window_types;
};
@@ -170,13 +170,13 @@ class KDE_EXPORT Windowdef_simple
// Windowdef
inline
-Windowdef::Windowdef( const QString& comment_P )
+Windowdef::Windowdef( const TQString& comment_P )
: _comment( comment_P )
{
}
inline
-const QString& Windowdef::comment() const
+const TQString& Windowdef::comment() const
{
return _comment;
}
@@ -189,14 +189,14 @@ Windowdef::~Windowdef()
// Windowdef_list
inline
-Windowdef_list::Windowdef_list( const QString& comment_P )
- : QPtrList< Windowdef >(), _comment( comment_P )
+Windowdef_list::Windowdef_list( const TQString& comment_P )
+ : TQPtrList< Windowdef >(), _comment( comment_P )
{
setAutoDelete( true );
}
inline
-const QString& Windowdef_list::comment() const
+const TQString& Windowdef_list::comment() const
{
return _comment;
}
@@ -204,7 +204,7 @@ const QString& Windowdef_list::comment() const
// Windowdef_simple
inline
-const QString& Windowdef_simple::title() const
+const TQString& Windowdef_simple::title() const
{
return _title;
}
@@ -216,7 +216,7 @@ Windowdef_simple::substr_type_t Windowdef_simple::title_match_type() const
}
inline
-const QString& Windowdef_simple::wclass() const
+const TQString& Windowdef_simple::wclass() const
{
return _wclass;
}
@@ -228,7 +228,7 @@ Windowdef_simple::substr_type_t Windowdef_simple::wclass_match_type() const
}
inline
-const QString& Windowdef_simple::role() const
+const TQString& Windowdef_simple::role() const
{
return _role;
}
diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp
index ac96a9709..c99efda49 100644
--- a/khotkeys/update/update.cpp
+++ b/khotkeys/update/update.cpp
@@ -39,8 +39,8 @@ int main( int argc, char* argv[] )
KCmdLineArgs::addCmdLineOptions( options );
KApplication app( false, true ); // X11 connection is necessary for KKey* stuff :-/
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
- QCString id = args->getOption( "id" );
- QString file = locate( "data", "khotkeys/" + id + ".khotkeys" );
+ TQCString id = args->getOption( "id" );
+ TQString file = locate( "data", "khotkeys/" + id + ".khotkeys" );
if( file.isEmpty())
{
kdWarning() << "File " << id << " not found!" << endl;
@@ -56,7 +56,7 @@ int main( int argc, char* argv[] )
return 2;
}
settings.write_settings();
- QByteArray data;
+ TQByteArray data;
kapp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data );
return 0;
}
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 19e91be5c..7bc46afa4 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -25,17 +25,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <ctime>
#include <time.h>
-#include <qcheckbox.h>
-#include <qcursor.h>
-#include <qgroupbox.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qtimer.h>
-#include <qtooltip.h>
-#include <qclipboard.h>
-#include <qtabwidget.h>
-#include <qwidgetstack.h>
-#include <qcombobox.h>
+#include <tqcheckbox.h>
+#include <tqcursor.h>
+#include <tqgroupbox.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqtimer.h>
+#include <tqtooltip.h>
+#include <tqclipboard.h>
+#include <tqtabwidget.h>
+#include <tqwidgetstack.h>
+#include <tqcombobox.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -68,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extern "C"
{
- KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile)
+ KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("clockapplet");
KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
@@ -79,7 +79,7 @@ extern "C"
// Settings
-KConfigDialogSingle::KConfigDialogSingle(Zone *zone, QWidget *parent,
+KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
const char *name, Prefs * prefs,
KDialogBase::DialogType dialogType,
bool modal) :
@@ -95,7 +95,7 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, QWidget *parent,
setIcon(SmallIcon("date"));
settings = new SettingsWidgetImp(prefs, zone, 0, "General");
- connect(settings->kcfg_Type, SIGNAL(activated(int)), SLOT(selectPage(int)));
+ connect(settings->kcfg_Type, TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));
settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::palette().active().background());
settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::palette().active().background());
@@ -115,26 +115,26 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, QWidget *parent,
settings->widgetStack->addWidget(fuzzyPage, 3);
fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::palette().active().background());
- connect(settings->kcfg_PlainShowDate, SIGNAL(toggled(bool)),
- SLOT(dateToggled()));
- connect(settings->kcfg_PlainShowDayOfWeek, SIGNAL(toggled(bool)),
- SLOT(dateToggled()));
- connect(digitalPage->kcfg_DigitalShowDate, SIGNAL(toggled(bool)),
- SLOT(dateToggled()));
- connect(digitalPage->kcfg_DigitalShowDayOfWeek, SIGNAL(toggled(bool)),
- SLOT(dateToggled()));
- connect(digitalPage->kcfg_DigitalShowDate, SIGNAL(toggled(bool)),
- SLOT(dateToggled()));
- connect(analogPage->kcfg_AnalogShowDate, SIGNAL(toggled(bool)),
- SLOT(dateToggled()));
- connect(analogPage->kcfg_AnalogShowDayOfWeek, SIGNAL(toggled(bool)),
- SLOT(dateToggled()));
- connect(fuzzyPage->kcfg_FuzzyShowDate, SIGNAL(toggled(bool)),
- SLOT(dateToggled()));
- connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, SIGNAL(toggled(bool)),
- SLOT(dateToggled()));
-
- addPage(settings, i18n("General"), QString::fromLatin1("package_settings"));
+ connect(settings->kcfg_PlainShowDate, TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(dateToggled()));
+ connect(settings->kcfg_PlainShowDayOfWeek, TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(dateToggled()));
+ connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(dateToggled()));
+ connect(digitalPage->kcfg_DigitalShowDayOfWeek, TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(dateToggled()));
+ connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(dateToggled()));
+ connect(analogPage->kcfg_AnalogShowDate, TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(dateToggled()));
+ connect(analogPage->kcfg_AnalogShowDayOfWeek, TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(dateToggled()));
+ connect(fuzzyPage->kcfg_FuzzyShowDate, TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(dateToggled()));
+ connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(dateToggled()));
+
+ addPage(settings, i18n("General"), TQString::fromLatin1("package_settings"));
}
void KConfigDialogSingle::updateSettings()
@@ -155,7 +155,7 @@ void KConfigDialogSingle::updateWidgetsDefault()
item->swapDefault();
// This is ugly, but kcfg_Type does not have its correct setting
// at this point in time.
- QTimer::singleShot(0, this, SLOT(dateToggled()));
+ TQTimer::singleShot(0, this, TQT_SLOT(dateToggled()));
}
void KConfigDialogSingle::selectPage(int p)
@@ -190,7 +190,7 @@ void KConfigDialogSingle::dateToggled()
settings->dateBox->setEnabled(showDate);
}
-SettingsWidgetImp::SettingsWidgetImp(Prefs *p, Zone *z, QWidget* parent, const char* name, WFlags fl) :
+SettingsWidgetImp::SettingsWidgetImp(Prefs *p, Zone *z, TQWidget* parent, const char* name, WFlags fl) :
SettingsWidget(parent, name, fl), prefs(p), zone(z)
{
zone->readZoneList(tzListView);
@@ -217,8 +217,8 @@ ClockWidget::~ClockWidget()
//************************************************************
-PlainClock::PlainClock(ClockApplet *applet, Prefs *prefs, QWidget *parent, const char *name)
- : QLabel(parent, name), ClockWidget(applet, prefs)
+PlainClock::PlainClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, const char *name)
+ : TQLabel(parent, name), ClockWidget(applet, prefs)
{
setWFlags(WNoAutoErase);
setBackgroundOrigin(AncestorOrigin);
@@ -229,7 +229,7 @@ PlainClock::PlainClock(ClockApplet *applet, Prefs *prefs, QWidget *parent, const
int PlainClock::preferedWidthForHeight(int ) const
{
- QString maxLengthTime = KGlobal::locale()->formatTime( QTime( 23, 59 ), _prefs->plainShowSeconds());
+ TQString maxLengthTime = KGlobal::locale()->formatTime( TQTime( 23, 59 ), _prefs->plainShowSeconds());
return fontMetrics().width( maxLengthTime ) + 8;
}
@@ -242,7 +242,7 @@ int PlainClock::preferedHeightForWidth(int /*w*/) const
void PlainClock::updateClock()
{
- QString newStr = KGlobal::locale()->formatTime(_applet->clockGetTime(), _prefs->plainShowSeconds());
+ TQString newStr = KGlobal::locale()->formatTime(_applet->clockGetTime(), _prefs->plainShowSeconds());
if (_force || newStr != _timeStr) {
_timeStr = newStr;
@@ -268,10 +268,10 @@ bool PlainClock::showDayOfWeek()
return _prefs->plainShowDayOfWeek();
}
-void PlainClock::paintEvent(QPaintEvent *)
+void PlainClock::paintEvent(TQPaintEvent *)
{
- QPainter p;
- QPixmap buf(size());
+ TQPainter p;
+ TQPixmap buf(size());
buf.fill(this, 0, 0);
p.begin(&buf);
p.setFont(font());
@@ -284,9 +284,9 @@ void PlainClock::paintEvent(QPaintEvent *)
p.end();
}
-void PlainClock::drawContents(QPainter *p)
+void PlainClock::drawContents(TQPainter *p)
{
- QRect tr(0, 0, width(), height());
+ TQRect tr(0, 0, width(), height());
if (!KickerSettings::transparent())
p->drawText(tr, AlignCenter, _timeStr);
@@ -297,8 +297,8 @@ void PlainClock::drawContents(QPainter *p)
//************************************************************
-DigitalClock::DigitalClock(ClockApplet *applet, Prefs *prefs, QWidget *parent, const char *name)
- : QLCDNumber(parent, name), ClockWidget(applet, prefs)
+DigitalClock::DigitalClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, const char *name)
+ : TQLCDNumber(parent, name), ClockWidget(applet, prefs)
{
setWFlags(WNoAutoErase);
setBackgroundOrigin(AncestorOrigin);
@@ -331,16 +331,16 @@ int DigitalClock::preferedHeightForWidth(int w) const
void DigitalClock::updateClock()
{
static bool colon = true;
- QString newStr;
- QTime t(_applet->clockGetTime());
+ TQString newStr;
+ TQTime t(_applet->clockGetTime());
int h = t.hour();
int m = t.minute();
int s = t.second();
- QString format("%02d");
+ TQString format("%02d");
- QString sep(!colon && _prefs->digitalBlink() ? " " : ":");
+ TQString sep(!colon && _prefs->digitalBlink() ? " " : ":");
if (_prefs->digitalShowSeconds())
format += sep + "%02d";
@@ -378,19 +378,19 @@ void DigitalClock::loadSettings()
{
setFrameStyle(_prefs->digitalShowFrame() ? Panel | Sunken : NoFrame);
setMargin( 4 );
- setSegmentStyle(QLCDNumber::Flat);
+ setSegmentStyle(TQLCDNumber::Flat);
if (_prefs->digitalLCDStyle())
lcdPattern = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User);
setNumDigits(_prefs->digitalShowSeconds() ? 8:5);
- _buffer = new QPixmap(width(), height());
+ _buffer = new TQPixmap(width(), height());
}
-void DigitalClock::paintEvent(QPaintEvent*)
+void DigitalClock::paintEvent(TQPaintEvent*)
{
- QPainter p(_buffer);
+ TQPainter p(_buffer);
if (_prefs->digitalLCDStyle())
{
@@ -403,7 +403,7 @@ void DigitalClock::paintEvent(QPaintEvent*)
}
else if (paletteBackgroundPixmap())
{
- QPoint offset = backgroundOffset();
+ TQPoint offset = backgroundOffset();
p.drawTiledPixmap(0, 0, width(), height(), *paletteBackgroundPixmap(), offset.x(), offset.y());
}
else
@@ -424,34 +424,34 @@ void DigitalClock::paintEvent(QPaintEvent*)
// yes, the colors for the lcd-lock are hardcoded,
// but other colors would break the lcd-lock anyway
-void DigitalClock::drawContents( QPainter * p)
+void DigitalClock::drawContents( TQPainter * p)
{
setUpdatesEnabled( FALSE );
- QPalette pal = palette();
+ TQPalette pal = palette();
if (_prefs->digitalLCDStyle())
- pal.setColor( QColorGroup::Foreground, QColor(128,128,128));
+ pal.setColor( TQColorGroup::Foreground, TQColor(128,128,128));
else
- pal.setColor( QColorGroup::Foreground, _prefs->digitalShadowColor());
+ pal.setColor( TQColorGroup::Foreground, _prefs->digitalShadowColor());
setPalette( pal );
p->translate( +1, +1 );
- QLCDNumber::drawContents( p );
+ TQLCDNumber::drawContents( p );
if (_prefs->digitalLCDStyle())
- pal.setColor( QColorGroup::Foreground, Qt::black);
+ pal.setColor( TQColorGroup::Foreground, Qt::black);
else
- pal.setColor( QColorGroup::Foreground, _prefs->digitalForegroundColor());
+ pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor());
setPalette( pal );
p->translate( -2, -2 );
setUpdatesEnabled( TRUE );
- QLCDNumber::drawContents( p );
+ TQLCDNumber::drawContents( p );
p->translate( +1, +1 );
}
// reallocate buffer pixmap
-void DigitalClock::resizeEvent ( QResizeEvent *)
+void DigitalClock::resizeEvent ( TQResizeEvent *)
{
delete _buffer;
- _buffer = new QPixmap( width(), height() );
+ _buffer = new TQPixmap( width(), height() );
}
@@ -469,8 +469,8 @@ bool DigitalClock::showDayOfWeek()
//************************************************************
-AnalogClock::AnalogClock(ClockApplet *applet, Prefs *prefs, QWidget *parent, const char *name)
- : QFrame(parent, name), ClockWidget(applet, prefs), _spPx(NULL)
+AnalogClock::AnalogClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, const char *name)
+ : TQFrame(parent, name), ClockWidget(applet, prefs), _spPx(NULL)
{
setWFlags(WNoAutoErase);
setBackgroundOrigin(AncestorOrigin);
@@ -495,8 +495,8 @@ void AnalogClock::initBackgroundPixmap()
{
//make a scaled pixmap -- so when image is reduced it'll look "OK".
_bgScale = _prefs->analogAntialias()+1;
- QImage bgImage = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User).convertToImage();
- lcdPattern = QPixmap(bgImage.scale(bgImage.width() * _bgScale,
+ TQImage bgImage = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User).convertToImage();
+ lcdPattern = TQPixmap(bgImage.scale(bgImage.width() * _bgScale,
bgImage.height() * _bgScale));
}
@@ -528,13 +528,13 @@ void AnalogClock::loadSettings()
setFrameStyle(_prefs->analogShowFrame() ? Panel | Sunken : NoFrame);
_time = _applet->clockGetTime();
- _spPx = new QPixmap(size().width() * _prefs->analogAntialias()+1,
+ _spPx = new TQPixmap(size().width() * _prefs->analogAntialias()+1,
size().height() * _prefs->analogAntialias()+1);
update();
}
-void AnalogClock::paintEvent( QPaintEvent * )
+void AnalogClock::paintEvent( TQPaintEvent * )
{
if ( !isVisible() )
return;
@@ -547,10 +547,10 @@ void AnalogClock::paintEvent( QPaintEvent * )
(spHeight != _spPx->size().height()))
{
delete _spPx;
- _spPx = new QPixmap(spWidth, spHeight);
+ _spPx = new TQPixmap(spWidth, spHeight);
}
- QPainter paint;
+ TQPainter paint;
paint.begin(_spPx);
if (_prefs->analogLCDStyle())
@@ -570,12 +570,12 @@ void AnalogClock::paintEvent( QPaintEvent * )
}
else if (paletteBackgroundPixmap())
{
- QPixmap bg(width(), height());
- QPainter p(&bg);
- QPoint offset = backgroundOffset();
+ TQPixmap bg(width(), height());
+ TQPainter p(&bg);
+ TQPoint offset = backgroundOffset();
p.drawTiledPixmap(0, 0, width(), height(), *paletteBackgroundPixmap(), offset.x(), offset.y());
p.end();
- QImage bgImage = bg.convertToImage().scale(spWidth, spHeight);
+ TQImage bgImage = bg.convertToImage().scale(spWidth, spHeight);
paint.drawImage(0, 0, bgImage);
}
else
@@ -583,26 +583,26 @@ void AnalogClock::paintEvent( QPaintEvent * )
_spPx->fill(_prefs->analogBackgroundColor());
}
- QPointArray pts;
- QPoint cp(spWidth / 2, spHeight / 2);
+ TQPointArray pts;
+ TQPoint cp(spWidth / 2, spHeight / 2);
int d = KMIN(spWidth,spHeight) - (10 * aaFactor);
if (_prefs->analogLCDStyle())
{
- paint.setPen( QPen(QColor(100,100,100), aaFactor) );
- paint.setBrush( QColor(100,100,100) );
+ paint.setPen( TQPen(TQColor(100,100,100), aaFactor) );
+ paint.setBrush( TQColor(100,100,100) );
}
else
{
- paint.setPen( QPen(_prefs->analogShadowColor(), aaFactor) );
+ paint.setPen( TQPen(_prefs->analogShadowColor(), aaFactor) );
paint.setBrush( _prefs->analogShadowColor() );
}
paint.setViewport(2,2,spWidth,spHeight);
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 );
@@ -631,7 +631,7 @@ void AnalogClock::paintEvent( QPaintEvent * )
matrix.rotate( -s_angle );
}
- QWMatrix matrix2;
+ TQWMatrix matrix2;
matrix2.translate( cp.x(), cp.y());
matrix2.scale( d/1000.0F, d/1000.0F );
@@ -644,10 +644,10 @@ void AnalogClock::paintEvent( QPaintEvent * )
}
if (_prefs->analogLCDStyle()) {
- paint.setPen( QPen(Qt::black, aaFactor) );
+ paint.setPen( TQPen(Qt::black, aaFactor) );
paint.setBrush( Qt::black );
} else {
- paint.setPen( QPen(_prefs->analogForegroundColor(), aaFactor) );
+ paint.setPen( TQPen(_prefs->analogForegroundColor(), aaFactor) );
paint.setBrush( _prefs->analogForegroundColor() );
}
@@ -655,13 +655,13 @@ void AnalogClock::paintEvent( QPaintEvent * )
}
paint.end();
- QPainter paintFinal;
+ TQPainter paintFinal;
paintFinal.begin(this);
if (aaFactor != 1)
{
- QImage spImage = _spPx->convertToImage();
- QImage displayImage = spImage.smoothScale(size());
+ TQImage spImage = _spPx->convertToImage();
+ TQImage displayImage = spImage.smoothScale(size());
paintFinal.drawImage(0, 0, displayImage);
}
@@ -678,7 +678,7 @@ void AnalogClock::paintEvent( QPaintEvent * )
// the background pixmap disappears during a style change
-void AnalogClock::styleChange(QStyle &)
+void AnalogClock::styleChange(TQStyle &)
{
if (_prefs->analogLCDStyle())
{
@@ -700,8 +700,8 @@ bool AnalogClock::showDayOfWeek()
//************************************************************
-FuzzyClock::FuzzyClock(ClockApplet *applet, Prefs *prefs, QWidget *parent, const char *name)
- : QFrame(parent, name), ClockWidget(applet, prefs)
+FuzzyClock::FuzzyClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, const char *name)
+ : TQFrame(parent, name), ClockWidget(applet, prefs)
{
setBackgroundOrigin(AncestorOrigin);
loadSettings();
@@ -754,7 +754,7 @@ FuzzyClock::FuzzyClock(ClockApplet *applet, Prefs *prefs, QWidget *parent, const
void FuzzyClock::deleteMyself()
{
if(alreadyDrawing) // try again later
- QTimer::singleShot(1000, this, SLOT(deleteMyself()));
+ TQTimer::singleShot(1000, this, TQT_SLOT(deleteMyself()));
else
delete this;
}
@@ -762,14 +762,14 @@ void FuzzyClock::deleteMyself()
int FuzzyClock::preferedWidthForHeight(int ) const
{
- QFontMetrics fm(_prefs->fuzzyFont());
+ TQFontMetrics fm(_prefs->fuzzyFont());
return fm.width(_timeStr) + 8;
}
int FuzzyClock::preferedHeightForWidth(int ) const
{
- QFontMetrics fm(_prefs->fuzzyFont());
+ TQFontMetrics fm(_prefs->fuzzyFont());
return fm.width(_timeStr) + 8;
}
@@ -792,7 +792,7 @@ void FuzzyClock::loadSettings()
setFrameStyle(_prefs->fuzzyShowFrame() ? Panel | Sunken : 0);
}
-void FuzzyClock::drawContents(QPainter *p)
+void FuzzyClock::drawContents(TQPainter *p)
{
if (!isVisible())
return;
@@ -801,7 +801,7 @@ void FuzzyClock::drawContents(QPainter *p)
return;
alreadyDrawing = true;
- QString newTimeStr;
+ TQString newTimeStr;
if (_prefs->fuzzyness() == 1 || _prefs->fuzzyness() == 2) {
int minute = _time.minute();
@@ -838,7 +838,7 @@ void FuzzyClock::drawContents(QPainter *p)
}
if (phStart >= 0)
newTimeStr.replace(phStart, phLength, hourNames[realHour]);
- newTimeStr.replace(0, 1, QString(newTimeStr.at(0).upper()));
+ newTimeStr.replace(0, 1, TQString(newTimeStr.at(0).upper()));
}
} else if (_prefs->fuzzyness() == 3) {
newTimeStr = dayTime[_time.hour() / 3];
@@ -863,15 +863,15 @@ void FuzzyClock::drawContents(QPainter *p)
p->setFont(_prefs->fuzzyFont());
p->setPen(_prefs->fuzzyForegroundColor());
- QRect tr;
+ TQRect tr;
if (_applet->getOrientation() == Vertical)
{
p->rotate(90);
- tr = QRect(4, -2, height() - 8, -(width()) + 2);
+ tr = TQRect(4, -2, height() - 8, -(width()) + 2);
}
else
- tr = QRect(4, 2, width() - 8, height() - 4);
+ tr = TQRect(4, 2, width() - 8, height() - 4);
if (!KickerSettings::transparent())
p->drawText(tr, AlignCenter, _timeStr);
@@ -895,14 +895,14 @@ bool FuzzyClock::showDayOfWeek()
//************************************************************
-ClockApplet::ClockApplet(const QString& configFile, Type t, int actions,
- QWidget *parent, const char *name)
+ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
+ TQWidget *parent, const char *name)
: KPanelApplet(configFile, t, actions, parent, name),
_calendar(0),
_disableCalendar(false),
_clock(0),
- _timer(new QTimer(this)),
- m_layoutTimer(new QTimer(this)),
+ _timer(new TQTimer(this)),
+ m_layoutTimer(new TQTimer(this)),
m_layoutDelay(0),
m_followBackgroundSetting(true),
m_dateFollowBackgroundSetting(true),
@@ -918,19 +918,19 @@ ClockApplet::ClockApplet(const QString& configFile, Type t, int actions,
configFileName = configFile.latin1();
setBackgroundOrigin(AncestorOrigin);
- _dayOfWeek = new QLabel(this);
+ _dayOfWeek = new TQLabel(this);
_dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
_dayOfWeek->setBackgroundOrigin(AncestorOrigin);
_dayOfWeek->installEventFilter(this); // catch mouse clicks
- _date = new QLabel(this);
+ _date = new TQLabel(this);
_date->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
_date->setBackgroundOrigin(AncestorOrigin);
_date->installEventFilter(this); // catch mouse clicks
- connect(m_layoutTimer, SIGNAL(timeout()), this, SLOT(fixupLayout()));
- connect(_timer, SIGNAL(timeout()), SLOT(slotUpdate()));
- connect(kapp, SIGNAL(kdisplayPaletteChanged()), SLOT(globalPaletteChange()));
+ connect(m_layoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout()));
+ connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate()));
+ connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(globalPaletteChange()));
reconfigure(); // initialize clock widget
slotUpdate();
@@ -938,8 +938,8 @@ ClockApplet::ClockApplet(const QString& configFile, Type t, int actions,
if (kapp->authorizeKAction("kicker_rmb"))
{
menu = new KPopupMenu();
- connect(menu, SIGNAL(aboutToShow()), SLOT(aboutToShowContextMenu()));
- connect(menu, SIGNAL(activated(int)), SLOT(contextMenuActivated(int)));
+ connect(menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu()));
+ connect(menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
setCustomMenu(menu);
}
@@ -1030,7 +1030,7 @@ int ClockApplet::widthForHeight(int h) const
{
// if the date format STARTS with a year, assume it's in descending
// order and should therefore PRECEED the date.
- QString dateFormat = KGlobal::locale()->dateFormatShort();
+ TQString dateFormat = KGlobal::locale()->dateFormatShort();
dateFirst = dateFormat.at(1) == 'y' || dateFormat.at(1) == 'Y';
}
@@ -1129,9 +1129,9 @@ int ClockApplet::heightForWidth(int w) const
if (_date->minimumSizeHint().width() > w)
{
- QString dateStr = _date->text();
+ TQString dateStr = _date->text();
// if we're too wide to fit, replace the first non-digit from the end with a space
- int p = dateStr.findRev(QRegExp("[^0-9]"));
+ int p = dateStr.findRev(TQRegExp("[^0-9]"));
if (p > 0)
{
_date->setText(dateStr.insert(p, '\n'));
@@ -1167,7 +1167,7 @@ void ClockApplet::preferences(bool timezone)
if (!dialog)
{
dialog = new KConfigDialogSingle(zone, this, configFileName, _prefs, KDialogBase::Swallow);
- connect(dialog, SIGNAL(settingsChanged()), this, SLOT(slotReconfigure()));
+ connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotReconfigure()));
}
if (timezone)
@@ -1180,8 +1180,8 @@ void ClockApplet::preferences(bool timezone)
void ClockApplet::updateFollowBackground()
{
- QColor globalBgroundColor = KApplication::palette().active().background();
- QColor bgColor;
+ TQColor globalBgroundColor = KApplication::palette().active().background();
+ TQColor bgColor;
switch (_prefs->type())
{
@@ -1253,7 +1253,7 @@ void ClockApplet::reconfigure()
m_updateOnTheMinute = updateInterval != shortInterval;
if (m_updateOnTheMinute)
{
- connect(_timer, SIGNAL(timeout()), this, SLOT(setTimerTo60()));
+ connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
updateInterval = ((60 - clockGetTime().second()) * 1000) + 500;
}
else
@@ -1261,7 +1261,7 @@ void ClockApplet::reconfigure()
// in case we reconfigure to show seconds but setTimerTo60 is going to be called
// we need to make sure to disconnect this so we don't end up updating only once
// a minute ;)
- disconnect(_timer, SIGNAL(timeout()), this, SLOT(setTimerTo60()));
+ disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
}
_timer->start(updateInterval);
@@ -1311,14 +1311,14 @@ void ClockApplet::reconfigure()
void ClockApplet::setTimerTo60()
{
// kdDebug() << "setTimerTo60" << endl;
- disconnect(_timer, SIGNAL(timeout()), this, SLOT(setTimerTo60()));
+ disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
_timer->changeInterval(60000);
}
void ClockApplet::setBackground()
{
- QColor globalBgroundColor = KApplication::palette().active().background();
- QColor fgColor, bgColor;
+ TQColor globalBgroundColor = KApplication::palette().active().background();
+ TQColor fgColor, bgColor;
if (!_clock)
return;
@@ -1382,7 +1382,7 @@ void ClockApplet::globalPaletteChange()
if (!m_dateFollowBackgroundSetting && !m_followBackgroundSetting)
return;
- QColor globalBgroundColor = KApplication::palette().active().background();
+ TQColor globalBgroundColor = KApplication::palette().active().background();
if (m_dateFollowBackgroundSetting)
_prefs->setDateBackgroundColor(globalBgroundColor);
@@ -1428,7 +1428,7 @@ void ClockApplet::slotUpdate()
if (seconds > 2)
{
- connect(_timer, SIGNAL(timeout()), this, SLOT(setTimerTo60()));
+ connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
_timer->changeInterval(((60 - seconds) * 1000) + 500);
}
}
@@ -1441,7 +1441,7 @@ void ClockApplet::slotCalendarDeleted()
_calendar = 0L;
// don't reopen the calendar immediately ...
_disableCalendar = true;
- QTimer::singleShot(100, this, SLOT(slotEnableCalendar()));
+ TQTimer::singleShot(100, this, TQT_SLOT(slotEnableCalendar()));
// we are free to show a tip know :)
installEventFilter(KickerTip::the());
@@ -1471,11 +1471,11 @@ void ClockApplet::toggleCalendar()
removeEventFilter(KickerTip::the());
_calendar = new DatePicker(this, _lastDate, _prefs);
- connect(_calendar, SIGNAL(destroyed()), SLOT(slotCalendarDeleted()));
+ connect(_calendar, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCalendarDeleted()));
- QSize size = _prefs->calendarSize();
+ TQSize size = _prefs->calendarSize();
- if (size != QSize())
+ if (size != TQSize())
{
_calendar->resize(size);
}
@@ -1485,7 +1485,7 @@ void ClockApplet::toggleCalendar()
}
// make calendar fully visible
- QPoint popupAt = KickerLib::popupPosition(popupDirection(),
+ TQPoint popupAt = KickerLib::popupPosition(popupDirection(),
_calendar,
this);
_calendar->move(popupAt);
@@ -1499,7 +1499,7 @@ void ClockApplet::openContextMenu()
if (!menu || !kapp->authorizeKAction("kicker_rmb"))
return;
- menu->exec( QCursor::pos() );
+ menu->exec( TQCursor::pos() );
}
void ClockApplet::contextMenuActivated(int result)
@@ -1528,7 +1528,7 @@ void ClockApplet::contextMenuActivated(int result)
case 103:
proc << locate("exe", "kdesu");
proc << "--nonewdcop";
- proc << QString("%1 kde-clock.desktop --lang %2")
+ proc << TQString("%1 kde-clock.desktop --lang %2")
.arg(locate("exe", "kcmshell"))
.arg(KGlobal::locale()->language());
proc.start(KProcess::DontCare);
@@ -1552,7 +1552,7 @@ void ClockApplet::aboutToShowContextMenu()
menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) );
KLocale *loc = KGlobal::locale();
- QDateTime dt = QDateTime::currentDateTime();
+ TQDateTime dt = TQDateTime::currentDateTime();
dt = dt.addSecs(TZoffset);
KPopupMenu *copyMenu = new KPopupMenu( menu );
@@ -1565,12 +1565,12 @@ void ClockApplet::aboutToShowContextMenu()
copyMenu->insertItem(dt.time().toString(), 207);
copyMenu->insertItem(dt.toString(), 208);
copyMenu->insertItem(dt.toString("yyyy-MM-dd hh:mm:ss"), 209);
- connect( copyMenu, SIGNAL( activated(int) ), this, SLOT( slotCopyMenuActivated(int) ) );
+ connect( copyMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotCopyMenuActivated(int) ) );
if (!bImmutable)
{
KPopupMenu *zoneMenu = new KPopupMenu( menu );
- connect(zoneMenu, SIGNAL(activated(int)), SLOT(contextMenuActivated(int)));
+ connect(zoneMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
for (int i = 0; i <= zone->remoteZoneCount(); i++)
{
if (i == 0)
@@ -1587,7 +1587,7 @@ void ClockApplet::aboutToShowContextMenu()
zoneMenu->insertItem(SmallIcon("configure"), i18n("&Configure Timezones..."), 110);
KPopupMenu *type_menu = new KPopupMenu(menu);
- connect(type_menu, SIGNAL(activated(int)), SLOT(contextMenuActivated(int)));
+ connect(type_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
type_menu->insertItem(i18n("&Plain"), Prefs::EnumType::Plain, 1);
type_menu->insertItem(i18n("&Digital"), Prefs::EnumType::Digital, 2);
type_menu->insertItem(i18n("&Analog"), Prefs::EnumType::Analog, 3);
@@ -1614,19 +1614,19 @@ void ClockApplet::aboutToShowContextMenu()
void ClockApplet::slotCopyMenuActivated( int id )
{
- QPopupMenu *m = (QPopupMenu *) sender();
- QString s = m->text(id);
- QApplication::clipboard()->setText(s);
+ TQPopupMenu *m = (TQPopupMenu *) sender();
+ TQString s = m->text(id);
+ TQApplication::clipboard()->setText(s);
}
-QTime ClockApplet::clockGetTime()
+TQTime ClockApplet::clockGetTime()
{
- return QTime::currentTime().addSecs(TZoffset);
+ return TQTime::currentTime().addSecs(TZoffset);
}
-QDate ClockApplet::clockGetDate()
+TQDate ClockApplet::clockGetDate()
{
- return QDateTime::currentDateTime().addSecs(TZoffset).date();
+ return TQDateTime::currentDateTime().addSecs(TZoffset).date();
}
void ClockApplet::showZone(int z)
@@ -1649,26 +1649,26 @@ void ClockApplet::prevZone()
showZone(zone->zoneIndex());
}
-void ClockApplet::mousePressEvent(QMouseEvent *ev)
+void ClockApplet::mousePressEvent(TQMouseEvent *ev)
{
switch (ev->button())
{
- case QMouseEvent::LeftButton:
+ case TQMouseEvent::LeftButton:
toggleCalendar();
break;
- case QMouseEvent::RightButton:
+ case TQMouseEvent::RightButton:
openContextMenu();
break;
- case QMouseEvent::MidButton:
+ case TQMouseEvent::MidButton:
nextZone();
- QToolTip::remove(_clock->widget());
+ TQToolTip::remove(_clock->widget());
break;
default:
break;
}
}
-void ClockApplet::wheelEvent(QWheelEvent* e)
+void ClockApplet::wheelEvent(TQWheelEvent* e)
{
if (e->delta() < 0)
{
@@ -1679,17 +1679,17 @@ void ClockApplet::wheelEvent(QWheelEvent* e)
nextZone();
}
- QToolTip::remove(_clock->widget());
+ TQToolTip::remove(_clock->widget());
KickerTip::Client::updateKickerTip();
}
// catch the mouse clicks of our child widgets
-bool ClockApplet::eventFilter( QObject *o, QEvent *e )
+bool ClockApplet::eventFilter( TQObject *o, TQEvent *e )
{
if (( o == _clock->widget() || o == _date || o == _dayOfWeek) &&
- e->type() == QEvent::MouseButtonPress )
+ e->type() == TQEvent::MouseButtonPress )
{
- mousePressEvent(static_cast<QMouseEvent*>(e) );
+ mousePressEvent(static_cast<TQMouseEvent*>(e) );
return true;
}
@@ -1709,13 +1709,13 @@ void ClockApplet::updateDateLabel(bool reLayout)
if (zone->zoneIndex() != 0)
{
- QString zone_s = i18n(zone->zone().utf8());
+ TQString zone_s = i18n(zone->zone().utf8());
_date->setText(zone_s.mid(zone_s.find('/') + 1).replace("_", " "));
_date->setShown(true);
}
else
{
- QString dateStr = KGlobal::locale()->formatDate(_lastDate, true);
+ TQString dateStr = KGlobal::locale()->formatDate(_lastDate, true);
_date->setText(dateStr);
_date->setShown(showDate);
}
@@ -1736,12 +1736,12 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
{
int zoneCount = zone->remoteZoneCount();
- QString activeZone = zone->zone();
+ TQString activeZone = zone->zone();
if (zoneCount == 0)
{
- QString _time = KGlobal::locale()->formatTime(clockGetTime(),
+ TQString _time = KGlobal::locale()->formatTime(clockGetTime(),
_prefs->plainShowSeconds());
- QString _date = KGlobal::locale()->formatDate(clockGetDate(), false);
+ TQString _date = KGlobal::locale()->formatDate(clockGetDate(), false);
data.message = _time;
data.subtext = _date;
@@ -1757,7 +1757,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
for (int i = 0; i <= zone->remoteZoneCount(); i++)
{
- QString m_zone = zone->zone(i);
+ TQString m_zone = zone->zone(i);
TZoffset = zone->calc_TZ_offset(m_zone);
if (!m_zone.isEmpty())
@@ -1765,9 +1765,9 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
m_zone = i18n(m_zone.utf8()); // ensure it gets translated
}
- QString _time = KGlobal::locale()->formatTime(clockGetTime(),
+ TQString _time = KGlobal::locale()->formatTime(clockGetTime(),
_prefs->plainShowSeconds());
- QString _date = KGlobal::locale()->formatDate(clockGetDate(), false);
+ TQString _date = KGlobal::locale()->formatDate(clockGetDate(), false);
if (activeIndex == i)
{
@@ -1839,19 +1839,19 @@ int ClockApplet::type()
}
ClockAppletToolTip::ClockAppletToolTip( ClockApplet* clock )
- : QToolTip( clock ),
+ : TQToolTip( clock ),
m_clock( clock )
{
}
-void ClockAppletToolTip::maybeTip( const QPoint & /*point*/ )
+void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
{
- QString tipText;
+ TQString tipText;
if ( (m_clock->type() == Prefs::EnumType::Fuzzy) ||
(m_clock->type() == Prefs::EnumType::Analog) )
{
// show full time (incl. hour) as tooltip for Fuzzy clock
- tipText = KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(m_clock->TZoffset));
+ tipText = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset));
}
else
{
diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h
index efa67be46..e1bc980e8 100644
--- a/kicker/applets/clock/clock.h
+++ b/kicker/applets/clock/clock.h
@@ -24,15 +24,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __CLOCK_H
#define __CLOCK_H
-#include <qlcdnumber.h>
-#include <qlabel.h>
-#include <qtoolbutton.h>
-#include <qguardedptr.h>
-#include <qdatetime.h>
-#include <qvbox.h>
-#include <qstringlist.h>
-#include <qtooltip.h>
-#include <qevent.h>
+#include <tqlcdnumber.h>
+#include <tqlabel.h>
+#include <tqtoolbutton.h>
+#include <tqguardedptr.h>
+#include <tqdatetime.h>
+#include <tqvbox.h>
+#include <tqstringlist.h>
+#include <tqtooltip.h>
+#include <tqevent.h>
#include <dcopobject.h>
#include <kpanelapplet.h>
@@ -71,7 +71,7 @@ class SettingsWidgetImp : public SettingsWidget
public:
SettingsWidgetImp(Prefs *p=0,
Zone *z=0,
- QWidget* parent=0,
+ TQWidget* parent=0,
const char* name=0,
WFlags fl=0);
public slots:
@@ -88,7 +88,7 @@ class KConfigDialogSingle : public KConfigDialog
public:
KConfigDialogSingle(Zone *zone,
- QWidget *parent=0,
+ TQWidget *parent=0,
const char *name=0,
Prefs *prefs=0,
KDialogBase::DialogType dialogType = KDialogBase::IconList,
@@ -120,7 +120,7 @@ class ClockWidget
ClockWidget(ClockApplet *applet, Prefs *prefs);
virtual ~ClockWidget();
- virtual QWidget* widget()=0;
+ virtual TQWidget* widget()=0;
virtual int preferedWidthForHeight(int h) const =0;
virtual int preferedHeightForWidth(int w) const =0;
virtual void updateClock()=0;
@@ -132,19 +132,19 @@ class ClockWidget
protected:
ClockApplet *_applet;
Prefs *_prefs;
- QTime _time;
+ TQTime _time;
bool _force;
};
-class PlainClock : public QLabel, public ClockWidget
+class PlainClock : public TQLabel, public ClockWidget
{
Q_OBJECT
public:
- PlainClock(ClockApplet *applet, Prefs *prefs, QWidget *parent=0, const char *name=0);
+ PlainClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0);
- QWidget* widget() { return this; }
+ TQWidget* widget() { return this; }
int preferedWidthForHeight(int h) const;
int preferedHeightForWidth(int w) const;
void updateClock();
@@ -153,22 +153,22 @@ class PlainClock : public QLabel, public ClockWidget
bool showDayOfWeek();
protected:
- void paintEvent(QPaintEvent *e);
- void drawContents(QPainter *p);
+ void paintEvent(TQPaintEvent *e);
+ void drawContents(TQPainter *p);
- QString _timeStr;
+ TQString _timeStr;
};
-class DigitalClock : public QLCDNumber, public ClockWidget
+class DigitalClock : public TQLCDNumber, public ClockWidget
{
Q_OBJECT
public:
- DigitalClock(ClockApplet *applet, Prefs *prefs, QWidget *parent=0, const char *name=0);
+ DigitalClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0);
~DigitalClock();
- QWidget* widget() { return this; }
+ TQWidget* widget() { return this; }
int preferedWidthForHeight(int h) const;
int preferedHeightForWidth(int w) const;
void updateClock();
@@ -177,25 +177,25 @@ class DigitalClock : public QLCDNumber, public ClockWidget
bool showDayOfWeek();
protected:
- void paintEvent( QPaintEvent*);
- void drawContents( QPainter * p);
- void resizeEvent ( QResizeEvent *ev);
+ void paintEvent( TQPaintEvent*);
+ void drawContents( TQPainter * p);
+ void resizeEvent ( TQResizeEvent *ev);
- QPixmap *_buffer;
- QString _timeStr;
- QPixmap lcdPattern;
+ TQPixmap *_buffer;
+ TQString _timeStr;
+ TQPixmap lcdPattern;
};
-class AnalogClock : public QFrame, public ClockWidget
+class AnalogClock : public TQFrame, public ClockWidget
{
Q_OBJECT
public:
- AnalogClock(ClockApplet *applet, Prefs *prefs, QWidget *parent=0, const char *name=0);
+ AnalogClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0);
~AnalogClock();
- QWidget* widget() { return this; }
+ TQWidget* widget() { return this; }
int preferedWidthForHeight(int h) const { return h; }
int preferedHeightForWidth(int w) const { return w; }
void updateClock();
@@ -204,24 +204,24 @@ class AnalogClock : public QFrame, public ClockWidget
bool showDayOfWeek();
protected:
- virtual void paintEvent(QPaintEvent *);
- void styleChange(QStyle&);
+ virtual void paintEvent(TQPaintEvent *);
+ void styleChange(TQStyle&);
void initBackgroundPixmap();
- QPixmap *_spPx;
- QPixmap lcdPattern;
+ TQPixmap *_spPx;
+ TQPixmap lcdPattern;
int _bgScale;
};
-class FuzzyClock : public QFrame, public ClockWidget
+class FuzzyClock : public TQFrame, public ClockWidget
{
Q_OBJECT
public:
- FuzzyClock(ClockApplet *applet, Prefs* prefs, QWidget *parent=0, const char *name=0);
+ FuzzyClock(ClockApplet *applet, Prefs* prefs, TQWidget *parent=0, const char *name=0);
- QWidget* widget() { return this; }
+ TQWidget* widget() { return this; }
int preferedWidthForHeight(int h) const;
int preferedHeightForWidth(int w) const;
void updateClock();
@@ -233,14 +233,14 @@ class FuzzyClock : public QFrame, public ClockWidget
void deleteMyself();
protected:
- virtual void drawContents(QPainter *p);
+ virtual void drawContents(TQPainter *p);
- QStringList hourNames;
- QStringList normalFuzzy;
- QStringList normalFuzzyOne;
- QStringList dayTime;
+ TQStringList hourNames;
+ TQStringList normalFuzzy;
+ TQStringList normalFuzzyOne;
+ TQStringList dayTime;
- QString _timeStr;
+ TQString _timeStr;
private:
bool alreadyDrawing;
@@ -252,7 +252,7 @@ class ClockAppletToolTip : public QToolTip
ClockAppletToolTip( ClockApplet* clock );
protected:
- virtual void maybeTip( const QPoint & );
+ virtual void maybeTip( const TQPoint & );
private:
ClockApplet *m_clock;
@@ -266,8 +266,8 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb
friend class ClockAppletToolTip;
public:
- ClockApplet(const QString& configFile, Type t = Normal, int actions = 0,
- QWidget *parent = 0, const char *name = 0);
+ ClockApplet(const TQString& configFile, Type t = Normal, int actions = 0,
+ TQWidget *parent = 0, const char *name = 0);
~ClockApplet();
int widthForHeight(int h) const;
@@ -279,8 +279,8 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb
void resizeRequest() { emit(updateLayout()); }
const Zone* timezones() { return zone; }
- QTime clockGetTime();
- QDate clockGetDate();
+ TQTime clockGetTime();
+ TQDate clockGetDate();
virtual void updateKickerTip(KickerTip::Data&);
@@ -310,23 +310,23 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb
void prevZone();
void updateFollowBackground();
- void paletteChange(const QPalette &) { setBackground(); }
+ void paletteChange(const TQPalette &) { setBackground(); }
void setBackground();
- void mousePressEvent(QMouseEvent *ev);
- void wheelEvent(QWheelEvent* e);
- bool eventFilter(QObject *, QEvent *);
+ void mousePressEvent(TQMouseEvent *ev);
+ void wheelEvent(TQWheelEvent* e);
+ bool eventFilter(TQObject *, TQEvent *);
virtual void positionChange(Position p);
- QCString configFileName;
+ TQCString configFileName;
DatePicker *_calendar;
bool _disableCalendar;
ClockWidget *_clock;
- QLabel *_date;
- QLabel *_dayOfWeek;
- QDate _lastDate;
- QTimer *_timer;
- QTimer *m_layoutTimer;
+ TQLabel *_date;
+ TQLabel *_dayOfWeek;
+ TQDate _lastDate;
+ TQTimer *_timer;
+ TQTimer *m_layoutTimer;
int m_layoutDelay;
bool m_followBackgroundSetting;
bool m_dateFollowBackgroundSetting;
@@ -338,7 +338,7 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb
bool showDate;
bool showDayOfWeek;
bool m_updateOnTheMinute;
- QStringList _remotezonelist;
+ TQStringList _remotezonelist;
KPopupMenu* menu;
ClockAppletToolTip m_tooltip;
KTextShadowEngine *m_shadowEngine;
diff --git a/kicker/applets/clock/datepicker.cpp b/kicker/applets/clock/datepicker.cpp
index 0ea677e8a..3864db556 100644
--- a/kicker/applets/clock/datepicker.cpp
+++ b/kicker/applets/clock/datepicker.cpp
@@ -30,8 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kwin.h>
#include <netwm.h>
-DatePicker::DatePicker(QWidget *parent, const QDate& date, Prefs* _prefs)
- : QVBox( parent, 0,
+DatePicker::DatePicker(TQWidget *parent, const TQDate& date, Prefs* _prefs)
+ : TQVBox( parent, 0,
_prefs->calendarFullWindow()
? (WType_TopLevel | WDestructiveClose |
WStyle_StaysOnTop)
@@ -43,11 +43,11 @@ DatePicker::DatePicker(QWidget *parent, const QDate& date, Prefs* _prefs)
if (prefs->calendarFullWindow())
{
KWin::setType(winId(), NET::Utility);
- setFrameStyle(QFrame::NoFrame);
+ setFrameStyle(TQFrame::NoFrame);
}
else
{
- setFrameStyle(QFrame::PopupPanel | QFrame::Raised);
+ setFrameStyle(TQFrame::PopupPanel | TQFrame::Raised);
}
KWin::setOnAllDesktops(handle(), true);
@@ -59,15 +59,15 @@ DatePicker::DatePicker(QWidget *parent, const QDate& date, Prefs* _prefs)
setIcon(SmallIcon("date"));
}
-void DatePicker::closeEvent(QCloseEvent* e)
+void DatePicker::closeEvent(TQCloseEvent* e)
{
prefs->setCalendarSize(size());
- QVBox::closeEvent(e);
+ TQVBox::closeEvent(e);
}
-void DatePicker::keyPressEvent(QKeyEvent *e)
+void DatePicker::keyPressEvent(TQKeyEvent *e)
{
- QVBox::keyPressEvent(e);
+ TQVBox::keyPressEvent(e);
if (e->key() == Qt::Key_Escape)
{
@@ -75,12 +75,12 @@ void DatePicker::keyPressEvent(QKeyEvent *e)
}
}
-bool DatePicker::setDate(const QDate& date)
+bool DatePicker::setDate(const TQDate& date)
{
return picker->setDate(date);
}
-QDate DatePicker::date()
+TQDate DatePicker::date()
{
return picker->date();
}
diff --git a/kicker/applets/clock/datepicker.h b/kicker/applets/clock/datepicker.h
index ee39261e0..f2e8a3397 100644
--- a/kicker/applets/clock/datepicker.h
+++ b/kicker/applets/clock/datepicker.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __DATEPICKER_H
#define __DATEPICKER_H
-#include <qvbox.h>
-#include <qdatetime.h>
+#include <tqvbox.h>
+#include <tqdatetime.h>
class KDatePicker;
class Prefs;
@@ -33,13 +33,13 @@ class Prefs;
class DatePicker : public QVBox
{
public:
- DatePicker(QWidget*, const QDate&, Prefs* _prefs);
- bool setDate(const QDate& date);
- QDate date();
+ DatePicker(TQWidget*, const TQDate&, Prefs* _prefs);
+ bool setDate(const TQDate& date);
+ TQDate date();
protected:
- void closeEvent(QCloseEvent* e);
- void keyPressEvent(QKeyEvent *e);
+ void closeEvent(TQCloseEvent* e);
+ void keyPressEvent(TQKeyEvent *e);
private:
KDatePicker *picker;
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index 1d952a765..320d84b4c 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -34,8 +34,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kstringhandler.h>
#include <klocale.h>
-#include <qfile.h>
-#include <qtooltip.h>
+#include <tqfile.h>
+#include <tqtooltip.h>
#include <klistview.h>
#include <time.h>
@@ -51,8 +51,8 @@ Zone::Zone(KConfig* conf):
config->setGroup("General");
/* default displayable timezones */
- QString tzList = config->readEntry("RemoteZones");
- _remotezonelist = QStringList::split(",", tzList);
+ TQString tzList = config->readEntry("RemoteZones");
+ _remotezonelist = TQStringList::split(",", tzList);
setZone(config->readNumEntry("Initial_TZ", 0));
}
@@ -69,12 +69,12 @@ void Zone::setZone(int z)
_zoneIndex = z;
}
-QString Zone::zone(int z) const
+TQString Zone::zone(int z) const
{
return (z == 0 ? _defaultTZ : _remotezonelist[z-1]);
}
-int Zone::calc_TZ_offset(const QString& zone, bool /* reset */)
+int Zone::calc_TZ_offset(const TQString& zone, bool /* reset */)
{
const KTimezone *z = zone.isEmpty() ? m_zoneDb.local() : m_zoneDb.zone(zone);
@@ -94,26 +94,26 @@ int Zone::calc_TZ_offset(const QString& zone, bool /* reset */)
void Zone::readZoneList(KListView *listView )
{
const KTimezones::ZoneMap zones = m_zoneDb.allZones();
- QMap<QString, QListViewItem*> KontinentMap;
+ TQMap<TQString, TQListViewItem*> KontinentMap;
listView->setRootIsDecorated(true);
for (KTimezones::ZoneMap::ConstIterator it = zones.begin(); it != zones.end(); ++it)
{
const KTimezone *zone = it.data();
- QString tzName = zone->name();
- QString comment = zone->comment();
+ TQString tzName = zone->name();
+ TQString comment = zone->comment();
if (!comment.isEmpty())
comment = i18n(comment.utf8());
- const QStringList KontCity = QStringList::split("/", i18n(tzName.utf8()).replace("_", " "));
- QListViewItem* Kontinent = KontinentMap[KontCity[0]];
+ const TQStringList KontCity = TQStringList::split("/", i18n(tzName.utf8()).replace("_", " "));
+ TQListViewItem* Kontinent = KontinentMap[KontCity[0]];
if (!Kontinent) {
- KontinentMap[KontCity[0]] = new QListViewItem(listView, KontCity[0]);
+ KontinentMap[KontCity[0]] = new TQListViewItem(listView, KontCity[0]);
Kontinent = KontinentMap[KontCity[0]];
Kontinent->setExpandable(true);
}
- QCheckListItem *li = new QCheckListItem(Kontinent, KontCity[1], QCheckListItem::CheckBox);
+ TQCheckListItem *li = new TQCheckListItem(Kontinent, KontCity[1], TQCheckListItem::CheckBox);
li->setText(1, comment);
li->setText(2, tzName); /* store complete path in ListView */
@@ -122,11 +122,11 @@ void Zone::readZoneList(KListView *listView )
// locate the flag from /l10n/%1/flag.png
// if not available select default "C" flag
- QString flag = locate( "locale", QString("l10n/%1/flag.png").arg(zone->countryCode().lower()) );
- if (!QFile::exists(flag))
+ TQString flag = locate( "locale", TQString("l10n/%1/flag.png").arg(zone->countryCode().lower()) );
+ if (!TQFile::exists(flag))
flag = locate( "locale", "l10n/C/flag.png" );
- if (QFile::exists(flag))
- li->setPixmap(0, QPixmap(flag));
+ if (TQFile::exists(flag))
+ li->setPixmap(0, TQPixmap(flag));
}
}
@@ -135,14 +135,14 @@ void Zone::getSelectedZonelist(KListView *listView)
_remotezonelist.clear();
/* loop through all entries */
- QListViewItem *root = listView->firstChild();
+ TQListViewItem *root = listView->firstChild();
while (root) {
if (root->firstChild()) {
root = root->firstChild();
continue;
}
- QCheckListItem *cl = (QCheckListItem*) root;
+ TQCheckListItem *cl = (TQCheckListItem*) root;
if (cl->isOn()) {
_remotezonelist.append(cl->text(2));
}
diff --git a/kicker/applets/clock/zone.h b/kicker/applets/clock/zone.h
index 34371c6ae..db34188bd 100644
--- a/kicker/applets/clock/zone.h
+++ b/kicker/applets/clock/zone.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define __ZONE_H
#include <ktimezones.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
class KConfig;
class KListView;
@@ -38,24 +38,24 @@ public:
void writeSettings();
- QString zone() const { return zone(_zoneIndex); };
- QString zone(int z) const;
- QStringList remoteZoneList() const { return _remotezonelist; };
+ TQString zone() const { return zone(_zoneIndex); };
+ TQString zone(int z) const;
+ TQStringList remoteZoneList() const { return _remotezonelist; };
int remoteZoneCount() { return _remotezonelist.count(); };
unsigned int zoneIndex() const { return _zoneIndex; }
void setZone(int z = 0);
void nextZone();
void prevZone();
- int calc_TZ_offset(const QString& zone, bool reset=false);
+ int calc_TZ_offset(const TQString& zone, bool reset=false);
void readZoneList(KListView *listView);
void getSelectedZonelist(KListView *listView);
protected:
KTimezones m_zoneDb;
- QStringList _remotezonelist;
+ TQStringList _remotezonelist;
KConfig *config;
- QString _defaultTZ;
+ TQString _defaultTZ;
unsigned int _zoneIndex;
};
diff --git a/kicker/applets/launcher/configdlg.cpp b/kicker/applets/launcher/configdlg.cpp
index 9950dd2a9..c35f0970c 100644
--- a/kicker/applets/launcher/configdlg.cpp
+++ b/kicker/applets/launcher/configdlg.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qcombobox.h>
+#include <tqcombobox.h>
#include <klocale.h>
#include <kdebug.h>
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "configdlg.h"
#include "configdlgbase.h"
-ConfigDlg::ConfigDlg(QWidget *parent, const char *name, Prefs *config,
+ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config,
int autoSize, KConfigDialog::DialogType dialogType,
int dialogButtons) :
KConfigDialog(parent, name, config, dialogType, dialogButtons),
@@ -44,11 +44,11 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, Prefs *config,
m_ui->iconDim->insertItem(i18n("Automatic"));
for (int n=0; n<int(m_settings->iconDimChoices().size()); ++n)
{
- m_ui->iconDim->insertItem(QString::number(
+ m_ui->iconDim->insertItem(TQString::number(
m_settings->iconDimChoices()[n]));
}
- connect(m_ui->iconDim, SIGNAL(textChanged(const QString&)),
- this, SLOT(updateButtons()));
+ connect(m_ui->iconDim, TQT_SIGNAL(textChanged(const TQString&)),
+ this, TQT_SLOT(updateButtons()));
updateWidgets();
m_oldIconDimText = m_ui->iconDim->currentText();
updateButtons();
@@ -83,7 +83,7 @@ void ConfigDlg::updateWidgets()
}
else
{
- m_ui->iconDim->setEditText(QString::number(m_settings->iconDim()));
+ m_ui->iconDim->setEditText(TQString::number(m_settings->iconDim()));
}
}
diff --git a/kicker/applets/launcher/configdlg.h b/kicker/applets/launcher/configdlg.h
index 1d03a9381..ff35098d3 100644
--- a/kicker/applets/launcher/configdlg.h
+++ b/kicker/applets/launcher/configdlg.h
@@ -34,7 +34,7 @@ class ConfigDlg : public KConfigDialog
Q_OBJECT
public:
- ConfigDlg(QWidget *parent, const char *name, Prefs *config, int autoSize,
+ ConfigDlg(TQWidget *parent, const char *name, Prefs *config, int autoSize,
KConfigDialog::DialogType dialogType, int dialogButtons);
protected:
@@ -49,7 +49,7 @@ private:
ConfigDlgBase *m_ui;
Prefs* m_settings;
int m_autoSize;
- QString m_oldIconDimText;
+ TQString m_oldIconDimText;
};
#endif
diff --git a/kicker/applets/launcher/flowgridmanager.cpp b/kicker/applets/launcher/flowgridmanager.cpp
index b5715097b..0cf3fba62 100644
--- a/kicker/applets/launcher/flowgridmanager.cpp
+++ b/kicker/applets/launcher/flowgridmanager.cpp
@@ -13,10 +13,10 @@
#endif
-FlowGridManager::FlowGridManager(QSize p_item_size,
- QSize p_space_size,
- QSize p_border_size,
- QSize p_frame_size,
+FlowGridManager::FlowGridManager(TQSize p_item_size,
+ TQSize p_space_size,
+ TQSize p_border_size,
+ TQSize p_frame_size,
Qt::Orientation orient,
int num_items,
Slack slack_x,Slack slack_y)
@@ -42,25 +42,25 @@ void FlowGridManager::setNumItems(int num_items)
return;
_numItems=num_items; _dirty=true;
}
-void FlowGridManager::setItemSize(QSize p_item_size)
+void FlowGridManager::setItemSize(TQSize p_item_size)
{ if (_pItemSize==p_item_size)
return;
_pItemSize=p_item_size; _dirty=true;
}
-void FlowGridManager::setSpaceSize(QSize p_space_size)
+void FlowGridManager::setSpaceSize(TQSize p_space_size)
{ if (_pSpaceSize==p_space_size)
return;
_pSpaceSize=p_space_size; _dirty=true;
}
-void FlowGridManager::setBorderSize(QSize p_border_size)
+void FlowGridManager::setBorderSize(TQSize p_border_size)
{ if (_pBorderSize==p_border_size)
return;
_pBorderSize=p_border_size; _dirty=true;
}
-void FlowGridManager::setFrameSize(QSize p_frame_size)
+void FlowGridManager::setFrameSize(TQSize p_frame_size)
{ if (_pFrameSize==p_frame_size)
return;
_pFrameSize=p_frame_size;
@@ -93,25 +93,25 @@ void FlowGridManager::setConserveSpace(bool conserve)
// get members
-QSize FlowGridManager::itemSize() const
+TQSize FlowGridManager::itemSize() const
{ _checkReconfigure(); return _itemSize;}
-QSize FlowGridManager::spaceSize() const
+TQSize FlowGridManager::spaceSize() const
{ _checkReconfigure(); return _spaceSize;}
-QSize FlowGridManager::borderSize() const
+TQSize FlowGridManager::borderSize() const
{ _checkReconfigure(); return _borderSize;}
-QSize FlowGridManager::gridDim() const
+TQSize FlowGridManager::gridDim() const
{ _checkReconfigure(); return _gridDim;}
-QSize FlowGridManager::gridSpacing() const
+TQSize FlowGridManager::gridSpacing() const
{ _checkReconfigure(); return _gridSpacing;}
-QSize FlowGridManager::frameSize() const
+TQSize FlowGridManager::frameSize() const
{ _checkReconfigure(); return _frameSize;}
-QPoint FlowGridManager::origin() const
+TQPoint FlowGridManager::origin() const
{ _checkReconfigure(); return _origin;}
Qt::Orientation FlowGridManager::orientation() const
@@ -131,21 +131,21 @@ bool FlowGridManager::conserveSpace() const
bool FlowGridManager::isValid() const
{ _checkReconfigure(); return _valid;}
-QPoint FlowGridManager::posAtCell(int x,int y) const
+TQPoint FlowGridManager::posAtCell(int x,int y) const
{ _checkReconfigure();
- return _origin+QPoint(_gridSpacing.width()*x,_gridSpacing.height()*y);
+ return _origin+TQPoint(_gridSpacing.width()*x,_gridSpacing.height()*y);
}
-QPoint FlowGridManager::pos(int i) const
+TQPoint FlowGridManager::pos(int i) const
{ return posAtCell(cell(i).x(),cell(i).y());
}
-QPoint FlowGridManager::cell(int index) const
+TQPoint FlowGridManager::cell(int index) const
{ _checkReconfigure();
//assert((index>=0) && (index<_gridDim.width()*_gridDim.height()));
int x=index % _gridDim.width(),
y=index / _gridDim.width();
- return QPoint(x,y);
+ return TQPoint(x,y);
}
@@ -153,7 +153,7 @@ QPoint FlowGridManager::cell(int index) const
// return height if orientation is Horizontal
// return width if orientation is Vertical
-int FlowGridManager::_getHH(QSize size) const
+int FlowGridManager::_getHH(TQSize size) const
{ if (_orientation==Qt::Horizontal)
return size.height();
return size.width();
@@ -161,17 +161,17 @@ int FlowGridManager::_getHH(QSize size) const
// return height if orientation is Vertical
// return width if orientation is Horizontal
-int FlowGridManager::_getWH(QSize size) const
+int FlowGridManager::_getWH(TQSize size) const
{ if (_orientation==Qt::Horizontal)
return size.width();
return size.height();
}
// swap horizontal and vertical if orientation is Vertical, otherwise return arg
-QSize FlowGridManager::_swapHV(QSize hv) const
+TQSize FlowGridManager::_swapHV(TQSize hv) const
{ if (_orientation==Qt::Horizontal)
return hv;
- QSize temp=hv;
+ TQSize temp=hv;
temp.transpose();
return temp;
}
@@ -187,22 +187,22 @@ int FlowGridManager::_slack(int nitems,int length,int item,int space,int border)
void FlowGridManager::_clear() const
{
- _borderSize=QSize(0,0);
- _spaceSize=QSize(0,0);
- _itemSize=QSize(0,0);
- _gridDim=QSize(0,0);
- _gridSpacing=QSize(0,0);
- _origin=QPoint(0,0);
- _frameSize=QSize(0,0);
+ _borderSize=TQSize(0,0);
+ _spaceSize=TQSize(0,0);
+ _itemSize=TQSize(0,0);
+ _gridDim=TQSize(0,0);
+ _gridSpacing=TQSize(0,0);
+ _origin=TQPoint(0,0);
+ _frameSize=TQSize(0,0);
_dirty=false;
_valid=false;
}
-int FlowGridManager::indexNearest(QPoint p) const
+int FlowGridManager::indexNearest(TQPoint p) const
{ if (!isValid()) return -1;
- QPoint c=(p-_origin)-QPoint(_spaceSize.width(),_spaceSize.height())/2;
+ TQPoint c=(p-_origin)-TQPoint(_spaceSize.width(),_spaceSize.height())/2;
int x=c.x()/_gridSpacing.width(),
y=c.y()/_gridSpacing.height();
int i= x+y*_gridDim.width();
@@ -254,20 +254,20 @@ void FlowGridManager::_reconfigure() const
iSlack=slack/2;
pBorderHeight+=iSlack;
if (_conserveSpace) {
- _itemSize=_swapHV(QSize(_getWH(_pItemSize),pItemHeight));
- _spaceSize=_swapHV(QSize(_getWH(_pSpaceSize),pSpaceHeight));
- _borderSize=_swapHV(QSize(_getWH(_pBorderSize),pBorderHeight));
+ _itemSize=_swapHV(TQSize(_getWH(_pItemSize),pItemHeight));
+ _spaceSize=_swapHV(TQSize(_getWH(_pSpaceSize),pSpaceHeight));
+ _borderSize=_swapHV(TQSize(_getWH(_pBorderSize),pBorderHeight));
}
else {
- _itemSize=_swapHV(QSize(pItemHeight,pItemHeight));
- _spaceSize=_swapHV(QSize(pSpaceHeight,pSpaceHeight));
- _borderSize=_swapHV(QSize(pBorderHeight,pBorderHeight));
+ _itemSize=_swapHV(TQSize(pItemHeight,pItemHeight));
+ _spaceSize=_swapHV(TQSize(pSpaceHeight,pSpaceHeight));
+ _borderSize=_swapHV(TQSize(pBorderHeight,pBorderHeight));
}
- _gridDim=_swapHV(QSize(numspans,spanlen));
+ _gridDim=_swapHV(TQSize(numspans,spanlen));
_gridSpacing=_itemSize+_spaceSize;
- _origin=QPoint(_borderSize.width(),_borderSize.height());
- _frameSize=2*_borderSize+QSize(_gridDim.width()*_gridSpacing.width()-_spaceSize.width(),
+ _origin=TQPoint(_borderSize.width(),_borderSize.height());
+ _frameSize=2*_borderSize+TQSize(_gridDim.width()*_gridSpacing.width()-_spaceSize.width(),
_gridDim.height()*_gridSpacing.height()-_spaceSize.height());
_dirty=false;
diff --git a/kicker/applets/launcher/flowgridmanager.h b/kicker/applets/launcher/flowgridmanager.h
index 9d100c74f..521490c51 100644
--- a/kicker/applets/launcher/flowgridmanager.h
+++ b/kicker/applets/launcher/flowgridmanager.h
@@ -7,9 +7,9 @@
#ifndef __const_space_grid_h__
#define __const_space_grid_h__
-#include <qnamespace.h>
-#include <qpoint.h>
-#include <qsize.h>
+#include <tqnamespace.h>
+#include <tqpoint.h>
+#include <tqsize.h>
class FlowGridManager {
@@ -22,10 +22,10 @@ public:
ItemSlack,SpaceSlack,BorderSlack,NoSlack
} Slack;
- FlowGridManager(QSize p_item_size=QSize(0,0),
- QSize p_space_size=QSize(0,0),
- QSize p_border_size=QSize(0,0),
- QSize frame_size=QSize(0,0),
+ FlowGridManager(TQSize p_item_size=TQSize(0,0),
+ TQSize p_space_size=TQSize(0,0),
+ TQSize p_border_size=TQSize(0,0),
+ TQSize frame_size=TQSize(0,0),
Qt::Orientation orient=Qt::Horizontal,
int num_items=0,
Slack slack_x=ItemSlack,
@@ -33,39 +33,39 @@ public:
void setNumItems(int num_items);
- void setItemSize(QSize item_size);
- void setSpaceSize(QSize space_size);
- void setBorderSize(QSize border_size);
+ void setItemSize(TQSize item_size);
+ void setSpaceSize(TQSize space_size);
+ void setBorderSize(TQSize border_size);
void setOrientation(Qt::Orientation orient);
- void setFrameSize(QSize frame_size);
+ void setFrameSize(TQSize frame_size);
void setSlack(Slack slack_x, Slack slack_y);
void setConserveSpace(bool conserve);
- QSize itemSize() const;
- QSize spaceSize() const;
- QSize borderSize() const;
- QSize gridDim() const;
- QSize gridSpacing() const;
- QSize frameSize() const;
- QPoint origin() const;
+ TQSize itemSize() const;
+ TQSize spaceSize() const;
+ TQSize borderSize() const;
+ TQSize gridDim() const;
+ TQSize gridSpacing() const;
+ TQSize frameSize() const;
+ TQPoint origin() const;
Qt::Orientation orientation() const;
bool conserveSpace() const;
// Slack slackX() const;
// Slack slackY() const;
- QPoint posAtCell(int x,int y) const;
- QPoint pos(int i) const;
- QPoint cell(int index) const;
+ TQPoint posAtCell(int x,int y) const;
+ TQPoint pos(int i) const;
+ TQPoint cell(int index) const;
bool isValid() const;
- int indexNearest(QPoint p) const;
+ int indexNearest(TQPoint p) const;
void dump();
protected:
- int _getHH(QSize size) const;
- int _getWH(QSize size) const;
- QSize _swapHV(QSize hv) const;
+ int _getHH(TQSize size) const;
+ int _getWH(TQSize size) const;
+ TQSize _swapHV(TQSize hv) const;
inline void _checkReconfigure() const;
int _slack(int nitems,int length,int item,int space,int border) const;
void _reconfigure() const;
@@ -73,15 +73,15 @@ protected:
protected:
// user-definable data
- QSize _pItemSize,_pSpaceSize,_pBorderSize,_pFrameSize;
+ TQSize _pItemSize,_pSpaceSize,_pBorderSize,_pFrameSize;
Slack _slackX, _slackY;
bool _conserveSpace;
Qt::Orientation _orientation;
int _numItems;
// results
- mutable QSize _itemSize, _spaceSize, _borderSize, _gridDim, _gridSpacing, _frameSize;
- mutable QPoint _origin;
+ mutable TQSize _itemSize, _spaceSize, _borderSize, _gridDim, _gridSpacing, _frameSize;
+ mutable TQPoint _origin;
// status
mutable bool _dirty, _valid;
diff --git a/kicker/applets/launcher/popularity.cpp b/kicker/applets/launcher/popularity.cpp
index 3bfcdd872..a22a98c99 100644
--- a/kicker/applets/launcher/popularity.cpp
+++ b/kicker/applets/launcher/popularity.cpp
@@ -48,7 +48,7 @@ public:
// gets also 1-falloff added to its popularity.
double falloff;
// popularity values for each service
- map<QString, double> vals;
+ map<TQString, double> vals;
// accumulated popularity of the unknown programs
// started before the statistic started
double iniVal;
@@ -56,7 +56,7 @@ public:
struct Popularity
{
- QString service;
+ TQString service;
double popularity;
bool operator<(const Popularity& p) const
{
@@ -70,7 +70,7 @@ public:
vector<SingleFalloffHistory> m_stats;
vector<Popularity> m_servicesByPopularity;
- map<QString, int> m_serviceRanks;
+ map<TQString, int> m_serviceRanks;
double m_historyHorizon;
};
@@ -86,13 +86,13 @@ PopularityStatistics::~PopularityStatistics()
delete d;
}
-void PopularityStatistics::useService(const QString& service)
+void PopularityStatistics::useService(const TQString& service)
{
vector<PopularityStatisticsImpl::SingleFalloffHistory>::iterator
it(d->m_stats.begin()), end(d->m_stats.end());
for (; it != end; ++it)
{
- map<QString, double>::iterator valIt;
+ map<TQString, double>::iterator valIt;
bool found(false);
for (valIt = it->vals.begin(); valIt != it->vals.end(); ++valIt)
{
@@ -113,19 +113,19 @@ void PopularityStatistics::useService(const QString& service)
d->updateServiceRanks();
}
-void PopularityStatistics::moveToTop(const QStringList& newTopServiceList)
+void PopularityStatistics::moveToTop(const TQStringList& newTopServiceList)
{
vector<PopularityStatisticsImpl::SingleFalloffHistory>::iterator
histIt(d->m_stats.begin()), histEnd(d->m_stats.end());
for (; histIt != histEnd; ++histIt)
{
- set<QString> newTopServices;
+ set<TQString> newTopServices;
for (uint n=0; n<newTopServiceList.size(); ++n)
newTopServices.insert(newTopServiceList[n]);
// Sort by popularity
vector<PopularityStatisticsImpl::Popularity> ranking;
- map<QString, double>::iterator valIt;
+ map<TQString, double>::iterator valIt;
for (valIt = histIt->vals.begin(); valIt != histIt->vals.end(); ++valIt)
{
PopularityStatisticsImpl::Popularity pop;
@@ -137,7 +137,7 @@ void PopularityStatistics::moveToTop(const QStringList& newTopServiceList)
// Get the new positions of each service in the ranking.
// We don't touch the popularity values in the ranking.
- list<QString> topServiceList, bottomServiceList;
+ list<TQString> topServiceList, bottomServiceList;
vector<PopularityStatisticsImpl::Popularity>:: iterator rankIt;
for (rankIt = ranking.begin(); rankIt != ranking.end(); ++rankIt)
{
@@ -160,16 +160,16 @@ void PopularityStatistics::moveToTop(const QStringList& newTopServiceList)
newTopServices.erase(newTopServices.begin());
}
- list<QString> newServiceList;
+ list<TQString> newServiceList;
copy(topServiceList.begin(), topServiceList.end(),
- back_insert_iterator<list<QString> >(newServiceList));
+ back_insert_iterator<list<TQString> >(newServiceList));
copy(bottomServiceList.begin(), bottomServiceList.end(),
- back_insert_iterator<list<QString> >(newServiceList));
+ back_insert_iterator<list<TQString> >(newServiceList));
// Merge the old list of service popularities
// with the new ordering of the services
histIt->vals.clear();
- list<QString>::iterator servIt;
+ list<TQString>::iterator servIt;
uint serviceIndex = 0;
//kdDebug() << endl;
@@ -207,12 +207,12 @@ void PopularityStatistics::moveToTop(const QStringList& newTopServiceList)
/*v
Old version - moves everything else one position up
and 'service' to the bottom
-void PopularityStatistics::moveToBottom(const QString& service)
+void PopularityStatistics::moveToBottom(const TQString& service)
{
// Moves a service to the bottom of the ranking
// by moving everything else to the top
d->updateServiceRanks();
- QStringList allButOneServices;
+ TQStringList allButOneServices;
vector<PopularityStatisticsImpl::Popularity>::iterator
it(d->m_servicesByPopularity.begin()),
end(d->m_servicesByPopularity.end());
@@ -224,7 +224,7 @@ void PopularityStatistics::moveToBottom(const QString& service)
moveToTop(allButOneServices);
}*/
-void PopularityStatistics::moveToBottom(const QString& service)
+void PopularityStatistics::moveToBottom(const TQString& service)
{
vector<PopularityStatisticsImpl::SingleFalloffHistory>::iterator
it(d->m_stats.begin()), end(d->m_stats.end());
@@ -237,12 +237,12 @@ void PopularityStatistics::moveToBottom(const QString& service)
d->updateServiceRanks();
}
-QString PopularityStatistics::serviceByRank(int n) const
+TQString PopularityStatistics::serviceByRank(int n) const
{
if (n >= 0 && n < int(d->m_servicesByPopularity.size()))
return d->m_servicesByPopularity[n].service;
else
- return QString();
+ return TQString();
}
double PopularityStatistics::popularityByRank(int n) const
@@ -253,7 +253,7 @@ double PopularityStatistics::popularityByRank(int n) const
return 0.0;
}
-int PopularityStatistics::rankByService(const QString service)
+int PopularityStatistics::rankByService(const TQString service)
{
if (d->m_serviceRanks.find(service) != d->m_serviceRanks.end())
{
@@ -264,16 +264,16 @@ int PopularityStatistics::rankByService(const QString service)
void PopularityStatistics::writeConfig(Prefs* prefs) const
{
- QStringList serviceNames, serviceHistories;
+ TQStringList serviceNames, serviceHistories;
int limit = prefs->serviceCacheSize();
//kdDebug() << "popularityData: writeConfig" << endl;
for (int n=0; n<int(d->m_servicesByPopularity.size()) && n<limit; ++n)
{
PopularityStatisticsImpl::Popularity pop = d->m_servicesByPopularity[n];
- QStringList historyData;
+ TQStringList historyData;
for (int i=0; i<int(d->m_stats.size()); ++i)
{
- historyData << QString::number(d->m_stats[i].vals[pop.service]);
+ historyData << TQString::number(d->m_stats[i].vals[pop.service]);
}
serviceNames << pop.service;
serviceHistories << historyData.join("/");
@@ -286,13 +286,13 @@ void PopularityStatistics::writeConfig(Prefs* prefs) const
void PopularityStatistics::readConfig(Prefs* prefs)
{
int n = 0;
- QStringList serviceNames = prefs->serviceNames();
- QStringList histories = prefs->serviceHistories();
+ TQStringList serviceNames = prefs->serviceNames();
+ TQStringList histories = prefs->serviceHistories();
for (n = std::min(serviceNames.size(), histories.size())-1; n>=0; --n)
{
- QString serviceName = serviceNames[n];
- QStringList serviceHistory =
- QStringList::split("/", histories[n]);
+ TQString serviceName = serviceNames[n];
+ TQStringList serviceHistory =
+ TQStringList::split("/", histories[n]);
for (int i=min(serviceHistory.size(), d->m_stats.size())-1; i>=0; --i)
{
d->m_stats[i].vals[serviceName] = serviceHistory[i].toDouble();
@@ -301,7 +301,7 @@ void PopularityStatistics::readConfig(Prefs* prefs)
for (int i=0; i<int(d->m_stats.size()); ++i)
{
- map<QString, double>::iterator valIt;
+ map<TQString, double>::iterator valIt;
double valSum = 0;
for (valIt = d->m_stats[i].vals.begin();
valIt != d->m_stats[i].vals.end(); ++valIt)
@@ -356,7 +356,7 @@ void PopularityStatisticsImpl::normalizeHistory(SingleFalloffHistory& h)
{
//kdDebug() << "Normalize history" << endl;
double sum = h.iniVal;
- map<QString, double>::iterator it;
+ map<TQString, double>::iterator it;
for (it = h.vals.begin(); it != h.vals.end(); ++it)
{
sum += it->second;
@@ -375,7 +375,7 @@ void PopularityStatisticsImpl::updateServiceRanks()
vector<SingleFalloffHistory>::iterator
it(m_stats.begin()), end(m_stats.end());
- map<QString, double> serviceValSum, serviceValWeightSum;
+ map<TQString, double> serviceValSum, serviceValWeightSum;
int numStats = m_stats.size();
for (int statIndex = 0; it != end; ++it, ++statIndex)
{
@@ -387,7 +387,7 @@ void PopularityStatisticsImpl::updateServiceRanks()
continue;
}
- map<QString, double>::iterator valIt;
+ map<TQString, double>::iterator valIt;
/*double valSum = 0;
for (valIt = it->vals.begin(); valIt != it->vals.end(); ++valIt)
{
@@ -402,7 +402,7 @@ void PopularityStatisticsImpl::updateServiceRanks()
}
m_servicesByPopularity.clear();
- map<QString, double>::iterator sIt;
+ map<TQString, double>::iterator sIt;
for (sIt = serviceValWeightSum.begin();
sIt != serviceValWeightSum.end(); ++sIt)
{
@@ -417,7 +417,7 @@ void PopularityStatisticsImpl::updateServiceRanks()
for (uint n = 0; n < m_servicesByPopularity.size(); ++n)
{
m_serviceRanks[m_servicesByPopularity[n].service] = n;
- /*kdDebug() << QString("Rank %1: %2 %3").arg(n)
+ /*kdDebug() << TQString("Rank %1: %2 %3").arg(n)
.arg(m_servicesByPopularity[n].popularity)
.arg(m_servicesByPopularity[n].service) << endl;*/
}
diff --git a/kicker/applets/launcher/popularity.h b/kicker/applets/launcher/popularity.h
index b1dcb32d6..06e7e0454 100644
--- a/kicker/applets/launcher/popularity.h
+++ b/kicker/applets/launcher/popularity.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __popularity_h__
#define __popularity_h__
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
class PopularityStatisticsImpl;
class Prefs;
@@ -61,7 +61,7 @@ public:
* counters for the given service and decrease the
* counters for all the others.
*/
- void useService(const QString& service);
+ void useService(const TQString& service);
/**
* Exchange all state variables of the most
@@ -71,18 +71,18 @@ public:
* as before. Order of items in the string list
* does *not* matter/
*/
- void moveToTop(const QStringList& services);
+ void moveToTop(const TQStringList& services);
/**
* Sets all counters to zero for the given service
*/
- void moveToBottom(const QString& service);
+ void moveToBottom(const TQString& service);
/**
* Retrieve the name of a service by its position
* in the current popularity ranking
*/
- QString serviceByRank(int n) const;
+ TQString serviceByRank(int n) const;
/**
* Retrieve the popularity (0-1) of a service by
@@ -94,7 +94,7 @@ public:
* Gets the rank of a given service.
* Returns -1 if the service is not in the ranking
*/
- int rankByService(const QString service);
+ int rankByService(const TQString service);
/**
* Writes the configuration.
diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp
index 74d00a6e4..0eebec315 100644
--- a/kicker/applets/launcher/quickaddappsmenu.cpp
+++ b/kicker/applets/launcher/quickaddappsmenu.cpp
@@ -33,22 +33,22 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdebug.h>
#include "quickaddappsmenu.h"
-QuickAddAppsMenu::QuickAddAppsMenu(const QString &label, const QString &relPath, QWidget *target, QWidget *parent, const char *name, const QString &sender)
+QuickAddAppsMenu::QuickAddAppsMenu(const TQString &label, const TQString &relPath, TQWidget *target, TQWidget *parent, const char *name, const TQString &sender)
: PanelServiceMenu(label, relPath, parent, name)
{
_targetObject = target;
_sender = sender;
- connect(this, SIGNAL(addAppBefore(QString,QString)),
- target, SLOT(addAppBeforeManually(QString,QString)));
+ connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)),
+ target, TQT_SLOT(addAppBeforeManually(TQString,TQString)));
}
-QuickAddAppsMenu::QuickAddAppsMenu(QWidget *target, QWidget *parent, const QString &sender, const char *name)
- : PanelServiceMenu(QString::null, QString::null, parent, name)
+QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQString &sender, const char *name)
+ : PanelServiceMenu(TQString::null, TQString::null, parent, name)
{
_targetObject = target;
_sender = sender;
- connect(this, SIGNAL(addAppBefore(QString,QString)),
- target, SLOT(addAppBeforeManually(QString,QString)));
+ connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)),
+ target, TQT_SLOT(addAppBeforeManually(TQString,TQString)));
}
void QuickAddAppsMenu::slotExec(int id)
@@ -60,7 +60,7 @@ void QuickAddAppsMenu::slotExec(int id)
}
-PanelServiceMenu *QuickAddAppsMenu::newSubMenu(const QString &label, const QString &relPath, QWidget *parent, const char *name, const QString &insertInlineHeader)
+PanelServiceMenu *QuickAddAppsMenu::newSubMenu(const TQString &label, const TQString &relPath, TQWidget *parent, const char *name, const TQString &insertInlineHeader)
{
return new QuickAddAppsMenu(label, relPath, _targetObject, parent, name, _sender);
}
diff --git a/kicker/applets/launcher/quickaddappsmenu.h b/kicker/applets/launcher/quickaddappsmenu.h
index 88465049c..01c185181 100644
--- a/kicker/applets/launcher/quickaddappsmenu.h
+++ b/kicker/applets/launcher/quickaddappsmenu.h
@@ -31,21 +31,21 @@ s
class QuickAddAppsMenu: public PanelServiceMenu {
Q_OBJECT
public:
- QuickAddAppsMenu(const QString &label, const QString &relPath, QWidget *target, QWidget *parent=0, const char *name=0, const QString &sender=QString(""));
- QuickAddAppsMenu(QWidget *target, QWidget *parent=0, const QString &sender=QString(""), const char *name=0);
+ QuickAddAppsMenu(const TQString &label, const TQString &relPath, TQWidget *target, TQWidget *parent=0, const char *name=0, const TQString &sender=TQString(""));
+ QuickAddAppsMenu(TQWidget *target, TQWidget *parent=0, const TQString &sender=TQString(""), const char *name=0);
signals:
- void addAppBefore(QString,QString);
+ void addAppBefore(TQString,TQString);
protected slots:
virtual void slotExec(int id);
protected:
- virtual PanelServiceMenu *newSubMenu(const QString &label,
- const QString &relPath,
- QWidget *parent,
+ virtual PanelServiceMenu *newSubMenu(const TQString &label,
+ const TQString &relPath,
+ TQWidget *parent,
const char *name,
- const QString & _inlineHeader=QString::null);
+ const TQString & _inlineHeader=TQString::null);
private:
- QWidget *_targetObject;
- QString _sender;
+ TQWidget *_targetObject;
+ TQString _sender;
};
#endif
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 933088b04..2ac0742ca 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -24,10 +24,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "quickbutton.h"
#include "quickaddappsmenu.h"
-#include <qpainter.h>
-#include <qdrawutil.h>
-#include <qpopupmenu.h>
-#include <qtooltip.h>
+#include <tqpainter.h>
+#include <tqdrawutil.h>
+#include <tqpopupmenu.h>
+#include <tqtooltip.h>
#include <kactionclasses.h>
#include <kickertip.h>
@@ -52,7 +52,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define DEBUGSTR kndDebug()
#endif
-QuickURL::QuickURL(const QString &u)
+QuickURL::QuickURL(const TQString &u)
{ DEBUGSTR<<"QuickURL::QuickURL("<<u<<")"<<endl<<flush;
KService::Ptr _service=0;
_menuId = u;
@@ -66,7 +66,7 @@ QuickURL::QuickURL(const QString &u)
if (_menuId.endsWith(".desktop")) {
// Strip path
- QString s = _menuId;
+ TQString s = _menuId;
s = s.mid(s.findRev('/')+1);
s = s.left(s.length()-8);
_service = KService::serviceByStorageId(s);
@@ -116,18 +116,18 @@ void QuickURL::run() const
}
//similar to MimeType::pixmapForURL
-QPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group,
- int _force_size, int _state, QString *) const
+TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group,
+ int _force_size, int _state, TQString *) const
{ // Load icon
- QPixmap pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state);
+ TQPixmap pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state);
// Resize to fit button
- pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, QImage::ScaleMin));
+ pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQImage::ScaleMin));
return pxmap;
}
-QuickButton::QuickButton(const QString &u, KAction* configAction,
- QWidget *parent, const char *name) :
+QuickButton::QuickButton(const TQString &u, KAction* configAction,
+ TQWidget *parent, const char *name) :
SimpleButton(parent, name),
m_flashCounter(0),
m_sticky(false)
@@ -138,29 +138,29 @@ QuickButton::QuickButton(const QString &u, KAction* configAction,
_oldCursor = cursor();
_qurl=new QuickURL(u);
- QToolTip::add(this, _qurl->name());
+ TQToolTip::add(this, _qurl->name());
resize(int(DEFAULT_ICON_DIM),int(DEFAULT_ICON_DIM));
- QBrush bgbrush(colorGroup().brush(QColorGroup::Background));
+ TQBrush bgbrush(colorGroup().brush(TQColorGroup::Background));
QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu(
parent, this, _qurl->url());
- _popup = new QPopupMenu(this);
+ _popup = new TQPopupMenu(this);
_popup->insertItem(i18n("Add Application"), addAppsMenu);
configAction->plug(_popup);
_popup->insertSeparator();
_popup->insertItem(SmallIcon("remove"), i18n("Remove"),
- this, SLOT(removeApp()));
+ this, TQT_SLOT(removeApp()));
m_stickyAction = new KToggleAction(i18n("Never Remove Automatically"),
KShortcut(), this);
- connect(m_stickyAction, SIGNAL(toggled(bool)),
- this, SLOT(slotStickyToggled(bool)));
+ connect(m_stickyAction, TQT_SIGNAL(toggled(bool)),
+ this, TQT_SLOT(slotStickyToggled(bool)));
m_stickyAction->plug(_popup, 2);
m_stickyId = _popup->idAt(2);
- connect(this, SIGNAL(clicked()), SLOT(launch()));
- connect(this, SIGNAL(removeApp(QuickButton *)), parent,
- SLOT(removeAppManually(QuickButton *)));
+ connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(launch()));
+ connect(this, TQT_SIGNAL(removeApp(QuickButton *)), parent,
+ TQT_SLOT(removeAppManually(QuickButton *)));
}
QuickButton::~QuickButton()
@@ -169,13 +169,13 @@ QuickButton::~QuickButton()
}
-QString QuickButton::url() const
+TQString QuickButton::url() const
{
return _qurl->url();
}
-QString QuickButton::menuId() const
+TQString QuickButton::menuId() const
{ return _qurl->menuId();}
@@ -189,26 +189,26 @@ void QuickButton::loadIcon()
setPixmap(_icon);
}
-void QuickButton::resizeEvent(QResizeEvent *e)
+void QuickButton::resizeEvent(TQResizeEvent *e)
{
loadIcon();
SimpleButton::resizeEvent(e);
}
-void QuickButton::mousePressEvent(QMouseEvent *e)
+void QuickButton::mousePressEvent(TQMouseEvent *e)
{
if (e->button() == RightButton)
_popup->popup(e->globalPos());
else if (e->button() == LeftButton) {
_dragPos = e->pos();
- QButton::mousePressEvent(e);
+ TQButton::mousePressEvent(e);
}
}
-void QuickButton::mouseMoveEvent(QMouseEvent *e)
+void QuickButton::mouseMoveEvent(TQMouseEvent *e)
{
if ((e->state() & LeftButton) == 0) return;
- QPoint p(e->pos() - _dragPos);
+ TQPoint p(e->pos() - _dragPos);
if (p.manhattanLength() <= KGlobalSettings::dndEventDelay())
return;
DEBUGSTR<<"dragstart"<<endl<<flush;
@@ -264,7 +264,7 @@ void QuickButton::removeApp()
void QuickButton::flash()
{
m_flashCounter = 2000;
- QTimer::singleShot(0, this, SLOT(slotFlash()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotFlash()));
}
void QuickButton::slotFlash()
@@ -275,7 +275,7 @@ void QuickButton::slotFlash()
m_flashCounter -= timeout;
if (m_flashCounter < 0) m_flashCounter = 0;
update();
- QTimer::singleShot(timeout, this, SLOT(slotFlash()));
+ TQTimer::singleShot(timeout, this, TQT_SLOT(slotFlash()));
}
}
@@ -300,7 +300,7 @@ void QuickButton::updateKickerTip(KickerTip::Data &data)
data.message = _qurl->name();
data.direction = m_popupDirection;
data.subtext = _qurl->genericName();
- if (data.subtext == QString())
+ if (data.subtext == TQString())
{
data.subtext = data.message;
}
diff --git a/kicker/applets/launcher/quickbutton.h b/kicker/applets/launcher/quickbutton.h
index 98eabec6e..263651cc0 100644
--- a/kicker/applets/launcher/quickbutton.h
+++ b/kicker/applets/launcher/quickbutton.h
@@ -24,11 +24,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __quickbutton_h__
#define __quickbutton_h__
-#include <qbutton.h>
-#include <qpoint.h>
-#include <qstring.h>
-#include <qpixmap.h>
-#include <qcursor.h>
+#include <tqbutton.h>
+#include <tqpoint.h>
+#include <tqstring.h>
+#include <tqpixmap.h>
+#include <tqcursor.h>
#include <kickertip.h>
#include <kicontheme.h>
@@ -45,22 +45,22 @@ class KToggleAction;
class QuickURL {
public:
- QuickURL(const QString &u);
+ QuickURL(const TQString &u);
KURL kurl() const {return _kurl;};
- QString url() const {return _kurl.url();};
- QString menuId() const {return _menuId;};
- QString genericName() const { return m_genericName; }
- QString name() const { return m_name; }
+ TQString url() const {return _kurl.url();};
+ TQString menuId() const {return _menuId;};
+ TQString genericName() const { return m_genericName; }
+ TQString name() const { return m_name; }
KService::Ptr service() const {return _service;};
void run() const;
- QPixmap pixmap(mode_t _mode = 0, KIcon::Group _group = KIcon::Desktop,
- int _force_size = 0, int _state = 0, QString * _path = 0L) const;
+ TQPixmap pixmap(mode_t _mode = 0, KIcon::Group _group = KIcon::Desktop,
+ int _force_size = 0, int _state = 0, TQString * _path = 0L) const;
private:
KURL _kurl;
- QString _menuId;
- QString m_genericName;
- QString m_name;
+ TQString _menuId;
+ TQString m_genericName;
+ TQString m_name;
KService::Ptr _service;
};
@@ -71,12 +71,12 @@ class QuickButton: public SimpleButton, public KickerTip::Client {
public:
enum { DEFAULT_ICON_DIM = 16 };
enum { ICON_MARGIN = 1 };
- QuickButton(const QString &u, KAction* configAction,
- QWidget *parent=0, const char *name=0);
+ QuickButton(const TQString &u, KAction* configAction,
+ TQWidget *parent=0, const char *name=0);
~QuickButton();
- QString url() const;
- QString menuId() const;
- QPixmap icon() const{ return _icon;}
+ TQString url() const;
+ TQString menuId() const;
+ TQPixmap icon() const{ return _icon;}
bool sticky() { return m_sticky; }
void setSticky(bool bSticky);
void setPopupDirection(KPanelApplet::Direction d);
@@ -88,13 +88,13 @@ public:
signals:
void removeApp(QuickButton *);
- void executed(QString serviceStorageID);
+ void executed(TQString serviceStorageID);
void stickyToggled(bool isSticky);
protected:
- void mousePressEvent(QMouseEvent *e);
- void mouseMoveEvent(QMouseEvent *e);
- void resizeEvent(QResizeEvent *rsevent);
+ void mousePressEvent(TQMouseEvent *e);
+ void mouseMoveEvent(TQMouseEvent *e);
+ void resizeEvent(TQResizeEvent *rsevent);
void loadIcon();
void updateKickerTip(KickerTip::Data &data);
@@ -108,10 +108,10 @@ protected slots:
private:
int m_flashCounter;
QuickURL *_qurl;
- QPoint _dragPos;
- QPopupMenu *_popup;
- QPixmap _icon, _iconh;
- QCursor _oldCursor;
+ TQPoint _dragPos;
+ TQPopupMenu *_popup;
+ TQPixmap _icon, _iconh;
+ TQCursor _oldCursor;
bool _highlight, _changeCursorOverItem, _dragEnabled;
int _iconDim;
bool m_sticky;
diff --git a/kicker/applets/launcher/quickbuttongroup.h b/kicker/applets/launcher/quickbuttongroup.h
index 1d373ae92..85f28845c 100644
--- a/kicker/applets/launcher/quickbuttongroup.h
+++ b/kicker/applets/launcher/quickbuttongroup.h
@@ -7,7 +7,7 @@
#ifndef __quickbuttongroup_h__
#define __quickbuttongroup_h__
-#include <qstring.h>
+#include <tqstring.h>
#include <functional>
#include "easyvector.h"
#include "quickbutton.h"
@@ -17,7 +17,7 @@ class QuickButtonGroup: virtual public EasyVector< QuickButton* > {
public:
QuickButtonGroup(const EasyVector< QuickButton* > &kv):EasyVector< QuickButton* >(kv){};
QuickButtonGroup():EasyVector< QuickButton* >(){};
- Index findDescriptor(const QString &desc);
+ Index findDescriptor(const TQString &desc);
void show();
void hide();
@@ -27,7 +27,7 @@ public:
void setUpdatesEnabled(bool enable);
};
-QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const QString &desc)
+QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc)
{ return findProperty(desc, std::mem_fun(&QuickButton::url));}
inline void QuickButtonGroup::setUpdatesEnabled(bool enable)
@@ -38,10 +38,10 @@ inline void QuickButtonGroup::setUpdatesEnabled(bool enable)
}
inline void QuickButtonGroup::show()
-{ std::for_each(begin(),end(),std::mem_fun(&QWidget::show));}
+{ std::for_each(begin(),end(),std::mem_fun(&TQWidget::show));}
inline void QuickButtonGroup::hide()
-{ std::for_each(begin(),end(),std::mem_fun(&QWidget::hide));}
+{ std::for_each(begin(),end(),std::mem_fun(&TQWidget::hide));}
inline void QuickButtonGroup::setDragging(bool drag)
{ std::for_each(begin(),end(),std::bind2nd(std::mem_fun(&QuickButton::setDragging),drag));}
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index abae9efe1..557ea4cd3 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -22,11 +22,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qpainter.h>
-#include <qpopupmenu.h>
-#include <qslider.h>
-#include <qtimer.h>
-#include <qtooltip.h>
+#include <tqpainter.h>
+#include <tqpopupmenu.h>
+#include <tqslider.h>
+#include <tqtimer.h>
+#include <tqtooltip.h>
#include <dcopclient.h>
#include <kaction.h>
@@ -69,7 +69,7 @@ const ButtonGroup::Index Append=ButtonGroup::Append;
extern "C"
{
- KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile)
+ KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("quicklauncher");
return new QuickLauncher(configFile, KPanelApplet::Normal,
@@ -78,8 +78,8 @@ extern "C"
}
}
-QuickLauncher::QuickLauncher(const QString& configFile, Type type, int actions,
- QWidget *parent, const char *name) :
+QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
+ TQWidget *parent, const char *name) :
KPanelApplet(configFile, type, actions, parent, name)
{
DCOPObject::setObjId("QuickLauncherApplet");
@@ -108,10 +108,10 @@ QuickLauncher::QuickLauncher(const QString& configFile, Type type, int actions,
m_dragButtons = 0;
m_configAction = new KAction(i18n("Configure Quicklauncher..."), "configure", KShortcut(),
- this, SLOT(slotConfigure()), this);
+ this, TQT_SLOT(slotConfigure()), this);
- m_saveTimer = new QTimer(this);
- connect(m_saveTimer, SIGNAL(timeout()), this, SLOT(saveConfig()));
+ m_saveTimer = new TQTimer(this);
+ connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig()));
m_popularity = new PopularityStatistics();
@@ -125,15 +125,15 @@ QuickLauncher::QuickLauncher(const QString& configFile, Type type, int actions,
setRefreshEnabled(true);
setAcceptDrops(true);
- //QToolTip::add(this, i18n("Drop applications here"));
+ //TQToolTip::add(this, i18n("Drop applications here"));
DEBUGSTR << " QuickLauncher::QuickLauncher(" << configFile <<
",...) END" << endl << flush;
DCOPClient *dcopClient = KApplication::dcopClient();
dcopClient->connectDCOPSignal(0, "appLauncher",
- "serviceStartedByStorageId(QString,QString)",
+ "serviceStartedByStorageId(TQString,TQString)",
"QuickLauncherApplet",
- "serviceStartedByStorageId(QString,QString)",
+ "serviceStartedByStorageId(TQString,TQString)",
false);
kdDebug() << "Quicklauncher registered DCOP signal" << endl;
}
@@ -161,22 +161,22 @@ QuickLauncher::~QuickLauncher()
void QuickLauncher::buildPopupMenu()
{
QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu(this, this);
- m_popup = new QPopupMenu(this);
+ m_popup = new TQPopupMenu(this);
m_popup->insertItem(i18n("Add Application"), addAppsMenu);
m_configAction->plug(m_popup);
- m_appletPopup = new QPopupMenu(this);
+ m_appletPopup = new TQPopupMenu(this);
m_appletPopup->insertItem(i18n("Add Application"), addAppsMenu);
- m_removeAppsMenu = new QPopupMenu(this);
- connect(m_removeAppsMenu, SIGNAL(aboutToShow()),
- SLOT(fillRemoveAppsMenu()));
- connect(m_removeAppsMenu, SIGNAL(activated(int)),
- SLOT(removeAppManually(int)));
+ m_removeAppsMenu = new TQPopupMenu(this);
+ connect(m_removeAppsMenu, TQT_SIGNAL(aboutToShow()),
+ TQT_SLOT(fillRemoveAppsMenu()));
+ connect(m_removeAppsMenu, TQT_SIGNAL(activated(int)),
+ TQT_SLOT(removeAppManually(int)));
m_appletPopup->insertItem(i18n("Remove Application"), m_removeAppsMenu);
m_appletPopup->insertSeparator();
m_appletPopup->setCheckable( true );
- m_appletPopup->insertItem(i18n("About"), this, SLOT(about()));
+ m_appletPopup->insertItem(i18n("About"), this, TQT_SLOT(about()));
setCustomMenu(m_appletPopup);
}
@@ -189,7 +189,7 @@ void QuickLauncher::fillRemoveAppsMenu()
int i = 0;
while (iter != m_buttons->end())
{
- QString text = QToolTip::textFor(*iter);
+ TQString text = TQToolTip::textFor(*iter);
if (text.isEmpty())
{
text = (*iter)->url();
@@ -235,8 +235,8 @@ void QuickLauncher::slotConfigure()
m_configDialog = new ConfigDlg(this, "configdialog",
m_settings, SIZE_AUTO, KDialogBase::Plain, KDialogBase::Ok |
KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Default);
- connect(m_configDialog, SIGNAL(settingsChanged()),
- this, SLOT(slotSettingsDialogChanged()));
+ connect(m_configDialog, TQT_SIGNAL(settingsChanged()),
+ this, TQT_SLOT(slotSettingsDialogChanged()));
}
m_configDialog->show();
@@ -254,7 +254,7 @@ int QuickLauncher::findApp(QuickButton *button)
}
-int QuickLauncher::findApp(QString url)
+int QuickLauncher::findApp(TQString url)
{
if (m_buttons->empty())
{
@@ -285,8 +285,8 @@ void QuickLauncher::removeApp(int index, bool manuallyRemoved)
DEBUGSTR << "Removing button. index=" << index << " url='" <<
(*m_buttons)[index]->url() << "'" << endl << flush;
- QString removeAppUrl = (*m_buttons)[index]->url();
- QString removeAppMenuId = (*m_buttons)[index]->menuId();
+ TQString removeAppUrl = (*m_buttons)[index]->url();
+ TQString removeAppMenuId = (*m_buttons)[index]->menuId();
delete (*m_buttons)[index];
m_buttons->eraseAt(index);
@@ -307,7 +307,7 @@ void QuickLauncher::removeApp(int index, bool manuallyRemoved)
}
-void QuickLauncher::removeApp(QString url, bool manuallyRemoved)
+void QuickLauncher::removeApp(TQString url, bool manuallyRemoved)
{
int index = findApp(url);
if (index == NotFound)
@@ -333,7 +333,7 @@ void QuickLauncher::removeAppManually(QuickButton *button)
int QuickLauncher::widthForHeight(int h) const
{
FlowGridManager temp_manager = *m_manager;
- temp_manager.setFrameSize(QSize(h,h));
+ temp_manager.setFrameSize(TQSize(h,h));
temp_manager.setOrientation(Qt::Horizontal); // ??? probably not necessary
if (temp_manager.isValid())
{
@@ -346,7 +346,7 @@ int QuickLauncher::widthForHeight(int h) const
int QuickLauncher::heightForWidth(int w) const
{
FlowGridManager temp_manager=*m_manager;
- temp_manager.setFrameSize(QSize(w,w));
+ temp_manager.setFrameSize(TQSize(w,w));
temp_manager.setOrientation(Qt::Vertical); // ??? probably not necessary
if (temp_manager.isValid())
{
@@ -365,10 +365,10 @@ int QuickLauncher::dimension() const
return size().height();
}
-void QuickLauncher::addApp(QString url, bool manuallyAdded)
+void QuickLauncher::addApp(TQString url, bool manuallyAdded)
{
assert(m_buttons);
- QString newButtonId = QuickURL(url).menuId();
+ TQString newButtonId = QuickURL(url).menuId();
if (m_appOrdering.find(newButtonId) == m_appOrdering.end())
{
m_appOrdering[newButtonId] = m_appOrdering.size();
@@ -376,7 +376,7 @@ void QuickLauncher::addApp(QString url, bool manuallyAdded)
uint appPos;
for (appPos = 0; appPos < m_buttons->size(); ++appPos)
{
- QString buttonId = (*m_buttons)[appPos]->menuId();
+ TQString buttonId = (*m_buttons)[appPos]->menuId();
if (m_appOrdering[buttonId] >= m_appOrdering[newButtonId])
{
break;
@@ -385,18 +385,18 @@ void QuickLauncher::addApp(QString url, bool manuallyAdded)
addApp(url, appPos, manuallyAdded);
}
-QuickButton* QuickLauncher::createButton(QString url)
+QuickButton* QuickLauncher::createButton(TQString url)
{
QuickButton* newButton=new QuickButton(url, m_configAction, this);
- connect(newButton, SIGNAL(executed(QString)),
- this, SLOT(slotOwnServiceExecuted(QString)));
- connect(newButton, SIGNAL(stickyToggled(bool)),
- this, SLOT(slotStickyToggled()));
+ connect(newButton, TQT_SIGNAL(executed(TQString)),
+ this, TQT_SLOT(slotOwnServiceExecuted(TQString)));
+ connect(newButton, TQT_SIGNAL(stickyToggled(bool)),
+ this, TQT_SLOT(slotStickyToggled()));
newButton->setPopupDirection(popupDirection());
return newButton;
}
-void QuickLauncher::addApp(QString url, int index, bool manuallyAdded)
+void QuickLauncher::addApp(TQString url, int index, bool manuallyAdded)
{
DEBUGSTR << endl <<"About to add: url='" << url <<
"' index=" << index << endl << flush;
@@ -447,12 +447,12 @@ void QuickLauncher::updateInsertionPosToStatusQuo()
// Update the app ordering map, so that next time,
// addApp(url,manAdded) (without index) will insert the
// item at the same position again.
- std::list<QString> appList;
+ std::list<TQString> appList;
std::set<int> posList;
//kdDebug() << "Rearranging application order. Before:" << endl;
for (uint n = 0; n < m_buttons->size(); ++n)
{
- QString buttonId = (*m_buttons)[n]->menuId();
+ TQString buttonId = (*m_buttons)[n]->menuId();
appList.push_back(buttonId);
if (m_appOrdering.find(buttonId) == m_appOrdering.end())
{
@@ -473,7 +473,7 @@ void QuickLauncher::updateInsertionPosToStatusQuo()
//kdDebug() << "Done." << endl;
}
-void QuickLauncher::addAppBeforeManually(QString url, QString sender)
+void QuickLauncher::addAppBeforeManually(TQString url, TQString sender)
{
if (sender.isNull())
{
@@ -501,7 +501,7 @@ void QuickLauncher::about()
}
-void QuickLauncher::mousePressEvent(QMouseEvent *e)
+void QuickLauncher::mousePressEvent(TQMouseEvent *e)
{
if (e->button() == RightButton)
{
@@ -509,12 +509,12 @@ void QuickLauncher::mousePressEvent(QMouseEvent *e)
}
}
-void QuickLauncher::resizeEvent(QResizeEvent*)
+void QuickLauncher::resizeEvent(TQResizeEvent*)
{
refreshContents();
}
-void QuickLauncher::dragEnterEvent(QDragEnterEvent *e)
+void QuickLauncher::dragEnterEvent(TQDragEnterEvent *e)
{
DEBUGSTR << "QuickLauncher::dragEnterEvent(pos=" << e->pos() <<
" type=" << e->type() << ")" << endl << flush;
@@ -534,7 +534,7 @@ void QuickLauncher::dragEnterEvent(QDragEnterEvent *e)
m_dragButtons=new ButtonGroup;
m_oldButtons=new ButtonGroup(*m_buttons);
- QString url;
+ TQString url;
KURL::List::ConstIterator it = kurlList.begin();
for ( ; it != kurlList.end(); ++it )
{
@@ -568,7 +568,7 @@ void QuickLauncher::dragEnterEvent(QDragEnterEvent *e)
}
-void QuickLauncher::dragMoveEvent(QDragMoveEvent *e)
+void QuickLauncher::dragMoveEvent(TQDragMoveEvent *e)
{
if (!m_dragAccepted)
{
@@ -594,7 +594,7 @@ void QuickLauncher::dragMoveEvent(QDragMoveEvent *e)
}
-void QuickLauncher::dragLeaveEvent(QDragLeaveEvent *e)
+void QuickLauncher::dragLeaveEvent(TQDragLeaveEvent *e)
{
DEBUGSTR << "QuickLauncher::dragLeaveEvent(type=" <<
e->type() << ")" << endl << flush;
@@ -612,7 +612,7 @@ void QuickLauncher::dragLeaveEvent(QDragLeaveEvent *e)
}
-void QuickLauncher::dropEvent(QDropEvent *e)
+void QuickLauncher::dropEvent(TQDropEvent *e)
{
DEBUGSTR << "QuickLauncher::dropEvent(pos=" << e->pos() <<
" type=" << e->type() << ")" << endl << flush;
@@ -719,13 +719,13 @@ void QuickLauncher::refreshContents()
}
m_space = std::max((idim/8)-1, 0);
m_border = m_space;
- m_buttonSize = QSize(idim, idim);
+ m_buttonSize = TQSize(idim, idim);
m_manager->setOrientation(orientation());
m_manager->setNumItems(m_buttons->size());
m_manager->setFrameSize(size());
m_manager->setItemSize(m_buttonSize);
- m_manager->setSpaceSize(QSize(m_space, m_space));
- m_manager->setBorderSize(QSize(m_border, m_border));
+ m_manager->setSpaceSize(TQSize(m_space, m_space));
+ m_manager->setBorderSize(TQSize(m_border, m_border));
if (!m_refreshEnabled)
{
m_needsRefresh=true;
@@ -740,7 +740,7 @@ void QuickLauncher::refreshContents()
}
unsigned index;
- QPoint pos;
+ TQPoint pos;
setUpdatesEnabled(false);
m_buttons->setUpdatesEnabled(false);
for (index = 0; index < m_buttons->size(); index++)
@@ -812,13 +812,13 @@ void QuickLauncher::loadConfig()
DEBUGSTR << " ConserveSpace=" << (m_manager->conserveSpace()) <<
endl << flush;
DEBUGSTR << " DragEnabled=" << isDragEnabled() << endl << flush;*/
- QStringList volatileButtons = m_settings->volatileButtons();
- QStringList urls = m_settings->buttons();
+ TQStringList volatileButtons = m_settings->volatileButtons();
+ TQStringList urls = m_settings->buttons();
kdDebug() << "GetButtons " << urls.join("/") << endl;
- QStringList::Iterator iter(urls.begin());
+ TQStringList::Iterator iter(urls.begin());
int n = 0;
while (iter != urls.end()) {
- QString url = *iter;
+ TQString url = *iter;
addApp(url, n, false);
++iter;
++n;
@@ -838,8 +838,8 @@ void QuickLauncher::loadConfig()
m_popularity->readConfig(m_settings);
m_popularity->setHistoryHorizon(m_settings->historyHorizon()/100.0);
- QStringList serviceNames = m_settings->serviceNames();
- QValueList<int> insPos = m_settings->serviceInspos();
+ TQStringList serviceNames = m_settings->serviceNames();
+ TQValueList<int> insPos = m_settings->serviceInspos();
for (int n=std::min(serviceNames.size(),insPos.size())-1; n>=0; --n)
{
m_appOrdering[serviceNames[n]] = insPos[n];
@@ -853,7 +853,7 @@ void QuickLauncher::saveConfig()
m_needsSave=true;
return;
}
- QStringList urls, volatileUrls;
+ TQStringList urls, volatileUrls;
ButtonIter iter = m_buttons->begin();
while (iter != m_buttons->end()) {
if ((*iter)->sticky() == false)
@@ -872,8 +872,8 @@ void QuickLauncher::saveConfig()
m_popularity->writeConfig(m_settings);
// m_popularity must have written the current service list by now
- QStringList serviceNames = m_settings->serviceNames();
- QValueList<int> insertionPositions;
+ TQStringList serviceNames = m_settings->serviceNames();
+ TQValueList<int> insertionPositions;
for (int n=0; n<int(serviceNames.size()); ++n)
{
if (m_appOrdering.find(serviceNames[n]) != m_appOrdering.end())
@@ -901,25 +901,25 @@ void QuickLauncher::setRefreshEnabled(bool enable)
}
}
-void QuickLauncher::serviceStartedByStorageId(QString /*starter*/, QString storageId)
+void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString storageId)
{
KService::Ptr service = KService::serviceByStorageId(storageId);
- if (service->icon() == QString::null)
+ if (service->icon() == TQString::null)
{
kdDebug() << storageId << " has no icon. Makes no sense to add it.";
return;
}
QuickURL url = QuickURL(locate("apps", service->desktopEntryPath()));
- QString desktopMenuId(url.menuId());
+ TQString desktopMenuId(url.menuId());
kdDebug() << "storageId=" << storageId << " desktopURL=" << desktopMenuId << endl;
// A service was started somwhere else. If the quicklauncher contains
// this service too, we flash the icon
QuickButton *startedButton = 0;
- std::set<QString> buttonIdSet;
+ std::set<TQString> buttonIdSet;
for (uint n = 0; n < m_buttons->size(); ++n)
{
QuickButton *button = (*m_buttons)[n];
- QString buttonMenuId = button->menuId();
+ TQString buttonMenuId = button->menuId();
buttonIdSet.insert(buttonMenuId);
if (desktopMenuId == buttonMenuId)
{
@@ -936,7 +936,7 @@ void QuickLauncher::serviceStartedByStorageId(QString /*starter*/, QString stora
if (m_settings->autoAdjustEnabled())
{
- QTimer::singleShot(0, this, SLOT(slotAdjustToCurrentPopularity()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity()));
}
}
@@ -958,8 +958,8 @@ void QuickLauncher::slotAdjustToCurrentPopularity()
minAddPopularity += (belowAvgAllowed * stats->popularityByRank(n)) / maxItems;
}
double minDelPopularity = minAddPopularity * hysteresisFactor;
- std::map<QString, QuickButton*> removeableApps;
- std::set<QString> existingApps;
+ std::map<TQString, QuickButton*> removeableApps;
+ std::set<TQString> existingApps;
int numApps = m_buttons->size();
for (int n = 0; n < int(m_buttons->size()); ++n)
{
@@ -978,7 +978,7 @@ void QuickLauncher::slotAdjustToCurrentPopularity()
(numApps < maxItems && stats->popularityByRank(n) > minAddPopularity);
++n)
{
- QString app = m_popularity->serviceByRank(n);
+ TQString app = m_popularity->serviceByRank(n);
if (existingApps.find(app) == existingApps.end())
{
addApp(QuickURL(m_popularity->serviceByRank(n)).url(), false);
@@ -1005,12 +1005,12 @@ void QuickLauncher::slotAdjustToCurrentPopularity()
m_saveTimer->start(10000,true);
}
-void QuickLauncher::slotOwnServiceExecuted(QString serviceMenuId)
+void QuickLauncher::slotOwnServiceExecuted(TQString serviceMenuId)
{
m_popularity->useService(serviceMenuId);
if (m_settings->autoAdjustEnabled())
{
- QTimer::singleShot(0, this, SLOT(slotAdjustToCurrentPopularity()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity()));
}
}
@@ -1019,25 +1019,25 @@ void QuickLauncher::updateStickyHighlightLayer()
// Creates a transparent image which is used
// to highlight those buttons which will never
// be removed automatically from the launcher
- QPixmap areaPix(width(), height());
- QPainter areaPixPainter(&areaPix);
- areaPixPainter.fillRect(0, 0, width(), height(), QColor(255, 255, 255));
- QSize itemSize = m_manager->itemSize();
- QSize spaceSize = m_manager->spaceSize();
+ TQPixmap areaPix(width(), height());
+ TQPainter areaPixPainter(&areaPix);
+ areaPixPainter.fillRect(0, 0, width(), height(), TQColor(255, 255, 255));
+ TQSize itemSize = m_manager->itemSize();
+ TQSize spaceSize = m_manager->spaceSize();
for (uint n=0; n<m_buttons->size(); ++n)
{
- QPoint pos = m_manager->pos(n);
+ TQPoint pos = m_manager->pos(n);
if ((*m_buttons)[n]->sticky() == false)
{
areaPixPainter.fillRect(pos.x()-(spaceSize.width()+1)/2,
pos.y()-(spaceSize.height()+1)/2,
itemSize.width()+spaceSize.width()+1,
itemSize.height()+spaceSize.height()+1,
- QColor(0, 0, 0));
+ TQColor(0, 0, 0));
}
}
- QImage areaLayer = areaPix.convertToImage();
- m_stickyHighlightLayer = QImage(width(), height(), 32);
+ TQImage areaLayer = areaPix.convertToImage();
+ m_stickyHighlightLayer = TQImage(width(), height(), 32);
m_stickyHighlightLayer.setAlphaBuffer(true);
int pix, tlPix, brPix, w(width()), h(height());
QRgb transparent(qRgba(0, 0, 0, 0));
@@ -1063,14 +1063,14 @@ void QuickLauncher::updateStickyHighlightLayer()
repaint();
}
-void QuickLauncher::paintEvent(QPaintEvent* e)
+void QuickLauncher::paintEvent(TQPaintEvent* e)
{
KPanelApplet::paintEvent(e);
if (m_settings->autoAdjustEnabled() &&
m_settings->showVolatileButtonIndicator())
{
- QPainter p(this);
+ TQPainter p(this);
p.drawImage(0, 0, m_stickyHighlightLayer);
}
}
diff --git a/kicker/applets/launcher/quicklauncher.h b/kicker/applets/launcher/quicklauncher.h
index c82d39661..bb53cfa9c 100644
--- a/kicker/applets/launcher/quicklauncher.h
+++ b/kicker/applets/launcher/quicklauncher.h
@@ -25,9 +25,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define __quicklauncher_h__
#include <dcopobject.h>
-#include <qimage.h>
-#include <qstring.h>
-#include <qvaluevector.h>
+#include <tqimage.h>
+#include <tqstring.h>
+#include <tqvaluevector.h>
#include <kpanelapplet.h>
#include <map>
@@ -49,7 +49,7 @@ class QuickLauncher: public KPanelApplet, public DCOPObject
K_DCOP
k_dcop:
- void serviceStartedByStorageId(QString starter, QString storageId);
+ void serviceStartedByStorageId(TQString starter, TQString storageId);
public:
enum {DEFAULT_ICON_DIM=QuickButton::DEFAULT_ICON_DIM};
@@ -59,34 +59,34 @@ public:
float popularity;
};
- QuickLauncher(const QString& configFile, Type t = Normal, int actions = 0,
- QWidget *parent = 0, const char *name = 0);
+ QuickLauncher(const TQString& configFile, Type t = Normal, int actions = 0,
+ TQWidget *parent = 0, const char *name = 0);
~QuickLauncher();
int widthForHeight(int height) const;
int heightForWidth(int width) const;
- void addApp(QString url, int index, bool manuallyAdded);
+ void addApp(TQString url, int index, bool manuallyAdded);
virtual void action(Action a);
public slots:
- void addApp(QString url, bool manuallyAdded);
- void addAppBeforeManually(QString url, QString sender);
+ void addApp(TQString url, bool manuallyAdded);
+ void addAppBeforeManually(TQString url, TQString sender);
void removeAppManually(QuickButton *button);
- void removeApp(QString url, bool manuallyRemoved);
+ void removeApp(TQString url, bool manuallyRemoved);
void removeApp(int index, bool manuallyRemoved);
void removeAppManually(int index);
void saveConfig();
void about();
protected:
- int findApp(QString url);
+ int findApp(TQString url);
int findApp(QuickButton *button);
- void mousePressEvent(QMouseEvent *e);
- void resizeEvent(QResizeEvent*);
- void dragEnterEvent(QDragEnterEvent *e);
- void dragLeaveEvent(QDragLeaveEvent *e);
- void dragMoveEvent(QDragMoveEvent *e);
- void dropEvent(QDropEvent *e);
+ void mousePressEvent(TQMouseEvent *e);
+ void resizeEvent(TQResizeEvent*);
+ void dragEnterEvent(TQDragEnterEvent *e);
+ void dragLeaveEvent(TQDragLeaveEvent *e);
+ void dragMoveEvent(TQDragMoveEvent *e);
+ void dropEvent(TQDropEvent *e);
void refreshContents();
void setRefreshEnabled(bool enable);
void setConserveSpace(bool conserve_space);
@@ -106,33 +106,33 @@ protected slots:
void slotConfigure();
void slotSettingsDialogChanged();
void fillRemoveAppsMenu();
- void slotOwnServiceExecuted(QString serviceMenuId);
+ void slotOwnServiceExecuted(TQString serviceMenuId);
void slotAdjustToCurrentPopularity();
void slotStickyToggled();
protected:
void updateInsertionPosToStatusQuo();
void updateStickyHighlightLayer();
- QuickButton* createButton(QString url);
- virtual void paintEvent(QPaintEvent* e);
+ QuickButton* createButton(TQString url);
+ virtual void paintEvent(TQPaintEvent* e);
virtual void positionChange(Position);
- QPopupMenu *m_popup;
- QPopupMenu *m_appletPopup;
- QPopupMenu *m_removeAppsMenu;
+ TQPopupMenu *m_popup;
+ TQPopupMenu *m_appletPopup;
+ TQPopupMenu *m_removeAppsMenu;
QuickButtonGroup *m_buttons, *m_newButtons, *m_oldButtons, *m_dragButtons;
int m_space, m_border;
- QSize m_buttonSize;
+ TQSize m_buttonSize;
FlowGridManager *m_manager;
int m_dropLen, m_dropPos, m_minPanelDim;
bool m_dragAccepted, m_refreshEnabled, m_needsSave, m_needsRefresh;
- std::map<QString, int> m_appOrdering;
+ std::map<TQString, int> m_appOrdering;
Prefs* m_settings;
KAction *m_configAction;
ConfigDlg *m_configDialog;
PopularityStatistics* m_popularity;
- QImage m_stickyHighlightLayer;
- QTimer *m_saveTimer;
+ TQImage m_stickyHighlightLayer;
+ TQTimer *m_saveTimer;
};
#endif
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index d22e4a8ed..3bc53efae 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -24,13 +24,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qpopupmenu.h>
-#include <qtoolbutton.h>
-#include <qstyle.h>
-#include <qtooltip.h>
+#include <tqlayout.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqpopupmenu.h>
+#include <tqtoolbutton.h>
+#include <tqstyle.h>
+#include <tqtooltip.h>
#include <dcopclient.h>
@@ -46,14 +46,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extern "C"
{
- KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile)
+ KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("lockout");
return new Lockout(configFile, parent, "lockout");
}
}
-Lockout::Lockout( const QString& configFile, QWidget *parent, const char *name)
+Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name)
: KPanelApplet( configFile, KPanelApplet::Normal, 0, parent, name ), bTransparent( false )
{
KConfig *conf = config();
@@ -63,9 +63,9 @@ Lockout::Lockout( const QString& configFile, QWidget *parent, const char *name)
setBackgroundOrigin( AncestorOrigin );
if ( orientation() == Horizontal )
- layout = new QBoxLayout( this, QBoxLayout::TopToBottom );
+ layout = new TQBoxLayout( this, TQBoxLayout::TopToBottom );
else
- layout = new QBoxLayout( this, QBoxLayout::LeftToRight );
+ layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
layout->setAutoAdd( true );
layout->setMargin( 0 );
@@ -74,16 +74,16 @@ Lockout::Lockout( const QString& configFile, QWidget *parent, const char *name)
lockButton = new SimpleButton( this, "lock");
logoutButton = new SimpleButton( this, "logout");
- QToolTip::add( lockButton, i18n("Lock the session") );
- QToolTip::add( logoutButton, i18n("Log out") );
+ TQToolTip::add( lockButton, i18n("Lock the session") );
+ TQToolTip::add( logoutButton, i18n("Log out") );
lockButton->setPixmap( SmallIcon( "lock" ));
logoutButton->setPixmap( SmallIcon( "exit" ));
bTransparent = conf->readBoolEntry( "Transparent", bTransparent );
- connect( lockButton, SIGNAL( clicked() ), SLOT( lock() ));
- connect( logoutButton, SIGNAL( clicked() ), SLOT( logout() ));
+ connect( lockButton, TQT_SIGNAL( clicked() ), TQT_SLOT( lock() ));
+ connect( logoutButton, TQT_SIGNAL( clicked() ), TQT_SLOT( logout() ));
lockButton->installEventFilter( this );
logoutButton->installEventFilter( this );
@@ -94,13 +94,13 @@ Lockout::Lockout( const QString& configFile, QWidget *parent, const char *name)
if (!kapp->authorize("logout"))
logoutButton->hide();
- lockButton->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
- logoutButton->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
+ lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
+ logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
- connect( kapp, SIGNAL( iconChanged(int) ), SLOT( slotIconChanged() ));
+ connect( kapp, TQT_SIGNAL( iconChanged(int) ), TQT_SLOT( slotIconChanged() ));
}
Lockout::~Lockout()
@@ -113,18 +113,18 @@ Lockout::~Lockout()
// direction and wasting a lot of space.
void Lockout::checkLayout( int height ) const
{
- QSize s = minimumSizeHint();
- QBoxLayout::Direction direction = layout->direction();
+ TQSize s = minimumSizeHint();
+ TQBoxLayout::Direction direction = layout->direction();
- if ( direction == QBoxLayout::LeftToRight &&
+ if ( direction == TQBoxLayout::LeftToRight &&
( ( orientation() == Vertical && s.width() - 2 >= height ) ||
( orientation() == Horizontal && s.width() - 2 < height ) ) ) {
- layout->setDirection( QBoxLayout::TopToBottom );
+ layout->setDirection( TQBoxLayout::TopToBottom );
}
- else if ( direction == QBoxLayout::TopToBottom &&
+ else if ( direction == TQBoxLayout::TopToBottom &&
( ( orientation() == Vertical && s.height() - 2 < height ) ||
( orientation() == Horizontal && s.height() - 2 >= height ) ) ) {
- layout->setDirection( QBoxLayout::LeftToRight );
+ layout->setDirection( TQBoxLayout::LeftToRight );
}
}
@@ -142,7 +142,7 @@ int Lockout::heightForWidth( int width ) const
void Lockout::lock()
{
- QCString appname( "kdesktop" );
+ TQCString appname( "kdesktop" );
int kicker_screen_number = qt_xscreen();
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
@@ -154,64 +154,64 @@ void Lockout::logout()
kapp->requestShutDown();
}
-void Lockout::mousePressEvent(QMouseEvent* e)
+void Lockout::mousePressEvent(TQMouseEvent* e)
{
propagateMouseEvent(e);
}
-void Lockout::mouseReleaseEvent(QMouseEvent* e)
+void Lockout::mouseReleaseEvent(TQMouseEvent* e)
{
propagateMouseEvent(e);
}
-void Lockout::mouseDoubleClickEvent(QMouseEvent* e)
+void Lockout::mouseDoubleClickEvent(TQMouseEvent* e)
{
propagateMouseEvent(e);
}
-void Lockout::mouseMoveEvent(QMouseEvent* e)
+void Lockout::mouseMoveEvent(TQMouseEvent* e)
{
propagateMouseEvent(e);
}
-void Lockout::propagateMouseEvent(QMouseEvent* e)
+void Lockout::propagateMouseEvent(TQMouseEvent* e)
{
if ( !isTopLevel() ) {
- QMouseEvent me(e->type(), mapTo( topLevelWidget(), e->pos() ),
+ TQMouseEvent me(e->type(), mapTo( topLevelWidget(), e->pos() ),
e->globalPos(), e->button(), e->state() );
- QApplication::sendEvent( topLevelWidget(), &me );
+ TQApplication::sendEvent( topLevelWidget(), &me );
}
}
-bool Lockout::eventFilter( QObject *o, QEvent *e )
+bool Lockout::eventFilter( TQObject *o, TQEvent *e )
{
if (!kapp->authorizeKAction("kicker_rmb"))
return false; // Process event normally:
- if( e->type() == QEvent::MouseButtonPress )
+ if( e->type() == TQEvent::MouseButtonPress )
{
KConfig *conf = config();
conf->setGroup("lockout");
- QMouseEvent *me = static_cast<QMouseEvent *>( e );
- if( me->button() == QMouseEvent::RightButton )
+ TQMouseEvent *me = static_cast<TQMouseEvent *>( e );
+ if( me->button() == TQMouseEvent::RightButton )
{
if( o == lockButton )
{
- QPopupMenu *popup = new QPopupMenu();
+ TQPopupMenu *popup = new TQPopupMenu();
popup->insertItem( SmallIcon( "lock" ), i18n("Lock Session"),
- this, SLOT( lock() ) );
+ this, TQT_SLOT( lock() ) );
popup->insertSeparator();
i18n("&Transparent");
//popup->insertItem( i18n( "&Transparent" ), 100 );
popup->insertItem( SmallIcon( "configure" ),
i18n( "&Configure Screen Saver..." ),
- this, SLOT( slotLockPrefs() ) );
+ this, TQT_SLOT( slotLockPrefs() ) );
//popup->setItemChecked( 100, bTransparent );
- //popup->connectItem(100, this, SLOT( slotTransparent() ) );
+ //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) );
//if (conf->entryIsImmutable( "Transparent" ))
// popup->setItemEnabled( 100, false );
popup->exec( me->globalPos() );
@@ -221,18 +221,18 @@ bool Lockout::eventFilter( QObject *o, QEvent *e )
}
else if ( o == logoutButton )
{
- QPopupMenu *popup = new QPopupMenu();
+ TQPopupMenu *popup = new TQPopupMenu();
popup->insertItem( SmallIcon( "exit" ), i18n("&Log Out..."),
- this, SLOT( logout() ) );
+ this, TQT_SLOT( logout() ) );
popup->insertSeparator();
//popup->insertItem( i18n( "&Transparent" ), 100 );
popup->insertItem( SmallIcon( "configure" ),
i18n( "&Configure Session Manager..." ),
- this, SLOT( slotLogoutPrefs() ) );
+ this, TQT_SLOT( slotLogoutPrefs() ) );
//popup->setItemChecked( 100, bTransparent );
- //popup->connectItem(100, this, SLOT( slotTransparent() ) );
+ //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) );
//if (conf->entryIsImmutable( "Transparent" ))
// popup->setItemEnabled( 100, false );
popup->exec( me->globalPos() );
diff --git a/kicker/applets/lockout/lockout.h b/kicker/applets/lockout/lockout.h
index 606870a99..a0b2d67e0 100644
--- a/kicker/applets/lockout/lockout.h
+++ b/kicker/applets/lockout/lockout.h
@@ -1,8 +1,8 @@
#ifndef LOCKOUT_H
#define LOCKOUT_H
-#include <qevent.h>
-#include <qstring.h>
+#include <tqevent.h>
+#include <tqstring.h>
#include <kpanelapplet.h>
#include "simplebutton.h"
@@ -15,20 +15,20 @@ class Lockout : public KPanelApplet
Q_OBJECT
public:
- Lockout( const QString& configFile,
- QWidget *parent = 0, const char *name = 0 );
+ Lockout( const TQString& configFile,
+ TQWidget *parent = 0, const char *name = 0 );
~Lockout();
int widthForHeight(int height) const;
int heightForWidth(int width) const;
protected:
- virtual void mousePressEvent( QMouseEvent * );
- virtual void mouseMoveEvent( QMouseEvent * );
- virtual void mouseReleaseEvent( QMouseEvent * );
- virtual void mouseDoubleClickEvent( QMouseEvent * );
+ virtual void mousePressEvent( TQMouseEvent * );
+ virtual void mouseMoveEvent( TQMouseEvent * );
+ virtual void mouseReleaseEvent( TQMouseEvent * );
+ virtual void mouseDoubleClickEvent( TQMouseEvent * );
- virtual bool eventFilter( QObject *, QEvent * );
+ virtual bool eventFilter( TQObject *, TQEvent * );
private slots:
void lock();
@@ -40,11 +40,11 @@ private slots:
void slotIconChanged();
private:
- void propagateMouseEvent( QMouseEvent * );
+ void propagateMouseEvent( TQMouseEvent * );
void checkLayout( int height ) const;
SimpleButton *lockButton, *logoutButton;
- QBoxLayout *layout;
+ TQBoxLayout *layout;
bool bTransparent;
};
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index 4ccd0eeef..b137b5d5c 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -33,7 +33,7 @@
extern "C"
{
- KDE_EXPORT KPanelApplet* init( QWidget *parent, const QString configFile)
+ KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
{
KGlobal::locale()->insertCatalogue("mediaapplet");
return new MediaApplet(configFile, KPanelApplet::Normal,
@@ -42,7 +42,7 @@ extern "C"
}
}
-MediaApplet::MediaApplet(const QString& configFile, Type type, int actions, QWidget *parent, const char *name)
+MediaApplet::MediaApplet(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name)
: KPanelApplet(configFile, type, actions, parent, name),
mButtonSizeSum(0)
{
@@ -57,18 +57,18 @@ MediaApplet::MediaApplet(const QString& configFile, Type type, int actions, QWid
mpDirLister = new KDirLister();
- connect( mpDirLister, SIGNAL( clear() ),
- this, SLOT( slotClear() ) );
- connect( mpDirLister, SIGNAL( started(const KURL&) ),
- this, SLOT( slotStarted(const KURL&) ) );
- connect( mpDirLister, SIGNAL( completed() ),
- this, SLOT( slotCompleted() ) );
- connect( mpDirLister, SIGNAL( newItems( const KFileItemList & ) ),
- this, SLOT( slotNewItems( const KFileItemList & ) ) );
- connect( mpDirLister, SIGNAL( deleteItem( KFileItem * ) ),
- this, SLOT( slotDeleteItem( KFileItem * ) ) );
- connect( mpDirLister, SIGNAL( refreshItems( const KFileItemList & ) ),
- this, SLOT( slotRefreshItems( const KFileItemList & ) ) );
+ connect( mpDirLister, TQT_SIGNAL( clear() ),
+ this, TQT_SLOT( slotClear() ) );
+ connect( mpDirLister, TQT_SIGNAL( started(const KURL&) ),
+ this, TQT_SLOT( slotStarted(const KURL&) ) );
+ connect( mpDirLister, TQT_SIGNAL( completed() ),
+ this, TQT_SLOT( slotCompleted() ) );
+ connect( mpDirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ),
+ this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
+ connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
+ this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
+ connect( mpDirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ),
+ this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) );
reloadList();
}
@@ -135,7 +135,7 @@ int MediaApplet::heightForWidth( int /*width*/ ) const
return mButtonSizeSum;
}
-void MediaApplet::resizeEvent( QResizeEvent *)
+void MediaApplet::resizeEvent( TQResizeEvent *)
{
arrangeButtons();
}
@@ -323,7 +323,7 @@ void MediaApplet::slotRefreshItems(const KFileItemList &entries)
{
kdDebug()<<"MediaApplet::slotRefreshItems:"<<(*it.current()).url().url()<<endl;
- QString mimetype = (*it.current()).mimetype();
+ TQString mimetype = (*it.current()).mimetype();
bool found = false;
kdDebug()<<"mimetype="<<mimetype<<endl;
@@ -423,7 +423,7 @@ void MediaApplet::reloadList()
mpDirLister->openURL(KURL("media:/"));
}
-void MediaApplet::mousePressEvent(QMouseEvent *e)
+void MediaApplet::mousePressEvent(TQMouseEvent *e)
{
if(e->button()==RightButton)
{
diff --git a/kicker/applets/media/mediaapplet.h b/kicker/applets/media/mediaapplet.h
index 5e2320be0..68d0b5d99 100644
--- a/kicker/applets/media/mediaapplet.h
+++ b/kicker/applets/media/mediaapplet.h
@@ -25,15 +25,15 @@
#endif
#include <kpanelapplet.h>
-#include <qstring.h>
+#include <tqstring.h>
#include <kconfig.h>
#include <kurl.h>
#include <kfileitem.h>
#include <kdirlister.h>
-#include <qptrlist.h>
+#include <tqptrlist.h>
#include "mediumbutton.h"
-typedef QValueList<MediumButton*> MediumButtonList;
+typedef TQValueList<MediumButton*> MediumButtonList;
class MediaApplet : public KPanelApplet
@@ -41,8 +41,8 @@ class MediaApplet : public KPanelApplet
Q_OBJECT
public:
- MediaApplet(const QString& configFile, Type t = Normal, int actions = 0,
- QWidget *parent = 0, const char *name = 0);
+ MediaApplet(const TQString& configFile, Type t = Normal, int actions = 0,
+ TQWidget *parent = 0, const char *name = 0);
~MediaApplet();
int widthForHeight(int height) const;
@@ -52,12 +52,12 @@ public:
protected:
void arrangeButtons();
- void resizeEvent(QResizeEvent *e);
+ void resizeEvent(TQResizeEvent *e);
void positionChange(Position p);
void reloadList();
void loadConfig();
void saveConfig();
- void mousePressEvent(QMouseEvent *e);
+ void mousePressEvent(TQMouseEvent *e);
protected slots:
void slotClear();
@@ -70,8 +70,8 @@ protected slots:
private:
KDirLister *mpDirLister;
MediumButtonList mButtonList;
- QStringList mExcludedTypesList;
- QStringList mExcludedList;
+ TQStringList mExcludedTypesList;
+ TQStringList mExcludedList;
KFileItemList mMedia;
int mButtonSizeSum;
};
diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp
index e8007a989..5be2acbab 100644
--- a/kicker/applets/media/mediumbutton.cpp
+++ b/kicker/applets/media/mediumbutton.cpp
@@ -19,13 +19,13 @@
#include "mediumbutton.h"
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qpainter.h>
-#include <qdrawutil.h>
-#include <qpopupmenu.h>
-#include <qstyle.h>
-#include <qtooltip.h>
+#include <tqapplication.h>
+#include <tqclipboard.h>
+#include <tqpainter.h>
+#include <tqdrawutil.h>
+#include <tqpopupmenu.h>
+#include <tqstyle.h>
+#include <tqtooltip.h>
#include <kmessagebox.h>
#include <kmimetype.h>
@@ -44,13 +44,13 @@
#include <konq_popupmenu.h>
#include <konq_drag.h>
-MediumButton::MediumButton(QWidget *parent, const KFileItem &fileItem)
+MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem)
: PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem)
{
- KAction *a = KStdAction::paste(this, SLOT(slotPaste()),
+ KAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()),
&mActions, "pasteto");
a->setShortcut(0);
- a = KStdAction::copy(this, SLOT(slotCopy()), &mActions, "copy");
+ a = KStdAction::copy(this, TQT_SLOT(slotCopy()), &mActions, "copy");
a->setShortcut(0);
setBackgroundOrigin(AncestorOrigin);
@@ -63,18 +63,18 @@ MediumButton::MediumButton(QWidget *parent, const KFileItem &fileItem)
refreshType();
- connect(&mOpenTimer, SIGNAL(timeout()), SLOT(slotDragOpen()));
+ connect(&mOpenTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDragOpen()));
// Activate this code only if we find a way to have both an
// action and a popup menu for the same kicker button
- //connect(this, SIGNAL(clicked()), this, SLOT(slotClicked()));
+ //connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));
- setPopup(new QPopupMenu());
+ setPopup(new TQPopupMenu());
}
MediumButton::~MediumButton()
{
- QPopupMenu *menu = popup();
+ TQPopupMenu *menu = popup();
setPopup(0);
delete menu;
}
@@ -94,7 +94,7 @@ void MediumButton::setFileItem(const KFileItem &fileItem)
void MediumButton::initPopup()
{
- QPopupMenu *old_popup = popup();
+ TQPopupMenu *old_popup = popup();
KFileItemList items;
items.append(&mFileItem);
@@ -122,7 +122,7 @@ void MediumButton::initPopup()
void MediumButton::refreshType()
{
KMimeType::Ptr mime = mFileItem.determineMimeType();
- QToolTip::add(this, mime->comment());
+ TQToolTip::add(this, mime->comment());
setIcon(mFileItem.iconName());
}
@@ -144,10 +144,10 @@ void MediumButton::slotCopy()
{
KonqDrag * obj = KonqDrag::newDrag(mFileItem.url(), false);
- QApplication::clipboard()->setData( obj );
+ TQApplication::clipboard()->setData( obj );
}
-void MediumButton::dragEnterEvent(QDragEnterEvent* e)
+void MediumButton::dragEnterEvent(TQDragEnterEvent* e)
{
if (mFileItem.isWritable())
{
@@ -156,14 +156,14 @@ void MediumButton::dragEnterEvent(QDragEnterEvent* e)
}
}
-void MediumButton::dragLeaveEvent(QDragLeaveEvent* e)
+void MediumButton::dragLeaveEvent(TQDragLeaveEvent* e)
{
mOpenTimer.stop();
PanelPopupButton::dragLeaveEvent( e );
}
-void MediumButton::dropEvent(QDropEvent *e)
+void MediumButton::dropEvent(TQDropEvent *e)
{
mOpenTimer.stop();
@@ -175,7 +175,7 @@ void MediumButton::slotDragOpen()
mFileItem.run();
}
-QString MediumButton::tileName()
+TQString MediumButton::tileName()
{
return mFileItem.text();
}
diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h
index 8d7970d89..3fa31756a 100644
--- a/kicker/applets/media/mediumbutton.h
+++ b/kicker/applets/media/mediumbutton.h
@@ -21,11 +21,11 @@
#define MEDIUMBUTTON_H
#include <panelbutton.h>
-#include <qpoint.h>
-#include <qstring.h>
-#include <qpixmap.h>
-#include <qcursor.h>
-#include <qtimer.h>
+#include <tqpoint.h>
+#include <tqstring.h>
+#include <tqpixmap.h>
+#include <tqcursor.h>
+#include <tqtimer.h>
#include <kfileitem.h>
#include <kpanelapplet.h>
#include <kactioncollection.h>
@@ -35,19 +35,19 @@ class MediumButton : public PanelPopupButton
Q_OBJECT
public:
- MediumButton(QWidget *parent, const KFileItem &fileItem);
+ MediumButton(TQWidget *parent, const KFileItem &fileItem);
~MediumButton();
const KFileItem &fileItem() const;
void setFileItem(const KFileItem &fileItem);
void setPanelPosition(KPanelApplet::Position position);
protected:
- QString tileName();
+ TQString tileName();
void refreshType();
void initPopup();
- void dragEnterEvent( QDragEnterEvent* );
- void dragLeaveEvent( QDragLeaveEvent* );
- void dropEvent(QDropEvent *e);
+ void dragEnterEvent( TQDragEnterEvent* );
+ void dragLeaveEvent( TQDragLeaveEvent* );
+ void dropEvent(TQDropEvent *e);
protected slots:
// Activate this code only if we find a way to have both an
@@ -60,7 +60,7 @@ protected slots:
private:
KActionCollection mActions;
KFileItem mFileItem;
- QTimer mOpenTimer;
+ TQTimer mOpenTimer;
};
#endif
diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp
index 179878e89..8d9cdcc94 100644
--- a/kicker/applets/media/preferencesdialog.cpp
+++ b/kicker/applets/media/preferencesdialog.cpp
@@ -21,34 +21,34 @@
#include <klocale.h>
#include <kmimetype.h>
-#include <qvbox.h>
-#include <qwhatsthis.h>
+#include <tqvbox.h>
+#include <tqwhatsthis.h>
#include <klistview.h>
#include <kfiledetailview.h>
class MediumTypeItem : public QCheckListItem
{
public:
- MediumTypeItem(QListView *parent, const QString name,
- const QString mimetype)
- : QCheckListItem(parent, name, CheckBox),
+ MediumTypeItem(TQListView *parent, const TQString name,
+ const TQString mimetype)
+ : TQCheckListItem(parent, name, CheckBox),
mMimeType(mimetype) { }
- const QString &mimeType() const { return mMimeType; }
+ const TQString &mimeType() const { return mMimeType; }
private:
- QString mMimeType;
+ TQString mMimeType;
};
class MediumItem : public QCheckListItem
{
public:
- MediumItem(QListView *parent, const QString name,
+ MediumItem(TQListView *parent, const TQString name,
const KFileItem medium)
- : QCheckListItem(parent, name, CheckBox),
+ : TQCheckListItem(parent, name, CheckBox),
mMedium(medium) { }
- const QString itemURL() const { return mMedium.url().url(); }
+ const TQString itemURL() const { return mMedium.url().url(); }
private:
KFileItem mMedium;
@@ -56,27 +56,27 @@ private:
-PreferencesDialog::PreferencesDialog(KFileItemList media, QWidget *parent,
+PreferencesDialog::PreferencesDialog(KFileItemList media, TQWidget *parent,
const char *name)
: KDialogBase(Tabbed, i18n("Media Applet Preferences"), Ok|Cancel|Default,
Ok, parent, name, true),
mMedia(media)
{
- QVBox *types_page = addVBoxPage( i18n("Medium Types") );
+ TQVBox *types_page = addVBoxPage( i18n("Medium Types") );
mpMediumTypesListView = new KListView(types_page);
//mpMediumTypesListView->setFullWidth(true);
mpMediumTypesListView->addColumn( i18n("Types to Display") );
- QWhatsThis::add(mpMediumTypesListView, i18n("Deselect the medium types which you do not want to see in the applet"));
+ TQWhatsThis::add(mpMediumTypesListView, i18n("Deselect the medium types which you do not want to see in the applet"));
- QVBox *media_page = addVBoxPage( i18n("Media") );
+ TQVBox *media_page = addVBoxPage( i18n("Media") );
mpMediaListView = new KListView(media_page);
//mpMediaListView->setFullWidth(true);
mpMediaListView->addColumn( i18n("Media to Display") );
- QWhatsThis::add(mpMediaListView, i18n("Deselect the media which you do not want to see in the applet"));
+ TQWhatsThis::add(mpMediaListView, i18n("Deselect the media which you do not want to see in the applet"));
slotDefault();
}
@@ -87,7 +87,7 @@ PreferencesDialog::~PreferencesDialog()
void PreferencesDialog::slotDefault()
{
- QStringList defaultExclude;
+ TQStringList defaultExclude;
defaultExclude << "media/hdd_mounted";
defaultExclude << "media/hdd_unmounted";
@@ -97,12 +97,12 @@ void PreferencesDialog::slotDefault()
defaultExclude << "media/smb_unmounted";
setExcludedMediumTypes(defaultExclude);
- setExcludedMedia(QStringList());
+ setExcludedMedia(TQStringList());
}
-QStringList PreferencesDialog::excludedMediumTypes()
+TQStringList PreferencesDialog::excludedMediumTypes()
{
- QStringList excludedTypes;
+ TQStringList excludedTypes;
for(MediumTypeItem *it=static_cast<MediumTypeItem *>(mpMediumTypesListView->firstChild());
it; it=static_cast<MediumTypeItem *>(it->nextSibling()))
@@ -113,13 +113,13 @@ QStringList PreferencesDialog::excludedMediumTypes()
return excludedTypes;
}
-void PreferencesDialog::setExcludedMediumTypes(QStringList excludedTypesList)
+void PreferencesDialog::setExcludedMediumTypes(TQStringList excludedTypesList)
{
mpMediumTypesListView->clear();
mpMediumTypesListView->setRootIsDecorated(false);
KMimeType::List mimetypes = KMimeType::allMimeTypes();
- QValueListIterator<KMimeType::Ptr> it(mimetypes.begin());
+ TQValueListIterator<KMimeType::Ptr> it(mimetypes.begin());
for(; it != mimetypes.end(); ++it)
{
@@ -132,9 +132,9 @@ void PreferencesDialog::setExcludedMediumTypes(QStringList excludedTypesList)
}
}
-QStringList PreferencesDialog::excludedMedia()
+TQStringList PreferencesDialog::excludedMedia()
{
- QStringList excluded;
+ TQStringList excluded;
for(MediumItem *it=static_cast<MediumItem *>(mpMediaListView->firstChild());
it; it=static_cast<MediumItem *>(it->nextSibling()))
@@ -145,7 +145,7 @@ QStringList PreferencesDialog::excludedMedia()
return excluded;
}
-void PreferencesDialog::setExcludedMedia(QStringList excludedList)
+void PreferencesDialog::setExcludedMedia(TQStringList excludedList)
{
mpMediaListView->clear();
mpMediaListView->setRootIsDecorated(false);
diff --git a/kicker/applets/media/preferencesdialog.h b/kicker/applets/media/preferencesdialog.h
index bb400564b..e946f81de 100644
--- a/kicker/applets/media/preferencesdialog.h
+++ b/kicker/applets/media/preferencesdialog.h
@@ -20,7 +20,7 @@
#ifndef PREFERENCESDIALOG_H
#define PREFERENCESDIALOG_H
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kdialogbase.h>
#include <kfileitem.h>
@@ -32,14 +32,14 @@ class PreferencesDialog : public KDialogBase
{
Q_OBJECT
public:
- PreferencesDialog(KFileItemList media, QWidget *parent=0, const char *name=0);
+ PreferencesDialog(KFileItemList media, TQWidget *parent=0, const char *name=0);
~PreferencesDialog();
- QStringList excludedMediumTypes();
- void setExcludedMediumTypes(QStringList excludedTypesList);
+ TQStringList excludedMediumTypes();
+ void setExcludedMediumTypes(TQStringList excludedTypesList);
- QStringList excludedMedia();
- void setExcludedMedia(QStringList excludedList);
+ TQStringList excludedMedia();
+ void setExcludedMedia(TQStringList excludedList);
protected slots:
void slotDefault();
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index ae10614c6..472f3bd0d 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -26,9 +26,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "menuapplet.h"
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qvariant.h> // avoid X11 #define's
+#include <tqlayout.h>
+#include <tqtooltip.h>
+#include <tqvariant.h> // avoid X11 #define's
#include <kapplication.h>
#include <kconfig.h>
@@ -45,7 +45,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/*
KMenuBar from KDE3.1 and older won't work very well with this applet.
- This is because QMenuBar tries really hard to keep its preffered size,
+ This is because TQMenuBar tries really hard to keep its preffered size,
se even if the X window for the menubar has the size enforced by this
applet, Qt thinks it has the size Qt wants. This results in parts
of the menubar not being repainted. Also, old KMenuBar always forced
@@ -61,7 +61,7 @@ extern Time qt_x_time;
extern "C"
{
- KDE_EXPORT KPanelApplet* init( QWidget* parent_P, const QString& configFile_P )
+ KDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P )
{
KGlobal::locale()->insertCatalogue("kmenuapplet");
return new KickerMenuApplet::Applet( configFile_P, parent_P );
@@ -78,7 +78,7 @@ const long SUPPORTED_WINDOW_TYPES = NET::NormalMask | NET::DesktopMask | NET::Do
| NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::OverrideMask
| NET::TopMenuMask | NET::UtilityMask | NET::SplashMask;
-Applet::Applet( const QString& configFile_P, QWidget* parent_P )
+Applet::Applet( const TQString& configFile_P, TQWidget* parent_P )
: KPanelApplet( configFile_P, Normal, 0, parent_P, "menuapplet" ),
DCOPObject( "menuapplet" ),
module( NULL ),
@@ -91,8 +91,8 @@ Applet::Applet( const QString& configFile_P, QWidget* parent_P )
setBackgroundOrigin(AncestorOrigin);
dcopclient.registerAs( "menuapplet", false );
// toolbarAppearanceChanged(int) is sent when changing macstyle
- connect( kapp, SIGNAL( toolbarAppearanceChanged( int )),
- this, SLOT( readSettings()));
+ connect( kapp, TQT_SIGNAL( toolbarAppearanceChanged( int )),
+ this, TQT_SLOT( readSettings()));
claimSelection();
readSettings();
updateTopEdgeOffset();
@@ -152,7 +152,7 @@ void Applet::activeWindowChanged( WId w_P )
window != None;
window = tryTransientFor( window ))
{
- for( QValueList< MenuEmbed* >::ConstIterator it = menus.begin();
+ for( TQValueList< MenuEmbed* >::ConstIterator it = menus.begin();
it != menus.end();
++it )
{
@@ -175,7 +175,7 @@ void Applet::activeWindowChanged( WId w_P )
}
if( try_desktop )
{
- for( QValueList< MenuEmbed* >::ConstIterator it = menus.begin();
+ for( TQValueList< MenuEmbed* >::ConstIterator it = menus.begin();
it != menus.end();
++it )
{
@@ -233,7 +233,7 @@ WId Applet::tryTransientFor( WId w_P )
void Applet::menuLost( MenuEmbed* embed )
{
- for( QValueList< MenuEmbed* >::Iterator it = menus.begin();
+ for( TQValueList< MenuEmbed* >::Iterator it = menus.begin();
it != menus.end();
++it )
{
@@ -266,21 +266,21 @@ void Applet::positionChange( Position )
// Kicker's frame).
void Applet::updateTopEdgeOffset()
{
- QPoint p = topLevelWidget()->mapToGlobal( QPoint( 0, 0 ));
+ TQPoint p = topLevelWidget()->mapToGlobal( TQPoint( 0, 0 ));
if( p.y() <= 2 ) // 2 = work also when running in appletproxy
- topEdgeOffset = mapToGlobal( QPoint( 0, 0 )).y() - p.y();
+ topEdgeOffset = mapToGlobal( TQPoint( 0, 0 )).y() - p.y();
else
topEdgeOffset = 0;
if( active_menu != NULL )
active_menu->move( active_menu->x(), -topEdgeOffset );
}
-void Applet::paletteChange(const QPalette & /* oldPalette */)
+void Applet::paletteChange(const TQPalette & /* oldPalette */)
{
setBackground();
}
-void Applet::moveEvent( QMoveEvent* )
+void Applet::moveEvent( TQMoveEvent* )
{
setBackground();
}
@@ -300,13 +300,13 @@ void Applet::claimSelection()
{
delete selection_watcher;
selection_watcher = NULL;
- connect( selection, SIGNAL( lostOwnership()), SLOT( lostSelection()));
+ connect( selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection()));
module = new KWinModule;
- connect( module, SIGNAL( windowAdded( WId )), this, SLOT( windowAdded( WId )));
- connect( module, SIGNAL( activeWindowChanged( WId )),
- this, SLOT( activeWindowChanged( WId )));
- QValueList< WId > windows = module->windows();
- for( QValueList< WId >::ConstIterator it = windows.begin();
+ connect( module, TQT_SIGNAL( windowAdded( WId )), this, TQT_SLOT( windowAdded( WId )));
+ connect( module, TQT_SIGNAL( activeWindowChanged( WId )),
+ this, TQT_SLOT( activeWindowChanged( WId )));
+ TQValueList< WId > windows = module->windows();
+ for( TQValueList< WId >::ConstIterator it = windows.begin();
it != windows.end();
++it )
windowAdded( *it );
@@ -321,7 +321,7 @@ void Applet::lostSelection()
if( selection == NULL )
return;
// kdDebug() << "lost selection" << endl;
- for( QValueList< MenuEmbed* >::ConstIterator it = menus.begin();
+ for( TQValueList< MenuEmbed* >::ConstIterator it = menus.begin();
it != menus.end();
++it )
delete (*it); // delete all MenuEmbed's = release all menus
@@ -330,7 +330,7 @@ void Applet::lostSelection()
if( selection_watcher == NULL )
{
selection_watcher = new KSelectionWatcher( makeSelectionAtom(), DefaultScreen( qt_xdisplay()));
- connect( selection_watcher, SIGNAL( lostOwner()), this, SLOT( claimSelection()));
+ connect( selection_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( claimSelection()));
}
delete module;
module = NULL;
@@ -346,9 +346,9 @@ void Applet::readSettings()
desktop_menu = cfg.readBoolEntry( "ShowMenubar", false );
cfg.setGroup( "KDE" );
if( cfg.readBoolEntry( "macStyle", false ) || desktop_menu )
- QToolTip::remove( this );
+ TQToolTip::remove( this );
else
- QToolTip::add( this, i18n(
+ TQToolTip::add( this, i18n(
"You do not appear to have enabled the standalone menubar; "
"enable it in the Behavior control module for desktop." ));
if( !isDisabled() && active_menu == NULL )
@@ -397,7 +397,7 @@ Atom Applet::makeSelectionAtom()
}
MenuEmbed::MenuEmbed( WId mainwindow_P, bool desktop_P,
- QWidget* parent_P, const char* name_P )
+ TQWidget* parent_P, const char* name_P )
: QXEmbed( parent_P, name_P ),
main_window( mainwindow_P ),
desktop( desktop_P )
@@ -418,7 +418,7 @@ bool MenuEmbed::x11Event( XEvent* ev_P )
&& ev_P->xconfigurerequest.value_mask & ( CWWidth | CWHeight ))
{
XConfigureRequestEvent& ev = ev_P->xconfigurerequest;
- QSize new_size = size();
+ TQSize new_size = size();
if( ev.value_mask & CWWidth )
new_size.setWidth( ev.width );
if( ev.value_mask & CWHeight )
@@ -443,7 +443,7 @@ bool MenuEmbed::x11Event( XEvent* ev_P )
void MenuEmbed::sendSyntheticConfigureNotifyEvent()
{
- QPoint globalPos = mapToGlobal(QPoint(0,0));
+ TQPoint globalPos = mapToGlobal(TQPoint(0,0));
if (embeddedWinId()) {
XConfigureEvent c;
memset(&c, 0, sizeof(c));
@@ -489,11 +489,11 @@ void MenuEmbed::setMinimumSize( int w, int h )
void MenuEmbed::setBackground()
{
- const QPixmap *pbg = parentWidget()->backgroundPixmap();
+ const TQPixmap *pbg = parentWidget()->backgroundPixmap();
if (pbg)
{
- QPixmap bg(width(), height());
+ TQPixmap bg(width(), height());
bg.fill(parentWidget(), pos());
setPaletteBackgroundPixmap(bg);
setBackgroundOrigin(WidgetOrigin);
diff --git a/kicker/applets/menu/menuapplet.h b/kicker/applets/menu/menuapplet.h
index 8374e897b..5ba54cd66 100644
--- a/kicker/applets/menu/menuapplet.h
+++ b/kicker/applets/menu/menuapplet.h
@@ -27,8 +27,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <assert.h>
-#include <qvaluelist.h>
-#include <qevent.h>
+#include <tqvaluelist.h>
+#include <tqevent.h>
#include <qxembed.h>
#include <kpanelapplet.h>
@@ -78,7 +78,7 @@ k_dcop:
ASYNC configure();
public:
- Applet( const QString& configFile, QWidget *parent );
+ Applet( const TQString& configFile, TQWidget *parent );
virtual ~Applet();
virtual int widthForHeight( int height ) const;
virtual int heightForWidth( int width ) const;
@@ -92,9 +92,9 @@ public:
protected:
- virtual void paletteChange(const QPalette& );
+ virtual void paletteChange(const TQPalette& );
virtual void positionChange( Position p );
- virtual void moveEvent(QMoveEvent *);
+ virtual void moveEvent(TQMoveEvent *);
private slots:
@@ -150,7 +150,7 @@ private:
/**
* List of all known menus.
*/
- QValueList< MenuEmbed* > menus;
+ TQValueList< MenuEmbed* > menus;
/**
* A pointer to the current active menu, which is member
@@ -197,7 +197,7 @@ public:
* @param desktop true if @p mainwindow is the desktop
*/
MenuEmbed( WId mainwindow, bool desktop,
- QWidget* parent = NULL, const char* name = NULL );
+ TQWidget* parent = NULL, const char* name = NULL );
void setBackground();
@@ -210,7 +210,7 @@ public:
*/
bool isDesktopMenu() const;
virtual void setMinimumSize( int w, int h );
- void setMinimumSize( const QSize& s ) { setMinimumSize( s.width(), s.height()); }
+ void setMinimumSize( const TQSize& s ) { setMinimumSize( s.width(), s.height()); }
protected:
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index defc21795..dc2431e15 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -21,12 +21,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qpainter.h>
-#include <qtooltip.h>
-#include <qlineedit.h>
-#include <qpopupmenu.h>
-#include <qlayout.h>
-#include <qbuttongroup.h>
+#include <tqpainter.h>
+#include <tqtooltip.h>
+#include <tqlineedit.h>
+#include <tqpopupmenu.h>
+#include <tqlayout.h>
+#include <tqbuttongroup.h>
#include <dcopref.h>
#include <kglobalsettings.h>
@@ -73,15 +73,15 @@ static const int bgOffset = 300;
extern "C"
{
- KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile)
+ KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("kminipagerapplet");
return new KMiniPager(configFile, KPanelApplet::Normal, 0, parent, "kminipagerapplet");
}
}
-KMiniPager::KMiniPager(const QString& configFile, Type type, int actions,
- QWidget *parent, const char *name)
+KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
+ TQWidget *parent, const char *name)
: KPanelApplet( configFile, type, actions, parent, name ),
m_layout(0),
m_desktopLayoutOwner( NULL ),
@@ -90,8 +90,8 @@ KMiniPager::KMiniPager(const QString& configFile, Type type, int actions,
m_settings( new PagerSettings(sharedConfig()) )
{
setBackgroundOrigin( AncestorOrigin );
- int scnum = QApplication::desktop()->screenNumber(this);
- QRect desk = QApplication::desktop()->screenGeometry(scnum);
+ int scnum = TQApplication::desktop()->screenNumber(this);
+ TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
if (desk.width() <= 800)
{
KConfigSkeleton::ItemBool* item = dynamic_cast<KConfigSkeleton::ItemBool*>(m_settings->findItem("Preview"));
@@ -107,9 +107,9 @@ KMiniPager::KMiniPager(const QString& configFile, Type type, int actions,
TaskManager::the()->trackGeometry();
}
- m_group = new QButtonGroup(this);
+ m_group = new TQButtonGroup(this);
m_group->setBackgroundOrigin(AncestorOrigin);
- m_group->setFrameStyle(QFrame::NoFrame);
+ m_group->setFrameStyle(TQFrame::NoFrame);
m_group->setExclusive( true );
setFont( KGlobalSettings::taskbarFont() );
@@ -127,32 +127,32 @@ KMiniPager::KMiniPager(const QString& configFile, Type type, int actions,
desktopLayoutX = -1;
desktopLayoutY = -1;
- QSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop()));
+ TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop()));
m_useViewports = s.width() * s.height() > 1;
drawButtons();
- connect( m_kwin, SIGNAL( currentDesktopChanged(int)), SLOT( slotSetDesktop(int) ) );
- connect( m_kwin, SIGNAL( currentDesktopViewportChanged(int, const QPoint&)), SLOT(slotSetDesktopViewport(int, const QPoint&)));
- connect( m_kwin, SIGNAL( numberOfDesktopsChanged(int)), SLOT( slotSetDesktopCount(int) ) );
- connect( m_kwin, SIGNAL( desktopGeometryChanged(int)), SLOT( slotRefreshViewportCount(int) ) );
- connect( m_kwin, SIGNAL( activeWindowChanged(WId)), SLOT( slotActiveWindowChanged(WId) ) );
- connect( m_kwin, SIGNAL( windowAdded(WId) ), this, SLOT( slotWindowAdded(WId) ) );
- connect( m_kwin, SIGNAL( windowRemoved(WId) ), this, SLOT( slotWindowRemoved(WId) ) );
- connect( m_kwin, SIGNAL( windowChanged(WId,unsigned int) ), this, SLOT( slotWindowChanged(WId,unsigned int) ) );
- connect( m_kwin, SIGNAL( desktopNamesChanged() ), this, SLOT( slotDesktopNamesChanged() ) );
- connect( kapp, SIGNAL(backgroundChanged(int)), SLOT(slotBackgroundChanged(int)) );
+ connect( m_kwin, TQT_SIGNAL( currentDesktopChanged(int)), TQT_SLOT( slotSetDesktop(int) ) );
+ connect( m_kwin, TQT_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQT_SLOT(slotSetDesktopViewport(int, const TQPoint&)));
+ connect( m_kwin, TQT_SIGNAL( numberOfDesktopsChanged(int)), TQT_SLOT( slotSetDesktopCount(int) ) );
+ connect( m_kwin, TQT_SIGNAL( desktopGeometryChanged(int)), TQT_SLOT( slotRefreshViewportCount(int) ) );
+ connect( m_kwin, TQT_SIGNAL( activeWindowChanged(WId)), TQT_SLOT( slotActiveWindowChanged(WId) ) );
+ connect( m_kwin, TQT_SIGNAL( windowAdded(WId) ), this, TQT_SLOT( slotWindowAdded(WId) ) );
+ connect( m_kwin, TQT_SIGNAL( windowRemoved(WId) ), this, TQT_SLOT( slotWindowRemoved(WId) ) );
+ connect( m_kwin, TQT_SIGNAL( windowChanged(WId,unsigned int) ), this, TQT_SLOT( slotWindowChanged(WId,unsigned int) ) );
+ connect( m_kwin, TQT_SIGNAL( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) );
+ connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) );
if (kapp->authorizeKAction("kicker_rmb") && kapp->authorizeControlModule("kde-kcmtaskbar.desktop"))
{
- m_contextMenu = new QPopupMenu();
- connect(m_contextMenu, SIGNAL(aboutToShow()), SLOT(aboutToShowContextMenu()));
- connect(m_contextMenu, SIGNAL(activated(int)), SLOT(contextMenuActivated(int)));
+ m_contextMenu = new TQPopupMenu();
+ connect(m_contextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu()));
+ connect(m_contextMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
setCustomMenu(m_contextMenu);
}
- QValueList<WId>::ConstIterator it;
- QValueList<WId>::ConstIterator itEnd = m_kwin->windows().end();
+ TQValueList<WId>::ConstIterator it;
+ TQValueList<WId>::ConstIterator itEnd = m_kwin->windows().end();
for ( it = m_kwin->windows().begin(); it != itEnd; ++it)
{
slotWindowAdded( (*it) );
@@ -218,11 +218,11 @@ void KMiniPager::slotSetDesktop(int desktop)
}
}
-void KMiniPager::slotSetDesktopViewport(int desktop, const QPoint& viewport)
+void KMiniPager::slotSetDesktopViewport(int desktop, const TQPoint& viewport)
{
// ###
Q_UNUSED(desktop);
- QSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop()));
+ TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop()));
slotSetDesktop((viewport.y()-1) * s.width() + viewport.x() );
}
@@ -231,9 +231,9 @@ void KMiniPager::slotButtonSelected( int desk )
if (m_kwin->numberOfViewports(m_kwin->currentDesktop()).width() *
m_kwin->numberOfViewports(m_kwin->currentDesktop()).height() > 1)
{
- QPoint p;
+ TQPoint p;
- p.setX( (desk-1) * QApplication::desktop()->width());
+ p.setX( (desk-1) * TQApplication::desktop()->width());
p.setY( 0 );
KWin::setCurrentDesktopViewport(m_kwin->currentDesktop(), p);
@@ -276,14 +276,14 @@ int KMiniPager::widthForHeight(int h) const
{
if (desktopPreview() || m_settings->backgroundType() == PagerSettings::EnumBackgroundType::BgLive)
{
- bw = (int) ( bw * (double) QApplication::desktop()->width() / QApplication::desktop()->height() );
+ bw = (int) ( bw * (double) TQApplication::desktop()->width() / TQApplication::desktop()->height() );
}
}
else
{
// scale to desktop width as a minimum
- bw = (int) (bw * (double) QApplication::desktop()->width() / QApplication::desktop()->height());
- QFontMetrics fm = fontMetrics();
+ bw = (int) (bw * (double) TQApplication::desktop()->width() / TQApplication::desktop()->height());
+ TQFontMetrics fm = fontMetrics();
for (int i = 1; i <= deskNum; i++)
{
int sw = fm.width( m_kwin->desktopName( i ) ) + 8;
@@ -331,7 +331,7 @@ int KMiniPager::heightForWidth(int w) const
int bh = (w/rowNum) + 1;
if ( desktopPreview() )
{
- bh = (int) ( bh * (double) QApplication::desktop()->height() / QApplication::desktop()->width() );
+ bh = (int) ( bh * (double) TQApplication::desktop()->height() / TQApplication::desktop()->width() );
}
else if ( m_settings->labelType() == PagerSettings::EnumLabelType::LabelName )
{
@@ -365,7 +365,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
if( m_desktopLayoutOwner == NULL )
{ // must own manager selection before setting global desktop layout
int screen = DefaultScreen( qt_xdisplay());
- m_desktopLayoutOwner = new KSelectionOwner( QString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
+ m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
screen, this );
if( !m_desktopLayoutOwner->claim( false ))
{
@@ -379,7 +379,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
i.setDesktopLayout( orient, x, y, NET::DesktopLayoutCornerTopLeft );
}
-void KMiniPager::resizeEvent(QResizeEvent*)
+void KMiniPager::resizeEvent(TQResizeEvent*)
{
bool horiz = orientation() == Horizontal;
@@ -418,10 +418,10 @@ void KMiniPager::resizeEvent(QResizeEvent*)
}
// 1 pixel spacing.
- m_layout = new QGridLayout(this, nDX, nDY, 0, 1);
+ m_layout = new TQGridLayout(this, nDX, nDY, 0, 1);
- QValueList<KMiniPagerButton*>::Iterator it = m_desktops.begin();
- QValueList<KMiniPagerButton*>::Iterator itEnd = m_desktops.end();
+ TQValueList<KMiniPagerButton*>::Iterator it = m_desktops.begin();
+ TQValueList<KMiniPagerButton*>::Iterator itEnd = m_desktops.end();
int c = 0,
r = 0;
while( it != itEnd ) {
@@ -438,7 +438,7 @@ void KMiniPager::resizeEvent(QResizeEvent*)
updateGeometry();
}
-void KMiniPager::wheelEvent( QWheelEvent* e )
+void KMiniPager::wheelEvent( TQWheelEvent* e )
{
int newDesk;
int desktops = KWin::numberOfDesktops();
@@ -465,24 +465,24 @@ void KMiniPager::drawButtons()
int i = 1;
do
{
- QSize viewportNum = m_kwin->numberOfViewports(i);
+ TQSize viewportNum = m_kwin->numberOfViewports(i);
for (int j = 1; j <= viewportNum.width() * viewportNum.height(); ++j)
{
- QSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop()));
- QPoint viewport( (j-1) % s.width(), (j-1) / s.width());
+ TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop()));
+ TQPoint viewport( (j-1) % s.width(), (j-1) / s.width());
desk = new KMiniPagerButton( count, m_useViewports, viewport, this );
if ( m_settings->labelType() != PagerSettings::EnumLabelType::LabelName )
{
- QToolTip::add( desk, desk->desktopName() );
+ TQToolTip::add( desk, desk->desktopName() );
}
m_desktops.append( desk );
m_group->insert( desk, count );
- connect(desk, SIGNAL(buttonSelected(int)),
- SLOT(slotButtonSelected(int)) );
- connect(desk, SIGNAL(showMenu(const QPoint&, int )),
- SLOT(slotShowMenu(const QPoint&, int )) );
+ connect(desk, TQT_SIGNAL(buttonSelected(int)),
+ TQT_SLOT(slotButtonSelected(int)) );
+ connect(desk, TQT_SIGNAL(showMenu(const TQPoint&, int )),
+ TQT_SLOT(slotShowMenu(const TQPoint&, int )) );
desk->show();
++count;
@@ -493,11 +493,11 @@ void KMiniPager::drawButtons()
void KMiniPager::slotSetDesktopCount( int )
{
- QSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop()));
+ TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop()));
m_useViewports = s.width() * s.height() > 1;
- QValueList<KMiniPagerButton*>::ConstIterator it;
- QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
+ TQValueList<KMiniPagerButton*>::ConstIterator it;
+ TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
for( it = m_desktops.begin(); it != itEnd; ++it )
{
delete (*it);
@@ -518,11 +518,11 @@ void KMiniPager::slotSetDesktopCount( int )
void KMiniPager::slotRefreshViewportCount( int )
{
- QSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop()));
+ TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop()));
m_useViewports = s.width() * s.height() > 1;
- QValueList<KMiniPagerButton*>::ConstIterator it;
- QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
+ TQValueList<KMiniPagerButton*>::ConstIterator it;
+ TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
for( it = m_desktops.begin(); it != itEnd; ++it )
{
delete (*it);
@@ -549,8 +549,8 @@ void KMiniPager::slotActiveWindowChanged( WId win )
KWin::WindowInfo* inf2 = win ? info( win ) : NULL;
m_activeWindow = win;
- QValueList<KMiniPagerButton*>::ConstIterator it;
- QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
+ TQValueList<KMiniPagerButton*>::ConstIterator it;
+ TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
for ( it = m_desktops.begin(); it != itEnd; ++it)
{
if ( ( inf1 && (*it)->shouldPaintWindow(inf1)) ||
@@ -573,8 +573,8 @@ void KMiniPager::slotWindowAdded( WId win)
return;
}
- QValueList<KMiniPagerButton*>::ConstIterator it;
- QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
+ TQValueList<KMiniPagerButton*>::ConstIterator it;
+ TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
for ( it = m_desktops.begin(); it != itEnd; ++it)
{
if ( (*it)->shouldPaintWindow(inf) )
@@ -605,8 +605,8 @@ void KMiniPager::slotWindowRemoved(WId win)
return;
}
- QValueList<KMiniPagerButton*>::ConstIterator it;
- QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
+ TQValueList<KMiniPagerButton*>::ConstIterator it;
+ TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
for (it = m_desktops.begin(); it != itEnd; ++it)
{
if (onAllDesktops || onAllViewports || desktop == (*it)->desktop())
@@ -637,9 +637,9 @@ void KMiniPager::slotWindowChanged( WId win , unsigned int properties )
{
KWin::WindowInfo* inf = m_windows[win];
bool skipPager = inf->hasState(NET::SkipPager);
- QMemArray<bool> old_shouldPaintWindow(m_desktops.size());
- QValueList<KMiniPagerButton*>::ConstIterator it;
- QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
+ TQMemArray<bool> old_shouldPaintWindow(m_desktops.size());
+ TQValueList<KMiniPagerButton*>::ConstIterator it;
+ TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
int i = 0;
for ( it = m_desktops.begin(); it != itEnd; ++it)
{
@@ -693,8 +693,8 @@ KTextShadowEngine* KMiniPager::shadowEngine()
void KMiniPager::refresh()
{
- QValueList<KMiniPagerButton*>::ConstIterator it;
- QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
+ TQValueList<KMiniPagerButton*>::ConstIterator it;
+ TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
for ( it = m_desktops.begin(); it != itEnd; ++it)
{
(*it)->update();
@@ -716,13 +716,13 @@ void KMiniPager::aboutToShowContextMenu()
showMenu->setCheckable(true);
showMenu->insertTitle(i18n("Pager Layout"));
- QPopupMenu* rowMenu = new QPopupMenu(showMenu);
+ TQPopupMenu* rowMenu = new TQPopupMenu(showMenu);
rowMenu->setCheckable(true);
rowMenu->insertItem(i18n("&Automatic"), 0 + rowOffset);
rowMenu->insertItem(i18n("one row or column", "&1"), 1 + rowOffset);
rowMenu->insertItem(i18n("two rows or columns", "&2"), 2 + rowOffset);
rowMenu->insertItem( i18n("three rows or columns", "&3"), 3 + rowOffset);
- connect(rowMenu, SIGNAL(activated(int)), SLOT(contextMenuActivated(int)));
+ connect(rowMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
showMenu->insertItem((orientation()==Horizontal) ? i18n("&Rows"):
i18n("&Columns"),
rowMenu);
@@ -747,7 +747,7 @@ void KMiniPager::aboutToShowContextMenu()
showMenu->insertItem(i18n("&Desktop Wallpaper"),
PagerSettings::EnumBackgroundType::BgLive + bgOffset);
}
- connect(showMenu, SIGNAL(activated(int)), SLOT(contextMenuActivated(int)));
+ connect(showMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
m_contextMenu->insertItem(i18n("&Pager Options"),showMenu);
m_contextMenu->insertItem(SmallIcon("configure"),
@@ -766,7 +766,7 @@ void KMiniPager::aboutToShowContextMenu()
PagerSettings::EnumLabelType::LabelName);
}
-void KMiniPager::slotShowMenu(const QPoint& pos, int desktop)
+void KMiniPager::slotShowMenu(const TQPoint& pos, int desktop)
{
if (!m_contextMenu)
{
@@ -827,8 +827,8 @@ void KMiniPager::contextMenuActivated(int result)
{
if (m_useViewports == false) {
m_settings->setBackgroundType(PagerSettings::EnumBackgroundType::BgLive);
- QValueList<KMiniPagerButton*>::ConstIterator it;
- QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
+ TQValueList<KMiniPagerButton*>::ConstIterator it;
+ TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
for( it = m_desktops.begin(); it != itEnd; ++it )
{
(*it)->backgroundChanged();
@@ -858,16 +858,16 @@ void KMiniPager::contextMenuActivated(int result)
void KMiniPager::slotDesktopNamesChanged()
{
- QValueList<KMiniPagerButton*>::ConstIterator it = m_desktops.begin();
- QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
+ TQValueList<KMiniPagerButton*>::ConstIterator it = m_desktops.begin();
+ TQValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
for (int i = 1; it != itEnd; ++it, ++i)
{
- QString name = m_kwin->desktopName(i);
+ TQString name = m_kwin->desktopName(i);
(*it)->setDesktopName(name);
(*it)->repaint();
- QToolTip::remove((*it));
- QToolTip::add((*it), name);
+ TQToolTip::remove((*it));
+ TQToolTip::add((*it), name);
}
updateLayout();
@@ -884,9 +884,9 @@ void KMiniPager::showPager()
else
{
// Let's run kpager if it isn't running
- connect( dcop, SIGNAL( applicationRegistered(const QCString &) ), this, SLOT(applicationRegistered(const QCString &)) );
+ connect( dcop, TQT_SIGNAL( applicationRegistered(const TQCString &) ), this, TQT_SLOT(applicationRegistered(const TQCString &)) );
dcop->setNotifications(true);
- QString strAppPath(locate("exe", "kpager"));
+ TQString strAppPath(locate("exe", "kpager"));
if (!strAppPath.isEmpty())
{
KProcess process;
@@ -899,25 +899,25 @@ void KMiniPager::showPager()
void KMiniPager::showKPager(bool toggleShow)
{
- QPoint pt;
+ TQPoint pt;
switch ( position() )
{
case pTop:
- pt = mapToGlobal( QPoint(x(), y() + height()) );
+ pt = mapToGlobal( TQPoint(x(), y() + height()) );
break;
case pLeft:
- pt = mapToGlobal( QPoint(x() + width(), y()) );
+ pt = mapToGlobal( TQPoint(x() + width(), y()) );
break;
case pRight:
case pBottom:
default:
- pt=mapToGlobal( QPoint(x(), y()) );
+ pt=mapToGlobal( TQPoint(x(), y()) );
}
DCOPClient *dcop=kapp->dcopClient();
- QByteArray data;
- QDataStream arg(data, IO_WriteOnly);
+ TQByteArray data;
+ TQDataStream arg(data, IO_WriteOnly);
arg << pt.x() << pt.y() ;
if (toggleShow)
{
@@ -929,12 +929,12 @@ void KMiniPager::showKPager(bool toggleShow)
}
}
-void KMiniPager::applicationRegistered( const QCString & appName )
+void KMiniPager::applicationRegistered( const TQCString & appName )
{
if (appName == "kpager")
{
- disconnect( kapp->dcopClient(), SIGNAL( applicationRegistered(const QCString &) ),
- this, SLOT(applicationRegistered(const QCString &)) );
+ disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRegistered(const TQCString &) ),
+ this, TQT_SLOT(applicationRegistered(const TQCString &)) );
showKPager(false);
}
}
diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h
index d96ba83f7..88712d9ff 100644
--- a/kicker/applets/minipager/pagerapplet.h
+++ b/kicker/applets/minipager/pagerapplet.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __MINIPAGER_H
#define __MINIPAGER_H
-#include <qvaluelist.h>
-#include <qintdict.h>
+#include <tqvaluelist.h>
+#include <tqintdict.h>
#include <kpanelapplet.h>
#include <kwin.h>
@@ -49,8 +49,8 @@ class KMiniPager : public KPanelApplet
Q_OBJECT
public:
- KMiniPager(const QString& configFile, Type t = Normal, int actions = 0,
- QWidget *parent = 0, const char *name = 0);
+ KMiniPager(const TQString& configFile, Type t = Normal, int actions = 0,
+ TQWidget *parent = 0, const char *name = 0);
virtual ~KMiniPager();
@@ -78,11 +78,11 @@ public:
void emitRequestFocus() { emit requestFocus(); }
- QPoint clickPos;
+ TQPoint clickPos;
public slots:
void slotSetDesktop(int desktop);
- void slotSetDesktopViewport(int desktop, const QPoint& viewport);
+ void slotSetDesktopViewport(int desktop, const TQPoint& viewport);
void slotSetDesktopCount(int count);
void slotRefreshViewportCount(int currentDesktop);
void slotButtonSelected(int desk );
@@ -90,7 +90,7 @@ public slots:
void slotWindowAdded( WId );
void slotWindowRemoved( WId );
void slotWindowChanged( WId, unsigned int );
- void slotShowMenu( const QPoint&, int );
+ void slotShowMenu( const TQPoint&, int );
void slotDesktopNamesChanged();
void slotBackgroundChanged( int );
@@ -98,30 +98,30 @@ public slots:
protected:
void drawButtons();
- void startDrag( const QPoint &point );
+ void startDrag( const TQPoint &point );
void updateDesktopLayout(int,int,int);
- void resizeEvent(QResizeEvent*);
- void wheelEvent( QWheelEvent* e );
+ void resizeEvent(TQResizeEvent*);
+ void wheelEvent( TQWheelEvent* e );
void showKPager(bool toggleShow);
protected slots:
void showPager();
- void applicationRegistered(const QCString &appName);
+ void applicationRegistered(const TQCString &appName);
void aboutToShowContextMenu();
void contextMenuActivated(int);
private:
- QValueList<KMiniPagerButton*> m_desktops;
+ TQValueList<KMiniPagerButton*> m_desktops;
int m_curDesk;
int m_rmbDesk;
- QIntDict<KWin::WindowInfo> m_windows;
+ TQIntDict<KWin::WindowInfo> m_windows;
WId m_activeWindow;
- QButtonGroup *m_group;
+ TQButtonGroup *m_group;
- QGridLayout *m_layout;
+ TQGridLayout *m_layout;
bool m_useViewports;
int desktopLayoutOrientation;
int desktopLayoutX;
@@ -131,7 +131,7 @@ private:
KWinModule *m_kwin;
KTextShadowEngine* m_shadowEngine;
- QPopupMenu *m_contextMenu;
+ TQPopupMenu *m_contextMenu;
PagerSettings *m_settings;
};
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index c17e0e1cb..c56afca38 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -23,12 +23,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <stdlib.h>
-#include <qcursor.h>
-#include <qdrawutil.h>
-#include <qlineedit.h>
-#include <qpainter.h>
-#include <qpopupmenu.h>
-#include <qstylesheet.h>
+#include <tqcursor.h>
+#include <tqdrawutil.h>
+#include <tqlineedit.h>
+#include <tqpainter.h>
+#include <tqpopupmenu.h>
+#include <tqstylesheet.h>
#include <netwm.h>
#include <dcopclient.h>
@@ -58,9 +58,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
KSharedPixmap* KMiniPagerButton::s_commonSharedPixmap;
KPixmap* KMiniPagerButton::s_commonBgPixmap;
-KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const QPoint& viewport,
+KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const TQPoint& viewport,
KMiniPager *parent, const char *name)
- : QButton(parent, name),
+ : TQButton(parent, name),
m_pager(parent),
m_desktop(desk),
m_useViewports(useViewPorts),
@@ -81,10 +81,10 @@ KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const QPoint& vi
m_desktopName = m_pager->kwin()->desktopName(m_desktop);
- connect(this, SIGNAL(clicked()), SLOT(slotClicked()));
- connect(this, SIGNAL(toggled(bool)), SLOT(slotToggled(bool)));
- connect(&m_dragSwitchTimer, SIGNAL(timeout()), this, SLOT(slotDragSwitch()));
- connect(&m_updateCompressor, SIGNAL(timeout()), this, SLOT(update()));
+ connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()));
+ connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
+ connect(&m_dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragSwitch()));
+ connect(&m_updateCompressor, TQT_SIGNAL(timeout()), this, TQT_SLOT(update()));
if (m_pager->desktopPreview())
{
@@ -99,37 +99,37 @@ KMiniPagerButton::~KMiniPagerButton()
delete m_bgPixmap;
}
-QRect KMiniPagerButton::mapGeometryToViewport(const KWin::WindowInfo& info) const
+TQRect KMiniPagerButton::mapGeometryToViewport(const KWin::WindowInfo& info) const
{
if (!m_useViewports)
return info.frameGeometry();
// ### fix vertically layouted viewports
- QRect _r(info.frameGeometry());
- QPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop()));
+ TQRect _r(info.frameGeometry());
+ TQPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop()));
- _r.moveBy( - (m_desktop - vx.x()) * QApplication::desktop()->width(),
+ _r.moveBy( - (m_desktop - vx.x()) * TQApplication::desktop()->width(),
0);
if ((info.state() & NET::Sticky))
{
- _r.moveTopLeft(QPoint(_r.x() % QApplication::desktop()->width(),
- _r.y() % QApplication::desktop()->height()));
+ _r.moveTopLeft(TQPoint(_r.x() % TQApplication::desktop()->width(),
+ _r.y() % TQApplication::desktop()->height()));
}
return _r;
}
-QPoint KMiniPagerButton::mapPointToViewport(const QPoint& _p) const
+TQPoint KMiniPagerButton::mapPointToViewport(const TQPoint& _p) const
{
if (!m_useViewports) return _p;
- QPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop()));
+ TQPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop()));
// ### fix vertically layouted viewports
- QPoint p(_p);
- p.setX(p.x() + (m_desktop - vx.x()) * QApplication::desktop()->width());
+ TQPoint p(_p);
+ p.setX(p.x() + (m_desktop - vx.x()) * TQApplication::desktop()->width());
return p;
}
@@ -152,11 +152,11 @@ bool KMiniPagerButton::shouldPaintWindow( KWin::WindowInfo *info ) const
return false;
if (m_useViewports) {
- QRect r = mapGeometryToViewport(*info);
+ TQRect r = mapGeometryToViewport(*info);
if (!info->hasState(NET::Sticky) &&
- !QApplication::desktop()->geometry().contains(r.topLeft()) &&
- !QApplication::desktop()->geometry().contains(r.topRight()))
+ !TQApplication::desktop()->geometry().contains(r.topLeft()) &&
+ !TQApplication::desktop()->geometry().contains(r.topRight()))
return false;
}
@@ -172,7 +172,7 @@ bool KMiniPagerButton::shouldPaintWindow( KWin::WindowInfo *info ) const
return true;
}
-void KMiniPagerButton::resizeEvent(QResizeEvent *ev)
+void KMiniPagerButton::resizeEvent(TQResizeEvent *ev)
{
if (m_lineEdit)
{
@@ -182,7 +182,7 @@ void KMiniPagerButton::resizeEvent(QResizeEvent *ev)
delete m_bgPixmap;
m_bgPixmap = 0;
- QButton::resizeEvent(ev);
+ TQButton::resizeEvent(ev);
}
void KMiniPagerButton::windowsChanged()
@@ -217,21 +217,21 @@ void KMiniPagerButton::loadBgPixmap()
client->attach();
}
- QCString kdesktop_name;
+ TQCString kdesktop_name;
int screen_number = DefaultScreen(qt_xdisplay());
if (screen_number == 0)
kdesktop_name = "kdesktop";
else
kdesktop_name.sprintf("kdesktop-screen-%d", screen_number);
- QByteArray data, replyData;
- QCString replyType;
+ TQByteArray data, replyData;
+ TQCString replyType;
if (client->call(kdesktop_name, "KBackgroundIface", "isCommon()",
data, replyType, replyData))
{
if (replyType == "bool")
{
- QDataStream reply(replyData, IO_ReadOnly);
+ TQDataStream reply(replyData, IO_ReadOnly);
reply >> m_isCommon;
}
}
@@ -245,8 +245,8 @@ void KMiniPagerButton::loadBgPixmap()
}
else if (s_commonSharedPixmap)
{ // other button is already fetching the pixmap
- connect(s_commonSharedPixmap, SIGNAL(done(bool)),
- SLOT(backgroundLoaded(bool)));
+ connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)),
+ TQT_SLOT(backgroundLoaded(bool)));
return;
}
}
@@ -256,15 +256,15 @@ void KMiniPagerButton::loadBgPixmap()
if (!s_commonSharedPixmap)
{
s_commonSharedPixmap = new KSharedPixmap;
- connect(s_commonSharedPixmap, SIGNAL(done(bool)),
- SLOT(backgroundLoaded(bool)));
+ connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)),
+ TQT_SLOT(backgroundLoaded(bool)));
}
- retval = s_commonSharedPixmap->loadFromShared(QString("DESKTOP1"));
+ retval = s_commonSharedPixmap->loadFromShared(TQString("DESKTOP1"));
if (retval == false) {
- QDataStream args( data, IO_WriteOnly );
+ TQDataStream args( data, IO_WriteOnly );
args << 1; // Argument is 1 (true)
client->send(kdesktop_name, "KBackgroundIface", "setExport(int)", data);
- retval = s_commonSharedPixmap->loadFromShared(QString("DESKTOP1"));
+ retval = s_commonSharedPixmap->loadFromShared(TQString("DESKTOP1"));
}
}
else
@@ -272,30 +272,30 @@ void KMiniPagerButton::loadBgPixmap()
if (!m_sharedPixmap)
{
m_sharedPixmap = new KSharedPixmap;
- connect(m_sharedPixmap, SIGNAL(done(bool)),
- SLOT(backgroundLoaded(bool)));
+ connect(m_sharedPixmap, TQT_SIGNAL(done(bool)),
+ TQT_SLOT(backgroundLoaded(bool)));
}
- retval = m_sharedPixmap->loadFromShared(QString("DESKTOP%1").arg(m_desktop));
+ retval = m_sharedPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_desktop));
if (retval == false) {
- QDataStream args( data, IO_WriteOnly );
+ TQDataStream args( data, IO_WriteOnly );
args << 1;
client->send(kdesktop_name, "KBackgroundIface", "setExport(int)", data);
- retval = m_sharedPixmap->loadFromShared(QString("DESKTOP%1").arg(m_desktop));
+ retval = m_sharedPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_desktop));
}
}
}
-static QPixmap scalePixmap(const QPixmap &pixmap, int width, int height)
+static TQPixmap scalePixmap(const TQPixmap &pixmap, int width, int height)
{
if (pixmap.width()>100)
{
KPixmapIO io;
- QImage img( io.convertToImage( pixmap ) );
+ TQImage img( io.convertToImage( pixmap ) );
return io.convertToPixmap( img.smoothScale( width, height ) );
}
- QImage img( pixmap.convertToImage().smoothScale( width, height ) );
- QPixmap pix;
+ TQImage img( pixmap.convertToImage().smoothScale( width, height ) );
+ TQPixmap pix;
pix.convertFromImage( img );
return pix;
@@ -335,26 +335,26 @@ void KMiniPagerButton::backgroundLoaded( bool loaded )
}
}
-void KMiniPagerButton::enterEvent(QEvent *)
+void KMiniPagerButton::enterEvent(TQEvent *)
{
m_inside = true;
update();
}
-void KMiniPagerButton::leaveEvent(QEvent *)
+void KMiniPagerButton::leaveEvent(TQEvent *)
{
m_inside = false;
update();
}
-void KMiniPagerButton::drawButton(QPainter *bp)
+void KMiniPagerButton::drawButton(TQPainter *bp)
{
int w = width();
int h = height();
bool on = isOn();
bool down = isDown();
- QBrush background;
+ TQBrush background;
bool liveBkgnd = m_pager->bgType() == PagerSettings::EnumBackgroundType::BgLive;
bool transparent = m_pager->bgType() == PagerSettings::EnumBackgroundType::BgTransparent;
@@ -363,7 +363,7 @@ void KMiniPagerButton::drawButton(QPainter *bp)
if (backgroundPixmap())
{
- QPoint pt = backgroundOffset();
+ TQPoint pt = backgroundOffset();
bp->drawTiledPixmap(0, 0, width(), height(), *backgroundPixmap(), pt.x(), pt.y());
}
else
@@ -418,11 +418,11 @@ void KMiniPagerButton::drawButton(QPainter *bp)
}
else
{
- QBrush background;
+ TQBrush background;
if (on)
{
- background = colorGroup().brush(QColorGroup::Midlight);
+ background = colorGroup().brush(TQColorGroup::Midlight);
}
else if (down)
{
@@ -431,7 +431,7 @@ void KMiniPagerButton::drawButton(QPainter *bp)
}
else
{
- background = colorGroup().brush(QColorGroup::Mid);
+ background = colorGroup().brush(TQColorGroup::Mid);
}
bp->fillRect(0, 0, w, h, background);
@@ -443,29 +443,29 @@ void KMiniPagerButton::drawButton(QPainter *bp)
{
KWinModule* kwin = m_pager->kwin();
KWin::WindowInfo *info = 0;
- int dw = QApplication::desktop()->width();
- int dh = QApplication::desktop()->height();
+ int dw = TQApplication::desktop()->width();
+ int dh = TQApplication::desktop()->height();
- QValueList<WId> windows = kwin->stackingOrder();
- QValueList<WId>::const_iterator itEnd = windows.constEnd();
- for (QValueList<WId>::ConstIterator it = windows.constBegin(); it != itEnd; ++it)
+ TQValueList<WId> windows = kwin->stackingOrder();
+ TQValueList<WId>::const_iterator itEnd = windows.constEnd();
+ for (TQValueList<WId>::ConstIterator it = windows.constBegin(); it != itEnd; ++it)
{
info = m_pager->info(*it);
if (shouldPaintWindow(info))
{
- QRect r = mapGeometryToViewport(*info);
- r = QRect(r.x() * width() / dw, 2 + r.y() * height() / dh,
+ TQRect r = mapGeometryToViewport(*info);
+ r = TQRect(r.x() * width() / dw, 2 + r.y() * height() / dh,
r.width() * width() / dw, r.height() * height() / dh);
if (kwin->activeWindow() == info->win())
{
- QBrush brush = colorGroup().brush(QColorGroup::Highlight);
+ TQBrush brush = colorGroup().brush(TQColorGroup::Highlight);
qDrawShadeRect(bp, r, colorGroup(), false, 1, 0, &brush);
}
else
{
- QBrush brush = colorGroup().brush(QColorGroup::Button);
+ TQBrush brush = colorGroup().brush(TQColorGroup::Button);
if (on)
{
@@ -478,7 +478,7 @@ void KMiniPagerButton::drawButton(QPainter *bp)
if (m_pager->windowIcons() && r.width() > 15 && r.height() > 15)
{
- QPixmap icon = KWin::icon(*it, 16, 16, true);
+ TQPixmap icon = KWin::icon(*it, 16, 16, true);
if (!icon.isNull())
{
bp->drawPixmap(r.left() + ((r.width() - 16) / 2),
@@ -508,23 +508,23 @@ void KMiniPagerButton::drawButton(QPainter *bp)
if (m_pager->labelType() != PagerSettings::EnumLabelType::LabelNone)
{
- QString label = (m_pager->labelType() == PagerSettings::EnumLabelType::LabelNumber) ?
- QString::number(m_desktop) : m_desktopName;
+ TQString label = (m_pager->labelType() == PagerSettings::EnumLabelType::LabelNumber) ?
+ TQString::number(m_desktop) : m_desktopName;
if (transparent || liveBkgnd)
{
bp->setPen(on ? colorGroup().midlight() : colorGroup().buttonText());
- m_pager->shadowEngine()->drawText(*bp, QRect(0, 0, w, h), AlignCenter, label, size());
+ m_pager->shadowEngine()->drawText(*bp, TQRect(0, 0, w, h), AlignCenter, label, size());
}
else
bp->drawText(0, 0, w, h, AlignCenter, label);
}
if (m_inside)
- KickerLib::drawBlendedRect(bp, QRect(1, 1, width() - 2, height() - 2), colorGroup().foreground());
+ KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), colorGroup().foreground());
}
-void KMiniPagerButton::mousePressEvent(QMouseEvent * e)
+void KMiniPagerButton::mousePressEvent(TQMouseEvent * e)
{
if (e->button() == RightButton)
{
@@ -541,29 +541,29 @@ void KMiniPagerButton::mousePressEvent(QMouseEvent * e)
m_pager->clickPos = e->pos();
}
- QButton::mousePressEvent(e);
+ TQButton::mousePressEvent(e);
}
-void KMiniPagerButton::mouseReleaseEvent(QMouseEvent* e)
+void KMiniPagerButton::mouseReleaseEvent(TQMouseEvent* e)
{
- m_pager->clickPos = QPoint();
- QButton::mouseReleaseEvent(e);
+ m_pager->clickPos = TQPoint();
+ TQButton::mouseReleaseEvent(e);
}
-void KMiniPagerButton::mouseMoveEvent(QMouseEvent* e)
+void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e)
{
if (!m_pager->desktopPreview())
{
return;
}
- int dw = QApplication::desktop()->width();
- int dh = QApplication::desktop()->height();
+ int dw = TQApplication::desktop()->width();
+ int dh = TQApplication::desktop()->height();
int w = width();
int h = height();
- QPoint pos(m_pager->clickPos.isNull() ? mapFromGlobal(QCursor::pos()) : m_pager->clickPos);
- QPoint p = mapPointToViewport(QPoint(pos.x() * dw / w, pos.y() * dh / h));
+ TQPoint pos(m_pager->clickPos.isNull() ? mapFromGlobal(TQCursor::pos()) : m_pager->clickPos);
+ TQPoint p = mapPointToViewport(TQPoint(pos.x() * dw / w, pos.y() * dh / h));
Task::Ptr wasWindow = m_currentWindow;
m_currentWindow = TaskManager::the()->findTask(m_useViewports ? 1 : m_desktop, p);
@@ -576,13 +576,13 @@ void KMiniPagerButton::mouseMoveEvent(QMouseEvent* e)
if (m_currentWindow && !m_pager->clickPos.isNull() &&
(m_pager->clickPos - e->pos()).manhattanLength() > KGlobalSettings::dndEventDelay())
{
- QRect r = m_currentWindow->geometry();
+ TQRect r = m_currentWindow->geometry();
// preview window height, window width
int ww = r.width() * w / dw;
int wh = r.height() * h / dh;
- QPixmap windowImage(ww, wh);
- QPainter bp(&windowImage, this);
+ TQPixmap windowImage(ww, wh);
+ TQPainter bp(&windowImage, this);
bp.setPen(colorGroup().foreground());
bp.drawRect(0, 0, ww, wh);
@@ -591,7 +591,7 @@ void KMiniPagerButton::mouseMoveEvent(QMouseEvent* e)
Task::List tasklist;
tasklist.append(m_currentWindow);
TaskDrag* drag = new TaskDrag(tasklist, this);
- QPoint offset(m_pager->clickPos.x() - (r.x() * w / dw),
+ TQPoint offset(m_pager->clickPos.x() - (r.x() * w / dw),
m_pager->clickPos.y() - (r.y() * h / dh));
drag->setPixmap(windowImage, offset);
drag->dragMove();
@@ -601,11 +601,11 @@ void KMiniPagerButton::mouseMoveEvent(QMouseEvent* e)
setDown(false);
}
- m_pager->clickPos = QPoint();
+ m_pager->clickPos = TQPoint();
}
}
-void KMiniPagerButton::dragEnterEvent(QDragEnterEvent* e)
+void KMiniPagerButton::dragEnterEvent(TQDragEnterEvent* e)
{
if (PanelDrag::canDecode(e))
{
@@ -623,11 +623,11 @@ void KMiniPagerButton::dragEnterEvent(QDragEnterEvent* e)
// if a dragitem is held for over a pager button for two seconds,
// activate corresponding desktop
m_dragSwitchTimer.start(1000, true);
- QButton::dragEnterEvent(e);
+ TQButton::dragEnterEvent(e);
}
}
-void KMiniPagerButton::dropEvent(QDropEvent* e)
+void KMiniPagerButton::dropEvent(TQDropEvent* e)
{
if (TaskDrag::canDecode(e))
{
@@ -637,12 +637,12 @@ void KMiniPagerButton::dropEvent(QDropEvent* e)
if ((m_useViewports || e->source() == this) && tasks.count() == 1)
{
Task::Ptr task = tasks[0];
- int dw = QApplication::desktop()->width();
- int dh = QApplication::desktop()->height();
+ int dw = TQApplication::desktop()->width();
+ int dh = TQApplication::desktop()->height();
int w = width();
int h = height();
- QRect location = mapGeometryToViewport(task->info());
- QPoint pos = mapPointToViewport(e->pos());
+ TQRect location = mapGeometryToViewport(task->info());
+ TQPoint pos = mapPointToViewport(e->pos());
int deltaX = pos.x() - m_pager->clickPos.x();
int deltaY = pos.y() - m_pager->clickPos.y();
@@ -685,7 +685,7 @@ void KMiniPagerButton::dropEvent(QDropEvent* e)
setDown(false);
}
- QButton::dropEvent( e );
+ TQButton::dropEvent( e );
}
void KMiniPagerButton::enabledChange( bool oldEnabled )
@@ -695,10 +695,10 @@ void KMiniPagerButton::enabledChange( bool oldEnabled )
m_pager->refresh();
}
- QButton::enabledChange(oldEnabled);
+ TQButton::enabledChange(oldEnabled);
}
-void KMiniPagerButton::dragLeaveEvent( QDragLeaveEvent* e )
+void KMiniPagerButton::dragLeaveEvent( TQDragLeaveEvent* e )
{
m_dragSwitchTimer.stop();
@@ -707,7 +707,7 @@ void KMiniPagerButton::dragLeaveEvent( QDragLeaveEvent* e )
setDown(false);
}
- QButton::dragLeaveEvent( e );
+ TQButton::dragLeaveEvent( e );
}
void KMiniPagerButton::slotDragSwitch()
@@ -723,8 +723,8 @@ void KMiniPagerButton::slotClicked()
void KMiniPagerButton::rename()
{
if ( !m_lineEdit ) {
- m_lineEdit = new QLineEdit( this );
- connect( m_lineEdit, SIGNAL( returnPressed() ), m_lineEdit, SLOT( hide() ) );
+ m_lineEdit = new TQLineEdit( this );
+ connect( m_lineEdit, TQT_SIGNAL( returnPressed() ), m_lineEdit, TQT_SLOT( hide() ) );
m_lineEdit->installEventFilter( this );
}
m_lineEdit->setGeometry( rect() );
@@ -743,19 +743,19 @@ void KMiniPagerButton::slotToggled( bool b )
}
}
-bool KMiniPagerButton::eventFilter( QObject *o, QEvent * e)
+bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e)
{
if (o && o == m_lineEdit &&
- (e->type() == QEvent::FocusOut || e->type() == QEvent::Hide))
+ (e->type() == TQEvent::FocusOut || e->type() == TQEvent::Hide))
{
m_pager->kwin()->setDesktopName( m_desktop, m_lineEdit->text() );
m_desktopName = m_lineEdit->text();
- QTimer::singleShot( 0, m_lineEdit, SLOT( deleteLater() ) );
+ TQTimer::singleShot( 0, m_lineEdit, TQT_SLOT( deleteLater() ) );
m_lineEdit = 0;
return true;
}
- return QButton::eventFilter(o, e);
+ return TQButton::eventFilter(o, e);
}
void KMiniPagerButton::updateKickerTip(KickerTip::Data &data)
@@ -764,7 +764,7 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data)
Task::Dict::iterator taskEnd = tasks.end();
uint taskCounter = 0;
uint taskLimiter = 4;
- QString lastWindow;
+ TQString lastWindow;
for (Task::Dict::iterator it = tasks.begin(); it != taskEnd; ++it)
{
@@ -777,8 +777,8 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data)
continue;
}
- QPixmap winIcon = it.data()->pixmap();
- QString bullet;
+ TQPixmap winIcon = it.data()->pixmap();
+ TQString bullet;
if (winIcon.isNull())
{
@@ -786,20 +786,20 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data)
}
else
{
- data.mimeFactory->setPixmap(QString::number(taskCounter), winIcon);
- bullet = QString("<img src=\"%1\" width=\"%2\" height=\"%3\">").arg(taskCounter).arg(16).arg(16);
+ data.mimeFactory->setPixmap(TQString::number(taskCounter), winIcon);
+ bullet = TQString("<img src=\"%1\" width=\"%2\" height=\"%3\">").arg(taskCounter).arg(16).arg(16);
}
- QString name = KStringHandler::cPixelSqueeze(it.data()->visibleName(), fontMetrics(), 400);
- name = QStyleSheet::escape(name);
+ TQString name = KStringHandler::cPixelSqueeze(it.data()->visibleName(), fontMetrics(), 400);
+ name = TQStyleSheet::escape(name);
if (it.data() == m_currentWindow)
{
- data.subtext.append(QString("<br>%1&nbsp; <u>").arg(bullet));
+ data.subtext.append(TQString("<br>%1&nbsp; <u>").arg(bullet));
data.subtext.append(name).append("</u>");
}
else
{
- data.subtext.append(QString("<br>%1&nbsp; ").arg(bullet));
+ data.subtext.append(TQString("<br>%1&nbsp; ").arg(bullet));
data.subtext.append(name);
}
}
@@ -828,7 +828,7 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data)
data.duration = 4000;
data.icon = DesktopIcon("window_list", KIcon::SizeMedium);
- data.message = QStyleSheet::escape(m_desktopName);
+ data.message = TQStyleSheet::escape(m_desktopName);
data.direction = m_pager->popupDirection();
}
diff --git a/kicker/applets/minipager/pagerbutton.h b/kicker/applets/minipager/pagerbutton.h
index 1547201e0..50baf68c9 100644
--- a/kicker/applets/minipager/pagerbutton.h
+++ b/kicker/applets/minipager/pagerbutton.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __MINIPAGERBUTTON_H
#define __MINIPAGERBUTTON_H
-#include <qbutton.h>
+#include <tqbutton.h>
#include "taskmanager.h"
#include "kickertip.h"
@@ -35,18 +35,18 @@ class KMiniPager;
class KSharedPixmap;
class QLineEdit;
-class KMiniPagerButton : public QButton, public KickerTip::Client
+class KMiniPagerButton : public TQButton, public KickerTip::Client
{
Q_OBJECT
public:
- KMiniPagerButton(int desk, bool useViewports, const QPoint& viewport,
+ KMiniPagerButton(int desk, bool useViewports, const TQPoint& viewport,
KMiniPager *parent=0, const char *name=0);
~KMiniPagerButton();
int desktop() { return m_desktop; }
- QString desktopName() { return m_desktopName; }
- void setDesktopName( QString name ) { m_desktopName = name; }
+ TQString desktopName() { return m_desktopName; }
+ void setDesktopName( TQString name ) { m_desktopName = name; }
void rename();
void backgroundChanged();
@@ -56,22 +56,22 @@ public:
signals:
void buttonSelected( int desk );
- void showMenu( const QPoint&, int );
+ void showMenu( const TQPoint&, int );
protected:
- void drawButton(QPainter *);
- void enterEvent(QEvent*);
- void leaveEvent(QEvent*);
- void resizeEvent(QResizeEvent *ev);
- void mousePressEvent(QMouseEvent *);
- void mouseReleaseEvent(QMouseEvent *);
- void mouseMoveEvent(QMouseEvent *);
- void dragEnterEvent(QDragEnterEvent* e);
- void dragLeaveEvent(QDragLeaveEvent* e);
+ void drawButton(TQPainter *);
+ void enterEvent(TQEvent*);
+ void leaveEvent(TQEvent*);
+ void resizeEvent(TQResizeEvent *ev);
+ void mousePressEvent(TQMouseEvent *);
+ void mouseReleaseEvent(TQMouseEvent *);
+ void mouseMoveEvent(TQMouseEvent *);
+ void dragEnterEvent(TQDragEnterEvent* e);
+ void dragLeaveEvent(TQDragLeaveEvent* e);
void enabledChange( bool oldEnabled );
- void dropEvent(QDropEvent* e);
+ void dropEvent(TQDropEvent* e);
- bool eventFilter(QObject*, QEvent*);
+ bool eventFilter(TQObject*, TQEvent*);
void updateKickerTip(KickerTip::Data &data);
private slots:
@@ -83,20 +83,20 @@ private slots:
private:
void loadBgPixmap();
- QRect mapGeometryToViewport(const KWin::WindowInfo&) const;
- QPoint mapPointToViewport(const QPoint&) const;
+ TQRect mapGeometryToViewport(const KWin::WindowInfo&) const;
+ TQPoint mapPointToViewport(const TQPoint&) const;
KMiniPager* m_pager;
int m_desktop;
bool m_useViewports;
- QString m_desktopName;
- QPoint m_viewport;
+ TQString m_desktopName;
+ TQPoint m_viewport;
- QTimer m_updateCompressor;
- QTimer m_dragSwitchTimer;
+ TQTimer m_updateCompressor;
+ TQTimer m_dragSwitchTimer;
Task::Ptr m_dragging;
- QLineEdit* m_lineEdit;
+ TQLineEdit* m_lineEdit;
KSharedPixmap *m_sharedPixmap;
KPixmap *m_bgPixmap;
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index c256aa36f..44f2229ec 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -22,9 +22,9 @@
#include "NaughtyProcessMonitor.h"
#include "NaughtyConfigDialog.h"
-#include <qmessagebox.h>
-#include <qtoolbutton.h>
-#include <qlayout.h>
+#include <tqmessagebox.h>
+#include <tqtoolbutton.h>
+#include <tqlayout.h>
#include <kiconloader.h>
#include <kglobal.h>
@@ -34,11 +34,11 @@
#include <klocale.h>
#include <kpopupmenu.h>
#include <kmessagebox.h>
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
extern "C"
{
- KDE_EXPORT KPanelApplet* init(QWidget * parent, const QString & configFile)
+ KDE_EXPORT KPanelApplet* init(TQWidget * parent, const TQString & configFile)
{
KGlobal::locale()->insertCatalogue("naughtyapplet");
@@ -55,10 +55,10 @@ extern "C"
NaughtyApplet::NaughtyApplet
(
- const QString & configFile,
+ const TQString & configFile,
Type t,
int actions,
- QWidget * parent,
+ TQWidget * parent,
const char * name
)
: KPanelApplet(configFile, t, actions, parent, name)
@@ -69,27 +69,27 @@ NaughtyApplet::NaughtyApplet
button_ = new SimpleButton(this);
button_->setFixedSize(20, 20);
- QVBoxLayout * layout = new QVBoxLayout(this);
+ TQVBoxLayout * layout = new TQVBoxLayout(this);
layout->addWidget(button_);
monitor_ = new NaughtyProcessMonitor(2, 20, this);
connect
(
- button_, SIGNAL(clicked()),
- this, SLOT(slotPreferences())
+ button_, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(slotPreferences())
);
connect
(
- monitor_, SIGNAL(runawayProcess(ulong, const QString &)),
- this, SLOT(slotWarn(ulong, const QString &))
+ monitor_, TQT_SIGNAL(runawayProcess(ulong, const TQString &)),
+ this, TQT_SLOT(slotWarn(ulong, const TQString &))
);
connect
(
- monitor_, SIGNAL(load(uint)),
- this, SLOT(slotLoad(uint))
+ monitor_, TQT_SIGNAL(load(uint)),
+ this, TQT_SLOT(slotLoad(uint))
);
loadSettings();
@@ -103,17 +103,17 @@ NaughtyApplet::~NaughtyApplet()
}
void
-NaughtyApplet::slotWarn(ulong pid, const QString & name)
+NaughtyApplet::slotWarn(ulong pid, const TQString & name)
{
if (ignoreList_.contains(name))
return;
- QString s = i18n("A program called '%1' is slowing down the others "
+ TQString s = i18n("A program called '%1' is slowing down the others "
"on your machine. It may have a bug that is causing "
"this, or it may just be busy.\n"
"Would you like to try to stop the program?");
- int retval = KMessageBox::warningYesNo(this, s.arg(name), QString::null, i18n("Stop"), i18n("Keep Running"));
+ int retval = KMessageBox::warningYesNo(this, s.arg(name), TQString::null, i18n("Stop"), i18n("Keep Running"));
if (KMessageBox::Yes == retval)
monitor_->kill(pid);
@@ -121,7 +121,7 @@ NaughtyApplet::slotWarn(ulong pid, const QString & name)
{
s = i18n("In future, should busy programs called '%1' be ignored?");
- retval = KMessageBox::questionYesNo(this, s.arg(name), QString::null, i18n("Ignore"), i18n("Do Not Ignore"));
+ retval = KMessageBox::questionYesNo(this, s.arg(name), TQString::null, i18n("Ignore"), i18n("Do Not Ignore"));
if (KMessageBox::Yes == retval)
{
@@ -187,9 +187,9 @@ NaughtyApplet::preferences()
this
);
- QDialog::DialogCode retval = QDialog::DialogCode(d.exec());
+ TQDialog::DialogCode retval = TQDialog::DialogCode(d.exec());
- if (QDialog::Accepted == retval)
+ if (TQDialog::Accepted == retval)
{
ignoreList_ = d.ignoreList();
monitor_->setInterval(d.updateInterval());
diff --git a/kicker/applets/naughty/NaughtyApplet.h b/kicker/applets/naughty/NaughtyApplet.h
index 00df51ec4..b9da7b3f9 100644
--- a/kicker/applets/naughty/NaughtyApplet.h
+++ b/kicker/applets/naughty/NaughtyApplet.h
@@ -22,7 +22,7 @@
#define NAUGHTY_H
#include <kpanelapplet.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include "simplebutton.h"
@@ -37,10 +37,10 @@ class NaughtyApplet : public KPanelApplet
NaughtyApplet
(
- const QString & configFile,
+ const TQString & configFile,
Type t = Normal,
int actions = 0,
- QWidget * parent = 0,
+ TQWidget * parent = 0,
const char * name = 0
);
@@ -55,7 +55,7 @@ class NaughtyApplet : public KPanelApplet
protected slots:
- void slotWarn(ulong pid, const QString & name);
+ void slotWarn(ulong pid, const TQString & name);
void slotLoad(uint);
void slotPreferences();
@@ -70,7 +70,7 @@ class NaughtyApplet : public KPanelApplet
NaughtyProcessMonitor * monitor_;
SimpleButton * button_;
- QStringList ignoreList_;
+ TQStringList ignoreList_;
};
#endif
diff --git a/kicker/applets/naughty/NaughtyConfigDialog.cpp b/kicker/applets/naughty/NaughtyConfigDialog.cpp
index e03a955cc..57146778d 100644
--- a/kicker/applets/naughty/NaughtyConfigDialog.cpp
+++ b/kicker/applets/naughty/NaughtyConfigDialog.cpp
@@ -21,17 +21,17 @@
#include <keditlistbox.h>
#include <knuminput.h>
#include <klocale.h>
-#include <qvbox.h>
+#include <tqvbox.h>
#include "NaughtyConfigDialog.h"
#include "NaughtyConfigDialog.moc"
NaughtyConfigDialog::NaughtyConfigDialog
(
- const QStringList & items,
+ const TQStringList & items,
uint updateInterval,
uint threshold,
- QWidget * parent,
+ TQWidget * parent,
const char * name
)
:
@@ -46,7 +46,7 @@ NaughtyConfigDialog::NaughtyConfigDialog
true
)
{
- QVBox * v = new QVBox(this);
+ TQVBox * v = new TQVBox(this);
setMainWidget(v);
kini_updateInterval_ = new KIntNumInput(updateInterval, v);
@@ -88,7 +88,7 @@ NaughtyConfigDialog::threshold() const
QStringList
NaughtyConfigDialog::ignoreList() const
{
- QStringList retval;
+ TQStringList retval;
for (int i = 0; i < listBox_->count(); i++)
retval << listBox_->text(i);
diff --git a/kicker/applets/naughty/NaughtyConfigDialog.h b/kicker/applets/naughty/NaughtyConfigDialog.h
index 485cbf14f..2f5ca311f 100644
--- a/kicker/applets/naughty/NaughtyConfigDialog.h
+++ b/kicker/applets/naughty/NaughtyConfigDialog.h
@@ -34,16 +34,16 @@ class NaughtyConfigDialog : public KDialogBase
NaughtyConfigDialog
(
- const QStringList & items,
+ const TQStringList & items,
uint interval,
uint threshold,
- QWidget * parent = 0,
+ TQWidget * parent = 0,
const char * name = 0
);
~NaughtyConfigDialog();
- QStringList ignoreList() const;
+ TQStringList ignoreList() const;
uint updateInterval() const;
uint threshold() const;
diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
index f9d352902..37cba7a37 100644
--- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp
+++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
@@ -33,14 +33,14 @@
#include <signal.h>
#include <unistd.h>
-#include <qfile.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qtextstream.h>
-#include <qdir.h>
-#include <qtimer.h>
-#include <qmap.h>
-#include <qdatetime.h>
+#include <tqfile.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqtextstream.h>
+#include <tqdir.h>
+#include <tqtimer.h>
+#include <tqmap.h>
+#include <tqdatetime.h>
#include <klocale.h>
@@ -64,12 +64,12 @@ class NaughtyProcessMonitorPrivate
}
uint interval_;
- QTimer * timer_;
- QMap<ulong, uint> loadMap_;
- QMap<ulong, uint> scoreMap_;
+ TQTimer * timer_;
+ TQMap<ulong, uint> loadMap_;
+ TQMap<ulong, uint> scoreMap_;
#ifdef __OpenBSD__
- QMap<ulong, uint> cacheLoadMap_;
- QMap<ulong, uid_t> uidMap_;
+ TQMap<ulong, uint> cacheLoadMap_;
+ TQMap<ulong, uid_t> uidMap_;
#endif
uint oldLoad_;
uint triggerLevel_;
@@ -86,16 +86,16 @@ NaughtyProcessMonitor::NaughtyProcessMonitor
(
uint interval,
uint triggerLevel,
- QObject * parent,
+ TQObject * parent,
const char * name
)
- : QObject(parent, name)
+ : TQObject(parent, name)
{
d = new NaughtyProcessMonitorPrivate;
d->interval_ = interval * 1000;
d->triggerLevel_ = triggerLevel;
- d->timer_ = new QTimer(this);
- connect(d->timer_, SIGNAL(timeout()), this, SLOT(slotTimeout()));
+ d->timer_ = new TQTimer(this);
+ connect(d->timer_, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
}
NaughtyProcessMonitor::~NaughtyProcessMonitor()
@@ -151,9 +151,9 @@ NaughtyProcessMonitor::slotTimeout()
if (cpu > d->triggerLevel_ * (d->interval_ / 1000))
{
uint load;
- QValueList<ulong> l(pidList());
+ TQValueList<ulong> l(pidList());
- for (QValueList<ulong>::ConstIterator it(l.begin()); it != l.end(); ++it)
+ for (TQValueList<ulong>::ConstIterator it(l.begin()); it != l.end(); ++it)
if (getLoad(*it, load))
_process(*it, load);
}
@@ -196,19 +196,19 @@ NaughtyProcessMonitor::_process(ulong pid, uint load)
NaughtyProcessMonitor::canKill(ulong pid) const
{
#ifdef __linux__
- QFile f("/proc/" + QString::number(pid) + "/status");
+ TQFile f("/proc/" + TQString::number(pid) + "/status");
if (!f.open(IO_ReadOnly))
return false;
- QTextStream t(&f);
+ TQTextStream t(&f);
- QString s;
+ TQString s;
while (!t.atEnd() && s.left(4) != "Uid:")
s = t.readLine();
- QStringList l(QStringList::split('\t', s));
+ TQStringList l(TQStringList::split('\t', s));
uint a(l[1].toUInt());
@@ -236,12 +236,12 @@ NaughtyProcessMonitor::processName(ulong pid) const
{
#if defined(__linux__) || defined(__OpenBSD__)
#ifdef __linux__
- QFile f("/proc/" + QString::number(pid) + "/cmdline");
+ TQFile f("/proc/" + TQString::number(pid) + "/cmdline");
if (!f.open(IO_ReadOnly))
return i18n("Unknown");
- QCString s;
+ TQCString s;
while (true)
{
@@ -255,7 +255,7 @@ NaughtyProcessMonitor::processName(ulong pid) const
}
// Now strip 'kdeinit:' prefix.
- QString unicode(QString::fromLocal8Bit(s));
+ TQString unicode(TQString::fromLocal8Bit(s));
#elif defined(__OpenBSD__)
int mib[4] ;
@@ -280,14 +280,14 @@ NaughtyProcessMonitor::processName(ulong pid) const
}
// Now strip 'kdeinit:' prefix.
- QString unicode(QString::fromLocal8Bit(argv[0]));
+ TQString unicode(TQString::fromLocal8Bit(argv[0]));
free (argv) ;
#endif
- QStringList parts(QStringList::split(' ', unicode));
+ TQStringList parts(TQStringList::split(' ', unicode));
- QString processName = parts[0] == "kdeinit:" ? parts[1] : parts[0];
+ TQString processName = parts[0] == "kdeinit:" ? parts[1] : parts[0];
int lastSlash = processName.findRev('/');
@@ -299,7 +299,7 @@ NaughtyProcessMonitor::processName(ulong pid) const
#else
Q_UNUSED( pid );
- return QString::null;
+ return TQString::null;
#endif
}
@@ -307,18 +307,18 @@ NaughtyProcessMonitor::processName(ulong pid) const
NaughtyProcessMonitor::cpuLoad() const
{
#ifdef __linux__
- QFile f("/proc/stat");
+ TQFile f("/proc/stat");
if (!f.open(IO_ReadOnly))
return 0;
bool forgetThisOne = 0 == d->oldLoad_;
- QTextStream t(&f);
+ TQTextStream t(&f);
- QString s = t.readLine();
+ TQString s = t.readLine();
- QStringList l(QStringList::split(' ', s));
+ TQStringList l(TQStringList::split(' ', s));
uint user = l[1].toUInt();
uint sys = l[3].toUInt();
@@ -355,15 +355,15 @@ NaughtyProcessMonitor::cpuLoad() const
#endif
}
- QValueList<ulong>
+ TQValueList<ulong>
NaughtyProcessMonitor::pidList() const
{
#ifdef __linux__
- QStringList dl(QDir("/proc").entryList());
+ TQStringList dl(TQDir("/proc").entryList());
- QValueList<ulong> pl;
+ TQValueList<ulong> pl;
- for (QStringList::ConstIterator it(dl.begin()); it != dl.end(); ++it)
+ for (TQStringList::ConstIterator it(dl.begin()); it != dl.end(); ++it)
if (((*it)[0].isDigit()))
pl << (*it).toUInt();
@@ -374,7 +374,7 @@ NaughtyProcessMonitor::pidList() const
size_t size ;
struct kinfo_proc *kp ;
int i ;
- QValueList<ulong> l;
+ TQValueList<ulong> l;
// fetch number of processes
@@ -421,7 +421,7 @@ NaughtyProcessMonitor::pidList() const
return l ;
#else
- QValueList<ulong> l;
+ TQValueList<ulong> l;
return l;
#endif
}
@@ -430,16 +430,16 @@ NaughtyProcessMonitor::pidList() const
NaughtyProcessMonitor::getLoad(ulong pid, uint & load) const
{
#ifdef __linux__
- QFile f("/proc/" + QString::number(pid) + "/stat");
+ TQFile f("/proc/" + TQString::number(pid) + "/stat");
if (!f.open(IO_ReadOnly))
return false;
- QTextStream t(&f);
+ TQTextStream t(&f);
- QString line(t.readLine());
+ TQString line(t.readLine());
- QStringList fields(QStringList::split(' ', line));
+ TQStringList fields(TQStringList::split(' ', line));
uint userTime (fields[13].toUInt());
uint sysTime (fields[14].toUInt());
diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.h b/kicker/applets/naughty/NaughtyProcessMonitor.h
index d7023dbd7..cc5c91cfc 100644
--- a/kicker/applets/naughty/NaughtyProcessMonitor.h
+++ b/kicker/applets/naughty/NaughtyProcessMonitor.h
@@ -21,7 +21,7 @@
#ifndef NAUGHTY_PROCESS_MONITOR_H
#define NAUGHTY_PROCESS_MONITOR_H
-#include <qobject.h>
+#include <tqobject.h>
class NaughtyProcessMonitorPrivate;
@@ -35,7 +35,7 @@ class NaughtyProcessMonitor : public QObject
(
uint interval,
uint triggerLevel,
- QObject * parent = 0,
+ TQObject * parent = 0,
const char * name = 0
);
@@ -50,9 +50,9 @@ class NaughtyProcessMonitor : public QObject
void setInterval(uint);
virtual uint cpuLoad() const;
- virtual QValueList<ulong> pidList() const;
+ virtual TQValueList<ulong> pidList() const;
virtual bool getLoad(ulong pid, uint & load) const;
- virtual QString processName(ulong pid) const;
+ virtual TQString processName(ulong pid) const;
virtual bool canKill(ulong pid) const;
virtual bool kill(ulong pid) const;
@@ -63,7 +63,7 @@ class NaughtyProcessMonitor : public QObject
signals:
void load(uint);
- void runawayProcess(ulong pid, const QString & name);
+ void runawayProcess(ulong pid, const TQString & name);
private:
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index 93bb5d7ad..94f30f33a 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -21,11 +21,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qlabel.h>
-#include <qfont.h>
-#include <qstringlist.h>
-#include <qpushbutton.h>
-#include <qhbox.h>
+#include <tqlabel.h>
+#include <tqfont.h>
+#include <tqstringlist.h>
+#include <tqpushbutton.h>
+#include <tqhbox.h>
#include <kapplication.h>
#include <kglobal.h>
@@ -42,22 +42,22 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extern "C"
{
- KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile)
+ KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("krunapplet");
return new RunApplet(configFile, KPanelApplet::Stretch, 0, parent, "krunapplet");
}
}
-RunApplet::RunApplet(const QString& configFile, Type type, int actions,
- QWidget *parent, const char *name)
+RunApplet::RunApplet(const TQString& configFile, Type type, int actions,
+ TQWidget *parent, const char *name)
: KPanelApplet(configFile, type, actions, parent, name)
{
// setBackgroundMode(X11ParentRelative);
setBackgroundOrigin( AncestorOrigin );
// setup label
- _label = new QLabel(i18n("Run command:"), this);
- QFont f(_label->font());
+ _label = new TQLabel(i18n("Run command:"), this);
+ TQFont f(_label->font());
f.setPixelSize(12);
// _label->setBackgroundMode(X11ParentRelative);
_label->setBackgroundOrigin( AncestorOrigin );
@@ -65,25 +65,25 @@ RunApplet::RunApplet(const QString& configFile, Type type, int actions,
_label->setFont(f);
// setup popup button
- _btn = new QPushButton(this);
+ _btn = new TQPushButton(this);
f = _btn->font();
f.setPixelSize(12);
_btn->setFont(f);
- connect(_btn, SIGNAL(clicked()), SLOT(popup_combo()));
+ connect(_btn, TQT_SIGNAL(clicked()), TQT_SLOT(popup_combo()));
// setup history combo
_input = new KHistoryCombo(this);
_input->setFocus();
_input->clearEdit();
watchForFocus(_input->lineEdit());
- connect(_input, SIGNAL(activated(const QString&)),
- SLOT(run_command(const QString&)));
+ connect(_input, TQT_SIGNAL(activated(const TQString&)),
+ TQT_SLOT(run_command(const TQString&)));
KConfig *c = config();
c->setGroup("General");
// restore history and completion list
- QStringList list = c->readListEntry("Completion list");
+ TQStringList list = c->readListEntry("Completion list");
_input->completionObject()->setItems(list);
list = c->readListEntry("History list");
_input->setHistoryItems(list);
@@ -92,7 +92,7 @@ RunApplet::RunApplet(const QString& configFile, Type type, int actions,
_filterData = new KURIFilterData();
- _hbox = new QHBox( 0, 0, WStyle_Customize | WType_Popup );
+ _hbox = new TQHBox( 0, 0, WStyle_Customize | WType_Popup );
_hbox->setFixedSize(120, 22);
}
@@ -102,7 +102,7 @@ RunApplet::~RunApplet()
c->setGroup("General");
// save history and completion list
- QStringList list = _input->completionObject()->items();
+ TQStringList list = _input->completionObject()->items();
c->writeEntry("Completion list", list);
list = _input->historyItems();
c->writeEntry("History list", list);
@@ -113,12 +113,12 @@ RunApplet::~RunApplet()
KGlobal::locale()->removeCatalogue("krunapplet");
}
-void RunApplet::resizeEvent(QResizeEvent*)
+void RunApplet::resizeEvent(TQResizeEvent*)
{
if(orientation() == Horizontal)
{
_btn->hide();
- _input->reparent(this, QPoint(0,0), true);
+ _input->reparent(this, TQPoint(0,0), true);
_label->setGeometry(0,0, width(), _label->height());
if(height() >= _input->sizeHint().height() + _label->height())
@@ -149,7 +149,7 @@ void RunApplet::resizeEvent(QResizeEvent*)
{
_btn->show();
_btn->setFixedSize(width(), 22);
- _input->reparent( _hbox, QPoint(0, 0), false);
+ _input->reparent( _hbox, TQPoint(0, 0), false);
_label->hide();
}
setButtonText();
@@ -162,7 +162,7 @@ void RunApplet::positionChange(KPanelApplet::Position)
void RunApplet::setButtonText()
{
- QString t;
+ TQString t;
if (position() == pRight)
{
@@ -194,32 +194,32 @@ int RunApplet::heightForWidth(int ) const
void RunApplet::popup_combo()
{
- QPoint p;
+ TQPoint p;
if (position() == pRight)
- p = mapToGlobal(QPoint(-_input->width()-1, 0));
+ p = mapToGlobal(TQPoint(-_input->width()-1, 0));
else
- p = mapToGlobal(QPoint(width()+1, 0));
+ p = mapToGlobal(TQPoint(width()+1, 0));
_hbox->move(p);
_hbox->show();
_input->setFocus();
}
-void RunApplet::run_command(const QString& command)
+void RunApplet::run_command(const TQString& command)
{
- QString exec;
+ TQString exec;
bool focusNeeded = false;
kapp->propagateSessionManager();
_filterData->setData( _input->currentText().stripWhiteSpace() );
- QStringList filters;
+ TQStringList filters;
filters << "kurisearchfilter" << "kshorturifilter";
KURIFilter::self()->filterURI( *(_filterData), filters );
_input->addToHistory(command);
_input->clearEdit();
- QString cmd = (_filterData->uri().isLocalFile() ? _filterData->uri().path():_filterData->uri().url());
+ TQString cmd = (_filterData->uri().isLocalFile() ? _filterData->uri().path():_filterData->uri().url());
// Nothing interesting. Quit!
if ( cmd.isEmpty() ){
diff --git a/kicker/applets/run/runapplet.h b/kicker/applets/run/runapplet.h
index ded8fc398..520d6e00b 100644
--- a/kicker/applets/run/runapplet.h
+++ b/kicker/applets/run/runapplet.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __runapplet_h__
#define __runapplet_h__
-#include <qstring.h>
+#include <tqstring.h>
#include <kpanelapplet.h>
class QLabel;
@@ -38,28 +38,28 @@ class RunApplet : public KPanelApplet
Q_OBJECT
public:
- RunApplet(const QString& configFile, Type t = Stretch, int actions = 0,
- QWidget *parent = 0, const char *name = 0);
+ RunApplet(const TQString& configFile, Type t = Stretch, int actions = 0,
+ TQWidget *parent = 0, const char *name = 0);
virtual ~RunApplet();
int widthForHeight(int height) const;
int heightForWidth(int width) const;
protected:
- void resizeEvent(QResizeEvent*);
+ void resizeEvent(TQResizeEvent*);
void positionChange(KPanelApplet::Position);
protected slots:
- void run_command(const QString&);
+ void run_command(const TQString&);
void popup_combo();
void setButtonText();
private:
KHistoryCombo *_input;
KURIFilterData *_filterData;
- QLabel *_label;
- QPushButton *_btn;
- QHBox *_hbox;
+ TQLabel *_label;
+ TQPushButton *_btn;
+ TQHBox *_hbox;
};
#endif
diff --git a/kicker/applets/swallow/prefwidget.cpp b/kicker/applets/swallow/prefwidget.cpp
index 2e443a6b2..0afdd90b8 100644
--- a/kicker/applets/swallow/prefwidget.cpp
+++ b/kicker/applets/swallow/prefwidget.cpp
@@ -19,7 +19,7 @@
#include "prefwidget.h"
-PreferencesWidget::PreferencesWidget( SwallowCommandList *swc, QWidget *parent )
+PreferencesWidget::PreferencesWidget( SwallowCommandList *swc, TQWidget *parent )
: PreferencesWidgetBase(parent)
{
diff --git a/kicker/applets/swallow/prefwidget.h b/kicker/applets/swallow/prefwidget.h
index 76ecce35e..a23d6414b 100644
--- a/kicker/applets/swallow/prefwidget.h
+++ b/kicker/applets/swallow/prefwidget.h
@@ -26,7 +26,7 @@ class PreferencesWidget : public PreferencesWidgetBase
Q_OBJECT
public:
- PreferencesWidget( SwallowCommandList* swc, QWidget* parent = 0 );
+ PreferencesWidget( SwallowCommandList* swc, TQWidget* parent = 0 );
// ~PreferencesWidget();
};
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index b1224986b..7112c706a 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -20,8 +20,8 @@
#include <stdlib.h>
-#include <qlayout.h>
-#include <qstringlist.h>
+#include <tqlayout.h>
+#include <tqstringlist.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
@@ -40,9 +40,9 @@
#include "swallow.h"
#include "prefwidget.h"
-template class QPtrList<SwallowApp>;
-typedef QPtrListIterator<SwallowApp> SwallowAppListIterator;
-template class QPtrList<SwallowCommand>;
+template class TQPtrList<SwallowApp>;
+typedef TQPtrListIterator<SwallowApp> SwallowAppListIterator;
+template class TQPtrList<SwallowCommand>;
// init static variables
@@ -53,14 +53,14 @@ SwallowApplet * SwallowApplet::self = 0L;
extern "C"
{
- KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile) {
+ KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) {
return new SwallowApplet(configFile, parent, "kswallow applet");
}
}
-SwallowApplet::SwallowApplet( const QString& configFile,
- QWidget *parent, const char *name )
+SwallowApplet::SwallowApplet( const TQString& configFile,
+ TQWidget *parent, const char *name )
: KPanelApplet( configFile, Normal, Preferences, parent, name )
{
resize( 30, 30 );
@@ -74,9 +74,9 @@ SwallowApplet::SwallowApplet( const QString& configFile,
appList = new SwallowAppList;
appList->setAutoDelete( true );
- QBoxLayout::Direction d = (orientation() == Horizontal) ?
- QBoxLayout::LeftToRight : QBoxLayout::TopToBottom;
- m_layout = new QBoxLayout( this, d, 0, 2 ); // make stretch configurable?
+ TQBoxLayout::Direction d = (orientation() == Horizontal) ?
+ TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom;
+ m_layout = new TQBoxLayout( this, d, 0, 2 ); // make stretch configurable?
m_layout->setAutoAdd( false );
// read the config file and start all the configured apps
@@ -116,8 +116,8 @@ SwallowCommandList* SwallowApplet::readConfig()
kc->setGroup("General");
int count = kc->readNumEntry("Number of apps");
kdDebug() << "*** Registered " << count << " App(s) to be swallow'ed!" << endl;
- QString group = "SwallowApp %1";
- QString title, cmd;
+ TQString group = "SwallowApp %1";
+ TQString title, cmd;
ushort errors = 0;
SwallowCommand *swc = 0L;
@@ -140,7 +140,7 @@ SwallowCommandList* SwallowApplet::readConfig()
}
if ( errors > 0 ) {
- QString entry = (errors == 1) ? i18n("entry") : i18n("entries");
+ TQString entry = (errors == 1) ? i18n("entry") : i18n("entries");
if ( KMessageBox::questionYesNo(0L, i18n("I found %1 invalid/incomplete %2\nin the configuration file.\n\nBoth the window title and the commandline\n of the to be swallowed application\nare required.\n\n.Do you want to correct this?").arg(errors).arg(entry), i18n("Configuration Error"),i18n("Correct"),i18n("Ignore Error")) == KMessageBox::Yes)
preferences();
}
@@ -157,8 +157,8 @@ void SwallowApplet::createApps( SwallowCommandList* list )
while ( (it.current()) ) {
app = new SwallowApp( it.current(), this );
app->hide();
- connect( app, SIGNAL( embedded(SwallowApp *)),
- SLOT( embedded(SwallowApp *)));
+ connect( app, TQT_SIGNAL( embedded(SwallowApp *)),
+ TQT_SLOT( embedded(SwallowApp *)));
appList->append( app );
++it;
kapp->processEvents();
@@ -179,8 +179,8 @@ void SwallowApplet::embedded( SwallowApp *app )
kdDebug() << "--> ratio: " << app->sizeRatio() << endl;
kdDebug() << "**** " << app << " is embedded now, with (" << app->width() << ", " << app->height() << ")" << endl;
- disconnect( app, SIGNAL( embedded(SwallowApp *)),
- this, SLOT( embedded(SwallowApp *)));
+ disconnect( app, TQT_SIGNAL( embedded(SwallowApp *)),
+ this, TQT_SLOT( embedded(SwallowApp *)));
embeddedList->append( app );
@@ -236,9 +236,9 @@ int SwallowApplet::heightForWidth(int)
void SwallowApplet::layoutApps()
{
if ( KPanelApplet::orientation() == Horizontal )
- m_layout->setDirection( QBoxLayout::LeftToRight );
+ m_layout->setDirection( TQBoxLayout::LeftToRight );
else
- m_layout->setDirection( QBoxLayout::TopToBottom );
+ m_layout->setDirection( TQBoxLayout::TopToBottom );
}
@@ -255,7 +255,7 @@ void SwallowApplet::removeApplet( SwallowApp *app )
///////////////////////////////////////////////////////////////////
-static void parseCommand(KProcess *proc, QString cmd)
+static void parseCommand(KProcess *proc, TQString cmd)
{
int pos;
@@ -269,7 +269,7 @@ static void parseCommand(KProcess *proc, QString cmd)
}
-SwallowApp::SwallowApp(const SwallowCommand *swc, QWidget* parent,
+SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent,
const char* /* name */)
: QXEmbed( parent )
{
@@ -278,8 +278,8 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, QWidget* parent,
QXEmbed::initialize();
winTitle = swc->title;
- connect(SwallowApplet::winModule(), SIGNAL(windowAdded(WId)),
- this, SLOT(windowAdded(WId)));
+ connect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)),
+ this, TQT_SLOT(windowAdded(WId)));
if (!swc->cmdline.isEmpty()) {
KProcess *process = new KProcess;
@@ -287,10 +287,10 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, QWidget* parent,
// move window out of sight
// *process << "-geometry";
- // *process << QString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height());
+ // *process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height());
- connect(process, SIGNAL(processExited(KProcess*)),
- this, SLOT(processExited(KProcess*)));
+ connect(process, TQT_SIGNAL(processExited(KProcess*)),
+ this, TQT_SLOT(processExited(KProcess*)));
process->start();
}
@@ -320,7 +320,7 @@ void SwallowApp::windowAdded(WId win)
if (winTitle == names[0]) {
kdDebug()<< "embedding window with title: "<<winTitle.latin1() << endl;
- QRect r = KWin::windowInfo(win).geometry();
+ TQRect r = KWin::windowInfo(win).geometry();
int h = r.height();
if ( h == 0 ) h = 1;
wh_ratio = (float) r.width() / (float) h;
@@ -330,8 +330,8 @@ void SwallowApp::windowAdded(WId win)
embed(win);
XReparentWindow(qt_xdisplay(), win, winId(), 0, 0);
- disconnect(SwallowApplet::winModule(), SIGNAL(windowAdded(WId)),
- this, SLOT(windowAdded(WId)));
+ disconnect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)),
+ this, TQT_SLOT(windowAdded(WId)));
emit embedded( this );
}
diff --git a/kicker/applets/swallow/swallow.h b/kicker/applets/swallow/swallow.h
index 8e472f415..7488e913b 100644
--- a/kicker/applets/swallow/swallow.h
+++ b/kicker/applets/swallow/swallow.h
@@ -20,8 +20,8 @@
#define __swallow_h__
-#include <qevent.h>
-#include <qptrlist.h>
+#include <tqevent.h>
+#include <tqptrlist.h>
#include <qxembed.h>
#include <kpanelapplet.h>
@@ -34,20 +34,20 @@ class KWinModule;
class SwallowApp;
typedef struct _SwallowCommand {
- QString cmdline;
- QString title;
+ TQString cmdline;
+ TQString title;
} SwallowCommand;
-typedef QPtrList<SwallowCommand> SwallowCommandList;
-typedef QPtrListIterator<SwallowCommand> SwallowCommandListIterator;
-typedef QPtrList<SwallowApp> SwallowAppList;
+typedef TQPtrList<SwallowCommand> SwallowCommandList;
+typedef TQPtrListIterator<SwallowCommand> SwallowCommandListIterator;
+typedef TQPtrList<SwallowApp> SwallowAppList;
class SwallowApplet : public KPanelApplet
{
Q_OBJECT
public:
- SwallowApplet( const QString& configFile, QWidget *parent,
+ SwallowApplet( const TQString& configFile, TQWidget *parent,
const char *name = 0L );
~SwallowApplet();
@@ -81,7 +81,7 @@ private:
static KWinModule *wModule;
SwallowCommandList * m_swcList;
- QBoxLayout *m_layout;
+ TQBoxLayout *m_layout;
};
@@ -91,7 +91,7 @@ class SwallowApp : public QXEmbed
Q_OBJECT
public:
- SwallowApp( const SwallowCommand * swc, QWidget* parent = 0,
+ SwallowApp( const SwallowCommand * swc, TQWidget* parent = 0,
const char* name = 0);
~SwallowApp();
@@ -106,7 +106,7 @@ protected slots:
private:
KProcess *process;
- QString winTitle;
+ TQString winTitle;
float wh_ratio;
};
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 1d9e40747..933855f74 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -26,14 +26,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qcursor.h>
-#include <qlayout.h>
-#include <qpopupmenu.h>
-#include <qtimer.h>
-#include <qpixmap.h>
-#include <qevent.h>
-#include <qstyle.h>
-#include <qpainter.h>
+#include <tqcursor.h>
+#include <tqlayout.h>
+#include <tqpopupmenu.h>
+#include <tqtimer.h>
+#include <tqpixmap.h>
+#include <tqevent.h>
+#include <tqstyle.h>
+#include <tqpainter.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -59,7 +59,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extern "C"
{
- KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile)
+ KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("ksystemtrayapplet");
return new SystemTrayApplet(configFile, KPanelApplet::Normal,
@@ -67,8 +67,8 @@ extern "C"
}
}
-SystemTrayApplet::SystemTrayApplet(const QString& configFile, Type type, int actions,
- QWidget *parent, const char *name)
+SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int actions,
+ TQWidget *parent, const char *name)
: KPanelApplet(configFile, type, actions, parent, name),
m_showFrame(false),
m_showHidden(false),
@@ -92,15 +92,15 @@ SystemTrayApplet::SystemTrayApplet(const QString& configFile, Type type, int act
kapp->dcopClient()->setNotifications(true);
connectDCOPSignal("kicker", "kicker", "configurationChanged()", "loadSettings()", false);
- QTimer::singleShot(0, this, SLOT(initialize()));
+ TQTimer::singleShot(0, this, TQT_SLOT(initialize()));
}
void SystemTrayApplet::initialize()
{
// register existing tray windows
- const QValueList<WId> systemTrayWindows = kwin_module->systemTrayWindows();
+ const TQValueList<WId> systemTrayWindows = kwin_module->systemTrayWindows();
bool existing = false;
- for (QValueList<WId>::ConstIterator it = systemTrayWindows.begin();
+ for (TQValueList<WId>::ConstIterator it = systemTrayWindows.begin();
it != systemTrayWindows.end(); ++it )
{
embedWindow(*it, true);
@@ -116,14 +116,14 @@ void SystemTrayApplet::initialize()
}
// the KWinModule notifies us when tray windows are added or removed
- connect( kwin_module, SIGNAL( systemTrayWindowAdded(WId) ),
- this, SLOT( systemTrayWindowAdded(WId) ) );
- connect( kwin_module, SIGNAL( systemTrayWindowRemoved(WId) ),
- this, SLOT( updateTrayWindows() ) );
+ connect( kwin_module, TQT_SIGNAL( systemTrayWindowAdded(WId) ),
+ this, TQT_SLOT( systemTrayWindowAdded(WId) ) );
+ connect( kwin_module, TQT_SIGNAL( systemTrayWindowRemoved(WId) ),
+ this, TQT_SLOT( updateTrayWindows() ) );
- QCString screenstr;
+ TQCString screenstr;
screenstr.setNum(qt_xscreen());
- QCString trayatom = "_NET_SYSTEM_TRAY_S" + screenstr;
+ TQCString trayatom = "_NET_SYSTEM_TRAY_S" + screenstr;
Display *display = qt_xdisplay();
@@ -210,9 +210,9 @@ void SystemTrayApplet::preferences()
KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel,
KDialogBase::Ok, true);
m_settingsDialog->resize(450, 400);
- connect(m_settingsDialog, SIGNAL(applyClicked()), this, SLOT(applySettings()));
- connect(m_settingsDialog, SIGNAL(okClicked()), this, SLOT(applySettings()));
- connect(m_settingsDialog, SIGNAL(finished()), this, SLOT(settingsDialogFinished()));
+ connect(m_settingsDialog, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(applySettings()));
+ connect(m_settingsDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(applySettings()));
+ connect(m_settingsDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(settingsDialogFinished()));
m_iconSelector = new KActionSelector(m_settingsDialog);
m_iconSelector->setAvailableLabel(i18n("Visible icons:"));
@@ -220,14 +220,14 @@ void SystemTrayApplet::preferences()
m_iconSelector->setShowUpDownButtons(false);
m_settingsDialog->setMainWidget(m_iconSelector);
- QListBox *shownListBox = m_iconSelector->availableListBox();
- QListBox *hiddenListBox = m_iconSelector->selectedListBox();
+ TQListBox *shownListBox = m_iconSelector->availableListBox();
+ TQListBox *hiddenListBox = m_iconSelector->selectedListBox();
TrayEmbedList::const_iterator it = m_shownWins.begin();
TrayEmbedList::const_iterator itEnd = m_shownWins.end();
for (; it != itEnd; ++it)
{
- QString name = KWin::windowInfo((*it)->embeddedWinId()).name();
+ TQString name = KWin::windowInfo((*it)->embeddedWinId()).name();
if(!shownListBox->findItem(name, Qt::ExactMatch | Qt::CaseSensitive))
{
shownListBox->insertItem(KWin::icon((*it)->embeddedWinId(), 22, 22, true), name);
@@ -238,7 +238,7 @@ void SystemTrayApplet::preferences()
itEnd = m_hiddenWins.end();
for (; it != itEnd; ++it)
{
- QString name = KWin::windowInfo((*it)->embeddedWinId()).name();
+ TQString name = KWin::windowInfo((*it)->embeddedWinId()).name();
if(!hiddenListBox->findItem(name, Qt::ExactMatch | Qt::CaseSensitive))
{
hiddenListBox->insertItem(KWin::icon((*it)->embeddedWinId(), 22, 22, true), name);
@@ -264,13 +264,13 @@ void SystemTrayApplet::applySettings()
KConfig *conf = config();
conf->setGroup("HiddenTrayIcons");
- QString name;
+ TQString name;
// use the following snippet of code someday to implement ordering
// of icons
/*
m_visibleIconList.clear();
- QListBoxItem* item = m_iconSelector->availableListBox()->firstItem();
+ TQListBoxItem* item = m_iconSelector->availableListBox()->firstItem();
for (; item; item = item->next())
{
m_visibleIconList.append(item->text());
@@ -279,7 +279,7 @@ void SystemTrayApplet::applySettings()
selection.clear();*/
m_hiddenIconList.clear();
- QListBoxItem* item = m_iconSelector->selectedListBox()->firstItem();
+ TQListBoxItem* item = m_iconSelector->selectedListBox()->firstItem();
for (; item; item = item->next())
{
m_hiddenIconList.append(item->text());
@@ -328,7 +328,7 @@ void SystemTrayApplet::checkAutoRetract()
return;
}
- if (!geometry().contains(mapFromGlobal(QCursor::pos())))
+ if (!geometry().contains(mapFromGlobal(TQCursor::pos())))
{
m_autoRetractTimer->stop();
if (m_autoRetract)
@@ -376,12 +376,12 @@ void SystemTrayApplet::showExpandButton(bool show)
.width(),
height() - 4);
}
- connect(m_expandButton, SIGNAL(clicked()),
- this, SLOT(toggleExpanded()));
+ connect(m_expandButton, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(toggleExpanded()));
- m_autoRetractTimer = new QTimer(this);
- connect(m_autoRetractTimer, SIGNAL(timeout()),
- this, SLOT(checkAutoRetract()));
+ m_autoRetractTimer = new TQTimer(this);
+ connect(m_autoRetractTimer, TQT_SIGNAL(timeout()),
+ this, TQT_SLOT(checkAutoRetract()));
}
else
{
@@ -483,7 +483,7 @@ void SystemTrayApplet::embedWindow( WId w, bool kde_tray )
return;
}
- connect(emb, SIGNAL(embeddedWindowDestroyed()), SLOT(updateTrayWindows()));
+ connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows()));
emb->getIconSize(m_iconSize);
if (shouldHide(w))
@@ -724,18 +724,18 @@ int SystemTrayApplet::maxIconHeight() const
return largest;
}
-bool SystemTrayApplet::eventFilter(QObject* watched, QEvent* e)
+bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e)
{
if (watched == m_expandButton)
{
- QPoint p;
- if (e->type() == QEvent::ContextMenu)
+ TQPoint p;
+ if (e->type() == TQEvent::ContextMenu)
{
- p = static_cast<QContextMenuEvent*>(e)->globalPos();
+ p = static_cast<TQContextMenuEvent*>(e)->globalPos();
}
- else if (e->type() == QEvent::MouseButtonPress)
+ else if (e->type() == TQEvent::MouseButtonPress)
{
- QMouseEvent* me = static_cast<QMouseEvent*>(e);
+ TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
if (me->button() == Qt::RightButton)
{
p = me->globalPos();
@@ -744,11 +744,11 @@ bool SystemTrayApplet::eventFilter(QObject* watched, QEvent* e)
if (!p.isNull())
{
- QPopupMenu* contextMenu = new QPopupMenu(this);
+ TQPopupMenu* contextMenu = new TQPopupMenu(this);
contextMenu->insertItem(SmallIcon("configure"), i18n("Configure System Tray..."),
- this, SLOT(configure()));
+ this, TQT_SLOT(configure()));
- contextMenu->exec(static_cast<QContextMenuEvent*>(e)->globalPos());
+ contextMenu->exec(static_cast<TQContextMenuEvent*>(e)->globalPos());
delete contextMenu;
return true;
@@ -796,17 +796,17 @@ int SystemTrayApplet::heightForWidth(int w) const
return sizeHint().height();
}
-void SystemTrayApplet::moveEvent( QMoveEvent* )
+void SystemTrayApplet::moveEvent( TQMoveEvent* )
{
setBackground();
}
-void SystemTrayApplet::resizeEvent( QResizeEvent* )
+void SystemTrayApplet::resizeEvent( TQResizeEvent* )
{
layoutTray();
// we need to give ourselves a chance to adjust our size before calling this
- QTimer::singleShot(0, this, SIGNAL(updateLayout()));
+ TQTimer::singleShot(0, this, TQT_SIGNAL(updateLayout()));
}
void SystemTrayApplet::layoutTray()
@@ -826,7 +826,7 @@ void SystemTrayApplet::layoutTray()
int i = 0, line, nbrOfLines, heightWidth;
bool showExpandButton = m_expandButton && m_expandButton->isVisibleTo(this);
delete m_layout;
- m_layout = new QGridLayout(this, 1, 1, ICON_MARGIN, ICON_MARGIN);
+ m_layout = new TQGridLayout(this, 1, 1, ICON_MARGIN, ICON_MARGIN);
if (m_expandButton)
{
@@ -966,7 +966,7 @@ void SystemTrayApplet::layoutTray()
setBackground();
}
-void SystemTrayApplet::paletteChange(const QPalette & /* oldPalette */)
+void SystemTrayApplet::paletteChange(const TQPalette & /* oldPalette */)
{
setBackground();
}
@@ -985,17 +985,17 @@ void SystemTrayApplet::setBackground()
}
-TrayEmbed::TrayEmbed( bool kdeTray, QWidget* parent )
+TrayEmbed::TrayEmbed( bool kdeTray, TQWidget* parent )
: QXEmbed( parent ), kde_tray( kdeTray )
{
hide();
- m_scaledWidget = new QWidget(parent);
+ m_scaledWidget = new TQWidget(parent);
m_scaledWidget->hide();
}
void TrayEmbed::getIconSize(int defaultIconSize)
{
- QSize minSize = minimumSizeHint();
+ TQSize minSize = minimumSizeHint();
int width = minSize.width();
int height = minSize.height();
@@ -1011,11 +1011,11 @@ void TrayEmbed::getIconSize(int defaultIconSize)
void TrayEmbed::setBackground()
{
- const QPixmap *pbg = parentWidget()->backgroundPixmap();
+ const TQPixmap *pbg = parentWidget()->backgroundPixmap();
if (pbg)
{
- QPixmap bg(width(), height());
+ TQPixmap bg(width(), height());
bg.fill(parentWidget(), pos());
setPaletteBackgroundPixmap(bg);
setBackgroundOrigin(WidgetOrigin);
diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h
index 848be90f0..e2f8f64af 100644
--- a/kicker/applets/systemtray/systemtrayapplet.h
+++ b/kicker/applets/systemtray/systemtrayapplet.h
@@ -24,9 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __systemtrayapplet_h__
#define __systemtrayapplet_h__
-#include <qvaluevector.h>
-#include <qstringlist.h>
-#include <qevent.h>
+#include <tqvaluevector.h>
+#include <tqstringlist.h>
+#include <tqevent.h>
#include <qxembed.h>
#include <dcopobject.h>
@@ -46,12 +46,12 @@ class SystemTrayApplet : public KPanelApplet, public DCOPObject
{
Q_OBJECT
K_DCOP
- typedef QValueVector<TrayEmbed*> TrayEmbedList;
+ typedef TQValueVector<TrayEmbed*> TrayEmbedList;
public:
- SystemTrayApplet(const QString& configFile, Type t = Normal, int actions = 0,
- QWidget *parent = 0, const char *name = 0);
+ SystemTrayApplet(const TQString& configFile, Type t = Normal, int actions = 0,
+ TQWidget *parent = 0, const char *name = 0);
~SystemTrayApplet();
int widthForHeight(int h) const;
@@ -59,15 +59,15 @@ public:
int maxIconWidth() const;
int maxIconHeight() const;
- bool eventFilter(QObject* watched, QEvent* e);
+ bool eventFilter(TQObject* watched, TQEvent* e);
k_dcop:
void loadSettings();
void iconSizeChanged();
protected:
- void resizeEvent(QResizeEvent*);
- void moveEvent(QMoveEvent *);
+ void resizeEvent(TQResizeEvent*);
+ void moveEvent(TQMoveEvent *);
bool x11Event( XEvent *e );
void preferences();
void orientationChange( Orientation );
@@ -77,7 +77,7 @@ protected slots:
void systemTrayWindowAdded( WId );
void updateTrayWindows();
void layoutTray();
- void paletteChange(const QPalette & /* oldPalette */);
+ void paletteChange(const TQPalette & /* oldPalette */);
void toggleExpanded();
void settingsDialogFinished();
void applySettings();
@@ -97,7 +97,7 @@ private:
TrayEmbedList m_shownWins;
TrayEmbedList m_hiddenWins;
- QStringList m_hiddenIconList;
+ TQStringList m_hiddenIconList;
KWinModule *kwin_module;
Atom net_system_tray_selection;
Atom net_system_tray_opcode;
@@ -106,23 +106,23 @@ private:
SimpleArrowButton *m_expandButton;
KDialogBase* m_settingsDialog;
KActionSelector* m_iconSelector;
- QTimer* m_autoRetractTimer;
+ TQTimer* m_autoRetractTimer;
bool m_autoRetract;
int m_iconSize;
- QGridLayout* m_layout;
+ TQGridLayout* m_layout;
};
class TrayEmbed : public QXEmbed
{
Q_OBJECT
public:
- TrayEmbed( bool kdeTray, QWidget* parent = NULL );
+ TrayEmbed( bool kdeTray, TQWidget* parent = NULL );
bool kdeTray() const { return kde_tray; }
void setBackground();
void getIconSize(int defaultIconSize);
private:
bool kde_tray;
- QWidget *m_scaledWidget;
+ TQWidget *m_scaledWidget;
};
#endif
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp
index dc3428bf8..55e5d113f 100644
--- a/kicker/applets/taskbar/taskbarapplet.cpp
+++ b/kicker/applets/taskbar/taskbarapplet.cpp
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qlayout.h>
-#include <qpalette.h>
+#include <tqlayout.h>
+#include <tqpalette.h>
#include <kapplication.h>
#include <kglobal.h>
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extern "C"
{
- KDE_EXPORT KPanelApplet* init( QWidget *parent, const QString& configFile )
+ KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile )
{
// FIXME: what about two taskbars? perhaps this should be inserted just once
KGlobal::locale()->insertCatalogue( "ktaskbarapplet" );
@@ -51,15 +51,15 @@ extern "C"
}
}
-TaskbarApplet::TaskbarApplet( const QString& configFile, Type type, int actions,
- QWidget *parent, const char *name )
+TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions,
+ TQWidget *parent, const char *name )
: KPanelApplet( configFile, type, actions, parent, name )
{
setBackgroundOrigin( AncestorOrigin );
- QHBoxLayout* layout = new QHBoxLayout( this );
+ TQHBoxLayout* layout = new TQHBoxLayout( this );
container = new TaskBarContainer( false, this );
container->setBackgroundOrigin( AncestorOrigin );
- connect(container, SIGNAL(containerCountChanged()), this, SIGNAL(updateLayout()));
+ connect(container, TQT_SIGNAL(containerCountChanged()), this, TQT_SIGNAL(updateLayout()));
layout->addWidget( container, 1 );
container->popupDirectionChange(popupDirection());
}
@@ -82,7 +82,7 @@ int TaskbarApplet::widthForHeight(int h) const
KPanelExtension::Position d = orientation() == Qt::Horizontal ?
KPanelExtension::Top :
KPanelExtension::Left;
- return container->sizeHint(d, QSize(200, h)).width();
+ return container->sizeHint(d, TQSize(200, h)).width();
}
int TaskbarApplet::heightForWidth(int w) const
@@ -97,7 +97,7 @@ int TaskbarApplet::heightForWidth(int w) const
KPanelExtension::Position d = orientation() == Qt::Horizontal ?
KPanelExtension::Top :
KPanelExtension::Left;
- return container->sizeHint(d, QSize(w, 200)).height();
+ return container->sizeHint(d, TQSize(w, 200)).height();
}
void TaskbarApplet::preferences()
@@ -115,12 +115,12 @@ void TaskbarApplet::popupDirectionChange( Direction d )
container->popupDirectionChange( d );
}
-void TaskbarApplet::moveEvent(QMoveEvent *)
+void TaskbarApplet::moveEvent(TQMoveEvent *)
{
container->setBackground();
}
-void TaskbarApplet::paletteChange(const QPalette &)
+void TaskbarApplet::paletteChange(const TQPalette &)
{
container->setBackground();
}
diff --git a/kicker/applets/taskbar/taskbarapplet.h b/kicker/applets/taskbar/taskbarapplet.h
index f0842baca..69ef5eda1 100644
--- a/kicker/applets/taskbar/taskbarapplet.h
+++ b/kicker/applets/taskbar/taskbarapplet.h
@@ -34,8 +34,8 @@ class TaskbarApplet : public KPanelApplet
Q_OBJECT
public:
- TaskbarApplet( const QString& configFile, Type t = Normal, int actions = 0,
- QWidget *parent = 0, const char *name = 0 );
+ TaskbarApplet( const TQString& configFile, Type t = Normal, int actions = 0,
+ TQWidget *parent = 0, const char *name = 0 );
~TaskbarApplet();
int widthForHeight( int h ) const;
@@ -44,10 +44,10 @@ public:
void preferences();
protected:
- void moveEvent(QMoveEvent *);
+ void moveEvent(TQMoveEvent *);
void popupDirectionChange( Direction );
void orientationChange( Orientation );
- void paletteChange(const QPalette &);
+ void paletteChange(const TQPalette &);
private:
TaskBarContainer* container;
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index c27c4e281..18962b2ea 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -31,7 +31,7 @@
extern "C"
{
- KDE_EXPORT KPanelApplet* init( QWidget *parent, const QString& configFile)
+ KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("trashapplet");
return new TrashApplet(configFile, KPanelApplet::Normal,
@@ -39,7 +39,7 @@ extern "C"
}
}
-TrashApplet::TrashApplet(const QString& configFile, Type type, int actions, QWidget *parent, const char *name)
+TrashApplet::TrashApplet(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name)
: KPanelApplet(configFile, type, actions, parent, name), mButton(0)
{
mButton = new TrashButton(this);
@@ -53,12 +53,12 @@ TrashApplet::TrashApplet(const QString& configFile, Type type, int actions, QWid
mpDirLister = new KDirLister();
- connect( mpDirLister, SIGNAL( clear() ),
- this, SLOT( slotClear() ) );
- connect( mpDirLister, SIGNAL( completed() ),
- this, SLOT( slotCompleted() ) );
- connect( mpDirLister, SIGNAL( deleteItem( KFileItem * ) ),
- this, SLOT( slotDeleteItem( KFileItem * ) ) );
+ connect( mpDirLister, TQT_SIGNAL( clear() ),
+ this, TQT_SLOT( slotClear() ) );
+ connect( mpDirLister, TQT_SIGNAL( completed() ),
+ this, TQT_SLOT( slotCompleted() ) );
+ connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
+ this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
mpDirLister->openURL("trash:/");
}
@@ -67,8 +67,8 @@ TrashApplet::~TrashApplet()
{
// disconnect the dir lister before quitting so as not to crash
// on kicker exit
- disconnect( mpDirLister, SIGNAL( clear() ),
- this, SLOT( slotClear() ) );
+ disconnect( mpDirLister, TQT_SIGNAL( clear() ),
+ this, TQT_SLOT( slotClear() ) );
delete mpDirLister;
KGlobal::locale()->removeCatalogue("trashapplet");
}
@@ -111,7 +111,7 @@ int TrashApplet::heightForWidth( int width ) const
return mButton->heightForWidth( width );
}
-void TrashApplet::resizeEvent( QResizeEvent * )
+void TrashApplet::resizeEvent( TQResizeEvent * )
{
if (!mButton)
{
diff --git a/kicker/applets/trash/trashapplet.h b/kicker/applets/trash/trashapplet.h
index bc9662af4..c77cf3755 100644
--- a/kicker/applets/trash/trashapplet.h
+++ b/kicker/applets/trash/trashapplet.h
@@ -25,7 +25,7 @@
#endif
#include <kpanelapplet.h>
-#include <qstring.h>
+#include <tqstring.h>
#include <kurl.h>
#include <kdirlister.h>
@@ -36,8 +36,8 @@ class TrashApplet : public KPanelApplet
Q_OBJECT
public:
- TrashApplet(const QString& configFile, Type t = Normal, int actions = 0,
- QWidget *parent = 0, const char *name = 0);
+ TrashApplet(const TQString& configFile, Type t = Normal, int actions = 0,
+ TQWidget *parent = 0, const char *name = 0);
~TrashApplet();
int widthForHeight(int height) const;
@@ -45,7 +45,7 @@ public:
void about();
protected:
- void resizeEvent(QResizeEvent *e);
+ void resizeEvent(TQResizeEvent *e);
void positionChange(Position p);
protected slots:
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index e6934a983..eb036c119 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -19,8 +19,8 @@
#include "trashbutton.h"
-#include <qpopupmenu.h>
-#include <qtooltip.h>
+#include <tqpopupmenu.h>
+#include <tqtooltip.h>
#include <klocale.h>
#include <krun.h>
@@ -31,7 +31,7 @@
#include <konq_operations.h>
#include <konq_popupmenu.h>
-TrashButton::TrashButton(QWidget *parent)
+TrashButton::TrashButton(TQWidget *parent)
: PanelPopupButton(parent), mActions(this, this),
mFileItem(KFileItem::Unknown, KFileItem::Unknown, "trash:/")
{
@@ -39,7 +39,7 @@ TrashButton::TrashButton(QWidget *parent)
KIO::NetAccess::stat("trash:/", entry, 0L);
mFileItem.assign(KFileItem(entry, "trash:/"));
- KAction *a = KStdAction::paste(this, SLOT(slotPaste()),
+ KAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()),
&mActions, "paste");
a->setShortcut(0);
@@ -53,9 +53,9 @@ TrashButton::TrashButton(QWidget *parent)
// Activate this code only if we find a way to have both an
// action and a popup menu for the same kicker button
- //connect(this, SIGNAL(clicked()), this, SLOT(slotClicked()));
+ //connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));
- setPopup(new QPopupMenu());
+ setPopup(new TQPopupMenu());
}
TrashButton::~TrashButton()
@@ -67,18 +67,18 @@ void TrashButton::setItemCount(int count)
if (count==0)
{
setIcon( "trashcan_empty" );
- QToolTip::add(this, i18n("Empty"));
+ TQToolTip::add(this, i18n("Empty"));
}
else
{
setIcon( "trashcan_full" );
- QToolTip::add(this, i18n("One item", "%n items", count));
+ TQToolTip::add(this, i18n("One item", "%n items", count));
}
}
void TrashButton::initPopup()
{
- QPopupMenu *old_popup = popup();
+ TQPopupMenu *old_popup = popup();
KFileItemList items;
items.append(&mFileItem);
@@ -117,17 +117,17 @@ void TrashButton::slotPaste()
KonqOperations::doPaste(this, mFileItem.url());
}
-void TrashButton::dragEnterEvent(QDragEnterEvent* e)
+void TrashButton::dragEnterEvent(TQDragEnterEvent* e)
{
e->accept(true);
}
-void TrashButton::dropEvent(QDropEvent *e)
+void TrashButton::dropEvent(TQDropEvent *e)
{
KonqOperations::doDrop(0L, mFileItem.url(), e, this);
}
-QString TrashButton::tileName()
+TQString TrashButton::tileName()
{
return mFileItem.name();
}
diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h
index 7a5d8b59f..891e274c0 100644
--- a/kicker/applets/trash/trashbutton.h
+++ b/kicker/applets/trash/trashbutton.h
@@ -21,11 +21,11 @@
#define TRASHBUTTON_H
#include <panelbutton.h>
-#include <qpoint.h>
-#include <qstring.h>
-#include <qpixmap.h>
-#include <qcursor.h>
-#include <qtimer.h>
+#include <tqpoint.h>
+#include <tqstring.h>
+#include <tqpixmap.h>
+#include <tqcursor.h>
+#include <tqtimer.h>
#include <kfileitem.h>
#include <kpanelapplet.h>
#include <kactioncollection.h>
@@ -35,16 +35,16 @@ class TrashButton : public PanelPopupButton
Q_OBJECT
public:
- TrashButton(QWidget *parent);
+ TrashButton(TQWidget *parent);
~TrashButton();
void setItemCount(int count);
void setPanelPosition(KPanelApplet::Position position);
protected:
- QString tileName();
+ TQString tileName();
void initPopup();
- void dragEnterEvent(QDragEnterEvent *e);
- void dropEvent(QDropEvent *e);
+ void dragEnterEvent(TQDragEnterEvent *e);
+ void dropEvent(TQDropEvent *e);
protected slots:
// Activate this code only if we find a way to have both an
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index 71b583f35..d3b625f80 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extern "C"
{
- KDE_EXPORT KPanelExtension* init(QWidget *parent, const QString& configFile)
+ KDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("dockbarextension");
return new DockBarExtension(configFile, KPanelExtension::Normal,
@@ -52,15 +52,15 @@ extern "C"
}
}
-DockBarExtension::DockBarExtension(const QString& configFile, Type type,
- int actions, QWidget *parent, const char *name)
+DockBarExtension::DockBarExtension(const TQString& configFile, Type type,
+ int actions, TQWidget *parent, const char *name)
: KPanelExtension(configFile, type, actions, parent, name)
{
dragging_container = 0;
kwin_module = new KWinModule(this);
- connect( kwin_module, SIGNAL( windowAdded(WId) ), SLOT( windowAdded(WId) ) );
+ connect( kwin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) );
setMinimumSize(DockContainer::sz(), DockContainer::sz());
- setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
loadContainerConfig();
}
@@ -77,15 +77,15 @@ DockBarExtension::~DockBarExtension()
if (dragging_container) delete dragging_container;
}
-QSize DockBarExtension::sizeHint(Position p, QSize) const
+TQSize DockBarExtension::sizeHint(Position p, TQSize) const
{
if (p == Left || p == Right)
- return QSize(DockContainer::sz(), DockContainer::sz() * containers.count());
+ return TQSize(DockContainer::sz(), DockContainer::sz() * containers.count());
else
- return QSize(DockContainer::sz() * containers.count(), DockContainer::sz());
+ return TQSize(DockContainer::sz() * containers.count(), DockContainer::sz());
}
-void DockBarExtension::resizeEvent(QResizeEvent*)
+void DockBarExtension::resizeEvent(TQResizeEvent*)
{
layoutContainers();
}
@@ -96,7 +96,7 @@ void DockBarExtension::windowAdded(WId win)
// try to read WM_COMMAND
int argc;
char **argv;
- QString command;
+ TQString command;
if (XGetCommand(qt_xdisplay(), win, &argv, &argc)) {
command = KShell::joinArgs(argv, argc);
XFreeStringList(argv);
@@ -145,7 +145,7 @@ void DockBarExtension::windowAdded(WId win)
// try to read class hint
XClassHint hint;
- QString resClass, resName;
+ TQString resClass, resName;
if (XGetClassHint(qt_xdisplay(), win, &hint)) {
resName = hint.res_name;
resClass = hint.res_class;
@@ -182,7 +182,7 @@ void DockBarExtension::layoutContainers()
}
}
-void DockBarExtension::embedWindow(WId win, QString command, QString resName, QString resClass)
+void DockBarExtension::embedWindow(WId win, TQString command, TQString resName, TQString resClass)
{
if (win == 0) return;
DockContainer* container = 0;
@@ -204,7 +204,7 @@ void DockBarExtension::embedWindow(WId win, QString command, QString resName, QS
}
if (container == 0) {
- QString cmd = command.isNull() ? resClass : command;
+ TQString cmd = command.isNull() ? resClass : command;
if (KStandardDirs::findExe(KShell::splitArgs(cmd).front()).isEmpty())
ncmd = true;
container = new DockContainer(cmd, this, resName, resClass);
@@ -236,10 +236,10 @@ void DockBarExtension::addContainer(DockContainer* c, int pos)
containers.insert(it, c);
}
- connect(c, SIGNAL(embeddedWindowDestroyed(DockContainer*)),
- SLOT(embeddedWindowDestroyed(DockContainer*)));
- connect(c, SIGNAL(settingsChanged(DockContainer*)),
- SLOT(settingsChanged(DockContainer*)));
+ connect(c, TQT_SIGNAL(embeddedWindowDestroyed(DockContainer*)),
+ TQT_SLOT(embeddedWindowDestroyed(DockContainer*)));
+ connect(c, TQT_SIGNAL(settingsChanged(DockContainer*)),
+ TQT_SLOT(settingsChanged(DockContainer*)));
c->resize(DockContainer::sz(), DockContainer::sz());
c->show();
}
@@ -272,7 +272,7 @@ void DockBarExtension::settingsChanged(DockContainer *)
void DockBarExtension::saveContainerConfig()
{
- QStringList applet_list;
+ TQStringList applet_list;
KConfig *conf = config();
unsigned count = 0;
@@ -283,7 +283,7 @@ void DockBarExtension::saveContainerConfig()
DockContainer* c = *it;
if (!c->command().isEmpty())
{
- QString applet_gid = QString("Applet_%1").arg(QString::number(count));
+ TQString applet_gid = TQString("Applet_%1").arg(TQString::number(count));
applet_list.append(applet_gid);
conf->setGroup(applet_gid);
conf->writePathEntry("Command", c->command());
@@ -302,15 +302,15 @@ void DockBarExtension::loadContainerConfig()
{
KConfig *conf = config();
conf->setGroup("General");
- QStringList applets = conf->readListEntry("Applets");
+ TQStringList applets = conf->readListEntry("Applets");
- QStringList fail_list;
- for (QStringList::Iterator it = applets.begin(); it != applets.end(); ++it) {
+ TQStringList fail_list;
+ for (TQStringList::Iterator it = applets.begin(); it != applets.end(); ++it) {
if (!conf->hasGroup(*it)) continue;
conf->setGroup(*it);
- QString cmd = conf->readPathEntry("Command");
- QString resName = conf->readPathEntry("resName");
- QString resClass = conf->readEntry("resClass");
+ TQString cmd = conf->readPathEntry("Command");
+ TQString resName = conf->readPathEntry("resName");
+ TQString resClass = conf->readEntry("resClass");
if (cmd.isEmpty() || resName.isEmpty() || resClass.isEmpty()) continue;
DockContainer* c = new DockContainer(cmd, this, resName, resClass );
@@ -328,7 +328,7 @@ void DockBarExtension::loadContainerConfig()
saveContainerConfig();
}
-int DockBarExtension::findContainerAtPoint(const QPoint& p)
+int DockBarExtension::findContainerAtPoint(const TQPoint& p)
{
int i = 0;
for (DockContainer::Vector::const_iterator it = containers.constBegin();
@@ -344,7 +344,7 @@ int DockBarExtension::findContainerAtPoint(const QPoint& p)
return -1;
}
-void DockBarExtension::mousePressEvent(QMouseEvent *e ) {
+void DockBarExtension::mousePressEvent(TQMouseEvent *e ) {
if (e->button() == LeftButton) {
// Store the position of the mouse clic.
mclic_pos = e->pos();
@@ -354,7 +354,7 @@ void DockBarExtension::mousePressEvent(QMouseEvent *e ) {
}
}
-void DockBarExtension::mouseReleaseEvent(QMouseEvent *e ) {
+void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) {
if (e->button() != LeftButton) return;
if (dragging_container) {
releaseMouse();
@@ -365,11 +365,11 @@ void DockBarExtension::mouseReleaseEvent(QMouseEvent *e ) {
}
}
-void DockBarExtension::mouseMoveEvent(QMouseEvent *e) {
+void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) {
if (! (e->state() & LeftButton) ) return;
if (dragging_container == 0) {
// Check whether the user has moved far enough.
- int delay = QApplication::startDragDistance();
+ int delay = TQApplication::startDragDistance();
if ( (mclic_pos - e->pos()).manhattanLength() > delay ) {
int pos = findContainerAtPoint(e->pos());
original_container = 0;
@@ -388,7 +388,7 @@ void DockBarExtension::mouseMoveEvent(QMouseEvent *e) {
dragging_container->move(e->globalPos() - mclic_dock_pos);
// change layout of other containers
- QPoint dragpos(dragging_container->pos()),
+ TQPoint dragpos(dragging_container->pos()),
barpos(mapToGlobal(pos()));
int pdrag1,pdrag2,psz;
pdrag1 = dragpos.x() - barpos.x() + DockContainer::sz()/2;
diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h
index 0003ec6fa..e735ec708 100644
--- a/kicker/extensions/dockbar/dockbarextension.h
+++ b/kicker/extensions/dockbar/dockbarextension.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __dockbarextension_h__
#define __dockbarextension_h__
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
#include <kpanelextension.h>
#include "dockcontainer.h"
@@ -35,12 +35,12 @@ class DockBarExtension : public KPanelExtension
Q_OBJECT
public:
- DockBarExtension(const QString& configFile, Type t = Normal,
- int actions = 0, QWidget *parent = 0, const char *name = 0);
+ DockBarExtension(const TQString& configFile, Type t = Normal,
+ int actions = 0, TQWidget *parent = 0, const char *name = 0);
virtual ~DockBarExtension();
- QSize sizeHint(Position, QSize maxSize) const;
+ TQSize sizeHint(Position, TQSize maxSize) const;
Position preferedPosition() const { return Right; }
protected slots:
@@ -49,24 +49,24 @@ protected slots:
void settingsChanged(DockContainer*);
protected:
- void resizeEvent(QResizeEvent*);
- void embedWindow(WId win, QString command, QString resName, QString resClass);
+ void resizeEvent(TQResizeEvent*);
+ void embedWindow(WId win, TQString command, TQString resName, TQString resClass);
void addContainer(DockContainer*, int pos=-1);
void removeContainer(DockContainer*);
void saveContainerConfig();
void loadContainerConfig();
void layoutContainers();
- int findContainerAtPoint(const QPoint&);
- void mousePressEvent(QMouseEvent *);
- void mouseReleaseEvent(QMouseEvent *);
- void mouseMoveEvent(QMouseEvent *);
+ int findContainerAtPoint(const TQPoint&);
+ void mousePressEvent(TQMouseEvent *);
+ void mouseReleaseEvent(TQMouseEvent *);
+ void mouseMoveEvent(TQMouseEvent *);
private:
KWinModule* kwin_module;
DockContainer::Vector containers;
// handle the dragging of applets
DockContainer *dragging_container, *original_container;
- QPoint mclic_pos, mclic_dock_pos;
+ TQPoint mclic_pos, mclic_dock_pos;
int dragged_container_original_pos;
};
diff --git a/kicker/extensions/dockbar/dockcontainer.cpp b/kicker/extensions/dockbar/dockcontainer.cpp
index f2117346d..d363b6b30 100644
--- a/kicker/extensions/dockbar/dockcontainer.cpp
+++ b/kicker/extensions/dockbar/dockcontainer.cpp
@@ -21,10 +21,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qwidget.h>
-#include <qtooltip.h>
+#include <tqwidget.h>
+#include <tqtooltip.h>
#include <kwin.h>
-#include <qvalidator.h>
+#include <tqvalidator.h>
#include <kinputdialog.h>
#include <klocale.h>
#include <kpopupmenu.h>
@@ -38,9 +38,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <X11/Xutil.h>
-DockContainer::DockContainer( QString command, QWidget *parent,
- QString resname, QString resclass, bool undocked_style )
- : QFrame( parent, resname.ascii(),
+DockContainer::DockContainer( TQString command, TQWidget *parent,
+ TQString resname, TQString resclass, bool undocked_style )
+ : TQFrame( parent, resname.ascii(),
undocked_style ? WStyle_Customize |
WStyle_StaysOnTop | WStyle_Tool |
WStyle_NoBorder | WX11BypassWM : 0 ),
@@ -64,7 +64,7 @@ DockContainer::DockContainer( QString command, QWidget *parent,
if (!undocked_style) {
setFrameStyle(StyledPanel | Raised);
setLineWidth(border());
- QToolTip::add(this, command);
+ TQToolTip::add(this, command);
} else {
setFrameStyle(StyledPanel | Plain);
setLineWidth(1);
@@ -76,7 +76,7 @@ void DockContainer::embed( WId id )
{
if( id == _embeddedWinId || id == 0)
return;
- QRect geom = KWin::windowInfo(id,NET::WMKDEFrameStrut).frameGeometry();
+ TQRect geom = KWin::windowInfo(id,NET::WMKDEFrameStrut).frameGeometry();
// does the same as KWM::prepareForSwallowing()
XWithdrawWindow( qt_xdisplay(), id, qt_xscreen() );
@@ -147,10 +147,10 @@ bool DockContainer::x11Event( XEvent *e )
void DockContainer::askNewCommand(bool bad_command)
{
bool ok;
- QString title( i18n("Enter Command Line for Applet %1.%2").arg(resName()).arg(resClass()) );
- QString description( i18n("This applet does not behave correctly and the dockbar was unable to "
+ TQString title( i18n("Enter Command Line for Applet %1.%2").arg(resName()).arg(resClass()) );
+ TQString description( i18n("This applet does not behave correctly and the dockbar was unable to "
"find the command line necessary to launch it the next time KDE starts up") );
- QString cmd;
+ TQString cmd;
/*
I was not able to figure out why valgrind complains inside the getText call..
@@ -160,13 +160,13 @@ void DockContainer::askNewCommand(bool bad_command)
cmd = KInputDialog::getText( title, description,
command(), &ok, this );
} else {
- cmd = KInputDialog::getText( title, QString::null,
+ cmd = KInputDialog::getText( title, TQString::null,
command(), &ok, this );
}
if (ok) { _command = cmd; emit settingsChanged(this); }
}
-void DockContainer::popupMenu(QPoint p)
+void DockContainer::popupMenu(TQPoint p)
{
int r;
{
diff --git a/kicker/extensions/dockbar/dockcontainer.h b/kicker/extensions/dockbar/dockcontainer.h
index bc9962290..d1968fa28 100644
--- a/kicker/extensions/dockbar/dockcontainer.h
+++ b/kicker/extensions/dockbar/dockcontainer.h
@@ -24,19 +24,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __dockcontainer_h__
#define __dockcontainer_h__
-#include <qframe.h>
-#include <qvaluevector.h>
+#include <tqframe.h>
+#include <tqvaluevector.h>
class DockContainer : public QFrame
{
Q_OBJECT
public:
- typedef QValueVector<DockContainer*> Vector;
+ typedef TQValueVector<DockContainer*> Vector;
- DockContainer( QString command, QWidget *parent,
- QString resname,
- QString resclass,
+ DockContainer( TQString command, TQWidget *parent,
+ TQString resname,
+ TQString resclass,
bool undocked_style=false);
void embed(WId);
@@ -44,11 +44,11 @@ public:
void kill();
WId embeddedWinId() const;
- QString command() const;
- QString resClass() const;
- QString resName() const;
+ TQString command() const;
+ TQString resClass() const;
+ TQString resName() const;
void askNewCommand(bool bad_command=true);
- void popupMenu(QPoint p);
+ void popupMenu(TQPoint p);
static int& sz();
static int& border();
signals:
@@ -60,8 +60,8 @@ protected:
private:
WId _embeddedWinId;
- QString _command;
- QString _resName, _resClass;
+ TQString _command;
+ TQString _resName, _resClass;
};
@@ -70,17 +70,17 @@ inline WId DockContainer::embeddedWinId() const
return _embeddedWinId;
}
-inline QString DockContainer::command() const
+inline TQString DockContainer::command() const
{
return _command;
}
-inline QString DockContainer::resClass() const
+inline TQString DockContainer::resClass() const
{
return _resClass;
}
-inline QString DockContainer::resName() const
+inline TQString DockContainer::resName() const
{
return _resName;
}
diff --git a/kicker/extensions/kasbar/docs.h b/kicker/extensions/kasbar/docs.h
index 6a9aa5849..105176d08 100644
--- a/kicker/extensions/kasbar/docs.h
+++ b/kicker/extensions/kasbar/docs.h
@@ -40,23 +40,23 @@ class QObject
{
};
-class QWidget : public QObject
+class TQWidget : public QObject
{
};
-class QDialog : public QWidget
+class TQDialog : public QWidget
{
};
-class QFrame : public QWidget
+class TQFrame : public QWidget
{
};
-class QHBox : public QFrame
+class TQHBox : public QFrame
{
};
-class QLCDNumber : public QFrame
+class TQLCDNumber : public QFrame
{
};
diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp
index 73d20d94b..d32f0a1dd 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.cpp
+++ b/kicker/extensions/kasbar/kasaboutdlg.cpp
@@ -52,12 +52,12 @@
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-#include <qcheckbox.h>
-#include <qgrid.h>
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqcheckbox.h>
+#include <tqgrid.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <kdeversion.h>
#include <klocale.h>
@@ -83,7 +83,7 @@
#define Icon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
#define LargeIcon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
-KasAboutDialog::KasAboutDialog( QWidget *parent )
+KasAboutDialog::KasAboutDialog( TQWidget *parent )
: KDialogBase( KDialogBase::IconList, i18n("About Kasbar"),
KDialogBase::Ok,
KDialogBase::Ok,
@@ -110,10 +110,10 @@ KasAboutDialog::~KasAboutDialog()
void KasAboutDialog::addDemoBar()
{
- QHBox *box = new QHBox( this );
+ TQHBox *box = new TQHBox( this );
box->setLineWidth(2);
- box->setFrameStyle( QFrame::Panel | QFrame::Sunken );
+ box->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
box->setSpacing( spacingHint() );
box->setMargin( marginHint() );
@@ -129,7 +129,7 @@ void KasAboutDialog::addDemoBar()
KasPopup *pop = new KasPopup( ci );
ci->setPopup( pop );
ci->setCustomPopup( true );
- connect( ci, SIGNAL(leftButtonClicked(QMouseEvent *)), ci, SLOT(togglePopup()) );
+ connect( ci, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQT_SLOT(togglePopup()) );
KasBar *groupbar = bar->createChildBar( ( bar->orientation() == Horizontal ) ? Vertical : Horizontal, pop );
KasItem *i = 0;
@@ -150,10 +150,10 @@ void KasAboutDialog::addDemoBar()
void KasAboutDialog::addInfoPage()
{
- QVBox *aboutPage = addVBoxPage( i18n("About"), i18n("About Kasbar"), Icon( "appearance" ) );
+ TQVBox *aboutPage = addVBoxPage( i18n("About"), i18n("About Kasbar"), Icon( "appearance" ) );
aboutPage->setSpacing( spacingHint() );
- new QLabel( i18n( "<qt><body>"
+ new TQLabel( i18n( "<qt><body>"
"<h2>Kasbar Version: %1</h2>"
"<b>KDE Version:</b> %2"
"</body></qt>" )
@@ -176,12 +176,12 @@ void KasAboutDialog::addInfoPage()
"</body></html>" )
.arg( HOMEPAGE_URL ).arg( HOMEPAGE_URL ) );
- text5->setWordWrap( QTextEdit::WidgetWidth );
+ text5->setWordWrap( TQTextEdit::WidgetWidth );
}
void KasAboutDialog::addAuthorsPage()
{
- QVBox *authorsPage = addVBoxPage( i18n("Authors"),
+ TQVBox *authorsPage = addVBoxPage( i18n("Authors"),
i18n("Kasbar Authors"),
Icon( "kuser" ) );
@@ -206,28 +206,28 @@ void KasAboutDialog::addAuthorsPage()
"</html>" ) );
- text->setWordWrap( QTextEdit::WidgetWidth );
+ text->setWordWrap( TQTextEdit::WidgetWidth );
}
void KasAboutDialog::addBSDPage()
{
- QVBox *bsdLicense = addVBoxPage( i18n("BSD License"), QString::null, Icon( "filefind" ) );
+ TQVBox *bsdLicense = addVBoxPage( i18n("BSD License"), TQString::null, Icon( "filefind" ) );
- new QLabel( i18n( "Kasbar may be used under the terms of either the BSD license, "
+ new TQLabel( i18n( "Kasbar may be used under the terms of either the BSD license, "
"or the GNU Public License." ), bsdLicense );
KTextBrowser *text2 = new KTextBrowser( bsdLicense );
text2->setText( "Some text of unsurpassed tediousness goes here." );
- text2->setWordWrap( QTextEdit::NoWrap );
+ text2->setWordWrap( TQTextEdit::NoWrap );
- QString bsdFile = locate("data", "LICENSES/BSD");
+ TQString bsdFile = locate("data", "LICENSES/BSD");
if ( !bsdFile.isEmpty() ) {
- QString result;
- QFile file( bsdFile );
+ TQString result;
+ TQFile file( bsdFile );
if ( file.open( IO_ReadOnly ) )
{
- QTextStream str(&file);
+ TQTextStream str(&file);
result += str.read();
}
@@ -237,23 +237,23 @@ void KasAboutDialog::addBSDPage()
void KasAboutDialog::addGPLPage()
{
- QVBox *gplPage = addVBoxPage( i18n("GPL License"), QString::null, Icon( "filefind" ) );
+ TQVBox *gplPage = addVBoxPage( i18n("GPL License"), TQString::null, Icon( "filefind" ) );
- new QLabel( i18n( "Kasbar may be used under the terms of either the BSD license, "
+ new TQLabel( i18n( "Kasbar may be used under the terms of either the BSD license, "
"or the GNU Public License." ), gplPage );
KTextBrowser *text3 = new KTextBrowser( gplPage );
text3->setText( "Some more text of unsurpassed tediousness goes here." );
- text3->setWordWrap( QTextEdit::NoWrap );
+ text3->setWordWrap( TQTextEdit::NoWrap );
- QString gplFile = locate("data", "LICENSES/GPL_V2");
+ TQString gplFile = locate("data", "LICENSES/GPL_V2");
if ( !gplFile.isEmpty() ) {
- QString result;
- QFile file( gplFile );
+ TQString result;
+ TQFile file( gplFile );
if ( file.open( IO_ReadOnly ) )
{
- QTextStream str(&file);
+ TQTextStream str(&file);
result += str.read();
}
diff --git a/kicker/extensions/kasbar/kasaboutdlg.h b/kicker/extensions/kasbar/kasaboutdlg.h
index c217ead79..0311202ba 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.h
+++ b/kicker/extensions/kasbar/kasaboutdlg.h
@@ -68,7 +68,7 @@ class KasAboutDialog : public KDialogBase
Q_OBJECT
public:
- KasAboutDialog( QWidget *parent=0 );
+ KasAboutDialog( TQWidget *parent=0 );
~KasAboutDialog();
void addAuthorsPage();
diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp
index 8210190c8..06bf3c24f 100644
--- a/kicker/extensions/kasbar/kasbar.cpp
+++ b/kicker/extensions/kasbar/kasbar.cpp
@@ -53,11 +53,11 @@
*/
#include <math.h>
-#include <qbitmap.h>
-#include <qcursor.h>
-#include <qpainter.h>
-#include <qmemarray.h>
-#include <qtimer.h>
+#include <tqbitmap.h>
+#include <tqcursor.h>
+#include <tqpainter.h>
+#include <tqmemarray.h>
+#include <tqtimer.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -76,11 +76,11 @@ static const int LARGE_EXTENT = 68;
static const int HUGE_EXTENT = 84;
static const int ENORMOUS_EXTENT = 148;
-KasBar::KasBar( Orientation o, QWidget *parent, const char *name, WFlags f )
- : QWidget( parent, name, f ),
+KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f )
+ : TQWidget( parent, name, f ),
master_(0),
orient( o ),
- direction_( o == Horizontal ? QBoxLayout::LeftToRight : QBoxLayout::TopToBottom ),
+ direction_( o == Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
itemUnderMouse_( 0 ),
boxesPerLine_(10), // Temp value
inDrag( false ),
@@ -102,14 +102,14 @@ KasBar::KasBar( Orientation o, QWidget *parent, const char *name, WFlags f )
setMouseTracking( true );
setMaxBoxes( 0 );
- connect( this, SIGNAL( configChanged() ), SLOT( repaint() ) );
+ connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) );
}
-KasBar::KasBar( Orientation o, KasBar *master, QWidget *parent, const char *name, WFlags f )
- : QWidget( parent, name, f ),
+KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f )
+ : TQWidget( parent, name, f ),
master_(master),
orient( o ),
- direction_( o == Horizontal ? QBoxLayout::LeftToRight : QBoxLayout::TopToBottom ),
+ direction_( o == Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
itemUnderMouse_( 0 ),
boxesPerLine_(10), // Temp value
inDrag( false ),
@@ -130,7 +130,7 @@ KasBar::KasBar( Orientation o, KasBar *master, QWidget *parent, const char *name
items.setAutoDelete( true );
setMouseTracking( true );
setMaxBoxes( 0 );
- connect( master_, SIGNAL( configChanged() ), SLOT( repaint() ) );
+ connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) );
}
KasBar::~KasBar()
@@ -145,15 +145,15 @@ KasResources *KasBar::resources()
if ( isTopLevel() ) {
res = new KasResources( this );
- connect( res, SIGNAL( changed() ), SIGNAL( configChanged() ) );
- connect( this, SIGNAL( itemSizeChanged(int) ), res, SLOT( itemSizeChanged() ) );
+ connect( res, TQT_SIGNAL( changed() ), TQT_SIGNAL( configChanged() ) );
+ connect( this, TQT_SIGNAL( itemSizeChanged(int) ), res, TQT_SLOT( itemSizeChanged() ) );
return res;
}
return master_->resources();
}
-KasBar *KasBar::createChildBar( Orientation o, QWidget *parent, const char *name )
+KasBar *KasBar::createChildBar( Orientation o, TQWidget *parent, const char *name )
{
KasBar *child = new KasBar( o, this, parent, name );
child->rereadMaster();
@@ -218,8 +218,8 @@ void KasBar::setTransparent( bool enable )
kdDebug(1345) << "KasBar: Enabling transparency" << endl;
rootPix = new KRootPixmap( this );
- connect( rootPix, SIGNAL( backgroundUpdated(const QPixmap &) ),
- this, SLOT( setBackground(const QPixmap &) ) );
+ connect( rootPix, TQT_SIGNAL( backgroundUpdated(const TQPixmap &) ),
+ this, TQT_SLOT( setBackground(const TQPixmap &) ) );
rootPix->setCustomPainting( true );
@@ -259,7 +259,7 @@ void KasBar::setTint( bool enable )
}
}
-void KasBar::setTint( double amount, QColor color )
+void KasBar::setTint( double amount, TQColor color )
{
tintAmount_ = amount;
tintColour_ = color;
@@ -273,7 +273,7 @@ void KasBar::setTint( double amount, QColor color )
}
}
-void KasBar::setTintColor( const QColor &c )
+void KasBar::setTintColor( const TQColor &c )
{
setTint( tintAmount_, c );
}
@@ -303,7 +303,7 @@ void KasBar::setBoxesPerLine( int count )
updateLayout();
}
-void KasBar::setDetachedPosition( const QPoint &pos )
+void KasBar::setDetachedPosition( const TQPoint &pos )
{
if ( detachedPos == pos )
return;
@@ -317,7 +317,7 @@ void KasBar::setDirection( Direction dir )
if ( direction_ == dir )
return;
- if ( ( dir == QBoxLayout::LeftToRight ) || ( dir == QBoxLayout::RightToLeft ) )
+ if ( ( dir == TQBoxLayout::LeftToRight ) || ( dir == TQBoxLayout::RightToLeft ) )
orient = Horizontal;
else
orient = Vertical;
@@ -333,29 +333,29 @@ void KasBar::setOrientation( Orientation o )
return;
if ( o == Horizontal )
- setDirection( QBoxLayout::LeftToRight );
+ setDirection( TQBoxLayout::LeftToRight );
else
- setDirection( QBoxLayout::TopToBottom );
+ setDirection( TQBoxLayout::TopToBottom );
}
void KasBar::toggleOrientation()
{
switch( direction_ ) {
- case QBoxLayout::LeftToRight:
- setDirection( QBoxLayout::RightToLeft );
+ case TQBoxLayout::LeftToRight:
+ setDirection( TQBoxLayout::RightToLeft );
break;
- case QBoxLayout::RightToLeft:
- setDirection( QBoxLayout::TopToBottom );
+ case TQBoxLayout::RightToLeft:
+ setDirection( TQBoxLayout::TopToBottom );
break;
- case QBoxLayout::TopToBottom:
- setDirection( QBoxLayout::BottomToTop );
+ case TQBoxLayout::TopToBottom:
+ setDirection( TQBoxLayout::BottomToTop );
break;
- case QBoxLayout::BottomToTop:
- setDirection( QBoxLayout::LeftToRight );
+ case TQBoxLayout::BottomToTop:
+ setDirection( TQBoxLayout::LeftToRight );
break;
default:
kdWarning() << "toggleOrientation got an odd direction: " << (uint) direction_ << endl;
- setDirection( QBoxLayout::LeftToRight );
+ setDirection( TQBoxLayout::LeftToRight );
break;
}
}
@@ -375,7 +375,7 @@ void KasBar::setDetached( bool detach )
emit detachedChanged( detached );
}
-QSize KasBar::sizeHint( Orientation o, QSize sz )
+TQSize KasBar::sizeHint( Orientation o, TQSize sz )
{
if ( o == Horizontal )
setBoxesPerLine( sz.width() / itemExtent() );
@@ -395,7 +395,7 @@ QSize KasBar::sizeHint( Orientation o, QSize sz )
if( r*c < items.count() ) // remainders
++r;
- QSize s;
+ TQSize s;
if( o == Horizontal ) {
s.setWidth( c*itemExtent() );
s.setHeight( r*itemExtent() );
@@ -433,11 +433,11 @@ void KasBar::updateLayout()
if( r*c < items.count() ) // remainders
++r;
- QSize sz;
+ TQSize sz;
if ( orient == Horizontal )
- sz = QSize( c * itemExtent(), r * itemExtent() );
+ sz = TQSize( c * itemExtent(), r * itemExtent() );
else
- sz = QSize( r * itemExtent(), c * itemExtent() );
+ sz = TQSize( r * itemExtent(), c * itemExtent() );
if ( sz != size() ) {
resize( sz );
@@ -445,32 +445,32 @@ void KasBar::updateLayout()
setUpdatesEnabled( updates );
- QWidget *top = topLevelWidget();
- QRegion mask;
+ TQWidget *top = topLevelWidget();
+ TQRegion mask;
KasItem *i;
if ( orient == Horizontal ) {
for ( i = items.first(); i; i = items.next() ) {
int x = (items.at() % c) * itemExtent();
- if ( direction_ == QBoxLayout::RightToLeft )
+ if ( direction_ == TQBoxLayout::RightToLeft )
x = width() - x - itemExtent();
i->setPos( x, (items.at() / c) * itemExtent() );
i->update();
- mask = mask.unite( QRegion( QRect( i->pos(), QSize(itemExtent(),itemExtent()) ) ) );
+ mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) );
}
}
else {
for ( i = items.first(); i; i = items.next() ) {
int y = (items.at() / r) * itemExtent();
- if ( direction_ == QBoxLayout::BottomToTop )
+ if ( direction_ == TQBoxLayout::BottomToTop )
y = height() - y - itemExtent();
i->setPos( (items.at() % r) * itemExtent(), y );
i->update();
- mask = mask.unite( QRegion( QRect( i->pos(), QSize(itemExtent(),itemExtent()) ) ) );
+ mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) );
}
}
@@ -526,7 +526,7 @@ void KasBar::clear()
updateLayout();
}
-void KasBar::mousePressEvent(QMouseEvent *ev)
+void KasBar::mousePressEvent(TQMouseEvent *ev)
{
KasItem *i = itemAt( ev->pos() );
if ( i )
@@ -535,7 +535,7 @@ void KasBar::mousePressEvent(QMouseEvent *ev)
pressPos = ev->globalPos();
}
-void KasBar::mouseReleaseEvent(QMouseEvent *ev)
+void KasBar::mouseReleaseEvent(TQMouseEvent *ev)
{
if ( !inDrag ) {
KasItem *i = itemAt( ev->pos() );
@@ -547,16 +547,16 @@ void KasBar::mouseReleaseEvent(QMouseEvent *ev)
emit configChanged();
}
- pressPos = QPoint();
+ pressPos = TQPoint();
inDrag = false;
}
void KasBar::updateMouseOver()
{
- updateMouseOver( mapFromGlobal( QCursor::pos() ) );
+ updateMouseOver( mapFromGlobal( TQCursor::pos() ) );
}
-void KasBar::updateMouseOver( QPoint pos )
+void KasBar::updateMouseOver( TQPoint pos )
{
KasItem *i = itemAt(pos);
@@ -573,10 +573,10 @@ void KasBar::updateMouseOver( QPoint pos )
itemUnderMouse_ = i;
}
-void KasBar::mouseMoveEvent(QMouseEvent *ev)
+void KasBar::mouseMoveEvent(TQMouseEvent *ev)
{
if ( detached && (!pressPos.isNull()) ) {
- QPoint moved = ev->globalPos() - pressPos;
+ TQPoint moved = ev->globalPos() - pressPos;
if ( !inDrag ) {
if ( moved.manhattanLength() > 6 ) {
@@ -598,7 +598,7 @@ void KasBar::mouseMoveEvent(QMouseEvent *ev)
}
}
-void KasBar::dragMoveEvent ( QDragMoveEvent *ev )
+void KasBar::dragMoveEvent ( TQDragMoveEvent *ev )
{
KasItem *i = itemAt( ev->pos() );
if ( itemUnderMouse_ != i ) {
@@ -610,23 +610,23 @@ void KasBar::dragMoveEvent ( QDragMoveEvent *ev )
}
}
-void KasBar::paintEvent(QPaintEvent *ev)
+void KasBar::paintEvent(TQPaintEvent *ev)
{
- QPainter q( this );
+ TQPainter q( this );
q.drawPixmap( ev->rect().topLeft(), offscreen, ev->rect() );
}
-void KasBar::resizeEvent(QResizeEvent *ev)
+void KasBar::resizeEvent(TQResizeEvent *ev)
{
offscreen.resize( ev->size() );
- QPainter p( &offscreen );
- paintBackground( &p, QRect(QPoint(0,0),size()) );
- QWidget::resizeEvent(ev);
+ TQPainter p( &offscreen );
+ paintBackground( &p, TQRect(TQPoint(0,0),size()) );
+ TQWidget::resizeEvent(ev);
emit layoutChanged();
}
-QPoint KasBar::itemPos( KasItem *i )
+TQPoint KasBar::itemPos( KasItem *i )
{
return i->pos();
}
@@ -638,12 +638,12 @@ void KasBar::updateItem( KasItem *i )
if ( !isShown() )
return;
- QPainter p( &offscreen );
- QPoint pos = i->pos();
+ TQPainter p( &offscreen );
+ TQPoint pos = i->pos();
- paintBackground( &p, QRect( pos, QSize( itemExtent(), itemExtent() ) ) );
+ paintBackground( &p, TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) );
i->paint( &p, pos.x(), pos.y() );
- update( QRect( pos, QSize( itemExtent(), itemExtent() ) ) );
+ update( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) );
}
void KasBar::repaintItem(KasItem *i, bool erase )
@@ -653,22 +653,22 @@ void KasBar::repaintItem(KasItem *i, bool erase )
if ( !isShown() )
return;
- QPainter p( &offscreen );
- QPoint pos = i->pos();
+ TQPainter p( &offscreen );
+ TQPoint pos = i->pos();
- paintBackground( &p, QRect( pos, QSize( itemExtent(), itemExtent() ) ) );
+ paintBackground( &p, TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) );
i->paint( &p, pos.x(), pos.y() );
- repaint( QRect( pos, QSize( itemExtent(), itemExtent() ) ), transparent_ || erase );
+ repaint( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ), transparent_ || erase );
}
-KasItem* KasBar::itemAt(const QPoint &p)
+KasItem* KasBar::itemAt(const TQPoint &p)
{
KasItem *i;
- QRect cr;
+ TQRect cr;
for (i = items.first(); i; i = items.next()) {
cr.setTopLeft( i->pos() );
- cr.setSize( QSize( itemExtent(), itemExtent() ) );
+ cr.setSize( TQSize( itemExtent(), itemExtent() ) );
if(cr.contains(p))
return i;
@@ -677,12 +677,12 @@ KasItem* KasBar::itemAt(const QPoint &p)
return 0;
}
-void KasBar::setBackground( const QPixmap &newBg )
+void KasBar::setBackground( const TQPixmap &newBg )
{
bg = newBg;
- QPainter p( &offscreen );
- paintBackground( &p, QRect(QPoint(0,0),size()) );
+ TQPainter p( &offscreen );
+ paintBackground( &p, TQRect(TQPoint(0,0),size()) );
updateLayout();
}
@@ -701,7 +701,7 @@ void KasBar::setPaintInactiveFrames( bool enable )
update();
}
-void KasBar::paintBackground( QPainter *p, const QRect &r )
+void KasBar::paintBackground( TQPainter *p, const TQRect &r )
{
// If we're transparent
if ( transparent_ ) {
@@ -719,8 +719,8 @@ void KasBar::addTestItems()
i->setText( "Animated" );
i->setIcon( KGlobal::iconLoader()->loadIcon( "icons", KIcon::NoGroup, KIcon::SizeMedium ) );
i->setAnimation( resources()->startupAnimation() );
- QTimer *aniTimer = new QTimer( i );
- connect( aniTimer, SIGNAL( timeout() ), i, SLOT( advanceAnimation() ) );
+ TQTimer *aniTimer = new TQTimer( i );
+ connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) );
aniTimer->start( 100 );
i->setShowAnimation( true );
diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h
index 297291d4f..8ff745475 100644
--- a/kicker/extensions/kasbar/kasbar.h
+++ b/kicker/extensions/kasbar/kasbar.h
@@ -59,10 +59,10 @@
#ifndef __KASBAR_H
#define __KASBAR_H
-#include <qwidget.h>
-#include <qpoint.h>
-#include <qptrlist.h>
-#include <qlayout.h>
+#include <tqwidget.h>
+#include <tqpoint.h>
+#include <tqptrlist.h>
+#include <tqlayout.h>
#include "kasresources.h"
@@ -71,7 +71,7 @@ class KRootPixmap;
class KasItem;
class KasResources;
-typedef QPtrList<KasItem> KasItemList;
+typedef TQPtrList<KasItem> KasItemList;
/**
@@ -89,13 +89,13 @@ class KDE_EXPORT KasBar : public QWidget
friend class KasItem;
public:
- KasBar( Orientation o, QWidget *parent=0, const char *name=0, WFlags f=0 );
+ KasBar( Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 );
KasBar( Orientation o, KasBar *master,
- QWidget* parent=0, const char* name=0, WFlags f=0 );
+ TQWidget* parent=0, const char* name=0, WFlags f=0 );
virtual ~KasBar();
- typedef QBoxLayout::Direction Direction;
+ typedef TQBoxLayout::Direction Direction;
/** Returns true iff this is a top-level bar. This is unrelated to it being a top-level widget. */
bool isTopLevel() const { return !master_; }
@@ -104,7 +104,7 @@ public:
KasBar *master() const { return master_; }
/** Creates a child bar of the kasbar. The child will inherit the appearance options. */
- virtual KasBar *createChildBar( Orientation o, QWidget *parent, const char *name=0 );
+ virtual KasBar *createChildBar( Orientation o, TQWidget *parent, const char *name=0 );
/** Factory method that returns the singleton resources object. */
virtual KasResources *resources();
@@ -148,11 +148,11 @@ public:
Direction direction() const { return direction_; }
bool isDetached() const { return detached; }
- QPoint detachedPosition() const { return detachedPos; }
+ TQPoint detachedPosition() const { return detachedPos; }
bool isDrag() const { return inDrag; }
- QSize sizeHint( Orientation, QSize max );
+ TQSize sizeHint( Orientation, TQSize max );
//
// Look and feel options
@@ -167,7 +167,7 @@ public:
bool hasTint() const { return enableTint_; }
/** Sets the amount and color of the tint. */
- void setTint( double amount, QColor color );
+ void setTint( double amount, TQColor color );
/** Sets the amount of tinting. */
void setTintAmount( double amount ) { setTint( amount, tintColour_ ); }
@@ -176,7 +176,7 @@ public:
double tintAmount() const { return tintAmount_; }
/** Get the color of the tint. */
- QColor tintColor() const { return tintColour_; }
+ TQColor tintColor() const { return tintColour_; }
/** Returns true iff we will paint frames around inactive items. */
bool paintInactiveFrames() const { return paintInactiveFrame_; }
@@ -191,10 +191,10 @@ public:
void repaintItem(KasItem *i, bool erase = true );
/** Returns the item at p or 0. */
- KasItem* itemAt(const QPoint &p);
+ KasItem* itemAt(const TQPoint &p);
/** Get the position of the specified item. */
- QPoint itemPos( KasItem *i );
+ TQPoint itemPos( KasItem *i );
/** The item under the mouse pointer (or 0). */
KasItem *itemUnderMouse() const { return itemUnderMouse_; }
@@ -208,12 +208,12 @@ public slots:
void setItemSize( int size );
void setItemExtent( int size );
- void setDetachedPosition( const QPoint &pos );
+ void setDetachedPosition( const TQPoint &pos );
virtual void updateLayout();
void updateMouseOver();
- void updateMouseOver( QPoint pos );
+ void updateMouseOver( TQPoint pos );
/** Enable or disable tinting. */
void setTint( bool enable );
@@ -222,12 +222,12 @@ public slots:
void setTransparent( bool enable );
/** Set the color of the tint. */
- void setTintColor( const QColor &c );
+ void setTintColor( const TQColor &c );
/** Set the strength of the tint (as a percentage). */
void setTintAmount( int percent );
- void setBackground( const QPixmap &pix );
+ void setBackground( const TQPixmap &pix );
void setMasked( bool mask );
@@ -245,7 +245,7 @@ public slots:
signals:
void detachedChanged( bool );
- void detachedPositionChanged( const QPoint & );
+ void detachedPositionChanged( const TQPoint & );
void dragStarted();
void directionChanged();
@@ -262,42 +262,42 @@ protected:
KRootPixmap *rootPixmap() const { return rootPix; }
/** Displays the popup menus, hides/shows windows. */
- void mousePressEvent(QMouseEvent *ev);
+ void mousePressEvent(TQMouseEvent *ev);
/** Displays the popup menus, hides/shows windows. */
- void mouseReleaseEvent(QMouseEvent *ev);
+ void mouseReleaseEvent(TQMouseEvent *ev);
/** Overridden to implement the mouse-over highlight effect. */
- void mouseMoveEvent(QMouseEvent *ev);
+ void mouseMoveEvent(TQMouseEvent *ev);
/** Overridden to implement the drag-over task switching. */
- void dragMoveEvent(QDragMoveEvent *ev);
+ void dragMoveEvent(TQDragMoveEvent *ev);
/** Paints the background of the item to the painter. */
- void paintBackground( QPainter *p, const QRect &r );
+ void paintBackground( TQPainter *p, const TQRect &r );
/** Calls the paint methods for the items in the rectangle specified by the event. */
- void paintEvent(QPaintEvent *ev);
+ void paintEvent(TQPaintEvent *ev);
/** Forces the widget to re-layout it's contents. */
- void resizeEvent(QResizeEvent *ev);
+ void resizeEvent(TQResizeEvent *ev);
private:
// Core data
- QPixmap offscreen;
+ TQPixmap offscreen;
KasBar *master_;
KasItemList items;
Orientation orient;
Direction direction_;
KasItem *itemUnderMouse_;
uint boxesPerLine_;
- QPoint pressPos;
+ TQPoint pressPos;
bool inDrag;
bool detached;
int maxBoxes_;
int itemSize_;
int itemExtent_;
- QPoint detachedPos;
+ TQPoint detachedPos;
bool paintInactiveFrame_;
// Implements pseudo-transparency
@@ -306,7 +306,7 @@ private:
KRootPixmap *rootPix;
bool enableTint_;
double tintAmount_;
- QColor tintColour_;
+ TQColor tintColour_;
bool useMask_;
// Look and feel resources
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index 6c006af16..ffd1b766e 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -104,7 +104,7 @@ int main( int argc, char **argv )
kastasker->readConfig();
kastasker->move( kastasker->detachedPosition() );
- kastasker->connect( kastasker->resources(), SIGNAL(changed()), SLOT(readConfig()) );
+ kastasker->connect( kastasker->resources(), TQT_SIGNAL(changed()), TQT_SLOT(readConfig()) );
kastasker->refreshAll();
}
@@ -118,7 +118,7 @@ int main( int argc, char **argv )
KApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
- app.connect( &app, SIGNAL( lastWindowClosed() ), SLOT(quit()) );
+ app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) );
return app.exec();
}
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index 9b1e2435e..3bc3dcd1b 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -51,7 +51,7 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-#include <qlayout.h>
+#include <tqlayout.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -74,7 +74,7 @@
extern "C"
{
- KDE_EXPORT KPanelExtension *init( QWidget *parent, const QString& configFile )
+ KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile )
{
KGlobal::locale()->insertCatalogue("kasbarextension");
return new KasBarExtension( configFile,
@@ -84,10 +84,10 @@ extern "C"
}
}
-KasBarExtension::KasBarExtension( const QString& configFile,
+KasBarExtension::KasBarExtension( const TQString& configFile,
Type type,
int actions,
- QWidget *parent, const char *name )
+ TQWidget *parent, const char *name )
: KPanelExtension( configFile, type, actions, parent, name ),
detached_( false )
{
@@ -97,8 +97,8 @@ KasBarExtension::KasBarExtension( const QString& configFile,
// setBackgroundMode( NoBackground );
kasbar = new KasTasker( orientation(), this, name );
- connect( kasbar, SIGNAL( layoutChanged() ), this, SIGNAL( updateLayout() ) );
- connect( kasbar, SIGNAL( detachedChanged(bool) ), this, SLOT( setDetached(bool) ) );
+ connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) );
+ connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) );
kasbar->setConfig( config() );
kasbar->readConfig();
@@ -127,7 +127,7 @@ void KasBarExtension::setDetached( bool detach )
resize( detachedSize() );
}
else {
- kasbar->reparent( this, QPoint(0,0), true );
+ kasbar->reparent( this, TQPoint(0,0), true );
kasbar->setOrientation( orientation() );
updateGeometry();
@@ -137,23 +137,23 @@ void KasBarExtension::setDetached( bool detach )
emit updateLayout();
}
-void KasBarExtension::showEvent( QShowEvent */*se*/ )
+void KasBarExtension::showEvent( TQShowEvent */*se*/ )
{
updateGeometry();
resize( kasbar->size() );
repaint( true );
}
-QSize KasBarExtension::detachedSize()
+TQSize KasBarExtension::detachedSize()
{
if ( orientation() == Vertical )
- return QSize( kasbar->itemExtent()/2, 0 );
+ return TQSize( kasbar->itemExtent()/2, 0 );
else
- return QSize( 0, kasbar->itemExtent()/2 );
+ return TQSize( 0, kasbar->itemExtent()/2 );
}
-QSize KasBarExtension::sizeHint(Position p, QSize maxSize ) const
+TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const
{
Orientation o = Horizontal;
@@ -162,9 +162,9 @@ QSize KasBarExtension::sizeHint(Position p, QSize maxSize ) const
if ( detached_ ) {
if ( o == Vertical )
- return QSize( kasbar->itemExtent()/2, 0 );
+ return TQSize( kasbar->itemExtent()/2, 0 );
else
- return QSize( 0, kasbar->itemExtent()/2 );
+ return TQSize( 0, kasbar->itemExtent()/2 );
}
return kasbar->sizeHint( o, maxSize );
diff --git a/kicker/extensions/kasbar/kasbarextension.h b/kicker/extensions/kasbar/kasbarextension.h
index e85750d40..7fbb4fbc6 100644
--- a/kicker/extensions/kasbar/kasbarextension.h
+++ b/kicker/extensions/kasbar/kasbarextension.h
@@ -56,7 +56,7 @@
#ifndef KASBAREXTENSION_H
#define KASBAREXTENSION_H
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
#include <kpanelextension.h>
class KasTasker;
@@ -69,31 +69,31 @@ class KasBarExtension : public KPanelExtension
Q_OBJECT
public:
- KasBarExtension( const QString& configFile,
+ KasBarExtension( const TQString& configFile,
Type t = Normal,
int actions = 0,
- QWidget *parent = 0, const char *name = 0 );
+ TQWidget *parent = 0, const char *name = 0 );
virtual ~KasBarExtension();
- QSize sizeHint( Position, QSize maxSize ) const;
+ TQSize sizeHint( Position, TQSize maxSize ) const;
Position preferedPosition() const { return Right; }
virtual void positionChange( Position position );
bool isDetached() const { return detached_; }
- QSize detachedSize();
+ TQSize detachedSize();
public slots:
void setDetached( bool detach );
protected:
- void showEvent( QShowEvent *se );
+ void showEvent( TQShowEvent *se );
virtual void about();
virtual void preferences();
private:
- QGuardedPtr<KasTasker> kasbar;
+ TQGuardedPtr<KasTasker> kasbar;
bool detached_;
};
diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp
index 0292a93cb..386a7922d 100644
--- a/kicker/extensions/kasbar/kasclockitem.cpp
+++ b/kicker/extensions/kasbar/kasclockitem.cpp
@@ -1,9 +1,9 @@
-#include <qpainter.h>
-#include <qbitmap.h>
-#include <qdatetime.h>
-#include <qdrawutil.h>
-#include <qlcdnumber.h>
-#include <qtimer.h>
+#include <tqpainter.h>
+#include <tqbitmap.h>
+#include <tqdatetime.h>
+#include <tqdrawutil.h>
+#include <tqlcdnumber.h>
+#include <tqtimer.h>
#include <kdatepicker.h>
#include <kglobal.h>
@@ -26,11 +26,11 @@
class LCD : public QLCDNumber
{
public:
- LCD( QWidget *parent, const char *name=0 )
- : QLCDNumber(parent,name) {}
+ LCD( TQWidget *parent, const char *name=0 )
+ : TQLCDNumber(parent,name) {}
~LCD() {}
- void draw( QPainter *p ) { drawContents(p); }
+ void draw( TQPainter *p ) { drawContents(p); }
};
KasClockItem::KasClockItem( KasBar *parent )
@@ -38,23 +38,23 @@ KasClockItem::KasClockItem( KasBar *parent )
{
setCustomPopup( true );
- QTimer *t = new QTimer( this );
- connect( t, SIGNAL( timeout() ), SLOT( updateTime() ) );
+ TQTimer *t = new TQTimer( this );
+ connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateTime() ) );
t->start( 1000 );
lcd = new LCD( parent );
lcd->hide();
- lcd->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
+ lcd->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
lcd->setBackgroundMode( NoBackground );
- lcd->setFrameStyle( QFrame::NoFrame );
- lcd->setSegmentStyle( QLCDNumber::Flat );
+ lcd->setFrameStyle( TQFrame::NoFrame );
+ lcd->setSegmentStyle( TQLCDNumber::Flat );
lcd->setNumDigits( 5 );
lcd->setAutoMask( true );
updateTime();
- connect( this, SIGNAL(leftButtonClicked(QMouseEvent *)), SLOT(togglePopup()) );
- connect( this, SIGNAL(rightButtonClicked(QMouseEvent *)), SLOT(showMenuAt(QMouseEvent *) ) );
+ connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) );
+ connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) );
}
KasClockItem::~KasClockItem()
@@ -75,17 +75,17 @@ KasPopup *KasClockItem::createPopup()
void KasClockItem::updateTime()
{
- setText( KGlobal::locale()->formatDate( QDate::currentDate(), true /* shortFormat */ ) );
- lcd->display( KGlobal::locale()->formatTime( QTime::currentTime(), false /* includeSecs */, false /* isDuration */) );
+ setText( KGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) );
+ lcd->display( KGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) );
update();
}
-void KasClockItem::paint( QPainter *p )
+void KasClockItem::paint( TQPainter *p )
{
KasItem::paint( p );
- lcd->setGeometry( QRect( 0, 0, extent(), extent()-15 ) );
+ lcd->setGeometry( TQRect( 0, 0, extent(), extent()-15 ) );
p->save();
p->translate( 3, 15 );
@@ -100,13 +100,13 @@ void KasClockItem::paint( QPainter *p )
p->restore();
}
-void KasClockItem::showMenuAt( QMouseEvent *ev )
+void KasClockItem::showMenuAt( TQMouseEvent *ev )
{
hidePopup();
showMenuAt( ev->globalPos() );
}
-void KasClockItem::showMenuAt( QPoint p )
+void KasClockItem::showMenuAt( TQPoint p )
{
mouseLeave();
kasbar()->updateMouseOver();
diff --git a/kicker/extensions/kasbar/kasclockitem.h b/kicker/extensions/kasbar/kasclockitem.h
index 380901765..a95ebac7b 100644
--- a/kicker/extensions/kasbar/kasclockitem.h
+++ b/kicker/extensions/kasbar/kasclockitem.h
@@ -17,13 +17,13 @@ public:
KasClockItem( KasBar *parent );
virtual ~KasClockItem();
- void paint( QPainter *p );
+ void paint( TQPainter *p );
public slots:
void updateTime();
- void showMenuAt( QMouseEvent *ev );
- void showMenuAt( QPoint p );
+ void showMenuAt( TQMouseEvent *ev );
+ void showMenuAt( TQPoint p );
protected:
/** Reimplemented from KasItem to create a date picker. */
diff --git a/kicker/extensions/kasbar/kasgrouper.cpp b/kicker/extensions/kasbar/kasgrouper.cpp
index 44dcc57b5..c1f000947 100644
--- a/kicker/extensions/kasbar/kasgrouper.cpp
+++ b/kicker/extensions/kasbar/kasgrouper.cpp
@@ -116,7 +116,7 @@ KasItem *KasGrouper::maybeAddToGroup( Task::Ptr t )
{
KasItem *item = 0;
- QString taskClass = t->className().lower();
+ TQString taskClass = t->className().lower();
for ( uint i = 0; (!item) && (i < kasbar->itemCount()); i++ ) {
KasItem *ei = kasbar->itemAt( i );
@@ -125,8 +125,8 @@ KasItem *KasGrouper::maybeAddToGroup( Task::Ptr t )
KasTaskItem *eti = static_cast<KasTaskItem *> (ei);
- // NB This calls Task::className() not QObject::className()
- QString currClass = eti->task()->className().lower();
+ // NB This calls Task::className() not TQObject::className()
+ TQString currClass = eti->task()->className().lower();
if ( Task::idMatch( currClass, taskClass ) ) {
KasGroupItem *egi = kasbar->convertToGroup( eti->task() );
@@ -140,8 +140,8 @@ KasItem *KasGrouper::maybeAddToGroup( Task::Ptr t )
for ( int i = 0; i < egi->taskCount(); i++ ) {
- // NB This calls Task::className() not QObject::className()
- QString currClass = egi->task( i )->className().lower();
+ // NB This calls Task::className() not TQObject::className()
+ TQString currClass = egi->task( i )->className().lower();
if ( Task::idMatch( currClass, taskClass ) ) {
egi->addTask( t );
diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp
index a4435f7c2..6e03e8e3c 100644
--- a/kicker/extensions/kasbar/kasgroupitem.cpp
+++ b/kicker/extensions/kasbar/kasgroupitem.cpp
@@ -51,10 +51,10 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-#include <qpainter.h>
-#include <qbitmap.h>
-#include <qtimer.h>
-#include <qwmatrix.h>
+#include <tqpainter.h>
+#include <tqbitmap.h>
+#include <tqtimer.h>
+#include <tqwmatrix.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -83,10 +83,10 @@ KasGroupItem::KasGroupItem( KasTasker *parent )
setGroupItem( true );
setText( i18n("Group") );
- connect( parent, SIGNAL( layoutChanged() ), this, SLOT( hidePopup() ) );
- connect( parent, SIGNAL( layoutChanged() ), this, SLOT( update() ) );
- connect( this, SIGNAL(leftButtonClicked(QMouseEvent *)), SLOT(togglePopup()) );
- connect( this, SIGNAL(rightButtonClicked(QMouseEvent *)), SLOT(showGroupMenuAt(QMouseEvent *) ) );
+ connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) );
+ connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) );
+ connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) );
+ connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) );
}
KasGroupItem::~KasGroupItem()
@@ -109,7 +109,7 @@ void KasGroupItem::addTask( Task::Ptr t )
updateIcon();
}
- connect( t, SIGNAL( changed(bool) ), this, SLOT( update() ) );
+ connect( t, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( update() ) );
update();
}
@@ -140,7 +140,7 @@ void KasGroupItem::removeTask( Task::Ptr t )
void KasGroupItem::updateIcon()
{
- QPixmap p;
+ TQPixmap p;
bool usedIconLoader = false;
Task::Ptr t = items.first();
if (!t)
@@ -162,7 +162,7 @@ void KasGroupItem::updateIcon()
setIcon( p );
}
-void KasGroupItem::paint( QPainter *p )
+void KasGroupItem::paint( TQPainter *p )
{
KasItem::paint( p );
@@ -180,7 +180,7 @@ void KasGroupItem::paint( QPainter *p )
p->setPen( isShowingPopup() ? res->activePenColor() : res->inactivePenColor() );
if ( modCount ) {
- QString modCountStr;
+ TQString modCountStr;
modCountStr.setNum( modCount );
p->drawText( extent()-fontMetrics().width( modCountStr )-3,
15+fontMetrics().ascent(),
@@ -226,7 +226,7 @@ void KasGroupItem::paint( QPainter *p )
}
if ( ((int) items.count() > microsPerCol) && ( kasbar()->itemSize() != KasBar::Small ) ) {
- QString countStr;
+ TQString countStr;
countStr.setNum( items.count() );
p->drawText( extent()-fontMetrics().width( countStr )-3,
extent()+fontMetrics().ascent()-16,
@@ -257,7 +257,7 @@ KasPopup *KasGroupItem::createPopup()
KasPopup *pop = new KasPopup( this );
bar = kasbar()->createChildBar( ( kasbar()->orientation() == Horizontal ) ? Vertical : Horizontal, pop );
- connect( pop, SIGNAL(shown()), SLOT(updatePopup()) );
+ connect( pop, TQT_SIGNAL(shown()), TQT_SLOT(updatePopup()) );
return pop;
@@ -283,15 +283,15 @@ void KasGroupItem::ungroup()
kasbar()->moveToMain( this );
}
-void KasGroupItem::showGroupMenuAt( QMouseEvent *ev )
+void KasGroupItem::showGroupMenuAt( TQMouseEvent *ev )
{
showGroupMenuAt( ev->globalPos() );
}
-void KasGroupItem::showGroupMenuAt( const QPoint &p )
+void KasGroupItem::showGroupMenuAt( const TQPoint &p )
{
TaskRMBMenu *tm = new TaskRMBMenu(items, true, kasbar());
- tm->insertItem( i18n("&Ungroup" ), this, SLOT( ungroup() ) );
+ tm->insertItem( i18n("&Ungroup" ), this, TQT_SLOT( ungroup() ) );
tm->insertSeparator();
tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() );
diff --git a/kicker/extensions/kasbar/kasgroupitem.h b/kicker/extensions/kasbar/kasgroupitem.h
index 348fb2839..e30260f57 100644
--- a/kicker/extensions/kasbar/kasgroupitem.h
+++ b/kicker/extensions/kasbar/kasgroupitem.h
@@ -59,7 +59,7 @@
#ifndef KASGROUPITEM_H
#define KASGROUPITEM_H
-#include <qpixmap.h>
+#include <tqpixmap.h>
#include <taskmanager.h>
#include "kasitem.h"
@@ -87,14 +87,14 @@ public:
void setGroupType( uint type ) { groupType_ = type; }
/** Reimplemented to paint the item. */
- virtual void paint( QPainter *p );
+ virtual void paint( TQPainter *p );
KasTasker *kasbar() const;
Task::Ptr task( uint i ) { return items.at( i ); }
int taskCount() const { return items.count(); }
- QPixmap icon();
+ TQPixmap icon();
public slots:
void addTask( Task::Ptr t );
@@ -102,8 +102,8 @@ public slots:
void ungroup();
- void showGroupMenuAt( QMouseEvent *ev );
- void showGroupMenuAt( const QPoint &p );
+ void showGroupMenuAt( TQMouseEvent *ev );
+ void showGroupMenuAt( const TQPoint &p );
void updateIcon();
@@ -114,7 +114,7 @@ protected:
virtual KasPopup *createPopup();
private:
- QString title_;
+ TQString title_;
Task::List items;
uint groupType_;
KasTasker *bar;
diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp
index 5cd8ef7f0..8fd795363 100644
--- a/kicker/extensions/kasbar/kasitem.cpp
+++ b/kicker/extensions/kasbar/kasitem.cpp
@@ -51,11 +51,11 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-#include <qcursor.h>
-#include <qpainter.h>
-#include <qdrawutil.h>
-#include <qregexp.h>
-#include <qtimer.h>
+#include <tqcursor.h>
+#include <tqpainter.h>
+#include <tqdrawutil.h>
+#include <tqregexp.h>
+#include <tqtimer.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -86,7 +86,7 @@ static const char *tiny_arrow[]={
static const int KASITEM_CHECK_POPUP_DELAY = 500;
KasItem::KasItem( KasBar *parent )
- : QObject( parent ),
+ : TQObject( parent ),
kas( parent ), popupTimer( 0 ), dragTimer( 0 ),
title( i18n( "Kasbar" ) ),
mouseOver( false ), activated( false ),
@@ -94,8 +94,8 @@ KasItem::KasItem( KasBar *parent )
frame(true), modified(false), attention_(false), prog( -1 ),
anim(), aniFrame( 0 ), drawAnim( false )
{
- connect( parent, SIGNAL( dragStarted() ), SLOT( hidePopup() ) );
- connect( this, SIGNAL( middleButtonClicked(QMouseEvent *) ), parent, SLOT( toggleOrientation() ) );
+ connect( parent, TQT_SIGNAL( dragStarted() ), TQT_SLOT( hidePopup() ) );
+ connect( this, TQT_SIGNAL( middleButtonClicked(TQMouseEvent *) ), parent, TQT_SLOT( toggleOrientation() ) );
}
KasItem::~KasItem()
@@ -112,7 +112,7 @@ void KasItem::setActive( bool yesno )
update();
}
-void KasItem::setText( const QString &text )
+void KasItem::setText( const TQString &text )
{
if ( title == text )
return;
@@ -121,7 +121,7 @@ void KasItem::setText( const QString &text )
update();
}
-void KasItem::setIcon( const QPixmap &p )
+void KasItem::setIcon( const TQPixmap &p )
{
pix = p;
update();
@@ -168,8 +168,8 @@ void KasItem::mouseEnter()
static const int POPUP_DELAY = 300;
if ( (!customPopup) && (popupTimer == 0) ) {
- popupTimer = new QTimer( this, "popupTimer" );
- connect( popupTimer, SIGNAL( timeout() ), SLOT( showPopup() ) );
+ popupTimer = new TQTimer( this, "popupTimer" );
+ connect( popupTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( showPopup() ) );
popupTimer->start( POPUP_DELAY, true );
}
@@ -177,7 +177,7 @@ void KasItem::mouseEnter()
update();
}
-void KasItem::mouseReleaseEvent( QMouseEvent *ev )
+void KasItem::mouseReleaseEvent( TQMouseEvent *ev )
{
if ( ev->button() == LeftButton )
emit leftButtonClicked( ev );
@@ -195,7 +195,7 @@ void KasItem::checkPopup()
if ( !pop->isVisible() )
return;
- QWidget *w = QApplication::widgetAt( QCursor::pos() );
+ TQWidget *w = TQApplication::widgetAt( TQCursor::pos() );
if ( !w ) {
if ( popupTimer ) {
delete popupTimer;
@@ -205,7 +205,7 @@ void KasItem::checkPopup()
hidePopup();
}
else {
- QTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, SLOT( checkPopup() ) );
+ TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) );
}
}
@@ -214,8 +214,8 @@ void KasItem::dragEnter()
static const int DRAG_SWITCH_DELAY = 1000;
if ( dragTimer == 0 ) {
- dragTimer = new QTimer( this, "dragTimer" );
- connect( dragTimer, SIGNAL( timeout() ), SLOT( dragOverAction() ) );
+ dragTimer = new TQTimer( this, "dragTimer" );
+ connect( dragTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( dragOverAction() ) );
dragTimer->start( DRAG_SWITCH_DELAY, true );
}
@@ -268,7 +268,7 @@ void KasItem::showPopup()
pop->show();
update();
- QTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, SLOT( checkPopup() ) );
+ TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) );
}
void KasItem::hidePopup()
@@ -296,23 +296,23 @@ void KasItem::setPopup( KasPopup *popup )
pop = popup;
}
-void KasItem::paintFrame( QPainter *p )
+void KasItem::paintFrame( TQPainter *p )
{
if ( !frame )
return;
qDrawShadePanel(p, 0, 0, extent(), extent(), colorGroup(), false, 2);
- QPen pen;
+ TQPen pen;
if ( mouseOver ) {
if ( attention_ ) {
- pen = QPen( resources()->attentionColor(), 2 );
+ pen = TQPen( resources()->attentionColor(), 2 );
p->setPen( pen );
p->drawRect( 0, 0, extent(), extent());
}
else {
- pen = QPen( Qt::white );
+ pen = TQPen( Qt::white );
p->setPen( pen );
p->drawRect(0, 0, extent(), extent());
}
@@ -323,15 +323,15 @@ void KasItem::paintFrame( QPainter *p )
}
}
-void KasItem::paintLabel( QPainter *p )
+void KasItem::paintLabel( TQPainter *p )
{
- QString text = title;
+ TQString text = title;
if ( !groupItem ) {
- p->fillRect( 2, 2, extent()-4, 13, QBrush( resources()->labelBgColor() ) );
+ p->fillRect( 2, 2, extent()-4, 13, TQBrush( resources()->labelBgColor() ) );
if ( isProgressItem() ) {
- QRegExp reg( "(1?[0-9]?[0-9])%" );
+ TQRegExp reg( "(1?[0-9]?[0-9])%" );
if ( -1 != reg.search( text ) ) {
prog = reg.cap(1).toInt();
paintProgress( p, prog );
@@ -352,11 +352,11 @@ void KasItem::paintLabel( QPainter *p )
return;
}
else {
- QPixmap arrow( tiny_arrow );
+ TQPixmap arrow( tiny_arrow );
- QPoint popupPos = KasPopup::calcPosition( this, 10, 10 );
- QPoint iPos = kas->mapToGlobal( kas->itemPos( this ) );
- QWMatrix turn;
+ TQPoint popupPos = KasPopup::calcPosition( this, 10, 10 );
+ TQPoint iPos = kas->mapToGlobal( kas->itemPos( this ) );
+ TQWMatrix turn;
if ( popupPos.x() < iPos.x() ) {
paintArrowLabel( p, arrow.width(), true );
@@ -385,16 +385,16 @@ void KasItem::paintLabel( QPainter *p )
}
}
-void KasItem::paintArrowLabel( QPainter *p, int arrowSize, bool arrowOnLeft )
+void KasItem::paintArrowLabel( TQPainter *p, int arrowSize, bool arrowOnLeft )
{
- QString text = title;
+ TQString text = title;
int lx = 2;
int ly = 2;
int w = extent()-4;
int h = 13;
arrowSize+=2; // Add a space
- p->fillRect( lx, ly, w, h, QBrush( resources()->labelBgColor() ) );
+ p->fillRect( lx, ly, w, h, TQBrush( resources()->labelBgColor() ) );
// Adjust for arrow
if ( arrowOnLeft ) {
@@ -413,13 +413,13 @@ void KasItem::paintArrowLabel( QPainter *p, int arrowSize, bool arrowOnLeft )
p->drawText( lx, ly, w, h-1, AlignCenter, text );
}
-void KasItem::paintModified( QPainter *p )
+void KasItem::paintModified( TQPainter *p )
{
if ( modified )
p->drawPixmap(extent()-12, extent()-22, resources()->modifiedIcon() );
}
-void KasItem::paintBackground( QPainter *p )
+void KasItem::paintBackground( TQPainter *p )
{
if ( activated )
p->drawPixmap( 0, 0, resources()->activeBg() );
@@ -429,13 +429,13 @@ void KasItem::paintBackground( QPainter *p )
p->drawPixmap( 0, 0, resources()->inactiveBg() );
}
-void KasItem::paintProgress( QPainter *p, int percent )
+void KasItem::paintProgress( TQPainter *p, int percent )
{
double amt = (extent()-4) * (percent / 100.0L);
- p->fillRect( 2, 13, (int) amt, 2, QBrush( resources()->progressColor() ) );
+ p->fillRect( 2, 13, (int) amt, 2, TQBrush( resources()->progressColor() ) );
}
-void KasItem::paintStateIcon( QPainter *p, uint state )
+void KasItem::paintStateIcon( TQPainter *p, uint state )
{
if ( kas->itemSize() != KasBar::Small ) {
switch(state) {
@@ -469,7 +469,7 @@ void KasItem::paintStateIcon( QPainter *p, uint state )
}
}
-void KasItem::paintAttention( QPainter *p )
+void KasItem::paintAttention( TQPainter *p )
{
p->setPen( resources()->attentionColor() );
p->drawPixmap( 3, extent()-11, resources()->attentionIcon() );
@@ -500,12 +500,12 @@ void KasItem::setShowAnimation( bool yes )
update();
}
-void KasItem::paintAnimation( QPainter *p )
+void KasItem::paintAnimation( TQPainter *p )
{
if ( (aniFrame+1) > anim.count() )
return;
- QPixmap pix = anim[ aniFrame ];
+ TQPixmap pix = anim[ aniFrame ];
if ( pix.isNull() )
return;
@@ -515,7 +515,7 @@ void KasItem::paintAnimation( QPainter *p )
p->drawPixmap( extent()-18, 16, pix );
}
-void KasItem::paintIcon( QPainter *p )
+void KasItem::paintIcon( TQPainter *p )
{
if ( pix.isNull() )
return;
@@ -525,7 +525,7 @@ void KasItem::paintIcon( QPainter *p )
p->drawPixmap( x-4, y+15, pix );
}
-void KasItem::paint( QPainter *p )
+void KasItem::paint( TQPainter *p )
{
paintBackground( p );
paintFrame( p );
@@ -539,7 +539,7 @@ void KasItem::paint( QPainter *p )
paintAttention( p );
}
-void KasItem::paint( QPainter *p, int x, int y )
+void KasItem::paint( TQPainter *p, int x, int y )
{
p->save();
p->translate( x, y );
diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h
index 3555d576f..268754f75 100644
--- a/kicker/extensions/kasbar/kasitem.h
+++ b/kicker/extensions/kasbar/kasitem.h
@@ -60,10 +60,10 @@ class QPainter;
class QMouseEvent;
class KasPopup;
-#include <qobject.h>
-#include <qguardedptr.h>
-#include <qpoint.h>
-#include <qvaluevector.h>
+#include <tqobject.h>
+#include <tqguardedptr.h>
+#include <tqpoint.h>
+#include <tqvaluevector.h>
#include <kdemacros.h>
@@ -81,7 +81,7 @@ class KDE_EXPORT KasItem : public QObject
public:
friend class KasBar;
- typedef QValueVector<QPixmap> PixmapList;
+ typedef TQValueVector<TQPixmap> PixmapList;
/** The states that a window can be in. */
enum WindowState {
@@ -98,12 +98,12 @@ public:
int extent() const { return kas->itemExtent(); }
/** Returns the text that will be displayed in the title. */
- QString text() const { return title; }
+ TQString text() const { return title; }
/** Returns the position of this item. */
- QPoint pos() const { return pos_; }
- void setPos( const QPoint &p ) { pos_ = p; }
- void setPos( int x, int y ) { pos_ = QPoint( x, y ); }
+ TQPoint pos() const { return pos_; }
+ void setPos( const TQPoint &p ) { pos_ = p; }
+ void setPos( int x, int y ) { pos_ = TQPoint( x, y ); }
/** Returns the progress so far. This will -1 if the item is not displaying progress info. */
int progress() const { return prog; }
@@ -147,27 +147,27 @@ public:
// Drawing Methods
//
- /** Translates the QPainter then calls paintItem(). */
- void paint( QPainter *p, int x, int y );
+ /** Translates the TQPainter then calls paintItem(). */
+ void paint( TQPainter *p, int x, int y );
/**
* Subclasses should reimplement this method to paint themselves. The painter is setup so
* that the item is always at 0, 0.
*/
- virtual void paint( QPainter *p );
+ virtual void paint( TQPainter *p );
/** Draw a standard frame for the item. */
- void paintFrame( QPainter *p );
+ void paintFrame( TQPainter *p );
/** Paint the background. */
- void paintBackground( QPainter *p );
+ void paintBackground( TQPainter *p );
/** Draw the label for the item. */
- void paintLabel( QPainter *p );
+ void paintLabel( TQPainter *p );
- void paintIcon( QPainter *p );
+ void paintIcon( TQPainter *p );
- void paintModified( QPainter *p );
+ void paintModified( TQPainter *p );
public slots:
void repaint();
@@ -175,8 +175,8 @@ public slots:
void update();
void setActive( bool yes );
- void setText( const QString &title );
- void setIcon( const QPixmap &icon );
+ void setText( const TQString &title );
+ void setIcon( const TQPixmap &icon );
void setProgress( int percent );
void setShowFrame( bool yes );
void setModified( bool yes );
@@ -206,43 +206,43 @@ public slots:
virtual void dragOverAction() {}
signals:
- void leftButtonClicked( QMouseEvent *ev );
- void middleButtonClicked( QMouseEvent *ev );
- void rightButtonClicked( QMouseEvent *ev );
+ void leftButtonClicked( TQMouseEvent *ev );
+ void middleButtonClicked( TQMouseEvent *ev );
+ void rightButtonClicked( TQMouseEvent *ev );
protected:
KasResources *resources() { return kas->resources(); }
/** Gets the font metrics from the parent. */
- QFontMetrics fontMetrics() const { return kas->fontMetrics(); }
+ TQFontMetrics fontMetrics() const { return kas->fontMetrics(); }
/** Gets the color group from the parent. */
- const QColorGroup &colorGroup() const { return kas->colorGroup(); }
+ const TQColorGroup &colorGroup() const { return kas->colorGroup(); }
/** Factory method that creates a popup widget for the item. */
virtual KasPopup *createPopup();
/** Draw a label with an arrow, the parameters specify the position and size of the arrow. */
- void paintArrowLabel( QPainter *p, int arrowSize, bool arrowOnLeft );
+ void paintArrowLabel( TQPainter *p, int arrowSize, bool arrowOnLeft );
/** Paints a progress graph. */
- void paintProgress( QPainter *p, int percent );
+ void paintProgress( TQPainter *p, int percent );
- void paintStateIcon( QPainter *p, uint state );
+ void paintStateIcon( TQPainter *p, uint state );
- void paintAttention( QPainter *p );
+ void paintAttention( TQPainter *p );
- void paintAnimation( QPainter *p );
+ void paintAnimation( TQPainter *p );
//
// Event Handlers
//
/** Called when the item receives a mouse event. */
- virtual void mousePressEvent( QMouseEvent * ) {}
+ virtual void mousePressEvent( TQMouseEvent * ) {}
/** Called when the item receives a mouse event. */
- virtual void mouseReleaseEvent( QMouseEvent * );
+ virtual void mouseReleaseEvent( TQMouseEvent * );
/** Called when the mouse enters the item. */
virtual void mouseEnter();
@@ -258,13 +258,13 @@ protected:
private:
KasBar *kas;
- QGuardedPtr<KasPopup> pop;
- QTimer *popupTimer;
- QTimer *dragTimer;
+ TQGuardedPtr<KasPopup> pop;
+ TQTimer *popupTimer;
+ TQTimer *dragTimer;
- QPoint pos_;
- QString title;
- QPixmap pix;
+ TQPoint pos_;
+ TQString title;
+ TQPixmap pix;
bool mouseOver;
bool activated;
bool customPopup;
diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp
index b0f9c23e3..2d33a068d 100644
--- a/kicker/extensions/kasbar/kasloaditem.cpp
+++ b/kicker/extensions/kasbar/kasloaditem.cpp
@@ -6,11 +6,11 @@
#include <sys/loadavg.h> // e.g. Solaris
#endif
-#include <qpainter.h>
-#include <qbitmap.h>
-#include <qdatetime.h>
-#include <qdrawutil.h>
-#include <qtimer.h>
+#include <tqpainter.h>
+#include <tqbitmap.h>
+#include <tqdatetime.h>
+#include <tqdrawutil.h>
+#include <tqtimer.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -33,12 +33,12 @@
KasLoadItem::KasLoadItem( KasBar *parent )
: KasItem( parent )
{
- QTimer *t = new QTimer( this );
- connect( t, SIGNAL( timeout() ), SLOT( updateDisplay() ) );
+ TQTimer *t = new TQTimer( this );
+ connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateDisplay() ) );
t->start( 1000 );
updateDisplay();
- connect( this, SIGNAL(rightButtonClicked(QMouseEvent *)), SLOT(showMenuAt(QMouseEvent *) ) );
+ connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) );
}
KasLoadItem::~KasLoadItem()
@@ -63,10 +63,10 @@ void KasLoadItem::updateDisplay()
valuesFifteen.pop_front();
}
- setText( QString("%1").arg( valuesOne.last(), 3, 'f', 2 ) );
+ setText( TQString("%1").arg( valuesOne.last(), 3, 'f', 2 ) );
}
-void KasLoadItem::paint( QPainter *p )
+void KasLoadItem::paint( TQPainter *p )
{
double val = valuesOne.last();
double maxValue = 1.0;
@@ -95,8 +95,8 @@ void KasLoadItem::paint( QPainter *p )
KasItem::paint( p );
- QColor light = kasbar()->colorGroup().highlight();
- QColor dark = light.dark();
+ TQColor light = kasbar()->colorGroup().highlight();
+ TQColor dark = light.dark();
KPixmap pix;
pix.resize( w, h );
@@ -110,13 +110,13 @@ void KasLoadItem::paint( QPainter *p )
}
}
-void KasLoadItem::showMenuAt( QMouseEvent *ev )
+void KasLoadItem::showMenuAt( TQMouseEvent *ev )
{
hidePopup();
showMenuAt( ev->globalPos() );
}
-void KasLoadItem::showMenuAt( QPoint p )
+void KasLoadItem::showMenuAt( TQPoint p )
{
mouseLeave();
kasbar()->updateMouseOver();
diff --git a/kicker/extensions/kasbar/kasloaditem.h b/kicker/extensions/kasbar/kasloaditem.h
index 527a85abc..ba2fd5ff4 100644
--- a/kicker/extensions/kasbar/kasloaditem.h
+++ b/kicker/extensions/kasbar/kasloaditem.h
@@ -19,17 +19,17 @@ public:
KasLoadItem( KasBar *parent );
virtual ~KasLoadItem();
- void paint( QPainter *p );
+ void paint( TQPainter *p );
public slots:
void updateDisplay();
- void showMenuAt( QMouseEvent *ev );
- void showMenuAt( QPoint p );
+ void showMenuAt( TQMouseEvent *ev );
+ void showMenuAt( TQPoint p );
private:
- QValueList<double> valuesOne;
- QValueList<double> valuesFive;
- QValueList<double> valuesFifteen;
+ TQValueList<double> valuesOne;
+ TQValueList<double> valuesFive;
+ TQValueList<double> valuesFifteen;
};
#endif // KASLOADITEM_H
diff --git a/kicker/extensions/kasbar/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp
index 4407f2f48..7538dfbb2 100644
--- a/kicker/extensions/kasbar/kaspopup.cpp
+++ b/kicker/extensions/kasbar/kaspopup.cpp
@@ -51,7 +51,7 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-#include <qapplication.h>
+#include <tqapplication.h>
#include "kasitem.h"
#include "kasbar.h"
@@ -60,7 +60,7 @@
#include "kaspopup.moc"
KasPopup::KasPopup( KasItem *item, const char *name )
- : QHBox( 0, name, WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ),
+ : TQHBox( 0, name, WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ),
item_( item ),
kasbar_( item->kasbar() )
{
@@ -79,17 +79,17 @@ void KasPopup::show()
{
emit aboutToShow();
positionSelf();
- QWidget::show();
+ TQWidget::show();
emit shown();
}
-QPoint KasPopup::calcPosition( KasItem *item, int w, int h )
+TQPoint KasPopup::calcPosition( KasItem *item, int w, int h )
{
KasBar *kasbar = item->kasbar();
- QPoint pos = kasbar->itemPos( item );
+ TQPoint pos = kasbar->itemPos( item );
if ( ( pos.x() < 0 ) && ( pos.y() < 0 ) )
- return QPoint();
+ return TQPoint();
pos = kasbar->mapToGlobal( pos );
int x = pos.x();
@@ -114,7 +114,7 @@ QPoint KasPopup::calcPosition( KasItem *item, int w, int h )
y = y - h + kasbar->itemExtent();
}
- return QPoint( x, y );
+ return TQPoint( x, y );
}
diff --git a/kicker/extensions/kasbar/kaspopup.h b/kicker/extensions/kasbar/kaspopup.h
index 11c024782..811202b62 100644
--- a/kicker/extensions/kasbar/kaspopup.h
+++ b/kicker/extensions/kasbar/kaspopup.h
@@ -56,8 +56,8 @@
#ifndef KASPOPUP_H
#define KASPOPUP_H
-#include <qguardedptr.h>
-#include <qhbox.h>
+#include <tqguardedptr.h>
+#include <tqhbox.h>
#include <kpixmap.h>
#include "kasitem.h"
@@ -81,7 +81,7 @@ public:
KasItem *item() const { return item_; }
KasBar *kasbar() const { return kasbar_; }
- static QPoint calcPosition( KasItem *item, int w, int h );
+ static TQPoint calcPosition( KasItem *item, int w, int h );
public slots:
/**
@@ -98,7 +98,7 @@ signals:
void shown();
private:
- QGuardedPtr<KasItem> item_;
+ TQGuardedPtr<KasItem> item_;
KasBar *kasbar_;
};
diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp
index d6f0cf39f..e81b0aacb 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.cpp
+++ b/kicker/extensions/kasbar/kasprefsdlg.cpp
@@ -52,15 +52,15 @@
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qgrid.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qslider.h>
-#include <qspinbox.h>
-#include <qvbox.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqgrid.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
+#include <tqslider.h>
+#include <tqspinbox.h>
+#include <tqvbox.h>
+#include <tqwhatsthis.h>
#include <kcolorbutton.h>
#include <kconfig.h>
@@ -79,7 +79,7 @@
#define LargeIcon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
-KasPrefsDialog::KasPrefsDialog( KasTasker *kas, QWidget *parent )
+KasPrefsDialog::KasPrefsDialog( KasTasker *kas, TQWidget *parent )
: KDialogBase( KDialogBase::IconList, i18n("Kasbar Preferences"),
KDialogBase::Ok | KDialogBase::Cancel,
KDialogBase::Ok,
@@ -110,21 +110,21 @@ void KasPrefsDialog::itemSizeChanged( int sz )
void KasPrefsDialog::addLookPage()
{
- QVBox *lookPage = addVBoxPage( i18n("Appearance"), QString::null, Icon( "appearance" ) );
+ TQVBox *lookPage = addVBoxPage( i18n("Appearance"), TQString::null, Icon( "appearance" ) );
//
// Item size
//
- QGrid *itemSizeBox = new QGrid( 2, lookPage );
+ TQGrid *itemSizeBox = new TQGrid( 2, lookPage );
itemSizeBox->setSpacing( spacingHint() );
- QWhatsThis::add( itemSizeBox,
+ TQWhatsThis::add( itemSizeBox,
i18n( "Specifies the size of the task items." ) );
- QLabel *itemSizeLabel = new QLabel( i18n("Si&ze:"), itemSizeBox );
+ TQLabel *itemSizeLabel = new TQLabel( i18n("Si&ze:"), itemSizeBox );
- itemSizeCombo = new QComboBox( itemSizeBox );
+ itemSizeCombo = new TQComboBox( itemSizeBox );
itemSizeCombo->insertItem( i18n( "Enormous" ) );
itemSizeCombo->insertItem( i18n( "Huge" ) );
itemSizeCombo->insertItem( i18n( "Large" ) );
@@ -134,20 +134,20 @@ void KasPrefsDialog::addLookPage()
itemSizeLabel->setBuddy( itemSizeCombo );
- connect( itemSizeCombo, SIGNAL( activated( int ) ),
- kasbar, SLOT( setItemSize( int ) ) );
- connect( itemSizeCombo, SIGNAL( activated( int ) ), SLOT( itemSizeChanged( int ) ) );
+ connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ),
+ kasbar, TQT_SLOT( setItemSize( int ) ) );
+ connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( itemSizeChanged( int ) ) );
- new QWidget( itemSizeBox );
+ new TQWidget( itemSizeBox );
- customSize = new QSpinBox( 5, 1000, 1, itemSizeBox );
+ customSize = new TQSpinBox( 5, 1000, 1, itemSizeBox );
customSize->setValue( kasbar->itemExtent() );
- connect( customSize, SIGNAL( valueChanged( int ) ),
- kasbar, SLOT( setItemExtent( int ) ) );
- connect( customSize, SIGNAL( valueChanged( int ) ),
- kasbar, SLOT( customSizeChanged( int ) ) );
+ connect( customSize, TQT_SIGNAL( valueChanged( int ) ),
+ kasbar, TQT_SLOT( setItemExtent( int ) ) );
+ connect( customSize, TQT_SIGNAL( valueChanged( int ) ),
+ kasbar, TQT_SLOT( customSizeChanged( int ) ) );
int sz = kasbar->itemSize();
itemSizeCombo->setCurrentItem( sz );
@@ -157,12 +157,12 @@ void KasPrefsDialog::addLookPage()
// Boxes per line
//
- QHBox *maxBoxesBox = new QHBox( lookPage );
- QWhatsThis::add( maxBoxesBox,
+ TQHBox *maxBoxesBox = new TQHBox( lookPage );
+ TQWhatsThis::add( maxBoxesBox,
i18n( "Specifies the maximum number of items that should be placed in a line "
"before starting a new row or column. If the value is 0 then all the "
"available space will be used." ) );
- QLabel *maxBoxesLabel = new QLabel( i18n("Bo&xes per line: "), maxBoxesBox );
+ TQLabel *maxBoxesLabel = new TQLabel( i18n("Bo&xes per line: "), maxBoxesBox );
KConfig *conf = kasbar->config();
if ( conf )
@@ -171,273 +171,273 @@ void KasPrefsDialog::addLookPage()
conf ? conf->readNumEntry( "MaxBoxes", 0 ) : 11,
10,
maxBoxesBox, "maxboxes" );
- connect( maxBoxesSpin, SIGNAL( valueChanged( int ) ), kasbar, SLOT( setMaxBoxes( int ) ) );
+ connect( maxBoxesSpin, TQT_SIGNAL( valueChanged( int ) ), kasbar, TQT_SLOT( setMaxBoxes( int ) ) );
maxBoxesLabel->setBuddy( maxBoxesSpin );
//
// Mode
//
- detachedCheck = new QCheckBox( i18n("&Detach from screen edge"), lookPage );
- QWhatsThis::add( detachedCheck, i18n( "Detaches the bar from the screen edge and makes it draggable." ) );
+ detachedCheck = new TQCheckBox( i18n("&Detach from screen edge"), lookPage );
+ TQWhatsThis::add( detachedCheck, i18n( "Detaches the bar from the screen edge and makes it draggable." ) );
detachedCheck->setEnabled( !kasbar->isStandAlone() );
detachedCheck->setChecked( kasbar->isDetached() );
- connect( detachedCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setDetached(bool) ) );
+ connect( detachedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setDetached(bool) ) );
- (void) new QWidget( lookPage, "spacer" );
- (void) new QWidget( lookPage, "spacer" );
- (void) new QWidget( lookPage, "spacer" );
+ (void) new TQWidget( lookPage, "spacer" );
+ (void) new TQWidget( lookPage, "spacer" );
+ (void) new TQWidget( lookPage, "spacer" );
}
void KasPrefsDialog::addBackgroundPage()
{
- QVBox *bgPage = addVBoxPage( i18n("Background"), QString::null, Icon( "background" ) );
+ TQVBox *bgPage = addVBoxPage( i18n("Background"), TQString::null, Icon( "background" ) );
- transCheck = new QCheckBox( i18n("Trans&parent"), bgPage );
- QWhatsThis::add( transCheck, i18n( "Enables pseudo-transparent mode." ) );
+ transCheck = new TQCheckBox( i18n("Trans&parent"), bgPage );
+ TQWhatsThis::add( transCheck, i18n( "Enables pseudo-transparent mode." ) );
transCheck->setChecked( kasbar->isTransparent() );
- connect( transCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setTransparent(bool) ) );
+ connect( transCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTransparent(bool) ) );
- tintCheck = new QCheckBox( i18n("Enable t&int"), bgPage );
- QWhatsThis::add( tintCheck,
+ tintCheck = new TQCheckBox( i18n("Enable t&int"), bgPage );
+ TQWhatsThis::add( tintCheck,
i18n( "Enables tinting the background that shows through in transparent mode." ) );
tintCheck->setChecked( kasbar->hasTint() );
- connect( tintCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setTint(bool) ) );
+ connect( tintCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTint(bool) ) );
- QHBox *tintColBox = new QHBox( bgPage );
- QWhatsThis::add( tintColBox,
+ TQHBox *tintColBox = new TQHBox( bgPage );
+ TQWhatsThis::add( tintColBox,
i18n( "Specifies the color used for the background tint." ) );
- connect( tintCheck, SIGNAL( toggled(bool) ), tintColBox, SLOT( setEnabled(bool) ) );
+ connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintColBox, TQT_SLOT( setEnabled(bool) ) );
tintColBox->setEnabled( kasbar->hasTint() );
- QLabel *tintLabel = new QLabel( i18n("Tint &color:"), tintColBox );
+ TQLabel *tintLabel = new TQLabel( i18n("Tint &color:"), tintColBox );
tintButton = new KColorButton( kasbar->tintColor(), tintColBox );
- connect( tintButton, SIGNAL( changed( const QColor & ) ),
- kasbar, SLOT( setTintColor( const QColor & ) ) );
+ connect( tintButton, TQT_SIGNAL( changed( const TQColor & ) ),
+ kasbar, TQT_SLOT( setTintColor( const TQColor & ) ) );
tintLabel->setBuddy( tintButton );
- QHBox *tintAmtBox = new QHBox( bgPage );
- QWhatsThis::add( tintAmtBox,
+ TQHBox *tintAmtBox = new TQHBox( bgPage );
+ TQWhatsThis::add( tintAmtBox,
i18n( "Specifies the strength of the background tint." ) );
- connect( tintCheck, SIGNAL( toggled(bool) ), tintAmtBox, SLOT( setEnabled(bool) ) );
+ connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintAmtBox, TQT_SLOT( setEnabled(bool) ) );
tintAmtBox->setEnabled( kasbar->hasTint() );
- QLabel *tintStrengthLabel = new QLabel( i18n("Tint &strength: "), tintAmtBox );
+ TQLabel *tintStrengthLabel = new TQLabel( i18n("Tint &strength: "), tintAmtBox );
int percent = (int) (kasbar->tintAmount() * 100.0);
- tintAmount = new QSlider( 0, 100, 1, percent, Horizontal, tintAmtBox );
+ tintAmount = new TQSlider( 0, 100, 1, percent, Horizontal, tintAmtBox );
tintAmount->setTracking( true );
- connect( tintAmount, SIGNAL( valueChanged( int ) ),
- kasbar, SLOT( setTintAmount( int ) ) );
+ connect( tintAmount, TQT_SIGNAL( valueChanged( int ) ),
+ kasbar, TQT_SLOT( setTintAmount( int ) ) );
tintStrengthLabel->setBuddy( tintAmount );
- (void) new QWidget( bgPage, "spacer" );
- (void) new QWidget( bgPage, "spacer" );
- (void) new QWidget( bgPage, "spacer" );
+ (void) new TQWidget( bgPage, "spacer" );
+ (void) new TQWidget( bgPage, "spacer" );
+ (void) new TQWidget( bgPage, "spacer" );
}
void KasPrefsDialog::addThumbsPage()
{
- QVBox *thumbsPage = addVBoxPage( i18n("Thumbnails"), QString::null, Icon( "icons" ) );
+ TQVBox *thumbsPage = addVBoxPage( i18n("Thumbnails"), TQString::null, Icon( "icons" ) );
- thumbsCheck = new QCheckBox( i18n("Enable thu&mbnails"), thumbsPage );
- QWhatsThis::add( thumbsCheck,
+ thumbsCheck = new TQCheckBox( i18n("Enable thu&mbnails"), thumbsPage );
+ TQWhatsThis::add( thumbsCheck,
i18n( "Enables the display of a thumbnailed image of the window when "
"you move your mouse pointer over an item. The thumbnails are "
"approximate, and may not reflect the current window contents.\n\n"
"Using this option on a slow machine may cause performance problems." ) );
thumbsCheck->setChecked( kasbar->thumbnailsEnabled() );
- connect( thumbsCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setThumbnailsEnabled(bool) ) );
+ connect( thumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setThumbnailsEnabled(bool) ) );
- embedThumbsCheck = new QCheckBox( i18n("&Embed thumbnails"), thumbsPage );
+ embedThumbsCheck = new TQCheckBox( i18n("&Embed thumbnails"), thumbsPage );
embedThumbsCheck->setChecked( kasbar->embedThumbnails() );
- connect( embedThumbsCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setEmbedThumbnails(bool) ) );
+ connect( embedThumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setEmbedThumbnails(bool) ) );
- QHBox *thumbSizeBox = new QHBox( thumbsPage );
- QWhatsThis::add( thumbSizeBox,
+ TQHBox *thumbSizeBox = new TQHBox( thumbsPage );
+ TQWhatsThis::add( thumbSizeBox,
i18n( "Controls the size of the window thumbnails. Using large sizes may "
"cause performance problems." ) );
- QLabel *thumbSizeLabel = new QLabel( i18n("Thumbnail &size: "), thumbSizeBox );
+ TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox );
int percent = (int) (kasbar->thumbnailSize() * 100.0);
- thumbSizeSlider = new QSlider( 0, 100, 1, percent, Horizontal, thumbSizeBox );
- connect( thumbSizeSlider, SIGNAL( valueChanged( int ) ),
- kasbar, SLOT( setThumbnailSize( int ) ) );
+ thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Horizontal, thumbSizeBox );
+ connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ),
+ kasbar, TQT_SLOT( setThumbnailSize( int ) ) );
thumbSizeLabel->setBuddy( thumbSizeSlider );
- QHBox *thumbUpdateBox = new QHBox( thumbsPage );
+ TQHBox *thumbUpdateBox = new TQHBox( thumbsPage );
thumbUpdateBox->setSpacing( spacingHint() );
- QWhatsThis::add( thumbUpdateBox,
+ TQWhatsThis::add( thumbUpdateBox,
i18n( "Controls the frequency with which the thumbnail of the active window "
"is updated. If the value is 0 then no updates will be performed.\n\n"
"Using small values may cause performance problems on slow machines." ) );
- QLabel *thumbUpdateLabel = new QLabel( i18n("&Update thumbnail every: "), thumbUpdateBox );
- thumbUpdateSpin = new QSpinBox( 0, 1000, 1, thumbUpdateBox );
+ TQLabel *thumbUpdateLabel = new TQLabel( i18n("&Update thumbnail every: "), thumbUpdateBox );
+ thumbUpdateSpin = new TQSpinBox( 0, 1000, 1, thumbUpdateBox );
thumbUpdateSpin->setValue( kasbar->thumbnailUpdateDelay() );
- connect( thumbUpdateSpin, SIGNAL( valueChanged( int ) ),
- kasbar, SLOT( setThumbnailUpdateDelay( int ) ) );
- (void) new QLabel( i18n("seconds"), thumbUpdateBox );
+ connect( thumbUpdateSpin, TQT_SIGNAL( valueChanged( int ) ),
+ kasbar, TQT_SLOT( setThumbnailUpdateDelay( int ) ) );
+ (void) new TQLabel( i18n("seconds"), thumbUpdateBox );
thumbUpdateLabel->setBuddy( thumbUpdateSpin );
- (void) new QWidget( thumbsPage, "spacer" );
- (void) new QWidget( thumbsPage, "spacer" );
- (void) new QWidget( thumbsPage, "spacer" );
+ (void) new TQWidget( thumbsPage, "spacer" );
+ (void) new TQWidget( thumbsPage, "spacer" );
+ (void) new TQWidget( thumbsPage, "spacer" );
}
void KasPrefsDialog::addBehavePage()
{
- QVBox *behavePage = addVBoxPage( i18n("Behavior"), QString::null, Icon( "window_list" ) );
+ TQVBox *behavePage = addVBoxPage( i18n("Behavior"), TQString::null, Icon( "window_list" ) );
- groupWindowsCheck = new QCheckBox( i18n("&Group windows"), behavePage );
- QWhatsThis::add( groupWindowsCheck,
+ groupWindowsCheck = new TQCheckBox( i18n("&Group windows"), behavePage );
+ TQWhatsThis::add( groupWindowsCheck,
i18n( "Enables the grouping together of related windows." ) );
groupWindowsCheck->setChecked( kasbar->groupWindows() );
- connect( groupWindowsCheck, SIGNAL( toggled(bool) ),
- kasbar, SLOT( setGroupWindows(bool) ) );
+ connect( groupWindowsCheck, TQT_SIGNAL( toggled(bool) ),
+ kasbar, TQT_SLOT( setGroupWindows(bool) ) );
- showAllWindowsCheck = new QCheckBox( i18n("Show all &windows"), behavePage );
- QWhatsThis::add( showAllWindowsCheck,
+ showAllWindowsCheck = new TQCheckBox( i18n("Show all &windows"), behavePage );
+ TQWhatsThis::add( showAllWindowsCheck,
i18n( "Enables the display of all windows, not just those on the current desktop." ) );
showAllWindowsCheck->setChecked( kasbar->showAllWindows() );
- connect( showAllWindowsCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setShowAllWindows(bool) ) );
+ connect( showAllWindowsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAllWindows(bool) ) );
- groupInactiveCheck = new QCheckBox( i18n("&Group windows on inactive desktops"), behavePage );
- QWhatsThis::add( groupInactiveCheck,
+ groupInactiveCheck = new TQCheckBox( i18n("&Group windows on inactive desktops"), behavePage );
+ TQWhatsThis::add( groupInactiveCheck,
i18n( "Enables the grouping together of windows that are not on the current desktop." ) );
groupInactiveCheck->setChecked( kasbar->groupInactiveDesktops() );
- connect( groupInactiveCheck, SIGNAL( toggled(bool) ),
- kasbar, SLOT( setGroupInactiveDesktops(bool) ) );
+ connect( groupInactiveCheck, TQT_SIGNAL( toggled(bool) ),
+ kasbar, TQT_SLOT( setGroupInactiveDesktops(bool) ) );
- onlyShowMinimizedCheck = new QCheckBox( i18n("Only show &minimized windows"), behavePage );
- QWhatsThis::add( onlyShowMinimizedCheck,
+ onlyShowMinimizedCheck = new TQCheckBox( i18n("Only show &minimized windows"), behavePage );
+ TQWhatsThis::add( onlyShowMinimizedCheck,
i18n( "When this option is checked only minimized windows are shown in the bar. " \
"This gives Kasbar similar behavior to the icon handling in older environments " \
"like CDE or OpenLook." ) );
onlyShowMinimizedCheck->setChecked( kasbar->onlyShowMinimized() );
- connect( onlyShowMinimizedCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setOnlyShowMinimized(bool) ) );
+ connect( onlyShowMinimizedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setOnlyShowMinimized(bool) ) );
- (void) new QWidget( behavePage, "spacer" );
- (void) new QWidget( behavePage, "spacer" );
+ (void) new TQWidget( behavePage, "spacer" );
+ (void) new TQWidget( behavePage, "spacer" );
}
void KasPrefsDialog::addColorsPage()
{
- QVBox *colorsPage = addVBoxPage( i18n("Colors"), QString::null, Icon( "colors" ) );
+ TQVBox *colorsPage = addVBoxPage( i18n("Colors"), TQString::null, Icon( "colors" ) );
// Item label colors
- QGrid *group = new QGrid( 2, colorsPage );
+ TQGrid *group = new TQGrid( 2, colorsPage );
- QLabel *labelPenLabel = new QLabel( i18n("Label foreground:"), group );
+ TQLabel *labelPenLabel = new TQLabel( i18n("Label foreground:"), group );
labelPenButton = new KColorButton( res->labelPenColor(), group );
- connect( labelPenButton, SIGNAL( changed( const QColor & ) ),
- res, SLOT( setLabelPenColor( const QColor & ) ) );
+ connect( labelPenButton, TQT_SIGNAL( changed( const TQColor & ) ),
+ res, TQT_SLOT( setLabelPenColor( const TQColor & ) ) );
labelPenLabel->setBuddy( labelPenButton );
- QLabel *labelBackgroundLabel = new QLabel( i18n("Label background:"), group );
+ TQLabel *labelBackgroundLabel = new TQLabel( i18n("Label background:"), group );
labelBackgroundButton = new KColorButton( res->labelBgColor(), group );
- connect( labelBackgroundButton, SIGNAL( changed( const QColor & ) ),
- res, SLOT( setLabelBgColor( const QColor & ) ) );
+ connect( labelBackgroundButton, TQT_SIGNAL( changed( const TQColor & ) ),
+ res, TQT_SLOT( setLabelBgColor( const TQColor & ) ) );
labelBackgroundLabel->setBuddy( labelBackgroundButton );
// Inactive colors
- group = new QGrid( 2, colorsPage );
+ group = new TQGrid( 2, colorsPage );
- QLabel *inactivePenLabel = new QLabel( i18n("Inactive foreground:"), group );
+ TQLabel *inactivePenLabel = new TQLabel( i18n("Inactive foreground:"), group );
inactivePenButton = new KColorButton( res->inactivePenColor(), group );
- connect( inactivePenButton, SIGNAL( changed( const QColor & ) ),
- res, SLOT( setInactivePenColor( const QColor & ) ) );
+ connect( inactivePenButton, TQT_SIGNAL( changed( const TQColor & ) ),
+ res, TQT_SLOT( setInactivePenColor( const TQColor & ) ) );
inactivePenLabel->setBuddy( inactivePenButton );
- QLabel *inactiveBgLabel = new QLabel( i18n("Inactive background:"), group );
+ TQLabel *inactiveBgLabel = new TQLabel( i18n("Inactive background:"), group );
inactiveBgButton = new KColorButton( res->inactiveBgColor(), group );
- connect( inactiveBgButton, SIGNAL( changed( const QColor & ) ),
- res, SLOT( setInactiveBgColor( const QColor & ) ) );
+ connect( inactiveBgButton, TQT_SIGNAL( changed( const TQColor & ) ),
+ res, TQT_SLOT( setInactiveBgColor( const TQColor & ) ) );
inactiveBgLabel->setBuddy( inactiveBgButton );
// Active colors
- group = new QGrid( 2, colorsPage );
+ group = new TQGrid( 2, colorsPage );
- QLabel *activePenLabel = new QLabel( i18n("Active foreground:"), group );
+ TQLabel *activePenLabel = new TQLabel( i18n("Active foreground:"), group );
activePenButton = new KColorButton( res->activePenColor(), group );
- connect( activePenButton, SIGNAL( changed( const QColor & ) ),
- res, SLOT( setActivePenColor( const QColor & ) ) );
+ connect( activePenButton, TQT_SIGNAL( changed( const TQColor & ) ),
+ res, TQT_SLOT( setActivePenColor( const TQColor & ) ) );
activePenLabel->setBuddy( activePenButton );
- QLabel *activeBgLabel = new QLabel( i18n("Active background:"), group );
+ TQLabel *activeBgLabel = new TQLabel( i18n("Active background:"), group );
activeBgButton = new KColorButton( res->activeBgColor(), group );
- connect( activeBgButton, SIGNAL( changed( const QColor & ) ),
- res, SLOT( setActiveBgColor( const QColor & ) ) );
+ connect( activeBgButton, TQT_SIGNAL( changed( const TQColor & ) ),
+ res, TQT_SLOT( setActiveBgColor( const TQColor & ) ) );
activeBgLabel->setBuddy( activeBgButton );
- group = new QGrid( 2, colorsPage );
+ group = new TQGrid( 2, colorsPage );
- QLabel *progressLabel = new QLabel( i18n("&Progress color:"), group );
+ TQLabel *progressLabel = new TQLabel( i18n("&Progress color:"), group );
progressButton = new KColorButton( res->progressColor(), group );
- connect( progressButton, SIGNAL( changed( const QColor & ) ),
- res, SLOT( setProgressColor( const QColor & ) ) );
+ connect( progressButton, TQT_SIGNAL( changed( const TQColor & ) ),
+ res, TQT_SLOT( setProgressColor( const TQColor & ) ) );
progressLabel->setBuddy( progressButton );
- QLabel *attentionLabel = new QLabel( i18n("&Attention color:"), group );
+ TQLabel *attentionLabel = new TQLabel( i18n("&Attention color:"), group );
attentionButton = new KColorButton( res->attentionColor(), group );
- connect( attentionButton, SIGNAL( changed( const QColor & ) ),
- res, SLOT( setAttentionColor( const QColor & ) ) );
+ connect( attentionButton, TQT_SIGNAL( changed( const TQColor & ) ),
+ res, TQT_SLOT( setAttentionColor( const TQColor & ) ) );
attentionLabel->setBuddy( attentionButton );
- (void) new QWidget( colorsPage, "spacer" );
+ (void) new TQWidget( colorsPage, "spacer" );
}
void KasPrefsDialog::addIndicatorsPage()
{
- QVBox *indicatorsPage = addVBoxPage( i18n("Indicators"), QString::null, Icon( "bell" ) );
+ TQVBox *indicatorsPage = addVBoxPage( i18n("Indicators"), TQString::null, Icon( "bell" ) );
- (void) new QWidget( indicatorsPage, "spacer" );
- (void) new QWidget( indicatorsPage, "spacer" );
+ (void) new TQWidget( indicatorsPage, "spacer" );
+ (void) new TQWidget( indicatorsPage, "spacer" );
}
void KasPrefsDialog::addAdvancedPage()
{
- QVBox *advancedPage = addVBoxPage( i18n("Advanced"), QString::null, Icon( "misc" ) );
+ TQVBox *advancedPage = addVBoxPage( i18n("Advanced"), TQString::null, Icon( "misc" ) );
// Startup notifier
- notifierCheck = new QCheckBox( i18n("Enable &startup notifier"), advancedPage );
- QWhatsThis::add( notifierCheck,
+ notifierCheck = new TQCheckBox( i18n("Enable &startup notifier"), advancedPage );
+ TQWhatsThis::add( notifierCheck,
i18n( "Enables the display of tasks that are starting but have not yet "
"created a window." ) );
notifierCheck->setChecked( kasbar->notifierEnabled() );
- connect( notifierCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setNotifierEnabled(bool) ) );
+ connect( notifierCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setNotifierEnabled(bool) ) );
// Status advanced
- modifiedCheck = new QCheckBox( i18n("Enable &modified indicator"), advancedPage );
- QWhatsThis::add( modifiedCheck,
+ modifiedCheck = new TQCheckBox( i18n("Enable &modified indicator"), advancedPage );
+ TQWhatsThis::add( modifiedCheck,
i18n( "Enables the display of a floppy disk state icon for windows containing "
"a modified document." ) );
modifiedCheck->setChecked( kasbar->showModified() );
- connect( modifiedCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setShowModified(bool) ) );
+ connect( modifiedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowModified(bool) ) );
- progressCheck = new QCheckBox( i18n("Enable &progress indicator"), advancedPage );
- QWhatsThis::add( progressCheck,
+ progressCheck = new TQCheckBox( i18n("Enable &progress indicator"), advancedPage );
+ TQWhatsThis::add( progressCheck,
i18n( "Enables the display of a progress bar in the label of windows show "
"are progress indicators." ) );
progressCheck->setChecked( kasbar->showProgress() );
- connect( progressCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setShowProgress(bool) ) );
+ connect( progressCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowProgress(bool) ) );
- attentionCheck = new QCheckBox( i18n("Enable &attention indicator"), advancedPage );
- QWhatsThis::add( attentionCheck,
+ attentionCheck = new TQCheckBox( i18n("Enable &attention indicator"), advancedPage );
+ TQWhatsThis::add( attentionCheck,
i18n( "Enables the display of an icon that indicates a window that needs attention." ) );
attentionCheck->setChecked( kasbar->showAttention() );
- connect( attentionCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setShowAttention(bool) ) );
+ connect( attentionCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAttention(bool) ) );
- inactiveFramesCheck = new QCheckBox( i18n("Enable frames for inactive items"), advancedPage );
- QWhatsThis::add( inactiveFramesCheck,
+ inactiveFramesCheck = new TQCheckBox( i18n("Enable frames for inactive items"), advancedPage );
+ TQWhatsThis::add( inactiveFramesCheck,
i18n( "Enables frames around inactive items, if you want the bar to disappear into " \
"the background you should probably uncheck this option." ) );
inactiveFramesCheck->setChecked( kasbar->paintInactiveFrames() );
- connect( inactiveFramesCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setPaintInactiveFrames(bool) ) );
+ connect( inactiveFramesCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setPaintInactiveFrames(bool) ) );
- (void) new QWidget( advancedPage, "spacer" );
- (void) new QWidget( advancedPage, "spacer" );
+ (void) new TQWidget( advancedPage, "spacer" );
+ (void) new TQWidget( advancedPage, "spacer" );
}
void KasPrefsDialog::customSizeChanged ( int value )
@@ -458,11 +458,11 @@ void KasPrefsDialog::accept()
conf->sync();
}
- QDialog::accept();
+ TQDialog::accept();
}
void KasPrefsDialog::reject()
{
kasbar->readConfig();
- QDialog::reject();
+ TQDialog::reject();
}
diff --git a/kicker/extensions/kasbar/kasprefsdlg.h b/kicker/extensions/kasbar/kasprefsdlg.h
index 8c6bb3200..c8faeb317 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.h
+++ b/kicker/extensions/kasbar/kasprefsdlg.h
@@ -79,7 +79,7 @@ class KasPrefsDialog : public KDialogBase
Q_OBJECT
public:
- KasPrefsDialog( KasTasker *kas, QWidget *parent=0 );
+ KasPrefsDialog( KasTasker *kas, TQWidget *parent=0 );
~KasPrefsDialog();
void addLookPage();
@@ -102,27 +102,27 @@ private slots:
private:
- QComboBox *itemSizeCombo;
- QSpinBox *customSize;
- QCheckBox *transCheck;
- QCheckBox *tintCheck;
+ TQComboBox *itemSizeCombo;
+ TQSpinBox *customSize;
+ TQCheckBox *transCheck;
+ TQCheckBox *tintCheck;
KColorButton *tintButton;
- QSlider *tintAmount;
- QCheckBox *thumbsCheck;
- QCheckBox *embedThumbsCheck;
- QSlider *thumbSizeSlider;
- QSpinBox *thumbUpdateSpin;
- QCheckBox *notifierCheck;
- QCheckBox *modifiedCheck;
- QCheckBox *progressCheck;
- QCheckBox *showAllWindowsCheck;
- QCheckBox *onlyShowMinimizedCheck;
+ TQSlider *tintAmount;
+ TQCheckBox *thumbsCheck;
+ TQCheckBox *embedThumbsCheck;
+ TQSlider *thumbSizeSlider;
+ TQSpinBox *thumbUpdateSpin;
+ TQCheckBox *notifierCheck;
+ TQCheckBox *modifiedCheck;
+ TQCheckBox *progressCheck;
+ TQCheckBox *showAllWindowsCheck;
+ TQCheckBox *onlyShowMinimizedCheck;
KIntSpinBox *maxBoxesSpin;
- QCheckBox *detachedCheck;
- QCheckBox *groupWindowsCheck;
- QCheckBox *groupInactiveCheck;
- QCheckBox *attentionCheck;
- QCheckBox *inactiveFramesCheck;
+ TQCheckBox *detachedCheck;
+ TQCheckBox *groupWindowsCheck;
+ TQCheckBox *groupInactiveCheck;
+ TQCheckBox *attentionCheck;
+ TQCheckBox *inactiveFramesCheck;
KColorButton *labelPenButton;
KColorButton *labelBackgroundButton;
diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp
index 0248642f4..78b25e8c0 100644
--- a/kicker/extensions/kasbar/kasresources.cpp
+++ b/kicker/extensions/kasbar/kasresources.cpp
@@ -124,7 +124,7 @@ static const char *micro_shade[]={
};
KasResources::KasResources( KasBar *parent, const char *name )
- : QObject( parent, name ? name : "kasbar_resources" ),
+ : TQObject( parent, name ? name : "kasbar_resources" ),
kasbar( parent ),
labelPenColor_( Qt::white ), labelBgColor_( Qt::black ),
activePenColor_( Qt::black ), activeBgColor_( Qt::white ),
@@ -138,85 +138,85 @@ KasResources::~KasResources()
{
}
-QBitmap KasResources::minIcon()
+TQBitmap KasResources::minIcon()
{
if ( minPix.isNull() ) {
- minPix = QBitmap(8, 8, min_bits, true);
+ minPix = TQBitmap(8, 8, min_bits, true);
minPix.setMask(minPix);
}
return minPix;
}
-QBitmap KasResources::maxIcon()
+TQBitmap KasResources::maxIcon()
{
if ( maxPix.isNull() ) {
- maxPix = QBitmap(8, 8, max_bits, true);
+ maxPix = TQBitmap(8, 8, max_bits, true);
maxPix.setMask(maxPix);
}
return maxPix;
}
-QBitmap KasResources::shadeIcon()
+TQBitmap KasResources::shadeIcon()
{
if ( shadePix.isNull() ) {
- shadePix = QBitmap(8, 8, shade_bits, true);
+ shadePix = TQBitmap(8, 8, shade_bits, true);
shadePix.setMask(shadePix);
}
return shadePix;
}
-QBitmap KasResources::attentionIcon()
+TQBitmap KasResources::attentionIcon()
{
if ( attentionPix.isNull() ) {
- attentionPix = QBitmap( 8, 8, attention_bits, true );
+ attentionPix = TQBitmap( 8, 8, attention_bits, true );
attentionPix.setMask( attentionPix );
}
return attentionPix;
}
-QPixmap KasResources::modifiedIcon()
+TQPixmap KasResources::modifiedIcon()
{
if ( modifiedPix.isNull() )
- modifiedPix = QPixmap( tiny_floppy );
+ modifiedPix = TQPixmap( tiny_floppy );
return modifiedPix;
}
-QPixmap KasResources::microShadeIcon()
+TQPixmap KasResources::microShadeIcon()
{
if ( microShadePix.isNull() )
- microShadePix = QPixmap( micro_shade );
+ microShadePix = TQPixmap( micro_shade );
return microShadePix;
}
-QPixmap KasResources::microMaxIcon()
+TQPixmap KasResources::microMaxIcon()
{
if ( microMaxPix.isNull() )
- microMaxPix = QPixmap( micro_max );
+ microMaxPix = TQPixmap( micro_max );
return microMaxPix;
}
-QPixmap KasResources::microMinIcon()
+TQPixmap KasResources::microMinIcon()
{
if ( microMinPix.isNull() )
- microMinPix = QPixmap( micro_min );
+ microMinPix = TQPixmap( micro_min );
return microMinPix;
}
static const int MAX_ANIMATION_FRAME=10;
-QValueVector<QPixmap> KasResources::startupAnimation()
+TQValueVector<TQPixmap> KasResources::startupAnimation()
{
if ( startupFrames_.isEmpty() ) {
for ( int i = 1; i <= MAX_ANIMATION_FRAME; i++ ) {
- QPixmap p( locate("data", "kicker/pics/disk" + QString::number(i) + ".png") );
+ TQPixmap p( locate("data", "kicker/pics/disk" + TQString::number(i) + ".png") );
if ( !p.isNull() )
startupFrames_.append( p );
}
@@ -225,7 +225,7 @@ QValueVector<QPixmap> KasResources::startupAnimation()
return startupFrames_;
}
-void KasResources::setLabelPenColor( const QColor &color )
+void KasResources::setLabelPenColor( const TQColor &color )
{
if ( labelPenColor_ == color )
return;
@@ -234,7 +234,7 @@ void KasResources::setLabelPenColor( const QColor &color )
emit changed();
}
-void KasResources::setLabelBgColor( const QColor &color )
+void KasResources::setLabelBgColor( const TQColor &color )
{
if ( labelBgColor_ == color )
return;
@@ -243,7 +243,7 @@ void KasResources::setLabelBgColor( const QColor &color )
emit changed();
}
-void KasResources::setInactivePenColor( const QColor &color )
+void KasResources::setInactivePenColor( const TQColor &color )
{
if ( inactivePenColor_ == color )
return;
@@ -252,7 +252,7 @@ void KasResources::setInactivePenColor( const QColor &color )
emit changed();
}
-void KasResources::setInactiveBgColor( const QColor &color )
+void KasResources::setInactiveBgColor( const TQColor &color )
{
if ( inactiveBgColor_ == color )
return;
@@ -261,7 +261,7 @@ void KasResources::setInactiveBgColor( const QColor &color )
emit changed();
}
-void KasResources::setActivePenColor( const QColor &color )
+void KasResources::setActivePenColor( const TQColor &color )
{
if ( activePenColor_ == color )
return;
@@ -270,7 +270,7 @@ void KasResources::setActivePenColor( const QColor &color )
emit changed();
}
-void KasResources::setActiveBgColor( const QColor &color )
+void KasResources::setActiveBgColor( const TQColor &color )
{
if ( activeBgColor_ == color )
return;
@@ -279,7 +279,7 @@ void KasResources::setActiveBgColor( const QColor &color )
emit changed();
}
-void KasResources::setProgressColor( const QColor &color )
+void KasResources::setProgressColor( const TQColor &color )
{
if ( progressColor_ == color )
return;
@@ -288,7 +288,7 @@ void KasResources::setProgressColor( const QColor &color )
emit changed();
}
-void KasResources::setAttentionColor( const QColor &color )
+void KasResources::setAttentionColor( const TQColor &color )
{
if ( attentionColor_ == color )
return;
diff --git a/kicker/extensions/kasbar/kasresources.h b/kicker/extensions/kasbar/kasresources.h
index 44048bcc3..cda153c30 100644
--- a/kicker/extensions/kasbar/kasresources.h
+++ b/kicker/extensions/kasbar/kasresources.h
@@ -57,14 +57,14 @@
#ifndef KASRESOURCES_H
#define KASRESOURCES_H
-#include <qbitmap.h>
-#include <qcolor.h>
-#include <qbrush.h>
-#include <qpen.h>
+#include <tqbitmap.h>
+#include <tqcolor.h>
+#include <tqbrush.h>
+#include <tqpen.h>
#include <kpixmap.h>
-#include <qobject.h>
-#include <qvaluevector.h>
+#include <tqobject.h>
+#include <tqvaluevector.h>
class KasBar;
@@ -81,39 +81,39 @@ public:
KasResources( KasBar *parent, const char *name=0 );
virtual ~KasResources();
- QColor labelPenColor() const { return labelPenColor_; }
- QColor labelBgColor() const { return labelBgColor_; }
- QColor inactivePenColor() const { return inactivePenColor_; }
- QColor inactiveBgColor() const { return inactiveBgColor_; }
- QColor activePenColor() const { return activePenColor_; }
- QColor activeBgColor() const { return activeBgColor_; }
+ TQColor labelPenColor() const { return labelPenColor_; }
+ TQColor labelBgColor() const { return labelBgColor_; }
+ TQColor inactivePenColor() const { return inactivePenColor_; }
+ TQColor inactiveBgColor() const { return inactiveBgColor_; }
+ TQColor activePenColor() const { return activePenColor_; }
+ TQColor activeBgColor() const { return activeBgColor_; }
- QColor progressColor() const { return progressColor_; }
- QColor attentionColor() const { return attentionColor_; }
+ TQColor progressColor() const { return progressColor_; }
+ TQColor attentionColor() const { return attentionColor_; }
/** Accessor for the min icon (singleton). */
- QBitmap minIcon();
+ TQBitmap minIcon();
/** Accessor for the max icon (singleton). */
- QBitmap maxIcon();
+ TQBitmap maxIcon();
/** Accessor for the shade icon (singleton). */
- QBitmap shadeIcon();
+ TQBitmap shadeIcon();
/** Accessor for the attention icon (singleton). */
- QBitmap attentionIcon();
+ TQBitmap attentionIcon();
/** Accessor for the modified icon (singleton). */
- QPixmap modifiedIcon();
+ TQPixmap modifiedIcon();
/** Accessor for the micro min icon (singleton). */
- QPixmap microMinIcon();
+ TQPixmap microMinIcon();
/** Accessor for the micro max icon (singleton). */
- QPixmap microMaxIcon();
+ TQPixmap microMaxIcon();
/** Accessor for the micro shade icon (singleton). */
- QPixmap microShadeIcon();
+ TQPixmap microShadeIcon();
/** Accessor used by items to get the active bg fill. */
KPixmap activeBg();
@@ -121,18 +121,18 @@ public:
/** Accessor used by items to get the inactive bg fill. */
KPixmap inactiveBg();
- QValueVector<QPixmap> startupAnimation();
+ TQValueVector<TQPixmap> startupAnimation();
public slots:
- void setLabelPenColor( const QColor &color );
- void setLabelBgColor( const QColor &color );
- void setInactivePenColor( const QColor &color );
- void setInactiveBgColor( const QColor &color );
- void setActivePenColor( const QColor &color );
- void setActiveBgColor( const QColor &color );
+ void setLabelPenColor( const TQColor &color );
+ void setLabelBgColor( const TQColor &color );
+ void setInactivePenColor( const TQColor &color );
+ void setInactiveBgColor( const TQColor &color );
+ void setActivePenColor( const TQColor &color );
+ void setActiveBgColor( const TQColor &color );
- void setProgressColor( const QColor &color );
- void setAttentionColor( const QColor &color );
+ void setProgressColor( const TQColor &color );
+ void setAttentionColor( const TQColor &color );
void itemSizeChanged();
@@ -142,29 +142,29 @@ signals:
private:
KasBar *kasbar;
- QBitmap minPix;
- QBitmap maxPix;
- QBitmap shadePix;
- QBitmap attentionPix;
- QPixmap modifiedPix;
- QPixmap microShadePix;
- QPixmap microMaxPix;
- QPixmap microMinPix;
-
- QColor labelPenColor_;
- QColor labelBgColor_;
- QColor activePenColor_;
- QColor activeBgColor_;
- QColor inactivePenColor_;
- QColor inactiveBgColor_;
-
- QColor progressColor_;
- QColor attentionColor_;
+ TQBitmap minPix;
+ TQBitmap maxPix;
+ TQBitmap shadePix;
+ TQBitmap attentionPix;
+ TQPixmap modifiedPix;
+ TQPixmap microShadePix;
+ TQPixmap microMaxPix;
+ TQPixmap microMinPix;
+
+ TQColor labelPenColor_;
+ TQColor labelBgColor_;
+ TQColor activePenColor_;
+ TQColor activeBgColor_;
+ TQColor inactivePenColor_;
+ TQColor inactiveBgColor_;
+
+ TQColor progressColor_;
+ TQColor attentionColor_;
KPixmap actBg;
KPixmap inactBg;
- QValueVector<QPixmap> startupFrames_;
+ TQValueVector<TQPixmap> startupFrames_;
};
#endif // KASRESOURCES_H
diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp
index 334edc836..53d823430 100644
--- a/kicker/extensions/kasbar/kasstartupitem.cpp
+++ b/kicker/extensions/kasbar/kasstartupitem.cpp
@@ -51,10 +51,10 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-#include <qpainter.h>
-#include <qbitmap.h>
-#include <qdrawutil.h>
-#include <qtimer.h>
+#include <tqpainter.h>
+#include <tqbitmap.h>
+#include <tqdrawutil.h>
+#include <tqtimer.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -79,8 +79,8 @@ KasStartupItem::KasStartupItem( KasBar *parent, Startup::Ptr startup )
setShowFrame( false );
setAnimation( resources()->startupAnimation() );
- aniTimer = new QTimer( this );
- connect( aniTimer, SIGNAL( timeout() ), SLOT( aniTimerFired() ) );
+ aniTimer = new TQTimer( this );
+ connect( aniTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( aniTimerFired() ) );
aniTimer->start( 100 );
}
@@ -88,12 +88,12 @@ KasStartupItem::~KasStartupItem()
{
}
-QPixmap KasStartupItem::icon() const
+TQPixmap KasStartupItem::icon() const
{
/**
* This icon stuff should all be handled by the task manager api, but isn't yet.
*/
- QPixmap pixmap;
+ TQPixmap pixmap;
switch( kasbar()->itemSize() ) {
case KasBar::Small:
@@ -143,11 +143,11 @@ void KasStartupItem::aniTimerFired()
advanceAnimation();
}
-void KasStartupItem::paint( QPainter *p )
+void KasStartupItem::paint( TQPainter *p )
{
p->save();
- p->setClipRect( 0, 0, extent(), extent(), QPainter::CoordPainter );
+ p->setClipRect( 0, 0, extent(), extent(), TQPainter::CoordPainter );
p->translate( extent()/2, extent()/2 );
p->rotate( 9.0L * frame );
p->scale( 0.7L, 0.7L );
diff --git a/kicker/extensions/kasbar/kasstartupitem.h b/kicker/extensions/kasbar/kasstartupitem.h
index b8019f337..b3de4765e 100644
--- a/kicker/extensions/kasbar/kasstartupitem.h
+++ b/kicker/extensions/kasbar/kasstartupitem.h
@@ -57,8 +57,8 @@
#ifndef KASSTARTUPITEM_H
#define KASSTARTUPITEM_H
-#include <qpixmap.h>
-#include <qstring.h>
+#include <tqpixmap.h>
+#include <tqstring.h>
#include "kasitem.h"
class Startup;
@@ -76,20 +76,20 @@ public:
KasStartupItem( KasBar *parent, Startup::Ptr startup );
virtual ~KasStartupItem();
- QPixmap icon() const;
+ TQPixmap icon() const;
Startup::Ptr startup() const { return startup_; }
/**
* Reimplemented to paint the item.
*/
- virtual void paint( QPainter *p );
+ virtual void paint( TQPainter *p );
protected slots:
void aniTimerFired();
private:
Startup::Ptr startup_;
- QTimer *aniTimer;
+ TQTimer *aniTimer;
int frame;
};
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index 9c93db56c..a087f40ff 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -51,8 +51,8 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include <kactionclasses.h>
#include <kconfig.h>
@@ -79,7 +79,7 @@
static const int SWITCH_DESKTOPS_REGROUP_DELAY = 50;
-KasTasker::KasTasker( Orientation o, QWidget* parent, const char* name, WFlags f )
+KasTasker::KasTasker( Orientation o, TQWidget* parent, const char* name, WFlags f )
: KasBar( o, parent, name, f ),
menu( 0 ),
conf( 0 ),
@@ -102,20 +102,20 @@ KasTasker::KasTasker( Orientation o, QWidget* parent, const char* name, WFlags f
loadItem(0)
{
setAcceptDrops( true );
- connect(TaskManager::the(), SIGNAL(taskAdded(Task::Ptr)), SLOT(addTask(Task::Ptr)));
- connect(TaskManager::the(), SIGNAL(taskRemoved(Task::Ptr)), SLOT(removeTask(Task::Ptr)));
- connect(TaskManager::the(), SIGNAL(startupAdded(Startup::Ptr)), SLOT(addStartup(Startup::Ptr)));
- connect(TaskManager::the(), SIGNAL(startupRemoved(Startup::Ptr)), SLOT(removeStartup(Startup::Ptr)));
- connect(TaskManager::the(), SIGNAL(desktopChanged(int)), SLOT(refreshAllLater()));
-// connect( manager, SIGNAL( windowChanged( Task::Ptr ) ), SLOT( refreshAllLater() ) );
+ connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)), TQT_SLOT(addTask(Task::Ptr)));
+ connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), TQT_SLOT(removeTask(Task::Ptr)));
+ connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)), TQT_SLOT(addStartup(Startup::Ptr)));
+ connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)), TQT_SLOT(removeStartup(Startup::Ptr)));
+ connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAllLater()));
+// connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAllLater() ) );
- connect( this, SIGNAL( itemSizeChanged( int ) ), SLOT( refreshAll() ) );
+ connect( this, TQT_SIGNAL( itemSizeChanged( int ) ), TQT_SLOT( refreshAll() ) );
- connect( this, SIGNAL( detachedPositionChanged(const QPoint &) ), SLOT( writeLayout() ) );
- connect( this, SIGNAL( directionChanged() ), SLOT( writeLayout() ) );
+ connect( this, TQT_SIGNAL( detachedPositionChanged(const TQPoint &) ), TQT_SLOT( writeLayout() ) );
+ connect( this, TQT_SIGNAL( directionChanged() ), TQT_SLOT( writeLayout() ) );
}
-KasTasker::KasTasker( Orientation o, KasTasker *master, QWidget* parent, const char* name, WFlags f )
+KasTasker::KasTasker( Orientation o, KasTasker *master, TQWidget* parent, const char* name, WFlags f )
: KasBar( o, master, parent, name, f ),
menu( 0 ),
conf( 0 ),
@@ -155,27 +155,27 @@ KPopupMenu *KasTasker::contextMenu()
this, "toggle_show_all_windows" );
showAllWindowsAction->setChecked( showAllWindows() );
showAllWindowsAction->plug( menu );
- connect( showAllWindowsAction, SIGNAL(toggled(bool)), SLOT(setShowAllWindows(bool)) );
- connect( this, SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, SLOT(setChecked(bool)) );
+ connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) );
+ connect( this, TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) );
groupWindowsAction = new KToggleAction( i18n("&Group Windows"), KShortcut(),
this, "toggle_group_windows" );
groupWindowsAction->setChecked( groupWindows() );
groupWindowsAction->plug( menu );
- connect( groupWindowsAction, SIGNAL(toggled(bool)), SLOT(setGroupWindows(bool)) );
- connect( this, SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, SLOT(setChecked(bool)) );
+ connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) );
+ connect( this, TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) );
showClockAction = new KToggleAction( i18n("Show &Clock"), KShortcut(), this, "toggle_show_clock" );
showClockAction->setChecked( showClock() );
showClockAction->plug( menu );
- connect( showClockAction, SIGNAL(toggled(bool)), SLOT(setShowClock(bool)) );
- connect( this, SIGNAL(showClockChanged(bool)), showClockAction, SLOT(setChecked(bool)) );
+ connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) );
+ connect( this, TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) );
showLoadAction = new KToggleAction( i18n("Show &Load Meter"), KShortcut(), this, "toggle_show_load" );
showLoadAction->setChecked( showLoad() );
showLoadAction->plug( menu );
- connect( showLoadAction, SIGNAL(toggled(bool)), SLOT(setShowLoad(bool)) );
- connect( this, SIGNAL(showLoadChanged(bool)), showLoadAction, SLOT(setChecked(bool)) );
+ connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) );
+ connect( this, TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) );
menu->insertSeparator();
@@ -183,38 +183,38 @@ KPopupMenu *KasTasker::contextMenu()
toggleDetachedAction = new KToggleAction( i18n("&Floating"), KShortcut(), this, "toggle_detached" );
toggleDetachedAction->setChecked( isDetached() );
toggleDetachedAction->plug( menu );
- connect( toggleDetachedAction, SIGNAL(toggled(bool)), SLOT(setDetached(bool)) );
- connect( this, SIGNAL(detachedChanged(bool)), toggleDetachedAction, SLOT(setChecked(bool)) );
+ connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) );
+ connect( this, TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) );
}
- rotateBarAction = new KAction( i18n("R&otate Bar"), QString("rotate"), KShortcut(),
- this, SLOT( toggleOrientation() ),
+ rotateBarAction = new KAction( i18n("R&otate Bar"), TQString("rotate"), KShortcut(),
+ this, TQT_SLOT( toggleOrientation() ),
this, "rotate_bar" );
rotateBarAction->plug( menu );
- connect( this, SIGNAL(detachedChanged(bool)), rotateBarAction, SLOT(setEnabled(bool)) );
- connect( rotateBarAction, SIGNAL(activated()), SLOT(writeConfigLater()) );
+ connect( this, TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) );
+ connect( rotateBarAction, TQT_SIGNAL(activated()), TQT_SLOT(writeConfigLater()) );
- menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, SLOT( refreshAll() ) );
+ menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQT_SLOT( refreshAll() ) );
menu->insertSeparator();
- menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, SLOT( showPreferences() ) );
+ menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQT_SLOT( showPreferences() ) );
// Help menu
KPopupMenu *help = new KPopupMenu;
- help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, SLOT( showAbout() ) );
+ help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQT_SLOT( showAbout() ) );
menu->insertItem( SmallIcon("help"), i18n("&Help"), help );
if ( standalone_ ) {
menu->insertSeparator();
- menu->insertItem( SmallIcon("exit"), i18n("&Quit"), qApp, SLOT( quit() ) );
+ menu->insertItem( SmallIcon("exit"), i18n("&Quit"), qApp, TQT_SLOT( quit() ) );
}
}
return menu;
}
-KasTasker *KasTasker::createChildBar( Orientation o, QWidget *parent, const char *name )
+KasTasker *KasTasker::createChildBar( Orientation o, TQWidget *parent, const char *name )
{
KasTasker *child = new KasTasker( o, this, parent, name );
child->conf = this->conf;
@@ -269,9 +269,9 @@ void KasTasker::addTask( Task::Ptr t )
//
// Ensure the window manager knows where we put the icon.
//
- QPoint p = mapToGlobal( itemPos( item ) );
- QSize s( itemExtent(), itemExtent() );
- t->publishIconGeometry( QRect( p, s ) );
+ TQPoint p = mapToGlobal( itemPos( item ) );
+ TQSize s( itemExtent(), itemExtent() );
+ t->publishIconGeometry( TQRect( p, s ) );
}
}
@@ -294,7 +294,7 @@ KasGroupItem *KasTasker::convertToGroup( Task::Ptr t )
removeTask( t );
insert( i, gi );
- connect(TaskManager::the(), SIGNAL(taskRemoved(Task::Ptr)), gi, SLOT(removeTask(Task::Ptr)));
+ connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), gi, TQT_SLOT(removeTask(Task::Ptr)));
return gi;
}
@@ -371,7 +371,7 @@ void KasTasker::refreshAll()
void KasTasker::refreshAllLater()
{
- QTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, SLOT( refreshAll() ) );
+ TQTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, TQT_SLOT( refreshAll() ) );
}
void KasTasker::refreshIconGeometry()
@@ -380,9 +380,9 @@ void KasTasker::refreshIconGeometry()
if ( itemAt(i)->inherits( "KasTaskItem" ) ) {
KasTaskItem *curr = static_cast<KasTaskItem *> (itemAt( i ));
- QPoint p = mapToGlobal( itemPos( curr ) );
- QSize s( itemExtent(), itemExtent() );
- curr->task()->publishIconGeometry( QRect( p, s ) );
+ TQPoint p = mapToGlobal( itemPos( curr ) );
+ TQSize s( itemExtent(), itemExtent() );
+ curr->task()->publishIconGeometry( TQRect( p, s ) );
}
}
}
@@ -432,12 +432,12 @@ void KasTasker::setShowAllWindows( bool enable )
showAllWindows_ = enable;
refreshAll();
if ( !showAllWindows_ ) {
- connect(TaskManager::the(), SIGNAL(desktopChanged(int)), SLOT(refreshAll()));
-// connect( manager, SIGNAL( windowChanged( Task::Ptr ) ), SLOT( refreshAll() ) );
+ connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAll()));
+// connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAll() ) );
}
else {
- disconnect(TaskManager::the(), SIGNAL(desktopChanged(int)), this, SLOT(refreshAll()));
-// disconnect( manager, SIGNAL( windowChanged( Task::Ptr ) ), this, SLOT( refreshAll() ) );
+ disconnect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), this, TQT_SLOT(refreshAll()));
+// disconnect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), this, TQT_SLOT( refreshAll() ) );
}
emit showAllWindowsChanged( enable );
@@ -551,7 +551,7 @@ void KasTasker::readConfig()
void KasTasker::writeConfigLater()
{
- QTimer::singleShot( 10, this, SLOT( writeConfig() ) );
+ TQTimer::singleShot( 10, this, TQT_SLOT( writeConfig() ) );
}
void KasTasker::writeConfig()
@@ -634,11 +634,11 @@ void KasTasker::readConfig( KConfig *conf )
//
conf->setGroup("Layout");
- setDirection( (Direction) conf->readNumEntry( "Direction", QBoxLayout::LeftToRight ) );
+ setDirection( (Direction) conf->readNumEntry( "Direction", TQBoxLayout::LeftToRight ) );
setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Horizontal ) );
setMaxBoxes( conf->readUnsignedNumEntry( "MaxBoxes", 0 ) );
- QPoint pos(100, 100);
+ TQPoint pos(100, 100);
setDetachedPosition( conf->readPointEntry( "DetachedPosition", &pos ) );
setDetached( conf->readBoolEntry( "Detached", false ) );
diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h
index 1379c8d8c..b90e4ddeb 100644
--- a/kicker/extensions/kasbar/kastasker.h
+++ b/kicker/extensions/kasbar/kastasker.h
@@ -91,7 +91,7 @@ class KDE_EXPORT KasTasker : public KasBar
public:
/** Create a KasTasker widget. */
- KasTasker( Orientation o, QWidget* parent = 0, const char* name = 0, WFlags f = 0 );
+ KasTasker( Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
/**
* Create a KasTasker widget that is slaved to another KasTasker. The
@@ -99,7 +99,7 @@ public:
* not connect to the signals of the TaskManager.
*/
KasTasker( Orientation o, KasTasker *master,
- QWidget *parent=0, const char *name=0, WFlags f=0 );
+ TQWidget *parent=0, const char *name=0, WFlags f=0 );
/** Cleans up. */
virtual ~KasTasker();
@@ -107,7 +107,7 @@ public:
/** Factory method that returns the default menu for items in the bar. */
virtual KPopupMenu *contextMenu();
- virtual KasTasker *createChildBar( Orientation o, QWidget *parent, const char *name=0 );
+ virtual KasTasker *createChildBar( Orientation o, TQWidget *parent, const char *name=0 );
/**
* Returns true if this is the top KasTasker. Note that it is possible for
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index d21d5ccc6..c9ec7bdd0 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -53,17 +53,17 @@
*/
#include <errno.h>
-#include <qbitmap.h>
-#include <qimage.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qmetaobject.h>
-#include <qpainter.h>
-#include <qregexp.h>
-#include <qtabwidget.h>
-#include <qtextview.h>
-#include <qtimer.h>
-#include <qvbox.h>
+#include <tqbitmap.h>
+#include <tqimage.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqmetaobject.h>
+#include <tqpainter.h>
+#include <tqregexp.h>
+#include <tqtabwidget.h>
+#include <tqtextview.h>
+#include <tqtimer.h>
+#include <tqvbox.h>
#include <kdebug.h>
#include <kdialog.h>
@@ -99,17 +99,17 @@ KasTaskItem::KasTaskItem( KasTasker *parent, Task::Ptr task )
setAttention( task->demandsAttention() );
updateTask(false);
- connect( task, SIGNAL( changed(bool) ), this, SLOT( updateTask(bool) ) );
- connect( task, SIGNAL( activated() ), this, SLOT( startAutoThumbnail() ) );
- connect( task, SIGNAL( deactivated() ), this, SLOT( stopAutoThumbnail() ) );
- connect( task, SIGNAL( iconChanged() ), this, SLOT( iconChanged() ) );
- connect( task, SIGNAL( thumbnailChanged() ), this, SLOT( iconChanged() ) );
+ connect( task, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( updateTask(bool) ) );
+ connect( task, TQT_SIGNAL( activated() ), this, TQT_SLOT( startAutoThumbnail() ) );
+ connect( task, TQT_SIGNAL( deactivated() ), this, TQT_SLOT( stopAutoThumbnail() ) );
+ connect( task, TQT_SIGNAL( iconChanged() ), this, TQT_SLOT( iconChanged() ) );
+ connect( task, TQT_SIGNAL( thumbnailChanged() ), this, TQT_SLOT( iconChanged() ) );
- connect( this, SIGNAL(leftButtonClicked(QMouseEvent *)), SLOT(toggleActivateAction()) );
- connect( this, SIGNAL(rightButtonClicked(QMouseEvent *)), SLOT(showWindowMenuAt(QMouseEvent *) ) );
+ connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(toggleActivateAction()) );
+ connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showWindowMenuAt(TQMouseEvent *) ) );
- attentionTimer = new QTimer( this, "attentionTimer" );
- connect( attentionTimer, SIGNAL( timeout() ), SLOT( checkAttention() ) );
+ attentionTimer = new TQTimer( this, "attentionTimer" );
+ connect( attentionTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAttention() ) );
attentionTimer->start( CHECK_ATTENTION_DELAY );
}
@@ -122,7 +122,7 @@ KasTasker *KasTaskItem::kasbar() const
return static_cast<KasTasker *> (KasItem::kasbar());
}
-QPixmap KasTaskItem::icon()
+TQPixmap KasTaskItem::icon()
{
int sizes[] = { KIcon::SizeEnormous,
KIcon::SizeHuge,
@@ -133,11 +133,11 @@ QPixmap KasTaskItem::icon()
if ( kasbar()->embedThumbnails() && task_->hasThumbnail() ) {
usedIconLoader = true;
- QPixmap thumb = task_->thumbnail();
- QSize sz = thumb.size();
- sz.scale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], QSize::ScaleMin );
+ TQPixmap thumb = task_->thumbnail();
+ TQSize sz = thumb.size();
+ sz.scale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], TQSize::ScaleMin );
- QImage img = thumb.convertToImage();
+ TQImage img = thumb.convertToImage();
img = img.smoothScale( sz );
bool ok = thumb.convertFromImage( img );
@@ -146,7 +146,7 @@ QPixmap KasTaskItem::icon()
}
usedIconLoader = false;
- QPixmap p = task_->bestIcon( sizes[kasbar()->itemSize()], usedIconLoader );
+ TQPixmap p = task_->bestIcon( sizes[kasbar()->itemSize()], usedIconLoader );
if ( !p.isNull() )
return p;
@@ -184,12 +184,12 @@ void KasTaskItem::updateTask(bool geometryChangeOnly)
update();
}
-void KasTaskItem::paint( QPainter *p )
+void KasTaskItem::paint( TQPainter *p )
{
KasItem::paint( p );
KasResources *res = resources();
- QColor c = task_->isActive() ? res->activePenColor() : res->inactivePenColor();
+ TQColor c = task_->isActive() ? res->activePenColor() : res->inactivePenColor();
p->setPen( c );
//
@@ -203,9 +203,9 @@ void KasTaskItem::paint( QPainter *p )
&& ( kas->itemSize() != KasBar::Medium );
if ( usedIconLoader && iconHasChanged && haveSpace ) {
- QPixmap pix = icon();
+ TQPixmap pix = icon();
int x = (extent() - 4 - pix.width()) / 2;
- QPixmap overlay = task_->pixmap();
+ TQPixmap overlay = task_->pixmap();
p->drawPixmap( x-4+pix.width()-overlay.width(), 18, overlay );
}
@@ -226,7 +226,7 @@ void KasTaskItem::paint( QPainter *p )
// Check if we only have one desktop
bool oneDesktop = (TaskManager::the()->numberOfDesktops() == 1) ? true : false;
- QString deskStr;
+ TQString deskStr;
if ( task_->isOnAllDesktops() )
deskStr = i18n( "All" );
else
@@ -261,7 +261,7 @@ void KasTaskItem::toggleActivateAction()
}
}
-void KasTaskItem::showWindowMenuAt( QMouseEvent *ev )
+void KasTaskItem::showWindowMenuAt( TQMouseEvent *ev )
{
hidePopup();
showWindowMenuAt( ev->globalPos() );
@@ -294,13 +294,13 @@ void KasTaskItem::startAutoThumbnail()
return;
if ( kasbar()->thumbnailUpdateDelay() > 0 ) {
- thumbTimer = new QTimer( this, "thumbTimer" );
- connect( thumbTimer, SIGNAL( timeout() ), SLOT( refreshThumbnail() ) );
+ thumbTimer = new TQTimer( this, "thumbTimer" );
+ connect( thumbTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( refreshThumbnail() ) );
thumbTimer->start( kasbar()->thumbnailUpdateDelay() * 1000 );
}
- QTimer::singleShot( 200, this, SLOT( refreshThumbnail() ) );
+ TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) );
}
void KasTaskItem::stopAutoThumbnail()
@@ -322,7 +322,7 @@ void KasTaskItem::refreshThumbnail()
// TODO: Check if the popup obscures the window
KasItem *i = kasbar()->itemUnderMouse();
if ( i && i->isShowingPopup() ) {
- QTimer::singleShot( 200, this, SLOT( refreshThumbnail() ) );
+ TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) );
return;
}
@@ -330,14 +330,14 @@ void KasTaskItem::refreshThumbnail()
task_->updateThumbnail();
}
-void KasTaskItem::showWindowMenuAt( QPoint p )
+void KasTaskItem::showWindowMenuAt( TQPoint p )
{
TaskRMBMenu *tm = new TaskRMBMenu(task_, true, kasbar());
- tm->insertItem( i18n("To &Tray" ), this, SLOT( sendToTray() ) );
+ tm->insertItem( i18n("To &Tray" ), this, TQT_SLOT( sendToTray() ) );
tm->insertSeparator();
tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() );
tm->insertSeparator();
- tm->insertItem( i18n("&Properties" ), this, SLOT( showPropertiesDialog() ) );
+ tm->insertItem( i18n("&Properties" ), this, TQT_SLOT( showPropertiesDialog() ) );
mouseLeave();
kasbar()->updateMouseOver();
@@ -347,7 +347,7 @@ void KasTaskItem::showWindowMenuAt( QPoint p )
void KasTaskItem::sendToTray()
{
- QString s;
+ TQString s;
s.setNum( task_->window() );
KProcess proc;
@@ -372,7 +372,7 @@ void KasTaskItem::showPropertiesDialog()
//
// Create Dialog
//
- QDialog *dlg = new QDialog( /*kasbar()*/0L, "task_props", false );
+ TQDialog *dlg = new TQDialog( /*kasbar()*/0L, "task_props", false );
//
// Title
@@ -385,7 +385,7 @@ void KasTaskItem::showPropertiesDialog()
//
// Tabbed View
//
- QTabWidget *tabs = new QTabWidget( dlg );
+ TQTabWidget *tabs = new TQTabWidget( dlg );
tabs->addTab( createX11Props( tabs ), i18n("General") );
tabs->addTab( createTaskProps( task_, tabs ), i18n("Task") );
@@ -399,7 +399,7 @@ void KasTaskItem::showPropertiesDialog()
//
// Layout Dialog
//
- QVBoxLayout *vbl = new QVBoxLayout( dlg, KDialog::marginHint(), KDialog::spacingHint() );
+ TQVBoxLayout *vbl = new TQVBoxLayout( dlg, KDialog::marginHint(), KDialog::spacingHint() );
vbl->addWidget( title );
vbl->addWidget( tabs );
@@ -408,23 +408,23 @@ void KasTaskItem::showPropertiesDialog()
}
-QWidget *KasTaskItem::createTaskProps( QObject *target, QWidget *parent, bool recursive )
+TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool recursive )
{
- QVBox *vb = new QVBox( parent );
+ TQVBox *vb = new TQVBox( parent );
vb->setSpacing( KDialog::spacingHint() );
vb->setMargin( KDialog::marginHint() );
// Create List View
KListView *taskprops = new KListView( vb, "props_view" );
- taskprops->setResizeMode( QListView::LastColumn );
+ taskprops->setResizeMode( TQListView::LastColumn );
taskprops->addColumn( i18n("Property"), 0 );
taskprops->addColumn( i18n("Type"), 0 );
taskprops->addColumn( i18n("Value") );
// Create List Items
- QMetaObject *mo = target->metaObject();
+ TQMetaObject *mo = target->metaObject();
for ( int i = 0; i < mo->numProperties( recursive ); i++ ) {
- const QMetaProperty *p = mo->property(i, recursive);
+ const TQMetaProperty *p = mo->property(i, recursive);
(void) new KListViewItem( taskprops,
p->name(), p->type(),
@@ -434,17 +434,17 @@ QWidget *KasTaskItem::createTaskProps( QObject *target, QWidget *parent, bool re
return vb;
}
-QString KasTaskItem::expandMacros( const QString &format, QObject *data )
+TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data )
{
- QString s = format;
- QRegExp re("\\$(\\w+)");
+ TQString s = format;
+ TQRegExp re("\\$(\\w+)");
int pos = 0;
while ( pos >= 0 ) {
pos = re.search( s, pos );
if ( pos >= 0 ) {
- QVariant val = data->property( re.cap(1).latin1() );
- QString v = val.asString();
+ TQVariant val = data->property( re.cap(1).latin1() );
+ TQString v = val.asString();
s.replace( pos, re.matchedLength(), v );
pos = pos + v.length();
}
@@ -453,18 +453,18 @@ QString KasTaskItem::expandMacros( const QString &format, QObject *data )
return s;
}
-QWidget *KasTaskItem::createX11Props( QWidget *parent )
+TQWidget *KasTaskItem::createX11Props( TQWidget *parent )
{
- QVBox *vb2 = new QVBox( parent );
- vb2->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Preferred );
+ TQVBox *vb2 = new TQVBox( parent );
+ vb2->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
vb2->setSpacing( KDialog::spacingHint() );
vb2->setMargin( KDialog::marginHint() );
// Create View
- new QLabel( i18n("General"), vb2, "view" );
- QTextView *tv = new QTextView( vb2 );
+ new TQLabel( i18n("General"), vb2, "view" );
+ TQTextView *tv = new TQTextView( vb2 );
- QString fmt = i18n(
+ TQString fmt = i18n(
"<html>"
"<body>"
"<b>Name</b>: $name<br>"
@@ -489,20 +489,20 @@ QWidget *KasTaskItem::createX11Props( QWidget *parent )
);
tv->setText( expandMacros( fmt, task_ ) );
- tv->setWordWrap( QTextEdit::WidgetWidth );
+ tv->setWordWrap( TQTextEdit::WidgetWidth );
return vb2;
}
-QWidget *KasTaskItem::createNETProps( QWidget *parent )
+TQWidget *KasTaskItem::createNETProps( TQWidget *parent )
{
- QVBox *vb3 = new QVBox( parent );
+ TQVBox *vb3 = new TQVBox( parent );
vb3->setSpacing( KDialog::spacingHint() );
vb3->setMargin( KDialog::marginHint() );
// Create View
- new QLabel( i18n("NET WM Specification Info"), vb3, "view" );
- new QTextView( vb3 );
+ new TQLabel( i18n("NET WM Specification Info"), vb3, "view" );
+ new TQTextView( vb3 );
return vb3;
}
diff --git a/kicker/extensions/kasbar/kastaskitem.h b/kicker/extensions/kasbar/kastaskitem.h
index cc7d0d188..b2b166ef5 100644
--- a/kicker/extensions/kasbar/kastaskitem.h
+++ b/kicker/extensions/kasbar/kastaskitem.h
@@ -57,7 +57,7 @@
#ifndef KASTASKITEM_H
#define KASTASKITEM_H
-#include <qpixmap.h>
+#include <tqpixmap.h>
#include "kasitem.h"
class Task;
@@ -76,10 +76,10 @@ class KasTaskItem : public KasItem
KasTaskItem( KasTasker *parent, Task::Ptr task );
virtual ~KasTaskItem();
- QPixmap icon();
+ TQPixmap icon();
/** Reimplemented to paint the item. */
- virtual void paint( QPainter *p );
+ virtual void paint( TQPainter *p );
/** Returns the task the item is displaying. */
Task::Ptr task() const { return task_; }
@@ -87,7 +87,7 @@ class KasTaskItem : public KasItem
/** Returns the parent KasTasker object. */
KasTasker *kasbar() const;
- QString expandMacros( const QString &format, QObject *data );
+ TQString expandMacros( const TQString &format, TQObject *data );
public slots:
void updateTask(bool geometryChangeOnly);
@@ -101,12 +101,12 @@ public slots:
void iconChanged();
void checkAttention();
- void showWindowMenuAt( QPoint pos );
+ void showWindowMenuAt( TQPoint pos );
void sendToTray();
void showPropertiesDialog();
void toggleActivateAction();
- void showWindowMenuAt( QMouseEvent *ev );
+ void showWindowMenuAt( TQMouseEvent *ev );
protected:
/**
@@ -114,9 +114,9 @@ protected:
*/
virtual KasPopup *createPopup();
- QWidget *createTaskProps( QObject *target, QWidget *parent=0, bool recursive=true );
- QWidget *createX11Props( QWidget *tabbed );
- QWidget *createNETProps( QWidget *tabbed );
+ TQWidget *createTaskProps( TQObject *target, TQWidget *parent=0, bool recursive=true );
+ TQWidget *createX11Props( TQWidget *tabbed );
+ TQWidget *createNETProps( TQWidget *tabbed );
/**
* Reimplemented to activate the task.
@@ -125,10 +125,10 @@ protected:
private:
Task::Ptr task_;
- QTimer *thumbTimer;
+ TQTimer *thumbTimer;
bool usedIconLoader;
bool iconHasChanged;
- QTimer *attentionTimer;
+ TQTimer *attentionTimer;
};
#endif // KASTASKITEM_H
diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp
index 91f3ecbc9..25c096a65 100644
--- a/kicker/extensions/kasbar/kastaskpopup.cpp
+++ b/kicker/extensions/kasbar/kastaskpopup.cpp
@@ -51,8 +51,8 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-#include <qpainter.h>
-#include <qapplication.h>
+#include <tqpainter.h>
+#include <tqapplication.h>
#include <kdebug.h>
#include <kglobalsettings.h>
@@ -76,7 +76,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name )
setFont(KGlobalSettings::generalFont());
setMouseTracking( true );
- QString text = item->task()->visibleIconicName();
+ TQString text = item->task()->visibleIconicName();
if ( item->kasbar()->thumbnailsEnabled() && item->task()->hasThumbnail() ) {
titleBg.resize( width(), TITLE_HEIGHT );
@@ -94,7 +94,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name )
Qt::black, colorGroup().mid(),
KPixmapEffect::DiagonalGradient );
- connect( item->task(), SIGNAL( thumbnailChanged() ), SLOT( refresh() ) );
+ connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) );
}
KasTaskPopup::~KasTaskPopup()
@@ -103,7 +103,7 @@ KasTaskPopup::~KasTaskPopup()
void KasTaskPopup::refresh()
{
- QString text = item->task()->visibleIconicName();
+ TQString text = item->task()->visibleIconicName();
if ( item->kasbar()->thumbnailsEnabled() && item->task()->hasThumbnail() ) {
resize( item->task()->thumbnail().width() + 2,
TITLE_HEIGHT + item->task()->thumbnail().height() + 2 );
@@ -112,12 +112,12 @@ void KasTaskPopup::refresh()
update();
}
-void KasTaskPopup::paintEvent( QPaintEvent * )
+void KasTaskPopup::paintEvent( TQPaintEvent * )
{
- QPainter p( this );
+ TQPainter p( this );
p.drawPixmap( 0, 0, titleBg );
- QString text = item->task()->visibleIconicName();
+ TQString text = item->task()->visibleIconicName();
p.setPen( Qt::white );
if ( fontMetrics().width( text ) > width() - 4 )
@@ -126,7 +126,7 @@ void KasTaskPopup::paintEvent( QPaintEvent * )
else
p.drawText( 1, 1, width() - 4, TITLE_HEIGHT - 1, AlignCenter, text );
- QPixmap thumb = item->task()->thumbnail();
+ TQPixmap thumb = item->task()->thumbnail();
if ( !thumb.isNull() )
p.drawPixmap( 1, TITLE_HEIGHT, thumb );
diff --git a/kicker/extensions/kasbar/kastaskpopup.h b/kicker/extensions/kasbar/kastaskpopup.h
index 8118fff6c..dcdc33107 100644
--- a/kicker/extensions/kasbar/kastaskpopup.h
+++ b/kicker/extensions/kasbar/kastaskpopup.h
@@ -78,7 +78,7 @@ public slots:
void refresh();
protected:
- virtual void paintEvent( QPaintEvent * );
+ virtual void paintEvent( TQPaintEvent * );
private:
KasTaskItem *item;
diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp
index a959f7f87..401c67fbd 100644
--- a/kicker/extensions/sidebar/sidebarextension.cpp
+++ b/kicker/extensions/sidebar/sidebarextension.cpp
@@ -22,16 +22,16 @@
#include <klocale.h>
#include <kparts/part.h>
#include <kparts/componentfactory.h>
-#include <qlayout.h>
+#include <tqlayout.h>
#include <konq_historymgr.h>
#include <krun.h>
#include <kurl.h>
-#include <qvbox.h>
-#include <qcursor.h>
+#include <tqvbox.h>
+#include <tqcursor.h>
extern "C"
{
- KDE_EXPORT KPanelExtension *init( QWidget *parent, const QString& configFile )
+ KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile )
{
KGlobal::locale()->insertCatalogue("kickersidebarextension");
KGlobal::locale()->insertCatalogue("konqueror");
@@ -42,17 +42,17 @@ extern "C"
}
}
-SidebarExtension::SidebarExtension( const QString& configFile,
+SidebarExtension::SidebarExtension( const TQString& configFile,
Type type,
int actions,
- QWidget *parent, const char *name )
+ TQWidget *parent, const char *name )
: KPanelExtension( configFile, type, actions, parent, name ),m_resizing(false),m_expandedSize(200)
{
kdDebug() << "SidebarExtension: Created '" << name << "', '" << configFile << "'" << endl;
new KonqHistoryManager(0,"SidebarExtensionHistoryManager");
- m_layout=new QHBoxLayout(this);
+ m_layout=new TQHBoxLayout(this);
m_layout->activate();
- m_sbWrapper=new QVBox(this);
+ m_sbWrapper=new TQVBox(this);
KParts::ReadOnlyPart *p=KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>(
"konq_sidebar",
m_sbWrapper,
@@ -62,19 +62,19 @@ SidebarExtension::SidebarExtension( const QString& configFile,
KParts::BrowserExtension *be=KParts::BrowserExtension::childObject(p);
if (be) {
- connect(be,SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
- this,SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
- connect(be,SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
- this,SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
+ connect(be,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
+ this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
+ connect(be,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
+ this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
}
- m_resizeHandle=new QFrame(this);
- m_resizeHandle->setFrameShape(QFrame::Panel);
- m_resizeHandle->setFrameShadow(QFrame::Raised);
+ m_resizeHandle=new TQFrame(this);
+ m_resizeHandle->setFrameShape(TQFrame::Panel);
+ m_resizeHandle->setFrameShadow(TQFrame::Raised);
m_resizeHandle->setFixedWidth(6);
- m_resizeHandle->setCursor(QCursor(Qt::SizeHorCursor));
- connect(p->widget(),SIGNAL(panelHasBeenExpanded(bool)),this,SLOT(needLayoutUpdate(bool)));
+ m_resizeHandle->setCursor(TQCursor(Qt::SizeHorCursor));
+ connect(p->widget(),TQT_SIGNAL(panelHasBeenExpanded(bool)),this,TQT_SLOT(needLayoutUpdate(bool)));
needLayoutUpdate(false);
m_resizeHandle->installEventFilter(this);
m_resizeHandle->setMouseTracking(true);
@@ -110,31 +110,31 @@ SidebarExtension::~SidebarExtension()
KGlobal::locale()->removeCatalogue("konqueror");
}
-bool SidebarExtension::eventFilter( QObject *, QEvent *e ) {
- if (e->type()==QEvent::MouseButtonPress) {
+bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) {
+ if (e->type()==TQEvent::MouseButtonPress) {
m_resizing=true;
- m_x=((QMouseEvent*)e)->globalX();
+ m_x=((TQMouseEvent*)e)->globalX();
return true;
- } else if (e->type()==QEvent::MouseButtonRelease) {
+ } else if (e->type()==TQEvent::MouseButtonRelease) {
m_resizing=false;
m_expandedSize=topLevelWidget()->width();
needLayoutUpdate(true);
return true;
- } else if (e->type()==QEvent::MouseMove) {
+ } else if (e->type()==TQEvent::MouseMove) {
if (m_resizing) {
Position p=position();
if (p==Left) {
- int diff=((QMouseEvent*)e)->globalX()-m_x;
+ int diff=((TQMouseEvent*)e)->globalX()-m_x;
if (abs(diff)>3) {
topLevelWidget()->setFixedWidth(topLevelWidget()->width()+diff);
- m_x=((QMouseEvent*)e)->globalX();
+ m_x=((TQMouseEvent*)e)->globalX();
}
} else if (p==Right) {
- int diff=((QMouseEvent*)e)->globalX()-m_x;
+ int diff=((TQMouseEvent*)e)->globalX()-m_x;
if (abs(diff)>3) {
topLevelWidget()->setFixedWidth(topLevelWidget()->width()-diff);
topLevelWidget()->move(topLevelWidget()->x()+diff,topLevelWidget()->y());
- m_x=((QMouseEvent*)e)->globalX();
+ m_x=((TQMouseEvent*)e)->globalX();
}
}
return true;
@@ -148,9 +148,9 @@ KPanelExtension::Position SidebarExtension::preferedPosition() const {
return KPanelExtension::Left;
}
-QSize SidebarExtension::sizeHint(Position, QSize maxSize ) const
+TQSize SidebarExtension::sizeHint(Position, TQSize maxSize ) const
{
- return QSize(m_currentWidth,maxSize.height());
+ return TQSize(m_currentWidth,maxSize.height());
}
void SidebarExtension::positionChange( Position position ) {
diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h
index a44c270ba..700f04e4a 100644
--- a/kicker/extensions/sidebar/sidebarextension.h
+++ b/kicker/extensions/sidebar/sidebarextension.h
@@ -29,14 +29,14 @@ class SidebarExtension : public KPanelExtension
Q_OBJECT
public:
- SidebarExtension( const QString& configFile,
+ SidebarExtension( const TQString& configFile,
Type t = Normal,
int actions = 0,
- QWidget *parent = 0, const char *name = 0 );
+ TQWidget *parent = 0, const char *name = 0 );
virtual ~SidebarExtension();
- QSize sizeHint( Position, QSize maxSize ) const;
+ TQSize sizeHint( Position, TQSize maxSize ) const;
Position preferedPosition() const;
virtual void positionChange( Position position );
@@ -44,7 +44,7 @@ public:
protected:
virtual void about();
virtual void preferences();
- virtual bool eventFilter( QObject *o, QEvent *e );
+ virtual bool eventFilter( TQObject *o, TQEvent *e );
protected slots:
void openURLRequest( const KURL &, const KParts::URLArgs &);
void needLayoutUpdate(bool);
@@ -52,11 +52,11 @@ protected slots:
private:
int m_currentWidth;
int m_x;
- QFrame *m_resizeHandle;
+ TQFrame *m_resizeHandle;
bool m_resizing;
int m_expandedSize;
- QHBoxLayout *m_layout;
- QVBox *m_sbWrapper;
+ TQHBoxLayout *m_layout;
+ TQVBox *m_sbWrapper;
};
#endif
diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp
index a25297b39..e0deb768e 100644
--- a/kicker/extensions/taskbar/taskbarextension.cpp
+++ b/kicker/extensions/taskbar/taskbarextension.cpp
@@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qlayout.h>
-#include <qtimer.h>
-#include <qwmatrix.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
+#include <tqwmatrix.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extern "C"
{
- KDE_EXPORT KPanelExtension* init( QWidget *parent, const QString& configFile )
+ KDE_EXPORT KPanelExtension* init( TQWidget *parent, const TQString& configFile )
{
KGlobal::locale()->insertCatalogue( "taskbarextension" );
return new TaskBarExtension( configFile, KPanelExtension::Stretch,
@@ -50,30 +50,30 @@ extern "C"
}
}
-TaskBarExtension::TaskBarExtension(const QString& configFile, Type type,
- int actions, QWidget *parent, const char *name)
+TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type,
+ int actions, TQWidget *parent, const char *name)
: KPanelExtension(configFile, type, actions, parent, name),
m_bgImage(0),
m_bgFilename(0),
m_rootPixmap(0)
{
- QHBoxLayout *layout = new QHBoxLayout(this);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
m_container = new TaskBarContainer(false, this);
m_container->setBackgroundOrigin(AncestorOrigin);
positionChange(position());
layout->addWidget(m_container);
- connect(m_container, SIGNAL(containerCountChanged()),
- SIGNAL(updateLayout()));
+ connect(m_container, TQT_SIGNAL(containerCountChanged()),
+ TQT_SIGNAL(updateLayout()));
kapp->dcopClient()->setNotifications(true);
connectDCOPSignal("kicker", "kicker", "configurationChanged()",
"configure()", false);
- connect(kapp, SIGNAL(kdisplayPaletteChanged()),
- SLOT(setBackgroundTheme()));
+ connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()),
+ TQT_SLOT(setBackgroundTheme()));
- QTimer::singleShot(0, this, SLOT(setBackgroundTheme()));
+ TQTimer::singleShot(0, this, TQT_SLOT(setBackgroundTheme()));
}
TaskBarExtension::~TaskBarExtension()
@@ -105,7 +105,7 @@ void TaskBarExtension::positionChange( Position p )
{
m_container->popupDirectionChange(KPanelApplet::Down);
}
- else if (QApplication::reverseLayout())
+ else if (TQApplication::reverseLayout())
{
m_container->popupDirectionChange(KPanelApplet::Left);
}
@@ -123,14 +123,14 @@ void TaskBarExtension::preferences()
m_container->preferences();
}
-QSize TaskBarExtension::sizeHint(Position p, QSize maxSize) const
+TQSize TaskBarExtension::sizeHint(Position p, TQSize maxSize) const
{
if (p == Left || p == Right)
maxSize.setWidth(sizeInPixels());
else
maxSize.setHeight(sizeInPixels());
-// kdDebug(1210) << "TaskBarExtension::sizeHint( Position, QSize )" << endl;
+// kdDebug(1210) << "TaskBarExtension::sizeHint( Position, TQSize )" << endl;
// kdDebug(1210) << " width: " << size.width() << endl;
// kdDebug(1210) << "height: " << size.height() << endl;
return m_container->sizeHint(p, maxSize);
@@ -150,8 +150,8 @@ void TaskBarExtension::setBackgroundTheme()
{
m_rootPixmap = new KRootPixmap(this);
m_rootPixmap->setCustomPainting(true);
- connect(m_rootPixmap, SIGNAL(backgroundUpdated(const QPixmap&)),
- SLOT(updateBackground(const QPixmap&)));
+ connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)),
+ TQT_SLOT(updateBackground(const TQPixmap&)));
}
else
{
@@ -173,7 +173,7 @@ void TaskBarExtension::setBackgroundTheme()
if (KickerSettings::useBackgroundTheme())
{
- QString bgFilename = locate("appdata", KickerSettings::backgroundTheme());
+ TQString bgFilename = locate("appdata", KickerSettings::backgroundTheme());
if (m_bgFilename != bgFilename)
{
@@ -183,13 +183,13 @@ void TaskBarExtension::setBackgroundTheme()
if (!m_bgImage.isNull())
{
- QImage bgImage = m_bgImage;
+ TQImage bgImage = m_bgImage;
if (orientation() == Vertical)
{
if (KickerSettings::rotateBackground())
{
- QWMatrix matrix;
+ TQWMatrix matrix;
matrix.rotate(position() == KPanelExtension::Left ? 90: 270);
bgImage = bgImage.xForm(matrix);
}
@@ -201,7 +201,7 @@ void TaskBarExtension::setBackgroundTheme()
if (position() == KPanelExtension::Top &&
KickerSettings::rotateBackground())
{
- QWMatrix matrix;
+ TQWMatrix matrix;
matrix.rotate(180);
bgImage = bgImage.xForm(matrix);
}
@@ -220,16 +220,16 @@ void TaskBarExtension::setBackgroundTheme()
m_container->setBackground();
}
-void TaskBarExtension::updateBackground(const QPixmap& bgImage)
+void TaskBarExtension::updateBackground(const TQPixmap& bgImage)
{
unsetPalette();
setPaletteBackgroundPixmap(bgImage);
m_container->setBackground();
}
-void TaskBarExtension::resizeEvent(QResizeEvent *e)
+void TaskBarExtension::resizeEvent(TQResizeEvent *e)
{
- QFrame::resizeEvent(e);
+ TQFrame::resizeEvent(e);
setBackgroundTheme();
}
diff --git a/kicker/extensions/taskbar/taskbarextension.h b/kicker/extensions/taskbar/taskbarextension.h
index 021420483..2848e80c7 100644
--- a/kicker/extensions/taskbar/taskbarextension.h
+++ b/kicker/extensions/taskbar/taskbarextension.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __taskbarextension_h__
#define __taskbarextension_h__
-#include <qimage.h>
+#include <tqimage.h>
#include <dcopobject.h>
#include <kpanelextension.h>
@@ -45,28 +45,28 @@ k_dcop:
void configure();
public:
- TaskBarExtension( const QString& configFile, Type t = Normal,
- int actions = 0, QWidget *parent = 0, const char *name = 0 );
+ TaskBarExtension( const TQString& configFile, Type t = Normal,
+ int actions = 0, TQWidget *parent = 0, const char *name = 0 );
~TaskBarExtension();
- QSize sizeHint( Position, QSize maxSize ) const;
+ TQSize sizeHint( Position, TQSize maxSize ) const;
Position preferedPosition() const { return Bottom; }
protected:
- void resizeEvent(QResizeEvent*);
+ void resizeEvent(TQResizeEvent*);
void positionChange( Position );
void preferences();
private:
TaskBarContainer *m_container;
- QImage m_bgImage;
- QString m_bgFilename;
+ TQImage m_bgImage;
+ TQString m_bgFilename;
KRootPixmap *m_rootPixmap;
private slots:
void setBackgroundTheme();
- void updateBackground(const QPixmap&);
+ void updateBackground(const TQPixmap&);
};
#endif
diff --git a/kicker/kicker/buttons/bookmarksbutton.cpp b/kicker/kicker/buttons/bookmarksbutton.cpp
index b351af263..e267848ef 100644
--- a/kicker/kicker/buttons/bookmarksbutton.cpp
+++ b/kicker/kicker/buttons/bookmarksbutton.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qtooltip.h>
+#include <tqtooltip.h>
#include <kaction.h>
#include <kbookmark.h>
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "bookmarksbutton.h"
#include "bookmarksbutton.moc"
-BookmarksButton::BookmarksButton(QWidget* parent)
+BookmarksButton::BookmarksButton(TQWidget* parent)
: PanelPopupButton(parent, "BookmarksButton"),
bookmarkParent(0),
bookmarkMenu(0),
@@ -49,7 +49,7 @@ BookmarksButton::BookmarksButton(QWidget* parent)
actionCollection,
true, false);
setPopup(bookmarkParent);
- QToolTip::add(this, i18n("Bookmarks"));
+ TQToolTip::add(this, i18n("Bookmarks"));
setTitle(i18n("Bookmarks"));
setIcon("bookmark");
}
diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h
index 95ffa9609..3d8518519 100644
--- a/kicker/kicker/buttons/bookmarksbutton.h
+++ b/kicker/kicker/buttons/bookmarksbutton.h
@@ -39,14 +39,14 @@ class BookmarksButton : public PanelPopupButton
Q_OBJECT
public:
- BookmarksButton(QWidget* parent);
+ BookmarksButton(TQWidget* parent);
~BookmarksButton();
void loadConfig(const KConfigGroup& config);
virtual void properties();
protected:
- virtual QString tileName() { return "WindowList"; }
+ virtual TQString tileName() { return "WindowList"; }
virtual void initPopup();
KPopupMenu* bookmarkParent;
diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp
index 9a445d218..950882696 100644
--- a/kicker/kicker/buttons/browserbutton.cpp
+++ b/kicker/kicker/buttons/browserbutton.cpp
@@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qtimer.h>
-#include <qtooltip.h>
-#include <qdragobject.h>
+#include <tqtimer.h>
+#include <tqtooltip.h>
+#include <tqdragobject.h>
#include <kconfig.h>
#include <klocale.h>
@@ -38,14 +38,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "browserbutton.h"
#include "browserbutton.moc"
-BrowserButton::BrowserButton( const QString& icon, const QString& startDir, QWidget* parent )
+BrowserButton::BrowserButton( const TQString& icon, const TQString& startDir, TQWidget* parent )
: PanelPopupButton( parent, "BrowserButton" )
, topMenu( 0 )
{
initialize( icon, startDir );
}
-BrowserButton::BrowserButton( const KConfigGroup& config, QWidget* parent )
+BrowserButton::BrowserButton( const KConfigGroup& config, TQWidget* parent )
: PanelPopupButton( parent, "BrowserButton" )
, topMenu( 0 )
{
@@ -57,7 +57,7 @@ BrowserButton::~BrowserButton()
delete topMenu;
}
-void BrowserButton::initialize( const QString& icon, const QString& path )
+void BrowserButton::initialize( const TQString& icon, const TQString& path )
{
_icon = icon;
@@ -65,10 +65,10 @@ void BrowserButton::initialize( const QString& icon, const QString& path )
topMenu = new PanelBrowserMenu( path );
setPopup(topMenu);
- _menuTimer = new QTimer( this );
- connect( _menuTimer, SIGNAL(timeout()), SLOT(slotDelayedPopup()) );
+ _menuTimer = new TQTimer( this );
+ connect( _menuTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDelayedPopup()) );
- QToolTip::add(this, i18n("Browse: %1").arg(path));
+ TQToolTip::add(this, i18n("Browse: %1").arg(path));
setTitle( path );
setIcon ( _icon );
}
@@ -79,7 +79,7 @@ void BrowserButton::saveConfig( KConfigGroup& config ) const
config.writePathEntry("Path", topMenu->path());
}
-void BrowserButton::dragEnterEvent( QDragEnterEvent *ev )
+void BrowserButton::dragEnterEvent( TQDragEnterEvent *ev )
{
if ((ev->source() != this) && KURLDrag::canDecode(ev))
{
@@ -93,17 +93,17 @@ void BrowserButton::dragEnterEvent( QDragEnterEvent *ev )
PanelButton::dragEnterEvent(ev);
}
-void BrowserButton::dragLeaveEvent( QDragLeaveEvent *ev )
+void BrowserButton::dragLeaveEvent( TQDragLeaveEvent *ev )
{
_menuTimer->stop();
PanelButton::dragLeaveEvent(ev);
}
-void BrowserButton::dropEvent( QDropEvent *ev )
+void BrowserButton::dropEvent( TQDropEvent *ev )
{
KURL path ( topMenu->path() );
_menuTimer->stop();
- KFileItem item( path, QString::fromLatin1( "inode/directory" ), KFileItem::Unknown );
+ KFileItem item( path, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown );
KonqOperations::doDrop( &item, path, ev, this );
PanelButton::dropEvent(ev);
}
@@ -124,9 +124,9 @@ void BrowserButton::properties()
{
PanelBrowserDialog dlg( topMenu->path(), _icon, this );
- if( dlg.exec() == QDialog::Accepted ){
+ if( dlg.exec() == TQDialog::Accepted ){
_icon = dlg.icon();
- QString path = dlg.path();
+ TQString path = dlg.path();
if ( path != topMenu->path() ) {
delete topMenu;
diff --git a/kicker/kicker/buttons/browserbutton.h b/kicker/kicker/buttons/browserbutton.h
index 00ff0abea..bb08801d9 100644
--- a/kicker/kicker/buttons/browserbutton.h
+++ b/kicker/kicker/buttons/browserbutton.h
@@ -36,8 +36,8 @@ class BrowserButton : public PanelPopupButton
Q_OBJECT
public:
- BrowserButton( const QString& icon, const QString& startDir, QWidget* parent );
- BrowserButton( const KConfigGroup& config, QWidget* parent );
+ BrowserButton( const TQString& icon, const TQString& startDir, TQWidget* parent );
+ BrowserButton( const KConfigGroup& config, TQWidget* parent );
virtual ~BrowserButton();
void saveConfig( KConfigGroup& config ) const;
@@ -49,17 +49,17 @@ protected slots:
virtual void startDrag();
protected:
- void initialize( const QString& icon, const QString& startDir );
- virtual QString tileName() { return "Browser"; }
+ void initialize( const TQString& icon, const TQString& startDir );
+ virtual TQString tileName() { return "Browser"; }
virtual void initPopup();
- virtual void dropEvent(QDropEvent *ev);
- virtual void dragEnterEvent(QDragEnterEvent *ev);
- virtual void dragLeaveEvent(QDragLeaveEvent *ev);
- virtual QString defaultIcon() const { return "kdisknav"; };
+ virtual void dropEvent(TQDropEvent *ev);
+ virtual void dragEnterEvent(TQDragEnterEvent *ev);
+ virtual void dragLeaveEvent(TQDragLeaveEvent *ev);
+ virtual TQString defaultIcon() const { return "kdisknav"; };
PanelBrowserMenu* topMenu;
- QString _icon;
- QTimer *_menuTimer;
+ TQString _icon;
+ TQTimer *_menuTimer;
};
#endif
diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp
index 3831303d7..9f23741e5 100644
--- a/kicker/kicker/buttons/desktopbutton.cpp
+++ b/kicker/kicker/buttons/desktopbutton.cpp
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qtooltip.h>
-#include <qdragobject.h>
+#include <tqtooltip.h>
+#include <tqdragobject.h>
#include <klocale.h>
#include <kglobalsettings.h>
@@ -36,17 +36,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "desktopbutton.h"
#include "desktopbutton.moc"
-DesktopButton::DesktopButton( QWidget* parent )
+DesktopButton::DesktopButton( TQWidget* parent )
: PanelButton( parent, "DesktopButton" )
{
setToggleButton(true);
- QToolTip::add(this, i18n("Show desktop"));
+ TQToolTip::add(this, i18n("Show desktop"));
setTitle(i18n("Desktop Access"));
setIcon("desktop");
- connect( this, SIGNAL(toggled(bool)), this, SLOT(showDesktop(bool)) );
- connect( ShowDesktop::the(), SIGNAL(desktopShown(bool)), this, SLOT(toggle(bool)) );
+ connect( this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showDesktop(bool)) );
+ connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) );
setOn( ShowDesktop::the()->desktopShowing() );
}
@@ -65,7 +65,7 @@ void DesktopButton::showDesktop(bool showDesktop)
KickerTip::enableTipping(true);
}
-void DesktopButton::dragEnterEvent( QDragEnterEvent *ev )
+void DesktopButton::dragEnterEvent( TQDragEnterEvent *ev )
{
if ((ev->source() != this) && KURLDrag::canDecode(ev))
ev->accept(rect());
@@ -74,10 +74,10 @@ void DesktopButton::dragEnterEvent( QDragEnterEvent *ev )
PanelButton::dragEnterEvent(ev);
}
-void DesktopButton::dropEvent( QDropEvent *ev )
+void DesktopButton::dropEvent( TQDropEvent *ev )
{
KURL dPath ( KGlobalSettings::desktopPath() );
- KFileItem item( dPath, QString::fromLatin1( "inode/directory" ), KFileItem::Unknown );
+ KFileItem item( dPath, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown );
KonqOperations::doDrop( &item, dPath, ev, this );
PanelButton::dropEvent(ev);
}
diff --git a/kicker/kicker/buttons/desktopbutton.h b/kicker/kicker/buttons/desktopbutton.h
index 62de4c342..c896bdf92 100644
--- a/kicker/kicker/buttons/desktopbutton.h
+++ b/kicker/kicker/buttons/desktopbutton.h
@@ -34,12 +34,12 @@ class DesktopButton : public PanelButton
Q_OBJECT
public:
- DesktopButton( QWidget* parent );
+ DesktopButton( TQWidget* parent );
protected:
- virtual QString tileName() { return "DesktopButton"; }
- virtual void dragEnterEvent(QDragEnterEvent *ev);
- virtual void dropEvent(QDropEvent *ev);
+ virtual TQString tileName() { return "DesktopButton"; }
+ virtual void dragEnterEvent(TQDragEnterEvent *ev);
+ virtual void dropEvent(TQDropEvent *ev);
protected slots:
void toggle(bool);
diff --git a/kicker/kicker/buttons/extensionbutton.cpp b/kicker/kicker/buttons/extensionbutton.cpp
index 004e0d47b..d4590a024 100644
--- a/kicker/kicker/buttons/extensionbutton.cpp
+++ b/kicker/kicker/buttons/extensionbutton.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qtooltip.h>
+#include <tqtooltip.h>
#include <kconfig.h>
#include <kpanelmenu.h>
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "extensionbutton.h"
#include "extensionbutton.moc"
-ExtensionButton::ExtensionButton( const QString& desktopFile, QWidget* parent )
+ExtensionButton::ExtensionButton( const TQString& desktopFile, TQWidget* parent )
: PanelPopupButton( parent, "ExtensionButton" )
, info( 0 )
, menu( 0 )
@@ -39,13 +39,13 @@ ExtensionButton::ExtensionButton( const QString& desktopFile, QWidget* parent )
initialize( desktopFile );
}
-ExtensionButton::ExtensionButton( const KConfigGroup& config, QWidget* parent )
+ExtensionButton::ExtensionButton( const KConfigGroup& config, TQWidget* parent )
: PanelPopupButton( parent, "extensionbuttton" )
{
initialize( config.readPathEntry("DesktopFile") );
}
-void ExtensionButton::initialize( const QString& desktopFile )
+void ExtensionButton::initialize( const TQString& desktopFile )
{
info = new MenuInfo(desktopFile);
if (!info->isValid())
@@ -56,7 +56,7 @@ void ExtensionButton::initialize( const QString& desktopFile )
menu = info->load(this);
setPopup(menu);
- QToolTip::add(this, info->comment());
+ TQToolTip::add(this, info->comment());
setTitle(info->name());
setIcon(info->icon());
}
diff --git a/kicker/kicker/buttons/extensionbutton.h b/kicker/kicker/buttons/extensionbutton.h
index 0d489f706..48854323e 100644
--- a/kicker/kicker/buttons/extensionbutton.h
+++ b/kicker/kicker/buttons/extensionbutton.h
@@ -34,15 +34,15 @@ class ExtensionButton : public PanelPopupButton
Q_OBJECT
public:
- ExtensionButton( const QString& desktopFile, QWidget* parent );
- ExtensionButton( const KConfigGroup& config, QWidget* parent );
+ ExtensionButton( const TQString& desktopFile, TQWidget* parent );
+ ExtensionButton( const KConfigGroup& config, TQWidget* parent );
~ExtensionButton();
void saveConfig( KConfigGroup& config ) const;
protected:
- void initialize( const QString& desktopFile );
- virtual QString tileName() { return "URL"; }
+ void initialize( const TQString& desktopFile );
+ virtual TQString tileName() { return "URL"; }
virtual void initPopup();
MenuInfo* info;
diff --git a/kicker/kicker/buttons/kbutton.cpp b/kicker/kicker/buttons/kbutton.cpp
index 320a45842..73454b99f 100644
--- a/kicker/kicker/buttons/kbutton.cpp
+++ b/kicker/kicker/buttons/kbutton.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qtooltip.h>
+#include <tqtooltip.h>
#include <klocale.h>
#include <kapplication.h>
@@ -37,10 +37,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "kbutton.h"
#include "kbutton.moc"
-KButton::KButton( QWidget* parent )
+KButton::KButton( TQWidget* parent )
: PanelPopupButton( parent, "KButton" )
{
- QToolTip::add(this, i18n("Applications, tasks and desktop sessions"));
+ TQToolTip::add(this, i18n("Applications, tasks and desktop sessions"));
setTitle(i18n("K Menu"));
setPopup(MenuManager::the()->kmenu());
@@ -64,7 +64,7 @@ KButton::~KButton()
void KButton::properties()
{
- KApplication::startServiceByDesktopName("kmenuedit", QStringList(),
+ KApplication::startServiceByDesktopName("kmenuedit", TQStringList(),
0, 0, 0, "", true);
}
diff --git a/kicker/kicker/buttons/kbutton.h b/kicker/kicker/buttons/kbutton.h
index 6de61181f..bf98e74f8 100644
--- a/kicker/kicker/buttons/kbutton.h
+++ b/kicker/kicker/buttons/kbutton.h
@@ -34,7 +34,7 @@ class KButton : public PanelPopupButton
Q_OBJECT
public:
- KButton( QWidget *parent );
+ KButton( TQWidget *parent );
~KButton();
void loadConfig( const KConfigGroup& config );
@@ -42,9 +42,9 @@ public:
virtual void properties();
protected:
- virtual QString tileName() { return "KMenu"; }
+ virtual TQString tileName() { return "KMenu"; }
virtual void initPopup();
- virtual QString defaultIcon() const { return "go"; }
+ virtual TQString defaultIcon() const { return "go"; }
};
#endif
diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp
index 9413e8aaa..29b7ddb2e 100644
--- a/kicker/kicker/buttons/nonkdeappbutton.cpp
+++ b/kicker/kicker/buttons/nonkdeappbutton.cpp
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qtooltip.h>
-#include <qdragobject.h>
+#include <tqtooltip.h>
+#include <tqdragobject.h>
#include <kconfig.h>
#include <kdesktopfile.h>
@@ -47,11 +47,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// this is one of the two constructors. gets called when creating a new button
// e.g. via the "non-KDE Application" dialog, not one that was saved and then
// restored.
-NonKDEAppButton::NonKDEAppButton(const QString& name,
- const QString& description,
- const QString& filePath, const QString& icon,
- const QString &cmdLine, bool inTerm,
- QWidget* parent)
+NonKDEAppButton::NonKDEAppButton(const TQString& name,
+ const TQString& description,
+ const TQString& filePath, const TQString& icon,
+ const TQString &cmdLine, bool inTerm,
+ TQWidget* parent)
: PanelButton(parent, "NonKDEAppButton") // call our superclass's constructor
{
// call the initialization method
@@ -61,11 +61,11 @@ NonKDEAppButton::NonKDEAppButton(const QString& name,
// to the slotExec() slot
// we do this here instead of in initialize(...) since initialize(...) may
// get called later, e.g after reconfiguring it
- connect(this, SIGNAL(clicked()), SLOT(slotExec()));
+ connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()));
}
// this constructor is used when restoring a button, usually at startup
-NonKDEAppButton::NonKDEAppButton( const KConfigGroup& config, QWidget* parent )
+NonKDEAppButton::NonKDEAppButton( const KConfigGroup& config, TQWidget* parent )
: PanelButton(parent, "NonKDEAppButton") // call our superclass's constructor
{
// call the initialization method, this time with values from a config file
@@ -77,13 +77,13 @@ NonKDEAppButton::NonKDEAppButton( const KConfigGroup& config, QWidget* parent )
config.readBoolEntry("RunInTerminal"));
// see comment on connect in above constructor
- connect(this, SIGNAL(clicked()), SLOT(slotExec()));
+ connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()));
}
-void NonKDEAppButton::initialize(const QString& name,
- const QString& description,
- const QString& filePath, const QString& icon,
- const QString &cmdLine, bool inTerm )
+void NonKDEAppButton::initialize(const TQString& name,
+ const TQString& description,
+ const TQString& filePath, const TQString& icon,
+ const TQString &cmdLine, bool inTerm )
{
// and now we actually set up most of the member variables with the
// values passed in here. by doing this all in an initialize() method
@@ -98,8 +98,8 @@ void NonKDEAppButton::initialize(const QString& name,
// now we set the buttons tooltip, title and icon using the appropriate
// set*() methods from the PanelButton class from which we subclass
- // assign the name or the description to a QString called tooltip
- QString tooltip = description.isEmpty() ? nameStr : descStr;
+ // assign the name or the description to a TQString called tooltip
+ TQString tooltip = description.isEmpty() ? nameStr : descStr;
if (tooltip.isEmpty())
{
@@ -123,7 +123,7 @@ void NonKDEAppButton::initialize(const QString& name,
}
// set the tooltip
- QToolTip::add(this, tooltip);
+ TQToolTip::add(this, tooltip);
// set the icon
setIcon(iconStr);
@@ -142,7 +142,7 @@ void NonKDEAppButton::saveConfig( KConfigGroup& config ) const
config.writePathEntry("CommandLine", cmdStr);
}
-void NonKDEAppButton::dragEnterEvent(QDragEnterEvent *ev)
+void NonKDEAppButton::dragEnterEvent(TQDragEnterEvent *ev)
{
// when something is dragged onto this button, we'll accept it
// if we aren't dragged onto ourselves, and if it's a URL
@@ -159,11 +159,11 @@ void NonKDEAppButton::dragEnterEvent(QDragEnterEvent *ev)
PanelButton::dragEnterEvent(ev);
}
-void NonKDEAppButton::dropEvent(QDropEvent *ev)
+void NonKDEAppButton::dropEvent(TQDropEvent *ev)
{
// something has been droped on us!
KURL::List fileList;
- QString execStr;
+ TQString execStr;
if (KURLDrag::decode(ev, fileList))
{
// according to KURLDrag, we've successfully retrieved
@@ -205,7 +205,7 @@ void NonKDEAppButton::slotExec()
runCommand();
}
-void NonKDEAppButton::runCommand(const QString& execStr)
+void NonKDEAppButton::runCommand(const TQString& execStr)
{
// run our command! this method is used both by the drag 'n drop
// facilities as well as when the button is activated (usualy w/a click)
@@ -225,7 +225,7 @@ void NonKDEAppButton::runCommand(const QString& execStr)
// get merged into the application config automagically for us
KConfig *config = KGlobal::config();
config->setGroup("misc");
- QString termStr = config->readPathEntry("Terminal", "konsole");
+ TQString termStr = config->readPathEntry("Terminal", "konsole");
// and now we run the darn thing and store how we fared in result
result = KRun::runCommand(termStr + " -e " + pathStr + " " +
@@ -269,7 +269,7 @@ void NonKDEAppButton::properties()
{
// the user has requested to configure this button
// this method gets called by the ButtonContainer that houses the button
- // see ButtonContainer::eventFilter(QObject *o, QEvent *e), where the
+ // see ButtonContainer::eventFilter(TQObject *o, TQEvent *e), where the
// context menu is created and dealt with.
// so we create a new config dialog ....
@@ -278,8 +278,8 @@ void NonKDEAppButton::properties()
// ... connect the signal it emits when it has data for us to save
// to our updateSettings slot (see above) ...
- connect(dlg, SIGNAL(updateSettings(PanelExeDialog*)), this,
- SLOT(updateSettings(PanelExeDialog*)));
+ connect(dlg, TQT_SIGNAL(updateSettings(PanelExeDialog*)), this,
+ TQT_SLOT(updateSettings(PanelExeDialog*)));
// ... and then show it to the user
dlg->show();
diff --git a/kicker/kicker/buttons/nonkdeappbutton.h b/kicker/kicker/buttons/nonkdeappbutton.h
index bbb74c892..217f2c22c 100644
--- a/kicker/kicker/buttons/nonkdeappbutton.h
+++ b/kicker/kicker/buttons/nonkdeappbutton.h
@@ -42,12 +42,12 @@ class NonKDEAppButton : public PanelButton
public:
// define our two constructors, one used for creating new buttons...
- NonKDEAppButton(const QString& name, const QString& description,
- const QString& filePath, const QString& icon,
- const QString& cmdLine, bool inTerm, QWidget* parent);
+ NonKDEAppButton(const TQString& name, const TQString& description,
+ const TQString& filePath, const TQString& icon,
+ const TQString& cmdLine, bool inTerm, TQWidget* parent);
// ... and once for restoring them at start up
- NonKDEAppButton(const KConfigGroup& config, QWidget* parent);
+ NonKDEAppButton(const KConfigGroup& config, TQWidget* parent);
// reimplemented from PanelButton
virtual void saveConfig(KConfigGroup& config) const;
@@ -63,29 +63,29 @@ protected slots:
protected:
// used to set up our internal state, either when creating the button
// or after reconfiguration
- void initialize(const QString& name, const QString& description,
- const QString& filePath, const QString& icon,
- const QString& cmdLine, bool inTerm);
+ void initialize(const TQString& name, const TQString& description,
+ const TQString& filePath, const TQString& icon,
+ const TQString& cmdLine, bool inTerm);
// run the command!
// the execStr parameter, which default to an empty string,
// is used to provide additional command line options aside
// from the ones in our config file; for instance a URL drag'd onto us
- void runCommand(const QString& execStr = QString::null);
+ void runCommand(const TQString& execStr = TQString::null);
// reimplemented from PanelButton
- virtual QString tileName() { return "URL"; }
- QString defaultIcon() const { return "exec"; };
+ virtual TQString tileName() { return "URL"; }
+ TQString defaultIcon() const { return "exec"; };
// handle drag and drop actions
- virtual void dropEvent(QDropEvent *ev);
- virtual void dragEnterEvent(QDragEnterEvent *ev);
-
- QString nameStr; // the name given this button by the user
- QString descStr; // the description given this button by the user
- QString pathStr; // the path to the command
- QString iconStr; // the path to the icon for this button
- QString cmdStr; // command line flags, if any
+ virtual void dropEvent(TQDropEvent *ev);
+ virtual void dragEnterEvent(TQDragEnterEvent *ev);
+
+ TQString nameStr; // the name given this button by the user
+ TQString descStr; // the description given this button by the user
+ TQString pathStr; // the path to the command
+ TQString iconStr; // the path to the icon for this button
+ TQString cmdStr; // command line flags, if any
bool term; // whether to run this in a terminal or not
}; // all done defining the class!
diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp
index a5ec7c9a2..f7322a976 100644
--- a/kicker/kicker/buttons/servicebutton.cpp
+++ b/kicker/kicker/buttons/servicebutton.cpp
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qdragobject.h>
-#include <qtooltip.h>
+#include <tqdragobject.h>
+#include <tqtooltip.h>
#include <kdesktopfile.h>
#include <klocale.h>
@@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "servicebutton.h"
#include "servicebutton.moc"
-ServiceButton::ServiceButton(const QString& desktopFile, QWidget* parent)
+ServiceButton::ServiceButton(const TQString& desktopFile, TQWidget* parent)
: PanelButton(parent, "ServiceButton"),
_service(0)
{
@@ -47,25 +47,25 @@ ServiceButton::ServiceButton(const QString& desktopFile, QWidget* parent)
initialize();
}
-ServiceButton::ServiceButton(const KService::Ptr &service, QWidget* parent)
+ServiceButton::ServiceButton(const KService::Ptr &service, TQWidget* parent)
: PanelButton(parent, "ServiceButton"),
_service(service),
_id(service->storageId())
{
if (_id.startsWith("/"))
{
- QString tmp = KGlobal::dirs()->relativeLocation("appdata", _id);
+ TQString tmp = KGlobal::dirs()->relativeLocation("appdata", _id);
if (!tmp.startsWith("/"))
_id = ":"+tmp;
}
initialize();
}
-ServiceButton::ServiceButton( const KConfigGroup& config, QWidget* parent )
+ServiceButton::ServiceButton( const KConfigGroup& config, TQWidget* parent )
: PanelButton(parent, "ServiceButton"),
_service(0)
{
- QString id;
+ TQString id;
if (config.hasKey("StorageId"))
id = config.readPathEntry("StorageId");
else
@@ -78,7 +78,7 @@ ServiceButton::~ServiceButton()
{
}
-void ServiceButton::loadServiceFromId(const QString &id)
+void ServiceButton::loadServiceFromId(const TQString &id)
{
_id = id;
/* this is a KService::Ptr
@@ -112,7 +112,7 @@ void ServiceButton::loadServiceFromId(const QString &id)
if (_id.startsWith("/"))
{
- QString tmp = KGlobal::dirs()->relativeLocation("appdata", _id);
+ TQString tmp = KGlobal::dirs()->relativeLocation("appdata", _id);
if (!tmp.startsWith("/"))
_id = ":"+tmp;
}
@@ -121,7 +121,7 @@ void ServiceButton::loadServiceFromId(const QString &id)
void ServiceButton::initialize()
{
readDesktopFile();
- connect(this, SIGNAL(clicked()), SLOT(slotExec()));
+ connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()));
}
void ServiceButton::readDesktopFile()
@@ -134,15 +134,15 @@ void ServiceButton::readDesktopFile()
if (!_service->genericName().isEmpty())
{
- QToolTip::add(this, _service->genericName());
+ TQToolTip::add(this, _service->genericName());
}
else if (_service->comment().isEmpty())
{
- QToolTip::add(this, _service->name());
+ TQToolTip::add(this, _service->name());
}
else
{
- QToolTip::add(this, _service->name() + " - " + _service->comment());
+ TQToolTip::add(this, _service->name() + " - " + _service->comment());
}
setTitle( _service->name() );
@@ -156,7 +156,7 @@ void ServiceButton::saveConfig( KConfigGroup& config ) const
config.writePathEntry("DesktopFile", _service->desktopEntryPath());
}
-void ServiceButton::dragEnterEvent(QDragEnterEvent *ev)
+void ServiceButton::dragEnterEvent(TQDragEnterEvent *ev)
{
if ((ev->source() != this) && KURLDrag::canDecode(ev))
ev->accept(rect());
@@ -165,7 +165,7 @@ void ServiceButton::dragEnterEvent(QDragEnterEvent *ev)
PanelButton::dragEnterEvent(ev);
}
-void ServiceButton::dropEvent( QDropEvent* ev )
+void ServiceButton::dropEvent( TQDropEvent* ev )
{
KURL::List uriList;
if( KURLDrag::decode( ev, uriList ) && _service ) {
@@ -177,7 +177,7 @@ void ServiceButton::dropEvent( QDropEvent* ev )
void ServiceButton::startDrag()
{
- QString path = _service->desktopEntryPath();
+ TQString path = _service->desktopEntryPath();
// If the path to the desktop file is relative, try to get the full
// path from KStdDirs.
@@ -192,7 +192,7 @@ void ServiceButton::slotExec()
{
// this allows the button to return to a non-pressed state
// before launching
- QTimer::singleShot(0, this, SLOT(performExec()));
+ TQTimer::singleShot(0, this, TQT_SLOT(performExec()));
}
void ServiceButton::performExec()
@@ -211,7 +211,7 @@ void ServiceButton::properties()
return;
}
- QString path = _service->desktopEntryPath();
+ TQString path = _service->desktopEntryPath();
// If the path to the desktop file is relative, try to get the full
// path from KStdDirs.
@@ -223,10 +223,10 @@ void ServiceButton::properties()
KPropertiesDialog* dialog = new KPropertiesDialog(serviceURL, 0, 0,
false, false);
dialog->setFileNameReadOnly(true);
- connect(dialog, SIGNAL(saveAs(const KURL &, KURL &)),
- this, SLOT(slotSaveAs(const KURL &, KURL &)));
- connect(dialog, SIGNAL(propertiesClosed()),
- this, SLOT(slotUpdate()));
+ connect(dialog, TQT_SIGNAL(saveAs(const KURL &, KURL &)),
+ this, TQT_SLOT(slotSaveAs(const KURL &, KURL &)));
+ connect(dialog, TQT_SIGNAL(propertiesClosed()),
+ this, TQT_SLOT(slotUpdate()));
dialog->show();
}
@@ -239,10 +239,10 @@ void ServiceButton::slotUpdate()
void ServiceButton::slotSaveAs(const KURL &oldUrl, KURL &newUrl)
{
- QString oldPath = oldUrl.path();
+ TQString oldPath = oldUrl.path();
if (locateLocal("appdata", oldUrl.fileName()) != oldPath)
{
- QString path = KickerLib::newDesktopFile(oldUrl);
+ TQString path = KickerLib::newDesktopFile(oldUrl);
newUrl.setPath(path);
_id = path;
}
@@ -250,7 +250,7 @@ void ServiceButton::slotSaveAs(const KURL &oldUrl, KURL &newUrl)
bool ServiceButton::checkForBackingFile()
{
- QString id = _id;
+ TQString id = _id;
loadServiceFromId(_id);
// we need to reset the _id back to whatever it was
diff --git a/kicker/kicker/buttons/servicebutton.h b/kicker/kicker/buttons/servicebutton.h
index 26f32791a..2d881d72c 100644
--- a/kicker/kicker/buttons/servicebutton.h
+++ b/kicker/kicker/buttons/servicebutton.h
@@ -33,9 +33,9 @@ class ServiceButton : public PanelButton
Q_OBJECT
public:
- ServiceButton( const QString& desktopFile, QWidget* parent );
- ServiceButton( const KService::Ptr& service, QWidget* parent );
- ServiceButton( const KConfigGroup& config, QWidget* parent );
+ ServiceButton( const TQString& desktopFile, TQWidget* parent );
+ ServiceButton( const KService::Ptr& service, TQWidget* parent );
+ ServiceButton( const KConfigGroup& config, TQWidget* parent );
~ServiceButton();
@@ -50,17 +50,17 @@ protected slots:
protected:
void initialize();
- void loadServiceFromId(const QString &id);
+ void loadServiceFromId(const TQString &id);
void readDesktopFile();
- virtual QString tileName() { return "URL"; }
+ virtual TQString tileName() { return "URL"; }
virtual void startDrag();
- virtual void dropEvent(QDropEvent *);
- virtual void dragEnterEvent(QDragEnterEvent *);
- QString defaultIcon() const { return "exec"; };
+ virtual void dropEvent(TQDropEvent *);
+ virtual void dragEnterEvent(TQDragEnterEvent *);
+ TQString defaultIcon() const { return "exec"; };
bool checkForBackingFile();
KService::Ptr _service;
- QString _id;
+ TQString _id;
};
#endif
diff --git a/kicker/kicker/buttons/servicemenubutton.cpp b/kicker/kicker/buttons/servicemenubutton.cpp
index e3fc41185..7a036e796 100644
--- a/kicker/kicker/buttons/servicemenubutton.cpp
+++ b/kicker/kicker/buttons/servicemenubutton.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qtooltip.h>
+#include <tqtooltip.h>
#include <kconfig.h>
#include <kservicegroup.h>
@@ -32,21 +32,21 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "servicemenubutton.h"
#include "servicemenubutton.moc"
-ServiceMenuButton::ServiceMenuButton( const QString& relPath, QWidget* parent )
+ServiceMenuButton::ServiceMenuButton( const TQString& relPath, TQWidget* parent )
: PanelPopupButton( parent, "ServiceMenuButton" )
, topMenu( 0 )
{
initialize( relPath );
}
-ServiceMenuButton::ServiceMenuButton( const KConfigGroup& config, QWidget* parent )
+ServiceMenuButton::ServiceMenuButton( const KConfigGroup& config, TQWidget* parent )
: PanelPopupButton( parent, "ServiceMenuButton" )
, topMenu( 0 )
{
initialize( config.readPathEntry("RelPath") );
}
-void ServiceMenuButton::initialize( const QString& relPath )
+void ServiceMenuButton::initialize( const TQString& relPath )
{
KServiceGroup::Ptr group = KServiceGroup::group( relPath );
@@ -56,13 +56,13 @@ void ServiceMenuButton::initialize( const QString& relPath )
return;
}
- QString caption = group->caption();
+ TQString caption = group->caption();
if (caption.isEmpty())
{
caption = i18n("Applications");
}
- QString comment = group->comment();
+ TQString comment = group->comment();
if (comment.isEmpty())
{
comment = caption;
@@ -70,7 +70,7 @@ void ServiceMenuButton::initialize( const QString& relPath )
topMenu = new PanelServiceMenu(caption, relPath);
setPopup(topMenu);
- QToolTip::add(this, comment);
+ TQToolTip::add(this, comment);
setTitle(caption);
setIcon(group->icon());
}
diff --git a/kicker/kicker/buttons/servicemenubutton.h b/kicker/kicker/buttons/servicemenubutton.h
index 1bd9d1885..0bd05b8ee 100644
--- a/kicker/kicker/buttons/servicemenubutton.h
+++ b/kicker/kicker/buttons/servicemenubutton.h
@@ -36,15 +36,15 @@ class ServiceMenuButton : public PanelPopupButton
Q_OBJECT
public:
- ServiceMenuButton( const QString& relPath, QWidget* parent );
- ServiceMenuButton( const KConfigGroup& config, QWidget* parent );
+ ServiceMenuButton( const TQString& relPath, TQWidget* parent );
+ ServiceMenuButton( const KConfigGroup& config, TQWidget* parent );
void saveConfig( KConfigGroup& config ) const;
protected:
- void initialize( const QString& relPath );
- virtual QString tileName() { return "Browser"; }
- virtual QString defaultIcon() const { return "folder"; }
+ void initialize( const TQString& relPath );
+ virtual TQString tileName() { return "Browser"; }
+ virtual TQString defaultIcon() const { return "folder"; }
virtual void startDrag();
virtual void initPopup();
diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp
index 007b0cc00..a61b5d775 100644
--- a/kicker/kicker/buttons/urlbutton.cpp
+++ b/kicker/kicker/buttons/urlbutton.cpp
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qtooltip.h>
-#include <qfile.h>
+#include <tqtooltip.h>
+#include <tqfile.h>
#include <kdesktopfile.h>
#include <kfileitem.h>
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "urlbutton.h"
#include "urlbutton.moc"
-URLButton::URLButton( const QString& url, QWidget* parent )
+URLButton::URLButton( const TQString& url, TQWidget* parent )
: PanelButton( parent, "URLButton" )
, fileItem( 0 )
, pDlg( 0 )
@@ -52,7 +52,7 @@ URLButton::URLButton( const QString& url, QWidget* parent )
initialize( url );
}
-URLButton::URLButton( const KConfigGroup& config, QWidget* parent )
+URLButton::URLButton( const KConfigGroup& config, TQWidget* parent )
: PanelButton( parent, "URLButton" )
, fileItem( 0 )
, pDlg( 0 )
@@ -65,12 +65,12 @@ URLButton::~URLButton()
delete fileItem;
}
-void URLButton::initialize( const QString& _url )
+void URLButton::initialize( const TQString& _url )
{
KURL url(_url);
if (!url.isLocalFile() || !url.path().endsWith(".desktop"))
{
- QString file = KickerLib::newDesktopFile(url);
+ TQString file = KickerLib::newDesktopFile(url);
KDesktopFile df(file);
df.writeEntry("Encoding", "UTF-8");
df.writeEntry("Type","Link");
@@ -90,7 +90,7 @@ void URLButton::initialize( const QString& _url )
}
fileItem = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, url );
setIcon( fileItem->iconName() );
- connect( this, SIGNAL(clicked()), SLOT(slotExec()) );
+ connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()) );
setToolTip();
if (url.isLocalFile())
@@ -113,23 +113,23 @@ void URLButton::setToolTip()
if (df.readComment().isEmpty())
{
- QToolTip::add(this, df.readName());
+ TQToolTip::add(this, df.readName());
}
else
{
- QToolTip::add(this, df.readName() + " - " + df.readComment());
+ TQToolTip::add(this, df.readName() + " - " + df.readComment());
}
setTitle(df.readName());
}
else
{
- QToolTip::add(this, fileItem->url().prettyURL());
+ TQToolTip::add(this, fileItem->url().prettyURL());
setTitle(fileItem->url().prettyURL());
}
}
-void URLButton::dragEnterEvent(QDragEnterEvent *ev)
+void URLButton::dragEnterEvent(TQDragEnterEvent *ev)
{
if ((ev->source() != this) && fileItem->acceptsDrops() && KURLDrag::canDecode(ev))
ev->accept(rect());
@@ -138,7 +138,7 @@ void URLButton::dragEnterEvent(QDragEnterEvent *ev)
PanelButton::dragEnterEvent(ev);
}
-void URLButton::dropEvent(QDropEvent *ev)
+void URLButton::dropEvent(TQDropEvent *ev)
{
kapp->propagateSessionManager();
KURL::List execList;
@@ -186,7 +186,7 @@ void URLButton::updateURL()
void URLButton::properties()
{
- if ( (fileItem->isLocalFile() && !QFile::exists(fileItem->url().path()) )
+ if ( (fileItem->isLocalFile() && !TQFile::exists(fileItem->url().path()) )
|| !fileItem->url().isValid())
{
KMessageBox::error( 0L, i18n("The file %1 does not exist")
@@ -196,6 +196,6 @@ void URLButton::properties()
pDlg = new KPropertiesDialog(fileItem, 0L, 0L, false, false); // will delete itself
pDlg->setFileNameReadOnly(true);
- connect(pDlg, SIGNAL(applied()), SLOT(updateURL()));
+ connect(pDlg, TQT_SIGNAL(applied()), TQT_SLOT(updateURL()));
pDlg->show();
}
diff --git a/kicker/kicker/buttons/urlbutton.h b/kicker/kicker/buttons/urlbutton.h
index e6f6b12e0..c2cbd2a19 100644
--- a/kicker/kicker/buttons/urlbutton.h
+++ b/kicker/kicker/buttons/urlbutton.h
@@ -37,8 +37,8 @@ class URLButton : public PanelButton
Q_OBJECT
public:
- URLButton( const QString& url, QWidget* parent );
- URLButton( const KConfigGroup& config, QWidget* parent );
+ URLButton( const TQString& url, TQWidget* parent );
+ URLButton( const KConfigGroup& config, TQWidget* parent );
virtual ~URLButton();
@@ -51,11 +51,11 @@ protected slots:
void updateURL();
protected:
- void initialize( const QString& url );
- virtual QString tileName() { return "URL"; }
+ void initialize( const TQString& url );
+ virtual TQString tileName() { return "URL"; }
virtual void startDrag();
- virtual void dropEvent(QDropEvent *);
- virtual void dragEnterEvent(QDragEnterEvent *);
+ virtual void dropEvent(TQDropEvent *);
+ virtual void dragEnterEvent(TQDragEnterEvent *);
void setToolTip();
KFileItem *fileItem;
diff --git a/kicker/kicker/buttons/windowlistbutton.cpp b/kicker/kicker/buttons/windowlistbutton.cpp
index 8a60ca5e8..0b413d880 100644
--- a/kicker/kicker/buttons/windowlistbutton.cpp
+++ b/kicker/kicker/buttons/windowlistbutton.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qtooltip.h>
+#include <tqtooltip.h>
#include <kwindowlistmenu.h>
#include <klocale.h>
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "windowlistbutton.h"
#include "windowlistbutton.moc"
-WindowListButton::WindowListButton( QWidget* parent )
+WindowListButton::WindowListButton( TQWidget* parent )
: PanelPopupButton( parent, "WindowListButton" )
, topMenu( 0 )
{
@@ -37,7 +37,7 @@ WindowListButton::WindowListButton( QWidget* parent )
setPopup(topMenu);
setTitle(i18n("Window List"));
- QToolTip::add(this, i18n("Window list"));
+ TQToolTip::add(this, i18n("Window list"));
setIcon("window_list");
}
diff --git a/kicker/kicker/buttons/windowlistbutton.h b/kicker/kicker/buttons/windowlistbutton.h
index 23dc26c19..d8b57c62e 100644
--- a/kicker/kicker/buttons/windowlistbutton.h
+++ b/kicker/kicker/buttons/windowlistbutton.h
@@ -36,10 +36,10 @@ class WindowListButton : public PanelPopupButton
Q_OBJECT
public:
- WindowListButton( QWidget* parent );
+ WindowListButton( TQWidget* parent );
protected:
- virtual QString tileName() { return "WindowList"; }
+ virtual TQString tileName() { return "WindowList"; }
virtual void initPopup();
KWindowListMenu* topMenu;
diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp
index cd9de3c62..251cbc1bd 100644
--- a/kicker/kicker/core/applethandle.cpp
+++ b/kicker/kicker/core/applethandle.cpp
@@ -21,14 +21,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qcursor.h>
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qstyle.h>
-#include <qpixmapcache.h>
-#include <qtimer.h>
-#include <qtooltip.h>
-#include <qimage.h>
+#include <tqcursor.h>
+#include <tqlayout.h>
+#include <tqpainter.h>
+#include <tqstyle.h>
+#include <tqpixmapcache.h>
+#include <tqtimer.h>
+#include <tqtooltip.h>
+#include <tqimage.h>
#include <kpushbutton.h>
#include <kapplication.h>
@@ -43,7 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "applethandle.h"
AppletHandle::AppletHandle(AppletContainer* parent)
- : QWidget(parent),
+ : TQWidget(parent),
m_applet(parent),
m_menuButton(0),
m_drawHandle(false),
@@ -52,7 +52,7 @@ AppletHandle::AppletHandle(AppletContainer* parent)
{
setBackgroundOrigin(AncestorOrigin);
setMinimumSize(widthForHeight(0), heightForWidth(0));
- m_layout = new QBoxLayout(this, QBoxLayout::BottomToTop, 0, 0);
+ m_layout = new TQBoxLayout(this, TQBoxLayout::BottomToTop, 0, 0);
m_dragBar = new AppletHandleDrag(this);
m_dragBar->installEventFilter(this);
@@ -64,25 +64,25 @@ AppletHandle::AppletHandle(AppletContainer* parent)
m_menuButton->installEventFilter(this);
m_layout->addWidget(m_menuButton);
- connect(m_menuButton, SIGNAL(pressed()),
- this, SLOT(menuButtonPressed()));
- QToolTip::add(m_menuButton, i18n("%1 menu").arg(parent->info().name()));
+ connect(m_menuButton, TQT_SIGNAL(pressed()),
+ this, TQT_SLOT(menuButtonPressed()));
+ TQToolTip::add(m_menuButton, i18n("%1 menu").arg(parent->info().name()));
}
- QToolTip::add(this, i18n("%1 applet handle").arg(parent->info().name()));
+ TQToolTip::add(this, i18n("%1 applet handle").arg(parent->info().name()));
resetLayout();
}
int AppletHandle::heightForWidth( int /* w */ ) const
{
- int size = style().pixelMetric(QStyle::PM_DockWindowHandleExtent, this);
+ int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
return size;
}
int AppletHandle::widthForHeight( int /* h */ ) const
{
- int size = style().pixelMetric(QStyle::PM_DockWindowHandleExtent, this);
+ int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
return size;
}
@@ -101,19 +101,19 @@ void AppletHandle::setPopupDirection(KPanelApplet::Direction d)
switch (m_popupDirection)
{
case KPanelApplet::Up:
- m_layout->setDirection(QBoxLayout::BottomToTop);
+ m_layout->setDirection(TQBoxLayout::BottomToTop);
a = Qt::UpArrow;
break;
case KPanelApplet::Down:
- m_layout->setDirection(QBoxLayout::TopToBottom);
+ m_layout->setDirection(TQBoxLayout::TopToBottom);
a = Qt::DownArrow;
break;
case KPanelApplet::Left:
- m_layout->setDirection(QBoxLayout::RightToLeft);
+ m_layout->setDirection(TQBoxLayout::RightToLeft);
a = Qt::LeftArrow;
break;
case KPanelApplet::Right:
- m_layout->setDirection(QBoxLayout::LeftToRight);
+ m_layout->setDirection(TQBoxLayout::LeftToRight);
a = Qt::RightArrow;
break;
}
@@ -150,9 +150,9 @@ void AppletHandle::setFadeOutHandle(bool fadeOut)
{
if (!m_handleHoverTimer)
{
- m_handleHoverTimer = new QTimer(this);
- connect(m_handleHoverTimer, SIGNAL(timeout()),
- this, SLOT(checkHandleHover()));
+ m_handleHoverTimer = new TQTimer(this);
+ connect(m_handleHoverTimer, TQT_SIGNAL(timeout()),
+ this, TQT_SLOT(checkHandleHover()));
m_applet->installEventFilter(this);
}
}
@@ -166,13 +166,13 @@ void AppletHandle::setFadeOutHandle(bool fadeOut)
resetLayout();
}
-bool AppletHandle::eventFilter(QObject *o, QEvent *e)
+bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
{
if (o == parent())
{
switch (e->type())
{
- case QEvent::Enter:
+ case TQEvent::Enter:
{
m_drawHandle = true;
resetLayout();
@@ -184,14 +184,14 @@ bool AppletHandle::eventFilter(QObject *o, QEvent *e)
break;
}
- case QEvent::Leave:
+ case TQEvent::Leave:
{
if (m_menuButton && m_menuButton->isOn())
{
break;
}
- QWidget* w = dynamic_cast<QWidget*>(o);
+ TQWidget* w = dynamic_cast<TQWidget*>(o);
bool nowDrawIt = false;
if (w)
@@ -199,7 +199,7 @@ bool AppletHandle::eventFilter(QObject *o, QEvent *e)
// a hack for applets that have out-of-process
// elements (e.g the systray) so that the handle
// doesn't flicker when moving over those elements
- if (w->rect().contains(w->mapFromGlobal(QCursor::pos())))
+ if (w->rect().contains(w->mapFromGlobal(TQCursor::pos())))
{
nowDrawIt = true;
}
@@ -222,13 +222,13 @@ bool AppletHandle::eventFilter(QObject *o, QEvent *e)
break;
}
- return QWidget::eventFilter( o, e );
+ return TQWidget::eventFilter( o, e );
}
else if (o == m_dragBar)
{
- if (e->type() == QEvent::MouseButtonPress)
+ if (e->type() == TQEvent::MouseButtonPress)
{
- QMouseEvent* ev = static_cast<QMouseEvent*>(e);
+ TQMouseEvent* ev = static_cast<TQMouseEvent*>(e);
if (ev->button() == LeftButton || ev->button() == MidButton)
{
emit moveApplet(m_applet->mapFromGlobal(ev->globalPos()));
@@ -236,9 +236,9 @@ bool AppletHandle::eventFilter(QObject *o, QEvent *e)
}
}
- if (m_menuButton && e->type() == QEvent::MouseButtonPress)
+ if (m_menuButton && e->type() == TQEvent::MouseButtonPress)
{
- QMouseEvent* ev = static_cast<QMouseEvent*>(e);
+ TQMouseEvent* ev = static_cast<TQMouseEvent*>(e);
if (ev->button() == RightButton)
{
if (!m_menuButton->isDown())
@@ -251,7 +251,7 @@ bool AppletHandle::eventFilter(QObject *o, QEvent *e)
}
}
- return QWidget::eventFilter(o, e); // standard event processing
+ return TQWidget::eventFilter(o, e); // standard event processing
}
void AppletHandle::menuButtonPressed()
@@ -263,7 +263,7 @@ void AppletHandle::menuButtonPressed()
emit showAppletMenu();
- if (!onMenuButton(QCursor::pos()))
+ if (!onMenuButton(TQCursor::pos()))
{
toggleMenuButtonOff();
}
@@ -274,7 +274,7 @@ void AppletHandle::checkHandleHover()
if (!m_handleHoverTimer ||
(m_menuButton && m_menuButton->isOn()) ||
m_applet->geometry().contains(m_applet->mapToParent(
- m_applet->mapFromGlobal(QCursor::pos()))))
+ m_applet->mapFromGlobal(TQCursor::pos()))))
{
return;
}
@@ -284,7 +284,7 @@ void AppletHandle::checkHandleHover()
resetLayout();
}
-bool AppletHandle::onMenuButton(const QPoint& point) const
+bool AppletHandle::onMenuButton(const TQPoint& point) const
{
return m_menuButton && (childAt(mapFromGlobal(point)) == m_menuButton);
}
@@ -300,78 +300,78 @@ void AppletHandle::toggleMenuButtonOff()
}
AppletHandleDrag::AppletHandleDrag(AppletHandle* parent)
- : QWidget(parent),
+ : TQWidget(parent),
m_parent(parent),
m_inside(false)
{
setBackgroundOrigin( AncestorOrigin );
}
-QSize AppletHandleDrag::minimumSizeHint() const
+TQSize AppletHandleDrag::minimumSizeHint() const
{
- int wh = style().pixelMetric(QStyle::PM_DockWindowHandleExtent, this);
+ int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
if (m_parent->orientation() == Horizontal)
{
- return QSize(wh, 0);
+ return TQSize(wh, 0);
}
- return QSize(0, wh);
+ return TQSize(0, wh);
}
-QSizePolicy AppletHandleDrag::sizePolicy() const
+TQSizePolicy AppletHandleDrag::sizePolicy() const
{
if (m_parent->orientation() == Horizontal)
{
- return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred );
+ return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
}
- return QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed );
+ return TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
}
-void AppletHandleDrag::enterEvent( QEvent *e )
+void AppletHandleDrag::enterEvent( TQEvent *e )
{
m_inside = true;
- QWidget::enterEvent( e );
+ TQWidget::enterEvent( e );
update();
}
-void AppletHandleDrag::leaveEvent( QEvent *e )
+void AppletHandleDrag::leaveEvent( TQEvent *e )
{
m_inside = false;
- QWidget::enterEvent( e );
+ TQWidget::enterEvent( e );
update();
}
-void AppletHandleDrag::paintEvent(QPaintEvent *)
+void AppletHandleDrag::paintEvent(TQPaintEvent *)
{
- QPainter p(this);
+ TQPainter p(this);
if (!KickerSettings::transparent())
{
if (paletteBackgroundPixmap())
{
- QPoint offset = backgroundOffset();
+ TQPoint offset = backgroundOffset();
int ox = offset.x();
int oy = offset.y();
p.drawTiledPixmap( 0, 0, width(), height(),*paletteBackgroundPixmap(), ox, oy);
}
- QStyle::SFlags flags = QStyle::Style_Default;
- flags |= QStyle::Style_Enabled;
+ TQStyle::SFlags flags = TQStyle::Style_Default;
+ flags |= TQStyle::Style_Enabled;
if (m_parent->orientation() == Horizontal)
{
- flags |= QStyle::Style_Horizontal;
+ flags |= TQStyle::Style_Horizontal;
}
- QRect r = rect();
+ TQRect r = rect();
- style().drawPrimitive(QStyle::PE_DockWindowHandle, &p, r,
+ style().drawPrimitive(TQStyle::PE_DockWindowHandle, &p, r,
colorGroup(), flags);
}
else
{
- KickerLib::drawBlendedRect(&p, QRect(0, 0, width(), height()), paletteForegroundColor(), m_inside ? 0x40 : 0x20);
+ KickerLib::drawBlendedRect(&p, TQRect(0, 0, width(), height()), paletteForegroundColor(), m_inside ? 0x40 : 0x20);
}
}
@@ -381,22 +381,22 @@ AppletHandleButton::AppletHandleButton(AppletHandle *parent)
{
}
-QSize AppletHandleButton::minimumSizeHint() const
+TQSize AppletHandleButton::minimumSizeHint() const
{
- int height = style().pixelMetric(QStyle::PM_DockWindowHandleExtent, this);
+ int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
int width = height;
if (m_parent->orientation() == Horizontal)
{
- return QSize(width, height);
+ return TQSize(width, height);
}
- return QSize(height, width);
+ return TQSize(height, width);
}
-QSizePolicy AppletHandleButton::sizePolicy() const
+TQSizePolicy AppletHandleButton::sizePolicy() const
{
- return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
+ return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
}
#include "applethandle.moc"
diff --git a/kicker/kicker/core/applethandle.h b/kicker/kicker/core/applethandle.h
index 2158756cb..ab340af06 100644
--- a/kicker/kicker/core/applethandle.h
+++ b/kicker/kicker/core/applethandle.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __applethandle_h__
#define __applethandle_h__
-#include <qwidget.h>
-#include <qpushbutton.h>
+#include <tqwidget.h>
+#include <tqpushbutton.h>
#include "container_applet.h"
#include "simplebutton.h"
@@ -45,7 +45,7 @@ class AppletHandle : public QWidget
void resetLayout();
void setFadeOutHandle(bool);
- bool eventFilter (QObject *, QEvent *);
+ bool eventFilter (TQObject *, TQEvent *);
int widthForHeight( int h ) const;
int heightForWidth( int w ) const;
@@ -61,10 +61,10 @@ class AppletHandle : public QWidget
return m_applet->orientation();
}
- bool onMenuButton(const QPoint& point) const;
+ bool onMenuButton(const TQPoint& point) const;
signals:
- void moveApplet( const QPoint& moveOffset );
+ void moveApplet( const TQPoint& moveOffset );
void showAppletMenu();
public slots:
@@ -76,12 +76,12 @@ class AppletHandle : public QWidget
private:
AppletContainer* m_applet;
- QBoxLayout* m_layout;
+ TQBoxLayout* m_layout;
AppletHandleDrag* m_dragBar;
AppletHandleButton* m_menuButton;
bool m_drawHandle;
KPanelApplet::Direction m_popupDirection;
- QTimer* m_handleHoverTimer;
+ TQTimer* m_handleHoverTimer;
bool m_inside;
};
@@ -92,15 +92,15 @@ class AppletHandleDrag : public QWidget
public:
AppletHandleDrag(AppletHandle* parent);
- QSize minimumSizeHint() const;
- QSize minimumSize() const { return minimumSizeHint(); }
- QSize sizeHint() const { return minimumSize(); }
- QSizePolicy sizePolicy() const;
+ TQSize minimumSizeHint() const;
+ TQSize minimumSize() const { return minimumSizeHint(); }
+ TQSize sizeHint() const { return minimumSize(); }
+ TQSizePolicy sizePolicy() const;
protected:
- void paintEvent( QPaintEvent* );
- void enterEvent( QEvent* );
- void leaveEvent( QEvent* );
+ void paintEvent( TQPaintEvent* );
+ void enterEvent( TQEvent* );
+ void leaveEvent( TQEvent* );
const AppletHandle* m_parent;
private:
@@ -113,10 +113,10 @@ class AppletHandleButton : public SimpleArrowButton
public:
AppletHandleButton(AppletHandle *parent);
- QSize minimumSizeHint() const;
- QSize minimumSize() const { return minimumSizeHint(); }
- QSize sizeHint() const { return minimumSize(); }
- QSizePolicy sizePolicy() const;
+ TQSize minimumSizeHint() const;
+ TQSize minimumSize() const { return minimumSizeHint(); }
+ TQSize sizeHint() const { return minimumSize(); }
+ TQSizePolicy sizePolicy() const;
private:
bool m_moveMouse;
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index 390b934d3..77c6d1912 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -21,14 +21,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qcursor.h>
+#include <tqcursor.h>
#include <qxembed.h>
-#include <qframe.h>
-#include <qlayout.h>
-#include <qhbox.h>
-#include <qfile.h>
-#include <qtimer.h>
-#include <qtooltip.h>
+#include <tqframe.h>
+#include <tqlayout.h>
+#include <tqhbox.h>
+#include <tqfile.h>
+#include <tqtimer.h>
+#include <tqtooltip.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -57,12 +57,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define APPLET_MARGIN 1
AppletContainer::AppletContainer(const AppletInfo& info,
- QPopupMenu* opMenu,
+ TQPopupMenu* opMenu,
bool immutable,
- QWidget* parent )
+ TQWidget* parent )
: BaseContainer(opMenu,
parent,
- QString(info.library() + "container").latin1()),
+ TQString(info.library() + "container").latin1()),
_info(info),
_handle(0),
_layout(0),
@@ -74,28 +74,28 @@ AppletContainer::AppletContainer(const AppletInfo& info,
setBackgroundOrigin(AncestorOrigin);
//setup appletframe
- _appletframe = new QHBox(this);
+ _appletframe = new TQHBox(this);
_appletframe->setBackgroundOrigin( AncestorOrigin );
- _appletframe->setFrameStyle(QFrame::NoFrame);
+ _appletframe->setFrameStyle(TQFrame::NoFrame);
_appletframe->installEventFilter(this);
if (orientation() == Horizontal)
{
- _layout = new QBoxLayout(this, QBoxLayout::LeftToRight, 0, 0);
+ _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0);
}
else
{
- _layout = new QBoxLayout(this, QBoxLayout::TopToBottom, 0, 0);
+ _layout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 0, 0);
}
- _layout->setResizeMode( QLayout::FreeResize );
+ _layout->setResizeMode( TQLayout::FreeResize );
_layout->addSpacing(APPLET_MARGIN);
_handle = new AppletHandle(this);
_layout->addWidget(_handle, 0);
- connect(_handle, SIGNAL(moveApplet(const QPoint&)),
- this, SLOT(moveApplet(const QPoint&)));
- connect(_handle, SIGNAL(showAppletMenu()), this, SLOT(showAppletMenu()));
+ connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)),
+ this, TQT_SLOT(moveApplet(const TQPoint&)));
+ connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu()));
_layout->addWidget(_appletframe, 1);
_layout->activate();
@@ -124,12 +124,12 @@ AppletContainer::AppletContainer(const AppletInfo& info,
setImmutable(immutable);
- connect(_applet, SIGNAL(updateLayout()), SLOT(slotUpdateLayout()));
- connect(_applet, SIGNAL(requestFocus()), SLOT(activateWindow()));
- connect(_applet, SIGNAL(requestFocus(bool)), SLOT(focusRequested(bool)));
+ connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout()));
+ connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(activateWindow()));
+ connect(_applet, TQT_SIGNAL(requestFocus(bool)), TQT_SLOT(focusRequested(bool)));
- connect(Kicker::the(), SIGNAL(configurationChanged()),
- this, SLOT(slotReconfigure()));
+ connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
+ this, TQT_SLOT(slotReconfigure()));
}
void AppletContainer::configure()
@@ -193,17 +193,17 @@ void AppletContainer::resetLayout()
if (orientation() == Horizontal)
{
- _layout->setDirection( QBoxLayout::LeftToRight );
+ _layout->setDirection( TQBoxLayout::LeftToRight );
}
else
{
- _layout->setDirection( QBoxLayout::TopToBottom );
+ _layout->setDirection( TQBoxLayout::TopToBottom );
}
_layout->activate();
}
-void AppletContainer::moveApplet( const QPoint& moveOffset )
+void AppletContainer::moveApplet( const TQPoint& moveOffset )
{
_moveOffset = moveOffset;
emit moveme(this);
@@ -221,7 +221,7 @@ void AppletContainer::showAppletMenu()
return;
}
- QPopupMenu *menu = opMenu();
+ TQPopupMenu *menu = opMenu();
Kicker::the()->setInsertionPoint(_handle->mapToGlobal(_handle->rect().center()));
@@ -231,7 +231,7 @@ void AppletContainer::showAppletMenu()
moveApplet(_handle->mapToParent(_handle->rect().center()));
break;
case PanelAppletOpMenu::Remove:
- Kicker::the()->setInsertionPoint(QPoint());
+ Kicker::the()->setInsertionPoint(TQPoint());
emit removeme(this);
return; // Above signal will cause this to be deleted.
break;
@@ -251,7 +251,7 @@ void AppletContainer::showAppletMenu()
break;
}
- Kicker::the()->setInsertionPoint(QPoint());
+ Kicker::the()->setInsertionPoint(TQPoint());
clearOpMenu();
}
@@ -270,7 +270,7 @@ void AppletContainer::slotRemoved(KConfig* config)
return;
}
- QFile::remove(locateLocal("config", _configFile));
+ TQFile::remove(locateLocal("config", _configFile));
}
void AppletContainer::activateWindow()
@@ -314,15 +314,15 @@ void AppletContainer::doSaveConfiguration( KConfigGroup& config,
}
}
-QPopupMenu* AppletContainer::createOpMenu()
+TQPopupMenu* AppletContainer::createOpMenu()
{
- QPopupMenu* opMenu = new PanelAppletOpMenu(_actions, appletOpMenu(),
+ TQPopupMenu* opMenu = new PanelAppletOpMenu(_actions, appletOpMenu(),
appletsOwnMenu(),
_info.name(), _info.icon(),
this);
- connect(opMenu, SIGNAL(escapePressed()),
- _handle, SLOT(toggleMenuButtonOff()));
+ connect(opMenu, TQT_SIGNAL(escapePressed()),
+ _handle, TQT_SLOT(toggleMenuButtonOff()));
return opMenu;
}
@@ -339,7 +339,7 @@ void AppletContainer::slotUpdateLayout()
}
-const QPopupMenu* AppletContainer::appletsOwnMenu() const
+const TQPopupMenu* AppletContainer::appletsOwnMenu() const
{
if (!_applet)
{
@@ -447,8 +447,8 @@ void AppletContainer::setBackground()
if (KickerSettings::transparent())
{
// Trick to tell applets that they must refresh their transparent background if they need.
- QMoveEvent e(_applet->pos(), _applet->pos());
- QApplication::sendEvent(_applet, &e);
+ TQMoveEvent e(_applet->pos(), _applet->pos());
+ TQApplication::sendEvent(_applet, &e);
}
}
@@ -471,7 +471,7 @@ void AppletContainer::setImmutable(bool immutable)
}
else if (!_handle->isVisibleTo(this))
{
- QToolTip::add(_handle, _info.name());
+ TQToolTip::add(_handle, _info.name());
_handle->show();
setBackground();
}
diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h
index 8c364c09f..11eed1bfe 100644
--- a/kicker/kicker/core/container_applet.h
+++ b/kicker/kicker/core/container_applet.h
@@ -43,11 +43,11 @@ class AppletContainer : public BaseContainer
Q_OBJECT
public:
- AppletContainer(const AppletInfo& info, QPopupMenu* opMenu, bool isImmutable = false, QWidget* parent = 0);
+ AppletContainer(const AppletInfo& info, TQPopupMenu* opMenu, bool isImmutable = false, TQWidget* parent = 0);
KPanelApplet::Type type() const { return _type; }
const AppletInfo& info() const { return _info; }
- const QPopupMenu* appletsOwnMenu() const;
+ const TQPopupMenu* appletsOwnMenu() const;
bool isStretch() const { return type() == KPanelApplet::Stretch; }
void resetLayout();
@@ -58,9 +58,9 @@ public:
virtual void reportBug();
virtual void setBackground();
virtual bool isValid() const { return _valid; }
- virtual QString appletType() const { return "Applet"; }
- virtual QString icon() const { return _info.icon(); }
- virtual QString visibleName() const { return _info.name(); }
+ virtual TQString appletType() const { return "Applet"; }
+ virtual TQString icon() const { return _info.icon(); }
+ virtual TQString visibleName() const { return _info.name(); }
int widthForHeight(int height) const;
int heightForWidth(int width) const;
@@ -76,7 +76,7 @@ public slots:
virtual void setPopupDirection(KPanelApplet::Direction d);
virtual void setOrientation(KPanelExtension::Orientation o);
virtual void setImmutable(bool immutable);
- void moveApplet( const QPoint& moveOffset );
+ void moveApplet( const TQPoint& moveOffset );
void showAppletMenu();
void slotReconfigure();
void activateWindow();
@@ -86,18 +86,18 @@ protected:
virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const;
virtual void alignmentChange(KPanelExtension::Alignment a);
- virtual QPopupMenu* createOpMenu();
+ virtual TQPopupMenu* createOpMenu();
AppletInfo _info;
AppletHandle *_handle;
- QHBox *_appletframe;
- QBoxLayout *_layout;
+ TQHBox *_appletframe;
+ TQBoxLayout *_layout;
KPanelApplet::Type _type;
int _widthForHeightHint;
int _heightForWidthHint;
- QString _deskFile, _configFile;
+ TQString _deskFile, _configFile;
bool _firstuse;
- QCString _id;
+ TQCString _id;
KPanelApplet * _applet;
bool _valid;
diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp
index cadbe592a..bb3d7d984 100644
--- a/kicker/kicker/core/container_base.cpp
+++ b/kicker/kicker/core/container_base.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
#include <kglobal.h>
#include <kconfig.h>
@@ -34,14 +34,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "container_base.h"
#include "container_base.moc"
-BaseContainer::BaseContainer( QPopupMenu* appletOpMenu, QWidget* parent, const char * name )
- : QWidget( parent, name )
+BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const char * name )
+ : TQWidget( parent, name )
, _dir(KPanelApplet::Up)
, _orient(Horizontal)
, _alignment(KPanelExtension::LeftTop)
, _fspace(0)
- , _moveOffset(QPoint(0,0))
- , _aid(QString::null)
+ , _moveOffset(TQPoint(0,0))
+ , _aid(TQString::null)
, _actions(0)
, m_immutable(false)
, _opMnu(0)
@@ -53,10 +53,10 @@ BaseContainer::~BaseContainer()
delete _opMnu;
}
-void BaseContainer::reparent(QWidget* parent, WFlags f, const QPoint& p, bool showIt)
+void BaseContainer::reparent(TQWidget* parent, WFlags f, const TQPoint& p, bool showIt)
{
emit takeme(this);
- QWidget::reparent(parent, f, p, showIt);
+ TQWidget::reparent(parent, f, p, showIt);
}
bool BaseContainer::isImmutable() const
@@ -121,7 +121,7 @@ void BaseContainer::setAlignment(KPanelExtension::Alignment a)
alignmentChange(a);
}
-QPopupMenu* BaseContainer::opMenu()
+TQPopupMenu* BaseContainer::opMenu()
{
if (_opMnu == 0)
{
diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h
index aa3efeb98..1da1500cd 100644
--- a/kicker/kicker/core/container_base.h
+++ b/kicker/kicker/core/container_base.h
@@ -24,9 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __container_base_h__
#define __container_base_h__
-#include <qwidget.h>
-#include <qpoint.h>
-#include <qvaluelist.h>
+#include <tqwidget.h>
+#include <tqpoint.h>
+#include <tqvaluelist.h>
#include <kpanelextension.h>
#include <kpanelapplet.h>
@@ -39,14 +39,14 @@ class BaseContainer : public QWidget
Q_OBJECT
public:
- typedef QValueList<BaseContainer*> List;
- typedef QValueListIterator<BaseContainer*> Iterator;
- typedef QValueListConstIterator<BaseContainer*> ConstIterator;
+ typedef TQValueList<BaseContainer*> List;
+ typedef TQValueListIterator<BaseContainer*> Iterator;
+ typedef TQValueListConstIterator<BaseContainer*> ConstIterator;
- BaseContainer( QPopupMenu* appletOpMenu, QWidget* parent = 0, const char * name = 0 );
+ BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent = 0, const char * name = 0 );
~BaseContainer();
- virtual void reparent(QWidget * parent, WFlags f, const QPoint & p, bool showIt = false);
+ virtual void reparent(TQWidget * parent, WFlags f, const TQPoint & p, bool showIt = false);
virtual int widthForHeight(int height) const = 0;
virtual int heightForWidth(int width) const = 0;
@@ -66,8 +66,8 @@ public:
double freeSpace() const { return _fspace; }
void setFreeSpace(double f) { _fspace = f; }
- QString appletId() const { return _aid; }
- void setAppletId(const QString& s) { _aid = s; }
+ TQString appletId() const { return _aid; }
+ void setAppletId(const TQString& s) { _aid = s; }
virtual int actions() const { return _actions; }
@@ -77,7 +77,7 @@ public:
virtual void setBackground() {}
- QPopupMenu* opMenu();
+ TQPopupMenu* opMenu();
void clearOpMenu();
void loadConfiguration( KConfigGroup& );
@@ -86,11 +86,11 @@ public:
void configure(KPanelExtension::Orientation, KPanelApplet::Direction);
virtual void configure() {}
- QPoint moveOffset() const { return _moveOffset; }
+ TQPoint moveOffset() const { return _moveOffset; }
- virtual QString appletType() const = 0;
- virtual QString icon() const { return "unknown"; }
- virtual QString visibleName() const = 0;
+ virtual TQString appletType() const = 0;
+ virtual TQString icon() const { return "unknown"; }
+ virtual TQString visibleName() const = 0;
public slots:
virtual void slotRemoved(KConfig* config);
@@ -113,21 +113,21 @@ protected:
bool /* layoutOnly */ ) const {}
virtual void alignmentChange(KPanelExtension::Alignment) {}
- virtual QPopupMenu* createOpMenu() = 0;
- QPopupMenu *appletOpMenu() const { return _appletOpMnu; }
+ virtual TQPopupMenu* createOpMenu() = 0;
+ TQPopupMenu *appletOpMenu() const { return _appletOpMnu; }
KPanelApplet::Direction _dir;
KPanelExtension::Orientation _orient;
KPanelExtension::Alignment _alignment;
double _fspace;
- QPoint _moveOffset;
- QString _aid;
+ TQPoint _moveOffset;
+ TQString _aid;
int _actions;
bool m_immutable;
private:
- QPopupMenu *_opMnu;
- QPopupMenu *_appletOpMnu;
+ TQPopupMenu *_opMnu;
+ TQPopupMenu *_appletOpMnu;
};
#endif
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index b050f371d..8ac39a47f 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <algorithm>
-#include <qlayout.h>
+#include <tqlayout.h>
#include <kapplication.h>
#include <kconfig.h>
@@ -56,7 +56,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "container_button.h"
#include "container_button.moc"
-ButtonContainer::ButtonContainer(QPopupMenu* opMenu, QWidget* parent)
+ButtonContainer::ButtonContainer(TQPopupMenu* opMenu, TQWidget* parent)
: BaseContainer(opMenu, parent)
, _button(0)
, _layout(0)
@@ -145,21 +145,21 @@ void ButtonContainer::embedButton(PanelButton* b)
if (!b) return;
delete _layout;
- _layout = new QVBoxLayout(this);
+ _layout = new TQVBoxLayout(this);
_button = b;
_button->installEventFilter(this);
_layout->add(_button);
- connect(_button, SIGNAL(requestSave()), SIGNAL(requestSave()));
- connect(_button, SIGNAL(hideme(bool)), SLOT(hideRequested(bool)));
- connect(_button, SIGNAL(removeme()), SLOT(removeRequested()));
- connect(_button, SIGNAL(dragme(const QPixmap)),
- SLOT(dragButton(const QPixmap)));
- connect(_button, SIGNAL(dragme(const KURL::List, const QPixmap)),
- SLOT(dragButton(const KURL::List, const QPixmap)));
+ connect(_button, TQT_SIGNAL(requestSave()), TQT_SIGNAL(requestSave()));
+ connect(_button, TQT_SIGNAL(hideme(bool)), TQT_SLOT(hideRequested(bool)));
+ connect(_button, TQT_SIGNAL(removeme()), TQT_SLOT(removeRequested()));
+ connect(_button, TQT_SIGNAL(dragme(const TQPixmap)),
+ TQT_SLOT(dragButton(const TQPixmap)));
+ connect(_button, TQT_SIGNAL(dragme(const KURL::List, const TQPixmap)),
+ TQT_SLOT(dragButton(const KURL::List, const TQPixmap)));
}
-QPopupMenu* ButtonContainer::createOpMenu()
+TQPopupMenu* ButtonContainer::createOpMenu()
{
return new PanelAppletOpMenu(_actions, appletOpMenu(), 0, _button->title(),
_button->icon(), this);
@@ -187,7 +187,7 @@ void ButtonContainer::hideRequested(bool shouldHide)
}
}
-void ButtonContainer::dragButton(const KURL::List urls, const QPixmap icon)
+void ButtonContainer::dragButton(const KURL::List urls, const TQPixmap icon)
{
if (isImmutable())
{
@@ -203,7 +203,7 @@ void ButtonContainer::dragButton(const KURL::List urls, const QPixmap icon)
releaseKeyboard();
}
-void ButtonContainer::dragButton(const QPixmap icon)
+void ButtonContainer::dragButton(const TQPixmap icon)
{
PanelDrag* dd = new PanelDrag(this, this);
dd->setPixmap(icon);
@@ -212,9 +212,9 @@ void ButtonContainer::dragButton(const QPixmap icon)
releaseKeyboard();
}
-bool ButtonContainer::eventFilter(QObject *o, QEvent *e)
+bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
{
- if (o == _button && e->type() == QEvent::MouseButtonPress)
+ if (o == _button && e->type() == TQEvent::MouseButtonPress)
{
static bool sentinal = false;
@@ -224,7 +224,7 @@ bool ButtonContainer::eventFilter(QObject *o, QEvent *e)
}
sentinal = true;
- QMouseEvent* me = static_cast<QMouseEvent*>(e);
+ TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
switch (me->button())
{
case MidButton:
@@ -249,11 +249,11 @@ bool ButtonContainer::eventFilter(QObject *o, QEvent *e)
break;
}
- QPopupMenu* menu = opMenu();
- connect( menu, SIGNAL( aboutToHide() ), this, SLOT( slotMenuClosed() ) );
- QPoint pos = KickerLib::popupPosition(popupDirection(), menu, this,
+ TQPopupMenu* menu = opMenu();
+ connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) );
+ TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this,
(orientation() == Horizontal) ?
- QPoint(0, 0) : me->pos());
+ TQPoint(0, 0) : me->pos());
Kicker::the()->setInsertionPoint(me->globalPos());
@@ -284,7 +284,7 @@ bool ButtonContainer::eventFilter(QObject *o, QEvent *e)
}
KickerTip::enableTipping(true);
- Kicker::the()->setInsertionPoint(QPoint());
+ Kicker::the()->setInsertionPoint(TQPoint());
clearOpMenu();
sentinal = false;
return true;
@@ -322,7 +322,7 @@ void ButtonContainer::checkImmutability(const KConfigGroup& config)
}
// KMenuButton containerpan
-KMenuButtonContainer::KMenuButtonContainer(const KConfigGroup& config, QPopupMenu *opMenu, QWidget* parent)
+KMenuButtonContainer::KMenuButtonContainer(const KConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
checkImmutability(config);
@@ -330,7 +330,7 @@ KMenuButtonContainer::KMenuButtonContainer(const KConfigGroup& config, QPopupMen
_actions = PanelAppletOpMenu::KMenuEditor;
}
-KMenuButtonContainer::KMenuButtonContainer(QPopupMenu *opMenu, QWidget* parent)
+KMenuButtonContainer::KMenuButtonContainer(TQPopupMenu *opMenu, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
embedButton( new KButton(this) );
@@ -346,14 +346,14 @@ int KMenuButtonContainer::heightForWidth( int width ) const
}
// DesktopButton container
-DesktopButtonContainer::DesktopButtonContainer(QPopupMenu *opMenu, QWidget* parent)
+DesktopButtonContainer::DesktopButtonContainer(TQPopupMenu *opMenu, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
embedButton( new DesktopButton(this) );
}
DesktopButtonContainer::DesktopButtonContainer(const KConfigGroup& config,
- QPopupMenu *opMenu, QWidget* parent)
+ TQPopupMenu *opMenu, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
checkImmutability(config);
@@ -361,8 +361,8 @@ DesktopButtonContainer::DesktopButtonContainer(const KConfigGroup& config,
}
// ServiceButton container
-ServiceButtonContainer::ServiceButtonContainer( const QString& desktopFile,
- QPopupMenu* opMenu, QWidget* parent)
+ServiceButtonContainer::ServiceButtonContainer( const TQString& desktopFile,
+ TQPopupMenu* opMenu, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
embedButton( new ServiceButton( desktopFile, this ) );
@@ -370,7 +370,7 @@ ServiceButtonContainer::ServiceButtonContainer( const QString& desktopFile,
}
ServiceButtonContainer::ServiceButtonContainer( const KService::Ptr &service,
- QPopupMenu* opMenu, QWidget* parent)
+ TQPopupMenu* opMenu, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
embedButton( new ServiceButton( service, this ) );
@@ -378,7 +378,7 @@ ServiceButtonContainer::ServiceButtonContainer( const KService::Ptr &service,
}
ServiceButtonContainer::ServiceButtonContainer( const KConfigGroup& config,
- QPopupMenu* opMenu, QWidget* parent)
+ TQPopupMenu* opMenu, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
checkImmutability(config);
@@ -386,25 +386,25 @@ ServiceButtonContainer::ServiceButtonContainer( const KConfigGroup& config,
_actions = KPanelApplet::Preferences;
}
-QString ServiceButtonContainer::icon() const
+TQString ServiceButtonContainer::icon() const
{
return button()->icon();
}
-QString ServiceButtonContainer::visibleName() const
+TQString ServiceButtonContainer::visibleName() const
{
return button()->title();
}
// URLButton container
-URLButtonContainer::URLButtonContainer( const QString& url, QPopupMenu* opMenu, QWidget* parent )
+URLButtonContainer::URLButtonContainer( const TQString& url, TQPopupMenu* opMenu, TQWidget* parent )
: ButtonContainer(opMenu, parent)
{
embedButton( new URLButton( url, this ) );
_actions = KPanelApplet::Preferences;
}
-URLButtonContainer::URLButtonContainer( const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent)
+URLButtonContainer::URLButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
checkImmutability(config);
@@ -412,25 +412,25 @@ URLButtonContainer::URLButtonContainer( const KConfigGroup& config, QPopupMenu*
_actions = KPanelApplet::Preferences;
}
-QString URLButtonContainer::icon() const
+TQString URLButtonContainer::icon() const
{
return button()->icon();
}
-QString URLButtonContainer::visibleName() const
+TQString URLButtonContainer::visibleName() const
{
return button()->title();
}
// BrowserButton container
-BrowserButtonContainer::BrowserButtonContainer(const QString &startDir, QPopupMenu* opMenu, const QString& icon, QWidget* parent)
+BrowserButtonContainer::BrowserButtonContainer(const TQString &startDir, TQPopupMenu* opMenu, const TQString& icon, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
embedButton( new BrowserButton(icon, startDir, this) );
_actions = KPanelApplet::Preferences;
}
-BrowserButtonContainer::BrowserButtonContainer( const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent)
+BrowserButtonContainer::BrowserButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
checkImmutability(config);
@@ -439,45 +439,45 @@ BrowserButtonContainer::BrowserButtonContainer( const KConfigGroup& config, QPop
}
// ServiceMenuButton container
-ServiceMenuButtonContainer::ServiceMenuButtonContainer(const QString& relPath, QPopupMenu* opMenu, QWidget* parent)
+ServiceMenuButtonContainer::ServiceMenuButtonContainer(const TQString& relPath, TQPopupMenu* opMenu, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
embedButton( new ServiceMenuButton(relPath, this) );
}
-ServiceMenuButtonContainer::ServiceMenuButtonContainer( const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent)
+ServiceMenuButtonContainer::ServiceMenuButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
checkImmutability(config);
embedButton( new ServiceMenuButton(config, this) );
}
-QString ServiceMenuButtonContainer::icon() const
+TQString ServiceMenuButtonContainer::icon() const
{
return button()->icon();
}
-QString ServiceMenuButtonContainer::visibleName() const
+TQString ServiceMenuButtonContainer::visibleName() const
{
return button()->title();
}
// WindowListButton container
-WindowListButtonContainer::WindowListButtonContainer(const KConfigGroup& config, QPopupMenu *opMenu, QWidget* parent)
+WindowListButtonContainer::WindowListButtonContainer(const KConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
checkImmutability(config);
embedButton( new WindowListButton(this) );
}
-WindowListButtonContainer::WindowListButtonContainer(QPopupMenu *opMenu, QWidget* parent)
+WindowListButtonContainer::WindowListButtonContainer(TQPopupMenu *opMenu, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
embedButton( new WindowListButton(this) );
}
// BookmarkButton container
-BookmarksButtonContainer::BookmarksButtonContainer(const KConfigGroup& config, QPopupMenu *opMenu, QWidget* parent)
+BookmarksButtonContainer::BookmarksButtonContainer(const KConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
checkImmutability(config);
@@ -485,7 +485,7 @@ BookmarksButtonContainer::BookmarksButtonContainer(const KConfigGroup& config, Q
_actions = PanelAppletOpMenu::BookmarkEditor;
}
-BookmarksButtonContainer::BookmarksButtonContainer(QPopupMenu *opMenu, QWidget* parent)
+BookmarksButtonContainer::BookmarksButtonContainer(TQPopupMenu *opMenu, TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
embedButton( new BookmarksButton(this) );
@@ -493,14 +493,14 @@ BookmarksButtonContainer::BookmarksButtonContainer(QPopupMenu *opMenu, QWidget*
}
// NonKDEAppButton container
-NonKDEAppButtonContainer::NonKDEAppButtonContainer(const QString &name,
- const QString &description,
- const QString &filePath,
- const QString &icon,
- const QString &cmdLine,
+NonKDEAppButtonContainer::NonKDEAppButtonContainer(const TQString &name,
+ const TQString &description,
+ const TQString &filePath,
+ const TQString &icon,
+ const TQString &cmdLine,
bool inTerm,
- QPopupMenu* opMenu,
- QWidget* parent)
+ TQPopupMenu* opMenu,
+ TQWidget* parent)
: ButtonContainer(opMenu, parent)
{
embedButton(new NonKDEAppButton(name, description, filePath, icon, cmdLine,
@@ -508,7 +508,7 @@ NonKDEAppButtonContainer::NonKDEAppButtonContainer(const QString &name,
_actions = KPanelApplet::Preferences;
}
-NonKDEAppButtonContainer::NonKDEAppButtonContainer( const KConfigGroup& config, QPopupMenu* opMenu, QWidget *parent)
+NonKDEAppButtonContainer::NonKDEAppButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent)
: ButtonContainer(opMenu, parent)
{
checkImmutability(config);
@@ -517,25 +517,25 @@ NonKDEAppButtonContainer::NonKDEAppButtonContainer( const KConfigGroup& config,
}
// ExtensionButton container
-ExtensionButtonContainer::ExtensionButtonContainer(const QString& df, QPopupMenu* opMenu, QWidget *parent)
+ExtensionButtonContainer::ExtensionButtonContainer(const TQString& df, TQPopupMenu* opMenu, TQWidget *parent)
: ButtonContainer(opMenu, parent)
{
embedButton( new ExtensionButton(df, this) );
}
-ExtensionButtonContainer::ExtensionButtonContainer( const KConfigGroup& config, QPopupMenu* opMenu, QWidget *parent)
+ExtensionButtonContainer::ExtensionButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent)
: ButtonContainer(opMenu, parent)
{
checkImmutability(config);
embedButton( new ExtensionButton(config, this) );
}
-QString ExtensionButtonContainer::icon() const
+TQString ExtensionButtonContainer::icon() const
{
return button()->icon();
}
-QString ExtensionButtonContainer::visibleName() const
+TQString ExtensionButtonContainer::visibleName() const
{
return button()->title();
}
diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h
index 737271216..3d8592a6d 100644
--- a/kicker/kicker/core/container_button.h
+++ b/kicker/kicker/core/container_button.h
@@ -39,7 +39,7 @@ class ButtonContainer : public BaseContainer
Q_OBJECT
public:
- ButtonContainer(QPopupMenu* opMenu, QWidget* parent = 0);
+ ButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0);
virtual bool isValid() const;
virtual bool isAMenu() const { return false; }
@@ -51,7 +51,7 @@ public:
virtual void configure();
- bool eventFilter (QObject *, QEvent *);
+ bool eventFilter (TQObject *, TQEvent *);
virtual void completeMoveOperation();
PanelButton* button() const { return _button; }
@@ -64,29 +64,29 @@ protected slots:
void slotMenuClosed();
void removeRequested();
void hideRequested(bool);
- void dragButton(const KURL::List urls, const QPixmap icon);
- void dragButton(const QPixmap icon);
+ void dragButton(const KURL::List urls, const TQPixmap icon);
+ void dragButton(const TQPixmap icon);
protected:
virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const;
void embedButton(PanelButton* p);
- QPopupMenu* createOpMenu();
+ TQPopupMenu* createOpMenu();
void checkImmutability(const KConfigGroup&);
protected:
PanelButton *_button;
- QLayout *_layout;
- QPoint _oldpos;
+ TQLayout *_layout;
+ TQPoint _oldpos;
};
class KMenuButtonContainer : public ButtonContainer
{
public:
- KMenuButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0);
- KMenuButtonContainer(QPopupMenu* opMenu, QWidget* parent = 0);
- virtual QString appletType() const { return "KMenuButton"; }
- virtual QString icon() const { return "kmenu"; }
- virtual QString visibleName() const { return i18n("K Menu"); }
+ KMenuButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+ KMenuButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0);
+ virtual TQString appletType() const { return "KMenuButton"; }
+ virtual TQString icon() const { return "kmenu"; }
+ virtual TQString visibleName() const { return i18n("K Menu"); }
virtual int heightForWidth( int width ) const;
bool isAMenu() const { return true; }
@@ -95,99 +95,99 @@ public:
class DesktopButtonContainer : public ButtonContainer
{
public:
- DesktopButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0);
- DesktopButtonContainer(QPopupMenu* opMenu, QWidget* parent = 0);
- QString appletType() const { return "DesktopButton"; }
- virtual QString icon() const { return "desktop"; }
- virtual QString visibleName() const { return i18n("Desktop Access"); }
+ DesktopButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+ DesktopButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0);
+ TQString appletType() const { return "DesktopButton"; }
+ virtual TQString icon() const { return "desktop"; }
+ virtual TQString visibleName() const { return i18n("Desktop Access"); }
};
class ServiceButtonContainer : public ButtonContainer
{
public:
- ServiceButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0);
- ServiceButtonContainer(const KService::Ptr & service, QPopupMenu* opMenu,QWidget* parent = 0);
- ServiceButtonContainer(const QString& desktopFile, QPopupMenu* opMenu,QWidget* parent = 0);
- QString appletType() const { return "ServiceButton"; }
- virtual QString icon() const;
- virtual QString visibleName() const;
+ ServiceButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+ ServiceButtonContainer(const KService::Ptr & service, TQPopupMenu* opMenu,TQWidget* parent = 0);
+ ServiceButtonContainer(const TQString& desktopFile, TQPopupMenu* opMenu,TQWidget* parent = 0);
+ TQString appletType() const { return "ServiceButton"; }
+ virtual TQString icon() const;
+ virtual TQString visibleName() const;
};
class URLButtonContainer : public ButtonContainer
{
public:
- URLButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0);
- URLButtonContainer(const QString& url, QPopupMenu* opMenu, QWidget* parent = 0);
- QString appletType() const { return "URLButton"; }
- virtual QString icon() const;
- virtual QString visibleName() const;
+ URLButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+ URLButtonContainer(const TQString& url, TQPopupMenu* opMenu, TQWidget* parent = 0);
+ TQString appletType() const { return "URLButton"; }
+ virtual TQString icon() const;
+ virtual TQString visibleName() const;
};
class BrowserButtonContainer : public ButtonContainer
{
public:
- BrowserButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0);
- BrowserButtonContainer(const QString& startDir, QPopupMenu* opMenu, const QString& icon = "kdisknav", QWidget* parent = 0);
- QString appletType() const { return "BrowserButton"; }
- virtual QString icon() const { return "kdisknav"; }
- virtual QString visibleName() const { return i18n("Quick Browser"); }
+ BrowserButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+ BrowserButtonContainer(const TQString& startDir, TQPopupMenu* opMenu, const TQString& icon = "kdisknav", TQWidget* parent = 0);
+ TQString appletType() const { return "BrowserButton"; }
+ virtual TQString icon() const { return "kdisknav"; }
+ virtual TQString visibleName() const { return i18n("Quick Browser"); }
bool isAMenu() const { return true; }
};
class ServiceMenuButtonContainer : public ButtonContainer
{
public:
- ServiceMenuButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0);
- ServiceMenuButtonContainer(const QString& relPath, QPopupMenu* opMenu, QWidget* parent = 0);
- QString appletType() const { return "ServiceMenuButton"; }
- virtual QString icon() const;
- virtual QString visibleName() const;
+ ServiceMenuButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+ ServiceMenuButtonContainer(const TQString& relPath, TQPopupMenu* opMenu, TQWidget* parent = 0);
+ TQString appletType() const { return "ServiceMenuButton"; }
+ virtual TQString icon() const;
+ virtual TQString visibleName() const;
bool isAMenu() const { return true; }
};
class WindowListButtonContainer : public ButtonContainer
{
public:
- WindowListButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0);
- WindowListButtonContainer(QPopupMenu* opMenu, QWidget* parent = 0);
- QString appletType() const { return "WindowListButton"; }
- virtual QString icon() const { return "window_list"; }
- virtual QString visibleName() const { return i18n("Windowlist"); }
+ WindowListButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+ WindowListButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0);
+ TQString appletType() const { return "WindowListButton"; }
+ virtual TQString icon() const { return "window_list"; }
+ virtual TQString visibleName() const { return i18n("Windowlist"); }
bool isAMenu() const { return true; }
};
class BookmarksButtonContainer : public ButtonContainer
{
public:
- BookmarksButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0);
- BookmarksButtonContainer(QPopupMenu* opMenu, QWidget* parent = 0);
- QString appletType() const { return "BookmarksButton"; }
- virtual QString icon() const { return "bookmark"; }
- virtual QString visibleName() const { return i18n("Bookmarks"); }
+ BookmarksButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
+ BookmarksButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0);
+ TQString appletType() const { return "BookmarksButton"; }
+ virtual TQString icon() const { return "bookmark"; }
+ virtual TQString visibleName() const { return i18n("Bookmarks"); }
bool isAMenu() const { return true; }
};
class NonKDEAppButtonContainer : public ButtonContainer
{
public:
- NonKDEAppButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget *parent=0);
- NonKDEAppButtonContainer(const QString &name, const QString &description,
- const QString &filePath, const QString &icon,
- const QString &cmdLine, bool inTerm,
- QPopupMenu* opMenu, QWidget* parent = 0);
- QString appletType() const { return "ExecButton"; }
- virtual QString icon() const { return "exec"; }
- virtual QString visibleName() const { return i18n("Non-KDE Application"); }
+ NonKDEAppButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent=0);
+ NonKDEAppButtonContainer(const TQString &name, const TQString &description,
+ const TQString &filePath, const TQString &icon,
+ const TQString &cmdLine, bool inTerm,
+ TQPopupMenu* opMenu, TQWidget* parent = 0);
+ TQString appletType() const { return "ExecButton"; }
+ virtual TQString icon() const { return "exec"; }
+ virtual TQString visibleName() const { return i18n("Non-KDE Application"); }
};
class ExtensionButtonContainer : public ButtonContainer
{
public:
- ExtensionButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget *parent=0);
- ExtensionButtonContainer(const QString& desktopFile, QPopupMenu* opMenu, QWidget *parent= 0);
- QString appletType() const { return "ExtensionButton"; }
- virtual QString icon() const;
- virtual QString visibleName() const;
+ ExtensionButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent=0);
+ ExtensionButtonContainer(const TQString& desktopFile, TQPopupMenu* opMenu, TQWidget *parent= 0);
+ TQString appletType() const { return "ExtensionButton"; }
+ virtual TQString icon() const;
+ virtual TQString visibleName() const;
bool isAMenu() const { return true; }
};
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 694513109..7aee673f1 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -24,16 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <stdlib.h>
#include <math.h>
-#include <qcursor.h>
-#include <qfile.h>
-#include <qlayout.h>
-#include <qmovie.h>
-#include <qpainter.h>
-#include <qtimer.h>
-#include <qtooltip.h>
-#include <qvbox.h>
+#include <tqcursor.h>
+#include <tqfile.h>
+#include <tqlayout.h>
+#include <tqmovie.h>
+#include <tqpainter.h>
+#include <tqtimer.h>
+#include <tqtooltip.h>
+#include <tqvbox.h>
#include <qxembed.h>
-#include <qcolor.h>
+#include <tqcolor.h>
#include <dcopclient.h>
#include <kconfig.h>
@@ -66,9 +66,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define PANEL_SPEED(x, c) (int)((1.0-2.0*fabs((x)-(c)/2.0)/c)*m_settings.hideAnimationSpeed()+1.0)
ExtensionContainer::ExtensionContainer(const AppletInfo& info,
- const QString& extensionId,
- QWidget *parent)
- : QFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder),
+ const TQString& extensionId,
+ TQWidget *parent)
+ : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder),
m_settings(KSharedConfig::openConfig(info.configFile())),
m_hideMode(ManualHide),
m_unhideTriggeredAt(UnhideTrigger::None),
@@ -93,9 +93,9 @@ ExtensionContainer::ExtensionContainer(const AppletInfo& info,
ExtensionContainer::ExtensionContainer(KPanelExtension* extension,
const AppletInfo& info,
- const QString& extensionId,
- QWidget *parent)
- : QFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder),
+ const TQString& extensionId,
+ TQWidget *parent)
+ : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder),
m_settings(KSharedConfig::openConfig(info.configFile())),
_autoHidden(false),
_userHidden(Unhidden),
@@ -111,7 +111,7 @@ ExtensionContainer::ExtensionContainer(KPanelExtension* extension,
m_maintainFocus(0),
m_panelOrder(ExtensionManager::the()->nextPanelOrder())
{
- m_extension->reparent(this, QPoint(0, 0));
+ m_extension->reparent(this, TQPoint(0, 0));
init();
}
@@ -122,38 +122,38 @@ void ExtensionContainer::init()
KWin::setState(winId(), NET::Sticky);
KWin::setOnAllDesktops(winId(), true);
- connect(Kicker::the()->kwinModule(), SIGNAL(strutChanged()), this, SLOT(strutChanged()));
- connect(Kicker::the()->kwinModule(), SIGNAL(currentDesktopChanged(int)),
- this, SLOT( currentDesktopChanged(int)));
+ connect(Kicker::the()->kwinModule(), TQT_SIGNAL(strutChanged()), this, TQT_SLOT(strutChanged()));
+ connect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
+ this, TQT_SLOT( currentDesktopChanged(int)));
setBackgroundOrigin(AncestorOrigin);
setFrameStyle(NoFrame);
setLineWidth(0);
setMargin(0);
- connect(UnhideTrigger::the(), SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)),
- this, SLOT(unhideTriggered(UnhideTrigger::Trigger,int)));
+ connect(UnhideTrigger::the(), TQT_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)),
+ this, TQT_SLOT(unhideTriggered(UnhideTrigger::Trigger,int)));
_popupWidgetFilter = new PopupWidgetFilter( this );
- connect(_popupWidgetFilter, SIGNAL(popupWidgetHiding()), SLOT(maybeStartAutoHideTimer()));
+ connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer()));
// layout
- _layout = new QGridLayout(this, 3, 3, 0, 0);
- _layout->setResizeMode(QLayout::FreeResize);
+ _layout = new TQGridLayout(this, 3, 3, 0, 0);
+ _layout->setResizeMode(TQLayout::FreeResize);
_layout->setRowStretch(1,10);
_layout->setColStretch(1,10);
// instantiate the autohide timer
- _autohideTimer = new QTimer(this, "_autohideTimer");
- connect(_autohideTimer, SIGNAL(timeout()), SLOT(autoHideTimeout()));
+ _autohideTimer = new TQTimer(this, "_autohideTimer");
+ connect(_autohideTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoHideTimeout()));
// instantiate the updateLayout event compressor timer
- _updateLayoutTimer = new QTimer(this, "_updateLayoutTimer");
- connect(_updateLayoutTimer, SIGNAL(timeout()), SLOT(actuallyUpdateLayout()));
+ _updateLayoutTimer = new TQTimer(this, "_updateLayoutTimer");
+ connect(_updateLayoutTimer, TQT_SIGNAL(timeout()), TQT_SLOT(actuallyUpdateLayout()));
installEventFilter(this); // for mouse event handling
- connect(Kicker::the(), SIGNAL(kdisplayPaletteChanged()), this, SLOT(updateHighlightColor()));
+ connect(Kicker::the(), TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(updateHighlightColor()));
updateHighlightColor();
// if we were hidden when kicker quit, let's start out hidden as well!
@@ -192,9 +192,9 @@ void ExtensionContainer::init()
item->setDefaultValue(m_extension->customSize());
}
- connect(m_extension, SIGNAL(updateLayout()), SLOT(updateLayout()));
- connect(m_extension, SIGNAL(maintainFocus(bool)),
- SLOT(maintainFocus(bool)));
+ connect(m_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(updateLayout()));
+ connect(m_extension, TQT_SIGNAL(maintainFocus(bool)),
+ TQT_SLOT(maintainFocus(bool)));
_layout->addWidget(m_extension, 1, 1);
}
@@ -210,7 +210,7 @@ ExtensionContainer::~ExtensionContainer()
{
}
-QSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const QSize &maxSize) const
+TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &maxSize) const
{
int width = 0;
int height = 0;
@@ -255,7 +255,7 @@ QSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const QSize &max
height += _layout->rowSpacing(0) + _layout->rowSpacing(2);
}
- QSize size(width, height);
+ TQSize size(width, height);
size = size.boundedTo(maxSize);
if (m_extension)
@@ -342,7 +342,7 @@ void ExtensionContainer::writeConfig()
m_settings.writeConfig();
}
-void ExtensionContainer::showPanelMenu( const QPoint& globalPos )
+void ExtensionContainer::showPanelMenu( const TQPoint& globalPos )
{
if (!kapp->authorizeKAction("kicker_rmb"))
{
@@ -354,7 +354,7 @@ void ExtensionContainer::showPanelMenu( const QPoint& globalPos )
// use the extenion's own custom menu
Kicker::the()->setInsertionPoint(globalPos);
m_extension->customMenu()->exec(globalPos);
- Kicker::the()->setInsertionPoint(QPoint());
+ Kicker::the()->setInsertionPoint(TQPoint());
return;
}
@@ -366,7 +366,7 @@ void ExtensionContainer::showPanelMenu( const QPoint& globalPos )
this);
}
- QPopupMenu *menu = KickerLib::reduceMenu(_opMnu);
+ TQPopupMenu *menu = KickerLib::reduceMenu(_opMnu);
Kicker::the()->setInsertionPoint(globalPos);
@@ -390,7 +390,7 @@ void ExtensionContainer::showPanelMenu( const QPoint& globalPos )
default:
break;
}
- Kicker::the()->setInsertionPoint(QPoint());
+ Kicker::the()->setInsertionPoint(TQPoint());
}
void ExtensionContainer::about()
@@ -440,9 +440,9 @@ void ExtensionContainer::removeSessionConfigFile()
return;
}
- if (QFile::exists(locate("config", _info.configFile())))
+ if (TQFile::exists(locate("config", _info.configFile())))
{
- QFile::remove(locate("config", _info.configFile()));
+ TQFile::remove(locate("config", _info.configFile()));
}
}
@@ -462,7 +462,7 @@ void ExtensionContainer::moveMe()
stopAutoHideTimer();
- QApplication::syncX();
+ TQApplication::syncX();
UserRectSel::RectList rects;
KPanelExtension::Position positions[] = { KPanelExtension::Left,
@@ -473,7 +473,7 @@ void ExtensionContainer::moveMe()
KPanelExtension::Center,
KPanelExtension::RightBottom };
- for (int s = 0; s < QApplication::desktop()->numScreens(); s++)
+ for (int s = 0; s < TQApplication::desktop()->numScreens(); s++)
{
for (int i = 0; i < 4; i++)
{
@@ -552,13 +552,13 @@ void ExtensionContainer::actuallyUpdateLayout()
void ExtensionContainer::enableMouseOverEffects()
{
KickerTip::enableTipping(true);
- QPoint globalPos = QCursor::pos();
- QPoint localPos = mapFromGlobal(globalPos);
- QWidget* child = childAt(localPos);
+ TQPoint globalPos = TQCursor::pos();
+ TQPoint localPos = mapFromGlobal(globalPos);
+ TQWidget* child = childAt(localPos);
if (child)
{
- QMouseEvent* e = new QMouseEvent(QEvent::Enter, localPos, globalPos, 0, 0);
+ TQMouseEvent* e = new TQMouseEvent(TQEvent::Enter, localPos, globalPos, 0, 0);
qApp->sendEvent(child, e);
}
}
@@ -656,11 +656,11 @@ void ExtensionContainer::unhideTriggered(UnhideTrigger::Trigger tr, int Xinerama
// Otherwise hide mode is automatic. The code below is slightly
// complex so as to keep the same behavior as it has always had:
// only unhide when the cursor position is within the widget geometry.
- // We can't just do geometry().contains(QCursor::pos()) because
+ // We can't just do geometry().contains(TQCursor::pos()) because
// now we hide the panel completely off screen.
- int x = QCursor::pos().x();
- int y = QCursor::pos().y();
+ int x = TQCursor::pos().x();
+ int y = TQCursor::pos().y();
int t = geometry().top();
int b = geometry().bottom();
int r = geometry().right();
@@ -700,7 +700,7 @@ void ExtensionContainer::autoHideTimeout()
{
// kdDebug(1210) << "PanelContainer::autoHideTimeout() " << name() << endl;
// Hack: If there is a popup open, don't autohide until it closes.
- QWidget* popup = QApplication::activePopupWidget();
+ TQWidget* popup = TQApplication::activePopupWidget();
if (popup)
{
@@ -728,8 +728,8 @@ void ExtensionContainer::autoHideTimeout()
return;
}
- QRect r = geometry();
- QPoint p = QCursor::pos();
+ TQRect r = geometry();
+ TQPoint p = TQCursor::pos();
if (!r.contains(p) &&
(m_settings.unhideLocation() == UnhideTrigger::None ||
!shouldUnhideForTrigger(m_unhideTriggeredAt)))
@@ -763,21 +763,21 @@ void ExtensionContainer::autoHide(bool hide)
blockUserInput(true);
- QPoint oldpos = pos();
- QRect newextent = initialGeometry( position(), alignment(), xineramaScreen(), hide, Unhidden );
- QPoint newpos = newextent.topLeft();
+ TQPoint oldpos = pos();
+ TQRect newextent = initialGeometry( position(), alignment(), xineramaScreen(), hide, Unhidden );
+ TQPoint newpos = newextent.topLeft();
if (hide)
{
/* bail out if we are unable to hide */
- for (int s=0; s < QApplication::desktop()->numScreens(); s++)
+ for (int s=0; s < TQApplication::desktop()->numScreens(); s++)
{
/* don't let it intersect with any screen in the hidden position
* that it doesn't intesect in the shown position. Should prevent
* panels from hiding by sliding onto other screens, while still
* letting them show reveal buttons onscreen */
- QRect desktopGeom = QApplication::desktop()->screenGeometry(s);
+ TQRect desktopGeom = TQApplication::desktop()->screenGeometry(s);
if (desktopGeom.intersects(newextent) &&
!desktopGeom.intersects(geometry()))
{
@@ -848,11 +848,11 @@ void ExtensionContainer::autoHide(bool hide)
updateLayout();
// Sometimes tooltips don't get hidden
- QToolTip::hide();
+ TQToolTip::hide();
_in_autohide = false;
- QTimer::singleShot(100, this, SLOT(enableMouseOverEffects()));
+ TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects()));
}
void ExtensionContainer::animatedHide(bool left)
@@ -875,24 +875,24 @@ void ExtensionContainer::animatedHide(bool left)
newState = RightBottom;
}
- QPoint oldpos = pos();
- QRect newextent = initialGeometry(position(), alignment(), xineramaScreen(), false, newState);
- QPoint newpos(newextent.topLeft());
+ TQPoint oldpos = pos();
+ TQRect newextent = initialGeometry(position(), alignment(), xineramaScreen(), false, newState);
+ TQPoint newpos(newextent.topLeft());
if (newState != Unhidden)
{
/* bail out if we are unable to hide */
- for(int s=0; s < QApplication::desktop()->numScreens(); s++)
+ for(int s=0; s < TQApplication::desktop()->numScreens(); s++)
{
/* don't let it intersect with any screen in the hidden position
* that it doesn't intesect in the shown position. Should prevent
* panels from hiding by sliding onto other screens, while still
* letting them show reveal buttons onscreen */
- if (QApplication::desktop()->screenGeometry(s).intersects(newextent) &&
- !QApplication::desktop()->screenGeometry(s).intersects(geometry()))
+ if (TQApplication::desktop()->screenGeometry(s).intersects(newextent) &&
+ !TQApplication::desktop()->screenGeometry(s).intersects(geometry()))
{
blockUserInput(false);
- QTimer::singleShot(100, this, SLOT(enableMouseOverEffects()));
+ TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects()));
return;
}
}
@@ -955,7 +955,7 @@ void ExtensionContainer::animatedHide(bool left)
config->setGroup(extensionId());
config->writeEntry("UserHidden", userHidden());
- QTimer::singleShot(100, this, SLOT(enableMouseOverEffects()));
+ TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects()));
}
bool ExtensionContainer::reserveStrut() const
@@ -981,9 +981,9 @@ void ExtensionContainer::updateWindowManager()
int w = 0;
int h = 0;
- QRect geom = initialGeometry(position(), alignment(), xineramaScreen());
- QRect virtRect(QApplication::desktop()->geometry());
- QRect screenRect(QApplication::desktop()->screenGeometry(xineramaScreen()));
+ TQRect geom = initialGeometry(position(), alignment(), xineramaScreen());
+ TQRect virtRect(TQApplication::desktop()->geometry());
+ TQRect screenRect(TQApplication::desktop()->screenGeometry(xineramaScreen()));
if (m_hideMode == ManualHide && !userHidden())
{
@@ -1083,7 +1083,7 @@ void ExtensionContainer::currentDesktopChanged(int)
void ExtensionContainer::strutChanged()
{
//kdDebug(1210) << "PanelContainer::strutChanged()" << endl;
- QRect ig = currentGeometry();
+ TQRect ig = currentGeometry();
if (ig != geometry())
{
@@ -1265,8 +1265,8 @@ int ExtensionContainer::setupBorderSpace()
}
int layoutOffset = 0;
- QRect r = QApplication::desktop()->screenGeometry(xineramaScreen());
- QRect h = geometry();
+ TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen());
+ TQRect h = geometry();
if (orientation() == Vertical)
{
@@ -1340,28 +1340,28 @@ void ExtensionContainer::updateHighlightColor()
{
KConfig *config = KGlobal::config();
config->setGroup("WM");
- QColor color = QApplication::palette().active().highlight();
+ TQColor color = TQApplication::palette().active().highlight();
m_highlightColor = config->readColorEntry("activeBackground", &color);
update();
}
-void ExtensionContainer::paintEvent(QPaintEvent *e)
+void ExtensionContainer::paintEvent(TQPaintEvent *e)
{
- QFrame::paintEvent(e);
+ TQFrame::paintEvent(e);
if (needsBorder())
{
// draw border
- QPainter p(this);
+ TQPainter p(this);
if (KickerSettings::useBackgroundTheme() && KickerSettings::colorizeBackground())
p.setPen(m_highlightColor);
else
- p.setPen(palette().color(QPalette::Active, QColorGroup::Mid));
+ p.setPen(palette().color(TQPalette::Active, TQColorGroup::Mid));
p.drawRect(0, 0, width(), height());
}
}
-void ExtensionContainer::leaveEvent(QEvent*)
+void ExtensionContainer::leaveEvent(TQEvent*)
{
maybeStartAutoHideTimer();
}
@@ -1405,8 +1405,8 @@ void ExtensionContainer::unhideIfHidden(int showForAtLeastHowManyMS)
if (_autoHidden)
{
autoHide(false);
- QTimer::singleShot(showForAtLeastHowManyMS,
- this, SLOT(maybeStartAutoHideTimer()));
+ TQTimer::singleShot(showForAtLeastHowManyMS,
+ this, TQT_SLOT(maybeStartAutoHideTimer()));
return;
}
@@ -1433,19 +1433,19 @@ void ExtensionContainer::setHideButtons(bool showLeft, bool showRight)
resetLayout();
}
-bool ExtensionContainer::event(QEvent* e)
+bool ExtensionContainer::event(TQEvent* e)
{
// Update the layout when we receive a LayoutHint. This way we can adjust
// to changes of the layout of the main widget.
- if (e->type() == QEvent::LayoutHint)
+ if (e->type() == TQEvent::LayoutHint)
{
updateLayout();
}
- return QFrame::event(e);
+ return TQFrame::event(e);
}
-void ExtensionContainer::closeEvent(QCloseEvent* e)
+void ExtensionContainer::closeEvent(TQCloseEvent* e)
{
// Prevent being closed via Alt-F4
e->ignore();
@@ -1519,7 +1519,7 @@ KPanelExtension::Position ExtensionContainer::position() const
void ExtensionContainer::resetLayout()
{
- QRect g = initialGeometry(position(), alignment(), xineramaScreen(),
+ TQRect g = initialGeometry(position(), alignment(), xineramaScreen(),
autoHidden(), userHidden());
// Disable the layout while we rearrange the panel.
@@ -1547,7 +1547,7 @@ void ExtensionContainer::resetLayout()
_ltHB = new HideButton(this);
_ltHB->installEventFilter(this);
_ltHB->setEnabled(true);
- connect(_ltHB, SIGNAL(clicked()), this, SLOT(hideLeft()));
+ connect(_ltHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideLeft()));
haveToArrangeButtons = true;
}
@@ -1578,7 +1578,7 @@ void ExtensionContainer::resetLayout()
_rbHB = new HideButton(this);
_rbHB->installEventFilter(this);
_rbHB->setEnabled(true);
- connect(_rbHB, SIGNAL(clicked()), this, SLOT(hideRight()));
+ connect(_rbHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideRight()));
haveToArrangeButtons = true;
}
@@ -1602,27 +1602,27 @@ void ExtensionContainer::resetLayout()
if (_ltHB)
{
- QToolTip::remove(_ltHB);
+ TQToolTip::remove(_ltHB);
if (userHidden())
{
- QToolTip::add(_ltHB, i18n("Show panel"));
+ TQToolTip::add(_ltHB, i18n("Show panel"));
}
else
{
- QToolTip::add(_ltHB, i18n("Hide panel"));
+ TQToolTip::add(_ltHB, i18n("Hide panel"));
}
}
if (_rbHB)
{
- QToolTip::remove( _rbHB );
+ TQToolTip::remove( _rbHB );
if (userHidden())
{
- QToolTip::add(_rbHB, i18n("Show panel"));
+ TQToolTip::add(_rbHB, i18n("Show panel"));
}
else
{
- QToolTip::add(_rbHB, i18n("Hide panel"));
+ TQToolTip::add(_rbHB, i18n("Hide panel"));
}
}
@@ -1692,13 +1692,13 @@ bool ExtensionContainer::needsBorder() const
//&& !KickerSettings::useBackgroundTheme();
}
-QSize ExtensionContainer::initialSize(KPanelExtension::Position p, QRect workArea) const
+TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workArea) const
{
/*kdDebug(1210) << "initialSize() Work Area: (" << workArea.topLeft().x() <<
", " << workArea.topLeft().y() << ") to (" << workArea.bottomRight().x() <<
", " << workArea.bottomRight().y() << ")" << endl;*/
- QSize hint = sizeHint(p, workArea.size()).boundedTo(workArea.size());
+ TQSize hint = sizeHint(p, workArea.size()).boundedTo(workArea.size());
int width = 0;
int height = 0;
@@ -1723,25 +1723,25 @@ QSize ExtensionContainer::initialSize(KPanelExtension::Position p, QRect workAre
}
}
- return QSize(width, height);
+ return TQSize(width, height);
}
-QPoint ExtensionContainer::initialLocation(KPanelExtension::Position p,
+TQPoint ExtensionContainer::initialLocation(KPanelExtension::Position p,
KPanelExtension::Alignment a,
int XineramaScreen,
- const QSize &s,
- QRect workArea,
+ const TQSize &s,
+ TQRect workArea,
bool autohidden,
UserHidden userHidden) const
{
- QRect wholeScreen;
+ TQRect wholeScreen;
if (XineramaScreen == XineramaAllScreens)
{
- wholeScreen = QApplication::desktop()->geometry();
+ wholeScreen = TQApplication::desktop()->geometry();
}
else
{
- wholeScreen = QApplication::desktop()->screenGeometry(XineramaScreen);
+ wholeScreen = TQApplication::desktop()->screenGeometry(XineramaScreen);
}
/*kdDebug(1210) << "initialLocation() Work Area: (" <<
@@ -1890,7 +1890,7 @@ QPoint ExtensionContainer::initialLocation(KPanelExtension::Position p,
}
}
- return QPoint( left, top );
+ return TQPoint( left, top );
}
int ExtensionContainer::xineramaScreen() const
@@ -1900,14 +1900,14 @@ int ExtensionContainer::xineramaScreen() const
/* -2 means all screens, -1 primary screens, the rest are valid screen numbers */
if (XineramaAllScreens <= m_settings.xineramaScreen() &&
- m_settings.xineramaScreen() < QApplication::desktop()->numScreens())
+ m_settings.xineramaScreen() < TQApplication::desktop()->numScreens())
{
return m_settings.xineramaScreen();
}
else
{
/* force invalid screen locations onto the primary screen */
- return QApplication::desktop()->primaryScreen();
+ return TQApplication::desktop()->primaryScreen();
}
}
@@ -1921,13 +1921,13 @@ void ExtensionContainer::setXineramaScreen(int screen)
arrange(position(),alignment(), screen);
}
-QRect ExtensionContainer::currentGeometry() const
+TQRect ExtensionContainer::currentGeometry() const
{
return initialGeometry(position(), alignment(), xineramaScreen(),
autoHidden(), userHidden());
}
-QRect ExtensionContainer::initialGeometry(KPanelExtension::Position p,
+TQRect ExtensionContainer::initialGeometry(KPanelExtension::Position p,
KPanelExtension::Alignment a,
int XineramaScreen,
bool autoHidden,
@@ -1937,54 +1937,54 @@ QRect ExtensionContainer::initialGeometry(KPanelExtension::Position p,
/*kdDebug(1210) << "initialGeometry() Computing geometry for " << name() <<
" on screen " << XineramaScreen << endl;*/
- QRect workArea = ExtensionManager::the()->workArea(XineramaScreen, this);
- QSize size = initialSize(p, workArea);
- QPoint point = initialLocation(p, a, XineramaScreen,
+ TQRect workArea = ExtensionManager::the()->workArea(XineramaScreen, this);
+ TQSize size = initialSize(p, workArea);
+ TQPoint point = initialLocation(p, a, XineramaScreen,
size, workArea,
autoHidden, userHidden);
//kdDebug(1210) << "Size: " << size.width() << " x " << size.height() << endl;
//kdDebug(1210) << "Pos: (" << point.x() << ", " << point.y() << ")" << endl;
- return QRect(point, size);
+ return TQRect(point, size);
}
-bool ExtensionContainer::eventFilter( QObject*, QEvent * e)
+bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
{
if (autoHidden())
{
switch ( e->type() )
{
- case QEvent::MouseButtonPress:
- case QEvent::MouseButtonRelease:
- case QEvent::MouseButtonDblClick:
- case QEvent::MouseMove:
- case QEvent::KeyPress:
- case QEvent::KeyRelease:
+ case TQEvent::MouseButtonPress:
+ case TQEvent::MouseButtonRelease:
+ case TQEvent::MouseButtonDblClick:
+ case TQEvent::MouseMove:
+ case TQEvent::KeyPress:
+ case TQEvent::KeyRelease:
return true; // ignore;
default:
break;
}
}
- QEvent::Type eventType = e->type();
+ TQEvent::Type eventType = e->type();
if (_block_user_input)
{
- return (eventType == QEvent::MouseButtonPress ||
- eventType == QEvent::MouseButtonRelease ||
- eventType == QEvent::MouseButtonDblClick ||
- eventType == QEvent::MouseMove ||
- eventType == QEvent::KeyPress ||
- eventType == QEvent::KeyRelease ||
- eventType == QEvent::Enter ||
- eventType == QEvent::Leave);
+ return (eventType == TQEvent::MouseButtonPress ||
+ eventType == TQEvent::MouseButtonRelease ||
+ eventType == TQEvent::MouseButtonDblClick ||
+ eventType == TQEvent::MouseMove ||
+ eventType == TQEvent::KeyPress ||
+ eventType == TQEvent::KeyRelease ||
+ eventType == TQEvent::Enter ||
+ eventType == TQEvent::Leave);
}
switch (eventType)
{
- case QEvent::MouseButtonPress:
+ case TQEvent::MouseButtonPress:
{
- QMouseEvent* me = static_cast<QMouseEvent*>(e);
+ TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
if ( me->button() == LeftButton )
{
_last_lmb_press = me->globalPos();
@@ -1998,9 +1998,9 @@ bool ExtensionContainer::eventFilter( QObject*, QEvent * e)
}
break;
- case QEvent::MouseButtonRelease:
+ case TQEvent::MouseButtonRelease:
{
- QMouseEvent* me = static_cast<QMouseEvent*>(e);
+ TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
if ( me->button() == LeftButton )
{
_is_lmb_down = false;
@@ -2008,16 +2008,16 @@ bool ExtensionContainer::eventFilter( QObject*, QEvent * e)
}
break;
- case QEvent::MouseMove:
+ case TQEvent::MouseMove:
{
- QMouseEvent* me = (QMouseEvent*) e;
+ TQMouseEvent* me = (TQMouseEvent*) e;
if (_is_lmb_down &&
((me->state() & LeftButton) == LeftButton) &&
!Kicker::the()->isImmutable() &&
!m_settings.config()->isImmutable() &&
!ExtensionManager::the()->isMenuBar(this))
{
- QPoint p(me->globalPos() - _last_lmb_press);
+ TQPoint p(me->globalPos() - _last_lmb_press);
int x_threshold = width();
int y_threshold = height();
@@ -2049,14 +2049,14 @@ bool ExtensionContainer::eventFilter( QObject*, QEvent * e)
return false;
}
-PopupWidgetFilter::PopupWidgetFilter( QObject *parent )
- : QObject( parent, "PopupWidgetFilter" )
+PopupWidgetFilter::PopupWidgetFilter( TQObject *parent )
+ : TQObject( parent, "PopupWidgetFilter" )
{
}
-bool PopupWidgetFilter::eventFilter( QObject*, QEvent* e )
+bool PopupWidgetFilter::eventFilter( TQObject*, TQEvent* e )
{
- if (e->type() == QEvent::Hide)
+ if (e->type() == TQEvent::Hide)
{
emit popupWidgetHiding();
}
diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h
index aebe048e6..cdc608392 100644
--- a/kicker/kicker/core/container_extension.h
+++ b/kicker/kicker/core/container_extension.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __container_extension_h__
#define __container_extension_h__
-#include <qframe.h>
-#include <qptrlist.h>
+#include <tqframe.h>
+#include <tqptrlist.h>
#include <kpanelextension.h>
#include <dcopobject.h>
@@ -58,24 +58,24 @@ public:
enum HideMode { ManualHide, AutomaticHide, BackgroundHide };
ExtensionContainer(const AppletInfo& info,
- const QString& extensionId,
- QWidget *parent = 0);
+ const TQString& extensionId,
+ TQWidget *parent = 0);
ExtensionContainer(KPanelExtension* extension,
const AppletInfo& info,
- const QString& extensionId,
- QWidget *parent = 0);
+ const TQString& extensionId,
+ TQWidget *parent = 0);
virtual ~ExtensionContainer();
- virtual QSize sizeHint(KPanelExtension::Position, const QSize &maxSize) const;
+ virtual TQSize sizeHint(KPanelExtension::Position, const TQSize &maxSize) const;
const AppletInfo& info() const { return _info; }
- QString extensionId() const { return _id; }
+ TQString extensionId() const { return _id; }
void readConfig();
void writeConfig();
- virtual QString panelId() const { return extensionId(); }
+ virtual TQString panelId() const { return extensionId(); }
virtual void about();
virtual void help();
@@ -103,12 +103,12 @@ public:
KPanelExtension::Alignment alignment() const;
void setAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); }
- QRect currentGeometry() const;
- QRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a,
+ TQRect currentGeometry() const;
+ TQRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a,
int XineramaScreen, bool autoHidden = false,
UserHidden userHidden = Unhidden) const;
- bool eventFilter( QObject *, QEvent * );
+ bool eventFilter( TQObject *, TQEvent * );
int panelOrder() const { return m_panelOrder; }
void setPanelOrder(int order) { m_panelOrder = order; }
@@ -117,7 +117,7 @@ signals:
void removeme(ExtensionContainer*);
protected slots:
- virtual void showPanelMenu( const QPoint& pos );
+ virtual void showPanelMenu( const TQPoint& pos );
void moveMe();
void updateLayout();
void actuallyUpdateLayout();
@@ -125,10 +125,10 @@ protected slots:
void updateHighlightColor();
protected:
- bool event(QEvent*);
- void closeEvent( QCloseEvent* e );
- void paintEvent(QPaintEvent*);
- void leaveEvent(QEvent*);
+ bool event(TQEvent*);
+ void closeEvent( TQCloseEvent* e );
+ void paintEvent(TQPaintEvent*);
+ void leaveEvent(TQEvent*);
void arrange(KPanelExtension::Position p, KPanelExtension::Alignment a, int XineramaScreen);
bool autoHidden() const { return _autoHidden; };
@@ -154,9 +154,9 @@ private slots:
private:
bool shouldUnhideForTrigger(UnhideTrigger::Trigger t) const;
void init();
- QSize initialSize(KPanelExtension::Position p, QRect workArea) const;
- QPoint initialLocation(KPanelExtension::Position p, KPanelExtension::Alignment a,
- int XineramaScreen, const QSize &s, QRect workArea,
+ TQSize initialSize(KPanelExtension::Position p, TQRect workArea) const;
+ TQPoint initialLocation(KPanelExtension::Position p, KPanelExtension::Alignment a,
+ int XineramaScreen, const TQSize &s, TQRect workArea,
bool autohidden = false, UserHidden userHidden = Unhidden) const;
void positionChange(KPanelExtension::Position p);
void alignmentChange(KPanelExtension::Alignment a);
@@ -172,17 +172,17 @@ private:
bool _autoHidden;
UserHidden _userHidden;
bool _block_user_input;
- QPoint _last_lmb_press;
+ TQPoint _last_lmb_press;
bool _is_lmb_down;
bool _in_autohide;
// Misc objects
- QTimer *_autohideTimer;
- QTimer *_updateLayoutTimer;
+ TQTimer *_autohideTimer;
+ TQTimer *_updateLayoutTimer;
NETExtendedStrut _strut;
PopupWidgetFilter *_popupWidgetFilter;
- QString _id;
+ TQString _id;
PanelExtensionOpMenu *_opMnu;
AppletInfo _info;
KPanelExtension::Type _type;
@@ -190,12 +190,12 @@ private:
// Widgets
HideButton *_ltHB; // Left Hide Button
HideButton *_rbHB; // Right Hide Button
- QGridLayout *_layout;
+ TQGridLayout *_layout;
KPanelExtension *m_extension;
int m_maintainFocus;
int m_panelOrder;
- QColor m_highlightColor;
+ TQColor m_highlightColor;
};
class PopupWidgetFilter : public QObject
@@ -203,13 +203,13 @@ class PopupWidgetFilter : public QObject
Q_OBJECT
public:
- PopupWidgetFilter( QObject *parent );
+ PopupWidgetFilter( TQObject *parent );
~PopupWidgetFilter() {}
- bool eventFilter( QObject *obj, QEvent* e );
+ bool eventFilter( TQObject *obj, TQEvent* e );
signals:
void popupWidgetHiding();
};
-typedef QValueList<ExtensionContainer*> ExtensionList;
+typedef TQValueList<ExtensionContainer*> ExtensionList;
#endif
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 23732e684..7d63d562a 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <unistd.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qstyle.h>
-#include <qtextstream.h>
-#include <qtimer.h>
-#include <qwmatrix.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqstyle.h>
+#include <tqtextstream.h>
+#include <tqtimer.h>
+#include <tqwmatrix.h>
#include <kapplication.h>
#include <kglobal.h>
@@ -69,8 +69,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extern int kicker_screen_number;
ContainerArea::ContainerArea(KConfig* _c,
- QWidget* parent,
- QPopupMenu* opMenu,
+ TQWidget* parent,
+ TQPopupMenu* opMenu,
const char* name)
: Panner(parent, name),
_moveAC(0),
@@ -78,7 +78,7 @@ ContainerArea::ContainerArea(KConfig* _c,
_config(_c),
_dragIndicator(0),
_dragMoveAC(0),
- _dragMoveOffset(QPoint(0,0)),
+ _dragMoveOffset(TQPoint(0,0)),
m_opMenu(opMenu),
_rootPixmap(0),
_useBgTheme(false),
@@ -100,11 +100,11 @@ ContainerArea::ContainerArea(KConfig* _c,
setBackground();
- connect(&_autoScrollTimer, SIGNAL(timeout()), SLOT(autoScroll()));
- connect(kapp, SIGNAL(kdisplayPaletteChanged()), SLOT(setBackground()));
- connect(Kicker::the(), SIGNAL(immutabilityChanged(bool)),
- SLOT(immutabilityChanged(bool)));
- connect(this, SIGNAL(contentsMoving(int, int)), SLOT(setBackground()));
+ connect(&_autoScrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoScroll()));
+ connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(setBackground()));
+ connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)),
+ TQT_SLOT(immutabilityChanged(bool)));
+ connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground()));
}
ContainerArea::~ContainerArea()
@@ -139,7 +139,7 @@ void ContainerArea::initialize(bool useDefaultConfig)
}
setAcceptDrops(!isImmutable());
- QTimer::singleShot(0, this, SLOT(resizeContents()));
+ TQTimer::singleShot(0, this, TQT_SLOT(resizeContents()));
}
void ContainerArea::defaultContainerConfig()
@@ -160,12 +160,12 @@ void ContainerArea::defaultContainerConfig()
}
dsize -= 560;
- QStringList buttons;
+ TQStringList buttons;
- QFile f(locate("data", "kicker/default-apps"));
+ TQFile f(locate("data", "kicker/default-apps"));
if (f.open(IO_ReadOnly))
{
- QTextStream is(&f);
+ TQTextStream is(&f);
while (!is.eof())
buttons << is.readLine();
@@ -179,7 +179,7 @@ void ContainerArea::defaultContainerConfig()
}
//int size = dsize;
- for (QStringList::ConstIterator it = buttons.begin(); it != buttons.end(); ++it)
+ for (TQStringList::ConstIterator it = buttons.begin(); it != buttons.end(); ++it)
{
/*size -= 42;
if (size <= 0)
@@ -190,9 +190,9 @@ void ContainerArea::defaultContainerConfig()
if (!service)
{
// look for a special button
- QString s = locate("appdata", *it);
+ TQString s = locate("appdata", *it);
if (s.isEmpty()) continue;
- QString itExt = (*it).section('/', 1);
+ TQString itExt = (*it).section('/', 1);
button = new ExtensionButtonContainer(itExt, m_opMenu, m_contents);
}
else
@@ -216,7 +216,7 @@ void ContainerArea::defaultContainerConfig()
AppletContainer* a = manager->createAppletContainer(
"minipagerapplet.desktop",
true,
- QString::null,
+ TQString::null,
m_opMenu,
m_contents);
if (a)
@@ -229,7 +229,7 @@ void ContainerArea::defaultContainerConfig()
a = manager->createAppletContainer(
"taskbarapplet.desktop",
true,
- QString::null,
+ TQString::null,
m_opMenu,
m_contents);
if (a)
@@ -242,7 +242,7 @@ void ContainerArea::defaultContainerConfig()
a = manager->createAppletContainer(
"systemtrayapplet.desktop",
true,
- QString::null,
+ TQString::null,
m_opMenu,
m_contents );
if (a)
@@ -255,7 +255,7 @@ void ContainerArea::defaultContainerConfig()
a = manager->createAppletContainer(
"clockapplet.desktop",
true,
- QString::null,
+ TQString::null,
m_opMenu,
m_contents );
if (a)
@@ -274,17 +274,17 @@ void ContainerArea::defaultContainerConfig()
saveContainerConfig();
}
-void ContainerArea::loadContainers(const QStringList& containers)
+void ContainerArea::loadContainers(const TQStringList& containers)
{
// read applet list
bool badApplets = false;
// now restore the applets
- QStringList::const_iterator it = containers.constBegin();
- QStringList::const_iterator itEnd = containers.constEnd();
+ TQStringList::const_iterator it = containers.constBegin();
+ TQStringList::const_iterator itEnd = containers.constEnd();
for (; it != itEnd; ++it)
{
- QString appletId(*it);
+ TQString appletId(*it);
// is there a config group for this applet?
if (!_config->hasGroup(appletId))
@@ -298,7 +298,7 @@ void ContainerArea::loadContainers(const QStringList& containers)
int sep = appletId.findRev('_');
Q_ASSERT(sep != -1);
- QString appletType = appletId.left(sep);
+ TQString appletType = appletId.left(sep);
// create a matching applet container
if (appletType == "KMenuButton")
@@ -359,7 +359,7 @@ void ContainerArea::loadContainers(const QStringList& containers)
// it gets executed too soon. we need to wait until the containers are
// actually resized, but we enter the event loop prior to that happening
// above.
- QTimer::singleShot(0, this, SLOT(updateContainersBackground()));
+ TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground()));
}
void ContainerArea::saveContainerConfig(bool layoutOnly)
@@ -370,8 +370,8 @@ void ContainerArea::saveContainerConfig(bool layoutOnly)
}
// Save the applet list
- QStringList alist;
- QLayoutIterator it2 = m_layout->iterator();
+ TQStringList alist;
+ TQLayoutIterator it2 = m_layout->iterator();
for (; it2.current(); ++it2)
{
BaseContainer* a = dynamic_cast<BaseContainer*>(it2.current()->widget());
@@ -414,9 +414,9 @@ void ContainerArea::configure()
resizeContents();
}
-const QWidget* ContainerArea::addButton(const AppletInfo& info)
+const TQWidget* ContainerArea::addButton(const AppletInfo& info)
{
- QString buttonType = info.library();
+ TQString buttonType = info.library();
if (buttonType == "BookmarksButton")
{
@@ -453,7 +453,7 @@ const QWidget* ContainerArea::addButton(const AppletInfo& info)
return 0;
}
-const QWidget* ContainerArea::addKMenuButton()
+const TQWidget* ContainerArea::addKMenuButton()
{
if (!canAddContainers())
{
@@ -465,7 +465,7 @@ const QWidget* ContainerArea::addKMenuButton()
return b;
}
-const QWidget* ContainerArea::addDesktopButton()
+const TQWidget* ContainerArea::addDesktopButton()
{
if (!canAddContainers())
{
@@ -477,7 +477,7 @@ const QWidget* ContainerArea::addDesktopButton()
return b;
}
-const QWidget* ContainerArea::addWindowListButton()
+const TQWidget* ContainerArea::addWindowListButton()
{
if (!canAddContainers())
{
@@ -489,7 +489,7 @@ const QWidget* ContainerArea::addWindowListButton()
return b;
}
-const QWidget* ContainerArea::addBookmarksButton()
+const TQWidget* ContainerArea::addBookmarksButton()
{
if (!canAddContainers())
{
@@ -501,7 +501,7 @@ const QWidget* ContainerArea::addBookmarksButton()
return b;
}
-const QWidget* ContainerArea::addServiceButton(const QString& desktopFile)
+const TQWidget* ContainerArea::addServiceButton(const TQString& desktopFile)
{
if (!canAddContainers())
{
@@ -514,7 +514,7 @@ const QWidget* ContainerArea::addServiceButton(const QString& desktopFile)
return b;
}
-const QWidget* ContainerArea::addURLButton(const QString &url)
+const TQWidget* ContainerArea::addURLButton(const TQString &url)
{
if (!canAddContainers())
{
@@ -526,17 +526,17 @@ const QWidget* ContainerArea::addURLButton(const QString &url)
return b;
}
-const QWidget* ContainerArea::addBrowserButton()
+const TQWidget* ContainerArea::addBrowserButton()
{
if (!canAddContainers())
{
return 0;
}
- PanelBrowserDialog *dlg = new PanelBrowserDialog(QDir::home().path(),
+ PanelBrowserDialog *dlg = new PanelBrowserDialog(TQDir::home().path(),
"kdisknav");
- if (dlg->exec() == QDialog::Accepted)
+ if (dlg->exec() == TQDialog::Accepted)
{
return addBrowserButton(dlg->path(), dlg->icon());
}
@@ -544,8 +544,8 @@ const QWidget* ContainerArea::addBrowserButton()
return 0;
}
-const QWidget* ContainerArea::addBrowserButton(const QString &startDir,
- const QString& icon)
+const TQWidget* ContainerArea::addBrowserButton(const TQString &startDir,
+ const TQString& icon)
{
if (!canAddContainers())
{
@@ -558,7 +558,7 @@ const QWidget* ContainerArea::addBrowserButton(const QString &startDir,
return b;
}
-const QWidget* ContainerArea::addServiceMenuButton(const QString& relPath)
+const TQWidget* ContainerArea::addServiceMenuButton(const TQString& relPath)
{
if (!canAddContainers())
{
@@ -571,17 +571,17 @@ const QWidget* ContainerArea::addServiceMenuButton(const QString& relPath)
return b;
}
-const QWidget* ContainerArea::addNonKDEAppButton()
+const TQWidget* ContainerArea::addNonKDEAppButton()
{
if (!canAddContainers())
{
return 0;
}
- PanelExeDialog dlg(QString::null, QString::null, QString::null,
- QString::null, QString::null, false, 0);
+ PanelExeDialog dlg(TQString::null, TQString::null, TQString::null,
+ TQString::null, TQString::null, false, 0);
- if (dlg.exec() == QDialog::Accepted)
+ if (dlg.exec() == TQDialog::Accepted)
{
return addNonKDEAppButton(dlg.title(), dlg.description(),
dlg.command(), dlg.iconPath(),
@@ -592,11 +592,11 @@ const QWidget* ContainerArea::addNonKDEAppButton()
return 0;
}
-const QWidget* ContainerArea::addNonKDEAppButton(const QString &name,
- const QString &description,
- const QString& filePath,
- const QString &icon,
- const QString &cmdLine,
+const TQWidget* ContainerArea::addNonKDEAppButton(const TQString &name,
+ const TQString &description,
+ const TQString& filePath,
+ const TQString &icon,
+ const TQString &cmdLine,
bool inTerm)
{
if (!canAddContainers())
@@ -613,7 +613,7 @@ const QWidget* ContainerArea::addNonKDEAppButton(const QString &name,
return b;
}
-const QWidget* ContainerArea::addExtensionButton(const QString& df)
+const TQWidget* ContainerArea::addExtensionButton(const TQString& df)
{
if (!canAddContainers())
{
@@ -651,7 +651,7 @@ AppletContainer* ContainerArea::addApplet(const AppletInfo& info,
AppletContainer* a = PluginManager::the()->createAppletContainer(
info.desktopFile(),
false, // not startup
- QString::null, // no config
+ TQString::null, // no config
m_opMenu,
m_contents,
isImmutable);
@@ -682,8 +682,8 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index)
if (arrange)
{
- QWidget* w = m_layout->widgetAt(index);
- QPoint oldInsertionPoint = Kicker::the()->insertionPoint();
+ TQWidget* w = m_layout->widgetAt(index);
+ TQPoint oldInsertionPoint = Kicker::the()->insertionPoint();
if (w)
{
// let's set the insertion point to where the widget asked to be
@@ -693,7 +693,7 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index)
if (Kicker::the()->insertionPoint().isNull())
{
- m_layout->insertIntoFreeSpace(a, QPoint());
+ m_layout->insertIntoFreeSpace(a, TQPoint());
}
else
{
@@ -710,20 +710,20 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index)
m_layout->add(a);
}
- connect(a, SIGNAL(moveme(BaseContainer*)),
- SLOT(startContainerMove(BaseContainer*)));
- connect(a, SIGNAL(removeme(BaseContainer*)),
- SLOT(removeContainer(BaseContainer*)));
- connect(a, SIGNAL(takeme(BaseContainer*)),
- SLOT(takeContainer(BaseContainer*)));
- connect(a, SIGNAL(requestSave()),
- SLOT(slotSaveContainerConfig()));
- connect(a, SIGNAL(maintainFocus(bool)),
- this, SIGNAL(maintainFocus(bool)));
+ connect(a, TQT_SIGNAL(moveme(BaseContainer*)),
+ TQT_SLOT(startContainerMove(BaseContainer*)));
+ connect(a, TQT_SIGNAL(removeme(BaseContainer*)),
+ TQT_SLOT(removeContainer(BaseContainer*)));
+ connect(a, TQT_SIGNAL(takeme(BaseContainer*)),
+ TQT_SLOT(takeContainer(BaseContainer*)));
+ connect(a, TQT_SIGNAL(requestSave()),
+ TQT_SLOT(slotSaveContainerConfig()));
+ connect(a, TQT_SIGNAL(maintainFocus(bool)),
+ this, TQT_SIGNAL(maintainFocus(bool)));
if (dynamic_cast<AppletContainer*>(a))
{
- connect(a, SIGNAL(updateLayout()), SLOT(resizeContents()));
+ connect(a, TQT_SIGNAL(updateLayout()), TQT_SLOT(resizeContents()));
}
a->configure(orientation(), popupDirection());
@@ -806,16 +806,16 @@ void ContainerArea::takeContainer(BaseContainer* a)
return;
}
- disconnect(a, SIGNAL(moveme(BaseContainer*)),
- this, SLOT(startContainerMove(BaseContainer*)));
- disconnect(a, SIGNAL(removeme(BaseContainer*)),
- this, SLOT(removeContainer(BaseContainer*)));
- disconnect(a, SIGNAL(takeme(BaseContainer*)),
- this, SLOT(takeContainer(BaseContainer*)));
- disconnect(a, SIGNAL(requestSave()),
- this, SLOT(slotSaveContainerConfig()));
- disconnect(a, SIGNAL(maintainFocus(bool)),
- this, SIGNAL(maintainFocus(bool)));
+ disconnect(a, TQT_SIGNAL(moveme(BaseContainer*)),
+ this, TQT_SLOT(startContainerMove(BaseContainer*)));
+ disconnect(a, TQT_SIGNAL(removeme(BaseContainer*)),
+ this, TQT_SLOT(removeContainer(BaseContainer*)));
+ disconnect(a, TQT_SIGNAL(takeme(BaseContainer*)),
+ this, TQT_SLOT(takeContainer(BaseContainer*)));
+ disconnect(a, TQT_SIGNAL(requestSave()),
+ this, TQT_SLOT(slotSaveContainerConfig()));
+ disconnect(a, TQT_SIGNAL(maintainFocus(bool)),
+ this, TQT_SIGNAL(maintainFocus(bool)));
// Just remove the group from our own config file. Leave separate config
// files untouched.
@@ -859,10 +859,10 @@ void ContainerArea::resizeContents()
}
}
-QString ContainerArea::createUniqueId(const QString& appletType) const
+TQString ContainerArea::createUniqueId(const TQString& appletType) const
{
- QString idBase = appletType + "_%1";
- QString newId;
+ TQString idBase = appletType + "_%1";
+ TQString newId;
int i = 0;
bool unique = false;
@@ -911,7 +911,7 @@ void ContainerArea::startContainerMove(BaseContainer *a)
a->raise();
}
-void ContainerArea::mouseReleaseEvent(QMouseEvent *)
+void ContainerArea::mouseReleaseEvent(TQMouseEvent *)
{
if (!_moveAC)
{
@@ -936,7 +936,7 @@ void ContainerArea::mouseReleaseEvent(QMouseEvent *)
saveContainerConfig(true);
}
-void ContainerArea::mouseMoveEvent(QMouseEvent *ev)
+void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
{
if (!_moveAC)
{
@@ -1035,7 +1035,7 @@ bool ContainerArea::isImmutable() const
return m_immutable || Kicker::the()->isImmutable();
}
-void ContainerArea::dragEnterEvent(QDragEnterEvent *ev)
+void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev)
{
bool canAccept = !isImmutable() &&
(PanelDrag::canDecode(ev) ||
@@ -1066,13 +1066,13 @@ void ContainerArea::dragEnterEvent(QDragEnterEvent *ev)
if (orientation() == Horizontal)
{
- _dragIndicator->setPreferredSize(QSize(preferedWidth, height()));
+ _dragIndicator->setPreferredSize(TQSize(preferedWidth, height()));
}
else
{
- _dragIndicator->setPreferredSize(QSize(width(), preferedHeight));
+ _dragIndicator->setPreferredSize(TQSize(width(), preferedHeight));
}
- _dragMoveOffset = QPoint(_dragIndicator->width()/2,
+ _dragMoveOffset = TQPoint(_dragIndicator->width()/2,
_dragIndicator->height()/2);
// Find the container before the position of the dragindicator.
@@ -1108,7 +1108,7 @@ void ContainerArea::dragEnterEvent(QDragEnterEvent *ev)
_dragIndicator->show();
}
-void ContainerArea::dragMoveEvent(QDragMoveEvent* ev)
+void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev)
{
if (ev->source() == this)
{
@@ -1117,10 +1117,10 @@ void ContainerArea::dragMoveEvent(QDragMoveEvent* ev)
// then it does work only on every second event.
// Cancel the drag by faking an Escape keystroke.
- QKeyEvent fakedKeyPress(QEvent::KeyPress, Key_Escape, 0, 0);
- QKeyEvent fakedKeyRelease(QEvent::KeyRelease, Key_Escape, 0, 0);
- QApplication::sendEvent(this, &fakedKeyPress);
- QApplication::sendEvent(this, &fakedKeyRelease);
+ TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Key_Escape, 0, 0);
+ TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0);
+ TQApplication::sendEvent(this, &fakedKeyPress);
+ TQApplication::sendEvent(this, &fakedKeyRelease);
qApp->processEvents();
startContainerMove(_moveAC);
@@ -1151,7 +1151,7 @@ void ContainerArea::dragMoveEvent(QDragMoveEvent* ev)
}
}
-void ContainerArea::dragLeaveEvent(QDragLeaveEvent*)
+void ContainerArea::dragLeaveEvent(TQDragLeaveEvent*)
{
if (_dragIndicator)
{
@@ -1161,7 +1161,7 @@ void ContainerArea::dragLeaveEvent(QDragLeaveEvent*)
_dragMoveAC = 0;
}
-void ContainerArea::dropEvent(QDropEvent *ev)
+void ContainerArea::dropEvent(TQDropEvent *ev)
{
if (!_dragIndicator)
{
@@ -1182,7 +1182,7 @@ void ContainerArea::dropEvent(QDropEvent *ev)
return;
}
- QObject *parent = ev->source() ? ev->source()->parent() : 0;
+ TQObject *parent = ev->source() ? ev->source()->parent() : 0;
while (parent && (parent != this))
{
parent = parent->parent();
@@ -1217,7 +1217,7 @@ void ContainerArea::dropEvent(QDropEvent *ev)
a->reparent(m_contents, 0, _dragIndicator->pos(), true);
a->setAppletId(createUniqueId(a->appletType()));
addContainer(a, true);
- Kicker::the()->setInsertionPoint(QPoint());
+ Kicker::the()->setInsertionPoint(TQPoint());
m_layout->updateFreeSpaceValues();
_dragMoveAC = 0;
_dragIndicator->hide();
@@ -1243,7 +1243,7 @@ void ContainerArea::dropEvent(QDropEvent *ev)
addApplet(info);
}
- Kicker::the()->setInsertionPoint(QPoint());
+ Kicker::the()->setInsertionPoint(TQPoint());
return;
}
@@ -1269,7 +1269,7 @@ void ContainerArea::dropEvent(QDropEvent *ev)
// see if it's a executable or directory
if (url.protocol() == "programs")
{
- QString relPath = url.path();
+ TQString relPath = url.path();
if (relPath[0] == '/')
{
relPath = relPath.right(relPath.length() - 1);
@@ -1278,7 +1278,7 @@ void ContainerArea::dropEvent(QDropEvent *ev)
}
else if (url.isLocalFile())
{
- QFileInfo fi(url.path());
+ TQFileInfo fi(url.path());
if (fi.isDir())
{ // directory
switch (PanelDirDropMenu().exec(mapToGlobal(ev->pos())))
@@ -1308,15 +1308,15 @@ void ContainerArea::dropEvent(QDropEvent *ev)
else if (fi.isExecutable())
{
// non-KDE executable
- QString pixmapFile;
+ TQString pixmapFile;
KMimeType::pixmapForURL(url, 0, KIcon::Panel, 0,
KIcon::DefaultState, &pixmapFile);
- PanelExeDialog dlg(QString::null, QString::null, url.path(),
- pixmapFile, QString::null, false, 0);
- if (dlg.exec() == QDialog::Accepted)
+ PanelExeDialog dlg(TQString::null, TQString::null, url.path(),
+ pixmapFile, TQString::null, false, 0);
+ if (dlg.exec() == TQDialog::Accepted)
{
// KIconloader returns a full path, we only want the name
- QFileInfo iconfi(dlg.iconPath());
+ TQFileInfo iconfi(dlg.iconPath());
a = new NonKDEAppButtonContainer(dlg.title(),
dlg.description(),
dlg.command(),
@@ -1340,7 +1340,7 @@ void ContainerArea::dropEvent(QDropEvent *ev)
if (!a)
{
_dragIndicator->hide();
- Kicker::the()->setInsertionPoint(QPoint());
+ Kicker::the()->setInsertionPoint(TQPoint());
m_layout->setStretchEnabled(true);
return;
}
@@ -1352,11 +1352,11 @@ void ContainerArea::dropEvent(QDropEvent *ev)
saveContainerConfig();
_dragMoveAC = 0;
_dragIndicator->hide();
- Kicker::the()->setInsertionPoint(QPoint());
+ Kicker::the()->setInsertionPoint(TQPoint());
m_layout->setStretchEnabled(true);
}
-bool ContainerArea::eventFilter(QObject* o, QEvent* e)
+bool ContainerArea::eventFilter(TQObject* o, TQEvent* e)
{
// Propagate the layout hints which m_contents receives. This way widgets
// which contain a ContainerArea can react to layout changes of its
@@ -1364,7 +1364,7 @@ bool ContainerArea::eventFilter(QObject* o, QEvent* e)
// want to grow as well.
if (o == m_contents)
{
- if (e->type() == QEvent::LayoutHint)
+ if (e->type() == TQEvent::LayoutHint)
{
updateGeometry(); // Posts a new layout hint to our parent.
}
@@ -1374,13 +1374,13 @@ bool ContainerArea::eventFilter(QObject* o, QEvent* e)
return Panner::eventFilter(o, e);
}
-void ContainerArea::resizeEvent(QResizeEvent *ev)
+void ContainerArea::resizeEvent(TQResizeEvent *ev)
{
Panner::resizeEvent(ev);
setBackground();
}
-void ContainerArea::viewportResizeEvent(QResizeEvent* ev)
+void ContainerArea::viewportResizeEvent(TQResizeEvent* ev)
{
Panner::viewportResizeEvent(ev);
if (orientation() == Horizontal)
@@ -1411,8 +1411,8 @@ void ContainerArea::setBackground()
{
_rootPixmap = new KRootPixmap(this);
_rootPixmap->setCustomPainting(true);
- connect(_rootPixmap, SIGNAL(backgroundUpdated(const QPixmap&)),
- SLOT(updateBackground(const QPixmap&)));
+ connect(_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)),
+ TQT_SLOT(updateBackground(const TQPixmap&)));
}
else
{
@@ -1438,9 +1438,9 @@ void ContainerArea::setBackground()
// by keeping the src image static, we can share it among panels and only
// reload from disk when it actually changes in the config, not every time we
// get a resize or configure event
- static QString bgStr;
- static QImage srcImage;
- QString newBgStr = locate("appdata", KickerSettings::backgroundTheme());
+ static TQString bgStr;
+ static TQImage srcImage;
+ TQString newBgStr = locate("appdata", KickerSettings::backgroundTheme());
if (bgStr != newBgStr)
{
@@ -1454,13 +1454,13 @@ void ContainerArea::setBackground()
}
else
{
- QImage bgImage = srcImage;
+ TQImage bgImage = srcImage;
if (orientation() == Vertical)
{
if (KickerSettings::rotateBackground())
{
- QWMatrix matrix;
+ TQWMatrix matrix;
matrix.rotate(position() == KPanelExtension::Left ? 90: 270);
bgImage = bgImage.xForm(matrix);
}
@@ -1472,7 +1472,7 @@ void ContainerArea::setBackground()
if (position() == KPanelExtension::Top &&
KickerSettings::rotateBackground())
{
- QWMatrix matrix;
+ TQWMatrix matrix;
matrix.rotate(180);
bgImage = bgImage.xForm(matrix);
}
@@ -1484,8 +1484,8 @@ void ContainerArea::setBackground()
{
KickerLib::colorize(bgImage);
}
- setPaletteBackgroundPixmap(QPixmap(bgImage));
- QTimer::singleShot(0, this, SLOT(updateContainersBackground()));
+ setPaletteBackgroundPixmap(TQPixmap(bgImage));
+ TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground()));
}
}
@@ -1507,12 +1507,12 @@ void ContainerArea::immutabilityChanged(bool immutable)
}
setAcceptDrops(!isImmutable());
- QTimer::singleShot(0, this, SLOT(setBackground()));
+ TQTimer::singleShot(0, this, TQT_SLOT(setBackground()));
}
-QRect ContainerArea::availableSpaceFollowing(BaseContainer* a)
+TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a)
{
- QRect availableSpace = rect();
+ TQRect availableSpace = rect();
BaseContainer* b = 0;
if (a)
@@ -1564,7 +1564,7 @@ QRect ContainerArea::availableSpaceFollowing(BaseContainer* a)
void ContainerArea::moveDragIndicator(int pos)
{
- QRect availableSpace = availableSpaceFollowing(_dragMoveAC);
+ TQRect availableSpace = availableSpaceFollowing(_dragMoveAC);
// Move _dragIndicator to position pos, restricted by availableSpace.
// Resize _dragIndicator if necessary.
@@ -1606,11 +1606,11 @@ void ContainerArea::moveDragIndicator(int pos)
}
}
-void ContainerArea::updateBackground( const QPixmap& pm )
+void ContainerArea::updateBackground( const TQPixmap& pm )
{
- QBrush bgBrush(colorGroup().background(), pm);
- QPalette pal = kapp->palette();
- pal.setBrush(QColorGroup::Background, bgBrush);
+ TQBrush bgBrush(colorGroup().background(), pm);
+ TQPalette pal = kapp->palette();
+ pal.setBrush(TQColorGroup::Background, bgBrush);
setPalette(pal);
// because the Pixmap can be smaller as the containerarea
@@ -1632,7 +1632,7 @@ void ContainerArea::resizeContents(int w, int h)
if (!m_updateBackgroundsCalled)
{
m_updateBackgroundsCalled = true;
- QTimer::singleShot(0, this, SLOT(updateContainersBackground()));
+ TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground()));
}
}
@@ -1761,8 +1761,8 @@ void ContainerArea::updateContainersBackground()
// case the cached is cleared).
if( !m_cachedGeometry.contains( *it ))
{
- m_cachedGeometry[ *it ] = QRect();
- connect( *it, SIGNAL( destroyed()), SLOT( destroyCachedGeometry()));
+ m_cachedGeometry[ *it ] = TQRect();
+ connect( *it, TQT_SIGNAL( destroyed()), TQT_SLOT( destroyCachedGeometry()));
}
if( m_cachedGeometry[ *it ] != (*it)->geometry())
{
@@ -1774,10 +1774,10 @@ void ContainerArea::updateContainersBackground()
void ContainerArea::destroyCachedGeometry()
{
- m_cachedGeometry.remove(const_cast<QWidget*>(static_cast<const QWidget*>(sender())));
+ m_cachedGeometry.remove(const_cast<TQWidget*>(static_cast<const TQWidget*>(sender())));
}
-BaseContainer::List ContainerArea::containers(const QString& type) const
+BaseContainer::List ContainerArea::containers(const TQString& type) const
{
if (type.isEmpty() || type == "All")
{
@@ -1792,7 +1792,7 @@ BaseContainer::List ContainerArea::containers(const QString& type) const
it != m_containers.constEnd();
++it)
{
- QString type = (*it)->appletType();
+ TQString type = (*it)->appletType();
if (type == "KMenuButton" ||
type == "WindowListButton" ||
type == "BookmarksButton" ||
@@ -1821,7 +1821,7 @@ BaseContainer::List ContainerArea::containers(const QString& type) const
return list;
}
-int ContainerArea::containerCount(const QString& type) const
+int ContainerArea::containerCount(const TQString& type) const
{
if (type.isEmpty() || type == "All")
{
@@ -1835,7 +1835,7 @@ int ContainerArea::containerCount(const QString& type) const
it != m_containers.end();
++it)
{
- QString type = (*it)->appletType();
+ TQString type = (*it)->appletType();
if (type == "KMenuButton" ||
type == "WindowListButton" ||
type == "BookmarksButton" ||
@@ -1864,7 +1864,7 @@ int ContainerArea::containerCount(const QString& type) const
return count;
}
-QStringList ContainerArea::listContainers() const
+TQStringList ContainerArea::listContainers() const
{
return m_layout->listItems();
}
@@ -1879,7 +1879,7 @@ void ContainerArea::showAddAppletDialog()
if (!m_addAppletDialog)
{
m_addAppletDialog = new AddAppletDialog(this, this, 0);
- connect(m_addAppletDialog, SIGNAL(finished()), this, SLOT(addAppletDialogDone()));
+ connect(m_addAppletDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(addAppletDialogDone()));
}
else
{
@@ -1900,7 +1900,7 @@ void ContainerArea::addAppletDialogDone()
m_addAppletDialog = 0;
}
-const QPixmap* ContainerArea::completeBackgroundPixmap() const
+const TQPixmap* ContainerArea::completeBackgroundPixmap() const
{
return &_completeBg;
}
@@ -1916,22 +1916,22 @@ int ContainerArea::heightForWidth(int w) const
}
-DragIndicator::DragIndicator(QWidget* parent, const char* name)
- : QWidget(parent, name)
+DragIndicator::DragIndicator(TQWidget* parent, const char* name)
+ : TQWidget(parent, name)
{
setBackgroundOrigin(AncestorOrigin);
}
-void DragIndicator::paintEvent(QPaintEvent*)
+void DragIndicator::paintEvent(TQPaintEvent*)
{
- QPainter painter(this);
- QRect rect(0, 0, width(), height());
- style().drawPrimitive( QStyle::PE_FocusRect, &painter, rect, colorGroup(),
- QStyle::Style_Default, colorGroup().base() );
+ TQPainter painter(this);
+ TQRect rect(0, 0, width(), height());
+ style().drawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(),
+ TQStyle::Style_Default, colorGroup().base() );
}
-void DragIndicator::mousePressEvent(QMouseEvent*)
+void DragIndicator::mousePressEvent(TQMouseEvent*)
{
hide();
}
diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h
index 8b17c8ae9..a43cd8c9c 100644
--- a/kicker/kicker/core/containerarea.h
+++ b/kicker/kicker/core/containerarea.h
@@ -24,9 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __containerarea_h__
#define __containerarea_h__
-#include <qpixmap.h>
-#include <qptrlist.h>
-#include <qtimer.h>
+#include <tqpixmap.h>
+#include <tqptrlist.h>
+#include <tqtimer.h>
#include <appletinfo.h>
@@ -48,7 +48,7 @@ class ContainerArea : public Panner
Q_OBJECT
public:
- ContainerArea( KConfig* config, QWidget* parent, QPopupMenu* opMenu, const char* name = 0 );
+ ContainerArea( KConfig* config, TQWidget* parent, TQPopupMenu* opMenu, const char* name = 0 );
~ContainerArea();
void initialize(bool useDefaultConfig);
@@ -56,24 +56,24 @@ public:
KPanelApplet::Direction popupDirection() const;
bool isImmutable() const;
- const QWidget* addButton(const AppletInfo& info);
- const QWidget* addKMenuButton();
- const QWidget* addDesktopButton();
- const QWidget* addWindowListButton();
- const QWidget* addBookmarksButton();
- const QWidget* addServiceButton(const QString& desktopFile);
- const QWidget* addURLButton(const QString &url);
- const QWidget* addBrowserButton();
- const QWidget* addBrowserButton(const QString &startDir,
- const QString& icon = QString("kdisknav"));
- const QWidget* addServiceMenuButton(const QString& relPath);
- const QWidget* addNonKDEAppButton();
- const QWidget* addNonKDEAppButton(const QString &name,
- const QString &description,
- const QString &filePath,
- const QString &icon,
- const QString &cmdLine, bool inTerm);
- const QWidget* addExtensionButton(const QString& desktopFile);
+ const TQWidget* addButton(const AppletInfo& info);
+ const TQWidget* addKMenuButton();
+ const TQWidget* addDesktopButton();
+ const TQWidget* addWindowListButton();
+ const TQWidget* addBookmarksButton();
+ const TQWidget* addServiceButton(const TQString& desktopFile);
+ const TQWidget* addURLButton(const TQString &url);
+ const TQWidget* addBrowserButton();
+ const TQWidget* addBrowserButton(const TQString &startDir,
+ const TQString& icon = TQString("kdisknav"));
+ const TQWidget* addServiceMenuButton(const TQString& relPath);
+ const TQWidget* addNonKDEAppButton();
+ const TQWidget* addNonKDEAppButton(const TQString &name,
+ const TQString &description,
+ const TQString &filePath,
+ const TQString &icon,
+ const TQString &cmdLine, bool inTerm);
+ const TQWidget* addExtensionButton(const TQString& desktopFile);
AppletContainer* addApplet(const AppletInfo& info,
bool isImmutable = false,
int insertionIndex = -1);
@@ -84,11 +84,11 @@ public:
int widthForHeight(int height) const;
int heightForWidth(int width) const;
- const QPixmap* completeBackgroundPixmap() const;
+ const TQPixmap* completeBackgroundPixmap() const;
- BaseContainer::List containers(const QString& type) const;
- int containerCount(const QString& type) const;
- QStringList listContainers() const;
+ BaseContainer::List containers(const TQString& type) const;
+ int containerCount(const TQString& type) const;
+ TQStringList listContainers() const;
bool canAddContainers() const;
signals:
@@ -108,25 +108,25 @@ public slots:
void addAppletDialogDone();
protected:
- QString createUniqueId(const QString& appletType) const;
+ TQString createUniqueId(const TQString& appletType) const;
void completeContainerAddition(BaseContainer* container,
int insertionIndex = -1);
- bool eventFilter(QObject*, QEvent*);
- void mouseMoveEvent(QMouseEvent*);
- void mouseReleaseEvent(QMouseEvent *);
- void dragEnterEvent(QDragEnterEvent*);
- void dragMoveEvent(QDragMoveEvent*);
- void dragLeaveEvent(QDragLeaveEvent*);
- void dropEvent(QDropEvent*);
- void resizeEvent(QResizeEvent*);
- void viewportResizeEvent(QResizeEvent*);
+ bool eventFilter(TQObject*, TQEvent*);
+ void mouseMoveEvent(TQMouseEvent*);
+ void mouseReleaseEvent(TQMouseEvent *);
+ void dragEnterEvent(TQDragEnterEvent*);
+ void dragMoveEvent(TQDragMoveEvent*);
+ void dragLeaveEvent(TQDragLeaveEvent*);
+ void dropEvent(TQDropEvent*);
+ void resizeEvent(TQResizeEvent*);
+ void viewportResizeEvent(TQResizeEvent*);
void defaultContainerConfig();
- void loadContainers(const QStringList& containers);
+ void loadContainers(const TQStringList& containers);
void saveContainerConfig(bool layoutOnly = false);
- QRect availableSpaceFollowing(BaseContainer*);
+ TQRect availableSpaceFollowing(BaseContainer*);
void moveDragIndicator(int pos);
void scrollTo(BaseContainer*);
@@ -138,7 +138,7 @@ protected:
protected slots:
void autoScroll();
- void updateBackground(const QPixmap&);
+ void updateBackground(const TQPixmap&);
void setBackground();
void immutabilityChanged(bool);
void updateContainersBackground();
@@ -154,21 +154,21 @@ private:
DragIndicator* _dragIndicator;
BaseContainer* _dragMoveAC;
QPoint _dragMoveOffset;
- QPopupMenu* m_opMenu;
+ TQPopupMenu* m_opMenu;
KRootPixmap* _rootPixmap;
bool _transparent;
bool _useBgTheme;
bool _bgSet;
- QPixmap _completeBg;
- QTimer _autoScrollTimer;
+ TQPixmap _completeBg;
+ TQTimer _autoScrollTimer;
bool m_canAddContainers;
bool m_immutable;
bool m_updateBackgroundsCalled;
- QWidget* m_contents;
+ TQWidget* m_contents;
ContainerAreaLayout* m_layout;
AddAppletDialog* m_addAppletDialog;
- QMap< QWidget*, QRect > m_cachedGeometry;
+ TQMap< TQWidget*, TQRect > m_cachedGeometry;
};
@@ -177,18 +177,18 @@ class DragIndicator : public QWidget
Q_OBJECT
public:
- DragIndicator(QWidget* parent = 0, const char* name = 0);
+ DragIndicator(TQWidget* parent = 0, const char* name = 0);
~DragIndicator() {}
- QSize preferredSize() const { return _preferredSize; }
- void setPreferredSize(const QSize& size) { _preferredSize = size; }
+ TQSize preferredSize() const { return _preferredSize; }
+ void setPreferredSize(const TQSize& size) { _preferredSize = size; }
protected:
- void paintEvent(QPaintEvent*);
- void mousePressEvent(QMouseEvent*);
+ void paintEvent(TQPaintEvent*);
+ void mousePressEvent(TQMouseEvent*);
private:
- QSize _preferredSize;
+ TQSize _preferredSize;
};
#endif
diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp
index a865bec86..12a09c8e6 100644
--- a/kicker/kicker/core/containerarealayout.cpp
+++ b/kicker/kicker/core/containerarealayout.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <assert.h>
#include <math.h>
-#include <qapplication.h>
+#include <tqapplication.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -41,20 +41,20 @@ class ContainerAreaLayoutIterator : public QGLayoutIterator
{
}
- QLayoutItem* current()
+ TQLayoutItem* current()
{
return m_idx < int(m_list->count()) ? (*m_list->at(m_idx))->item : 0;
}
- QLayoutItem* next()
+ TQLayoutItem* next()
{
m_idx++;
return current();
}
- QLayoutItem* takeCurrent()
+ TQLayoutItem* takeCurrent()
{
- QLayoutItem* item = 0;
+ TQLayoutItem* item = 0;
ContainerAreaLayout::ItemList::iterator b = m_list->at(m_idx);
if (b != m_list->end())
{
@@ -128,12 +128,12 @@ Qt::Orientation ContainerAreaLayoutItem::orientation() const
return m_layout->orientation();
}
-QRect ContainerAreaLayoutItem::geometryR() const
+TQRect ContainerAreaLayoutItem::geometryR() const
{
return m_layout->transform(geometry());
}
-void ContainerAreaLayoutItem::setGeometryR(const QRect& r)
+void ContainerAreaLayoutItem::setGeometryR(const TQRect& r)
{
setGeometry(m_layout->transform(r));
}
@@ -178,7 +178,7 @@ int ContainerAreaLayoutItem::leftR() const
{
if (orientation() == Horizontal)
{
- if (QApplication::reverseLayout())
+ if (TQApplication::reverseLayout())
return m_layout->geometry().right() - geometry().right();
else
return geometry().left();
@@ -193,7 +193,7 @@ int ContainerAreaLayoutItem::rightR() const
{
if (orientation() == Horizontal)
{
- if (QApplication::reverseLayout())
+ if (TQApplication::reverseLayout())
return m_layout->geometry().right() - geometry().left();
else
return geometry().right();
@@ -205,19 +205,19 @@ int ContainerAreaLayoutItem::rightR() const
}
-ContainerAreaLayout::ContainerAreaLayout(QWidget* parent)
- : QLayout(parent),
+ContainerAreaLayout::ContainerAreaLayout(TQWidget* parent)
+ : TQLayout(parent),
m_orientation(Horizontal),
m_stretchEnabled(true)
{
}
-void ContainerAreaLayout::addItem(QLayoutItem* item)
+void ContainerAreaLayout::addItem(TQLayoutItem* item)
{
m_items.append(new ContainerAreaLayoutItem(item, this));
}
-void ContainerAreaLayout::insertIntoFreeSpace(QWidget* widget, QPoint insertionPoint)
+void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertionPoint)
{
if (!widget)
{
@@ -247,7 +247,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(QWidget* widget, QPoint insertionP
if (nextIt == m_items.end())
{
// first item in!
- item->setGeometryR(QRect(insertionPoint.x(), insertionPoint.y(), widget->width(), widget->height()));
+ item->setGeometryR(TQRect(insertionPoint.x(), insertionPoint.y(), widget->width(), widget->height()));
updateFreeSpaceValues();
return;
}
@@ -311,7 +311,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(QWidget* widget, QPoint insertionP
}
}
- QRect geom = item->geometryR();
+ TQRect geom = item->geometryR();
geom.moveLeft(insPos);
item->setGeometryR(geom);
widget->setGeometry(transform(geom)); // widget isn't shown, layout not active yet
@@ -341,13 +341,13 @@ void ContainerAreaLayout::insertIntoFreeSpace(QWidget* widget, QPoint insertionP
updateFreeSpaceValues();
}
-QStringList ContainerAreaLayout::listItems() const
+TQStringList ContainerAreaLayout::listItems() const
{
- QStringList items;
+ TQStringList items;
for (ItemList::const_iterator it = m_items.constBegin();
it != m_items.constEnd(); ++it)
{
- QLayoutItem* item = (*it)->item;
+ TQLayoutItem* item = (*it)->item;
BaseContainer* container = dynamic_cast<BaseContainer*>(item->widget());
if (!container)
@@ -374,7 +374,7 @@ QStringList ContainerAreaLayout::listItems() const
return items;
}
-QWidget* ContainerAreaLayout::widgetAt(int index) const
+TQWidget* ContainerAreaLayout::widgetAt(int index) const
{
if (index < 0 || index >= (int)m_items.count())
{
@@ -384,46 +384,46 @@ QWidget* ContainerAreaLayout::widgetAt(int index) const
return m_items[index]->item->widget();
}
-QSize ContainerAreaLayout::sizeHint() const
+TQSize ContainerAreaLayout::sizeHint() const
{
const int size = KickerLib::sizeValue(KPanelExtension::SizeNormal);
if (orientation() == Horizontal)
{
- return QSize(widthForHeight(size), size);
+ return TQSize(widthForHeight(size), size);
}
else
{
- return QSize(size, heightForWidth(size));
+ return TQSize(size, heightForWidth(size));
}
}
-QSize ContainerAreaLayout::minimumSize() const
+TQSize ContainerAreaLayout::minimumSize() const
{
const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny);
if (orientation() == Horizontal)
{
- return QSize(widthForHeight(size), size);
+ return TQSize(widthForHeight(size), size);
}
else
{
- return QSize(size, heightForWidth(size));
+ return TQSize(size, heightForWidth(size));
}
}
-QLayoutIterator ContainerAreaLayout::iterator()
+TQLayoutIterator ContainerAreaLayout::iterator()
{
- return QLayoutIterator(new ContainerAreaLayoutIterator(&m_items));
+ return TQLayoutIterator(new ContainerAreaLayoutIterator(&m_items));
}
-void ContainerAreaLayout::setGeometry(const QRect& rect)
+void ContainerAreaLayout::setGeometry(const TQRect& rect)
{
//RESEARCH: when can we short curcuit this?
// maybe a dirty flag to be set when we have containers
// that needs laying out?
- QLayout::setGeometry(rect);
+ TQLayout::setGeometry(rect);
float totalFreeSpace = kMax(0, widthR() - widthForHeightR(heightR()));
int occupiedSpace = 0;
@@ -453,7 +453,7 @@ void ContainerAreaLayout::setGeometry(const QRect& rect)
w = widthR() - pos;
}
}
- cur->setGeometryR(QRect(pos, 0, w, heightR()));
+ cur->setGeometryR(TQRect(pos, 0, w, heightR()));
}
}
@@ -520,10 +520,10 @@ int ContainerAreaLayout::distanceToPreviousItem(ItemList::const_iterator it) con
cur->leftR() - leftR();
}
-void ContainerAreaLayout::moveContainerSwitch(QWidget* container, int distance)
+void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance)
{
const bool horizontal = orientation() == Horizontal;
- const bool reverseLayout = QApplication::reverseLayout();
+ const bool reverseLayout = TQApplication::reverseLayout();
if (horizontal && reverseLayout)
distance = - distance;
@@ -566,7 +566,7 @@ void ContainerAreaLayout::moveContainerSwitch(QWidget* container, int distance)
break;
// Move 'next' to the other side of 'moving'.
- QRect geom = next->geometryR();
+ TQRect geom = next->geometryR();
if (forward)
geom.moveLeft(geom.left() - moving->widthR());
else
@@ -630,7 +630,7 @@ void ContainerAreaLayout::moveContainerSwitch(QWidget* container, int distance)
}
// Move the container to its new position and prevent it from moving outside the panel.
- QRect geom = moving->geometryR();
+ TQRect geom = moving->geometryR();
distance = kClamp(newPos, 0, widthR() - moving->widthR());
geom.moveLeft(distance);
moving->setGeometryR(geom);
@@ -645,7 +645,7 @@ void ContainerAreaLayout::moveContainerSwitch(QWidget* container, int distance)
if(AppletContainer* applet = dynamic_cast<AppletContainer*>(container))
if( applet->info().desktopFile() == "menuapplet.desktop" )
{
- QRect geom = (*it)->geometryR();
+ TQRect geom = (*it)->geometryR();
if( prev != m_items.constEnd())
geom.moveLeft( (*prev)->rightR() + 1 );
else
@@ -657,10 +657,10 @@ void ContainerAreaLayout::moveContainerSwitch(QWidget* container, int distance)
updateFreeSpaceValues();
}
-int ContainerAreaLayout::moveContainerPush(QWidget* a, int distance)
+int ContainerAreaLayout::moveContainerPush(TQWidget* a, int distance)
{
const bool horizontal = orientation() == Horizontal;
- const bool reverseLayout = QApplication::reverseLayout();
+ const bool reverseLayout = TQApplication::reverseLayout();
// Get the iterator 'it' pointing to the layoutitem representing 'a'.
ItemList::const_iterator it = m_items.constBegin();
@@ -721,20 +721,20 @@ int ContainerAreaLayout::moveContainerPushRecursive(ItemList::const_iterator it,
moved = forward ? kMin(distance, available)
: kMax(distance, available);
- QRect geom = cur->geometryR();
+ TQRect geom = cur->geometryR();
geom.moveLeft(geom.left() + moved);
cur->setGeometryR(geom);
return moved;
}
-QRect ContainerAreaLayout::transform(const QRect& r) const
+TQRect ContainerAreaLayout::transform(const TQRect& r) const
{
if (orientation() == Horizontal)
{
- if (QApplication::reverseLayout())
+ if (TQApplication::reverseLayout())
{
- QRect t = r;
+ TQRect t = r;
t.moveLeft(geometry().right() - r.right());
return t;
}
@@ -745,7 +745,7 @@ QRect ContainerAreaLayout::transform(const QRect& r) const
}
else
{
- return QRect(r.y(), r.x(), r.height(), r.width());
+ return TQRect(r.y(), r.x(), r.height(), r.width());
}
}
diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h
index 4d4e0561d..995497268 100644
--- a/kicker/kicker/core/containerarealayout.h
+++ b/kicker/kicker/core/containerarealayout.h
@@ -24,14 +24,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __containerarealayout_h__
#define __containerarealayout_h__
-#include <qlayout.h>
+#include <tqlayout.h>
class ContainerAreaLayout;
class ContainerAreaLayoutItem : public Qt
{
public:
- ContainerAreaLayoutItem(QLayoutItem* i, ContainerAreaLayout* layout)
+ ContainerAreaLayoutItem(TQLayoutItem* i, ContainerAreaLayout* layout)
: item(i),
m_freeSpaceRatio(0.0),
m_layout(layout)
@@ -45,9 +45,9 @@ class ContainerAreaLayoutItem : public Qt
bool isStretch() const;
- QRect geometry() const
+ TQRect geometry() const
{ return item->geometry(); }
- void setGeometry(const QRect& geometry)
+ void setGeometry(const TQRect& geometry)
{ item->setGeometry(geometry); }
double freeSpaceRatio() const;
@@ -56,15 +56,15 @@ class ContainerAreaLayoutItem : public Qt
Orientation orientation() const;
// Relative geometry
- QRect geometryR() const;
- void setGeometryR(const QRect&);
+ TQRect geometryR() const;
+ void setGeometryR(const TQRect&);
int widthForHeightR(int w) const;
int widthR() const;
int heightR() const;
int leftR() const;
int rightR() const;
- QLayoutItem* item;
+ TQLayoutItem* item;
private:
double m_freeSpaceRatio;
@@ -75,18 +75,18 @@ class ContainerAreaLayout : public QLayout
{
public:
typedef ContainerAreaLayoutItem Item;
- typedef QValueList<Item*> ItemList;
+ typedef TQValueList<Item*> ItemList;
- ContainerAreaLayout(QWidget* parent);
+ ContainerAreaLayout(TQWidget* parent);
- void addItem(QLayoutItem* item);
- void insertIntoFreeSpace(QWidget* item, QPoint insertionPoint);
- QStringList listItems() const;
- QWidget* widgetAt(int index) const;
- QSize sizeHint() const;
- QSize minimumSize() const;
- QLayoutIterator iterator();
- void setGeometry(const QRect& rect);
+ void addItem(TQLayoutItem* item);
+ void insertIntoFreeSpace(TQWidget* item, TQPoint insertionPoint);
+ TQStringList listItems() const;
+ TQWidget* widgetAt(int index) const;
+ TQSize sizeHint() const;
+ TQSize minimumSize() const;
+ TQLayoutIterator iterator();
+ void setGeometry(const TQRect& rect);
Orientation orientation() const { return m_orientation; }
void setOrientation(Orientation o) { m_orientation = o; }
@@ -97,11 +97,11 @@ class ContainerAreaLayout : public QLayout
void setStretchEnabled(bool enable);
- void moveContainerSwitch(QWidget* container, int distance);
- int moveContainerPush(QWidget* container, int distance);
+ void moveContainerSwitch(TQWidget* container, int distance);
+ int moveContainerPush(TQWidget* container, int distance);
// Relative geometry
- QRect transform(const QRect&) const;
+ TQRect transform(const TQRect&) const;
int widthForHeightR(int w) const;
int widthR() const;
int heightR() const;
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index e1c2c0c57..e0f68ce8a 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -59,7 +59,7 @@ ExtensionManager* ExtensionManager::the()
}
ExtensionManager::ExtensionManager()
- : QObject(0, "ExtensionManager"),
+ : TQObject(0, "ExtensionManager"),
m_menubarPanel(0),
m_mainPanel(0),
m_panelCounter(-1)
@@ -108,7 +108,7 @@ void ExtensionManager::initialize()
m_mainPanel = pm->createExtensionContainer(
"childpanelextension.desktop",
true,
- QString(kapp->aboutData()->appName()) + "rc",
+ TQString(kapp->aboutData()->appName()) + "rc",
"Main Panel");
}
@@ -130,14 +130,14 @@ void ExtensionManager::initialize()
// read extension list
config->setGroup("General");
- QStringList elist = config->readListEntry("Extensions2");
+ TQStringList elist = config->readListEntry("Extensions2");
// now restore the extensions
- QStringList::iterator itEnd = elist.end();
- for (QStringList::iterator it = elist.begin(); it != elist.end(); ++it)
+ TQStringList::iterator itEnd = elist.end();
+ for (TQStringList::iterator it = elist.begin(); it != elist.end(); ++it)
{
// extension id
- QString extensionId(*it);
+ TQString extensionId(*it);
// create a matching applet container
if (extensionId.find("Extension") == -1)
@@ -168,9 +168,9 @@ void ExtensionManager::initialize()
}
pm->clearUntrustedLists();
- connect(Kicker::the(), SIGNAL(configurationChanged()), SLOT(configurationChanged()));
+ connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), TQT_SLOT(configurationChanged()));
DCOPRef r( "ksmserver", "ksmserver" );
- r.send( "resumeStartup", QCString( "kicker" ));
+ r.send( "resumeStartup", TQCString( "kicker" ));
}
void ExtensionManager::configureMenubar(bool duringInit)
@@ -187,7 +187,7 @@ void ExtensionManager::configureMenubar(bool duringInit)
if (duringInit)
{
- AppletInfo menubarInfo("menuapplet.desktop", QString::null, AppletInfo::Applet);
+ AppletInfo menubarInfo("menuapplet.desktop", TQString::null, AppletInfo::Applet);
if (PluginManager::the()->hasInstance(menubarInfo))
{
// it's already there, in the main panel!
@@ -211,7 +211,7 @@ void ExtensionManager::configureMenubar(bool duringInit)
updateMenubar();
m_menubarPanel->show();
- connect(kapp, SIGNAL(kdisplayFontChanged()), SLOT(updateMenubar()));
+ connect(kapp, TQT_SIGNAL(kdisplayFontChanged()), TQT_SLOT(updateMenubar()));
}
else if (m_menubarPanel)
{
@@ -253,11 +253,11 @@ void ExtensionManager::migrateMenubar()
return;
}
- QStringList elist = config->readListEntry("Extensions2");
- QStringList::iterator itEnd = elist.end();
- for (QStringList::iterator it = elist.begin(); it != elist.end(); ++it)
+ TQStringList elist = config->readListEntry("Extensions2");
+ TQStringList::iterator itEnd = elist.end();
+ for (TQStringList::iterator it = elist.begin(); it != elist.end(); ++it)
{
- QString extensionId(*it);
+ TQString extensionId(*it);
if (extensionId.find("Extension") == -1)
{
@@ -271,18 +271,18 @@ void ExtensionManager::migrateMenubar()
}
config->setGroup(extensionId);
- QString extension = config->readPathEntry("ConfigFile");
+ TQString extension = config->readPathEntry("ConfigFile");
KConfig extensionConfig(locate("config", extension));
extensionConfig.setGroup("General");
if (extensionConfig.hasKey("Applets2"))
{
- QStringList containers = extensionConfig.readListEntry("Applets2");
- QStringList::iterator cit = containers.begin();
- QStringList::iterator citEnd = containers.end();
+ TQStringList containers = extensionConfig.readListEntry("Applets2");
+ TQStringList::iterator cit = containers.begin();
+ TQStringList::iterator citEnd = containers.end();
for (; cit != citEnd; ++cit)
{
- QString appletId(*cit);
+ TQString appletId(*cit);
// is there a config group for this applet?
if (!extensionConfig.hasGroup(appletId))
@@ -291,14 +291,14 @@ void ExtensionManager::migrateMenubar()
}
KConfigGroup group(&extensionConfig, appletId.latin1());
- QString appletType = appletId.left(appletId.findRev('_'));
+ TQString appletType = appletId.left(appletId.findRev('_'));
if (appletType == "Applet")
{
- QString appletFile = group.readPathEntry("DesktopFile");
+ TQString appletFile = group.readPathEntry("DesktopFile");
if (appletFile.find("menuapplet.desktop") != -1)
{
- QString menubarConfig = locate("config", extension);
+ TQString menubarConfig = locate("config", extension);
KIO::NetAccess::copy(menubarConfig,
locateLocal("config",
"kicker_menubarpanelrc"), 0);
@@ -325,7 +325,7 @@ void ExtensionManager::saveContainerConfig()
KConfig *config = KGlobal::config();
// build the extension list
- QStringList elist;
+ TQStringList elist;
ExtensionList::iterator itEnd = _containers.end();
for (ExtensionList::iterator it = _containers.begin(); it != itEnd; ++it)
{
@@ -378,22 +378,22 @@ void ExtensionManager::updateMenubar()
m_menubarPanel->xineramaScreen());
}
-bool ExtensionManager::isMainPanel(const QWidget* panel) const
+bool ExtensionManager::isMainPanel(const TQWidget* panel) const
{
return m_mainPanel == panel;
}
-bool ExtensionManager::isMenuBar(const QWidget* panel) const
+bool ExtensionManager::isMenuBar(const TQWidget* panel) const
{
return m_menubarPanel == panel;
}
-void ExtensionManager::addExtension( const QString& desktopFile )
+void ExtensionManager::addExtension( const TQString& desktopFile )
{
PluginManager* pm = PluginManager::the();
ExtensionContainer *e = pm->createExtensionContainer(desktopFile,
false, // is not startup
- QString::null, // no config
+ TQString::null, // no config
uniqueId());
@@ -422,8 +422,8 @@ void ExtensionManager::addContainer(ExtensionContainer* e)
_containers.append(e);
- connect(e, SIGNAL(removeme(ExtensionContainer*)),
- this, SLOT(removeContainer(ExtensionContainer*)));
+ connect(e, TQT_SIGNAL(removeme(ExtensionContainer*)),
+ this, TQT_SLOT(removeContainer(ExtensionContainer*)));
emit desktopIconsAreaChanged(desktopIconsArea(e->xineramaScreen()),
e->xineramaScreen());
@@ -457,10 +457,10 @@ void ExtensionManager::removeAllContainers()
saveContainerConfig();
}
-QString ExtensionManager::uniqueId()
+TQString ExtensionManager::uniqueId()
{
- QString idBase = "Extension_%1";
- QString newId;
+ TQString idBase = "Extension_%1";
+ TQString newId;
int i = 0;
bool unique = false;
@@ -621,14 +621,14 @@ bool ExtensionManager::shouldExclude(int XineramaScreen,
return true;
}
-QRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* extension)
+TQRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* extension)
{
if (!extension)
{
return Kicker::the()->kwinModule()->workArea(XineramaScreen);
}
- QValueList<WId> list;
+ TQValueList<WId> list;
ExtensionList::iterator itEnd = _containers.end();
ExtensionList::iterator it = _containers.begin();
@@ -672,7 +672,7 @@ QRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* e
}
}
- QRect workArea;
+ TQRect workArea;
if ((XineramaScreen == XineramaAllScreens) || (kapp->desktop()->numScreens() < 2))
{
/* special value for all screens */
@@ -681,7 +681,7 @@ QRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* e
else
{
workArea = Kicker::the()->kwinModule()->workArea(list, XineramaScreen)
- .intersect(QApplication::desktop()->screenGeometry(XineramaScreen));
+ .intersect(TQApplication::desktop()->screenGeometry(XineramaScreen));
}
return workArea;
@@ -693,7 +693,7 @@ int ExtensionManager::nextPanelOrder()
return m_panelCounter;
}
-void ExtensionManager::reduceArea(QRect &area, const ExtensionContainer *extension) const
+void ExtensionManager::reduceArea(TQRect &area, const ExtensionContainer *extension) const
{
if (!extension ||
extension->hideMode() == ExtensionContainer::AutomaticHide ||
@@ -702,10 +702,10 @@ void ExtensionManager::reduceArea(QRect &area, const ExtensionContainer *extensi
return;
}
- QRect geom = extension->initialGeometry(extension->position(), extension->alignment(),
+ TQRect geom = extension->initialGeometry(extension->position(), extension->alignment(),
extension->xineramaScreen());
- // reduce given area (QRect) to the space not covered by the given extension
+ // reduce given area (TQRect) to the space not covered by the given extension
// As simplification: the length of the extension is not taken into account
// which means that even a small extension e.g. on the left side of the desktop
// will remove the available area with its with
@@ -736,12 +736,12 @@ void ExtensionManager::reduceArea(QRect &area, const ExtensionContainer *extensi
}
}
-QRect ExtensionManager::desktopIconsArea(int screen) const
+TQRect ExtensionManager::desktopIconsArea(int screen) const
{
// This is pretty broken, mixes Xinerama and non-Xinerama multihead
// and generally doesn't seem to be required anyway => ignore screen.
-// QRect area = QApplication::desktop()->screenGeometry(screen);
- QRect area = QApplication::desktop()->geometry();
+// TQRect area = TQApplication::desktop()->screenGeometry(screen);
+ TQRect area = TQApplication::desktop()->geometry();
reduceArea(area, m_mainPanel);
reduceArea(area, m_menubarPanel);
diff --git a/kicker/kicker/core/extensionmanager.h b/kicker/kicker/core/extensionmanager.h
index 2885df01f..6de7b35e1 100644
--- a/kicker/kicker/core/extensionmanager.h
+++ b/kicker/kicker/core/extensionmanager.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __extensionmanager_h__
#define __extensionmanager_h__
-#include <qvaluelist.h>
-#include <qobject.h>
+#include <tqvaluelist.h>
+#include <tqobject.h>
#include "container_extension.h"
@@ -39,20 +39,20 @@ public:
static ExtensionManager* the();
void configureMenubar(bool duringInit);
- void addExtension( const QString &desktopFile );
- bool isMainPanel(const QWidget* panel) const;
- bool isMenuBar(const QWidget* panel) const;
+ void addExtension( const TQString &desktopFile );
+ bool isMainPanel(const TQWidget* panel) const;
+ bool isMenuBar(const TQWidget* panel) const;
void addContainer( ExtensionContainer* );
void removeAllContainers();
ExtensionList containers() const { return _containers; }
KPanelExtension::Position initialPanelPosition(KPanelExtension::Position preferred);
- QRect workArea(int XineramaScreen, const ExtensionContainer* container);
+ TQRect workArea(int XineramaScreen, const ExtensionContainer* container);
int nextPanelOrder();
// return the space available for all icons on the desktop
// subtracts all panels from XineramaScreen's geometry
- QRect desktopIconsArea(int xineramaScreen) const;
+ TQRect desktopIconsArea(int xineramaScreen) const;
public slots:
void removeContainer( ExtensionContainer* );
@@ -60,14 +60,14 @@ public slots:
void extensionSizeChanged(ExtensionContainer *);
signals:
- void desktopIconsAreaChanged(const QRect &, int xineramaScreen);
+ void desktopIconsAreaChanged(const TQRect &, int xineramaScreen);
protected:
friend class Kicker;
ExtensionManager();
~ExtensionManager();
- QString uniqueId();
+ TQString uniqueId();
void saveContainerConfig();
bool shouldExclude(int XineramaScreen,
const ExtensionContainer* container,
@@ -79,7 +79,7 @@ protected slots:
private:
void migrateMenubar();
- void reduceArea(QRect &area, const ExtensionContainer *panel) const;
+ void reduceArea(TQRect &area, const ExtensionContainer *panel) const;
ExtensionList _containers;
ExtensionContainer* m_menubarPanel;
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index 65e059c5b..de37c609e 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -24,9 +24,9 @@
#include <stdlib.h>
#include <unistd.h>
-#include <qfile.h>
-#include <qtimer.h>
-#include <qtooltip.h>
+#include <tqfile.h>
+#include <tqtimer.h>
+#include <tqtooltip.h>
#include <dcopclient.h>
#include <kconfig.h>
@@ -74,7 +74,7 @@ Kicker::Kicker()
// this means we've most likely crashed once. so let's see if we
// stay up for more than 2 minutes time, and if so reset the
// crash handler since the crash isn't a frequent offender
- QTimer::singleShot(120000, this, SLOT(setCrashHandler()));
+ TQTimer::singleShot(120000, this, TQT_SLOT(setCrashHandler()));
}
else
{
@@ -93,7 +93,7 @@ Kicker::Kicker()
dcopClient()->setDefaultObject("Panel");
disableSessionManagement();
- QString dataPathBase = KStandardDirs::kde_default("data").append("kicker/");
+ TQString dataPathBase = KStandardDirs::kde_default("data").append("kicker/");
KGlobal::dirs()->addResourceType("mini", dataPathBase + "pics/mini");
KGlobal::dirs()->addResourceType("icon", dataPathBase + "pics");
KGlobal::dirs()->addResourceType("builtinbuttons", dataPathBase + "builtins");
@@ -121,19 +121,19 @@ Kicker::Kicker()
// set up our global settings
configure();
- connect(this, SIGNAL(settingsChanged(int)), SLOT(slotSettingsChanged(int)));
- connect(this, SIGNAL(kdisplayPaletteChanged()), SLOT(paletteChanged()));
- connect(this, SIGNAL(kdisplayStyleChanged()), SLOT(slotStyleChanged()));
+ connect(this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
+ connect(this, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
+ connect(this, TQT_SIGNAL(kdisplayStyleChanged()), TQT_SLOT(slotStyleChanged()));
#if (QT_VERSION-0 >= 0x030200) // XRANDR support
- connect(desktop(), SIGNAL(resized(int)), SLOT(slotDesktopResized()));
+ connect(desktop(), TQT_SIGNAL(resized(int)), TQT_SLOT(slotDesktopResized()));
#endif
// the panels, aka extensions
- QTimer::singleShot(0, ExtensionManager::the(), SLOT(initialize()));
+ TQTimer::singleShot(0, ExtensionManager::the(), TQT_SLOT(initialize()));
- connect(ExtensionManager::the(), SIGNAL(desktopIconsAreaChanged(const QRect &, int)),
- this, SLOT(slotDesktopIconsAreaChanged(const QRect &, int)));
+ connect(ExtensionManager::the(), TQT_SIGNAL(desktopIconsAreaChanged(const TQRect &, int)),
+ this, TQT_SLOT(slotDesktopIconsAreaChanged(const TQRect &, int)));
}
Kicker::~Kicker()
@@ -205,7 +205,7 @@ void Kicker::slotStyleChanged()
restart();
}
-bool Kicker::highlightMenuItem(const QString &menuId)
+bool Kicker::highlightMenuItem(const TQString &menuId)
{
return MenuManager::the()->kmenu()->highlightMenuItem( menuId );
}
@@ -215,7 +215,7 @@ void Kicker::showKMenu()
MenuManager::the()->showKMenu();
}
-void Kicker::popupKMenu(const QPoint &p)
+void Kicker::popupKMenu(const TQPoint &p)
{
MenuManager::the()->popupKMenu(p);
}
@@ -231,13 +231,13 @@ void Kicker::configure()
KickerSettings::self()->readConfig();
- QToolTip::setGloballyEnabled(KickerSettings::showToolTips());
+ TQToolTip::setGloballyEnabled(KickerSettings::showToolTips());
if (notFirstConfig)
{
emit configurationChanged();
{
- QByteArray data;
+ TQByteArray data;
emitDCOPSignal("configurationChanged()", data);
}
}
@@ -254,7 +254,7 @@ void Kicker::quit()
void Kicker::restart()
{
// do this on a timer to give us time to return true
- QTimer::singleShot(0, this, SLOT(slotRestart()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotRestart()));
}
void Kicker::slotRestart()
@@ -267,7 +267,7 @@ void Kicker::slotRestart()
char ** o_argv = new char*[2];
o_argv[0] = strdup("kicker");
o_argv[1] = 0L;
- execv(QFile::encodeName(locate("exe", "kdeinit_wrapper")), o_argv);
+ execv(TQFile::encodeName(locate("exe", "kdeinit_wrapper")), o_argv);
exit(1);
}
@@ -282,14 +282,14 @@ bool Kicker::isKioskImmutable() const
return config()->isImmutable();
}
-void Kicker::addExtension( const QString &desktopFile )
+void Kicker::addExtension( const TQString &desktopFile )
{
ExtensionManager::the()->addExtension( desktopFile );
}
-QStringList Kicker::configModules(bool controlCenter)
+TQStringList Kicker::configModules(bool controlCenter)
{
- QStringList args;
+ TQStringList args;
if (controlCenter)
{
@@ -306,39 +306,39 @@ QStringList Kicker::configModules(bool controlCenter)
return args;
}
-QPoint Kicker::insertionPoint()
+TQPoint Kicker::insertionPoint()
{
return m_insertionPoint;
}
-void Kicker::setInsertionPoint(const QPoint &p)
+void Kicker::setInsertionPoint(const TQPoint &p)
{
m_insertionPoint = p;
}
-void Kicker::showConfig(const QString& configPath, int page)
+void Kicker::showConfig(const TQString& configPath, int page)
{
if (!m_configDialog)
{
m_configDialog = new KCMultiDialog(0);
- QStringList modules = configModules(false);
- QStringList::ConstIterator end(modules.end());
- for (QStringList::ConstIterator it = modules.begin(); it != end; ++it)
+ TQStringList modules = configModules(false);
+ TQStringList::ConstIterator end(modules.end());
+ for (TQStringList::ConstIterator it = modules.begin(); it != end; ++it)
{
m_configDialog->addModule(*it);
}
- connect(m_configDialog, SIGNAL(finished()), SLOT(configDialogFinished()));
+ connect(m_configDialog, TQT_SIGNAL(finished()), TQT_SLOT(configDialogFinished()));
}
if (!configPath.isEmpty())
{
- QByteArray data;
- QDataStream stream(data, IO_WriteOnly);
+ TQByteArray data;
+ TQDataStream stream(data, IO_WriteOnly);
stream << configPath;
- emitDCOPSignal("configSwitchToPanel(QString)", data);
+ emitDCOPSignal("configSwitchToPanel(TQString)", data);
}
KWin::setOnDesktop(m_configDialog->winId(), KWin::currentDesktop());
@@ -352,7 +352,7 @@ void Kicker::showConfig(const QString& configPath, int page)
void Kicker::showTaskBarConfig()
{
- showConfig(QString(), 4);
+ showConfig(TQString(), 4);
}
void Kicker::configureMenubar()
@@ -386,16 +386,16 @@ KWinModule* Kicker::kwinModule()
return m_kwinModule;
}
-QRect Kicker::desktopIconsArea(int screen) const
+TQRect Kicker::desktopIconsArea(int screen) const
{
return ExtensionManager::the()->desktopIconsArea(screen);
}
-void Kicker::slotDesktopIconsAreaChanged(const QRect &area, int screen)
+void Kicker::slotDesktopIconsAreaChanged(const TQRect &area, int screen)
{
- QByteArray params;
- QDataStream stream(params, IO_WriteOnly);
+ TQByteArray params;
+ TQDataStream stream(params, IO_WriteOnly);
stream << area;
stream << screen;
- emitDCOPSignal("desktopIconsAreaChanged(QRect, int)", params);
+ emitDCOPSignal("desktopIconsAreaChanged(TQRect, int)", params);
}
diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h
index 9ac1d3eac..6bb071007 100644
--- a/kicker/kicker/core/kicker.h
+++ b/kicker/kicker/core/kicker.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __kicker_h__
#define __kicker_h__
-#include <qcolor.h>
+#include <tqcolor.h>
#include <kuniqueapplication.h>
#include <kicontheme.h>
@@ -49,22 +49,22 @@ k_dcop:
void configure();
void quit();
void restart();
- void addExtension( const QString &desktopFile );
- void popupKMenu( const QPoint &globalPos );
+ void addExtension( const TQString &desktopFile );
+ void popupKMenu( const TQPoint &globalPos );
void clearQuickStartMenu();
- bool highlightMenuItem( const QString &menuId );
+ bool highlightMenuItem( const TQString &menuId );
void showKMenu();
void toggleShowDesktop();
bool desktopShowing();
- void showConfig(const QString& config, int page = -1);
+ void showConfig(const TQString& config, int page = -1);
void showTaskBarConfig();
void configureMenubar();
// return the region on the desktop, which is not covered by panels
// and therefore allowed to be used by icons placed on the desktop
- QRect desktopIconsArea(int screen) const;
+ TQRect desktopIconsArea(int screen) const;
k_dcop_signals:
- void desktopIconsAreaChanged(QRect area, int screen);
+ void desktopIconsAreaChanged(TQRect area, int screen);
public:
static Kicker* the();
@@ -75,12 +75,12 @@ public:
bool isKioskImmutable() const;
bool canAddContainers() const { return m_canAddContainers && !isImmutable(); }
- static QStringList configModules(bool controlCenter);
+ static TQStringList configModules(bool controlCenter);
/**
* Global position where to insert a new item
*/
- QPoint insertionPoint();
+ TQPoint insertionPoint();
/**
* Set the global position where to insert a new item
@@ -90,14 +90,14 @@ public:
*
* Kicker::the()->setInsertionPoint(p);
* ...
- * QPoint where = Kicker::the()->insertionPoint();
+ * TQPoint where = Kicker::the()->insertionPoint();
* ...
- * Kicker::the()->setInsertionPoint(QPoint());
+ * Kicker::the()->setInsertionPoint(TQPoint());
*
* this is not pretty, but it's pragmatic and does everything
* that is needed
*/
- void setInsertionPoint(const QPoint &p);
+ void setInsertionPoint(const TQPoint &p);
public slots:
@@ -116,7 +116,7 @@ private slots:
void slotStyleChanged();
void paletteChanged();
void setCrashHandler();
- void slotDesktopIconsAreaChanged(const QRect &area, int screen);
+ void slotDesktopIconsAreaChanged(const TQRect &area, int screen);
private:
static void crashHandler(int signal);
@@ -125,7 +125,7 @@ private:
KWinModule* m_kwinModule;
KCMultiDialog* m_configDialog;
bool m_canAddContainers;
- QPoint m_insertionPoint;
+ TQPoint m_insertionPoint;
};
#endif
diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp
index 2134fb975..bc62df231 100644
--- a/kicker/kicker/core/kickerbindings.cpp
+++ b/kicker/kicker/core/kickerbindings.cpp
@@ -23,10 +23,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef NOSLOTS
# define DEF( name, key3, key4, target, fnSlot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4, target, SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString::null, key3, key4, target, TQT_SLOT(fnSlot) )
#else
# define DEF( name, key3, key4, target, fnSlot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4 )
+ keys->insert( name, i18n(name), TQString::null, key3, key4 )
#endif
#define WIN KKey::QtWIN
diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp
index aa49f90aa..16090b9af 100644
--- a/kicker/kicker/core/main.cpp
+++ b/kicker/kicker/core/main.cpp
@@ -51,13 +51,13 @@ static const char version[] = VERSION;
static void sighandler(int)
{
fprintf(stderr, "kicker: sighandler called\n");
- QApplication::exit();
+ TQApplication::exit();
}
extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
{
{
- QCString multiHead = getenv("KDE_MULTIHEAD");
+ TQCString multiHead = getenv("KDE_MULTIHEAD");
if (multiHead.lower() == "true") {
Display *dpy = XOpenDisplay(NULL);
if (! dpy) {
@@ -69,14 +69,14 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
int number_of_screens = ScreenCount(dpy);
kicker_screen_number = DefaultScreen(dpy);
int pos;
- QCString display_name = XDisplayString(dpy);
+ TQCString display_name = XDisplayString(dpy);
XCloseDisplay(dpy);
dpy = 0;
if ((pos = display_name.findRev('.')) != -1)
display_name.remove(pos, 10);
- QCString env;
+ TQCString env;
if (number_of_screens != 1) {
for (int i = 0; i < number_of_screens; i++) {
if (i != kicker_screen_number && fork() == 0) {
@@ -101,7 +101,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
KGlobal::locale()->setMainCatalogue("kicker");
- QCString appname;
+ TQCString appname;
if (kicker_screen_number == 0)
appname = "kicker";
else
@@ -140,12 +140,12 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
signal(SIGHUP, SIG_IGN);
// send it even before KApplication ctor, because ksmserver will launch another app as soon
- // as QApplication registers with it
+ // as TQApplication registers with it
DCOPClient* cl = new DCOPClient;
cl->attach();
DCOPRef r( "ksmserver", "ksmserver" );
r.setDCOPClient( cl );
- r.send( "suspendStartup", QCString( "kicker" ));
+ r.send( "suspendStartup", TQCString( "kicker" ));
delete cl;
Kicker* kicker = new Kicker;
int rv = kicker->exec();
diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp
index 9e4a91f97..908f6bdf9 100644
--- a/kicker/kicker/core/menumanager.cpp
+++ b/kicker/kicker/core/menumanager.cpp
@@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qcursor.h>
-#include <qpixmap.h>
-#include <qtimer.h>
+#include <tqcursor.h>
+#include <tqpixmap.h>
+#include <tqtimer.h>
#include <kapplication.h>
#include <dcopclient.h>
@@ -59,13 +59,13 @@ MenuManager* MenuManager::the()
return m_self;
}
-MenuManager::MenuManager(QObject *parent)
- : QObject(parent, "MenuManager"), DCOPObject("MenuManager")
+MenuManager::MenuManager(TQObject *parent)
+ : TQObject(parent, "MenuManager"), DCOPObject("MenuManager")
{
m_kmenu = new PanelKMenu;
kapp->dcopClient()->setNotifications(true);
- connect(kapp->dcopClient(), SIGNAL(applicationRemoved(const QCString&)),
- this, SLOT(applicationRemoved(const QCString&)));
+ connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)),
+ this, TQT_SLOT(applicationRemoved(const TQCString&)));
}
MenuManager::~MenuManager()
@@ -88,7 +88,7 @@ void MenuManager::showKMenu()
m_kmenu->showMenu();
}
-void MenuManager::popupKMenu(const QPoint &p)
+void MenuManager::popupKMenu(const TQPoint &p)
{
// kdDebug(1210) << "popupKMenu()" << endl;
if (m_kmenu->isVisible())
@@ -97,7 +97,7 @@ void MenuManager::popupKMenu(const QPoint &p)
}
else if (p.isNull())
{
- m_kmenu->popup(QCursor::pos());
+ m_kmenu->popup(TQCursor::pos());
}
else
{
@@ -120,7 +120,7 @@ void MenuManager::unregisterKButton(PanelPopupButton *button)
m_kbuttons.remove(button);
}
-PanelPopupButton* MenuManager::findKButtonFor(QPopupMenu* menu)
+PanelPopupButton* MenuManager::findKButtonFor(TQPopupMenu* menu)
{
KButtonList::const_iterator itEnd = m_kbuttons.constEnd();
for (KButtonList::const_iterator it = m_kbuttons.constBegin(); it != itEnd; ++it)
@@ -147,37 +147,37 @@ void MenuManager::kmenuAccelActivated()
if (m_kbuttons.isEmpty())
{
// no button to use, make it behave like a desktop menu
- QPoint p;
+ TQPoint p;
// Popup the K-menu at the center of the screen.
- QDesktopWidget* desktop = KApplication::desktop();
- QRect r;
+ TQDesktopWidget* desktop = KApplication::desktop();
+ TQRect r;
if (desktop->numScreens() < 2)
r = desktop->geometry();
else
- r = desktop->screenGeometry(desktop->screenNumber(QCursor::pos()));
+ r = desktop->screenGeometry(desktop->screenNumber(TQCursor::pos()));
// kMenu->rect() is not valid before showing, use sizeHint()
- p = r.center() - QRect( QPoint( 0, 0 ), m_kmenu->sizeHint()).center();
+ p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->sizeHint()).center();
m_kmenu->popup(p);
// when the cursor is in the area where the menu pops up,
// the item under the cursor gets selected. The single shot
// avoids this from happening by allowing the item to be selected
// when the event loop is enterred, and then resetting it.
- QTimer::singleShot(0, this, SLOT(slotSetKMenuItemActive()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotSetKMenuItemActive()));
}
else
{
// We need the kmenu's size to place it at the right position.
// We cannot rely on the popup menu's current size(), if it wasn't
// shown before, so we resize it here according to its sizeHint().
- const QSize size = m_kmenu->sizeHint();
+ const TQSize size = m_kmenu->sizeHint();
m_kmenu->resize(size.width(),size.height());
PanelPopupButton* button = findKButtonFor(m_kmenu);
// let's unhide the panel while we're at it. traverse the widget
// hierarchy until we find the panel, if any
- QObject* menuParent = button->parent();
+ TQObject* menuParent = button->parent();
while (menuParent)
{
ExtensionContainer* ext = dynamic_cast<ExtensionContainer*>(menuParent);
@@ -198,11 +198,11 @@ void MenuManager::kmenuAccelActivated()
}
}
-QCString MenuManager::createMenu(QPixmap icon, QString text)
+TQCString MenuManager::createMenu(TQPixmap icon, TQString text)
{
static int menucount = 0;
menucount++;
- QCString name;
+ TQCString name;
name.sprintf("kickerclientmenu-%d", menucount );
KickerClientMenu* p = new KickerClientMenu( 0, name );
clientmenus.append(p);
@@ -215,7 +215,7 @@ QCString MenuManager::createMenu(QPixmap icon, QString text)
return name;
}
-void MenuManager::removeMenu(QCString menu)
+void MenuManager::removeMenu(TQCString menu)
{
bool iterate = true;
ClientMenuList::iterator it = clientmenus.begin();
@@ -234,7 +234,7 @@ void MenuManager::removeMenu(QCString menu)
}
-void MenuManager::applicationRemoved(const QCString& appRemoved)
+void MenuManager::applicationRemoved(const TQCString& appRemoved)
{
bool iterate = true;
ClientMenuList::iterator it = clientmenus.begin();
@@ -252,21 +252,21 @@ void MenuManager::applicationRemoved(const QCString& appRemoved)
m_kmenu->adjustSize();
}
-bool MenuManager::process(const QCString &fun, const QByteArray &data,
- QCString &replyType, QByteArray &replyData)
+bool MenuManager::process(const TQCString &fun, const TQByteArray &data,
+ TQCString &replyType, TQByteArray &replyData)
{
- if ( fun == "createMenu(QPixmap,QString)" ) {
- QDataStream dataStream( data, IO_ReadOnly );
- QPixmap icon;
- QString text;
+ if ( fun == "createMenu(TQPixmap,TQString)" ) {
+ TQDataStream dataStream( data, IO_ReadOnly );
+ TQPixmap icon;
+ TQString text;
dataStream >> icon >> text;
- QDataStream reply( replyData, IO_WriteOnly );
+ TQDataStream reply( replyData, IO_WriteOnly );
reply << createMenu( icon, text );
- replyType = "QCString";
+ replyType = "TQCString";
return true;
- } else if ( fun == "removeMenu(QCString)" ) {
- QDataStream dataStream( data, IO_ReadOnly );
- QCString menu;
+ } else if ( fun == "removeMenu(TQCString)" ) {
+ TQDataStream dataStream( data, IO_ReadOnly );
+ TQCString menu;
dataStream >> menu;
removeMenu( menu );
replyType = "void";
diff --git a/kicker/kicker/core/menumanager.h b/kicker/kicker/core/menumanager.h
index ed0e5d225..e9d7dfef4 100644
--- a/kicker/kicker/core/menumanager.h
+++ b/kicker/kicker/core/menumanager.h
@@ -25,38 +25,38 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define KICKER_MENU_MANAGER_H
#include <dcopobject.h>
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
class PanelKMenu;
class KickerClientMenu;
class PanelPopupButton;
-typedef QValueList<PanelPopupButton*> KButtonList;
+typedef TQValueList<PanelPopupButton*> KButtonList;
/**
* The factory for menus created by other applications. Also the owner of these menus.
*/
-class MenuManager : public QObject, DCOPObject
+class MenuManager : public TQObject, DCOPObject
{
Q_OBJECT
public:
static MenuManager* the();
// dcop exported
- QCString createMenu(QPixmap icon, QString text);
- void removeMenu(QCString menu);
+ TQCString createMenu(TQPixmap icon, TQString text);
+ void removeMenu(TQCString menu);
// dcop internal
- bool process(const QCString &fun, const QByteArray &data, QCString& replyType, QByteArray &reply);
+ bool process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &reply);
// KMenu controls
PanelKMenu* kmenu() { return m_kmenu; }
void showKMenu();
- void popupKMenu(const QPoint &p);
+ void popupKMenu(const TQPoint &p);
void registerKButton(PanelPopupButton *button);
void unregisterKButton(PanelPopupButton *button);
- PanelPopupButton* findKButtonFor(QPopupMenu* menu);
+ PanelPopupButton* findKButtonFor(TQPopupMenu* menu);
~MenuManager();
public slots:
@@ -64,15 +64,15 @@ public slots:
void kmenuAccelActivated();
protected slots:
- void applicationRemoved(const QCString&);
+ void applicationRemoved(const TQCString&);
protected:
PanelKMenu* m_kmenu;
- typedef QValueList<KickerClientMenu*> ClientMenuList;
+ typedef TQValueList<KickerClientMenu*> ClientMenuList;
ClientMenuList clientmenus;
private:
- MenuManager(QObject *parent = 0);
+ MenuManager(TQObject *parent = 0);
static MenuManager* m_self;
KButtonList m_kbuttons;
diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp
index 70b7b407d..2bd70c82b 100644
--- a/kicker/kicker/core/panelextension.cpp
+++ b/kicker/kicker/core/panelextension.cpp
@@ -22,11 +22,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qframe.h>
-#include <qvalidator.h>
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qstyle.h>
+#include <tqframe.h>
+#include <tqvalidator.h>
+#include <tqlayout.h>
+#include <tqpainter.h>
+#include <tqstyle.h>
#include <kdebug.h>
#include <khelpmenu.h>
@@ -53,8 +53,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "panelextension.moc"
// KDE4: make these say Panel_(somenumber)
-PanelExtension::PanelExtension(const QString& configFile, QWidget *parent, const char *name)
- : DCOPObject(QCString("ChildPanel_") + QString::number((ulong)this).latin1()),
+PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, const char *name)
+ : DCOPObject(TQCString("ChildPanel_") + TQString::number((ulong)this).latin1()),
KPanelExtension(configFile, KPanelExtension::Stretch, 0, parent, name),
_opMnu(0),
m_panelAddMenu(0),
@@ -67,11 +67,11 @@ PanelExtension::PanelExtension(const QString& configFile, QWidget *parent, const
setAcceptDrops(!Kicker::the()->isImmutable());
setCustomMenu(opMenu());
- QVBoxLayout* _layout = new QVBoxLayout(this);
+ TQVBoxLayout* _layout = new TQVBoxLayout(this);
// container area
_containerArea = new ContainerArea( config(), this, opMenu() );
- connect(_containerArea, SIGNAL(maintainFocus(bool)), this, SIGNAL(maintainFocus(bool)));
+ connect(_containerArea, TQT_SIGNAL(maintainFocus(bool)), this, TQT_SIGNAL(maintainFocus(bool)));
_layout->addWidget(_containerArea);
_containerArea->viewport()->installEventFilter(this);
@@ -81,15 +81,15 @@ PanelExtension::PanelExtension(const QString& configFile, QWidget *parent, const
// beginning.
positionChange(position());
- connect(Kicker::the(), SIGNAL(configurationChanged()),
- SLOT(configurationChanged()));
- connect(Kicker::the(), SIGNAL(immutabilityChanged(bool)),
- SLOT(immutabilityChanged(bool)));
+ connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
+ TQT_SLOT(configurationChanged()));
+ connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)),
+ TQT_SLOT(immutabilityChanged(bool)));
// we wait to get back to the event loop to start up the container area so that
// the main panel in ExtensionManager will be assigned and we can tell in a
// relatively non-hackish way that we are (or aren't) the "main panel"
- QTimer::singleShot(0, this, SLOT(populateContainerArea()));
+ TQTimer::singleShot(0, this, TQT_SLOT(populateContainerArea()));
}
PanelExtension::~PanelExtension()
@@ -121,15 +121,15 @@ void PanelExtension::immutabilityChanged(bool)
m_opMenuBuilt = false;
}
-QPopupMenu* PanelExtension::opMenu()
+TQPopupMenu* PanelExtension::opMenu()
{
if (_opMnu)
{
return _opMnu;
}
- _opMnu = new QPopupMenu(this);
- connect(_opMnu, SIGNAL(aboutToShow()), this, SLOT(slotBuildOpMenu()));
+ _opMnu = new TQPopupMenu(this);
+ connect(_opMnu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBuildOpMenu()));
return _opMnu;
}
@@ -139,39 +139,39 @@ void PanelExtension::positionChange(Position p)
_containerArea->setPosition(p);
}
-QSize PanelExtension::sizeHint(Position p, QSize maxSize) const
+TQSize PanelExtension::sizeHint(Position p, TQSize maxSize) const
{
- QSize size;
+ TQSize size;
if (p == Left || p == Right)
{
- size = QSize(sizeInPixels(),
+ size = TQSize(sizeInPixels(),
_containerArea->heightForWidth(sizeInPixels()));
}
else
{
- size = QSize(_containerArea->widthForHeight(sizeInPixels()),
+ size = TQSize(_containerArea->widthForHeight(sizeInPixels()),
sizeInPixels());
}
return size.boundedTo( maxSize );
}
-bool PanelExtension::eventFilter(QObject*, QEvent * e)
+bool PanelExtension::eventFilter(TQObject*, TQEvent * e)
{
- if ( e->type() == QEvent::MouseButtonPress )
+ if ( e->type() == TQEvent::MouseButtonPress )
{
- QMouseEvent* me = (QMouseEvent*) e;
+ TQMouseEvent* me = (TQMouseEvent*) e;
if ( me->button() == RightButton && kapp->authorize("action/kicker_rmb"))
{
Kicker::the()->setInsertionPoint(me->globalPos());
opMenu()->exec(me->globalPos());
- Kicker::the()->setInsertionPoint(QPoint());
+ Kicker::the()->setInsertionPoint(TQPoint());
return true;
}
}
else
- if ( e->type() == QEvent::Resize )
+ if ( e->type() == TQEvent::Resize )
{
emit updateLayout();
}
@@ -211,72 +211,72 @@ void PanelExtension::addWindowListButton()
_containerArea->addWindowListButton();
}
-void PanelExtension::addURLButton(const QString &url)
+void PanelExtension::addURLButton(const TQString &url)
{
_containerArea->addURLButton(url);
}
-void PanelExtension::addBrowserButton(const QString &startDir)
+void PanelExtension::addBrowserButton(const TQString &startDir)
{
_containerArea->addBrowserButton(startDir);
}
-void PanelExtension::addServiceButton(const QString& desktopEntry)
+void PanelExtension::addServiceButton(const TQString& desktopEntry)
{
_containerArea->addServiceButton(desktopEntry);
}
-void PanelExtension::addServiceMenuButton(const QString &,
- const QString& relPath)
+void PanelExtension::addServiceMenuButton(const TQString &,
+ const TQString& relPath)
{
_containerArea->addServiceMenuButton(relPath);
}
-void PanelExtension::addNonKDEAppButton(const QString &filePath,
- const QString &icon,
- const QString &cmdLine, bool inTerm)
+void PanelExtension::addNonKDEAppButton(const TQString &filePath,
+ const TQString &icon,
+ const TQString &cmdLine, bool inTerm)
{
- _containerArea->addNonKDEAppButton(filePath, QString::null, filePath, icon,
+ _containerArea->addNonKDEAppButton(filePath, TQString::null, filePath, icon,
cmdLine, inTerm);
}
-void PanelExtension::addNonKDEAppButton(const QString &title,
- const QString &description,
- const QString &filePath,
- const QString &icon,
- const QString &cmdLine, bool inTerm)
+void PanelExtension::addNonKDEAppButton(const TQString &title,
+ const TQString &description,
+ const TQString &filePath,
+ const TQString &icon,
+ const TQString &cmdLine, bool inTerm)
{
_containerArea->addNonKDEAppButton(title, description, filePath, icon,
cmdLine, inTerm);
}
-void PanelExtension::addApplet(const QString &desktopFile)
+void PanelExtension::addApplet(const TQString &desktopFile)
{
- _containerArea->addApplet(AppletInfo(desktopFile, QString::null, AppletInfo::Applet));
+ _containerArea->addApplet(AppletInfo(desktopFile, TQString::null, AppletInfo::Applet));
}
-void PanelExtension::addAppletContainer(const QString &desktopFile)
+void PanelExtension::addAppletContainer(const TQString &desktopFile)
{
// KDE4: this appears in the DCOP interface.
// but it's such a bad name, can this go away?
addApplet(desktopFile);
}
-bool PanelExtension::insertApplet(const QString& desktopFile, int index)
+bool PanelExtension::insertApplet(const TQString& desktopFile, int index)
{
return _containerArea->addApplet(desktopFile, false, index) != 0;
}
-bool PanelExtension::insertImmutableApplet(const QString& desktopFile, int index)
+bool PanelExtension::insertImmutableApplet(const TQString& desktopFile, int index)
{
return _containerArea->addApplet(desktopFile, true, index) != 0;
}
-QStringList PanelExtension::listApplets()
+TQStringList PanelExtension::listApplets()
{
return _containerArea->listContainers();
BaseContainer::List containers = _containerArea->containers("All");
- QStringList names;
+ TQStringList names;
for (BaseContainer::List::const_iterator it = containers.constBegin();
it != containers.constEnd();
@@ -330,7 +330,7 @@ void PanelExtension::slotBuildOpMenu()
m_opMenuBuilt = true;
bool kickerImmutable = Kicker::the()->isImmutable();
- bool isMenuBar = ExtensionManager::the()->isMenuBar(dynamic_cast<QWidget*>(parent()));
+ bool isMenuBar = ExtensionManager::the()->isMenuBar(dynamic_cast<TQWidget*>(parent()));
if (!kickerImmutable)
{
@@ -339,7 +339,7 @@ void PanelExtension::slotBuildOpMenu()
{
_opMnu->insertItem(isMenuBar ? i18n("Add &Applet to Menubar...")
: i18n("Add &Applet to Panel..."),
- _containerArea, SLOT(showAddAppletDialog()));
+ _containerArea, TQT_SLOT(showAddAppletDialog()));
m_panelAddMenu = new PanelAddButtonMenu(_containerArea, this);
_opMnu->insertItem(isMenuBar ? i18n("Add Appli&cation to Menubar")
: i18n("Add Appli&cation to Panel"),
@@ -362,7 +362,7 @@ void PanelExtension::slotBuildOpMenu()
}
_opMnu->insertItem(SmallIconSet("lock"), i18n("&Lock Panels"),
- Kicker::the(), SLOT(toggleLock()));
+ Kicker::the(), TQT_SLOT(toggleLock()));
}
else if (!Kicker::the()->isKioskImmutable())
{
@@ -370,20 +370,20 @@ void PanelExtension::slotBuildOpMenu()
SmallIconSet("lock"),
kickerImmutable ? i18n("Un&lock Panels") :
i18n("&Lock Panels"),
- Kicker::the(), SLOT(toggleLock()));
+ Kicker::the(), TQT_SLOT(toggleLock()));
}
if (!isMenuBar && !Kicker::the()->isKioskImmutable())
{
_opMnu->insertItem(SmallIconSet("configure"),
i18n("&Configure Panel..."),
- this, SLOT(showConfig()));
+ this, TQT_SLOT(showConfig()));
_opMnu->insertSeparator();
}
_opMnu->insertItem(SmallIconSet("fork"),
i18n("&Launch Process Manager..."),
- this, SLOT(showProcessManager()));
+ this, TQT_SLOT(showProcessManager()));
_opMnu->insertSeparator();
if (kapp->authorize("action/help"))
@@ -441,7 +441,7 @@ void MenubarExtension::populateContainerArea()
if (!m_menubar)
{
m_menubar = _containerArea->addApplet(AppletInfo("menuapplet.desktop",
- QString::null,
+ TQString::null,
AppletInfo::Applet));
}
diff --git a/kicker/kicker/core/panelextension.h b/kicker/kicker/core/panelextension.h
index 9f50fb9ae..5c753c316 100644
--- a/kicker/kicker/core/panelextension.h
+++ b/kicker/kicker/core/panelextension.h
@@ -44,10 +44,10 @@ class PanelExtension : public KPanelExtension, virtual public DCOPObject
K_DCOP
public:
- PanelExtension(const QString& configFile, QWidget *parent = 0, const char *name = 0);
+ PanelExtension(const TQString& configFile, TQWidget *parent = 0, const char *name = 0);
virtual ~PanelExtension();
- QPopupMenu* opMenu();
+ TQPopupMenu* opMenu();
k_dcop:
int panelSize() { return sizeInPixels(); }
@@ -58,31 +58,31 @@ k_dcop:
void addKMenuButton();
void addDesktopButton();
void addWindowListButton();
- void addURLButton(const QString &url);
- void addBrowserButton(const QString &startDir);
- void addServiceButton(const QString &desktopEntry);
- void addServiceMenuButton(const QString &name, const QString& relPath);
- void addNonKDEAppButton(const QString &filePath, const QString &icon,
- const QString &cmdLine, bool inTerm);
- void addNonKDEAppButton(const QString &title, const QString &description,
- const QString &filePath, const QString &icon,
- const QString &cmdLine, bool inTerm);
-
- void addApplet(const QString &desktopFile);
- void addAppletContainer(const QString &desktopFile); // KDE4: remove, useless
-
- bool insertApplet(const QString& desktopFile, int index);
- bool insertImmutableApplet(const QString& desktopFile, int index);
- QStringList listApplets();
+ void addURLButton(const TQString &url);
+ void addBrowserButton(const TQString &startDir);
+ void addServiceButton(const TQString &desktopEntry);
+ void addServiceMenuButton(const TQString &name, const TQString& relPath);
+ void addNonKDEAppButton(const TQString &filePath, const TQString &icon,
+ const TQString &cmdLine, bool inTerm);
+ void addNonKDEAppButton(const TQString &title, const TQString &description,
+ const TQString &filePath, const TQString &icon,
+ const TQString &cmdLine, bool inTerm);
+
+ void addApplet(const TQString &desktopFile);
+ void addAppletContainer(const TQString &desktopFile); // KDE4: remove, useless
+
+ bool insertApplet(const TQString& desktopFile, int index);
+ bool insertImmutableApplet(const TQString& desktopFile, int index);
+ TQStringList listApplets();
bool removeApplet(int index);
void restart(); // KDE4: remove, moved to Kicker
void configure(); // KDE4: remove, moved to Kikcker
public:
- QSize sizeHint(Position, QSize maxSize) const;
+ TQSize sizeHint(Position, TQSize maxSize) const;
Position preferedPosition() const { return Bottom; }
- bool eventFilter( QObject *, QEvent * );
+ bool eventFilter( TQObject *, TQEvent * );
protected:
void positionChange(Position);
@@ -98,12 +98,12 @@ protected slots:
virtual void populateContainerArea();
private:
- QPopupMenu* _opMnu;
- QPopupMenu* m_panelAddMenu;
- QPopupMenu* m_removeMnu;
- QPopupMenu* m_addExtensionMenu;
- QPopupMenu* m_removeExtensionMenu;
- QString _configFile;
+ TQPopupMenu* _opMnu;
+ TQPopupMenu* m_panelAddMenu;
+ TQPopupMenu* m_removeMnu;
+ TQPopupMenu* m_addExtensionMenu;
+ TQPopupMenu* m_removeExtensionMenu;
+ TQString _configFile;
bool m_opMenuBuilt;
};
diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp
index e392959ad..81975ccae 100644
--- a/kicker/kicker/core/pluginmanager.cpp
+++ b/kicker/kicker/core/pluginmanager.cpp
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qfile.h>
-#include <qtimer.h>
+#include <tqfile.h>
+#include <tqtimer.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -54,33 +54,33 @@ PluginManager* PluginManager::the()
AppletInfo::List PluginManager::applets(bool sort, AppletInfo::List* list)
{
- QStringList rel;
+ TQStringList rel;
KGlobal::dirs()->findAllResources("applets", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::Applet, sort, list);
}
AppletInfo::List PluginManager::extensions(bool sort, AppletInfo::List* list)
{
- QStringList rel;
+ TQStringList rel;
KGlobal::dirs()->findAllResources("extensions", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::Extension, sort, list);
}
AppletInfo::List PluginManager::builtinButtons(bool sort, AppletInfo::List* list)
{
- QStringList rel;
+ TQStringList rel;
KGlobal::dirs()->findAllResources("builtinbuttons", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::BuiltinButton, sort, list);
}
AppletInfo::List PluginManager::specialButtons(bool sort, AppletInfo::List* list)
{
- QStringList rel;
+ TQStringList rel;
KGlobal::dirs()->findAllResources("specialbuttons", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::SpecialButton, sort, list);
}
-AppletInfo::List PluginManager::plugins(const QStringList& desktopFiles,
+AppletInfo::List PluginManager::plugins(const TQStringList& desktopFiles,
AppletInfo::AppletType type,
bool sort,
AppletInfo::List* list)
@@ -92,10 +92,10 @@ AppletInfo::List PluginManager::plugins(const QStringList& desktopFiles,
plugins = *list;
}
- for (QStringList::ConstIterator it = desktopFiles.constBegin();
+ for (TQStringList::ConstIterator it = desktopFiles.constBegin();
it != desktopFiles.constEnd(); ++it)
{
- AppletInfo info(*it, QString::null, type);
+ AppletInfo info(*it, TQString::null, type);
if (!info.isHidden())
{
@@ -123,8 +123,8 @@ PluginManager::~PluginManager()
AppletInfo::Dict::const_iterator it = _dict.constBegin();
for (; it != _dict.constEnd(); ++it)
{
- disconnect(it.key(), SIGNAL(destroyed( QObject*)),
- this, SLOT(slotPluginDestroyed(QObject*)));
+ disconnect(it.key(), TQT_SIGNAL(destroyed( TQObject*)),
+ this, TQT_SLOT(slotPluginDestroyed(TQObject*)));
delete it.data();
}
@@ -133,10 +133,10 @@ PluginManager::~PluginManager()
}
KPanelApplet* PluginManager::loadApplet(const AppletInfo& info,
- QWidget* parent )
+ TQWidget* parent )
{
KLibLoader* loader = KLibLoader::self();
- KLibrary* lib = loader->library( QFile::encodeName(info.library()) );
+ KLibrary* lib = loader->library( TQFile::encodeName(info.library()) );
if (!lib)
{
@@ -145,13 +145,13 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info,
return 0;
}
- KPanelApplet* (*init_ptr)(QWidget *, const QString&);
- init_ptr = (KPanelApplet* (*)(QWidget *, const QString&))lib->symbol( "init" );
+ KPanelApplet* (*init_ptr)(TQWidget *, const TQString&);
+ init_ptr = (KPanelApplet* (*)(TQWidget *, const TQString&))lib->symbol( "init" );
if (!init_ptr)
{
kdWarning() << info.library() << " is not a kicker extension!" << endl;
- loader->unloadLibrary( QFile::encodeName(info.library()) );
+ loader->unloadLibrary( TQFile::encodeName(info.library()) );
return 0;
}
@@ -160,15 +160,15 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info,
if (applet)
{
_dict.insert( applet, new AppletInfo( info ) );
- connect( applet, SIGNAL( destroyed( QObject* ) ),
- SLOT( slotPluginDestroyed( QObject* ) ) );
+ connect( applet, TQT_SIGNAL( destroyed( TQObject* ) ),
+ TQT_SLOT( slotPluginDestroyed( TQObject* ) ) );
}
return applet;
}
KPanelExtension* PluginManager::loadExtension(
- const AppletInfo& info, QWidget* parent )
+ const AppletInfo& info, TQWidget* parent )
{
if (info.library() == "childpanel_panelextension"
/* KDE4? || info.library() == "panel" */)
@@ -177,7 +177,7 @@ KPanelExtension* PluginManager::loadExtension(
}
KLibLoader* loader = KLibLoader::self();
- KLibrary* lib = loader->library( QFile::encodeName(info.library()) );
+ KLibrary* lib = loader->library( TQFile::encodeName(info.library()) );
if( !lib ) {
kdWarning() << "cannot open extension: " << info.library()
@@ -185,12 +185,12 @@ KPanelExtension* PluginManager::loadExtension(
return 0;
}
- KPanelExtension* (*init_ptr)(QWidget *, const QString&);
- init_ptr = (KPanelExtension* (*)(QWidget *, const QString&))lib->symbol( "init" );
+ KPanelExtension* (*init_ptr)(TQWidget *, const TQString&);
+ init_ptr = (KPanelExtension* (*)(TQWidget *, const TQString&))lib->symbol( "init" );
if(!init_ptr){
kdWarning() << info.library() << " is not a kicker extension!" << endl;
- loader->unloadLibrary( QFile::encodeName(info.library()) );
+ loader->unloadLibrary( TQFile::encodeName(info.library()) );
return 0;
}
@@ -198,8 +198,8 @@ KPanelExtension* PluginManager::loadExtension(
if( extension ) {
_dict.insert( extension, new AppletInfo( info ) );
- connect( extension, SIGNAL( destroyed( QObject* ) ),
- SLOT( slotPluginDestroyed( QObject* ) ) );
+ connect( extension, TQT_SIGNAL( destroyed( TQObject* ) ),
+ TQT_SLOT( slotPluginDestroyed( TQObject* ) ) );
}
return extension;
@@ -219,7 +219,7 @@ bool PluginManager::hasInstance( const AppletInfo& info ) const
return false;
}
-void PluginManager::slotPluginDestroyed(QObject* object)
+void PluginManager::slotPluginDestroyed(TQObject* object)
{
AppletInfo* info = 0;
AppletInfo::Dict::iterator it = _dict.begin();
@@ -243,14 +243,14 @@ void PluginManager::slotPluginDestroyed(QObject* object)
}
AppletContainer* PluginManager::createAppletContainer(
- const QString& desktopFile,
+ const TQString& desktopFile,
bool isStartup,
- const QString& configFile,
- QPopupMenu* opMenu,
- QWidget* parent,
+ const TQString& configFile,
+ TQPopupMenu* opMenu,
+ TQWidget* parent,
bool isImmutable)
{
- QString desktopPath = KGlobal::dirs()->findResource( "applets", desktopFile );
+ TQString desktopPath = KGlobal::dirs()->findResource( "applets", desktopFile );
// KDE4: remove
// support the old (KDE 2.2) nameing scheme
@@ -298,17 +298,17 @@ AppletContainer* PluginManager::createAppletContainer(
return container;
}
-ExtensionContainer* PluginManager::createExtensionContainer(const QString& desktopFile,
+ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desktopFile,
bool isStartup,
- const QString& configFile,
- const QString& extensionId)
+ const TQString& configFile,
+ const TQString& extensionId)
{
if (desktopFile.isEmpty())
{
return 0;
}
- QString desktopPath = KGlobal::dirs()->findResource("extensions", desktopFile);
+ TQString desktopPath = KGlobal::dirs()->findResource("extensions", desktopFile);
if (desktopPath.isEmpty())
{
return 0;
@@ -355,22 +355,22 @@ void PluginManager::clearUntrustedLists()
generalGroup.sync();
}
-LibUnloader::LibUnloader( const QString &libName, QObject *parent )
- : QObject( parent ), _libName( libName )
+LibUnloader::LibUnloader( const TQString &libName, TQObject *parent )
+ : TQObject( parent ), _libName( libName )
{
// NOTE: this doesn't work on kicker shutdown because the timer never gets
// fired.
- QTimer::singleShot( 0, this, SLOT( unload() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( unload() ) );
}
-void LibUnloader::unload( const QString &libName )
+void LibUnloader::unload( const TQString &libName )
{
(void)new LibUnloader( libName, kapp );
}
void LibUnloader::unload()
{
- KLibLoader::self()->unloadLibrary( QFile::encodeName( _libName ) );
+ KLibLoader::self()->unloadLibrary( TQFile::encodeName( _libName ) );
deleteLater();
}
diff --git a/kicker/kicker/core/pluginmanager.h b/kicker/kicker/core/pluginmanager.h
index bbea87b30..7be94c2ac 100644
--- a/kicker/kicker/core/pluginmanager.h
+++ b/kicker/kicker/core/pluginmanager.h
@@ -24,9 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __PLUGIN_MANAGER_H__
#define __PLUGIN_MANAGER_H__
-#include <qmap.h>
-#include <qobject.h>
-#include <qstringlist.h>
+#include <tqmap.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
#include <kdemacros.h>
#include <kstaticdeleter.h>
@@ -49,19 +49,19 @@ public:
static AppletInfo::List builtinButtons(bool sort = true, AppletInfo::List* list = 0);
static AppletInfo::List specialButtons(bool sort = true, AppletInfo::List* list = 0);
- AppletContainer* createAppletContainer(const QString& desktopFile,
+ AppletContainer* createAppletContainer(const TQString& desktopFile,
bool isStartup,
- const QString& configFile,
- QPopupMenu* opMenu,
- QWidget* parent,
+ const TQString& configFile,
+ TQPopupMenu* opMenu,
+ TQWidget* parent,
bool isImmutable = false);
- ExtensionContainer* createExtensionContainer(const QString& desktopFile,
+ ExtensionContainer* createExtensionContainer(const TQString& desktopFile,
bool isStartup,
- const QString& configFile,
- const QString& extensionId);
+ const TQString& configFile,
+ const TQString& extensionId);
- KPanelApplet* loadApplet(const AppletInfo& info, QWidget* parent);
- KPanelExtension* loadExtension(const AppletInfo& info, QWidget* parent);
+ KPanelApplet* loadApplet(const AppletInfo& info, TQWidget* parent);
+ KPanelExtension* loadExtension(const AppletInfo& info, TQWidget* parent);
bool hasInstance(const AppletInfo&) const;
@@ -69,13 +69,13 @@ public slots:
void clearUntrustedLists();
protected:
- static AppletInfo::List plugins(const QStringList& desktopFiles,
+ static AppletInfo::List plugins(const TQStringList& desktopFiles,
AppletInfo::AppletType,
bool sort,
AppletInfo::List* list);
private slots:
- void slotPluginDestroyed(QObject* plugin);
+ void slotPluginDestroyed(TQObject* plugin);
private:
friend class KStaticDeleter<PluginManager>;
@@ -84,23 +84,23 @@ private:
AppletInfo::Dict _dict;
static PluginManager* m_self;
- QStringList m_untrustedApplets;
- QStringList m_untrustedExtensions;
+ TQStringList m_untrustedApplets;
+ TQStringList m_untrustedExtensions;
};
class LibUnloader : public QObject
{
Q_OBJECT
public:
- static void unload( const QString &libName );
+ static void unload( const TQString &libName );
private slots:
void unload();
private:
- LibUnloader( const QString &libName, QObject *parent );
+ LibUnloader( const TQString &libName, TQObject *parent );
- QString _libName;
+ TQString _libName;
};
#endif
diff --git a/kicker/kicker/core/showdesktop.cpp b/kicker/kicker/core/showdesktop.cpp
index 5575b3b28..7f75ba1b9 100644
--- a/kicker/kicker/core/showdesktop.cpp
+++ b/kicker/kicker/core/showdesktop.cpp
@@ -40,7 +40,7 @@ ShowDesktop* ShowDesktop::the()
}
ShowDesktop::ShowDesktop()
- : QObject(),
+ : TQObject(),
m_showingDesktop(false)
{
// This feature is implemented in KWin. Keep old code in Kicker for the case
@@ -49,8 +49,8 @@ ShowDesktop::ShowDesktop()
m_wmSupport = i.isSupported( NET::WM2ShowingDesktop );
if( m_wmSupport )
{
- connect( Kicker::the()->kwinModule(), SIGNAL( showingDesktopChanged( bool )),
- SLOT( showingDesktopChanged( bool )));
+ connect( Kicker::the()->kwinModule(), TQT_SIGNAL( showingDesktopChanged( bool )),
+ TQT_SLOT( showingDesktopChanged( bool )));
showingDesktopChanged( m_showingDesktop = Kicker::the()->kwinModule()->showingDesktop());
}
}
@@ -133,8 +133,8 @@ void ShowDesktop::showDesktop( bool b )
m_activeWindow = Kicker::the()->kwinModule()->activeWindow();
m_iconifiedList.clear();
- const QValueList<WId> windows = Kicker::the()->kwinModule()->windows();
- for (QValueList<WId>::ConstIterator it = windows.begin();
+ const TQValueList<WId> windows = Kicker::the()->kwinModule()->windows();
+ for (TQValueList<WId>::ConstIterator it = windows.begin();
it != windows.end();
++it)
{
@@ -153,7 +153,7 @@ void ShowDesktop::showDesktop( bool b )
// find first, hide later, otherwise transients may get minimized
// with the window they're transient for
- for (QValueVector<WId>::Iterator it = m_iconifiedList.begin();
+ for (TQValueVector<WId>::Iterator it = m_iconifiedList.begin();
it != m_iconifiedList.end();
++it)
{
@@ -161,23 +161,23 @@ void ShowDesktop::showDesktop( bool b )
}
// on desktop changes or when a window is deiconified, we abort the show desktop mode
- connect(Kicker::the()->kwinModule(), SIGNAL(currentDesktopChanged(int)),
- SLOT(slotCurrentDesktopChanged(int)));
- connect(Kicker::the()->kwinModule(), SIGNAL(windowChanged(WId,unsigned int)),
- SLOT(slotWindowChanged(WId,unsigned int)));
- connect(Kicker::the()->kwinModule(), SIGNAL(windowAdded(WId)),
- SLOT(slotWindowAdded(WId)));
+ connect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
+ TQT_SLOT(slotCurrentDesktopChanged(int)));
+ connect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
+ TQT_SLOT(slotWindowChanged(WId,unsigned int)));
+ connect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowAdded(WId)),
+ TQT_SLOT(slotWindowAdded(WId)));
}
else
{
- disconnect(Kicker::the()->kwinModule(), SIGNAL(currentDesktopChanged(int)),
- this, SLOT(slotCurrentDesktopChanged(int)));
- disconnect(Kicker::the()->kwinModule(), SIGNAL(windowChanged(WId,unsigned int)),
- this, SLOT(slotWindowChanged(WId,unsigned int)));
- disconnect(Kicker::the()->kwinModule(), SIGNAL(windowAdded(WId)),
- this, SLOT(slotWindowAdded(WId)));
-
- for (QValueVector<WId>::ConstIterator it = m_iconifiedList.begin();
+ disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
+ this, TQT_SLOT(slotCurrentDesktopChanged(int)));
+ disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
+ this, TQT_SLOT(slotWindowChanged(WId,unsigned int)));
+ disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowAdded(WId)),
+ this, TQT_SLOT(slotWindowAdded(WId)));
+
+ for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin();
it != m_iconifiedList.end();
++it)
{
diff --git a/kicker/kicker/core/showdesktop.h b/kicker/kicker/core/showdesktop.h
index bebf62007..8d4d2546c 100644
--- a/kicker/kicker/core/showdesktop.h
+++ b/kicker/kicker/core/showdesktop.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class KWinModule;
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
/**
* Singleton class that handles desktop access (minimizing all windows)
@@ -56,7 +56,7 @@ private:
ShowDesktop();
bool m_showingDesktop;
- QValueVector<WId> m_iconifiedList;
+ TQValueVector<WId> m_iconifiedList;
WId m_activeWindow;
bool m_wmSupport;
};
diff --git a/kicker/kicker/core/unhidetrigger.cpp b/kicker/kicker/core/unhidetrigger.cpp
index bd0e0a0f8..7dcf1a127 100644
--- a/kicker/kicker/core/unhidetrigger.cpp
+++ b/kicker/kicker/core/unhidetrigger.cpp
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qtimer.h>
-#include <qcursor.h>
+#include <tqtimer.h>
+#include <tqcursor.h>
#include <kdebug.h>
#include "unhidetrigger.h"
@@ -39,8 +39,8 @@ UnhideTrigger::UnhideTrigger()
, _lastXineramaScreen( -1 )
, enabledCount( 0 )
{
- _timer = new QTimer( this );
- connect( _timer, SIGNAL(timeout()), SLOT(pollMouse()) );
+ _timer = new TQTimer( this );
+ connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(pollMouse()) );
}
void UnhideTrigger::setEnabled( bool enable )
@@ -65,10 +65,10 @@ bool UnhideTrigger::isEnabled() const
void UnhideTrigger::pollMouse()
{
- QPoint pos = QCursor::pos();
- for(int s = 0; s < QApplication::desktop()->numScreens(); s++)
+ TQPoint pos = TQCursor::pos();
+ for(int s = 0; s < TQApplication::desktop()->numScreens(); s++)
{
- QRect r = QApplication::desktop()->screenGeometry(s);
+ TQRect r = TQApplication::desktop()->screenGeometry(s);
if (pos.x() == r.left())
{
if (pos.y() == r.top())
diff --git a/kicker/kicker/core/unhidetrigger.h b/kicker/kicker/core/unhidetrigger.h
index 7e13a0e1d..af05a43f5 100644
--- a/kicker/kicker/core/unhidetrigger.h
+++ b/kicker/kicker/core/unhidetrigger.h
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif
-#include <qobject.h>
+#include <tqobject.h>
class UnhideTrigger : public QObject
{
@@ -55,7 +55,7 @@ private:
void emitTrigger( Trigger t , int XineramaScreen );
Trigger _lastTrigger;
int _lastXineramaScreen;
- QTimer *_timer;
+ TQTimer *_timer;
int enabledCount;
};
diff --git a/kicker/kicker/core/userrectsel.cpp b/kicker/kicker/core/userrectsel.cpp
index 5654b1eb3..d4b54f04a 100644
--- a/kicker/kicker/core/userrectsel.cpp
+++ b/kicker/kicker/core/userrectsel.cpp
@@ -21,14 +21,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qapplication.h>
-#include <qpainter.h>
+#include <tqapplication.h>
+#include <tqpainter.h>
#include "userrectsel.h"
#include "userrectsel.moc"
-UserRectSel::UserRectSel(const RectList& rects, const QPoint& _offset, const QColor& color)
- : QWidget(0, 0, WStyle_Customize | WX11BypassWM),
+UserRectSel::UserRectSel(const RectList& rects, const TQPoint& _offset, const TQColor& color)
+ : TQWidget(0, 0, WStyle_Customize | WX11BypassWM),
rectangles(rects),
offset(_offset)
{
@@ -44,7 +44,7 @@ UserRectSel::~UserRectSel()
delete _frame[i];
}
-void UserRectSel::mouseReleaseEvent(QMouseEvent * e)
+void UserRectSel::mouseReleaseEvent(TQMouseEvent * e)
{
if (e->button() == LeftButton)
{
@@ -52,11 +52,11 @@ void UserRectSel::mouseReleaseEvent(QMouseEvent * e)
}
}
-void UserRectSel::mouseMoveEvent(QMouseEvent * e)
+void UserRectSel::mouseMoveEvent(TQMouseEvent * e)
{
PanelStrut nearest = current;
int diff = -1;
- QPoint p = e->globalPos(); // + offset;
+ TQPoint p = e->globalPos(); // + offset;
for (RectList::const_iterator it = rectangles.constBegin();
it != rectangles.constEnd();
++it)
@@ -88,12 +88,12 @@ void UserRectSel::paintCurrent()
{
for (i = 0; i < 4; i++)
{
- _frame[i] = new QWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM);
+ _frame[i] = new TQWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM);
_frame[i]->setPaletteBackgroundColor(Qt::black);
}
for (i = 4; i < 8; i++)
{
- _frame[i] = new QWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM);
+ _frame[i] = new TQWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM);
_frame[i]->setPaletteBackgroundColor(_color);
}
}
@@ -132,7 +132,7 @@ void UserRectSel::paintCurrent()
}
-UserRectSel::PanelStrut UserRectSel::select(const RectList& rects, const QPoint& offset, const QColor& color)
+UserRectSel::PanelStrut UserRectSel::select(const RectList& rects, const TQPoint& offset, const TQColor& color)
{
UserRectSel sel(rects, offset, color);
sel.show();
diff --git a/kicker/kicker/core/userrectsel.h b/kicker/kicker/core/userrectsel.h
index 724f39818..63ba47fd5 100644
--- a/kicker/kicker/core/userrectsel.h
+++ b/kicker/kicker/core/userrectsel.h
@@ -24,9 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __userrectsel_h__
#define __userrectsel_h__
-#include <qwidget.h>
-#include <qvaluevector.h>
-#include <qcolor.h>
+#include <tqwidget.h>
+#include <tqvaluevector.h>
+#include <tqcolor.h>
#include <kpanelextension.h>
@@ -47,7 +47,7 @@ class UserRectSel : public QWidget
{
}
- PanelStrut(const QRect& rect, int XineramaScreen,
+ PanelStrut(const TQRect& rect, int XineramaScreen,
KPanelExtension::Position pos,
KPanelExtension::Alignment alignment)
: m_rect(rect),
@@ -69,29 +69,29 @@ class UserRectSel : public QWidget
return !(*this == rhs);
}
- QRect m_rect;
+ TQRect m_rect;
int m_screen;
KPanelExtension::Position m_pos;
KPanelExtension::Alignment m_alignment;
};
- typedef QValueVector<PanelStrut> RectList;
- static PanelStrut select(const RectList& rects, const QPoint& _offset, const QColor& color);
+ typedef TQValueVector<PanelStrut> RectList;
+ static PanelStrut select(const RectList& rects, const TQPoint& _offset, const TQColor& color);
protected:
- void mouseReleaseEvent(QMouseEvent *);
- void mouseMoveEvent(QMouseEvent *);
+ void mouseReleaseEvent(TQMouseEvent *);
+ void mouseMoveEvent(TQMouseEvent *);
private:
- UserRectSel(const RectList& rects, const QPoint& _offset, const QColor& color);
+ UserRectSel(const RectList& rects, const TQPoint& _offset, const TQColor& color);
~UserRectSel();
void paintCurrent();
const RectList rectangles;
PanelStrut current;
- QPoint offset;
- QWidget *_frame[8];
- QColor _color;
+ TQPoint offset;
+ TQWidget *_frame[8];
+ TQColor _color;
friend class ShutUpCompiler;
};
diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp
index bfcea5629..97a35aff6 100644
--- a/kicker/kicker/kicker-3.4-reverseLayout.cpp
+++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp
@@ -1,8 +1,8 @@
-#include <qfile.h>
-#include <qmap.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqmap.h>
+#include <tqregexp.h>
+#include <tqstring.h>
+#include <tqtextstream.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
@@ -14,10 +14,10 @@
struct AppletInfo
{
double freeSpace;
- QString configFile;
- QString desktopFile;
+ TQString configFile;
+ TQString desktopFile;
};
-typedef QMap<QString, AppletInfo> AppletInfoMap;
+typedef TQMap<TQString, AppletInfo> AppletInfoMap;
int main(int argc, char** argv)
{
@@ -25,20 +25,20 @@ int main(int argc, char** argv)
KCmdLineArgs::init(argc, argv, "kicker", "", "", "", false);
KApplication app(false, false);
- QStringList stretchableApplets;
+ TQStringList stretchableApplets;
stretchableApplets << "taskbarapplet.desktop";
- QTextStream in (stdin, IO_ReadOnly);
- QTextStream out(stdout, IO_WriteOnly);
+ TQTextStream in (stdin, IO_ReadOnly);
+ TQTextStream out(stdout, IO_WriteOnly);
- QStringList appletIds;
+ TQStringList appletIds;
AppletInfoMap applets;
- QRegExp rxGroup("^\\[(.+)\\]$");
- QRegExp rxKeyValue("([^=]+)=[ \t]*([^\n]+)");
- QString currentGroup;
+ TQRegExp rxGroup("^\\[(.+)\\]$");
+ TQRegExp rxKeyValue("([^=]+)=[ \t]*([^\n]+)");
+ TQString currentGroup;
- QString line;
+ TQString line;
while (!(line = in.readLine()).isNull())
{
if (rxGroup.search(line) != -1)
@@ -49,12 +49,12 @@ int main(int argc, char** argv)
if (rxKeyValue.search(line) != -1)
{
- QString key = rxKeyValue.cap(1);
- QString value = rxKeyValue.cap(2);
+ TQString key = rxKeyValue.cap(1);
+ TQString value = rxKeyValue.cap(2);
if (key == "Applets")
{
- appletIds = QStringList::split(",", value);
+ appletIds = TQStringList::split(",", value);
}
else if (key == "FreeSpace")
{
@@ -71,11 +71,11 @@ int main(int argc, char** argv)
}
}
- if (QApplication::reverseLayout())
+ if (TQApplication::reverseLayout())
{
// Reverse appletIds
- QStringList appletIdsRev;
- QStringList::ConstIterator it;
+ TQStringList appletIdsRev;
+ TQStringList::ConstIterator it;
for (it = appletIds.begin(); it != appletIds.end(); ++it)
{
appletIdsRev.prepend(*it);
@@ -108,7 +108,7 @@ int main(int argc, char** argv)
{
out << "[General]" << endl;
out << "Applets2=" << appletIds.join(",") << endl;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for (it = appletIds.begin(); it != appletIds.end(); ++it)
{
out << "[" << *it << "]" << endl;
@@ -117,9 +117,9 @@ int main(int argc, char** argv)
}
// Build a list of childpanel config files.
- QStringList childPanelConfigFiles;
+ TQStringList childPanelConfigFiles;
AppletInfoMap::ConstIterator it2;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for (it2 = applets.begin(); it2 != applets.end(); ++it2)
{
if (it2.data().desktopFile == "childpanelextension.desktop")
@@ -131,8 +131,8 @@ int main(int argc, char** argv)
if (!childPanelConfigFiles.isEmpty())
{
// Create a temporary kconf_update .upd file for updating the childpanels
- KTempFile tempFile(QString::null, ".upd");
- QTextStream* upd = tempFile.textStream();
+ KTempFile tempFile(TQString::null, ".upd");
+ TQTextStream* upd = tempFile.textStream();
for (it = childPanelConfigFiles.begin(); it != childPanelConfigFiles.end(); ++it)
{
*upd << "Id=kde_3.4_reverseLayout" << endl;
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index e7ac47c9c..796920ed4 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -22,17 +22,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qapplication.h>
-#include <qcombobox.h>
-#include <qdir.h>
-#include <qframe.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qpalette.h>
-#include <qscrollview.h>
-#include <qtimer.h>
-#include <qsizepolicy.h>
+#include <tqapplication.h>
+#include <tqcombobox.h>
+#include <tqdir.h>
+#include <tqframe.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqpalette.h>
+#include <tqscrollview.h>
+#include <tqtimer.h>
+#include <tqsizepolicy.h>
#include <kiconloader.h>
#include <kdebug.h>
@@ -55,13 +55,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "menuinfo.h"
#include "pluginmanager.h"
-AppletWidget::AppletWidget(const AppletInfo& info, bool odd, QWidget *parent)
+AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent)
: AppletItem(parent),
m_appletInfo(info),
m_odd(odd),
m_selected(false)
{
- setFocusPolicy(QWidget::StrongFocus);
+ setFocusPolicy(TQWidget::StrongFocus);
setSelected(m_selected);
itemTitle->setText("<h3>" + info.name() + "</h3>");
@@ -75,16 +75,16 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, QWidget *parent)
itemDescription->installEventFilter(this);
KIconLoader * ldr = KGlobal::iconLoader();
- QPixmap icon = ldr->loadIcon(info.icon(), KIcon::Panel, KIcon::SizeLarge);
+ TQPixmap icon = ldr->loadIcon(info.icon(), KIcon::Panel, KIcon::SizeLarge);
itemPixmap->setPixmap(icon);
itemPixmap->installEventFilter(this);
}
-bool AppletWidget::eventFilter(QObject*, QEvent* e)
+bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
{
- if (e->type() == QEvent::MouseButtonPress)
+ if (e->type() == TQEvent::MouseButtonPress)
{
- QMouseEvent* me = static_cast<QMouseEvent*>(e);
+ TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
if (me->button() & LeftButton)
{
m_dragStart = me->pos();
@@ -95,9 +95,9 @@ bool AppletWidget::eventFilter(QObject*, QEvent* e)
return false;
}
- if (e->type() == QEvent::MouseMove)
+ if (e->type() == TQEvent::MouseMove)
{
- QMouseEvent* me = static_cast<QMouseEvent*>(e);
+ TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
if ((me->pos() - m_dragStart).manhattanLength() >
KGlobalSettings::dndEventDelay())
{
@@ -113,15 +113,15 @@ bool AppletWidget::eventFilter(QObject*, QEvent* e)
return true;
}
}
- else if (e->type() == QEvent::MouseButtonRelease)
+ else if (e->type() == TQEvent::MouseButtonRelease)
{
- m_dragStart = QPoint();
+ m_dragStart = TQPoint();
}
return false;
}
-void AppletWidget::keyPressEvent(QKeyEvent *e)
+void AppletWidget::keyPressEvent(TQKeyEvent *e)
{
if (e->key() == Qt::Key_Enter ||
e->key() == Qt::Key_Return)
@@ -130,17 +130,17 @@ void AppletWidget::keyPressEvent(QKeyEvent *e)
}
else if (e->key() == Qt::Key_Up)
{
- QKeyEvent fakedKeyPress(QEvent::KeyPress, Qt::Key_BackTab, 0, 0);
- QKeyEvent fakedKeyRelease(QEvent::KeyRelease, Key_BackTab, 0, 0);
- QApplication::sendEvent(this, &fakedKeyPress);
- QApplication::sendEvent(this, &fakedKeyRelease);
+ TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_BackTab, 0, 0);
+ TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_BackTab, 0, 0);
+ TQApplication::sendEvent(this, &fakedKeyPress);
+ TQApplication::sendEvent(this, &fakedKeyRelease);
}
else if (e->key() == Qt::Key_Down)
{
- QKeyEvent fakedKeyPress(QEvent::KeyPress, Qt::Key_Tab, 0, 0);
- QKeyEvent fakedKeyRelease(QEvent::KeyRelease, Key_Escape, 0, 0);
- QApplication::sendEvent(this, &fakedKeyPress);
- QApplication::sendEvent(this, &fakedKeyRelease);
+ TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_Tab, 0, 0);
+ TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0);
+ TQApplication::sendEvent(this, &fakedKeyPress);
+ TQApplication::sendEvent(this, &fakedKeyRelease);
}
else
{
@@ -148,21 +148,21 @@ void AppletWidget::keyPressEvent(QKeyEvent *e)
}
}
-void AppletWidget::mousePressEvent(QMouseEvent *e)
+void AppletWidget::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == QMouseEvent::LeftButton)
+ if (e->button() == TQMouseEvent::LeftButton)
{
emit clicked(this);
m_dragStart = e->pos();
}
setFocus();
- QWidget::mousePressEvent(e);
+ TQWidget::mousePressEvent(e);
}
-void AppletWidget::mouseMoveEvent(QMouseEvent *e)
+void AppletWidget::mouseMoveEvent(TQMouseEvent *e)
{
- if (e->button() == QMouseEvent::LeftButton &&
+ if (e->button() == TQMouseEvent::LeftButton &&
!m_dragStart.isNull() &&
(e->pos() - m_dragStart).manhattanLength() >
KGlobalSettings::dndEventDelay())
@@ -178,15 +178,15 @@ void AppletWidget::mouseMoveEvent(QMouseEvent *e)
}
}
-void AppletWidget::mouseReleaseEvent(QMouseEvent *e)
+void AppletWidget::mouseReleaseEvent(TQMouseEvent *e)
{
- m_dragStart = QPoint();
- QWidget::mouseReleaseEvent(e);
+ m_dragStart = TQPoint();
+ TQWidget::mouseReleaseEvent(e);
}
-void AppletWidget::mouseDoubleClickEvent(QMouseEvent *e)
+void AppletWidget::mouseDoubleClickEvent(TQMouseEvent *e)
{
- if (!e->button() == QMouseEvent::LeftButton)
+ if (!e->button() == TQMouseEvent::LeftButton)
{
AppletItem::mouseDoubleClickEvent(e);
return;
@@ -223,24 +223,24 @@ void AppletWidget::setOdd(bool odd)
setSelected(m_selected);
}
-void AppletWidget::focusInEvent(QFocusEvent*)
+void AppletWidget::focusInEvent(TQFocusEvent*)
{
emit clicked(this);
}
AddAppletDialog::AddAppletDialog(ContainerArea* cArea,
- QWidget* parent,
+ TQWidget* parent,
const char* name)
: KDialogBase(parent, name, false, i18n("Add Applet"), 0),
m_selectedApplet(0),
m_containerArea(cArea),
m_insertionPoint(Kicker::the()->insertionPoint()),
m_closing(false),
- m_searchDelay(new QTimer(this))
+ m_searchDelay(new TQTimer(this))
{
m_mainWidget = new AppletView(this, "AddAppletDialog::m_mainWidget");
- m_mainWidget->appletScrollView->setResizePolicy(QScrollView::Manual);
- m_mainWidget->appletScrollView->setHScrollBarMode(QScrollView::AlwaysOff);
+ m_mainWidget->appletScrollView->setResizePolicy(TQScrollView::Manual);
+ m_mainWidget->appletScrollView->setHScrollBarMode(TQScrollView::AlwaysOff);
m_mainWidget->appletScrollView->viewport()->setPaletteBackgroundColor(KGlobalSettings::baseColor());
setMainWidget(m_mainWidget);
@@ -254,16 +254,16 @@ AddAppletDialog::AddAppletDialog(ContainerArea* cArea,
m_mainWidget->appletInstall->setGuiItem(addGuiItem);
m_mainWidget->closeButton->setGuiItem(KStdGuiItem::close());
- connect(m_mainWidget->appletSearch, SIGNAL(textChanged(const QString&)), this, SLOT(delayedSearch()));
- connect(m_searchDelay, SIGNAL(timeout()), this, SLOT(search()));
- connect(m_mainWidget->appletFilter, SIGNAL(activated(int)), this, SLOT(filter(int)));
- connect(m_mainWidget->appletInstall, SIGNAL(clicked()), this, SLOT(addCurrentApplet()));
- connect(m_mainWidget->closeButton, SIGNAL(clicked()), this, SLOT(close()));
+ connect(m_mainWidget->appletSearch, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(delayedSearch()));
+ connect(m_searchDelay, TQT_SIGNAL(timeout()), this, TQT_SLOT(search()));
+ connect(m_mainWidget->appletFilter, TQT_SIGNAL(activated(int)), this, TQT_SLOT(filter(int)));
+ connect(m_mainWidget->appletInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(addCurrentApplet()));
+ connect(m_mainWidget->closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()));
m_selectedType = AppletInfo::Undefined;
m_appletBox = 0;
- QTimer::singleShot(0, this, SLOT(populateApplets()));
+ TQTimer::singleShot(0, this, TQT_SLOT(populateApplets()));
}
void AddAppletDialog::updateInsertionPoint()
@@ -272,7 +272,7 @@ void AddAppletDialog::updateInsertionPoint()
}
-void AddAppletDialog::closeEvent(QCloseEvent* e)
+void AddAppletDialog::closeEvent(TQCloseEvent* e)
{
m_closing = true;
saveDialogSize("AddAppletDialog Settings");
@@ -282,7 +282,7 @@ void AddAppletDialog::closeEvent(QCloseEvent* e)
void AddAppletDialog::resizeAppletView()
{
int w, h;
- QScrollView *v = m_mainWidget->appletScrollView;
+ TQScrollView *v = m_mainWidget->appletScrollView;
if (m_closing)
return;
@@ -300,21 +300,21 @@ void AddAppletDialog::resizeAppletView()
}
}
-bool AddAppletDialog::eventFilter(QObject *o, QEvent *e)
+bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e)
{
- if (e->type() == QEvent::Resize)
- QTimer::singleShot(0, this, SLOT(resizeAppletView()));
+ if (e->type() == TQEvent::Resize)
+ TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView()));
- return QObject::eventFilter(o, e);
+ return TQObject::eventFilter(o, e);
}
void AddAppletDialog::populateApplets()
{
- m_appletBox = new QWidget(m_mainWidget->appletScrollView->viewport());
+ m_appletBox = new TQWidget(m_mainWidget->appletScrollView->viewport());
m_appletBox->setPaletteBackgroundColor(KGlobalSettings::baseColor());
m_mainWidget->appletScrollView->addChild(m_appletBox, 0, 0);
m_appletBox->show();
- QVBoxLayout* layout = new QVBoxLayout(m_appletBox);
+ TQVBoxLayout* layout = new TQVBoxLayout(m_appletBox);
layout->setMargin(0);
m_mainWidget->appletScrollView->installEventFilter(this);
@@ -339,7 +339,7 @@ void AddAppletDialog::populateApplets()
int i = 0;
bool odd = true;
- QWidget* prevTabWidget = m_mainWidget->appletFilter;
+ TQWidget* prevTabWidget = m_mainWidget->appletFilter;
for (AppletInfo::List::iterator it = appletInfoList.begin();
!m_closing && it != appletInfoList.end();
@@ -372,10 +372,10 @@ void AddAppletDialog::populateApplets()
setTabOrder(prevTabWidget, itemWidget);
prevTabWidget = itemWidget;
- connect(itemWidget, SIGNAL(clicked(AppletWidget*)),
- this, SLOT(selectApplet(AppletWidget*)));
- connect(itemWidget, SIGNAL(doubleClicked(AppletWidget*)),
- this, SLOT(addApplet(AppletWidget*)));
+ connect(itemWidget, TQT_SIGNAL(clicked(AppletWidget*)),
+ this, TQT_SLOT(selectApplet(AppletWidget*)));
+ connect(itemWidget, TQT_SIGNAL(doubleClicked(AppletWidget*)),
+ this, TQT_SLOT(addApplet(AppletWidget*)));
if (m_closing)
{
@@ -419,10 +419,10 @@ void AddAppletDialog::addApplet(AppletWidget* applet)
return;
}
- QPoint prevInsertionPoint = Kicker::the()->insertionPoint();
+ TQPoint prevInsertionPoint = Kicker::the()->insertionPoint();
Kicker::the()->setInsertionPoint(m_insertionPoint);
- const QWidget* appletContainer = 0;
+ const TQWidget* appletContainer = 0;
if (applet->info().type() == AppletInfo::Applet)
{
@@ -473,7 +473,7 @@ void AddAppletDialog::addApplet(AppletWidget* applet)
}
bool AddAppletDialog::appletMatchesSearch(const AppletWidget* w,
- const QString& s)
+ const TQString& s)
{
if (w->info().type() == AppletInfo::Applet &&
w->info().isUniqueApplet() &&
@@ -498,7 +498,7 @@ void AddAppletDialog::delayedSearch()
void AddAppletDialog::search()
{
- QString s = m_mainWidget->appletSearch->text();
+ TQString s = m_mainWidget->appletSearch->text();
bool odd = true;
AppletWidget::List::const_iterator it = m_appletWidgetList.constBegin();
AppletWidget::List::const_iterator itEnd = m_appletWidgetList.constEnd();
@@ -518,7 +518,7 @@ void AddAppletDialog::search()
}
}
- QTimer::singleShot(0, this, SLOT(resizeAppletView()));
+ TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView()));
}
void AddAppletDialog::filter(int i)
diff --git a/kicker/kicker/ui/addapplet.h b/kicker/kicker/ui/addapplet.h
index d2ce50a00..d359d97c3 100644
--- a/kicker/kicker/ui/addapplet.h
+++ b/kicker/kicker/ui/addapplet.h
@@ -25,9 +25,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __addapplet_h__
#define __addapplet_h__
-#include <qstringlist.h>
-#include <qpixmap.h>
-#include <qvaluelist.h>
+#include <tqstringlist.h>
+#include <tqpixmap.h>
+#include <tqvaluelist.h>
#include <klocale.h>
#include <kdialogbase.h>
@@ -44,12 +44,12 @@ class AddAppletDialog : public KDialogBase
Q_OBJECT
public:
- AddAppletDialog(ContainerArea* cArea, QWidget* parent, const char* name);
+ AddAppletDialog(ContainerArea* cArea, TQWidget* parent, const char* name);
void updateInsertionPoint();
protected:
- void closeEvent(QCloseEvent*);
- bool eventFilter(QObject *o, QEvent *e);
+ void closeEvent(TQCloseEvent*);
+ bool eventFilter(TQObject *o, TQEvent *e);
private slots:
void populateApplets();
@@ -62,21 +62,21 @@ class AddAppletDialog : public KDialogBase
void resizeAppletView();
private:
- bool appletMatchesSearch(const AppletWidget* w, const QString& s);
+ bool appletMatchesSearch(const AppletWidget* w, const TQString& s);
AppletView *m_mainWidget;
- QWidget *m_appletBox;
+ TQWidget *m_appletBox;
AppletInfo::List m_applets;
- QValueList<AppletWidget*> m_appletWidgetList;
+ TQValueList<AppletWidget*> m_appletWidgetList;
AppletWidget* m_selectedApplet;
ContainerArea* m_containerArea;
AppletInfo::AppletType m_selectedType;
- QPoint m_insertionPoint;
+ TQPoint m_insertionPoint;
bool m_closing;
- QTimer *m_searchDelay;
+ TQTimer *m_searchDelay;
};
#endif
diff --git a/kicker/kicker/ui/addapplet_mnu.cpp b/kicker/kicker/ui/addapplet_mnu.cpp
index 3c3a3db87..6d5c4482f 100644
--- a/kicker/kicker/ui/addapplet_mnu.cpp
+++ b/kicker/kicker/ui/addapplet_mnu.cpp
@@ -29,12 +29,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "addapplet_mnu.h"
#include "addapplet_mnu.moc"
-PanelAddAppletMenu::PanelAddAppletMenu(ContainerArea* cArea, QWidget *parent, const char *name)
- : QPopupMenu(parent, name), containerArea(cArea)
+PanelAddAppletMenu::PanelAddAppletMenu(ContainerArea* cArea, TQWidget *parent, const char *name)
+ : TQPopupMenu(parent, name), containerArea(cArea)
{
setCheckable(true);
- connect(this, SIGNAL(activated(int)), SLOT(slotExec(int)));
- connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow()));
+ connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
+ connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
}
void PanelAddAppletMenu::slotAboutToShow()
diff --git a/kicker/kicker/ui/addapplet_mnu.h b/kicker/kicker/ui/addapplet_mnu.h
index 260de26dd..caedb4fdb 100644
--- a/kicker/kicker/ui/addapplet_mnu.h
+++ b/kicker/kicker/ui/addapplet_mnu.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __addapplet_mnu_h__
#define __addapplet_mnu_h__
-#include <qvaluelist.h>
-#include <qpopupmenu.h>
+#include <tqvaluelist.h>
+#include <tqpopupmenu.h>
#include "appletinfo.h"
@@ -36,7 +36,7 @@ class PanelAddAppletMenu : public QPopupMenu
Q_OBJECT
public:
- PanelAddAppletMenu(ContainerArea *cArea, QWidget *parent=0, const char *name=0);
+ PanelAddAppletMenu(ContainerArea *cArea, TQWidget *parent=0, const char *name=0);
protected slots:
virtual void slotExec(int id);
diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp
index ce6e618a7..38b48fe8e 100644
--- a/kicker/kicker/ui/addappletvisualfeedback.cpp
+++ b/kicker/kicker/ui/addappletvisualfeedback.cpp
@@ -23,11 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qapplication.h>
-#include <qlabel.h>
-#include <qpainter.h>
-#include <qsimplerichtext.h>
-#include <qtimer.h>
+#include <tqapplication.h>
+#include <tqlabel.h>
+#include <tqpainter.h>
+#include <tqsimplerichtext.h>
+#include <tqtimer.h>
#include <kdialog.h>
#include <klocale.h>
@@ -42,9 +42,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define DEFAULT_FRAMES_PER_SECOND 30
AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget,
- const QWidget* target,
+ const TQWidget* target,
KPanelApplet::Direction direction)
- : QWidget(0, "animtt", WX11BypassWM),
+ : TQWidget(0, "animtt", WX11BypassWM),
m_target(target),
m_direction(direction),
m_icon(*widget->itemPixmap->pixmap()),
@@ -55,22 +55,22 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget,
{
setFocusPolicy(NoFocus);
setBackgroundMode(NoBackground);
- connect(&m_moveTimer, SIGNAL(timeout()), SLOT(swoopCloser()));
+ connect(&m_moveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(swoopCloser()));
- QString m = "<qt><h3>" + i18n("%1 Added").arg(widget->info().name());
+ TQString m = "<qt><h3>" + i18n("%1 Added").arg(widget->info().name());
if (widget->info().name() != widget->info().comment())
{
m += "</h3><p>" + widget->info().comment() + "</p></qt>";
}
- m_richText = new QSimpleRichText(m, font());
+ m_richText = new TQSimpleRichText(m, font());
m_richText->setWidth(400);
displayInternal();
m_destination = KickerLib::popupPosition(m_direction, this, m_target);
- QPoint startAt = widget->itemPixmap->geometry().topLeft();
+ TQPoint startAt = widget->itemPixmap->geometry().topLeft();
startAt = widget->itemPixmap->mapToGlobal(startAt);
move(startAt);
@@ -85,7 +85,7 @@ AddAppletVisualFeedback::~AddAppletVisualFeedback()
delete m_richText;
}
-void AddAppletVisualFeedback::paintEvent(QPaintEvent * e)
+void AddAppletVisualFeedback::paintEvent(TQPaintEvent * e)
{
if (m_dirty)
{
@@ -93,11 +93,11 @@ void AddAppletVisualFeedback::paintEvent(QPaintEvent * e)
m_dirty = false;
}
- QPainter p(this);
+ TQPainter p(this);
p.drawPixmap(e->rect().topLeft(), m_pixmap, e->rect());
}
-void AddAppletVisualFeedback::mousePressEvent(QMouseEvent *)
+void AddAppletVisualFeedback::mousePressEvent(TQMouseEvent *)
{
m_moveTimer.stop();
hide();
@@ -106,7 +106,7 @@ void AddAppletVisualFeedback::mousePressEvent(QMouseEvent *)
void AddAppletVisualFeedback::makeMask()
{
- QPainter maskPainter(&m_mask);
+ TQPainter maskPainter(&m_mask);
m_mask.fill(Qt::black);
@@ -120,7 +120,7 @@ void AddAppletVisualFeedback::makeMask()
void AddAppletVisualFeedback::displayInternal()
{
// determine text rectangle
- QRect textRect(0, 0, 0, 0);
+ TQRect textRect(0, 0, 0, 0);
if (m_frames < 1)
{
@@ -154,7 +154,7 @@ void AddAppletVisualFeedback::displayInternal()
makeMask();
// draw background
- QPainter bufferPainter(&m_pixmap);
+ TQPainter bufferPainter(&m_pixmap);
bufferPainter.setPen(Qt::black);
bufferPainter.setBrush(colorGroup().background());
bufferPainter.drawRoundRect(0, 0, width, height,
@@ -174,11 +174,11 @@ void AddAppletVisualFeedback::displayInternal()
int textY = (height - textRect.height()) / 2;
// draw text shadow
- QColorGroup cg = colorGroup();
- cg.setColor(QColorGroup::Text, cg.background().dark(115));
- int shadowOffset = QApplication::reverseLayout() ? -1 : 1;
+ TQColorGroup cg = colorGroup();
+ cg.setColor(TQColorGroup::Text, cg.background().dark(115));
+ int shadowOffset = TQApplication::reverseLayout() ? -1 : 1;
m_richText->draw(&bufferPainter, 5 + textX + shadowOffset,
- textY + 1, QRect(), cg);
+ textY + 1, TQRect(), cg);
// draw text
cg = colorGroup();
@@ -193,7 +193,7 @@ void AddAppletVisualFeedback::swoopCloser()
return;
}
- QPoint loc = geometry().topLeft();
+ TQPoint loc = geometry().topLeft();
bool isLeft = m_destination.x() > loc.x();
if (loc.x() != m_destination.x())
{
@@ -217,7 +217,7 @@ void AddAppletVisualFeedback::swoopCloser()
{
m_moveTimer.stop();
displayInternal();
- QTimer::singleShot(2000, this, SLOT(deleteLater()));
+ TQTimer::singleShot(2000, this, TQT_SLOT(deleteLater()));
}
}
diff --git a/kicker/kicker/ui/addappletvisualfeedback.h b/kicker/kicker/ui/addappletvisualfeedback.h
index 084154704..98d2cb0fe 100644
--- a/kicker/kicker/ui/addappletvisualfeedback.h
+++ b/kicker/kicker/ui/addappletvisualfeedback.h
@@ -26,10 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef ADDAPPLETVISUALFEEDBACK_H
#define ADDAPPLETVISUALFEEDBACK_H
-#include <qbitmap.h>
-#include <qpixmap.h>
-#include <qtimer.h>
-#include <qwidget.h>
+#include <tqbitmap.h>
+#include <tqpixmap.h>
+#include <tqtimer.h>
+#include <tqwidget.h>
#include <kpanelapplet.h>
@@ -44,7 +44,7 @@ class AddAppletVisualFeedback : QWidget
public:
AddAppletVisualFeedback(AppletWidget* parent,
- const QWidget* destination,
+ const TQWidget* destination,
KPanelApplet::Direction direction);
~AddAppletVisualFeedback();
@@ -53,28 +53,28 @@ class AddAppletVisualFeedback : QWidget
void swoopCloser();
protected:
- void paintEvent(QPaintEvent * e);
- void mousePressEvent(QMouseEvent * e);
+ void paintEvent(TQPaintEvent * e);
+ void mousePressEvent(TQMouseEvent * e);
void makeMask();
void displayInternal();
private:
- const QWidget* m_target;
+ const TQWidget* m_target;
KPanelApplet::Direction m_direction;
- QBitmap m_mask;
- QPixmap m_pixmap;
- QPixmap m_icon;
- QSimpleRichText* m_richText;
+ TQBitmap m_mask;
+ TQPixmap m_pixmap;
+ TQPixmap m_icon;
+ TQSimpleRichText* m_richText;
int m_dissolveSize;
int m_dissolveDelta;
int m_frames;
- QTimer m_moveTimer;
+ TQTimer m_moveTimer;
bool m_dirty;
- QPoint m_destination;
+ TQPoint m_destination;
};
#endif
diff --git a/kicker/kicker/ui/addbutton_mnu.cpp b/kicker/kicker/ui/addbutton_mnu.cpp
index 65a60eea4..02c4718d4 100644
--- a/kicker/kicker/ui/addbutton_mnu.cpp
+++ b/kicker/kicker/ui/addbutton_mnu.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qdragobject.h>
+#include <tqdragobject.h>
#include <ksycocaentry.h>
#include <kservice.h>
@@ -33,14 +33,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "addbutton_mnu.moc"
#include "containerarea.h"
-PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, const QString & label,
- const QString & relPath, QWidget * parent, const char * name, const QString& _inlineHeader)
+PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, const TQString & label,
+ const TQString & relPath, TQWidget * parent, const char * name, const TQString& _inlineHeader)
: PanelServiceMenu(label, relPath, parent, name, true, _inlineHeader), containerArea(cArea)
{
}
-PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, QWidget * parent, const char * name, const QString& _inlineHeader)
- : PanelServiceMenu(QString::null, QString::null, parent, name, true, _inlineHeader), containerArea(cArea)
+PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, TQWidget * parent, const char * name, const TQString& _inlineHeader)
+ : PanelServiceMenu(TQString::null, TQString::null, parent, name, true, _inlineHeader), containerArea(cArea)
{
}
@@ -60,8 +60,8 @@ void PanelAddButtonMenu::slotExec(int id)
}
}
-PanelServiceMenu * PanelAddButtonMenu::newSubMenu(const QString & label, const QString & relPath,
- QWidget * parent, const char * name, const QString& _inlineHeader)
+PanelServiceMenu * PanelAddButtonMenu::newSubMenu(const TQString & label, const TQString & relPath,
+ TQWidget * parent, const char * name, const TQString& _inlineHeader)
{
return new PanelAddButtonMenu(containerArea, label, relPath, parent, name, _inlineHeader);
}
diff --git a/kicker/kicker/ui/addbutton_mnu.h b/kicker/kicker/ui/addbutton_mnu.h
index 8a9a7e348..209e7e9a3 100644
--- a/kicker/kicker/ui/addbutton_mnu.h
+++ b/kicker/kicker/ui/addbutton_mnu.h
@@ -33,17 +33,17 @@ class PanelAddButtonMenu : public PanelServiceMenu
Q_OBJECT
public:
- PanelAddButtonMenu(ContainerArea* cArea, const QString & label, const QString & relPath,
- QWidget * parent = 0, const char * name = 0,const QString& _inlineHeader= QString::null);
- PanelAddButtonMenu(ContainerArea* cArea, QWidget * parent = 0, const char * name = 0, const QString& _inlineHeader= QString::null);
+ PanelAddButtonMenu(ContainerArea* cArea, const TQString & label, const TQString & relPath,
+ TQWidget * parent = 0, const char * name = 0,const TQString& _inlineHeader= TQString::null);
+ PanelAddButtonMenu(ContainerArea* cArea, TQWidget * parent = 0, const char * name = 0, const TQString& _inlineHeader= TQString::null);
protected slots:
virtual void slotExec(int id);
virtual void addNonKDEApp();
protected:
- virtual PanelServiceMenu * newSubMenu(const QString & label, const QString & relPath,
- QWidget * parent, const char * name, const QString & _inlineHeader=QString::null);
+ virtual PanelServiceMenu * newSubMenu(const TQString & label, const TQString & relPath,
+ TQWidget * parent, const char * name, const TQString & _inlineHeader=TQString::null);
private:
ContainerArea *containerArea;
};
diff --git a/kicker/kicker/ui/addextension_mnu.cpp b/kicker/kicker/ui/addextension_mnu.cpp
index 4ca467f46..b22187443 100644
--- a/kicker/kicker/ui/addextension_mnu.cpp
+++ b/kicker/kicker/ui/addextension_mnu.cpp
@@ -27,12 +27,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "addextension_mnu.h"
#include "addextension_mnu.moc"
-PanelAddExtensionMenu::PanelAddExtensionMenu(QWidget *parent, const char *name)
- : QPopupMenu(parent, name)
+PanelAddExtensionMenu::PanelAddExtensionMenu(TQWidget *parent, const char *name)
+ : TQPopupMenu(parent, name)
{
setCheckable(true);
- connect(this, SIGNAL(activated(int)), SLOT(slotExec(int)));
- connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow()));
+ connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
+ connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
}
void PanelAddExtensionMenu::slotAboutToShow()
diff --git a/kicker/kicker/ui/addextension_mnu.h b/kicker/kicker/ui/addextension_mnu.h
index 60db0c201..a91986e19 100644
--- a/kicker/kicker/ui/addextension_mnu.h
+++ b/kicker/kicker/ui/addextension_mnu.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __addextension_mnu_h__
#define __addextension_mnu_h__
-#include <qvaluelist.h>
-#include <qpopupmenu.h>
+#include <tqvaluelist.h>
+#include <tqpopupmenu.h>
#include "appletinfo.h"
@@ -34,7 +34,7 @@ class PanelAddExtensionMenu : public QPopupMenu
Q_OBJECT
public:
- PanelAddExtensionMenu(QWidget *parent=0, const char *name=0);
+ PanelAddExtensionMenu(TQWidget *parent=0, const char *name=0);
protected slots:
virtual void slotExec(int id);
diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp
index 435911bbe..59ca9c89e 100644
--- a/kicker/kicker/ui/appletop_mnu.cpp
+++ b/kicker/kicker/ui/appletop_mnu.cpp
@@ -31,15 +31,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "container_button.h"
#include "containerarea.h"
-PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPopupMenu* appletsMenu,
- const QString & title, const QString &icon,
- QWidget *parent, const char *name)
- : QPopupMenu(parent, name)
+PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQPopupMenu* appletsMenu,
+ const TQString & title, const TQString &icon,
+ TQWidget *parent, const char *name)
+ : TQPopupMenu(parent, name)
{
bool needSeparator = false;
bool isButton = (parent && parent->inherits("ButtonContainer"));
bool isMenu = false;
- QString titleText = title;
+ TQString titleText = title;
titleText = titleText.replace('&', "&&");
if (isButton)
{
@@ -48,7 +48,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPop
if (!Kicker::the()->isImmutable())
{
- QString text = isButton ? (isMenu ? i18n("&Move %1 Menu") :
+ TQString text = isButton ? (isMenu ? i18n("&Move %1 Menu") :
i18n("&Move %1 Button")) :
i18n("&Move %1");
insertItem(SmallIcon("move"), text.arg(titleText), Move);
@@ -57,7 +57,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPop
// this is part of the kiosk support in kicker, allowing
// one to block users from adding new containers
ContainerArea* area = 0;
- QObject* findTheArea = parent ? parent->parent() : 0;
+ TQObject* findTheArea = parent ? parent->parent() : 0;
while (findTheArea)
{
area = dynamic_cast<ContainerArea*>(findTheArea);
@@ -98,7 +98,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPop
insertSeparator();
}
- QPixmap iconPix(kapp->iconLoader()->loadIcon(icon,
+ TQPixmap iconPix(kapp->iconLoader()->loadIcon(icon,
KIcon::Small, 0,
KIcon::DefaultState,
0, true));
@@ -140,22 +140,22 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPop
needSeparator = false;
}
- QString text = title.isEmpty() ? i18n("Applet Menu") :
+ TQString text = title.isEmpty() ? i18n("Applet Menu") :
i18n("%1 Menu").arg(titleText);
// the 2 const_cast's below prevents const_cast'ing in multiple places
// elsewhere in the kicker code base. it's ugly, but unavoidable
- // unless either QPopupMenu one day allows inserting const
+ // unless either TQPopupMenu one day allows inserting const
// QPopupMenu's or we uglify other bits of kicker's API,
// notably KPanelApplet::customMeu()
if (icon.isEmpty())
{
- insertItem(text, const_cast<QPopupMenu*>(appletsMenu));
+ insertItem(text, const_cast<TQPopupMenu*>(appletsMenu));
}
else
{
insertItem(SmallIcon(icon), text,
- const_cast<QPopupMenu*>(appletsMenu));
+ const_cast<TQPopupMenu*>(appletsMenu));
}
}
@@ -195,14 +195,14 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPop
adjustSize();
}
-void PanelAppletOpMenu::keyPressEvent(QKeyEvent* e)
+void PanelAppletOpMenu::keyPressEvent(TQKeyEvent* e)
{
if (e->key() == Qt::Key_Escape)
{
emit escapePressed();
}
- QPopupMenu::keyPressEvent(e);
+ TQPopupMenu::keyPressEvent(e);
}
#include "appletop_mnu.moc"
diff --git a/kicker/kicker/ui/appletop_mnu.h b/kicker/kicker/ui/appletop_mnu.h
index 25f03ada6..e0b219552 100644
--- a/kicker/kicker/ui/appletop_mnu.h
+++ b/kicker/kicker/ui/appletop_mnu.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef PANEL_APPLET_OP_MENU_H
#define PANEL_APPLET_OP_MENU_H
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
class AppletInfo;
@@ -40,15 +40,15 @@ public:
// they also are treated just like KPanelApplet::Preferences on selection
// KDE4: look at merging them there? perhaps under a generic "Editor" option?
enum { KMenuEditor = 1048576, BookmarkEditor = 2097152 };
- PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPopupMenu* appletsMenu = 0,
- const QString &title = 0, const QString &icon = 0,
- QWidget *parent=0, const char *name=0);
+ PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQPopupMenu* appletsMenu = 0,
+ const TQString &title = 0, const TQString &icon = 0,
+ TQWidget *parent=0, const char *name=0);
signals:
void escapePressed();
protected:
- void keyPressEvent(QKeyEvent* e);
+ void keyPressEvent(TQKeyEvent* e);
};
diff --git a/kicker/kicker/ui/appletwidget.h b/kicker/kicker/ui/appletwidget.h
index 77d05c2b3..6323f538e 100644
--- a/kicker/kicker/ui/appletwidget.h
+++ b/kicker/kicker/ui/appletwidget.h
@@ -25,8 +25,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef _appletwidget_h_
#define _appletwidget_h_
-#include <qpoint.h>
-#include <qvaluelist.h>
+#include <tqpoint.h>
+#include <tqvaluelist.h>
#include <klocale.h>
#include <kdialogbase.h>
@@ -39,11 +39,11 @@ class AppletWidget: public AppletItem
Q_OBJECT
public:
- typedef QValueList<AppletWidget*> List;
+ typedef TQValueList<AppletWidget*> List;
- AppletWidget(const AppletInfo& info, bool odd, QWidget *parent);
+ AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent);
const AppletInfo& info() const { return m_appletInfo; }
- virtual bool eventFilter(QObject* watched, QEvent* e);
+ virtual bool eventFilter(TQObject* watched, TQEvent* e);
void setSelected(bool selected);
void setOdd(bool odd);
@@ -54,18 +54,18 @@ class AppletWidget: public AppletItem
void doubleClicked(AppletWidget*);
protected:
- void keyPressEvent(QKeyEvent *e);
- void mousePressEvent(QMouseEvent *e);
- void mouseMoveEvent(QMouseEvent *e);
- void mouseReleaseEvent(QMouseEvent *e);
- void mouseDoubleClickEvent(QMouseEvent *e);
- void focusInEvent(QFocusEvent* e);
+ void keyPressEvent(TQKeyEvent *e);
+ void mousePressEvent(TQMouseEvent *e);
+ void mouseMoveEvent(TQMouseEvent *e);
+ void mouseReleaseEvent(TQMouseEvent *e);
+ void mouseDoubleClickEvent(TQMouseEvent *e);
+ void focusInEvent(TQFocusEvent* e);
private:
AppletInfo m_appletInfo;
bool m_odd;
bool m_selected;
- QPoint m_dragStart;
+ TQPoint m_dragStart;
};
#endif
diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp
index 1fd5d47f6..01e72d9ee 100644
--- a/kicker/kicker/ui/browser_dlg.cpp
+++ b/kicker/kicker/ui/browser_dlg.cpp
@@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qvbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqvbox.h>
#include <kglobal.h>
#include <klocale.h>
@@ -35,32 +35,32 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "browser_dlg.h"
#include "browser_dlg.moc"
-PanelBrowserDialog::PanelBrowserDialog( const QString& path, const QString &icon, QWidget *parent, const char *name )
+PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &icon, TQWidget *parent, const char *name )
: KDialogBase( parent, name, true, i18n( "Quick Browser Configuration" ), Ok|Cancel, Ok, true )
{
setMinimumWidth( 300 );
- QVBox *page = makeVBoxMainWidget();
+ TQVBox *page = makeVBoxMainWidget();
- QHBox *hbox2 = new QHBox( page );
+ TQHBox *hbox2 = new TQHBox( page );
hbox2->setSpacing( KDialog::spacingHint() );
- QLabel *label1 = new QLabel( i18n( "Button icon:" ), hbox2 );
+ TQLabel *label1 = new TQLabel( i18n( "Button icon:" ), hbox2 );
iconBtn = new KIconButton( hbox2 );
iconBtn->setFixedSize( 50, 50 );
iconBtn->setIconType( KIcon::Panel, KIcon::FileSystem );
label1->setBuddy( iconBtn );
- QHBox *hbox1 = new QHBox( page );
+ TQHBox *hbox1 = new TQHBox( page );
hbox1->setSpacing( KDialog::spacingHint() );
- QLabel *label2 = new QLabel( i18n ( "Path:" ), hbox1 );
+ TQLabel *label2 = new TQLabel( i18n ( "Path:" ), hbox1 );
pathInput = new KLineEdit( hbox1 );
- connect( pathInput, SIGNAL( textChanged ( const QString & )), this, SLOT( slotPathChanged( const QString & )));
+ connect( pathInput, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotPathChanged( const TQString & )));
pathInput->setText( path );
pathInput->setFocus();
label2->setBuddy( pathInput );
- browseBtn = new QPushButton( i18n( "&Browse..." ), hbox1 );
+ browseBtn = new TQPushButton( i18n( "&Browse..." ), hbox1 );
if ( icon.isEmpty() ) {
KURL u;
u.setPath( path );
@@ -69,7 +69,7 @@ PanelBrowserDialog::PanelBrowserDialog( const QString& path, const QString &icon
else
iconBtn->setIcon( icon );
- connect( browseBtn, SIGNAL( clicked() ), this, SLOT( browse() ) );
+ connect( browseBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( browse() ) );
}
PanelBrowserDialog::~PanelBrowserDialog()
@@ -77,14 +77,14 @@ PanelBrowserDialog::~PanelBrowserDialog()
}
-void PanelBrowserDialog::slotPathChanged( const QString &_text )
+void PanelBrowserDialog::slotPathChanged( const TQString &_text )
{
enableButtonOK( !_text.isEmpty() );
}
void PanelBrowserDialog::browse()
{
- QString dir = KFileDialog::getExistingDirectory( pathInput->text(), 0, i18n( "Select Folder" ) );
+ TQString dir = KFileDialog::getExistingDirectory( pathInput->text(), 0, i18n( "Select Folder" ) );
if ( !dir.isEmpty() ) {
pathInput->setText( dir );
KURL u;
@@ -95,7 +95,7 @@ void PanelBrowserDialog::browse()
void PanelBrowserDialog::slotOk()
{
- QDir dir(path());
+ TQDir dir(path());
if( !dir.exists() ) {
KMessageBox::sorry( this, i18n("'%1' is not a valid folder.").arg(path()) );
return;
@@ -103,12 +103,12 @@ void PanelBrowserDialog::slotOk()
KDialogBase::slotOk();
}
-const QString PanelBrowserDialog::icon()
+const TQString PanelBrowserDialog::icon()
{
return iconBtn->icon();
}
-QString PanelBrowserDialog::path()
+TQString PanelBrowserDialog::path()
{
return pathInput->text();
}
diff --git a/kicker/kicker/ui/browser_dlg.h b/kicker/kicker/ui/browser_dlg.h
index dc675c11c..113a7b83a 100644
--- a/kicker/kicker/ui/browser_dlg.h
+++ b/kicker/kicker/ui/browser_dlg.h
@@ -34,20 +34,20 @@ class PanelBrowserDialog : public KDialogBase
Q_OBJECT
public:
- PanelBrowserDialog( const QString &path = QString::null, const QString &icon = QString::null, QWidget *parent = 0, const char *name = 0 );
+ PanelBrowserDialog( const TQString &path = TQString::null, const TQString &icon = TQString::null, TQWidget *parent = 0, const char *name = 0 );
~PanelBrowserDialog();
- const QString icon();
- QString path();
+ const TQString icon();
+ TQString path();
protected slots:
void browse();
virtual void slotOk();
- void slotPathChanged( const QString &_text );
+ void slotPathChanged( const TQString &_text );
protected:
KIconButton *iconBtn;
KLineEdit *pathInput;
- QPushButton *browseBtn;
+ TQPushButton *browseBtn;
};
#endif
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index 9561881eb..6802e6388 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qdir.h>
-#include <qpixmap.h>
+#include <tqdir.h>
+#include <tqpixmap.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -49,26 +49,26 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define CICON(a) (*_icons)[a]
-QMap<QString, QPixmap> *PanelBrowserMenu::_icons = 0;
+TQMap<TQString, TQPixmap> *PanelBrowserMenu::_icons = 0;
-PanelBrowserMenu::PanelBrowserMenu(QString path, QWidget *parent, const char *name, int startid)
+PanelBrowserMenu::PanelBrowserMenu(TQString path, TQWidget *parent, const char *name, int startid)
: KPanelMenu(path, parent, name)
, _mimecheckTimer(0)
, _startid(startid)
, _dirty(false)
, _filesOnly(false)
{
- _lastpress = QPoint(-1, -1);
+ _lastpress = TQPoint(-1, -1);
setAcceptDrops(true); // Should depend on permissions of path.
// we are not interested for dirty events on files inside the
// directory (see slotClearIfNeeded)
- connect( &_dirWatch, SIGNAL(dirty(const QString&)),
- this, SLOT(slotClearIfNeeded(const QString&)) );
- connect( &_dirWatch, SIGNAL(created(const QString&)),
- this, SLOT(slotClear()) );
- connect( &_dirWatch, SIGNAL(deleted(const QString&)),
- this, SLOT(slotClear()) );
+ connect( &_dirWatch, TQT_SIGNAL(dirty(const TQString&)),
+ this, TQT_SLOT(slotClearIfNeeded(const TQString&)) );
+ connect( &_dirWatch, TQT_SIGNAL(created(const TQString&)),
+ this, TQT_SLOT(slotClear()) );
+ connect( &_dirWatch, TQT_SIGNAL(deleted(const TQString&)),
+ this, TQT_SLOT(slotClear()) );
kdDebug() << "PanelBrowserMenu Constructor " << path << endl;
}
@@ -78,7 +78,7 @@ PanelBrowserMenu::~PanelBrowserMenu()
kdDebug() << "PanelBrowserMenu Destructor " << path() << endl;
}
-void PanelBrowserMenu::slotClearIfNeeded(const QString& p)
+void PanelBrowserMenu::slotClearIfNeeded(const TQString& p)
{
if (p == path())
slotClear();
@@ -86,7 +86,7 @@ void PanelBrowserMenu::slotClearIfNeeded(const QString& p)
void PanelBrowserMenu::initialize()
{
- _lastpress = QPoint(-1, -1);
+ _lastpress = TQPoint(-1, -1);
// don't change menu if already visible
if (isVisible())
@@ -113,13 +113,13 @@ void PanelBrowserMenu::initialize()
_filemap.clear();
_mimemap.clear();
- int filter = QDir::Dirs | QDir::Files;
+ int filter = TQDir::Dirs | TQDir::Files;
if (KickerSettings::showHiddenFiles())
{
- filter |= QDir::Hidden;
+ filter |= TQDir::Hidden;
}
- QDir dir(path(), QString::null, QDir::DirsFirst | QDir::Name | QDir::IgnoreCase, filter);
+ TQDir dir(path(), TQString::null, TQDir::DirsFirst | TQDir::Name | TQDir::IgnoreCase, filter);
// does the directory exist?
if (!dir.exists()) {
@@ -148,9 +148,9 @@ void PanelBrowserMenu::initialize()
// only the first part menu got them
if(_startid == 0 && !_filesOnly) {
insertTitle(path());
- insertItem(CICON("kfm"), i18n("Open in File Manager"), this, SLOT(slotOpenFileManager()));
+ insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager()));
if (kapp->authorize("shell_access"))
- insertItem(CICON("terminal"), i18n("Open in Terminal"), this, SLOT(slotOpenTerminal()));
+ insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQT_SLOT(slotOpenTerminal()));
}
@@ -171,24 +171,24 @@ void PanelBrowserMenu::initialize()
// bump id
run_id++;
- QFileInfo *fi = it.current();
+ TQFileInfo *fi = it.current();
// handle directories
if (fi->isDir())
{
- QString name = fi->fileName();
+ TQString name = fi->fileName();
// ignore . and .. entries
if (name == "." || name == "..") continue;
- QPixmap icon;
- QString path = fi->absFilePath();
+ TQPixmap icon;
+ TQString path = fi->absFilePath();
// parse .directory if it does exist
- if (QFile::exists(path + "/.directory")) {
+ if (TQFile::exists(path + "/.directory")) {
KSimpleConfig c(path + "/.directory", true);
c.setDesktopGroup();
- QString iconPath = c.readEntry("Icon");
+ TQString iconPath = c.readEntry("Icon");
if ( iconPath.startsWith("./") )
iconPath = path + '/' + iconPath.mid(2);
@@ -225,11 +225,11 @@ void PanelBrowserMenu::initialize()
// handle files
else if(fi->isFile())
{
- QString name = fi->fileName();
- QString title = KIO::decodeFileName(name);
+ TQString name = fi->fileName();
+ TQString title = KIO::decodeFileName(name);
- QPixmap icon;
- QString path = fi->absFilePath();
+ TQPixmap icon;
+ TQString path = fi->absFilePath();
bool mimecheck = false;
@@ -240,13 +240,13 @@ void PanelBrowserMenu::initialize()
c.setDesktopGroup();
title = c.readEntry("Name", title);
- QString s = c.readEntry("Icon");
+ TQString s = c.readEntry("Icon");
if(!_icons->contains(s)) {
icon = KGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall,
KIcon::DefaultState, 0, true);
if(icon.isNull()) {
- QString type = c.readEntry("Type", "Application");
+ TQString type = c.readEntry("Type", "Application");
if (type == "Directory")
icon = CICON("folder");
else if (type == "Mimetype")
@@ -312,7 +312,7 @@ void PanelBrowserMenu::initialize()
adjustSize();
- QString dirname = path();
+ TQString dirname = path();
int maxlen = contentsRect().width() - 40;
if(item_count == 0)
@@ -329,17 +329,17 @@ void PanelBrowserMenu::initialize()
if(_mimemap.count() > 0) {
if(!_mimecheckTimer)
- _mimecheckTimer = new QTimer(this);
+ _mimecheckTimer = new TQTimer(this);
- connect(_mimecheckTimer, SIGNAL(timeout()), SLOT(slotMimeCheck()));
+ connect(_mimecheckTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMimeCheck()));
_mimecheckTimer->start(0);
}
}
-void PanelBrowserMenu::append(const QPixmap &pixmap, const QString &title, const QString &file, bool mimecheck)
+void PanelBrowserMenu::append(const TQPixmap &pixmap, const TQString &title, const TQString &file, bool mimecheck)
{
// avoid &'s being converted to accelerators
- QString newTitle = title;
+ TQString newTitle = title;
newTitle = KStringHandler::cEmSqueeze( newTitle, fontMetrics(), 20 );
newTitle.replace("&", "&&");
@@ -354,10 +354,10 @@ void PanelBrowserMenu::append(const QPixmap &pixmap, const QString &title, const
_mimemap.insert(id, true);
}
-void PanelBrowserMenu::append(const QPixmap &pixmap, const QString &title, PanelBrowserMenu *subMenu)
+void PanelBrowserMenu::append(const TQPixmap &pixmap, const TQString &title, PanelBrowserMenu *subMenu)
{
// avoid &'s being converted to accelerators
- QString newTitle = title;
+ TQString newTitle = title;
newTitle = KStringHandler::cEmSqueeze( newTitle, fontMetrics(), 20 );
newTitle.replace("&", "&&");
@@ -367,18 +367,18 @@ void PanelBrowserMenu::append(const QPixmap &pixmap, const QString &title, Panel
_subMenus.append(subMenu);
}
-void PanelBrowserMenu::mousePressEvent(QMouseEvent *e)
+void PanelBrowserMenu::mousePressEvent(TQMouseEvent *e)
{
- QPopupMenu::mousePressEvent(e);
+ TQPopupMenu::mousePressEvent(e);
_lastpress = e->pos();
}
-void PanelBrowserMenu::mouseMoveEvent(QMouseEvent *e)
+void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e)
{
- QPopupMenu::mouseMoveEvent(e);
+ TQPopupMenu::mouseMoveEvent(e);
if (!(e->state() & LeftButton)) return;
- if(_lastpress == QPoint(-1, -1)) return;
+ if(_lastpress == TQPoint(-1, -1)) return;
// DND delay
if((_lastpress - e->pos()).manhattanLength() < 12) return;
@@ -388,14 +388,14 @@ void PanelBrowserMenu::mouseMoveEvent(QMouseEvent *e)
if(!_filemap.contains(id)) return;
// reset _lastpress
- _lastpress = QPoint(-1, -1);
+ _lastpress = TQPoint(-1, -1);
// start drag
KURL url;
url.setPath(path() + "/" + _filemap[id]);
KURL::List files(url);
KURLDrag *d = new KURLDrag(files, this);
- connect(d, SIGNAL(destroyed()), this, SLOT(slotDragObjectDestroyed()));
+ connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed()));
d->setPixmap(iconSet(id)->pixmap());
d->drag();
}
@@ -408,7 +408,7 @@ void PanelBrowserMenu::slotDragObjectDestroyed()
}
}
-void PanelBrowserMenu::dragEnterEvent( QDragEnterEvent *ev )
+void PanelBrowserMenu::dragEnterEvent( TQDragEnterEvent *ev )
{
if (KURLDrag::canDecode(ev))
{
@@ -417,16 +417,16 @@ void PanelBrowserMenu::dragEnterEvent( QDragEnterEvent *ev )
KPanelMenu::dragEnterEvent(ev);
}
-void PanelBrowserMenu::dragMoveEvent(QDragMoveEvent *ev)
+void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev)
{
- QMouseEvent mev(QEvent::MouseMove, ev->pos(), Qt::NoButton, Qt::LeftButton);
- QPopupMenu::mouseMoveEvent(&mev);
+ TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), Qt::NoButton, Qt::LeftButton);
+ TQPopupMenu::mouseMoveEvent(&mev);
}
-void PanelBrowserMenu::dropEvent( QDropEvent *ev )
+void PanelBrowserMenu::dropEvent( TQDropEvent *ev )
{
KURL u( path() );
- KFileItem item( u, QString::fromLatin1( "inode/directory" ), KFileItem::Unknown );
+ KFileItem item( u, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown );
KonqOperations::doDrop( &item, u, ev, this );
KPanelMenu::dropEvent(ev);
// ### TODO: Update list
@@ -441,14 +441,14 @@ void PanelBrowserMenu::slotExec(int id)
KURL url;
url.setPath(path() + "/" + _filemap[id]);
new KRun(url, 0, true); // will delete itself
- _lastpress = QPoint(-1, -1);
+ _lastpress = TQPoint(-1, -1);
}
void PanelBrowserMenu::slotOpenTerminal()
{
KConfig * config = kapp->config();
config->setGroup("General");
- QString term = config->readPathEntry("TerminalApplication", "konsole");
+ TQString term = config->readPathEntry("TerminalApplication", "konsole");
KProcess proc;
proc << term;
@@ -467,7 +467,7 @@ void PanelBrowserMenu::slotOpenFileManager()
void PanelBrowserMenu::slotMimeCheck()
{
// get the first map entry
- QMap<int, bool>::Iterator it = _mimemap.begin();
+ TQMap<int, bool>::Iterator it = _mimemap.begin();
// no mime types left to check -> stop timer
if(it == _mimemap.end()) {
@@ -478,7 +478,7 @@ void PanelBrowserMenu::slotMimeCheck()
}
int id = it.key();
- QString file = _filemap[id];
+ TQString file = _filemap[id];
_mimemap.remove(it);
@@ -486,18 +486,18 @@ void PanelBrowserMenu::slotMimeCheck()
url.setPath( path() + '/' + file );
// KMimeType::Ptr mt = KMimeType::findByURL(url, 0, true, false);
-// QString icon(mt->icon(url, true));
- QString icon = KMimeType::iconForURL( url );
+// TQString icon(mt->icon(url, true));
+ TQString icon = KMimeType::iconForURL( url );
// kdDebug() << url.url() << ": " << icon << endl;
file = KStringHandler::cEmSqueeze( file, fontMetrics(), 20 );
file.replace("&", "&&");
if(!_icons->contains(icon)) {
- QPixmap pm = SmallIcon(icon);
+ TQPixmap pm = SmallIcon(icon);
if( pm.height() > 16 )
{
- QPixmap cropped( 16, 16 );
+ TQPixmap cropped( 16, 16 );
copyBlt( &cropped, 0, 0, &pm, 0, 0, 16, 16 );
pm = cropped;
}
@@ -521,7 +521,7 @@ void PanelBrowserMenu::slotClear()
}
KPanelMenu::slotClear();
- for (QValueVector<PanelBrowserMenu*>::iterator it = _subMenus.begin();
+ for (TQValueVector<PanelBrowserMenu*>::iterator it = _subMenus.begin();
it != _subMenus.end();
++it)
{
@@ -536,7 +536,7 @@ void PanelBrowserMenu::initIconMap()
// kdDebug() << "PanelBrowserMenu::initIconMap" << endl;
- _icons = new QMap<QString, QPixmap>;
+ _icons = new TQMap<TQString, TQPixmap>;
_icons->insert("folder", SmallIcon("folder"));
_icons->insert("unknown", SmallIcon("mime_empty"));
diff --git a/kicker/kicker/ui/browser_mnu.h b/kicker/kicker/ui/browser_mnu.h
index 5999db2cb..38f9b9690 100644
--- a/kicker/kicker/ui/browser_mnu.h
+++ b/kicker/kicker/ui/browser_mnu.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __browser_mnu_h__
#define __browser_mnu_h__
-#include <qmap.h>
-#include <qvaluevector.h>
+#include <tqmap.h>
+#include <tqvaluevector.h>
#include <kpanelmenu.h>
#include <kdirwatch.h>
@@ -34,11 +34,11 @@ class PanelBrowserMenu : public KPanelMenu
Q_OBJECT
public:
- PanelBrowserMenu(QString path, QWidget *parent = 0, const char *name = 0, int startid = 0);
+ PanelBrowserMenu(TQString path, TQWidget *parent = 0, const char *name = 0, int startid = 0);
~PanelBrowserMenu();
- void append(const QPixmap &pixmap, const QString &title, const QString &filename, bool mimecheck);
- void append(const QPixmap &pixmap, const QString &title, PanelBrowserMenu *subMenu);
+ void append(const TQPixmap &pixmap, const TQString &title, const TQString &filename, bool mimecheck);
+ void append(const TQPixmap &pixmap, const TQString &title, PanelBrowserMenu *subMenu);
public slots:
void initialize();
@@ -48,24 +48,24 @@ protected slots:
void slotOpenTerminal();
void slotOpenFileManager();
void slotMimeCheck();
- void slotClearIfNeeded(const QString&);
+ void slotClearIfNeeded(const TQString&);
void slotClear();
void slotDragObjectDestroyed();
protected:
- void mousePressEvent(QMouseEvent *);
- void mouseMoveEvent(QMouseEvent *);
- void dropEvent(QDropEvent *ev);
- void dragEnterEvent(QDragEnterEvent *ev);
- void dragMoveEvent(QDragMoveEvent *);
+ void mousePressEvent(TQMouseEvent *);
+ void mouseMoveEvent(TQMouseEvent *);
+ void dropEvent(TQDropEvent *ev);
+ void dragEnterEvent(TQDragEnterEvent *ev);
+ void dragMoveEvent(TQDragMoveEvent *);
void initIconMap();
- QPoint _lastpress;
- QMap<int, QString> _filemap;
- QMap<int, bool> _mimemap;
- QTimer *_mimecheckTimer;
+ TQPoint _lastpress;
+ TQMap<int, TQString> _filemap;
+ TQMap<int, bool> _mimemap;
+ TQTimer *_mimecheckTimer;
KDirWatch _dirWatch;
- QValueVector<PanelBrowserMenu*> _subMenus;
+ TQValueVector<PanelBrowserMenu*> _subMenus;
int _startid;
bool _dirty;
@@ -75,7 +75,7 @@ protected:
// entries are not inserted in the menu and its submenus.
bool _filesOnly;
- static QMap<QString, QPixmap> *_icons;
+ static TQMap<TQString, TQPixmap> *_icons;
};
#endif
diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp
index f098e40d4..9736351e1 100644
--- a/kicker/kicker/ui/client_mnu.cpp
+++ b/kicker/kicker/ui/client_mnu.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qpixmap.h>
+#include <tqpixmap.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -30,8 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "client_mnu.h"
#include "client_mnu.moc"
-KickerClientMenu::KickerClientMenu( QWidget * parent, const char *name )
- : QPopupMenu( parent, name), DCOPObject( name )
+KickerClientMenu::KickerClientMenu( TQWidget * parent, const char *name )
+ : TQPopupMenu( parent, name), DCOPObject( name )
{
}
@@ -41,33 +41,33 @@ KickerClientMenu::~KickerClientMenu()
void KickerClientMenu::clear()
{
- QPopupMenu::clear();
+ TQPopupMenu::clear();
}
-void KickerClientMenu::insertItem( QPixmap icon, QString text, int id )
+void KickerClientMenu::insertItem( TQPixmap icon, TQString text, int id )
{
- int globalid = QPopupMenu::insertItem( icon, text, this, SLOT( slotActivated(int) ) );
+ int globalid = TQPopupMenu::insertItem( icon, text, this, TQT_SLOT( slotActivated(int) ) );
setItemParameter( globalid, id );
}
-void KickerClientMenu::insertItem( QString text, int id )
+void KickerClientMenu::insertItem( TQString text, int id )
{
- int globalid = QPopupMenu::insertItem( text, this, SLOT( slotActivated(int) ) );
+ int globalid = TQPopupMenu::insertItem( text, this, TQT_SLOT( slotActivated(int) ) );
setItemParameter( globalid, id );
}
-QCString KickerClientMenu::insertMenu( QPixmap icon, QString text, int id )
+TQCString KickerClientMenu::insertMenu( TQPixmap icon, TQString text, int id )
{
- QString subname("%1-submenu%2");
- QCString subid = subname.arg(objId()).arg(id).local8Bit();
+ TQString subname("%1-submenu%2");
+ TQCString subid = subname.arg(objId()).arg(id).local8Bit();
KickerClientMenu *sub = new KickerClientMenu(this, subid);
- int globalid = QPopupMenu::insertItem( icon, text, sub, id);
+ int globalid = TQPopupMenu::insertItem( icon, text, sub, id);
setItemParameter( globalid, id );
return subid;
}
-void KickerClientMenu::connectDCOPSignal( QCString signal, QCString appId, QCString objId )
+void KickerClientMenu::connectDCOPSignal( TQCString signal, TQCString appId, TQCString objId )
{
// very primitive right now
if ( signal == "activated(int)" ) {
@@ -78,48 +78,48 @@ void KickerClientMenu::connectDCOPSignal( QCString signal, QCString appId, QCStr
}
}
-bool KickerClientMenu::process(const QCString &fun, const QByteArray &data,
- QCString &replyType, QByteArray &replyData)
+bool KickerClientMenu::process(const TQCString &fun, const TQByteArray &data,
+ TQCString &replyType, TQByteArray &replyData)
{
if ( fun == "clear()" ) {
clear();
replyType = "void";
return true;
}
- else if ( fun == "insertItem(QPixmap,QString,int)" ) {
- QDataStream dataStream( data, IO_ReadOnly );
- QPixmap icon;
- QString text;
+ else if ( fun == "insertItem(TQPixmap,TQString,int)" ) {
+ TQDataStream dataStream( data, IO_ReadOnly );
+ TQPixmap icon;
+ TQString text;
int id;
dataStream >> icon >> text >> id;
insertItem( icon, text, id );
replyType = "void";
return true;
}
- else if ( fun == "insertMenu(QPixmap,QString,int)" ) {
- QDataStream dataStream( data, IO_ReadOnly );
- QPixmap icon;
- QString text;
+ else if ( fun == "insertMenu(TQPixmap,TQString,int)" ) {
+ TQDataStream dataStream( data, IO_ReadOnly );
+ TQPixmap icon;
+ TQString text;
int id;
dataStream >> icon >> text >> id;
- QCString ref = insertMenu( icon, text, id );
- replyType = "QCString";
- QDataStream replyStream( replyData, IO_WriteOnly );
+ TQCString ref = insertMenu( icon, text, id );
+ replyType = "TQCString";
+ TQDataStream replyStream( replyData, IO_WriteOnly );
replyStream << ref;
return true;
}
- else if ( fun == "insertItem(QString,int)" ) {
- QDataStream dataStream( data, IO_ReadOnly );
- QString text;
+ else if ( fun == "insertItem(TQString,int)" ) {
+ TQDataStream dataStream( data, IO_ReadOnly );
+ TQString text;
int id;
dataStream >> text >> id;
insertItem( text, id );
replyType = "void";
return true;
}
- else if ( fun == "connectDCOPSignal(QCString,QCString,QCString)" ) {
- QDataStream dataStream( data, IO_ReadOnly );
- QCString signal, appId, objId;
+ else if ( fun == "connectDCOPSignal(TQCString,TQCString,TQCString)" ) {
+ TQDataStream dataStream( data, IO_ReadOnly );
+ TQCString signal, appId, objId;
dataStream >> signal >> appId >> objId;
connectDCOPSignal( signal, appId, objId );
replyType = "void";
@@ -131,8 +131,8 @@ bool KickerClientMenu::process(const QCString &fun, const QByteArray &data,
void KickerClientMenu::slotActivated(int id)
{
if ( !app.isEmpty() ) {
- QByteArray data;
- QDataStream dataStream( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream dataStream( data, IO_WriteOnly );
dataStream << id;
kapp->dcopClient()->send( app, obj, "activated(int)", data );
}
diff --git a/kicker/kicker/ui/client_mnu.h b/kicker/kicker/ui/client_mnu.h
index fe8e4a113..272f6364f 100644
--- a/kicker/kicker/ui/client_mnu.h
+++ b/kicker/kicker/ui/client_mnu.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef PANEL_CLIENTMENU_H
#define PANEL_CLIENTMENU_H
-#include <qstringlist.h>
-#include <qpopupmenu.h>
+#include <tqstringlist.h>
+#include <tqpopupmenu.h>
#include <dcopobject.h>
@@ -36,46 +36,46 @@ class PanelKMenu;
// also manages the toplevel K Button Menu.
/**
- * Small additions to QPopupMenu to contain data we need for DCop handling
+ * Small additions to TQPopupMenu to contain data we need for DCop handling
*/
-class KickerClientMenu : public QPopupMenu, DCOPObject
+class KickerClientMenu : public TQPopupMenu, DCOPObject
{
Q_OBJECT
public:
- KickerClientMenu( QWidget *parent=0, const char *name=0);
+ KickerClientMenu( TQWidget *parent=0, const char *name=0);
~KickerClientMenu();
// dcop exported
void clear();
- void insertItem( QPixmap icon, QString text, int id );
- void insertItem( QString text, int id );
+ void insertItem( TQPixmap icon, TQString text, int id );
+ void insertItem( TQString text, int id );
- QCString insertMenu( QPixmap icon, QString test, int id );
+ TQCString insertMenu( TQPixmap icon, TQString test, int id );
// dcop signals:
// void activated(int)
- void connectDCOPSignal( QCString signal, QCString appId, QCString objId );
+ void connectDCOPSignal( TQCString signal, TQCString appId, TQCString objId );
// dcop internal
- virtual bool process(const QCString &fun, const QByteArray &data,
- QCString &replyType, QByteArray &reply);
+ virtual bool process(const TQCString &fun, const TQByteArray &data,
+ TQCString &replyType, TQByteArray &reply);
protected slots:
void slotActivated(int id);
private:
- QCString app, obj; // for the signal
+ TQCString app, obj; // for the signal
// for the panel menu, internal
friend class PanelKMenu;
- QString text;
- QPixmap icon;
+ TQString text;
+ TQPixmap icon;
// for the KickerClientMenu, internal
friend class MenuManager;
int idInParentMenu;
- QCString createdBy;
+ TQCString createdBy;
};
#endif
diff --git a/kicker/kicker/ui/dirdrop_mnu.cpp b/kicker/kicker/ui/dirdrop_mnu.cpp
index 2f64fdd12..cd814f42b 100644
--- a/kicker/kicker/ui/dirdrop_mnu.cpp
+++ b/kicker/kicker/ui/dirdrop_mnu.cpp
@@ -26,8 +26,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "dirdrop_mnu.h"
-PanelDirDropMenu::PanelDirDropMenu(QWidget *parent, const char *name)
- :QPopupMenu(parent, name)
+PanelDirDropMenu::PanelDirDropMenu(TQWidget *parent, const char *name)
+ :TQPopupMenu(parent, name)
{
insertItem(SmallIconSet("folder"), i18n("Add as &File Manager URL"), Url);
setAccel(CTRL+Key_F, Url);
diff --git a/kicker/kicker/ui/dirdrop_mnu.h b/kicker/kicker/ui/dirdrop_mnu.h
index 15fa799c2..d05187400 100644
--- a/kicker/kicker/ui/dirdrop_mnu.h
+++ b/kicker/kicker/ui/dirdrop_mnu.h
@@ -24,14 +24,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __dirdrop_mnu_h__
#define __dirdrop_mnu_h__
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
// The directory dropped menu
class PanelDirDropMenu : public QPopupMenu
{
public:
enum OpButton{Url=1, Browser};
- PanelDirDropMenu(QWidget *parent=0, const char *name=0);
+ PanelDirDropMenu(TQWidget *parent=0, const char *name=0);
};
#endif
diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp
index 19583444e..cb0d42c56 100644
--- a/kicker/kicker/ui/exe_dlg.cpp
+++ b/kicker/kicker/ui/exe_dlg.cpp
@@ -21,16 +21,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qfileinfo.h>
+#include <tqfileinfo.h>
#include <klocale.h>
#include <kiconloader.h>
-#include <qcheckbox.h>
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qlineedit.h>
-#include <qvbox.h>
+#include <tqcheckbox.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
+#include <tqlineedit.h>
+#include <tqvbox.h>
#include <kicondialog.h>
#include <kmessagebox.h>
@@ -45,16 +45,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "exe_dlg.h"
#include "nonKDEButtonSettings.h"
-PanelExeDialog::PanelExeDialog(const QString& title, const QString& description,
- const QString &path, const QString &icon,
- const QString &cmd, bool inTerm,
- QWidget *parent, const char *name)
+PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& description,
+ const TQString &path, const TQString &icon,
+ const TQString &cmd, bool inTerm,
+ TQWidget *parent, const char *name)
: KDialogBase(parent, name, false, i18n("Non-KDE Application Configuration"), Ok|Cancel, Ok, true),
m_icon(icon.isEmpty() ? "exec" : icon),
m_iconChanged(false)
{
setCaption(i18n("Non-KDE Application Configuration"));
- QFileInfo fi(path);
+ TQFileInfo fi(path);
ui = new NonKDEButtonSettings(makeVBoxMainWidget());
fillCompletion();
@@ -68,14 +68,14 @@ PanelExeDialog::PanelExeDialog(const QString& title, const QString& description,
updateIcon();
- connect(ui->m_exec, SIGNAL(urlSelected(const QString &)),
- this, SLOT(slotSelect(const QString &)));
- connect(ui->m_exec, SIGNAL(textChanged(const QString &)),
- this, SLOT(slotTextChanged(const QString &)));
- connect(ui->m_exec, SIGNAL(returnPressed()),
- this, SLOT(slotReturnPressed()));
- connect(ui->m_icon, SIGNAL(iconChanged(QString)),
- this, SLOT(slotIconChanged(QString)));
+ connect(ui->m_exec, TQT_SIGNAL(urlSelected(const TQString &)),
+ this, TQT_SLOT(slotSelect(const TQString &)));
+ connect(ui->m_exec, TQT_SIGNAL(textChanged(const TQString &)),
+ this, TQT_SLOT(slotTextChanged(const TQString &)));
+ connect(ui->m_exec, TQT_SIGNAL(returnPressed()),
+ this, TQT_SLOT(slotReturnPressed()));
+ connect(ui->m_icon, TQT_SIGNAL(iconChanged(TQString)),
+ this, TQT_SLOT(slotIconChanged(TQString)));
// leave decent space for the commandline
resize(sizeHint().width() > 300 ? sizeHint().width() : 300,
@@ -94,27 +94,27 @@ bool PanelExeDialog::useTerminal() const
return ui->m_inTerm->isChecked();
}
-QString PanelExeDialog::title() const
+TQString PanelExeDialog::title() const
{
return ui->m_title->text();
}
-QString PanelExeDialog::description() const
+TQString PanelExeDialog::description() const
{
return ui->m_description->text();
}
-QString PanelExeDialog::commandLine() const
+TQString PanelExeDialog::commandLine() const
{
return ui->m_commandLine->text();
}
-QString PanelExeDialog::iconPath() const
+TQString PanelExeDialog::iconPath() const
{
return ui->m_icon->icon();
}
-QString PanelExeDialog::command() const
+TQString PanelExeDialog::command() const
{
return ui->m_exec->url();
}
@@ -128,19 +128,19 @@ void PanelExeDialog::updateIcon()
void PanelExeDialog::fillCompletion()
{
KCompletion *comp = ui->m_exec->completionObject();
- QStringList exePaths = KStandardDirs::systemPaths();
+ TQStringList exePaths = KStandardDirs::systemPaths();
- for (QStringList::ConstIterator it = exePaths.begin(); it != exePaths.end(); it++)
+ for (TQStringList::ConstIterator it = exePaths.begin(); it != exePaths.end(); it++)
{
- QDir d( (*it) );
- d.setFilter( QDir::Files | QDir::Executable );
+ TQDir d( (*it) );
+ d.setFilter( TQDir::Files | TQDir::Executable );
const QFileInfoList *list = d.entryInfoList();
if (!list)
continue;
QFileInfoListIterator it2( *list );
- QFileInfo *fi;
+ TQFileInfo *fi;
while ( (fi = it2.current()) != 0 ) {
m_partialPath2full.insert(fi->fileName(), fi->filePath(), false);
@@ -151,20 +151,20 @@ void PanelExeDialog::fillCompletion()
}
}
-void PanelExeDialog::slotIconChanged(QString)
+void PanelExeDialog::slotIconChanged(TQString)
{
m_iconChanged = true;
}
-void PanelExeDialog::slotTextChanged(const QString &str)
+void PanelExeDialog::slotTextChanged(const TQString &str)
{
if (m_iconChanged)
{
return;
}
- QString exeLocation = str;
- QMap<QString, QString>::iterator it = m_partialPath2full.find(str);
+ TQString exeLocation = str;
+ TQMap<TQString, TQString>::iterator it = m_partialPath2full.find(str);
if (it != m_partialPath2full.end())
exeLocation = it.data();
@@ -178,12 +178,12 @@ void PanelExeDialog::slotReturnPressed()
ui->m_exec->setURL(m_partialPath2full[ui->m_exec->url()]);
}
-void PanelExeDialog::slotSelect(const QString& exec)
+void PanelExeDialog::slotSelect(const TQString& exec)
{
if ( exec.isEmpty() )
return;
- QFileInfo fi(exec);
+ TQFileInfo fi(exec);
if (!fi.isExecutable())
{
if(KMessageBox::warningYesNo(0, i18n("The selected file is not executable.\n"
diff --git a/kicker/kicker/ui/exe_dlg.h b/kicker/kicker/ui/exe_dlg.h
index f7624fa35..ef96fe9d0 100644
--- a/kicker/kicker/ui/exe_dlg.h
+++ b/kicker/kicker/ui/exe_dlg.h
@@ -31,25 +31,25 @@ class PanelExeDialog : public KDialogBase
{
Q_OBJECT
public:
- PanelExeDialog(const QString& title, const QString& description,
- const QString &path, const QString &pixmap=QString::null,
- const QString &cmd=QString::null, bool inTerm=false,
- QWidget *parent=0, const char *name=0);
- QString iconPath() const;
- QString command() const;
- QString commandLine() const;
- QString title() const;
- QString description() const;
+ PanelExeDialog(const TQString& title, const TQString& description,
+ const TQString &path, const TQString &pixmap=TQString::null,
+ const TQString &cmd=TQString::null, bool inTerm=false,
+ TQWidget *parent=0, const char *name=0);
+ TQString iconPath() const;
+ TQString command() const;
+ TQString commandLine() const;
+ TQString title() const;
+ TQString description() const;
bool useTerminal() const;
signals:
void updateSettings(PanelExeDialog*);
protected slots:
- void slotSelect(const QString& exec);
- void slotTextChanged(const QString &);
+ void slotSelect(const TQString& exec);
+ void slotTextChanged(const TQString &);
void slotReturnPressed();
- void slotIconChanged(QString);
+ void slotIconChanged(TQString);
void slotOk();
protected:
@@ -57,8 +57,8 @@ protected:
void updateIcon();
NonKDEButtonSettings* ui;
- QString m_icon;
- QMap<QString, QString> m_partialPath2full;
+ TQString m_icon;
+ TQMap<TQString, TQString> m_partialPath2full;
bool m_iconChanged;
};
diff --git a/kicker/kicker/ui/extensionop_mnu.cpp b/kicker/kicker/ui/extensionop_mnu.cpp
index 9389f9cd4..a30434a48 100644
--- a/kicker/kicker/ui/extensionop_mnu.cpp
+++ b/kicker/kicker/ui/extensionop_mnu.cpp
@@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "kicker.h"
#include "extensionop_mnu.h"
-PanelExtensionOpMenu::PanelExtensionOpMenu(const QString& extension, int actions, QWidget *parent, const char *name)
- : QPopupMenu(parent, name)
+PanelExtensionOpMenu::PanelExtensionOpMenu(const TQString& extension, int actions, TQWidget *parent, const char *name)
+ : TQPopupMenu(parent, name)
{
if (!Kicker::the()->isImmutable())
{
diff --git a/kicker/kicker/ui/extensionop_mnu.h b/kicker/kicker/ui/extensionop_mnu.h
index 85bf914af..01bda4340 100644
--- a/kicker/kicker/ui/extensionop_mnu.h
+++ b/kicker/kicker/ui/extensionop_mnu.h
@@ -24,13 +24,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __extensionop_mnu_h__
#define __extensionop_mnu_h__
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
class PanelExtensionOpMenu : public QPopupMenu
{
public:
enum OpButton{Move = 9900, Remove = 9901, Help = 9902, About = 9903, Preferences = 9904, ReportBug = 9905, Shade = 9906 };
- PanelExtensionOpMenu(const QString& extension, int actions, QWidget *parent=0, const char *name=0);
+ PanelExtensionOpMenu(const TQString& extension, int actions, TQWidget *parent=0, const char *name=0);
};
#endif
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 31d614006..a73e0a48d 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -20,7 +20,7 @@
#include "hidebutton.h"
-#include <qpainter.h>
+#include <tqpainter.h>
#include <kapplication.h>
#include <kcursor.h>
@@ -31,15 +31,15 @@
#include <kipc.h>
#include <kstandarddirs.h>
-HideButton::HideButton(QWidget *parent, const char *name)
- : QButton(parent, name),
+HideButton::HideButton(TQWidget *parent, const char *name)
+ : TQButton(parent, name),
m_highlight(false),
m_arrow(Qt::LeftArrow)
{
setBackgroundOrigin(AncestorOrigin);
- connect(kapp, SIGNAL(settingsChanged(int)), SLOT(slotSettingsChanged(int)));
- connect(kapp, SIGNAL(iconChanged(int)), SLOT(slotIconChanged(int)));
+ connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
+ connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int)));
kapp->addKipcEventMask(KIPC::SettingsChanged);
kapp->addKipcEventMask(KIPC::IconChanged);
@@ -47,7 +47,7 @@ HideButton::HideButton(QWidget *parent, const char *name)
slotSettingsChanged(KApplication::SETTINGS_MOUSE);
}
-void HideButton::drawButton(QPainter *p)
+void HideButton::drawButton(TQPainter *p)
{
if (m_arrow == Qt::LeftArrow)
{
@@ -73,18 +73,18 @@ void HideButton::drawButton(QPainter *p)
drawButtonLabel(p);
}
-void HideButton::drawButtonLabel(QPainter *p)
+void HideButton::drawButtonLabel(TQPainter *p)
{
if (pixmap())
{
- QPixmap pix = m_highlight? m_activeIcon : m_normalIcon;
+ TQPixmap pix = m_highlight? m_activeIcon : m_normalIcon;
if (isOn() || isDown())
{
p->translate(2, 2);
}
- QPoint origin(2, 2);
+ TQPoint origin(2, 2);
if (pix.height() < (height() - 4))
{
@@ -100,9 +100,9 @@ void HideButton::drawButtonLabel(QPainter *p)
}
}
-void HideButton::setPixmap(const QPixmap &pix)
+void HideButton::setPixmap(const TQPixmap &pix)
{
- QButton::setPixmap(pix);
+ TQButton::setPixmap(pix);
generateIcons();
}
@@ -137,8 +137,8 @@ void HideButton::generateIcons()
return;
}
- QImage image = pixmap()->convertToImage();
- image = image.smoothScale(size() - QSize(4, 4), QImage::ScaleMin);
+ TQImage image = pixmap()->convertToImage();
+ image = image.smoothScale(size() - TQSize(4, 4), TQImage::ScaleMin);
KIconEffect effect;
@@ -176,23 +176,23 @@ void HideButton::slotIconChanged(int group)
repaint(false);
}
-void HideButton::enterEvent(QEvent *e)
+void HideButton::enterEvent(TQEvent *e)
{
m_highlight = true;
repaint(false);
- QButton::enterEvent(e);
+ TQButton::enterEvent(e);
}
-void HideButton::leaveEvent(QEvent *e)
+void HideButton::leaveEvent(TQEvent *e)
{
m_highlight = false;
repaint(false);
- QButton::enterEvent(e);
+ TQButton::enterEvent(e);
}
-void HideButton::resizeEvent(QResizeEvent *)
+void HideButton::resizeEvent(TQResizeEvent *)
{
generateIcons();
}
diff --git a/kicker/kicker/ui/hidebutton.h b/kicker/kicker/ui/hidebutton.h
index da387cde7..9a6c4612e 100644
--- a/kicker/kicker/ui/hidebutton.h
+++ b/kicker/kicker/ui/hidebutton.h
@@ -20,30 +20,30 @@
#ifndef HIDEBUTTON_H
#define HIDEBUTTON_H
-#include <qbutton.h>
-#include <qpixmap.h>
+#include <tqbutton.h>
+#include <tqpixmap.h>
class HideButton : public QButton
{
Q_OBJECT
public:
- HideButton(QWidget *parent, const char *name = 0);
+ HideButton(TQWidget *parent, const char *name = 0);
void setArrowType(Qt::ArrowType arrow);
- void setPixmap(const QPixmap &pix);
+ void setPixmap(const TQPixmap &pix);
protected:
- void drawButton(QPainter *p);
- void drawButtonLabel(QPainter *p);
+ void drawButton(TQPainter *p);
+ void drawButtonLabel(TQPainter *p);
void generateIcons();
- void enterEvent(QEvent *e);
- void leaveEvent( QEvent *e );
- void resizeEvent(QResizeEvent *e);
+ void enterEvent(TQEvent *e);
+ void leaveEvent( TQEvent *e );
+ void resizeEvent(TQResizeEvent *e);
bool m_highlight;
- QPixmap m_normalIcon;
- QPixmap m_activeIcon;
+ TQPixmap m_normalIcon;
+ TQPixmap m_activeIcon;
Qt::ArrowType m_arrow;
protected slots:
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 609ce84be..b2e3d59bb 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -26,9 +26,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <unistd.h>
#include <dmctl.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qstyle.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqstyle.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -62,11 +62,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "k_mnu.moc"
PanelKMenu::PanelKMenu()
- : PanelServiceMenu(QString::null, QString::null, 0, "KMenu")
+ : PanelServiceMenu(TQString::null, TQString::null, 0, "KMenu")
, bookmarkMenu(0)
, bookmarkOwner(0)
{
- static const QCString dcopObjId("KMenu");
+ static const TQCString dcopObjId("KMenu");
DCOPObject::setObjId(dcopObjId);
// set the first client id to some arbitrarily large value.
client_id = 10000;
@@ -74,13 +74,13 @@ PanelKMenu::PanelKMenu()
disableAutoClear();
actionCollection = new KActionCollection(this);
setCaption(i18n("K Menu"));
- connect(Kicker::the(), SIGNAL(configurationChanged()),
- this, SLOT(configChanged()));
+ connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
+ this, TQT_SLOT(configChanged()));
DCOPClient *dcopClient = KApplication::dcopClient();
dcopClient->connectDCOPSignal(0, "appLauncher",
- "serviceStartedByStorageId(QString,QString)",
+ "serviceStartedByStorageId(TQString,TQString)",
dcopObjId,
- "slotServiceStartedByStorageId(QString,QString)",
+ "slotServiceStartedByStorageId(TQString,TQString)",
false);
}
@@ -91,8 +91,8 @@ PanelKMenu::~PanelKMenu()
delete bookmarkOwner;
}
-void PanelKMenu::slotServiceStartedByStorageId(QString starter,
- QString storageId)
+void PanelKMenu::slotServiceStartedByStorageId(TQString starter,
+ TQString storageId)
{
if (starter != "kmenu")
{
@@ -111,10 +111,10 @@ bool PanelKMenu::loadSidePixmap()
return false;
}
- QString sideName = KickerSettings::sidePixmapName();
- QString sideTileName = KickerSettings::sideTileName();
+ TQString sideName = KickerSettings::sidePixmapName();
+ TQString sideTileName = KickerSettings::sideTileName();
- QImage image;
+ TQImage image;
image.load(locate("data", "kicker/pics/" + sideName));
if (image.isNull())
@@ -147,8 +147,8 @@ bool PanelKMenu::loadSidePixmap()
if (sideTilePixmap.height() < 100)
{
int tiles = (int)(100 / sideTilePixmap.height()) + 1;
- QPixmap preTiledPixmap(sideTilePixmap.width(), sideTilePixmap.height() * tiles);
- QPainter p(&preTiledPixmap);
+ TQPixmap preTiledPixmap(sideTilePixmap.width(), sideTilePixmap.height() * tiles);
+ TQPainter p(&preTiledPixmap);
p.drawTiledPixmap(preTiledPixmap.rect(), sideTilePixmap);
sideTilePixmap = preTiledPixmap;
}
@@ -160,7 +160,7 @@ void PanelKMenu::paletteChanged()
{
if (!loadSidePixmap())
{
- sidePixmap = sideTilePixmap = QPixmap();
+ sidePixmap = sideTilePixmap = TQPixmap();
setMinimumSize( sizeHint() );
}
}
@@ -178,14 +178,14 @@ void PanelKMenu::initialize()
if (loadSidePixmap())
{
// in case we've been through here before, let's disconnect
- disconnect(kapp, SIGNAL(kdisplayPaletteChanged()),
- this, SLOT(paletteChanged()));
- connect(kapp, SIGNAL(kdisplayPaletteChanged()),
- this, SLOT(paletteChanged()));
+ disconnect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()),
+ this, TQT_SLOT(paletteChanged()));
+ connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()),
+ this, TQT_SLOT(paletteChanged()));
}
else
{
- sidePixmap = sideTilePixmap = QPixmap();
+ sidePixmap = sideTilePixmap = TQPixmap();
}
// add services
@@ -235,10 +235,10 @@ void PanelKMenu::initialize()
}
// insert dynamic menus
- QStringList menu_ext = KickerSettings::menuExtensions();
+ TQStringList menu_ext = KickerSettings::menuExtensions();
if (!menu_ext.isEmpty())
{
- for (QStringList::ConstIterator it=menu_ext.begin(); it!=menu_ext.end(); ++it)
+ for (TQStringList::ConstIterator it=menu_ext.begin(); it!=menu_ext.end(); ++it)
{
MenuInfo info(*it);
if (!info.isValid())
@@ -259,7 +259,7 @@ void PanelKMenu::initialize()
// insert client menus, if any
if (clients.count() > 0) {
- QIntDictIterator<KickerClientMenu> it(clients);
+ TQIntDictIterator<KickerClientMenu> it(clients);
while (it){
if (it.current()->text.at(0) != '.')
insertItem(
@@ -279,16 +279,16 @@ void PanelKMenu::initialize()
insertItem(KickerLib::menuIconSet("run"),
i18n("Run Command..."),
this,
- SLOT( slotRunCommand()));
+ TQT_SLOT( slotRunCommand()));
insertSeparator();
}
if (DM().isSwitchable() && kapp->authorize("switch_user"))
{
- sessionsMenu = new QPopupMenu( this );
+ sessionsMenu = new TQPopupMenu( this );
insertItem(KickerLib::menuIconSet("switchuser"), i18n("Switch User"), sessionsMenu);
- connect( sessionsMenu, SIGNAL(aboutToShow()), SLOT(slotPopulateSessions()) );
- connect( sessionsMenu, SIGNAL(activated(int)), SLOT(slotSessionActivated(int)) );
+ connect( sessionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotPopulateSessions()) );
+ connect( sessionsMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSessionActivated(int)) );
}
/*
@@ -298,17 +298,17 @@ void PanelKMenu::initialize()
ksmserver.setGroup("General");
if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession")
{
- insertItem(KickerLib::menuIconSet("filesave"), i18n("Save Session"), this, SLOT(slotSaveSession()));
+ insertItem(KickerLib::menuIconSet("filesave"), i18n("Save Session"), this, TQT_SLOT(slotSaveSession()));
}
if (kapp->authorize("lock_screen"))
{
- insertItem(KickerLib::menuIconSet("lock"), i18n("Lock Session"), this, SLOT(slotLock()));
+ insertItem(KickerLib::menuIconSet("lock"), i18n("Lock Session"), this, TQT_SLOT(slotLock()));
}
if (kapp->authorize("logout"))
{
- insertItem(KickerLib::menuIconSet("exit"), i18n("Log Out..."), this, SLOT(slotLogout()));
+ insertItem(KickerLib::menuIconSet("exit"), i18n("Log Out..."), this, TQT_SLOT(slotLogout()));
}
#if 0
@@ -341,7 +341,7 @@ extern int kicker_screen_number;
void PanelKMenu::slotLock()
{
- QCString appname( "kdesktop" );
+ TQCString appname( "kdesktop" );
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", "");
@@ -421,15 +421,15 @@ void PanelKMenu::doNewSession( bool lock )
void PanelKMenu::slotSaveSession()
{
- QByteArray data;
+ TQByteArray data;
kapp->dcopClient()->send( "ksmserver", "default",
"saveCurrentSession()", data );
}
void PanelKMenu::slotRunCommand()
{
- QByteArray data;
- QCString appname( "kdesktop" );
+ TQByteArray data;
+ TQCString appname( "kdesktop" );
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
@@ -442,12 +442,12 @@ void PanelKMenu::slotEditUserContact()
{
}
-void PanelKMenu::setMinimumSize(const QSize & s)
+void PanelKMenu::setMinimumSize(const TQSize & s)
{
KPanelMenu::setMinimumSize(s.width() + sidePixmap.width(), s.height());
}
-void PanelKMenu::setMaximumSize(const QSize & s)
+void PanelKMenu::setMaximumSize(const TQSize & s)
{
KPanelMenu::setMaximumSize(s.width() + sidePixmap.width(), s.height());
}
@@ -477,20 +477,20 @@ void PanelKMenu::showMenu()
}
}
-QRect PanelKMenu::sideImageRect()
+TQRect PanelKMenu::sideImageRect()
{
- return QStyle::visualRect( QRect( frameWidth(), frameWidth(), sidePixmap.width(),
+ return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(),
height() - 2*frameWidth() ), this );
}
-void PanelKMenu::resizeEvent(QResizeEvent * e)
+void PanelKMenu::resizeEvent(TQResizeEvent * e)
{
// kdDebug(1210) << "PanelKMenu::resizeEvent():" << endl;
// kdDebug(1210) << geometry().width() << ", " << geometry().height() << endl;
PanelServiceMenu::resizeEvent(e);
- setFrameRect( QStyle::visualRect( QRect( sidePixmap.width(), 0,
+ setFrameRect( TQStyle::visualRect( TQRect( sidePixmap.width(), 0,
width() - sidePixmap.width(), height() ), this ) );
}
@@ -501,30 +501,30 @@ void PanelKMenu::resize(int width, int height)
PanelServiceMenu::resize(width, height);
}
-QSize PanelKMenu::sizeHint() const
+TQSize PanelKMenu::sizeHint() const
{
- QSize s = PanelServiceMenu::sizeHint();
+ TQSize s = PanelServiceMenu::sizeHint();
// kdDebug(1210) << "PanelKMenu::sizeHint()" << endl;
// kdDebug(1210) << s.width() << ", " << s.height() << endl;
return s;
}
-void PanelKMenu::paintEvent(QPaintEvent * e)
+void PanelKMenu::paintEvent(TQPaintEvent * e)
{
if (sidePixmap.isNull()) {
PanelServiceMenu::paintEvent(e);
return;
}
- QPainter p(this);
+ TQPainter p(this);
p.setClipRegion(e->region());
- style().drawPrimitive( QStyle::PE_PanelPopup, &p,
- QRect( 0, 0, width(), height() ),
- colorGroup(), QStyle::Style_Default,
- QStyleOption( frameWidth(), 0 ) );
+ style().drawPrimitive( TQStyle::PE_PanelPopup, &p,
+ TQRect( 0, 0, width(), height() ),
+ colorGroup(), TQStyle::Style_Default,
+ TQStyleOption( frameWidth(), 0 ) );
- QRect r = sideImageRect();
+ TQRect r = sideImageRect();
r.setBottom( r.bottom() - sidePixmap.height() );
if ( r.intersects( e->rect() ) )
{
@@ -535,8 +535,8 @@ void PanelKMenu::paintEvent(QPaintEvent * e)
r.setTop( r.bottom() - sidePixmap.height() );
if ( r.intersects( e->rect() ) )
{
- QRect drawRect = r.intersect( e->rect() );
- QRect pixRect = drawRect;
+ TQRect drawRect = r.intersect( e->rect() );
+ TQRect pixRect = drawRect;
pixRect.moveBy( -r.left(), -r.top() );
p.drawPixmap( drawRect.topLeft(), sidePixmap, pixRect );
}
@@ -544,40 +544,40 @@ void PanelKMenu::paintEvent(QPaintEvent * e)
drawContents( &p );
}
-QMouseEvent PanelKMenu::translateMouseEvent( QMouseEvent* e )
+TQMouseEvent PanelKMenu::translateMouseEvent( TQMouseEvent* e )
{
- QRect side = sideImageRect();
+ TQRect side = sideImageRect();
if ( !side.contains( e->pos() ) )
return *e;
- QPoint newpos( e->pos() );
- QApplication::reverseLayout() ?
+ TQPoint newpos( e->pos() );
+ TQApplication::reverseLayout() ?
newpos.setX( newpos.x() - side.width() ) :
newpos.setX( newpos.x() + side.width() );
- QPoint newglobal( e->globalPos() );
- QApplication::reverseLayout() ?
+ TQPoint newglobal( e->globalPos() );
+ TQApplication::reverseLayout() ?
newglobal.setX( newpos.x() - side.width() ) :
newglobal.setX( newpos.x() + side.width() );
- return QMouseEvent( e->type(), newpos, newglobal, e->button(), e->state() );
+ return TQMouseEvent( e->type(), newpos, newglobal, e->button(), e->state() );
}
-void PanelKMenu::mousePressEvent(QMouseEvent * e)
+void PanelKMenu::mousePressEvent(TQMouseEvent * e)
{
- QMouseEvent newEvent = translateMouseEvent(e);
+ TQMouseEvent newEvent = translateMouseEvent(e);
PanelServiceMenu::mousePressEvent( &newEvent );
}
-void PanelKMenu::mouseReleaseEvent(QMouseEvent *e)
+void PanelKMenu::mouseReleaseEvent(TQMouseEvent *e)
{
- QMouseEvent newEvent = translateMouseEvent(e);
+ TQMouseEvent newEvent = translateMouseEvent(e);
PanelServiceMenu::mouseReleaseEvent( &newEvent );
}
-void PanelKMenu::mouseMoveEvent(QMouseEvent *e)
+void PanelKMenu::mouseMoveEvent(TQMouseEvent *e)
{
- QMouseEvent newEvent = translateMouseEvent(e);
+ TQMouseEvent newEvent = translateMouseEvent(e);
PanelServiceMenu::mouseMoveEvent( &newEvent );
}
@@ -593,7 +593,7 @@ void PanelKMenu::createRecentMenuItems()
{
RecentlyLaunchedApps::the().m_nNumMenuItems = 0;
- QStringList RecentApps;
+ TQStringList RecentApps;
RecentlyLaunchedApps::the().getRecentApps(RecentApps);
if (RecentApps.count() > 0)
@@ -602,7 +602,7 @@ void PanelKMenu::createRecentMenuItems()
int nId = serviceMenuEndId() + 1;
int nIndex = KickerSettings::showMenuTitles() ? 1 : 0;
- for (QValueList<QString>::ConstIterator it =
+ for (TQValueList<TQString>::ConstIterator it =
RecentApps.fromLast(); /*nop*/; --it)
{
KService::Ptr s = KService::serviceByDesktopPath(*it);
@@ -642,7 +642,7 @@ void PanelKMenu::clearSubmenus()
{
// we don't need to delete these on the way out since the libloader
// handles them for us
- if (QApplication::closingDown())
+ if (TQApplication::closingDown())
{
return;
}
@@ -688,13 +688,13 @@ void PanelKMenu::updateRecent()
}
// insert new items
- QStringList RecentApps;
+ TQStringList RecentApps;
RecentlyLaunchedApps::the().getRecentApps(RecentApps);
if (RecentApps.count() > 0)
{
bool bNeedSeparator = KickerSettings::showMenuTitles();
- for (QValueList<QString>::ConstIterator it = RecentApps.fromLast();
+ for (TQValueList<TQString>::ConstIterator it = RecentApps.fromLast();
/*nop*/; --it)
{
KService::Ptr s = KService::serviceByDesktopPath(*it);
diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h
index f20cde06d..412648f1b 100644
--- a/kicker/kicker/ui/k_mnu.h
+++ b/kicker/kicker/ui/k_mnu.h
@@ -25,8 +25,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define __k_mnu_h__
#include <dcopobject.h>
-#include <qintdict.h>
-#include <qpixmap.h>
+#include <tqintdict.h>
+#include <tqpixmap.h>
#include "service_mnu.h"
@@ -42,7 +42,7 @@ class PanelKMenu : public PanelServiceMenu, public DCOPObject
K_DCOP
k_dcop:
- void slotServiceStartedByStorageId(QString starter, QString desktopPath);
+ void slotServiceStartedByStorageId(TQString starter, TQString desktopPath);
public:
PanelKMenu();
@@ -51,9 +51,9 @@ public:
int insertClientMenu(KickerClientMenu *p);
void removeClientMenu(int id);
- virtual QSize sizeHint() const;
- virtual void setMinimumSize(const QSize &);
- virtual void setMaximumSize(const QSize &);
+ virtual TQSize sizeHint() const;
+ virtual void setMinimumSize(const TQSize &);
+ virtual void setMaximumSize(const TQSize &);
virtual void setMinimumSize(int, int);
virtual void setMaximumSize(int, int);
virtual void showMenu();
@@ -78,25 +78,25 @@ protected slots:
void updateRecent();
protected:
- QRect sideImageRect();
- QMouseEvent translateMouseEvent(QMouseEvent* e);
- void resizeEvent(QResizeEvent *);
- void paintEvent(QPaintEvent *);
- void mousePressEvent(QMouseEvent *);
- void mouseReleaseEvent(QMouseEvent *);
- void mouseMoveEvent(QMouseEvent *);
+ TQRect sideImageRect();
+ TQMouseEvent translateMouseEvent(TQMouseEvent* e);
+ void resizeEvent(TQResizeEvent *);
+ void paintEvent(TQPaintEvent *);
+ void mousePressEvent(TQMouseEvent *);
+ void mouseReleaseEvent(TQMouseEvent *);
+ void mouseMoveEvent(TQMouseEvent *);
bool loadSidePixmap();
void doNewSession(bool lock);
void createRecentMenuItems();
virtual void clearSubmenus();
private:
- QPopupMenu *sessionsMenu;
- QPixmap sidePixmap;
- QPixmap sideTilePixmap;
+ TQPopupMenu *sessionsMenu;
+ TQPixmap sidePixmap;
+ TQPixmap sideTilePixmap;
int client_id;
bool delay_init;
- QIntDict<KickerClientMenu> clients;
+ TQIntDict<KickerClientMenu> clients;
KBookmarkMenu *bookmarkMenu;
KActionCollection *actionCollection;
KBookmarkOwner *bookmarkOwner;
diff --git a/kicker/kicker/ui/panelmenuiteminfo.h b/kicker/kicker/ui/panelmenuiteminfo.h
index 29faca50f..66d0f7d9c 100644
--- a/kicker/kicker/ui/panelmenuiteminfo.h
+++ b/kicker/kicker/ui/panelmenuiteminfo.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef PANELMENUITEMINFO_H
#define PANELMENUITEMINFO_H
-#include <qpopupmenu.h>
-#include <qstring.h>
+#include <tqpopupmenu.h>
+#include <tqstring.h>
#include <kiconloader.h>
@@ -38,10 +38,10 @@ class PanelMenuItemInfo
PanelMenuItemInfo()
: m_recvr(0), m_id(-1) {}
- PanelMenuItemInfo(const QString& iconName, const QString& visibleName, const QObject* recvr, const QCString& slot, int id = -1)
+ PanelMenuItemInfo(const TQString& iconName, const TQString& visibleName, const TQObject* recvr, const TQCString& slot, int id = -1)
: m_icon(iconName), m_name(visibleName), m_slot_(slot), m_recvr(recvr), m_id(id) {}
- PanelMenuItemInfo(const QString& iconName, const QString& visibleName, int id = -1)
+ PanelMenuItemInfo(const TQString& iconName, const TQString& visibleName, int id = -1)
: m_icon(iconName), m_name(visibleName), m_recvr(0), m_id(id) {}
PanelMenuItemInfo(const PanelMenuItemInfo& c)
@@ -72,7 +72,7 @@ class PanelMenuItemInfo
return m_name.lower() > rh.m_name.lower();
}
- int plug(QPopupMenu* menu)
+ int plug(TQPopupMenu* menu)
{
if (!m_icon.isEmpty() && m_icon != "unknown")
{
@@ -92,10 +92,10 @@ class PanelMenuItemInfo
}
private:
- QString m_icon;
- QString m_name;
- QCString m_slot_; // HPUX namespace is polluted with m_slot
- const QObject* m_recvr;
+ TQString m_icon;
+ TQString m_name;
+ TQCString m_slot_; // HPUX namespace is polluted with m_slot
+ const TQObject* m_recvr;
int m_id;
};
diff --git a/kicker/kicker/ui/popupmenutitle.cpp b/kicker/kicker/ui/popupmenutitle.cpp
index adf44b802..3ea63f2be 100644
--- a/kicker/kicker/ui/popupmenutitle.cpp
+++ b/kicker/kicker/ui/popupmenutitle.cpp
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "popupmenutitle.h"
-PopupMenuTitle::PopupMenuTitle(const QString &name, const QFont &font) :
- QCustomMenuItem(),
+PopupMenuTitle::PopupMenuTitle(const TQString &name, const TQFont &font) :
+ TQCustomMenuItem(),
m_desktopName(name),
m_font(font)
{
diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h
index 4724c88c7..439fc195f 100644
--- a/kicker/kicker/ui/popupmenutitle.h
+++ b/kicker/kicker/ui/popupmenutitle.h
@@ -25,28 +25,28 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef POPUPMENUTITLE_H
#define POPUPMENUTITLE_H
-#include <qfont.h>
-#include <qstring.h>
-#include <qstyle.h>
-#include <qpainter.h>
-#include <qmenudata.h>
+#include <tqfont.h>
+#include <tqstring.h>
+#include <tqstyle.h>
+#include <tqpainter.h>
+#include <tqmenudata.h>
#include <kapplication.h>
class PopupMenuTitle : public QCustomMenuItem
{
public:
- PopupMenuTitle(const QString &name, const QFont &font);
+ PopupMenuTitle(const TQString &name, const TQFont &font);
bool fullSpan () const { return true; }
- void paint(QPainter* p, const QColorGroup& cg,
+ void paint(TQPainter* p, const TQColorGroup& cg,
bool /* act */, bool /*enabled*/,
int x, int y, int w, int h)
{
p->save();
- QRect r(x, y, w, h);
- kapp->style().drawPrimitive(QStyle::PE_HeaderSection,
+ TQRect r(x, y, w, h);
+ kapp->style().drawPrimitive(TQStyle::PE_HeaderSection,
p, r, cg);
if (!m_desktopName.isEmpty())
@@ -63,23 +63,23 @@ public:
p->restore();
}
- void setFont(const QFont &font)
+ void setFont(const TQFont &font)
{
m_font = font;
m_font.setBold(true);
}
- QSize sizeHint()
+ TQSize sizeHint()
{
- QSize size = QFontMetrics(m_font).size(AlignHCenter, m_desktopName);
+ TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName);
size.setHeight(size.height() +
- (kapp->style().pixelMetric(QStyle::PM_DefaultFrameWidth) * 2 + 1));
+ (kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1));
return size;
}
private:
- QString m_desktopName;
- QFont m_font;
+ TQString m_desktopName;
+ TQFont m_font;
};
#endif
diff --git a/kicker/kicker/ui/quickbrowser_mnu.cpp b/kicker/kicker/ui/quickbrowser_mnu.cpp
index 583fc1deb..1776f4876 100644
--- a/kicker/kicker/ui/quickbrowser_mnu.cpp
+++ b/kicker/kicker/ui/quickbrowser_mnu.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qdir.h>
+#include <tqdir.h>
#include <kapplication.h>
#include <klocale.h>
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "quickbrowser_mnu.h"
#include "quickbrowser_mnu.moc"
-PanelQuickBrowser::PanelQuickBrowser(QWidget *parent, const char *name)
+PanelQuickBrowser::PanelQuickBrowser(TQWidget *parent, const char *name)
: KPanelMenu("", parent, name) {}
void PanelQuickBrowser::initialize()
@@ -43,17 +43,17 @@ void PanelQuickBrowser::initialize()
KURL url;
- url.setPath(QDir::homeDirPath());
+ url.setPath(TQDir::homeDirPath());
if (kapp->authorizeURLAction("list", KURL(), url))
insertItem(SmallIcon("kfm_home"), i18n("&Home Folder"),
new PanelBrowserMenu(url.path(), this));
- url.setPath(QDir::rootDirPath());
+ url.setPath(TQDir::rootDirPath());
if (kapp->authorizeURLAction("list", KURL(), url))
insertItem(SmallIcon("folder_red"), i18n("&Root Folder"),
new PanelBrowserMenu(url.path(), this));
- url.setPath(QDir::rootDirPath() + "etc");
+ url.setPath(TQDir::rootDirPath() + "etc");
if (kapp->authorizeURLAction("list", KURL(), url))
insertItem(SmallIcon("folder_yellow"), i18n("System &Configuration"),
new PanelBrowserMenu(url.path(), this));
diff --git a/kicker/kicker/ui/quickbrowser_mnu.h b/kicker/kicker/ui/quickbrowser_mnu.h
index 9d9582a8b..01b12d09d 100644
--- a/kicker/kicker/ui/quickbrowser_mnu.h
+++ b/kicker/kicker/ui/quickbrowser_mnu.h
@@ -31,7 +31,7 @@ class PanelQuickBrowser : public KPanelMenu
Q_OBJECT
public:
- PanelQuickBrowser(QWidget *parent=0, const char *name=0);
+ PanelQuickBrowser(TQWidget *parent=0, const char *name=0);
public slots:
virtual void initialize();
diff --git a/kicker/kicker/ui/recentapps.cpp b/kicker/kicker/ui/recentapps.cpp
index 54241cb29..473b0cdf2 100644
--- a/kicker/kicker/ui/recentapps.cpp
+++ b/kicker/kicker/ui/recentapps.cpp
@@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <time.h>
-#include <qregexp.h>
-#include <qstringlist.h>
+#include <tqregexp.h>
+#include <tqstringlist.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -63,17 +63,17 @@ void RecentlyLaunchedApps::init()
configChanged();
- QStringList recentApps = KickerSettings::recentAppsStat();
+ TQStringList recentApps = KickerSettings::recentAppsStat();
- for (QStringList::ConstIterator it = recentApps.begin();
+ for (TQStringList::ConstIterator it = recentApps.begin();
it != recentApps.end(); ++it )
{
- QRegExp re( "(\\d*) (\\d*) (.*)" );
+ TQRegExp re( "(\\d*) (\\d*) (.*)" );
if (re.search(*it) != -1)
{
int nCount = re.cap(1).toInt();
long lTime = re.cap(2).toLong();
- QString szPath = re.cap(3);
+ TQString szPath = re.cap(3);
m_appInfos.append(RecentlyLaunchedAppInfo(
szPath, nCount, time_t(lTime)));
}
@@ -91,12 +91,12 @@ void RecentlyLaunchedApps::configChanged()
void RecentlyLaunchedApps::save()
{
- QStringList recentApps;
+ TQStringList recentApps;
- for (QValueList<RecentlyLaunchedAppInfo>::const_iterator it =
+ for (TQValueList<RecentlyLaunchedAppInfo>::const_iterator it =
m_appInfos.constBegin(); it != m_appInfos.constEnd(); ++it)
{
- recentApps.append(QString("%1 %2 %3").arg((*it).getLaunchCount())
+ recentApps.append(TQString("%1 %2 %3").arg((*it).getLaunchCount())
.arg((*it).getLastLaunchTime())
.arg((*it).getDesktopPath()));
}
@@ -105,17 +105,17 @@ void RecentlyLaunchedApps::save()
KickerSettings::writeConfig();
}
-void RecentlyLaunchedApps::appLaunched(const QString& strApp)
+void RecentlyLaunchedApps::appLaunched(const TQString& strApp)
{
// Inform other applications (like the quickstarter applet)
// that an application was started
- QByteArray params;
- QDataStream stream(params, IO_WriteOnly);
+ TQByteArray params;
+ TQDataStream stream(params, IO_WriteOnly);
stream << launchDCOPSignalSource() << strApp;
KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
- "serviceStartedByStorageId(QString,QString)", params);
+ "serviceStartedByStorageId(TQString,TQString)", params);
- for (QValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin();
+ for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin();
it != m_appInfos.end(); ++it)
{
if ((*it).getDesktopPath() == strApp)
@@ -131,13 +131,13 @@ void RecentlyLaunchedApps::appLaunched(const QString& strApp)
qHeapSort(m_appInfos);
}
-void RecentlyLaunchedApps::getRecentApps(QStringList& recentApps)
+void RecentlyLaunchedApps::getRecentApps(TQStringList& recentApps)
{
recentApps.clear();
int maximumNum = KickerSettings::numVisibleEntries();
int i = 0;
- for (QValueList<RecentlyLaunchedAppInfo>::const_iterator it =
+ for (TQValueList<RecentlyLaunchedAppInfo>::const_iterator it =
m_appInfos.constBegin();
it != m_appInfos.constEnd() && i < maximumNum;
++it, ++i)
@@ -146,9 +146,9 @@ void RecentlyLaunchedApps::getRecentApps(QStringList& recentApps)
}
}
-void RecentlyLaunchedApps::removeItem( const QString& strName )
+void RecentlyLaunchedApps::removeItem( const TQString& strName )
{
- for (QValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin();
+ for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin();
it != m_appInfos.end(); ++it)
{
if ((*it).getDesktopPath() == strName)
@@ -164,7 +164,7 @@ void RecentlyLaunchedApps::clearRecentApps()
m_appInfos.clear();
}
-QString RecentlyLaunchedApps::caption() const
+TQString RecentlyLaunchedApps::caption() const
{
return KickerSettings::recentVsOften() ?
i18n("Recently Used Applications") :
diff --git a/kicker/kicker/ui/recentapps.h b/kicker/kicker/ui/recentapps.h
index 0582cc166..4539d86a4 100644
--- a/kicker/kicker/ui/recentapps.h
+++ b/kicker/kicker/ui/recentapps.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __recentapps_h__
#define __recentapps_h__
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
class RecentlyLaunchedApps;
@@ -37,7 +37,7 @@ public:
m_lastLaunchTime = 0;
}
- RecentlyLaunchedAppInfo(const QString& desktopPath, int nLaunchCount, time_t lastLaunchTime)
+ RecentlyLaunchedAppInfo(const TQString& desktopPath, int nLaunchCount, time_t lastLaunchTime)
{
m_desktopPath = desktopPath;
m_launchCount = nLaunchCount;
@@ -59,7 +59,7 @@ public:
m_launchCount > rhs.m_launchCount;
}
- QString getDesktopPath() const { return m_desktopPath; }
+ TQString getDesktopPath() const { return m_desktopPath; }
int getLaunchCount() const { return m_launchCount; };
time_t getLastLaunchTime() const { return m_lastLaunchTime; };
void increaseLaunchCount() { m_launchCount++; };
@@ -67,7 +67,7 @@ public:
void setLastLaunchTime(time_t lastLaunch) { m_lastLaunchTime = lastLaunch; };
private:
- QString m_desktopPath;
+ TQString m_desktopPath;
int m_launchCount;
time_t m_lastLaunchTime;
};
@@ -80,19 +80,19 @@ public:
void configChanged();
void save();
void clearRecentApps();
- void appLaunched(const QString & strApp);
- void getRecentApps(QStringList & RecentApps);
- void removeItem(const QString &strName);
- QString caption() const;
+ void appLaunched(const TQString & strApp);
+ void getRecentApps(TQStringList & RecentApps);
+ void removeItem(const TQString &strName);
+ TQString caption() const;
int m_nNumMenuItems;
bool m_bNeedToUpdate;
private:
- QString launchDCOPSignalSource() { return "kmenu"; }
+ TQString launchDCOPSignalSource() { return "kmenu"; }
RecentlyLaunchedApps();
- QValueList<RecentlyLaunchedAppInfo> m_appInfos;
+ TQValueList<RecentlyLaunchedAppInfo> m_appInfos;
bool m_bInitialised;
};
diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp
index fce885f39..2e0543dae 100644
--- a/kicker/kicker/ui/removeapplet_mnu.cpp
+++ b/kicker/kicker/ui/removeapplet_mnu.cpp
@@ -33,12 +33,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "removeapplet_mnu.moc"
PanelRemoveAppletMenu::PanelRemoveAppletMenu(ContainerArea* cArea,
- QWidget *parent,
+ TQWidget *parent,
const char *name)
- : QPopupMenu(parent, name), m_containerArea(cArea)
+ : TQPopupMenu(parent, name), m_containerArea(cArea)
{
- connect(this, SIGNAL(activated(int)), SLOT(slotExec(int)));
- connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow()));
+ connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
+ connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
}
void PanelRemoveAppletMenu::slotAboutToShow()
@@ -49,7 +49,7 @@ void PanelRemoveAppletMenu::slotAboutToShow()
m_containers = m_containerArea->containers("Applet") +
m_containerArea->containers("Special Button");
- QValueList<PanelMenuItemInfo> items;
+ TQValueList<PanelMenuItemInfo> items;
for (BaseContainer::List::const_iterator it = m_containers.constBegin();
it != m_containers.constEnd();)
@@ -71,7 +71,7 @@ void PanelRemoveAppletMenu::slotAboutToShow()
qHeapSort(items);
- for (QValueList<PanelMenuItemInfo>::iterator it = items.begin();
+ for (TQValueList<PanelMenuItemInfo>::iterator it = items.begin();
it != items.end();
++it)
{
@@ -81,7 +81,7 @@ void PanelRemoveAppletMenu::slotAboutToShow()
if (m_containers.count() > 1)
{
insertSeparator();
- insertItem(i18n("All"), this, SLOT(slotRemoveAll()), 0, id);
+ insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id);
}
}
diff --git a/kicker/kicker/ui/removeapplet_mnu.h b/kicker/kicker/ui/removeapplet_mnu.h
index 455a93afd..b444b8540 100644
--- a/kicker/kicker/ui/removeapplet_mnu.h
+++ b/kicker/kicker/ui/removeapplet_mnu.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __removeapplet_mnu_h__
#define __removeapplet_mnu_h__
-#include <qptrlist.h>
-#include <qpopupmenu.h>
+#include <tqptrlist.h>
+#include <tqpopupmenu.h>
#include "appletinfo.h"
#include "container_base.h"
@@ -37,7 +37,7 @@ class PanelRemoveAppletMenu : public QPopupMenu
Q_OBJECT
public:
- PanelRemoveAppletMenu(ContainerArea* cArea, QWidget* parent = 0, const char* name = 0);
+ PanelRemoveAppletMenu(ContainerArea* cArea, TQWidget* parent = 0, const char* name = 0);
protected slots:
void slotExec( int id );
diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp
index 33dc48e14..8f02abd67 100644
--- a/kicker/kicker/ui/removebutton_mnu.cpp
+++ b/kicker/kicker/ui/removebutton_mnu.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qregexp.h>
+#include <tqregexp.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kglobal.h>
@@ -37,14 +37,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "removebutton_mnu.moc"
PanelRemoveButtonMenu::PanelRemoveButtonMenu( ContainerArea* cArea,
- QWidget *parent, const char *name )
- : QPopupMenu( parent, name ), containerArea( cArea )
+ TQWidget *parent, const char *name )
+ : TQPopupMenu( parent, name ), containerArea( cArea )
{
- connect(this, SIGNAL(activated(int)), SLOT(slotExec(int)));
- connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow()));
+ connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
+ connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
}
-void PanelRemoveButtonMenu::addToContainers(const QString& type)
+void PanelRemoveButtonMenu::addToContainers(const TQString& type)
{
BaseContainer::List list = containerArea->containers(type);
for (BaseContainer::Iterator it = list.begin();
@@ -70,7 +70,7 @@ void PanelRemoveButtonMenu::slotAboutToShow()
addToContainers("ExecButton");
int id = 0;
- QValueList<PanelMenuItemInfo> items;
+ TQValueList<PanelMenuItemInfo> items;
for (BaseContainer::Iterator it = containers.begin(); it != containers.end(); ++it)
{
items.append(PanelMenuItemInfo((*it)->icon(), (*it)->visibleName(), id));
@@ -79,7 +79,7 @@ void PanelRemoveButtonMenu::slotAboutToShow()
qHeapSort(items);
- for (QValueList<PanelMenuItemInfo>::iterator it = items.begin();
+ for (TQValueList<PanelMenuItemInfo>::iterator it = items.begin();
it != items.end();
++it)
{
@@ -89,7 +89,7 @@ void PanelRemoveButtonMenu::slotAboutToShow()
if (containers.count() > 1)
{
insertSeparator();
- insertItem(i18n("All"), this, SLOT(slotRemoveAll()), 0, id);
+ insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id);
}
}
diff --git a/kicker/kicker/ui/removebutton_mnu.h b/kicker/kicker/ui/removebutton_mnu.h
index 20d29c171..d326a2f62 100644
--- a/kicker/kicker/ui/removebutton_mnu.h
+++ b/kicker/kicker/ui/removebutton_mnu.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __removebutton_mnu_h__
#define __removebutton_mnu_h__
-#include <qptrlist.h>
-#include <qpopupmenu.h>
+#include <tqptrlist.h>
+#include <tqpopupmenu.h>
#include "appletinfo.h"
#include "container_base.h"
@@ -37,7 +37,7 @@ class PanelRemoveButtonMenu : public QPopupMenu
Q_OBJECT
public:
- PanelRemoveButtonMenu( ContainerArea *cArea, QWidget *parent=0, const char *name=0 );
+ PanelRemoveButtonMenu( ContainerArea *cArea, TQWidget *parent=0, const char *name=0 );
~PanelRemoveButtonMenu();
protected slots:
@@ -46,7 +46,7 @@ protected slots:
void slotRemoveAll();
private:
- void addToContainers(const QString& type);
+ void addToContainers(const TQString& type);
BaseContainer::List containers;
ContainerArea* containerArea;
diff --git a/kicker/kicker/ui/removecontainer_mnu.cpp b/kicker/kicker/ui/removecontainer_mnu.cpp
index ddce1f2df..9d6d19eaf 100644
--- a/kicker/kicker/ui/removecontainer_mnu.cpp
+++ b/kicker/kicker/ui/removecontainer_mnu.cpp
@@ -36,15 +36,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "containerarea.h"
RemoveContainerMenu::RemoveContainerMenu( ContainerArea* cArea,
- QWidget *parent, const char *name)
- : QPopupMenu( parent, name ), containerArea( cArea )
+ TQWidget *parent, const char *name)
+ : TQPopupMenu( parent, name ), containerArea( cArea )
{
appletId = insertItem(i18n("&Applet"),
new PanelRemoveAppletMenu(containerArea, this));
buttonId = insertItem(i18n("Appli&cation"),
new PanelRemoveButtonMenu( containerArea, this ) );
adjustSize();
- connect( this, SIGNAL( aboutToShow() ), SLOT( slotAboutToShow() ) );
+ connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) );
}
RemoveContainerMenu::~RemoveContainerMenu()
diff --git a/kicker/kicker/ui/removecontainer_mnu.h b/kicker/kicker/ui/removecontainer_mnu.h
index 9d7142671..6dd28dc30 100644
--- a/kicker/kicker/ui/removecontainer_mnu.h
+++ b/kicker/kicker/ui/removecontainer_mnu.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __removecontainer_mnu_h__
#define __removecontainer_mnu_h__
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
class ContainerArea;
@@ -33,7 +33,7 @@ class RemoveContainerMenu : public QPopupMenu
Q_OBJECT
public:
- RemoveContainerMenu(ContainerArea* cArea, QWidget *parent=0, const char *name=0);
+ RemoveContainerMenu(ContainerArea* cArea, TQWidget *parent=0, const char *name=0);
~RemoveContainerMenu();
protected slots:
diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp
index 7f7d09075..9d5d80d2b 100644
--- a/kicker/kicker/ui/removeextension_mnu.cpp
+++ b/kicker/kicker/ui/removeextension_mnu.cpp
@@ -34,11 +34,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
static const int REMOVEALLID = 1000;
-PanelRemoveExtensionMenu::PanelRemoveExtensionMenu( QWidget *parent, const char *name )
- : QPopupMenu( parent, name )
+PanelRemoveExtensionMenu::PanelRemoveExtensionMenu( TQWidget *parent, const char *name )
+ : TQPopupMenu( parent, name )
{
- connect(this, SIGNAL(activated(int)), SLOT(slotExec(int)));
- connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow()));
+ connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
+ connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
}
PanelRemoveExtensionMenu::PanelRemoveExtensionMenu()
@@ -51,13 +51,13 @@ void PanelRemoveExtensionMenu::slotAboutToShow()
clear();
m_containers = ExtensionManager::the()->containers();
- QValueList<PanelMenuItemInfo> items;
+ TQValueList<PanelMenuItemInfo> items;
ExtensionList::iterator itEnd = m_containers.end();
for (ExtensionList::iterator it = m_containers.begin(); it != itEnd; ++it)
{
const AppletInfo info = (*it)->info();
- QString name = info.name().replace("&", "&&");
+ TQString name = info.name().replace("&", "&&");
switch ((*it)->position())
{
case KPanelExtension::Top:
@@ -76,13 +76,13 @@ void PanelRemoveExtensionMenu::slotAboutToShow()
name = i18n("%1 (Floating)").arg(name);
break;
}
- items.append(PanelMenuItemInfo(QString::null, name, id));
+ items.append(PanelMenuItemInfo(TQString::null, name, id));
++id;
}
qHeapSort(items);
- QValueList<PanelMenuItemInfo>::iterator itEnd2 = items.end();
- for (QValueList<PanelMenuItemInfo>::iterator it = items.begin(); it != itEnd2; ++it)
+ TQValueList<PanelMenuItemInfo>::iterator itEnd2 = items.end();
+ for (TQValueList<PanelMenuItemInfo>::iterator it = items.begin(); it != itEnd2; ++it)
{
(*it).plug(this);
}
diff --git a/kicker/kicker/ui/removeextension_mnu.h b/kicker/kicker/ui/removeextension_mnu.h
index bc0e08b00..2fc83008a 100644
--- a/kicker/kicker/ui/removeextension_mnu.h
+++ b/kicker/kicker/ui/removeextension_mnu.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __removeextension_mnu_h__
#define __removeextension_mnu_h__
-#include <qptrlist.h>
-#include <qpopupmenu.h>
+#include <tqptrlist.h>
+#include <tqpopupmenu.h>
#include "container_extension.h"
@@ -34,7 +34,7 @@ class PanelRemoveExtensionMenu : public QPopupMenu
Q_OBJECT
public:
- PanelRemoveExtensionMenu( QWidget *parent=0, const char *name=0 );
+ PanelRemoveExtensionMenu( TQWidget *parent=0, const char *name=0 );
PanelRemoveExtensionMenu();
protected slots:
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index a59c14ce8..9b46b2396 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -22,10 +22,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
#include <typeinfo>
-#include <qcursor.h>
-#include <qbitmap.h>
-#include <qpixmap.h>
-#include <qimage.h>
+#include <tqcursor.h>
+#include <tqbitmap.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -55,8 +55,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "service_mnu.h"
#include "service_mnu.moc"
-PanelServiceMenu::PanelServiceMenu(const QString & label, const QString & relPath, QWidget * parent,
- const char * name, bool addmenumode, const QString & insertInlineHeader)
+PanelServiceMenu::PanelServiceMenu(const TQString & label, const TQString & relPath, TQWidget * parent,
+ const char * name, bool addmenumode, const TQString & insertInlineHeader)
: KPanelMenu(label, parent, name),
relPath_(relPath),
insertInlineHeader_( insertInlineHeader ),
@@ -66,9 +66,9 @@ PanelServiceMenu::PanelServiceMenu(const QString & label, const QString & relPat
{
excludeNoDisplay_=true;
- connect(KSycoca::self(), SIGNAL(databaseChanged()),
- SLOT(slotClearOnClose()));
- connect(this, SIGNAL(aboutToHide()), this, SLOT(slotClose()));
+ connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()),
+ TQT_SLOT(slotClearOnClose()));
+ connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClose()));
}
PanelServiceMenu::~PanelServiceMenu()
@@ -84,7 +84,7 @@ void PanelServiceMenu::setExcludeNoDisplay( bool flag )
void PanelServiceMenu::showMenu()
{
- activateParent(QString::null);
+ activateParent(TQString::null);
}
// the initialization is split in initialize() and
@@ -105,10 +105,10 @@ void PanelServiceMenu::initialize()
void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root,
KServiceGroup::List& _list,
- const QString& /* _relPath */,
+ const TQString& /* _relPath */,
int& id)
{
- QStringList suppressGenericNames = _root->suppressGenericNames();
+ TQStringList suppressGenericNames = _root->suppressGenericNames();
KServiceGroup::List::ConstIterator it = _list.begin();
bool separatorNeeded = false;
@@ -120,7 +120,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root,
{
KServiceGroup::Ptr g(static_cast<KServiceGroup *>(e));
- QString groupCaption = g->caption();
+ TQString groupCaption = g->caption();
// Avoid adding empty groups.
KServiceGroup::Ptr subMenuRoot = KServiceGroup::group(g->relPath());
@@ -131,7 +131,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root,
continue;
}
- QString inlineHeaderName = g->showInlineHeader() ? groupCaption : "";
+ TQString inlineHeaderName = g->showInlineHeader() ? groupCaption : "";
// Item names may contain ampersands. To avoid them being converted
// to accelerators, replace them with two ampersands.
groupCaption.replace("&", "&&");
@@ -192,7 +192,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root,
newSubMenu(g->name(), g->relPath(), this, g->name().utf8(), inlineHeaderName);
m->setCaption(groupCaption);
- QIconSet iconset = KickerLib::menuIconSet(g->icon());
+ TQIconSet iconset = KickerLib::menuIconSet(g->icon());
if (separatorNeeded)
{
@@ -248,7 +248,7 @@ void PanelServiceMenu::doInitialize()
// Set the startposition outside the panel, so there is no drag initiated
// when we use drag and click to select items. A drag is only initiated when
// you click to open the menu, and then press and drag an item.
- startPos_ = QPoint(-1,-1);
+ startPos_ = TQPoint(-1,-1);
// We ask KSycoca to give us all services (sorted).
KServiceGroup::Ptr root = KServiceGroup::group(relPath_);
@@ -272,7 +272,7 @@ void PanelServiceMenu::doInitialize()
if (relPath_ == "")
{
insertItem(KickerLib::menuIconSet("exec"), i18n("Add Non-KDE Application"),
- this, SLOT(addNonKDEApp()));
+ this, TQT_SLOT(addNonKDEApp()));
}
if (list.count() > 0) {
@@ -295,11 +295,11 @@ void PanelServiceMenu::configChanged()
void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId,
int nIndex/*= -1*/,
- const QStringList *suppressGenericNames /* = 0 */,
- const QString & aliasname)
+ const TQStringList *suppressGenericNames /* = 0 */,
+ const TQString & aliasname)
{
- QString serviceName = (aliasname.isEmpty() ? s->name() : aliasname).simplifyWhiteSpace();
- QString comment = s->genericName().simplifyWhiteSpace();
+ TQString serviceName = (aliasname.isEmpty() ? s->name() : aliasname).simplifyWhiteSpace();
+ TQString comment = s->genericName().simplifyWhiteSpace();
if (!comment.isEmpty())
{
@@ -351,7 +351,7 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId,
entryMap_.insert(newId, static_cast<KSycocaEntry*>(s));
}
-void PanelServiceMenu::activateParent(const QString &child)
+void PanelServiceMenu::activateParent(const TQString &child)
{
PanelServiceMenu *parentMenu = dynamic_cast<PanelServiceMenu*>(parent());
if (parentMenu)
@@ -389,7 +389,7 @@ void PanelServiceMenu::activateParent(const QString &child)
}
}
-bool PanelServiceMenu::highlightMenuItem( const QString &menuItemId )
+bool PanelServiceMenu::highlightMenuItem( const TQString &menuItemId )
{
initialize();
@@ -406,13 +406,13 @@ bool PanelServiceMenu::highlightMenuItem( const QString &menuItemId )
static_cast<KSycocaEntry*>(mapIt.data()));
if (s && (s->menuId() == menuItemId))
{
- activateParent(QString::null);
+ activateParent(TQString::null);
int index = indexOf(mapIt.key());
setActiveItem(index);
// Warp mouse pointer to location of active item
- QRect r = itemGeometry(index);
- QCursor::setPos(mapToGlobal(QPoint(r.x()+ r.width() - 15,
+ TQRect r = itemGeometry(index);
+ TQCursor::setPos(mapToGlobal(TQPoint(r.x()+ r.width() - 15,
r.y() + r.height() - 5)));
return true;
}
@@ -442,19 +442,19 @@ void PanelServiceMenu::slotExec(int id)
KService::Ptr service = static_cast<KService *>(e);
KApplication::startServiceByDesktopPath(service->desktopEntryPath(),
- QStringList(), 0, 0, 0, "", true);
+ TQStringList(), 0, 0, 0, "", true);
updateRecentlyUsedApps(service);
- startPos_ = QPoint(-1,-1);
+ startPos_ = TQPoint(-1,-1);
}
-void PanelServiceMenu::mousePressEvent(QMouseEvent * ev)
+void PanelServiceMenu::mousePressEvent(TQMouseEvent * ev)
{
startPos_ = ev->pos();
KPanelMenu::mousePressEvent(ev);
}
-void PanelServiceMenu::mouseReleaseEvent(QMouseEvent * ev)
+void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
{
if (ev->button() == RightButton && !Kicker::the()->isKioskImmutable())
{
@@ -475,7 +475,7 @@ void PanelServiceMenu::mouseReleaseEvent(QMouseEvent * ev)
delete popupMenu_;
popupMenu_ = new KPopupMenu(this);
- connect(popupMenu_, SIGNAL(activated(int)), SLOT(slotContextMenu(int)));
+ connect(popupMenu_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int)));
bool hasEntries = false;
switch (contextKSycocaEntry_->sycocaType())
@@ -552,8 +552,8 @@ void PanelServiceMenu::slotContextMenu(int selected)
KProcess *proc;
KService::Ptr service;
KServiceGroup::Ptr g;
- QByteArray ba;
- QDataStream ds(ba, IO_WriteOnly);
+ TQByteArray ba;
+ TQDataStream ds(ba, IO_WriteOnly);
KURL src,dest;
KIO::CopyJob *job;
@@ -572,29 +572,29 @@ void PanelServiceMenu::slotContextMenu(int selected)
break;
case AddItemToPanel: {
- QCString appname = "kicker";
+ TQCString appname = "kicker";
if ( kicker_screen_number )
appname.sprintf("kicker-screen-%d", kicker_screen_number);
service = static_cast<KService *>(contextKSycocaEntry_);
- kapp->dcopClient()->send(appname, "Panel", "addServiceButton(QString)", service->desktopEntryPath());
+ kapp->dcopClient()->send(appname, "Panel", "addServiceButton(TQString)", service->desktopEntryPath());
break;
}
case EditItem:
proc = new KProcess(this);
- *proc << KStandardDirs::findExe(QString::fromLatin1("kmenuedit"));
+ *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId();
proc->start();
break;
case PutIntoRunDialog: {
close();
- QCString appname = "kdesktop";
+ TQCString appname = "kdesktop";
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
service = static_cast<KService *>(contextKSycocaEntry_);
kapp->updateRemoteUserTimestamp( appname );
- kapp->dcopClient()->send(appname, "default", "popupExecuteCommand(QString)", service->exec());
+ kapp->dcopClient()->send(appname, "default", "popupExecuteCommand(TQString)", service->exec());
break;
}
@@ -614,19 +614,19 @@ void PanelServiceMenu::slotContextMenu(int selected)
break;
case AddMenuToPanel: {
- QCString appname = "kicker";
+ TQCString appname = "kicker";
if ( kicker_screen_number )
appname.sprintf("kicker-screen-%d", kicker_screen_number);
g = static_cast<KServiceGroup *>(contextKSycocaEntry_);
ds << "foo" << g->relPath();
- kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(QString,QString)", ba);
+ kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba);
break;
}
case EditMenu:
proc = new KProcess(this);
- *proc << KStandardDirs::findExe(QString::fromLatin1("kmenuedit"));
+ *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath();
proc->start();
break;
@@ -636,7 +636,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
}
}
-void PanelServiceMenu::mouseMoveEvent(QMouseEvent * ev)
+void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
{
KPanelMenu::mouseMoveEvent(ev);
@@ -646,8 +646,8 @@ void PanelServiceMenu::mouseMoveEvent(QMouseEvent * ev)
if ( (ev->state() & LeftButton ) != LeftButton )
return;
- QPoint p = ev->pos() - startPos_;
- if (p.manhattanLength() <= QApplication::startDragDistance() )
+ TQPoint p = ev->pos() - startPos_;
+ if (p.manhattanLength() <= TQApplication::startDragDistance() )
return;
int id = idAt(startPos_);
@@ -663,7 +663,7 @@ void PanelServiceMenu::mouseMoveEvent(QMouseEvent * ev)
KSycocaEntry * e = entryMap_[id];
- QPixmap icon;
+ TQPixmap icon;
KURL url;
switch (e->sycocaType()) {
@@ -671,7 +671,7 @@ void PanelServiceMenu::mouseMoveEvent(QMouseEvent * ev)
case KST_KService:
{
icon = static_cast<KService *>(e)->pixmap(KIcon::Small);
- QString filePath = static_cast<KService *>(e)->desktopEntryPath();
+ TQString filePath = static_cast<KService *>(e)->desktopEntryPath();
if (filePath[0] != '/')
{
filePath = locate("apps", filePath);
@@ -699,17 +699,17 @@ void PanelServiceMenu::mouseMoveEvent(QMouseEvent * ev)
// path from KStdDirs.
KURLDrag *d = new KURLDrag(KURL::List(url), this);
- connect(d, SIGNAL(destroyed()), this, SLOT(slotDragObjectDestroyed()));
+ connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed()));
d->setPixmap(icon);
d->dragCopy();
// Set the startposition outside the panel, so there is no drag initiated
// when we use drag and click to select items. A drag is only initiated when
// you click to open the menu, and then press and drag an item.
- startPos_ = QPoint(-1,-1);
+ startPos_ = TQPoint(-1,-1);
}
-void PanelServiceMenu::dragEnterEvent(QDragEnterEvent *event)
+void PanelServiceMenu::dragEnterEvent(TQDragEnterEvent *event)
{
// Set the DragObject's target to this widget. This is needed because the
// widget doesn't accept drops, but we want to determine if the drag object
@@ -722,10 +722,10 @@ void PanelServiceMenu::dragEnterEvent(QDragEnterEvent *event)
event->ignore();
}
-void PanelServiceMenu::dragLeaveEvent(QDragLeaveEvent *)
+void PanelServiceMenu::dragLeaveEvent(TQDragLeaveEvent *)
{
// see PanelServiceMenu::dragEnterEvent why this is nescessary
- if (!frameGeometry().contains(QCursor::pos()))
+ if (!frameGeometry().contains(TQCursor::pos()))
{
KURLDrag::setTarget(0);
}
@@ -742,12 +742,12 @@ void PanelServiceMenu::slotDragObjectDestroyed()
// the execution of any code after the original exec() statement
// though the panels themselves continue on otherwise normally
// (we just have some sort of nested event loop)
- QTimer::singleShot(0, this, SLOT(close()));
+ TQTimer::singleShot(0, this, TQT_SLOT(close()));
}
}
-PanelServiceMenu *PanelServiceMenu::newSubMenu(const QString & label, const QString & relPath,
- QWidget * parent, const char * name, const QString& _inlineHeader)
+PanelServiceMenu *PanelServiceMenu::newSubMenu(const TQString & label, const TQString & relPath,
+ TQWidget * parent, const char * name, const TQString& _inlineHeader)
{
return new PanelServiceMenu(label, relPath, parent, name, false,_inlineHeader);
}
@@ -783,7 +783,7 @@ void PanelServiceMenu::slotClear()
// QPopupMenu's aboutToHide() is emitted before the popup is really hidden,
// and also before a click in the menu is handled, so do the clearing
// only after that has been handled
- QTimer::singleShot(100, this, SLOT(slotClear()));
+ TQTimer::singleShot(100, this, TQT_SLOT(slotClear()));
return;
}
@@ -807,7 +807,7 @@ void PanelServiceMenu::selectFirstItem()
// updates "recent" section of KMenu
void PanelServiceMenu::updateRecentlyUsedApps(KService::Ptr &service)
{
- QString strItem(service->desktopEntryPath());
+ TQString strItem(service->desktopEntryPath());
// don't add an item from root kmenu level
if (!strItem.contains('/'))
diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h
index 9e28acd3f..3bc112348 100644
--- a/kicker/kicker/ui/service_mnu.h
+++ b/kicker/kicker/ui/service_mnu.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef SERVICE_MENU_H
#define SERVICE_MENU_H
-#include <qmap.h>
-#include <qvaluevector.h>
+#include <tqmap.h>
+#include <tqvaluevector.h>
#include <ksycocaentry.h>
#include <kservice.h>
@@ -41,32 +41,32 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* @author Rik Hemsley <rik@kde.org>
*/
-typedef QMap<int, KSycocaEntry::Ptr> EntryMap;
-typedef QValueVector<QPopupMenu*> PopupMenuList;
+typedef TQMap<int, KSycocaEntry::Ptr> EntryMap;
+typedef TQValueVector<TQPopupMenu*> PopupMenuList;
class KDE_EXPORT PanelServiceMenu : public KPanelMenu
{
Q_OBJECT
public:
- PanelServiceMenu(const QString & label, const QString & relPath,
- QWidget* parent = 0, const char* name = 0,
+ PanelServiceMenu(const TQString & label, const TQString & relPath,
+ TQWidget* parent = 0, const char* name = 0,
bool addmenumode = false,
- const QString &insertInlineHeader = QString::null);
+ const TQString &insertInlineHeader = TQString::null);
virtual ~PanelServiceMenu();
- QString relPath() { return relPath_; }
+ TQString relPath() { return relPath_; }
void setExcludeNoDisplay( bool flag );
virtual void showMenu();
- bool highlightMenuItem( const QString &menuId );
+ bool highlightMenuItem( const TQString &menuId );
void selectFirstItem();
private:
void fillMenu( KServiceGroup::Ptr &_root, KServiceGroup::List &_list,
- const QString &_relPath, int & id );
+ const TQString &_relPath, int & id );
protected slots:
virtual void initialize();
@@ -82,37 +82,37 @@ protected slots:
protected:
void insertMenuItem(KService::Ptr & s, int nId, int nIndex = -1,
- const QStringList *suppressGenericNames=0,
- const QString &aliasname = QString::null);
- virtual PanelServiceMenu * newSubMenu(const QString & label,
- const QString & relPath,
- QWidget * parent, const char * name,
- const QString & _inlineHeader =
- QString::null);
-
- virtual void mousePressEvent(QMouseEvent *);
- virtual void mouseReleaseEvent(QMouseEvent *);
- virtual void mouseMoveEvent(QMouseEvent *);
- virtual void dragEnterEvent(QDragEnterEvent *);
- virtual void dragLeaveEvent(QDragLeaveEvent *);
+ const TQStringList *suppressGenericNames=0,
+ const TQString &aliasname = TQString::null);
+ virtual PanelServiceMenu * newSubMenu(const TQString & label,
+ const TQString & relPath,
+ TQWidget * parent, const char * name,
+ const TQString & _inlineHeader =
+ TQString::null);
+
+ virtual void mousePressEvent(TQMouseEvent *);
+ virtual void mouseReleaseEvent(TQMouseEvent *);
+ virtual void mouseMoveEvent(TQMouseEvent *);
+ virtual void dragEnterEvent(TQDragEnterEvent *);
+ virtual void dragLeaveEvent(TQDragLeaveEvent *);
virtual void updateRecentlyUsedApps(KService::Ptr &s);
- void activateParent(const QString &child);
+ void activateParent(const TQString &child);
int serviceMenuStartId() { return 4242; }
int serviceMenuEndId() { return 5242; }
virtual void clearSubmenus();
void doInitialize();
- QString relPath_;
+ TQString relPath_;
EntryMap entryMap_;
bool loaded_;
bool excludeNoDisplay_;
- QString insertInlineHeader_;
- QPopupMenu * opPopup_;
+ TQString insertInlineHeader_;
+ TQPopupMenu * opPopup_;
bool clearOnClose_;
bool addmenumode_;
- QPoint startPos_;
+ TQPoint startPos_;
PopupMenuList subMenus;
private slots:
diff --git a/kicker/libkicker/appletinfo.cpp b/kicker/libkicker/appletinfo.cpp
index cfb626fac..b0d36ba61 100644
--- a/kicker/libkicker/appletinfo.cpp
+++ b/kicker/libkicker/appletinfo.cpp
@@ -21,18 +21,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qfileinfo.h>
+#include <tqfileinfo.h>
#include <kdesktopfile.h>
#include <kapplication.h>
#include "appletinfo.h"
-AppletInfo::AppletInfo( const QString& deskFile, const QString& configFile, const AppletInfo::AppletType type)
+AppletInfo::AppletInfo( const TQString& deskFile, const TQString& configFile, const AppletInfo::AppletType type)
: m_type (type),
m_unique(true),
m_hidden(false)
{
- QFileInfo fi(deskFile);
+ TQFileInfo fi(deskFile);
m_desktopFile = fi.fileName();
const char* resource = "applets";
@@ -98,15 +98,15 @@ bool AppletInfo::operator!=( const AppletInfo& rhs) const
bool AppletInfo::operator<( const AppletInfo& rhs ) const
{
- return ( QString::localeAwareCompare( name(), rhs.name() ) < 0 );
+ return ( TQString::localeAwareCompare( name(), rhs.name() ) < 0 );
}
bool AppletInfo::operator> ( const AppletInfo& rhs ) const
{
- return ( QString::localeAwareCompare( name(), rhs.name() ) > 0 );
+ return ( TQString::localeAwareCompare( name(), rhs.name() ) > 0 );
}
bool AppletInfo::operator<= ( const AppletInfo& rhs ) const
{
- return ( QString::localeAwareCompare( name(), rhs.name() ) <= 0 );
+ return ( TQString::localeAwareCompare( name(), rhs.name() ) <= 0 );
}
diff --git a/kicker/libkicker/appletinfo.h b/kicker/libkicker/appletinfo.h
index b9ab187ba..f89bb6aea 100644
--- a/kicker/libkicker/appletinfo.h
+++ b/kicker/libkicker/appletinfo.h
@@ -24,18 +24,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __appletinfo_h__
#define __appletinfo_h__
-#include <qmap.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qvaluevector.h>
+#include <tqmap.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqvaluevector.h>
#include <kdemacros.h>
class KDE_EXPORT AppletInfo
{
public:
- typedef QValueVector<AppletInfo> List;
- typedef QMap<QObject*, AppletInfo*> Dict;
+ typedef TQValueVector<AppletInfo> List;
+ typedef TQMap<TQObject*, AppletInfo*> Dict;
enum AppletType { Undefined = 0,
Applet = 1,
@@ -44,24 +44,24 @@ class KDE_EXPORT AppletInfo
Extension = 8,
Button = BuiltinButton | SpecialButton };
- AppletInfo(const QString& desktopFile = QString::null,
- const QString& configFile = QString::null,
+ AppletInfo(const TQString& desktopFile = TQString::null,
+ const TQString& configFile = TQString::null,
const AppletType type = Undefined);
- QString name() const { return m_name; }
- QString comment() const { return m_comment; }
- QString icon() const { return m_icon; }
+ TQString name() const { return m_name; }
+ TQString comment() const { return m_comment; }
+ TQString icon() const { return m_icon; }
AppletType type() const { return m_type; }
- QString library() const { return m_lib; }
- QString desktopFile() const { return m_desktopFile; }
- QString configFile() const { return m_configFile; }
+ TQString library() const { return m_lib; }
+ TQString desktopFile() const { return m_desktopFile; }
+ TQString configFile() const { return m_configFile; }
bool isUniqueApplet() const { return m_unique; }
bool isHidden() const { return m_hidden; }
- void setConfigFile(QString cf) { m_configFile = cf; }
+ void setConfigFile(TQString cf) { m_configFile = cf; }
bool operator<(const AppletInfo& rhs) const;
bool operator>(const AppletInfo& rhs) const;
@@ -71,19 +71,19 @@ class KDE_EXPORT AppletInfo
void setType(AppletType type) { m_type = type; }
protected:
- void setName(QString name) { m_name = name; }
- void setComment(QString comment) { m_comment = comment; }
- void setIcon(QString icon) { m_icon = icon; }
- void setLibrary(QString lib) { m_lib = lib; }
+ void setName(TQString name) { m_name = name; }
+ void setComment(TQString comment) { m_comment = comment; }
+ void setIcon(TQString icon) { m_icon = icon; }
+ void setLibrary(TQString lib) { m_lib = lib; }
void setIsUnique(bool u) { m_unique = u; }
private:
- QString m_name;
- QString m_comment;
- QString m_icon;
- QString m_lib;
- QString m_desktopFile;
- QString m_configFile;
+ TQString m_name;
+ TQString m_comment;
+ TQString m_icon;
+ TQString m_lib;
+ TQString m_desktopFile;
+ TQString m_configFile;
AppletType m_type;
bool m_unique;
bool m_hidden;
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index a0915bcd1..1e9025e5a 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -21,12 +21,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qapplication.h>
-#include <qbitmap.h>
-#include <qfile.h>
-#include <qpopupmenu.h>
-#include <qregexp.h>
-#include <qpainter.h>
+#include <tqapplication.h>
+#include <tqbitmap.h>
+#include <tqfile.h>
+#include <tqpopupmenu.h>
+#include <tqregexp.h>
+#include <tqpainter.h>
#include <kiconeffect.h>
#include <kiconloader.h>
@@ -161,53 +161,53 @@ int maxButtonDim()
int maxDim;
//return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge;
- KSimpleConfig *kickerconfig = new KSimpleConfig( QString::fromLatin1( "kickerrc" ));
+ KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
kickerconfig->setGroup("General");
maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);;
delete kickerconfig;
return maxDim;
}
-QString newDesktopFile(const KURL& url)
+TQString newDesktopFile(const KURL& url)
{
- QString base = url.fileName();
+ TQString base = url.fileName();
if (base.endsWith(".desktop"))
base.truncate(base.length()-8);
- QRegExp r("(.*)(?=-\\d+)");
+ TQRegExp r("(.*)(?=-\\d+)");
if (r.search(base) > -1)
base = r.cap(1);
- QString file = base + ".desktop";
+ TQString file = base + ".desktop";
for(int n = 1; ++n; )
{
- QString path = locate("appdata", file);
+ TQString path = locate("appdata", file);
if (path.isEmpty())
break;
- file = QString("%2-%1.desktop").arg(n).arg(base);
+ file = TQString("%2-%1.desktop").arg(n).arg(base);
}
file = locateLocal("appdata", file);
return file;
}
-QString copyDesktopFile(const KURL& url)
+TQString copyDesktopFile(const KURL& url)
{
- QString file = newDesktopFile(url);
+ TQString file = newDesktopFile(url);
KURL dest;
dest.setPath(file);
KIO::NetAccess::upload(url.path(), dest, 0);
return file;
}
-QPopupMenu* reduceMenu(QPopupMenu *menu)
+TQPopupMenu* reduceMenu(TQPopupMenu *menu)
{
if (menu->count() != 1)
{
return menu;
}
- QMenuItem *item = menu->findItem(menu->idAt(0));
+ TQMenuItem *item = menu->findItem(menu->idAt(0));
if (item->popup())
{
@@ -217,20 +217,20 @@ QPopupMenu* reduceMenu(QPopupMenu *menu)
return menu;
}
-QPoint popupPosition(KPanelApplet::Direction d,
- const QWidget* popup,
- const QWidget* source,
- const QPoint& offset)
+TQPoint popupPosition(KPanelApplet::Direction d,
+ const TQWidget* popup,
+ const TQWidget* source,
+ const TQPoint& offset)
{
- QRect r;
+ TQRect r;
if (source->isTopLevel())
{
r = source->geometry();
}
else
{
- r = QRect(source->mapToGlobal(QPoint(0, 0)),
- source->mapToGlobal(QPoint(source->width(), source->height())));
+ r = TQRect(source->mapToGlobal(TQPoint(0, 0)),
+ source->mapToGlobal(TQPoint(source->width(), source->height())));
switch (d)
{
@@ -252,8 +252,8 @@ QPoint popupPosition(KPanelApplet::Direction d,
case KPanelApplet::Left:
case KPanelApplet::Right:
{
- QDesktopWidget* desktop = QApplication::desktop();
- QRect screen = desktop->screenGeometry(desktop->screenNumber(const_cast<QWidget*>(source)));
+ TQDesktopWidget* desktop = TQApplication::desktop();
+ TQRect screen = desktop->screenGeometry(desktop->screenNumber(const_cast<TQWidget*>(source)));
int x = (d == KPanelApplet::Left) ? r.left() - popup->width() :
r.right() + 1;
int y = r.top() + offset.y();
@@ -274,7 +274,7 @@ QPoint popupPosition(KPanelApplet::Direction d,
}
}
- return QPoint(x, y);
+ return TQPoint(x, y);
}
case KPanelApplet::Up:
case KPanelApplet::Down:
@@ -284,7 +284,7 @@ QPoint popupPosition(KPanelApplet::Direction d,
int y = (d == KPanelApplet::Up) ? r.top() - popup->height() :
r.bottom() + 1;
- if (QApplication::reverseLayout())
+ if (TQApplication::reverseLayout())
{
x = r.right() - popup->width() + 1;
@@ -299,12 +299,12 @@ QPoint popupPosition(KPanelApplet::Direction d,
x = r.left();
}
- return QPoint(x, y);
+ return TQPoint(x, y);
}
else
{
- QDesktopWidget* desktop = QApplication::desktop();
- QRect screen = desktop->screenGeometry(desktop->screenNumber(const_cast<QWidget*>(source)));
+ TQDesktopWidget* desktop = TQApplication::desktop();
+ TQRect screen = desktop->screenGeometry(desktop->screenNumber(const_cast<TQWidget*>(source)));
x = r.left() + offset.x();
// try to keep this on the screen
@@ -319,24 +319,24 @@ QPoint popupPosition(KPanelApplet::Direction d,
}
}
- return QPoint(x, y);
+ return TQPoint(x, y);
}
}
}
-void colorize(QImage& image)
+void colorize(TQImage& image)
{
KConfig *config = KGlobal::config();
config->setGroup("WM");
- QColor color = QApplication::palette().active().highlight();
- QColor activeTitle = config->readColorEntry("activeBackground", &color);
- QColor inactiveTitle = config->readColorEntry("inactiveBackground", &color);
+ TQColor color = TQApplication::palette().active().highlight();
+ TQColor activeTitle = config->readColorEntry("activeBackground", &color);
+ TQColor inactiveTitle = config->readColorEntry("inactiveBackground", &color);
// figure out which color is most suitable for recoloring to
int h1, s1, v1, h2, s2, v2, h3, s3, v3;
activeTitle.hsv(&h1, &s1, &v1);
inactiveTitle.hsv(&h2, &s2, &v2);
- QApplication::palette().active().background().hsv(&h3, &s3, &v3);
+ TQApplication::palette().active().background().hsv(&h3, &s3, &v3);
if ( (kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < kAbs(h2-h3)+kAbs(s2-s3)+kAbs(v2-v3)) &&
((kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < 32) || (s1 < 32)) && (s2 > s1))
@@ -361,7 +361,7 @@ void colorize(QImage& image)
KIconEffect::colorize(image, color, 1.0);
}
-QColor blendColors(const QColor& c1, const QColor& c2)
+TQColor blendColors(const TQColor& c1, const TQColor& c2)
{
int r1, g1, b1;
int r2, g2, b2;
@@ -373,10 +373,10 @@ QColor blendColors(const QColor& c1, const QColor& c2)
g1 += (int) (.5 * (g2 - g1));
b1 += (int) (.5 * (b2 - b1));
- return QColor(r1, g1, b1);
+ return TQColor(r1, g1, b1);
}
-QColor shadowColor(const QColor& c)
+TQColor shadowColor(const TQColor& c)
{
int r = c.red();
int g = c.green();
@@ -397,12 +397,12 @@ QColor shadowColor(const QColor& c)
else
b = 0;
- return QColor( r, g, b );
+ return TQColor( r, g, b );
}
-QIconSet menuIconSet(const QString& icon)
+TQIconSet menuIconSet(const TQString& icon)
{
- QIconSet iconset;
+ TQIconSet iconset;
int iconSize = KickerSettings::menuEntryHeight();
if (iconSize < 0)
@@ -420,14 +420,14 @@ QIconSet menuIconSet(const QString& icon)
}
else if (iconSize == 0)
{
- QPixmap normal = KGlobal::iconLoader()->loadIcon(icon,
+ TQPixmap normal = KGlobal::iconLoader()->loadIcon(icon,
KIcon::Small,
0,
KIcon::DefaultState,
0,
true);
- QPixmap active = KGlobal::iconLoader()->loadIcon(icon,
+ TQPixmap active = KGlobal::iconLoader()->loadIcon(icon,
KIcon::Small,
0,
KIcon::ActiveState,
@@ -445,31 +445,31 @@ QIconSet menuIconSet(const QString& icon)
active.convertFromImage(active.convertToImage().smoothScale(20,20));
}
- iconset.setPixmap(normal, QIconSet::Small, QIconSet::Normal);
- iconset.setPixmap(active, QIconSet::Small, QIconSet::Active);
+ iconset.setPixmap(normal, TQIconSet::Small, TQIconSet::Normal);
+ iconset.setPixmap(active, TQIconSet::Small, TQIconSet::Active);
}
}
if (iconset.isNull())
{
- QPixmap pix(iconSize, iconSize);
- QBitmap map(iconSize, iconSize, true);
+ TQPixmap pix(iconSize, iconSize);
+ TQBitmap map(iconSize, iconSize, true);
pix.setMask(map);
- iconset = QIconSet(pix, pix);
+ iconset = TQIconSet(pix, pix);
}
return iconset;
}
-void drawBlendedRect(QPainter *p, const QRect &r, const QColor &color, int alpha)
+void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color, int alpha)
{
- static QPixmap pix;
- static QColor last_color = Qt::black;
+ static TQPixmap pix;
+ static TQColor last_color = Qt::black;
static int last_alpha = 0;
if (pix.isNull() || last_color != color || last_alpha != alpha)
{
- QImage img(16, 16, 32);
+ TQImage img(16, 16, 32);
img.setAlphaBuffer(false);
img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF));
img.setAlphaBuffer(true);
diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h
index 2b9449584..0a4677914 100644
--- a/kicker/libkicker/global.h
+++ b/kicker/libkicker/global.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __pglobal_h__
#define __pglobal_h__
-#include <qiconset.h>
-#include <qmap.h>
+#include <tqiconset.h>
+#include <tqmap.h>
#include <kpanelapplet.h>
#include <kpanelextension.h>
@@ -52,23 +52,23 @@ KDE_EXPORT int maxButtonDim();
* Tint the image to reflect the current color scheme
* Used, for instance, by KMenu side bar
*/
-KDE_EXPORT void colorize(QImage& image);
+KDE_EXPORT void colorize(TQImage& image);
/**
* Blend a color rectangle on a painter
*/
-KDE_EXPORT void drawBlendedRect(QPainter *p, const QRect &r, const QColor &color = Qt::black, int alpha = 0x40);
+KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = Qt::black, int alpha = 0x40);
/**
* Blend two colours together to get a colour halfway in between
*/
-KDE_EXPORT QColor blendColors(const QColor& c1, const QColor& c2);
+KDE_EXPORT TQColor blendColors(const TQColor& c1, const TQColor& c2);
/**
* Create or copy .desktop files for use in kicker safely and easily
*/
-KDE_EXPORT QString copyDesktopFile(const KURL&url);
-KDE_EXPORT QString newDesktopFile(const KURL&url);
+KDE_EXPORT TQString copyDesktopFile(const KURL&url);
+KDE_EXPORT TQString newDesktopFile(const KURL&url);
/**
@@ -80,7 +80,7 @@ KDE_EXPORT QString newDesktopFile(const KURL&url);
* This function checks whether that is the case and returns either the
* original menu or the sub-menu when appropriate.
*/
-KDE_EXPORT QPopupMenu *reduceMenu(QPopupMenu *);
+KDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *);
/**
@@ -88,16 +88,16 @@ KDE_EXPORT QPopupMenu *reduceMenu(QPopupMenu *);
* direction, the size of the menu, the widget geometry, and a optional
* point in the local coordinates of the widget.
*/
-KDE_EXPORT QPoint popupPosition(KPanelApplet::Direction d,
- const QWidget* popup,
- const QWidget* source,
- const QPoint& offset = QPoint(0, 0));
+KDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d,
+ const TQWidget* popup,
+ const TQWidget* source,
+ const TQPoint& offset = TQPoint(0, 0));
/**
* Calculate an acceptable inverse of the given color wich will be used
* as the shadow color.
*/
-KDE_EXPORT QColor shadowColor(const QColor& c);
+KDE_EXPORT TQColor shadowColor(const TQColor& c);
/**
* Get an appropriate for a menu in Plasma. As the user may set this size
@@ -105,7 +105,7 @@ KDE_EXPORT QColor shadowColor(const QColor& c);
* @param icon the name of icon requested
* @return the icon set for the requested icon
*/
-KDE_EXPORT QIconSet menuIconSet(const QString& icon);
+KDE_EXPORT TQIconSet menuIconSet(const TQString& icon);
}
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index 403641443..34cf65c56 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -23,11 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qapplication.h>
-#include <qpainter.h>
-#include <qsimplerichtext.h>
-#include <qtimer.h>
-#include <qtooltip.h>
+#include <tqapplication.h>
+#include <tqpainter.h>
+#include <tqsimplerichtext.h>
+#include <tqtimer.h>
+#include <tqtooltip.h>
#include <kdialog.h>
@@ -46,7 +46,7 @@ int KickerTip::m_tippingEnabled = 1;
void KickerTip::Client::updateKickerTip() const
{
- if (KickerTip::the()->isTippingFor(dynamic_cast<const QWidget*>(this)) &&
+ if (KickerTip::the()->isTippingFor(dynamic_cast<const TQWidget*>(this)) &&
KickerTip::the()->isVisible())
{
KickerTip::the()->display();
@@ -63,8 +63,8 @@ KickerTip* KickerTip::the()
return m_self;
}
-KickerTip::KickerTip(QWidget * parent)
- : QWidget(parent, "animtt",WX11BypassWM),
+KickerTip::KickerTip(TQWidget * parent)
+ : TQWidget(parent, "animtt",WX11BypassWM),
m_richText(0),
m_mimeFactory(0),
m_dissolveSize(0),
@@ -78,7 +78,7 @@ KickerTip::KickerTip(QWidget * parent)
setBackgroundMode(NoBackground);
resize(0, 0);
hide();
- connect(&m_frameTimer, SIGNAL(timeout()), SLOT(internalUpdate()));
+ connect(&m_frameTimer, TQT_SIGNAL(timeout()), TQT_SLOT(internalUpdate()));
}
KickerTip::~KickerTip()
@@ -104,7 +104,7 @@ void KickerTip::display()
}
}
- QWidget *widget = const_cast<QWidget*>(m_tippingFor);
+ TQWidget *widget = const_cast<TQWidget*>(m_tippingFor);
KickerTip::Client *client = dynamic_cast<KickerTip::Client*>(widget);
if (!client)
@@ -116,7 +116,7 @@ void KickerTip::display()
// richtext area are freed but the mimefactory is ready to be added to in
// the call to updateKickerTip
delete m_mimeFactory;
- m_mimeFactory = new QMimeSourceFactory();
+ m_mimeFactory = new TQMimeSourceFactory();
// Declare interchange object and define defaults.
Data data;
@@ -136,8 +136,8 @@ void KickerTip::display()
}
delete m_richText;
- m_richText = new QSimpleRichText("<qt><h3>" + data.message + "</h3><p>" +
- data.subtext + "</p></qt>", font(), QString::null, 0,
+ m_richText = new TQSimpleRichText("<qt><h3>" + data.message + "</h3><p>" +
+ data.subtext + "</p></qt>", font(), TQString::null, 0,
m_mimeFactory);
m_richText->setWidth(640);
m_direction = data.direction;
@@ -148,7 +148,7 @@ void KickerTip::display()
}
else if (KickerSettings::mouseOversShowText())
{
- m_icon = QPixmap();
+ m_icon = TQPixmap();
}
else
{
@@ -167,8 +167,8 @@ void KickerTip::display()
// close the message window after given mS
if (data.duration > 0)
{
- disconnect(&m_timer, SIGNAL(timeout()), 0, 0);
- connect(&m_timer, SIGNAL(timeout()), SLOT(hide()));
+ disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0);
+ connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide()));
m_timer.start(data.duration, true);
}
else
@@ -180,7 +180,7 @@ void KickerTip::display()
show();
}
-void KickerTip::paintEvent(QPaintEvent * e)
+void KickerTip::paintEvent(TQPaintEvent * e)
{
if (m_dirty)
{
@@ -188,23 +188,23 @@ void KickerTip::paintEvent(QPaintEvent * e)
m_dirty = false;
}
- QPainter p(this);
+ TQPainter p(this);
p.drawPixmap(e->rect().topLeft(), m_pixmap, e->rect());
}
-void KickerTip::mousePressEvent(QMouseEvent * /*e*/)
+void KickerTip::mousePressEvent(TQMouseEvent * /*e*/)
{
- QToolTip::setGloballyEnabled(m_toolTipsEnabled);
+ TQToolTip::setGloballyEnabled(m_toolTipsEnabled);
hide();
}
-static void drawRoundRect(QPainter &p, const QRect &r)
+static void drawRoundRect(TQPainter &p, const TQRect &r)
{
static int line[8] = { 1, 3, 4, 5, 6, 7, 7, 8 };
static int border[8] = { 1, 2, 1, 1, 1, 1, 1, 1 };
int xl, xr, y1, y2;
- QPen pen = p.pen();
- bool drawBorder = pen.style() != QPen::NoPen;
+ TQPen pen = p.pen();
+ bool drawBorder = pen.style() != TQPen::NoPen;
if (r.width() < 16 || r.height() < 16)
{
@@ -272,7 +272,7 @@ static void drawRoundRect(QPainter &p, const QRect &r)
void KickerTip::plainMask()
{
- QPainter maskPainter(&m_mask);
+ TQPainter maskPainter(&m_mask);
m_mask.fill(Qt::black);
@@ -286,7 +286,7 @@ void KickerTip::plainMask()
void KickerTip::dissolveMask()
{
- QPainter maskPainter(&m_mask);
+ TQPainter maskPainter(&m_mask);
m_mask.fill(Qt::black);
@@ -339,7 +339,7 @@ void KickerTip::displayInternal()
}
// determine text rectangle
- QRect textRect(0, 0, 0, 0);
+ TQRect textRect(0, 0, 0, 0);
if (KickerSettings::mouseOversShowText())
{
textRect.setWidth(m_richText->widthUsed());
@@ -382,11 +382,11 @@ void KickerTip::displayInternal()
}
// draw background
- QPainter bufferPainter(&m_pixmap);
+ TQPainter bufferPainter(&m_pixmap);
bufferPainter.setPen(colorGroup().foreground());
bufferPainter.setBrush(colorGroup().background());
//bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height);
- drawRoundRect(bufferPainter, QRect(0, 0, width, height));
+ drawRoundRect(bufferPainter, TQRect(0, 0, width, height));
// draw icon if present
if (!m_icon.isNull())
@@ -400,10 +400,10 @@ void KickerTip::displayInternal()
if (KickerSettings::mouseOversShowText())
{
// draw text shadow
- QColorGroup cg = colorGroup();
- cg.setColor(QColorGroup::Text, cg.background().dark(115));
- int shadowOffset = QApplication::reverseLayout() ? -1 : 1;
- m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, QRect(), cg);
+ TQColorGroup cg = colorGroup();
+ cg.setColor(TQColorGroup::Text, cg.background().dark(115));
+ int shadowOffset = TQApplication::reverseLayout() ? -1 : 1;
+ m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, TQRect(), cg);
// draw text
cg = colorGroup();
@@ -411,39 +411,39 @@ void KickerTip::displayInternal()
}
}
-void KickerTip::tipFor(const QWidget* w)
+void KickerTip::tipFor(const TQWidget* w)
{
if (m_tippingFor)
{
- disconnect(m_tippingFor, SIGNAL(destroyed(QObject*)),
- this, SLOT(tipperDestroyed(QObject*)));
+ disconnect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)),
+ this, TQT_SLOT(tipperDestroyed(TQObject*)));
}
m_tippingFor = w;
if (m_tippingFor)
{
- connect(m_tippingFor, SIGNAL(destroyed(QObject*)),
- this, SLOT(tipperDestroyed(QObject*)));
+ connect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)),
+ this, TQT_SLOT(tipperDestroyed(TQObject*)));
}
}
-void KickerTip::untipFor(const QWidget* w)
+void KickerTip::untipFor(const TQWidget* w)
{
if (isTippingFor(w))
hide();
}
-bool KickerTip::isTippingFor(const QWidget* w) const
+bool KickerTip::isTippingFor(const TQWidget* w) const
{
return m_tippingFor == w;
}
-void KickerTip::tipperDestroyed(QObject* o)
+void KickerTip::tipperDestroyed(TQObject* o)
{
// we can't do a dynamic cast because we are in the process of dieing
// so static it is.
- untipFor(static_cast<QWidget*>(o));
+ untipFor(static_cast<TQWidget*>(o));
}
void KickerTip::internalUpdate()
@@ -479,10 +479,10 @@ void KickerTip::hide()
tipFor(0);
m_timer.stop();
m_frameTimer.stop();
- QWidget::hide();
+ TQWidget::hide();
}
-bool KickerTip::eventFilter(QObject *object, QEvent *event)
+bool KickerTip::eventFilter(TQObject *object, TQEvent *event)
{
if (!tippingEnabled())
{
@@ -494,11 +494,11 @@ bool KickerTip::eventFilter(QObject *object, QEvent *event)
return false;
}
- QWidget *widget = static_cast<QWidget*>(object);
+ TQWidget *widget = static_cast<TQWidget*>(object);
switch (event->type())
{
- case QEvent::Enter:
+ case TQEvent::Enter:
if (!KickerSettings::showMouseOverEffects())
{
return false;
@@ -508,13 +508,13 @@ bool KickerTip::eventFilter(QObject *object, QEvent *event)
!qApp->activePopupWidget() &&
!isTippingFor(widget))
{
- m_toolTipsEnabled = QToolTip::isGloballyEnabled();
- QToolTip::setGloballyEnabled(false);
+ m_toolTipsEnabled = TQToolTip::isGloballyEnabled();
+ TQToolTip::setGloballyEnabled(false);
tipFor(widget);
m_timer.stop();
- disconnect(&m_timer, SIGNAL(timeout()), 0, 0);
- connect(&m_timer, SIGNAL(timeout()), SLOT(display()));
+ disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0);
+ connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(display()));
// delay to avoid false starts
// e.g. when the user quickly zooms their mouse over
@@ -529,22 +529,22 @@ bool KickerTip::eventFilter(QObject *object, QEvent *event)
}
}
break;
- case QEvent::Leave:
- QToolTip::setGloballyEnabled(m_toolTipsEnabled);
+ case TQEvent::Leave:
+ TQToolTip::setGloballyEnabled(m_toolTipsEnabled);
m_timer.stop();
if (isTippingFor(widget) && isVisible())
{
- disconnect(&m_timer, SIGNAL(timeout()), 0, 0);
- connect(&m_timer, SIGNAL(timeout()), SLOT(hide()));
+ disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0);
+ connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide()));
m_timer.start(KickerSettings::mouseOversHideDelay(), true);
}
tipFor(0);
break;
- case QEvent::MouseButtonPress:
- QToolTip::setGloballyEnabled(m_toolTipsEnabled);
+ case TQEvent::MouseButtonPress:
+ TQToolTip::setGloballyEnabled(m_toolTipsEnabled);
hide();
default:
break;
diff --git a/kicker/libkicker/kickertip.h b/kicker/libkicker/kickertip.h
index 7211012fb..e51fae4ac 100644
--- a/kicker/libkicker/kickertip.h
+++ b/kicker/libkicker/kickertip.h
@@ -26,10 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef KICKER_TIP_H
#define KICKER_TIP_H
-#include <qbitmap.h>
-#include <qpixmap.h>
-#include <qtimer.h>
-#include <qwidget.h>
+#include <tqbitmap.h>
+#include <tqpixmap.h>
+#include <tqtimer.h>
+#include <tqwidget.h>
#include <kpanelapplet.h>
@@ -47,15 +47,15 @@ public:
struct Data
{
- QString message;
- QString subtext;
- QPixmap icon;
+ TQString message;
+ TQString subtext;
+ TQPixmap icon;
KickerTip::MaskEffect maskEffect;
int duration;
KPanelApplet::Direction direction;
// do NOT delete this in the client!
- QMimeSourceFactory* mimeFactory;
+ TQMimeSourceFactory* mimeFactory;
};
class KDE_EXPORT Client
@@ -69,15 +69,15 @@ public:
static void enableTipping(bool tip);
static bool tippingEnabled();
- void untipFor(const QWidget* w);
- bool eventFilter(QObject *o, QEvent *e);
+ void untipFor(const TQWidget* w);
+ bool eventFilter(TQObject *o, TQEvent *e);
protected:
- KickerTip(QWidget * parent);
+ KickerTip(TQWidget * parent);
~KickerTip();
- void paintEvent(QPaintEvent * e);
- void mousePressEvent(QMouseEvent * e);
+ void paintEvent(TQPaintEvent * e);
+ void mousePressEvent(TQMouseEvent * e);
void plainMask();
void dissolveMask();
@@ -85,32 +85,32 @@ protected:
void displayInternal();
void hide();
- void tipFor(const QWidget* w);
- bool isTippingFor(const QWidget* w) const;
+ void tipFor(const TQWidget* w);
+ bool isTippingFor(const TQWidget* w) const;
protected slots:
- void tipperDestroyed(QObject* o);
+ void tipperDestroyed(TQObject* o);
void internalUpdate();
void display();
private:
- QBitmap m_mask;
- QPixmap m_pixmap;
- QPixmap m_icon;
+ TQBitmap m_mask;
+ TQPixmap m_pixmap;
+ TQPixmap m_icon;
MaskEffect m_maskEffect;
- QSimpleRichText* m_richText;
- QMimeSourceFactory* m_mimeFactory;
+ TQSimpleRichText* m_richText;
+ TQMimeSourceFactory* m_mimeFactory;
int m_dissolveSize;
int m_dissolveDelta;
KPanelApplet::Direction m_direction;
- QTimer m_timer;
- QTimer m_frameTimer;
+ TQTimer m_timer;
+ TQTimer m_frameTimer;
bool m_dirty;
bool m_toolTipsEnabled;
- const QWidget* m_tippingFor;
+ const TQWidget* m_tippingFor;
static KickerTip* m_self;
static int m_tippingEnabled;
diff --git a/kicker/libkicker/kshadowengine.cpp b/kicker/libkicker/kshadowengine.cpp
index 32008883e..19ccc669d 100644
--- a/kicker/libkicker/kshadowengine.cpp
+++ b/kicker/libkicker/kshadowengine.cpp
@@ -21,10 +21,10 @@
* Boston, MA 02110-1301, USA.
*/
-#include <qcolor.h>
-#include <qpainter.h>
-#include <qbitmap.h>
-#include <qpixmap.h>
+#include <tqcolor.h>
+#include <tqpainter.h>
+#include <tqbitmap.h>
+#include <tqpixmap.h>
#include "kshadowsettings.h"
#include "kshadowengine.h"
@@ -58,9 +58,9 @@ KShadowSettings *KShadowEngine::shadowSettings()
return m_shadowSettings;
}
-QImage KShadowEngine::makeShadow(const QPixmap& textPixmap, const QColor &bgColor)
+TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgColor)
{
- QImage result;
+ TQImage result;
// create a new image for for the shaddow
int w = textPixmap.width();
@@ -78,7 +78,7 @@ QImage KShadowEngine::makeShadow(const QPixmap& textPixmap, const QColor &bgColo
/*
* This is the source pixmap
*/
- QImage img = textPixmap.convertToImage().convertDepth(32);
+ TQImage img = textPixmap.convertToImage().convertDepth(32);
/*
* Resize the image if necessary
@@ -125,7 +125,7 @@ QImage KShadowEngine::makeShadow(const QPixmap& textPixmap, const QColor &bgColo
// Multiplication factor for pixels diagonal to the text
#define DIAGONAL_FACTOR 1.0
-double KShadowEngine::defaultDecay(QImage& source, int i, int j)
+double KShadowEngine::defaultDecay(TQImage& source, int i, int j)
{
if ((i < 1) || (j < 1) || (i > source.width() - 2) || (j > source.height() - 2))
return 0;
@@ -144,19 +144,19 @@ double KShadowEngine::defaultDecay(QImage& source, int i, int j)
return alphaShadow;
}
-double KShadowEngine::doubleLinearDecay(QImage& source, int i, int j)
+double KShadowEngine::doubleLinearDecay(TQImage& source, int i, int j)
{
//printf("img: %p, %d %d\n", (char *) &source, i, j);
return defaultDecay( source, i, j ); // for now
}
-double KShadowEngine::radialDecay(QImage& source, int i, int j)
+double KShadowEngine::radialDecay(TQImage& source, int i, int j)
{
//printf("img: %p, %d %d\n", (char *) &source, i, j);
return defaultDecay( source, i, j ); // for now
}
-double KShadowEngine::noDecay(QImage& source, int i, int j)
+double KShadowEngine::noDecay(TQImage& source, int i, int j)
{
// create a new image for for the shaddow
int w = source.width();
@@ -210,28 +210,28 @@ KTextShadowEngine::KTextShadowEngine() : KShadowEngine()
}
// taken from mtaskbar, by Sebastian Wolff
-void KTextShadowEngine::drawText(QPainter &p, const QRect &tr, int tf, const QString &str, const QSize &size)
+void KTextShadowEngine::drawText(TQPainter &p, const TQRect &tr, int tf, const TQString &str, const TQSize &size)
{
// get the color of the shadow: white for dark text, black for bright text
- QPen textPen = p.pen();
- QColor shadCol = textPen.color();
+ TQPen textPen = p.pen();
+ TQColor shadCol = textPen.color();
if (shadCol.red() +
shadCol.green() +
shadCol.blue() <= 3*256/2-1)
{
- shadCol = QColor(255,255,255);
+ shadCol = TQColor(255,255,255);
}
else
{
- shadCol = QColor(0,0,0);
+ shadCol = TQColor(0,0,0);
}
// get a transparent pixmap
- QPainter pixPainter;
- QPixmap textPixmap(size);
+ TQPainter pixPainter;
+ TQPixmap textPixmap(size);
- textPixmap.fill(QColor(0,0,0));
+ textPixmap.fill(TQColor(0,0,0));
textPixmap.setMask(textPixmap.createHeuristicMask(true));
// draw text
@@ -242,7 +242,7 @@ void KTextShadowEngine::drawText(QPainter &p, const QRect &tr, int tf, const QSt
pixPainter.end();
// draw shadow
- QImage img = makeShadow(textPixmap, shadCol);
+ TQImage img = makeShadow(textPixmap, shadCol);
// return
p.drawImage(0, 0, img);
diff --git a/kicker/libkicker/kshadowengine.h b/kicker/libkicker/kshadowengine.h
index 0fc4877fa..041e8faf6 100644
--- a/kicker/libkicker/kshadowengine.h
+++ b/kicker/libkicker/kshadowengine.h
@@ -24,9 +24,9 @@
#ifndef __FX_SHADOW
#define __FX_SHADOW
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qcolor.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
+#include <tqcolor.h>
#include <kdemacros.h>
@@ -79,7 +79,7 @@ public:
* @param bgColor the background color
* @return the resulting image
*/
- QImage makeShadow(const QPixmap& textPixmap, const QColor &bgColor);
+ TQImage makeShadow(const TQPixmap& textPixmap, const TQColor &bgColor);
private:
// No static objects in libs, and no static deleters in kdefx...
@@ -90,24 +90,24 @@ private:
/*
* a simple algorithm with 3 pixels thickness
*/
- double defaultDecay(QImage& source, int x, int y);
+ double defaultDecay(TQImage& source, int x, int y);
/*
* a slower algorithm where the influence of a pixel
* is qGray(px)/(abs(dx) + abs(dy) +1).
*/
- double doubleLinearDecay(QImage& source, int x, int y);
+ double doubleLinearDecay(TQImage& source, int x, int y);
/*
* a very slow algorithm where the influence of a pixel
* is qGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1).
*/
- double radialDecay(QImage& source, int x, int y);
+ double radialDecay(TQImage& source, int x, int y);
/*
* a nice/fast algorithm proposed by Bernardo Hung
*/
- double noDecay(QImage& source, int x, int y);
+ double noDecay(TQImage& source, int x, int y);
void *d;
};
@@ -117,7 +117,7 @@ class KDE_EXPORT KTextShadowEngine : public KShadowEngine
public:
KTextShadowEngine();
- void drawText(QPainter &p, const QRect &tr, int tf, const QString &str, const QSize &size);
+ void drawText(TQPainter &p, const TQRect &tr, int tf, const TQString &str, const TQSize &size);
};
#endif
diff --git a/kicker/libkicker/kshadowsettings.cpp b/kicker/libkicker/kshadowsettings.cpp
index 9c935d30f..4d6bce5c3 100644
--- a/kicker/libkicker/kshadowsettings.cpp
+++ b/kicker/libkicker/kshadowsettings.cpp
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include "kshadowsettings.h"
KShadowSettings::KShadowSettings()
@@ -30,7 +30,7 @@ KShadowSettings::KShadowSettings()
}
// load/save methods
-void KShadowSettings::fromString(const QString &val)
+void KShadowSettings::fromString(const TQString &val)
{
setOffsetX(val.section(',', OFFSET_X, OFFSET_X).toInt());
setOffsetY(val.section(',', OFFSET_Y, OFFSET_Y).toInt());
@@ -41,9 +41,9 @@ void KShadowSettings::fromString(const QString &val)
setSelectionType((SelectionType)val.section(',', SELECTION_TYPE, SELECTION_TYPE).toInt());
}
-QString KShadowSettings::toString() const
+TQString KShadowSettings::toString() const
{
- QString result;
+ TQString result;
result.sprintf("%d,%d,%f,%f,%d,%d,%d",
offsetX(),
offsetY(),
diff --git a/kicker/libkicker/kshadowsettings.h b/kicker/libkicker/kshadowsettings.h
index 9a91f1c15..e222b964d 100644
--- a/kicker/libkicker/kshadowsettings.h
+++ b/kicker/libkicker/kshadowsettings.h
@@ -24,12 +24,12 @@
#include <kdemacros.h>
-#define SHADOW_CONFIG_ENTRY QString("ShadowParameters")
-#define SHADOW_TEXT_COLOR QString("ShadowTextColor")
-#define SHADOW_TEXT_BACKGROUND QString("ShadowTextBackground")
+#define SHADOW_CONFIG_ENTRY TQString("ShadowParameters")
+#define SHADOW_TEXT_COLOR TQString("ShadowTextColor")
+#define SHADOW_TEXT_BACKGROUND TQString("ShadowTextBackground")
// fallback configuration string
-#define DEFAULT_SHADOW_CONFIGURATION QString("0,0,4.0,120.0,2,1,1,0,0,0")
+#define DEFAULT_SHADOW_CONFIGURATION TQString("0,0,4.0,120.0,2,1,1,0,0,0")
/**
* This class is the implementation of a structure for the
@@ -92,13 +92,13 @@ class KDE_EXPORT KShadowSettings
* @param the string to load from (comma-separated values)
* @see ConfigurationOrder
*/
- virtual void fromString(const QString &s);
+ virtual void fromString(const TQString &s);
/**
* Saves the configuration to a string.
* @return the configuration (comma-separated values)
* @see ConfigurationOrder
*/
- virtual QString toString() const;
+ virtual TQString toString() const;
// get methods
/**
diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp
index 740d44d95..0c36ffea0 100644
--- a/kicker/libkicker/menuinfo.cpp
+++ b/kicker/libkicker/menuinfo.cpp
@@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "menuinfo.h"
-#include <qfile.h>
-#include <qwidget.h>
+#include <tqfile.h>
+#include <tqwidget.h>
#include <kapplication.h>
#include <ksimpleconfig.h>
@@ -33,15 +33,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kpanelmenu.h>
#include <kparts/componentfactory.h>
-MenuInfo::MenuInfo(const QString& desktopFile)
+MenuInfo::MenuInfo(const TQString& desktopFile)
{
- KSimpleConfig df(locate("data", QString::fromLatin1("kicker/menuext/%1").arg(desktopFile)));
+ KSimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile)));
df.setGroup("Desktop Entry");
- QStringList list = df.readListEntry("X-KDE-AuthorizeAction");
+ TQStringList list = df.readListEntry("X-KDE-AuthorizeAction");
if (kapp && !list.isEmpty())
{
- for(QStringList::ConstIterator it = list.begin();
+ for(TQStringList::ConstIterator it = list.begin();
it != list.end();
++it)
{
@@ -57,12 +57,12 @@ MenuInfo::MenuInfo(const QString& desktopFile)
desktopfile_ = desktopFile;
}
-KPanelMenu* MenuInfo::load(QWidget *parent, const char *name)
+KPanelMenu* MenuInfo::load(TQWidget *parent, const char *name)
{
if (library_.isEmpty())
return 0;
return KParts::ComponentFactory::createInstanceFromLibrary<KPanelMenu>(
- QFile::encodeName( library_ ),
+ TQFile::encodeName( library_ ),
parent, name );
}
diff --git a/kicker/libkicker/menuinfo.h b/kicker/libkicker/menuinfo.h
index 0d324538e..4a2074830 100644
--- a/kicker/libkicker/menuinfo.h
+++ b/kicker/libkicker/menuinfo.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef _menuinfo_h_
#define _menuinfo_h_
-#include <qstring.h>
+#include <tqstring.h>
#include <kdemacros.h>
@@ -34,19 +34,19 @@ class QWidget;
class KDE_EXPORT MenuInfo
{
public:
- MenuInfo(const QString& desktopFile);
+ MenuInfo(const TQString& desktopFile);
- QString name() const { return name_; }
- QString comment() const { return comment_; }
- QString icon() const { return icon_; }
- QString library() const { return library_; }
- QString desktopFile() const { return desktopfile_; }
+ TQString name() const { return name_; }
+ TQString comment() const { return comment_; }
+ TQString icon() const { return icon_; }
+ TQString library() const { return library_; }
+ TQString desktopFile() const { return desktopfile_; }
bool isValid() const { return !name_.isEmpty(); }
- KPanelMenu* load(QWidget *parent = 0, const char *name = 0);
+ KPanelMenu* load(TQWidget *parent = 0, const char *name = 0);
private:
- QString name_, comment_, icon_, library_, desktopfile_;
+ TQString name_, comment_, icon_, library_, desktopfile_;
};
#endif
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index 407a78ca6..972e5195e 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -21,15 +21,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qcursor.h>
-#include <qfile.h>
-#include <qfontmetrics.h>
-#include <qpainter.h>
-#include <qpopupmenu.h>
-#include <qstyle.h>
-#include <qstylesheet.h>
-#include <qtooltip.h>
-#include <qpixmap.h>
+#include <tqcursor.h>
+#include <tqfile.h>
+#include <tqfontmetrics.h>
+#include <tqpainter.h>
+#include <tqpopupmenu.h>
+#include <tqstyle.h>
+#include <tqstylesheet.h>
+#include <tqtooltip.h>
+#include <tqpixmap.h>
#include <kapplication.h>
#include <kconfig.h>
@@ -57,8 +57,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// init static variable
KShadowEngine* PanelButton::s_textShadowEngine = 0L;
-PanelButton::PanelButton( QWidget* parent, const char* name )
- : QButton(parent, name),
+PanelButton::PanelButton( TQWidget* parent, const char* name )
+ : TQButton(parent, name),
m_valid(true),
m_isLeftMouseButtonDown(false),
m_drawArrow(false),
@@ -85,41 +85,41 @@ PanelButton::PanelButton( QWidget* parent, const char* name )
installEventFilter(KickerTip::the());
- connect(kapp, SIGNAL(settingsChanged(int)), SLOT(updateSettings(int)));
- connect(kapp, SIGNAL(iconChanged(int)), SLOT(updateIcon(int)));
+ connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(updateSettings(int)));
+ connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(updateIcon(int)));
}
void PanelButton::configure()
{
- QString name = tileName();
+ TQString name = tileName();
if( name.isEmpty() )
return;
if (!KickerSettings::enableTileBackground())
{
- setTile(QString::null);
+ setTile(TQString::null);
return;
}
KConfigGroup tilesGroup( KGlobal::config(), "button_tiles" );
if( !tilesGroup.readBoolEntry( "Enable" + name + "Tiles", true ) ) {
- setTile( QString::null );
+ setTile( TQString::null );
return;
}
- QString tile = tilesGroup.readEntry( name + "Tile" );
- QColor color = QColor();
+ TQString tile = tilesGroup.readEntry( name + "Tile" );
+ TQColor color = TQColor();
if (tile == "Colorize")
{
color = tilesGroup.readColorEntry( name + "TileColor" );
- tile = QString::null;
+ tile = TQString::null;
}
setTile( tile, color );
}
-void PanelButton::setTile(const QString& tile, const QColor& color)
+void PanelButton::setTile(const TQString& tile, const TQColor& color)
{
if (tile == m_tile && m_tileColor == color)
{
@@ -143,11 +143,11 @@ void PanelButton::setDrawArrow(bool drawArrow)
update();
}
-QImage PanelButton::loadTile(const QString& tile,
- const QSize& size,
- const QString& state)
+TQImage PanelButton::loadTile(const TQString& tile,
+ const TQSize& size,
+ const TQString& state)
{
- QString name = tile;
+ TQString name = tile;
if (size.height() < 42)
{
@@ -164,7 +164,7 @@ QImage PanelButton::loadTile(const QString& tile,
name += state + ".png";
- QImage tileImg(KGlobal::dirs()->findResource("tiles", name));
+ TQImage tileImg(KGlobal::dirs()->findResource("tiles", name));
// scale if size does not match exactly
if (!tileImg.isNull() && tileImg.size() != size)
@@ -177,7 +177,7 @@ QImage PanelButton::loadTile(const QString& tile,
void PanelButton::setEnabled(bool enable)
{
- QButton::setEnabled(enable);
+ TQButton::setEnabled(enable);
loadIcons();
update();
}
@@ -223,18 +223,18 @@ void PanelButton::updateSettings(int category)
}
}
-void PanelButton::checkForDeletion(const QString& path)
+void PanelButton::checkForDeletion(const TQString& path)
{
if (path == m_backingFile)
{
setEnabled(false);
- QTimer::singleShot(1000, this, SLOT(scheduleForRemoval()));
+ TQTimer::singleShot(1000, this, TQT_SLOT(scheduleForRemoval()));
}
}
bool PanelButton::checkForBackingFile()
{
- return QFile::exists(m_backingFile);
+ return TQFile::exists(m_backingFile);
}
void PanelButton::scheduleForRemoval()
@@ -261,7 +261,7 @@ void PanelButton::scheduleForRemoval()
}
timelapse *= 2;
- QTimer::singleShot(timelapse, this, SLOT(scheduleForRemoval()));
+ TQTimer::singleShot(timelapse, this, TQT_SLOT(scheduleForRemoval()));
}
}
@@ -290,9 +290,9 @@ int PanelButton::widthForHeight(int height) const
// before adding the text in here
if (orientation() == Horizontal && !m_buttonText.isEmpty())
{
- QFont f(font());
+ TQFont f(font());
//f.setPixelSize(KMIN(height, KMAX(int(float(height) * m_fontPercent), 16)));
- QFontMetrics fm(f);
+ TQFontMetrics fm(f);
//rc += fm.width(m_buttonText) + KMIN(25, KMAX(5, fm.width('m') / 2));
rc += fm.width(m_buttonText);
@@ -306,12 +306,12 @@ int PanelButton::heightForWidth(int width) const
return preferredDimension(width);
}
-const QPixmap& PanelButton::labelIcon() const
+const TQPixmap& PanelButton::labelIcon() const
{
return m_highlight ? m_iconh : m_icon;
}
-const QPixmap& PanelButton::zoomIcon() const
+const TQPixmap& PanelButton::zoomIcon() const
{
return m_iconz;
}
@@ -321,12 +321,12 @@ bool PanelButton::isValid() const
return m_valid;
}
-void PanelButton::setTitle(const QString& t)
+void PanelButton::setTitle(const TQString& t)
{
m_title = t;
}
-void PanelButton::setIcon(const QString& icon)
+void PanelButton::setIcon(const TQString& icon)
{
if (icon == m_iconName)
{
@@ -339,7 +339,7 @@ void PanelButton::setIcon(const QString& icon)
emit iconChanged();
}
-QString PanelButton::icon() const
+TQString PanelButton::icon() const
{
return m_iconName;
}
@@ -349,23 +349,23 @@ bool PanelButton::hasText() const
return !m_buttonText.isEmpty();
}
-void PanelButton::setButtonText(const QString& text)
+void PanelButton::setButtonText(const TQString& text)
{
m_buttonText = " " + text;
update();
}
-QString PanelButton::buttonText() const
+TQString PanelButton::buttonText() const
{
return m_buttonText;
}
-void PanelButton::setTextColor(const QColor& c)
+void PanelButton::setTextColor(const TQColor& c)
{
m_textColor = c;
}
-QColor PanelButton::textColor() const
+TQColor PanelButton::textColor() const
{
return m_textColor;
}
@@ -390,12 +390,12 @@ KPanelApplet::Direction PanelButton::popupDirection() const
return m_popupDirection;
}
-QPoint PanelButton::center() const
+TQPoint PanelButton::center() const
{
return mapToGlobal(rect().center());
}
-QString PanelButton::title() const
+TQString PanelButton::title() const
{
return m_title;
}
@@ -412,7 +412,7 @@ void PanelButton::startDrag()
emit dragme(m_icon);
}
-void PanelButton::enterEvent(QEvent* e)
+void PanelButton::enterEvent(TQEvent* e)
{
if (!m_highlight)
{
@@ -420,10 +420,10 @@ void PanelButton::enterEvent(QEvent* e)
repaint(false);
}
- QButton::enterEvent(e);
+ TQButton::enterEvent(e);
}
-void PanelButton::leaveEvent(QEvent* e)
+void PanelButton::leaveEvent(TQEvent* e)
{
if (m_highlight)
{
@@ -431,10 +431,10 @@ void PanelButton::leaveEvent(QEvent* e)
repaint(false);
}
- QButton::leaveEvent(e);
+ TQButton::leaveEvent(e);
}
-void PanelButton::dragEnterEvent(QDragEnterEvent* e)
+void PanelButton::dragEnterEvent(TQDragEnterEvent* e)
{
if (e->isAccepted())
{
@@ -442,31 +442,31 @@ void PanelButton::dragEnterEvent(QDragEnterEvent* e)
}
update();
- QButton::dragEnterEvent( e );
+ TQButton::dragEnterEvent( e );
}
-void PanelButton::dragLeaveEvent(QDragLeaveEvent* e)
+void PanelButton::dragLeaveEvent(TQDragLeaveEvent* e)
{
m_hasAcceptedDrag = false;
update();
- QButton::dragLeaveEvent( e );
+ TQButton::dragLeaveEvent( e );
}
-void PanelButton::dropEvent(QDropEvent* e)
+void PanelButton::dropEvent(TQDropEvent* e)
{
m_hasAcceptedDrag = false;
update();
- QButton::dropEvent( e );
+ TQButton::dropEvent( e );
}
-void PanelButton::mouseMoveEvent(QMouseEvent *e)
+void PanelButton::mouseMoveEvent(TQMouseEvent *e)
{
if (!m_isLeftMouseButtonDown || (e->state() & LeftButton) == 0)
{
return;
}
- QPoint p(e->pos() - m_lastLeftMouseButtonPress);
+ TQPoint p(e->pos() - m_lastLeftMouseButtonPress);
if (p.manhattanLength() <= 16)
{
// KGlobalSettings::dndEventDelay() is not enough!
@@ -477,29 +477,29 @@ void PanelButton::mouseMoveEvent(QMouseEvent *e)
triggerDrag();
}
-void PanelButton::mousePressEvent(QMouseEvent *e)
+void PanelButton::mousePressEvent(TQMouseEvent *e)
{
if (e->button() == LeftButton)
{
m_lastLeftMouseButtonPress = e->pos();
m_isLeftMouseButtonDown = true;
}
- QButton::mousePressEvent(e);
+ TQButton::mousePressEvent(e);
}
-void PanelButton::mouseReleaseEvent(QMouseEvent *e)
+void PanelButton::mouseReleaseEvent(TQMouseEvent *e)
{
if (e->button() == LeftButton)
{
m_isLeftMouseButtonDown = false;
- QPixmap pix = labelIcon();
+ TQPixmap pix = labelIcon();
KIconEffect::visualActivate(this, this->geometry(), &pix);
}
- QButton::mouseReleaseEvent(e);
+ TQButton::mouseReleaseEvent(e);
}
-void PanelButton::resizeEvent(QResizeEvent*)
+void PanelButton::resizeEvent(TQResizeEvent*)
{
loadTiles();
@@ -509,20 +509,20 @@ void PanelButton::resizeEvent(QResizeEvent*)
}
}
-void PanelButton::drawButton(QPainter *p)
+void PanelButton::drawButton(TQPainter *p)
{
- const QPixmap& tile = (isDown() || isOn()) ? m_down : m_up;
+ const TQPixmap& tile = (isDown() || isOn()) ? m_down : m_up;
if (m_tileColor.isValid())
{
p->fillRect(rect(), m_tileColor);
- style().drawPrimitive(QStyle::PE_Panel, p, rect(), colorGroup());
+ style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
}
else if (paletteBackgroundPixmap())
{
// Draw the background. This is always needed, even when using tiles,
// because they don't have to cover the entire button.
- QPoint offset = backgroundOffset();
+ TQPoint offset = backgroundOffset();
int ox = offset.x();
int oy = offset.y();
p->drawTiledPixmap( 0, 0, width(), height(),*paletteBackgroundPixmap(), ox, oy);
@@ -536,7 +536,7 @@ void PanelButton::drawButton(QPainter *p)
else if (isDown() || isOn())
{
// Draw shapes to indicate the down state.
- style().drawPrimitive(QStyle::PE_Panel, p, rect(), colorGroup(), QStyle::Style_Sunken);
+ style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken);
}
drawButtonLabel(p);
@@ -545,15 +545,15 @@ void PanelButton::drawButton(QPainter *p)
{
int x1, y1, x2, y2;
rect().coords(&x1, &y1, &x2, &y2);
- QRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
- style().drawPrimitive(QStyle::PE_FocusRect, p, r, colorGroup(),
- QStyle::Style_Default, colorGroup().button());
+ TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
+ style().drawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
+ TQStyle::Style_Default, colorGroup().button());
}
}
-void PanelButton::drawButtonLabel(QPainter *p)
+void PanelButton::drawButtonLabel(TQPainter *p)
{
- QPixmap icon = labelIcon();
+ TQPixmap icon = labelIcon();
bool active = isDown() || isOn();
if (active)
@@ -568,7 +568,7 @@ void PanelButton::drawButtonLabel(QPainter *p)
int w = width();
int y = (h - icon.height())/2;
p->save();
- QFont f = font();
+ TQFont f = font();
double fontPercent = m_fontPercent;
if (active)
@@ -576,12 +576,12 @@ void PanelButton::drawButtonLabel(QPainter *p)
fontPercent *= .8;
}
//f.setPixelSize(KMIN(h, KMAX(int(float(h) * m_fontPercent), 16)));
- QFontMetrics fm(f);
+ TQFontMetrics fm(f);
p->setFont(f);
/* Draw shadowed text */
- bool reverse = QApplication::reverseLayout();
- QPainter::TextDirection rtl = reverse ? QPainter::RTL : QPainter::LTR;
+ bool reverse = TQApplication::reverseLayout();
+ TQPainter::TextDirection rtl = reverse ? TQPainter::RTL : TQPainter::LTR;
if (!reverse && !icon.isNull())
{
@@ -592,13 +592,13 @@ void PanelButton::drawButtonLabel(QPainter *p)
int tX = reverse ? 3 : icon.width() + KMIN(25, KMAX(5, fm.width('m') / 2));
int tY = fm.ascent() + ((h - fm.height()) / 2);
- QColor shadCol = KickerLib::shadowColor(m_textColor);
+ TQColor shadCol = KickerLib::shadowColor(m_textColor);
// get a transparent pixmap
- QPainter pixPainter;
- QPixmap textPixmap(w, h);
+ TQPainter pixPainter;
+ TQPixmap textPixmap(w, h);
- textPixmap.fill(QColor(0,0,0));
+ textPixmap.fill(TQColor(0,0,0));
textPixmap.setMask(textPixmap.createHeuristicMask(true));
// draw text
@@ -619,7 +619,7 @@ void PanelButton::drawButtonLabel(QPainter *p)
}
// draw shadow
- QImage img = s_textShadowEngine->makeShadow(textPixmap, shadCol);
+ TQImage img = s_textShadowEngine->makeShadow(textPixmap, shadCol);
p->drawImage(0, 0, img);
p->save();
p->setPen(m_textColor);
@@ -642,50 +642,50 @@ void PanelButton::drawButtonLabel(QPainter *p)
if (m_drawArrow && (m_highlight || active))
{
- QStyle::PrimitiveElement e = QStyle::PE_ArrowUp;
- int arrowSize = style().pixelMetric(QStyle::PM_MenuButtonIndicator);
- QRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize);
+ TQStyle::PrimitiveElement e = TQStyle::PE_ArrowUp;
+ int arrowSize = style().pixelMetric(TQStyle::PM_MenuButtonIndicator);
+ TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize);
switch (m_arrowDirection)
{
case KPanelExtension::Top:
- e = QStyle::PE_ArrowUp;
+ e = TQStyle::PE_ArrowUp;
break;
case KPanelExtension::Bottom:
- e = QStyle::PE_ArrowDown;
+ e = TQStyle::PE_ArrowDown;
r.moveBy(0, height() - arrowSize);
break;
case KPanelExtension::Right:
- e = QStyle::PE_ArrowRight;
- r = QRect(width() - arrowSize, (height() - arrowSize)/2, arrowSize, arrowSize);
+ e = TQStyle::PE_ArrowRight;
+ r = TQRect(width() - arrowSize, (height() - arrowSize)/2, arrowSize, arrowSize);
break;
case KPanelExtension::Left:
- e = QStyle::PE_ArrowLeft;
- r = QRect(0, (height() - arrowSize)/2, arrowSize, arrowSize);
+ e = TQStyle::PE_ArrowLeft;
+ r = TQRect(0, (height() - arrowSize)/2, arrowSize, arrowSize);
break;
case KPanelExtension::Floating:
if (orientation() == Horizontal)
{
- e = QStyle::PE_ArrowDown;
+ e = TQStyle::PE_ArrowDown;
r.moveBy(0, height() - arrowSize);
}
- else if (QApplication::reverseLayout())
+ else if (TQApplication::reverseLayout())
{
- e = QStyle::PE_ArrowLeft;
- r = QRect(0, (height() - arrowSize)/2, arrowSize, arrowSize);
+ e = TQStyle::PE_ArrowLeft;
+ r = TQRect(0, (height() - arrowSize)/2, arrowSize, arrowSize);
}
else
{
- e = QStyle::PE_ArrowRight;
- r = QRect(width() - arrowSize, (height() - arrowSize)/2, arrowSize, arrowSize);
+ e = TQStyle::PE_ArrowRight;
+ r = TQRect(width() - arrowSize, (height() - arrowSize)/2, arrowSize, arrowSize);
}
break;
}
- int flags = QStyle::Style_Enabled;
+ int flags = TQStyle::Style_Enabled;
if (active)
{
- flags |= QStyle::Style_Down;
+ flags |= TQStyle::Style_Down;
}
style().drawPrimitive(e, p, r, colorGroup(), flags);
}
@@ -704,7 +704,7 @@ int PanelButton::preferredIconSize(int proposed_size) const
return -1; // unknown icon size
}
- QValueList<int> sizes = ith->querySizes(KIcon::Panel);
+ TQValueList<int> sizes = ith->querySizes(KIcon::Panel);
int sz = ith->defaultSize(KIcon::Panel);
@@ -723,7 +723,7 @@ int PanelButton::preferredIconSize(int proposed_size) const
}
//kdDebug()<<endl<<endl<<flush;
- QValueListConstIterator<int> i = sizes.constBegin();
+ TQValueListConstIterator<int> i = sizes.constBegin();
while (i != sizes.constEnd())
{
if ((*i) + (2 * KickerSettings::iconMargin()) > upperLimit)
@@ -738,7 +738,7 @@ int PanelButton::preferredIconSize(int proposed_size) const
return sz;
}
-void PanelButton::backedByFile(const QString& localFilePath)
+void PanelButton::backedByFile(const TQString& localFilePath)
{
m_backingFile = localFilePath;
@@ -748,16 +748,16 @@ void PanelButton::backedByFile(const QString& localFilePath)
}
// avoid multiple connections
- disconnect(KDirWatch::self(), SIGNAL(deleted(const QString&)),
- this, SLOT(checkForDeletion(const QString&)));
+ disconnect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)),
+ this, TQT_SLOT(checkForDeletion(const TQString&)));
if (!KDirWatch::self()->contains(m_backingFile))
{
KDirWatch::self()->addFile(m_backingFile);
}
- connect(KDirWatch::self(), SIGNAL(deleted(const QString&)),
- this, SLOT(checkForDeletion(const QString&)));
+ connect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)),
+ this, TQT_SLOT(checkForDeletion(const TQString&)));
}
@@ -775,27 +775,27 @@ void PanelButton::loadTiles()
if (m_tileColor.isValid())
{
setBackgroundOrigin(WidgetOrigin);
- m_up = m_down = QPixmap();
+ m_up = m_down = TQPixmap();
}
else if (m_tile.isNull())
{
setBackgroundOrigin(AncestorOrigin);
- m_up = m_down = QPixmap();
+ m_up = m_down = TQPixmap();
}
else
{
setBackgroundOrigin(WidgetOrigin);
// If only the tiles were named a bit smarter we wouldn't have
// to pass the up or down argument.
- m_up = QPixmap(loadTile(m_tile, size(), "up"));
- m_down = QPixmap(loadTile(m_tile, size(), "down"));
+ m_up = TQPixmap(loadTile(m_tile, size(), "up"));
+ m_down = TQPixmap(loadTile(m_tile, size(), "down"));
}
}
void PanelButton::loadIcons()
{
KIconLoader * ldr = KGlobal::iconLoader();
- QString nm = m_iconName;
+ TQString nm = m_iconName;
KIcon::States defaultState = isEnabled() ? KIcon::DefaultState :
KIcon::DisabledState;
m_icon = ldr->loadIcon(nm, KIcon::Panel, m_size, defaultState, 0L, true);
@@ -844,8 +844,8 @@ bool PanelButton::calculateIconSize()
void PanelButton::updateKickerTip(KickerTip::Data& data)
{
- data.message = QStyleSheet::escape(title());
- data.subtext = QStyleSheet::escape(QToolTip::textFor(this));
+ data.message = TQStyleSheet::escape(title());
+ data.subtext = TQStyleSheet::escape(TQToolTip::textFor(this));
data.icon = zoomIcon();
data.direction = popupDirection();
}
@@ -854,21 +854,21 @@ void PanelButton::updateKickerTip(KickerTip::Data& data)
// PanelPopupButton class
//
-PanelPopupButton::PanelPopupButton(QWidget *parent, const char *name)
+PanelPopupButton::PanelPopupButton(TQWidget *parent, const char *name)
: PanelButton(parent, name),
m_popup(0),
m_pressedDuringPopup(false),
m_initialized(false)
{
- connect(this, SIGNAL(pressed()), SLOT(slotExecMenu()));
+ connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotExecMenu()));
}
-void PanelPopupButton::setPopup(QPopupMenu *popup)
+void PanelPopupButton::setPopup(TQPopupMenu *popup)
{
if (m_popup)
{
m_popup->removeEventFilter(this);
- disconnect(m_popup, SIGNAL(aboutToHide()), this, SLOT(menuAboutToHide()));
+ disconnect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide()));
}
m_popup = popup;
@@ -877,20 +877,20 @@ void PanelPopupButton::setPopup(QPopupMenu *popup)
if (m_popup)
{
m_popup->installEventFilter(this);
- connect(m_popup, SIGNAL(aboutToHide()), this, SLOT(menuAboutToHide()));
+ connect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide()));
}
}
-QPopupMenu *PanelPopupButton::popup() const
+TQPopupMenu *PanelPopupButton::popup() const
{
return m_popup;
}
-bool PanelPopupButton::eventFilter(QObject *, QEvent *e)
+bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e)
{
- if (e->type() == QEvent::MouseMove)
+ if (e->type() == TQEvent::MouseMove)
{
- QMouseEvent *me = static_cast<QMouseEvent *>(e);
+ TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
if (rect().contains(mapFromGlobal(me->globalPos())) &&
((me->state() & ControlButton) != 0 ||
(me->state() & ShiftButton) != 0))
@@ -899,19 +899,19 @@ bool PanelPopupButton::eventFilter(QObject *, QEvent *e)
return true;
}
}
- else if (e->type() == QEvent::MouseButtonPress ||
- e->type() == QEvent::MouseButtonDblClick)
+ else if (e->type() == TQEvent::MouseButtonPress ||
+ e->type() == TQEvent::MouseButtonDblClick)
{
- QMouseEvent *me = static_cast<QMouseEvent *>(e);
+ TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
if (rect().contains(mapFromGlobal(me->globalPos())))
{
m_pressedDuringPopup = true;
return true;
}
}
- else if (e->type() == QEvent::MouseButtonRelease)
+ else if (e->type() == TQEvent::MouseButtonRelease)
{
- QMouseEvent *me = static_cast<QMouseEvent *>(e);
+ TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
if (rect().contains(mapFromGlobal(me->globalPos())))
{
if (m_pressedDuringPopup && m_popup)
diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h
index f71865c77..5a7b6d197 100644
--- a/kicker/libkicker/panelbutton.h
+++ b/kicker/libkicker/panelbutton.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <algorithm>
-#include <qbutton.h>
+#include <tqbutton.h>
#include <kpanelapplet.h>
#include <kpanelextension.h>
@@ -40,10 +40,10 @@ class KShadowEngine;
/**
* PanelButton is the base class for all buttons to be
- * placed in Kicker's panels. It inherits QButton, and
+ * placed in Kicker's panels. It inherits TQButton, and
* KickerTip::Client.
*/
-class KDE_EXPORT PanelButton: public QButton, public KickerTip::Client
+class KDE_EXPORT PanelButton: public TQButton, public KickerTip::Client
{
Q_OBJECT
@@ -53,7 +53,7 @@ public:
* @param parent the parent widget
* @param name the widget's name
*/
- PanelButton( QWidget* parent, const char* name );
+ PanelButton( TQWidget* parent, const char* name );
/**
* Configures this button according to the user's preferences for
@@ -90,12 +90,12 @@ public:
/**
* @return the button's current icon
*/
- virtual const QPixmap& labelIcon() const;
+ virtual const TQPixmap& labelIcon() const;
/**
* @return the button's zoom icon
*/
- virtual const QPixmap& zoomIcon() const;
+ virtual const TQPixmap& zoomIcon() const;
/**
* @return true if this button is valid.
@@ -106,12 +106,12 @@ public:
* Changes the title for the panel button.
* @param t the button's title
*/
- void setTitle(const QString& t);
+ void setTitle(const TQString& t);
/**
* @return the title of the button.
*/
- QString title() const;
+ TQString title() const;
/**
* Changes the name of the panel button's tile, with
@@ -119,7 +119,7 @@ public:
* @param tile the button's tile name
* @param color the button's tile color
*/
- void setTile(const QString& tile, const QColor& color = QColor());
+ void setTile(const TQString& tile, const TQColor& color = TQColor());
/**
* Set to true to draw an arrow on the button.
@@ -130,12 +130,12 @@ public:
* Used to set the icon for this panel button.
* @param icon the path to the button's icon
*/
- void setIcon(const QString& icon);
+ void setIcon(const TQString& icon);
/**
* @return the button's icon
*/
- QString icon() const;
+ TQString icon() const;
/**
* @return whether this button has a text label or not
@@ -146,23 +146,23 @@ public:
* Change the button's text label
* @param text text for button's label
*/
- void setButtonText(const QString& text);
+ void setButtonText(const TQString& text);
/**
* @return button's text label
*/
- QString buttonText() const;
+ TQString buttonText() const;
/**
* Change the button's text label color
* @param c the new text label color
*/
- void setTextColor(const QColor& c);
+ void setTextColor(const TQColor& c);
/**
* @return the button's text label color
*/
- QColor textColor() const;
+ TQColor textColor() const;
/**
* Change the button's text scale
@@ -188,7 +188,7 @@ public:
/**
* @return global position of the center of the button
*/
- QPoint center() const;
+ TQPoint center() const;
/**
* Used to load the graphical tile of the button
@@ -196,8 +196,8 @@ public:
* @param size size of the tile
* @param state used if button has multiple states (null by default)
*/
- static QImage loadTile(const QString& name, const QSize&,
- const QString& state = QString::null);
+ static TQImage loadTile(const TQString& name, const TQSize&,
+ const TQString& state = TQString::null);
/**
* Update the contents of the button's KickerTip
@@ -233,12 +233,12 @@ signals:
/**
* Emitted when button initiates a drag
*/
- void dragme(const QPixmap);
+ void dragme(const TQPixmap);
/**
* Overloads dragme to support panel button's with a list of KURL's ([url/servicemenu/browser]button)
*/
- void dragme(const KURL::List, const QPixmap);
+ void dragme(const KURL::List, const TQPixmap);
public slots:
/**
@@ -263,12 +263,12 @@ protected:
* to the subclass, should not be i18n'd and is never made user visible.
* KDE4: remove this and use the classname directly instead.
*/
- virtual QString tileName() = 0;
+ virtual TQString tileName() = 0;
/**
* @return the default icon for the button
*/
- virtual QString defaultIcon() const { return "unknown"; };
+ virtual TQString defaultIcon() const { return "unknown"; };
/**
* Called right before drag occurs.
@@ -277,22 +277,22 @@ protected:
/**
* Emits a signal to drag the button. Reimplement this if, for example,
- * if you need the button to call dragme(KURL::List, const QPixmap)
- * instead of dragme(const QPixmap)
+ * if you need the button to call dragme(KURL::List, const TQPixmap)
+ * instead of dragme(const TQPixmap)
*/
virtual void startDrag();
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
- virtual void dragEnterEvent(QDragEnterEvent *);
- virtual void dragLeaveEvent(QDragLeaveEvent *);
- virtual void dropEvent(QDropEvent *);
- virtual void mouseMoveEvent(QMouseEvent *);
- virtual void mousePressEvent(QMouseEvent *);
- virtual void mouseReleaseEvent(QMouseEvent *);
- virtual void resizeEvent(QResizeEvent*);
- virtual void drawButton(QPainter *);
- virtual void drawButtonLabel(QPainter *);
+ virtual void enterEvent(TQEvent *);
+ virtual void leaveEvent(TQEvent *);
+ virtual void dragEnterEvent(TQDragEnterEvent *);
+ virtual void dragLeaveEvent(TQDragLeaveEvent *);
+ virtual void dropEvent(TQDropEvent *);
+ virtual void mouseMoveEvent(TQMouseEvent *);
+ virtual void mousePressEvent(TQMouseEvent *);
+ virtual void mouseReleaseEvent(TQMouseEvent *);
+ virtual void resizeEvent(TQResizeEvent*);
+ virtual void drawButton(TQPainter *);
+ virtual void drawButtonLabel(TQPainter *);
/**
* @return the preferred icon size.
@@ -320,7 +320,7 @@ protected:
* Set the file backing this button (See @ref checkForBackingFile()),
* you shouldn't need to use this, currently it's only used in [url/service]button
*/
- void backedByFile(const QString& localFilePath);
+ void backedByFile(const TQString& localFilePath);
/**
* Sets the button's arrow direction.
@@ -344,7 +344,7 @@ protected:
bool calculateIconSize();
bool m_valid;
- QPixmap m_icon;
+ TQPixmap m_icon;
protected slots:
/**
@@ -364,7 +364,7 @@ protected slots:
* has been deleted.
* @param path path to backing file
*/
- void checkForDeletion(const QString& path);
+ void checkForDeletion(const TQString& path);
/**
* Called to prepare the button for removal from the Kicker
@@ -372,23 +372,23 @@ protected slots:
void scheduleForRemoval();
private:
- QPoint m_lastLeftMouseButtonPress;
+ TQPoint m_lastLeftMouseButtonPress;
bool m_isLeftMouseButtonDown;
bool m_drawArrow;
bool m_highlight;
bool m_changeCursorOverItem;
bool m_hasAcceptedDrag;
- QColor m_textColor;
- QColor m_tileColor;
- QString m_buttonText;
- QString m_tile;
- QString m_title;
- QString m_iconName;
- QString m_backingFile;
- QPixmap m_up;
- QPixmap m_down;
- QPixmap m_iconh; // hover
- QPixmap m_iconz; // mouse over
+ TQColor m_textColor;
+ TQColor m_tileColor;
+ TQString m_buttonText;
+ TQString m_tile;
+ TQString m_title;
+ TQString m_iconName;
+ TQString m_backingFile;
+ TQPixmap m_up;
+ TQPixmap m_down;
+ TQPixmap m_iconh; // hover
+ TQPixmap m_iconz; // mouse over
KPanelExtension::Position m_arrowDirection;
KPanelApplet::Direction m_popupDirection;
Orientation m_orientation;
@@ -413,20 +413,20 @@ public:
* @param parent the parent widget
* @param name the widget's name
*/
- PanelPopupButton(QWidget *parent=0, const char *name=0);
+ PanelPopupButton(TQWidget *parent=0, const char *name=0);
/**
* Sets the button's popup menu.
* @param popup the menu to pop up
*/
- void setPopup(QPopupMenu *popup);
+ void setPopup(TQPopupMenu *popup);
/**
* @return the button's popup menu
*/
- QPopupMenu *popup() const;
+ TQPopupMenu *popup() const;
- bool eventFilter(QObject *, QEvent *);
+ bool eventFilter(TQObject *, TQEvent *);
virtual void showMenu();
protected:
@@ -460,7 +460,7 @@ private slots:
void menuAboutToHide();
private:
- QPopupMenu *m_popup;
+ TQPopupMenu *m_popup;
bool m_pressedDuringPopup;
bool m_initialized;
diff --git a/kicker/libkicker/paneldrag.cpp b/kicker/libkicker/paneldrag.cpp
index 871ac1d96..1fb6b9ce6 100644
--- a/kicker/libkicker/paneldrag.cpp
+++ b/kicker/libkicker/paneldrag.cpp
@@ -24,14 +24,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <sys/types.h>
#include <unistd.h>
-#include <qbuffer.h>
+#include <tqbuffer.h>
#include "paneldrag.h"
#define PANELDRAG_BUFSIZE sizeof(BaseContainer*) + sizeof(pid_t)
-PanelDrag::PanelDrag(BaseContainer* container, QWidget* dragSource)
- : QDragObject(dragSource, 0)
+PanelDrag::PanelDrag(BaseContainer* container, TQWidget* dragSource)
+ : TQDragObject(dragSource, 0)
{
pid_t source_pid = getpid();
@@ -44,9 +44,9 @@ PanelDrag::~PanelDrag()
{
}
-bool PanelDrag::decode(const QMimeSource* e, BaseContainer** container)
+bool PanelDrag::decode(const TQMimeSource* e, BaseContainer** container)
{
- QByteArray a = e->encodedData("application/basecontainerptr");
+ TQByteArray a = e->encodedData("application/basecontainerptr");
if (a.size() != PANELDRAG_BUFSIZE)
{
@@ -55,25 +55,25 @@ bool PanelDrag::decode(const QMimeSource* e, BaseContainer** container)
pid_t target_pid = getpid();
pid_t source_pid;
- memcpy(&source_pid, a.data() + sizeof(QObject*), sizeof(pid_t));
+ memcpy(&source_pid, a.data() + sizeof(TQObject*), sizeof(pid_t));
if (source_pid == target_pid)
{
- memcpy(container, a.data(), sizeof(QObject*));
+ memcpy(container, a.data(), sizeof(TQObject*));
return true;
}
return false;
}
-bool PanelDrag::canDecode(const QMimeSource *e)
+bool PanelDrag::canDecode(const TQMimeSource *e)
{
if (!e->provides("application/basecontainerptr"))
{
return false;
}
- QByteArray a = e->encodedData("application/basecontainerptr");
+ TQByteArray a = e->encodedData("application/basecontainerptr");
if (a.size() != PANELDRAG_BUFSIZE)
{
return false;
@@ -91,15 +91,15 @@ bool PanelDrag::canDecode(const QMimeSource *e)
return true;
}
-QByteArray PanelDrag::encodedData(const char * mimeType) const
+TQByteArray PanelDrag::encodedData(const char * mimeType) const
{
- if (QString("application/basecontainerptr") == mimeType &&
+ if (TQString("application/basecontainerptr") == mimeType &&
a.size() == PANELDRAG_BUFSIZE)
{
return a;
}
- return QByteArray();
+ return TQByteArray();
}
const char * PanelDrag::format(int i) const
@@ -113,12 +113,12 @@ const char * PanelDrag::format(int i) const
}
-AppletInfoDrag::AppletInfoDrag(const AppletInfo& info, QWidget *dragSource)
- : QDragObject(dragSource, 0)
+AppletInfoDrag::AppletInfoDrag(const AppletInfo& info, TQWidget *dragSource)
+ : TQDragObject(dragSource, 0)
{
- QBuffer buff(a);
+ TQBuffer buff(a);
buff.open(IO_WriteOnly);
- QDataStream s(&buff);
+ TQDataStream s(&buff);
s << info.desktopFile() << info.configFile() << info.type();
}
@@ -136,17 +136,17 @@ const char * AppletInfoDrag::format(int i) const
return 0;
}
-QByteArray AppletInfoDrag::encodedData(const char* mimeType) const
+TQByteArray AppletInfoDrag::encodedData(const char* mimeType) const
{
- if (QString("application/appletinfo") == mimeType)
+ if (TQString("application/appletinfo") == mimeType)
{
return a;
}
- return QByteArray();
+ return TQByteArray();
}
-bool AppletInfoDrag::canDecode(const QMimeSource * e)
+bool AppletInfoDrag::canDecode(const TQMimeSource * e)
{
if (!e->provides("application/appletinfo"))
{
@@ -156,21 +156,21 @@ bool AppletInfoDrag::canDecode(const QMimeSource * e)
return true;
}
-bool AppletInfoDrag::decode(const QMimeSource* e, AppletInfo& container)
+bool AppletInfoDrag::decode(const TQMimeSource* e, AppletInfo& container)
{
- QByteArray a = e->encodedData("application/appletinfo");
+ TQByteArray a = e->encodedData("application/appletinfo");
if (a.isEmpty())
{
return false;
}
- QBuffer buff(a);
+ TQBuffer buff(a);
buff.open(IO_ReadOnly);
- QDataStream s(&buff);
+ TQDataStream s(&buff);
- QString desktopFile;
- QString configFile;
+ TQString desktopFile;
+ TQString configFile;
int type;
s >> desktopFile >> configFile >> type;
AppletInfo info(desktopFile, configFile, (AppletInfo::AppletType)type);
diff --git a/kicker/libkicker/paneldrag.h b/kicker/libkicker/paneldrag.h
index ba85ad375..3d7cbf858 100644
--- a/kicker/libkicker/paneldrag.h
+++ b/kicker/libkicker/paneldrag.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef _paneldrag_h_
#define _paneldrag_h_
-#include <qdragobject.h>
+#include <tqdragobject.h>
#include <kdemacros.h>
@@ -35,33 +35,33 @@ class BaseContainer;
class KDE_EXPORT PanelDrag : public QDragObject
{
public:
- PanelDrag(BaseContainer* container, QWidget *dragSource);
+ PanelDrag(BaseContainer* container, TQWidget *dragSource);
~PanelDrag();
virtual const char * format(int i = 0) const;
- virtual QByteArray encodedData(const char *) const;
+ virtual TQByteArray encodedData(const char *) const;
- static bool canDecode(const QMimeSource * e);
- static bool decode(const QMimeSource* e, BaseContainer** container);
+ static bool canDecode(const TQMimeSource * e);
+ static bool decode(const TQMimeSource* e, BaseContainer** container);
private:
- QByteArray a;
+ TQByteArray a;
};
class KDE_EXPORT AppletInfoDrag : public QDragObject
{
public:
- AppletInfoDrag(const AppletInfo& container, QWidget *dragSource);
+ AppletInfoDrag(const AppletInfo& container, TQWidget *dragSource);
~AppletInfoDrag();
virtual const char * format(int i = 0) const;
- virtual QByteArray encodedData(const char *) const;
+ virtual TQByteArray encodedData(const char *) const;
- static bool canDecode(const QMimeSource * e);
- static bool decode(const QMimeSource* e, AppletInfo& container);
+ static bool canDecode(const TQMimeSource * e);
+ static bool decode(const TQMimeSource* e, AppletInfo& container);
private:
- QByteArray a;
+ TQByteArray a;
};
#endif
diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp
index 43dd67a41..7d11a429e 100644
--- a/kicker/libkicker/panner.cpp
+++ b/kicker/libkicker/panner.cpp
@@ -21,11 +21,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qtimer.h>
-#include <qpainter.h>
-#include <qstyle.h>
+#include <tqlayout.h>
+#include <tqtooltip.h>
+#include <tqtimer.h>
+#include <tqpainter.h>
+#include <tqstyle.h>
#include <kglobal.h>
#include <klocale.h>
@@ -35,8 +35,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "panner.h"
#include "panner.moc"
-Panner::Panner( QWidget* parent, const char* name )
- : QWidget( parent, name ),
+Panner::Panner( TQWidget* parent, const char* name )
+ : TQWidget( parent, name ),
_luSB(0),
_rdSB(0),
_cwidth(0), _cheight(0),
@@ -45,17 +45,17 @@ Panner::Panner( QWidget* parent, const char* name )
KGlobal::locale()->insertCatalogue("libkicker");
setBackgroundOrigin( AncestorOrigin );
- _updateScrollButtonsTimer = new QTimer(this);
- connect(_updateScrollButtonsTimer, SIGNAL(timeout()), this, SLOT(reallyUpdateScrollButtons()));
+ _updateScrollButtonsTimer = new TQTimer(this);
+ connect(_updateScrollButtonsTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reallyUpdateScrollButtons()));
- _clipper = new QWidget(this);
+ _clipper = new TQWidget(this);
_clipper->setBackgroundOrigin(AncestorOrigin);
_clipper->installEventFilter( this );
- _viewport = new QWidget(_clipper);
+ _viewport = new TQWidget(_clipper);
_viewport->setBackgroundOrigin(AncestorOrigin);
// layout
- _layout = new QBoxLayout(this, QBoxLayout::LeftToRight);
+ _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight);
_layout->addWidget(_clipper, 1);
setOrientation(Horizontal);
}
@@ -78,8 +78,8 @@ void Panner::createScrollButtons()
_luSB->setMinimumSize(12, 12);
_luSB->hide();
_layout->addWidget(_luSB);
- connect(_luSB, SIGNAL(pressed()), SLOT(startScrollLeftUp()));
- connect(_luSB, SIGNAL(released()), SLOT(stopScroll()));
+ connect(_luSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollLeftUp()));
+ connect(_luSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll()));
// right/down scroll button
_rdSB = new SimpleArrowButton(this);
@@ -88,8 +88,8 @@ void Panner::createScrollButtons()
_rdSB->setMinimumSize(12, 12);
_rdSB->hide();
_layout->addWidget(_rdSB);
- connect(_rdSB, SIGNAL(pressed()), SLOT(startScrollRightDown()));
- connect(_rdSB, SIGNAL(released()), SLOT(stopScroll()));
+ connect(_rdSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollRightDown()));
+ connect(_rdSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll()));
// set up the buttons
setupButtons();
@@ -103,13 +103,13 @@ void Panner::setupButtons()
{
_luSB->setArrowType(Qt::LeftArrow);
_rdSB->setArrowType(Qt::RightArrow);
- _luSB->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding));
- _rdSB->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding));
- QToolTip::add(_luSB, i18n("Scroll left"));
- QToolTip::add(_rdSB, i18n("Scroll right"));
+ _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+ _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+ TQToolTip::add(_luSB, i18n("Scroll left"));
+ TQToolTip::add(_rdSB, i18n("Scroll right"));
setMinimumSize(24, 0);
}
- _layout->setDirection(QBoxLayout::LeftToRight);
+ _layout->setDirection(TQBoxLayout::LeftToRight);
}
else
{
@@ -117,13 +117,13 @@ void Panner::setupButtons()
{
_luSB->setArrowType(Qt::UpArrow);
_rdSB->setArrowType(Qt::DownArrow);
- _luSB->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
- _rdSB->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
- QToolTip::add(_luSB, i18n("Scroll up"));
- QToolTip::add(_rdSB, i18n("Scroll down"));
+ _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+ _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+ TQToolTip::add(_luSB, i18n("Scroll up"));
+ TQToolTip::add(_rdSB, i18n("Scroll down"));
setMinimumSize(0, 24);
}
- _layout->setDirection(QBoxLayout::TopToBottom);
+ _layout->setDirection(TQBoxLayout::TopToBottom);
}
if (isVisible())
@@ -141,9 +141,9 @@ void Panner::setOrientation(Orientation o)
reallyUpdateScrollButtons();
}
-void Panner::resizeEvent( QResizeEvent* )
+void Panner::resizeEvent( TQResizeEvent* )
{
- //QScrollView::resizeEvent( e );
+ //TQScrollView::resizeEvent( e );
//updateScrollButtons();
}
@@ -169,8 +169,8 @@ void Panner::scrollLeftUp()
void Panner::startScrollRightDown()
{
- _scrollTimer = new QTimer(this);
- connect(_scrollTimer, SIGNAL(timeout()), SLOT(scrollRightDown()));
+ _scrollTimer = new TQTimer(this);
+ connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollRightDown()));
_scrollTimer->start(50);
_step = 8;
scrollRightDown();
@@ -178,8 +178,8 @@ void Panner::startScrollRightDown()
void Panner::startScrollLeftUp()
{
- _scrollTimer = new QTimer(this);
- connect(_scrollTimer, SIGNAL(timeout()), SLOT(scrollLeftUp()));
+ _scrollTimer = new TQTimer(this);
+ connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollLeftUp()));
_scrollTimer->start(50);
_step = 8;
scrollLeftUp();
@@ -258,26 +258,26 @@ void Panner::resizeContents( int w, int h )
updateScrollButtons();
}
-QPoint Panner::contentsToViewport( const QPoint& p ) const
+TQPoint Panner::contentsToViewport( const TQPoint& p ) const
{
- return QPoint(p.x() - contentsX() - _clipper->x(), p.y() - contentsY() - _clipper->y());
+ return TQPoint(p.x() - contentsX() - _clipper->x(), p.y() - contentsY() - _clipper->y());
}
-QPoint Panner::viewportToContents( const QPoint& vp ) const
+TQPoint Panner::viewportToContents( const TQPoint& vp ) const
{
- return QPoint(vp.x() + contentsX() + _clipper->x(), vp.y() + contentsY() + _clipper->y());
+ return TQPoint(vp.x() + contentsX() + _clipper->x(), vp.y() + contentsY() + _clipper->y());
}
void Panner::contentsToViewport( int x, int y, int& vx, int& vy ) const
{
- const QPoint v = contentsToViewport(QPoint(x,y));
+ const TQPoint v = contentsToViewport(TQPoint(x,y));
vx = v.x();
vy = v.y();
}
void Panner::viewportToContents( int vx, int vy, int& x, int& y ) const
{
- const QPoint c = viewportToContents(QPoint(vx,vy));
+ const TQPoint c = viewportToContents(TQPoint(vx,vy));
x = c.x();
y = c.y();
}
@@ -334,33 +334,33 @@ void Panner::ensureVisible( int x, int y, int xmargin, int ymargin )
setContentsPos( -cx, -cy );
}
-bool Panner::eventFilter( QObject *obj, QEvent *e )
+bool Panner::eventFilter( TQObject *obj, TQEvent *e )
{
if ( obj == _viewport || obj == _clipper )
{
switch ( e->type() )
{
- case QEvent::Resize:
- viewportResizeEvent((QResizeEvent *)e);
+ case TQEvent::Resize:
+ viewportResizeEvent((TQResizeEvent *)e);
break;
- case QEvent::MouseButtonPress:
- viewportMousePressEvent( (QMouseEvent*)e );
- if ( ((QMouseEvent*)e)->isAccepted() )
+ case TQEvent::MouseButtonPress:
+ viewportMousePressEvent( (TQMouseEvent*)e );
+ if ( ((TQMouseEvent*)e)->isAccepted() )
return true;
break;
- case QEvent::MouseButtonRelease:
- viewportMouseReleaseEvent( (QMouseEvent*)e );
- if ( ((QMouseEvent*)e)->isAccepted() )
+ case TQEvent::MouseButtonRelease:
+ viewportMouseReleaseEvent( (TQMouseEvent*)e );
+ if ( ((TQMouseEvent*)e)->isAccepted() )
return true;
break;
- case QEvent::MouseButtonDblClick:
- viewportMouseDoubleClickEvent( (QMouseEvent*)e );
- if ( ((QMouseEvent*)e)->isAccepted() )
+ case TQEvent::MouseButtonDblClick:
+ viewportMouseDoubleClickEvent( (TQMouseEvent*)e );
+ if ( ((TQMouseEvent*)e)->isAccepted() )
return true;
break;
- case QEvent::MouseMove:
- viewportMouseMoveEvent( (QMouseEvent*)e );
- if ( ((QMouseEvent*)e)->isAccepted() )
+ case TQEvent::MouseMove:
+ viewportMouseMoveEvent( (TQMouseEvent*)e );
+ if ( ((TQMouseEvent*)e)->isAccepted() )
return true;
break;
default:
@@ -368,29 +368,29 @@ bool Panner::eventFilter( QObject *obj, QEvent *e )
}
}
- return QWidget::eventFilter( obj, e ); // always continue with standard event processing
+ return TQWidget::eventFilter( obj, e ); // always continue with standard event processing
}
-void Panner::viewportResizeEvent( QResizeEvent* )
+void Panner::viewportResizeEvent( TQResizeEvent* )
{
}
-void Panner::viewportMousePressEvent( QMouseEvent* e)
+void Panner::viewportMousePressEvent( TQMouseEvent* e)
{
e->ignore();
}
-void Panner::viewportMouseReleaseEvent( QMouseEvent* e )
+void Panner::viewportMouseReleaseEvent( TQMouseEvent* e )
{
e->ignore();
}
-void Panner::viewportMouseDoubleClickEvent( QMouseEvent* e )
+void Panner::viewportMouseDoubleClickEvent( TQMouseEvent* e )
{
e->ignore();
}
-void Panner::viewportMouseMoveEvent( QMouseEvent* e )
+void Panner::viewportMouseMoveEvent( TQMouseEvent* e )
{
e->ignore();
}
diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h
index 6657c9a76..ee1bc026a 100644
--- a/kicker/libkicker/panner.h
+++ b/kicker/libkicker/panner.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __panner_h__
#define __panner_h__
-#include <qwidget.h>
+#include <tqwidget.h>
#include "simplebutton.h"
@@ -36,17 +36,17 @@ class KDE_EXPORT Panner : public QWidget
Q_OBJECT
public:
- Panner( QWidget* parent, const char* name = 0 );
+ Panner( TQWidget* parent, const char* name = 0 );
~Panner();
- QSize minimumSizeHint() const { return QWidget::minimumSizeHint(); }
+ TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); }
Qt::Orientation orientation() const { return _orient; }
virtual void setOrientation(Orientation orientation);
- QWidget *viewport() const { return _viewport; }
+ TQWidget *viewport() const { return _viewport; }
- QRect contentsRect() const { return QRect(0, 0, width(), height()); }
+ TQRect contentsRect() const { return TQRect(0, 0, width(), height()); }
int contentsX() const { return _viewport ? -_viewport->x() : 0; }
int contentsY() const { return _viewport ? -_viewport->y() : 0; }
@@ -59,14 +59,14 @@ public:
void contentsToViewport( int x, int y, int& vx, int& vy ) const;
void viewportToContents( int vx, int vy, int& x, int& y ) const;
- QPoint contentsToViewport( const QPoint& ) const;
- QPoint viewportToContents( const QPoint& ) const;
+ QPoint contentsToViewport( const TQPoint& ) const;
+ QPoint viewportToContents( const TQPoint& ) const;
- void addChild(QWidget *child) { child->show(); }
- void removeChild(QWidget *child) { child->hide(); }
- int childX(QWidget *child) const { return child->x(); }
- int childY(QWidget *child) const { return child->y(); }
- void moveChild(QWidget *child, int x, int y) { child->move(x, y); }
+ void addChild(TQWidget *child) { child->show(); }
+ void removeChild(TQWidget *child) { child->hide(); }
+ int childX(TQWidget *child) const { return child->x(); }
+ int childY(TQWidget *child) const { return child->y(); }
+ void moveChild(TQWidget *child, int x, int y) { child->move(x, y); }
void ensureVisible( int x, int y );
void ensureVisible( int x, int y, int xmargin, int ymargin );
@@ -85,13 +85,13 @@ signals:
void contentsMoving(int x, int y);
protected:
- virtual bool eventFilter( QObject *obj, QEvent *e );
- virtual void resizeEvent(QResizeEvent *ev);
- virtual void viewportResizeEvent( QResizeEvent* );
- virtual void viewportMousePressEvent( QMouseEvent* );
- virtual void viewportMouseReleaseEvent( QMouseEvent* );
- virtual void viewportMouseDoubleClickEvent( QMouseEvent* );
- virtual void viewportMouseMoveEvent( QMouseEvent* );
+ virtual bool eventFilter( TQObject *obj, TQEvent *e );
+ virtual void resizeEvent(TQResizeEvent *ev);
+ virtual void viewportResizeEvent( TQResizeEvent* );
+ virtual void viewportMousePressEvent( TQMouseEvent* );
+ virtual void viewportMouseReleaseEvent( TQMouseEvent* );
+ virtual void viewportMouseDoubleClickEvent( TQMouseEvent* );
+ virtual void viewportMouseMoveEvent( TQMouseEvent* );
private:
void setupButtons();
@@ -99,14 +99,14 @@ private:
void updateScrollButtons();
Orientation _orient;
- QBoxLayout *_layout;
+ TQBoxLayout *_layout;
SimpleArrowButton *_luSB; // Left Scroll Button
SimpleArrowButton *_rdSB; // Right Scroll Button
- QTimer *_updateScrollButtonsTimer;
- QTimer *_scrollTimer;
+ TQTimer *_updateScrollButtonsTimer;
+ TQTimer *_scrollTimer;
- QWidget *_clipper;
- QWidget *_viewport;
+ TQWidget *_clipper;
+ TQWidget *_viewport;
int _cwidth, _cheight;
int _cx, _cy;
int _step;
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index 223e71982..4c28b2101 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -20,8 +20,8 @@
#include "simplebutton.h"
-#include <qpainter.h>
-#include <qstyle.h>
+#include <tqpainter.h>
+#include <tqstyle.h>
#include <kapplication.h>
#include <kcursor.h>
@@ -34,17 +34,17 @@
#define BUTTON_MARGIN KDialog::spacingHint()
-SimpleButton::SimpleButton(QWidget *parent, const char *name)
- : QButton(parent, name),
+SimpleButton::SimpleButton(TQWidget *parent, const char *name)
+ : TQButton(parent, name),
m_highlight(false),
m_orientation(Qt::Horizontal)
{
setBackgroundOrigin( AncestorOrigin );
- connect( kapp, SIGNAL( settingsChanged( int ) ),
- SLOT( slotSettingsChanged( int ) ) );
- connect( kapp, SIGNAL( iconChanged( int ) ),
- SLOT( slotIconChanged( int ) ) );
+ connect( kapp, TQT_SIGNAL( settingsChanged( int ) ),
+ TQT_SLOT( slotSettingsChanged( int ) ) );
+ connect( kapp, TQT_SIGNAL( iconChanged( int ) ),
+ TQT_SLOT( slotIconChanged( int ) ) );
kapp->addKipcEventMask( KIPC::SettingsChanged );
kapp->addKipcEventMask( KIPC::IconChanged );
@@ -52,9 +52,9 @@ SimpleButton::SimpleButton(QWidget *parent, const char *name)
slotSettingsChanged( KApplication::SETTINGS_MOUSE );
}
-void SimpleButton::setPixmap(const QPixmap &pix)
+void SimpleButton::setPixmap(const TQPixmap &pix)
{
- QButton::setPixmap(pix);
+ TQButton::setPixmap(pix);
generateIcons();
update();
}
@@ -65,39 +65,39 @@ void SimpleButton::setOrientation(Qt::Orientation orientation)
update();
}
-QSize SimpleButton::sizeHint() const
+TQSize SimpleButton::sizeHint() const
{
- const QPixmap* pm = pixmap();
+ const TQPixmap* pm = pixmap();
if (!pm)
- return QButton::sizeHint();
+ return TQButton::sizeHint();
else
- return QSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN);
+ return TQSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN);
}
-QSize SimpleButton::minimumSizeHint() const
+TQSize SimpleButton::minimumSizeHint() const
{
- const QPixmap* pm = pixmap();
+ const TQPixmap* pm = pixmap();
if (!pm)
- return QButton::minimumSizeHint();
+ return TQButton::minimumSizeHint();
else
- return QSize(pm->width(), pm->height());
+ return TQSize(pm->width(), pm->height());
}
-void SimpleButton::drawButton( QPainter *p )
+void SimpleButton::drawButton( TQPainter *p )
{
drawButtonLabel(p);
}
-void SimpleButton::drawButtonLabel( QPainter *p )
+void SimpleButton::drawButtonLabel( TQPainter *p )
{
if (!pixmap())
{
return;
}
- QPixmap pix = isEnabled() ? (m_highlight? m_activeIcon : m_normalIcon) : m_disabledIcon;
+ TQPixmap pix = isEnabled() ? (m_highlight? m_activeIcon : m_normalIcon) : m_disabledIcon;
if (isOn() || isDown())
{
@@ -110,7 +110,7 @@ void SimpleButton::drawButtonLabel( QPainter *p )
int ph = pix.height();
int pw = pix.width();
int margin = BUTTON_MARGIN;
- QPoint origin(margin / 2, margin / 2);
+ TQPoint origin(margin / 2, margin / 2);
if (ph < (h - margin))
{
@@ -132,7 +132,7 @@ void SimpleButton::generateIcons()
return;
}
- QImage image = pixmap()->convertToImage();
+ TQImage image = pixmap()->convertToImage();
KIconEffect effect;
m_normalIcon = effect.apply(image, KIcon::Panel, KIcon::DefaultState);
@@ -172,29 +172,29 @@ void SimpleButton::slotIconChanged( int group )
update();
}
-void SimpleButton::enterEvent( QEvent *e )
+void SimpleButton::enterEvent( TQEvent *e )
{
m_highlight = true;
repaint( false );
- QButton::enterEvent( e );
+ TQButton::enterEvent( e );
}
-void SimpleButton::leaveEvent( QEvent *e )
+void SimpleButton::leaveEvent( TQEvent *e )
{
m_highlight = false;
repaint( false );
- QButton::enterEvent( e );
+ TQButton::enterEvent( e );
}
-void SimpleButton::resizeEvent( QResizeEvent * )
+void SimpleButton::resizeEvent( TQResizeEvent * )
{
generateIcons();
}
-SimpleArrowButton::SimpleArrowButton(QWidget *parent, Qt::ArrowType arrow, const char *name)
+SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, const char *name)
: SimpleButton(parent, name)
{
setBackgroundOrigin(AncestorOrigin);
@@ -202,9 +202,9 @@ SimpleArrowButton::SimpleArrowButton(QWidget *parent, Qt::ArrowType arrow, const
_inside = false;
}
-QSize SimpleArrowButton::sizeHint() const
+TQSize SimpleArrowButton::sizeHint() const
{
- return QSize( 12, 12 );
+ return TQSize( 12, 12 );
}
void SimpleArrowButton::setArrowType(Qt::ArrowType a)
@@ -221,32 +221,32 @@ Qt::ArrowType SimpleArrowButton::arrowType() const
return _arrow;
}
-void SimpleArrowButton::drawButton( QPainter *p )
+void SimpleArrowButton::drawButton( TQPainter *p )
{
- QRect r(1, 1, width() - 2, height() - 2);
+ TQRect r(1, 1, width() - 2, height() - 2);
- QStyle::PrimitiveElement pe = QStyle::PE_ArrowLeft;
+ TQStyle::PrimitiveElement pe = TQStyle::PE_ArrowLeft;
switch (_arrow)
{
- case Qt::LeftArrow: pe = QStyle::PE_ArrowLeft; break;
- case Qt::RightArrow: pe = QStyle::PE_ArrowRight; break;
- case Qt::UpArrow: pe = QStyle::PE_ArrowUp; break;
- case Qt::DownArrow: pe = QStyle::PE_ArrowDown; break;
+ case Qt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break;
+ case Qt::RightArrow: pe = TQStyle::PE_ArrowRight; break;
+ case Qt::UpArrow: pe = TQStyle::PE_ArrowUp; break;
+ case Qt::DownArrow: pe = TQStyle::PE_ArrowDown; break;
}
- int flags = QStyle::Style_Default | QStyle::Style_Enabled;
- if (isDown() || isOn()) flags |= QStyle::Style_Down;
+ int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
+ if (isDown() || isOn()) flags |= TQStyle::Style_Down;
style().drawPrimitive(pe, p, r, colorGroup(), flags);
}
-void SimpleArrowButton::enterEvent( QEvent *e )
+void SimpleArrowButton::enterEvent( TQEvent *e )
{
_inside = true;
SimpleButton::enterEvent( e );
update();
}
-void SimpleArrowButton::leaveEvent( QEvent *e )
+void SimpleArrowButton::leaveEvent( TQEvent *e )
{
_inside = false;
SimpleButton::enterEvent( e );
diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h
index 5423dff6b..1ea5c7a44 100644
--- a/kicker/libkicker/simplebutton.h
+++ b/kicker/libkicker/simplebutton.h
@@ -21,8 +21,8 @@
#ifndef SIMPLEBUTTON_H
#define SIMPLEBUTTON_H
-#include <qbutton.h>
-#include <qpixmap.h>
+#include <tqbutton.h>
+#include <tqpixmap.h>
#include <kdemacros.h>
@@ -31,20 +31,20 @@ class KDE_EXPORT SimpleButton : public QButton
Q_OBJECT
public:
- SimpleButton(QWidget *parent, const char *name = 0);
- void setPixmap(const QPixmap &pix);
+ SimpleButton(TQWidget *parent, const char *name = 0);
+ void setPixmap(const TQPixmap &pix);
void setOrientation(Qt::Orientation orientaton);
- QSize sizeHint() const;
- QSize minimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
protected:
- void drawButton( QPainter *p );
- void drawButtonLabel( QPainter *p );
+ void drawButton( TQPainter *p );
+ void drawButtonLabel( TQPainter *p );
void generateIcons();
- void enterEvent( QEvent *e );
- void leaveEvent( QEvent *e );
- void resizeEvent( QResizeEvent *e );
+ void enterEvent( TQEvent *e );
+ void leaveEvent( TQEvent *e );
+ void resizeEvent( TQResizeEvent *e );
protected slots:
virtual void slotSettingsChanged( int category );
@@ -52,9 +52,9 @@ class KDE_EXPORT SimpleButton : public QButton
private:
bool m_highlight;
- QPixmap m_normalIcon;
- QPixmap m_activeIcon;
- QPixmap m_disabledIcon;
+ TQPixmap m_normalIcon;
+ TQPixmap m_activeIcon;
+ TQPixmap m_disabledIcon;
Qt::Orientation m_orientation;
class SimpleButtonPrivate;
SimpleButtonPrivate* d;
@@ -65,14 +65,14 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
Q_OBJECT
public:
- SimpleArrowButton(QWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0);
+ SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0);
virtual ~SimpleArrowButton() {};
- QSize sizeHint() const;
+ TQSize sizeHint() const;
protected:
- virtual void enterEvent( QEvent *e );
- virtual void leaveEvent( QEvent *e );
- virtual void drawButton(QPainter *p);
+ virtual void enterEvent( TQEvent *e );
+ virtual void leaveEvent( TQEvent *e );
+ virtual void drawButton(TQPainter *p);
Qt::ArrowType arrowType() const;
public slots:
diff --git a/kicker/menuext/find/findmenu.cpp b/kicker/menuext/find/findmenu.cpp
index fc3ae12a6..24020e0c2 100644
--- a/kicker/menuext/find/findmenu.cpp
+++ b/kicker/menuext/find/findmenu.cpp
@@ -31,8 +31,8 @@
K_EXPORT_KICKER_MENUEXT( find, FindMenu )
-FindMenu::FindMenu( QWidget *parent, const char *name,
- const QStringList &/*args*/)
+FindMenu::FindMenu( TQWidget *parent, const char *name,
+ const TQStringList &/*args*/)
: KPanelMenu( "", parent, name )
{
}
@@ -44,19 +44,19 @@ FindMenu::~FindMenu()
void FindMenu::initialize()
{
- QStringList list = KGlobal::dirs()->findAllResources( "data", "kicker/menuext/find/*.desktop", false, true );
+ TQStringList list = KGlobal::dirs()->findAllResources( "data", "kicker/menuext/find/*.desktop", false, true );
list.sort();
int id = 0;
mConfigList.clear();
- for ( QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
+ for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
KSimpleConfig config( *it, true );
config.setDesktopGroup();
mConfigList.append( *it );
- QString text = config.readEntry( "Name" );
+ TQString text = config.readEntry( "Name" );
insertItem( SmallIconSet( config.readEntry( "Icon" ) ), text, id );
id++;
@@ -65,7 +65,7 @@ void FindMenu::initialize()
void FindMenu::slotExec( int pos )
{
- QString app = mConfigList[ pos ];
+ TQString app = mConfigList[ pos ];
kapp->propagateSessionManager();
diff --git a/kicker/menuext/find/findmenu.h b/kicker/menuext/find/findmenu.h
index 2297c4dff..09bd06aca 100644
--- a/kicker/menuext/find/findmenu.h
+++ b/kicker/menuext/find/findmenu.h
@@ -33,7 +33,7 @@ class FindMenu : public KPanelMenu
Q_OBJECT
public:
- FindMenu( QWidget* parent, const char* name, const QStringList &/*args*/ );
+ FindMenu( TQWidget* parent, const char* name, const TQStringList &/*args*/ );
~FindMenu();
protected slots:
@@ -41,7 +41,7 @@ class FindMenu : public KPanelMenu
void slotExec( int );
private:
- QStringList mConfigList;
+ TQStringList mConfigList;
};
#endif
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index 63cee8106..584a345aa 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -32,18 +32,18 @@
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
-#include <qvalidator.h>
+#include <tqvalidator.h>
-class Validator : public QValidator {
+class Validator : public TQValidator {
public:
- Validator( QObject *parent ) : QValidator( parent, 0 ) {}
+ Validator( TQObject *parent ) : TQValidator( parent, 0 ) {}
~Validator() {}
- virtual QValidator::State validate( QString &, int & ) const { return QValidator::Acceptable; }
+ virtual TQValidator::State validate( TQString &, int & ) const { return TQValidator::Acceptable; }
};
K_EXPORT_KICKER_MENUEXT(kate, KateSessionMenu)
-KateSessionMenu::KateSessionMenu( QWidget *parent, const char *name, const QStringList& )
+KateSessionMenu::KateSessionMenu( TQWidget *parent, const char *name, const TQStringList& )
: KPanelMenu( parent, name ),
m_parent( parent )
{
@@ -76,8 +76,8 @@ void KateSessionMenu::initialize()
insertSeparator();
- QStringList list = KGlobal::dirs()->findAllResources( "data", "kate/sessions/*.katesession", false, true);
- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
+ TQStringList list = KGlobal::dirs()->findAllResources( "data", "kate/sessions/*.katesession", false, true);
+ for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
KSimpleConfig config( *it, true );
config.setGroup( "General" );
@@ -86,14 +86,14 @@ void KateSessionMenu::initialize()
m_sessions.sort();
- for ( QStringList::ConstIterator it1 = m_sessions.begin(); it1 != m_sessions.end(); ++it1 )
+ for ( TQStringList::ConstIterator it1 = m_sessions.begin(); it1 != m_sessions.end(); ++it1 )
{
insertItem( *it1, id++ );
}
// means for updating, to let the user manually update if he/she added new sessions.
insertSeparator();
- insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, SLOT(reinitialize()) );
+ insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQT_SLOT(reinitialize()) );
}
void KateSessionMenu::slotExec( int id )
@@ -101,7 +101,7 @@ void KateSessionMenu::slotExec( int id )
if ( id < 0 )
return;
- QStringList args;
+ TQStringList args;
if ( id > 0 )
args << "--start";
@@ -109,9 +109,9 @@ void KateSessionMenu::slotExec( int id )
if ( id == 1 )
{
bool ok (false);
- QString name = KInputDialog::getText( i18n("Session Name"),
+ TQString name = KInputDialog::getText( i18n("Session Name"),
i18n("Please enter a name for the new session"),
- QString::null,
+ TQString::null,
&ok, 0, 0, new Validator( m_parent ) );
if ( ! ok )
return;
diff --git a/kicker/menuext/kate/katesessionmenu.h b/kicker/menuext/kate/katesessionmenu.h
index ea78bf6ba..3d5519496 100644
--- a/kicker/menuext/kate/katesessionmenu.h
+++ b/kicker/menuext/kate/katesessionmenu.h
@@ -26,7 +26,7 @@
class KateSessionMenu : public KPanelMenu {
Q_OBJECT
public:
- KateSessionMenu( QWidget *parent=0, const char *name=0, const QStringList& /*args*/=QStringList() );
+ KateSessionMenu( TQWidget *parent=0, const char *name=0, const TQStringList& /*args*/=TQStringList() );
~KateSessionMenu();
public slots:
@@ -36,8 +36,8 @@ class KateSessionMenu : public KPanelMenu {
virtual void slotExec( int id );
private:
- QStringList m_sessions;
- QWidget *m_parent;
+ TQStringList m_sessions;
+ TQWidget *m_parent;
};
#endif // _KateSessionMenu_h_
diff --git a/kicker/menuext/kdeprint/print_mnu.cpp b/kicker/menuext/kdeprint/print_mnu.cpp
index 8b2679432..eb2dbd8ab 100644
--- a/kicker/menuext/kdeprint/print_mnu.cpp
+++ b/kicker/menuext/kdeprint/print_mnu.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kapplication.h>
#include <krun.h>
#include <kdeprint/kmmanager.h>
-#include <qregexp.h>
+#include <tqregexp.h>
K_EXPORT_KICKER_MENUEXT(kdeprint, PrintMenu)
@@ -40,7 +40,7 @@ K_EXPORT_KICKER_MENUEXT(kdeprint, PrintMenu)
#define KPRINTER_ID 5
#define PRINTER_LIST_ID 10
-PrintMenu::PrintMenu(QWidget *parent, const char *name, const QStringList & /*args*/)
+PrintMenu::PrintMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/)
: KPanelMenu("", parent, name)
{
static bool kdeprintIconsInitialized = false;
@@ -75,11 +75,11 @@ void PrintMenu::initialize()
insertItem(SmallIconSet("fileprint"), i18n("Print File..."), KPRINTER_ID);
// printer list
- QPtrList<KMPrinter> *l = KMManager::self()->printerList();
+ TQPtrList<KMPrinter> *l = KMManager::self()->printerList();
if (l && !l->isEmpty())
{
bool separatorInserted = false;
- QPtrListIterator<KMPrinter> it(*l);
+ TQPtrListIterator<KMPrinter> it(*l);
for (; it.current(); ++it)
{
// no special, implicit or pure instances
@@ -106,10 +106,10 @@ void PrintMenu::slotExec(int ID)
kapp->kdeinitExec("kaddprinterwizard");
break;
case KDEPRINT_SETTINGS_ID:
- kapp->kdeinitExec("kaddprinterwizard", QStringList("--kdeconfig"));
+ kapp->kdeinitExec("kaddprinterwizard", TQStringList("--kdeconfig"));
break;
case CONFIG_SERVER_ID:
- kapp->kdeinitExec("kaddprinterwizard", QStringList("--serverconfig"));
+ kapp->kdeinitExec("kaddprinterwizard", TQStringList("--serverconfig"));
break;
case PRINT_MANAGER_ID:
KRun::runCommand("kcmshell kde-printers.desktop");
@@ -123,7 +123,7 @@ void PrintMenu::slotExec(int ID)
default:
{
// start kjobviewer
- QStringList args;
+ TQStringList args;
args << "--show" << "-d" << text(ID).remove('&');
kapp->kdeinitExec("kjobviewer", args);
}
diff --git a/kicker/menuext/kdeprint/print_mnu.h b/kicker/menuext/kdeprint/print_mnu.h
index a80da4be2..da795c039 100644
--- a/kicker/menuext/kdeprint/print_mnu.h
+++ b/kicker/menuext/kdeprint/print_mnu.h
@@ -32,7 +32,7 @@ class PrintMenu : public KPanelMenu, public KPReloadObject
Q_OBJECT
public:
- PrintMenu(QWidget *parent, const char *name, const QStringList & /*args*/);
+ PrintMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/);
~PrintMenu();
protected slots:
diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp
index 3ac09e050..4010bace7 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.cpp
+++ b/kicker/menuext/konq-profiles/konqy_menu.cpp
@@ -31,12 +31,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kio/global.h>
#include <ksimpleconfig.h>
-#include <qregexp.h>
-#include <qfileinfo.h>
+#include <tqregexp.h>
+#include <tqfileinfo.h>
K_EXPORT_KICKER_MENUEXT(konqueror, KonquerorProfilesMenu)
-KonquerorProfilesMenu::KonquerorProfilesMenu(QWidget *parent, const char *name, const QStringList & /*args*/)
+KonquerorProfilesMenu::KonquerorProfilesMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/)
: KPanelMenu("", parent, name)
{
static bool kdeprintIconsInitialized = false;
@@ -55,16 +55,16 @@ void KonquerorProfilesMenu::initialize()
if (initialized()) clear();
setInitialized(true);
- QStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
+ TQStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
m_profiles.resize(profiles.count());
int id=1;
- QStringList::ConstIterator pEnd = profiles.end();
- for (QStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt )
+ TQStringList::ConstIterator pEnd = profiles.end();
+ for (TQStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt )
{
- QFileInfo info( *pIt );
- QString profileName = KIO::decodeFileName( info.baseName() );
- QString niceName=profileName;
+ TQFileInfo info( *pIt );
+ TQString profileName = KIO::decodeFileName( info.baseName() );
+ TQString niceName=profileName;
KSimpleConfig cfg( *pIt, true );
if ( cfg.hasGroup( "Profile" ) )
{
@@ -81,7 +81,7 @@ void KonquerorProfilesMenu::initialize()
void KonquerorProfilesMenu::slotExec(int id)
{
- QStringList args;
+ TQStringList args;
args<<"--profile"<<m_profiles[id-1];
kapp->kdeinitExec("konqueror", args);
}
diff --git a/kicker/menuext/konq-profiles/konqy_menu.h b/kicker/menuext/konq-profiles/konqy_menu.h
index f47b026ee..ba3bb19f7 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.h
+++ b/kicker/menuext/konq-profiles/konqy_menu.h
@@ -26,14 +26,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kpanelmenu.h>
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
class KonquerorProfilesMenu : public KPanelMenu
{
Q_OBJECT
public:
- KonquerorProfilesMenu(QWidget *parent, const char *name, const QStringList & /*args*/);
+ KonquerorProfilesMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/);
~KonquerorProfilesMenu();
protected slots:
@@ -43,7 +43,7 @@ class KonquerorProfilesMenu : public KPanelMenu
protected:
void reload();
- QValueVector<QString> m_profiles;
+ TQValueVector<TQString> m_profiles;
};
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index 87df6f268..afd1127f6 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -27,8 +27,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <unistd.h>
#include <sys/stat.h>
-#include <qdir.h>
-#include <qfileinfo.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
#include <kapplication.h>
#include <kglobal.h>
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
K_EXPORT_KICKER_MENUEXT(konsole, KonsoleMenu)
-KonsoleMenu::KonsoleMenu(QWidget *parent, const char *name, const QStringList& /* args */)
+KonsoleMenu::KonsoleMenu(TQWidget *parent, const char *name, const TQStringList& /* args */)
: KPanelMenu("", parent, name),
m_profileMenu(0),
m_bookmarksSession(0),
@@ -58,8 +58,8 @@ KonsoleMenu::~KonsoleMenu()
}
static void insertItemSorted(KPopupMenu *menu,
- const QIconSet &iconSet,
- const QString &txt, int id)
+ const TQIconSet &iconSet,
+ const TQString &txt, int id)
{
const int defaultId = 1; // The id of the 'new' item.
int index = menu->indexOf(defaultId);
@@ -96,17 +96,17 @@ void KonsoleMenu::initialize()
setInitialized(true);
- QStringList list = KGlobal::dirs()->findAllResources("data",
+ TQStringList list = KGlobal::dirs()->findAllResources("data",
"konsole/*.desktop",
false, true);
- QString defaultShell = locate("data", "konsole/shell.desktop");
+ TQString defaultShell = locate("data", "konsole/shell.desktop");
list.prepend(defaultShell);
int id = 1;
sessionList.clear();
- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
+ for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
if ((*it == defaultShell) && (id != 1))
{
@@ -115,10 +115,10 @@ void KonsoleMenu::initialize()
KSimpleConfig conf(*it, true /* read only */);
conf.setDesktopGroup();
- QString text = conf.readEntry("Name");
+ TQString text = conf.readEntry("Name");
// try to locate the binary
- QString exec= conf.readPathEntry("Exec");
+ TQString exec= conf.readPathEntry("Exec");
if (exec.startsWith("su -c \'"))
{
exec = exec.mid(7,exec.length()-8);
@@ -126,7 +126,7 @@ void KonsoleMenu::initialize()
exec = KRun::binaryName(exec, false);
exec = KShell::tildeExpand(exec);
- QString pexec = KGlobal::dirs()->findExe(exec);
+ TQString pexec = KGlobal::dirs()->findExe(exec);
if (text.isEmpty() ||
conf.readEntry("Type") != "KonsoleApplication" ||
(!exec.isEmpty() && pexec.isEmpty()))
@@ -135,7 +135,7 @@ void KonsoleMenu::initialize()
}
insertItemSorted(this, SmallIconSet(conf.readEntry("Icon", "konsole")),
text, id++);
- QFileInfo fi(*it);
+ TQFileInfo fi(*it);
sessionList.append(fi.baseName(true));
if (id == 2)
@@ -150,27 +150,27 @@ void KonsoleMenu::initialize()
insertItem(SmallIconSet("keditbookmarks"),
i18n("New Session at Bookmark"), m_bookmarksSession);
connect(m_bookmarkHandlerSession,
- SIGNAL(openURL(const QString&, const QString&)),
- SLOT(newSession(const QString&, const QString&)));
+ TQT_SIGNAL(openURL(const TQString&, const TQString&)),
+ TQT_SLOT(newSession(const TQString&, const TQString&)));
screenList.clear();
- QCString screenDir = getenv("SCREENDIR");
+ TQCString screenDir = getenv("SCREENDIR");
if (screenDir.isEmpty())
{
- screenDir = QFile::encodeName(QDir::homeDirPath()) + "/.screen/";
+ screenDir = TQFile::encodeName(TQDir::homeDirPath()) + "/.screen/";
}
- QStringList sessions;
- // Can't use QDir as it doesn't support FIFOs :(
+ TQStringList sessions;
+ // Can't use TQDir as it doesn't support FIFOs :(
DIR *dir = opendir(screenDir);
if (dir)
{
struct dirent *entry;
while ((entry = readdir(dir)))
{
- QCString path = screenDir + "/" + entry->d_name;
+ TQCString path = screenDir + "/" + entry->d_name;
struct stat st;
if (stat(path, &st) != 0)
{
@@ -182,7 +182,7 @@ void KonsoleMenu::initialize()
(fd = open(path, O_WRONLY | O_NONBLOCK)) != -1)
{
::close(fd);
- screenList.append(QFile::decodeName(entry->d_name));
+ screenList.append(TQFile::decodeName(entry->d_name));
insertItem(SmallIconSet("konsole"),
i18n("Screen is a program controlling screens!",
"Screen at %1").arg(entry->d_name), id);
@@ -197,16 +197,16 @@ void KonsoleMenu::initialize()
delete m_profileMenu;
m_profileMenu = new KPopupMenu(this);
- QStringList profiles = KGlobal::dirs()->findAllResources("data",
+ TQStringList profiles = KGlobal::dirs()->findAllResources("data",
"konsole/profiles/*",
false, true );
m_profiles.resize(profiles.count());
- QStringList::ConstIterator pEnd = profiles.end();
- for (QStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt)
+ TQStringList::ConstIterator pEnd = profiles.end();
+ for (TQStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt)
{
- QFileInfo info(*pIt);
- QString profileName = KIO::decodeFileName(info.baseName());
- QString niceName = profileName;
+ TQFileInfo info(*pIt);
+ TQString profileName = KIO::decodeFileName(info.baseName());
+ TQString niceName = profileName;
KSimpleConfig cfg(*pIt, true);
if (cfg.hasGroup("Profile"))
{
@@ -229,11 +229,11 @@ void KonsoleMenu::initialize()
// we don't have any profiles, disable the menu
setItemEnabled(profileID, false);
}
- connect(m_profileMenu, SIGNAL(activated(int)), SLOT(launchProfile(int)));
+ connect(m_profileMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(launchProfile(int)));
insertSeparator();
insertItem(SmallIconSet("reload"),
- i18n("Reload Sessions"), this, SLOT(reinitialize()));
+ i18n("Reload Sessions"), this, TQT_SLOT(reinitialize()));
}
void KonsoleMenu::slotExec(int id)
@@ -245,7 +245,7 @@ void KonsoleMenu::slotExec(int id)
--id;
kapp->propagateSessionManager();
- QStringList args;
+ TQStringList args;
if (static_cast<unsigned int>(id) < sessionList.count())
{
args << "--type";
@@ -271,7 +271,7 @@ void KonsoleMenu::launchProfile(int id)
--id;
// this is a session, not a bookmark, so execute that instead
- QStringList args;
+ TQStringList args;
args << "--profile" << m_profiles[id];
kapp->kdeinitExec("konsole", args);
}
@@ -283,9 +283,9 @@ KURL KonsoleMenu::baseURL() const
return url;
}
-void KonsoleMenu::newSession(const QString& sURL, const QString& title)
+void KonsoleMenu::newSession(const TQString& sURL, const TQString& title)
{
- QStringList args;
+ TQStringList args;
KURL url = KURL(sURL);
if ((url.protocol() == "file") && (url.hasPath()))
@@ -297,8 +297,8 @@ void KonsoleMenu::newSession(const QString& sURL, const QString& title)
}
else if ((!url.protocol().isEmpty()) && (url.hasHost()))
{
- QString protocol = url.protocol();
- QString host = url.host();
+ TQString protocol = url.protocol();
+ TQString host = url.host();
args << "-T" << title;
args << "-e" << protocol.latin1(); /* argv[0] == command to run. */
if (url.hasUser()) {
diff --git a/kicker/menuext/konsole/konsole_mnu.h b/kicker/menuext/konsole/konsole_mnu.h
index 988764124..e64c53212 100644
--- a/kicker/menuext/konsole/konsole_mnu.h
+++ b/kicker/menuext/konsole/konsole_mnu.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef _konsole_mnu_h_
#define _konsole_mnu_h_
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
#include <kpanelmenu.h>
#include <klibloader.h>
@@ -38,7 +38,7 @@ class KonsoleMenu : public KPanelMenu/*, public KPReloadObject*/
Q_OBJECT
public:
- KonsoleMenu(QWidget *parent, const char *name, const QStringList& /* args */);
+ KonsoleMenu(TQWidget *parent, const char *name, const TQStringList& /* args */);
~KonsoleMenu();
KURL baseURL() const;
@@ -47,13 +47,13 @@ protected slots:
void slotExec(int id);
void launchProfile(int id);
void initialize();
- void newSession(const QString& sURL, const QString& title);
+ void newSession(const TQString& sURL, const TQString& title);
private:
- QStringList sessionList;
- QStringList screenList;
- QValueVector<QString> m_profiles;
+ TQStringList sessionList;
+ TQStringList screenList;
+ TQValueVector<TQString> m_profiles;
KPopupMenu* m_profileMenu;
KPopupMenu* m_bookmarksSession;
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index c9f8e2806..46967b54c 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -3,7 +3,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <qtextstream.h>
+#include <tqtextstream.h>
#include <kbookmarkimporter.h>
#include <kmimetype.h>
@@ -16,20 +16,20 @@
#include "konsolebookmarkhandler.h"
KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool )
- : QObject( konsole, "KonsoleBookmarkHandler" ),
+ : TQObject( konsole, "KonsoleBookmarkHandler" ),
KBookmarkOwner(),
m_konsole( konsole ),
m_importStream( 0L )
{
m_menu = new KPopupMenu( konsole, "bookmark menu" );
- QString file = locate( "data", "konsole/bookmarks.xml" );
+ TQString file = locate( "data", "konsole/bookmarks.xml" );
if ( file.isEmpty() )
file = locateLocal( "data", "konsole/bookmarks.xml" );
// import old bookmarks
if ( !KStandardDirs::exists( file ) ) {
- QString oldFile = locate( "data", "kfile/bookmarks.html" );
+ TQString oldFile = locate( "data", "kfile/bookmarks.html" );
if ( !oldFile.isEmpty() )
importOldBookmarks( oldFile, file );
}
@@ -38,20 +38,20 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool )
manager->setUpdate( true );
manager->setShowNSBookmarks( false );
- connect( manager, SIGNAL( changed(const QString &, const QString &) ),
- SLOT( slotBookmarksChanged(const QString &, const QString &) ) );
+ connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
+ TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) );
m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu,
NULL, false, /*Not toplevel*/
false /*No 'Add Bookmark'*/ );
}
-QString KonsoleBookmarkHandler::currentURL() const
+TQString KonsoleBookmarkHandler::currentURL() const
{
return m_konsole->baseURL().url();
}
-void KonsoleBookmarkHandler::importOldBookmarks( const QString& path,
- const QString& destinationPath )
+void KonsoleBookmarkHandler::importOldBookmarks( const TQString& path,
+ const TQString& destinationPath )
{
KSaveFile file( destinationPath );
if ( file.status() != 0 )
@@ -62,13 +62,13 @@ void KonsoleBookmarkHandler::importOldBookmarks( const QString& path,
KNSBookmarkImporter importer( path );
connect( &importer,
- SIGNAL( newBookmark( const QString&, const QCString&, const QString& )),
- SLOT( slotNewBookmark( const QString&, const QCString&, const QString& )));
+ TQT_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )),
+ TQT_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& )));
connect( &importer,
- SIGNAL( newFolder( const QString&, bool, const QString& )),
- SLOT( slotNewFolder( const QString&, bool, const QString& )));
- connect( &importer, SIGNAL( newSeparator() ), SLOT( newSeparator() ));
- connect( &importer, SIGNAL( endMenu() ), SLOT( endMenu() ));
+ TQT_SIGNAL( newFolder( const TQString&, bool, const TQString& )),
+ TQT_SLOT( slotNewFolder( const TQString&, bool, const TQString& )));
+ connect( &importer, TQT_SIGNAL( newSeparator() ), TQT_SLOT( newSeparator() ));
+ connect( &importer, TQT_SIGNAL( endMenu() ), TQT_SLOT( endMenu() ));
importer.parseNSBookmarks( false );
@@ -78,24 +78,24 @@ void KonsoleBookmarkHandler::importOldBookmarks( const QString& path,
m_importStream = 0L;
}
-void KonsoleBookmarkHandler::slotNewBookmark( const QString& /*text*/,
- const QCString& url,
- const QString& additionalInfo )
+void KonsoleBookmarkHandler::slotNewBookmark( const TQString& /*text*/,
+ const TQCString& url,
+ const TQString& additionalInfo )
{
*m_importStream << "<bookmark icon=\"" << KMimeType::iconForURL( KURL( url ) );
- *m_importStream << "\" href=\"" << QString::fromUtf8(url) << "\">\n";
- *m_importStream << "<title>" << (additionalInfo.isEmpty() ? QString::fromUtf8(url) : additionalInfo) << "</title>\n</bookmark>\n";
+ *m_importStream << "\" href=\"" << TQString::fromUtf8(url) << "\">\n";
+ *m_importStream << "<title>" << (additionalInfo.isEmpty() ? TQString::fromUtf8(url) : additionalInfo) << "</title>\n</bookmark>\n";
}
-void KonsoleBookmarkHandler::slotNewFolder( const QString& text, bool /*open*/,
- const QString& /*additionalInfo*/ )
+void KonsoleBookmarkHandler::slotNewFolder( const TQString& text, bool /*open*/,
+ const TQString& /*additionalInfo*/ )
{
*m_importStream << "<folder icon=\"bookmark_folder\">\n<title=\"";
*m_importStream << text << "\">\n";
}
-void KonsoleBookmarkHandler::slotBookmarksChanged( const QString &,
- const QString & )
+void KonsoleBookmarkHandler::slotBookmarksChanged( const TQString &,
+ const TQString & )
{
// This is called when someone changes bookmarks in konsole....
m_bookmarkMenu->slotBookmarksChanged("");
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.h b/kicker/menuext/konsole/konsolebookmarkhandler.h
index b22f0d03d..eed2c00d6 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.h
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.h
@@ -12,42 +12,42 @@ class KPopupMenu;
class KonsoleBookmarkMenu;
class KonsoleMenu;
-class KonsoleBookmarkHandler : public QObject, public KBookmarkOwner
+class KonsoleBookmarkHandler : public TQObject, public KBookmarkOwner
{
Q_OBJECT
public:
KonsoleBookmarkHandler( KonsoleMenu *konsole, bool toplevel );
- QPopupMenu * popupMenu();
+ TQPopupMenu * popupMenu();
// KBookmarkOwner interface:
- virtual void openBookmarkURL( const QString& url, const QString& title )
+ virtual void openBookmarkURL( const TQString& url, const TQString& title )
{ emit openURL( url, title ); }
- virtual QString currentURL() const;
+ virtual TQString currentURL() const;
KPopupMenu *menu() const { return m_menu; }
signals:
- void openURL( const QString& url, const QString& title );
+ void openURL( const TQString& url, const TQString& title );
private slots:
// for importing
- void slotNewBookmark( const QString& text, const QCString& url,
- const QString& additionalInfo );
- void slotNewFolder( const QString& text, bool open,
- const QString& additionalInfo );
- void slotBookmarksChanged( const QString &, const QString & caller );
+ void slotNewBookmark( const TQString& text, const TQCString& url,
+ const TQString& additionalInfo );
+ void slotNewFolder( const TQString& text, bool open,
+ const TQString& additionalInfo );
+ void slotBookmarksChanged( const TQString &, const TQString & caller );
void newSeparator();
void endFolder();
private:
- void importOldBookmarks( const QString& path, const QString& destinationPath );
+ void importOldBookmarks( const TQString& path, const TQString& destinationPath );
KonsoleMenu *m_konsole;
KPopupMenu *m_menu;
KonsoleBookmarkMenu *m_bookmarkMenu;
- QTextStream *m_importStream;
+ TQTextStream *m_importStream;
protected:
virtual void virtual_hook( int id, void* data );
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
index b10d26c40..1a31fe55c 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <qtextstream.h>
+#include <tqtextstream.h>
#include <kbookmarkimporter.h>
#include <kmimetype.h>
@@ -14,7 +14,7 @@
#include "konsolebookmarkmenu.h"
#include "konsolebookmarkhandler.h"
-#include <qfile.h>
+#include <tqfile.h>
#include <kaction.h>
#include <klocale.h>
@@ -23,7 +23,7 @@
KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu,
KActionCollection *collec, bool _isRoot, bool _add,
- const QString & parentAddress )
+ const TQString & parentAddress )
: KBookmarkMenu( mgr, _owner, _parentMenu, collec, _isRoot, _add,
parentAddress),
m_kOwner(_owner)
@@ -31,14 +31,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
/*
* First, we disconnect KBookmarkMenu::slotAboutToShow()
* Then, we connect KonsoleBookmarkMenu::slotAboutToShow().
- * They are named differently because the SLOT() macro thinks we want
+ * They are named differently because the TQT_SLOT() macro thinks we want
* KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow()
* Could this be solved if slotAboutToShow() is virtual in KBookmarMenu?
*/
- disconnect( _parentMenu, SIGNAL( aboutToShow() ), this,
- SLOT( slotAboutToShow() ) );
- connect( _parentMenu, SIGNAL( aboutToShow() ),
- SLOT( slotAboutToShow2() ) );
+ disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this,
+ TQT_SLOT( slotAboutToShow() ) );
+ connect( _parentMenu, TQT_SIGNAL( aboutToShow() ),
+ TQT_SLOT( slotAboutToShow2() ) );
}
/*
@@ -64,7 +64,7 @@ void KonsoleBookmarkMenu::refill()
{
//kdDebug(1203) << "KBookmarkMenu::refill()" << endl;
m_lstSubMenus.clear();
- QPtrListIterator<KAction> it( m_actions );
+ TQPtrListIterator<KAction> it( m_actions );
for (; it.current(); ++it )
it.current()->unplug( m_parentMenu );
m_parentMenu->clear();
@@ -86,7 +86,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
addNewFolder();
if ( m_pManager->showNSBookmarks()
- && QFile::exists( KNSBookmarkImporter::netscapeBookmarksFile() ) )
+ && TQFile::exists( KNSBookmarkImporter::netscapeBookmarksFile() ) )
{
m_parentMenu->insertSeparator();
@@ -98,10 +98,10 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
KonsoleBookmarkMenu *subMenu = new KonsoleBookmarkMenu( m_pManager,
m_kOwner, actionMenu->popupMenu(),
m_actionCollection, false,
- m_bAddBookmark, QString::null );
+ m_bAddBookmark, TQString::null );
m_lstSubMenus.append(subMenu);
- connect( actionMenu->popupMenu(), SIGNAL(aboutToShow()), subMenu,
- SLOT(slotNSLoad()));
+ connect( actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu,
+ TQT_SLOT(slotNSLoad()));
}
}
@@ -111,7 +111,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
for ( KBookmark bm = parentBookmark.first(); !bm.isNull();
bm = parentBookmark.next(bm) )
{
- QString text = bm.text();
+ TQString text = bm.text();
text.replace( '&', "&&" );
if ( !separatorInserted && m_bIsRoot) { // inserted before the first konq bookmark, to avoid the separator if no konq bookmark
m_parentMenu->insertSeparator();
@@ -128,7 +128,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
// kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl;
// create a normal URL item, with ID as a name
KAction * action = new KAction( text, bm.icon(), 0,
- this, SLOT( slotBookmarkSelected() ),
+ this, TQT_SLOT( slotBookmarkSelected() ),
m_actionCollection, bm.url().url().utf8() );
action->setStatusText( bm.url().prettyURL() );
@@ -163,21 +163,21 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
void KonsoleBookmarkMenu::slotBookmarkSelected()
{
KAction * a;
- QString b;
+ TQString b;
if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
a = (KAction*)sender();
b = a->text();
- m_kOwner->openBookmarkURL( QString::fromUtf8(sender()->name()), /* URL */
+ m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */
( (KAction *)sender() )->text() /* Title */ );
}
void KonsoleBookmarkMenu::slotNSBookmarkSelected()
{
KAction *a;
- QString b;
+ TQString b;
- QString link(sender()->name()+8);
+ TQString link(sender()->name()+8);
a = (KAction*)sender();
b = a->text();
m_kOwner->openBookmarkURL( link, /*URL */
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.h b/kicker/menuext/konsole/konsolebookmarkmenu.h
index 65e87f0f5..681236708 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.h
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.h
@@ -1,9 +1,9 @@
#ifndef KONSOLEBOOKMARKMENU_H
#define KONSOLEBOOKMARKMENU_H
-#include <qptrlist.h>
-#include <qptrstack.h>
-#include <qobject.h>
+#include <tqptrlist.h>
+#include <tqptrstack.h>
+#include <tqobject.h>
#include <sys/types.h>
#include <kbookmark.h>
#include <kbookmarkmenu.h>
@@ -29,7 +29,7 @@ public:
KonsoleBookmarkMenu( KBookmarkManager* mgr,
KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu,
KActionCollection *collec, bool _isRoot,
- bool _add = true, const QString & parentAddress = "");
+ bool _add = true, const TQString & parentAddress = "");
void fillBookmarkMenu();
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index dd157d2cb..0c072e026 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qcursor.h>
-#include <qtimer.h>
+#include <tqcursor.h>
+#include <tqtimer.h>
#include <kapplication.h>
#include <kglobal.h>
@@ -43,28 +43,28 @@ K_EXPORT_KICKER_MENUEXT(prefmenu, PrefMenu)
const int idStart = 4242;
-PrefMenu::PrefMenu(QWidget *parent,
+PrefMenu::PrefMenu(TQWidget *parent,
const char *name,
- const QStringList &/*args*/)
+ const TQStringList &/*args*/)
: KPanelMenu(i18n("Settings"), parent, name),
m_clearOnClose(false)
{
}
-PrefMenu::PrefMenu(const QString& label,
- const QString& root,
- QWidget *parent)
+PrefMenu::PrefMenu(const TQString& label,
+ const TQString& root,
+ TQWidget *parent)
: KPanelMenu(label, parent),
m_clearOnClose(false),
m_root(root)
{
m_subMenus.setAutoDelete(true);
- connect(KSycoca::self(), SIGNAL(databaseChanged()),
- this, SLOT(clearOnClose()));
+ connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()),
+ this, TQT_SLOT(clearOnClose()));
- connect(this, SIGNAL(aboutToHide()),
- this, SLOT(aboutToClose()));
+ connect(this, TQT_SIGNAL(aboutToHide()),
+ this, TQT_SLOT(aboutToClose()));
}
PrefMenu::~PrefMenu()
@@ -74,11 +74,11 @@ PrefMenu::~PrefMenu()
void PrefMenu::insertMenuItem(KService::Ptr& s,
int nId,
int nIndex,
- const QStringList *suppressGenericNames)
+ const TQStringList *suppressGenericNames)
{
- QString serviceName = s->name();
+ TQString serviceName = s->name();
// add comment
- QString comment = s->genericName();
+ TQString comment = s->genericName();
if (!comment.isEmpty())
{
if (KickerSettings::menuEntryFormat() == KickerSettings::NameAndDescription)
@@ -86,12 +86,12 @@ void PrefMenu::insertMenuItem(KService::Ptr& s,
if (!suppressGenericNames ||
!suppressGenericNames->contains(s->untranslatedGenericName()))
{
- serviceName = QString("%1 (%2)").arg(serviceName).arg(comment);
+ serviceName = TQString("%1 (%2)").arg(serviceName).arg(comment);
}
}
else if (KickerSettings::menuEntryFormat() == KickerSettings::DescriptionAndName)
{
- serviceName = QString("%1 (%2)").arg(comment).arg(serviceName);
+ serviceName = TQString("%1 (%2)").arg(comment).arg(serviceName);
}
else if (KickerSettings::menuEntryFormat() == KickerSettings::DescriptionOnly)
{
@@ -126,13 +126,13 @@ void PrefMenu::insertMenuItem(KService::Ptr& s,
m_entryMap.insert(newId, static_cast<KSycocaEntry*>(s));
}
-void PrefMenu::mousePressEvent(QMouseEvent * ev)
+void PrefMenu::mousePressEvent(TQMouseEvent * ev)
{
m_dragStartPos = ev->pos();
KPanelMenu::mousePressEvent(ev);
}
-void PrefMenu::mouseMoveEvent(QMouseEvent * ev)
+void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
{
KPanelMenu::mouseMoveEvent(ev);
@@ -141,8 +141,8 @@ void PrefMenu::mouseMoveEvent(QMouseEvent * ev)
return;
}
- QPoint p = ev->pos() - m_dragStartPos;
- if (p.manhattanLength() <= QApplication::startDragDistance())
+ TQPoint p = ev->pos() - m_dragStartPos;
+ if (p.manhattanLength() <= TQApplication::startDragDistance())
{
return;
}
@@ -163,7 +163,7 @@ void PrefMenu::mouseMoveEvent(QMouseEvent * ev)
KSycocaEntry * e = m_entryMap[id];
- QPixmap icon;
+ TQPixmap icon;
KURL url;
switch (e->sycocaType())
@@ -171,7 +171,7 @@ void PrefMenu::mouseMoveEvent(QMouseEvent * ev)
case KST_KService:
{
icon = static_cast<KService *>(e)->pixmap(KIcon::Small);
- QString filePath = static_cast<KService *>(e)->desktopEntryPath();
+ TQString filePath = static_cast<KService *>(e)->desktopEntryPath();
if (filePath[0] != '/')
{
filePath = locate("apps", filePath);
@@ -198,17 +198,17 @@ void PrefMenu::mouseMoveEvent(QMouseEvent * ev)
// If the path to the desktop file is relative, try to get the full
// path from KStdDirs.
KURLDrag *d = new KURLDrag(KURL::List(url), this);
- connect(d, SIGNAL(destroyed()), this, SLOT(dragObjectDestroyed()));
+ connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(dragObjectDestroyed()));
d->setPixmap(icon);
d->dragCopy();
// Set the startposition outside the panel, so there is no drag initiated
// when we use drag and click to select items. A drag is only initiated when
// you click to open the menu, and then press and drag an item.
- m_dragStartPos = QPoint(-1,-1);
+ m_dragStartPos = TQPoint(-1,-1);
}
-void PrefMenu::dragEnterEvent(QDragEnterEvent *event)
+void PrefMenu::dragEnterEvent(TQDragEnterEvent *event)
{
// Set the DragObject's target to this widget. This is needed because the
// widget doesn't accept drops, but we want to determine if the drag object
@@ -221,10 +221,10 @@ void PrefMenu::dragEnterEvent(QDragEnterEvent *event)
event->ignore();
}
-void PrefMenu::dragLeaveEvent(QDragLeaveEvent */*event*/)
+void PrefMenu::dragLeaveEvent(TQDragLeaveEvent */*event*/)
{
// see PrefMenu::dragEnterEvent why this is nescessary
- if (!frameGeometry().contains(QCursor::pos()))
+ if (!frameGeometry().contains(TQCursor::pos()))
{
KURLDrag::setTarget(0);
}
@@ -240,13 +240,13 @@ void PrefMenu::initialize()
// Set the startposition outside the panel, so there is no drag initiated
// when we use drag and click to select items. A drag is only initiated when
// you click to open the menu, and then press and drag an item.
- m_dragStartPos = QPoint(-1,-1);
+ m_dragStartPos = TQPoint(-1,-1);
if (m_root.isEmpty())
{
insertItem(KickerLib::menuIconSet("kcontrol"),
i18n("Control Center"),
- this, SLOT(launchControlCenter()));
+ this, TQT_SLOT(launchControlCenter()));
insertSeparator();
}
@@ -269,7 +269,7 @@ void PrefMenu::initialize()
int id = idStart;
- QStringList suppressGenericNames = root->suppressGenericNames();
+ TQStringList suppressGenericNames = root->suppressGenericNames();
KServiceGroup::List::ConstIterator it = list.begin();
for (; it != list.end(); ++it)
@@ -280,7 +280,7 @@ void PrefMenu::initialize()
{
KServiceGroup::Ptr g(static_cast<KServiceGroup *>(e));
- QString groupCaption = g->caption();
+ TQString groupCaption = g->caption();
// Avoid adding empty groups.
KServiceGroup::Ptr subMenuRoot = KServiceGroup::group(g->relPath());
@@ -332,8 +332,8 @@ void PrefMenu::slotExec(int id)
KSycocaEntry *e = m_entryMap[id];
KService::Ptr service = static_cast<KService *>(e);
KApplication::startServiceByDesktopPath(service->desktopEntryPath(),
- QStringList(), 0, 0, 0, "", true);
- m_dragStartPos = QPoint(-1,-1);
+ TQStringList(), 0, 0, 0, "", true);
+ m_dragStartPos = TQPoint(-1,-1);
}
void PrefMenu::clearOnClose()
@@ -358,7 +358,7 @@ void PrefMenu::slotClear()
// QPopupMenu's aboutToHide() is emitted before the popup is really hidden,
// and also before a click in the menu is handled, so do the clearing
// only after that has been handled
- QTimer::singleShot( 100, this, SLOT( slotClear()));
+ TQTimer::singleShot( 100, this, TQT_SLOT( slotClear()));
return;
}
@@ -378,7 +378,7 @@ void PrefMenu::aboutToClose()
void PrefMenu::launchControlCenter()
{
- KApplication::startServiceByDesktopName("kcontrol", QStringList(),
+ KApplication::startServiceByDesktopName("kcontrol", TQStringList(),
0, 0, 0, "", true);
}
diff --git a/kicker/menuext/prefmenu/prefmenu.h b/kicker/menuext/prefmenu/prefmenu.h
index 99c3772fc..d673fceef 100644
--- a/kicker/menuext/prefmenu/prefmenu.h
+++ b/kicker/menuext/prefmenu/prefmenu.h
@@ -24,40 +24,40 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef _prefmenu_h_
#define _prefmenu_h_
-#include <qmap.h>
+#include <tqmap.h>
#include <kpanelmenu.h>
#include <ksycocaentry.h>
-typedef QMap<int, KSycocaEntry::Ptr> EntryMap;
-typedef QPtrList<QPopupMenu> PopupMenuList;
+typedef TQMap<int, KSycocaEntry::Ptr> EntryMap;
+typedef TQPtrList<TQPopupMenu> PopupMenuList;
class PrefMenu : public KPanelMenu
{
Q_OBJECT
public:
- PrefMenu(QWidget *parent,
+ PrefMenu(TQWidget *parent,
const char *name,
- const QStringList & /*args*/);
- PrefMenu(const QString& label,
- const QString& root,
- QWidget *parent);
+ const TQStringList & /*args*/);
+ PrefMenu(const TQString& label,
+ const TQString& root,
+ TQWidget *parent);
~PrefMenu();
protected:
void insertMenuItem(KService::Ptr & s,
int nId,
int nIndex= -1,
- const QStringList *suppressGenericNames = 0);
- virtual void mousePressEvent(QMouseEvent *);
- virtual void mouseMoveEvent(QMouseEvent *);
- virtual void dragEnterEvent(QDragEnterEvent *);
- virtual void dragLeaveEvent(QDragLeaveEvent *);
+ const TQStringList *suppressGenericNames = 0);
+ virtual void mousePressEvent(TQMouseEvent *);
+ virtual void mouseMoveEvent(TQMouseEvent *);
+ virtual void dragEnterEvent(TQDragEnterEvent *);
+ virtual void dragLeaveEvent(TQDragLeaveEvent *);
bool m_clearOnClose;
- QString m_root;
- QPoint m_dragStartPos;
+ TQString m_root;
+ TQPoint m_dragStartPos;
EntryMap m_entryMap;
PopupMenuList m_subMenus;
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index 06c84d7a6..b8c3c6d81 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qdragobject.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqdragobject.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <kglobal.h>
#include <kiconloader.h>
@@ -39,8 +39,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
K_EXPORT_KICKER_MENUEXT(recentdocs, RecentDocsMenu)
-RecentDocsMenu::RecentDocsMenu(QWidget *parent, const char *name,
- const QStringList &/*args*/)
+RecentDocsMenu::RecentDocsMenu(TQWidget *parent, const char *name,
+ const TQStringList &/*args*/)
: KPanelMenu(KRecentDocument::recentDocumentDirectory(), parent, name)
{
}
@@ -52,7 +52,7 @@ RecentDocsMenu::~RecentDocsMenu()
void RecentDocsMenu::initialize() {
if (initialized()) clear();
- insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, SLOT(slotClearHistory()));
+ insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQT_SLOT(slotClearHistory()));
insertSeparator();
_fileList = KRecentDocument::recentDocuments();
@@ -65,24 +65,24 @@ void RecentDocsMenu::initialize() {
int id = 0;
char alreadyPresentInMenu;
- QStringList previousEntries;
- for (QStringList::ConstIterator it = _fileList.begin(); it != _fileList.end(); ++it) {
+ TQStringList previousEntries;
+ for (TQStringList::ConstIterator it = _fileList.begin(); it != _fileList.end(); ++it) {
KDesktopFile f(*it, true /* read only */);
// Make sure this entry is not already present in the menu
alreadyPresentInMenu = 0;
- for ( QStringList::Iterator previt = previousEntries.begin(); previt != previousEntries.end(); ++previt ) {
- if (QString::localeAwareCompare(*previt, f.readName().replace('&', QString::fromAscii("&&") )) == 0) {
+ for ( TQStringList::Iterator previt = previousEntries.begin(); previt != previousEntries.end(); ++previt ) {
+ if (TQString::localeAwareCompare(*previt, f.readName().replace('&', TQString::fromAscii("&&") )) == 0) {
alreadyPresentInMenu = 1;
}
}
if (alreadyPresentInMenu == 0) {
// Add item to menu
- insertItem(SmallIconSet(f.readIcon()), f.readName().replace('&', QString::fromAscii("&&") ), id++);
+ insertItem(SmallIconSet(f.readIcon()), f.readName().replace('&', TQString::fromAscii("&&") ), id++);
// Append to duplicate checking list
- previousEntries.append(f.readName().replace('&', QString::fromAscii("&&") ));
+ previousEntries.append(f.readName().replace('&', TQString::fromAscii("&&") ));
}
}
@@ -103,12 +103,12 @@ void RecentDocsMenu::slotExec(int id) {
}
}
-void RecentDocsMenu::mousePressEvent(QMouseEvent* e) {
+void RecentDocsMenu::mousePressEvent(TQMouseEvent* e) {
_mouseDown = e->pos();
- QPopupMenu::mousePressEvent(e);
+ TQPopupMenu::mousePressEvent(e);
}
-void RecentDocsMenu::mouseMoveEvent(QMouseEvent* e) {
+void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) {
KPanelMenu::mouseMoveEvent(e);
if (!(e->state() & LeftButton))
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.h b/kicker/menuext/recentdocs/recentdocsmenu.h
index 1e3157495..d2e777570 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.h
+++ b/kicker/menuext/recentdocs/recentdocsmenu.h
@@ -34,7 +34,7 @@ class RecentDocsMenu : public KPanelMenu
Q_OBJECT
public:
- RecentDocsMenu(QWidget* parent, const char* name, const QStringList &/*args*/);
+ RecentDocsMenu(TQWidget* parent, const char* name, const TQStringList &/*args*/);
~RecentDocsMenu();
void initialize();
@@ -44,12 +44,12 @@ protected slots:
void slotAboutToShow();
protected:
- void mousePressEvent(QMouseEvent* e);
- void mouseMoveEvent(QMouseEvent* e);
+ void mousePressEvent(TQMouseEvent* e);
+ void mouseMoveEvent(TQMouseEvent* e);
private:
- QStringList _fileList;
- QPoint _mouseDown;
+ TQStringList _fileList;
+ TQPoint _mouseDown;
};
#endif // RECENTDOCSMENU_H
diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp
index 42b3d5339..c09f9a825 100644
--- a/kicker/menuext/remote/remotemenu.cpp
+++ b/kicker/menuext/remote/remotemenu.cpp
@@ -27,9 +27,9 @@
#include <kdesktopfile.h>
#include <kservice.h>
-#include <qpixmap.h>
-#include <qdir.h>
-#include <qtimer.h>
+#include <tqpixmap.h>
+#include <tqdir.h>
+#include <tqtimer.h>
#include "kickerSettings.h"
@@ -38,16 +38,16 @@
K_EXPORT_KICKER_MENUEXT(remotemenu, RemoteMenu)
-RemoteMenu::RemoteMenu(QWidget *parent, const char *name,
- const QStringList &/*args*/)
+RemoteMenu::RemoteMenu(TQWidget *parent, const char *name,
+ const TQStringList &/*args*/)
: KPanelMenu(parent, name), KDirNotify()
{
KGlobal::dirs()->addResourceType("remote_entries",
KStandardDirs::kde_default("data") + "remoteview");
- QString path = KGlobal::dirs()->saveLocation("remote_entries");
+ TQString path = KGlobal::dirs()->saveLocation("remote_entries");
- QDir dir = path;
+ TQDir dir = path;
if (!dir.exists())
{
dir.cdUp();
@@ -68,35 +68,35 @@ void RemoteMenu::initialize()
}
id = insertItem(SmallIcon("wizard"), i18n("Add Network Folder"));
- connectItem(id, this, SLOT(startWizard()));
+ connectItem(id, this, TQT_SLOT(startWizard()));
id = insertItem(SmallIcon("kfm"), i18n("Manage Network Folders"));
- connectItem(id, this, SLOT(openRemoteDir()));
+ connectItem(id, this, TQT_SLOT(openRemoteDir()));
insertSeparator();
m_desktopMap.clear();
- QStringList names_found;
- QStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries");
+ TQStringList names_found;
+ TQStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries");
- QStringList::ConstIterator dirpath = dirList.begin();
- QStringList::ConstIterator end = dirList.end();
+ TQStringList::ConstIterator dirpath = dirList.begin();
+ TQStringList::ConstIterator end = dirList.end();
for(; dirpath!=end; ++dirpath)
{
- QDir dir = *dirpath;
+ TQDir dir = *dirpath;
if (!dir.exists()) continue;
- QStringList filenames
- = dir.entryList( QDir::Files | QDir::Readable );
+ TQStringList filenames
+ = dir.entryList( TQDir::Files | TQDir::Readable );
- QStringList::ConstIterator name = filenames.begin();
- QStringList::ConstIterator endf = filenames.end();
+ TQStringList::ConstIterator name = filenames.begin();
+ TQStringList::ConstIterator endf = filenames.end();
for(; name!=endf; ++name)
{
if (!names_found.contains(*name))
{
names_found.append(*name);
- QString filename = *dirpath+*name;
+ TQString filename = *dirpath+*name;
KDesktopFile desktop(filename);
id = insertItem(SmallIcon(desktop.readIcon()), desktop.readName());
m_desktopMap[id] = filename;
diff --git a/kicker/menuext/remote/remotemenu.h b/kicker/menuext/remote/remotemenu.h
index 1e46bb4e3..607e1fc64 100644
--- a/kicker/menuext/remote/remotemenu.h
+++ b/kicker/menuext/remote/remotemenu.h
@@ -22,7 +22,7 @@
#include <kdirnotify.h>
#include <kpanelmenu.h>
-#include <qmap.h>
+#include <tqmap.h>
class RemoteMenu : public KPanelMenu, public KDirNotify
{
@@ -30,8 +30,8 @@ class RemoteMenu : public KPanelMenu, public KDirNotify
K_DCOP
public:
- RemoteMenu(QWidget *parent, const char *name,
- const QStringList & /*args*/);
+ RemoteMenu(TQWidget *parent, const char *name,
+ const TQStringList & /*args*/);
~RemoteMenu();
k_dcop:
@@ -47,7 +47,7 @@ class RemoteMenu : public KPanelMenu, public KDirNotify
void slotExec(int id);
private:
- QMap<int, QString> m_desktopMap;
+ TQMap<int, TQString> m_desktopMap;
};
#endif
diff --git a/kicker/menuext/system/systemmenu.cpp b/kicker/menuext/system/systemmenu.cpp
index 68c3f5c66..12ec087d8 100644
--- a/kicker/menuext/system/systemmenu.cpp
+++ b/kicker/menuext/system/systemmenu.cpp
@@ -21,19 +21,19 @@
#include <krun.h>
#include <kiconloader.h>
-#include <qpixmap.h>
+#include <tqpixmap.h>
#include "global.h"
K_EXPORT_KICKER_MENUEXT(systemmenu, SystemMenu)
-SystemMenu::SystemMenu(QWidget *parent, const char *name,
- const QStringList &/*args*/)
+SystemMenu::SystemMenu(TQWidget *parent, const char *name,
+ const TQStringList &/*args*/)
: KPanelMenu( parent, name)
{
- connect( &m_dirLister, SIGNAL( completed() ),
- this, SLOT( slotCompleted() ) );
+ connect( &m_dirLister, TQT_SIGNAL( completed() ),
+ this, TQT_SLOT( slotCompleted() ) );
m_dirLister.openURL(KURL("system:/"));
}
@@ -42,8 +42,8 @@ SystemMenu::~SystemMenu()
{
}
-void SystemMenu::append(const QString &icon, const KURL &url,
- const QString &label)
+void SystemMenu::append(const TQString &icon, const KURL &url,
+ const TQString &label)
{
int id = insertItem(KickerLib::menuIconSet(icon), label);
m_urlMap.insert(id, url);
@@ -68,9 +68,9 @@ void SystemMenu::initialize()
for (; it!=end; ++it)
{
- QString icon = (*it)->iconName();
+ TQString icon = (*it)->iconName();
KURL url = (*it)->url();
- QString name = (*it)->name();
+ TQString name = (*it)->name();
append(icon, url, name);
}
}
diff --git a/kicker/menuext/system/systemmenu.h b/kicker/menuext/system/systemmenu.h
index 6f118d21c..f25280989 100644
--- a/kicker/menuext/system/systemmenu.h
+++ b/kicker/menuext/system/systemmenu.h
@@ -30,8 +30,8 @@ class SystemMenu : public KPanelMenu
Q_OBJECT
public:
- SystemMenu(QWidget *parent, const char *name,
- const QStringList & /*args*/);
+ SystemMenu(TQWidget *parent, const char *name,
+ const TQStringList & /*args*/);
~SystemMenu();
protected slots:
@@ -41,10 +41,10 @@ class SystemMenu : public KPanelMenu
void slotCompleted();
private:
- void append(const QString &icon, const KURL &url, const QString &label);
+ void append(const TQString &icon, const KURL &url, const TQString &label);
KDirLister m_dirLister;
KFileItemList m_entries;
- QMap<int, KURL> m_urlMap;
+ TQMap<int, KURL> m_urlMap;
};
#endif
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index 80ea3e71d..3a4ebf4ed 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -23,15 +23,15 @@ using namespace std;
#include <pwd.h>
#include <sys/types.h>
-#include <qdir.h>
-#include <qimage.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qregexp.h>
-#include <qsettings.h>
-#include <qstyle.h>
-#include <qfile.h>
+#include <tqdir.h>
+#include <tqimage.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpainter.h>
+#include <tqregexp.h>
+#include <tqsettings.h>
+#include <tqstyle.h>
+#include <tqfile.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -69,51 +69,51 @@ extern "C"
}
};
-TOMFactory::TOMFactory(QObject *parent, const char *name)
+TOMFactory::TOMFactory(TQObject *parent, const char *name)
: KLibFactory(parent, name)
{
}
-QObject* TOMFactory::createObject(QObject *parent, const char *name, const char*, const QStringList&)
+TQObject* TOMFactory::createObject(TQObject *parent, const char *name, const char*, const TQStringList&)
{
- return new TOM((QWidget*)parent, name);
+ return new TOM((TQWidget*)parent, name);
}
-#include <qmenudata.h>
+#include <tqmenudata.h>
/*
* TODO: switch the backgroundmode when translucency turns on/off
* TODO: catch font changes too?
*/
-class runMenuWidget : public QWidget, public QMenuItem
+class runMenuWidget : public TQWidget, public QMenuItem
{
public:
runMenuWidget(KPopupMenu* parent, int index)
- : QWidget (parent),
+ : TQWidget (parent),
m_menu(parent),
m_index(index)
{
setFocusPolicy(StrongFocus);
- QHBoxLayout* runLayout = new QHBoxLayout(this);
+ TQHBoxLayout* runLayout = new TQHBoxLayout(this);
textRect = fontMetrics().boundingRect(i18n("Run:"));
runLayout->setSpacing(KDialog::spacingHint());
runLayout->addSpacing((KDialog::spacingHint() * 3) + KIcon::SizeMedium + textRect.width());
icon = DesktopIcon("run", KIcon::SizeMedium);
- /*QLabel* l1 = new QLabel(this);
- QPixmap foo = DesktopIcon("run", KIcon::SizeMedium);
+ /*TQLabel* l1 = new TQLabel(this);
+ TQPixmap foo = DesktopIcon("run", KIcon::SizeMedium);
cout << "foo is: " << foo.width() << " by " << foo.height() << endl;
l1->setPixmap(foo);
runLayout->addWidget(l1);*/
- /*QLabel* l2 = new QLabel(i18n("&Run: "), this);
+ /*TQLabel* l2 = new TQLabel(i18n("&Run: "), this);
l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
l2->setBuddy(this);
runLayout->addWidget(l2);*/
m_runEdit = new KHistoryCombo(this);
- m_runEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+ m_runEdit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
runLayout->addWidget(m_runEdit, 10);
runLayout->addSpacing(KDialog::spacingHint());
- QSettings settings;
+ TQSettings settings;
if (settings.readEntry("/KStyle/Settings/MenuTransparencyEngine", "Disabled") != "Disabled")
{
setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
@@ -138,18 +138,18 @@ class runMenuWidget : public QWidget, public QMenuItem
~runMenuWidget() {}
- void paintEvent(QPaintEvent * /*e*/)
+ void paintEvent(TQPaintEvent * /*e*/)
{
- QPainter p(this);
- QRect r(rect());
+ TQPainter p(this);
+ TQRect r(rect());
// ew, nasty hack. may result in coredumps due to horrid C-style cast???
- kapp->style().drawControl(QStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), QStyle::Style_Enabled,
- QStyleOption(static_cast<QMenuItem*>(this), 0, KIcon::SizeMedium ));
+ kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled,
+ TQStyleOption(static_cast<TQMenuItem*>(this), 0, KIcon::SizeMedium ));
p.drawPixmap(KDialog::spacingHint(), 1, icon);
p.drawText((KDialog::spacingHint() * 2) + KIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:"));
}
- void focusInEvent (QFocusEvent* e)
+ void focusInEvent (TQFocusEvent* e)
{
if (!e || e->gotFocus())
{
@@ -158,7 +158,7 @@ class runMenuWidget : public QWidget, public QMenuItem
}
}
- void enterEvent(QEvent*)
+ void enterEvent(TQEvent*)
{
focusInEvent(0);
}
@@ -166,12 +166,12 @@ class runMenuWidget : public QWidget, public QMenuItem
private:
KPopupMenu* m_menu;
KHistoryCombo* m_runEdit;
- QPixmap icon;
- QRect textRect;
+ TQPixmap icon;
+ TQRect textRect;
int m_index;
};
-TOM::TOM(QWidget *parent, const char *name)
+TOM::TOM(TQWidget *parent, const char *name)
: KPanelMenu(parent, name),
m_maxIndex(0)
{
@@ -199,7 +199,7 @@ TOM::~TOM()
slotClear();
}
-void TOM::initializeRecentApps(QPopupMenu* menu)
+void TOM::initializeRecentApps(TQPopupMenu* menu)
{
/*
* TODO: make this real
@@ -217,7 +217,7 @@ void TOM::initializeRecentDocs()
{
m_recentDocsMenu->clear();
m_recentDocsMenu->insertItem(SmallIconSet("history_clear"), i18n("Clear History"),
- this, SLOT(clearRecentDocHistory()));
+ this, TQT_SLOT(clearRecentDocHistory()));
m_recentDocsMenu->insertSeparator();
m_recentDocURLs = KRecentDocument::recentDocuments();
@@ -229,7 +229,7 @@ void TOM::initializeRecentDocs()
}
int id = 0;
- for (QStringList::ConstIterator it = m_recentDocURLs.begin();
+ for (TQStringList::ConstIterator it = m_recentDocURLs.begin();
it != m_recentDocURLs.end();
++it)
{
@@ -258,8 +258,8 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu)
return 0;
}
- QString name = config.readEntry("Name", i18n("Unknown"));
- QString icon = config.readEntry("Icon");
+ TQString name = config.readEntry("Name", i18n("Unknown"));
+ TQString icon = config.readEntry("Icon");
int numTasks = config.readNumEntry("NumTasks", 0);
if (numTasks < 1)
@@ -272,7 +272,7 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu)
{
taskGroup = new KPopupMenu(this);
- if (icon != QString::null)
+ if (icon != TQString::null)
{
insertItem(DesktopIcon(icon, KIcon::SizeMedium), name, taskGroup);
}
@@ -289,7 +289,7 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu)
int foundTasks = 0;
for (int i = 0; i < numTasks; ++i)
{
- QString groupName = QString("Task%1").arg(i);
+ TQString groupName = TQString("Task%1").arg(i);
if (config.hasGroup(groupName))
{
@@ -300,10 +300,10 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu)
continue;
}
- QString name = config.readEntry("Name");
+ TQString name = config.readEntry("Name");
// in case the name contains an ampersand, double 'em up
name.replace("&", "&&");
- QString desktopfile = config.readPathEntry("DesktopFile");
+ TQString desktopfile = config.readPathEntry("DesktopFile");
KService::Ptr pService = KService::serviceByDesktopPath(desktopfile);
if (!pService)
@@ -316,12 +316,12 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu)
}
}
- QString execName = pService->name();
- QString icon = pService->icon();
+ TQString execName = pService->name();
+ TQString icon = pService->icon();
if (m_detailedTaskEntries && !execName.isEmpty())
{
- QString tmp = i18n("%1 (%2)");
+ TQString tmp = i18n("%1 (%2)");
if (m_detailedNamesFirst)
{
@@ -341,7 +341,7 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu)
else
{
- QIconSet iconset = BarIconSet(icon, 22);
+ TQIconSet iconset = BarIconSet(icon, 22);
if (iconset.isNull())
taskGroup->insertItem(name, m_maxIndex);
else
@@ -365,13 +365,13 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu)
return 0;
}
- connect(taskGroup, SIGNAL(activated(int)), this, SLOT(runTask(int)));
+ connect(taskGroup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(runTask(int)));
// so we have an actual task group menu with tasks, let's add it
if (inSubMenu)
{
- QObject::connect(taskGroup, SIGNAL(aboutToShowContextMenu(KPopupMenu*, int, QPopupMenu*)),
- this, SLOT(contextualizeRMBmenu(KPopupMenu*, int, QPopupMenu*)));
+ TQObject::connect(taskGroup, TQT_SIGNAL(aboutToShowContextMenu(KPopupMenu*, int, TQPopupMenu*)),
+ this, TQT_SLOT(contextualizeRMBmenu(KPopupMenu*, int, TQPopupMenu*)));
m_submenus.append(taskGroup);
@@ -382,14 +382,14 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu)
{
taskGroup->insertSeparator();
taskGroup->insertItem("Modify These Tasks", configureMenuID);
- QPopupMenu* rmbMenu = taskGroup->contextMenu();
+ TQPopupMenu* rmbMenu = taskGroup->contextMenu();
rmbMenu->setFont(m_largerFont);
KPopupTitle* title = new KPopupTitle();
title->setText(i18n("%1 Menu Editor").arg(name));
rmbMenu->insertItem(title, contextMenuTitleID);
rmbMenu->insertItem(i18n("Add This Task to Panel"));
rmbMenu->insertItem(i18n("Modify This Task..."));
- rmbMenu->insertItem(i18n("Remove This Task..."), this, SLOT(removeTask()));
+ rmbMenu->insertItem(i18n("Remove This Task..."), this, TQT_SLOT(removeTask()));
rmbMenu->insertItem(i18n("Insert New Task..."));
}
}
@@ -428,27 +428,27 @@ void TOM::initialize()
/*if (!loadSidePixmap())
{
- m_sidePixmap = m_sideTilePixmap = QPixmap();
+ m_sidePixmap = m_sideTilePixmap = TQPixmap();
}
else
{
- connect(kapp, SIGNAL(kdisplayPaletteChanged()), SLOT(paletteChanged()));
+ connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
}*/
// TASKS
insertTitle(i18n("Tasks"), contextMenuTitleID);
- QStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/tom/");
- QStringList::ConstIterator dIt = dirs.begin();
- QStringList::ConstIterator dEnd = dirs.end();
+ TQStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/tom/");
+ TQStringList::ConstIterator dIt = dirs.begin();
+ TQStringList::ConstIterator dEnd = dirs.end();
for (; dIt != dEnd; ++dIt )
{
- QDir dir(*dIt);
+ TQDir dir(*dIt);
- QStringList entries = dir.entryList("*rc", QDir::Files);
- QStringList::ConstIterator eIt = entries.begin();
- QStringList::ConstIterator eEnd = entries.end();
+ TQStringList entries = dir.entryList("*rc", TQDir::Files);
+ TQStringList::ConstIterator eIt = entries.begin();
+ TQStringList::ConstIterator eEnd = entries.end();
for (; eIt != eEnd; ++eIt )
{
@@ -457,7 +457,7 @@ void TOM::initialize()
}
}
- PanelServiceMenu* moreApps = new PanelServiceMenu(QString::null, QString::null, this, "More Applications");
+ PanelServiceMenu* moreApps = new PanelServiceMenu(TQString::null, TQString::null, this, "More Applications");
moreApps->setFont(m_largerFont);
insertItem(DesktopIcon("misc", KIcon::SizeMedium), i18n("More Applications"), moreApps);
m_submenus.append(moreApps);
@@ -472,9 +472,9 @@ void TOM::initialize()
// DESTINATIONS
insertTitle(i18n("Destinations"), destMenuTitleID);
int numDests = 0;
- QString destinationsConfig = locate("appdata", "tom/destinations");
+ TQString destinationsConfig = locate("appdata", "tom/destinations");
- if (!destinationsConfig.isEmpty() && QFile::exists(destinationsConfig))
+ if (!destinationsConfig.isEmpty() && TQFile::exists(destinationsConfig))
{
KConfig config(destinationsConfig);
numDests = appendTaskGroup(config, false);
@@ -486,7 +486,7 @@ void TOM::initialize()
}
else if (kapp->authorize("run_command"))
{
- insertItem(DesktopIcon("run", KIcon::SizeMedium), i18n("Run Command..."), this, SLOT(runCommand()));
+ insertItem(DesktopIcon("run", KIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
}
// RECENTLY USED ITEMS
@@ -494,8 +494,8 @@ void TOM::initialize()
m_recentDocsMenu = new KPopupMenu(this, "recentDocs");
m_recentDocsMenu->setFont(m_largerFont);
- connect(m_recentDocsMenu, SIGNAL(aboutToShow()), this, SLOT(initializeRecentDocs()));
- connect(m_recentDocsMenu, SIGNAL(activated(int)), this, SLOT(openRecentDocument(int)));
+ connect(m_recentDocsMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(initializeRecentDocs()));
+ connect(m_recentDocsMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openRecentDocument(int)));
insertItem(DesktopIcon("document", KIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu);
m_submenus.append(m_recentDocsMenu);
@@ -512,16 +512,16 @@ void TOM::initialize()
// if we have no destinations, put the run command here
if (numDests == 0 && kapp->authorize("run_command"))
{
- insertItem(DesktopIcon("run", KIcon::SizeMedium), i18n("Run Command..."), this, SLOT(runCommand()));
+ insertItem(DesktopIcon("run", KIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
}
KConfig* config = KGlobal::config();
- QStringList menu_ext = config->readListEntry("Extensions");
+ TQStringList menu_ext = config->readListEntry("Extensions");
if (!menu_ext.isEmpty())
{
bool needSeparator = false;
- for (QStringList::ConstIterator it = menu_ext.begin(); it != menu_ext.end(); ++it)
+ for (TQStringList::ConstIterator it = menu_ext.begin(); it != menu_ext.end(); ++it)
{
MenuInfo info(*it);
if (!info.isValid())
@@ -546,11 +546,11 @@ void TOM::initialize()
}
- QString username;
+ TQString username;
struct passwd *userInfo = getpwuid(getuid());
if (userInfo)
{
- username = QString::fromLocal8Bit(userInfo->pw_gecos);
+ username = TQString::fromLocal8Bit(userInfo->pw_gecos);
if (username.find(',') != -1)
{
// Remove everything from and including first comma
@@ -559,12 +559,12 @@ void TOM::initialize()
if (username.isEmpty())
{
- username = QString::fromLocal8Bit(userInfo->pw_name);
+ username = TQString::fromLocal8Bit(userInfo->pw_name);
}
}
insertItem(DesktopIcon("exit", KIcon::SizeMedium),
- i18n("Logout %1").arg(username), this, SLOT(logout()));
+ i18n("Logout %1").arg(username), this, TQT_SLOT(logout()));
}
void TOM::reload()
@@ -573,7 +573,7 @@ void TOM::reload()
initialize();
}
-void TOM::contextualizeRMBmenu(KPopupMenu* menu, int menuItem, QPopupMenu* ctxMenu)
+void TOM::contextualizeRMBmenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu)
{
if (menuItem == configureMenuID)
{
@@ -582,7 +582,7 @@ void TOM::contextualizeRMBmenu(KPopupMenu* menu, int menuItem, QPopupMenu* ctxMe
}
ctxMenu->removeItem(contextMenuTitleID);
- QString text = menu->text(menuItem);
+ TQString text = menu->text(menuItem);
int parens = text.find('(') - 1;
if (parens > 0)
{
@@ -608,7 +608,7 @@ void TOM::slotExec(int /* id */)
void TOM::removeTask()
{
// TODO: write this change out to the appropriate config file
- QString task = KPopupMenu::contextMenuFocus()->text(KPopupMenu::contextMenuFocusItem());
+ TQString task = KPopupMenu::contextMenuFocus()->text(KPopupMenu::contextMenuFocusItem());
if (KMessageBox::warningContinueCancel(this,
i18n("<qt>Are you sure you want to remove the <strong>%1</strong> task?<p>"
"<em>Tip: You can restore the task after it has been removed by selecting the &quot;Modify These Tasks&quot; entry</em></qt>").arg(task),
@@ -629,12 +629,12 @@ void TOM::removeTask()
bool TOM::loadSidePixmap()
{
KConfig *config = KGlobal::config();
- QColor color = palette().active().highlight();
- QImage image;
+ TQColor color = palette().active().highlight();
+ TQImage image;
config->setGroup("WM");
- QColor activeTitle = config->readColorEntry("activeBackground", &color);
- QColor inactiveTitle = config->readColorEntry("inactiveBackground", &color);
+ TQColor activeTitle = config->readColorEntry("activeBackground", &color);
+ TQColor inactiveTitle = config->readColorEntry("inactiveBackground", &color);
config->setGroup("KMenu");
if (!config->readBoolEntry("Usem_sidePixmap", true))
@@ -667,8 +667,8 @@ bool TOM::loadSidePixmap()
}
color.setRgb(r, g, b);
- QString sideName = config->readEntry("SideName", "kside.png");
- QString sideTileName = config->readEntry("SideTileName", "kside_tile.png");
+ TQString sideName = config->readEntry("SideName", "kside.png");
+ TQString sideTileName = config->readEntry("SideTileName", "kside_tile.png");
image.load(locate("data", "kicker/pics/" + sideName));
@@ -699,8 +699,8 @@ bool TOM::loadSidePixmap()
if (m_sideTilePixmap.height() < 100)
{
int tiles = (int)(100 / m_sideTilePixmap.height()) + 1;
- QPixmap preTiledPixmap(m_sideTilePixmap.width(), m_sideTilePixmap.height() * tiles);
- QPainter p(&preTiledPixmap);
+ TQPixmap preTiledPixmap(m_sideTilePixmap.width(), m_sideTilePixmap.height() * tiles);
+ TQPainter p(&preTiledPixmap);
p.drawTiledPixmap(preTiledPixmap.rect(), m_sideTilePixmap);
m_sideTilePixmap = preTiledPixmap;
}
@@ -711,15 +711,15 @@ bool TOM::loadSidePixmap()
void TOM::paletteChanged()
{
if (!loadSidePixmap())
- m_sidePixmap = m_sideTilePixmap = QPixmap();
+ m_sidePixmap = m_sideTilePixmap = TQPixmap();
}
-void TOM::setMinimumSize(const QSize & s)
+void TOM::setMinimumSize(const TQSize & s)
{
KPanelMenu::setMinimumSize(s.width() + m_sidePixmap.width(), s.height());
}
-void TOM::setMaximumSize(const QSize & s)
+void TOM::setMaximumSize(const TQSize & s)
{
KPanelMenu::setMaximumSize(s.width() + m_sidePixmap.width(), s.height());
}
@@ -734,33 +734,33 @@ void TOM::setMaximumSize(int w, int h)
KPanelMenu::setMaximumSize(w + m_sidePixmap.width(), h);
}
-QRect TOM::sideImageRect()
+TQRect TOM::sideImageRect()
{
- return QStyle::visualRect( QRect( frameWidth(), frameWidth(), m_sidePixmap.width(),
+ return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), m_sidePixmap.width(),
height() - 2*frameWidth() ), this );
}
-void TOM::resizeEvent(QResizeEvent * e)
+void TOM::resizeEvent(TQResizeEvent * e)
{
- setFrameRect( QStyle::visualRect( QRect( m_sidePixmap.width(), 0,
+ setFrameRect( TQStyle::visualRect( TQRect( m_sidePixmap.width(), 0,
width() - m_sidePixmap.width(), height() ), this ) );
}
-void TOM::paintEvent(QPaintEvent * e)
+void TOM::paintEvent(TQPaintEvent * e)
{
if (m_sidePixmap.isNull()) {
KPanelMenu::paintEvent(e);
return;
}
- QPainter p(this);
+ TQPainter p(this);
- style().drawPrimitive( QStyle::PE_PanelPopup, &p,
- QRect( 0, 0, width(), height() ),
- colorGroup(), QStyle::Style_Default,
- QStyleOption( frameWidth(), 0 ) );
+ style().drawPrimitive( TQStyle::PE_PanelPopup, &p,
+ TQRect( 0, 0, width(), height() ),
+ colorGroup(), TQStyle::Style_Default,
+ TQStyleOption( frameWidth(), 0 ) );
- QRect r = sideImageRect();
+ TQRect r = sideImageRect();
r.setBottom( r.bottom() - m_sidePixmap.height() );
p.drawTiledPixmap( r, m_sideTilePixmap );
@@ -771,40 +771,40 @@ void TOM::paintEvent(QPaintEvent * e)
drawContents( &p );
}
-QMouseEvent TOM::translateMouseEvent( QMouseEvent* e )
+TQMouseEvent TOM::translateMouseEvent( TQMouseEvent* e )
{
- QRect side = sideImageRect();
+ TQRect side = sideImageRect();
if ( !side.contains( e->pos() ) )
return *e;
- QPoint newpos( e->pos() );
- QApplication::reverseLayout() ?
+ TQPoint newpos( e->pos() );
+ TQApplication::reverseLayout() ?
newpos.setX( newpos.x() - side.width() ) :
newpos.setX( newpos.x() + side.width() );
- QPoint newglobal( e->globalPos() );
- QApplication::reverseLayout() ?
+ TQPoint newglobal( e->globalPos() );
+ TQApplication::reverseLayout() ?
newglobal.setX( newpos.x() - side.width() ) :
newglobal.setX( newpos.x() + side.width() );
- return QMouseEvent( e->type(), newpos, newglobal, e->button(), e->state() );
+ return TQMouseEvent( e->type(), newpos, newglobal, e->button(), e->state() );
}
-void TOM::mousePressEvent(QMouseEvent * e)
+void TOM::mousePressEvent(TQMouseEvent * e)
{
- QMouseEvent newEvent = translateMouseEvent(e);
+ TQMouseEvent newEvent = translateMouseEvent(e);
KPanelMenu::mousePressEvent( &newEvent );
}
-void TOM::mouseReleaseEvent(QMouseEvent *e)
+void TOM::mouseReleaseEvent(TQMouseEvent *e)
{
- QMouseEvent newEvent = translateMouseEvent(e);
+ TQMouseEvent newEvent = translateMouseEvent(e);
KPanelMenu::mouseReleaseEvent( &newEvent );
}
-void TOM::mouseMoveEvent(QMouseEvent *e)
+void TOM::mouseMoveEvent(TQMouseEvent *e)
{
- QMouseEvent newEvent = translateMouseEvent(e);
+ TQMouseEvent newEvent = translateMouseEvent(e);
KPanelMenu::mouseMoveEvent( &newEvent );
}*/
@@ -812,8 +812,8 @@ extern int kicker_screen_number;
void TOM::runCommand()
{
- QByteArray data;
- QCString appname( "kdesktop" );
+ TQByteArray data;
+ TQCString appname( "kdesktop" );
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
@@ -828,7 +828,7 @@ void TOM::runTask(int id)
kapp->propagateSessionManager();
KApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(),
- QStringList(), 0, 0, 0, "", true);
+ TQStringList(), 0, 0, 0, "", true);
}
void TOM::clearRecentDocHistory()
diff --git a/kicker/menuext/tom/tom.h b/kicker/menuext/tom/tom.h
index 663cb05d6..f658a1ffe 100644
--- a/kicker/menuext/tom/tom.h
+++ b/kicker/menuext/tom/tom.h
@@ -19,7 +19,7 @@
#ifndef __tom_h_
#define __tom_h_
-#include <qpixmap.h>
+#include <tqpixmap.h>
#include <kpanelmenu.h>
#include <klibloader.h>
@@ -27,20 +27,20 @@
class KPopupMenu;
class QPopupMenu;
-typedef QPtrList<QPopupMenu> PopupMenuList;
-typedef QMap<int, KService::Ptr> TaskMap;
+typedef TQPtrList<TQPopupMenu> PopupMenuList;
+typedef TQMap<int, KService::Ptr> TaskMap;
class TOM : public KPanelMenu
{
Q_OBJECT
public:
- TOM(QWidget *parent = 0, const char *name = 0);
+ TOM(TQWidget *parent = 0, const char *name = 0);
~TOM();
// for the side image
- /*void setMinimumSize(const QSize &);
- void setMaximumSize(const QSize &);
+ /*void setMinimumSize(const TQSize &);
+ void setMaximumSize(const TQSize &);
void setMinimumSize(int, int);
void setMaximumSize(int, int); */
@@ -49,7 +49,7 @@ class TOM : public KPanelMenu
void slotExec(int);
//void configChanged();
void initialize();
- void contextualizeRMBmenu(KPopupMenu* menu, int menuItem, QPopupMenu* ctxMenu);
+ void contextualizeRMBmenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu);
//void paletteChanged();
void clearRecentDocHistory();
void runCommand();
@@ -67,43 +67,43 @@ class TOM : public KPanelMenu
void reload();
int appendTaskGroup(KConfig& config, bool inSubMenu = true );
- void initializeRecentApps(QPopupMenu* menu);
- //int insertTOMTitle(QPopupMenu* menu, const QString &text, int id = -1, int index = -1);
+ void initializeRecentApps(TQPopupMenu* menu);
+ //int insertTOMTitle(TQPopupMenu* menu, const TQString &text, int id = -1, int index = -1);
/*
* this stuff should be shared w/the kmenu
- QRect sideImageRect();
- QMouseEvent translateMouseEvent( QMouseEvent* e );
- void resizeEvent(QResizeEvent *);
- void paintEvent(QPaintEvent *);
- void mousePressEvent(QMouseEvent *);
- void mouseReleaseEvent(QMouseEvent *);
- void mouseMoveEvent(QMouseEvent *);
+ TQRect sideImageRect();
+ TQMouseEvent translateMouseEvent( TQMouseEvent* e );
+ void resizeEvent(TQResizeEvent *);
+ void paintEvent(TQPaintEvent *);
+ void mousePressEvent(TQMouseEvent *);
+ void mouseReleaseEvent(TQMouseEvent *);
+ void mouseMoveEvent(TQMouseEvent *);
bool loadSidePixmap();
- QPixmap m_sidePixmap;
- QPixmap m_sideTilePixmap;*/
+ TQPixmap m_sidePixmap;
+ TQPixmap m_sideTilePixmap;*/
PopupMenuList m_submenus;
- QFont m_largerFont;
+ TQFont m_largerFont;
int m_maxIndex;
bool m_isImmutable;
bool m_detailedTaskEntries;
bool m_detailedNamesFirst;
TaskMap m_tasks;
KPopupMenu* m_recentDocsMenu;
- QStringList m_recentDocURLs;
+ TQStringList m_recentDocURLs;
};
class TOMFactory : public KLibFactory
{
public:
- TOMFactory(QObject *parent = 0, const char *name = 0);
+ TOMFactory(TQObject *parent = 0, const char *name = 0);
protected:
- QObject* createObject(QObject *parent = 0, const char *name = 0,
- const char *classname = "QObject",
- const QStringList& args = QStringList());
+ TQObject* createObject(TQObject *parent = 0, const char *name = 0,
+ const char *classname = "TQObject",
+ const TQStringList& args = TQStringList());
};
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index d9ac588d5..0501fcd9a 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -23,9 +23,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <stdlib.h>
-#include <qstring.h>
-#include <qfile.h>
-#include <qobjectlist.h>
+#include <tqstring.h>
+#include <tqfile.h>
+#include <tqobjectlist.h>
#include <qxembed.h>
#include <kapplication.h>
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kmessagebox.h>
#include <kpanelapplet.h>
#include <kaboutdata.h>
-#include <qfileinfo.h>
+#include <tqfileinfo.h>
#include <dcopclient.h>
#include <kwin.h>
@@ -97,20 +97,20 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
KCmdLineArgs::usage(i18n("No desktop file specified") );
// Perhaps we should use a konsole-like solution here (shell, list of args...)
- QString desktopfile( args->arg(0) );
+ TQString desktopfile( args->arg(0) );
// load applet DSO
- if ( !QFile::exists( desktopfile ) &&
+ if ( !TQFile::exists( desktopfile ) &&
!desktopfile.endsWith( ".desktop" ) )
desktopfile.append( ".desktop" );
- if ( !QFile::exists( desktopfile ) )
+ if ( !TQFile::exists( desktopfile ) )
desktopfile = locate( "applets", desktopfile ).latin1();
proxy.loadApplet( desktopfile, args->getOption("configfile"));
// dock into our applet container
- QCString callbackid = args->getOption( "callbackid");
+ TQCString callbackid = args->getOption( "callbackid");
if ( callbackid.isEmpty() )
proxy.showStandalone();
else
@@ -119,8 +119,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
return a.exec();
}
-AppletProxy::AppletProxy(QObject* parent, const char* name)
- : QObject(parent, name)
+AppletProxy::AppletProxy(TQObject* parent, const char* name)
+ : TQObject(parent, name)
, DCOPObject("AppletProxy")
, _info(0)
, _applet(0)
@@ -142,7 +142,7 @@ AppletProxy::AppletProxy(QObject* parent, const char* name)
exit(0);
}
- _bg = QPixmap();
+ _bg = TQPixmap();
}
AppletProxy::~AppletProxy()
@@ -152,12 +152,12 @@ AppletProxy::~AppletProxy()
delete _applet;
}
-void AppletProxy::loadApplet(const QString& desktopFile, const QString& configFile)
+void AppletProxy::loadApplet(const TQString& desktopFile, const TQString& configFile)
{
- QString df;
+ TQString df;
// try simple path first
- QFileInfo finfo( desktopFile );
+ TQFileInfo finfo( desktopFile );
if ( finfo.exists() ) {
df = finfo.absFilePath();
} else {
@@ -165,7 +165,7 @@ void AppletProxy::loadApplet(const QString& desktopFile, const QString& configFi
df = KGlobal::dirs()->findResource("applets", desktopFile);
}
- QFile file(df);
+ TQFile file(df);
// does the config file exist?
if (df.isNull() || !file.exists()) {
kdError() << "Failed to locate applet desktop file: " << desktopFile << endl;
@@ -197,15 +197,15 @@ void AppletProxy::loadApplet(const QString& desktopFile, const QString& configFi
}
// connect updateLayout signal
- connect(_applet, SIGNAL(updateLayout()), SLOT(slotUpdateLayout()));
+ connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout()));
// connect requestFocus signal
- connect(_applet, SIGNAL(requestFocus()), SLOT(slotRequestFocus()));
+ connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(slotRequestFocus()));
}
KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info)
{
KLibLoader* loader = KLibLoader::self();
- KLibrary* lib = loader->library(QFile::encodeName(info.library()));
+ KLibrary* lib = loader->library(TQFile::encodeName(info.library()));
if (!lib)
{
@@ -214,8 +214,8 @@ KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info)
return 0;
}
- KPanelApplet* (*init_ptr)(QWidget *, const QString&);
- init_ptr = (KPanelApplet* (*)(QWidget *, const QString&))lib->symbol( "init" );
+ KPanelApplet* (*init_ptr)(TQWidget *, const TQString&);
+ init_ptr = (KPanelApplet* (*)(TQWidget *, const TQString&))lib->symbol( "init" );
if (!init_ptr)
{
@@ -226,21 +226,21 @@ KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info)
return init_ptr(0, info.configFile());
}
-void AppletProxy::repaintApplet(QWidget* widget)
+void AppletProxy::repaintApplet(TQWidget* widget)
{
widget->repaint();
- const QObjectList* children = widget->children();
+ const TQObjectList* children = widget->children();
if (!children)
{
return;
}
- QObjectList::iterator it = children->begin();
+ TQObjectList::iterator it = children->begin();
for (; it != children->end(); ++it)
{
- QWidget *w = dynamic_cast<QWidget*>(*it);
+ TQWidget *w = dynamic_cast<TQWidget*>(*it);
if (w)
{
repaintApplet(w);
@@ -248,7 +248,7 @@ void AppletProxy::repaintApplet(QWidget* widget)
}
}
-void AppletProxy::dock(const QCString& callbackID)
+void AppletProxy::dock(const TQCString& callbackID)
{
kdDebug(1210) << "Callback ID: " << callbackID << endl;
@@ -258,16 +258,16 @@ void AppletProxy::dock(const QCString& callbackID)
DCOPClient* dcop = kapp->dcopClient();
dcop->setNotifications(true);
- connect(dcop, SIGNAL(applicationRemoved(const QCString&)),
- SLOT(slotApplicationRemoved(const QCString&)));
+ connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)),
+ TQT_SLOT(slotApplicationRemoved(const TQCString&)));
WId win;
// get docked
{
- QCString replyType;
- QByteArray data, replyData;
- QDataStream dataStream( data, IO_WriteOnly );
+ TQCString replyType;
+ TQByteArray data, replyData;
+ TQDataStream dataStream( data, IO_WriteOnly );
int actions = 0;
if (_applet) actions = _applet->actions();
@@ -282,7 +282,7 @@ void AppletProxy::dock(const QCString& callbackID)
int screen_number = 0;
if (qt_xdisplay())
screen_number = DefaultScreen(qt_xdisplay());
- QCString appname;
+ TQCString appname;
if (screen_number == 0)
appname = "kicker";
else
@@ -298,7 +298,7 @@ void AppletProxy::dock(const QCString& callbackID)
exit(0);
}
- QDataStream reply( replyData, IO_ReadOnly );
+ TQDataStream reply( replyData, IO_ReadOnly );
reply >> win;
// request background
@@ -328,15 +328,15 @@ void AppletProxy::dock(const QCString& callbackID)
}
-bool AppletProxy::process(const QCString &fun, const QByteArray &data,
- QCString& replyType, QByteArray &replyData)
+bool AppletProxy::process(const TQCString &fun, const TQByteArray &data,
+ TQCString& replyType, TQByteArray &replyData)
{
if ( fun == "widthForHeight(int)" )
{
- QDataStream dataStream( data, IO_ReadOnly );
+ TQDataStream dataStream( data, IO_ReadOnly );
int height;
dataStream >> height;
- QDataStream reply( replyData, IO_WriteOnly );
+ TQDataStream reply( replyData, IO_WriteOnly );
replyType = "int";
if (!_applet)
@@ -348,10 +348,10 @@ bool AppletProxy::process(const QCString &fun, const QByteArray &data,
}
else if ( fun == "heightForWidth(int)" )
{
- QDataStream dataStream( data, IO_ReadOnly );
+ TQDataStream dataStream( data, IO_ReadOnly );
int width;
dataStream >> width;
- QDataStream reply( replyData, IO_WriteOnly );
+ TQDataStream reply( replyData, IO_WriteOnly );
replyType = "int";
if(!_applet)
@@ -363,7 +363,7 @@ bool AppletProxy::process(const QCString &fun, const QByteArray &data,
}
else if ( fun == "setDirection(int)" )
{
- QDataStream dataStream( data, IO_ReadOnly );
+ TQDataStream dataStream( data, IO_ReadOnly );
int dir;
dataStream >> dir;
@@ -374,7 +374,7 @@ bool AppletProxy::process(const QCString &fun, const QByteArray &data,
}
else if ( fun == "setAlignment(int)" )
{
- QDataStream dataStream( data, IO_ReadOnly );
+ TQDataStream dataStream( data, IO_ReadOnly );
int alignment;
dataStream >> alignment;
@@ -412,7 +412,7 @@ bool AppletProxy::process(const QCString &fun, const QByteArray &data,
}
else if ( fun == "actions()" )
{
- QDataStream reply( replyData, IO_WriteOnly );
+ TQDataStream reply( replyData, IO_WriteOnly );
int actions = 0;
if(_applet) actions = _applet->actions();
reply << actions;
@@ -421,16 +421,16 @@ bool AppletProxy::process(const QCString &fun, const QByteArray &data,
}
else if ( fun == "type()" )
{
- QDataStream reply( replyData, IO_WriteOnly );
+ TQDataStream reply( replyData, IO_WriteOnly );
int type = 0;
if (_applet) type = static_cast<int>(_applet->type());
reply << type;
replyType = "int";
return true;
}
- else if ( fun == "setBackground(QPixmap)" )
+ else if ( fun == "setBackground(TQPixmap)" )
{
- QDataStream dataStream( data, IO_ReadOnly );
+ TQDataStream dataStream( data, IO_ReadOnly );
dataStream >> _bg;
if(_applet)
if ( _bg.isNull() ) { // no transparency
@@ -453,11 +453,11 @@ void AppletProxy::slotUpdateLayout()
{
if(_callbackID.isNull()) return;
- QByteArray data;
+ TQByteArray data;
int screen_number = 0;
if (qt_xdisplay())
screen_number = DefaultScreen(qt_xdisplay());
- QCString appname;
+ TQCString appname;
if (screen_number == 0)
appname = "kicker";
else
@@ -470,11 +470,11 @@ void AppletProxy::slotRequestFocus()
{
if(_callbackID.isNull()) return;
- QByteArray data;
+ TQByteArray data;
int screen_number = 0;
if (qt_xdisplay())
screen_number = DefaultScreen(qt_xdisplay());
- QCString appname;
+ TQCString appname;
if (screen_number == 0)
appname = "kicker";
else
@@ -483,12 +483,12 @@ void AppletProxy::slotRequestFocus()
kapp->dcopClient()->send(appname, _callbackID, "requestFocus()", data);
}
-void AppletProxy::slotApplicationRemoved(const QCString& appId)
+void AppletProxy::slotApplicationRemoved(const TQCString& appId)
{
int screen_number = 0;
if (qt_xdisplay())
screen_number = DefaultScreen(qt_xdisplay());
- QCString appname;
+ TQCString appname;
if (screen_number == 0)
appname = "kicker";
else
diff --git a/kicker/proxy/appletproxy.h b/kicker/proxy/appletproxy.h
index 182280193..4c504022f 100644
--- a/kicker/proxy/appletproxy.h
+++ b/kicker/proxy/appletproxy.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __appletproxy_h__
#define __appletproxy_h__
-#include <qcstring.h>
-#include <qobject.h>
+#include <tqcstring.h>
+#include <tqobject.h>
#include <dcopobject.h>
@@ -34,34 +34,34 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class KPanelApplet;
class KickerPluginManager;
-class AppletProxy : public QObject, DCOPObject
+class AppletProxy : public TQObject, DCOPObject
{
Q_OBJECT
public:
- AppletProxy(QObject* parent, const char* name = 0);
+ AppletProxy(TQObject* parent, const char* name = 0);
~AppletProxy();
- void loadApplet(const QString& desktopFile, const QString& configFile);
+ void loadApplet(const TQString& desktopFile, const TQString& configFile);
KPanelApplet* loadApplet(const AppletInfo& info);
- void dock(const QCString& callbackID);
+ void dock(const TQCString& callbackID);
void showStandalone();
- bool process(const QCString &fun, const QByteArray &data,
- QCString& replyType, QByteArray &replyData);
+ bool process(const TQCString &fun, const TQByteArray &data,
+ TQCString& replyType, TQByteArray &replyData);
protected slots:
void slotUpdateLayout();
void slotRequestFocus();
- void slotApplicationRemoved(const QCString&);
+ void slotApplicationRemoved(const TQCString&);
private:
- void repaintApplet(QWidget* widget);
+ void repaintApplet(TQWidget* widget);
AppletInfo *_info;
KPanelApplet *_applet;
- QCString _callbackID;
- QPixmap _bg;
+ TQCString _callbackID;
+ TQPixmap _bg;
};
#endif
diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp
index f7c3309c4..796f10c93 100644
--- a/kicker/proxy/extensiondebugger.cpp
+++ b/kicker/proxy/extensiondebugger.cpp
@@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qfile.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <tqfile.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
#include <kapplication.h>
#include <kglobal.h>
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdebug.h>
#include <kpanelextension.h>
#include <kaboutdata.h>
-#include <qfileinfo.h>
+#include <tqfileinfo.h>
#include "appletinfo.h"
#include "extensiondebugger.h"
@@ -51,7 +51,7 @@ static KCmdLineOptions options[] =
KPanelExtension* loadExtension(const AppletInfo& info)
{
KLibLoader* loader = KLibLoader::self();
- KLibrary* lib = loader->library(QFile::encodeName(info.library()));
+ KLibrary* lib = loader->library(TQFile::encodeName(info.library()));
if (!lib)
{
@@ -60,8 +60,8 @@ KPanelExtension* loadExtension(const AppletInfo& info)
return 0;
}
- KPanelExtension* (*init_ptr)(QWidget *, const QString&);
- init_ptr = (KPanelExtension* (*)(QWidget *, const QString&))lib->symbol( "init" );
+ KPanelExtension* (*init_ptr)(TQWidget *, const TQString&);
+ init_ptr = (KPanelExtension* (*)(TQWidget *, const TQString&))lib->symbol( "init" );
if (!init_ptr)
{
@@ -91,7 +91,7 @@ int main( int argc, char ** argv )
KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
"kicker/extensions");
- QString df;
+ TQString df;
// parse cmdline args
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
@@ -101,19 +101,19 @@ int main( int argc, char ** argv )
KCmdLineArgs::usage(i18n("No desktop file specified") );
- QCString desktopFile = QCString( args->arg(0) );
+ TQCString desktopFile = TQCString( args->arg(0) );
// try simple path first
- QFileInfo finfo( desktopFile );
+ TQFileInfo finfo( desktopFile );
if ( finfo.exists() ) {
df = finfo.absFilePath();
} else {
// locate desktop file
- df = KGlobal::dirs()->findResource("extensions", QString(desktopFile));
+ df = KGlobal::dirs()->findResource("extensions", TQString(desktopFile));
}
// does the config file exist?
- if (!QFile::exists(df)) {
+ if (!TQFile::exists(df)) {
kdError() << "Failed to locate extension desktop file: " << desktopFile << endl;
return 1;
}
@@ -129,7 +129,7 @@ int main( int argc, char ** argv )
ExtensionContainer *container = new ExtensionContainer( extension );
container->show();
- QObject::connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) );
+ TQObject::connect( &a, TQT_SIGNAL( lastWindowClosed() ), &a, TQT_SLOT( quit() ) );
int result = a.exec();
@@ -137,19 +137,19 @@ int main( int argc, char ** argv )
return result;
}
-ExtensionContainer::ExtensionContainer( KPanelExtension *extension, QWidget *parent, const char *name )
- : QWidget( parent, name ), m_extension( extension )
+ExtensionContainer::ExtensionContainer( KPanelExtension *extension, TQWidget *parent, const char *name )
+ : TQWidget( parent, name ), m_extension( extension )
{
- ( new QVBoxLayout( this ) )->setAutoAdd( true );
+ ( new TQVBoxLayout( this ) )->setAutoAdd( true );
- QPushButton *configButton = new QPushButton( i18n( "Configure..." ), this );
- connect( configButton, SIGNAL( clicked() ),
- this, SLOT( showPreferences() ) );
+ TQPushButton *configButton = new TQPushButton( i18n( "Configure..." ), this );
+ connect( configButton, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( showPreferences() ) );
- m_extension->reparent( this, QPoint( 0, 0 ) );
+ m_extension->reparent( this, TQPoint( 0, 0 ) );
}
-void ExtensionContainer::resizeEvent( QResizeEvent * )
+void ExtensionContainer::resizeEvent( TQResizeEvent * )
{
m_extension->setGeometry( 0, 0, width(), height() );
}
diff --git a/kicker/proxy/extensiondebugger.h b/kicker/proxy/extensiondebugger.h
index 36745ae90..87ac76ecb 100644
--- a/kicker/proxy/extensiondebugger.h
+++ b/kicker/proxy/extensiondebugger.h
@@ -32,10 +32,10 @@ class ExtensionContainer : public QWidget
Q_OBJECT
public:
- ExtensionContainer(KPanelExtension *extension, QWidget* parent = 0, const char* name = 0);
+ ExtensionContainer(KPanelExtension *extension, TQWidget* parent = 0, const char* name = 0);
protected:
- void resizeEvent( QResizeEvent *ev );
+ void resizeEvent( TQResizeEvent *ev );
private slots:
void showPreferences();
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index 0fbb341e5..3d931c95b 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <stdlib.h>
-#include <qstring.h>
-#include <qfile.h>
+#include <tqstring.h>
+#include <tqfile.h>
#include <qxembed.h>
#include <kapplication.h>
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdebug.h>
#include <kpanelextension.h>
#include <kaboutdata.h>
-#include <qfileinfo.h>
+#include <tqfileinfo.h>
#include <dcopclient.h>
#include "appletinfo.h"
@@ -90,7 +90,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
}
// Perhaps we should use a konsole-like solution here (shell, list of args...)
- QCString desktopfile = QCString( args->arg(0) );
+ TQCString desktopfile = TQCString( args->arg(0) );
// load extension DSO
proxy.loadExtension( desktopfile, args->getOption("configfile"));
@@ -101,8 +101,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
return a.exec();
}
-ExtensionProxy::ExtensionProxy(QObject* parent, const char* name)
- : QObject(parent, name)
+ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name)
+ : TQObject(parent, name)
, DCOPObject("ExtensionProxy")
, _info(0)
, _extension(0)
@@ -124,20 +124,20 @@ ExtensionProxy::~ExtensionProxy()
kapp->dcopClient()->detach();
}
-void ExtensionProxy::loadExtension(const QCString& desktopFile, const QCString& configFile)
+void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString& configFile)
{
- QString df;
+ TQString df;
// try simple path first
- QFileInfo finfo( desktopFile );
+ TQFileInfo finfo( desktopFile );
if ( finfo.exists() ) {
df = finfo.absFilePath();
} else {
// locate desktop file
- df = KGlobal::dirs()->findResource("extensions", QString(desktopFile));
+ df = KGlobal::dirs()->findResource("extensions", TQString(desktopFile));
}
- QFile file(df);
+ TQFile file(df);
// does the config file exist?
if (df.isNull() || !file.exists()) {
kdError() << "Failed to locate extension desktop file: " << desktopFile << endl;
@@ -161,13 +161,13 @@ void ExtensionProxy::loadExtension(const QCString& desktopFile, const QCString&
}
// connect updateLayout signal
- connect(_extension, SIGNAL(updateLayout()), SLOT(slotUpdateLayout()));
+ connect(_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout()));
}
KPanelExtension* ExtensionProxy::loadExtension(const AppletInfo& info)
{
KLibLoader* loader = KLibLoader::self();
- KLibrary* lib = loader->library(QFile::encodeName(info.library()));
+ KLibrary* lib = loader->library(TQFile::encodeName(info.library()));
if (!lib)
{
@@ -176,8 +176,8 @@ KPanelExtension* ExtensionProxy::loadExtension(const AppletInfo& info)
return 0;
}
- KPanelExtension* (*init_ptr)(QWidget *, const QString&);
- init_ptr = (KPanelExtension* (*)(QWidget *, const QString&))lib->symbol( "init" );
+ KPanelExtension* (*init_ptr)(TQWidget *, const TQString&);
+ init_ptr = (KPanelExtension* (*)(TQWidget *, const TQString&))lib->symbol( "init" );
if (!init_ptr)
{
@@ -188,7 +188,7 @@ KPanelExtension* ExtensionProxy::loadExtension(const AppletInfo& info)
return init_ptr(0, info.configFile());
}
-void ExtensionProxy::dock(const QCString& callbackID)
+void ExtensionProxy::dock(const TQCString& callbackID)
{
kdDebug(1210) << "Callback ID: " << callbackID << endl;
@@ -198,16 +198,16 @@ void ExtensionProxy::dock(const QCString& callbackID)
DCOPClient* dcop = kapp->dcopClient();
dcop->setNotifications(true);
- connect(dcop, SIGNAL(applicationRemoved(const QCString&)),
- SLOT(slotApplicationRemoved(const QCString&)));
+ connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)),
+ TQT_SLOT(slotApplicationRemoved(const TQCString&)));
WId win;
// get docked
{
- QCString replyType;
- QByteArray data, replyData;
- QDataStream dataStream( data, IO_WriteOnly );
+ TQCString replyType;
+ TQByteArray data, replyData;
+ TQDataStream dataStream( data, IO_WriteOnly );
int actions = 0;
if(_extension) actions = _extension->actions();
@@ -222,7 +222,7 @@ void ExtensionProxy::dock(const QCString& callbackID)
int screen_number = 0;
if (qt_xdisplay())
screen_number = DefaultScreen(qt_xdisplay());
- QCString appname;
+ TQCString appname;
if (screen_number == 0)
appname = "kicker";
else
@@ -235,7 +235,7 @@ void ExtensionProxy::dock(const QCString& callbackID)
exit(0);
}
- QDataStream reply( replyData, IO_ReadOnly );
+ TQDataStream reply( replyData, IO_ReadOnly );
reply >> win;
}
@@ -255,19 +255,19 @@ void ExtensionProxy::dock(const QCString& callbackID)
}
}
-bool ExtensionProxy::process(const QCString &fun, const QByteArray &data,
- QCString& replyType, QByteArray &replyData)
+bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data,
+ TQCString& replyType, TQByteArray &replyData)
{
- if ( fun == "sizeHint(int,QSize)" )
+ if ( fun == "sizeHint(int,TQSize)" )
{
- QDataStream dataStream( data, IO_ReadOnly );
+ TQDataStream dataStream( data, IO_ReadOnly );
int pos;
- QSize maxSize;
+ TQSize maxSize;
dataStream >> pos;
dataStream >> maxSize;
- QDataStream reply( replyData, IO_WriteOnly );
- replyType = "QSize";
+ TQDataStream reply( replyData, IO_WriteOnly );
+ replyType = "TQSize";
if(!_extension)
reply << maxSize;
@@ -278,7 +278,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data,
}
else if ( fun == "setPosition(int)" )
{
- QDataStream dataStream( data, IO_ReadOnly );
+ TQDataStream dataStream( data, IO_ReadOnly );
int pos;
dataStream >> pos;
@@ -289,7 +289,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data,
}
else if ( fun == "setAlignment(int)" )
{
- QDataStream dataStream( data, IO_ReadOnly );
+ TQDataStream dataStream( data, IO_ReadOnly );
int alignment;
dataStream >> alignment;
@@ -300,7 +300,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data,
}
else if ( fun == "setSize(int,int)" )
{
- QDataStream dataStream( data, IO_ReadOnly );
+ TQDataStream dataStream( data, IO_ReadOnly );
int serializedSize;
int custom;
dataStream >> serializedSize;
@@ -338,7 +338,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data,
}
else if ( fun == "actions()" )
{
- QDataStream reply( replyData, IO_WriteOnly );
+ TQDataStream reply( replyData, IO_WriteOnly );
int actions = 0;
if(_extension) actions = _extension->actions();
reply << actions;
@@ -347,7 +347,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data,
}
else if ( fun == "preferedPosition()" )
{
- QDataStream reply( replyData, IO_WriteOnly );
+ TQDataStream reply( replyData, IO_WriteOnly );
int pos = static_cast<int>(KPanelExtension::Bottom);
if(_extension) pos = static_cast<int>(_extension->preferedPosition());
reply << pos;
@@ -356,7 +356,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data,
}
else if ( fun == "type()" )
{
- QDataStream reply( replyData, IO_WriteOnly );
+ TQDataStream reply( replyData, IO_WriteOnly );
int type = 0;
if (_extension) type = static_cast<int>(_extension->type());
reply << type;
@@ -370,11 +370,11 @@ void ExtensionProxy::slotUpdateLayout()
{
if(_callbackID.isNull()) return;
- QByteArray data;
+ TQByteArray data;
int screen_number = 0;
if (qt_xdisplay())
screen_number = DefaultScreen(qt_xdisplay());
- QCString appname;
+ TQCString appname;
if (screen_number == 0)
appname = "kicker";
else
@@ -383,12 +383,12 @@ void ExtensionProxy::slotUpdateLayout()
kapp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
}
-void ExtensionProxy::slotApplicationRemoved(const QCString& appId)
+void ExtensionProxy::slotApplicationRemoved(const TQCString& appId)
{
int screen_number = 0;
if (qt_xdisplay())
screen_number = DefaultScreen(qt_xdisplay());
- QCString appname;
+ TQCString appname;
if (screen_number == 0)
appname = "kicker";
else
diff --git a/kicker/proxy/extensionproxy.h b/kicker/proxy/extensionproxy.h
index e5b8ca96d..88bc0a325 100644
--- a/kicker/proxy/extensionproxy.h
+++ b/kicker/proxy/extensionproxy.h
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __extensionproxy_h__
#define __extensionproxy_h__
-#include <qcstring.h>
-#include <qobject.h>
+#include <tqcstring.h>
+#include <tqobject.h>
#include <dcopobject.h>
@@ -33,29 +33,29 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class KPanelExtension;
-class ExtensionProxy : public QObject, DCOPObject
+class ExtensionProxy : public TQObject, DCOPObject
{
Q_OBJECT
public:
- ExtensionProxy(QObject* parent, const char* name = 0);
+ ExtensionProxy(TQObject* parent, const char* name = 0);
~ExtensionProxy();
- void loadExtension(const QCString& desktopFile, const QCString& configFile);
+ void loadExtension(const TQCString& desktopFile, const TQCString& configFile);
KPanelExtension* loadExtension(const AppletInfo& info);
- void dock(const QCString& callbackID);
+ void dock(const TQCString& callbackID);
- bool process(const QCString &fun, const QByteArray &data,
- QCString& replyType, QByteArray &replyData);
+ bool process(const TQCString &fun, const TQByteArray &data,
+ TQCString& replyType, TQByteArray &replyData);
protected slots:
void slotUpdateLayout();
- void slotApplicationRemoved(const QCString&);
+ void slotApplicationRemoved(const TQCString&);
private:
AppletInfo *_info;
KPanelExtension *_extension;
- QCString _callbackID;
+ TQCString _callbackID;
};
#endif
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index c2580f5f1..88768e811 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -25,12 +25,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <math.h>
-#include <qapplication.h>
-#include <qbitmap.h>
-#include <qdesktopwidget.h>
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qstringlist.h>
+#include <tqapplication.h>
+#include <tqbitmap.h>
+#include <tqdesktopwidget.h>
+#include <tqlayout.h>
+#include <tqpainter.h>
+#include <tqstringlist.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -50,7 +50,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "taskbar.moc"
-TaskBar::TaskBar( QWidget *parent, const char *name )
+TaskBar::TaskBar( TQWidget *parent, const char *name )
: Panner( parent, name ),
m_showAllWindows(false),
m_currentScreen(-1),
@@ -65,35 +65,35 @@ TaskBar::TaskBar( QWidget *parent, const char *name )
blocklayout = true;
// init
- setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
// setup animation frames
for (int i = 1; i < 11; i++)
{
- frames.append(new QPixmap(locate("data", "kicker/pics/disk" + QString::number(i) + ".png")));
+ frames.append(new TQPixmap(locate("data", "kicker/pics/disk" + TQString::number(i) + ".png")));
}
// configure
configure();
- connect(&m_relayoutTimer, SIGNAL(timeout()),
- this, SLOT(reLayout()));
+ connect(&m_relayoutTimer, TQT_SIGNAL(timeout()),
+ this, TQT_SLOT(reLayout()));
- connect(this, SIGNAL(contentsMoving(int, int)), SLOT(setBackground()));
+ connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground()));
// connect manager
- connect(TaskManager::the(), SIGNAL(taskAdded(Task::Ptr)),
- this, SLOT(add(Task::Ptr)));
- connect(TaskManager::the(), SIGNAL(taskRemoved(Task::Ptr)),
- this, SLOT(remove(Task::Ptr)));
- connect(TaskManager::the(), SIGNAL(startupAdded(Startup::Ptr)),
- this, SLOT(add(Startup::Ptr)));
- connect(TaskManager::the(), SIGNAL(startupRemoved(Startup::Ptr)),
- this, SLOT(remove(Startup::Ptr)));
- connect(TaskManager::the(), SIGNAL(desktopChanged(int)),
- this, SLOT(desktopChanged(int)));
- connect(TaskManager::the(), SIGNAL(windowChanged(Task::Ptr)),
- this, SLOT(windowChanged(Task::Ptr)));
+ connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)),
+ this, TQT_SLOT(add(Task::Ptr)));
+ connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)),
+ this, TQT_SLOT(remove(Task::Ptr)));
+ connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)),
+ this, TQT_SLOT(add(Startup::Ptr)));
+ connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)),
+ this, TQT_SLOT(remove(Startup::Ptr)));
+ connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)),
+ this, TQT_SLOT(desktopChanged(int)));
+ connect(TaskManager::the(), TQT_SIGNAL(windowChanged(Task::Ptr)),
+ this, TQT_SLOT(windowChanged(Task::Ptr)));
isGrouping = shouldGroup();
@@ -115,7 +115,7 @@ TaskBar::TaskBar( QWidget *parent, const char *name )
blocklayout = false;
- connect(kapp, SIGNAL(settingsChanged(int)), SLOT(slotSettingsChanged(int)));
+ connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
keys = new KGlobalAccel( this );
#include "taskbarbindings.cpp"
keys->readSettings();
@@ -159,22 +159,22 @@ KTextShadowEngine *TaskBar::textShadowEngine()
}
-QSize TaskBar::sizeHint() const
+TQSize TaskBar::sizeHint() const
{
// get our minimum height based on the minimum button height or the
// height of the font in use, which is largest
- QFontMetrics fm(KGlobalSettings::taskbarFont());
+ TQFontMetrics fm(KGlobalSettings::taskbarFont());
int minButtonHeight = fm.height() > TaskBarSettings::minimumButtonHeight() ?
fm.height() : TaskBarSettings::minimumButtonHeight();
- return QSize(BUTTON_MIN_WIDTH, minButtonHeight);
+ return TQSize(BUTTON_MIN_WIDTH, minButtonHeight);
}
-QSize TaskBar::sizeHint( KPanelExtension::Position p, QSize maxSize) const
+TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
{
// get our minimum height based on the minimum button height or the
// height of the font in use, which is largest
- QFontMetrics fm(KGlobalSettings::taskbarFont());
+ TQFontMetrics fm(KGlobalSettings::taskbarFont());
int minButtonHeight = fm.height() > TaskBarSettings::minimumButtonHeight() ?
fm.height() : TaskBarSettings::minimumButtonHeight();
@@ -191,7 +191,7 @@ QSize TaskBar::sizeHint( KPanelExtension::Position p, QSize maxSize) const
{
return maxSize;
}
- return QSize( maxSize.width(), actualMax );
+ return TQSize( maxSize.width(), actualMax );
}
else
{
@@ -224,7 +224,7 @@ QSize TaskBar::sizeHint( KPanelExtension::Position p, QSize maxSize) const
{
return maxSize;
}
- return QSize( actualMax, maxSize.height() );
+ return TQSize( actualMax, maxSize.height() );
}
}
@@ -242,8 +242,8 @@ void TaskBar::configure()
m_currentScreen = -1; // Show all screens or re-get our screen
m_showOnlyCurrentScreen = (TaskBarSettings::showCurrentScreenOnly() &&
- QApplication::desktop()->isVirtualDesktop() &&
- QApplication::desktop()->numScreens() > 1) || (QApplication::desktop()->numScreens() < 2);
+ TQApplication::desktop()->isVirtualDesktop() &&
+ TQApplication::desktop()->numScreens() > 1) || (TQApplication::desktop()->numScreens() < 2);
// we need to watch geometry issues if we aren't showing windows when we
// are paying attention to the current Xinerama screen
@@ -251,10 +251,10 @@ void TaskBar::configure()
{
// disconnect first in case we've been here before
// to avoid multiple connections
- disconnect(TaskManager::the(), SIGNAL(windowChangedGeometry(Task::Ptr)),
- this, SLOT(windowChangedGeometry(Task::Ptr)));
- connect(TaskManager::the(), SIGNAL(windowChangedGeometry(Task::Ptr)),
- this, SLOT(windowChangedGeometry(Task::Ptr)));
+ disconnect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)),
+ this, TQT_SLOT(windowChangedGeometry(Task::Ptr)));
+ connect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)),
+ this, TQT_SLOT(windowChangedGeometry(Task::Ptr)));
}
TaskManager::the()->trackGeometry(m_showOnlyCurrentScreen);
@@ -283,18 +283,18 @@ void TaskBar::setOrientation( Orientation o )
reLayoutEventually();
}
-void TaskBar::moveEvent( QMoveEvent* e )
+void TaskBar::moveEvent( TQMoveEvent* e )
{
Panner::moveEvent(e);
setViewportBackground();
}
-void TaskBar::resizeEvent( QResizeEvent* e )
+void TaskBar::resizeEvent( TQResizeEvent* e )
{
if (m_showOnlyCurrentScreen)
{
- QPoint topLeft = mapToGlobal(this->geometry().topLeft());
- if (m_currentScreen != QApplication::desktop()->screenNumber(topLeft))
+ TQPoint topLeft = mapToGlobal(this->geometry().topLeft());
+ if (m_currentScreen != TQApplication::desktop()->screenNumber(topLeft))
{
// we have been moved to another screen!
m_currentScreen = -1;
@@ -366,7 +366,7 @@ void TaskBar::add(Startup::Ptr startup)
// create new container
TaskContainer *container = new TaskContainer(startup, frames, this, viewport());
m_hiddenContainers.append(container);
- connect(container, SIGNAL(showMe(TaskContainer*)), this, SLOT(showTaskContainer(TaskContainer*)));
+ connect(container, TQT_SIGNAL(showMe(TaskContainer*)), this, TQT_SLOT(showTaskContainer(TaskContainer*)));
}
void TaskBar::showTaskContainer(TaskContainer* container)
@@ -654,8 +654,8 @@ void TaskBar::reLayoutEventually()
void TaskBar::reLayout()
{
- // Because QPopupMenu::exec() creates its own event loop, deferred deletes
- // via QObject::deleteLater() may be prematurely executed when a container's
+ // Because TQPopupMenu::exec() creates its own event loop, deferred deletes
+ // via TQObject::deleteLater() may be prematurely executed when a container's
// popup menu is visible.
//
// To get around this, we collect the containers and delete them manually
@@ -695,7 +695,7 @@ void TaskBar::reLayout()
// number of rows simply depends on our height which is either the
// minimum button height or the height of the font in use, whichever is
// largest
- QFontMetrics fm(KGlobalSettings::taskbarFont());
+ TQFontMetrics fm(KGlobalSettings::taskbarFont());
int minButtonHeight = fm.height() > TaskBarSettings::minimumButtonHeight() ?
fm.height() : TaskBarSettings::minimumButtonHeight();
@@ -756,7 +756,7 @@ void TaskBar::reLayout()
}
int i = 0;
- bool reverseLayout = QApplication::reverseLayout();
+ bool reverseLayout = TQApplication::reverseLayout();
for (TaskContainer::Iterator it = list.begin();
it != list.end();
++it, i++)
@@ -812,16 +812,16 @@ void TaskBar::reLayout()
}
}
- QTimer::singleShot(100, this, SLOT(publishIconGeometry()));
+ TQTimer::singleShot(100, this, TQT_SLOT(publishIconGeometry()));
}
void TaskBar::setViewportBackground()
{
- const QPixmap *bg = parentWidget()->backgroundPixmap();
+ const TQPixmap *bg = parentWidget()->backgroundPixmap();
if (bg)
{
- QPixmap pm(parentWidget()->size());
+ TQPixmap pm(parentWidget()->size());
pm.fill(parentWidget(), pos() + viewport()->pos());
viewport()->setPaletteBackgroundPixmap(pm);
viewport()->setBackgroundOrigin(WidgetOrigin);
@@ -863,7 +863,7 @@ void TaskBar::setArrowType(Qt::ArrowType at)
void TaskBar::publishIconGeometry()
{
- QPoint p = mapToGlobal(QPoint(0,0)); // roundtrip, don't do that too often
+ TQPoint p = mapToGlobal(TQPoint(0,0)); // roundtrip, don't do that too often
for (TaskContainer::Iterator it = containers.begin();
it != containers.end();
@@ -873,37 +873,37 @@ void TaskBar::publishIconGeometry()
}
}
-void TaskBar::viewportMousePressEvent( QMouseEvent* e )
+void TaskBar::viewportMousePressEvent( TQMouseEvent* e )
{
propagateMouseEvent( e );
}
-void TaskBar::viewportMouseReleaseEvent( QMouseEvent* e )
+void TaskBar::viewportMouseReleaseEvent( TQMouseEvent* e )
{
propagateMouseEvent( e );
}
-void TaskBar::viewportMouseDoubleClickEvent( QMouseEvent* e )
+void TaskBar::viewportMouseDoubleClickEvent( TQMouseEvent* e )
{
propagateMouseEvent( e );
}
-void TaskBar::viewportMouseMoveEvent( QMouseEvent* e )
+void TaskBar::viewportMouseMoveEvent( TQMouseEvent* e )
{
propagateMouseEvent( e );
}
-void TaskBar::propagateMouseEvent( QMouseEvent* e )
+void TaskBar::propagateMouseEvent( TQMouseEvent* e )
{
if ( !isTopLevel() )
{
- QMouseEvent me( e->type(), mapTo( topLevelWidget(), e->pos() ),
+ TQMouseEvent me( e->type(), mapTo( topLevelWidget(), e->pos() ),
e->globalPos(), e->button(), e->state() );
- QApplication::sendEvent( topLevelWidget(), &me );
+ TQApplication::sendEvent( topLevelWidget(), &me );
}
}
-bool TaskBar::idMatch( const QString& id1, const QString& id2 )
+bool TaskBar::idMatch( const TQString& id1, const TQString& id2 )
{
if ( id1.isEmpty() || id2.isEmpty() )
return false;
@@ -949,7 +949,7 @@ int TaskBar::taskCount() const
int TaskBar::maximumButtonsWithoutShrinking() const
{
- QFontMetrics fm(KGlobalSettings::taskbarFont());
+ TQFontMetrics fm(KGlobalSettings::taskbarFont());
int minButtonHeight = fm.height() > TaskBarSettings::minimumButtonHeight() ?
fm.height() : TaskBarSettings::minimumButtonHeight();
int rows = contentsRect().height() / minButtonHeight;
@@ -1124,7 +1124,7 @@ void TaskBar::activateNextTask(bool forward)
}
}
-void TaskBar::wheelEvent(QWheelEvent* e)
+void TaskBar::wheelEvent(TQWheelEvent* e)
{
if (e->delta() > 0)
{
@@ -1162,35 +1162,35 @@ int TaskBar::showScreen() const
if (m_showOnlyCurrentScreen && m_currentScreen == -1)
{
const_cast<TaskBar*>(this)->m_currentScreen =
- QApplication::desktop()->screenNumber(mapToGlobal(this->geometry().topLeft()));
+ TQApplication::desktop()->screenNumber(mapToGlobal(this->geometry().topLeft()));
}
return m_currentScreen;
}
-QImage* TaskBar::blendGradient(const QSize& size)
+TQImage* TaskBar::blendGradient(const TQSize& size)
{
if (m_blendGradient.isNull() || m_blendGradient.size() != size)
{
- QPixmap bgpm(size);
- QPainter bgp(&bgpm);
+ TQPixmap bgpm(size);
+ TQPainter bgp(&bgpm);
bgpm.fill(black);
- if (QApplication::reverseLayout())
+ if (TQApplication::reverseLayout())
{
- QImage gradient = KImageEffect::gradient(
- QSize(30, size.height()),
- QColor(255,255,255),
- QColor(0,0,0),
+ TQImage gradient = KImageEffect::gradient(
+ TQSize(30, size.height()),
+ TQColor(255,255,255),
+ TQColor(0,0,0),
KImageEffect::HorizontalGradient);
bgp.drawImage(0, 0, gradient);
}
else
{
- QImage gradient = KImageEffect::gradient(
- QSize(30, size.height()),
- QColor(0,0,0),
- QColor(255,255,255),
+ TQImage gradient = KImageEffect::gradient(
+ TQSize(30, size.height()),
+ TQColor(0,0,0),
+ TQColor(255,255,255),
KImageEffect::HorizontalGradient);
bgp.drawImage(size.width() - 30, 0, gradient);
}
@@ -1203,7 +1203,7 @@ QImage* TaskBar::blendGradient(const QSize& size)
void TaskBar::sortContainersByDesktop(TaskContainer::List& list)
{
- typedef QValueVector<QPair<int, QPair<int, TaskContainer*> > > SortVector;
+ typedef TQValueVector<QPair<int, QPair<int, TaskContainer*> > > SortVector;
SortVector sorted;
sorted.resize(list.count());
int i = 0;
diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h
index 73c397670..ff160bc92 100644
--- a/kicker/taskbar/taskbar.h
+++ b/kicker/taskbar/taskbar.h
@@ -44,11 +44,11 @@ class TaskBar : public Panner
Q_OBJECT
public:
- TaskBar( QWidget *parent = 0, const char *name = 0 );
+ TaskBar( TQWidget *parent = 0, const char *name = 0 );
~TaskBar();
- QSize sizeHint() const;
- QSize sizeHint( KPanelExtension::Position, QSize maxSize ) const;
+ TQSize sizeHint() const;
+ TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const;
void setOrientation( Orientation );
void setArrowType( Qt::ArrowType at );
@@ -61,7 +61,7 @@ public:
bool sortByDesktop() const { return m_sortByDesktop; }
bool showAllWindows() const { return m_showAllWindows; }
- QImage* blendGradient(const QSize& size);
+ TQImage* blendGradient(const TQSize& size);
KTextShadowEngine *textShadowEngine();
@@ -93,15 +93,15 @@ protected slots:
protected:
void reLayoutEventually();
- void viewportMousePressEvent( QMouseEvent* );
- void viewportMouseReleaseEvent( QMouseEvent* );
- void viewportMouseDoubleClickEvent( QMouseEvent* );
- void viewportMouseMoveEvent( QMouseEvent* );
- void wheelEvent(QWheelEvent*);
- void propagateMouseEvent( QMouseEvent* );
- void resizeEvent( QResizeEvent* );
- void moveEvent( QMoveEvent* );
- bool idMatch( const QString& id1, const QString& id2 );
+ void viewportMousePressEvent( TQMouseEvent* );
+ void viewportMouseReleaseEvent( TQMouseEvent* );
+ void viewportMouseDoubleClickEvent( TQMouseEvent* );
+ void viewportMouseMoveEvent( TQMouseEvent* );
+ void wheelEvent(TQWheelEvent*);
+ void propagateMouseEvent( TQMouseEvent* );
+ void resizeEvent( TQResizeEvent* );
+ void moveEvent( TQMoveEvent* );
+ bool idMatch( const TQString& id1, const TQString& id2 );
TaskContainer::List filteredContainers();
private:
@@ -127,9 +127,9 @@ private:
void reGroup();
KGlobalAccel* keys;
KTextShadowEngine* m_textShadowEngine;
- QTimer m_relayoutTimer;
+ TQTimer m_relayoutTimer;
bool m_ignoreUpdates;
- QImage m_blendGradient;
+ TQImage m_blendGradient;
};
#endif
diff --git a/kicker/taskbar/taskbarbindings.cpp b/kicker/taskbar/taskbarbindings.cpp
index 63accd854..c457d3623 100644
--- a/kicker/taskbar/taskbarbindings.cpp
+++ b/kicker/taskbar/taskbarbindings.cpp
@@ -23,10 +23,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4, this, SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) )
#else
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4 )
+ keys->insert( name, i18n(name), TQString::null, key3, key4 )
#endif
#define WIN KKey::QtWIN
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index a548b7837..661706bdb 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qlayout.h>
-#include <qtimer.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -42,8 +42,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "taskbarcontainer.h"
#include "taskbarcontainer.moc"
-TaskBarContainer::TaskBarContainer( bool enableFrame, QWidget *parent, const char *name )
- : QFrame(parent, name),
+TaskBarContainer::TaskBarContainer( bool enableFrame, TQWidget *parent, const char *name )
+ : TQFrame(parent, name),
direction( KPanelApplet::Up ),
showWindowListButton( true ),
windowListButton(0),
@@ -63,16 +63,16 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, QWidget *parent, const cha
margin = 0;
}
- layout = new QBoxLayout( this, QApplication::reverseLayout() ?
- QBoxLayout::RightToLeft :
- QBoxLayout::LeftToRight );
+ layout = new TQBoxLayout( this, TQApplication::reverseLayout() ?
+ TQBoxLayout::RightToLeft :
+ TQBoxLayout::LeftToRight );
layout->setMargin( margin );
// scrollable taskbar
taskBar = new TaskBar(this);
layout->addWidget( taskBar );
- connect( taskBar, SIGNAL( containerCountChanged() ), SIGNAL( containerCountChanged() ) );
+ connect( taskBar, TQT_SIGNAL( containerCountChanged() ), TQT_SIGNAL( containerCountChanged() ) );
setBackground();
@@ -105,13 +105,13 @@ void TaskBarContainer::configure()
// window list button
windowListButton = new SimpleButton(this);
windowListMenu= new KWindowListMenu;
- connect(windowListButton, SIGNAL(pressed()),
- SLOT(showWindowListMenu()));
- connect(windowListMenu, SIGNAL(aboutToHide()),
- SLOT(windowListMenuAboutToHide()));
+ connect(windowListButton, TQT_SIGNAL(pressed()),
+ TQT_SLOT(showWindowListMenu()));
+ connect(windowListMenu, TQT_SIGNAL(aboutToHide()),
+ TQT_SLOT(windowListMenuAboutToHide()));
// geometry
- QString icon;
+ TQString icon;
switch (direction)
{
case KPanelApplet::Up:
@@ -156,7 +156,7 @@ void TaskBarContainer::configChanged()
void TaskBarContainer::preferences()
{
- QByteArray data;
+ TQByteArray data;
if (!kapp->dcopClient()->isAttached())
{
@@ -175,9 +175,9 @@ void TaskBarContainer::orientationChange(Orientation o)
windowListButton->setFixedWidth(WINDOWLISTBUTTON_SIZE);
windowListButton->setMaximumHeight(BUTTON_MAX_WIDTH);
}
- layout->setDirection(QApplication::reverseLayout() ?
- QBoxLayout::RightToLeft :
- QBoxLayout::LeftToRight);
+ layout->setDirection(TQApplication::reverseLayout() ?
+ TQBoxLayout::RightToLeft :
+ TQBoxLayout::LeftToRight);
}
else
{
@@ -186,7 +186,7 @@ void TaskBarContainer::orientationChange(Orientation o)
windowListButton->setMaximumWidth(BUTTON_MAX_WIDTH);
windowListButton->setFixedHeight(WINDOWLISTBUTTON_SIZE);
}
- layout->setDirection(QBoxLayout::TopToBottom);
+ layout->setDirection(TQBoxLayout::TopToBottom);
}
taskBar->setOrientation(o);
@@ -202,7 +202,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d)
direction = d;
ArrowType at = UpArrow;
- QString icon;
+ TQString icon;
switch (d)
{
case KPanelApplet::Up:
@@ -242,7 +242,7 @@ void TaskBarContainer::showWindowListMenu()
windowListMenu->init();
// calc popup menu position
- QPoint pos( mapToGlobal( QPoint(0,0) ) );
+ TQPoint pos( mapToGlobal( TQPoint(0,0) ) );
switch( direction ) {
case KPanelApplet::Right:
@@ -260,9 +260,9 @@ void TaskBarContainer::showWindowListMenu()
break;
}
- disconnect( windowListButton, SIGNAL( pressed() ), this, SLOT( showWindowListMenu() ) );
+ disconnect( windowListButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( showWindowListMenu() ) );
windowListMenu->exec( pos );
- QTimer::singleShot(100, this, SLOT(reconnectWindowListButton()));
+ TQTimer::singleShot(100, this, TQT_SLOT(reconnectWindowListButton()));
}
void TaskBarContainer::windowListMenuAboutToHide()
@@ -274,14 +274,14 @@ void TaskBarContainer::windowListMenuAboutToHide()
void TaskBarContainer::reconnectWindowListButton()
{
- connect( windowListButton, SIGNAL( pressed() ), SLOT( showWindowListMenu() ) );
+ connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) );
}
-QSize TaskBarContainer::sizeHint( KPanelExtension::Position p, QSize maxSize) const
+TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
{
- QSize size = taskBar->sizeHint( p, maxSize );
+ TQSize size = taskBar->sizeHint( p, maxSize );
if ( (p == KPanelExtension::Left || p == KPanelExtension::Right) && showWindowListButton ) {
- return QSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE );
+ return TQSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE );
}
return size;
}
diff --git a/kicker/taskbar/taskbarcontainer.h b/kicker/taskbar/taskbarcontainer.h
index c265036b6..6c542ef00 100644
--- a/kicker/taskbar/taskbarcontainer.h
+++ b/kicker/taskbar/taskbarcontainer.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __taskbarcontainer_h__
#define __taskbarcontainer_h__
-#include <qframe.h>
+#include <tqframe.h>
#include <dcopobject.h>
#include <kpanelapplet.h>
@@ -35,20 +35,20 @@ class SimpleButton;
class KWindowListMenu;
class TaskBar;
-class KDE_EXPORT TaskBarContainer : public QFrame, public DCOPObject
+class KDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject
{
Q_OBJECT
K_DCOP
public:
- TaskBarContainer( bool enableFrame, QWidget* parent = 0, const char* name = 0 );
+ TaskBarContainer( bool enableFrame, TQWidget* parent = 0, const char* name = 0 );
~TaskBarContainer();
void orientationChange( Orientation );
void popupDirectionChange( KPanelApplet::Direction );
void preferences();
//FIXME: don't use Position, use Orientation
- QSize sizeHint( KPanelExtension::Position, QSize maxSize ) const;
+ TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const;
void setBackground();
k_dcop:
@@ -66,7 +66,7 @@ protected slots:
private:
KPanelApplet::Direction direction;
bool showWindowListButton;
- QBoxLayout * layout;
+ TQBoxLayout * layout;
TaskBar * taskBar;
SimpleButton * windowListButton;
KWindowListMenu * windowListMenu;
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 7025d643a..6bc74044e 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -25,15 +25,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <assert.h>
-#include <qbitmap.h>
-#include <qcolor.h>
-#include <qcursor.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qstyle.h>
-#include <qstylesheet.h>
-#include <qtooltip.h>
+#include <tqbitmap.h>
+#include <tqcolor.h>
+#include <tqcursor.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqstyle.h>
+#include <tqstylesheet.h>
+#include <tqtooltip.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -55,8 +55,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "taskcontainer.moc"
TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar,
- QWidget *parent, const char *name)
- : QToolButton(parent, name),
+ TQWidget *parent, const char *name)
+ : TQToolButton(parent, name),
currentFrame(0),
attentionState(-1),
lastActivated(0),
@@ -82,8 +82,8 @@ TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar,
}
TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames,
- TaskBar* bar, QWidget *parent, const char *name)
- : QToolButton(parent, name),
+ TaskBar* bar, TQWidget *parent, const char *name)
+ : TQToolButton(parent, name),
currentFrame(0),
frames(startupFrames),
attentionState(-1),
@@ -102,7 +102,7 @@ TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames,
sid = m_startup->bin();
- connect(m_startup, SIGNAL(changed()), SLOT(update()));
+ connect(m_startup, TQT_SIGNAL(changed()), TQT_SLOT(update()));
dragSwitchTimer.start(333, true);
}
@@ -111,14 +111,14 @@ void TaskContainer::init()
{
setWFlags(WNoAutoErase);
setBackgroundMode(NoBackground);
- animBg = QPixmap(16, 16);
+ animBg = TQPixmap(16, 16);
installEventFilter(KickerTip::the());
- connect(&animationTimer, SIGNAL(timeout()), SLOT(animationTimerFired()));
- connect(&dragSwitchTimer, SIGNAL(timeout()), SLOT(showMe()));
- connect(&attentionTimer, SIGNAL(timeout()), SLOT(attentionTimerFired()));
- connect(&m_paintEventCompressionTimer, SIGNAL(timeout()), SLOT(updateNow()));
+ connect(&animationTimer, TQT_SIGNAL(timeout()), TQT_SLOT(animationTimerFired()));
+ connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(showMe()));
+ connect(&attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimerFired()));
+ connect(&m_paintEventCompressionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateNow()));
}
TaskContainer::~TaskContainer()
@@ -138,8 +138,8 @@ void TaskContainer::showMe()
animationTimer.start(100);
emit showMe(this);
- disconnect(&dragSwitchTimer, SIGNAL(timeout()), this, SLOT(showMe()));
- connect(&dragSwitchTimer, SIGNAL(timeout()), SLOT(dragSwitch()));
+ disconnect(&dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showMe()));
+ connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch()));
}
void TaskContainer::stopTimers()
@@ -159,7 +159,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange)
return;
}
- const QObject* source = sender();
+ const TQObject* source = sender();
Task::Ptr task = 0;
Task::List::const_iterator itEnd = tasks.constEnd();
for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it)
@@ -182,7 +182,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange)
void TaskContainer::iconChanged()
{
- const QObject* source = sender();
+ const TQObject* source = sender();
Task::Ptr task = 0;
Task::List::const_iterator itEnd = tasks.constEnd();
for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it)
@@ -204,7 +204,7 @@ void TaskContainer::iconChanged()
}
KickerTip::Client::updateKickerTip();
- QToolButton::update();
+ TQToolButton::update();
}
void TaskContainer::setLastActivated()
@@ -227,14 +227,14 @@ void TaskContainer::animationTimerFired()
{
if (!frames.isEmpty() && taskBar->showIcon() && frames.at(currentFrame) != frames.end())
{
- QPixmap *pm = *frames.at(currentFrame);
+ TQPixmap *pm = *frames.at(currentFrame);
// draw pixmap
if ( pm && !pm->isNull() ) {
// we only have to redraw the background for frames 0, 8 and 9
if ( currentFrame == 0 || currentFrame > 7 ) {
// double buffered painting
- QPixmap composite( animBg );
+ TQPixmap composite( animBg );
bitBlt( &composite, 0, 0, pm );
bitBlt( this, iconRect.x(), iconRect.y(), &composite );
}
@@ -298,16 +298,16 @@ void TaskContainer::attentionTimerFired()
update();
}
-QSizePolicy TaskContainer::sizePolicy() const
+TQSizePolicy TaskContainer::sizePolicy() const
{
- return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
+ return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
}
-void TaskContainer::resizeEvent( QResizeEvent * )
+void TaskContainer::resizeEvent( TQResizeEvent * )
{
// calculate the icon rect
- QRect br( style().subRect( QStyle::SR_PushButtonContents, this ) );
- iconRect = QStyle::visualRect( QRect(br.x() + 2, (height() - 16) / 2, 16, 16), this );
+ TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) );
+ iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this );
}
void TaskContainer::add(Task::Ptr task)
@@ -330,9 +330,9 @@ void TaskContainer::add(Task::Ptr task)
KickerTip::Client::updateKickerTip();
update();
- connect(task, SIGNAL(changed(bool)), SLOT(taskChanged(bool)));
- connect(task, SIGNAL(iconChanged()), SLOT(iconChanged()));
- connect(task, SIGNAL(activated()), SLOT(setLastActivated()));
+ connect(task, TQT_SIGNAL(changed(bool)), TQT_SLOT(taskChanged(bool)));
+ connect(task, TQT_SIGNAL(iconChanged()), TQT_SLOT(iconChanged()));
+ connect(task, TQT_SIGNAL(activated()), TQT_SLOT(setLastActivated()));
}
void TaskContainer::remove(Task::Ptr task)
@@ -342,7 +342,7 @@ void TaskContainer::remove(Task::Ptr task)
return;
}
- task->publishIconGeometry(QRect());
+ task->publishIconGeometry(TQRect());
for (Task::List::Iterator it = tasks.begin(); it != tasks.end(); ++it)
{
if ((*it) == task)
@@ -424,7 +424,7 @@ bool TaskContainer::isEmpty()
return (tasks.isEmpty() && !m_startup);
}
-QString TaskContainer::id()
+TQString TaskContainer::id()
{
return sid;
}
@@ -440,7 +440,7 @@ void TaskContainer::setBackground()
updateNow();
}
-void TaskContainer::paintEvent( QPaintEvent* )
+void TaskContainer::paintEvent( TQPaintEvent* )
{
if (!m_paintEventCompression)
{
@@ -452,14 +452,14 @@ void TaskContainer::paintEvent( QPaintEvent* )
}
m_paintEventCompression = false;
- QPixmap* pm = new QPixmap(size());
+ TQPixmap* pm = new TQPixmap(size());
- const QPixmap* background = taskBar->backgroundPixmap();
+ const TQPixmap* background = taskBar->backgroundPixmap();
if (background)
{
- QPoint pt = mapTo(taskBar, QPoint(0, 0)) + taskBar->backgroundOffset();
- QPainter p(pm);
+ TQPoint pt = mapTo(taskBar, TQPoint(0, 0)) + taskBar->backgroundOffset();
+ TQPainter p(pm);
p.drawTiledPixmap(0, 0, width(), height(), *background, pt.x(), pt.y());
p.end();
}
@@ -468,7 +468,7 @@ void TaskContainer::paintEvent( QPaintEvent* )
pm->fill(taskBar->paletteBackgroundColor());
}
- QPainter p;
+ TQPainter p;
p.begin(pm ,this);
drawButton(&p);
p.end();
@@ -477,7 +477,7 @@ void TaskContainer::paintEvent( QPaintEvent* )
delete pm;
}
-void TaskContainer::drawButton(QPainter *p)
+void TaskContainer::drawButton(TQPainter *p)
{
if (isEmpty())
{
@@ -485,8 +485,8 @@ void TaskContainer::drawButton(QPainter *p)
}
// get a pointer to the pixmap we're drawing on
- QPixmap *pm((QPixmap*)p->device());
- QPixmap pixmap; // icon
+ TQPixmap *pm((TQPixmap*)p->device());
+ TQPixmap pixmap; // icon
Task::Ptr task = 0;
bool iconified = !TaskBarSettings::showOnlyIconified();
bool halo = TaskBarSettings::haloText();
@@ -494,7 +494,7 @@ void TaskContainer::drawButton(QPainter *p)
bool drawButton = alwaysDrawButtons ||
(m_mouseOver && !halo && isEnabled() &&
TaskBarSettings::showButtonOnHover());
- QFont font(KGlobalSettings::taskbarFont());
+ TQFont font(KGlobalSettings::taskbarFont());
// draw sunken if we contain the active task
bool active = false;
@@ -522,14 +522,14 @@ void TaskContainer::drawButton(QPainter *p)
font.setBold(active);
- QColorGroup colors = palette().active();
+ TQColorGroup colors = palette().active();
if (TaskBarSettings::useCustomColors())
{
- colors.setColor( QColorGroup::Button, TaskBarSettings::taskBackgroundColor());
- colors.setColor( QColorGroup::Background, TaskBarSettings::taskBackgroundColor() );
- colors.setColor( QColorGroup::ButtonText, TaskBarSettings::inactiveTaskTextColor() );
- colors.setColor( QColorGroup::Text, TaskBarSettings::inactiveTaskTextColor() );
+ colors.setColor( TQColorGroup::Button, TaskBarSettings::taskBackgroundColor());
+ colors.setColor( TQColorGroup::Background, TaskBarSettings::taskBackgroundColor() );
+ colors.setColor( TQColorGroup::ButtonText, TaskBarSettings::inactiveTaskTextColor() );
+ colors.setColor( TQColorGroup::Text, TaskBarSettings::inactiveTaskTextColor() );
}
if (demandsAttention)
@@ -538,29 +538,29 @@ void TaskContainer::drawButton(QPainter *p)
{
halo = true;
- QRect r = rect();
- QColor line = colors.highlight();
+ TQRect r = rect();
+ TQColor line = colors.highlight();
r.addCoords(2, 2, -2, -2);
p->fillRect(r, line);
for (int i = 0; i < 2; ++i)
{
line = KickerLib::blendColors(line, colors.background());
- p->setPen(QPen(line, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+ p->setPen(TQPen(line, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
r.addCoords(-1, -1, 1, 1);
p->drawRect(r);
}
}
// blink until blink timeout, then display differently without blinking
- colors.setColor( QColorGroup::Button, colors.highlight() );
- colors.setColor( QColorGroup::Background, colors.highlight() );
- colors.setColor( QColorGroup::ButtonText, colors.highlightedText() );
- colors.setColor( QColorGroup::Text, colors.highlightedText() );
+ colors.setColor( TQColorGroup::Button, colors.highlight() );
+ colors.setColor( TQColorGroup::Background, colors.highlight() );
+ colors.setColor( TQColorGroup::ButtonText, colors.highlightedText() );
+ colors.setColor( TQColorGroup::Text, colors.highlightedText() );
}
if (active || aboutToActivate)
{
- colors.setColor(QColorGroup::Button, colors.button().dark(110));
+ colors.setColor(TQColorGroup::Button, colors.button().dark(110));
}
// get the task icon
@@ -570,16 +570,16 @@ void TaskContainer::drawButton(QPainter *p)
}
bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate));
- bool reverse = QApplication::reverseLayout();
- QRect br(style().subRect(QStyle::SR_PushButtonContents, this));
- QPoint shift = QPoint(style().pixelMetric(QStyle::PM_ButtonShiftHorizontal),
- style().pixelMetric(QStyle::PM_ButtonShiftVertical));
+ bool reverse = TQApplication::reverseLayout();
+ TQRect br(style().subRect(TQStyle::SR_PushButtonContents, this));
+ TQPoint shift = TQPoint(style().pixelMetric(TQStyle::PM_ButtonShiftHorizontal),
+ style().pixelMetric(TQStyle::PM_ButtonShiftVertical));
// draw button background
if (drawButton)
{
- style().drawPrimitive(QStyle::PE_HeaderSection, p,
- QRect(0, 0, width(), height()),
+ style().drawPrimitive(TQStyle::PE_HeaderSection, p,
+ TQRect(0, 0, width(), height()),
colors);
}
@@ -601,7 +601,7 @@ void TaskContainer::drawButton(QPainter *p)
// make sure it is no larger than 16x16
if ( pixmap.width() > 16 || pixmap.height() > 16 )
{
- QImage tmp = pixmap.convertToImage();
+ TQImage tmp = pixmap.convertToImage();
pixmap.convertFromImage( tmp.smoothScale( 16, 16 ) );
}
@@ -612,17 +612,17 @@ void TaskContainer::drawButton(QPainter *p)
}
// draw icon
- QRect pmr(0, 0, pixmap.width(), pixmap.height());
+ TQRect pmr(0, 0, pixmap.width(), pixmap.height());
pmr.moveCenter(iconRect.center());
p->drawPixmap(pmr, pixmap);
}
}
// find text
- QString text = name();
+ TQString text = name();
// modified overlay
- static QString modStr = "[" + i18n( "modified" ) + "]";
+ static TQString modStr = "[" + i18n( "modified" ) + "]";
int modStrPos = text.find( modStr );
int textPos = ( taskBar->showIcon() && (!pixmap.isNull() || m_startup)) ? 2 + 16 + 2 : 0;
@@ -630,12 +630,12 @@ void TaskContainer::drawButton(QPainter *p)
{
// +1 because we include a space after the closing brace.
text.remove(modStrPos, modStr.length() + 1);
- QPixmap modPixmap = SmallIcon("modified");
+ TQPixmap modPixmap = SmallIcon("modified");
// draw modified overlay
if (!modPixmap.isNull())
{
- QRect r = QStyle::visualRect(QRect(br.x() + textPos,
+ TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos,
(height() - 16) / 2, 16, 16),
this);
@@ -652,27 +652,27 @@ void TaskContainer::drawButton(QPainter *p)
// draw text
if (!text.isEmpty())
{
- QRect tr = QStyle::visualRect(QRect(br.x() + textPos + 1, 0,
+ TQRect tr = TQStyle::visualRect(TQRect(br.x() + textPos + 1, 0,
width() - textPos, height()),
this);
int textFlags = AlignVCenter | SingleLine;
textFlags |= reverse ? AlignRight : AlignLeft;
- QPen textPen;
+ TQPen textPen;
// get the color for the text label
if (iconified)
{
- textPen = QPen(KickerLib::blendColors(colors.button(), colors.buttonText()));
+ textPen = TQPen(KickerLib::blendColors(colors.button(), colors.buttonText()));
}
else if (!active)
{
- textPen = QPen(colors.buttonText());
+ textPen = TQPen(colors.buttonText());
}
else // hack for the dotNET style and others
{
if (TaskBarSettings::useCustomColors())
{
- textPen = QPen(TaskBarSettings::activeTaskTextColor());
+ textPen = TQPen(TaskBarSettings::activeTaskTextColor());
}
else
{
@@ -686,11 +686,11 @@ void TaskContainer::drawButton(QPainter *p)
availableWidth -= 8;
}
- if (QFontMetrics(font).width(text) > availableWidth)
+ if (TQFontMetrics(font).width(text) > availableWidth)
{
// draw text into overlay pixmap
- QPixmap tpm(*pm);
- QPainter tp(&tpm);
+ TQPixmap tpm(*pm);
+ TQPainter tp(&tpm);
if (sunken)
{
@@ -710,8 +710,8 @@ void TaskContainer::drawButton(QPainter *p)
}
// blend text into background image
- QImage img = pm->convertToImage();
- QImage timg = tpm.convertToImage();
+ TQImage img = pm->convertToImage();
+ TQImage timg = tpm.convertToImage();
KImageEffect::blend(img, timg, *taskBar->blendGradient(size()), KImageEffect::Red);
pm->convertFromImage(img);
}
@@ -733,12 +733,12 @@ void TaskContainer::drawButton(QPainter *p)
if (!frames.isEmpty() && m_startup && frames.at(currentFrame) != frames.end())
{
- QPixmap *anim = *frames.at(currentFrame);
+ TQPixmap *anim = *frames.at(currentFrame);
if (anim && !anim->isNull())
{
// save the background for the other frames
- bitBlt(&animBg, QPoint(0,0), pm, iconRect);
+ bitBlt(&animBg, TQPoint(0,0), pm, iconRect);
// draw the animation frame
bitBlt(pm, iconRect.x(), iconRect.y(), anim);
}
@@ -753,22 +753,22 @@ void TaskContainer::drawButton(QPainter *p)
// draw popup arrow
if (m_filteredTasks.count() > 1)
{
- QStyle::PrimitiveElement e = QStyle::PE_ArrowLeft;
+ TQStyle::PrimitiveElement e = TQStyle::PE_ArrowLeft;
switch (arrowType)
{
- case Qt::LeftArrow: e = QStyle::PE_ArrowLeft; break;
- case Qt::RightArrow: e = QStyle::PE_ArrowRight; break;
- case Qt::UpArrow: e = QStyle::PE_ArrowUp; break;
- case Qt::DownArrow: e = QStyle::PE_ArrowDown; break;
+ case Qt::LeftArrow: e = TQStyle::PE_ArrowLeft; break;
+ case Qt::RightArrow: e = TQStyle::PE_ArrowRight; break;
+ case Qt::UpArrow: e = TQStyle::PE_ArrowUp; break;
+ case Qt::DownArrow: e = TQStyle::PE_ArrowDown; break;
}
- int flags = QStyle::Style_Enabled;
- QRect ar = QStyle::visualRect(QRect(br.x() + br.width() - 8 - 2,
+ int flags = TQStyle::Style_Enabled;
+ TQRect ar = TQStyle::visualRect(TQRect(br.x() + br.width() - 8 - 2,
br.y(), 8, br.height()), this);
if (sunken)
{
- flags |= QStyle::Style_Down;
+ flags |= TQStyle::Style_Down;
}
style().drawPrimitive(e, p, ar, colors, flags);
@@ -776,7 +776,7 @@ void TaskContainer::drawButton(QPainter *p)
// draw mouse over frame in transparent mode
if (m_mouseOver && halo)
- KickerLib::drawBlendedRect(p, QRect(0, 0, width(), height()), colorGroup().foreground());
+ KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), colorGroup().foreground());
if (aboutToActivate)
{
@@ -784,10 +784,10 @@ void TaskContainer::drawButton(QPainter *p)
}
}
-QString TaskContainer::name()
+TQString TaskContainer::name()
{
// default to container id
- QString text;
+ TQString text;
// single task -> use mainwindow caption
if (m_filteredTasks.count() == 1)
@@ -798,7 +798,7 @@ QString TaskContainer::name()
{
// multiple tasks -> use the common part of all captions
// if it is more descriptive than the class name
- const QString match = m_filteredTasks.first()->visibleName();
+ const TQString match = m_filteredTasks.first()->visibleName();
unsigned int maxLength = match.length();
unsigned int i = 0;
bool stop = false;
@@ -807,11 +807,11 @@ QString TaskContainer::name()
// in common, and then use everything UP TO that as the name in the button
while (i < maxLength)
{
- QChar check = match.at(i).lower();
+ TQChar check = match.at(i).lower();
Task::List::iterator itEnd = m_filteredTasks.end();
for (Task::List::iterator it = m_filteredTasks.begin(); it != itEnd; ++it)
{
- // we're doing a lot of Utf8 -> QString conversions here
+ // we're doing a lot of Utf8 -> TQString conversions here
// by repeatedly calling visibleIconicName() =/
if (check != (*it)->visibleName().at(i).lower())
{
@@ -863,14 +863,14 @@ QString TaskContainer::name()
// this is faster than (" [%1]").arg() or +
// and it's as fast as using append, but cleaner looking
text += " [";
- text += QString::number(m_filteredTasks.count());
+ text += TQString::number(m_filteredTasks.count());
text += "]";
}
return text;
}
-void TaskContainer::mousePressEvent( QMouseEvent* e )
+void TaskContainer::mousePressEvent( TQMouseEvent* e )
{
if (discardNextMouseEvent)
{
@@ -884,7 +884,7 @@ void TaskContainer::mousePressEvent( QMouseEvent* e )
}
else
{
- m_dragStartPos = QPoint();
+ m_dragStartPos = TQPoint();
}
int buttonAction = 0;
@@ -913,9 +913,9 @@ void TaskContainer::mousePressEvent( QMouseEvent* e )
}
}
-void TaskContainer::mouseReleaseEvent(QMouseEvent *e)
+void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
{
- m_dragStartPos = QPoint();
+ m_dragStartPos = TQPoint();
if (!TaskBarSettings::drawButtons())
{
@@ -926,7 +926,7 @@ void TaskContainer::mouseReleaseEvent(QMouseEvent *e)
// button as unpressed just before it's activated.
if (!rect().contains(e->pos()))
{
- QToolButton::mouseReleaseEvent(e);
+ TQToolButton::mouseReleaseEvent(e);
return;
}
@@ -960,7 +960,7 @@ void TaskContainer::mouseReleaseEvent(QMouseEvent *e)
}
performAction( buttonAction );
- QTimer::singleShot(0, this, SLOT(update()));
+ TQTimer::singleShot(0, this, TQT_SLOT(update()));
}
void TaskContainer::performAction(int action)
@@ -1130,7 +1130,7 @@ void TaskContainer::popupMenu(int action)
}
// calc popup menu position
- QPoint pos(mapToGlobal(QPoint(0, 0)));
+ TQPoint pos(mapToGlobal(TQPoint(0, 0)));
switch( arrowType )
{
@@ -1141,12 +1141,12 @@ void TaskContainer::popupMenu(int action)
pos.setX(pos.x() - m_menu->sizeHint().width());
break;
case DownArrow:
- if ( QApplication::reverseLayout() )
+ if ( TQApplication::reverseLayout() )
pos.setX( pos.x() + width() - m_menu->sizeHint().width() );
pos.setY( pos.y() + height() );
break;
case UpArrow:
- if ( QApplication::reverseLayout() )
+ if ( TQApplication::reverseLayout() )
pos.setX( pos.x() + width() - m_menu->sizeHint().width() );
pos.setY(pos.y() - m_menu->sizeHint().height());
break;
@@ -1160,7 +1160,7 @@ void TaskContainer::popupMenu(int action)
m_menu = 0;
}
-void TaskContainer::mouseMoveEvent( QMouseEvent* e )
+void TaskContainer::mouseMoveEvent( TQMouseEvent* e )
{
kdDebug() << "regular move" << endl;
if (!m_dragStartPos.isNull())
@@ -1168,10 +1168,10 @@ void TaskContainer::mouseMoveEvent( QMouseEvent* e )
startDrag(e->pos());
}
- QToolButton::mouseMoveEvent(e);
+ TQToolButton::mouseMoveEvent(e);
}
-bool TaskContainer::startDrag(const QPoint& pos)
+bool TaskContainer::startDrag(const TQPoint& pos)
{
if (m_filteredTasks.count() != 1)
{
@@ -1205,21 +1205,21 @@ bool TaskContainer::startDrag(const QPoint& pos)
// This is the code that gives us the proper behavior
// when a popup menu is displayed and we are clicked:
// close the menu, and don't reopen it immediately.
-// It's copied from QToolButton. Unfortunately Qt is lame
+// It's copied from TQToolButton. Unfortunately Qt is lame
// as usual and makes interesting stuff private or
// non-virtual, so we have to copy code.
-bool TaskContainer::eventFilter(QObject *o, QEvent *e)
+bool TaskContainer::eventFilter(TQObject *o, TQEvent *e)
{
switch ( e->type() )
{
- case QEvent::MouseButtonPress:
- case QEvent::MouseButtonDblClick:
+ case TQEvent::MouseButtonPress:
+ case TQEvent::MouseButtonDblClick:
{
- QMouseEvent *me = (QMouseEvent*)e;
- QPoint p = me->globalPos();
- if ( QApplication::widgetAt( p, true ) == this )
+ TQMouseEvent *me = (TQMouseEvent*)e;
+ TQPoint p = me->globalPos();
+ if ( TQApplication::widgetAt( p, true ) == this )
{
- if (me->type() == QEvent::MouseButtonPress &&
+ if (me->type() == TQEvent::MouseButtonPress &&
me->button() == LeftButton)
{
m_dragStartPos = mapFromGlobal(p);
@@ -1229,25 +1229,25 @@ bool TaskContainer::eventFilter(QObject *o, QEvent *e)
}
break;
}
- case QEvent::MouseButtonRelease:
+ case TQEvent::MouseButtonRelease:
{
- m_dragStartPos = QPoint();
+ m_dragStartPos = TQPoint();
break;
}
- case QEvent::MouseMove:
+ case TQEvent::MouseMove:
{
if (!m_dragStartPos.isNull())
{
- QMouseEvent* me = static_cast<QMouseEvent*>(e);
- QPoint p(me->globalPos());
+ TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
+ TQPoint p(me->globalPos());
if (me->state() & LeftButton &&
- QApplication::widgetAt(p, true) == this)
+ TQApplication::widgetAt(p, true) == this)
{
kdDebug() << "event move" << endl;
if (startDrag(mapFromGlobal(p)))
{
- QPopupMenu* menu = dynamic_cast<QPopupMenu*>(o);
+ TQPopupMenu* menu = dynamic_cast<TQPopupMenu*>(o);
if (menu)
{
@@ -1263,7 +1263,7 @@ bool TaskContainer::eventFilter(QObject *o, QEvent *e)
break;
}
- return QToolButton::eventFilter( o, e );
+ return TQToolButton::eventFilter( o, e );
}
void TaskContainer::setArrowType( Qt::ArrowType at )
@@ -1277,19 +1277,19 @@ void TaskContainer::setArrowType( Qt::ArrowType at )
update();
}
-void TaskContainer::publishIconGeometry( QPoint global )
+void TaskContainer::publishIconGeometry( TQPoint global )
{
- QPoint p = global + geometry().topLeft();
+ TQPoint p = global + geometry().topLeft();
Task::List::const_iterator itEnd = tasks.constEnd();
for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it)
{
Task::Ptr t = *it;
- t->publishIconGeometry(QRect(p.x(), p.y(), width(), height()));
+ t->publishIconGeometry(TQRect(p.x(), p.y(), width(), height()));
}
}
-void TaskContainer::dragEnterEvent( QDragEnterEvent* e )
+void TaskContainer::dragEnterEvent( TQDragEnterEvent* e )
{
// ignore task drags and applet drags
if (TaskDrag::canDecode(e) || PanelDrag::canDecode(e))
@@ -1310,37 +1310,37 @@ void TaskContainer::dragEnterEvent( QDragEnterEvent* e )
dragSwitchTimer.start(1000, true);
}
- QToolButton::dragEnterEvent( e );
+ TQToolButton::dragEnterEvent( e );
}
-void TaskContainer::dragLeaveEvent( QDragLeaveEvent* e )
+void TaskContainer::dragLeaveEvent( TQDragLeaveEvent* e )
{
dragSwitchTimer.stop();
- QToolButton::dragLeaveEvent( e );
+ TQToolButton::dragLeaveEvent( e );
}
-void TaskContainer::enterEvent(QEvent* e)
+void TaskContainer::enterEvent(TQEvent* e)
{
- QToolTip::remove(this);
+ TQToolTip::remove(this);
m_mouseOver = true;
updateNow();
if (tasks.isEmpty())
{
- QToolButton::enterEvent(e);
+ TQToolButton::enterEvent(e);
return;
}
if (!KickerSettings::showMouseOverEffects())
{
- QString tooltip = "<qt>" + QStyleSheet::escape(name()) + "</qt>";
- QToolTip::add(this, tooltip);
+ TQString tooltip = "<qt>" + TQStyleSheet::escape(name()) + "</qt>";
+ TQToolTip::add(this, tooltip);
return;
}
}
-void TaskContainer::leaveEvent(QEvent*)
+void TaskContainer::leaveEvent(TQEvent*)
{
m_mouseOver = false;
updateNow();
@@ -1458,14 +1458,14 @@ void TaskContainer::updateFilteredTaskList()
}
else
{
- t->publishIconGeometry( QRect());
+ t->publishIconGeometry( TQRect());
}
}
// sort container list by desktop
if (taskBar->sortByDesktop() && m_filteredTasks.count() > 1)
{
- QValueVector<QPair<int, Task::Ptr> > sorted;
+ TQValueVector<QPair<int, Task::Ptr> > sorted;
sorted.resize(m_filteredTasks.count());
int i = 0;
@@ -1480,7 +1480,7 @@ void TaskContainer::updateFilteredTaskList()
qHeapSort(sorted);
m_filteredTasks.clear();
- for (QValueVector<QPair<int, Task::Ptr> >::iterator it = sorted.begin();
+ for (TQValueVector<QPair<int, Task::Ptr> >::iterator it = sorted.begin();
it != sorted.end();
++it)
{
@@ -1525,9 +1525,9 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
return;
}
- QPixmap pixmap;
- QString name;
- QString details;
+ TQPixmap pixmap;
+ TQString name;
+ TQString details;
if (m_filteredTasks.count() > 0)
{
@@ -1549,7 +1549,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
}
// Collect all desktops the tasks are on. Sort naturally.
- QMap<int, QString> desktopMap;
+ TQMap<int, TQString> desktopMap;
bool demandsAttention = false;
bool modified = false;
bool allDesktops = false;
@@ -1587,8 +1587,8 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
}
else
{
- QStringList desktopNames = desktopMap.values();
- details.append(i18n("On %1").arg(QStyleSheet::escape(desktopNames.join(", "))) + "<br>");
+ TQStringList desktopNames = desktopMap.values();
+ details.append(i18n("On %1").arg(TQStyleSheet::escape(desktopNames.join(", "))) + "<br>");
}
}
@@ -1602,7 +1602,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
{
details.append(i18n("Has unsaved changes"));
- static QString modStr = "[" + i18n( "modified" ) + "]";
+ static TQString modStr = "[" + i18n( "modified" ) + "]";
int modStrPos = name.find(modStr);
if (modStrPos >= 0)
@@ -1613,7 +1613,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
}
}
- data.message = QStyleSheet::escape(name);
+ data.message = TQStyleSheet::escape(name);
data.subtext = details;
data.icon = pixmap;
data.direction = KickerLib::arrowToDirection(arrowType);
@@ -1624,7 +1624,7 @@ void TaskContainer::finish()
// Disconnect all signal/slot connections to avoid triggering a popupMenu() call,
// whose event loop is the root of all (or at least much) evil.
// Unfortunately, we can't just do "disconnect()", because that gets us a bunch
- // of dangling QGuardedPtr objects (most notably in QTipManager.) (kling)
+ // of dangling TQGuardedPtr objects (most notably in QTipManager.) (kling)
animationTimer.disconnect();
dragSwitchTimer.disconnect();
diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h
index 4328c36d4..567a74a79 100644
--- a/kicker/taskbar/taskcontainer.h
+++ b/kicker/taskbar/taskcontainer.h
@@ -25,28 +25,28 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __taskcontainer_h__
#define __taskcontainer_h__
-#include <qpixmap.h>
-#include <qtimer.h>
-#include <qtoolbutton.h>
+#include <tqpixmap.h>
+#include <tqtimer.h>
+#include <tqtoolbutton.h>
#include "kickertip.h"
#include "taskmanager.h"
class TaskBar;
-typedef QValueList<QPixmap*> PixmapList;
+typedef TQValueList<TQPixmap*> PixmapList;
-class TaskContainer : public QToolButton, public KickerTip::Client
+class TaskContainer : public TQToolButton, public KickerTip::Client
{
Q_OBJECT
public:
- typedef QValueList<TaskContainer*> List;
- typedef QValueList<TaskContainer*>::iterator Iterator;
+ typedef TQValueList<TaskContainer*> List;
+ typedef TQValueList<TaskContainer*>::iterator Iterator;
- TaskContainer(Task::Ptr, TaskBar*, QWidget *parent = 0, const char *name = 0);
+ TaskContainer(Task::Ptr, TaskBar*, TQWidget *parent = 0, const char *name = 0);
TaskContainer(Startup::Ptr, PixmapList&, TaskBar*,
- QWidget *parent = 0, const char *name = 0);
+ TQWidget *parent = 0, const char *name = 0);
virtual ~TaskContainer();
void setArrowType( Qt::ArrowType at );
@@ -66,17 +66,17 @@ public:
bool isIconified();
bool isOnScreen();
- QString id();
+ TQString id();
int desktop();
- QString name();
+ TQString name();
- virtual QSizePolicy sizePolicy () const;
+ virtual TQSizePolicy sizePolicy () const;
- void publishIconGeometry( QPoint );
+ void publishIconGeometry( TQPoint );
void desktopChanged( int );
void windowChanged(Task::Ptr);
void settingsChanged();
- bool eventFilter( QObject *o, QEvent *e );
+ bool eventFilter( TQObject *o, TQEvent *e );
int taskCount() const { return tasks.count(); }
int filteredTaskCount() const { return m_filteredTasks.count(); }
@@ -96,17 +96,17 @@ signals:
void showMe(TaskContainer*);
protected:
- void paintEvent(QPaintEvent*);
- void drawButton(QPainter*);
- void resizeEvent(QResizeEvent*);
- void mousePressEvent(QMouseEvent*);
- void mouseReleaseEvent(QMouseEvent*);
- void mouseMoveEvent(QMouseEvent*);
- void dragEnterEvent(QDragEnterEvent*);
- void dragLeaveEvent(QDragLeaveEvent*);
- void enterEvent(QEvent*);
- void leaveEvent(QEvent*);
- bool startDrag(const QPoint& pos);
+ void paintEvent(TQPaintEvent*);
+ void drawButton(TQPainter*);
+ void resizeEvent(TQResizeEvent*);
+ void mousePressEvent(TQMouseEvent*);
+ void mouseReleaseEvent(TQMouseEvent*);
+ void mouseMoveEvent(TQMouseEvent*);
+ void dragEnterEvent(TQDragEnterEvent*);
+ void dragLeaveEvent(TQDragLeaveEvent*);
+ void enterEvent(TQEvent*);
+ void leaveEvent(TQEvent*);
+ bool startDrag(const TQPoint& pos);
void stopTimers();
void performAction(int);
@@ -125,20 +125,20 @@ protected slots:
private:
void checkAttention(const Task::Ptr changed_task = NULL);
- QString sid;
- QTimer animationTimer;
- QTimer dragSwitchTimer;
- QTimer attentionTimer;
- QTimer m_paintEventCompressionTimer;
+ TQString sid;
+ TQTimer animationTimer;
+ TQTimer dragSwitchTimer;
+ TQTimer attentionTimer;
+ TQTimer m_paintEventCompressionTimer;
int currentFrame;
PixmapList frames;
int attentionState;
- QRect iconRect;
- QPixmap animBg;
+ TQRect iconRect;
+ TQPixmap animBg;
Task::List tasks;
Task::List m_filteredTasks;
Task::Ptr lastActivated;
- QPopupMenu* m_menu;
+ TQPopupMenu* m_menu;
Startup::Ptr m_startup;
ArrowType arrowType;
TaskBar* taskBar;
@@ -147,7 +147,7 @@ private:
bool m_mouseOver;
bool m_paintEventCompression;
enum { ATTENTION_BLINK_TIMEOUT = 4 };
- QPoint m_dragStartPos;
+ TQPoint m_dragStartPos;
};
#endif
diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index 03278c0fe..864d10f5d 100644
--- a/kicker/taskmanager/tasklmbmenu.cpp
+++ b/kicker/taskmanager/tasklmbmenu.cpp
@@ -25,17 +25,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "tasklmbmenu.h"
#include "tasklmbmenu.moc"
-#include <qpainter.h>
-#include <qstyle.h>
+#include <tqpainter.h>
+#include <tqstyle.h>
#include <kdebug.h>
#include <kglobalsettings.h>
#include "global.h"
-TaskMenuItem::TaskMenuItem(const QString &text,
+TaskMenuItem::TaskMenuItem(const TQString &text,
bool active, bool minimized, bool attention)
- : QCustomMenuItem(),
+ : TQCustomMenuItem(),
m_text(text),
m_isActive(active),
m_isMinimized(minimized),
@@ -48,13 +48,13 @@ TaskMenuItem::~TaskMenuItem()
{
}
-void TaskMenuItem::paint(QPainter *p, const QColorGroup &cg,
+void TaskMenuItem::paint(TQPainter *p, const TQColorGroup &cg,
bool highlighted, bool /*enabled*/,
int x, int y, int w, int h )
{
if (m_isActive)
{
- QFont font = p->font();
+ TQFont font = p->font();
font.setBold(true);
p->setFont(font);
}
@@ -65,7 +65,7 @@ void TaskMenuItem::paint(QPainter *p, const QColorGroup &cg,
}
else if (m_isMinimized)
{
- p->setPen(QPen(KickerLib::blendColors(cg.background(), cg.text())));
+ p->setPen(TQPen(KickerLib::blendColors(cg.background(), cg.text())));
}
else if (m_demandsAttention && !m_attentionState)
{
@@ -75,21 +75,21 @@ void TaskMenuItem::paint(QPainter *p, const QColorGroup &cg,
p->drawText(x, y, w, h, AlignAuto|AlignVCenter|DontClip|ShowPrefix, m_text);
}
-QSize TaskMenuItem::sizeHint()
+TQSize TaskMenuItem::sizeHint()
{
- QFont font = QFont();
+ TQFont font = TQFont();
if (m_isActive)
{
font.setBold(true);
}
- return QFontMetrics(font).size(AlignAuto|AlignVCenter|DontClip|ShowPrefix,
+ return TQFontMetrics(font).size(AlignAuto|AlignVCenter|DontClip|ShowPrefix,
m_text);
}
/*****************************************************************************/
-TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, QWidget *parent, const char *name)
- : QPopupMenu(parent, name),
+TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, TQWidget *parent, const char *name)
+ : TQPopupMenu(parent, name),
m_tasks(tasks),
m_lastDragId(-1),
m_attentionState(false)
@@ -98,8 +98,8 @@ TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, QWidget *parent, const char *n
setAcceptDrops(true); // Always enabled to activate task during drag&drop.
- m_dragSwitchTimer = new QTimer(this, "DragSwitchTimer");
- connect(m_dragSwitchTimer, SIGNAL(timeout()), SLOT(dragSwitch()));
+ m_dragSwitchTimer = new TQTimer(this, "DragSwitchTimer");
+ connect(m_dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch()));
}
void TaskLMBMenu::fillMenu()
@@ -111,14 +111,14 @@ void TaskLMBMenu::fillMenu()
{
Task::Ptr t = (*it);
- QString text = t->visibleName().replace("&", "&&");
+ TQString text = t->visibleName().replace("&", "&&");
TaskMenuItem *menuItem = new TaskMenuItem(text,
t->isActive(),
t->isIconified(),
t->demandsAttention());
- int id = insertItem(QIconSet(t->pixmap()), menuItem);
- connectItem(id, t, SLOT(activateRaiseOrIconify()));
+ int id = insertItem(TQIconSet(t->pixmap()), menuItem);
+ connectItem(id, t, TQT_SLOT(activateRaiseOrIconify()));
setItemChecked(id, t->isActive());
if (t->demandsAttention())
@@ -130,8 +130,8 @@ void TaskLMBMenu::fillMenu()
if (m_attentionState)
{
- m_attentionTimer = new QTimer(this, "AttentionTimer");
- connect(m_attentionTimer, SIGNAL(timeout()), SLOT(attentionTimeout()));
+ m_attentionTimer = new TQTimer(this, "AttentionTimer");
+ connect(m_attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimeout()));
m_attentionTimer->start(500, true);
}
}
@@ -140,7 +140,7 @@ void TaskLMBMenu::attentionTimeout()
{
m_attentionState = !m_attentionState;
- for (QValueList<TaskMenuItem*>::const_iterator it = m_attentionMap.constBegin();
+ for (TQValueList<TaskMenuItem*>::const_iterator it = m_attentionMap.constBegin();
it != m_attentionMap.constEnd();
++it)
{
@@ -152,7 +152,7 @@ void TaskLMBMenu::attentionTimeout()
m_attentionTimer->start(500, true);
}
-void TaskLMBMenu::dragEnterEvent( QDragEnterEvent* e )
+void TaskLMBMenu::dragEnterEvent( TQDragEnterEvent* e )
{
// ignore task drags
if (TaskDrag::canDecode(e))
@@ -173,20 +173,20 @@ void TaskLMBMenu::dragEnterEvent( QDragEnterEvent* e )
m_dragSwitchTimer->start(1000, true);
}
- QPopupMenu::dragEnterEvent( e );
+ TQPopupMenu::dragEnterEvent( e );
}
-void TaskLMBMenu::dragLeaveEvent( QDragLeaveEvent* e )
+void TaskLMBMenu::dragLeaveEvent( TQDragLeaveEvent* e )
{
m_dragSwitchTimer->stop();
m_lastDragId = -1;
- QPopupMenu::dragLeaveEvent(e);
+ TQPopupMenu::dragLeaveEvent(e);
hide();
}
-void TaskLMBMenu::dragMoveEvent( QDragMoveEvent* e )
+void TaskLMBMenu::dragMoveEvent( TQDragMoveEvent* e )
{
// ignore task drags
if (TaskDrag::canDecode(e))
@@ -207,7 +207,7 @@ void TaskLMBMenu::dragMoveEvent( QDragMoveEvent* e )
m_dragSwitchTimer->start(1000, true);
}
- QPopupMenu::dragMoveEvent(e);
+ TQPopupMenu::dragMoveEvent(e);
}
void TaskLMBMenu::dragSwitch()
@@ -227,7 +227,7 @@ void TaskLMBMenu::dragSwitch()
}
}
-void TaskLMBMenu::mousePressEvent( QMouseEvent* e )
+void TaskLMBMenu::mousePressEvent( TQMouseEvent* e )
{
if (e->button() == LeftButton)
{
@@ -235,28 +235,28 @@ void TaskLMBMenu::mousePressEvent( QMouseEvent* e )
}
else
{
- m_dragStartPos = QPoint();
+ m_dragStartPos = TQPoint();
}
- QPopupMenu::mousePressEvent(e);
+ TQPopupMenu::mousePressEvent(e);
}
-void TaskLMBMenu::mouseReleaseEvent(QMouseEvent* e)
+void TaskLMBMenu::mouseReleaseEvent(TQMouseEvent* e)
{
- m_dragStartPos = QPoint();
- QPopupMenu::mouseReleaseEvent(e);
+ m_dragStartPos = TQPoint();
+ TQPopupMenu::mouseReleaseEvent(e);
}
-void TaskLMBMenu::mouseMoveEvent(QMouseEvent* e)
+void TaskLMBMenu::mouseMoveEvent(TQMouseEvent* e)
{
if (m_dragStartPos.isNull())
{
- QPopupMenu::mouseMoveEvent(e);
+ TQPopupMenu::mouseMoveEvent(e);
return;
}
int delay = KGlobalSettings::dndEventDelay();
- QPoint newPos(e->pos());
+ TQPoint newPos(e->pos());
if ((m_dragStartPos - newPos).manhattanLength() > delay)
{
@@ -276,6 +276,6 @@ void TaskLMBMenu::mouseMoveEvent(QMouseEvent* e)
}
}
- QPopupMenu::mouseMoveEvent(e);
+ TQPopupMenu::mouseMoveEvent(e);
}
diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h
index 945c3e649..d11091d82 100644
--- a/kicker/taskmanager/tasklmbmenu.h
+++ b/kicker/taskmanager/tasklmbmenu.h
@@ -25,24 +25,24 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __tasklmbmenu_h__
#define __tasklmbmenu_h__
-#include <qpopupmenu.h>
-#include <qtimer.h>
+#include <tqpopupmenu.h>
+#include <tqtimer.h>
#include "taskmanager.h"
class TaskMenuItem : public QCustomMenuItem
{
public:
- TaskMenuItem(const QString &text,
+ TaskMenuItem(const TQString &text,
bool active, bool minimized, bool attention);
~TaskMenuItem();
- void paint(QPainter*, const QColorGroup&, bool, bool, int, int, int, int);
- QSize sizeHint();
+ void paint(TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int);
+ TQSize sizeHint();
void setAttentionState(bool state) { m_attentionState = state; }
private:
- QString m_text;
+ TQString m_text;
bool m_isActive;
bool m_isMinimized;
bool m_demandsAttention;
@@ -56,19 +56,19 @@ class KDE_EXPORT TaskLMBMenu : public QPopupMenu
Q_OBJECT
public:
- TaskLMBMenu(const Task::List& list, QWidget *parent = 0, const char *name = 0);
+ TaskLMBMenu(const Task::List& list, TQWidget *parent = 0, const char *name = 0);
protected slots:
void dragSwitch();
void attentionTimeout();
protected:
- void dragEnterEvent(QDragEnterEvent*);
- void dragLeaveEvent(QDragLeaveEvent*);
- void dragMoveEvent(QDragMoveEvent*);
- void mousePressEvent(QMouseEvent*);
- void mouseMoveEvent(QMouseEvent*);
- void mouseReleaseEvent(QMouseEvent*);
+ void dragEnterEvent(TQDragEnterEvent*);
+ void dragLeaveEvent(TQDragLeaveEvent*);
+ void dragMoveEvent(TQDragMoveEvent*);
+ void mousePressEvent(TQMouseEvent*);
+ void mouseMoveEvent(TQMouseEvent*);
+ void mouseReleaseEvent(TQMouseEvent*);
private:
void fillMenu();
@@ -76,10 +76,10 @@ private:
Task::List m_tasks;
int m_lastDragId;
bool m_attentionState;
- QTimer* m_attentionTimer;
- QTimer* m_dragSwitchTimer;
- QPoint m_dragStartPos;
- QValueList<TaskMenuItem*> m_attentionMap;
+ TQTimer* m_attentionTimer;
+ TQTimer* m_dragSwitchTimer;
+ TQPoint m_dragStartPos;
+ TQValueList<TaskMenuItem*> m_attentionMap;
};
#endif
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index dd9364c0e..9a912e6fd 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -21,10 +21,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <qapplication.h>
-#include <qcursor.h>
-#include <qimage.h>
-#include <qtimer.h>
+#include <tqapplication.h>
+#include <tqcursor.h>
+#include <tqimage.h>
+#include <tqtimer.h>
#include <kconfig.h>
#include <kdebug.h>
@@ -54,28 +54,28 @@ TaskManager* TaskManager::the()
}
TaskManager::TaskManager()
- : QObject(),
+ : TQObject(),
_active(0),
_startup_info(0),
m_winModule(new KWinModule()),
m_trackGeometry(false)
{
KGlobal::locale()->insertCatalogue("libtaskmanager");
- connect(m_winModule, SIGNAL(windowAdded(WId)),
- this, SLOT(windowAdded(WId)));
- connect(m_winModule, SIGNAL(windowRemoved(WId)),
- this, SLOT(windowRemoved(WId)));
- connect(m_winModule, SIGNAL(activeWindowChanged(WId)),
- this, SLOT(activeWindowChanged(WId)));
- connect(m_winModule, SIGNAL(currentDesktopChanged(int)),
- this, SLOT(currentDesktopChanged(int)));
- connect(m_winModule, SIGNAL(windowChanged(WId,unsigned int)),
- this, SLOT(windowChanged(WId,unsigned int)));
+ connect(m_winModule, TQT_SIGNAL(windowAdded(WId)),
+ this, TQT_SLOT(windowAdded(WId)));
+ connect(m_winModule, TQT_SIGNAL(windowRemoved(WId)),
+ this, TQT_SLOT(windowRemoved(WId)));
+ connect(m_winModule, TQT_SIGNAL(activeWindowChanged(WId)),
+ this, TQT_SLOT(activeWindowChanged(WId)));
+ connect(m_winModule, TQT_SIGNAL(currentDesktopChanged(int)),
+ this, TQT_SLOT(currentDesktopChanged(int)));
+ connect(m_winModule, TQT_SIGNAL(windowChanged(WId,unsigned int)),
+ this, TQT_SLOT(windowChanged(WId,unsigned int)));
// register existing windows
- const QValueList<WId> windows = m_winModule->windows();
- QValueList<WId>::ConstIterator end(windows.end());
- for (QValueList<WId>::ConstIterator it = windows.begin(); it != end; ++it)
+ const TQValueList<WId> windows = m_winModule->windows();
+ TQValueList<WId>::ConstIterator end(windows.end());
+ for (TQValueList<WId>::ConstIterator it = windows.begin(); it != end; ++it)
{
windowAdded(*it);
}
@@ -99,14 +99,14 @@ void TaskManager::configure_startup()
return;
_startup_info = new KStartupInfo( KStartupInfo::CleanOnCantDetect, this );
connect( _startup_info,
- SIGNAL( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )),
- SLOT( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )));
+ TQT_SIGNAL( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )),
+ TQT_SLOT( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )));
connect( _startup_info,
- SIGNAL( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )),
- SLOT( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )));
+ TQT_SIGNAL( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )),
+ TQT_SLOT( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )));
connect( _startup_info,
- SIGNAL( gotRemoveStartup( const KStartupInfoId&, const KStartupInfoData& )),
- SLOT( killStartup( const KStartupInfoId& )));
+ TQT_SIGNAL( gotRemoveStartup( const KStartupInfoId&, const KStartupInfoData& )),
+ TQT_SLOT( killStartup( const KStartupInfoId& )));
c.setGroup( "TaskbarButtonSettings" );
_startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 ));
}
@@ -114,7 +114,7 @@ void TaskManager::configure_startup()
#ifdef THUMBNAILING_POSSIBLE
void TaskManager::setXCompositeEnabled(bool state)
{
- Display *dpy = QPaintDevice::x11AppDisplay();
+ Display *dpy = TQPaintDevice::x11AppDisplay();
if (!state)
{
@@ -227,9 +227,9 @@ Task::Ptr TaskManager::findTask(WId w)
return 0;
}
-Task::Ptr TaskManager::findTask(int desktop, const QPoint& p)
+Task::Ptr TaskManager::findTask(int desktop, const TQPoint& p)
{
- QValueList<WId> list = winModule()->stackingOrder();
+ TQValueList<WId> list = winModule()->stackingOrder();
Task::Ptr task = 0;
int currentIndex = -1;
@@ -544,7 +544,7 @@ void TaskManager::killStartup(Startup::Ptr s)
emit startupRemoved(s);
}
-QString TaskManager::desktopName(int desk) const
+TQString TaskManager::desktopName(int desk) const
{
return m_winModule->desktopName(desk);
}
@@ -561,8 +561,8 @@ bool TaskManager::isOnTop(const Task* task)
return false;
}
- QValueList<WId>::ConstIterator begin(m_winModule->stackingOrder().constBegin());
- QValueList<WId>::ConstIterator it = m_winModule->stackingOrder().fromLast();
+ TQValueList<WId>::ConstIterator begin(m_winModule->stackingOrder().constBegin());
+ TQValueList<WId>::ConstIterator it = m_winModule->stackingOrder().fromLast();
do
{
Task::Dict::iterator taskItEnd = m_tasksByWId.end();
@@ -602,14 +602,14 @@ bool TaskManager::isOnScreen(int screen, const WId wid)
// for window decos that fudge a bit and claim to extend beyond the
// edge of the screen, we just contract a bit.
- QRect window = wi.frameGeometry();
- QRect desktop = QApplication::desktop()->screenGeometry(screen);
+ TQRect window = wi.frameGeometry();
+ TQRect desktop = TQApplication::desktop()->screenGeometry(screen);
desktop.addCoords(5, 5, -5, -5);
return window.intersects(desktop);
}
-Task::Task(WId win, QObject *parent, const char *name)
- : QObject(parent, name),
+Task::Task(WId win, TQObject *parent, const char *name)
+ : TQObject(parent, name),
_active(false),
_win(win),
m_frameId(win),
@@ -657,7 +657,7 @@ Task::~Task()
#ifdef THUMBNAILING_POSSIBLE
if (m_windowPixmap)
{
- XFreePixmap(QPaintDevice::x11AppDisplay(), m_windowPixmap);
+ XFreePixmap(TQPaintDevice::x11AppDisplay(), m_windowPixmap);
}
#endif // THUMBNAILING_POSSIBLE
}
@@ -676,7 +676,7 @@ void Task::findWindowFrameId()
target_win = _win;
for (;;)
{
- if (!XQueryTree(QPaintDevice::x11AppDisplay(), target_win, &root,
+ if (!XQueryTree(TQPaintDevice::x11AppDisplay(), target_win, &root,
&parent, &children, &nchildren))
{
break;
@@ -728,7 +728,7 @@ void Task::refreshIcon()
void Task::refresh(unsigned int dirty)
{
- QString name = visibleName();
+ TQString name = visibleName();
_info = KWin::windowInfo(_win, 0, NET::WM2AllowedActions);
if (dirty != NET::WMName || name != visibleName())
@@ -804,9 +804,9 @@ bool Task::isOnTop() const
bool Task::isModified() const
{
- static QString modStr = QString::fromUtf8("[") +
+ static TQString modStr = TQString::fromUtf8("[") +
i18n("modified") +
- QString::fromUtf8("]");
+ TQString::fromUtf8("]");
int modStrPos = _info.visibleName().find(modStr);
return ( modStrPos != -1 );
@@ -859,31 +859,31 @@ void Task::removeTransient(WId w)
_transients_demanding_attention.remove(w);
}
-QString Task::className()
+TQString Task::className()
{
XClassHint hint;
if(XGetClassHint(qt_xdisplay(), _win, &hint)) {
- QString nh( hint.res_name );
+ TQString nh( hint.res_name );
XFree( hint.res_name );
XFree( hint.res_class );
return nh;
}
- return QString::null;
+ return TQString::null;
}
-QString Task::classClass()
+TQString Task::classClass()
{
XClassHint hint;
if(XGetClassHint(qt_xdisplay(), _win, &hint)) {
- QString ch( hint.res_class );
+ TQString ch( hint.res_class );
XFree( hint.res_name );
XFree( hint.res_class );
return ch;
}
- return QString::null;
+ return TQString::null;
}
-QPixmap Task::icon( int width, int height, bool allowResize )
+TQPixmap Task::icon( int width, int height, bool allowResize )
{
if ( (width == _lastWidth)
&& (height == _lastHeight)
@@ -891,7 +891,7 @@ QPixmap Task::icon( int width, int height, bool allowResize )
&& (!_lastIcon.isNull()) )
return _lastIcon;
- QPixmap newIcon = KWin::icon( _win, width, height, allowResize );
+ TQPixmap newIcon = KWin::icon( _win, width, height, allowResize );
if ( !newIcon.isNull() ) {
_lastIcon = newIcon;
_lastWidth = width;
@@ -902,9 +902,9 @@ QPixmap Task::icon( int width, int height, bool allowResize )
return newIcon;
}
-QPixmap Task::bestIcon( int size, bool &isStaticIcon )
+TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
{
- QPixmap pixmap;
+ TQPixmap pixmap;
isStaticIcon = false;
switch( size ) {
@@ -979,7 +979,7 @@ QPixmap Task::bestIcon( int size, bool &isStaticIcon )
return pixmap;
}
-bool Task::idMatch( const QString& id1, const QString& id2 )
+bool Task::idMatch( const TQString& id1, const TQString& id2 )
{
if ( id1.isEmpty() || id2.isEmpty() )
return false;
@@ -1009,8 +1009,8 @@ void Task::move()
KWin::deIconifyWindow(_win);
}
- QRect geom = _info.geometry();
- QCursor::setPos(geom.center());
+ TQRect geom = _info.geometry();
+ TQCursor::setPos(geom.center());
NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize);
ri.moveResizeRequest(_win, geom.center().x(),
@@ -1032,8 +1032,8 @@ void Task::resize()
KWin::deIconifyWindow(_win);
}
- QRect geom = _info.geometry();
- QCursor::setPos(geom.bottomRight());
+ TQRect geom = _info.geometry();
+ TQCursor::setPos(geom.bottomRight());
NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize);
ri.moveResizeRequest(_win, geom.bottomRight().x(),
@@ -1269,7 +1269,7 @@ void Task::toggleShaded()
setShaded( !isShaded() );
}
-void Task::publishIconGeometry(QRect rect)
+void Task::publishIconGeometry(TQRect rect)
{
if (rect == m_iconGeometry)
{
@@ -1305,15 +1305,15 @@ void Task::updateThumbnail()
// by the thumbnail generation. This makes things much smoother
// on slower machines.
//
- QWidget *rootWin = qApp->desktop();
- QRect geom = _info.geometry();
- _grab = QPixmap::grabWindow(rootWin->winId(),
+ TQWidget *rootWin = qApp->desktop();
+ TQRect geom = _info.geometry();
+ _grab = TQPixmap::grabWindow(rootWin->winId(),
geom.x(), geom.y(),
geom.width(), geom.height());
if (!_grab.isNull())
{
- QTimer::singleShot(200, this, SLOT(generateThumbnail()));
+ TQTimer::singleShot(200, this, TQT_SLOT(generateThumbnail()));
}
}
@@ -1322,7 +1322,7 @@ void Task::generateThumbnail()
if ( _grab.isNull() )
return;
- QImage img = _grab.convertToImage();
+ TQImage img = _grab.convertToImage();
double width = img.width();
double height = img.height();
@@ -1337,14 +1337,14 @@ void Task::generateThumbnail()
}
#ifdef THUMBNAILING_POSSIBLE
-QPixmap Task::thumbnail(int maxDimension)
+TQPixmap Task::thumbnail(int maxDimension)
{
if (!TaskManager::xCompositeEnabled() || !m_windowPixmap)
{
- return QPixmap();
+ return TQPixmap();
}
- Display *dpy = QPaintDevice::x11AppDisplay();
+ Display *dpy = TQPaintDevice::x11AppDisplay();
XWindowAttributes winAttr;
XGetWindowAttributes(dpy, m_frameId, &winAttr);
@@ -1374,12 +1374,12 @@ QPixmap Task::thumbnail(int maxDimension)
int thumbnailWidth = (int)(winAttr.width * factor);
int thumbnailHeight = (int)(winAttr.height * factor);
- QPixmap thumbnail(thumbnailWidth, thumbnailHeight);
- thumbnail.fill(QApplication::palette().active().background());
+ TQPixmap thumbnail(thumbnailWidth, thumbnailHeight);
+ thumbnail.fill(TQApplication::palette().active().background());
-#if 0 // QImage::smoothScale() scaling
- QPixmap full(winAttr.width, winAttr.height);
- full.fill(QApplication::palette().active().background());
+#if 0 // TQImage::smoothScale() scaling
+ TQPixmap full(winAttr.width, winAttr.height);
+ full.fill(TQApplication::palette().active().background());
bool hasAlpha = format->type == PictTypeDirect && format->direct.alphaMask;
@@ -1394,7 +1394,7 @@ QPixmap Task::thumbnail(int maxDimension)
winAttr.width, winAttr.height);
KPixmapIO io;
- QImage image = io.convertToImage(full);
+ TQImage image = io.convertToImage(full);
thumbnail = io.convertToPixmap(image.smoothScale(thumbnailWidth,
thumbnailHeight));
#else // XRENDER scaling
@@ -1408,7 +1408,7 @@ QPixmap Task::thumbnail(int maxDimension)
XRenderSetPictureTransform(dpy, picture, &transformation);
XRenderSetPictureFilter(dpy, picture, FilterBest, 0, 0);
- XRenderComposite(QPaintDevice::x11AppDisplay(),
+ XRenderComposite(TQPaintDevice::x11AppDisplay(),
PictOpOver, // we're filtering, alpha values are probable
picture, // src
None, // mask
@@ -1423,9 +1423,9 @@ QPixmap Task::thumbnail(int maxDimension)
return thumbnail;
}
#else // THUMBNAILING_POSSIBLE
-QPixmap Task::thumbnail(int /* maxDimension */)
+TQPixmap Task::thumbnail(int /* maxDimension */)
{
- return QPixmap();
+ return TQPixmap();
}
#endif // THUMBNAILING_POSSIBLE
@@ -1438,7 +1438,7 @@ void Task::updateWindowPixmap()
return;
}
- Display *dpy = QPaintDevice::x11AppDisplay();
+ Display *dpy = TQPaintDevice::x11AppDisplay();
if (m_windowPixmap)
{
@@ -1453,8 +1453,8 @@ void Task::updateWindowPixmap()
}
Startup::Startup(const KStartupInfoId& id, const KStartupInfoData& data,
- QObject * parent, const char *name)
- : QObject(parent, name), _id(id), _data(data)
+ TQObject * parent, const char *name)
+ : TQObject(parent, name), _id(id), _data(data)
{
}
@@ -1473,11 +1473,11 @@ int TaskManager::currentDesktop() const
return m_winModule->currentDesktop();
}
-TaskDrag::TaskDrag(const Task::List& tasks, QWidget* source, const char* name)
- : QStoredDrag("taskbar/task", source, name)
+TaskDrag::TaskDrag(const Task::List& tasks, TQWidget* source, const char* name)
+ : TQStoredDrag("taskbar/task", source, name)
{
- QByteArray data;
- QDataStream stream(data, IO_WriteOnly);
+ TQByteArray data;
+ TQDataStream stream(data, IO_WriteOnly);
Task::List::const_iterator itEnd = tasks.constEnd();
for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it)
@@ -1492,19 +1492,19 @@ TaskDrag::~TaskDrag()
{
}
-bool TaskDrag::canDecode(const QMimeSource* e)
+bool TaskDrag::canDecode(const TQMimeSource* e)
{
return e->provides("taskbar/task");
}
-Task::List TaskDrag::decode( const QMimeSource* e )
+Task::List TaskDrag::decode( const TQMimeSource* e )
{
- QByteArray data(e->encodedData("taskbar/task"));
+ TQByteArray data(e->encodedData("taskbar/task"));
Task::List tasks;
if (data.size())
{
- QDataStream stream(data, IO_ReadOnly);
+ TQDataStream stream(data, IO_ReadOnly);
while (!stream.atEnd())
{
WId id;
diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h
index 5885569d9..8f5876360 100644
--- a/kicker/taskmanager/taskmanager.h
+++ b/kicker/taskmanager/taskmanager.h
@@ -27,15 +27,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <sys/types.h>
-#include <qobject.h>
-#include <qpixmap.h>
-#include <qpoint.h>
-#include <qptrlist.h>
-#include <qpixmap.h>
-#include <qdragobject.h>
-#include <qrect.h>
-#include <qvaluelist.h>
-#include <qvaluevector.h>
+#include <tqobject.h>
+#include <tqpixmap.h>
+#include <tqpoint.h>
+#include <tqptrlist.h>
+#include <tqpixmap.h>
+#include <tqdragobject.h>
+#include <tqrect.h>
+#include <tqvaluelist.h>
+#include <tqvaluevector.h>
#include <ksharedptr.h>
#include <kstartupinfo.h>
@@ -60,7 +60,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class KWinModule;
class TaskManager;
-typedef QValueList<WId> WindowList;
+typedef TQValueList<WId> WindowList;
/**
* A dynamic interface to a task (main window).
@@ -68,16 +68,16 @@ typedef QValueList<WId> WindowList;
* @see TaskManager
* @see KWinModule
*/
-class KDE_EXPORT Task: public QObject, public KShared
+class KDE_EXPORT Task: public TQObject, public KShared
{
Q_OBJECT
- Q_PROPERTY( QString visibleIconicName READ visibleIconicName )
- Q_PROPERTY( QString iconicName READ iconicName )
- Q_PROPERTY( QString visibleIconicNameWithState READ visibleIconicNameWithState )
- Q_PROPERTY( QString visibleName READ visibleName )
- Q_PROPERTY( QString name READ name )
- Q_PROPERTY( QString visibleNameWithState READ visibleNameWithState )
- Q_PROPERTY( QPixmap pixmap READ pixmap )
+ Q_PROPERTY( TQString visibleIconicName READ visibleIconicName )
+ Q_PROPERTY( TQString iconicName READ iconicName )
+ Q_PROPERTY( TQString visibleIconicNameWithState READ visibleIconicNameWithState )
+ Q_PROPERTY( TQString visibleName READ visibleName )
+ Q_PROPERTY( TQString name READ name )
+ Q_PROPERTY( TQString visibleNameWithState READ visibleNameWithState )
+ Q_PROPERTY( TQPixmap pixmap READ pixmap )
Q_PROPERTY( bool maximized READ isMaximized )
Q_PROPERTY( bool minimized READ isMinimized )
// KDE4 deprecated
@@ -92,33 +92,33 @@ class KDE_EXPORT Task: public QObject, public KShared
Q_PROPERTY( int desktop READ desktop )
Q_PROPERTY( double thumbnailSize READ thumbnailSize WRITE setThumbnailSize )
Q_PROPERTY( bool hasThumbnail READ hasThumbnail )
- Q_PROPERTY( QPixmap thumbnail READ thumbnail )
+ Q_PROPERTY( TQPixmap thumbnail READ thumbnail )
public:
typedef KSharedPtr<Task> Ptr;
- typedef QValueVector<Task::Ptr> List;
- typedef QMap<WId, Task::Ptr> Dict;
+ typedef TQValueVector<Task::Ptr> List;
+ typedef TQMap<WId, Task::Ptr> Dict;
- Task(WId win, QObject *parent, const char *name = 0);
+ Task(WId win, TQObject *parent, const char *name = 0);
virtual ~Task();
WId window() const { return _win; }
KWin::WindowInfo info() const { return _info; }
#if 0 // this would use (_NET_)WM_ICON_NAME, which is shorter, but can be different from window name
- QString visibleIconicName() const { return _info.visibleIconName(); }
- QString visibleIconicNameWithState() const { return _info.visibleIconNameWithState(); }
- QString iconicName() const { return _info.iconName(); }
+ TQString visibleIconicName() const { return _info.visibleIconName(); }
+ TQString visibleIconicNameWithState() const { return _info.visibleIconNameWithState(); }
+ TQString iconicName() const { return _info.iconName(); }
#else
- QString visibleIconicName() const { return _info.visibleName(); }
- QString visibleIconicNameWithState() const { return _info.visibleNameWithState(); }
- QString iconicName() const { return _info.name(); }
+ TQString visibleIconicName() const { return _info.visibleName(); }
+ TQString visibleIconicNameWithState() const { return _info.visibleNameWithState(); }
+ TQString iconicName() const { return _info.name(); }
#endif
- QString visibleName() const { return _info.visibleName(); }
- QString visibleNameWithState() const { return _info.visibleNameWithState(); }
- QString name() const { return _info.name(); }
- QString className();
- QString classClass();
+ TQString visibleName() const { return _info.visibleName(); }
+ TQString visibleNameWithState() const { return _info.visibleNameWithState(); }
+ TQString name() const { return _info.name(); }
+ TQString className();
+ TQString classClass();
/**
* A list of the window ids of all transient windows (dialogs) associated
@@ -131,7 +131,7 @@ public:
* only fall back to a static icon if there is no icon of any size in
* the WM hints.
*/
- QPixmap pixmap() const { return _pixmap; }
+ TQPixmap pixmap() const { return _pixmap; }
/**
* Returns the best icon for any of the KIcon::StdSizes. If there is no
@@ -140,14 +140,14 @@ public:
*
* <pre>
* bool gotStaticIcon;
- * QPixmap icon = myTask->icon( KIcon::SizeMedium, gotStaticIcon );
+ * TQPixmap icon = myTask->icon( KIcon::SizeMedium, gotStaticIcon );
* </pre>
*
* @param size Any of the constants in KIcon::StdSizes.
* @param isStaticIcon Set to true if KIconLoader was used, false otherwise.
* @see KIcon
*/
- QPixmap bestIcon( int size, bool &isStaticIcon );
+ TQPixmap bestIcon( int size, bool &isStaticIcon );
/**
* Tries to find an icon for the task with the specified size. If there
@@ -158,13 +158,13 @@ public:
* parameters will only query the NET properties if the icon has changed or
* none was found.
*/
- QPixmap icon( int width, int height, bool allowResize = false );
+ TQPixmap icon( int width, int height, bool allowResize = false );
/**
* Returns true iff the windows with the specified ids should be grouped
* together in the task list.
*/
- static bool idMatch(const QString &, const QString &);
+ static bool idMatch(const TQString &, const TQString &);
// state
@@ -264,12 +264,12 @@ public:
/**
* Returns the geometry for this window
*/
- QRect geometry() const { return _info.geometry(); }
+ TQRect geometry() const { return _info.geometry(); }
/**
* Returns the geometry for the from of this window
*/
- QRect frameGeometry() const { return _info.frameGeometry(); }
+ TQRect frameGeometry() const { return _info.frameGeometry(); }
// internal
@@ -312,9 +312,9 @@ public:
* Returns the thumbnail for this task (or a null image if there is
* none).
*/
- const QPixmap &thumbnail() const { return _thumb; }
+ const TQPixmap &thumbnail() const { return _thumb; }
- QPixmap thumbnail(int maxDimension);
+ TQPixmap thumbnail(int maxDimension);
void updateWindowPixmap();
@@ -415,7 +415,7 @@ public slots:
* task will be displayed when iconised. It is used, for example by the
* KWin inconify animation.
*/
- void publishIconGeometry(QRect);
+ void publishIconGeometry(TQRect);
/**
* Tells the task to generate a new thumbnail. When the thumbnail is
@@ -460,7 +460,7 @@ private:
bool _active;
WId _win;
WId m_frameId;
- QPixmap _pixmap;
+ TQPixmap _pixmap;
KWin::WindowInfo _info;
WindowList _transients;
WindowList _transients_demanding_attention;
@@ -468,12 +468,12 @@ private:
int _lastWidth;
int _lastHeight;
bool _lastResize;
- QPixmap _lastIcon;
+ TQPixmap _lastIcon;
double _thumbSize;
- QPixmap _thumb;
- QPixmap _grab;
- QRect m_iconGeometry;
+ TQPixmap _thumb;
+ TQPixmap _grab;
+ TQRect m_iconGeometry;
#ifdef THUMBNAILING_POSSIBLE
Pixmap m_windowPixmap;
#endif // THUMBNAILING_POSSIBLE
@@ -489,20 +489,20 @@ public:
/**
* Constructs a task drag object for a task list.
*/
- TaskDrag(const Task::List& tasks, QWidget* source = 0,
+ TaskDrag(const Task::List& tasks, TQWidget* source = 0,
const char* name = 0);
~TaskDrag();
/**
* Returns true if the mime source can be decoded to a TaskDrag.
*/
- static bool canDecode( const QMimeSource* e );
+ static bool canDecode( const TQMimeSource* e );
/**
* Decodes the tasks from the mime source and returns them if successful.
* Otherwise an empty task list is returned.
*/
- static Task::List decode( const QMimeSource* e );
+ static Task::List decode( const TQMimeSource* e );
};
@@ -511,35 +511,35 @@ public:
*
* @see TaskManager
*/
-class KDE_EXPORT Startup: public QObject, public KShared
+class KDE_EXPORT Startup: public TQObject, public KShared
{
Q_OBJECT
- Q_PROPERTY( QString text READ text )
- Q_PROPERTY( QString bin READ bin )
- Q_PROPERTY( QString icon READ icon )
+ Q_PROPERTY( TQString text READ text )
+ Q_PROPERTY( TQString bin READ bin )
+ Q_PROPERTY( TQString icon READ icon )
public:
typedef KSharedPtr<Startup> Ptr;
- typedef QValueVector<Startup::Ptr> List;
+ typedef TQValueVector<Startup::Ptr> List;
- Startup( const KStartupInfoId& id, const KStartupInfoData& data, QObject * parent,
+ Startup( const KStartupInfoId& id, const KStartupInfoData& data, TQObject * parent,
const char *name = 0);
virtual ~Startup();
/**
* The name of the starting task (if known).
*/
- QString text() const { return _data.findName(); }
+ TQString text() const { return _data.findName(); }
/**
* The name of the executable of the starting task.
*/
- QString bin() const { return _data.bin(); }
+ TQString bin() const { return _data.bin(); }
/**
* The name of the icon to be used for the starting task.
*/
- QString icon() const { return _data.findIcon(); }
+ TQString icon() const { return _data.findIcon(); }
void update( const KStartupInfoData& data );
const KStartupInfoId& id() const { return _id; }
@@ -583,7 +583,7 @@ public:
/**
* Returns the task for a given location, or 0 if there is no such task.
*/
- Task::Ptr findTask(int desktop, const QPoint& p);
+ Task::Ptr findTask(int desktop, const TQPoint& p);
/**
* Returns a list of all current tasks.
@@ -598,7 +598,7 @@ public:
/**
* Returns the name of the nth desktop.
*/
- QString desktopName(int n) const;
+ TQString desktopName(int n) const;
/**
* Returns the number of virtual desktops.
diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp
index 47260687f..fb4c9ae87 100644
--- a/kicker/taskmanager/taskrmbmenu.cpp
+++ b/kicker/taskmanager/taskrmbmenu.cpp
@@ -38,8 +38,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "taskrmbmenu.h"
#include "taskrmbmenu.moc"
-TaskRMBMenu::TaskRMBMenu(const Task::List& theTasks, bool show, QWidget *parent, const char *name)
- : QPopupMenu( parent, name )
+TaskRMBMenu::TaskRMBMenu(const Task::List& theTasks, bool show, TQWidget *parent, const char *name)
+ : TQPopupMenu( parent, name )
, tasks( theTasks )
, showAll( show )
{
@@ -54,8 +54,8 @@ TaskRMBMenu::TaskRMBMenu(const Task::List& theTasks, bool show, QWidget *parent,
}
}
-TaskRMBMenu::TaskRMBMenu(Task::Ptr task, bool show, QWidget *parent, const char *name)
- : QPopupMenu( parent, name )
+TaskRMBMenu::TaskRMBMenu(Task::Ptr task, bool show, TQWidget *parent, const char *name)
+ : TQPopupMenu( parent, name )
, showAll( show )
{
fillMenu(task);
@@ -76,7 +76,7 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
if (showAll)
{
id = insertItem(i18n("&To Current Desktop"),
- t, SLOT(toCurrentDesktop()));
+ t, TQT_SLOT(toCurrentDesktop()));
setItemEnabled( id, !t->isOnCurrentDesktop() );
}
@@ -86,27 +86,27 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
}
}
- id = insertItem(SmallIconSet("move"), i18n("&Move"), t, SLOT(move()));
+ id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQT_SLOT(move()));
setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMove));
- id = insertItem(i18n("Re&size"), t, SLOT(resize()));
+ id = insertItem(i18n("Re&size"), t, TQT_SLOT(resize()));
setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionResize));
- id = insertItem(i18n("Mi&nimize"), t, SLOT(toggleIconified()));
+ id = insertItem(i18n("Mi&nimize"), t, TQT_SLOT(toggleIconified()));
setItemChecked(id, t->isIconified());
setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMinimize));
- id = insertItem(i18n("Ma&ximize"), t, SLOT(toggleMaximized()));
+ id = insertItem(i18n("Ma&ximize"), t, TQT_SLOT(toggleMaximized()));
setItemChecked(id, t->isMaximized());
setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMax));
- id = insertItem(i18n("&Shade"), t, SLOT(toggleShaded()));
+ id = insertItem(i18n("&Shade"), t, TQT_SLOT(toggleShaded()));
setItemChecked(id, t->isShaded());
setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionShade));
insertSeparator();
- id = insertItem(SmallIcon("fileclose"), i18n("&Close"), t, SLOT(close()));
+ id = insertItem(SmallIcon("fileclose"), i18n("&Close"), t, TQT_SLOT(close()));
setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionClose));
}
@@ -120,11 +120,11 @@ void TaskRMBMenu::fillMenu()
{
Task::Ptr t = (*it);
- id = insertItem( QIconSet( t->pixmap() ),
+ id = insertItem( TQIconSet( t->pixmap() ),
t->visibleNameWithState(),
new TaskRMBMenu(t, this) );
setItemChecked( id, t->isActive() );
- connectItem( id, t, SLOT( activateRaiseOrIconify() ) );
+ connectItem( id, t, TQT_SLOT( activateRaiseOrIconify() ) );
}
insertSeparator();
@@ -135,7 +135,7 @@ void TaskRMBMenu::fillMenu()
{
id = insertItem(i18n("All to &Desktop"), makeDesktopsMenu());
- id = insertItem(i18n("All &to Current Desktop"), this, SLOT(slotAllToCurrentDesktop()));
+ id = insertItem(i18n("All &to Current Desktop"), this, TQT_SLOT(slotAllToCurrentDesktop()));
Task::List::iterator itEnd = tasks.end();
for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
{
@@ -150,7 +150,7 @@ void TaskRMBMenu::fillMenu()
enable = false;
- id = insertItem( i18n( "Mi&nimize All" ), this, SLOT( slotMinimizeAll() ) );
+ id = insertItem( i18n( "Mi&nimize All" ), this, TQT_SLOT( slotMinimizeAll() ) );
itEnd = tasks.end();
for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
{
@@ -163,7 +163,7 @@ void TaskRMBMenu::fillMenu()
enable = false;
- id = insertItem( i18n( "Ma&ximize All" ), this, SLOT( slotMaximizeAll() ) );
+ id = insertItem( i18n( "Ma&ximize All" ), this, TQT_SLOT( slotMaximizeAll() ) );
itEnd = tasks.end();
for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
{
@@ -176,7 +176,7 @@ void TaskRMBMenu::fillMenu()
enable = false;
- id = insertItem( i18n( "&Restore All" ), this, SLOT( slotRestoreAll() ) );
+ id = insertItem( i18n( "&Restore All" ), this, TQT_SLOT( slotRestoreAll() ) );
itEnd = tasks.end();
for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
{
@@ -191,29 +191,29 @@ void TaskRMBMenu::fillMenu()
enable = false;
- insertItem( SmallIcon( "remove" ), i18n( "&Close All" ), this, SLOT( slotCloseAll() ) );
+ insertItem( SmallIcon( "remove" ), i18n( "&Close All" ), this, TQT_SLOT( slotCloseAll() ) );
}
-QPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t)
+TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t)
{
int id;
- QPopupMenu* menu = new QPopupMenu(this);
+ TQPopupMenu* menu = new TQPopupMenu(this);
menu->setCheckable(true);
id = menu->insertItem(SmallIconSet("up"),
i18n("Keep &Above Others"),
- t, SLOT(toggleAlwaysOnTop()));
+ t, TQT_SLOT(toggleAlwaysOnTop()));
menu->setItemChecked(id, t->isAlwaysOnTop());
id = menu->insertItem(SmallIconSet("down"),
i18n("Keep &Below Others"),
- t, SLOT(toggleKeptBelowOthers()));
+ t, TQT_SLOT(toggleKeptBelowOthers()));
menu->setItemChecked(id, t->isKeptBelowOthers());
id = menu->insertItem(SmallIconSet("window_fullscreen"),
i18n("&Fullscreen"),
- t, SLOT(toggleFullScreen()));
+ t, TQT_SLOT(toggleFullScreen()));
menu->setItemChecked(id, t->isFullScreen());
if (KWin::allowedActionsSupported())
@@ -224,20 +224,20 @@ QPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t)
return menu;
}
-QPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t)
+TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t)
{
- QPopupMenu* m = new QPopupMenu( this );
+ TQPopupMenu* m = new TQPopupMenu( this );
m->setCheckable( true );
- int id = m->insertItem( i18n("&All Desktops"), t, SLOT( toDesktop(int) ) );
+ int id = m->insertItem( i18n("&All Desktops"), t, TQT_SLOT( toDesktop(int) ) );
m->setItemParameter( id, 0 ); // 0 means all desktops
m->setItemChecked( id, t->isOnAllDesktops() );
m->insertSeparator();
for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) {
- QString name = QString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
- id = m->insertItem( name, t, SLOT( toDesktop(int) ) );
+ TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
+ id = m->insertItem( name, t, TQT_SLOT( toDesktop(int) ) );
m->setItemParameter( id, i );
m->setItemChecked( id, !t->isOnAllDesktops() && t->desktop() == i );
}
@@ -245,19 +245,19 @@ QPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t)
return m;
}
-QPopupMenu* TaskRMBMenu::makeDesktopsMenu()
+TQPopupMenu* TaskRMBMenu::makeDesktopsMenu()
{
- QPopupMenu* m = new QPopupMenu( this );
+ TQPopupMenu* m = new TQPopupMenu( this );
m->setCheckable( true );
- int id = m->insertItem( i18n("&All Desktops"), this, SLOT( slotAllToDesktop(int) ) );
+ int id = m->insertItem( i18n("&All Desktops"), this, TQT_SLOT( slotAllToDesktop(int) ) );
m->setItemParameter( id, 0 ); // 0 means all desktops
m->insertSeparator();
for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) {
- QString name = QString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
- id = m->insertItem( name, this, SLOT( slotAllToDesktop(int) ) );
+ TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
+ id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) );
m->setItemParameter( id, i );
}
diff --git a/kicker/taskmanager/taskrmbmenu.h b/kicker/taskmanager/taskrmbmenu.h
index a167d6665..6657bf909 100644
--- a/kicker/taskmanager/taskrmbmenu.h
+++ b/kicker/taskmanager/taskrmbmenu.h
@@ -25,22 +25,22 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __taskrmbmenu_h__
#define __taskrmbmenu_h__
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
class KDE_EXPORT TaskRMBMenu : public QPopupMenu
{
Q_OBJECT
public:
- TaskRMBMenu(const Task::List&, bool showAll = true, QWidget *parent = 0, const char *name = 0);
- TaskRMBMenu(Task::Ptr, bool showAll = true, QWidget *parent = 0, const char *name = 0);
+ TaskRMBMenu(const Task::List&, bool showAll = true, TQWidget *parent = 0, const char *name = 0);
+ TaskRMBMenu(Task::Ptr, bool showAll = true, TQWidget *parent = 0, const char *name = 0);
private:
void fillMenu(Task::Ptr);
void fillMenu();
- QPopupMenu* makeAdvancedMenu(Task::Ptr);
- QPopupMenu* makeDesktopsMenu(Task::Ptr);
- QPopupMenu* makeDesktopsMenu();
+ TQPopupMenu* makeAdvancedMenu(Task::Ptr);
+ TQPopupMenu* makeDesktopsMenu(Task::Ptr);
+ TQPopupMenu* makeDesktopsMenu();
private slots:
void slotMinimizeAll();
diff --git a/kioslave/about/kio_about.cpp b/kioslave/about/kio_about.cpp
index 226de2f4f..5f012fdd6 100644
--- a/kioslave/about/kio_about.cpp
+++ b/kioslave/about/kio_about.cpp
@@ -21,13 +21,13 @@
#include "kio_about.h"
#include <stdlib.h>
-#include <qstring.h>
+#include <tqstring.h>
#include <kinstance.h>
#include <kurl.h>
using namespace KIO;
-AboutProtocol::AboutProtocol(const QCString &pool_socket, const QCString &app_socket)
+AboutProtocol::AboutProtocol(const TQCString &pool_socket, const TQCString &app_socket)
: SlaveBase("about", pool_socket, app_socket)
{
}
@@ -38,10 +38,10 @@ AboutProtocol::~AboutProtocol()
void AboutProtocol::get( const KURL& )
{
- QByteArray output;
+ TQByteArray output;
- QTextStream os( output, IO_WriteOnly );
- os.setEncoding( QTextStream::Latin1 ); // In fast ASCII
+ TQTextStream os( output, IO_WriteOnly );
+ os.setEncoding( TQTextStream::Latin1 ); // In fast ASCII
os << "<html><head><title>about:blank</title></head><body></body></html>";
diff --git a/kioslave/about/kio_about.h b/kioslave/about/kio_about.h
index 29982dbe7..a5bff2a8f 100644
--- a/kioslave/about/kio_about.h
+++ b/kioslave/about/kio_about.h
@@ -20,7 +20,7 @@
#ifndef __kio_about_h__
#define __kio_about_h__
-#include <qcstring.h>
+#include <tqcstring.h>
#include <kio/global.h>
#include <kio/slavebase.h>
@@ -29,7 +29,7 @@
class AboutProtocol : public KIO::SlaveBase
{
public:
- AboutProtocol(const QCString &pool_socket, const QCString &app_socket);
+ AboutProtocol(const TQCString &pool_socket, const TQCString &app_socket);
virtual ~AboutProtocol();
virtual void get(const KURL& url);
diff --git a/kioslave/cgi/cgi.cpp b/kioslave/cgi/cgi.cpp
index 011760e0b..5f57c3fe8 100644
--- a/kioslave/cgi/cgi.cpp
+++ b/kioslave/cgi/cgi.cpp
@@ -19,8 +19,8 @@
#include <stdio.h>
#include <stdlib.h>
-#include <qdir.h>
-#include <qregexp.h>
+#include <tqdir.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <kprocess.h>
@@ -33,7 +33,7 @@
using namespace KIO;
-CgiProtocol::CgiProtocol( const QCString &pool, const QCString &app )
+CgiProtocol::CgiProtocol( const TQCString &pool, const TQCString &app )
: SlaveBase( "cgi", pool, app )
{
kdDebug(7124) << "CgiProtocol::CgiProtocol" << endl;
@@ -49,10 +49,10 @@ CgiProtocol::~CgiProtocol()
}
/**
- * Search in reverse order through a QByteArray for a given character. The position
+ * Search in reverse order through a TQByteArray for a given character. The position
* of the character is returned, or -1 if it was not found.
*/
-static int qByteArrayFindRev( const QByteArray &ba, char c, int startIndex )
+static int qByteArrayFindRev( const TQByteArray &ba, char c, int startIndex )
{
for ( int i = startIndex; i >= 0; --i )
if ( ba[i] == c ) return i;
@@ -62,29 +62,29 @@ static int qByteArrayFindRev( const QByteArray &ba, char c, int startIndex )
/**
* Extract data in ba from start, including no more than len characters from ba.
- * Should be exactly comparable to QCString::mid()
+ * Should be exactly comparable to TQCString::mid()
*/
-static QCString extractQCString( const QByteArray &ba, uint start, uint len = 0xffffffff )
+static TQCString extractQCString( const TQByteArray &ba, uint start, uint len = 0xffffffff )
{
uint realLen = len;
if ( ( ba.size() - start ) < len )
realLen = ba.size() - start;
- return QCString( &ba[ start ], realLen + 1 );
+ return TQCString( &ba[ start ], realLen + 1 );
}
/**
- * Search through a QByteArray for a given string. The position of the string
+ * Search through a TQByteArray for a given string. The position of the string
* is returned, or -1 if it was not found.
*/
-static int qByteArrayFindStr( const QByteArray &ba, const char *str )
+static int qByteArrayFindStr( const TQByteArray &ba, const char *str )
{
int strLen = qstrlen( str );
int searchLen = ba.size() - strLen;
for ( int i = 0; i <= searchLen; ++i ) {
- QCString temp = extractQCString( ba, i, strLen );
+ TQCString temp = extractQCString( ba, i, strLen );
if ( temp == str )
return i;
}
@@ -102,30 +102,30 @@ void CgiProtocol::get( const KURL& url )
kdDebug(7124) << " Protocol: " << url.protocol() << endl;
kdDebug(7124) << " Filename: " << url.filename() << endl;
#endif
- QCString protocol = "SERVER_PROTOCOL=HTTP";
+ TQCString protocol = "SERVER_PROTOCOL=HTTP";
putenv( protocol.data() );
- QCString requestMethod = "REQUEST_METHOD=GET";
+ TQCString requestMethod = "REQUEST_METHOD=GET";
putenv( requestMethod.data() );
- QCString query = url.query().mid( 1 ).local8Bit();
+ TQCString query = url.query().mid( 1 ).local8Bit();
query.prepend( "QUERY_STRING=" );
putenv( query.data() );
- QString path = url.path();
+ TQString path = url.path();
- QString file;
+ TQString file;
int pos = path.findRev('/');
if ( pos >= 0 ) file = path.mid( pos + 1 );
else file = path;
- QString cmd;
+ TQString cmd;
bool stripHeader = false;
bool forwardFile = true;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for( it = mCgiPaths.begin(); it != mCgiPaths.end(); ++it ) {
cmd = *it;
if ( !(*it).endsWith("/") )
@@ -143,7 +143,7 @@ void CgiProtocol::get( const KURL& url )
if ( forwardFile ) {
kdDebug(7124) << "Forwarding to '" << path << "'" << endl;
- QCString filepath = QFile::encodeName( path );
+ TQCString filepath = TQFile::encodeName( path );
fd = fopen( filepath.data(), "r" );
@@ -155,7 +155,7 @@ void CgiProtocol::get( const KURL& url )
} else {
kdDebug(7124) << "Cmd: " << cmd << endl;
- fd = popen( QFile::encodeName(KProcess::quote( cmd )).data(), "r" );
+ fd = popen( TQFile::encodeName(KProcess::quote( cmd )).data(), "r" );
if ( !fd ) {
kdDebug(7124) << "Error running '" << cmd << "'" << endl;
@@ -184,7 +184,7 @@ void CgiProtocol::get( const KURL& url )
buffer[n] = 0;
if ( stripHeader ) {
- QByteArray output;
+ TQByteArray output;
// Access the buffer in-place by using setRawData()
output.setRawData( buffer, n );
@@ -203,7 +203,7 @@ void CgiProtocol::get( const KURL& url )
kdDebug(7124) << " end: " << end << endl;
#endif
- QCString contentType = extractQCString( output, colon + 1, end - colon - 1 );
+ TQCString contentType = extractQCString( output, colon + 1, end - colon - 1 );
contentType = contentType.stripWhiteSpace();
@@ -231,7 +231,7 @@ void CgiProtocol::get( const KURL& url )
stripHeader = false;
} else {
- QByteArray array;
+ TQByteArray array;
array.setRawData( buffer, n );
data( array );
array.resetRawData( buffer, n );
diff --git a/kioslave/cgi/cgi.h b/kioslave/cgi/cgi.h
index fec90aa59..fbfba7a91 100644
--- a/kioslave/cgi/cgi.h
+++ b/kioslave/cgi/cgi.h
@@ -18,7 +18,7 @@
#ifndef KIO_CGI_H
#define KIO_CGI_H
-#include <qobject.h>
+#include <tqobject.h>
#include <kio/slavebase.h>
@@ -31,7 +31,7 @@ class KProcess;
class CgiProtocol : public KIO::SlaveBase
{
public:
- CgiProtocol( const QCString &pool, const QCString &app );
+ CgiProtocol( const TQCString &pool, const TQCString &app );
virtual ~CgiProtocol();
virtual void get( const KURL& url );
@@ -39,10 +39,10 @@ class CgiProtocol : public KIO::SlaveBase
// virtual void mimetype( const KURL& url );
protected:
-// QCString errorMessage();
+// TQCString errorMessage();
private:
- QStringList mCgiPaths;
+ TQStringList mCgiPaths;
};
#endif
diff --git a/kioslave/cgi/kcmcgi/kcmcgi.cpp b/kioslave/cgi/kcmcgi/kcmcgi.cpp
index 18436e8d9..521c0fd95 100644
--- a/kioslave/cgi/kcmcgi/kcmcgi.cpp
+++ b/kioslave/cgi/kcmcgi/kcmcgi.cpp
@@ -22,18 +22,18 @@
#include <kaboutdata.h>
#include <kfiledialog.h>
-#include <qlayout.h>
-#include <qlistbox.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
-#include <qhbox.h>
+#include <tqlayout.h>
+#include <tqlistbox.h>
+#include <tqpushbutton.h>
+#include <tqgroupbox.h>
+#include <tqhbox.h>
#include "kcmcgi.h"
#include "kcmcgi.moc"
extern "C"
{
- KDE_EXPORT KCModule *create_cgi( QWidget *parent, const char * )
+ KDE_EXPORT KCModule *create_cgi( TQWidget *parent, const char * )
{
KGlobal::locale()->insertCatalogue("kcmcgi");
return new KCMCgi( parent, "kcmcgi" );
@@ -41,27 +41,27 @@ extern "C"
}
-KCMCgi::KCMCgi(QWidget *parent, const char *name)
+KCMCgi::KCMCgi(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
setButtons(Default|Apply);
- QVBoxLayout *topLayout = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
- QGroupBox *topBox = new QGroupBox( 1, Horizontal, i18n("Paths to Local CGI Programs"), this );
+ TQGroupBox *topBox = new TQGroupBox( 1, Horizontal, i18n("Paths to Local CGI Programs"), this );
topLayout->addWidget( topBox );
- mListBox = new QListBox( topBox );
+ mListBox = new TQListBox( topBox );
- QHBox *buttonBox = new QHBox( topBox );
+ TQHBox *buttonBox = new TQHBox( topBox );
buttonBox->setSpacing( KDialog::spacingHint() );
- mAddButton = new QPushButton( i18n("Add..."), buttonBox );
- connect( mAddButton, SIGNAL( clicked() ), SLOT( addPath() ) );
+ mAddButton = new TQPushButton( i18n("Add..."), buttonBox );
+ connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addPath() ) );
- mRemoveButton = new QPushButton( i18n("Remove"), buttonBox );
- connect( mRemoveButton, SIGNAL( clicked() ), SLOT( removePath() ) );
- connect( mListBox, SIGNAL( clicked ( QListBoxItem * )),this, SLOT( slotItemSelected( QListBoxItem *)));
+ mRemoveButton = new TQPushButton( i18n("Remove"), buttonBox );
+ connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removePath() ) );
+ connect( mListBox, TQT_SIGNAL( clicked ( TQListBoxItem * )),this, TQT_SLOT( slotItemSelected( TQListBoxItem *)));
mConfig = new KConfig("kcmcgirc");
@@ -82,7 +82,7 @@ KCMCgi::~KCMCgi()
delete mConfig;
}
-void KCMCgi::slotItemSelected( QListBoxItem * )
+void KCMCgi::slotItemSelected( TQListBoxItem * )
{
updateButton();
}
@@ -100,7 +100,7 @@ void KCMCgi::defaults()
void KCMCgi::save()
{
- QStringList paths;
+ TQStringList paths;
uint i;
for( i = 0; i < mListBox->count(); ++i ) {
@@ -116,14 +116,14 @@ void KCMCgi::save()
void KCMCgi::load()
{
mConfig->setGroup( "General" );
- QStringList paths = mConfig->readListEntry( "Paths" );
+ TQStringList paths = mConfig->readListEntry( "Paths" );
mListBox->insertStringList( paths );
}
void KCMCgi::addPath()
{
- QString path = KFileDialog::getExistingDirectory( QString::null, this );
+ TQString path = KFileDialog::getExistingDirectory( TQString::null, this );
if ( !path.isEmpty() ) {
mListBox->insertItem( path );
@@ -142,7 +142,7 @@ void KCMCgi::removePath()
updateButton();
}
-QString KCMCgi::quickHelp() const
+TQString KCMCgi::quickHelp() const
{
return i18n("<h1>CGI Scripts</h1> The CGI KIO slave lets you execute "
"local CGI programs without the need to run a web server. "
diff --git a/kioslave/cgi/kcmcgi/kcmcgi.h b/kioslave/cgi/kcmcgi/kcmcgi.h
index 10e4e3385..344a27b4d 100644
--- a/kioslave/cgi/kcmcgi/kcmcgi.h
+++ b/kioslave/cgi/kcmcgi/kcmcgi.h
@@ -29,25 +29,25 @@ class KCMCgi : public KCModule
{
Q_OBJECT
public:
- KCMCgi( QWidget *parent = 0, const char *name = 0 );
+ KCMCgi( TQWidget *parent = 0, const char *name = 0 );
~KCMCgi();
void load();
void save();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
public slots:
protected slots:
void addPath();
void removePath();
- void slotItemSelected( QListBoxItem * item );
+ void slotItemSelected( TQListBoxItem * item );
private:
void updateButton();
- QListBox *mListBox;
- QPushButton *mAddButton;
- QPushButton *mRemoveButton;
+ TQListBox *mListBox;
+ TQPushButton *mAddButton;
+ TQPushButton *mRemoveButton;
KConfig *mConfig;
};
diff --git a/kioslave/filter/filter.cc b/kioslave/filter/filter.cc
index fe7cbc154..8392dd160 100644
--- a/kioslave/filter/filter.cc
+++ b/kioslave/filter/filter.cc
@@ -53,10 +53,10 @@ int kdemain( int argc, char ** argv)
return 0;
}
-FilterProtocol::FilterProtocol( const QCString & protocol, const QCString &pool, const QCString &app )
+FilterProtocol::FilterProtocol( const TQCString & protocol, const TQCString &pool, const TQCString &app )
: KIO::SlaveBase( protocol, pool, app )
{
- QString mimetype = QString::fromLatin1("application/x-") + QString::fromLatin1(protocol);
+ TQString mimetype = TQString::fromLatin1("application/x-") + TQString::fromLatin1(protocol);
filter = KFilterBase::findFilterByMimeType( mimetype );
Q_ASSERT(filter);
}
@@ -82,8 +82,8 @@ void FilterProtocol::get( const KURL & )
bool bError = true;
int result;
- QByteArray inputBuffer;
- QByteArray outputBuffer(8*1024); // Start with a modest buffer
+ TQByteArray inputBuffer;
+ TQByteArray outputBuffer(8*1024); // Start with a modest buffer
filter->setOutBuffer( outputBuffer.data(), outputBuffer.size() );
while(true)
{
@@ -139,7 +139,7 @@ void FilterProtocol::get( const KURL & )
dataReq(); // Request data
result = readData( inputBuffer);
kdDebug(7110) << "requestData: got " << result << "(expecting 0)" << endl;
- data( QByteArray() ); // Send EOF
+ data( TQByteArray() ); // Send EOF
}
filter->terminate();
@@ -157,7 +157,7 @@ void FilterProtocol::get( const KURL & )
void FilterProtocol::put( const KURL &/*url*/, int, bool /*_overwrite*/, bool /*_resume*/ )
{
- error( KIO::ERR_UNSUPPORTED_ACTION, QString::fromLatin1("put"));
+ error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("put"));
}
void FilterProtocol::setSubURL(const KURL &url)
diff --git a/kioslave/filter/filter.h b/kioslave/filter/filter.h
index 51b56061b..4f81af3c7 100644
--- a/kioslave/filter/filter.h
+++ b/kioslave/filter/filter.h
@@ -24,14 +24,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __filter_h__
#define __filter_h__
-#include <qobject.h>
+#include <tqobject.h>
#include <kio/global.h>
#include <kio/slavebase.h>
-class FilterProtocol : public QObject, public KIO::SlaveBase
+class FilterProtocol : public TQObject, public KIO::SlaveBase
{
public:
- FilterProtocol( const QCString & protocol, const QCString &pool, const QCString &app );
+ FilterProtocol( const TQCString & protocol, const TQCString &pool, const TQCString &app );
virtual void get( const KURL &url );
virtual void put( const KURL &url, int _mode, bool _overwrite,
diff --git a/kioslave/finger/kio_finger.cpp b/kioslave/finger/kio_finger.cpp
index c940998b9..8bfc25106 100644
--- a/kioslave/finger/kio_finger.cpp
+++ b/kioslave/finger/kio_finger.cpp
@@ -21,11 +21,11 @@
#include <sys/stat.h>
#include <string.h>
-#include <qtextstream.h>
-#include <qdict.h>
-#include <qcstring.h>
-#include <qfile.h>
-#include <qregexp.h>
+#include <tqtextstream.h>
+#include <tqdict.h>
+#include <tqcstring.h>
+#include <tqfile.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <kinstance.h>
@@ -39,7 +39,7 @@
using namespace KIO;
-static const QString defaultRefreshRate = "60";
+static const TQString defaultRefreshRate = "60";
extern "C"
{
@@ -67,10 +67,10 @@ extern "C"
/* ---------------------------------------------------------------------------------- */
-FingerProtocol::FingerProtocol(const QCString &pool_socket, const QCString &app_socket)
- : QObject(), SlaveBase("finger", pool_socket, app_socket)
+FingerProtocol::FingerProtocol(const TQCString &pool_socket, const TQCString &app_socket)
+ : TQObject(), SlaveBase("finger", pool_socket, app_socket)
{
- myStdStream = new QString();
+ myStdStream = new TQString();
getProgramPath();
}
@@ -104,17 +104,17 @@ void FingerProtocol::get(const KURL& url )
// Reset the stream
*myStdStream="";
- QString query = myURL->query();
- QString refreshRate = defaultRefreshRate;
+ TQString query = myURL->query();
+ TQString refreshRate = defaultRefreshRate;
//kdDebug() << "query: " << query << endl;
// Check the validity of the query
- QRegExp regExp("?refreshRate=[0-9][0-9]*", true, true);
+ TQRegExp regExp("?refreshRate=[0-9][0-9]*", true, true);
if (query.contains(regExp)) {
//kdDebug() << "looks like a valid query" << endl;
- QRegExp regExp( "([0-9]+)" );
+ TQRegExp regExp( "([0-9]+)" );
regExp.search(query);
refreshRate = regExp.cap(0);
}
@@ -126,16 +126,16 @@ void FingerProtocol::get(const KURL& url )
<< *myFingerPath << *myFingerCSSFile
<< refreshRate << myURL->host() << myURL->user() ;
- connect(myKProcess, SIGNAL(receivedStdout(KProcess *, char *, int)),
- this, SLOT(slotGetStdOutput(KProcess *, char *, int)));
- //connect(myKProcess, SIGNAL(receivedStderr(KProcess *, char *, int)),
- // this, SLOT(slotGetStdOutput(KProcess *, char *, int)));
+ connect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
+ //connect(myKProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
+ // this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
myKProcess->start(KProcess::Block, KProcess::All);
- data(QCString(myStdStream->local8Bit()));
+ data(TQCString(myStdStream->local8Bit()));
- data(QByteArray());
+ data(TQByteArray());
finished();
//clean up
@@ -150,7 +150,7 @@ void FingerProtocol::get(const KURL& url )
void FingerProtocol::slotGetStdOutput(KProcess* /* p */, char *s, int len)
{
//kdDebug() << "void FingerProtocol::slotGetStdoutOutput()" << endl;
- *myStdStream += QString::fromLocal8Bit(s, len);
+ *myStdStream += TQString::fromLocal8Bit(s, len);
}
@@ -172,7 +172,7 @@ void FingerProtocol::getProgramPath()
//kdDebug() << "kfingerMainWindow::getProgramPath()" << endl;
// Not to sure wether I'm using the right error number here. - schlpbch -
- myPerlPath = new QString(KGlobal::dirs()->findExe("perl"));
+ myPerlPath = new TQString(KGlobal::dirs()->findExe("perl"));
if (myPerlPath->isEmpty())
{
//kdDebug() << "Perl command not found" << endl;
@@ -185,7 +185,7 @@ void FingerProtocol::getProgramPath()
//kdDebug() << "Perl command found:" << *myPerlPath << endl;
}
- myFingerPath = new QString(KGlobal::dirs()->findExe("finger"));
+ myFingerPath = new TQString(KGlobal::dirs()->findExe("finger"));
if ((myFingerPath->isEmpty()))
{
//kdDebug() << "Finger command not found" << endl;
@@ -198,7 +198,7 @@ void FingerProtocol::getProgramPath()
//kdDebug() << "Finger command found:" << *myFingerPath << endl;
}
- myFingerPerlScript = new QString(locate("data","kio_finger/kio_finger.pl"));
+ myFingerPerlScript = new TQString(locate("data","kio_finger/kio_finger.pl"));
if (myFingerPerlScript->isEmpty())
{
//kdDebug() << "kio_finger.pl script not found" << endl;
@@ -211,7 +211,7 @@ void FingerProtocol::getProgramPath()
//kdDebug() << "kio_finger perl script found: " << *myFingerPerlScript << endl;
}
- myFingerCSSFile = new QString(locate("data","kio_finger/kio_finger.css"));
+ myFingerCSSFile = new TQString(locate("data","kio_finger/kio_finger.css"));
if (myFingerCSSFile->isEmpty())
{
//kdDebug() << "kio_finger.css file not found" << endl;
diff --git a/kioslave/finger/kio_finger.h b/kioslave/finger/kio_finger.h
index 8d63236d4..92366f45d 100644
--- a/kioslave/finger/kio_finger.h
+++ b/kioslave/finger/kio_finger.h
@@ -20,21 +20,21 @@
#ifndef __kio_finger_h__
#define __kio_finger_h__
-#include <qstring.h>
-#include <qcstring.h>
+#include <tqstring.h>
+#include <tqcstring.h>
#include <kurl.h>
#include <kprocess.h>
#include <kio/global.h>
#include <kio/slavebase.h>
-class FingerProtocol : public QObject, public KIO::SlaveBase
+class FingerProtocol : public TQObject, public KIO::SlaveBase
{
Q_OBJECT
public:
- FingerProtocol(const QCString &pool_socket, const QCString &app_socket);
+ FingerProtocol(const TQCString &pool_socket, const TQCString &app_socket);
virtual ~FingerProtocol();
virtual void mimetype(const KURL& url);
@@ -47,9 +47,9 @@ private:
KURL *myURL;
QString *myPerlPath;
- QString *myFingerPath;
- QString *myFingerPerlScript;
- QString *myFingerCSSFile;
+ TQString *myFingerPath;
+ TQString *myFingerPerlScript;
+ TQString *myFingerCSSFile;
QString *myStdStream;
diff --git a/kioslave/fish/fish.cpp b/kioslave/fish/fish.cpp
index 3967bcd6b..77533964c 100644
--- a/kioslave/fish/fish.cpp
+++ b/kioslave/fish/fish.cpp
@@ -26,12 +26,12 @@
#include "config.h"
-#include <qcstring.h>
-#include <qfile.h>
-#include <qsocket.h>
-#include <qdatetime.h>
-#include <qbitarray.h>
-#include <qregexp.h>
+#include <tqcstring.h>
+#include <tqfile.h>
+#include <tqsocket.h>
+#include <tqdatetime.h>
+#include <tqbitarray.h>
+#include <tqregexp.h>
#include <stdlib.h>
#ifdef HAVE_PTY_H
@@ -245,7 +245,7 @@ const struct fishProtocol::fish_info fishProtocol::fishInfo[] = {
0 }
};
-fishProtocol::fishProtocol(const QCString &pool_socket, const QCString &app_socket)
+fishProtocol::fishProtocol(const TQCString &pool_socket, const TQCString &app_socket)
: SlaveBase("fish", pool_socket, app_socket), mimeBuffer(1024),
mimeTypeSent(false)
{
@@ -254,12 +254,12 @@ fishProtocol::fishProtocol(const QCString &pool_socket, const QCString &app_sock
// disabled: currently not needed. Didn't work reliably.
// isOpenSSH = !system("ssh -V 2>&1 | grep OpenSSH > /dev/null");
if (isNXFish)
- sshPath = strdup(QFile::encodeName(KStandardDirs::findExe("nxfish")));
+ sshPath = strdup(TQFile::encodeName(KStandardDirs::findExe("nxfish")));
else
- sshPath = strdup(QFile::encodeName(KStandardDirs::findExe("ssh")));
+ sshPath = strdup(TQFile::encodeName(KStandardDirs::findExe("ssh")));
}
if (suPath == NULL) {
- suPath = strdup(QFile::encodeName(KStandardDirs::findExe("su")));
+ suPath = strdup(TQFile::encodeName(KStandardDirs::findExe("su")));
}
childPid = 0;
connectionPort = 0;
@@ -282,7 +282,7 @@ fishProtocol::fishProtocol(const QCString &pool_socket, const QCString &app_sock
typeAtom.m_long = 0;
mimeAtom.m_uds = UDS_MIME_TYPE;
mimeAtom.m_long = 0;
- mimeAtom.m_str = QString::null;
+ mimeAtom.m_str = TQString::null;
hasAppend = false;
@@ -310,7 +310,7 @@ void fishProtocol::openConnection() {
if (connectionHost.isEmpty() && !isNXFish)
{
- error( KIO::ERR_UNKNOWN_HOST, QString::null );
+ error( KIO::ERR_UNKNOWN_HOST, TQString::null );
return;
}
@@ -398,7 +398,7 @@ creates the subprocess
bool fishProtocol::connectionStart() {
int fd[2];
int rc, flags;
- thisFn = QString::null;
+ thisFn = TQString::null;
rc = open_pty_pair(fd);
if (rc == -1) {
@@ -462,7 +462,7 @@ bool fishProtocol::connectionStart() {
// (isOpenSSH?"-C":"+C"),
if (connectionPort)
- execl(sshPath, "ssh", "-p", QString::number(connectionPort).latin1(), common_args);
+ execl(sshPath, "ssh", "-p", TQString::number(connectionPort).latin1(), common_args);
else
execl(sshPath, "ssh", common_args);
#undef common_args
@@ -535,7 +535,7 @@ writes one chunk of data to stdin of child process
void fishProtocol::writeChild(const char *buf, KIO::fileoffset_t len) {
if (outBufPos >= 0 && outBuf) {
#if 0
- QString debug;
+ TQString debug;
debug.setLatin1(outBuf,outBufLen);
if (len > 0) myDebug( << "write request while old one is pending, throwing away input (" << outBufLen << "," << outBufPos << "," << debug.left(10) << "...)" << endl);
#endif
@@ -550,7 +550,7 @@ void fishProtocol::writeChild(const char *buf, KIO::fileoffset_t len) {
manages initial communication setup including password queries
*/
int fishProtocol::establishConnection(char *buffer, KIO::fileoffset_t len) {
- QString buf;
+ TQString buf;
buf.setLatin1(buffer,len);
int pos;
// Strip trailing whitespace
@@ -561,12 +561,12 @@ int fishProtocol::establishConnection(char *buffer, KIO::fileoffset_t len) {
while (childPid && ((pos = buf.find('\n')) >= 0 ||
buf.endsWith(":") || buf.endsWith("?"))) {
pos++;
- QString str = buf.left(pos);
+ TQString str = buf.left(pos);
buf = buf.mid(pos);
if (str == "\n")
continue;
if (str == "FISH:\n") {
- thisFn = QString::null;
+ thisFn = TQString::null;
infoMessage(i18n("Initiating protocol..."));
if (!connectionAuth.password.isEmpty()) {
connectionAuth.password = connectionAuth.password.left(connectionAuth.password.length()-1);
@@ -591,7 +591,7 @@ int fishProtocol::establishConnection(char *buffer, KIO::fileoffset_t len) {
} else if (!connectionPassword.isEmpty()) {
myDebug( << "sending cpass" << endl);
connectionAuth.password = connectionPassword+"\n";
- connectionPassword = QString::null;
+ connectionPassword = TQString::null;
// su does not like receiving a password directly after sending
// the password prompt so we wait a while.
if (local)
@@ -605,7 +605,7 @@ int fishProtocol::establishConnection(char *buffer, KIO::fileoffset_t len) {
else
connectionAuth.caption = i18n("SSH Authorization") + " - " + url.user() + "@" + url.host();
if ((!firstLogin || !checkCachedAuthentication(connectionAuth))) {
- connectionAuth.password = QString::null; // don't prefill
+ connectionAuth.password = TQString::null; // don't prefill
if ( !openPassDlg(connectionAuth)) {
error(ERR_USER_CANCELED,connectionHost);
shutdownConnection();
@@ -633,7 +633,7 @@ int fishProtocol::establishConnection(char *buffer, KIO::fileoffset_t len) {
sleep(1);
writeChild(connectionAuth.password.latin1(),connectionAuth.password.length());
}
- thisFn = QString::null;
+ thisFn = TQString::null;
return 0;
} else if (buf.endsWith("?")) {
int rc = messageBox(QuestionYesNo,thisFn+buf);
@@ -642,7 +642,7 @@ int fishProtocol::establishConnection(char *buffer, KIO::fileoffset_t len) {
} else {
writeChild("no\n",3);
}
- thisFn = QString::null;
+ thisFn = TQString::null;
return 0;
} else {
myDebug( << "unmatched case in initial handling! shouldn't happen!" << endl);
@@ -653,8 +653,8 @@ int fishProtocol::establishConnection(char *buffer, KIO::fileoffset_t len) {
/**
sets connection information for subsequent commands
*/
-void fishProtocol::setHost(const QString & host, int port, const QString & u, const QString & pass){
- QString user(u);
+void fishProtocol::setHost(const TQString & host, int port, const TQString & u, const TQString & pass){
+ TQString user(u);
if (isNXFish)
local = 0;
@@ -731,20 +731,20 @@ bool fishProtocol::sendCommand(fish_command_type cmd, ...) {
va_list list;
va_start(list, cmd);
- QString realCmd = info.command;
- QString realAlt = info.alt;
- static QRegExp rx("[][\\\\\n $`#!()*?{}~&<>;'\"%^@|\t]");
+ TQString realCmd = info.command;
+ TQString realAlt = info.alt;
+ static TQRegExp rx("[][\\\\\n $`#!()*?{}~&<>;'\"%^@|\t]");
for (int i = 0; i < info.params; i++) {
- QString arg(va_arg(list, const char *));
+ TQString arg(va_arg(list, const char *));
int pos = -2;
while ((pos = rx.search(arg,pos+2)) >= 0) {
- arg.replace(pos,0,QString("\\"));
+ arg.replace(pos,0,TQString("\\"));
}
//myDebug( << "arg " << i << ": " << arg << endl);
realCmd.append(" ").append(arg);
- realAlt.replace(QRegExp("%"+QString::number(i+1)),arg);
+ realAlt.replace(TQRegExp("%"+TQString::number(i+1)),arg);
}
- QString s("#");
+ TQString s("#");
s.append(realCmd).append("\n ").append(realAlt).append(" 2>&1;echo '### 000'\n");
if (realCmd == "FISH")
s.prepend(" ");
@@ -756,7 +756,7 @@ bool fishProtocol::sendCommand(fish_command_type cmd, ...) {
/**
checks response string for result code, converting 000 and 001 appropriately
*/
-int fishProtocol::handleResponse(const QString &str){
+int fishProtocol::handleResponse(const TQString &str){
myDebug( << "handling: " << str << endl);
if (str.startsWith("### ")) {
bool isOk = false;
@@ -772,9 +772,9 @@ int fishProtocol::handleResponse(const QString &str){
}
}
-int fishProtocol::makeTimeFromLs(const QString &monthStr, const QString &dayStr, const QString &timeyearStr)
+int fishProtocol::makeTimeFromLs(const TQString &monthStr, const TQString &dayStr, const TQString &timeyearStr)
{
- QDateTime dt(QDate::currentDate(Qt::UTC));
+ TQDateTime dt(TQDate::currentDate(Qt::UTC));
int year = dt.date().year();
int month = dt.date().month();
int currentMonth = month;
@@ -807,11 +807,11 @@ int fishProtocol::makeTimeFromLs(const QString &monthStr, const QString &dayStr,
/**
parses response from server and acts accordingly
*/
-void fishProtocol::manageConnection(const QString &l) {
- QString line(l);
+void fishProtocol::manageConnection(const TQString &l) {
+ TQString line(l);
int rc = handleResponse(line);
UDSAtom atom;
- QDateTime dt;
+ TQDateTime dt;
KIO::filesize_t fsize;
int pos, pos2, pos3;
bool isOk = false;
@@ -927,12 +927,12 @@ void fishProtocol::manageConnection(const QString &l) {
pos2 = line.find(' ',pos+1);
pos3 = line.find(' ',pos2+1);
if (pos < 0 || pos2 < 0 || pos3 < 0) break;
- dt.setDate(QDate(line.mid(1,pos-1).toInt(),line.mid(pos+1,pos2-pos-1).toInt(),line.mid(pos2+1,pos3-pos2-1).toInt()));
+ dt.setDate(TQDate(line.mid(1,pos-1).toInt(),line.mid(pos+1,pos2-pos-1).toInt(),line.mid(pos2+1,pos3-pos2-1).toInt()));
pos = pos3;
pos2 = line.find(' ',pos+1);
pos3 = line.find(' ',pos2+1);
if (pos < 0 || pos2 < 0 || pos3 < 0) break;
- dt.setTime(QTime(line.mid(pos+1,pos2-pos-1).toInt(),line.mid(pos2+1,pos3-pos2-1).toInt(),line.mid(pos3+1).toInt()));
+ dt.setTime(TQTime(line.mid(pos+1,pos2-pos-1).toInt(),line.mid(pos2+1,pos3-pos2-1).toInt(),line.mid(pos3+1).toInt()));
errorCount--;
atom.m_long = dt.toTime_t();
udsEntry.append(atom);
@@ -970,7 +970,7 @@ void fishProtocol::manageConnection(const QString &l) {
break;
case 'M': {
- QString type = line.mid(1);
+ TQString type = line.mid(1);
// First thing's first. If remote says this is a directory, throw out any
// name-based file type guesses.
@@ -1001,7 +1001,7 @@ void fishProtocol::manageConnection(const QString &l) {
} else {
if (!mimeAtom.m_str.isNull())
udsEntry.append(mimeAtom);
- mimeAtom.m_str = QString::null;
+ mimeAtom.m_str = TQString::null;
udsEntry.append(typeAtom);
typeAtom.m_long = 0;
@@ -1164,23 +1164,23 @@ void fishProtocol::manageConnection(const QString &l) {
statEntry(udsStatEntry);
} else if (fishCommand == FISH_APPEND) {
dataReq();
- if (readData(rawData) > 0) sendCommand(FISH_APPEND,E(QString::number(rawData.size())),E(url.path()));
- else if (!checkExist && putPerm > -1) sendCommand(FISH_CHMOD,E(QString::number(putPerm,8)),E(url.path()));
+ if (readData(rawData) > 0) sendCommand(FISH_APPEND,E(TQString::number(rawData.size())),E(url.path()));
+ else if (!checkExist && putPerm > -1) sendCommand(FISH_CHMOD,E(TQString::number(putPerm,8)),E(url.path()));
sendLen = rawData.size();
} else if (fishCommand == FISH_WRITE) {
dataReq();
- if (readData(rawData) > 0) sendCommand(FISH_WRITE,E(QString::number(putPos)),E(QString::number(rawData.size())),E(url.path()));
- else if (!checkExist && putPerm > -1) sendCommand(FISH_CHMOD,E(QString::number(putPerm,8)),E(url.path()));
+ if (readData(rawData) > 0) sendCommand(FISH_WRITE,E(TQString::number(putPos)),E(TQString::number(rawData.size())),E(url.path()));
+ else if (!checkExist && putPerm > -1) sendCommand(FISH_CHMOD,E(TQString::number(putPerm,8)),E(url.path()));
putPos += rawData.size();
sendLen = rawData.size();
} else if (fishCommand == FISH_RETR) {
- data(QByteArray());
+ data(TQByteArray());
}
finished();
}
}
-void fishProtocol::writeStdin(const QString &line)
+void fishProtocol::writeStdin(const TQString &line)
{
qlist.append(line);
@@ -1277,7 +1277,7 @@ int fishProtocol::received(const char *buffer, KIO::fileoffset_t buflen)
continue; // Process rest of buffer/buflen
}
- QByteArray bdata;
+ TQByteArray bdata;
bdata.duplicate(buffer,dataSize);
data(bdata);
@@ -1301,7 +1301,7 @@ int fishProtocol::received(const char *buffer, KIO::fileoffset_t buflen)
if (pos < buflen)
{
- QString s = remoteEncoding()->decode(QCString(buffer,pos+1));
+ TQString s = remoteEncoding()->decode(TQCString(buffer,pos+1));
buffer += pos+1;
buflen -= pos+1;
@@ -1374,7 +1374,7 @@ void fishProtocol::finished() {
}
}
/** aborts command sequence and calls error() */
-void fishProtocol::error(int type, const QString &detail) {
+void fishProtocol::error(int type, const TQString &detail) {
commandList.clear();
commandCodes.clear();
myDebug( << "ERROR: " << type << " - " << detail << endl);
@@ -1409,7 +1409,7 @@ void fishProtocol::run() {
}
if (FD_ISSET(childFd,&wfds) && outBufPos >= 0) {
#if 0
- QString debug;
+ TQString debug;
debug.setLatin1(outBuf+outBufPos,outBufLen-outBufPos);
myDebug( << "now writing " << (outBufLen-outBufPos) << " " << debug.left(40) << "..." << endl);
#endif
@@ -1436,7 +1436,7 @@ void fishProtocol::run() {
if (rc > 0) {
int noff = received(buf,rc+offset);
if (noff > 0) memmove(buf,buf+offset+rc-noff,noff);
- //myDebug( << "left " << noff << " bytes: " << QString::fromLatin1(buf,offset) << endl);
+ //myDebug( << "left " << noff << " bytes: " << TQString::fromLatin1(buf,offset) << endl);
offset = noff;
} else {
if (errno == EINTR)
@@ -1513,7 +1513,7 @@ void fishProtocol::mkdir(const KURL& u, int permissions) {
sendCommand(FISH_PWD);
} else {
sendCommand(FISH_MKD,E(url.path()));
- if (permissions > -1) sendCommand(FISH_CHMOD,E(QString::number(permissions,8)),E(url.path()));
+ if (permissions > -1) sendCommand(FISH_CHMOD,E(TQString::number(permissions,8)),E(url.path()));
}
run();
}
@@ -1544,7 +1544,7 @@ void fishProtocol::rename(const KURL& s, const KURL& d, bool overwrite) {
run();
}
/** create a symlink */
-void fishProtocol::symlink(const QString& target, const KURL& u, bool overwrite) {
+void fishProtocol::symlink(const TQString& target, const KURL& u, bool overwrite) {
myDebug( << "@@@@@@@@@ symlink " << target << " " << u << " " << overwrite << endl);
setHost(u.host(),u.port(),u.user(),u.pass());
url = u;
@@ -1574,7 +1574,7 @@ void fishProtocol::chmod(const KURL& u, int permissions){
if (!url.hasPath()) {
sendCommand(FISH_PWD);
} else {
- if (permissions > -1) sendCommand(FISH_CHMOD,E(QString::number(permissions,8)),E(url.path()));
+ if (permissions > -1) sendCommand(FISH_CHMOD,E(TQString::number(permissions,8)),E(url.path()));
}
run();
}
@@ -1602,7 +1602,7 @@ void fishProtocol::copy(const KURL &s, const KURL &d, int permissions, bool over
sendCommand(FISH_LIST,E(url.path()));
}
sendCommand(FISH_COPY,E(src.path()),E(url.path()));
- if (permissions > -1) sendCommand(FISH_CHMOD,E(QString::number(permissions,8)),E(url.path()));
+ if (permissions > -1) sendCommand(FISH_CHMOD,E(TQString::number(permissions,8)),E(url.path()));
}
run();
}
@@ -1622,18 +1622,18 @@ void fishProtocol::del(const KURL &u, bool isFile){
run();
}
/** special like background execute */
-void fishProtocol::special( const QByteArray &data ){
+void fishProtocol::special( const TQByteArray &data ){
int tmp;
- QDataStream stream(data, IO_ReadOnly);
+ TQDataStream stream(data, IO_ReadOnly);
stream >> tmp;
switch (tmp) {
case FISH_EXEC_CMD: // SSH EXEC
{
KURL u;
- QString command;
- QString tempfile;
+ TQString command;
+ TQString tempfile;
stream >> u;
stream >> command;
myDebug( << "@@@@@@@@@ exec " << u << " " << command << endl);
@@ -1647,7 +1647,7 @@ void fishProtocol::special( const QByteArray &data ){
}
default:
// Some command we don't understand.
- error(ERR_UNSUPPORTED_ACTION,QString().setNum(tmp));
+ error(ERR_UNSUPPORTED_ACTION,TQString().setNum(tmp));
break;
}
}
@@ -1657,5 +1657,5 @@ void fishProtocol::slave_status() {
if (childPid > 0)
slaveStatus(connectionHost,isLoggedIn);
else
- slaveStatus(QString::null,false);
+ slaveStatus(TQString::null,false);
}
diff --git a/kioslave/fish/fish.h b/kioslave/fish/fish.h
index e2665a320..6508d39ba 100644
--- a/kioslave/fish/fish.h
+++ b/kioslave/fish/fish.h
@@ -16,8 +16,8 @@
#ifndef __fish_h__
#define __fish_h__
-#include <qstring.h>
-#include <qcstring.h>
+#include <tqstring.h>
+#include <tqcstring.h>
#include <kurl.h>
@@ -32,7 +32,7 @@
class fishProtocol : public KIO::SlaveBase
{
public:
- fishProtocol(const QCString &pool_socket, const QCString &app_socket);
+ fishProtocol(const TQCString &pool_socket, const TQCString &app_socket);
virtual ~fishProtocol();
/**
@@ -48,7 +48,7 @@ It is set to false if the connection becomes closed.
*/
void shutdownConnection(bool forced=false);
/** sets connection information for subsequent commands */
- void setHost(const QString & host, int port, const QString & user, const QString & pass);
+ void setHost(const TQString & host, int port, const TQString & user, const TQString & pass);
/** Forced close of the connection */
void closeConnection();
/** get a file */
@@ -56,7 +56,7 @@ It is set to false if the connection becomes closed.
/** put a file */
void put(const KURL& url, int permissions, bool overwrite, bool resume);
/** aborts command sequence and calls error() */
- void error(int type, const QString &detail);
+ void error(int type, const TQString &detail);
/** executes next command in sequence or calls finished() if all is done */
void finished();
/** stat a file */
@@ -70,7 +70,7 @@ It is set to false if the connection becomes closed.
/** rename a file */
void rename(const KURL& src, const KURL& dest, bool overwrite);
/** create a symlink */
- void symlink(const QString& target, const KURL& dest, bool overwrite);
+ void symlink(const TQString& target, const KURL& dest, bool overwrite);
/** change file permissions */
void chmod(const KURL& url, int permissions);
/** copies a file */
@@ -80,7 +80,7 @@ It is set to false if the connection becomes closed.
/** removes a file or directory */
void del(const KURL &u, bool isfile);
/** special like background execute */
- void special( const QByteArray &data );
+ void special( const TQByteArray &data );
private: // Private attributes
/** the SSH process used to communicate with the remote end */
@@ -98,7 +98,7 @@ private: // Private attributes
/** // FIXME: just a workaround for konq deficiencies */
bool isStat;
/** // FIXME: just a workaround for konq deficiencies */
- QString redirectUser, redirectPass;
+ TQString redirectUser, redirectPass;
protected: // Protected attributes
/** for LIST/STAT */
@@ -110,32 +110,32 @@ protected: // Protected attributes
/** for LIST/STAT */
KIO::UDSAtom mimeAtom;
/** for LIST/STAT */
- QString thisFn;
+ TQString thisFn;
/** for STAT */
- QString wantedFn;
- QString statPath;
+ TQString wantedFn;
+ TQString statPath;
/** url of current request */
KURL url;
/** true if connection is logged in successfully */
bool isLoggedIn;
/** host name of current connection */
- QString connectionHost;
+ TQString connectionHost;
/** user name of current connection */
- QString connectionUser;
+ TQString connectionUser;
/** port of current connection */
int connectionPort;
/** password of current connection */
- QString connectionPassword;
+ TQString connectionPassword;
/** AuthInfo object used for logging in */
KIO::AuthInfo connectionAuth;
/** number of lines received, == 0 -> everything went ok */
int errorCount;
/** queue for lines to be sent */
- QStringList qlist;
+ TQStringList qlist;
/** queue for commands to be sent */
- QStringList commandList;
+ TQStringList commandList;
/** queue for commands to be sent */
- QValueList<int> commandCodes;
+ TQValueList<int> commandCodes;
/** bytes still to be read in raw mode */
KIO::fileoffset_t rawRead;
/** bytes still to be written in raw mode */
@@ -163,9 +163,9 @@ protected: // Protected attributes
/** true if this is the first login attempt (== use cached password) */
bool firstLogin;
/** write buffer */
- QByteArray rawData;
+ TQByteArray rawData;
/** buffer for storing bytes used for MimeMagic */
- QByteArray mimeBuffer;
+ TQByteArray mimeBuffer;
/** whther the mimetype has been sent already */
bool mimeTypeSent;
/** number of bytes read so far */
@@ -192,9 +192,9 @@ protected: // Protected methods
/** builds each FISH request and sets the error counter */
bool sendCommand(fish_command_type cmd, ...);
/** checks response string for result code, converting 000 and 001 appropriately */
- int handleResponse(const QString &str);
+ int handleResponse(const TQString &str);
/** parses a ls -l time spec */
- int makeTimeFromLs(const QString &dayStr, const QString &monthStr, const QString &timeyearStr);
+ int makeTimeFromLs(const TQString &dayStr, const TQString &monthStr, const TQString &timeyearStr);
/** executes a chain of commands */
void run();
/** creates the subprocess */
@@ -202,9 +202,9 @@ protected: // Protected methods
/** writes one chunk of data to stdin of child process */
void writeChild(const char *buf, KIO::fileoffset_t len);
/** parses response from server and acts accordingly */
- void manageConnection(const QString &line);
+ void manageConnection(const TQString &line);
/** writes to process */
- void writeStdin(const QString &line);
+ void writeStdin(const TQString &line);
};
diff --git a/kioslave/floppy/kio_floppy.cpp b/kioslave/floppy/kio_floppy.cpp
index ef3d6e6f2..a0c68a9d2 100644
--- a/kioslave/floppy/kio_floppy.cpp
+++ b/kioslave/floppy/kio_floppy.cpp
@@ -36,9 +36,9 @@
#include <sys/time.h>
#include <sys/types.h>
-#include <qtextstream.h>
-#include <qcstring.h>
-#include <qfile.h>
+#include <tqtextstream.h>
+#include <tqcstring.h>
+#include <tqfile.h>
#include "kio_floppy.h"
@@ -67,12 +67,12 @@ int kdemain( int argc, char **argv )
return 0;
}
-void getDriveAndPath(const QString& path, QString& drive, QString& rest)
+void getDriveAndPath(const TQString& path, TQString& drive, TQString& rest)
{
- drive=QString::null;
- rest=QString::null;
- QStringList list=QStringList::split("/",path);
- for (QStringList::Iterator it=list.begin(); it!=list.end(); it++)
+ drive=TQString::null;
+ rest=TQString::null;
+ TQStringList list=TQStringList::split("/",path);
+ for (TQStringList::Iterator it=list.begin(); it!=list.end(); it++)
{
if (it==list.begin())
drive=(*it)+":";
@@ -81,7 +81,7 @@ void getDriveAndPath(const QString& path, QString& drive, QString& rest)
}
}
-FloppyProtocol::FloppyProtocol (const QCString &pool, const QCString &app )
+FloppyProtocol::FloppyProtocol (const TQCString &pool, const TQCString &app )
:SlaveBase( "floppy", pool, app )
,m_mtool(0)
,m_stdoutBuffer(0)
@@ -185,15 +185,15 @@ void FloppyProtocol::terminateBuffers()
//kdDebug(7101)<<"Floppy::terminateBuffers() ends"<<endl;
}
-bool FloppyProtocol::stopAfterError(const KURL& url, const QString& drive)
+bool FloppyProtocol::stopAfterError(const KURL& url, const TQString& drive)
{
if (m_stderrSize==0)
return true;
//m_stderrBuffer[m_stderrSize]='\0';
- QString outputString(m_stderrBuffer);
- QTextIStream output(&outputString);
- QString line=output.readLine();
+ TQString outputString(m_stderrBuffer);
+ TQTextIStream output(&outputString);
+ TQString line=output.readLine();
kdDebug(7101)<<"line: -"<<line<<"-"<<endl;
if (line.find("resource busy") > -1)
{
@@ -255,7 +255,7 @@ void FloppyProtocol::listDir( const KURL& _url)
{
kdDebug(7101)<<"Floppy::listDir() "<<_url.path()<<endl;
KURL url(_url);
- QString path(url.path());
+ TQString path(url.path());
if ((path.isEmpty()) || (path=="/"))
{
@@ -264,11 +264,11 @@ void FloppyProtocol::listDir( const KURL& _url)
finished();
return;
}
- QString drive;
- QString floppyPath;
+ TQString drive;
+ TQString floppyPath;
getDriveAndPath(path,drive,floppyPath);
- QStringList args;
+ TQStringList args;
args<<"mdir"<<"-a"<<(drive+floppyPath);
if (m_mtool!=0)
@@ -318,9 +318,9 @@ void FloppyProtocol::listDir( const KURL& _url)
if (errorOccured)
return;
- QString outputString(m_stdoutBuffer);
- QTextIStream output(&outputString);
- QString line;
+ TQString outputString(m_stdoutBuffer);
+ TQTextIStream output(&outputString);
+ TQString line;
int totalNumber(0);
int mode(0);
@@ -363,7 +363,7 @@ void FloppyProtocol::listDir( const KURL& _url)
//kdDebug(7101)<<"Floppy::listDir() ends"<<endl;
}
-void FloppyProtocol::errorMissingMToolsProgram(const QString& name)
+void FloppyProtocol::errorMissingMToolsProgram(const TQString& name)
{
error(KIO::ERR_SLAVE_DEFINED,i18n("Could not start program \"%1\".\nEnsure that the mtools package is installed correctly on your system.").arg(name));
}
@@ -392,14 +392,14 @@ void FloppyProtocol::createUDSEntry(const StatInfo& info, UDSEntry& entry)
entry.append( atom );
}
-StatInfo FloppyProtocol::createStatInfo(const QString line, bool makeStat, const QString& dirName)
+StatInfo FloppyProtocol::createStatInfo(const TQString line, bool makeStat, const TQString& dirName)
{
//kdDebug(7101)<<"Floppy::createUDSEntry()"<<endl;
- QString name;
- QString size;
+ TQString name;
+ TQString size;
bool isDir(false);
- QString day,month, year;
- QString hour, minute;
+ TQString day,month, year;
+ TQString hour, minute;
StatInfo info;
if (line.length()==41)
@@ -409,7 +409,7 @@ StatInfo FloppyProtocol::createStatInfo(const QString line, bool makeStat, const
if (nameLength>0)
{
name=line.mid(0,nameLength);
- QString ext=line.mid(9,3);
+ TQString ext=line.mid(9,3);
ext=ext.stripWhiteSpace();
if (!ext.isEmpty())
name+="."+ext;
@@ -470,7 +470,7 @@ StatInfo FloppyProtocol::createStatInfo(const QString line, bool makeStat, const
info.name=name;
info.size=size.toInt();
- QDateTime date(QDate(year.toInt(),month.toInt(),day.toInt()),QTime(hour.toInt(),minute.toInt()));
+ TQDateTime date(TQDate(year.toInt(),month.toInt(),day.toInt()),TQTime(hour.toInt(),minute.toInt()));
info.time=date.toTime_t();
if (isDir)
@@ -489,9 +489,9 @@ StatInfo FloppyProtocol::_stat(const KURL& url)
{
StatInfo info;
- QString path(url.path());
- QString drive;
- QString floppyPath;
+ TQString path(url.path());
+ TQString drive;
+ TQString floppyPath;
getDriveAndPath(path,drive,floppyPath);
if (floppyPath.isEmpty())
@@ -511,7 +511,7 @@ StatInfo FloppyProtocol::_stat(const KURL& url)
if (m_mtool!=0)
delete m_mtool;
- QStringList args;
+ TQStringList args;
args<<"mdir"<<"-a"<<(drive+floppyPath);
//kdDebug(7101)<<"Floppy::_stat(): create m_mtool"<<endl;
@@ -573,9 +573,9 @@ StatInfo FloppyProtocol::_stat(const KURL& url)
}
kdDebug(7101)<<"Floppy::_stat(): parse stuff"<<endl;
- QString outputString(m_stdoutBuffer);
- QTextIStream output(&outputString);
- QString line;
+ TQString outputString(m_stdoutBuffer);
+ TQTextIStream output(&outputString);
+ TQString line;
for (int lineNumber=0; !output.atEnd(); lineNumber++)
{
line=output.readLine();
@@ -593,16 +593,16 @@ StatInfo FloppyProtocol::_stat(const KURL& url)
int FloppyProtocol::freeSpace(const KURL& url)
{
- QString path(url.path());
- QString drive;
- QString floppyPath;
+ TQString path(url.path());
+ TQString drive;
+ TQString floppyPath;
getDriveAndPath(path,drive,floppyPath);
//kdDebug(7101)<<"Floppy::freeSpace(): delete m_mtool"<<endl;
if (m_mtool!=0)
delete m_mtool;
- QStringList args;
+ TQStringList args;
args<<"mdir"<<"-a"<<drive;
//kdDebug(7101)<<"Floppy::freeSpace(): create m_mtool"<<endl;
@@ -662,16 +662,16 @@ int FloppyProtocol::freeSpace(const KURL& url)
}
kdDebug(7101)<<"Floppy::freeSpace(): parse stuff"<<endl;
- QString outputString(m_stdoutBuffer);
- QTextIStream output(&outputString);
- QString line;
+ TQString outputString(m_stdoutBuffer);
+ TQTextIStream output(&outputString);
+ TQString line;
int lineNumber(0);
while (!output.atEnd())
{
line=output.readLine();
if (line.find("bytes free")==36)
{
- QString tmp=line.mid(24,3);
+ TQString tmp=line.mid(24,3);
tmp=tmp.stripWhiteSpace();
tmp+=line.mid(28,3);
tmp=tmp.stripWhiteSpace();
@@ -689,7 +689,7 @@ void FloppyProtocol::stat( const KURL & _url)
{
kdDebug(7101)<<"Floppy::stat() "<<_url.path()<<endl;
KURL url(_url);
- QString path(url.path());
+ TQString path(url.path());
if ((path.isEmpty()) || (path=="/"))
{
@@ -714,7 +714,7 @@ void FloppyProtocol::stat( const KURL & _url)
void FloppyProtocol::mkdir( const KURL& url, int)
{
kdDebug(7101)<<"FloppyProtocol::mkdir()"<<endl;
- QString path(url.path());
+ TQString path(url.path());
if ((path.isEmpty()) || (path=="/"))
{
@@ -724,8 +724,8 @@ void FloppyProtocol::mkdir( const KURL& url, int)
finished();
return;
}
- QString drive;
- QString floppyPath;
+ TQString drive;
+ TQString floppyPath;
getDriveAndPath(path,drive,floppyPath);
if (floppyPath.isEmpty())
{
@@ -735,7 +735,7 @@ void FloppyProtocol::mkdir( const KURL& url, int)
if (m_mtool!=0)
delete m_mtool;
//kdDebug(7101)<<"Floppy::stat(): create args"<<endl;
- QStringList args;
+ TQStringList args;
args<<"mmd"<<(drive+floppyPath);
kdDebug(7101)<<"Floppy::mkdir(): executing: mmd -"<<(drive+floppyPath)<<"-"<<endl;
@@ -786,7 +786,7 @@ void FloppyProtocol::mkdir( const KURL& url, int)
void FloppyProtocol::del( const KURL& url, bool isfile)
{
kdDebug(7101)<<"FloppyProtocol::del()"<<endl;
- QString path(url.path());
+ TQString path(url.path());
if ((path.isEmpty()) || (path=="/"))
{
@@ -796,8 +796,8 @@ void FloppyProtocol::del( const KURL& url, bool isfile)
finished();
return;
}
- QString drive;
- QString floppyPath;
+ TQString drive;
+ TQString floppyPath;
getDriveAndPath(path,drive,floppyPath);
if (floppyPath.isEmpty())
{
@@ -808,7 +808,7 @@ void FloppyProtocol::del( const KURL& url, bool isfile)
if (m_mtool!=0)
delete m_mtool;
//kdDebug(7101)<<"Floppy::stat(): create args"<<endl;
- QStringList args;
+ TQStringList args;
bool usingmdel;
@@ -823,14 +823,14 @@ void FloppyProtocol::del( const KURL& url, bool isfile)
usingmdel=false;
}
- kdDebug(7101)<<"Floppy::del(): executing: " << (usingmdel ? QString("mdel") : QString("mrd") ) << "-"<<(drive+floppyPath)<<"-"<<endl;
+ kdDebug(7101)<<"Floppy::del(): executing: " << (usingmdel ? TQString("mdel") : TQString("mrd") ) << "-"<<(drive+floppyPath)<<"-"<<endl;
m_mtool=new Program(args);
if (!m_mtool->start())
{
delete m_mtool;
m_mtool=0;
- errorMissingMToolsProgram(usingmdel ? QString("mdel") : QString("mrd"));
+ errorMissingMToolsProgram(usingmdel ? TQString("mdel") : TQString("mrd"));
return;
}
@@ -870,8 +870,8 @@ void FloppyProtocol::del( const KURL& url, bool isfile)
void FloppyProtocol::rename( const KURL &src, const KURL &dest, bool _overwrite )
{
- QString srcPath(src.path());
- QString destPath(dest.path());
+ TQString srcPath(src.path());
+ TQString destPath(dest.path());
kdDebug(7101)<<"Floppy::rename() -"<<srcPath<<"- to -"<<destPath<<"-"<<endl;
@@ -881,8 +881,8 @@ void FloppyProtocol::rename( const KURL &src, const KURL &dest, bool _overwrite
if ((destPath.isEmpty()) || (destPath=="/"))
destPath="/a/";
- QString srcDrive;
- QString srcFloppyPath;
+ TQString srcDrive;
+ TQString srcFloppyPath;
getDriveAndPath(srcPath,srcDrive,srcFloppyPath);
if (srcFloppyPath.isEmpty())
{
@@ -890,8 +890,8 @@ void FloppyProtocol::rename( const KURL &src, const KURL &dest, bool _overwrite
return;
}
- QString destDrive;
- QString destFloppyPath;
+ TQString destDrive;
+ TQString destFloppyPath;
getDriveAndPath(destPath,destDrive,destFloppyPath);
if (destFloppyPath.isEmpty())
{
@@ -902,7 +902,7 @@ void FloppyProtocol::rename( const KURL &src, const KURL &dest, bool _overwrite
if (m_mtool!=0)
delete m_mtool;
//kdDebug(7101)<<"Floppy::stat(): create args"<<endl;
- QStringList args;
+ TQStringList args;
if (_overwrite)
args<<"mren"<<"-o"<<(srcDrive+srcFloppyPath)<<(destDrive+destFloppyPath);
@@ -956,7 +956,7 @@ void FloppyProtocol::rename( const KURL &src, const KURL &dest, bool _overwrite
void FloppyProtocol::get( const KURL& url )
{
- QString path(url.path());
+ TQString path(url.path());
kdDebug(7101)<<"Floppy::get() -"<<path<<"-"<<endl;
if ((path.isEmpty()) || (path=="/"))
@@ -974,8 +974,8 @@ void FloppyProtocol::get( const KURL& url )
totalSize( info.size);
- QString drive;
- QString floppyPath;
+ TQString drive;
+ TQString floppyPath;
getDriveAndPath(path,drive,floppyPath);
if (floppyPath.isEmpty())
{
@@ -986,7 +986,7 @@ void FloppyProtocol::get( const KURL& url )
if (m_mtool!=0)
delete m_mtool;
//kdDebug(7101)<<"Floppy::stat(): create args"<<endl;
- QStringList args;
+ TQStringList args;
args<<"mcopy"<<(drive+floppyPath)<<"-";
kdDebug(7101)<<"Floppy::get(): executing: mcopy -"<<(drive+floppyPath)<<"-"<<endl;
@@ -1003,7 +1003,7 @@ void FloppyProtocol::get( const KURL& url )
clearBuffers();
int result;
int bytesRead(0);
- QByteArray array;
+ TQByteArray array;
bool loopFinished(false);
bool errorOccured(false);
do
@@ -1050,13 +1050,13 @@ void FloppyProtocol::get( const KURL& url )
return;
//kdDebug(7101)<<"Floppy::get(): finishing"<<endl;
- data( QByteArray() );
+ data( TQByteArray() );
finished();
}
void FloppyProtocol::put( const KURL& url, int , bool overwrite, bool )
{
- QString path(url.path());
+ TQString path(url.path());
kdDebug(7101)<<"Floppy::put() -"<<path<<"-"<<endl;
if ((path.isEmpty()) || (path=="/"))
@@ -1067,8 +1067,8 @@ void FloppyProtocol::put( const KURL& url, int , bool overwrite, bool )
finished();
return;
}
- QString drive;
- QString floppyPath;
+ TQString drive;
+ TQString floppyPath;
getDriveAndPath(path,drive,floppyPath);
if (floppyPath.isEmpty())
{
@@ -1082,7 +1082,7 @@ void FloppyProtocol::put( const KURL& url, int , bool overwrite, bool )
if (m_mtool!=0)
delete m_mtool;
//kdDebug(7101)<<"Floppy::stat(): create args"<<endl;
- QStringList args;
+ TQStringList args;
if (overwrite)
args<<"mcopy"<<"-o"<<"-"<<(drive+floppyPath);
else
@@ -1103,7 +1103,7 @@ void FloppyProtocol::put( const KURL& url, int , bool overwrite, bool )
clearBuffers();
int result(0);
int bytesRead(0);
- QByteArray array;
+ TQByteArray array;
//from file.cc
// Loop until we got 0 (end of data)
@@ -1129,7 +1129,7 @@ void FloppyProtocol::put( const KURL& url, int , bool overwrite, bool )
}
else
{
- QByteArray buffer;
+ TQByteArray buffer;
dataReq(); // Request for data
//kdDebug(7101)<<"Floppy::put(): after dataReq()"<<endl;
result = readData( buffer );
diff --git a/kioslave/floppy/kio_floppy.h b/kioslave/floppy/kio_floppy.h
index bfc003b9f..3cc58488f 100644
--- a/kioslave/floppy/kio_floppy.h
+++ b/kioslave/floppy/kio_floppy.h
@@ -25,12 +25,12 @@
#include "program.h"
-#include <qstring.h>
+#include <tqstring.h>
struct StatInfo
{
StatInfo():name(""),time(0),size(0),mode(0),freeSpace(0),isDir(false),isValid(false) {;}
- QString name;
+ TQString name;
time_t time;
int size;
int mode;
@@ -43,7 +43,7 @@ struct StatInfo
class FloppyProtocol : public KIO::SlaveBase
{
public:
- FloppyProtocol (const QCString &pool, const QCString &app );
+ FloppyProtocol (const TQCString &pool, const TQCString &app );
virtual ~FloppyProtocol();
virtual void listDir( const KURL& url);
@@ -59,13 +59,13 @@ class FloppyProtocol : public KIO::SlaveBase
int readStdout();
int readStderr();
- StatInfo createStatInfo(const QString line, bool makeStat=false, const QString& dirName="");
+ StatInfo createStatInfo(const TQString line, bool makeStat=false, const TQString& dirName="");
void createUDSEntry(const StatInfo& info, KIO::UDSEntry& entry);
StatInfo _stat(const KURL& _url);
int freeSpace(const KURL& url);
- bool stopAfterError(const KURL& url, const QString& drive);
- void errorMissingMToolsProgram(const QString& name);
+ bool stopAfterError(const KURL& url, const TQString& drive);
+ void errorMissingMToolsProgram(const TQString& name);
void clearBuffers();
void terminateBuffers();
diff --git a/kioslave/floppy/program.cpp b/kioslave/floppy/program.cpp
index 7cfd4989a..83080c233 100644
--- a/kioslave/floppy/program.cpp
+++ b/kioslave/floppy/program.cpp
@@ -31,7 +31,7 @@
#include <kdebug.h>
-Program::Program(const QStringList &args)
+Program::Program(const TQStringList &args)
:m_pid(0)
,mArgs(args)
,mStarted(false)
@@ -135,7 +135,7 @@ bool Program::start()
char **arglist=(char**)malloc((mArgs.count()+1)*sizeof(char*));
int c=0;
- for (QStringList::Iterator it=mArgs.begin(); it!=mArgs.end(); ++it)
+ for (TQStringList::Iterator it=mArgs.begin(); it!=mArgs.end(); ++it)
{
arglist[c]=(char*)malloc((*it).length()+1);
strcpy(arglist[c], (*it).latin1());
diff --git a/kioslave/floppy/program.h b/kioslave/floppy/program.h
index 29ea634ad..409603689 100644
--- a/kioslave/floppy/program.h
+++ b/kioslave/floppy/program.h
@@ -20,7 +20,7 @@
#ifndef PROGRAM_H
#define PROGRAM_H
-#include <qstringlist.h>
+#include <tqstringlist.h>
/**
* start programs and write to thieir stdin, stderr,
@@ -29,7 +29,7 @@
class Program
{
public:
- Program(const QStringList &args);
+ Program(const TQStringList &args);
~Program();
bool start();
bool isRunning();
@@ -45,7 +45,7 @@ protected:
int mStdin[2];
int mStderr[2];
int m_pid;
- QStringList mArgs;
+ TQStringList mArgs;
bool mStarted;
};
diff --git a/kioslave/home/homeimpl.cpp b/kioslave/home/homeimpl.cpp
index 7e86173ba..12a692319 100644
--- a/kioslave/home/homeimpl.cpp
+++ b/kioslave/home/homeimpl.cpp
@@ -20,8 +20,8 @@
#include "homeimpl.h"
#include <kdebug.h>
-#include <qapplication.h>
-#include <qeventloop.h>
+#include <tqapplication.h>
+#include <tqeventloop.h>
#include <sys/stat.h>
@@ -33,9 +33,9 @@ HomeImpl::HomeImpl()
m_effectiveUid = user.uid();
}
-bool HomeImpl::parseURL(const KURL &url, QString &name, QString &path) const
+bool HomeImpl::parseURL(const KURL &url, TQString &name, TQString &path) const
{
- QString url_path = url.path();
+ TQString url_path = url.path();
int i = url_path.find('/', 1);
if (i > 0)
@@ -46,13 +46,13 @@ bool HomeImpl::parseURL(const KURL &url, QString &name, QString &path) const
else
{
name = url_path.mid(1);
- path = QString::null;
+ path = TQString::null;
}
- return name != QString::null;
+ return name != TQString::null;
}
-bool HomeImpl::realURL(const QString &name, const QString &path, KURL &url)
+bool HomeImpl::realURL(const TQString &name, const TQString &path, KURL &url)
{
KUser user(name);
@@ -69,23 +69,23 @@ bool HomeImpl::realURL(const QString &name, const QString &path, KURL &url)
}
-bool HomeImpl::listHomes(QValueList<KIO::UDSEntry> &list)
+bool HomeImpl::listHomes(TQValueList<KIO::UDSEntry> &list)
{
kdDebug() << "HomeImpl::listHomes" << endl;
KUser current_user;
- QValueList<KUserGroup> groups = current_user.groups();
- QValueList<int> uid_list;
+ TQValueList<KUserGroup> groups = current_user.groups();
+ TQValueList<int> uid_list;
- QValueList<KUserGroup>::iterator groups_it = groups.begin();
- QValueList<KUserGroup>::iterator groups_end = groups.end();
+ TQValueList<KUserGroup>::iterator groups_it = groups.begin();
+ TQValueList<KUserGroup>::iterator groups_end = groups.end();
for(; groups_it!=groups_end; ++groups_it)
{
- QValueList<KUser> users = (*groups_it).users();
+ TQValueList<KUser> users = (*groups_it).users();
- QValueList<KUser>::iterator it = users.begin();
- QValueList<KUser>::iterator users_end = users.end();
+ TQValueList<KUser>::iterator it = users.begin();
+ TQValueList<KUser>::iterator users_end = users.end();
for(; it!=users_end; ++it)
{
@@ -104,7 +104,7 @@ bool HomeImpl::listHomes(QValueList<KIO::UDSEntry> &list)
}
static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l,
- const QString &s = QString::null)
+ const TQString &s = TQString::null)
{
KIO::UDSAtom atom;
atom.m_uds = ID;
@@ -133,7 +133,7 @@ void HomeImpl::createHomeEntry(KIO::UDSEntry &entry,
entry.clear();
- QString full_name = user.loginName();
+ TQString full_name = user.loginName();
if (!user.fullName().isEmpty())
{
@@ -148,7 +148,7 @@ void HomeImpl::createHomeEntry(KIO::UDSEntry &entry,
addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR);
addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory");
- QString icon_name = "folder_home2";
+ TQString icon_name = "folder_home2";
if (user.uid()==m_effectiveUid)
{
@@ -162,7 +162,7 @@ void HomeImpl::createHomeEntry(KIO::UDSEntry &entry,
entry += extractUrlInfos(url);
}
-bool HomeImpl::statHome(const QString &name, KIO::UDSEntry &entry)
+bool HomeImpl::statHome(const TQString &name, KIO::UDSEntry &entry)
{
kdDebug() << "HomeImpl::statHome: " << name << endl;
@@ -193,8 +193,8 @@ KIO::UDSEntry HomeImpl::extractUrlInfos(const KURL &url)
m_entryBuffer.clear();
KIO::StatJob *job = KIO::stat(url, false);
- connect( job, SIGNAL( result(KIO::Job *) ),
- this, SLOT( slotStatResult(KIO::Job *) ) );
+ connect( job, TQT_SIGNAL( result(KIO::Job *) ),
+ this, TQT_SLOT( slotStatResult(KIO::Job *) ) );
qApp->eventLoop()->enterLoop();
KIO::UDSEntry::iterator it = m_entryBuffer.begin();
diff --git a/kioslave/home/homeimpl.h b/kioslave/home/homeimpl.h
index 8c4ace279..62c7b3868 100644
--- a/kioslave/home/homeimpl.h
+++ b/kioslave/home/homeimpl.h
@@ -25,7 +25,7 @@
#include <kurl.h>
#include <kuser.h>
-#include <qstring.h>
+#include <tqstring.h>
class HomeImpl : public QObject
{
@@ -33,11 +33,11 @@ Q_OBJECT
public:
HomeImpl();
- bool parseURL(const KURL &url, QString &name, QString &path) const;
- bool realURL(const QString &name, const QString &path, KURL &url);
+ bool parseURL(const KURL &url, TQString &name, TQString &path) const;
+ bool realURL(const TQString &name, const TQString &path, KURL &url);
- bool statHome(const QString &name, KIO::UDSEntry &entry);
- bool listHomes(QValueList<KIO::UDSEntry> &list);
+ bool statHome(const TQString &name, KIO::UDSEntry &entry);
+ bool listHomes(TQValueList<KIO::UDSEntry> &list);
void createTopLevelEntry(KIO::UDSEntry &entry) const;
diff --git a/kioslave/home/kdedmodule/homedirnotify.cpp b/kioslave/home/kdedmodule/homedirnotify.cpp
index e4eab44bb..823027fe2 100644
--- a/kioslave/home/kdedmodule/homedirnotify.cpp
+++ b/kioslave/home/kdedmodule/homedirnotify.cpp
@@ -37,18 +37,18 @@ void HomeDirNotify::init()
mInited = true;
KUser current_user;
- QValueList<KUserGroup> groups = current_user.groups();
- QValueList<int> uid_list;
+ TQValueList<KUserGroup> groups = current_user.groups();
+ TQValueList<int> uid_list;
- QValueList<KUserGroup>::iterator groups_it = groups.begin();
- QValueList<KUserGroup>::iterator groups_end = groups.end();
+ TQValueList<KUserGroup>::iterator groups_it = groups.begin();
+ TQValueList<KUserGroup>::iterator groups_end = groups.end();
for(; groups_it!=groups_end; ++groups_it)
{
- QValueList<KUser> users = (*groups_it).users();
+ TQValueList<KUser> users = (*groups_it).users();
- QValueList<KUser>::iterator it = users.begin();
- QValueList<KUser>::iterator users_end = users.end();
+ TQValueList<KUser>::iterator it = users.begin();
+ TQValueList<KUser>::iterator users_end = users.end();
for(; it!=users_end; ++it)
{
@@ -57,7 +57,7 @@ void HomeDirNotify::init()
{
uid_list.append( (*it).uid() );
- QString name = (*it).loginName();
+ TQString name = (*it).loginName();
KURL url;
url.setPath( (*it).homeDir() );
@@ -72,17 +72,17 @@ KURL HomeDirNotify::toHomeURL(const KURL &url)
kdDebug() << "HomeDirNotify::toHomeURL(" << url << ")" << endl;
init();
- QMap<QString,KURL>::iterator it = m_homeFoldersMap.begin();
- QMap<QString,KURL>::iterator end = m_homeFoldersMap.end();
+ TQMap<TQString,KURL>::iterator it = m_homeFoldersMap.begin();
+ TQMap<TQString,KURL>::iterator end = m_homeFoldersMap.end();
for (; it!=end; ++it)
{
- QString name = it.key();
+ TQString name = it.key();
KURL base = it.data();
if ( base.isParentOf(url) )
{
- QString path = KURL::relativePath(base.path(),
+ TQString path = KURL::relativePath(base.path(),
url.path());
KURL result("home:/"+name+"/"+path);
result.cleanPath();
diff --git a/kioslave/home/kdedmodule/homedirnotify.h b/kioslave/home/kdedmodule/homedirnotify.h
index 14655a1cd..dbbd0845e 100644
--- a/kioslave/home/kdedmodule/homedirnotify.h
+++ b/kioslave/home/kdedmodule/homedirnotify.h
@@ -22,7 +22,7 @@
#include <kurl.h>
#include <kdirnotify.h>
-#include <qmap.h>
+#include <tqmap.h>
class HomeDirNotify : public KDirNotify
{
@@ -41,7 +41,7 @@ private:
KURL toHomeURL(const KURL &url);
KURL::List toHomeURLList(const KURL::List &list);
- QMap<QString,KURL> m_homeFoldersMap;
+ TQMap<TQString,KURL> m_homeFoldersMap;
bool mInited;
};
diff --git a/kioslave/home/kdedmodule/homedirnotifymodule.cpp b/kioslave/home/kdedmodule/homedirnotifymodule.cpp
index 1b91ccc31..03f664117 100644
--- a/kioslave/home/kdedmodule/homedirnotifymodule.cpp
+++ b/kioslave/home/kdedmodule/homedirnotifymodule.cpp
@@ -22,13 +22,13 @@
#include <klocale.h>
#include <kglobal.h>
-HomeDirNotifyModule::HomeDirNotifyModule(const QCString &obj)
+HomeDirNotifyModule::HomeDirNotifyModule(const TQCString &obj)
: KDEDModule(obj)
{
}
extern "C" {
- KDE_EXPORT KDEDModule *create_homedirnotify(const QCString &obj)
+ KDE_EXPORT KDEDModule *create_homedirnotify(const TQCString &obj)
{
KGlobal::locale()->insertCatalogue("kio_home");
return new HomeDirNotifyModule(obj);
diff --git a/kioslave/home/kdedmodule/homedirnotifymodule.h b/kioslave/home/kdedmodule/homedirnotifymodule.h
index 159670fb6..69d96dfc9 100644
--- a/kioslave/home/kdedmodule/homedirnotifymodule.h
+++ b/kioslave/home/kdedmodule/homedirnotifymodule.h
@@ -28,7 +28,7 @@ class HomeDirNotifyModule : public KDEDModule
K_DCOP
public:
- HomeDirNotifyModule(const QCString &obj);
+ HomeDirNotifyModule(const TQCString &obj);
private:
HomeDirNotify notifier;
};
diff --git a/kioslave/home/kio_home.cpp b/kioslave/home/kio_home.cpp
index 36a3161d8..c8a77acc5 100644
--- a/kioslave/home/kio_home.cpp
+++ b/kioslave/home/kio_home.cpp
@@ -56,8 +56,8 @@ extern "C" {
}
-HomeProtocol::HomeProtocol(const QCString &protocol,
- const QCString &pool, const QCString &app)
+HomeProtocol::HomeProtocol(const TQCString &protocol,
+ const TQCString &pool, const TQCString &app)
: ForwardingSlaveBase(protocol, pool, app)
{
}
@@ -68,7 +68,7 @@ HomeProtocol::~HomeProtocol()
bool HomeProtocol::rewriteURL(const KURL &url, KURL &newUrl)
{
- QString name, path;
+ TQString name, path;
if ( !m_impl.parseURL(url, name, path) )
{
@@ -97,7 +97,7 @@ void HomeProtocol::listDir(const KURL &url)
return;
}
- QString name, path;
+ TQString name, path;
bool ok = m_impl.parseURL(url, name, path);
if ( !ok )
@@ -145,7 +145,7 @@ void HomeProtocol::stat(const KURL &url)
{
kdDebug() << "HomeProtocol::stat: " << url << endl;
- QString path = url.path();
+ TQString path = url.path();
if ( path.isEmpty() || path == "/" )
{
// The root is "virtual" - it's not a single physical directory
@@ -156,7 +156,7 @@ void HomeProtocol::stat(const KURL &url)
return;
}
- QString name;
+ TQString name;
bool ok = m_impl.parseURL(url, name, path);
if ( !ok )
diff --git a/kioslave/home/kio_home.h b/kioslave/home/kio_home.h
index 1d5e237ea..cf5f3a3cd 100644
--- a/kioslave/home/kio_home.h
+++ b/kioslave/home/kio_home.h
@@ -26,8 +26,8 @@
class HomeProtocol : public KIO::ForwardingSlaveBase
{
public:
- HomeProtocol(const QCString &protocol, const QCString &pool,
- const QCString &app);
+ HomeProtocol(const TQCString &protocol, const TQCString &pool,
+ const TQCString &app);
virtual ~HomeProtocol();
virtual bool rewriteURL(const KURL &url, KURL &newUrl);
diff --git a/kioslave/home/testhome.cpp b/kioslave/home/testhome.cpp
index e9d64ec68..61e7d9fa6 100644
--- a/kioslave/home/testhome.cpp
+++ b/kioslave/home/testhome.cpp
@@ -28,12 +28,12 @@
#include <stdlib.h>
-static bool check(const QString& txt, QString a, QString b)
+static bool check(const TQString& txt, TQString a, TQString b)
{
if (a.isEmpty())
- a = QString::null;
+ a = TQString::null;
if (b.isEmpty())
- b = QString::null;
+ b = TQString::null;
if (a == b) {
kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "ok" << endl;
}
diff --git a/kioslave/info/info.cc b/kioslave/info/info.cc
index 6b829ec1c..ab35f282b 100644
--- a/kioslave/info/info.cc
+++ b/kioslave/info/info.cc
@@ -2,10 +2,10 @@
#include <stdlib.h>
#include <sys/stat.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qregexp.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <kprocess.h>
@@ -18,7 +18,7 @@
using namespace KIO;
-InfoProtocol::InfoProtocol( const QCString &pool, const QCString &app )
+InfoProtocol::InfoProtocol( const TQCString &pool, const TQCString &app )
: SlaveBase( "info", pool, app )
, m_page( "" )
, m_node( "" )
@@ -31,11 +31,11 @@ InfoProtocol::InfoProtocol( const QCString &pool, const QCString &app )
if( m_perl.isNull() || m_infoScript.isNull() || m_infoConf.isNull() ) {
kdError( 7108 ) << "Critical error: Cannot locate files for HTML-conversion" << endl;
- QString errorStr;
+ TQString errorStr;
if ( m_perl.isNull() ) {
errorStr = "perl.";
} else {
- QString missing =m_infoScript.isNull() ? "kio_info/kde-info2html" : "kio_info/kde-info2html.conf";
+ TQString missing =m_infoScript.isNull() ? "kio_info/kde-info2html" : "kio_info/kde-info2html.conf";
errorStr = "kde-info2html" + i18n( "\nUnable to locate file %1 which is necessary to run this service. "
"Please check your software installation" ).arg( missing );
}
@@ -70,7 +70,7 @@ void InfoProtocol::get( const KURL& url )
if (!url.host().isEmpty()) {
KURL newURl(url);
newURl.setPath(url.host()+url.path());
- newURl.setHost(QString::null);
+ newURl.setHost(TQString::null);
redirection(newURl);
finished();
return;
@@ -80,7 +80,7 @@ void InfoProtocol::get( const KURL& url )
{
// Trailing / are not supported, so we need to remove them.
KURL newUrl( url );
- QString newPath( url.path() );
+ TQString newPath( url.path() );
newPath.truncate( newPath.length()-1 );
newUrl.setPath( newPath );
redirection( newUrl );
@@ -92,11 +92,11 @@ void InfoProtocol::get( const KURL& url )
// extract the path and node from url
decodeURL( url );
- QString path = KGlobal::iconLoader()->iconPath("up", KIcon::Toolbar, true);
+ TQString path = KGlobal::iconLoader()->iconPath("up", KIcon::Toolbar, true);
int revindex = path.findRev('/');
path = path.left(revindex);
- QString cmd = KProcess::quote(m_perl);
+ TQString cmd = KProcess::quote(m_perl);
cmd += " ";
cmd += KProcess::quote(m_infoScript);
cmd += " ";
@@ -110,7 +110,7 @@ void InfoProtocol::get( const KURL& url )
kdDebug( 7108 ) << "cmd: " << cmd << endl;
- FILE *file = popen( QFile::encodeName(cmd), "r" );
+ FILE *file = popen( TQFile::encodeName(cmd), "r" );
if ( !file ) {
kdDebug( 7108 ) << "InfoProtocol::get popen failed" << endl;
error( ERR_CANNOT_LAUNCH_PROCESS, cmd );
@@ -118,7 +118,7 @@ void InfoProtocol::get( const KURL& url )
}
char buffer[ 4096 ];
- QByteArray array;
+ TQByteArray array;
bool empty = true;
while ( !feof( file ) )
@@ -192,7 +192,7 @@ void InfoProtocol::decodeURL( const KURL &url )
kdDebug( 7108 ) << "InfoProtocol::decodeURL - done" << endl;
}
-void InfoProtocol::decodePath( QString path )
+void InfoProtocol::decodePath( TQString path )
{
kdDebug( 7108 ) << "InfoProtocol::decodePath(-" <<path<<"-)"<< endl;
diff --git a/kioslave/info/info.h b/kioslave/info/info.h
index ccf41fc5e..20c142cf3 100644
--- a/kioslave/info/info.h
+++ b/kioslave/info/info.h
@@ -1,7 +1,7 @@
#ifndef __info_h__
#define __info_h__
-#include <qobject.h>
+#include <tqobject.h>
#include <kio/slavebase.h>
@@ -11,7 +11,7 @@ class InfoProtocol : public KIO::SlaveBase
{
public:
- InfoProtocol( const QCString &pool, const QCString &app );
+ InfoProtocol( const TQCString &pool, const TQCString &app );
virtual ~InfoProtocol();
virtual void get( const KURL& url );
@@ -21,16 +21,16 @@ public:
protected:
void decodeURL( const KURL &url );
- void decodePath( QString path );
+ void decodePath( TQString path );
private:
- QString m_page;
- QString m_node;
+ TQString m_page;
+ TQString m_node;
- QString m_perl;
- QString m_infoScript;
- QString m_infoConf;
+ TQString m_perl;
+ TQString m_infoScript;
+ TQString m_infoConf;
};
#endif // __info_h__
diff --git a/kioslave/ldap/kio_ldap.cpp b/kioslave/ldap/kio_ldap.cpp
index 749ab6121..7abc95509 100644
--- a/kioslave/ldap/kio_ldap.cpp
+++ b/kioslave/ldap/kio_ldap.cpp
@@ -54,8 +54,8 @@ int kdemain( int argc, char **argv )
/**
* Initialize the ldap slave
*/
-LDAPProtocol::LDAPProtocol( const QCString &protocol, const QCString &pool,
- const QCString &app ) : SlaveBase( protocol, pool, app )
+LDAPProtocol::LDAPProtocol( const TQCString &protocol, const TQCString &pool,
+ const TQCString &app ) : SlaveBase( protocol, pool, app )
{
mLDAP = 0; mTLS = 0; mVer = 3; mAuthSASL = false;
mRealm = ""; mBindName = "";
@@ -79,11 +79,11 @@ void LDAPProtocol::LDAPErr( const KURL &url, int err )
if ( err == LDAP_SUCCESS ) return;
kdDebug(7125) << "error code: " << err << " msg: " << ldap_err2string(err) <<
" Additonal error message: '" << errmsg << "'" << endl;
- QString msg;
- QString extraMsg;
+ TQString msg;
+ TQString extraMsg;
if ( errmsg ) {
if ( errmsg[0] )
- extraMsg = i18n("\nAdditional info: ") + QString::fromUtf8( errmsg );
+ extraMsg = i18n("\nAdditional info: ") + TQString::fromUtf8( errmsg );
free( errmsg );
}
msg = url.prettyURL();
@@ -164,24 +164,24 @@ void LDAPProtocol::LDAPErr( const KURL &url, int err )
void LDAPProtocol::controlsFromMetaData( LDAPControl ***serverctrls,
LDAPControl ***clientctrls )
{
- QString oid; bool critical; QByteArray value;
+ TQString oid; bool critical; TQByteArray value;
int i = 0;
- while ( hasMetaData( QString::fromLatin1("SERVER_CTRL%1").arg(i) ) ) {
- QCString val = metaData( QString::fromLatin1("SERVER_CTRL%1").arg(i) ).utf8();
+ while ( hasMetaData( TQString::fromLatin1("SERVER_CTRL%1").arg(i) ) ) {
+ TQCString val = metaData( TQString::fromLatin1("SERVER_CTRL%1").arg(i) ).utf8();
LDIF::splitControl( val, oid, critical, value );
kdDebug(7125) << "server ctrl #" << i << " value: " << val <<
" oid: " << oid << " critical: " << critical << " value: " <<
- QString::fromUtf8( value, value.size() ) << endl;
+ TQString::fromUtf8( value, value.size() ) << endl;
addControlOp( serverctrls, oid, value, critical );
i++;
}
i = 0;
- while ( hasMetaData( QString::fromLatin1("CLIENT_CTRL%1").arg(i) ) ) {
- QCString val = metaData( QString::fromLatin1("CLIENT_CTRL%1").arg(i) ).utf8();
+ while ( hasMetaData( TQString::fromLatin1("CLIENT_CTRL%1").arg(i) ) ) {
+ TQCString val = metaData( TQString::fromLatin1("CLIENT_CTRL%1").arg(i) ).utf8();
LDIF::splitControl( val, oid, critical, value );
kdDebug(7125) << "client ctrl #" << i << " value: " << val <<
" oid: " << oid << " critical: " << critical << " value: " <<
- QString::fromUtf8( value, value.size() ) << endl;
+ TQString::fromUtf8( value, value.size() ) << endl;
addControlOp( clientctrls, oid, value, critical );
i++;
}
@@ -220,7 +220,7 @@ int LDAPProtocol::asyncSearch( LDAPUrl &usrc )
usrc.scope() << " filter=\"" << usrc.filter() << "\" attrs=" << usrc.attributes() <<
endl;
retval = ldap_search_ext( mLDAP, usrc.dn().utf8(), scope,
- usrc.filter().isEmpty() ? QCString() : usrc.filter().utf8(), attrs, 0,
+ usrc.filter().isEmpty() ? TQCString() : usrc.filter().utf8(), attrs, 0,
serverctrls, clientctrls,
0, mSizeLimit, &msgid );
@@ -237,16 +237,16 @@ int LDAPProtocol::asyncSearch( LDAPUrl &usrc )
return retval;
}
-QCString LDAPProtocol::LDAPEntryAsLDIF( LDAPMessage *message )
+TQCString LDAPProtocol::LDAPEntryAsLDIF( LDAPMessage *message )
{
- QCString result;
+ TQCString result;
char *name;
struct berval **bvals;
BerElement *entry;
- QByteArray tmp;
+ TQByteArray tmp;
char *dn = ldap_get_dn( mLDAP, message );
- if ( dn == NULL ) return QCString( "" );
+ if ( dn == NULL ) return TQCString( "" );
tmp.setRawData( dn, strlen( dn ) );
result += LDIF::assembleLine( "dn", tmp ) + '\n';
tmp.resetRawData( dn, strlen( dn ) );
@@ -264,7 +264,7 @@ QCString LDAPProtocol::LDAPEntryAsLDIF( LDAPMessage *message )
char* val = bvals[i]->bv_val;
unsigned long len = bvals[i]->bv_len;
tmp.setRawData( val, len );
- result += LDIF::assembleLine( QString::fromUtf8( name ), tmp, 76 ) + '\n';
+ result += LDIF::assembleLine( TQString::fromUtf8( name ), tmp, 76 ) + '\n';
tmp.resetRawData( val, len );
}
ldap_value_free_len(bvals);
@@ -276,8 +276,8 @@ QCString LDAPProtocol::LDAPEntryAsLDIF( LDAPMessage *message )
return result;
}
-void LDAPProtocol::addControlOp( LDAPControl ***pctrls, const QString &oid,
- const QByteArray &value, bool critical )
+void LDAPProtocol::addControlOp( LDAPControl ***pctrls, const TQString &oid,
+ const TQByteArray &value, bool critical )
{
LDAPControl **ctrls;
LDAPControl *ctrl = (LDAPControl *) malloc( sizeof( LDAPControl ) );
@@ -285,7 +285,7 @@ void LDAPProtocol::addControlOp( LDAPControl ***pctrls, const QString &oid,
ctrls = *pctrls;
kdDebug(7125) << "addControlOp: oid:'" << oid << "' val: '" <<
- QString::fromUtf8(value, value.size()) << "'" << endl;
+ TQString::fromUtf8(value, value.size()) << "'" << endl;
int vallen = value.size();
ctrl->ldctl_value.bv_len = vallen;
if ( vallen ) {
@@ -313,11 +313,11 @@ void LDAPProtocol::addControlOp( LDAPControl ***pctrls, const QString &oid,
*pctrls = ctrls;
}
-void LDAPProtocol::addModOp( LDAPMod ***pmods, int mod_type, const QString &attr,
- const QByteArray &value )
+void LDAPProtocol::addModOp( LDAPMod ***pmods, int mod_type, const TQString &attr,
+ const TQByteArray &value )
{
// kdDebug(7125) << "type: " << mod_type << " attr: " << attr <<
-// " value: " << QString::fromUtf8(value,value.size()) <<
+// " value: " << TQString::fromUtf8(value,value.size()) <<
// " size: " << value.size() << endl;
LDAPMod **mods;
@@ -380,7 +380,7 @@ void LDAPProtocol::addModOp( LDAPMod ***pmods, int mod_type, const QString &attr
}
}
-void LDAPProtocol::LDAPEntry2UDSEntry( const QString &dn, UDSEntry &entry,
+void LDAPProtocol::LDAPEntry2UDSEntry( const TQString &dn, UDSEntry &entry,
const LDAPUrl &usrc, bool dir )
{
UDSAtom atom;
@@ -389,7 +389,7 @@ void LDAPProtocol::LDAPEntry2UDSEntry( const QString &dn, UDSEntry &entry,
entry.clear();
atom.m_uds = UDS_NAME;
atom.m_long = 0;
- QString name = dn;
+ TQString name = dn;
if ( (pos = name.find(",")) > 0 )
name = name.left( pos );
if ( (pos = name.find("=")) > 0 )
@@ -437,13 +437,13 @@ void LDAPProtocol::changeCheck( LDAPUrl &url )
if ( url.hasExtension( "x-ver" ) )
ver = url.extension( "x-ver", critical).toInt();
bool authSASL = url.hasExtension( "x-sasl" );
- QString mech;
+ TQString mech;
if ( url.hasExtension( "x-mech" ) )
mech = url.extension( "x-mech", critical).upper();
- QString realm;
+ TQString realm;
if ( url.hasExtension( "x-realm" ) )
mech = url.extension( "x-realm", critical).upper();
- QString bindname;
+ TQString bindname;
if ( url.hasExtension( "bindname" ) )
bindname = url.extension( "bindname", critical).upper();
int timelimit = 0;
@@ -480,8 +480,8 @@ void LDAPProtocol::changeCheck( LDAPUrl &url )
}
}
-void LDAPProtocol::setHost( const QString& host, int port,
- const QString& user, const QString& password )
+void LDAPProtocol::setHost( const TQString& host, int port,
+ const TQString& user, const TQString& password )
{
if( mHost != host || mPort != port || mUser != user || mPassword != password )
@@ -519,8 +519,8 @@ void LDAPProtocol::fillAuthInfo( AuthInfo &info )
info.url.setPort( mPort );
info.url.setUser( mUser );
info.caption = i18n("LDAP Login");
- info.comment = QString::fromLatin1( mProtocol ) + "://" + mHost + ":" +
- QString::number( mPort );
+ info.comment = TQString::fromLatin1( mProtocol ) + "://" + mHost + ":" +
+ TQString::number( mPort );
info.commentLabel = i18n("site:");
info.username = mAuthSASL ? mUser : mBindName;
info.password = mPassword;
@@ -561,7 +561,7 @@ int LDAPProtocol::saslInteract( void *in )
}
interact = ( sasl_interact_t * ) in;
- QString value;
+ TQString value;
while( interact->id != SASL_CB_LIST_END ) {
value = "";
@@ -668,7 +668,7 @@ void LDAPProtocol::openConnection()
#endif
bool auth = false;
- QString mechanism = mMech.isEmpty() ? "DIGEST-MD5" : mMech;
+ TQString mechanism = mMech.isEmpty() ? "DIGEST-MD5" : mMech;
mFirstAuth = true; mCancel = false;
const bool cached = checkCachedAuthentication( info );
@@ -689,7 +689,7 @@ void LDAPProtocol::openConnection()
mPassword = info.password;
} else {
kdDebug(7125) << "Dialog cancelled!" << endl;
- error( ERR_USER_CANCELED, QString::null );
+ error( ERR_USER_CANCELED, TQString::null );
closeConnection();
return;
}
@@ -711,7 +711,7 @@ void LDAPProtocol::openConnection()
auth = true;
if ( ret != LDAP_SUCCESS ) {
if ( mCancel )
- error( ERR_USER_CANCELED, QString::null );
+ error( ERR_USER_CANCELED, TQString::null );
else
LDAPErr( Url );
closeConnection();
@@ -756,9 +756,9 @@ void LDAPProtocol::get( const KURL &_url )
// tell the mimetype
mimeType("text/plain");
// collect the result
- QCString result;
+ TQCString result;
filesize_t processed_size = 0;
- QByteArray array;
+ TQByteArray array;
while( true ) {
ret = ldap_result( mLDAP, id, 0, NULL, &msg );
@@ -806,7 +806,7 @@ void LDAPProtocol::stat( const KURL &_url )
{
kdDebug(7125) << "stat(" << _url << ")" << endl;
- QStringList att,saveatt;
+ TQStringList att,saveatt;
LDAPUrl usrc(_url);
LDAPMessage *msg;
int ret, id;
@@ -902,7 +902,7 @@ void LDAPProtocol::put( const KURL &_url, int, bool overwrite, bool )
LDAPMod **lmod = 0;
LDAPControl **serverctrls = 0, **clientctrls = 0;
- QByteArray buffer;
+ TQByteArray buffer;
int result = 0;
LDIF::ParseVal ret;
LDIF ldif;
@@ -956,7 +956,7 @@ void LDAPProtocol::put( const KURL &_url, int, bool overwrite, bool )
" deloldrdn: " << ldif.delOldRdn() << endl;
controlsFromMetaData( &serverctrls, &clientctrls );
ldaperr = ldap_rename_s( mLDAP, ldif.dn().utf8(), ldif.newRdn().utf8(),
- ldif.newSuperior().isEmpty() ? QCString() : ldif.newSuperior().utf8(),
+ ldif.newSuperior().isEmpty() ? TQCString() : ldif.newSuperior().utf8(),
ldif.delOldRdn(), serverctrls, clientctrls );
FREELDAPMEM;
@@ -1049,7 +1049,7 @@ void LDAPProtocol::listDir( const KURL &_url )
int ret, ret2, id, id2;
unsigned long total=0;
char *dn;
- QStringList att,saveatt;
+ TQStringList att,saveatt;
LDAPMessage *entry,*msg,*entry2,*msg2;
LDAPUrl usrc(_url),usrc2;
bool critical;
@@ -1100,17 +1100,17 @@ void LDAPProtocol::listDir( const KURL &_url )
dn = ldap_get_dn( mLDAP, entry );
kdDebug(7125) << "dn: " << dn << endl;
- LDAPEntry2UDSEntry( QString::fromUtf8(dn), uds, usrc );
+ LDAPEntry2UDSEntry( TQString::fromUtf8(dn), uds, usrc );
listEntry( uds, false );
// processedSize( total );
kdDebug(7125) << " total: " << total << " " << usrc.prettyURL() << endl;
// publish the sub-directories (if dirmode==sub)
if ( isSub ) {
- usrc2.setDn( QString::fromUtf8( dn ) );
+ usrc2.setDn( TQString::fromUtf8( dn ) );
usrc2.setScope( LDAPUrl::One );
usrc2.setAttributes( att );
- usrc2.setFilter( QString::null );
+ usrc2.setFilter( TQString::null );
kdDebug(7125) << "search2 " << dn << endl;
if ( (id2 = asyncSearch( usrc2 )) != -1 ) {
while ( true ) {
@@ -1126,7 +1126,7 @@ void LDAPProtocol::listDir( const KURL &_url )
if ( entry2 ) {
usrc2.setAttributes( saveatt );
usrc2.setFilter( usrc.filter() );
- LDAPEntry2UDSEntry( QString::fromUtf8( dn ), uds, usrc2, true );
+ LDAPEntry2UDSEntry( TQString::fromUtf8( dn ), uds, usrc2, true );
listEntry( uds, false );
total++;
}
diff --git a/kioslave/ldap/kio_ldap.h b/kioslave/ldap/kio_ldap.h
index ff722d345..d262b61ea 100644
--- a/kioslave/ldap/kio_ldap.h
+++ b/kioslave/ldap/kio_ldap.h
@@ -1,8 +1,8 @@
#ifndef __LDAP_H__
#define __LDAP_H__
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
#include <kio/slavebase.h>
#include <kio/authinfo.h>
@@ -15,11 +15,11 @@
class LDAPProtocol : public KIO::SlaveBase
{
public:
- LDAPProtocol( const QCString &protocol, const QCString &pool, const QCString &app );
+ LDAPProtocol( const TQCString &protocol, const TQCString &pool, const TQCString &app );
virtual ~LDAPProtocol();
- virtual void setHost( const QString& host, int port,
- const QString& user, const QString& pass );
+ virtual void setHost( const TQString& host, int port,
+ const TQString& user, const TQString& pass );
virtual void openConnection();
virtual void closeConnection();
@@ -34,28 +34,28 @@ class LDAPProtocol : public KIO::SlaveBase
private:
- QString mHost;
+ TQString mHost;
int mPort;
- QString mUser;
- QString mPassword;
+ TQString mUser;
+ TQString mPassword;
LDAP *mLDAP;
int mVer, mSizeLimit, mTimeLimit;
bool mTLS;
bool mAuthSASL;
- QString mMech,mRealm,mBindName;
+ TQString mMech,mRealm,mBindName;
bool mCancel, mFirstAuth;
void controlsFromMetaData( LDAPControl ***serverctrls,
LDAPControl ***clientctrls );
- void addControlOp( LDAPControl ***pctrls, const QString &oid,
- const QByteArray &value, bool critical );
+ void addControlOp( LDAPControl ***pctrls, const TQString &oid,
+ const TQByteArray &value, bool critical );
void addModOp( LDAPMod ***pmods, int mod_type,
- const QString &attr, const QByteArray &value );
- void LDAPEntry2UDSEntry( const QString &dn, KIO::UDSEntry &entry,
+ const TQString &attr, const TQByteArray &value );
+ void LDAPEntry2UDSEntry( const TQString &dn, KIO::UDSEntry &entry,
const KABC::LDAPUrl &usrc, bool dir=false );
int asyncSearch( KABC::LDAPUrl &usrc );
- QCString LDAPEntryAsLDIF( LDAPMessage *msg );
+ TQCString LDAPEntryAsLDIF( LDAPMessage *msg );
void LDAPErr( const KURL &url, int err = LDAP_SUCCESS );
void changeCheck( KABC::LDAPUrl &url );
diff --git a/kioslave/mac/kio_mac.cpp b/kioslave/mac/kio_mac.cpp
index 56989487a..e64d22d65 100644
--- a/kioslave/mac/kio_mac.cpp
+++ b/kioslave/mac/kio_mac.cpp
@@ -22,8 +22,8 @@
#include <kdebug.h>
#include <klocale.h>
#include <kconfig.h>
-#include <qstring.h>
-#include <qregexp.h>
+#include <tqstring.h>
+#include <tqregexp.h>
#include <sys/stat.h>
#include <stdlib.h>
@@ -43,11 +43,11 @@ extern "C" {
}
}
-MacProtocol::MacProtocol(const QCString &pool, const QCString &app)
- : QObject(), SlaveBase("mac", pool, app) {
-/* logFile = new QFile("/home/jr/logfile");
+MacProtocol::MacProtocol(const TQCString &pool, const TQCString &app)
+ : TQObject(), SlaveBase("mac", pool, app) {
+/* logFile = new TQFile("/home/jr/logfile");
logFile->open(IO_ReadWrite | IO_Append);
- logStream = new QTextStream(logFile);
+ logStream = new TQTextStream(logFile);
*logStream << "Start Macprotocol()" << endl;
*/
}
@@ -66,10 +66,10 @@ MacProtocol::~MacProtocol() {
//get() called when a file is to be read
void MacProtocol::get(const KURL& url) {
- QString path = prepareHP(url); //mount and change to correct directory - return the filename
- QString query = url.query();
- QString mode("-");
- QString mime;
+ TQString path = prepareHP(url); //mount and change to correct directory - return the filename
+ TQString query = url.query();
+ TQString mode("-");
+ TQString mime;
processedBytes = 0;
//Find out the size and if it's a text file
@@ -105,8 +105,8 @@ void MacProtocol::get(const KURL& url) {
*myKProcess << "hpcopy" << mode << path << "-";
//data is now sent directly from the slot
- connect(myKProcess, SIGNAL(receivedStdout(KProcess *, char *, int)),
- this, SLOT(slotSetDataStdOutput(KProcess *, char *, int)));
+ connect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
+ this, TQT_SLOT(slotSetDataStdOutput(KProcess *, char *, int)));
myKProcess->start(KProcess::Block, KProcess::All);
@@ -119,13 +119,13 @@ void MacProtocol::get(const KURL& url) {
//clean up
delete myKProcess; myKProcess = 0;
//finish
- data(QByteArray());
+ data(TQByteArray());
finished();
}
//listDir() called when the user is looking at a directory
void MacProtocol::listDir(const KURL& url) {
- QString filename = prepareHP(url);
+ TQString filename = prepareHP(url);
if (filename.isNull()) {
error(ERR_CANNOT_LAUNCH_PROCESS, i18n("No filename was found"));
@@ -133,9 +133,9 @@ void MacProtocol::listDir(const KURL& url) {
myKProcess = new KProcess();
*myKProcess << "hpls" << "-la" << filename;
- standardOutputStream = QString::null;
- connect(myKProcess, SIGNAL(receivedStdout(KProcess *, char *, int)),
- this, SLOT(slotGetStdOutput(KProcess *, char *, int)));
+ standardOutputStream = TQString::null;
+ connect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
myKProcess->start(KProcess::Block, KProcess::All);
@@ -146,13 +146,13 @@ void MacProtocol::listDir(const KURL& url) {
//clean up
delete myKProcess; myKProcess = 0;
- disconnect(myKProcess, SIGNAL(receivedStdout(KProcess *, char *, int)),
- this, SLOT(slotGetStdOutput(KProcess *, char *, int)));
+ disconnect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
UDSEntry entry;
if (!standardOutputStream.isEmpty()) {
- QTextStream in(&standardOutputStream, IO_ReadOnly);
- QString line = in.readLine(); //throw away top file which shows current directory
+ TQTextStream in(&standardOutputStream, IO_ReadOnly);
+ TQString line = in.readLine(); //throw away top file which shows current directory
line = in.readLine();
while (line != NULL) {
@@ -180,8 +180,8 @@ void MacProtocol::stat(const KURL& url) {
//doStat(), does all the work that stat() needs
//it's been separated out so it can be called from get() which
//also need information
-QValueList<KIO::UDSAtom> MacProtocol::doStat(const KURL& url) {
- QString filename = prepareHP(url);
+TQValueList<KIO::UDSAtom> MacProtocol::doStat(const KURL& url) {
+ TQString filename = prepareHP(url);
if (filename.isNull()) {
error(ERR_SLAVE_DEFINED, i18n("No filename was found in the URL"));
@@ -190,9 +190,9 @@ QValueList<KIO::UDSAtom> MacProtocol::doStat(const KURL& url) {
*myKProcess << "hpls" << "-ld" << filename;
- standardOutputStream = QString::null;
- connect(myKProcess, SIGNAL(receivedStdout(KProcess *, char *, int)),
- this, SLOT(slotGetStdOutput(KProcess *, char *, int)));
+ standardOutputStream = TQString::null;
+ connect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
myKProcess->start(KProcess::Block, KProcess::All);
@@ -203,8 +203,8 @@ QValueList<KIO::UDSAtom> MacProtocol::doStat(const KURL& url) {
//clean up
delete myKProcess; myKProcess = 0;
- disconnect(myKProcess, SIGNAL(receivedStdout(KProcess *, char *, int)),
- this, SLOT(slotGetStdOutput(KProcess *, char *, int)));
+ disconnect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
if (standardOutputStream.isEmpty()) {
filename.replace("\\ ", " "); //get rid of escapes
@@ -215,7 +215,7 @@ QValueList<KIO::UDSAtom> MacProtocol::doStat(const KURL& url) {
error(ERR_DOES_NOT_EXIST, filename);
} else {
//remove trailing \n
- QString line = standardOutputStream.left(standardOutputStream.length()-1);
+ TQString line = standardOutputStream.left(standardOutputStream.length()-1);
UDSEntry entry = makeUDS(line);
return entry;
}
@@ -225,23 +225,23 @@ QValueList<KIO::UDSAtom> MacProtocol::doStat(const KURL& url) {
return entry;
}//if filename == null
- return QValueList<KIO::UDSAtom>();
+ return TQValueList<KIO::UDSAtom>();
}
//prepareHP() called from get() listDir() and stat()
//(re)mounts the partition and changes to the appropriate directory
-QString MacProtocol::prepareHP(const KURL& url) {
- QString path = url.path(-1);
+TQString MacProtocol::prepareHP(const KURL& url) {
+ TQString path = url.path(-1);
if (path.left(1) == "/") {
path = path.mid(1); // strip leading slash
}
//find out if a device has been specified in the query e.g. ?dev=/dev/fd0
//or in the config file (query device entries are saved to config file)
- QString device;
+ TQString device;
KConfig* config = new KConfig("macrc");
- QString query = url.query();
+ TQString query = url.query();
int modepos = query.find("dev=");
if (modepos == -1) {
//no device specified, read from config or go with #define PARTITION
@@ -256,9 +256,9 @@ QString MacProtocol::prepareHP(const KURL& url) {
//first we run just hpmount and check the output to see if it's version 1.0.2 or 1.0.4
myKProcess = new KProcess();
*myKProcess << "hpmount";
- standardOutputStream = QString::null;
- connect(myKProcess, SIGNAL(receivedStderr(KProcess *, char *, int)),
- this, SLOT(slotGetStdOutput(KProcess *, char *, int)));
+ standardOutputStream = TQString::null;
+ connect(myKProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
myKProcess->start(KProcess::Block, KProcess::All);
@@ -269,8 +269,8 @@ QString MacProtocol::prepareHP(const KURL& url) {
}
delete myKProcess; myKProcess = 0;
- disconnect(myKProcess, SIGNAL(receivedStderr(KProcess *, char *, int)),
- this, SLOT(slotGetStdOutput(KProcess *, char *, int)));
+ disconnect(myKProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
//now mount the drive
myKProcess = new KProcess();
@@ -304,7 +304,7 @@ QString MacProtocol::prepareHP(const KURL& url) {
path.replace(")", "\\)");
//then change to the right directory
- int s; QString dir;
+ int s; TQString dir;
s = path.find('/');
while (s != -1) {
dir = path.left(s);
@@ -333,13 +333,13 @@ QString MacProtocol::prepareHP(const KURL& url) {
//makeUDS() takes a line of output from hpls -l and converts it into
// one of these UDSEntrys to return
//called from listDir() and stat()
-QValueList<KIO::UDSAtom> MacProtocol::makeUDS(const QString& _line) {
- QString line(_line);
+TQValueList<KIO::UDSAtom> MacProtocol::makeUDS(const TQString& _line) {
+ TQString line(_line);
UDSEntry entry;
//is it a file or a directory
- QRegExp dirRE("^d. +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+) +(.*)");
- QRegExp fileRE("^([f|F]). +(....)/(....) +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+) +(.*)");
+ TQRegExp dirRE("^d. +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+) +(.*)");
+ TQRegExp fileRE("^([f|F]). +(....)/(....) +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+) +(.*)");
if (dirRE.exactMatch(line)) {
UDSAtom atom;
atom.m_uds = KIO::UDS_NAME;
@@ -365,7 +365,7 @@ QValueList<KIO::UDSAtom> MacProtocol::makeUDS(const QString& _line) {
entry.append(atom);
atom.m_uds = KIO::UDS_SIZE;
- QString theSize(fileRE.cap(4)); //TODO: this is data size, what about resource size?
+ TQString theSize(fileRE.cap(4)); //TODO: this is data size, what about resource size?
atom.m_long = theSize.toLong();
entry.append(atom);
@@ -374,7 +374,7 @@ QValueList<KIO::UDSAtom> MacProtocol::makeUDS(const QString& _line) {
entry.append(atom);
atom.m_uds = KIO::UDS_ACCESS;
- if (QString(fileRE.cap(1)) == QString("F")) { //if locked then read only
+ if (TQString(fileRE.cap(1)) == TQString("F")) { //if locked then read only
atom.m_long = 0444;
} else {
atom.m_long = 0644;
@@ -382,13 +382,13 @@ QValueList<KIO::UDSAtom> MacProtocol::makeUDS(const QString& _line) {
entry.append(atom);
atom.m_uds = KIO::UDS_MIME_TYPE;
- QString mimetype = getMimetype(fileRE.cap(2),fileRE.cap(3));
+ TQString mimetype = getMimetype(fileRE.cap(2),fileRE.cap(3));
atom.m_str = mimetype.local8Bit();
entry.append(atom);
// Is it a file or a link/alias, just make aliases link to themselves
- if (QString(fileRE.cap(2)) == QString("adrp") ||
- QString(fileRE.cap(2)) == QString("fdrp")) {
+ if (TQString(fileRE.cap(2)) == TQString("adrp") ||
+ TQString(fileRE.cap(2)) == TQString("fdrp")) {
atom.m_uds = KIO::UDS_FILE_TYPE;
atom.m_long = S_IFREG;
entry.append(atom);
@@ -413,7 +413,7 @@ QValueList<KIO::UDSAtom> MacProtocol::makeUDS(const QString& _line) {
//slotGetStdOutput() grabs output from the hp commands
// and adds it to the buffer
void MacProtocol::slotGetStdOutput(KProcess*, char *s, int len) {
- standardOutputStream += QString::fromLocal8Bit(s, len);
+ standardOutputStream += TQString::fromLocal8Bit(s, len);
}
//slotSetDataStdOutput() is used during hpcopy to give
@@ -421,7 +421,7 @@ void MacProtocol::slotGetStdOutput(KProcess*, char *s, int len) {
void MacProtocol::slotSetDataStdOutput(KProcess*, char *s, int len) {
processedBytes += len;
processedSize(processedBytes);
- QByteArray array;
+ TQByteArray array;
array.setRawData(s, len);
data(array);
array.resetRawData(s, len);
@@ -429,7 +429,7 @@ void MacProtocol::slotSetDataStdOutput(KProcess*, char *s, int len) {
//makeTime() takes in the date output from hpls -l
//and returns as good a timestamp as we're going to get
-int MacProtocol::makeTime(QString mday, QString mon, QString third) {
+int MacProtocol::makeTime(TQString mday, TQString mon, TQString third) {
int year; int month; int day;
int hour; int minute;
@@ -453,17 +453,17 @@ int MacProtocol::makeTime(QString mday, QString mon, QString third) {
//if the file is recent (last 12 months) hpls gives us the time,
// otherwise it only prints the year
- QRegExp hourMin("(..):(..)");
+ TQRegExp hourMin("(..):(..)");
if (hourMin.exactMatch(third)) {
- QDate currentDate(QDate::currentDate());
+ TQDate currentDate(TQDate::currentDate());
if (month > currentDate.month()) {
year = currentDate.year() - 1;
} else {
year = currentDate.year();
}
- QString h(hourMin.cap(1));
- QString m(hourMin.cap(2));
+ TQString h(hourMin.cap(1));
+ TQString m(hourMin.cap(2));
hour = h.toInt();
minute = m.toInt();
} else {
@@ -475,87 +475,87 @@ int MacProtocol::makeTime(QString mday, QString mon, QString third) {
day = mday.toInt();
//check it's valid
- if ( (!QDate::isValid(year, month, day)) || (!QTime::isValid(hour, minute, 0) ) ) {
+ if ( (!TQDate::isValid(year, month, day)) || (!TQTime::isValid(hour, minute, 0) ) ) {
error(ERR_INTERNAL, i18n("Could not parse a valid date from hpls"));
}
//put it together and work it out
- QDate fileDate(year, month, day);
- QTime fileTime(hour, minute);
- QDateTime fileDateTime(fileDate, fileTime);
+ TQDate fileDate(year, month, day);
+ TQTime fileTime(hour, minute);
+ TQDateTime fileDateTime(fileDate, fileTime);
return fileDateTime.toTime_t();
}
-QString MacProtocol::getMimetype(QString type, QString app) {
- if (type == QString("TEXT") && app == QString("ttxt")) {
- return QString("text/plain");
- } else if (type == QString("TEXT") && app == QString("udog")) {
- return QString("text/html");
- } else if (type == QString("svgs")) {
- return QString("text/xml");
- } else if (type == QString("ZIP ")) {
- return QString("application/zip");
- } else if (type == QString("pZip")) {
- return QString("application/zip");
- } else if (type == QString("APPL")) {
- return QString("application/x-executable");
- } else if (type == QString("MooV")) {
- return QString("video/quicktime");
- } else if (type == QString("TEXT") && app == QString("MSWD")) {
- return QString("application/vnd.ms-word");
- } else if (type == QString("PDF ")) {
- return QString("application/pdf");
- } else if (app == QString("CARO")) {
- return QString("application/pdf");
- } else if (type == QString("SIT5")) {
- return QString("application/x-stuffit");
- } else if (type == QString("SITD")) {
- return QString("application/x-stuffit");
- } else if (type == QString("SIT!")) {
- return QString("application/x-stuffit");
- } else if (app == QString("SIT!")) {
- return QString("application/x-stuffit");
- } else if (type == QString("RTFf")) {
- return QString("text/rtf");
- } else if (type == QString("GIFf")) {
- return QString("image/gif");
- } else if (type == QString("JPEG")) {
- return QString("image/jpeg");
- } else if (type == QString("PNGf")) {
- return QString("image/png");
- } else if (type == QString("XBMm")) {
- return QString("image/x-xbm");
- } else if (type == QString("EPSF")) {
- return QString("image/x-epsf");
- } else if (type == QString("TIFF")) {
- return QString("image/tiff");
- } else if (type == QString("PICT")) {
- return QString("image/pict");
- } else if (type == QString("TPIC")) {
- return QString("image/x-targa");
- } else if (type == QString("ULAW")) {
- return QString("audio/basic");
- } else if (type == QString("AIFF")) {
- return QString("audio/x-aiff");
- } else if (type == QString("WAVE")) {
- return QString("audio/x-wav");
- } else if (type == QString("FFIL") && app == QString("DMOV")) {
- return QString("application/x-font");
- } else if (type == QString("XLS3")) {
- return QString("application/vnd.ms-excel");
- } else if (type == QString("XLS4")) {
- return QString("application/vnd.ms-excel");
- } else if (type == QString("XLS5")) {
- return QString("application/vnd.ms-excel");
- } else if (app == QString("MSWD")) {
- return QString("application/vnd.ms-word");
- } else if (type == QString("TEXT")) {
- return QString("text/plain");
- } else if (app == QString("ttxt")) {
- return QString("text/plain");
+TQString MacProtocol::getMimetype(TQString type, TQString app) {
+ if (type == TQString("TEXT") && app == TQString("ttxt")) {
+ return TQString("text/plain");
+ } else if (type == TQString("TEXT") && app == TQString("udog")) {
+ return TQString("text/html");
+ } else if (type == TQString("svgs")) {
+ return TQString("text/xml");
+ } else if (type == TQString("ZIP ")) {
+ return TQString("application/zip");
+ } else if (type == TQString("pZip")) {
+ return TQString("application/zip");
+ } else if (type == TQString("APPL")) {
+ return TQString("application/x-executable");
+ } else if (type == TQString("MooV")) {
+ return TQString("video/quicktime");
+ } else if (type == TQString("TEXT") && app == TQString("MSWD")) {
+ return TQString("application/vnd.ms-word");
+ } else if (type == TQString("PDF ")) {
+ return TQString("application/pdf");
+ } else if (app == TQString("CARO")) {
+ return TQString("application/pdf");
+ } else if (type == TQString("SIT5")) {
+ return TQString("application/x-stuffit");
+ } else if (type == TQString("SITD")) {
+ return TQString("application/x-stuffit");
+ } else if (type == TQString("SIT!")) {
+ return TQString("application/x-stuffit");
+ } else if (app == TQString("SIT!")) {
+ return TQString("application/x-stuffit");
+ } else if (type == TQString("RTFf")) {
+ return TQString("text/rtf");
+ } else if (type == TQString("GIFf")) {
+ return TQString("image/gif");
+ } else if (type == TQString("JPEG")) {
+ return TQString("image/jpeg");
+ } else if (type == TQString("PNGf")) {
+ return TQString("image/png");
+ } else if (type == TQString("XBMm")) {
+ return TQString("image/x-xbm");
+ } else if (type == TQString("EPSF")) {
+ return TQString("image/x-epsf");
+ } else if (type == TQString("TIFF")) {
+ return TQString("image/tiff");
+ } else if (type == TQString("PICT")) {
+ return TQString("image/pict");
+ } else if (type == TQString("TPIC")) {
+ return TQString("image/x-targa");
+ } else if (type == TQString("ULAW")) {
+ return TQString("audio/basic");
+ } else if (type == TQString("AIFF")) {
+ return TQString("audio/x-aiff");
+ } else if (type == TQString("WAVE")) {
+ return TQString("audio/x-wav");
+ } else if (type == TQString("FFIL") && app == TQString("DMOV")) {
+ return TQString("application/x-font");
+ } else if (type == TQString("XLS3")) {
+ return TQString("application/vnd.ms-excel");
+ } else if (type == TQString("XLS4")) {
+ return TQString("application/vnd.ms-excel");
+ } else if (type == TQString("XLS5")) {
+ return TQString("application/vnd.ms-excel");
+ } else if (app == TQString("MSWD")) {
+ return TQString("application/vnd.ms-word");
+ } else if (type == TQString("TEXT")) {
+ return TQString("text/plain");
+ } else if (app == TQString("ttxt")) {
+ return TQString("text/plain");
}
- return QString("application/octet-stream");
+ return TQString("application/octet-stream");
}
diff --git a/kioslave/mac/kio_mac.h b/kioslave/mac/kio_mac.h
index c87217e08..7f74dfca7 100644
--- a/kioslave/mac/kio_mac.h
+++ b/kioslave/mac/kio_mac.h
@@ -21,16 +21,16 @@
#include <kurl.h>
#include <kprocess.h>
-#include <qstring.h>
-#include <qcstring.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqstring.h>
+#include <tqcstring.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
-class MacProtocol : public QObject, public KIO::SlaveBase
+class MacProtocol : public TQObject, public KIO::SlaveBase
{
Q_OBJECT
public:
- MacProtocol(const QCString &pool, const QCString &app);
+ MacProtocol(const TQCString &pool, const TQCString &app);
~MacProtocol();
virtual void get(const KURL& url );
virtual void listDir(const KURL& url);
@@ -39,17 +39,17 @@ protected slots:
void slotGetStdOutput(KProcess*, char*, int);
void slotSetDataStdOutput(KProcess*, char *s, int len);
protected:
- QString prepareHP(const KURL& _url);
- QValueList<KIO::UDSAtom> makeUDS(const QString& _line);
- int makeTime(QString mday, QString mon, QString third);
- QString getMimetype(QString type, QString app);
- QValueList<KIO::UDSAtom> doStat(const KURL& url);
+ TQString prepareHP(const KURL& _url);
+ TQValueList<KIO::UDSAtom> makeUDS(const TQString& _line);
+ int makeTime(TQString mday, TQString mon, TQString third);
+ TQString getMimetype(TQString type, TQString app);
+ TQValueList<KIO::UDSAtom> doStat(const KURL& url);
KIO::filesize_t processedBytes;
- QString standardOutputStream;
+ TQString standardOutputStream;
KProcess* myKProcess;
//for debugging
- //QFile* logFile;
- //QTextStream* logStream;
+ //TQFile* logFile;
+ //TQTextStream* logStream;
};
diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp
index 068287b7e..013a15248 100644
--- a/kioslave/man/kio_man.cpp
+++ b/kioslave/man/kio_man.cpp
@@ -22,14 +22,14 @@
#include <string.h>
#include <dirent.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qdatastream.h>
-#include <qcstring.h>
-#include <qptrlist.h>
-#include <qmap.h>
-#include <qregexp.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqdatastream.h>
+#include <tqcstring.h>
+#include <tqptrlist.h>
+#include <tqmap.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <kinstance.h>
@@ -56,7 +56,7 @@ MANProtocol *MANProtocol::_self = 0;
* Drop trailing ".section[.gz]" from name
*/
static
-void stripExtension( QString *name )
+void stripExtension( TQString *name )
{
int pos = name->length();
@@ -77,11 +77,11 @@ void stripExtension( QString *name )
}
static
-bool parseUrl(const QString& _url, QString &title, QString &section)
+bool parseUrl(const TQString& _url, TQString &title, TQString &section)
{
- section = QString::null;
+ section = TQString::null;
- QString url = _url;
+ TQString url = _url;
if (url.at(0) == '/') {
if (KStandardDirs::exists(url)) {
title = url;
@@ -111,13 +111,13 @@ bool parseUrl(const QString& _url, QString &title, QString &section)
}
-MANProtocol::MANProtocol(const QCString &pool_socket, const QCString &app_socket)
- : QObject(), SlaveBase("man", pool_socket, app_socket)
+MANProtocol::MANProtocol(const TQCString &pool_socket, const TQCString &app_socket)
+ : TQObject(), SlaveBase("man", pool_socket, app_socket)
{
assert(!_self);
_self = this;
- const QString common_dir = KGlobal::dirs()->findResourceDir( "html", "en/common/kde-common.css" );
- const QString strPath=QString( "file:%1/en/common" ).arg( common_dir );
+ const TQString common_dir = KGlobal::dirs()->findResourceDir( "html", "en/common/kde-common.css" );
+ const TQString strPath=TQString( "file:%1/en/common" ).arg( common_dir );
m_htmlPath=strPath.local8Bit(); // ### TODO encode for HTML
m_cssPath=strPath.local8Bit(); // ### TODO encode for CSS
section_names << "1" << "2" << "3" << "3n" << "3p" << "4" << "5" << "6" << "7"
@@ -132,18 +132,18 @@ MANProtocol::~MANProtocol()
_self = 0;
}
-void MANProtocol::parseWhatIs( QMap<QString, QString> &i, QTextStream &t, const QString &mark )
+void MANProtocol::parseWhatIs( TQMap<TQString, TQString> &i, TQTextStream &t, const TQString &mark )
{
- QRegExp re( mark );
- QString l;
+ TQRegExp re( mark );
+ TQString l;
while ( !t.atEnd() )
{
l = t.readLine();
int pos = re.search( l );
if (pos != -1)
{
- QString names = l.left(pos);
- QString descr = l.mid(pos + re.matchedLength());
+ TQString names = l.left(pos);
+ TQString descr = l.mid(pos + re.matchedLength());
while ((pos = names.find(",")) != -1)
{
i[names.left(pos++)] = descr;
@@ -156,20 +156,20 @@ void MANProtocol::parseWhatIs( QMap<QString, QString> &i, QTextStream &t, const
}
}
-bool MANProtocol::addWhatIs(QMap<QString, QString> &i, const QString &name, const QString &mark)
+bool MANProtocol::addWhatIs(TQMap<TQString, TQString> &i, const TQString &name, const TQString &mark)
{
- QFile f(name);
+ TQFile f(name);
if (!f.open(IO_ReadOnly))
return false;
- QTextStream t(&f);
+ TQTextStream t(&f);
parseWhatIs( i, t, mark );
return true;
}
-QMap<QString, QString> MANProtocol::buildIndexMap(const QString &section)
+TQMap<TQString, TQString> MANProtocol::buildIndexMap(const TQString &section)
{
- QMap<QString, QString> i;
- QStringList man_dirs = manDirectories();
+ TQMap<TQString, TQString> i;
+ TQStringList man_dirs = manDirectories();
// Supplementary places for whatis databases
man_dirs += m_mandbpath;
if (man_dirs.find("/var/cache/man")==man_dirs.end())
@@ -177,16 +177,16 @@ QMap<QString, QString> MANProtocol::buildIndexMap(const QString &section)
if (man_dirs.find("/var/catman")==man_dirs.end())
man_dirs << "/var/catman";
- QStringList names;
+ TQStringList names;
names << "whatis.db" << "whatis";
- QString mark = "\\s+\\(" + section + "[a-z]*\\)\\s+-\\s+";
+ TQString mark = "\\s+\\(" + section + "[a-z]*\\)\\s+-\\s+";
- for ( QStringList::ConstIterator it_dir = man_dirs.begin();
+ for ( TQStringList::ConstIterator it_dir = man_dirs.begin();
it_dir != man_dirs.end();
++it_dir )
{
- if ( QFile::exists( *it_dir ) ) {
- QStringList::ConstIterator it_name;
+ if ( TQFile::exists( *it_dir ) ) {
+ TQStringList::ConstIterator it_name;
for ( it_name = names.begin();
it_name != names.end();
it_name++ )
@@ -197,11 +197,11 @@ QMap<QString, QString> MANProtocol::buildIndexMap(const QString &section)
if ( it_name == names.end() ) {
KProcess proc;
proc << "whatis" << "-M" << (*it_dir) << "-w" << "*";
- myStdStream = QString::null;
- connect( &proc, SIGNAL( receivedStdout(KProcess *, char *, int ) ),
- SLOT( slotGetStdOutput( KProcess *, char *, int ) ) );
+ myStdStream = TQString::null;
+ connect( &proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int ) ),
+ TQT_SLOT( slotGetStdOutput( KProcess *, char *, int ) ) );
proc.start( KProcess::Block, KProcess::Stdout );
- QTextStream t( &myStdStream, IO_ReadOnly );
+ TQTextStream t( &myStdStream, IO_ReadOnly );
parseWhatIs( i, t, mark );
}
}
@@ -209,54 +209,54 @@ QMap<QString, QString> MANProtocol::buildIndexMap(const QString &section)
return i;
}
-QStringList MANProtocol::manDirectories()
+TQStringList MANProtocol::manDirectories()
{
checkManPaths();
//
// Build a list of man directories including translations
//
- QStringList man_dirs;
+ TQStringList man_dirs;
- for ( QStringList::ConstIterator it_dir = m_manpath.begin();
+ for ( TQStringList::ConstIterator it_dir = m_manpath.begin();
it_dir != m_manpath.end();
it_dir++ )
{
// Translated pages in "<mandir>/<lang>" if the directory
// exists
- QStringList languages = KGlobal::locale()->languageList();
+ TQStringList languages = KGlobal::locale()->languageList();
- for (QStringList::ConstIterator it_lang = languages.begin();
+ for (TQStringList::ConstIterator it_lang = languages.begin();
it_lang != languages.end();
it_lang++ )
{
- if ( !(*it_lang).isEmpty() && (*it_lang) != QString("C") ) {
- QString dir = (*it_dir) + '/' + (*it_lang);
+ if ( !(*it_lang).isEmpty() && (*it_lang) != TQString("C") ) {
+ TQString dir = (*it_dir) + '/' + (*it_lang);
struct stat sbuf;
- if ( ::stat( QFile::encodeName( dir ), &sbuf ) == 0
+ if ( ::stat( TQFile::encodeName( dir ), &sbuf ) == 0
&& S_ISDIR( sbuf.st_mode ) )
{
- const QString p = QDir(dir).canonicalPath();
+ const TQString p = TQDir(dir).canonicalPath();
if (!man_dirs.contains(p)) man_dirs += p;
}
}
}
// Untranslated pages in "<mandir>"
- const QString p = QDir(*it_dir).canonicalPath();
+ const TQString p = TQDir(*it_dir).canonicalPath();
if (!man_dirs.contains(p)) man_dirs += p;
}
return man_dirs;
}
-QStringList MANProtocol::findPages(const QString &_section,
- const QString &title,
+TQStringList MANProtocol::findPages(const TQString &_section,
+ const TQString &title,
bool full_path)
{
- QString section = _section;
+ TQString section = _section;
- QStringList list;
+ TQStringList list;
// kdDebug() << "findPages '" << section << "' '" << title << "'\n";
if (title.at(0) == '/') {
@@ -264,12 +264,12 @@ QStringList MANProtocol::findPages(const QString &_section,
return list;
}
- const QString star( "*" );
+ const TQString star( "*" );
//
// Find man sections in this directory
//
- QStringList sect_list;
+ TQStringList sect_list;
if ( section.isEmpty() )
section = star;
@@ -287,41 +287,41 @@ QStringList MANProtocol::findPages(const QString &_section,
sect_list += section;
}
- QStringList man_dirs = manDirectories();
+ TQStringList man_dirs = manDirectories();
//
// Find man pages in the sections listed above
//
- for ( QStringList::ConstIterator it_sect = sect_list.begin();
+ for ( TQStringList::ConstIterator it_sect = sect_list.begin();
it_sect != sect_list.end();
it_sect++ )
{
- QString it_real = (*it_sect).lower();
+ TQString it_real = (*it_sect).lower();
//
// Find pages
//
- for ( QStringList::ConstIterator it_dir = man_dirs.begin();
+ for ( TQStringList::ConstIterator it_dir = man_dirs.begin();
it_dir != man_dirs.end();
it_dir++ )
{
- QString man_dir = (*it_dir);
+ TQString man_dir = (*it_dir);
//
// Sections = all sub directories "man*" and "sman*"
//
- DIR *dp = ::opendir( QFile::encodeName( man_dir ) );
+ DIR *dp = ::opendir( TQFile::encodeName( man_dir ) );
if ( !dp )
continue;
struct dirent *ep;
- const QString man = QString("man");
- const QString sman = QString("sman");
+ const TQString man = TQString("man");
+ const TQString sman = TQString("sman");
while ( (ep = ::readdir( dp )) != 0L ) {
- const QString file = QFile::decodeName( ep->d_name );
- QString sect = QString::null;
+ const TQString file = TQFile::decodeName( ep->d_name );
+ TQString sect = TQString::null;
if ( file.startsWith( man ) )
sect = file.mid(3);
@@ -340,8 +340,8 @@ QStringList MANProtocol::findPages(const QString &_section,
::closedir( dp );
if ( *it_sect != star ) { // in that case we only look around for sections
- const QString dir = man_dir + QString("/man") + (it_real) + '/';
- const QString sdir = man_dir + QString("/sman") + (it_real) + '/';
+ const TQString dir = man_dir + TQString("/man") + (it_real) + '/';
+ const TQString sdir = man_dir + TQString("/sman") + (it_real) + '/';
findManPagesInSection(dir, title, full_path, list);
findManPagesInSection(sdir, title, full_path, list);
@@ -354,12 +354,12 @@ QStringList MANProtocol::findPages(const QString &_section,
return list;
}
-void MANProtocol::findManPagesInSection(const QString &dir, const QString &title, bool full_path, QStringList &list)
+void MANProtocol::findManPagesInSection(const TQString &dir, const TQString &title, bool full_path, TQStringList &list)
{
kdDebug() << "findManPagesInSection " << dir << " " << title << endl;
bool title_given = !title.isEmpty();
- DIR *dp = ::opendir( QFile::encodeName( dir ) );
+ DIR *dp = ::opendir( TQFile::encodeName( dir ) );
if ( !dp )
return;
@@ -369,7 +369,7 @@ void MANProtocol::findManPagesInSection(const QString &dir, const QString &title
while ( (ep = ::readdir( dp )) != 0L ) {
if ( ep->d_name[0] != '.' ) {
- QString name = QFile::decodeName( ep->d_name );
+ TQString name = TQFile::decodeName( ep->d_name );
// check title if we're looking for a specific page
if ( title_given ) {
@@ -378,7 +378,7 @@ void MANProtocol::findManPagesInSection(const QString &dir, const QString &title
}
else {
// beginning matches, do a more thorough check...
- QString tmp_name = name;
+ TQString tmp_name = name;
stripExtension( &tmp_name );
if ( tmp_name != title )
continue;
@@ -404,7 +404,7 @@ void MANProtocol::output(const char *insert)
{
m_outputBuffer.close();
data(m_outputBuffer.buffer());
- m_outputBuffer.setBuffer(QByteArray());
+ m_outputBuffer.setBuffer(TQByteArray());
m_outputBuffer.open(IO_WriteOnly);
}
}
@@ -421,9 +421,9 @@ void output_real(const char *insert)
MANProtocol::self()->output(insert);
}
-static QString text2html(const QString& txt)
+static TQString text2html(const TQString& txt)
{
- QString reply = txt;
+ TQString reply = txt;
reply = reply.replace('&', "&amp;");
reply = reply.replace('<', "&lt;");
@@ -437,7 +437,7 @@ void MANProtocol::get(const KURL& url )
{
kdDebug(7107) << "GET " << url.url() << endl;
- QString title, section;
+ TQString title, section;
if (!parseUrl(url.path(), title, section))
{
@@ -458,7 +458,7 @@ void MANProtocol::get(const KURL& url )
// tell the mimetype
mimeType("text/html");
- const QStringList foundPages=findPages(section, title);
+ const TQStringList foundPages=findPages(section, title);
bool pageFound=true;
if (foundPages.isEmpty())
{
@@ -488,7 +488,7 @@ void MANProtocol::get(const KURL& url )
{
setResourcePath(m_htmlPath,m_cssPath);
m_outputBuffer.open(IO_WriteOnly);
- const QCString filename=QFile::encodeName(foundPages[0]);
+ const TQCString filename=TQFile::encodeName(foundPages[0]);
char *buf = readManPage(filename);
if (!buf)
@@ -505,26 +505,26 @@ void MANProtocol::get(const KURL& url )
m_outputBuffer.close();
data(m_outputBuffer.buffer());
- m_outputBuffer.setBuffer(QByteArray());
+ m_outputBuffer.setBuffer(TQByteArray());
// tell we are done
- data(QByteArray());
+ data(TQByteArray());
}
finished();
}
void MANProtocol::slotGetStdOutput(KProcess* /* p */, char *s, int len)
{
- myStdStream += QString::fromLocal8Bit(s, len);
+ myStdStream += TQString::fromLocal8Bit(s, len);
}
void MANProtocol::slotGetStdOutputUtf8(KProcess* /* p */, char *s, int len)
{
- myStdStream += QString::fromUtf8(s, len);
+ myStdStream += TQString::fromUtf8(s, len);
}
char *MANProtocol::readManPage(const char *_filename)
{
- QCString filename = _filename;
+ TQCString filename = _filename;
char *buf = NULL;
@@ -533,21 +533,21 @@ char *MANProtocol::readManPage(const char *_filename)
* /usr/man/sman7fs/pcfs.7fs -> text/x-csrc : WRONG
* If the path name constains the string sman, assume that it's SGML and
* convert it to roff format (used on Solaris). */
- //QString file_mimetype = KMimeType::findByPath(QString(filename), 0, false)->name();
+ //TQString file_mimetype = KMimeType::findByPath(TQString(filename), 0, false)->name();
if (filename.contains("sman", false)) //file_mimetype == "text/html" || )
{
- myStdStream =QString::null;
+ myStdStream =TQString::null;
KProcess proc;
/* Determine path to sgml2roff, if not already done. */
getProgramPath();
proc << mySgml2RoffPath << filename;
- QApplication::connect(&proc, SIGNAL(receivedStdout (KProcess *, char *, int)),
- this, SLOT(slotGetStdOutput(KProcess *, char *, int)));
+ TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
proc.start(KProcess::Block, KProcess::All);
- const QCString cstr=myStdStream.latin1();
+ const TQCString cstr=myStdStream.latin1();
const int len = cstr.size()-1;
buf = new char[len + 4];
qmemmove(buf + 1, cstr.data(), len);
@@ -556,30 +556,30 @@ char *MANProtocol::readManPage(const char *_filename)
}
else
{
- if (QDir::isRelativePath(filename)) {
+ if (TQDir::isRelativePath(filename)) {
kdDebug(7107) << "relative " << filename << endl;
- filename = QDir::cleanDirPath(lastdir + "/" + filename).utf8();
+ filename = TQDir::cleanDirPath(lastdir + "/" + filename).utf8();
if (!KStandardDirs::exists(filename)) { // exists perhaps with suffix
lastdir = filename.left(filename.findRev('/'));
- QDir mandir(lastdir);
+ TQDir mandir(lastdir);
mandir.setNameFilter(filename.mid(filename.findRev('/') + 1) + ".*");
- filename = lastdir + "/" + QFile::encodeName(mandir.entryList().first());
+ filename = lastdir + "/" + TQFile::encodeName(mandir.entryList().first());
}
kdDebug(7107) << "resolved to " << filename << endl;
}
lastdir = filename.left(filename.findRev('/'));
- myStdStream = QString::null;
+ myStdStream = TQString::null;
KProcess proc;
/* TODO: detect availability of 'man --recode' so that this can go
* upstream */
proc << "man" << "--recode" << "UTF-8" << filename;
- QApplication::connect(&proc, SIGNAL(receivedStdout (KProcess *, char *, int)),
- this, SLOT(slotGetStdOutputUtf8(KProcess *, char *, int)));
+ TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutputUtf8(KProcess *, char *, int)));
proc.start(KProcess::Block, KProcess::All);
- const QCString cstr=myStdStream.utf8();
+ const TQCString cstr=myStdStream.utf8();
const int len = cstr.size()-1;
buf = new char[len + 4];
qmemmove(buf + 1, cstr.data(), len);
@@ -590,11 +590,11 @@ char *MANProtocol::readManPage(const char *_filename)
}
-void MANProtocol::outputError(const QString& errmsg)
+void MANProtocol::outputError(const TQString& errmsg)
{
- QByteArray array;
- QTextStream os(array, IO_WriteOnly);
- os.setEncoding(QTextStream::UnicodeUTF8);
+ TQByteArray array;
+ TQTextStream os(array, IO_WriteOnly);
+ os.setEncoding(TQTextStream::UnicodeUTF8);
os << "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Strict//EN\">" << endl;
os << "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" << endl;
@@ -608,11 +608,11 @@ void MANProtocol::outputError(const QString& errmsg)
data(array);
}
-void MANProtocol::outputMatchingPages(const QStringList &matchingPages)
+void MANProtocol::outputMatchingPages(const TQStringList &matchingPages)
{
- QByteArray array;
- QTextStream os(array, IO_WriteOnly);
- os.setEncoding(QTextStream::UnicodeUTF8);
+ TQByteArray array;
+ TQTextStream os(array, IO_WriteOnly);
+ os.setEncoding(TQTextStream::UnicodeUTF8);
os << "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Strict//EN\">" << endl;
os << "<html>\n<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">"<<endl;
@@ -624,7 +624,7 @@ void MANProtocol::outputMatchingPages(const QStringList &matchingPages)
os << "</h1>\n<ul>\n";
int acckey=1;
- for (QStringList::ConstIterator it = matchingPages.begin(); it != matchingPages.end(); ++it)
+ for (TQStringList::ConstIterator it = matchingPages.begin(); it != matchingPages.end(); ++it)
{
os<<"<li><a href='man:"<<(*it)<<"' accesskey='"<< acckey <<"'>"<< *it <<"</a><br>\n<br>\n";
acckey++;
@@ -645,7 +645,7 @@ void MANProtocol::stat( const KURL& url)
{
kdDebug(7107) << "ENTERING STAT " << url.url() << endl;
- QString title, section;
+ TQString title, section;
if (!parseUrl(url.path(), title, section))
{
@@ -670,9 +670,9 @@ void MANProtocol::stat( const KURL& url)
atom.m_uds = UDS_URL;
atom.m_long = 0;
- QString newUrl = "man:"+title;
+ TQString newUrl = "man:"+title;
if (!section.isEmpty())
- newUrl += QString("(%1)").arg(section);
+ newUrl += TQString("(%1)").arg(section);
atom.m_str = newUrl;
entry.append(atom);
@@ -718,7 +718,7 @@ void MANProtocol::mimetype(const KURL & /*url*/)
finished();
}
-static QString sectionName(const QString& section)
+static TQString sectionName(const TQString& section)
{
if (section == "1")
return i18n("User Commands");
@@ -747,20 +747,20 @@ static QString sectionName(const QString& section)
else if (section == "n")
return i18n("New");
- return QString::null;
+ return TQString::null;
}
-QStringList MANProtocol::buildSectionList(const QStringList& dirs) const
+TQStringList MANProtocol::buildSectionList(const TQStringList& dirs) const
{
- QStringList l;
+ TQStringList l;
- for (QStringList::ConstIterator it = section_names.begin();
+ for (TQStringList::ConstIterator it = section_names.begin();
it != section_names.end(); ++it)
{
- for (QStringList::ConstIterator dir = dirs.begin();
+ for (TQStringList::ConstIterator dir = dirs.begin();
dir != dirs.end(); ++dir)
{
- QDir d((*dir)+"/man"+(*it));
+ TQDir d((*dir)+"/man"+(*it));
if (d.exists())
{
l << *it;
@@ -773,9 +773,9 @@ QStringList MANProtocol::buildSectionList(const QStringList& dirs) const
void MANProtocol::showMainIndex()
{
- QByteArray array;
- QTextStream os(array, IO_WriteOnly);
- os.setEncoding(QTextStream::UnicodeUTF8);
+ TQByteArray array;
+ TQTextStream os(array, IO_WriteOnly);
+ os.setEncoding(TQTextStream::UnicodeUTF8);
// print header
os << "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Strict//EN\">" << endl;
@@ -787,16 +787,16 @@ void MANProtocol::showMainIndex()
os << "<body><h1>" << i18n("UNIX Manual Index") << "</h1>" << endl;
// ### TODO: why still the environment variable
- const QString sectList = getenv("MANSECT");
- QStringList sections;
+ const TQString sectList = getenv("MANSECT");
+ TQStringList sections;
if (sectList.isEmpty())
sections = buildSectionList(manDirectories());
else
- sections = QStringList::split(':', sectList);
+ sections = TQStringList::split(':', sectList);
os << "<table>" << endl;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for (it = sections.begin(); it != sections.end(); ++it)
os << "<tr><td><a href=\"man:(" << *it << ")\" accesskey=\"" <<
(((*it).length()==1)?(*it):(*it).right(1))<<"\">" << i18n("Section ")
@@ -811,10 +811,10 @@ void MANProtocol::showMainIndex()
finished();
}
-void MANProtocol::constructPath(QStringList& constr_path, QStringList constr_catmanpath)
+void MANProtocol::constructPath(TQStringList& constr_path, TQStringList constr_catmanpath)
{
- QMap<QString, QString> manpath_map;
- QMap<QString, QString> mandb_map;
+ TQMap<TQString, TQString> manpath_map;
+ TQMap<TQString, TQString> mandb_map;
// Add paths from /etc/man.conf
//
@@ -823,14 +823,14 @@ void MANProtocol::constructPath(QStringList& constr_path, QStringList constr_cat
// Mappings from $PATH to manpath are given by lines starting with
// "MANPATH_MAP"
- QRegExp manpath_regex( "^MANPATH\\s" );
- QRegExp mandatory_regex( "^MANDATORY_MANPATH\\s" );
- QRegExp manpath_map_regex( "^MANPATH_MAP\\s" );
- QRegExp mandb_map_regex( "^MANDB_MAP\\s" );
- //QRegExp section_regex( "^SECTION\\s" );
- QRegExp space_regex( "\\s+" ); // for parsing manpath map
+ TQRegExp manpath_regex( "^MANPATH\\s" );
+ TQRegExp mandatory_regex( "^MANDATORY_MANPATH\\s" );
+ TQRegExp manpath_map_regex( "^MANPATH_MAP\\s" );
+ TQRegExp mandb_map_regex( "^MANDB_MAP\\s" );
+ //TQRegExp section_regex( "^SECTION\\s" );
+ TQRegExp space_regex( "\\s+" ); // for parsing manpath map
- QFile mc("/etc/man.conf"); // Caldera
+ TQFile mc("/etc/man.conf"); // Caldera
if (!mc.exists())
mc.setName("/etc/manpath.config"); // SuSE, Debian
if (!mc.exists())
@@ -838,32 +838,32 @@ void MANProtocol::constructPath(QStringList& constr_path, QStringList constr_cat
if (mc.open(IO_ReadOnly))
{
- QTextStream is(&mc);
- is.setEncoding(QTextStream::Locale);
+ TQTextStream is(&mc);
+ is.setEncoding(TQTextStream::Locale);
while (!is.eof())
{
- const QString line = is.readLine();
+ const TQString line = is.readLine();
if ( manpath_regex.search(line, 0) == 0 )
{
- const QString path = line.mid(8).stripWhiteSpace();
+ const TQString path = line.mid(8).stripWhiteSpace();
constr_path += path;
}
else if ( mandatory_regex.search(line, 0) == 0 )
{
- const QString path = line.mid(18).stripWhiteSpace();
+ const TQString path = line.mid(18).stripWhiteSpace();
constr_path += path;
}
else if ( manpath_map_regex.search(line, 0) == 0 )
{
// The entry is "MANPATH_MAP <path> <manpath>"
- const QStringList mapping =
- QStringList::split(space_regex, line);
+ const TQStringList mapping =
+ TQStringList::split(space_regex, line);
if ( mapping.count() == 3 )
{
- const QString dir = QDir::cleanDirPath( mapping[1] );
- const QString mandir = QDir::cleanDirPath( mapping[2] );
+ const TQString dir = TQDir::cleanDirPath( mapping[1] );
+ const TQString mandir = TQDir::cleanDirPath( mapping[2] );
manpath_map[ dir ] = mandir;
}
@@ -871,13 +871,13 @@ void MANProtocol::constructPath(QStringList& constr_path, QStringList constr_cat
else if ( mandb_map_regex.search(line, 0) == 0 )
{
// The entry is "MANDB_MAP <manpath> <catmanpath>"
- const QStringList mapping =
- QStringList::split(space_regex, line);
+ const TQStringList mapping =
+ TQStringList::split(space_regex, line);
if ( mapping.count() == 3 )
{
- const QString mandir = QDir::cleanDirPath( mapping[1] );
- const QString catmandir = QDir::cleanDirPath( mapping[2] );
+ const TQString mandir = TQDir::cleanDirPath( mapping[1] );
+ const TQString catmandir = TQDir::cleanDirPath( mapping[2] );
mandb_map[ mandir ] = catmandir;
}
@@ -920,8 +920,8 @@ void MANProtocol::constructPath(QStringList& constr_path, QStringList constr_cat
int i = 0;
while (manpaths[i]) {
- if ( constr_path.findIndex( QString( manpaths[i] ) ) == -1 )
- constr_path += QString( manpaths[i] );
+ if ( constr_path.findIndex( TQString( manpaths[i] ) ) == -1 )
+ constr_path += TQString( manpaths[i] );
i++;
}
@@ -931,16 +931,16 @@ void MANProtocol::constructPath(QStringList& constr_path, QStringList constr_cat
// to the man path (the actual existence check is done further down)
if ( ::getenv("PATH") ) {
- const QStringList path =
- QStringList::split( ":",
- QString::fromLocal8Bit( ::getenv("PATH") ) );
+ const TQStringList path =
+ TQStringList::split( ":",
+ TQString::fromLocal8Bit( ::getenv("PATH") ) );
- for ( QStringList::const_iterator it = path.begin();
+ for ( TQStringList::const_iterator it = path.begin();
it != path.end();
++it )
{
- const QString dir = QDir::cleanDirPath( *it );
- QString mandir = manpath_map[ dir ];
+ const TQString dir = TQDir::cleanDirPath( *it );
+ TQString mandir = manpath_map[ dir ];
if ( !mandir.isEmpty() ) {
// a path mapping exists
@@ -950,18 +950,18 @@ void MANProtocol::constructPath(QStringList& constr_path, QStringList constr_cat
else {
// no manpath mapping, use "<path>/man" and "<path>/../man"
- mandir = dir + QString( "/man" );
+ mandir = dir + TQString( "/man" );
if ( constr_path.findIndex( mandir ) == -1 )
constr_path += mandir;
int pos = dir.findRev( '/' );
if ( pos > 0 ) {
- mandir = dir.left( pos ) + QString("/man");
+ mandir = dir.left( pos ) + TQString("/man");
if ( constr_path.findIndex( mandir ) == -1 )
constr_path += mandir;
}
}
- QString catmandir = mandb_map[ mandir ];
+ TQString catmandir = mandb_map[ mandir ];
if ( !mandir.isEmpty() )
{
if ( constr_catmanpath.findIndex( catmandir ) == -1 )
@@ -988,8 +988,8 @@ void MANProtocol::checkManPaths()
inited = true;
- const QString manpath_env = QString::fromLocal8Bit( ::getenv("MANPATH") );
- //QString mansect_env = QString::fromLocal8Bit( ::getenv("MANSECT") );
+ const TQString manpath_env = TQString::fromLocal8Bit( ::getenv("MANPATH") );
+ //TQString mansect_env = TQString::fromLocal8Bit( ::getenv("MANSECT") );
// Decide if $MANPATH is enough on its own or if it should be merged
// with the constructed path.
@@ -1010,10 +1010,10 @@ void MANProtocol::checkManPaths()
// /etc/man.conf
// default dirs
// $PATH
- QStringList constr_path;
- QStringList constr_catmanpath; // catmanpath
+ TQStringList constr_path;
+ TQStringList constr_catmanpath; // catmanpath
- QString conf_section;
+ TQString conf_section;
if ( construct_path )
{
@@ -1029,20 +1029,20 @@ void MANProtocol::checkManPaths()
// satisfied if any empty string in path_list_env (there
// should be 1 or 0) is replaced by the constructed path.
- const QStringList path_list_env = QStringList::split( ':', manpath_env , true );
+ const TQStringList path_list_env = TQStringList::split( ':', manpath_env , true );
- for ( QStringList::const_iterator it = path_list_env.begin();
+ for ( TQStringList::const_iterator it = path_list_env.begin();
it != path_list_env.end();
++it )
{
struct stat sbuf;
- QString dir = (*it);
+ TQString dir = (*it);
if ( !dir.isEmpty() ) {
// Add dir to the man path if it exists
if ( m_manpath.findIndex( dir ) == -1 ) {
- if ( ::stat( QFile::encodeName( dir ), &sbuf ) == 0
+ if ( ::stat( TQFile::encodeName( dir ), &sbuf ) == 0
&& S_ISDIR( sbuf.st_mode ) )
{
m_manpath += dir;
@@ -1053,7 +1053,7 @@ void MANProtocol::checkManPaths()
// Insert constructed path ($MANPATH was empty, or
// there was a ":" at an end or "::")
- for ( QStringList::Iterator it2 = constr_path.begin();
+ for ( TQStringList::Iterator it2 = constr_path.begin();
it2 != constr_path.end();
it2++ )
{
@@ -1061,7 +1061,7 @@ void MANProtocol::checkManPaths()
if ( !dir.isEmpty() ) {
if ( m_manpath.findIndex( dir ) == -1 ) {
- if ( ::stat( QFile::encodeName( dir ), &sbuf ) == 0
+ if ( ::stat( TQFile::encodeName( dir ), &sbuf ) == 0
&& S_ISDIR( sbuf.st_mode ) )
{
m_manpath += dir;
@@ -1074,14 +1074,14 @@ void MANProtocol::checkManPaths()
/* sections are not used
// Sections
- QStringList m_mansect = QStringList::split( ':', mansect_env, true );
+ TQStringList m_mansect = TQStringList::split( ':', mansect_env, true );
const char* default_sect[] =
{ "1", "2", "3", "4", "5", "6", "7", "8", "9", "n", 0L };
for ( int i = 0; default_sect[i] != 0L; i++ )
- if ( m_mansect.findIndex( QString( default_sect[i] ) ) == -1 )
- m_mansect += QString( default_sect[i] );
+ if ( m_mansect.findIndex( TQString( default_sect[i] ) ) == -1 )
+ m_mansect += TQString( default_sect[i] );
*/
}
@@ -1151,14 +1151,14 @@ int compare_man_index(const void *s1, const void *s2)
#warning using heapsort
// Set up my own man page list,
// with a special compare function to sort itself
-typedef QPtrList<struct man_index_t> QManIndexListBase;
-typedef QPtrListIterator<struct man_index_t> QManIndexListIterator;
+typedef TQPtrList<struct man_index_t> QManIndexListBase;
+typedef TQPtrListIterator<struct man_index_t> QManIndexListIterator;
class QManIndexList : public QManIndexListBase
{
public:
private:
- int compareItems( QPtrCollection::Item s1, QPtrCollection::Item s2 )
+ int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 )
{
struct man_index_t *m1 = (struct man_index_t *)s1;
struct man_index_t *m2 = (struct man_index_t *)s2;
@@ -1198,11 +1198,11 @@ private:
-void MANProtocol::showIndex(const QString& section)
+void MANProtocol::showIndex(const TQString& section)
{
- QByteArray array;
- QTextStream os(array, IO_WriteOnly);
- os.setEncoding(QTextStream::UnicodeUTF8);
+ TQByteArray array;
+ TQTextStream os(array, IO_WriteOnly);
+ os.setEncoding(TQTextStream::UnicodeUTF8);
// print header
os << "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Strict//EN\">" << endl;
@@ -1220,9 +1220,9 @@ void MANProtocol::showIndex(const QString& section)
infoMessage(i18n("Generating Index"));
// search for the man pages
- QStringList pages = findPages( section, QString::null );
+ TQStringList pages = findPages( section, TQString::null );
- QMap<QString, QString> indexmap = buildIndexMap(section);
+ TQMap<TQString, TQString> indexmap = buildIndexMap(section);
// print out the list
os << "<table>" << endl;
@@ -1230,12 +1230,12 @@ void MANProtocol::showIndex(const QString& section)
#ifdef _USE_OLD_CODE
pages.sort();
- QMap<QString, QString> pagemap;
+ TQMap<TQString, TQString> pagemap;
- QStringList::ConstIterator page;
+ TQStringList::ConstIterator page;
for (page = pages.begin(); page != pages.end(); ++page)
{
- QString fileName = *page;
+ TQString fileName = *page;
stripExtension( &fileName );
@@ -1248,7 +1248,7 @@ void MANProtocol::showIndex(const QString& section)
}
- for (QMap<QString,QString>::ConstIterator it = pagemap.begin();
+ for (TQMap<TQString,TQString>::ConstIterator it = pagemap.begin();
it != pagemap.end(); ++it)
{
os << "<tr><td><a href=\"man:" << it.data() << "\">\n"
@@ -1272,7 +1272,7 @@ void MANProtocol::showIndex(const QString& section)
#endif /* _USE_QSORT */
- QStringList::const_iterator page;
+ TQStringList::const_iterator page;
for (page = pages.begin(); page != pages.end(); ++page)
{
// I look for the beginning of the man page name
@@ -1366,13 +1366,13 @@ void MANProtocol::showIndex(const QString& section)
// sort and print
qsort(indexlist, listlen, sizeof(struct man_index_t *), compare_man_index);
- QChar firstchar, tmp;
- QString indexLine="<div class=\"secidxshort\">\n";
+ TQChar firstchar, tmp;
+ TQString indexLine="<div class=\"secidxshort\">\n";
if (indexlist[0]->manpage_len>0)
{
- firstchar=QChar((indexlist[0]->manpage_begin)[0]).lower();
+ firstchar=TQChar((indexlist[0]->manpage_begin)[0]).lower();
- const QString appendixstr = QString(
+ const TQString appendixstr = TQString(
" [<a href=\"#%1\" accesskey=\"%2\">%3</a>]\n"
).arg(firstchar).arg(firstchar).arg(firstchar);
indexLine.append(appendixstr);
@@ -1397,14 +1397,14 @@ void MANProtocol::showIndex(const QString& section)
continue;
}
- tmp=QChar((manindex->manpage_begin)[0]).lower();
+ tmp=TQChar((manindex->manpage_begin)[0]).lower();
if (firstchar != tmp)
{
firstchar = tmp;
os << "<tr><td class=\"secidxnextletter\"" << " colspan=\"3\">\n <a name=\""
<< firstchar << "\">" << firstchar << "</a>\n</td></tr>" << endl;
- const QString appendixstr = QString(
+ const TQString appendixstr = TQString(
" [<a href=\"#%1\" accesskey=\"%2\">%3</a>]\n"
).arg(firstchar).arg(firstchar).arg(firstchar);
indexLine.append(appendixstr);
@@ -1471,7 +1471,7 @@ void MANProtocol::showIndex(const QString& section)
// print footer
os << "</body></html>" << endl;
- infoMessage(QString::null);
+ infoMessage(TQString::null);
mimeType("text/html");
data(array);
finished();
@@ -1481,15 +1481,15 @@ void MANProtocol::listDir(const KURL &url)
{
kdDebug( 7107 ) << "ENTER listDir: " << url.prettyURL() << endl;
- QString title;
- QString section;
+ TQString title;
+ TQString section;
if ( !parseUrl(url.path(), title, section) ) {
error( KIO::ERR_MALFORMED_URL, url.url() );
return;
}
- QStringList list = findPages( section, QString::null, false );
+ TQStringList list = findPages( section, TQString::null, false );
UDSEntryList uds_entry_list;
UDSEntry uds_entry;
@@ -1498,8 +1498,8 @@ void MANProtocol::listDir(const KURL &url)
uds_atom.m_uds = KIO::UDS_NAME; // we only do names...
uds_entry.append( uds_atom );
- QStringList::Iterator it = list.begin();
- QStringList::Iterator end = list.end();
+ TQStringList::Iterator it = list.begin();
+ TQStringList::Iterator end = list.end();
for ( ; it != end; ++it ) {
stripExtension( &(*it) );
@@ -1522,7 +1522,7 @@ void MANProtocol::getProgramPath()
return;
/* sgml2roff isn't found in PATH. Check some possible locations where it may be found. */
- mySgml2RoffPath = KGlobal::dirs()->findExe("sgml2roff", QString(SGML2ROFF_DIRS));
+ mySgml2RoffPath = KGlobal::dirs()->findExe("sgml2roff", TQString(SGML2ROFF_DIRS));
if (!mySgml2RoffPath.isEmpty())
return;
diff --git a/kioslave/man/kio_man.h b/kioslave/man/kio_man.h
index d1d924ce0..617245f80 100644
--- a/kioslave/man/kio_man.h
+++ b/kioslave/man/kio_man.h
@@ -21,24 +21,24 @@
#define __kio_man_h__
-#include <qstring.h>
-#include <qcstring.h>
-#include <qstringlist.h>
-#include <qdict.h>
-#include <qbuffer.h>
+#include <tqstring.h>
+#include <tqcstring.h>
+#include <tqstringlist.h>
+#include <tqdict.h>
+#include <tqbuffer.h>
#include <kio/global.h>
#include <kio/slavebase.h>
-class MANProtocol : public QObject, public KIO::SlaveBase
+class MANProtocol : public TQObject, public KIO::SlaveBase
{
Q_OBJECT
public:
- MANProtocol(const QCString &pool_socket, const QCString &app_socket);
+ MANProtocol(const TQCString &pool_socket, const TQCString &app_socket);
virtual ~MANProtocol();
virtual void get(const KURL& url);
@@ -47,11 +47,11 @@ public:
virtual void mimetype(const KURL &url);
virtual void listDir(const KURL &url);
- void outputError(const QString& errmsg);
- void outputMatchingPages(const QStringList &matchingPages);
+ void outputError(const TQString& errmsg);
+ void outputMatchingPages(const TQStringList &matchingPages);
void showMainIndex();
- void showIndex(const QString& section);
+ void showIndex(const TQString& section);
// the following two functions are the interface to man2html
void output(const char *insert);
@@ -65,35 +65,35 @@ private slots:
private:
void checkManPaths();
- QStringList manDirectories();
- QMap<QString, QString> buildIndexMap(const QString& section);
- bool addWhatIs(QMap<QString, QString>& i, const QString& f, const QString& mark);
- void parseWhatIs( QMap<QString, QString> &i, QTextStream &t, const QString &mark );
- QStringList findPages(const QString& section,
- const QString &title,
+ TQStringList manDirectories();
+ TQMap<TQString, TQString> buildIndexMap(const TQString& section);
+ bool addWhatIs(TQMap<TQString, TQString>& i, const TQString& f, const TQString& mark);
+ void parseWhatIs( TQMap<TQString, TQString> &i, TQTextStream &t, const TQString &mark );
+ TQStringList findPages(const TQString& section,
+ const TQString &title,
bool full_path = true);
void addToBuffer(const char *buffer, int buflen);
- QString pageName(const QString& page) const;
- QStringList buildSectionList(const QStringList& dirs) const;
- void constructPath(QStringList& constr_path, QStringList constr_catmanpath);
+ TQString pageName(const TQString& page) const;
+ TQStringList buildSectionList(const TQStringList& dirs) const;
+ void constructPath(TQStringList& constr_path, TQStringList constr_catmanpath);
private:
static MANProtocol *_self;
- QCString lastdir;
+ TQCString lastdir;
- void findManPagesInSection(const QString &dir, const QString &title, bool full_path, QStringList &list);
- QStringList m_manpath; ///< Path of man directories
- QStringList m_mandbpath; ///< Path of catman directories
- QStringList section_names;
+ void findManPagesInSection(const TQString &dir, const TQString &title, bool full_path, TQStringList &list);
+ TQStringList m_manpath; ///< Path of man directories
+ TQStringList m_mandbpath; ///< Path of catman directories
+ TQStringList section_names;
- QString myStdStream;
- QString mySgml2RoffPath;
+ TQString myStdStream;
+ TQString mySgml2RoffPath;
void getProgramPath();
- QCString m_htmlPath; ///< Path to KDE resources, encoded for HTML
- QCString m_cssPath; ///< Path to KDE resources, encoded for CSS
- QBuffer m_outputBuffer; ///< Buffer for the output
- QString m_manCSSFile; ///< Path to kio_man.css
+ TQCString m_htmlPath; ///< Path to KDE resources, encoded for HTML
+ TQCString m_cssPath; ///< Path to KDE resources, encoded for CSS
+ TQBuffer m_outputBuffer; ///< Buffer for the output
+ TQString m_manCSSFile; ///< Path to kio_man.css
};
diff --git a/kioslave/man/kio_man_test.cpp b/kioslave/man/kio_man_test.cpp
index bfb78a652..44623cb9f 100644
--- a/kioslave/man/kio_man_test.cpp
+++ b/kioslave/man/kio_man_test.cpp
@@ -1,6 +1,6 @@
-#include <qobject.h>
+#include <tqobject.h>
#include "kio_man.h"
@@ -14,7 +14,7 @@ class kio_man_test : public MANProtocol
Q_OBJECT
public:
- kio_man_test(const QCString &pool_socket, const QCString &app_socket);
+ kio_man_test(const TQCString &pool_socket, const TQCString &app_socket);
protected:
virtual void data(int);
diff --git a/kioslave/man/kmanpart.cpp b/kioslave/man/kmanpart.cpp
index 307a8c6b2..b52085596 100644
--- a/kioslave/man/kmanpart.cpp
+++ b/kioslave/man/kmanpart.cpp
@@ -18,7 +18,7 @@
*/
#include "kmanpart.h"
-#include <qstring.h>
+#include <tqstring.h>
#include <kinstance.h>
#include <kglobal.h>
@@ -39,7 +39,7 @@ extern "C"
KInstance* KManPartFactory::s_instance = 0L;
KAboutData* KManPartFactory::s_about = 0L;
-KManPartFactory::KManPartFactory( QObject* parent, const char* name )
+KManPartFactory::KManPartFactory( TQObject* parent, const char* name )
: KParts::Factory( parent, name )
{}
@@ -50,8 +50,8 @@ KManPartFactory::~KManPartFactory()
delete s_about;
}
-KParts::Part* KManPartFactory::createPartObject( QWidget * parentWidget, const char* /*widgetName*/, QObject *,
- const char* name, const char* /*className*/,const QStringList & )
+KParts::Part* KManPartFactory::createPartObject( TQWidget * parentWidget, const char* /*widgetName*/, TQObject *,
+ const char* name, const char* /*className*/,const TQStringList & )
{
KManPart* part = new KManPart(parentWidget, name );
return part;
@@ -69,7 +69,7 @@ KInstance* KManPartFactory::instance()
}
-KManPart::KManPart( QWidget * parent, const char * name )
+KManPart::KManPart( TQWidget * parent, const char * name )
: KHTMLPart( parent, name )
,m_job(0)
{
@@ -95,12 +95,12 @@ bool KManPart::openFile()
url.setPath( m_file );
m_job = KIO::get( url, true, false );
- connect( m_job, SIGNAL( data( KIO::Job *, const QByteArray &) ), SLOT( readData( KIO::Job *, const QByteArray &) ) );
- connect( m_job, SIGNAL( result( KIO::Job * ) ), SLOT( jobDone( KIO::Job * ) ) );
+ connect( m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( KIO::Job *, const TQByteArray &) ) );
+ connect( m_job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( jobDone( KIO::Job * ) ) );
return true;
}
-void KManPart::readData(KIO::Job * , const QByteArray & data)
+void KManPart::readData(KIO::Job * , const TQByteArray & data)
{
write(data,data.size());
}
diff --git a/kioslave/man/kmanpart.h b/kioslave/man/kmanpart.h
index f68b68784..f2d9e3891 100644
--- a/kioslave/man/kmanpart.h
+++ b/kioslave/man/kmanpart.h
@@ -28,7 +28,7 @@
#include <kio/job.h>
#include <kio/jobclasses.h>
-#include <qcstring.h>
+#include <tqcstring.h>
class KInstance;
class KAboutData;
@@ -41,12 +41,12 @@ class KManPartFactory: public KParts::Factory
{
Q_OBJECT
public:
- KManPartFactory( QObject * parent = 0, const char * name = 0 );
+ KManPartFactory( TQObject * parent = 0, const char * name = 0 );
virtual ~KManPartFactory();
- virtual KParts::Part* createPartObject( QWidget * parentWidget, const char * widgetName ,
- QObject* parent, const char* name, const char * classname,
- const QStringList &args);
+ virtual KParts::Part* createPartObject( TQWidget * parentWidget, const char * widgetName ,
+ TQObject* parent, const char* name, const char * classname,
+ const TQStringList &args);
static KInstance * instance();
@@ -60,13 +60,13 @@ class KManPart : public KHTMLPart
{
Q_OBJECT
public:
- KManPart( QWidget * parent, const char * name = 0L );
+ KManPart( TQWidget * parent, const char * name = 0L );
KParts::BrowserExtension * extension() {return m_extension;}
public slots:
virtual bool openURL( const KURL &url );
protected slots:
- void readData(KIO::Job * , const QByteArray & data);
+ void readData(KIO::Job * , const TQByteArray & data);
void jobDone( KIO::Job *);
protected:
virtual bool openFile();
diff --git a/kioslave/man/man2html.cpp b/kioslave/man/man2html.cpp
index b502e8edc..089ba239b 100644
--- a/kioslave/man/man2html.cpp
+++ b/kioslave/man/man2html.cpp
@@ -130,11 +130,11 @@
#include <stdio.h>
-#include <qvaluestack.h>
-#include <qstring.h>
-#include <qptrlist.h>
-#include <qmap.h>
-#include <qdatetime.h>
+#include <tqvaluestack.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
+#include <tqmap.h>
+#include <tqdatetime.h>
#ifdef SIMPLE_MAN2HTML
# include <stdlib.h>
@@ -144,7 +144,7 @@
# define kdDebug(x) cerr
# define kdWarning(x) cerr << "WARNING "
#else
-# include <qtextcodec.h>
+# include <tqtextcodec.h>
# include <kdebug.h>
# include <kdeversion.h>
#endif
@@ -233,7 +233,7 @@ public:
StringDefinition( int len, const char* cstr ) : m_length( len ), m_output( cstr ) {}
public:
int m_length; ///< Length of output text
- QCString m_output; ///< Defined string
+ TQCString m_output; ///< Defined string
};
/**
@@ -255,19 +255,19 @@ class NumberDefinition
/**
* Map of character definitions
*/
-static QMap<QCString,StringDefinition> s_characterDefinitionMap;
+static TQMap<TQCString,StringDefinition> s_characterDefinitionMap;
/**
* Map of string variable and macro definitions
* \note String variables and macros are the same thing!
*/
-static QMap<QCString,StringDefinition> s_stringDefinitionMap;
+static TQMap<TQCString,StringDefinition> s_stringDefinitionMap;
/**
* Map of number registers
* \note Intern number registers (starting with a dot are not handled here)
*/
-static QMap<QCString,NumberDefinition> s_numberDefinitionMap;
+static TQMap<TQCString,NumberDefinition> s_numberDefinitionMap;
static void fill_old_character_definitions( void );
@@ -319,7 +319,7 @@ static void InitStringDefinitions( void )
// \*S "Change to default font size"
#ifndef SIMPLE_MAN2HTML
// Special KDE KIO man:
- const QCString kdeversion(KDE_VERSION_STRING);
+ const TQCString kdeversion(KDE_VERSION_STRING);
s_stringDefinitionMap.insert( ".KDE_VERSION_STRING", StringDefinition( kdeversion.length(), kdeversion ) );
#endif
}
@@ -332,7 +332,7 @@ static void InitNumberDefinitions( void )
{
// As the date number registers are more for end-users, better choose local time.
// Groff seems to support Gregorian dates only
- QDate today( QDate::currentDate( Qt::LocalTime ) );
+ TQDate today( TQDate::currentDate( Qt::LocalTime ) );
s_numberDefinitionMap.insert( "year", today.year() ); // Y2K-correct year
s_numberDefinitionMap.insert( "yr", today.year() - 1900 ); // Y2K-incorrect year
s_numberDefinitionMap.insert( "mo", today.month() );
@@ -639,13 +639,13 @@ static int curpos=0;
static char *scan_troff(char *c, bool san, char **result);
static char *scan_troff_mandoc(char *c, bool san, char **result);
-static QValueList<char*> s_argumentList;
+static TQValueList<char*> s_argumentList;
-static QCString htmlPath, cssPath;
+static TQCString htmlPath, cssPath;
-static QCString s_dollarZero; // Value of $0
+static TQCString s_dollarZero; // Value of $0
-void setResourcePath(const QCString& _htmlPath, const QCString& _cssPath)
+void setResourcePath(const TQCString& _htmlPath, const TQCString& _cssPath)
{
htmlPath=_htmlPath;
cssPath=_cssPath;
@@ -657,7 +657,7 @@ static void fill_old_character_definitions( void )
{
const int nr = standardchar[i].nr;
const char temp[3] = { nr / 256, nr % 256, 0 };
- QCString name( temp );
+ TQCString name( temp );
s_characterDefinitionMap.insert( name, StringDefinition( standardchar[i].slen, standardchar[i].st ) );
}
}
@@ -733,11 +733,11 @@ static void add_links(char *c)
if (g!=c) {
- QCString dir;
- QCString file(g, h - g + 1);
+ TQCString dir;
+ TQCString file(g, h - g + 1);
file = file.stripWhiteSpace();
for (int index = 0; includedirs[index]; index++) {
- QCString str = QCString(includedirs[index]) + "/" + file;
+ TQCString str = TQCString(includedirs[index]) + "/" + file;
if (!access(str, R_OK)) {
dir = includedirs[index];
break;
@@ -751,7 +751,7 @@ static void add_links(char *c)
output_real(c);
*g=t;*h=0;
- QCString str;
+ TQCString str;
str.sprintf("<A HREF=\"file:%s/%s\">%s</A>&gt;", dir.data(), file.data(), file.data());
output_real(str.data());
c=f+6;
@@ -817,8 +817,8 @@ static void add_links(char *c)
}
if (isalnum(*h)) {
char t,sec, *e;
- QString subsec; // ### TODO avoid using QString, as we do not know the encoding
- QString fstr(f); // ### TODO avoid using QString, as we do not know the encoding
+ TQString subsec; // ### TODO avoid using TQString, as we do not know the encoding
+ TQString fstr(f); // ### TODO avoid using TQString, as we do not know the encoding
e=h+1;
sec=f[1];
subsec=f[2];
@@ -836,7 +836,7 @@ static void add_links(char *c)
*h=t;
t=*e;
*e='\0';
- QCString str;
+ TQCString str;
if (subsec.isEmpty())
str.sprintf("<A HREF=\"man:%s(%c)\">%s</A>", h, sec, h);
else
@@ -863,7 +863,7 @@ static void add_links(char *c)
t=*f; *f='\0';
output_real(c);
*f=t; t=*g;*g='\0';
- QCString str;
+ TQCString str;
str.sprintf("<A HREF=\"%s://%s\">%s</A>", ((j==3)?"ftp":"http"), f, f);
output_real(str.data());
*g=t;
@@ -895,7 +895,7 @@ static void add_links(char *c)
*g='\0';
output_real(c);
*g=t;t=*h;*h='\0';
- QCString str;
+ TQCString str;
str.sprintf("<A HREF=\"mailto:%s\">%s</A>", g, g);
output_real(str.data());
*h=t;
@@ -920,7 +920,7 @@ static void add_links(char *c)
*g='\0';
output_real(c);
*g=t; t=*h; *h='\0';
- QCString str;
+ TQCString str;
str.sprintf("<A HREF=\"%s\">%s</A>", g, g);
output_real(str.data());
*h=t;
@@ -947,7 +947,7 @@ static void add_links(char *c)
output_real(c);
}
-static QCString current_font;
+static TQCString current_font;
static int current_size=0;
static int fillout=1;
@@ -1007,10 +1007,10 @@ static void out_html(const char *c)
delete [] c3;
}
-static QCString set_font( const QCString& name )
+static TQCString set_font( const TQCString& name )
{
// Every font but R (Regular) creates <span> elements
- QCString markup;
+ TQCString markup;
if ( current_font != "R" && !current_font.isEmpty() )
markup += "</span>";
const uint len = name.length();
@@ -1075,18 +1075,18 @@ static QCString set_font( const QCString& name )
}
/// \deprecated
-static QCString set_font( const char ch )
+static TQCString set_font( const char ch )
#ifndef SIMPLE_MAN2HTML
KDE_DEPRECATED;
-static QCString set_font( const char ch )
+static TQCString set_font( const char ch )
#endif
{
- const QCString name = &ch;
+ const TQCString name = &ch;
return set_font( name );
}
-static QCString change_to_size(int nr)
+static TQCString change_to_size(int nr)
{
switch (nr)
{
@@ -1097,8 +1097,8 @@ static QCString change_to_size(int nr)
}
if ( nr == current_size )
return "";
- const QCString font ( current_font );
- QCString markup;
+ const TQCString font ( current_font );
+ TQCString markup;
markup = set_font("R");
if (current_size)
markup += "</FONT>";
@@ -1128,21 +1128,21 @@ static int intresult=0;
static bool skip_escape=false;
static bool single_escape=false;
-static char *scan_escape_direct( char *c, QCString& cstr );
+static char *scan_escape_direct( char *c, TQCString& cstr );
/**
* scan a named character
* param c position
*/
-static QCString scan_named_character( char*& c )
+static TQCString scan_named_character( char*& c )
{
- QCString name;
+ TQCString name;
if ( *c == '(' )
{
// \*(ab Name of two characters
if ( c[1] == escapesym )
{
- QCString cstr;
+ TQCString cstr;
c = scan_escape_direct( c+2, cstr );
// ### HACK: as we convert characters too early to HTML, we need to support more than 2 characters here and assume that all characters passed by the variable are to be used.
name = cstr;
@@ -1164,7 +1164,7 @@ static QCString scan_named_character( char*& c )
{
if ( *c == escapesym )
{
- QCString cstr;
+ TQCString cstr;
c = scan_escape_direct( c+1, cstr );
const int result = cstr.find(']');
if ( result == -1 )
@@ -1196,7 +1196,7 @@ static QCString scan_named_character( char*& c )
{
if ( *c == escapesym )
{
- QCString cstr;
+ TQCString cstr;
c = scan_escape_direct( c+1, cstr );
const int result = cstr.find('\'');
if ( result == -1 )
@@ -1223,7 +1223,7 @@ static QCString scan_named_character( char*& c )
// Note: characters with a one character length name doe not exist, as they would collide with other escapes
// Now we have the name, let us find it between the string names
- QMap<QCString,StringDefinition>::iterator it=s_characterDefinitionMap.find(name);
+ TQMap<TQCString,StringDefinition>::iterator it=s_characterDefinitionMap.find(name);
if (it==s_characterDefinitionMap.end())
{
kdDebug(7107) << "EXCEPTION: cannot find character with name: " << name << endl;
@@ -1237,15 +1237,15 @@ static QCString scan_named_character( char*& c )
}
}
-static QCString scan_named_string(char*& c)
+static TQCString scan_named_string(char*& c)
{
- QCString name;
+ TQCString name;
if ( *c == '(' )
{
// \*(ab Name of two characters
if ( c[1] == escapesym )
{
- QCString cstr;
+ TQCString cstr;
c = scan_escape_direct( c+2, cstr );
kdDebug(7107) << "\\(" << cstr << endl;
// ### HACK: as we convert characters too early to HTML, we need to support more than 2 characters here and assume that all characters passed by the variable are to be used.
@@ -1268,7 +1268,7 @@ static QCString scan_named_string(char*& c)
{
if ( *c == escapesym )
{
- QCString cstr;
+ TQCString cstr;
c = scan_escape_direct( c+1, cstr );
const int result = cstr.find(']');
if ( result == -1 )
@@ -1299,7 +1299,7 @@ static QCString scan_named_string(char*& c)
c++;
}
// Now we have the name, let us find it between the string names
- QMap<QCString,StringDefinition>::iterator it=s_stringDefinitionMap.find(name);
+ TQMap<TQCString,StringDefinition>::iterator it=s_stringDefinitionMap.find(name);
if (it==s_stringDefinitionMap.end())
{
kdDebug(7107) << "EXCEPTION: cannot find string with name: " << name << endl;
@@ -1313,7 +1313,7 @@ static QCString scan_named_string(char*& c)
}
}
-static QCString scan_dollar_parameter(char*& c)
+static TQCString scan_dollar_parameter(char*& c)
{
unsigned int argno = 0; // No dollar argument number yet!
if ( *c == '0' )
@@ -1367,8 +1367,8 @@ static QCString scan_dollar_parameter(char*& c)
else if ( ( *c == '*' ) || ( *c == '@' ) )
{
const bool quote = ( *c == '@' );
- QValueList<char*>::const_iterator it = s_argumentList.begin();
- QCString param;
+ TQValueList<char*>::const_iterator it = s_argumentList.begin();
+ TQCString param;
bool space = false;
for ( ; it != s_argumentList.end(); ++it )
{
@@ -1406,7 +1406,7 @@ static QCString scan_dollar_parameter(char*& c)
}
/// return the value of read-only number registers
-static int read_only_number_register( const QCString& name )
+static int read_only_number_register( const TQCString& name )
{
// Internal read-only variables
if ( name == ".$" )
@@ -1459,7 +1459,7 @@ static int scan_number_register( char*& c)
case '-': sign = -1; c++; break;
default: break;
}
- QCString name;
+ TQCString name;
if ( *c == '[' )
{
c++;
@@ -1514,7 +1514,7 @@ static int scan_number_register( char*& c)
}
else
{
- QMap< QCString, NumberDefinition >::iterator it = s_numberDefinitionMap.find( name );
+ TQMap< TQCString, NumberDefinition >::iterator it = s_numberDefinitionMap.find( name );
if ( it == s_numberDefinitionMap.end() )
{
return 0; // Undefined variable
@@ -1528,15 +1528,15 @@ static int scan_number_register( char*& c)
}
/// get and set font
-static QCString scan_named_font( char*& c )
+static TQCString scan_named_font( char*& c )
{
- QCString name;
+ TQCString name;
if ( *c == '(' )
{
// \f(ab Name of two characters
if ( c[1] == escapesym )
{
- QCString cstr;
+ TQCString cstr;
c = scan_escape_direct( c+2, cstr );
kdDebug(7107) << "\\(" << cstr << endl;
// ### HACK: as we convert characters too early to HTML, we need to support more than 2 characters here and assume that all characters passed by the variable are to be used.
@@ -1558,7 +1558,7 @@ static QCString scan_named_font( char*& c )
{
if ( *c == escapesym )
{
- QCString cstr;
+ TQCString cstr;
c = scan_escape_direct( c+1, cstr );
const int result = cstr.find(']');
if ( result == -1 )
@@ -1617,9 +1617,9 @@ static QCString scan_named_font( char*& c )
return "";
}
-static QCString scan_number_code( char*& c )
+static TQCString scan_number_code( char*& c )
{
- QCString number;
+ TQCString number;
if ( *c != '\'' )
return "";
while ( *c && ( *c != '\n' ) && ( *c != '\'' ) )
@@ -1647,7 +1647,7 @@ static QCString scan_number_code( char*& c )
// ### TODO known missing escapes from groff(7):
// ### TODO \& \! \) \: \R
-static char *scan_escape_direct( char *c, QCString& cstr )
+static char *scan_escape_direct( char *c, TQCString& cstr )
{
bool exoutputp;
bool exskipescape;
@@ -1682,7 +1682,7 @@ static char *scan_escape_direct( char *c, QCString& cstr )
c--;
}
else
- cstr = QCString( c, 1 );
+ cstr = TQCString( c, 1 );
break;
}
case 'k': c++; if (*c=='(') c+=2; // ### FIXME \k[REG] exists too
@@ -1807,7 +1807,7 @@ static char *scan_escape_direct( char *c, QCString& cstr )
if (*++c) c++; // c += 2
if (sscanf(c, "%d", &i) != 1) // (### FIXME ugly!)
break;
- QCString temp;
+ TQCString temp;
temp.sprintf( "%d", i ); // Skip over number (### FIXME ugly!)
c += temp.length();
switch(i) {
@@ -1831,7 +1831,7 @@ static char *scan_escape_direct( char *c, QCString& cstr )
static char *scan_escape(char *c)
{
- QCString cstr;
+ TQCString cstr;
char* result = scan_escape_direct( c, cstr );
if ( !skip_escape )
out_html(cstr);
@@ -1916,7 +1916,7 @@ public:
TABLEROW *prev, *next;
private:
- QPtrList<TABLEITEM> items;
+ TQPtrList<TABLEITEM> items;
};
TABLEITEM::TABLEITEM(TABLEROW *row) : contents(0), _parent(row) {
@@ -1927,7 +1927,7 @@ TABLEITEM::TABLEITEM(TABLEROW *row) : contents(0), _parent(row) {
TABLEROW *TABLEROW::copyLayout() const {
TABLEROW *newrow = new TABLEROW();
- QPtrListIterator<TABLEITEM> it(items);
+ TQPtrListIterator<TABLEITEM> it(items);
for ( ; it.current(); ++it) {
TABLEITEM *newitem = new TABLEITEM(newrow);
newitem->copyLayout(it.current());
@@ -2063,7 +2063,7 @@ static char *scan_table(char *c)
char *g;
int center=0, expand=0, box=0, border=0, linesize=1;
int i,j,maxcol=0, finished=0;
- QCString oldfont;
+ TQCString oldfont;
int oldsize,oldfillout;
char itemsep='\t';
TABLEROW *layout=NULL, *currow;
@@ -2775,8 +2775,8 @@ static void request_while( char*& c, int j, bool mdoc )
char* newline = skip_till_newline( c );
const char oldchar = *newline;
*newline = 0;
- // We store the full .while stuff into a QCString as if it would be a macro
- const QCString macro = c ;
+ // We store the full .while stuff into a TQCString as if it would be a macro
+ const TQCString macro = c ;
kdDebug(7107) << "'Macro' of .while" << endl << macro << endl;
// Prepare for continuing after .while loop end
*newline = oldchar;
@@ -3039,7 +3039,7 @@ static int get_request(char *req, int len)
// &%(#@ c programs !!!
//static int ifelseval=0;
// If/else can be nested!
-static QValueStack<int> s_ifelseval;
+static TQValueStack<int> s_ifelseval;
// Process a (mdoc) request involving quotes
static char* process_quote(char* c, int j, const char* open, const char* close)
@@ -3088,7 +3088,7 @@ static bool is_identifier_char( const char c )
return false;
}
-static QCString scan_identifier( char*& c )
+static TQCString scan_identifier( char*& c )
{
char* h = c; // help pointer
// ### TODO Groff seems to eat nearly everything as identifier name (info:/groff/Identifiers)
@@ -3096,7 +3096,7 @@ static QCString scan_identifier( char*& c )
++h;
const char tempchar = *h;
*h = 0;
- const QCString name = c;
+ const TQCString name = c;
*h = tempchar;
if ( name.isEmpty() )
{
@@ -3140,7 +3140,7 @@ static char *scan_request(char *c)
else
{
int nlen = 0;
- QCString macroName;
+ TQCString macroName;
while (c[nlen] && (c[nlen] != ' ') && (c[nlen] != '\t') && (c[nlen] != '\n') && (c[nlen] != escapesym))
{
macroName+=c[nlen];
@@ -3149,11 +3149,11 @@ static char *scan_request(char *c)
int j = nlen;
while (c[j] && c[j]==' ' || c[j]=='\t') j++;
/* search macro database of self-defined macros */
- QMap<QCString,StringDefinition>::iterator it=s_stringDefinitionMap.find(macroName);
+ TQMap<TQCString,StringDefinition>::iterator it=s_stringDefinitionMap.find(macroName);
if (it!=s_stringDefinitionMap.end())
{
kdDebug(7107) << "CALLING MACRO: " << macroName << endl;
- const QCString oldDollarZero = s_dollarZero; // Previous value of $0
+ const TQCString oldDollarZero = s_dollarZero; // Previous value of $0
s_dollarZero = macroName;
sl=fill_words(c+j, wordlist, &words, true, &c);
*sl='\0';
@@ -3176,7 +3176,7 @@ static char *scan_request(char *c)
char* work = new char [length+2];
work[0] = '\n'; // The macro must start after an end of line to allow a request on first line
qstrncpy(work+1,(*it).m_output.data(),length+1);
- const QValueList<char*> oldArgumentList( s_argumentList );
+ const TQValueList<char*> oldArgumentList( s_argumentList );
s_argumentList.clear();
for ( i = 0 ; i < max_wordlist; i++ )
{
@@ -3233,7 +3233,7 @@ static char *scan_request(char *c)
++c;
break;
}
- const QCString name ( scan_identifier( c ) );
+ const TQCString name ( scan_identifier( c ) );
while (*c && *c!='\n') c++;
c++;
h=c;
@@ -3241,7 +3241,7 @@ static char *scan_request(char *c)
*c='\0';
char* result=0;
scan_troff(h,0,&result);
- QMap<QCString,StringDefinition>::iterator it=s_stringDefinitionMap.find(name);
+ TQMap<TQCString,StringDefinition>::iterator it=s_stringDefinitionMap.find(name);
if (it==s_stringDefinitionMap.end())
{
StringDefinition def;
@@ -3267,7 +3267,7 @@ static char *scan_request(char *c)
kdDebug(7107) << "start .ds/.as" << endl;
int oldcurpos=curpos;
c+=j;
- const QCString name( scan_identifier( c) );
+ const TQCString name( scan_identifier( c) );
if ( name.isEmpty() )
break;
while (*c && isspace(*c)) c++;
@@ -3276,7 +3276,7 @@ static char *scan_request(char *c)
curpos=0;
char* result=0;
c=scan_troff(c,1,&result);
- QMap<QCString,StringDefinition>::iterator it=s_stringDefinitionMap.find(name);
+ TQMap<TQCString,StringDefinition>::iterator it=s_stringDefinitionMap.find(name);
if (it==s_stringDefinitionMap.end())
{
StringDefinition def;
@@ -3424,7 +3424,7 @@ static char *scan_request(char *c)
h = skip_till_newline( c );
const char oldChar = *h;
*h = 0;
- const QCString name = c;
+ const TQCString name = c;
// ### TODO: name might contain a variable
if ( name.isEmpty() )
out_html( set_font( "P" ) ); // Previous font
@@ -4075,7 +4075,7 @@ static char *scan_request(char *c)
#else
// kio_man transforms from local to UTF-8
out_html("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=");
- out_html(QTextCodec::codecForLocale()->mimeName());
+ out_html(TQTextCodec::codecForLocale()->mimeName());
out_html("\">\n");
#endif
out_html("<TITLE>");
@@ -4163,13 +4163,13 @@ static char *scan_request(char *c)
{
kdDebug(7107) << "start .rm/.rn" << endl;
c+=j;
- const QCString name( scan_identifier( c ) );
+ const TQCString name( scan_identifier( c ) );
if ( name.isEmpty() )
{
kdDebug(7107) << "EXCEPTION: empty origin string to remove/rename: " << endl;
break;
}
- QCString name2;
+ TQCString name2;
if ( !mode )
{
while (*c && isspace(*c) && *c!='\n') ++c;
@@ -4181,7 +4181,7 @@ static char *scan_request(char *c)
}
}
c=skip_till_newline(c);
- QMap<QCString,StringDefinition>::iterator it=s_stringDefinitionMap.find(name);
+ TQMap<TQCString,StringDefinition>::iterator it=s_stringDefinitionMap.find(name);
if (it==s_stringDefinitionMap.end())
{
kdDebug(7107) << "EXCEPTION: cannot find string to rename or remove: " << name << endl;
@@ -4216,7 +4216,7 @@ static char *scan_request(char *c)
{
kdDebug(7107) << "start .nr" << endl;
c += j;
- const QCString name( scan_identifier( c ) );
+ const TQCString name( scan_identifier( c ) );
if ( name.isEmpty() )
{
kdDebug(7107) << "EXCEPTION: empty name for register variable" << endl;
@@ -4240,7 +4240,7 @@ static char *scan_request(char *c)
c=scan_expression( c, &increment );
}
c = skip_till_newline( c );
- QMap <QCString, NumberDefinition>::iterator it = s_numberDefinitionMap.find( name );
+ TQMap <TQCString, NumberDefinition>::iterator it = s_numberDefinitionMap.find( name );
if ( it == s_numberDefinitionMap.end() )
{
if ( sign < 1 )
@@ -4277,9 +4277,9 @@ static char *scan_request(char *c)
c = nameStart;
while (*c && (*c != ' ') && (*c != '\n')) c++;
*c = '\0';
- const QCString name(nameStart);
+ const TQCString name(nameStart);
- QCString endmacro;
+ TQCString endmacro;
if (words == 1)
{
endmacro="..";
@@ -4297,7 +4297,7 @@ static char *scan_request(char *c)
while (*c && qstrncmp(c,endmacro,length))
c=skip_till_newline(c);
- QCString macro;
+ TQCString macro;
while (sl!=c)
{
if (sl[0]=='\\' && sl[1]=='\\')
@@ -4310,7 +4310,7 @@ static char *scan_request(char *c)
sl++;
}
- QMap<QCString,StringDefinition>::iterator it=s_stringDefinitionMap.find(name);
+ TQMap<TQCString,StringDefinition>::iterator it=s_stringDefinitionMap.find(name);
if (it==s_stringDefinitionMap.end())
{
StringDefinition def;
@@ -5069,14 +5069,14 @@ static char *scan_request(char *c)
// Be careful: unlike .rn, the destination is first, origin is second
kdDebug(7107) << "start .als" << endl;
c+=j;
- const QCString name ( scan_identifier( c ) );
+ const TQCString name ( scan_identifier( c ) );
if ( name.isEmpty() )
{
kdDebug(7107) << "EXCEPTION: empty destination string to alias" << endl;
break;
}
while (*c && isspace(*c) && *c!='\n') ++c;
- const QCString name2 ( scan_identifier ( c ) );
+ const TQCString name2 ( scan_identifier ( c ) );
if ( name2.isEmpty() )
{
kdDebug(7107) << "EXCEPTION: empty origin string to alias" << endl;
@@ -5090,7 +5090,7 @@ static char *scan_request(char *c)
break;
}
// Second parametr is origin (unlike in .rn)
- QMap<QCString,StringDefinition>::iterator it=s_stringDefinitionMap.find(name2);
+ TQMap<TQCString,StringDefinition>::iterator it=s_stringDefinitionMap.find(name2);
if (it==s_stringDefinitionMap.end())
{
kdDebug(7107) << "EXCEPTION: cannot find string to make alias: " << name2 << endl;
@@ -5107,14 +5107,14 @@ static char *scan_request(char *c)
{
kdDebug(7107) << "start .rr" << endl;
c += j;
- const QCString name ( scan_identifier( c ) );
+ const TQCString name ( scan_identifier( c ) );
if ( name.isEmpty() )
{
kdDebug(7107) << "EXCEPTION: empty origin string to remove/rename: " << endl;
break;
}
c = skip_till_newline( c );
- QMap <QCString, NumberDefinition>::iterator it = s_numberDefinitionMap.find( name );
+ TQMap <TQCString, NumberDefinition>::iterator it = s_numberDefinitionMap.find( name );
if ( it == s_numberDefinitionMap.end() )
{
kdDebug(7107) << "EXCEPTION: trying to remove inexistant number register: " << endl;
@@ -5130,21 +5130,21 @@ static char *scan_request(char *c)
{
kdDebug(7107) << "start .rnn" << endl;
c+=j;
- const QCString name ( scan_identifier ( c ) );
+ const TQCString name ( scan_identifier ( c ) );
if ( name.isEmpty() )
{
kdDebug(7107) << "EXCEPTION: empty origin to remove/rename number register" << endl;
break;
}
while (*c && isspace(*c) && *c!='\n') ++c;
- const QCString name2 ( scan_identifier ( c ) );
+ const TQCString name2 ( scan_identifier ( c ) );
if ( name2.isEmpty() )
{
kdDebug(7107) << "EXCEPTION: empty destination to rename number register " << endl;
break;
}
c = skip_till_newline( c );
- QMap<QCString,NumberDefinition>::iterator it=s_numberDefinitionMap.find(name);
+ TQMap<TQCString,NumberDefinition>::iterator it=s_numberDefinitionMap.find(name);
if (it==s_numberDefinitionMap.end())
{
kdDebug(7107) << "EXCEPTION: cannot find number register to rename: " << name << endl;
@@ -5167,14 +5167,14 @@ static char *scan_request(char *c)
// Be careful: unlike .rnn, the destination is first, origin is second
kdDebug(7107) << "start .aln" << endl;
c+=j;
- const QCString name ( scan_identifier( c ) );
+ const TQCString name ( scan_identifier( c ) );
if ( name.isEmpty() )
{
kdDebug(7107) << "EXCEPTION: empty destination number register to alias" << endl;
break;
}
while (*c && isspace(*c) && *c!='\n') ++c;
- const QCString name2 ( scan_identifier( c ) );
+ const TQCString name2 ( scan_identifier( c ) );
if ( name2.isEmpty() )
{
kdDebug(7107) << "EXCEPTION: empty origin number register to alias" << endl;
@@ -5188,7 +5188,7 @@ static char *scan_request(char *c)
break;
}
// Second parametr is origin (unlike in .rnn)
- QMap<QCString,NumberDefinition>::iterator it=s_numberDefinitionMap.find(name2);
+ TQMap<TQCString,NumberDefinition>::iterator it=s_numberDefinitionMap.find(name2);
if (it==s_numberDefinitionMap.end())
{
kdDebug(7107) << "EXCEPTION: cannot find string to make alias: " << name2 << endl;
@@ -5208,7 +5208,7 @@ static char *scan_request(char *c)
while (*h && *h!='\n' && isdigit(*h) ) ++h;
const char tempchar = *h;
*h = 0;
- const QCString number = c;
+ const TQCString number = c;
*h = tempchar;
c = skip_till_newline( h );
unsigned int result = 1; // Numbers of shifts to do
diff --git a/kioslave/man/man2html.h b/kioslave/man/man2html.h
index ab672c4e5..e4d19a87b 100644
--- a/kioslave/man/man2html.h
+++ b/kioslave/man/man2html.h
@@ -6,7 +6,7 @@
*
*/
-#include <qcstring.h>
+#include <tqcstring.h>
/** call this with the buffer you have */
void scan_man_page(const char *man_page);
@@ -19,7 +19,7 @@ void scan_man_page(const char *man_page);
* \since 3.5
*
*/
-extern void setResourcePath(const QCString& _htmlPath, const QCString& _cssPath);
+extern void setResourcePath(const TQCString& _htmlPath, const TQCString& _cssPath);
/** implement this somewhere. It will be called
with HTML contents
diff --git a/kioslave/media/kcmodule/main.cpp b/kioslave/media/kcmodule/main.cpp
index e431e95f8..da52ea119 100644
--- a/kioslave/media/kcmodule/main.cpp
+++ b/kioslave/media/kcmodule/main.cpp
@@ -19,8 +19,8 @@
#include "main.h"
-#include <qtabwidget.h>
-#include <qlayout.h>
+#include <tqtabwidget.h>
+#include <tqlayout.h>
#include <klocale.h>
#include <kaboutdata.h>
@@ -32,16 +32,16 @@
#include "managermodule.h"
-typedef KGenericFactory<MediaModule, QWidget> MediaFactory;
+typedef KGenericFactory<MediaModule, TQWidget> MediaFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_media, MediaFactory( "kcmmedia" ) )
-MediaModule::MediaModule( QWidget *parent, const char *name, const QStringList& )
+MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList& )
: KCModule(MediaFactory::instance(), parent, name )
{
KGlobal::locale()->insertCatalogue("kio_media");
- 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 );
@@ -49,13 +49,13 @@ MediaModule::MediaModule( QWidget *parent, const char *name, const QStringList&
m_notifierModule = new NotifierModule( this, "notifier" );
tab->addTab( m_notifierModule, i18n( "&Notifications" ) );
- connect( m_notifierModule, SIGNAL( changed( bool ) ),
- this, SLOT( moduleChanged( bool ) ) );
+ connect( m_notifierModule, TQT_SIGNAL( changed( bool ) ),
+ this, TQT_SLOT( moduleChanged( bool ) ) );
m_managerModule = new ManagerModule( this, "manager" );
tab->addTab( m_managerModule, i18n( "&Advanced" ) );
- connect( m_managerModule, SIGNAL( changed( bool ) ),
- this, SLOT( moduleChanged( bool ) ) );
+ connect( m_managerModule, TQT_SIGNAL( changed( bool ) ),
+ this, TQT_SLOT( moduleChanged( bool ) ) );
@@ -95,7 +95,7 @@ void MediaModule::moduleChanged( bool state )
emit changed( state );
}
-QString MediaModule::quickHelp() const
+TQString MediaModule::quickHelp() const
{
return i18n("FIXME : Write me...");
}
diff --git a/kioslave/media/kcmodule/main.h b/kioslave/media/kcmodule/main.h
index 1ab909527..14e747bd9 100644
--- a/kioslave/media/kcmodule/main.h
+++ b/kioslave/media/kcmodule/main.h
@@ -27,12 +27,12 @@ class MediaModule : public KCModule
Q_OBJECT
public:
- MediaModule( QWidget *parent, const char *name, const QStringList& );
+ MediaModule( TQWidget *parent, const char *name, const TQStringList& );
virtual void load();
virtual void save();
virtual void defaults();
- virtual QString quickHelp() const;
+ virtual TQString quickHelp() const;
protected slots:
void moduleChanged( bool state );
diff --git a/kioslave/media/kcmodule/managermodule.cpp b/kioslave/media/kcmodule/managermodule.cpp
index e5f493d27..e0b30b90f 100644
--- a/kioslave/media/kcmodule/managermodule.cpp
+++ b/kioslave/media/kcmodule/managermodule.cpp
@@ -22,13 +22,13 @@
#include <klocale.h>
#include <dcopref.h>
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
#include <kdirnotify_stub.h>
#include "managermoduleview.h"
#include "mediamanagersettings.h"
-ManagerModule::ManagerModule( QWidget* parent, const char* name )
+ManagerModule::ManagerModule( TQWidget* parent, const char* name )
: KCModule( parent, name )
{
ManagerModuleView *view = new ManagerModuleView( this );
@@ -36,14 +36,14 @@ ManagerModule::ManagerModule( QWidget* parent, const char* name )
addConfig( MediaManagerSettings::self(), view );
#ifndef COMPILE_HALBACKEND
- QString hal_text = view->kcfg_HalBackendEnabled->text();
+ TQString hal_text = view->kcfg_HalBackendEnabled->text();
hal_text += " ("+i18n("No support for HAL on this system")+")";
view->kcfg_HalBackendEnabled->setText( hal_text );
#endif
view->kcfg_HalBackendEnabled->setEnabled( false );
#ifndef COMPILE_LINUXCDPOLLING
- QString poll_text = view->kcfg_CdPollingEnabled->text();
+ TQString poll_text = view->kcfg_CdPollingEnabled->text();
poll_text += " ("+i18n("No support for CD polling on this system")+")";
view->kcfg_CdPollingEnabled->setText( poll_text );
#endif
diff --git a/kioslave/media/kcmodule/managermodule.h b/kioslave/media/kcmodule/managermodule.h
index 7fa3d649a..0b62dfc5e 100644
--- a/kioslave/media/kcmodule/managermodule.h
+++ b/kioslave/media/kcmodule/managermodule.h
@@ -26,7 +26,7 @@ class ManagerModule : public KCModule
Q_OBJECT
public:
- ManagerModule( QWidget* parent = 0, const char* name = 0);
+ ManagerModule( TQWidget* parent = 0, const char* name = 0);
void save();
};
diff --git a/kioslave/media/kcmodule/mimetypelistboxitem.cpp b/kioslave/media/kcmodule/mimetypelistboxitem.cpp
index 86460ed88..e7334248a 100644
--- a/kioslave/media/kcmodule/mimetypelistboxitem.cpp
+++ b/kioslave/media/kcmodule/mimetypelistboxitem.cpp
@@ -21,14 +21,14 @@
#include <kmimetype.h>
-MimetypeListBoxItem::MimetypeListBoxItem(const QString &mimetype, QListBox *parent)
- : QListBoxText(parent), m_mimetype(mimetype)
+MimetypeListBoxItem::MimetypeListBoxItem(const TQString &mimetype, TQListBox *parent)
+ : TQListBoxText(parent), m_mimetype(mimetype)
{
KMimeType::Ptr mime = KMimeType::mimeType( mimetype );
setText( mime->comment() );
}
-const QString &MimetypeListBoxItem::mimetype() const
+const TQString &MimetypeListBoxItem::mimetype() const
{
return m_mimetype;
}
diff --git a/kioslave/media/kcmodule/mimetypelistboxitem.h b/kioslave/media/kcmodule/mimetypelistboxitem.h
index fee215ecf..f61afba3d 100644
--- a/kioslave/media/kcmodule/mimetypelistboxitem.h
+++ b/kioslave/media/kcmodule/mimetypelistboxitem.h
@@ -20,18 +20,18 @@
#ifndef _MIMETYPELISTBOXITEM_H_
#define _MIMETYPELISTBOXITEM_H_
-#include <qlistbox.h>
-#include <qstring.h>
+#include <tqlistbox.h>
+#include <tqstring.h>
class MimetypeListBoxItem : public QListBoxText
{
public:
- MimetypeListBoxItem(const QString &mimetype, QListBox *parent);
+ MimetypeListBoxItem(const TQString &mimetype, TQListBox *parent);
- const QString &mimetype() const;
+ const TQString &mimetype() const;
private:
- QString m_mimetype;
+ TQString m_mimetype;
};
#endif
diff --git a/kioslave/media/kcmodule/notifiermodule.cpp b/kioslave/media/kcmodule/notifiermodule.cpp
index 015d7396a..c7871c953 100644
--- a/kioslave/media/kcmodule/notifiermodule.cpp
+++ b/kioslave/media/kcmodule/notifiermodule.cpp
@@ -21,7 +21,7 @@
#include <klocale.h>
-#include <qlayout.h>
+#include <tqlayout.h>
#include <kcombobox.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
@@ -31,10 +31,10 @@
#include "actionlistboxitem.h"
#include "mimetypelistboxitem.h"
-NotifierModule::NotifierModule(QWidget *parent, const char *name)
+NotifierModule::NotifierModule(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
- QBoxLayout *layout = new QVBoxLayout( this, 0, KDialog::spacingHint() );
+ TQBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
m_view = new NotifierModuleView( this );
layout->addWidget( m_view );
@@ -45,10 +45,10 @@ NotifierModule::NotifierModule(QWidget *parent, const char *name)
m_view->mimetypesCombo->insertItem( i18n("All Mime Types") );
- QStringList mimetypes = m_settings.supportedMimetypes();
+ TQStringList mimetypes = m_settings.supportedMimetypes();
- QStringList::iterator it = mimetypes.begin();
- QStringList::iterator end = mimetypes.end();
+ TQStringList::iterator it = mimetypes.begin();
+ TQStringList::iterator end = mimetypes.end();
for ( ; it!=end; ++it )
{
@@ -57,18 +57,18 @@ NotifierModule::NotifierModule(QWidget *parent, const char *name)
updateListBox();
- connect( m_view->mimetypesCombo, SIGNAL( activated(int) ),
- this, SLOT( slotMimeTypeChanged(int) ) );
- connect( m_view->actionsList, SIGNAL( selectionChanged(QListBoxItem*) ),
- this, SLOT( slotActionSelected(QListBoxItem*) ) );
- connect( m_view->addButton, SIGNAL( clicked() ),
- this, SLOT( slotAdd() ) );
- connect( m_view->editButton, SIGNAL( clicked() ),
- this, SLOT( slotEdit() ) );
- connect( m_view->deleteButton, SIGNAL( clicked() ),
- this, SLOT( slotDelete() ) );
- connect( m_view->toggleAutoButton, SIGNAL( clicked() ),
- this, SLOT( slotToggleAuto() ) );
+ connect( m_view->mimetypesCombo, TQT_SIGNAL( activated(int) ),
+ this, TQT_SLOT( slotMimeTypeChanged(int) ) );
+ connect( m_view->actionsList, TQT_SIGNAL( selectionChanged(TQListBoxItem*) ),
+ this, TQT_SLOT( slotActionSelected(TQListBoxItem*) ) );
+ connect( m_view->addButton, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( slotAdd() ) );
+ connect( m_view->editButton, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( slotEdit() ) );
+ connect( m_view->deleteButton, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( slotDelete() ) );
+ connect( m_view->toggleAutoButton, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( slotToggleAuto() ) );
}
NotifierModule::~NotifierModule()
@@ -97,7 +97,7 @@ void NotifierModule::updateListBox()
m_view->actionsList->clear();
slotActionSelected( 0L );
- QValueList<NotifierAction*> services;
+ TQValueList<NotifierAction*> services;
if ( m_mimetype.isEmpty() )
{
services = m_settings.actions();
@@ -107,7 +107,7 @@ void NotifierModule::updateListBox()
services = m_settings.actionsForMimetype( m_mimetype );
}
- QValueList<NotifierAction*>::iterator it;
+ TQValueList<NotifierAction*>::iterator it;
for ( it = services.begin(); it != services.end(); ++it )
{
@@ -115,7 +115,7 @@ void NotifierModule::updateListBox()
}
}
-void NotifierModule::slotActionSelected(QListBoxItem *item)
+void NotifierModule::slotActionSelected(TQListBoxItem *item)
{
NotifierAction *action = 0L;
@@ -137,11 +137,11 @@ void NotifierModule::slotMimeTypeChanged(int index)
{
if ( index == 0 )
{
- m_mimetype = QString();
+ m_mimetype = TQString();
}
else
{
- QListBoxItem *item = m_view->mimetypesCombo->listBox()->item( index );
+ TQListBoxItem *item = m_view->mimetypesCombo->listBox()->item( index );
MimetypeListBoxItem *mime_item
= static_cast<MimetypeListBoxItem*>( item );
m_mimetype = mime_item->mimetype();
@@ -157,7 +157,7 @@ void NotifierModule::slotAdd()
int value = dialog.exec();
- if ( value == QDialog::Accepted )
+ if ( value == TQDialog::Accepted )
{
m_settings.addAction( action );
updateListBox();
@@ -181,7 +181,7 @@ void NotifierModule::slotEdit()
int value = dialog.exec();
- if ( value == QDialog::Accepted )
+ if ( value == TQDialog::Accepted )
{
updateListBox();
emit changed( true );
diff --git a/kioslave/media/kcmodule/notifiermodule.h b/kioslave/media/kcmodule/notifiermodule.h
index 6c71df51f..e284e87fe 100644
--- a/kioslave/media/kcmodule/notifiermodule.h
+++ b/kioslave/media/kcmodule/notifiermodule.h
@@ -30,7 +30,7 @@ class NotifierModule : public KCModule
Q_OBJECT
public:
- NotifierModule( QWidget* parent = 0, const char* name = 0);
+ NotifierModule( TQWidget* parent = 0, const char* name = 0);
~NotifierModule();
void load();
@@ -43,13 +43,13 @@ private slots:
void slotEdit();
void slotToggleAuto();
- void slotActionSelected( QListBoxItem * item );
+ void slotActionSelected( TQListBoxItem * item );
void slotMimeTypeChanged( int index );
private:
void updateListBox();
- QString m_mimetype;
+ TQString m_mimetype;
NotifierSettings m_settings;
NotifierModuleView *m_view;
};
diff --git a/kioslave/media/kcmodule/serviceconfigdialog.cpp b/kioslave/media/kcmodule/serviceconfigdialog.cpp
index 1a127d12b..61dd060f2 100644
--- a/kioslave/media/kcmodule/serviceconfigdialog.cpp
+++ b/kioslave/media/kcmodule/serviceconfigdialog.cpp
@@ -23,20 +23,20 @@
#include <klineedit.h>
#include <kactionselector.h>
#include <kicondialog.h>
-#include <qlistbox.h>
+#include <tqlistbox.h>
#include <kservice.h>
#include <kopenwith.h>
#include <kpushbutton.h>
#include <kiconloader.h>
-#include <qpixmap.h>
-#include <qiconset.h>
+#include <tqpixmap.h>
+#include <tqiconset.h>
#include "mimetypelistboxitem.h"
ServiceConfigDialog::ServiceConfigDialog(NotifierServiceAction *action,
- const QStringList &mimetypesList,
- QWidget* parent, const char* name)
+ const TQStringList &mimetypesList,
+ TQWidget* parent, const char* name)
: KDialogBase(parent, name, true, i18n("Edit Service"), Ok|Cancel, Ok, true),
m_action(action)
{
@@ -46,22 +46,22 @@ ServiceConfigDialog::ServiceConfigDialog(NotifierServiceAction *action,
m_view->labelEdit->setText( m_action->label() );
m_view->commandEdit->setText( m_action->service().m_strExec );
- QIconSet iconSet = SmallIconSet("configure");
- QPixmap pixMap = iconSet.pixmap( QIconSet::Small, QIconSet::Normal );
+ TQIconSet iconSet = SmallIconSet("configure");
+ TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
m_view->commandButton->setIconSet( iconSet );
m_view->commandButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
m_iconChanged = false;
- QStringList all_mimetypes = mimetypesList;
- QStringList action_mimetypes = action->mimetypes();
+ TQStringList all_mimetypes = mimetypesList;
+ TQStringList action_mimetypes = action->mimetypes();
- QStringList::iterator it = all_mimetypes.begin();
- QStringList::iterator end = all_mimetypes.end();
+ TQStringList::iterator it = all_mimetypes.begin();
+ TQStringList::iterator end = all_mimetypes.end();
for ( ; it!=end; ++it )
{
- QListBox *list;
+ TQListBox *list;
if ( action_mimetypes.contains( *it ) )
{
@@ -78,10 +78,10 @@ ServiceConfigDialog::ServiceConfigDialog(NotifierServiceAction *action,
setMainWidget(m_view);
setCaption( m_action->label() );
- connect( m_view->iconButton, SIGNAL( iconChanged(QString) ),
- this, SLOT( slotIconChanged() ) );
- connect( m_view->commandButton, SIGNAL( clicked() ),
- this, SLOT( slotCommand() ) );
+ connect( m_view->iconButton, TQT_SIGNAL( iconChanged(TQString) ),
+ this, TQT_SLOT( slotIconChanged() ) );
+ connect( m_view->commandButton, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( slotCommand() ) );
}
bool operator==( KDEDesktopMimeType::Service s1, KDEDesktopMimeType::Service s2 )
@@ -103,12 +103,12 @@ void ServiceConfigDialog::slotOk()
service.m_strIcon = m_view->iconButton->icon();
service.m_strExec = m_view->commandEdit->text();
- QStringList mimetypes;
+ TQStringList mimetypes;
uint list_count = m_view->mimetypesSelector->selectedListBox()->count();
for( uint i=0; i < list_count; ++i )
{
- QListBoxItem *item = m_view->mimetypesSelector->selectedListBox()->item(i);
+ TQListBoxItem *item = m_view->mimetypesSelector->selectedListBox()->item(i);
MimetypeListBoxItem *mime_item = static_cast<MimetypeListBoxItem*>( item );
mimetypes.append( mime_item->mimetype() );
}
@@ -134,7 +134,7 @@ void ServiceConfigDialog::slotCommand()
{
KOpenWithDlg d(this);
int value = d.exec();
- if ( value == QDialog::Accepted )
+ if ( value == TQDialog::Accepted )
{
KService::Ptr service = d.service();
if ( service != 0L )
diff --git a/kioslave/media/kcmodule/serviceconfigdialog.h b/kioslave/media/kcmodule/serviceconfigdialog.h
index 090a978d4..24e907205 100644
--- a/kioslave/media/kcmodule/serviceconfigdialog.h
+++ b/kioslave/media/kcmodule/serviceconfigdialog.h
@@ -31,8 +31,8 @@ class ServiceConfigDialog : public KDialogBase
public:
ServiceConfigDialog(NotifierServiceAction *action,
- const QStringList &mimetypesList,
- QWidget* parent = 0, const char* name = 0);
+ const TQStringList &mimetypesList,
+ TQWidget* parent = 0, const char* name = 0);
public slots:
void slotOk();
diff --git a/kioslave/media/kfile-plugin/kfilemediaplugin.cpp b/kioslave/media/kfile-plugin/kfilemediaplugin.cpp
index 37aa7d61f..bda34bff2 100644
--- a/kioslave/media/kfile-plugin/kfilemediaplugin.cpp
+++ b/kioslave/media/kfile-plugin/kfilemediaplugin.cpp
@@ -24,11 +24,11 @@
#include <dcopref.h>
-#include <qpixmap.h>
-#include <qpainter.h>
-#include <qstyle.h>
-#include <qapplication.h>
-#include <qfile.h>
+#include <tqpixmap.h>
+#include <tqpainter.h>
+#include <tqstyle.h>
+#include <tqapplication.h>
+#include <tqfile.h>
#ifdef HAVE_STATVFS
# include <sys/statvfs.h>
@@ -41,8 +41,8 @@
typedef KGenericFactory<KFileMediaPlugin> KFileMediaPluginFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_media, KFileMediaPluginFactory("kio_media"))
-KFileMediaPlugin::KFileMediaPlugin(QObject *parent, const char *name,
- const QStringList& args)
+KFileMediaPlugin::KFileMediaPlugin(TQObject *parent, const char *name,
+ const TQStringList& args)
: KFilePlugin(parent, name, args)
{
addMimeType( "media/audiocd" );
@@ -94,9 +94,9 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
if (medium.id().isNull()) return false;
- QString mount_point = medium.mountPoint();
+ TQString mount_point = medium.mountPoint();
KURL base_url = medium.prettyBaseURL();
- QString device_node = medium.deviceNode();
+ TQString device_node = medium.deviceNode();
KFileMetaInfoGroup group = appendGroup(info, "mediumInfo");
@@ -119,7 +119,7 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
struct statvfs vfs;
memset(&vfs, 0, sizeof(vfs));
- if ( ::statvfs(QFile::encodeName(mount_point), &vfs) != -1 )
+ if ( ::statvfs(TQFile::encodeName(mount_point), &vfs) != -1 )
{
m_total = static_cast<KIO::filesize_t>(vfs.f_blocks) * static_cast<KIO::filesize_t>(vfs.f_frsize);
m_free = static_cast<KIO::filesize_t>(vfs.f_bavail) * static_cast<KIO::filesize_t>(vfs.f_frsize);
@@ -140,19 +140,19 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
group = appendGroup(info, "mediumSummary");
- appendItem(group, "percent", QString("%1%").arg(percent));
+ appendItem(group, "percent", TQString("%1%").arg(percent));
- QPixmap bar(150, 20);
- QPainter p(&bar);
+ TQPixmap bar(150, 20);
+ TQPainter p(&bar);
p.fillRect(0, 0, length, 20, Qt::red);
p.fillRect(length, 0, 150-length, 20, Qt::green);
- QColorGroup cg = QApplication::palette().active();
+ TQColorGroup cg = TQApplication::palette().active();
- QApplication::style().drawPrimitive(QStyle::PE_Panel, &p,
- QRect(0, 0, 150, 20), cg,
- QStyle::Style_Sunken);
+ TQApplication::style().drawPrimitive(TQStyle::PE_Panel, &p,
+ TQRect(0, 0, 150, 20), cg,
+ TQStyle::Style_Sunken);
appendItem( group, "thumbnail", bar );
}
@@ -169,7 +169,7 @@ const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info)
if ( !reply.isValid() )
{
- return Medium(QString::null, QString::null);
+ return Medium(TQString::null, TQString::null);
}
return Medium::create(reply);
@@ -183,24 +183,24 @@ void KFileMediaPlugin::addMimeType(const char *mimeType)
= addGroupInfo(info, "mediumInfo", i18n("Medium Information"));
KFileMimeTypeInfo::ItemInfo *item
- = addItemInfo(group, "free", i18n("Free"), QVariant::ULongLong);
+ = addItemInfo(group, "free", i18n("Free"), TQVariant::ULongLong);
setUnit(item, KFileMimeTypeInfo::Bytes);
- item = addItemInfo(group, "used", i18n("Used"), QVariant::ULongLong);
+ item = addItemInfo(group, "used", i18n("Used"), TQVariant::ULongLong);
setUnit(item, KFileMimeTypeInfo::Bytes);
- item = addItemInfo(group, "total", i18n("Total"), QVariant::ULongLong);
+ item = addItemInfo(group, "total", i18n("Total"), TQVariant::ULongLong);
setUnit(item, KFileMimeTypeInfo::Bytes);
- item = addItemInfo(group, "baseURL", i18n("Base URL"), QVariant::String);
- item = addItemInfo(group, "mountPoint", i18n("Mount Point"), QVariant::String);
- item = addItemInfo(group, "deviceNode", i18n("Device Node"), QVariant::String);
+ item = addItemInfo(group, "baseURL", i18n("Base URL"), TQVariant::String);
+ item = addItemInfo(group, "mountPoint", i18n("Mount Point"), TQVariant::String);
+ item = addItemInfo(group, "deviceNode", i18n("Device Node"), TQVariant::String);
group = addGroupInfo(info, "mediumSummary", i18n("Medium Summary"));
- item = addItemInfo(group, "percent", i18n("Usage"), QVariant::String);
+ item = addItemInfo(group, "percent", i18n("Usage"), TQVariant::String);
- item = addItemInfo( group, "thumbnail", i18n("Bar Graph"), QVariant::Image );
+ item = addItemInfo( group, "thumbnail", i18n("Bar Graph"), TQVariant::Image );
setHint( item, KFileMimeTypeInfo::Thumbnail );
}
diff --git a/kioslave/media/kfile-plugin/kfilemediaplugin.h b/kioslave/media/kfile-plugin/kfilemediaplugin.h
index 666f75df3..7799ffc3d 100644
--- a/kioslave/media/kfile-plugin/kfilemediaplugin.h
+++ b/kioslave/media/kfile-plugin/kfilemediaplugin.h
@@ -30,8 +30,8 @@ class KFileMediaPlugin : public KFilePlugin
{
Q_OBJECT
public:
- KFileMediaPlugin(QObject *parent, const char *name,
- const QStringList &args);
+ KFileMediaPlugin(TQObject *parent, const char *name,
+ const TQStringList &args);
bool readInfo(KFileMetaInfo &info, uint what = KFileMetaInfo::Fastest);
diff --git a/kioslave/media/kio_media.cpp b/kioslave/media/kio_media.cpp
index b9283592c..6aff0ae1a 100644
--- a/kioslave/media/kio_media.cpp
+++ b/kioslave/media/kio_media.cpp
@@ -25,7 +25,7 @@
#include <dcopclient.h>
#include <kcmdlineargs.h>
-#include <qeventloop.h>
+#include <tqeventloop.h>
#include "kio_media.h"
@@ -57,12 +57,12 @@ extern "C" {
}
-MediaProtocol::MediaProtocol(const QCString &protocol,
- const QCString &pool, const QCString &app)
+MediaProtocol::MediaProtocol(const TQCString &protocol,
+ const TQCString &pool, const TQCString &app)
: ForwardingSlaveBase(protocol, pool, app)
{
- connect( &m_impl, SIGNAL( warning( const QString & ) ),
- this, SLOT( slotWarning( const QString & ) ) );
+ connect( &m_impl, TQT_SIGNAL( warning( const TQString & ) ),
+ this, TQT_SLOT( slotWarning( const TQString & ) ) );
}
MediaProtocol::~MediaProtocol()
@@ -71,7 +71,7 @@ MediaProtocol::~MediaProtocol()
bool MediaProtocol::rewriteURL(const KURL &url, KURL &newUrl)
{
- QString name, path;
+ TQString name, path;
if ( !m_impl.parseURL(url, name, path) )
{
@@ -94,7 +94,7 @@ void MediaProtocol::put(const KURL &url, int permissions,
{
kdDebug(1219) << "MediaProtocol::put: " << url << endl;
- QString name, path;
+ TQString name, path;
bool ok = m_impl.parseURL(url, name, path);
if ( ok && path.isEmpty() )
@@ -112,9 +112,9 @@ void MediaProtocol::rename(const KURL &src, const KURL &dest, bool overwrite)
kdDebug(1219) << "MediaProtocol::rename: " << src << ", " << dest << ", "
<< overwrite << endl;
- QString src_name, src_path;
+ TQString src_name, src_path;
bool ok = m_impl.parseURL(src, src_name, src_path);
- QString dest_name, dest_path;
+ TQString dest_name, dest_path;
ok &= m_impl.parseURL(dest, dest_name, dest_path);
if ( ok && src_path.isEmpty() && dest_path.isEmpty()
@@ -139,7 +139,7 @@ void MediaProtocol::mkdir(const KURL &url, int permissions)
{
kdDebug(1219) << "MediaProtocol::mkdir: " << url << endl;
- QString name, path;
+ TQString name, path;
bool ok = m_impl.parseURL(url, name, path);
if ( ok && path.isEmpty() )
@@ -156,7 +156,7 @@ void MediaProtocol::del(const KURL &url, bool isFile)
{
kdDebug(1219) << "MediaProtocol::del: " << url << endl;
- QString name, path;
+ TQString name, path;
bool ok = m_impl.parseURL(url, name, path);
if ( ok && path.isEmpty() )
@@ -172,7 +172,7 @@ void MediaProtocol::del(const KURL &url, bool isFile)
void MediaProtocol::stat(const KURL &url)
{
kdDebug(1219) << "MediaProtocol::stat: " << url << endl;
- QString path = url.path();
+ TQString path = url.path();
if( path.isEmpty() || path == "/" )
{
// The root is "virtual" - it's not a single physical directory
@@ -183,7 +183,7 @@ void MediaProtocol::stat(const KURL &url)
return;
}
- QString name;
+ TQString name;
bool ok = m_impl.parseURL(url, name, path);
if ( !ok )
@@ -223,7 +223,7 @@ void MediaProtocol::listDir(const KURL &url)
return;
}
- QString name, path;
+ TQString name, path;
bool ok = m_impl.parseURL(url, name, path);
if ( !ok )
@@ -267,7 +267,7 @@ void MediaProtocol::listRoot()
finished();
}
-void MediaProtocol::slotWarning( const QString &msg )
+void MediaProtocol::slotWarning( const TQString &msg )
{
warning( msg );
}
diff --git a/kioslave/media/kio_media.h b/kioslave/media/kio_media.h
index 55b3ae670..80da4a6cc 100644
--- a/kioslave/media/kio_media.h
+++ b/kioslave/media/kio_media.h
@@ -28,8 +28,8 @@ class MediaProtocol : public KIO::ForwardingSlaveBase
{
Q_OBJECT
public:
- MediaProtocol(const QCString &protocol, const QCString &pool,
- const QCString &app);
+ MediaProtocol(const TQCString &protocol, const TQCString &pool,
+ const TQCString &app);
virtual ~MediaProtocol();
virtual bool rewriteURL(const KURL &url, KURL &newUrl);
@@ -43,7 +43,7 @@ public:
virtual void listDir(const KURL &url);
private slots:
- void slotWarning( const QString &msg );
+ void slotWarning( const TQString &msg );
private:
void listRoot();
diff --git a/kioslave/media/libmediacommon/actionlistboxitem.cpp b/kioslave/media/libmediacommon/actionlistboxitem.cpp
index 3551857c1..271d2e487 100644
--- a/kioslave/media/libmediacommon/actionlistboxitem.cpp
+++ b/kioslave/media/libmediacommon/actionlistboxitem.cpp
@@ -21,13 +21,13 @@
#include <klocale.h>
-#include <qpixmap.h>
+#include <tqpixmap.h>
-ActionListBoxItem::ActionListBoxItem(NotifierAction *action, QString mimetype, QListBox *parent)
- : QListBoxPixmap(parent, action->pixmap()),
+ActionListBoxItem::ActionListBoxItem(NotifierAction *action, TQString mimetype, TQListBox *parent)
+ : TQListBoxPixmap(parent, action->pixmap()),
m_action(action)
{
- QString text = m_action->label();
+ TQString text = m_action->label();
if ( m_action->autoMimetypes().contains( mimetype ) )
{
diff --git a/kioslave/media/libmediacommon/actionlistboxitem.h b/kioslave/media/libmediacommon/actionlistboxitem.h
index cdd8a3ff1..0378e1d6f 100644
--- a/kioslave/media/libmediacommon/actionlistboxitem.h
+++ b/kioslave/media/libmediacommon/actionlistboxitem.h
@@ -20,15 +20,15 @@
#ifndef _ACTIONLISTBOXITEM_H_
#define _ACTIONLISTBOXITEM_H_
-#include <qlistbox.h>
-#include <qstring.h>
+#include <tqlistbox.h>
+#include <tqstring.h>
#include "notifieraction.h"
class ActionListBoxItem : public QListBoxPixmap
{
public:
- ActionListBoxItem(NotifierAction *action, QString mimetype, QListBox *parent);
+ ActionListBoxItem(NotifierAction *action, TQString mimetype, TQListBox *parent);
~ActionListBoxItem();
NotifierAction *action() const;
diff --git a/kioslave/media/libmediacommon/medium.cpp b/kioslave/media/libmediacommon/medium.cpp
index 4cba32aeb..e7e91dd54 100644
--- a/kioslave/media/libmediacommon/medium.cpp
+++ b/kioslave/media/libmediacommon/medium.cpp
@@ -21,25 +21,25 @@
#include <kconfig.h>
#include <klocale.h>
-const QString Medium::SEPARATOR = "---";
+const TQString Medium::SEPARATOR = "---";
-Medium::Medium(const QString &id, const QString &name)
+Medium::Medium(const TQString &id, const TQString &name)
{
m_properties+= id; /* ID */
m_properties+= name; /* NAME */
m_properties+= name; /* LABEL */
- m_properties+= QString::null; /* USER_LABEL */
+ m_properties+= TQString::null; /* USER_LABEL */
m_properties+= "false"; /* MOUNTABLE */
- m_properties+= QString::null; /* DEVICE_NODE */
- m_properties+= QString::null; /* MOUNT_POINT */
- m_properties+= QString::null; /* FS_TYPE */
+ m_properties+= TQString::null; /* DEVICE_NODE */
+ m_properties+= TQString::null; /* MOUNT_POINT */
+ m_properties+= TQString::null; /* FS_TYPE */
m_properties+= "false"; /* MOUNTED */
- m_properties+= QString::null; /* BASE_URL */
- m_properties+= QString::null; /* MIME_TYPE */
- m_properties+= QString::null; /* ICON_NAME */
+ m_properties+= TQString::null; /* BASE_URL */
+ m_properties+= TQString::null; /* MIME_TYPE */
+ m_properties+= TQString::null; /* ICON_NAME */
m_properties+= "false"; /* ENCRYPTED */
- m_properties+= QString::null; /* CLEAR_DEVICE_UDI */
+ m_properties+= TQString::null; /* CLEAR_DEVICE_UDI */
loadUserLabel();
@@ -48,26 +48,26 @@ Medium::Medium(const QString &id, const QString &name)
Medium::Medium()
{
- m_properties+= QString::null; /* ID */
- m_properties+= QString::null; /* NAME */
- m_properties+= QString::null; /* LABEL */
- m_properties+= QString::null; /* USER_LABEL */
-
- m_properties+= QString::null; /* MOUNTABLE */
- m_properties+= QString::null; /* DEVICE_NODE */
- m_properties+= QString::null; /* MOUNT_POINT */
- m_properties+= QString::null; /* FS_TYPE */
- m_properties+= QString::null; /* MOUNTED */
- m_properties+= QString::null; /* BASE_URL */
- m_properties+= QString::null; /* MIME_TYPE */
- m_properties+= QString::null; /* ICON_NAME */
- m_properties+= QString::null; /* ENCRYPTED */
- m_properties+= QString::null; /* CLEAR_DEVICE_UDI */
+ m_properties+= TQString::null; /* ID */
+ m_properties+= TQString::null; /* NAME */
+ m_properties+= TQString::null; /* LABEL */
+ m_properties+= TQString::null; /* USER_LABEL */
+
+ m_properties+= TQString::null; /* MOUNTABLE */
+ m_properties+= TQString::null; /* DEVICE_NODE */
+ m_properties+= TQString::null; /* MOUNT_POINT */
+ m_properties+= TQString::null; /* FS_TYPE */
+ m_properties+= TQString::null; /* MOUNTED */
+ m_properties+= TQString::null; /* BASE_URL */
+ m_properties+= TQString::null; /* MIME_TYPE */
+ m_properties+= TQString::null; /* ICON_NAME */
+ m_properties+= TQString::null; /* ENCRYPTED */
+ m_properties+= TQString::null; /* CLEAR_DEVICE_UDI */
m_halmounted = false;
}
-const Medium Medium::create(const QStringList &properties)
+const Medium Medium::create(const TQStringList &properties)
{
Medium m;
@@ -93,7 +93,7 @@ const Medium Medium::create(const QStringList &properties)
return m;
}
-Medium::List Medium::createList(const QStringList &properties)
+Medium::List Medium::createList(const TQStringList &properties)
{
List l;
@@ -101,15 +101,15 @@ Medium::List Medium::createList(const QStringList &properties)
{
int media_count = properties.size()/(PROPERTIES_COUNT+1);
- QStringList props = properties;
+ TQStringList props = properties;
for(int i=0; i<media_count; i++)
{
const Medium m = create(props);
l.append(m);
- QStringList::iterator first = props.begin();
- QStringList::iterator last = props.find(SEPARATOR);
+ TQStringList::iterator first = props.begin();
+ TQStringList::iterator last = props.find(SEPARATOR);
++last;
props.erase(first, last);
}
@@ -119,12 +119,12 @@ Medium::List Medium::createList(const QStringList &properties)
}
-void Medium::setName(const QString &name)
+void Medium::setName(const TQString &name)
{
m_properties[NAME] = name;
}
-void Medium::setLabel(const QString &label)
+void Medium::setLabel(const TQString &label)
{
m_properties[LABEL] = label;
}
@@ -134,12 +134,12 @@ void Medium::setEncrypted(bool state)
m_properties[ENCRYPTED] = ( state ? "true" : "false" );
}
-void Medium::setUserLabel(const QString &label)
+void Medium::setUserLabel(const TQString &label)
{
KConfig cfg("mediamanagerrc");
cfg.setGroup("UserLabels");
- QString entry_name = m_properties[ID];
+ TQString entry_name = m_properties[ID];
if ( label.isNull() )
{
@@ -158,7 +158,7 @@ void Medium::loadUserLabel()
KConfig cfg("mediamanagerrc");
cfg.setGroup("UserLabels");
- QString entry_name = m_properties[ID];
+ TQString entry_name = m_properties[ID];
if ( cfg.hasKey(entry_name) )
{
@@ -166,7 +166,7 @@ void Medium::loadUserLabel()
}
else
{
- m_properties[USER_LABEL] = QString::null;
+ m_properties[USER_LABEL] = TQString::null;
}
}
@@ -185,9 +185,9 @@ bool Medium::mountableState(bool mounted)
return true;
}
-void Medium::mountableState(const QString &deviceNode,
- const QString &mountPoint,
- const QString &fsType, bool mounted)
+void Medium::mountableState(const TQString &deviceNode,
+ const TQString &mountPoint,
+ const TQString &fsType, bool mounted)
{
m_properties[MOUNTABLE] = "true";
m_properties[DEVICE_NODE] = deviceNode;
@@ -196,10 +196,10 @@ void Medium::mountableState(const QString &deviceNode,
m_properties[MOUNTED] = ( mounted ? "true" : "false" );
}
-void Medium::mountableState(const QString &deviceNode,
- const QString &clearDeviceUdi,
- const QString &mountPoint,
- const QString &fsType, bool mounted)
+void Medium::mountableState(const TQString &deviceNode,
+ const TQString &clearDeviceUdi,
+ const TQString &mountPoint,
+ const TQString &fsType, bool mounted)
{
m_properties[MOUNTABLE] = "true";
m_properties[DEVICE_NODE] = deviceNode;
@@ -209,18 +209,18 @@ void Medium::mountableState(const QString &deviceNode,
m_properties[MOUNTED] = ( mounted ? "true" : "false" );
}
-void Medium::unmountableState(const QString &baseURL)
+void Medium::unmountableState(const TQString &baseURL)
{
m_properties[MOUNTABLE] = "false";
m_properties[BASE_URL] = baseURL;
}
-void Medium::setMimeType(const QString &mimeType)
+void Medium::setMimeType(const TQString &mimeType)
{
m_properties[MIME_TYPE] = mimeType;
}
-void Medium::setIconName(const QString &iconName)
+void Medium::setIconName(const TQString &iconName)
{
m_properties[ICON_NAME] = iconName;
}
@@ -243,7 +243,7 @@ KURL Medium::prettyBaseURL() const
return KURL( mountPoint() );
}
-QString Medium::prettyLabel() const
+TQString Medium::prettyLabel() const
{
if ( !userLabel().isEmpty() )
{
diff --git a/kioslave/media/libmediacommon/medium.h b/kioslave/media/libmediacommon/medium.h
index 543bdf596..54e1556dc 100644
--- a/kioslave/media/libmediacommon/medium.h
+++ b/kioslave/media/libmediacommon/medium.h
@@ -19,15 +19,15 @@
#ifndef _MEDIUM_H_
#define _MEDIUM_H_
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <kurl.h>
-#include <qmap.h>
+#include <tqmap.h>
class Medium
{
public:
- typedef QValueList<const Medium> List;
+ typedef TQValueList<const Medium> List;
static const uint ID = 0;
static const uint NAME = 1;
@@ -44,51 +44,51 @@ public:
static const uint ENCRYPTED = 12;
static const uint CLEAR_DEVICE_UDI = 13;
static const uint PROPERTIES_COUNT = 14;
- static const QString SEPARATOR;
+ static const TQString SEPARATOR;
- Medium(const QString &id, const QString &name);
- static const Medium create(const QStringList &properties);
- static List createList(const QStringList &properties);
+ Medium(const TQString &id, const TQString &name);
+ static const Medium create(const TQStringList &properties);
+ static List createList(const TQStringList &properties);
- const QStringList &properties() const { return m_properties; }
+ const TQStringList &properties() const { return m_properties; }
- QString id() const { return m_properties[ID]; }
- QString name() const { return m_properties[NAME]; }
- QString label() const { return m_properties[LABEL]; }
- QString userLabel() const { return m_properties[USER_LABEL]; }
+ TQString id() const { return m_properties[ID]; }
+ TQString name() const { return m_properties[NAME]; }
+ TQString label() const { return m_properties[LABEL]; }
+ TQString userLabel() const { return m_properties[USER_LABEL]; }
bool isMountable() const { return m_properties[MOUNTABLE]=="true"; }
- QString deviceNode() const { return m_properties[DEVICE_NODE]; }
- QString mountPoint() const { return m_properties[MOUNT_POINT]; }
- QString fsType() const { return m_properties[FS_TYPE]; }
+ TQString deviceNode() const { return m_properties[DEVICE_NODE]; }
+ TQString mountPoint() const { return m_properties[MOUNT_POINT]; }
+ TQString fsType() const { return m_properties[FS_TYPE]; }
bool isMounted() const { return m_properties[MOUNTED]=="true"; }
- QString baseURL() const { return m_properties[BASE_URL]; }
- QString mimeType() const { return m_properties[MIME_TYPE]; }
- QString iconName() const { return m_properties[ICON_NAME]; }
+ TQString baseURL() const { return m_properties[BASE_URL]; }
+ TQString mimeType() const { return m_properties[MIME_TYPE]; }
+ TQString iconName() const { return m_properties[ICON_NAME]; }
bool isEncrypted() const { return m_properties[ENCRYPTED]=="true"; };
- QString clearDeviceUdi() const { return m_properties[CLEAR_DEVICE_UDI]; };
+ TQString clearDeviceUdi() const { return m_properties[CLEAR_DEVICE_UDI]; };
bool needMounting() const;
bool needDecryption() const;
KURL prettyBaseURL() const;
- QString prettyLabel() const;
+ TQString prettyLabel() const;
- void setName(const QString &name);
- void setLabel(const QString &label);
- void setUserLabel(const QString &label);
+ void setName(const TQString &name);
+ void setLabel(const TQString &label);
+ void setUserLabel(const TQString &label);
void setEncrypted(bool state);
bool mountableState(bool mounted);
- void mountableState(const QString &deviceNode,
- const QString &mountPoint,
- const QString &fsType, bool mounted);
- void mountableState(const QString &deviceNode,
- const QString &clearDeviceUdi,
- const QString &mountPoint,
- const QString &fsType, bool mounted);
- void unmountableState(const QString &baseURL = QString::null);
-
- void setMimeType(const QString &mimeType);
- void setIconName(const QString &iconName);
+ void mountableState(const TQString &deviceNode,
+ const TQString &mountPoint,
+ const TQString &fsType, bool mounted);
+ void mountableState(const TQString &deviceNode,
+ const TQString &clearDeviceUdi,
+ const TQString &mountPoint,
+ const TQString &fsType, bool mounted);
+ void unmountableState(const TQString &baseURL = TQString::null);
+
+ void setMimeType(const TQString &mimeType);
+ void setIconName(const TQString &iconName);
void setHalMounted(bool flag) const { m_halmounted = flag; }
bool halMounted() const { return m_halmounted; }
@@ -96,21 +96,21 @@ private:
Medium();
void loadUserLabel();
- QStringList m_properties;
+ TQStringList m_properties;
mutable bool m_halmounted;
-friend class QValueListNode<const Medium>;
+friend class TQValueListNode<const Medium>;
};
namespace MediaManagerUtils {
- static inline QMap<QString,QString> splitOptions(const QStringList & options)
+ static inline TQMap<TQString,TQString> splitOptions(const TQStringList & options)
{
- QMap<QString,QString> valids;
+ TQMap<TQString,TQString> valids;
- for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
+ for (TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
{
- QString key = (*it).left((*it).find('='));
- QString value = (*it).mid((*it).find('=') + 1);
+ TQString key = (*it).left((*it).find('='));
+ TQString value = (*it).mid((*it).find('=') + 1);
valids[key] = value;
}
return valids;
diff --git a/kioslave/media/libmediacommon/notifieraction.cpp b/kioslave/media/libmediacommon/notifieraction.cpp
index 3eea682d4..d10314701 100644
--- a/kioslave/media/libmediacommon/notifieraction.cpp
+++ b/kioslave/media/libmediacommon/notifieraction.cpp
@@ -19,7 +19,7 @@
#include "notifieraction.h"
-#include <qfile.h>
+#include <tqfile.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <kicontheme.h>
@@ -32,42 +32,42 @@ NotifierAction::~NotifierAction()
{
}
-void NotifierAction::setIconName(const QString &iconName)
+void NotifierAction::setIconName(const TQString &iconName)
{
m_iconName = iconName;
}
-void NotifierAction::setLabel(const QString &label)
+void NotifierAction::setLabel(const TQString &label)
{
m_label = label;
}
-QString NotifierAction::iconName() const
+TQString NotifierAction::iconName() const
{
return m_iconName;
}
-QPixmap NotifierAction::pixmap() const
+TQPixmap NotifierAction::pixmap() const
{
- QFile f( m_iconName );
+ TQFile f( m_iconName );
if ( f.exists() )
{
- return QPixmap( m_iconName );
+ return TQPixmap( m_iconName );
}
else
{
- QString path = KGlobal::iconLoader()->iconPath( m_iconName, -32 );
- return QPixmap( path );
+ TQString path = KGlobal::iconLoader()->iconPath( m_iconName, -32 );
+ return TQPixmap( path );
}
}
-QString NotifierAction::label() const
+TQString NotifierAction::label() const
{
return m_label;
}
-void NotifierAction::addAutoMimetype( const QString &mimetype )
+void NotifierAction::addAutoMimetype( const TQString &mimetype )
{
if ( !m_autoMimetypes.contains( mimetype ) )
{
@@ -75,12 +75,12 @@ void NotifierAction::addAutoMimetype( const QString &mimetype )
}
}
-void NotifierAction::removeAutoMimetype( const QString &mimetype )
+void NotifierAction::removeAutoMimetype( const TQString &mimetype )
{
m_autoMimetypes.remove( mimetype );
}
-QStringList NotifierAction::autoMimetypes()
+TQStringList NotifierAction::autoMimetypes()
{
return m_autoMimetypes;
}
@@ -90,7 +90,7 @@ bool NotifierAction::isWritable() const
return false;
}
-bool NotifierAction::supportsMimetype(const QString &/*mimetype*/) const
+bool NotifierAction::supportsMimetype(const TQString &/*mimetype*/) const
{
return true;
}
diff --git a/kioslave/media/libmediacommon/notifieraction.h b/kioslave/media/libmediacommon/notifieraction.h
index 028ce7433..21e2f01f4 100644
--- a/kioslave/media/libmediacommon/notifieraction.h
+++ b/kioslave/media/libmediacommon/notifieraction.h
@@ -21,8 +21,8 @@
#define _NOTIFIERACTION_H_
#include <kfileitem.h>
-#include <qstring.h>
-#include <qpixmap.h>
+#include <tqstring.h>
+#include <tqpixmap.h>
class NotifierSettings;
@@ -32,27 +32,27 @@ public:
NotifierAction();
virtual ~NotifierAction();
- virtual QString label() const;
- virtual QString iconName() const;
- virtual void setLabel( const QString &label );
- virtual void setIconName( const QString &icon );
+ virtual TQString label() const;
+ virtual TQString iconName() const;
+ virtual void setLabel( const TQString &label );
+ virtual void setIconName( const TQString &icon );
- QPixmap pixmap() const;
+ TQPixmap pixmap() const;
- QStringList autoMimetypes();
+ TQStringList autoMimetypes();
- virtual QString id() const = 0;
+ virtual TQString id() const = 0;
virtual bool isWritable() const;
- virtual bool supportsMimetype( const QString &mimetype ) const;
+ virtual bool supportsMimetype( const TQString &mimetype ) const;
virtual void execute( KFileItem &medium ) = 0;
private:
- void addAutoMimetype( const QString &mimetype );
- void removeAutoMimetype( const QString &mimetype );
+ void addAutoMimetype( const TQString &mimetype );
+ void removeAutoMimetype( const TQString &mimetype );
- QString m_label;
- QString m_iconName;
- QStringList m_autoMimetypes;
+ TQString m_label;
+ TQString m_iconName;
+ TQStringList m_autoMimetypes;
friend class NotifierSettings;
};
diff --git a/kioslave/media/libmediacommon/notifiernothingaction.cpp b/kioslave/media/libmediacommon/notifiernothingaction.cpp
index adf7fcf04..6a86ad92f 100644
--- a/kioslave/media/libmediacommon/notifiernothingaction.cpp
+++ b/kioslave/media/libmediacommon/notifiernothingaction.cpp
@@ -28,7 +28,7 @@ NotifierNothingAction::NotifierNothingAction()
setLabel(i18n("Do Nothing"));
}
-QString NotifierNothingAction::id() const
+TQString NotifierNothingAction::id() const
{
return "#NothinAction";
}
diff --git a/kioslave/media/libmediacommon/notifiernothingaction.h b/kioslave/media/libmediacommon/notifiernothingaction.h
index 6fd564f61..2c0d22cfb 100644
--- a/kioslave/media/libmediacommon/notifiernothingaction.h
+++ b/kioslave/media/libmediacommon/notifiernothingaction.h
@@ -26,7 +26,7 @@ class NotifierNothingAction : public NotifierAction
{
public:
NotifierNothingAction();
- virtual QString id() const;
+ virtual TQString id() const;
virtual void execute(KFileItem &medium);
};
diff --git a/kioslave/media/libmediacommon/notifieropenaction.cpp b/kioslave/media/libmediacommon/notifieropenaction.cpp
index 2cf664cc6..4d6d8025c 100644
--- a/kioslave/media/libmediacommon/notifieropenaction.cpp
+++ b/kioslave/media/libmediacommon/notifieropenaction.cpp
@@ -28,7 +28,7 @@ NotifierOpenAction::NotifierOpenAction()
setLabel(i18n("Open in New Window"));
}
-QString NotifierOpenAction::id() const
+TQString NotifierOpenAction::id() const
{
return "#OpenAction";
}
@@ -38,7 +38,7 @@ void NotifierOpenAction::execute(KFileItem &medium)
medium.run();
}
-bool NotifierOpenAction::supportsMimetype( const QString &mimetype ) const
+bool NotifierOpenAction::supportsMimetype( const TQString &mimetype ) const
{
return !mimetype.contains( "blank" ) && !mimetype.contains( "encrypted" );
}
diff --git a/kioslave/media/libmediacommon/notifieropenaction.h b/kioslave/media/libmediacommon/notifieropenaction.h
index 3239e5ca2..4fe8a614e 100644
--- a/kioslave/media/libmediacommon/notifieropenaction.h
+++ b/kioslave/media/libmediacommon/notifieropenaction.h
@@ -26,9 +26,9 @@ class NotifierOpenAction : public NotifierAction
{
public:
NotifierOpenAction();
- virtual QString id() const;
+ virtual TQString id() const;
virtual void execute(KFileItem &medium);
- bool supportsMimetype( const QString &mimetype ) const;
+ bool supportsMimetype( const TQString &mimetype ) const;
};
#endif
diff --git a/kioslave/media/libmediacommon/notifierserviceaction.cpp b/kioslave/media/libmediacommon/notifierserviceaction.cpp
index ee2401945..c7bece4f8 100644
--- a/kioslave/media/libmediacommon/notifierserviceaction.cpp
+++ b/kioslave/media/libmediacommon/notifierserviceaction.cpp
@@ -19,9 +19,9 @@
#include "notifierserviceaction.h"
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
#include <kstddirs.h>
#include <kdesktopfile.h>
#include <klocale.h>
@@ -37,11 +37,11 @@ NotifierServiceAction::NotifierServiceAction()
m_service.m_strExec = "konqueror %u";
}
-QString NotifierServiceAction::id() const
+TQString NotifierServiceAction::id() const
{
if (m_filePath.isEmpty() || m_service.m_strName.isEmpty())
{
- return QString();
+ return TQString();
}
else
{
@@ -49,13 +49,13 @@ QString NotifierServiceAction::id() const
}
}
-void NotifierServiceAction::setIconName( const QString &icon )
+void NotifierServiceAction::setIconName( const TQString &icon )
{
m_service.m_strIcon = icon;
NotifierAction::setIconName( icon );
}
-void NotifierServiceAction::setLabel( const QString &label )
+void NotifierServiceAction::setLabel( const TQString &label )
{
m_service.m_strName = label;
NotifierAction::setLabel( label );
@@ -84,12 +84,12 @@ KDEDesktopMimeType::Service NotifierServiceAction::service() const
return m_service;
}
-void NotifierServiceAction::setFilePath(const QString &filePath)
+void NotifierServiceAction::setFilePath(const TQString &filePath)
{
m_filePath = filePath;
}
-QString NotifierServiceAction::filePath() const
+TQString NotifierServiceAction::filePath() const
{
return m_filePath;
}
@@ -98,18 +98,18 @@ void NotifierServiceAction::updateFilePath()
{
if ( !m_filePath.isEmpty() ) return;
- QString action_name = m_service.m_strName;
+ TQString action_name = m_service.m_strName;
action_name.replace( " ", "_" );
- QDir actions_dir( locateLocal( "data", "konqueror/servicemenus/", true ) );
+ TQDir actions_dir( locateLocal( "data", "konqueror/servicemenus/", true ) );
- QString filename = actions_dir.absFilePath( action_name + ".desktop" );
+ TQString filename = actions_dir.absFilePath( action_name + ".desktop" );
int counter = 1;
- while ( QFile::exists( filename ) )
+ while ( TQFile::exists( filename ) )
{
filename = actions_dir.absFilePath( action_name
- + QString::number( counter )
+ + TQString::number( counter )
+ ".desktop" );
counter++;
}
@@ -117,19 +117,19 @@ void NotifierServiceAction::updateFilePath()
m_filePath = filename;
}
-void NotifierServiceAction::setMimetypes(const QStringList &mimetypes)
+void NotifierServiceAction::setMimetypes(const TQStringList &mimetypes)
{
m_mimetypes = mimetypes;
}
-QStringList NotifierServiceAction::mimetypes()
+TQStringList NotifierServiceAction::mimetypes()
{
return m_mimetypes;
}
bool NotifierServiceAction::isWritable() const
{
- QFileInfo info( m_filePath );
+ TQFileInfo info( m_filePath );
if ( info.exists() )
{
@@ -137,30 +137,30 @@ bool NotifierServiceAction::isWritable() const
}
else
{
- info = QFileInfo( info.dirPath() );
+ info = TQFileInfo( info.dirPath() );
return info.isWritable();
}
}
-bool NotifierServiceAction::supportsMimetype(const QString &mimetype) const
+bool NotifierServiceAction::supportsMimetype(const TQString &mimetype) const
{
return m_mimetypes.contains(mimetype);
}
void NotifierServiceAction::save() const
{
- QFile::remove( m_filePath );
+ TQFile::remove( m_filePath );
KDesktopFile desktopFile(m_filePath);
- desktopFile.setGroup(QString("Desktop Action ") + m_service.m_strName);
- desktopFile.writeEntry(QString("Icon"), m_service.m_strIcon);
- desktopFile.writeEntry(QString("Name"), m_service.m_strName);
- desktopFile.writeEntry(QString("Exec"), m_service.m_strExec);
+ desktopFile.setGroup(TQString("Desktop Action ") + m_service.m_strName);
+ desktopFile.writeEntry(TQString("Icon"), m_service.m_strIcon);
+ desktopFile.writeEntry(TQString("Name"), m_service.m_strName);
+ desktopFile.writeEntry(TQString("Exec"), m_service.m_strExec);
desktopFile.setDesktopGroup();
- desktopFile.writeEntry(QString("ServiceTypes"), m_mimetypes, ",");
- desktopFile.writeEntry(QString("Actions"),
- QStringList(m_service.m_strName),";");
+ desktopFile.writeEntry(TQString("ServiceTypes"), m_mimetypes, ",");
+ desktopFile.writeEntry(TQString("Actions"),
+ TQStringList(m_service.m_strName),";");
}
diff --git a/kioslave/media/libmediacommon/notifierserviceaction.h b/kioslave/media/libmediacommon/notifierserviceaction.h
index 4d61a6b74..829193fba 100644
--- a/kioslave/media/libmediacommon/notifierserviceaction.h
+++ b/kioslave/media/libmediacommon/notifierserviceaction.h
@@ -21,7 +21,7 @@
#define _NOTIFIERSERVICEACTION_H_
#include <kmimetype.h>
-#include <qstring.h>
+#include <tqstring.h>
#include "notifieraction.h"
@@ -29,23 +29,23 @@ class NotifierServiceAction : public NotifierAction
{
public:
NotifierServiceAction();
- virtual QString id() const;
+ virtual TQString id() const;
virtual void execute(KFileItem &item);
- virtual void setIconName( const QString &icon );
- virtual void setLabel( const QString &label );
+ virtual void setIconName( const TQString &icon );
+ virtual void setLabel( const TQString &label );
void setService(KDEDesktopMimeType::Service service);
KDEDesktopMimeType::Service service() const;
- void setFilePath(const QString &filePath);
- QString filePath() const;
+ void setFilePath(const TQString &filePath);
+ TQString filePath() const;
- void setMimetypes(const QStringList &mimetypes);
- QStringList mimetypes();
+ void setMimetypes(const TQStringList &mimetypes);
+ TQStringList mimetypes();
virtual bool isWritable() const;
- virtual bool supportsMimetype(const QString &mimetype) const;
+ virtual bool supportsMimetype(const TQString &mimetype) const;
void save() const;
@@ -53,8 +53,8 @@ private:
void updateFilePath();
KDEDesktopMimeType::Service m_service;
- QString m_filePath;
- QStringList m_mimetypes;
+ TQString m_filePath;
+ TQStringList m_mimetypes;
};
#endif
diff --git a/kioslave/media/libmediacommon/notifiersettings.cpp b/kioslave/media/libmediacommon/notifiersettings.cpp
index c7ba40e85..d1ab55d87 100644
--- a/kioslave/media/libmediacommon/notifiersettings.cpp
+++ b/kioslave/media/libmediacommon/notifiersettings.cpp
@@ -22,8 +22,8 @@
#include <kglobal.h>
#include <kdesktopfile.h>
#include <kstandarddirs.h>
-#include <qdir.h>
-#include <qfile.h>
+#include <tqdir.h>
+#include <tqfile.h>
#include "notifieropenaction.h"
#include "notifiernothingaction.h"
@@ -81,22 +81,22 @@ NotifierSettings::~NotifierSettings()
}
}
-QValueList<NotifierAction*> NotifierSettings::actions()
+TQValueList<NotifierAction*> NotifierSettings::actions()
{
return m_actions;
}
-const QStringList &NotifierSettings::supportedMimetypes()
+const TQStringList &NotifierSettings::supportedMimetypes()
{
return m_supportedMimetypes;
}
-QValueList<NotifierAction*> NotifierSettings::actionsForMimetype( const QString &mimetype )
+TQValueList<NotifierAction*> NotifierSettings::actionsForMimetype( const TQString &mimetype )
{
- QValueList<NotifierAction*> result;
+ TQValueList<NotifierAction*> result;
- QValueList<NotifierAction*>::iterator it = m_actions.begin();
- QValueList<NotifierAction*>::iterator end = m_actions.end();
+ TQValueList<NotifierAction*>::iterator it = m_actions.begin();
+ TQValueList<NotifierAction*>::iterator end = m_actions.end();
for ( ; it!=end; ++it )
{
@@ -128,9 +128,9 @@ bool NotifierSettings::deleteAction( NotifierServiceAction *action )
m_idMap.remove( action->id() );
m_deletedActions.append( action );
- QStringList auto_mimetypes = action->autoMimetypes();
- QStringList::iterator it = auto_mimetypes.begin();
- QStringList::iterator end = auto_mimetypes.end();
+ TQStringList auto_mimetypes = action->autoMimetypes();
+ TQStringList::iterator it = auto_mimetypes.begin();
+ TQStringList::iterator end = auto_mimetypes.end();
for ( ; it!=end; ++it )
{
@@ -143,7 +143,7 @@ bool NotifierSettings::deleteAction( NotifierServiceAction *action )
return false;
}
-void NotifierSettings::setAutoAction( const QString &mimetype, NotifierAction *action )
+void NotifierSettings::setAutoAction( const TQString &mimetype, NotifierAction *action )
{
resetAutoAction( mimetype );
m_autoMimetypesMap[mimetype] = action;
@@ -151,7 +151,7 @@ void NotifierSettings::setAutoAction( const QString &mimetype, NotifierAction *a
}
-void NotifierSettings::resetAutoAction( const QString &mimetype )
+void NotifierSettings::resetAutoAction( const TQString &mimetype )
{
if ( m_autoMimetypesMap.contains( mimetype ) )
{
@@ -163,13 +163,13 @@ void NotifierSettings::resetAutoAction( const QString &mimetype )
void NotifierSettings::clearAutoActions()
{
- QMap<QString,NotifierAction*>::iterator it = m_autoMimetypesMap.begin();
- QMap<QString,NotifierAction*>::iterator end = m_autoMimetypesMap.end();
+ TQMap<TQString,NotifierAction*>::iterator it = m_autoMimetypesMap.begin();
+ TQMap<TQString,NotifierAction*>::iterator end = m_autoMimetypesMap.end();
for ( ; it!=end; ++it )
{
NotifierAction *action = it.data();
- QString mimetype = it.key();
+ TQString mimetype = it.key();
if ( action )
action->removeAutoMimetype( mimetype );
@@ -177,7 +177,7 @@ void NotifierSettings::clearAutoActions()
}
}
-NotifierAction *NotifierSettings::autoActionForMimetype( const QString &mimetype )
+NotifierAction *NotifierSettings::autoActionForMimetype( const TQString &mimetype )
{
if ( m_autoMimetypesMap.contains( mimetype ) )
{
@@ -212,10 +212,10 @@ void NotifierSettings::reload()
m_actions.append( open );
m_idMap[ open->id() ] = open;
- QValueList<NotifierServiceAction*> services = listServices();
+ TQValueList<NotifierServiceAction*> services = listServices();
- QValueList<NotifierServiceAction*>::iterator serv_it = services.begin();
- QValueList<NotifierServiceAction*>::iterator serv_end = services.end();
+ TQValueList<NotifierServiceAction*>::iterator serv_it = services.begin();
+ TQValueList<NotifierServiceAction*>::iterator serv_end = services.end();
for ( ; serv_it!=serv_end; ++serv_it )
{
@@ -228,15 +228,15 @@ void NotifierSettings::reload()
m_idMap[ nothing->id() ] = nothing;
KConfig config( "medianotifierrc", true );
- QMap<QString,QString> auto_actions_map = config.entryMap( "Auto Actions" );
+ TQMap<TQString,TQString> auto_actions_map = config.entryMap( "Auto Actions" );
- QMap<QString,QString>::iterator auto_it = auto_actions_map.begin();
- QMap<QString,QString>::iterator auto_end = auto_actions_map.end();
+ TQMap<TQString,TQString>::iterator auto_it = auto_actions_map.begin();
+ TQMap<TQString,TQString>::iterator auto_end = auto_actions_map.end();
for ( ; auto_it!=auto_end; ++auto_it )
{
- QString mime = auto_it.key();
- QString action_id = auto_it.data();
+ TQString mime = auto_it.key();
+ TQString action_id = auto_it.data();
if ( m_idMap.contains( action_id ) )
{
@@ -250,8 +250,8 @@ void NotifierSettings::reload()
}
void NotifierSettings::save()
{
- QValueList<NotifierAction*>::iterator act_it = m_actions.begin();
- QValueList<NotifierAction*>::iterator act_end = m_actions.end();
+ TQValueList<NotifierAction*>::iterator act_it = m_actions.begin();
+ TQValueList<NotifierAction*>::iterator act_end = m_actions.end();
for ( ; act_it!=act_end; ++act_it )
{
@@ -267,15 +267,15 @@ void NotifierSettings::save()
{
NotifierServiceAction *a = m_deletedActions.first();
m_deletedActions.remove( a );
- QFile::remove( a->filePath() );
+ TQFile::remove( a->filePath() );
delete a;
}
KSimpleConfig config( "medianotifierrc" );
config.setGroup( "Auto Actions" );
- QMap<QString,NotifierAction*>::iterator auto_it = m_autoMimetypesMap.begin();
- QMap<QString,NotifierAction*>::iterator auto_end = m_autoMimetypesMap.end();
+ TQMap<TQString,NotifierAction*>::iterator auto_it = m_autoMimetypesMap.begin();
+ TQMap<TQString,NotifierAction*>::iterator auto_end = m_autoMimetypesMap.end();
for ( ; auto_it!=auto_end; ++auto_it )
{
@@ -290,20 +290,20 @@ void NotifierSettings::save()
}
}
-QValueList<NotifierServiceAction*> NotifierSettings::loadActions( KDesktopFile &desktop ) const
+TQValueList<NotifierServiceAction*> NotifierSettings::loadActions( KDesktopFile &desktop ) const
{
desktop.setDesktopGroup();
- QValueList<NotifierServiceAction*> services;
+ TQValueList<NotifierServiceAction*> services;
- const QString filename = desktop.fileName();
- const QStringList mimetypes = desktop.readListEntry( "ServiceTypes" );
+ const TQString filename = desktop.fileName();
+ const TQStringList mimetypes = desktop.readListEntry( "ServiceTypes" );
- QValueList<KDEDesktopMimeType::Service> type_services
+ TQValueList<KDEDesktopMimeType::Service> type_services
= KDEDesktopMimeType::userDefinedServices(filename, true);
- QValueList<KDEDesktopMimeType::Service>::iterator service_it = type_services.begin();
- QValueList<KDEDesktopMimeType::Service>::iterator service_end = type_services.end();
+ TQValueList<KDEDesktopMimeType::Service>::iterator service_it = type_services.begin();
+ TQValueList<KDEDesktopMimeType::Service>::iterator service_end = type_services.end();
for (; service_it!=service_end; ++service_it)
{
NotifierServiceAction *service_action
@@ -320,7 +320,7 @@ QValueList<NotifierServiceAction*> NotifierSettings::loadActions( KDesktopFile &
}
-bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const QString &mimetype ) const
+bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString &mimetype ) const
{
desktop.setDesktopGroup();
@@ -328,19 +328,19 @@ bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const QString &
&& desktop.hasKey( "ServiceTypes" )
&& !desktop.readBoolEntry( "X-KDE-MediaNotifierHide", false ) )
{
- const QStringList actions = desktop.readListEntry( "Actions" );
+ const TQStringList actions = desktop.readListEntry( "Actions" );
if ( actions.size()!=1 )
{
return false;
}
- const QStringList types = desktop.readListEntry( "ServiceTypes" );
+ const TQStringList types = desktop.readListEntry( "ServiceTypes" );
if ( mimetype.isEmpty() )
{
- QStringList::ConstIterator type_it = types.begin();
- QStringList::ConstIterator type_end = types.end();
+ TQStringList::ConstIterator type_it = types.begin();
+ TQStringList::ConstIterator type_end = types.end();
for (; type_it != type_end; ++type_it)
{
if ( (*type_it).startsWith( "media/" ) )
@@ -358,25 +358,25 @@ bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const QString &
return false;
}
-QValueList<NotifierServiceAction*> NotifierSettings::listServices( const QString &mimetype ) const
+TQValueList<NotifierServiceAction*> NotifierSettings::listServices( const TQString &mimetype ) const
{
- QValueList<NotifierServiceAction*> services;
- QStringList dirs = KGlobal::dirs()->findDirs("data", "konqueror/servicemenus/");
+ TQValueList<NotifierServiceAction*> services;
+ TQStringList dirs = KGlobal::dirs()->findDirs("data", "konqueror/servicemenus/");
- QStringList::ConstIterator dir_it = dirs.begin();
- QStringList::ConstIterator dir_end = dirs.end();
+ TQStringList::ConstIterator dir_it = dirs.begin();
+ TQStringList::ConstIterator dir_end = dirs.end();
for (; dir_it != dir_end; ++dir_it)
{
- QDir dir( *dir_it );
+ TQDir dir( *dir_it );
- QStringList entries = dir.entryList( "*.desktop", QDir::Files );
+ TQStringList entries = dir.entryList( "*.desktop", TQDir::Files );
- QStringList::ConstIterator entry_it = entries.begin();
- QStringList::ConstIterator entry_end = entries.end();
+ TQStringList::ConstIterator entry_it = entries.begin();
+ TQStringList::ConstIterator entry_end = entries.end();
for (; entry_it != entry_end; ++entry_it )
{
- QString filename = *dir_it + *entry_it;
+ TQString filename = *dir_it + *entry_it;
KDesktopFile desktop( filename, true );
diff --git a/kioslave/media/libmediacommon/notifiersettings.h b/kioslave/media/libmediacommon/notifiersettings.h
index 6ddee318b..dee5c440b 100644
--- a/kioslave/media/libmediacommon/notifiersettings.h
+++ b/kioslave/media/libmediacommon/notifiersettings.h
@@ -20,8 +20,8 @@
#ifndef _NOTIFIERSETTINGS_H_
#define _NOTIFIERSETTINGS_H_
-#include <qvaluelist.h>
-#include <qmap.h>
+#include <tqvaluelist.h>
+#include <tqmap.h>
#include "notifieraction.h"
#include "notifierserviceaction.h"
@@ -33,31 +33,31 @@ public:
NotifierSettings();
~NotifierSettings();
- QValueList<NotifierAction*> actions();
- QValueList<NotifierAction*> actionsForMimetype( const QString &mimetype );
+ TQValueList<NotifierAction*> actions();
+ TQValueList<NotifierAction*> actionsForMimetype( const TQString &mimetype );
bool addAction( NotifierServiceAction *action );
bool deleteAction( NotifierServiceAction *action );
- void setAutoAction( const QString &mimetype, NotifierAction *action );
- void resetAutoAction( const QString &mimetype );
+ void setAutoAction( const TQString &mimetype, NotifierAction *action );
+ void resetAutoAction( const TQString &mimetype );
void clearAutoActions();
- NotifierAction *autoActionForMimetype( const QString &mimetype );
+ NotifierAction *autoActionForMimetype( const TQString &mimetype );
- const QStringList &supportedMimetypes();
+ const TQStringList &supportedMimetypes();
void reload();
void save();
private:
- QValueList<NotifierServiceAction*> listServices( const QString &mimetype = QString() ) const;
- bool shouldLoadActions( KDesktopFile &desktop, const QString &mimetype ) const;
- QValueList<NotifierServiceAction*> loadActions( KDesktopFile &desktop ) const;
-
- QStringList m_supportedMimetypes;
- QValueList<NotifierAction*> m_actions;
- QValueList<NotifierServiceAction*> m_deletedActions;
- QMap<QString,NotifierAction*> m_idMap;
- QMap<QString,NotifierAction*> m_autoMimetypesMap;
+ TQValueList<NotifierServiceAction*> listServices( const TQString &mimetype = TQString() ) const;
+ bool shouldLoadActions( KDesktopFile &desktop, const TQString &mimetype ) const;
+ TQValueList<NotifierServiceAction*> loadActions( KDesktopFile &desktop ) const;
+
+ TQStringList m_supportedMimetypes;
+ TQValueList<NotifierAction*> m_actions;
+ TQValueList<NotifierServiceAction*> m_deletedActions;
+ TQMap<TQString,NotifierAction*> m_idMap;
+ TQMap<TQString,NotifierAction*> m_autoMimetypesMap;
};
#endif
diff --git a/kioslave/media/mediaimpl.cpp b/kioslave/media/mediaimpl.cpp
index 516bcdb01..fb9e01480 100644
--- a/kioslave/media/mediaimpl.cpp
+++ b/kioslave/media/mediaimpl.cpp
@@ -28,20 +28,20 @@
#include <kmimetype.h>
#include <kapplication.h>
-#include <qeventloop.h>
+#include <tqeventloop.h>
#include <sys/stat.h>
#include "medium.h"
-MediaImpl::MediaImpl() : QObject(), DCOPObject("mediaimpl"), mp_mounting(0L)
+MediaImpl::MediaImpl() : TQObject(), DCOPObject("mediaimpl"), mp_mounting(0L)
{
}
-bool MediaImpl::parseURL(const KURL &url, QString &name, QString &path) const
+bool MediaImpl::parseURL(const KURL &url, TQString &name, TQString &path) const
{
- QString url_path = url.path();
+ TQString url_path = url.path();
int i = url_path.find('/', 1);
if (i > 0)
@@ -52,13 +52,13 @@ bool MediaImpl::parseURL(const KURL &url, QString &name, QString &path) const
else
{
name = url_path.mid(1);
- path = QString::null;
+ path = TQString::null;
}
- return name != QString::null;
+ return name != TQString::null;
}
-bool MediaImpl::realURL(const QString &name, const QString &path, KURL &url)
+bool MediaImpl::realURL(const TQString &name, const TQString &path, KURL &url)
{
bool ok;
Medium m = findMediumByName(name, ok);
@@ -73,7 +73,7 @@ bool MediaImpl::realURL(const QString &name, const QString &path, KURL &url)
}
-bool MediaImpl::statMedium(const QString &name, KIO::UDSEntry &entry)
+bool MediaImpl::statMedium(const TQString &name, KIO::UDSEntry &entry)
{
kdDebug(1219) << "MediaImpl::statMedium: " << name << endl;
@@ -100,7 +100,7 @@ bool MediaImpl::statMedium(const QString &name, KIO::UDSEntry &entry)
return true;
}
-bool MediaImpl::statMediumByLabel(const QString &label, KIO::UDSEntry &entry)
+bool MediaImpl::statMediumByLabel(const TQString &label, KIO::UDSEntry &entry)
{
kdDebug(1219) << "MediaImpl::statMediumByLabel: " << label << endl;
@@ -114,7 +114,7 @@ bool MediaImpl::statMediumByLabel(const QString &label, KIO::UDSEntry &entry)
return false;
}
- QString name = reply;
+ TQString name = reply;
if (name.isEmpty())
{
@@ -126,7 +126,7 @@ bool MediaImpl::statMediumByLabel(const QString &label, KIO::UDSEntry &entry)
}
-bool MediaImpl::listMedia(QValueList<KIO::UDSEntry> &list)
+bool MediaImpl::listMedia(TQValueList<KIO::UDSEntry> &list)
{
kdDebug(1219) << "MediaImpl::listMedia" << endl;
@@ -159,7 +159,7 @@ bool MediaImpl::listMedia(QValueList<KIO::UDSEntry> &list)
return true;
}
-bool MediaImpl::setUserLabel(const QString &name, const QString &label)
+bool MediaImpl::setUserLabel(const TQString &name, const TQString &label)
{
kdDebug(1219) << "MediaImpl::setUserLabel: " << name << ", " << label << endl;
@@ -175,7 +175,7 @@ bool MediaImpl::setUserLabel(const QString &name, const QString &label)
}
else
{
- QString returned_name = reply;
+ TQString returned_name = reply;
if (!returned_name.isEmpty()
&& returned_name!=name)
{
@@ -199,7 +199,7 @@ bool MediaImpl::setUserLabel(const QString &name, const QString &label)
}
}
-const Medium MediaImpl::findMediumByName(const QString &name, bool &ok)
+const Medium MediaImpl::findMediumByName(const TQString &name, bool &ok)
{
DCOPRef mediamanager("kded", "mediamanager");
DCOPReply reply = mediamanager.call( "properties", name );
@@ -246,16 +246,16 @@ bool MediaImpl::ensureMediumMounted(Medium &medium)
medium.deviceNode(),
medium.mountPoint());
job->setAutoWarningHandlingEnabled(false);
- connect( job, SIGNAL( result( KIO::Job * ) ),
- this, SLOT( slotMountResult( KIO::Job * ) ) );
- connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ),
- this, SLOT( slotWarning( KIO::Job *, const QString & ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
+ this, TQT_SLOT( slotMountResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( warning( KIO::Job *, const TQString & ) ),
+ this, TQT_SLOT( slotWarning( KIO::Job *, const TQString & ) ) );
*/
kapp->dcopClient()
->connectDCOPSignal("kded", "mediamanager",
- "mediumChanged(QString, bool)",
+ "mediumChanged(TQString, bool)",
"mediaimpl",
- "slotMediumChanged(QString)",
+ "slotMediumChanged(TQString)",
false);
DCOPRef mediamanager("kded", "mediamanager");
@@ -274,9 +274,9 @@ bool MediaImpl::ensureMediumMounted(Medium &medium)
kapp->dcopClient()
->disconnectDCOPSignal("kded", "mediamanager",
- "mediumChanged(QString, bool)",
+ "mediumChanged(TQString, bool)",
"mediaimpl",
- "slotMediumChanged(QString)");
+ "slotMediumChanged(TQString)");
return m_lastErrorCode==0;
}
@@ -284,7 +284,7 @@ bool MediaImpl::ensureMediumMounted(Medium &medium)
return true;
}
-void MediaImpl::slotWarning( KIO::Job * /*job*/, const QString &msg )
+void MediaImpl::slotWarning( KIO::Job * /*job*/, const TQString &msg )
{
emit warning( msg );
}
@@ -301,7 +301,7 @@ void MediaImpl::slotMountResult(KIO::Job *job)
}
}
-void MediaImpl::slotMediumChanged(const QString &name)
+void MediaImpl::slotMediumChanged(const TQString &name)
{
kdDebug(1219) << "MediaImpl::slotMediumChanged:" << name << endl;
@@ -315,7 +315,7 @@ void MediaImpl::slotMediumChanged(const QString &name)
}
static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l,
- const QString &s = QString::null)
+ const TQString &s = TQString::null)
{
KIO::UDSAtom atom;
atom.m_uds = ID;
@@ -353,10 +353,10 @@ KIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url)
KIO::StatJob *job = KIO::stat(url, false);
job->setAutoWarningHandlingEnabled( false );
- connect( job, SIGNAL( result(KIO::Job *) ),
- this, SLOT( slotStatResult(KIO::Job *) ) );
- connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ),
- this, SLOT( slotWarning( KIO::Job *, const QString & ) ) );
+ connect( job, TQT_SIGNAL( result(KIO::Job *) ),
+ this, TQT_SLOT( slotStatResult(KIO::Job *) ) );
+ connect( job, TQT_SIGNAL( warning( KIO::Job *, const TQString & ) ),
+ this, TQT_SLOT( slotWarning( KIO::Job *, const TQString & ) ) );
qApp->eventLoop()->enterLoop();
KIO::UDSEntry::iterator it = m_entryBuffer.begin();
@@ -395,7 +395,7 @@ void MediaImpl::createMediumEntry(KIO::UDSEntry& entry,
{
kdDebug(1219) << "MediaProtocol::createMedium" << endl;
- QString url = "media:/"+medium.name();
+ TQString url = "media:/"+medium.name();
kdDebug(1219) << "url = " << url << ", mime = " << medium.mimeType() << endl;
@@ -403,7 +403,7 @@ void MediaImpl::createMediumEntry(KIO::UDSEntry& entry,
addAtom(entry, KIO::UDS_URL, 0, url);
- QString label = KIO::encodeFileName( medium.prettyLabel() );
+ TQString label = KIO::encodeFileName( medium.prettyLabel() );
addAtom(entry, KIO::UDS_NAME, 0, label);
addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR);
@@ -417,8 +417,8 @@ void MediaImpl::createMediumEntry(KIO::UDSEntry& entry,
}
else
{
- QString mime = medium.mimeType();
- QString icon = KMimeType::mimeType(mime)->icon(mime, false);
+ TQString mime = medium.mimeType();
+ TQString icon = KMimeType::mimeType(mime)->icon(mime, false);
addAtom(entry, KIO::UDS_ICON_NAME, 0, icon);
}
diff --git a/kioslave/media/mediaimpl.h b/kioslave/media/mediaimpl.h
index 2d82aefda..92b1d0202 100644
--- a/kioslave/media/mediaimpl.h
+++ b/kioslave/media/mediaimpl.h
@@ -25,43 +25,43 @@
#include <kurl.h>
#include <dcopobject.h>
-#include <qobject.h>
-#include <qstring.h>
+#include <tqobject.h>
+#include <tqstring.h>
#include "medium.h"
-class MediaImpl : public QObject, public DCOPObject
+class MediaImpl : public TQObject, public DCOPObject
{
Q_OBJECT
K_DCOP
public:
MediaImpl();
- bool parseURL(const KURL &url, QString &name, QString &path) const;
- bool realURL(const QString &name, const QString &path, KURL &url);
+ bool parseURL(const KURL &url, TQString &name, TQString &path) const;
+ bool realURL(const TQString &name, const TQString &path, KURL &url);
- bool statMedium(const QString &name, KIO::UDSEntry &entry);
- bool statMediumByLabel(const QString &label, KIO::UDSEntry &entry);
- bool listMedia(QValueList<KIO::UDSEntry> &list);
- bool setUserLabel(const QString &name, const QString &label);
+ bool statMedium(const TQString &name, KIO::UDSEntry &entry);
+ bool statMediumByLabel(const TQString &label, KIO::UDSEntry &entry);
+ bool listMedia(TQValueList<KIO::UDSEntry> &list);
+ bool setUserLabel(const TQString &name, const TQString &label);
void createTopLevelEntry(KIO::UDSEntry& entry) const;
int lastErrorCode() const { return m_lastErrorCode; }
- QString lastErrorMessage() const { return m_lastErrorMessage; }
+ TQString lastErrorMessage() const { return m_lastErrorMessage; }
k_dcop:
- void slotMediumChanged(const QString &name);
+ void slotMediumChanged(const TQString &name);
signals:
- void warning(const QString &msg);
+ void warning(const TQString &msg);
private slots:
- void slotWarning(KIO::Job *job, const QString &msg);
+ void slotWarning(KIO::Job *job, const TQString &msg);
void slotMountResult(KIO::Job *job);
void slotStatResult(KIO::Job *job);
private:
- const Medium findMediumByName(const QString &name, bool &ok);
+ const Medium findMediumByName(const TQString &name, bool &ok);
bool ensureMediumMounted(Medium &medium);
KIO::UDSEntry extractUrlInfos(const KURL &url);
@@ -75,7 +75,7 @@ private:
/// Last error code stored in class to simplify API.
/// Note that this means almost no method can be const.
int m_lastErrorCode;
- QString m_lastErrorMessage;
+ TQString m_lastErrorMessage;
};
#endif
diff --git a/kioslave/media/mediamanager/fstabbackend.cpp b/kioslave/media/mediamanager/fstabbackend.cpp
index 4ffcf4b2d..189f52aee 100644
--- a/kioslave/media/mediamanager/fstabbackend.cpp
+++ b/kioslave/media/mediamanager/fstabbackend.cpp
@@ -33,7 +33,7 @@
#define CDC_CD_R 0x2000 /* drive is a CD-R */
#define CDC_CD_RW 0x4000 /* drive is a CD-RW */
#define CDC_DVD 0x8000 /* drive is a DVD */
-#include <qfile.h>
+#include <tqfile.h>
#endif
#include <klocale.h>
@@ -56,13 +56,13 @@
FstabBackend::FstabBackend(MediaList &list, bool networkSharesOnly)
- : QObject(), BackendBase(list), m_networkSharesOnly(networkSharesOnly)
+ : TQObject(), BackendBase(list), m_networkSharesOnly(networkSharesOnly)
{
KDirWatch::self()->addFile(MTAB);
KDirWatch::self()->addFile(FSTAB);
- connect( KDirWatch::self(), SIGNAL( dirty(const QString&) ),
- this, SLOT( slotDirty(const QString&) ) );
+ connect( KDirWatch::self(), TQT_SIGNAL( dirty(const TQString&) ),
+ this, TQT_SLOT( slotDirty(const TQString&) ) );
handleFstabChange(false);
handleMtabChange(false);
@@ -70,16 +70,16 @@ FstabBackend::FstabBackend(MediaList &list, bool networkSharesOnly)
KDirWatch::self()->startScan();
#ifdef Q_OS_FREEBSD
- connect( &m_mtabTimer, SIGNAL( timeout() ),
- this, SLOT( handleMtabChange() ) );
+ connect( &m_mtabTimer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( handleMtabChange() ) );
m_mtabTimer.start(250);
#endif
}
FstabBackend::~FstabBackend()
{
- QStringList::iterator it = m_mtabIds.begin();
- QStringList::iterator end = m_mtabIds.end();
+ TQStringList::iterator it = m_mtabIds.begin();
+ TQStringList::iterator end = m_mtabIds.end();
for (; it!=end; ++it)
{
@@ -97,27 +97,27 @@ FstabBackend::~FstabBackend()
KDirWatch::self()->removeFile(MTAB);
}
-QString FstabBackend::mount( const QString &_udi )
+TQString FstabBackend::mount( const TQString &_udi )
{
const Medium* medium = m_mediaList.findById(_udi);
if (!medium)
return i18n("No such medium: %1").arg(_udi);
KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint());
KIO::NetAccess::synchronousRun( job, 0 );
- return QString::null;
+ return TQString::null;
}
-QString FstabBackend::unmount( const QString &_udi )
+TQString FstabBackend::unmount( const TQString &_udi )
{
const Medium* medium = m_mediaList.findById(_udi);
if (!medium)
return i18n("No such medium: %1").arg(_udi);
KIO::Job* job = KIO::unmount( medium->mountPoint(), false);
KIO::NetAccess::synchronousRun( job, 0 );
- return QString::null;
+ return TQString::null;
}
-void FstabBackend::slotDirty(const QString &path)
+void FstabBackend::slotDirty(const TQString &path)
{
if (path==MTAB)
{
@@ -169,7 +169,7 @@ bool inExclusionPattern(KMountPoint *mount, bool networkSharesOnly)
void FstabBackend::handleMtabChange(bool allowNotification)
{
- QStringList new_mtabIds;
+ TQStringList new_mtabIds;
KMountPoint::List mtab = KMountPoint::currentMountPoints();
KMountPoint::List::iterator it = mtab.begin();
@@ -177,28 +177,28 @@ void FstabBackend::handleMtabChange(bool allowNotification)
for (; it!=end; ++it)
{
- QString dev = (*it)->mountedFrom();
- QString mp = (*it)->mountPoint();
- QString fs = (*it)->mountType();
+ TQString dev = (*it)->mountedFrom();
+ TQString mp = (*it)->mountPoint();
+ TQString fs = (*it)->mountType();
if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue;
/* Did we know this already before ? If yes, then
nothing has changed, do not stat the mount point. Avoids
hang if network shares are stalling */
- QString mtabEntry = dev + "*" + mp + "*" + fs;
+ TQString mtabEntry = dev + "*" + mp + "*" + fs;
if(m_mtabEntries.contains(mtabEntry)) {
new_mtabIds += m_mtabEntries[mtabEntry];
continue;
}
- QString id = generateId(dev, mp);
+ TQString id = generateId(dev, mp);
new_mtabIds+=id;
m_mtabEntries[mtabEntry] = id;
if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) )
{
- QString mime, icon, label;
+ TQString mime, icon, label;
guess(dev, mp, fs, true, mime, icon, label);
m_mediaList.changeMediumState(id, true, false,
mime, icon, label);
@@ -206,13 +206,13 @@ void FstabBackend::handleMtabChange(bool allowNotification)
#if 0
else if ( !m_mtabIds.contains(id) )
{
- QString name = generateName(dev, fs);
+ TQString name = generateName(dev, fs);
Medium *m = new Medium(id, name);
m->mountableState(dev, mp, fs, true);
- QString mime, icon, label;
+ TQString mime, icon, label;
guess(dev, mp, fs, true, mime, icon, label);
m->setMimeType(mime);
@@ -224,8 +224,8 @@ void FstabBackend::handleMtabChange(bool allowNotification)
#endif
}
- QStringList::iterator it2 = m_mtabIds.begin();
- QStringList::iterator end2 = m_mtabIds.end();
+ TQStringList::iterator it2 = m_mtabIds.begin();
+ TQStringList::iterator end2 = m_mtabIds.end();
for (; it2!=end2; ++it2)
{
@@ -233,15 +233,15 @@ void FstabBackend::handleMtabChange(bool allowNotification)
{
const Medium *medium = m_mediaList.findById(*it2);
- QString dev = medium->deviceNode();
- QString mp = medium->mountPoint();
- QString fs = medium->fsType();
+ TQString dev = medium->deviceNode();
+ TQString mp = medium->mountPoint();
+ TQString fs = medium->fsType();
- QString mtabEntry = dev + "*" + mp + "*" + fs;
+ TQString mtabEntry = dev + "*" + mp + "*" + fs;
m_mtabEntries.remove(mtabEntry);
- QString mime, icon, label;
+ TQString mime, icon, label;
guess(dev, mp, fs, false, mime, icon, label);
m_mediaList.changeMediumState(*it2, false, false,
@@ -260,7 +260,7 @@ void FstabBackend::handleMtabChange(bool allowNotification)
void FstabBackend::handleFstabChange(bool allowNotification)
{
- QStringList new_fstabIds;
+ TQStringList new_fstabIds;
KMountPoint::List fstab = KMountPoint::possibleMountPoints();
KMountPoint::List::iterator it = fstab.begin();
@@ -268,24 +268,24 @@ void FstabBackend::handleFstabChange(bool allowNotification)
for (; it!=end; ++it)
{
- QString dev = (*it)->mountedFrom();
- QString mp = (*it)->mountPoint();
- QString fs = (*it)->mountType();
+ TQString dev = (*it)->mountedFrom();
+ TQString mp = (*it)->mountPoint();
+ TQString fs = (*it)->mountType();
if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue;
- QString id = generateId(dev, mp);
+ TQString id = generateId(dev, mp);
new_fstabIds+=id;
if ( !m_fstabIds.contains(id) )
{
- QString name = generateName(dev, fs);
+ TQString name = generateName(dev, fs);
Medium *m = new Medium(id, name);
m->mountableState(dev, mp, fs, false);
- QString mime, icon, label;
+ TQString mime, icon, label;
guess(dev, mp, fs, false, mime, icon, label);
m->setMimeType(mime);
@@ -296,8 +296,8 @@ void FstabBackend::handleFstabChange(bool allowNotification)
}
}
- QStringList::iterator it2 = m_fstabIds.begin();
- QStringList::iterator end2 = m_fstabIds.end();
+ TQStringList::iterator it2 = m_fstabIds.begin();
+ TQStringList::iterator end2 = m_fstabIds.end();
for (; it2!=end2; ++it2)
{
@@ -310,18 +310,18 @@ void FstabBackend::handleFstabChange(bool allowNotification)
m_fstabIds = new_fstabIds;
}
-QString FstabBackend::generateId(const QString &devNode,
- const QString &mountPoint)
+TQString FstabBackend::generateId(const TQString &devNode,
+ const TQString &mountPoint)
{
- QString d = KStandardDirs::realFilePath(devNode);
- QString m = KStandardDirs::realPath(mountPoint);
+ TQString d = KStandardDirs::realFilePath(devNode);
+ TQString m = KStandardDirs::realPath(mountPoint);
return "/org/kde/mediamanager/fstab/"
+d.replace("/", "")
+m.replace("/", "");
}
-QString FstabBackend::generateName(const QString &devNode, const QString &fsType)
+TQString FstabBackend::generateName(const TQString &devNode, const TQString &fsType)
{
KURL url( devNode );
@@ -335,19 +335,19 @@ QString FstabBackend::generateName(const QString &devNode, const QString &fsType
}
}
-void FstabBackend::guess(const QString &devNode, const QString &mountPoint,
- const QString &fsType, bool mounted,
- QString &mimeType, QString &iconName, QString &label)
+void FstabBackend::guess(const TQString &devNode, const TQString &mountPoint,
+ const TQString &fsType, bool mounted,
+ TQString &mimeType, TQString &iconName, TQString &label)
{
enum { UNKNOWN, CD, CDWRITER, DVD, DVDWRITER } devType = UNKNOWN;
#ifdef __linux__
// Guessing device types by mount point is not exactly accurate...
// Do something accurate first, and fall back if necessary.
- int device=open(QFile::encodeName(devNode), O_RDONLY|O_NONBLOCK);
+ int device=open(TQFile::encodeName(devNode), O_RDONLY|O_NONBLOCK);
if(device>=0)
{
bool isCd=false;
- QString devname=devNode.section('/', -1);
+ TQString devname=devNode.section('/', -1);
if(devname.startsWith("scd") || devname.startsWith("sr"))
{
// SCSI CD/DVD drive
@@ -358,10 +358,10 @@ void FstabBackend::guess(const QString &devNode, const QString &mountPoint,
// IDE device -- we can't tell if this is a
// CD/DVD drive or harddisk by just looking at the
// filename
- QFile m(QString("/proc/ide/") + devname + "/media");
+ TQFile m(TQString("/proc/ide/") + devname + "/media");
if(m.open(IO_ReadOnly))
{
- QString buf;
+ TQString buf;
m.readLine(buf, 1024);
if(buf.contains("cdrom"))
isCd=true;
@@ -469,7 +469,7 @@ void FstabBackend::guess(const QString &devNode, const QString &mountPoint,
}
else
{
- QString tmp = devNode;
+ TQString tmp = devNode;
if ( tmp.startsWith("/dev/") )
{
tmp = tmp.mid(5);
@@ -477,7 +477,7 @@ void FstabBackend::guess(const QString &devNode, const QString &mountPoint,
label+= " (" + tmp + ")";
}
mimeType+= (mounted ? "_mounted" : "_unmounted");
- iconName = QString::null;
+ iconName = TQString::null;
}
#include "fstabbackend.moc"
diff --git a/kioslave/media/mediamanager/fstabbackend.h b/kioslave/media/mediamanager/fstabbackend.h
index ceb2f23ef..e43ed48c0 100644
--- a/kioslave/media/mediamanager/fstabbackend.h
+++ b/kioslave/media/mediamanager/fstabbackend.h
@@ -21,15 +21,15 @@
#include "backendbase.h"
-#include <qobject.h>
-#include <qstringlist.h>
-#include <qmap.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
+#include <tqmap.h>
#ifdef Q_OS_FREEBSD
-#include <qtimer.h>
+#include <tqtimer.h>
#endif
-class FstabBackend : public QObject, public BackendBase
+class FstabBackend : public TQObject, public BackendBase
{
Q_OBJECT
@@ -37,31 +37,31 @@ public:
FstabBackend(MediaList &list, bool networkSharesOnly = false);
virtual ~FstabBackend();
- static void guess(const QString &devNode, const QString &mountPoint,
- const QString &fsType, bool mounted,
- QString &mimeType, QString &iconName,
- QString &label);
+ static void guess(const TQString &devNode, const TQString &mountPoint,
+ const TQString &fsType, bool mounted,
+ TQString &mimeType, TQString &iconName,
+ TQString &label);
- QString mount(const QString &id);
- QString unmount(const QString &id);
+ TQString mount(const TQString &id);
+ TQString unmount(const TQString &id);
private slots:
- void slotDirty(const QString &path);
+ void slotDirty(const TQString &path);
void handleFstabChange(bool allowNotification = true);
void handleMtabChange(bool allowNotification = true);
private:
- static QString generateId(const QString &devNode,
- const QString &mountPoint);
- static QString generateName(const QString &devNode,
- const QString &fsType);
+ static TQString generateId(const TQString &devNode,
+ const TQString &mountPoint);
+ static TQString generateName(const TQString &devNode,
+ const TQString &fsType);
bool m_networkSharesOnly;
- QStringList m_mtabIds;
- QMap<QString, QString> m_mtabEntries;
- QStringList m_fstabIds;
+ TQStringList m_mtabIds;
+ TQMap<TQString, TQString> m_mtabEntries;
+ TQStringList m_fstabIds;
#ifdef Q_OS_FREEBSD
- QTimer m_mtabTimer;
+ TQTimer m_mtabTimer;
#endif
};
diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp
index 4d6d9b19d..b6763ee84 100644
--- a/kioslave/media/mediamanager/halbackend.cpp
+++ b/kioslave/media/mediamanager/halbackend.cpp
@@ -24,14 +24,14 @@
#include <kapplication.h>
#include <kmessagebox.h>
-#include <qeventloop.h>
-#include <qfile.h>
+#include <tqeventloop.h>
+#include <tqfile.h>
#include <klocale.h>
#include <kurl.h>
#include <kdebug.h>
#include <kprocess.h>
#include <kconfig.h>
-#include <qstylesheet.h>
+#include <tqstylesheet.h>
#include <kmountpoint.h>
#include <kmessagebox.h>
#include <kio/job.h>
@@ -39,22 +39,22 @@
#include <kprocess.h>
#define MOUNT_SUFFIX ( \
- (medium->isMounted() ? QString("_mounted") : QString("_unmounted")) + \
+ (medium->isMounted() ? TQString("_mounted") : TQString("_unmounted")) + \
(medium->isEncrypted() ? (halClearVolume ? "_decrypted" : "_encrypted") : "" ) \
)
#define MOUNT_ICON_SUFFIX ( \
- (medium->isMounted() ? QString("_mount") : QString("_unmount")) + \
+ (medium->isMounted() ? TQString("_mount") : TQString("_unmount")) + \
(medium->isEncrypted() ? (halClearVolume ? "_decrypt" : "_encrypt") : "" ) \
)
/* Static instance of this class, for static HAL callbacks */
static HALBackend* s_HALBackend;
-/* A macro function to convert HAL string properties to QString */
-QString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key)
+/* A macro function to convert HAL string properties to TQString */
+TQString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key)
{
char* _ppt_string;
- QString _ppt_QString;
+ TQString _ppt_QString;
DBusError error;
dbus_error_init(&error);
_ppt_string = libhal_device_get_property_string(ctx, udi, key, &error);
@@ -65,8 +65,8 @@ QString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi,
}
/* Constructor */
-HALBackend::HALBackend(MediaList &list, QObject* parent)
- : QObject()
+HALBackend::HALBackend(MediaList &list, TQObject* parent)
+ : TQObject()
, BackendBase(list)
, m_halContext(NULL)
, m_halStoragePolicy(NULL)
@@ -81,8 +81,8 @@ HALBackend::~HALBackend()
/* Close HAL connection */
if (m_halContext)
{
- const QPtrList<Medium> medlist = m_mediaList.list();
- QPtrListIterator<Medium> it (medlist);
+ const TQPtrList<Medium> medlist = m_mediaList.list();
+ TQPtrListIterator<Medium> it (medlist);
for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it)
{
if( !current_medium->id().startsWith( "/org/kde" ))
@@ -235,7 +235,7 @@ void HALBackend::AddDevice(const char *udi, bool allowNotification)
return;
/* Query drive udi */
- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device");
+ TQString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device");
if ( driveUdi.isNull() ) // no storage - no fun
return;
@@ -284,10 +284,10 @@ void HALBackend::AddDevice(const char *udi, bool allowNotification)
m_mediaList.addMedium(medium, allowNotification);
// finally check for automount
- QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi));
+ TQMap<TQString,TQString> options = MediaManagerUtils::splitOptions(mountoptions(udi));
kdDebug() << "automount " << options["automount"] << endl;
if (options["automount"] == "true" && allowNotification ) {
- QString error = mount(medium);
+ TQString error = mount(medium);
if (!error.isEmpty())
kdDebug() << "error " << error << endl;
}
@@ -354,20 +354,20 @@ void HALBackend::ModifyDevice(const char *udi, const char* key)
void HALBackend::DeviceCondition(const char* udi, const char* condition)
{
- QString conditionName = QString(condition);
+ TQString conditionName = TQString(condition);
kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl;
if (conditionName == "EjectPressed") {
const Medium* medium = m_mediaList.findById(udi);
if (!medium) {
/* the ejectpressed appears on the drive and we need to find the volume */
- const QPtrList<Medium> medlist = m_mediaList.list();
- QPtrListIterator<Medium> it (medlist);
+ const TQPtrList<Medium> medlist = m_mediaList.list();
+ TQPtrListIterator<Medium> it (medlist);
for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it)
{
if( current_medium->id().startsWith( "/org/kde" ))
continue;
- QString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device");
+ TQString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device");
if (driveUdi == udi)
{
medium = current_medium;
@@ -436,7 +436,7 @@ const char* HALBackend::findMediumUdiFromUdi(const char* udi)
libhal_volume_free(halVolume);
/* this is a volume whose drive is registered */
- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device");
+ TQString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device");
return findMediumUdiFromUdi(driveUdi.ascii());
}
@@ -446,7 +446,7 @@ const char* HALBackend::findMediumUdiFromUdi(const char* udi)
void HALBackend::ResetProperties(const char* mediumUdi, bool allowNotification)
{
kdDebug(1219) << "HALBackend::setProperties" << endl;
- if ( QString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) )
+ if ( TQString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) )
{
const Medium *cmedium = m_mediaList.findById(mediumUdi);
if ( cmedium )
@@ -487,7 +487,7 @@ void HALBackend::setVolumeProperties(Medium* medium)
LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi);
if (!halVolume)
return;
- QString driveUdi = libhal_volume_get_storage_device_udi(halVolume);
+ TQString driveUdi = libhal_volume_get_storage_device_udi(halVolume);
LibHalDrive* halDrive = 0;
if ( !driveUdi.isNull() )
halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii());
@@ -507,7 +507,7 @@ void HALBackend::setVolumeProperties(Medium* medium)
medium->setEncrypted(true);
char* clearUdi = libhal_volume_crypto_get_clear_volume_udi(m_halContext, halVolume);
- QString clearUdiString;
+ TQString clearUdiString;
if (clearUdi != NULL) {
kdDebug(1219) << "HALBackend::setVolumeProperties : crypto clear volume avail - " << clearUdi << endl;
halClearVolume = libhal_volume_from_udi(m_halContext, clearUdi);
@@ -526,9 +526,9 @@ void HALBackend::setVolumeProperties(Medium* medium)
else
medium->mountableState(
libhal_volume_get_device_file(halVolume), /* Device node */
- QString::null,
- QString::null, /* Mount point */
- QString::null, /* Filesystem type */
+ TQString::null,
+ TQString::null, /* Mount point */
+ TQString::null, /* Filesystem type */
false ); /* Mounted ? */
}
else
@@ -543,12 +543,12 @@ void HALBackend::setVolumeProperties(Medium* medium)
char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy);
- QString volume_name = QString::fromUtf8(name);
- QString media_name = volume_name;
+ TQString volume_name = TQString::fromUtf8(name);
+ TQString media_name = volume_name;
medium->setLabel(media_name);
free(name);
- QString mimeType;
+ TQString mimeType;
if (libhal_volume_is_disc(halVolume))
{
mimeType = "media/cdrom" + MOUNT_SUFFIX;
@@ -579,10 +579,10 @@ void HALBackend::setVolumeProperties(Medium* medium)
if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume))
{
mimeType = "media/audiocd";
- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) );
+ medium->unmountableState( "audiocd:/?device=" + TQString(libhal_volume_get_device_file(halVolume)) );
}
- medium->setIconName(QString::null);
+ medium->setIconName(TQString::null);
/* check if the disc id a vcd or a video dvd */
DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume));
@@ -602,7 +602,7 @@ void HALBackend::setVolumeProperties(Medium* medium)
else
{
mimeType = "media/hdd" + MOUNT_SUFFIX;
- medium->setIconName(QString::null); // reset icon
+ medium->setIconName(TQString::null); // reset icon
if (libhal_drive_is_hotpluggable(halDrive))
{
mimeType = "media/removable" + MOUNT_SUFFIX;
@@ -640,13 +640,13 @@ void HALBackend::setVolumeProperties(Medium* medium)
break;
}
case LIBHAL_DRIVE_TYPE_TAPE:
- medium->setIconName(QString::null); //FIXME need icon
+ medium->setIconName(TQString::null); //FIXME need icon
break;
default:
- medium->setIconName(QString::null);
+ medium->setIconName(TQString::null);
}
- if (medium->isMounted() && QFile::exists(medium->mountPoint() + "/dcim"))
+ if (medium->isMounted() && TQFile::exists(medium->mountPoint() + "/dcim"))
{
mimeType = "media/camera" + MOUNT_SUFFIX;
}
@@ -660,7 +660,7 @@ void HALBackend::setVolumeProperties(Medium* medium)
bool HALBackend::setFstabProperties( Medium *medium )
{
- QString mp = isInFstab(medium);
+ TQString mp = isInFstab(medium);
if (!mp.isNull() && !medium->id().startsWith( "/org/kde" ) )
{
@@ -682,7 +682,7 @@ bool HALBackend::setFstabProperties( Medium *medium )
}
kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " << endl;
- QString fstype = medium->fsType();
+ TQString fstype = medium->fsType();
if ( fstype.isNull() )
fstype = "auto";
@@ -713,7 +713,7 @@ bool HALBackend::setFloppyProperties(Medium* medium)
if (!halDrive)
return false;
- QString drive_type = libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type");
+ TQString drive_type = libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type");
if (drive_type == "zip") {
int numVolumes;
@@ -731,7 +731,7 @@ bool HALBackend::setFloppyProperties(Medium* medium)
medium->setLabel(i18n("Unknown Drive"));
// HAL hates floppies - so we have to do it twice ;(
- medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false);
+ medium->mountableState(libhal_drive_get_device_file(halDrive), TQString::null, TQString::null, false);
setFloppyMountState(medium);
if (drive_type == "floppy")
@@ -753,7 +753,7 @@ bool HALBackend::setFloppyProperties(Medium* medium)
/** @todo And mimtype for JAZ drives ? */
- medium->setIconName(QString::null);
+ medium->setIconName(TQString::null);
libhal_drive_free(halDrive);
@@ -768,8 +768,8 @@ void HALBackend::setFloppyMountState( Medium *medium )
KMountPoint::List::iterator it = mtab.begin();
KMountPoint::List::iterator end = mtab.end();
- QString fstype;
- QString mountpoint;
+ TQString fstype;
+ TQString mountpoint;
for (; it!=end; ++it)
{
if ((*it)->mountedFrom() == medium->deviceNode() )
@@ -795,7 +795,7 @@ void HALBackend::setCameraProperties(Medium* medium)
/** @todo find name */
medium->setName("camera");
- QString device = "camera:/";
+ TQString device = "camera:/";
char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL);
DBusError error;
@@ -812,7 +812,7 @@ void HALBackend::setCameraProperties(Medium* medium)
/** @todo find the rest of this URL */
medium->unmountableState(device);
medium->setMimeType("media/gphoto2camera");
- medium->setIconName(QString::null);
+ medium->setIconName(TQString::null);
if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL))
medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product"));
else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL))
@@ -821,7 +821,7 @@ void HALBackend::setCameraProperties(Medium* medium)
medium->setLabel(i18n("Camera"));
}
-QString HALBackend::generateName(const QString &devNode)
+TQString HALBackend::generateName(const TQString &devNode)
{
return KURL(devNode).fileName();
}
@@ -865,15 +865,15 @@ void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi,
s_HALBackend->DeviceCondition(udi, condition_name);
}
-QStringList HALBackend::mountoptions(const QString &name)
+TQStringList HALBackend::mountoptions(const TQString &name)
{
const Medium* medium = m_mediaList.findById(name);
if (!medium)
- return QStringList(); // we don't know about that one
+ return TQStringList(); // we don't know about that one
if (!isInFstab(medium).isNull())
- return QStringList(); // not handled by HAL - fstab entry
+ return TQStringList(); // not handled by HAL - fstab entry
- QString volume_udi = name;
+ TQString volume_udi = name;
if (medium->isEncrypted()) {
// see if we have a clear volume
LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, medium->id().latin1());
@@ -884,12 +884,12 @@ QStringList HALBackend::mountoptions(const QString &name)
libhal_free_string(clearUdi);
} else {
// if not decrypted yet then no mountoptions
- return QStringList();
+ return TQStringList();
}
libhal_volume_free(halVolume);
} else {
// strange...
- return QStringList();
+ return TQStringList();
}
}
@@ -897,24 +897,24 @@ QStringList HALBackend::mountoptions(const QString &name)
config.setGroup(name);
char ** array = libhal_device_get_property_strlist(m_halContext, volume_udi.latin1(), "volume.mount.valid_options", NULL);
- QMap<QString,bool> valids;
+ TQMap<TQString,bool> valids;
for (int index = 0; array && array[index]; ++index) {
- QString t = array[index];
+ TQString t = array[index];
if (t.endsWith("="))
t = t.left(t.length() - 1);
valids[t] = true;
kdDebug() << "valid " << t << endl;
}
libhal_free_string_array(array);
- QStringList result;
- QString tmp;
+ TQStringList result;
+ TQString tmp;
- QString fstype = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "volume.fstype");
+ TQString fstype = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "volume.fstype");
if (fstype.isNull())
fstype = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "volume.policy.mount_filesystem");
- QString drive_udi = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "block.storage_device");
+ TQString drive_udi = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "block.storage_device");
bool removable = false;
if ( !drive_udi.isNull() )
@@ -932,12 +932,12 @@ QStringList HALBackend::mountoptions(const QString &name)
|| libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.has_audio", NULL))
value = false;
- result << QString("automount=%1").arg(value ? "true" : "false");
+ result << TQString("automount=%1").arg(value ? "true" : "false");
if (valids.contains("ro"))
{
value = config.readBoolEntry("ro", false);
- tmp = QString("ro=%1").arg(value ? "true" : "false");
+ tmp = TQString("ro=%1").arg(value ? "true" : "false");
if (fstype != "iso9660") // makes no sense
result << tmp;
}
@@ -945,7 +945,7 @@ QStringList HALBackend::mountoptions(const QString &name)
if (valids.contains("quiet"))
{
value = config.readBoolEntry("quiet", false);
- tmp = QString("quiet=%1").arg(value ? "true" : "false");
+ tmp = TQString("quiet=%1").arg(value ? "true" : "false");
if (fstype != "iso9660") // makes no sense
result << tmp;
}
@@ -953,27 +953,27 @@ QStringList HALBackend::mountoptions(const QString &name)
if (valids.contains("flush"))
{
value = config.readBoolEntry("flush", fstype.endsWith("fat"));
- tmp = QString("flush=%1").arg(value ? "true" : "false");
+ tmp = TQString("flush=%1").arg(value ? "true" : "false");
result << tmp;
}
if (valids.contains("uid"))
{
value = config.readBoolEntry("uid", true);
- tmp = QString("uid=%1").arg(value ? "true" : "false");
+ tmp = TQString("uid=%1").arg(value ? "true" : "false");
result << tmp;
}
if (valids.contains("utf8"))
{
value = config.readBoolEntry("utf8", true);
- tmp = QString("utf8=%1").arg(value ? "true" : "false");
+ tmp = TQString("utf8=%1").arg(value ? "true" : "false");
result << tmp;
}
if (valids.contains("shortname"))
{
- QString svalue = config.readEntry("shortname", "lower").lower();
+ TQString svalue = config.readEntry("shortname", "lower").lower();
if (svalue == "winnt")
result << "shortname=winnt";
else if (svalue == "win95")
@@ -991,14 +991,14 @@ QStringList HALBackend::mountoptions(const QString &name)
// check in the same order as `locale` does
char *cType;
if ( (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) {
- result << QString("locale=%1").arg(cType);
+ result << TQString("locale=%1").arg(cType);
}
}
if (valids.contains("sync"))
{
value = config.readBoolEntry("sync", ( valids.contains("flush") && !fstype.endsWith("fat") ) && removable);
- tmp = QString("sync=%1").arg(value ? "true" : "false");
+ tmp = TQString("sync=%1").arg(value ? "true" : "false");
if (fstype != "iso9660") // makes no sense
result << tmp;
}
@@ -1006,12 +1006,12 @@ QStringList HALBackend::mountoptions(const QString &name)
if (valids.contains("noatime"))
{
value = config.readBoolEntry("atime", !fstype.endsWith("fat"));
- tmp = QString("atime=%1").arg(value ? "true" : "false");
+ tmp = TQString("atime=%1").arg(value ? "true" : "false");
if (fstype != "iso9660") // makes no sense
result << tmp;
}
- QString mount_point = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "volume.mount_point");
+ TQString mount_point = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "volume.mount_point");
if (mount_point.isEmpty())
mount_point = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "volume.policy.desired_mount_point");
@@ -1020,12 +1020,12 @@ QStringList HALBackend::mountoptions(const QString &name)
if (!mount_point.startsWith("/"))
mount_point = "/media/" + mount_point;
- result << QString("mountpoint=%1").arg(mount_point);
- result << QString("filesystem=%1").arg(fstype);
+ result << TQString("mountpoint=%1").arg(mount_point);
+ result << TQString("filesystem=%1").arg(fstype);
if (valids.contains("data"))
{
- QString svalue = config.readEntry("journaling").lower();
+ TQString svalue = config.readEntry("journaling").lower();
if (svalue == "ordered")
result << "journaling=ordered";
else if (svalue == "writeback")
@@ -1039,14 +1039,14 @@ QStringList HALBackend::mountoptions(const QString &name)
return result;
}
-bool HALBackend::setMountoptions(const QString &name, const QStringList &options )
+bool HALBackend::setMountoptions(const TQString &name, const TQStringList &options )
{
kdDebug() << "setMountoptions " << name << " " << options << endl;
KConfig config("mediamanagerrc");
config.setGroup(name);
- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options);
+ TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(options);
const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
for (int index = 0; names[index]; ++index)
@@ -1059,11 +1059,11 @@ bool HALBackend::setMountoptions(const QString &name, const QStringList &options
if (valids.contains("journaling"))
config.writeEntry("journaling", valids["journaling"]);
- if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"])))
+ if (!mountoptions(name).contains(TQString("mountpoint=%1").arg(valids["mountpoint"])))
config.writeEntry("mountpoint", valids["mountpoint"]);
if (valids.contains("automount")) {
- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device");
+ TQString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device");
config.setGroup(drive_udi);
config.writeEntry("automount", valids["automount"]);
}
@@ -1071,8 +1071,8 @@ bool HALBackend::setMountoptions(const QString &name, const QStringList &options
return true;
}
-QString startKdeSudoProcess(const QString& kdesudoPath, const QString& command,
- const QString& dialogCaption, const QString& dialogComment)
+TQString startKdeSudoProcess(const TQString& kdesudoPath, const TQString& command,
+ const TQString& dialogCaption, const TQString& dialogComment)
{
KProcess kdesudoProcess;
@@ -1086,11 +1086,11 @@ QString startKdeSudoProcess(const QString& kdesudoPath, const QString& command,
// @todo handle kdesudo output
kdesudoProcess.start(KProcess::Block);
- return QString();
+ return TQString();
}
-QString startKdeSuProcess(const QString& kdesuPath, const QString& command,
- const QString& dialogCaption)
+TQString startKdeSuProcess(const TQString& kdesuPath, const TQString& command,
+ const TQString& dialogCaption)
{
KProcess kdesuProcess;
@@ -1103,19 +1103,19 @@ QString startKdeSuProcess(const QString& kdesuPath, const QString& command,
// @todo handle kdesu output
kdesuProcess.start(KProcess::Block);
- return QString();
+ return TQString();
}
-QString startPrivilegedProcess(const QString& command, const QString& dialogCaption, const QString& dialogComment)
+TQString startPrivilegedProcess(const TQString& command, const TQString& dialogCaption, const TQString& dialogComment)
{
- QString error;
+ TQString error;
- QString kdesudoPath = KStandardDirs::findExe("kdesudo");
+ TQString kdesudoPath = KStandardDirs::findExe("kdesudo");
if (!kdesudoPath.isEmpty())
error = startKdeSudoProcess(kdesudoPath, command, dialogCaption, dialogComment);
else {
- QString kdesuPath = KStandardDirs::findExe("kdesu");
+ TQString kdesuPath = KStandardDirs::findExe("kdesu");
if (!kdesuPath.isEmpty())
error = startKdeSuProcess(kdesuPath, command, dialogCaption);
@@ -1124,28 +1124,28 @@ QString startPrivilegedProcess(const QString& command, const QString& dialogCapt
return error;
}
-QString privilegedMount(const char* udi, const char* mountPoint, const char** options, int numberOfOptions)
+TQString privilegedMount(const char* udi, const char* mountPoint, const char** options, int numberOfOptions)
{
- QString error;
+ TQString error;
kdDebug() << "run privileged mount for " << udi << endl;
- QString dbusSendPath = KStandardDirs::findExe("dbus-send");
+ TQString dbusSendPath = KStandardDirs::findExe("dbus-send");
// @todo return error message
if (dbusSendPath.isEmpty())
- return QString();
+ return TQString();
- QString mountOptions;
- QTextOStream optionsStream(&mountOptions);
+ TQString mountOptions;
+ TQTextOStream optionsStream(&mountOptions);
for (int optionIndex = 0; optionIndex < numberOfOptions; optionIndex++) {
optionsStream << options[optionIndex];
if (optionIndex < numberOfOptions - 1)
optionsStream << ",";
}
- QString command;
- QTextOStream(&command) << dbusSendPath
+ TQString command;
+ TQTextOStream(&command) << dbusSendPath
<< " --system --print-reply --dest=org.freedesktop.Hal " << udi
<< " org.freedesktop.Hal.Device.Volume.Mount string:" << mountPoint
<< " string: array:string:" << mountOptions;
@@ -1159,20 +1159,20 @@ QString privilegedMount(const char* udi, const char* mountPoint, const char** op
return error;
}
-QString privilegedUnmount(const char* udi)
+TQString privilegedUnmount(const char* udi)
{
- QString error;
+ TQString error;
kdDebug() << "run privileged unmount for " << udi << endl;
- QString dbusSendPath = KStandardDirs::findExe("dbus-send");
+ TQString dbusSendPath = KStandardDirs::findExe("dbus-send");
// @todo return error message
if (dbusSendPath.isEmpty())
- return QString();
+ return TQString();
- QString command;
- QTextOStream(&command) << dbusSendPath
+ TQString command;
+ TQTextOStream(&command) << dbusSendPath
<< " --system --print-reply --dest=org.freedesktop.Hal " << udi
<< " org.freedesktop.Hal.Device.Volume.Unmount array:string:force";
@@ -1185,7 +1185,7 @@ QString privilegedUnmount(const char* udi)
return error;
}
-static QString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions,
+static TQString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions,
DBusConnection *dbus_connection)
{
DBusMessage *dmesg, *reply;
@@ -1208,12 +1208,12 @@ static QString mount_priv(const char *udi, const char *mount_point, const char *
return i18n("Internal Error");
}
- QString qerror;
+ TQString qerror;
dbus_error_init (&error);
if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error)))
{
- QString qerror = error.message;
+ TQString qerror = error.message;
kdError() << "mount failed for " << udi << ": " << error.name << " - " << qerror << endl;
if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType"))
qerror = i18n("Invalid filesystem type");
@@ -1242,20 +1242,20 @@ static QString mount_priv(const char *udi, const char *mount_point, const char *
}
-QString HALBackend::listUsingProcesses(const Medium* medium)
+TQString HALBackend::listUsingProcesses(const Medium* medium)
{
- QString proclist, fullmsg;
- QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
+ TQString proclist, fullmsg;
+ TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
FILE *fuser = popen(cmdline.latin1(), "r");
uint counter = 0;
if (fuser) {
proclist += "<pre>";
- QTextIStream is(fuser);
- QString tmp;
+ TQTextIStream is(fuser);
+ TQString tmp;
while (!is.atEnd()) {
tmp = is.readLine();
- tmp = QStyleSheet::escape(tmp) + "\n";
+ tmp = TQStyleSheet::escape(tmp) + "\n";
proclist += tmp;
if (counter++ > 10)
@@ -1275,24 +1275,24 @@ QString HALBackend::listUsingProcesses(const Medium* medium)
fullmsg += "<br>" + proclist;
return fullmsg;
} else {
- return QString::null;
+ return TQString::null;
}
}
-QString HALBackend::killUsingProcesses(const Medium* medium)
+TQString HALBackend::killUsingProcesses(const Medium* medium)
{
- QString proclist, fullmsg;
- QString cmdline = QString("/usr/bin/env fuser -vmk %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
+ TQString proclist, fullmsg;
+ TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
FILE *fuser = popen(cmdline.latin1(), "r");
uint counter = 0;
if (fuser) {
proclist += "<pre>";
- QTextIStream is(fuser);
- QString tmp;
+ TQTextIStream is(fuser);
+ TQString tmp;
while (!is.atEnd()) {
tmp = is.readLine();
- tmp = QStyleSheet::escape(tmp) + "\n";
+ tmp = TQStyleSheet::escape(tmp) + "\n";
proclist += tmp;
if (counter++ > 10)
@@ -1310,7 +1310,7 @@ QString HALBackend::killUsingProcesses(const Medium* medium)
fullmsg += "<br>" + proclist;
return fullmsg;
} else {
- return QString::null;
+ return TQString::null;
}
}
@@ -1319,11 +1319,11 @@ void HALBackend::slotResult(KIO::Job *job)
kdDebug() << "slotResult " << mount_jobs[job] << endl;
struct mount_job_data *data = mount_jobs[job];
- QString& qerror = data->errorMessage;
+ TQString& qerror = data->errorMessage;
const Medium* medium = data->medium;
if (job->error() == KIO::ERR_COULD_NOT_UNMOUNT) {
- QString proclist(listUsingProcesses(medium));
+ TQString proclist(listUsingProcesses(medium));
qerror = "<qt>";
qerror += "<p>" + i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and "
@@ -1352,7 +1352,7 @@ void HALBackend::slotResult(KIO::Job *job)
kapp->eventLoop()->exitLoop();
}
-QString HALBackend::isInFstab(const Medium *medium)
+TQString HALBackend::isInFstab(const Medium *medium)
{
KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName);
@@ -1361,27 +1361,27 @@ QString HALBackend::isInFstab(const Medium *medium)
for (; it!=end; ++it)
{
- QString reald = (*it)->realDeviceName();
+ TQString reald = (*it)->realDeviceName();
if ( reald.endsWith( "/" ) )
reald = reald.left( reald.length() - 1 );
kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl;
if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && reald == medium->deviceNode() ) )
{
- QStringList opts = (*it)->mountOptions();
+ TQStringList opts = (*it)->mountOptions();
if (opts.contains("user") || opts.contains("users"))
return (*it)->mountPoint();
}
}
- return QString::null;
+ return TQString::null;
}
-QString HALBackend::mount(const Medium *medium)
+TQString HALBackend::mount(const Medium *medium)
{
if (medium->isMounted())
- return QString(); // that was easy
+ return TQString(); // that was easy
- QString mountPoint = isInFstab(medium);
+ TQString mountPoint = isInFstab(medium);
if (!mountPoint.isNull())
{
struct mount_job_data data;
@@ -1390,8 +1390,8 @@ QString HALBackend::mount(const Medium *medium)
kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl;
KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint );
- connect(job, SIGNAL( result (KIO::Job *)),
- SLOT( slotResult( KIO::Job *)));
+ connect(job, TQT_SIGNAL( result (KIO::Job *)),
+ TQT_SLOT( slotResult( KIO::Job *)));
mount_jobs[job] = &data;
// The caller expects the device to be mounted when the function
// completes. Thus block until the job completes.
@@ -1399,22 +1399,22 @@ QString HALBackend::mount(const Medium *medium)
kapp->eventLoop()->enterLoop();
}
// Return the error message (if any) to the caller
- return (data.error) ? data.errorMessage : QString::null;
+ return (data.error) ? data.errorMessage : TQString::null;
} else if (medium->id().startsWith("/org/kde/") )
return i18n("Permissions denied");
- QStringList soptions;
+ TQStringList soptions;
kdDebug() << "mounting " << medium->id() << "..." << endl;
- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id()));
+ TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id()));
if (valids["flush"] == "true")
soptions << "flush";
if ((valids["uid"] == "true") && (medium->fsType() != "ntfs"))
{
- soptions << QString("uid=%1").arg(getuid());
+ soptions << TQString("uid=%1").arg(getuid());
}
if (valids["ro"] == "true")
@@ -1433,44 +1433,44 @@ QString HALBackend::mount(const Medium *medium)
soptions << "sync";
if (medium->fsType() == "ntfs") {
- QString fsLocale("locale=");
+ TQString fsLocale("locale=");
fsLocale += setlocale(LC_ALL, "");
soptions << fsLocale;
}
- QString mount_point = valids["mountpoint"];
+ TQString mount_point = valids["mountpoint"];
if (mount_point.startsWith("/media/"))
mount_point = mount_point.mid(7);
if (valids.contains("shortname"))
{
- soptions << QString("shortname=%1").arg(valids["shortname"]);
+ soptions << TQString("shortname=%1").arg(valids["shortname"]);
}
if (valids.contains("locale"))
{
- soptions << QString("locale=%1").arg(valids["locale"]);
+ soptions << TQString("locale=%1").arg(valids["locale"]);
}
if (valids.contains("journaling"))
{
- QString option = valids["journaling"];
+ TQString option = valids["journaling"];
if (option == "data")
- soptions << QString("data=journal");
+ soptions << TQString("data=journal");
else if (option == "writeback")
- soptions << QString("data=writeback");
+ soptions << TQString("data=writeback");
else
- soptions << QString("data=ordered");
+ soptions << TQString("data=ordered");
}
const char **options = new const char*[soptions.size() + 1];
uint noptions = 0;
- for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions)
+ for (TQStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions)
options[noptions] = (*it).latin1();
options[noptions] = NULL;
- QString qerror = i18n("Cannot mount encrypted drives!");
+ TQString qerror = i18n("Cannot mount encrypted drives!");
if (!medium->isEncrypted()) {
// normal volume
@@ -1496,10 +1496,10 @@ QString HALBackend::mount(const Medium *medium)
medium->setHalMounted(true);
ResetProperties(medium->id().latin1());
- return QString();
+ return TQString();
}
-QString HALBackend::mount(const QString &_udi)
+TQString HALBackend::mount(const TQString &_udi)
{
const Medium* medium = m_mediaList.findById(_udi);
if (!medium)
@@ -1508,7 +1508,7 @@ QString HALBackend::mount(const QString &_udi)
return mount(medium);
}
-QString HALBackend::unmount(const QString &_udi)
+TQString HALBackend::unmount(const TQString &_udi)
{
const Medium* medium = m_mediaList.findById(_udi);
if (!medium)
@@ -1528,9 +1528,9 @@ QString HALBackend::unmount(const QString &_udi)
return i18n("No such medium: %1").arg(_udi);
if (!medium->isMounted())
- return QString(); // that was easy
+ return TQString(); // that was easy
- QString mountPoint = isInFstab(medium);
+ TQString mountPoint = isInFstab(medium);
if (!mountPoint.isNull())
{
struct mount_job_data data;
@@ -1539,8 +1539,8 @@ QString HALBackend::unmount(const QString &_udi)
kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl;
KIO::Job *job = KIO::unmount( medium->mountPoint(), false );
- connect(job, SIGNAL( result (KIO::Job *)),
- SLOT( slotResult( KIO::Job *)));
+ connect(job, TQT_SIGNAL( result (KIO::Job *)),
+ TQT_SLOT( slotResult( KIO::Job *)));
mount_jobs[job] = &data;
// The caller expects the device to be unmounted when the function
// completes. Thus block until the job completes.
@@ -1548,13 +1548,13 @@ QString HALBackend::unmount(const QString &_udi)
kapp->eventLoop()->enterLoop();
}
// Return the error message (if any) to the caller
- return (data.error) ? data.errorMessage : QString::null;
+ return (data.error) ? data.errorMessage : TQString::null;
}
DBusMessage *dmesg, *reply;
DBusError error;
const char *options[2];
- QString udi = QString::null;
+ TQString udi = TQString::null;
if (!medium->isEncrypted()) {
// normal volume
@@ -1607,7 +1607,7 @@ QString HALBackend::unmount(const QString &_udi)
if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error)))
{
thisunmounthasfailed = 1;
- QString qerror, reason, origqerror;
+ TQString qerror, reason, origqerror;
if (!strcmp(error.name, "org.freedesktop.Hal.Device.PermissionDeniedByPolicy")) {
qerror = privilegedUnmount(udi.latin1());
@@ -1615,7 +1615,7 @@ QString HALBackend::unmount(const QString &_udi)
if (qerror.isEmpty()) {
dbus_message_unref(dmesg);
dbus_error_free(&error);
- return QString();
+ return TQString();
}
// @todo handle unmount error message
@@ -1675,17 +1675,17 @@ QString HALBackend::unmount(const QString &_udi)
while (dbus_connection_dispatch(dbus_connection) == DBUS_DISPATCH_DATA_REMAINS) ;
- return QString();
+ return TQString();
}
-QString HALBackend::decrypt(const QString &_udi, const QString &password)
+TQString HALBackend::decrypt(const TQString &_udi, const TQString &password)
{
const Medium* medium = m_mediaList.findById(_udi);
if (!medium)
return i18n("No such medium: %1").arg(_udi);
if (!medium->isEncrypted() || !medium->clearDeviceUdi().isNull())
- return QString();
+ return TQString();
const char *udi = medium->id().latin1();
DBusMessage *msg = NULL;
@@ -1702,7 +1702,7 @@ QString HALBackend::decrypt(const QString &_udi, const QString &password)
return i18n("Internal Error");
}
- QCString pwdUtf8 = password.utf8();
+ TQCString pwdUtf8 = password.utf8();
const char *pwd_utf8 = pwdUtf8;
if (!dbus_message_append_args (msg, DBUS_TYPE_STRING, &pwd_utf8, DBUS_TYPE_INVALID)) {
kdDebug() << "decrypt failed for " << udi << ": could not append args to dbus message\n";
@@ -1714,7 +1714,7 @@ QString HALBackend::decrypt(const QString &_udi, const QString &password)
if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, msg, -1, &error)) ||
dbus_error_is_set (&error))
{
- QString qerror = i18n("Internal Error");
+ TQString qerror = i18n("Internal Error");
kdDebug() << "decrypt failed for " << udi << ": " << error.name << " " << error.message << endl;
if (strcmp (error.name, "org.freedesktop.Hal.Device.Volume.Crypto.SetupPasswordError") == 0) {
qerror = i18n("Wrong password");
@@ -1730,17 +1730,17 @@ QString HALBackend::decrypt(const QString &_udi, const QString &password)
while (dbus_connection_dispatch(dbus_connection) == DBUS_DISPATCH_DATA_REMAINS) ;
- return QString();
+ return TQString();
}
-QString HALBackend::undecrypt(const QString &_udi)
+TQString HALBackend::undecrypt(const TQString &_udi)
{
const Medium* medium = m_mediaList.findById(_udi);
if (!medium)
return i18n("No such medium: %1").arg(_udi);
if (!medium->isEncrypted() || medium->clearDeviceUdi().isNull())
- return QString();
+ return TQString();
const char *udi = medium->id().latin1();
DBusMessage *msg = NULL;
@@ -1767,7 +1767,7 @@ QString HALBackend::undecrypt(const QString &_udi)
if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, msg, -1, &error)) ||
dbus_error_is_set (&error))
{
- QString qerror = i18n("Internal Error");
+ TQString qerror = i18n("Internal Error");
kdDebug() << "teardown failed for " << udi << ": " << error.name << " " << error.message << endl;
dbus_error_free (&error);
dbus_message_unref (msg);
@@ -1782,7 +1782,7 @@ QString HALBackend::undecrypt(const QString &_udi)
while (dbus_connection_dispatch(dbus_connection) == DBUS_DISPATCH_DATA_REMAINS) ;
- return QString();
+ return TQString();
}
#include "halbackend.moc"
diff --git a/kioslave/media/mediamanager/halbackend.h b/kioslave/media/mediamanager/halbackend.h
index c5bdd532c..59c7aa366 100644
--- a/kioslave/media/mediamanager/halbackend.h
+++ b/kioslave/media/mediamanager/halbackend.h
@@ -31,9 +31,9 @@
#include "backendbase.h"
-#include <qobject.h>
-#include <qstringlist.h>
-#include <qstring.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
+#include <tqstring.h>
#include <config.h>
@@ -49,7 +49,7 @@ namespace KIO {
class Job;
}
-class HALBackend : public QObject, public BackendBase
+class HALBackend : public TQObject, public BackendBase
{
Q_OBJECT
@@ -57,7 +57,7 @@ public:
/**
* Constructor
*/
- HALBackend(MediaList &list, QObject* parent);
+ HALBackend(MediaList &list, TQObject* parent);
/**
* Destructor
@@ -78,15 +78,15 @@ public:
*/
bool ListDevices();
- QStringList mountoptions(const QString &id);
+ TQStringList mountoptions(const TQString &id);
- bool setMountoptions(const QString &id, const QStringList &options);
+ bool setMountoptions(const TQString &id, const TQStringList &options);
- QString mount(const QString &id);
- QString mount(const Medium *medium);
- QString unmount(const QString &id);
- QString decrypt(const QString &id, const QString &password);
- QString undecrypt(const QString &id);
+ TQString mount(const TQString &id);
+ TQString mount(const Medium *medium);
+ TQString unmount(const TQString &id);
+ TQString decrypt(const TQString &id, const TQString &password);
+ TQString undecrypt(const TQString &id);
private:
/**
@@ -142,10 +142,10 @@ private:
void setFloppyMountState( Medium* medium );
bool setFstabProperties(Medium* medium);
void setCameraProperties(Medium* medium);
- QString generateName(const QString &devNode);
- static QString isInFstab(const Medium *medium);
- static QString listUsingProcesses(const Medium *medium);
- static QString killUsingProcesses(const Medium *medium);
+ TQString generateName(const TQString &devNode);
+ static TQString isInFstab(const Medium *medium);
+ static TQString listUsingProcesses(const Medium *medium);
+ static TQString killUsingProcesses(const Medium *medium);
private slots:
void slotResult(KIO::Job *job);
@@ -207,7 +207,7 @@ private:
/**
* Object for the kded module
*/
- QObject* m_parent;
+ TQObject* m_parent;
DBusConnection *dbus_connection;
@@ -222,10 +222,10 @@ private:
// [out] KIO::Error if an error occured during operation. Otherwise, 0
int error;
// [out] Error message to be displayed to the user
- QString errorMessage;
+ TQString errorMessage;
};
- QMap<KIO::Job *, struct mount_job_data*> mount_jobs;
+ TQMap<KIO::Job *, struct mount_job_data*> mount_jobs;
};
#endif /* _HALBACKEND_H_ */
diff --git a/kioslave/media/mediamanager/linuxcdpolling.cpp b/kioslave/media/mediamanager/linuxcdpolling.cpp
index 7519023fe..945fd950a 100644
--- a/kioslave/media/mediamanager/linuxcdpolling.cpp
+++ b/kioslave/media/mediamanager/linuxcdpolling.cpp
@@ -21,9 +21,9 @@
#include "linuxcdpolling.h"
-#include <qthread.h>
-#include <qmutex.h>
-#include <qfile.h>
+#include <tqthread.h>
+#include <tqmutex.h>
+#include <tqfile.h>
#include <kdebug.h>
@@ -113,7 +113,7 @@ DiscType::operator int() const
class PollingThread : public QThread
{
public:
- PollingThread(const QCString &devNode) : m_dev(devNode)
+ PollingThread(const TQCString &devNode) : m_dev(devNode)
{
kdDebug(1219) << "PollingThread::PollingThread("
<< devNode << ")" << endl;
@@ -125,20 +125,20 @@ public:
void stop()
{
- QMutexLocker locker(&m_mutex);
+ TQMutexLocker locker(&m_mutex);
m_stop = true;
}
bool hasChanged()
{
- QMutexLocker locker(&m_mutex);
+ TQMutexLocker locker(&m_mutex);
return m_currentType!=m_lastPollType;
}
DiscType type()
{
- QMutexLocker locker(&m_mutex);
+ TQMutexLocker locker(&m_mutex);
m_currentType = m_lastPollType;
return m_currentType;
}
@@ -165,36 +165,36 @@ protected:
}
private:
- QMutex m_mutex;
+ TQMutex m_mutex;
bool m_stop;
- const QCString m_dev;
+ const TQCString m_dev;
DiscType m_currentType;
DiscType m_lastPollType;
};
LinuxCDPolling::LinuxCDPolling(MediaList &list)
- : QObject(), BackendBase(list)
+ : TQObject(), BackendBase(list)
{
- connect(&m_mediaList, SIGNAL(mediumAdded(const QString &,
- const QString &, bool)),
- this, SLOT(slotMediumAdded(const QString &)) );
+ connect(&m_mediaList, TQT_SIGNAL(mediumAdded(const TQString &,
+ const TQString &, bool)),
+ this, TQT_SLOT(slotMediumAdded(const TQString &)) );
- connect(&m_mediaList, SIGNAL(mediumRemoved(const QString &,
- const QString &, bool)),
- this, SLOT(slotMediumRemoved(const QString &)) );
+ connect(&m_mediaList, TQT_SIGNAL(mediumRemoved(const TQString &,
+ const TQString &, bool)),
+ this, TQT_SLOT(slotMediumRemoved(const TQString &)) );
- connect(&m_mediaList, SIGNAL(mediumStateChanged(const QString &,
- const QString &, bool, bool)),
- this, SLOT(slotMediumStateChanged(const QString &)) );
+ connect(&m_mediaList, TQT_SIGNAL(mediumStateChanged(const TQString &,
+ const TQString &, bool, bool)),
+ this, TQT_SLOT(slotMediumStateChanged(const TQString &)) );
- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout()));
+ connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
}
LinuxCDPolling::~LinuxCDPolling()
{
- QMap<QString, PollingThread*>::iterator it = m_threads.begin();
- QMap<QString, PollingThread*>::iterator end = m_threads.end();
+ TQMap<TQString, PollingThread*>::iterator it = m_threads.begin();
+ TQMap<TQString, PollingThread*>::iterator end = m_threads.end();
for(; it!=end; ++it)
{
@@ -205,7 +205,7 @@ LinuxCDPolling::~LinuxCDPolling()
}
}
-void LinuxCDPolling::slotMediumAdded(const QString &id)
+void LinuxCDPolling::slotMediumAdded(const TQString &id)
{
kdDebug(1219) << "LinuxCDPolling::slotMediumAdded(" << id << ")" << endl;
@@ -213,7 +213,7 @@ void LinuxCDPolling::slotMediumAdded(const QString &id)
const Medium *medium = m_mediaList.findById(id);
- QString mime = medium->mimeType();
+ TQString mime = medium->mimeType();
kdDebug(1219) << "mime == " << mime << endl;
if (mime.find("dvd")==-1 && mime.find("cd")==-1) return;
@@ -222,7 +222,7 @@ void LinuxCDPolling::slotMediumAdded(const QString &id)
{
m_excludeNotification.append( id );
- QCString dev = QFile::encodeName( medium->deviceNode() ).data();
+ TQCString dev = TQFile::encodeName( medium->deviceNode() ).data();
PollingThread *thread = new PollingThread(dev);
m_threads[id] = thread;
thread->start();
@@ -230,7 +230,7 @@ void LinuxCDPolling::slotMediumAdded(const QString &id)
}
}
-void LinuxCDPolling::slotMediumRemoved(const QString &id)
+void LinuxCDPolling::slotMediumRemoved(const TQString &id)
{
kdDebug(1219) << "LinuxCDPolling::slotMediumRemoved(" << id << ")" << endl;
@@ -245,14 +245,14 @@ void LinuxCDPolling::slotMediumRemoved(const QString &id)
m_excludeNotification.remove(id);
}
-void LinuxCDPolling::slotMediumStateChanged(const QString &id)
+void LinuxCDPolling::slotMediumStateChanged(const TQString &id)
{
kdDebug(1219) << "LinuxCDPolling::slotMediumStateChanged("
<< id << ")" << endl;
const Medium *medium = m_mediaList.findById(id);
- QString mime = medium->mimeType();
+ TQString mime = medium->mimeType();
kdDebug(1219) << "mime == " << mime << endl;
if (mime.find("dvd")==-1 && mime.find("cd")==-1) return;
@@ -262,7 +262,7 @@ void LinuxCDPolling::slotMediumStateChanged(const QString &id)
// It is just a mount state change, no need to notify
m_excludeNotification.append( id );
- QCString dev = QFile::encodeName( medium->deviceNode() ).data();
+ TQCString dev = TQFile::encodeName( medium->deviceNode() ).data();
PollingThread *thread = new PollingThread(dev);
m_threads[id] = thread;
thread->start();
@@ -288,12 +288,12 @@ void LinuxCDPolling::slotTimeout()
return;
}
- QMap<QString, PollingThread*>::iterator it = m_threads.begin();
- QMap<QString, PollingThread*>::iterator end = m_threads.end();
+ TQMap<TQString, PollingThread*>::iterator it = m_threads.begin();
+ TQMap<TQString, PollingThread*>::iterator end = m_threads.end();
for(; it!=end; ++it)
{
- QString id = it.key();
+ TQString id = it.key();
PollingThread *thread = it.data();
if (thread->hasChanged())
@@ -305,16 +305,16 @@ void LinuxCDPolling::slotTimeout()
}
}
-static QString baseType(const Medium *medium)
+static TQString baseType(const Medium *medium)
{
kdDebug(1219) << "baseType(" << medium->id() << ")" << endl;
- QString devNode = medium->deviceNode();
- QString mountPoint = medium->mountPoint();
- QString fsType = medium->fsType();
+ TQString devNode = medium->deviceNode();
+ TQString mountPoint = medium->mountPoint();
+ TQString fsType = medium->fsType();
bool mounted = medium->isMounted();
- QString mimeType, iconName, label;
+ TQString mimeType, iconName, label;
FstabBackend::guess(devNode, mountPoint, fsType, mounted,
mimeType, iconName, label);
@@ -336,13 +336,13 @@ static void restoreEmptyState(MediaList &list, const Medium *medium,
{
kdDebug(1219) << "restoreEmptyState(" << medium->id() << ")" << endl;
- QString id = medium->id();
- QString devNode = medium->deviceNode();
- QString mountPoint = medium->mountPoint();
- QString fsType = medium->fsType();
+ TQString id = medium->id();
+ TQString devNode = medium->deviceNode();
+ TQString mountPoint = medium->mountPoint();
+ TQString fsType = medium->fsType();
bool mounted = medium->isMounted();
- QString mimeType, iconName, label;
+ TQString mimeType, iconName, label;
FstabBackend::guess(devNode, mountPoint, fsType, mounted,
mimeType, iconName, label);
@@ -357,8 +357,8 @@ void LinuxCDPolling::applyType(DiscType type, const Medium *medium)
kdDebug(1219) << "LinuxCDPolling::applyType(" << type << ", "
<< medium->id() << ")" << endl;
- QString id = medium->id();
- QString dev = medium->deviceNode();
+ TQString id = medium->id();
+ TQString dev = medium->deviceNode();
bool notify = !m_excludeNotification.contains(id);
m_excludeNotification.remove(id);
@@ -402,7 +402,7 @@ void LinuxCDPolling::applyType(DiscType type, const Medium *medium)
}
}
-DiscType LinuxCDPolling::identifyDiscType(const QCString &devNode,
+DiscType LinuxCDPolling::identifyDiscType(const TQCString &devNode,
const DiscType &current)
{
//kdDebug(1219) << "LinuxCDPolling::identifyDiscType("
@@ -475,7 +475,7 @@ DiscType LinuxCDPolling::identifyDiscType(const QCString &devNode,
}
}
-bool LinuxCDPolling::hasDirectory(const QCString &devNode, const QCString &dir)
+bool LinuxCDPolling::hasDirectory(const TQCString &devNode, const TQCString &dir)
{
bool ret = false; // return value
int fd = 0; // file descriptor for drive
@@ -487,7 +487,7 @@ bool LinuxCDPolling::hasDirectory(const QCString &devNode, const QCString &dir)
char dirname[256]; // filename for the current path table entry
int pos = 0; // our position into the path table
int curr_record = 1; // the path table record we're on
- QCString fixed_directory = dir.upper(); // the uppercase version of the "directory" parameter
+ TQCString fixed_directory = dir.upper(); // the uppercase version of the "directory" parameter
// open the drive
fd = open(devNode, O_RDONLY | O_NONBLOCK);
@@ -555,7 +555,7 @@ bool LinuxCDPolling::hasDirectory(const QCString &devNode, const QCString &dir)
break;
}
dirname[len_di] = 0;
- qstrcpy(dirname, QCString(dirname).upper());
+ qstrcpy(dirname, TQCString(dirname).upper());
// if we found a folder that has the root as a parent, and the directory name matches
// then return success
diff --git a/kioslave/media/mediamanager/linuxcdpolling.h b/kioslave/media/mediamanager/linuxcdpolling.h
index 1df113962..3dec7e3ee 100644
--- a/kioslave/media/mediamanager/linuxcdpolling.h
+++ b/kioslave/media/mediamanager/linuxcdpolling.h
@@ -21,10 +21,10 @@
#include "backendbase.h"
-#include <qobject.h>
-#include <qcstring.h>
-#include <qmap.h>
-#include <qtimer.h>
+#include <tqobject.h>
+#include <tqcstring.h>
+#include <tqmap.h>
+#include <tqtimer.h>
class DiscType
{
@@ -47,7 +47,7 @@ private:
class PollingThread;
-class LinuxCDPolling : public QObject, public BackendBase
+class LinuxCDPolling : public TQObject, public BackendBase
{
Q_OBJECT
@@ -64,23 +64,23 @@ public:
* @param current the current known state of the drive
* @return the disc type
*/
- static DiscType identifyDiscType(const QCString &devNode,
+ static DiscType identifyDiscType(const TQCString &devNode,
const DiscType &current = DiscType::Unknown);
private slots:
- void slotMediumAdded(const QString &id);
- void slotMediumRemoved(const QString &id);
- void slotMediumStateChanged(const QString &id);
+ void slotMediumAdded(const TQString &id);
+ void slotMediumRemoved(const TQString &id);
+ void slotMediumStateChanged(const TQString &id);
void slotTimeout();
private:
void applyType(DiscType type, const Medium *medium);
- static bool hasDirectory(const QCString &devNode, const QCString &dir);
+ static bool hasDirectory(const TQCString &devNode, const TQCString &dir);
- QMap<QString, PollingThread*> m_threads;
- QStringList m_excludeNotification;
- QTimer m_timer;
+ TQMap<TQString, PollingThread*> m_threads;
+ TQStringList m_excludeNotification;
+ TQTimer m_timer;
};
#endif
diff --git a/kioslave/media/mediamanager/mediadirnotify.cpp b/kioslave/media/mediamanager/mediadirnotify.cpp
index 340414634..9e6658153 100644
--- a/kioslave/media/mediamanager/mediadirnotify.cpp
+++ b/kioslave/media/mediamanager/mediadirnotify.cpp
@@ -36,10 +36,10 @@ KURL::List MediaDirNotify::toMediaURL(const KURL &url)
KURL::List result;
- const QPtrList<Medium> list = m_mediaList.list();
+ const TQPtrList<Medium> list = m_mediaList.list();
- QPtrList<Medium>::const_iterator it = list.begin();
- QPtrList<Medium>::const_iterator end = list.end();
+ TQPtrList<Medium>::const_iterator it = list.begin();
+ TQPtrList<Medium>::const_iterator end = list.end();
for (; it!=end; ++it)
{
@@ -48,7 +48,7 @@ KURL::List MediaDirNotify::toMediaURL(const KURL &url)
if ( base.isParentOf(url) )
{
- QString path = KURL::relativePath(base.path(),
+ TQString path = KURL::relativePath(base.path(),
url.path());
KURL new_url("media:/"+m->name()+"/"+path );
diff --git a/kioslave/media/mediamanager/medialist.cpp b/kioslave/media/mediamanager/medialist.cpp
index 974eddbf6..bb0de6248 100644
--- a/kioslave/media/mediamanager/medialist.cpp
+++ b/kioslave/media/mediamanager/medialist.cpp
@@ -27,14 +27,14 @@ MediaList::MediaList()
m_media.setAutoDelete(true);
}
-const QPtrList<Medium> MediaList::list() const
+const TQPtrList<Medium> MediaList::list() const
{
kdDebug(1219) << "MediaList::list()" << endl;
return m_media;
}
-const Medium *MediaList::findById(const QString &id) const
+const Medium *MediaList::findById(const TQString &id) const
{
kdDebug(1219) << "MediaList::findById(" << id << ")" << endl;
@@ -43,7 +43,7 @@ const Medium *MediaList::findById(const QString &id) const
return m_idMap[id];
}
-const Medium *MediaList::findByName(const QString &name) const
+const Medium *MediaList::findByName(const TQString &name) const
{
kdDebug(1219) << "MediaList::findByName(" << name << ")" << endl;
@@ -52,7 +52,7 @@ const Medium *MediaList::findByName(const QString &name) const
return m_nameMap[name];
}
-const Medium *MediaList::findByClearUdi(const QString &name)
+const Medium *MediaList::findByClearUdi(const TQString &name)
{
kdDebug(1219) << "MediaList::findByClearUdi(" << name << ")" << endl;
@@ -65,17 +65,17 @@ const Medium *MediaList::findByClearUdi(const QString &name)
}
-QString MediaList::addMedium(Medium *medium, bool allowNotification)
+TQString MediaList::addMedium(Medium *medium, bool allowNotification)
{
kdDebug(1219) << "MediaList::addMedium(@" << medium->id() << ")" << endl;
- QString id = medium->id();
- if ( m_idMap.contains(id) ) return QString::null;
+ TQString id = medium->id();
+ if ( m_idMap.contains(id) ) return TQString::null;
m_media.append( medium );
m_idMap[id] = medium;
- QString name = medium->name();
+ TQString name = medium->name();
if ( !m_nameMap.contains(name) )
{
m_nameMap[name] = medium;
@@ -87,15 +87,15 @@ QString MediaList::addMedium(Medium *medium, bool allowNotification)
return name;
}
- QString base_name = name+"_";
+ TQString base_name = name+"_";
int i = 1;
- while ( m_nameMap.contains(base_name+QString::number(i)) )
+ while ( m_nameMap.contains(base_name+TQString::number(i)) )
{
i++;
}
- name = base_name+QString::number(i);
+ name = base_name+TQString::number(i);
medium->setName(name);
m_nameMap[name] = medium;
@@ -105,14 +105,14 @@ QString MediaList::addMedium(Medium *medium, bool allowNotification)
return name;
}
-bool MediaList::removeMedium(const QString &id, bool allowNotification)
+bool MediaList::removeMedium(const TQString &id, bool allowNotification)
{
kdDebug(1219) << "MediaList::removeMedium(" << id << ")" << endl;
if ( !m_idMap.contains(id) ) return false;
Medium *medium = m_idMap[id];
- QString name = medium->name();
+ TQString name = medium->name();
m_idMap.remove(id);
m_nameMap.remove( medium->name() );
@@ -132,10 +132,10 @@ bool MediaList::changeMediumState(const Medium &medium, bool allowNotification)
if ( medium.isMountable() )
{
- QString device_node = medium.deviceNode();
- QString clear_device_udi = medium.clearDeviceUdi();
- QString mount_point = medium.mountPoint();
- QString fs_type = medium.fsType();
+ TQString device_node = medium.deviceNode();
+ TQString clear_device_udi = medium.clearDeviceUdi();
+ TQString mount_point = medium.mountPoint();
+ TQString fs_type = medium.fsType();
bool mounted = medium.isMounted();
m->mountableState( device_node, clear_device_udi, mount_point,
@@ -166,12 +166,12 @@ bool MediaList::changeMediumState(const Medium &medium, bool allowNotification)
return true;
}
-bool MediaList::changeMediumState(const QString &id,
- const QString &baseURL,
+bool MediaList::changeMediumState(const TQString &id,
+ const TQString &baseURL,
bool allowNotification,
- const QString &mimeType,
- const QString &iconName,
- const QString &label)
+ const TQString &mimeType,
+ const TQString &iconName,
+ const TQString &label)
{
kdDebug(1219) << "MediaList::changeMediumState(" << id << ", "
<< baseURL << ", " << mimeType << ", " << iconName << ")"
@@ -204,14 +204,14 @@ bool MediaList::changeMediumState(const QString &id,
return true;
}
-bool MediaList::changeMediumState(const QString &id,
- const QString &deviceNode,
- const QString &mountPoint,
- const QString &fsType, bool mounted,
+bool MediaList::changeMediumState(const TQString &id,
+ const TQString &deviceNode,
+ const TQString &mountPoint,
+ const TQString &fsType, bool mounted,
bool allowNotification,
- const QString &mimeType,
- const QString &iconName,
- const QString &label)
+ const TQString &mimeType,
+ const TQString &iconName,
+ const TQString &label)
{
kdDebug(1219) << "MediaList::changeMediumState(" << id << ", "
<< deviceNode << ", " << mountPoint << ", " << fsType << ", "
@@ -245,11 +245,11 @@ bool MediaList::changeMediumState(const QString &id,
return true;
}
-bool MediaList::changeMediumState(const QString &id, bool mounted,
+bool MediaList::changeMediumState(const TQString &id, bool mounted,
bool allowNotification,
- const QString &mimeType,
- const QString &iconName,
- const QString &label)
+ const TQString &mimeType,
+ const TQString &iconName,
+ const TQString &label)
{
kdDebug(1219) << "MediaList::changeMediumState(" << id << ", "
<< mounted << ", " << mimeType << ", " << iconName << ")"
@@ -282,7 +282,7 @@ bool MediaList::changeMediumState(const QString &id, bool mounted,
return true;
}
-bool MediaList::setUserLabel(const QString &name, const QString &label)
+bool MediaList::setUserLabel(const TQString &name, const TQString &label)
{
kdDebug(1219) << "MediaList::setUserLabel(" << name << ", "
<< label << ")" << endl;
diff --git a/kioslave/media/mediamanager/medialist.h b/kioslave/media/mediamanager/medialist.h
index 4de333875..59ddb6bd2 100644
--- a/kioslave/media/mediamanager/medialist.h
+++ b/kioslave/media/mediamanager/medialist.h
@@ -19,7 +19,7 @@
#ifndef _MEDIALIST_H_
#define _MEDIALIST_H_
-#include <qobject.h>
+#include <tqobject.h>
#include "medium.h"
@@ -31,50 +31,50 @@ public:
MediaList();
// FIXME: should be <const Medium> or something similar...
- const QPtrList<Medium> list() const;
- const Medium *findById(const QString &id) const;
- const Medium *findByName(const QString &name) const;
- const Medium *findByClearUdi(const QString &name);
+ const TQPtrList<Medium> list() const;
+ const Medium *findById(const TQString &id) const;
+ const Medium *findByName(const TQString &name) const;
+ const Medium *findByClearUdi(const TQString &name);
public:
- QString addMedium(Medium *medium, bool allowNotification = true);
- bool removeMedium(const QString &id, bool allowNotification = true);
+ TQString addMedium(Medium *medium, bool allowNotification = true);
+ bool removeMedium(const TQString &id, bool allowNotification = true);
bool changeMediumState(const Medium &medium, bool allowNotification);
- bool changeMediumState(const QString &id,
- const QString &baseURL,
+ bool changeMediumState(const TQString &id,
+ const TQString &baseURL,
bool allowNotification = true,
- const QString &mimeType = QString::null,
- const QString &iconName = QString::null,
- const QString &label = QString::null);
- bool changeMediumState(const QString &id,
- const QString &deviceNode,
- const QString &mountPoint,
- const QString &fsType, bool mounted,
+ const TQString &mimeType = TQString::null,
+ const TQString &iconName = TQString::null,
+ const TQString &label = TQString::null);
+ bool changeMediumState(const TQString &id,
+ const TQString &deviceNode,
+ const TQString &mountPoint,
+ const TQString &fsType, bool mounted,
bool allowNotification = true,
- const QString &mimeType = QString::null,
- const QString &iconName = QString::null,
- const QString &label = QString::null);
- bool changeMediumState(const QString &id, bool mounted,
+ const TQString &mimeType = TQString::null,
+ const TQString &iconName = TQString::null,
+ const TQString &label = TQString::null);
+ bool changeMediumState(const TQString &id, bool mounted,
bool allowNotification = true,
- const QString &mimeType = QString::null,
- const QString &iconName = QString::null,
- const QString &label = QString::null);
+ const TQString &mimeType = TQString::null,
+ const TQString &iconName = TQString::null,
+ const TQString &label = TQString::null);
- bool setUserLabel(const QString &name, const QString &label);
+ bool setUserLabel(const TQString &name, const TQString &label);
signals:
- void mediumAdded(const QString &id, const QString &name,
+ void mediumAdded(const TQString &id, const TQString &name,
bool allowNotification);
- void mediumRemoved(const QString &id, const QString &name,
+ void mediumRemoved(const TQString &id, const TQString &name,
bool allowNotification);
- void mediumStateChanged(const QString &id, const QString &name,
+ void mediumStateChanged(const TQString &id, const TQString &name,
bool mounted, bool allowNotification);
private:
- QPtrList<Medium> m_media;
- QMap<QString,Medium*> m_nameMap;
- QMap<QString,Medium*> m_idMap;
+ TQPtrList<Medium> m_media;
+ TQMap<TQString,Medium*> m_nameMap;
+ TQMap<TQString,Medium*> m_idMap;
};
#endif
diff --git a/kioslave/media/mediamanager/mediamanager.cpp b/kioslave/media/mediamanager/mediamanager.cpp
index f1569e817..5d8eb4143 100644
--- a/kioslave/media/mediamanager/mediamanager.cpp
+++ b/kioslave/media/mediamanager/mediamanager.cpp
@@ -19,7 +19,7 @@
#include "mediamanager.h"
#include <config.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -41,18 +41,18 @@
#endif //COMPILE_LINUXCDPOLLING
-MediaManager::MediaManager(const QCString &obj)
+MediaManager::MediaManager(const TQCString &obj)
: KDEDModule(obj), m_dirNotify(m_mediaList)
{
- connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)),
- SLOT(slotMediumAdded(const QString&, const QString&, bool)) );
- connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)),
- SLOT(slotMediumRemoved(const QString&, const QString&, bool)) );
+ connect( &m_mediaList, TQT_SIGNAL(mediumAdded(const TQString&, const TQString&, bool)),
+ TQT_SLOT(slotMediumAdded(const TQString&, const TQString&, bool)) );
+ connect( &m_mediaList, TQT_SIGNAL(mediumRemoved(const TQString&, const TQString&, bool)),
+ TQT_SLOT(slotMediumRemoved(const TQString&, const TQString&, bool)) );
connect( &m_mediaList,
- SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)),
- SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) );
+ TQT_SIGNAL(mediumStateChanged(const TQString&, const TQString&, bool, bool)),
+ TQT_SLOT(slotMediumChanged(const TQString&, const TQString&, bool, bool)) );
- QTimer::singleShot( 10, this, SLOT( loadBackends() ) );
+ TQTimer::singleShot( 10, this, TQT_SLOT( loadBackends() ) );
}
MediaManager::~MediaManager()
@@ -117,14 +117,14 @@ void MediaManager::loadBackends()
}
-QStringList MediaManager::fullList()
+TQStringList MediaManager::fullList()
{
- QPtrList<Medium> list = m_mediaList.list();
+ TQPtrList<Medium> list = m_mediaList.list();
- QStringList result;
+ TQStringList result;
- QPtrList<Medium>::const_iterator it = list.begin();
- QPtrList<Medium>::const_iterator end = list.end();
+ TQPtrList<Medium>::const_iterator it = list.begin();
+ TQPtrList<Medium>::const_iterator end = list.end();
for (; it!=end; ++it)
{
result+= (*it)->properties();
@@ -134,7 +134,7 @@ QStringList MediaManager::fullList()
return result;
}
-QStringList MediaManager::properties(const QString &name)
+TQStringList MediaManager::properties(const TQString &name)
{
const Medium *m = m_mediaList.findByName(name);
@@ -146,7 +146,7 @@ QStringList MediaManager::properties(const QString &name)
{
if (u.protocol() == "system")
{
- QString path = u.path();
+ TQString path = u.path();
if (path.startsWith("/media/"))
path = path.mid(strlen("/media/"));
m = m_mediaList.findByName(path);
@@ -160,10 +160,10 @@ QStringList MediaManager::properties(const QString &name)
else if (u.protocol() == "file")
{
// look for the mount point
- QPtrList<Medium> list = m_mediaList.list();
- QPtrList<Medium>::const_iterator it = list.begin();
- QPtrList<Medium>::const_iterator end = list.end();
- QString path;
+ TQPtrList<Medium> list = m_mediaList.list();
+ TQPtrList<Medium>::const_iterator it = list.begin();
+ TQPtrList<Medium>::const_iterator end = list.end();
+ TQString path;
for (; it!=end; ++it)
{
@@ -181,21 +181,21 @@ QStringList MediaManager::properties(const QString &name)
if (m)
return m->properties();
else
- return QStringList();
+ return TQStringList();
}
-QStringList MediaManager::mountoptions(const QString &name)
+TQStringList MediaManager::mountoptions(const TQString &name)
{
#ifdef COMPILE_HALBACKEND
if (!m_halbackend)
- return QStringList();
+ return TQStringList();
return m_halbackend->mountoptions(name);
#else
- return QStringList();
+ return TQStringList();
#endif
}
-bool MediaManager::setMountoptions(const QString &name, const QStringList &options)
+bool MediaManager::setMountoptions(const TQString &name, const TQStringList &options)
{
#ifdef COMPILE_HALBACKEND
if (!m_halbackend)
@@ -206,7 +206,7 @@ bool MediaManager::setMountoptions(const QString &name, const QStringList &optio
#endif
}
-QString MediaManager::mount(const QString &name)
+TQString MediaManager::mount(const TQString &name)
{
#ifdef COMPILE_HALBACKEND
if (!m_halbackend)
@@ -219,7 +219,7 @@ QString MediaManager::mount(const QString &name)
#endif
}
-QString MediaManager::unmount(const QString &name)
+TQString MediaManager::unmount(const TQString &name)
{
#ifdef COMPILE_HALBACKEND
if (!m_halbackend)
@@ -232,7 +232,7 @@ QString MediaManager::unmount(const QString &name)
#endif
}
-QString MediaManager::decrypt(const QString &name, const QString &password)
+TQString MediaManager::decrypt(const TQString &name, const TQString &password)
{
#ifdef COMPILE_HALBACKEND
if (!m_halbackend)
@@ -243,7 +243,7 @@ QString MediaManager::decrypt(const QString &name, const QString &password)
#endif
}
-QString MediaManager::undecrypt(const QString &name)
+TQString MediaManager::undecrypt(const TQString &name)
{
#ifdef COMPILE_HALBACKEND
if (!m_halbackend)
@@ -254,12 +254,12 @@ QString MediaManager::undecrypt(const QString &name)
#endif
}
-QString MediaManager::nameForLabel(const QString &label)
+TQString MediaManager::nameForLabel(const TQString &label)
{
- const QPtrList<Medium> media = m_mediaList.list();
+ const TQPtrList<Medium> media = m_mediaList.list();
- QPtrList<Medium>::const_iterator it = media.begin();
- QPtrList<Medium>::const_iterator end = media.end();
+ TQPtrList<Medium>::const_iterator it = media.begin();
+ TQPtrList<Medium>::const_iterator end = media.end();
for (; it!=end; ++it)
{
const Medium *m = *it;
@@ -270,10 +270,10 @@ QString MediaManager::nameForLabel(const QString &label)
}
}
- return QString::null;
+ return TQString::null;
}
-ASYNC MediaManager::setUserLabel(const QString &name, const QString &label)
+ASYNC MediaManager::setUserLabel(const TQString &name, const TQString &label)
{
m_mediaList.setUserLabel(name, label);
}
@@ -284,7 +284,7 @@ ASYNC MediaManager::reloadBackends()
loadBackends();
}
-bool MediaManager::removablePlug(const QString &devNode, const QString &label)
+bool MediaManager::removablePlug(const TQString &devNode, const TQString &label)
{
if (mp_removableBackend)
{
@@ -293,7 +293,7 @@ bool MediaManager::removablePlug(const QString &devNode, const QString &label)
return false;
}
-bool MediaManager::removableUnplug(const QString &devNode)
+bool MediaManager::removableUnplug(const TQString &devNode)
{
if (mp_removableBackend)
{
@@ -302,7 +302,7 @@ bool MediaManager::removableUnplug(const QString &devNode)
return false;
}
-bool MediaManager::removableCamera(const QString &devNode)
+bool MediaManager::removableCamera(const TQString &devNode)
{
if (mp_removableBackend)
{
@@ -312,7 +312,7 @@ bool MediaManager::removableCamera(const QString &devNode)
}
-void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name,
+void MediaManager::slotMediumAdded(const TQString &/*id*/, const TQString &name,
bool allowNotification)
{
kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl;
@@ -324,7 +324,7 @@ void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name,
emit mediumAdded(name);
}
-void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name,
+void MediaManager::slotMediumRemoved(const TQString &/*id*/, const TQString &name,
bool allowNotification)
{
kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl;
@@ -336,7 +336,7 @@ void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name,
emit mediumRemoved(name);
}
-void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name,
+void MediaManager::slotMediumChanged(const TQString &/*id*/, const TQString &name,
bool mounted, bool allowNotification)
{
kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl;
@@ -354,7 +354,7 @@ void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name,
extern "C" {
- KDE_EXPORT KDEDModule *create_mediamanager(const QCString &obj)
+ KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj)
{
KGlobal::locale()->insertCatalogue("kio_media");
return new MediaManager(obj);
diff --git a/kioslave/media/mediamanager/mediamanager.h b/kioslave/media/mediamanager/mediamanager.h
index 36942362d..2cc46f8cf 100644
--- a/kioslave/media/mediamanager/mediamanager.h
+++ b/kioslave/media/mediamanager/mediamanager.h
@@ -20,8 +20,8 @@
#define _MEDIAMANAGER_H_
#include <kdedmodule.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include "medialist.h"
#include "backendbase.h"
@@ -36,53 +36,53 @@ class MediaManager : public KDEDModule
Q_OBJECT
K_DCOP
public:
- MediaManager(const QCString &obj);
+ MediaManager(const TQCString &obj);
~MediaManager();
k_dcop:
- QStringList fullList();
- QStringList properties(const QString &name);
- QStringList mountoptions(const QString &name);
- bool setMountoptions(const QString &name, const QStringList &options);
+ TQStringList fullList();
+ TQStringList properties(const TQString &name);
+ TQStringList mountoptions(const TQString &name);
+ bool setMountoptions(const TQString &name, const TQStringList &options);
- QString mount(const QString &uid);
- QString unmount(const QString &uid);
- QString decrypt(const QString &uid, const QString &password);
- QString undecrypt(const QString &uid);
+ TQString mount(const TQString &uid);
+ TQString unmount(const TQString &uid);
+ TQString decrypt(const TQString &uid, const TQString &password);
+ TQString undecrypt(const TQString &uid);
- QString nameForLabel(const QString &label);
- ASYNC setUserLabel(const QString &name, const QString &label);
+ TQString nameForLabel(const TQString &label);
+ ASYNC setUserLabel(const TQString &name, const TQString &label);
ASYNC reloadBackends();
// Removable media handling (for people not having HAL)
- bool removablePlug(const QString &devNode, const QString &label);
- bool removableUnplug(const QString &devNode);
- bool removableCamera(const QString &devNode);
+ bool removablePlug(const TQString &devNode, const TQString &label);
+ bool removableUnplug(const TQString &devNode);
+ bool removableCamera(const TQString &devNode);
k_dcop_signals:
- void mediumAdded(const QString &name, bool allowNotification);
- void mediumRemoved(const QString &name, bool allowNotification);
- void mediumChanged(const QString &name, bool allowNotification);
+ void mediumAdded(const TQString &name, bool allowNotification);
+ void mediumRemoved(const TQString &name, bool allowNotification);
+ void mediumChanged(const TQString &name, bool allowNotification);
// For compatibility purpose, not needed for KDE4
- void mediumAdded(const QString &name);
- void mediumRemoved(const QString &name);
- void mediumChanged(const QString &name);
+ void mediumAdded(const TQString &name);
+ void mediumRemoved(const TQString &name);
+ void mediumChanged(const TQString &name);
private slots:
void loadBackends();
- void slotMediumAdded(const QString &id, const QString &name,
+ void slotMediumAdded(const TQString &id, const TQString &name,
bool allowNotification);
- void slotMediumRemoved(const QString &id, const QString &name,
+ void slotMediumRemoved(const TQString &id, const TQString &name,
bool allowNotification);
- void slotMediumChanged(const QString &id, const QString &name,
+ void slotMediumChanged(const TQString &id, const TQString &name,
bool mounted, bool allowNotification);
private:
MediaList m_mediaList;
- QValueList<BackendBase*> m_backends;
+ TQValueList<BackendBase*> m_backends;
RemovableBackend *mp_removableBackend;
HALBackend *m_halbackend;
MediaDirNotify m_dirNotify;
diff --git a/kioslave/media/mediamanager/removablebackend.cpp b/kioslave/media/mediamanager/removablebackend.cpp
index ea8318ecf..f307ee2f8 100644
--- a/kioslave/media/mediamanager/removablebackend.cpp
+++ b/kioslave/media/mediamanager/removablebackend.cpp
@@ -33,19 +33,19 @@
RemovableBackend::RemovableBackend(MediaList &list)
- : QObject(), BackendBase(list)
+ : TQObject(), BackendBase(list)
{
KDirWatch::self()->addFile(MTAB);
- connect( KDirWatch::self(), SIGNAL( dirty(const QString&) ),
- this, SLOT( slotDirty(const QString&) ) );
+ connect( KDirWatch::self(), TQT_SIGNAL( dirty(const TQString&) ),
+ this, TQT_SLOT( slotDirty(const TQString&) ) );
KDirWatch::self()->startScan();
}
RemovableBackend::~RemovableBackend()
{
- QStringList::iterator it = m_removableIds.begin();
- QStringList::iterator end = m_removableIds.end();
+ TQStringList::iterator it = m_removableIds.begin();
+ TQStringList::iterator end = m_removableIds.end();
for (; it!=end; ++it)
{
@@ -55,25 +55,25 @@ RemovableBackend::~RemovableBackend()
KDirWatch::self()->removeFile(MTAB);
}
-bool RemovableBackend::plug(const QString &devNode, const QString &label)
+bool RemovableBackend::plug(const TQString &devNode, const TQString &label)
{
- QString name = generateName(devNode);
- QString id = generateId(devNode);
+ TQString name = generateName(devNode);
+ TQString id = generateId(devNode);
if (!m_removableIds.contains(id))
{
Medium *medium = new Medium(id, name);
- medium->mountableState(devNode, QString::null,
- QString::null, false);
+ medium->mountableState(devNode, TQString::null,
+ TQString::null, false);
- QStringList words = QStringList::split(" ", label);
+ TQStringList words = TQStringList::split(" ", label);
- QStringList::iterator it = words.begin();
- QStringList::iterator end = words.end();
+ TQStringList::iterator it = words.begin();
+ TQStringList::iterator end = words.end();
- QString tmp = (*it).lower();
+ TQString tmp = (*it).lower();
tmp[0] = tmp[0].upper();
- QString new_label = tmp;
+ TQString new_label = tmp;
++it;
for (; it!=end; ++it)
@@ -92,9 +92,9 @@ bool RemovableBackend::plug(const QString &devNode, const QString &label)
return false;
}
-bool RemovableBackend::unplug(const QString &devNode)
+bool RemovableBackend::unplug(const TQString &devNode)
{
- QString id = generateId(devNode);
+ TQString id = generateId(devNode);
if (m_removableIds.contains(id))
{
m_removableIds.remove(id);
@@ -103,18 +103,18 @@ bool RemovableBackend::unplug(const QString &devNode)
return false;
}
-bool RemovableBackend::camera(const QString &devNode)
+bool RemovableBackend::camera(const TQString &devNode)
{
- QString id = generateId(devNode);
+ TQString id = generateId(devNode);
if (m_removableIds.contains(id))
{
return m_mediaList.changeMediumState(id,
- QString("camera:/"), false, "media/gphoto2camera");
+ TQString("camera:/"), false, "media/gphoto2camera");
}
return false;
}
-void RemovableBackend::slotDirty(const QString &path)
+void RemovableBackend::slotDirty(const TQString &path)
{
if (path==MTAB)
{
@@ -125,7 +125,7 @@ void RemovableBackend::slotDirty(const QString &path)
void RemovableBackend::handleMtabChange()
{
- QStringList new_mtabIds;
+ TQStringList new_mtabIds;
KMountPoint::List mtab = KMountPoint::currentMountPoints();
KMountPoint::List::iterator it = mtab.begin();
@@ -133,11 +133,11 @@ void RemovableBackend::handleMtabChange()
for (; it!=end; ++it)
{
- QString dev = (*it)->mountedFrom();
- QString mp = (*it)->mountPoint();
- QString fs = (*it)->mountType();
+ TQString dev = (*it)->mountedFrom();
+ TQString mp = (*it)->mountPoint();
+ TQString fs = (*it)->mountType();
- QString id = generateId(dev);
+ TQString id = generateId(dev);
new_mtabIds+=id;
if ( !m_mtabIds.contains(id)
@@ -148,8 +148,8 @@ void RemovableBackend::handleMtabChange()
}
}
- QStringList::iterator it2 = m_mtabIds.begin();
- QStringList::iterator end2 = m_mtabIds.end();
+ TQStringList::iterator it2 = m_mtabIds.begin();
+ TQStringList::iterator end2 = m_mtabIds.end();
for (; it2!=end2; ++it2)
{
@@ -164,15 +164,15 @@ void RemovableBackend::handleMtabChange()
m_mtabIds = new_mtabIds;
}
-QString RemovableBackend::generateId(const QString &devNode)
+TQString RemovableBackend::generateId(const TQString &devNode)
{
- QString dev = KStandardDirs::realFilePath(devNode);
+ TQString dev = KStandardDirs::realFilePath(devNode);
return "/org/kde/mediamanager/removable/"
+dev.replace("/", "");
}
-QString RemovableBackend::generateName(const QString &devNode)
+TQString RemovableBackend::generateName(const TQString &devNode)
{
return KURL(devNode).fileName();
}
diff --git a/kioslave/media/mediamanager/removablebackend.h b/kioslave/media/mediamanager/removablebackend.h
index 02fc0409e..fa16a391b 100644
--- a/kioslave/media/mediamanager/removablebackend.h
+++ b/kioslave/media/mediamanager/removablebackend.h
@@ -21,10 +21,10 @@
#include "backendbase.h"
-#include <qobject.h>
-#include <qstringlist.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
-class RemovableBackend : public QObject, public BackendBase
+class RemovableBackend : public TQObject, public BackendBase
{
Q_OBJECT
@@ -32,21 +32,21 @@ public:
RemovableBackend(MediaList &list);
virtual ~RemovableBackend();
- bool plug(const QString &devNode, const QString &label);
- bool unplug(const QString &devNode);
- bool camera(const QString &devNode);
+ bool plug(const TQString &devNode, const TQString &label);
+ bool unplug(const TQString &devNode);
+ bool camera(const TQString &devNode);
private slots:
- void slotDirty(const QString &path);
+ void slotDirty(const TQString &path);
private:
void handleMtabChange();
- static QString generateId(const QString &devNode);
- static QString generateName(const QString &devNode);
+ static TQString generateId(const TQString &devNode);
+ static TQString generateName(const TQString &devNode);
- QStringList m_removableIds;
- QStringList m_mtabIds;
+ TQStringList m_removableIds;
+ TQStringList m_mtabIds;
};
#endif
diff --git a/kioslave/media/medianotifier/medianotifier.cpp b/kioslave/media/medianotifier/medianotifier.cpp
index ce39215d9..b0596e31d 100644
--- a/kioslave/media/medianotifier/medianotifier.cpp
+++ b/kioslave/media/medianotifier/medianotifier.cpp
@@ -21,10 +21,10 @@
#include <sys/vfs.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qdir.h>
-#include <qcheckbox.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqdir.h>
+#include <tqcheckbox.h>
#include <kapplication.h>
#include <kglobal.h>
@@ -41,30 +41,30 @@
#include "notifieraction.h"
#include "mediamanagersettings.h"
-MediaNotifier::MediaNotifier(const QCString &name) : KDEDModule(name)
+MediaNotifier::MediaNotifier(const TQCString &name) : KDEDModule(name)
{
- connectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)",
- "onMediumChange(QString, bool)", true );
+ connectDCOPSignal( "kded", "mediamanager", "mediumAdded(TQString, bool)",
+ "onMediumChange(TQString, bool)", true );
- connectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)",
- "onMediumChange(QString, bool)", true );
+ connectDCOPSignal( "kded", "mediamanager", "mediumChanged(TQString, bool)",
+ "onMediumChange(TQString, bool)", true );
- m_freeTimer = new QTimer( this );
- connect( m_freeTimer, SIGNAL( timeout() ), SLOT( checkFreeDiskSpace() ) );
+ m_freeTimer = new TQTimer( this );
+ connect( m_freeTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkFreeDiskSpace() ) );
m_freeTimer->start( 1000*6*2 /* 20 minutes */ );
m_freeDialog = 0;
}
MediaNotifier::~MediaNotifier()
{
- disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)",
- "onMediumChange(QString, bool)" );
+ disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(TQString, bool)",
+ "onMediumChange(TQString, bool)" );
- disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)",
- "onMediumChange(QString, bool)" );
+ disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(TQString, bool)",
+ "onMediumChange(TQString, bool)" );
}
-void MediaNotifier::onMediumChange( const QString &name, bool allowNotification )
+void MediaNotifier::onMediumChange( const TQString &name, bool allowNotification )
{
kdDebug() << "MediaNotifier::onMediumChange( " << name << ", "
<< allowNotification << ")" << endl;
@@ -85,8 +85,8 @@ void MediaNotifier::onMediumChange( const QString &name, bool allowNotification
m_allowNotificationMap[job] = allowNotification;
- connect( job, SIGNAL( result( KIO::Job * ) ),
- this, SLOT( slotStatResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
+ this, TQT_SLOT( slotStatResult( KIO::Job * ) ) );
}
void MediaNotifier::slotStatResult( KIO::Job *job )
@@ -110,7 +110,7 @@ void MediaNotifier::slotStatResult( KIO::Job *job )
bool MediaNotifier::autostart( const KFileItem &medium )
{
- QString mimetype = medium.mimetype();
+ TQString mimetype = medium.mimetype();
bool is_cdrom = mimetype.startsWith( "media/cd" ) || mimetype.startsWith( "media/dvd" );
bool is_mounted = mimetype.contains( "_mounted" );
@@ -136,20 +136,20 @@ bool MediaNotifier::autostart( const KFileItem &medium )
// From now we're sure the medium is already mounted.
// We can use the local path for stating, no need to use KIO here.
bool local;
- QString path = medium.mostLocalURL( local ).path(); // local is always true here...
+ TQString path = medium.mostLocalURL( local ).path(); // local is always true here...
// When a new medium is mounted the root directory of the medium should
// be checked for the following Autostart files in order of precedence:
// .autorun, autorun, autorun.sh
- QStringList autorun_list;
+ TQStringList autorun_list;
autorun_list << ".autorun" << "autorun" << "autorun.sh";
- QStringList::iterator it = autorun_list.begin();
- QStringList::iterator end = autorun_list.end();
+ TQStringList::iterator it = autorun_list.begin();
+ TQStringList::iterator end = autorun_list.end();
for ( ; it!=end; ++it )
{
- if ( QFile::exists( path + "/" + *it ) )
+ if ( TQFile::exists( path + "/" + *it ) )
{
return execAutorun( medium, path, *it );
}
@@ -158,7 +158,7 @@ bool MediaNotifier::autostart( const KFileItem &medium )
// When a new medium is mounted the root directory of the medium should
// be checked for the following Autoopen files in order of precedence:
// .autoopen, autoopen
- QStringList autoopen_list;
+ TQStringList autoopen_list;
autoopen_list << ".autoopen" << "autoopen";
it = autoopen_list.begin();
@@ -166,7 +166,7 @@ bool MediaNotifier::autostart( const KFileItem &medium )
for ( ; it!=end; ++it )
{
- if ( QFile::exists( path + "/" + *it ) )
+ if ( TQFile::exists( path + "/" + *it ) )
{
return execAutoopen( medium, path, *it );
}
@@ -175,23 +175,23 @@ bool MediaNotifier::autostart( const KFileItem &medium )
return false;
}
-bool MediaNotifier::execAutorun( const KFileItem &medium, const QString &path,
- const QString &autorunFile )
+bool MediaNotifier::execAutorun( const KFileItem &medium, const TQString &path,
+ const TQString &autorunFile )
{
// The desktop environment MUST prompt the user for confirmation
// before automatically starting an application.
- QString mediumType = medium.mimeTypePtr()->name();
- QString text = i18n( "An autorun file has been found on your '%1'."
+ TQString mediumType = medium.mimeTypePtr()->name();
+ TQString text = i18n( "An autorun file has been found on your '%1'."
" Do you want to execute it?\n"
"Note that executing a file on a medium may compromise"
" your system's security").arg( mediumType );
- QString caption = i18n( "Autorun - %1" ).arg( medium.url().prettyURL() );
+ TQString caption = i18n( "Autorun - %1" ).arg( medium.url().prettyURL() );
KGuiItem yes = KStdGuiItem::yes();
KGuiItem no = KStdGuiItem::no();
int options = KMessageBox::Notify | KMessageBox::Dangerous;
int answer = KMessageBox::warningYesNo( 0L, text, caption, yes, no,
- QString::null, options );
+ TQString::null, options );
if ( answer == KMessageBox::Yes )
{
@@ -209,16 +209,16 @@ bool MediaNotifier::execAutorun( const KFileItem &medium, const QString &path,
return true;
}
-bool MediaNotifier::execAutoopen( const KFileItem &medium, const QString &path,
- const QString &autoopenFile )
+bool MediaNotifier::execAutoopen( const KFileItem &medium, const TQString &path,
+ const TQString &autoopenFile )
{
// An Autoopen file MUST contain a single relative path that points
// to a non-executable file contained on the medium. [...]
- QFile file( path+"/"+autoopenFile );
+ TQFile file( path+"/"+autoopenFile );
file.open( IO_ReadOnly );
- QTextStream stream( &file );
+ TQTextStream stream( &file );
- QString relative_path = stream.readLine().stripWhiteSpace();
+ TQString relative_path = stream.readLine().stripWhiteSpace();
// The relative path MUST NOT contain path components that
// refer to a parent directory ( ../ )
@@ -229,7 +229,7 @@ bool MediaNotifier::execAutoopen( const KFileItem &medium, const QString &path,
// The desktop environment MUST verify that the relative path points
// to a file that is actually located on the medium [...]
- QString resolved_path
+ TQString resolved_path
= KStandardDirs::realFilePath( path+"/"+relative_path );
if ( !resolved_path.startsWith( path ) )
@@ -238,12 +238,12 @@ bool MediaNotifier::execAutoopen( const KFileItem &medium, const QString &path,
}
- QFile document( resolved_path );
+ TQFile document( resolved_path );
// TODO: What about FAT all files are executable...
// If the relative path points to an executable file then the desktop
// environment MUST NOT execute the file.
- if ( !document.exists() /*|| QFileInfo(document).isExecutable()*/ )
+ if ( !document.exists() /*|| TQFileInfo(document).isExecutable()*/ )
{
return false;
}
@@ -253,19 +253,19 @@ bool MediaNotifier::execAutoopen( const KFileItem &medium, const QString &path,
// The desktop environment MUST prompt the user for confirmation
// before opening the file.
- QString mediumType = medium.mimeTypePtr()->name();
- QString filename = url.filename();
- QString text = i18n( "An autoopen file has been found on your '%1'."
+ TQString mediumType = medium.mimeTypePtr()->name();
+ TQString filename = url.filename();
+ TQString text = i18n( "An autoopen file has been found on your '%1'."
" Do you want to open '%2'?\n"
"Note that opening a file on a medium may compromise"
" your system's security").arg( mediumType ).arg( filename );
- QString caption = i18n( "Autoopen - %1" ).arg( medium.url().prettyURL() );
+ TQString caption = i18n( "Autoopen - %1" ).arg( medium.url().prettyURL() );
KGuiItem yes = KStdGuiItem::yes();
KGuiItem no = KStdGuiItem::no();
int options = KMessageBox::Notify | KMessageBox::Dangerous;
int answer = KMessageBox::warningYesNo( 0L, text, caption, yes, no,
- QString::null, options );
+ TQString::null, options );
// TODO: Take case of the "UNLESS" part?
// When an Autoopen file has been detected and the user has confirmed
@@ -289,7 +289,7 @@ void MediaNotifier::notify( KFileItem &medium )
if ( settings->autoActionForMimetype( medium.mimetype() )==0L )
{
- QValueList<NotifierAction*> actions
+ TQValueList<NotifierAction*> actions
= settings->actionsForMimetype( medium.mimetype() );
// If only one action remains, it's the "do nothing" action
@@ -311,7 +311,7 @@ void MediaNotifier::notify( KFileItem &medium )
extern "C"
{
- KDE_EXPORT KDEDModule *create_medianotifier(const QCString &name)
+ KDE_EXPORT KDEDModule *create_medianotifier(const TQCString &name)
{
KGlobal::locale()->insertCatalogue("kay");
return new MediaNotifier(name);
@@ -325,7 +325,7 @@ void MediaNotifier::checkFreeDiskSpace()
if ( m_freeDialog )
return;
- if ( statfs( QFile::encodeName( QDir::homeDirPath() ), &sfs ) == 0 )
+ if ( statfs( TQFile::encodeName( TQDir::homeDirPath() ), &sfs ) == 0 )
{
total = sfs.f_blocks;
avail = ( getuid() ? sfs.f_bavail : sfs.f_bfree );
@@ -344,15 +344,15 @@ void MediaNotifier::checkFreeDiskSpace()
0, "warningYesNo", false, true,
i18n( "Start Konqueror" ), KStdGuiItem::cancel());
- QString text = i18n( "You are running low on disk space on your home partition (currently %1% free), would you like to "
+ TQString text = i18n( "You are running low on disk space on your home partition (currently %1% free), would you like to "
"run Konqueror to free some disk space and fix the problem?" ).arg( freeperc );
bool checkboxResult = false;
- KMessageBox::createKMessageBox(m_freeDialog, QMessageBox::Warning, text, QStringList(),
+ KMessageBox::createKMessageBox(m_freeDialog, TQMessageBox::Warning, text, TQStringList(),
i18n("Do not ask again"),
&checkboxResult, KMessageBox::Notify | KMessageBox::NoExec);
m_freeDialog->show();
- connect( m_freeDialog, SIGNAL( yesClicked() ), SLOT( slotFreeContinue() ) );
- connect( m_freeDialog, SIGNAL( noClicked() ), SLOT( slotFreeCancel() ) );
+ connect( m_freeDialog, TQT_SIGNAL( yesClicked() ), TQT_SLOT( slotFreeContinue() ) );
+ connect( m_freeDialog, TQT_SIGNAL( noClicked() ), TQT_SLOT( slotFreeCancel() ) );
}
}
}
@@ -369,7 +369,7 @@ void MediaNotifier::slotFreeCancel()
void MediaNotifier::slotFreeFinished( KMessageBox::ButtonCode res )
{
- QCheckBox *checkbox = ::qt_cast<QCheckBox*>( m_freeDialog->child( 0, "QCheckBox" ) );
+ TQCheckBox *checkbox = ::qt_cast<TQCheckBox*>( m_freeDialog->child( 0, "TQCheckBox" ) );
if ( checkbox && checkbox->isChecked() )
KMessageBox::saveDontShowAgainYesNo("dontagainfreespace", res);
m_freeDialog->delayedDestruct();
@@ -377,7 +377,7 @@ void MediaNotifier::slotFreeFinished( KMessageBox::ButtonCode res )
if ( res == KMessageBox::Continue ) // start Konqi
{
- ( void ) new KRun( KURL::fromPathOrURL( QDir::homeDirPath() ) );
+ ( void ) new KRun( KURL::fromPathOrURL( TQDir::homeDirPath() ) );
}
else // people don't want to be bothered, at least stop the timer; there's no way to save the dontshowagain entry in this case
m_freeTimer->stop();
diff --git a/kioslave/media/medianotifier/medianotifier.h b/kioslave/media/medianotifier/medianotifier.h
index e070ac7ac..23f203f97 100644
--- a/kioslave/media/medianotifier/medianotifier.h
+++ b/kioslave/media/medianotifier/medianotifier.h
@@ -25,8 +25,8 @@
#include <kio/job.h>
#include <kmessagebox.h>
-#include <qstring.h>
-#include <qmap.h>
+#include <tqstring.h>
+#include <tqmap.h>
class KDialogBase;
@@ -36,11 +36,11 @@ class MediaNotifier: public KDEDModule
K_DCOP
public:
- MediaNotifier( const QCString &name );
+ MediaNotifier( const TQCString &name );
virtual ~MediaNotifier();
k_dcop:
- void onMediumChange( const QString &name, bool allowNotification );
+ void onMediumChange( const TQString &name, bool allowNotification );
private slots:
void slotStatResult( KIO::Job *job );
@@ -53,13 +53,13 @@ private:
bool autostart( const KFileItem &medium );
void notify( KFileItem &medium );
- bool execAutorun( const KFileItem &medium, const QString &path,
- const QString &autorunFile );
- bool execAutoopen( const KFileItem &medium, const QString &path,
- const QString &autoopenFile );
+ bool execAutorun( const KFileItem &medium, const TQString &path,
+ const TQString &autorunFile );
+ bool execAutoopen( const KFileItem &medium, const TQString &path,
+ const TQString &autoopenFile );
- QMap<KIO::Job*,bool> m_allowNotificationMap;
- QTimer * m_freeTimer;
+ TQMap<KIO::Job*,bool> m_allowNotificationMap;
+ TQTimer * m_freeTimer;
KDialogBase * m_freeDialog;
};
#endif
diff --git a/kioslave/media/medianotifier/notificationdialog.cpp b/kioslave/media/medianotifier/notificationdialog.cpp
index a4dab0245..7ba172601 100644
--- a/kioslave/media/medianotifier/notificationdialog.cpp
+++ b/kioslave/media/medianotifier/notificationdialog.cpp
@@ -18,31 +18,31 @@
*/
#include "notificationdialog.h"
-#include <qlayout.h>
+#include <tqlayout.h>
#include <krun.h>
#include <klocale.h>
#include <kstandarddirs.h>
#include <kio/global.h>
#include <klistbox.h>
-#include <qlabel.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
+#include <tqlabel.h>
+#include <tqcheckbox.h>
+#include <tqpushbutton.h>
#include "actionlistboxitem.h"
#include "notificationdialogview.h"
NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *settings,
- QWidget* parent, const char* name )
+ TQWidget* parent, const char* name )
: KDialogBase( parent, name, false, i18n( "Medium Detected" ), Ok|Cancel|User1, Ok, true),
m_medium(medium), m_settings( settings )
{
setCaption( KIO::decodeFileName(m_medium.name()) );
clearWState( WState_Polished );
- QWidget *page = new QWidget( this );
+ TQWidget *page = new TQWidget( this );
setMainWidget(page);
- QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() );
+ TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
m_view = new NotificationDialogView( page );
@@ -53,30 +53,30 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett
updateActionsListBox();
- resize( QSize(400,400).expandedTo( minimumSizeHint() ) );
+ resize( TQSize(400,400).expandedTo( minimumSizeHint() ) );
m_actionWatcher = new KDirWatch();
- QString services_dir
+ TQString services_dir
= locateLocal( "data", "konqueror/servicemenus", true );
m_actionWatcher->addDir( services_dir );
setButtonText( User1, i18n("Configure...") );
- connect( m_actionWatcher, SIGNAL( dirty( const QString & ) ),
- this, SLOT( slotActionsChanged( const QString & ) ) );
- connect( this , SIGNAL( okClicked() ),
- this, SLOT( slotOk() ) );
- connect( this, SIGNAL( user1Clicked() ),
- this, SLOT( slotConfigure() ) );
- connect( m_view->actionsList, SIGNAL( doubleClicked ( QListBoxItem*, const QPoint & ) ),
- this, SLOT( slotOk() ) );
+ connect( m_actionWatcher, TQT_SIGNAL( dirty( const TQString & ) ),
+ this, TQT_SLOT( slotActionsChanged( const TQString & ) ) );
+ connect( this , TQT_SIGNAL( okClicked() ),
+ this, TQT_SLOT( slotOk() ) );
+ connect( this, TQT_SIGNAL( user1Clicked() ),
+ this, TQT_SLOT( slotConfigure() ) );
+ connect( m_view->actionsList, TQT_SIGNAL( doubleClicked ( TQListBoxItem*, const TQPoint & ) ),
+ this, TQT_SLOT( slotOk() ) );
- connect( this, SIGNAL( finished() ),
- this, SLOT( delayedDestruct() ) );
+ connect( this, TQT_SIGNAL( finished() ),
+ this, TQT_SLOT( delayedDestruct() ) );
m_actionWatcher->startScan();
- QPushButton * btn = actionButton( Ok );
+ TQPushButton * btn = actionButton( Ok );
btn->setFocus();
}
@@ -90,11 +90,11 @@ void NotificationDialog::updateActionsListBox()
{
m_view->actionsList->clear();
- QValueList<NotifierAction*> actions
+ TQValueList<NotifierAction*> actions
= m_settings->actionsForMimetype( m_medium.mimetype() );
- QValueList<NotifierAction*>::iterator it = actions.begin();
- QValueList<NotifierAction*>::iterator end = actions.end();
+ TQValueList<NotifierAction*>::iterator it = actions.begin();
+ TQValueList<NotifierAction*>::iterator end = actions.end();
for ( ; it!=end; ++it )
{
@@ -106,7 +106,7 @@ void NotificationDialog::updateActionsListBox()
}
-void NotificationDialog::slotActionsChanged(const QString &/*dir*/)
+void NotificationDialog::slotActionsChanged(const TQString &/*dir*/)
{
m_settings->reload();
updateActionsListBox();
@@ -114,7 +114,7 @@ void NotificationDialog::slotActionsChanged(const QString &/*dir*/)
void NotificationDialog::slotOk()
{
- QListBoxItem *item = m_view->actionsList->selectedItem();
+ TQListBoxItem *item = m_view->actionsList->selectedItem();
if ( item != 0L )
{
@@ -136,7 +136,7 @@ void NotificationDialog::launchAction( NotifierAction *action )
action->execute(m_medium);
- QDialog::accept();
+ TQDialog::accept();
}
void NotificationDialog::slotConfigure()
diff --git a/kioslave/media/medianotifier/notificationdialog.h b/kioslave/media/medianotifier/notificationdialog.h
index 94db1fee0..f073676e3 100644
--- a/kioslave/media/medianotifier/notificationdialog.h
+++ b/kioslave/media/medianotifier/notificationdialog.h
@@ -35,13 +35,13 @@ class NotificationDialog : public KDialogBase
public:
NotificationDialog( KFileItem medium, NotifierSettings *settings,
- QWidget* parent = 0, const char* name = 0 );
+ TQWidget* parent = 0, const char* name = 0 );
~NotificationDialog();
private slots:
void slotOk();
void slotConfigure();
- void slotActionsChanged(const QString& dir);
+ void slotActionsChanged(const TQString& dir);
private:
void launchAction( NotifierAction *action );
diff --git a/kioslave/media/mounthelper/dialog.cpp b/kioslave/media/mounthelper/dialog.cpp
index 74bcfb388..549bbdc4a 100644
--- a/kioslave/media/mounthelper/dialog.cpp
+++ b/kioslave/media/mounthelper/dialog.cpp
@@ -22,7 +22,7 @@
#include "dialog.h"
-Dialog::Dialog(QString url, QString iconName) :
+Dialog::Dialog(TQString url, TQString iconName) :
KDialogBase(NULL, "Dialog", true, "Decrypt Storage Device", (Cancel|User1), User1, false, KGuiItem(i18n("Decrypt"), "decrypted" ))
{
decryptDialog = new DecryptDialog(this);
@@ -34,10 +34,10 @@ Dialog::Dialog(QString url, QString iconName) :
enableButton( User1, false );
- QPixmap pixmap = KGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
+ TQPixmap pixmap = KGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
decryptDialog->encryptedIcon->setPixmap( pixmap );
- connect(decryptDialog->passwordEdit, SIGNAL (textChanged(const QString &)), this, SLOT (slotPasswordChanged(const QString &)));
+ connect(decryptDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
setMainWidget(decryptDialog);
}
@@ -47,20 +47,20 @@ Dialog::~Dialog()
delete decryptDialog;
}
-QString Dialog::getPassword()
+TQString Dialog::getPassword()
{
return decryptDialog->passwordEdit->text();
}
-void Dialog::slotDialogError(QString errorMsg)
+void Dialog::slotDialogError(TQString errorMsg)
{
kdDebug() << __func__ << "(" << errorMsg << " )" << endl;
- decryptDialog->errorLabel->setText(QString("<b>%1</b>").arg(errorMsg));
+ decryptDialog->errorLabel->setText(TQString("<b>%1</b>").arg(errorMsg));
decryptDialog->errorBox->show();
}
-void Dialog::slotPasswordChanged(const QString &text)
+void Dialog::slotPasswordChanged(const TQString &text)
{
enableButton( User1, !text.isEmpty() );
}
diff --git a/kioslave/media/mounthelper/dialog.h b/kioslave/media/mounthelper/dialog.h
index 1f544c370..872486f5b 100644
--- a/kioslave/media/mounthelper/dialog.h
+++ b/kioslave/media/mounthelper/dialog.h
@@ -30,9 +30,9 @@
#include <kdialogbase.h>
#include <kiconloader.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qgroupbox.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqgroupbox.h>
#include "decryptdialog.h"
@@ -44,14 +44,14 @@ class Dialog : public KDialogBase
Q_OBJECT
public:
- Dialog(QString url, QString iconName);
+ Dialog(TQString url, TQString iconName);
~Dialog();
- QString getPassword();
+ TQString getPassword();
public slots:
- void slotDialogError(QString errorMsg);
- void slotPasswordChanged(const QString &text);
+ void slotDialogError(TQString errorMsg);
+ void slotPasswordChanged(const TQString &text);
private:
DecryptDialog *decryptDialog;
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.cpp b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
index 5dae9e0d3..01448f79d 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.cpp
+++ b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
@@ -26,7 +26,7 @@
#include <kmessagebox.h>
#include <dcopclient.h>
#include <dcopref.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include <stdlib.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -45,7 +45,7 @@ const Medium MountHelper::findMedium(const KURL &url)
DCOPReply reply = mediamanager.call( "properties", url.fileName() );
if ( !reply.isValid() ) {
m_errorStr = i18n("The KDE mediamanager is not running.")+"\n";
- return Medium(QString::null, QString::null);
+ return Medium(TQString::null, TQString::null);
}
const Medium& medium = Medium::create(reply);
if ( medium.id().isEmpty() ) {
@@ -53,7 +53,7 @@ const Medium MountHelper::findMedium(const KURL &url)
reply = mediamanager.call( "properties", url.prettyURL() );
if ( !reply.isValid() ) {
m_errorStr = i18n("Internal Error");
- return Medium(QString::null, QString::null);
+ return Medium(TQString::null, TQString::null);
}
return Medium::create(reply);
} else {
@@ -65,7 +65,7 @@ MountHelper::MountHelper() : KApplication()
{
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
- m_errorStr = QString::null;
+ m_errorStr = TQString::null;
KURL url(args->url(0));
const Medium medium = findMedium(url);
@@ -74,19 +74,19 @@ MountHelper::MountHelper() : KApplication()
{
if (m_errorStr.isEmpty())
m_errorStr+= i18n("%1 cannot be found.").arg(url.prettyURL());
- QTimer::singleShot(0, this, SLOT(error()) );
+ TQTimer::singleShot(0, this, TQT_SLOT(error()) );
return;
}
if ( !medium.isMountable() && !args->isSet("e") && !args->isSet("s"))
{
m_errorStr = i18n("%1 is not a mountable media.").arg(url.prettyURL());
- QTimer::singleShot(0, this, SLOT(error()) );
+ TQTimer::singleShot(0, this, TQT_SLOT(error()) );
return;
}
- QString device = medium.deviceNode();
- QString mount_point = medium.mountPoint();
+ TQString device = medium.deviceNode();
+ TQString mount_point = medium.mountPoint();
m_isCdrom = medium.mimeType().find("dvd")!=-1
|| medium.mimeType().find("cd")!=-1;
@@ -96,20 +96,20 @@ MountHelper::MountHelper() : KApplication()
if (!medium.isEncrypted())
{
m_errorStr = i18n("%1 is not an encrypted media.").arg(url.prettyURL());
- QTimer::singleShot(0, this, SLOT(error()) );
+ TQTimer::singleShot(0, this, TQT_SLOT(error()) );
return;
}
if (!medium.needDecryption())
{
m_errorStr = i18n("%1 is already decrypted.").arg(url.prettyURL());
- QTimer::singleShot(0, this, SLOT(error()) );
+ TQTimer::singleShot(0, this, TQT_SLOT(error()) );
return;
}
- QString iconName = medium.iconName();
+ TQString iconName = medium.iconName();
if (iconName.isEmpty())
{
- QString mime = medium.mimeType();
+ TQString mime = medium.mimeType();
iconName = KMimeType::mimeType(mime)->icon(mime, false);
}
@@ -117,9 +117,9 @@ MountHelper::MountHelper() : KApplication()
dialog = new Dialog(url.prettyURL(), iconName);
dialog->show();
- connect(dialog, SIGNAL (user1Clicked()), this, SLOT (slotSendPassword()));
- connect(dialog, SIGNAL (cancelClicked()), this, SLOT (slotCancel()));
- connect(this, SIGNAL (signalPasswordError(QString)), dialog, SLOT (slotDialogError(QString)));
+ connect(dialog, TQT_SIGNAL (user1Clicked()), this, TQT_SLOT (slotSendPassword()));
+ connect(dialog, TQT_SIGNAL (cancelClicked()), this, TQT_SLOT (slotCancel()));
+ connect(this, TQT_SIGNAL (signalPasswordError(TQString)), dialog, TQT_SLOT (slotDialogError(TQString)));
}
else if (args->isSet("u"))
{
@@ -180,7 +180,7 @@ MountHelper::MountHelper() : KApplication()
}
}
-void MountHelper::invokeEject(const QString &device, bool quiet)
+void MountHelper::invokeEject(const TQString &device, bool quiet)
{
KProcess *proc = new KProcess(this);
*proc << "kdeeject";
@@ -189,8 +189,8 @@ void MountHelper::invokeEject(const QString &device, bool quiet)
*proc << "-q";
}
*proc << device;
- connect( proc, SIGNAL(processExited(KProcess *)),
- this, SLOT( ejectFinished(KProcess *) ) );
+ connect( proc, TQT_SIGNAL(processExited(KProcess *)),
+ this, TQT_SLOT( ejectFinished(KProcess *) ) );
proc->start();
}
@@ -209,7 +209,7 @@ void MountHelper::ejectFinished(KProcess* proc)
m_errorStr = i18n("The device was successfully unmounted, but could not be ejected");
}
//X Comment this because the error is useless as long as the unmount is successfull.
-//X QTimer::singleShot(0, this, SLOT(error()));
+//X TQTimer::singleShot(0, this, TQT_SLOT(error()));
::exit(0);
}
}
@@ -229,7 +229,7 @@ void MountHelper::slotSendPassword()
m_errorStr = i18n("The KDE mediamanager is not running.");
error();
} else {
- QString errorMsg = reply;
+ TQString errorMsg = reply;
if (errorMsg.isNull()) {
exit(0);
} else {
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.h b/kioslave/media/mounthelper/kio_media_mounthelper.h
index ed5884d4f..4779c75ec 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.h
+++ b/kioslave/media/mounthelper/kio_media_mounthelper.h
@@ -23,7 +23,7 @@
#define _KIO_MEDIA_MOUNTHELPER_H_
#include <kapplication.h>
-#include <qstring.h>
+#include <tqstring.h>
#include <kio/job.h>
#include "medium.h"
@@ -38,10 +38,10 @@ public:
private:
const Medium findMedium(const KURL &url);
- void invokeEject(const QString &device, bool quiet=false);
- QString m_errorStr;
+ void invokeEject(const TQString &device, bool quiet=false);
+ TQString m_errorStr;
bool m_isCdrom;
- QString m_mediumId;
+ TQString m_mediumId;
Dialog *dialog;
private slots:
@@ -51,7 +51,7 @@ private slots:
void error();
signals:
- void signalPasswordError(QString errorMsg);
+ void signalPasswordError(TQString errorMsg);
};
#endif
diff --git a/kioslave/media/propsdlgplugin/propertiespage.cpp b/kioslave/media/propsdlgplugin/propertiespage.cpp
index 455d1e2e3..14ac2b33f 100644
--- a/kioslave/media/propsdlgplugin/propertiespage.cpp
+++ b/kioslave/media/propsdlgplugin/propertiespage.cpp
@@ -17,18 +17,18 @@
Boston, MA 02110-1301, USA.
*/
-#include <qcheckbox.h>
-#include <qtooltip.h>
-#include <qbuttongroup.h>
-#include <qlineedit.h>
-#include <qfileinfo.h>
-#include <qlabel.h>
-#include <qregexp.h>
+#include <tqcheckbox.h>
+#include <tqtooltip.h>
+#include <tqbuttongroup.h>
+#include <tqlineedit.h>
+#include <tqfileinfo.h>
+#include <tqlabel.h>
+#include <tqregexp.h>
#include <kpushbutton.h>
#include <kmessagebox.h>
#include <klocale.h>
-#include <qcombobox.h>
-#include <qtimer.h>
+#include <tqcombobox.h>
+#include <tqtimer.h>
#include <kdebug.h>
#include "propertiespage.h"
#include <dcopref.h>
@@ -37,14 +37,14 @@
const char *short_names[] = {"lower", "win95", "winnt", "mixed", 0 };
const char *journales[] = {"data", "ordered", "writeback", 0 };
-PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id)
+PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
: PropertiesPageGUI(parent), id(_id)
{
kdDebug() << "props page " << id << endl;
DCOPRef mediamanager("kded", "mediamanager");
DCOPReply reply = mediamanager.call( "mountoptions", id);
- QStringList list;
+ TQStringList list;
if (reply.isValid())
list = reply;
@@ -52,10 +52,10 @@ PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id)
if (list.size()) {
kdDebug() << "list " << list << endl;
- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
+ for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
- QString key = (*it).left((*it).find('='));
- QString value = (*it).mid((*it).find('=') + 1);
+ TQString key = (*it).left((*it).find('='));
+ TQString value = (*it).mid((*it).find('=') + 1);
kdDebug() << "key '" << key << "' value '" << value << "'\n";
options[key] = value;
}
@@ -64,43 +64,43 @@ PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id)
option_ro->hide();
else
option_ro->setChecked(options["ro"] == "true");
- connect( option_ro, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) );
+ connect( option_ro, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
if (!options.contains("quiet"))
option_quiet->hide();
else
option_quiet->setChecked(options["quiet"] == "true");
- connect( option_quiet, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) );
+ connect( option_quiet, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
if (!options.contains("sync"))
option_sync->hide();
else
option_sync->setChecked(options["sync"] == "true");
- connect( option_sync, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) );
+ connect( option_sync, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
if (!options.contains("atime"))
option_atime->hide();
else
option_atime->setChecked(options["atime"] == "true");
- connect( option_atime, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) );
+ connect( option_atime, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
if (!options.contains("flush"))
option_flush->hide();
else
option_flush->setChecked(options["flush"] == "true");
- connect( option_flush, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) );
+ connect( option_flush, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
if (!options.contains("utf8"))
option_utf8->hide();
else
option_utf8->setChecked(options["utf8"] == "true");
- connect( option_utf8, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) );
+ connect( option_utf8, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
if (!options.contains("uid"))
option_uid->hide();
else
option_uid->setChecked(options["uid"] == "true");
- connect( option_uid, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) );
+ connect( option_uid, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
if (!options.contains("shortname"))
{
@@ -115,7 +115,7 @@ PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id)
option_shortname->setCurrentItem(index);
break;
}
- connect( option_shortname, SIGNAL( activated(int) ), SIGNAL( changed() ) );
+ connect( option_shortname, TQT_SIGNAL( activated(int) ), TQT_SIGNAL( changed() ) );
}
if (!options.contains("journaling"))
@@ -131,14 +131,14 @@ PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id)
option_journaling->setCurrentItem(index);
break;
}
- connect( option_journaling, SIGNAL( activated(int) ), SIGNAL( changed() ) );
+ connect( option_journaling, TQT_SIGNAL( activated(int) ), TQT_SIGNAL( changed() ) );
}
label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"]));
option_mountpoint->setText(options["mountpoint"]);
- connect( option_mountpoint, SIGNAL( textChanged( const QString &) ), SIGNAL( changed() ) );
+ connect( option_mountpoint, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SIGNAL( changed() ) );
option_automount->setChecked(options["automount"] == "true");
- connect( option_automount, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) );
+ connect( option_automount, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
if (!options.contains("journaling") &&
!options.contains("shortname") &&
@@ -161,43 +161,43 @@ PropertiesPage::~PropertiesPage()
bool PropertiesPage::save()
{
- QStringList result;
+ TQStringList result;
if (options.contains("ro"))
- result << QString("ro=%1").arg(option_ro->isChecked() ? "true" : "false");
+ result << TQString("ro=%1").arg(option_ro->isChecked() ? "true" : "false");
if (options.contains("quiet"))
- result << QString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false");
+ result << TQString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false");
if (options.contains("sync"))
- result << QString("sync=%1").arg(option_sync->isChecked() ? "true" : "false");
+ result << TQString("sync=%1").arg(option_sync->isChecked() ? "true" : "false");
if (options.contains("atime"))
- result << QString("atime=%1").arg(option_atime->isChecked() ? "true" : "false");
+ result << TQString("atime=%1").arg(option_atime->isChecked() ? "true" : "false");
if (options.contains("flush"))
- result << QString("flush=%1").arg(option_flush->isChecked() ? "true" : "false");
+ result << TQString("flush=%1").arg(option_flush->isChecked() ? "true" : "false");
if (options.contains("utf8"))
- result << QString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false");
+ result << TQString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false");
if (options.contains("uid"))
- result << QString("uid=%1").arg(option_uid->isChecked() ? "true" : "false");
+ result << TQString("uid=%1").arg(option_uid->isChecked() ? "true" : "false");
if (options.contains("shortname"))
- result << QString("shortname=%1").arg(short_names[option_shortname->currentItem()]);
+ result << TQString("shortname=%1").arg(short_names[option_shortname->currentItem()]);
if (options.contains("journaling"))
- result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]);
+ result << TQString("journaling=%1").arg(journales[option_journaling->currentItem()]);
- QString mp = option_mountpoint->text();
+ TQString mp = option_mountpoint->text();
if (!mp.startsWith("/media/"))
{
KMessageBox::sorry(this, i18n("Mountpoint has to be below /media"));
return false;
}
- result << QString("mountpoint=%1").arg(mp);
- result << QString("automount=%1").arg(option_automount->isChecked() ? "true" : "false");
+ result << TQString("mountpoint=%1").arg(mp);
+ result << TQString("automount=%1").arg(option_automount->isChecked() ? "true" : "false");
kdDebug() << result << endl;
diff --git a/kioslave/media/propsdlgplugin/propertiespage.h b/kioslave/media/propsdlgplugin/propertiespage.h
index fa23c7873..f36e27ded 100644
--- a/kioslave/media/propsdlgplugin/propertiespage.h
+++ b/kioslave/media/propsdlgplugin/propertiespage.h
@@ -21,7 +21,7 @@
#define PROPERTIESPAGE_H
#include "propertiespagegui.h"
-#include <qmap.h>
+#include <tqmap.h>
class QCheckBox;
class Medium;
@@ -31,15 +31,15 @@ class PropertiesPage : public PropertiesPageGUI
Q_OBJECT
public:
- PropertiesPage(QWidget* parent, const QString &_id);
+ PropertiesPage(TQWidget* parent, const TQString &_id);
virtual ~PropertiesPage();
bool save();
protected:
- QMap<QString,QString> options;
- QString id;
+ TQMap<TQString,TQString> options;
+ TQString id;
};
diff --git a/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp b/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
index dbaf6e898..59433a5da 100644
--- a/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
@@ -17,11 +17,11 @@
Boston, MA 02110-1301, USA.
*/
-#include <qstring.h>
-#include <qvbox.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qtimer.h>
+#include <tqstring.h>
+#include <tqvbox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqtimer.h>
#include <kgenericfactory.h>
#include <kdebug.h>
@@ -50,7 +50,7 @@ class PropsDlgSharePlugin::Private
};
PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
- const char *, const QStringList & )
+ const char *, const TQStringList & )
: KPropsDlgPlugin(dlg), d(0)
{
if (properties->items().count() != 1)
@@ -65,15 +65,15 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
if ( !reply.isValid() )
return;
- QVBox* vbox = properties->addVBoxPage(i18n("&Mounting"));
+ TQVBox* vbox = properties->addVBoxPage(i18n("&Mounting"));
d = new Private();
d->page = new PropertiesPage(vbox, Medium::create(reply).id());
- connect(d->page, SIGNAL(changed()),
- SLOT(slotChanged()));
+ connect(d->page, TQT_SIGNAL(changed()),
+ TQT_SLOT(slotChanged()));
- // QTimer::singleShot(100, this, SLOT(slotChanged()));
+ // TQTimer::singleShot(100, this, TQT_SLOT(slotChanged()));
}
diff --git a/kioslave/media/propsdlgplugin/propsdlgshareplugin.h b/kioslave/media/propsdlgplugin/propsdlgshareplugin.h
index cb9fdfaab..87b7d1e13 100644
--- a/kioslave/media/propsdlgplugin/propsdlgshareplugin.h
+++ b/kioslave/media/propsdlgplugin/propsdlgshareplugin.h
@@ -26,7 +26,7 @@ class PropsDlgSharePlugin : public KPropsDlgPlugin
{
Q_OBJECT
public:
- PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & );
+ PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const TQStringList & );
virtual ~PropsDlgSharePlugin();
virtual void applyChanges();
diff --git a/kioslave/media/testmedia.cpp b/kioslave/media/testmedia.cpp
index d3f19512c..89ced4ba1 100644
--- a/kioslave/media/testmedia.cpp
+++ b/kioslave/media/testmedia.cpp
@@ -28,12 +28,12 @@
#include <stdlib.h>
-static bool check(const QString& txt, QString a, QString b)
+static bool check(const TQString& txt, TQString a, TQString b)
{
if (a.isEmpty())
- a = QString::null;
+ a = TQString::null;
if (b.isEmpty())
- b = QString::null;
+ b = TQString::null;
if (a == b) {
kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "ok" << endl;
}
diff --git a/kioslave/nfs/kio_nfs.cpp b/kioslave/nfs/kio_nfs.cpp
index b35489c8d..debe19d3d 100644
--- a/kioslave/nfs/kio_nfs.cpp
+++ b/kioslave/nfs/kio_nfs.cpp
@@ -45,8 +45,8 @@
#include <time.h>
#include <unistd.h>
-#include <qfile.h>
-#include <qdir.h>
+#include <tqfile.h>
+#include <tqdir.h>
#include <kdebug.h>
#include <kinstance.h>
@@ -127,12 +127,12 @@ int kdemain( int argc, char **argv )
return 0;
}
-static bool isRoot(const QString& path)
+static bool isRoot(const TQString& path)
{
return (path.isEmpty() || (path=="/"));
}
-static bool isAbsoluteLink(const QString& path)
+static bool isAbsoluteLink(const TQString& path)
{
//hmm, don't know
if (path.isEmpty()) return TRUE;
@@ -166,23 +166,23 @@ static void createVirtualDirEntry(UDSEntry & entry)
}
-static void stripTrailingSlash(QString& path)
+static void stripTrailingSlash(TQString& path)
{
//if (path=="/") return;
if (path=="/") path="";
else if (path[path.length()-1]=='/') path.truncate(path.length()-1);
}
-static void getLastPart(const QString& path, QString& lastPart, QString& rest)
+static void getLastPart(const TQString& path, TQString& lastPart, TQString& rest)
{
int slashPos=path.findRev("/");
lastPart=path.mid(slashPos+1);
rest=path.left(slashPos+1);
}
-static QString removeFirstPart(const QString& path)
+static TQString removeFirstPart(const TQString& path)
{
- QString result("");
+ TQString result("");
if (path.isEmpty()) return result;
result=path.mid(1);
int slashPos=result.find("/");
@@ -235,7 +235,7 @@ NFSFileHandle& NFSFileHandle::operator= (const char* src)
}*/
-NFSProtocol::NFSProtocol (const QCString &pool, const QCString &app )
+NFSProtocol::NFSProtocol (const TQCString &pool, const TQCString &app )
:SlaveBase( "nfs", pool, app )
,m_client(0)
,m_sock(-1)
@@ -291,7 +291,7 @@ void NFSProtocol::closeConnection()
m_client=0;
}
-bool NFSProtocol::isExportedDir(const QString& path)
+bool NFSProtocol::isExportedDir(const TQString& path)
{
return (m_exportedDirs.find(path.mid(1))!=m_exportedDirs.end());
}
@@ -301,7 +301,7 @@ bool NFSProtocol::isExportedDir(const QString& path)
If this doesn't succeed, it needs to do a nfs rpc call
in order to obtain one.
*/
-NFSFileHandle NFSProtocol::getFileHandle(QString path)
+NFSFileHandle NFSProtocol::getFileHandle(TQString path)
{
if (m_client==0) openConnection();
@@ -326,7 +326,7 @@ NFSFileHandle NFSProtocol::getFileHandle(QString path)
kdDebug(7121)<<"path is in the cache, returning the FH -"<<m_handleCache[path]<<"-"<<endl;
return m_handleCache[path];
}
- QString rest, lastPart;
+ TQString rest, lastPart;
getLastPart(path,lastPart,rest);
kdDebug(7121)<<"splitting path into rest -"<<rest<<"- and lastPart -"<<lastPart<<"-"<<endl;
@@ -341,7 +341,7 @@ NFSFileHandle NFSProtocol::getFileHandle(QString path)
diropargs dirargs;
diropres dirres;
memcpy(dirargs.dir.data,(const char*)parentFH,NFS_FHSIZE);
- QCString tmpStr=QFile::encodeName(lastPart);
+ TQCString tmpStr=TQFile::encodeName(lastPart);
dirargs.name=tmpStr.data();
//cerr<<"calling rpc: FH: -"<<parentFH<<"- with name -"<<dirargs.name<<"-"<<endl;
@@ -416,7 +416,7 @@ void NFSProtocol::openConnection()
return;
}
}
- QCString hostName("localhost");
+ TQCString hostName("localhost");
char nameBuffer[1024];
nameBuffer[0] = '\0';
if (gethostname(nameBuffer, 1024)==0)
@@ -466,12 +466,12 @@ void NFSProtocol::openConnection()
atLeastOnceSucceeded=TRUE;
NFSFileHandle fh;
fh=fhStatus.fhstatus_u.fhs_fhandle;
- QString fname;
+ TQString fname;
if ( exportlist->ex_dir[0] == '/' )
fname = KIO::encodeFileName(exportlist->ex_dir + 1);
else
fname = KIO::encodeFileName(exportlist->ex_dir);
- m_handleCache.insert(QString("/")+fname,fh);
+ m_handleCache.insert(TQString("/")+fname,fh);
m_exportedDirs.append(fname);
// kdDebug() <<"appending file -"<<fname<<"- with FH: -"<<fhStatus.fhstatus_u.fhs_fhandle<<"-"<<endl;
}
@@ -511,7 +511,7 @@ void NFSProtocol::openConnection()
void NFSProtocol::listDir( const KURL& _url)
{
KURL url(_url);
- QString path( QFile::encodeName(url.path()));
+ TQString path( TQFile::encodeName(url.path()));
if (path.isEmpty())
{
@@ -530,7 +530,7 @@ void NFSProtocol::listDir( const KURL& _url)
totalSize( m_exportedDirs.count());
//in this case we don't need to do a real listdir
UDSEntry entry;
- for (QStringList::Iterator it=m_exportedDirs.begin(); it!=m_exportedDirs.end(); it++)
+ for (TQStringList::Iterator it=m_exportedDirs.begin(); it!=m_exportedDirs.end(); it++)
{
UDSAtom atom;
entry.clear();
@@ -546,7 +546,7 @@ void NFSProtocol::listDir( const KURL& _url)
return;
}
- QStringList filesToList;
+ TQStringList filesToList;
kdDebug(7121)<<"getting subdir -"<<path<<"-"<<endl;
stripTrailingSlash(path);
NFSFileHandle fh=getFileHandle(path);
@@ -569,7 +569,7 @@ void NFSProtocol::listDir( const KURL& _url)
if (!checkForError(clnt_stat,listres.status,path)) return;
for (entry *dirEntry=listres.readdirres_u.reply.entries;dirEntry!=0;dirEntry=dirEntry->nextentry)
{
- if ((QString(".")!=dirEntry->name) && (QString("..")!=dirEntry->name))
+ if ((TQString(".")!=dirEntry->name) && (TQString("..")!=dirEntry->name))
filesToList.append(dirEntry->name);
}
} while (!listres.readdirres_u.reply.eof);
@@ -577,13 +577,13 @@ void NFSProtocol::listDir( const KURL& _url)
UDSEntry entry;
//stat all files in filesToList
- for (QStringList::Iterator it=filesToList.begin(); it!=filesToList.end(); it++)
+ for (TQStringList::Iterator it=filesToList.begin(); it!=filesToList.end(); it++)
{
UDSAtom atom;
diropargs dirargs;
diropres dirres;
memcpy(dirargs.dir.data,fh,NFS_FHSIZE);
- QCString tmpStr=QFile::encodeName(*it);
+ TQCString tmpStr=TQFile::encodeName(*it);
dirargs.name=tmpStr.data();
kdDebug(7121)<<"calling rpc: FH: -"<<fh<<"- with name -"<<dirargs.name<<"-"<<endl;
@@ -619,7 +619,7 @@ void NFSProtocol::listDir( const KURL& _url)
(xdrproc_t) xdr_readlinkres, (char*)&readLinkRes,total_timeout);
if (!checkForError(clnt_stat,readLinkRes.status,(*it))) return;
kdDebug(7121)<<"link dest is -"<<readLinkRes.readlinkres_u.data<<"-"<<endl;
- QCString linkDest(readLinkRes.readlinkres_u.data);
+ TQCString linkDest(readLinkRes.readlinkres_u.data);
atom.m_uds = KIO::UDS_LINK_DEST;
atom.m_str = linkDest;
entry.append( atom );
@@ -637,7 +637,7 @@ void NFSProtocol::listDir( const KURL& _url)
}
else
{
- tmpStr=QDir::cleanDirPath(path+QString("/")+QString(linkDest)).latin1();
+ tmpStr=TQDir::cleanDirPath(path+TQString("/")+TQString(linkDest)).latin1();
dirargs.name=tmpStr.data();
tmpFH=getFileHandle(tmpStr);
memcpy(dirargs.dir.data,tmpFH,NFS_FHSIZE);
@@ -664,10 +664,10 @@ void NFSProtocol::listDir( const KURL& _url)
void NFSProtocol::stat( const KURL & url)
{
- QString path( QFile::encodeName(url.path()));
+ TQString path( TQFile::encodeName(url.path()));
stripTrailingSlash(path);
kdDebug(7121)<<"NFS::stat for -"<<path<<"-"<<endl;
- QString tmpPath=path;
+ TQString tmpPath=path;
if ((tmpPath.length()>1) && (tmpPath[0]=='/')) tmpPath=tmpPath.mid(1);
// We can't stat root, but we know it's a dir
if (isRoot(path) || isExportedDir(path))
@@ -696,7 +696,7 @@ void NFSProtocol::stat( const KURL & url)
diropargs dirargs;
attrstat attrAndStat;
memcpy(dirargs.dir.data,fh,NFS_FHSIZE);
- QCString tmpStr=QFile::encodeName(path);
+ TQCString tmpStr=TQFile::encodeName(path);
dirargs.name=tmpStr.data();
kdDebug(7121)<<"calling rpc: FH: -"<<fh<<"- with name -"<<dirargs.name<<"-"<<endl;
@@ -710,7 +710,7 @@ void NFSProtocol::stat( const KURL & url)
UDSAtom atom;
- QString fileName, parentDir;
+ TQString fileName, parentDir;
getLastPart(path, fileName, parentDir);
stripTrailingSlash(parentDir);
@@ -734,7 +734,7 @@ void NFSProtocol::stat( const KURL & url)
(xdrproc_t) xdr_readlinkres, (char*)&readLinkRes,total_timeout);
if (!checkForError(clnt_stat,readLinkRes.status,path)) return;
kdDebug(7121)<<"link dest is -"<<readLinkRes.readlinkres_u.data<<"-"<<endl;
- QCString linkDest(readLinkRes.readlinkres_u.data);
+ TQCString linkDest(readLinkRes.readlinkres_u.data);
atom.m_uds = KIO::UDS_LINK_DEST;
atom.m_str = linkDest;
entry.append( atom );
@@ -753,7 +753,7 @@ void NFSProtocol::stat( const KURL & url)
else
{
- tmpStr=QDir::cleanDirPath(parentDir+QString("/")+QString(linkDest)).latin1();
+ tmpStr=TQDir::cleanDirPath(parentDir+TQString("/")+TQString(linkDest)).latin1();
diropargs dirargs;
dirargs.name=tmpStr.data();
NFSFileHandle tmpFH;
@@ -775,7 +775,7 @@ void NFSProtocol::stat( const KURL & url)
finished();
}
-void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const QCString& path)
+void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString& path)
{
//taken from file.cc
struct stat buff;
@@ -800,14 +800,14 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const QCString&
atom.m_uds = KIO::UDS_USER;
uid_t uid = buff.st_uid;
- QString *temp = m_usercache.find( uid );
+ TQString *temp = m_usercache.find( uid );
if ( !temp )
{
struct passwd *user = getpwuid( uid );
if ( user )
{
- m_usercache.insert( uid, new QString(QString::fromLatin1(user->pw_name)) );
+ m_usercache.insert( uid, new TQString(TQString::fromLatin1(user->pw_name)) );
atom.m_str = user->pw_name;
}
else
@@ -825,7 +825,7 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const QCString&
struct group *grp = getgrgid( gid );
if ( grp )
{
- m_groupcache.insert( gid, new QString(QString::fromLatin1(grp->gr_name)) );
+ m_groupcache.insert( gid, new TQString(TQString::fromLatin1(grp->gr_name)) );
atom.m_str = grp->gr_name;
}
else
@@ -893,13 +893,13 @@ void NFSProtocol::completeUDSEntry(UDSEntry& entry, fattr& attributes)
atom.m_uds = KIO::UDS_USER;
uid_t uid = attributes.uid;
- QString *temp = m_usercache.find( uid );
+ TQString *temp = m_usercache.find( uid );
if ( !temp )
{
struct passwd *user = getpwuid( uid );
if ( user )
{
- m_usercache.insert( uid, new QString(user->pw_name) );
+ m_usercache.insert( uid, new TQString(user->pw_name) );
atom.m_str = user->pw_name;
}
else
@@ -917,7 +917,7 @@ void NFSProtocol::completeUDSEntry(UDSEntry& entry, fattr& attributes)
struct group *grp = getgrgid( gid );
if ( grp )
{
- m_groupcache.insert( gid, new QString(grp->gr_name) );
+ m_groupcache.insert( gid, new TQString(grp->gr_name) );
atom.m_str = grp->gr_name;
}
else
@@ -959,7 +959,7 @@ void NFSProtocol::completeUDSEntry(UDSEntry& entry, fattr& attributes)
}*/
}
-void NFSProtocol::setHost(const QString& host, int /*port*/, const QString& /*user*/, const QString& /*pass*/)
+void NFSProtocol::setHost(const TQString& host, int /*port*/, const TQString& /*user*/, const TQString& /*pass*/)
{
kdDebug(7121)<<"setHost: -"<<host<<"-"<<endl;
if (host.isEmpty())
@@ -977,9 +977,9 @@ void NFSProtocol::setHost(const QString& host, int /*port*/, const QString& /*us
void NFSProtocol::mkdir( const KURL& url, int permissions )
{
kdDebug(7121)<<"mkdir"<<endl;
- QString thePath( QFile::encodeName(url.path()));
+ TQString thePath( TQFile::encodeName(url.path()));
stripTrailingSlash(thePath);
- QString dirName, parentDir;
+ TQString dirName, parentDir;
getLastPart(thePath, dirName, parentDir);
stripTrailingSlash(parentDir);
kdDebug(7121)<<"path: -"<<thePath<<"- dir: -"<<dirName<<"- parentDir: -"<<parentDir<<"-"<<endl;
@@ -997,7 +997,7 @@ void NFSProtocol::mkdir( const KURL& url, int permissions )
createargs createArgs;
memcpy(createArgs.where.dir.data,fh,NFS_FHSIZE);
- QCString tmpName=QFile::encodeName(dirName);
+ TQCString tmpName=TQFile::encodeName(dirName);
createArgs.where.name=tmpName.data();
if (permissions==-1) createArgs.attributes.mode=0755;
else createArgs.attributes.mode=permissions;
@@ -1011,7 +1011,7 @@ void NFSProtocol::mkdir( const KURL& url, int permissions )
finished();
}
-bool NFSProtocol::checkForError(int clientStat, int nfsStat, const QString& text)
+bool NFSProtocol::checkForError(int clientStat, int nfsStat, const TQString& text)
{
if (clientStat!=RPC_SUCCESS)
{
@@ -1090,10 +1090,10 @@ bool NFSProtocol::checkForError(int clientStat, int nfsStat, const QString& text
void NFSProtocol::del( const KURL& url, bool isfile)
{
- QString thePath( QFile::encodeName(url.path()));
+ TQString thePath( TQFile::encodeName(url.path()));
stripTrailingSlash(thePath);
- QString fileName, parentDir;
+ TQString fileName, parentDir;
getLastPart(thePath, fileName, parentDir);
stripTrailingSlash(parentDir);
kdDebug(7121)<<"del(): path: -"<<thePath<<"- file -"<<fileName<<"- parentDir: -"<<parentDir<<"-"<<endl;
@@ -1115,7 +1115,7 @@ void NFSProtocol::del( const KURL& url, bool isfile)
kdDebug(7121)<<"Deleting file "<<thePath<<endl;
diropargs dirOpArgs;
memcpy(dirOpArgs.dir.data,fh,NFS_FHSIZE);
- QCString tmpName=QFile::encodeName(fileName);
+ TQCString tmpName=TQFile::encodeName(fileName);
dirOpArgs.name=tmpName.data();
nfsstat nfsStat;
@@ -1133,7 +1133,7 @@ void NFSProtocol::del( const KURL& url, bool isfile)
kdDebug(7121)<<"Deleting directory "<<thePath<<endl;
diropargs dirOpArgs;
memcpy(dirOpArgs.dir.data,fh,NFS_FHSIZE);
- QCString tmpName=QFile::encodeName(fileName);
+ TQCString tmpName=TQFile::encodeName(fileName);
dirOpArgs.name=tmpName.data();
nfsstat nfsStat;
@@ -1150,7 +1150,7 @@ void NFSProtocol::del( const KURL& url, bool isfile)
void NFSProtocol::chmod( const KURL& url, int permissions )
{
- QString thePath( QFile::encodeName(url.path()));
+ TQString thePath( TQFile::encodeName(url.path()));
stripTrailingSlash(thePath);
kdDebug( 7121 ) << "chmod -"<< thePath << "-"<<endl;
if (isRoot(thePath) || isExportedDir(thePath))
@@ -1190,7 +1190,7 @@ void NFSProtocol::chmod( const KURL& url, int permissions )
void NFSProtocol::get( const KURL& url )
{
- QString thePath( QFile::encodeName(url.path()));
+ TQString thePath( TQFile::encodeName(url.path()));
kdDebug(7121)<<"get() -"<<thePath<<"-"<<endl;
NFSFileHandle fh=getFileHandle(thePath);
if (fh.isInvalid())
@@ -1208,7 +1208,7 @@ void NFSProtocol::get( const KURL& url )
char buf[NFS_MAXDATA];
readRes.readres_u.reply.data.data_val=buf;
- QByteArray array;
+ TQByteArray array;
do
{
int clnt_stat = clnt_call(m_client, NFSPROC_READ,
@@ -1231,20 +1231,20 @@ void NFSProtocol::get( const KURL& url )
}
} while (offset>0);
- data( QByteArray() );
+ data( TQByteArray() );
finished();
}
//TODO the partial putting thing is not yet implemented
void NFSProtocol::put( const KURL& url, int _mode, bool _overwrite, bool /*_resume*/ )
{
- QString destPath( QFile::encodeName(url.path()));
+ TQString destPath( TQFile::encodeName(url.path()));
kdDebug( 7121 ) << "Put -" << destPath <<"-"<<endl;
- /*QString dest_part( dest_orig );
+ /*TQString dest_part( dest_orig );
dest_part += ".part";*/
stripTrailingSlash(destPath);
- QString parentDir, fileName;
+ TQString parentDir, fileName;
getLastPart(destPath,fileName, parentDir);
if (isRoot(parentDir))
{
@@ -1282,7 +1282,7 @@ void NFSProtocol::put( const KURL& url, int _mode, bool _overwrite, bool /*_resu
}
createargs createArgs;
memcpy(createArgs.where.dir.data,(const char*)parentFH,NFS_FHSIZE);
- QCString tmpName=QFile::encodeName(fileName);
+ TQCString tmpName=TQFile::encodeName(fileName);
createArgs.where.name=tmpName.data();
//the mode is apparently ignored if the file already exists
@@ -1322,7 +1322,7 @@ void NFSProtocol::put( const KURL& url, int _mode, bool _overwrite, bool /*_resu
kdDebug(7121)<<"starting to put"<<endl;
do
{
- QByteArray buffer;
+ TQByteArray buffer;
dataReq(); // Request for data
result = readData( buffer );
//kdDebug(7121)<<"received "<<result<<" bytes for putting"<<endl;
@@ -1364,8 +1364,8 @@ void NFSProtocol::put( const KURL& url, int _mode, bool _overwrite, bool /*_resu
void NFSProtocol::rename( const KURL &src, const KURL &dest, bool _overwrite )
{
- QString srcPath( QFile::encodeName(src.path()));
- QString destPath( QFile::encodeName(dest.path()));
+ TQString srcPath( TQFile::encodeName(src.path()));
+ TQString destPath( TQFile::encodeName(dest.path()));
stripTrailingSlash(srcPath);
stripTrailingSlash(destPath);
kdDebug(7121)<<"renaming -"<<srcPath<<"- to -"<<destPath<<"-"<<endl;
@@ -1387,7 +1387,7 @@ void NFSProtocol::rename( const KURL &src, const KURL &dest, bool _overwrite )
}
}
- QString srcFileName, srcParentDir, destFileName, destParentDir;
+ TQString srcFileName, srcParentDir, destFileName, destParentDir;
getLastPart(srcPath, srcFileName, srcParentDir);
NFSFileHandle srcFH=getFileHandle(srcParentDir);
@@ -1398,7 +1398,7 @@ void NFSProtocol::rename( const KURL &src, const KURL &dest, bool _overwrite )
}
renameargs renameArgs;
memcpy(renameArgs.from.dir.data,srcFH,NFS_FHSIZE);
- QCString tmpName=QFile::encodeName(srcFileName);
+ TQCString tmpName=TQFile::encodeName(srcFileName);
renameArgs.from.name=tmpName.data();
getLastPart(destPath, destFileName, destParentDir);
@@ -1409,7 +1409,7 @@ void NFSProtocol::rename( const KURL &src, const KURL &dest, bool _overwrite )
return;
}
memcpy(renameArgs.to.dir.data,destFH,NFS_FHSIZE);
- QCString tmpName2=QFile::encodeName(destFileName);
+ TQCString tmpName2=TQFile::encodeName(destFileName);
renameArgs.to.name=tmpName2.data();
nfsstat nfsStat;
@@ -1423,7 +1423,7 @@ void NFSProtocol::rename( const KURL &src, const KURL &dest, bool _overwrite )
void NFSProtocol::copy( const KURL &src, const KURL &dest, int _mode, bool _overwrite )
{
//prepare the source
- QString thePath( QFile::encodeName(src.path()));
+ TQString thePath( TQFile::encodeName(src.path()));
stripTrailingSlash(thePath);
kdDebug( 7121 ) << "Copy to -" << thePath <<"-"<<endl;
NFSFileHandle fh=getFileHandle(thePath);
@@ -1434,9 +1434,9 @@ void NFSProtocol::copy( const KURL &src, const KURL &dest, int _mode, bool _over
};
//create the destination
- QString destPath( QFile::encodeName(dest.path()));
+ TQString destPath( TQFile::encodeName(dest.path()));
stripTrailingSlash(destPath);
- QString parentDir, fileName;
+ TQString parentDir, fileName;
getLastPart(destPath,fileName, parentDir);
if (isRoot(parentDir))
{
@@ -1472,7 +1472,7 @@ void NFSProtocol::copy( const KURL &src, const KURL &dest, int _mode, bool _over
};
createargs createArgs;
memcpy(createArgs.where.dir.data,(const char*)parentFH,NFS_FHSIZE);
- QCString tmpName=QFile::encodeName(fileName);
+ TQCString tmpName=TQFile::encodeName(fileName);
createArgs.where.name=tmpName.data();
if (_mode==-1) createArgs.attributes.mode=0644;
else createArgs.attributes.mode=_mode;
@@ -1543,13 +1543,13 @@ void NFSProtocol::copy( const KURL &src, const KURL &dest, int _mode, bool _over
}
//TODO why isn't this even called ?
-void NFSProtocol::symlink( const QString &target, const KURL &dest, bool )
+void NFSProtocol::symlink( const TQString &target, const KURL &dest, bool )
{
kdDebug(7121)<<"symlinking "<<endl;
- QString destPath=dest.path();
+ TQString destPath=dest.path();
stripTrailingSlash(destPath);
- QString parentDir, fileName;
+ TQString parentDir, fileName;
getLastPart(destPath,fileName, parentDir);
kdDebug(7121)<<"symlinking "<<parentDir<<" "<<fileName<<" to "<<target<<endl;
NFSFileHandle fh=getFileHandle(parentDir);
@@ -1565,11 +1565,11 @@ void NFSProtocol::symlink( const QString &target, const KURL &dest, bool )
}
kdDebug(7121)<<"tach"<<endl;
- QCString tmpStr=target.latin1();
+ TQCString tmpStr=target.latin1();
symlinkargs symLinkArgs;
symLinkArgs.to=tmpStr.data();
memcpy(symLinkArgs.from.dir.data,(const char*)fh,NFS_FHSIZE);
- QCString tmpStr2=QFile::encodeName(destPath);
+ TQCString tmpStr2=TQFile::encodeName(destPath);
symLinkArgs.from.name=tmpStr2.data();
nfsstat nfsStat;
@@ -1582,30 +1582,30 @@ void NFSProtocol::symlink( const QString &target, const KURL &dest, bool )
}
-bool NFSProtocol::isValidLink(const QString& parentDir, const QString& linkDest)
+bool NFSProtocol::isValidLink(const TQString& parentDir, const TQString& linkDest)
{
kdDebug(7121)<<"isValidLink: parent: "<<parentDir<<" link: "<<linkDest<<endl;
if (linkDest.isEmpty()) return FALSE;
if (isAbsoluteLink(linkDest))
{
kdDebug(7121)<<"is an absolute link"<<endl;
- return QFile::exists(linkDest);
+ return TQFile::exists(linkDest);
}
else
{
kdDebug(7121)<<"is a relative link"<<endl;
- QString absDest=parentDir+"/"+linkDest;
+ TQString absDest=parentDir+"/"+linkDest;
kdDebug(7121)<<"pointing abs to "<<absDest<<endl;
absDest=removeFirstPart(absDest);
kdDebug(7121)<<"removed first part "<<absDest<<endl;
- absDest=QDir::cleanDirPath(absDest);
+ absDest=TQDir::cleanDirPath(absDest);
kdDebug(7121)<<"simplified to "<<absDest<<endl;
if (absDest.find("../")==0)
return FALSE;
kdDebug(7121)<<"is inside the nfs tree"<<endl;
absDest=parentDir+"/"+linkDest;
- absDest=QDir::cleanDirPath(absDest);
+ absDest=TQDir::cleanDirPath(absDest);
kdDebug(7121)<<"getting file handle of "<<absDest<<endl;
NFSFileHandle fh=getFileHandle(absDest);
return (!fh.isInvalid());
diff --git a/kioslave/nfs/kio_nfs.h b/kioslave/nfs/kio_nfs.h
index 23eb0b467..9f6d38103 100644
--- a/kioslave/nfs/kio_nfs.h
+++ b/kioslave/nfs/kio_nfs.h
@@ -23,11 +23,11 @@
#include <kio/slavebase.h>
#include <kio/global.h>
-#include <qmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qintdict.h>
-#include <qtimer.h>
+#include <tqmap.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqintdict.h>
+#include <tqtimer.h>
#define PORTMAP //this seems to be required to compile on Solaris
#include <rpc/rpc.h>
@@ -55,24 +55,24 @@ class NFSFileHandle
//ostream& operator<<(ostream&, const NFSFileHandle&);
-typedef QMap<QString,NFSFileHandle> NFSFileHandleMap;
+typedef TQMap<TQString,NFSFileHandle> NFSFileHandleMap;
class NFSProtocol : public KIO::SlaveBase
{
public:
- NFSProtocol (const QCString &pool, const QCString &app );
+ NFSProtocol (const TQCString &pool, const TQCString &app );
virtual ~NFSProtocol();
virtual void openConnection();
virtual void closeConnection();
- virtual void setHost( const QString& host, int port, const QString& user, const QString& pass );
+ virtual void setHost( const TQString& host, int port, const TQString& user, const TQString& pass );
virtual void put( const KURL& url, int _mode,bool _overwrite, bool _resume );
virtual void get( const KURL& url );
virtual void listDir( const KURL& url);
- virtual void symlink( const QString &target, const KURL &dest, bool );
+ virtual void symlink( const TQString &target, const KURL &dest, bool );
virtual void stat( const KURL & url);
virtual void mkdir( const KURL& url, int permissions );
virtual void del( const KURL& url, bool isfile);
@@ -81,22 +81,22 @@ class NFSProtocol : public KIO::SlaveBase
virtual void copy( const KURL& src, const KURL &dest, int mode, bool overwrite );
protected:
// void createVirtualDirEntry(KIO::UDSEntry & entry);
- bool checkForError(int clientStat, int nfsStat, const QString& text);
- bool isExportedDir(const QString& path);
+ bool checkForError(int clientStat, int nfsStat, const TQString& text);
+ bool isExportedDir(const TQString& path);
void completeUDSEntry(KIO::UDSEntry& entry, fattr& attributes);
void completeBadLinkUDSEntry(KIO::UDSEntry& entry, fattr& attributes);
- void completeAbsoluteLinkUDSEntry(KIO::UDSEntry& entry, const QCString& path);
- bool isValidLink(const QString& parentDir, const QString& linkDest);
-// bool isAbsoluteLink(const QString& path);
+ void completeAbsoluteLinkUDSEntry(KIO::UDSEntry& entry, const TQCString& path);
+ bool isValidLink(const TQString& parentDir, const TQString& linkDest);
+// bool isAbsoluteLink(const TQString& path);
- NFSFileHandle getFileHandle(QString path);
+ NFSFileHandle getFileHandle(TQString path);
NFSFileHandleMap m_handleCache;
- QIntDict<QString> m_usercache; // maps long ==> QString *
- QIntDict<QString> m_groupcache;
+ TQIntDict<TQString> m_usercache; // maps long ==> TQString *
+ TQIntDict<TQString> m_groupcache;
- QStringList m_exportedDirs;
- QString m_currentHost;
+ TQStringList m_exportedDirs;
+ TQString m_currentHost;
CLIENT *m_client;
CLIENT *m_nfsClient;
timeval total_timeout;
diff --git a/kioslave/nntp/nntp.cpp b/kioslave/nntp/nntp.cpp
index 40b162868..b109bb58a 100644
--- a/kioslave/nntp/nntp.cpp
+++ b/kioslave/nntp/nntp.cpp
@@ -12,8 +12,8 @@
#include <stdlib.h>
#include <stdio.h>
-#include <qdir.h>
-#include <qregexp.h>
+#include <tqdir.h>
+#include <tqregexp.h>
#include <kinstance.h>
#include <kdebug.h>
@@ -62,7 +62,7 @@ int kdemain(int argc, char **argv) {
/****************** NNTPProtocol ************************/
-NNTPProtocol::NNTPProtocol ( const QCString & pool, const QCString & app, bool isSSL )
+NNTPProtocol::NNTPProtocol ( const TQCString & pool, const TQCString & app, bool isSSL )
: TCPSlaveBase( (isSSL ? NNTPS_PORT : NNTP_PORT), (isSSL ? "nntps" : "nntp"), pool,
app, isSSL )
{
@@ -81,10 +81,10 @@ NNTPProtocol::~NNTPProtocol() {
nntp_close();
}
-void NNTPProtocol::setHost ( const QString & host, int port, const QString & user,
- const QString & pass )
+void NNTPProtocol::setHost ( const TQString & host, int port, const TQString & user,
+ const TQString & pass )
{
- DBG << "setHost: " << ( ! user.isEmpty() ? (user+"@") : QString(""))
+ DBG << "setHost: " << ( ! user.isEmpty() ? (user+"@") : TQString(""))
<< host << ":" << ( ( port == 0 ) ? m_iDefaultPort : port ) << endl;
if ( isConnectionValid() && (mHost != host || m_iPort != port ||
@@ -99,11 +99,11 @@ void NNTPProtocol::setHost ( const QString & host, int port, const QString & use
void NNTPProtocol::get(const KURL& url) {
DBG << "get " << url.prettyURL() << endl;
- QString path = QDir::cleanDirPath(url.path());
- QRegExp regMsgId = QRegExp("^\\/?[a-z0-9\\.\\-_]+\\/<\\S+>$", false);
+ TQString path = TQDir::cleanDirPath(url.path());
+ TQRegExp regMsgId = TQRegExp("^\\/?[a-z0-9\\.\\-_]+\\/<\\S+>$", false);
int pos;
- QString group;
- QString msg_id;
+ TQString group;
+ TQString msg_id;
// path should be like: /group/<msg_id>
if (regMsgId.search(path) != 0) {
@@ -142,8 +142,8 @@ void NNTPProtocol::get(const KURL& url) {
}
// read and send data
- QCString line;
- QByteArray buffer;
+ TQCString line;
+ TQByteArray buffer;
char tmp[MAX_PACKET_LEN];
int len = 0;
while ( true ) {
@@ -160,7 +160,7 @@ void NNTPProtocol::get(const KURL& url) {
break;
if ( line.left(2) == ".." )
line.remove( 0, 1 );
- // cannot use QCString, it would send the 0-terminator too
+ // cannot use TQCString, it would send the 0-terminator too
buffer.setRawData( line.data(), line.length() );
data( buffer );
buffer.resetRawData( line.data(), line.length() );
@@ -181,10 +181,10 @@ void NNTPProtocol::put( const KURL &/*url*/, int /*permissions*/, bool /*overwri
finished();
}
-void NNTPProtocol::special(const QByteArray& data) {
+void NNTPProtocol::special(const TQByteArray& data) {
// 1 = post article
int cmd;
- QDataStream stream(data, IO_ReadOnly);
+ TQDataStream stream(data, IO_ReadOnly);
if ( !nntp_open() )
return;
@@ -214,13 +214,13 @@ bool NNTPProtocol::post_article() {
int result;
bool last_chunk_had_line_ending = true;
do {
- QByteArray buffer;
- QCString data;
+ TQByteArray buffer;
+ TQCString data;
dataReq();
result = readData(buffer);
// treat the buffer data
if (result>0) {
- data = QCString(buffer.data(),buffer.size()+1);
+ data = TQCString(buffer.data(),buffer.size()+1);
// translate "\r\n." to "\r\n.."
int pos=0;
if (last_chunk_had_line_ending && data[0] == '.') {
@@ -265,17 +265,17 @@ bool NNTPProtocol::post_article() {
void NNTPProtocol::stat( const KURL& url ) {
DBG << "stat " << url.prettyURL() << endl;
UDSEntry entry;
- QString path = QDir::cleanDirPath(url.path());
- QRegExp regGroup = QRegExp("^\\/?[a-z0-9\\.\\-_]+\\/?$",false);
- QRegExp regMsgId = QRegExp("^\\/?[a-z0-9\\.\\-_]+\\/<\\S+>$", false);
+ TQString path = TQDir::cleanDirPath(url.path());
+ TQRegExp regGroup = TQRegExp("^\\/?[a-z0-9\\.\\-_]+\\/?$",false);
+ TQRegExp regMsgId = TQRegExp("^\\/?[a-z0-9\\.\\-_]+\\/<\\S+>$", false);
int pos;
- QString group;
- QString msg_id;
+ TQString group;
+ TQString msg_id;
// / = group list
if (path.isEmpty() || path == "/") {
DBG << "stat root" << endl;
- fillUDSEntry(entry, QString::null, 0, postingAllowed, false);
+ fillUDSEntry(entry, TQString::null, 0, postingAllowed, false);
// /group = message list
} else if (regGroup.search(path) == 0) {
@@ -312,7 +312,7 @@ void NNTPProtocol::listDir( const KURL& url ) {
if ( !nntp_open() )
return;
- QString path = QDir::cleanDirPath(url.path());
+ TQString path = TQDir::cleanDirPath(url.path());
if (path.isEmpty())
{
@@ -329,20 +329,20 @@ void NNTPProtocol::listDir( const KURL& url ) {
} else {
// if path = /group
int pos;
- QString group;
+ TQString group;
if (path.left(1) == "/")
path.remove(0,1);
if ((pos = path.find('/')) > 0)
group = path.left(pos);
else
group = path;
- QString first = url.queryItem( "first" );
+ TQString first = url.queryItem( "first" );
if ( fetchGroup( group, first.toULong() ) )
finished();
}
}
-void NNTPProtocol::fetchGroups( const QString &since )
+void NNTPProtocol::fetchGroups( const TQString &since )
{
int expected;
int res;
@@ -361,7 +361,7 @@ void NNTPProtocol::fetchGroups( const QString &since )
}
// read newsgroups line by line
- QCString line, group;
+ TQCString line, group;
int pos, pos2;
long msg_cnt;
bool moderated;
@@ -407,7 +407,7 @@ void NNTPProtocol::fetchGroups( const QString &since )
// incremental article listing
UDSAtom atom;
atom.m_uds = UDS_EXTRA;
- atom.m_str = QString::number( last );
+ atom.m_str = TQString::number( last );
entry.append( atom );
entryList.append(entry);
@@ -422,9 +422,9 @@ void NNTPProtocol::fetchGroups( const QString &since )
if (entryList.count() > 0) listEntries(entryList);
}
-bool NNTPProtocol::fetchGroup( QString &group, unsigned long first ) {
+bool NNTPProtocol::fetchGroup( TQString &group, unsigned long first ) {
int res_code;
- QString resp_line;
+ TQString resp_line;
// select group
res_code = sendCommand( "GROUP " + group );
@@ -471,15 +471,15 @@ bool NNTPProtocol::fetchGroupRFC977( unsigned long first )
UDSEntryList entryList;
// set article pointer to first article and get msg-id of it
- int res_code = sendCommand( "STAT " + QString::number( first ) );
- QString resp_line = readBuffer;
+ int res_code = sendCommand( "STAT " + TQString::number( first ) );
+ TQString resp_line = readBuffer;
if (res_code != 223) {
unexpected_response(res_code,"STAT");
return false;
}
//STAT res_line: 223 nnn <msg_id> ...
- QString msg_id;
+ TQString msg_id;
int pos, pos2;
if ((pos = resp_line.find('<')) > 0 && (pos2 = resp_line.find('>',pos+1))) {
msg_id = resp_line.mid(pos,pos2-pos+1);
@@ -528,8 +528,8 @@ bool NNTPProtocol::fetchGroupXOVER( unsigned long first, bool &notSupported )
{
notSupported = false;
- QString line;
- QStringList headers;
+ TQString line;
+ TQStringList headers;
int res = sendCommand( "LIST OVERVIEW.FMT" );
if ( res == 215 ) {
@@ -552,7 +552,7 @@ bool NNTPProtocol::fetchGroupXOVER( unsigned long first, bool &notSupported )
<< "References:" << "Bytes:" << "Lines:";
}
- res = sendCommand( "XOVER " + QString::number( first ) + "-" );
+ res = sendCommand( "XOVER " + TQString::number( first ) + "-" );
if ( res == 420 )
return true; // no articles selected
if ( res == 500 )
@@ -561,12 +561,12 @@ bool NNTPProtocol::fetchGroupXOVER( unsigned long first, bool &notSupported )
return false;
long msgSize;
- QString msgId;
+ TQString msgId;
UDSAtom atom;
UDSEntry entry;
UDSEntryList entryList;
- QStringList fields;
+ TQStringList fields;
while ( true ) {
if ( ! waitForResponse( readTimeout() ) ) {
error( ERR_SERVER_TIMEOUT, mHost );
@@ -582,11 +582,11 @@ bool NNTPProtocol::fetchGroupXOVER( unsigned long first, bool &notSupported )
return true;
}
- fields = QStringList::split( "\t", line, true );
- msgId = QString::null;
+ fields = TQStringList::split( "\t", line, true );
+ msgId = TQString::null;
msgSize = 0;
- QStringList::ConstIterator it = headers.constBegin();
- QStringList::ConstIterator it2 = fields.constBegin();
+ TQStringList::ConstIterator it = headers.constBegin();
+ TQStringList::ConstIterator it2 = fields.constBegin();
++it2; // first entry is the serial number
for ( ; it != headers.constEnd() && it2 != fields.constEnd(); ++it, ++it2 ) {
if ( (*it).contains( "Message-ID:", false ) ) {
@@ -617,7 +617,7 @@ bool NNTPProtocol::fetchGroupXOVER( unsigned long first, bool &notSupported )
}
-void NNTPProtocol::fillUDSEntry(UDSEntry& entry, const QString& name, long size,
+void NNTPProtocol::fillUDSEntry(UDSEntry& entry, const TQString& name, long size,
bool posting_allowed, bool is_article) {
long posting=0;
@@ -633,14 +633,14 @@ void NNTPProtocol::fillUDSEntry(UDSEntry& entry, const QString& name, long size,
// entry size
atom.m_uds = UDS_SIZE;
- atom.m_str = QString::null;
+ atom.m_str = TQString::null;
atom.m_long = size;
entry.append(atom);
// file type
atom.m_uds = UDS_FILE_TYPE;
atom.m_long = is_article? S_IFREG : S_IFDIR;
- atom.m_str = QString::null;
+ atom.m_str = TQString::null;
entry.append(atom);
// access permissions
@@ -648,11 +648,11 @@ void NNTPProtocol::fillUDSEntry(UDSEntry& entry, const QString& name, long size,
posting = posting_allowed? (S_IWUSR | S_IWGRP | S_IWOTH) : 0;
atom.m_long = (is_article)? (S_IRUSR | S_IRGRP | S_IROTH) :
(S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH | posting);
- atom.m_str = QString::null;
+ atom.m_str = TQString::null;
entry.append(atom);
atom.m_uds = UDS_USER;
- atom.m_str = mUser.isEmpty() ? QString("root") : mUser;
+ atom.m_str = mUser.isEmpty() ? TQString("root") : mUser;
atom.m_long= 0;
entry.append(atom);
@@ -746,7 +746,7 @@ bool NNTPProtocol::nntp_open()
}
}
-int NNTPProtocol::sendCommand( const QString &cmd )
+int NNTPProtocol::sendCommand( const TQString &cmd )
{
int res_code = 0;
@@ -811,7 +811,7 @@ int NNTPProtocol::sendCommand( const QString &cmd )
return res_code;
}
-void NNTPProtocol::unexpected_response( int res_code, const QString & command) {
+void NNTPProtocol::unexpected_response( int res_code, const TQString & command) {
ERR << "Unexpected response to " << command << " command: (" << res_code << ") "
<< readBuffer << endl;
error(ERR_INTERNAL,i18n("Unexpected server response to %1 command:\n%2").
@@ -845,8 +845,8 @@ int NNTPProtocol::evalResponse ( char *data, ssize_t &len )
use the KIO::Error's instead, but let this here for
documentation of the NNTP response codes and may
by later use.
-QString& NNTPProtocol::errorStr(int resp_code) {
- QString ret;
+TQString& NNTPProtocol::errorStr(int resp_code) {
+ TQString ret;
switch (resp_code) {
case 100: ret = "help text follows"; break;
@@ -888,7 +888,7 @@ QString& NNTPProtocol::errorStr(int resp_code) {
case 501: ret = "command syntax error"; break;
case 502: ret = "access restriction or permission denied"; break;
case 503: ret = "program fault - command not performed"; break;
- default: ret = QString("unknown NNTP response code %1").arg(resp_code);
+ default: ret = TQString("unknown NNTP response code %1").arg(resp_code);
}
return ret;
diff --git a/kioslave/nntp/nntp.h b/kioslave/nntp/nntp.h
index 7efe597a8..30368eee1 100644
--- a/kioslave/nntp/nntp.h
+++ b/kioslave/nntp/nntp.h
@@ -11,7 +11,7 @@
#ifndef _NNTP_H
#define _NNTP_H
-#include <qstring.h>
+#include <tqstring.h>
#include <kio/global.h>
#include <kio/tcpslavebase.h>
@@ -30,15 +30,15 @@ class NNTPProtocol:public KIO::TCPSlaveBase
/** Default Constructor
* @param isSSL is a true or false to indicate whether ssl is to be used
*/
- NNTPProtocol ( const QCString & pool, const QCString & app, bool isSSL );
+ NNTPProtocol ( const TQCString & pool, const TQCString & app, bool isSSL );
virtual ~NNTPProtocol();
virtual void get(const KURL& url );
virtual void put( const KURL& url, int permissions, bool overwrite, bool resume );
virtual void stat(const KURL& url );
virtual void listDir(const KURL& url );
- virtual void setHost(const QString& host, int port,
- const QString& user, const QString& pass);
+ virtual void setHost(const TQString& host, int port,
+ const TQString& user, const TQString& pass);
/**
* Special command: 1 = post article
@@ -47,7 +47,7 @@ class NNTPProtocol:public KIO::TCPSlaveBase
* as in RFC850. It's not checked for correctness here.
* @deprecated use put() for posting
*/
- virtual void special(const QByteArray& data);
+ virtual void special(const TQByteArray& data);
protected:
@@ -55,7 +55,7 @@ class NNTPProtocol:public KIO::TCPSlaveBase
* Send a command to the server. Returns the response code and
* the response line
*/
- int sendCommand( const QString &cmd );
+ int sendCommand( const TQString &cmd );
/**
* Attempt to properly shut down the NNTP connection by sending
@@ -76,7 +76,7 @@ class NNTPProtocol:public KIO::TCPSlaveBase
private:
- QString mHost, mUser, mPass;
+ TQString mHost, mUser, mPass;
bool postingAllowed, opened;
char readBuffer[MAX_PACKET_LEN];
ssize_t readBufferLen;
@@ -86,7 +86,7 @@ class NNTPProtocol:public KIO::TCPSlaveBase
* all available groups.
* @param since Date as specified in RFC 977 for the NEWGROUPS command
*/
- void fetchGroups( const QString &since );
+ void fetchGroups( const TQString &since );
/**
* Fetch message listing from the given newsgroup.
* This will use RFC2980 XOVER if available, plain RFC977 STAT/NEXT
@@ -95,7 +95,7 @@ class NNTPProtocol:public KIO::TCPSlaveBase
* @param first Serial number of the first message, 0 lists all messages.
* @return true on sucess, false otherwise.
*/
- bool fetchGroup ( QString &group, unsigned long first = 0 );
+ bool fetchGroup ( TQString &group, unsigned long first = 0 );
/**
* Fetch message listing from the current group using RFC977 STAT/NEXT
* commands.
@@ -115,10 +115,10 @@ class NNTPProtocol:public KIO::TCPSlaveBase
*/
bool fetchGroupXOVER( unsigned long first, bool &notSupported );
/// creates an UDSEntry with file information used in stat and listDir
- void fillUDSEntry ( KIO::UDSEntry & entry, const QString & name, long size,
+ void fillUDSEntry ( KIO::UDSEntry & entry, const TQString & name, long size,
bool postingAllowed, bool is_article );
/// error handling for unexpected responses
- void unexpected_response ( int res_code, const QString & command );
+ void unexpected_response ( int res_code, const TQString & command );
/**
* grabs the response line from the server. used after most send_cmd calls. max
* length for the returned string ( char *data ) is 4096 characters including
diff --git a/kioslave/pop3/pop3.cc b/kioslave/pop3/pop3.cc
index 06266d7a4..0ab27f63b 100644
--- a/kioslave/pop3/pop3.cc
+++ b/kioslave/pop3/pop3.cc
@@ -47,9 +47,9 @@ extern "C" {
}
#endif
-#include <qcstring.h>
-#include <qglobal.h>
-#include <qregexp.h>
+#include <tqcstring.h>
+#include <tqglobal.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <kinstance.h>
@@ -124,7 +124,7 @@ int kdemain(int argc, char **argv)
return 0;
}
-POP3Protocol::POP3Protocol(const QCString & pool, const QCString & app,
+POP3Protocol::POP3Protocol(const TQCString & pool, const TQCString & app,
bool isSSL)
: TCPSlaveBase((isSSL ? 995 : 110), (isSSL ? "pop3s" : "pop3"), pool, app,
isSSL)
@@ -148,8 +148,8 @@ POP3Protocol::~POP3Protocol()
closeConnection();
}
-void POP3Protocol::setHost(const QString & _host, int _port,
- const QString & _user, const QString & _pass)
+void POP3Protocol::setHost(const TQString & _host, int _port,
+ const TQString & _user, const TQString & _pass)
{
m_sServer = _host;
m_iPort = _port;
@@ -242,8 +242,8 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len,
QMIN(r_len, (buf[4] == ' ' ? recv_len - 5 : recv_len - 4)));
}
- QString command = QString::fromLatin1(cmd);
- QString serverMsg = QString::fromLatin1(buf).mid(5).stripWhiteSpace();
+ TQString command = TQString::fromLatin1(cmd);
+ TQString serverMsg = TQString::fromLatin1(buf).mid(5).stripWhiteSpace();
if (command.left(4) == "PASS") {
command = i18n("PASS <your password>");
@@ -353,7 +353,7 @@ int POP3Protocol::loginAPOP( char *challenge, KIO::AuthInfo &ai )
{
char buf[512];
- QString apop_string = QString::fromLatin1("APOP ");
+ TQString apop_string = TQString::fromLatin1("APOP ");
if (m_sUser.isEmpty() || m_sPass.isEmpty()) {
// Prompt for usernames
if (!openPassDlg(ai)) {
@@ -455,13 +455,13 @@ bool POP3Protocol::saslInteract( void *in, AuthInfo &ai )
#define SASLERROR closeConnection(); \
error(ERR_COULD_NOT_AUTHENTICATE, i18n("An error occured during authentication: %1").arg \
-( QString::fromUtf8( sasl_errdetail( conn ) ))); \
+( TQString::fromUtf8( sasl_errdetail( conn ) ))); \
int POP3Protocol::loginSASL( KIO::AuthInfo &ai )
{
#ifdef HAVE_LIBSASL2
char buf[512];
- QString sasl_buffer = QString::fromLatin1("AUTH");
+ TQString sasl_buffer = TQString::fromLatin1("AUTH");
int result;
sasl_conn_t *conn = NULL;
@@ -485,7 +485,7 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai )
// This is based on RFC 1734's wisdom
if ( hasMetaData("sasl") || command(sasl_buffer.local8Bit()) == Ok ) {
- QStringList sasl_list;
+ TQStringList sasl_list;
if (hasMetaData("sasl")) {
sasl_list.append(metaData("sasl").latin1());
} else
@@ -523,22 +523,22 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai )
POP3_DEBUG << "Preferred authentication method is " << mechusing << "." << endl;
- QByteArray challenge, tmp;
+ TQByteArray challenge, tmp;
- QString firstCommand = "AUTH " + QString::fromLatin1( mechusing );
+ TQString firstCommand = "AUTH " + TQString::fromLatin1( mechusing );
challenge.setRawData( out, outlen );
KCodecs::base64Encode( challenge, tmp );
challenge.resetRawData( out, outlen );
if ( !tmp.isEmpty() ) {
firstCommand += " ";
- firstCommand += QString::fromLatin1( tmp.data(), tmp.size() );
+ firstCommand += TQString::fromLatin1( tmp.data(), tmp.size() );
}
challenge.resize( 2049 );
resp = command( firstCommand.latin1(), challenge.data(), 2049 );
while( resp == Cont ) {
challenge.resize(challenge.find(0));
-// POP3_DEBUG << "S: " << QCString(challenge.data(),challenge.size()+1) << endl;
+// POP3_DEBUG << "S: " << TQCString(challenge.data(),challenge.size()+1) << endl;
KCodecs::base64Decode( challenge, tmp );
do {
result = sasl_client_step(conn, tmp.isEmpty() ? 0 : tmp.data(),
@@ -563,7 +563,7 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai )
challenge.setRawData( out, outlen );
KCodecs::base64Encode( challenge, tmp );
challenge.resetRawData( out, outlen );
-// POP3_DEBUG << "C: " << QCString(tmp.data(),tmp.size()+1) << endl;
+// POP3_DEBUG << "C: " << TQCString(tmp.data(),tmp.size()+1) << endl;
tmp.resize(tmp.size()+1);
tmp[tmp.size()-1] = '\0';
challenge.resize(2049);
@@ -624,7 +624,7 @@ bool POP3Protocol::loginPASS( KIO::AuthInfo &ai )
m_sOldUser = m_sUser;
m_sOldPass = m_sPass;
- QString one_string = QString::fromLatin1("USER ");
+ TQString one_string = TQString::fromLatin1("USER ");
one_string.append( m_sUser );
if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) {
@@ -638,7 +638,7 @@ bool POP3Protocol::loginPASS( KIO::AuthInfo &ai )
return false;
}
- one_string = QString::fromLatin1("PASS ");
+ one_string = TQString::fromLatin1("PASS ");
one_string.append(m_sPass);
if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) {
@@ -692,7 +692,7 @@ bool POP3Protocol::pop3_open()
return false; // we've got major problems, and possibly the
// wrong port
}
- QCString greeting(greeting_buf);
+ TQCString greeting(greeting_buf);
delete[]greeting_buf;
if (greeting.length() > 0) {
@@ -700,8 +700,8 @@ bool POP3Protocol::pop3_open()
}
// Does the server support APOP?
- QString apop_cmd;
- QRegExp re("<[A-Za-z0-9\\.\\-_]+@[A-Za-z0-9\\.\\-_]+>$", false);
+ TQString apop_cmd;
+ TQRegExp re("<[A-Za-z0-9\\.\\-_]+@[A-Za-z0-9\\.\\-_]+>$", false);
POP3_DEBUG << "greeting: " << greeting << endl;
int apop_pos = greeting.find(re);
@@ -783,7 +783,7 @@ bool POP3Protocol::pop3_open()
size_t POP3Protocol::realGetSize(unsigned int msg_num)
{
char *buf;
- QCString cmd;
+ TQCString cmd;
size_t ret = 0;
buf = new char[MAX_RESPONSE_LEN];
@@ -801,11 +801,11 @@ size_t POP3Protocol::realGetSize(unsigned int msg_num)
return ret;
}
-void POP3Protocol::special(const QByteArray & aData)
+void POP3Protocol::special(const TQByteArray & aData)
{
- QString result;
+ TQString result;
char buf[MAX_PACKET_LEN];
- QDataStream stream(aData, IO_ReadOnly);
+ TQDataStream stream(aData, IO_ReadOnly);
int tmp;
stream >> tmp;
@@ -813,14 +813,14 @@ void POP3Protocol::special(const QByteArray & aData)
return;
for (int i = 0; i < 2; i++) {
- QCString cmd = (i) ? "AUTH" : "CAPA";
+ TQCString cmd = (i) ? "AUTH" : "CAPA";
if ( command(cmd) != Ok )
continue;
while (true) {
myReadLine(buf, MAX_PACKET_LEN - 1);
if (qstrcmp(buf, ".\r\n") == 0)
break;
- result += " " + QString(buf).left(strlen(buf) - 2)
+ result += " " + TQString(buf).left(strlen(buf) - 2)
.replace(" ", "-");
}
}
@@ -853,8 +853,8 @@ void POP3Protocol::get(const KURL & url)
bool ok = true;
char buf[MAX_PACKET_LEN];
char destbuf[MAX_PACKET_LEN];
- QByteArray array;
- QString cmd, path = url.path();
+ TQByteArray array;
+ TQString cmd, path = url.path();
int maxCommands = (metaData("pipelining") == "on") ? MAX_COMMANDS : 1;
if (path.at(0) == '/')
@@ -919,12 +919,12 @@ void POP3Protocol::get(const KURL & url)
}
}
POP3_DEBUG << "Finishing up list" << endl;
- data(QByteArray());
+ data(TQByteArray());
finished();
} else if (cmd == "remove") {
- QStringList waitingCommands = QStringList::split(',', path);
+ TQStringList waitingCommands = TQStringList::split(',', path);
int activeCommands = 0;
- QStringList::Iterator it = waitingCommands.begin();
+ TQStringList::Iterator it = waitingCommands.begin();
while (it != waitingCommands.end() || activeCommands > 0) {
while (activeCommands < maxCommands && it != waitingCommands.end()) {
sendCommand(("DELE " + *it).latin1());
@@ -937,12 +937,12 @@ void POP3Protocol::get(const KURL & url)
finished();
m_cmd = CMD_NONE;
} else if (cmd == "download" || cmd == "headers") {
- QStringList waitingCommands = QStringList::split(',', path);
+ TQStringList waitingCommands = TQStringList::split(',', path);
bool noProgress = (metaData("progress") == "off"
|| waitingCommands.count() > 1);
int p_size = 0;
unsigned int msg_len = 0;
- QString list_cmd("LIST ");
+ TQString list_cmd("LIST ");
list_cmd += path;
memset(buf, 0, sizeof(buf));
if ( !noProgress ) {
@@ -972,7 +972,7 @@ void POP3Protocol::get(const KURL & url)
}
int activeCommands = 0;
- QStringList::Iterator it = waitingCommands.begin();
+ TQStringList::Iterator it = waitingCommands.begin();
while (it != waitingCommands.end() || activeCommands > 0) {
while (activeCommands < maxCommands && it != waitingCommands.end()) {
sendCommand(((cmd ==
@@ -1069,10 +1069,10 @@ void POP3Protocol::get(const KURL & url)
}
}
POP3_DEBUG << "Finishing up" << endl;
- data(QByteArray());
+ data(TQByteArray());
finished();
} else if ((cmd == "uid") || (cmd == "list")) {
- QString qbuf;
+ TQString qbuf;
(void) path.toInt(&ok);
if (!ok) {
@@ -1096,7 +1096,7 @@ void POP3Protocol::get(const KURL & url)
processedSize(len);
POP3_DEBUG << buf << endl;
POP3_DEBUG << "Finishing up uid" << endl;
- data(QByteArray());
+ data(TQByteArray());
finished();
} else {
closeConnection();
@@ -1117,7 +1117,7 @@ void POP3Protocol::listDir(const KURL &)
bool isINT;
int num_messages = 0;
char buf[MAX_RESPONSE_LEN];
- QCString q_buf;
+ TQCString q_buf;
// Try and open a connection
if (!pop3_open()) {
@@ -1150,7 +1150,7 @@ void POP3Protocol::listDir(const KURL &)
}
UDSEntry entry;
UDSAtom atom;
- QString fname;
+ TQString fname;
for (int i = 0; i < num_messages; i++) {
fname = "Message %1";
@@ -1176,7 +1176,7 @@ void POP3Protocol::listDir(const KURL &)
uds_url.setUser(m_sUser);
uds_url.setPass(m_sPass);
uds_url.setHost(m_sServer);
- uds_url.setPath(QString::fromLatin1("/download/%1").arg(i + 1));
+ uds_url.setPath(TQString::fromLatin1("/download/%1").arg(i + 1));
atom.m_str = uds_url.url();
atom.m_long = 0;
entry.append(atom);
@@ -1205,7 +1205,7 @@ void POP3Protocol::listDir(const KURL &)
void POP3Protocol::stat(const KURL & url)
{
- QString _path = url.path();
+ TQString _path = url.path();
if (_path.at(0) == '/')
_path.remove(0, 1);
@@ -1234,7 +1234,7 @@ void POP3Protocol::stat(const KURL & url)
void POP3Protocol::del(const KURL & url, bool /*isfile */ )
{
- QString invalidURI = QString::null;
+ TQString invalidURI = TQString::null;
bool isInt;
if (!pop3_open()) {
@@ -1243,7 +1243,7 @@ void POP3Protocol::del(const KURL & url, bool /*isfile */ )
return;
}
- QString _path = url.path();
+ TQString _path = url.path();
if (_path.at(0) == '/') {
_path.remove(0, 1);
}
diff --git a/kioslave/pop3/pop3.h b/kioslave/pop3/pop3.h
index 94114f675..9c6ca9185 100644
--- a/kioslave/pop3/pop3.h
+++ b/kioslave/pop3/pop3.h
@@ -33,7 +33,7 @@
#include <stdio.h>
-#include <qstring.h>
+#include <tqstring.h>
#include <kio/tcpslavebase.h>
@@ -41,13 +41,13 @@
class POP3Protocol:public KIO::TCPSlaveBase {
public:
- POP3Protocol(const QCString & pool, const QCString & app, bool SSL);
+ POP3Protocol(const TQCString & pool, const TQCString & app, bool SSL);
virtual ~ POP3Protocol();
- virtual void setHost(const QString & host, int port,
- const QString & user, const QString & pass);
+ virtual void setHost(const TQString & host, int port,
+ const TQString & user, const TQString & pass);
- virtual void special(const QByteArray & aData);
+ virtual void special(const TQByteArray & aData);
virtual void get(const KURL & url);
virtual void stat(const KURL & url);
virtual void del(const KURL & url, bool isfile);
@@ -122,10 +122,10 @@ protected:
int m_cmd;
unsigned short int m_iOldPort;
struct timeval m_tTimeout;
- QString m_sOldServer, m_sOldPass, m_sOldUser;
- QString m_sServer, m_sPass, m_sUser;
+ TQString m_sOldServer, m_sOldPass, m_sOldUser;
+ TQString m_sServer, m_sPass, m_sUser;
bool m_try_apop, m_try_sasl, opened, supports_apop;
- QString m_sError;
+ TQString m_sError;
char readBuffer[MAX_PACKET_LEN];
ssize_t readBufferLen;
};
diff --git a/kioslave/remote/kdedmodule/remotedirnotify.cpp b/kioslave/remote/kdedmodule/remotedirnotify.cpp
index 88933e29a..e6e2359a6 100644
--- a/kioslave/remote/kdedmodule/remotedirnotify.cpp
+++ b/kioslave/remote/kdedmodule/remotedirnotify.cpp
@@ -26,14 +26,14 @@
#include <kdirnotify_stub.h>
-#include <qdir.h>
+#include <tqdir.h>
RemoteDirNotify::RemoteDirNotify()
{
KGlobal::dirs()->addResourceType("remote_entries",
KStandardDirs::kde_default("data") + "remoteview");
- QString path = KGlobal::dirs()->saveLocation("remote_entries");
+ TQString path = KGlobal::dirs()->saveLocation("remote_entries");
m_baseURL.setPath(path);
}
@@ -42,7 +42,7 @@ KURL RemoteDirNotify::toRemoteURL(const KURL &url)
kdDebug(1220) << "RemoteDirNotify::toRemoteURL(" << url << ")" << endl;
if ( m_baseURL.isParentOf(url) )
{
- QString path = KURL::relativePath(m_baseURL.path(),
+ TQString path = KURL::relativePath(m_baseURL.path(),
url.path());
KURL result("remote:/"+path);
result.cleanPath();
diff --git a/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp b/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp
index 5877ac299..894400ce2 100644
--- a/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp
+++ b/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp
@@ -22,13 +22,13 @@
#include <klocale.h>
#include <kglobal.h>
-RemoteDirNotifyModule::RemoteDirNotifyModule(const QCString &obj)
+RemoteDirNotifyModule::RemoteDirNotifyModule(const TQCString &obj)
: KDEDModule(obj)
{
}
extern "C" {
- KDE_EXPORT KDEDModule *create_remotedirnotify(const QCString &obj)
+ KDE_EXPORT KDEDModule *create_remotedirnotify(const TQCString &obj)
{
KGlobal::locale()->insertCatalogue("kio_remote");
return new RemoteDirNotifyModule(obj);
diff --git a/kioslave/remote/kdedmodule/remotedirnotifymodule.h b/kioslave/remote/kdedmodule/remotedirnotifymodule.h
index 4ce8c2c7d..e6cf0d720 100644
--- a/kioslave/remote/kdedmodule/remotedirnotifymodule.h
+++ b/kioslave/remote/kdedmodule/remotedirnotifymodule.h
@@ -28,7 +28,7 @@ class RemoteDirNotifyModule : public KDEDModule
K_DCOP
public:
- RemoteDirNotifyModule(const QCString &obj);
+ RemoteDirNotifyModule(const TQCString &obj);
private:
RemoteDirNotify notifier;
};
diff --git a/kioslave/remote/kio_remote.cpp b/kioslave/remote/kio_remote.cpp
index 1200f943c..646a99d30 100644
--- a/kioslave/remote/kio_remote.cpp
+++ b/kioslave/remote/kio_remote.cpp
@@ -56,8 +56,8 @@ extern "C" {
}
-RemoteProtocol::RemoteProtocol(const QCString &protocol,
- const QCString &pool, const QCString &app)
+RemoteProtocol::RemoteProtocol(const TQCString &protocol,
+ const TQCString &pool, const TQCString &app)
: SlaveBase(protocol, pool, app)
{
}
@@ -77,7 +77,7 @@ void RemoteProtocol::listDir(const KURL &url)
}
int second_slash_idx = url.path().find( '/', 1 );
- QString root_dirname = url.path().mid( 1, second_slash_idx-1 );
+ TQString root_dirname = url.path().mid( 1, second_slash_idx-1 );
KURL target = m_impl.findBaseURL( root_dirname );
kdDebug(1220) << "possible redirection target : " << target << endl;
@@ -125,7 +125,7 @@ void RemoteProtocol::stat(const KURL &url)
{
kdDebug(1220) << "RemoteProtocol::stat: " << url << endl;
- QString path = url.path();
+ TQString path = url.path();
if ( path.isEmpty() || path == "/" )
{
// The root is "virtual" - it's not a single physical directory
@@ -152,7 +152,7 @@ void RemoteProtocol::stat(const KURL &url)
}
int second_slash_idx = url.path().find( '/', 1 );
- QString root_dirname = url.path().mid( 1, second_slash_idx-1 );
+ TQString root_dirname = url.path().mid( 1, second_slash_idx-1 );
if ( second_slash_idx==-1 || ( (int)url.path().length() )==second_slash_idx+1 )
{
@@ -198,7 +198,7 @@ void RemoteProtocol::get(const KURL &url)
{
kdDebug(1220) << "RemoteProtocol::get: " << url << endl;
- QString file = m_impl.findDesktopFile( url.fileName() );
+ TQString file = m_impl.findDesktopFile( url.fileName() );
kdDebug(1220) << "desktop file : " << file << endl;
if (!file.isEmpty())
diff --git a/kioslave/remote/kio_remote.h b/kioslave/remote/kio_remote.h
index 7d3b0366e..f2c06296a 100644
--- a/kioslave/remote/kio_remote.h
+++ b/kioslave/remote/kio_remote.h
@@ -26,8 +26,8 @@
class RemoteProtocol : public KIO::SlaveBase
{
public:
- RemoteProtocol(const QCString &protocol, const QCString &pool,
- const QCString &app);
+ RemoteProtocol(const TQCString &protocol, const TQCString &pool,
+ const TQCString &app);
virtual ~RemoteProtocol();
virtual void listDir(const KURL &url);
diff --git a/kioslave/remote/remoteimpl.cpp b/kioslave/remote/remoteimpl.cpp
index 139cbfd2a..47e41b821 100644
--- a/kioslave/remote/remoteimpl.cpp
+++ b/kioslave/remote/remoteimpl.cpp
@@ -26,8 +26,8 @@
#include <kservice.h>
#include <klocale.h>
-#include <qdir.h>
-#include <qfile.h>
+#include <tqdir.h>
+#include <tqfile.h>
#include <sys/stat.h>
@@ -39,9 +39,9 @@ RemoteImpl::RemoteImpl()
KGlobal::dirs()->addResourceType("remote_entries",
KStandardDirs::kde_default("data") + "remoteview");
- QString path = KGlobal::dirs()->saveLocation("remote_entries");
+ TQString path = KGlobal::dirs()->saveLocation("remote_entries");
- QDir dir = path;
+ TQDir dir = path;
if (!dir.exists())
{
dir.cdUp();
@@ -49,28 +49,28 @@ RemoteImpl::RemoteImpl()
}
}
-void RemoteImpl::listRoot(QValueList<KIO::UDSEntry> &list) const
+void RemoteImpl::listRoot(TQValueList<KIO::UDSEntry> &list) const
{
kdDebug(1220) << "RemoteImpl::listRoot" << endl;
- QStringList names_found;
- QStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries");
+ TQStringList names_found;
+ TQStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries");
- QStringList::ConstIterator dirpath = dirList.begin();
- QStringList::ConstIterator end = dirList.end();
+ TQStringList::ConstIterator dirpath = dirList.begin();
+ TQStringList::ConstIterator end = dirList.end();
for(; dirpath!=end; ++dirpath)
{
- QDir dir = *dirpath;
+ TQDir dir = *dirpath;
if (!dir.exists()) continue;
- QStringList filenames
- = dir.entryList( QDir::Files | QDir::Readable );
+ TQStringList filenames
+ = dir.entryList( TQDir::Files | TQDir::Readable );
KIO::UDSEntry entry;
- QStringList::ConstIterator name = filenames.begin();
- QStringList::ConstIterator endf = filenames.end();
+ TQStringList::ConstIterator name = filenames.begin();
+ TQStringList::ConstIterator endf = filenames.end();
for(; name!=endf; ++name)
{
@@ -85,27 +85,27 @@ void RemoteImpl::listRoot(QValueList<KIO::UDSEntry> &list) const
}
}
-bool RemoteImpl::findDirectory(const QString &filename, QString &directory) const
+bool RemoteImpl::findDirectory(const TQString &filename, TQString &directory) const
{
kdDebug(1220) << "RemoteImpl::findDirectory" << endl;
- QStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries");
+ TQStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries");
- QStringList::ConstIterator dirpath = dirList.begin();
- QStringList::ConstIterator end = dirList.end();
+ TQStringList::ConstIterator dirpath = dirList.begin();
+ TQStringList::ConstIterator end = dirList.end();
for(; dirpath!=end; ++dirpath)
{
- QDir dir = *dirpath;
+ TQDir dir = *dirpath;
if (!dir.exists()) continue;
- QStringList filenames
- = dir.entryList( QDir::Files | QDir::Readable );
+ TQStringList filenames
+ = dir.entryList( TQDir::Files | TQDir::Readable );
KIO::UDSEntry entry;
- QStringList::ConstIterator name = filenames.begin();
- QStringList::ConstIterator endf = filenames.end();
+ TQStringList::ConstIterator name = filenames.begin();
+ TQStringList::ConstIterator endf = filenames.end();
for(; name!=endf; ++name)
{
@@ -120,24 +120,24 @@ bool RemoteImpl::findDirectory(const QString &filename, QString &directory) cons
return false;
}
-QString RemoteImpl::findDesktopFile(const QString &filename) const
+TQString RemoteImpl::findDesktopFile(const TQString &filename) const
{
kdDebug(1220) << "RemoteImpl::findDesktopFile" << endl;
- QString directory;
+ TQString directory;
if (findDirectory(filename+".desktop", directory))
{
return directory+filename+".desktop";
}
- return QString::null;
+ return TQString::null;
}
-KURL RemoteImpl::findBaseURL(const QString &filename) const
+KURL RemoteImpl::findBaseURL(const TQString &filename) const
{
kdDebug(1220) << "RemoteImpl::findBaseURL" << endl;
- QString file = findDesktopFile(filename);
+ TQString file = findDesktopFile(filename);
if (!file.isEmpty())
{
KDesktopFile desktop(file, true);
@@ -149,7 +149,7 @@ KURL RemoteImpl::findBaseURL(const QString &filename) const
static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l,
- const QString &s = QString::null)
+ const TQString &s = TQString::null)
{
KIO::UDSAtom atom;
atom.m_uds = ID;
@@ -213,8 +213,8 @@ bool RemoteImpl::isWizardURL(const KURL &url) const
void RemoteImpl::createEntry(KIO::UDSEntry &entry,
- const QString &directory,
- const QString &file) const
+ const TQString &directory,
+ const TQString &file) const
{
kdDebug(1220) << "RemoteImpl::createEntry" << endl;
@@ -224,7 +224,7 @@ void RemoteImpl::createEntry(KIO::UDSEntry &entry,
entry.clear();
- QString new_filename = file;
+ TQString new_filename = file;
new_filename.truncate( file.length()-8);
addAtom(entry, KIO::UDS_NAME, 0, desktop.readName());
@@ -233,17 +233,17 @@ void RemoteImpl::createEntry(KIO::UDSEntry &entry,
addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR);
addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory");
- QString icon = desktop.readIcon();
+ TQString icon = desktop.readIcon();
addAtom(entry, KIO::UDS_ICON_NAME, 0, icon);
addAtom(entry, KIO::UDS_LINK_DEST, 0, desktop.readURL());
}
-bool RemoteImpl::statNetworkFolder(KIO::UDSEntry &entry, const QString &filename) const
+bool RemoteImpl::statNetworkFolder(KIO::UDSEntry &entry, const TQString &filename) const
{
kdDebug(1220) << "RemoteImpl::statNetworkFolder: " << filename << endl;
- QString directory;
+ TQString directory;
if (findDirectory(filename+".desktop", directory))
{
createEntry(entry, directory, filename+".desktop");
@@ -253,36 +253,36 @@ bool RemoteImpl::statNetworkFolder(KIO::UDSEntry &entry, const QString &filename
return false;
}
-bool RemoteImpl::deleteNetworkFolder(const QString &filename) const
+bool RemoteImpl::deleteNetworkFolder(const TQString &filename) const
{
kdDebug(1220) << "RemoteImpl::deleteNetworkFolder: " << filename << endl;
- QString directory;
+ TQString directory;
if (findDirectory(filename+".desktop", directory))
{
kdDebug(1220) << "Removing " << directory << filename << ".desktop" << endl;
- return QFile::remove(directory+filename+".desktop");
+ return TQFile::remove(directory+filename+".desktop");
}
return false;
}
-bool RemoteImpl::renameFolders(const QString &src, const QString &dest,
+bool RemoteImpl::renameFolders(const TQString &src, const TQString &dest,
bool overwrite) const
{
kdDebug(1220) << "RemoteImpl::renameFolders: "
<< src << ", " << dest << endl;
- QString directory;
+ TQString directory;
if (findDirectory(src+".desktop", directory))
{
- if (!overwrite && QFile::exists(directory+dest+".desktop"))
+ if (!overwrite && TQFile::exists(directory+dest+".desktop"))
{
return false;
}
kdDebug(1220) << "Renaming " << directory << src << ".desktop"<< endl;
- QDir dir(directory);
+ TQDir dir(directory);
bool res = dir.rename(src+".desktop", dest+".desktop");
if (res)
{
diff --git a/kioslave/remote/remoteimpl.h b/kioslave/remote/remoteimpl.h
index ba7390bf4..b9bb6ac2d 100644
--- a/kioslave/remote/remoteimpl.h
+++ b/kioslave/remote/remoteimpl.h
@@ -24,7 +24,7 @@
#include <kio/job.h>
#include <kurl.h>
-#include <qstring.h>
+#include <tqstring.h>
class RemoteImpl
{
@@ -34,21 +34,21 @@ public:
void createTopLevelEntry(KIO::UDSEntry &entry) const;
bool createWizardEntry(KIO::UDSEntry &entry) const;
bool isWizardURL(const KURL &url) const;
- bool statNetworkFolder(KIO::UDSEntry &entry, const QString &filename) const;
+ bool statNetworkFolder(KIO::UDSEntry &entry, const TQString &filename) const;
- void listRoot(QValueList<KIO::UDSEntry> &list) const;
+ void listRoot(TQValueList<KIO::UDSEntry> &list) const;
- KURL findBaseURL(const QString &filename) const;
- QString findDesktopFile(const QString &filename) const;
+ KURL findBaseURL(const TQString &filename) const;
+ TQString findDesktopFile(const TQString &filename) const;
- bool deleteNetworkFolder(const QString &filename) const;
- bool renameFolders(const QString &src, const QString &dest,
+ bool deleteNetworkFolder(const TQString &filename) const;
+ bool renameFolders(const TQString &src, const TQString &dest,
bool overwrite) const;
private:
- bool findDirectory(const QString &filename, QString &directory) const;
- void createEntry(KIO::UDSEntry& entry, const QString &directory,
- const QString &file) const;
+ bool findDirectory(const TQString &filename, TQString &directory) const;
+ void createEntry(KIO::UDSEntry& entry, const TQString &directory,
+ const TQString &file) const;
};
#endif
diff --git a/kioslave/remote/testremote.cpp b/kioslave/remote/testremote.cpp
index a3e979023..3c76b6f22 100644
--- a/kioslave/remote/testremote.cpp
+++ b/kioslave/remote/testremote.cpp
@@ -28,12 +28,12 @@
#include <stdlib.h>
-static bool check(const QString& txt, QString a, QString b)
+static bool check(const TQString& txt, TQString a, TQString b)
{
if (a.isEmpty())
- a = QString::null;
+ a = TQString::null;
if (b.isEmpty())
- b = QString::null;
+ b = TQString::null;
if (a == b) {
kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "ok" << endl;
}
diff --git a/kioslave/settings/kio_settings.cc b/kioslave/settings/kio_settings.cc
index 4d5bbe873..28aaba846 100644
--- a/kioslave/settings/kio_settings.cc
+++ b/kioslave/settings/kio_settings.cc
@@ -20,11 +20,11 @@
#include <kio/slavebase.h>
#include <kinstance.h>
#include <kdebug.h>
-#include <qtextstream.h>
+#include <tqtextstream.h>
#include <klocale.h>
#include <sys/stat.h>
#include <dcopclient.h>
-#include <qdatastream.h>
+#include <tqdatastream.h>
#include <time.h>
#include <kprocess.h>
#include <kservice.h>
@@ -35,13 +35,13 @@ class SettingsProtocol : public KIO::SlaveBase
{
public:
enum RunMode { SettingsMode, ProgramsMode, ApplicationsMode };
- SettingsProtocol(const QCString &protocol, const QCString &pool, const QCString &app);
+ SettingsProtocol(const TQCString &protocol, const TQCString &pool, const TQCString &app);
virtual ~SettingsProtocol();
virtual void get( const KURL& url );
virtual void stat(const KURL& url);
virtual void listDir(const KURL& url);
void listRoot();
- KServiceGroup::Ptr findGroup(const QString &relPath);
+ KServiceGroup::Ptr findGroup(const TQString &relPath);
private:
DCOPClient *m_dcopClient;
@@ -60,7 +60,7 @@ extern "C" {
}
-static void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const QString& s = QString::null)
+static void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString::null)
{
KIO::UDSAtom atom;
atom.m_uds = ID;
@@ -69,7 +69,7 @@ static void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const QString
entry.append(atom);
}
-static void createFileEntry(KIO::UDSEntry& entry, const QString& name, const QString& url, const QString& mime, const QString& iconName, const QString& localPath)
+static void createFileEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime, const TQString& iconName, const TQString& localPath)
{
entry.clear();
addAtom(entry, KIO::UDS_NAME, 0, KIO::encodeFileName(name));
@@ -84,7 +84,7 @@ static void createFileEntry(KIO::UDSEntry& entry, const QString& name, const QSt
addAtom(entry, KIO::UDS_ICON_NAME, 0, iconName);
}
-static void createDirEntry(KIO::UDSEntry& entry, const QString& name, const QString& url, const QString& mime,const QString& iconName)
+static void createDirEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime,const TQString& iconName)
{
entry.clear();
addAtom(entry, KIO::UDS_NAME, 0, name);
@@ -96,7 +96,7 @@ static void createDirEntry(KIO::UDSEntry& entry, const QString& name, const QStr
addAtom(entry, KIO::UDS_ICON_NAME, 0, iconName);
}
-SettingsProtocol::SettingsProtocol( const QCString &protocol, const QCString &pool, const QCString &app): SlaveBase( protocol, pool, app )
+SettingsProtocol::SettingsProtocol( const TQCString &protocol, const TQCString &pool, const TQCString &app): SlaveBase( protocol, pool, app )
{
// Adjusts which part of the K Menu to virtualize.
if ( protocol == "programs" )
@@ -119,11 +119,11 @@ SettingsProtocol::~SettingsProtocol()
delete m_dcopClient;
}
-KServiceGroup::Ptr SettingsProtocol::findGroup(const QString &relPath)
+KServiceGroup::Ptr SettingsProtocol::findGroup(const TQString &relPath)
{
- QString nextPart;
- QString alreadyFound("Settings/");
- QStringList rest = QStringList::split('/', relPath);
+ TQString nextPart;
+ TQString alreadyFound("Settings/");
+ TQStringList rest = TQStringList::split('/', relPath);
kdDebug() << "Trying harder to find group " << relPath << endl;
for (unsigned int i=0; i<rest.count(); i++)
@@ -182,7 +182,7 @@ void SettingsProtocol::stat(const KURL& url)
{
KIO::UDSEntry entry;
- QString servicePath( url.path(1) );
+ TQString servicePath( url.path(1) );
servicePath.remove(0, 1); // remove starting '/'
if ( m_runMode == SettingsMode)
@@ -216,7 +216,7 @@ void SettingsProtocol::stat(const KURL& url)
void SettingsProtocol::listDir(const KURL& url)
{
- QString groupPath = url.path(1);
+ TQString groupPath = url.path(1);
groupPath.remove(0, 1); // remove starting '/'
if ( m_runMode == SettingsMode)
@@ -243,7 +243,7 @@ void SettingsProtocol::listDir(const KURL& url)
if (e->isType(KST_KServiceGroup)) {
KServiceGroup::Ptr g(static_cast<KServiceGroup *>(e));
- QString groupCaption = g->caption();
+ TQString groupCaption = g->caption();
// Avoid adding empty groups.
KServiceGroup::Ptr subMenuRoot = KServiceGroup::group(g->relPath());
@@ -254,7 +254,7 @@ void SettingsProtocol::listDir(const KURL& url)
if ((g->name().at(0) == '.'))
continue;
- QString relPath = g->relPath();
+ TQString relPath = g->relPath();
// Do not display the "Settings" menu group in Programs Mode.
if( (m_runMode == ProgramsMode) && relPath.startsWith( "Settings" ) )
diff --git a/kioslave/sftp/kio_sftp.cpp b/kioslave/sftp/kio_sftp.cpp
index e6aaaf532..456d47084 100644
--- a/kioslave/sftp/kio_sftp.cpp
+++ b/kioslave/sftp/kio_sftp.cpp
@@ -29,12 +29,12 @@ So we can't connect.
#include <fcntl.h>
-#include <qcstring.h>
-#include <qstring.h>
-#include <qobject.h>
-#include <qstrlist.h>
-#include <qfile.h>
-#include <qbuffer.h>
+#include <tqcstring.h>
+#include <tqstring.h>
+#include <tqobject.h>
+#include <tqstrlist.h>
+#include <tqfile.h>
+#include <tqbuffer.h>
#include <stdlib.h>
#include <unistd.h>
@@ -131,7 +131,7 @@ static int writeToFile (int fd, const char *buf, size_t len)
return 0;
}
-sftpProtocol::sftpProtocol(const QCString &pool_socket, const QCString &app_socket)
+sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket)
: SlaveBase("kio_sftp", pool_socket, app_socket),
mConnected(false), mPort(-1), mMsgId(0) {
kdDebug(KIO_SFTP_DB) << "sftpProtocol(): pid = " << getpid() << endl;
@@ -203,7 +203,7 @@ void sftpProtocol::copy(const KURL &src, const KURL &dest, int permissions, bool
else if ( destLocal && !srcLocal ) // Copy sftp -> file
sftpCopyGet(dest, src, permissions, overwrite);
else
- error(ERR_UNSUPPORTED_ACTION, QString::null);
+ error(ERR_UNSUPPORTED_ACTION, TQString::null);
}
void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool overwrite)
@@ -216,7 +216,7 @@ void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool
return;
KDE_struct_stat buff_orig;
- QCString dest_orig ( QFile::encodeName(dest.path()) );
+ TQCString dest_orig ( TQFile::encodeName(dest.path()) );
bool origExists = (KDE_lstat( dest_orig.data(), &buff_orig ) != -1);
if (origExists)
@@ -235,7 +235,7 @@ void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool
}
KIO::filesize_t offset = 0;
- QCString dest_part ( dest_orig + ".part" );
+ TQCString dest_part ( dest_orig + ".part" );
int fd = -1;
bool partExists = false;
@@ -319,7 +319,7 @@ void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool
}
}
- data(QByteArray());
+ data(TQByteArray());
kdDebug(KIO_SFTP_DB) << "sftpCopyGet(): emit finished()" << endl;
finished();
}
@@ -351,7 +351,7 @@ sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, KIO::filesize_t off
Q_UINT32 pflags = SSH2_FXF_READ;
attr.clear();
- QByteArray handle;
+ TQByteArray handle;
if( (code = sftpOpen(src, pflags, attr, handle)) != SSH2_FX_OK ) {
res.text = src.prettyURL();
res.code = ERR_CANNOT_OPEN_FOR_READING;
@@ -360,8 +360,8 @@ sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, KIO::filesize_t off
// needed for determining mimetype
// note: have to emit mimetype before emitting totalsize.
- QByteArray buff;
- QByteArray mimeBuffer;
+ TQByteArray buff;
+ TQByteArray mimeBuffer;
unsigned int oldSize;
bool foundMimetype = false;
@@ -463,13 +463,13 @@ void sftpProtocol::get(const KURL& url) {
return;
}
- data(QByteArray());
+ data(TQByteArray());
kdDebug(KIO_SFTP_DB) << "get(): emit finished()" << endl;
finished();
}
-void sftpProtocol::setHost (const QString& h, int port, const QString& user, const QString& pass)
+void sftpProtocol::setHost (const TQString& h, int port, const TQString& user, const TQString& pass)
{
kdDebug(KIO_SFTP_DB) << "setHost(): " << user << "@" << h << ":" << port << endl;
@@ -524,7 +524,7 @@ void sftpProtocol::openConnection() {
info.url.setPort(mPort);
info.url.setUser(mUsername);
info.caption = i18n("SFTP Login");
- info.comment = "sftp://" + mHost + ":" + QString::number(mPort);
+ info.comment = "sftp://" + mHost + ":" + TQString::number(mPort);
info.commentLabel = i18n("site:");
info.username = mUsername;
info.keepPassword = true;
@@ -608,8 +608,8 @@ void sftpProtocol::openConnection() {
//
int err; // error code from KSshProcess
- QString msg; // msg for dialog box
- QString caption; // dialog box caption
+ TQString msg; // msg for dialog box
+ TQString caption; // dialog box caption
bool firstTime = true;
bool dlgResult;
@@ -647,7 +647,7 @@ void sftpProtocol::openConnection() {
}
else {
// user canceled or dialog failed to open
- error(ERR_USER_CANCELED, QString::null);
+ error(ERR_USER_CANCELED, TQString::null);
kdDebug(KIO_SFTP_DB) << "openConnection(): user canceled, dlgResult = " << dlgResult << endl;
closeConnection();
return;
@@ -704,7 +704,7 @@ void sftpProtocol::openConnection() {
msg = ssh.errorMsg();
if( KMessageBox::Yes != messageBox(WarningYesNo, msg, caption) ) {
closeConnection();
- error(ERR_USER_CANCELED, QString::null);
+ error(ERR_USER_CANCELED, TQString::null);
return;
}
ssh.acceptHostKey(true);
@@ -715,7 +715,7 @@ void sftpProtocol::openConnection() {
msg = ssh.errorMsg();
if( KMessageBox::Yes != messageBox(WarningYesNo, msg, caption) ) {
closeConnection();
- error(ERR_USER_CANCELED, QString::null);
+ error(ERR_USER_CANCELED, TQString::null);
return;
}
ssh.acceptHostKey(true);
@@ -764,14 +764,14 @@ void sftpProtocol::openConnection() {
// catch all in case we did something wrong above
if( !mConnected ) {
- error(ERR_INTERNAL, QString::null);
+ error(ERR_INTERNAL, TQString::null);
return;
}
// Now send init packet.
kdDebug(KIO_SFTP_DB) << "openConnection(): Sending SSH2_FXP_INIT packet." << endl;
- QByteArray p;
- QDataStream packet(p, IO_WriteOnly);
+ TQByteArray p;
+ TQDataStream packet(p, IO_WriteOnly);
packet << (Q_UINT32)5; // packet length
packet << (Q_UINT8) SSH2_FXP_INIT; // packet type
packet << (Q_UINT32)SSH2_FILEXFER_VERSION; // client version
@@ -779,7 +779,7 @@ void sftpProtocol::openConnection() {
putPacket(p);
getPacket(p);
- QDataStream s(p, IO_ReadOnly);
+ TQDataStream s(p, IO_ReadOnly);
Q_UINT32 version;
Q_UINT8 type;
s >> type;
@@ -837,7 +837,7 @@ void sftpProtocol::closeConnection() {
void sftpProtocol::sftpCopyPut(const KURL& src, const KURL& dest, int permissions, bool overwrite) {
KDE_struct_stat buff;
- QCString file (QFile::encodeName(src.path()));
+ TQCString file (TQFile::encodeName(src.path()));
if (KDE_lstat(file.data(), &buff) == -1) {
error (ERR_DOES_NOT_EXIST, src.prettyURL());
@@ -985,7 +985,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool
pflags = SSH2_FXF_WRITE | SSH2_FXF_CREAT | SSH2_FXF_APPEND;
sftpFileAttr attr(remoteEncoding());
- QByteArray handle;
+ TQByteArray handle;
// Set the permissions of the file we write to if it didn't already exist
// and the permission info is supplied, i.e it is not -1
@@ -1013,7 +1013,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool
}
long nbytes;
- QByteArray buff;
+ TQByteArray buff;
do {
@@ -1108,7 +1108,7 @@ void sftpProtocol::stat ( const KURL& url ){
UDSAtom atom;
atom.m_uds = KIO::UDS_NAME;
- atom.m_str = QString::null;
+ atom.m_str = TQString::null;
entry.append( atom );
atom.m_uds = KIO::UDS_FILE_TYPE;
@@ -1158,7 +1158,7 @@ void sftpProtocol::mimetype ( const KURL& url ){
return;
Q_UINT32 pflags = SSH2_FXF_READ;
- QByteArray handle, mydata;
+ TQByteArray handle, mydata;
sftpFileAttr attr(remoteEncoding());
int code;
if( (code = sftpOpen(url, pflags, attr, handle)) != SSH2_FX_OK ) {
@@ -1180,7 +1180,7 @@ void sftpProtocol::mimetype ( const KURL& url ){
}
- data(QByteArray());
+ data(TQByteArray());
processedSize(offset);
sftpClose(handle);
finished();
@@ -1206,7 +1206,7 @@ void sftpProtocol::listDir(const KURL& url) {
}
int code;
- QByteArray handle;
+ TQByteArray handle;
if( (code = sftpOpenDirectory(url, handle)) != SSH2_FX_OK ) {
kdError(KIO_SFTP_DB) << "listDir(): open directory failed" << endl;
@@ -1248,7 +1248,7 @@ void sftpProtocol::mkdir(const KURL&url, int permissions){
if( !mConnected )
return;
- QCString path = remoteEncoding()->encode(url.path());
+ TQCString path = remoteEncoding()->encode(url.path());
uint len = path.length();
sftpFileAttr attr(remoteEncoding());
@@ -1259,8 +1259,8 @@ void sftpProtocol::mkdir(const KURL&url, int permissions){
Q_UINT32 id, expectedId;
id = expectedId = mMsgId++;
- QByteArray p;
- QDataStream s(p, IO_WriteOnly);
+ TQByteArray p;
+ TQDataStream s(p, IO_WriteOnly);
s << Q_UINT32(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + attr.size());
s << (Q_UINT8)SSH2_FXP_MKDIR;
s << id;
@@ -1273,7 +1273,7 @@ void sftpProtocol::mkdir(const KURL&url, int permissions){
getPacket(p);
Q_UINT8 type;
- QDataStream r(p, IO_ReadOnly);
+ TQDataStream r(p, IO_ReadOnly);
r >> type >> id;
if( id != expectedId ) {
@@ -1359,7 +1359,7 @@ void sftpProtocol::rename(const KURL& src, const KURL& dest, bool overwrite){
kdDebug(KIO_SFTP_DB) << "rename(): END" << endl;
}
-void sftpProtocol::symlink(const QString& target, const KURL& dest, bool overwrite){
+void sftpProtocol::symlink(const TQString& target, const KURL& dest, bool overwrite){
kdDebug(KIO_SFTP_DB) << "symlink()" << endl;
if (!isSupportedOperation(SSH2_FXP_SYMLINK)) {
@@ -1410,7 +1410,7 @@ void sftpProtocol::symlink(const QString& target, const KURL& dest, bool overwri
}
void sftpProtocol::chmod(const KURL& url, int permissions){
- QString perms;
+ TQString perms;
perms.setNum(permissions, 8);
kdDebug(KIO_SFTP_DB) << "chmod(" << url << ", " << perms << ")" << endl;
@@ -1427,7 +1427,7 @@ void sftpProtocol::chmod(const KURL& url, int permissions){
if( (code = sftpSetStat(url, attr)) != SSH2_FX_OK ) {
kdError(KIO_SFTP_DB) << "chmod(): sftpSetStat failed with error " << code << endl;
if( code == SSH2_FX_FAILURE )
- error(ERR_CANNOT_CHMOD, QString::null);
+ error(ERR_CANNOT_CHMOD, TQString::null);
else
processStatus(code, url.prettyURL());
}
@@ -1454,11 +1454,11 @@ void sftpProtocol::slave_status() {
kdDebug(KIO_SFTP_DB) << "slave_status(): connected to "
<< mHost << "? " << mConnected << endl;
- slaveStatus ((mConnected ? mHost : QString::null), mConnected);
+ slaveStatus ((mConnected ? mHost : TQString::null), mConnected);
}
-bool sftpProtocol::getPacket(QByteArray& msg) {
- QByteArray buf(4096);
+bool sftpProtocol::getPacket(TQByteArray& msg) {
+ TQByteArray buf(4096);
// Get the message length...
ssize_t len = atomicio(ssh.stdioFd(), buf.data(), 4, true /*read*/);
@@ -1473,21 +1473,21 @@ bool sftpProtocol::getPacket(QByteArray& msg) {
}
uint msgLen;
- QDataStream s(buf, IO_ReadOnly);
+ TQDataStream s(buf, IO_ReadOnly);
s >> msgLen;
//kdDebug(KIO_SFTP_DB) << "getPacket(): Message size = " << msgLen << endl;
msg.resize(0);
- QBuffer b( msg );
+ TQBuffer b( msg );
b.open( IO_WriteOnly );
while( msgLen ) {
len = atomicio(ssh.stdioFd(), buf.data(), kMin(buf.size(), msgLen), true /*read*/);
if( len == 0 || len == -1) {
- QString errmsg;
+ TQString errmsg;
if (len == 0)
errmsg = i18n("Connection closed");
else
@@ -1514,7 +1514,7 @@ bool sftpProtocol::getPacket(QByteArray& msg) {
}
/** Send an sftp packet to stdin of the ssh process. */
-bool sftpProtocol::putPacket(QByteArray& p){
+bool sftpProtocol::putPacket(TQByteArray& p){
// kdDebug(KIO_SFTP_DB) << "putPacket(): size == " << p.size() << endl;
int ret;
ret = atomicio(ssh.stdioFd(), p.data(), p.size(), false /*write*/);
@@ -1535,14 +1535,14 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){
kdDebug(KIO_SFTP_DB) << "sftpRealPath(" << url << ", newUrl)" << endl;
- QCString path = remoteEncoding()->encode(url.path());
+ TQCString path = remoteEncoding()->encode(url.path());
uint len = path.length();
Q_UINT32 id, expectedId;
id = expectedId = mMsgId++;
- QByteArray p;
- QDataStream s(p, IO_WriteOnly);
+ TQByteArray p;
+ TQDataStream s(p, IO_WriteOnly);
s << Q_UINT32(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len);
s << (Q_UINT8)SSH2_FXP_REALPATH;
s << id;
@@ -1552,7 +1552,7 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){
getPacket(p);
Q_UINT8 type;
- QDataStream r(p, IO_ReadOnly);
+ TQDataStream r(p, IO_ReadOnly);
r >> type >> id;
if( id != expectedId ) {
@@ -1578,7 +1578,7 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){
return -1;
}
- QCString newPath;
+ TQCString newPath;
r >> newPath;
newPath.truncate(newPath.size());
@@ -1589,7 +1589,7 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){
return SSH2_FX_OK;
}
-sftpProtocol::Status sftpProtocol::doProcessStatus(Q_UINT8 code, const QString& message)
+sftpProtocol::Status sftpProtocol::doProcessStatus(Q_UINT8 code, const TQString& message)
{
Status res;
res.code = 0;
@@ -1628,25 +1628,25 @@ sftpProtocol::Status sftpProtocol::doProcessStatus(Q_UINT8 code, const QString&
}
/** Process SSH_FXP_STATUS packets. */
-void sftpProtocol::processStatus(Q_UINT8 code, const QString& message){
+void sftpProtocol::processStatus(Q_UINT8 code, const TQString& message){
Status st = doProcessStatus( code, message );
if( st.code != 0 )
error( st.code, st.text );
}
/** Opens a directory handle for url.path. Returns true if succeeds. */
-int sftpProtocol::sftpOpenDirectory(const KURL& url, QByteArray& handle){
+int sftpProtocol::sftpOpenDirectory(const KURL& url, TQByteArray& handle){
kdDebug(KIO_SFTP_DB) << "sftpOpenDirectory(" << url << ", handle)" << endl;
- QCString path = remoteEncoding()->encode(url.path());
+ TQCString path = remoteEncoding()->encode(url.path());
uint len = path.length();
Q_UINT32 id, expectedId;
id = expectedId = mMsgId++;
- QByteArray p;
- QDataStream s(p, IO_WriteOnly);
+ TQByteArray p;
+ TQDataStream s(p, IO_WriteOnly);
s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len);
s << (Q_UINT8)SSH2_FXP_OPENDIR;
s << (Q_UINT32)id;
@@ -1655,7 +1655,7 @@ int sftpProtocol::sftpOpenDirectory(const KURL& url, QByteArray& handle){
putPacket(p);
getPacket(p);
- QDataStream r(p, IO_ReadOnly);
+ TQDataStream r(p, IO_ReadOnly);
Q_UINT8 type;
r >> type >> id;
@@ -1687,15 +1687,15 @@ int sftpProtocol::sftpOpenDirectory(const KURL& url, QByteArray& handle){
}
/** Closes a directory or file handle. */
-int sftpProtocol::sftpClose(const QByteArray& handle){
+int sftpProtocol::sftpClose(const TQByteArray& handle){
kdDebug(KIO_SFTP_DB) << "sftpClose()" << endl;
Q_UINT32 id, expectedId;
id = expectedId = mMsgId++;
- QByteArray p;
- QDataStream s(p, IO_WriteOnly);
+ TQByteArray p;
+ TQDataStream s(p, IO_WriteOnly);
s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size());
s << (Q_UINT8)SSH2_FXP_CLOSE;
s << (Q_UINT32)id;
@@ -1704,7 +1704,7 @@ int sftpProtocol::sftpClose(const QByteArray& handle){
putPacket(p);
getPacket(p);
- QDataStream r(p, IO_ReadOnly);
+ TQDataStream r(p, IO_ReadOnly);
Q_UINT8 type;
r >> type >> id;
@@ -1732,14 +1732,14 @@ int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){
kdDebug(KIO_SFTP_DB) << "sftpSetStat(" << url << ", attr)" << endl;
- QCString path = remoteEncoding()->encode(url.path());
+ TQCString path = remoteEncoding()->encode(url.path());
uint len = path.length();
Q_UINT32 id, expectedId;
id = expectedId = mMsgId++;
- QByteArray p;
- QDataStream s(p, IO_WriteOnly);
+ TQByteArray p;
+ TQDataStream s(p, IO_WriteOnly);
s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + attr.size());
s << (Q_UINT8)SSH2_FXP_SETSTAT;
s << (Q_UINT32)id;
@@ -1749,7 +1749,7 @@ int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){
putPacket(p);
getPacket(p);
- QDataStream r(p, IO_ReadOnly);
+ TQDataStream r(p, IO_ReadOnly);
Q_UINT8 type;
r >> type >> id;
@@ -1778,14 +1778,14 @@ int sftpProtocol::sftpRemove(const KURL& url, bool isfile){
kdDebug(KIO_SFTP_DB) << "sftpRemove(): " << url << ", isFile ? " << isfile << endl;
- QCString path = remoteEncoding()->encode(url.path());
+ TQCString path = remoteEncoding()->encode(url.path());
uint len = path.length();
Q_UINT32 id, expectedId;
id = expectedId = mMsgId++;
- QByteArray p;
- QDataStream s(p, IO_WriteOnly);
+ TQByteArray p;
+ TQDataStream s(p, IO_WriteOnly);
s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len);
s << (Q_UINT8)(isfile ? SSH2_FXP_REMOVE : SSH2_FXP_RMDIR);
s << (Q_UINT32)id;
@@ -1794,7 +1794,7 @@ int sftpProtocol::sftpRemove(const KURL& url, bool isfile){
putPacket(p);
getPacket(p);
- QDataStream r(p, IO_ReadOnly);
+ TQDataStream r(p, IO_ReadOnly);
Q_UINT8 type;
r >> type >> id;
@@ -1822,8 +1822,8 @@ int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){
kdDebug(KIO_SFTP_DB) << "sftpRename(" << src << " -> " << dest << ")" << endl;
- QCString srcPath = remoteEncoding()->encode(src.path());
- QCString destPath = remoteEncoding()->encode(dest.path());
+ TQCString srcPath = remoteEncoding()->encode(src.path());
+ TQCString destPath = remoteEncoding()->encode(dest.path());
uint slen = srcPath.length();
uint dlen = destPath.length();
@@ -1831,8 +1831,8 @@ int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){
Q_UINT32 id, expectedId;
id = expectedId = mMsgId++;
- QByteArray p;
- QDataStream s(p, IO_WriteOnly);
+ TQByteArray p;
+ TQDataStream s(p, IO_WriteOnly);
s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ +
4 /*str length*/ + slen +
4 /*str length*/ + dlen);
@@ -1844,7 +1844,7 @@ int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){
putPacket(p);
getPacket(p);
- QDataStream r(p, IO_ReadOnly);
+ TQDataStream r(p, IO_ReadOnly);
Q_UINT8 type;
r >> type >> id;
@@ -1867,7 +1867,7 @@ int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){
return code;
}
/** Get directory listings. */
-int sftpProtocol::sftpReadDir(const QByteArray& handle, const KURL& url){
+int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){
// url is needed so we can lookup the link destination
kdDebug(KIO_SFTP_DB) << "sftpReadDir(): " << url << endl;
@@ -1877,8 +1877,8 @@ int sftpProtocol::sftpReadDir(const QByteArray& handle, const KURL& url){
sftpFileAttr attr (remoteEncoding());
attr.setDirAttrsFlag(true);
- QByteArray p;
- QDataStream s(p, IO_WriteOnly);
+ TQByteArray p;
+ TQDataStream s(p, IO_WriteOnly);
id = expectedId = mMsgId++;
s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size());
s << (Q_UINT8)SSH2_FXP_READDIR;
@@ -1888,7 +1888,7 @@ int sftpProtocol::sftpReadDir(const QByteArray& handle, const KURL& url){
putPacket(p);
getPacket(p);
- QDataStream r(p, IO_ReadOnly);
+ TQDataStream r(p, IO_ReadOnly);
r >> type >> id;
if( id != expectedId ) {
@@ -1933,11 +1933,11 @@ int sftpProtocol::sftpReadDir(const QByteArray& handle, const KURL& url){
return SSH2_FX_OK;
}
-int sftpProtocol::sftpReadLink(const KURL& url, QString& target){
+int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){
kdDebug(KIO_SFTP_DB) << "sftpReadLink(): " << url << endl;
- QCString path = remoteEncoding()->encode(url.path());
+ TQCString path = remoteEncoding()->encode(url.path());
uint len = path.length();
//kdDebug(KIO_SFTP_DB) << "sftpReadLink(): Encoded Path: " << path << endl;
@@ -1946,8 +1946,8 @@ int sftpProtocol::sftpReadLink(const KURL& url, QString& target){
Q_UINT32 id, expectedId;
id = expectedId = mMsgId++;
- QByteArray p;
- QDataStream s(p, IO_WriteOnly);
+ TQByteArray p;
+ TQDataStream s(p, IO_WriteOnly);
s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len);
s << (Q_UINT8)SSH2_FXP_READLINK;
s << id;
@@ -1958,7 +1958,7 @@ int sftpProtocol::sftpReadLink(const KURL& url, QString& target){
getPacket(p);
Q_UINT8 type;
- QDataStream r(p, IO_ReadOnly);
+ TQDataStream r(p, IO_ReadOnly);
r >> type >> id;
if( id != expectedId ) {
@@ -1985,7 +1985,7 @@ int sftpProtocol::sftpReadLink(const KURL& url, QString& target){
return -1;
}
- QCString linkAddress;
+ TQCString linkAddress;
r >> linkAddress;
linkAddress.truncate(linkAddress.size());
@@ -1996,10 +1996,10 @@ int sftpProtocol::sftpReadLink(const KURL& url, QString& target){
return SSH2_FX_OK;
}
-int sftpProtocol::sftpSymLink(const QString& _target, const KURL& dest){
+int sftpProtocol::sftpSymLink(const TQString& _target, const KURL& dest){
- QCString destPath = remoteEncoding()->encode(dest.path());
- QCString target = remoteEncoding()->encode(_target);
+ TQCString destPath = remoteEncoding()->encode(dest.path());
+ TQCString target = remoteEncoding()->encode(_target);
uint dlen = destPath.length();
uint tlen = target.length();
@@ -2008,8 +2008,8 @@ int sftpProtocol::sftpSymLink(const QString& _target, const KURL& dest){
Q_UINT32 id, expectedId;
id = expectedId = mMsgId++;
- QByteArray p;
- QDataStream s(p, IO_WriteOnly);
+ TQByteArray p;
+ TQDataStream s(p, IO_WriteOnly);
s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ +
4 /*str length*/ + tlen +
4 /*str length*/ + dlen);
@@ -2021,7 +2021,7 @@ int sftpProtocol::sftpSymLink(const QString& _target, const KURL& dest){
putPacket(p);
getPacket(p);
- QDataStream r(p, IO_ReadOnly);
+ TQDataStream r(p, IO_ReadOnly);
Q_UINT8 type;
r >> type >> id;
@@ -2049,14 +2049,14 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) {
kdDebug(KIO_SFTP_DB) << "sftpStat(): " << url << endl;
- QCString path = remoteEncoding()->encode(url.path());
+ TQCString path = remoteEncoding()->encode(url.path());
uint len = path.length();
Q_UINT32 id, expectedId;
id = expectedId = mMsgId++;
- QByteArray p;
- QDataStream s(p, IO_WriteOnly);
+ TQByteArray p;
+ TQDataStream s(p, IO_WriteOnly);
s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len);
s << (Q_UINT8)SSH2_FXP_LSTAT;
s << (Q_UINT32)id;
@@ -2065,7 +2065,7 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) {
putPacket(p);
getPacket(p);
- QDataStream r(p, IO_ReadOnly);
+ TQDataStream r(p, IO_ReadOnly);
Q_UINT8 type;
r >> type >> id;
@@ -2094,7 +2094,7 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) {
// to determine the actual destination's type (file/dir).
if( S_ISLNK(attr.permissions()) && isSupportedOperation(SSH2_FXP_READLINK) ) {
- QString target;
+ TQString target;
int code = sftpReadLink( url, target );
if ( code != SSH2_FX_OK ) {
@@ -2134,17 +2134,17 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) {
int sftpProtocol::sftpOpen(const KURL& url, const Q_UINT32 pflags,
- const sftpFileAttr& attr, QByteArray& handle) {
+ const sftpFileAttr& attr, TQByteArray& handle) {
kdDebug(KIO_SFTP_DB) << "sftpOpen(" << url << ", handle" << endl;
- QCString path = remoteEncoding()->encode(url.path());
+ TQCString path = remoteEncoding()->encode(url.path());
uint len = path.length();
Q_UINT32 id, expectedId;
id = expectedId = mMsgId++;
- QByteArray p;
- QDataStream s(p, IO_WriteOnly);
+ TQByteArray p;
+ TQDataStream s(p, IO_WriteOnly);
s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ +
4 /*str length*/ + len +
4 /*pflags*/ + attr.size());
@@ -2157,7 +2157,7 @@ int sftpProtocol::sftpOpen(const KURL& url, const Q_UINT32 pflags,
putPacket(p);
getPacket(p);
- QDataStream r(p, IO_ReadOnly);
+ TQDataStream r(p, IO_ReadOnly);
Q_UINT8 type;
r >> type >> id;
@@ -2188,11 +2188,11 @@ int sftpProtocol::sftpOpen(const KURL& url, const Q_UINT32 pflags,
}
-int sftpProtocol::sftpRead(const QByteArray& handle, KIO::filesize_t offset, Q_UINT32 len, QByteArray& data)
+int sftpProtocol::sftpRead(const TQByteArray& handle, KIO::filesize_t offset, Q_UINT32 len, TQByteArray& data)
{
// kdDebug(KIO_SFTP_DB) << "sftpRead( offset = " << offset << ", len = " << len << ")" << endl;
- QByteArray p;
- QDataStream s(p, IO_WriteOnly);
+ TQByteArray p;
+ TQDataStream s(p, IO_WriteOnly);
Q_UINT32 id, expectedId;
id = expectedId = mMsgId++;
@@ -2208,7 +2208,7 @@ int sftpProtocol::sftpRead(const QByteArray& handle, KIO::filesize_t offset, Q_U
putPacket(p);
getPacket(p);
- QDataStream r(p, IO_ReadOnly);
+ TQDataStream r(p, IO_ReadOnly);
Q_UINT8 type;
r >> type >> id;
@@ -2235,11 +2235,11 @@ int sftpProtocol::sftpRead(const QByteArray& handle, KIO::filesize_t offset, Q_U
}
-int sftpProtocol::sftpWrite(const QByteArray& handle, KIO::filesize_t offset, const QByteArray& data){
+int sftpProtocol::sftpWrite(const TQByteArray& handle, KIO::filesize_t offset, const TQByteArray& data){
// kdDebug(KIO_SFTP_DB) << "sftpWrite( offset = " << offset <<
// ", data sz = " << data.size() << ")" << endl;
- QByteArray p;
- QDataStream s(p, IO_WriteOnly);
+ TQByteArray p;
+ TQDataStream s(p, IO_WriteOnly);
Q_UINT32 id, expectedId;
id = expectedId = mMsgId++;
@@ -2263,7 +2263,7 @@ int sftpProtocol::sftpWrite(const QByteArray& handle, KIO::filesize_t offset, co
// kdDebug(KIO_SFTP_DB) << "sftpWrite(): received packet [" << p << "]" << endl;
- QDataStream r(p, IO_ReadOnly);
+ TQDataStream r(p, IO_ReadOnly);
Q_UINT8 type;
r >> type >> id;
diff --git a/kioslave/sftp/kio_sftp.h b/kioslave/sftp/kio_sftp.h
index ff99b4760..22cd4764a 100644
--- a/kioslave/sftp/kio_sftp.h
+++ b/kioslave/sftp/kio_sftp.h
@@ -17,9 +17,9 @@
#ifndef __kio_sftp_h__
#define __kio_sftp_h__
-#include <qstring.h>
-#include <qcstring.h>
-#include <qobject.h>
+#include <tqstring.h>
+#include <tqcstring.h>
+#include <tqobject.h>
#include <kurl.h>
#include <kio/global.h>
@@ -37,9 +37,9 @@ class sftpProtocol : public KIO::SlaveBase
{
public:
- sftpProtocol(const QCString &pool_socket, const QCString &app_socket);
+ sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket);
virtual ~sftpProtocol();
- virtual void setHost(const QString& h, int port, const QString& user, const QString& pass);
+ virtual void setHost(const TQString& h, int port, const TQString& user, const TQString& pass);
virtual void get(const KURL& url);
virtual void listDir(const KURL& url) ;
virtual void mimetype(const KURL& url);
@@ -50,7 +50,7 @@ public:
virtual void slave_status();
virtual void del(const KURL &url, bool isfile);
virtual void chmod(const KURL& url, int permissions);
- virtual void symlink(const QString& target, const KURL& dest, bool overwrite);
+ virtual void symlink(const TQString& target, const KURL& dest, bool overwrite);
virtual void rename(const KURL& src, const KURL& dest, bool overwrite);
virtual void mkdir(const KURL&url, int permissions);
virtual void openConnection();
@@ -60,7 +60,7 @@ private: // Private variables
bool mConnected;
/** Host we are connected to. */
- QString mHost;
+ TQString mHost;
/** Port we are connected to. */
int mPort;
@@ -69,10 +69,10 @@ private: // Private variables
KSshProcess ssh;
/** Username to use when connecting */
- QString mUsername;
+ TQString mUsername;
/** User's password */
- QString mPassword;
+ TQString mPassword;
/** Message id of the last sftp packet we sent. */
unsigned int mMsgId;
@@ -87,11 +87,11 @@ private: // Private variables
{
int code;
KIO::filesize_t size;
- QString text;
+ TQString text;
};
private: // private methods
- bool getPacket(QByteArray& msg);
+ bool getPacket(TQByteArray& msg);
/* Type is a sftp packet type found in .sftp.h'.
* Example: SSH2_FXP_READLINK, SSH2_FXP_RENAME, etc.
@@ -107,15 +107,15 @@ private: // private methods
int sftpRealPath(const KURL& url, KURL& newUrl);
/** Send an sftp packet to stdin of the ssh process. */
- bool putPacket(QByteArray& p);
+ bool putPacket(TQByteArray& p);
/** Process SSH_FXP_STATUS packets. */
- void processStatus(Q_UINT8, const QString& message = QString::null);
+ void processStatus(Q_UINT8, const TQString& message = TQString::null);
/** Process SSH_FXP_STATUS packes and return the result. */
- Status doProcessStatus(Q_UINT8, const QString& message = QString::null);
+ Status doProcessStatus(Q_UINT8, const TQString& message = TQString::null);
/** Opens a directory handle for url.path. Returns true if succeeds. */
- int sftpOpenDirectory(const KURL& url, QByteArray& handle);
+ int sftpOpenDirectory(const KURL& url, TQByteArray& handle);
/** Closes a directory or file handle. */
- int sftpClose(const QByteArray& handle);
+ int sftpClose(const TQByteArray& handle);
/** Send a sftp command to rename a file or directoy. */
int sftpRename(const KURL& src, const KURL& dest);
/** Set a files attributes. */
@@ -123,19 +123,19 @@ private: // private methods
/** Sends a sftp command to remove a file or directory. */
int sftpRemove(const KURL& url, bool isfile);
/** Creates a symlink named dest to target. */
- int sftpSymLink(const QString& target, const KURL& dest);
+ int sftpSymLink(const TQString& target, const KURL& dest);
/** Get directory listings. */
- int sftpReadDir(const QByteArray& handle, const KURL& url);
+ int sftpReadDir(const TQByteArray& handle, const KURL& url);
/** Retrieves the destination of a link. */
- int sftpReadLink(const KURL& url, QString& target);
+ int sftpReadLink(const KURL& url, TQString& target);
/** Stats a file. */
int sftpStat(const KURL& url, sftpFileAttr& attr);
/** No descriptions */
- int sftpOpen(const KURL& url, const Q_UINT32 pflags, const sftpFileAttr& attr, QByteArray& handle);
+ int sftpOpen(const KURL& url, const Q_UINT32 pflags, const sftpFileAttr& attr, TQByteArray& handle);
/** No descriptions */
- int sftpRead(const QByteArray& handle, KIO::filesize_t offset, Q_UINT32 len, QByteArray& data);
+ int sftpRead(const TQByteArray& handle, KIO::filesize_t offset, Q_UINT32 len, TQByteArray& data);
/** No descriptions */
- int sftpWrite(const QByteArray& handle, KIO::filesize_t offset, const QByteArray& data);
+ int sftpWrite(const TQByteArray& handle, KIO::filesize_t offset, const TQByteArray& data);
/** Performs faster upload when the source is a local file... */
void sftpCopyPut(const KURL& src, const KURL& dest, int mode, bool overwrite);
diff --git a/kioslave/sftp/ksshprocess.cpp b/kioslave/sftp/ksshprocess.cpp
index c0393445d..9b2323bd6 100644
--- a/kioslave/sftp/ksshprocess.cpp
+++ b/kioslave/sftp/ksshprocess.cpp
@@ -67,7 +67,7 @@
#include <kstandarddirs.h>
#include <klocale.h>
-#include <qregexp.h>
+#include <tqregexp.h>
/*
* The following are tables of string and regexps we match
@@ -82,10 +82,10 @@
* so that is matched last. We use these generic version strings
* so we can do a best effor to support unknown ssh versions.
*/
-QRegExp KSshProcess::versionStrs[] = {
- QRegExp("OpenSSH_3\\.[6-9]|OpenSSH_[1-9]*[4-9]\\.[0-9]"),
- QRegExp("OpenSSH"),
- QRegExp("SSH Secure Shell")
+TQRegExp KSshProcess::versionStrs[] = {
+ TQRegExp("OpenSSH_3\\.[6-9]|OpenSSH_[1-9]*[4-9]\\.[0-9]"),
+ TQRegExp("OpenSSH"),
+ TQRegExp("SSH Secure Shell")
};
const char * const KSshProcess::passwordPrompt[] = {
@@ -118,10 +118,10 @@ const char* const KSshProcess::tryAgainMsg[] = {
"adjfhjsdhfdsjfsjdfhuefeufeuefe"
};
-QRegExp KSshProcess::hostKeyMissingMsg[] = {
- QRegExp("The authenticity of host|No (DSA|RSA) host key is known for"),
- QRegExp("The authenticity of host|No (DSA|RSA) host key is known for"),
- QRegExp("Host key not found from database")
+TQRegExp KSshProcess::hostKeyMissingMsg[] = {
+ TQRegExp("The authenticity of host|No (DSA|RSA) host key is known for"),
+ TQRegExp("The authenticity of host|No (DSA|RSA) host key is known for"),
+ TQRegExp("Host key not found from database")
};
const char* const KSshProcess::continuePrompt[] = {
@@ -136,16 +136,16 @@ const char* const KSshProcess::hostKeyChangedMsg[] = {
"WARNING: HOST IDENTIFICATION HAS CHANGED!"
};
-QRegExp KSshProcess::keyFingerprintMsg[] = {
- QRegExp("..(:..){15}"),
- QRegExp("..(:..){15}"),
- QRegExp(".....(-.....){10}")
+TQRegExp KSshProcess::keyFingerprintMsg[] = {
+ TQRegExp("..(:..){15}"),
+ TQRegExp("..(:..){15}"),
+ TQRegExp(".....(-.....){10}")
};
-QRegExp KSshProcess::knownHostsFileMsg[] = {
- QRegExp("Add correct host key in (.*) to get rid of this message."),
- QRegExp("Add correct host key in (.*) to get rid of this message."),
- QRegExp("Add correct host key to \"(.*)\"")
+TQRegExp KSshProcess::knownHostsFileMsg[] = {
+ TQRegExp("Add correct host key in (.*) to get rid of this message."),
+ TQRegExp("Add correct host key in (.*) to get rid of this message."),
+ TQRegExp("Add correct host key to \"(.*)\"")
};
@@ -164,10 +164,10 @@ const char* const KSshProcess::changeHostKeyOnDiskPrompt[] = {
// quit. The later if StrictHostKeyChecking is "no".
// The former if StrictHostKeyChecking is
// "yes" or explicitly set to "ask".
-QRegExp KSshProcess::hostKeyVerifyFailedMsg[] = {
- QRegExp("Host key verification failed\\."),
- QRegExp("Host key verification failed\\."),
- QRegExp("Disconnected; key exchange or algorithm? negotiation failed \\(Key exchange failed\\.\\)\\.")
+TQRegExp KSshProcess::hostKeyVerifyFailedMsg[] = {
+ TQRegExp("Host key verification failed\\."),
+ TQRegExp("Host key verification failed\\."),
+ TQRegExp("Disconnected; key exchange or algorithm? negotiation failed \\(Key exchange failed\\.\\)\\.")
};
const char * const KSshProcess::connectionClosedMsg[] = {
@@ -206,14 +206,14 @@ void KSshProcess::removeSignalHandlers() {
KSshProcess::KSshProcess()
: mVersion(UNKNOWN_VER), mConnected(false),
mRunning(false), mConnectState(0) {
- mSshPath = KStandardDirs::findExe(QString::fromLatin1("ssh"));
+ mSshPath = KStandardDirs::findExe(TQString::fromLatin1("ssh"));
kdDebug(KSSHPROC) << "KSshProcess::KSshProcess(): ssh path [" <<
mSshPath << "]" << endl;
installSignalHandlers();
}
-KSshProcess::KSshProcess(QString pathToSsh)
+KSshProcess::KSshProcess(TQString pathToSsh)
: mSshPath(pathToSsh), mVersion(UNKNOWN_VER), mConnected(false),
mRunning(false), mConnectState(0) {
installSignalHandlers();
@@ -225,7 +225,7 @@ KSshProcess::~KSshProcess(){
while(waitpid(-1, NULL, WNOHANG) > 0);
}
-bool KSshProcess::setSshPath(QString pathToSsh) {
+bool KSshProcess::setSshPath(TQString pathToSsh) {
mSshPath = pathToSsh;
version();
if( mVersion == UNKNOWN_VER )
@@ -235,7 +235,7 @@ bool KSshProcess::setSshPath(QString pathToSsh) {
}
KSshProcess::SshVersion KSshProcess::version() {
- QString cmd;
+ TQString cmd;
cmd = mSshPath+" -V 2>&1";
// Get version string from ssh client.
@@ -259,7 +259,7 @@ KSshProcess::SshVersion KSshProcess::version() {
kdError(KSSHPROC) << "KSshProcess::version(): pclose failed." << endl;
}
buf[len] = '\0';
- QString ver;
+ TQString ver;
ver = buf;
kdDebug(KSSHPROC) << "KSshProcess::version(): "
"got version string [" << ver << "]" << endl;
@@ -285,14 +285,14 @@ KSshProcess::SshVersion KSshProcess::version() {
return mVersion;
}
/*
-QString KSshProcess::versionStr() {
+TQString KSshProcess::versionStr() {
if( mVersion == UNKNOWN_VER ) {
version();
if( mVersion == UNKNOWN_VER )
- return QString::null;
+ return TQString::null;
}
- return QString::fromLatin1(versionStrs[mVersion]);
+ return TQString::fromLatin1(versionStrs[mVersion]);
}
*/
@@ -300,9 +300,9 @@ bool KSshProcess::setOptions(const SshOptList& opts) {
kdDebug(KSSHPROC) << "KSshProcess::setOptions()" << endl;
mArgs.clear();
SshOptListConstIterator it;
- QString cmd, subsystem;
- mPassword = mUsername = mHost = QString::null;
- QCString tmp;
+ TQString cmd, subsystem;
+ mPassword = mUsername = mHost = TQString::null;
+ TQCString tmp;
for(it = opts.begin(); it != opts.end(); ++it) {
//kdDebug(KSSHPROC) << "opt.opt = " << (*it).opt << endl;
//kdDebug(KSSHPROC) << "opt.str = " << (*it).str << endl;
@@ -340,7 +340,7 @@ bool KSshProcess::setOptions(const SshOptList& opts) {
case SSH_PROTOCOL:
if( mVersion <= OPENSSH ) {
tmp = "Protocol=";
- tmp += QString::number((*it).num).latin1();
+ tmp += TQString::number((*it).num).latin1();
mArgs.append("-o");
mArgs.append(tmp);
}
@@ -445,14 +445,14 @@ bool KSshProcess::setOptions(const SshOptList& opts) {
}
void KSshProcess::printArgs() {
- QValueListIterator<QCString> it;
+ TQValueListIterator<TQCString> it;
for( it = mArgs.begin(); it != mArgs.end(); ++it) {
kdDebug(KSSHPROC) << "arg: " << *it << endl;
}
}
-int KSshProcess::error(QString& msg) {
+int KSshProcess::error(TQString& msg) {
kdDebug(KSSHPROC) << "KSshProcess::error()" << endl;
kdDebug() << mErrorMsg << endl;
msg = mErrorMsg;
@@ -539,15 +539,15 @@ void KSshProcess::acceptHostKey(bool accept) {
mAcceptHostKey = accept;
}
-void KSshProcess::setPassword(QString password) {
+void KSshProcess::setPassword(TQString password) {
kdDebug(KSSHPROC) << "KSshProcess::setPassword(password:xxxxxxxx)" << endl;
mPassword = password;
}
-QString KSshProcess::getLine() {
- static QStringList buffer;
- QString line = QString::null;
- QCString ptyLine, errLine;
+TQString KSshProcess::getLine() {
+ static TQStringList buffer;
+ TQString line = TQString::null;
+ TQCString ptyLine, errLine;
if( buffer.empty() ) {
// PtyProcess buffers lines. First check that there
@@ -559,11 +559,11 @@ QString KSshProcess::getLine() {
// If PtyProcess did have something for us, get it and
// place it in our line buffer.
if( ! ptyLine.isEmpty() ) {
- buffer.prepend(QString(ptyLine));
+ buffer.prepend(TQString(ptyLine));
}
if( ! errLine.isEmpty() ) {
- buffer.prepend(QString(errLine));
+ buffer.prepend(TQString(errLine));
}
// If we still don't have anything in our buffer so there must
@@ -602,13 +602,13 @@ QString KSshProcess::getLine() {
kdDebug(KSSHPROC) << "KSshProcess::connect(): " <<
"timed out waiting for a response" << endl;
mError = ERR_TIMED_OUT;
- return QString::null;
+ return TQString::null;
}
else if( ret == -1 ) {
kdDebug(KSSHPROC) << "KSshProcess::connect(): "
<< "select error: " << strerror(errno) << endl;
mError = ERR_INTERNAL;
- return QString::null;
+ return TQString::null;
}
// We are not respecting any type of order in which the
@@ -616,14 +616,14 @@ QString KSshProcess::getLine() {
// had data on it first.
if( FD_ISSET(ptyfd, &rfds) ) {
ptyLine = ssh.readLineFromPty(false);
- buffer.prepend(QString(ptyLine));
+ buffer.prepend(TQString(ptyLine));
//kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
// "line from pty -" << ptyLine << endl;
}
if( FD_ISSET(errfd, &rfds) ) {
errLine = ssh.readLineFromStderr(false);
- buffer.prepend(QString(errLine));
+ buffer.prepend(TQString(errLine));
//kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
// "line from err -" << errLine << endl;
}
@@ -720,8 +720,8 @@ bool KSshProcess::connect() {
kdDebug(KSSHPROC) << "KSshProcess::connect(): "
<< "Connect state " << stateStr(mConnectState) << endl;
- QString line; // a line from ssh
- QString msgBuf; // buffer for important messages from ssh
+ TQString line; // a line from ssh
+ TQString msgBuf; // buffer for important messages from ssh
// which are to be returned to the user
switch(mConnectState) {
@@ -733,8 +733,8 @@ bool KSshProcess::connect() {
case STATE_START:
// reset some key values to safe values
mAcceptHostKey = false;
- mKeyFingerprint = QString::null;
- mKnownHostsFile = QString::null;
+ mKeyFingerprint = TQString::null;
+ mKnownHostsFile = TQString::null;
if( mArgs.isEmpty() ) {
kdDebug(KSSHPROC) << "KSshProcess::connect(): ssh options "
@@ -776,7 +776,7 @@ bool KSshProcess::connect() {
i18n("Error encountered while talking to ssh.");
mConnectState = STATE_FATAL;
}
- else if( line.find(QString::fromLatin1(passwordPrompt[mVersion]), 0, false) != -1 ) {
+ else if( line.find(TQString::fromLatin1(passwordPrompt[mVersion]), 0, false) != -1 ) {
mConnectState = STATE_TRY_PASSWD;
}
else if( line.find(passphrasePrompt[mVersion]) != -1 ) {
@@ -824,7 +824,7 @@ bool KSshProcess::connect() {
// STATE_TRY_PASSWD:
// If we have password send it to the ssh process, else
// set error ERR_NEED_PASSWD and return false to the caller.
- // The caller then must then call KSshProcess::setPassword(QString)
+ // The caller then must then call KSshProcess::setPassword(TQString)
// before calling KSshProcess::connect() again.
//
// Almost exactly liek STATE_TRY_PASSPHRASE. Check there if you
@@ -839,11 +839,11 @@ bool KSshProcess::connect() {
ssh.writeLine(mPassword.latin1());
// Overwrite the password so it isn't in memory.
- mPassword.fill(QChar('X'));
+ mPassword.fill(TQChar('X'));
// Set the password to null so we will request another
// password if this one fails.
- mPassword = QString::null;
+ mPassword = TQString::null;
mConnectState = STATE_WAIT_PROMPT;
}
@@ -862,7 +862,7 @@ bool KSshProcess::connect() {
// STATE_TRY_KEY_PASSPHRASE:
// If we have passphrase send it to the ssh process, else
// set error ERR_NEED_PASSPHRASE and return false to the caller.
- // The caller then must then call KSshProcess::setPassword(QString)
+ // The caller then must then call KSshProcess::setPassword(TQString)
// before calling KSshProcess::connect() again.
//
// Almost exactly like STATE_TRY_PASSWD. The only difference is
@@ -878,11 +878,11 @@ bool KSshProcess::connect() {
ssh.writeLine(mPassword.latin1());
// Overwrite the password so it isn't in memory.
- mPassword.fill(QChar('X'));
+ mPassword.fill(TQChar('X'));
// Set the password to null so we will request another
// password if this one fails.
- mPassword = QString::null;
+ mPassword = TQString::null;
mConnectState = STATE_WAIT_PROMPT;
}
diff --git a/kioslave/sftp/ksshprocess.h b/kioslave/sftp/ksshprocess.h
index 2ec1abfd6..7fe8dd814 100644
--- a/kioslave/sftp/ksshprocess.h
+++ b/kioslave/sftp/ksshprocess.h
@@ -23,7 +23,7 @@
#include <signal.h>
#include <unistd.h>
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include <kdebug.h>
@@ -69,7 +69,7 @@
* }
*
* int err;
- * QString errMsg;
+ * TQString errMsg;
* while( !ssh.connect() ) {
* err = ssh.error(errMsg);
*
@@ -117,7 +117,7 @@ public:
class SshOpt {
public:
Q_UINT32 opt;
- QString str;
+ TQString str;
Q_INT32 num;
bool boolean;
};
@@ -125,9 +125,9 @@ public:
/**
* List of SshOptions and associated iterators
*/
- typedef QValueList<SshOpt> SshOptList;
- typedef QValueListIterator<SshOpt> SshOptListIterator;
- typedef QValueListConstIterator<SshOpt> SshOptListConstIterator;
+ typedef TQValueList<SshOpt> SshOptList;
+ typedef TQValueListIterator<SshOpt> SshOptListIterator;
+ typedef TQValueListConstIterator<SshOpt> SshOptListConstIterator;
/**
* Ssh versions supported by KSshProcess. Subject to change
@@ -320,7 +320,7 @@ public:
* @param pathToSsh The fully qualified path name of the ssh binary
* KSshProcess should use to setup a SSH connection.
*/
- KSshProcess(QString pathToSsh);
+ KSshProcess(TQString pathToSsh);
~KSshProcess();
/**
@@ -333,7 +333,7 @@ public:
* recognizes the version.
*
*/
- bool setSshPath(QString pathToSsh);
+ bool setSshPath(TQString pathToSsh);
/**
* Get the ssh version.
@@ -349,7 +349,7 @@ public:
*
* @return A string describing the ssh version recognized by KSshProcess
*/
- //QString versionStr();
+ //TQString versionStr();
/**
* Get the last error encountered by KSshProcess.
@@ -358,7 +358,7 @@ public:
*
* @return The error number. See SshError for descriptions.
*/
- int error(QString& msg);
+ int error(TQString& msg);
/**
* Get the last error encountered by KSshProcess.
@@ -366,7 +366,7 @@ public:
*/
int error() { return mError; }
- QString errorMsg() { return mErrorMsg; }
+ TQString errorMsg() { return mErrorMsg; }
/**
* Send a signal to the ssh process. Do not use this to end the
@@ -482,7 +482,7 @@ public:
*
* @param password The user password to give ssh.
*/
- void setPassword(QString password);
+ void setPassword(TQString password);
/**
* Access to standard in and out of the ssh process.
@@ -508,7 +508,7 @@ private:
/**
* Path the the ssh binary.
*/
- QString mSshPath;
+ TQString mSshPath;
/**
* SSH version. This is an index into the supported SSH
@@ -519,17 +519,17 @@ private:
/**
* User's password. Zero this out when it is no longer needed.
*/
- QString mPassword;
+ TQString mPassword;
/**
* User's username.
*/
- QString mUsername;
+ TQString mUsername;
/**
* Name of host we are connecting to.
*/
- QString mHost;
+ TQString mHost;
/**
* Accept new or changed host keys if true.
@@ -552,13 +552,13 @@ private:
* Save any key fingerprint msg from ssh so we can present
* it to the caller.
*/
- QString mKeyFingerprint;
+ TQString mKeyFingerprint;
/**
* The location of the known host key file. We grab this from
* any error messages ssh prints out.
*/
- QString mKnownHostsFile;
+ TQString mKnownHostsFile;
/**
* The state of our connect state machine.
@@ -580,7 +580,7 @@ private:
* An error message that corresponds to the error number set in
* mError. Optional.
*/
- QString mErrorMsg;
+ TQString mErrorMsg;
/**
* Interface to the SSH process we ceate. Handles communication
@@ -602,22 +602,22 @@ private:
void installSignalHandlers();
void removeSignalHandlers();
- QString getLine();
+ TQString getLine();
- static QRegExp versionStrs[];
+ static TQRegExp versionStrs[];
static const char * const passwordPrompt[];
static const char * const passphrasePrompt[];
static const char * const authSuccessMsg[];
static const char * const authFailedMsg[];
- static QRegExp hostKeyMissingMsg[];
+ static TQRegExp hostKeyMissingMsg[];
static const char * const hostKeyChangedMsg[];
static const char * const continuePrompt[];
static const char * const hostKeyAcceptedMsg[];
static const char * const tryAgainMsg[];
- static QRegExp hostKeyVerifyFailedMsg[];
+ static TQRegExp hostKeyVerifyFailedMsg[];
static const char * const connectionClosedMsg[];
static const char * const changeHostKeyOnDiskPrompt[];
- static QRegExp keyFingerprintMsg[];
- static QRegExp knownHostsFileMsg[];
+ static TQRegExp keyFingerprintMsg[];
+ static TQRegExp knownHostsFileMsg[];
};
#endif
diff --git a/kioslave/sftp/ksshprocesstest.cpp b/kioslave/sftp/ksshprocesstest.cpp
index 3a37be02c..59dbf58c7 100644
--- a/kioslave/sftp/ksshprocesstest.cpp
+++ b/kioslave/sftp/ksshprocesstest.cpp
@@ -22,15 +22,15 @@ int main(int argc, char *argv[]) {
opts.append(opt);
opt.opt = KSshProcess::SSH_HOST;
- opt.str = QString(argv[2]);
+ opt.str = TQString(argv[2]);
opts.append(opt);
opt.opt = KSshProcess::SSH_USERNAME;
- opt.str = QString(argv[3]);
+ opt.str = TQString(argv[3]);
opts.append(opt);
// opt.opt = KSshProcess::SSH_PASSWD;
-// opt.str = QString(argv[4]);
+// opt.str = TQString(argv[4]);
// opts.append(opt);
if( !ssh.setOptions(opts) ) {
@@ -53,7 +53,7 @@ int main(int argc, char *argv[]) {
cout << "Password: ";
cin >> buf;
cout << "password is " << buf << endl;
- ssh.setPassword(QString(buf));
+ ssh.setPassword(TQString(buf));
break;
case KSshProcess::ERR_NEW_HOST_KEY:
case KSshProcess::ERR_DIFF_HOST_KEY:
diff --git a/kioslave/sftp/process.cpp b/kioslave/sftp/process.cpp
index fcf012514..ca99b36bb 100644
--- a/kioslave/sftp/process.cpp
+++ b/kioslave/sftp/process.cpp
@@ -43,9 +43,9 @@
#include <sys/select.h> // Needed on some systems.
#endif
-#include <qglobal.h>
-#include <qcstring.h>
-#include <qfile.h>
+#include <tqglobal.h>
+#include <tqcstring.h>
+#include <tqfile.h>
#include <kdebug.h>
#include <kstandarddirs.h>
@@ -99,10 +99,10 @@ MyPtyProcess::~MyPtyProcess()
*/
-QCString MyPtyProcess::readLineFrom(int fd, QCString& inbuf, bool block)
+TQCString MyPtyProcess::readLineFrom(int fd, TQCString& inbuf, bool block)
{
int pos;
- QCString ret;
+ TQCString ret;
if (!inbuf.isEmpty())
{
@@ -172,7 +172,7 @@ QCString MyPtyProcess::readLineFrom(int fd, QCString& inbuf, bool block)
return ret;
}
-void MyPtyProcess::writeLine(QCString line, bool addnl)
+void MyPtyProcess::writeLine(TQCString line, bool addnl)
{
if (!line.isEmpty())
write(m_Fd, line, line.length());
@@ -180,7 +180,7 @@ void MyPtyProcess::writeLine(QCString line, bool addnl)
write(m_Fd, "\n", 1);
}
-void MyPtyProcess::unreadLineFrom(QCString inbuf, QCString line, bool addnl)
+void MyPtyProcess::unreadLineFrom(TQCString inbuf, TQCString line, bool addnl)
{
if (addnl)
line += '\n';
@@ -193,7 +193,7 @@ void MyPtyProcess::unreadLineFrom(QCString inbuf, QCString line, bool addnl)
* Fork and execute the command. This returns in the parent.
*/
-int MyPtyProcess::exec(QCString command, QCStringList args)
+int MyPtyProcess::exec(TQCString command, QCStringList args)
{
kdDebug(PTYPROC) << "MyPtyProcess::exec(): " << command << endl;// << ", args = " << args << endl;
@@ -259,18 +259,18 @@ int MyPtyProcess::exec(QCString command, QCStringList args)
_exit(1);
// From now on, terminal output goes through the tty.
- QCString path;
+ TQCString path;
if (command.contains('/'))
path = command;
else
{
- QString file = KStandardDirs::findExe(command);
+ TQString file = KStandardDirs::findExe(command);
if (file.isEmpty())
{
kdError(PTYPROC) << k_lineinfo << command << " not found\n";
_exit(1);
}
- path = QFile::encodeName(file);
+ path = TQFile::encodeName(file);
}
int i;
@@ -393,7 +393,7 @@ int MyPtyProcess::waitForChild()
if (ret)
{
- QCString line = readLine(false);
+ TQCString line = readLine(false);
while (!line.isNull())
{
if (!m_Exit.isEmpty() && !qstrnicmp(line, m_Exit, m_Exit.length()))
diff --git a/kioslave/sftp/process.h b/kioslave/sftp/process.h
index 64dcfb973..b0f20f77b 100644
--- a/kioslave/sftp/process.h
+++ b/kioslave/sftp/process.h
@@ -12,15 +12,15 @@
#ifndef __Process_h_Included__
#define __Process_h_Included__
-#include <qcstring.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <tqcstring.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
#define PTYPROC 7120
class PTY;
-typedef QValueList<QCString> QCStringList;
+typedef TQValueList<TQCString> QCStringList;
/**
* Synchronous communication with tty programs.
@@ -43,7 +43,7 @@ public:
* @param command The command to execute.
* @param args The arguments to the command.
*/
- int exec(QCString command, QCStringList args);
+ int exec(TQCString command, QCStringList args);
/**
* Read a line from the program's standard out. Depending on the @em block
@@ -51,16 +51,16 @@ public:
* @param block Block until a full line is read?
* @return The output string.
*/
- QCString readLine(bool block = true)
+ TQCString readLine(bool block = true)
{ return readLineFrom(m_Fd, m_ptyBuf, block); }
- QCString readLineFromPty(bool block = true)
+ TQCString readLineFromPty(bool block = true)
{ return readLineFrom(m_Fd, m_ptyBuf, block); }
- QCString readLineFromStdout(bool block = true)
+ TQCString readLineFromStdout(bool block = true)
{ return readLineFrom(m_stdinout, m_stdoutBuf, block); }
- QCString readLineFromStderr(bool block = true)
+ TQCString readLineFromStderr(bool block = true)
{ return readLineFrom(m_err, m_stderrBuf, block); }
/**
@@ -68,7 +68,7 @@ public:
* @param line The text to write.
* @param addNewline Adds a '\n' to the line.
*/
- void writeLine(QCString line, bool addNewline=true);
+ void writeLine(TQCString line, bool addNewline=true);
/**
* Put back a line of input.
@@ -76,23 +76,23 @@ public:
* @param addNewline Adds a '\n' to the line.
*/
- void unreadLine(QCString line, bool addNewline = true)
+ void unreadLine(TQCString line, bool addNewline = true)
{ unreadLineFrom(m_ptyBuf, line, addNewline); }
- void unreadLineFromPty(QCString line, bool addNewline = true)
+ void unreadLineFromPty(TQCString line, bool addNewline = true)
{ unreadLineFrom(m_ptyBuf, line, addNewline); }
- void unreadLineFromStderr(QCString line, bool addNewline = true)
+ void unreadLineFromStderr(TQCString line, bool addNewline = true)
{ unreadLineFrom(m_stderrBuf, line, addNewline); }
- void unreadLineFromStdout(QCString line, bool addNewline = true)
+ void unreadLineFromStdout(TQCString line, bool addNewline = true)
{ unreadLineFrom(m_stdoutBuf, line, addNewline); }
/**
* Set exit string. If a line of program output matches this,
* @ref #waitForChild() will terminate the program and return.
*/
- void setExitString(QCString exit) { m_Exit = exit; }
+ void setExitString(TQCString exit) { m_Exit = exit; }
/**
* Wait for the child to exit. See also @ref #setExitString.
@@ -129,18 +129,18 @@ public:
protected:
bool m_bErase, m_bTerminal;
int m_Pid, m_Fd, m_stdinout, m_err;
- QCString m_Command, m_Exit;
+ TQCString m_Command, m_Exit;
private:
int init();
int SetupTTY(int fd);
PTY *m_pPTY;
- QCString m_TTY;
- QCString m_ptyBuf, m_stderrBuf, m_stdoutBuf;
+ TQCString m_TTY;
+ TQCString m_ptyBuf, m_stderrBuf, m_stdoutBuf;
- QCString readLineFrom(int fd, QCString& inbuf, bool block);
- void unreadLineFrom(QCString inbuf, QCString line, bool addnl);
+ TQCString readLineFrom(int fd, TQCString& inbuf, bool block);
+ void unreadLineFrom(TQCString inbuf, TQCString line, bool addnl);
class PtyProcessPrivate;
PtyProcessPrivate *d;
};
diff --git a/kioslave/sftp/sftpfileattr.cpp b/kioslave/sftp/sftpfileattr.cpp
index 07aada36d..42148ac28 100644
--- a/kioslave/sftp/sftpfileattr.cpp
+++ b/kioslave/sftp/sftpfileattr.cpp
@@ -21,8 +21,8 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <qstring.h>
-#include <qdatastream.h>
+#include <tqstring.h>
+#include <tqdatastream.h>
#include <kio/global.h>
#include <kremoteencoding.h>
@@ -123,7 +123,7 @@ UDSEntry sftpFileAttr::entry() {
}
/** Use to output the file attributes to a sftp packet */
-QDataStream& operator<< (QDataStream& s, const sftpFileAttr& fa) {
+TQDataStream& operator<< (TQDataStream& s, const sftpFileAttr& fa) {
s << (Q_UINT32)fa.mFlags;
if( fa.mFlags & SSH2_FILEXFER_ATTR_SIZE )
@@ -148,7 +148,7 @@ QDataStream& operator<< (QDataStream& s, const sftpFileAttr& fa) {
/** Use to read a file attribute from a sftp packet */
-QDataStream& operator>> (QDataStream& s, sftpFileAttr& fa) {
+TQDataStream& operator>> (TQDataStream& s, sftpFileAttr& fa) {
// XXX Add some error checking in here in case
// we get a bad sftp packet.
@@ -156,7 +156,7 @@ QDataStream& operator>> (QDataStream& s, sftpFileAttr& fa) {
fa.clear();
if( fa.mDirAttrs ) {
- QCString fn;
+ TQCString fn;
s >> fn;
fn.truncate( fn.size() );
@@ -203,7 +203,7 @@ QDataStream& operator>> (QDataStream& s, sftpFileAttr& fa) {
/** Parse longname for the owner and group names. */
void sftpFileAttr::getUserGroupNames(){
// Get the name of the owner and group of the file from longname.
- QString user, group;
+ TQString user, group;
if( mLongname.isEmpty() ) {
// do not have the user name so use the user id instead
user.setNum(mUid);
@@ -214,7 +214,7 @@ void sftpFileAttr::getUserGroupNames(){
int i = 0;
int l = mLongname.length();
- QString longName = mEncoding->decode( mLongname );
+ TQString longName = mEncoding->decode( mLongname );
kdDebug(7120) << "Decoded: " << longName << endl;
@@ -285,10 +285,10 @@ void sftpFileAttr::clear(){
clearFileSize();
clearPermissions();
clearExtensions();
- mFilename = QString::null;
- mGroupName = QString::null;
- mUserName = QString::null;
- mLinkDestination = QString::null;
+ mFilename = TQString::null;
+ mGroupName = TQString::null;
+ mUserName = TQString::null;
+ mLinkDestination = TQString::null;
mFlags = 0;
mLongname = "\0";
mLinkType = 0;
diff --git a/kioslave/sftp/sftpfileattr.h b/kioslave/sftp/sftpfileattr.h
index 28743504b..a2a9cf87e 100644
--- a/kioslave/sftp/sftpfileattr.h
+++ b/kioslave/sftp/sftpfileattr.h
@@ -20,9 +20,9 @@
#include <sys/types.h>
-#include <qglobal.h>
-#include <qstring.h>
-#include <qdatastream.h>
+#include <tqglobal.h>
+#include <tqstring.h>
+#include <tqdatastream.h>
#include <kio/global.h>
#include <kdebug.h>
@@ -39,7 +39,7 @@ class sftpFileAttr {
private: // Private attributes
/** Name of file. */
- QString mFilename;
+ TQString mFilename;
/** Specifies which fields of the file attribute are available. */
Q_UINT32 mFlags;
@@ -69,13 +69,13 @@ private: // Private attributes
/** Longname of the file as found in a SSH_FXP_NAME sftp packet.
These contents are parse to return the file's owner name and
gr oup name. */
- QCString mLongname;
+ TQCString mLongname;
- QString mUserName;
- QString mGroupName;
+ TQString mUserName;
+ TQString mGroupName;
/** If file is a link, contains the destination of the link */
- QString mLinkDestination;
+ TQString mLinkDestination;
/** If resource is a link, contains the type the link,e.g. file,dir... */
mode_t mLinkType;
@@ -195,17 +195,17 @@ public:
unsigned int flags() const { return mFlags; }
/** Sets file's longname. See sftpFileAttr::longname. */
- void setLongname(QString l) { mLongname = l.latin1(); }
+ void setLongname(TQString l) { mLongname = l.latin1(); }
/** Returns a string describing the file attributes. The format is specific
to the implementation of the sftp server. In most cases (ie OpenSSH)
this is similar to the long output of 'ls'. */
- QString longname() const { return mLongname; }
+ TQString longname() const { return mLongname; }
- void setLinkDestination(const QString& target)
+ void setLinkDestination(const TQString& target)
{ mLinkDestination = target; }
- QString linkDestination()
+ TQString linkDestination()
{ return mLinkDestination; }
/** Sets the actual type a symbolic link points to. */
@@ -214,10 +214,10 @@ public:
mode_t linkType() const { return mLinkType; }
/** No descriptions */
- void setFilename(const QString& fn)
+ void setFilename(const TQString& fn)
{ mFilename = fn; }
- QString filename() const
+ TQString filename() const
{ return mFilename; }
/** Returns a UDSEntry describing the file.
@@ -228,7 +228,7 @@ public:
This will only write the sftp ATTR structure to the stream.
It will never write the filename and longname because the client
never sends those to the server. */
- friend QDataStream& operator<< (QDataStream&, const sftpFileAttr&);
+ friend TQDataStream& operator<< (TQDataStream&, const sftpFileAttr&);
/** Use to read a file attribute from a sftp packet.
Read this carefully! If the DirAttrs flag is true, this will
@@ -237,7 +237,7 @@ public:
If the DirAttrs flag is false, this will only read file attributes
from the stream.
BY DEFAULT, A NEW INSTANCE HAS DirAttrs == false */
- friend QDataStream& operator>> (QDataStream&, sftpFileAttr&);
+ friend TQDataStream& operator>> (TQDataStream&, sftpFileAttr&);
/** Parse longname for the owner and group names. */
void getUserGroupNames();
diff --git a/kioslave/smb/kio_smb.cpp b/kioslave/smb/kio_smb.cpp
index 05db789ee..fd86ebadb 100644
--- a/kioslave/smb/kio_smb.cpp
+++ b/kioslave/smb/kio_smb.cpp
@@ -32,7 +32,7 @@
#include "kio_smb_internal.h"
//===========================================================================
-SMBSlave::SMBSlave(const QCString& pool, const QCString& app)
+SMBSlave::SMBSlave(const TQCString& pool, const TQCString& app)
: SlaveBase( "smb", pool, app )
{
m_initialized_smbc = false;
diff --git a/kioslave/smb/kio_smb.h b/kioslave/smb/kio_smb.h
index a04d7b3fa..da40bda13 100644
--- a/kioslave/smb/kio_smb.h
+++ b/kioslave/smb/kio_smb.h
@@ -39,11 +39,11 @@
//-------------
// QT includes
//-------------
-#include <qstring.h>
-#include <qptrlist.h>
-#include <qstringlist.h>
-#include <qtextstream.h>
-#include <qstrlist.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
+#include <tqstringlist.h>
+#include <tqtextstream.h>
+#include <tqstrlist.h>
//--------------
// KDE includes
@@ -68,7 +68,7 @@
#include <stdio.h>
#include <errno.h>
#include <time.h>
-#include <qobject.h>
+#include <tqobject.h>
//-------------------------------
// Samba client library includes
@@ -92,7 +92,7 @@ class KProcess;
//===========================================================================
-class SMBSlave : public QObject, public KIO::SlaveBase
+class SMBSlave : public TQObject, public KIO::SlaveBase
{
Q_OBJECT
@@ -105,10 +105,10 @@ private:
/**
* From Controlcenter
*/
- QString m_default_user;
-// QString m_default_workgroup; //currently unused, Alex <neundorf@kde.org>
- QString m_default_password;
- QString m_default_encoding;
+ TQString m_default_user;
+// TQString m_default_workgroup; //currently unused, Alex <neundorf@kde.org>
+ TQString m_default_password;
+ TQString m_default_encoding;
/**
* we store the current url, it's needed for
@@ -234,7 +234,7 @@ public:
//-----------------------------------------------------------------------
// Functions overwritten in kio_smb.cpp
- SMBSlave(const QCString& pool, const QCString& app);
+ SMBSlave(const TQCString& pool, const TQCString& app);
virtual ~SMBSlave();
// Functions overwritten in kio_smb_browse.cpp
@@ -255,18 +255,18 @@ public:
virtual void put( const KURL& kurl, int permissions, bool overwrite, bool resume );
// Functions not implemented (yet)
- //virtual void setHost(const QString& host, int port, const QString& user, const QString& pass);
+ //virtual void setHost(const TQString& host, int port, const TQString& user, const TQString& pass);
//virtual void openConnection();
//virtual void closeConnection();
//virtual void slave_status();
- virtual void special( const QByteArray & );
+ virtual void special( const TQByteArray & );
private slots:
void readOutput(KProcess *proc, char *buffer, int buflen);
void readStdErr(KProcess *proc, char *buffer, int buflen);
private:
- QString mybuf, mystderr;
+ TQString mybuf, mystderr;
};
diff --git a/kioslave/smb/kio_smb_auth.cpp b/kioslave/smb/kio_smb_auth.cpp
index 60d9ac285..d216e1e5b 100644
--- a/kioslave/smb/kio_smb_auth.cpp
+++ b/kioslave/smb/kio_smb_auth.cpp
@@ -33,7 +33,7 @@
#include "kio_smb_internal.h"
#include <ksimpleconfig.h>
-#include <qdir.h>
+#include <tqdir.h>
#include <stdlib.h>
// call for libsmbclient
@@ -67,14 +67,14 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share,
kdDebug(KIO_SMB) << "AAAAAAAAAAAAAA auth_smbc_get_dat: set user=" << username << ", workgroup=" << workgroup
<< " server=" << server << ", share=" << share << endl;
- QString s_server = QString::fromUtf8(server);
- QString s_share = QString::fromUtf8(share);
+ TQString s_server = TQString::fromUtf8(server);
+ TQString s_share = TQString::fromUtf8(share);
workgroup[wgmaxlen - 1] = 0;
- QString s_workgroup = QString::fromUtf8(workgroup);
+ TQString s_workgroup = TQString::fromUtf8(workgroup);
username[unmaxlen - 1] = 0;
- QString s_username = QString::fromUtf8(username);
+ TQString s_username = TQString::fromUtf8(username);
password[pwmaxlen - 1] = 0;
- QString s_password = QString::fromUtf8(password);
+ TQString s_password = TQString::fromUtf8(password);
KIO::AuthInfo info;
info.url = KURL("smb:///");
@@ -93,7 +93,7 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share,
{
// ok, we do not know the password. Let's try anonymous before we try for real
info.username = "anonymous";
- info.password = QString::null;
+ info.password = TQString::null;
}
else
{
@@ -117,7 +117,7 @@ bool SMBSlave::checkPassword(SMBUrl &url)
info.url = KURL("smb:///");
info.url.setHost(url.host());
- QString share = url.path();
+ TQString share = url.path();
int index = share.find('/', 1);
if (index > 1)
share = share.left(index);
diff --git a/kioslave/smb/kio_smb_browse.cpp b/kioslave/smb/kio_smb_browse.cpp
index de6bf4ed2..e9a216fd3 100644
--- a/kioslave/smb/kio_smb_browse.cpp
+++ b/kioslave/smb/kio_smb_browse.cpp
@@ -34,7 +34,7 @@
#include <pwd.h>
#include <grp.h>
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
#include <kglobal.h>
@@ -83,7 +83,7 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign
if ( user )
udsatom.m_str = user->pw_name;
else
- udsatom.m_str = QString::number( uid );
+ udsatom.m_str = TQString::number( uid );
udsentry.append(udsatom);
udsatom.m_uds = KIO::UDS_GROUP;
@@ -92,7 +92,7 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign
if ( grp )
udsatom.m_str = grp->gr_name;
else
- udsatom.m_str = QString::number( gid );
+ udsatom.m_str = TQString::number( gid );
udsentry.append(udsatom);
udsatom.m_uds = KIO::UDS_ACCESS;
@@ -194,7 +194,7 @@ void SMBSlave::stat( const KURL& kurl )
KURL SMBSlave::checkURL(const KURL& kurl) const
{
kdDebug(KIO_SMB) << "checkURL " << kurl << endl;
- QString surl = kurl.url();
+ TQString surl = kurl.url();
if (surl.startsWith("smb:/")) {
if (surl.length() == 5) // just the above
return kurl; // unchanged
@@ -211,7 +211,7 @@ KURL SMBSlave::checkURL(const KURL& kurl) const
if (surl.contains('@') && !surl.contains("smb://")) {
KURL url(kurl);
url.setPath("/"+kurl.url().right( kurl.url().length()-kurl.url().find('@') -1));
- QString userinfo = kurl.url().mid(5, kurl.url().find('@')-5);
+ TQString userinfo = kurl.url().mid(5, kurl.url().find('@')-5);
if(userinfo.contains(':')) {
url.setUser(userinfo.left(userinfo.find(':')));
url.setPass(userinfo.right(userinfo.length()-userinfo.find(':')-1));
@@ -305,7 +305,7 @@ void SMBSlave::reportError(const SMBUrl &url)
"if they ask for it)") );
break;
default:
- error( ERR_INTERNAL, i18n("Unknown error condition in stat: %1").arg(QString::fromLocal8Bit( strerror(errno))) );
+ error( ERR_INTERNAL, i18n("Unknown error condition in stat: %1").arg(TQString::fromLocal8Bit( strerror(errno))) );
}
}
@@ -343,10 +343,10 @@ void SMBSlave::listDir( const KURL& kurl )
// Set name
atom.m_uds = KIO::UDS_NAME;
- QString dirpName = QString::fromUtf8( dirp->name );
+ TQString dirpName = TQString::fromUtf8( dirp->name );
// We cannot trust dirp->commentlen has it might be with or without the NUL character
// See KDE bug #111430 and Samba bug #3030
- QString comment = QString::fromUtf8( dirp->comment );
+ TQString comment = TQString::fromUtf8( dirp->comment );
if ( dirp->smbc_type == SMBC_SERVER || dirp->smbc_type == SMBC_WORKGROUP ) {
atom.m_str = dirpName.lower();
atom.m_str.at( 0 ) = dirpName.at( 0 ).upper();
@@ -398,18 +398,18 @@ void SMBSlave::listDir( const KURL& kurl )
if (dirp->smbc_type == SMBC_SERVER) {
atom.m_uds = KIO::UDS_URL;
- // QString workgroup = m_current_url.host().upper();
+ // TQString workgroup = m_current_url.host().upper();
KURL u("smb:/");
u.setHost(dirpName);
atom.m_str = u.url();
// when libsmbclient knows
- // atom.m_str = QString("smb://%1?WORKGROUP=%2").arg(dirpName).arg(workgroup.upper());
+ // atom.m_str = TQString("smb://%1?WORKGROUP=%2").arg(dirpName).arg(workgroup.upper());
kdDebug(KIO_SMB) << "list item " << atom.m_str << endl;
udsentry.append(atom);
atom.m_uds = KIO::UDS_MIME_TYPE;
- atom.m_str = QString::fromLatin1("application/x-smb-server");
+ atom.m_str = TQString::fromLatin1("application/x-smb-server");
udsentry.append(atom);
}
@@ -429,11 +429,11 @@ void SMBSlave::listDir( const KURL& kurl )
udsentry.append(atom);
atom.m_uds = KIO::UDS_MIME_TYPE;
- atom.m_str = QString::fromLatin1("application/x-smb-workgroup");
+ atom.m_str = TQString::fromLatin1("application/x-smb-workgroup");
udsentry.append(atom);
atom.m_uds = KIO::UDS_URL;
- // QString workgroup = m_current_url.host().upper();
+ // TQString workgroup = m_current_url.host().upper();
KURL u("smb:/");
u.setHost(dirpName);
atom.m_str = u.url();
diff --git a/kioslave/smb/kio_smb_config.cpp b/kioslave/smb/kio_smb_config.cpp
index c772f8b94..101ba160d 100644
--- a/kioslave/smb/kio_smb_config.cpp
+++ b/kioslave/smb/kio_smb_config.cpp
@@ -33,7 +33,7 @@
#include "kio_smb_internal.h"
#include <kconfig.h>
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
//===========================================================================
void SMBSlave::reparseConfiguration()
{
@@ -43,23 +43,23 @@ void SMBSlave::reparseConfiguration()
// m_default_workgroup=cfg->readEntry("Workgroup");
// m_showHiddenShares=cfg->readBoolEntry("ShowHiddenShares",false);
- QString m_encoding = QTextCodec::codecForLocale()->name();
+ TQString m_encoding = TQTextCodec::codecForLocale()->name();
m_default_encoding = cfg->readEntry( "Encoding", m_encoding.lower() );
// unscramble, taken from Nicola Brodu's smb ioslave
//not really secure, but better than storing the plain password
- QString scrambled = cfg->readEntry( "Password" );
+ TQString scrambled = cfg->readEntry( "Password" );
m_default_password = "";
for (uint i=0; i<scrambled.length()/3; i++)
{
- QChar qc1 = scrambled[i*3];
- QChar qc2 = scrambled[i*3+1];
- QChar qc3 = scrambled[i*3+2];
+ TQChar qc1 = scrambled[i*3];
+ TQChar qc2 = scrambled[i*3+1];
+ TQChar qc3 = scrambled[i*3+2];
unsigned int a1 = qc1.latin1() - '0';
unsigned int a2 = qc2.latin1() - 'A';
unsigned int a3 = qc3.latin1() - '0';
unsigned int num = ((a1 & 0x3F) << 10) | ((a2& 0x1F) << 5) | (a3 & 0x1F);
- m_default_password[i] = QChar((uchar)((num - 17) ^ 173)); // restore
+ m_default_password[i] = TQChar((uchar)((num - 17) ^ 173)); // restore
}
delete cfg;
diff --git a/kioslave/smb/kio_smb_file.cpp b/kioslave/smb/kio_smb_file.cpp
index 67fe0d213..8c7867722 100644
--- a/kioslave/smb/kio_smb_file.cpp
+++ b/kioslave/smb/kio_smb_file.cpp
@@ -45,7 +45,7 @@ void SMBSlave::get( const KURL& kurl )
time_t lasttime = 0;
time_t starttime = 0;
KIO::filesize_t totalbytesread = 0;
- QByteArray filedata;
+ TQByteArray filedata;
SMBUrl url;
kdDebug(KIO_SMB) << "SMBSlave::get on " << kurl << endl;
@@ -132,7 +132,7 @@ void SMBSlave::get( const KURL& kurl )
}
smbc_close(filefd);
- data( QByteArray() );
+ data( TQByteArray() );
processedSize(static_cast<KIO::filesize_t>(st.st_size));
}
@@ -161,7 +161,7 @@ void SMBSlave::put( const KURL& kurl,
int filefd;
bool exists;
mode_t mode;
- QByteArray filedata;
+ TQByteArray filedata;
kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl << endl;
diff --git a/kioslave/smb/kio_smb_internal.cpp b/kioslave/smb/kio_smb_internal.cpp
index 27cdfb8d3..3660e3e8a 100644
--- a/kioslave/smb/kio_smb_internal.cpp
+++ b/kioslave/smb/kio_smb_internal.cpp
@@ -31,7 +31,7 @@
#include "kio_smb.h"
#include "kio_smb_internal.h"
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
#include <kconfig.h>
#include <kglobal.h>
@@ -57,14 +57,14 @@ SMBUrl::SMBUrl(const KURL& kurl)
//-----------------------------------------------------------------------
-void SMBUrl::addPath(const QString &filedir)
+void SMBUrl::addPath(const TQString &filedir)
{
KURL::addPath(filedir);
updateCache();
}
//-----------------------------------------------------------------------
-bool SMBUrl::cd(const QString &filedir)
+bool SMBUrl::cd(const TQString &filedir)
{
if (!KURL::cd(filedir))
return false;
@@ -83,7 +83,7 @@ void SMBUrl::updateCache()
if (KURL::url() == "smb:/")
m_surl = "smb://";
else {
- QString surl = "smb://";
+ TQString surl = "smb://";
if (KURL::hasUser()) {
surl += KURL::encode_string(KURL::user(), 106);
if (KURL::hasPass()) {
diff --git a/kioslave/smb/kio_smb_internal.h b/kioslave/smb/kio_smb_internal.h
index aabfc7ab7..b6da04e58 100644
--- a/kioslave/smb/kio_smb_internal.h
+++ b/kioslave/smb/kio_smb_internal.h
@@ -65,9 +65,9 @@ public:
* Appends the specified file and dir to this SMBUrl
* "smb://server/share" --> "smb://server/share/filedir"
*/
- void addPath(const QString &filedir);
+ void addPath(const TQString &filedir);
- bool cd(const QString &dir);
+ bool cd(const TQString &dir);
/**
* Returns the type of this SMBUrl:
@@ -78,33 +78,33 @@ public:
*/
SMBUrlType getType() const;
- void setPass( const QString& _txt ) { KURL::setPass(_txt); updateCache(); }
- void setUser( const QString& _txt ) { KURL::setUser(_txt); updateCache(); }
- void setHost( const QString& _txt ) { KURL::setHost(_txt); updateCache(); }
+ void setPass( const TQString& _txt ) { KURL::setPass(_txt); updateCache(); }
+ void setUser( const TQString& _txt ) { KURL::setUser(_txt); updateCache(); }
+ void setHost( const TQString& _txt ) { KURL::setHost(_txt); updateCache(); }
/**
* Returns the workgroup if it given in url
*/
-// QString getWorkgroup() const;
+// TQString getWorkgroup() const;
/**
* Returns path after workgroup
*/
-// QString getServerShareDir() const;
+// TQString getServerShareDir() const;
/**
* Return a URL that is suitable for libsmbclient
*/
- QCString toSmbcUrl() const { return m_surl; }
+ TQCString toSmbcUrl() const { return m_surl; }
private:
/**
- * Change from QString to QCString (MS Windows's character encoding)
+ * Change from TQString to TQCString (MS Windows's character encoding)
*/
- QCString fromUnicode( const QString &_str ) const;
+ TQCString fromUnicode( const TQString &_str ) const;
void updateCache();
- QCString m_surl;
+ TQCString m_surl;
/**
* Type of URL
diff --git a/kioslave/smb/kio_smb_mount.cpp b/kioslave/smb/kio_smb_mount.cpp
index 08d62ed39..f9c366235 100644
--- a/kioslave/smb/kio_smb_mount.cpp
+++ b/kioslave/smb/kio_smb_mount.cpp
@@ -20,26 +20,26 @@
#include "kio_smb.h"
#include <kstandarddirs.h>
-#include <qcstring.h>
+#include <tqcstring.h>
#include <unistd.h>
-#include <qdir.h>
+#include <tqdir.h>
#include <kprocess.h>
void SMBSlave::readOutput(KProcess *, char *buffer, int buflen)
{
- mybuf += QString::fromLocal8Bit(buffer, buflen);
+ mybuf += TQString::fromLocal8Bit(buffer, buflen);
}
void SMBSlave::readStdErr(KProcess *, char *buffer, int buflen)
{
- mystderr += QString::fromLocal8Bit(buffer, buflen);
+ mystderr += TQString::fromLocal8Bit(buffer, buflen);
}
-void SMBSlave::special( const QByteArray & data)
+void SMBSlave::special( const TQByteArray & data)
{
kdDebug(KIO_SMB)<<"Smb::special()"<<endl;
int tmp;
- QDataStream stream(data, IO_ReadOnly);
+ TQDataStream stream(data, IO_ReadOnly);
stream >> tmp;
//mounting and umounting are both blocking, "guarded" by a SIGALARM in the future
switch (tmp)
@@ -47,11 +47,11 @@ void SMBSlave::special( const QByteArray & data)
case 1:
case 3:
{
- QString remotePath, mountPoint, user;
+ TQString remotePath, mountPoint, user;
stream >> remotePath >> mountPoint;
- QStringList sl=QStringList::split("/",remotePath);
- QString share,host;
+ TQStringList sl=TQStringList::split("/",remotePath);
+ TQString share,host;
if (sl.count()>=2)
{
host=(*sl.at(0)).mid(2);
@@ -89,7 +89,7 @@ void SMBSlave::special( const QByteArray & data)
proc.setUseShell(true); // to have the path to smbmnt (which is used by smbmount); see man smbmount
proc << "smbmount";
- QString options;
+ TQString options;
if ( smburl.user().isEmpty() )
{
@@ -113,11 +113,11 @@ void SMBSlave::special( const QByteArray & data)
proc << KProcess::quote(mountPoint.local8Bit());
proc << options;
- connect(&proc, SIGNAL( receivedStdout(KProcess *, char *, int )),
- SLOT(readOutput(KProcess *, char *, int)));
+ connect(&proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int )),
+ TQT_SLOT(readOutput(KProcess *, char *, int)));
- connect(&proc, SIGNAL( receivedStderr(KProcess *, char *, int )),
- SLOT(readStdErr(KProcess *, char *, int)));
+ connect(&proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int )),
+ TQT_SLOT(readStdErr(KProcess *, char *, int)));
if (!proc.start( KProcess::Block, KProcess::AllOutput ))
{
@@ -143,7 +143,7 @@ void SMBSlave::special( const QByteArray & data)
case 2:
case 4:
{
- QString mountPoint;
+ TQString mountPoint;
stream >> mountPoint;
KProcess proc;
@@ -154,11 +154,11 @@ void SMBSlave::special( const QByteArray & data)
mybuf.truncate(0);
mystderr.truncate(0);
- connect(&proc, SIGNAL( receivedStdout(KProcess *, char *, int )),
- SLOT(readOutput(KProcess *, char *, int)));
+ connect(&proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int )),
+ TQT_SLOT(readOutput(KProcess *, char *, int)));
- connect(&proc, SIGNAL( receivedStderr(KProcess *, char *, int )),
- SLOT(readStdErr(KProcess *, char *, int)));
+ connect(&proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int )),
+ TQT_SLOT(readStdErr(KProcess *, char *, int)));
if ( !proc.start( KProcess::Block, KProcess::AllOutput ) )
{
@@ -182,12 +182,12 @@ void SMBSlave::special( const QByteArray & data)
{
bool ok;
- QDir dir(mountPoint);
+ TQDir dir(mountPoint);
dir.cdUp();
ok = dir.rmdir(mountPoint);
if ( ok )
{
- QString p=dir.path();
+ TQString p=dir.path();
dir.cdUp();
ok = dir.rmdir(p);
}
diff --git a/kioslave/smtp/capabilities.cc b/kioslave/smtp/capabilities.cc
index a26626ce1..5b2856837 100644
--- a/kioslave/smtp/capabilities.cc
+++ b/kioslave/smtp/capabilities.cc
@@ -35,7 +35,7 @@
#include "response.h"
-#include <qstrlist.h>
+#include <tqstrlist.h>
namespace KioSMTP {
@@ -56,24 +56,24 @@ namespace KioSMTP {
return c;
}
- void Capabilities::add( const QString & cap, bool replace ) {
- QStringList tokens = QStringList::split( ' ', cap.upper() );
+ void Capabilities::add( const TQString & cap, bool replace ) {
+ TQStringList tokens = TQStringList::split( ' ', cap.upper() );
if ( tokens.empty() )
return;
- QString name = tokens.front(); tokens.pop_front();
+ TQString name = tokens.front(); tokens.pop_front();
add( name, tokens, replace );
}
- void Capabilities::add( const QString & name, const QStringList & args, bool replace ) {
+ void Capabilities::add( const TQString & name, const TQStringList & args, bool replace ) {
if ( replace )
mCapabilities[name] = args;
else
mCapabilities[name] += args;
}
- QString Capabilities::asMetaDataString() const {
- QString result;
- for ( QMap<QString,QStringList>::const_iterator it = mCapabilities.begin() ; it != mCapabilities.end() ; ++it ) {
+ TQString Capabilities::asMetaDataString() const {
+ TQString result;
+ for ( TQMap<TQString,TQStringList>::const_iterator it = mCapabilities.begin() ; it != mCapabilities.end() ; ++it ) {
result += it.key();
if ( !it.data().empty() )
result += ' ' + it.data().join( " " );
@@ -82,24 +82,24 @@ namespace KioSMTP {
return result;
}
- QString Capabilities::authMethodMetaData() const {
- QStringList sl = saslMethodsQSL();
- QString result;
- for ( QStringList::const_iterator it = sl.begin() ; it != sl.end() ; ++it )
+ TQString Capabilities::authMethodMetaData() const {
+ TQStringList sl = saslMethodsQSL();
+ TQString result;
+ for ( TQStringList::const_iterator it = sl.begin() ; it != sl.end() ; ++it )
result += "SASL/" + *it + '\n';
return result;
}
- QStrIList Capabilities::saslMethods() const {
- QStrIList result( true ); // deep copies to be safe
- QStringList sl = saslMethodsQSL();
- for ( QStringList::const_iterator it = sl.begin() ; it != sl.end() ; ++it )
+ TQStrIList Capabilities::saslMethods() const {
+ TQStrIList result( true ); // deep copies to be safe
+ TQStringList sl = saslMethodsQSL();
+ for ( TQStringList::const_iterator it = sl.begin() ; it != sl.end() ; ++it )
result.append( (*it).latin1() );
return result;
}
- QString Capabilities::createSpecialResponse( bool tls ) const {
- QStringList result;
+ TQString Capabilities::createSpecialResponse( bool tls ) const {
+ TQStringList result;
if ( tls )
result.push_back( "STARTTLS" );
result += saslMethodsQSL();
@@ -113,16 +113,16 @@ namespace KioSMTP {
if ( ok && !size )
result.push_back( "SIZE=*" ); // any size
else if ( ok )
- result.push_back( "SIZE=" + QString::number( size ) ); // fixed max
+ result.push_back( "SIZE=" + TQString::number( size ) ); // fixed max
else
result.push_back( "SIZE" ); // indetermined
}
return result.join( " " );
}
- QStringList Capabilities::saslMethodsQSL() const {
- QStringList result;
- for ( QMap<QString,QStringList>::const_iterator it = mCapabilities.begin() ; it != mCapabilities.end() ; ++it ) {
+ TQStringList Capabilities::saslMethodsQSL() const {
+ TQStringList result;
+ for ( TQMap<TQString,TQStringList>::const_iterator it = mCapabilities.begin() ; it != mCapabilities.end() ; ++it ) {
if ( it.key() == "AUTH" )
result += it.data();
else if ( it.key().startsWith( "AUTH=" ) ) {
@@ -131,8 +131,8 @@ namespace KioSMTP {
}
}
result.sort();
- QStringList::iterator it = result.begin();
- for (QStringList::iterator ot = it++; it != result.end(); ot = it++)
+ TQStringList::iterator it = result.begin();
+ for (TQStringList::iterator ot = it++; it != result.end(); ot = it++)
if (*ot == *it) result.remove(ot);
return result;
}
diff --git a/kioslave/smtp/capabilities.h b/kioslave/smtp/capabilities.h
index 1ae5972aa..d9a9de39a 100644
--- a/kioslave/smtp/capabilities.h
+++ b/kioslave/smtp/capabilities.h
@@ -32,10 +32,10 @@
#ifndef __KIOSMTP_CAPABILITIES_H__
#define __KIOSMTP_CAPABILITIES_H__
-#include <qmap.h>
-#include <qcstring.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqmap.h>
+#include <tqcstring.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
class QStrIList;
@@ -49,27 +49,27 @@ namespace KioSMTP {
static Capabilities fromResponse( const Response & response );
- void add( const QString & cap, bool replace=false );
- void add( const QString & name, const QStringList & args, bool replace=false );
+ void add( const TQString & cap, bool replace=false );
+ void add( const TQString & name, const TQStringList & args, bool replace=false );
void clear() { mCapabilities.clear(); }
- bool have( const QString & cap ) const {
+ bool have( const TQString & cap ) const {
return mCapabilities.find( cap.upper() ) != mCapabilities.end();
}
- bool have( const QCString & cap ) const { return have( QString( cap.data() ) ); }
- bool have( const char * cap ) const { return have( QString::fromLatin1( cap ) ); }
+ bool have( const TQCString & cap ) const { return have( TQString( cap.data() ) ); }
+ bool have( const char * cap ) const { return have( TQString::fromLatin1( cap ) ); }
- QString asMetaDataString() const;
+ TQString asMetaDataString() const;
- QString authMethodMetaData() const;
- QStrIList saslMethods() const;
+ TQString authMethodMetaData() const;
+ TQStrIList saslMethods() const;
- QString createSpecialResponse( bool tls ) const;
+ TQString createSpecialResponse( bool tls ) const;
- QStringList saslMethodsQSL() const;
+ TQStringList saslMethodsQSL() const;
private:
- QMap<QString,QStringList> mCapabilities;
+ TQMap<TQString,TQStringList> mCapabilities;
};
} // namespace KioSMTP
diff --git a/kioslave/smtp/command.cc b/kioslave/smtp/command.cc
index 9fb7281c9..2771baf82 100644
--- a/kioslave/smtp/command.cc
+++ b/kioslave/smtp/command.cc
@@ -79,7 +79,7 @@ static sasl_callback_t callbacks[] = {
return r.isOk();
}
- void Command::ungetCommandLine( const QCString &, TransactionState * ) {
+ void Command::ungetCommandLine( const TQCString &, TransactionState * ) {
mComplete = false;
}
@@ -122,7 +122,7 @@ static sasl_callback_t callbacks[] = {
// EHLO / HELO
//
- QCString EHLOCommand::nextCommandLine( TransactionState * ) {
+ TQCString EHLOCommand::nextCommandLine( TransactionState * ) {
mNeedResponse = true;
mComplete = mEHLONotSupported;
const char * cmd = mEHLONotSupported ? "HELO " : "EHLO " ;
@@ -159,7 +159,7 @@ static sasl_callback_t callbacks[] = {
// STARTTLS - rfc 3207
//
- QCString StartTLSCommand::nextCommandLine( TransactionState * ) {
+ TQCString StartTLSCommand::nextCommandLine( TransactionState * ) {
mComplete = true;
mNeedResponse = true;
return "STARTTLS\r\n";
@@ -195,14 +195,14 @@ static sasl_callback_t callbacks[] = {
#define SASLERROR mSMTP->error(KIO::ERR_COULD_NOT_AUTHENTICATE, \
i18n("An error occured during authentication: %1").arg \
- ( QString::fromUtf8( sasl_errdetail( conn ) )));
+ ( TQString::fromUtf8( sasl_errdetail( conn ) )));
//
// AUTH - rfc 2554
//
AuthCommand::AuthCommand( SMTPProtocol * smtp,
const char *mechanisms,
- const QString &aFQDN,
+ const TQString &aFQDN,
KIO::AuthInfo &ai )
: Command( smtp, CloseConnectionOnError|OnlyLastInPipeline ),
mAi( &ai ),
@@ -306,29 +306,29 @@ static sasl_callback_t callbacks[] = {
return !mMechusing;
}
- void AuthCommand::ungetCommandLine( const QCString & s, TransactionState * ) {
+ void AuthCommand::ungetCommandLine( const TQCString & s, TransactionState * ) {
mUngetSASLResponse = s;
mComplete = false;
}
- QCString AuthCommand::nextCommandLine( TransactionState * ) {
+ TQCString AuthCommand::nextCommandLine( TransactionState * ) {
mNeedResponse = true;
- QCString cmd;
+ TQCString cmd;
#ifdef HAVE_LIBSASL2
- QByteArray tmp, challenge;
+ TQByteArray tmp, challenge;
if ( !mUngetSASLResponse.isNull() ) {
// implement un-ungetCommandLine
cmd = mUngetSASLResponse;
mUngetSASLResponse = 0;
} else if ( mFirstTime ) {
- QString firstCommand = "AUTH " + QString::fromLatin1( mMechusing );
+ TQString firstCommand = "AUTH " + TQString::fromLatin1( mMechusing );
tmp.setRawData( mOut, mOutlen );
KCodecs::base64Encode( tmp, challenge );
tmp.resetRawData( mOut, mOutlen );
if ( !challenge.isEmpty() ) {
firstCommand += " ";
- firstCommand += QString::fromLatin1( challenge.data(), challenge.size() );
+ firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() );
}
cmd = firstCommand.latin1();
@@ -394,14 +394,14 @@ static sasl_callback_t callbacks[] = {
// MAIL FROM:
//
- QCString MailFromCommand::nextCommandLine( TransactionState * ) {
+ TQCString MailFromCommand::nextCommandLine( TransactionState * ) {
mComplete = true;
mNeedResponse = true;
- QCString cmdLine = "MAIL FROM:<" + mAddr + '>';
+ TQCString cmdLine = "MAIL FROM:<" + mAddr + '>';
if ( m8Bit && haveCapability("8BITMIME") )
cmdLine += " BODY=8BITMIME";
if ( mSize && haveCapability("SIZE") )
- cmdLine += " SIZE=" + QCString().setNum( mSize );
+ cmdLine += " SIZE=" + TQCString().setNum( mSize );
return cmdLine + "\r\n";
}
@@ -420,7 +420,7 @@ static sasl_callback_t callbacks[] = {
// RCPT TO:
//
- QCString RcptToCommand::nextCommandLine( TransactionState * ) {
+ TQCString RcptToCommand::nextCommandLine( TransactionState * ) {
mComplete = true;
mNeedResponse = true;
return "RCPT TO:<" + mAddr + ">\r\n";
@@ -443,7 +443,7 @@ static sasl_callback_t callbacks[] = {
// DATA (only initial processing!)
//
- QCString DataCommand::nextCommandLine( TransactionState * ts ) {
+ TQCString DataCommand::nextCommandLine( TransactionState * ts ) {
assert( ts );
mComplete = true;
mNeedResponse = true;
@@ -451,7 +451,7 @@ static sasl_callback_t callbacks[] = {
return "DATA\r\n";
}
- void DataCommand::ungetCommandLine( const QCString &, TransactionState * ts ) {
+ void DataCommand::ungetCommandLine( const TQCString &, TransactionState * ts ) {
assert( ts );
mComplete = false;
ts->setDataCommandIssued( false );
@@ -473,7 +473,7 @@ static sasl_callback_t callbacks[] = {
//
// DATA (data transfer)
//
- void TransferCommand::ungetCommandLine( const QCString & cmd, TransactionState * ) {
+ void TransferCommand::ungetCommandLine( const TQCString & cmd, TransactionState * ) {
if ( cmd.isEmpty() )
return; // don't change state when we can't detect the unget in
// the next nextCommandLine !!
@@ -488,16 +488,16 @@ static sasl_callback_t callbacks[] = {
return ts->failed();
}
- QCString TransferCommand::nextCommandLine( TransactionState * ts ) {
+ TQCString TransferCommand::nextCommandLine( TransactionState * ts ) {
assert( ts ); // let's rely on it ( at least for the moment )
assert( !isComplete() );
assert( !ts->failed() );
- static const QCString dotCRLF = ".\r\n";
- static const QCString CRLFdotCRLF = "\r\n.\r\n";
+ static const TQCString dotCRLF = ".\r\n";
+ static const TQCString CRLFdotCRLF = "\r\n.\r\n";
if ( !mUngetBuffer.isEmpty() ) {
- const QCString ret = mUngetBuffer;
+ const TQCString ret = mUngetBuffer;
mUngetBuffer = 0;
if ( mWasComplete ) {
mComplete = true;
@@ -510,7 +510,7 @@ static sasl_callback_t callbacks[] = {
kdDebug(7112) << "requesting data" << endl;
mSMTP->dataReq();
- QByteArray ba;
+ TQByteArray ba;
int result = mSMTP->readData( ba );
kdDebug(7112) << "got " << result << " bytes" << endl;
if ( result > 0 )
@@ -541,8 +541,8 @@ static sasl_callback_t callbacks[] = {
return true;
}
- static QCString dotstuff_lf2crlf( const QByteArray & ba, char & last ) {
- QCString result( ba.size() * 2 + 1 ); // worst case: repeated "[.]\n"
+ static TQCString dotstuff_lf2crlf( const TQByteArray & ba, char & last ) {
+ TQCString result( ba.size() * 2 + 1 ); // worst case: repeated "[.]\n"
const char * s = ba.data();
const char * const send = ba.data() + ba.size();
char * d = result.data();
@@ -560,7 +560,7 @@ static sasl_callback_t callbacks[] = {
return result;
}
- QCString TransferCommand::prepare( const QByteArray & ba ) {
+ TQCString TransferCommand::prepare( const TQByteArray & ba ) {
if ( ba.isEmpty() )
return 0;
if ( mSMTP->metaData("lf2crlf+dotstuff") == "slave" ) {
@@ -568,7 +568,7 @@ static sasl_callback_t callbacks[] = {
return dotstuff_lf2crlf( ba, mLastChar );
} else {
mLastChar = ba[ ba.size() - 1 ];
- return QCString( ba.data(), ba.size() + 1 );
+ return TQCString( ba.data(), ba.size() + 1 );
}
}
@@ -576,7 +576,7 @@ static sasl_callback_t callbacks[] = {
// NOOP
//
- QCString NoopCommand::nextCommandLine( TransactionState * ) {
+ TQCString NoopCommand::nextCommandLine( TransactionState * ) {
mComplete = true;
mNeedResponse = true;
return "NOOP\r\n";
@@ -586,7 +586,7 @@ static sasl_callback_t callbacks[] = {
// RSET
//
- QCString RsetCommand::nextCommandLine( TransactionState * ) {
+ TQCString RsetCommand::nextCommandLine( TransactionState * ) {
mComplete = true;
mNeedResponse = true;
return "RSET\r\n";
@@ -596,7 +596,7 @@ static sasl_callback_t callbacks[] = {
// QUIT
//
- QCString QuitCommand::nextCommandLine( TransactionState * ) {
+ TQCString QuitCommand::nextCommandLine( TransactionState * ) {
mComplete = true;
mNeedResponse = true;
return "QUIT\r\n";
diff --git a/kioslave/smtp/command.h b/kioslave/smtp/command.h
index e67f02556..bd6b6aa85 100644
--- a/kioslave/smtp/command.h
+++ b/kioslave/smtp/command.h
@@ -33,8 +33,8 @@
#define __KIOSMTP_COMMAND_H__
-#include <qstring.h>
-#include <qcstring.h>
+#include <tqstring.h>
+#include <tqcstring.h>
#ifdef HAVE_LIBSASL2
extern "C" {
@@ -101,11 +101,11 @@ namespace KioSMTP {
static Command * createSimpleCommand( int which, SMTPProtocol * smtp );
- virtual QCString nextCommandLine( TransactionState * ts=0 ) = 0;
+ virtual TQCString nextCommandLine( TransactionState * ts=0 ) = 0;
/* Reimplement this if your @ref #nextCommandLine() implementation
changes state other than @ref mComplete. The default
implementation just resets @ref mComplete to false. */
- virtual void ungetCommandLine( const QCString & cmdLine, TransactionState * ts=0 );
+ virtual void ungetCommandLine( const TQCString & cmdLine, TransactionState * ts=0 );
/* Reimplement this if your command need more sophisicated
response processing than just checking for @ref
Response::isOk(). The default implementation sets @ref
@@ -152,16 +152,16 @@ namespace KioSMTP {
class EHLOCommand : public Command {
public:
- EHLOCommand( SMTPProtocol * smtp, const QString & hostname )
+ EHLOCommand( SMTPProtocol * smtp, const TQString & hostname )
: Command( smtp, CloseConnectionOnError|OnlyLastInPipeline ),
mEHLONotSupported( false ),
mHostname( hostname.stripWhiteSpace() ) {}
- QCString nextCommandLine( TransactionState * );
+ TQCString nextCommandLine( TransactionState * );
bool processResponse( const Response & response, TransactionState * );
private:
bool mEHLONotSupported;
- QString mHostname;
+ TQString mHostname;
};
class StartTLSCommand : public Command {
@@ -169,18 +169,18 @@ namespace KioSMTP {
StartTLSCommand( SMTPProtocol * smtp )
: Command( smtp, CloseConnectionOnError|OnlyLastInPipeline ) {}
- QCString nextCommandLine( TransactionState * );
+ TQCString nextCommandLine( TransactionState * );
bool processResponse( const Response & response, TransactionState * );
};
class AuthCommand : public Command {
public:
AuthCommand( SMTPProtocol * smtp, const char *mechanisms,
- const QString &aFQDN, KIO::AuthInfo &ai );
+ const TQString &aFQDN, KIO::AuthInfo &ai );
~AuthCommand();
bool doNotExecute( const TransactionState * ts ) const;
- QCString nextCommandLine( TransactionState * );
- void ungetCommandLine( const QCString & cmdLine, TransactionState * );
+ TQCString nextCommandLine( TransactionState * );
+ void ungetCommandLine( const TQCString & cmdLine, TransactionState * );
bool processResponse( const Response & response, TransactionState * );
private:
bool saslInteract( void *in );
@@ -194,34 +194,34 @@ namespace KioSMTP {
bool mOneStep;
KIO::AuthInfo *mAi;
- QCString mLastChallenge;
- QCString mUngetSASLResponse;
+ TQCString mLastChallenge;
+ TQCString mUngetSASLResponse;
bool mFirstTime;
};
class MailFromCommand : public Command {
public:
- MailFromCommand( SMTPProtocol * smtp, const QCString & addr,
+ MailFromCommand( SMTPProtocol * smtp, const TQCString & addr,
bool eightBit=false, unsigned int size=0 )
: Command( smtp ), mAddr( addr ), m8Bit( eightBit ), mSize( size ) {}
- QCString nextCommandLine( TransactionState * );
+ TQCString nextCommandLine( TransactionState * );
bool processResponse( const Response & response, TransactionState * );
private:
- QCString mAddr;
+ TQCString mAddr;
bool m8Bit;
unsigned int mSize;
};
class RcptToCommand : public Command {
public:
- RcptToCommand( SMTPProtocol * smtp, const QCString & addr )
+ RcptToCommand( SMTPProtocol * smtp, const TQCString & addr )
: Command( smtp ), mAddr( addr ) {}
- QCString nextCommandLine( TransactionState * );
+ TQCString nextCommandLine( TransactionState * );
bool processResponse( const Response & response, TransactionState * );
private:
- QCString mAddr;
+ TQCString mAddr;
};
/** Handles only the initial intermediate response and compltetes at
@@ -231,25 +231,25 @@ namespace KioSMTP {
DataCommand( SMTPProtocol * smtp )
: Command( smtp, OnlyLastInPipeline ) {}
- QCString nextCommandLine( TransactionState * );
- void ungetCommandLine( const QCString & cmd, TransactionState * ts );
+ TQCString nextCommandLine( TransactionState * );
+ void ungetCommandLine( const TQCString & cmd, TransactionState * ts );
bool processResponse( const Response & response, TransactionState * );
};
/** Handles the data transfer following a successful DATA command */
class TransferCommand : public Command {
public:
- TransferCommand( SMTPProtocol * smtp, const QCString & initialBuffer )
+ TransferCommand( SMTPProtocol * smtp, const TQCString & initialBuffer )
: Command( smtp, OnlyFirstInPipeline ),
mUngetBuffer( initialBuffer ), mLastChar( '\n' ), mWasComplete( false ) {}
bool doNotExecute( const TransactionState * ts ) const;
- QCString nextCommandLine( TransactionState * );
- void ungetCommandLine( const QCString & cmd, TransactionState * ts );
+ TQCString nextCommandLine( TransactionState * );
+ void ungetCommandLine( const TQCString & cmd, TransactionState * ts );
bool processResponse( const Response & response, TransactionState * );
private:
- QCString prepare( const QByteArray & ba );
- QCString mUngetBuffer;
+ TQCString prepare( const TQByteArray & ba );
+ TQCString mUngetBuffer;
char mLastChar;
bool mWasComplete; // ... before ungetting
};
@@ -259,7 +259,7 @@ namespace KioSMTP {
NoopCommand( SMTPProtocol * smtp )
: Command( smtp, OnlyLastInPipeline ) {}
- QCString nextCommandLine( TransactionState * );
+ TQCString nextCommandLine( TransactionState * );
};
class RsetCommand : public Command {
@@ -267,7 +267,7 @@ namespace KioSMTP {
RsetCommand( SMTPProtocol * smtp )
: Command( smtp, CloseConnectionOnError ) {}
- QCString nextCommandLine( TransactionState * );
+ TQCString nextCommandLine( TransactionState * );
};
class QuitCommand : public Command {
@@ -275,7 +275,7 @@ namespace KioSMTP {
QuitCommand( SMTPProtocol * smtp )
: Command( smtp, CloseConnectionOnError|OnlyLastInPipeline ) {}
- QCString nextCommandLine( TransactionState * );
+ TQCString nextCommandLine( TransactionState * );
};
} // namespace KioSMTP
diff --git a/kioslave/smtp/interactivesmtpserver.cc b/kioslave/smtp/interactivesmtpserver.cc
index 4deddd3ca..50cd6f036 100644
--- a/kioslave/smtp/interactivesmtpserver.cc
+++ b/kioslave/smtp/interactivesmtpserver.cc
@@ -33,30 +33,30 @@
#include <config.h>
-#include <qserversocket.h>
-#include <qsocket.h>
-#include <qwidget.h>
-#include <qapplication.h>
-#include <qhostaddress.h>
-#include <qtextedit.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qstring.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <tqserversocket.h>
+#include <tqsocket.h>
+#include <tqwidget.h>
+#include <tqapplication.h>
+#include <tqhostaddress.h>
+#include <tqtextedit.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqstring.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
#include <cassert>
#include "interactivesmtpserver.h"
-static const QHostAddress localhost( 0x7f000001 ); // 127.0.0.1
+static const TQHostAddress localhost( 0x7f000001 ); // 127.0.0.1
InteractiveSMTPServerWindow::~InteractiveSMTPServerWindow() {
if ( mSocket ) {
mSocket->close();
- if ( mSocket->state() == QSocket::Closing )
- connect( mSocket, SIGNAL(delayedCloseFinished()),
- mSocket, SLOT(deleteLater()) );
+ if ( mSocket->state() == TQSocket::Closing )
+ connect( mSocket, TQT_SIGNAL(delayedCloseFinished()),
+ mSocket, TQT_SLOT(deleteLater()) );
else
mSocket->deleteLater();
mSocket = 0;
@@ -65,20 +65,20 @@ InteractiveSMTPServerWindow::~InteractiveSMTPServerWindow() {
void InteractiveSMTPServerWindow::slotSendResponse()
{
- const QString line = mLineEdit->text();
+ const TQString line = mLineEdit->text();
mLineEdit->clear();
- QTextStream s( mSocket );
+ TQTextStream s( mSocket );
s << line + "\r\n";
slotDisplayServer( line );
}
-InteractiveSMTPServer::InteractiveSMTPServer( QObject* parent )
- : QServerSocket( localhost, 2525, 1, parent )
+InteractiveSMTPServer::InteractiveSMTPServer( TQObject* parent )
+ : TQServerSocket( localhost, 2525, 1, parent )
{
}
int main( int argc, char * argv[] ) {
- QApplication app( argc, argv );
+ TQApplication app( argc, argv );
InteractiveSMTPServer server;
@@ -88,37 +88,37 @@ int main( int argc, char * argv[] ) {
};
-InteractiveSMTPServerWindow::InteractiveSMTPServerWindow( QSocket * socket, QWidget * parent, const char * name, WFlags f )
- : QWidget( parent, name, f ), mSocket( socket )
+InteractiveSMTPServerWindow::InteractiveSMTPServerWindow( TQSocket * socket, TQWidget * parent, const char * name, WFlags f )
+ : TQWidget( parent, name, f ), mSocket( socket )
{
- QPushButton * but;
+ TQPushButton * but;
assert( socket );
- QVBoxLayout * vlay = new QVBoxLayout( this, 6 );
+ TQVBoxLayout * vlay = new TQVBoxLayout( this, 6 );
- mTextEdit = new QTextEdit( this );
- mTextEdit->setTextFormat( QTextEdit::LogText );
+ mTextEdit = new TQTextEdit( this );
+ mTextEdit->setTextFormat( TQTextEdit::LogText );
vlay->addWidget( mTextEdit, 1 );
- QHBoxLayout * hlay = new QHBoxLayout( vlay );
+ TQHBoxLayout * hlay = new TQHBoxLayout( vlay );
- mLineEdit = new QLineEdit( this );
- but = new QPushButton( "&Send", this );
- hlay->addWidget( new QLabel( mLineEdit, "&Response:", this ) );
+ mLineEdit = new TQLineEdit( this );
+ but = new TQPushButton( "&Send", this );
+ hlay->addWidget( new TQLabel( mLineEdit, "&Response:", this ) );
hlay->addWidget( mLineEdit, 1 );
hlay->addWidget( but );
- connect( mLineEdit, SIGNAL(returnPressed()), SLOT(slotSendResponse()) );
- connect( but, SIGNAL(clicked()), SLOT(slotSendResponse()) );
+ connect( mLineEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotSendResponse()) );
+ connect( but, TQT_SIGNAL(clicked()), TQT_SLOT(slotSendResponse()) );
- but = new QPushButton( "&Close Connection", this );
+ but = new TQPushButton( "&Close Connection", this );
vlay->addWidget( but );
- connect( but, SIGNAL(clicked()), SLOT(slotConnectionClosed()) );
+ connect( but, TQT_SIGNAL(clicked()), TQT_SLOT(slotConnectionClosed()) );
- connect( socket, SIGNAL(connectionClosed()), SLOT(slotConnectionClosed()) );
- connect( socket, SIGNAL(error(int)), SLOT(slotError(int)) );
- connect( socket, SIGNAL(readyRead()), SLOT(slotReadyRead()) );
+ connect( socket, TQT_SIGNAL(connectionClosed()), TQT_SLOT(slotConnectionClosed()) );
+ connect( socket, TQT_SIGNAL(error(int)), TQT_SLOT(slotError(int)) );
+ connect( socket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotReadyRead()) );
mLineEdit->setText( "220 hi there" );
mLineEdit->setFocus();
diff --git a/kioslave/smtp/interactivesmtpserver.h b/kioslave/smtp/interactivesmtpserver.h
index 3ae210a74..39a07f6a9 100644
--- a/kioslave/smtp/interactivesmtpserver.h
+++ b/kioslave/smtp/interactivesmtpserver.h
@@ -34,20 +34,20 @@
your version.
*/
-#include <qwidget.h>
+#include <tqwidget.h>
-static QString err2str( int err ) {
+static TQString err2str( int err ) {
switch ( err ) {
- case QSocket::ErrConnectionRefused: return "Connection refused";
- case QSocket::ErrHostNotFound: return "Host not found";
- case QSocket::ErrSocketRead: return "Failed to read from socket";
+ case TQSocket::ErrConnectionRefused: return "Connection refused";
+ case TQSocket::ErrHostNotFound: return "Host not found";
+ case TQSocket::ErrSocketRead: return "Failed to read from socket";
default: return "Unknown error";
}
}
-static QString escape( QString s ) {
+static TQString escape( TQString s ) {
return s
.replace( '&', "&amp;" )
.replace( '>', "&gt;" )
@@ -57,7 +57,7 @@ static QString escape( QString s ) {
}
-static QString trim( const QString & s ) {
+static TQString trim( const TQString & s ) {
if ( s.endsWith( "\r\n" ) )
return s.left( s.length() - 2 );
if ( s.endsWith( "\r" ) || s.endsWith( "\n" ) )
@@ -66,21 +66,21 @@ static QString trim( const QString & s ) {
}
-class InteractiveSMTPServerWindow : public QWidget {
+class InteractiveSMTPServerWindow : public TQWidget {
Q_OBJECT
public:
- InteractiveSMTPServerWindow( QSocket * socket, QWidget * parent=0, const char * name=0, WFlags f=0 );
+ InteractiveSMTPServerWindow( TQSocket * socket, TQWidget * parent=0, const char * name=0, WFlags f=0 );
~InteractiveSMTPServerWindow();
public slots:
void slotSendResponse();
- void slotDisplayClient( const QString & s ) {
+ void slotDisplayClient( const TQString & s ) {
mTextEdit->append( "C:" + escape(s) );
}
- void slotDisplayServer( const QString & s ) {
+ void slotDisplayServer( const TQString & s ) {
mTextEdit->append( "S:" + escape(s) );
}
- void slotDisplayMeta( const QString & s ) {
+ void slotDisplayMeta( const TQString & s ) {
mTextEdit->append( "<font color=\"red\">" + escape(s) + "</font>" );
}
void slotReadyRead() {
@@ -88,7 +88,7 @@ public slots:
slotDisplayClient( trim( mSocket->readLine() ) );
}
void slotError( int err ) {
- slotDisplayMeta( QString( "E: %1 (%2)" ).arg( err2str( err ) ).arg( err ) );
+ slotDisplayMeta( TQString( "E: %1 (%2)" ).arg( err2str( err ) ).arg( err ) );
}
void slotConnectionClosed() {
slotDisplayMeta( "Connection closed by peer" );
@@ -97,20 +97,20 @@ public slots:
mSocket->close();
}
private:
- QSocket * mSocket;
- QTextEdit * mTextEdit;
- QLineEdit * mLineEdit;
+ TQSocket * mSocket;
+ TQTextEdit * mTextEdit;
+ TQLineEdit * mLineEdit;
};
-class InteractiveSMTPServer : public QServerSocket {
+class InteractiveSMTPServer : public TQServerSocket {
Q_OBJECT
public:
- InteractiveSMTPServer( QObject * parent=0 );
+ InteractiveSMTPServer( TQObject * parent=0 );
~InteractiveSMTPServer() {}
/*! \reimp */
void newConnection( int fd ) {
- QSocket * socket = new QSocket();
+ TQSocket * socket = new TQSocket();
socket->setSocket( fd );
InteractiveSMTPServerWindow * w = new InteractiveSMTPServerWindow( socket );
w->show();
diff --git a/kioslave/smtp/request.cc b/kioslave/smtp/request.cc
index 566d2c758..ab02abc1c 100644
--- a/kioslave/smtp/request.cc
+++ b/kioslave/smtp/request.cc
@@ -45,17 +45,17 @@ namespace KioSMTP {
Request Request::fromURL( const KURL & url ) {
Request request;
- const QStringList query = QStringList::split( '&', url.query().mid(1) );
+ const TQStringList query = TQStringList::split( '&', url.query().mid(1) );
#ifndef NDEBUG
kdDebug(7112) << "Parsing request from query:\n" + query.join("\n" ) << endl;
#endif
- for ( QStringList::const_iterator it = query.begin() ; it != query.end() ; ++it ) {
+ for ( TQStringList::const_iterator it = query.begin() ; it != query.end() ; ++it ) {
int equalsPos = (*it).find( '=' );
if ( equalsPos <= 0 )
continue;
- const QString key = (*it).left( equalsPos ).lower();
- const QString value = KURL::decode_string( (*it).mid( equalsPos + 1 ) );
+ const TQString key = (*it).left( equalsPos ).lower();
+ const TQString value = KURL::decode_string( (*it).mid( equalsPos + 1 ) );
if ( key == "to" )
request.addTo( value );
@@ -87,11 +87,11 @@ namespace KioSMTP {
return request;
}
- QCString Request::heloHostnameCString() const {
+ TQCString Request::heloHostnameCString() const {
return KIDNA::toAsciiCString( heloHostname() );
}
- static bool isUsAscii( const QString & s ) {
+ static bool isUsAscii( const TQString & s ) {
for ( uint i = 0 ; i < s.length() ; ++i )
if ( s[i].unicode() > 127 ) return false;
return true;
@@ -100,7 +100,7 @@ namespace KioSMTP {
static inline bool isSpecial( char ch ) {
- static const QCString specials = "()<>[]:;@\\,.\"";
+ static const TQCString specials = "()<>[]:;@\\,.\"";
return specials.find( ch ) >= 0;
}
@@ -112,17 +112,17 @@ namespace KioSMTP {
- static inline QCString rfc2047Encode( const QString & s ) {
- QCString r = KCodecs::base64Encode( s.stripWhiteSpace().utf8(), false );
+ static inline TQCString rfc2047Encode( const TQString & s ) {
+ TQCString r = KCodecs::base64Encode( s.stripWhiteSpace().utf8(), false );
return "=?utf-8?b?" + r + "?=" ; // use base64 since that always gives a valid encoded-word
}
- static QCString quote( const QString & s ) {
+ static TQCString quote( const TQString & s ) {
assert( isUsAscii( s ) );
- QCString r( s.length() * 2 );
+ TQCString r( s.length() * 2 );
bool needsQuotes = false;
unsigned int j = 0;
@@ -145,19 +145,19 @@ namespace KioSMTP {
- static QCString formatFromAddress( const QString & fromRealName, const QString & fromAddress ) {
+ static TQCString formatFromAddress( const TQString & fromRealName, const TQString & fromAddress ) {
if ( fromRealName.isEmpty() )
return fromAddress.latin1(); // no real name: return "joe@user.org"
// return "Joe User <joe@user.org>", "\"User, Joe\" <joe@user.org>"
// or "=?utf-8?q?Joe_User?= <joe@user.org>", depending on real name's nature.
- QCString r = isUsAscii( fromRealName ) ? quote( fromRealName ) : rfc2047Encode( fromRealName );
+ TQCString r = isUsAscii( fromRealName ) ? quote( fromRealName ) : rfc2047Encode( fromRealName );
return r + " <" + fromAddress.latin1() + '>';
}
- static QCString formatSubject( QString s ) {
+ static TQCString formatSubject( TQString s ) {
if ( isUsAscii( s ) )
return s.remove( '\n' ).latin1(); // don't break header folding,
// so remove any line break
@@ -168,21 +168,21 @@ namespace KioSMTP {
- QCString Request::headerFields( const QString & fromRealName ) const {
+ TQCString Request::headerFields( const TQString & fromRealName ) const {
if ( !emitHeaders() )
return 0;
assert( hasFromAddress() ); // should have been checked for by
// caller (MAIL FROM comes before DATA)
- QCString result = "From: " + formatFromAddress( fromRealName, fromAddress() ) + "\r\n";
+ TQCString result = "From: " + formatFromAddress( fromRealName, fromAddress() ) + "\r\n";
if ( !subject().isEmpty() )
result += "Subject: " + formatSubject( subject() ) + "\r\n";
if ( !to().empty() )
- result += QCString( "To: " ) + to().join( ",\r\n\t" /* line folding */ ).latin1() + "\r\n";
+ result += TQCString( "To: " ) + to().join( ",\r\n\t" /* line folding */ ).latin1() + "\r\n";
if ( !cc().empty() )
- result += QCString( "Cc: " ) + cc().join( ",\r\n\t" /* line folding */ ).latin1() + "\r\n";
+ result += TQCString( "Cc: " ) + cc().join( ",\r\n\t" /* line folding */ ).latin1() + "\r\n";
return result;
}
diff --git a/kioslave/smtp/request.h b/kioslave/smtp/request.h
index 15bbd76b9..e1b3acda8 100644
--- a/kioslave/smtp/request.h
+++ b/kioslave/smtp/request.h
@@ -32,8 +32,8 @@
#ifndef __KIOSMTP_REQUEST_H__
#define __KIOSMTP_REQUEST_H__
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
class KURL;
@@ -47,30 +47,30 @@ namespace KioSMTP {
static Request fromURL( const KURL & url );
- QString profileName() const { return mProfileName; }
- void setProfileName( const QString & profileName ) { mProfileName = profileName; }
+ TQString profileName() const { return mProfileName; }
+ void setProfileName( const TQString & profileName ) { mProfileName = profileName; }
bool hasProfile() const { return !profileName().isNull(); }
- QString subject() const { return mSubject; }
- void setSubject( const QString & subject ) { mSubject = subject; }
+ TQString subject() const { return mSubject; }
+ void setSubject( const TQString & subject ) { mSubject = subject; }
- QString fromAddress() const { return mFromAddress; }
- void setFromAddress( const QString & fromAddress ) { mFromAddress = fromAddress; }
+ TQString fromAddress() const { return mFromAddress; }
+ void setFromAddress( const TQString & fromAddress ) { mFromAddress = fromAddress; }
bool hasFromAddress() const { return !mFromAddress.isEmpty(); }
- QStringList recipients() const { return to() + cc() + bcc() ; }
+ TQStringList recipients() const { return to() + cc() + bcc() ; }
bool hasRecipients() const { return !to().empty() || !cc().empty() || !bcc().empty() ; }
- QStringList to() const { return mTo; }
- QStringList cc() const { return mCc; }
- QStringList bcc() const { return mBcc; }
- void addTo( const QString & to ) { mTo.push_back( to ); }
- void addCc( const QString & cc ) { mCc.push_back( cc ); }
- void addBcc( const QString & bcc ) { mBcc.push_back( bcc ); }
+ TQStringList to() const { return mTo; }
+ TQStringList cc() const { return mCc; }
+ TQStringList bcc() const { return mBcc; }
+ void addTo( const TQString & to ) { mTo.push_back( to ); }
+ void addCc( const TQString & cc ) { mCc.push_back( cc ); }
+ void addBcc( const TQString & bcc ) { mBcc.push_back( bcc ); }
- QString heloHostname() const { return mHeloHostname; }
- QCString heloHostnameCString() const;
- void setHeloHostname( const QString & hostname ) { mHeloHostname = hostname; }
+ TQString heloHostname() const { return mHeloHostname; }
+ TQCString heloHostnameCString() const;
+ void setHeloHostname( const TQString & hostname ) { mHeloHostname = hostname; }
bool emitHeaders() const { return mEmitHeaders; }
void setEmitHeaders( bool emitHeaders ) { mEmitHeaders = emitHeaders; }
@@ -85,11 +85,11 @@ namespace KioSMTP {
serialization of the header fields "To", "Cc", "Subject" and
"From", as determined by the respective settings. If @ref
#emitHeaders() is false, returns a null string. */
- QCString headerFields( const QString & fromRealName=QString::null ) const;
+ TQCString headerFields( const TQString & fromRealName=TQString::null ) const;
private:
- QStringList mTo, mCc, mBcc;
- QString mProfileName, mSubject, mFromAddress, mHeloHostname;
+ TQStringList mTo, mCc, mBcc;
+ TQString mProfileName, mSubject, mFromAddress, mHeloHostname;
bool mEmitHeaders;
bool m8Bit;
unsigned int mSize;
diff --git a/kioslave/smtp/response.cc b/kioslave/smtp/response.cc
index b1745865a..ec5067871 100644
--- a/kioslave/smtp/response.cc
+++ b/kioslave/smtp/response.cc
@@ -36,7 +36,7 @@
#include <klocale.h>
#include <kio/global.h>
-#include <qstring.h>
+#include <tqstring.h>
namespace KioSMTP {
@@ -59,7 +59,7 @@ namespace KioSMTP {
}
bool ok = false;
- unsigned int code = QCString( line, 3+1 ).toUInt( &ok );
+ unsigned int code = TQCString( line, 3+1 ).toUInt( &ok );
if ( !ok || code < 100 || code > 559 ) {
// not a number or number out of range
mValid = false;
@@ -85,22 +85,22 @@ namespace KioSMTP {
return;
}
- mLines.push_back( len > 4 ? QCString( line+4, len-4+1 ).stripWhiteSpace() : QCString() );
+ mLines.push_back( len > 4 ? TQCString( line+4, len-4+1 ).stripWhiteSpace() : TQCString() );
}
// hackishly fixing QCStringList flaws...
- static QCString join( char sep, const QCStringList & list ) {
+ static TQCString join( char sep, const QCStringList & list ) {
if ( list.empty() )
- return QCString();
- QCString result = list.front();
+ return TQCString();
+ TQCString result = list.front();
for ( QCStringList::const_iterator it = ++list.begin() ; it != list.end() ; ++it )
result += sep + *it;
return result;
}
- QString Response::errorMessage() const {
- QString msg;
+ TQString Response::errorMessage() const {
+ TQString msg;
if ( lines().count() > 1 )
msg = i18n("The server responded:\n%1")
.arg( join( '\n', lines() ) );
diff --git a/kioslave/smtp/response.h b/kioslave/smtp/response.h
index 22835690a..1e5f722ab 100644
--- a/kioslave/smtp/response.h
+++ b/kioslave/smtp/response.h
@@ -32,9 +32,9 @@
#ifndef __KIOSMTP_RESPONSE_H__
#define __KIOSMTP_RESPONSE_H__
-#include <qcstring.h>
-#include <qvaluelist.h>
-typedef QValueList<QCString> QCStringList;
+#include <tqcstring.h>
+#include <tqvaluelist.h>
+typedef TQValueList<TQCString> QCStringList;
class QString;
@@ -55,7 +55,7 @@ namespace KioSMTP {
/** Return an internationalized error message according to the
response's code. */
- QString errorMessage() const;
+ TQString errorMessage() const;
/** Translate the SMTP error code into a KIO one */
int errorCode() const;
diff --git a/kioslave/smtp/smtp.cc b/kioslave/smtp/smtp.cc
index dc621f533..e493f5132 100644
--- a/kioslave/smtp/smtp.cc
+++ b/kioslave/smtp/smtp.cc
@@ -61,9 +61,9 @@ using KioSMTP::TransactionState;
#include <kio/slaveinterface.h>
#include <klocale.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qcstring.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqcstring.h>
#include <memory>
using std::auto_ptr;
@@ -117,7 +117,7 @@ int kdemain(int argc, char **argv)
return 0;
}
-SMTPProtocol::SMTPProtocol(const QCString & pool, const QCString & app,
+SMTPProtocol::SMTPProtocol(const TQCString & pool, const TQCString & app,
bool useSSL)
: TCPSlaveBase(useSSL ? 465 : 25,
useSSL ? "smtps" : "smtp",
@@ -157,8 +157,8 @@ void SMTPProtocol::closeConnection() {
smtp_close();
}
-void SMTPProtocol::special( const QByteArray & aData ) {
- QDataStream s( aData, IO_ReadOnly );
+void SMTPProtocol::special( const TQByteArray & aData ) {
+ TQDataStream s( aData, IO_ReadOnly );
int what;
s >> what;
if ( what == 'c' ) {
@@ -208,9 +208,9 @@ void SMTPProtocol::put(const KURL & url, int /*permissions */ ,
m_sPass = mset.getSetting(KEMailSettings::OutServerPass);
if (m_sUser.isEmpty())
- m_sUser = QString::null;
+ m_sUser = TQString::null;
if (m_sPass.isEmpty())
- m_sPass = QString::null;
+ m_sPass = TQString::null;
open_url.setUser(m_sUser);
open_url.setPass(m_sPass);
m_sServer = open_url.host();
@@ -229,7 +229,7 @@ void SMTPProtocol::put(const KURL & url, int /*permissions */ ,
// and then format accordingly (either: emailaddress@host.com or
// Real Name <emailaddress@host.com>)
if ( !request.hasFromAddress() ) {
- const QString from = mset.getSetting( KEMailSettings::EmailAddress );
+ const TQString from = mset.getSetting( KEMailSettings::EmailAddress );
if ( !from.isNull() )
request.setFromAddress( from );
else if ( request.emitHeaders() ) {
@@ -259,8 +259,8 @@ void SMTPProtocol::put(const KURL & url, int /*permissions */ ,
// Loop through our To and CC recipients, and send the proper
// SMTP commands, for the benefit of the server.
- QStringList recipients = request.recipients();
- for ( QStringList::const_iterator it = recipients.begin() ; it != recipients.end() ; ++it )
+ TQStringList recipients = request.recipients();
+ for ( TQStringList::const_iterator it = recipients.begin() ; it != recipients.end() ; ++it )
queueCommand( new RcptToCommand( this, (*it).latin1() ) );
queueCommand( Command::DATA );
@@ -275,8 +275,8 @@ void SMTPProtocol::put(const KURL & url, int /*permissions */ ,
}
-void SMTPProtocol::setHost(const QString & host, int port,
- const QString & user, const QString & pass)
+void SMTPProtocol::setHost(const TQString & host, int port,
+ const TQString & user, const TQString & pass)
{
m_sServer = host;
m_iPort = port;
@@ -284,7 +284,7 @@ void SMTPProtocol::setHost(const QString & host, int port,
m_sPass = pass;
}
-bool SMTPProtocol::sendCommandLine( const QCString & cmdline ) {
+bool SMTPProtocol::sendCommandLine( const TQCString & cmdline ) {
//kdDebug( cmdline.length() < 4096, 7112) << "C: " << cmdline.data();
//kdDebug( cmdline.length() >= 4096, 7112) << "C: <" << cmdline.length() << " bytes>" << endl;
kdDebug( 7112) << "C: <" << cmdline.length() << " bytes>" << endl;
@@ -319,7 +319,7 @@ Response SMTPProtocol::getResponse( bool * ok ) {
return response;
}
- kdDebug(7112) << "S: " << QCString( buf, recv_len + 1 ).data();
+ kdDebug(7112) << "S: " << TQCString( buf, recv_len + 1 ).data();
// ...and parse lines...
response.parseLine( buf, recv_len );
@@ -344,7 +344,7 @@ bool SMTPProtocol::executeQueuedCommands( TransactionState * ts ) {
kdDebug( canPipelineCommands(), 7112 ) << "using pipelining" << endl;
while( !mPendingCommandQueue.isEmpty() ) {
- QCString cmdline = collectPipelineCommands( ts );
+ TQCString cmdline = collectPipelineCommands( ts );
if ( ts->failedFatally() ) {
smtp_close( false ); // _hard_ shutdown
return false;
@@ -369,10 +369,10 @@ bool SMTPProtocol::executeQueuedCommands( TransactionState * ts ) {
return true;
}
-QCString SMTPProtocol::collectPipelineCommands( TransactionState * ts ) {
+TQCString SMTPProtocol::collectPipelineCommands( TransactionState * ts ) {
assert( ts );
- QCString cmdLine;
+ TQCString cmdLine;
unsigned int cmdLine_len = 0;
while ( mPendingCommandQueue.head() ) {
@@ -394,7 +394,7 @@ QCString SMTPProtocol::collectPipelineCommands( TransactionState * ts ) {
break;
while ( !cmd->isComplete() && !cmd->needsResponse() ) {
- const QCString currentCmdLine = cmd->nextCommandLine( ts );
+ const TQCString currentCmdLine = cmd->nextCommandLine( ts );
if ( ts->failedFatally() )
return cmdLine;
const unsigned int currentCmdLine_len = currentCmdLine.length();
@@ -464,7 +464,7 @@ bool SMTPProtocol::execute( Command * cmd, TransactionState * ts )
do {
while ( !cmd->isComplete() && !cmd->needsResponse() ) {
- const QCString cmdLine = cmd->nextCommandLine( ts );
+ const TQCString cmdLine = cmd->nextCommandLine( ts );
if ( ts && ts->failedFatally() ) {
smtp_close( false );
return false;
@@ -495,7 +495,7 @@ bool SMTPProtocol::execute( Command * cmd, TransactionState * ts )
return true;
}
-bool SMTPProtocol::smtp_open(const QString& fakeHostname)
+bool SMTPProtocol::smtp_open(const TQString& fakeHostname)
{
if (m_opened &&
m_iOldPort == port(m_iPort) &&
@@ -527,7 +527,7 @@ bool SMTPProtocol::smtp_open(const QString& fakeHostname)
}
else
{
- QString tmpPort;
+ TQString tmpPort;
KSocketAddress* addr = KExtendedSocket::localAddress(m_iSock);
// perform name lookup. NI_NAMEREQD means: don't return a numeric
// value (we need to know when we get have the IP address, so we
@@ -592,7 +592,7 @@ bool SMTPProtocol::authenticate()
authInfo.password = m_sPass;
authInfo.prompt = i18n("Username and password for your SMTP account:");
- QStringList strList;
+ TQStringList strList;
if (!metaData("sasl").isEmpty())
strList.append(metaData("sasl").latin1());
@@ -609,7 +609,7 @@ bool SMTPProtocol::authenticate()
void SMTPProtocol::parseFeatures( const Response & ehloResponse ) {
mCapabilities = Capabilities::fromResponse( ehloResponse );
- QString category = usingTLS() ? "TLS" : usingSSL() ? "SSL" : "PLAIN" ;
+ TQString category = usingTLS() ? "TLS" : usingSSL() ? "SSL" : "PLAIN" ;
setMetaData( category + " AUTH METHODS", mCapabilities.authMethodMetaData() );
setMetaData( category + " CAPABILITIES", mCapabilities.asMetaDataString() );
#ifndef NDEBUG
@@ -628,9 +628,9 @@ void SMTPProtocol::smtp_close( bool nice ) {
execute( Command::QUIT );
kdDebug( 7112 ) << "closing connection" << endl;
closeDescriptor();
- m_sOldServer = QString::null;
- m_sOldUser = QString::null;
- m_sOldPass = QString::null;
+ m_sOldServer = TQString::null;
+ m_sOldUser = TQString::null;
+ m_sOldPass = TQString::null;
mCapabilities.clear();
mPendingCommandQueue.clear();
@@ -641,7 +641,7 @@ void SMTPProtocol::smtp_close( bool nice ) {
void SMTPProtocol::stat(const KURL & url)
{
- QString path = url.path();
+ TQString path = url.path();
error(KIO::ERR_DOES_NOT_EXIST, url.path());
}
diff --git a/kioslave/smtp/smtp.h b/kioslave/smtp/smtp.h
index 571375bd4..435fea8b1 100644
--- a/kioslave/smtp/smtp.h
+++ b/kioslave/smtp/smtp.h
@@ -33,13 +33,13 @@
#include "capabilities.h"
-#include <qstring.h>
-#include <qptrqueue.h>
+#include <tqstring.h>
+#include <tqptrqueue.h>
class KURL;
class QCString;
template <typename T> class QMemArray;
-typedef QMemArray<char> QByteArray;
+typedef TQMemArray<char> QByteArray;
namespace KioSMTP {
class Response;
@@ -50,13 +50,13 @@ namespace KioSMTP {
class SMTPProtocol : public KIO::TCPSlaveBase {
friend class KioSMTP::Command;
public:
- SMTPProtocol(const QCString & pool, const QCString & app, bool useSSL);
+ SMTPProtocol(const TQCString & pool, const TQCString & app, bool useSSL);
virtual ~ SMTPProtocol();
- virtual void setHost(const QString & host, int port,
- const QString & user, const QString & pass);
+ virtual void setHost(const TQString & host, int port,
+ const TQString & user, const TQString & pass);
- virtual void special(const QByteArray & aData);
+ virtual void special(const TQByteArray & aData);
virtual void put(const KURL & url, int permissions, bool overwrite,
bool resume);
virtual void stat(const KURL & url);
@@ -65,7 +65,7 @@ public:
protected:
- bool smtp_open(const QString& fakeHostname = QString::null);
+ bool smtp_open(const TQString& fakeHostname = TQString::null);
/** Closes the connection. If @p nice is true (default), then QUIT
is sent and it's reponse waited for. */
@@ -100,8 +100,8 @@ protected:
bool authenticate();
void parseFeatures( const KioSMTP::Response & ehloResponse );
- bool sendCommandLine( const QCString & cmd );
- QCString collectPipelineCommands( KioSMTP::TransactionState * ts );
+ bool sendCommandLine( const TQCString & cmd );
+ TQCString collectPipelineCommands( KioSMTP::TransactionState * ts );
bool batchProcessResponses( KioSMTP::TransactionState * ts );
/** This is a pure convenience wrapper around
@@ -120,7 +120,7 @@ protected:
/** This is a pure convenience wrapper around
@ref KioSMTP::Capabilities::createSpecialResponse */
- QString createSpecialResponse() const {
+ TQString createSpecialResponse() const {
return mCapabilities.createSpecialResponse( usingTLS() || haveCapability( "STARTTLS" ) );
}
@@ -131,14 +131,14 @@ protected:
unsigned short m_iOldPort;
bool m_opened;
- QString m_sServer, m_sOldServer;
- QString m_sUser, m_sOldUser;
- QString m_sPass, m_sOldPass;
- QString m_hostname;
+ TQString m_sServer, m_sOldServer;
+ TQString m_sUser, m_sOldUser;
+ TQString m_sPass, m_sOldPass;
+ TQString m_hostname;
KioSMTP::Capabilities mCapabilities;
- typedef QPtrQueue<KioSMTP::Command> CommandQueue;
+ typedef TQPtrQueue<KioSMTP::Command> CommandQueue;
CommandQueue mPendingCommandQueue;
CommandQueue mSentCommandQueue;
};
diff --git a/kioslave/smtp/test_commands.cc b/kioslave/smtp/test_commands.cc
index a6969490f..680514b10 100644
--- a/kioslave/smtp/test_commands.cc
+++ b/kioslave/smtp/test_commands.cc
@@ -1,9 +1,9 @@
#include <kio/global.h>
#include <kdebug.h>
-#include <qstring.h>
-#include <qcstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqcstring.h>
+#include <tqstringlist.h>
//#include <iostream>
//using std::cout;
@@ -25,19 +25,19 @@ public:
bool usesSSL;
bool usesTLS;
int lastErrorCode;
- QString lastErrorMessage;
+ TQString lastErrorMessage;
int lastMessageBoxCode;
- QString lastMessageBoxText;
- QByteArray nextData;
+ TQString lastMessageBoxText;
+ TQByteArray nextData;
int nextDataReturnCode;
- QStringList caps;
+ TQStringList caps;
KIO::MetaData metadata;
void clear() {
startTLSReturnCode = 1;
usesSSL = usesTLS = false;
lastErrorCode = lastMessageBoxCode = 0;
- lastErrorMessage = lastMessageBoxText = QString::null;
+ lastErrorMessage = lastMessageBoxText = TQString::null;
nextData.resize( 0 );
nextDataReturnCode = -1;
caps.clear();
@@ -56,17 +56,17 @@ public:
bool usingSSL() const { return usesSSL; }
bool usingTLS() const { return usesTLS; }
bool haveCapability( const char * cap ) const { return caps.contains( cap ); }
- void error( int id, const QString & msg ) {
+ void error( int id, const TQString & msg ) {
lastErrorCode = id;
lastErrorMessage = msg;
}
- void messageBox( int id, const QString & msg, const QString & ) {
+ void messageBox( int id, const TQString & msg, const TQString & ) {
lastMessageBoxCode = id;
lastMessageBoxText = msg;
}
void dataReq() { /* noop */ }
- int readData( QByteArray & ba ) { ba = nextData; return nextDataReturnCode; }
- QString metaData( const QString & key ) const { return metadata[key]; }
+ int readData( TQByteArray & ba ) { ba = nextData; return nextDataReturnCode; }
+ TQString metaData( const TQString & key ) const { return metadata[key]; }
};
@@ -236,7 +236,7 @@ int main( int, char** ) {
//
smtp.clear();
- QStrIList mechs;
+ TQStrIList mechs;
mechs.append( "PLAIN" );
smtp.metadata["sasl"] = "PLAIN";
AuthCommand auth( &smtp, mechs, "user", "pass" );
diff --git a/kioslave/smtp/test_headergeneration.cc b/kioslave/smtp/test_headergeneration.cc
index bdf8b251f..83d999c4a 100644
--- a/kioslave/smtp/test_headergeneration.cc
+++ b/kioslave/smtp/test_headergeneration.cc
@@ -6,7 +6,7 @@
//using std::endl;
int main( int , char ** ) {
- static QCString expected =
+ static TQCString expected =
"From: mutz@kde.org\r\n"
"Subject: missing subject\r\n"
"To: joe@user.org,\r\n"
@@ -57,7 +57,7 @@ int main( int , char ** ) {
"\n";
KioSMTP::Request request;
- QCString result;
+ TQCString result;
request.setEmitHeaders( true );
request.setFromAddress( "mutz@kde.org" );
diff --git a/kioslave/smtp/test_responseparser.cc b/kioslave/smtp/test_responseparser.cc
index 5daa2fb3b..e251aa291 100644
--- a/kioslave/smtp/test_responseparser.cc
+++ b/kioslave/smtp/test_responseparser.cc
@@ -1,10 +1,10 @@
#include "response.h"
#include <assert.h>
-static const QCString singleLineResponseCRLF = "250 OK\r\n";
-static const QCString singleLineResponse = "250 OK";
+static const TQCString singleLineResponseCRLF = "250 OK\r\n";
+static const TQCString singleLineResponse = "250 OK";
-static const QCString multiLineResponse[] = {
+static const TQCString multiLineResponse[] = {
"250-ktown.kde.org\r\n",
"250-STARTTLS\r\n",
"250-AUTH PLAIN DIGEST-MD5\r\n",
diff --git a/kioslave/smtp/transactionstate.cc b/kioslave/smtp/transactionstate.cc
index 3bf3c7614..67d61486a 100644
--- a/kioslave/smtp/transactionstate.cc
+++ b/kioslave/smtp/transactionstate.cc
@@ -36,17 +36,17 @@
#include <kio/global.h>
#include <klocale.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
namespace KioSMTP {
- void TransactionState::setFailedFatally( int code, const QString & msg ) {
+ void TransactionState::setFailedFatally( int code, const TQString & msg ) {
mFailed = mFailedFatally = true;
mErrorCode = code;
mErrorMessage = msg;
}
- void TransactionState::setMailFromFailed( const QString & addr, const Response & r ) {
+ void TransactionState::setMailFromFailed( const TQString & addr, const Response & r ) {
setFailed();
mErrorCode = KIO::ERR_NO_CONTENT;
if ( addr.isEmpty() )
@@ -86,17 +86,17 @@ namespace KioSMTP {
return KIO::ERR_INTERNAL;
}
- QString TransactionState::errorMessage() const {
+ TQString TransactionState::errorMessage() const {
if ( !failed() )
- return QString::null;
+ return TQString::null;
if ( !mErrorMessage.isEmpty() )
return mErrorMessage;
if ( haveRejectedRecipients() ) {
- QString msg = i18n("Message sending failed since the following recipients were rejected by the server:\n"
+ TQString msg = i18n("Message sending failed since the following recipients were rejected by the server:\n"
"%1");
- QStringList recip;
+ TQStringList recip;
for ( RejectedRecipientList::const_iterator it = mRejectedRecipients.begin() ;
it != mRejectedRecipients.end() ; ++it )
recip.push_back( (*it).recipient + " (" + (*it).reason + ')' );
diff --git a/kioslave/smtp/transactionstate.h b/kioslave/smtp/transactionstate.h
index 96376718e..d2f9ef797 100644
--- a/kioslave/smtp/transactionstate.h
+++ b/kioslave/smtp/transactionstate.h
@@ -34,8 +34,8 @@
#include "response.h"
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
namespace KioSMTP {
@@ -63,18 +63,18 @@ namespace KioSMTP {
class TransactionState {
public:
struct RecipientRejection {
- RecipientRejection( const QString & who=QString::null,
- const QString & why=QString::null )
+ RecipientRejection( const TQString & who=TQString::null,
+ const TQString & why=TQString::null )
: recipient( who ), reason( why ) {}
- QString recipient;
- QString reason;
+ TQString recipient;
+ TQString reason;
#ifdef KIOSMTP_COMPARATORS
bool operator==( const RecipientRejection & other ) const {
return recipient == other.recipient && reason == other.reason;
}
#endif
};
- typedef QValueList<RecipientRejection> RejectedRecipientList;
+ typedef TQValueList<RecipientRejection> RejectedRecipientList;
TransactionState( bool rcptToDenyIsFailure=true )
: mErrorCode( 0 ),
@@ -96,7 +96,7 @@ namespace KioSMTP {
untidy connection shutdown is in order (ie. @ref
smtp_close(false)). Fatal failure is handled immediately */
bool failedFatally() const { return mFailedFatally; }
- void setFailedFatally( int code=0, const QString & msg=QString::null );
+ void setFailedFatally( int code=0, const TQString & msg=TQString::null );
/** @return whether the transaction was completed successfully */
bool complete() const { return mComplete; }
@@ -106,10 +106,10 @@ namespace KioSMTP {
failed, or 0 otherwise */
int errorCode() const;
/** @return an appropriate error message in case the transaction
- failed or QString::null otherwise */
- QString errorMessage() const;
+ failed or TQString::null otherwise */
+ TQString errorMessage() const;
- void setMailFromFailed( const QString & addr, const Response & r );
+ void setMailFromFailed( const TQString & addr, const Response & r );
bool dataCommandIssued() const { return mDataCommandIssued; }
void setDataCommandIssued( bool issued ) { mDataCommandIssued = issued; }
@@ -137,7 +137,7 @@ namespace KioSMTP {
return mRejectedRecipients;
}
void addRejectedRecipient( const RecipientRejection & r );
- void addRejectedRecipient( const QString & who, const QString & why ) {
+ void addRejectedRecipient( const TQString & who, const TQString & why ) {
addRejectedRecipient( RecipientRejection( who, why ) );
}
@@ -169,7 +169,7 @@ namespace KioSMTP {
private:
RejectedRecipientList mRejectedRecipients;
Response mDataResponse;
- QString mErrorMessage;
+ TQString mErrorMessage;
int mErrorCode;
bool mRcptToDenyIsFailure;
bool mAtLeastOneRecipientWasAccepted;
diff --git a/kioslave/system/kdedmodule/systemdirnotify.cpp b/kioslave/system/kdedmodule/systemdirnotify.cpp
index e0ec57992..162d96621 100644
--- a/kioslave/system/kdedmodule/systemdirnotify.cpp
+++ b/kioslave/system/kdedmodule/systemdirnotify.cpp
@@ -26,7 +26,7 @@
#include <kdirnotify_stub.h>
-#include <qdir.h>
+#include <tqdir.h>
SystemDirNotify::SystemDirNotify()
: mInited( false )
@@ -41,21 +41,21 @@ void SystemDirNotify::init()
KGlobal::dirs()->addResourceType("system_entries",
KStandardDirs::kde_default("data") + "systemview");
- QStringList names_found;
- QStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
+ TQStringList names_found;
+ TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
- QStringList::ConstIterator dirpath = dirList.begin();
- QStringList::ConstIterator end = dirList.end();
+ TQStringList::ConstIterator dirpath = dirList.begin();
+ TQStringList::ConstIterator end = dirList.end();
for(; dirpath!=end; ++dirpath)
{
- QDir dir = *dirpath;
+ TQDir dir = *dirpath;
if (!dir.exists()) continue;
- QStringList filenames
- = dir.entryList( QDir::Files | QDir::Readable );
+ TQStringList filenames
+ = dir.entryList( TQDir::Files | TQDir::Readable );
- QStringList::ConstIterator name = filenames.begin();
- QStringList::ConstIterator endf = filenames.end();
+ TQStringList::ConstIterator name = filenames.begin();
+ TQStringList::ConstIterator endf = filenames.end();
for(; name!=endf; ++name)
{
@@ -63,7 +63,7 @@ void SystemDirNotify::init()
{
KDesktopFile desktop(*dirpath+*name, true);
- QString system_name = *name;
+ TQString system_name = *name;
system_name.truncate(system_name.length()-8);
KURL system_url("system:/"+system_name);
@@ -90,8 +90,8 @@ KURL SystemDirNotify::toSystemURL(const KURL &url)
kdDebug() << "SystemDirNotify::toSystemURL(" << url << ")" << endl;
init();
- QMap<KURL,KURL>::const_iterator it = m_urlMap.begin();
- QMap<KURL,KURL>::const_iterator end = m_urlMap.end();
+ TQMap<KURL,KURL>::const_iterator it = m_urlMap.begin();
+ TQMap<KURL,KURL>::const_iterator end = m_urlMap.end();
for (; it!=end; ++it)
{
@@ -99,7 +99,7 @@ KURL SystemDirNotify::toSystemURL(const KURL &url)
if ( base.isParentOf(url) )
{
- QString path = KURL::relativePath(base.path(),
+ TQString path = KURL::relativePath(base.path(),
url.path());
KURL result = it.data();
result.addPath(path);
diff --git a/kioslave/system/kdedmodule/systemdirnotify.h b/kioslave/system/kdedmodule/systemdirnotify.h
index 34da65b82..b743ddb42 100644
--- a/kioslave/system/kdedmodule/systemdirnotify.h
+++ b/kioslave/system/kdedmodule/systemdirnotify.h
@@ -21,7 +21,7 @@
#include <kurl.h>
#include <kdirnotify.h>
-#include <qmap.h>
+#include <tqmap.h>
class SystemDirNotify : public KDirNotify
{
@@ -40,7 +40,7 @@ private:
KURL toSystemURL(const KURL &url);
KURL::List toSystemURLList(const KURL::List &list);
- QMap<KURL,KURL> m_urlMap;
+ TQMap<KURL,KURL> m_urlMap;
bool mInited;
};
diff --git a/kioslave/system/kdedmodule/systemdirnotifymodule.cpp b/kioslave/system/kdedmodule/systemdirnotifymodule.cpp
index 36c46fcd0..b89daf129 100644
--- a/kioslave/system/kdedmodule/systemdirnotifymodule.cpp
+++ b/kioslave/system/kdedmodule/systemdirnotifymodule.cpp
@@ -22,13 +22,13 @@
#include <klocale.h>
#include <kglobal.h>
-SystemDirNotifyModule::SystemDirNotifyModule(const QCString &obj)
+SystemDirNotifyModule::SystemDirNotifyModule(const TQCString &obj)
: KDEDModule(obj)
{
}
extern "C" {
- KDE_EXPORT KDEDModule *create_systemdirnotify(const QCString &obj)
+ KDE_EXPORT KDEDModule *create_systemdirnotify(const TQCString &obj)
{
KGlobal::locale()->insertCatalogue("kio_system");
return new SystemDirNotifyModule(obj);
diff --git a/kioslave/system/kdedmodule/systemdirnotifymodule.h b/kioslave/system/kdedmodule/systemdirnotifymodule.h
index c75cd1a9e..e979ba098 100644
--- a/kioslave/system/kdedmodule/systemdirnotifymodule.h
+++ b/kioslave/system/kdedmodule/systemdirnotifymodule.h
@@ -28,7 +28,7 @@ class SystemDirNotifyModule : public KDEDModule
K_DCOP
public:
- SystemDirNotifyModule(const QCString &obj);
+ SystemDirNotifyModule(const TQCString &obj);
private:
SystemDirNotify notifier;
};
diff --git a/kioslave/system/kio_system.cpp b/kioslave/system/kio_system.cpp
index c2683add8..1f86a90d1 100644
--- a/kioslave/system/kio_system.cpp
+++ b/kioslave/system/kio_system.cpp
@@ -25,7 +25,7 @@
#include <kcmdlineargs.h>
#include <dcopclient.h>
-#include <qeventloop.h>
+#include <tqeventloop.h>
#include "kio_system.h"
@@ -57,8 +57,8 @@ extern "C" {
}
-SystemProtocol::SystemProtocol(const QCString &protocol,
- const QCString &pool, const QCString &app)
+SystemProtocol::SystemProtocol(const TQCString &protocol,
+ const TQCString &pool, const TQCString &app)
: ForwardingSlaveBase(protocol, pool, app)
{
}
@@ -69,7 +69,7 @@ SystemProtocol::~SystemProtocol()
bool SystemProtocol::rewriteURL(const KURL &url, KURL &newUrl)
{
- QString name, path;
+ TQString name, path;
if ( !m_impl.parseURL(url, name, path) )
{
@@ -91,7 +91,7 @@ void SystemProtocol::stat(const KURL &url)
{
kdDebug() << "SystemProtocol::stat: " << url << endl;
- QString path = url.path();
+ TQString path = url.path();
if ( path.isEmpty() || path == "/" )
{
// The root is "virtual" - it's not a single physical directory
@@ -102,7 +102,7 @@ void SystemProtocol::stat(const KURL &url)
return;
}
- QString name;
+ TQString name;
bool ok = m_impl.parseURL(url, name, path);
if ( !ok )
@@ -141,7 +141,7 @@ void SystemProtocol::listDir(const KURL &url)
return;
}
- QString name, path;
+ TQString name, path;
bool ok = m_impl.parseURL(url, name, path);
if ( !ok )
diff --git a/kioslave/system/kio_system.h b/kioslave/system/kio_system.h
index 8c7c4664c..916c495e5 100644
--- a/kioslave/system/kio_system.h
+++ b/kioslave/system/kio_system.h
@@ -27,8 +27,8 @@
class SystemProtocol : public KIO::ForwardingSlaveBase
{
public:
- SystemProtocol(const QCString &protocol, const QCString &pool,
- const QCString &app);
+ SystemProtocol(const TQCString &protocol, const TQCString &pool,
+ const TQCString &app);
virtual ~SystemProtocol();
virtual bool rewriteURL(const KURL &url, KURL &newUrl);
diff --git a/kioslave/system/systemimpl.cpp b/kioslave/system/systemimpl.cpp
index 46214ce20..a53c85045 100644
--- a/kioslave/system/systemimpl.cpp
+++ b/kioslave/system/systemimpl.cpp
@@ -24,40 +24,40 @@
#include <kstandarddirs.h>
#include <kdesktopfile.h>
-#include <qapplication.h>
-#include <qeventloop.h>
-#include <qdir.h>
+#include <tqapplication.h>
+#include <tqeventloop.h>
+#include <tqdir.h>
#include <sys/stat.h>
-SystemImpl::SystemImpl() : QObject()
+SystemImpl::SystemImpl() : TQObject()
{
KGlobal::dirs()->addResourceType("system_entries",
KStandardDirs::kde_default("data") + "systemview");
}
-bool SystemImpl::listRoot(QValueList<KIO::UDSEntry> &list)
+bool SystemImpl::listRoot(TQValueList<KIO::UDSEntry> &list)
{
kdDebug() << "SystemImpl::listRoot" << endl;
- QStringList names_found;
- QStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
+ TQStringList names_found;
+ TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
- QStringList::ConstIterator dirpath = dirList.begin();
- QStringList::ConstIterator end = dirList.end();
+ TQStringList::ConstIterator dirpath = dirList.begin();
+ TQStringList::ConstIterator end = dirList.end();
for(; dirpath!=end; ++dirpath)
{
- QDir dir = *dirpath;
+ TQDir dir = *dirpath;
if (!dir.exists()) continue;
- QStringList filenames
- = dir.entryList( QDir::Files | QDir::Readable );
+ TQStringList filenames
+ = dir.entryList( TQDir::Files | TQDir::Readable );
KIO::UDSEntry entry;
- QStringList::ConstIterator filename = filenames.begin();
- QStringList::ConstIterator endf = filenames.end();
+ TQStringList::ConstIterator filename = filenames.begin();
+ TQStringList::ConstIterator endf = filenames.end();
for(; filename!=endf; ++filename)
{
@@ -77,9 +77,9 @@ bool SystemImpl::listRoot(QValueList<KIO::UDSEntry> &list)
return true;
}
-bool SystemImpl::parseURL(const KURL &url, QString &name, QString &path) const
+bool SystemImpl::parseURL(const KURL &url, TQString &name, TQString &path) const
{
- QString url_path = url.path();
+ TQString url_path = url.path();
int i = url_path.find('/', 1);
if (i > 0)
@@ -90,13 +90,13 @@ bool SystemImpl::parseURL(const KURL &url, QString &name, QString &path) const
else
{
name = url_path.mid(1);
- path = QString::null;
+ path = TQString::null;
}
- return name != QString::null;
+ return name != TQString::null;
}
-bool SystemImpl::realURL(const QString &name, const QString &path,
+bool SystemImpl::realURL(const TQString &name, const TQString &path,
KURL &url) const
{
url = findBaseURL(name);
@@ -109,25 +109,25 @@ bool SystemImpl::realURL(const QString &name, const QString &path,
return true;
}
-bool SystemImpl::statByName(const QString &filename, KIO::UDSEntry& entry)
+bool SystemImpl::statByName(const TQString &filename, KIO::UDSEntry& entry)
{
kdDebug() << "SystemImpl::statByName" << endl;
- QStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
+ TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
- QStringList::ConstIterator dirpath = dirList.begin();
- QStringList::ConstIterator end = dirList.end();
+ TQStringList::ConstIterator dirpath = dirList.begin();
+ TQStringList::ConstIterator end = dirList.end();
for(; dirpath!=end; ++dirpath)
{
- QDir dir = *dirpath;
+ TQDir dir = *dirpath;
if (!dir.exists()) continue;
- QStringList filenames
- = dir.entryList( QDir::Files | QDir::Readable );
+ TQStringList filenames
+ = dir.entryList( TQDir::Files | TQDir::Readable );
- QStringList::ConstIterator name = filenames.begin();
- QStringList::ConstIterator endf = filenames.end();
+ TQStringList::ConstIterator name = filenames.begin();
+ TQStringList::ConstIterator endf = filenames.end();
for(; name!=endf; ++name)
{
@@ -142,27 +142,27 @@ bool SystemImpl::statByName(const QString &filename, KIO::UDSEntry& entry)
return false;
}
-KURL SystemImpl::findBaseURL(const QString &filename) const
+KURL SystemImpl::findBaseURL(const TQString &filename) const
{
kdDebug() << "SystemImpl::findBaseURL" << endl;
- QStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
+ TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
- QStringList::ConstIterator dirpath = dirList.begin();
- QStringList::ConstIterator end = dirList.end();
+ TQStringList::ConstIterator dirpath = dirList.begin();
+ TQStringList::ConstIterator end = dirList.end();
for(; dirpath!=end; ++dirpath)
{
- QDir dir = *dirpath;
+ TQDir dir = *dirpath;
if (!dir.exists()) continue;
- QStringList filenames
- = dir.entryList( QDir::Files | QDir::Readable );
+ TQStringList filenames
+ = dir.entryList( TQDir::Files | TQDir::Readable );
KIO::UDSEntry entry;
- QStringList::ConstIterator name = filenames.begin();
- QStringList::ConstIterator endf = filenames.end();
+ TQStringList::ConstIterator name = filenames.begin();
+ TQStringList::ConstIterator endf = filenames.end();
for(; name!=endf; ++name)
{
@@ -186,7 +186,7 @@ KURL SystemImpl::findBaseURL(const QString &filename) const
static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l,
- const QString &s = QString::null)
+ const TQString &s = TQString::null)
{
KIO::UDSAtom atom;
atom.m_uds = ID;
@@ -207,8 +207,8 @@ void SystemImpl::createTopLevelEntry(KIO::UDSEntry &entry) const
}
void SystemImpl::createEntry(KIO::UDSEntry &entry,
- const QString &directory,
- const QString &file)
+ const TQString &directory,
+ const TQString &file)
{
kdDebug() << "SystemImpl::createEntry" << endl;
@@ -226,7 +226,7 @@ void SystemImpl::createEntry(KIO::UDSEntry &entry,
addAtom(entry, KIO::UDS_NAME, 0, desktop.readName());
- QString new_filename = file;
+ TQString new_filename = file;
new_filename.truncate(file.length()-8);
if ( desktop.readURL().isEmpty() )
@@ -241,8 +241,8 @@ void SystemImpl::createEntry(KIO::UDSEntry &entry,
addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR);
addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory");
- QString icon = desktop.readIcon();
- QString empty_icon = desktop.readEntry("EmptyIcon");
+ TQString icon = desktop.readIcon();
+ TQString empty_icon = desktop.readEntry("EmptyIcon");
if (!empty_icon.isEmpty())
{
@@ -251,12 +251,12 @@ void SystemImpl::createEntry(KIO::UDSEntry &entry,
m_lastListingEmpty = true;
KIO::ListJob *job = KIO::listDir(url, false, false);
- connect( job, SIGNAL( entries(KIO::Job *,
+ connect( job, TQT_SIGNAL( entries(KIO::Job *,
const KIO::UDSEntryList &) ),
- this, SLOT( slotEntries(KIO::Job *,
+ this, TQT_SLOT( slotEntries(KIO::Job *,
const KIO::UDSEntryList &) ) );
- connect( job, SIGNAL( result(KIO::Job *) ),
- this, SLOT( slotResult(KIO::Job *) ) );
+ connect( job, TQT_SIGNAL( result(KIO::Job *) ),
+ this, TQT_SLOT( slotResult(KIO::Job *) ) );
qApp->eventLoop()->enterLoop();
if (m_lastListingEmpty) icon = empty_icon;
diff --git a/kioslave/system/systemimpl.h b/kioslave/system/systemimpl.h
index a06874465..2cddeb120 100644
--- a/kioslave/system/systemimpl.h
+++ b/kioslave/system/systemimpl.h
@@ -25,8 +25,8 @@
#include <kurl.h>
#include <dcopobject.h>
-#include <qobject.h>
-#include <qstring.h>
+#include <tqobject.h>
+#include <tqstring.h>
class SystemImpl : public QObject
{
@@ -35,31 +35,31 @@ public:
SystemImpl();
void createTopLevelEntry(KIO::UDSEntry& entry) const;
- bool statByName(const QString &filename, KIO::UDSEntry& entry);
+ bool statByName(const TQString &filename, KIO::UDSEntry& entry);
- bool listRoot(QValueList<KIO::UDSEntry> &list);
+ bool listRoot(TQValueList<KIO::UDSEntry> &list);
- bool parseURL(const KURL &url, QString &name, QString &path) const;
- bool realURL(const QString &name, const QString &path, KURL &url) const;
+ bool parseURL(const KURL &url, TQString &name, TQString &path) const;
+ bool realURL(const TQString &name, const TQString &path, KURL &url) const;
int lastErrorCode() const { return m_lastErrorCode; }
- QString lastErrorMessage() const { return m_lastErrorMessage; }
+ TQString lastErrorMessage() const { return m_lastErrorMessage; }
private slots:
- KURL findBaseURL(const QString &filename) const;
+ KURL findBaseURL(const TQString &filename) const;
void slotEntries(KIO::Job *job, const KIO::UDSEntryList &list);
void slotResult(KIO::Job *job);
private:
- void createEntry(KIO::UDSEntry& entry, const QString &directory,
- const QString &file);
+ void createEntry(KIO::UDSEntry& entry, const TQString &directory,
+ const TQString &file);
bool m_lastListingEmpty;
/// Last error code stored in class to simplify API.
/// Note that this means almost no method can be const.
int m_lastErrorCode;
- QString m_lastErrorMessage;
+ TQString m_lastErrorMessage;
};
#endif
diff --git a/kioslave/system/testsystem.cpp b/kioslave/system/testsystem.cpp
index 95107680f..d9ad43e50 100644
--- a/kioslave/system/testsystem.cpp
+++ b/kioslave/system/testsystem.cpp
@@ -28,12 +28,12 @@
#include <stdlib.h>
-static bool check(const QString& txt, QString a, QString b)
+static bool check(const TQString& txt, TQString a, TQString b)
{
if (a.isEmpty())
- a = QString::null;
+ a = TQString::null;
if (b.isEmpty())
- b = QString::null;
+ b = TQString::null;
if (a == b) {
kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "ok" << endl;
}
diff --git a/kioslave/tar/ktartest.cpp b/kioslave/tar/ktartest.cpp
index a82e6dbcd..bfbb216d4 100644
--- a/kioslave/tar/ktartest.cpp
+++ b/kioslave/tar/ktartest.cpp
@@ -1,13 +1,13 @@
#include "ktar.h"
#include <stdio.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <kinstance.h>
#include <kdebug.h>
-void recursive_print( const KTarDirectory * dir, const QString & path )
+void recursive_print( const KTarDirectory * dir, const TQString & path )
{
- QStringList l = dir->entries();
- QStringList::Iterator it = l.begin();
+ TQStringList l = dir->entries();
+ TQStringList::Iterator it = l.begin();
for( ; it != l.end(); ++it )
{
const KTarEntry* entry = dir->entry( (*it) );
@@ -37,7 +37,7 @@ int main( int argc, char** argv )
}
KInstance instance("ktartest");
- QString command = argv[1];
+ TQString command = argv[1];
kdDebug() << "main: command=" << command << endl;
if ( command == "list" )
{
@@ -81,19 +81,19 @@ int main( int argc, char** argv )
Q_ASSERT( e && e->isFile() );
const KTarFile* f = (KTarFile*)e;
- QByteArray arr( f->data() );
+ TQByteArray arr( f->data() );
printf("SIZE=%i\n",arr.size() );
- QString str( arr );
+ TQString str( arr );
printf("DATA=%s\n", str.latin1());
/*
- // This is what KGzipDev::readAll could do, if QIODevice::readAll was virtual....
- QByteArray array(1024);
+ // This is what KGzipDev::readAll could do, if TQIODevice::readAll was virtual....
+ TQByteArray array(1024);
int n;
while ( ( n = dev.readBlock( array.data(), array.size() ) ) )
{
kdDebug() << "readBlock returned " << n << endl << endl;
- QCString s(array,n+1); // Terminate with 0 before printing
+ TQCString s(array,n+1); // Terminate with 0 before printing
printf("%s", s.data());
}
dev.close();
@@ -151,9 +151,9 @@ int main( int argc, char** argv )
Q_ASSERT( e && e->isFile() );
const KTarFile* f = (KTarFile*)e;
- QByteArray arr( f->data() );
+ TQByteArray arr( f->data() );
printf("SIZE=%i\n",arr.size() );
- QString str( arr );
+ TQString str( arr );
printf("DATA=%s\n", str.latin1());
tar.close();
@@ -172,7 +172,7 @@ int main( int argc, char** argv )
// Generate long filenames of each possible length bigger than 98...
for (int i = 98; i < 500 ; i++ )
{
- QString str, num;
+ TQString str, num;
str.fill( 'a', i-10 );
num.setNum( i );
num = num.rightJustify( 10, '0' );
@@ -186,7 +186,7 @@ int main( int argc, char** argv )
}
else if ( command == "bytearray" )
{
- QFile file( argv[2] );
+ TQFile file( argv[2] );
if ( !file.open( IO_ReadOnly ) )
return 1;
KTarGz tar( &file );
diff --git a/kioslave/tar/tar.cc b/kioslave/tar/tar.cc
index bfe909367..8afc1d0e8 100644
--- a/kioslave/tar/tar.cc
+++ b/kioslave/tar/tar.cc
@@ -7,7 +7,7 @@
#include <stdlib.h>
#include <unistd.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <kglobal.h>
#include <kurl.h>
@@ -49,7 +49,7 @@ int kdemain( int argc, char **argv )
return 0;
}
-ArchiveProtocol::ArchiveProtocol( const QCString &pool, const QCString &app ) : SlaveBase( "tar", pool, app )
+ArchiveProtocol::ArchiveProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "tar", pool, app )
{
kdDebug( 7109 ) << "ArchiveProtocol::ArchiveProtocol" << endl;
m_archiveFile = 0L;
@@ -60,9 +60,9 @@ ArchiveProtocol::~ArchiveProtocol()
delete m_archiveFile;
}
-bool ArchiveProtocol::checkNewFile( const KURL & url, QString & path, KIO::Error& errorNum )
+bool ArchiveProtocol::checkNewFile( const KURL & url, TQString & path, KIO::Error& errorNum )
{
- QString fullPath = url.path();
+ TQString fullPath = url.path();
kdDebug(7109) << "ArchiveProtocol::checkNewFile " << fullPath << endl;
@@ -71,7 +71,7 @@ bool ArchiveProtocol::checkNewFile( const KURL & url, QString & path, KIO::Error
{
// Has it changed ?
KDE_struct_stat statbuf;
- if ( KDE_stat( QFile::encodeName( m_archiveName ), &statbuf ) == 0 )
+ if ( KDE_stat( TQFile::encodeName( m_archiveName ), &statbuf ) == 0 )
{
if ( m_mtime == statbuf.st_mtime )
{
@@ -93,8 +93,8 @@ bool ArchiveProtocol::checkNewFile( const KURL & url, QString & path, KIO::Error
// Find where the tar file is in the full path
int pos = 0;
- QString archiveFile;
- path = QString::null;
+ TQString archiveFile;
+ path = TQString::null;
int len = fullPath.length();
if ( len != 0 && fullPath[ len - 1 ] != '/' )
@@ -105,9 +105,9 @@ bool ArchiveProtocol::checkNewFile( const KURL & url, QString & path, KIO::Error
statbuf.st_mode = 0; // be sure to clear the directory bit
while ( (pos=fullPath.find( '/', pos+1 )) != -1 )
{
- QString tryPath = fullPath.left( pos );
+ TQString tryPath = fullPath.left( pos );
kdDebug(7109) << fullPath << " trying " << tryPath << endl;
- if ( KDE_stat( QFile::encodeName(tryPath), &statbuf ) == -1 )
+ if ( KDE_stat( TQFile::encodeName(tryPath), &statbuf ) == -1 )
{
// We are not in the file system anymore, either we have already enough data or we will never get any useful data anymore
break;
@@ -125,7 +125,7 @@ bool ArchiveProtocol::checkNewFile( const KURL & url, QString & path, KIO::Error
path.truncate( len - 1 );
}
else
- path = QString::fromLatin1("/");
+ path = TQString::fromLatin1("/");
kdDebug(7109) << "Found. archiveFile=" << archiveFile << " path=" << path << endl;
break;
}
@@ -215,7 +215,7 @@ void ArchiveProtocol::listDir( const KURL & url )
{
kdDebug( 7109 ) << "ArchiveProtocol::listDir " << url << endl;
- QString path;
+ TQString path;
KIO::Error errorNum;
if ( !checkNewFile( url, path, errorNum ) )
{
@@ -248,23 +248,23 @@ void ArchiveProtocol::listDir( const KURL & url )
if ( path.isEmpty() )
{
- KURL redir( url.protocol() + QString::fromLatin1( ":/") );
+ KURL redir( url.protocol() + TQString::fromLatin1( ":/") );
kdDebug( 7109 ) << "url.path()==" << url.path() << endl;
- redir.setPath( url.path() + QString::fromLatin1("/") );
+ redir.setPath( url.path() + TQString::fromLatin1("/") );
kdDebug( 7109 ) << "ArchiveProtocol::listDir: redirection " << redir.url() << endl;
redirection( redir );
finished();
return;
}
- path = QString::fromLocal8Bit(remoteEncoding()->encode(path));
+ path = TQString::fromLocal8Bit(remoteEncoding()->encode(path));
kdDebug( 7109 ) << "checkNewFile done" << endl;
const KArchiveDirectory* root = m_archiveFile->directory();
const KArchiveDirectory* dir;
if (!path.isEmpty() && path != "/")
{
- kdDebug(7109) << QString("Looking for entry %1").arg(path) << endl;
+ kdDebug(7109) << TQString("Looking for entry %1").arg(path) << endl;
const KArchiveEntry* e = root->entry( path );
if ( !e )
{
@@ -281,11 +281,11 @@ void ArchiveProtocol::listDir( const KURL & url )
dir = root;
}
- QStringList l = dir->entries();
+ TQStringList l = dir->entries();
totalSize( l.count() );
UDSEntry entry;
- QStringList::Iterator it = l.begin();
+ TQStringList::Iterator it = l.begin();
for( ; it != l.end(); ++it )
{
kdDebug(7109) << (*it) << endl;
@@ -305,7 +305,7 @@ void ArchiveProtocol::listDir( const KURL & url )
void ArchiveProtocol::stat( const KURL & url )
{
- QString path;
+ TQString path;
UDSEntry entry;
KIO::Error errorNum;
if ( !checkNewFile( url, path, errorNum ) )
@@ -335,7 +335,7 @@ void ArchiveProtocol::stat( const KURL & url )
kdDebug( 7109 ) << "ArchiveProtocol::stat returning name=" << url.fileName() << endl;
KDE_struct_stat buff;
- if ( KDE_stat( QFile::encodeName( url.path() ), &buff ) == -1 )
+ if ( KDE_stat( TQFile::encodeName( url.path() ), &buff ) == -1 )
{
// Should not happen, as the file was already stated by checkNewFile
error( KIO::ERR_COULD_NOT_STAT, url.prettyURL() );
@@ -360,10 +360,10 @@ void ArchiveProtocol::stat( const KURL & url )
const KArchiveEntry* archiveEntry;
if ( path.isEmpty() )
{
- path = QString::fromLatin1( "/" );
+ path = TQString::fromLatin1( "/" );
archiveEntry = root;
} else {
- path = QString::fromLocal8Bit(remoteEncoding()->encode(path));
+ path = TQString::fromLocal8Bit(remoteEncoding()->encode(path));
archiveEntry = root->entry( path );
}
if ( !archiveEntry )
@@ -382,7 +382,7 @@ void ArchiveProtocol::get( const KURL & url )
{
kdDebug( 7109 ) << "ArchiveProtocol::get " << url << endl;
- QString path;
+ TQString path;
KIO::Error errorNum;
if ( !checkNewFile( url, path, errorNum ) )
{
@@ -403,7 +403,7 @@ void ArchiveProtocol::get( const KURL & url )
}
}
- path = QString::fromLocal8Bit(remoteEncoding()->encode(path));
+ path = TQString::fromLocal8Bit(remoteEncoding()->encode(path));
const KArchiveDirectory* root = m_archiveFile->directory();
const KArchiveEntry* archiveEntry = root->entry( path );
@@ -443,7 +443,7 @@ void ArchiveProtocol::get( const KURL & url )
* - errors are skipped, resulting in an empty file
*/
- QIODevice* io = 0;
+ TQIODevice* io = 0;
// Getting the device is hard, as archiveFileEntry->device() is not virtual!
if ( url.protocol() == "tar" )
{
@@ -481,11 +481,11 @@ void ArchiveProtocol::get( const KURL & url )
totalSize( archiveFileEntry->size() );
- // Size of a QIODevice read. It must be large enough so that the mime type check will not fail
+ // Size of a TQIODevice read. It must be large enough so that the mime type check will not fail
const int maxSize = 0x100000; // 1MB
int bufferSize = kMin( maxSize, archiveFileEntry->size() );
- QByteArray buffer ( bufferSize );
+ TQByteArray buffer ( bufferSize );
if ( buffer.isEmpty() && bufferSize > 0 )
{
// Something went wrong
@@ -504,7 +504,7 @@ void ArchiveProtocol::get( const KURL & url )
if ( !firstRead )
{
bufferSize = kMin( maxSize, fileSize );
- buffer.resize( bufferSize, QGArray::SpeedOptim );
+ buffer.resize( bufferSize, TQGArray::SpeedOptim );
}
const Q_LONG read = io->readBlock( buffer.data(), buffer.size() ); // Avoid to use bufferSize here, in case something went wrong.
if ( read != bufferSize )
@@ -530,7 +530,7 @@ void ArchiveProtocol::get( const KURL & url )
io->close();
delete io;
- data( QByteArray() );
+ data( TQByteArray() );
finished();
}
diff --git a/kioslave/tar/tar.h b/kioslave/tar/tar.h
index 644a8b100..1cde2deae 100644
--- a/kioslave/tar/tar.h
+++ b/kioslave/tar/tar.h
@@ -28,7 +28,7 @@
class ArchiveProtocol : public KIO::SlaveBase
{
public:
- ArchiveProtocol( const QCString &pool, const QCString &app );
+ ArchiveProtocol( const TQCString &pool, const TQCString &app );
virtual ~ArchiveProtocol();
virtual void listDir( const KURL & url );
@@ -45,10 +45,10 @@ protected:
* \param errNum KIO error number (undefined if the function returns true)
* \return true if file was found, false if there was an error
*/
- bool checkNewFile( const KURL & url, QString & path, KIO::Error& errorNum );
+ bool checkNewFile( const KURL & url, TQString & path, KIO::Error& errorNum );
KArchive * m_archiveFile;
- QString m_archiveName;
+ TQString m_archiveName;
time_t m_mtime;
};
diff --git a/kioslave/thumbnail/cursorcreator.cpp b/kioslave/thumbnail/cursorcreator.cpp
index 0b1470bd6..d77629acf 100644
--- a/kioslave/thumbnail/cursorcreator.cpp
+++ b/kioslave/thumbnail/cursorcreator.cpp
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qimage.h>
-#include <qfile.h>
+#include <tqimage.h>
+#include <tqfile.h>
#include <kdemacros.h>
@@ -35,16 +35,16 @@ extern "C"
}
}
-bool CursorCreator::create( const QString &path, int width, int height, QImage &img )
+bool CursorCreator::create( const TQString &path, int width, int height, TQImage &img )
{
XcursorImage *cursor = XcursorFilenameLoadImage(
- QFile::encodeName( path ).data(),
+ TQFile::encodeName( path ).data(),
width > height ? height : width );
if ( cursor ) {
- img = QImage( reinterpret_cast<uchar *>( cursor->pixels ),
+ img = TQImage( reinterpret_cast<uchar *>( cursor->pixels ),
cursor->width, cursor->height, 32,
- NULL, 0, QImage::BigEndian );
+ NULL, 0, TQImage::BigEndian );
img.setAlphaBuffer( true );
// Convert the image to non-premultiplied alpha
diff --git a/kioslave/thumbnail/cursorcreator.h b/kioslave/thumbnail/cursorcreator.h
index 7ef8ac2fd..9fd7c7fa4 100644
--- a/kioslave/thumbnail/cursorcreator.h
+++ b/kioslave/thumbnail/cursorcreator.h
@@ -26,7 +26,7 @@ class CursorCreator : public ThumbCreator
{
public:
CursorCreator() {}
- bool create( const QString &path, int, int, QImage &img );
+ bool create( const TQString &path, int, int, TQImage &img );
};
#endif
diff --git a/kioslave/thumbnail/djvucreator.cpp b/kioslave/thumbnail/djvucreator.cpp
index 653fc4163..20a32fb26 100644
--- a/kioslave/thumbnail/djvucreator.cpp
+++ b/kioslave/thumbnail/djvucreator.cpp
@@ -36,8 +36,8 @@
#include <fcntl.h>
#include <errno.h>
-#include <qfile.h>
-#include <qimage.h>
+#include <tqfile.h>
+#include <tqimage.h>
#include <kdemacros.h>
@@ -53,19 +53,19 @@ extern "C"
}
}
-bool DjVuCreator::create(const QString &path, int width, int height, QImage &img)
+bool DjVuCreator::create(const TQString &path, int width, int height, TQImage &img)
{
int output[2];
- QByteArray data(1024);
+ TQByteArray data(1024);
bool ok = false;
if (pipe(output) == -1)
return false;
const char* argv[8];
- QCString sizearg, fnamearg;
+ TQCString sizearg, fnamearg;
sizearg.sprintf("%dx%d", width, height);
- fnamearg = QFile::encodeName( path );
+ fnamearg = TQFile::encodeName( path );
argv[0] = "ddjvu";
argv[1] = "-page";
argv[2] = "1";
diff --git a/kioslave/thumbnail/djvucreator.h b/kioslave/thumbnail/djvucreator.h
index f6724c163..f5df3650b 100644
--- a/kioslave/thumbnail/djvucreator.h
+++ b/kioslave/thumbnail/djvucreator.h
@@ -27,7 +27,7 @@ class DjVuCreator : public ThumbCreator
{
public:
DjVuCreator() {}
- virtual bool create(const QString &path, int, int, QImage &img);
+ virtual bool create(const TQString &path, int, int, TQImage &img);
virtual Flags flags() const;
};
diff --git a/kioslave/thumbnail/exrcreator.cpp b/kioslave/thumbnail/exrcreator.cpp
index ac2bc3a71..633ad5095 100644
--- a/kioslave/thumbnail/exrcreator.cpp
+++ b/kioslave/thumbnail/exrcreator.cpp
@@ -17,13 +17,13 @@
Boston, MA 02110-1301, USA.
*/
-#include <qimage.h>
+#include <tqimage.h>
#include <kimageio.h>
#include <kdebug.h>
#include <kconfig.h>
#include <kglobal.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <ImfInputFile.h>
#include <ImfPreviewImage.h>
@@ -38,7 +38,7 @@ extern "C"
}
}
-bool EXRCreator::create(const QString &path, int, int, QImage &img)
+bool EXRCreator::create(const TQString &path, int, int, TQImage &img)
{
Imf::InputFile in ( path.ascii() );
const Imf::Header &h = in.header();
@@ -46,7 +46,7 @@ bool EXRCreator::create(const QString &path, int, int, QImage &img)
if ( h.hasPreviewImage() ) {
kdDebug() << "EXRcreator - using preview" << endl;
const Imf::PreviewImage &preview = in.header().previewImage();
- QImage qpreview(preview.width(), preview.height(), 32, 0, QImage::BigEndian);
+ TQImage qpreview(preview.width(), preview.height(), 32, 0, TQImage::BigEndian);
for ( unsigned int y=0; y < preview.height(); y++ ) {
for ( unsigned int x=0; x < preview.width(); x++ ) {
const Imf::PreviewRgba &q = preview.pixels()[x+(y*preview.width())];
@@ -65,7 +65,7 @@ bool EXRCreator::create(const QString &path, int, int, QImage &img)
KConfig * config = KGlobal::config();
KConfigGroupSaver cgs( config, "PreviewSettings" );
unsigned long long maxSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ );
- unsigned long long fileSize = QFile( path ).size();
+ unsigned long long fileSize = TQFile( path ).size();
if ( (fileSize > 0) && (fileSize < maxSize) ) {
if (!img.load( path )) {
return false;
diff --git a/kioslave/thumbnail/exrcreator.h b/kioslave/thumbnail/exrcreator.h
index 498bcfb1b..75e11d455 100644
--- a/kioslave/thumbnail/exrcreator.h
+++ b/kioslave/thumbnail/exrcreator.h
@@ -26,7 +26,7 @@ class EXRCreator : public ThumbCreator
{
public:
EXRCreator() {};
- virtual bool create(const QString &path, int, int, QImage &img);
+ virtual bool create(const TQString &path, int, int, TQImage &img);
virtual Flags flags() const;
};
diff --git a/kioslave/thumbnail/htmlcreator.cpp b/kioslave/thumbnail/htmlcreator.cpp
index 0431bcf6e..c9ddf0204 100644
--- a/kioslave/thumbnail/htmlcreator.cpp
+++ b/kioslave/thumbnail/htmlcreator.cpp
@@ -19,9 +19,9 @@
*/
#include <time.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qpainter.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
+#include <tqpainter.h>
#include <kapplication.h>
#include <khtml_part.h>
@@ -45,12 +45,12 @@ HTMLCreator::~HTMLCreator()
delete m_html;
}
-bool HTMLCreator::create(const QString &path, int width, int height, QImage &img)
+bool HTMLCreator::create(const TQString &path, int width, int height, TQImage &img)
{
if (!m_html)
{
m_html = new KHTMLPart;
- connect(m_html, SIGNAL(completed()), SLOT(slotCompleted()));
+ connect(m_html, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted()));
m_html->setJScriptEnabled(false);
m_html->setJavaEnabled(false);
m_html->setPluginsEnabled(false);
@@ -68,8 +68,8 @@ bool HTMLCreator::create(const QString &path, int width, int height, QImage &img
killTimer(t);
// render the HTML page on a bigger pixmap and use smoothScale,
- // looks better than directly scaling with the QPainter (malte)
- QPixmap pix;
+ // looks better than directly scaling with the TQPainter (malte)
+ TQPixmap pix;
if (width > 400 || height > 600)
{
if (height * 3 > width * 4)
@@ -81,13 +81,13 @@ bool HTMLCreator::create(const QString &path, int width, int height, QImage &img
pix.resize(400, 600);
// light-grey background, in case loadind the page failed
- pix.fill( QColor( 245, 245, 245 ) );
+ pix.fill( TQColor( 245, 245, 245 ) );
int borderX = pix.width() / width, borderY = pix.height() / height;
- QRect rc(borderX, borderY, pix.width() - borderX * 2,
+ TQRect rc(borderX, borderY, pix.width() - borderX * 2,
pix.height() - borderY * 2);
- QPainter p;
+ TQPainter p;
p.begin(&pix);
m_html->paint(&p, rc);
p.end();
@@ -99,7 +99,7 @@ bool HTMLCreator::create(const QString &path, int width, int height, QImage &img
return true;
}
-void HTMLCreator::timerEvent(QTimerEvent *)
+void HTMLCreator::timerEvent(TQTimerEvent *)
{
qApp->exit_loop();
}
diff --git a/kioslave/thumbnail/htmlcreator.h b/kioslave/thumbnail/htmlcreator.h
index 6cb58b18f..f131ed1ad 100644
--- a/kioslave/thumbnail/htmlcreator.h
+++ b/kioslave/thumbnail/htmlcreator.h
@@ -25,17 +25,17 @@
class KHTMLPart;
-class HTMLCreator : public QObject, public ThumbCreator
+class HTMLCreator : public TQObject, public ThumbCreator
{
Q_OBJECT
public:
HTMLCreator();
virtual ~HTMLCreator();
- virtual bool create(const QString &path, int width, int height, QImage &img);
+ virtual bool create(const TQString &path, int width, int height, TQImage &img);
virtual Flags flags() const;
protected:
- virtual void timerEvent(QTimerEvent *);
+ virtual void timerEvent(TQTimerEvent *);
private slots:
void slotCompleted();
diff --git a/kioslave/thumbnail/imagecreator.cpp b/kioslave/thumbnail/imagecreator.cpp
index 24a75a51a..259a8928f 100644
--- a/kioslave/thumbnail/imagecreator.cpp
+++ b/kioslave/thumbnail/imagecreator.cpp
@@ -20,7 +20,7 @@
#include <assert.h>
-#include <qimage.h>
+#include <tqimage.h>
#include <kimageio.h>
@@ -35,7 +35,7 @@ extern "C"
}
}
-bool ImageCreator::create(const QString &path, int, int, QImage &img)
+bool ImageCreator::create(const TQString &path, int, int, TQImage &img)
{
// create image preview
if (!img.load( path ))
diff --git a/kioslave/thumbnail/imagecreator.h b/kioslave/thumbnail/imagecreator.h
index d06c9fa7d..cc527438d 100644
--- a/kioslave/thumbnail/imagecreator.h
+++ b/kioslave/thumbnail/imagecreator.h
@@ -26,7 +26,7 @@ class ImageCreator : public ThumbCreator
{
public:
ImageCreator() {}
- virtual bool create(const QString &path, int, int, QImage &img);
+ virtual bool create(const TQString &path, int, int, TQImage &img);
virtual Flags flags() const;
};
diff --git a/kioslave/thumbnail/textcreator.cpp b/kioslave/thumbnail/textcreator.cpp
index b0424e228..31f4c4254 100644
--- a/kioslave/thumbnail/textcreator.cpp
+++ b/kioslave/thumbnail/textcreator.cpp
@@ -18,9 +18,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <qfile.h>
-#include <qpixmap.h>
-#include <qimage.h>
+#include <tqfile.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
#include <kstandarddirs.h>
#include <kpixmapsplitter.h>
@@ -49,7 +49,7 @@ TextCreator::~TextCreator()
delete [] m_data;
}
-bool TextCreator::create(const QString &path, int width, int height, QImage &img)
+bool TextCreator::create(const TQString &path, int width, int height, TQImage &img)
{
// Filter out unwanted mimetypes
KMimeType::Ptr mimeType = KMimeType::findByPath( path );
@@ -59,12 +59,12 @@ bool TextCreator::create(const QString &path, int width, int height, QImage &img
if ( !m_splitter )
{
m_splitter = new KPixmapSplitter;
- QString pixmap = locate( "data", "konqueror/pics/thumbnailfont_7x4.png" );
+ TQString pixmap = locate( "data", "konqueror/pics/thumbnailfont_7x4.png" );
if ( !pixmap.isEmpty() )
{
// FIXME: make font/glyphsize configurable...
- m_splitter->setPixmap( QPixmap( pixmap ));
- m_splitter->setItemSize( QSize( 4, 7 ));
+ m_splitter->setPixmap( TQPixmap( pixmap ));
+ m_splitter->setItemSize( TQSize( 4, 7 ));
}
}
@@ -72,7 +72,7 @@ bool TextCreator::create(const QString &path, int width, int height, QImage &img
// determine some sizes...
// example: width: 60, height: 64
- QSize pixmapSize( width, height );
+ TQSize pixmapSize( width, height );
if (height * 3 > width * 4)
pixmapSize.setHeight( width * 4 / 3 );
else
@@ -85,7 +85,7 @@ bool TextCreator::create(const QString &path, int width, int height, QImage &img
int xborder = 1 + pixmapSize.width()/16; // minimum x-border
int yborder = 1 + pixmapSize.height()/16; // minimum y-border
- QSize chSize = m_splitter->itemSize(); // the size of one char
+ TQSize chSize = m_splitter->itemSize(); // the size of one char
int xOffset = chSize.width();
int yOffset = chSize.height();
@@ -99,7 +99,7 @@ bool TextCreator::create(const QString &path, int width, int height, QImage &img
const int bytesToRead = 120 * numLines;
// create text-preview
- QFile file( path );
+ TQFile file( path );
if ( file.open( IO_ReadOnly ))
{
if ( !m_data || m_dataSize < bytesToRead + 1 )
@@ -114,12 +114,12 @@ bool TextCreator::create(const QString &path, int width, int height, QImage &img
{
ok = true;
m_data[read] = '\0';
- QString text = QString::fromLocal8Bit( m_data );
+ TQString text = TQString::fromLocal8Bit( m_data );
// FIXME: maybe strip whitespace and read more?
- m_pixmap.fill( QColor( 245, 245, 245 ) ); // light-grey background
+ m_pixmap.fill( TQColor( 245, 245, 245 ) ); // light-grey background
- QRect rect;
+ TQRect rect;
int rest = m_pixmap.width() - (numCharsPerLine * chSize.width());
xborder = QMAX( xborder, rest/2); // center horizontally
@@ -132,7 +132,7 @@ bool TextCreator::create(const QString &path, int width, int height, QImage &img
int posLastLine = m_pixmap.height() - (chSize.height() + yborder);
bool newLine = false;
Q_ASSERT( posNewLine > 0 );
- const QPixmap *fontPixmap = &(m_splitter->pixmap());
+ const TQPixmap *fontPixmap = &(m_splitter->pixmap());
for ( uint i = 0; i < text.length(); i++ )
{
@@ -158,7 +158,7 @@ bool TextCreator::create(const QString &path, int width, int height, QImage &img
}
// check for newlines in the text (unix,dos)
- QChar ch = text.at( i );
+ TQChar ch = text.at( i );
if ( ch == '\n' )
{
newLine = true;
@@ -174,7 +174,7 @@ bool TextCreator::create(const QString &path, int width, int height, QImage &img
rect = m_splitter->coordinates( ch );
if ( !rect.isEmpty() )
{
- bitBlt( &m_pixmap, QPoint(x,y), fontPixmap, rect, Qt::CopyROP );
+ bitBlt( &m_pixmap, TQPoint(x,y), fontPixmap, rect, Qt::CopyROP );
}
x += xOffset; // next character
diff --git a/kioslave/thumbnail/textcreator.h b/kioslave/thumbnail/textcreator.h
index 92461d0cd..02b14aec9 100644
--- a/kioslave/thumbnail/textcreator.h
+++ b/kioslave/thumbnail/textcreator.h
@@ -20,7 +20,7 @@
#ifndef _TEXTCREATOR_H_
#define _TEXTCREATOR_H_
-#include <qpixmap.h>
+#include <tqpixmap.h>
#include <kio/thumbcreator.h>
class KPixmapSplitter;
@@ -30,14 +30,14 @@ class TextCreator : public ThumbCreator
public:
TextCreator();
virtual ~TextCreator();
- virtual bool create(const QString &path, int width, int height, QImage &img);
+ virtual bool create(const TQString &path, int width, int height, TQImage &img);
virtual Flags flags() const;
private:
KPixmapSplitter *m_splitter;
char *m_data;
int m_dataSize;
- QPixmap m_pixmap;
+ TQPixmap m_pixmap;
};
#endif
diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp
index 99cb3a89d..272e34eed 100644
--- a/kioslave/thumbnail/thumbnail.cpp
+++ b/kioslave/thumbnail/thumbnail.cpp
@@ -27,12 +27,12 @@
#include <sys/ipc.h>
#include <sys/shm.h>
-#include <qfile.h>
-#include <qbitmap.h>
-#include <qpixmap.h>
-#include <qpainter.h>
-#include <qimage.h>
-#include <qbuffer.h>
+#include <tqfile.h>
+#include <tqbitmap.h>
+#include <tqpixmap.h>
+#include <tqpainter.h>
+#include <tqimage.h>
+#include <tqbuffer.h>
#include <kdatastream.h> // Do not remove, needed for correct bool serialization
#include <kurl.h>
@@ -53,13 +53,13 @@
#include "thumbnail.h"
#include <kio/thumbcreator.h>
-// Use correctly KInstance instead of KApplication (but then no QPixmap)
+// Use correctly KInstance instead of KApplication (but then no TQPixmap)
#undef USE_KINSTANCE
// Fix thumbnail: protocol
#define THUMBNAIL_HACK (1)
#ifdef THUMBNAIL_HACK
-# include <qfileinfo.h>
+# include <tqfileinfo.h>
# include <ktrader.h>
#endif
@@ -122,7 +122,7 @@ int kdemain(int argc, char **argv)
return 0;
}
-ThumbnailProtocol::ThumbnailProtocol(const QCString &pool, const QCString &app)
+ThumbnailProtocol::ThumbnailProtocol(const TQCString &pool, const TQCString &app)
: SlaveBase("thumbnail", pool, app)
{
m_creators.setAutoDelete(true);
@@ -144,7 +144,7 @@ void ThumbnailProtocol::get(const KURL &url)
if (m_mimeType.isEmpty())
{
kdDebug(7115) << "PATH: " << url.path() << endl;
- QFileInfo info(url.path());
+ TQFileInfo info(url.path());
if (info.isDir())
{
// We cannot process a directory
@@ -204,7 +204,7 @@ void ThumbnailProtocol::get(const KURL &url)
if (m_iconAlpha)
m_iconAlpha = (m_iconAlpha << 24) | 0xffffff;
- QImage img;
+ TQImage img;
KConfigGroup group( KGlobal::config(), "PreviewSettings" );
@@ -222,7 +222,7 @@ void ThumbnailProtocol::get(const KURL &url)
if (info.isValid())
{
KFileMetaInfoItem item = info.item(KFileMimeTypeInfo::Thumbnail);
- if (item.isValid() && item.value().type() == QVariant::Image)
+ if (item.isValid() && item.value().type() == TQVariant::Image)
{
img = item.value().toImage();
kdDebug(7115) << "using KFMI for the thumbnail\n";
@@ -236,17 +236,17 @@ void ThumbnailProtocol::get(const KURL &url)
if (!kfmiThumb)
{
kdDebug(7115) << "using thumb creator for the thumbnail\n";
- QString plugin = metaData("plugin");
+ TQString plugin = metaData("plugin");
#ifdef THUMBNAIL_HACK
if (plugin.isEmpty())
{
KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
- QMap<QString, KService::Ptr> mimeMap;
+ TQMap<TQString, KService::Ptr> mimeMap;
for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
{
- QStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
- for (QStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt)
+ TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
+ for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt)
{
if ((*mt)==m_mimeType)
{
@@ -269,9 +269,9 @@ void ThumbnailProtocol::get(const KURL &url)
ThumbCreator *creator = m_creators[plugin];
if (!creator)
{
- // Don't use KLibFactory here, this is not a QObject and
+ // Don't use KLibFactory here, this is not a TQObject and
// neither is ThumbCreator
- KLibrary *library = KLibLoader::self()->library(QFile::encodeName(plugin));
+ KLibrary *library = KLibLoader::self()->library(TQFile::encodeName(plugin));
if (library)
{
newCreator create = (newCreator)library->symbol("new_creator");
@@ -307,26 +307,26 @@ void ThumbnailProtocol::get(const KURL &url)
#ifndef USE_KINSTANCE
if (flags & ThumbCreator::DrawFrame)
{
- QPixmap pix;
+ TQPixmap pix;
pix.convertFromImage(img);
int x2 = pix.width() - 1;
int y2 = pix.height() - 1;
// paint a black rectangle around the "page"
- QPainter p;
+ TQPainter p;
p.begin( &pix );
- p.setPen( QColor( 48, 48, 48 ));
+ p.setPen( TQColor( 48, 48, 48 ));
p.drawLine( x2, 0, x2, y2 );
p.drawLine( 0, y2, x2, y2 );
- p.setPen( QColor( 215, 215, 215 ));
+ p.setPen( TQColor( 215, 215, 215 ));
p.drawLine( 0, 0, x2, 0 );
p.drawLine( 0, 0, 0, y2 );
p.end();
- const QBitmap *mask = pix.mask();
+ const TQBitmap *mask = pix.mask();
if ( mask ) // need to update it so we can see the frame
{
- QBitmap bitmap( *mask );
- QPainter painter;
+ TQBitmap bitmap( *mask );
+ TQPainter painter;
painter.begin( &bitmap );
painter.drawLine( x2, 0, x2, y2 );
painter.drawLine( 0, y2, x2, y2 );
@@ -344,7 +344,7 @@ void ThumbnailProtocol::get(const KURL &url)
if ((flags & ThumbCreator::BlendIcon) && KGlobal::iconLoader()->alphaBlending(KIcon::Desktop))
{
// blending the mimetype icon in
- QImage icon = getIcon();
+ TQImage icon = getIcon();
int x = img.width() - icon.width() - 4;
x = QMAX( x, 0 );
@@ -359,7 +359,7 @@ void ThumbnailProtocol::get(const KURL &url)
return;
}
- const QString shmid = metaData("shmid");
+ const TQString shmid = metaData("shmid");
if (shmid.isEmpty())
{
#ifdef THUMBNAIL_HACK
@@ -367,7 +367,7 @@ void ThumbnailProtocol::get(const KURL &url)
{
// If thumbnail was called directly from Konqueror, then the image needs to be raw
//kdDebug(7115) << "RAW IMAGE TO STREAM" << endl;
- QBuffer buf;
+ TQBuffer buf;
if (!buf.open(IO_WriteOnly))
{
error(KIO::ERR_INTERNAL, i18n("Could not write image."));
@@ -380,8 +380,8 @@ void ThumbnailProtocol::get(const KURL &url)
else
#endif
{
- QByteArray imgData;
- QDataStream stream( imgData, IO_WriteOnly );
+ TQByteArray imgData;
+ TQDataStream stream( imgData, IO_WriteOnly );
//kdDebug(7115) << "IMAGE TO STREAM" << endl;
stream << img;
data(imgData);
@@ -389,8 +389,8 @@ void ThumbnailProtocol::get(const KURL &url)
}
else
{
- QByteArray imgData;
- QDataStream stream( imgData, IO_WriteOnly );
+ TQByteArray imgData;
+ TQDataStream stream( imgData, IO_WriteOnly );
//kdDebug(7115) << "IMAGE TO SHMID" << endl;
void *shmaddr = shmat(shmid.toInt(), 0, 0);
if (shmaddr == (void *)-1)
@@ -415,12 +415,12 @@ void ThumbnailProtocol::get(const KURL &url)
finished();
}
-const QImage& ThumbnailProtocol::getIcon()
+const TQImage& ThumbnailProtocol::getIcon()
{
- QImage* icon = m_iconDict.find(m_mimeType);
+ TQImage* icon = m_iconDict.find(m_mimeType);
if ( !icon ) // generate it!
{
- icon = new QImage( KMimeType::mimeType(m_mimeType)->pixmap( KIcon::Desktop, m_iconSize ).convertToImage() );
+ icon = new TQImage( KMimeType::mimeType(m_mimeType)->pixmap( KIcon::Desktop, m_iconSize ).convertToImage() );
icon->setAlphaBuffer( true );
int w = icon->width();
diff --git a/kioslave/thumbnail/thumbnail.h b/kioslave/thumbnail/thumbnail.h
index 23118e21c..0bd4c1412 100644
--- a/kioslave/thumbnail/thumbnail.h
+++ b/kioslave/thumbnail/thumbnail.h
@@ -20,7 +20,7 @@
#ifndef _THUMBNAIL_H_
#define _THUMBNAIL_H_
-#include <qdict.h>
+#include <tqdict.h>
#include <kio/slavebase.h>
@@ -30,25 +30,25 @@ class QImage;
class ThumbnailProtocol : public KIO::SlaveBase
{
public:
- ThumbnailProtocol(const QCString &pool, const QCString &app);
+ ThumbnailProtocol(const TQCString &pool, const TQCString &app);
virtual ~ThumbnailProtocol();
virtual void get(const KURL &url);
protected:
- const QImage& getIcon();
+ const TQImage& getIcon();
private:
- QString m_mimeType;
+ TQString m_mimeType;
int m_width;
int m_height;
bool m_keepAspectRatio;
int m_iconSize;
int m_iconAlpha;
// Thumbnail creators
- QDict<ThumbCreator> m_creators;
+ TQDict<ThumbCreator> m_creators;
// transparent icon cache
- QDict<QImage> m_iconDict;
+ TQDict<TQImage> m_iconDict;
};
#endif
diff --git a/kioslave/trash/kfile-plugin/kfile_trash.cpp b/kioslave/trash/kfile-plugin/kfile_trash.cpp
index baa27143c..edd57014d 100644
--- a/kioslave/trash/kfile-plugin/kfile_trash.cpp
+++ b/kioslave/trash/kfile-plugin/kfile_trash.cpp
@@ -23,16 +23,16 @@
#include <kgenericfactory.h>
#include <kdebug.h>
-#include <qfile.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
typedef KGenericFactory<KTrashPlugin> TrashFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_trash, TrashFactory("kfile_trash"))
-KTrashPlugin::KTrashPlugin(QObject *parent, const char *name,
- const QStringList &args) : KFilePlugin(parent, name, args)
+KTrashPlugin::KTrashPlugin(TQObject *parent, const char *name,
+ const TQStringList &args) : KFilePlugin(parent, name, args)
{
KGlobal::locale()->insertCatalogue( "kio_trash" );
@@ -44,7 +44,7 @@ KTrashPlugin::KTrashPlugin(QObject *parent, const char *name,
(void)impl.init();
}
-void KTrashPlugin::makeMimeTypeInfo(const QString& mimeType)
+void KTrashPlugin::makeMimeTypeInfo(const TQString& mimeType)
{
KFileMimeTypeInfo* info = addMimeTypeInfo( mimeType );
@@ -52,8 +52,8 @@ void KTrashPlugin::makeMimeTypeInfo(const QString& mimeType)
addGroupInfo(info, "General", i18n("General"));
KFileMimeTypeInfo::ItemInfo* item;
- item = addItemInfo(group, "OriginalPath", i18n("Original Path"), QVariant::String);
- item = addItemInfo(group, "DateOfDeletion", i18n("Date of Deletion"), QVariant::DateTime);
+ item = addItemInfo(group, "OriginalPath", i18n("Original Path"), TQVariant::String);
+ item = addItemInfo(group, "DateOfDeletion", i18n("Date of Deletion"), TQVariant::DateTime);
}
bool KTrashPlugin::readInfo(KFileMetaInfo& info, uint)
@@ -63,7 +63,7 @@ bool KTrashPlugin::readInfo(KFileMetaInfo& info, uint)
if ( url.protocol()=="system"
&& url.path().startsWith("/trash") )
{
- QString path = url.path();
+ TQString path = url.path();
path.remove(0, 6);
url.setProtocol("trash");
url.setPath(path);
@@ -74,8 +74,8 @@ bool KTrashPlugin::readInfo(KFileMetaInfo& info, uint)
return false;
int trashId;
- QString fileId;
- QString relativePath;
+ TQString fileId;
+ TQString relativePath;
if ( !TrashImpl::parseURL( url, trashId, fileId, relativePath ) )
return false;
diff --git a/kioslave/trash/kfile-plugin/kfile_trash.h b/kioslave/trash/kfile-plugin/kfile_trash.h
index 8316f7402..a041999a4 100644
--- a/kioslave/trash/kfile-plugin/kfile_trash.h
+++ b/kioslave/trash/kfile-plugin/kfile_trash.h
@@ -31,11 +31,11 @@ class KTrashPlugin: public KFilePlugin
Q_OBJECT
public:
- KTrashPlugin(QObject *parent, const char *name, const QStringList& args);
+ KTrashPlugin(TQObject *parent, const char *name, const TQStringList& args);
virtual bool readInfo(KFileMetaInfo& info, uint what);
private:
- void makeMimeTypeInfo(const QString& mimeType);
+ void makeMimeTypeInfo(const TQString& mimeType);
TrashImpl impl;
};
diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp
index 7912cbb7c..1210bb59a 100644
--- a/kioslave/trash/kio_trash.cpp
+++ b/kioslave/trash/kio_trash.cpp
@@ -29,10 +29,10 @@
#include <kprocess.h>
#include <dcopclient.h>
-#include <qdatastream.h>
-#include <qtextstream.h>
-#include <qfile.h>
-#include <qeventloop.h>
+#include <tqdatastream.h>
+#include <tqtextstream.h>
+#include <tqfile.h>
+#include <tqeventloop.h>
#include <time.h>
#include <pwd.h>
@@ -73,15 +73,15 @@ extern "C" {
return; \
}
-TrashProtocol::TrashProtocol( const QCString& protocol, const QCString &pool, const QCString &app)
+TrashProtocol::TrashProtocol( const TQCString& protocol, const TQCString &pool, const TQCString &app)
: SlaveBase(protocol, pool, app )
{
struct passwd *user = getpwuid( getuid() );
if ( user )
- m_userName = QString::fromLatin1(user->pw_name);
+ m_userName = TQString::fromLatin1(user->pw_name);
struct group *grp = getgrgid( getgid() );
if ( grp )
- m_groupName = QString::fromLatin1(grp->gr_name);
+ m_groupName = TQString::fromLatin1(grp->gr_name);
}
TrashProtocol::~TrashProtocol()
@@ -91,7 +91,7 @@ TrashProtocol::~TrashProtocol()
void TrashProtocol::restore( const KURL& trashURL )
{
int trashId;
- QString fileId, relativePath;
+ TQString fileId, relativePath;
bool ok = TrashImpl::parseURL( trashURL, trashId, fileId, relativePath );
if ( !ok ) {
error( KIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( trashURL.prettyURL() ) );
@@ -109,9 +109,9 @@ void TrashProtocol::restore( const KURL& trashURL )
dest.addPath( relativePath );
// Check that the destination directory exists, to improve the error code in case it doesn't.
- const QString destDir = dest.directory();
+ const TQString destDir = dest.directory();
KDE_struct_stat buff;
- if ( KDE_lstat( QFile::encodeName( destDir ), &buff ) == -1 ) {
+ if ( KDE_lstat( TQFile::encodeName( destDir ), &buff ) == -1 ) {
error( KIO::ERR_SLAVE_DEFINED,
i18n( "The directory %1 does not exist anymore, so it is not possible to restore this item to its original location. "
"You can either recreate that directory and use the restore operation again, or drag the item anywhere else to restore it." ).arg( destDir ) );
@@ -154,16 +154,16 @@ void TrashProtocol::copyOrMove( const KURL &src, const KURL &dest, bool overwrit
if ( src.protocol() == "trash" && dest.isLocalFile() ) {
// Extracting (e.g. via dnd). Ignore original location stored in info file.
int trashId;
- QString fileId, relativePath;
+ TQString fileId, relativePath;
bool ok = TrashImpl::parseURL( src, trashId, fileId, relativePath );
if ( !ok ) {
error( KIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( src.prettyURL() ) );
return;
}
- const QString destPath = dest.path();
- if ( QFile::exists( destPath ) ) {
+ const TQString destPath = dest.path();
+ if ( TQFile::exists( destPath ) ) {
if ( overwrite ) {
- ok = QFile::remove( destPath );
+ ok = TQFile::remove( destPath );
Q_ASSERT( ok ); // ### TODO
} else {
error( KIO::ERR_FILE_ALREADY_EXIST, destPath );
@@ -187,20 +187,20 @@ void TrashProtocol::copyOrMove( const KURL &src, const KURL &dest, bool overwrit
}
return;
} else if ( src.isLocalFile() && dest.protocol() == "trash" ) {
- QString dir = dest.directory();
+ TQString dir = dest.directory();
//kdDebug() << "trashing a file to " << dir << endl;
// Trashing a file
// We detect the case where this isn't normal trashing, but
// e.g. if kwrite tries to save (moving tempfile over destination)
if ( dir.length() <= 1 && src.fileName() == dest.fileName() ) // new toplevel entry
{
- const QString srcPath = src.path();
+ const TQString srcPath = src.path();
// In theory we should use TrashImpl::parseURL to give the right filename to createInfo,
// in case the trash URL didn't contain the same filename as srcPath.
// But this can only happen with copyAs/moveAs, not available in the GUI
// for the trash (New/... or Rename from iconview/listview).
int trashId;
- QString fileId;
+ TQString fileId;
if ( !impl.createInfo( srcPath, trashId, fileId ) ) {
error( impl.lastErrorCode(), impl.lastErrorMessage() );
} else {
@@ -217,7 +217,7 @@ void TrashProtocol::copyOrMove( const KURL &src, const KURL &dest, bool overwrit
error( impl.lastErrorCode(), impl.lastErrorMessage() );
} else {
// Inform caller of the final URL. Used by konq_undo.
- const KURL url = impl.makeURL( trashId, fileId, QString::null );
+ const KURL url = impl.makeURL( trashId, fileId, TQString::null );
setMetaData( "trashURL-" + srcPath, url.url() );
finished();
}
@@ -233,7 +233,7 @@ void TrashProtocol::copyOrMove( const KURL &src, const KURL &dest, bool overwrit
error( KIO::ERR_UNSUPPORTED_ACTION, "should never happen" );
}
-static void addAtom(KIO::UDSEntry& entry, unsigned int ID, long long l, const QString& s = QString::null)
+static void addAtom(KIO::UDSEntry& entry, unsigned int ID, long long l, const TQString& s = TQString::null)
{
KIO::UDSAtom atom;
atom.m_uds = ID;
@@ -256,7 +256,7 @@ void TrashProtocol::createTopLevelDirEntry(KIO::UDSEntry& entry)
void TrashProtocol::stat(const KURL& url)
{
INIT_IMPL;
- const QString path = url.path();
+ const TQString path = url.path();
if( path.isEmpty() || path == "/" ) {
// The root is "virtual" - it's not a single physical directory
KIO::UDSEntry entry;
@@ -265,7 +265,7 @@ void TrashProtocol::stat(const KURL& url)
finished();
} else {
int trashId;
- QString fileId, relativePath;
+ TQString fileId, relativePath;
bool ok = TrashImpl::parseURL( url, trashId, fileId, relativePath );
@@ -279,15 +279,15 @@ void TrashProtocol::stat(const KURL& url)
return;
}
- const QString filePath = impl.physicalPath( trashId, fileId, relativePath );
+ const TQString filePath = impl.physicalPath( trashId, fileId, relativePath );
if ( filePath.isEmpty() ) {
error( impl.lastErrorCode(), impl.lastErrorMessage() );
return;
}
- QString fileName = filePath.section('/', -1, -1, QString::SectionSkipEmpty);
+ TQString fileName = filePath.section('/', -1, -1, TQString::SectionSkipEmpty);
- QString fileURL = QString::null;
+ TQString fileURL = TQString::null;
if ( url.path().length() > 1 ) {
fileURL = url.url();
}
@@ -310,7 +310,7 @@ void TrashProtocol::stat(const KURL& url)
void TrashProtocol::del( const KURL &url, bool /*isfile*/ )
{
int trashId;
- QString fileId, relativePath;
+ TQString fileId, relativePath;
bool ok = TrashImpl::parseURL( url, trashId, fileId, relativePath );
if ( !ok ) {
@@ -342,14 +342,14 @@ void TrashProtocol::listDir(const KURL& url)
return;
}
int trashId;
- QString fileId;
- QString relativePath;
+ TQString fileId;
+ TQString relativePath;
bool ok = TrashImpl::parseURL( url, trashId, fileId, relativePath );
if ( !ok ) {
error( KIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( url.prettyURL() ) );
return;
}
- //was: const QString physicalPath = impl.physicalPath( trashId, fileId, relativePath );
+ //was: const TQString physicalPath = impl.physicalPath( trashId, fileId, relativePath );
// Get info for deleted directory - the date of deletion and orig path will be used
// for all the items in it, and we need the physicalPath.
@@ -366,22 +366,22 @@ void TrashProtocol::listDir(const KURL& url)
// List subdir. Can't use kio_file here since we provide our own info...
kdDebug() << k_funcinfo << "listing " << info.physicalPath << endl;
- QStrList entryNames = impl.listDir( info.physicalPath );
+ TQStrList entryNames = impl.listDir( info.physicalPath );
totalSize( entryNames.count() );
KIO::UDSEntry entry;
- QStrListIterator entryIt( entryNames );
+ TQStrListIterator entryIt( entryNames );
for (; entryIt.current(); ++entryIt) {
- QString fileName = QFile::decodeName( entryIt.current() );
+ TQString fileName = TQFile::decodeName( entryIt.current() );
if ( fileName == ".." )
continue;
- const QString filePath = info.physicalPath + "/" + fileName;
+ const TQString filePath = info.physicalPath + "/" + fileName;
// shouldn't be necessary
- //const QString url = TrashImpl::makeURL( trashId, fileId, relativePath + "/" + fileName );
+ //const TQString url = TrashImpl::makeURL( trashId, fileId, relativePath + "/" + fileName );
entry.clear();
TrashedFileInfo infoForItem( info );
infoForItem.origPath += '/';
infoForItem.origPath += fileName;
- if ( ok && createUDSEntry( filePath, fileName, QString::null /*url*/, entry, infoForItem ) ) {
+ if ( ok && createUDSEntry( filePath, fileName, TQString::null /*url*/, entry, infoForItem ) ) {
listEntry( entry, false );
}
}
@@ -390,9 +390,9 @@ void TrashProtocol::listDir(const KURL& url)
finished();
}
-bool TrashProtocol::createUDSEntry( const QString& physicalPath, const QString& fileName, const QString& url, KIO::UDSEntry& entry, const TrashedFileInfo& info )
+bool TrashProtocol::createUDSEntry( const TQString& physicalPath, const TQString& fileName, const TQString& url, KIO::UDSEntry& entry, const TrashedFileInfo& info )
{
- QCString physicalPath_c = QFile::encodeName( physicalPath );
+ TQCString physicalPath_c = TQFile::encodeName( physicalPath );
KDE_struct_stat buff;
if ( KDE_lstat( physicalPath_c, &buff ) == -1 ) {
kdWarning() << "couldn't stat " << physicalPath << endl;
@@ -405,7 +405,7 @@ bool TrashProtocol::createUDSEntry( const QString& physicalPath, const QString&
buffer2[ n ] = 0;
}
- addAtom( entry, KIO::UDS_LINK_DEST, 0, QFile::decodeName( buffer2 ) );
+ addAtom( entry, KIO::UDS_LINK_DEST, 0, TQFile::decodeName( buffer2 ) );
// Follow symlink
// That makes sense in kio_file, but not in the trash, especially for the size
// #136876
@@ -449,7 +449,7 @@ void TrashProtocol::listRoot()
createTopLevelDirEntry( entry );
listEntry( entry, false );
for ( TrashedFileInfoList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
- const KURL url = TrashImpl::makeURL( (*it).trashId, (*it).fileId, QString::null );
+ const KURL url = TrashImpl::makeURL( (*it).trashId, (*it).fileId, TQString::null );
KURL origURL;
origURL.setPath( (*it).origPath );
entry.clear();
@@ -461,10 +461,10 @@ void TrashProtocol::listRoot()
finished();
}
-void TrashProtocol::special( const QByteArray & data )
+void TrashProtocol::special( const TQByteArray & data )
{
INIT_IMPL;
- QDataStream stream( data, IO_ReadOnly );
+ TQDataStream stream( data, IO_ReadOnly );
int cmd;
stream >> cmd;
@@ -488,7 +488,7 @@ void TrashProtocol::special( const QByteArray & data )
}
default:
kdWarning(7116) << "Unknown command in special(): " << cmd << endl;
- error( KIO::ERR_UNSUPPORTED_ACTION, QString::number(cmd) );
+ error( KIO::ERR_UNSUPPORTED_ACTION, TQString::number(cmd) );
break;
}
}
@@ -516,14 +516,14 @@ void TrashProtocol::get( const KURL& url )
return;
}
int trashId;
- QString fileId;
- QString relativePath;
+ TQString fileId;
+ TQString relativePath;
bool ok = TrashImpl::parseURL( url, trashId, fileId, relativePath );
if ( !ok ) {
error( KIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( url.prettyURL() ) );
return;
}
- const QString physicalPath = impl.physicalPath( trashId, fileId, relativePath );
+ const TQString physicalPath = impl.physicalPath( trashId, fileId, relativePath );
if ( physicalPath.isEmpty() ) {
error( impl.lastErrorCode(), impl.lastErrorMessage() );
return;
@@ -534,21 +534,21 @@ void TrashProtocol::get( const KURL& url )
KURL fileURL;
fileURL.setPath( physicalPath );
KIO::Job* job = KIO::get( fileURL );
- connect( job, SIGNAL( data( KIO::Job*, const QByteArray& ) ),
- this, SLOT( slotData( KIO::Job*, const QByteArray& ) ) );
- connect( job, SIGNAL( mimetype( KIO::Job*, const QString& ) ),
- this, SLOT( slotMimetype( KIO::Job*, const QString& ) ) );
- connect( job, SIGNAL( result(KIO::Job *) ),
- this, SLOT( jobFinished(KIO::Job *) ) );
+ connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQT_SIGNAL( mimetype( KIO::Job*, const TQString& ) ),
+ this, TQT_SLOT( slotMimetype( KIO::Job*, const TQString& ) ) );
+ connect( job, TQT_SIGNAL( result(KIO::Job *) ),
+ this, TQT_SLOT( jobFinished(KIO::Job *) ) );
qApp->eventLoop()->enterLoop();
}
-void TrashProtocol::slotData( KIO::Job*, const QByteArray&arr )
+void TrashProtocol::slotData( KIO::Job*, const TQByteArray&arr )
{
data( arr );
}
-void TrashProtocol::slotMimetype( KIO::Job*, const QString& mt )
+void TrashProtocol::slotMimetype( KIO::Job*, const TQString& mt )
{
mimeType( mt );
}
@@ -570,13 +570,13 @@ void TrashProtocol::mkdir( const KURL& url, int /*permissions*/ )
// ############ Problem: we don't know the original path.
// Let's try to avoid this case (we should get to copy() instead, for local files)
kdDebug() << "mkdir: " << url << endl;
- QString dir = url.directory();
+ TQString dir = url.directory();
if ( dir.length() <= 1 ) // new toplevel entry
{
// ## we should use TrashImpl::parseURL to give the right filename to createInfo
int trashId;
- QString fileId;
+ TQString fileId;
if ( !impl.createInfo( url.path(), trashId, fileId ) ) {
error( impl.lastErrorCode(), impl.lastErrorMessage() );
} else {
diff --git a/kioslave/trash/kio_trash.h b/kioslave/trash/kio_trash.h
index 726db431e..37ea1944f 100644
--- a/kioslave/trash/kio_trash.h
+++ b/kioslave/trash/kio_trash.h
@@ -27,11 +27,11 @@ namespace KIO { class Job; }
typedef TrashImpl::TrashedFileInfo TrashedFileInfo;
typedef TrashImpl::TrashedFileInfoList TrashedFileInfoList;
-class TrashProtocol : public QObject, public KIO::SlaveBase
+class TrashProtocol : public TQObject, public KIO::SlaveBase
{
Q_OBJECT
public:
- TrashProtocol( const QCString& protocol, const QCString &pool, const QCString &app);
+ TrashProtocol( const TQCString& protocol, const TQCString &pool, const TQCString &app);
virtual ~TrashProtocol();
virtual void stat(const KURL& url);
virtual void listDir(const KURL& url);
@@ -47,25 +47,25 @@ public:
* 2 : migrate old (pre-kde-3.4) trash contents
* 3 : restore a file to its original location. Args: KURL trashURL.
*/
- virtual void special( const QByteArray & data );
+ virtual void special( const TQByteArray & data );
private slots:
- void slotData( KIO::Job*, const QByteArray& );
- void slotMimetype( KIO::Job*, const QString& );
+ void slotData( KIO::Job*, const TQByteArray& );
+ void slotMimetype( KIO::Job*, const TQString& );
void jobFinished( KIO::Job* job );
private:
typedef enum CopyOrMove { Copy, Move };
void copyOrMove( const KURL& src, const KURL& dest, bool overwrite, CopyOrMove action );
void createTopLevelDirEntry(KIO::UDSEntry& entry);
- bool createUDSEntry( const QString& physicalPath, const QString& fileName, const QString& url,
+ bool createUDSEntry( const TQString& physicalPath, const TQString& fileName, const TQString& url,
KIO::UDSEntry& entry, const TrashedFileInfo& info );
void listRoot();
void restore( const KURL& trashURL );
TrashImpl impl;
- QString m_userName;
- QString m_groupName;
+ TQString m_userName;
+ TQString m_groupName;
};
#endif
diff --git a/kioslave/trash/ktrash.cpp b/kioslave/trash/ktrash.cpp
index 4fa5ccd27..0c9710367 100644
--- a/kioslave/trash/ktrash.cpp
+++ b/kioslave/trash/ktrash.cpp
@@ -50,8 +50,8 @@ int main(int argc, char *argv[])
if ( args->isSet( "empty" ) ) {
// We use a kio job instead of linking to TrashImpl, for a smaller binary
// (and the possibility of a central service at some point)
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)1;
KIO::Job* job = KIO::special( "trash:/", packedArgs );
(void)KIO::NetAccess::synchronousRun( job, 0 );
@@ -65,8 +65,8 @@ int main(int argc, char *argv[])
#if 0
// This is only for testing. KDesktop handles it automatically.
if ( args->isSet( "migrate" ) ) {
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)2;
KIO::Job* job = KIO::special( "trash:/", packedArgs );
(void)KIO::NetAccess::synchronousRun( job, 0 );
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
}
#endif
- QCString restoreArg = args->getOption( "restore" );
+ TQCString restoreArg = args->getOption( "restore" );
if ( !restoreArg.isEmpty() ) {
if (restoreArg.find("system:/trash")==0) {
@@ -88,8 +88,8 @@ int main(int argc, char *argv[])
return 1;
}
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)3 << trashURL;
KIO::Job* job = KIO::special( trashURL, packedArgs );
bool ok = KIO::NetAccess::synchronousRun( job, 0 );
diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp
index 4557c5031..fb6927d3e 100644
--- a/kioslave/trash/testtrash.cpp
+++ b/kioslave/trash/testtrash.cpp
@@ -34,9 +34,9 @@
#include <kdebug.h>
#include <kcmdlineargs.h>
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qvaluevector.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
+#include <tqvaluevector.h>
#include <stdio.h>
#include <stdlib.h>
@@ -45,12 +45,12 @@
#include <kfileitem.h>
#include <kstandarddirs.h>
-static bool check(const QString& txt, QString a, QString b)
+static bool check(const TQString& txt, TQString a, TQString b)
{
if (a.isEmpty())
- a = QString::null;
+ a = TQString::null;
if (b.isEmpty())
- b = QString::null;
+ b = TQString::null;
if (a == b) {
kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "ok" << endl;
}
@@ -69,7 +69,7 @@ static bool check(const QString& txt, QString a, QString b)
int main(int argc, char *argv[])
{
- // Ensure a known QFile::encodeName behavior for trashUtf8FileFromHome
+ // Ensure a known TQFile::encodeName behavior for trashUtf8FileFromHome
// However this assume your $HOME doesn't use characters from other locales...
setenv( "LC_ALL", "en_GB.ISO-8859-1", 1 );
#ifdef UTF8TEST
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
#endif
// Use another directory than the real one, just to keep things clean
- setenv( "XDG_DATA_HOME", QFile::encodeName( QDir::homeDirPath() + "/.local-testtrash" ), true );
+ setenv( "XDG_DATA_HOME", TQFile::encodeName( TQDir::homeDirPath() + "/.local-testtrash" ), true );
setenv( "KDE_FORK_SLAVES", "yes", true );
KApplication::disableAutoDcopRegistration();
@@ -93,44 +93,44 @@ int main(int argc, char *argv[])
return 0; // success. The exit(1) in check() is what happens in case of failure.
}
-QString TestTrash::homeTmpDir() const
+TQString TestTrash::homeTmpDir() const
{
- return QDir::homeDirPath() + "/.kde/testtrash/";
+ return TQDir::homeDirPath() + "/.kde/testtrash/";
}
-QString TestTrash::readOnlyDirPath() const
+TQString TestTrash::readOnlyDirPath() const
{
- return homeTmpDir() + QString( "readonly" );
+ return homeTmpDir() + TQString( "readonly" );
}
-QString TestTrash::otherTmpDir() const
+TQString TestTrash::otherTmpDir() const
{
// This one needs to be on another partition
return "/tmp/testtrash/";
}
-QString TestTrash::utf8FileName() const
+TQString TestTrash::utf8FileName() const
{
- return QString( "test" ) + QChar( 0x2153 ); // "1/3" character, not part of latin1
+ return TQString( "test" ) + TQChar( 0x2153 ); // "1/3" character, not part of latin1
}
-QString TestTrash::umlautFileName() const
+TQString TestTrash::umlautFileName() const
{
- return QString( "umlaut" ) + QChar( 0xEB );
+ return TQString( "umlaut" ) + TQChar( 0xEB );
}
-static void removeFile( const QString& trashDir, const QString& fileName )
+static void removeFile( const TQString& trashDir, const TQString& fileName )
{
- QDir dir;
+ TQDir dir;
dir.remove( trashDir + fileName );
- assert( !QDir( trashDir + fileName ).exists() );
+ assert( !TQDir( trashDir + fileName ).exists() );
}
-static void removeDir( const QString& trashDir, const QString& dirName )
+static void removeDir( const TQString& trashDir, const TQString& dirName )
{
- QDir dir;
+ TQDir dir;
dir.rmdir( trashDir + dirName );
- assert( !QDir( trashDir + dirName ).exists() );
+ assert( !TQDir( trashDir + dirName ).exists() );
}
void TestTrash::setup()
@@ -148,7 +148,7 @@ void TestTrash::setup()
m_otherPartitionId = 0;
m_tmpIsWritablePartition = false;
m_tmpTrashId = -1;
- QValueVector<int> writableTopDirs;
+ TQValueVector<int> writableTopDirs;
for ( TrashImpl::TrashDirMap::ConstIterator it = trashDirs.begin(); it != trashDirs.end() ; ++it ) {
if ( it.key() == 0 ) {
assert( it.data() == m_trashDir );
@@ -156,8 +156,8 @@ void TestTrash::setup()
foundTrashDir = true;
} else {
assert( topDirs.find( it.key() ) != topDirs.end() );
- const QString topdir = topDirs[it.key()];
- if ( QFileInfo( topdir ).isWritable() ) {
+ const TQString topdir = topDirs[it.key()];
+ if ( TQFileInfo( topdir ).isWritable() ) {
writableTopDirs.append( it.key() );
if ( topdir == "/tmp/" ) {
m_tmpIsWritablePartition = true;
@@ -174,9 +174,9 @@ void TestTrash::setup()
}
}
}
- for ( QValueVector<int>::const_iterator it = writableTopDirs.begin(); it != writableTopDirs.end(); ++it ) {
- const QString topdir = topDirs[ *it ];
- const QString trashdir = trashDirs[ *it ];
+ for ( TQValueVector<int>::const_iterator it = writableTopDirs.begin(); it != writableTopDirs.end(); ++it ) {
+ const TQString topdir = topDirs[ *it ];
+ const TQString trashdir = trashDirs[ *it ];
assert( !topdir.isEmpty() );
assert( !trashDirs.isEmpty() );
if ( topdir != "/tmp/" || // we'd prefer not to use /tmp here, to separate the tests
@@ -196,17 +196,17 @@ void TestTrash::setup()
kdWarning() << "No writable partition other than $HOME found, some tests will be skipped" << endl;
// Start with a clean base dir
- if ( QFileInfo( homeTmpDir() ).exists() ) {
+ if ( TQFileInfo( homeTmpDir() ).exists() ) {
bool ok = KIO::NetAccess::del( homeTmpDir(), 0 );
if ( !ok )
kdFatal() << "Couldn't delete " << homeTmpDir() << endl;
}
- if ( QFileInfo( otherTmpDir() ).exists() ) {
+ if ( TQFileInfo( otherTmpDir() ).exists() ) {
bool ok = KIO::NetAccess::del( otherTmpDir(), 0 );
if ( !ok )
kdFatal() << "Couldn't delete " << otherTmpDir() << endl;
}
- QDir dir; // TT: why not a static method?
+ TQDir dir; // TT: why not a static method?
bool ok = dir.mkdir( homeTmpDir() );
if ( !ok )
kdFatal() << "Couldn't create " << homeTmpDir() << endl;
@@ -325,17 +325,17 @@ void TestTrash::runAll()
void TestTrash::urlTestFile()
{
- const KURL url = TrashImpl::makeURL( 1, "fileId", QString::null );
+ const KURL url = TrashImpl::makeURL( 1, "fileId", TQString::null );
check( "makeURL for a file", url.url(), "trash:/1-fileId" );
int trashId;
- QString fileId;
- QString relativePath;
+ TQString fileId;
+ TQString relativePath;
bool ok = TrashImpl::parseURL( url, trashId, fileId, relativePath );
assert( ok );
- check( "parseURL: trashId", QString::number( trashId ), "1" );
+ check( "parseURL: trashId", TQString::number( trashId ), "1" );
check( "parseURL: fileId", fileId, "fileId" );
- check( "parseURL: relativePath", relativePath, QString::null );
+ check( "parseURL: relativePath", relativePath, TQString::null );
}
void TestTrash::urlTestDirectory()
@@ -344,11 +344,11 @@ void TestTrash::urlTestDirectory()
check( "makeURL", url.url(), "trash:/1-fileId/subfile" );
int trashId;
- QString fileId;
- QString relativePath;
+ TQString fileId;
+ TQString relativePath;
bool ok = TrashImpl::parseURL( url, trashId, fileId, relativePath );
assert( ok );
- check( "parseURL: trashId", QString::number( trashId ), "1" );
+ check( "parseURL: trashId", TQString::number( trashId ), "1" );
check( "parseURL: fileId", fileId, "fileId" );
check( "parseURL: relativePath", relativePath, "subfile" );
}
@@ -359,54 +359,54 @@ void TestTrash::urlTestSubDirectory()
check( "makeURL", url.url(), "trash:/1-fileId/subfile/foobar" );
int trashId;
- QString fileId;
- QString relativePath;
+ TQString fileId;
+ TQString relativePath;
bool ok = TrashImpl::parseURL( url, trashId, fileId, relativePath );
assert( ok );
- check( "parseURL: trashId", QString::number( trashId ), "1" );
+ check( "parseURL: trashId", TQString::number( trashId ), "1" );
check( "parseURL: fileId", fileId, "fileId" );
check( "parseURL: relativePath", relativePath, "subfile/foobar" );
}
-static void checkInfoFile( const QString& infoPath, const QString& origFilePath )
+static void checkInfoFile( const TQString& infoPath, const TQString& origFilePath )
{
kdDebug() << k_funcinfo << infoPath << endl;
- QFileInfo info( infoPath );
+ TQFileInfo info( infoPath );
assert( info.exists() );
assert( info.isFile() );
KSimpleConfig infoFile( info.absFilePath(), true );
if ( !infoFile.hasGroup( "Trash Info" ) )
kdFatal() << "no Trash Info group in " << info.absFilePath() << endl;
infoFile.setGroup( "Trash Info" );
- const QString origPath = infoFile.readEntry( "Path" );
+ const TQString origPath = infoFile.readEntry( "Path" );
assert( !origPath.isEmpty() );
assert( origPath == KURL::encode_string( origFilePath, KGlobal::locale()->fileEncodingMib() ) );
- const QString date = infoFile.readEntry( "DeletionDate" );
+ const TQString date = infoFile.readEntry( "DeletionDate" );
assert( !date.isEmpty() );
assert( date.contains( "T" ) );
}
-static void createTestFile( const QString& path )
+static void createTestFile( const TQString& path )
{
- QFile f( path );
+ TQFile f( path );
if ( !f.open( IO_WriteOnly ) )
kdFatal() << "Can't create " << path << endl;
f.writeBlock( "Hello world\n", 12 );
f.close();
- assert( QFile::exists( path ) );
+ assert( TQFile::exists( path ) );
}
-void TestTrash::trashFile( const QString& origFilePath, const QString& fileId )
+void TestTrash::trashFile( const TQString& origFilePath, const TQString& fileId )
{
// setup
- if ( !QFile::exists( origFilePath ) )
+ if ( !TQFile::exists( origFilePath ) )
createTestFile( origFilePath );
KURL u;
u.setPath( origFilePath );
// test
KIO::Job* job = KIO::move( u, "trash:/" );
- QMap<QString, QString> metaData;
+ TQMap<TQString, TQString> metaData;
//bool ok = KIO::NetAccess::move( u, "trash:/" );
bool ok = KIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData );
if ( !ok )
@@ -417,20 +417,20 @@ void TestTrash::trashFile( const QString& origFilePath, const QString& fileId )
} else {
checkInfoFile( m_trashDir + "/info/" + fileId + ".trashinfo", origFilePath );
- QFileInfo files( m_trashDir + "/files/" + fileId );
+ TQFileInfo files( m_trashDir + "/files/" + fileId );
assert( files.isFile() );
assert( files.size() == 12 );
}
// coolo suggests testing that the original file is actually gone, too :)
- assert( !QFile::exists( origFilePath ) );
+ assert( !TQFile::exists( origFilePath ) );
assert( !metaData.isEmpty() );
bool found = false;
- QMap<QString, QString>::ConstIterator it = metaData.begin();
+ TQMap<TQString, TQString>::ConstIterator it = metaData.begin();
for ( ; it != metaData.end() ; ++it ) {
if ( it.key().startsWith( "trashURL" ) ) {
- const QString origPath = it.key().mid( 9 );
+ const TQString origPath = it.key().mid( 9 );
KURL trashURL( it.data() );
kdDebug() << trashURL << endl;
assert( !trashURL.isEmpty() );
@@ -438,7 +438,7 @@ void TestTrash::trashFile( const QString& origFilePath, const QString& fileId )
int trashId = 0;
if ( origFilePath.startsWith( "/tmp" ) && m_tmpIsWritablePartition )
trashId = m_tmpTrashId;
- assert( trashURL.path() == "/" + QString::number( trashId ) + "-" + fileId );
+ assert( trashURL.path() == "/" + TQString::number( trashId ) + "-" + fileId );
found = true;
}
}
@@ -448,7 +448,7 @@ void TestTrash::trashFile( const QString& origFilePath, const QString& fileId )
void TestTrash::trashFileFromHome()
{
kdDebug() << k_funcinfo << endl;
- const QString fileName = "fileFromHome";
+ const TQString fileName = "fileFromHome";
trashFile( homeTmpDir() + fileName, fileName );
// Do it again, check that we got a different id
@@ -458,21 +458,21 @@ void TestTrash::trashFileFromHome()
void TestTrash::trashPercentFileFromHome()
{
kdDebug() << k_funcinfo << endl;
- const QString fileName = "file%2f";
+ const TQString fileName = "file%2f";
trashFile( homeTmpDir() + fileName, fileName );
}
void TestTrash::trashUtf8FileFromHome()
{
kdDebug() << k_funcinfo << endl;
- const QString fileName = utf8FileName();
+ const TQString fileName = utf8FileName();
trashFile( homeTmpDir() + fileName, fileName );
}
void TestTrash::trashUmlautFileFromHome()
{
kdDebug() << k_funcinfo << endl;
- const QString fileName = umlautFileName();
+ const TQString fileName = umlautFileName();
trashFile( homeTmpDir() + fileName, fileName );
}
@@ -487,7 +487,7 @@ void TestTrash::testTrashNotEmpty()
void TestTrash::trashFileFromOther()
{
kdDebug() << k_funcinfo << endl;
- const QString fileName = "fileFromOther";
+ const TQString fileName = "fileFromOther";
trashFile( otherTmpDir() + fileName, fileName );
}
@@ -498,45 +498,45 @@ void TestTrash::trashFileIntoOtherPartition()
return;
}
kdDebug() << k_funcinfo << endl;
- const QString fileName = "testtrash-file";
- const QString origFilePath = m_otherPartitionTopDir + fileName;
- const QString fileId = fileName;
+ const TQString fileName = "testtrash-file";
+ const TQString origFilePath = m_otherPartitionTopDir + fileName;
+ const TQString fileId = fileName;
// cleanup
- QFile::remove( m_otherPartitionTrashDir + "/info/" + fileId + ".trashinfo" );
- QFile::remove( m_otherPartitionTrashDir + "/files/" + fileId );
+ TQFile::remove( m_otherPartitionTrashDir + "/info/" + fileId + ".trashinfo" );
+ TQFile::remove( m_otherPartitionTrashDir + "/files/" + fileId );
// setup
- if ( !QFile::exists( origFilePath ) )
+ if ( !TQFile::exists( origFilePath ) )
createTestFile( origFilePath );
KURL u;
u.setPath( origFilePath );
// test
KIO::Job* job = KIO::move( u, "trash:/" );
- QMap<QString, QString> metaData;
+ TQMap<TQString, TQString> metaData;
bool ok = KIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData );
assert( ok );
// Note that the Path stored in the info file is relative, on other partitions (#95652)
checkInfoFile( m_otherPartitionTrashDir + "/info/" + fileId + ".trashinfo", fileName );
- QFileInfo files( m_otherPartitionTrashDir + "/files/" + fileId );
+ TQFileInfo files( m_otherPartitionTrashDir + "/files/" + fileId );
assert( files.isFile() );
assert( files.size() == 12 );
// coolo suggests testing that the original file is actually gone, too :)
- assert( !QFile::exists( origFilePath ) );
+ assert( !TQFile::exists( origFilePath ) );
assert( !metaData.isEmpty() );
bool found = false;
- QMap<QString, QString>::ConstIterator it = metaData.begin();
+ TQMap<TQString, TQString>::ConstIterator it = metaData.begin();
for ( ; it != metaData.end() ; ++it ) {
if ( it.key().startsWith( "trashURL" ) ) {
- const QString origPath = it.key().mid( 9 );
+ const TQString origPath = it.key().mid( 9 );
KURL trashURL( it.data() );
kdDebug() << trashURL << endl;
assert( !trashURL.isEmpty() );
assert( trashURL.protocol() == "trash" );
- assert( trashURL.path() == QString( "/%1-%2" ).arg( m_otherPartitionId ).arg( fileId ) );
+ assert( trashURL.path() == TQString( "/%1-%2" ).arg( m_otherPartitionId ).arg( fileId ) );
found = true;
}
}
@@ -548,30 +548,30 @@ void TestTrash::trashFileOwnedByRoot()
kdDebug() << k_funcinfo << endl;
KURL u;
u.setPath( "/etc/passwd" );
- const QString fileId = "passwd";
+ const TQString fileId = "passwd";
KIO::CopyJob* job = KIO::move( u, "trash:/" );
job->setInteractive( false ); // no skip dialog, thanks
- QMap<QString, QString> metaData;
+ TQMap<TQString, TQString> metaData;
//bool ok = KIO::NetAccess::move( u, "trash:/" );
bool ok = KIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData );
assert( !ok );
assert( KIO::NetAccess::lastError() == KIO::ERR_ACCESS_DENIED );
- const QString infoPath( m_trashDir + "/info/" + fileId + ".trashinfo" );
- assert( !QFile::exists( infoPath ) );
+ const TQString infoPath( m_trashDir + "/info/" + fileId + ".trashinfo" );
+ assert( !TQFile::exists( infoPath ) );
- QFileInfo files( m_trashDir + "/files/" + fileId );
+ TQFileInfo files( m_trashDir + "/files/" + fileId );
assert( !files.exists() );
- assert( QFile::exists( u.path() ) );
+ assert( TQFile::exists( u.path() ) );
}
-void TestTrash::trashSymlink( const QString& origFilePath, const QString& fileId, bool broken )
+void TestTrash::trashSymlink( const TQString& origFilePath, const TQString& fileId, bool broken )
{
kdDebug() << k_funcinfo << endl;
// setup
const char* target = broken ? "/nonexistent" : "/tmp";
- bool ok = ::symlink( target, QFile::encodeName( origFilePath ) ) == 0;
+ bool ok = ::symlink( target, TQFile::encodeName( origFilePath ) ) == 0;
assert( ok );
KURL u;
u.setPath( origFilePath );
@@ -585,39 +585,39 @@ void TestTrash::trashSymlink( const QString& origFilePath, const QString& fileId
}
checkInfoFile( m_trashDir + "/info/" + fileId + ".trashinfo", origFilePath );
- QFileInfo files( m_trashDir + "/files/" + fileId );
+ TQFileInfo files( m_trashDir + "/files/" + fileId );
assert( files.isSymLink() );
- assert( files.readLink() == QFile::decodeName( target ) );
- assert( !QFile::exists( origFilePath ) );
+ assert( files.readLink() == TQFile::decodeName( target ) );
+ assert( !TQFile::exists( origFilePath ) );
}
void TestTrash::trashSymlinkFromHome()
{
kdDebug() << k_funcinfo << endl;
- const QString fileName = "symlinkFromHome";
+ const TQString fileName = "symlinkFromHome";
trashSymlink( homeTmpDir() + fileName, fileName, false );
}
void TestTrash::trashSymlinkFromOther()
{
kdDebug() << k_funcinfo << endl;
- const QString fileName = "symlinkFromOther";
+ const TQString fileName = "symlinkFromOther";
trashSymlink( otherTmpDir() + fileName, fileName, false );
}
void TestTrash::trashBrokenSymlinkFromHome()
{
kdDebug() << k_funcinfo << endl;
- const QString fileName = "brokenSymlinkFromHome";
+ const TQString fileName = "brokenSymlinkFromHome";
trashSymlink( homeTmpDir() + fileName, fileName, true );
}
-void TestTrash::trashDirectory( const QString& origPath, const QString& fileId )
+void TestTrash::trashDirectory( const TQString& origPath, const TQString& fileId )
{
kdDebug() << k_funcinfo << fileId << endl;
// setup
- if ( !QFileInfo( origPath ).exists() ) {
- QDir dir;
+ if ( !TQFileInfo( origPath ).exists() ) {
+ TQDir dir;
bool ok = dir.mkdir( origPath );
Q_ASSERT( ok );
}
@@ -633,19 +633,19 @@ void TestTrash::trashDirectory( const QString& origPath, const QString& fileId )
}
checkInfoFile( m_trashDir + "/info/" + fileId + ".trashinfo", origPath );
- QFileInfo filesDir( m_trashDir + "/files/" + fileId );
+ TQFileInfo filesDir( m_trashDir + "/files/" + fileId );
assert( filesDir.isDir() );
- QFileInfo files( m_trashDir + "/files/" + fileId + "/testfile" );
+ TQFileInfo files( m_trashDir + "/files/" + fileId + "/testfile" );
assert( files.exists() );
assert( files.isFile() );
assert( files.size() == 12 );
- assert( !QFile::exists( origPath ) );
+ assert( !TQFile::exists( origPath ) );
}
void TestTrash::trashDirectoryFromHome()
{
kdDebug() << k_funcinfo << endl;
- QString dirName = "trashDirFromHome";
+ TQString dirName = "trashDirFromHome";
trashDirectory( homeTmpDir() + dirName, dirName );
// Do it again, check that we got a different id
trashDirectory( homeTmpDir() + dirName, dirName + "_1" );
@@ -654,16 +654,16 @@ void TestTrash::trashDirectoryFromHome()
void TestTrash::trashReadOnlyDirFromHome()
{
kdDebug() << k_funcinfo << endl;
- const QString dirName = readOnlyDirPath();
- QDir dir;
+ const TQString dirName = readOnlyDirPath();
+ TQDir dir;
bool ok = dir.mkdir( dirName );
Q_ASSERT( ok );
// #130780
- const QString subDirPath = dirName + "/readonly_subdir";
+ const TQString subDirPath = dirName + "/readonly_subdir";
ok = dir.mkdir( subDirPath );
Q_ASSERT( ok );
createTestFile( subDirPath + "/testfile_in_subdir" );
- ::chmod( QFile::encodeName( subDirPath ), 0500 );
+ ::chmod( TQFile::encodeName( subDirPath ), 0500 );
trashDirectory( dirName, "readonly" );
}
@@ -671,7 +671,7 @@ void TestTrash::trashReadOnlyDirFromHome()
void TestTrash::trashDirectoryFromOther()
{
kdDebug() << k_funcinfo << endl;
- QString dirName = "trashDirFromOther";
+ TQString dirName = "trashDirFromOther";
trashDirectory( otherTmpDir() + dirName, dirName );
}
@@ -696,13 +696,13 @@ void TestTrash::delRootFile()
bool ok = KIO::NetAccess::del( "trash:/0-fileFromHome", 0L );
assert( ok );
- QFileInfo file( m_trashDir + "/files/fileFromHome" );
+ TQFileInfo file( m_trashDir + "/files/fileFromHome" );
assert( !file.exists() );
- QFileInfo info( m_trashDir + "/info/fileFromHome.trashinfo" );
+ TQFileInfo info( m_trashDir + "/info/fileFromHome.trashinfo" );
assert( !info.exists() );
// trash it again, we might need it later
- const QString fileName = "fileFromHome";
+ const TQString fileName = "fileFromHome";
trashFile( homeTmpDir() + fileName, fileName );
}
@@ -715,11 +715,11 @@ void TestTrash::delFileInDirectory()
assert( !ok );
assert( KIO::NetAccess::lastError() == KIO::ERR_ACCESS_DENIED );
- QFileInfo dir( m_trashDir + "/files/trashDirFromHome" );
+ TQFileInfo dir( m_trashDir + "/files/trashDirFromHome" );
assert( dir.exists() );
- QFileInfo file( m_trashDir + "/files/trashDirFromHome/testfile" );
+ TQFileInfo file( m_trashDir + "/files/trashDirFromHome/testfile" );
assert( file.exists() );
- QFileInfo info( m_trashDir + "/info/trashDirFromHome.trashinfo" );
+ TQFileInfo info( m_trashDir + "/info/trashDirFromHome.trashinfo" );
assert( info.exists() );
}
@@ -731,15 +731,15 @@ void TestTrash::delDirectory()
bool ok = KIO::NetAccess::del( "trash:/0-trashDirFromHome", 0L );
assert( ok );
- QFileInfo dir( m_trashDir + "/files/trashDirFromHome" );
+ TQFileInfo dir( m_trashDir + "/files/trashDirFromHome" );
assert( !dir.exists() );
- QFileInfo file( m_trashDir + "/files/trashDirFromHome/testfile" );
+ TQFileInfo file( m_trashDir + "/files/trashDirFromHome/testfile" );
assert( !file.exists() );
- QFileInfo info( m_trashDir + "/info/trashDirFromHome.trashinfo" );
+ TQFileInfo info( m_trashDir + "/info/trashDirFromHome.trashinfo" );
assert( !info.exists() );
// trash it again, we'll need it later
- QString dirName = "trashDirFromHome";
+ TQString dirName = "trashDirFromHome";
trashDirectory( homeTmpDir() + dirName, dirName );
}
@@ -829,7 +829,7 @@ void TestTrash::statFileInDirectory()
assert( !item.acceptsDrops() );
}
-void TestTrash::copyFromTrash( const QString& fileId, const QString& destPath, const QString& relativePath )
+void TestTrash::copyFromTrash( const TQString& fileId, const TQString& destPath, const TQString& relativePath )
{
KURL src( "trash:/0-" + fileId );
if ( !relativePath.isEmpty() )
@@ -837,57 +837,57 @@ void TestTrash::copyFromTrash( const QString& fileId, const QString& destPath, c
KURL dest;
dest.setPath( destPath );
- assert( KIO::NetAccess::exists( src, true, (QWidget*)0 ) );
+ assert( KIO::NetAccess::exists( src, true, (TQWidget*)0 ) );
// A dnd would use copy(), but we use copyAs to ensure the final filename
//kdDebug() << k_funcinfo << "copyAs:" << src << " -> " << dest << endl;
KIO::Job* job = KIO::copyAs( src, dest );
bool ok = KIO::NetAccess::synchronousRun( job, 0 );
assert( ok );
- QString infoFile( m_trashDir + "/info/" + fileId + ".trashinfo" );
- assert( QFile::exists( infoFile ) );
+ TQString infoFile( m_trashDir + "/info/" + fileId + ".trashinfo" );
+ assert( TQFile::exists( infoFile ) );
- QFileInfo filesItem( m_trashDir + "/files/" + fileId );
+ TQFileInfo filesItem( m_trashDir + "/files/" + fileId );
assert( filesItem.exists() );
- assert( QFile::exists( destPath ) );
+ assert( TQFile::exists( destPath ) );
}
void TestTrash::copyFileFromTrash()
{
kdDebug() << k_funcinfo << endl;
- const QString destPath = otherTmpDir() + "fileFromHome_copied";
+ const TQString destPath = otherTmpDir() + "fileFromHome_copied";
copyFromTrash( "fileFromHome", destPath );
- assert( QFileInfo( destPath ).isFile() );
- assert( QFileInfo( destPath ).size() == 12 );
+ assert( TQFileInfo( destPath ).isFile() );
+ assert( TQFileInfo( destPath ).size() == 12 );
}
void TestTrash::copyFileInDirectoryFromTrash()
{
kdDebug() << k_funcinfo << endl;
- const QString destPath = otherTmpDir() + "testfile_copied";
+ const TQString destPath = otherTmpDir() + "testfile_copied";
copyFromTrash( "trashDirFromHome", destPath, "testfile" );
- assert( QFileInfo( destPath ).isFile() );
- assert( QFileInfo( destPath ).size() == 12 );
+ assert( TQFileInfo( destPath ).isFile() );
+ assert( TQFileInfo( destPath ).size() == 12 );
}
void TestTrash::copyDirectoryFromTrash()
{
kdDebug() << k_funcinfo << endl;
- const QString destPath = otherTmpDir() + "trashDirFromHome_copied";
+ const TQString destPath = otherTmpDir() + "trashDirFromHome_copied";
copyFromTrash( "trashDirFromHome", destPath );
- assert( QFileInfo( destPath ).isDir() );
+ assert( TQFileInfo( destPath ).isDir() );
}
void TestTrash::copySymlinkFromTrash()
{
kdDebug() << k_funcinfo << endl;
- const QString destPath = otherTmpDir() + "symlinkFromHome_copied";
+ const TQString destPath = otherTmpDir() + "symlinkFromHome_copied";
copyFromTrash( "symlinkFromHome", destPath );
- assert( QFileInfo( destPath ).isSymLink() );
+ assert( TQFileInfo( destPath ).isSymLink() );
}
-void TestTrash::moveFromTrash( const QString& fileId, const QString& destPath, const QString& relativePath )
+void TestTrash::moveFromTrash( const TQString& fileId, const TQString& destPath, const TQString& relativePath )
{
KURL src( "trash:/0-" + fileId );
if ( !relativePath.isEmpty() )
@@ -895,106 +895,106 @@ void TestTrash::moveFromTrash( const QString& fileId, const QString& destPath, c
KURL dest;
dest.setPath( destPath );
- assert( KIO::NetAccess::exists( src, true, (QWidget*)0 ) );
+ assert( KIO::NetAccess::exists( src, true, (TQWidget*)0 ) );
// A dnd would use move(), but we use moveAs to ensure the final filename
KIO::Job* job = KIO::moveAs( src, dest );
bool ok = KIO::NetAccess::synchronousRun( job, 0 );
assert( ok );
- QString infoFile( m_trashDir + "/info/" + fileId + ".trashinfo" );
- assert( !QFile::exists( infoFile ) );
+ TQString infoFile( m_trashDir + "/info/" + fileId + ".trashinfo" );
+ assert( !TQFile::exists( infoFile ) );
- QFileInfo filesItem( m_trashDir + "/files/" + fileId );
+ TQFileInfo filesItem( m_trashDir + "/files/" + fileId );
assert( !filesItem.exists() );
- assert( QFile::exists( destPath ) );
+ assert( TQFile::exists( destPath ) );
}
void TestTrash::moveFileFromTrash()
{
kdDebug() << k_funcinfo << endl;
- const QString destPath = otherTmpDir() + "fileFromHome_restored";
+ const TQString destPath = otherTmpDir() + "fileFromHome_restored";
moveFromTrash( "fileFromHome", destPath );
- assert( QFileInfo( destPath ).isFile() );
- assert( QFileInfo( destPath ).size() == 12 );
+ assert( TQFileInfo( destPath ).isFile() );
+ assert( TQFileInfo( destPath ).size() == 12 );
// trash it again for later
- const QString fileName = "fileFromHome";
+ const TQString fileName = "fileFromHome";
trashFile( homeTmpDir() + fileName, fileName );
}
void TestTrash::moveFileInDirectoryFromTrash()
{
kdDebug() << k_funcinfo << endl;
- const QString destPath = otherTmpDir() + "testfile_restored";
+ const TQString destPath = otherTmpDir() + "testfile_restored";
copyFromTrash( "trashDirFromHome", destPath, "testfile" );
- assert( QFileInfo( destPath ).isFile() );
- assert( QFileInfo( destPath ).size() == 12 );
+ assert( TQFileInfo( destPath ).isFile() );
+ assert( TQFileInfo( destPath ).size() == 12 );
}
void TestTrash::moveDirectoryFromTrash()
{
kdDebug() << k_funcinfo << endl;
- const QString destPath = otherTmpDir() + "trashDirFromHome_restored";
+ const TQString destPath = otherTmpDir() + "trashDirFromHome_restored";
moveFromTrash( "trashDirFromHome", destPath );
- assert( QFileInfo( destPath ).isDir() );
+ assert( TQFileInfo( destPath ).isDir() );
// trash it again, we'll need it later
- QString dirName = "trashDirFromHome";
+ TQString dirName = "trashDirFromHome";
trashDirectory( homeTmpDir() + dirName, dirName );
}
void TestTrash::trashDirectoryOwnedByRoot()
{
KURL u;
- if ( QFile::exists( "/etc/cups" ) )
+ if ( TQFile::exists( "/etc/cups" ) )
u.setPath( "/etc/cups" );
- else if ( QFile::exists( "/boot" ) )
+ else if ( TQFile::exists( "/boot" ) )
u.setPath( "/boot" );
else
u.setPath( "/etc" );
- const QString fileId = u.path();
+ const TQString fileId = u.path();
kdDebug() << k_funcinfo << "fileId=" << fileId << endl;
KIO::CopyJob* job = KIO::move( u, "trash:/" );
job->setInteractive( false ); // no skip dialog, thanks
- QMap<QString, QString> metaData;
+ TQMap<TQString, TQString> metaData;
bool ok = KIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData );
assert( !ok );
const int err = KIO::NetAccess::lastError();
assert( err == KIO::ERR_ACCESS_DENIED
|| err == KIO::ERR_CANNOT_OPEN_FOR_READING );
- const QString infoPath( m_trashDir + "/info/" + fileId + ".trashinfo" );
- assert( !QFile::exists( infoPath ) );
+ const TQString infoPath( m_trashDir + "/info/" + fileId + ".trashinfo" );
+ assert( !TQFile::exists( infoPath ) );
- QFileInfo files( m_trashDir + "/files/" + fileId );
+ TQFileInfo files( m_trashDir + "/files/" + fileId );
assert( !files.exists() );
- assert( QFile::exists( u.path() ) );
+ assert( TQFile::exists( u.path() ) );
}
void TestTrash::moveSymlinkFromTrash()
{
kdDebug() << k_funcinfo << endl;
- const QString destPath = otherTmpDir() + "symlinkFromHome_restored";
+ const TQString destPath = otherTmpDir() + "symlinkFromHome_restored";
moveFromTrash( "symlinkFromHome", destPath );
- assert( QFileInfo( destPath ).isSymLink() );
+ assert( TQFileInfo( destPath ).isSymLink() );
}
void TestTrash::getFile()
{
kdDebug() << k_funcinfo << endl;
- const QString fileId = "fileFromHome_1";
- const KURL url = TrashImpl::makeURL( 0, fileId, QString::null );
- QString tmpFile;
+ const TQString fileId = "fileFromHome_1";
+ const KURL url = TrashImpl::makeURL( 0, fileId, TQString::null );
+ TQString tmpFile;
bool ok = KIO::NetAccess::download( url, tmpFile, 0 );
assert( ok );
- QFile file( tmpFile );
+ TQFile file( tmpFile );
ok = file.open( IO_ReadOnly );
assert( ok );
- QByteArray str = file.readAll();
- QCString cstr( str.data(), str.size() + 1 );
+ TQByteArray str = file.readAll();
+ TQCString cstr( str.data(), str.size() + 1 );
if ( cstr != "Hello world\n" )
kdFatal() << "get() returned the following data:" << cstr << endl;
file.close();
@@ -1004,43 +1004,43 @@ void TestTrash::getFile()
void TestTrash::restoreFile()
{
kdDebug() << k_funcinfo << endl;
- const QString fileId = "fileFromHome_1";
- const KURL url = TrashImpl::makeURL( 0, fileId, QString::null );
- const QString infoFile( m_trashDir + "/info/" + fileId + ".trashinfo" );
- const QString filesItem( m_trashDir + "/files/" + fileId );
+ const TQString fileId = "fileFromHome_1";
+ const KURL url = TrashImpl::makeURL( 0, fileId, TQString::null );
+ const TQString infoFile( m_trashDir + "/info/" + fileId + ".trashinfo" );
+ const TQString filesItem( m_trashDir + "/files/" + fileId );
- assert( QFile::exists( infoFile ) );
- assert( QFile::exists( filesItem ) );
+ assert( TQFile::exists( infoFile ) );
+ assert( TQFile::exists( filesItem ) );
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)3 << url;
KIO::Job* job = KIO::special( url, packedArgs );
bool ok = KIO::NetAccess::synchronousRun( job, 0 );
assert( ok );
- assert( !QFile::exists( infoFile ) );
- assert( !QFile::exists( filesItem ) );
+ assert( !TQFile::exists( infoFile ) );
+ assert( !TQFile::exists( filesItem ) );
- const QString destPath = homeTmpDir() + "fileFromHome";
- assert( QFile::exists( destPath ) );
+ const TQString destPath = homeTmpDir() + "fileFromHome";
+ assert( TQFile::exists( destPath ) );
}
void TestTrash::restoreFileFromSubDir()
{
kdDebug() << k_funcinfo << endl;
- const QString fileId = "trashDirFromHome_1/testfile";
- assert( !QFile::exists( homeTmpDir() + "trashDirFromHome_1" ) );
+ const TQString fileId = "trashDirFromHome_1/testfile";
+ assert( !TQFile::exists( homeTmpDir() + "trashDirFromHome_1" ) );
- const KURL url = TrashImpl::makeURL( 0, fileId, QString::null );
- const QString infoFile( m_trashDir + "/info/trashDirFromHome_1.trashinfo" );
- const QString filesItem( m_trashDir + "/files/trashDirFromHome_1/testfile" );
+ const KURL url = TrashImpl::makeURL( 0, fileId, TQString::null );
+ const TQString infoFile( m_trashDir + "/info/trashDirFromHome_1.trashinfo" );
+ const TQString filesItem( m_trashDir + "/files/trashDirFromHome_1/testfile" );
- assert( QFile::exists( infoFile ) );
- assert( QFile::exists( filesItem ) );
+ assert( TQFile::exists( infoFile ) );
+ assert( TQFile::exists( filesItem ) );
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)3 << url;
KIO::Job* job = KIO::special( url, packedArgs );
bool ok = KIO::NetAccess::synchronousRun( job, 0 );
@@ -1049,9 +1049,9 @@ void TestTrash::restoreFileFromSubDir()
assert( KIO::NetAccess::lastError() == KIO::ERR_SLAVE_DEFINED );
// check that nothing happened
- assert( QFile::exists( infoFile ) );
- assert( QFile::exists( filesItem ) );
- assert( !QFile::exists( homeTmpDir() + "trashDirFromHome_1" ) );
+ assert( TQFile::exists( infoFile ) );
+ assert( TQFile::exists( filesItem ) );
+ assert( !TQFile::exists( homeTmpDir() + "trashDirFromHome_1" ) );
}
void TestTrash::restoreFileToDeletedDirectory()
@@ -1065,16 +1065,16 @@ void TestTrash::restoreFileToDeletedDirectory()
bool delOK = KIO::NetAccess::del( homeTmpDir(), 0 );
assert( delOK );
- const QString fileId = "fileFromHome";
- const KURL url = TrashImpl::makeURL( 0, fileId, QString::null );
- const QString infoFile( m_trashDir + "/info/" + fileId + ".trashinfo" );
- const QString filesItem( m_trashDir + "/files/" + fileId );
+ const TQString fileId = "fileFromHome";
+ const KURL url = TrashImpl::makeURL( 0, fileId, TQString::null );
+ const TQString infoFile( m_trashDir + "/info/" + fileId + ".trashinfo" );
+ const TQString filesItem( m_trashDir + "/files/" + fileId );
- assert( QFile::exists( infoFile ) );
- assert( QFile::exists( filesItem ) );
+ assert( TQFile::exists( infoFile ) );
+ assert( TQFile::exists( filesItem ) );
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)3 << url;
KIO::Job* job = KIO::special( url, packedArgs );
bool ok = KIO::NetAccess::synchronousRun( job, 0 );
@@ -1083,11 +1083,11 @@ void TestTrash::restoreFileToDeletedDirectory()
assert( KIO::NetAccess::lastError() == KIO::ERR_SLAVE_DEFINED );
// check that nothing happened
- assert( QFile::exists( infoFile ) );
- assert( QFile::exists( filesItem ) );
+ assert( TQFile::exists( infoFile ) );
+ assert( TQFile::exists( filesItem ) );
- const QString destPath = homeTmpDir() + "fileFromHome";
- assert( !QFile::exists( destPath ) );
+ const TQString destPath = homeTmpDir() + "fileFromHome";
+ assert( !TQFile::exists( destPath ) );
}
void TestTrash::listRootDir()
@@ -1096,8 +1096,8 @@ void TestTrash::listRootDir()
m_entryCount = 0;
m_listResult.clear();
KIO::ListJob* job = KIO::listDir( "trash:/" );
- connect( job, SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ),
- SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList& ) ) );
+ connect( job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ),
+ TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList& ) ) );
bool ok = KIO::NetAccess::synchronousRun( job, 0 );
assert( ok );
kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl;
@@ -1113,8 +1113,8 @@ void TestTrash::listRecursiveRootDir()
m_entryCount = 0;
m_listResult.clear();
KIO::ListJob* job = KIO::listRecursive( "trash:/" );
- connect( job, SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ),
- SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList& ) ) );
+ connect( job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ),
+ TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList& ) ) );
bool ok = KIO::NetAccess::synchronousRun( job, 0 );
assert( ok );
kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl;
@@ -1130,8 +1130,8 @@ void TestTrash::listSubDir()
m_entryCount = 0;
m_listResult.clear();
KIO::ListJob* job = KIO::listDir( "trash:/0-trashDirFromHome" );
- connect( job, SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ),
- SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList& ) ) );
+ connect( job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ),
+ TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList& ) ) );
bool ok = KIO::NetAccess::synchronousRun( job, 0 );
assert( ok );
kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl;
@@ -1146,7 +1146,7 @@ void TestTrash::slotEntries( KIO::Job*, const KIO::UDSEntryList& lst )
{
for( KIO::UDSEntryList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
KIO::UDSEntry::ConstIterator it2 = (*it).begin();
- QString displayName;
+ TQString displayName;
KURL url;
for( ; it2 != (*it).end(); it2++ ) {
switch ((*it2).m_uds) {
@@ -1174,8 +1174,8 @@ void TestTrash::emptyTrash()
// So we can't activate this test by default.
#if 0
kdDebug() << k_funcinfo << endl;
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)1;
KIO::Job* job = KIO::special( "trash:/", packedArgs );
bool ok = KIO::NetAccess::synchronousRun( job, 0 );
@@ -1186,9 +1186,9 @@ void TestTrash::emptyTrash()
cfg.setGroup( "Status" );
assert( cfg.readBoolEntry( "Empty", false ) == true );
- assert( !QFile::exists( m_trashDir + "/files/fileFromHome" ) );
- assert( !QFile::exists( m_trashDir + "/files/readonly" ) );
- assert( !QFile::exists( m_trashDir + "/info/readonly.trashinfo" ) );
+ assert( !TQFile::exists( m_trashDir + "/files/fileFromHome" ) );
+ assert( !TQFile::exists( m_trashDir + "/files/readonly" ) );
+ assert( !TQFile::exists( m_trashDir + "/info/readonly.trashinfo" ) );
#else
kdDebug() << k_funcinfo << " : SKIPPED" << endl;
diff --git a/kioslave/trash/testtrash.h b/kioslave/trash/testtrash.h
index 70d06dc8b..fd286c945 100644
--- a/kioslave/trash/testtrash.h
+++ b/kioslave/trash/testtrash.h
@@ -20,7 +20,7 @@
#ifndef TESTTRASH_H
#define TESTTRASH_H
-#include <qobject.h>
+#include <tqobject.h>
class TestTrash : public QObject
{
@@ -91,28 +91,28 @@ private slots:
void slotEntries( KIO::Job*, const KIO::UDSEntryList& );
private:
- void trashFile( const QString& origFilePath, const QString& fileId );
- void trashSymlink( const QString& origFilePath, const QString& fileName, bool broken );
- void trashDirectory( const QString& origPath, const QString& fileName );
- void copyFromTrash( const QString& fileId, const QString& destPath, const QString& relativePath = QString::null );
- void moveFromTrash( const QString& fileId, const QString& destPath, const QString& relativePath = QString::null );
-
- QString homeTmpDir() const;
- QString otherTmpDir() const;
- QString utf8FileName() const;
- QString umlautFileName() const;
- QString readOnlyDirPath() const;
-
- QString m_trashDir;
-
- QString m_otherPartitionTopDir;
- QString m_otherPartitionTrashDir;
+ void trashFile( const TQString& origFilePath, const TQString& fileId );
+ void trashSymlink( const TQString& origFilePath, const TQString& fileName, bool broken );
+ void trashDirectory( const TQString& origPath, const TQString& fileName );
+ void copyFromTrash( const TQString& fileId, const TQString& destPath, const TQString& relativePath = TQString::null );
+ void moveFromTrash( const TQString& fileId, const TQString& destPath, const TQString& relativePath = TQString::null );
+
+ TQString homeTmpDir() const;
+ TQString otherTmpDir() const;
+ TQString utf8FileName() const;
+ TQString umlautFileName() const;
+ TQString readOnlyDirPath() const;
+
+ TQString m_trashDir;
+
+ TQString m_otherPartitionTopDir;
+ TQString m_otherPartitionTrashDir;
bool m_tmpIsWritablePartition;
int m_tmpTrashId;
int m_otherPartitionId;
int m_entryCount;
- QStringList m_listResult;
+ TQStringList m_listResult;
};
#endif
diff --git a/kioslave/trash/trashimpl.cpp b/kioslave/trash/trashimpl.cpp
index 9507c77ab..f43e7929f 100644
--- a/kioslave/trash/trashimpl.cpp
+++ b/kioslave/trash/trashimpl.cpp
@@ -35,10 +35,10 @@
#include <dcopref.h>
-#include <qapplication.h>
-#include <qeventloop.h>
-#include <qfile.h>
-#include <qdir.h>
+#include <tqapplication.h>
+#include <tqeventloop.h>
+#include <tqfile.h>
+#include <tqdir.h>
#include <sys/stat.h>
#include <sys/types.h>
@@ -50,7 +50,7 @@
#include <errno.h>
TrashImpl::TrashImpl() :
- QObject(),
+ TQObject(),
m_lastErrorCode( 0 ),
m_initStatus( InitToBeDone ),
m_lastId( 0 ),
@@ -62,7 +62,7 @@ TrashImpl::TrashImpl() :
m_config( "trashrc" )
{
KDE_struct_stat buff;
- if ( KDE_lstat( QFile::encodeName( QDir::homeDirPath() ), &buff ) == 0 ) {
+ if ( KDE_lstat( TQFile::encodeName( TQDir::homeDirPath() ), &buff ) == 0 ) {
m_homeDevice = buff.st_dev;
} else {
kdError() << "Should never happen: couldn't stat $HOME " << strerror( errno ) << endl;
@@ -75,15 +75,15 @@ TrashImpl::TrashImpl() :
* @return errorcode, or 0 if the dir was created or existed already
* Warning, don't use return value like a bool
*/
-int TrashImpl::testDir( const QString &_name ) const
+int TrashImpl::testDir( const TQString &_name ) const
{
- DIR *dp = opendir( QFile::encodeName(_name) );
+ DIR *dp = opendir( TQFile::encodeName(_name) );
if ( dp == NULL )
{
- QString name = _name;
+ TQString name = _name;
if ( name.endsWith( "/" ) )
name.truncate( name.length() - 1 );
- QCString path = QFile::encodeName(name);
+ TQCString path = TQFile::encodeName(name);
bool ok = ::mkdir( path, S_IRWXU ) == 0;
if ( !ok && errno == EEXIST ) {
@@ -132,13 +132,13 @@ bool TrashImpl::init()
// see also kdesktop/init.cc for first time initialization
m_initStatus = InitError;
// $XDG_DATA_HOME/Trash, i.e. ~/.local/share/Trash by default.
- const QString xdgDataDir = KGlobal::dirs()->localxdgdatadir();
+ const TQString xdgDataDir = KGlobal::dirs()->localxdgdatadir();
if ( !KStandardDirs::makeDir( xdgDataDir, 0700 ) ) {
kdWarning() << "failed to create " << xdgDataDir << endl;
return false;
}
- const QString trashDir = xdgDataDir + "Trash";
+ const TQString trashDir = xdgDataDir + "Trash";
int err;
if ( ( err = testDir( trashDir ) ) ) {
error( err, trashDir );
@@ -161,17 +161,17 @@ bool TrashImpl::init()
void TrashImpl::migrateOldTrash()
{
kdDebug() << k_funcinfo << endl;
- const QString oldTrashDir = KGlobalSettings::trashPath();
- const QStrList entries = listDir( oldTrashDir );
+ const TQString oldTrashDir = KGlobalSettings::trashPath();
+ const TQStrList entries = listDir( oldTrashDir );
bool allOK = true;
- QStrListIterator entryIt( entries );
+ TQStrListIterator entryIt( entries );
for (; entryIt.current(); ++entryIt) {
- QString srcPath = QFile::decodeName( *entryIt );
+ TQString srcPath = TQFile::decodeName( *entryIt );
if ( srcPath == "." || srcPath == ".." || srcPath == ".directory" )
continue;
srcPath.prepend( oldTrashDir ); // make absolute
int trashId;
- QString fileId;
+ TQString fileId;
if ( !createInfo( srcPath, trashId, fileId ) ) {
kdWarning() << "Trash migration: failed to create info for " << srcPath << endl;
allOK = false;
@@ -193,11 +193,11 @@ void TrashImpl::migrateOldTrash()
}
}
-bool TrashImpl::createInfo( const QString& origPath, int& trashId, QString& fileId )
+bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fileId )
{
kdDebug() << k_funcinfo << origPath << endl;
// Check source
- const QCString origPath_c( QFile::encodeName( origPath ) );
+ const TQCString origPath_c( TQFile::encodeName( origPath ) );
KDE_struct_stat buff_src;
if ( KDE_lstat( origPath_c.data(), &buff_src ) == -1 ) {
if ( errno == EACCES )
@@ -218,7 +218,7 @@ bool TrashImpl::createInfo( const QString& origPath, int& trashId, QString& file
// Grab original filename
KURL url;
url.setPath( origPath );
- const QString origFileName = url.fileName();
+ const TQString origFileName = url.fileName();
// Make destination file in info/
url.setPath( infoPath( trashId, origFileName ) ); // we first try with origFileName
@@ -228,7 +228,7 @@ bool TrashImpl::createInfo( const QString& origPath, int& trashId, QString& file
int fd = 0;
do {
kdDebug() << k_funcinfo << "trying to create " << url.path() << endl;
- fd = ::open( QFile::encodeName( url.path() ), O_WRONLY | O_CREAT | O_EXCL, 0600 );
+ fd = ::open( TQFile::encodeName( url.path() ), O_WRONLY | O_CREAT | O_EXCL, 0600 );
if ( fd < 0 ) {
if ( errno == EEXIST ) {
url.setFileName( KIO::RenameDlg::suggestName( baseDirectory, url.fileName() ) );
@@ -239,7 +239,7 @@ bool TrashImpl::createInfo( const QString& origPath, int& trashId, QString& file
}
}
} while ( fd < 0 );
- const QString infoPath = url.path();
+ const TQString infoPath = url.path();
fileId = url.fileName();
Q_ASSERT( fileId.endsWith( ".trashinfo" ) );
fileId.truncate( fileId.length() - 10 ); // remove .trashinfo from fileId
@@ -252,7 +252,7 @@ bool TrashImpl::createInfo( const QString& origPath, int& trashId, QString& file
// Contents of the info file. We could use KSimpleConfig, but that would
// mean closing and reopening fd, i.e. opening a race condition...
- QCString info = "[Trash Info]\n";
+ TQCString info = "[Trash Info]\n";
info += "Path=";
// Escape filenames according to the way they are encoded on the filesystem
// All this to basically get back to the raw 8-bit representation of the filename...
@@ -262,14 +262,14 @@ bool TrashImpl::createInfo( const QString& origPath, int& trashId, QString& file
info += KURL::encode_string( makeRelativePath( topDirectoryPath( trashId ), origPath ), m_mibEnum ).latin1();
info += "\n";
info += "DeletionDate=";
- info += QDateTime::currentDateTime().toString( Qt::ISODate ).latin1();
+ info += TQDateTime::currentDateTime().toString( Qt::ISODate ).latin1();
info += "\n";
size_t sz = info.size() - 1; // avoid trailing 0 from QCString
size_t written = ::fwrite(info.data(), 1, sz, file);
if ( written != sz ) {
::fclose( file );
- QFile::remove( infoPath );
+ TQFile::remove( infoPath );
error( KIO::ERR_DISK_FULL, infoPath );
return false;
}
@@ -280,12 +280,12 @@ bool TrashImpl::createInfo( const QString& origPath, int& trashId, QString& file
return true;
}
-QString TrashImpl::makeRelativePath( const QString& topdir, const QString& path )
+TQString TrashImpl::makeRelativePath( const TQString& topdir, const TQString& path )
{
- const QString realPath = KStandardDirs::realFilePath( path );
+ const TQString realPath = KStandardDirs::realFilePath( path );
// topdir ends with '/'
if ( realPath.startsWith( topdir ) ) {
- const QString rel = realPath.mid( topdir.length() );
+ const TQString rel = realPath.mid( topdir.length() );
Q_ASSERT( rel[0] != '/' );
return rel;
} else { // shouldn't happen...
@@ -294,40 +294,40 @@ QString TrashImpl::makeRelativePath( const QString& topdir, const QString& path
}
}
-QString TrashImpl::infoPath( int trashId, const QString& fileId ) const
+TQString TrashImpl::infoPath( int trashId, const TQString& fileId ) const
{
- QString trashPath = trashDirectoryPath( trashId );
+ TQString trashPath = trashDirectoryPath( trashId );
trashPath += "/info/";
trashPath += fileId;
trashPath += ".trashinfo";
return trashPath;
}
-QString TrashImpl::filesPath( int trashId, const QString& fileId ) const
+TQString TrashImpl::filesPath( int trashId, const TQString& fileId ) const
{
- QString trashPath = trashDirectoryPath( trashId );
+ TQString trashPath = trashDirectoryPath( trashId );
trashPath += "/files/";
trashPath += fileId;
return trashPath;
}
-bool TrashImpl::deleteInfo( int trashId, const QString& fileId )
+bool TrashImpl::deleteInfo( int trashId, const TQString& fileId )
{
- bool ok = QFile::remove( infoPath( trashId, fileId ) );
+ bool ok = TQFile::remove( infoPath( trashId, fileId ) );
if ( ok )
fileRemoved();
return ok;
}
-bool TrashImpl::moveToTrash( const QString& origPath, int trashId, const QString& fileId )
+bool TrashImpl::moveToTrash( const TQString& origPath, int trashId, const TQString& fileId )
{
kdDebug() << k_funcinfo << endl;
- const QString dest = filesPath( trashId, fileId );
+ const TQString dest = filesPath( trashId, fileId );
if ( !move( origPath, dest ) ) {
// Maybe the move failed due to no permissions to delete source.
// In that case, delete dest to keep things consistent, since KIO doesn't do it.
- if ( QFileInfo( dest ).isFile() )
- QFile::remove( dest );
+ if ( TQFileInfo( dest ).isFile() )
+ TQFile::remove( dest );
else
synchronousDel( dest, false, true );
return false;
@@ -336,9 +336,9 @@ bool TrashImpl::moveToTrash( const QString& origPath, int trashId, const QString
return true;
}
-bool TrashImpl::moveFromTrash( const QString& dest, int trashId, const QString& fileId, const QString& relativePath )
+bool TrashImpl::moveFromTrash( const TQString& dest, int trashId, const TQString& fileId, const TQString& relativePath )
{
- QString src = filesPath( trashId, fileId );
+ TQString src = filesPath( trashId, fileId );
if ( !relativePath.isEmpty() ) {
src += '/';
src += relativePath;
@@ -348,7 +348,7 @@ bool TrashImpl::moveFromTrash( const QString& dest, int trashId, const QString&
return true;
}
-bool TrashImpl::move( const QString& src, const QString& dest )
+bool TrashImpl::move( const TQString& src, const TQString& dest )
{
if ( directRename( src, dest ) ) {
// This notification is done by KIO::moveAs when using the code below
@@ -370,8 +370,8 @@ bool TrashImpl::move( const QString& src, const QString& dest )
#ifdef KIO_COPYJOB_HAS_SETINTERACTIVE
job->setInteractive( false );
#endif
- connect( job, SIGNAL( result(KIO::Job *) ),
- this, SLOT( jobFinished(KIO::Job *) ) );
+ connect( job, TQT_SIGNAL( result(KIO::Job *) ),
+ this, TQT_SLOT( jobFinished(KIO::Job *) ) );
qApp->eventLoop()->enterLoop();
return m_lastErrorCode == 0;
@@ -384,19 +384,19 @@ void TrashImpl::jobFinished(KIO::Job* job)
qApp->eventLoop()->exitLoop();
}
-bool TrashImpl::copyToTrash( const QString& origPath, int trashId, const QString& fileId )
+bool TrashImpl::copyToTrash( const TQString& origPath, int trashId, const TQString& fileId )
{
kdDebug() << k_funcinfo << endl;
- const QString dest = filesPath( trashId, fileId );
+ const TQString dest = filesPath( trashId, fileId );
if ( !copy( origPath, dest ) )
return false;
fileAdded();
return true;
}
-bool TrashImpl::copyFromTrash( const QString& dest, int trashId, const QString& fileId, const QString& relativePath )
+bool TrashImpl::copyFromTrash( const TQString& dest, int trashId, const TQString& fileId, const TQString& relativePath )
{
- QString src = filesPath( trashId, fileId );
+ TQString src = filesPath( trashId, fileId );
if ( !relativePath.isEmpty() ) {
src += '/';
src += relativePath;
@@ -404,7 +404,7 @@ bool TrashImpl::copyFromTrash( const QString& dest, int trashId, const QString&
return copy( src, dest );
}
-bool TrashImpl::copy( const QString& src, const QString& dest )
+bool TrashImpl::copy( const TQString& src, const TQString& dest )
{
// kio_file's copy() method is quite complex (in order to be fast), let's just call it...
m_lastErrorCode = 0;
@@ -417,19 +417,19 @@ bool TrashImpl::copy( const QString& src, const QString& dest )
#ifdef KIO_COPYJOB_HAS_SETINTERACTIVE
job->setInteractive( false );
#endif
- connect( job, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( jobFinished( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
+ this, TQT_SLOT( jobFinished( KIO::Job* ) ) );
qApp->eventLoop()->enterLoop();
return m_lastErrorCode == 0;
}
-bool TrashImpl::directRename( const QString& src, const QString& dest )
+bool TrashImpl::directRename( const TQString& src, const TQString& dest )
{
kdDebug() << k_funcinfo << src << " -> " << dest << endl;
- if ( ::rename( QFile::encodeName( src ), QFile::encodeName( dest ) ) != 0 ) {
+ if ( ::rename( TQFile::encodeName( src ), TQFile::encodeName( dest ) ) != 0 ) {
if (errno == EXDEV) {
- error( KIO::ERR_UNSUPPORTED_ACTION, QString::fromLatin1("rename") );
+ error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename") );
} else {
if (( errno == EACCES ) || (errno == EPERM)) {
error( KIO::ERR_ACCESS_DENIED, dest );
@@ -445,10 +445,10 @@ bool TrashImpl::directRename( const QString& src, const QString& dest )
}
#if 0
-bool TrashImpl::mkdir( int trashId, const QString& fileId, int permissions )
+bool TrashImpl::mkdir( int trashId, const TQString& fileId, int permissions )
{
- const QString path = filesPath( trashId, fileId );
- if ( ::mkdir( QFile::encodeName( path ), permissions ) != 0 ) {
+ const TQString path = filesPath( trashId, fileId );
+ if ( ::mkdir( TQFile::encodeName( path ), permissions ) != 0 ) {
if ( errno == EACCES ) {
error( KIO::ERR_ACCESS_DENIED, path );
return false;
@@ -461,18 +461,18 @@ bool TrashImpl::mkdir( int trashId, const QString& fileId, int permissions )
}
} else {
if ( permissions != -1 )
- ::chmod( QFile::encodeName( path ), permissions );
+ ::chmod( TQFile::encodeName( path ), permissions );
}
return true;
}
#endif
-bool TrashImpl::del( int trashId, const QString& fileId )
+bool TrashImpl::del( int trashId, const TQString& fileId )
{
- QString info = infoPath(trashId, fileId);
- QString file = filesPath(trashId, fileId);
+ TQString info = infoPath(trashId, fileId);
+ TQString file = filesPath(trashId, fileId);
- QCString info_c = QFile::encodeName(info);
+ TQCString info_c = TQFile::encodeName(info);
KDE_struct_stat buff;
if ( KDE_lstat( info_c.data(), &buff ) == -1 ) {
@@ -483,18 +483,18 @@ bool TrashImpl::del( int trashId, const QString& fileId )
return false;
}
- if ( !synchronousDel( file, true, QFileInfo(file).isDir() ) )
+ if ( !synchronousDel( file, true, TQFileInfo(file).isDir() ) )
return false;
- QFile::remove( info );
+ TQFile::remove( info );
fileRemoved();
return true;
}
-bool TrashImpl::synchronousDel( const QString& path, bool setLastErrorCode, bool isDir )
+bool TrashImpl::synchronousDel( const TQString& path, bool setLastErrorCode, bool isDir )
{
const int oldErrorCode = m_lastErrorCode;
- const QString oldErrorMsg = m_lastErrorMessage;
+ const TQString oldErrorMsg = m_lastErrorMessage;
KURL url;
url.setPath( path );
@@ -505,16 +505,16 @@ bool TrashImpl::synchronousDel( const QString& path, bool setLastErrorCode, bool
KFileItem fileItem( url, "inode/directory", KFileItem::Unknown );
KFileItemList fileItemList;
fileItemList.append( &fileItem );
- KIO::ChmodJob* chmodJob = KIO::chmod( fileItemList, 0200, 0200, QString::null, QString::null, true /*recursive*/, false /*showProgressInfo*/ );
- connect( chmodJob, SIGNAL( result(KIO::Job *) ),
- this, SLOT( jobFinished(KIO::Job *) ) );
+ KIO::ChmodJob* chmodJob = KIO::chmod( fileItemList, 0200, 0200, TQString::null, TQString::null, true /*recursive*/, false /*showProgressInfo*/ );
+ connect( chmodJob, TQT_SIGNAL( result(KIO::Job *) ),
+ this, TQT_SLOT( jobFinished(KIO::Job *) ) );
qApp->eventLoop()->enterLoop();
}
kdDebug() << k_funcinfo << "deleting " << url << endl;
KIO::DeleteJob *job = KIO::del( url, false, false );
- connect( job, SIGNAL( result(KIO::Job *) ),
- this, SLOT( jobFinished(KIO::Job *) ) );
+ connect( job, TQT_SIGNAL( result(KIO::Job *) ),
+ this, TQT_SLOT( jobFinished(KIO::Job *) ) );
qApp->eventLoop()->enterLoop();
bool ok = m_lastErrorCode == 0;
if ( !setLastErrorCode ) {
@@ -538,9 +538,9 @@ bool TrashImpl::emptyTrash()
const TrashedFileInfoList::const_iterator end = fileInfoList.end();
for ( ; it != end ; ++it ) {
const TrashedFileInfo& info = *it;
- const QString filesPath = info.physicalPath;
+ const TQString filesPath = info.physicalPath;
if ( synchronousDel( filesPath, true, true ) ) {
- QFile::remove( infoPath( info.trashId, info.fileId ) );
+ TQFile::remove( infoPath( info.trashId, info.fileId ) );
} // else error code is set
}
fileRemoved();
@@ -559,17 +559,17 @@ TrashImpl::TrashedFileInfoList TrashImpl::list()
TrashDirMap::const_iterator it = m_trashDirectories.begin();
for ( ; it != m_trashDirectories.end() ; ++it ) {
const int trashId = it.key();
- QString infoPath = it.data();
+ TQString infoPath = it.data();
infoPath += "/info";
// Code taken from kio_file
- QStrList entryNames = listDir( infoPath );
+ TQStrList entryNames = listDir( infoPath );
//char path_buffer[PATH_MAX];
//getcwd(path_buffer, PATH_MAX - 1);
//if ( chdir( infoPathEnc ) )
// continue;
- QStrListIterator entryIt( entryNames );
+ TQStrListIterator entryIt( entryNames );
for (; entryIt.current(); ++entryIt) {
- QString fileName = QFile::decodeName( *entryIt );
+ TQString fileName = TQFile::decodeName( *entryIt );
if ( fileName == "." || fileName == ".." )
continue;
if ( !fileName.endsWith( ".trashinfo" ) ) {
@@ -587,11 +587,11 @@ TrashImpl::TrashedFileInfoList TrashImpl::list()
}
// Returns the entries in a given directory - including "." and ".."
-QStrList TrashImpl::listDir( const QString& physicalPath )
+TQStrList TrashImpl::listDir( const TQString& physicalPath )
{
- const QCString physicalPathEnc = QFile::encodeName( physicalPath );
+ const TQCString physicalPathEnc = TQFile::encodeName( physicalPath );
kdDebug() << k_funcinfo << "listing " << physicalPath << endl;
- QStrList entryNames;
+ TQStrList entryNames;
DIR *dp = opendir( physicalPathEnc );
if ( dp == 0 )
return entryNames;
@@ -602,7 +602,7 @@ QStrList TrashImpl::listDir( const QString& physicalPath )
return entryNames;
}
-bool TrashImpl::infoForFile( int trashId, const QString& fileId, TrashedFileInfo& info )
+bool TrashImpl::infoForFile( int trashId, const TQString& fileId, TrashedFileInfo& info )
{
kdDebug() << k_funcinfo << trashId << " " << fileId << endl;
info.trashId = trashId; // easy :)
@@ -611,7 +611,7 @@ bool TrashImpl::infoForFile( int trashId, const QString& fileId, TrashedFileInfo
return readInfoFile( infoPath( trashId, fileId ), info, trashId );
}
-bool TrashImpl::readInfoFile( const QString& infoPath, TrashedFileInfo& info, int trashId )
+bool TrashImpl::readInfoFile( const TQString& infoPath, TrashedFileInfo& info, int trashId )
{
KSimpleConfig cfg( infoPath, true );
if ( !cfg.hasGroup( "Trash Info" ) ) {
@@ -625,19 +625,19 @@ bool TrashImpl::readInfoFile( const QString& infoPath, TrashedFileInfo& info, in
if ( trashId == 0 )
Q_ASSERT( info.origPath[0] == '/' );
else {
- const QString topdir = topDirectoryPath( trashId ); // includes trailing slash
+ const TQString topdir = topDirectoryPath( trashId ); // includes trailing slash
info.origPath.prepend( topdir );
}
- QString line = cfg.readEntry( "DeletionDate" );
+ TQString line = cfg.readEntry( "DeletionDate" );
if ( !line.isEmpty() ) {
- info.deletionDate = QDateTime::fromString( line, Qt::ISODate );
+ info.deletionDate = TQDateTime::fromString( line, Qt::ISODate );
}
return true;
}
-QString TrashImpl::physicalPath( int trashId, const QString& fileId, const QString& relativePath )
+TQString TrashImpl::physicalPath( int trashId, const TQString& fileId, const TQString& relativePath )
{
- QString filePath = filesPath( trashId, fileId );
+ TQString filePath = filesPath( trashId, fileId );
if ( !relativePath.isEmpty() ) {
filePath += "/";
filePath += relativePath;
@@ -645,7 +645,7 @@ QString TrashImpl::physicalPath( int trashId, const QString& fileId, const QStri
return filePath;
}
-void TrashImpl::error( int e, const QString& s )
+void TrashImpl::error( int e, const TQString& s )
{
if ( e )
kdDebug() << k_funcinfo << e << " " << s << endl;
@@ -660,10 +660,10 @@ bool TrashImpl::isEmpty() const
scanTrashDirectories();
TrashDirMap::const_iterator it = m_trashDirectories.begin();
for ( ; it != m_trashDirectories.end() ; ++it ) {
- QString infoPath = it.data();
+ TQString infoPath = it.data();
infoPath += "/info";
- DIR *dp = opendir( QFile::encodeName( infoPath ) );
+ DIR *dp = opendir( TQFile::encodeName( infoPath ) );
if ( dp )
{
struct dirent *ep;
@@ -704,17 +704,17 @@ void TrashImpl::fileRemoved()
// which will be done by the job soon after this.
}
-int TrashImpl::findTrashDirectory( const QString& origPath )
+int TrashImpl::findTrashDirectory( const TQString& origPath )
{
kdDebug() << k_funcinfo << origPath << endl;
// First check if same device as $HOME, then we use the home trash right away.
KDE_struct_stat buff;
- if ( KDE_lstat( QFile::encodeName( origPath ), &buff ) == 0
+ if ( KDE_lstat( TQFile::encodeName( origPath ), &buff ) == 0
&& buff.st_dev == m_homeDevice )
return 0;
- QString mountPoint = KIO::findPathMountPoint( origPath );
- const QString trashDir = trashForMountPoint( mountPoint, true );
+ TQString mountPoint = KIO::findPathMountPoint( origPath );
+ const TQString trashDir = trashForMountPoint( mountPoint, true );
kdDebug() << "mountPoint=" << mountPoint << " trashDir=" << trashDir << endl;
if ( trashDir.isEmpty() )
return 0; // no trash available on partition
@@ -742,14 +742,14 @@ void TrashImpl::scanTrashDirectories() const
{
const KMountPoint::List lst = KMountPoint::currentMountPoints();
for ( KMountPoint::List::ConstIterator it = lst.begin() ; it != lst.end() ; ++it ) {
- const QCString str = (*it)->mountType().latin1();
+ const TQCString str = (*it)->mountType().latin1();
// Skip pseudo-filesystems, there's no chance we'll find a .Trash on them :)
// ## Maybe we should also skip readonly filesystems
if ( str != "proc" && str != "devfs" && str != "usbdevfs" &&
str != "sysfs" && str != "devpts" && str != "subfs" /* #96259 */ &&
str != "autofs" /* #101116 */ ) {
- QString topdir = (*it)->mountPoint();
- QString trashDir = trashForMountPoint( topdir, false );
+ TQString topdir = (*it)->mountPoint();
+ TQString trashDir = trashForMountPoint( topdir, false );
if ( !trashDir.isEmpty() ) {
// OK, trashDir is a valid trash directory. Ensure it's registered.
int trashId = idForTrashDirectory( trashDir );
@@ -781,13 +781,13 @@ TrashImpl::TrashDirMap TrashImpl::topDirectories() const
return m_topDirectories;
}
-QString TrashImpl::trashForMountPoint( const QString& topdir, bool createIfNeeded ) const
+TQString TrashImpl::trashForMountPoint( const TQString& topdir, bool createIfNeeded ) const
{
// (1) Administrator-created $topdir/.Trash directory
- const QString rootTrashDir = topdir + "/.Trash";
- const QCString rootTrashDir_c = QFile::encodeName( rootTrashDir );
- // Can't use QFileInfo here since we need to test for the sticky bit
+ const TQString rootTrashDir = topdir + "/.Trash";
+ const TQCString rootTrashDir_c = TQFile::encodeName( rootTrashDir );
+ // Can't use TQFileInfo here since we need to test for the sticky bit
uid_t uid = getuid();
KDE_struct_stat buff;
const uint requiredBits = S_ISVTX; // Sticky bit required
@@ -797,8 +797,8 @@ QString TrashImpl::trashForMountPoint( const QString& topdir, bool createIfNeede
&& ((buff.st_mode & requiredBits) == requiredBits)
&& (::access(rootTrashDir_c, W_OK))
) {
- const QString trashDir = rootTrashDir + "/" + QString::number( uid );
- const QCString trashDir_c = QFile::encodeName( trashDir );
+ const TQString trashDir = rootTrashDir + "/" + TQString::number( uid );
+ const TQCString trashDir_c = TQFile::encodeName( trashDir );
if ( KDE_lstat( trashDir_c, &buff ) == 0 ) {
if ( (buff.st_uid == uid) // must be owned by user
&& (S_ISDIR(buff.st_mode)) // must be a dir
@@ -817,8 +817,8 @@ QString TrashImpl::trashForMountPoint( const QString& topdir, bool createIfNeede
}
// (2) $topdir/.Trash-$uid
- const QString trashDir = topdir + "/.Trash-" + QString::number( uid );
- const QCString trashDir_c = QFile::encodeName( trashDir );
+ const TQString trashDir = topdir + "/.Trash-" + TQString::number( uid );
+ const TQCString trashDir_c = TQFile::encodeName( trashDir );
if ( KDE_lstat( trashDir_c, &buff ) == 0 )
{
if ( (buff.st_uid == uid) // must be owned by user
@@ -831,15 +831,15 @@ QString TrashImpl::trashForMountPoint( const QString& topdir, bool createIfNeede
}
kdDebug() << "Directory " << trashDir << " exists but didn't pass the security checks, can't use it" << endl;
// Exists, but not useable
- return QString::null;
+ return TQString::null;
}
if ( createIfNeeded && initTrashDirectory( trashDir_c ) ) {
return trashDir;
}
- return QString::null;
+ return TQString::null;
}
-int TrashImpl::idForTrashDirectory( const QString& trashDir ) const
+int TrashImpl::idForTrashDirectory( const TQString& trashDir ) const
{
// If this is too slow we can always use a reverse map...
TrashDirMap::ConstIterator it = m_trashDirectories.begin();
@@ -851,7 +851,7 @@ int TrashImpl::idForTrashDirectory( const QString& trashDir ) const
return -1;
}
-bool TrashImpl::initTrashDirectory( const QCString& trashDir_c ) const
+bool TrashImpl::initTrashDirectory( const TQCString& trashDir_c ) const
{
if ( ::mkdir( trashDir_c, 0700 ) != 0 )
return false;
@@ -879,20 +879,20 @@ bool TrashImpl::initTrashDirectory( const QCString& trashDir_c ) const
return true;
}
-bool TrashImpl::checkTrashSubdirs( const QCString& trashDir_c ) const
+bool TrashImpl::checkTrashSubdirs( const TQCString& trashDir_c ) const
{
- // testDir currently works with a QString - ## optimize
- QString trashDir = QFile::decodeName( trashDir_c );
- const QString info = trashDir + "/info";
+ // testDir currently works with a TQString - ## optimize
+ TQString trashDir = TQFile::decodeName( trashDir_c );
+ const TQString info = trashDir + "/info";
if ( testDir( info ) != 0 )
return false;
- const QString files = trashDir + "/files";
+ const TQString files = trashDir + "/files";
if ( testDir( files ) != 0 )
return false;
return true;
}
-QString TrashImpl::trashDirectoryPath( int trashId ) const
+TQString TrashImpl::trashDirectoryPath( int trashId ) const
{
// Never scanned for trash dirs? (This can happen after killing kio_trash
// and reusing a directory listing from the earlier instance.)
@@ -902,7 +902,7 @@ QString TrashImpl::trashDirectoryPath( int trashId ) const
return m_trashDirectories[trashId];
}
-QString TrashImpl::topDirectoryPath( int trashId ) const
+TQString TrashImpl::topDirectoryPath( int trashId ) const
{
if ( !m_trashDirectoriesScanned )
scanTrashDirectories();
@@ -913,12 +913,12 @@ QString TrashImpl::topDirectoryPath( int trashId ) const
// Helper method. Creates a URL with the format trash:/trashid-fileid or
// trash:/trashid-fileid/relativePath/To/File for a file inside a trashed directory.
-KURL TrashImpl::makeURL( int trashId, const QString& fileId, const QString& relativePath )
+KURL TrashImpl::makeURL( int trashId, const TQString& fileId, const TQString& relativePath )
{
KURL url;
url.setProtocol( "trash" );
- QString path = "/";
- path += QString::number( trashId );
+ TQString path = "/";
+ path += TQString::number( trashId );
path += '-';
path += fileId;
if ( !relativePath.isEmpty() ) {
@@ -931,11 +931,11 @@ KURL TrashImpl::makeURL( int trashId, const QString& fileId, const QString& rela
// Helper method. Parses a trash URL with the URL scheme defined in makeURL.
// The trash:/ URL itself isn't parsed here, must be caught by the caller before hand.
-bool TrashImpl::parseURL( const KURL& url, int& trashId, QString& fileId, QString& relativePath )
+bool TrashImpl::parseURL( const KURL& url, int& trashId, TQString& fileId, TQString& relativePath )
{
if ( url.protocol() != "trash" )
return false;
- const QString path = url.path();
+ const TQString path = url.path();
int start = 0;
if ( path[0] == '/' ) // always true I hope
start = 1;
@@ -951,7 +951,7 @@ bool TrashImpl::parseURL( const KURL& url, int& trashId, QString& fileId, QStrin
slashPos = path.find( '/', start );
if ( slashPos <= 0 ) {
fileId = path.mid( start );
- relativePath = QString::null;
+ relativePath = TQString::null;
return true;
}
fileId = path.mid( start, slashPos - start );
diff --git a/kioslave/trash/trashimpl.h b/kioslave/trash/trashimpl.h
index 2b16ec67e..027864456 100644
--- a/kioslave/trash/trashimpl.h
+++ b/kioslave/trash/trashimpl.h
@@ -23,11 +23,11 @@
#include <kio/jobclasses.h>
#include <ksimpleconfig.h>
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qmap.h>
-#include <qvaluelist.h>
-#include <qstrlist.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
+#include <tqmap.h>
+#include <tqvaluelist.h>
+#include <tqstrlist.h>
#include <assert.h>
/**
@@ -47,29 +47,29 @@ public:
/// Create info for a file to be trashed
/// Returns trashId and fileId
/// The caller is then responsible for actually trashing the file
- bool createInfo( const QString& origPath, int& trashId, QString& fileId );
+ bool createInfo( const TQString& origPath, int& trashId, TQString& fileId );
/// Delete info file for a file to be trashed
/// Usually used for undoing what createInfo did if trashing failed
- bool deleteInfo( int trashId, const QString& fileId );
+ bool deleteInfo( int trashId, const TQString& fileId );
/// Moving a file or directory into the trash. The ids come from createInfo.
- bool moveToTrash( const QString& origPath, int trashId, const QString& fileId );
+ bool moveToTrash( const TQString& origPath, int trashId, const TQString& fileId );
/// Moving a file or directory out of the trash. The ids come from createInfo.
- bool moveFromTrash( const QString& origPath, int trashId, const QString& fileId, const QString& relativePath );
+ bool moveFromTrash( const TQString& origPath, int trashId, const TQString& fileId, const TQString& relativePath );
/// Copying a file or directory into the trash. The ids come from createInfo.
- bool copyToTrash( const QString& origPath, int trashId, const QString& fileId );
+ bool copyToTrash( const TQString& origPath, int trashId, const TQString& fileId );
/// Copying a file or directory out of the trash. The ids come from createInfo.
- bool copyFromTrash( const QString& origPath, int trashId, const QString& fileId, const QString& relativePath );
+ bool copyFromTrash( const TQString& origPath, int trashId, const TQString& fileId, const TQString& relativePath );
/// Create a top-level trashed directory
- //bool mkdir( int trashId, const QString& fileId, int permissions );
+ //bool mkdir( int trashId, const TQString& fileId, int permissions );
/// Get rid of a trashed file
- bool del( int trashId, const QString& fileId );
+ bool del( int trashId, const TQString& fileId );
/// Empty trash, i.e. delete all trashed files
bool emptyTrash();
@@ -79,35 +79,35 @@ public:
struct TrashedFileInfo {
int trashId; // for the url
- QString fileId; // for the url
- QString physicalPath; // for stat'ing etc.
- QString origPath; // from info file
- QDateTime deletionDate; // from info file
+ TQString fileId; // for the url
+ TQString physicalPath; // for stat'ing etc.
+ TQString origPath; // from info file
+ TQDateTime deletionDate; // from info file
};
/// List trashed files
- typedef QValueList<TrashedFileInfo> TrashedFileInfoList;
+ typedef TQValueList<TrashedFileInfo> TrashedFileInfoList;
TrashedFileInfoList list();
/// Return the info for a given trashed file
- bool infoForFile( int trashId, const QString& fileId, TrashedFileInfo& info );
+ bool infoForFile( int trashId, const TQString& fileId, TrashedFileInfo& info );
/// Return the physicalPath for a given trashed file - helper method which
/// encapsulates the call to infoForFile. Don't use if you need more info from TrashedFileInfo.
- QString physicalPath( int trashId, const QString& fileId, const QString& relativePath );
+ TQString physicalPath( int trashId, const TQString& fileId, const TQString& relativePath );
/// Move data from the old trash system to the new one
void migrateOldTrash();
/// KIO error code
int lastErrorCode() const { return m_lastErrorCode; }
- QString lastErrorMessage() const { return m_lastErrorMessage; }
+ TQString lastErrorMessage() const { return m_lastErrorMessage; }
- QStrList listDir( const QString& physicalPath );
+ TQStrList listDir( const TQString& physicalPath );
- static KURL makeURL( int trashId, const QString& fileId, const QString& relativePath );
- static bool parseURL( const KURL& url, int& trashId, QString& fileId, QString& relativePath );
+ static KURL makeURL( int trashId, const TQString& fileId, const TQString& relativePath );
+ static bool parseURL( const KURL& url, int& trashId, TQString& fileId, TQString& relativePath );
- typedef QMap<int, QString> TrashDirMap;
+ typedef TQMap<int, TQString> TrashDirMap;
/// @internal This method is for TestTrash only. Home trash is included (id 0).
TrashDirMap trashDirectories() const;
/// @internal This method is for TestTrash only. No entry with id 0.
@@ -115,38 +115,38 @@ public:
private:
/// Helper method. Moves a file or directory using the appropriate method.
- bool move( const QString& src, const QString& dest );
- bool copy( const QString& src, const QString& dest );
+ bool move( const TQString& src, const TQString& dest );
+ bool copy( const TQString& src, const TQString& dest );
/// Helper method. Tries to call ::rename(src,dest) and does error handling.
- bool directRename( const QString& src, const QString& dest );
+ bool directRename( const TQString& src, const TQString& dest );
void fileAdded();
void fileRemoved();
// Warning, returns error code, not a bool
- int testDir( const QString& name ) const;
- void error( int e, const QString& s );
+ int testDir( const TQString& name ) const;
+ void error( int e, const TQString& s );
- bool readInfoFile( const QString& infoPath, TrashedFileInfo& info, int trashId );
+ bool readInfoFile( const TQString& infoPath, TrashedFileInfo& info, int trashId );
- QString infoPath( int trashId, const QString& fileId ) const;
- QString filesPath( int trashId, const QString& fileId ) const;
+ TQString infoPath( int trashId, const TQString& fileId ) const;
+ TQString filesPath( int trashId, const TQString& fileId ) const;
/// Find the trash dir to use for a given file to delete, based on original path
- int findTrashDirectory( const QString& origPath );
+ int findTrashDirectory( const TQString& origPath );
- QString trashDirectoryPath( int trashId ) const;
- QString topDirectoryPath( int trashId ) const;
+ TQString trashDirectoryPath( int trashId ) const;
+ TQString topDirectoryPath( int trashId ) const;
- bool synchronousDel( const QString& path, bool setLastErrorCode, bool isDir );
+ bool synchronousDel( const TQString& path, bool setLastErrorCode, bool isDir );
void scanTrashDirectories() const;
- int idForTrashDirectory( const QString& trashDir ) const;
- bool initTrashDirectory( const QCString& trashDir_c ) const;
- bool checkTrashSubdirs( const QCString& trashDir_c ) const;
- QString trashForMountPoint( const QString& topdir, bool createIfNeeded ) const;
- static QString makeRelativePath( const QString& topdir, const QString& path );
+ int idForTrashDirectory( const TQString& trashDir ) const;
+ bool initTrashDirectory( const TQCString& trashDir_c ) const;
+ bool checkTrashSubdirs( const TQCString& trashDir_c ) const;
+ TQString trashForMountPoint( const TQString& topdir, bool createIfNeeded ) const;
+ static TQString makeRelativePath( const TQString& topdir, const TQString& path );
private slots:
void jobFinished(KIO::Job *job);
@@ -155,7 +155,7 @@ private:
/// Last error code stored in class to simplify API.
/// Note that this means almost no method can be const.
int m_lastErrorCode;
- QString m_lastErrorMessage;
+ TQString m_lastErrorMessage;
enum { InitToBeDone, InitOK, InitError } m_initStatus;
diff --git a/klipper/applet.cpp b/klipper/applet.cpp
index 298a00b3d..97eee6eec 100644
--- a/klipper/applet.cpp
+++ b/klipper/applet.cpp
@@ -32,7 +32,7 @@
extern "C"
{
- KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile)
+ KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("klipper");
int actions = KPanelApplet::Preferences | KPanelApplet::About | KPanelApplet::Help;
@@ -40,13 +40,13 @@ extern "C"
}
}
-KlipperApplet::KlipperApplet(const QString& configFile, Type t, int actions,
- QWidget *parent, const char *name)
+KlipperApplet::KlipperApplet(const TQString& configFile, Type t, int actions,
+ TQWidget *parent, const char *name)
: KPanelApplet(configFile, t, actions, parent, name)
{
KlipperWidget::createAboutData();
move( 0, 0 );
- setBackgroundMode(QWidget::X11ParentRelative);
+ setBackgroundMode(TQWidget::X11ParentRelative);
widget = new KlipperAppletWidget( this );
setCustomMenu(widget->history()->popup());
centerWidget();
@@ -70,7 +70,7 @@ int KlipperApplet::heightForWidth(int) const
return widget->height();
}
-void KlipperApplet::resizeEvent( QResizeEvent* ev )
+void KlipperApplet::resizeEvent( TQResizeEvent* ev )
{
widget->adjustSize();
KPanelApplet::resizeEvent( ev );
@@ -91,7 +91,7 @@ void KlipperApplet::preferences()
void KlipperApplet::help()
{
- kapp->invokeHelp(QString::null, QString::fromLatin1("klipper"));
+ kapp->invokeHelp(TQString::null, TQString::fromLatin1("klipper"));
}
void KlipperApplet::about()
@@ -100,7 +100,7 @@ void KlipperApplet::about()
about.exec();
}
-KlipperAppletWidget::KlipperAppletWidget( QWidget* parent )
+KlipperAppletWidget::KlipperAppletWidget( TQWidget* parent )
// init() is called first, before KlipperWidget is called with ( parent, kconfig )
: KlipperWidget( ( init(), parent ), new KConfig( "klipperrc" ))
{
@@ -112,8 +112,8 @@ KlipperAppletWidget::KlipperAppletWidget( QWidget* parent )
void KlipperAppletWidget::init()
{
// if there's klipper process running, quit it
- QByteArray arg1, arg2;
- QCString str;
+ TQByteArray arg1, arg2;
+ TQCString str;
// call() - wait for finishing
kapp->dcopClient()->call("klipper", "klipper", "quitProcess()", arg1, str, arg2 );
// register ourselves, so if klipper process is started,
diff --git a/klipper/applet.h b/klipper/applet.h
index c1a4bafcf..3f1ee3361 100644
--- a/klipper/applet.h
+++ b/klipper/applet.h
@@ -31,14 +31,14 @@ class KlipperApplet : public KPanelApplet
{
Q_OBJECT
public:
- KlipperApplet(const QString& configFile, Type t = Normal, int actions = 0,
- QWidget *parent = 0, const char *name = 0);
+ KlipperApplet(const TQString& configFile, Type t = Normal, int actions = 0,
+ TQWidget *parent = 0, const char *name = 0);
~KlipperApplet();
int widthForHeight(int h) const;
int heightForWidth(int w) const;
protected:
- void resizeEvent( QResizeEvent* );
+ void resizeEvent( TQResizeEvent* );
void preferences();
void help();
void about();
@@ -55,7 +55,7 @@ class KlipperAppletWidget : public KlipperWidget
k_dcop:
int newInstance();
public:
- KlipperAppletWidget( QWidget* parent = NULL );
+ KlipperAppletWidget( TQWidget* parent = NULL );
virtual ~KlipperAppletWidget();
private:
void init();
diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp
index 20157a1a2..d87e59985 100644
--- a/klipper/clipboardpoll.cpp
+++ b/klipper/clipboardpoll.cpp
@@ -23,7 +23,7 @@
#include "clipboardpoll.h"
#include <kapplication.h>
-#include <qclipboard.h>
+#include <tqclipboard.h>
#include <kdebug.h>
#include <X11/Xatom.h>
#include <time.h>
@@ -60,8 +60,8 @@
extern Time qt_x_time;
-ClipboardPoll::ClipboardPoll( QWidget* parent )
- : QWidget( parent )
+ClipboardPoll::ClipboardPoll( TQWidget* parent )
+ : TQWidget( parent )
, xfixes_event_base( -1 )
{
hide();
@@ -111,9 +111,9 @@ ClipboardPoll::ClipboardPoll( QWidget* parent )
void ClipboardPoll::initPolling()
{
- connect( kapp->clipboard(), SIGNAL( selectionChanged() ), SLOT(qtSelectionChanged()));
- connect( kapp->clipboard(), SIGNAL( dataChanged() ), SLOT( qtClipboardChanged() ));
- connect( &timer, SIGNAL( timeout()), SLOT( timeout()));
+ connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged() ), TQT_SLOT(qtSelectionChanged()));
+ connect( kapp->clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( qtClipboardChanged() ));
+ connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( timeout()));
timer.start( 1000, false );
selection.atom = XA_PRIMARY;
clipboard.atom = xa_clipboard;
diff --git a/klipper/clipboardpoll.h b/klipper/clipboardpoll.h
index c7b3b266d..462ad8097 100644
--- a/klipper/clipboardpoll.h
+++ b/klipper/clipboardpoll.h
@@ -20,8 +20,8 @@
#ifndef _CLIPBOARDPOLL_H_
#define _CLIPBOARDPOLL_H_
-#include <qwidget.h>
-#include <qtimer.h>
+#include <tqwidget.h>
+#include <tqtimer.h>
#include <X11/Xlib.h>
#include <fixx11h.h>
@@ -30,7 +30,7 @@ class ClipboardPoll
{
Q_OBJECT
public:
- ClipboardPoll( QWidget* parent );
+ ClipboardPoll( TQWidget* parent );
signals:
void clipboardChanged( bool selectionMode );
protected:
@@ -55,7 +55,7 @@ class ClipboardPoll
bool checkTimestamp( SelectionData& data );
bool changedTimestamp( SelectionData& data, const XEvent& e );
void initPolling();
- QTimer timer;
+ TQTimer timer;
SelectionData selection;
SelectionData clipboard;
Atom xa_clipboard;
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index a195a2332..3f325d40e 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -17,13 +17,13 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlistview.h>
-#include <qpushbutton.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qvbuttongroup.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlistview.h>
+#include <tqpushbutton.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
+#include <tqvbuttongroup.h>
#include <assert.h>
#include <kiconloader.h>
@@ -42,9 +42,9 @@ ConfigDialog::ConfigDialog( const ActionList *list, KGlobalAccel *accel,
Ok, 0L, "config dialog" )
{
if ( isApplet )
- setHelp( QString::null, "klipper" );
+ setHelp( TQString::null, "klipper" );
- QFrame *w = 0L; // the parent for the widgets
+ TQFrame *w = 0L; // the parent for the widgets
w = addVBoxPage( i18n("&General") );
generalWidget = new GeneralWidget( w, "general widget" );
@@ -66,8 +66,8 @@ void ConfigDialog::show()
{
if ( !isVisible() ) {
KWinModule module(0, KWinModule::INFO_DESKTOP);
- QSize s1 = sizeHint();
- QSize s2 = module.workArea().size();
+ TQSize s1 = sizeHint();
+ TQSize s2 = module.workArea().size();
int w = s1.width();
int h = s1.height();
@@ -91,39 +91,39 @@ void ConfigDialog::commitShortcuts()
////
-GeneralWidget::GeneralWidget( QWidget *parent, const char *name )
- : QVBox( parent, name )
+GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
+ : TQVBox( parent, name )
{
setSpacing(KDialog::spacingHint());
- cbMousePos = new QCheckBox( i18n("&Popup menu at mouse-cursor position"),
+ cbMousePos = new TQCheckBox( i18n("&Popup menu at mouse-cursor position"),
this );
- cbSaveContents = new QCheckBox( i18n("Save clipboard contents on e&xit"),
+ cbSaveContents = new TQCheckBox( i18n("Save clipboard contents on e&xit"),
this );
- cbStripWhitespace = new QCheckBox( i18n("Remove whitespace when executing actions"), this );
- QWhatsThis::add( cbStripWhitespace,
+ cbStripWhitespace = new TQCheckBox( i18n("Remove whitespace when executing actions"), this );
+ TQWhatsThis::add( cbStripWhitespace,
i18n("Sometimes, the selected text has some whitespace at the end, which, if loaded as URL in a browser would cause an error. Enabling this option removes any whitespace at the beginning or end of the selected string (the original clipboard contents will not be modified).") );
- cbReplayAIH = new QCheckBox( i18n("&Replay actions on an item selected from history"),
+ cbReplayAIH = new TQCheckBox( i18n("&Replay actions on an item selected from history"),
this );
- cbNoNull = new QCheckBox( i18n("Pre&vent empty clipboard"), this );
- QWhatsThis::add( cbNoNull,
+ cbNoNull = new TQCheckBox( i18n("Pre&vent empty clipboard"), this );
+ TQWhatsThis::add( cbNoNull,
i18n("Selecting this option has the effect, that the "
"clipboard can never be emptied. E.g. when an "
"application exits, the clipboard would usually be "
"emptied.") );
- cbIgnoreSelection = new QCheckBox( i18n("&Ignore selection"), this );
- QWhatsThis::add( cbIgnoreSelection,
+ cbIgnoreSelection = new TQCheckBox( i18n("&Ignore selection"), this );
+ TQWhatsThis::add( cbIgnoreSelection,
i18n("This option prevents the selection being recorded "
"in the clipboard history. Only explicit clipboard "
"changes are recorded.") );
- QVButtonGroup *group = new QVButtonGroup( i18n("Clipboard/Selection Behavior"), this );
+ TQVButtonGroup *group = new TQVButtonGroup( i18n("Clipboard/Selection Behavior"), this );
group->setExclusive( true );
- QWhatsThis::add( group,
+ TQWhatsThis::add( group,
i18n("<qt>There are two different clipboard buffers available:<br><br>"
"<b>Clipboard</b> is filled by selecting something "
"and pressing Ctrl+C, or by clicking \"Copy\" in a toolbar or "
@@ -134,16 +134,16 @@ GeneralWidget::GeneralWidget( QWidget *parent, const char *name )
"You can configure the relationship between Clipboard and Selection."
"</qt>" ));
- cbSynchronize = new QRadioButton(
+ cbSynchronize = new TQRadioButton(
i18n("Sy&nchronize contents of the clipboard and the selection"),
group );
- QWhatsThis::add( cbSynchronize,
+ TQWhatsThis::add( cbSynchronize,
i18n("Selecting this option synchronizes these two buffers, so they "
"work the same way as in KDE 1.x and 2.x.") );
- cbSeparate = new QRadioButton(
+ cbSeparate = new TQRadioButton(
i18n("Separate clipboard and selection"), group );
- QWhatsThis::add(
+ TQWhatsThis::add(
cbSeparate,
i18n("Using this option will only set the selection when highlighting "
"something and the clipboard when choosing e.g. \"Copy\" "
@@ -155,20 +155,20 @@ GeneralWidget::GeneralWidget( QWidget *parent, const char *name )
popupTimeout->setLabel( i18n( "Tim&eout for action popups:" ) );
popupTimeout->setRange( 0, 200, 1, true );
popupTimeout->setSuffix( i18n( " sec" ) );
- QToolTip::add( popupTimeout, i18n("A value of 0 disables the timeout") );
+ TQToolTip::add( popupTimeout, i18n("A value of 0 disables the timeout") );
maxItems = new KIntNumInput( this );
maxItems->setLabel( i18n( "C&lipboard history size:" ) );
maxItems->setRange( 2, 2048, 1, true );
- connect( maxItems, SIGNAL( valueChanged( int )),
- SLOT( historySizeChanged( int ) ));
+ connect( maxItems, TQT_SIGNAL( valueChanged( int )),
+ TQT_SLOT( historySizeChanged( int ) ));
- connect( group, SIGNAL( clicked( int )),
- SLOT( slotClipConfigChanged() ));
+ connect( group, TQT_SIGNAL( clicked( int )),
+ TQT_SLOT( slotClipConfigChanged() ));
slotClipConfigChanged();
// Add some spacing at the end
- QWidget *dummy = new QWidget( this );
+ TQWidget *dummy = new TQWidget( this );
setStretchFactor( dummy, 1 );
}
@@ -191,7 +191,7 @@ void GeneralWidget::slotClipConfigChanged()
/////////////////////////////////////////
////
-void ListView::rename( QListViewItem* item, int c )
+void ListView::rename( TQListViewItem* item, int c )
{
bool gui = false;
if ( item->childCount() != 0 && c == 0) {
@@ -203,7 +203,7 @@ void ListView::rename( QListViewItem* item, int c )
if ( gui ) {
if ( ! _regExpEditor )
- _regExpEditor = KParts::ComponentFactory::createInstanceFromQuery<QDialog>( "KRegExpEditor/KRegExpEditor", QString::null, this );
+ _regExpEditor = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString::null, this );
KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( _regExpEditor->qt_cast( "KRegExpEditorInterface" ) );
assert( iface );
iface->setRegExp( item->text( 0 ) );
@@ -218,19 +218,19 @@ void ListView::rename( QListViewItem* item, int c )
}
-ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget, QWidget *parent,
+ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget, TQWidget *parent,
const char *name )
- : QVBox( parent, name ),
+ : TQVBox( parent, name ),
advancedWidget( 0L )
{
Q_ASSERT( list != 0L );
- QLabel *lblAction = new QLabel(
+ TQLabel *lblAction = new TQLabel(
i18n("Action &list (right click to add/remove commands):"), this );
listView = new ListView( configWidget, this, "list view" );
lblAction->setBuddy( listView );
- listView->addColumn( i18n("Regular Expression (see http://doc.trolltech.com/qregexp.html#details)") );
+ listView->addColumn( i18n("Regular Expression (see http://doc.trolltech.com/tqregexp.html#details)") );
listView->addColumn( i18n("Description") );
listView->setRenameable(0);
@@ -244,33 +244,33 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
listView->setRootIsDecorated( true );
listView->setMultiSelection( false );
listView->setAllColumnsShowFocus( true );
- listView->setSelectionMode( QListView::Single );
- connect( listView, SIGNAL(executed( QListViewItem*, const QPoint&, int )),
- SLOT( slotItemChanged( QListViewItem*, const QPoint& , int ) ));
- connect( listView, SIGNAL( selectionChanged ( QListViewItem * )),
- SLOT(selectionChanged ( QListViewItem * )));
+ listView->setSelectionMode( TQListView::Single );
+ connect( listView, TQT_SIGNAL(executed( TQListViewItem*, const TQPoint&, int )),
+ TQT_SLOT( slotItemChanged( TQListViewItem*, const TQPoint& , int ) ));
+ connect( listView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )),
+ TQT_SLOT(selectionChanged ( TQListViewItem * )));
connect(listView,
- SIGNAL(contextMenu(KListView *, QListViewItem *, const QPoint&)),
- SLOT( slotContextMenu(KListView*, QListViewItem*, const QPoint&)));
+ TQT_SIGNAL(contextMenu(KListView *, TQListViewItem *, const TQPoint&)),
+ TQT_SLOT( slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)));
ClipAction *action = 0L;
ClipCommand *command = 0L;
- QListViewItem *item = 0L;
- QListViewItem *child = 0L;
- QListViewItem *after = 0L; // QListView's default inserting really sucks
+ TQListViewItem *item = 0L;
+ TQListViewItem *child = 0L;
+ TQListViewItem *after = 0L; // QListView's default inserting really sucks
ActionListIterator it( *list );
- const QPixmap& doc = SmallIcon( "misc" );
- const QPixmap& exec = SmallIcon( "exec" );
+ const TQPixmap& doc = SmallIcon( "misc" );
+ const TQPixmap& exec = SmallIcon( "exec" );
for ( action = it.current(); action; action = ++it ) {
- item = new QListViewItem( listView, after,
+ item = new TQListViewItem( listView, after,
action->regExp(), action->description() );
item->setPixmap( 0, doc );
- QPtrListIterator<ClipCommand> it2( action->commands() );
+ TQPtrListIterator<ClipCommand> it2( action->commands() );
for ( command = it2.current(); command; command = ++it2 ) {
- child = new QListViewItem( item, after,
+ child = new TQListViewItem( item, after,
command->command, command->description);
if ( command->pixmap.isEmpty() )
child->setPixmap( 0, exec );
@@ -283,31 +283,31 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
listView->setSorting( -1 ); // newly inserted items just append unsorted
- cbUseGUIRegExpEditor = new QCheckBox( i18n("&Use graphical editor for editing regular expressions" ), this );
+ cbUseGUIRegExpEditor = new TQCheckBox( i18n("&Use graphical editor for editing regular expressions" ), this );
if ( KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
{
cbUseGUIRegExpEditor->hide();
cbUseGUIRegExpEditor->setChecked( false );
}
- QHBox *box = new QHBox( this );
+ TQHBox *box = new TQHBox( this );
box->setSpacing( KDialog::spacingHint() );
- QPushButton *button = new QPushButton( i18n("&Add Action"), box );
- connect( button, SIGNAL( clicked() ), SLOT( slotAddAction() ));
+ TQPushButton *button = new TQPushButton( i18n("&Add Action"), box );
+ connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddAction() ));
- delActionButton = new QPushButton( i18n("&Delete Action"), box );
- connect( delActionButton, SIGNAL( clicked() ), SLOT( slotDeleteAction() ));
+ delActionButton = new TQPushButton( i18n("&Delete Action"), box );
+ connect( delActionButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDeleteAction() ));
- QLabel *label = new QLabel(i18n("Click on a highlighted item's column to change it. \"%s\" in a command will be replaced with the clipboard contents."), box);
+ TQLabel *label = new TQLabel(i18n("Click on a highlighted item's column to change it. \"%s\" in a command will be replaced with the clipboard contents."), box);
label->setAlignment( WordBreak | AlignLeft | AlignVCenter );
box->setStretchFactor( label, 5 );
- box = new QHBox( this );
- QPushButton *advanced = new QPushButton( i18n("Advanced..."), box );
+ box = new TQHBox( this );
+ TQPushButton *advanced = new TQPushButton( i18n("Advanced..."), box );
advanced->setFixedSize( advanced->sizeHint() );
- connect( advanced, SIGNAL( clicked() ), SLOT( slotAdvanced() ));
- (void) new QWidget( box ); // spacer
+ connect( advanced, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdvanced() ));
+ (void) new TQWidget( box ); // spacer
delActionButton->setEnabled(listView->currentItem () !=0);
}
@@ -316,13 +316,13 @@ ActionWidget::~ActionWidget()
{
}
-void ActionWidget::selectionChanged ( QListViewItem * item)
+void ActionWidget::selectionChanged ( TQListViewItem * item)
{
delActionButton->setEnabled(item!=0);
}
-void ActionWidget::slotContextMenu( KListView *, QListViewItem *item,
- const QPoint& pos )
+void ActionWidget::slotContextMenu( KListView *, TQListViewItem *item,
+ const TQPoint& pos )
{
if ( !item )
return;
@@ -338,8 +338,8 @@ void ActionWidget::slotContextMenu( KListView *, QListViewItem *item,
int id = menu->exec( pos );
if ( id == addCmd ) {
- QListViewItem *p = item->parent() ? item->parent() : item;
- QListViewItem *cmdItem = new QListViewItem( p, item,
+ TQListViewItem *p = item->parent() ? item->parent() : item;
+ TQListViewItem *cmdItem = new TQListViewItem( p, item,
i18n("Click here to set the command to be executed"),
i18n("<new command>") );
cmdItem->setPixmap( 0, SmallIcon( "exec" ) );
@@ -350,7 +350,7 @@ void ActionWidget::slotContextMenu( KListView *, QListViewItem *item,
delete menu;
}
-void ActionWidget::slotItemChanged( QListViewItem *item, const QPoint&, int col )
+void ActionWidget::slotItemChanged( TQListViewItem *item, const TQPoint&, int col )
{
if ( !item->parent() || col != 0 )
return;
@@ -361,7 +361,7 @@ void ActionWidget::slotItemChanged( QListViewItem *item, const QPoint&, int col
void ActionWidget::slotAddAction()
{
- QListViewItem *item = new QListViewItem( listView );
+ TQListViewItem *item = new TQListViewItem( listView );
item->setPixmap( 0, SmallIcon( "misc" ));
item->setText( 0, i18n("Click here to set the regexp"));
item->setText( 1, i18n("<new action>"));
@@ -370,7 +370,7 @@ void ActionWidget::slotAddAction()
void ActionWidget::slotDeleteAction()
{
- QListViewItem *item = listView->currentItem();
+ TQListViewItem *item = listView->currentItem();
if ( item && item->parent() )
item = item->parent();
delete item;
@@ -379,8 +379,8 @@ void ActionWidget::slotDeleteAction()
ActionList * ActionWidget::actionList()
{
- QListViewItem *item = listView->firstChild();
- QListViewItem *child = 0L;
+ TQListViewItem *item = listView->firstChild();
+ TQListViewItem *child = 0L;
ClipAction *action = 0L;
ActionList *list = new ActionList;
list->setAutoDelete( true );
@@ -406,24 +406,24 @@ void ActionWidget::slotAdvanced()
KDialogBase dlg( 0L, "advanced dlg", true,
i18n("Advanced Settings"),
KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok );
- QVBox *box = dlg.makeVBoxMainWidget();
+ TQVBox *box = dlg.makeVBoxMainWidget();
AdvancedWidget *widget = new AdvancedWidget( box );
widget->setWMClasses( m_wmClasses );
dlg.resize( dlg.sizeHint().width(),
dlg.sizeHint().height() +40); // or we get an ugly scrollbar :(
- if ( dlg.exec() == QDialog::Accepted ) {
+ if ( dlg.exec() == TQDialog::Accepted ) {
m_wmClasses = widget->wmClasses();
}
}
-AdvancedWidget::AdvancedWidget( QWidget *parent, const char *name )
- : QVBox( parent, name )
+AdvancedWidget::AdvancedWidget( TQWidget *parent, const char *name )
+ : TQVBox( parent, name )
{
editListBox = new KEditListBox( i18n("D&isable Actions for Windows of Type WM_CLASS"), this, "editlistbox", true, KEditListBox::Add | KEditListBox::Remove );
- QWhatsThis::add( editListBox,
+ TQWhatsThis::add( editListBox,
i18n("<qt>This lets you specify windows in which Klipper should "
"not invoke \"actions\". Use<br><br>"
"<center><b>xprop | grep WM_CLASS</b></center><br>"
@@ -439,7 +439,7 @@ AdvancedWidget::~AdvancedWidget()
{
}
-void AdvancedWidget::setWMClasses( const QStringList& items )
+void AdvancedWidget::setWMClasses( const TQStringList& items )
{
editListBox->clear();
editListBox->insertStringList( items );
@@ -451,8 +451,8 @@ void AdvancedWidget::setWMClasses( const QStringList& items )
//////////
/*
-KeysWidget::KeysWidget( KAccelActions &keyMap, QWidget *parent, const char *name)
- : QVBox( parent, name )
+KeysWidget::KeysWidget( KAccelActions &keyMap, TQWidget *parent, const char *name)
+ : TQVBox( parent, name )
{
keyChooser = new KKeyChooser( keyMap, this );
}
diff --git a/klipper/configdialog.h b/klipper/configdialog.h
index be64b8335..49b994ecf 100644
--- a/klipper/configdialog.h
+++ b/klipper/configdialog.h
@@ -20,12 +20,12 @@
#ifndef CONFIGDIALOG_H
#define CONFIGDIALOG_H
-#include <qcheckbox.h>
-#include <qevent.h>
-#include <qgroupbox.h>
-#include <qheader.h>
-#include <qradiobutton.h>
-#include <qvbox.h>
+#include <tqcheckbox.h>
+#include <tqevent.h>
+#include <tqgroupbox.h>
+#include <tqheader.h>
+#include <tqradiobutton.h>
+#include <tqvbox.h>
#include <kdialogbase.h>
#include <keditlistbox.h>
@@ -49,7 +49,7 @@ class GeneralWidget : public QVBox
friend class ConfigDialog;
public:
- GeneralWidget( QWidget *parent, const char *name );
+ GeneralWidget( TQWidget *parent, const char *name );
~GeneralWidget();
private slots:
@@ -57,9 +57,9 @@ private slots:
void slotClipConfigChanged();
private:
- QCheckBox *cbMousePos, *cbSaveContents, *cbReplayAIH, *cbNoNull;
- QCheckBox *cbIgnoreSelection, *cbStripWhitespace;
- QRadioButton *cbSynchronize, *cbImplicitSelection, *cbSeparate;
+ TQCheckBox *cbMousePos, *cbSaveContents, *cbReplayAIH, *cbNoNull;
+ TQCheckBox *cbIgnoreSelection, *cbStripWhitespace;
+ TQRadioButton *cbSynchronize, *cbImplicitSelection, *cbSeparate;
KIntNumInput *popupTimeout, *maxItems;
};
@@ -71,11 +71,11 @@ class AdvancedWidget : public QVBox
Q_OBJECT
public:
- AdvancedWidget( QWidget *parent = 0L, const char *name = 0L );
+ AdvancedWidget( TQWidget *parent = 0L, const char *name = 0L );
~AdvancedWidget();
- void setWMClasses( const QStringList& items );
- QStringList wmClasses() const { return editListBox->items(); }
+ void setWMClasses( const TQStringList& items );
+ TQStringList wmClasses() const { return editListBox->items(); }
private:
KEditListBox *editListBox;
@@ -88,7 +88,7 @@ class ActionWidget : public QVBox
friend class ConfigDialog;
public:
- ActionWidget( const ActionList *list, ConfigDialog* configWidget, QWidget *parent, const char *name );
+ ActionWidget( const ActionList *list, ConfigDialog* configWidget, TQWidget *parent, const char *name );
~ActionWidget();
/**
@@ -98,23 +98,23 @@ public:
*/
ActionList * actionList();
- void setWMClasses( const QStringList& items ) { m_wmClasses = items; }
- QStringList wmClasses() const { return m_wmClasses; }
+ void setWMClasses( const TQStringList& items ) { m_wmClasses = items; }
+ TQStringList wmClasses() const { return m_wmClasses; }
private slots:
void slotAddAction();
void slotDeleteAction();
- void slotItemChanged( QListViewItem *, const QPoint& , int );
+ void slotItemChanged( TQListViewItem *, const TQPoint& , int );
void slotAdvanced();
- void slotContextMenu( KListView *, QListViewItem *, const QPoint& );
- void selectionChanged ( QListViewItem *);
+ void slotContextMenu( KListView *, TQListViewItem *, const TQPoint& );
+ void selectionChanged ( TQListViewItem *);
private:
KListView *listView;
- QStringList m_wmClasses;
+ TQStringList m_wmClasses;
AdvancedWidget *advancedWidget;
- QPushButton *delActionButton;
- QCheckBox *cbUseGUIRegExpEditor;
+ TQPushButton *delActionButton;
+ TQCheckBox *cbUseGUIRegExpEditor;
};
/*class KeysWidget : public QVBox
@@ -124,7 +124,7 @@ private:
friend class ConfigDialog;
public:
- KeysWidget( KAccelActions &keyMap, QWidget *parent, const char *name );
+ KeysWidget( KAccelActions &keyMap, TQWidget *parent, const char *name );
~KeysWidget();
private:
@@ -168,7 +168,7 @@ public:
{
return generalWidget->cbIgnoreSelection->isChecked();
}
- QStringList noActionsFor() const {
+ TQStringList noActionsFor() const {
return actionWidget->wmClasses();
}
bool useGUIRegExpEditor() const
@@ -210,7 +210,7 @@ public:
void setSynchronize( bool synchronize ) {
generalWidget->cbSynchronize->setChecked( synchronize );
}
- void setNoActionsFor( const QStringList& items ) {
+ void setNoActionsFor( const TQStringList& items ) {
actionWidget->setWMClasses( items );
}
void setUseGUIRegExpEditor( bool enabled )
@@ -234,30 +234,30 @@ private:
class ListView : public KListView
{
public:
- ListView( ConfigDialog* configWidget, QWidget *parent, const char *name )
+ ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name )
: KListView( parent, name ), _configWidget( configWidget ),
_regExpEditor(0L) {}
- // QListView has a weird idea of a sizeHint...
- virtual QSize sizeHint () const {
+ // TQListView has a weird idea of a sizeHint...
+ virtual TQSize sizeHint () const {
int w = minimumSizeHint().width();
int h = header()->height();
h += viewport()->sizeHint().height();
h += horizontalScrollBar()->height();
- QListViewItem *item = firstChild();
+ TQListViewItem *item = firstChild();
while ( item ) {
h += item->totalHeight();
item = item->nextSibling();
}
- return QSize( w, h );
+ return TQSize( w, h );
}
protected:
- virtual void rename( QListViewItem* item, int c );
+ virtual void rename( TQListViewItem* item, int c );
private:
ConfigDialog* _configWidget;
- QDialog* _regExpEditor;
+ TQDialog* _regExpEditor;
};
#endif // CONFIGDIALOG_H
diff --git a/klipper/history.cpp b/klipper/history.cpp
index 068475214..a02b37156 100644
--- a/klipper/history.cpp
+++ b/klipper/history.cpp
@@ -25,12 +25,12 @@
#include "historystringitem.h"
#include "klipperpopup.h"
-History::History( QWidget* parent, const char* name )
- : QObject( parent, name ),
+History::History( TQWidget* parent, const char* name )
+ : TQObject( parent, name ),
m_popup( new KlipperPopup( this, parent, "main_widget" ) ),
m_topIsUserSelected( false )
{
- connect( this, SIGNAL( changed() ), m_popup, SLOT( slotHistoryChanged() ) );
+ connect( this, TQT_SIGNAL( changed() ), m_popup, TQT_SLOT( slotHistoryChanged() ) );
itemList.setAutoDelete( true );
}
diff --git a/klipper/history.h b/klipper/history.h
index 9c54cb387..f00a80a1a 100644
--- a/klipper/history.h
+++ b/klipper/history.h
@@ -21,8 +21,8 @@
#ifndef _HISTORY_H_
#define _HISTORY_H_
-#include <qobject.h>
-#include <qptrlist.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
#include "historyitem.h"
class KlipperPopup;
@@ -34,12 +34,12 @@ class History : public QObject
{
Q_OBJECT
public:
- History( QWidget* parent, const char* name );
+ History( TQWidget* parent, const char* name );
~History();
/**
* Iterator for history
*/
- typedef QPtrListIterator<HistoryItem> iterator;
+ typedef TQPtrListIterator<HistoryItem> iterator;
/**
* Return (toplevel) popup menu (or default view, of you like)
@@ -135,7 +135,7 @@ private:
/**
* The history
*/
- QPtrList<HistoryItem> itemList;
+ TQPtrList<HistoryItem> itemList;
/**
* ensure that the number of items does not exceed max_size()
diff --git a/klipper/historyimageitem.cpp b/klipper/historyimageitem.cpp
index f95a76429..38767b42c 100644
--- a/klipper/historyimageitem.cpp
+++ b/klipper/historyimageitem.cpp
@@ -18,20 +18,20 @@
Boston, MA 02110-1301, USA.
*/
-#include <qstring.h>
+#include <tqstring.h>
#include <kdebug.h>
#include "historyimageitem.h"
-HistoryImageItem::HistoryImageItem( const QPixmap& data )
+HistoryImageItem::HistoryImageItem( const TQPixmap& data )
: HistoryItem(), m_data( data )
{
}
-QString HistoryImageItem::text() const {
+TQString HistoryImageItem::text() const {
if ( m_text.isNull() ) {
- m_text = QString( "%1x%2x%3 %4" )
+ m_text = TQString( "%1x%2x%3 %4" )
.arg( m_data.width() )
.arg( m_data.height() )
.arg( m_data.depth() );
@@ -41,6 +41,6 @@ QString HistoryImageItem::text() const {
}
/* virtual */
-void HistoryImageItem::write( QDataStream& stream ) const {
- stream << QString( "image" ) << m_data;
+void HistoryImageItem::write( TQDataStream& stream ) const {
+ stream << TQString( "image" ) << m_data;
}
diff --git a/klipper/historyimageitem.h b/klipper/historyimageitem.h
index 2518e0a4c..f9a79d89c 100644
--- a/klipper/historyimageitem.h
+++ b/klipper/historyimageitem.h
@@ -22,8 +22,8 @@
#define _HISTORYIMAGEITEM_H_
#include "historyitem.h"
-#include <qpixmap.h>
-#include <qdragobject.h>
+#include <tqpixmap.h>
+#include <tqdragobject.h>
/**
* A image entry in the clipboard history.
@@ -31,29 +31,29 @@
class HistoryImageItem : public HistoryItem
{
public:
- HistoryImageItem( const QPixmap& data );
+ HistoryImageItem( const TQPixmap& data );
virtual ~HistoryImageItem() {}
- virtual QString text() const;
+ virtual TQString text() const;
virtual bool operator==( const HistoryItem& rhs) const {
if ( const HistoryImageItem* casted_rhs = dynamic_cast<const HistoryImageItem*>( &rhs ) ) {
return &casted_rhs->m_data == &m_data; // Not perfect, but better than nothing.
}
return false;
}
- virtual const QPixmap& image() const { return m_data; }
- virtual QMimeSource* mimeSource() const { return new QImageDrag( m_data.convertToImage()) ; }
+ virtual const TQPixmap& image() const { return m_data; }
+ virtual TQMimeSource* mimeSource() const { return new TQImageDrag( m_data.convertToImage()) ; }
- virtual void write( QDataStream& stream ) const;
+ virtual void write( TQDataStream& stream ) const;
private:
/**
*
*/
- const QPixmap m_data;
+ const TQPixmap m_data;
/**
* Cache for m_data's string representation
*/
- mutable QString m_text;
+ mutable TQString m_text;
};
diff --git a/klipper/historyitem.cpp b/klipper/historyitem.cpp
index 680e6b700..481339b30 100644
--- a/klipper/historyitem.cpp
+++ b/klipper/historyitem.cpp
@@ -17,11 +17,11 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#include <qmime.h>
-#include <qdragobject.h>
-#include <qmap.h>
-#include <qstring.h>
-#include <qpixmap.h>
+#include <tqmime.h>
+#include <tqdragobject.h>
+#include <tqmap.h>
+#include <tqstring.h>
+#include <tqpixmap.h>
#include <kurldrag.h>
#include <kdebug.h>
@@ -39,7 +39,7 @@ HistoryItem::~HistoryItem() {
}
-HistoryItem* HistoryItem::create( const QMimeSource& aSource )
+HistoryItem* HistoryItem::create( const TQMimeSource& aSource )
{
#if 0
int i=0;
@@ -49,36 +49,36 @@ HistoryItem* HistoryItem::create( const QMimeSource& aSource )
#endif
if( KURLDrag::canDecode( &aSource )) {
KURL::List urls;
- QMap<QString,QString> metaData;
+ TQMap<TQString,TQString> metaData;
if( KURLDrag::decode( &aSource, urls, metaData )) {
// this is from KonqDrag (libkonq)
- QByteArray a = aSource.encodedData( "application/x-kde-cutselection" );
+ TQByteArray a = aSource.encodedData( "application/x-kde-cutselection" );
bool cut = !a.isEmpty() && (a.at(0) == '1'); // true if 1
return new HistoryURLItem( urls, metaData, cut );
}
}
- if ( QTextDrag::canDecode( &aSource ) ) {
- QString text;
- if( QTextDrag::decode( &aSource, text ))
+ if ( TQTextDrag::canDecode( &aSource ) ) {
+ TQString text;
+ if( TQTextDrag::decode( &aSource, text ))
return text.isNull() ? 0 : new HistoryStringItem( text );
}
- if ( QImageDrag::canDecode( &aSource ) ) {
- QPixmap image;
- if( QImageDrag::decode( &aSource, image ))
+ if ( TQImageDrag::canDecode( &aSource ) ) {
+ TQPixmap image;
+ if( TQImageDrag::decode( &aSource, image ))
return image.isNull() ? 0 : new HistoryImageItem( image );
}
return 0; // Failed.
}
-HistoryItem* HistoryItem::create( QDataStream& aSource ) {
+HistoryItem* HistoryItem::create( TQDataStream& aSource ) {
if ( aSource.atEnd() ) {
return 0;
}
- QString type;
+ TQString type;
aSource >> type;
if ( type == "url" ) {
KURL::List urls;
- QMap< QString, QString > metaData;
+ TQMap< TQString, TQString > metaData;
int cut;
aSource >> urls;
aSource >> metaData;
@@ -86,12 +86,12 @@ HistoryItem* HistoryItem::create( QDataStream& aSource ) {
return new HistoryURLItem( urls, metaData, cut );
}
if ( type == "string" ) {
- QString text;
+ TQString text;
aSource >> text;
return new HistoryStringItem( text );
}
if ( type == "image" ) {
- QPixmap image;
+ TQPixmap image;
aSource >> image;
return new HistoryImageItem( image );
}
diff --git a/klipper/historyitem.h b/klipper/historyitem.h
index 04ab542ed..05b2de641 100644
--- a/klipper/historyitem.h
+++ b/klipper/historyitem.h
@@ -19,7 +19,7 @@
*/
#ifndef _HISTORYITEM_H_
#define _HISTORYITEM_H_
-#include <qpixmap.h>
+#include <tqpixmap.h>
class QString;
class QMimeSource;
@@ -39,24 +39,24 @@ public:
* An image would be returned as a descriptive
* text, such as 32x43 image.
*/
- virtual QString text() const = 0;
+ virtual TQString text() const = 0;
/**
* Return the current item as text
* A text would be returned as a null pixmap,
* which is also the default implementation
*/
- inline virtual const QPixmap& image() const;
+ inline virtual const TQPixmap& image() const;
/**
- * Returns QMimeSource suitable for QClipboard::setData().
+ * Returns TQMimeSource suitable for QClipboard::setData().
*/
- virtual QMimeSource* mimeSource() const = 0;
+ virtual TQMimeSource* mimeSource() const = 0;
/**
* Write object on datastream
*/
- virtual void write( QDataStream& stream ) const = 0;
+ virtual void write( TQDataStream& stream ) const = 0;
/**
* Equality.
@@ -67,24 +67,24 @@ public:
* Create an HistoryItem from MimeSources (i.e., clipboard data)
* returns null if create fails (e.g, unsupported mimetype)
*/
- static HistoryItem* create( const QMimeSource& aSource );
+ static HistoryItem* create( const TQMimeSource& aSource );
/**
* Create an HistoryItem from MimeSources (i.e., clipboard data)
* returns null if creation fails. In this case, the datastream
* is left in an undefined state.
*/
- static HistoryItem* create( QDataStream& aSource );
+ static HistoryItem* create( TQDataStream& aSource );
};
inline
-const QPixmap& HistoryItem::image() const {
- static QPixmap nullPixmap;
+const TQPixmap& HistoryItem::image() const {
+ static TQPixmap nullPixmap;
return nullPixmap;
}
inline
-QDataStream& operator<<( QDataStream& lhs, HistoryItem const * const rhs ) {
+TQDataStream& operator<<( TQDataStream& lhs, HistoryItem const * const rhs ) {
if ( rhs ) {
rhs->write( lhs );
}
diff --git a/klipper/historystringitem.cpp b/klipper/historystringitem.cpp
index dcb7b8da9..85a4ede4d 100644
--- a/klipper/historystringitem.cpp
+++ b/klipper/historystringitem.cpp
@@ -19,13 +19,13 @@
*/
#include "historystringitem.h"
-HistoryStringItem::HistoryStringItem( const QString& data )
+HistoryStringItem::HistoryStringItem( const TQString& data )
: HistoryItem(), m_data( data )
{
}
/* virtual */
-void HistoryStringItem::write( QDataStream& stream ) const {
- stream << QString( "string" ) << m_data;
+void HistoryStringItem::write( TQDataStream& stream ) const {
+ stream << TQString( "string" ) << m_data;
}
diff --git a/klipper/historystringitem.h b/klipper/historystringitem.h
index ccbaa2e63..a142fbe2e 100644
--- a/klipper/historystringitem.h
+++ b/klipper/historystringitem.h
@@ -20,8 +20,8 @@
#ifndef _HISTORYSTRINGITEM_H_
#define _HISTORYSTRINGITEM_H_
-#include <qstring.h>
-#include <qdragobject.h>
+#include <tqstring.h>
+#include <tqdragobject.h>
#include "historyitem.h"
@@ -31,27 +31,27 @@
class HistoryStringItem : public HistoryItem
{
public:
- HistoryStringItem( const QString& data );
+ HistoryStringItem( const TQString& data );
virtual ~HistoryStringItem() {}
- virtual QString text() const;
+ virtual TQString text() const;
virtual bool operator==( const HistoryItem& rhs) const {
if ( const HistoryStringItem* casted_rhs = dynamic_cast<const HistoryStringItem*>( &rhs ) ) {
return casted_rhs->m_data == m_data;
}
return false;
}
- virtual QMimeSource* mimeSource() const { return new QTextDrag( m_data ) ; }
+ virtual TQMimeSource* mimeSource() const { return new TQTextDrag( m_data ) ; }
/**
* Write object on datastream
*/
- virtual void write( QDataStream& stream ) const;
+ virtual void write( TQDataStream& stream ) const;
private:
- QString m_data;
+ TQString m_data;
};
-inline QString HistoryStringItem::text() const { return m_data; }
+inline TQString HistoryStringItem::text() const { return m_data; }
#endif
diff --git a/klipper/historyurlitem.cpp b/klipper/historyurlitem.cpp
index 3e85a17c3..863a93fb8 100644
--- a/klipper/historyurlitem.cpp
+++ b/klipper/historyurlitem.cpp
@@ -22,28 +22,28 @@
#include <kmultipledrag.h>
#include <kurldrag.h>
-HistoryURLItem::HistoryURLItem( const KURL::List &_urls, QMap<QString, QString> _metaData, bool _cut )
+HistoryURLItem::HistoryURLItem( const KURL::List &_urls, TQMap<TQString, TQString> _metaData, bool _cut )
: urls( _urls ), metaData( _metaData ), cut( _cut )
{
}
/* virtual */
-void HistoryURLItem::write( QDataStream& stream ) const
+void HistoryURLItem::write( TQDataStream& stream ) const
{
- stream << QString( "url" ) << urls << metaData << (int)cut;
+ stream << TQString( "url" ) << urls << metaData << (int)cut;
}
-QString HistoryURLItem::text() const {
+TQString HistoryURLItem::text() const {
return urls.toStringList().join( " " );
}
-QMimeSource* HistoryURLItem::mimeSource() const {
+TQMimeSource* HistoryURLItem::mimeSource() const {
KMultipleDrag* drag = new KMultipleDrag;
drag->addDragObject( new KURLDrag( urls, metaData ));
// from KonqDrag (libkonq)
- QStoredDrag* cutdrag = new QStoredDrag( "application/x-kde-cutselection" );
- QByteArray a;
- QCString s ( cut ? "1" : "0" );
+ TQStoredDrag* cutdrag = new TQStoredDrag( "application/x-kde-cutselection" );
+ TQByteArray a;
+ TQCString s ( cut ? "1" : "0" );
a.resize( s.length() + 1 ); // trailing zero
memcpy( a.data(), s.data(), s.length() + 1 );
cutdrag->setEncodedData( a );
diff --git a/klipper/historyurlitem.h b/klipper/historyurlitem.h
index 5619b6037..7908721c8 100644
--- a/klipper/historyurlitem.h
+++ b/klipper/historyurlitem.h
@@ -22,7 +22,7 @@
#include "historyitem.h"
-#include <qmap.h>
+#include <tqmap.h>
#include <kurl.h>
/**
@@ -31,18 +31,18 @@
class HistoryURLItem : public HistoryItem
{
public:
- HistoryURLItem( const KURL::List &urls, QMap<QString, QString> metaData, bool cut );
- virtual QString text() const;
+ HistoryURLItem( const KURL::List &urls, TQMap<TQString, TQString> metaData, bool cut );
+ virtual TQString text() const;
virtual bool operator==( const HistoryItem& rhs) const;
- virtual QMimeSource* mimeSource() const;
+ virtual TQMimeSource* mimeSource() const;
/**
* Write object on datastream
*/
- virtual void write( QDataStream& stream ) const;
+ virtual void write( TQDataStream& stream ) const;
private:
KURL::List urls;
- QMap<QString, QString> metaData;
+ TQMap<TQString, TQString> metaData;
bool cut;
};
diff --git a/klipper/klipperbindings.cpp b/klipper/klipperbindings.cpp
index b32c90410..31bb25049 100644
--- a/klipper/klipperbindings.cpp
+++ b/klipper/klipperbindings.cpp
@@ -19,10 +19,10 @@
*/
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4, this, SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) )
#else
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4 )
+ keys->insert( name, i18n(name), TQString::null, key3, key4 )
#endif
#define WIN KKey::QtWIN
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index 7dfc0a3fd..954768fc5 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -44,8 +44,8 @@ namespace {
// #define DEBUG_EVENTS__
#ifdef DEBUG_EVENTS__
-kdbgstream& operator<<( kdbgstream& stream, const QKeyEvent& e ) {
- stream << "(QKeyEvent(text=" << e.text() << ",key=" << e.key() << ( e.isAccepted()?",accepted":",ignored)" ) << ",count=" << e.count();
+kdbgstream& operator<<( kdbgstream& stream, const TQKeyEvent& e ) {
+ stream << "(TQKeyEvent(text=" << e.text() << ",key=" << e.key() << ( e.isAccepted()?",accepted":",ignored)" ) << ",count=" << e.count();
if ( e.state() & Qt::AltButton ) {
stream << ",ALT";
}
@@ -74,18 +74,18 @@ kdbgstream& operator<<( kdbgstream& stream, const QKeyEvent& e ) {
*/
class KLineEditBlackKey : public KLineEdit {
public:
- KLineEditBlackKey(const QString& string, QWidget* parent, const char* name )
+ KLineEditBlackKey(const TQString& string, TQWidget* parent, const char* name )
: KLineEdit( string, parent, name )
{}
- KLineEditBlackKey( QWidget* parent, const char* name )
+ KLineEditBlackKey( TQWidget* parent, const char* name )
: KLineEdit( parent, name )
{}
~KLineEditBlackKey() {
}
protected:
- virtual void keyPressEvent( QKeyEvent* e ) {
+ virtual void keyPressEvent( TQKeyEvent* e ) {
KLineEdit::keyPressEvent( e );
e->accept();
@@ -93,7 +93,7 @@ protected:
};
-KlipperPopup::KlipperPopup( History* history, QWidget* parent, const char* name )
+KlipperPopup::KlipperPopup( History* history, TQWidget* parent, const char* name )
: KPopupMenu( parent, name ),
m_dirty( true ),
QSempty( i18n( "<empty clipboard>" ) ),
@@ -106,14 +106,14 @@ KlipperPopup::KlipperPopup( History* history, QWidget* parent, const char* name
n_history_items( 0 )
{
KWin::WindowInfo i = KWin::windowInfo( winId(), NET::WMGeometry );
- QRect g = i.geometry();
- QRect screen = KGlobalSettings::desktopGeometry(g.center());
+ TQRect g = i.geometry();
+ TQRect screen = KGlobalSettings::desktopGeometry(g.center());
int menu_height = ( screen.height() ) * 3/4;
int menu_width = ( screen.width() ) * 1/3;
m_popupProxy = new PopupProxy( this, "popup_proxy", menu_height, menu_width );
- connect( this, SIGNAL( aboutToShow() ), SLOT( slotAboutToShow() ) );
+ connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) );
}
KlipperPopup::~KlipperPopup() {
@@ -146,15 +146,15 @@ void KlipperPopup::buildFromScratch() {
m_filterWidget = new KLineEditBlackKey( this, "Klipper filter widget" );
insertTitle( SmallIcon( "klipper" ), i18n("Klipper - Clipboard Tool"));
m_filterWidgetId = insertItem( m_filterWidget, m_filterWidgetId, 1 );
- m_filterWidget->setFocusPolicy( QWidget::NoFocus );
+ m_filterWidget->setFocusPolicy( TQWidget::NoFocus );
setItemVisible( m_filterWidgetId, false );
m_filterWidget->hide();
- QString lastGroup;
+ TQString lastGroup;
// Bit of a hack here. It would be better of KHelpMenu could be an action.
// Insert Help-menu at the butttom of the "default" group.
- QString group;
- QString defaultGroup( "default" );
+ TQString group;
+ TQString defaultGroup( "default" );
for ( KAction* action = m_actions.first(); action; action = m_actions.next() ) {
group = action->group();
if ( group != lastGroup ) {
@@ -173,7 +173,7 @@ void KlipperPopup::buildFromScratch() {
}
-void KlipperPopup::rebuild( const QString& filter ) {
+void KlipperPopup::rebuild( const TQString& filter ) {
bool from_scratch = ( count() == 0 );
if ( from_scratch ) {
@@ -184,11 +184,11 @@ void KlipperPopup::rebuild( const QString& filter ) {
}
}
- QRegExp filterexp( filter );
+ TQRegExp filterexp( filter );
if ( filterexp.isValid() ) {
m_filterWidget->setPaletteForegroundColor( paletteForegroundColor() );
} else {
- m_filterWidget->setPaletteForegroundColor( QColor( "red" ) );
+ m_filterWidget->setPaletteForegroundColor( TQColor( "red" ) );
}
n_history_items = m_popupProxy->buildParent( TOP_HISTORY_ITEM_INDEX, filterexp );
@@ -221,12 +221,12 @@ void KlipperPopup::plugAction( KAction* action ) {
/* virtual */
-void KlipperPopup::keyPressEvent( QKeyEvent* e ) {
+void KlipperPopup::keyPressEvent( TQKeyEvent* e ) {
// If alt-something is pressed, select a shortcut
// from the menu. Do this by sending a keyPress
// without the alt-modifier to the superobject.
if ( e->state() & Qt::AltButton ) {
- QKeyEvent ke( QEvent::KeyPress,
+ TQKeyEvent ke( TQEvent::KeyPress,
e->key(),
e->ascii(),
e->state() ^ Qt::AltButton,
@@ -273,8 +273,8 @@ void KlipperPopup::keyPressEvent( QKeyEvent* e ) {
#ifdef DEBUG_EVENTS__
kdDebug() << "Passing this event down to child (KLineEdit): " << e << endl;
#endif
- QString lastString = m_filterWidget->text();
- QApplication::sendEvent( m_filterWidget, e );
+ TQString lastString = m_filterWidget->text();
+ TQApplication::sendEvent( m_filterWidget, e );
if ( m_filterWidget->text().isEmpty() ) {
if ( isItemVisible( m_filterWidgetId ) )
{
diff --git a/klipper/klipperpopup.h b/klipper/klipperpopup.h
index f77b87954..50ca55938 100644
--- a/klipper/klipperpopup.h
+++ b/klipper/klipperpopup.h
@@ -21,8 +21,8 @@
#define _KLIPPERPOPUP_H_
#include <kpopupmenu.h>
-#include <qptrlist.h>
-#include <qstring.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
class History;
class KlipperWidget;
@@ -40,7 +40,7 @@ class KlipperPopup : public KPopupMenu
Q_OBJECT
public:
- KlipperPopup( History* history, QWidget* parent=0, const char* name=0 );
+ KlipperPopup( History* history, TQWidget* parent=0, const char* name=0 );
~KlipperPopup();
void plugAction( KAction* action );
@@ -59,14 +59,14 @@ public slots:
void slotAboutToShow();
private:
- void rebuild( const QString& filter = QString::null );
+ void rebuild( const TQString& filter = TQString::null );
void buildFromScratch();
void insertSearchFilter();
void removeSearchFilter();
protected:
- virtual void keyPressEvent( QKeyEvent* e );
+ virtual void keyPressEvent( TQKeyEvent* e );
private:
bool m_dirty : 1; // true if menu contents needs to be rebuild.
@@ -74,13 +74,13 @@ private:
/**
* Contains the string shown if the menu is empty.
*/
- QString QSempty;
+ TQString QSempty;
/**
* Contains the string shown if the search string has no
* matches and the menu is not empty.
*/
- QString QSnomatch;
+ TQString QSnomatch;
/**
* The "document" (clipboard history)
@@ -95,7 +95,7 @@ private:
/**
* (unowned) actions to plug into the primary popup menu
*/
- QPtrList<KAction> m_actions;
+ TQPtrList<KAction> m_actions;
/**
* Proxy helper object used to track history items
diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp
index 84a9e4ae6..196a4259c 100644
--- a/klipper/popupproxy.cpp
+++ b/klipper/popupproxy.cpp
@@ -17,10 +17,10 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#include <qregexp.h>
-#include <qstyle.h>
-#include <qpixmap.h>
-#include <qimage.h>
+#include <tqregexp.h>
+#include <tqstyle.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
#include <kstringhandler.h>
#include <klocale.h>
@@ -33,14 +33,14 @@
PopupProxy::PopupProxy( KlipperPopup* parent, const char* name, int menu_height, int menu_width )
- : QObject( parent, name ),
+ : TQObject( parent, name ),
proxy_for_menu( parent ),
spillPointer( parent->history()->youngest() ),
m_menu_height( menu_height ),
m_menu_width( menu_width ),
nextItemNumber( 0 )
{
- connect( parent->history(), SIGNAL( changed() ), SLOT( slotHistoryChanged() ) );
+ connect( parent->history(), TQT_SIGNAL( changed() ), TQT_SLOT( slotHistoryChanged() ) );
}
void PopupProxy::slotHistoryChanged() {
@@ -61,7 +61,7 @@ void PopupProxy::deleteMoreMenus() {
}
}
-int PopupProxy::buildParent( int index, const QRegExp& filter ) {
+int PopupProxy::buildParent( int index, const TQRegExp& filter ) {
deleteMoreMenus();
// Start from top of history (again)
spillPointer = parent()->history()->youngest();
@@ -75,7 +75,7 @@ int PopupProxy::buildParent( int index, const QRegExp& filter ) {
}
KlipperPopup* PopupProxy::parent() {
- return static_cast<KlipperPopup*>( QObject::parent() );
+ return static_cast<KlipperPopup*>( TQObject::parent() );
}
void PopupProxy::slotAboutToShow() {
@@ -89,17 +89,17 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item,
// Insert item
int id = -1;
- QPixmap image( item->image() );
+ TQPixmap image( item->image() );
if ( image.isNull() ) {
// Squeeze text strings so that do not take up the entire screen (or more)
- QString text( KStringHandler::cPixelSqueeze(item->text().simplifyWhiteSpace(),
+ TQString text( KStringHandler::cPixelSqueeze(item->text().simplifyWhiteSpace(),
proxy_for_menu->fontMetrics(),
m_menu_width).replace( "&", "&&" ) );
id = proxy_for_menu->insertItem( text, -1, index );
} else {
- const QSize max_size( m_menu_width,m_menu_height/4 );
+ const TQSize max_size( m_menu_width,m_menu_height/4 );
if ( image.height() > max_size.height() || image.width() > max_size.width() ) {
- image.convertFromImage( image.convertToImage().smoothScale( max_size, QImage::ScaleMin ) );
+ image.convertFromImage( image.convertToImage().smoothScale( max_size, TQImage::ScaleMin ) );
}
id = proxy_for_menu->insertItem( image, -1, index );
}
@@ -107,18 +107,18 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item,
// Determine height of a menu item.
Q_ASSERT( id != -1 ); // Be sure that the item was inserted.
- QMenuItem* mi = proxy_for_menu->findItem( id );
- int fontheight = QFontMetrics( proxy_for_menu->fontMetrics() ).height();
- int itemheight = proxy_for_menu->style().sizeFromContents(QStyle::CT_PopupMenuItem,
+ TQMenuItem* mi = proxy_for_menu->findItem( id );
+ int fontheight = TQFontMetrics( proxy_for_menu->fontMetrics() ).height();
+ int itemheight = proxy_for_menu->style().sizeFromContents(TQStyle::CT_PopupMenuItem,
proxy_for_menu,
- QSize( 0, fontheight ),
- QStyleOption(mi,10,0) ).height();
+ TQSize( 0, fontheight ),
+ TQStyleOption(mi,10,0) ).height();
// Test if there was enough space
remainingHeight -= itemheight;
History* history = parent()->history();
proxy_for_menu->connectItem( id,
history,
- SLOT( slotMoveToTop( int ) ) );
+ TQT_SLOT( slotMoveToTop( int ) ) );
proxy_for_menu->setItemParameter( id, nextItemNumber );
}
@@ -152,7 +152,7 @@ int PopupProxy::insertFromSpill( int index ) {
if ( spillPointer.current() ) {
KPopupMenu* moreMenu = new KPopupMenu( proxy_for_menu, "a more menu" );
proxy_for_menu->insertItem( i18n( "&More" ), moreMenu, -1, index );
- connect( moreMenu, SIGNAL( aboutToShow() ), SLOT( slotAboutToShow() ) );
+ connect( moreMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) );
proxy_for_menu = moreMenu;
}
diff --git a/klipper/popupproxy.h b/klipper/popupproxy.h
index 689e97f2a..88436cc93 100644
--- a/klipper/popupproxy.h
+++ b/klipper/popupproxy.h
@@ -20,10 +20,10 @@
#ifndef _POPUPPROXY_H_
#define _POPUPPROXY_H_
-#include <qptrlist.h>
-#include <qobject.h>
-#include <qstring.h>
-#include <qregexp.h>
+#include <tqptrlist.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqregexp.h>
#include <kpopupmenu.h>
#include <history.h>
@@ -55,7 +55,7 @@ public:
* @param filter If non-empty, only insert items that match filter as a regex
* @return number of items inserted.
*/
- int buildParent( int index, const QRegExp& filter = QRegExp() );
+ int buildParent( int index, const TQRegExp& filter = TQRegExp() );
public slots:
void slotAboutToShow();
@@ -83,7 +83,7 @@ private:
private:
KPopupMenu* proxy_for_menu;
History::iterator spillPointer;
- QRegExp m_filter;
+ TQRegExp m_filter;
int m_menu_height;
int m_menu_width;
int nextItemNumber;
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index 748d4a78f..039e56dfe 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -21,15 +21,15 @@
Boston, MA 02110-1301, USA.
*/
-#include <qclipboard.h>
-#include <qcursor.h>
-#include <qdatetime.h>
-#include <qfile.h>
-#include <qintdict.h>
-#include <qpainter.h>
-#include <qtooltip.h>
-#include <qmime.h>
-#include <qdragobject.h>
+#include <tqclipboard.h>
+#include <tqcursor.h>
+#include <tqdatetime.h>
+#include <tqfile.h>
+#include <tqintdict.h>
+#include <tqpainter.h>
+#include <tqtooltip.h>
+#include <tqmime.h>
+#include <tqdragobject.h>
#include <kaboutdata.h>
#include <kaction.h>
@@ -126,8 +126,8 @@ extern bool qt_qclipboard_bailout_hack;
static void ensureGlobalSyncOff(KConfig* config);
// config == kapp->config for process, otherwise applet
-KlipperWidget::KlipperWidget( QWidget *parent, KConfig* config )
- : QWidget( parent )
+KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config )
+ : TQWidget( parent )
, DCOPObject( "klipper" )
, m_overflowCounter( 0 )
, locklevel( 0 )
@@ -144,14 +144,14 @@ KlipperWidget::KlipperWidget( QWidget *parent, KConfig* config )
setBackgroundMode( X11ParentRelative );
clip = kapp->clipboard();
- connect( &m_overflowClearTimer, SIGNAL( timeout()), SLOT( slotClearOverflow()));
+ connect( &m_overflowClearTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotClearOverflow()));
m_overflowClearTimer.start( 1000 );
- connect( &m_pendingCheckTimer, SIGNAL( timeout()), SLOT( slotCheckPending()));
+ connect( &m_pendingCheckTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotCheckPending()));
m_history = new History( this, "main_history" );
// we need that collection, otherwise KToggleAction is not happy :}
- QString defaultGroup( "default" );
+ TQString defaultGroup( "default" );
KActionCollection *collection = new KActionCollection( this, "my collection" );
toggleURLGrabAction = new KToggleAction( collection, "toggleUrlGrabAction" );
toggleURLGrabAction->setEnabled( true );
@@ -160,16 +160,16 @@ KlipperWidget::KlipperWidget( QWidget *parent, KConfig* config )
"history_clear",
0,
history(),
- SLOT( slotClear() ),
+ TQT_SLOT( slotClear() ),
collection,
"clearHistoryAction" );
- connect( clearHistoryAction, SIGNAL( activated() ), SLOT( slotClearClipboard() ) );
+ connect( clearHistoryAction, TQT_SIGNAL( activated() ), TQT_SLOT( slotClearClipboard() ) );
clearHistoryAction->setGroup( defaultGroup );
configureAction = new KAction( i18n("&Configure Klipper..."),
"configure",
0,
this,
- SLOT( slotConfigure() ),
+ TQT_SLOT( slotConfigure() ),
collection,
"configureAction" );
configureAction->setGroup( defaultGroup );
@@ -177,7 +177,7 @@ KlipperWidget::KlipperWidget( QWidget *parent, KConfig* config )
"exit",
0,
this,
- SLOT( slotQuit() ),
+ TQT_SLOT( slotQuit() ),
collection,
"quitAction" );
quitAction->setGroup( "exit" );
@@ -186,15 +186,15 @@ KlipperWidget::KlipperWidget( QWidget *parent, KConfig* config )
readConfiguration( kc );
setURLGrabberEnabled( bURLGrabber );
- hideTimer = new QTime();
- showTimer = new QTime();
+ hideTimer = new TQTime();
+ showTimer = new TQTime();
readProperties(m_config);
- connect(kapp, SIGNAL(settingsChanged(int)), SLOT(slotSettingsChanged(int)));
+ connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
poll = new ClipboardPoll( this );
- connect( poll, SIGNAL( clipboardChanged( bool ) ),
- this, SLOT( newClipData( bool ) ) );
+ connect( poll, TQT_SIGNAL( clipboardChanged( bool ) ),
+ this, TQT_SLOT( newClipData( bool ) ) );
m_pixmap = KSystemTray::loadSizedIcon( "klipper", width() );
m_iconOrigWidth = width();
@@ -209,13 +209,13 @@ KlipperWidget::KlipperWidget( QWidget *parent, KConfig* config )
globalKeys->updateConnections();
toggleURLGrabAction->setShortcut(globalKeys->shortcut("Enable/Disable Clipboard Actions"));
- connect( toggleURLGrabAction, SIGNAL( toggled( bool )),
- this, SLOT( setURLGrabberEnabled( bool )));
+ connect( toggleURLGrabAction, TQT_SIGNAL( toggled( bool )),
+ this, TQT_SLOT( setURLGrabberEnabled( bool )));
KlipperPopup* popup = history()->popup();
- connect ( history(), SIGNAL( topChanged() ), SLOT( slotHistoryTopChanged() ) );
- connect( popup, SIGNAL( aboutToHide() ), SLOT( slotStartHideTimer() ) );
- connect( popup, SIGNAL( aboutToShow() ), SLOT( slotStartShowTimer() ) );
+ connect ( history(), TQT_SIGNAL( topChanged() ), TQT_SLOT( slotHistoryTopChanged() ) );
+ connect( popup, TQT_SIGNAL( aboutToHide() ), TQT_SLOT( slotStartHideTimer() ) );
+ connect( popup, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotStartShowTimer() ) );
popup->plugAction( toggleURLGrabAction );
popup->plugAction( clearHistoryAction );
@@ -224,7 +224,7 @@ KlipperWidget::KlipperWidget( QWidget *parent, KConfig* config )
popup->plugAction( quitAction );
}
- QToolTip::add( this, i18n("Klipper - clipboard tool") );
+ TQToolTip::add( this, i18n("Klipper - clipboard tool") );
}
KlipperWidget::~KlipperWidget()
@@ -244,13 +244,13 @@ void KlipperWidget::adjustSize()
}
// DCOP
-QString KlipperWidget::getClipboardContents()
+TQString KlipperWidget::getClipboardContents()
{
return getClipboardHistoryItem(0);
}
// DCOP - don't call from Klipper itself
-void KlipperWidget::setClipboardContents(QString s)
+void KlipperWidget::setClipboardContents(TQString s)
{
Ignore lock( locklevel );
updateTimestamp();
@@ -276,7 +276,7 @@ void KlipperWidget::clearClipboardHistory()
}
-void KlipperWidget::mousePressEvent(QMouseEvent *e)
+void KlipperWidget::mousePressEvent(TQMouseEvent *e)
{
if ( e->button() != LeftButton && e->button() != RightButton )
return;
@@ -289,12 +289,12 @@ void KlipperWidget::mousePressEvent(QMouseEvent *e)
}
}
-void KlipperWidget::paintEvent(QPaintEvent *)
+void KlipperWidget::paintEvent(TQPaintEvent *)
{
- QPainter p(this);
+ TQPainter p(this);
// Honor Free Desktop specifications that allow for arbitrary system tray icon sizes
if ((m_iconOrigWidth != width()) || (m_iconOrigHeight != height())) {
- QImage newIcon;
+ TQImage newIcon;
m_pixmap = KSystemTray::loadSizedIcon( "klipper", width() );
newIcon = m_pixmap;
newIcon = newIcon.smoothScale(width(), height());
@@ -318,29 +318,29 @@ void KlipperWidget::slotStartShowTimer()
showTimer->start();
}
-void KlipperWidget::showPopupMenu( QPopupMenu *menu )
+void KlipperWidget::showPopupMenu( TQPopupMenu *menu )
{
Q_ASSERT( menu != 0L );
- QSize size = menu->sizeHint(); // geometry is not valid until it's shown
+ TQSize size = menu->sizeHint(); // geometry is not valid until it's shown
if (bPopupAtMouse) {
- QPoint g = QCursor::pos();
+ TQPoint g = TQCursor::pos();
if ( size.height() < g.y() )
- menu->popup(QPoint( g.x(), g.y() - size.height()));
+ menu->popup(TQPoint( g.x(), g.y() - size.height()));
else
- menu->popup(QPoint(g.x(), g.y()));
+ menu->popup(TQPoint(g.x(), g.y()));
} else {
KWin::WindowInfo i = KWin::windowInfo( winId(), NET::WMGeometry );
- QRect g = i.geometry();
- QRect screen = KGlobalSettings::desktopGeometry(g.center());
+ TQRect g = i.geometry();
+ TQRect screen = KGlobalSettings::desktopGeometry(g.center());
if ( g.x()-screen.x() > screen.width()/2 &&
g.y()-screen.y() + size.height() > screen.height() )
- menu->popup(QPoint( g.x(), g.y() - size.height()));
+ menu->popup(TQPoint( g.x(), g.y() - size.height()));
else
- menu->popup(QPoint( g.x() + width(), g.y() + height()));
+ menu->popup(TQPoint( g.x() + width(), g.y() + height()));
- // menu->exec(mapToGlobal(QPoint( width()/2, height()/2 )));
+ // menu->exec(mapToGlobal(TQPoint( width()/2, height()/2 )));
}
}
@@ -348,8 +348,8 @@ bool KlipperWidget::loadHistory() {
static const char* const failed_load_warning =
"Failed to load history resource. Clipboard history cannot be read.";
// don't use "appdata", klipper is also a kicker applet
- QString history_file_name = ::locateLocal( "data", "klipper/history2.lst" );
- QFile history_file( history_file_name );
+ TQString history_file_name = ::locateLocal( "data", "klipper/history2.lst" );
+ TQFile history_file( history_file_name );
bool oldfile = false;
if ( !history_file.exists() ) { // backwards compatibility
oldfile = true;
@@ -367,13 +367,13 @@ bool KlipperWidget::loadHistory() {
kdWarning() << failed_load_warning << ": " << history_file.errorString() << endl;
return false;
}
- QDataStream file_stream( &history_file );
+ TQDataStream file_stream( &history_file );
if( file_stream.atEnd()) {
kdWarning() << failed_load_warning << endl;
return false;
}
- QDataStream* history_stream = &file_stream;
- QByteArray data;
+ TQDataStream* history_stream = &file_stream;
+ TQByteArray data;
if( !oldfile ) {
Q_UINT32 crc;
file_stream >> crc >> data;
@@ -382,7 +382,7 @@ bool KlipperWidget::loadHistory() {
return false;
}
- history_stream = new QDataStream( data, IO_ReadOnly );
+ history_stream = new TQDataStream( data, IO_ReadOnly );
}
char* version;
*history_stream >> version;
@@ -392,7 +392,7 @@ bool KlipperWidget::loadHistory() {
// youngest-first to keep the most important clipboard
// items at the top, but the history is created oldest
// first.
- QPtrList<HistoryItem> reverseList;
+ TQPtrList<HistoryItem> reverseList;
for ( HistoryItem* item = HistoryItem::create( *history_stream );
item;
item = HistoryItem::create( *history_stream ) )
@@ -423,7 +423,7 @@ void KlipperWidget::saveHistory() {
static const char* const failed_save_warning =
"Failed to save history. Clipboard history cannot be saved.";
// don't use "appdata", klipper is also a kicker applet
- QString history_file_name( ::locateLocal( "data", "klipper/history2.lst" ) );
+ TQString history_file_name( ::locateLocal( "data", "klipper/history2.lst" ) );
if ( history_file_name.isNull() || history_file_name.isEmpty() ) {
kdWarning() << failed_save_warning << endl;
return;
@@ -433,8 +433,8 @@ void KlipperWidget::saveHistory() {
kdWarning() << failed_save_warning << endl;
return;
}
- QByteArray data;
- QDataStream history_stream( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream history_stream( data, IO_WriteOnly );
history_stream << klipper_version; // const char*
for ( const HistoryItem* item = history()->first(); item; item = history()->next() ) {
history_stream << item;
@@ -445,7 +445,7 @@ void KlipperWidget::saveHistory() {
void KlipperWidget::readProperties(KConfig *kc)
{
- QStringList dataList;
+ TQStringList dataList;
history()->slotClear();
@@ -456,7 +456,7 @@ void KlipperWidget::readProperties(KConfig *kc)
KConfigGroupSaver groupSaver(kc, "General");
dataList = kc->readListEntry("ClipboardData");
- for (QStringList::ConstIterator it = dataList.end();
+ for (TQStringList::ConstIterator it = dataList.end();
it != dataList.begin();
)
{
@@ -560,7 +560,7 @@ void KlipperWidget::slotConfigure()
dlg->setSynchronize( bSynchronize );
dlg->setNoActionsFor( myURLGrabber->avoidWindows() );
- if ( dlg->exec() == QDialog::Accepted ) {
+ if ( dlg->exec() == TQDialog::Accepted ) {
bKeepContents = dlg->keepContents();
bPopupAtMouse = dlg->popupAtMousePos();
bReplayActionInHistory = dlg->replayActionInHistory();
@@ -626,10 +626,10 @@ void KlipperWidget::slotRepeatAction()
{
if ( !myURLGrabber ) {
myURLGrabber = new URLGrabber( m_config );
- connect( myURLGrabber, SIGNAL( sigPopup( QPopupMenu * )),
- SLOT( showPopupMenu( QPopupMenu * )) );
- connect( myURLGrabber, SIGNAL( sigDisablePopup() ),
- this, SLOT( disableURLGrabber() ) );
+ connect( myURLGrabber, TQT_SIGNAL( sigPopup( TQPopupMenu * )),
+ TQT_SLOT( showPopupMenu( TQPopupMenu * )) );
+ connect( myURLGrabber, TQT_SIGNAL( sigDisablePopup() ),
+ this, TQT_SLOT( disableURLGrabber() ) );
}
const HistoryStringItem* top = dynamic_cast<const HistoryStringItem*>( history()->first() );
@@ -645,8 +645,8 @@ void KlipperWidget::setURLGrabberEnabled( bool enable )
KConfig *kc = m_config;
kc->setGroup("General");
kc->writeEntry("URLGrabberEnabled", bURLGrabber);
- m_lastURLGrabberTextSelection = QString();
- m_lastURLGrabberTextClipboard = QString();
+ m_lastURLGrabberTextSelection = TQString();
+ m_lastURLGrabberTextClipboard = TQString();
}
toggleURLGrabAction->setChecked( enable );
@@ -661,10 +661,10 @@ void KlipperWidget::setURLGrabberEnabled( bool enable )
toggleURLGrabAction->setText(i18n("&Actions Enabled"));
if ( !myURLGrabber ) {
myURLGrabber = new URLGrabber( m_config );
- connect( myURLGrabber, SIGNAL( sigPopup( QPopupMenu * )),
- SLOT( showPopupMenu( QPopupMenu * )) );
- connect( myURLGrabber, SIGNAL( sigDisablePopup() ),
- this, SLOT( disableURLGrabber() ) );
+ connect( myURLGrabber, TQT_SIGNAL( sigPopup( TQPopupMenu * )),
+ TQT_SLOT( showPopupMenu( TQPopupMenu * )) );
+ connect( myURLGrabber, TQT_SIGNAL( sigDisablePopup() ),
+ this, TQT_SLOT( disableURLGrabber() ) );
}
}
}
@@ -701,17 +701,17 @@ void KlipperWidget::slotClearClipboard()
//XXX: Should die, and the DCOP signal handled sensible.
-QString KlipperWidget::clipboardContents( bool * /*isSelection*/ )
+TQString KlipperWidget::clipboardContents( bool * /*isSelection*/ )
{
kdWarning() << "Obsolete function called. Please fix" << endl;
#if 0
bool selection = true;
- QMimeSource* data = clip->data(QClipboard::Selection);
+ TQMimeSource* data = clip->data(QClipboard::Selection);
if ( data->serialNumber() == m_lastSelection )
{
- QString clipContents = clip->text(QClipboard::Clipboard);
+ TQString clipContents = clip->text(QClipboard::Clipboard);
if ( clipContents != m_lastClipboard )
{
contents = clipContents;
@@ -729,7 +729,7 @@ QString KlipperWidget::clipboardContents( bool * /*isSelection*/ )
return 0;
}
-void KlipperWidget::applyClipChanges( const QMimeSource& clipData )
+void KlipperWidget::applyClipChanges( const TQMimeSource& clipData )
{
if ( locklevel )
return;
@@ -804,7 +804,7 @@ void KlipperWidget::slotCheckPending()
void KlipperWidget::checkClipData( bool selectionMode )
{
- if ( ignoreClipboardChanges() ) // internal to klipper, ignoring QSpinBox selections
+ if ( ignoreClipboardChanges() ) // internal to klipper, ignoring TQSpinBox selections
{
// keep our old clipboard, thanks
// This won't quite work, but it's close enough for now.
@@ -851,7 +851,7 @@ void KlipperWidget::checkClipData( bool selectionMode )
qDebug( " format: %s", format);
}
#endif
- QMimeSource* data = clip->data( selectionMode ? QClipboard::Selection : QClipboard::Clipboard );
+ TQMimeSource* data = clip->data( selectionMode ? QClipboard::Selection : QClipboard::Clipboard );
if ( !data ) {
kdWarning("No data in clipboard. This not not supposed to happen." );
return;
@@ -879,14 +879,14 @@ void KlipperWidget::checkClipData( bool selectionMode )
if ( selectionMode && bIgnoreSelection )
return;
- if( selectionMode && bSelectionTextOnly && !QTextDrag::canDecode( data ))
+ if( selectionMode && bSelectionTextOnly && !TQTextDrag::canDecode( data ))
return;
if( KURLDrag::canDecode( data ))
; // ok
- else if( QTextDrag::canDecode( data ))
+ else if( TQTextDrag::canDecode( data ))
; // ok
- else if( QImageDrag::canDecode( data ))
+ else if( TQImageDrag::canDecode( data ))
{
// Limit mimetypes that are tracked by Klipper (this is basically a workaround
// for #109032). Can't add UI in 3.5 because of string freeze, and I'm not sure
@@ -906,14 +906,14 @@ void KlipperWidget::checkClipData( bool selectionMode )
else
m_lastClipboard = data->serialNumber();
- QString& lastURLGrabberText = selectionMode
+ TQString& lastURLGrabberText = selectionMode
? m_lastURLGrabberTextSelection : m_lastURLGrabberTextClipboard;
- if( QTextDrag::canDecode( data ))
+ if( TQTextDrag::canDecode( data ))
{
if ( bURLGrabber && myURLGrabber )
{
- QString text;
- QTextDrag::decode( data, text );
+ TQString text;
+ TQTextDrag::decode( data, text );
// Make sure URLGrabber doesn't repeat all the time if klipper reads the same
// text all the time (e.g. because XFixes is not available and the application
// has broken TIMESTAMP target). Using most recent history item may not always
@@ -928,10 +928,10 @@ void KlipperWidget::checkClipData( bool selectionMode )
}
}
else
- lastURLGrabberText = QString();
+ lastURLGrabberText = TQString();
}
else
- lastURLGrabberText = QString();
+ lastURLGrabberText = TQString();
if (changed) {
applyClipChanges( *data );
@@ -981,23 +981,23 @@ void KlipperWidget::slotClearOverflow()
m_overflowCounter = 0;
}
-QStringList KlipperWidget::getClipboardHistoryMenu()
+TQStringList KlipperWidget::getClipboardHistoryMenu()
{
- QStringList menu;
+ TQStringList menu;
for ( const HistoryItem* item = history()->first(); item; item = history()->next() ) {
menu << item->text();
}
return menu;
}
-QString KlipperWidget::getClipboardHistoryItem(int i)
+TQString KlipperWidget::getClipboardHistoryItem(int i)
{
for ( const HistoryItem* item = history()->first(); item; item = history()->next() , i-- ) {
if ( i == 0 ) {
return item->text();
}
}
- return QString::null;
+ return TQString::null;
}
@@ -1008,13 +1008,13 @@ QString KlipperWidget::getClipboardHistoryItem(int i)
//
bool KlipperWidget::ignoreClipboardChanges() const
{
- QWidget *focusWidget = qApp->focusWidget();
+ TQWidget *focusWidget = qApp->focusWidget();
if ( focusWidget )
{
- if ( focusWidget->inherits( "QSpinBox" ) ||
+ if ( focusWidget->inherits( "TQSpinBox" ) ||
(focusWidget->parentWidget() &&
- focusWidget->inherits("QLineEdit") &&
- focusWidget->parentWidget()->inherits("QSpinWidget")) )
+ focusWidget->inherits("TQLineEdit") &&
+ focusWidget->parentWidget()->inherits("TQSpinWidget")) )
{
return true;
}
@@ -1030,7 +1030,7 @@ bool KlipperWidget::ignoreClipboardChanges() const
// Therefore, qt_x_time needs to be updated to current X server timestamp.
// Call KApplication::updateUserTime() only from functions that are
-// called from outside (DCOP), or from QTimer timeout !
+// called from outside (DCOP), or from TQTimer timeout !
extern Time qt_x_time;
extern Time qt_x_user_time;
@@ -1076,7 +1076,7 @@ void KlipperWidget::updateTimestamp()
Time& time = ( strcmp( qVersion(), "3.3.1" ) == 0
|| strcmp( qVersion(), "3.3.0" ) == 0 )
? qt_x_user_time : qt_x_time;
- static QWidget* w = 0;
+ static TQWidget* w = 0;
if ( !w )
w = new QWidget;
unsigned char data[ 1 ];
@@ -1140,7 +1140,7 @@ KAboutData* KlipperWidget::aboutData()
return about_data;
}
-Klipper::Klipper( QWidget* parent )
+Klipper::Klipper( TQWidget* parent )
: KlipperWidget( parent, kapp->config())
{
}
diff --git a/klipper/toplevel.h b/klipper/toplevel.h
index 20a6a3027..6f90b4ad8 100644
--- a/klipper/toplevel.h
+++ b/klipper/toplevel.h
@@ -24,10 +24,10 @@
#include <kapplication.h>
#include <kglobalaccel.h>
#include <kpopupmenu.h>
-#include <qmap.h>
-#include <qpixmap.h>
+#include <tqmap.h>
+#include <tqpixmap.h>
#include <dcopobject.h>
-#include <qtimer.h>
+#include <tqtimer.h>
class QClipboard;
class KToggleAction;
@@ -41,21 +41,21 @@ class QMimeSource;
class HistoryItem;
class KlipperSessionManaged;
-class KlipperWidget : public QWidget, public DCOPObject
+class KlipperWidget : public TQWidget, public DCOPObject
{
Q_OBJECT
K_DCOP
k_dcop:
- QString getClipboardContents();
- void setClipboardContents(QString s);
+ TQString getClipboardContents();
+ void setClipboardContents(TQString s);
void clearClipboardContents();
void clearClipboardHistory();
- QStringList getClipboardHistoryMenu();
- QString getClipboardHistoryItem(int i);
+ TQStringList getClipboardHistoryMenu();
+ TQString getClipboardHistoryItem(int i);
public:
- KlipperWidget( QWidget *parent, KConfig* config );
+ KlipperWidget( TQWidget *parent, KConfig* config );
~KlipperWidget();
virtual void adjustSize();
@@ -86,8 +86,8 @@ protected:
*/
enum SelectionMode { Clipboard = 2, Selection = 4 };
- void paintEvent(QPaintEvent *);
- void mousePressEvent(QMouseEvent *);
+ void paintEvent(TQPaintEvent *);
+ void mousePressEvent(TQMouseEvent *);
void readProperties(KConfig *);
void readConfiguration(KConfig *);
@@ -106,9 +106,9 @@ protected:
* @returns the contents of the selection or, if empty, the contents of
* the clipboard.
*/
- QString clipboardContents( bool *isSelection = 0L );
+ TQString clipboardContents( bool *isSelection = 0L );
- void removeFromHistory( const QString& text );
+ void removeFromHistory( const TQString& text );
void setEmptyClipboard();
void clipboardSignalArrived( bool selectionMode );
@@ -122,7 +122,7 @@ protected:
/**
* Enter clipboard data in the history.
*/
- void applyClipChanges( const QMimeSource& data );
+ void applyClipChanges( const TQMimeSource& data );
void setClipboard( const HistoryItem& item, int mode );
bool ignoreClipboardChanges() const;
@@ -132,7 +132,7 @@ protected:
protected slots:
void slotPopupMenu();
- void showPopupMenu( QPopupMenu * );
+ void showPopupMenu( TQPopupMenu * );
void slotRepeatAction();
void setURLGrabberEnabled( bool );
void toggleURLGrabber();
@@ -160,10 +160,10 @@ private:
QClipboard *clip;
- QTime *hideTimer;
- QTime *showTimer;
+ TQTime *hideTimer;
+ TQTime *showTimer;
- QMimeSource* m_lastClipdata;
+ TQMimeSource* m_lastClipdata;
int m_lastClipboard;
int m_lastSelection;
History* m_history;
@@ -172,8 +172,8 @@ private:
KAction* clearHistoryAction;
KAction* configureAction;
KAction* quitAction;
- QPixmap m_pixmap;
- QPixmap m_scaledpixmap;
+ TQPixmap m_pixmap;
+ TQPixmap m_scaledpixmap;
int m_iconOrigWidth;
int m_iconOrigHeight;
bool bPopupAtMouse :1;
@@ -197,11 +197,11 @@ private:
int locklevel;
URLGrabber *myURLGrabber;
- QString m_lastURLGrabberTextSelection;
- QString m_lastURLGrabberTextClipboard;
+ TQString m_lastURLGrabberTextSelection;
+ TQString m_lastURLGrabberTextClipboard;
KConfig* m_config;
- QTimer m_overflowClearTimer;
- QTimer m_pendingCheckTimer;
+ TQTimer m_overflowClearTimer;
+ TQTimer m_pendingCheckTimer;
bool m_pendingContentsCheck;
ClipboardPoll* poll;
static KAboutData* about_data;
@@ -218,7 +218,7 @@ k_dcop:
int newInstance();
void quitProcess(); // not ASYNC
public:
- Klipper( QWidget* parent = NULL );
+ Klipper( TQWidget* parent = NULL );
};
#endif
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index 45d5f5e4b..c814508c1 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qcursor.h>
-#include <qtimer.h>
+#include <tqcursor.h>
+#include <tqtimer.h>
#include <kapplication.h>
#include <kconfig.h>
@@ -61,9 +61,9 @@ URLGrabber::URLGrabber( KConfig* config )
readConfiguration( m_config );
- myPopupKillTimer = new QTimer( this );
- connect( myPopupKillTimer, SIGNAL( timeout() ),
- SLOT( slotKillPopupMenu() ));
+ myPopupKillTimer = new TQTimer( this );
+ connect( myPopupKillTimer, TQT_SIGNAL( timeout() ),
+ TQT_SLOT( slotKillPopupMenu() ));
// testing
/*
@@ -94,7 +94,7 @@ URLGrabber::~URLGrabber()
// Called from Klipper::slotRepeatAction, i.e. by pressing Ctrl-Alt-R
// shortcut. I.e. never from clipboard monitoring
//
-void URLGrabber::invokeAction( const QString& clip )
+void URLGrabber::invokeAction( const TQString& clip )
{
if ( !clip.isEmpty() )
myClipData = clip;
@@ -112,7 +112,7 @@ void URLGrabber::setActionList( ActionList *list )
}
-const ActionList& URLGrabber::matchingActions( const QString& clipData )
+const ActionList& URLGrabber::matchingActions( const TQString& clipData )
{
myMatches.clear();
ClipAction *action = 0L;
@@ -126,7 +126,7 @@ const ActionList& URLGrabber::matchingActions( const QString& clipData )
}
-bool URLGrabber::checkNewData( const QString& clipData )
+bool URLGrabber::checkNewData( const TQString& clipData )
{
// kdDebug() << "** checking new data: " << clipData << endl;
myClipData = clipData;
@@ -157,18 +157,18 @@ void URLGrabber::actionMenu( bool wm_class_check )
if ( wm_class_check && isAvoidedWindow() )
return;
- QString item;
+ TQString item;
myCommandMapper.clear();
myGroupingMapper.clear();
myPopupKillTimer->stop();
delete myMenu;
myMenu = new KPopupMenu;
- connect( myMenu, SIGNAL( activated( int )),
- SLOT( slotItemSelected( int )));
+ connect( myMenu, TQT_SIGNAL( activated( int )),
+ TQT_SLOT( slotItemSelected( int )));
for ( action = it.current(); action; action = ++it ) {
- QPtrListIterator<ClipCommand> it2( action->commands() );
+ TQPtrListIterator<ClipCommand> it2( action->commands() );
if ( it2.count() > 0 )
myMenu->insertTitle( SmallIcon( "klipper" ), action->description() +
i18n(" - Actions For: ") +
@@ -225,7 +225,7 @@ void URLGrabber::slotItemSelected( int id )
break;
default:
ClipCommand *command = myCommandMapper.find( id );
- QStringList *backrefs = myGroupingMapper.find( id );
+ TQStringList *backrefs = myGroupingMapper.find( id );
if ( !command || !backrefs )
qWarning("Klipper: can't find associated action");
else
@@ -235,18 +235,18 @@ void URLGrabber::slotItemSelected( int id )
void URLGrabber::execute( const struct ClipCommand *command,
- QStringList *backrefs) const
+ TQStringList *backrefs) const
{
if ( command->isEnabled ) {
- QMap<QChar,QString> map;
+ TQMap<TQChar,TQString> map;
map.insert( 's', myClipData );
int brCounter = -1;
- QStringList::Iterator it = backrefs->begin();
+ TQStringList::Iterator it = backrefs->begin();
while( it != backrefs->end() ) {
map.insert( char(++brCounter + '0') , *it );
++it;
}
- QString cmdLine = KMacroExpander::expandMacrosShellQuote( command->command, map );
+ TQString cmdLine = KMacroExpander::expandMacrosShellQuote( command->command, map );
if ( cmdLine.isEmpty() )
return;
@@ -277,10 +277,10 @@ void URLGrabber::editData()
dlg->setMainWidget( edit );
dlg->adjustSize();
- if ( dlg->exec() == QDialog::Accepted ) {
+ if ( dlg->exec() == TQDialog::Accepted ) {
myClipData = edit->text();
delete dlg;
- QTimer::singleShot( 0, this, SLOT( slotActionMenu() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotActionMenu() ) );
}
else
{
@@ -299,9 +299,9 @@ void URLGrabber::readConfiguration( KConfig *kc )
myAvoidWindows = kc->readListEntry("No Actions for WM_CLASS");
myPopupKillTimeout = kc->readNumEntry( "Timeout for Action popups (seconds)", 8 );
m_stripWhiteSpace = kc->readBoolEntry("Strip Whitespace before exec", true);
- QString group;
+ TQString group;
for ( int i = 0; i < num; i++ ) {
- group = QString("Action_%1").arg( i );
+ group = TQString("Action_%1").arg( i );
kc->setGroup( group );
myActions->append( new ClipAction( kc ) );
}
@@ -320,9 +320,9 @@ void URLGrabber::writeConfiguration( KConfig *kc )
ClipAction *action;
int i = 0;
- QString group;
+ TQString group;
while ( (action = it.current()) ) {
- group = QString("Action_%1").arg( i );
+ group = TQString("Action_%1").arg( i );
kc->setGroup( group );
action->save( kc );
++i;
@@ -344,7 +344,7 @@ bool URLGrabber::isAvoidedWindow() const
long BUFSIZE = 2048;
bool ret = false;
Window active = 0L;
- QString wmClass;
+ TQString wmClass;
// get the active window
if (XGetWindowProperty(d, DefaultRootWindow( d ), active_window, 0l, 1l,
@@ -364,7 +364,7 @@ bool URLGrabber::isAvoidedWindow() const
&type_ret, &format_ret, &nitems_ret,
&unused, &data_ret ) == Success) {
if ( type_ret == XA_STRING && format_ret == 8 && nitems_ret > 0 ) {
- wmClass = QString::fromUtf8( (const char *) data_ret );
+ wmClass = TQString::fromUtf8( (const char *) data_ret );
ret = (myAvoidWindows.find( wmClass ) != myAvoidWindows.end());
}
@@ -379,7 +379,7 @@ void URLGrabber::slotKillPopupMenu()
{
if ( myMenu && myMenu->isVisible() )
{
- if ( myMenu->geometry().contains( QCursor::pos() ) &&
+ if ( myMenu->geometry().contains( TQCursor::pos() ) &&
myPopupKillTimeout > 0 )
{
myPopupKillTimer->start( 1000 * myPopupKillTimeout, true );
@@ -394,8 +394,8 @@ void URLGrabber::slotKillPopupMenu()
///////////////////////////////////////////////////////////////////////////
////////
-ClipCommand::ClipCommand(const QString &_command, const QString &_description,
- bool _isEnabled, const QString &_icon)
+ClipCommand::ClipCommand(const TQString &_command, const TQString &_description,
+ bool _isEnabled, const TQString &_icon)
: command(_command),
description(_description),
isEnabled(_isEnabled)
@@ -412,12 +412,12 @@ ClipCommand::ClipCommand(const QString &_command, const QString &_description,
if (service)
pixmap = service->icon();
else
- pixmap = QString::null;
+ pixmap = TQString::null;
}
}
-ClipAction::ClipAction( const QString& regExp, const QString& description )
+ClipAction::ClipAction( const TQString& regExp, const TQString& description )
: myRegExp( regExp ), myDescription( description )
{
myCommands.setAutoDelete( true );
@@ -431,7 +431,7 @@ ClipAction::ClipAction( const ClipAction& action )
myDescription = action.myDescription;
ClipCommand *command = 0L;
- QPtrListIterator<ClipCommand> it( myCommands );
+ TQPtrListIterator<ClipCommand> it( myCommands );
for ( ; it.current(); ++it ) {
command = it.current();
addCommand(command->command, command->description, command->isEnabled);
@@ -447,9 +447,9 @@ ClipAction::ClipAction( KConfig *kc )
int num = kc->readNumEntry( "Number of commands" );
// read the commands
- QString actionGroup = kc->group();
+ TQString actionGroup = kc->group();
for ( int i = 0; i < num; i++ ) {
- QString group = actionGroup + "/Command_%1";
+ TQString group = actionGroup + "/Command_%1";
kc->setGroup( group.arg( i ) );
addCommand( kc->readPathEntry( "Commandline" ),
@@ -465,8 +465,8 @@ ClipAction::~ClipAction()
}
-void ClipAction::addCommand( const QString& command,
- const QString& description, bool enabled, const QString& icon )
+void ClipAction::addCommand( const TQString& command,
+ const TQString& description, bool enabled, const TQString& icon )
{
if ( command.isEmpty() )
return;
@@ -484,14 +484,14 @@ void ClipAction::save( KConfig *kc ) const
kc->writeEntry( "Regexp", regExp() );
kc->writeEntry( "Number of commands", myCommands.count() );
- QString actionGroup = kc->group();
+ TQString actionGroup = kc->group();
struct ClipCommand *cmd;
- QPtrListIterator<struct ClipCommand> it( myCommands );
+ TQPtrListIterator<struct ClipCommand> it( myCommands );
// now iterate over all commands of this action
int i = 0;
while ( (cmd = it.current()) ) {
- QString group = actionGroup + "/Command_%1";
+ TQString group = actionGroup + "/Command_%1";
kc->setGroup( group.arg( i ) );
kc->writePathEntry( "Commandline", cmd->command );
diff --git a/klipper/urlgrabber.h b/klipper/urlgrabber.h
index 232455fa0..7841e940a 100644
--- a/klipper/urlgrabber.h
+++ b/klipper/urlgrabber.h
@@ -20,11 +20,11 @@
#ifndef URLGRABBER_H
#define URLGRABBER_H
-#include <qptrlist.h>
-#include <qintdict.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqptrlist.h>
+#include <tqintdict.h>
+#include <tqregexp.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <kprocess.h>
@@ -36,8 +36,8 @@ class KPopupMenu;
class ClipAction;
struct ClipCommand;
-typedef QPtrList<ClipAction> ActionList;
-typedef QPtrListIterator<ClipAction> ActionListIterator;
+typedef TQPtrList<ClipAction> ActionList;
+typedef TQPtrListIterator<ClipAction> ActionListIterator;
class URLGrabber : public QObject
{
@@ -53,8 +53,8 @@ public:
* @returns false if the string should be put into the popupmenu or not,
* otherwise true.
*/
- bool checkNewData( const QString& clipData );
- void invokeAction( const QString& clip = QString::null );
+ bool checkNewData( const TQString& clipData );
+ void invokeAction( const TQString& clip = TQString::null );
const ActionList * actionList() const { return myActions; }
void setActionList( ActionList * );
@@ -64,29 +64,29 @@ public:
int popupTimeout() const { return myPopupKillTimeout; }
void setPopupTimeout( int timeout ) { myPopupKillTimeout = timeout; }
- const QStringList& avoidWindows() const { return myAvoidWindows; }
- void setAvoidWindows( const QStringList& list ) { myAvoidWindows = list; }
+ const TQStringList& avoidWindows() const { return myAvoidWindows; }
+ void setAvoidWindows( const TQStringList& list ) { myAvoidWindows = list; }
bool stripWhiteSpace() const { return m_stripWhiteSpace; }
void setStripWhiteSpace( bool enable ) { m_stripWhiteSpace = enable; }
private:
- const ActionList& matchingActions( const QString& );
+ const ActionList& matchingActions( const TQString& );
void execute( const struct ClipCommand *command,
- QStringList *backrefs ) const;
+ TQStringList *backrefs ) const;
void editData();
bool isAvoidedWindow() const;
void actionMenu( bool wm_class_check );
ActionList *myActions;
ActionList myMatches;
- QStringList myAvoidWindows;
- QString myClipData;
+ TQStringList myAvoidWindows;
+ TQString myClipData;
ClipAction *myCurrentAction;
- QIntDict<ClipCommand> myCommandMapper;
- QIntDict<QStringList> myGroupingMapper;
+ TQIntDict<ClipCommand> myCommandMapper;
+ TQIntDict<TQStringList> myGroupingMapper;
KPopupMenu *myMenu;
- QTimer *myPopupKillTimer;
+ TQTimer *myPopupKillTimer;
int myPopupKillTimeout;
bool m_stripWhiteSpace;
KConfig* m_config;
@@ -98,7 +98,7 @@ private slots:
signals:
- void sigPopup( QPopupMenu * );
+ void sigPopup( TQPopupMenu * );
void sigDisablePopup();
};
@@ -106,11 +106,11 @@ signals:
struct ClipCommand
{
- ClipCommand( const QString &, const QString &, bool = true, const QString & = "" );
- QString command;
- QString description;
+ ClipCommand( const TQString &, const TQString &, bool = true, const TQString & = "" );
+ TQString command;
+ TQString description;
bool isEnabled;
- QString pixmap;
+ TQString pixmap;
// int id; // the index reflecting the position in the list of commands
};
@@ -122,14 +122,14 @@ struct ClipCommand
class ClipAction
{
public:
- ClipAction( const QString& regExp, const QString& description );
+ ClipAction( const TQString& regExp, const TQString& description );
ClipAction( const ClipAction& );
ClipAction( KConfig *kc );
~ClipAction();
- void setRegExp( const QString& r) { myRegExp = QRegExp( r ); }
- QString regExp() const { return myRegExp.pattern(); }
- inline bool matches( const QString& string ) {
+ void setRegExp( const TQString& r) { myRegExp = TQRegExp( r ); }
+ TQString regExp() const { return myRegExp.pattern(); }
+ inline bool matches( const TQString& string ) {
int res = myRegExp.search( string ) ;
if ( res != -1 ) {
myCapturedTexts = myRegExp.capturedTexts();
@@ -138,16 +138,16 @@ public:
return false;
}
- void setDescription( const QString& d) { myDescription = d; }
- const QString& description() const { return myDescription; }
+ void setDescription( const TQString& d) { myDescription = d; }
+ const TQString& description() const { return myDescription; }
/**
* Removes all ClipCommands associated with this ClipAction.
*/
void clearCommands() { myCommands.clear(); }
- void addCommand( const QString& command, const QString& description, bool, const QString& icon = "" );
- const QPtrList<ClipCommand>& commands() const { return myCommands; }
+ void addCommand( const TQString& command, const TQString& description, bool, const TQString& icon = "" );
+ const TQPtrList<ClipCommand>& commands() const { return myCommands; }
/**
* Saves this action to a a given KConfig object
@@ -158,13 +158,13 @@ public:
* Returns the most recent list of matched group backreferences.
* Note: you probably need to call matches() first.
*/
- inline const QStringList* capturedTexts() const { return &myCapturedTexts; }
+ inline const TQStringList* capturedTexts() const { return &myCapturedTexts; }
private:
- QRegExp myRegExp;
+ TQRegExp myRegExp;
QStringList myCapturedTexts;
- QString myDescription;
- QPtrList<ClipCommand> myCommands;
+ TQString myDescription;
+ TQPtrList<ClipCommand> myCommands;
};
diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp
index f6971a1f2..1ab175c17 100644
--- a/kmenuedit/basictab.cpp
+++ b/kmenuedit/basictab.cpp
@@ -18,13 +18,13 @@
*/
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qfileinfo.h>
-#include <qgroupbox.h>
-#include <qhbox.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqfileinfo.h>
+#include <tqgroupbox.h>
+#include <tqhbox.h>
+#include <tqwhatsthis.h>
#include <klocale.h>
#include <kstandarddirs.h>
@@ -47,19 +47,19 @@
#include "basictab.h"
#include "basictab.moc"
-BasicTab::BasicTab( QWidget *parent, const char *name )
- : QWidget(parent, name)
+BasicTab::BasicTab( TQWidget *parent, const char *name )
+ : TQWidget(parent, name)
{
_menuFolderInfo = 0;
_menuEntryInfo = 0;
- QGridLayout *layout = new QGridLayout(this, 6, 2,
+ TQGridLayout *layout = new TQGridLayout(this, 6, 2,
KDialog::marginHint(),
KDialog::spacingHint());
// general group
- QGroupBox *general_group = new QGroupBox(this);
- QGridLayout *grid = new QGridLayout(general_group, 5, 2,
+ TQGroupBox *general_group = new TQGroupBox(this);
+ TQGridLayout *grid = new TQGridLayout(general_group, 5, 2,
KDialog::marginHint(),
KDialog::spacingHint());
@@ -74,7 +74,7 @@ BasicTab::BasicTab( QWidget *parent, const char *name )
_commentEdit->setAcceptDrops(false);
_execEdit = new KURLRequester(general_group);
_execEdit->lineEdit()->setAcceptDrops(false);
- QWhatsThis::add(_execEdit,i18n(
+ TQWhatsThis::add(_execEdit,i18n(
"Following the command, you can have several place holders which will be replaced "
"with the actual values when the actual program is run:\n"
"%f - a single file name\n"
@@ -87,32 +87,32 @@ BasicTab::BasicTab( QWidget *parent, const char *name )
"%m - the mini-icon\n"
"%c - the caption"));
- _launchCB = new QCheckBox(i18n("Enable &launch feedback"), general_group);
- _systrayCB = new QCheckBox(i18n("&Place in system tray"), general_group);
+ _launchCB = new TQCheckBox(i18n("Enable &launch feedback"), general_group);
+ _systrayCB = new TQCheckBox(i18n("&Place in system tray"), general_group);
// setup labels
- _nameLabel = new QLabel(_nameEdit, i18n("&Name:"), general_group);
- _descriptionLabel = new QLabel(_descriptionEdit, i18n("&Description:"), general_group);
- _commentLabel = new QLabel(_commentEdit, i18n("&Comment:"), general_group);
- _execLabel = new QLabel(_execEdit, i18n("Co&mmand:"), general_group);
+ _nameLabel = new TQLabel(_nameEdit, i18n("&Name:"), general_group);
+ _descriptionLabel = new TQLabel(_descriptionEdit, i18n("&Description:"), general_group);
+ _commentLabel = new TQLabel(_commentEdit, i18n("&Comment:"), general_group);
+ _execLabel = new TQLabel(_execEdit, i18n("Co&mmand:"), general_group);
grid->addWidget(_nameLabel, 0, 0);
grid->addWidget(_descriptionLabel, 1, 0);
grid->addWidget(_commentLabel, 2, 0);
grid->addWidget(_execLabel, 3, 0);
// connect line inputs
- connect(_nameEdit, SIGNAL(textChanged(const QString&)),
- SLOT(slotChanged()));
- connect(_descriptionEdit, SIGNAL(textChanged(const QString&)),
- SLOT(slotChanged()));
- connect(_commentEdit, SIGNAL(textChanged(const QString&)),
- SLOT(slotChanged()));
- connect(_execEdit, SIGNAL(textChanged(const QString&)),
- SLOT(slotChanged()));
- connect(_execEdit, SIGNAL(urlSelected(const QString&)),
- SLOT(slotExecSelected()));
- connect(_launchCB, SIGNAL(clicked()), SLOT(launchcb_clicked()));
- connect(_systrayCB, SIGNAL(clicked()), SLOT(systraycb_clicked()));
+ connect(_nameEdit, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(slotChanged()));
+ connect(_descriptionEdit, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(slotChanged()));
+ connect(_commentEdit, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(slotChanged()));
+ connect(_execEdit, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(slotChanged()));
+ connect(_execEdit, TQT_SIGNAL(urlSelected(const TQString&)),
+ TQT_SLOT(slotExecSelected()));
+ connect(_launchCB, TQT_SIGNAL(clicked()), TQT_SLOT(launchcb_clicked()));
+ connect(_systrayCB, TQT_SIGNAL(clicked()), TQT_SLOT(systraycb_clicked()));
// add line inputs to the grid
grid->addMultiCellWidget(_nameEdit, 0, 0, 1, 1);
@@ -126,21 +126,21 @@ BasicTab::BasicTab( QWidget *parent, const char *name )
_iconButton = new KIconButton(general_group);
_iconButton->setFixedSize(56,56);
_iconButton->setIconSize(48);
- connect(_iconButton, SIGNAL(iconChanged(QString)), SLOT(slotChanged()));
+ connect(_iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(slotChanged()));
grid->addMultiCellWidget(_iconButton, 0, 1, 2, 2);
// add the general group to the main layout
layout->addMultiCellWidget(general_group, 0, 0, 0, 1);
// path group
- _path_group = new QGroupBox(this);
- QVBoxLayout *vbox = new QVBoxLayout(_path_group, KDialog::marginHint(),
+ _path_group = new TQGroupBox(this);
+ TQVBoxLayout *vbox = new TQVBoxLayout(_path_group, KDialog::marginHint(),
KDialog::spacingHint());
- QHBox *hbox = new QHBox(_path_group);
+ TQHBox *hbox = new TQHBox(_path_group);
hbox->setSpacing(KDialog::spacingHint());
- _pathLabel = new QLabel(i18n("&Work path:"), hbox);
+ _pathLabel = new TQLabel(i18n("&Work path:"), hbox);
_pathEdit = new KURLRequester(hbox);
_pathEdit->setMode(KFile::Directory | KFile::LocalOnly);
@@ -148,52 +148,52 @@ BasicTab::BasicTab( QWidget *parent, const char *name )
_pathLabel->setBuddy(_pathEdit);
- connect(_pathEdit, SIGNAL(textChanged(const QString&)),
- SLOT(slotChanged()));
+ connect(_pathEdit, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(slotChanged()));
vbox->addWidget(hbox);
layout->addMultiCellWidget(_path_group, 1, 1, 0, 1);
// terminal group
- _term_group = new QGroupBox(this);
- vbox = new QVBoxLayout(_term_group, KDialog::marginHint(),
+ _term_group = new TQGroupBox(this);
+ vbox = new TQVBoxLayout(_term_group, KDialog::marginHint(),
KDialog::spacingHint());
- _terminalCB = new QCheckBox(i18n("Run in term&inal"), _term_group);
- connect(_terminalCB, SIGNAL(clicked()), SLOT(termcb_clicked()));
+ _terminalCB = new TQCheckBox(i18n("Run in term&inal"), _term_group);
+ connect(_terminalCB, TQT_SIGNAL(clicked()), TQT_SLOT(termcb_clicked()));
vbox->addWidget(_terminalCB);
- hbox = new QHBox(_term_group);
+ hbox = new TQHBox(_term_group);
hbox->setSpacing(KDialog::spacingHint());
- _termOptLabel = new QLabel(i18n("Terminal &options:"), hbox);
+ _termOptLabel = new TQLabel(i18n("Terminal &options:"), hbox);
_termOptEdit = new KLineEdit(hbox);
_termOptEdit->setAcceptDrops(false);
_termOptLabel->setBuddy(_termOptEdit);
- connect(_termOptEdit, SIGNAL(textChanged(const QString&)),
- SLOT(slotChanged()));
+ connect(_termOptEdit, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(slotChanged()));
vbox->addWidget(hbox);
layout->addMultiCellWidget(_term_group, 2, 2, 0, 1);
_termOptEdit->setEnabled(false);
// uid group
- _uid_group = new QGroupBox(this);
- vbox = new QVBoxLayout(_uid_group, KDialog::marginHint(),
+ _uid_group = new TQGroupBox(this);
+ vbox = new TQVBoxLayout(_uid_group, KDialog::marginHint(),
KDialog::spacingHint());
- _uidCB = new QCheckBox(i18n("&Run as a different user"), _uid_group);
- connect(_uidCB, SIGNAL(clicked()), SLOT(uidcb_clicked()));
+ _uidCB = new TQCheckBox(i18n("&Run as a different user"), _uid_group);
+ connect(_uidCB, TQT_SIGNAL(clicked()), TQT_SLOT(uidcb_clicked()));
vbox->addWidget(_uidCB);
- hbox = new QHBox(_uid_group);
+ hbox = new TQHBox(_uid_group);
hbox->setSpacing(KDialog::spacingHint());
- _uidLabel = new QLabel(i18n("&Username:"), hbox);
+ _uidLabel = new TQLabel(i18n("&Username:"), hbox);
_uidEdit = new KLineEdit(hbox);
_uidEdit->setAcceptDrops(false);
_uidLabel->setBuddy(_uidEdit);
- connect(_uidEdit, SIGNAL(textChanged(const QString&)),
- SLOT(slotChanged()));
+ connect(_uidEdit, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(slotChanged()));
vbox->addWidget(hbox);
layout->addMultiCellWidget(_uid_group, 3, 3, 0, 1);
@@ -202,25 +202,25 @@ BasicTab::BasicTab( QWidget *parent, const char *name )
layout->setRowStretch(0, 2);
// key binding group
- general_group_keybind = new QGroupBox(this);
+ general_group_keybind = new TQGroupBox(this);
layout->addMultiCellWidget( general_group_keybind, 4, 4, 0, 1 );
// dummy widget in order to make it look a bit better
- layout->addWidget( new QWidget(this), 5, 0 );
+ layout->addWidget( new TQWidget(this), 5, 0 );
layout->setRowStretch( 5, 4 );
- QGridLayout *grid_keybind = new QGridLayout(general_group_keybind, 3, 1,
+ TQGridLayout *grid_keybind = new TQGridLayout(general_group_keybind, 3, 1,
KDialog::marginHint(),
KDialog::spacingHint());
//_keyEdit = new KLineEdit(general_group_keybind);
//_keyEdit->setReadOnly( true );
//_keyEdit->setText( "" );
- //QPushButton* _keyButton = new QPushButton( i18n( "Change" ),
+ //TQPushButton* _keyButton = new TQPushButton( i18n( "Change" ),
// general_group_keybind );
- //connect( _keyButton, SIGNAL( clicked()), this, SLOT( keyButtonPressed()));
+ //connect( _keyButton, TQT_SIGNAL( clicked()), this, TQT_SLOT( keyButtonPressed()));
_keyEdit = new KKeyButton(general_group_keybind);
- grid_keybind->addWidget(new QLabel(_keyEdit, i18n("Current shortcut &key:"), general_group_keybind), 0, 0);
- connect( _keyEdit, SIGNAL(capturedShortcut(const KShortcut&)),
- this, SLOT(slotCapturedShortcut(const KShortcut&)));
+ grid_keybind->addWidget(new TQLabel(_keyEdit, i18n("Current shortcut &key:"), general_group_keybind), 0, 0);
+ connect( _keyEdit, TQT_SIGNAL(capturedShortcut(const KShortcut&)),
+ this, TQT_SLOT(slotCapturedShortcut(const KShortcut&)));
grid_keybind->addWidget(_keyEdit, 0, 1);
//grid_keybind->addWidget(_keyButton, 0, 2 );
@@ -315,19 +315,19 @@ void BasicTab::setEntryInfo(MenuEntryInfo *entryInfo)
if (!entryInfo)
{
- _nameEdit->setText(QString::null);
- _descriptionEdit->setText(QString::null);
- _commentEdit->setText(QString::null);
- _iconButton->setIcon(QString::null);
+ _nameEdit->setText(TQString::null);
+ _descriptionEdit->setText(TQString::null);
+ _commentEdit->setText(TQString::null);
+ _iconButton->setIcon(TQString::null);
// key binding part
_keyEdit->setShortcut( KShortcut(), false );
- _execEdit->lineEdit()->setText(QString::null);
+ _execEdit->lineEdit()->setText(TQString::null);
_systrayCB->setChecked(false);
- _pathEdit->lineEdit()->setText(QString::null);
- _termOptEdit->setText(QString::null);
- _uidEdit->setText(QString::null);
+ _pathEdit->lineEdit()->setText(TQString::null);
+ _termOptEdit->setText(TQString::null);
+ _uidEdit->setText(TQString::null);
_launchCB->setChecked(false);
_terminalCB->setChecked(false);
@@ -352,7 +352,7 @@ void BasicTab::setEntryInfo(MenuEntryInfo *entryInfo)
_keyEdit->setShortcut( entryInfo->shortcut(), false );
}
- QString temp = df->readPathEntry("Exec");
+ TQString temp = df->readPathEntry("Exec");
if (temp.left(12) == "ksystraycmd ")
{
_execEdit->lineEdit()->setText(temp.right(temp.length()-12));
@@ -458,7 +458,7 @@ void BasicTab::uidcb_clicked()
void BasicTab::slotExecSelected()
{
- QString path = _execEdit->lineEdit()->text();
+ TQString path = _execEdit->lineEdit()->text();
if (!path.startsWith("'"))
_execEdit->lineEdit()->setText(KProcess::quote(path));
}
diff --git a/kmenuedit/basictab.h b/kmenuedit/basictab.h
index 6f6bb63a9..7b0bd555c 100644
--- a/kmenuedit/basictab.h
+++ b/kmenuedit/basictab.h
@@ -20,8 +20,8 @@
#ifndef __basictab_h__
#define __basictab_h__
-#include <qwidget.h>
-#include <qstring.h>
+#include <tqwidget.h>
+#include <tqstring.h>
#include <klineedit.h>
@@ -43,7 +43,7 @@ class BasicTab : public QWidget
Q_OBJECT
public:
- BasicTab( QWidget *parent=0, const char *name=0 );
+ BasicTab( TQWidget *parent=0, const char *name=0 );
void apply();
signals:
@@ -73,10 +73,10 @@ protected:
KKeyButton *_keyEdit;
KURLRequester *_execEdit, *_pathEdit;
KLineEdit *_termOptEdit, *_uidEdit;
- QCheckBox *_terminalCB, *_uidCB, *_launchCB, *_systrayCB;
+ TQCheckBox *_terminalCB, *_uidCB, *_launchCB, *_systrayCB;
KIconButton *_iconButton;
- QGroupBox *_path_group, *_term_group, *_uid_group, *general_group_keybind;
- QLabel *_termOptLabel, *_uidLabel, *_pathLabel, *_nameLabel, *_commentLabel, *_execLabel;
+ TQGroupBox *_path_group, *_term_group, *_uid_group, *general_group_keybind;
+ TQLabel *_termOptLabel, *_uidLabel, *_pathLabel, *_nameLabel, *_commentLabel, *_execLabel;
QLabel *_descriptionLabel;
MenuFolderInfo *_menuFolderInfo;
diff --git a/kmenuedit/khotkeys.cpp b/kmenuedit/khotkeys.cpp
index 65909ab75..9b0ead3c7 100644
--- a/kmenuedit/khotkeys.cpp
+++ b/kmenuedit/khotkeys.cpp
@@ -25,13 +25,13 @@ extern "C"
{
static void (*khotkeys_init_2)( void );
static void (*khotkeys_cleanup_2)( void );
- static QString (*khotkeys_get_menu_entry_shortcut_2)( const QString& entry_P );
- static QString (*khotkeys_change_menu_entry_shortcut_2)( const QString& entry_P,
- const QString& shortcut_P );
- static bool (*khotkeys_menu_entry_moved_2)( const QString& new_P, const QString& old_P );
- static void (*khotkeys_menu_entry_deleted_2)( const QString& entry_P );
- static QStringList (*khotkeys_get_all_shortcuts_2)( );
- static KService::Ptr (*khotkeys_find_menu_entry_2)( const QString& shortcut_P );
+ static TQString (*khotkeys_get_menu_entry_shortcut_2)( const TQString& entry_P );
+ static TQString (*khotkeys_change_menu_entry_shortcut_2)( const TQString& entry_P,
+ const TQString& shortcut_P );
+ static bool (*khotkeys_menu_entry_moved_2)( const TQString& new_P, const TQString& old_P );
+ static void (*khotkeys_menu_entry_deleted_2)( const TQString& entry_P );
+ static TQStringList (*khotkeys_get_all_shortcuts_2)( );
+ static KService::Ptr (*khotkeys_find_menu_entry_2)( const TQString& shortcut_P );
}
static bool khotkeys_present = false;
@@ -46,22 +46,22 @@ bool KHotKeys::init()
khotkeys_init_2 = ( void (*)(void)) ( lib->symbol( "khotkeys_init" ));
khotkeys_cleanup_2 = ( void (*)(void)) ( lib->symbol( "khotkeys_cleanup" ));
khotkeys_get_menu_entry_shortcut_2 =
- ( QString (*)( const QString& ))
+ ( TQString (*)( const TQString& ))
( lib->symbol( "khotkeys_get_menu_entry_shortcut" ));
khotkeys_change_menu_entry_shortcut_2 =
- ( QString (*)( const QString&, const QString& ))
+ ( TQString (*)( const TQString&, const TQString& ))
( lib->symbol( "khotkeys_change_menu_entry_shortcut" ));
khotkeys_menu_entry_moved_2 =
- ( bool (*)( const QString&, const QString& ))
+ ( bool (*)( const TQString&, const TQString& ))
( lib->symbol( "khotkeys_menu_entry_moved" ));
khotkeys_menu_entry_deleted_2 =
- ( void (*)( const QString& ))
+ ( void (*)( const TQString& ))
( lib->symbol( "khotkeys_menu_entry_deleted" ));
khotkeys_get_all_shortcuts_2 =
- ( QStringList (*)( ))
+ ( TQStringList (*)( ))
( lib->symbol( "khotkeys_get_all_shortcuts" ));
khotkeys_find_menu_entry_2 =
- ( KService::Ptr (*)( const QString& ))
+ ( KService::Ptr (*)( const TQString& ))
( lib->symbol( "khotkeys_find_menu_entry" ));
if( khotkeys_init_2
@@ -92,7 +92,7 @@ bool KHotKeys::present()
return khotkeys_present;
}
-QString KHotKeys::getMenuEntryShortcut( const QString& entry_P )
+TQString KHotKeys::getMenuEntryShortcut( const TQString& entry_P )
{
if( !khotkeys_inited )
init();
@@ -101,8 +101,8 @@ QString KHotKeys::getMenuEntryShortcut( const QString& entry_P )
return khotkeys_get_menu_entry_shortcut_2( entry_P );
}
-QString KHotKeys::changeMenuEntryShortcut( const QString& entry_P,
- const QString shortcut_P )
+TQString KHotKeys::changeMenuEntryShortcut( const TQString& entry_P,
+ const TQString shortcut_P )
{
if( !khotkeys_inited )
init();
@@ -111,7 +111,7 @@ QString KHotKeys::changeMenuEntryShortcut( const QString& entry_P,
return khotkeys_change_menu_entry_shortcut_2( entry_P, shortcut_P );
}
-bool KHotKeys::menuEntryMoved( const QString& new_P, const QString& old_P )
+bool KHotKeys::menuEntryMoved( const TQString& new_P, const TQString& old_P )
{
if( !khotkeys_inited )
init();
@@ -120,7 +120,7 @@ bool KHotKeys::menuEntryMoved( const QString& new_P, const QString& old_P )
return khotkeys_menu_entry_moved_2( new_P, old_P );
}
-void KHotKeys::menuEntryDeleted( const QString& entry_P )
+void KHotKeys::menuEntryDeleted( const TQString& entry_P )
{
if( !khotkeys_inited )
init();
@@ -129,16 +129,16 @@ void KHotKeys::menuEntryDeleted( const QString& entry_P )
khotkeys_menu_entry_deleted_2( entry_P );
}
-QStringList KHotKeys::allShortCuts( )
+TQStringList KHotKeys::allShortCuts( )
{
if( !khotkeys_inited )
init();
if (!khotkeys_get_all_shortcuts_2)
- return QStringList();
+ return TQStringList();
return khotkeys_get_all_shortcuts_2();
}
-KService::Ptr KHotKeys::findMenuEntry( const QString &shortcut_P )
+KService::Ptr KHotKeys::findMenuEntry( const TQString &shortcut_P )
{
if( !khotkeys_inited )
init();
diff --git a/kmenuedit/khotkeys.h b/kmenuedit/khotkeys.h
index 15aaeeb62..ebf404512 100644
--- a/kmenuedit/khotkeys.h
+++ b/kmenuedit/khotkeys.h
@@ -21,7 +21,7 @@
#ifndef __khotkeys_public_h__
#define __khotkeys_public_h__
-#include <qstring.h>
+#include <tqstring.h>
#include <kservice.h>
// see kdebase/khotkeys/kcontrol for info on these
@@ -32,13 +32,13 @@ public:
static bool init();
static void cleanup();
static bool present();
- static QString getMenuEntryShortcut( const QString& entry_P );
- static QString changeMenuEntryShortcut( const QString& entry_P,
- const QString shortcut_P );
- static bool menuEntryMoved( const QString& new_P, const QString& old_P );
- static void menuEntryDeleted( const QString& entry_P );
- static QStringList allShortCuts( );
- static KService::Ptr findMenuEntry( const QString &shortcut_P );
+ static TQString getMenuEntryShortcut( const TQString& entry_P );
+ static TQString changeMenuEntryShortcut( const TQString& entry_P,
+ const TQString shortcut_P );
+ static bool menuEntryMoved( const TQString& new_P, const TQString& old_P );
+ static void menuEntryDeleted( const TQString& entry_P );
+ static TQStringList allShortCuts( );
+ static KService::Ptr findMenuEntry( const TQString &shortcut_P );
};
#endif
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp
index ba8d6fc08..9474d85eb 100644
--- a/kmenuedit/kmenuedit.cpp
+++ b/kmenuedit/kmenuedit.cpp
@@ -18,7 +18,7 @@
*
*/
-#include <qsplitter.h>
+#include <tqsplitter.h>
#include <kaction.h>
#include <kapplication.h>
@@ -37,7 +37,7 @@
#include "kmenuedit.h"
#include "kmenuedit.moc"
-KMenuEdit::KMenuEdit (bool controlCenter, QWidget *, const char *name)
+KMenuEdit::KMenuEdit (bool controlCenter, TQWidget *, const char *name)
: KMainWindow (0, name), m_tree(0), m_basicTab(0), m_splitter(0), m_controlCenter(controlCenter)
{
#if 0
@@ -69,8 +69,8 @@ void KMenuEdit::setupActions()
m_actionDelete = 0;
- KStdAction::save(this, SLOT( slotSave() ), actionCollection());
- KStdAction::quit(this, SLOT( close() ), actionCollection());
+ KStdAction::save(this, TQT_SLOT( slotSave() ), actionCollection());
+ KStdAction::quit(this, TQT_SLOT( close() ), actionCollection());
KStdAction::cut(0, 0, actionCollection());
KStdAction::copy(0, 0, actionCollection());
KStdAction::paste(0, 0, actionCollection());
@@ -78,29 +78,29 @@ void KMenuEdit::setupActions()
void KMenuEdit::setupView()
{
- m_splitter = new QSplitter(Horizontal, this);
+ m_splitter = new TQSplitter(Horizontal, this);
m_tree = new TreeView(m_controlCenter, actionCollection(), m_splitter);
m_basicTab = new BasicTab(m_splitter);
- connect(m_tree, SIGNAL(entrySelected(MenuFolderInfo *)),
- m_basicTab, SLOT(setFolderInfo(MenuFolderInfo *)));
- connect(m_tree, SIGNAL(entrySelected(MenuEntryInfo *)),
- m_basicTab, SLOT(setEntryInfo(MenuEntryInfo *)));
- connect(m_tree, SIGNAL(disableAction()),
- m_basicTab, SLOT(slotDisableAction() ) );
+ connect(m_tree, TQT_SIGNAL(entrySelected(MenuFolderInfo *)),
+ m_basicTab, TQT_SLOT(setFolderInfo(MenuFolderInfo *)));
+ connect(m_tree, TQT_SIGNAL(entrySelected(MenuEntryInfo *)),
+ m_basicTab, TQT_SLOT(setEntryInfo(MenuEntryInfo *)));
+ connect(m_tree, TQT_SIGNAL(disableAction()),
+ m_basicTab, TQT_SLOT(slotDisableAction() ) );
- connect(m_basicTab, SIGNAL(changed(MenuFolderInfo *)),
- m_tree, SLOT(currentChanged(MenuFolderInfo *)));
+ connect(m_basicTab, TQT_SIGNAL(changed(MenuFolderInfo *)),
+ m_tree, TQT_SLOT(currentChanged(MenuFolderInfo *)));
- connect(m_basicTab, SIGNAL(changed(MenuEntryInfo *)),
- m_tree, SLOT(currentChanged(MenuEntryInfo *)));
+ connect(m_basicTab, TQT_SIGNAL(changed(MenuEntryInfo *)),
+ m_tree, TQT_SLOT(currentChanged(MenuEntryInfo *)));
- connect(m_basicTab, SIGNAL(findServiceShortcut(const KShortcut&, KService::Ptr &)),
- m_tree, SLOT(findServiceShortcut(const KShortcut&, KService::Ptr &)));
+ connect(m_basicTab, TQT_SIGNAL(findServiceShortcut(const KShortcut&, KService::Ptr &)),
+ m_tree, TQT_SLOT(findServiceShortcut(const KShortcut&, KService::Ptr &)));
// restore splitter sizes
KConfig* config = KGlobal::config();
- QValueList<int> sizes = config->readIntListEntry("SplitterSizes");
+ TQValueList<int> sizes = config->readIntListEntry("SplitterSizes");
if (sizes.isEmpty())
sizes << 1 << 3;
diff --git a/kmenuedit/kmenuedit.h b/kmenuedit/kmenuedit.h
index 32e860e04..2d95b6e35 100644
--- a/kmenuedit/kmenuedit.h
+++ b/kmenuedit/kmenuedit.h
@@ -33,11 +33,11 @@ class KMenuEdit : public KMainWindow
Q_OBJECT
public:
- KMenuEdit( bool controlCenter, QWidget *parent=0, const char *name=0 );
+ KMenuEdit( bool controlCenter, TQWidget *parent=0, const char *name=0 );
~KMenuEdit();
- void selectMenu(const QString &menu) { m_tree->selectMenu(menu); }
- void selectMenuEntry(const QString &menuEntry) { m_tree->selectMenuEntry(menuEntry); }
+ void selectMenu(const TQString &menu) { m_tree->selectMenu(menu); }
+ void selectMenuEntry(const TQString &menuEntry) { m_tree->selectMenuEntry(menuEntry); }
protected:
void setupView();
@@ -51,7 +51,7 @@ protected slots:
protected:
TreeView *m_tree;
BasicTab *m_basicTab;
- QSplitter *m_splitter;
+ TQSplitter *m_splitter;
KAction *m_actionDelete;
KToggleAction *m_actionShowHidden;
diff --git a/kmenuedit/main.cpp b/kmenuedit/main.cpp
index abb4f5968..81d1c7e52 100644
--- a/kmenuedit/main.cpp
+++ b/kmenuedit/main.cpp
@@ -51,10 +51,10 @@ public:
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
if (args->count() > 0)
{
- menuEdit->selectMenu(QString::fromLocal8Bit(args->arg(0)));
+ menuEdit->selectMenu(TQString::fromLocal8Bit(args->arg(0)));
if (args->count() > 1)
{
- menuEdit->selectMenuEntry(QString::fromLocal8Bit(args->arg(1)));
+ menuEdit->selectMenuEntry(TQString::fromLocal8Bit(args->arg(1)));
}
}
return KUniqueApplication::newInstance();
diff --git a/kmenuedit/menufile.cpp b/kmenuedit/menufile.cpp
index 7fe2be954..d1582c23b 100644
--- a/kmenuedit/menufile.cpp
+++ b/kmenuedit/menufile.cpp
@@ -16,9 +16,9 @@
*
*/
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qregexp.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -46,7 +46,7 @@
#define MF_SEPARATOR "Separator"
#define MF_MERGE "Merge"
-MenuFile::MenuFile(const QString &file)
+MenuFile::MenuFile(const TQString &file)
: m_fileName(file), m_bDirty(false)
{
load();
@@ -61,7 +61,7 @@ bool MenuFile::load()
if (m_fileName.isEmpty())
return false;
- QFile file( m_fileName );
+ TQFile file( m_fileName );
if (!file.open( IO_ReadOnly ))
{
kdWarning() << "Could not read " << m_fileName << endl;
@@ -69,7 +69,7 @@ bool MenuFile::load()
return false;
}
- QString errorMsg;
+ TQString errorMsg;
int errorRow;
int errorCol;
if ( !m_doc.setContent( &file, &errorMsg, &errorRow, &errorCol ) ) {
@@ -85,14 +85,14 @@ bool MenuFile::load()
void MenuFile::create()
{
- QDomImplementation impl;
- QDomDocumentType docType = impl.createDocumentType( MF_MENU, MF_PUBLIC_ID, MF_SYSTEM_ID );
- m_doc = impl.createDocument(QString::null, MF_MENU, docType);
+ TQDomImplementation impl;
+ TQDomDocumentType docType = impl.createDocumentType( MF_MENU, MF_PUBLIC_ID, MF_SYSTEM_ID );
+ m_doc = impl.createDocument(TQString::null, MF_MENU, docType);
}
bool MenuFile::save()
{
- QFile file( m_fileName );
+ TQFile file( m_fileName );
if (!file.open( IO_WriteOnly ))
{
@@ -100,8 +100,8 @@ bool MenuFile::save()
m_error = i18n("Could not write to %1").arg(m_fileName);
return false;
}
- QTextStream stream( &file );
- stream.setEncoding(QTextStream::UnicodeUTF8);
+ TQTextStream stream( &file );
+ stream.setEncoding(TQTextStream::UnicodeUTF8);
stream << m_doc.toString();
@@ -119,10 +119,10 @@ bool MenuFile::save()
return true;
}
-QDomElement MenuFile::findMenu(QDomElement elem, const QString &menuName, bool create)
+TQDomElement MenuFile::findMenu(TQDomElement elem, const TQString &menuName, bool create)
{
- QString menuNodeName;
- QString subMenuName;
+ TQString menuNodeName;
+ TQString subMenuName;
int i = menuName.find('/');
if (i >= 0)
{
@@ -139,18 +139,18 @@ QDomElement MenuFile::findMenu(QDomElement elem, const QString &menuName, bool c
if (menuNodeName.isEmpty())
return elem;
- QDomNode n = elem.firstChild();
+ TQDomNode n = elem.firstChild();
while( !n.isNull() )
{
- QDomElement e = n.toElement(); // try to convert the node to an element.
+ TQDomElement e = n.toElement(); // try to convert the node to an element.
if (e.tagName() == MF_MENU)
{
- QString name;
+ TQString name;
- QDomNode n2 = e.firstChild();
+ TQDomNode n2 = e.firstChild();
while ( !n2.isNull() )
{
- QDomElement e2 = n2.toElement();
+ TQDomElement e2 = n2.toElement();
if (!e2.isNull() && e2.tagName() == MF_NAME)
{
name = e2.text();
@@ -171,11 +171,11 @@ QDomElement MenuFile::findMenu(QDomElement elem, const QString &menuName, bool c
}
if (!create)
- return QDomElement();
+ return TQDomElement();
// Create new node.
- QDomElement newElem = m_doc.createElement(MF_MENU);
- QDomElement newNameElem = m_doc.createElement(MF_NAME);
+ TQDomElement newElem = m_doc.createElement(MF_MENU);
+ TQDomElement newNameElem = m_doc.createElement(MF_NAME);
newNameElem.appendChild(m_doc.createTextNode(menuNodeName));
newElem.appendChild(newNameElem);
elem.appendChild(newElem);
@@ -186,10 +186,10 @@ QDomElement MenuFile::findMenu(QDomElement elem, const QString &menuName, bool c
return findMenu(newElem, subMenuName, create);
}
-static QString entryToDirId(const QString &path)
+static TQString entryToDirId(const TQString &path)
{
// See also KDesktopFile::locateLocal
- QString local;
+ TQString local;
if (path.startsWith("/"))
{
// XDG Desktop menu items come with absolute paths, we need to
@@ -205,13 +205,13 @@ static QString entryToDirId(const QString &path)
return local;
}
-static void purgeIncludesExcludes(QDomElement elem, const QString &appId, QDomElement &excludeNode, QDomElement &includeNode)
+static void purgeIncludesExcludes(TQDomElement elem, const TQString &appId, TQDomElement &excludeNode, TQDomElement &includeNode)
{
// Remove any previous includes/excludes of appId
- QDomNode n = elem.firstChild();
+ TQDomNode n = elem.firstChild();
while( !n.isNull() )
{
- QDomElement e = n.toElement(); // try to convert the node to an element.
+ TQDomElement e = n.toElement(); // try to convert the node to an element.
bool bIncludeNode = (e.tagName() == MF_INCLUDE);
bool bExcludeNode = (e.tagName() == MF_EXCLUDE);
if (bIncludeNode)
@@ -220,11 +220,11 @@ static void purgeIncludesExcludes(QDomElement elem, const QString &appId, QDomEl
excludeNode = e;
if (bIncludeNode || bExcludeNode)
{
- QDomNode n2 = e.firstChild();
+ TQDomNode n2 = e.firstChild();
while ( !n2.isNull() )
{
- QDomNode next = n2.nextSibling();
- QDomElement e2 = n2.toElement();
+ TQDomNode next = n2.nextSibling();
+ TQDomElement e2 = n2.toElement();
if (!e2.isNull() && e2.tagName() == MF_FILENAME)
{
if (e2.text() == appId)
@@ -240,14 +240,14 @@ static void purgeIncludesExcludes(QDomElement elem, const QString &appId, QDomEl
}
}
-static void purgeDeleted(QDomElement elem)
+static void purgeDeleted(TQDomElement elem)
{
// Remove any previous includes/excludes of appId
- QDomNode n = elem.firstChild();
+ TQDomNode n = elem.firstChild();
while( !n.isNull() )
{
- QDomNode next = n.nextSibling();
- QDomElement e = n.toElement(); // try to convert the node to an element.
+ TQDomNode next = n.nextSibling();
+ TQDomElement e = n.toElement(); // try to convert the node to an element.
if ((e.tagName() == MF_DELETED) ||
(e.tagName() == MF_NOTDELETED))
{
@@ -257,14 +257,14 @@ static void purgeDeleted(QDomElement elem)
}
}
-static void purgeLayout(QDomElement elem)
+static void purgeLayout(TQDomElement elem)
{
// Remove any previous includes/excludes of appId
- QDomNode n = elem.firstChild();
+ TQDomNode n = elem.firstChild();
while( !n.isNull() )
{
- QDomNode next = n.nextSibling();
- QDomElement e = n.toElement(); // try to convert the node to an element.
+ TQDomNode next = n.nextSibling();
+ TQDomElement e = n.toElement(); // try to convert the node to an element.
if (e.tagName() == MF_LAYOUT)
{
elem.removeChild(e);
@@ -273,16 +273,16 @@ static void purgeLayout(QDomElement elem)
}
}
-void MenuFile::addEntry(const QString &menuName, const QString &menuId)
+void MenuFile::addEntry(const TQString &menuName, const TQString &menuId)
{
m_bDirty = true;
m_removedEntries.remove(menuId);
- QDomElement elem = findMenu(m_doc.documentElement(), menuName, true);
+ TQDomElement elem = findMenu(m_doc.documentElement(), menuName, true);
- QDomElement excludeNode;
- QDomElement includeNode;
+ TQDomElement excludeNode;
+ TQDomElement includeNode;
purgeIncludesExcludes(elem, menuId, excludeNode, includeNode);
@@ -292,58 +292,58 @@ void MenuFile::addEntry(const QString &menuName, const QString &menuId)
elem.appendChild(includeNode);
}
- QDomElement fileNode = m_doc.createElement(MF_FILENAME);
+ TQDomElement fileNode = m_doc.createElement(MF_FILENAME);
fileNode.appendChild(m_doc.createTextNode(menuId));
includeNode.appendChild(fileNode);
}
-void MenuFile::setLayout(const QString &menuName, const QStringList &layout)
+void MenuFile::setLayout(const TQString &menuName, const TQStringList &layout)
{
m_bDirty = true;
- QDomElement elem = findMenu(m_doc.documentElement(), menuName, true);
+ TQDomElement elem = findMenu(m_doc.documentElement(), menuName, true);
purgeLayout(elem);
- QDomElement layoutNode = m_doc.createElement(MF_LAYOUT);
+ TQDomElement layoutNode = m_doc.createElement(MF_LAYOUT);
elem.appendChild(layoutNode);
- for(QStringList::ConstIterator it = layout.begin();
+ for(TQStringList::ConstIterator it = layout.begin();
it != layout.end(); ++it)
{
- QString li = *it;
+ TQString li = *it;
if (li == ":S")
{
layoutNode.appendChild(m_doc.createElement(MF_SEPARATOR));
}
else if (li == ":M")
{
- QDomElement mergeNode = m_doc.createElement(MF_MERGE);
+ TQDomElement mergeNode = m_doc.createElement(MF_MERGE);
mergeNode.setAttribute("type", "menus");
layoutNode.appendChild(mergeNode);
}
else if (li == ":F")
{
- QDomElement mergeNode = m_doc.createElement(MF_MERGE);
+ TQDomElement mergeNode = m_doc.createElement(MF_MERGE);
mergeNode.setAttribute("type", "files");
layoutNode.appendChild(mergeNode);
}
else if (li == ":A")
{
- QDomElement mergeNode = m_doc.createElement(MF_MERGE);
+ TQDomElement mergeNode = m_doc.createElement(MF_MERGE);
mergeNode.setAttribute("type", "all");
layoutNode.appendChild(mergeNode);
}
else if (li.endsWith("/"))
{
li.truncate(li.length()-1);
- QDomElement menuNode = m_doc.createElement(MF_MENUNAME);
+ TQDomElement menuNode = m_doc.createElement(MF_MENUNAME);
menuNode.appendChild(m_doc.createTextNode(li));
layoutNode.appendChild(menuNode);
}
else
{
- QDomElement fileNode = m_doc.createElement(MF_FILENAME);
+ TQDomElement fileNode = m_doc.createElement(MF_FILENAME);
fileNode.appendChild(m_doc.createTextNode(li));
layoutNode.appendChild(fileNode);
}
@@ -351,16 +351,16 @@ void MenuFile::setLayout(const QString &menuName, const QStringList &layout)
}
-void MenuFile::removeEntry(const QString &menuName, const QString &menuId)
+void MenuFile::removeEntry(const TQString &menuName, const TQString &menuId)
{
m_bDirty = true;
m_removedEntries.append(menuId);
- QDomElement elem = findMenu(m_doc.documentElement(), menuName, true);
+ TQDomElement elem = findMenu(m_doc.documentElement(), menuName, true);
- QDomElement excludeNode;
- QDomElement includeNode;
+ TQDomElement excludeNode;
+ TQDomElement includeNode;
purgeIncludesExcludes(elem, menuId, excludeNode, includeNode);
@@ -370,35 +370,35 @@ void MenuFile::removeEntry(const QString &menuName, const QString &menuId)
elem.appendChild(excludeNode);
}
- QDomElement fileNode = m_doc.createElement(MF_FILENAME);
+ TQDomElement fileNode = m_doc.createElement(MF_FILENAME);
fileNode.appendChild(m_doc.createTextNode(menuId));
excludeNode.appendChild(fileNode);
}
-void MenuFile::addMenu(const QString &menuName, const QString &menuFile)
+void MenuFile::addMenu(const TQString &menuName, const TQString &menuFile)
{
m_bDirty = true;
- QDomElement elem = findMenu(m_doc.documentElement(), menuName, true);
+ TQDomElement elem = findMenu(m_doc.documentElement(), menuName, true);
- QDomElement dirElem = m_doc.createElement(MF_DIRECTORY);
+ TQDomElement dirElem = m_doc.createElement(MF_DIRECTORY);
dirElem.appendChild(m_doc.createTextNode(entryToDirId(menuFile)));
elem.appendChild(dirElem);
}
-void MenuFile::moveMenu(const QString &oldMenu, const QString &newMenu)
+void MenuFile::moveMenu(const TQString &oldMenu, const TQString &newMenu)
{
m_bDirty = true;
// Undelete the new menu
- QDomElement elem = findMenu(m_doc.documentElement(), newMenu, true);
+ TQDomElement elem = findMenu(m_doc.documentElement(), newMenu, true);
purgeDeleted(elem);
elem.appendChild(m_doc.createElement(MF_NOTDELETED));
// TODO: GET RID OF COMMON PART, IT BREAKS STUFF
// Find common part
- QStringList oldMenuParts = QStringList::split('/', oldMenu);
- QStringList newMenuParts = QStringList::split('/', newMenu);
- QString commonMenuName;
+ TQStringList oldMenuParts = TQStringList::split('/', oldMenu);
+ TQStringList newMenuParts = TQStringList::split('/', newMenu);
+ TQString commonMenuName;
uint max = QMIN(oldMenuParts.count(), newMenuParts.count());
uint i = 0;
for(; i < max; i++)
@@ -407,14 +407,14 @@ void MenuFile::moveMenu(const QString &oldMenu, const QString &newMenu)
break;
commonMenuName += '/' + oldMenuParts[i];
}
- QString oldMenuName;
+ TQString oldMenuName;
for(uint j = i; j < oldMenuParts.count(); j++)
{
if (i != j)
oldMenuName += '/';
oldMenuName += oldMenuParts[j];
}
- QString newMenuName;
+ TQString newMenuName;
for(uint j = i; j < newMenuParts.count(); j++)
{
if (i != j)
@@ -427,8 +427,8 @@ void MenuFile::moveMenu(const QString &oldMenu, const QString &newMenu)
elem = findMenu(m_doc.documentElement(), commonMenuName, true);
// Add instructions for moving
- QDomElement moveNode = m_doc.createElement(MF_MOVE);
- QDomElement node = m_doc.createElement(MF_OLD);
+ TQDomElement moveNode = m_doc.createElement(MF_MOVE);
+ TQDomElement node = m_doc.createElement(MF_OLD);
node.appendChild(m_doc.createTextNode(oldMenuName));
moveNode.appendChild(node);
node = m_doc.createElement(MF_NEW);
@@ -437,11 +437,11 @@ void MenuFile::moveMenu(const QString &oldMenu, const QString &newMenu)
elem.appendChild(moveNode);
}
-void MenuFile::removeMenu(const QString &menuName)
+void MenuFile::removeMenu(const TQString &menuName)
{
m_bDirty = true;
- QDomElement elem = findMenu(m_doc.documentElement(), menuName, true);
+ TQDomElement elem = findMenu(m_doc.documentElement(), menuName, true);
purgeDeleted(elem);
elem.appendChild(m_doc.createElement(MF_DELETED));
@@ -451,15 +451,15 @@ void MenuFile::removeMenu(const QString &menuName)
* Returns a unique menu-name for a new menu under @p menuName
* inspired by @p newMenu
*/
-QString MenuFile::uniqueMenuName(const QString &menuName, const QString &newMenu, const QStringList & excludeList)
+TQString MenuFile::uniqueMenuName(const TQString &menuName, const TQString &newMenu, const TQStringList & excludeList)
{
- QDomElement elem = findMenu(m_doc.documentElement(), menuName, false);
+ TQDomElement elem = findMenu(m_doc.documentElement(), menuName, false);
- QString result = newMenu;
+ TQString result = newMenu;
if (result.endsWith("/"))
result.truncate(result.length()-1);
- QRegExp r("(.*)(?=-\\d+)");
+ TQRegExp r("(.*)(?=-\\d+)");
result = (r.search(result) > -1) ? r.cap(1) : result;
int trunc = result.length(); // Position of trailing '/'
@@ -472,9 +472,9 @@ QString MenuFile::uniqueMenuName(const QString &menuName, const QString &newMenu
return result;
result.truncate(trunc);
- result.append(QString("-%1/").arg(n));
+ result.append(TQString("-%1/").arg(n));
}
- return QString::null; // Never reached
+ return TQString::null; // Never reached
}
void MenuFile::performAction(const ActionAtom *atom)
@@ -499,7 +499,7 @@ void MenuFile::performAction(const ActionAtom *atom)
}
}
-MenuFile::ActionAtom *MenuFile::pushAction(MenuFile::ActionType action, const QString &arg1, const QString &arg2)
+MenuFile::ActionAtom *MenuFile::pushAction(MenuFile::ActionType action, const TQString &arg1, const TQString &arg2)
{
ActionAtom *atom = new ActionAtom;
atom->action = action;
@@ -530,9 +530,9 @@ bool MenuFile::performAllActions()
// Entries that have been removed from the menu are added to .hidden
// so that they don't re-appear in Lost & Found
- QStringList removed = m_removedEntries;
+ TQStringList removed = m_removedEntries;
m_removedEntries.clear();
- for(QStringList::ConstIterator it = removed.begin();
+ for(TQStringList::ConstIterator it = removed.begin();
it != removed.end(); ++it)
{
addEntry("/.hidden/", *it);
diff --git a/kmenuedit/menufile.h b/kmenuedit/menufile.h
index 61ca3a9f0..c216d486c 100644
--- a/kmenuedit/menufile.h
+++ b/kmenuedit/menufile.h
@@ -19,19 +19,19 @@
#ifndef __menufile_h__
#define __menufile_h__
-#include <qdom.h>
-#include <qstring.h>
+#include <tqdom.h>
+#include <tqstring.h>
class MenuFile
{
public:
- MenuFile(const QString &file);
+ MenuFile(const TQString &file);
~MenuFile();
bool load();
bool save();
void create();
- QString error() { return m_error; } // Returns the last error message
+ TQString error() { return m_error; } // Returns the last error message
enum ActionType {
ADD_ENTRY = 0,
@@ -44,14 +44,14 @@ public:
struct ActionAtom
{
ActionType action;
- QString arg1;
- QString arg2;
+ TQString arg1;
+ TQString arg2;
};
/**
* Create action atom and push it on the stack
*/
- ActionAtom *pushAction(ActionType action, const QString &arg1, const QString &arg2);
+ ActionAtom *pushAction(ActionType action, const TQString &arg1, const TQString &arg2);
/**
* Pop @p atom from the stack.
@@ -76,20 +76,20 @@ public:
*/
bool dirty();
- void addEntry(const QString &menuName, const QString &menuId);
- void removeEntry(const QString &menuName, const QString &menuId);
+ void addEntry(const TQString &menuName, const TQString &menuId);
+ void removeEntry(const TQString &menuName, const TQString &menuId);
- void addMenu(const QString &menuName, const QString &menuFile);
- void moveMenu(const QString &oldMenu, const QString &newMenu);
- void removeMenu(const QString &menuName);
+ void addMenu(const TQString &menuName, const TQString &menuFile);
+ void moveMenu(const TQString &oldMenu, const TQString &newMenu);
+ void removeMenu(const TQString &menuName);
- void setLayout(const QString &menuName, const QStringList &layout);
+ void setLayout(const TQString &menuName, const TQStringList &layout);
/**
* Returns a unique menu-name for a new menu under @p menuName
* inspired by @p newMenu and not part of @p excludeList
*/
- QString uniqueMenuName(const QString &menuName, const QString &newMenu, const QStringList &excludeList);
+ TQString uniqueMenuName(const TQString &menuName, const TQString &newMenu, const TQStringList &excludeList);
protected:
/**
@@ -97,17 +97,17 @@ protected:
* If @p create is true, the menu is created if it doesn't exist yet.
* @return The menu dom-node of @p menuName
*/
- QDomElement findMenu(QDomElement elem, const QString &menuName, bool create);
+ TQDomElement findMenu(TQDomElement elem, const TQString &menuName, bool create);
private:
- QString m_error;
- QString m_fileName;
+ TQString m_error;
+ TQString m_fileName;
- QDomDocument m_doc;
+ TQDomDocument m_doc;
bool m_bDirty;
- QPtrList<ActionAtom> m_actionList;
- QStringList m_removedEntries;
+ TQPtrList<ActionAtom> m_actionList;
+ TQStringList m_removedEntries;
};
diff --git a/kmenuedit/menuinfo.cpp b/kmenuedit/menuinfo.cpp
index 1fa4cb436..ce17b33ee 100644
--- a/kmenuedit/menuinfo.cpp
+++ b/kmenuedit/menuinfo.cpp
@@ -20,7 +20,7 @@
#include "menuinfo.h"
#include "menufile.h"
-#include <qregexp.h>
+#include <tqregexp.h>
#include <kdesktopfile.h>
#include <khotkeys.h>
@@ -30,10 +30,10 @@
// MenuFolderInfo
//
-static QStringList *s_allShortcuts = 0;
-static QStringList *s_newShortcuts = 0;
-static QStringList *s_freeShortcuts = 0;
-static QStringList *s_deletedApps = 0;
+static TQStringList *s_allShortcuts = 0;
+static TQStringList *s_newShortcuts = 0;
+static TQStringList *s_freeShortcuts = 0;
+static TQStringList *s_deletedApps = 0;
// Add separator
void MenuFolderInfo::add(MenuSeparatorInfo *info, bool initial)
@@ -76,7 +76,7 @@ bool MenuFolderInfo::takeRecursive(MenuFolderInfo *info)
}
// Recursively update all fullIds
-void MenuFolderInfo::updateFullId(const QString &parentId)
+void MenuFolderInfo::updateFullId(const TQString &parentId)
{
fullId = parentId + id;
@@ -103,12 +103,12 @@ void MenuFolderInfo::take(MenuEntryInfo *entry)
// Return a unique sub-menu caption inspired by @p caption
-QString MenuFolderInfo::uniqueMenuCaption(const QString &caption)
+TQString MenuFolderInfo::uniqueMenuCaption(const TQString &caption)
{
- QRegExp r("(.*)(?=-\\d+)");
- QString cap = (r.search(caption) > -1) ? r.cap(1) : caption;
+ TQRegExp r("(.*)(?=-\\d+)");
+ TQString cap = (r.search(caption) > -1) ? r.cap(1) : caption;
- QString result = caption;
+ TQString result = caption;
for(int n = 1; ++n; )
{
@@ -125,18 +125,18 @@ QString MenuFolderInfo::uniqueMenuCaption(const QString &caption)
if (ok)
return result;
- result = cap + QString("-%1").arg(n);
+ result = cap + TQString("-%1").arg(n);
}
- return QString::null; // Never reached
+ return TQString::null; // Never reached
}
// Return a unique item caption inspired by @p caption
-QString MenuFolderInfo::uniqueItemCaption(const QString &caption, const QString &exclude)
+TQString MenuFolderInfo::uniqueItemCaption(const TQString &caption, const TQString &exclude)
{
- QRegExp r("(.*)(?=-\\d+)");
- QString cap = (r.search(caption) > -1) ? r.cap(1) : caption;
+ TQRegExp r("(.*)(?=-\\d+)");
+ TQString cap = (r.search(caption) > -1) ? r.cap(1) : caption;
- QString result = caption;
+ TQString result = caption;
for(int n = 1; ++n; )
{
@@ -144,7 +144,7 @@ QString MenuFolderInfo::uniqueItemCaption(const QString &caption, const QString
if (result == exclude)
ok = false;
MenuEntryInfo *entryInfo;
- for(QPtrListIterator<MenuEntryInfo> it(entries);
+ for(TQPtrListIterator<MenuEntryInfo> it(entries);
ok && (entryInfo = it.current()); ++it)
{
if (entryInfo->caption == result)
@@ -153,15 +153,15 @@ QString MenuFolderInfo::uniqueItemCaption(const QString &caption, const QString
if (ok)
return result;
- result = cap + QString("-%1").arg(n);
+ result = cap + TQString("-%1").arg(n);
}
- return QString::null; // Never reached
+ return TQString::null; // Never reached
}
// Return a list of existing submenu ids
-QStringList MenuFolderInfo::existingMenuIds()
+TQStringList MenuFolderInfo::existingMenuIds()
{
- QStringList result;
+ TQStringList result;
for(MenuFolderInfo *subFolderInfo = subFolders.first();
subFolderInfo; subFolderInfo = subFolders.next())
{
@@ -180,7 +180,7 @@ void MenuFolderInfo::save(MenuFile *menuFile)
if (s_deletedApps)
{
// Remove hotkeys for applications that have been deleted
- for(QStringList::ConstIterator it = s_deletedApps->begin();
+ for(TQStringList::ConstIterator it = s_deletedApps->begin();
it != s_deletedApps->end(); ++it)
{
KHotKeys::menuEntryDeleted(*it);
@@ -191,7 +191,7 @@ void MenuFolderInfo::save(MenuFile *menuFile)
if (dirty)
{
- QString local = KDesktopFile::locateLocal(directoryFile);
+ TQString local = KDesktopFile::locateLocal(directoryFile);
KConfig *df = 0;
if (directoryFile != local)
@@ -223,7 +223,7 @@ void MenuFolderInfo::save(MenuFile *menuFile)
// Save entries
MenuEntryInfo *entryInfo;
- for(QPtrListIterator<MenuEntryInfo> it(entries);
+ for(TQPtrListIterator<MenuEntryInfo> it(entries);
(entryInfo = it.current()); ++it)
{
if (entryInfo->needInsertion())
@@ -245,7 +245,7 @@ bool MenuFolderInfo::hasDirt()
// Check entries
MenuEntryInfo *entryInfo;
- for(QPtrListIterator<MenuEntryInfo> it(entries);
+ for(TQPtrListIterator<MenuEntryInfo> it(entries);
(entryInfo = it.current()); ++it)
{
if (entryInfo->dirty) return true;
@@ -268,7 +268,7 @@ KService::Ptr MenuFolderInfo::findServiceShortcut(const KShortcut&cut)
// Check entries
MenuEntryInfo *entryInfo;
- for(QPtrListIterator<MenuEntryInfo> it(entries);
+ for(TQPtrListIterator<MenuEntryInfo> it(entries);
(entryInfo = it.current()); ++it)
{
if (entryInfo->shortCut == cut)
@@ -288,7 +288,7 @@ void MenuFolderInfo::setInUse(bool inUse)
// Propagate to entries
MenuEntryInfo *entryInfo;
- for(QPtrListIterator<MenuEntryInfo> it(entries);
+ for(TQPtrListIterator<MenuEntryInfo> it(entries);
(entryInfo = it.current()); ++it)
{
entryInfo->setInUse(inUse);
@@ -320,7 +320,7 @@ void MenuEntryInfo::setDirty()
dirty = true;
- QString local = locateLocal("xdgdata-apps", service->menuId());
+ TQString local = locateLocal("xdgdata-apps", service->menuId());
if (local != service->desktopEntryPath())
{
KDesktopFile *oldDf = desktopFile();
@@ -354,7 +354,7 @@ void MenuEntryInfo::save()
}
}
-void MenuEntryInfo::setCaption(const QString &_caption)
+void MenuEntryInfo::setCaption(const TQString &_caption)
{
if (caption == _caption)
return;
@@ -363,7 +363,7 @@ void MenuEntryInfo::setCaption(const QString &_caption)
desktopFile()->writeEntry("Name", caption);
}
-void MenuEntryInfo::setDescription(const QString &_description)
+void MenuEntryInfo::setDescription(const TQString &_description)
{
if (description == _description)
return;
@@ -372,7 +372,7 @@ void MenuEntryInfo::setDescription(const QString &_description)
desktopFile()->writeEntry("GenericName", description);
}
-void MenuEntryInfo::setIcon(const QString &_icon)
+void MenuEntryInfo::setIcon(const TQString &_icon)
{
if (icon == _icon)
return;
@@ -409,7 +409,7 @@ static void freeShortcut(const KShortcut &shortCut)
{
if (!isEmpty(shortCut))
{
- QString shortcutKey = shortCut.toString();
+ TQString shortcutKey = shortCut.toString();
if (s_newShortcuts)
s_newShortcuts->remove(shortcutKey);
@@ -424,7 +424,7 @@ static void allocateShortcut(const KShortcut &shortCut)
{
if (!isEmpty(shortCut))
{
- QString shortcutKey = shortCut.toString();
+ TQString shortcutKey = shortCut.toString();
if (s_freeShortcuts)
s_freeShortcuts->remove(shortcutKey);
@@ -483,11 +483,11 @@ bool MenuEntryInfo::isShortcutAvailable(const KShortcut &_shortcut)
if (shortCut == _shortcut)
return true;
- QString shortcutKey = _shortcut.toString();
+ TQString shortcutKey = _shortcut.toString();
bool available = true;
if (!s_allShortcuts)
{
- s_allShortcuts = new QStringList(KHotKeys::allShortCuts());
+ s_allShortcuts = new TQStringList(KHotKeys::allShortCuts());
}
available = !s_allShortcuts->contains(shortcutKey);
if (available && s_newShortcuts)
diff --git a/kmenuedit/menuinfo.h b/kmenuedit/menuinfo.h
index 17a17e7ff..1d9cbeb8e 100644
--- a/kmenuedit/menuinfo.h
+++ b/kmenuedit/menuinfo.h
@@ -20,7 +20,7 @@
#ifndef __menuinfo_h__
#define __menuinfo_h__
-#include <qstring.h>
+#include <tqstring.h>
#include <kshortcut.h>
#include <kservice.h>
@@ -66,40 +66,40 @@ public:
void take(MenuEntryInfo *);
// Return a unique sub-menu caption inspired by @p caption
- QString uniqueMenuCaption(const QString &caption);
+ TQString uniqueMenuCaption(const TQString &caption);
// Return a unique item caption inspired by @p caption but different
// from @p exclude
- QString uniqueItemCaption(const QString &caption, const QString &exclude = QString::null);
+ TQString uniqueItemCaption(const TQString &caption, const TQString &exclude = TQString::null);
// Update full id's for this item and all submenus
- void updateFullId(const QString &parentId);
+ void updateFullId(const TQString &parentId);
// Return a list of existing submenu ids
- QStringList existingMenuIds();
+ TQStringList existingMenuIds();
- void setCaption(const QString &_caption)
+ void setCaption(const TQString &_caption)
{
if (_caption == caption) return;
caption = _caption;
setDirty();
}
- void setIcon(const QString &_icon)
+ void setIcon(const TQString &_icon)
{
if (_icon == icon) return;
icon = _icon;
setDirty();
}
- void setGenericName(const QString &_description)
+ void setGenericName(const TQString &_description)
{
if (_description == genericname) return;
genericname = _description;
setDirty();
}
- void setComment(const QString &_comment)
+ void setComment(const TQString &_comment)
{
if (_comment == comment) return;
comment = _comment;
@@ -125,16 +125,16 @@ public:
void setInUse(bool inUse);
public:
- QString id; // Relative to parent
- QString fullId; // Name in tree
- QString caption; // Visible name
- QString genericname; // Generic description
- QString comment; // Comment
- QString directoryFile; // File describing this folder.
- QString icon; // Icon
- QPtrList<MenuFolderInfo> subFolders; // Sub menus in this folder
- QPtrList<MenuEntryInfo> entries; // Menu entries in this folder
- QPtrList<MenuInfo> initialLayout; // Layout of menu entries according to sycoca
+ TQString id; // Relative to parent
+ TQString fullId; // Name in tree
+ TQString caption; // Visible name
+ TQString genericname; // Generic description
+ TQString comment; // Comment
+ TQString directoryFile; // File describing this folder.
+ TQString icon; // Icon
+ TQPtrList<MenuFolderInfo> subFolders; // Sub menus in this folder
+ TQPtrList<MenuEntryInfo> entries; // Menu entries in this folder
+ TQPtrList<MenuInfo> initialLayout; // Layout of menu entries according to sycoca
bool dirty;
bool hidden;
};
@@ -152,13 +152,13 @@ public:
}
~MenuEntryInfo();
- void setCaption(const QString &_caption);
- void setDescription(const QString &_description);
- void setIcon(const QString &_icon);
+ void setCaption(const TQString &_caption);
+ void setDescription(const TQString &_description);
+ void setIcon(const TQString &_icon);
- QString menuId() const { return service->menuId(); }
+ TQString menuId() const { return service->menuId(); }
- QString file() const { return service->desktopEntryPath(); }
+ TQString file() const { return service->desktopEntryPath(); }
KShortcut shortcut();
void setShortcut(const KShortcut &_shortcut);
@@ -177,9 +177,9 @@ public:
KDesktopFile *desktopFile();
public:
- QString caption;
- QString description;
- QString icon;
+ TQString caption;
+ TQString description;
+ TQString icon;
KService::Ptr service;
KDesktopFile *df;
KShortcut shortCut;
diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index 760c052fe..693ba568c 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -21,17 +21,17 @@
#include <unistd.h>
-#include <qcstring.h>
-#include <qcursor.h>
-#include <qdatastream.h>
-#include <qdir.h>
-#include <qdragobject.h>
-#include <qfileinfo.h>
-#include <qheader.h>
-#include <qpainter.h>
-#include <qpopupmenu.h>
-#include <qregexp.h>
-#include <qstringlist.h>
+#include <tqcstring.h>
+#include <tqcursor.h>
+#include <tqdatastream.h>
+#include <tqdir.h>
+#include <tqdragobject.h>
+#include <tqfileinfo.h>
+#include <tqheader.h>
+#include <tqpainter.h>
+#include <tqpopupmenu.h>
+#include <tqregexp.h>
+#include <tqstringlist.h>
#include <kglobal.h>
#include <kstandarddirs.h>
@@ -61,15 +61,15 @@
#define COPY_FILE 'c'
#define COPY_SEPARATOR 'S'
-TreeItem::TreeItem(QListViewItem *parent, QListViewItem *after, const QString& menuId, bool __init)
- :QListViewItem(parent, after), _hidden(false), _init(__init), _layoutDirty(false), _menuId(menuId),
+TreeItem::TreeItem(TQListViewItem *parent, TQListViewItem *after, const TQString& menuId, bool __init)
+ :TQListViewItem(parent, after), _hidden(false), _init(__init), _layoutDirty(false), _menuId(menuId),
m_folderInfo(0), m_entryInfo(0) {}
-TreeItem::TreeItem(QListView *parent, QListViewItem *after, const QString& menuId, bool __init)
- : QListViewItem(parent, after), _hidden(false), _init(__init), _layoutDirty(false), _menuId(menuId),
+TreeItem::TreeItem(TQListView *parent, TQListViewItem *after, const TQString& menuId, bool __init)
+ : TQListViewItem(parent, after), _hidden(false), _init(__init), _layoutDirty(false), _menuId(menuId),
m_folderInfo(0), m_entryInfo(0) {}
-void TreeItem::setName(const QString &name)
+void TreeItem::setName(const TQString &name)
{
_name = name;
update();
@@ -84,7 +84,7 @@ void TreeItem::setHidden(bool b)
void TreeItem::update()
{
- QString s = _name;
+ TQString s = _name;
if (_hidden)
s += i18n(" [Hidden]");
setText(0, s);
@@ -95,7 +95,7 @@ void TreeItem::setOpen(bool o)
if (o)
load();
- QListViewItem::setOpen(o);
+ TQListViewItem::setOpen(o);
}
void TreeItem::load()
@@ -108,9 +108,9 @@ void TreeItem::load()
}
}
-void TreeItem::paintCell ( QPainter * p, const QColorGroup & cg, int column, int width, int align )
+void TreeItem::paintCell ( TQPainter * p, const TQColorGroup & cg, int column, int width, int align )
{
- QListViewItem::paintCell(p, cg, column, width, align);
+ TQListViewItem::paintCell(p, cg, column, width, align);
if (!m_folderInfo && !m_entryInfo)
{
@@ -127,18 +127,18 @@ void TreeItem::paintCell ( QPainter * p, const QColorGroup & cg, int column, int
void TreeItem::setup()
{
- QListViewItem::setup();
+ TQListViewItem::setup();
if (!m_folderInfo && !m_entryInfo)
setHeight(8);
}
-static QPixmap appIcon(const QString &iconName)
+static TQPixmap appIcon(const TQString &iconName)
{
- QPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, 0L, true);
+ TQPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, 0L, true);
// make sure they are not larger than 20x20
if (normal.width() > 20 || normal.height() > 20)
{
- QImage tmp = normal.convertToImage();
+ TQImage tmp = normal.convertToImage();
tmp = tmp.smoothScale(20, 20);
normal.convertFromImage(tmp);
}
@@ -146,12 +146,12 @@ static QPixmap appIcon(const QString &iconName)
}
-TreeView::TreeView( bool controlCenter, KActionCollection *ac, QWidget *parent, const char *name )
+TreeView::TreeView( bool controlCenter, KActionCollection *ac, TQWidget *parent, const char *name )
: KListView(parent, name), m_ac(ac), m_rmb(0), m_clipboard(0),
m_clipboardFolderInfo(0), m_clipboardEntryInfo(0),
m_controlCenter(controlCenter), m_layoutDirty(false)
{
- setFrameStyle(QFrame::WinPanel | QFrame::Sunken);
+ setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
setAllColumnsShowFocus(true);
setRootIsDecorated(true);
setSorting(-1);
@@ -163,23 +163,23 @@ TreeView::TreeView( bool controlCenter, KActionCollection *ac, QWidget *parent,
addColumn("");
header()->hide();
- connect(this, SIGNAL(dropped(QDropEvent*, QListViewItem*, QListViewItem*)),
- SLOT(slotDropped(QDropEvent*, QListViewItem*, QListViewItem*)));
+ connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
+ TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
- connect(this, SIGNAL(clicked( QListViewItem* )),
- SLOT(itemSelected( QListViewItem* )));
+ connect(this, TQT_SIGNAL(clicked( TQListViewItem* )),
+ TQT_SLOT(itemSelected( TQListViewItem* )));
- connect(this,SIGNAL(selectionChanged ( QListViewItem * )),
- SLOT(itemSelected( QListViewItem* )));
+ connect(this,TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
+ TQT_SLOT(itemSelected( TQListViewItem* )));
- connect(this, SIGNAL(rightButtonPressed(QListViewItem*, const QPoint&, int)),
- SLOT(slotRMBPressed(QListViewItem*, const QPoint&)));
+ connect(this, TQT_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)),
+ TQT_SLOT(slotRMBPressed(TQListViewItem*, const TQPoint&)));
// connect actions
- connect(m_ac->action("newitem"), SIGNAL(activated()), SLOT(newitem()));
- connect(m_ac->action("newsubmenu"), SIGNAL(activated()), SLOT(newsubmenu()));
+ connect(m_ac->action("newitem"), TQT_SIGNAL(activated()), TQT_SLOT(newitem()));
+ connect(m_ac->action("newsubmenu"), TQT_SIGNAL(activated()), TQT_SLOT(newsubmenu()));
if (m_ac->action("newsep"))
- connect(m_ac->action("newsep"), SIGNAL(activated()), SLOT(newsep()));
+ connect(m_ac->action("newsep"), TQT_SIGNAL(activated()), TQT_SLOT(newsep()));
m_menuFile = new MenuFile( locateLocal("xdgconf-menu", "applications-kmenuedit.menu"));
m_rootFolder = new MenuFolderInfo;
@@ -208,28 +208,28 @@ void TreeView::setViewMode(bool showHidden)
delete m_rmb;
// setup rmb menu
- m_rmb = new QPopupMenu(this);
+ m_rmb = new TQPopupMenu(this);
KAction *action;
action = m_ac->action("edit_cut");
if(action) {
action->plug(m_rmb);
action->setEnabled(false);
- connect(action, SIGNAL(activated()), SLOT(cut()));
+ connect(action, TQT_SIGNAL(activated()), TQT_SLOT(cut()));
}
action = m_ac->action("edit_copy");
if(action) {
action->plug(m_rmb);
action->setEnabled(false);
- connect(action, SIGNAL(activated()), SLOT(copy()));
+ connect(action, TQT_SIGNAL(activated()), TQT_SLOT(copy()));
}
action = m_ac->action("edit_paste");
if(action) {
action->plug(m_rmb);
action->setEnabled(false);
- connect(action, SIGNAL(activated()), SLOT(paste()));
+ connect(action, TQT_SIGNAL(activated()), TQT_SLOT(paste()));
}
m_rmb->insertSeparator();
@@ -238,7 +238,7 @@ void TreeView::setViewMode(bool showHidden)
if(action) {
action->plug(m_rmb);
action->setEnabled(false);
- connect(action, SIGNAL(activated()), SLOT(del()));
+ connect(action, TQT_SIGNAL(activated()), TQT_SLOT(del()));
}
m_rmb->insertSeparator();
@@ -255,7 +255,7 @@ void TreeView::setViewMode(bool showHidden)
fill();
}
-void TreeView::readMenuFolderInfo(MenuFolderInfo *folderInfo, KServiceGroup::Ptr folder, const QString &prefix)
+void TreeView::readMenuFolderInfo(MenuFolderInfo *folderInfo, KServiceGroup::Ptr folder, const TQString &prefix)
{
if (!folderInfo)
{
@@ -277,7 +277,7 @@ void TreeView::readMenuFolderInfo(MenuFolderInfo *folderInfo, KServiceGroup::Ptr
folderInfo->hidden = folder->noDisplay();
folderInfo->directoryFile = folder->directoryEntryPath();
folderInfo->icon = folder->icon();
- QString id = folder->relPath();
+ TQString id = folder->relPath();
int i = id.findRev('/', -2);
id = id.mid(i+1);
folderInfo->id = id;
@@ -310,27 +310,27 @@ void TreeView::readMenuFolderInfo(MenuFolderInfo *folderInfo, KServiceGroup::Ptr
void TreeView::fill()
{
- QApplication::setOverrideCursor(Qt::WaitCursor);
+ TQApplication::setOverrideCursor(Qt::WaitCursor);
clear();
fillBranch(m_rootFolder, 0);
- QApplication::restoreOverrideCursor();
+ TQApplication::restoreOverrideCursor();
}
-QString TreeView::findName(KDesktopFile *df, bool deleted)
+TQString TreeView::findName(KDesktopFile *df, bool deleted)
{
- QString name = df->readName();
+ TQString name = df->readName();
if (deleted)
{
if (name == "empty")
- name = QString::null;
+ name = TQString::null;
if (name.isEmpty())
{
- QString file = df->fileName();
- QString res = df->resource();
+ TQString file = df->fileName();
+ TQString res = df->resource();
bool isLocal = true;
- QStringList files = KGlobal::dirs()->findAllResources(res.latin1(), file);
- for(QStringList::ConstIterator it = files.begin();
+ TQStringList files = KGlobal::dirs()->findAllResources(res.latin1(), file);
+ for(TQStringList::ConstIterator it = files.begin();
it != files.end();
++it)
{
@@ -351,13 +351,13 @@ QString TreeView::findName(KDesktopFile *df, bool deleted)
return name;
}
-TreeItem *TreeView::createTreeItem(TreeItem *parent, QListViewItem *after, MenuFolderInfo *folderInfo, bool _init)
+TreeItem *TreeView::createTreeItem(TreeItem *parent, TQListViewItem *after, MenuFolderInfo *folderInfo, bool _init)
{
TreeItem *item;
if (parent == 0)
- item = new TreeItem(this, after, QString::null, _init);
+ item = new TreeItem(this, after, TQString::null, _init);
else
- item = new TreeItem(parent, after, QString::null, _init);
+ item = new TreeItem(parent, after, TQString::null, _init);
item->setMenuFolderInfo(folderInfo);
item->setName(folderInfo->caption);
@@ -368,7 +368,7 @@ TreeItem *TreeView::createTreeItem(TreeItem *parent, QListViewItem *after, MenuF
return item;
}
-TreeItem *TreeView::createTreeItem(TreeItem *parent, QListViewItem *after, MenuEntryInfo *entryInfo, bool _init)
+TreeItem *TreeView::createTreeItem(TreeItem *parent, TQListViewItem *after, MenuEntryInfo *entryInfo, bool _init)
{
bool hidden = entryInfo->hidden;
@@ -403,21 +403,21 @@ TreeItem *TreeView::createTreeItem(TreeItem *parent, QListViewItem *after, MenuE
return item;
}
-TreeItem *TreeView::createTreeItem(TreeItem *parent, QListViewItem *after, MenuSeparatorInfo *, bool _init)
+TreeItem *TreeView::createTreeItem(TreeItem *parent, TQListViewItem *after, MenuSeparatorInfo *, bool _init)
{
TreeItem* item;
if (parent == 0)
- item = new TreeItem(this, after, QString::null, _init);
+ item = new TreeItem(this, after, TQString::null, _init);
else
- item = new TreeItem(parent, after, QString::null,_init);
+ item = new TreeItem(parent, after, TQString::null,_init);
return item;
}
void TreeView::fillBranch(MenuFolderInfo *folderInfo, TreeItem *parent)
{
- QString relPath = parent ? parent->directory() : QString::null;
- QPtrListIterator<MenuInfo> it( folderInfo->initialLayout );
+ TQString relPath = parent ? parent->directory() : TQString::null;
+ TQPtrListIterator<MenuInfo> it( folderInfo->initialLayout );
TreeItem *after = 0;
for (MenuInfo *info; (info = it.current()); ++it)
{
@@ -443,7 +443,7 @@ void TreeView::fillBranch(MenuFolderInfo *folderInfo, TreeItem *parent)
}
}
-void TreeView::closeAllItems(QListViewItem *item)
+void TreeView::closeAllItems(TQListViewItem *item)
{
if (!item) return;
while(item)
@@ -454,7 +454,7 @@ void TreeView::closeAllItems(QListViewItem *item)
}
}
-void TreeView::selectMenu(const QString &menu)
+void TreeView::selectMenu(const TQString &menu)
{
closeAllItems(firstChild());
@@ -465,7 +465,7 @@ void TreeView::selectMenu(const QString &menu)
return; // Root menu
}
- QString restMenu = menu.mid(1);
+ TQString restMenu = menu.mid(1);
if (!restMenu.endsWith("/"))
restMenu += "/";
@@ -473,7 +473,7 @@ void TreeView::selectMenu(const QString &menu)
do
{
int i = restMenu.find("/");
- QString subMenu = restMenu.left(i+1);
+ TQString subMenu = restMenu.left(i+1);
restMenu = restMenu.mid(i+1);
item = (TreeItem*)(item ? item->firstChild() : firstChild());
@@ -497,7 +497,7 @@ void TreeView::selectMenu(const QString &menu)
}
}
-void TreeView::selectMenuEntry(const QString &menuEntry)
+void TreeView::selectMenuEntry(const TQString &menuEntry)
{
TreeItem *item = (TreeItem *) selectedItem();
if (!item)
@@ -522,7 +522,7 @@ void TreeView::selectMenuEntry(const QString &menuEntry)
}
}
-void TreeView::itemSelected(QListViewItem *item)
+void TreeView::itemSelected(TQListViewItem *item)
{
TreeItem *_item = (TreeItem*)item;
bool selected = false;
@@ -587,29 +587,29 @@ void TreeView::currentChanged(MenuEntryInfo *entryInfo)
item->setPixmap(0, appIcon(entryInfo->icon));
}
-QStringList TreeView::fileList(const QString& rPath)
+TQStringList TreeView::fileList(const TQString& rPath)
{
- QString relativePath = rPath;
+ TQString relativePath = rPath;
// truncate "/.directory"
int pos = relativePath.findRev("/.directory");
if (pos > 0) relativePath.truncate(pos);
- QStringList filelist;
+ TQStringList filelist;
// loop through all resource dirs and build a file list
- QStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
- for (QStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
+ TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
+ for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
{
- QDir dir((*it) + "/" + relativePath);
+ TQDir dir((*it) + "/" + relativePath);
if(!dir.exists()) continue;
- dir.setFilter(QDir::Files);
+ dir.setFilter(TQDir::Files);
dir.setNameFilter("*.desktop;*.kdelnk");
// build a list of files
- QStringList files = dir.entryList();
- for (QStringList::ConstIterator it = files.begin(); it != files.end(); ++it) {
+ TQStringList files = dir.entryList();
+ for (TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) {
// does not work?!
//if (filelist.contains(*it)) continue;
@@ -626,27 +626,27 @@ QStringList TreeView::fileList(const QString& rPath)
return filelist;
}
-QStringList TreeView::dirList(const QString& rPath)
+TQStringList TreeView::dirList(const TQString& rPath)
{
- QString relativePath = rPath;
+ TQString relativePath = rPath;
// truncate "/.directory"
int pos = relativePath.findRev("/.directory");
if (pos > 0) relativePath.truncate(pos);
- QStringList dirlist;
+ TQStringList dirlist;
// loop through all resource dirs and build a subdir list
- QStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
- for (QStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
+ TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
+ for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
{
- QDir dir((*it) + "/" + relativePath);
+ TQDir dir((*it) + "/" + relativePath);
if(!dir.exists()) continue;
- dir.setFilter(QDir::Dirs);
+ dir.setFilter(TQDir::Dirs);
// build a list of subdirs
- QStringList subdirs = dir.entryList();
- for (QStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it) {
+ TQStringList subdirs = dir.entryList();
+ for (TQStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it) {
if ((*it) == "." || (*it) == "..") continue;
// does not work?!
// if (dirlist.contains(*it)) continue;
@@ -664,7 +664,7 @@ QStringList TreeView::dirList(const QString& rPath)
return dirlist;
}
-bool TreeView::acceptDrag(QDropEvent* e) const
+bool TreeView::acceptDrag(TQDropEvent* e) const
{
if (e->provides("application/x-kmenuedit-internal") &&
(e->source() == const_cast<TreeView *>(this)))
@@ -677,43 +677,43 @@ bool TreeView::acceptDrag(QDropEvent* e) const
}
-static QString createDesktopFile(const QString &file, QString *menuId, QStringList *excludeList)
+static TQString createDesktopFile(const TQString &file, TQString *menuId, TQStringList *excludeList)
{
- QString base = file.mid(file.findRev('/')+1);
+ TQString base = file.mid(file.findRev('/')+1);
base = base.left(base.findRev('.'));
- QRegExp r("(.*)(?=-\\d+)");
+ TQRegExp r("(.*)(?=-\\d+)");
base = (r.search(base) > -1) ? r.cap(1) : base;
- QString result = KService::newServicePath(true, base, menuId, excludeList);
+ TQString result = KService::newServicePath(true, base, menuId, excludeList);
excludeList->append(*menuId);
// Todo for Undo-support: Undo menuId allocation:
return result;
}
-static KDesktopFile *copyDesktopFile(MenuEntryInfo *entryInfo, QString *menuId, QStringList *excludeList)
+static KDesktopFile *copyDesktopFile(MenuEntryInfo *entryInfo, TQString *menuId, TQStringList *excludeList)
{
- QString result = createDesktopFile(entryInfo->file(), menuId, excludeList);
+ TQString result = createDesktopFile(entryInfo->file(), menuId, excludeList);
KDesktopFile *df = entryInfo->desktopFile()->copyTo(result);
df->deleteEntry("Categories"); // Don't set any categories!
return df;
}
-static QString createDirectoryFile(const QString &file, QStringList *excludeList)
+static TQString createDirectoryFile(const TQString &file, TQStringList *excludeList)
{
- QString base = file.mid(file.findRev('/')+1);
+ TQString base = file.mid(file.findRev('/')+1);
base = base.left(base.findRev('.'));
- QString result;
+ TQString result;
int i = 1;
while(true)
{
if (i == 1)
result = base + ".directory";
else
- result = base + QString("-%1.directory").arg(i);
+ result = base + TQString("-%1.directory").arg(i);
if (!excludeList->contains(result))
{
@@ -728,13 +728,13 @@ static QString createDirectoryFile(const QString &file, QStringList *excludeList
}
-void TreeView::slotDropped (QDropEvent * e, QListViewItem *parent, QListViewItem*after)
+void TreeView::slotDropped (TQDropEvent * e, TQListViewItem *parent, TQListViewItem*after)
{
if(!e) return;
// get destination folder
TreeItem *parentItem = static_cast<TreeItem*>(parent);
- QString folder = parentItem ? parentItem->directory() : QString::null;
+ TQString folder = parentItem ? parentItem->directory() : TQString::null;
MenuFolderInfo *parentFolderInfo = parentItem ? parentItem->folderInfo() : m_rootFolder;
if (e->source() != this)
@@ -743,12 +743,12 @@ void TreeView::slotDropped (QDropEvent * e, QListViewItem *parent, QListViewItem
KURL::List urls;
if (!KURLDrag::decode(e, urls) || (urls.count() != 1) || !urls[0].isLocalFile())
return;
- QString path = urls[0].path();
+ TQString path = urls[0].path();
if (!path.endsWith(".desktop"))
return;
- QString menuId;
- QString result = createDesktopFile(path, &menuId, &m_newMenuIds);
+ TQString menuId;
+ TQString result = createDesktopFile(path, &menuId, &m_newMenuIds);
KDesktopFile orig_df(path);
KDesktopFile *df = orig_df.copyTo(result);
df->deleteEntry("Categories"); // Don't set any categories!
@@ -758,8 +758,8 @@ void TreeView::slotDropped (QDropEvent * e, QListViewItem *parent, QListViewItem
MenuEntryInfo *entryInfo = new MenuEntryInfo(s, df);
- QString oldCaption = entryInfo->caption;
- QString newCaption = parentFolderInfo->uniqueItemCaption(oldCaption, oldCaption);
+ TQString oldCaption = entryInfo->caption;
+ TQString newCaption = parentFolderInfo->uniqueItemCaption(oldCaption, oldCaption);
entryInfo->setCaption(newCaption);
// Add file to menu
@@ -792,7 +792,7 @@ void TreeView::slotDropped (QDropEvent * e, QListViewItem *parent, QListViewItem
if (command == MOVE_FOLDER)
{
MenuFolderInfo *folderInfo = m_dragInfo;
- if (e->action() == QDropEvent::Copy)
+ if (e->action() == TQDropEvent::Copy)
{
// Ugh.. this is hard :)
// * Create new .directory file
@@ -817,9 +817,9 @@ void TreeView::slotDropped (QDropEvent * e, QListViewItem *parent, QListViewItem
oldParentFolderInfo->take(folderInfo);
// Move menu
- QString oldFolder = folderInfo->fullId;
- QString folderName = folderInfo->id;
- QString newFolder = m_menuFile->uniqueMenuName(folder, folderName, parentFolderInfo->existingMenuIds());
+ TQString oldFolder = folderInfo->fullId;
+ TQString folderName = folderInfo->id;
+ TQString newFolder = m_menuFile->uniqueMenuName(folder, folderName, parentFolderInfo->existingMenuIds());
folderInfo->id = newFolder;
// Add file to menu
@@ -827,7 +827,7 @@ void TreeView::slotDropped (QDropEvent * e, QListViewItem *parent, QListViewItem
m_menuFile->pushAction(MenuFile::MOVE_MENU, oldFolder, folder + newFolder);
// Make sure caption is unique
- QString newCaption = parentFolderInfo->uniqueMenuCaption(folderInfo->caption);
+ TQString newCaption = parentFolderInfo->uniqueMenuCaption(folderInfo->caption);
if (newCaption != folderInfo->caption)
{
folderInfo->setCaption(newCaption);
@@ -863,9 +863,9 @@ void TreeView::slotDropped (QDropEvent * e, QListViewItem *parent, QListViewItem
else if (command == MOVE_FILE)
{
MenuEntryInfo *entryInfo = m_dragItem->entryInfo();
- QString menuId = entryInfo->menuId();
+ TQString menuId = entryInfo->menuId();
- if (e->action() == QDropEvent::Copy)
+ if (e->action() == TQDropEvent::Copy)
{
// Need to copy file and then add it
@@ -877,15 +877,15 @@ void TreeView::slotDropped (QDropEvent * e, QListViewItem *parent, QListViewItem
entryInfo = new MenuEntryInfo(s, df);
- QString oldCaption = entryInfo->caption;
- QString newCaption = parentFolderInfo->uniqueItemCaption(oldCaption, oldCaption);
+ TQString oldCaption = entryInfo->caption;
+ TQString newCaption = parentFolderInfo->uniqueItemCaption(oldCaption, oldCaption);
entryInfo->setCaption(newCaption);
}
else
{
del(m_dragItem, false);
- QString oldCaption = entryInfo->caption;
- QString newCaption = parentFolderInfo->uniqueItemCaption(oldCaption);
+ TQString oldCaption = entryInfo->caption;
+ TQString newCaption = parentFolderInfo->uniqueItemCaption(oldCaption);
entryInfo->setCaption(newCaption);
entryInfo->setInUse(true);
}
@@ -907,7 +907,7 @@ void TreeView::slotDropped (QDropEvent * e, QListViewItem *parent, QListViewItem
}
else if (command == COPY_SEPARATOR)
{
- if (e->action() != QDropEvent::Copy)
+ if (e->action() != TQDropEvent::Copy)
del(m_dragItem, false);
TreeItem *newItem = createTreeItem(parentItem, after, m_separator, true);
@@ -926,7 +926,7 @@ void TreeView::slotDropped (QDropEvent * e, QListViewItem *parent, QListViewItem
void TreeView::startDrag()
{
- QDragObject *drag = dragObject();
+ TQDragObject *drag = dragObject();
if (!drag)
return;
@@ -934,9 +934,9 @@ void TreeView::startDrag()
drag->dragMove();
}
-QDragObject *TreeView::dragObject()
+TQDragObject *TreeView::dragObject()
{
- m_dragPath = QString::null;
+ m_dragPath = TQString::null;
TreeItem *item = (TreeItem*)selectedItem();
if(item == 0) return 0;
@@ -953,7 +953,7 @@ QDragObject *TreeView::dragObject()
m_drag = MOVE_FILE;
m_dragInfo = 0;
m_dragItem = item;
- QString menuId = item->menuId();
+ TQString menuId = item->menuId();
m_dragPath = item->entryInfo()->service->desktopEntryPath();
if (!m_dragPath.isEmpty())
m_dragPath = locate("apps", m_dragPath);
@@ -971,13 +971,13 @@ QDragObject *TreeView::dragObject()
m_dragItem = item;
}
- drag->addDragObject( new QStoredDrag("application/x-kmenuedit-internal", 0));
+ drag->addDragObject( new TQStoredDrag("application/x-kmenuedit-internal", 0));
if ( item->pixmap(0) )
drag->setPixmap(*item->pixmap(0));
return drag;
}
-void TreeView::slotRMBPressed(QListViewItem*, const QPoint& p)
+void TreeView::slotRMBPressed(TQListViewItem*, const TQPoint& p)
{
TreeItem *item = (TreeItem*)selectedItem();
if(item == 0) return;
@@ -991,23 +991,23 @@ void TreeView::newsubmenu()
TreeItem *item = (TreeItem*)selectedItem();
bool ok;
- QString caption = KInputDialog::getText( i18n( "New Submenu" ),
- i18n( "Submenu name:" ), QString::null, &ok, this );
+ TQString caption = KInputDialog::getText( i18n( "New Submenu" ),
+ i18n( "Submenu name:" ), TQString::null, &ok, this );
if (!ok) return;
- QString file = caption;
+ TQString file = caption;
file.replace('/', '-');
file = createDirectoryFile(file, &m_newDirectoryList); // Create
// get destination folder
- QString folder;
+ TQString folder;
if(!item)
{
parentItem = 0;
- folder = QString::null;
+ folder = TQString::null;
}
else if(item->isDirectory())
{
@@ -1018,7 +1018,7 @@ void TreeView::newsubmenu()
else
{
parentItem = static_cast<TreeItem*>(item->parent());
- folder = parentItem ? parentItem->directory() : QString::null;
+ folder = parentItem ? parentItem->directory() : TQString::null;
}
MenuFolderInfo *parentFolderInfo = parentItem ? parentItem->folderInfo() : m_rootFolder;
@@ -1062,13 +1062,13 @@ void TreeView::newitem()
TreeItem *item = (TreeItem*)selectedItem();
bool ok;
- QString caption = KInputDialog::getText( i18n( "New Item" ),
- i18n( "Item name:" ), QString::null, &ok, this );
+ TQString caption = KInputDialog::getText( i18n( "New Item" ),
+ i18n( "Item name:" ), TQString::null, &ok, this );
if (!ok) return;
- QString menuId;
- QString file = caption;
+ TQString menuId;
+ TQString file = caption;
file.replace('/', '-');
file = createDesktopFile(file, &menuId, &m_newMenuIds); // Create
@@ -1078,12 +1078,12 @@ void TreeView::newitem()
df->writeEntry("Type", "Application");
// get destination folder
- QString folder;
+ TQString folder;
if(!item)
{
parentItem = 0;
- folder = QString::null;
+ folder = TQString::null;
}
else if(item->isDirectory())
{
@@ -1094,7 +1094,7 @@ void TreeView::newitem()
else
{
parentItem = static_cast<TreeItem*>(item->parent());
- folder = parentItem ? parentItem->directory() : QString::null;
+ folder = parentItem ? parentItem->directory() : TQString::null;
}
MenuFolderInfo *parentFolderInfo = parentItem ? parentItem->folderInfo() : m_rootFolder;
@@ -1189,7 +1189,7 @@ void TreeView::copy( bool cutting )
// is item a folder or a file?
if(item->isDirectory())
{
- QString folder = item->directory();
+ TQString folder = item->directory();
if (cutting)
{
// Place in clipboard
@@ -1246,7 +1246,7 @@ void TreeView::paste()
if (!m_clipboard) return;
// get destination folder
- QString folder;
+ TQString folder;
if(item->isDirectory())
{
@@ -1257,7 +1257,7 @@ void TreeView::paste()
else
{
parentItem = static_cast<TreeItem*>(item->parent());
- folder = parentItem ? parentItem->directory() : QString::null;
+ folder = parentItem ? parentItem->directory() : TQString::null;
}
MenuFolderInfo *parentFolderInfo = parentItem ? parentItem->folderInfo() : m_rootFolder;
@@ -1274,9 +1274,9 @@ void TreeView::paste()
else if (command == MOVE_FOLDER)
{
// Move menu
- QString oldFolder = folderInfo->fullId;
- QString folderName = folderInfo->id;
- QString newFolder = m_menuFile->uniqueMenuName(folder, folderName, parentFolderInfo->existingMenuIds());
+ TQString oldFolder = folderInfo->fullId;
+ TQString folderName = folderInfo->id;
+ TQString newFolder = m_menuFile->uniqueMenuName(folder, folderName, parentFolderInfo->existingMenuIds());
folderInfo->id = newFolder;
// Add file to menu
@@ -1284,7 +1284,7 @@ void TreeView::paste()
m_menuFile->pushAction(MenuFile::MOVE_MENU, oldFolder, folder + newFolder);
// Make sure caption is unique
- QString newCaption = parentFolderInfo->uniqueMenuCaption(folderInfo->caption);
+ TQString newCaption = parentFolderInfo->uniqueMenuCaption(folderInfo->caption);
if (newCaption != folderInfo->caption)
{
folderInfo->setCaption(newCaption);
@@ -1309,7 +1309,7 @@ void TreeView::paste()
else if ((command == COPY_FILE) || (command == MOVE_FILE))
{
MenuEntryInfo *entryInfo = m_clipboardEntryInfo;
- QString menuId;
+ TQString menuId;
if (command == COPY_FILE)
{
@@ -1320,8 +1320,8 @@ void TreeView::paste()
s->setMenuId(menuId);
entryInfo = new MenuEntryInfo(s, df);
- QString oldCaption = entryInfo->caption;
- QString newCaption = parentFolderInfo->uniqueItemCaption(oldCaption, oldCaption);
+ TQString oldCaption = entryInfo->caption;
+ TQString newCaption = parentFolderInfo->uniqueItemCaption(oldCaption, oldCaption);
entryInfo->setCaption(newCaption);
}
else if (command == MOVE_FILE)
@@ -1329,8 +1329,8 @@ void TreeView::paste()
menuId = entryInfo->menuId();
m_clipboard = COPY_FILE; // Next one copies.
- QString oldCaption = entryInfo->caption;
- QString newCaption = parentFolderInfo->uniqueItemCaption(oldCaption);
+ TQString oldCaption = entryInfo->caption;
+ TQString newCaption = parentFolderInfo->uniqueItemCaption(oldCaption);
entryInfo->setCaption(newCaption);
entryInfo->setInUse(true);
}
@@ -1412,7 +1412,7 @@ void TreeView::del(TreeItem *item, bool deleteInfo)
// Remove from menu
// m_menuFile->removeMenu(item->directory());
- m_menuFile->pushAction(MenuFile::REMOVE_MENU, item->directory(), QString::null);
+ m_menuFile->pushAction(MenuFile::REMOVE_MENU, item->directory(), TQString::null);
// Remove tree item
delete item;
@@ -1420,7 +1420,7 @@ void TreeView::del(TreeItem *item, bool deleteInfo)
else if (item->isEntry())
{
MenuEntryInfo *entryInfo = item->entryInfo();
- QString menuId = entryInfo->menuId();
+ TQString menuId = entryInfo->menuId();
// Remove MenuFolderInfo
MenuFolderInfo *parentFolderInfo = parentItem ? parentItem->folderInfo() : m_rootFolder;
@@ -1439,7 +1439,7 @@ void TreeView::del(TreeItem *item, bool deleteInfo)
}
// Remove from menu
- QString folder = parentItem ? parentItem->directory() : QString::null;
+ TQString folder = parentItem ? parentItem->directory() : TQString::null;
// m_menuFile->removeEntry(folder, menuId);
m_menuFile->pushAction(MenuFile::REMOVE_ENTRY, folder, menuId);
@@ -1466,11 +1466,11 @@ void TreeView::cleanupClipboard() {
m_clipboard = 0;
}
-static QStringList extractLayout(TreeItem *item)
+static TQStringList extractLayout(TreeItem *item)
{
bool firstFolder = true;
bool firstEntry = true;
- QStringList layout;
+ TQStringList layout;
for(;item; item = static_cast<TreeItem*>(item->nextSibling()))
{
if (item->isDirectory())
@@ -1499,9 +1499,9 @@ static QStringList extractLayout(TreeItem *item)
return layout;
}
-QStringList TreeItem::layout()
+TQStringList TreeItem::layout()
{
- QStringList layout = extractLayout(static_cast<TreeItem*>(firstChild()));
+ TQStringList layout = extractLayout(static_cast<TreeItem*>(firstChild()));
_layoutDirty = false;
return layout;
}
@@ -1510,13 +1510,13 @@ void TreeView::saveLayout()
{
if (m_layoutDirty)
{
- QStringList layout = extractLayout(static_cast<TreeItem*>(firstChild()));
+ TQStringList layout = extractLayout(static_cast<TreeItem*>(firstChild()));
m_menuFile->setLayout(m_rootFolder->fullId, layout);
m_layoutDirty = false;
}
- QPtrList<QListViewItem> lst;
- QListViewItemIterator it( this );
+ TQPtrList<TQListViewItem> lst;
+ TQListViewItemIterator it( this );
while ( it.current() ) {
TreeItem *item = static_cast<TreeItem*>(it.current());
if ( item->isLayoutDirty() )
@@ -1559,8 +1559,8 @@ void TreeView::setLayoutDirty(TreeItem *parentItem)
bool TreeView::isLayoutDirty()
{
- QPtrList<QListViewItem> lst;
- QListViewItemIterator it( this );
+ TQPtrList<TQListViewItem> lst;
+ TQListViewItemIterator it( this );
while ( it.current() ) {
if ( static_cast<TreeItem*>(it.current())->isLayoutDirty() )
return true;
diff --git a/kmenuedit/treeview.h b/kmenuedit/treeview.h
index 13d415c13..63099f44c 100644
--- a/kmenuedit/treeview.h
+++ b/kmenuedit/treeview.h
@@ -22,7 +22,7 @@
#ifndef __treeview_h__
#define __treeview_h__
-#include <qstring.h>
+#include <tqstring.h>
#include <klistview.h>
#include <kservice.h>
#include <kservicegroup.h>
@@ -39,13 +39,13 @@ class KShortcut;
class TreeItem : public QListViewItem
{
public:
- TreeItem(QListViewItem *parent, QListViewItem *after, const QString &menuIdn, bool __init = false);
- TreeItem(QListView *parent, QListViewItem* after, const QString &menuId, bool __init = false);
+ TreeItem(TQListViewItem *parent, TQListViewItem *after, const TQString &menuIdn, bool __init = false);
+ TreeItem(TQListView *parent, TQListViewItem* after, const TQString &menuId, bool __init = false);
- QString menuId() const { return _menuId; }
+ TQString menuId() const { return _menuId; }
- QString directory() const { return _directoryPath; }
- void setDirectoryPath(const QString& path) { _directoryPath = path; }
+ TQString directory() const { return _directoryPath; }
+ void setDirectoryPath(const TQString& path) { _directoryPath = path; }
MenuFolderInfo *folderInfo() { return m_folderInfo; }
void setMenuFolderInfo(MenuFolderInfo *folderInfo) { m_folderInfo = folderInfo; }
@@ -53,8 +53,8 @@ public:
MenuEntryInfo *entryInfo() { return m_entryInfo; }
void setMenuEntryInfo(MenuEntryInfo *entryInfo) { m_entryInfo = entryInfo; }
- QString name() const { return _name; }
- void setName(const QString &name);
+ TQString name() const { return _name; }
+ void setName(const TQString &name);
bool isDirectory() const { return m_folderInfo; }
bool isEntry() const { return m_entryInfo; }
@@ -64,12 +64,12 @@ public:
bool isLayoutDirty() { return _layoutDirty; }
void setLayoutDirty() { _layoutDirty = true; }
- QStringList layout();
+ TQStringList layout();
virtual void setOpen(bool o);
void load();
- virtual void paintCell(QPainter * p, const QColorGroup & cg, int column, int width, int align);
+ virtual void paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align);
virtual void setup();
private:
@@ -78,9 +78,9 @@ private:
bool _hidden : 1;
bool _init : 1;
bool _layoutDirty : 1;
- QString _menuId;
- QString _name;
- QString _directoryPath;
+ TQString _menuId;
+ TQString _name;
+ TQString _directoryPath;
MenuFolderInfo *m_folderInfo;
MenuEntryInfo *m_entryInfo;
};
@@ -90,17 +90,17 @@ class TreeView : public KListView
friend class TreeItem;
Q_OBJECT
public:
- TreeView(bool controlCenter, KActionCollection *ac, QWidget *parent=0, const char *name=0);
+ TreeView(bool controlCenter, KActionCollection *ac, TQWidget *parent=0, const char *name=0);
~TreeView();
- void readMenuFolderInfo(MenuFolderInfo *folderInfo=0, KServiceGroup::Ptr folder=0, const QString &prefix=QString::null);
+ void readMenuFolderInfo(MenuFolderInfo *folderInfo=0, KServiceGroup::Ptr folder=0, const TQString &prefix=TQString::null);
void setViewMode(bool showHidden);
bool save();
bool dirty();
- void selectMenu(const QString &menu);
- void selectMenuEntry(const QString &menuEntry);
+ void selectMenu(const TQString &menu);
+ void selectMenuEntry(const TQString &menuEntry);
public slots:
void currentChanged(MenuFolderInfo *folderInfo);
@@ -112,9 +112,9 @@ signals:
void entrySelected(MenuEntryInfo *entryInfo);
void disableAction();
protected slots:
- void itemSelected(QListViewItem *);
- void slotDropped(QDropEvent *, QListViewItem *, QListViewItem *);
- void slotRMBPressed(QListViewItem*, const QPoint&);
+ void itemSelected(TQListViewItem *);
+ void slotDropped(TQDropEvent *, TQListViewItem *, TQListViewItem *);
+ void slotRMBPressed(TQListViewItem*, const TQPoint&);
void newsubmenu();
void newitem();
@@ -126,16 +126,16 @@ protected slots:
void del();
protected:
- TreeItem *createTreeItem(TreeItem *parent, QListViewItem *after, MenuFolderInfo *folderInfo, bool _init = false);
- TreeItem *createTreeItem(TreeItem *parent, QListViewItem *after, MenuEntryInfo *entryInfo, bool _init = false);
- TreeItem *createTreeItem(TreeItem *parent, QListViewItem *after, MenuSeparatorInfo *sepInfo, bool _init = false);
+ TreeItem *createTreeItem(TreeItem *parent, TQListViewItem *after, MenuFolderInfo *folderInfo, bool _init = false);
+ TreeItem *createTreeItem(TreeItem *parent, TQListViewItem *after, MenuEntryInfo *entryInfo, bool _init = false);
+ TreeItem *createTreeItem(TreeItem *parent, TQListViewItem *after, MenuSeparatorInfo *sepInfo, bool _init = false);
void del(TreeItem *, bool deleteInfo);
void fill();
void fillBranch(MenuFolderInfo *folderInfo, TreeItem *parent);
- QString findName(KDesktopFile *df, bool deleted);
+ TQString findName(KDesktopFile *df, bool deleted);
- void closeAllItems(QListViewItem *item);
+ void closeAllItems(TQListViewItem *item);
// moving = src will be removed later
void copy( bool moving );
@@ -146,30 +146,30 @@ protected:
void setLayoutDirty(TreeItem *);
void saveLayout();
- QStringList fileList(const QString& relativePath);
- QStringList dirList(const QString& relativePath);
+ TQStringList fileList(const TQString& relativePath);
+ TQStringList dirList(const TQString& relativePath);
- virtual bool acceptDrag(QDropEvent* event) const;
- virtual QDragObject *dragObject();
+ virtual bool acceptDrag(TQDropEvent* event) const;
+ virtual TQDragObject *dragObject();
virtual void startDrag();
private:
KActionCollection *m_ac;
- QPopupMenu *m_rmb;
+ TQPopupMenu *m_rmb;
int m_clipboard;
MenuFolderInfo *m_clipboardFolderInfo;
MenuEntryInfo *m_clipboardEntryInfo;
int m_drag;
MenuFolderInfo *m_dragInfo;
TreeItem *m_dragItem;
- QString m_dragPath;
+ TQString m_dragPath;
bool m_showHidden;
bool m_controlCenter;
MenuFile *m_menuFile;
MenuFolderInfo *m_rootFolder;
MenuSeparatorInfo *m_separator;
- QStringList m_newMenuIds;
- QStringList m_newDirectoryList;
+ TQStringList m_newMenuIds;
+ TQStringList m_newDirectoryList;
bool m_detailedMenuEntries;
bool m_detailedEntriesNamesFirst;
bool m_layoutDirty;
diff --git a/knetattach/knetattach.ui.h b/knetattach/knetattach.ui.h
index de890e228..f60dab03e 100644
--- a/knetattach/knetattach.ui.h
+++ b/knetattach/knetattach.ui.h
@@ -13,14 +13,14 @@
void KNetAttach::init()
{
setIcon(SmallIcon("knetattach"));
- disconnect(finishButton(), SIGNAL(clicked()), (QDialog*)this, SLOT(accept()));
- connect(finishButton(), SIGNAL(clicked()), this, SLOT(finished()));
+ disconnect(finishButton(), TQT_SIGNAL(clicked()), (TQDialog*)this, TQT_SLOT(accept()));
+ connect(finishButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(finished()));
finishButton()->setText(i18n("Save && C&onnect"));
//setResizeMode(Fixed); FIXME: make the wizard fixed-geometry
setFinishEnabled(_folderParameters, false);
KConfig recent("krecentconnections", true, false);
recent.setGroup("General");
- QStringList idx = recent.readListEntry("Index");
+ TQStringList idx = recent.readListEntry("Index");
if (idx.isEmpty()) {
_recent->setEnabled(false);
if (_recent->isChecked()) {
@@ -32,9 +32,9 @@ void KNetAttach::init()
}
}
-void KNetAttach::setInformationText( const QString &type )
+void KNetAttach::setInformationText( const TQString &type )
{
- QString text;
+ TQString text;
if (type=="WebFolder") {
text = i18n("Enter a name for this <i>WebFolder</i> as well as a server address, port and folder path to use and press the <b>Save & Connect</b> button.");
@@ -49,7 +49,7 @@ void KNetAttach::setInformationText( const QString &type )
_informationText->setText(text);
}
-void KNetAttach::showPage( QWidget *page )
+void KNetAttach::showPage( TQWidget *page )
{
if (page == _folderType) {
} else if (page == _folderParameters) {
@@ -78,7 +78,7 @@ void KNetAttach::showPage( QWidget *page )
KConfig recent("krecentconnections", true, false);
if (!recent.hasGroup(_recentConnectionName->currentText())) {
recent.setGroup("General");
- QStringList idx = recent.readListEntry("Index");
+ TQStringList idx = recent.readListEntry("Index");
if (idx.isEmpty()) {
_recent->setEnabled(false);
if (_recent->isChecked()) {
@@ -112,7 +112,7 @@ void KNetAttach::showPage( QWidget *page )
updateParametersPageStatus();
}
- QWizard::showPage(page);
+ TQWizard::showPage(page);
}
@@ -149,9 +149,9 @@ void KNetAttach::finished()
url.setHost(_host->text().stripWhiteSpace());
url.setUser(_user->text().stripWhiteSpace());
- QString path = _path->text().stripWhiteSpace();
+ TQString path = _path->text().stripWhiteSpace();
if (!path.startsWith("/")) {
- path = QString("/") + path;
+ path = TQString("/") + path;
}
url.setPath(path);
_folderParameters->setEnabled(false);
@@ -166,13 +166,13 @@ void KNetAttach::finished()
kapp->invokeBrowser(url.url());
- QString name = _connectionName->text().stripWhiteSpace();
+ TQString name = _connectionName->text().stripWhiteSpace();
if (_createIcon->isChecked()) {
KGlobal::dirs()->addResourceType("remote_entries",
KStandardDirs::kde_default("data") + "remoteview");
- QString path = KGlobal::dirs()->saveLocation("remote_entries");
+ TQString path = KGlobal::dirs()->saveLocation("remote_entries");
path += name + ".desktop";
KSimpleConfig desktopFile(path, false);
desktopFile.setGroup("Desktop Entry");
@@ -188,7 +188,7 @@ void KNetAttach::finished()
if (!name.isEmpty()) {
KConfig recent("krecentconnections", false, false);
recent.setGroup("General");
- QStringList idx = recent.readListEntry("Index");
+ TQStringList idx = recent.readListEntry("Index");
recent.deleteGroup(name); // erase anything stale
if (idx.contains(name)) {
idx.remove(name);
@@ -196,7 +196,7 @@ void KNetAttach::finished()
recent.writeEntry("Index", idx);
recent.setGroup(name);
} else {
- QString last;
+ TQString last;
if (!idx.isEmpty()) {
last = idx.last();
idx.pop_back();
@@ -214,7 +214,7 @@ void KNetAttach::finished()
recent.sync();
}
- QDialog::accept();
+ TQDialog::accept();
}
@@ -241,7 +241,7 @@ bool KNetAttach::doConnectionTest(const KURL& url)
}
-bool KNetAttach::updateForProtocol(const QString& protocol)
+bool KNetAttach::updateForProtocol(const TQString& protocol)
{
_type = protocol;
if (protocol == "WebFolder") {
diff --git a/konqueror/KonqMainWindowIface.cc b/konqueror/KonqMainWindowIface.cc
index 00233d883..462c08aed 100644
--- a/konqueror/KonqMainWindowIface.cc
+++ b/konqueror/KonqMainWindowIface.cc
@@ -45,27 +45,27 @@ KonqMainWindowIface::~KonqMainWindowIface()
delete m_dcopActionProxy;
}
-void KonqMainWindowIface::openURL( QString url )
+void KonqMainWindowIface::openURL( TQString url )
{
m_pMainWindow->openFilteredURL( url );
}
-void KonqMainWindowIface::newTab( QString url )
+void KonqMainWindowIface::newTab( TQString url )
{
m_pMainWindow->openFilteredURL( url, true );
}
-void KonqMainWindowIface::openURL( QString url, bool tempFile )
+void KonqMainWindowIface::openURL( TQString url, bool tempFile )
{
m_pMainWindow->openFilteredURL( url, false, tempFile );
}
-void KonqMainWindowIface::newTab( QString url, bool tempFile )
+void KonqMainWindowIface::newTab( TQString url, bool tempFile )
{
m_pMainWindow->openFilteredURL( url, true, tempFile );
}
-void KonqMainWindowIface::newTabASN( QString url, const QCString& startup_id, bool tempFile )
+void KonqMainWindowIface::newTabASN( TQString url, const TQCString& startup_id, bool tempFile )
{
KStartupInfo::setNewStartupId( m_pMainWindow, startup_id );
m_pMainWindow->openFilteredURL( url, true, tempFile );
@@ -129,7 +129,7 @@ DCOPRef KonqMainWindowIface::part(int viewNumber)
return (*it)->dcopObject()->part();
}
-DCOPRef KonqMainWindowIface::action( const QCString &name )
+DCOPRef KonqMainWindowIface::action( const TQCString &name )
{
return DCOPRef( kapp->dcopClient()->appId(), m_dcopActionProxy->actionObjectId( name ) );
}
@@ -137,16 +137,16 @@ DCOPRef KonqMainWindowIface::action( const QCString &name )
QCStringList KonqMainWindowIface::actions()
{
QCStringList res;
- QValueList<KAction *> lst = m_dcopActionProxy->actions();
- QValueList<KAction *>::ConstIterator it = lst.begin();
- QValueList<KAction *>::ConstIterator end = lst.end();
+ TQValueList<KAction *> lst = m_dcopActionProxy->actions();
+ TQValueList<KAction *>::ConstIterator it = lst.begin();
+ TQValueList<KAction *>::ConstIterator end = lst.end();
for (; it != end; ++it )
res.append( (*it)->name() );
return res;
}
-QMap<QCString,DCOPRef> KonqMainWindowIface::actionMap()
+TQMap<TQCString,DCOPRef> KonqMainWindowIface::actionMap()
{
return m_dcopActionProxy->actionMap();
}
@@ -156,7 +156,7 @@ QCStringList KonqMainWindowIface::functionsDynamic()
return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( m_pMainWindow );
}
-bool KonqMainWindowIface::processDynamic( const QCString &fun, const QByteArray &data, QCString &replyType, QByteArray &replyData )
+bool KonqMainWindowIface::processDynamic( const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData )
{
if ( KDCOPPropertyProxy::isPropertyRequest( fun, m_pMainWindow ) )
return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, m_pMainWindow );
diff --git a/konqueror/KonqMainWindowIface.h b/konqueror/KonqMainWindowIface.h
index 334307cb0..fc853e536 100644
--- a/konqueror/KonqMainWindowIface.h
+++ b/konqueror/KonqMainWindowIface.h
@@ -22,7 +22,7 @@
#define __KonqMainWindowIface_h__
#include <dcopobject.h>
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include <dcopref.h>
#include <kmainwindowiface.h>
@@ -42,13 +42,13 @@ public:
k_dcop:
- void openURL( QString url );
- void newTab( QString url );
+ void openURL( TQString url );
+ void newTab( TQString url );
- void openURL( QString url, bool tempFile );
- void newTab( QString url, bool tempFile );
+ void openURL( TQString url, bool tempFile );
+ void newTab( TQString url, bool tempFile );
- void newTabASN( QString url, const QCString& startup_id, bool tempFile );
+ void newTabASN( TQString url, const TQCString& startup_id, bool tempFile );
void splitViewHorizontally();
void splitViewVertically();
@@ -71,9 +71,9 @@ k_dcop:
DCOPRef view(int viewNumber);
DCOPRef part(int partNumber);
- DCOPRef action( const QCString &name );
+ DCOPRef action( const TQCString &name );
QCStringList actions();
- QMap<QCString,DCOPRef> actionMap();
+ TQMap<TQCString,DCOPRef> actionMap();
/**
* Used by kfmclient when searching a window to open a tab within
@@ -82,7 +82,7 @@ k_dcop:
public:
virtual QCStringList functionsDynamic();
- virtual bool processDynamic( const QCString &fun, const QByteArray &data, QCString &replyType, QByteArray &replyData );
+ virtual bool processDynamic( const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData );
private:
diff --git a/konqueror/KonqViewIface.cc b/konqueror/KonqViewIface.cc
index 0aeffda1a..8219fc861 100644
--- a/konqueror/KonqViewIface.cc
+++ b/konqueror/KonqViewIface.cc
@@ -25,7 +25,7 @@
#include <dcopclient.h>
#include <kdebug.h>
-KonqViewIface::KonqViewIface( KonqView * view, const QCString& name )
+KonqViewIface::KonqViewIface( KonqView * view, const TQCString& name )
: DCOPObject( name ), m_pView ( view )
{
}
@@ -34,14 +34,14 @@ KonqViewIface::~KonqViewIface()
{
}
-void KonqViewIface::openURL( QString url, const QString & locationBarURL, const QString & nameFilter )
+void KonqViewIface::openURL( TQString url, const TQString & locationBarURL, const TQString & nameFilter )
{
KURL u(url);
m_pView->openURL( u, locationBarURL, nameFilter );
}
-bool KonqViewIface::changeViewMode( const QString &serviceType,
- const QString &serviceName )
+bool KonqViewIface::changeViewMode( const TQString &serviceType,
+ const TQString &serviceName )
{
return m_pView->changeViewMode( serviceType, serviceName );
}
@@ -57,22 +57,22 @@ void KonqViewIface::stop()
m_pView->stop();
}
-QString KonqViewIface::url()
+TQString KonqViewIface::url()
{
return m_pView->url().url();
}
-QString KonqViewIface::locationBarURL()
+TQString KonqViewIface::locationBarURL()
{
return m_pView->locationBarURL();
}
-QString KonqViewIface::serviceType()
+TQString KonqViewIface::serviceType()
{
return m_pView->serviceType();
}
-QStringList KonqViewIface::serviceTypes()
+TQStringList KonqViewIface::serviceTypes()
{
return m_pView->serviceTypes();
}
@@ -86,9 +86,9 @@ DCOPRef KonqViewIface::part()
if ( !part )
return res;
- QVariant dcopProperty = part->property( "dcopObjectId" );
+ TQVariant dcopProperty = part->property( "dcopObjectId" );
- if ( dcopProperty.type() != QVariant::CString )
+ if ( dcopProperty.type() != TQVariant::CString )
return res;
res.setRef( kapp->dcopClient()->appId(), dcopProperty.toCString() );
diff --git a/konqueror/KonqViewIface.h b/konqueror/KonqViewIface.h
index 43630f7f5..aa79de719 100644
--- a/konqueror/KonqViewIface.h
+++ b/konqueror/KonqViewIface.h
@@ -22,7 +22,7 @@
#define __KonqViewIface_h__
#include <dcopobject.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include <dcopref.h>
class KonqView;
@@ -35,7 +35,7 @@ class KonqViewIface : virtual public DCOPObject
K_DCOP
public:
- KonqViewIface( KonqView * view, const QCString& name );
+ KonqViewIface( KonqView * view, const TQCString& name );
~KonqViewIface();
k_dcop:
@@ -44,9 +44,9 @@ k_dcop:
* Displays another URL, but without changing the view mode
* (Make sure the part can display this URL)
*/
- void openURL( QString url,
- const QString & locationBarURL,
- const QString & nameFilter );
+ void openURL( TQString url,
+ const TQString & locationBarURL,
+ const TQString & nameFilter );
/** Reload */
void reload();
@@ -57,8 +57,8 @@ k_dcop:
* @param serviceName allows to enforce a particular service to be chosen,
* @see KonqFactory.
*/
- bool changeViewMode( const QString &serviceType,
- const QString &serviceName );
+ bool changeViewMode( const TQString &serviceType,
+ const TQString &serviceName );
/**
* Call this to prevent next openURL() call from changing history lists
@@ -74,23 +74,23 @@ k_dcop:
/**
* Retrieve view's URL
*/
- QString url();
+ TQString url();
/**
* Get view's location bar URL, i.e. the one that the view signals
* It can be different from url(), for instance if we display a index.html
*/
- QString locationBarURL();
+ TQString locationBarURL();
/**
* @return the servicetype this view is currently displaying
*/
- QString serviceType();
+ TQString serviceType();
/**
* @return the servicetypes this view is capable to display
*/
- QStringList serviceTypes();
+ TQStringList serviceTypes();
/**
* @return the part embedded into this view
diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cc
index 3656512f7..ce7850967 100644
--- a/konqueror/KonquerorIface.cc
+++ b/konqueror/KonquerorIface.cc
@@ -28,7 +28,7 @@
#include <kapplication.h>
#include <dcopclient.h>
#include <kdebug.h>
-#include <qfile.h>
+#include <tqfile.h>
#include "konq_settingsxt.h"
// these DCOP calls come from outside, so any windows created by these
@@ -50,7 +50,7 @@ KonquerorIface::~KonquerorIface()
{
}
-DCOPRef KonquerorIface::openBrowserWindow( const QString &url )
+DCOPRef KonquerorIface::openBrowserWindow( const TQString &url )
{
qt_x_user_time = 0;
KonqMainWindow *res = KonqMisc::createSimpleWindow( KURL(url) );
@@ -59,24 +59,24 @@ DCOPRef KonquerorIface::openBrowserWindow( const QString &url )
return res->dcopObject();
}
-DCOPRef KonquerorIface::openBrowserWindowASN( const QString &url, const QCString& startup_id )
+DCOPRef KonquerorIface::openBrowserWindowASN( const TQString &url, const TQCString& startup_id )
{
kapp->setStartupId( startup_id );
return openBrowserWindow( url );
}
-DCOPRef KonquerorIface::createNewWindow( const QString &url )
+DCOPRef KonquerorIface::createNewWindow( const TQString &url )
{
- return createNewWindow( url, QString::null, false );
+ return createNewWindow( url, TQString::null, false );
}
-DCOPRef KonquerorIface::createNewWindowASN( const QString &url, const QCString& startup_id, bool tempFile )
+DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQCString& startup_id, bool tempFile )
{
kapp->setStartupId( startup_id );
- return createNewWindow( url, QString::null, tempFile );
+ return createNewWindow( url, TQString::null, tempFile );
}
-DCOPRef KonquerorIface::createNewWindowWithSelection( const QString &url, QStringList filesToSelect )
+DCOPRef KonquerorIface::createNewWindowWithSelection( const TQString &url, TQStringList filesToSelect )
{
qt_x_user_time = 0;
KonqMainWindow *res = KonqMisc::createNewWindow( KURL(url), KParts::URLArgs(), false, filesToSelect );
@@ -85,50 +85,50 @@ DCOPRef KonquerorIface::createNewWindowWithSelection( const QString &url, QStrin
return res->dcopObject();
}
-DCOPRef KonquerorIface::createNewWindowWithSelectionASN( const QString &url, QStringList filesToSelect, const QCString &startup_id )
+DCOPRef KonquerorIface::createNewWindowWithSelectionASN( const TQString &url, TQStringList filesToSelect, const TQCString &startup_id )
{
kapp->setStartupId( startup_id );
return createNewWindowWithSelection( url, filesToSelect );
}
-DCOPRef KonquerorIface::createNewWindow( const QString &url, const QString &mimetype, bool tempFile )
+DCOPRef KonquerorIface::createNewWindow( const TQString &url, const TQString &mimetype, bool tempFile )
{
qt_x_user_time = 0;
KParts::URLArgs args;
args.serviceType = mimetype;
// Filter the URL, so that "kfmclient openURL gg:foo" works also when konq is already running
KURL finalURL = KonqMisc::konqFilteredURL( 0, url );
- KonqMainWindow *res = KonqMisc::createNewWindow( finalURL, args, false, QStringList(), tempFile );
+ KonqMainWindow *res = KonqMisc::createNewWindow( finalURL, args, false, TQStringList(), tempFile );
if ( !res )
return DCOPRef();
return res->dcopObject();
}
-DCOPRef KonquerorIface::createNewWindowASN( const QString &url, const QString &mimetype,
- const QCString& startup_id, bool tempFile )
+DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQString &mimetype,
+ const TQCString& startup_id, bool tempFile )
{
kapp->setStartupId( startup_id );
return createNewWindow( url, mimetype, tempFile );
}
-DCOPRef KonquerorIface::createBrowserWindowFromProfile( const QString &path )
+DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString &path )
{
qt_x_user_time = 0;
- kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( const QString &path ) " << endl;
+ kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( const TQString &path ) " << endl;
kdDebug(1202) << path << endl;
- KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, QString::null );
+ KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, TQString::null );
if ( !res )
return DCOPRef();
return res->dcopObject();
}
-DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const QString &path, const QCString& startup_id )
+DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path, const TQCString& startup_id )
{
kapp->setStartupId( startup_id );
return createBrowserWindowFromProfile( path );
}
-DCOPRef KonquerorIface::createBrowserWindowFromProfile( const QString & path, const QString &filename )
+DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString & path, const TQString &filename )
{
qt_x_user_time = 0;
kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( path, filename ) " << endl;
@@ -139,14 +139,14 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfile( const QString & path, co
return res->dcopObject();
}
-DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const QString &path, const QString &filename,
- const QCString& startup_id )
+DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path, const TQString &filename,
+ const TQCString& startup_id )
{
kapp->setStartupId( startup_id );
return createBrowserWindowFromProfile( path, filename );
}
-DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const QString & path, const QString &filename, const QString &url )
+DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString & path, const TQString &filename, const TQString &url )
{
qt_x_user_time = 0;
KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url) );
@@ -155,14 +155,14 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const QString & pa
return res->dcopObject();
}
-DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const QString & path, const QString &filename, const QString &url,
- const QCString& startup_id )
+DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString & path, const TQString &filename, const TQString &url,
+ const TQCString& startup_id )
{
kapp->setStartupId( startup_id );
return createBrowserWindowFromProfileAndURL( path, filename, url );
}
-DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const QString &path, const QString &filename, const QString &url, const QString &mimetype )
+DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString &path, const TQString &filename, const TQString &url, const TQString &mimetype )
{
qt_x_user_time = 0;
KParts::URLArgs args;
@@ -173,8 +173,8 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const QString &pat
return res->dcopObject();
}
-DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const QString & path, const QString &filename, const QString &url, const QString &mimetype,
- const QCString& startup_id )
+DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString & path, const TQString &filename, const TQString &url, const TQString &mimetype,
+ const TQCString& startup_id )
{
kapp->setStartupId( startup_id );
return createBrowserWindowFromProfileAndURL( path, filename, url, mimetype );
@@ -186,10 +186,10 @@ void KonquerorIface::reparseConfiguration()
KGlobal::config()->reparseConfiguration();
KonqFMSettings::reparseConfiguration();
- QPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
+ TQPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
if ( mainWindows )
{
- QPtrListIterator<KonqMainWindow> it( *mainWindows );
+ TQPtrListIterator<KonqMainWindow> it( *mainWindows );
for (; it.current(); ++it )
it.current()->reparseConfiguration();
}
@@ -197,47 +197,47 @@ void KonquerorIface::reparseConfiguration()
void KonquerorIface::updateProfileList()
{
- QPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
+ TQPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
if ( !mainWindows )
return;
- QPtrListIterator<KonqMainWindow> it( *mainWindows );
+ TQPtrListIterator<KonqMainWindow> it( *mainWindows );
for (; it.current(); ++it )
it.current()->viewManager()->profileListDirty( false );
}
-QString KonquerorIface::crashLogFile()
+TQString KonquerorIface::crashLogFile()
{
return KonqMainWindow::s_crashlog_file->name();
}
-QValueList<DCOPRef> KonquerorIface::getWindows()
+TQValueList<DCOPRef> KonquerorIface::getWindows()
{
- QValueList<DCOPRef> lst;
- QPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
+ TQValueList<DCOPRef> lst;
+ TQPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
if ( mainWindows )
{
- QPtrListIterator<KonqMainWindow> it( *mainWindows );
+ TQPtrListIterator<KonqMainWindow> it( *mainWindows );
for (; it.current(); ++it )
lst.append( DCOPRef( kapp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
}
return lst;
}
-void KonquerorIface::addToCombo( QString url, QCString objId )
+void KonquerorIface::addToCombo( TQString url, TQCString objId )
{
KonqMainWindow::comboAction( KonqMainWindow::ComboAdd, url, objId );
}
-void KonquerorIface::removeFromCombo( QString url, QCString objId )
+void KonquerorIface::removeFromCombo( TQString url, TQCString objId )
{
KonqMainWindow::comboAction( KonqMainWindow::ComboRemove, url, objId );
}
-void KonquerorIface::comboCleared( QCString objId )
+void KonquerorIface::comboCleared( TQCString objId )
{
KonqMainWindow::comboAction( KonqMainWindow::ComboClear,
- QString::null, objId );
+ TQString::null, objId );
}
bool KonquerorIface::processCanBeReused( int screen )
@@ -246,31 +246,31 @@ bool KonquerorIface::processCanBeReused( int screen )
return false; // this instance run on different screen, and Qt apps can't migrate
if( KonqMainWindow::isPreloaded())
return false; // will be handled by preloading related code instead
- QPtrList<KonqMainWindow>* windows = KonqMainWindow::mainWindowList();
+ TQPtrList<KonqMainWindow>* windows = KonqMainWindow::mainWindowList();
if( windows == NULL )
return true;
- QStringList allowed_parts = KonqSettings::safeParts();
+ TQStringList allowed_parts = KonqSettings::safeParts();
bool all_parts_allowed = false;
- if( allowed_parts.count() == 1 && allowed_parts.first() == QString::fromLatin1( "SAFE" ))
+ if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "SAFE" ))
{
allowed_parts.clear();
// is duplicated in client/kfmclient.cc
- allowed_parts << QString::fromLatin1( "konq_iconview.desktop" )
- << QString::fromLatin1( "konq_multicolumnview.desktop" )
- << QString::fromLatin1( "konq_sidebartng.desktop" )
- << QString::fromLatin1( "konq_infolistview.desktop" )
- << QString::fromLatin1( "konq_treeview.desktop" )
- << QString::fromLatin1( "konq_detailedlistview.desktop" );
+ allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" )
+ << TQString::fromLatin1( "konq_multicolumnview.desktop" )
+ << TQString::fromLatin1( "konq_sidebartng.desktop" )
+ << TQString::fromLatin1( "konq_infolistview.desktop" )
+ << TQString::fromLatin1( "konq_treeview.desktop" )
+ << TQString::fromLatin1( "konq_detailedlistview.desktop" );
}
- else if( allowed_parts.count() == 1 && allowed_parts.first() == QString::fromLatin1( "ALL" ))
+ else if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "ALL" ))
{
allowed_parts.clear();
all_parts_allowed = true;
}
if( all_parts_allowed )
return true;
- for( QPtrListIterator<KonqMainWindow> it1( *windows );
+ for( TQPtrListIterator<KonqMainWindow> it1( *windows );
it1 != NULL;
++it1 )
{
diff --git a/konqueror/KonquerorIface.h b/konqueror/KonquerorIface.h
index ba5fd41dd..508feda85 100644
--- a/konqueror/KonquerorIface.h
+++ b/konqueror/KonquerorIface.h
@@ -22,10 +22,10 @@
#define __KonquerorIface_h__
#include <dcopobject.h>
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include <dcopref.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
/**
* DCOP interface for konqueror
*/
@@ -42,55 +42,55 @@ k_dcop:
/**
* Opens a new window for the given @p url (using createSimpleWindow, i.e. a single view)
*/
- DCOPRef openBrowserWindow( const QString &url );
+ DCOPRef openBrowserWindow( const TQString &url );
/**
* Like @ref openBrowserWindow , with setting the application startup notification ( ASN )
* property on the window.
*/
- DCOPRef openBrowserWindowASN( const QString &url, const QCString &startup_id );
+ DCOPRef openBrowserWindowASN( const TQString &url, const TQCString &startup_id );
/**
* Opens a new window for the given @p url (using createNewWindow, i.e. with an appropriate profile)
*/
- DCOPRef createNewWindow( const QString &url );
+ DCOPRef createNewWindow( const TQString &url );
/**
* Like @ref createNewWindow , with setting the application startup notification ( ASN )
* property on the window.
*/
- DCOPRef createNewWindowASN( const QString &url, const QCString &startup_id, bool tempFile );
+ DCOPRef createNewWindowASN( const TQString &url, const TQCString &startup_id, bool tempFile );
/**
* Opens a new window like @ref createNewWindow, then selects the given @p filesToSelect
*/
- DCOPRef createNewWindowWithSelection( const QString &url, QStringList filesToSelect );
+ DCOPRef createNewWindowWithSelection( const TQString &url, TQStringList filesToSelect );
/**
* Like @ref createNewWindowWithSelection, with setting the application startup notification ( ASN )
* property on the window.
*/
- DCOPRef createNewWindowWithSelectionASN( const QString &url, QStringList filesToSelect, const QCString &startup_id );
+ DCOPRef createNewWindowWithSelectionASN( const TQString &url, TQStringList filesToSelect, const TQCString &startup_id );
/**
* Opens a new window for the given @p url (using createNewWindow, i.e. with an appropriate profile)
* @param mimetype to speed it up.
*/
- DCOPRef createNewWindow( const QString &url, const QString & mimetype, bool tempFile );
+ DCOPRef createNewWindow( const TQString &url, const TQString & mimetype, bool tempFile );
/**
* Like @ref createNewWindow , with setting the application startup notification ( ASN )
* property on the window.
*/
- DCOPRef createNewWindowASN( const QString &url, const QString & mimetype,
- const QCString &startup_id, bool tempFile );
+ DCOPRef createNewWindowASN( const TQString &url, const TQString & mimetype,
+ const TQCString &startup_id, bool tempFile );
/**
* As the name says, this creates a window from a profile.
* Used for instance by khelpcenter.
*/
- DCOPRef createBrowserWindowFromProfile( const QString &path );
+ DCOPRef createBrowserWindowFromProfile( const TQString &path );
/**
* Like @ref createBrowserWindowFromProfile , with setting the application startup
* notification ( ASN ) property on the window.
*/
- DCOPRef createBrowserWindowFromProfileASN( const QString &path, const QCString &startup_id );
+ DCOPRef createBrowserWindowFromProfileASN( const TQString &path, const TQCString &startup_id );
/**
* As the name says, this creates a window from a profile.
@@ -98,13 +98,13 @@ k_dcop:
* @param path full path to the profile file
* @param filename name of the profile file, if under the profiles dir
*/
- DCOPRef createBrowserWindowFromProfile( const QString &path, const QString &filename );
+ DCOPRef createBrowserWindowFromProfile( const TQString &path, const TQString &filename );
/**
* Like @ref createBrowserWindowFromProfile , with setting the application startup
* notification ( ASN ) property on the window.
*/
- DCOPRef createBrowserWindowFromProfileASN( const QString &path, const QString &filename,
- const QCString &startup_id );
+ DCOPRef createBrowserWindowFromProfileASN( const TQString &path, const TQString &filename,
+ const TQCString &startup_id );
/**
* Creates a window from a profile and a URL.
@@ -114,13 +114,13 @@ k_dcop:
* @param filename name of the profile file, if under the profiles dir
* @param url the URL to open
*/
- DCOPRef createBrowserWindowFromProfileAndURL( const QString &path, const QString &filename, const QString &url );
+ DCOPRef createBrowserWindowFromProfileAndURL( const TQString &path, const TQString &filename, const TQString &url );
/**
* Like @ref createBrowserWindowFromProfileAndURL , with setting the application startup
* notification ( ASN ) property on the window.
*/
- DCOPRef createBrowserWindowFromProfileAndURLASN( const QString &path, const QString &filename, const QString &url,
- const QCString &startup_id );
+ DCOPRef createBrowserWindowFromProfileAndURLASN( const TQString &path, const TQString &filename, const TQString &url,
+ const TQCString &startup_id );
/**
* Creates a window the fastest way : the caller has to provide
@@ -130,13 +130,13 @@ k_dcop:
* @param url the URL to open
* @param mimetype the mimetype that the URL we want to open has
*/
- DCOPRef createBrowserWindowFromProfileAndURL( const QString &path, const QString &filename, const QString &url, const QString &mimetype );
+ DCOPRef createBrowserWindowFromProfileAndURL( const TQString &path, const TQString &filename, const TQString &url, const TQString &mimetype );
/**
* Like @ref createBrowserWindowFromProfileAndURL , with setting the application startup
* notification ( ASN ) property on the window.
*/
- DCOPRef createBrowserWindowFromProfileAndURLASN( const QString &path, const QString &filename, const QString &url, const QString &mimetype,
- const QCString& startup_id );
+ DCOPRef createBrowserWindowFromProfileAndURLASN( const TQString &path, const TQString &filename, const TQString &url, const TQString &mimetype,
+ const TQCString& startup_id );
/**
* Called by kcontrol when the global configuration changes
@@ -146,12 +146,12 @@ k_dcop:
/**
* @return the name of the instance's crash log file
*/
- QString crashLogFile();
+ TQString crashLogFile();
/**
* @return a list of references to all the windows
*/
- QValueList<DCOPRef> getWindows();
+ TQValueList<DCOPRef> getWindows();
/**
* Called internally as broadcast when the user adds/removes/renames a view profile
@@ -161,17 +161,17 @@ k_dcop:
/**
* Called internally as broadcast when a URL is to be added to the combobox.
*/
- ASYNC addToCombo( QString, QCString );
+ ASYNC addToCombo( TQString, TQCString );
/**
* Called internall as broadcast when a URL has to be removed from the combo.
*/
- ASYNC removeFromCombo( QString, QCString );
+ ASYNC removeFromCombo( TQString, TQCString );
/**
* Called internally as a broadcast when the combobox was cleared.
*/
- ASYNC comboCleared( QCString );
+ ASYNC comboCleared( TQCString );
/**
* Used by kfmclient when the 'minimize memory usage' setting is set
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index 8a5385697..c9c83fd4f 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -1,6 +1,6 @@
#include "konq_aboutpage.h"
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
#include <kaboutdata.h>
#include <kapplication.h>
@@ -16,19 +16,19 @@
#include <kconfig.h>
#include <assert.h>
-#include <qfile.h>
-#include <qdir.h>
+#include <tqfile.h>
+#include <tqdir.h>
K_EXPORT_COMPONENT_FACTORY( konq_aboutpage, KonqAboutPageFactory )
KInstance *KonqAboutPageFactory::s_instance = 0;
-QString *KonqAboutPageFactory::s_launch_html = 0;
-QString *KonqAboutPageFactory::s_intro_html = 0;
-QString *KonqAboutPageFactory::s_specs_html = 0;
-QString *KonqAboutPageFactory::s_tips_html = 0;
-QString *KonqAboutPageFactory::s_plugins_html = 0;
+TQString *KonqAboutPageFactory::s_launch_html = 0;
+TQString *KonqAboutPageFactory::s_intro_html = 0;
+TQString *KonqAboutPageFactory::s_specs_html = 0;
+TQString *KonqAboutPageFactory::s_tips_html = 0;
+TQString *KonqAboutPageFactory::s_plugins_html = 0;
-KonqAboutPageFactory::KonqAboutPageFactory( QObject *parent, const char *name )
+KonqAboutPageFactory::KonqAboutPageFactory( TQObject *parent, const char *name )
: KParts::Factory( parent, name )
{
s_instance = new KInstance( "konqaboutpage" );
@@ -50,9 +50,9 @@ KonqAboutPageFactory::~KonqAboutPageFactory()
s_plugins_html = 0;
}
-KParts::Part *KonqAboutPageFactory::createPartObject( QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name,
- const char *, const QStringList & )
+KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name,
+ const char *, const TQStringList & )
{
//KonqFrame *frame = dynamic_cast<KonqFrame *>( parentWidget );
//if ( !frame ) return 0;
@@ -61,32 +61,32 @@ KParts::Part *KonqAboutPageFactory::createPartObject( QWidget *parentWidget, con
parentWidget, widgetName, parent, name );
}
-QString KonqAboutPageFactory::loadFile( const QString& file )
+TQString KonqAboutPageFactory::loadFile( const TQString& file )
{
- QString res;
+ TQString res;
if ( file.isEmpty() )
return res;
- QFile f( file );
+ TQFile f( file );
if ( !f.open( IO_ReadOnly ) )
return res;
- QTextStream t( &f );
+ TQTextStream t( &f );
res = t.read();
// otherwise all embedded objects are referenced as about:/...
- QString basehref = QString::fromLatin1("<BASE HREF=\"file:") +
+ TQString basehref = TQString::fromLatin1("<BASE HREF=\"file:") +
file.left( file.findRev( '/' )) +
- QString::fromLatin1("/\">\n");
- QRegExp reg("<head>");
+ TQString::fromLatin1("/\">\n");
+ TQRegExp reg("<head>");
reg.setCaseSensitive(FALSE);
res.replace(reg, "<head>\n\t" + basehref);
return res;
}
-QString KonqAboutPageFactory::launch()
+TQString KonqAboutPageFactory::launch()
{
// FIXME: only regenerate launch page if kuriikwsfilterrc changed.
/*
@@ -94,21 +94,21 @@ QString KonqAboutPageFactory::launch()
return *s_launch_html;
*/
- QString res = loadFile( locate( "data", "konqueror/about/launch.html" ));
+ TQString res = loadFile( locate( "data", "konqueror/about/launch.html" ));
if ( res.isEmpty() )
return res;
KIconLoader *iconloader = KGlobal::iconLoader();
int iconSize = iconloader->currentSize(KIcon::Desktop);
- QString home_icon_path = iconloader->iconPath("kfm_home", KIcon::Desktop );
- QString storage_icon_path = iconloader->iconPath("system", KIcon::Desktop );
- QString remote_icon_path = iconloader->iconPath("network", KIcon::Desktop );
- QString wastebin_icon_path = iconloader->iconPath("trashcan_full", KIcon::Desktop );
- QString applications_icon_path = iconloader->iconPath("kmenu", KIcon::Desktop );
- QString settings_icon_path = iconloader->iconPath("kcontrol", KIcon::Desktop );
- QString help_icon_path = iconloader->iconPath("khelpcenter", KIcon::Desktop );
- QString home_folder = QDir::homeDirPath();
- QString continue_icon_path = QApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
+ TQString home_icon_path = iconloader->iconPath("kfm_home", KIcon::Desktop );
+ TQString storage_icon_path = iconloader->iconPath("system", KIcon::Desktop );
+ TQString remote_icon_path = iconloader->iconPath("network", KIcon::Desktop );
+ TQString wastebin_icon_path = iconloader->iconPath("trashcan_full", KIcon::Desktop );
+ TQString applications_icon_path = iconloader->iconPath("kmenu", KIcon::Desktop );
+ TQString settings_icon_path = iconloader->iconPath("kcontrol", KIcon::Desktop );
+ TQString help_icon_path = iconloader->iconPath("khelpcenter", KIcon::Desktop );
+ TQString home_folder = TQDir::homeDirPath();
+ TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
@@ -117,15 +117,15 @@ QString KonqAboutPageFactory::launch()
res = res.arg( "" );
// Try to split page in three. If it succeeds, insert the default search into the middle part.
- QStringList parts = QStringList::split( "<!--search bar splitter-->", res );
+ TQStringList parts = TQStringList::split( "<!--search bar splitter-->", res );
if ( parts.count() == 3 ) {
KConfig config( "kuriikwsfilterrc", true /*read-only*/, false /*no KDE globals*/ );
config.setGroup( "General" );
- QString name = config.readEntry("DefaultSearchEngine");
+ TQString name = config.readEntry("DefaultSearchEngine");
KService::Ptr service =
- KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(name));
+ KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(name));
if ( service ) {
- QString searchBar = parts[1];
+ TQString searchBar = parts[1];
searchBar = searchBar
.arg( iconSize ).arg( iconSize )
.arg( service->name() )
@@ -176,24 +176,24 @@ QString KonqAboutPageFactory::launch()
;
i18n("Search the Web");//i18n for possible future use
- s_launch_html = new QString( res );
+ s_launch_html = new TQString( res );
return res;
}
-QString KonqAboutPageFactory::intro()
+TQString KonqAboutPageFactory::intro()
{
if ( s_intro_html )
return *s_intro_html;
- QString res = loadFile( locate( "data", "konqueror/about/intro.html" ));
+ TQString res = loadFile( locate( "data", "konqueror/about/intro.html" ));
if ( res.isEmpty() )
return res;
KIconLoader *iconloader = KGlobal::iconLoader();
- QString back_icon_path = QApplication::reverseLayout()?iconloader->iconPath("forward", KIcon::Small ):iconloader->iconPath("back", KIcon::Small );
- QString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small );
- QString continue_icon_path = QApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
+ TQString back_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("forward", KIcon::Small ):iconloader->iconPath("back", KIcon::Small );
+ TQString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small );
+ TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
@@ -234,19 +234,19 @@ QString KonqAboutPageFactory::intro()
;
- s_intro_html = new QString( res );
+ s_intro_html = new TQString( res );
return res;
}
-QString KonqAboutPageFactory::specs()
+TQString KonqAboutPageFactory::specs()
{
if ( s_specs_html )
return *s_specs_html;
KIconLoader *iconloader = KGlobal::iconLoader();
- QString res = loadFile( locate( "data", "konqueror/about/specs.html" ));
- QString continue_icon_path = QApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
+ TQString res = loadFile( locate( "data", "konqueror/about/specs.html" ));
+ TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
if ( res.isEmpty() )
return res;
@@ -316,36 +316,36 @@ QString KonqAboutPageFactory::specs()
;
- s_specs_html = new QString( res );
+ s_specs_html = new TQString( res );
return res;
}
-QString KonqAboutPageFactory::tips()
+TQString KonqAboutPageFactory::tips()
{
if ( s_tips_html )
return *s_tips_html;
- QString res = loadFile( locate( "data", "konqueror/about/tips.html" ));
+ TQString res = loadFile( locate( "data", "konqueror/about/tips.html" ));
if ( res.isEmpty() )
return res;
KIconLoader *iconloader = KGlobal::iconLoader();
- QString viewmag_icon_path =
+ TQString viewmag_icon_path =
iconloader->iconPath("viewmag", KIcon::Small );
- QString history_icon_path =
+ TQString history_icon_path =
iconloader->iconPath("history", KIcon::Small );
- QString openterm_icon_path =
+ TQString openterm_icon_path =
iconloader->iconPath("openterm", KIcon::Small );
- QString locationbar_erase_rtl_icon_path =
+ TQString locationbar_erase_rtl_icon_path =
iconloader->iconPath("clear_left", KIcon::Small );
- QString locationbar_erase_icon_path =
+ TQString locationbar_erase_icon_path =
iconloader->iconPath("locationbar_erase", KIcon::Small );
- QString window_fullscreen_icon_path =
+ TQString window_fullscreen_icon_path =
iconloader->iconPath("window_fullscreen", KIcon::Small );
- QString view_left_right_icon_path =
+ TQString view_left_right_icon_path =
iconloader->iconPath("view_left_right", KIcon::Small );
- QString continue_icon_path = QApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
+ TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
@@ -372,7 +372,7 @@ QString KonqAboutPageFactory::tips()
.arg( i18n( "When you want to paste a new address into the Location toolbar you might want to "
"clear the current entry by pressing the black arrow with the white cross "
"<img width='16' height='16' src=\"%1\"> in the toolbar.")
- .arg(QApplication::reverseLayout() ? locationbar_erase_rtl_icon_path : locationbar_erase_icon_path))
+ .arg(TQApplication::reverseLayout() ? locationbar_erase_rtl_icon_path : locationbar_erase_icon_path))
.arg( i18n( "To create a link on your desktop pointing to the current page, "
"simply drag the \"Location\" label that is to the left of the Location toolbar, drop it on to "
"the desktop, and choose \"Link\"." ) )
@@ -401,18 +401,18 @@ QString KonqAboutPageFactory::tips()
;
- s_tips_html = new QString( res );
+ s_tips_html = new TQString( res );
return res;
}
-QString KonqAboutPageFactory::plugins()
+TQString KonqAboutPageFactory::plugins()
{
if ( s_plugins_html )
return *s_plugins_html;
- QString res = loadFile( locate( "data", kapp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" ))
+ TQString res = loadFile( locate( "data", kapp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" ))
.arg(i18n("Installed Plugins"))
.arg(i18n("<td>Plugin</td><td>Description</td><td>File</td><td>Types</td>"))
.arg(i18n("Installed"))
@@ -420,19 +420,19 @@ QString KonqAboutPageFactory::plugins()
if ( res.isEmpty() )
return res;
- s_plugins_html = new QString( res );
+ s_plugins_html = new TQString( res );
return res;
}
KonqAboutPage::KonqAboutPage( //KonqMainWindow *
- QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name )
+ TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name )
: KHTMLPart( parentWidget, widgetName, parent, name, BrowserViewGUI )
{
//m_mainWindow = mainWindow;
- QTextCodec* codec = KGlobal::locale()->codecForEncoding();
+ TQTextCodec* codec = KGlobal::locale()->codecForEncoding();
if (codec)
setCharset(codec->name(), true);
else
@@ -453,9 +453,9 @@ bool KonqAboutPage::openURL( const KURL &u )
if ( u.url() == "about:plugins" )
serve( KonqAboutPageFactory::plugins(), "plugins" );
else if ( !u.query().isEmpty() ) {
- QMap< QString, QString > queryItems = u.queryItems( 0 );
- QMap< QString, QString >::ConstIterator query = queryItems.begin();
- QString newUrl;
+ TQMap< TQString, TQString > queryItems = u.queryItems( 0 );
+ TQMap< TQString, TQString >::ConstIterator query = queryItems.begin();
+ TQString newUrl;
if (query.key() == "strigi") {
newUrl = KURIFilter::self()->filteredURI( query.key() + ":?q=" + query.data() );
} else {
@@ -473,66 +473,66 @@ bool KonqAboutPage::openFile()
return true;
}
-void KonqAboutPage::saveState( QDataStream &stream )
+void KonqAboutPage::saveState( TQDataStream &stream )
{
stream << m_htmlDoc;
stream << m_what;
}
-void KonqAboutPage::restoreState( QDataStream &stream )
+void KonqAboutPage::restoreState( TQDataStream &stream )
{
stream >> m_htmlDoc;
stream >> m_what;
serve( m_htmlDoc, m_what );
}
-void KonqAboutPage::serve( const QString& html, const QString& what )
+void KonqAboutPage::serve( const TQString& html, const TQString& what )
{
m_what = what;
- begin( KURL( QString("about:%1").arg(what) ) );
+ begin( KURL( TQString("about:%1").arg(what) ) );
write( html );
end();
m_htmlDoc = html;
}
-void KonqAboutPage::urlSelected( const QString &url, int button, int state, const QString &target, KParts::URLArgs _args )
+void KonqAboutPage::urlSelected( const TQString &url, int button, int state, const TQString &target, KParts::URLArgs _args )
{
KURL u( url );
if ( u.protocol() == "exec" )
{
- QStringList args = QStringList::split( QChar( ' ' ), url.mid( 6 ) );
- QString executable = args[ 0 ];
+ TQStringList args = TQStringList::split( TQChar( ' ' ), url.mid( 6 ) );
+ TQString executable = args[ 0 ];
args.remove( args.begin() );
KApplication::kdeinitExec( executable, args );
return;
}
- if ( url == QString::fromLatin1("launch.html") )
+ if ( url == TQString::fromLatin1("launch.html") )
{
emit browserExtension()->openURLNotify();
serve( KonqAboutPageFactory::launch(), "konqueror" );
return;
}
- else if ( url == QString::fromLatin1("intro.html") )
+ else if ( url == TQString::fromLatin1("intro.html") )
{
emit browserExtension()->openURLNotify();
serve( KonqAboutPageFactory::intro(), "konqueror" );
return;
}
- else if ( url == QString::fromLatin1("specs.html") )
+ else if ( url == TQString::fromLatin1("specs.html") )
{
emit browserExtension()->openURLNotify();
serve( KonqAboutPageFactory::specs(), "konqueror" );
return;
}
- else if ( url == QString::fromLatin1("tips.html") )
+ else if ( url == TQString::fromLatin1("tips.html") )
{
emit browserExtension()->openURLNotify();
serve( KonqAboutPageFactory::tips(), "konqueror" );
return;
}
- else if ( url == QString::fromLatin1("config:/disable_overview") )
+ else if ( url == TQString::fromLatin1("config:/disable_overview") )
{
if ( KMessageBox::questionYesNo( widget(),
i18n("Do you want to disable showing "
@@ -540,10 +540,10 @@ void KonqAboutPage::urlSelected( const QString &url, int button, int state, cons
i18n("Faster Startup?"),i18n("Disable"),i18n("Keep") )
== KMessageBox::Yes )
{
- QString profile = locateLocal("data", "konqueror/profiles/webbrowsing");
+ TQString profile = locateLocal("data", "konqueror/profiles/webbrowsing");
KSaveFile file( profile );
if ( file.status() == 0 ) {
- QCString content = "[Profile]\n"
+ TQCString content = "[Profile]\n"
"Name=Web-Browser";
fputs( content.data(), file.fstream() );
file.close();
diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h
index 9ec77b5d5..c72a85250 100644
--- a/konqueror/about/konq_aboutpage.h
+++ b/konqueror/about/konq_aboutpage.h
@@ -10,26 +10,26 @@ class KInstance;
class KonqAboutPageFactory : public KParts::Factory
{
public:
- KonqAboutPageFactory( QObject *parent = 0, const char *name = 0 );
+ KonqAboutPageFactory( TQObject *parent = 0, const char *name = 0 );
virtual ~KonqAboutPageFactory();
- virtual KParts::Part *createPartObject( QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name,
- const char *classname, const QStringList &args );
+ virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name,
+ const char *classname, const TQStringList &args );
static KInstance *instance() { return s_instance; }
- static QString launch();
- static QString intro();
- static QString specs();
- static QString tips();
- static QString plugins();
+ static TQString launch();
+ static TQString intro();
+ static TQString specs();
+ static TQString tips();
+ static TQString plugins();
private:
- static QString loadFile( const QString& file );
+ static TQString loadFile( const TQString& file );
static KInstance *s_instance;
- static QString *s_launch_html, *s_intro_html, *s_specs_html, *s_tips_html, *s_plugins_html;
+ static TQString *s_launch_html, *s_intro_html, *s_specs_html, *s_tips_html, *s_plugins_html;
};
class KonqAboutPage : public KHTMLPart
@@ -37,27 +37,27 @@ class KonqAboutPage : public KHTMLPart
Q_OBJECT
public:
KonqAboutPage( /*KonqMainWindow *mainWindow,*/
- QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name );
+ TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name );
~KonqAboutPage();
virtual bool openURL( const KURL &url );
virtual bool openFile();
- virtual void saveState( QDataStream &stream );
- virtual void restoreState( QDataStream &stream );
+ virtual void saveState( TQDataStream &stream );
+ virtual void restoreState( TQDataStream &stream );
protected:
- virtual void urlSelected( const QString &url, int button, int state, const QString &target, KParts::URLArgs args = KParts::URLArgs() );
+ virtual void urlSelected( const TQString &url, int button, int state, const TQString &target, KParts::URLArgs args = KParts::URLArgs() );
private:
- void serve( const QString&, const QString& );
+ void serve( const TQString&, const TQString& );
KHTMLPart *m_doc;
//KonqMainWindow *m_mainWindow;
- QString m_htmlDoc;
- QString m_what;
+ TQString m_htmlDoc;
+ TQString m_what;
};
#endif
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index f60c48dbe..5df26bb68 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -23,7 +23,7 @@
#include <signal.h>
#include <unistd.h>
-#include <qdir.h>
+#include <tqdir.h>
#include <kio/job.h>
#include <kcmdlineargs.h>
@@ -39,7 +39,7 @@
#include <kdebug.h>
#include <dcopclient.h>
#include <kservice.h>
-#include <qregexp.h>
+#include <tqregexp.h>
#include "kfmclient.h"
#include "KonquerorIface_stub.h"
@@ -55,7 +55,7 @@ static const char description[] = I18N_NOOP("KDE tool for opening URLs from the
static const char version[] = "2.0";
-QCString clientApp::startup_id_str;
+TQCString clientApp::startup_id_str;
bool clientApp::m_ok = true;
bool s_interactive = true;
@@ -174,58 +174,58 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
will be done (oh well), if there's no URL, no reusing will be done either (also
because the webbrowsing profile doesn't have any URL listed).
*/
-static bool startNewKonqueror( QString url, QString mimetype, const QString& profile )
+static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& profile )
{
- KConfig cfg( QString::fromLatin1( "konquerorrc" ), true );
+ KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
cfg.setGroup( "Reusing" );
- QStringList allowed_parts;
+ TQStringList allowed_parts;
// is duplicated in ../KonquerorIface.cc
- allowed_parts << QString::fromLatin1( "konq_iconview.desktop" )
- << QString::fromLatin1( "konq_multicolumnview.desktop" )
- << QString::fromLatin1( "konq_sidebartng.desktop" )
- << QString::fromLatin1( "konq_infolistview.desktop" )
- << QString::fromLatin1( "konq_treeview.desktop" )
- << QString::fromLatin1( "konq_detailedlistview.desktop" );
+ allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" )
+ << TQString::fromLatin1( "konq_multicolumnview.desktop" )
+ << TQString::fromLatin1( "konq_sidebartng.desktop" )
+ << TQString::fromLatin1( "konq_infolistview.desktop" )
+ << TQString::fromLatin1( "konq_treeview.desktop" )
+ << TQString::fromLatin1( "konq_detailedlistview.desktop" );
if( cfg.hasKey( "SafeParts" )
- && cfg.readEntry( "SafeParts" ) != QString::fromLatin1( "SAFE" ))
+ && cfg.readEntry( "SafeParts" ) != TQString::fromLatin1( "SAFE" ))
allowed_parts = cfg.readListEntry( "SafeParts" );
- if( allowed_parts.count() == 1 && allowed_parts.first() == QString::fromLatin1( "ALL" ))
+ if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "ALL" ))
return false; // all parts allowed
if( url.isEmpty())
{
if( profile.isEmpty())
return true;
- QString profilepath = locate( "data", QString::fromLatin1("konqueror/profiles/") + profile );
+ TQString profilepath = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profile );
if( profilepath.isEmpty())
return true;
KConfig cfg( profilepath, true );
cfg.setDollarExpansion( true );
cfg.setGroup( "Profile" );
- QMap< QString, QString > entries = cfg.entryMap( QString::fromLatin1( "Profile" ));
- QRegExp urlregexp( QString::fromLatin1( "^View[0-9]*_URL$" ));
- QStringList urls;
- for( QMap< QString, QString >::ConstIterator it = entries.begin();
+ TQMap< TQString, TQString > entries = cfg.entryMap( TQString::fromLatin1( "Profile" ));
+ TQRegExp urlregexp( TQString::fromLatin1( "^View[0-9]*_URL$" ));
+ TQStringList urls;
+ for( TQMap< TQString, TQString >::ConstIterator it = entries.begin();
it != entries.end();
++it )
{
// don't read value from map, dollar expansion is needed
- QString value = cfg.readEntry( it.key());
+ TQString value = cfg.readEntry( it.key());
if( urlregexp.search( it.key()) >= 0 && !value.isEmpty())
urls << value;
}
if( urls.count() != 1 )
return true;
url = urls.first();
- mimetype = QString::fromLatin1( "" );
+ mimetype = TQString::fromLatin1( "" );
}
if( mimetype.isEmpty())
mimetype = KMimeType::findByURL( KURL( url ) )->name();
- KTrader::OfferList offers = KTrader::self()->query( mimetype, QString::fromLatin1( "KParts/ReadOnlyPart" ),
- QString::null, QString::null );
+ KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::fromLatin1( "KParts/ReadOnlyPart" ),
+ TQString::null, TQString::null );
KService::Ptr serv;
if( offers.count() > 0 )
serv = offers.first();
- return serv == NULL || !allowed_parts.contains( serv->desktopEntryName() + QString::fromLatin1(".desktop") );
+ return serv == NULL || !allowed_parts.contains( serv->desktopEntryName() + TQString::fromLatin1(".desktop") );
}
static int currentScreen()
@@ -244,30 +244,30 @@ static int currentScreen()
}
// when reusing a preloaded konqy, make sure your always use a DCOP call which opens a profile !
-static QCString getPreloadedKonqy()
+static TQCString getPreloadedKonqy()
{
- KConfig cfg( QString::fromLatin1( "konquerorrc" ), true );
+ KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
cfg.setGroup( "Reusing" );
if( cfg.readNumEntry( "MaxPreloadCount", 1 ) == 0 )
return "";
DCOPRef ref( "kded", "konqy_preloader" );
- QCString ret;
+ TQCString ret;
if( ref.callExt( "getPreloadedKonqy", DCOPRef::NoEventLoop, 3000, currentScreen()).get( ret ))
return ret;
- return QCString();
+ return TQCString();
}
-static QCString konqyToReuse( const QString& url, const QString& mimetype, const QString& profile )
+static TQCString konqyToReuse( const TQString& url, const TQString& mimetype, const TQString& profile )
{ // prefer(?) preloaded ones
- QCString ret = getPreloadedKonqy();
+ TQCString ret = getPreloadedKonqy();
if( !ret.isEmpty())
return ret;
if( startNewKonqueror( url, mimetype, profile ))
return "";
- QCString appObj;
- QByteArray data;
- QDataStream str( data, IO_WriteOnly );
+ TQCString appObj;
+ TQByteArray data;
+ TQDataStream str( data, IO_WriteOnly );
str << currentScreen();
if( !KApplication::dcopClient()->findObject( "konqueror*", "KonquerorIface",
"processCanBeReused( int )", data, ret, appObj, false, 3000 ) )
@@ -285,7 +285,7 @@ void clientApp::sendASNChange()
data.addPid( 0 ); // say there's another process for this ASN with unknown PID
data.setHostname(); // ( no need to bother to get this konqy's PID )
Display* dpy = qt_xdisplay();
- if( dpy == NULL ) // we may be running without QApplication here
+ if( dpy == NULL ) // we may be running without TQApplication here
dpy = XOpenDisplay( NULL );
if( dpy != NULL )
KStartupInfo::sendChangeX( dpy, id, data );
@@ -293,15 +293,15 @@ void clientApp::sendASNChange()
XCloseDisplay( dpy );
}
-bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, const QString & mimetype)
+bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, const TQString & mimetype)
{
kdDebug( 1202 ) << "clientApp::createNewWindow " << url.url() << " mimetype=" << mimetype << endl;
// check if user wants to use external browser
// ###### this option seems to have no GUI and to be redundant with BrowserApplication now.
// ###### KDE4: remove
- KConfig config( QString::fromLatin1("kfmclientrc"));
- config.setGroup( QString::fromLatin1("Settings"));
- QString strBrowser = config.readPathEntry("ExternalBrowser");
+ KConfig config( TQString::fromLatin1("kfmclientrc"));
+ config.setGroup( TQString::fromLatin1("Settings"));
+ TQString strBrowser = config.readPathEntry("ExternalBrowser");
if (!strBrowser.isEmpty())
{
if ( tempFile )
@@ -312,7 +312,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
return true;
}
- if (url.protocol().startsWith(QString::fromLatin1("http")))
+ if (url.protocol().startsWith(TQString::fromLatin1("http")))
{
config.setGroup("General");
if (!config.readEntry("BrowserApplication").isEmpty())
@@ -321,20 +321,20 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
KStartupInfo::appStarted();
KRun * run = new KRun( url, 0, 0, false, false /* no progress window */ ); // TODO pass tempFile [needs support in the KRun ctor]
- QObject::connect( run, SIGNAL( finished() ), &app, SLOT( delayedQuit() ));
- QObject::connect( run, SIGNAL( error() ), &app, SLOT( delayedQuit() ));
+ TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() ));
+ TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() ));
app.exec();
return !krun_has_error;
}
}
- KConfig cfg( QString::fromLatin1( "konquerorrc" ), true );
+ KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
cfg.setGroup( "FMSettings" );
if ( newTab || cfg.readBoolEntry( "KonquerorTabforExternalURL", false ) )
{
- QCString foundApp, foundObj;
- QByteArray data;
- QDataStream str( data, IO_WriteOnly );
+ TQCString foundApp, foundObj;
+ TQByteArray data;
+ TQDataStream str( data, IO_WriteOnly );
if( KApplication::dcopClient()->findObject( "konqueror*", "konqueror-mainwindow*",
"windowCanBeUsedForTab()", data, foundApp, foundObj, false, 3000 ) )
{
@@ -347,7 +347,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
}
}
- QCString appId = konqyToReuse( url.url(), mimetype, QString::null );
+ TQCString appId = konqyToReuse( url.url(), mimetype, TQString::null );
if( !appId.isEmpty())
{
kdDebug( 1202 ) << "clientApp::createNewWindow using existing konqueror" << endl;
@@ -357,9 +357,9 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
}
else
{
- QString error;
+ TQString error;
/* Well, we can't pass a mimetype through startServiceByDesktopPath !
- if ( KApplication::startServiceByDesktopPath( QString::fromLatin1("konqueror.desktop"),
+ if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
url.url(), &error ) > 0 )
{
kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
@@ -383,14 +383,14 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
return true;
}
-bool clientApp::openProfile( const QString & profileName, const QString & url, const QString & mimetype )
+bool clientApp::openProfile( const TQString & profileName, const TQString & url, const TQString & mimetype )
{
- QCString appId = konqyToReuse( url, mimetype, profileName );
+ TQCString appId = konqyToReuse( url, mimetype, profileName );
if( appId.isEmpty())
{
- QString error;
- if ( KApplication::startServiceByDesktopPath( QString::fromLatin1("konqueror.desktop"),
- QString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 )
+ TQString error;
+ if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
+ TQString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 )
{
kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
return false;
@@ -399,7 +399,7 @@ bool clientApp::openProfile( const QString & profileName, const QString & url, c
// so when we arrive here, konq is up and running already, and appId contains the identification
}
- QString profile = locate( "data", QString::fromLatin1("konqueror/profiles/") + profileName );
+ TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName );
if ( profile.isEmpty() )
{
fprintf( stderr, "%s", i18n("Profile %1 not found\n").arg(profileName).local8Bit().data() );
@@ -421,7 +421,7 @@ void clientApp::delayedQuit()
{
// Quit in 2 seconds. This leaves time for KRun to pop up
// "app not found" in KProcessRunner, if that was the case.
- QTimer::singleShot( 2000, this, SLOT(deref()) );
+ TQTimer::singleShot( 2000, this, TQT_SLOT(deref()) );
// don't access the KRun instance later, it will be deleted after calling slots
if( static_cast< const KRun* >( sender())->hasError())
krun_has_error = true;
@@ -450,7 +450,7 @@ bool clientApp::doIt()
if ( !args->isSet( "ninteractive" ) ) {
s_interactive = false;
}
- QCString command = args->arg(0);
+ TQCString command = args->arg(0);
// read ASN env. variable for non-KApp cases
startup_id_str = KStartupInfo::currentStartupIdEnv().id();
@@ -468,7 +468,7 @@ bool clientApp::doIt()
if ( argc == 1 )
{
KURL url;
- url.setPath(QDir::homeDirPath());
+ url.setPath(TQDir::homeDirPath());
return createNewWindow( url, command == "newTab", tempFile );
}
if ( argc == 2 )
@@ -477,7 +477,7 @@ bool clientApp::doIt()
}
if ( argc == 3 )
{
- return createNewWindow( args->url(1), command == "newTab", tempFile, QString::fromLatin1(args->arg(2)) );
+ return createNewWindow( args->url(1), command == "newTab", tempFile, TQString::fromLatin1(args->arg(2)) );
}
}
else if ( command == "openProfile" )
@@ -489,10 +489,10 @@ bool clientApp::doIt()
KApplication::dcopClient()->attach();
}
checkArgumentCount(argc, 2, 3);
- QString url;
+ TQString url;
if ( argc == 3 )
url = args->url(2).url();
- return openProfile( QString::fromLocal8Bit(args->arg(1)), url );
+ return openProfile( TQString::fromLocal8Bit(args->arg(1)), url );
}
// the following commands need KApplication
@@ -502,8 +502,8 @@ bool clientApp::doIt()
{
checkArgumentCount(argc, 2, 2);
KPropertiesDialog * p = new KPropertiesDialog( args->url(1) );
- QObject::connect( p, SIGNAL( destroyed() ), &app, SLOT( quit() ));
- QObject::connect( p, SIGNAL( canceled() ), &app, SLOT( slotDialogCanceled() ));
+ TQObject::connect( p, TQT_SIGNAL( destroyed() ), &app, TQT_SLOT( quit() ));
+ TQObject::connect( p, TQT_SIGNAL( canceled() ), &app, TQT_SLOT( slotDialogCanceled() ));
app.exec();
return m_ok;
}
@@ -518,8 +518,8 @@ bool clientApp::doIt()
else if ( argc == 2 )
{
KRun * run = new KRun( args->url(1), 0, 0, false, false /* no progress window */ );
- QObject::connect( run, SIGNAL( finished() ), &app, SLOT( delayedQuit() ));
- QObject::connect( run, SIGNAL( error() ), &app, SLOT( delayedQuit() ));
+ TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() ));
+ TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() ));
app.exec();
return !krun_has_error;
}
@@ -527,7 +527,7 @@ bool clientApp::doIt()
{
KURL::List urls;
urls.append( args->url(1) );
- const KTrader::OfferList offers = KTrader::self()->query( QString::fromLocal8Bit( args->arg( 2 ) ), QString::fromLatin1( "Application" ), QString::null, QString::null );
+ const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null );
if (offers.isEmpty()) return 1;
KService::Ptr serv = offers.first();
return KRun::run( *serv, urls );
@@ -543,7 +543,7 @@ bool clientApp::doIt()
KIO::Job * job = KIO::move( srcLst, args->url(argc - 1) );
if ( !s_interactive )
job->setInteractive( false );
- connect( job, SIGNAL( result( KIO::Job * ) ), &app, SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ), &app, TQT_SLOT( slotResult( KIO::Job * ) ) );
app.exec();
return m_ok;
}
@@ -569,8 +569,8 @@ bool clientApp::doIt()
}
if (srcLst.count() == 0)
return m_ok;
- QString dst =
- KFileDialog::getSaveFileName( (argc<2) ? (QString::null) : (args->url(1).filename()) );
+ TQString dst =
+ KFileDialog::getSaveFileName( (argc<2) ? (TQString::null) : (args->url(1).filename()) );
if (dst.isEmpty()) // cancelled
return m_ok; // AK - really okay?
KURL dsturl;
@@ -578,7 +578,7 @@ bool clientApp::doIt()
KIO::Job * job = KIO::copy( srcLst, dsturl );
if ( !s_interactive )
job->setInteractive( false );
- connect( job, SIGNAL( result( KIO::Job * ) ), &app, SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ), &app, TQT_SLOT( slotResult( KIO::Job * ) ) );
app.exec();
return m_ok;
}
@@ -592,7 +592,7 @@ bool clientApp::doIt()
KIO::Job * job = KIO::copy( srcLst, args->url(argc - 1) );
if ( !s_interactive )
job->setInteractive( false );
- connect( job, SIGNAL( result( KIO::Job * ) ), &app, SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ), &app, TQT_SLOT( slotResult( KIO::Job * ) ) );
app.exec();
return m_ok;
}
@@ -608,7 +608,7 @@ bool clientApp::doIt()
else if ( command == "configure" )
{
checkArgumentCount(argc, 1, 1);
- QByteArray data;
+ TQByteArray data;
kapp->dcopClient()->send( "*", "KonqMainViewIface", "reparseConfiguration()", data );
// Warning. In case something is added/changed here, keep kcontrol/konq/main.cpp in sync.
}
@@ -620,7 +620,7 @@ bool clientApp::doIt()
}
else
{
- fprintf( stderr, "%s", i18n("Syntax Error: Unknown command '%1'\n").arg(QString::fromLocal8Bit(command)).local8Bit().data() );
+ fprintf( stderr, "%s", i18n("Syntax Error: Unknown command '%1'\n").arg(TQString::fromLocal8Bit(command)).local8Bit().data() );
return false;
}
return true;
diff --git a/konqueror/client/kfmclient.h b/konqueror/client/kfmclient.h
index 0d13a6e8c..dea4ee883 100644
--- a/konqueror/client/kfmclient.h
+++ b/konqueror/client/kfmclient.h
@@ -31,10 +31,10 @@ public:
static bool doIt();
/** Make konqueror open a window for @p url */
- static bool createNewWindow(const KURL & url, bool newTab, bool tempFile, const QString & mimetype = QString::null);
+ static bool createNewWindow(const KURL & url, bool newTab, bool tempFile, const TQString & mimetype = TQString::null);
/** Make konqueror open a window for @p profile, @p url and @p mimetype */
- static bool openProfile(const QString & profile, const QString & url, const QString & mimetype = QString::null);
+ static bool openProfile(const TQString & profile, const TQString & url, const TQString & mimetype = TQString::null);
protected slots:
void slotResult( KIO::Job * );
@@ -44,7 +44,7 @@ protected slots:
private:
static void sendASNChange();
static bool m_ok;
- static QCString startup_id_str;
+ static TQCString startup_id_str;
};
diff --git a/konqueror/delayedinitializer.cc b/konqueror/delayedinitializer.cc
index 87d405ac4..c8ab89722 100644
--- a/konqueror/delayedinitializer.cc
+++ b/konqueror/delayedinitializer.cc
@@ -19,15 +19,15 @@
#include "delayedinitializer.h"
-#include <qtimer.h>
+#include <tqtimer.h>
-DelayedInitializer::DelayedInitializer( int eventType, QObject *parent, const char *name )
- : QObject( parent, name ), m_eventType( eventType ), m_signalEmitted( false )
+DelayedInitializer::DelayedInitializer( int eventType, TQObject *parent, const char *name )
+ : TQObject( parent, name ), m_eventType( eventType ), m_signalEmitted( false )
{
parent->installEventFilter( this );
}
-bool DelayedInitializer::eventFilter( QObject *receiver, QEvent *event )
+bool DelayedInitializer::eventFilter( TQObject *receiver, TQEvent *event )
{
if ( m_signalEmitted || event->type() != m_eventType )
return false;
@@ -38,7 +38,7 @@ bool DelayedInitializer::eventFilter( QObject *receiver, QEvent *event )
// Move the emitting of the event to the end of the eventQueue
// so we are absolutely sure the event we get here is handled before
// the initialize is fired.
- QTimer::singleShot( 0, this, SLOT( slotInitialize() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotInitialize() ) );
return false;
}
diff --git a/konqueror/delayedinitializer.h b/konqueror/delayedinitializer.h
index 493ed6dd0..1f9f66470 100644
--- a/konqueror/delayedinitializer.h
+++ b/konqueror/delayedinitializer.h
@@ -20,15 +20,15 @@
#ifndef __delayedinitializer_h__
#define __delayedinitializer_h__
-#include <qobject.h>
+#include <tqobject.h>
class DelayedInitializer : public QObject
{
Q_OBJECT
public:
- DelayedInitializer( int eventType, QObject *parent, const char *name = 0 );
+ DelayedInitializer( int eventType, TQObject *parent, const char *name = 0 );
- virtual bool eventFilter( QObject *receiver, QEvent *event );
+ virtual bool eventFilter( TQObject *receiver, TQEvent *event );
signals:
void initialize();
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index 672ac80e8..cf567c33f 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -25,7 +25,7 @@
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <kaction.h>
#include <kapplication.h>
@@ -43,13 +43,13 @@
#include <kmessagebox.h>
#include <kstaticdeleter.h>
-#include <qregexp.h>
-#include <qdatetime.h>
+#include <tqregexp.h>
+#include <tqdatetime.h>
#include <config.h>
-template class QPtrList<KFileIVI>;
-//template class QValueList<int>;
+template class TQPtrList<KFileIVI>;
+//template class TQValueList<int>;
class KonqIconViewFactory : public KParts::Factory
{
@@ -72,8 +72,8 @@ public:
s_defaultViewProps = 0;
}
- virtual KParts::Part* createPartObject( QWidget *parentWidget, const char *,
- QObject *parent, const char *name, const char*, const QStringList &args )
+ virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *,
+ TQObject *parent, const char *name, const char*, const TQStringList &args )
{
if( args.count() < 1 )
kdWarning() << "KonqKfmIconView: Missing Parameter" << endl;
@@ -158,13 +158,13 @@ void IconViewBrowserExtension::setSaveViewPropertiesLocally( bool value )
m_iconView->m_pProps->setSaveViewPropertiesLocally( value );
}
-void IconViewBrowserExtension::setNameFilter( const QString &nameFilter )
+void IconViewBrowserExtension::setNameFilter( const TQString &nameFilter )
{
//kdDebug(1202) << "IconViewBrowserExtension::setNameFilter " << nameFilter << endl;
m_iconView->m_nameFilter = nameFilter;
}
-KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const char *name, const QString& mode )
+KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode )
: KonqDirPart( parent, name )
, m_bNeedSetCurrentItem( false )
, m_pEnsureVisible( 0 )
@@ -182,22 +182,22 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const
m_pIconView = new KonqIconViewWidget( parentWidget, "qiconview" );
m_pIconView->initConfig( true );
- connect( m_pIconView, SIGNAL(imagePreviewFinished()),
- this, SLOT(slotRenderingFinished()));
+ connect( m_pIconView, TQT_SIGNAL(imagePreviewFinished()),
+ this, TQT_SLOT(slotRenderingFinished()));
// connect up the icon inc/dec signals
- connect( m_pIconView, SIGNAL(incIconSize()),
- this, SLOT(slotIncIconSize()));
- connect( m_pIconView, SIGNAL(decIconSize()),
- this, SLOT(slotDecIconSize()));
+ connect( m_pIconView, TQT_SIGNAL(incIconSize()),
+ this, TQT_SLOT(slotIncIconSize()));
+ connect( m_pIconView, TQT_SIGNAL(decIconSize()),
+ this, TQT_SLOT(slotDecIconSize()));
// pass signals to the extension
- connect( m_pIconView, SIGNAL( enableAction( const char *, bool ) ),
- m_extension, SIGNAL( enableAction( const char *, bool ) ) );
+ connect( m_pIconView, TQT_SIGNAL( enableAction( const char *, bool ) ),
+ m_extension, TQT_SIGNAL( enableAction( const char *, bool ) ) );
// signals from konqdirpart (for BC reasons)
- connect( this, SIGNAL( findOpened( KonqDirPart * ) ), SLOT( slotKFindOpened() ) );
- connect( this, SIGNAL( findClosed( KonqDirPart * ) ), SLOT( slotKFindClosed() ) );
+ connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) );
+ connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) );
setWidget( m_pIconView );
m_mimeTypeResolver = new KMimeTypeResolver<KFileIVI,KonqKfmIconView>(this);
@@ -209,39 +209,39 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const
// Don't repaint on configuration changes during construction
m_bInit = true;
- m_paDotFiles = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, SLOT( slotShowDot() ),
+ m_paDotFiles = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ),
actionCollection(), "show_dot" );
// m_paDotFiles->setCheckedState(i18n("Hide &Hidden Files"));
m_paDotFiles->setToolTip( i18n( "Toggle displaying of hidden dot files" ) );
- m_paDirectoryOverlays = new KToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, SLOT( slotShowDirectoryOverlays() ),
+ m_paDirectoryOverlays = new KToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQT_SLOT( slotShowDirectoryOverlays() ),
actionCollection(), "show_directory_overlays" );
m_pamPreview = new KActionMenu( i18n( "&Preview" ), actionCollection(), "iconview_preview" );
m_paEnablePreviews = new KToggleAction( i18n("Enable Previews"), 0, actionCollection(), "iconview_preview_all" );
m_paEnablePreviews->setCheckedState( i18n("Disable Previews") );
- connect( m_paEnablePreviews, SIGNAL( toggled( bool ) ), this, SLOT( slotPreview( bool ) ) );
+ connect( m_paEnablePreviews, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) );
m_paEnablePreviews->setIcon("thumbnail");
m_pamPreview->insert( m_paEnablePreviews );
m_pamPreview->insert( new KActionSeparator(this) );
KTrader::OfferList plugins = KTrader::self()->query( "ThumbCreator" );
- QMap< QString, KToggleAction* > previewActions;
+ TQMap< TQString, KToggleAction* > previewActions;
for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
{
if ( KToggleAction*& preview = previewActions[ ( *it )->name() ] )
- preview->setName( QCString( preview->name() ) + ',' + ( *it )->desktopEntryName().latin1() );
+ preview->setName( TQCString( preview->name() ) + ',' + ( *it )->desktopEntryName().latin1() );
else
{
preview = new KToggleAction( (*it)->name(), 0, actionCollection(), (*it)->desktopEntryName().latin1() );
- connect( preview, SIGNAL( toggled( bool ) ), this, SLOT( slotPreview( bool ) ) );
+ connect( preview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) );
m_pamPreview->insert( preview );
m_paPreviewPlugins.append( preview );
}
}
KToggleAction *soundPreview = new KToggleAction( i18n("Sound Files"), 0, actionCollection(), "audio/" );
- connect( soundPreview, SIGNAL( toggled( bool ) ), this, SLOT( slotPreview( bool ) ) );
+ connect( soundPreview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) );
m_pamPreview->insert( soundPreview );
m_paPreviewPlugins.append( soundPreview );
@@ -265,14 +265,14 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const
aSortByType->setChecked( false );
aSortByDate->setChecked( false );
- connect( aSortByNameCS, SIGNAL( toggled( bool ) ), this, SLOT( slotSortByNameCaseSensitive( bool ) ) );
- connect( aSortByNameCI, SIGNAL( toggled( bool ) ), this, SLOT( slotSortByNameCaseInsensitive( bool ) ) );
- connect( aSortBySize, SIGNAL( toggled( bool ) ), this, SLOT( slotSortBySize( bool ) ) );
- connect( aSortByType, SIGNAL( toggled( bool ) ), this, SLOT( slotSortByType( bool ) ) );
- connect( aSortByDate, SIGNAL( toggled( bool ) ), this, SLOT( slotSortByDate( bool ) ) );
+ connect( aSortByNameCS, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByNameCaseSensitive( bool ) ) );
+ connect( aSortByNameCI, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByNameCaseInsensitive( bool ) ) );
+ connect( aSortBySize, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortBySize( bool ) ) );
+ connect( aSortByType, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByType( bool ) ) );
+ connect( aSortByDate, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByDate( bool ) ) );
//enable menu item representing the saved sorting criterion
- QString sortcrit = KonqIconViewFactory::defaultViewProps()->sortCriterion();
+ TQString sortcrit = KonqIconViewFactory::defaultViewProps()->sortCriterion();
KRadioAction *sort_action = dynamic_cast<KRadioAction *>(actionCollection()->action(sortcrit.latin1()));
if(sort_action!=NULL) sort_action->activate();
@@ -281,8 +281,8 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const
m_paSortDirsFirst->setChecked( KonqIconViewFactory::defaultViewProps()->isDirsFirst() );
- connect( aSortDescending, SIGNAL( toggled( bool ) ), this, SLOT( slotSortDescending() ) );
- connect( m_paSortDirsFirst, SIGNAL( toggled( bool ) ), this, SLOT( slotSortDirsFirst() ) );
+ connect( aSortDescending, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortDescending() ) );
+ connect( m_paSortDirsFirst, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortDirsFirst() ) );
//enable stored settings
slotSortDirsFirst();
@@ -302,15 +302,15 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const
m_pamSort->insert( aSortDescending );
*/
- m_paSelect = new KAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, SLOT( slotSelect() ),
+ m_paSelect = new KAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ),
actionCollection(), "select" );
- m_paUnselect = new KAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, SLOT( slotUnselect() ),
+ m_paUnselect = new KAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ),
actionCollection(), "unselect" );
- m_paSelectAll = KStdAction::selectAll( this, SLOT( slotSelectAll() ), actionCollection(), "selectall" );
- m_paUnselectAll = new KAction( i18n( "Unselect All" ), CTRL+Key_U, this, SLOT( slotUnselectAll() ),
+ m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" );
+ m_paUnselectAll = new KAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ),
actionCollection(), "unselectall" );
m_paInvertSelection = new KAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk,
- this, SLOT( slotInvertSelection() ),
+ this, TQT_SLOT( slotInvertSelection() ),
actionCollection(), "invertselection" );
m_paSelect->setToolTip( i18n( "Allows selecting of file or folder items based on a given mask" ) );
@@ -323,65 +323,65 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const
//m_paRightText = new KToggleAction( i18n( "Text at &Right" ), 0, actionCollection(), "textright" );
//m_paBottomText->setExclusiveGroup( "TextPos" );
//m_paRightText->setExclusiveGroup( "TextPos" );
- //connect( m_paBottomText, SIGNAL( toggled( bool ) ), this, SLOT( slotTextBottom( bool ) ) );
- //connect( m_paRightText, SIGNAL( toggled( bool ) ), this, SLOT( slotTextRight( bool ) ) );
+ //connect( m_paBottomText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextBottom( bool ) ) );
+ //connect( m_paRightText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextRight( bool ) ) );
- connect( m_pIconView, SIGNAL( executed( QIconViewItem * ) ),
- this, SLOT( slotReturnPressed( QIconViewItem * ) ) );
- connect( m_pIconView, SIGNAL( returnPressed( QIconViewItem * ) ),
- this, SLOT( slotReturnPressed( QIconViewItem * ) ) );
+ connect( m_pIconView, TQT_SIGNAL( executed( TQIconViewItem * ) ),
+ this, TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
+ connect( m_pIconView, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ),
+ this, TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
- connect( m_pIconView, SIGNAL( onItem( QIconViewItem * ) ),
- this, SLOT( slotOnItem( QIconViewItem * ) ) );
+ connect( m_pIconView, TQT_SIGNAL( onItem( TQIconViewItem * ) ),
+ this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) );
- connect( m_pIconView, SIGNAL( onViewport() ),
- this, SLOT( slotOnViewport() ) );
+ connect( m_pIconView, TQT_SIGNAL( onViewport() ),
+ this, TQT_SLOT( slotOnViewport() ) );
- connect( m_pIconView, SIGNAL( mouseButtonPressed(int, QIconViewItem*, const QPoint&)),
- this, SLOT( slotMouseButtonPressed(int, QIconViewItem*, const QPoint&)) );
- connect( m_pIconView, SIGNAL( mouseButtonClicked(int, QIconViewItem*, const QPoint&)),
- this, SLOT( slotMouseButtonClicked(int, QIconViewItem*, const QPoint&)) );
- connect( m_pIconView, SIGNAL( contextMenuRequested(QIconViewItem*, const QPoint&)),
- this, SLOT( slotContextMenuRequested(QIconViewItem*, const QPoint&)) );
+ connect( m_pIconView, TQT_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)),
+ this, TQT_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) );
+ connect( m_pIconView, TQT_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)),
+ this, TQT_SLOT( slotMouseButtonClicked(int, TQIconViewItem*, const TQPoint&)) );
+ connect( m_pIconView, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)),
+ this, TQT_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) );
// Signals needed to implement the spring loading folders behavior
- connect( m_pIconView, SIGNAL( held( QIconViewItem * ) ),
- this, SLOT( slotDragHeld( QIconViewItem * ) ) );
- connect( m_pIconView, SIGNAL( dragEntered( bool ) ),
- this, SLOT( slotDragEntered( bool ) ) );
- connect( m_pIconView, SIGNAL( dragLeft() ),
- this, SLOT( slotDragLeft() ) );
- connect( m_pIconView, SIGNAL( dragMove( bool ) ),
- this, SLOT( slotDragMove( bool ) ) );
- connect( m_pIconView, SIGNAL( dragFinished() ),
- this, SLOT( slotDragFinished() ) );
+ connect( m_pIconView, TQT_SIGNAL( held( TQIconViewItem * ) ),
+ this, TQT_SLOT( slotDragHeld( TQIconViewItem * ) ) );
+ connect( m_pIconView, TQT_SIGNAL( dragEntered( bool ) ),
+ this, TQT_SLOT( slotDragEntered( bool ) ) );
+ connect( m_pIconView, TQT_SIGNAL( dragLeft() ),
+ this, TQT_SLOT( slotDragLeft() ) );
+ connect( m_pIconView, TQT_SIGNAL( dragMove( bool ) ),
+ this, TQT_SLOT( slotDragMove( bool ) ) );
+ connect( m_pIconView, TQT_SIGNAL( dragFinished() ),
+ this, TQT_SLOT( slotDragFinished() ) );
// Create the directory lister
m_dirLister = new KDirLister( true );
setDirLister( m_dirLister );
m_dirLister->setMainWindow(m_pIconView->topLevelWidget());
- connect( m_dirLister, SIGNAL( started( const KURL & ) ),
- this, SLOT( slotStarted() ) );
- connect( m_dirLister, SIGNAL( completed() ), this, SLOT( slotCompleted() ) );
- connect( m_dirLister, SIGNAL( canceled( const KURL& ) ), this, SLOT( slotCanceled( const KURL& ) ) );
- connect( m_dirLister, SIGNAL( clear() ), this, SLOT( slotClear() ) );
- connect( m_dirLister, SIGNAL( newItems( const KFileItemList& ) ),
- this, SLOT( slotNewItems( const KFileItemList& ) ) );
- connect( m_dirLister, SIGNAL( deleteItem( KFileItem * ) ),
- this, SLOT( slotDeleteItem( KFileItem * ) ) );
- connect( m_dirLister, SIGNAL( refreshItems( const KFileItemList& ) ),
- this, SLOT( slotRefreshItems( const KFileItemList& ) ) );
- connect( m_dirLister, SIGNAL( redirection( const KURL & ) ),
- this, SLOT( slotRedirection( const KURL & ) ) );
- connect( m_dirLister, SIGNAL( itemsFilteredByMime(const KFileItemList& ) ),
- SIGNAL( itemsFilteredByMime(const KFileItemList& ) ) );
- connect( m_dirLister, SIGNAL( infoMessage( const QString& ) ),
- extension(), SIGNAL( infoMessage( const QString& ) ) );
- connect( m_dirLister, SIGNAL( percent( int ) ),
- extension(), SIGNAL( loadingProgress( int ) ) );
- connect( m_dirLister, SIGNAL( speed( int ) ),
- extension(), SIGNAL( speedProgress( int ) ) );
+ connect( m_dirLister, TQT_SIGNAL( started( const KURL & ) ),
+ this, TQT_SLOT( slotStarted() ) );
+ connect( m_dirLister, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) );
+ connect( m_dirLister, TQT_SIGNAL( canceled( const KURL& ) ), this, TQT_SLOT( slotCanceled( const KURL& ) ) );
+ connect( m_dirLister, TQT_SIGNAL( clear() ), this, TQT_SLOT( slotClear() ) );
+ connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList& ) ),
+ this, TQT_SLOT( slotNewItems( const KFileItemList& ) ) );
+ connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
+ this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
+ connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList& ) ),
+ this, TQT_SLOT( slotRefreshItems( const KFileItemList& ) ) );
+ connect( m_dirLister, TQT_SIGNAL( redirection( const KURL & ) ),
+ this, TQT_SLOT( slotRedirection( const KURL & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ),
+ TQT_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ) );
+ connect( m_dirLister, TQT_SIGNAL( infoMessage( const TQString& ) ),
+ extension(), TQT_SIGNAL( infoMessage( const TQString& ) ) );
+ connect( m_dirLister, TQT_SIGNAL( percent( int ) ),
+ extension(), TQT_SIGNAL( loadingProgress( int ) ) );
+ connect( m_dirLister, TQT_SIGNAL( speed( int ) ),
+ extension(), TQT_SIGNAL( speedProgress( int ) ) );
// Now we may react to configuration changes
m_bInit = false;
@@ -392,10 +392,10 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const
m_bUpdateContentsPosAfterListing = false;
m_bDirPropertiesChanged = true;
m_bPreviewRunningBeforeCloseURL = false;
- m_pIconView->setResizeMode( QIconView::Adjust );
+ m_pIconView->setResizeMode( TQIconView::Adjust );
- connect( m_pIconView, SIGNAL( selectionChanged() ),
- this, SLOT( slotSelectionChanged() ) );
+ connect( m_pIconView, TQT_SIGNAL( selectionChanged() ),
+ this, TQT_SLOT( slotSelectionChanged() ) );
// Respect kcmkonq's configuration for word-wrap icon text.
// If we want something else, we have to adapt the configuration or remove it...
@@ -429,7 +429,7 @@ const KFileItem * KonqKfmIconView::currentItem()
void KonqKfmIconView::slotPreview( bool toggle )
{
- QCString name = sender()->name(); // e.g. clipartthumbnail (or audio/, special case)
+ TQCString name = sender()->name(); // e.g. clipartthumbnail (or audio/, special case)
if (name == "iconview_preview_all")
{
m_pProps->setShowingPreview( toggle );
@@ -453,8 +453,8 @@ void KonqKfmIconView::slotPreview( bool toggle )
}
else
{
- QStringList types = QStringList::split( ',', name );
- for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it )
+ TQStringList types = TQStringList::split( ',', name );
+ for ( TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it )
{
m_pProps->setShowingPreview( *it, toggle );
m_pIconView->setPreviewSettings( m_pProps->previewSettings() );
@@ -471,7 +471,7 @@ void KonqKfmIconView::slotPreview( bool toggle )
bool previewRunning = m_pIconView->isPreviewRunning();
if ( previewRunning )
m_pIconView->stopImagePreview();
- QStringList mimeTypes = serv->property("MimeTypes").toStringList();
+ TQStringList mimeTypes = serv->property("MimeTypes").toStringList();
m_pIconView->setIcons( m_pIconView->iconSize(), mimeTypes );
if ( previewRunning )
m_pIconView->startImagePreview( m_pProps->previewSettings(), false );
@@ -502,7 +502,7 @@ void KonqKfmIconView::slotShowDirectoryOverlays()
m_pProps->setShowingDirectoryOverlays( show );
- for ( QIconViewItem *item = m_pIconView->firstItem(); item; item = item->nextItem() )
+ for ( TQIconViewItem *item = m_pIconView->firstItem(); item; item = item->nextItem() )
{
KFileIVI* kItem = static_cast<KFileIVI*>(item);
if ( !kItem->item()->isDir() ) continue;
@@ -520,15 +520,15 @@ void KonqKfmIconView::slotShowDirectoryOverlays()
void KonqKfmIconView::slotSelect()
{
bool ok;
- QString pattern = KInputDialog::getText( QString::null,
+ TQString pattern = KInputDialog::getText( TQString::null,
i18n( "Select files:" ), "*", &ok, m_pIconView );
if ( ok )
{
- QRegExp re( pattern, true, true );
+ TQRegExp re( pattern, true, true );
m_pIconView->blockSignals( true );
- QIconViewItem *it = m_pIconView->firstItem();
+ TQIconViewItem *it = m_pIconView->firstItem();
while ( it )
{
if ( re.exactMatch( it->text() ) )
@@ -547,15 +547,15 @@ void KonqKfmIconView::slotSelect()
void KonqKfmIconView::slotUnselect()
{
bool ok;
- QString pattern = KInputDialog::getText( QString::null,
+ TQString pattern = KInputDialog::getText( TQString::null,
i18n( "Unselect files:" ), "*", &ok, m_pIconView );
if ( ok )
{
- QRegExp re( pattern, true, true );
+ TQRegExp re( pattern, true, true );
m_pIconView->blockSignals( true );
- QIconViewItem *it = m_pIconView->firstItem();
+ TQIconViewItem *it = m_pIconView->firstItem();
while ( it )
{
if ( re.exactMatch( it->text() ) )
@@ -705,7 +705,7 @@ bool KonqKfmIconView::doCloseURL()
return true;
}
-void KonqKfmIconView::slotReturnPressed( QIconViewItem *item )
+void KonqKfmIconView::slotReturnPressed( TQIconViewItem *item )
{
if ( !item )
return;
@@ -719,7 +719,7 @@ void KonqKfmIconView::slotReturnPressed( QIconViewItem *item )
lmbClicked( fileItem );
}
-void KonqKfmIconView::slotDragHeld( QIconViewItem *item )
+void KonqKfmIconView::slotDragHeld( TQIconViewItem *item )
{
kdDebug() << "KonqKfmIconView::slotDragHeld()" << endl;
@@ -764,7 +764,7 @@ void KonqKfmIconView::slotDragFinished()
}
-void KonqKfmIconView::slotContextMenuRequested(QIconViewItem* _item, const QPoint& _global)
+void KonqKfmIconView::slotContextMenuRequested(TQIconViewItem* _item, const TQPoint& _global)
{
const KFileItemList items = m_pIconView->selectedFileItems();
if ( items.isEmpty() )
@@ -780,7 +780,7 @@ void KonqKfmIconView::slotContextMenuRequested(QIconViewItem* _item, const QPoin
if ( rootItem ) {
KURL parentDirURL = rootItem->url();
// Check if parentDirURL applies to the selected items (usually yes, but not with search results)
- QPtrListIterator<KFileItem> kit( items );
+ TQPtrListIterator<KFileItem> kit( items );
for ( ; kit.current(); ++kit )
if ( kit.current()->url().directory( 1 ) != rootItem->url().path() )
parentDirURL = KURL();
@@ -792,7 +792,7 @@ void KonqKfmIconView::slotContextMenuRequested(QIconViewItem* _item, const QPoin
emit m_extension->popupMenu( 0L, _global, items, KParts::URLArgs(), popupFlags);
}
-void KonqKfmIconView::slotMouseButtonPressed(int _button, QIconViewItem* _item, const QPoint&)
+void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item, const TQPoint&)
{
if ( _button == RightButton && !_item )
{
@@ -822,14 +822,14 @@ void KonqKfmIconView::slotMouseButtonPressed(int _button, QIconViewItem* _item,
KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowUp;
- emit m_extension->popupMenu( 0L, QCursor::pos(), items, KParts::URLArgs(), popupFlags );
+ emit m_extension->popupMenu( 0L, TQCursor::pos(), items, KParts::URLArgs(), popupFlags );
if ( delRootItem )
delete item; // we just created it
}
}
-void KonqKfmIconView::slotMouseButtonClicked(int _button, QIconViewItem* _item, const QPoint& )
+void KonqKfmIconView::slotMouseButtonClicked(int _button, TQIconViewItem* _item, const TQPoint& )
{
if( _button == MidButton )
mmbClicked( _item ? static_cast<KFileIVI*>(_item)->item() : 0L );
@@ -859,7 +859,7 @@ void KonqKfmIconView::slotCanceled( const KURL& url )
// It could be about the URL we were listing, and openURL() aborted it.
if ( m_bLoading && url.equals( m_pIconView->url(), true ) )
{
- emit canceled( QString::null );
+ emit canceled( TQString::null );
m_bLoading = false;
}
@@ -962,7 +962,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries )
KFileItem* fileItem = item->item();
if ( !m_itemsToSelect.isEmpty() ) {
- QStringList::Iterator tsit = m_itemsToSelect.find( fileItem->name() );
+ TQStringList::Iterator tsit = m_itemsToSelect.find( fileItem->name() );
if ( tsit != m_itemsToSelect.end() ) {
m_itemsToSelect.remove( tsit );
m_pIconView->setSelected( item, true, true );
@@ -979,7 +979,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries )
showDirectoryOverlay(item);
}
- QString key;
+ TQString key;
switch ( m_eSortCriterion )
{
@@ -989,7 +989,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries )
case Type: key = item->item()->mimetype()+ "\008" +item->text().lower(); break; // ### slows down listing :-(
case Date:
{
- QDateTime dayt;
+ TQDateTime dayt;
dayt.setTime_t(item->item()->time(KIO::UDS_MODIFICATION_TIME ));
key = dayt.toString("yyyyMMddhhmmss");
break;
@@ -1065,9 +1065,9 @@ void KonqKfmIconView::showDirectoryOverlay(KFileIVI* item)
{
if (!m_paOutstandingOverlaysTimer)
{
- m_paOutstandingOverlaysTimer = new QTimer(this);
- connect(m_paOutstandingOverlaysTimer, SIGNAL(timeout()),
- SLOT(slotDirectoryOverlayStart()));
+ m_paOutstandingOverlaysTimer = new TQTimer(this);
+ connect(m_paOutstandingOverlaysTimer, TQT_SIGNAL(timeout()),
+ TQT_SLOT(slotDirectoryOverlayStart()));
}
m_paOutstandingOverlaysTimer->start(20, true);
}
@@ -1086,7 +1086,7 @@ void KonqKfmIconView::slotDirectoryOverlayStart()
if (overlay)
{
- connect( overlay, SIGNAL( finished() ), this, SLOT( slotDirectoryOverlayFinished() ) );
+ connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDirectoryOverlayFinished() ) );
overlay->start(); // Watch out, may emit finished() immediately!!
return; // Let it run....
}
@@ -1115,7 +1115,7 @@ void KonqKfmIconView::slotRefreshItems( const KFileItemList& entries )
kdDebug() << "KonqKfmIconView::slotRefreshItems '" << rit.current()->name() << "' ivi=" << ivi << endl;
if (ivi)
{
- QSize oldSize = ivi->pixmap()->size();
+ TQSize oldSize = ivi->pixmap()->size();
if ( ivi->isThumbnail() ) {
bNeedPreviewJob = true;
ivi->invalidateThumbnail();
@@ -1153,9 +1153,9 @@ void KonqKfmIconView::slotClear()
m_pIconView->viewport()->setUpdatesEnabled( false );
if ( !m_pTimeoutRefreshTimer )
{
- m_pTimeoutRefreshTimer = new QTimer( this );
- connect( m_pTimeoutRefreshTimer, SIGNAL( timeout() ),
- this, SLOT( slotRefreshViewport() ) );
+ m_pTimeoutRefreshTimer = new TQTimer( this );
+ connect( m_pTimeoutRefreshTimer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( slotRefreshViewport() ) );
}
m_pTimeoutRefreshTimer->start( 700, true );
@@ -1180,7 +1180,7 @@ void KonqKfmIconView::slotClear()
void KonqKfmIconView::slotRedirection( const KURL & url )
{
- const QString prettyURL = url.pathOrURL();
+ const TQString prettyURL = url.pathOrURL();
emit m_extension->setLocationBarURL( prettyURL );
emit setWindowCaption( prettyURL );
m_pIconView->setURL( url );
@@ -1245,7 +1245,7 @@ void KonqKfmIconView::slotRenderingFinished()
void KonqKfmIconView::slotRefreshViewport()
{
kdDebug(1202) << "KonqKfmIconView::slotRefreshViewport()" << endl;
- QWidget * vp = m_pIconView->viewport();
+ TQWidget * vp = m_pIconView->viewport();
bool prevState = vp->isUpdatesEnabled();
vp->setUpdatesEnabled( true );
vp->repaint();
@@ -1270,7 +1270,7 @@ bool KonqKfmIconView::doOpenURL( const KURL & url )
m_dirLister->setMimeFilter( mimeFilter() );
// This *must* happen before m_dirLister->openURL because it emits
- // clear() and QIconView::clear() calls setContentsPos(0,0)!
+ // clear() and TQIconView::clear() calls setContentsPos(0,0)!
KParts::URLArgs args = m_extension->urlArgs();
if ( args.reload )
{
@@ -1305,9 +1305,9 @@ bool KonqKfmIconView::doOpenURL( const KURL & url )
m_paEnablePreviews->setChecked( m_pProps->isShowingPreview() );
for ( m_paPreviewPlugins.first(); m_paPreviewPlugins.current(); m_paPreviewPlugins.next() )
{
- QStringList types = QStringList::split( ',', m_paPreviewPlugins.current()->name() );
+ TQStringList types = TQStringList::split( ',', m_paPreviewPlugins.current()->name() );
bool enabled = false;
- for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it )
+ for ( TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it )
if ( m_pProps->isShowingPreview( *it ) )
{
enabled = true;
@@ -1318,7 +1318,7 @@ bool KonqKfmIconView::doOpenURL( const KURL & url )
}
}
- const QString prettyURL = url.pathOrURL();
+ const TQString prettyURL = url.pathOrURL();
emit setWindowCaption( prettyURL );
return true;
@@ -1334,7 +1334,7 @@ void KonqKfmIconView::slotKFindClosed()
m_dirLister->setAutoUpdate( true );
}
-void KonqKfmIconView::slotOnItem( QIconViewItem *item )
+void KonqKfmIconView::slotOnItem( TQIconViewItem *item )
{
emit setStatusBarText( static_cast<KFileIVI *>(item)->item()->getStatusBarInfo() );
emitMouseOver( static_cast<KFileIVI*>(item)->item());
@@ -1347,7 +1347,7 @@ void KonqKfmIconView::slotOnViewport()
emitMouseOver( 0 );
}
-void KonqKfmIconView::setViewMode( const QString &mode )
+void KonqKfmIconView::setViewMode( const TQString &mode )
{
if ( mode == m_mode )
return;
@@ -1357,13 +1357,13 @@ void KonqKfmIconView::setViewMode( const QString &mode )
m_mode = mode;
if (mode=="MultiColumnView")
{
- m_pIconView->setArrangement(QIconView::TopToBottom);
- m_pIconView->setItemTextPos(QIconView::Right);
+ m_pIconView->setArrangement(TQIconView::TopToBottom);
+ m_pIconView->setItemTextPos(TQIconView::Right);
}
else
{
- m_pIconView->setArrangement(QIconView::LeftToRight);
- m_pIconView->setItemTextPos(QIconView::Bottom);
+ m_pIconView->setArrangement(TQIconView::LeftToRight);
+ m_pIconView->setItemTextPos(TQIconView::Bottom);
}
if ( m_bPreviewRunningBeforeCloseURL )
@@ -1380,28 +1380,28 @@ void KonqKfmIconView::setupSortKeys()
{
case NameCaseSensitive:
m_pIconView->setCaseInsensitiveSort( false );
- for ( QIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
+ for ( TQIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
it->setKey( it->text() );
break;
case NameCaseInsensitive:
m_pIconView->setCaseInsensitiveSort( true );
- for ( QIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
+ for ( TQIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
it->setKey( it->text().lower() );
break;
case Size:
- for ( QIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
+ for ( TQIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
it->setKey( makeSizeKey( (KFileIVI *)it ) );
break;
case Type:
// Sort by Type + Name (#17014)
- for ( QIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
+ for ( TQIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
it->setKey( static_cast<KFileIVI *>( it )->item()->mimetype() + "\008" + it->text().lower() );
break;
case Date:
{
//Sorts by time of modification (#52750)
- QDateTime dayt;
- for ( QIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
+ TQDateTime dayt;
+ for ( TQIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
{
dayt.setTime_t(static_cast<KFileIVI *>( it )->item()->time(KIO::UDS_MODIFICATION_TIME));
it->setKey(dayt.toString("yyyyMMddhhmmss"));
@@ -1411,7 +1411,7 @@ void KonqKfmIconView::setupSortKeys()
}
}
-QString KonqKfmIconView::makeSizeKey( KFileIVI *item )
+TQString KonqKfmIconView::makeSizeKey( KFileIVI *item )
{
return KIO::number( item->item()->size() ).rightJustify( 20, '0' );
}
@@ -1428,8 +1428,8 @@ static KStaticDeleter<SpringLoadingManager> s_springManagerDeleter;
SpringLoadingManager::SpringLoadingManager()
: m_startPart(0L)
{
- connect( &m_endTimer, SIGNAL( timeout() ),
- this, SLOT( finished() ) );
+ connect( &m_endTimer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( finished() ) );
}
@@ -1451,7 +1451,7 @@ bool SpringLoadingManager::exists()
void SpringLoadingManager::springLoadTrigger(KonqKfmIconView *view,
KFileItem *file,
- QIconViewItem *item)
+ TQIconViewItem *item)
{
if ( !file || !file->isDir() )
return;
@@ -1483,7 +1483,7 @@ void SpringLoadingManager::springLoadTrigger(KonqKfmIconView *view,
// Open the folder URL, we don't want to modify the browser
// history, hence the use of openURL and setLocationBarURL
view->openURL(url);
- const QString prettyURL = url.pathOrURL();
+ const TQString prettyURL = url.pathOrURL();
emit view->extension()->setLocationBarURL( prettyURL );
}
@@ -1526,7 +1526,7 @@ void SpringLoadingManager::finished()
KonqKfmIconView *view = static_cast<KonqKfmIconView*>(part);
view->openURL(url);
- const QString prettyURL = url.pathOrURL();
+ const TQString prettyURL = url.pathOrURL();
emit view->extension()->setLocationBarURL( prettyURL );
deleteLater();
diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h
index 7563fedcd..3385cc43a 100644
--- a/konqueror/iconview/konq_iconview.h
+++ b/konqueror/iconview/konq_iconview.h
@@ -24,8 +24,8 @@
#include <konq_operations.h>
#include <konq_dirpart.h>
#include <kmimetyperesolver.h>
-#include <qptrdict.h>
-#include <qptrlist.h>
+#include <tqptrdict.h>
+#include <tqptrlist.h>
#include <kfileivi.h>
class KonqPropsView;
@@ -46,12 +46,12 @@ class KonqKfmIconView : public KonqDirPart
friend class IconViewBrowserExtension; // to access m_pProps
Q_OBJECT
Q_PROPERTY( bool supportsUndo READ supportsUndo )
- Q_PROPERTY( QString viewMode READ viewMode WRITE setViewMode )
+ Q_PROPERTY( TQString viewMode READ viewMode WRITE setViewMode )
public:
enum SortCriterion { NameCaseSensitive, NameCaseInsensitive, Size, Type, Date };
- KonqKfmIconView( QWidget *parentWidget, QObject *parent, const char *name, const QString& mode );
+ KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode );
virtual ~KonqKfmIconView();
virtual const KFileItem * currentItem();
@@ -62,8 +62,8 @@ public:
bool supportsUndo() const { return true; }
- void setViewMode( const QString &mode );
- QString viewMode() const { return m_mode; }
+ void setViewMode( const TQString &mode );
+ TQString viewMode() const { return m_mode; }
// "Cut" icons : disable those whose URL is in lst, enable the rest
virtual void disableIcons( const KURL::List & lst );
@@ -93,16 +93,16 @@ public slots:
protected slots:
// slots connected to QIconView
- void slotReturnPressed( QIconViewItem *item );
- void slotMouseButtonPressed(int, QIconViewItem*, const QPoint&);
- void slotMouseButtonClicked(int, QIconViewItem*, const QPoint&);
- void slotContextMenuRequested(QIconViewItem*, const QPoint&);
- void slotOnItem( QIconViewItem *item );
+ void slotReturnPressed( TQIconViewItem *item );
+ void slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&);
+ void slotMouseButtonClicked(int, TQIconViewItem*, const TQPoint&);
+ void slotContextMenuRequested(TQIconViewItem*, const TQPoint&);
+ void slotOnItem( TQIconViewItem *item );
void slotOnViewport();
void slotSelectionChanged();
// Slot used for spring loading folders
- void slotDragHeld( QIconViewItem *item );
+ void slotDragHeld( TQIconViewItem *item );
void slotDragMove( bool accepted );
void slotDragEntered( bool accepted );
void slotDragLeft();
@@ -146,7 +146,7 @@ protected:
/** */
void setupSortKeys();
- QString makeSizeKey( KFileIVI *item );
+ TQString makeSizeKey( KFileIVI *item );
/** The directory lister for this URL */
KDirLister* m_dirLister;
@@ -190,20 +190,20 @@ protected:
KFileIVI * m_pEnsureVisible;
- QStringList m_itemsToSelect;
+ TQStringList m_itemsToSelect;
SortCriterion m_eSortCriterion;
KToggleAction *m_paDotFiles;
KToggleAction *m_paDirectoryOverlays;
KToggleAction *m_paEnablePreviews;
- QPtrList<KFileIVI> m_paOutstandingOverlays;
- QTimer *m_paOutstandingOverlaysTimer;
+ TQPtrList<KFileIVI> m_paOutstandingOverlays;
+ TQTimer *m_paOutstandingOverlaysTimer;
/* KToggleAction *m_paImagePreview;
KToggleAction *m_paTextPreview;
KToggleAction *m_paHTMLPreview;*/
KActionMenu *m_pamPreview;
- QPtrList<KToggleAction> m_paPreviewPlugins;
+ TQPtrList<KToggleAction> m_paPreviewPlugins;
KActionMenu *m_pamSort;
KAction *m_paSelect;
@@ -216,13 +216,13 @@ protected:
KonqIconViewWidget *m_pIconView;
- QTimer *m_pTimeoutRefreshTimer;
+ TQTimer *m_pTimeoutRefreshTimer;
- QPtrDict<KFileIVI> m_itemDict; // maps KFileItem * -> KFileIVI *
+ TQPtrDict<KFileIVI> m_itemDict; // maps KFileItem * -> KFileIVI *
KMimeTypeResolver<KFileIVI,KonqKfmIconView> * m_mimeTypeResolver;
- QString m_mode;
+ TQString m_mode;
private:
void showDirectoryOverlay(KFileIVI* item);
@@ -242,7 +242,7 @@ public slots:
// Those slots are automatically connected by the shell
void reparseConfiguration();
void setSaveViewPropertiesLocally( bool value );
- void setNameFilter( const QString &nameFilter );
+ void setNameFilter( const TQString &nameFilter );
void refreshMimeTypes() { m_iconView->iconViewWidget()->refreshMimeTypes(); }
@@ -277,7 +277,7 @@ public:
static bool exists();
void springLoadTrigger(KonqKfmIconView *view, KFileItem *file,
- QIconViewItem *item);
+ TQIconViewItem *item);
void dragLeft(KonqKfmIconView *view);
void dragEntered(KonqKfmIconView *view);
@@ -292,7 +292,7 @@ private:
// Timer allowing to know the user wants to abort the spring loading
// and go back to his start url (closing the opened window if needed)
- QTimer m_endTimer;
+ TQTimer m_endTimer;
};
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index f0e8426d9..2aafe885c 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -32,9 +32,9 @@
#include <stdlib.h>
-#include <qclipboard.h>
-#include <qpopupmenu.h>
-#include <qpainter.h>
+#include <tqclipboard.h>
+#include <tqpopupmenu.h>
+#include <tqpainter.h>
#include <klocale.h>
#include <dcopclient.h>
@@ -80,160 +80,160 @@ void KEBApp::createActions() {
// save and quit should probably not be in the toplevel???
(void) KStdAction::quit(
- this, SLOT( close() ), actionCollection());
- KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), actionCollection());
+ this, TQT_SLOT( close() ), actionCollection());
+ KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
(void) KStdAction::configureToolbars(
- this, SLOT( slotConfigureToolbars() ), actionCollection());
+ this, TQT_SLOT( slotConfigureToolbars() ), actionCollection());
if (m_browser) {
(void) KStdAction::open(
- actn, SLOT( slotLoad() ), actionCollection());
+ actn, TQT_SLOT( slotLoad() ), actionCollection());
(void) KStdAction::saveAs(
- actn, SLOT( slotSaveAs() ), actionCollection());
+ actn, TQT_SLOT( slotSaveAs() ), actionCollection());
}
- (void) KStdAction::cut(actn, SLOT( slotCut() ), actionCollection());
- (void) KStdAction::copy(actn, SLOT( slotCopy() ), actionCollection());
- (void) KStdAction::paste(actn, SLOT( slotPaste() ), actionCollection());
- (void) KStdAction::print(actn, SLOT( slotPrint() ), actionCollection());
+ (void) KStdAction::cut(actn, TQT_SLOT( slotCut() ), actionCollection());
+ (void) KStdAction::copy(actn, TQT_SLOT( slotCopy() ), actionCollection());
+ (void) KStdAction::paste(actn, TQT_SLOT( slotPaste() ), actionCollection());
+ (void) KStdAction::print(actn, TQT_SLOT( slotPrint() ), actionCollection());
// settings menu
(void) new KToggleAction(
i18n("&Show Netscape Bookmarks in Konqueror"), 0,
- actn, SLOT( slotShowNS() ), actionCollection(),
+ actn, TQT_SLOT( slotShowNS() ), actionCollection(),
"settings_showNS");
// actions
(void) new KAction(
i18n("&Delete"), "editdelete", Key_Delete,
- actn, SLOT( slotDelete() ), actionCollection(), "delete");
+ actn, TQT_SLOT( slotDelete() ), actionCollection(), "delete");
(void) new KAction(
i18n("Rename"), "text", Key_F2,
- actn, SLOT( slotRename() ), actionCollection(), "rename");
+ actn, TQT_SLOT( slotRename() ), actionCollection(), "rename");
(void) new KAction(
i18n("C&hange URL"), "text", Key_F3,
- actn, SLOT( slotChangeURL() ), actionCollection(), "changeurl");
+ actn, TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl");
(void) new KAction(
i18n("C&hange Comment"), "text", Key_F4,
- actn, SLOT( slotChangeComment() ), actionCollection(), "changecomment");
+ actn, TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment");
(void) new KAction(
i18n("Chan&ge Icon..."), "icons", 0,
- actn, SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
+ actn, TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
(void) new KAction(
i18n("Update Favicon"), 0,
- actn, SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
+ actn, TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
(void) new KAction(
i18n("Recursive Sort"), 0,
- actn, SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
+ actn, TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
(void) new KAction(
i18n("&New Folder..."), "folder_new", CTRL+Key_N,
- actn, SLOT( slotNewFolder() ), actionCollection(), "newfolder");
+ actn, TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
(void) new KAction(
i18n("&New Bookmark"), "www", 0,
- actn, SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
+ actn, TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
(void) new KAction(
i18n("&Insert Separator"), CTRL+Key_I,
- actn, SLOT( slotInsertSeparator() ), actionCollection(),
+ actn, TQT_SLOT( slotInsertSeparator() ), actionCollection(),
"insertseparator");
(void) new KAction(
i18n("&Sort Alphabetically"), 0,
- actn, SLOT( slotSort() ), actionCollection(), "sort");
+ actn, TQT_SLOT( slotSort() ), actionCollection(), "sort");
(void) new KAction(
i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0,
- actn, SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
+ actn, TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
(void) new KAction(
i18n("Show in T&oolbar"), "bookmark_toolbar", 0,
- actn, SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
+ actn, TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
(void) new KAction(
i18n("Hide in T&oolbar"), "bookmark_toolbar", 0,
- actn, SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
+ actn, TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
(void) new KAction(
i18n("&Expand All Folders"), 0,
- actn, SLOT( slotExpandAll() ), actionCollection(), "expandall");
+ actn, TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall");
(void) new KAction(
i18n("Collapse &All Folders"), 0,
- actn, SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
+ actn, TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
(void) new KAction(
i18n("&Open in Konqueror"), "fileopen", 0,
- actn, SLOT( slotOpenLink() ), actionCollection(), "openlink" );
+ actn, TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
(void) new KAction(
i18n("Check &Status"), "bookmark", 0,
- actn, SLOT( slotTestSelection() ), actionCollection(), "testlink" );
+ actn, TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
(void) new KAction(
i18n("Check Status: &All"), 0,
- actn, SLOT( slotTestAll() ), actionCollection(), "testall" );
+ actn, TQT_SLOT( slotTestAll() ), actionCollection(), "testall" );
(void) new KAction(
i18n("Update All &Favicons"), 0,
- actn, SLOT( slotUpdateAllFavIcons() ), actionCollection(),
+ actn, TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(),
"updateallfavicons" );
(void) new KAction(
i18n("Cancel &Checks"), 0,
- actn, SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
+ actn, TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
(void) new KAction(
i18n("Cancel &Favicon Updates"), 0,
- actn, SLOT( slotCancelFavIconUpdates() ), actionCollection(),
+ actn, TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(),
"cancelfaviconupdates" );
(void) new KAction(
i18n("Import &Netscape Bookmarks..."), "netscape", 0,
- actn, SLOT( slotImport() ), actionCollection(), "importNS");
+ actn, TQT_SLOT( slotImport() ), actionCollection(), "importNS");
(void) new KAction(
i18n("Import &Opera Bookmarks..."), "opera", 0,
- actn, SLOT( slotImport() ), actionCollection(), "importOpera");
+ actn, TQT_SLOT( slotImport() ), actionCollection(), "importOpera");
(void) new KAction(
i18n("Import All &Crash Sessions as Bookmarks..."), 0,
- actn, SLOT( slotImport() ), actionCollection(), "importCrashes");
+ actn, TQT_SLOT( slotImport() ), actionCollection(), "importCrashes");
(void) new KAction(
i18n("Import &Galeon Bookmarks..."), 0,
- actn, SLOT( slotImport() ), actionCollection(), "importGaleon");
+ actn, TQT_SLOT( slotImport() ), actionCollection(), "importGaleon");
(void) new KAction(
i18n("Import &KDE2/KDE3 Bookmarks..."), 0,
- actn, SLOT( slotImport() ), actionCollection(), "importKDE2");
+ actn, TQT_SLOT( slotImport() ), actionCollection(), "importKDE2");
(void) new KAction(
i18n("Import &IE Bookmarks..."), 0,
- actn, SLOT( slotImport() ), actionCollection(), "importIE");
+ actn, TQT_SLOT( slotImport() ), actionCollection(), "importIE");
(void) new KAction(
i18n("Import &Mozilla Bookmarks..."), "mozilla", 0,
- actn, SLOT( slotImport() ), actionCollection(), "importMoz");
+ actn, TQT_SLOT( slotImport() ), actionCollection(), "importMoz");
(void) new KAction(
i18n("Export to &Netscape Bookmarks"), "netscape", 0,
- actn, SLOT( slotExportNS() ), actionCollection(), "exportNS");
+ actn, TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS");
(void) new KAction(
i18n("Export to &Opera Bookmarks..."), "opera", 0,
- actn, SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
+ actn, TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
(void) new KAction(
i18n("Export to &HTML Bookmarks..."), "html", 0,
- actn, SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
+ actn, TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
(void) new KAction(
i18n("Export to &IE Bookmarks..."), 0,
- actn, SLOT( slotExportIE() ), actionCollection(), "exportIE");
+ actn, TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE");
(void) new KAction(
i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0,
- actn, SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
+ actn, TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
}
void ActionsImpl::slotLoad() {
- QString bookmarksFile
- = KFileDialog::getOpenFileName(QString::null, "*.xml", KEBApp::self());
+ TQString bookmarksFile
+ = KFileDialog::getOpenFileName(TQString::null, "*.xml", KEBApp::self());
if (bookmarksFile.isNull())
return;
- KEBApp::self()->m_caption = QString::null;
+ KEBApp::self()->m_caption = TQString::null;
KEBApp::self()->m_bookmarksFilename = bookmarksFile;
KEBApp::self()->construct();
}
void ActionsImpl::slotSaveAs() {
KEBApp::self()->bkInfo()->commitChanges();
- QString saveFilename
- = KFileDialog::getSaveFileName(QString::null, "*.xml", KEBApp::self());
+ TQString saveFilename
+ = KFileDialog::getSaveFileName(TQString::null, "*.xml", KEBApp::self());
if (!saveFilename.isEmpty())
CurrentMgr::self()->saveAs(saveFilename);
}
-void CurrentMgr::doExport(ExportType type, const QString & _path) {
+void CurrentMgr::doExport(ExportType type, const TQString & _path) {
if(KEBApp::self())
KEBApp::self()->bkInfo()->commitChanges();
- QString path(_path);
+ TQString path(_path);
// TODO - add a factory and make all this use the base class
if (type == OperaExport) {
if (path.isNull())
@@ -245,7 +245,7 @@ void CurrentMgr::doExport(ExportType type, const QString & _path) {
} else if (type == HTMLExport) {
if (path.isNull())
path = KFileDialog::getSaveFileName(
- QDir::homeDirPath(),
+ TQDir::homeDirPath(),
i18n("*.html|HTML Bookmark Listing") );
HTMLExporter exporter;
exporter.write(mgr()->root(), path);
@@ -274,7 +274,7 @@ void CurrentMgr::doExport(ExportType type, const QString & _path) {
void KEBApp::setActionsEnabled(SelcAbilities sa) {
KActionCollection * coll = actionCollection();
- QStringList toEnable;
+ TQStringList toEnable;
if (sa.multiSelect || (sa.singleSelect && !sa.root))
toEnable << "edit_copy";
@@ -314,7 +314,7 @@ void KEBApp::setActionsEnabled(SelcAbilities sa) {
}
}
- for ( QStringList::Iterator it = toEnable.begin();
+ for ( TQStringList::Iterator it = toEnable.begin();
it != toEnable.end(); ++it )
{
coll->action((*it).ascii())->setEnabled(true);
@@ -342,7 +342,7 @@ void ActionsImpl::slotCopy() {
KEBApp::self()->bkInfo()->commitChanges();
// this is not a command, because it can't be undone
Q_ASSERT(ListView::self()->selectedItemsMap().count() != 0);
- QValueList<KBookmark> bookmarks
+ TQValueList<KBookmark> bookmarks
= ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
KBookmarkDrag* data = KBookmarkDrag::newDrag(bookmarks, 0 /* not this ! */);
kapp->clipboard()->setData(data, QClipboard::Clipboard);
@@ -363,8 +363,8 @@ void ActionsImpl::slotPaste() {
void ActionsImpl::slotNewFolder() {
KEBApp::self()->bkInfo()->commitChanges();
bool ok;
- QString str = KInputDialog::getText( i18n( "Create New Bookmark Folder" ),
- i18n( "New folder:" ), QString::null, &ok );
+ TQString str = KInputDialog::getText( i18n( "Create New Bookmark Folder" ),
+ i18n( "New folder:" ), TQString::null, &ok );
if (!ok)
return;
@@ -379,7 +379,7 @@ void ActionsImpl::slotNewBookmark() {
// TODO - make a setCurrentItem(Command *) which uses finaladdress interface
CreateCommand * cmd = new CreateCommand(
ListView::self()->userAddress(),
- QString::null, "www", KURL("http://"));
+ TQString::null, "www", KURL("http://"));
CmdHistory::self()->addCommand(cmd);
}
@@ -421,32 +421,32 @@ void ActionsImpl::slotExportMoz() {
/* -------------------------------------- */
-static QCString s_appId, s_objId;
+static TQCString s_appId, s_objId;
static KParts::ReadOnlyPart *s_part;
void ActionsImpl::slotPrint() {
KEBApp::self()->bkInfo()->commitChanges();
s_part = KParts::ComponentFactory
::createPartInstanceFromQuery<KParts::ReadOnlyPart>(
- "text/html", QString::null);
- s_part->setProperty("pluginsEnabled", QVariant(false, 1));
- s_part->setProperty("javaScriptEnabled", QVariant(false, 1));
- s_part->setProperty("javaEnabled", QVariant(false, 1));
+ "text/html", TQString::null);
+ s_part->setProperty("pluginsEnabled", TQVariant(false, 1));
+ s_part->setProperty("javaScriptEnabled", TQVariant(false, 1));
+ s_part->setProperty("javaEnabled", TQVariant(false, 1));
// doc->openStream( "text/html", KURL() );
- // doc->writeStream( QCString( "<HTML><BODY>FOO</BODY></HTML>" ) );
+ // doc->writeStream( TQCString( "<HTML><BODY>FOO</BODY></HTML>" ) );
// doc->closeStream();
HTMLExporter exporter;
KTempFile tmpf(locateLocal("tmp", "print_bookmarks"), ".html");
- QTextStream *tstream = tmpf.textStream();
- tstream->setEncoding(QTextStream::Unicode);
+ TQTextStream *tstream = tmpf.textStream();
+ tstream->setEncoding(TQTextStream::Unicode);
(*tstream) << exporter.toString(CurrentMgr::self()->mgr()->root(), true);
tmpf.close();
s_appId = kapp->dcopClient()->appId();
s_objId = s_part->property("dcopObjectId").toString().latin1();
- connect(s_part, SIGNAL(completed()), this, SLOT(slotDelayedPrint()));
+ connect(s_part, TQT_SIGNAL(completed()), this, TQT_SLOT(slotDelayedPrint()));
s_part->openURL(KURL( tmpf.name() ));
}
@@ -508,21 +508,21 @@ void ActionsImpl::slotUpdateFavIcon() {
class KBookmarkGroupList : private KBookmarkGroupTraverser {
public:
KBookmarkGroupList(KBookmarkManager *);
- QValueList<KBookmark> getList(const KBookmarkGroup &);
+ TQValueList<KBookmark> getList(const KBookmarkGroup &);
private:
virtual void visit(const KBookmark &) { ; }
virtual void visitEnter(const KBookmarkGroup &);
virtual void visitLeave(const KBookmarkGroup &) { ; }
private:
KBookmarkManager *m_manager;
- QValueList<KBookmark> m_list;
+ TQValueList<KBookmark> m_list;
};
KBookmarkGroupList::KBookmarkGroupList( KBookmarkManager *manager ) {
m_manager = manager;
}
-QValueList<KBookmark> KBookmarkGroupList::getList( const KBookmarkGroup &grp ) {
+TQValueList<KBookmark> KBookmarkGroupList::getList( const KBookmarkGroup &grp ) {
traverse(grp);
return m_list;
}
@@ -537,9 +537,9 @@ void ActionsImpl::slotRecursiveSort() {
Q_ASSERT(bk.isGroup());
KEBMacroCommand *mcmd = new KEBMacroCommand(i18n("Recursive Sort"));
KBookmarkGroupList lister(CurrentMgr::self()->mgr());
- QValueList<KBookmark> bookmarks = lister.getList(bk.toGroup());
+ TQValueList<KBookmark> bookmarks = lister.getList(bk.toGroup());
bookmarks << bk.toGroup();
- for (QValueListConstIterator<KBookmark> it = bookmarks.begin(); it != bookmarks.end(); ++it) {
+ for (TQValueListConstIterator<KBookmark> it = bookmarks.begin(); it != bookmarks.end(); ++it) {
SortCommand *cmd = new SortCommand("", (*it).address());
cmd->execute();
mcmd->addCommand(cmd);
@@ -565,8 +565,8 @@ void ActionsImpl::slotDelete() {
void ActionsImpl::slotOpenLink() {
KEBApp::self()->bkInfo()->commitChanges();
- QValueList<KBookmark> bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
- QValueListIterator<KBookmark> it;
+ TQValueList<KBookmark> bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
+ TQValueListIterator<KBookmark> it;
for (it = bks.begin(); it != bks.end(); ++it) {
if ((*it).isGroup() || (*it).isSeparator())
continue;
@@ -601,14 +601,14 @@ void ActionsImpl::slotSetAsToolbar() {
void ActionsImpl::slotShowInToolbar() {
KEBApp::self()->bkInfo()->commitChanges();
- QValueList<KBookmark> bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
+ TQValueList<KBookmark> bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
KEBMacroCommand *mcmd = CmdGen::setShownInToolbar(bks, true);
CmdHistory::self()->addCommand(mcmd);
}
void ActionsImpl::slotHideInToolbar() {
KEBApp::self()->bkInfo()->commitChanges();
- QValueList<KBookmark> bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
+ TQValueList<KBookmark> bks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
KEBMacroCommand *mcmd = CmdGen::setShownInToolbar(bks, false);
CmdHistory::self()->addCommand(mcmd);
}
@@ -617,7 +617,7 @@ void ActionsImpl::slotChangeIcon() {
KEBApp::self()->bkInfo()->commitChanges();
KBookmark bk = ListView::self()->firstSelected()->bookmark();
KIconDialog dlg(KEBApp::self());
- QString newIcon = dlg.selectIcon(KIcon::Small, KIcon::FileSystem);
+ TQString newIcon = dlg.selectIcon(KIcon::Small, KIcon::FileSystem);
if (newIcon.isEmpty())
return;
EditCommand *cmd = new EditCommand(
diff --git a/konqueror/keditbookmarks/actionsimpl.h b/konqueror/keditbookmarks/actionsimpl.h
index c10b8e12c..11cd70d57 100644
--- a/konqueror/keditbookmarks/actionsimpl.h
+++ b/konqueror/keditbookmarks/actionsimpl.h
@@ -21,7 +21,7 @@
#ifndef __actionsimpl_h
#define __actionsimpl_h
-#include <qobject.h>
+#include <tqobject.h>
class ActionsImpl : public QObject
{
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index 9d2d23f28..edc4a66bb 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -23,11 +23,11 @@
#include <stdlib.h>
-#include <qtimer.h>
-#include <qclipboard.h>
-#include <qsplitter.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqtimer.h>
+#include <tqclipboard.h>
+#include <tqsplitter.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
#include <klocale.h>
#include <kdebug.h>
@@ -49,16 +49,16 @@
// SHUFFLE all these functions around, the order is just plain stupid
-BookmarkLineEdit::BookmarkLineEdit( QWidget *parent )
+BookmarkLineEdit::BookmarkLineEdit( TQWidget *parent )
: KLineEdit( parent )
{
}
void BookmarkLineEdit::cut()
{
- QString select( selectedText() );
+ TQString select( selectedText() );
int pos( selectionStart() );
- QString newText( text().remove( pos, select.length() ) );
+ TQString newText( text().remove( pos, select.length() ) );
KLineEdit::cut();
setEdited( true ); //KDE 4 setModified( true );
emit textChanged( newText );
@@ -74,22 +74,22 @@ void BookmarkInfoWidget::showBookmark(const KBookmark &bk) {
// all read only and blank
m_title_le->setReadOnly(true);
- m_title_le->setText(QString::null);
+ m_title_le->setText(TQString::null);
m_url_le->setReadOnly(true);
- m_url_le->setText(QString::null);
+ m_url_le->setText(TQString::null);
m_comment_le->setReadOnly(true);
- m_comment_le->setText(QString::null);
+ m_comment_le->setText(TQString::null);
m_visitdate_le->setReadOnly(true);
- m_visitdate_le->setText(QString::null);
+ m_visitdate_le->setText(TQString::null);
m_credate_le->setReadOnly(true);
- m_credate_le->setText(QString::null);
+ m_credate_le->setText(TQString::null);
m_visitcount_le->setReadOnly(true);
- m_visitcount_le->setText(QString::null);
+ m_visitcount_le->setText(TQString::null);
return;
}
@@ -99,11 +99,11 @@ void BookmarkInfoWidget::showBookmark(const KBookmark &bk) {
m_title_le->setText(bk.fullText());
m_url_le->setReadOnly(bk.isGroup() || bk.isSeparator());
- m_url_le->setText(bk.isGroup() ? QString::null : bk.url().pathOrURL());
+ m_url_le->setText(bk.isGroup() ? TQString::null : bk.url().pathOrURL());
m_comment_le->setReadOnly((bk.isSeparator()|| !bk.hasParent()) ? true : false );
m_comment_le->setText(
- NodeEditCommand::getNodeText(bk, QStringList() << "desc"));
+ NodeEditCommand::getNodeText(bk, TQStringList() << "desc"));
// readonly fields
updateStatus();
@@ -112,14 +112,14 @@ void BookmarkInfoWidget::showBookmark(const KBookmark &bk) {
void BookmarkInfoWidget::updateStatus()
{
- QString visitDate =
- CurrentMgr::makeTimeStr( NodeEditCommand::getNodeText(m_bk, QStringList() << "info" << "metadata"
+ TQString visitDate =
+ CurrentMgr::makeTimeStr( NodeEditCommand::getNodeText(m_bk, TQStringList() << "info" << "metadata"
<< "time_visited" ));
m_visitdate_le->setReadOnly(true);
m_visitdate_le->setText(visitDate);
- QString creationDate =
- CurrentMgr::makeTimeStr( NodeEditCommand::getNodeText(m_bk, QStringList() << "info" << "metadata"
+ TQString creationDate =
+ CurrentMgr::makeTimeStr( NodeEditCommand::getNodeText(m_bk, TQStringList() << "info" << "metadata"
<< "time_added" ));
m_credate_le->setReadOnly(true);
m_credate_le->setText(creationDate);
@@ -127,7 +127,7 @@ void BookmarkInfoWidget::updateStatus()
// TODO - get the actual field name from the spec if it exists, else copy galeon
m_visitcount_le->setReadOnly(true);
m_visitcount_le->setText(
- NodeEditCommand::getNodeText(m_bk, QStringList() << "info" << "metadata"
+ NodeEditCommand::getNodeText(m_bk, TQStringList() << "info" << "metadata"
<< "visit_count" ));
}
@@ -148,7 +148,7 @@ void BookmarkInfoWidget::commitTitle()
}
}
-void BookmarkInfoWidget::slotTextChangedTitle(const QString &str)
+void BookmarkInfoWidget::slotTextChangedTitle(const TQString &str)
{
if (m_bk.isNull() || !m_title_le->isModified())
return;
@@ -157,7 +157,7 @@ void BookmarkInfoWidget::slotTextChangedTitle(const QString &str)
if(titlecmd)
{
- NodeEditCommand::setNodeText(m_bk, QStringList() << "title", str);
+ NodeEditCommand::setNodeText(m_bk, TQStringList() << "title", str);
titlecmd->modify(str);
}
else
@@ -178,7 +178,7 @@ void BookmarkInfoWidget::commitURL()
}
}
-void BookmarkInfoWidget::slotTextChangedURL(const QString &str) {
+void BookmarkInfoWidget::slotTextChangedURL(const TQString &str) {
if (m_bk.isNull() || !m_url_le->isModified())
return;
@@ -209,7 +209,7 @@ void BookmarkInfoWidget::commitComment()
}
}
-void BookmarkInfoWidget::slotTextChangedComment(const QString &str) {
+void BookmarkInfoWidget::slotTextChangedComment(const TQString &str) {
if (m_bk.isNull() || !m_comment_le->isModified())
return;
@@ -217,7 +217,7 @@ void BookmarkInfoWidget::slotTextChangedComment(const QString &str) {
if(commentcmd)
{
- NodeEditCommand::setNodeText(m_bk, QStringList() << "desc", str);
+ NodeEditCommand::setNodeText(m_bk, TQStringList() << "desc", str);
commentcmd->modify(str);
}
else
@@ -228,64 +228,64 @@ void BookmarkInfoWidget::slotTextChangedComment(const QString &str) {
}
}
-BookmarkInfoWidget::BookmarkInfoWidget(QWidget *parent, const char *name)
- : QWidget(parent, name), m_connected(false) {
+BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name)
+ : TQWidget(parent, name), m_connected(false) {
- timer = new QTimer(this);
- connect(timer, SIGNAL( timeout() ), SLOT( commitChanges()));
+ timer = new TQTimer(this);
+ connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( commitChanges()));
titlecmd = 0;
urlcmd = 0;
commentcmd = 0;
- QBoxLayout *vbox = new QVBoxLayout(this);
- QGridLayout *grid = new QGridLayout(vbox, 3, 4, 4);
+ TQBoxLayout *vbox = new TQVBoxLayout(this);
+ TQGridLayout *grid = new TQGridLayout(vbox, 3, 4, 4);
m_title_le = new BookmarkLineEdit(this);
grid->addWidget(m_title_le, 0, 1);
grid->addWidget(
- new QLabel(m_title_le, i18n("Name:"), this),
+ new TQLabel(m_title_le, i18n("Name:"), this),
0, 0);
- connect(m_title_le, SIGNAL( textChanged(const QString &) ),
- SLOT( slotTextChangedTitle(const QString &) ));
- connect(m_title_le, SIGNAL( lostFocus() ), SLOT( commitTitle() ));
+ connect(m_title_le, TQT_SIGNAL( textChanged(const TQString &) ),
+ TQT_SLOT( slotTextChangedTitle(const TQString &) ));
+ connect(m_title_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitTitle() ));
m_url_le = new BookmarkLineEdit(this);
grid->addWidget(m_url_le, 1, 1);
grid->addWidget(
- new QLabel(m_url_le, i18n("Location:"), this),
+ new TQLabel(m_url_le, i18n("Location:"), this),
1, 0);
- connect(m_url_le, SIGNAL( textChanged(const QString &) ),
- SLOT( slotTextChangedURL(const QString &) ));
- connect(m_url_le, SIGNAL( lostFocus() ), SLOT( commitURL() ));
+ connect(m_url_le, TQT_SIGNAL( textChanged(const TQString &) ),
+ TQT_SLOT( slotTextChangedURL(const TQString &) ));
+ connect(m_url_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitURL() ));
m_comment_le = new BookmarkLineEdit(this);
grid->addWidget(m_comment_le, 2, 1);
grid->addWidget(
- new QLabel(m_comment_le, i18n("Comment:"), this),
+ new TQLabel(m_comment_le, i18n("Comment:"), this),
2, 0);
- connect(m_comment_le, SIGNAL( textChanged(const QString &) ),
- SLOT( slotTextChangedComment(const QString &) ));
- connect(m_comment_le, SIGNAL( lostFocus() ), SLOT( commitComment() ));
+ connect(m_comment_le, TQT_SIGNAL( textChanged(const TQString &) ),
+ TQT_SLOT( slotTextChangedComment(const TQString &) ));
+ connect(m_comment_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitComment() ));
m_credate_le = new KLineEdit(this);
grid->addWidget(m_credate_le, 0, 3);
grid->addWidget(
- new QLabel(m_credate_le, i18n("First viewed:"), this),
+ new TQLabel(m_credate_le, i18n("First viewed:"), this),
0, 2);
m_visitdate_le = new KLineEdit(this);
grid->addWidget(m_visitdate_le, 1, 3);
grid->addWidget(
- new QLabel(m_visitdate_le, i18n("Viewed last:"), this),
+ new TQLabel(m_visitdate_le, i18n("Viewed last:"), this),
1, 2 );
m_visitcount_le = new KLineEdit(this);
grid->addWidget(m_visitcount_le, 2, 3);
grid->addWidget(
- new QLabel(m_visitcount_le, i18n("Times visited:"), this),
+ new TQLabel(m_visitcount_le, i18n("Times visited:"), this),
2, 2);
}
diff --git a/konqueror/keditbookmarks/bookmarkinfo.h b/konqueror/keditbookmarks/bookmarkinfo.h
index 51661959a..9894fec1d 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.h
+++ b/konqueror/keditbookmarks/bookmarkinfo.h
@@ -24,7 +24,7 @@
#include "commands.h"
#include <kbookmark.h>
-#include <qwidget.h>
+#include <tqwidget.h>
#include <klineedit.h>
class QTimer;
@@ -32,16 +32,16 @@ class QTimer;
class BookmarkLineEdit : public KLineEdit {
Q_OBJECT
public:
- BookmarkLineEdit( QWidget * );
+ BookmarkLineEdit( TQWidget * );
public slots:
virtual void cut ();
};
-class BookmarkInfoWidget : public QWidget {
+class BookmarkInfoWidget : public TQWidget {
Q_OBJECT
public:
- BookmarkInfoWidget(QWidget * = 0, const char * = 0);
+ BookmarkInfoWidget(TQWidget * = 0, const char * = 0);
void showBookmark(const KBookmark &bk);
void saveBookmark(const KBookmark &bk);
KBookmark bookmark() { return m_bk; }
@@ -50,9 +50,9 @@ public:
void updateStatus();
public slots:
- void slotTextChangedURL(const QString &);
- void slotTextChangedTitle(const QString &);
- void slotTextChangedComment(const QString &);
+ void slotTextChangedURL(const TQString &);
+ void slotTextChangedTitle(const TQString &);
+ void slotTextChangedComment(const TQString &);
// _The deal with all those commitChanges() calls_
// First a short example how all the components
@@ -99,7 +99,7 @@ private:
NodeEditCommand *titlecmd;
EditCommand *urlcmd;
NodeEditCommand *commentcmd;
- QTimer * timer;
+ TQTimer * timer;
BookmarkLineEdit *m_title_le, *m_url_le,
*m_comment_le;
KLineEdit *m_visitdate_le, *m_credate_le,
diff --git a/konqueror/keditbookmarks/bookmarkiterator.cpp b/konqueror/keditbookmarks/bookmarkiterator.cpp
index 588adb86c..c30d890e3 100644
--- a/konqueror/keditbookmarks/bookmarkiterator.cpp
+++ b/konqueror/keditbookmarks/bookmarkiterator.cpp
@@ -26,11 +26,11 @@
#include <kdebug.h>
-#include <qtimer.h>
+#include <tqtimer.h>
-BookmarkIterator::BookmarkIterator(QValueList<KBookmark> bks) : m_bklist(bks) {
- connect(this, SIGNAL( deleteSelf(BookmarkIterator *) ),
- SLOT( slotCancelTest(BookmarkIterator *) ));
+BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> bks) : m_bklist(bks) {
+ connect(this, TQT_SIGNAL( deleteSelf(BookmarkIterator *) ),
+ TQT_SLOT( slotCancelTest(BookmarkIterator *) ));
delayedEmitNextOne();
}
@@ -39,7 +39,7 @@ BookmarkIterator::~BookmarkIterator() {
}
void BookmarkIterator::delayedEmitNextOne() {
- QTimer::singleShot(1, this, SLOT( nextOne() ));
+ TQTimer::singleShot(1, this, TQT_SLOT( nextOne() ));
}
void BookmarkIterator::slotCancelTest(BookmarkIterator *test) {
@@ -65,7 +65,7 @@ void BookmarkIterator::nextOne() {
return;
}
- QValueListIterator<KBookmark> head = m_bklist.begin();
+ TQValueListIterator<KBookmark> head = m_bklist.begin();
KBookmark bk = (*head);
bool viable = bk.hasParent() && isApplicable(bk);
diff --git a/konqueror/keditbookmarks/bookmarkiterator.h b/konqueror/keditbookmarks/bookmarkiterator.h
index baafb3486..0931ccaf7 100644
--- a/konqueror/keditbookmarks/bookmarkiterator.h
+++ b/konqueror/keditbookmarks/bookmarkiterator.h
@@ -21,8 +21,8 @@
#ifndef __bookmarkiterator_h
#define __bookmarkiterator_h
-#include <qobject.h>
-#include <qptrlist.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
#include <kbookmark.h>
class KEBListViewItem;
@@ -33,7 +33,7 @@ class BookmarkIterator : public QObject
Q_OBJECT
public:
- BookmarkIterator(QValueList<KBookmark> bks);
+ BookmarkIterator(TQValueList<KBookmark> bks);
virtual ~BookmarkIterator();
virtual BookmarkIteratorHolder* holder() const = 0;
@@ -53,7 +53,7 @@ protected:
private:
KBookmark m_bk;
- QValueList<KBookmark> m_bklist;
+ TQValueList<KBookmark> m_bklist;
};
class BookmarkIteratorHolder
@@ -68,7 +68,7 @@ protected:
virtual void doItrListChanged() = 0;
int count() const { return m_itrs.count(); }
private:
- QPtrList<BookmarkIterator> m_itrs;
+ TQPtrList<BookmarkIterator> m_itrs;
};
#endif
diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp
index e545df54e..2ad58a682 100644
--- a/konqueror/keditbookmarks/commands.cpp
+++ b/konqueror/keditbookmarks/commands.cpp
@@ -27,7 +27,7 @@
#include "listview.h"
#include <assert.h>
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
#include <kdebug.h>
#include <klocale.h>
@@ -38,10 +38,10 @@
#include <kurldrag.h>
#include <kdesktopfile.h>
-QString KEBMacroCommand::affectedBookmarks() const
+TQString KEBMacroCommand::affectedBookmarks() const
{
- QPtrListIterator<KCommand> it(m_commands);
- QString affectBook;
+ TQPtrListIterator<KCommand> it(m_commands);
+ TQString affectBook;
if(it.current())
affectBook = dynamic_cast<IKEBCommand *>(it.current())->affectedBookmarks();
++it;
@@ -50,34 +50,34 @@ QString KEBMacroCommand::affectedBookmarks() const
return affectBook;
}
-QString DeleteManyCommand::prevOrParentAddress(QString addr)
+TQString DeleteManyCommand::prevOrParentAddress(TQString addr)
{
- QString prev = KBookmark::previousAddress( addr );
+ TQString prev = KBookmark::previousAddress( addr );
if( CurrentMgr::bookmarkAt(prev).hasParent())
return prev;
else
return KBookmark::parentAddress( addr );
}
-QString DeleteManyCommand::preOrderNextAddress(QString addr)
+TQString DeleteManyCommand::preOrderNextAddress(TQString addr)
{
- QString rootAdr = CurrentMgr::self()->mgr()->root().address();
+ TQString rootAdr = CurrentMgr::self()->mgr()->root().address();
while(addr != rootAdr)
{
- QString next = KBookmark::nextAddress(addr);
+ TQString next = KBookmark::nextAddress(addr);
if(CurrentMgr::bookmarkAt( next ).hasParent() )
return next;
addr = KBookmark::parentAddress( addr );
}
- return QString::null;
+ return TQString::null;
}
-bool DeleteManyCommand::isConsecutive(const QValueList<QString> & addresses)
+bool DeleteManyCommand::isConsecutive(const TQValueList<TQString> & addresses)
{
- QValueList<QString>::const_iterator it, end;
+ TQValueList<TQString>::const_iterator it, end;
it = addresses.begin();
end = addresses.end();
- QString addr = *(addresses.begin());
+ TQString addr = *(addresses.begin());
for( ; it != end; ++it)
{
if( *it != addr )
@@ -88,10 +88,10 @@ bool DeleteManyCommand::isConsecutive(const QValueList<QString> & addresses)
}
-DeleteManyCommand::DeleteManyCommand(const QString &name, const QValueList<QString> & addresses)
+DeleteManyCommand::DeleteManyCommand(const TQString &name, const TQValueList<TQString> & addresses)
: KEBMacroCommand(name)
{
- QValueList<QString>::const_iterator it, begin;
+ TQValueList<TQString>::const_iterator it, begin;
begin = addresses.begin();
it = addresses.end();
while(begin != it)
@@ -110,7 +110,7 @@ DeleteManyCommand::DeleteManyCommand(const QString &name, const QValueList<QStri
else
{
m_currentAddress = preOrderNextAddress( KBookmark::parentAddress( *begin ) );
- if(m_currentAddress == QString::null)
+ if(m_currentAddress == TQString::null)
m_currentAddress = prevOrParentAddress( *begin );
}
}
@@ -119,20 +119,20 @@ DeleteManyCommand::DeleteManyCommand(const QString &name, const QValueList<QStri
// Check if all bookmarks are consecutive
if(isConsecutive(addresses)) // Mark next bookmark after all selected
{ // That's a little work...
- QValueList<QString>::const_iterator last = addresses.end();
+ TQValueList<TQString>::const_iterator last = addresses.end();
--last;
if( CurrentMgr::bookmarkAt( KBookmark::nextAddress(*last) ).hasParent() )
m_currentAddress = *begin;
else
{
m_currentAddress = preOrderNextAddress( KBookmark::parentAddress( *begin ) );
- if( m_currentAddress == QString::null)
+ if( m_currentAddress == TQString::null)
m_currentAddress = prevOrParentAddress( *begin );
}
}
else // not consecutive, select the common parent (This could be more clever)
{
- QValueList<QString>::const_iterator jt, end;
+ TQValueList<TQString>::const_iterator jt, end;
end = addresses.end();
m_currentAddress = *begin;
for( jt = addresses.begin(); jt != end; ++jt)
@@ -141,13 +141,13 @@ DeleteManyCommand::DeleteManyCommand(const QString &name, const QValueList<QStri
}
}
-QString DeleteManyCommand::currentAddress() const
+TQString DeleteManyCommand::currentAddress() const
{
return m_currentAddress;
}
-QString CreateCommand::name() const {
+TQString CreateCommand::name() const {
if (m_separator) {
return i18n("Insert Separator");
} else if (m_group) {
@@ -160,19 +160,19 @@ QString CreateCommand::name() const {
}
void CreateCommand::execute() {
- QString parentAddress = KBookmark::parentAddress(m_to);
+ TQString parentAddress = KBookmark::parentAddress(m_to);
KBookmarkGroup parentGroup =
CurrentMgr::bookmarkAt(parentAddress).toGroup();
- QString previousSibling = KBookmark::previousAddress(m_to);
+ TQString previousSibling = KBookmark::previousAddress(m_to);
// kdDebug() << "CreateCommand::execute previousSibling="
// << previousSibling << endl;
KBookmark prev = (previousSibling.isEmpty())
- ? KBookmark(QDomElement())
+ ? KBookmark(TQDomElement())
: CurrentMgr::bookmarkAt(previousSibling);
- KBookmark bk = KBookmark(QDomElement());
+ KBookmark bk = KBookmark(TQDomElement());
if (m_separator) {
bk = parentGroup.createNewSeparator();
@@ -207,7 +207,7 @@ void CreateCommand::execute() {
Q_ASSERT(bk.address() == m_to);
}
-QString CreateCommand::finalAddress() const {
+TQString CreateCommand::finalAddress() const {
Q_ASSERT( !m_to.isEmpty() );
return m_to;
}
@@ -223,14 +223,14 @@ void CreateCommand::unexecute() {
bk.parentGroup().deleteBookmark(bk);
}
-QString CreateCommand::affectedBookmarks() const
+TQString CreateCommand::affectedBookmarks() const
{
return KBookmark::parentAddress(m_to);
}
-QString CreateCommand::currentAddress() const
+TQString CreateCommand::currentAddress() const
{
- QString bk = KBookmark::previousAddress( m_to );
+ TQString bk = KBookmark::previousAddress( m_to );
if(CurrentMgr::bookmarkAt( bk).hasParent())
return bk;
else
@@ -239,7 +239,7 @@ QString CreateCommand::currentAddress() const
/* -------------------------------------- */
-QString EditCommand::name() const {
+TQString EditCommand::name() const {
return i18n("%1 Change").arg(m_mytext);
}
@@ -249,7 +249,7 @@ void EditCommand::execute() {
m_reverseEditions.clear();
- QValueList<Edition>::Iterator it = m_editions.begin();
+ TQValueList<Edition>::Iterator it = m_editions.begin();
for ( ; it != m_editions.end() ; ++it) {
// backup current value
@@ -270,15 +270,15 @@ void EditCommand::unexecute() {
m_editions = cmd.m_reverseEditions;
}
-QString EditCommand::affectedBookmarks() const
+TQString EditCommand::affectedBookmarks() const
{
return KBookmark::parentAddress(m_address);
}
-void EditCommand::modify(const QString & a, const QString & v)
+void EditCommand::modify(const TQString & a, const TQString & v)
{
- QValueList<Edition>::Iterator it = m_editions.begin();
- QValueList<Edition>::Iterator end = m_editions.end();
+ TQValueList<Edition>::Iterator it = m_editions.begin();
+ TQValueList<Edition>::Iterator end = m_editions.end();
for ( ; it != end; ++it)
{
if( (*it).attr == a)
@@ -288,29 +288,29 @@ void EditCommand::modify(const QString & a, const QString & v)
/* -------------------------------------- */
-QString NodeEditCommand::name() const {
+TQString NodeEditCommand::name() const {
// TODO - make dynamic
return i18n("Renaming");
}
-QString NodeEditCommand::getNodeText(KBookmark bk, const QStringList &nodehier) {
- QDomNode subnode = bk.internalElement();
- for (QStringList::ConstIterator it = nodehier.begin();
+TQString NodeEditCommand::getNodeText(KBookmark bk, const TQStringList &nodehier) {
+ TQDomNode subnode = bk.internalElement();
+ for (TQStringList::ConstIterator it = nodehier.begin();
it != nodehier.end(); ++it)
{
subnode = subnode.namedItem((*it));
if (subnode.isNull())
- return QString::null;
+ return TQString::null;
}
return (subnode.firstChild().isNull())
- ? QString::null
+ ? TQString::null
: subnode.firstChild().toText().data();
}
-QString NodeEditCommand::setNodeText(KBookmark bk, const QStringList &nodehier,
- const QString newValue) {
- QDomNode subnode = bk.internalElement();
- for (QStringList::ConstIterator it = nodehier.begin();
+TQString NodeEditCommand::setNodeText(KBookmark bk, const TQStringList &nodehier,
+ const TQString newValue) {
+ TQDomNode subnode = bk.internalElement();
+ for (TQStringList::ConstIterator it = nodehier.begin();
it != nodehier.end(); ++it)
{
subnode = subnode.namedItem((*it));
@@ -321,13 +321,13 @@ QString NodeEditCommand::setNodeText(KBookmark bk, const QStringList &nodehier,
}
if (subnode.firstChild().isNull()) {
- QDomText domtext = subnode.ownerDocument().createTextNode("");
+ TQDomText domtext = subnode.ownerDocument().createTextNode("");
subnode.appendChild(domtext);
}
- QDomText domtext = subnode.firstChild().toText();
+ TQDomText domtext = subnode.firstChild().toText();
- QString oldText = domtext.data();
+ TQString oldText = domtext.data();
domtext.setData(newValue);
return oldText;
}
@@ -336,7 +336,7 @@ void NodeEditCommand::execute() {
// DUPLICATED HEAVILY FROM KIO/BOOKMARKS
KBookmark bk = CurrentMgr::bookmarkAt(m_address);
Q_ASSERT(!bk.isNull());
- m_oldText = setNodeText(bk, QStringList() << m_nodename, m_newText);
+ m_oldText = setNodeText(bk, TQStringList() << m_nodename, m_newText);
}
void NodeEditCommand::unexecute() {
@@ -349,12 +349,12 @@ void NodeEditCommand::unexecute() {
m_newText = cmd.m_oldText;
}
-void NodeEditCommand::modify(const QString & newText)
+void NodeEditCommand::modify(const TQString & newText)
{
m_newText = newText;
}
-QString NodeEditCommand::affectedBookmarks() const
+TQString NodeEditCommand::affectedBookmarks() const
{
return KBookmark::parentAddress(m_address);
}
@@ -368,15 +368,15 @@ void DeleteCommand::execute() {
Q_ASSERT(!bk.isNull());
if (m_contentOnly) {
- QDomElement groupRoot = bk.internalElement();
+ TQDomElement groupRoot = bk.internalElement();
- QDomNode n = groupRoot.firstChild();
+ TQDomNode n = groupRoot.firstChild();
while (!n.isNull()) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
if (!e.isNull()) {
// kdDebug() << e.tagName() << endl;
}
- QDomNode next = n.nextSibling();
+ TQDomNode next = n.nextSibling();
groupRoot.removeChild(n);
n = next;
}
@@ -419,19 +419,19 @@ void DeleteCommand::unexecute() {
}
}
-QString DeleteCommand::affectedBookmarks() const
+TQString DeleteCommand::affectedBookmarks() const
{
return KBookmark::parentAddress(m_from);
}
KEBMacroCommand* DeleteCommand::deleteAll(const KBookmarkGroup & parentGroup) {
- KEBMacroCommand *cmd = new KEBMacroCommand(QString::null);
- QStringList lstToDelete;
+ KEBMacroCommand *cmd = new KEBMacroCommand(TQString::null);
+ TQStringList lstToDelete;
// we need to delete from the end, to avoid index shifting
for (KBookmark bk = parentGroup.first();
!bk.isNull(); bk = parentGroup.next(bk))
lstToDelete.prepend(bk.address());
- for (QStringList::Iterator it = lstToDelete.begin();
+ for (TQStringList::Iterator it = lstToDelete.begin();
it != lstToDelete.end(); ++it)
cmd->addCommand(new DeleteCommand((*it)));
return cmd;
@@ -439,7 +439,7 @@ KEBMacroCommand* DeleteCommand::deleteAll(const KBookmarkGroup & parentGroup) {
/* -------------------------------------- */
-QString MoveCommand::name() const {
+TQString MoveCommand::name() const {
return i18n("Move %1").arg(m_mytext);
}
@@ -456,12 +456,12 @@ void MoveCommand::execute() {
bool wasFirstChild = (KBookmark::positionInParent(m_from) == 0);
KBookmark oldPreviousSibling = wasFirstChild
- ? KBookmark(QDomElement())
+ ? KBookmark(TQDomElement())
: CurrentMgr::bookmarkAt(
KBookmark::previousAddress(m_from));
// look for m_to in the QDom tree
- QString parentAddress = KBookmark::parentAddress(m_to);
+ TQString parentAddress = KBookmark::parentAddress(m_to);
KBookmark newParent = CurrentMgr::bookmarkAt(parentAddress);
Q_ASSERT(!newParent.isNull());
@@ -470,10 +470,10 @@ void MoveCommand::execute() {
bool isFirstChild = (KBookmark::positionInParent(m_to) == 0);
if (isFirstChild) {
- newParent.toGroup().moveItem(bk, QDomElement());
+ newParent.toGroup().moveItem(bk, TQDomElement());
} else {
- QString afterAddress = KBookmark::previousAddress(m_to);
+ TQString afterAddress = KBookmark::previousAddress(m_to);
// kdDebug() << "MoveCommand::execute afterAddress="
// << afterAddress << endl;
@@ -497,7 +497,7 @@ void MoveCommand::execute() {
// << m_from << " to=" << m_to << endl;
}
-QString MoveCommand::finalAddress() const {
+TQString MoveCommand::finalAddress() const {
Q_ASSERT( !m_to.isEmpty() );
return m_to;
}
@@ -511,7 +511,7 @@ void MoveCommand::unexecute() {
m_to = undoCmd.m_from;
}
-QString MoveCommand::affectedBookmarks() const
+TQString MoveCommand::affectedBookmarks() const
{
return KBookmark::commonParent(KBookmark::parentAddress(m_from), KBookmark::parentAddress(m_to));
}
@@ -543,7 +543,7 @@ class SortItem {
class SortByName {
public:
- static QString key(const SortItem &item) {
+ static TQString key(const SortItem &item) {
return (item.bookmark().isGroup() ? "a" : "b")
+ (item.bookmark().fullText().lower());
}
@@ -558,7 +558,7 @@ void SortCommand::execute() {
SortItem firstChild(grp.first());
// this will call moveAfter, which will add
// the subcommands for moving the items
- kInsertionSort<SortItem, SortByName, QString, SortCommand>
+ kInsertionSort<SortItem, SortByName, TQString, SortCommand>
(firstChild, (*this));
} else {
@@ -569,7 +569,7 @@ void SortCommand::execute() {
void SortCommand::moveAfter(const SortItem &moveMe,
const SortItem &afterMe) {
- QString destAddress =
+ TQString destAddress =
afterMe.isNull()
// move as first child
? KBookmark::parentAddress(moveMe.bookmark().address()) + "/0"
@@ -586,7 +586,7 @@ void SortCommand::unexecute() {
KEBMacroCommand::unexecute();
}
-QString SortCommand::affectedBookmarks() const
+TQString SortCommand::affectedBookmarks() const
{
return m_groupAddress;
}
@@ -598,14 +598,14 @@ KEBMacroCommand* CmdGen::setAsToolbar(const KBookmark &bk) {
KBookmarkGroup oldToolbar = CurrentMgr::self()->mgr()->toolbar();
if (!oldToolbar.isNull()) {
- QValueList<EditCommand::Edition> lst;
+ TQValueList<EditCommand::Edition> lst;
lst.append(EditCommand::Edition("toolbar", "no"));
lst.append(EditCommand::Edition("icon", ""));
EditCommand *cmd1 = new EditCommand(oldToolbar.address(), lst);
mcmd->addCommand(cmd1);
}
- QValueList<EditCommand::Edition> lst;
+ TQValueList<EditCommand::Edition> lst;
lst.append(EditCommand::Edition("toolbar", "yes"));
lst.append(EditCommand::Edition("icon", "bookmark_toolbar"));
// TODO - see below
@@ -619,16 +619,16 @@ bool CmdGen::shownInToolbar(const KBookmark &bk) {
return (bk.internalElement().attribute("showintoolbar") == "yes");
}
-KEBMacroCommand* CmdGen::setShownInToolbar(const QValueList<KBookmark> &bks, bool show) {
- QString i18n_name = i18n("%1 in Bookmark Toolbar").arg(show ? i18n("Show")
+KEBMacroCommand* CmdGen::setShownInToolbar(const TQValueList<KBookmark> &bks, bool show) {
+ TQString i18n_name = i18n("%1 in Bookmark Toolbar").arg(show ? i18n("Show")
: i18n("Hide"));
KEBMacroCommand *mcmd = new KEBMacroCommand(i18n_name);
- QValueList<KBookmark>::ConstIterator it, end;
+ TQValueList<KBookmark>::ConstIterator it, end;
end = bks.end();
for(it = bks.begin(); it != end; ++it)
{
- QValueList<EditCommand::Edition> lst;
+ TQValueList<EditCommand::Edition> lst;
lst.append(EditCommand::Edition("showintoolbar", show ? "yes" : "no"));
EditCommand *cmd = new EditCommand((*it).address(), lst);
mcmd->addCommand(cmd);
@@ -637,9 +637,9 @@ KEBMacroCommand* CmdGen::setShownInToolbar(const QValueList<KBookmark> &bks, boo
}
KEBMacroCommand* CmdGen::insertMimeSource(
- const QString &cmdName, QMimeSource *_data, const QString &addr
+ const TQString &cmdName, TQMimeSource *_data, const TQString &addr
) {
- QMimeSource *data = _data;
+ TQMimeSource *data = _data;
bool modified = false;
const char *format = 0;
for (int i = 0; format = data->format(i), format; i++) {
@@ -648,7 +648,7 @@ KEBMacroCommand* CmdGen::insertMimeSource(
// or not. so, we search. sucky...
if (strcmp(format, "GALEON_BOOKMARK") == 0) {
modified = true;
- QStoredDrag *mydrag = new QStoredDrag("application/x-xbel");
+ TQStoredDrag *mydrag = new TQStoredDrag("application/x-xbel");
mydrag->setEncodedData(data->encodedData("GALEON_BOOKMARK"));
data = mydrag;
break;
@@ -661,14 +661,14 @@ KEBMacroCommand* CmdGen::insertMimeSource(
continue; // break out of format loop
KURL::List::ConstIterator uit = uris.begin();
KURL::List::ConstIterator uEnd = uris.end();
- QValueList<KBookmark> urlBks;
+ TQValueList<KBookmark> urlBks;
for ( ; uit != uEnd ; ++uit ) {
if (!(*uit).url().endsWith(".desktop")) {
urlBks << KBookmark::standaloneBookmark((*uit).prettyURL(), (*uit));
continue;
}
KDesktopFile df((*uit).path(), true);
- QString title = df.readName();
+ TQString title = df.readName();
KURL url(df.readURL());
if (title.isNull())
title = url.prettyURL();
@@ -686,9 +686,9 @@ KEBMacroCommand* CmdGen::insertMimeSource(
return 0;
}
KEBMacroCommand *mcmd = new KEBMacroCommand(cmdName);
- QString currentAddress = addr;
- QValueList<KBookmark> bookmarks = KBookmarkDrag::decode(data);
- for (QValueListConstIterator<KBookmark> it = bookmarks.begin();
+ TQString currentAddress = addr;
+ TQValueList<KBookmark> bookmarks = KBookmarkDrag::decode(data);
+ for (TQValueListConstIterator<KBookmark> it = bookmarks.begin();
it != bookmarks.end(); ++it) {
CreateCommand *cmd = new CreateCommand(currentAddress, (*it));
cmd->execute();
@@ -700,17 +700,17 @@ KEBMacroCommand* CmdGen::insertMimeSource(
return mcmd;
}
-KEBMacroCommand* CmdGen::itemsMoved(const QValueVector<KEBListViewItem *> & items,
- const QString &newAddress, bool copy) {
+KEBMacroCommand* CmdGen::itemsMoved(const TQValueVector<KEBListViewItem *> & items,
+ const TQString &newAddress, bool copy) {
KEBMacroCommand *mcmd = new KEBMacroCommand(copy ? i18n("Copy Items")
: i18n("Move Items"));
- QValueList<KBookmark> list = ListView::self()->itemsToBookmarks( items );
- QValueList<KBookmark>::const_iterator it, end;
+ TQValueList<KBookmark> list = ListView::self()->itemsToBookmarks( items );
+ TQValueList<KBookmark>::const_iterator it, end;
it = list.begin();
end = list.end();
- QString bkInsertAddr = newAddress;
+ TQString bkInsertAddr = newAddress;
for (; it != end; ++it) {
if (copy) {
CreateCommand *cmd;
@@ -726,7 +726,7 @@ KEBMacroCommand* CmdGen::itemsMoved(const QValueVector<KEBListViewItem *> & item
bkInsertAddr = cmd->finalAddress();
} else /* if (move) */ {
- QString oldAddress = (*it).address();
+ TQString oldAddress = (*it).address();
if (bkInsertAddr.startsWith(oldAddress)) //FIXME uses internal representation of address
continue;
diff --git a/konqueror/keditbookmarks/commands.h b/konqueror/keditbookmarks/commands.h
index 61363f9dd..3df5d3acf 100644
--- a/konqueror/keditbookmarks/commands.h
+++ b/konqueror/keditbookmarks/commands.h
@@ -23,7 +23,7 @@
#include <kcommand.h>
#include <kbookmark.h>
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
// Interface adds the affectedBookmarks method
// Any class should on call add those bookmarks which are
@@ -35,82 +35,82 @@ class IKEBCommand
public:
IKEBCommand() {};
virtual ~IKEBCommand() {};
- virtual QString affectedBookmarks() const = 0;
- virtual QString currentAddress() const { return QString::null; }
+ virtual TQString affectedBookmarks() const = 0;
+ virtual TQString currentAddress() const { return TQString::null; }
};
class KEBMacroCommand : public KMacroCommand, public IKEBCommand
{
public:
- KEBMacroCommand(const QString &name)
+ KEBMacroCommand(const TQString &name)
: KMacroCommand(name) {};
virtual ~KEBMacroCommand() {};
- virtual QString affectedBookmarks() const;
+ virtual TQString affectedBookmarks() const;
};
class DeleteManyCommand : public KEBMacroCommand
{
public:
- DeleteManyCommand(const QString &name, const QValueList<QString> & addresses);
+ DeleteManyCommand(const TQString &name, const TQValueList<TQString> & addresses);
virtual ~DeleteManyCommand() {};
- virtual QString currentAddress() const;
+ virtual TQString currentAddress() const;
private:
- QString prevOrParentAddress(QString addr);
- QString preOrderNextAddress(QString addr);
- bool isConsecutive(const QValueList<QString> & addresses);
- QString m_currentAddress;
+ TQString prevOrParentAddress(TQString addr);
+ TQString preOrderNextAddress(TQString addr);
+ bool isConsecutive(const TQValueList<TQString> & addresses);
+ TQString m_currentAddress;
};
class CreateCommand : public KCommand, public IKEBCommand
{
public:
// separator
- CreateCommand(const QString &address)
+ CreateCommand(const TQString &address)
: KCommand(), m_to(address),
- m_group(false), m_separator(true), m_originalBookmark(QDomElement())
+ m_group(false), m_separator(true), m_originalBookmark(TQDomElement())
{ ; }
// bookmark
- CreateCommand(const QString &address,
- const QString &text, const QString &iconPath,
+ CreateCommand(const TQString &address,
+ const TQString &text, const TQString &iconPath,
const KURL &url)
: KCommand(), m_to(address), m_text(text), m_iconPath(iconPath), m_url(url),
- m_group(false), m_separator(false), m_originalBookmark(QDomElement())
+ m_group(false), m_separator(false), m_originalBookmark(TQDomElement())
{ ; }
// folder
- CreateCommand(const QString &address,
- const QString &text, const QString &iconPath,
+ CreateCommand(const TQString &address,
+ const TQString &text, const TQString &iconPath,
bool open)
: KCommand(), m_to(address), m_text(text), m_iconPath(iconPath),
- m_group(true), m_separator(false), m_open(open), m_originalBookmark(QDomElement())
+ m_group(true), m_separator(false), m_open(open), m_originalBookmark(TQDomElement())
{ ; }
// clone existing bookmark
- CreateCommand(const QString &address,
- const KBookmark &original, const QString &name = QString::null)
+ CreateCommand(const TQString &address,
+ const KBookmark &original, const TQString &name = TQString::null)
: KCommand(), m_to(address), m_group(false), m_separator(false),
m_open(false), m_originalBookmark(original), m_mytext(name)
{ ; }
- QString finalAddress() const;
+ TQString finalAddress() const;
virtual ~CreateCommand() { ; }
virtual void execute();
virtual void unexecute();
- virtual QString name() const;
- virtual QString affectedBookmarks() const;
- virtual QString currentAddress() const;
+ virtual TQString name() const;
+ virtual TQString affectedBookmarks() const;
+ virtual TQString currentAddress() const;
private:
- QString m_to;
- QString m_text;
- QString m_iconPath;
+ TQString m_to;
+ TQString m_text;
+ TQString m_iconPath;
KURL m_url;
bool m_group:1;
bool m_separator:1;
bool m_open:1;
KBookmark m_originalBookmark;
- QString m_mytext;
+ TQString m_mytext;
};
class EditCommand : public KCommand, public IKEBCommand
@@ -119,82 +119,82 @@ public:
struct Edition {
Edition() { ; } // needed for QValueList
- Edition(const QString &a, const QString &v) : attr(a), value(v) {}
- QString attr;
- QString value;
+ Edition(const TQString &a, const TQString &v) : attr(a), value(v) {}
+ TQString attr;
+ TQString value;
};
// change one attribute
- EditCommand(const QString &address, Edition edition, const QString &name = QString::null)
+ EditCommand(const TQString &address, Edition edition, const TQString &name = TQString::null)
: KCommand(), m_address(address), m_mytext(name)
{
m_editions.append(edition);
}
// change multiple attributes
- EditCommand(const QString &address,
- const QValueList<Edition> &editions,
- const QString &name = QString::null)
+ EditCommand(const TQString &address,
+ const TQValueList<Edition> &editions,
+ const TQString &name = TQString::null)
: KCommand(), m_address(address), m_editions(editions), m_mytext(name)
{ ; }
- void modify(const QString & a, const QString & v);
+ void modify(const TQString & a, const TQString & v);
virtual ~EditCommand() { ; }
virtual void execute();
virtual void unexecute();
- virtual QString name() const;
- virtual QString affectedBookmarks() const;
+ virtual TQString name() const;
+ virtual TQString affectedBookmarks() const;
private:
- QString m_address;
- QValueList<Edition> m_editions;
- QValueList<Edition> m_reverseEditions;
- QString m_mytext;
+ TQString m_address;
+ TQValueList<Edition> m_editions;
+ TQValueList<Edition> m_reverseEditions;
+ TQString m_mytext;
};
class NodeEditCommand : public KCommand, public IKEBCommand
{
public:
- NodeEditCommand(const QString &address,
- const QString &newText,
- const QString &nodeName)
+ NodeEditCommand(const TQString &address,
+ const TQString &newText,
+ const TQString &nodeName)
: KCommand(), m_address(address), m_newText(newText), m_nodename(nodeName)
{ ; }
- void modify(const QString & newText);
+ void modify(const TQString & newText);
virtual ~NodeEditCommand() { ; }
virtual void execute();
virtual void unexecute();
- virtual QString affectedBookmarks() const;
- virtual QString name() const;
- static QString getNodeText(KBookmark bk, const QStringList &nodehier);
- static QString setNodeText(KBookmark bk, const QStringList &nodehier,
- QString newValue);
+ virtual TQString affectedBookmarks() const;
+ virtual TQString name() const;
+ static TQString getNodeText(KBookmark bk, const TQStringList &nodehier);
+ static TQString setNodeText(KBookmark bk, const TQStringList &nodehier,
+ TQString newValue);
private:
- QString m_address;
- QString m_newText;
- QString m_oldText;
- QString m_nodename;
+ TQString m_address;
+ TQString m_newText;
+ TQString m_oldText;
+ TQString m_nodename;
};
class DeleteCommand : public KCommand, public IKEBCommand
{
public:
- DeleteCommand(const QString &from, bool contentOnly = false)
+ DeleteCommand(const TQString &from, bool contentOnly = false)
: KCommand(), m_from(from), m_cmd(0L), m_subCmd(0L), m_contentOnly(contentOnly)
{ ; }
virtual ~DeleteCommand() { delete m_cmd; delete m_subCmd;}
virtual void execute();
virtual void unexecute();
- virtual QString name() const {
+ virtual TQString name() const {
// NOTE - DeleteCommand needs no name, its always embedded in a macrocommand
return "";
};
- virtual QString affectedBookmarks() const;
+ virtual TQString affectedBookmarks() const;
static KEBMacroCommand* deleteAll(const KBookmarkGroup &parentGroup);
private:
- QString m_from;
+ TQString m_from;
KCommand *m_cmd;
KEBMacroCommand *m_subCmd;
bool m_contentOnly;
@@ -205,19 +205,19 @@ class MoveCommand : public KCommand, public IKEBCommand
public:
// "Create it with itemsAlreadyMoved=true since
// "KListView moves the item before telling us about it."
- MoveCommand(const QString &from, const QString &to, const QString &name = QString::null)
+ MoveCommand(const TQString &from, const TQString &to, const TQString &name = TQString::null)
: KCommand(), m_from(from), m_to(to), m_mytext(name)
{ ; }
- QString finalAddress() const;
+ TQString finalAddress() const;
virtual ~MoveCommand() { ; }
virtual void execute();
virtual void unexecute();
- virtual QString name() const;
- virtual QString affectedBookmarks() const;
+ virtual TQString name() const;
+ virtual TQString affectedBookmarks() const;
private:
- QString m_from;
- QString m_to;
- QString m_mytext;
+ TQString m_from;
+ TQString m_to;
+ TQString m_mytext;
};
class SortItem;
@@ -225,18 +225,18 @@ class SortItem;
class SortCommand : public KEBMacroCommand
{
public:
- SortCommand(const QString &name, const QString &groupAddress)
+ SortCommand(const TQString &name, const TQString &groupAddress)
: KEBMacroCommand(name), m_groupAddress(groupAddress)
{ ; }
virtual ~SortCommand()
{ ; }
virtual void execute();
virtual void unexecute();
- virtual QString affectedBookmarks() const;
+ virtual TQString affectedBookmarks() const;
// internal
void moveAfter(const SortItem &moveMe, const SortItem &afterMe);
private:
- QString m_groupAddress;
+ TQString m_groupAddress;
};
class KEBListViewItem;
@@ -244,11 +244,11 @@ class KEBListViewItem;
class CmdGen {
public:
static KEBMacroCommand* setAsToolbar(const KBookmark &bk);
- static KEBMacroCommand* setShownInToolbar(const QValueList<KBookmark> &bk, bool show);
+ static KEBMacroCommand* setShownInToolbar(const TQValueList<KBookmark> &bk, bool show);
static bool shownInToolbar(const KBookmark &bk);
- static KEBMacroCommand* deleteItems(const QString &commandName, const QValueVector<KEBListViewItem *> & items);
- static KEBMacroCommand* insertMimeSource(const QString &cmdName, QMimeSource *data, const QString &addr);
- static KEBMacroCommand* itemsMoved(const QValueVector<KEBListViewItem *> & items, const QString &newAddress, bool copy);
+ static KEBMacroCommand* deleteItems(const TQString &commandName, const TQValueVector<KEBListViewItem *> & items);
+ static KEBMacroCommand* insertMimeSource(const TQString &cmdName, TQMimeSource *data, const TQString &addr);
+ static KEBMacroCommand* itemsMoved(const TQValueVector<KEBListViewItem *> & items, const TQString &newAddress, bool copy);
private:
CmdGen() { ; }
};
diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp
index 76b27b9b6..a31af0c80 100644
--- a/konqueror/keditbookmarks/dcop.cpp
+++ b/konqueror/keditbookmarks/dcop.cpp
@@ -26,9 +26,9 @@
#include <stdlib.h>
-#include <qclipboard.h>
-#include <qpopupmenu.h>
-#include <qpainter.h>
+#include <tqclipboard.h>
+#include <tqpopupmenu.h>
+#include <tqpainter.h>
#include <klocale.h>
#include <kbookmarkmanager.h>
@@ -38,13 +38,13 @@
KBookmarkEditorIface::KBookmarkEditorIface()
- : QObject(), DCOPObject("KBookmarkEditor") {
- // connect(KBookmarkNotifier_stub, SIGNAL( updatedAccessMetadata(QString,QString) ),
- // this, SLOT( slotDcopUpdatedAccessMetadata(QString,QString) ));
- connectDCOPSignal(0, "KBookmarkNotifier", "updatedAccessMetadata(QString,QString)", "slotDcopUpdatedAccessMetadata(QString,QString)", false);
+ : TQObject(), DCOPObject("KBookmarkEditor") {
+ // connect(KBookmarkNotifier_stub, TQT_SIGNAL( updatedAccessMetadata(TQString,TQString) ),
+ // this, TQT_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) ));
+ connectDCOPSignal(0, "KBookmarkNotifier", "updatedAccessMetadata(TQString,TQString)", "slotDcopUpdatedAccessMetadata(TQString,TQString)", false);
}
-void KBookmarkEditorIface::slotDcopUpdatedAccessMetadata(QString filename, QString url) {
+void KBookmarkEditorIface::slotDcopUpdatedAccessMetadata(TQString filename, TQString url) {
// evil hack, konqi gets updates by way of historymgr,
// therefore konqi does'nt want "save" notification,
// unfortunately to stop konqi getting it is difficult
diff --git a/konqueror/keditbookmarks/dcop.h b/konqueror/keditbookmarks/dcop.h
index 3e8e545d8..6914f2db4 100644
--- a/konqueror/keditbookmarks/dcop.h
+++ b/konqueror/keditbookmarks/dcop.h
@@ -23,14 +23,14 @@
#include <dcopobject.h>
-class KBookmarkEditorIface : public QObject, public DCOPObject
+class KBookmarkEditorIface : public TQObject, public DCOPObject
{
Q_OBJECT
K_DCOP
public:
KBookmarkEditorIface();
k_dcop_hidden:
- void slotDcopUpdatedAccessMetadata(QString filename, QString url);
+ void slotDcopUpdatedAccessMetadata(TQString filename, TQString url);
};
#endif
diff --git a/konqueror/keditbookmarks/exporters.cpp b/konqueror/keditbookmarks/exporters.cpp
index 4b1bbb5e7..912edcb9a 100644
--- a/konqueror/keditbookmarks/exporters.cpp
+++ b/konqueror/keditbookmarks/exporters.cpp
@@ -24,24 +24,24 @@
#include <klocale.h>
#include <kapplication.h>
-#include <qfile.h>
+#include <tqfile.h>
HTMLExporter::HTMLExporter()
: m_out(&m_string, IO_WriteOnly) {
}
-void HTMLExporter::write(const KBookmarkGroup &grp, const QString &filename, bool showAddress) {
- QFile file(filename);
+void HTMLExporter::write(const KBookmarkGroup &grp, const TQString &filename, bool showAddress) {
+ TQFile file(filename);
if (!file.open(IO_WriteOnly)) {
kdError(7043) << "Can't write to file " << filename << endl;
return;
}
- QTextStream tstream(&file);
- tstream.setEncoding(QTextStream::UnicodeUTF8);
+ TQTextStream tstream(&file);
+ tstream.setEncoding(TQTextStream::UnicodeUTF8);
tstream << toString(grp, showAddress);
}
-QString HTMLExporter::toString(const KBookmarkGroup &grp, bool showAddress)
+TQString HTMLExporter::toString(const KBookmarkGroup &grp, bool showAddress)
{
m_showAddress = showAddress;
traverse(grp);
diff --git a/konqueror/keditbookmarks/exporters.h b/konqueror/keditbookmarks/exporters.h
index cdc3844ba..e40964371 100644
--- a/konqueror/keditbookmarks/exporters.h
+++ b/konqueror/keditbookmarks/exporters.h
@@ -24,15 +24,15 @@
class HTMLExporter : private KBookmarkGroupTraverser {
public:
HTMLExporter();
- QString toString(const KBookmarkGroup &, bool showAddress = false);
- void write(const KBookmarkGroup &, const QString &, bool showAddress = false);
+ TQString toString(const KBookmarkGroup &, bool showAddress = false);
+ void write(const KBookmarkGroup &, const TQString &, bool showAddress = false);
private:
virtual void visit(const KBookmark &);
virtual void visitEnter(const KBookmarkGroup &);
virtual void visitLeave(const KBookmarkGroup &);
private:
- QString m_string;
- QTextStream m_out;
+ TQString m_string;
+ TQTextStream m_out;
bool m_showAddress;
};
diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index b99371324..b9b9b4ea9 100644
--- a/konqueror/keditbookmarks/favicons.cpp
+++ b/konqueror/keditbookmarks/favicons.cpp
@@ -43,11 +43,11 @@ void FavIconsItrHolder::doItrListChanged() {
{
kdDebug()<<"Notifing managers "<<m_affectedBookmark<<endl;
CurrentMgr::self()->notifyManagers(CurrentMgr::bookmarkAt(m_affectedBookmark).toGroup());
- m_affectedBookmark = QString::null;
+ m_affectedBookmark = TQString::null;
}
}
-void FavIconsItrHolder::addAffectedBookmark( const QString & address )
+void FavIconsItrHolder::addAffectedBookmark( const TQString & address )
{
kdDebug()<<"addAffectedBookmark "<<address<<endl;
if(m_affectedBookmark.isNull())
@@ -59,7 +59,7 @@ void FavIconsItrHolder::addAffectedBookmark( const QString & address )
/* -------------------------- */
-FavIconsItr::FavIconsItr(QValueList<KBookmark> bks)
+FavIconsItr::FavIconsItr(TQValueList<KBookmark> bks)
: BookmarkIterator(bks) {
m_updater = 0;
}
@@ -86,8 +86,8 @@ void FavIconsItr::doAction() {
curItem()->setTmpStatus(i18n("Updating favicon..."));
if (!m_updater) {
m_updater = new FavIconUpdater(kapp, "FavIconUpdater");
- connect(m_updater, SIGNAL( done(bool) ),
- this, SLOT( slotDone(bool) ) );
+ connect(m_updater, TQT_SIGNAL( done(bool) ),
+ this, TQT_SLOT( slotDone(bool) ) );
}
if (curBk().url().protocol().startsWith("http")) {
m_updater->downloadIcon(curBk());
diff --git a/konqueror/keditbookmarks/favicons.h b/konqueror/keditbookmarks/favicons.h
index 81f7ed923..97894d741 100644
--- a/konqueror/keditbookmarks/favicons.h
+++ b/konqueror/keditbookmarks/favicons.h
@@ -34,13 +34,13 @@ public:
static FavIconsItrHolder* self() {
if (!s_self) { s_self = new FavIconsItrHolder(); }; return s_self;
}
- void addAffectedBookmark( const QString & address );
+ void addAffectedBookmark( const TQString & address );
protected:
virtual void doItrListChanged();
private:
FavIconsItrHolder();
static FavIconsItrHolder *s_self;
- QString m_affectedBookmark;
+ TQString m_affectedBookmark;
};
class FavIconUpdater;
@@ -50,7 +50,7 @@ class FavIconsItr : public BookmarkIterator
Q_OBJECT
public:
- FavIconsItr(QValueList<KBookmark> bks);
+ FavIconsItr(TQValueList<KBookmark> bks);
~FavIconsItr();
virtual FavIconsItrHolder* holder() const { return FavIconsItrHolder::self(); }
diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp
index 6b59f04cd..4df0d237d 100644
--- a/konqueror/keditbookmarks/importers.cpp
+++ b/konqueror/keditbookmarks/importers.cpp
@@ -25,7 +25,7 @@
#include "toplevel.h"
#include "listview.h"
-#include <qregexp.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <klocale.h>
@@ -40,15 +40,15 @@
#include <kbookmarkimporter_crash.h>
#include <kbookmarkdombuilder.h>
-QString ImportCommand::name() const {
+TQString ImportCommand::name() const {
return i18n("Import %1 Bookmarks").arg(visibleName());
}
-QString ImportCommand::folder() const {
- return m_folder ? i18n("%1 Bookmarks").arg(visibleName()) : QString::null;
+TQString ImportCommand::folder() const {
+ return m_folder ? i18n("%1 Bookmarks").arg(visibleName()) : TQString::null;
}
-ImportCommand* ImportCommand::importerFactory(const QCString &type) {
+ImportCommand* ImportCommand::importerFactory(const TQCString &type) {
if (type == "Galeon") return new GaleonImportCommand();
else if (type == "IE") return new IEImportCommand();
else if (type == "KDE2") return new KDE2ImportCommand();
@@ -62,10 +62,10 @@ ImportCommand* ImportCommand::importerFactory(const QCString &type) {
}
}
-ImportCommand* ImportCommand::performImport(const QCString &type, QWidget *top) {
+ImportCommand* ImportCommand::performImport(const TQCString &type, TQWidget *top) {
ImportCommand *importer = ImportCommand::importerFactory(type);
- QString mydirname = importer->requestFilename();
+ TQString mydirname = importer->requestFilename();
if (mydirname.isEmpty()) {
delete importer;
return 0;
@@ -136,9 +136,9 @@ void ImportCommand::unexecute() {
}
}
-QString ImportCommand::affectedBookmarks() const
+TQString ImportCommand::affectedBookmarks() const
{
- QString rootAdr = CurrentMgr::self()->mgr()->root().address();
+ TQString rootAdr = CurrentMgr::self()->mgr()->root().address();
if(m_group == rootAdr)
return m_group;
else
@@ -147,42 +147,42 @@ QString ImportCommand::affectedBookmarks() const
/* -------------------------------------- */
-QString MozImportCommand::requestFilename() const {
+TQString MozImportCommand::requestFilename() const {
static KMozillaBookmarkImporterImpl importer;
return importer.findDefaultLocation();
}
-QString NSImportCommand::requestFilename() const {
+TQString NSImportCommand::requestFilename() const {
static KNSBookmarkImporterImpl importer;
return importer.findDefaultLocation();
}
-QString OperaImportCommand::requestFilename() const {
+TQString OperaImportCommand::requestFilename() const {
static KOperaBookmarkImporterImpl importer;
return importer.findDefaultLocation();
}
-QString CrashesImportCommand::requestFilename() const {
+TQString CrashesImportCommand::requestFilename() const {
static KCrashBookmarkImporterImpl importer;
return importer.findDefaultLocation();
}
-QString IEImportCommand::requestFilename() const {
+TQString IEImportCommand::requestFilename() const {
static KIEBookmarkImporterImpl importer;
return importer.findDefaultLocation();
}
// following two are really just xbel
-QString GaleonImportCommand::requestFilename() const {
+TQString GaleonImportCommand::requestFilename() const {
return KFileDialog::getOpenFileName(
- QDir::homeDirPath() + "/.galeon",
+ TQDir::homeDirPath() + "/.galeon",
i18n("*.xbel|Galeon Bookmark Files (*.xbel)"));
}
#include "kstandarddirs.h"
-QString KDE2ImportCommand::requestFilename() const {
+TQString KDE2ImportCommand::requestFilename() const {
return KFileDialog::getOpenFileName(
locateLocal("data", "konqueror"),
i18n("*.xml|KDE Bookmark Files (*.xml)"));
@@ -233,10 +233,10 @@ void XBELImportCommand::doExecute(const KBookmarkGroup &/*bkGroup*/) {
// check if already open first???
KBookmarkManager *pManager = KBookmarkManager::managerForFile(m_fileName, false);
- QDomDocument doc = CurrentMgr::self()->mgr()->internalDocument();
+ TQDomDocument doc = CurrentMgr::self()->mgr()->internalDocument();
// get the xbel
- QDomNode subDoc = pManager->internalDocument().namedItem("xbel").cloneNode();
+ TQDomNode subDoc = pManager->internalDocument().namedItem("xbel").cloneNode();
if (subDoc.isProcessingInstruction())
subDoc = subDoc.nextSibling();
if (subDoc.isDocumentType())
@@ -249,42 +249,42 @@ void XBELImportCommand::doExecute(const KBookmarkGroup &/*bkGroup*/) {
subDoc.toElement().setTagName("folder");
// clear attributes
- QStringList tags;
+ TQStringList tags;
for (uint i = 0; i < subDoc.attributes().count(); i++)
tags << subDoc.attributes().item(i).toAttr().name();
- for (QStringList::Iterator it = tags.begin(); it != tags.end(); ++it)
+ for (TQStringList::Iterator it = tags.begin(); it != tags.end(); ++it)
subDoc.attributes().removeNamedItem((*it));
subDoc.toElement().setAttribute("icon", m_icon);
// give the folder a name
- QDomElement textElem = doc.createElement("title");
+ TQDomElement textElem = doc.createElement("title");
subDoc.insertBefore(textElem, subDoc.firstChild());
textElem.appendChild(doc.createTextNode(folder()));
}
// import and add it
- QDomNode node = doc.importNode(subDoc, true);
+ TQDomNode node = doc.importNode(subDoc, true);
if (!folder().isEmpty()) {
CurrentMgr::self()->mgr()->root().internalElement().appendChild(node);
m_group = KBookmarkGroup(node.toElement()).address();
} else {
- QDomElement root = CurrentMgr::self()->mgr()->root().internalElement();
+ TQDomElement root = CurrentMgr::self()->mgr()->root().internalElement();
- QValueList<QDomElement> childList;
+ TQValueList<TQDomElement> childList;
- QDomNode n = subDoc.firstChild().toElement();
+ TQDomNode n = subDoc.firstChild().toElement();
while (!n.isNull()) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
if (!e.isNull())
childList.append(e);
n = n.nextSibling();
}
- QValueList<QDomElement>::Iterator it = childList.begin();
- QValueList<QDomElement>::Iterator end = childList.end();
+ TQValueList<TQDomElement>::Iterator it = childList.begin();
+ TQValueList<TQDomElement>::Iterator end = childList.end();
for (; it!= end ; ++it)
root.appendChild((*it));
}
diff --git a/konqueror/keditbookmarks/importers.h b/konqueror/keditbookmarks/importers.h
index 929bf249a..ef23f5527 100644
--- a/konqueror/keditbookmarks/importers.h
+++ b/konqueror/keditbookmarks/importers.h
@@ -29,11 +29,11 @@
#include <kcommand.h>
#include <kbookmark.h>
-#include <qptrstack.h>
-#include <qobject.h>
+#include <tqptrstack.h>
+#include <tqobject.h>
// part pure
-class ImportCommand : public QObject, public KCommand, public IKEBCommand
+class ImportCommand : public TQObject, public KCommand, public IKEBCommand
{
Q_OBJECT
public:
@@ -41,24 +41,24 @@ public:
: KCommand(), m_utf8(false), m_folder(false), m_cleanUpCmd(0L)
{ ; }
- virtual void import(const QString &fileName, bool folder) = 0;
+ virtual void import(const TQString &fileName, bool folder) = 0;
- virtual QString name() const;
- virtual QString visibleName() const { return m_visibleName; }
- virtual QString requestFilename() const = 0;
+ virtual TQString name() const;
+ virtual TQString visibleName() const { return m_visibleName; }
+ virtual TQString requestFilename() const = 0;
- static ImportCommand* performImport(const QCString &, QWidget *);
- static ImportCommand* importerFactory(const QCString &);
+ static ImportCommand* performImport(const TQCString &, TQWidget *);
+ static ImportCommand* importerFactory(const TQCString &);
virtual ~ImportCommand()
{ ; }
virtual void execute();
virtual void unexecute();
- virtual QString affectedBookmarks() const;
+ virtual TQString affectedBookmarks() const;
- QString groupAddress() const { return m_group; }
- QString folder() const;
+ TQString groupAddress() const { return m_group; }
+ TQString folder() const;
protected:
/**
@@ -67,7 +67,7 @@ protected:
* @param icon icon for the new folder, if @p folder isn't empty
* @param utf8 true if the HTML is in utf-8 encoding
*/
- void init(const QString &fileName, bool folder, const QString &icon, bool utf8)
+ void init(const TQString &fileName, bool folder, const TQString &icon, bool utf8)
{
m_fileName = fileName;
m_folder = folder;
@@ -79,10 +79,10 @@ protected:
virtual void doExecute(const KBookmarkGroup &) = 0;
protected:
- QString m_visibleName;
- QString m_fileName;
- QString m_icon;
- QString m_group;
+ TQString m_visibleName;
+ TQString m_fileName;
+ TQString m_icon;
+ TQString m_group;
bool m_utf8;
private:
@@ -95,8 +95,8 @@ class XBELImportCommand : public ImportCommand
{
public:
XBELImportCommand() : ImportCommand() { ; }
- virtual void import(const QString &fileName, bool folder) = 0;
- virtual QString requestFilename() const = 0;
+ virtual void import(const TQString &fileName, bool folder) = 0;
+ virtual TQString requestFilename() const = 0;
private:
virtual void doCreateHoldingFolder(KBookmarkGroup &bkGroup);
virtual void doExecute(const KBookmarkGroup &);
@@ -106,20 +106,20 @@ class GaleonImportCommand : public XBELImportCommand
{
public:
GaleonImportCommand() : XBELImportCommand() { m_visibleName = i18n("Galeon"); }
- virtual void import(const QString &fileName, bool folder) {
+ virtual void import(const TQString &fileName, bool folder) {
init(fileName, folder, "", false);
}
- virtual QString requestFilename() const;
+ virtual TQString requestFilename() const;
};
class KDE2ImportCommand : public XBELImportCommand
{
public:
KDE2ImportCommand() : XBELImportCommand() { m_visibleName = i18n("KDE"); }
- virtual void import(const QString &fileName, bool folder) {
+ virtual void import(const TQString &fileName, bool folder) {
init(fileName, folder, "", false);
}
- virtual QString requestFilename() const;
+ virtual TQString requestFilename() const;
};
// part pure
@@ -127,8 +127,8 @@ class HTMLImportCommand : public ImportCommand
{
public:
HTMLImportCommand() : ImportCommand() { ; }
- virtual void import(const QString &fileName, bool folder) = 0;
- virtual QString requestFilename() const = 0;
+ virtual void import(const TQString &fileName, bool folder) = 0;
+ virtual TQString requestFilename() const = 0;
private:
virtual void doExecute(const KBookmarkGroup &);
};
@@ -137,30 +137,30 @@ class NSImportCommand : public HTMLImportCommand
{
public:
NSImportCommand() : HTMLImportCommand() { m_visibleName = i18n("Netscape"); }
- virtual void import(const QString &fileName, bool folder) {
+ virtual void import(const TQString &fileName, bool folder) {
init(fileName, folder, "netscape", false);
}
- virtual QString requestFilename() const;
+ virtual TQString requestFilename() const;
};
class MozImportCommand : public HTMLImportCommand
{
public:
MozImportCommand() : HTMLImportCommand() { m_visibleName = i18n("Mozilla"); }
- virtual void import(const QString &fileName, bool folder) {
+ virtual void import(const TQString &fileName, bool folder) {
init(fileName, folder, "mozilla", true);
}
- virtual QString requestFilename() const;
+ virtual TQString requestFilename() const;
};
class IEImportCommand : public ImportCommand
{
public:
IEImportCommand() : ImportCommand() { m_visibleName = i18n("IE"); }
- virtual void import(const QString &fileName, bool folder) {
+ virtual void import(const TQString &fileName, bool folder) {
init(fileName, folder, "", false);
}
- virtual QString requestFilename() const;
+ virtual TQString requestFilename() const;
private:
virtual void doExecute(const KBookmarkGroup &);
};
@@ -169,10 +169,10 @@ class OperaImportCommand : public ImportCommand
{
public:
OperaImportCommand() : ImportCommand() { m_visibleName = i18n("Opera"); }
- virtual void import(const QString &fileName, bool folder) {
+ virtual void import(const TQString &fileName, bool folder) {
init(fileName, folder, "opera", false);
}
- virtual QString requestFilename() const;
+ virtual TQString requestFilename() const;
private:
virtual void doExecute(const KBookmarkGroup &);
};
@@ -181,10 +181,10 @@ class CrashesImportCommand : public ImportCommand
{
public:
CrashesImportCommand() : ImportCommand() { m_visibleName = i18n("Crashes"); }
- virtual void import(const QString &fileName, bool folder) {
+ virtual void import(const TQString &fileName, bool folder) {
init(fileName, folder, "core", false);
}
- virtual QString requestFilename() const;
+ virtual TQString requestFilename() const;
private:
virtual void doExecute(const KBookmarkGroup &);
};
diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp
index f1e4ad741..d34794fdc 100644
--- a/konqueror/keditbookmarks/kbookmarkmerger.cpp
+++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp
@@ -31,9 +31,9 @@
#include <dcopclient.h>
-#include <qdir.h>
-#include <qdom.h>
-#include <qfile.h>
+#include <tqdir.h>
+#include <tqdom.h>
+#include <tqfile.h>
#include <X11/Xlib.h>
@@ -82,7 +82,7 @@ int main( int argc, char**argv )
}
KBookmarkManager *konqBookmarks = KBookmarkManager::userBookmarksManager();
- QStringList mergedFiles;
+ TQStringList mergedFiles;
{
KBookmarkGroup root = konqBookmarks->root();
for ( KBookmark bm = root.first(); !bm.isNull(); bm = root.next( bm ) ) {
@@ -90,7 +90,7 @@ int main( int argc, char**argv )
continue;
}
- QString mergedFrom = bm.metaDataItem( "merged_from" );
+ TQString mergedFrom = bm.metaDataItem( "merged_from" );
if ( !mergedFrom.isNull() ) {
mergedFiles << mergedFrom;
}
@@ -99,20 +99,20 @@ int main( int argc, char**argv )
bool didMergeBookmark = false;
- QString extraBookmarksDirName = QFile::decodeName( args->arg( 0 ) );
- QDir extraBookmarksDir( extraBookmarksDirName, "*.xml" );
+ TQString extraBookmarksDirName = TQFile::decodeName( args->arg( 0 ) );
+ TQDir extraBookmarksDir( extraBookmarksDirName, "*.xml" );
if ( !extraBookmarksDir.isReadable() ) {
kdError() << "Failed to read files in directory " << extraBookmarksDirName << endl;
return 1;
}
for ( unsigned int i = 0; i < extraBookmarksDir.count(); ++i ) {
- const QString fileName = extraBookmarksDir[ i ];
+ const TQString fileName = extraBookmarksDir[ i ];
if ( mergedFiles.find( fileName ) != mergedFiles.end() ) {
continue;
}
- const QString absPath = extraBookmarksDir.filePath( fileName );
+ const TQString absPath = extraBookmarksDir.filePath( fileName );
KBookmarkManager *mgr = KBookmarkManager::managerForFile( absPath, false );
KBookmarkGroup root = mgr->root();
for ( KBookmark bm = root.first(); !bm.isNull(); bm = root.next( bm ) ) {
diff --git a/konqueror/keditbookmarks/kebsearchline.cpp b/konqueror/keditbookmarks/kebsearchline.cpp
index 5d0f07e59..973f737b5 100644
--- a/konqueror/keditbookmarks/kebsearchline.cpp
+++ b/konqueror/keditbookmarks/kebsearchline.cpp
@@ -19,19 +19,19 @@
#include "kebsearchline.h"
#include "kebsearchline.moc"
-KEBSearchLine::KEBSearchLine(QWidget *parent, KListView *listView, const char *name)
+KEBSearchLine::KEBSearchLine(TQWidget *parent, KListView *listView, const char *name)
: KListViewSearchLine(parent, listView, name)
{
mmode = AND;
}
-KEBSearchLine::KEBSearchLine(QWidget *parent, const char *name)
+KEBSearchLine::KEBSearchLine(TQWidget *parent, const char *name)
:KListViewSearchLine(parent, name)
{
mmode = AND;
}
-void KEBSearchLine::updateSearch(const QString &s)
+void KEBSearchLine::updateSearch(const TQString &s)
{
KListViewSearchLine::updateSearch(s);
emit searchUpdated();
@@ -41,19 +41,19 @@ KEBSearchLine::~KEBSearchLine()
{
}
-bool KEBSearchLine::itemMatches(const QListViewItem *item, const QString &s) const
+bool KEBSearchLine::itemMatches(const TQListViewItem *item, const TQString &s) const
{
if(mmode == EXACTLY)
return KListViewSearchLine::itemMatches(item, s);
if(lastpattern != s)
{
- splitted = QStringList::split(QChar(' '), s);
+ splitted = TQStringList::split(TQChar(' '), s);
lastpattern = s;
}
- QStringList::const_iterator it = splitted.begin();
- QStringList::const_iterator end = splitted.end();
+ TQStringList::const_iterator it = splitted.begin();
+ TQStringList::const_iterator end = splitted.end();
if(mmode == OR)
{
diff --git a/konqueror/keditbookmarks/kebsearchline.h b/konqueror/keditbookmarks/kebsearchline.h
index 43248177e..cfaee61c5 100644
--- a/konqueror/keditbookmarks/kebsearchline.h
+++ b/konqueror/keditbookmarks/kebsearchline.h
@@ -20,33 +20,33 @@
#define __kebsearchline_h
#include <klistviewsearchline.h>
-#include <qobject.h>
+#include <tqobject.h>
class KEBSearchLine : public KListViewSearchLine
{
Q_OBJECT
public:
- KEBSearchLine(QWidget *parent = 0, KListView *listView = 0, const char *name = 0);
+ KEBSearchLine(TQWidget *parent = 0, KListView *listView = 0, const char *name = 0);
- KEBSearchLine(QWidget *parent, const char *name);
+ KEBSearchLine(TQWidget *parent, const char *name);
virtual ~KEBSearchLine();
enum modes { EXACTLY, AND, OR } mmode;
modes mode();
void setMode(modes m);
- virtual void updateSearch(const QString &s = QString::null);
+ virtual void updateSearch(const TQString &s = TQString::null);
signals:
void searchUpdated();
protected:
- virtual bool itemMatches(const QListViewItem *item, const QString &s) const;
+ virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const;
private:
- mutable QString lastpattern; // what was cached
- mutable QStringList splitted; // cache of the splitted string
+ mutable TQString lastpattern; // what was cached
+ mutable TQStringList splitted; // cache of the splitted string
};
#endif
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 25f72afb2..1fa31e967 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -29,10 +29,10 @@
#include <stdlib.h>
-#include <qclipboard.h>
-#include <qpopupmenu.h>
-#include <qpainter.h>
-#include <qheader.h>
+#include <tqclipboard.h>
+#include <tqpopupmenu.h>
+#include <tqpainter.h>
+#include <tqheader.h>
#include <klocale.h>
@@ -60,8 +60,8 @@ ListView* ListView::s_self = 0;
int ListView::s_myrenamecolumn = -1;
KEBListViewItem *ListView::s_myrenameitem = 0;
-QStringList ListView::s_selected_addresses;
-QString ListView::s_current_address;
+TQStringList ListView::s_selected_addresses;
+TQString ListView::s_current_address;
ListView::ListView()
: m_needToFixUp(false)
@@ -72,10 +72,10 @@ ListView::~ListView() {
self()->m_listView->saveColumnSetting();
}
-void ListView::createListViews(QSplitter *splitter) {
+void ListView::createListViews(TQSplitter *splitter) {
s_self = new ListView();
self()->m_listView = new KEBListView(splitter, false);
- splitter->setSizes(QValueList<int>() << 100 << 300);
+ splitter->setSizes(TQValueList<int>() << 100 << 300);
}
void ListView::initListViews() {
@@ -90,12 +90,12 @@ void ListView::connectSignals() {
m_listView->makeConnections();
}
-bool lessAddress(QString a, QString b)
+bool lessAddress(TQString a, TQString b)
{
if(a == b)
return false;
- QString error("ERROR");
+ TQString error("ERROR");
if(a == error)
return false;
if(b == error)
@@ -144,11 +144,11 @@ bool operator<(const KBookmark & first, const KBookmark & second) //FIXME Using
-QValueList<KBookmark> ListView::itemsToBookmarks(const QValueVector<KEBListViewItem *> & items) const
+TQValueList<KBookmark> ListView::itemsToBookmarks(const TQValueVector<KEBListViewItem *> & items) const
{
- QValueList<KBookmark> bookmarks; //TODO optimize by using a QValueVector
- QValueVector<KEBListViewItem *>::const_iterator it = items.constBegin();
- QValueVector<KEBListViewItem *>::const_iterator end = items.constEnd();
+ TQValueList<KBookmark> bookmarks; //TODO optimize by using a QValueVector
+ TQValueVector<KEBListViewItem *>::const_iterator it = items.constBegin();
+ TQValueVector<KEBListViewItem *>::const_iterator end = items.constEnd();
for( ; it!=end; ++it)
{
if(*it != m_listView->rootItem() )
@@ -158,12 +158,12 @@ QValueList<KBookmark> ListView::itemsToBookmarks(const QValueVector<KEBListViewI
return bookmarks;
}
-void ListView::invalidate(const QString & address)
+void ListView::invalidate(const TQString & address)
{
invalidate(getItemAtAddress(address));
}
-void ListView::invalidate(QListViewItem * item)
+void ListView::invalidate(TQListViewItem * item)
{
if(item->isSelected())
{
@@ -178,7 +178,7 @@ void ListView::invalidate(QListViewItem * item)
m_needToFixUp = true;
}
- QListViewItem * child = item->firstChild();
+ TQListViewItem * child = item->firstChild();
while(child)
{
//invalidate(child);
@@ -186,17 +186,17 @@ void ListView::invalidate(QListViewItem * item)
}
}
-void ListView::fixUpCurrent(const QString & address)
+void ListView::fixUpCurrent(const TQString & address)
{
if(!m_needToFixUp)
return;
m_needToFixUp = false;
- QListViewItem * item;
+ TQListViewItem * item;
if(mSelectedItems.count() != 0)
{
- QString least = mSelectedItems.begin().key()->bookmark().address();
- QMap<KEBListViewItem *, bool>::iterator it, end;
+ TQString least = mSelectedItems.begin().key()->bookmark().address();
+ TQMap<KEBListViewItem *, bool>::iterator it, end;
end = mSelectedItems.end();
for(it = mSelectedItems.begin(); it != end; ++it)
if( lessAddress(it.key()->bookmark().address(), least))
@@ -213,7 +213,7 @@ void ListView::fixUpCurrent(const QString & address)
void ListView::selected(KEBListViewItem * item, bool s)
{
Q_ASSERT(item->bookmark().hasParent() || item == m_listView->rootItem());
- QMap<KEBListViewItem *, bool>::iterator it;
+ TQMap<KEBListViewItem *, bool>::iterator it;
if(s)
mSelectedItems[item] = item;
@@ -223,7 +223,7 @@ void ListView::selected(KEBListViewItem * item, bool s)
KEBApp::self()->updateActions();
- const QValueVector<KEBListViewItem *> & selected = selectedItemsMap();
+ const TQValueVector<KEBListViewItem *> & selected = selectedItemsMap();
if (selected.count() != 1)
{
KEBApp::self()->bkInfo()->showBookmark(KBookmark());
@@ -231,8 +231,8 @@ void ListView::selected(KEBListViewItem * item, bool s)
}
//FIXME do it once somewhere
if (!KEBApp::self()->bkInfo()->connected()) {
- connect(KEBApp::self()->bkInfo(), SIGNAL( updateListViewItem() ),
- SLOT( slotBkInfoUpdateListViewItem() ));
+ connect(KEBApp::self()->bkInfo(), TQT_SIGNAL( updateListViewItem() ),
+ TQT_SLOT( slotBkInfoUpdateListViewItem() ));
KEBApp::self()->bkInfo()->setConnected(true);
}
@@ -240,10 +240,10 @@ void ListView::selected(KEBListViewItem * item, bool s)
firstSelected()->modUpdate();
}
-QValueVector<KEBListViewItem *> ListView::selectedItemsMap() const
+TQValueVector<KEBListViewItem *> ListView::selectedItemsMap() const
{
- QValueVector<KEBListViewItem *> selected;
- QMap<KEBListViewItem *, bool>::ConstIterator it, end;
+ TQValueVector<KEBListViewItem *> selected;
+ TQMap<KEBListViewItem *, bool>::ConstIterator it, end;
end = mSelectedItems.constEnd();
for(it = mSelectedItems.constBegin(); it != end; ++it)
{
@@ -258,7 +258,7 @@ KEBListViewItem * ListView::firstSelected() const
if(mSelectedItems.isEmpty())
return 0L;
- QValueVector<KEBListViewItem *> selected = selectedItemsMap();
+ TQValueVector<KEBListViewItem *> selected = selectedItemsMap();
if(selected.isEmpty())
return 0L;
else
@@ -282,11 +282,11 @@ void ListView::deselectAllChildren(KEBListViewItem *item)
}
}
-QValueList<QString> ListView::selectedAddresses()
+TQValueList<TQString> ListView::selectedAddresses()
{
- QValueList<QString> addresses;
- QValueList<KBookmark> bookmarks = itemsToBookmarks( selectedItemsMap() );
- QValueList<KBookmark>::const_iterator it, end;
+ TQValueList<TQString> addresses;
+ TQValueList<KBookmark> bookmarks = itemsToBookmarks( selectedItemsMap() );
+ TQValueList<KBookmark>::const_iterator it, end;
end = bookmarks.end();
for( it = bookmarks.begin(); it != end; ++it)
addresses.append( (*it).address() );
@@ -294,9 +294,9 @@ QValueList<QString> ListView::selectedAddresses()
}
-QValueList<KBookmark> ListView::selectedBookmarksExpanded() const {
- QValueList<KBookmark> bookmarks;
- for (QListViewItemIterator it(m_listView); it.current() != 0; ++it) {
+TQValueList<KBookmark> ListView::selectedBookmarksExpanded() const {
+ TQValueList<KBookmark> bookmarks;
+ for (TQListViewItemIterator it(m_listView); it.current() != 0; ++it) {
if (!it.current()->isSelected())
continue;
if(it.current() == m_listView->firstChild()) // root case
@@ -312,7 +312,7 @@ QValueList<KBookmark> ListView::selectedBookmarksExpanded() const {
}
-void ListView::selectedBookmarksExpandedHelper(KEBListViewItem * item, QValueList<KBookmark> & bookmarks) const
+void ListView::selectedBookmarksExpandedHelper(KEBListViewItem * item, TQValueList<KBookmark> & bookmarks) const
{
KEBListViewItem* child = static_cast<KEBListViewItem *>(item->firstChild());
while( child )
@@ -328,9 +328,9 @@ void ListView::selectedBookmarksExpandedHelper(KEBListViewItem * item, QValueLis
}
}
-QValueList<KBookmark> ListView::allBookmarks() const {
- QValueList<KBookmark> bookmarks;
- for (QListViewItemIterator it(m_listView); it.current() != 0; ++it)
+TQValueList<KBookmark> ListView::allBookmarks() const {
+ TQValueList<KBookmark> bookmarks;
+ for (TQListViewItemIterator it(m_listView); it.current() != 0; ++it)
{
KEBListViewItem * item = static_cast<KEBListViewItem *>(it.current());
if (!item->isEmptyFolderPadder() && (item->childCount() == 0))
@@ -341,7 +341,7 @@ QValueList<KBookmark> ListView::allBookmarks() const {
// DESIGN - make + "/0" a kbookmark:: thing?
-QString ListView::userAddress() const
+TQString ListView::userAddress() const
{
KBookmark current = firstSelected()->bookmark();
return (current.isGroup())
@@ -358,13 +358,13 @@ void ListView::setCurrent(KEBListViewItem *item, bool select) {
}
}
-KEBListViewItem* ListView::getItemAtAddress(const QString &address) const {
+KEBListViewItem* ListView::getItemAtAddress(const TQString &address) const {
//FIXME uses internal represantation of bookmark address
- QListViewItem *item = m_listView->rootItem();
+ TQListViewItem *item = m_listView->rootItem();
- QStringList addresses = QStringList::split('/',address); // e.g /5/10/2
+ TQStringList addresses = TQStringList::split('/',address); // e.g /5/10/2
- for (QStringList::Iterator it = addresses.begin(); it != addresses.end(); ++it) {
+ for (TQStringList::Iterator it = addresses.begin(); it != addresses.end(); ++it) {
if (item = item->firstChild(), !item)
return 0;
for (unsigned int i = 0; i < (*it).toUInt(); ++i)
@@ -375,7 +375,7 @@ KEBListViewItem* ListView::getItemAtAddress(const QString &address) const {
}
void ListView::setOpen(bool open) {
- for (QListViewItemIterator it(m_listView); it.current() != 0; ++it)
+ for (TQListViewItemIterator it(m_listView); it.current() != 0; ++it)
if (it.current()->parent())
it.current()->setOpen(open);
}
@@ -385,7 +385,7 @@ SelcAbilities ListView::getSelectionAbilities() const {
if (mSelectedItems.count() > 0)
{
- QValueVector<KEBListViewItem *> selected = selectedItemsMap();
+ TQValueVector<KEBListViewItem *> selected = selectedItemsMap();
if(!selected.isEmpty())
{
//Optimize
@@ -406,7 +406,7 @@ SelcAbilities ListView::getSelectionAbilities() const {
return sa;
}
-void ListView::handleDropped(KEBListView *, QDropEvent *e, QListViewItem *newParent, QListViewItem *itemAfterQLVI) {
+void ListView::handleDropped(KEBListView *, TQDropEvent *e, TQListViewItem *newParent, TQListViewItem *itemAfterQLVI) {
bool inApp = (e->source() == m_listView->viewport());
// drop before root item
@@ -415,7 +415,7 @@ void ListView::handleDropped(KEBListView *, QDropEvent *e, QListViewItem *newPar
KEBListViewItem *itemAfter = static_cast<KEBListViewItem *>(itemAfterQLVI);
- QString newAddress
+ TQString newAddress
= (!itemAfter || itemAfter->isEmptyFolderPadder())
? (static_cast<KEBListViewItem *>(newParent)->bookmark().address() + "/0")
: (KBookmark::nextAddress(itemAfter->bookmark().address()));
@@ -426,17 +426,17 @@ void ListView::handleDropped(KEBListView *, QDropEvent *e, QListViewItem *newPar
mcmd = CmdGen::insertMimeSource(i18n("Drop Items"), e, newAddress);
} else {
- const QValueVector<KEBListViewItem *> & selected = selectedItemsMap();
+ const TQValueVector<KEBListViewItem *> & selected = selectedItemsMap();
if (!(selected.count() > 0) || (*(selected.constBegin()) == itemAfterQLVI))
return;
- bool copy = (e->action() == QDropEvent::Copy);
+ bool copy = (e->action() == TQDropEvent::Copy);
mcmd = CmdGen::itemsMoved(selected, newAddress, copy);
}
CmdHistory::self()->didCommand(mcmd);
}
-void ListView::updateStatus(QString url) {
+void ListView::updateStatus(TQString url) {
m_listView->updateByURL(url);
}
@@ -447,7 +447,7 @@ void ListView::updateListView()
//Save selected items (restored in fillWithGroup)
s_selected_addresses.clear();
- QMap<KEBListViewItem *, bool>::const_iterator it, end;
+ TQMap<KEBListViewItem *, bool>::const_iterator it, end;
it = mSelectedItems.begin();
end = mSelectedItems.end();
for ( ; it != end; ++it)
@@ -461,7 +461,7 @@ void ListView::updateListView()
s_current_address = item->bookmark().address();
}
else
- s_current_address = QString::null;
+ s_current_address = TQString::null;
updateTree();
m_searchline->updateSearch();
@@ -482,7 +482,7 @@ void ListView::fillWithGroup(KEBListView *lv, KBookmarkGroup group, KEBListViewI
lv->clear();
KEBListViewItem *tree = new KEBListViewItem(lv, group);
fillWithGroup(lv, group, tree);
- tree->QListViewItem::setOpen(true);
+ tree->TQListViewItem::setOpen(true);
if (s_selected_addresses.contains(tree->bookmark().address()))
lv->setSelected(tree, true);
if(!s_current_address.isNull() && s_current_address == tree->bookmark().address())
@@ -498,7 +498,7 @@ void ListView::fillWithGroup(KEBListView *lv, KBookmarkGroup group, KEBListViewI
: new KEBListViewItem(lv, lastItem, grp);
fillWithGroup(lv, grp, item);
if (grp.isOpen())
- item->QListViewItem::setOpen(true);
+ item->TQListViewItem::setOpen(true);
if (grp.first().isNull())
new KEBListViewItem(item, item); // empty folder
lastItem = item;
@@ -542,27 +542,27 @@ void ListView::slotBkInfoUpdateListViewItem() {
KBookmark bk = i->bookmark();
i->setText(KEBListView::NameColumn, bk.fullText());
i->setText(KEBListView::UrlColumn, bk.url().pathOrURL());
- QString commentStr = NodeEditCommand::getNodeText(bk, QStringList() << "desc");
+ TQString commentStr = NodeEditCommand::getNodeText(bk, TQStringList() << "desc");
i->setText(KEBListView::CommentColumn, commentStr);
}
-void ListView::handleContextMenu(KEBListView *, KListView *, QListViewItem *qitem, const QPoint &p) {
+void ListView::handleContextMenu(KEBListView *, KListView *, TQListViewItem *qitem, const TQPoint &p) {
KEBListViewItem *item = static_cast<KEBListViewItem *>(qitem);
const char *type = ( !item
|| (item == m_listView->rootItem())
|| (item->bookmark().isGroup())
|| (item->isEmptyFolderPadder()))
? "popup_folder" : "popup_bookmark";
- QWidget* popup = KEBApp::self()->popupMenuFactory(type);
+ TQWidget* popup = KEBApp::self()->popupMenuFactory(type);
if (popup)
- static_cast<QPopupMenu*>(popup)->popup(p);
+ static_cast<TQPopupMenu*>(popup)->popup(p);
}
-void ListView::handleDoubleClicked(KEBListView *lv, QListViewItem *item, const QPoint &, int column) {
+void ListView::handleDoubleClicked(KEBListView *lv, TQListViewItem *item, const TQPoint &, int column) {
lv->rename(item, column);
}
-void ListView::handleItemRenamed(KEBListView *lv, QListViewItem *item, const QString &newText, int column) {
+void ListView::handleItemRenamed(KEBListView *lv, TQListViewItem *item, const TQString &newText, int column) {
Q_ASSERT(item);
KBookmark bk = static_cast<KEBListViewItem *>(item)->bookmark();
KCommand *cmd = 0;
@@ -634,20 +634,20 @@ void ListView::renameNextCell(bool fwd) {
/* -------------------------------------- */
-class KeyPressEater : public QObject {
+class KeyPressEater : public TQObject {
public:
- KeyPressEater( QWidget *parent = 0, const char *name = 0 )
- : QObject(parent, name) {
+ KeyPressEater( TQWidget *parent = 0, const char *name = 0 )
+ : TQObject(parent, name) {
m_allowedToTab = true;
}
protected:
- bool eventFilter(QObject *, QEvent *);
+ bool eventFilter(TQObject *, TQEvent *);
bool m_allowedToTab;
};
-bool KeyPressEater::eventFilter(QObject *, QEvent *pe) {
- if (pe->type() == QEvent::KeyPress) {
- QKeyEvent *k = (QKeyEvent *) pe;
+bool KeyPressEater::eventFilter(TQObject *, TQEvent *pe) {
+ if (pe->type() == TQEvent::KeyPress) {
+ TQKeyEvent *k = (TQKeyEvent *) pe;
if ((k->key() == Qt::Key_Backtab || k->key() == Qt::Key_Tab)
&& !(k->state() & ControlButton || k->state() & AltButton)
) {
@@ -718,21 +718,21 @@ void KEBListView::init() {
setDragEnabled(true);
setSelectionModeExt((!m_folderList) ? KListView::Extended: KListView::Single);
setAllColumnsShowFocus(true);
- connect(header(), SIGNAL(sizeChange(int, int, int)),
- this, SLOT(slotColumnSizeChanged(int, int, int)));
+ connect(header(), TQT_SIGNAL(sizeChange(int, int, int)),
+ this, TQT_SLOT(slotColumnSizeChanged(int, int, int)));
}
void KEBListView::makeConnections() {
- connect(this, SIGNAL( moved() ),
- SLOT( slotMoved() ));
- connect(this, SIGNAL( contextMenu(KListView *, QListViewItem*, const QPoint &) ),
- SLOT( slotContextMenu(KListView *, QListViewItem *, const QPoint &) ));
- connect(this, SIGNAL( itemRenamed(QListViewItem *, const QString &, int) ),
- SLOT( slotItemRenamed(QListViewItem *, const QString &, int) ));
- connect(this, SIGNAL( doubleClicked(QListViewItem *, const QPoint &, int) ),
- SLOT( slotDoubleClicked(QListViewItem *, const QPoint &, int) ));
- connect(this, SIGNAL( dropped(QDropEvent*, QListViewItem*, QListViewItem*) ),
- SLOT( slotDropped(QDropEvent*, QListViewItem*, QListViewItem*) ));
+ connect(this, TQT_SIGNAL( moved() ),
+ TQT_SLOT( slotMoved() ));
+ connect(this, TQT_SIGNAL( contextMenu(KListView *, TQListViewItem*, const TQPoint &) ),
+ TQT_SLOT( slotContextMenu(KListView *, TQListViewItem *, const TQPoint &) ));
+ connect(this, TQT_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ),
+ TQT_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) ));
+ connect(this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ),
+ TQT_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) ));
+ connect(this, TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ),
+ TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ));
}
void KEBListView::readonlyFlagInit(bool readonly) {
@@ -744,16 +744,16 @@ void KEBListView::readonlyFlagInit(bool readonly) {
void KEBListView::slotMoved()
{ ListView::self()->handleMoved(this); }
-void KEBListView::slotContextMenu(KListView *a, QListViewItem *b, const QPoint &c)
+void KEBListView::slotContextMenu(KListView *a, TQListViewItem *b, const TQPoint &c)
{ ListView::self()->handleContextMenu(this, a,b,c); }
-void KEBListView::slotItemRenamed(QListViewItem *a, const QString &b, int c)
+void KEBListView::slotItemRenamed(TQListViewItem *a, const TQString &b, int c)
{ ListView::self()->handleItemRenamed(this, a,b,c); }
-void KEBListView::slotDoubleClicked(QListViewItem *a, const QPoint &b, int c)
+void KEBListView::slotDoubleClicked(TQListViewItem *a, const TQPoint &b, int c)
{ ListView::self()->handleDoubleClicked(this, a,b,c); }
-void KEBListView::slotDropped(QDropEvent *a, QListViewItem *b, QListViewItem *c)
+void KEBListView::slotDropped(TQDropEvent *a, TQListViewItem *b, TQListViewItem *c)
{ ListView::self()->handleDropped(this, a,b,c); }
-void KEBListView::rename(QListViewItem *qitem, int column) {
+void KEBListView::rename(TQListViewItem *qitem, int column) {
KEBListViewItem *item = static_cast<KEBListViewItem *>(qitem);
if ( !(column == NameColumn || column == UrlColumn || column == CommentColumn)
|| KEBApp::self()->readonly()
@@ -776,8 +776,8 @@ KEBListViewItem* KEBListView::rootItem() const {
}
// Update display of bookmarks containing URL
-void KEBListView::updateByURL(QString url) {
- for (QListViewItemIterator it(this); it.current(); it++) {
+void KEBListView::updateByURL(TQString url) {
+ for (TQListViewItemIterator it(this); it.current(); it++) {
KEBListViewItem *p = static_cast<KEBListViewItem *>(it.current());
if (p->text(1) == url) {
p->modUpdate();
@@ -785,26 +785,26 @@ void KEBListView::updateByURL(QString url) {
}
}
-bool KEBListView::acceptDrag(QDropEvent * e) const {
+bool KEBListView::acceptDrag(TQDropEvent * e) const {
return (e->source() == viewport() || KBookmarkDrag::canDecode(e));
}
-QDragObject *KEBListView::dragObject() {
- QValueList<KBookmark> bookmarks =
+TQDragObject *KEBListView::dragObject() {
+ TQValueList<KBookmark> bookmarks =
ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
KBookmarkDrag *drag = KBookmarkDrag::newDrag(bookmarks, viewport());
- const QString iconname =
- (bookmarks.size() == 1) ? bookmarks.first().icon() : QString("bookmark");
+ const TQString iconname =
+ (bookmarks.size() == 1) ? bookmarks.first().icon() : TQString("bookmark");
drag->setPixmap(SmallIcon(iconname)) ;
return drag;
}
/* -------------------------------------- */
-bool KEBListViewItem::parentSelected(QListViewItem * item)
+bool KEBListViewItem::parentSelected(TQListViewItem * item)
{
- QListViewItem *root = item->listView()->firstChild();
- for( QListViewItem *parent = item->parent(); parent ; parent = parent->parent())
+ TQListViewItem *root = item->listView()->firstChild();
+ for( TQListViewItem *parent = item->parent(); parent ; parent = parent->parent())
if (parent->isSelected() && parent != root)
return true;
return false;
@@ -821,14 +821,14 @@ void KEBListViewItem::setSelected(bool s)
if(listView()->firstChild() == this)
{
ListView::self()->selected(this, s);
- QListViewItem::setSelected( s );
+ TQListViewItem::setSelected( s );
return;
}
if(s == false)
{
ListView::self()->selected(this, false);
- QListViewItem::setSelected( false );
+ TQListViewItem::setSelected( false );
ListView::deselectAllChildren( this ); //repaints
}
else if(parentSelected(this))
@@ -836,7 +836,7 @@ void KEBListViewItem::setSelected(bool s)
else
{
ListView::self()->selected(this, true);
- QListViewItem::setSelected( true );
+ TQListViewItem::setSelected( true );
ListView::deselectAllChildren(this);
}
}
@@ -847,7 +847,7 @@ void KEBListViewItem::normalConstruct(const KBookmark &bk) {
#endif
setText(KEBListView::CommentColumn, NodeEditCommand::getNodeText(bk, "desc"));
bool shown = CmdGen::shownInToolbar(bk);
- setPixmap(0, SmallIcon(shown ? QString("bookmark_toolbar") : bk.icon()));
+ setPixmap(0, SmallIcon(shown ? TQString("bookmark_toolbar") : bk.icon()));
// DESIGN - modUpdate badly needs a redesign
modUpdate();
}
@@ -855,8 +855,8 @@ void KEBListViewItem::normalConstruct(const KBookmark &bk) {
// DESIGN - following constructors should be names classes or else just explicit
// toplevel item (there should be only one!)
-KEBListViewItem::KEBListViewItem(QListView *parent, const KBookmarkGroup &gp)
- : QListViewItem(parent, KEBApp::self()->caption().isNull()
+KEBListViewItem::KEBListViewItem(TQListView *parent, const KBookmarkGroup &gp)
+ : TQListViewItem(parent, KEBApp::self()->caption().isNull()
? i18n("Bookmarks")
: i18n("%1 Bookmarks").arg(KEBApp::self()->caption())),
m_bookmark(gp), m_emptyFolderPadder(false) {
@@ -866,39 +866,39 @@ KEBListViewItem::KEBListViewItem(QListView *parent, const KBookmarkGroup &gp)
}
// empty folder item
-KEBListViewItem::KEBListViewItem(KEBListViewItem *parent, QListViewItem *after)
- : QListViewItem(parent, after, i18n("Empty Folder") ), m_emptyFolderPadder(true) {
+KEBListViewItem::KEBListViewItem(KEBListViewItem *parent, TQListViewItem *after)
+ : TQListViewItem(parent, after, i18n("Empty Folder") ), m_emptyFolderPadder(true) {
setPixmap(0, SmallIcon("bookmark"));
}
// group
-KEBListViewItem::KEBListViewItem(KEBListViewItem *parent, QListViewItem *after, const KBookmarkGroup &gp)
- : QListViewItem(parent, after, gp.fullText()), m_bookmark(gp), m_emptyFolderPadder(false) {
+KEBListViewItem::KEBListViewItem(KEBListViewItem *parent, TQListViewItem *after, const KBookmarkGroup &gp)
+ : TQListViewItem(parent, after, gp.fullText()), m_bookmark(gp), m_emptyFolderPadder(false) {
setExpandable(true);
normalConstruct(gp);
}
// bookmark (first of its group)
KEBListViewItem::KEBListViewItem(KEBListViewItem *parent, const KBookmark & bk)
- : QListViewItem(parent, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) {
+ : TQListViewItem(parent, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) {
normalConstruct(bk);
}
// bookmark (after another)
-KEBListViewItem::KEBListViewItem(KEBListViewItem *parent, QListViewItem *after, const KBookmark &bk)
- : QListViewItem(parent, after, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) {
+KEBListViewItem::KEBListViewItem(KEBListViewItem *parent, TQListViewItem *after, const KBookmark &bk)
+ : TQListViewItem(parent, after, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) {
normalConstruct(bk);
}
// root bookmark (first of its group)
-KEBListViewItem::KEBListViewItem(QListView *parent, const KBookmark & bk)
- : QListViewItem(parent, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) {
+KEBListViewItem::KEBListViewItem(TQListView *parent, const KBookmark & bk)
+ : TQListViewItem(parent, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) {
normalConstruct(bk);
}
// root bookmark (after another)
-KEBListViewItem::KEBListViewItem(QListView *parent, QListViewItem *after, const KBookmark &bk)
- : QListViewItem(parent, after, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) {
+KEBListViewItem::KEBListViewItem(TQListView *parent, TQListViewItem *after, const KBookmark &bk)
+ : TQListViewItem(parent, after, bk.fullText(), bk.url().pathOrURL()), m_bookmark(bk), m_emptyFolderPadder(false) {
normalConstruct(bk);
}
@@ -907,24 +907,24 @@ void KEBListViewItem::setOpen(bool open) {
if (!parent())
return;
m_bookmark.internalElement().setAttribute("folded", open ? "no" : "yes");
- QListViewItem::setOpen(open);
+ TQListViewItem::setOpen(open);
}
-void KEBListViewItem::greyStyle(QColorGroup &cg) {
+void KEBListViewItem::greyStyle(TQColorGroup &cg) {
int h, s, v;
cg.background().hsv(&h, &s, &v);
- QColor color = (v > 180 && v < 220) ? (Qt::darkGray) : (Qt::gray);
- cg.setColor(QColorGroup::Text, color);
+ TQColor color = (v > 180 && v < 220) ? (Qt::darkGray) : (Qt::gray);
+ cg.setColor(TQColorGroup::Text, color);
}
-void KEBListViewItem::boldStyle(QPainter *p) {
- QFont font = p->font();
+void KEBListViewItem::boldStyle(TQPainter *p) {
+ TQFont font = p->font();
font.setBold(true);
p->setFont(font);
}
-void KEBListViewItem::paintCell(QPainter *p, const QColorGroup &ocg, int col, int w, int a) {
- QColorGroup cg(ocg);
+void KEBListViewItem::paintCell(TQPainter *p, const TQColorGroup &ocg, int col, int w, int a) {
+ TQColorGroup cg(ocg);
if (parentSelected(this)) {
int base_h, base_s, base_v;
cg.background().hsv(&base_h, &base_s, &base_v);
@@ -932,11 +932,11 @@ void KEBListViewItem::paintCell(QPainter *p, const QColorGroup &ocg, int col, in
int hilite_h, hilite_s, hilite_v;
cg.highlight().hsv(&hilite_h, &hilite_s, &hilite_v);
- QColor col(hilite_h,
+ TQColor col(hilite_h,
(hilite_s + base_s + base_s ) / 3,
(hilite_v + base_v + base_v ) / 3,
- QColor::Hsv);
- cg.setColor(QColorGroup::Base, col);
+ TQColor::Hsv);
+ cg.setColor(TQColorGroup::Base, col);
}
if (col == KEBListView::StatusColumn) {
@@ -962,7 +962,7 @@ void KEBListViewItem::paintCell(QPainter *p, const QColorGroup &ocg, int col, in
}
}
- QListViewItem::paintCell(p, cg, col, w,a);
+ TQListViewItem::paintCell(p, cg, col, w,a);
}
#include "listview.moc"
diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h
index 7741f5858..e2938de80 100644
--- a/konqueror/keditbookmarks/listview.h
+++ b/konqueror/keditbookmarks/listview.h
@@ -22,9 +22,9 @@
#include <assert.h>
-#include <qlistview.h>
-#include <qmap.h>
-#include <qvaluevector.h>
+#include <tqlistview.h>
+#include <tqmap.h>
+#include <tqvaluevector.h>
#include <klocale.h>
#include <kbookmark.h>
@@ -39,24 +39,24 @@ class KListViewSearchLine;
class KEBListViewItem : public QListViewItem
{
public:
- KEBListViewItem(QListView *, const KBookmarkGroup &);
- KEBListViewItem(KEBListViewItem *, QListViewItem *);
- KEBListViewItem(KEBListViewItem *, QListViewItem *, const KBookmarkGroup &);
+ KEBListViewItem(TQListView *, const KBookmarkGroup &);
+ KEBListViewItem(KEBListViewItem *, TQListViewItem *);
+ KEBListViewItem(KEBListViewItem *, TQListViewItem *, const KBookmarkGroup &);
KEBListViewItem(KEBListViewItem *, const KBookmark &);
- KEBListViewItem(KEBListViewItem *, QListViewItem *, const KBookmark &);
+ KEBListViewItem(KEBListViewItem *, TQListViewItem *, const KBookmark &);
- KEBListViewItem(QListView *, const KBookmark &);
- KEBListViewItem(QListView *, QListViewItem *, const KBookmark &);
+ KEBListViewItem(TQListView *, const KBookmark &);
+ KEBListViewItem(TQListView *, TQListViewItem *, const KBookmark &);
- void nsPut(const QString &nm);
+ void nsPut(const TQString &nm);
void modUpdate();
- void setOldStatus(const QString &);
- void setTmpStatus(const QString &);
+ void setOldStatus(const TQString &);
+ void setTmpStatus(const TQString &);
void restoreStatus();
- void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment);
+ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
void setSelected ( bool s );
virtual void setOpen(bool);
@@ -66,18 +66,18 @@ public:
typedef enum { GreyStyle, BoldStyle, GreyBoldStyle, DefaultStyle } PaintStyle;
- static bool parentSelected(QListViewItem * item);
+ static bool parentSelected(TQListViewItem * item);
private:
- const QString nsGet() const;
+ const TQString nsGet() const;
void normalConstruct(const KBookmark &);
KBookmark m_bookmark;
PaintStyle m_paintStyle;
bool m_emptyFolderPadder;
- QString m_oldStatus;
- void greyStyle(QColorGroup &);
- void boldStyle(QPainter *);
+ TQString m_oldStatus;
+ void greyStyle(TQColorGroup &);
+ void boldStyle(TQPainter *);
};
class KEBListView : public KListView
@@ -91,7 +91,7 @@ public:
StatusColumn = 3,
AddressColumn = 4
};
- KEBListView(QWidget *parent, bool folderList)
+ KEBListView(TQWidget *parent, bool folderList)
: KListView(parent), m_folderList(folderList) {}
virtual ~KEBListView() {}
@@ -102,24 +102,24 @@ public:
void loadColumnSetting();
void saveColumnSetting();
- void updateByURL(QString url);
+ void updateByURL(TQString url);
bool isFolderList() const { return m_folderList; }
KEBListViewItem* rootItem() const;
public slots:
- virtual void rename(QListViewItem *item, int c);
+ virtual void rename(TQListViewItem *item, int c);
void slotMoved();
- void slotContextMenu(KListView *, QListViewItem *, const QPoint &);
- void slotItemRenamed(QListViewItem *, const QString &, int);
- void slotDoubleClicked(QListViewItem *, const QPoint &, int);
- void slotDropped(QDropEvent*, QListViewItem*, QListViewItem*);
+ void slotContextMenu(KListView *, TQListViewItem *, const TQPoint &);
+ void slotItemRenamed(TQListViewItem *, const TQString &, int);
+ void slotDoubleClicked(TQListViewItem *, const TQPoint &, int);
+ void slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*);
void slotColumnSizeChanged(int, int, int);
protected:
- virtual bool acceptDrag(QDropEvent *e) const;
- virtual QDragObject* dragObject();
+ virtual bool acceptDrag(TQDropEvent *e) const;
+ virtual TQDragObject* dragObject();
private:
bool m_folderList;
@@ -140,25 +140,25 @@ public:
// selected item stuff
void selected(KEBListViewItem * item, bool s);
- void invalidate(const QString & address);
- void invalidate(QListViewItem * item);
- void fixUpCurrent(const QString & address);
+ void invalidate(const TQString & address);
+ void invalidate(TQListViewItem * item);
+ void fixUpCurrent(const TQString & address);
KEBListViewItem * firstSelected() const;
- QValueVector<KEBListViewItem *> selectedItemsMap() const;
+ TQValueVector<KEBListViewItem *> selectedItemsMap() const;
- QValueList<QString> selectedAddresses();
+ TQValueList<TQString> selectedAddresses();
// bookmark helpers
- QValueList<KBookmark> itemsToBookmarks(const QValueVector<KEBListViewItem *> & items) const;
+ TQValueList<KBookmark> itemsToBookmarks(const TQValueVector<KEBListViewItem *> & items) const;
// bookmark stuff
- QValueList<KBookmark> allBookmarks() const;
- QValueList<KBookmark> selectedBookmarksExpanded() const;
+ TQValueList<KBookmark> allBookmarks() const;
+ TQValueList<KBookmark> selectedBookmarksExpanded() const;
// address stuff
- KEBListViewItem* getItemAtAddress(const QString &address) const;
- QString userAddress() const;
+ KEBListViewItem* getItemAtAddress(const TQString &address) const;
+ TQString userAddress() const;
// gui stuff - DESIGN - all of it???
SelcAbilities getSelectionAbilities() const;
@@ -168,20 +168,20 @@ public:
void setCurrent(KEBListViewItem *item, bool select);
void renameNextCell(bool dir);
- QWidget *widget() const { return m_listView; }
+ TQWidget *widget() const { return m_listView; }
void rename(int);
void clearSelection();
- void updateStatus(QString url);
+ void updateStatus(TQString url);
static ListView* self() { return s_self; }
- static void createListViews(QSplitter *parent);
+ static void createListViews(TQSplitter *parent);
void handleMoved(KEBListView *);
- void handleDropped(KEBListView *, QDropEvent *, QListViewItem *, QListViewItem *);
- void handleContextMenu(KEBListView *, KListView *, QListViewItem *, const QPoint &);
- void handleDoubleClicked(KEBListView *, QListViewItem *, const QPoint &, int);
- void handleItemRenamed(KEBListView *, QListViewItem *, const QString &, int);
+ void handleDropped(KEBListView *, TQDropEvent *, TQListViewItem *, TQListViewItem *);
+ void handleContextMenu(KEBListView *, KListView *, TQListViewItem *, const TQPoint &);
+ void handleDoubleClicked(KEBListView *, TQListViewItem *, const TQPoint &, int);
+ void handleItemRenamed(KEBListView *, TQListViewItem *, const TQString &, int);
static void startRename(int column, KEBListViewItem *item);
@@ -194,7 +194,7 @@ public slots:
private:
void updateTree();
- void selectedBookmarksExpandedHelper(KEBListViewItem * item, QValueList<KBookmark> & bookmarks) const;
+ void selectedBookmarksExpandedHelper(KEBListViewItem * item, TQValueList<KBookmark> & bookmarks) const;
void fillWithGroup(KEBListView *, KBookmarkGroup, KEBListViewItem * = 0);
ListView();
@@ -203,15 +203,15 @@ private:
KListViewSearchLine * m_searchline;
// Actually this is a std:set, the bool is ignored
- QMap<KEBListViewItem *, bool> mSelectedItems;
+ TQMap<KEBListViewItem *, bool> mSelectedItems;
bool m_needToFixUp;
// statics
static ListView *s_self;
static int s_myrenamecolumn;
static KEBListViewItem *s_myrenameitem;
- static QStringList s_selected_addresses;
- static QString s_current_address;
+ static TQStringList s_selected_addresses;
+ static TQString s_current_address;
};
#endif
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index 755a6f703..3416e7e0d 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -59,13 +59,13 @@ static KCmdLineOptions options[] = {
KCmdLineLastOption
};
-static void continueInWindow(QString _wname) {
- QCString wname = _wname.latin1();
+static void continueInWindow(TQString _wname) {
+ TQCString wname = _wname.latin1();
int id = -1;
QCStringList apps = kapp->dcopClient()->registeredApplications();
for (QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it) {
- QCString &clientId = *it;
+ TQCString &clientId = *it;
if (qstrncmp(clientId, wname, wname.length()) != 0)
continue;
@@ -83,8 +83,8 @@ static void continueInWindow(QString _wname) {
}
// TODO - make this register() or something like that and move dialog into main
-static int askUser(KApplication &app, QString filename, bool &readonly) {
- QCString requestedName("keditbookmarks");
+static int askUser(KApplication &app, TQString filename, bool &readonly) {
+ TQCString requestedName("keditbookmarks");
if (!filename.isEmpty())
requestedName += "-" + filename.utf8();
@@ -138,9 +138,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
bool gotArg = (args->count() == 1);
- QString filename = gotArg
- ? QString::fromLatin1(args->arg(0))
- : locateLocal("data", QString::fromLatin1("konqueror/bookmarks.xml"));
+ TQString filename = gotArg
+ ? TQString::fromLatin1(args->arg(0))
+ : locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
if (!isGui) {
CurrentMgr::self()->createManager(filename);
@@ -161,12 +161,12 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
// TODO - maybe an xbel export???
if (got > 1) // got == 0 isn't possible as !isGui is dependant on "export.*"
KCmdLineArgs::usage(I18N_NOOP("You may only specify a single --export option."));
- QString path = QString::fromLocal8Bit(args->getOption(arg2));
+ TQString path = TQString::fromLocal8Bit(args->getOption(arg2));
CurrentMgr::self()->doExport(exportType, path);
} else if (importType) {
if (got > 1) // got == 0 isn't possible as !isGui is dependant on "import.*"
KCmdLineArgs::usage(I18N_NOOP("You may only specify a single --import option."));
- QString path = QString::fromLocal8Bit(args->getOption(arg2));
+ TQString path = TQString::fromLocal8Bit(args->getOption(arg2));
ImportCommand *importer = ImportCommand::importerFactory(importType);
importer->import(path, true);
importer->execute();
@@ -176,19 +176,19 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
return 0; // error flag on exit?, 1?
}
- QString address = args->isSet("address")
- ? QString::fromLocal8Bit(args->getOption("address"))
- : QString("/0");
+ TQString address = args->isSet("address")
+ ? TQString::fromLocal8Bit(args->getOption("address"))
+ : TQString("/0");
- QString caption = args->isSet("customcaption")
- ? QString::fromLocal8Bit(args->getOption("customcaption"))
- : QString::null;
+ TQString caption = args->isSet("customcaption")
+ ? TQString::fromLocal8Bit(args->getOption("customcaption"))
+ : TQString::null;
args->clear();
bool readonly = false; // passed by ref
- if (askUser(app, (gotArg ? filename : QString::null), readonly)) {
+ if (askUser(app, (gotArg ? filename : TQString::null), readonly)) {
KEBApp *toplevel = new KEBApp(filename, readonly, address, browser, caption);
toplevel->show();
app.setMainWidget(toplevel);
diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp
index 84919ef27..0d7d0ddf8 100644
--- a/konqueror/keditbookmarks/testlink.cpp
+++ b/konqueror/keditbookmarks/testlink.cpp
@@ -25,8 +25,8 @@
#include "commands.h"
#include "bookmarkiterator.h"
-#include <qtimer.h>
-#include <qpainter.h>
+#include <tqtimer.h>
+#include <tqpainter.h>
#include <kdebug.h>
@@ -49,11 +49,11 @@ void TestLinkItrHolder::doItrListChanged() {
{
kdDebug()<<"Notifing managers "<<m_affectedBookmark<<endl;
CurrentMgr::self()->notifyManagers(CurrentMgr::bookmarkAt(m_affectedBookmark).toGroup());
- m_affectedBookmark = QString::null;
+ m_affectedBookmark = TQString::null;
}
}
-void TestLinkItrHolder::addAffectedBookmark( const QString & address )
+void TestLinkItrHolder::addAffectedBookmark( const TQString & address )
{
kdDebug()<<"addAffectedBookmark "<<address<<endl;
if(m_affectedBookmark.isNull())
@@ -65,7 +65,7 @@ void TestLinkItrHolder::addAffectedBookmark( const QString & address )
/* -------------------------- */
-TestLinkItr::TestLinkItr(QValueList<KBookmark> bks)
+TestLinkItr::TestLinkItr(TQValueList<KBookmark> bks)
: BookmarkIterator(bks) {
m_job = 0;
}
@@ -88,28 +88,28 @@ void TestLinkItr::doAction() {
m_job = KIO::get(curBk().url(), true, false);
m_job->addMetaData("errorPage", "true");
- m_job->addMetaData( QString("cookies"), QString("none") );
+ m_job->addMetaData( TQString("cookies"), TQString("none") );
- connect(m_job, SIGNAL( result( KIO::Job *)),
- this, SLOT( slotJobResult(KIO::Job *)));
- connect(m_job, SIGNAL( data( KIO::Job *, const QByteArray &)),
- this, SLOT( slotJobData(KIO::Job *, const QByteArray &)));
+ connect(m_job, TQT_SIGNAL( result( KIO::Job *)),
+ this, TQT_SLOT( slotJobResult(KIO::Job *)));
+ connect(m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &)),
+ this, TQT_SLOT( slotJobData(KIO::Job *, const TQByteArray &)));
curItem()->setTmpStatus(i18n("Checking..."));
- QString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url());
+ TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url());
curItem()->setOldStatus(oldModDate);
TestLinkItrHolder::self()->setMod(curBk().url().url(), i18n("Checking..."));
}
-void TestLinkItr::slotJobData(KIO::Job *job, const QByteArray &data) {
+void TestLinkItr::slotJobData(KIO::Job *job, const TQByteArray &data) {
KIO::TransferJob *transfer = (KIO::TransferJob *)job;
if (transfer->isErrorPage()) {
- QStringList lines = QStringList::split('\n', data);
- for (QStringList::Iterator it = lines.begin(); it != lines.end(); ++it) {
+ TQStringList lines = TQStringList::split('\n', data);
+ for (TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) {
int open_pos = (*it).find("<title>", 0, false);
if (open_pos >= 0) {
- QString leftover = (*it).mid(open_pos + 7);
+ TQString leftover = (*it).mid(open_pos + 7);
int close_pos = leftover.findRev("</title>", -1, false);
if (close_pos >= 0) {
// if no end tag found then just
@@ -123,9 +123,9 @@ void TestLinkItr::slotJobData(KIO::Job *job, const QByteArray &data) {
}
} else {
- QString modDate = transfer->queryMetaData("modified");
+ TQString modDate = transfer->queryMetaData("modified");
if (!modDate.isEmpty()) {
- curItem()->nsPut(QString::number(KRFCDate::parseDate(modDate)));
+ curItem()->nsPut(TQString::number(KRFCDate::parseDate(modDate)));
}
}
@@ -137,12 +137,12 @@ void TestLinkItr::slotJobResult(KIO::Job *job) {
if ( !curItem() ) return;
KIO::TransferJob *transfer = (KIO::TransferJob *)job;
- QString modDate = transfer->queryMetaData("modified");
+ TQString modDate = transfer->queryMetaData("modified");
bool chkErr = true;
if (transfer->error()) {
// can we assume that errorString will contain no entities?
- QString jerr = job->errorString();
+ TQString jerr = job->errorString();
if (!jerr.isEmpty()) {
jerr.replace("\n", " ");
curItem()->nsPut(jerr);
@@ -152,9 +152,9 @@ void TestLinkItr::slotJobResult(KIO::Job *job) {
if (chkErr) {
if (!modDate.isEmpty()) {
- curItem()->nsPut(QString::number(KRFCDate::parseDate(modDate)));
+ curItem()->nsPut(TQString::number(KRFCDate::parseDate(modDate)));
} else if (!m_errSet) {
- curItem()->nsPut(QString::number(KRFCDate::parseDate("0")));
+ curItem()->nsPut(TQString::number(KRFCDate::parseDate("0")));
}
}
@@ -165,27 +165,27 @@ void TestLinkItr::slotJobResult(KIO::Job *job) {
/* -------------------------- */
-const QString TestLinkItrHolder::getMod(const QString &url) const {
+const TQString TestLinkItrHolder::getMod(const TQString &url) const {
return m_modify.contains(url)
? m_modify[url]
- : QString::null;
+ : TQString::null;
}
-const QString TestLinkItrHolder::getOldVisit(const QString &url) const {
+const TQString TestLinkItrHolder::getOldVisit(const TQString &url) const {
return self()->m_oldModify.contains(url)
? self()->m_oldModify[url]
- : QString::null;
+ : TQString::null;
}
-void TestLinkItrHolder::setMod(const QString &url, const QString &val) {
+void TestLinkItrHolder::setMod(const TQString &url, const TQString &val) {
m_modify[url] = val;
}
-void TestLinkItrHolder::setOldVisit(const QString &url, const QString &val) {
+void TestLinkItrHolder::setOldVisit(const TQString &url, const TQString &val) {
m_oldModify[url] = val;
}
-void TestLinkItrHolder::resetToValue(const QString &url, const QString &oldValue) {
+void TestLinkItrHolder::resetToValue(const TQString &url, const TQString &oldValue) {
if (!oldValue.isEmpty()) {
m_modify[url] = oldValue;
} else {
@@ -195,11 +195,11 @@ void TestLinkItrHolder::resetToValue(const QString &url, const QString &oldValue
/* -------------------------- */
-QString TestLinkItrHolder::calcPaintStyle(const QString &url, KEBListViewItem::PaintStyle &_style,
- const QString &nVisit, const QString &Modify) {
+TQString TestLinkItrHolder::calcPaintStyle(const TQString &url, KEBListViewItem::PaintStyle &_style,
+ const TQString &nVisit, const TQString &Modify) {
bool newModValid = false;
int newMod = 0;
- QString newModStr;
+ TQString newModStr;
bool initial = false;
bool oldError = false;
@@ -224,7 +224,7 @@ QString TestLinkItrHolder::calcPaintStyle(const QString &url, KEBListViewItem::P
// kdDebug() << "TestLink " << url << " " << "booktime=" << nVisit << " urltime=" << newModStr <<
// " Modify=" << Modify << " init=" << initial << " newMod=" << newMod << "\n";
- QString visitStr;
+ TQString visitStr;
if (self()->getOldVisit(url).isNull()) {
// first time
@@ -233,7 +233,7 @@ QString TestLinkItrHolder::calcPaintStyle(const QString &url, KEBListViewItem::P
self()->setOldVisit(url, visitStr);
} else {
// may be reading a second bookmark with same url
- QString oom = nVisit;
+ TQString oom = nVisit;
visitStr = self()->getOldVisit(url);
if (oom.toInt() > visitStr.toInt()) {
self()->setOldVisit(url, oom);
@@ -245,7 +245,7 @@ QString TestLinkItrHolder::calcPaintStyle(const QString &url, KEBListViewItem::P
if (!visitStr.isNull())
visit = visitStr.toInt(); // TODO - check validity?
- QString statusStr;
+ TQString statusStr;
KEBListViewItem::PaintStyle style = KEBListViewItem::DefaultStyle;
// kdDebug() << "TestLink " << "isNull=" << newModStr.isNull() << "newModValid="
@@ -271,7 +271,7 @@ QString TestLinkItrHolder::calcPaintStyle(const QString &url, KEBListViewItem::P
} else if (initial && !newModStr.isNull() && (newMod == 0)) {
// previous check has no modify time recorded
- statusStr = QString::null;
+ statusStr = TQString::null;
} else if (!newModStr.isNull() && (newMod > visit)) {
// if modify time greater than last visit, show bold modify time
@@ -292,26 +292,26 @@ QString TestLinkItrHolder::calcPaintStyle(const QString &url, KEBListViewItem::P
}
} else {
- statusStr = QString::null;
+ statusStr = TQString::null;
}
_style = style;
return statusStr;
}
-static void parseInfo (KBookmark &bk, QString &nVisited) {
+static void parseInfo (KBookmark &bk, TQString &nVisited) {
nVisited =
- NodeEditCommand::getNodeText(bk, QStringList() << "info" << "metadata"
+ NodeEditCommand::getNodeText(bk, TQStringList() << "info" << "metadata"
<< "time_visited" );
// kdDebug() << " Visited=" << nVisited << "\n";
}
-static void parseNsInfo(const QString &nsinfo, QString &nCreate, QString &nAccess, QString &nModify) {
- QStringList sl = QStringList::split(' ', nsinfo);
+static void parseNsInfo(const TQString &nsinfo, TQString &nCreate, TQString &nAccess, TQString &nModify) {
+ TQStringList sl = TQStringList::split(' ', nsinfo);
- for (QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) {
- QStringList spl = QStringList::split('"', (*it));
+ for (TQStringList::Iterator it = sl.begin(); it != sl.end(); ++it) {
+ TQStringList spl = TQStringList::split('"', (*it));
if (spl[0] == "LAST_MODIFIED=") {
nModify = spl[1];
@@ -324,27 +324,27 @@ static void parseNsInfo(const QString &nsinfo, QString &nCreate, QString &nAcces
}
// Still use nsinfo for storing old modify time
-static const QString updateNsInfoMod(const QString &_nsinfo, const QString &nm) {
- QString nCreate, nAccess, nModify;
+static const TQString updateNsInfoMod(const TQString &_nsinfo, const TQString &nm) {
+ TQString nCreate, nAccess, nModify;
parseNsInfo(_nsinfo, nCreate, nAccess, nModify);
bool numValid = false;
nm.toInt(&numValid);
- QString tmp;
- tmp = "ADD_DATE=\"" + ((nCreate.isEmpty()) ? QString::number(time(0)) : nCreate) + "\"";
- tmp += " LAST_VISIT=\"" + ((nAccess.isEmpty()) ? QString("0") : nAccess) + "\"";
- tmp += " LAST_MODIFIED=\"" + ((numValid) ? nm : QString("1")) + "\"";
+ TQString tmp;
+ tmp = "ADD_DATE=\"" + ((nCreate.isEmpty()) ? TQString::number(time(0)) : nCreate) + "\"";
+ tmp += " LAST_VISIT=\"" + ((nAccess.isEmpty()) ? TQString("0") : nAccess) + "\"";
+ tmp += " LAST_MODIFIED=\"" + ((numValid) ? nm : TQString("1")) + "\"";
// if (!numValid) kdDebug() << tmp << "\n";
return tmp;
}
// KEBListViewItem !!!!!!!!!!!
-void KEBListViewItem::nsPut(const QString &newModDate) {
- static const QString NetscapeInfoAttribute = "netscapeinfo";
- const QString info = m_bookmark.internalElement().attribute(NetscapeInfoAttribute);
- QString blah = updateNsInfoMod(info, newModDate);
+void KEBListViewItem::nsPut(const TQString &newModDate) {
+ static const TQString NetscapeInfoAttribute = "netscapeinfo";
+ const TQString info = m_bookmark.internalElement().attribute(NetscapeInfoAttribute);
+ TQString blah = updateNsInfoMod(info, newModDate);
m_bookmark.internalElement().setAttribute(NetscapeInfoAttribute, blah);
TestLinkItrHolder::self()->setMod(m_bookmark.url().url(), newModDate);
setText(KEBListView::StatusColumn, newModDate);
@@ -352,17 +352,17 @@ void KEBListViewItem::nsPut(const QString &newModDate) {
// KEBListViewItem !!!!!!!!!!!
void KEBListViewItem::modUpdate() {
- QString nCreate, nAccess, oldModify;
- QString iVisit;
+ TQString nCreate, nAccess, oldModify;
+ TQString iVisit;
- QString nsinfo = m_bookmark.internalElement().attribute("netscapeinfo");
+ TQString nsinfo = m_bookmark.internalElement().attribute("netscapeinfo");
if (!nsinfo.isEmpty()) {
parseNsInfo(nsinfo, nCreate, nAccess, oldModify);
}
parseInfo(m_bookmark, iVisit);
- QString statusLine;
+ TQString statusLine;
statusLine = TestLinkItrHolder::calcPaintStyle(m_bookmark.url().url(), m_paintStyle, iVisit, oldModify);
if (statusLine != "Error")
setText(KEBListView::StatusColumn, statusLine);
@@ -371,13 +371,13 @@ void KEBListViewItem::modUpdate() {
/* -------------------------- */
// KEBListViewItem !!!!!!!!!!!
-void KEBListViewItem::setOldStatus(const QString &oldStatus) {
+void KEBListViewItem::setOldStatus(const TQString &oldStatus) {
// kdDebug() << "KEBListViewItem::setOldStatus" << endl;
m_oldStatus = oldStatus;
}
// KEBListViewItem !!!!!!!!!!!
-void KEBListViewItem::setTmpStatus(const QString &status) {
+void KEBListViewItem::setTmpStatus(const TQString &status) {
// kdDebug() << "KEBListViewItem::setTmpStatus" << endl;
m_paintStyle = KEBListViewItem::BoldStyle;
setText(KEBListView::StatusColumn, status);
diff --git a/konqueror/keditbookmarks/testlink.h b/konqueror/keditbookmarks/testlink.h
index 7b027edea..7ee84f90b 100644
--- a/konqueror/keditbookmarks/testlink.h
+++ b/konqueror/keditbookmarks/testlink.h
@@ -20,7 +20,7 @@
#ifndef __testlink_h
#define __testlink_h
-#include <qobject.h>
+#include <tqobject.h>
#include <kio/job.h>
#include <kbookmark.h>
@@ -33,22 +33,22 @@ public:
static TestLinkItrHolder* self() {
if (!s_self) { s_self = new TestLinkItrHolder(); }; return s_self;
}
- void addAffectedBookmark( const QString & address );
- void resetToValue(const QString &url, const QString &val);
- const QString getMod(const QString &url) const;
- const QString getOldVisit(const QString &url) const;
- void setMod(const QString &url, const QString &val);
- void setOldVisit(const QString &url, const QString &val);
- static QString calcPaintStyle(const QString &, KEBListViewItem::PaintStyle&,
- const QString &, const QString &);
+ void addAffectedBookmark( const TQString & address );
+ void resetToValue(const TQString &url, const TQString &val);
+ const TQString getMod(const TQString &url) const;
+ const TQString getOldVisit(const TQString &url) const;
+ void setMod(const TQString &url, const TQString &val);
+ void setOldVisit(const TQString &url, const TQString &val);
+ static TQString calcPaintStyle(const TQString &, KEBListViewItem::PaintStyle&,
+ const TQString &, const TQString &);
protected:
virtual void doItrListChanged();
private:
TestLinkItrHolder();
static TestLinkItrHolder *s_self;
- QMap<QString, QString> m_modify;
- QMap<QString, QString> m_oldModify;
- QString m_affectedBookmark;
+ TQMap<TQString, TQString> m_modify;
+ TQMap<TQString, TQString> m_oldModify;
+ TQString m_affectedBookmark;
};
class TestLinkItr : public BookmarkIterator
@@ -56,13 +56,13 @@ class TestLinkItr : public BookmarkIterator
Q_OBJECT
public:
- TestLinkItr(QValueList<KBookmark> bks);
+ TestLinkItr(TQValueList<KBookmark> bks);
~TestLinkItr();
virtual TestLinkItrHolder* holder() const { return TestLinkItrHolder::self(); }
public slots:
void slotJobResult(KIO::Job *job);
- void slotJobData(KIO::Job *job, const QByteArray &data);
+ void slotJobData(KIO::Job *job, const TQByteArray &data);
private:
virtual void doAction();
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 3f49d893a..4a505d495 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -32,10 +32,10 @@
#include <stdlib.h>
-#include <qclipboard.h>
-#include <qsplitter.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqclipboard.h>
+#include <tqsplitter.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
#include <klocale.h>
#include <kdebug.h>
@@ -60,8 +60,8 @@ CmdHistory* CmdHistory::s_self = 0;
CmdHistory::CmdHistory(KActionCollection *collection)
: m_commandHistory(collection) {
- connect(&m_commandHistory, SIGNAL( commandExecuted(KCommand *) ),
- SLOT( slotCommandExecuted(KCommand *) ));
+ connect(&m_commandHistory, TQT_SIGNAL( commandExecuted(KCommand *) ),
+ TQT_SLOT( slotCommandExecuted(KCommand *) ));
assert(!s_self);
s_self = this; // this is hacky
}
@@ -121,17 +121,17 @@ void CmdHistory::clearHistory() {
CurrentMgr *CurrentMgr::s_mgr = 0;
-KBookmark CurrentMgr::bookmarkAt(const QString &a) {
+KBookmark CurrentMgr::bookmarkAt(const TQString &a) {
return self()->mgr()->findByAddress(a);
}
bool CurrentMgr::managerSave() { return mgr()->save(); }
-void CurrentMgr::saveAs(const QString &fileName) { mgr()->saveAs(fileName); }
+void CurrentMgr::saveAs(const TQString &fileName) { mgr()->saveAs(fileName); }
void CurrentMgr::setUpdate(bool update) { mgr()->setUpdate(update); }
-QString CurrentMgr::path() const { return mgr()->path(); }
+TQString CurrentMgr::path() const { return mgr()->path(); }
bool CurrentMgr::showNSBookmarks() const { return mgr()->showNSBookmarks(); }
-void CurrentMgr::createManager(const QString &filename) {
+void CurrentMgr::createManager(const TQString &filename) {
if (m_mgr) {
kdDebug()<<"ERROR calling createManager twice"<<endl;
disconnect(m_mgr, 0, 0, 0);
@@ -140,11 +140,11 @@ void CurrentMgr::createManager(const QString &filename) {
m_mgr = KBookmarkManager::managerForFile(filename, false);
- connect(m_mgr, SIGNAL( changed(const QString &, const QString &) ),
- SLOT( slotBookmarksChanged(const QString &, const QString &) ));
+ connect(m_mgr, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
+ TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ));
}
-void CurrentMgr::slotBookmarksChanged(const QString &, const QString &) {
+void CurrentMgr::slotBookmarksChanged(const TQString &, const TQString &) {
if(ignorenext > 0) //We ignore the first changed signal after every change we did
{
--ignorenext;
@@ -170,21 +170,21 @@ void CurrentMgr::reloadConfig() {
mgr()->emitConfigChanged();
}
-QString CurrentMgr::makeTimeStr(const QString & in)
+TQString CurrentMgr::makeTimeStr(const TQString & in)
{
int secs;
bool ok;
secs = in.toInt(&ok);
if (!ok)
- return QString::null;
+ return TQString::null;
return makeTimeStr(secs);
}
-QString CurrentMgr::makeTimeStr(int b)
+TQString CurrentMgr::makeTimeStr(int b)
{
- QDateTime dt;
+ TQDateTime dt;
dt.setTime_t(b);
- return (dt.daysTo(QDateTime::currentDateTime()) > 31)
+ return (dt.daysTo(TQDateTime::currentDateTime()) > 31)
? KGlobal::locale()->formatDate(dt.date(), false)
: KGlobal::locale()->formatDateTime(dt, false);
}
@@ -194,8 +194,8 @@ QString CurrentMgr::makeTimeStr(int b)
KEBApp *KEBApp::s_topLevel = 0;
KEBApp::KEBApp(
- const QString &bookmarksFile, bool readonly,
- const QString &address, bool browser, const QString &caption
+ const TQString &bookmarksFile, bool readonly,
+ const TQString &address, bool browser, const TQString &caption
) : KMainWindow(), m_dcopIface(0), m_bookmarksFilename(bookmarksFile),
m_caption(caption), m_readOnly(readonly), m_browser(browser) {
@@ -205,24 +205,24 @@ KEBApp::KEBApp(
int h = 20;
- QSplitter *vsplitter = new QSplitter(this);
+ TQSplitter *vsplitter = new TQSplitter(this);
KToolBar *quicksearch = new KToolBar(vsplitter, "search toolbar");
KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ),
- QApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
+ TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
0, actionCollection(), "reset_quicksearch" );
resetQuickSearch->setWhatsThis( i18n( "<b>Reset Quick Search</b><br>"
"Resets the quick search so that all bookmarks are shown again." ) );
resetQuickSearch->plug( quicksearch );
- QLabel *lbl = new QLabel(i18n("Se&arch:"), quicksearch, "kde toolbar widget");
+ TQLabel *lbl = new TQLabel(i18n("Se&arch:"), quicksearch, "kde toolbar widget");
KListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, "KListViewSearchLine");
quicksearch->setStretchableWidget(searchLineEdit);
lbl->setBuddy(searchLineEdit);
- connect(resetQuickSearch, SIGNAL(activated()), searchLineEdit, SLOT(clear()));
- connect(searchLineEdit, SIGNAL(searchUpdated()), SLOT(updateActions()));
+ connect(resetQuickSearch, TQT_SIGNAL(activated()), searchLineEdit, TQT_SLOT(clear()));
+ connect(searchLineEdit, TQT_SIGNAL(searchUpdated()), TQT_SLOT(updateActions()));
ListView::createListViews(vsplitter);
ListView::self()->initListViews();
@@ -231,8 +231,8 @@ KEBApp::KEBApp(
m_bkinfo = new BookmarkInfoWidget(vsplitter);
- vsplitter->setOrientation(QSplitter::Vertical);
- vsplitter->setSizes(QValueList<int>() << h << 380
+ vsplitter->setOrientation(TQSplitter::Vertical);
+ vsplitter->setSizes(TQValueList<int>() << h << 380
<< m_bkinfo->sizeHint().height() );
setCentralWidget(vsplitter);
@@ -247,8 +247,8 @@ KEBApp::KEBApp(
m_dcopIface = new KBookmarkEditorIface();
- connect(kapp->clipboard(), SIGNAL( dataChanged() ),
- SLOT( slotClipboardDataChanged() ));
+ connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ),
+ TQT_SLOT( slotClipboardDataChanged() ));
ListView::self()->connectSignals();
@@ -276,7 +276,7 @@ void KEBApp::construct() {
setAutoSaveSettings();
}
-void KEBApp::updateStatus(QString url)
+void KEBApp::updateStatus(TQString url)
{
if(m_bkinfo->bookmark().url() == url)
m_bkinfo->updateStatus();
@@ -339,8 +339,8 @@ void KEBApp::notifyCommandExecuted() {
void KEBApp::slotConfigureToolbars() {
saveMainWindowSettings(KGlobal::config(), "MainWindow");
KEditToolbar dlg(actionCollection());
- connect(&dlg, SIGNAL( newToolbarConfig() ),
- SLOT( slotNewToolbarConfig() ));
+ connect(&dlg, TQT_SIGNAL( newToolbarConfig() ),
+ TQT_SLOT( slotNewToolbarConfig() ));
dlg.exec();
}
diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h
index 192f56028..7b1ec5f81 100644
--- a/konqueror/keditbookmarks/toplevel.h
+++ b/konqueror/keditbookmarks/toplevel.h
@@ -45,7 +45,7 @@ struct SelcAbilities {
bool tbShowState:1;
};
-class CmdHistory : public QObject {
+class CmdHistory : public TQObject {
Q_OBJECT
public:
CmdHistory(KActionCollection *collection);
@@ -73,33 +73,33 @@ private:
class KBookmark;
class KBookmarkManager;
-class CurrentMgr : public QObject {
+class CurrentMgr : public TQObject {
Q_OBJECT
public:
typedef enum {HTMLExport, OperaExport, IEExport, MozillaExport, NetscapeExport} ExportType;
static CurrentMgr* self() { if (!s_mgr) { s_mgr = new CurrentMgr(); } return s_mgr; }
- static KBookmark bookmarkAt(const QString & a);
+ static KBookmark bookmarkAt(const TQString & a);
KBookmarkManager* mgr() const { return m_mgr; }
bool showNSBookmarks() const;
- QString path() const;
+ TQString path() const;
- void createManager(const QString &filename);
+ void createManager(const TQString &filename);
void notifyManagers(KBookmarkGroup grp);
void notifyManagers();
bool managerSave();
- void saveAs(const QString &fileName);
- void doExport(ExportType type, const QString & path = QString::null);
+ void saveAs(const TQString &fileName);
+ void doExport(ExportType type, const TQString & path = TQString::null);
void setUpdate(bool update);
void reloadConfig();
- static QString makeTimeStr(const QString &);
- static QString makeTimeStr(int);
+ static TQString makeTimeStr(const TQString &);
+ static TQString makeTimeStr(int);
protected slots:
- void slotBookmarksChanged(const QString &, const QString &);
+ void slotBookmarksChanged(const TQString &, const TQString &);
private:
CurrentMgr() : m_mgr(0), ignorenext(0) { ; }
@@ -113,25 +113,25 @@ class KEBApp : public KMainWindow {
public:
static KEBApp* self() { return s_topLevel; }
- KEBApp(const QString & bookmarksFile, bool readonly, const QString &address, bool browser, const QString &caption);
+ KEBApp(const TQString & bookmarksFile, bool readonly, const TQString &address, bool browser, const TQString &caption);
virtual ~KEBApp();
- void updateStatus(QString url);
+ void updateStatus(TQString url);
void setActionsEnabled(SelcAbilities);
void setCancelFavIconUpdatesEnabled(bool);
void setCancelTestsEnabled(bool);
void notifyCommandExecuted();
- void findURL(QString url);
+ void findURL(TQString url);
- QWidget* popupMenuFactory(const char *type) {
+ TQWidget* popupMenuFactory(const char *type) {
return factory()->container(type, this);
}
KToggleAction* getToggleAction(const char *) const;
- QString caption() const { return m_caption; }
+ TQString caption() const { return m_caption; }
bool readonly() const { return m_readOnly; }
bool browser() const { return m_browser; }
bool nsShown() const;
@@ -159,8 +159,8 @@ private:
public: // only temporary
CmdHistory *m_cmdHistory;
- QString m_bookmarksFilename;
- QString m_caption;
+ TQString m_bookmarksFilename;
+ TQString m_caption;
void construct();
diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp
index 34c884617..0d9a4cd11 100644
--- a/konqueror/keditbookmarks/updater.cpp
+++ b/konqueror/keditbookmarks/updater.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <qtimer.h>
+#include <tqtimer.h>
#include "updater.h"
@@ -36,7 +36,7 @@
#include <kparts/componentfactory.h>
#include <kparts/browserextension.h>
-FavIconUpdater::FavIconUpdater(QObject *parent, const char *name)
+FavIconUpdater::FavIconUpdater(TQObject *parent, const char *name)
: KonqFavIconMgr(parent, name) {
m_part = 0;
m_webGrabber = 0;
@@ -58,7 +58,7 @@ void FavIconUpdater::timerDone() {
}
void FavIconUpdater::downloadIcon(const KBookmark &bk) {
- QString favicon = KonqFavIconMgr::iconForURL(bk.url().url());
+ TQString favicon = KonqFavIconMgr::iconForURL(bk.url().url());
if (!favicon.isNull()) {
// kdDebug() << "downloadIcon() - favicon" << favicon << endl;
bk.internalElement().setAttribute("icon", favicon);
@@ -90,17 +90,17 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
if (!m_part) {
KParts::ReadOnlyPart *part
= KParts::ComponentFactory
- ::createPartInstanceFromQuery<KParts::ReadOnlyPart>("text/html", QString::null);
+ ::createPartInstanceFromQuery<KParts::ReadOnlyPart>("text/html", TQString::null);
- part->setProperty("pluginsEnabled", QVariant(false, 1));
- part->setProperty("javaScriptEnabled", QVariant(false, 1));
- part->setProperty("javaEnabled", QVariant(false, 1));
- part->setProperty("autoloadImages", QVariant(false, 1));
+ part->setProperty("pluginsEnabled", TQVariant(false, 1));
+ part->setProperty("javaScriptEnabled", TQVariant(false, 1));
+ part->setProperty("javaEnabled", TQVariant(false, 1));
+ part->setProperty("autoloadImages", TQVariant(false, 1));
- connect(part, SIGNAL( canceled(const QString &) ),
- this, SLOT( slotCompleted() ));
- connect(part, SIGNAL( completed() ),
- this, SLOT( slotCompleted() ));
+ connect(part, TQT_SIGNAL( canceled(const TQString &) ),
+ this, TQT_SLOT( slotCompleted() ));
+ connect(part, TQT_SIGNAL( completed() ),
+ this, TQT_SLOT( slotCompleted() ));
KParts::BrowserExtension *ext = KParts::BrowserExtension::childObject(part);
assert(ext);
@@ -108,16 +108,16 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
m_browserIface = new FavIconBrowserInterface(this, "browseriface");
ext->setBrowserInterface(m_browserIface);
- connect(ext, SIGNAL( setIconURL(const KURL &) ),
- this, SLOT( setIconURL(const KURL &) ));
+ connect(ext, TQT_SIGNAL( setIconURL(const KURL &) ),
+ this, TQT_SLOT( setIconURL(const KURL &) ));
m_part = part;
}
if (!m_timer) {
// Timeout to stop the updating hanging
- m_timer = new QTimer(this);
- connect( m_timer, SIGNAL(timeout()), this, SLOT(timerDone()) );
+ m_timer = new TQTimer(this);
+ connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) );
}
m_timer->start(15000,false);
m_webGrabber = new FavIconWebGrabber(m_part, bk.url());
@@ -128,7 +128,7 @@ void FavIconUpdater::setIconURL(const KURL &iconURL) {
setIconForURL(m_bk.url(), iconURL);
}
-void FavIconUpdater::notifyChange(bool isHost, QString hostOrURL, QString iconName) {
+void FavIconUpdater::notifyChange(bool isHost, TQString hostOrURL, TQString iconName) {
// kdDebug() << "FavIconUpdater::notifyChange()" << endl;
Q_UNUSED(isHost);
@@ -150,21 +150,21 @@ FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url
// the use of KIO rather than directly using KHTML is to allow silently abort on error
KIO::Job *job = KIO::get(m_url, false, false);
- job->addMetaData( QString("cookies"), QString("none") );
- connect(job, SIGNAL( result( KIO::Job *)),
- this, SLOT( slotFinished(KIO::Job *) ));
- connect(job, SIGNAL( mimetype( KIO::Job *, const QString &) ),
- this, SLOT( slotMimetype(KIO::Job *, const QString &) ));
+ job->addMetaData( TQString("cookies"), TQString("none") );
+ connect(job, TQT_SIGNAL( result( KIO::Job *)),
+ this, TQT_SLOT( slotFinished(KIO::Job *) ));
+ connect(job, TQT_SIGNAL( mimetype( KIO::Job *, const TQString &) ),
+ this, TQT_SLOT( slotMimetype(KIO::Job *, const TQString &) ));
}
-void FavIconWebGrabber::slotMimetype(KIO::Job *job, const QString & /*type*/) {
+void FavIconWebGrabber::slotMimetype(KIO::Job *job, const TQString & /*type*/) {
KIO::SimpleJob *sjob = static_cast<KIO::SimpleJob *>(job);
m_url = sjob->url(); // allow for redirection
sjob->putOnHold();
// kdDebug() << "FavIconWebGrabber::slotMimetype " << m_url << "\n";
- // QString typeLocal = typeUncopied; // local copy
+ // TQString typeLocal = typeUncopied; // local copy
// kdDebug() << "slotMimetype : " << typeLocal << endl;
// TODO - what to do if typeLocal is not text/html ??
diff --git a/konqueror/keditbookmarks/updater.h b/konqueror/keditbookmarks/updater.h
index ff92ea55c..62e034744 100644
--- a/konqueror/keditbookmarks/updater.h
+++ b/konqueror/keditbookmarks/updater.h
@@ -35,7 +35,7 @@ public:
~FavIconWebGrabber() {}
protected slots:
- void slotMimetype(KIO::Job *job, const QString &_type);
+ void slotMimetype(KIO::Job *job, const TQString &_type);
void slotFinished(KIO::Job *job);
private:
@@ -50,13 +50,13 @@ class FavIconUpdater : public KonqFavIconMgr
Q_OBJECT
public:
- FavIconUpdater(QObject *parent, const char *name);
+ FavIconUpdater(TQObject *parent, const char *name);
~FavIconUpdater();
void downloadIcon(const KBookmark &bk);
void downloadIconActual(const KBookmark &bk);
- virtual void notifyChange(bool isHost, QString hostOrURL,
- QString iconName);
+ virtual void notifyChange(bool isHost, TQString hostOrURL,
+ TQString iconName);
protected slots:
void setIconURL(const KURL &iconURL);
@@ -71,7 +71,7 @@ private:
KParts::ReadOnlyPart *m_part;
FavIconBrowserInterface *m_browserIface;
FavIconWebGrabber *m_webGrabber;
- QTimer *m_timer;
+ TQTimer *m_timer;
KBookmark m_bk;
};
diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc
index ce0bafd03..5cb090909 100644
--- a/konqueror/konq_actions.cc
+++ b/konqueror/konq_actions.cc
@@ -34,13 +34,13 @@
#include "konq_view.h"
#include "konq_settingsxt.h"
-template class QPtrList<KonqHistoryEntry>;
+template class TQPtrList<KonqHistoryEntry>;
/////////////////
//static - used by KonqHistoryAction and KonqBidiHistoryAction
-void KonqBidiHistoryAction::fillHistoryPopup( const QPtrList<HistoryEntry> &history,
- QPopupMenu * popup,
+void KonqBidiHistoryAction::fillHistoryPopup( const TQPtrList<HistoryEntry> &history,
+ TQPopupMenu * popup,
bool onlyBack,
bool onlyForward,
bool checkCurrentItem,
@@ -50,7 +50,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const QPtrList<HistoryEntry> &hist
//kdDebug(1202) << "fillHistoryPopup position: " << history.at() << endl;
HistoryEntry * current = history.current();
- QPtrListIterator<HistoryEntry> it( history );
+ TQPtrListIterator<HistoryEntry> it( history );
if (onlyBack || onlyForward)
{
it += history.at(); // Jump to current item
@@ -61,7 +61,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const QPtrList<HistoryEntry> &hist
uint i = 0;
while ( it.current() )
{
- QString text = it.current()->title;
+ TQString text = it.current()->title;
text = KStringHandler::cEmSqueeze(text, popup->fontMetrics(), 30); //CT: squeeze
text.replace( "&", "&&" );
if ( checkCurrentItem && it.current() == current )
@@ -80,7 +80,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const QPtrList<HistoryEntry> &hist
///////////////////////////////
-KonqBidiHistoryAction::KonqBidiHistoryAction ( const QString & text, QObject* parent, const char* name )
+KonqBidiHistoryAction::KonqBidiHistoryAction ( const TQString & text, TQObject* parent, const char* name )
: KAction( text, 0, parent, name )
{
setShortcutConfigurable(false);
@@ -88,20 +88,20 @@ KonqBidiHistoryAction::KonqBidiHistoryAction ( const QString & text, QObject* pa
m_goMenu = 0L;
}
-int KonqBidiHistoryAction::plug( QWidget *widget, int index )
+int KonqBidiHistoryAction::plug( TQWidget *widget, int index )
{
if (kapp && !kapp->authorizeKAction(name()))
return -1;
// Go menu
- if ( widget->inherits("QPopupMenu") )
+ if ( widget->inherits("TQPopupMenu") )
{
- m_goMenu = (QPopupMenu*)widget;
+ m_goMenu = (TQPopupMenu*)widget;
// Forward signal (to main view)
- connect( m_goMenu, SIGNAL( aboutToShow() ),
- this, SIGNAL( menuAboutToShow() ) );
- connect( m_goMenu, SIGNAL( activated( int ) ),
- this, SLOT( slotActivated( int ) ) );
+ connect( m_goMenu, TQT_SIGNAL( aboutToShow() ),
+ this, TQT_SIGNAL( menuAboutToShow() ) );
+ connect( m_goMenu, TQT_SIGNAL( activated( int ) ),
+ this, TQT_SLOT( slotActivated( int ) ) );
//kdDebug(1202) << "m_goMenu->count()=" << m_goMenu->count() << endl;
// Store how many items the menu already contains.
// This means, the KonqBidiHistoryAction has to be plugged LAST in a menu !
@@ -111,7 +111,7 @@ int KonqBidiHistoryAction::plug( QWidget *widget, int index )
return KAction::plug( widget, index );
}
-void KonqBidiHistoryAction::fillGoMenu( const QPtrList<HistoryEntry> & history )
+void KonqBidiHistoryAction::fillGoMenu( const TQPtrList<HistoryEntry> & history )
{
if (history.isEmpty())
return; // nothing to do
@@ -168,29 +168,29 @@ void KonqBidiHistoryAction::slotActivated( int id )
///////////////////////////////
-KonqLogoAction::KonqLogoAction( const QString& text, int accel, QObject* parent, const char* name )
+KonqLogoAction::KonqLogoAction( const TQString& text, int accel, TQObject* parent, const char* name )
: KAction( text, accel, parent, name )
{
}
-KonqLogoAction::KonqLogoAction( const QString& text, int accel,
- QObject* receiver, const char* slot, QObject* parent, const char* name )
+KonqLogoAction::KonqLogoAction( const TQString& text, int accel,
+ TQObject* receiver, const char* slot, TQObject* parent, const char* name )
: KAction( text, accel, receiver, slot, parent, name )
{
}
-KonqLogoAction::KonqLogoAction( const QString& text, const QIconSet& pix, int accel, QObject* parent, const char* name )
+KonqLogoAction::KonqLogoAction( const TQString& text, const TQIconSet& pix, int accel, TQObject* parent, const char* name )
: KAction( text, pix, accel, parent, name )
{
}
-KonqLogoAction::KonqLogoAction( const QString& text, const QIconSet& pix,int accel, QObject* receiver, const char* slot, QObject* parent, const char* name )
+KonqLogoAction::KonqLogoAction( const TQString& text, const TQIconSet& pix,int accel, TQObject* receiver, const char* slot, TQObject* parent, const char* name )
: KAction( text, pix, accel, receiver, slot, parent, name )
{
}
-KonqLogoAction::KonqLogoAction( const QStringList& icons, QObject* receiver,
- const char* slot, QObject* parent,
+KonqLogoAction::KonqLogoAction( const TQStringList& icons, TQObject* receiver,
+ const char* slot, TQObject* parent,
const char* name )
: KAction( 0L, 0, receiver, slot, parent, name ) // text missing !
{
@@ -202,7 +202,7 @@ void KonqLogoAction::start()
int len = containerCount();
for ( int i = 0; i < len; i++ )
{
- QWidget *w = container( i );
+ TQWidget *w = container( i );
if ( w->inherits( "KToolBar" ) )
{
@@ -217,7 +217,7 @@ void KonqLogoAction::stop()
int len = containerCount();
for ( int i = 0; i < len; i++ )
{
- QWidget *w = container( i );
+ TQWidget *w = container( i );
if ( w->inherits( "KToolBar" ) )
{
@@ -229,7 +229,7 @@ void KonqLogoAction::stop()
void KonqLogoAction::updateIcon(int id)
{
- QWidget *w = container( id );
+ TQWidget *w = container( id );
if ( w->inherits( "KToolBar" ) )
{
@@ -240,7 +240,7 @@ void KonqLogoAction::updateIcon(int id)
-int KonqLogoAction::plug( QWidget *widget, int index )
+int KonqLogoAction::plug( TQWidget *widget, int index )
{
if (kapp && !kapp->authorizeKAction(name()))
return -1;
@@ -261,12 +261,12 @@ int KonqLogoAction::plug( QWidget *widget, int index )
int id_ = getToolButtonID();
- bar->insertAnimatedWidget( id_, this, SIGNAL(activated()), QString("kde"), index );
+ bar->insertAnimatedWidget( id_, this, TQT_SIGNAL(activated()), TQString("kde"), index );
bar->alignItemRight( id_ );
addContainer( bar, id_ );
- connect( bar, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
+ connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
return containerCount() - 1;
}
@@ -278,18 +278,18 @@ int KonqLogoAction::plug( QWidget *widget, int index )
///////////
-KonqViewModeAction::KonqViewModeAction( const QString &text, const QString &icon,
- QObject *parent, const char *name )
+KonqViewModeAction::KonqViewModeAction( const TQString &text, const TQString &icon,
+ TQObject *parent, const char *name )
: KRadioAction( text, icon, 0, parent, name )
{
m_menu = new QPopupMenu;
- connect( m_menu, SIGNAL( aboutToShow() ),
- this, SLOT( slotPopupAboutToShow() ) );
- connect( m_menu, SIGNAL( activated( int ) ),
- this, SLOT( slotPopupActivated() ) );
- connect( m_menu, SIGNAL( aboutToHide() ),
- this, SLOT( slotPopupAboutToHide() ) );
+ connect( m_menu, TQT_SIGNAL( aboutToShow() ),
+ this, TQT_SLOT( slotPopupAboutToShow() ) );
+ connect( m_menu, TQT_SIGNAL( activated( int ) ),
+ this, TQT_SLOT( slotPopupActivated() ) );
+ connect( m_menu, TQT_SIGNAL( aboutToHide() ),
+ this, TQT_SLOT( slotPopupAboutToHide() ) );
}
KonqViewModeAction::~KonqViewModeAction()
@@ -297,7 +297,7 @@ KonqViewModeAction::~KonqViewModeAction()
delete m_menu;
}
-int KonqViewModeAction::plug( QWidget *widget, int index )
+int KonqViewModeAction::plug( TQWidget *widget, int index )
{
int res = KRadioAction::plug( widget, index );
@@ -331,7 +331,7 @@ void KonqViewModeAction::slotPopupAboutToHide()
int i = 0;
for (; i < containerCount(); ++i )
{
- QWidget *widget = container( i );
+ TQWidget *widget = container( i );
if ( !widget->inherits( "KToolBar" ) )
continue;
@@ -348,17 +348,17 @@ void KonqViewModeAction::slotPopupAboutToHide()
MostOftenList * KonqMostOftenURLSAction::s_mostEntries = 0L;
uint KonqMostOftenURLSAction::s_maxEntries = 0;
-KonqMostOftenURLSAction::KonqMostOftenURLSAction( const QString& text,
- QObject *parent,
+KonqMostOftenURLSAction::KonqMostOftenURLSAction( const TQString& text,
+ TQObject *parent,
const char *name )
: KActionMenu( text, "goto", parent, name )
{
setDelayed( false );
- connect( popupMenu(), SIGNAL( aboutToShow() ), SLOT( slotFillMenu() ));
- //connect( popupMenu(), SIGNAL( aboutToHide() ), SLOT( slotClearMenu() ));
- connect( popupMenu(), SIGNAL( activated( int ) ),
- SLOT( slotActivated(int) ));
+ connect( popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotFillMenu() ));
+ //connect( popupMenu(), TQT_SIGNAL( aboutToHide() ), TQT_SLOT( slotClearMenu() ));
+ connect( popupMenu(), TQT_SIGNAL( activated( int ) ),
+ TQT_SLOT( slotActivated(int) ));
// Need to do all this upfront for a correct initial state
init();
}
@@ -380,11 +380,11 @@ void KonqMostOftenURLSAction::parseHistory() // only ever called once
KonqHistoryManager *mgr = KonqHistoryManager::kself();
KonqHistoryIterator it( mgr->entries() );
- connect( mgr, SIGNAL( entryAdded( const KonqHistoryEntry * )),
- SLOT( slotEntryAdded( const KonqHistoryEntry * )));
- connect( mgr, SIGNAL( entryRemoved( const KonqHistoryEntry * )),
- SLOT( slotEntryRemoved( const KonqHistoryEntry * )));
- connect( mgr, SIGNAL( cleared() ), SLOT( slotHistoryCleared() ));
+ connect( mgr, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * )),
+ TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * )));
+ connect( mgr, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry * )),
+ TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry * )));
+ connect( mgr, TQT_SIGNAL( cleared() ), TQT_SLOT( slotHistoryCleared() ));
s_mostEntries = new MostOftenList; // exit() will clean this up for now
for ( uint i = 0; it.current() && i < s_maxEntries; i++ ) {
@@ -447,7 +447,7 @@ void KonqMostOftenURLSAction::slotFillMenu()
KonqHistoryEntry *entry = s_mostEntries->at( id );
while ( entry ) {
// we take either title, typedURL or URL (in this order)
- QString text = entry->title.isEmpty() ? (entry->typedURL.isEmpty() ?
+ TQString text = entry->title.isEmpty() ? (entry->typedURL.isEmpty() ?
entry->url.prettyURL() :
entry->typedURL) :
entry->title;
@@ -487,8 +487,8 @@ void KonqMostOftenURLSAction::slotActivated( int id )
}
// sort by numberOfTimesVisited (least often goes first)
-int MostOftenList::compareItems( QPtrCollection::Item item1,
- QPtrCollection::Item item2)
+int MostOftenList::compareItems( TQPtrCollection::Item item1,
+ TQPtrCollection::Item item2)
{
KonqHistoryEntry *entry1 = static_cast<KonqHistoryEntry *>( item1 );
KonqHistoryEntry *entry2 = static_cast<KonqHistoryEntry *>( item2 );
diff --git a/konqueror/konq_actions.h b/konqueror/konq_actions.h
index d4fb343e7..947f0e404 100644
--- a/konqueror/konq_actions.h
+++ b/konqueror/konq_actions.h
@@ -22,7 +22,7 @@
#include <konq_historymgr.h>
#include <kaction.h>
-#include <qptrlist.h>
+#include <tqptrlist.h>
class HistoryEntry;
class QPopupMenu;
@@ -35,18 +35,18 @@ class KonqBidiHistoryAction : public KAction
{
Q_OBJECT
public:
- KonqBidiHistoryAction( const QString & text, QObject* parent = 0, const char* name = 0 );
+ KonqBidiHistoryAction( const TQString & text, TQObject* parent = 0, const char* name = 0 );
virtual ~KonqBidiHistoryAction() {};
- virtual int plug( QWidget *widget, int index = -1 );
- //virtual void unplug( QWidget *widget );
+ virtual int plug( TQWidget *widget, int index = -1 );
+ //virtual void unplug( TQWidget *widget );
- void fillGoMenu( const QPtrList<HistoryEntry> &history );
+ void fillGoMenu( const TQPtrList<HistoryEntry> &history );
// Used by KonqHistoryAction and KonqBidiHistoryAction
- static void fillHistoryPopup( const QPtrList<HistoryEntry> &history,
- QPopupMenu * popup,
+ static void fillHistoryPopup( const TQPtrList<HistoryEntry> &history,
+ TQPopupMenu * popup,
bool onlyBack = false,
bool onlyForward = false,
bool checkCurrentItem = false,
@@ -63,7 +63,7 @@ private:
uint m_firstIndex; // first index in the Go menu
int m_startPos;
int m_currentPos; // == history.at()
- QPopupMenu *m_goMenu; // hack
+ TQPopupMenu *m_goMenu; // hack
};
/////
@@ -72,38 +72,38 @@ class KonqLogoAction : public KAction
{
Q_OBJECT
public:
- KonqLogoAction( const QString& text, int accel = 0, QObject* parent = 0, const char* name = 0 );
- KonqLogoAction( const QString& text, int accel,
- QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
- KonqLogoAction( const QString& text, const QIconSet& pix, int accel = 0,
- QObject* parent = 0, const char* name = 0 );
- KonqLogoAction( const QString& text, const QIconSet& pix, int accel,
- QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
+ KonqLogoAction( const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 );
+ KonqLogoAction( const TQString& text, int accel,
+ TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
+ KonqLogoAction( const TQString& text, const TQIconSet& pix, int accel = 0,
+ TQObject* parent = 0, const char* name = 0 );
+ KonqLogoAction( const TQString& text, const TQIconSet& pix, int accel,
+ TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
// text missing !
- KonqLogoAction( const QStringList& icons, QObject* receiver,
- const char* slot, QObject* parent, const char* name = 0 );
+ KonqLogoAction( const TQStringList& icons, TQObject* receiver,
+ const char* slot, TQObject* parent, const char* name = 0 );
- virtual int plug( QWidget *widget, int index = -1 );
+ virtual int plug( TQWidget *widget, int index = -1 );
virtual void updateIcon(int id);
void start();
void stop();
private:
- QStringList iconList;
+ TQStringList iconList;
};
class KonqViewModeAction : public KRadioAction
{
Q_OBJECT
public:
- KonqViewModeAction( const QString &text, const QString &icon,
- QObject *parent, const char *name );
+ KonqViewModeAction( const TQString &text, const TQString &icon,
+ TQObject *parent, const char *name );
virtual ~KonqViewModeAction();
- virtual int plug( QWidget *widget, int index = -1 );
+ virtual int plug( TQWidget *widget, int index = -1 );
- QPopupMenu *popupMenu() const { return m_menu; }
+ TQPopupMenu *popupMenu() const { return m_menu; }
private slots:
void slotPopupAboutToShow();
@@ -112,7 +112,7 @@ private slots:
private:
bool m_popupActivated;
- QPopupMenu *m_menu;
+ TQPopupMenu *m_menu;
};
class MostOftenList : public KonqBaseHistoryList
@@ -121,7 +121,7 @@ protected:
/**
* Ensures that the items are sorted by numberOfTimesVisited
*/
- virtual int compareItems( QPtrCollection::Item, QPtrCollection::Item );
+ virtual int compareItems( TQPtrCollection::Item, TQPtrCollection::Item );
};
class KonqMostOftenURLSAction : public KActionMenu
@@ -129,7 +129,7 @@ class KonqMostOftenURLSAction : public KActionMenu
Q_OBJECT
public:
- KonqMostOftenURLSAction( const QString& text, QObject *parent,
+ KonqMostOftenURLSAction( const TQString& text, TQObject *parent,
const char *name );
virtual ~KonqMostOftenURLSAction();
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc
index 4ea68abb3..86747ebde 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cc
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qpainter.h>
-#include <qstyle.h>
+#include <tqpainter.h>
+#include <tqstyle.h>
#include <kapplication.h>
#include <kconfig.h>
#include <kcompletionbox.h>
@@ -39,7 +39,7 @@
KConfig * KonqCombo::s_config = 0L;
const int KonqCombo::temporary = 0;
-static QString titleOfURL( const QString& urlStr )
+static TQString titleOfURL( const TQString& urlStr )
{
KURL url = KURL::fromPathOrURL( urlStr );
KonqHistoryList& historylist = const_cast<KonqHistoryList&>( KonqHistoryManager::kself()->entries() );
@@ -48,50 +48,50 @@ static QString titleOfURL( const QString& urlStr )
url.setPath( url.path()+'/' );
historyentry = historylist.findEntry( url );
}
- return ( historyentry ? historyentry->title : QString::null );
+ return ( historyentry ? historyentry->title : TQString::null );
}
class Q_EXPORT KonqComboListBoxPixmap : public QListBoxItem
{
public:
- KonqComboListBoxPixmap( const QString& text );
- KonqComboListBoxPixmap( const QPixmap &, const QString& text, const QString& title );
+ KonqComboListBoxPixmap( const TQString& text );
+ KonqComboListBoxPixmap( const TQPixmap &, const TQString& text, const TQString& title );
- const QPixmap *pixmap() const { return &pm; }
+ const TQPixmap *pixmap() const { return &pm; }
- int height( const QListBox * ) const;
- int width( const QListBox * ) const;
+ int height( const TQListBox * ) const;
+ int width( const TQListBox * ) const;
int rtti() const;
static int RTTI;
- bool reuse( const QString& newText );
+ bool reuse( const TQString& newText );
protected:
- void paint( QPainter * );
+ void paint( TQPainter * );
private:
bool lookup_pending;
- QPixmap pm;
- QString title;
+ TQPixmap pm;
+ TQString title;
};
class KonqComboLineEdit : public KLineEdit
{
public:
- KonqComboLineEdit( QWidget *parent=0, const char *name=0 );
- void setCompletedItems( const QStringList& items );
+ KonqComboLineEdit( TQWidget *parent=0, const char *name=0 );
+ void setCompletedItems( const TQStringList& items );
};
class KonqComboCompletionBox : public KCompletionBox
{
public:
- KonqComboCompletionBox( QWidget *parent, const char *name = 0 );
- void setItems( const QStringList& items );
- void insertStringList( const QStringList & list, int index = -1 );
+ KonqComboCompletionBox( TQWidget *parent, const char *name = 0 );
+ void setItems( const TQStringList& items );
+ void insertStringList( const TQStringList & list, int index = -1 );
};
-KonqCombo::KonqCombo( QWidget *parent, const char *name )
+KonqCombo::KonqCombo( TQWidget *parent, const char *name )
: KHistoryCombo( parent, name ),
m_returnPressed( false ),
m_permanent( false ),
@@ -99,7 +99,7 @@ KonqCombo::KonqCombo( QWidget *parent, const char *name )
m_pageSecurity( KonqMainWindow::NotCrypted )
{
setInsertionPolicy( NoInsertion );
- setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ));
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
Q_ASSERT( s_config );
@@ -122,11 +122,11 @@ KonqCombo::KonqCombo( QWidget *parent, const char *name )
// Make the lineedit consume the Key_Enter event...
setTrapReturnKey( true );
- connect( KonqHistoryManager::kself(), SIGNAL(cleared()), SLOT(slotCleared()) );
- connect( this, SIGNAL(cleared() ), SLOT(slotCleared()) );
- connect( this, SIGNAL(highlighted( int )), SLOT(slotSetIcon( int )) );
- connect( this, SIGNAL(activated( const QString& )),
- SLOT(slotActivated( const QString& )) );
+ connect( KonqHistoryManager::kself(), TQT_SIGNAL(cleared()), TQT_SLOT(slotCleared()) );
+ connect( this, TQT_SIGNAL(cleared() ), TQT_SLOT(slotCleared()) );
+ connect( this, TQT_SIGNAL(highlighted( int )), TQT_SLOT(slotSetIcon( int )) );
+ connect( this, TQT_SIGNAL(activated( const TQString& )),
+ TQT_SLOT(slotActivated( const TQString& )) );
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
@@ -145,30 +145,30 @@ void KonqCombo::init( KCompletion *completion )
loadItems();
}
-void KonqCombo::setURL( const QString& url )
+void KonqCombo::setURL( const TQString& url )
{
//kdDebug(1202) << "KonqCombo::setURL: " << url << ", returnPressed ? " << m_returnPressed << endl;
setTemporary( url );
if ( m_returnPressed ) { // Really insert...
m_returnPressed = false;
- QByteArray data;
- QDataStream s( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream s( data, IO_WriteOnly );
s << url << kapp->dcopClient()->defaultObject();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
- "addToCombo(QString,QCString)", data);
+ "addToCombo(TQString,TQCString)", data);
}
// important security consideration: always display the beginning
// of the url rather than its end to prevent spoofing attempts.
lineEdit()->setCursorPosition( 0 );
}
-void KonqCombo::setTemporary( const QString& text )
+void KonqCombo::setTemporary( const TQString& text )
{
setTemporary( text, KonqPixmapProvider::self()->pixmapFor(text) );
}
-void KonqCombo::setTemporary( const QString& url, const QPixmap& pix )
+void KonqCombo::setTemporary( const TQString& url, const TQPixmap& pix )
{
//kdDebug(1202) << "KonqCombo::setTemporary: " << url << ", temporary = " << temporary << endl;
@@ -190,14 +190,14 @@ void KonqCombo::removeDuplicates( int index )
{
//kdDebug(1202) << "KonqCombo::removeDuplicates: Starting index = " << index << endl;
- QString url (temporaryItem());
+ TQString url (temporaryItem());
if (url.endsWith("/"))
url.truncate(url.length()-1);
// Remove all dupes, if available...
for ( int i = index; i < count(); i++ )
{
- QString item (text(i));
+ TQString item (text(i));
if (item.endsWith("/"))
item.truncate(item.length()-1);
@@ -208,7 +208,7 @@ void KonqCombo::removeDuplicates( int index )
}
// called via DCOP in all instances
-void KonqCombo::insertPermanent( const QString& url )
+void KonqCombo::insertPermanent( const TQString& url )
{
//kdDebug(1202) << "KonqCombo::insertPermanent: URL = " << url << endl;
saveState();
@@ -228,7 +228,7 @@ void KonqCombo::applyPermanent()
while ( count() >= maxCount() )
removeItem( --index );
- QString url (temporaryItem());
+ TQString url (temporaryItem());
insertItem( KonqPixmapProvider::self()->pixmapFor( url ), url, 1, titleOfURL( url ) );
//kdDebug(1202) << "KonqCombo::applyPermanent: " << url << endl;
@@ -238,19 +238,19 @@ void KonqCombo::applyPermanent()
}
}
-void KonqCombo::insertItem( const QString &text, int index, const QString& title )
+void KonqCombo::insertItem( const TQString &text, int index, const TQString& title )
{
KonqComboListBoxPixmap* item = new KonqComboListBoxPixmap( 0, text, title );
listBox()->insertItem( item, index );
}
-void KonqCombo::insertItem( const QPixmap &pixmap, const QString& text, int index, const QString& title )
+void KonqCombo::insertItem( const TQPixmap &pixmap, const TQString& text, int index, const TQString& title )
{
KonqComboListBoxPixmap* item = new KonqComboListBoxPixmap( pixmap, text, title );
listBox()->insertItem( item, index );
}
-void KonqCombo::updateItem( const QPixmap& pix, const QString& t, int index, const QString& title )
+void KonqCombo::updateItem( const TQPixmap& pix, const TQString& t, int index, const TQString& title )
{
// No need to flicker
if (text( index ) == t &&
@@ -260,9 +260,9 @@ void KonqCombo::updateItem( const QPixmap& pix, const QString& t, int index, con
// kdDebug(1202) << "KonqCombo::updateItem: item='" << t << "', index='"
// << index << "'" << endl;
- // QComboBox::changeItem() doesn't honour the pixmap when
+ // TQComboBox::changeItem() doesn't honour the pixmap when
// using an editable combobox, so we just remove and insert
- // ### use QComboBox::changeItem(), once that finally works
+ // ### use TQComboBox::changeItem(), once that finally works
// Well lets try it now as it seems to work fine for me. We
// can always revert :)
KonqComboListBoxPixmap* item = new KonqComboListBoxPixmap( pix, t, title );
@@ -318,9 +318,9 @@ void KonqCombo::loadItems()
s_config->writeEntry( "CompletionItems", "unused" );
s_config->setGroup( "Location Bar" );
- QStringList items = s_config->readPathListEntry( "ComboContents" );
- QStringList::ConstIterator it = items.begin();
- QString item;
+ TQStringList items = s_config->readPathListEntry( "ComboContents" );
+ TQStringList::ConstIterator it = items.begin();
+ TQString item;
bool first = true;
while ( it != items.end() ) {
item = *it;
@@ -367,7 +367,7 @@ void KonqCombo::popup()
void KonqCombo::saveItems()
{
- QStringList items;
+ TQStringList items;
int i = m_permanent ? 0 : 1;
for ( ; i < count(); i++ )
@@ -383,20 +383,20 @@ void KonqCombo::saveItems()
void KonqCombo::clearTemporary( bool makeCurrent )
{
applyPermanent();
- changeItem( QString::null, temporary ); // ### default pixmap?
+ changeItem( TQString::null, temporary ); // ### default pixmap?
if ( makeCurrent )
setCurrentItem( temporary );
}
-bool KonqCombo::eventFilter( QObject *o, QEvent *ev )
+bool KonqCombo::eventFilter( TQObject *o, TQEvent *ev )
{
// Handle Ctrl+Del/Backspace etc better than the Qt widget, which always
// jumps to the next whitespace.
- QLineEdit *edit = lineEdit();
+ TQLineEdit *edit = lineEdit();
if ( o == edit ) {
int type = ev->type();
- if ( type == QEvent::KeyPress ) {
- QKeyEvent *e = static_cast<QKeyEvent *>( ev );
+ if ( type == TQEvent::KeyPress ) {
+ TQKeyEvent *e = static_cast<TQKeyEvent *>( ev );
if ( e->key() == Key_Return || e->key() == Key_Enter ) {
m_modifier = e->state();
@@ -413,7 +413,7 @@ bool KonqCombo::eventFilter( QObject *o, QEvent *ev )
}
}
- else if ( type == QEvent::MouseButtonDblClick ) {
+ else if ( type == TQEvent::MouseButtonDblClick ) {
edit->selectAll();
return true;
}
@@ -421,11 +421,11 @@ bool KonqCombo::eventFilter( QObject *o, QEvent *ev )
return KComboBox::eventFilter( o, ev );
}
-void KonqCombo::keyPressEvent( QKeyEvent *e )
+void KonqCombo::keyPressEvent( TQKeyEvent *e )
{
KHistoryCombo::keyPressEvent( e );
// we have to set it as temporary, otherwise we wouldn't get our nice
- // pixmap. Yes, QComboBox still sucks.
+ // pixmap. Yes, TQComboBox still sucks.
if ( KKey( e ) == KKey( int( KStdAccel::rotateUp() ) ) ||
KKey( e ) == KKey( int( KStdAccel::rotateDown() ) ) )
setTemporary( currentText() );
@@ -437,17 +437,17 @@ void KonqCombo::keyPressEvent( QKeyEvent *e )
the next [/#?:], which makes more sense for URLs. The list of
chars that will stop the cursor are '/', '.', '?', '#', ':'.
*/
-void KonqCombo::selectWord(QKeyEvent *e)
+void KonqCombo::selectWord(TQKeyEvent *e)
{
- QLineEdit* edit = lineEdit();
- QString text = edit->text();
+ TQLineEdit* edit = lineEdit();
+ TQString text = edit->text();
int pos = edit->cursorPosition();
int pos_old = pos;
int count = 0;
// TODO: make these a parameter when in kdelibs/kdeui...
- QValueList<QChar> chars;
- chars << QChar('/') << QChar('.') << QChar('?') << QChar('#') << QChar(':');
+ TQValueList<TQChar> chars;
+ chars << TQChar('/') << TQChar('.') << TQChar('?') << TQChar('#') << TQChar(':');
bool allow_space_break = true;
if( e->key() == Key_Left || e->key() == Key_Backspace ) {
@@ -463,9 +463,9 @@ void KonqCombo::selectWord(QKeyEvent *e)
}
else if( e->key() == Key_Backspace ) {
edit->cursorForward(false, 1-count);
- QString text = edit->text();
+ TQString text = edit->text();
int pos_to_right = edit->text().length() - pos_old;
- QString cut = text.left(edit->cursorPosition()) + text.right(pos_to_right);
+ TQString cut = text.left(edit->cursorPosition()) + text.right(pos_to_right);
edit->setText(cut);
edit->setCursorPosition(pos_old-count+1);
}
@@ -486,10 +486,10 @@ void KonqCombo::selectWord(QKeyEvent *e)
}
else if( e->key() == Key_Delete ) {
edit->cursorForward(false, -count-1);
- QString text = edit->text();
+ TQString text = edit->text();
int pos_to_right = text.length() - pos - 1;
- QString cut = text.left(pos_old) +
- (pos_to_right > 0 ? text.right(pos_to_right) : QString::null );
+ TQString cut = text.left(pos_old) +
+ (pos_to_right > 0 ? text.right(pos_to_right) : TQString::null );
edit->setText(cut);
edit->setCursorPosition(pos_old);
}
@@ -501,13 +501,13 @@ void KonqCombo::selectWord(QKeyEvent *e)
void KonqCombo::slotCleared()
{
- QByteArray data;
- QDataStream s( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream s( data, IO_WriteOnly );
s << kapp->dcopClient()->defaultObject();
- kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "comboCleared(QCString)", data);
+ kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "comboCleared(TQCString)", data);
}
-void KonqCombo::removeURL( const QString& url )
+void KonqCombo::removeURL( const TQString& url )
{
setUpdatesEnabled( false );
lineEdit()->setUpdatesEnabled( false );
@@ -521,14 +521,14 @@ void KonqCombo::removeURL( const QString& url )
update();
}
-void KonqCombo::mousePressEvent( QMouseEvent *e )
+void KonqCombo::mousePressEvent( TQMouseEvent *e )
{
- m_dragStart = QPoint(); // null QPoint
+ m_dragStart = TQPoint(); // null QPoint
if ( e->button() == LeftButton && pixmap( currentItem()) ) {
// check if the pixmap was clicked
int x = e->pos().x();
- int x0 = QStyle::visualRect( style().querySubControlMetrics( QStyle::CC_ComboBox, this, QStyle::SC_ComboBoxEditField ), this ).x();
+ int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
if ( x > x0 + 2 && x < lineEdit()->x() ) {
m_dragStart = e->pos();
@@ -539,7 +539,7 @@ void KonqCombo::mousePressEvent( QMouseEvent *e )
if ( e->button() == LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) {
// check if the lock icon was clicked
int x = e->pos().x();
- int x0 = QStyle::visualRect( style().querySubControlMetrics( QStyle::CC_ComboBox, this, QStyle::SC_ComboBoxArrow ), this ).x();
+ int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x();
if ( x < x0 )
emit showPageSecurity();
@@ -548,7 +548,7 @@ void KonqCombo::mousePressEvent( QMouseEvent *e )
KComboBox::mousePressEvent( e );
}
-void KonqCombo::mouseMoveEvent( QMouseEvent *e )
+void KonqCombo::mouseMoveEvent( TQMouseEvent *e )
{
KComboBox::mouseMoveEvent( e );
if ( m_dragStart.isNull() || currentText().isEmpty() )
@@ -564,7 +564,7 @@ void KonqCombo::mouseMoveEvent( QMouseEvent *e )
KURL::List list;
list.append( url );
KURLDrag *drag = new KURLDrag( list, this );
- QPixmap pix = KonqPixmapProvider::self()->pixmapFor( currentText(),
+ TQPixmap pix = KonqPixmapProvider::self()->pixmapFor( currentText(),
KIcon::SizeMedium );
if ( !pix.isNull() )
drag->setPixmap( pix );
@@ -573,7 +573,7 @@ void KonqCombo::mouseMoveEvent( QMouseEvent *e )
}
}
-void KonqCombo::slotActivated( const QString& text )
+void KonqCombo::slotActivated( const TQString& text )
{
//kdDebug(1202) << "KonqCombo::slotActivated: " << text << endl;
applyPermanent();
@@ -587,28 +587,28 @@ void KonqCombo::setConfig( KConfig *kc )
s_config = kc;
}
-void KonqCombo::paintEvent( QPaintEvent *pe )
+void KonqCombo::paintEvent( TQPaintEvent *pe )
{
- QComboBox::paintEvent( pe );
+ TQComboBox::paintEvent( pe );
- QLineEdit *edit = lineEdit();
- QRect re = style().querySubControlMetrics( QStyle::CC_ComboBox, this, QStyle::SC_ComboBoxEditField );
- re = QStyle::visualRect(re, this);
+ TQLineEdit *edit = lineEdit();
+ TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField );
+ re = TQStyle::visualRect(re, this);
if ( m_pageSecurity!=KonqMainWindow::NotCrypted ) {
- QColor color(245, 246, 190);
+ TQColor color(245, 246, 190);
bool useColor = hasSufficientContrast(color,edit->paletteForegroundColor());
- QPainter p( this );
+ TQPainter p( this );
p.setClipRect( re );
- QPixmap pix = KonqPixmapProvider::self()->pixmapFor( currentText() );
+ TQPixmap pix = KonqPixmapProvider::self()->pixmapFor( currentText() );
if ( useColor ) {
- p.fillRect( re.x(), re.y(), pix.width() + 4, re.height(), QBrush( color ));
+ p.fillRect( re.x(), re.y(), pix.width() + 4, re.height(), TQBrush( color ));
p.drawPixmap( re.x() + 2, re.y() + ( re.height() - pix.height() ) / 2, pix );
}
- QRect r = edit->geometry();
+ TQRect r = edit->geometry();
r.setRight( re.right() - pix.width() - 4 );
if ( r != edit->geometry() )
edit->setGeometry( r );
@@ -618,16 +618,16 @@ void KonqCombo::paintEvent( QPaintEvent *pe )
pix = SmallIcon( m_pageSecurity==KonqMainWindow::Encrypted ? "encrypted" : "halfencrypted" );
p.fillRect( re.right() - pix.width() - 3 , re.y(), pix.width() + 4, re.height(),
- QBrush( useColor ? color : edit->paletteBackgroundColor() ));
+ TQBrush( useColor ? color : edit->paletteBackgroundColor() ));
p.drawPixmap( re.right() - pix.width() -1 , re.y() + ( re.height() - pix.height() ) / 2, pix );
p.setClipping( FALSE );
}
else {
- QRect r = edit->geometry();
+ TQRect r = edit->geometry();
r.setRight( re.right() );
if ( r != edit->geometry() )
edit->setGeometry( r );
- edit->setPaletteBackgroundColor( QApplication::palette( edit ).color( QPalette::Active, QColorGroup::Base ) );
+ edit->setPaletteBackgroundColor( TQApplication::palette( edit ).color( TQPalette::Active, TQColorGroup::Base ) );
}
}
@@ -637,7 +637,7 @@ void KonqCombo::setPageSecurity( int pageSecurity )
repaint();
}
-bool KonqCombo::hasSufficientContrast(const QColor &c1, const QColor &c2)
+bool KonqCombo::hasSufficientContrast(const TQColor &c1, const TQColor &c2)
{
// Taken from khtml/misc/helper.cc
#define HUE_DISTANCE 40
@@ -667,15 +667,15 @@ bool KonqCombo::hasSufficientContrast(const QColor &c1, const QColor &c2)
///////////////////////////////////////////////////////////////////////////////
-KonqComboListBoxPixmap::KonqComboListBoxPixmap( const QString& text )
- : QListBoxItem()
+KonqComboListBoxPixmap::KonqComboListBoxPixmap( const TQString& text )
+ : TQListBoxItem()
{
setText( text );
lookup_pending = true;
}
-KonqComboListBoxPixmap::KonqComboListBoxPixmap( const QPixmap & pix, const QString& text, const QString& _title )
- : QListBoxItem()
+KonqComboListBoxPixmap::KonqComboListBoxPixmap( const TQPixmap & pix, const TQString& text, const TQString& _title )
+ : TQListBoxItem()
{
pm = pix;
title = _title;
@@ -683,7 +683,7 @@ KonqComboListBoxPixmap::KonqComboListBoxPixmap( const QPixmap & pix, const QStri
lookup_pending = false;
}
-void KonqComboListBoxPixmap::paint( QPainter *painter )
+void KonqComboListBoxPixmap::paint( TQPainter *painter )
{
if ( lookup_pending ) {
title = titleOfURL( text() );
@@ -697,13 +697,13 @@ void KonqComboListBoxPixmap::paint( QPainter *painter )
pm = KonqPixmapProvider::self()->pixmapFor( text(), KIcon::SizeSmall );
}
else
- pm = QPixmap();
+ pm = TQPixmap();
lookup_pending = false;
}
int itemHeight = height( listBox() );
int yPos, pmWidth = 0;
- const QPixmap *pm = pixmap();
+ const TQPixmap *pm = pixmap();
if ( pm && ! pm->isNull() ) {
yPos = ( itemHeight - pm->height() ) / 2;
@@ -711,19 +711,19 @@ void KonqComboListBoxPixmap::paint( QPainter *painter )
pmWidth = pm->width() + 5;
}
- int entryWidth = listBox()->width() - listBox()->style().pixelMetric( QStyle::PM_ScrollBarExtent ) -
- 2 * listBox()->style().pixelMetric( QStyle::PM_DefaultFrameWidth );
+ int entryWidth = listBox()->width() - listBox()->style().pixelMetric( TQStyle::PM_ScrollBarExtent ) -
+ 2 * listBox()->style().pixelMetric( TQStyle::PM_DefaultFrameWidth );
int titleWidth = ( entryWidth / 3 ) - 1;
int urlWidth = entryWidth - titleWidth - pmWidth - 2;
if ( !text().isEmpty() ) {
- QString squeezedText = KStringHandler::rPixelSqueeze( text(), listBox()->fontMetrics(), urlWidth );
+ TQString squeezedText = KStringHandler::rPixelSqueeze( text(), listBox()->fontMetrics(), urlWidth );
painter->drawText( pmWidth, 0, urlWidth + pmWidth, itemHeight,
Qt::AlignLeft | Qt::AlignTop, squeezedText );
//painter->setPen( KGlobalSettings::inactiveTextColor() );
squeezedText = KStringHandler::rPixelSqueeze( title, listBox()->fontMetrics(), titleWidth );
- QFont font = painter->font();
+ TQFont font = painter->font();
font.setItalic( true );
painter->setFont( font );
painter->drawText( entryWidth - titleWidth, 0, titleWidth,
@@ -731,22 +731,22 @@ void KonqComboListBoxPixmap::paint( QPainter *painter )
}
}
-int KonqComboListBoxPixmap::height( const QListBox* lb ) const
+int KonqComboListBoxPixmap::height( const TQListBox* lb ) const
{
int h;
if ( text().isEmpty() )
h = pm.height();
else
h = QMAX( pm.height(), lb->fontMetrics().lineSpacing() + 2 );
- return QMAX( h, QApplication::globalStrut().height() );
+ return QMAX( h, TQApplication::globalStrut().height() );
}
-int KonqComboListBoxPixmap::width( const QListBox* lb ) const
+int KonqComboListBoxPixmap::width( const TQListBox* lb ) const
{
if ( text().isEmpty() )
- return QMAX( pm.width() + 6, QApplication::globalStrut().width() );
+ return QMAX( pm.width() + 6, TQApplication::globalStrut().width() );
return QMAX( pm.width() + lb->fontMetrics().width( text() ) + 6,
- QApplication::globalStrut().width() );
+ TQApplication::globalStrut().width() );
}
int KonqComboListBoxPixmap::RTTI = 1003;
@@ -756,7 +756,7 @@ int KonqComboListBoxPixmap::rtti() const
return RTTI;
}
-bool KonqComboListBoxPixmap::reuse( const QString& newText )
+bool KonqComboListBoxPixmap::reuse( const TQString& newText )
{
if ( text() == newText )
return false;
@@ -768,12 +768,12 @@ bool KonqComboListBoxPixmap::reuse( const QString& newText )
///////////////////////////////////////////////////////////////////////////////
-KonqComboLineEdit::KonqComboLineEdit( QWidget *parent, const char *name )
+KonqComboLineEdit::KonqComboLineEdit( TQWidget *parent, const char *name )
:KLineEdit( parent, name ) {}
-void KonqComboLineEdit::setCompletedItems( const QStringList& items )
+void KonqComboLineEdit::setCompletedItems( const TQStringList& items )
{
- QString txt;
+ TQString txt;
KonqComboCompletionBox *completionbox = static_cast<KonqComboCompletionBox*>( completionBox() );
if ( completionbox && completionbox->isVisible() )
@@ -789,9 +789,9 @@ void KonqComboLineEdit::setCompletedItems( const QStringList& items )
if ( completionbox->isVisible() ) {
bool wasSelected = completionbox->isSelected( completionbox->currentItem() );
- const QString currentSelection = completionbox->currentText();
+ const TQString currentSelection = completionbox->currentText();
completionbox->setItems( items );
- QListBoxItem* item = completionbox->findItem( currentSelection, Qt::ExactMatch );
+ TQListBoxItem* item = completionbox->findItem( currentSelection, Qt::ExactMatch );
if( !item || !wasSelected )
{
wasSelected = false;
@@ -813,7 +813,7 @@ void KonqComboLineEdit::setCompletedItems( const QStringList& items )
if ( autoSuggest() ) {
int index = items.first().find( txt );
- QString newText = items.first().mid( index );
+ TQString newText = items.first().mid( index );
setUserSelection( false );
setCompletedText( newText, true );
}
@@ -825,15 +825,15 @@ void KonqComboLineEdit::setCompletedItems( const QStringList& items )
///////////////////////////////////////////////////////////////////////////////
-KonqComboCompletionBox::KonqComboCompletionBox( QWidget *parent, const char *name )
+KonqComboCompletionBox::KonqComboCompletionBox( TQWidget *parent, const char *name )
:KCompletionBox( parent, name ) {}
-void KonqComboCompletionBox::setItems( const QStringList& items )
+void KonqComboCompletionBox::setItems( const TQStringList& items )
{
bool block = signalsBlocked();
blockSignals( true );
- QListBoxItem* item = firstItem();
+ TQListBoxItem* item = firstItem();
if ( !item )
insertStringList( items );
else {
@@ -842,8 +842,8 @@ void KonqComboCompletionBox::setItems( const QStringList& items )
//to reduce flicker
bool dirty = false;
- QStringList::ConstIterator it = items.constBegin();
- const QStringList::ConstIterator itEnd = items.constEnd();
+ TQStringList::ConstIterator it = items.constBegin();
+ const TQStringList::ConstIterator itEnd = items.constEnd();
for ( ; it != itEnd; ++it) {
if ( item ) {
@@ -862,7 +862,7 @@ void KonqComboCompletionBox::setItems( const QStringList& items )
if ( item )
dirty = true;
- QListBoxItem* tmp = item;
+ TQListBoxItem* tmp = item;
while ( (item = tmp ) ) {
tmp = item->next();
delete item;
@@ -878,15 +878,15 @@ void KonqComboCompletionBox::setItems( const QStringList& items )
blockSignals( block );
// Trigger d->down_workaround = true within KCompletionBox
- QStringList dummy;
+ TQStringList dummy;
KCompletionBox::insertItems( dummy, 1 );
}
-void KonqComboCompletionBox::insertStringList( const QStringList & list, int index )
+void KonqComboCompletionBox::insertStringList( const TQStringList & list, int index )
{
if ( index < 0 )
index = count();
- for ( QStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
+ for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
insertItem( new KonqComboListBoxPixmap( *it ), index++ );
}
diff --git a/konqueror/konq_combo.h b/konqueror/konq_combo.h
index 8775d0c96..dfb2778dc 100644
--- a/konqueror/konq_combo.h
+++ b/konqueror/konq_combo.h
@@ -20,7 +20,7 @@
#ifndef KONQ_COMBO_H
#define KONQ_COMBO_H
-#include <qevent.h>
+#include <tqevent.h>
#include <kcombobox.h>
#include <konq_historymgr.h>
@@ -35,21 +35,21 @@ class KonqCombo : public KHistoryCombo
Q_OBJECT
public:
- KonqCombo( QWidget *parent, const char *name );
+ KonqCombo( TQWidget *parent, const char *name );
~KonqCombo();
// initializes with the completion object and calls loadItems()
void init( KCompletion * );
// determines internally if it's temporary or final
- void setURL( const QString& url );
+ void setURL( const TQString& url );
- void setTemporary( const QString& );
- void setTemporary( const QString&, const QPixmap& );
+ void setTemporary( const TQString& );
+ void setTemporary( const TQString&, const TQPixmap& );
void clearTemporary( bool makeCurrent = true );
- void removeURL( const QString& url );
+ void removeURL( const TQString& url );
- void insertPermanent( const QString& );
+ void insertPermanent( const TQString& );
void updatePixmaps();
@@ -62,23 +62,23 @@ public:
void setPageSecurity( int );
- void insertItem( const QString &text, int index=-1, const QString& title=QString::null );
- void insertItem( const QPixmap &pixmap, const QString &text, int index=-1, const QString& title=QString::null );
+ void insertItem( const TQString &text, int index=-1, const TQString& title=TQString::null );
+ void insertItem( const TQPixmap &pixmap, const TQString &text, int index=-1, const TQString& title=TQString::null );
protected:
- virtual void keyPressEvent( QKeyEvent * );
- virtual bool eventFilter( QObject *, QEvent * );
- virtual void mousePressEvent( QMouseEvent * );
- virtual void mouseMoveEvent( QMouseEvent * );
- void paintEvent( QPaintEvent * );
- void selectWord(QKeyEvent *e);
+ virtual void keyPressEvent( TQKeyEvent * );
+ virtual bool eventFilter( TQObject *, TQEvent * );
+ virtual void mousePressEvent( TQMouseEvent * );
+ virtual void mouseMoveEvent( TQMouseEvent * );
+ void paintEvent( TQPaintEvent * );
+ void selectWord(TQKeyEvent *e);
signals:
/**
Specialized signal that emits the state of the modifier
keys along with the actual activated text.
*/
- void activated( const QString &, int );
+ void activated( const TQString &, int );
/**
User has clicked on the security lock in the combobar
@@ -88,24 +88,24 @@ signals:
private slots:
void slotCleared();
void slotSetIcon( int index );
- void slotActivated( const QString& text );
+ void slotActivated( const TQString& text );
private:
- void updateItem( const QPixmap& pix, const QString&, int index, const QString& title );
+ void updateItem( const TQPixmap& pix, const TQString&, int index, const TQString& title );
void saveState();
void restoreState();
void applyPermanent();
- QString temporaryItem() const { return text( temporary ); }
+ TQString temporaryItem() const { return text( temporary ); }
void removeDuplicates( int index );
- bool hasSufficientContrast(const QColor &c1, const QColor &c2);
+ bool hasSufficientContrast(const TQColor &c1, const TQColor &c2);
bool m_returnPressed;
bool m_permanent;
int m_cursorPos;
int m_currentIndex;
int m_modifier;
- QString m_currentText;
- QPoint m_dragStart;
+ TQString m_currentText;
+ TQPoint m_dragStart;
int m_pageSecurity;
static KConfig *s_config;
diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc
index a43d4540d..d6d9f71a0 100644
--- a/konqueror/konq_extensionmanager.cc
+++ b/konqueror/konq_extensionmanager.cc
@@ -14,8 +14,8 @@
*************************************************************************
*/
-#include <qlayout.h>
-#include <qtimer.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
#include <kconfig.h>
#include <kdebug.h>
@@ -39,7 +39,7 @@ public:
bool isChanged;
};
-KonqExtensionManager::KonqExtensionManager(QWidget *parent, KonqMainWindow *mainWindow, KParts::ReadOnlyPart* activePart) :
+KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mainWindow, KParts::ReadOnlyPart* activePart) :
KDialogBase(Plain, i18n("Configure"), Default | Cancel | Apply | Ok | User1,
Ok, parent, "extensionmanager", false, true, KGuiItem(i18n("&Reset"), "undo"))
{
@@ -47,14 +47,14 @@ KonqExtensionManager::KonqExtensionManager(QWidget *parent, KonqMainWindow *main
showButton(User1, false);
setChanged(false);
- setInitialSize(QSize(640, 480));
+ setInitialSize(TQSize(640, 480));
- (new QVBoxLayout(plainPage(), 0, 0))->setAutoAdd(true);
+ (new TQVBoxLayout(plainPage(), 0, 0))->setAutoAdd(true);
d->pluginSelector = new KPluginSelector(plainPage());
setMainWidget(d->pluginSelector);
- connect(d->pluginSelector, SIGNAL(changed(bool)), this, SLOT(setChanged(bool)));
- connect(d->pluginSelector, SIGNAL(configCommitted(const QCString &)),
- KSettings::Dispatcher::self(), SLOT(reparseConfiguration(const QCString &)));
+ connect(d->pluginSelector, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(setChanged(bool)));
+ connect(d->pluginSelector, TQT_SIGNAL(configCommitted(const TQCString &)),
+ KSettings::Dispatcher::self(), TQT_SLOT(reparseConfiguration(const TQCString &)));
d->mainWindow = mainWindow;
d->activePart = activePart;
@@ -101,8 +101,8 @@ void KonqExtensionManager::apply()
if( d->mainWindow )
{
KParts::Plugin::loadPlugins(d->mainWindow, d->mainWindow, KGlobal::instance());
- QPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(d->mainWindow);
- QPtrListIterator<KParts::Plugin> it(plugins);
+ TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(d->mainWindow);
+ TQPtrListIterator<KParts::Plugin> it(plugins);
KParts::Plugin *plugin;
while((plugin = it.current()) != 0)
{
@@ -113,8 +113,8 @@ void KonqExtensionManager::apply()
if ( d->activePart )
{
KParts::Plugin::loadPlugins( d->activePart, d->activePart, d->activePart->instance() );
- QPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects( d->activePart );
- QPtrListIterator<KParts::Plugin> it(plugins);
+ TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects( d->activePart );
+ TQPtrListIterator<KParts::Plugin> it(plugins);
KParts::Plugin *plugin;
while((plugin = it.current()) != 0)
{
diff --git a/konqueror/konq_extensionmanager.h b/konqueror/konq_extensionmanager.h
index 824dc2771..7ecc88b3b 100644
--- a/konqueror/konq_extensionmanager.h
+++ b/konqueror/konq_extensionmanager.h
@@ -36,7 +36,7 @@ class KonqExtensionManager : public KDialogBase
Q_OBJECT
public:
- KonqExtensionManager(QWidget *parent, KonqMainWindow *mainWindow, KParts::ReadOnlyPart* activePart);
+ KonqExtensionManager(TQWidget *parent, KonqMainWindow *mainWindow, KParts::ReadOnlyPart* activePart);
~KonqExtensionManager();
void apply();
diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc
index 9eeeac1fa..8dfee7f85 100644
--- a/konqueror/konq_factory.cc
+++ b/konqueror/konq_factory.cc
@@ -30,28 +30,28 @@
#include <klocale.h>
#include <kmessagebox.h>
-#include <qwidget.h>
-#include <qfile.h>
+#include <tqwidget.h>
+#include <tqfile.h>
#include <assert.h>
KAboutData *KonqFactory::s_aboutData = 0;
-KonqViewFactory::KonqViewFactory( KLibFactory *factory, const QStringList &args,
+KonqViewFactory::KonqViewFactory( KLibFactory *factory, const TQStringList &args,
bool createBrowser )
: m_factory( factory ), m_args( args ), m_createBrowser( createBrowser )
{
if ( m_createBrowser )
- m_args << QString::fromLatin1( "Browser/View" );
+ m_args << TQString::fromLatin1( "Browser/View" );
}
-KParts::ReadOnlyPart *KonqViewFactory::create( QWidget *parentWidget, const char *widgetName,
- QObject * parent, const char *name )
+KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const char *widgetName,
+ TQObject * parent, const char *name )
{
if ( !m_factory )
return 0L;
- QObject *obj = 0L;
+ TQObject *obj = 0L;
if ( m_factory->inherits( "KParts::Factory" ) )
{
@@ -74,17 +74,17 @@ KParts::ReadOnlyPart *KonqViewFactory::create( QWidget *parentWidget, const char
kdError(1202) << "Part " << obj << " (" << obj->className() << ") doesn't inherit KParts::ReadOnlyPart !" << endl;
KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>( obj );
- QFrame* frame = ::qt_cast<QFrame*>( part->widget() );
+ TQFrame* frame = ::qt_cast<TQFrame*>( part->widget() );
if (frame)
{
- frame->setFrameStyle( QFrame::NoFrame );
+ frame->setFrameStyle( TQFrame::NoFrame );
}
return part;
}
-KonqViewFactory KonqFactory::createView( const QString &serviceType,
- const QString &serviceName,
+KonqViewFactory KonqFactory::createView( const TQString &serviceType,
+ const TQString &serviceName,
KService::Ptr *serviceImpl,
KTrader::OfferList *partServiceOffers,
KTrader::OfferList *appServiceOffers,
@@ -142,7 +142,7 @@ KonqViewFactory KonqFactory::createView( const QString &serviceType,
if ( service )
{
kdDebug(1202) << "Trying to open lib for requested service " << service->desktopEntryName() << endl;
- factory = KLibLoader::self()->factory( QFile::encodeName(service->library()) );
+ factory = KLibLoader::self()->factory( TQFile::encodeName(service->library()) );
if ( !factory )
KMessageBox::error(0,
i18n("There was an error loading the module %1.\nThe diagnostics is:\n%2")
@@ -154,13 +154,13 @@ KonqViewFactory KonqFactory::createView( const QString &serviceType,
{
service = (*it);
// Allowed as default ?
- QVariant prop = service->property( "X-KDE-BrowserView-AllowAsDefault" );
+ TQVariant prop = service->property( "X-KDE-BrowserView-AllowAsDefault" );
kdDebug(1202) << service->desktopEntryName() << " : X-KDE-BrowserView-AllowAsDefault is valid : " << prop.isValid() << endl;
if ( !prop.isValid() || prop.toBool() ) // defaults to true
{
//kdDebug(1202) << "Trying to open lib for service " << service->name() << endl;
// Try loading factory
- factory = KLibLoader::self()->factory( QFile::encodeName(service->library()) );
+ factory = KLibLoader::self()->factory( TQFile::encodeName(service->library()) );
if ( !factory )
KMessageBox::error(0,
i18n("There was an error loading the module %1.\nThe diagnostics is:\n%2")
@@ -179,20 +179,20 @@ KonqViewFactory KonqFactory::createView( const QString &serviceType,
return KonqViewFactory();
}
- QStringList args;
+ TQStringList args;
- QVariant prop = service->property( "X-KDE-BrowserView-Args" );
+ TQVariant prop = service->property( "X-KDE-BrowserView-Args" );
if ( prop.isValid() )
{
- QString argStr = prop.toString();
- args = QStringList::split( " ", argStr );
+ TQString argStr = prop.toString();
+ args = TQStringList::split( " ", argStr );
}
return KonqViewFactory( factory, args, service->serviceTypes().contains( "Browser/View" ) );
}
-void KonqFactory::getOffers( const QString & serviceType,
+void KonqFactory::getOffers( const TQString & serviceType,
KTrader::OfferList *partServiceOffers,
KTrader::OfferList *appServiceOffers )
{
@@ -200,13 +200,13 @@ void KonqFactory::getOffers( const QString & serviceType,
{
*appServiceOffers = KTrader::self()->query( serviceType, "Application",
"DesktopEntryName != 'kfmclient' and DesktopEntryName != 'kfmclient_dir' and DesktopEntryName != 'kfmclient_html'",
- QString::null );
+ TQString::null );
}
if ( partServiceOffers )
{
*partServiceOffers = KTrader::self()->query( serviceType, "KParts/ReadOnlyPart",
- QString::null, QString::null );
+ TQString::null, TQString::null );
}
}
diff --git a/konqueror/konq_factory.h b/konqueror/konq_factory.h
index 8d156876f..ac24061e6 100644
--- a/konqueror/konq_factory.h
+++ b/konqueror/konq_factory.h
@@ -22,8 +22,8 @@
#ifndef __konq_factory_h__
#define __konq_factory_h__
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <klibloader.h>
#include <ktrader.h>
@@ -39,7 +39,7 @@ class KonqViewFactory
public:
KonqViewFactory() : m_factory( 0L ), m_createBrowser( false ) {}
- KonqViewFactory( KLibFactory *factory, const QStringList &args, bool createBrowser );
+ KonqViewFactory( KLibFactory *factory, const TQStringList &args, bool createBrowser );
KonqViewFactory( const KonqViewFactory &factory )
{ (*this) = factory; }
@@ -52,28 +52,28 @@ public:
return *this;
}
- KParts::ReadOnlyPart *create( QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name );
+ KParts::ReadOnlyPart *create( TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name );
bool isNull() const { return m_factory ? false : true; }
private:
KLibFactory *m_factory;
- QStringList m_args;
+ TQStringList m_args;
bool m_createBrowser;
};
class KonqFactory
{
public:
- static KonqViewFactory createView( const QString &serviceType,
- const QString &serviceName = QString::null,
+ static KonqViewFactory createView( const TQString &serviceType,
+ const TQString &serviceName = TQString::null,
KService::Ptr *serviceImpl = 0,
KTrader::OfferList *partServiceOffers = 0,
KTrader::OfferList *appServiceOffers = 0,
bool forceAutoEmbed = false );
- static void getOffers( const QString & serviceType,
+ static void getOffers( const TQString & serviceType,
KTrader::OfferList *partServiceOffers = 0,
KTrader::OfferList *appServiceOffers = 0);
diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc
index 0aacbe3d6..77310ebbc 100644
--- a/konqueror/konq_frame.cc
+++ b/konqueror/konq_frame.cc
@@ -18,14 +18,14 @@
*/
#include <math.h>
-#include <qpainter.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qtoolbutton.h>
-#include <qtabbar.h>
-#include <qptrlist.h>
-#include <qpopupmenu.h>
-#include <qkeysequence.h>
+#include <tqpainter.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
+#include <tqtoolbutton.h>
+#include <tqtabbar.h>
+#include <tqptrlist.h>
+#include <tqpopupmenu.h>
+#include <tqkeysequence.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -48,11 +48,11 @@
#define DEFAULT_HEADER_HEIGHT 13
-void KonqCheckBox::drawButton( QPainter *p )
+void KonqCheckBox::drawButton( TQPainter *p )
{
- //static QPixmap indicator_anchor( UserIcon( "indicator_anchor" ) );
- static QPixmap indicator_connect( UserIcon( "indicator_connect" ) );
- static QPixmap indicator_noconnect( UserIcon( "indicator_noconnect" ) );
+ //static TQPixmap indicator_anchor( UserIcon( "indicator_anchor" ) );
+ static TQPixmap indicator_connect( UserIcon( "indicator_connect" ) );
+ static TQPixmap indicator_noconnect( UserIcon( "indicator_noconnect" ) );
if (isOn() || isDown())
p->drawPixmap(0,0,indicator_connect);
@@ -66,22 +66,22 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name )
{
setSizeGripEnabled( false );
- m_led = new QLabel( this );
+ m_led = new TQLabel( this );
m_led->setAlignment( Qt::AlignCenter );
- m_led->setSizePolicy(QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ));
+ m_led->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
addWidget( m_led, 0, false ); // led (active view indicator)
m_led->hide();
m_pStatusLabel = new KSqueezedTextLabel( this );
m_pStatusLabel->setMinimumSize( 0, 0 );
- m_pStatusLabel->setSizePolicy(QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Fixed ));
+ m_pStatusLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
m_pStatusLabel->installEventFilter(this);
addWidget( m_pStatusLabel, 1 /*stretch*/, false ); // status label
m_pLinkedViewCheckBox = new KonqCheckBox( this, "m_pLinkedViewCheckBox" );
m_pLinkedViewCheckBox->setFocusPolicy(NoFocus);
- m_pLinkedViewCheckBox->setSizePolicy(QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ));
- QWhatsThis::add( m_pLinkedViewCheckBox,
+ m_pLinkedViewCheckBox->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
+ TQWhatsThis::add( m_pLinkedViewCheckBox,
i18n("Checking this box on at least two views sets those views as 'linked'. "
"Then, when you change directories in one view, the other views "
"linked with it will automatically update to show the current directory. "
@@ -89,15 +89,15 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name )
"directory tree with an icon view or detailed view, and possibly a "
"terminal emulator window." ) );
addWidget( m_pLinkedViewCheckBox, 0, true /*permanent->right align*/ );
- connect( m_pLinkedViewCheckBox, SIGNAL(toggled(bool)),
- this, SIGNAL(linkedViewClicked(bool)) );
+ connect( m_pLinkedViewCheckBox, TQT_SIGNAL(toggled(bool)),
+ this, TQT_SIGNAL(linkedViewClicked(bool)) );
m_progressBar = new KProgress( this );
m_progressBar->setMaximumHeight(fontMetrics().height());
m_progressBar->hide();
addWidget( m_progressBar, 0, true /*permanent->right align*/ );
- fontChange(QFont());
+ fontChange(TQFont());
installEventFilter( this );
}
@@ -105,7 +105,7 @@ KonqFrameStatusBar::~KonqFrameStatusBar()
{
}
-void KonqFrameStatusBar::fontChange(const QFont & /* oldFont */)
+void KonqFrameStatusBar::fontChange(const TQFont & /* oldFont */)
{
int h = fontMetrics().height();
if ( h < DEFAULT_HEADER_HEIGHT ) h = DEFAULT_HEADER_HEIGHT;
@@ -116,7 +116,7 @@ void KonqFrameStatusBar::fontChange(const QFont & /* oldFont */)
}
-void KonqFrameStatusBar::resizeEvent( QResizeEvent* ev )
+void KonqFrameStatusBar::resizeEvent( TQResizeEvent* ev )
{
//m_progressBar->setGeometry( width()-160, 0, 140, height() );
//m_pLinkedViewCheckBox->move( width()-15, m_yOffset ); // right justify
@@ -125,9 +125,9 @@ void KonqFrameStatusBar::resizeEvent( QResizeEvent* ev )
// I don't think this code _ever_ gets called!
// I don't want to remove it, though. :-)
-void KonqFrameStatusBar::mousePressEvent( QMouseEvent* event )
+void KonqFrameStatusBar::mousePressEvent( TQMouseEvent* event )
{
- QWidget::mousePressEvent( event );
+ TQWidget::mousePressEvent( event );
if ( !m_pParentKonqFrame->childView()->isPassiveMode() )
{
emit clicked();
@@ -145,7 +145,7 @@ void KonqFrameStatusBar::splitFrameMenu()
// We have to ship the remove view action ourselves,
// since this may not be the active view (passive view)
- KAction actRemoveView(i18n("Close View"), "view_remove", 0, m_pParentKonqFrame, SLOT(slotRemoveView()), (QObject*)0, "removethisview");
+ KAction actRemoveView(i18n("Close View"), "view_remove", 0, m_pParentKonqFrame, TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview");
//KonqView * nextView = mw->viewManager()->chooseNextView( m_pParentKonqFrame->childView() );
actRemoveView.setEnabled( mw->mainViewsCount() > 1 || m_pParentKonqFrame->childView()->isToggleView() || m_pParentKonqFrame->childView()->isPassiveMode() );
@@ -153,7 +153,7 @@ void KonqFrameStatusBar::splitFrameMenu()
// ###### might be not right for passive views !
KActionCollection *actionColl = mw->actionCollection();
- QPopupMenu menu;
+ TQPopupMenu menu;
actionColl->action( "splitviewh" )->plug( &menu );
actionColl->action( "splitviewv" )->plug( &menu );
@@ -162,20 +162,20 @@ void KonqFrameStatusBar::splitFrameMenu()
actRemoveView.plug( &menu );
- menu.exec(QCursor::pos());
+ menu.exec(TQCursor::pos());
}
-bool KonqFrameStatusBar::eventFilter(QObject* o, QEvent *e)
+bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e)
{
- if (o == m_pStatusLabel && e->type()==QEvent::MouseButtonPress)
+ if (o == m_pStatusLabel && e->type()==TQEvent::MouseButtonPress)
{
emit clicked();
update();
- if ( static_cast<QMouseEvent *>(e)->button() == RightButton)
+ if ( static_cast<TQMouseEvent *>(e)->button() == RightButton)
splitFrameMenu();
return true;
}
- else if ( o == this && e->type() == QEvent::ApplicationPaletteChange )
+ else if ( o == this && e->type() == TQEvent::ApplicationPaletteChange )
{
unsetPalette();
updateActiveStatus();
@@ -185,17 +185,17 @@ bool KonqFrameStatusBar::eventFilter(QObject* o, QEvent *e)
return false;
}
-void KonqFrameStatusBar::message( const QString &msg )
+void KonqFrameStatusBar::message( const TQString &msg )
{
- // We don't use the message()/clear() mechanism of QStatusBar because
+ // We don't use the message()/clear() mechanism of TQStatusBar because
// it really looks ugly (the label border goes away, the active-view indicator
// is hidden...)
- QString saveMsg = m_savedMessage;
+ TQString saveMsg = m_savedMessage;
slotDisplayStatusText( msg );
m_savedMessage = saveMsg;
}
-void KonqFrameStatusBar::slotDisplayStatusText(const QString& text)
+void KonqFrameStatusBar::slotDisplayStatusText(const TQString& text)
{
//kdDebug(1202)<<"KonqFrameHeader::slotDisplayStatusText("<<text<<")"<<endl;
//m_pStatusLabel->resize(fontMetrics().width(text),fontMetrics().height()+2);
@@ -223,7 +223,7 @@ void KonqFrameStatusBar::slotLoadingProgress( int percent )
void KonqFrameStatusBar::slotSpeedProgress( int bytesPerSecond )
{
- QString sizeStr;
+ TQString sizeStr;
if ( bytesPerSecond > 0 )
sizeStr = i18n( "%1/s" ).arg( KIO::convertSize( bytesPerSecond ) );
@@ -236,8 +236,8 @@ void KonqFrameStatusBar::slotSpeedProgress( int bytesPerSecond )
void KonqFrameStatusBar::slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *newOne)
{
if (newOne!=0)
- connect(newOne,SIGNAL(setStatusBarText(const QString &)),this,SLOT(slotDisplayStatusText(const QString&)));
- slotDisplayStatusText( QString::null );
+ connect(newOne,TQT_SIGNAL(setStatusBarText(const TQString &)),this,TQT_SLOT(slotDisplayStatusText(const TQString&)));
+ slotDisplayStatusText( TQString::null );
}
void KonqFrameStatusBar::showActiveViewIndicator( bool b )
@@ -268,25 +268,25 @@ void KonqFrameStatusBar::updateActiveStatus()
bool hasFocus = m_pParentKonqFrame->isActivePart();
- const QColorGroup& activeCg = kapp->palette().active();
+ const TQColorGroup& activeCg = kapp->palette().active();
setPaletteBackgroundColor( hasFocus ? activeCg.midlight() : activeCg.mid() );
- static QPixmap indicator_viewactive( UserIcon( "indicator_viewactive" ) );
- static QPixmap indicator_empty( UserIcon( "indicator_empty" ) );
+ static TQPixmap indicator_viewactive( UserIcon( "indicator_viewactive" ) );
+ static TQPixmap indicator_empty( UserIcon( "indicator_empty" ) );
m_led->setPixmap( hasFocus ? indicator_viewactive : indicator_empty );
}
//###################################################################
-void KonqFrameBase::printFrameInfo(const QString& spaces)
+void KonqFrameBase::printFrameInfo(const TQString& spaces)
{
kdDebug(1202) << spaces << "KonqFrameBase " << this << " printFrameInfo not implemented in derived class!" << endl;
}
//###################################################################
-KonqFrame::KonqFrame( QWidget* parent, KonqFrameContainerBase *parentContainer, const char *name )
-:QWidget(parent,name)
+KonqFrame::KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer, const char *name )
+:TQWidget(parent,name)
{
//kdDebug(1202) << "KonqFrame::KonqFrame()" << endl;
@@ -295,9 +295,9 @@ KonqFrame::KonqFrame( QWidget* parent, KonqFrameContainerBase *parentContainer,
// the frame statusbar
m_pStatusBar = new KonqFrameStatusBar( this, "KonquerorFrameStatusBar");
- m_pStatusBar->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ));
- connect(m_pStatusBar, SIGNAL(clicked()), this, SLOT(slotStatusBarClicked()));
- connect( m_pStatusBar, SIGNAL( linkedViewClicked( bool ) ), this, SLOT( slotLinkedViewClicked( bool ) ) );
+ m_pStatusBar->setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ connect(m_pStatusBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStatusBarClicked()));
+ connect( m_pStatusBar, TQT_SIGNAL( linkedViewClicked( bool ) ), this, TQT_SLOT( slotLinkedViewClicked( bool ) ) );
m_separator = 0;
m_pParentContainer = parentContainer;
}
@@ -318,22 +318,22 @@ void KonqFrame::listViews( ChildViewList *viewList )
viewList->append( childView() );
}
-void KonqFrame::saveConfig( KConfig* config, const QString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ )
+void KonqFrame::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ )
{
if (saveURLs)
- config->writePathEntry( QString::fromLatin1( "URL" ).prepend( prefix ),
+ config->writePathEntry( TQString::fromLatin1( "URL" ).prepend( prefix ),
childView()->url().url() );
- config->writeEntry( QString::fromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() );
- config->writeEntry( QString::fromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() );
- config->writeEntry( QString::fromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() );
- config->writeEntry( QString::fromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() );
- config->writeEntry( QString::fromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() );
- config->writeEntry( QString::fromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() );
- //config->writeEntry( QString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() );
- if (this == docContainer) config->writeEntry( QString::fromLatin1( "docContainer" ).prepend( prefix ), true );
+ config->writeEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() );
+ config->writeEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() );
+ config->writeEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() );
+ config->writeEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() );
+ config->writeEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() );
+ config->writeEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() );
+ //config->writeEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() );
+ if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true );
KonqConfigEvent ev( config, prefix+"_", true/*save*/);
- QApplication::sendEvent( childView()->part(), &ev );
+ TQApplication::sendEvent( childView()->part(), &ev );
}
void KonqFrame::copyHistory( KonqFrameBase *other )
@@ -342,12 +342,12 @@ void KonqFrame::copyHistory( KonqFrameBase *other )
childView()->copyHistory( static_cast<KonqFrame *>( other )->childView() );
}
-void KonqFrame::printFrameInfo( const QString& spaces )
+void KonqFrame::printFrameInfo( const TQString& spaces )
{
- QString className = "NoPart";
+ TQString className = "NoPart";
if (part()) className = part()->widget()->className();
- kdDebug(1202) << spaces << "KonqFrame " << this << " visible=" << QString("%1").arg(isVisible()) << " containing view "
- << childView() << " visible=" << QString("%1").arg(isVisible())
+ kdDebug(1202) << spaces << "KonqFrame " << this << " visible=" << TQString("%1").arg(isVisible()) << " containing view "
+ << childView() << " visible=" << TQString("%1").arg(isVisible())
<< " and part " << part() << " whose widget is a " << className << endl;
}
@@ -375,7 +375,7 @@ void KonqFrame::attachInternal()
//kdDebug(1202) << "KonqFrame::attachInternal()" << endl;
delete m_pLayout;
- m_pLayout = new QVBoxLayout( this, 0, -1, "KonqFrame's QVBoxLayout" );
+ m_pLayout = new TQVBoxLayout( this, 0, -1, "KonqFrame's TQVBoxLayout" );
m_pLayout->addWidget( m_pPart->widget(), 1 );
@@ -387,11 +387,11 @@ void KonqFrame::attachInternal()
m_pPart->widget()->installEventFilter(this);
}
-bool KonqFrame::eventFilter(QObject* /*obj*/, QEvent *ev)
+bool KonqFrame::eventFilter(TQObject* /*obj*/, TQEvent *ev)
{
- if (ev->type()==QEvent::KeyPress)
+ if (ev->type()==TQEvent::KeyPress)
{
- QKeyEvent * keyEv = static_cast<QKeyEvent*>(ev);
+ TQKeyEvent * keyEv = static_cast<TQKeyEvent*>(ev);
if ((keyEv->key()==Key_Tab) && (keyEv->state()==ControlButton))
{
emit ((KonqFrameContainer*)parent())->ctrlTabPressed();
@@ -401,7 +401,7 @@ bool KonqFrame::eventFilter(QObject* /*obj*/, QEvent *ev)
return false;
}
-void KonqFrame::insertTopWidget( QWidget * widget )
+void KonqFrame::insertTopWidget( TQWidget * widget )
{
assert(m_pLayout);
m_pLayout->insertWidget( 0, widget );
@@ -414,27 +414,27 @@ void KonqFrame::setView( KonqView* child )
m_pView = child;
if (m_pView)
{
- connect(m_pView,SIGNAL(sigPartChanged(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)),
- m_pStatusBar,SLOT(slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)));
+ connect(m_pView,TQT_SIGNAL(sigPartChanged(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)),
+ m_pStatusBar,TQT_SLOT(slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)));
}
}
-void KonqFrame::setTitle( const QString &title , QWidget* /*sender*/)
+void KonqFrame::setTitle( const TQString &title , TQWidget* /*sender*/)
{
//kdDebug(1202) << "KonqFrame::setTitle( " << title << " )" << endl;
m_title = title;
if (m_pParentContainer) m_pParentContainer->setTitle( title , this);
}
-void KonqFrame::setTabIcon( const KURL &url, QWidget* /*sender*/ )
+void KonqFrame::setTabIcon( const KURL &url, TQWidget* /*sender*/ )
{
//kdDebug(1202) << "KonqFrame::setTabIcon( " << url << " )" << endl;
if (m_pParentContainer) m_pParentContainer->setTabIcon( url, this );
}
-void KonqFrame::reparentFrame( QWidget* parent, const QPoint & p, bool showIt )
+void KonqFrame::reparentFrame( TQWidget* parent, const TQPoint & p, bool showIt )
{
- QWidget::reparent( parent, p, showIt );
+ TQWidget::reparent( parent, p, showIt );
}
void KonqFrame::slotStatusBarClicked()
@@ -452,7 +452,7 @@ void KonqFrame::slotLinkedViewClicked( bool mode )
}
void
-KonqFrame::paintEvent( QPaintEvent* )
+KonqFrame::paintEvent( TQPaintEvent* )
{
m_pStatusBar->repaint();
}
@@ -470,7 +470,7 @@ void KonqFrame::activateChild()
//###################################################################
-void KonqFrameContainerBase::printFrameInfo(const QString& spaces)
+void KonqFrameContainerBase::printFrameInfo(const TQString& spaces)
{
kdDebug(1202) << spaces << "KonqFrameContainerBase " << this << ", this shouldn't happen!" << endl;
}
@@ -478,10 +478,10 @@ void KonqFrameContainerBase::printFrameInfo(const QString& spaces)
//###################################################################
KonqFrameContainer::KonqFrameContainer( Orientation o,
- QWidget* parent,
+ TQWidget* parent,
KonqFrameContainerBase* parentContainer,
const char * name)
- : QSplitter( o, parent, name ), m_bAboutToBeDeleted(false)
+ : TQSplitter( o, parent, name ), m_bAboutToBeDeleted(false)
{
m_pParentContainer = parentContainer;
m_pFirstChild = 0L;
@@ -506,45 +506,45 @@ void KonqFrameContainer::listViews( ChildViewList *viewList )
m_pSecondChild->listViews( viewList );
}
-void KonqFrameContainer::saveConfig( KConfig* config, const QString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth )
+void KonqFrameContainer::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth )
{
int idSecond = id + (int)pow( 2.0, depth );
//write children sizes
- config->writeEntry( QString::fromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() );
+ config->writeEntry( TQString::fromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() );
//write children
- QStringList strlst;
+ TQStringList strlst;
if( firstChild() )
- strlst.append( QString::fromLatin1( firstChild()->frameType() ) + QString::number(idSecond - 1) );
+ strlst.append( TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1) );
if( secondChild() )
- strlst.append( QString::fromLatin1( secondChild()->frameType() ) + QString::number( idSecond ) );
+ strlst.append( TQString::fromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ) );
- config->writeEntry( QString::fromLatin1( "Children" ).prepend( prefix ), strlst );
+ config->writeEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), strlst );
//write orientation
- QString o;
+ TQString o;
if( orientation() == Qt::Horizontal )
- o = QString::fromLatin1("Horizontal");
+ o = TQString::fromLatin1("Horizontal");
else if( orientation() == Qt::Vertical )
- o = QString::fromLatin1("Vertical");
- config->writeEntry( QString::fromLatin1( "Orientation" ).prepend( prefix ), o );
+ o = TQString::fromLatin1("Vertical");
+ config->writeEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ), o );
//write docContainer
- if (this == docContainer) config->writeEntry( QString::fromLatin1( "docContainer" ).prepend( prefix ), true );
+ if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true );
- if (m_pSecondChild == m_pActiveChild) config->writeEntry( QString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 1 );
- else config->writeEntry( QString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 0 );
+ if (m_pSecondChild == m_pActiveChild) config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 1 );
+ else config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 0 );
//write child configs
if( firstChild() ) {
- QString newPrefix = QString::fromLatin1( firstChild()->frameType() ) + QString::number(idSecond - 1);
+ TQString newPrefix = TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1);
newPrefix.append( '_' );
firstChild()->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + 1 );
}
if( secondChild() ) {
- QString newPrefix = QString::fromLatin1( secondChild()->frameType() ) + QString::number( idSecond );
+ TQString newPrefix = TQString::fromLatin1( secondChild()->frameType() ) + TQString::number( idSecond );
newPrefix.append( '_' );
secondChild()->saveConfig( config, newPrefix, saveURLs, docContainer, idSecond, depth + 1 );
}
@@ -568,9 +568,9 @@ KonqFrameBase* KonqFrameContainer::otherChild( KonqFrameBase* child )
return 0L;
}
-void KonqFrameContainer::printFrameInfo( const QString& spaces )
+void KonqFrameContainer::printFrameInfo( const TQString& spaces )
{
- kdDebug(1202) << spaces << "KonqFrameContainer " << this << " visible=" << QString("%1").arg(isVisible())
+ kdDebug(1202) << spaces << "KonqFrameContainer " << this << " visible=" << TQString("%1").arg(isVisible())
<< " activeChild=" << m_pActiveChild << endl;
if (!m_pActiveChild)
kdDebug(1202) << "WARNING: " << this << " has a null active child!" << endl;
@@ -586,9 +586,9 @@ void KonqFrameContainer::printFrameInfo( const QString& spaces )
kdDebug(1202) << spaces << " Null child" << endl;
}
-void KonqFrameContainer::reparentFrame( QWidget* parent, const QPoint & p, bool showIt )
+void KonqFrameContainer::reparentFrame( TQWidget* parent, const TQPoint & p, bool showIt )
{
- QWidget::reparent( parent, p, showIt );
+ TQWidget::reparent( parent, p, showIt );
}
void KonqFrameContainer::swapChildren()
@@ -598,14 +598,14 @@ void KonqFrameContainer::swapChildren()
m_pSecondChild = firstCh;
}
-void KonqFrameContainer::setTitle( const QString &title , QWidget* sender)
+void KonqFrameContainer::setTitle( const TQString &title , TQWidget* sender)
{
//kdDebug(1202) << "KonqFrameContainer::setTitle( " << title << " , " << sender << " )" << endl;
if (m_pParentContainer && activeChild() && (sender == activeChild()->widget()))
m_pParentContainer->setTitle( title , this);
}
-void KonqFrameContainer::setTabIcon( const KURL &url, QWidget* sender )
+void KonqFrameContainer::setTabIcon( const KURL &url, TQWidget* sender )
{
//kdDebug(1202) << "KonqFrameContainer::setTabIcon( " << url << " , " << sender << " )" << endl;
if (m_pParentContainer && activeChild() && (sender == activeChild()->widget()))
@@ -653,18 +653,18 @@ void KonqFrameContainer::removeChildFrame( KonqFrameBase * frame )
kdWarning(1202) << this << " Can't find this child:" << frame << endl;
}
-void KonqFrameContainer::childEvent( QChildEvent *c )
+void KonqFrameContainer::childEvent( TQChildEvent *c )
{
// Child events cause layout changes. These are unnecassery if we are going
// to be deleted anyway.
if (!m_bAboutToBeDeleted)
- QSplitter::childEvent(c);
+ TQSplitter::childEvent(c);
}
void KonqFrameContainer::setRubberband( int pos )
{
emit setRubberbandCalled();
- QSplitter::setRubberband( pos );
+ TQSplitter::setRubberband( pos );
}
#include "konq_frame.moc"
diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h
index 24ff77faa..3b8dd2f5e 100644
--- a/konqueror/konq_frame.h
+++ b/konqueror/konq_frame.h
@@ -21,12 +21,12 @@
#include "konq_factory.h"
-#include <qguardedptr.h>
-#include <qcolor.h>
-#include <qwidget.h>
-#include <qsplitter.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
+#include <tqguardedptr.h>
+#include <tqcolor.h>
+#include <tqwidget.h>
+#include <tqsplitter.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
#include <kpixmap.h>
#include <kpixmapeffect.h>
@@ -66,10 +66,10 @@ class KonqCheckBox : public QCheckBox
{
Q_OBJECT // for classname
public:
- KonqCheckBox(QWidget *parent=0, const char *name=0)
- :QCheckBox( parent, name ) {}
+ KonqCheckBox(TQWidget *parent=0, const char *name=0)
+ :TQCheckBox( parent, name ) {}
protected:
- void drawButton( QPainter * );
+ void drawButton( TQPainter * );
};
@@ -107,10 +107,10 @@ class KonqFrameStatusBar : public KStatusBar
void slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *oldOne,KParts::ReadOnlyPart *newOne);
void slotLoadingProgress( int percent );
void slotSpeedProgress( int bytesPerSecond );
- void slotDisplayStatusText(const QString& text);
+ void slotDisplayStatusText(const TQString& text);
void slotClear();
- void message ( const QString & message );
+ void message ( const TQString & message );
signals:
/**
@@ -124,9 +124,9 @@ class KonqFrameStatusBar : public KStatusBar
void linkedViewClicked( bool mode );
protected:
- virtual bool eventFilter(QObject*,QEvent *);
- virtual void resizeEvent( QResizeEvent* );
- virtual void mousePressEvent( QMouseEvent* );
+ virtual bool eventFilter(TQObject*,TQEvent *);
+ virtual void resizeEvent( TQResizeEvent* );
+ virtual void mousePressEvent( TQMouseEvent* );
/**
* Brings up the context menu for this frame
*/
@@ -135,44 +135,44 @@ class KonqFrameStatusBar : public KStatusBar
/**
* Takes care of the statusbars size
**/
- virtual void fontChange(const QFont &oldFont);
+ virtual void fontChange(const TQFont &oldFont);
private:
KonqFrame* m_pParentKonqFrame;
- QCheckBox *m_pLinkedViewCheckBox;
+ TQCheckBox *m_pLinkedViewCheckBox;
KProgress *m_progressBar;
KSqueezedTextLabel *m_pStatusLabel;
- QLabel* m_led;
- QString m_savedMessage;
+ TQLabel* m_led;
+ TQString m_savedMessage;
};
-typedef QPtrList<KonqView> ChildViewList;
+typedef TQPtrList<KonqView> ChildViewList;
class KonqFrameBase
{
public:
virtual ~KonqFrameBase() {}
- virtual void saveConfig( KConfig* config, const QString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0) = 0;
+ virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0) = 0;
virtual void copyHistory( KonqFrameBase *other ) = 0;
- virtual void printFrameInfo( const QString& spaces );
+ virtual void printFrameInfo( const TQString& spaces );
- virtual void reparentFrame( QWidget* parent,
- const QPoint & p, bool showIt=FALSE ) = 0;
+ virtual void reparentFrame( TQWidget* parent,
+ const TQPoint & p, bool showIt=FALSE ) = 0;
virtual KonqFrameContainerBase* parentContainer() { return m_pParentContainer; }
virtual void setParentContainer(KonqFrameContainerBase* parent) { m_pParentContainer = parent; }
- virtual void setTitle( const QString &title , QWidget* sender) = 0;
- virtual void setTabIcon( const KURL &url, QWidget* sender ) = 0;
+ virtual void setTitle( const TQString &title , TQWidget* sender) = 0;
+ virtual void setTabIcon( const KURL &url, TQWidget* sender ) = 0;
- virtual QWidget* widget() = 0;
+ virtual TQWidget* widget() = 0;
virtual void listViews( ChildViewList *viewList ) = 0;
- virtual QCString frameType() = 0;
+ virtual TQCString frameType() = 0;
virtual void activateChild() = 0;
@@ -196,12 +196,12 @@ protected:
* widget of the layout
*/
-class KonqFrame : public QWidget, public KonqFrameBase
+class KonqFrame : public TQWidget, public KonqFrameBase
{
Q_OBJECT
public:
- KonqFrame( QWidget* parent, KonqFrameContainerBase *parentContainer = 0L,
+ KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer = 0L,
const char *name = 0L );
virtual ~KonqFrame();
@@ -215,7 +215,7 @@ public:
* Filters the CTRL+Tab event from the views and emits ctrlTabPressed to
make KonqMainWindow switch to the next view
*/
- virtual bool eventFilter(QObject*obj,QEvent *ev);
+ virtual bool eventFilter(TQObject*obj,TQEvent *ev);
/**
* Inserts the part's widget and the statusbar into the layout
@@ -226,7 +226,7 @@ public:
* Inserts a widget at the top of the part's widget, in the layout
* (used for the find functionality)
*/
- void insertTopWidget( QWidget * widget );
+ void insertTopWidget( TQWidget * widget );
/**
* Returns the part that is currently connected to the Frame.
@@ -242,22 +242,22 @@ public:
void setView( KonqView* child );
virtual void listViews( ChildViewList *viewList );
- virtual void saveConfig( KConfig* config, const QString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
+ virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
virtual void copyHistory( KonqFrameBase *other );
- virtual void printFrameInfo( const QString& spaces );
+ virtual void printFrameInfo( const TQString& spaces );
- virtual void setTitle( const QString &title, QWidget* sender );
- virtual void setTabIcon( const KURL &url, QWidget* sender );
+ virtual void setTitle( const TQString &title, TQWidget* sender );
+ virtual void setTabIcon( const KURL &url, TQWidget* sender );
- virtual void reparentFrame(QWidget * parent,
- const QPoint & p, bool showIt=FALSE );
+ virtual void reparentFrame(TQWidget * parent,
+ const TQPoint & p, bool showIt=FALSE );
//virtual KonqFrameContainerBase* parentContainer();
- virtual QWidget* widget() { return this; }
- virtual QCString frameType() { return QCString("View"); }
+ virtual TQWidget* widget() { return this; }
+ virtual TQCString frameType() { return TQCString("View"); }
- QVBoxLayout *layout()const { return m_pLayout; }
+ TQVBoxLayout *layout()const { return m_pLayout; }
KonqFrameStatusBar *statusbar() const { return m_pStatusBar; }
@@ -265,7 +265,7 @@ public:
KonqView* activeChildView() { return m_pView; }
- QString title() const { return m_title; }
+ TQString title() const { return m_title; }
public slots:
@@ -282,19 +282,19 @@ public slots:
void slotRemoveView();
protected:
- virtual void paintEvent( QPaintEvent* );
+ virtual void paintEvent( TQPaintEvent* );
- QVBoxLayout *m_pLayout;
- QGuardedPtr<KonqView> m_pView;
+ TQVBoxLayout *m_pLayout;
+ TQGuardedPtr<KonqView> m_pView;
- QGuardedPtr<KParts::ReadOnlyPart> m_pPart;
+ TQGuardedPtr<KParts::ReadOnlyPart> m_pPart;
KonqViewManager* m_pViewManager;
KSeparator *m_separator;
KonqFrameStatusBar* m_pStatusBar;
- QString m_title;
+ TQString m_title;
};
class KonqFrameContainerBase : public KonqFrameBase
@@ -312,12 +312,12 @@ public:
virtual void removeChildFrame( KonqFrameBase * frame ) = 0;
//inherited
- virtual void printFrameInfo( const QString& spaces );
+ virtual void printFrameInfo( const TQString& spaces );
- virtual QCString frameType() { return QCString("ContainerBase"); }
+ virtual TQCString frameType() { return TQCString("ContainerBase"); }
- virtual void reparentFrame(QWidget * parent,
- const QPoint & p, bool showIt=FALSE ) = 0;
+ virtual void reparentFrame(TQWidget * parent,
+ const TQPoint & p, bool showIt=FALSE ) = 0;
virtual KonqFrameBase* activeChild() { return m_pActiveChild; }
@@ -344,35 +344,35 @@ protected:
* KonqFrameContainers or, as leaves, KonqFrames.
*/
-class KonqFrameContainer : public QSplitter, public KonqFrameContainerBase
+class KonqFrameContainer : public TQSplitter, public KonqFrameContainerBase
{
Q_OBJECT
friend class KonqFrame; //for emitting ctrlTabPressed() only, aleXXX
public:
KonqFrameContainer( Orientation o,
- QWidget* parent,
+ TQWidget* parent,
KonqFrameContainerBase* parentContainer,
const char * name = 0);
virtual ~KonqFrameContainer();
virtual void listViews( ChildViewList *viewList );
- virtual void saveConfig( KConfig* config, const QString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
+ virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
virtual void copyHistory( KonqFrameBase *other );
KonqFrameBase* firstChild() { return m_pFirstChild; }
KonqFrameBase* secondChild() { return m_pSecondChild; }
KonqFrameBase* otherChild( KonqFrameBase* child );
- virtual void printFrameInfo( const QString& spaces );
+ virtual void printFrameInfo( const TQString& spaces );
void swapChildren();
- virtual void setTitle( const QString &title, QWidget* sender );
- virtual void setTabIcon( const KURL &url, QWidget* sender );
+ virtual void setTitle( const TQString &title, TQWidget* sender );
+ virtual void setTabIcon( const KURL &url, TQWidget* sender );
- virtual QWidget* widget() { return this; }
- virtual QCString frameType() { return QCString("Container"); }
+ virtual TQWidget* widget() { return this; }
+ virtual TQCString frameType() { return TQCString("Container"); }
/**
* Call this after inserting a new frame into the splitter.
@@ -384,16 +384,16 @@ public:
void removeChildFrame( KonqFrameBase * frame );
//inherited
- virtual void reparentFrame(QWidget * parent,
- const QPoint & p, bool showIt=FALSE );
+ virtual void reparentFrame(TQWidget * parent,
+ const TQPoint & p, bool showIt=FALSE );
//make this one public
- int idAfter( QWidget* w ){ return QSplitter::idAfter( w ); }
+ int idAfter( TQWidget* w ){ return TQSplitter::idAfter( w ); }
void setAboutToBeDeleted() { m_bAboutToBeDeleted = true; }
//inherited
- virtual void childEvent( QChildEvent * );
+ virtual void childEvent( TQChildEvent * );
signals:
void ctrlTabPressed();
diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc
index 7a3dbaca8..316c88254 100644
--- a/konqueror/konq_guiclients.cc
+++ b/konqueror/konq_guiclients.cc
@@ -37,18 +37,18 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
m_mainWindow = mainWindow;
- m_doc = QDomDocument( "kpartgui" );
- QDomElement root = m_doc.createElement( "kpartgui" );
+ m_doc = TQDomDocument( "kpartgui" );
+ TQDomElement root = m_doc.createElement( "kpartgui" );
root.setAttribute( "name", "konqueror" );
m_doc.appendChild( root );
- QDomElement menu = m_doc.createElement( "Menu" );
+ TQDomElement menu = m_doc.createElement( "Menu" );
root.appendChild( menu );
menu.setAttribute( "name", "popupmenu" );
if ( !mainWindow->menuBar()->isVisible() )
{
- QDomElement showMenuBarElement = m_doc.createElement( "action" );
+ TQDomElement showMenuBarElement = m_doc.createElement( "action" );
showMenuBarElement.setAttribute( "name", "options_show_menubar" );
menu.appendChild( showMenuBarElement );
@@ -57,7 +57,7 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
if ( mainWindow->fullScreenMode() )
{
- QDomElement stopFullScreenElement = m_doc.createElement( "action" );
+ TQDomElement stopFullScreenElement = m_doc.createElement( "action" );
stopFullScreenElement.setAttribute( "name", "fullscreen" );
menu.appendChild( stopFullScreenElement );
@@ -77,9 +77,9 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
else if ( embeddingServices.count() > 1 )
{
int idx = 0;
- QDomElement subMenu = m_doc.createElement( "menu" );
+ TQDomElement subMenu = m_doc.createElement( "menu" );
menu.appendChild( subMenu );
- QDomElement text = m_doc.createElement( "text" );
+ TQDomElement text = m_doc.createElement( "text" );
subMenu.appendChild( text );
text.appendChild( m_doc.createTextNode( i18n( "Preview In" ) ) );
subMenu.setAttribute( "group", "preview" );
@@ -100,22 +100,22 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
if ( doTabHandling )
{
- QDomElement openInSameWindow = m_doc.createElement( "action" );
+ TQDomElement openInSameWindow = m_doc.createElement( "action" );
openInSameWindow.setAttribute( "name", "sameview" );
openInSameWindow.setAttribute( "group", "tabhandling" );
menu.appendChild( openInSameWindow );
- QDomElement openInWindow = m_doc.createElement( "action" );
+ TQDomElement openInWindow = m_doc.createElement( "action" );
openInWindow.setAttribute( "name", "newview" );
openInWindow.setAttribute( "group", "tabhandling" );
menu.appendChild( openInWindow );
- QDomElement openInTabElement = m_doc.createElement( "action" );
+ TQDomElement openInTabElement = m_doc.createElement( "action" );
openInTabElement.setAttribute( "name", "openintab" );
openInTabElement.setAttribute( "group", "tabhandling" );
menu.appendChild( openInTabElement );
- QDomElement separatorElement = m_doc.createElement( "separator" );
+ TQDomElement separatorElement = m_doc.createElement( "separator" );
separatorElement.setAttribute( "group", "tabhandling" );
menu.appendChild( separatorElement );
}
@@ -129,7 +129,7 @@ PopupMenuGUIClient::~PopupMenuGUIClient()
{
}
-KAction *PopupMenuGUIClient::action( const QDomElement &element ) const
+KAction *PopupMenuGUIClient::action( const TQDomElement &element ) const
{
KAction *res = KXMLGUIClient::action( element );
@@ -139,24 +139,24 @@ KAction *PopupMenuGUIClient::action( const QDomElement &element ) const
return res;
}
-void PopupMenuGUIClient::addEmbeddingService( QDomElement &menu, int idx, const QString &name, const KService::Ptr &service )
+void PopupMenuGUIClient::addEmbeddingService( TQDomElement &menu, int idx, const TQString &name, const KService::Ptr &service )
{
- QDomElement action = m_doc.createElement( "action" );
+ TQDomElement action = m_doc.createElement( "action" );
menu.appendChild( action );
- QCString actName;
+ TQCString actName;
actName.setNum( idx );
- action.setAttribute( "name", QString::number( idx ) );
+ action.setAttribute( "name", TQString::number( idx ) );
action.setAttribute( "group", "preview" );
(void)new KAction( name, service->pixmap( KIcon::Small ), 0,
- m_mainWindow, SLOT( slotOpenEmbedded() ), actionCollection(), actName );
+ m_mainWindow, TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName );
}
ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
-: QObject( mainWindow )
+: TQObject( mainWindow )
{
m_mainWindow = mainWindow;
m_actions.setAutoDelete( true );
@@ -165,8 +165,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
KTrader::OfferList::Iterator it = offers.begin();
while ( it != offers.end() )
{
- QVariant prop = (*it)->property( "X-KDE-BrowserView-Toggable" );
- QVariant orientation = (*it)->property( "X-KDE-BrowserView-ToggableView-Orientation" );
+ TQVariant prop = (*it)->property( "X-KDE-BrowserView-Toggable" );
+ TQVariant orientation = (*it)->property( "X-KDE-BrowserView-ToggableView-Orientation" );
if ( !prop.isValid() || !prop.toBool() ||
!orientation.isValid() || orientation.toString().isEmpty() )
@@ -187,8 +187,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
KTrader::OfferList::ConstIterator cEnd = offers.end();
for (; cIt != cEnd; ++cIt )
{
- QString description = i18n( "Show %1" ).arg( (*cIt)->name() );
- QString name = (*cIt)->desktopEntryName();
+ TQString description = i18n( "Show %1" ).arg( (*cIt)->name() );
+ TQString name = (*cIt)->desktopEntryName();
//kdDebug(1202) << "ToggleViewGUIClient: name=" << name << endl;
KToggleAction *action = new KToggleAction( description, 0, mainWindow->actionCollection(), name.latin1() );
action->setCheckedState( i18n( "Hide %1" ).arg( (*cIt)->name() ) );
@@ -197,31 +197,31 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
if ( (*cIt)->icon() != "unknown" )
action->setIcon( (*cIt)->icon() );
- connect( action, SIGNAL( toggled( bool ) ),
- this, SLOT( slotToggleView( bool ) ) );
+ connect( action, TQT_SIGNAL( toggled( bool ) ),
+ this, TQT_SLOT( slotToggleView( bool ) ) );
m_actions.insert( name, action );
- QVariant orientation = (*cIt)->property( "X-KDE-BrowserView-ToggableView-Orientation" );
+ TQVariant orientation = (*cIt)->property( "X-KDE-BrowserView-ToggableView-Orientation" );
bool horizontal = orientation.toString().lower() == "horizontal";
m_mapOrientation.insert( name, horizontal );
}
- connect( m_mainWindow, SIGNAL( viewAdded( KonqView * ) ),
- this, SLOT( slotViewAdded( KonqView * ) ) );
- connect( m_mainWindow, SIGNAL( viewRemoved( KonqView * ) ),
- this, SLOT( slotViewRemoved( KonqView * ) ) );
+ connect( m_mainWindow, TQT_SIGNAL( viewAdded( KonqView * ) ),
+ this, TQT_SLOT( slotViewAdded( KonqView * ) ) );
+ connect( m_mainWindow, TQT_SIGNAL( viewRemoved( KonqView * ) ),
+ this, TQT_SLOT( slotViewRemoved( KonqView * ) ) );
}
ToggleViewGUIClient::~ToggleViewGUIClient()
{
}
-QPtrList<KAction> ToggleViewGUIClient::actions() const
+TQPtrList<KAction> ToggleViewGUIClient::actions() const
{
- QPtrList<KAction> res;
+ TQPtrList<KAction> res;
- QDictIterator<KAction> it( m_actions );
+ TQDictIterator<KAction> it( m_actions );
for (; it.current(); ++it )
res.append( it.current() );
@@ -230,7 +230,7 @@ QPtrList<KAction> ToggleViewGUIClient::actions() const
void ToggleViewGUIClient::slotToggleView( bool toggle )
{
- QString serviceName = QString::fromLatin1( sender()->name() );
+ TQString serviceName = TQString::fromLatin1( sender()->name() );
bool horizontal = m_mapOrientation[ serviceName ];
@@ -240,11 +240,11 @@ void ToggleViewGUIClient::slotToggleView( bool toggle )
{
KonqView *childView = viewManager->splitWindow( horizontal ? Qt::Vertical : Qt::Horizontal,
- QString::fromLatin1( "Browser/View" ),
+ TQString::fromLatin1( "Browser/View" ),
serviceName,
!horizontal /* vertical = make it first */);
- QValueList<int> newSplitterSizes;
+ TQValueList<int> newSplitterSizes;
if ( horizontal )
newSplitterSizes << 100 << 30;
@@ -265,7 +265,7 @@ void ToggleViewGUIClient::slotToggleView( bool toggle )
#if 0 // already done by splitWindow
if ( m_mainWindow->currentView() )
{
- QString locBarURL = m_mainWindow->currentView()->url().prettyURL(); // default one in case it doesn't set it
+ TQString locBarURL = m_mainWindow->currentView()->url().prettyURL(); // default one in case it doesn't set it
childView->openURL( m_mainWindow->currentView()->url(), locBarURL );
}
#endif
@@ -282,11 +282,11 @@ void ToggleViewGUIClient::slotToggleView( bool toggle )
}
else
{
- QPtrList<KonqView> viewList;
+ TQPtrList<KonqView> viewList;
m_mainWindow->listViews( &viewList );
- QPtrListIterator<KonqView> it( viewList );
+ TQPtrListIterator<KonqView> it( viewList );
for (; it.current(); ++it )
if ( it.current()->service()->desktopEntryName() == serviceName )
// takes care of choosing the new active view, and also calls slotViewRemoved
@@ -296,13 +296,13 @@ void ToggleViewGUIClient::slotToggleView( bool toggle )
}
-void ToggleViewGUIClient::saveConfig( bool add, const QString &serviceName )
+void ToggleViewGUIClient::saveConfig( bool add, const TQString &serviceName )
{
// This is used on konqueror's startup....... so it's never used, since
// the K menu only contains calls to kfmclient......
// Well, it could be useful again in the future.
// Currently, the profiles save this info.
- QStringList toggableViewsShown = KonqSettings::toggableViewsShown();
+ TQStringList toggableViewsShown = KonqSettings::toggableViewsShown();
if (add)
{
if ( !toggableViewsShown.contains( serviceName ) )
@@ -315,7 +315,7 @@ void ToggleViewGUIClient::saveConfig( bool add, const QString &serviceName )
void ToggleViewGUIClient::slotViewAdded( KonqView *view )
{
- QString name = view->service()->desktopEntryName();
+ TQString name = view->service()->desktopEntryName();
KAction *action = m_actions[ name ];
@@ -327,9 +327,9 @@ void ToggleViewGUIClient::slotViewAdded( KonqView *view )
// KonqView::isToggleView() is not set yet.. so just check for the orientation
#if 0
- QVariant vert = view->service()->property( "X-KDE-BrowserView-ToggableView-Orientation");
+ TQVariant vert = view->service()->property( "X-KDE-BrowserView-ToggableView-Orientation");
bool vertical = vert.toString().lower() == "vertical";
- QVariant nohead = view->service()->property( "X-KDE-BrowserView-ToggableView-NoHeader");
+ TQVariant nohead = view->service()->property( "X-KDE-BrowserView-ToggableView-NoHeader");
bool noheader = nohead.isValid() ? nohead.toBool() : false;
// if it is a vertical toggle part, turn on the header.
// this works even when konq loads the view from a profile.
@@ -344,7 +344,7 @@ void ToggleViewGUIClient::slotViewAdded( KonqView *view )
void ToggleViewGUIClient::slotViewRemoved( KonqView *view )
{
- QString name = view->service()->desktopEntryName();
+ TQString name = view->service()->desktopEntryName();
KAction *action = m_actions[ name ];
diff --git a/konqueror/konq_guiclients.h b/konqueror/konq_guiclients.h
index 3e34d3ee5..6dc31b7e9 100644
--- a/konqueror/konq_guiclients.h
+++ b/konqueror/konq_guiclients.h
@@ -21,8 +21,8 @@
#define __konq_guiclients_h__
#include <kxmlguiclient.h>
-#include <qobject.h>
-#include <qdict.h>
+#include <tqobject.h>
+#include <tqdict.h>
#include <ktrader.h>
class KAction;
@@ -59,14 +59,14 @@ public:
bool isIntoTrash, bool doTabHandling );
virtual ~PopupMenuGUIClient();
- virtual KAction *action( const QDomElement &element ) const;
+ virtual KAction *action( const TQDomElement &element ) const;
private:
- void addEmbeddingService( QDomElement &menu, int idx, const QString &name, const KService::Ptr &service );
+ void addEmbeddingService( TQDomElement &menu, int idx, const TQString &name, const KService::Ptr &service );
KonqMainWindow *m_mainWindow;
- QDomDocument m_doc;
+ TQDomDocument m_doc;
};
class ToggleViewGUIClient : public QObject
@@ -78,10 +78,10 @@ public:
bool empty() const { return m_empty; }
- QPtrList<KAction> actions() const;
- KAction *action( const QString &name ) { return m_actions[ name ]; }
+ TQPtrList<KAction> actions() const;
+ KAction *action( const TQString &name ) { return m_actions[ name ]; }
- void saveConfig( bool add, const QString &serviceName );
+ void saveConfig( bool add, const TQString &serviceName );
private slots:
void slotToggleView( bool toggle );
@@ -89,9 +89,9 @@ private slots:
void slotViewRemoved( KonqView *view );
private:
KonqMainWindow *m_mainWindow;
- QDict<KAction> m_actions;
+ TQDict<KAction> m_actions;
bool m_empty;
- QMap<QString,bool> m_mapOrientation;
+ TQMap<TQString,bool> m_mapOrientation;
};
#endif
diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc
index e64016ed9..3f3e47bc3 100644
--- a/konqueror/konq_main.cc
+++ b/konqueror/konq_main.cc
@@ -32,9 +32,9 @@
#include <kcmdlineargs.h>
#include <dcopclient.h>
#include <kimageio.h>
-#include <qfile.h>
+#include <tqfile.h>
-#include <qwidgetlist.h>
+#include <tqwidgetlist.h>
static const KCmdLineOptions options[] =
{
@@ -75,8 +75,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
int n = 1;
while ( KonqMainWindow::canBeRestored( n ) )
{
- QString className = KMainWindow::classNameOfToplevel( n );
- if( className == QString::fromLatin1( "KonqMainWindow" ))
+ TQString className = KMainWindow::classNameOfToplevel( n );
+ if( className == TQString::fromLatin1( "KonqMainWindow" ))
(new KonqMainWindow( KURL(), false ) )->restore( n );
else
kdWarning() << "Unknown class " << className << " in session saved data!" << endl;
@@ -87,34 +87,34 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
{
if (args->isSet("profiles"))
{
- QStringList profiles = KGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", false, true);
+ TQStringList profiles = KGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", false, true);
profiles.sort();
- for(QStringList::ConstIterator it = profiles.begin();
+ for(TQStringList::ConstIterator it = profiles.begin();
it != profiles.end(); ++it)
{
- QString file = *it;
+ TQString file = *it;
file = file.mid(file.findRev('/')+1);
- printf("%s\n", QFile::encodeName(file).data());
+ printf("%s\n", TQFile::encodeName(file).data());
}
return 0;
}
if (args->isSet("profile"))
{
- QString profile = QString::fromLocal8Bit(args->getOption("profile"));
- QString profilePath = profile;
+ TQString profile = TQString::fromLocal8Bit(args->getOption("profile"));
+ TQString profilePath = profile;
if (profile[0] != '/')
- profilePath = locate( "data", QString::fromLatin1("konqueror/profiles/")+profile );
- QString url;
- QStringList filesToSelect;
+ profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile );
+ TQString url;
+ TQStringList filesToSelect;
if (args->count() == 1)
- url = QString::fromLocal8Bit(args->arg(0));
+ url = TQString::fromLocal8Bit(args->arg(0));
KURL kurl(url);
KParts::URLArgs urlargs;
if (args->isSet("mimetype"))
- urlargs.serviceType = QString::fromLocal8Bit(args->getOption("mimetype"));
+ urlargs.serviceType = TQString::fromLocal8Bit(args->getOption("mimetype"));
if (args->isSet("select")) {
- QString fn = kurl.fileName(false);
+ TQString fn = kurl.fileName(false);
if( !fn.isEmpty() ){
filesToSelect += fn;
kurl.setFileName("");
@@ -149,8 +149,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
else if (!args->isSet("silent"))
{
// By default try to open in webbrowser mode. People can use "konqueror ." to get a filemanager.
- QString profile = "webbrowsing";
- QString profilePath = locate( "data", QString::fromLatin1("konqueror/profiles/")+profile );
+ TQString profile = "webbrowsing";
+ TQString profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile );
if ( !profilePath.isEmpty() ) {
KonqMisc::createBrowserWindowFromProfile( profilePath, profile );
} else {
@@ -169,23 +169,23 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
// KonqMisc::konqFilteredURL doesn't cope with local files... A bit of hackery below
KURL url = args->url(i);
KURL urlToOpen;
- QStringList filesToSelect;
+ TQStringList filesToSelect;
- if (url.isLocalFile() && QFile::exists(url.path())) // "konqueror index.html"
+ if (url.isLocalFile() && TQFile::exists(url.path())) // "konqueror index.html"
urlToOpen = url;
else
- urlToOpen = KURL( KonqMisc::konqFilteredURL(0L, QString::fromLocal8Bit(args->arg(i))) ); // "konqueror slashdot.org"
+ urlToOpen = KURL( KonqMisc::konqFilteredURL(0L, TQString::fromLocal8Bit(args->arg(i))) ); // "konqueror slashdot.org"
if ( !mainwin ) {
KParts::URLArgs urlargs;
if (args->isSet("mimetype"))
{
- urlargs.serviceType = QString::fromLocal8Bit(args->getOption("mimetype"));
+ urlargs.serviceType = TQString::fromLocal8Bit(args->getOption("mimetype"));
kdDebug(1202) << "main() : setting serviceType to " << urlargs.serviceType << endl;
}
if (args->isSet("select"))
{
- QString fn = urlToOpen.fileName(false);
+ TQString fn = urlToOpen.fileName(false);
if( !fn.isEmpty() ){
filesToSelect += fn;
urlToOpen.setFileName("");
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index e2e516b39..c6a9bb742 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -59,13 +59,13 @@
#include <time.h>
#include <unistd.h>
-#include <qfile.h>
-#include <qclipboard.h>
-#include <qmetaobject.h>
-#include <qvbox.h>
-#include <qlayout.h>
-#include <qfileinfo.h>
-#include <qwhatsthis.h>
+#include <tqfile.h>
+#include <tqclipboard.h>
+#include <tqmetaobject.h>
+#include <tqvbox.h>
+#include <tqlayout.h>
+#include <tqfileinfo.h>
+#include <tqwhatsthis.h>
#include <dcopclient.h>
#include <kaboutdata.h>
@@ -117,13 +117,13 @@
#include <X11/Xatom.h>
#include <fixx11h.h>
-template class QPtrList<QPixmap>;
-template class QPtrList<KToggleAction>;
+template class TQPtrList<TQPixmap>;
+template class TQPtrList<KToggleAction>;
-QPtrList<KonqMainWindow> *KonqMainWindow::s_lstViews = 0;
+TQPtrList<KonqMainWindow> *KonqMainWindow::s_lstViews = 0;
KConfig * KonqMainWindow::s_comboConfig = 0;
KCompletion * KonqMainWindow::s_pCompletion = 0;
-QFile * KonqMainWindow::s_crashlog_file = 0;
+TQFile * KonqMainWindow::s_crashlog_file = 0;
bool KonqMainWindow::s_preloaded = false;
KonqMainWindow* KonqMainWindow::s_preloadedWindow = 0;
int KonqMainWindow::s_initialMemoryUsage = -1;
@@ -141,13 +141,13 @@ KonqExtendedBookmarkOwner::KonqExtendedBookmarkOwner(KonqMainWindow *w)
m_pKonqMainWindow = w;
}
-KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, const char *name, const QString& xmluiFile)
+KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, const char *name, const TQString& xmluiFile)
: KParts::MainWindow( NoDCOPObject, 0L, name, WDestructiveClose | WStyle_ContextHelp | Qt::WGroupLeader )
{
setPreloadedFlag( false );
if ( !s_lstViews )
- s_lstViews = new QPtrList<KonqMainWindow>;
+ s_lstViews = new TQPtrList<KonqMainWindow>;
s_lstViews->append( this );
@@ -188,9 +188,9 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
KonqExtendedBookmarkOwner *extOwner = new KonqExtendedBookmarkOwner( this );
m_pBookmarksOwner = extOwner;
connect( extOwner,
- SIGNAL( signalFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ),
+ TQT_SIGNAL( signalFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ),
extOwner,
- SLOT( slotFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ) );
+ TQT_SLOT( slotFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ) );
// init history-manager, load history, get completion object
if ( !s_pCompletion ) {
@@ -203,7 +203,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
int mode = KonqSettings::settingsCompletionMode();
s_pCompletion->setCompletionMode( (KGlobalSettings::Completion) mode );
}
- connect(KParts::HistoryProvider::self(), SIGNAL(cleared()), SLOT(slotClearComboHistory()));
+ connect(KParts::HistoryProvider::self(), TQT_SIGNAL(cleared()), TQT_SLOT(slotClearComboHistory()));
KonqPixmapProvider *prov = KonqPixmapProvider::self();
if ( !s_comboConfig ) {
@@ -212,17 +212,17 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
s_comboConfig->setGroup( "Location Bar" );
prov->load( s_comboConfig, "ComboIconCache" );
}
- connect( prov, SIGNAL( changed() ), SLOT( slotIconsChanged() ) );
+ connect( prov, TQT_SIGNAL( changed() ), TQT_SLOT( slotIconsChanged() ) );
initCombo();
initActions();
setInstance( KGlobal::instance() );
- connect( KSycoca::self(), SIGNAL( databaseChanged() ),
- this, SLOT( slotDatabaseChanged() ) );
+ connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ),
+ this, TQT_SLOT( slotDatabaseChanged() ) );
- connect( kapp, SIGNAL( kdisplayFontChanged()), SLOT(slotReconfigure()));
+ connect( kapp, TQT_SIGNAL( kdisplayFontChanged()), TQT_SLOT(slotReconfigure()));
//load the xmlui file specified in the profile or the default konqueror.rc
setXMLFile( xmluiFile );
@@ -231,10 +231,10 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
createGUI( 0L );
- connect(toolBarMenuAction(),SIGNAL(activated()),this,SLOT(slotForceSaveMainWindowSettings()) );
+ connect(toolBarMenuAction(),TQT_SIGNAL(activated()),this,TQT_SLOT(slotForceSaveMainWindowSettings()) );
if ( !m_toggleViewGUIClient->empty() )
- plugActionList( QString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() );
+ plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() );
else
{
delete m_toggleViewGUIClient;
@@ -242,10 +242,10 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
}
// Those menus are created by konqueror.rc so their address will never change
- QPopupMenu *popup = static_cast<QPopupMenu*>(factory()->container("edit",this));
+ TQPopupMenu *popup = static_cast<TQPopupMenu*>(factory()->container("edit",this));
if (popup)
KAcceleratorManager::manage(popup);
- popup = static_cast<QPopupMenu*>(factory()->container("tools",this));
+ popup = static_cast<TQPopupMenu*>(factory()->container("tools",this));
if (popup)
KAcceleratorManager::manage(popup);
@@ -257,8 +257,8 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
KonqUndoManager::incRef();
- connect( KonqUndoManager::self(), SIGNAL( undoAvailable( bool ) ),
- this, SLOT( slotUndoAvailable( bool ) ) );
+ connect( KonqUndoManager::self(), TQT_SIGNAL( undoAvailable( bool ) ),
+ this, TQT_SLOT( slotUndoAvailable( bool ) ) );
m_bNeedApplyKonqMainWindowSettings = true;
if ( !initialURL.isEmpty() )
@@ -268,7 +268,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
else if ( openInitialURL )
{
KURL homeURL;
- homeURL.setPath( QDir::homeDirPath() );
+ homeURL.setPath( TQDir::homeDirPath() );
openURL( 0L, homeURL );
}
else
@@ -339,12 +339,12 @@ KonqMainWindow::~KonqMainWindow()
kdDebug(1202) << "KonqMainWindow::~KonqMainWindow " << this << " done" << endl;
}
-QWidget * KonqMainWindow::createContainer( QWidget *parent, int index, const QDomElement &element, int &id )
+TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id )
{
- static QString nameBookmarkBar = QString::fromLatin1( "bookmarkToolBar" );
- static QString tagToolBar = QString::fromLatin1( "ToolBar" );
+ static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" );
+ static TQString tagToolBar = TQString::fromLatin1( "ToolBar" );
- QWidget *res = KParts::MainWindow::createContainer( parent, index, element, id );
+ TQWidget *res = KParts::MainWindow::createContainer( parent, index, element, id );
if ( res && (element.tagName() == tagToolBar) && (element.attribute( "name" ) == nameBookmarkBar) )
{
@@ -362,8 +362,8 @@ QWidget * KonqMainWindow::createContainer( QWidget *parent, int index, const QDo
m_bookmarkBarActionCollection = new KActionCollection( this );
m_bookmarkBarActionCollection->setHighlightingEnabled( true );
connectActionCollection( m_bookmarkBarActionCollection );
- DelayedInitializer *initializer = new DelayedInitializer( QEvent::Show, res );
- connect( initializer, SIGNAL( initialize() ), this, SLOT(initBookmarkBar()) );
+ DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, res );
+ connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT(initBookmarkBar()) );
}
}
@@ -379,21 +379,21 @@ void KonqMainWindow::initBookmarkBar()
delete m_paBookmarkBar;
m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, this );
connect( m_paBookmarkBar,
- SIGNAL( aboutToShowContextMenu(const KBookmark &, QPopupMenu*) ),
- this, SLOT( slotFillContextMenu(const KBookmark &, QPopupMenu*) ));
+ TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ),
+ this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) ));
connect( m_paBookmarkBar,
- SIGNAL( openBookmark(const QString &, Qt::ButtonState) ),
- this, SLOT( slotOpenBookmarkURL(const QString &, Qt::ButtonState) ));
+ TQT_SIGNAL( openBookmark(const TQString &, Qt::ButtonState) ),
+ this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, Qt::ButtonState) ));
// hide if empty
if (bar->count() == 0 )
bar->hide();
}
-void KonqMainWindow::removeContainer( QWidget *container, QWidget *parent, QDomElement &element, int id )
+void KonqMainWindow::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id )
{
- static QString nameBookmarkBar = QString::fromLatin1( "bookmarkToolBar" );
- static QString tagToolBar = QString::fromLatin1( "ToolBar" );
+ static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" );
+ static TQString tagToolBar = TQString::fromLatin1( "ToolBar" );
if ( element.tagName() == tagToolBar && element.attribute( "name" ) == nameBookmarkBar )
{
@@ -409,29 +409,29 @@ void KonqMainWindow::removeContainer( QWidget *container, QWidget *parent, QDomE
// Note that KShortURIFilter does the same, but we have no way of getting it from there
//
// Note: this removes the filter from the URL.
-static QString detectNameFilter( KURL & url )
+static TQString detectNameFilter( KURL & url )
{
if ( !KProtocolInfo::supportsListing(url) )
- return QString::null;
+ return TQString::null;
// Look for wildcard selection
- QString nameFilter;
- QString path = url.path();
+ TQString nameFilter;
+ TQString path = url.path();
int lastSlash = path.findRev( '/' );
if ( lastSlash > -1 )
{
if ( !url.query().isEmpty() && lastSlash == (int)path.length()-1 ) { // In /tmp/?foo, foo isn't a query
path += url.query(); // includes the '?'
- url.setQuery( QString::null );
+ url.setQuery( TQString::null );
}
- const QString fileName = path.mid( lastSlash + 1 );
+ const TQString fileName = path.mid( lastSlash + 1 );
if ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 )
{
// Check that a file or dir with all the special chars in the filename doesn't exist
- if ( url.isLocalFile() ? !QFile::exists( path ) : !KIO::NetAccess::exists( url, false, 0 ) )
+ if ( url.isLocalFile() ? !TQFile::exists( path ) : !KIO::NetAccess::exists( url, false, 0 ) )
{
nameFilter = fileName;
- url.setFileName( QString::null );
+ url.setFileName( TQString::null );
kdDebug(1202) << "Found wildcard. nameFilter=" << nameFilter << " New url=" << url << endl;
}
}
@@ -440,7 +440,7 @@ static QString detectNameFilter( KURL & url )
return nameFilter;
}
-void KonqMainWindow::openFilteredURL( const QString & url, KonqOpenURLRequest & req )
+void KonqMainWindow::openFilteredURL( const TQString & url, KonqOpenURLRequest & req )
{
// Filter URL to build a correct one
if (m_currentDir.isEmpty() && m_currentView)
@@ -452,9 +452,9 @@ void KonqMainWindow::openFilteredURL( const QString & url, KonqOpenURLRequest &
if ( filteredURL.isEmpty() ) // initially empty, or error (e.g. ~unknown_user)
return;
- m_currentDir = QString::null;
+ m_currentDir = TQString::null;
- openURL( 0L, filteredURL, QString::null, req );
+ openURL( 0L, filteredURL, TQString::null, req );
// #4070: Give focus to view after URL was entered manually
// Note: we do it here if the view mode (i.e. part) wasn't changed
@@ -464,7 +464,7 @@ void KonqMainWindow::openFilteredURL( const QString & url, KonqOpenURLRequest &
}
-void KonqMainWindow::openFilteredURL( const QString & _url, bool inNewTab, bool tempFile )
+void KonqMainWindow::openFilteredURL( const TQString & _url, bool inNewTab, bool tempFile )
{
KonqOpenURLRequest req( _url );
req.newTab = inNewTab;
@@ -475,7 +475,7 @@ void KonqMainWindow::openFilteredURL( const QString & _url, bool inNewTab, bool
}
void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
- const QString &_serviceType, KonqOpenURLRequest& req,
+ const TQString &_serviceType, KonqOpenURLRequest& req,
bool trustedSource )
{
#ifndef NDEBUG // needed for req.debug()
@@ -485,7 +485,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
#endif
KURL url( _url );
- QString serviceType( _serviceType );
+ TQString serviceType( _serviceType );
if ( url.url() == "about:blank" )
{
serviceType = "text/html";
@@ -501,11 +501,11 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
return;
}
- QString nameFilter = detectNameFilter( url );
+ TQString nameFilter = detectNameFilter( url );
if ( !nameFilter.isEmpty() )
{
req.nameFilter = nameFilter;
- url.setFileName( QString::null );
+ url.setFileName( TQString::null );
}
KonqView *view = _view;
@@ -518,8 +518,8 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
if ( !view && !req.newTab )
view = m_currentView; /* Note, this can be 0L, e.g. on startup */
else if ( !view && req.newTab ) {
- view = m_pViewManager->addTab(QString::null,
- QString::null,
+ view = m_pViewManager->addTab(TQString::null,
+ TQString::null,
false,
req.openAfterCurrentPage);
if (view) {
@@ -537,7 +537,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
req.newTab = false;
}
- const QString oldLocationBarURL = m_combo->currentText();
+ const TQString oldLocationBarURL = m_combo->currentText();
if ( view )
{
if ( view == m_currentView )
@@ -555,7 +555,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
// Fast mode for local files: do the stat ourselves instead of letting KRun do it.
if ( serviceType.isEmpty() && url.isLocalFile() )
{
- QCString _path( QFile::encodeName(url.path()));
+ TQCString _path( TQFile::encodeName(url.path()));
KDE_struct_stat buff;
if ( KDE_stat( _path.data(), &buff ) != -1 )
serviceType = KMimeType::findByURL( url, buff.st_mode )->name();
@@ -586,12 +586,12 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
if ( !url.isLocalFile() && KonqRun::isTextExecutable( serviceType ) )
serviceType = "text/plain"; // view, don't execute
// Remote URL: save or open ?
- QString protClass = KProtocolInfo::protocolClass(url.protocol());
+ TQString protClass = KProtocolInfo::protocolClass(url.protocol());
bool open = url.isLocalFile() || protClass==":local";
if ( !open ) {
KParts::BrowserRun::AskSaveResult res = KonqRun::askSave( url, offer, serviceType );
if ( res == KParts::BrowserRun::Save )
- KParts::BrowserRun::simpleSave( url, QString::null, this );
+ KParts::BrowserRun::simpleSave( url, TQString::null, this );
open = ( res == KParts::BrowserRun::Open );
}
if ( open )
@@ -638,16 +638,16 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
if ( view == m_currentView )
startAnimation();
- connect( run, SIGNAL( finished() ), this, SLOT( slotRunFinished() ) );
+ connect( run, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotRunFinished() ) );
}
}
-bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView *childView, KonqOpenURLRequest& req )
+bool KonqMainWindow::openView( TQString serviceType, const KURL &_url, KonqView *childView, KonqOpenURLRequest& req )
{
// Second argument is referring URL
if ( !kapp->authorizeURLAction("open", childView ? childView->url() : KURL(), _url) )
{
- QString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, _url.prettyURL());
+ TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, _url.prettyURL());
KMessageBox::queuedMessageBox( this, KMessageBox::Error, msg );
return true; // Nothing else to do.
}
@@ -685,7 +685,7 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView *
return bOthersFollowed;
}
- QString indexFile;
+ TQString indexFile;
KURL url( _url );
@@ -697,7 +697,7 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView *
KServiceType::Ptr ptr = KServiceType::serviceType( serviceType );
if ( ptr )
{
- const QString protocol = ptr->property("X-KDE-LocalProtocol").toString();
+ const TQString protocol = ptr->property("X-KDE-LocalProtocol").toString();
if ( !protocol.isEmpty() && KonqFMSettings::settings()->shouldEmbed( serviceType ) )
{
url.setProtocol( protocol );
@@ -721,7 +721,7 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView *
// to still display the original URL (so that 'up' uses that URL,
// and since that's what the user entered).
// changeViewMode will take care of setting and storing that url.
- QString originalURL = url.pathOrURL();
+ TQString originalURL = url.pathOrURL();
if ( !req.nameFilter.isEmpty() ) // keep filter in location bar
{
if (!originalURL.endsWith("/"))
@@ -729,18 +729,18 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView *
originalURL += req.nameFilter;
}
- QString serviceName; // default: none provided
+ TQString serviceName; // default: none provided
if ( url.url().startsWith("about:konqueror") || url.url() == "about:plugins" )
{
serviceType = "KonqAboutPage"; // not KParts/ReadOnlyPart, it fills the Location menu ! :)
serviceName = "konq_aboutpage";
- originalURL = req.typedURL.isEmpty() ? QString::null : url.url();
+ originalURL = req.typedURL.isEmpty() ? TQString::null : url.url();
// empty if from profile, about:konqueror if the user typed it (not req.typedURL, it could be "about:")
}
else if ( url.url() == "about:blank" && req.typedURL.isEmpty() )
{
- originalURL = QString::null;
+ originalURL = TQString::null;
}
// Look for which view mode to use, if a directory - not if view locked
@@ -758,7 +758,7 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView *
KURL urlDotDir( url );
urlDotDir.addPath(".directory");
bool HTMLAllowed = m_bHTMLAllowed;
- QFile f( urlDotDir.path() );
+ TQFile f( urlDotDir.path() );
if ( f.open(IO_ReadOnly) )
{
f.close();
@@ -769,12 +769,12 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView *
kdDebug(1202) << "serviceName=" << serviceName << endl;
}
if ( HTMLAllowed &&
- ( ( indexFile = findIndexFile( url.path() ) ) != QString::null ) )
+ ( ( indexFile = findIndexFile( url.path() ) ) != TQString::null ) )
{
serviceType = "text/html";
url = KURL();
url.setPath( indexFile );
- serviceName = QString::null; // cancel what we just set, this is not a dir finally
+ serviceName = TQString::null; // cancel what we just set, this is not a dir finally
}
// Reflect this setting in the menu
@@ -826,7 +826,7 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView *
return false; // It didn't work out.
childView->setViewName( m_initialFrameName.isEmpty() ? req.args.frameName : m_initialFrameName );
- m_initialFrameName = QString::null;
+ m_initialFrameName = TQString::null;
}
else // We know the child view
{
@@ -848,7 +848,7 @@ bool KonqMainWindow::openView( QString serviceType, const KURL &_url, KonqView *
// So (if embedding would succeed, hence the checks above) we ask the user
// Otherwise the user will get asked 'open or save' in openURL anyway.
if ( ok && !forceAutoEmbed && !KProtocolInfo::supportsWriting( url ) ) {
- QString suggestedFilename;
+ TQString suggestedFilename;
KonqRun* run = childView->run();
int attachment = 0;
@@ -898,14 +898,14 @@ void KonqMainWindow::slotOpenURLRequest( const KURL &url, const KParts::URLArgs
kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl;
KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() );
- QString frameName = args.frameName;
+ TQString frameName = args.frameName;
if ( !frameName.isEmpty() )
{
- static QString _top = QString::fromLatin1( "_top" );
- static QString _self = QString::fromLatin1( "_self" );
- static QString _parent = QString::fromLatin1( "_parent" );
- static QString _blank = QString::fromLatin1( "_blank" );
+ static TQString _top = TQString::fromLatin1( "_top" );
+ static TQString _self = TQString::fromLatin1( "_self" );
+ static TQString _parent = TQString::fromLatin1( "_parent" );
+ static TQString _blank = TQString::fromLatin1( "_blank" );
if ( frameName.lower() == _blank )
{
@@ -960,7 +960,7 @@ void KonqMainWindow::openURL( KonqView *childView, const KURL &url, const KParts
if ( !args.doPost() && !args.reload &&
childView && urlcmp( url.url(), childView->url().url(), true, true ) )
{
- QString serviceType = args.serviceType;
+ TQString serviceType = args.serviceType;
if ( serviceType.isEmpty() )
serviceType = childView->serviceType();
@@ -975,12 +975,12 @@ void KonqMainWindow::openURL( KonqView *childView, const KURL &url, const KParts
openURL( childView, url, args.serviceType, req, args.trustedSource );
}
-QObject *KonqMainWindow::lastFrame( KonqView *view )
+TQObject *KonqMainWindow::lastFrame( KonqView *view )
{
- QObject *nextFrame, *viewFrame;
+ TQObject *nextFrame, *viewFrame;
nextFrame = view->frame();
viewFrame = 0;
- while ( nextFrame != 0 && ! nextFrame->inherits( "QWidgetStack" ) ) {
+ while ( nextFrame != 0 && ! nextFrame->inherits( "TQWidgetStack" ) ) {
viewFrame = nextFrame;
nextFrame = nextFrame->parent();
}
@@ -989,7 +989,7 @@ QObject *KonqMainWindow::lastFrame( KonqView *view )
// Linked-views feature, plus "sidebar follows URL opened in the active view" feature
bool KonqMainWindow::makeViewsFollow( const KURL & url, const KParts::URLArgs &args,
- const QString & serviceType, KonqView * senderView )
+ const TQString & serviceType, KonqView * senderView )
{
if ( !senderView->isLinkedView() && senderView != m_currentView )
return false; // none of those features apply -> return
@@ -1001,13 +1001,13 @@ bool KonqMainWindow::makeViewsFollow( const KURL & url, const KParts::URLArgs &a
req.args = args;
// We can't iterate over the map here, and openURL for each, because the map can get modified
// (e.g. by part changes). Better copy the views into a list.
- QPtrList<KonqView> listViews;
+ TQPtrList<KonqView> listViews;
MapViews::ConstIterator it = m_mapViews.begin();
MapViews::ConstIterator end = m_mapViews.end();
for (; it != end; ++it )
listViews.append( it.data() );
- QObject *senderFrame = lastFrame( senderView );
+ TQObject *senderFrame = lastFrame( senderView );
for ( KonqView * view = listViews.first() ; view ; view = listViews.next())
{
@@ -1015,7 +1015,7 @@ bool KonqMainWindow::makeViewsFollow( const KURL & url, const KParts::URLArgs &a
// Views that should follow this URL as both views are linked
if ( (view != senderView) && view->isLinkedView() && senderView->isLinkedView() )
{
- QObject *viewFrame = lastFrame( view );
+ TQObject *viewFrame = lastFrame( view );
// Only views in the same tab of the sender will follow
if ( senderFrame && viewFrame && viewFrame != senderFrame )
@@ -1084,7 +1084,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
if (KApplication::keyboardMouseState() & Qt::ShiftButton)
req.newTabInFront = !req.newTabInFront;
req.args = args;
- openURL( 0L, url, QString::null, req );
+ openURL( 0L, url, TQString::null, req );
}
else
{
@@ -1125,13 +1125,13 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
if ( windowArgs.lowerWindow )
newtabsinfront =! newtabsinfront;
- KonqView* newView = m_pViewManager->addTab(QString::null, QString::null, false, aftercurrentpage);
+ KonqView* newView = m_pViewManager->addTab(TQString::null, TQString::null, false, aftercurrentpage);
if (newView == 0L) return;
if (newtabsinfront)
m_pViewManager->showTab( newView );
- openURL( newView, url.isEmpty() ? KURL("about:blank") : url, QString::null);
+ openURL( newView, url.isEmpty() ? KURL("about:blank") : url, TQString::null);
newView->setViewName( args.frameName );
part=newView->part();
@@ -1146,7 +1146,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
req.args = args;
if ( args.serviceType.isEmpty() )
- mainWindow->openURL( 0L, url, QString::null, req );
+ mainWindow->openURL( 0L, url, TQString::null, req );
else if ( !mainWindow->openView( args.serviceType, url, 0L, req ) )
{
// we have problems. abort.
@@ -1170,7 +1170,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
mainWindow->viewManager()->setActivePart( part, true );
}
- QString profileName = QString::fromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" );
+ TQString profileName = TQString::fromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" );
KSimpleConfig cfg( locate( "data", profileName ), true );
cfg.setGroup( "Profile" );
@@ -1179,7 +1179,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
if ( windowArgs.y != -1 )
mainWindow->move( mainWindow->x(), windowArgs.y );
- QSize size = KonqViewManager::readConfigSize( cfg, mainWindow );
+ TQSize size = KonqViewManager::readConfigSize( cfg, mainWindow );
int width;
if ( windowArgs.width != -1 )
@@ -1205,7 +1205,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
if ( !windowArgs.toolBarsVisible )
{
- for ( QPtrListIterator<KToolBar> it( mainWindow->toolBarIterator() ); it.current(); ++it )
+ for ( TQPtrListIterator<KToolBar> it( mainWindow->toolBarIterator() ); it.current(); ++it )
{
(*it)->hide();
}
@@ -1220,7 +1220,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
if ( !windowArgs.resizable )
// ### this doesn't seem to work :-(
- mainWindow->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) );
+ mainWindow->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
// Trying to show the window initially behind the current window is a bit tricky,
// as this involves the window manager, which may see things differently.
@@ -1236,7 +1236,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
wm_usertime_support = wm_info.isSupported( NET::WM2UserTime );
if( wm_usertime_support )
{
- // *sigh*, and I thought nobody would need QWidget::dontFocusOnShow().
+ // *sigh*, and I thought nobody would need TQWidget::dontFocusOnShow().
// Avoid Qt's support for user time by setting it to 0, and
// set the property ourselves.
qt_x_user_time = 0;
@@ -1269,16 +1269,16 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
void KonqMainWindow::slotNewWindow()
{
// Use profile from current window, if set
- QString profile = m_pViewManager->currentProfile();
+ TQString profile = m_pViewManager->currentProfile();
if ( profile.isEmpty() )
{
if ( m_currentView && m_currentView->url().protocol().startsWith( "http" ) )
- profile = QString::fromLatin1("webbrowsing");
+ profile = TQString::fromLatin1("webbrowsing");
else
- profile = QString::fromLatin1("filemanagement");
+ profile = TQString::fromLatin1("filemanagement");
}
KonqMisc::createBrowserWindowFromProfile(
- locate( "data", QString::fromLatin1("konqueror/profiles/")+profile ),
+ locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ),
profile );
}
@@ -1306,8 +1306,8 @@ void KonqMainWindow::slotDuplicateWindow()
void KonqMainWindow::slotSendURL()
{
KURL::List lst = currentURLs();
- QString body;
- QString fileNameList;
+ TQString body;
+ TQString fileNameList;
for ( KURL::List::Iterator it = lst.begin() ; it != lst.end() ; ++it )
{
if ( !body.isEmpty() ) body += '\n';
@@ -1315,36 +1315,36 @@ void KonqMainWindow::slotSendURL()
if ( !fileNameList.isEmpty() ) fileNameList += ", ";
fileNameList += (*it).fileName();
}
- QString subject;
+ TQString subject;
if ( m_currentView && !m_currentView->part()->inherits("KonqDirPart") )
subject = m_currentView->caption();
else
subject = fileNameList;
- kapp->invokeMailer(QString::null,QString::null,QString::null,
+ kapp->invokeMailer(TQString::null,TQString::null,TQString::null,
subject, body);
}
void KonqMainWindow::slotSendFile()
{
KURL::List lst = currentURLs();
- QStringList urls;
- QString fileNameList;
+ TQStringList urls;
+ TQString fileNameList;
for ( KURL::List::Iterator it = lst.begin() ; it != lst.end() ; ++it )
{
if ( !fileNameList.isEmpty() ) fileNameList += ", ";
- if ( (*it).isLocalFile() && QFileInfo((*it).path()).isDir() )
+ if ( (*it).isLocalFile() && TQFileInfo((*it).path()).isDir() )
{
// Create a temp dir, so that we can put the ZIP file in it with a proper name
KTempFile zipFile;
- QString zipFileName = zipFile.name();
+ TQString zipFileName = zipFile.name();
zipFile.unlink();
- QDir().mkdir(zipFileName,true);
+ TQDir().mkdir(zipFileName,true);
zipFileName = zipFileName+"/"+(*it).fileName()+".zip";
KZip zip( zipFileName );
if ( !zip.open( IO_WriteOnly ) )
continue; // TODO error message
- zip.addLocalDirectory( (*it).path(), QString::null );
+ zip.addLocalDirectory( (*it).path(), TQString::null );
zip.close();
fileNameList += (*it).fileName()+".zip";
urls.append( zipFileName );
@@ -1355,22 +1355,22 @@ void KonqMainWindow::slotSendFile()
urls.append( (*it).url() );
}
}
- QString subject;
+ TQString subject;
if ( m_currentView && !m_currentView->part()->inherits("KonqDirPart") )
subject = m_currentView->caption();
else
subject = fileNameList;
- kapp->invokeMailer(QString::null, QString::null, QString::null, subject,
- QString::null, //body
- QString::null,
+ kapp->invokeMailer(TQString::null, TQString::null, TQString::null, subject,
+ TQString::null, //body
+ TQString::null,
urls); // attachments
}
void KonqMainWindow::slotOpenTerminal()
{
- QString term = KonqSettings::terminalApplication();
+ TQString term = KonqSettings::terminalApplication();
- QString dir ( QDir::homeDirPath() );
+ TQString dir ( TQDir::homeDirPath() );
//Try to get the directory of the current view
if ( m_currentView )
@@ -1384,7 +1384,7 @@ void KonqMainWindow::slotOpenTerminal()
//If the URL is local after the above conversion, set the directory.
if ( u.isLocalFile() )
{
- QString mime = m_currentView->serviceType();
+ TQString mime = m_currentView->serviceType();
if ( KMimeType::mimeType(mime)->is("inode/directory") )
dir = u.path();
else
@@ -1396,8 +1396,8 @@ void KonqMainWindow::slotOpenTerminal()
cmd.setWorkingDirectory(dir);
// Compensate for terminal having arguments.
- QStringList args = QStringList::split(' ', term);
- for ( QStringList::iterator it = args.begin(); it != args.end(); ++it )
+ TQStringList args = TQStringList::split(' ', term);
+ for ( TQStringList::iterator it = args.begin(); it != args.end(); ++it )
cmd << *it;
kdDebug(1202) << "slotOpenTerminal: directory " << dir
@@ -1410,11 +1410,11 @@ void KonqMainWindow::slotOpenLocation()
// Don't pre-fill the url, as it is auto-selected and thus overwrites the
// X clipboard, making it impossible to paste in the url you really wanted.
// Another example of why the X clipboard sux
- KURLRequesterDlg dlg( QString::null, this, 0, true);
+ KURLRequesterDlg dlg( TQString::null, this, 0, true);
dlg.setCaption( i18n("Open Location") );
// Set current directory for relative paths.
// Testcase: konqueror www.kde.org; Ctrl+O; file in $HOME; would open http://$file
- QString currentDir;
+ TQString currentDir;
if (m_currentView && m_currentView->url().isLocalFile())
currentDir = m_currentView->url().path(1);
dlg.urlRequester()->completionObject()->setDir( currentDir );
@@ -1454,8 +1454,8 @@ void KonqMainWindow::slotToolFind()
findPart->widget()->show();
findPart->widget()->setFocus();
- connect( dirPart, SIGNAL( findClosed(KonqDirPart *) ),
- this, SLOT( slotFindClosed(KonqDirPart *) ) );
+ connect( dirPart, TQT_SIGNAL( findClosed(KonqDirPart *) ),
+ this, TQT_SLOT( slotFindClosed(KonqDirPart *) ) );
}
else if ( sender()->inherits( "KAction" ) ) // don't go there if called by the singleShot below
{
@@ -1463,13 +1463,13 @@ void KonqMainWindow::slotToolFind()
if ( m_currentView && m_currentView->url().isLocalFile() )
url = m_currentView->locationBarURL();
else
- url.setPath( QDir::homeDirPath() );
+ url.setPath( TQDir::homeDirPath() );
KonqMainWindow * mw = KonqMisc::createBrowserWindowFromProfile(
- locate( "data", QString::fromLatin1("konqueror/profiles/filemanagement") ),
+ locate( "data", TQString::fromLatin1("konqueror/profiles/filemanagement") ),
"filemanagement", url, KParts::URLArgs(), true /* forbid "use html"*/ );
mw->m_paFindFiles->setChecked(true);
// Delay it after the openURL call (hacky!)
- QTimer::singleShot( 1, mw, SLOT(slotToolFind()));
+ TQTimer::singleShot( 1, mw, TQT_SLOT(slotToolFind()));
m_paFindFiles->setChecked(false);
}
}
@@ -1506,7 +1506,7 @@ void KonqMainWindow::slotOpenWith()
KURL::List lst;
lst.append( m_currentView->url() );
- QString serviceName = sender()->name();
+ TQString serviceName = sender()->name();
KTrader::OfferList offers = m_currentView->appServiceOffers();
KTrader::OfferList::ConstIterator it = offers.begin();
@@ -1524,7 +1524,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
if ( !toggle )
return;
- QString modeName = sender()->name();
+ TQString modeName = sender()->name();
if ( m_currentView->service()->desktopEntryName() == modeName )
return;
@@ -1536,8 +1536,8 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
// Save those, because changeViewMode will lose them
KURL url = m_currentView->url();
- QString locationBarURL = m_currentView->locationBarURL();
- QStringList filesToSelect;
+ TQString locationBarURL = m_currentView->locationBarURL();
+ TQStringList filesToSelect;
if( m_currentView->part()->inherits( "KonqDirPart" ) ) {
KFileItemList fileItemsToSelect = static_cast<KonqDirPart*>(m_currentView->part())->selectedFileItems();
KFileItemListIterator it( fileItemsToSelect );
@@ -1555,7 +1555,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
const KTrader::OfferList offers = m_currentView->partServiceOffers();
KTrader::OfferList::ConstIterator oIt = offers.begin();
KTrader::OfferList::ConstIterator oEnd = offers.end();
- const QString currentServiceKey = viewModeActionKey( m_currentView->service() );
+ const TQString currentServiceKey = viewModeActionKey( m_currentView->service() );
for (; oIt != oEnd; ++oIt )
{
KService::Ptr service = *oIt;
@@ -1569,13 +1569,13 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
// updateViewModeActions
// (I'm saying iconview/listview here, but theoretically it could be
// any view :)
- const QString serviceKey = viewModeActionKey( service );
+ const TQString serviceKey = viewModeActionKey( service );
m_viewModeToolBarServices[ serviceKey ] = service;
if ( serviceKey == currentServiceKey )
{
- QVariant modeProp = service->property( "X-KDE-BrowserView-ModeProperty" );
- QVariant modePropValue = service->property( "X-KDE-BrowserView-ModePropertyValue" );
+ TQVariant modeProp = service->property( "X-KDE-BrowserView-ModeProperty" );
+ TQVariant modePropValue = service->property( "X-KDE-BrowserView-ModePropertyValue" );
if ( !modeProp.isValid() || !modePropValue.isValid() )
break;
@@ -1587,16 +1587,16 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
// quick viewmode change (iconview) -> find the iconview-konqviewmode
// action and set new text,icon,etc. properties, to show the new
// current viewmode
- QPtrListIterator<KAction> it( m_toolBarViewModeActions );
+ TQPtrListIterator<KAction> it( m_toolBarViewModeActions );
for (; it.current(); ++it )
- if ( QString::fromLatin1( it.current()->name() ) == oldService->desktopEntryName() )
+ if ( TQString::fromLatin1( it.current()->name() ) == oldService->desktopEntryName() )
{
assert( it.current()->inherits( "KonqViewModeAction" ) );
KonqViewModeAction *action = static_cast<KonqViewModeAction *>( it.current() );
action->setChecked( true );
- QString servicename = service->genericName();
+ TQString servicename = service->genericName();
if (servicename.isEmpty())
servicename = service->name();
action->setText( servicename );
@@ -1618,7 +1618,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
{
m_currentView->changeViewMode( m_currentView->serviceType(), modeName );
KURL locURL = KURL::fromPathOrURL( locationBarURL );
- QString nameFilter = detectNameFilter( locURL );
+ TQString nameFilter = detectNameFilter( locURL );
if( m_currentView->part()->inherits( "KonqDirPart" ) )
static_cast<KonqDirPart*>( m_currentView->part() )->setFilesToSelect( filesToSelect );
m_currentView->openURL( locURL, locationBarURL, nameFilter );
@@ -1680,7 +1680,7 @@ void KonqMainWindow::showHTML( KonqView * _view, bool b, bool _activateView )
else if ( !b && _view->supportsServiceType( "text/html" ) )
{
KURL u( _view->url() );
- QString fileName = u.fileName().lower();
+ TQString fileName = u.fileName().lower();
if ( KProtocolInfo::supportsListing( u ) && fileName.startsWith("index.htm") ) {
_view->lockHistory();
u.setPath( u.directory() );
@@ -1753,7 +1753,7 @@ void KonqMainWindow::slotReload( KonqView* reloadView )
return;
if ( reloadView->part() && (reloadView->part()->metaObject()->findProperty("modified") != -1) ) {
- QVariant prop = reloadView->part()->property("modified");
+ TQVariant prop = reloadView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
i18n("This page contains changes that have not been submitted.\nReloading the page will discard these changes."),
@@ -1767,7 +1767,7 @@ void KonqMainWindow::slotReload( KonqView* reloadView )
{
reloadView->lockHistory();
// Reuse current servicetype for local files, but not for remote files (it could have changed, e.g. over HTTP)
- QString serviceType = reloadView->url().isLocalFile() ? reloadView->serviceType() : QString::null;
+ TQString serviceType = reloadView->url().isLocalFile() ? reloadView->serviceType() : TQString::null;
openURL( reloadView, reloadView->url(), serviceType, req );
}
}
@@ -1783,14 +1783,14 @@ void KonqMainWindow::slotReloadStop() {
}
void KonqMainWindow::toggleReloadStopButton(bool isReload) {
- //m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, this, SLOT( slotStop() ), actionCollection(), "stop" );
+ //m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" );
if (isReload) {
m_paReloadStop->setIcon("stop");
m_paReloadStop->setWhatsThis( i18n( "Stop loading the document<p>"
"All network transfers will be stopped and Konqueror will display the content "
"that has been received so far." ) );
m_paReloadStop->setToolTip( i18n( "Stop loading the document" ) );
- //m_paReloadStop = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, SLOT( slotReloadStop() ), actionCollection(), "reload" );
+ //m_paReloadStop = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload" );
} else {
m_paReloadStop->setIcon("reload");
m_paReloadStop->setWhatsThis( i18n( "Reload the currently displayed document<p>"
@@ -1808,7 +1808,7 @@ void KonqMainWindow::slotReloadPopup()
void KonqMainWindow::slotHome(KAction::ActivationReason, Qt::ButtonState state)
{
- QString homeURL = m_pViewManager->profileHomeURL();
+ TQString homeURL = m_pViewManager->profileHomeURL();
if (homeURL.isEmpty())
homeURL = KonqFMSettings::settings()->homeURL();
@@ -1897,7 +1897,7 @@ void KonqMainWindow::slotGoHistory()
// Show the sidebar
if (!static_cast<KToggleAction*>(a)->isChecked()) {
a->activate();
- QTimer::singleShot( 0, this, SLOT(slotGoHistory()));
+ TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistory()));
return;
}
@@ -1916,7 +1916,7 @@ void KonqMainWindow::slotGoHistory()
}
}
-QStringList KonqMainWindow::configModules() const
+TQStringList KonqMainWindow::configModules() const
{
return m_configureModules;
}
@@ -1933,10 +1933,10 @@ void KonqMainWindow::slotConfigure()
{
m_configureDialog = new KCMultiDialog( this, "configureDialog" );
- QStringList modules = configModules();
- QStringList::ConstIterator end( modules.end() );
+ TQStringList modules = configModules();
+ TQStringList::ConstIterator end( modules.end() );
- for( QStringList::ConstIterator it = modules.begin();
+ for( TQStringList::ConstIterator it = modules.begin();
it != end; ++it )
{
if ( kapp->authorizeControlModule( *it ) )
@@ -1961,15 +1961,15 @@ void KonqMainWindow::slotConfigureToolbars()
if ( autoSaveSettings() )
saveMainWindowSettings( KGlobal::config(), "KonqMainWindow" );
KEditToolbar dlg(factory());
- connect(&dlg,SIGNAL(newToolbarConfig()),this,SLOT(slotNewToolbarConfig()));
- connect(&dlg,SIGNAL(newToolbarConfig()),this,SLOT(initBookmarkBar()));
+ connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig()));
+ connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(initBookmarkBar()));
dlg.exec();
}
void KonqMainWindow::slotNewToolbarConfig() // This is called when OK or Apply is clicked
{
if ( m_toggleViewGUIClient )
- plugActionList( QString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() );
+ plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() );
if ( m_currentView && m_currentView->appServiceOffers().count() > 0 )
plugActionList( "openwith", m_openWithActions );
@@ -1984,10 +1984,10 @@ void KonqMainWindow::slotUndoAvailable( bool avail )
if ( avail && m_currentView && m_currentView->part() )
{
- // Avoid qWarning from QObject::property if it doesn't exist
+ // Avoid qWarning from TQObject::property if it doesn't exist
if ( m_currentView->part()->metaObject()->findProperty( "supportsUndo" ) != -1 )
{
- QVariant prop = m_currentView->part()->property( "supportsUndo" );
+ TQVariant prop = m_currentView->part()->property( "supportsUndo" );
if ( prop.isValid() && prop.toBool() )
enable = true;
}
@@ -2027,11 +2027,11 @@ void KonqMainWindow::slotRunFinished()
}
if ( run->hasError() ) { // we had an error
- QByteArray data;
- QDataStream s( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream s( data, IO_WriteOnly );
s << run->url().prettyURL() << kapp->dcopClient()->defaultObject();
kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
- "removeFromCombo(QString,QCString)", data);
+ "removeFromCombo(TQString,TQCString)", data);
}
KonqView *childView = run->childView();
@@ -2072,9 +2072,9 @@ void KonqMainWindow::slotRunFinished()
void KonqMainWindow::applyKonqMainWindowSettings()
{
- QStringList toggableViewsShown = KonqSettings::toggableViewsShown();
- QStringList::ConstIterator togIt = toggableViewsShown.begin();
- QStringList::ConstIterator togEnd = toggableViewsShown.end();
+ TQStringList toggableViewsShown = KonqSettings::toggableViewsShown();
+ TQStringList::ConstIterator togIt = toggableViewsShown.begin();
+ TQStringList::ConstIterator togEnd = toggableViewsShown.end();
for ( ; togIt != togEnd ; ++togIt )
{
// Find the action by name
@@ -2087,7 +2087,7 @@ void KonqMainWindow::applyKonqMainWindowSettings()
}
}
-void KonqMainWindow::slotSetStatusBarText( const QString & )
+void KonqMainWindow::slotSetStatusBarText( const TQString & )
{
// Reimplemented to disable KParts::MainWindow default behaviour
// Does nothing here, see konq_frame.cc
@@ -2210,22 +2210,22 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part )
{
// if we just toggled the view mode via the view mode actions, then
// we don't need to do all the time-taking stuff below (Simon)
- const QString currentServiceDesktopEntryName = m_currentView->service()->desktopEntryName();
- QPtrListIterator<KRadioAction> it( m_viewModeActions );
+ const TQString currentServiceDesktopEntryName = m_currentView->service()->desktopEntryName();
+ TQPtrListIterator<KRadioAction> it( m_viewModeActions );
for (; it.current(); ++it ) {
if ( it.current()->name() == currentServiceDesktopEntryName ) {
it.current()->setChecked( true );
break;
}
}
- const QString currentServiceLibrary = viewModeActionKey( m_currentView->service() );
- QPtrListIterator<KAction> ittb( m_toolBarViewModeActions );
+ const TQString currentServiceLibrary = viewModeActionKey( m_currentView->service() );
+ TQPtrListIterator<KAction> ittb( m_toolBarViewModeActions );
for (; ittb.current(); ++ittb ) {
KService::Ptr serv = KService::serviceByDesktopName( ittb.current()->name() );
if ( serv && viewModeActionKey( serv ) == currentServiceLibrary ) {
KToggleAction* ta = static_cast<KToggleAction*>( ittb.current() );
ta->setChecked( false );
- QString servicename = m_currentView->service()->genericName();
+ TQString servicename = m_currentView->service()->genericName();
if (servicename.isEmpty())
servicename = m_currentView->service()->name();
ta->setText( servicename );
@@ -2264,8 +2264,8 @@ void KonqMainWindow::insertChildView( KonqView *childView )
kdDebug(1202) << "KonqMainWindow::insertChildView " << childView << endl;
m_mapViews.insert( childView->part(), childView );
- connect( childView, SIGNAL( viewCompleted( KonqView * ) ),
- this, SLOT( slotViewCompleted( KonqView * ) ) );
+ connect( childView, TQT_SIGNAL( viewCompleted( KonqView * ) ),
+ this, TQT_SLOT( slotViewCompleted( KonqView * ) ) );
if ( !m_pViewManager->isLoadingProfile() ) // see KonqViewManager::loadViewProfile
viewCountChanged();
@@ -2277,8 +2277,8 @@ void KonqMainWindow::removeChildView( KonqView *childView )
{
kdDebug(1202) << "KonqMainWindow::removeChildView childView " << childView << endl;
- disconnect( childView, SIGNAL( viewCompleted( KonqView * ) ),
- this, SLOT( slotViewCompleted( KonqView * ) ) );
+ disconnect( childView, TQT_SIGNAL( viewCompleted( KonqView * ) ),
+ this, TQT_SLOT( slotViewCompleted( KonqView * ) ) );
#ifndef NDEBUG
dumpViewList();
@@ -2358,7 +2358,7 @@ KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *view )
return 0L;
}
-KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
+KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const TQString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
{
kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl;
@@ -2367,7 +2367,7 @@ KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const Q
for (; it != end; ++it )
{
KonqView* view = it.data();
- QString viewName = view->viewName();
+ TQString viewName = view->viewName();
kdDebug() << " - viewName=" << viewName << " "
<< "frame names:" << view->frameNames().join( "," ) << endl;
@@ -2395,8 +2395,8 @@ KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const Q
if ( ext )
{
- QPtrList<KParts::ReadOnlyPart> frames = ext->frames();
- QPtrListIterator<KParts::ReadOnlyPart> frameIt( frames );
+ TQPtrList<KParts::ReadOnlyPart> frames = ext->frames();
+ TQPtrListIterator<KParts::ReadOnlyPart> frameIt( frames );
for ( ; frameIt.current() ; ++frameIt )
{
if ( frameIt.current()->name() == name )
@@ -2416,12 +2416,12 @@ KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const Q
}
// static
-KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
+KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const TQString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
{
if ( !s_lstViews )
return 0;
- QPtrListIterator<KonqMainWindow> it( *s_lstViews );
+ TQPtrListIterator<KonqMainWindow> it( *s_lstViews );
for (; it.current(); ++it )
{
KonqView *res = it.current()->childView( callingPart, name, hostExtension, part );
@@ -2484,7 +2484,7 @@ KParts::ReadOnlyPart * KonqMainWindow::currentPart() const
return 0L;
}
-void KonqMainWindow::customEvent( QCustomEvent *event )
+void KonqMainWindow::customEvent( TQCustomEvent *event )
{
KParts::MainWindow::customEvent( event );
@@ -2495,7 +2495,7 @@ void KonqMainWindow::customEvent( QCustomEvent *event )
MapViews::ConstIterator it = m_mapViews.begin();
MapViews::ConstIterator end = m_mapViews.end();
for (; it != end; ++it )
- QApplication::sendEvent( (*it)->part(), event );
+ TQApplication::sendEvent( (*it)->part(), event );
return;
}
if ( KParts::OpenURLEvent::test( event ) )
@@ -2516,7 +2516,7 @@ void KonqMainWindow::customEvent( QCustomEvent *event )
if (it.key() != ev->part())
{
//kdDebug(1202) << "Sending event to view " << it.key()->className() << endl;
- QApplication::sendEvent( it.key(), event );
+ TQApplication::sendEvent( it.key(), event );
}
}
@@ -2529,14 +2529,14 @@ void KonqMainWindow::updateLocalPropsActions()
if ( m_currentView && m_currentView->url().isLocalFile() )
{
// Can we write ?
- QFileInfo info( m_currentView->url().path() );
+ TQFileInfo info( m_currentView->url().path() );
canWrite = info.isDir() && info.isWritable();
}
m_paSaveViewPropertiesLocally->setEnabled( canWrite );
m_paRemoveLocalProperties->setEnabled( canWrite );
}
-void KonqMainWindow::slotURLEntered( const QString &text, int state )
+void KonqMainWindow::slotURLEntered( const TQString &text, int state )
{
if ( m_bURLEnterLock || text.isEmpty() )
return;
@@ -2545,7 +2545,7 @@ void KonqMainWindow::slotURLEntered( const QString &text, int state )
if (state & ControlButton || state & AltButton)
{
- m_combo->setURL( m_currentView ? m_currentView->url().prettyURL() : QString::null );
+ m_combo->setURL( m_currentView ? m_currentView->url().prettyURL() : TQString::null );
openFilteredURL( text.stripWhiteSpace(), true );
}
else
@@ -2578,12 +2578,12 @@ void KonqMainWindow::slotSplitViewVertical()
void KonqMainWindow::slotAddTab()
{
- KonqView* newView = m_pViewManager->addTab(QString("text/html"), // this is what about:blank will use anyway
- QString::null,
+ KonqView* newView = m_pViewManager->addTab(TQString("text/html"), // this is what about:blank will use anyway
+ TQString::null,
false,
KonqSettings::openAfterCurrentPage());
if (newView == 0L) return;
- openURL( newView, KURL("about:blank"),QString::null);
+ openURL( newView, KURL("about:blank"),TQString::null);
m_pViewManager->showTab( newView );
focusLocationBar();
m_pWorkingTab = 0L;
@@ -2603,7 +2603,7 @@ void KonqMainWindow::slotBreakOffTab()
{
if (m_currentView && m_currentView->part() &&
(m_currentView->part()->metaObject()->findProperty("modified") != -1) ) {
- QVariant prop = m_currentView->part()->property("modified");
+ TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
i18n("This tab contains changes that have not been submitted.\nDetaching the tab will discard these changes."),
@@ -2620,7 +2620,7 @@ void KonqMainWindow::slotBreakOffTabPopup()
KonqView* originalView = m_currentView;
KonqView *view = m_pWorkingTab->activeChildView();
if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) {
- QVariant prop = view->part()->property("modified");
+ TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
if ( KMessageBox::warningContinueCancel( this,
@@ -2636,7 +2636,7 @@ void KonqMainWindow::slotBreakOffTabPopup()
//Can't do this safely here as the tabbar may disappear and we're
//hanging off here.
- QTimer::singleShot(0, this, SLOT( slotBreakOffTabPopupDelayed() ) );
+ TQTimer::singleShot(0, this, TQT_SLOT( slotBreakOffTabPopupDelayed() ) );
}
void KonqMainWindow::slotBreakOffTabPopupDelayed()
@@ -2701,7 +2701,7 @@ void KonqMainWindow::popupNewTab(bool infront, bool openAfterCurrentPage)
{
req.newTabInFront = true;
}
- openURL( 0L, (*it)->url(), QString::null, req );
+ openURL( 0L, (*it)->url(), TQString::null, req );
}
}
@@ -2714,7 +2714,7 @@ void KonqMainWindow::openMultiURL( KURL::List url )
KonqView* newView = m_pViewManager->addTab();
Q_ASSERT( newView );
if (newView == 0L) continue;
- openURL( newView, *it,QString::null);
+ openURL( newView, *it,TQString::null);
m_pViewManager->showTab( newView );
focusLocationBar();
m_pWorkingTab = 0L;
@@ -2725,7 +2725,7 @@ void KonqMainWindow::slotRemoveView()
{
if (m_currentView && m_currentView->part() &&
(m_currentView->part()->metaObject()->findProperty("modified") != -1) ) {
- QVariant prop = m_currentView->part()->property("modified");
+ TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
i18n("This view contains changes that have not been submitted.\nClosing the view will discard these changes."),
@@ -2741,7 +2741,7 @@ void KonqMainWindow::slotRemoveTab()
{
if (m_currentView && m_currentView->part() &&
(m_currentView->part()->metaObject()->findProperty("modified") != -1) ) {
- QVariant prop = m_currentView->part()->property("modified");
+ TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
i18n("This tab contains changes that have not been submitted.\nClosing the tab will discard these changes."),
@@ -2757,7 +2757,7 @@ void KonqMainWindow::slotRemoveTabPopup()
KonqView *originalView = m_currentView;
KonqView *view = m_pWorkingTab->activeChildView();
if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) {
- QVariant prop = view->part()->property("modified");
+ TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
if ( KMessageBox::warningContinueCancel( this,
@@ -2772,7 +2772,7 @@ void KonqMainWindow::slotRemoveTabPopup()
}
//Can't do immediately - may kill the tabbar, and we're in an event path down from it
- QTimer::singleShot( 0, this, SLOT( slotRemoveTabPopupDelayed() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotRemoveTabPopupDelayed() ) );
}
void KonqMainWindow::slotRemoveTabPopupDelayed()
@@ -2794,7 +2794,7 @@ void KonqMainWindow::slotRemoveOtherTabsPopup()
for (; it != end; ++it ) {
KonqView *view = it.data();
if ( view != originalView && view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) {
- QVariant prop = view->part()->property("modified");
+ TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
if ( KMessageBox::warningContinueCancel( this,
@@ -2810,7 +2810,7 @@ void KonqMainWindow::slotRemoveOtherTabsPopup()
m_pViewManager->showTab( originalView );
//Can't do immediately - kills the tabbar, and we're in an event path down from it
- QTimer::singleShot( 0, this, SLOT( slotRemoveOtherTabsPopupDelayed() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotRemoveOtherTabsPopupDelayed() ) );
}
void KonqMainWindow::slotRemoveOtherTabsPopupDelayed()
@@ -2827,7 +2827,7 @@ void KonqMainWindow::slotReloadAllTabs()
for (; it != end; ++it ) {
KonqView *view = it.data();
if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) {
- QVariant prop = view->part()->property("modified");
+ TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
if ( KMessageBox::warningContinueCancel( this,
@@ -2859,7 +2859,7 @@ void KonqMainWindow::slotActivatePrevTab()
void KonqMainWindow::slotActivateTab()
{
- m_pViewManager->activateTab( QString( sender()->name() ).right( 2 ).toInt() -1 );
+ m_pViewManager->activateTab( TQString( sender()->name() ).right( 2 ).toInt() -1 );
}
void KonqMainWindow::slotDumpDebugInfo()
@@ -2890,7 +2890,7 @@ void KonqMainWindow::slotRemoveLocalProperties()
u.addPath(".directory");
if ( u.isLocalFile() )
{
- QFile f( u.path() );
+ TQFile f( u.path() );
if ( f.open(IO_ReadWrite) )
{
f.close();
@@ -2902,16 +2902,16 @@ void KonqMainWindow::slotRemoveLocalProperties()
slotReload();
} else
{
- Q_ASSERT( QFile::exists(u.path()) ); // The action shouldn't be enabled, otherwise.
+ Q_ASSERT( TQFile::exists(u.path()) ); // The action shouldn't be enabled, otherwise.
KMessageBox::sorry( this, i18n("No permissions to write to %1").arg(u.path()) );
}
}
}
-bool KonqMainWindow::askForTarget(const QString& text, KURL& url)
+bool KonqMainWindow::askForTarget(const TQString& text, KURL& url)
{
const KURL initialUrl = (viewCount()==2) ? otherView(m_currentView)->url() : m_currentView->url();
- QString label = text.arg( m_currentView->url().pathOrURL() );
+ TQString label = text.arg( m_currentView->url().pathOrURL() );
KURLRequesterDlg dlg(initialUrl.pathOrURL(), label, this, "urlrequester", true);
dlg.setCaption(i18n("Enter Target"));
dlg.urlRequester()->setMode( KFile::File | KFile::ExistingOnly | KFile::Directory );
@@ -3014,7 +3014,7 @@ void KonqMainWindow::slotSaveViewProfile()
void KonqMainWindow::slotUpAboutToShow()
{
- QPopupMenu *popup = m_paUp->popupMenu();
+ TQPopupMenu *popup = m_paUp->popupMenu();
popup->clear();
@@ -3042,13 +3042,13 @@ void KonqMainWindow::slotUpAboutToShow()
void KonqMainWindow::slotUp(KAction::ActivationReason, Qt::ButtonState state)
{
m_goState = state;
- QTimer::singleShot( 0, this, SLOT( slotUpDelayed() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) );
}
void KonqMainWindow::slotUp()
{
m_goState = Qt::LeftButton;
- QTimer::singleShot( 0, this, SLOT( slotUpDelayed() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) );
}
void KonqMainWindow::slotUpDelayed()
@@ -3062,7 +3062,7 @@ void KonqMainWindow::slotUpDelayed()
if (m_goState & Qt::ShiftButton)
req.newTabInFront = !req.newTabInFront;
- const QString& url = m_currentView->upURL().url();
+ const TQString& url = m_currentView->upURL().url();
if(m_goState & Qt::ControlButton)
openFilteredURL(url, req );
else if(m_goState & Qt::MidButton)
@@ -3106,7 +3106,7 @@ void KonqMainWindow::slotGoHistoryActivated( int steps, Qt::ButtonState state )
// Only start 1 timer.
m_goBuffer = steps;
m_goState = state;
- QTimer::singleShot( 0, this, SLOT(slotGoHistoryDelayed()));
+ TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistoryDelayed()));
}
}
@@ -3198,10 +3198,10 @@ void KonqMainWindow::initCombo()
m_combo->init( s_pCompletion );
- connect( m_combo, SIGNAL(activated(const QString&,int)),
- this, SLOT(slotURLEntered(const QString&,int)) );
- connect( m_combo, SIGNAL(showPageSecurity()),
- this, SLOT(showPageSecurity()) );
+ connect( m_combo, TQT_SIGNAL(activated(const TQString&,int)),
+ this, TQT_SLOT(slotURLEntered(const TQString&,int)) );
+ connect( m_combo, TQT_SIGNAL(showPageSecurity()),
+ this, TQT_SLOT(showPageSecurity()) );
m_pURLCompletion = new KURLCompletion();
m_pURLCompletion->setCompletionMode( s_pCompletion->completionMode() );
@@ -3210,18 +3210,18 @@ void KonqMainWindow::initCombo()
// We do want completion of user names, right?
//m_pURLCompletion->setReplaceHome( false ); // Leave ~ alone! Will be taken care of by filters!!
- connect( m_combo, SIGNAL(completionModeChanged(KGlobalSettings::Completion)),
- SLOT( slotCompletionModeChanged( KGlobalSettings::Completion )));
- connect( m_combo, SIGNAL( completion( const QString& )),
- SLOT( slotMakeCompletion( const QString& )));
- connect( m_combo, SIGNAL( substringCompletion( const QString& )),
- SLOT( slotSubstringcompletion( const QString& )));
- connect( m_combo, SIGNAL( textRotation( KCompletionBase::KeyBindingType) ),
- SLOT( slotRotation( KCompletionBase::KeyBindingType )));
- connect( m_combo, SIGNAL( cleared() ),
- SLOT ( slotClearHistory() ) );
- connect( m_pURLCompletion, SIGNAL( match(const QString&) ),
- SLOT( slotMatch(const QString&) ));
+ connect( m_combo, TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)),
+ TQT_SLOT( slotCompletionModeChanged( KGlobalSettings::Completion )));
+ connect( m_combo, TQT_SIGNAL( completion( const TQString& )),
+ TQT_SLOT( slotMakeCompletion( const TQString& )));
+ connect( m_combo, TQT_SIGNAL( substringCompletion( const TQString& )),
+ TQT_SLOT( slotSubstringcompletion( const TQString& )));
+ connect( m_combo, TQT_SIGNAL( textRotation( KCompletionBase::KeyBindingType) ),
+ TQT_SLOT( slotRotation( KCompletionBase::KeyBindingType )));
+ connect( m_combo, TQT_SIGNAL( cleared() ),
+ TQT_SLOT ( slotClearHistory() ) );
+ connect( m_pURLCompletion, TQT_SIGNAL( match(const TQString&) ),
+ TQT_SLOT( slotMatch(const TQString&) ));
m_combo->lineEdit()->installEventFilter(this);
@@ -3229,8 +3229,8 @@ void KonqMainWindow::initCombo()
if ( !bookmarkCompletionInitialized )
{
bookmarkCompletionInitialized = true;
- DelayedInitializer *initializer = new DelayedInitializer( QEvent::KeyPress, m_combo->lineEdit() );
- connect( initializer, SIGNAL( initialize() ), this, SLOT( bookmarksIntoCompletion() ) );
+ DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, m_combo->lineEdit() );
+ connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT( bookmarksIntoCompletion() ) );
}
}
@@ -3261,15 +3261,15 @@ void KonqMainWindow::slotCompletionModeChanged( KGlobalSettings::Completion m )
// at first, try to find a completion in the current view, then use the global
// completion (history)
-void KonqMainWindow::slotMakeCompletion( const QString& text )
+void KonqMainWindow::slotMakeCompletion( const TQString& text )
{
if( m_pURLCompletion )
{
m_urlCompletionStarted = true; // flag for slotMatch()
// kdDebug(1202) << "Local Completion object found!" << endl;
- QString completion = m_pURLCompletion->makeCompletion( text );
- m_currentDir = QString::null;
+ TQString completion = m_pURLCompletion->makeCompletion( text );
+ m_currentDir = TQString::null;
if ( completion.isNull() && !m_pURLCompletion->isRunning() )
{
@@ -3296,11 +3296,11 @@ void KonqMainWindow::slotMakeCompletion( const QString& text )
// kdDebug(1202) << "Current dir: " << m_currentDir << " Current text: " << text << endl;
}
-void KonqMainWindow::slotSubstringcompletion( const QString& text )
+void KonqMainWindow::slotSubstringcompletion( const TQString& text )
{
bool filesFirst = currentURL().startsWith( "/" ) ||
currentURL().startsWith( "file:/" );
- QStringList items;
+ TQStringList items;
if ( filesFirst && m_pURLCompletion )
items = m_pURLCompletion->substringCompletion( text );
@@ -3318,7 +3318,7 @@ void KonqMainWindow::slotRotation( KCompletionBase::KeyBindingType type )
bool prev = (type == KCompletionBase::PrevCompletionMatch);
if ( prev || type == KCompletionBase::NextCompletionMatch ) {
- QString completion = prev ? m_pURLCompletion->previousMatch() :
+ TQString completion = prev ? m_pURLCompletion->previousMatch() :
m_pURLCompletion->nextMatch();
if( completion.isNull() ) { // try the history KCompletion object
@@ -3333,7 +3333,7 @@ void KonqMainWindow::slotRotation( KCompletionBase::KeyBindingType type )
}
// Handle match() from m_pURLCompletion
-void KonqMainWindow::slotMatch( const QString &match )
+void KonqMainWindow::slotMatch( const TQString &match )
{
if ( match.isEmpty() ) // this case is handled directly
return;
@@ -3345,7 +3345,7 @@ void KonqMainWindow::slotMatch( const QString &match )
// some special handling necessary for CompletionPopup
if ( m_combo->completionMode() == KGlobalSettings::CompletionPopup ||
m_combo->completionMode() == KGlobalSettings::CompletionPopupAuto ) {
- QStringList items = m_pURLCompletion->allMatches();
+ TQStringList items = m_pURLCompletion->allMatches();
items += historyPopupCompletionItems( m_combo->currentText() );
// items.sort(); // should we?
m_combo->setCompletedItems( items );
@@ -3373,15 +3373,15 @@ void KonqMainWindow::slotClearComboHistory()
m_combo->clearHistory();
}
-bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev)
+bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
{
- if ( ( ev->type()==QEvent::FocusIn || ev->type()==QEvent::FocusOut ) &&
+ if ( ( ev->type()==TQEvent::FocusIn || ev->type()==TQEvent::FocusOut ) &&
m_combo && m_combo->lineEdit() == obj )
{
//kdDebug(1202) << "KonqMainWindow::eventFilter " << obj << " " << obj->className() << " " << obj->name() << endl;
- QFocusEvent * focusEv = static_cast<QFocusEvent*>(ev);
- if (focusEv->reason() == QFocusEvent::Popup)
+ TQFocusEvent * focusEv = static_cast<TQFocusEvent*>(ev);
+ if (focusEv->reason() == TQFocusEvent::Popup)
{
return KParts::MainWindow::eventFilter( obj, ev );
}
@@ -3389,7 +3389,7 @@ bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev)
KParts::BrowserExtension * ext = 0;
if ( m_currentView )
ext = m_currentView->browserExtension();
- QStrList slotNames;
+ TQStrList slotNames;
if (ext)
slotNames = ext->metaObject()->slotNames();
@@ -3399,7 +3399,7 @@ bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev)
//}
- if (ev->type()==QEvent::FocusIn)
+ if (ev->type()==TQEvent::FocusIn)
{
//kdDebug(1202) << "ComboBox got the focus..." << endl;
if (m_bLocationBarConnected)
@@ -3409,31 +3409,31 @@ bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev)
}
m_bLocationBarConnected = true;
- // Workaround for Qt issue: usually, QLineEdit reacts on Ctrl-D,
+ // Workaround for Qt issue: usually, TQLineEdit reacts on Ctrl-D,
// but the duplicate_window action also has Ctrl-D as accel and
// prevents the lineedit from getting this event. IMHO the accel
// should be disabled in favor of the focus-widget.
KAction *duplicate = actionCollection()->action("duplicate_window");
- if ( duplicate->shortcut() == QKeySequence(CTRL+Key_D) )
+ if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) )
duplicate->setEnabled( false );
if (slotNames.contains("cut()"))
- disconnect( m_paCut, SIGNAL( activated() ), ext, SLOT( cut() ) );
+ disconnect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) );
if (slotNames.contains("copy()"))
- disconnect( m_paCopy, SIGNAL( activated() ), ext, SLOT( copy() ) );
+ disconnect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) );
if (slotNames.contains("paste()"))
- disconnect( m_paPaste, SIGNAL( activated() ), ext, SLOT( paste() ) );
+ disconnect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) );
if (slotNames.contains("del()"))
- disconnect( m_paDelete, SIGNAL( activated() ), ext, SLOT( del() ) );
- disconnect( m_paTrash, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
- this, SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) );
+ disconnect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) );
+ disconnect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
+ this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) );
- connect( m_paCut, SIGNAL( activated() ), m_combo->lineEdit(), SLOT( cut() ) );
- connect( m_paCopy, SIGNAL( activated() ), m_combo->lineEdit(), SLOT( copy() ) );
- connect( m_paPaste, SIGNAL( activated() ), m_combo->lineEdit(), SLOT( paste() ) );
- connect( QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(slotClipboardDataChanged()) );
- connect( m_combo->lineEdit(), SIGNAL(textChanged(const QString &)), this, SLOT(slotCheckComboSelection()) );
- connect( m_combo->lineEdit(), SIGNAL(selectionChanged()), this, SLOT(slotCheckComboSelection()) );
+ connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) );
+ connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) );
+ connect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) );
+ connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
+ connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) );
+ connect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) );
m_paTrash->setEnabled(false);
m_paDelete->setEnabled(false);
@@ -3441,7 +3441,7 @@ bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev)
slotClipboardDataChanged();
}
- else if ( ev->type()==QEvent::FocusOut)
+ else if ( ev->type()==TQEvent::FocusOut)
{
//kdDebug(1202) << "ComboBox lost focus..." << endl;
if (!m_bLocationBarConnected)
@@ -3455,26 +3455,26 @@ bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev)
// we use new_window as reference, as it's always in the same state
// as duplicate_window
KAction *duplicate = actionCollection()->action("duplicate_window");
- if ( duplicate->shortcut() == QKeySequence(CTRL+Key_D) )
+ if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) )
duplicate->setEnabled( actionCollection()->action("new_window")->isEnabled() );
if (slotNames.contains("cut()"))
- connect( m_paCut, SIGNAL( activated() ), ext, SLOT( cut() ) );
+ connect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) );
if (slotNames.contains("copy()"))
- connect( m_paCopy, SIGNAL( activated() ), ext, SLOT( copy() ) );
+ connect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) );
if (slotNames.contains("paste()"))
- connect( m_paPaste, SIGNAL( activated() ), ext, SLOT( paste() ) );
+ connect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) );
if (slotNames.contains("del()"))
- connect( m_paDelete, SIGNAL( activated() ), ext, SLOT( del() ) );
- connect( m_paTrash, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
- this, SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) );
+ connect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) );
+ connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
+ this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) );
- disconnect( m_paCut, SIGNAL( activated() ), m_combo->lineEdit(), SLOT( cut() ) );
- disconnect( m_paCopy, SIGNAL( activated() ), m_combo->lineEdit(), SLOT( copy() ) );
- disconnect( m_paPaste, SIGNAL( activated() ), m_combo->lineEdit(), SLOT( paste() ) );
- disconnect( QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(slotClipboardDataChanged()) );
- disconnect( m_combo->lineEdit(), SIGNAL(textChanged(const QString &)), this, SLOT(slotCheckComboSelection()) );
- disconnect( m_combo->lineEdit(), SIGNAL(selectionChanged()), this, SLOT(slotCheckComboSelection()) );
+ disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) );
+ disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) );
+ disconnect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) );
+ disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
+ disconnect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) );
+ disconnect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) );
if ( ext )
{
@@ -3500,7 +3500,7 @@ bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev)
void KonqMainWindow::slotClipboardDataChanged()
{
//kdDebug(1202) << "KonqMainWindow::slotClipboardDataChanged()" << endl;
- QMimeSource *data = QApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
m_paPaste->setEnabled( data->provides( "text/plain" ) );
slotCheckComboSelection();
}
@@ -3520,7 +3520,7 @@ void KonqMainWindow::slotClearLocationBar( KAction::ActivationReason, Qt::Button
m_combo->clearTemporary();
focusLocationBar();
if ( state & Qt::MidButton )
- m_combo->setURL( QApplication::clipboard()->text( QClipboard::Selection ) );
+ m_combo->setURL( TQApplication::clipboard()->text( QClipboard::Selection ) );
}
void KonqMainWindow::slotForceSaveMainWindowSettings()
@@ -3553,7 +3553,7 @@ void KonqMainWindow::slotUpdateFullScreen( bool set )
bool haveFullScreenButton = false;
//Walk over the toolbars and check whether there is a show fullscreen button in any of them
- QPtrListIterator<KToolBar> barIt = toolBarIterator();
+ TQPtrListIterator<KToolBar> barIt = toolBarIterator();
for (; barIt.current(); ++barIt )
{
//Are we plugged here, in a visible toolbar?
@@ -3567,7 +3567,7 @@ void KonqMainWindow::slotUpdateFullScreen( bool set )
if (!haveFullScreenButton)
{
- QPtrList<KAction> lst;
+ TQPtrList<KAction> lst;
lst.append( m_ptaFullScreen );
plugActionList( "fullscreen", lst );
}
@@ -3619,7 +3619,7 @@ void KonqMainWindow::setLocationBarURL( const KURL &url )
setLocationBarURL( url.pathOrURL() );
}
-void KonqMainWindow::setLocationBarURL( const QString &url )
+void KonqMainWindow::setLocationBarURL( const TQString &url )
{
kdDebug(1202) << "KonqMainWindow::setLocationBarURL: url = " << url << endl;
@@ -3643,7 +3643,7 @@ void KonqMainWindow::showPageSecurity()
}
// called via DCOP from KonquerorIface
-void KonqMainWindow::comboAction( int action, const QString& url, const QCString& objId )
+void KonqMainWindow::comboAction( int action, const TQString& url, const TQCString& objId )
{
if (!s_lstViews) // this happens in "konqueror --silent"
return;
@@ -3676,7 +3676,7 @@ void KonqMainWindow::comboAction( int action, const QString& url, const QCString
combo->saveItems();
}
-QString KonqMainWindow::locationBarURL() const
+TQString KonqMainWindow::locationBarURL() const
{
return m_combo->currentText();
}
@@ -3729,77 +3729,77 @@ void KonqMainWindow::initActions()
// File menu
m_pMenuNew = new KNewMenu ( actionCollection(), this, "new_menu" );
- QObject::connect( m_pMenuNew->popupMenu(), SIGNAL(aboutToShow()),
- this, SLOT(slotFileNewAboutToShow()) );
+ TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()),
+ this, TQT_SLOT(slotFileNewAboutToShow()) );
(void) new KAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" );
(void) new KAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" );
- (void) new KAction( i18n( "New &Window" ), "window_new", KStdAccel::shortcut(KStdAccel::New), this, SLOT( slotNewWindow() ), actionCollection(), "new_window" );
- (void) new KAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" );
- (void) new KAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, SLOT( slotSendURL() ), actionCollection(), "sendURL" );
- (void) new KAction( i18n( "S&end File..." ), "mail_generic", 0, this, SLOT( slotSendFile() ), actionCollection(), "sendPage" );
+ (void) new KAction( i18n( "New &Window" ), "window_new", KStdAccel::shortcut(KStdAccel::New), this, TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" );
+ (void) new KAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" );
+ (void) new KAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" );
+ (void) new KAction( i18n( "S&end File..." ), "mail_generic", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" );
if (kapp->authorize("shell_access"))
{
- (void) new KAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" );
+ (void) new KAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" );
}
- (void) new KAction( i18n( "&Open Location..." ), "fileopen", KStdAccel::shortcut(KStdAccel::Open), this, SLOT( slotOpenLocation() ), actionCollection(), "open_location" );
+ (void) new KAction( i18n( "&Open Location..." ), "fileopen", KStdAccel::shortcut(KStdAccel::Open), this, TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" );
- m_paFindFiles = new KToggleAction( i18n( "&Find File..." ), "filefind", KStdAccel::shortcut(KStdAccel::Find), this, SLOT( slotToolFind() ), actionCollection(), "findfile" );
+ m_paFindFiles = new KToggleAction( i18n( "&Find File..." ), "filefind", KStdAccel::shortcut(KStdAccel::Find), this, TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" );
m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" );
- (void) KStdAction::quit( this, SLOT( close() ), actionCollection(), "quit" );
+ (void) KStdAction::quit( this, TQT_SLOT( close() ), actionCollection(), "quit" );
- m_ptaUseHTML = new KToggleAction( i18n( "&Use index.html" ), 0, this, SLOT( slotShowHTML() ), actionCollection(), "usehtml" );
- m_paLockView = new KToggleAction( i18n( "Lock to Current Location"), 0, this, SLOT( slotLockView() ), actionCollection(), "lock" );
- m_paLinkView = new KToggleAction( i18n( "Lin&k View"), 0, this, SLOT( slotLinkView() ), actionCollection(), "link" );
+ m_ptaUseHTML = new KToggleAction( i18n( "&Use index.html" ), 0, this, TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" );
+ m_paLockView = new KToggleAction( i18n( "Lock to Current Location"), 0, this, TQT_SLOT( slotLockView() ), actionCollection(), "lock" );
+ m_paLinkView = new KToggleAction( i18n( "Lin&k View"), 0, this, TQT_SLOT( slotLinkView() ), actionCollection(), "link" );
// Go menu
m_paUp = new KToolBarPopupAction( i18n( "&Up" ), "up", KStdAccel::shortcut(KStdAccel::Up), actionCollection(), "up" );
- connect( m_paUp, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
- SLOT( slotUp(KAction::ActivationReason, Qt::ButtonState) ) );
- connect( m_paUp->popupMenu(), SIGNAL( aboutToShow() ), this, SLOT( slotUpAboutToShow() ) );
- connect( m_paUp->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotUpActivated( int ) ) );
+ connect( m_paUp, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
+ TQT_SLOT( slotUp(KAction::ActivationReason, Qt::ButtonState) ) );
+ connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUpAboutToShow() ) );
+ connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUpActivated( int ) ) );
QPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward();
m_paBack = new KToolBarPopupAction( backForward.first, KStdAccel::shortcut(KStdAccel::Back), 0, "", actionCollection(), "back" );
- connect( m_paBack, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
- SLOT( slotBack(KAction::ActivationReason, Qt::ButtonState) ) );
- connect( m_paBack->popupMenu(), SIGNAL( aboutToShow() ), this, SLOT( slotBackAboutToShow() ) );
- connect( m_paBack->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotBackActivated( int ) ) );
+ connect( m_paBack, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
+ TQT_SLOT( slotBack(KAction::ActivationReason, Qt::ButtonState) ) );
+ connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotBackAboutToShow() ) );
+ connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotBackActivated( int ) ) );
m_paForward = new KToolBarPopupAction( backForward.second, KStdAccel::shortcut(KStdAccel::Forward), 0, "", actionCollection(), "forward" );
- connect( m_paForward, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
- SLOT( slotForward(KAction::ActivationReason, Qt::ButtonState) ) );
- connect( m_paForward->popupMenu(), SIGNAL( aboutToShow() ), this, SLOT( slotForwardAboutToShow() ) );
- connect( m_paForward->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotForwardActivated( int ) ) );
+ connect( m_paForward, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
+ TQT_SLOT( slotForward(KAction::ActivationReason, Qt::ButtonState) ) );
+ connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotForwardAboutToShow() ) );
+ connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotForwardActivated( int ) ) );
m_paHistory = new KonqBidiHistoryAction( i18n("History"), actionCollection(), "history" );
- connect( m_paHistory, SIGNAL( menuAboutToShow() ), this, SLOT( slotGoMenuAboutToShow() ) );
- connect( m_paHistory, SIGNAL( activated( int ) ), this, SLOT( slotGoHistoryActivated( int ) ) );
+ connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), this, TQT_SLOT( slotGoMenuAboutToShow() ) );
+ connect( m_paHistory, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotGoHistoryActivated( int ) ) );
m_paHome = new KAction( i18n( "Home" ), "gohome", KStdAccel::shortcut(KStdAccel::Home), actionCollection(), "home" );
- connect( m_paHome, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
- SLOT( slotHome(KAction::ActivationReason, Qt::ButtonState) ) );
-
- (void) new KAction( i18n( "S&ystem" ), "system", 0, this, SLOT( slotGoSystem() ), actionCollection(), "go_system" );
- (void) new KAction( i18n( "App&lications" ), "kmenu", 0, this, SLOT( slotGoApplications() ), actionCollection(), "go_applications" );
- (void) new KAction( i18n( "&Storage Media" ), "system", 0, this, SLOT( slotGoMedia() ), actionCollection(), "go_media" );
- (void) new KAction( i18n( "&Network Folders" ), "network", 0, this, SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" );
- (void) new KAction( i18n( "Sett&ings" ), "kcontrol", 0, this, SLOT( slotGoSettings() ), actionCollection(), "go_settings" );
- //(void) new KAction( i18n( "Sidebar Configuration" ), 0, this, SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" );
- (void) new KAction( i18n( "Trash" ), "trashcan_full", 0, this, SLOT( slotGoTrash() ), actionCollection(), "go_trash" );
- (void) new KAction( i18n( "Autostart" ), 0, this, SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" );
+ connect( m_paHome, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
+ TQT_SLOT( slotHome(KAction::ActivationReason, Qt::ButtonState) ) );
+
+ (void) new KAction( i18n( "S&ystem" ), "system", 0, this, TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" );
+ (void) new KAction( i18n( "App&lications" ), "kmenu", 0, this, TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" );
+ (void) new KAction( i18n( "&Storage Media" ), "system", 0, this, TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" );
+ (void) new KAction( i18n( "&Network Folders" ), "network", 0, this, TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" );
+ (void) new KAction( i18n( "Sett&ings" ), "kcontrol", 0, this, TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" );
+ //(void) new KAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" );
+ (void) new KAction( i18n( "Trash" ), "trashcan_full", 0, this, TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" );
+ (void) new KAction( i18n( "Autostart" ), 0, this, TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" );
KonqMostOftenURLSAction *mostOften = new KonqMostOftenURLSAction( i18n("Most Often Visited"), actionCollection(), "go_most_often" );
- connect( mostOften, SIGNAL( activated( const KURL& )),
- SLOT( slotOpenURL( const KURL& )));
- (void) new KAction( i18n( "History" ), "history", 0, this, SLOT( slotGoHistory() ), actionCollection(), "go_history" );
+ connect( mostOften, TQT_SIGNAL( activated( const KURL& )),
+ TQT_SLOT( slotOpenURL( const KURL& )));
+ (void) new KAction( i18n( "History" ), "history", 0, this, TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" );
// Settings menu
- m_paSaveViewProfile = new KAction( i18n( "&Save View Profile..." ), 0, this, SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" );
- m_paSaveViewPropertiesLocally = new KToggleAction( i18n( "Save View Changes per &Folder" ), 0, this, SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" );
+ m_paSaveViewProfile = new KAction( i18n( "&Save View Profile..." ), 0, this, TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" );
+ m_paSaveViewPropertiesLocally = new KToggleAction( i18n( "Save View Changes per &Folder" ), 0, this, TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" );
// "Remove" ? "Reset" ? The former is more correct, the latter is more kcontrol-like...
- m_paRemoveLocalProperties = new KAction( i18n( "Remove Folder Properties" ), 0, this, SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" );
+ m_paRemoveLocalProperties = new KAction( i18n( "Remove Folder Properties" ), 0, this, TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" );
m_configureModules << "kde-filebehavior.desktop" << "kde-fileappearance.desktop" <<
@@ -3814,41 +3814,41 @@ void KonqMainWindow::initActions()
if (!kapp->authorizeControlModules(configModules()).isEmpty())
- KStdAction::preferences (this, SLOT (slotConfigure()), actionCollection() );
+ KStdAction::preferences (this, TQT_SLOT (slotConfigure()), actionCollection() );
- KStdAction::keyBindings( guiFactory(), SLOT( configureShortcuts() ), actionCollection() );
- KStdAction::configureToolbars( this, SLOT( slotConfigureToolbars() ), actionCollection() );
+ KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
+ KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
- m_paConfigureExtensions = new KAction( i18n("Configure Extensions..."), 0, this, SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions");
- m_paConfigureSpellChecking = new KAction( i18n("Configure Spell Checking..."), "spellcheck", 0,this, SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck");
+ m_paConfigureExtensions = new KAction( i18n("Configure Extensions..."), 0, this, TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions");
+ m_paConfigureSpellChecking = new KAction( i18n("Configure Spell Checking..."), "spellcheck", 0,this, TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck");
// Window menu
- m_paSplitViewHor = new KAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, this, SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" );
- m_paSplitViewVer = new KAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, this, SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" );
- m_paAddTab = new KAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, SLOT( slotAddTab() ), actionCollection(), "newtab" );
- m_paDuplicateTab = new KAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, this, SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" );
- m_paBreakOffTab = new KAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, this, SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" );
- m_paRemoveView = new KAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, this, SLOT( slotRemoveView() ), actionCollection(), "removeview" );
- m_paRemoveTab = new KAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, this, SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" );
- m_paRemoveOtherTabs = new KAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, this, SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" );
-
- m_paActivateNextTab = new KAction( i18n( "Activate Next Tab" ), "tab_next", QApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(), this, SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" );
- m_paActivatePrevTab = new KAction( i18n( "Activate Previous Tab" ), "tab_previous", QApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(), this, SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" );
-
- QCString actionname;
+ m_paSplitViewHor = new KAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, this, TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" );
+ m_paSplitViewVer = new KAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, this, TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" );
+ m_paAddTab = new KAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" );
+ m_paDuplicateTab = new KAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, this, TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" );
+ m_paBreakOffTab = new KAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, this, TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" );
+ m_paRemoveView = new KAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, this, TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" );
+ m_paRemoveTab = new KAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, this, TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" );
+ m_paRemoveOtherTabs = new KAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, this, TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" );
+
+ m_paActivateNextTab = new KAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(), this, TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" );
+ m_paActivatePrevTab = new KAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(), this, TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" );
+
+ TQCString actionname;
for (int i=1;i<13;i++) {
actionname.sprintf("activate_tab_%02d", i);
- new KAction(i18n("Activate Tab %1").arg(i), 0, this, SLOT(slotActivateTab()), actionCollection(), actionname);
+ new KAction(i18n("Activate Tab %1").arg(i), 0, this, TQT_SLOT(slotActivateTab()), actionCollection(), actionname);
}
- m_paMoveTabLeft = new KAction( i18n("Move Tab Left"), 0 , CTRL+SHIFT+Key_Left,this, SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left");
- m_paMoveTabRight = new KAction( i18n("Move Tab Right"), 0 , CTRL+SHIFT+Key_Right,this, SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right");
+ m_paMoveTabLeft = new KAction( i18n("Move Tab Left"), 0 , CTRL+SHIFT+Key_Left,this, TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left");
+ m_paMoveTabRight = new KAction( i18n("Move Tab Right"), 0 , CTRL+SHIFT+Key_Right,this, TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right");
#ifndef NDEBUG
- (void) new KAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, this, SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" );
+ (void) new KAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, this, TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" );
#endif
- m_paSaveRemoveViewProfile = new KAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" );
+ m_paSaveRemoveViewProfile = new KAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQT_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" );
m_pamLoadViewProfile = new KActionMenu( i18n( "Load &View Profile" ), actionCollection(), "loadviewprofile" );
m_pViewManager->setProfiles( m_pamLoadViewProfile );
@@ -3857,19 +3857,19 @@ void KonqMainWindow::initActions()
KShortcut fullScreenShortcut = m_ptaFullScreen->shortcut();
fullScreenShortcut.append( KKey( Key_F11 ) );
m_ptaFullScreen->setShortcut( fullScreenShortcut );
- connect( m_ptaFullScreen, SIGNAL( toggled( bool )), this, SLOT( slotUpdateFullScreen( bool )));
+ connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool )));
KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload);
reloadShortcut.append(KKey(CTRL + Key_R));
- m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, SLOT( slotReload() ), actionCollection(), "reload" );
- m_paReloadAllTabs = new KAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );
+ m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReload() ), actionCollection(), "reload" );
+ m_paReloadAllTabs = new KAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );
- m_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, this, SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );
+ m_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );
- m_paUndo = KStdAction::undo( KonqUndoManager::self(), SLOT( undo() ), actionCollection(), "undo" );
+ m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" );
//m_paUndo->setEnabled( KonqUndoManager::self()->undoAvailable() );
- connect( KonqUndoManager::self(), SIGNAL( undoTextChanged( const QString & ) ),
- m_paUndo, SLOT( setText( const QString & ) ) );
+ connect( KonqUndoManager::self(), TQT_SIGNAL( undoTextChanged( const TQString & ) ),
+ m_paUndo, TQT_SLOT( setText( const TQString & ) ) );
// Those are connected to the browserextension directly
m_paCut = KStdAction::cut( 0, 0, actionCollection(), "cut" );
@@ -3879,20 +3879,20 @@ void KonqMainWindow::initActions()
m_paCopy = KStdAction::copy( 0, 0, actionCollection(), "copy" );
m_paPaste = KStdAction::paste( 0, 0, actionCollection(), "paste" );
- m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, this, SLOT( slotStop() ), actionCollection(), "stop" );
+ m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" );
m_paRename = new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, actionCollection(), "rename" );
m_paTrash = new KAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" );
- connect( m_paTrash, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
- this, SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) );
+ connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
+ this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) );
m_paDelete = new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, actionCollection(), "del" );
- m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, this, SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" );
+ m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" );
// Location bar
m_locationLabel = new KonqDraggableLabel( this, i18n("L&ocation: ") );
- (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, this, SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" );
+ (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, this, TQT_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" );
m_locationLabel->setBuddy( m_combo );
KWidgetAction* comboAction = new KWidgetAction( m_combo, i18n( "Location Bar" ), 0,
@@ -3900,14 +3900,14 @@ void KonqMainWindow::initActions()
comboAction->setShortcutConfigurable( false );
comboAction->setAutoSized( true );
- QWhatsThis::add( m_combo, i18n( "Location Bar<p>"
+ TQWhatsThis::add( m_combo, i18n( "Location Bar<p>"
"Enter a web address or search term." ) );
KAction *clearLocation = new KAction( i18n( "Clear Location Bar" ),
- QApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
+ TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
CTRL+Key_L, actionCollection(), "clear_location" );
- connect( clearLocation, SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
- SLOT( slotClearLocationBar( KAction::ActivationReason, Qt::ButtonState ) ) );
+ connect( clearLocation, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
+ TQT_SLOT( slotClearLocationBar( KAction::ActivationReason, Qt::ButtonState ) ) );
clearLocation->setWhatsThis( i18n( "Clear Location bar<p>"
"Clears the content of the location bar." ) );
@@ -3923,21 +3923,21 @@ void KonqMainWindow::initActions()
m_pBookmarkMenu = new KBookmarkMenu( KonqBookmarkManager::self(), m_pBookmarksOwner, m_pamBookmarks->popupMenu(), m_bookmarksActionCollection, true );
connect( m_pBookmarkMenu,
- SIGNAL( aboutToShowContextMenu(const KBookmark &, QPopupMenu*) ),
- this, SLOT( slotFillContextMenu(const KBookmark &, QPopupMenu*) ));
+ TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ),
+ this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) ));
connect( m_pBookmarkMenu,
- SIGNAL( openBookmark(const QString &, Qt::ButtonState) ),
- this, SLOT( slotOpenBookmarkURL(const QString &, Qt::ButtonState) ));
+ TQT_SIGNAL( openBookmark(const TQString &, Qt::ButtonState) ),
+ this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, Qt::ButtonState) ));
KAction *addBookmark = actionCollection()->action("add_bookmark");
if (addBookmark)
addBookmark->setText(i18n("Bookmark This Location"));
- m_paShowMenuBar = KStdAction::showMenubar( this, SLOT( slotShowMenuBar() ), actionCollection() );
+ m_paShowMenuBar = KStdAction::showMenubar( this, TQT_SLOT( slotShowMenuBar() ), actionCollection() );
- (void) new KAction( i18n( "Kon&queror Introduction" ), 0, this, SLOT( slotIntro() ), actionCollection(), "konqintro" );
+ (void) new KAction( i18n( "Kon&queror Introduction" ), 0, this, TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" );
- KAction *goUrl = new KAction( i18n( "Go" ), "key_enter", 0, this, SLOT( goURL() ), actionCollection(), "go_url" );
+ KAction *goUrl = new KAction( i18n( "Go" ), "key_enter", 0, this, TQT_SLOT( goURL() ), actionCollection(), "go_url" );
goUrl->setWhatsThis( i18n( "Go<p>"
"Goes to the page that has been entered into the location bar." ) );
@@ -4009,7 +4009,7 @@ void KonqMainWindow::initActions()
m_paLinkView->setToolTip( i18n("Sets the view as 'linked'. A linked view follows folder changes made in other linked views.") );
}
-void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, QPopupMenu * pm )
+void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, TQPopupMenu * pm )
{
kdDebug() << "KonqMainWindow::slotFillContextMenu(bk, pm == " << pm << ")" << endl;
popupItems.clear();
@@ -4017,7 +4017,7 @@ void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, QPopupMenu * pm )
//Set tab_new_x to point to the correct icon based on NewTabsInFront
bool newtabsinfront = KonqSettings::newTabsInFront();
- QString tab_new_x ;
+ TQString tab_new_x ;
if ( newtabsinfront )
tab_new_x = "tab_new" ;
else
@@ -4026,21 +4026,21 @@ void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, QPopupMenu * pm )
if ( bk.isGroup() )
{
KBookmarkGroup grp = bk.toGroup();
- QValueList<KURL> list = grp.groupUrlList();
- QValueList<KURL>::Iterator it = list.begin();
+ TQValueList<KURL> list = grp.groupUrlList();
+ TQValueList<KURL>::Iterator it = list.begin();
for (; it != list.end(); ++it )
- popupItems.append( new KFileItem( (*it), QString::null, KFileItem::Unknown) );
- pm->insertItem( SmallIcon(tab_new_x), i18n( "Open Folder in Tabs" ), this, SLOT( slotPopupNewTabRight() ) );
+ popupItems.append( new KFileItem( (*it), TQString::null, KFileItem::Unknown) );
+ pm->insertItem( SmallIcon(tab_new_x), i18n( "Open Folder in Tabs" ), this, TQT_SLOT( slotPopupNewTabRight() ) );
}
else
{
- popupItems.append( new KFileItem( bk.url(), QString::null, KFileItem::Unknown) );
- pm->insertItem( SmallIcon("window_new"), i18n( "Open in New Window" ), this, SLOT( slotPopupNewWindow() ) );
- pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, SLOT( slotPopupNewTabRight() ) );
+ popupItems.append( new KFileItem( bk.url(), TQString::null, KFileItem::Unknown) );
+ pm->insertItem( SmallIcon("window_new"), i18n( "Open in New Window" ), this, TQT_SLOT( slotPopupNewWindow() ) );
+ pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, TQT_SLOT( slotPopupNewTabRight() ) );
}
}
-void KonqMainWindow::slotOpenBookmarkURL( const QString & url, Qt::ButtonState state)
+void KonqMainWindow::slotOpenBookmarkURL( const TQString & url, Qt::ButtonState state)
{
kdDebug(1202) << "KonqMainWindow::slotOpenBookmarkURL(" << url << ", " << state << ")" << endl;
@@ -4069,7 +4069,7 @@ void KonqMainWindow::slotOpenBookmarkURL( const QString & url, Qt::ButtonState s
void KonqMainWindow::slotMoveTabLeft()
{
- if ( QApplication::reverseLayout() )
+ if ( TQApplication::reverseLayout() )
m_pViewManager->moveTabForward();
else
m_pViewManager->moveTabBackward();
@@ -4077,7 +4077,7 @@ void KonqMainWindow::slotMoveTabLeft()
void KonqMainWindow::slotMoveTabRight()
{
- if ( QApplication::reverseLayout() )
+ if ( TQApplication::reverseLayout() )
m_pViewManager->moveTabBackward();
else
m_pViewManager->moveTabForward();
@@ -4108,8 +4108,8 @@ void KonqMainWindow::updateToolBarActions( bool pendingAction /*=false*/)
m_ptaUseHTML->setEnabled( true );
else if ( m_currentView->serviceTypes().contains( "text/html" ) ) {
// Currently viewing an index.html file via this feature (i.e. url points to a dir)
- QString locPath = KURL( m_currentView->locationBarURL() ).path();
- m_ptaUseHTML->setEnabled( QFileInfo( locPath ).isDir() );
+ TQString locPath = KURL( m_currentView->locationBarURL() ).path();
+ m_ptaUseHTML->setEnabled( TQFileInfo( locPath ).isDir() );
} else
m_ptaUseHTML->setEnabled( false );
}
@@ -4168,11 +4168,11 @@ void KonqMainWindow::updateViewActions()
m_paActivateNextTab->setEnabled( state );
m_paActivatePrevTab->setEnabled( state );
- QPtrList<KonqFrameBase>* childFrameList = tabContainer->childFrameList();
+ TQPtrList<KonqFrameBase>* childFrameList = tabContainer->childFrameList();
m_paMoveTabLeft->setEnabled( currentView() ? currentView()->frame()!=
- (QApplication::reverseLayout() ? childFrameList->last() : childFrameList->first()) : false );
+ (TQApplication::reverseLayout() ? childFrameList->last() : childFrameList->first()) : false );
m_paMoveTabRight->setEnabled( currentView() ? currentView()->frame()!=
- (QApplication::reverseLayout() ? childFrameList->first() : childFrameList->last()) : false );
+ (TQApplication::reverseLayout() ? childFrameList->first() : childFrameList->last()) : false );
}
else
{
@@ -4205,15 +4205,15 @@ void KonqMainWindow::updateViewActions()
{
// F5 is the default key binding for Reload.... a la Windows.
// mc users want F5 for Copy and F6 for move, but I can't make that default.
- m_paCopyFiles = new KAction( i18n("Copy &Files..."), Key_F7, this, SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" );
- m_paMoveFiles = new KAction( i18n("M&ove Files..."), Key_F8, this, SLOT( slotMoveFiles() ), actionCollection(), "movefiles" );
+ m_paCopyFiles = new KAction( i18n("Copy &Files..."), Key_F7, this, TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" );
+ m_paMoveFiles = new KAction( i18n("M&ove Files..."), Key_F8, this, TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" );
// This action doesn't appear in the GUI, it's for the shortcut only.
// KNewMenu takes care of the GUI stuff.
- m_paNewDir = new KAction( i18n("Create Folder..." ), Key_F10, this, SLOT( slotNewDir() ),
+ m_paNewDir = new KAction( i18n("Create Folder..." ), Key_F10, this, TQT_SLOT( slotNewDir() ),
actionCollection(), "konq_create_dir" );
- QPtrList<KAction> lst;
+ TQPtrList<KAction> lst;
lst.append( m_paCopyFiles );
lst.append( m_paMoveFiles );
m_paCopyFiles->setEnabled( false );
@@ -4238,23 +4238,23 @@ void KonqMainWindow::updateViewActions()
}
}
-QString KonqMainWindow::findIndexFile( const QString &dir )
+TQString KonqMainWindow::findIndexFile( const TQString &dir )
{
- QDir d( dir );
+ TQDir d( dir );
- QString f = d.filePath( "index.html", false );
- if ( QFile::exists( f ) )
+ TQString f = d.filePath( "index.html", false );
+ if ( TQFile::exists( f ) )
return f;
f = d.filePath( "index.htm", false );
- if ( QFile::exists( f ) )
+ if ( TQFile::exists( f ) )
return f;
f = d.filePath( "index.HTML", false );
- if ( QFile::exists( f ) )
+ if ( TQFile::exists( f ) )
return f;
- return QString::null;
+ return TQString::null;
}
void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext )
@@ -4264,7 +4264,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext )
KParts::BrowserExtension::ActionSlotMap::ConstIterator it = actionSlotMap->begin();
KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end();
- QStrList slotNames = ext->metaObject()->slotNames();
+ TQStrList slotNames = ext->metaObject()->slotNames();
for ( ; it != itEnd ; ++it )
{
@@ -4276,9 +4276,9 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext )
if ( slotNames.contains( it.key()+"()" ) )
{
if ( it.key() != "trash" )
- connect( act, SIGNAL( activated() ), ext, it.data() /* SLOT(slot name) */ );
+ connect( act, TQT_SIGNAL( activated() ), ext, it.data() /* TQT_SLOT(slot name) */ );
act->setEnabled( ext->isActionEnabled( it.key() ) );
- const QString text = ext->actionText( it.key() );
+ const TQString text = ext->actionText( it.key() );
if ( !text.isEmpty() )
act->setText( text );
// TODO how to re-set the original action text, when switching to a part that didn't call setAction?
@@ -4298,7 +4298,7 @@ void KonqMainWindow::disconnectExtension( KParts::BrowserExtension *ext )
KParts::BrowserExtension::ActionSlotMap::ConstIterator it = actionSlotMap->begin();
KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end();
- QStrList slotNames = ext->metaObject()->slotNames();
+ TQStrList slotNames = ext->metaObject()->slotNames();
for ( ; it != itEnd ; ++it )
{
@@ -4348,7 +4348,7 @@ void KonqMainWindow::enableAction( const char * name, bool enabled )
}
}
-void KonqMainWindow::setActionText( const char * name, const QString& text )
+void KonqMainWindow::setActionText( const char * name, const TQString& text )
{
KAction * act = actionCollection()->action( name );
if (!act)
@@ -4373,13 +4373,13 @@ void KonqMainWindow::enableAllActions( bool enable )
kdDebug(1202) << "KonqMainWindow::enableAllActions " << enable << endl;
KParts::BrowserExtension::ActionSlotMap * actionSlotMap = KParts::BrowserExtension::actionSlotMapPtr();
- QValueList<KAction *> actions = actionCollection()->actions();
- QValueList<KAction *>::Iterator it = actions.begin();
- QValueList<KAction *>::Iterator end = actions.end();
+ TQValueList<KAction *> actions = actionCollection()->actions();
+ TQValueList<KAction *>::Iterator it = actions.begin();
+ TQValueList<KAction *>::Iterator end = actions.end();
for (; it != end; ++it )
{
KAction *act = *it;
- if ( !QString(act->name()).startsWith("options_configure") /* do not touch the configureblah actions */
+ if ( !TQString(act->name()).startsWith("options_configure") /* do not touch the configureblah actions */
&& ( !enable || !actionSlotMap->contains( act->name() ) ) ) /* don't enable BE actions */
act->setEnabled( enable );
}
@@ -4405,7 +4405,7 @@ void KonqMainWindow::enableAllActions( bool enable )
if (m_toggleViewGUIClient)
{
- QPtrList<KAction> actions = m_toggleViewGUIClient->actions();
+ TQPtrList<KAction> actions = m_toggleViewGUIClient->actions();
for ( KAction * it = actions.first(); it ; it = actions.next() )
it->setEnabled( true );
}
@@ -4432,7 +4432,7 @@ void KonqMainWindow::disableActionsNoView()
m_paLinkView->setEnabled( false );
if (m_toggleViewGUIClient)
{
- QPtrList<KAction> actions = m_toggleViewGUIClient->actions();
+ TQPtrList<KAction> actions = m_toggleViewGUIClient->actions();
for ( KAction * it = actions.first(); it ; it = actions.next() )
it->setEnabled( false );
}
@@ -4458,12 +4458,12 @@ void KonqMainWindow::disableActionsNoView()
updateLocalPropsActions();
}
-void KonqExtendedBookmarkOwner::openBookmarkURL( const QString & /*url*/ )
+void KonqExtendedBookmarkOwner::openBookmarkURL( const TQString & /*url*/ )
{
// Do nothing, we catch the signal
}
-void KonqMainWindow::setCaption( const QString &caption )
+void KonqMainWindow::setCaption( const TQString &caption )
{
// KParts sends us empty captions when activating a brand new part
// We can't change it there (in case of apps removing all parts altogether)
@@ -4491,24 +4491,24 @@ void KonqMainWindow::show()
KParts::MainWindow::show();
}
-QString KonqExtendedBookmarkOwner::currentURL() const
+TQString KonqExtendedBookmarkOwner::currentURL() const
{
return m_pKonqMainWindow->currentURL();
}
-QString KonqMainWindow::currentProfile() const
+TQString KonqMainWindow::currentProfile() const
{
return m_pViewManager->currentProfile();
}
-QString KonqMainWindow::currentURL() const
+TQString KonqMainWindow::currentURL() const
{
if ( !m_currentView )
- return QString::null;
- QString url = m_currentView->url().prettyURL();
+ return TQString::null;
+ TQString url = m_currentView->url().prettyURL();
if ( m_currentView->part() && m_currentView->part()->inherits("KonqDirPart") )
{
- QString nameFilter = static_cast<KonqDirPart *>(m_currentView->part())->nameFilter();
+ TQString nameFilter = static_cast<KonqDirPart *>(m_currentView->part())->nameFilter();
if ( !nameFilter.isEmpty() )
{
if (!url.endsWith("/"))
@@ -4527,8 +4527,8 @@ void KonqExtendedBookmarkOwner::slotFillBookmarksList( KExtendedBookmarkOwner::Q
KonqFrameTabs* tabContainer = static_cast<KonqFrameTabs*>(docContainer);
- QPtrList<KonqFrameBase> frameList = *tabContainer->childFrameList();
- QPtrListIterator<KonqFrameBase> it( frameList );
+ TQPtrList<KonqFrameBase> frameList = *tabContainer->childFrameList();
+ TQPtrListIterator<KonqFrameBase> it( frameList );
for ( it.toFirst(); it != 0L; ++it )
{
@@ -4541,22 +4541,22 @@ void KonqExtendedBookmarkOwner::slotFillBookmarksList( KExtendedBookmarkOwner::Q
}
}
-QString KonqExtendedBookmarkOwner::currentTitle() const
+TQString KonqExtendedBookmarkOwner::currentTitle() const
{
return m_pKonqMainWindow->currentTitle();
}
-QString KonqMainWindow::currentTitle() const
+TQString KonqMainWindow::currentTitle() const
{
- return m_currentView ? m_currentView->caption() : QString::null;
+ return m_currentView ? m_currentView->caption() : TQString::null;
}
-void KonqMainWindow::slotPopupMenu( const QPoint &_global, const KURL &url, const QString &_mimeType, mode_t _mode )
+void KonqMainWindow::slotPopupMenu( const TQPoint &_global, const KURL &url, const TQString &_mimeType, mode_t _mode )
{
slotPopupMenu( 0L, _global, url, _mimeType, _mode );
}
-void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KURL &url, const QString &_mimeType, mode_t _mode )
+void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KURL &url, const TQString &_mimeType, mode_t _mode )
{
KFileItem item( url, _mimeType, _mode );
KFileItemList items;
@@ -4564,7 +4564,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
slotPopupMenu( client, _global, items, KParts::URLArgs(), KParts::BrowserExtension::DefaultPopupItems, false ); //BE CAREFUL WITH sender() !
}
-void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KURL &url, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags f, mode_t _mode )
+void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KURL &url, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags f, mode_t _mode )
{
KFileItem item( url, _args.serviceType, _mode );
KFileItemList items;
@@ -4572,22 +4572,22 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
slotPopupMenu( client, _global, items, _args, f, false ); //BE CAREFUL WITH sender() !
}
-void KonqMainWindow::slotPopupMenu( const QPoint &_global, const KFileItemList &_items )
+void KonqMainWindow::slotPopupMenu( const TQPoint &_global, const KFileItemList &_items )
{
slotPopupMenu( 0L, _global, _items );
}
-void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KFileItemList &_items )
+void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KFileItemList &_items )
{
slotPopupMenu( client, _global, _items, KParts::URLArgs(), KParts::BrowserExtension::DefaultPopupItems, true );
}
-void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags _flags )
+void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags _flags )
{
slotPopupMenu( client, _global, _items, _args, _flags, true );
}
-void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags itemFlags, bool showProperties )
+void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags itemFlags, bool showProperties )
{
KonqView * m_oldView = m_currentView;
@@ -4615,7 +4615,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
// This action collection is used to pass actions to KonqPopupMenu.
// It has to be a KActionCollection instead of a KActionPtrList because we need
// the actionStatusText signal...
- KActionCollection popupMenuCollection( (QWidget*)0 );
+ KActionCollection popupMenuCollection( (TQWidget*)0 );
popupMenuCollection.insert( m_paBack );
popupMenuCollection.insert( m_paForward );
popupMenuCollection.insert( m_paUp );
@@ -4632,7 +4632,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
popupMenuCollection.insert( m_paDelete );
// The pasteto action is used when clicking on a dir, to paste into it.
- KAction *actPaste = KStdAction::paste( this, SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" );
+ KAction *actPaste = KStdAction::paste( this, TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" );
actPaste->setEnabled( m_paPaste->isEnabled() );
popupMenuCollection.insert( actPaste );
@@ -4647,11 +4647,11 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
else
{
m_popupURL = KURL();
- m_popupServiceType = QString::null;
+ m_popupServiceType = TQString::null;
}
if ( (_items.count() == 1) && !m_popupServiceType.isEmpty() ) {
- QString currentServiceName = currentView->service()->desktopEntryName();
+ TQString currentServiceName = currentView->service()->desktopEntryName();
// List of services for the "Preview In" submenu.
m_popupEmbeddingServices = KTrader::self()->query(
@@ -4663,7 +4663,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
"and DesktopEntryName != '"+currentServiceName+"' "
// I had an old local dirtree.desktop without lib, no need for invalid entries
"and exist [Library]",
- QString::null );
+ TQString::null );
}
@@ -4705,21 +4705,21 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
if( doTabHandling )
{
if (_args.forcesNewWindow()) {
- actNewWindow = new KAction( i18n( "Open in T&his Window" ), 0, this, SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" );
+ actNewWindow = new KAction( i18n( "Open in T&his Window" ), 0, this, TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" );
actNewWindow->setToolTip( i18n( "Open the document in current window" ) );
}
- actNewWindow = new KAction( i18n( "Open in New &Window" ), "window_new", 0, this, SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" );
+ actNewWindow = new KAction( i18n( "Open in New &Window" ), "window_new", 0, this, TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" );
actNewWindow->setToolTip( i18n( "Open the document in a new window" ) );
//Set tab_new_x to point to the correct icon based on NewTabsInFront
bool newtabsinfront = KonqSettings::newTabsInFront();
- QString tab_new_x ;
+ TQString tab_new_x ;
if ( newtabsinfront )
tab_new_x = "tab_new" ;
else
tab_new_x = "tab_new_bg" ;
- actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
+ actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
actNewTab->setToolTip( i18n( "Open the document in a new tab" ) );
doTabHandling = true;
}
@@ -4733,7 +4733,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
else
kpf |= KonqPopupMenu::IsLink; // HACK
- QGuardedPtr<KonqPopupMenu> pPopupMenu = new KonqPopupMenu(
+ TQGuardedPtr<KonqPopupMenu> pPopupMenu = new KonqPopupMenu(
KonqBookmarkManager::self(), _items,
viewURL,
popupMenuCollection,
@@ -4750,7 +4750,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
// We will need these if we call the newTab slot
popupItems = _items;
popupUrlArgs = _args;
- popupUrlArgs.serviceType = QString::null; // Reset so that Open in New Window/Tab does mimetype detection
+ popupUrlArgs.serviceType = TQString::null; // Reset so that Open in New Window/Tab does mimetype detection
connectActionCollection( pPopupMenu->actionCollection() );
@@ -4763,15 +4763,15 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
if ( be )
{
- QObject::connect( this, SIGNAL(popupItemsDisturbed()), pPopupMenu, SLOT(close()) );
- QObject::connect( be, SIGNAL(itemsRemoved(const KFileItemList &)),
- this, SLOT(slotItemsRemoved(const KFileItemList &)) );
+ TQObject::connect( this, TQT_SIGNAL(popupItemsDisturbed()), pPopupMenu, TQT_SLOT(close()) );
+ TQObject::connect( be, TQT_SIGNAL(itemsRemoved(const KFileItemList &)),
+ this, TQT_SLOT(slotItemsRemoved(const KFileItemList &)) );
}
- QObject::disconnect( m_pMenuNew->popupMenu(), SIGNAL(aboutToShow()),
- this, SLOT(slotFileNewAboutToShow()) );
+ TQObject::disconnect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()),
+ this, TQT_SLOT(slotFileNewAboutToShow()) );
- QGuardedPtr<QObject> guard(this); // #149736
+ TQGuardedPtr<TQObject> guard(this); // #149736
pPopupMenu->exec( _global );
delete pPopupMenu;
@@ -4788,13 +4788,13 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
return;
}
- QObject::connect( m_pMenuNew->popupMenu(), SIGNAL(aboutToShow()),
- this, SLOT(slotFileNewAboutToShow()) );
+ TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()),
+ this, TQT_SLOT(slotFileNewAboutToShow()) );
if ( be )
{
- QObject::disconnect( be, SIGNAL(itemsRemoved(const KFileItemList &)),
- this, SLOT(slotItemsRemoved(const KFileItemList &)) );
+ TQObject::disconnect( be, TQT_SIGNAL(itemsRemoved(const KFileItemList &)),
+ this, TQT_SLOT(slotItemsRemoved(const KFileItemList &)) );
}
delete konqyMenuClient;
@@ -4825,8 +4825,8 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
m_currentView = m_oldView;
}
// Special case: RMB + renaming in sidebar; setFocus would abort editing.
- QWidget* fw = focusWidget();
- if ( !fw || !::qt_cast<QLineEdit*>( fw ) )
+ TQWidget* fw = focusWidget();
+ if ( !fw || !::qt_cast<TQLineEdit*>( fw ) )
m_oldView->part()->widget()->setFocus();
}
}
@@ -4834,7 +4834,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
void KonqMainWindow::slotItemsRemoved( const KFileItemList &items )
{
- QPtrListIterator<KFileItem> it( items );
+ TQPtrListIterator<KFileItem> it( items );
for ( ; it.current(); ++it )
{
if ( popupItems.contains( it.current() ) )
@@ -4847,20 +4847,20 @@ void KonqMainWindow::slotItemsRemoved( const KFileItemList &items )
void KonqMainWindow::slotOpenEmbedded()
{
- QCString name = sender()->name();
+ TQCString name = sender()->name();
m_popupService = m_popupEmbeddingServices[ name.toInt() ]->desktopEntryName();
m_popupEmbeddingServices.clear();
- QTimer::singleShot( 0, this, SLOT( slotOpenEmbeddedDoIt() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotOpenEmbeddedDoIt() ) );
}
void KonqMainWindow::slotOpenEmbeddedDoIt()
{
m_currentView->stop();
m_currentView->setLocationBarURL(m_popupURL);
- m_currentView->setTypedURL(QString::null);
+ m_currentView->setTypedURL(TQString::null);
if ( m_currentView->changeViewMode( m_popupServiceType,
m_popupService ) )
m_currentView->openURL( m_popupURL, m_popupURL.pathOrURL() );
@@ -4912,15 +4912,15 @@ void KonqMainWindow::saveProperties( KConfig *config )
void KonqMainWindow::readProperties( KConfig *config )
{
kdDebug(1202) << "KonqMainWindow::readProperties( KConfig *config )" << endl;
- m_pViewManager->loadViewProfile( *config, QString::null /*no profile name*/ );
+ m_pViewManager->loadViewProfile( *config, TQString::null /*no profile name*/ );
}
-void KonqMainWindow::setInitialFrameName( const QString &name )
+void KonqMainWindow::setInitialFrameName( const TQString &name )
{
m_initialFrameName = name;
}
-void KonqMainWindow::slotActionStatusText( const QString &text )
+void KonqMainWindow::slotActionStatusText( const TQString &text )
{
if ( !m_currentView )
return;
@@ -4963,8 +4963,8 @@ void KonqMainWindow::updateOpenWithActions()
KAction *action = new KAction( i18n( "Open with %1" ).arg( (*it)->name() ), 0, 0, (*it)->desktopEntryName().latin1() );
action->setIcon( (*it)->icon() );
- connect( action, SIGNAL( activated() ),
- this, SLOT( slotOpenWith() ) );
+ connect( action, TQT_SIGNAL( activated() ),
+ this, TQT_SLOT( slotOpenWith() ) );
m_openWithActions.append( action );
}
@@ -4975,11 +4975,11 @@ void KonqMainWindow::updateOpenWithActions()
}
}
-QString KonqMainWindow::viewModeActionKey( KService::Ptr service )
+TQString KonqMainWindow::viewModeActionKey( KService::Ptr service )
{
- QString library = service->library();
+ TQString library = service->library();
// Group all non-builtin views together
- QVariant builtIntoProp = service->property( "X-KDE-BrowserView-Built-Into" );
+ TQVariant builtIntoProp = service->property( "X-KDE-BrowserView-Built-Into" );
if ( !builtIntoProp.isValid() || builtIntoProp.toString() != "konqueror" )
library = "external";
return library;
@@ -4990,7 +4990,7 @@ void KonqMainWindow::updateViewModeActions()
unplugViewModeActions();
if ( m_viewModeMenu )
{
- QPtrListIterator<KRadioAction> it( m_viewModeActions );
+ TQPtrListIterator<KRadioAction> it( m_viewModeActions );
for (; it.current(); ++it )
it.current()->unplugAll();
delete m_viewModeMenu;
@@ -5025,10 +5025,10 @@ void KonqMainWindow::updateViewModeActions()
// treeview, etc.) into to two groups -> icon/list
// Although I wrote this now only of icon/listview it has to work for
// any view, that's why it's so general :)
- QMap<QString,KonqViewModeAction*> groupedServiceMap;
+ TQMap<TQString,KonqViewModeAction*> groupedServiceMap;
// Another temporary map, the preferred service for each library (2 entries in our example)
- QMap<QString,QString> preferredServiceMap;
+ TQMap<TQString,TQString> preferredServiceMap;
KConfig * config = KGlobal::config();
config->setGroup( "ModeToolBarServices" );
@@ -5037,18 +5037,18 @@ void KonqMainWindow::updateViewModeActions()
KTrader::OfferList::ConstIterator end = services.end();
for (; it != end; ++it )
{
- QVariant prop = (*it)->property( "X-KDE-BrowserView-Toggable" );
+ TQVariant prop = (*it)->property( "X-KDE-BrowserView-Toggable" );
if ( prop.isValid() && prop.toBool() ) // No toggable views in view mode
continue;
KRadioAction *action;
- QString itname = (*it)->genericName();
+ TQString itname = (*it)->genericName();
if (itname.isEmpty())
itname = (*it)->name();
- QString icon = (*it)->icon();
- if ( icon != QString::fromLatin1( "unknown" ) )
+ TQString icon = (*it)->icon();
+ if ( icon != TQString::fromLatin1( "unknown" ) )
// we *have* to specify a parent qobject, otherwise the exclusive group stuff doesn't work!(Simon)
action = new KRadioAction( itname, icon, 0, this, (*it)->desktopEntryName().ascii() );
else
@@ -5056,31 +5056,31 @@ void KonqMainWindow::updateViewModeActions()
action->setExclusiveGroup( "KonqMainWindow_ViewModes" );
- connect( action, SIGNAL( toggled( bool ) ),
- this, SLOT( slotViewModeToggle( bool ) ) );
+ connect( action, TQT_SIGNAL( toggled( bool ) ),
+ this, TQT_SLOT( slotViewModeToggle( bool ) ) );
m_viewModeActions.append( action );
action->plug( m_viewModeMenu->popupMenu() );
- const QString library = viewModeActionKey( *it );
+ const TQString library = viewModeActionKey( *it );
// look if we already have a KonqViewModeAction (in the toolbar)
// for this component
- QMap<QString,KonqViewModeAction*>::Iterator mapIt = groupedServiceMap.find( library );
+ TQMap<TQString,KonqViewModeAction*>::Iterator mapIt = groupedServiceMap.find( library );
// if we don't have -> create one
if ( mapIt == groupedServiceMap.end() )
{
// default service on this action: the current one (i.e. the first one)
- QString text = itname;
- QString icon = (*it)->icon();
- QCString name = (*it)->desktopEntryName().latin1();
+ TQString text = itname;
+ TQString icon = (*it)->icon();
+ TQCString name = (*it)->desktopEntryName().latin1();
//kdDebug(1202) << " Creating action for " << library << ". Default service " << itname << endl;
// if we previously changed the viewmode (see slotViewModeToggle!)
// then we will want to use the previously used settings (previous as
// in before the actions got deleted)
- QMap<QString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.find( library );
+ TQMap<TQString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.find( library );
if ( serviceIt != m_viewModeToolBarServices.end() )
{
kdDebug(1202) << " Setting action for " << library << " to " << (*serviceIt)->name() << endl;
@@ -5093,7 +5093,7 @@ void KonqMainWindow::updateViewModeActions()
{
// if we don't have it in the map, we should look for a setting
// for this library in the config file.
- QString preferredService = config->readEntry( library );
+ TQString preferredService = config->readEntry( library );
if ( !preferredService.isEmpty() && name != preferredService.latin1() )
{
//kdDebug(1202) << " Inserting into preferredServiceMap(" << library << ") : " << preferredService << endl;
@@ -5111,8 +5111,8 @@ void KonqMainWindow::updateViewModeActions()
tbAction->setChecked( action->isChecked() );
- connect( tbAction, SIGNAL( toggled( bool ) ),
- this, SLOT( slotViewModeToggle( bool ) ) );
+ connect( tbAction, TQT_SIGNAL( toggled( bool ) ),
+ this, TQT_SLOT( slotViewModeToggle( bool ) ) );
m_toolBarViewModeActions.append( tbAction );
@@ -5133,7 +5133,7 @@ void KonqMainWindow::updateViewModeActions()
{
//kdDebug(1202) << " Changing action for " << library << " into service " << (*it)->name() << endl;
- QString mapitname = (*it)->genericName();
+ TQString mapitname = (*it)->genericName();
if (mapitname.isEmpty())
mapitname = (*it)->name();
(*mapIt)->setText( mapitname );
@@ -5150,8 +5150,8 @@ void KonqMainWindow::updateViewModeActions()
// Note that this can happen (map not empty) when a inode/directory view is removed,
// and remains in the KConfig file.
Q_ASSERT( preferredServiceMap.isEmpty() );
- QMap<QString,QString>::Iterator debugIt = preferredServiceMap.begin();
- QMap<QString,QString>::Iterator debugEnd = preferredServiceMap.end();
+ TQMap<TQString,TQString>::Iterator debugIt = preferredServiceMap.begin();
+ TQMap<TQString,TQString>::Iterator debugEnd = preferredServiceMap.end();
for ( ; debugIt != debugEnd ; ++debugIt )
kdDebug(1202) << " STILL IN preferredServiceMap : " << debugIt.key() << " | " << debugIt.data() << endl;
#endif
@@ -5164,8 +5164,8 @@ void KonqMainWindow::updateViewModeActions()
void KonqMainWindow::saveToolBarServicesMap()
{
- QMap<QString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.begin();
- QMap<QString,KService::Ptr>::ConstIterator serviceEnd = m_viewModeToolBarServices.end();
+ TQMap<TQString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.begin();
+ TQMap<TQString,KService::Ptr>::ConstIterator serviceEnd = m_viewModeToolBarServices.end();
KConfig * config = KGlobal::config();
config->setGroup( "ModeToolBarServices" );
for ( ; serviceIt != serviceEnd ; ++serviceIt )
@@ -5175,7 +5175,7 @@ void KonqMainWindow::saveToolBarServicesMap()
void KonqMainWindow::plugViewModeActions()
{
- QPtrList<KAction> lst;
+ TQPtrList<KAction> lst;
lst.append( m_viewModeMenu );
plugActionList( "viewmode", lst );
// display the toolbar viewmode icons only for inode/directory, as here we have dedicated icons
@@ -5206,7 +5206,7 @@ void KonqMainWindow::updateBookmarkBar()
}
-void KonqMainWindow::closeEvent( QCloseEvent *e )
+void KonqMainWindow::closeEvent( TQCloseEvent *e )
{
kdDebug(1202) << "KonqMainWindow::closeEvent begin" << endl;
// This breaks session management (the window is withdrawn in kwin)
@@ -5219,7 +5219,7 @@ void KonqMainWindow::closeEvent( QCloseEvent *e )
if ( tabContainer->count() > 1 )
{
KConfig *config = KGlobal::config();
- KConfigGroupSaver cs( config, QString::fromLatin1("Notification Messages") );
+ KConfigGroupSaver cs( config, TQString::fromLatin1("Notification Messages") );
if ( !config->hasKey( "MultipleTabConfirm" ) )
{
@@ -5258,7 +5258,7 @@ void KonqMainWindow::closeEvent( QCloseEvent *e )
for (; it != end; ++it ) {
KonqView *view = it.data();
if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) {
- QVariant prop = view->part()->property("modified");
+ TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
if ( KMessageBox::warningContinueCancel( this,
@@ -5277,7 +5277,7 @@ void KonqMainWindow::closeEvent( QCloseEvent *e )
else if ( m_currentView && m_currentView->part() &&
(m_currentView->part()->metaObject()->findProperty("modified") != -1) )
{
- QVariant prop = m_currentView->part()->property("modified");
+ TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
i18n("This page contains changes that have not been submitted.\nClosing the window will discard these changes."),
@@ -5300,7 +5300,7 @@ void KonqMainWindow::closeEvent( QCloseEvent *e )
for (; it != end; ++it )
{
if ( (*it)->part() && (*it)->part()->widget() )
- QApplication::sendEvent( (*it)->part()->widget(), e );
+ TQApplication::sendEvent( (*it)->part()->widget(), e );
}
KParts::MainWindow::closeEvent( e );
if( isPreloaded() && !kapp->sessionSaving())
@@ -5317,13 +5317,13 @@ bool KonqMainWindow::queryExit()
return !stayPreloaded();
}
-void KonqMainWindow::setIcon( const QPixmap& pix )
+void KonqMainWindow::setIcon( const TQPixmap& pix )
{
KParts::MainWindow::setIcon( pix );
- QPixmap big = pix;
+ TQPixmap big = pix;
- QString url = m_combo->currentText();
+ TQString url = m_combo->currentText();
if ( !url.isEmpty() )
big = KonqPixmapProvider::self()->pixmapFor( url, KIcon::SizeMedium );
@@ -5338,12 +5338,12 @@ void KonqMainWindow::slotIntro()
void KonqMainWindow::goURL()
{
- QLineEdit *lineEdit = m_combo->lineEdit();
+ TQLineEdit *lineEdit = m_combo->lineEdit();
if ( !lineEdit )
return;
- QKeyEvent event( QEvent::KeyPress, Key_Return, '\n', 0 );
- QApplication::sendEvent( lineEdit, &event );
+ TQKeyEvent event( TQEvent::KeyPress, Key_Return, '\n', 0 );
+ TQApplication::sendEvent( lineEdit, &event );
}
void KonqMainWindow::slotLocationLabelActivated()
@@ -5363,7 +5363,7 @@ KAction *a = m_toggleViewGUIClient->action("konq_sidebartng");
return (a && static_cast<KToggleAction*>(a)->isChecked());
}
-void KonqMainWindow::slotAddWebSideBar(const KURL& url, const QString& name)
+void KonqMainWindow::slotAddWebSideBar(const KURL& url, const TQString& name)
{
if (url.url().isEmpty() && name.isEmpty())
return;
@@ -5404,8 +5404,8 @@ void KonqMainWindow::slotAddWebSideBar(const KURL& url, const QString& name)
void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group )
{
- static const QString& http = KGlobal::staticQString( "http" );
- static const QString& ftp = KGlobal::staticQString( "ftp" );
+ static const TQString& http = KGlobal::staticQString( "http" );
+ static const TQString& ftp = KGlobal::staticQString( "ftp" );
if ( group.isNull() )
return;
@@ -5421,7 +5421,7 @@ void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group )
if ( !url.isValid() )
continue;
- QString u = url.prettyURL();
+ TQString u = url.prettyURL();
s_pCompletion->addItem( u );
if ( url.isLocalFile() )
@@ -5436,18 +5436,18 @@ void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group )
void KonqMainWindow::connectActionCollection( KActionCollection *coll )
{
- connect( coll, SIGNAL( actionStatusText( const QString & ) ),
- this, SLOT( slotActionStatusText( const QString & ) ) );
- connect( coll, SIGNAL( clearStatusText() ),
- this, SLOT( slotClearStatusText() ) );
+ connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ),
+ this, TQT_SLOT( slotActionStatusText( const TQString & ) ) );
+ connect( coll, TQT_SIGNAL( clearStatusText() ),
+ this, TQT_SLOT( slotClearStatusText() ) );
}
void KonqMainWindow::disconnectActionCollection( KActionCollection *coll )
{
- disconnect( coll, SIGNAL( actionStatusText( const QString & ) ),
- this, SLOT( slotActionStatusText( const QString & ) ) );
- disconnect( coll, SIGNAL( clearStatusText() ),
- this, SLOT( slotClearStatusText() ) );
+ disconnect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ),
+ this, TQT_SLOT( slotActionStatusText( const TQString & ) ) );
+ disconnect( coll, TQT_SIGNAL( clearStatusText() ),
+ this, TQT_SLOT( slotClearStatusText() ) );
}
//
@@ -5456,16 +5456,16 @@ void KonqMainWindow::disconnectActionCollection( KActionCollection *coll )
// prepend http://www. or http:// if there's no protocol in 's'
// used only when there are no completion matches
-static QString hp_tryPrepend( const QString& s )
+static TQString hp_tryPrepend( const TQString& s )
{
if( s.isEmpty() || s[ 0 ] == '/' )
- return QString::null;
+ return TQString::null;
for( unsigned int pos = 0;
pos < s.length() - 2; // 4 = ://x
++pos )
{
if( s[ pos ] == ':' && s[ pos + 1 ] == '/' && s[ pos + 2 ] == '/' )
- return QString::null;
+ return TQString::null;
if( !s[ pos ].isLetter() )
break;
}
@@ -5473,7 +5473,7 @@ static QString hp_tryPrepend( const QString& s )
}
-static void hp_removeDupe( KCompletionMatches& l, const QString& dupe,
+static void hp_removeDupe( KCompletionMatches& l, const TQString& dupe,
KCompletionMatches::Iterator it_orig )
{
for( KCompletionMatches::Iterator it = l.begin();
@@ -5497,15 +5497,15 @@ static void hp_removeDupe( KCompletionMatches& l, const QString& dupe,
// some duplicates are also created by prepending protocols
static void hp_removeDuplicates( KCompletionMatches& l )
{
- QString http = "http://";
- QString ftp = "ftp://ftp.";
- QString file = "file:";
- QString file2 = "file://";
+ TQString http = "http://";
+ TQString ftp = "ftp://ftp.";
+ TQString file = "file:";
+ TQString file2 = "file://";
l.removeDuplicates();
for( KCompletionMatches::Iterator it = l.begin();
it != l.end();
++it ) {
- QString str = (*it).value();
+ TQString str = (*it).value();
if( str.startsWith( http )) {
if( str.find( '/', 7 ) < 0 ) { // http://something<noslash>
hp_removeDupe( l, str + '/', it );
@@ -5525,7 +5525,7 @@ static void hp_removeDuplicates( KCompletionMatches& l )
}
}
-static void hp_removeCommonPrefix( KCompletionMatches& l, const QString& prefix )
+static void hp_removeCommonPrefix( KCompletionMatches& l, const TQString& prefix )
{
for( KCompletionMatches::Iterator it = l.begin();
it != l.end();
@@ -5540,7 +5540,7 @@ static void hp_removeCommonPrefix( KCompletionMatches& l, const QString& prefix
// don't include common prefixes like 'http://', i.e. when s == 'h', include
// http://hotmail.com but don't include everything just starting with 'http://'
-static void hp_checkCommonPrefixes( KCompletionMatches& matches, const QString& s )
+static void hp_checkCommonPrefixes( KCompletionMatches& matches, const TQString& s )
{
static const char* const prefixes[] = {
"http://",
@@ -5556,43 +5556,43 @@ static void hp_checkCommonPrefixes( KCompletionMatches& matches, const QString&
for( const char* const *pos = prefixes;
*pos != NULL;
++pos ) {
- QString prefix = *pos;
+ TQString prefix = *pos;
if( prefix.startsWith( s )) {
hp_removeCommonPrefix( matches, prefix );
}
}
}
-QStringList KonqMainWindow::historyPopupCompletionItems( const QString& s)
+TQStringList KonqMainWindow::historyPopupCompletionItems( const TQString& s)
{
- const QString http = "http://";
- const QString https = "https://";
- const QString www = "http://www.";
- const QString wwws = "https://www.";
- const QString ftp = "ftp://";
- const QString ftpftp = "ftp://ftp.";
- const QString file = "file:"; // without /, because people enter /usr etc.
- const QString file2 = "file://";
+ const TQString http = "http://";
+ const TQString https = "https://";
+ const TQString www = "http://www.";
+ const TQString wwws = "https://www.";
+ const TQString ftp = "ftp://";
+ const TQString ftpftp = "ftp://ftp.";
+ const TQString file = "file:"; // without /, because people enter /usr etc.
+ const TQString file2 = "file://";
if( s.isEmpty())
- return QStringList();
+ return TQStringList();
KCompletionMatches matches= s_pCompletion->allWeightedMatches( s );
hp_checkCommonPrefixes( matches, s );
bool checkDuplicates = false;
if ( !s.startsWith( ftp ) ) {
matches += s_pCompletion->allWeightedMatches( ftp + s );
- if( QString( "ftp." ).startsWith( s ))
+ if( TQString( "ftp." ).startsWith( s ))
hp_removeCommonPrefix( matches, ftpftp );
checkDuplicates = true;
}
if ( !s.startsWith( https ) ) {
matches += s_pCompletion->allWeightedMatches( https + s );
- if( QString( "www." ).startsWith( s ))
+ if( TQString( "www." ).startsWith( s ))
hp_removeCommonPrefix( matches, wwws );
checkDuplicates = true;
}
if ( !s.startsWith( http )) {
matches += s_pCompletion->allWeightedMatches( http + s );
- if( QString( "www." ).startsWith( s ))
+ if( TQString( "www." ).startsWith( s ))
hp_removeCommonPrefix( matches, www );
checkDuplicates = true;
}
@@ -5618,11 +5618,11 @@ QStringList KonqMainWindow::historyPopupCompletionItems( const QString& s)
}
if( checkDuplicates )
hp_removeDuplicates( matches );
- QStringList items = matches.list();
+ TQStringList items = matches.list();
if( items.count() == 0
&& !s.contains( ':' ) && s[ 0 ] != '/' )
{
- QString pre = hp_tryPrepend( s );
+ TQString pre = hp_tryPrepend( s );
if( !pre.isNull())
items += pre;
}
@@ -5665,37 +5665,37 @@ void KonqMainWindow::removeChildFrame( KonqFrameBase * /*frame*/ )
m_pActiveChild = 0L;
}
-void KonqMainWindow::saveConfig( KConfig* config, const QString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) { if( m_pChildFrame ) m_pChildFrame->saveConfig( config, prefix, saveURLs, docContainer, id, depth); }
+void KonqMainWindow::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) { if( m_pChildFrame ) m_pChildFrame->saveConfig( config, prefix, saveURLs, docContainer, id, depth); }
void KonqMainWindow::copyHistory( KonqFrameBase *other ) { if( m_pChildFrame ) m_pChildFrame->copyHistory( other ); }
-void KonqMainWindow::printFrameInfo( const QString &spaces ) { if( m_pChildFrame ) m_pChildFrame->printFrameInfo( spaces ); }
+void KonqMainWindow::printFrameInfo( const TQString &spaces ) { if( m_pChildFrame ) m_pChildFrame->printFrameInfo( spaces ); }
-void KonqMainWindow::reparentFrame( QWidget* /*parent*/,
- const QPoint & /*p*/, bool /*showIt*/ ) { return; }
+void KonqMainWindow::reparentFrame( TQWidget* /*parent*/,
+ const TQPoint & /*p*/, bool /*showIt*/ ) { return; }
KonqFrameContainerBase* KonqMainWindow::parentContainer()const { return 0L; }
void KonqMainWindow::setParentContainer(KonqFrameContainerBase* /*parent*/) { return; }
-void KonqMainWindow::setTitle( const QString &/*title*/ , QWidget* /*sender*/) { return; }
-void KonqMainWindow::setTabIcon( const KURL &/*url*/, QWidget* /*sender*/ ) { return; }
+void KonqMainWindow::setTitle( const TQString &/*title*/ , TQWidget* /*sender*/) { return; }
+void KonqMainWindow::setTabIcon( const KURL &/*url*/, TQWidget* /*sender*/ ) { return; }
-QWidget* KonqMainWindow::widget() { return this; }
+TQWidget* KonqMainWindow::widget() { return this; }
void KonqMainWindow::listViews( ChildViewList *viewList ) { if( m_pChildFrame ) m_pChildFrame->listViews( viewList ); }
-QCString KonqMainWindow::frameType() { return QCString("MainWindow"); }
+TQCString KonqMainWindow::frameType() { return TQCString("MainWindow"); }
KonqFrameBase* KonqMainWindow::childFrame()const { return m_pChildFrame; }
void KonqMainWindow::setActiveChild( KonqFrameBase* /*activeChild*/ ) { return; }
-bool KonqMainWindow::isMimeTypeAssociatedWithSelf( const QString &mimeType )
+bool KonqMainWindow::isMimeTypeAssociatedWithSelf( const TQString &mimeType )
{
return isMimeTypeAssociatedWithSelf( mimeType, KServiceTypeProfile::preferredService( mimeType, "Application" ) );
}
-bool KonqMainWindow::isMimeTypeAssociatedWithSelf( const QString &/*mimeType*/, const KService::Ptr &offer )
+bool KonqMainWindow::isMimeTypeAssociatedWithSelf( const TQString &/*mimeType*/, const KService::Ptr &offer )
{
// Prevention against user stupidity : if the associated app for this mimetype
// is konqueror/kfmclient, then we'll loop forever. So we have to
@@ -5739,7 +5739,7 @@ void KonqMainWindow::resetWindow()
{
char data[ 1 ];
// empty append to get current X timestamp
- QWidget tmp_widget;
+ TQWidget tmp_widget;
XChangeProperty( qt_xdisplay(), tmp_widget.winId(), XA_WM_CLASS, XA_STRING, 8,
PropModeAppend, (unsigned char*) &data, 0 );
XEvent ev;
@@ -5769,14 +5769,14 @@ void KonqMainWindow::resetWindow()
kapp->setTopWidget( this ); // set again the default window icon
}
-bool KonqMainWindow::event( QEvent* e )
+bool KonqMainWindow::event( TQEvent* e )
{
- if( e->type() == QEvent::DeferredDelete )
+ if( e->type() == TQEvent::DeferredDelete )
{
// since the preloading code tries to reuse KonqMainWindow,
// the last window shouldn't be really deleted, but only hidden
// deleting WDestructiveClose windows is done using deleteLater(),
- // so catch QEvent::DefferedDelete and check if this window should stay
+ // so catch TQEvent::DefferedDelete and check if this window should stay
if( stayPreloaded())
{
setWFlags(WDestructiveClose); // was reset before deleteLater()
@@ -5859,10 +5859,10 @@ static int current_memory_usage( int* limit )
{
#ifdef __linux__
// Check whole memory usage - VmSize
- QFile f( QCString().sprintf( "/proc/%i/statm", getpid()));
+ TQFile f( TQCString().sprintf( "/proc/%i/statm", getpid()));
if( f.open( IO_ReadOnly ))
{
- QString line;
+ TQString line;
if( f.readLine( line, 1024 ) > 0 )
{
line = line.stripWhiteSpace();
@@ -5914,7 +5914,7 @@ static int current_memory_usage( int* limit )
void KonqMainWindow::saveWindowSize() const
{
- QString savedGroup = KGlobal::config()->group();
+ TQString savedGroup = KGlobal::config()->group();
KGlobal::config()->setGroup( "KonqMainWindow_Size" );
KParts::MainWindow::saveWindowSize( KGlobal::config() );
@@ -5925,7 +5925,7 @@ void KonqMainWindow::saveWindowSize() const
void KonqMainWindow::restoreWindowSize()
{
- QString savedGroup = KGlobal::config()->group();
+ TQString savedGroup = KGlobal::config()->group();
KGlobal::config()->setGroup( "KonqMainWindow_Size" );
KParts::MainWindow::restoreWindowSize( KGlobal::config() );
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index 3dbba5658..c5f89f654 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -22,10 +22,10 @@
#ifndef __konq_mainwindow_h__
#define __konq_mainwindow_h__
-#include <qmap.h>
-#include <qpoint.h>
-#include <qtimer.h>
-#include <qguardedptr.h>
+#include <tqmap.h>
+#include <tqpoint.h>
+#include <tqtimer.h>
+#include <tqguardedptr.h>
#include <kfileitem.h>
#include "konq_openurlrequest.h"
@@ -91,42 +91,42 @@ class KonqMainWindow : public KParts::MainWindow, public KonqFrameContainerBase
Q_PROPERTY( int viewCount READ viewCount )
Q_PROPERTY( int activeViewsCount READ activeViewsCount )
Q_PROPERTY( int linkableViewsCount READ linkableViewsCount )
- Q_PROPERTY( QString locationBarURL READ locationBarURL )
+ Q_PROPERTY( TQString locationBarURL READ locationBarURL )
Q_PROPERTY( bool fullScreenMode READ fullScreenMode )
- Q_PROPERTY( QString currentTitle READ currentTitle )
- Q_PROPERTY( QString currentURL READ currentURL )
+ Q_PROPERTY( TQString currentTitle READ currentTitle )
+ Q_PROPERTY( TQString currentURL READ currentURL )
Q_PROPERTY( bool isHTMLAllowed READ isHTMLAllowed )
- Q_PROPERTY( QString currentProfile READ currentProfile )
+ Q_PROPERTY( TQString currentProfile READ currentProfile )
public:
enum ComboAction { ComboClear, ComboAdd, ComboRemove };
enum PageSecurity { NotCrypted, Encrypted, Mixed };
- KonqMainWindow( const KURL &initialURL = KURL(), bool openInitialURL = true, const char *name = 0, const QString& xmluiFile="konqueror.rc");
+ KonqMainWindow( const KURL &initialURL = KURL(), bool openInitialURL = true, const char *name = 0, const TQString& xmluiFile="konqueror.rc");
~KonqMainWindow();
/**
* Filters the URL and calls the main openURL method.
*/
- void openFilteredURL( const QString & _url, KonqOpenURLRequest& _req);
+ void openFilteredURL( const TQString & _url, KonqOpenURLRequest& _req);
/**
* Filters the URL and calls the main openURL method.
*/
- void openFilteredURL( const QString &_url, bool inNewTab = false, bool tempFile = false );
+ void openFilteredURL( const TQString &_url, bool inNewTab = false, bool tempFile = false );
/**
* The main openURL method.
*/
void openURL( KonqView * view, const KURL & url,
- const QString &serviceType = QString::null,
+ const TQString &serviceType = TQString::null,
KonqOpenURLRequest & req = KonqOpenURLRequest::null, bool trustedSource = false );
/**
* Called by openURL when it knows the service type (either directly,
* or using KonqRun)
*/
- bool openView( QString serviceType, const KURL &_url, KonqView *childView,
+ bool openView( TQString serviceType, const KURL &_url, KonqView *childView,
KonqOpenURLRequest & req = KonqOpenURLRequest::null );
@@ -137,15 +137,15 @@ public:
KonqViewManager *viewManager() const { return m_pViewManager; }
// Central widget of the mainwindow, never 0L
- QWidget *mainWidget() const;
+ TQWidget *mainWidget() const;
- virtual QWidget *createContainer( QWidget *parent, int index, const QDomElement &element, int &id );
- virtual void removeContainer( QWidget *container, QWidget *parent, QDomElement &element, int id );
+ virtual TQWidget *createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id );
+ virtual void removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id );
virtual void saveProperties( KConfig *config );
virtual void readProperties( KConfig *config );
- void setInitialFrameName( const QString &name );
+ void setInitialFrameName( const TQString &name );
KonqMainWindowIface * dcopObject();
@@ -154,10 +154,10 @@ public:
void insertChildView( KonqView *childView );
void removeChildView( KonqView *childView );
KonqView *childView( KParts::ReadOnlyPart *view );
- KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
+ KonqView *childView( KParts::ReadOnlyPart *callingPart, const TQString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
// dcop idl bug! it can't handle KonqMainWindow *&mainWindow
- static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
+ static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const TQString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
// Total number of views
int viewCount() const { return m_mapViews.count(); }
@@ -171,7 +171,7 @@ public:
// Number of main views (non-toggle non-passive views)
int mainViewsCount() const;
- typedef QMap<KParts::ReadOnlyPart *, KonqView *> MapViews;
+ typedef TQMap<KParts::ReadOnlyPart *, KonqView *> MapViews;
const MapViews & viewMap() const { return m_mapViews; }
@@ -185,10 +185,10 @@ public:
// Only valid if there are one or two views
KonqView * otherView( KonqView * view ) const;
- virtual void customEvent( QCustomEvent *event );
+ virtual void customEvent( TQCustomEvent *event );
/// Overloaded of KMainWindow
- virtual void setCaption( const QString &caption );
+ virtual void setCaption( const TQString &caption );
/**
* Reimplemented for internal reasons. The API is not affected.
@@ -198,7 +198,7 @@ public:
/**
* Change URL displayed in the location bar
*/
- void setLocationBarURL( const QString &url );
+ void setLocationBarURL( const TQString &url );
/**
* Overload for convenience
*/
@@ -206,7 +206,7 @@ public:
/**
* Return URL displayed in the location bar - for KonqViewManager
*/
- QString locationBarURL() const;
+ TQString locationBarURL() const;
void focusLocationBar();
/**
@@ -237,7 +237,7 @@ public:
KToggleAction * linkViewAction()const { return m_paLinkView; }
void enableAction( const char * name, bool enabled );
- void setActionText( const char * name, const QString& text );
+ void setActionText( const char * name, const TQString& text );
/**
* The default settings "allow HTML" - the one used when creating a new view
@@ -247,7 +247,7 @@ public:
bool saveViewPropertiesLocally() const { return m_bSaveViewPropertiesLocally; }
- static QPtrList<KonqMainWindow> *mainWindowList() { return s_lstViews; }
+ static TQPtrList<KonqMainWindow> *mainWindowList() { return s_lstViews; }
// public for konq_guiclients
void viewCountChanged();
@@ -257,8 +257,8 @@ public:
// operates on all combos of all mainwindows of this instance
// up to now adds an entry or clears all entries
- static void comboAction( int action, const QString& url,
- const QCString& objId );
+ static void comboAction( int action, const TQString& url,
+ const TQCString& objId );
#ifndef NDEBUG
void dumpViewList();
@@ -275,25 +275,25 @@ public:
*/
void removeChildFrame( KonqFrameBase * frame );
- void saveConfig( KConfig* config, const QString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
+ void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
void copyHistory( KonqFrameBase *other );
- void printFrameInfo( const QString &spaces );
+ void printFrameInfo( const TQString &spaces );
- void reparentFrame( QWidget* parent,
- const QPoint & p, bool showIt=FALSE );
+ void reparentFrame( TQWidget* parent,
+ const TQPoint & p, bool showIt=FALSE );
KonqFrameContainerBase* parentContainer()const;
void setParentContainer(KonqFrameContainerBase* parent);
- void setTitle( const QString &title , QWidget* sender);
- void setTabIcon( const KURL &url, QWidget* sender );
+ void setTitle( const TQString &title , TQWidget* sender);
+ void setTabIcon( const KURL &url, TQWidget* sender );
- QWidget* widget();
+ TQWidget* widget();
void listViews( ChildViewList *viewList );
- QCString frameType();
+ TQCString frameType();
KonqFrameBase* childFrame()const;
@@ -304,8 +304,8 @@ public:
KonqFrameBase* workingTab()const { return m_pWorkingTab; }
void setWorkingTab( KonqFrameBase* tab ) { m_pWorkingTab = tab; }
- static bool isMimeTypeAssociatedWithSelf( const QString &mimeType );
- static bool isMimeTypeAssociatedWithSelf( const QString &mimeType, const KService::Ptr &offer );
+ static bool isMimeTypeAssociatedWithSelf( const TQString &mimeType );
+ static bool isMimeTypeAssociatedWithSelf( const TQString &mimeType, const KService::Ptr &offer );
void resetWindow();
@@ -316,11 +316,11 @@ public:
void toggleReloadStopButton(bool isStop);
- QString currentTitle() const;
- QString currentURL() const;
- QString currentProfile() const;
+ TQString currentTitle() const;
+ TQString currentURL() const;
+ TQString currentProfile() const;
- QStringList configModules() const;
+ TQStringList configModules() const;
void saveWindowSize() const;
void restoreWindowSize();
@@ -334,19 +334,19 @@ public slots:
void slotCtrlTabPressed();
// for KBookmarkMenu and KBookmarkBar
- void slotFillContextMenu( const KBookmark &, QPopupMenu * );
- void slotOpenBookmarkURL( const QString & url, Qt::ButtonState state );
+ void slotFillContextMenu( const KBookmark &, TQPopupMenu * );
+ void slotOpenBookmarkURL( const TQString & url, Qt::ButtonState state );
- void slotPopupMenu( const QPoint &_global, const KURL &_url, const QString &_mimeType, mode_t mode );
- void slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KURL &_url, const QString &_mimeType, mode_t mode );
- void slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KURL &_url, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags f, mode_t mode );
+ void slotPopupMenu( const TQPoint &_global, const KURL &_url, const TQString &_mimeType, mode_t mode );
+ void slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KURL &_url, const TQString &_mimeType, mode_t mode );
+ void slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KURL &_url, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags f, mode_t mode );
- void slotPopupMenu( const QPoint &_global, const KFileItemList &_items );
- void slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KFileItemList &_items );
- void slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags _flags );
+ void slotPopupMenu( const TQPoint &_global, const KFileItemList &_items );
+ void slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KFileItemList &_items );
+ void slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags _flags );
- void slotPopupMenu( KXMLGUIClient *client, const QPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags f, bool showProperties );
+ void slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KFileItemList &_items, const KParts::URLArgs &_args, KParts::BrowserExtension::PopupFlags f, bool showProperties );
/**
* __NEEEEVER__ call this method directly. It relies on sender() (the part)
@@ -413,12 +413,12 @@ public slots:
void slotClearLocationBar( KAction::ActivationReason reason, Qt::ButtonState state );
// reimplement from KParts::MainWindow
- virtual void slotSetStatusBarText( const QString &text );
+ virtual void slotSetStatusBarText( const TQString &text );
// public for KonqViewManager
void slotPartActivated( KParts::Part *part );
- virtual void setIcon( const QPixmap& );
+ virtual void setIcon( const TQPixmap& );
void slotGoHistoryActivated( int steps );
void slotGoHistoryActivated( int steps, Qt::ButtonState state );
@@ -429,7 +429,7 @@ public slots:
protected slots:
void slotViewCompleted( KonqView * view );
- void slotURLEntered( const QString &text, int );
+ void slotURLEntered( const TQString &text, int );
void slotFileNewAboutToShow();
void slotLocationLabelActivated();
@@ -491,10 +491,10 @@ protected slots:
void slotGoHistoryDelayed();
void slotCompletionModeChanged( KGlobalSettings::Completion );
- void slotMakeCompletion( const QString& );
- void slotSubstringcompletion( const QString& );
+ void slotMakeCompletion( const TQString& );
+ void slotSubstringcompletion( const TQString& );
void slotRotation( KCompletionBase::KeyBindingType );
- void slotMatch( const QString& );
+ void slotMatch( const TQString& );
void slotClearHistory();
void slotClearComboHistory();
@@ -505,7 +505,7 @@ protected slots:
void slotOpenURL( const KURL& );
- void slotActionStatusText( const QString &text );
+ void slotActionStatusText( const TQString &text );
void slotClearStatusText();
void slotFindOpen( KonqDirPart * dirPart );
@@ -513,21 +513,21 @@ protected slots:
void slotIconsChanged();
- virtual bool event( QEvent* );
+ virtual bool event( TQEvent* );
void slotMoveTabLeft();
void slotMoveTabRight();
- void slotAddWebSideBar(const KURL& url, const QString& name);
+ void slotAddWebSideBar(const KURL& url, const TQString& name);
void slotUpdateFullScreen( bool set ); // do not call directly
protected:
- virtual bool eventFilter(QObject*obj,QEvent *ev);
+ virtual bool eventFilter(TQObject*obj,TQEvent *ev);
- void fillHistoryPopup( QPopupMenu *menu, const QPtrList<HistoryEntry> &history );
+ void fillHistoryPopup( TQPopupMenu *menu, const TQPtrList<HistoryEntry> &history );
- bool makeViewsFollow( const KURL & url, const KParts::URLArgs &args, const QString & serviceType,
+ bool makeViewsFollow( const KURL & url, const KParts::URLArgs &args, const TQString & serviceType,
KonqView * senderView );
void applyKonqMainWindowSettings();
@@ -538,10 +538,10 @@ protected:
void updateLocalPropsActions();
- virtual void closeEvent( QCloseEvent * );
+ virtual void closeEvent( TQCloseEvent * );
virtual bool queryExit();
- bool askForTarget(const QString& text, KURL& url);
+ bool askForTarget(const TQString& text, KURL& url);
private slots:
void slotRequesterClicked( KURLRequester * );
@@ -578,7 +578,7 @@ private:
* still no match, then http://www. Due to that, this is only usable for
* popupcompletion and not for manual or auto-completion.
*/
- static QStringList historyPopupCompletionItems( const QString& s = QString::null);
+ static TQStringList historyPopupCompletionItems( const TQString& s = TQString::null);
void startAnimation();
void stopAnimation();
@@ -593,14 +593,14 @@ private:
/**
* Tries to find a index.html (.kde.html) file in the specified directory
*/
- static QString findIndexFile( const QString &directory );
+ static TQString findIndexFile( const TQString &directory );
void connectExtension( KParts::BrowserExtension *ext );
void disconnectExtension( KParts::BrowserExtension *ext );
void plugViewModeActions();
void unplugViewModeActions();
- static QString viewModeActionKey( KService::Ptr service );
+ static TQString viewModeActionKey( KService::Ptr service );
void connectActionCollection( KActionCollection *coll );
void disconnectActionCollection( KActionCollection *coll );
@@ -608,7 +608,7 @@ private:
bool stayPreloaded();
bool checkPreloadResourceUsage();
- QObject* lastFrame( KonqView *view );
+ TQObject* lastFrame( KonqView *view );
KNewMenu * m_pMenuNew;
@@ -693,7 +693,7 @@ private:
MapViews m_mapViews;
- QGuardedPtr<KonqView> m_currentView;
+ TQGuardedPtr<KonqView> m_currentView;
KBookmarkMenu* m_pBookmarkMenu;
KonqExtendedBookmarkOwner *m_pBookmarksOwner;
@@ -710,7 +710,7 @@ private:
KonqRun *m_initialKonqRun;
- QString m_title;
+ TQString m_title;
/**
* @since 3.4
@@ -722,10 +722,10 @@ private:
* the configure dialog.
* @since 3.4
*/
- QStringList m_configureModules;
+ TQStringList m_configureModules;
- QLabel* m_locationLabel;
- QGuardedPtr<KonqCombo> m_combo;
+ TQLabel* m_locationLabel;
+ TQGuardedPtr<KonqCombo> m_combo;
static KConfig *s_comboConfig;
KURLCompletion *m_pURLCompletion;
// just a reference to KonqHistoryManager's completionObject
@@ -734,28 +734,28 @@ private:
ToggleViewGUIClient *m_toggleViewGUIClient;
KTrader::OfferList m_popupEmbeddingServices;
- QString m_popupService;
- QString m_popupServiceType;
+ TQString m_popupService;
+ TQString m_popupServiceType;
KURL m_popupURL;
- QString m_initialFrameName;
+ TQString m_initialFrameName;
- QPtrList<KAction> m_openWithActions;
+ TQPtrList<KAction> m_openWithActions;
KActionMenu *m_viewModeMenu;
- QPtrList<KAction> m_toolBarViewModeActions; // basically holds two KonqViewActions, one of
+ TQPtrList<KAction> m_toolBarViewModeActions; // basically holds two KonqViewActions, one of
// iconview and one for listview
- QPtrList<KRadioAction> m_viewModeActions;
- QMap<QString,KService::Ptr> m_viewModeToolBarServices; // similar to m_toolBarViewModeActions
+ TQPtrList<KRadioAction> m_viewModeActions;
+ TQMap<TQString,KService::Ptr> m_viewModeToolBarServices; // similar to m_toolBarViewModeActions
// it holds a map library name (libkonqiconview/libkonqlistview) ==> service (service for
// iconview, multicolumnview, treeview, etc .)
KonqMainWindowIface * m_dcopObject;
- static QStringList *s_plstAnimatedLogo;
+ static TQStringList *s_plstAnimatedLogo;
- static QPtrList<KonqMainWindow> *s_lstViews;
+ static TQPtrList<KonqMainWindow> *s_lstViews;
- QString m_currentDir; // stores current dir for relative URLs whenever applicable
+ TQString m_currentDir; // stores current dir for relative URLs whenever applicable
bool m_urlCompletionStarted;
@@ -769,7 +769,7 @@ private:
public:
- static QFile *s_crashlog_file;
+ static TQFile *s_crashlog_file;
};
#endif
diff --git a/konqueror/konq_mainwindow_p.h b/konqueror/konq_mainwindow_p.h
index 74b5e6eed..d463ec193 100644
--- a/konqueror/konq_mainwindow_p.h
+++ b/konqueror/konq_mainwindow_p.h
@@ -27,9 +27,9 @@ class KonqExtendedBookmarkOwner : public KExtendedBookmarkOwner
public:
KonqExtendedBookmarkOwner(KonqMainWindow *);
// for KBookmarkOwner
- virtual void openBookmarkURL( const QString & _url );
- virtual QString currentTitle() const;
- virtual QString currentURL() const;
+ virtual void openBookmarkURL( const TQString & _url );
+ virtual TQString currentTitle() const;
+ virtual TQString currentURL() const;
public slots:
// for KExtendedBookmarkOwner
void slotFillBookmarksList( KExtendedBookmarkOwner::QStringPairList & list );
diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc
index 788462098..66aeaba41 100644
--- a/konqueror/konq_misc.cc
+++ b/konqueror/konq_misc.cc
@@ -18,9 +18,9 @@
*/
-#include <qwhatsthis.h>
-#include <qstyle.h>
-#include <qdir.h>
+#include <tqwhatsthis.h>
+#include <tqstyle.h>
+#include <tqdir.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -47,10 +47,10 @@
// Terminates fullscreen-mode for any full-screen window on the current desktop
void KonqMisc::abortFullScreenMode()
{
- QPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
+ TQPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
if ( mainWindows )
{
- QPtrListIterator<KonqMainWindow> it( *mainWindows );
+ TQPtrListIterator<KonqMainWindow> it( *mainWindows );
for (; it.current(); ++it )
{
if ( it.current()->fullScreenMode() )
@@ -64,14 +64,14 @@ void KonqMisc::abortFullScreenMode()
}
// #### this can probably be removed
-KonqMainWindow * KonqMisc::createSimpleWindow( const KURL & _url, const QString &frameName )
+KonqMainWindow * KonqMisc::createSimpleWindow( const KURL & _url, const TQString &frameName )
{
abortFullScreenMode();
// If _url is 0L, open $HOME [this doesn't happen anymore]
KURL url;
if (_url.isEmpty())
- url.setPath(QDir::homeDirPath());
+ url.setPath(TQDir::homeDirPath());
else
url = _url;
@@ -91,28 +91,28 @@ KonqMainWindow * KonqMisc::createSimpleWindow( const KURL & url, const KParts::U
req.args = args;
req.tempFile = tempFile;
KonqMainWindow *win = new KonqMainWindow( KURL(), false );
- win->openURL( 0L, url, QString::null, req );
+ win->openURL( 0L, url, TQString::null, req );
win->show();
return win;
}
-KonqMainWindow * KonqMisc::createNewWindow( const KURL &url, const KParts::URLArgs &args, bool forbidUseHTML, QStringList filesToSelect, bool tempFile, bool openURL )
+KonqMainWindow * KonqMisc::createNewWindow( const KURL &url, const KParts::URLArgs &args, bool forbidUseHTML, TQStringList filesToSelect, bool tempFile, bool openURL )
{
kdDebug() << "KonqMisc::createNewWindow url=" << url << endl;
// For HTTP or html files, use the web browsing profile, otherwise use filemanager profile
- QString profileName = (!(KProtocolInfo::supportsListing(url)) ||
+ TQString profileName = (!(KProtocolInfo::supportsListing(url)) ||
KMimeType::findByURL(url)->name() == "text/html")
? "webbrowsing" : "filemanagement";
- QString profile = locate( "data", QString::fromLatin1("konqueror/profiles/") + profileName );
+ TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName );
return createBrowserWindowFromProfile(profile, profileName,
url, args,
forbidUseHTML, filesToSelect, tempFile, openURL );
}
-KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const QString &path, const QString &filename, const KURL &url, const KParts::URLArgs &args, bool forbidUseHTML, const QStringList& filesToSelect, bool tempFile, bool openURL )
+KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const TQString &path, const TQString &filename, const KURL &url, const KParts::URLArgs &args, bool forbidUseHTML, const TQStringList& filesToSelect, bool tempFile, bool openURL )
{
kdDebug(1202) << "void KonqMisc::createBrowserWindowFromProfile() " << endl;
kdDebug(1202) << "path=" << path << ",filename=" << filename << ",url=" << url.prettyURL() << endl;
@@ -147,7 +147,7 @@ KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const QString &path,
KConfig cfg( path, true );
cfg.setDollarExpansion( true );
cfg.setGroup( "Profile" );
- QString xmluiFile=cfg.readEntry("XMLUIFile","konqueror.rc");
+ TQString xmluiFile=cfg.readEntry("XMLUIFile","konqueror.rc");
mainWindow = new KonqMainWindow( KURL(), false, 0, xmluiFile );
if ( forbidUseHTML )
@@ -173,7 +173,7 @@ KonqMainWindow * KonqMisc::newWindowFromHistory( KonqView* view, int steps )
return 0L;
KonqMainWindow* mainwindow = createNewWindow(he->url, KParts::URLArgs(),
- false, QStringList(), false, /*openURL*/false);
+ false, TQStringList(), false, /*openURL*/false);
if(!mainwindow)
return 0L;
KonqView* newView = mainwindow->currentView();
@@ -187,7 +187,7 @@ KonqMainWindow * KonqMisc::newWindowFromHistory( KonqView* view, int steps )
return mainwindow;
}
-QString KonqMisc::konqFilteredURL( QWidget* parent, const QString& _url, const QString& _path )
+TQString KonqMisc::konqFilteredURL( TQWidget* parent, const TQString& _url, const TQString& _path )
{
if ( !_url.startsWith( "about:" ) ) // Don't filter "about:" URLs
{
@@ -205,7 +205,7 @@ QString KonqMisc::konqFilteredURL( QWidget* parent, const QString& _url, const Q
if( data.uriType() == KURIFilterData::ERROR && !data.errorMsg().isEmpty() )
{
KMessageBox::sorry( parent, i18n( data.errorMsg().utf8() ) );
- return QString::null;
+ return TQString::null;
}
else
return data.uri().url();
@@ -220,56 +220,56 @@ QString KonqMisc::konqFilteredURL( QWidget* parent, const QString& _url, const Q
return _url; // return the original url if it cannot be filtered.
}
-KonqDraggableLabel::KonqDraggableLabel( KonqMainWindow* mw, const QString& text )
- : QLabel( text, 0L, "kde toolbar widget" ) // Use this name for it to be styled!
+KonqDraggableLabel::KonqDraggableLabel( KonqMainWindow* mw, const TQString& text )
+ : TQLabel( text, 0L, "kde toolbar widget" ) // Use this name for it to be styled!
, m_mw(mw)
{
setBackgroundMode( Qt::PaletteButton );
- setAlignment( (QApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) |
+ setAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) |
Qt::AlignVCenter | Qt::ShowPrefix );
setAcceptDrops(true);
adjustSize();
validDrag = false;
}
-void KonqDraggableLabel::mousePressEvent( QMouseEvent * ev )
+void KonqDraggableLabel::mousePressEvent( TQMouseEvent * ev )
{
validDrag = true;
startDragPos = ev->pos();
}
-void KonqDraggableLabel::mouseMoveEvent( QMouseEvent * ev )
+void KonqDraggableLabel::mouseMoveEvent( TQMouseEvent * ev )
{
- if ((startDragPos - ev->pos()).manhattanLength() > QApplication::startDragDistance())
+ if ((startDragPos - ev->pos()).manhattanLength() > TQApplication::startDragDistance())
{
validDrag = false;
if ( m_mw->currentView() )
{
KURL::List lst;
lst.append( m_mw->currentView()->url() );
- QDragObject * drag = new KURLDrag( lst, m_mw );
+ TQDragObject * drag = new KURLDrag( lst, m_mw );
drag->setPixmap( KMimeType::pixmapForURL( lst.first(), 0, KIcon::Small ) );
drag->dragCopy();
}
}
}
-void KonqDraggableLabel::mouseReleaseEvent( QMouseEvent * )
+void KonqDraggableLabel::mouseReleaseEvent( TQMouseEvent * )
{
validDrag = false;
}
-void KonqDraggableLabel::dragEnterEvent( QDragEnterEvent *ev )
+void KonqDraggableLabel::dragEnterEvent( TQDragEnterEvent *ev )
{
if ( KURLDrag::canDecode( ev ) )
ev->acceptAction();
}
-void KonqDraggableLabel::dropEvent( QDropEvent* ev )
+void KonqDraggableLabel::dropEvent( TQDropEvent* ev )
{
_savedLst.clear();
if ( KURLDrag::decode( ev, _savedLst ) ) {
- QTimer::singleShot(0, this, SLOT(delayedOpenURL()));
+ TQTimer::singleShot(0, this, TQT_SLOT(delayedOpenURL()));
}
}
diff --git a/konqueror/konq_misc.h b/konqueror/konq_misc.h
index f3d736b13..9696151e6 100644
--- a/konqueror/konq_misc.h
+++ b/konqueror/konq_misc.h
@@ -54,7 +54,7 @@ public:
/**
* Create a new window with a single view, showing @p url
*/
- static KonqMainWindow * createSimpleWindow( const KURL &url, const QString &frameName = QString::null );
+ static KonqMainWindow * createSimpleWindow( const KURL &url, const TQString &frameName = TQString::null );
/**
* Create a new window with a single view, showing @p url, using @p args
@@ -70,7 +70,7 @@ public:
static KonqMainWindow * createNewWindow( const KURL &url,
const KParts::URLArgs &args = KParts::URLArgs(),
bool forbidUseHTML = false,
- QStringList filesToSelect = QStringList(),
+ TQStringList filesToSelect = TQStringList(),
bool tempFile = false,
bool openURL = true);
@@ -80,12 +80,12 @@ public:
* @param forbidUseHTML internal. True when called by "Find Files"
* @param openURL If false no url is opened
*/
- static KonqMainWindow * createBrowserWindowFromProfile( const QString &path,
- const QString &filename,
+ static KonqMainWindow * createBrowserWindowFromProfile( const TQString &path,
+ const TQString &filename,
const KURL &url = KURL(),
const KParts::URLArgs &args = KParts::URLArgs(),
bool forbidUseHTML = false,
- const QStringList& filesToSelect = QStringList(),
+ const TQStringList& filesToSelect = TQStringList(),
bool tempFile = false,
bool openURL = true);
@@ -103,30 +103,30 @@ public:
* @p _url to be filtered.
* @p _path the absolute path to append to the url before filtering it.
*/
- static QString konqFilteredURL( QWidget* /*parent*/, const QString& /*_url*/, const QString& _path = QString::null );
+ static TQString konqFilteredURL( TQWidget* /*parent*/, const TQString& /*_url*/, const TQString& _path = TQString::null );
};
-#include <qlabel.h>
+#include <tqlabel.h>
class KonqDraggableLabel : public QLabel
{
Q_OBJECT
public:
- KonqDraggableLabel( KonqMainWindow * mw, const QString & text );
+ KonqDraggableLabel( KonqMainWindow * mw, const TQString & text );
protected:
- void mousePressEvent( QMouseEvent * ev );
- void mouseMoveEvent( QMouseEvent * ev );
- void mouseReleaseEvent( QMouseEvent * );
- void dragEnterEvent( QDragEnterEvent *ev );
- void dropEvent( QDropEvent* ev );
+ void mousePressEvent( TQMouseEvent * ev );
+ void mouseMoveEvent( TQMouseEvent * ev );
+ void mouseReleaseEvent( TQMouseEvent * );
+ void dragEnterEvent( TQDragEnterEvent *ev );
+ void dropEvent( TQDropEvent* ev );
private slots:
void delayedOpenURL();
private:
- QPoint startDragPos;
+ TQPoint startDragPos;
bool validDrag;
KonqMainWindow * m_mw;
KURL::List _savedLst;
diff --git a/konqueror/konq_openurlrequest.h b/konqueror/konq_openurlrequest.h
index f3256c81f..dffc0025d 100644
--- a/konqueror/konq_openurlrequest.h
+++ b/konqueror/konq_openurlrequest.h
@@ -1,7 +1,7 @@
#ifndef __konqopenurlrequest_h
#define __konqopenurlrequest_h
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include <kparts/browserextension.h>
@@ -12,14 +12,14 @@ struct KonqOpenURLRequest {
openAfterCurrentPage(false), forceAutoEmbed(false),
tempFile(false), userRequestedReload(false) {}
- KonqOpenURLRequest( const QString & url ) :
+ KonqOpenURLRequest( const TQString & url ) :
typedURL(url), followMode(false), newTab(false), newTabInFront(false),
openAfterCurrentPage(false), forceAutoEmbed(false),
tempFile(false), userRequestedReload(false) {}
- QString debug() const {
+ TQString debug() const {
#ifndef NDEBUG
- QStringList s;
+ TQStringList s;
if ( !args.frameName.isEmpty() )
s << "frameName=" + args.frameName;
if ( !nameFilter.isEmpty() )
@@ -42,12 +42,12 @@ struct KonqOpenURLRequest {
s << "userRequestedReload";
return "[" + s.join(" ") + "]";
#else
- return QString::null;
+ return TQString::null;
#endif
}
- QString typedURL; // empty if URL wasn't typed manually
- QString nameFilter; // like *.cpp, extracted from the URL
+ TQString typedURL; // empty if URL wasn't typed manually
+ TQString nameFilter; // like *.cpp, extracted from the URL
bool followMode; // true if following another view - avoids loops
bool newTab; // open url in new tab
bool newTabInFront; // new tab in front or back
@@ -56,7 +56,7 @@ struct KonqOpenURLRequest {
bool tempFile; // if true, the url should be deleted after use
bool userRequestedReload; // args.reload because the user requested it, not a website
KParts::URLArgs args;
- QStringList filesToSelect; // files to select in a konqdirpart
+ TQStringList filesToSelect; // files to select in a konqdirpart
static KonqOpenURLRequest null;
};
diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc
index a0e103a12..2a3547068 100644
--- a/konqueror/konq_profiledlg.cc
+++ b/konqueror/konq_profiledlg.cc
@@ -21,12 +21,12 @@
#include "konq_viewmgr.h"
#include "konq_settingsxt.h"
-#include <qcheckbox.h>
-#include <qdir.h>
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qheader.h>
-#include <qlineedit.h>
+#include <tqcheckbox.h>
+#include <tqdir.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
+#include <tqheader.h>
+#include <tqlineedit.h>
#include <klistview.h>
#include <kdebug.h>
@@ -42,13 +42,13 @@ KonqProfileMap KonqProfileDlg::readAllProfiles()
{
KonqProfileMap mapProfiles;
- QStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
- QStringList::ConstIterator pIt = profiles.begin();
- QStringList::ConstIterator pEnd = profiles.end();
+ TQStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
+ TQStringList::ConstIterator pIt = profiles.begin();
+ TQStringList::ConstIterator pEnd = profiles.end();
for (; pIt != pEnd; ++pIt )
{
- QFileInfo info( *pIt );
- QString profileName = KIO::decodeFileName( info.baseName() );
+ TQFileInfo info( *pIt );
+ TQString profileName = KIO::decodeFileName( info.baseName() );
KSimpleConfig cfg( *pIt, true );
if ( cfg.hasGroup( "Profile" ) )
{
@@ -63,8 +63,8 @@ KonqProfileMap KonqProfileDlg::readAllProfiles()
return mapProfiles;
}
-KonqProfileItem::KonqProfileItem( KListView *parent, const QString & text )
- : QListViewItem( parent, text ), m_profileName( text )
+KonqProfileItem::KonqProfileItem( KListView *parent, const TQString & text )
+ : TQListViewItem( parent, text ), m_profileName( text )
{
}
@@ -72,7 +72,7 @@ KonqProfileItem::KonqProfileItem( KListView *parent, const QString & text )
#define BTN_DELETE KDialogBase::User2
#define BTN_SAVE KDialogBase::User3
-KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const QString & preselectProfile, QWidget *parent )
+KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & preselectProfile, TQWidget *parent )
: KDialogBase( parent, "konq_profile_dialog", true, i18n( "Profile Management" ),
KDialogBase::Close | BTN_RENAME | BTN_DELETE | BTN_SAVE, BTN_SAVE, true,
KGuiItem( i18n( "&Rename Profile" ) ),
@@ -81,13 +81,13 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const QString & presel
{
m_pViewManager = manager;
- QVBox* box = new QVBox( this );
+ TQVBox* box = new TQVBox( this );
box->setSpacing( KDialog::spacingHint() );
setMainWidget( box );
- QLabel *lblName = new QLabel( i18n( "&Profile name:" ), box );
+ TQLabel *lblName = new TQLabel( i18n( "&Profile name:" ), box );
- m_pProfileNameLineEdit = new QLineEdit( box );
+ m_pProfileNameLineEdit = new TQLineEdit( box );
m_pProfileNameLineEdit->setFocus();
lblName->setBuddy( m_pProfileNameLineEdit );
@@ -100,23 +100,23 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const QString & presel
box->setStretchFactor( m_pListView, 1 );
- connect( m_pListView, SIGNAL( itemRenamed( QListViewItem * ) ),
- SLOT( slotItemRenamed( QListViewItem * ) ) );
+ connect( m_pListView, TQT_SIGNAL( itemRenamed( TQListViewItem * ) ),
+ TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) );
loadAllProfiles( preselectProfile );
m_pListView->setMinimumSize( m_pListView->sizeHint() );
- m_cbSaveURLs = new QCheckBox( i18n("Save &URLs in profile"), box );
+ m_cbSaveURLs = new TQCheckBox( i18n("Save &URLs in profile"), box );
m_cbSaveURLs->setChecked( KonqSettings::saveURLInProfile() );
- m_cbSaveSize = new QCheckBox( i18n("Save &window size in profile"), box );
+ m_cbSaveSize = new TQCheckBox( i18n("Save &window size in profile"), box );
m_cbSaveSize->setChecked( KonqSettings::saveWindowSizeInProfile() );
- connect( m_pListView, SIGNAL( selectionChanged( QListViewItem * ) ),
- this, SLOT( slotSelectionChanged( QListViewItem * ) ) );
+ connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
+ this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
- connect( m_pProfileNameLineEdit, SIGNAL( textChanged( const QString & ) ),
- this, SLOT( slotTextChanged( const QString & ) ) );
+ connect( m_pProfileNameLineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
+ this, TQT_SLOT( slotTextChanged( const TQString & ) ) );
enableButton( BTN_RENAME, m_pListView->selectedItem ()!=0 );
enableButton( BTN_DELETE, m_pListView->selectedItem ()!=0 );
@@ -130,7 +130,7 @@ KonqProfileDlg::~KonqProfileDlg()
KonqSettings::setSaveWindowSizeInProfile( m_cbSaveSize->isChecked() );
}
-void KonqProfileDlg::loadAllProfiles(const QString & preselectProfile)
+void KonqProfileDlg::loadAllProfiles(const TQString & preselectProfile)
{
bool profileFound = false;
m_mapEntries.clear();
@@ -140,8 +140,8 @@ void KonqProfileDlg::loadAllProfiles(const QString & preselectProfile)
KonqProfileMap::ConstIterator eEnd = m_mapEntries.end();
for (; eIt != eEnd; ++eIt )
{
- QListViewItem *item = new KonqProfileItem( m_pListView, eIt.key() );
- QString filename = eIt.data().mid( eIt.data().findRev( '/' ) + 1 );
+ TQListViewItem *item = new KonqProfileItem( m_pListView, eIt.key() );
+ TQString filename = eIt.data().mid( eIt.data().findRev( '/' ) + 1 );
kdDebug(1202) << filename << endl;
if ( filename == preselectProfile )
{
@@ -156,7 +156,7 @@ void KonqProfileDlg::loadAllProfiles(const QString & preselectProfile)
void KonqProfileDlg::slotUser3() // Save button
{
- QString name = KIO::encodeFileName( m_pProfileNameLineEdit->text() ); // in case of '/'
+ TQString name = KIO::encodeFileName( m_pProfileNameLineEdit->text() ); // in case of '/'
// Reuse filename of existing item, if any
if ( m_pListView->selectedItem() )
@@ -164,7 +164,7 @@ void KonqProfileDlg::slotUser3() // Save button
KonqProfileMap::Iterator it = m_mapEntries.find( m_pListView->selectedItem()->text(0) );
if ( it != m_mapEntries.end() )
{
- QFileInfo info( it.data() );
+ TQFileInfo info( it.data() );
name = info.baseName();
}
}
@@ -182,7 +182,7 @@ void KonqProfileDlg::slotUser2() // Delete button
return;
KonqProfileMap::Iterator it = m_mapEntries.find( m_pListView->selectedItem()->text(0) );
- if ( it != m_mapEntries.end() && QFile::remove( it.data() ) )
+ if ( it != m_mapEntries.end() && TQFile::remove( it.data() ) )
loadAllProfiles();
enableButton( BTN_RENAME, m_pListView->selectedItem() != 0 );
@@ -191,18 +191,18 @@ void KonqProfileDlg::slotUser2() // Delete button
void KonqProfileDlg::slotUser1() // Rename button
{
- QListViewItem *item = m_pListView->selectedItem();
+ TQListViewItem *item = m_pListView->selectedItem();
if ( item )
m_pListView->rename( item, 0 );
}
-void KonqProfileDlg::slotItemRenamed( QListViewItem * item )
+void KonqProfileDlg::slotItemRenamed( TQListViewItem * item )
{
KonqProfileItem * profileItem = static_cast<KonqProfileItem *>( item );
- QString newName = profileItem->text(0);
- QString oldName = profileItem->m_profileName;
+ TQString newName = profileItem->text(0);
+ TQString oldName = profileItem->m_profileName;
if (!newName.isEmpty())
{
@@ -210,7 +210,7 @@ void KonqProfileDlg::slotItemRenamed( QListViewItem * item )
if ( it != m_mapEntries.end() )
{
- QString fileName = it.data();
+ TQString fileName = it.data();
KSimpleConfig cfg( fileName );
cfg.setGroup( "Profile" );
cfg.writeEntry( "Name", newName );
@@ -224,19 +224,19 @@ void KonqProfileDlg::slotItemRenamed( QListViewItem * item )
}
}
-void KonqProfileDlg::slotSelectionChanged( QListViewItem * item )
+void KonqProfileDlg::slotSelectionChanged( TQListViewItem * item )
{
- m_pProfileNameLineEdit->setText( item ? item->text(0) : QString::null );
+ m_pProfileNameLineEdit->setText( item ? item->text(0) : TQString::null );
}
-void KonqProfileDlg::slotTextChanged( const QString & text )
+void KonqProfileDlg::slotTextChanged( const TQString & text )
{
enableButton( KDialogBase::User3, !text.isEmpty() );
// If we type the name of a profile, select it in the list
bool itemSelected = false;
- QListViewItem * item;
+ TQListViewItem * item;
for ( item = m_pListView->firstChild() ; item ; item = item->nextSibling() )
if ( item->text(0) == text /*only full text, not partial*/ )
@@ -251,7 +251,7 @@ void KonqProfileDlg::slotTextChanged( const QString & text )
if ( itemSelected )
{
- QFileInfo fi( m_mapEntries[ item->text( 0 ) ] );
+ TQFileInfo fi( m_mapEntries[ item->text( 0 ) ] );
itemSelected = itemSelected && fi.isWritable();
}
diff --git a/konqueror/konq_profiledlg.h b/konqueror/konq_profiledlg.h
index becb8e8fb..a473a7d67 100644
--- a/konqueror/konq_profiledlg.h
+++ b/konqueror/konq_profiledlg.h
@@ -22,8 +22,8 @@
#include <kdialogbase.h>
-#include <qlistview.h>
-#include <qmap.h>
+#include <tqlistview.h>
+#include <tqmap.h>
class KonqViewManager;
class QListViewItem;
@@ -33,22 +33,22 @@ class QLineEdit;
class KPushButton;
class KListView;
-typedef QMap<QString, QString> KonqProfileMap;
+typedef TQMap<TQString, TQString> KonqProfileMap;
class KonqProfileItem : public QListViewItem
{
public:
- KonqProfileItem( KListView *, const QString & );
+ KonqProfileItem( KListView *, const TQString & );
~KonqProfileItem() {}
- QString m_profileName;
+ TQString m_profileName;
};
class KonqProfileDlg : public KDialogBase
{
Q_OBJECT
public:
- KonqProfileDlg( KonqViewManager *manager, const QString &preselectProfile, QWidget *parent = 0L );
+ KonqProfileDlg( KonqViewManager *manager, const TQString &preselectProfile, TQWidget *parent = 0L );
~KonqProfileDlg();
/**
@@ -61,21 +61,21 @@ protected slots:
virtual void slotUser1(); // User1 is "Rename Profile" button
virtual void slotUser2(); // User2 is "Delete Profile" button
virtual void slotUser3(); // User3 is Save button
- void slotTextChanged( const QString & );
- void slotSelectionChanged( QListViewItem * item );
+ void slotTextChanged( const TQString & );
+ void slotSelectionChanged( TQListViewItem * item );
- void slotItemRenamed( QListViewItem * );
+ void slotItemRenamed( TQListViewItem * );
private:
- void loadAllProfiles(const QString & = QString::null);
+ void loadAllProfiles(const TQString & = TQString::null);
KonqViewManager *m_pViewManager;
KonqProfileMap m_mapEntries;
- QLineEdit *m_pProfileNameLineEdit;
+ TQLineEdit *m_pProfileNameLineEdit;
- QCheckBox *m_cbSaveURLs;
- QCheckBox *m_cbSaveSize;
+ TQCheckBox *m_cbSaveURLs;
+ TQCheckBox *m_cbSaveSize;
KListView *m_pListView;
};
diff --git a/konqueror/konq_run.cc b/konqueror/konq_run.cc
index 96256f8c3..fbac4e65c 100644
--- a/konqueror/konq_run.cc
+++ b/konqueror/konq_run.cc
@@ -55,11 +55,11 @@ KonqRun::~KonqRun()
m_pView->setRun(0L);
}
-void KonqRun::foundMimeType( const QString & _type )
+void KonqRun::foundMimeType( const TQString & _type )
{
//kdDebug(1202) << "KonqRun::foundMimeType " << _type << " m_req=" << m_req.debug() << endl;
- QString mimeType = _type; // this ref comes from the job, we lose it when using KIO again
+ TQString mimeType = _type; // this ref comes from the job, we lose it when using KIO again
m_bFoundMimeType = true;
@@ -150,8 +150,8 @@ void KonqRun::init()
// (in case it goes to scanFile, this will be done below)
KIO::StatJob *job = dynamic_cast<KIO::StatJob*>( m_job );
if ( job && !job->error() && m_pView ) {
- connect( job, SIGNAL( infoMessage( KIO::Job*, const QString& ) ),
- m_pView, SLOT( slotInfoMessage(KIO::Job*, const QString& ) ) );
+ connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
+ m_pView, TQT_SLOT( slotInfoMessage(KIO::Job*, const TQString& ) ) );
}
}
@@ -162,11 +162,11 @@ void KonqRun::scanFile()
// BrowserRun changes
KIO::TransferJob *job = dynamic_cast<KIO::TransferJob*>( m_job );
if ( job && !job->error() ) {
- connect( job, SIGNAL( redirection( KIO::Job *, const KURL& )),
- SLOT( slotRedirection( KIO::Job *, const KURL& ) ));
+ connect( job, TQT_SIGNAL( redirection( KIO::Job *, const KURL& )),
+ TQT_SLOT( slotRedirection( KIO::Job *, const KURL& ) ));
if ( m_pView && m_pView->service()->desktopEntryName() != "konq_sidebartng") {
- connect( job, SIGNAL( infoMessage( KIO::Job*, const QString& ) ),
- m_pView, SLOT( slotInfoMessage(KIO::Job*, const QString& ) ) );
+ connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
+ m_pView, TQT_SLOT( slotInfoMessage(KIO::Job*, const TQString& ) ) );
}
}
}
diff --git a/konqueror/konq_run.h b/konqueror/konq_run.h
index 50a393435..4084584a7 100644
--- a/konqueror/konq_run.h
+++ b/konqueror/konq_run.h
@@ -21,7 +21,7 @@
#define __kfm_run_h__
#include <kparts/browserrun.h>
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
#include <kservice.h>
#include "konq_openurlrequest.h"
@@ -49,12 +49,12 @@ public:
KonqView *childView() const { return m_pView; }
- const QString & typedURL() const { return m_req.typedURL; }
+ const TQString & typedURL() const { return m_req.typedURL; }
KURL mailtoURL() const { return m_mailto; }
protected:
- virtual void foundMimeType( const QString & _type );
+ virtual void foundMimeType( const TQString & _type );
virtual void handleError( KIO::Job * job );
virtual void init();
virtual void scanFile();
@@ -63,8 +63,8 @@ protected slots:
void slotRedirection( KIO::Job *, const KURL& );
protected:
- QGuardedPtr<KonqMainWindow> m_pMainWindow;
- QGuardedPtr<KonqView> m_pView;
+ TQGuardedPtr<KonqMainWindow> m_pMainWindow;
+ TQGuardedPtr<KonqView> m_pView;
bool m_bFoundMimeType;
KonqOpenURLRequest m_req;
KURL m_mailto;
diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc
index 25af00bc8..3cc5cc60d 100644
--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cc
@@ -21,12 +21,12 @@
#include "konq_tabs.h"
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qptrlist.h>
-#include <qpopupmenu.h>
-#include <qtoolbutton.h>
-#include <qtooltip.h>
+#include <tqapplication.h>
+#include <tqclipboard.h>
+#include <tqptrlist.h>
+#include <tqpopupmenu.h>
+#include <tqtoolbutton.h>
+#include <tqtooltip.h>
#include <kdebug.h>
#include <kiconloader.h>
@@ -43,9 +43,9 @@
#include <kaccelmanager.h>
#include <konq_pixmapprovider.h>
#include <kstdaccel.h>
-#include <qtabbar.h>
-#include <qwhatsthis.h>
-#include <qstyle.h>
+#include <tqtabbar.h>
+#include <tqwhatsthis.h>
+#include <tqstyle.h>
#define DUPLICATE_ID 3
#define RELOAD_ID 4
@@ -55,14 +55,14 @@
//###################################################################
-KonqFrameTabs::KonqFrameTabs(QWidget* parent, KonqFrameContainerBase* parentContainer,
+KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentContainer,
KonqViewManager* viewManager, const char * name)
: KTabWidget(parent, name), m_rightWidget(0), m_leftWidget(0), m_alwaysTabBar(false),
m_closeOtherTabsId(0)
{
KAcceleratorManager::setNoAccel(this);
- QWhatsThis::add( tabBar(), i18n( "This bar contains the list of currently open tabs. Click on a tab to make it "
+ TQWhatsThis::add( tabBar(), i18n( "This bar contains the list of currently open tabs. Click on a tab to make it "
"active. The option to show a close button instead of the website icon in the left "
"corner of the tab is configurable. You can also use keyboard shortcuts to "
"navigate through tabs. The text on the tab is the title of the website "
@@ -71,53 +71,53 @@ KonqFrameTabs::KonqFrameTabs(QWidget* parent, KonqFrameContainerBase* parentCont
//kdDebug(1202) << "KonqFrameTabs::KonqFrameTabs()" << endl;
m_pParentContainer = parentContainer;
- m_pChildFrameList = new QPtrList<KonqFrameBase>;
+ m_pChildFrameList = new TQPtrList<KonqFrameBase>;
m_pChildFrameList->setAutoDelete(false);
m_pActiveChild = 0L;
m_pViewManager = viewManager;
- connect( this, SIGNAL( currentChanged ( QWidget * ) ),
- this, SLOT( slotCurrentChanged( QWidget* ) ) );
+ connect( this, TQT_SIGNAL( currentChanged ( TQWidget * ) ),
+ this, TQT_SLOT( slotCurrentChanged( TQWidget* ) ) );
- m_pPopupMenu = new QPopupMenu( this );
+ m_pPopupMenu = new TQPopupMenu( this );
m_pPopupMenu->insertItem( SmallIcon( "tab_new" ),
i18n("&New Tab"),
m_pViewManager->mainWindow(),
- SLOT( slotAddTab() ),
+ TQT_SLOT( slotAddTab() ),
m_pViewManager->mainWindow()->action("newtab")->shortcut() );
m_pPopupMenu->insertItem( SmallIconSet( "reload" ),
i18n( "&Reload Tab" ),
m_pViewManager->mainWindow(),
- SLOT( slotReloadPopup() ),
+ TQT_SLOT( slotReloadPopup() ),
m_pViewManager->mainWindow()->action("reload")->shortcut(), RELOAD_ID );
m_pPopupMenu->insertItem( SmallIconSet( "tab_duplicate" ),
i18n("&Duplicate Tab"),
m_pViewManager->mainWindow(),
- SLOT( slotDuplicateTabPopup() ),
+ TQT_SLOT( slotDuplicateTabPopup() ),
m_pViewManager->mainWindow()->action("duplicatecurrenttab")->shortcut(),
DUPLICATE_ID );
m_pPopupMenu->insertItem( SmallIconSet( "tab_breakoff" ),
i18n("D&etach Tab"),
m_pViewManager->mainWindow(),
- SLOT( slotBreakOffTabPopup() ),
+ TQT_SLOT( slotBreakOffTabPopup() ),
m_pViewManager->mainWindow()->action("breakoffcurrenttab")->shortcut(),
BREAKOFF_ID );
m_pPopupMenu->insertSeparator();
- m_pSubPopupMenuTab = new QPopupMenu( this );
+ m_pSubPopupMenuTab = new TQPopupMenu( this );
m_pPopupMenu->insertItem( i18n("Other Tabs" ), m_pSubPopupMenuTab, OTHERTABS_ID );
- connect( m_pSubPopupMenuTab, SIGNAL( activated ( int ) ),
- this, SLOT( slotSubPopupMenuTabActivated( int ) ) );
+ connect( m_pSubPopupMenuTab, TQT_SIGNAL( activated ( int ) ),
+ this, TQT_SLOT( slotSubPopupMenuTabActivated( int ) ) );
m_pPopupMenu->insertSeparator();
m_pPopupMenu->insertItem( SmallIconSet( "tab_remove" ),
i18n("&Close Tab"),
m_pViewManager->mainWindow(),
- SLOT( slotRemoveTabPopup() ),
+ TQT_SLOT( slotRemoveTabPopup() ),
m_pViewManager->mainWindow()->action("removecurrenttab")->shortcut(),
CLOSETAB_ID );
- connect( this, SIGNAL( contextMenu( QWidget *, const QPoint & ) ),
- SLOT(slotContextMenu( QWidget *, const QPoint & ) ) );
- connect( this, SIGNAL( contextMenu( const QPoint & ) ),
- SLOT(slotContextMenu( const QPoint & ) ) );
+ connect( this, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ),
+ TQT_SLOT(slotContextMenu( TQWidget *, const TQPoint & ) ) );
+ connect( this, TQT_SIGNAL( contextMenu( const TQPoint & ) ),
+ TQT_SLOT(slotContextMenu( const TQPoint & ) ) );
m_MouseMiddleClickClosesTab = KonqSettings::mouseMiddleClickClosesTab();
@@ -130,49 +130,49 @@ KonqFrameTabs::KonqFrameTabs(QWidget* parent, KonqFrameContainerBase* parentCont
setHoverCloseButton( KonqSettings::hoverCloseButton() );
setTabCloseActivatePrevious( KonqSettings::tabCloseActivatePrevious() );
if (KonqSettings::tabPosition()=="Bottom")
- setTabPosition(QTabWidget::Bottom);
- connect( this, SIGNAL( closeRequest( QWidget * )), SLOT(slotCloseRequest( QWidget * )));
- connect( this, SIGNAL( removeTabPopup() ),
- m_pViewManager->mainWindow(), SLOT( slotRemoveTabPopup() ) );
+ setTabPosition(TQTabWidget::Bottom);
+ connect( this, TQT_SIGNAL( closeRequest( TQWidget * )), TQT_SLOT(slotCloseRequest( TQWidget * )));
+ connect( this, TQT_SIGNAL( removeTabPopup() ),
+ m_pViewManager->mainWindow(), TQT_SLOT( slotRemoveTabPopup() ) );
if ( KonqSettings::addTabButton() ) {
- m_leftWidget = new QToolButton( this );
- connect( m_leftWidget, SIGNAL( clicked() ),
- m_pViewManager->mainWindow(), SLOT( slotAddTab() ) );
+ m_leftWidget = new TQToolButton( this );
+ connect( m_leftWidget, TQT_SIGNAL( clicked() ),
+ m_pViewManager->mainWindow(), TQT_SLOT( slotAddTab() ) );
m_leftWidget->setIconSet( SmallIcon( "tab_new" ) );
m_leftWidget->adjustSize();
- QToolTip::add(m_leftWidget, i18n("Open a new tab"));
+ TQToolTip::add(m_leftWidget, i18n("Open a new tab"));
setCornerWidget( m_leftWidget, TopLeft );
}
if ( KonqSettings::closeTabButton() ) {
- m_rightWidget = new QToolButton( this );
- connect( m_rightWidget, SIGNAL( clicked() ),
- m_pViewManager->mainWindow(), SLOT( slotRemoveTab() ) );
+ m_rightWidget = new TQToolButton( this );
+ connect( m_rightWidget, TQT_SIGNAL( clicked() ),
+ m_pViewManager->mainWindow(), TQT_SLOT( slotRemoveTab() ) );
m_rightWidget->setIconSet( SmallIconSet( "tab_remove" ) );
m_rightWidget->adjustSize();
- QToolTip::add(m_rightWidget, i18n("Close the current tab"));
+ TQToolTip::add(m_rightWidget, i18n("Close the current tab"));
setCornerWidget( m_rightWidget, TopRight );
}
setAutomaticResizeTabs( true );
setTabReorderingEnabled( true );
- connect( this, SIGNAL( movedTab( int, int ) ),
- SLOT( slotMovedTab( int, int ) ) );
- connect( this, SIGNAL( mouseMiddleClick() ),
- SLOT( slotMouseMiddleClick() ) );
- connect( this, SIGNAL( mouseMiddleClick( QWidget * ) ),
- SLOT( slotMouseMiddleClick( QWidget * ) ) );
- connect( this, SIGNAL( mouseDoubleClick() ),
- m_pViewManager->mainWindow(), SLOT( slotAddTab() ) );
-
- connect( this, SIGNAL( testCanDecode(const QDragMoveEvent *, bool & )),
- SLOT( slotTestCanDecode(const QDragMoveEvent *, bool & ) ) );
- connect( this, SIGNAL( receivedDropEvent( QDropEvent * )),
- SLOT( slotReceivedDropEvent( QDropEvent * ) ) );
- connect( this, SIGNAL( receivedDropEvent( QWidget *, QDropEvent * )),
- SLOT( slotReceivedDropEvent( QWidget *, QDropEvent * ) ) );
- connect( this, SIGNAL( initiateDrag( QWidget * )),
- SLOT( slotInitiateDrag( QWidget * ) ) );
+ connect( this, TQT_SIGNAL( movedTab( int, int ) ),
+ TQT_SLOT( slotMovedTab( int, int ) ) );
+ connect( this, TQT_SIGNAL( mouseMiddleClick() ),
+ TQT_SLOT( slotMouseMiddleClick() ) );
+ connect( this, TQT_SIGNAL( mouseMiddleClick( TQWidget * ) ),
+ TQT_SLOT( slotMouseMiddleClick( TQWidget * ) ) );
+ connect( this, TQT_SIGNAL( mouseDoubleClick() ),
+ m_pViewManager->mainWindow(), TQT_SLOT( slotAddTab() ) );
+
+ connect( this, TQT_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )),
+ TQT_SLOT( slotTestCanDecode(const TQDragMoveEvent *, bool & ) ) );
+ connect( this, TQT_SIGNAL( receivedDropEvent( TQDropEvent * )),
+ TQT_SLOT( slotReceivedDropEvent( TQDropEvent * ) ) );
+ connect( this, TQT_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )),
+ TQT_SLOT( slotReceivedDropEvent( TQWidget *, TQDropEvent * ) ) );
+ connect( this, TQT_SIGNAL( initiateDrag( TQWidget * )),
+ TQT_SLOT( slotInitiateDrag( TQWidget * ) ) );
}
KonqFrameTabs::~KonqFrameTabs()
@@ -183,29 +183,29 @@ KonqFrameTabs::~KonqFrameTabs()
}
void KonqFrameTabs::listViews( ChildViewList *viewList ) {
- for( QPtrListIterator<KonqFrameBase> it( *m_pChildFrameList ); *it; ++it )
+ for( TQPtrListIterator<KonqFrameBase> it( *m_pChildFrameList ); *it; ++it )
it.current()->listViews(viewList);
}
-void KonqFrameTabs::saveConfig( KConfig* config, const QString &prefix, bool saveURLs,
+void KonqFrameTabs::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs,
KonqFrameBase* docContainer, int id, int depth )
{
//write children
- QStringList strlst;
+ TQStringList strlst;
int i = 0;
- QString newPrefix;
+ TQString newPrefix;
for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next())
{
- newPrefix = QString::fromLatin1( it->frameType() ) + "T" + QString::number(i);
+ newPrefix = TQString::fromLatin1( it->frameType() ) + "T" + TQString::number(i);
strlst.append( newPrefix );
newPrefix.append( '_' );
it->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + i );
i++;
}
- config->writeEntry( QString::fromLatin1( "Children" ).prepend( prefix ), strlst );
+ config->writeEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), strlst );
- config->writeEntry( QString::fromLatin1( "activeChildIndex" ).prepend( prefix ),
+ config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ),
currentPageIndex() );
}
@@ -222,10 +222,10 @@ void KonqFrameTabs::copyHistory( KonqFrameBase *other )
}
}
-void KonqFrameTabs::printFrameInfo( const QString& spaces )
+void KonqFrameTabs::printFrameInfo( const TQString& spaces )
{
kdDebug(1202) << spaces << "KonqFrameTabs " << this << " visible="
- << QString("%1").arg(isVisible()) << " activeChild="
+ << TQString("%1").arg(isVisible()) << " activeChild="
<< m_pActiveChild << endl;
if (!m_pActiveChild)
@@ -242,21 +242,21 @@ void KonqFrameTabs::printFrameInfo( const QString& spaces )
}
}
-void KonqFrameTabs::reparentFrame( QWidget* parent, const QPoint & p, bool showIt )
+void KonqFrameTabs::reparentFrame( TQWidget* parent, const TQPoint & p, bool showIt )
{
- QWidget::reparent( parent, p, showIt );
+ TQWidget::reparent( parent, p, showIt );
}
-void KonqFrameTabs::setTitle( const QString &title , QWidget* sender)
+void KonqFrameTabs::setTitle( const TQString &title , TQWidget* sender)
{
// kdDebug(1202) << "KonqFrameTabs::setTitle( " << title << " , " << sender << " )" << endl;
setTabLabel( sender,title );
}
-void KonqFrameTabs::setTabIcon( const KURL &url, QWidget* sender )
+void KonqFrameTabs::setTabIcon( const KURL &url, TQWidget* sender )
{
//kdDebug(1202) << "KonqFrameTabs::setTabIcon( " << url << " , " << sender << " )" << endl;
- QIconSet iconSet;
+ TQIconSet iconSet;
if (m_permanentCloseButtons)
iconSet = SmallIcon( "fileclose" );
else
@@ -319,7 +319,7 @@ void KonqFrameTabs::removeChildFrame( KonqFrameBase * frame )
//kdDebug(1202) << "KonqFrameTabs::RemoveChildFrame finished" << endl;
}
-void KonqFrameTabs::slotCurrentChanged( QWidget* newPage )
+void KonqFrameTabs::slotCurrentChanged( TQWidget* newPage )
{
setTabColor( newPage, KGlobalSettings::textColor() );
KonqFrameBase* currentFrame = dynamic_cast<KonqFrameBase*>(newPage);
@@ -357,7 +357,7 @@ void KonqFrameTabs::slotMovedTab( int from, int to )
}
}
-void KonqFrameTabs::slotContextMenu( const QPoint &p )
+void KonqFrameTabs::slotContextMenu( const TQPoint &p )
{
refreshSubPopupMenuTab();
@@ -371,7 +371,7 @@ void KonqFrameTabs::slotContextMenu( const QPoint &p )
m_pPopupMenu->exec( p );
}
-void KonqFrameTabs::slotContextMenu( QWidget *w, const QPoint &p )
+void KonqFrameTabs::slotContextMenu( TQWidget *w, const TQPoint &p )
{
refreshSubPopupMenuTab();
@@ -398,7 +398,7 @@ void KonqFrameTabs::refreshSubPopupMenuTab()
m_pSubPopupMenuTab->insertItem( SmallIcon( "reload_all_tabs" ),
i18n( "&Reload All Tabs" ),
m_pViewManager->mainWindow(),
- SLOT( slotReloadAllTabs() ),
+ TQT_SLOT( slotReloadAllTabs() ),
m_pViewManager->mainWindow()->action("reload_all_tabs")->shortcut() );
m_pSubPopupMenuTab->insertSeparator();
for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next())
@@ -406,11 +406,11 @@ void KonqFrameTabs::refreshSubPopupMenuTab()
KonqFrame* frame = dynamic_cast<KonqFrame *>(it);
if ( frame && frame->activeChildView() )
{
- QString title = frame->title().stripWhiteSpace();
+ TQString title = frame->title().stripWhiteSpace();
if ( title.isEmpty() )
title = frame->activeChildView()->url().url();
title = KStringHandler::csqueeze( title, 50 );
- m_pSubPopupMenuTab->insertItem( QIconSet( KonqPixmapProvider::self()->pixmapFor( frame->activeChildView()->url().url() ) ), title, i );
+ m_pSubPopupMenuTab->insertItem( TQIconSet( KonqPixmapProvider::self()->pixmapFor( frame->activeChildView()->url().url() ) ), title, i );
}
i++;
@@ -420,11 +420,11 @@ void KonqFrameTabs::refreshSubPopupMenuTab()
m_pSubPopupMenuTab->insertItem( SmallIconSet( "tab_remove_other" ),
i18n( "Close &Other Tabs" ),
m_pViewManager->mainWindow(),
- SLOT( slotRemoveOtherTabsPopup() ),
+ TQT_SLOT( slotRemoveOtherTabsPopup() ),
m_pViewManager->mainWindow()->action("removeothertabs")->shortcut() );
}
-void KonqFrameTabs::slotCloseRequest( QWidget *w )
+void KonqFrameTabs::slotCloseRequest( TQWidget *w )
{
if ( m_pChildFrameList->count() > 1 ) {
// Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls.
@@ -440,18 +440,18 @@ void KonqFrameTabs::slotSubPopupMenuTabActivated( int _id)
void KonqFrameTabs::slotMouseMiddleClick()
{
- QApplication::clipboard()->setSelectionMode( QClipboard::Selection );
- KURL filteredURL ( KonqMisc::konqFilteredURL( this, QApplication::clipboard()->text() ) );
+ TQApplication::clipboard()->setSelectionMode( QClipboard::Selection );
+ KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) );
if ( !filteredURL.isEmpty() ) {
- KonqView* newView = m_pViewManager->addTab(QString::null, QString::null, false, false);
+ KonqView* newView = m_pViewManager->addTab(TQString::null, TQString::null, false, false);
if (newView == 0L) return;
- m_pViewManager->mainWindow()->openURL( newView, filteredURL, QString::null );
+ m_pViewManager->mainWindow()->openURL( newView, filteredURL, TQString::null );
m_pViewManager->showTab( newView );
m_pViewManager->mainWindow()->focusLocationBar();
}
}
-void KonqFrameTabs::slotMouseMiddleClick( QWidget *w )
+void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w )
{
if ( m_MouseMiddleClickClosesTab ) {
if ( m_pChildFrameList->count() > 1 ) {
@@ -461,8 +461,8 @@ void KonqFrameTabs::slotMouseMiddleClick( QWidget *w )
}
}
else {
- QApplication::clipboard()->setSelectionMode( QClipboard::Selection );
- KURL filteredURL ( KonqMisc::konqFilteredURL( this, QApplication::clipboard()->text() ) );
+ TQApplication::clipboard()->setSelectionMode( QClipboard::Selection );
+ KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) );
if ( !filteredURL.isEmpty() ) {
KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w);
if (frame) {
@@ -472,25 +472,25 @@ void KonqFrameTabs::slotMouseMiddleClick( QWidget *w )
}
}
-void KonqFrameTabs::slotTestCanDecode(const QDragMoveEvent *e, bool &accept /* result */)
+void KonqFrameTabs::slotTestCanDecode(const TQDragMoveEvent *e, bool &accept /* result */)
{
accept = KURLDrag::canDecode( e );
}
-void KonqFrameTabs::slotReceivedDropEvent( QDropEvent *e )
+void KonqFrameTabs::slotReceivedDropEvent( TQDropEvent *e )
{
KURL::List lstDragURLs;
bool ok = KURLDrag::decode( e, lstDragURLs );
if ( ok && lstDragURLs.first().isValid() ) {
- KonqView* newView = m_pViewManager->addTab(QString::null, QString::null, false, false);
+ KonqView* newView = m_pViewManager->addTab(TQString::null, TQString::null, false, false);
if (newView == 0L) return;
- m_pViewManager->mainWindow()->openURL( newView, lstDragURLs.first(), QString::null );
+ m_pViewManager->mainWindow()->openURL( newView, lstDragURLs.first(), TQString::null );
m_pViewManager->showTab( newView );
m_pViewManager->mainWindow()->focusLocationBar();
}
}
-void KonqFrameTabs::slotReceivedDropEvent( QWidget *w, QDropEvent *e )
+void KonqFrameTabs::slotReceivedDropEvent( TQWidget *w, TQDropEvent *e )
{
KURL::List lstDragURLs;
bool ok = KURLDrag::decode( e, lstDragURLs );
@@ -502,7 +502,7 @@ void KonqFrameTabs::slotReceivedDropEvent( QWidget *w, QDropEvent *e )
}
}
-void KonqFrameTabs::slotInitiateDrag( QWidget *w )
+void KonqFrameTabs::slotInitiateDrag( TQWidget *w )
{
KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>( w );
if (frame) {
diff --git a/konqueror/konq_tabs.h b/konqueror/konq_tabs.h
index 98060e0bb..ccae6e84f 100644
--- a/konqueror/konq_tabs.h
+++ b/konqueror/konq_tabs.h
@@ -47,25 +47,25 @@ class KonqFrameTabs : public KTabWidget, public KonqFrameContainerBase
friend class KonqFrame; //for emitting ctrlTabPressed() only, aleXXX
public:
- KonqFrameTabs(QWidget* parent, KonqFrameContainerBase* parentContainer,
+ KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentContainer,
KonqViewManager* viewManager, const char * name = 0);
virtual ~KonqFrameTabs();
virtual void listViews( ChildViewList *viewList );
- virtual void saveConfig( KConfig* config, const QString &prefix, bool saveURLs,
+ virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs,
KonqFrameBase* docContainer, int id = 0, int depth = 0 );
virtual void copyHistory( KonqFrameBase *other );
- virtual void printFrameInfo( const QString& spaces );
+ virtual void printFrameInfo( const TQString& spaces );
- QPtrList<KonqFrameBase>* childFrameList() { return m_pChildFrameList; }
+ TQPtrList<KonqFrameBase>* childFrameList() { return m_pChildFrameList; }
- virtual void setTitle( const QString &title, QWidget* sender );
- virtual void setTabIcon( const KURL &url, QWidget* sender );
+ virtual void setTitle( const TQString &title, TQWidget* sender );
+ virtual void setTabIcon( const KURL &url, TQWidget* sender );
- virtual QWidget* widget() { return this; }
- virtual QCString frameType() { return QCString("Tabs"); }
+ virtual TQWidget* widget() { return this; }
+ virtual TQCString frameType() { return TQCString("Tabs"); }
void activateChild();
@@ -80,15 +80,15 @@ public:
void removeChildFrame( KonqFrameBase * frame );
//inherited
- virtual void reparentFrame(QWidget * parent,
- const QPoint & p, bool showIt=FALSE );
+ virtual void reparentFrame(TQWidget * parent,
+ const TQPoint & p, bool showIt=FALSE );
void moveTabBackward(int index);
void moveTabForward(int index);
public slots:
- void slotCurrentChanged( QWidget* newPage );
+ void slotCurrentChanged( TQWidget* newPage );
void setAlwaysTabbedMode( bool );
signals:
@@ -99,28 +99,28 @@ protected:
void refreshSubPopupMenuTab();
void hideTabBar();
- QPtrList<KonqFrameBase>* m_pChildFrameList;
+ TQPtrList<KonqFrameBase>* m_pChildFrameList;
private slots:
- void slotContextMenu( const QPoint& );
- void slotContextMenu( QWidget*, const QPoint& );
- void slotCloseRequest( QWidget* );
+ void slotContextMenu( const TQPoint& );
+ void slotContextMenu( TQWidget*, const TQPoint& );
+ void slotCloseRequest( TQWidget* );
void slotMovedTab( int, int );
void slotMouseMiddleClick();
- void slotMouseMiddleClick( QWidget* );
+ void slotMouseMiddleClick( TQWidget* );
- void slotTestCanDecode(const QDragMoveEvent *e, bool &accept /* result */);
- void slotReceivedDropEvent( QDropEvent* );
- void slotInitiateDrag( QWidget * );
- void slotReceivedDropEvent( QWidget *, QDropEvent * );
+ void slotTestCanDecode(const TQDragMoveEvent *e, bool &accept /* result */);
+ void slotReceivedDropEvent( TQDropEvent* );
+ void slotInitiateDrag( TQWidget * );
+ void slotReceivedDropEvent( TQWidget *, TQDropEvent * );
void slotSubPopupMenuTabActivated( int );
private:
KonqViewManager* m_pViewManager;
- QPopupMenu* m_pPopupMenu;
- QPopupMenu* m_pSubPopupMenuTab;
- QToolButton* m_rightWidget;
- QToolButton* m_leftWidget;
+ TQPopupMenu* m_pPopupMenu;
+ TQPopupMenu* m_pSubPopupMenuTab;
+ TQToolButton* m_rightWidget;
+ TQToolButton* m_leftWidget;
bool m_permanentCloseButtons;
bool m_alwaysTabBar;
bool m_MouseMiddleClickClosesTab;
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index 87222734c..aa96171fa 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -39,11 +39,11 @@
#include <kdebug.h>
#include <kcursor.h>
#include <kurldrag.h>
-#include <qscrollview.h>
+#include <tqscrollview.h>
-#include <qapplication.h>
-#include <qmetaobject.h>
-#include <qobjectlist.h>
+#include <tqapplication.h>
+#include <tqmetaobject.h>
+#include <tqobjectlist.h>
#include <config.h>
#include <private/qucomextra_p.h>
#include <kmessagebox.h>
@@ -53,7 +53,7 @@
//#define DEBUG_HISTORY
-template class QPtrList<HistoryEntry>;
+template class TQPtrList<HistoryEntry>;
KonqView::KonqView( KonqViewFactory &viewFactory,
KonqFrame* viewFrame,
@@ -61,7 +61,7 @@ KonqView::KonqView( KonqViewFactory &viewFactory,
const KService::Ptr &service,
const KTrader::OfferList &partServiceOffers,
const KTrader::OfferList &appServiceOffers,
- const QString &serviceType,
+ const TQString &serviceType,
bool passiveMode
)
{
@@ -111,13 +111,13 @@ KonqView::~KonqView()
//kdDebug(1202) << "KonqView::~KonqView : part = " << m_pPart << endl;
if (KonqMainWindow::s_crashlog_file) {
- QString part_url;
+ TQString part_url;
if (m_pPart)
part_url = m_pPart->url().url();
if (part_url.isNull())
part_url = "";
- QCString line;
- line = ( QString("close(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8();
+ TQCString line;
+ line = ( TQString("close(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8();
KonqMainWindow::s_crashlog_file->writeBlock(line, line.length());
KonqMainWindow::s_crashlog_file->flush();
}
@@ -127,7 +127,7 @@ KonqView::~KonqView()
{
finishedWithCurrentURL();
if ( isPassiveMode() )
- disconnect( m_pPart, SIGNAL( destroyed() ), m_pMainWindow->viewManager(), SLOT( slotObjectDestroyed() ) );
+ disconnect( m_pPart, TQT_SIGNAL( destroyed() ), m_pMainWindow->viewManager(), TQT_SLOT( slotObjectDestroyed() ) );
delete m_pPart;
}
@@ -136,28 +136,28 @@ KonqView::~KonqView()
//kdDebug(1202) << "KonqView::~KonqView " << this << " done" << endl;
}
-void KonqView::openURL( const KURL &url, const QString & locationBarURL,
- const QString & nameFilter, bool tempFile )
+void KonqView::openURL( const KURL &url, const TQString & locationBarURL,
+ const TQString & nameFilter, bool tempFile )
{
kdDebug(1202) << "KonqView::openURL url=" << url << " locationBarURL=" << locationBarURL << endl;
setServiceTypeInExtension();
if (KonqMainWindow::s_crashlog_file) {
- QString part_url;
+ TQString part_url;
if (m_pPart)
part_url = m_pPart->url().url();
if (part_url.isNull())
part_url = "";
- QString url_url = url.url();
+ TQString url_url = url.url();
if (url_url.isNull())
- url_url = QString("");
+ url_url = TQString("");
- QCString line;
+ TQCString line;
- line = ( QString("closed(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8();
+ line = ( TQString("closed(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8();
KonqMainWindow::s_crashlog_file->writeBlock(line,line.length());
- line = ( QString("opened(%3):%4\n").arg(m_randID,0,16).arg(url_url) ).utf8();
+ line = ( TQString("opened(%3):%4\n").arg(m_randID,0,16).arg(url_url) ).utf8();
KonqMainWindow::s_crashlog_file->writeBlock(line,line.length());
KonqMainWindow::s_crashlog_file->flush();
}
@@ -190,7 +190,7 @@ void KonqView::openURL( const KURL &url, const QString & locationBarURL,
} else
m_bLockHistory = false;
- callExtensionStringMethod( "setNameFilter(const QString&)", nameFilter );
+ callExtensionStringMethod( "setNameFilter(const TQString&)", nameFilter );
if ( m_bDisableScrolling )
callExtensionMethod( "disableScrolling()" );
@@ -224,7 +224,7 @@ void KonqView::openURL( const KURL &url, const QString & locationBarURL,
updateHistoryEntry(false /* don't save location bar URL yet */);
// add pending history entry
- KonqHistoryManager::kself()->addPending( url, locationBarURL, QString::null);
+ KonqHistoryManager::kself()->addPending( url, locationBarURL, TQString::null);
#ifdef DEBUG_HISTORY
kdDebug(1202) << "Current position : " << m_lstHistory.at() << endl;
@@ -255,7 +255,7 @@ void KonqView::switchView( KonqViewFactory &viewFactory )
connectPart();
- QVariant prop;
+ TQVariant prop;
prop = m_service->property( "X-KDE-BrowserView-FollowActive");
if (prop.isValid() && prop.toBool())
@@ -304,8 +304,8 @@ void KonqView::switchView( KonqViewFactory &viewFactory )
}
}
-bool KonqView::changeViewMode( const QString &serviceType,
- const QString &serviceName,
+bool KonqView::changeViewMode( const TQString &serviceType,
+ const TQString &serviceName,
bool forceAutoEmbed )
{
// Caller should call stop first.
@@ -372,16 +372,16 @@ bool KonqView::changeViewMode( const QString &serviceType,
void KonqView::connectPart( )
{
//kdDebug(1202) << "KonqView::connectPart" << endl;
- connect( m_pPart, SIGNAL( started( KIO::Job * ) ),
- this, SLOT( slotStarted( KIO::Job * ) ) );
- connect( m_pPart, SIGNAL( completed() ),
- this, SLOT( slotCompleted() ) );
- connect( m_pPart, SIGNAL( completed(bool) ),
- this, SLOT( slotCompleted(bool) ) );
- connect( m_pPart, SIGNAL( canceled( const QString & ) ),
- this, SLOT( slotCanceled( const QString & ) ) );
- connect( m_pPart, SIGNAL( setWindowCaption( const QString & ) ),
- this, SLOT( setCaption( const QString & ) ) );
+ connect( m_pPart, TQT_SIGNAL( started( KIO::Job * ) ),
+ this, TQT_SLOT( slotStarted( KIO::Job * ) ) );
+ connect( m_pPart, TQT_SIGNAL( completed() ),
+ this, TQT_SLOT( slotCompleted() ) );
+ connect( m_pPart, TQT_SIGNAL( completed(bool) ),
+ this, TQT_SLOT( slotCompleted(bool) ) );
+ connect( m_pPart, TQT_SIGNAL( canceled( const TQString & ) ),
+ this, TQT_SLOT( slotCanceled( const TQString & ) ) );
+ connect( m_pPart, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
+ this, TQT_SLOT( setCaption( const TQString & ) ) );
KParts::BrowserExtension *ext = browserExtension();
@@ -389,8 +389,8 @@ void KonqView::connectPart( )
{
ext->setBrowserInterface( m_browserIface );
- connect( ext, SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs &) ),
- m_pMainWindow, SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) );
+ connect( ext, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs &) ),
+ m_pMainWindow, TQT_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) );
if ( m_bPopupMenuEnabled )
{
@@ -398,90 +398,90 @@ void KonqView::connectPart( )
enablePopupMenu( true );
}
- connect( ext, SIGNAL( setLocationBarURL( const QString & ) ),
- this, SLOT( setLocationBarURL( const QString & ) ) );
+ connect( ext, TQT_SIGNAL( setLocationBarURL( const TQString & ) ),
+ this, TQT_SLOT( setLocationBarURL( const TQString & ) ) );
- connect( ext, SIGNAL( setIconURL( const KURL & ) ),
- this, SLOT( setIconURL( const KURL & ) ) );
+ connect( ext, TQT_SIGNAL( setIconURL( const KURL & ) ),
+ this, TQT_SLOT( setIconURL( const KURL & ) ) );
- connect( ext, SIGNAL( setPageSecurity( int ) ),
- this, SLOT( setPageSecurity( int ) ) );
+ connect( ext, TQT_SIGNAL( setPageSecurity( int ) ),
+ this, TQT_SLOT( setPageSecurity( int ) ) );
- connect( ext, SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ),
- m_pMainWindow, SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs & ) ) );
+ connect( ext, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ),
+ m_pMainWindow, TQT_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs & ) ) );
- connect( ext, SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
- m_pMainWindow, SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ) );
+ connect( ext, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
+ m_pMainWindow, TQT_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ) );
- connect( ext, SIGNAL( loadingProgress( int ) ),
- m_pKonqFrame->statusbar(), SLOT( slotLoadingProgress( int ) ) );
+ connect( ext, TQT_SIGNAL( loadingProgress( int ) ),
+ m_pKonqFrame->statusbar(), TQT_SLOT( slotLoadingProgress( int ) ) );
- connect( ext, SIGNAL( speedProgress( int ) ),
- m_pKonqFrame->statusbar(), SLOT( slotSpeedProgress( int ) ) );
+ connect( ext, TQT_SIGNAL( speedProgress( int ) ),
+ m_pKonqFrame->statusbar(), TQT_SLOT( slotSpeedProgress( int ) ) );
- connect( ext, SIGNAL( selectionInfo( const KFileItemList & ) ),
- this, SLOT( slotSelectionInfo( const KFileItemList & ) ) );
+ connect( ext, TQT_SIGNAL( selectionInfo( const KFileItemList & ) ),
+ this, TQT_SLOT( slotSelectionInfo( const KFileItemList & ) ) );
- connect( ext, SIGNAL( mouseOverInfo( const KFileItem * ) ),
- this, SLOT( slotMouseOverInfo( const KFileItem * ) ) );
+ connect( ext, TQT_SIGNAL( mouseOverInfo( const KFileItem * ) ),
+ this, TQT_SLOT( slotMouseOverInfo( const KFileItem * ) ) );
- connect( ext, SIGNAL( openURLNotify() ),
- this, SLOT( slotOpenURLNotify() ) );
+ connect( ext, TQT_SIGNAL( openURLNotify() ),
+ this, TQT_SLOT( slotOpenURLNotify() ) );
- connect( ext, SIGNAL( enableAction( const char *, bool ) ),
- this, SLOT( slotEnableAction( const char *, bool ) ) );
+ connect( ext, TQT_SIGNAL( enableAction( const char *, bool ) ),
+ this, TQT_SLOT( slotEnableAction( const char *, bool ) ) );
- connect( ext, SIGNAL( setActionText( const char *, const QString& ) ),
- this, SLOT( slotSetActionText( const char *, const QString& ) ) );
+ connect( ext, TQT_SIGNAL( setActionText( const char *, const TQString& ) ),
+ this, TQT_SLOT( slotSetActionText( const char *, const TQString& ) ) );
- connect( ext, SIGNAL( moveTopLevelWidget( int, int ) ),
- this, SLOT( slotMoveTopLevelWidget( int, int ) ) );
+ connect( ext, TQT_SIGNAL( moveTopLevelWidget( int, int ) ),
+ this, TQT_SLOT( slotMoveTopLevelWidget( int, int ) ) );
- connect( ext, SIGNAL( resizeTopLevelWidget( int, int ) ),
- this, SLOT( slotResizeTopLevelWidget( int, int ) ) );
+ connect( ext, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ),
+ this, TQT_SLOT( slotResizeTopLevelWidget( int, int ) ) );
- connect( ext, SIGNAL( requestFocus(KParts::ReadOnlyPart *) ),
- this, SLOT( slotRequestFocus(KParts::ReadOnlyPart *) ) );
+ connect( ext, TQT_SIGNAL( requestFocus(KParts::ReadOnlyPart *) ),
+ this, TQT_SLOT( slotRequestFocus(KParts::ReadOnlyPart *) ) );
if (service()->desktopEntryName() != "konq_sidebartng") {
- connect( ext, SIGNAL( infoMessage( const QString & ) ),
- m_pKonqFrame->statusbar(), SLOT( message( const QString & ) ) );
+ connect( ext, TQT_SIGNAL( infoMessage( const TQString & ) ),
+ m_pKonqFrame->statusbar(), TQT_SLOT( message( const TQString & ) ) );
connect( ext,
- SIGNAL( addWebSideBar(const KURL&, const QString&) ),
+ TQT_SIGNAL( addWebSideBar(const KURL&, const TQString&) ),
m_pMainWindow,
- SLOT( slotAddWebSideBar(const KURL&, const QString&) ) );
+ TQT_SLOT( slotAddWebSideBar(const KURL&, const TQString&) ) );
}
callExtensionBoolMethod( "setSaveViewPropertiesLocally(bool)", m_pMainWindow->saveViewPropertiesLocally() );
}
- QVariant urlDropHandling;
+ TQVariant urlDropHandling;
if ( ext )
urlDropHandling = ext->property( "urlDropHandling" );
else
- urlDropHandling = QVariant( true, 0 );
+ urlDropHandling = TQVariant( true, 0 );
// Handle url drops if
// a) either the property says "ok"
// or
// b) the part is a plain krop (no BE)
- m_bURLDropHandling = ( urlDropHandling.type() == QVariant::Bool &&
+ m_bURLDropHandling = ( urlDropHandling.type() == TQVariant::Bool &&
urlDropHandling.toBool() );
m_pPart->widget()->installEventFilter( this );
- if (m_bBackRightClick && m_pPart->widget()->inherits("QScrollView") )
+ if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") )
{
- (static_cast<QScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
+ (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
}
// KonqDirPart signal
if ( m_pPart->inherits("KonqDirPart") )
{
- connect( m_pPart, SIGNAL( findOpen( KonqDirPart * ) ),
- m_pMainWindow, SLOT( slotFindOpen( KonqDirPart * ) ) );
+ connect( m_pPart, TQT_SIGNAL( findOpen( KonqDirPart * ) ),
+ m_pMainWindow, TQT_SLOT( slotFindOpen( KonqDirPart * ) ) );
}
}
@@ -493,7 +493,7 @@ void KonqView::slotEnableAction( const char * name, bool enabled )
// stored inside the browser-extension.
}
-void KonqView::slotSetActionText( const char* name, const QString& text )
+void KonqView::slotSetActionText( const char* name, const TQString& text )
{
if ( m_pMainWindow->currentView() == this )
m_pMainWindow->setActionText( name, text );
@@ -532,9 +532,9 @@ void KonqView::slotStarted( KIO::Job * job )
job->setWindow (m_pMainWindow->topLevelWidget ());
}
- connect( job, SIGNAL( percent( KIO::Job *, unsigned long ) ), this, SLOT( slotPercent( KIO::Job *, unsigned long ) ) );
- connect( job, SIGNAL( speed( KIO::Job *, unsigned long ) ), this, SLOT( slotSpeed( KIO::Job *, unsigned long ) ) );
- connect( job, SIGNAL( infoMessage( KIO::Job *, const QString & ) ), this, SLOT( slotInfoMessage( KIO::Job *, const QString & ) ) );
+ connect( job, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( KIO::Job *, unsigned long ) ) );
+ connect( job, TQT_SIGNAL( speed( KIO::Job *, unsigned long ) ), this, TQT_SLOT( slotSpeed( KIO::Job *, unsigned long ) ) );
+ connect( job, TQT_SIGNAL( infoMessage( KIO::Job *, const TQString & ) ), this, TQT_SLOT( slotInfoMessage( KIO::Job *, const TQString & ) ) );
}
}
@@ -564,7 +564,7 @@ void KonqView::slotSpeed( KIO::Job *, unsigned long bytesPerSecond )
m_pKonqFrame->statusbar()->slotSpeedProgress( bytesPerSecond );
}
-void KonqView::slotInfoMessage( KIO::Job *, const QString &msg )
+void KonqView::slotInfoMessage( KIO::Job *, const TQString &msg )
{
m_pKonqFrame->statusbar()->message( msg );
}
@@ -605,7 +605,7 @@ void KonqView::slotCompleted( bool hasPending )
}
}
-void KonqView::slotCanceled( const QString & errorMsg )
+void KonqView::slotCanceled( const TQString & errorMsg )
{
kdDebug(1202) << "KonqView::slotCanceled" << endl;
// The errorMsg comes from the ReadOnlyPart's job.
@@ -619,13 +619,13 @@ void KonqView::slotCanceled( const QString & errorMsg )
void KonqView::slotSelectionInfo( const KFileItemList &items )
{
KonqFileSelectionEvent ev( items, m_pPart );
- QApplication::sendEvent( m_pMainWindow, &ev );
+ TQApplication::sendEvent( m_pMainWindow, &ev );
}
void KonqView::slotMouseOverInfo( const KFileItem *item )
{
KonqFileMouseOverEvent ev( item, m_pPart );
- QApplication::sendEvent( m_pMainWindow, &ev );
+ TQApplication::sendEvent( m_pMainWindow, &ev );
}
void KonqView::setLocationBarURL( const KURL& locationBarURL )
@@ -633,7 +633,7 @@ void KonqView::setLocationBarURL( const KURL& locationBarURL )
setLocationBarURL( locationBarURL.pathOrURL() );
}
-void KonqView::setLocationBarURL( const QString & locationBarURL )
+void KonqView::setLocationBarURL( const TQString & locationBarURL )
{
//kdDebug(1202) << "KonqView::setLocationBarURL " << locationBarURL << " this=" << this << endl;
@@ -673,11 +673,11 @@ void KonqView::setTabIcon( const KURL &url )
if (!m_bPassiveMode) frame()->setTabIcon( url, 0L );
}
-void KonqView::setCaption( const QString & caption )
+void KonqView::setCaption( const TQString & caption )
{
if (caption.isEmpty()) return;
- QString adjustedCaption = caption;
+ TQString adjustedCaption = caption;
// For local URLs we prefer to use only the directory name
if (url().isLocalFile())
{
@@ -745,8 +745,8 @@ void KonqView::updateHistoryEntry( bool saveLocationBarURL )
if ( browserExtension() )
{
- current->buffer = QByteArray(); // Start with empty buffer.
- QDataStream stream( current->buffer, IO_WriteOnly );
+ current->buffer = TQByteArray(); // Start with empty buffer.
+ TQDataStream stream( current->buffer, IO_WriteOnly );
browserExtension()->saveState( stream );
}
@@ -772,8 +772,8 @@ void KonqView::updateHistoryEntry( bool saveLocationBarURL )
current->strServiceName = m_service->desktopEntryName();
current->doPost = m_doPost;
- current->postData = m_doPost ? m_postData : QByteArray();
- current->postContentType = m_doPost ? m_postContentType : QString::null;
+ current->postData = m_doPost ? m_postData : TQByteArray();
+ current->postContentType = m_doPost ? m_postContentType : TQString::null;
current->pageReferrer = m_pageReferrer;
}
@@ -835,7 +835,7 @@ void KonqView::restoreHistory()
#endif
setLocationBarURL( h.locationBarURL );
setPageSecurity( h.pageSecurity );
- m_sTypedURL = QString::null;
+ m_sTypedURL = TQString::null;
if ( ! changeViewMode( h.strServiceType, h.strServiceName ) )
{
kdWarning(1202) << "Couldn't change view mode to " << h.strServiceType
@@ -850,7 +850,7 @@ void KonqView::restoreHistory()
if ( browserExtension() )
{
//kdDebug(1202) << "Restoring view from stream" << endl;
- QDataStream stream( h.buffer, IO_ReadOnly );
+ TQDataStream stream( h.buffer, IO_ReadOnly );
browserExtension()->restoreState( stream );
@@ -884,7 +884,7 @@ void KonqView::copyHistory( KonqView *other )
{
m_lstHistory.clear();
- QPtrListIterator<HistoryEntry> it( other->m_lstHistory );
+ TQPtrListIterator<HistoryEntry> it( other->m_lstHistory );
for (; it.current(); ++it )
m_lstHistory.append( new HistoryEntry( *it.current() ) );
m_lstHistory.at(other->m_lstHistory.at());
@@ -963,8 +963,8 @@ void KonqView::finishedWithCurrentURL()
if ( !m_tempFile.isEmpty() )
{
kdDebug(1202) << "######### Deleting tempfile after use:" << m_tempFile << endl;
- QFile::remove( m_tempFile );
- m_tempFile = QString::null;
+ TQFile::remove( m_tempFile );
+ m_tempFile = TQString::null;
}
}
@@ -1008,7 +1008,7 @@ void KonqView::setLockedLocation( bool b )
void KonqView::aboutToOpenURL( const KURL &url, const KParts::URLArgs &args )
{
KParts::OpenURLEvent ev( m_pPart, url, args );
- QApplication::sendEvent( m_pMainWindow, &ev );
+ TQApplication::sendEvent( m_pMainWindow, &ev );
m_bGotIconURL = false;
m_bAborted = false;
@@ -1025,14 +1025,14 @@ void KonqView::setServiceTypeInExtension()
ext->setURLArgs( args );
}
-QStringList KonqView::frameNames() const
+TQStringList KonqView::frameNames() const
{
return childFrameNames( m_pPart );
}
-QStringList KonqView::childFrameNames( KParts::ReadOnlyPart *part )
+TQStringList KonqView::childFrameNames( KParts::ReadOnlyPart *part )
{
- QStringList res;
+ TQStringList res;
KParts::BrowserHostExtension *hostExtension = KParts::BrowserHostExtension::childObject( part );
@@ -1041,15 +1041,15 @@ QStringList KonqView::childFrameNames( KParts::ReadOnlyPart *part )
res += hostExtension->frameNames();
- const QPtrList<KParts::ReadOnlyPart> children = hostExtension->frames();
- QPtrListIterator<KParts::ReadOnlyPart> it( children );
+ const TQPtrList<KParts::ReadOnlyPart> children = hostExtension->frames();
+ TQPtrListIterator<KParts::ReadOnlyPart> it( children );
for (; it.current(); ++it )
res += childFrameNames( it.current() );
return res;
}
-KParts::BrowserHostExtension* KonqView::hostExtension( KParts::ReadOnlyPart *part, const QString &name )
+KParts::BrowserHostExtension* KonqView::hostExtension( KParts::ReadOnlyPart *part, const TQString &name )
{
KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( part );
@@ -1059,8 +1059,8 @@ KParts::BrowserHostExtension* KonqView::hostExtension( KParts::ReadOnlyPart *par
if ( ext->frameNames().contains( name ) )
return ext;
- const QPtrList<KParts::ReadOnlyPart> children = ext->frames();
- QPtrListIterator<KParts::ReadOnlyPart> it( children );
+ const TQPtrList<KParts::ReadOnlyPart> children = ext->frames();
+ TQPtrListIterator<KParts::ReadOnlyPart> it( children );
for (; it.current(); ++it )
{
KParts::BrowserHostExtension *childHost = hostExtension( it.current(), name );
@@ -1073,7 +1073,7 @@ KParts::BrowserHostExtension* KonqView::hostExtension( KParts::ReadOnlyPart *par
bool KonqView::callExtensionMethod( const char *methodName )
{
- QObject *obj = KParts::BrowserExtension::childObject( m_pPart );
+ TQObject *obj = KParts::BrowserExtension::childObject( m_pPart );
if ( !obj ) // not all views have a browser extension !
return false;
@@ -1088,7 +1088,7 @@ bool KonqView::callExtensionMethod( const char *methodName )
bool KonqView::callExtensionBoolMethod( const char *methodName, bool value )
{
- QObject *obj = KParts::BrowserExtension::childObject( m_pPart );
+ TQObject *obj = KParts::BrowserExtension::childObject( m_pPart );
if ( !obj ) // not all views have a browser extension !
return false;
@@ -1103,9 +1103,9 @@ bool KonqView::callExtensionBoolMethod( const char *methodName, bool value )
return true;
}
-bool KonqView::callExtensionStringMethod( const char *methodName, QString value )
+bool KonqView::callExtensionStringMethod( const char *methodName, TQString value )
{
- QObject *obj = KParts::BrowserExtension::childObject( m_pPart );
+ TQObject *obj = KParts::BrowserExtension::childObject( m_pPart );
if ( !obj ) // not all views have a browser extension !
return false;
@@ -1122,7 +1122,7 @@ bool KonqView::callExtensionStringMethod( const char *methodName, QString value
bool KonqView::callExtensionURLMethod( const char *methodName, const KURL& value )
{
- QObject *obj = KParts::BrowserExtension::childObject( m_pPart );
+ TQObject *obj = KParts::BrowserExtension::childObject( m_pPart );
if ( !obj ) // not all views have a browser extension !
return false;
@@ -1137,16 +1137,16 @@ bool KonqView::callExtensionURLMethod( const char *methodName, const KURL& value
return true;
}
-void KonqView::setViewName( const QString &name )
+void KonqView::setViewName( const TQString &name )
{
//kdDebug() << "KonqView::setViewName this=" << this << " name=" << name << endl;
if ( m_pPart )
m_pPart->setName( name.local8Bit().data() );
}
-QString KonqView::viewName() const
+TQString KonqView::viewName() const
{
- return m_pPart ? QString::fromLocal8Bit( m_pPart->name() ) : QString::null;
+ return m_pPart ? TQString::fromLocal8Bit( m_pPart->name() ) : TQString::null;
}
void KonqView::enablePopupMenu( bool b )
@@ -1165,39 +1165,39 @@ void KonqView::enablePopupMenu( bool b )
if ( b ) {
m_bPopupMenuEnabled = true;
- connect( ext, SIGNAL( popupMenu( const QPoint &, const KFileItemList & ) ),
- m_pMainWindow, SLOT( slotPopupMenu( const QPoint &, const KFileItemList & ) ) );
+ connect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
+ m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) );
- connect( ext, SIGNAL( popupMenu( const QPoint &, const KURL &, const QString &, mode_t ) ),
- m_pMainWindow, SLOT( slotPopupMenu( const QPoint &, const KURL &, const QString &, mode_t ) ) );
+ connect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+ m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
- connect( ext, SIGNAL( popupMenu( KXMLGUIClient *, const QPoint &, const KFileItemList & ) ),
- m_pMainWindow, SLOT( slotPopupMenu( KXMLGUIClient *, const QPoint &, const KFileItemList & ) ) );
+ connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
+ m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
- connect( ext, SIGNAL( popupMenu( KXMLGUIClient *, const QPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ),
- m_pMainWindow, SLOT( slotPopupMenu( KXMLGUIClient *, const QPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) );
+ connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ),
+ m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) );
- connect( ext, SIGNAL( popupMenu( KXMLGUIClient *, const QPoint &, const KURL &, const QString &, mode_t ) ),
- m_pMainWindow, SLOT( slotPopupMenu( KXMLGUIClient *, const QPoint &, const KURL &, const QString &, mode_t ) ) );
+ connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+ m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
- connect( ext, SIGNAL( popupMenu( KXMLGUIClient *, const QPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ),
- m_pMainWindow, SLOT( slotPopupMenu( KXMLGUIClient *, const QPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) );
+ connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ),
+ m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) );
}
else // disable context popup
{
m_bPopupMenuEnabled = false;
- disconnect( ext, SIGNAL( popupMenu( const QPoint &, const KFileItemList & ) ),
- m_pMainWindow, SLOT( slotPopupMenu( const QPoint &, const KFileItemList & ) ) );
+ disconnect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
+ m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) );
- disconnect( ext, SIGNAL( popupMenu( const QPoint &, const KURL &, const QString &, mode_t ) ),
- m_pMainWindow, SLOT( slotPopupMenu( const QPoint &, const KURL &, const QString &, mode_t ) ) );
+ disconnect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+ m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
- disconnect( ext, SIGNAL( popupMenu( KXMLGUIClient *, const QPoint &, const KFileItemList & ) ),
- m_pMainWindow, SLOT( slotPopupMenu( KXMLGUIClient *, const QPoint &, const KFileItemList & ) ) );
+ disconnect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
+ m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
- disconnect( ext, SIGNAL( popupMenu( KXMLGUIClient *, const QPoint &, const KURL &, const QString &, mode_t ) ),
- m_pMainWindow, SLOT( slotPopupMenu( KXMLGUIClient *, const QPoint &, const KURL &, const QString &, mode_t ) ) );
+ disconnect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+ m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
}
enableBackRightClick( m_bBackRightClick );
}
@@ -1207,11 +1207,11 @@ void KonqView::enableBackRightClick( bool b )
{
m_bBackRightClick = b;
if ( b )
- connect( this, SIGNAL( backRightClick() ),
- m_pMainWindow, SLOT( slotBack() ) );
+ connect( this, TQT_SIGNAL( backRightClick() ),
+ m_pMainWindow, TQT_SLOT( slotBack() ) );
else
- disconnect( this, SIGNAL( backRightClick() ),
- m_pMainWindow, SLOT( slotBack() ) );
+ disconnect( this, TQT_SIGNAL( backRightClick() ),
+ m_pMainWindow, TQT_SLOT( slotBack() ) );
}
void KonqView::reparseConfiguration()
@@ -1220,9 +1220,9 @@ void KonqView::reparseConfiguration()
bool b = KonqSettings::backRightClick();
if ( m_bBackRightClick != b )
{
- if (m_bBackRightClick && m_pPart->widget()->inherits("QScrollView") )
+ if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") )
{
- (static_cast<QScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
+ (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
}
enableBackRightClick( b );
}
@@ -1237,12 +1237,12 @@ void KonqView::disableScrolling()
KonqViewIface * KonqView::dcopObject()
{
if ( !m_dcopObject ) {
- QCString dcopName = name();
+ TQCString dcopName = name();
if ( dcopName.isEmpty() || dcopName == "unnamed" )
dcopName = viewName().utf8();
if ( dcopName.isEmpty() || dcopName == "unnamed" ) {
- QVariant dcopProperty = part()->property( "dcopObjectId" );
- if ( dcopProperty.type() == QVariant::CString )
+ TQVariant dcopProperty = part()->property( "dcopObjectId" );
+ if ( dcopProperty.type() == TQVariant::CString )
dcopName = dcopProperty.toCString();
}
dcopName += "-view"; // to avoid having the same name as the part
@@ -1251,21 +1251,21 @@ KonqViewIface * KonqView::dcopObject()
return m_dcopObject;
}
-bool KonqView::eventFilter( QObject *obj, QEvent *e )
+bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
{
if ( !m_pPart )
return false;
// kdDebug() << "--" << obj->className() << "--" << e->type() << "--" << endl;
- if ( e->type() == QEvent::DragEnter && m_bURLDropHandling && obj == m_pPart->widget() )
+ if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && obj == m_pPart->widget() )
{
- QDragEnterEvent *ev = static_cast<QDragEnterEvent *>( e );
+ TQDragEnterEvent *ev = static_cast<TQDragEnterEvent *>( e );
if ( KURLDrag::canDecode( ev ) )
{
KURL::List lstDragURLs;
bool ok = KURLDrag::decode( ev, lstDragURLs );
- QObjectList *children = m_pPart->widget()->queryList( "QWidget" );
+ TQObjectList *children = m_pPart->widget()->queryList( "TQWidget" );
if ( ok &&
!lstDragURLs.first().url().contains( "javascript:", false ) && // ### this looks like a hack to me
@@ -1277,9 +1277,9 @@ bool KonqView::eventFilter( QObject *obj, QEvent *e )
delete children;
}
}
- else if ( e->type() == QEvent::Drop && m_bURLDropHandling && obj == m_pPart->widget() )
+ else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && obj == m_pPart->widget() )
{
- QDropEvent *ev = static_cast<QDropEvent *>( e );
+ TQDropEvent *ev = static_cast<TQDropEvent *>( e );
KURL::List lstDragURLs;
bool ok = KURLDrag::decode( ev, lstDragURLs );
@@ -1291,48 +1291,48 @@ bool KonqView::eventFilter( QObject *obj, QEvent *e )
if ( m_bBackRightClick )
{
- if ( e->type() == QEvent::ContextMenu )
+ if ( e->type() == TQEvent::ContextMenu )
{
- QContextMenuEvent *ev = static_cast<QContextMenuEvent *>( e );
- if ( ev->reason() == QContextMenuEvent::Mouse )
+ TQContextMenuEvent *ev = static_cast<TQContextMenuEvent *>( e );
+ if ( ev->reason() == TQContextMenuEvent::Mouse )
{
return true;
}
}
- else if ( e->type() == QEvent::MouseButtonPress )
+ else if ( e->type() == TQEvent::MouseButtonPress )
{
- QMouseEvent *ev = static_cast<QMouseEvent *>( e );
+ TQMouseEvent *ev = static_cast<TQMouseEvent *>( e );
if ( ev->button() == RightButton )
{
return true;
}
}
- else if ( e->type() == QEvent::MouseButtonRelease )
+ else if ( e->type() == TQEvent::MouseButtonRelease )
{
- QMouseEvent *ev = static_cast<QMouseEvent *>( e );
+ TQMouseEvent *ev = static_cast<TQMouseEvent *>( e );
if ( ev->button() == RightButton )
{
emit backRightClick();
return true;
}
}
- else if ( e->type() == QEvent::MouseMove )
+ else if ( e->type() == TQEvent::MouseMove )
{
- QMouseEvent *ev = static_cast<QMouseEvent *>( e );
+ TQMouseEvent *ev = static_cast<TQMouseEvent *>( e );
if ( ev->state() == RightButton )
{
obj->removeEventFilter( this );
- QMouseEvent me( QEvent::MouseButtonPress, ev->pos(), 2, 2 );
- QApplication::sendEvent( obj, &me );
- QContextMenuEvent ce( QContextMenuEvent::Mouse, ev->pos(), 2 );
- QApplication::sendEvent( obj, &ce );
+ TQMouseEvent me( TQEvent::MouseButtonPress, ev->pos(), 2, 2 );
+ TQApplication::sendEvent( obj, &me );
+ TQContextMenuEvent ce( TQContextMenuEvent::Mouse, ev->pos(), 2 );
+ TQApplication::sendEvent( obj, &ce );
obj->installEventFilter( this );
return true;
}
}
}
- if ( e->type() == QEvent::FocusIn )
+ if ( e->type() == TQEvent::FocusIn )
{
setActiveInstance();
}
@@ -1381,10 +1381,10 @@ KParts::StatusBarExtension * KonqView::statusBarExtension() const
return KParts::StatusBarExtension::childObject( m_pPart );
}
-bool KonqView::supportsServiceType( const QString &serviceType ) const
+bool KonqView::supportsServiceType( const TQString &serviceType ) const
{
- const QStringList lst = serviceTypes();
- for( QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+ const TQStringList lst = serviceTypes();
+ for( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
if ( *it == serviceType )
return true;
// Maybe we should keep around a list of KServiceType::Ptr?
diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h
index 24bec3110..28f2568d9 100644
--- a/konqueror/konq_view.h
+++ b/konqueror/konq_view.h
@@ -23,12 +23,12 @@
#include "konq_mainwindow.h"
#include "konq_factory.h"
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qobject.h>
-#include <qstringlist.h>
-#include <qguardedptr.h>
-#include <qcstring.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
+#include <tqguardedptr.h>
+#include <tqcstring.h>
#include <ktrader.h>
@@ -45,15 +45,15 @@ namespace KParts
struct HistoryEntry
{
KURL url;
- QString locationBarURL; // can be different from url when showing a index.html
- QString title;
- QByteArray buffer;
- QString strServiceType;
- QString strServiceName;
- QByteArray postData;
- QString postContentType;
+ TQString locationBarURL; // can be different from url when showing a index.html
+ TQString title;
+ TQByteArray buffer;
+ TQString strServiceType;
+ TQString strServiceName;
+ TQByteArray postData;
+ TQString postContentType;
bool doPost;
- QString pageReferrer;
+ TQString pageReferrer;
KonqMainWindow::PageSecurity pageSecurity;
};
@@ -84,7 +84,7 @@ public:
const KService::Ptr &service,
const KTrader::OfferList &partServiceOffers,
const KTrader::OfferList &appServiceOffers,
- const QString &serviceType,
+ const TQString &serviceType,
bool passiveMode);
~KonqView();
@@ -98,8 +98,8 @@ public:
* @param tempFile whether to delete the file after use
*/
void openURL( const KURL &url,
- const QString & locationBarURL,
- const QString &nameFilter = QString::null,
+ const TQString & locationBarURL,
+ const TQString &nameFilter = TQString::null,
bool tempFile = false );
/**
@@ -110,8 +110,8 @@ public:
* @param serviceName allows to enforce a particular service to be chosen,
* @see KonqFactory.
*/
- bool changeViewMode( const QString &serviceType,
- const QString &serviceName = QString::null,
+ bool changeViewMode( const TQString &serviceType,
+ const TQString &serviceName = TQString::null,
bool forceAutoEmbed = false );
/**
@@ -154,7 +154,7 @@ public:
/**
* @return the history of this view
*/
- const QPtrList<HistoryEntry> & history() { return m_lstHistory; }
+ const TQPtrList<HistoryEntry> & history() { return m_lstHistory; }
/**
* @return the HistoryEntry at postion @p pos
@@ -190,16 +190,16 @@ public:
* Get view's location bar URL, i.e. the one that the view signals
* It can be different from url(), for instance if we display a index.html
*/
- QString locationBarURL() const { return m_sLocationBarURL; }
+ TQString locationBarURL() const { return m_sLocationBarURL; }
/**
* Get the URL that was typed to get the current URL.
*/
- QString typedURL() const { return m_sTypedURL; }
+ TQString typedURL() const { return m_sTypedURL; }
/**
* Set the URL that was typed to get the current URL.
*/
- void setTypedURL( const QString & u ) { m_sTypedURL = u; }
+ void setTypedURL( const TQString & u ) { m_sTypedURL = u; }
/**
* Return the security state of page in view
@@ -228,14 +228,14 @@ public:
/**
* @return the servicetype this view is currently displaying
*/
- QString serviceType() const { return m_serviceType; }
+ TQString serviceType() const { return m_serviceType; }
/**
* @return the servicetypes this view is capable to display
*/
- QStringList serviceTypes() const { return m_service->serviceTypes(); }
+ TQStringList serviceTypes() const { return m_service->serviceTypes(); }
- bool supportsServiceType( const QString &serviceType ) const;
+ bool supportsServiceType( const TQString &serviceType ) const;
// True if "Use index.html" is set (->the view doesn't necessarily show HTML!)
bool allowHTML() const { return m_bAllowHTML; }
@@ -279,7 +279,7 @@ public:
void setService( const KService::Ptr &s ) { m_service = s; }
KService::Ptr service() { return m_service; }
- QString caption() const { return m_caption; }
+ TQString caption() const { return m_caption; }
KTrader::OfferList partServiceOffers() { return m_partServiceOffers; }
KTrader::OfferList appServiceOffers() { return m_appServiceOffers; }
@@ -289,11 +289,11 @@ public:
// return true if the method was found, false if the execution failed
bool callExtensionMethod( const char *methodName );
bool callExtensionBoolMethod( const char *methodName, bool value );
- bool callExtensionStringMethod( const char *methodName, QString value );
+ bool callExtensionStringMethod( const char *methodName, TQString value );
bool callExtensionURLMethod( const char *methodName, const KURL& value );
- void setViewName( const QString &name );
- QString viewName() const;
+ void setViewName( const TQString &name );
+ TQString viewName() const;
// True to enable the context popup menu
void enablePopupMenu( bool b );
@@ -303,7 +303,7 @@ public:
void disableScrolling();
- QStringList frameNames() const;
+ TQStringList frameNames() const;
KonqViewIface * dcopObject();
@@ -316,12 +316,12 @@ public:
// Returns false in case the reload must be cancelled.
bool prepareReload( KParts::URLArgs& args );
- // overload for the QString version
+ // overload for the TQString version
void setLocationBarURL( const KURL& locationBarURL );
- static QStringList childFrameNames( KParts::ReadOnlyPart *part );
+ static TQStringList childFrameNames( KParts::ReadOnlyPart *part );
- static KParts::BrowserHostExtension *hostExtension( KParts::ReadOnlyPart *part, const QString &name );
+ static KParts::BrowserHostExtension *hostExtension( KParts::ReadOnlyPart *part, const TQString &name );
signals:
@@ -346,7 +346,7 @@ public slots:
* and updates the main view if this view is the current one
* May be different from url e.g. if using "allowHTML".
*/
- void setLocationBarURL( const QString & locationBarURL );
+ void setLocationBarURL( const TQString & locationBarURL );
/**
* get an icon for the URL from the BrowserExtension
*/
@@ -354,20 +354,20 @@ public slots:
void setTabIcon( const KURL &url );
- void setCaption( const QString & caption );
+ void setCaption( const TQString & caption );
void setPageSecurity( int );
// connected to the KROP's KIO::Job
// but also to KonqRun's job
- void slotInfoMessage( KIO::Job *, const QString &msg );
+ void slotInfoMessage( KIO::Job *, const TQString &msg );
protected slots:
// connected to the KROP's KIO::Job
void slotStarted( KIO::Job * job );
void slotCompleted();
void slotCompleted( bool );
- void slotCanceled( const QString & errMsg );
+ void slotCanceled( const TQString & errMsg );
void slotPercent( KIO::Job *, unsigned long percent );
void slotSpeed( KIO::Job *, unsigned long bytesPerSecond );
@@ -378,7 +378,7 @@ protected slots:
void slotMouseOverInfo( const KFileItem* item );
void slotOpenURLNotify();
void slotEnableAction( const char * name, bool enabled );
- void slotSetActionText( const char* name, const QString& text );
+ void slotSetActionText( const char* name, const TQString& text );
void slotMoveTopLevelWidget( int x, int y );
void slotResizeTopLevelWidget( int w, int h );
void slotRequestFocus(KParts::ReadOnlyPart*);
@@ -414,35 +414,35 @@ private:
void finishedWithCurrentURL();
- virtual bool eventFilter( QObject *obj, QEvent *e );
+ virtual bool eventFilter( TQObject *obj, TQEvent *e );
////////////////// private members ///////////////
KParts::ReadOnlyPart *m_pPart;
- QString m_sLocationBarURL;
- QString m_sTypedURL;
+ TQString m_sLocationBarURL;
+ TQString m_sTypedURL;
KonqMainWindow::PageSecurity m_pageSecurity;
/**
* The full history (back + current + forward)
* The current position in the history is m_lstHistory.current()
*/
- QPtrList<HistoryEntry> m_lstHistory;
+ TQPtrList<HistoryEntry> m_lstHistory;
/**
* The post data that _resulted_ in this page.
* e.g. when submitting a form, and the result is an image, this data will be
* set (and saved/restored) when the image is being viewed. Necessary for reload.
*/
- QByteArray m_postData;
- QString m_postContentType;
+ TQByteArray m_postData;
+ TQString m_postContentType;
bool m_doPost;
/**
* The referrer that was used to obtain this page.
*/
- QString m_pageReferrer;
+ TQString m_pageReferrer;
KonqMainWindow *m_pMainWindow;
KonqRun *m_pRun;
@@ -468,9 +468,9 @@ private:
KTrader::OfferList m_partServiceOffers;
KTrader::OfferList m_appServiceOffers;
KService::Ptr m_service;
- QString m_serviceType;
- QString m_caption;
- QString m_tempFile;
+ TQString m_serviceType;
+ TQString m_caption;
+ TQString m_tempFile;
KonqViewIface * m_dcopObject;
KonqBrowserInterface *m_browserIface;
int m_randID;
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc
index 0460296c9..c4f03da75 100644
--- a/konqueror/konq_viewmgr.cc
+++ b/konqueror/konq_viewmgr.cc
@@ -26,8 +26,8 @@
#include "konq_events.h"
#include "konq_settingsxt.h"
-#include <qfileinfo.h>
-#include <qptrlist.h>
+#include <tqfileinfo.h>
+#include <tqptrlist.h>
#include <kaccelgen.h>
#include <kstandarddirs.h>
@@ -44,7 +44,7 @@
// #define DEBUG_VIEWMGR
-template class QPtrList<KonqView>;
+template class TQPtrList<KonqView>;
KonqViewManager::KonqViewManager( KonqMainWindow *mainWindow )
: KParts::PartManager( mainWindow )
@@ -56,12 +56,12 @@ KonqViewManager::KonqViewManager( KonqMainWindow *mainWindow )
m_bProfileListDirty = true;
m_bLoadingProfile = false;
- m_activePartChangedTimer = new QTimer(this);
- connect(m_activePartChangedTimer, SIGNAL(timeout()), this, SLOT(emitActivePartChanged()));
- connect( this, SIGNAL( activePartChanged ( KParts::Part * ) ), this, SLOT( slotActivePartChanged ( KParts::Part * ) ) );
+ m_activePartChangedTimer = new TQTimer(this);
+ connect(m_activePartChangedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(emitActivePartChanged()));
+ connect( this, TQT_SIGNAL( activePartChanged ( KParts::Part * ) ), this, TQT_SLOT( slotActivePartChanged ( KParts::Part * ) ) );
}
-KonqView* KonqViewManager::Initialize( const QString &serviceType, const QString &serviceName )
+KonqView* KonqViewManager::Initialize( const TQString &serviceType, const TQString &serviceName )
{
//kdDebug(1202) << "KonqViewManager::Initialize()" << endl;
KService::Ptr service;
@@ -93,8 +93,8 @@ KonqViewManager::~KonqViewManager()
}
KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
- const QString &serviceType,
- const QString &serviceName,
+ const TQString &serviceType,
+ const TQString &serviceName,
bool newOneFirst, bool forceAutoEmbed )
{
#ifdef DEBUG_VIEWMGR
@@ -118,7 +118,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
KonqFrameContainerBase* parentContainer = splitFrame->parentContainer();
bool moveNewContainer = false;
- QValueList<int> splitterSizes;
+ TQValueList<int> splitterSizes;
int index= -1;
if (parentContainer->frameType()=="Container") {
@@ -135,13 +135,13 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
parentContainer->widget()->setUpdatesEnabled( false );
//kdDebug(1202) << "Move out child" << endl;
- QPoint pos = splitFrame->widget()->pos();
+ TQPoint pos = splitFrame->widget()->pos();
parentContainer->removeChildFrame( splitFrame );
splitFrame->widget()->reparent( m_pMainWindow, pos );
//kdDebug(1202) << "Create new Container" << endl;
KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, parentContainer->widget(), parentContainer );
- connect(newContainer,SIGNAL(ctrlTabPressed()),m_pMainWindow,SLOT(slotCtrlTabPressed()));
+ connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
parentContainer->insertChildFrame( newContainer, index );
if ( moveNewContainer ) {
@@ -170,7 +170,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
newContainer->swapChildren();
}
- QValueList<int> newSplitterSizes;
+ TQValueList<int> newSplitterSizes;
newSplitterSizes << 50 << 50;
newContainer->setSizes( newSplitterSizes );
@@ -203,8 +203,8 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
}
KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
- const QString &serviceType,
- const QString &serviceName,
+ const TQString &serviceType,
+ const TQString &serviceName,
bool newOneFirst )
{
kdDebug(1202) << "KonqViewManager::splitWindow(default)" << endl;
@@ -214,7 +214,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
return 0L;
KURL url = m_pMainWindow->currentView()->url();
- QString locationBarURL = m_pMainWindow->currentView()->locationBarURL();
+ TQString locationBarURL = m_pMainWindow->currentView()->locationBarURL();
KService::Ptr service;
KTrader::OfferList partServiceOffers, appServiceOffers;
@@ -229,11 +229,11 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
mainFrame->widget()->setUpdatesEnabled( false );
//kdDebug(1202) << "Move out child" << endl;
- QPoint pos = mainFrame->widget()->pos();
+ TQPoint pos = mainFrame->widget()->pos();
m_pMainWindow->removeChildFrame( mainFrame );
KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, m_pMainWindow, 0L);
- connect(newContainer,SIGNAL(ctrlTabPressed()),m_pMainWindow,SLOT(slotCtrlTabPressed()));
+ connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
m_pMainWindow->insertChildFrame( newContainer );
@@ -273,7 +273,7 @@ void KonqViewManager::convertDocContainer()
KonqFrameContainerBase* parentContainer = m_pDocContainer->parentContainer();
bool moveNewContainer = false;
- QValueList<int> splitterSizes;
+ TQValueList<int> splitterSizes;
if (parentContainer->frameType()=="Container") {
moveNewContainer = (static_cast<KonqFrameContainer*>(parentContainer)->idAfter( m_pDocContainer->widget() ) != 0);
splitterSizes = static_cast<KonqFrameContainer*>(parentContainer)->sizes();
@@ -282,13 +282,13 @@ void KonqViewManager::convertDocContainer()
parentContainer->widget()->setUpdatesEnabled( false );
//kdDebug(1202) << "Move out child" << endl;
- QPoint pos = m_pDocContainer->widget()->pos();
+ TQPoint pos = m_pDocContainer->widget()->pos();
parentContainer->removeChildFrame( m_pDocContainer );
m_pDocContainer->widget()->reparent( m_pMainWindow, pos );
KonqFrameTabs* newContainer = new KonqFrameTabs( parentContainer->widget() , parentContainer, this);
parentContainer->insertChildFrame( newContainer );
- connect( newContainer, SIGNAL(ctrlTabPressed()), m_pMainWindow, SLOT(slotCtrlTabPressed()) );
+ connect( newContainer, TQT_SIGNAL(ctrlTabPressed()), m_pMainWindow, TQT_SLOT(slotCtrlTabPressed()) );
m_pDocContainer->widget()->reparent( newContainer, pos );
newContainer->insertChildFrame( m_pDocContainer );
@@ -307,7 +307,7 @@ void KonqViewManager::convertDocContainer()
m_pDocContainer = newContainer;
}
-KonqView* KonqViewManager::addTab(const QString &serviceType, const QString &serviceName, bool passiveMode, bool openAfterCurrentPage )
+KonqView* KonqViewManager::addTab(const TQString &serviceType, const TQString &serviceName, bool passiveMode, bool openAfterCurrentPage )
{
#ifdef DEBUG_VIEWMGR
kdDebug(1202) << "------------- KonqViewManager::addTab starting -------------" << endl;
@@ -423,12 +423,12 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag
KConfig config( tempFile.name() );
config.setGroup( "View Profile" );
- QString prefix = QString::fromLatin1( currentFrame->frameType() ) + QString::number(0);
+ TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0);
config.writeEntry( "RootItem", prefix );
prefix.append( '_' );
currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1);
- QString rootItem = config.readEntry( "RootItem", "empty" );
+ TQString rootItem = config.readEntry( "RootItem", "empty" );
if (rootItem.isNull() || rootItem == "empty") return;
@@ -493,10 +493,10 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab )
KConfig config( tempFile.name() );
config.setGroup( "View Profile" );
- QString prefix = QString::fromLatin1( currentFrame->frameType() ) + QString::number(0);
+ TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0);
config.writeEntry( "RootItem", prefix );
prefix.append( '_' );
- config.writeEntry( QString::fromLatin1( "docContainer" ).prepend( prefix ), true );
+ config.writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true );
currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1);
KonqMainWindow *mainWindow = new KonqMainWindow( KURL(), false );
@@ -567,8 +567,8 @@ void KonqViewManager::removeTab( KonqFrameBase* tab )
tabContainer->removeChildFrame(currentFrame);
- QPtrList<KonqView> viewList;
- QPtrListIterator<KonqView> it( viewList );
+ TQPtrList<KonqView> viewList;
+ TQPtrListIterator<KonqView> it( viewList );
currentFrame->listViews( &viewList );
@@ -598,8 +598,8 @@ void KonqViewManager::reloadAllTabs( )
KonqFrameTabs* tabContainer = static_cast<KonqFrameTabs*>(m_pDocContainer);
- QPtrList<KonqFrameBase> frameList = *tabContainer->childFrameList();
- QPtrListIterator<KonqFrameBase> it( frameList );
+ TQPtrList<KonqFrameBase> frameList = *tabContainer->childFrameList();
+ TQPtrListIterator<KonqFrameBase> it( frameList );
for ( it.toFirst(); it != 0L; ++it )
{
@@ -630,8 +630,8 @@ void KonqViewManager::removeOtherTabs( KonqFrameBase* tab )
return;
}
- QPtrList<KonqFrameBase> frameList = *tabContainer->childFrameList();
- QPtrListIterator<KonqFrameBase> it( frameList );
+ TQPtrList<KonqFrameBase> frameList = *tabContainer->childFrameList();
+ TQPtrListIterator<KonqFrameBase> it( frameList );
for ( it.toFirst(); it != 0L; ++it )
{
@@ -728,8 +728,8 @@ void KonqViewManager::updatePixmaps()
KonqFrameTabs* tabContainer = static_cast<KonqFrameTabs*>(m_pDocContainer);
- QPtrList<KonqView> viewList;
- QPtrListIterator<KonqView> it( viewList );
+ TQPtrList<KonqView> viewList;
+ TQPtrListIterator<KonqView> it( viewList );
tabContainer->listViews( &viewList );
for ( it.toFirst(); it != 0L; ++it )
@@ -762,7 +762,7 @@ void KonqViewManager::removeView( KonqView *view )
setActivePart( 0L, true );
int index = -1;
- QValueList<int> splitterSizes;
+ TQValueList<int> splitterSizes;
bool moveOtherChild = false;
if (grandParentContainer->frameType()=="Tabs")
@@ -788,7 +788,7 @@ void KonqViewManager::removeView( KonqView *view )
static_cast<KonqFrameContainer*>(parentContainer)->setAboutToBeDeleted();
//kdDebug(1202) << "--- Reparenting otherFrame to m_pMainWindow " << m_pMainWindow << endl;
- QPoint pos = otherFrame->widget()->pos();
+ TQPoint pos = otherFrame->widget()->pos();
otherFrame->reparentFrame( m_pMainWindow, pos );
//kdDebug(1202) << "--- Removing otherFrame from parentContainer" << endl;
@@ -884,7 +884,7 @@ void KonqViewManager::slotPassiveModePartDeleted()
// Passive mode parts aren't registered to the part manager,
// so we have to handle suicidal ones ourselves
KParts::ReadOnlyPart * part = const_cast<KParts::ReadOnlyPart *>( static_cast<const KParts::ReadOnlyPart *>( sender() ) );
- disconnect( part, SIGNAL( destroyed() ), this, SLOT( slotPassiveModePartDeleted() ) );
+ disconnect( part, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) );
kdDebug(1202) << "KonqViewManager::slotPassiveModePartDeleted part=" << part << endl;
KonqView * view = m_pMainWindow->childView( part );
kdDebug(1202) << "view=" << view << endl;
@@ -918,13 +918,13 @@ void KonqViewManager::clear()
if (m_pMainWindow->childFrame() == 0L) return;
- QPtrList<KonqView> viewList;
+ TQPtrList<KonqView> viewList;
m_pMainWindow->listViews( &viewList );
kdDebug(1202) << viewList.count() << " items" << endl;
- QPtrListIterator<KonqView> it( viewList );
+ TQPtrListIterator<KonqView> it( viewList );
for ( it.toFirst(); it.current(); ++it ) {
m_pMainWindow->removeChildView( it.current() );
kdDebug(1202) << "Deleting " << it.current() << endl;
@@ -981,8 +981,8 @@ KonqView *KonqViewManager::chooseNextView( KonqView *view )
return 0L; // no next view found
}
-KonqViewFactory KonqViewManager::createView( const QString &serviceType,
- const QString &serviceName,
+KonqViewFactory KonqViewManager::createView( const TQString &serviceType,
+ const TQString &serviceName,
KService::Ptr &service,
KTrader::OfferList &partServiceOffers,
KTrader::OfferList &appServiceOffers,
@@ -994,7 +994,7 @@ KonqViewFactory KonqViewManager::createView( const QString &serviceType,
if( serviceType.isEmpty() && m_pMainWindow->currentView() ) {
//clone current view
KonqView *cv = m_pMainWindow->currentView();
- QString _serviceType, _serviceName;
+ TQString _serviceType, _serviceName;
if ( cv->service()->desktopEntryName() == "konq_sidebartng" ) {
_serviceType = "text/html";
}
@@ -1020,13 +1020,13 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
const KService::Ptr &service,
const KTrader::OfferList &partServiceOffers,
const KTrader::OfferList &appServiceOffers,
- const QString &serviceType,
+ const TQString &serviceType,
bool passiveMode,
bool openAfterCurrentPage )
{
kdDebug(1202) << "KonqViewManager::setupView passiveMode=" << passiveMode << endl;
- QString sType = serviceType;
+ TQString sType = serviceType;
if ( sType.isEmpty() )
sType = m_pMainWindow->currentView()->serviceType();
@@ -1040,8 +1040,8 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
m_pMainWindow, service, partServiceOffers, appServiceOffers, sType, passiveMode );
//kdDebug(1202) << "KonqView created - v=" << v << " v->part()=" << v->part() << endl;
- QObject::connect( v, SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ),
- m_pMainWindow, SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) );
+ TQObject::connect( v, TQT_SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ),
+ m_pMainWindow, TQT_SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) );
m_pMainWindow->insertChildView( v );
@@ -1065,7 +1065,7 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
else
{
// Passive views aren't registered, but we still want to detect the suicidal ones
- connect( v->part(), SIGNAL( destroyed() ), this, SLOT( slotPassiveModePartDeleted() ) );
+ connect( v->part(), TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) );
}
//kdDebug(1202) << "KonqViewManager::setupView done" << endl;
@@ -1074,14 +1074,14 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
///////////////// Profile stuff ////////////////
-void KonqViewManager::saveViewProfile( const QString & fileName, const QString & profileName, bool saveURLs, bool saveWindowSize )
+void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString & profileName, bool saveURLs, bool saveWindowSize )
{
- QString path = locateLocal( "data", QString::fromLatin1( "konqueror/profiles/" ) +
+ TQString path = locateLocal( "data", TQString::fromLatin1( "konqueror/profiles/" ) +
fileName, KGlobal::instance() );
- if ( QFile::exists( path ) )
- QFile::remove( path );
+ if ( TQFile::exists( path ) )
+ TQFile::remove( path );
KSimpleConfig cfg( path );
cfg.setGroup( "Profile" );
@@ -1096,8 +1096,8 @@ void KonqViewManager::saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWi
{
//kdDebug(1202) << "KonqViewManager::saveViewProfile" << endl;
if( m_pMainWindow->childFrame() != 0L ) {
- QString prefix = QString::fromLatin1( m_pMainWindow->childFrame()->frameType() )
- + QString::number(0);
+ TQString prefix = TQString::fromLatin1( m_pMainWindow->childFrame()->frameType() )
+ + TQString::number(0);
cfg.writeEntry( "RootItem", prefix );
prefix.append( '_' );
m_pMainWindow->saveConfig( &cfg, prefix, saveURLs, m_pDocContainer, 0, 1);
@@ -1115,14 +1115,14 @@ void KonqViewManager::saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWi
// setAutoSaveSetting( "KongMainWindow", false ). The false is important,
// we do not want this call save size settings in the profile, because we
// do it ourselves. Save in a separate group than the rest of the profile.
- QString savedGroup = cfg.group();
+ TQString savedGroup = cfg.group();
m_pMainWindow->saveMainWindowSettings( &cfg, "Main Window Settings" );
cfg.setGroup( savedGroup );
cfg.sync();
}
-void KonqViewManager::loadViewProfile( const QString & path, const QString & filename,
+void KonqViewManager::loadViewProfile( const TQString & path, const TQString & filename,
const KURL & forcedURL, const KonqOpenURLRequest &req,
bool resetWindow, bool openURL )
{
@@ -1132,7 +1132,7 @@ void KonqViewManager::loadViewProfile( const QString & path, const QString & fil
loadViewProfile( cfg, filename, forcedURL, req, resetWindow, openURL );
}
-void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename,
+void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename,
const KURL & forcedURL, const KonqOpenURLRequest &req,
bool resetWindow, bool openURL )
{
@@ -1151,13 +1151,13 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename,
}
KonqView *originalView = m_pMainWindow->currentView();
- QPtrList<KonqFrameBase> frameList = *tabContainer->childFrameList();
- QPtrListIterator<KonqFrameBase> it( frameList );
+ TQPtrList<KonqFrameBase> frameList = *tabContainer->childFrameList();
+ TQPtrListIterator<KonqFrameBase> it( frameList );
for ( it.toFirst(); it != 0L; ++it )
{
KonqView *view = it.current()->activeChildView();
if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) {
- QVariant prop = view->part()->property("modified");
+ TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
showTab( view );
if ( KMessageBox::warningContinueCancel( 0,
@@ -1176,7 +1176,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename,
{
KonqView *view = m_pMainWindow->currentView();
if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) {
- QVariant prop = view->part()->property("modified");
+ TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( 0,
i18n("This page contains changes that have not been submitted.\nLoading a profile will discard these changes."),
@@ -1189,7 +1189,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename,
m_currentProfile = filename;
m_currentProfileText = cfg.readPathEntry("Name",filename);
- m_profileHomeURL = cfg.readEntry("HomeURL", QString::null);
+ m_profileHomeURL = cfg.readEntry("HomeURL", TQString::null);
m_pMainWindow->currentProfileChanged();
KURL defaultURL;
@@ -1198,7 +1198,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename,
clear();
- QString rootItem = cfg.readEntry( "RootItem", "empty" );
+ TQString rootItem = cfg.readEntry( "RootItem", "empty" );
//kdDebug(1202) << "KonqViewManager::loadViewProfile : loading RootItem " << rootItem <<
//" forcedURL " << forcedURL.url() << endl;
@@ -1289,7 +1289,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename,
if( m_pMainWindow->isFullScreen())
m_pMainWindow->showNormal();
- QSize size = readConfigSize( cfg, m_pMainWindow );
+ TQSize size = readConfigSize( cfg, m_pMainWindow );
if ( size.isValid() )
m_pMainWindow->resize( size );
else // no size in the profile; use last known size
@@ -1306,7 +1306,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename,
// so that the window doesn't try to change the size stored in the Profile group.
// (If applyMainWindowSettings finds a "Width" or "Height" entry, it
// sets them to 0,0)
- QString savedGroup = cfg.group();
+ TQString savedGroup = cfg.group();
m_pMainWindow->applyMainWindowSettings( &cfg, "Main Window Settings" );
cfg.setGroup( savedGroup );
@@ -1317,7 +1317,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const QString & filename,
//kdDebug(1202) << "KonqViewManager::loadViewProfile done" << endl;
}
-void KonqViewManager::setActivePart( KParts::Part *part, QWidget * )
+void KonqViewManager::setActivePart( KParts::Part *part, TQWidget * )
{
setActivePart( part, false );
}
@@ -1401,17 +1401,17 @@ void KonqViewManager::emitActivePartChanged()
}
-QSize KonqViewManager::readConfigSize( KConfig &cfg, QWidget *widget )
+TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget )
{
bool ok;
- QString widthStr = cfg.readEntry( "Width" );
- QString heightStr = cfg.readEntry( "Height" );
+ TQString widthStr = cfg.readEntry( "Width" );
+ TQString heightStr = cfg.readEntry( "Height" );
int width = -1;
int height = -1;
- QRect geom = KGlobalSettings::desktopGeometry(widget);
+ TQRect geom = KGlobalSettings::desktopGeometry(widget);
if ( widthStr.contains( '%' ) == 1 )
{
@@ -1443,13 +1443,13 @@ QSize KonqViewManager::readConfigSize( KConfig &cfg, QWidget *widget )
height = -1;
}
- return QSize( width, height );
+ return TQSize( width, height );
}
void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
- const QString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage )
+ const TQString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage )
{
- QString prefix;
+ TQString prefix;
if( name != "InitialView" )
prefix = name + '_';
@@ -1457,16 +1457,16 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
if( name.startsWith("View") || name == "empty" ) {
//load view config
- QString serviceType;
- QString serviceName;
+ TQString serviceType;
+ TQString serviceName;
if ( name == "empty" ) {
// An empty profile is an empty KHTML part. Makes all KHTML actions available, avoids crashes,
// makes it easy to DND a URL onto it, and makes it fast to load a website from there.
serviceType = "text/html";
serviceName = "html";
} else {
- serviceType = cfg.readEntry( QString::fromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory");
- serviceName = cfg.readEntry( QString::fromLatin1( "ServiceName" ).prepend( prefix ) );
+ serviceType = cfg.readEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory");
+ serviceName = cfg.readEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ) );
}
//kdDebug(1202) << "KonqViewManager::loadItem: ServiceType " << serviceType << " " << serviceName << endl;
@@ -1480,17 +1480,17 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
return; //ugh..
}
- bool passiveMode = cfg.readBoolEntry( QString::fromLatin1( "PassiveMode" ).prepend( prefix ), false );
+ bool passiveMode = cfg.readBoolEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), false );
//kdDebug(1202) << "KonqViewManager::loadItem: Creating View Stuff" << endl;
KonqView *childView = setupView( parent, viewFactory, service, partServiceOffers, appServiceOffers, serviceType, passiveMode, openAfterCurrentPage );
- if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( QString::fromLatin1( "LinkedView" ).prepend( prefix ), false ) );
- childView->setToggleView( cfg.readBoolEntry( QString::fromLatin1( "ToggleView" ).prepend( prefix ), false ) );
- if( !cfg.readBoolEntry( QString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) )
+ if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), false ) );
+ childView->setToggleView( cfg.readBoolEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), false ) );
+ if( !cfg.readBoolEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) )
childView->frame()->statusbar()->hide();
- if (cfg.readBoolEntry( QString::fromLatin1( "docContainer" ).prepend( prefix ), false ))
+ if (cfg.readBoolEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), false ))
m_pDocContainer = childView->frame();
if (!m_pDocContainer)
@@ -1532,11 +1532,11 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
}
}
KonqConfigEvent ev( &cfg, prefix+"_", false/*load*/);
- QApplication::sendEvent( childView->part(), &ev );
+ TQApplication::sendEvent( childView->part(), &ev );
childView->frame()->show();
- QString key = QString::fromLatin1( "URL" ).prepend( prefix );
+ TQString key = TQString::fromLatin1( "URL" ).prepend( prefix );
if ( openURL )
{
KURL url;
@@ -1544,13 +1544,13 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
//kdDebug(1202) << "KonqViewManager::loadItem: key " << key << endl;
if ( cfg.hasKey( key ) )
{
- QString u = cfg.readPathEntry( key );
+ TQString u = cfg.readPathEntry( key );
if ( u.isEmpty() )
- u = QString::fromLatin1("about:blank");
+ u = TQString::fromLatin1("about:blank");
url = u;
}
else if(key == "empty_URL")
- url = QString::fromLatin1("about:blank");
+ url = TQString::fromLatin1("about:blank");
else
url = defaultURL;
@@ -1567,13 +1567,13 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
//else kdDebug(1202) << "KonqViewManager::loadItem: url is empty" << endl;
}
// Do this after opening the URL, so that it's actually possible to open it :)
- childView->setLockedLocation( cfg.readBoolEntry( QString::fromLatin1( "LockedLocation" ).prepend( prefix ), false ) );
+ childView->setLockedLocation( cfg.readBoolEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), false ) );
}
else if( name.startsWith("Container") ) {
//kdDebug(1202) << "KonqViewManager::loadItem Item is Container" << endl;
//load container config
- QString ostr = cfg.readEntry( QString::fromLatin1( "Orientation" ).prepend( prefix ) );
+ TQString ostr = cfg.readEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ) );
//kdDebug(1202) << "Orientation: " << ostr << endl;
Qt::Orientation o;
if( ostr == "Vertical" )
@@ -1585,13 +1585,13 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
o = Qt::Horizontal;
}
- QValueList<int> sizes =
- cfg.readIntListEntry( QString::fromLatin1( "SplitterSizes" ).prepend( prefix ));
+ TQValueList<int> sizes =
+ cfg.readIntListEntry( TQString::fromLatin1( "SplitterSizes" ).prepend( prefix ));
- int index = cfg.readNumEntry( QString::fromLatin1( "activeChildIndex" ).prepend(prefix), -1 );
+ int index = cfg.readNumEntry( TQString::fromLatin1( "activeChildIndex" ).prepend(prefix), -1 );
- QStrList childList;
- if( cfg.readListEntry( QString::fromLatin1( "Children" ).prepend( prefix ), childList ) < 2 )
+ TQStrList childList;
+ if( cfg.readListEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), childList ) < 2 )
{
kdWarning() << "Profile Loading Error: Less than two children in " << name << endl;
// fallback to defaults
@@ -1600,7 +1600,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
else
{
KonqFrameContainer *newContainer = new KonqFrameContainer( o, parent->widget(), parent );
- connect(newContainer,SIGNAL(ctrlTabPressed()),m_pMainWindow,SLOT(slotCtrlTabPressed()));
+ connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
int tabindex = -1;
if(openAfterCurrentPage && parent->frameType() == "Tabs") // Need to honor it, if possible
@@ -1608,7 +1608,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
parent->insertChildFrame( newContainer, tabindex );
- if (cfg.readBoolEntry( QString::fromLatin1( "docContainer" ).prepend( prefix ), false ))
+ if (cfg.readBoolEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), false ))
m_pDocContainer = newContainer;
loadItem( cfg, newContainer, childList.at(0), defaultURL, openURL );
@@ -1629,18 +1629,18 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
//kdDebug(1202) << "KonqViewManager::loadItem: Item is a Tabs" << endl;
KonqFrameTabs *newContainer = new KonqFrameTabs( parent->widget(), parent, this );
- connect(newContainer,SIGNAL(ctrlTabPressed()),m_pMainWindow,SLOT(slotCtrlTabPressed()));
+ connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
parent->insertChildFrame( newContainer );
m_pDocContainer = newContainer;
- int index = cfg.readNumEntry( QString::fromLatin1( "activeChildIndex" ).prepend(prefix), 0 );
+ int index = cfg.readNumEntry( TQString::fromLatin1( "activeChildIndex" ).prepend(prefix), 0 );
- QStringList childList = cfg.readListEntry( QString::fromLatin1( "Children" ).prepend( prefix ) );
- for ( QStringList::Iterator it = childList.begin(); it != childList.end(); ++it )
+ TQStringList childList = cfg.readListEntry( TQString::fromLatin1( "Children" ).prepend( prefix ) );
+ for ( TQStringList::Iterator it = childList.begin(); it != childList.end(); ++it )
{
loadItem( cfg, newContainer, *it, defaultURL, openURL );
- QWidget* currentPage = newContainer->currentPage();
+ TQWidget* currentPage = newContainer->currentPage();
if (currentPage != 0L) {
KonqView* activeChildView = dynamic_cast<KonqFrameBase*>(currentPage)->activeChildView();
if (activeChildView != 0L) {
@@ -1667,16 +1667,16 @@ void KonqViewManager::setProfiles( KActionMenu *profiles )
if ( m_pamProfiles )
{
- connect( m_pamProfiles->popupMenu(), SIGNAL( activated( int ) ),
- this, SLOT( slotProfileActivated( int ) ) );
- connect( m_pamProfiles->popupMenu(), SIGNAL( aboutToShow() ),
- this, SLOT( slotProfileListAboutToShow() ) );
+ connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( activated( int ) ),
+ this, TQT_SLOT( slotProfileActivated( int ) ) );
+ connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( aboutToShow() ),
+ this, TQT_SLOT( slotProfileListAboutToShow() ) );
}
//KonqMainWindow::enableAllActions will call it anyway
//profileListDirty();
}
-void KonqViewManager::showProfileDlg( const QString & preselectProfile )
+void KonqViewManager::showProfileDlg( const TQString & preselectProfile )
{
KonqProfileDlg dlg( this, preselectProfile, m_pMainWindow );
dlg.exec();
@@ -1685,7 +1685,7 @@ void KonqViewManager::showProfileDlg( const QString & preselectProfile )
void KonqViewManager::slotProfileDlg()
{
- showProfileDlg( QString::null );
+ showProfileDlg( TQString::null );
}
void KonqViewManager::profileListDirty( bool broadcast )
@@ -1696,21 +1696,21 @@ void KonqViewManager::profileListDirty( bool broadcast )
m_bProfileListDirty = true;
#if 0
// There's always one profile at least, now...
- QStringList profiles = KonqFactory::instance()->dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
+ TQStringList profiles = KonqFactory::instance()->dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
if ( m_pamProfiles )
m_pamProfiles->setEnabled( profiles.count() > 0 );
#endif
return;
}
- kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "updateProfileList()", QByteArray() );
+ kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "updateProfileList()", TQByteArray() );
}
void KonqViewManager::slotProfileActivated( int id )
{
- QMap<QString, QString>::ConstIterator iter = m_mapProfileNames.begin();
- QMap<QString, QString>::ConstIterator end = m_mapProfileNames.end();
+ TQMap<TQString, TQString>::ConstIterator iter = m_mapProfileNames.begin();
+ TQMap<TQString, TQString>::ConstIterator end = m_mapProfileNames.end();
for(int i=0; iter != end; ++iter, ++i) {
if( i == id ) {
@@ -1727,18 +1727,18 @@ void KonqViewManager::slotProfileListAboutToShow()
if ( !m_pamProfiles || !m_bProfileListDirty )
return;
- QPopupMenu *popup = m_pamProfiles->popupMenu();
+ TQPopupMenu *popup = m_pamProfiles->popupMenu();
popup->clear();
// Fetch profiles
m_mapProfileNames = KonqProfileDlg::readAllProfiles();
// Generate accelerators
- QStringList accel_strings;
+ TQStringList accel_strings;
KAccelGen::generateFromKeys(m_mapProfileNames, accel_strings);
// Store menu items
- QValueListIterator<QString> iter = accel_strings.begin();
+ TQValueListIterator<TQString> iter = accel_strings.begin();
for( int id = 0;
iter != accel_strings.end();
++iter, ++id ) {
@@ -1752,10 +1752,10 @@ void KonqViewManager::setLoading( KonqView *view, bool loading )
{
KonqFrameContainerBase* parentContainer = view->frame()->parentContainer();
if ( parentContainer->frameType() == "Tabs" ) {
- QColor color;
+ TQColor color;
KonqFrameTabs* konqframetabs = static_cast<KonqFrameTabs*>( parentContainer );
if ( loading )
- color = QColor( (KGlobalSettings::linkColor().red() + KGlobalSettings::inactiveTextColor().red())/2,
+ color = TQColor( (KGlobalSettings::linkColor().red() + KGlobalSettings::inactiveTextColor().red())/2,
(KGlobalSettings::linkColor().green()+ KGlobalSettings::inactiveTextColor().green())/2,
(KGlobalSettings::linkColor().blue() + KGlobalSettings::inactiveTextColor().blue())/2 );
else
@@ -1776,8 +1776,8 @@ void KonqViewManager::showHTML(bool b)
KonqFrameTabs* tabContainer = static_cast<KonqFrameTabs*>(m_pDocContainer);
- QPtrList<KonqFrameBase> frameList = *tabContainer->childFrameList();
- QPtrListIterator<KonqFrameBase> it( frameList );
+ TQPtrList<KonqFrameBase> frameList = *tabContainer->childFrameList();
+ TQPtrListIterator<KonqFrameBase> it( frameList );
for ( it.toFirst(); it != 0L; ++it )
{
@@ -1802,16 +1802,16 @@ void KonqViewManager::printSizeInfo( KonqFrameBase* frame,
KonqFrameContainerBase* parent,
const char* msg )
{
- QRect r;
+ TQRect r;
r = frame->widget()->geometry();
qDebug("Child size %s : x: %d, y: %d, w: %d, h: %d", msg, r.x(),r.y(),r.width(),r.height() );
if ( parent->frameType() == "Container" )
{
- QValueList<int> sizes;
+ TQValueList<int> sizes;
sizes = static_cast<KonqFrameContainer*>(parent)->sizes();
printf( "Parent sizes %s :", msg );
- QValueList<int>::ConstIterator it;
+ TQValueList<int>::ConstIterator it;
for( it = sizes.begin(); it != sizes.end(); ++it )
printf( " %d", (*it) );
printf("\n");
@@ -1823,8 +1823,8 @@ void KonqViewManager::printFullHierarchy( KonqFrameContainerBase * container )
kdDebug(1202) << "currentView=" << m_pMainWindow->currentView() << endl;
kdDebug(1202) << "docContainer=" << m_pDocContainer << endl;
- if (container) container->printFrameInfo(QString::null);
- else m_pMainWindow->printFrameInfo(QString::null);
+ if (container) container->printFrameInfo(TQString::null);
+ else m_pMainWindow->printFrameInfo(TQString::null);
}
#endif
diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h
index dff2a033c..341710857 100644
--- a/konqueror/konq_viewmgr.h
+++ b/konqueror/konq_viewmgr.h
@@ -22,10 +22,10 @@
#include "konq_factory.h"
-#include <qnamespace.h>
-#include <qobject.h>
-#include <qmap.h>
-#include <qguardedptr.h>
+#include <tqnamespace.h>
+#include <tqobject.h>
+#include <tqmap.h>
+#include <tqguardedptr.h>
#include <ktrader.h>
@@ -57,7 +57,7 @@ public:
KonqViewManager( KonqMainWindow *mainWindow );
~KonqViewManager();
- KonqView* Initialize( const QString &serviceType, const QString &serviceName );
+ KonqView* Initialize( const TQString &serviceType, const TQString &serviceName );
/**
* Splits the view, depending on orientation, either horizontally or
@@ -70,8 +70,8 @@ public:
* @param newOneFirst if true, move the new view as the first one (left or top)
*/
KonqView* splitView( Qt::Orientation orientation,
- const QString & serviceType = QString::null,
- const QString & serviceName = QString::null,
+ const TQString & serviceType = TQString::null,
+ const TQString & serviceName = TQString::null,
bool newOneFirst = false, bool forceAutoEmbed = false );
/**
@@ -82,8 +82,8 @@ public:
* @param newOneFirst if true, move the new view as the first one (left or top)
*/
KonqView* splitWindow( Qt::Orientation orientation,
- const QString & serviceType = QString::null,
- const QString & serviceName = QString::null,
+ const TQString & serviceType = TQString::null,
+ const TQString & serviceName = TQString::null,
bool newOneFirst = false);
/**
@@ -95,8 +95,8 @@ public:
/**
* Adds a tab to m_pMainContainer
*/
- KonqView* addTab(const QString &serviceType = QString::null,
- const QString &serviceName = QString::null,
+ KonqView* addTab(const TQString &serviceType = TQString::null,
+ const TQString &serviceName = TQString::null,
bool passiveMode = false, bool openAfterCurrentPage = false );
@@ -188,20 +188,20 @@ public:
* @param saveURLs whether to save the URLs in the profile
* @param saveWindowSize whether to save the size of the window in the profile
*/
- void saveViewProfile( const QString & fileName, const QString & profileName,
+ void saveViewProfile( const TQString & fileName, const TQString & profileName,
bool saveURLs, bool saveWindowSize );
/**
* Loads a view layout from a config file. Removes all views before loading.
* @param cfg the config file
* @param filename if set, remember the file name of the profile (for save settings)
- * It has to be under the profiles dir. Otherwise, set to QString::null
+ * It has to be under the profiles dir. Otherwise, set to TQString::null
* @param forcedURL if set, the URL to open, whatever the profile says
* @param req attributes related to @p forcedURL
* @param resetWindow if the profile doesn't have attributes like size or toolbar
* settings, they will be reset to the defaults
*/
- void loadViewProfile( KConfig &cfg, const QString & filename,
+ void loadViewProfile( KConfig &cfg, const TQString & filename,
const KURL & forcedURL = KURL(),
const KonqOpenURLRequest &req = KonqOpenURLRequest(),
bool resetWindow = false, bool openURL = true );
@@ -210,13 +210,13 @@ public:
* Loads a view layout from a config file. Removes all views before loading.
* @param path the full path to the config file
* @param filename if set, remember the file name of the profile (for save settings)
- * It has to be under the profiles dir. Otherwise, set to QString::null
+ * It has to be under the profiles dir. Otherwise, set to TQString::null
* @param forcedURL if set, the URL to open, whatever the profile says
* @param req attributes related to @p forcedURL
* @param resetWindow if the profile doesn't have attributes like size or toolbar
* settings, they will be reset to the defaults
*/
- void loadViewProfile( const QString & path, const QString & filename,
+ void loadViewProfile( const TQString & path, const TQString & filename,
const KURL & forcedURL = KURL(),
const KonqOpenURLRequest &req = KonqOpenURLRequest(),
bool resetWindow = false, bool openURL = true );
@@ -224,12 +224,12 @@ public:
* Return the filename of the last profile that was loaded
* by the view manager. For "save settings".
*/
- QString currentProfile() const { return m_currentProfile; }
+ TQString currentProfile() const { return m_currentProfile; }
/**
* Return the name (i18n'ed) of the last profile that was loaded
* by the view manager. For "save settings".
*/
- QString currentProfileText() const { return m_currentProfileText; }
+ TQString currentProfileText() const { return m_currentProfileText; }
/**
* Whether we are currently loading a profile
@@ -265,16 +265,16 @@ public:
/**
* Reimplemented from PartManager
*/
- virtual void setActivePart( KParts::Part *part, QWidget *widget = 0L );
+ virtual void setActivePart( KParts::Part *part, TQWidget *widget = 0L );
void setActivePart( KParts::Part *part, bool immediate );
- void showProfileDlg( const QString & preselectProfile );
+ void showProfileDlg( const TQString & preselectProfile );
/**
* The widget is the one which you are referring to.
*/
- static QSize readConfigSize( KConfig &cfg, QWidget *widget = NULL);
+ static TQSize readConfigSize( KConfig &cfg, TQWidget *widget = NULL);
#ifndef NDEBUG
void printFullHierarchy( KonqFrameContainerBase * container );
@@ -284,7 +284,7 @@ public:
void showHTML(bool b);
- QString profileHomeURL() const { return m_profileHomeURL; }
+ TQString profileHomeURL() const { return m_profileHomeURL; }
protected slots:
void emitActivePartChanged();
@@ -310,7 +310,7 @@ protected:
* (this is set to false when we have a forcedURL to open)
*/
void loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
- const QString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage = false );
+ const TQString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage = false );
// Disabled - we do it ourselves
virtual void setActiveInstance( KInstance * ) {}
@@ -322,8 +322,8 @@ private:
* it clones the current view.
* Returns the newly created view.
*/
- KonqViewFactory createView( const QString &serviceType,
- const QString &serviceName,
+ KonqViewFactory createView( const TQString &serviceType,
+ const TQString &serviceName,
KService::Ptr &service,
KTrader::OfferList &partServiceOffers,
KTrader::OfferList &appServiceOffers,
@@ -338,7 +338,7 @@ private:
const KService::Ptr &service,
const KTrader::OfferList &partServiceOffers,
const KTrader::OfferList &appServiceOffers,
- const QString &serviceType,
+ const TQString &serviceType,
bool passiveMode, bool openAfterCurrentPage = false);
#ifndef NDEBUG
@@ -352,16 +352,16 @@ private:
KonqFrameBase *m_pDocContainer;
- QGuardedPtr<KActionMenu> m_pamProfiles;
+ TQGuardedPtr<KActionMenu> m_pamProfiles;
bool m_bProfileListDirty;
bool m_bLoadingProfile;
- QString m_currentProfile;
- QString m_currentProfileText;
- QString m_profileHomeURL;
+ TQString m_currentProfile;
+ TQString m_currentProfileText;
+ TQString m_profileHomeURL;
- QMap<QString, QString> m_mapProfileNames;
+ TQMap<TQString, TQString> m_mapProfileNames;
- QTimer *m_activePartChangedTimer;
+ TQTimer *m_activePartChangedTimer;
};
#endif
diff --git a/konqueror/kttsplugin/khtmlkttsd.cpp b/konqueror/kttsplugin/khtmlkttsd.cpp
index cda947223..e832bd27a 100644
--- a/konqueror/kttsplugin/khtmlkttsd.cpp
+++ b/konqueror/kttsplugin/khtmlkttsd.cpp
@@ -22,18 +22,18 @@
#include <kaction.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
-#include <qmessagebox.h>
+#include <tqmessagebox.h>
#include <klocale.h>
-#include <qstring.h>
-#include <qtimer.h>
+#include <tqstring.h>
+#include <tqtimer.h>
#include <kspeech.h>
-#include <qbuffer.h>
+#include <tqbuffer.h>
#include <kapplication.h>
#include <dcopclient.h>
#include <ktrader.h>
-KHTMLPluginKTTSD::KHTMLPluginKTTSD( QObject* parent, const char* name, const QStringList& )
+KHTMLPluginKTTSD::KHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& )
: Plugin( parent, name )
{
// If KTTSD is not installed, hide action.
@@ -42,7 +42,7 @@ KHTMLPluginKTTSD::KHTMLPluginKTTSD( QObject* parent, const char* name, const QSt
{
(void) new KAction( i18n("&Speak Text"),
"kttsd", 0,
- this, SLOT(slotReadOut()),
+ this, TQT_SLOT(slotReadOut()),
actionCollection(), "tools_kttsd" );
}
else
@@ -57,7 +57,7 @@ void KHTMLPluginKTTSD::slotReadOut()
{
// The parent is assumed to be a KHTMLPart
if ( !parent()->inherits("KHTMLPart") )
- QMessageBox::warning( 0, i18n( "Cannot Read source" ),
+ TQMessageBox::warning( 0, i18n( "Cannot Read source" ),
i18n( "You cannot read anything except web pages with\n"
"this plugin, sorry." ));
else
@@ -66,34 +66,34 @@ void KHTMLPluginKTTSD::slotReadOut()
DCOPClient *client = kapp->dcopClient();
if (!client->isApplicationRegistered("kttsd"))
{
- QString error;
- if (kapp->startServiceByDesktopName("kttsd", QStringList(), &error))
- QMessageBox::warning(0, i18n( "Starting KTTSD Failed"), error );
+ TQString error;
+ if (kapp->startServiceByDesktopName("kttsd", TQStringList(), &error))
+ TQMessageBox::warning(0, i18n( "Starting KTTSD Failed"), error );
}
// Find out if KTTSD supports xhtml (rich speak).
- QByteArray data;
- QBuffer dataBuf(data);
- QDataStream arg;
+ TQByteArray data;
+ TQBuffer dataBuf(data);
+ TQDataStream arg;
dataBuf.open(IO_WriteOnly);
arg.setDevice(&dataBuf);
arg << "" << KSpeech::mtHtml;
- QCString replyType;
- QByteArray replyData;
+ TQCString replyType;
+ TQByteArray replyData;
bool supportsXhtml = false;
- if ( !client->call("kttsd", "KSpeech", "supportsMarkup(QString,uint)",
+ if ( !client->call("kttsd", "KSpeech", "supportsMarkup(TQString,uint)",
data, replyType, replyData, true) )
- QMessageBox::warning( 0, i18n( "DCOP Call Failed" ),
+ TQMessageBox::warning( 0, i18n( "DCOP Call Failed" ),
i18n( "The DCOP call supportsMarkup failed." ));
else
{
- QDataStream reply(replyData, IO_ReadOnly);
+ TQDataStream reply(replyData, IO_ReadOnly);
reply >> supportsXhtml;
}
KHTMLPart *part = (KHTMLPart *) parent();
- QString query;
+ TQString query;
if (supportsXhtml)
{
kdDebug() << "KTTS claims to support rich speak (XHTML to SSML)." << endl;
@@ -120,15 +120,15 @@ void KHTMLPluginKTTSD::slotReadOut()
dataBuf.at(0); // reset data
arg << query << "";
- if ( !client->call("kttsd", "KSpeech", "setText(QString,QString)",
+ if ( !client->call("kttsd", "KSpeech", "setText(TQString,TQString)",
data, replyType, replyData, true) )
- QMessageBox::warning( 0, i18n( "DCOP Call Failed" ),
+ TQMessageBox::warning( 0, i18n( "DCOP Call Failed" ),
i18n( "The DCOP call setText failed." ));
dataBuf.at(0);
arg << 0;
if ( !client->call("kttsd", "KSpeech", "startText(uint)",
data, replyType, replyData, true) )
- QMessageBox::warning( 0, i18n( "DCOP Call Failed" ),
+ TQMessageBox::warning( 0, i18n( "DCOP Call Failed" ),
i18n( "The DCOP call startText failed." ));
}
}
diff --git a/konqueror/kttsplugin/khtmlkttsd.h b/konqueror/kttsplugin/khtmlkttsd.h
index aa1608498..b4e5702ca 100644
--- a/konqueror/kttsplugin/khtmlkttsd.h
+++ b/konqueror/kttsplugin/khtmlkttsd.h
@@ -33,7 +33,7 @@ public:
/**
* Construct a new KParts plugin.
*/
- KHTMLPluginKTTSD( QObject* parent, const char* name, const QStringList& );
+ KHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& );
/**
* Destructor.
diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc
index 02aac1d07..7b06a4996 100644
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cc
@@ -24,8 +24,8 @@
#include <klocale.h>
#include <assert.h>
#include <stdio.h>
-#include <qpainter.h>
-#include <qheader.h>
+#include <tqpainter.h>
+#include <tqheader.h>
#include <kiconloader.h>
#include "konq_infolistviewitem.h"
#include "konq_infolistviewwidget.h"
@@ -98,7 +98,7 @@ void KonqInfoListViewItem::updateContents()
case KIO::UDS_ACCESS_TIME:
case KIO::UDS_CREATION_TIME:
{
- QDateTime dt;
+ TQDateTime dt;
time_t _time = m_fileitem->time( tmpColumn->udsId );
if ( _time != 0 )
{
@@ -121,7 +121,7 @@ void KonqInfoListViewItem::gotMetaInfo()
if (!info.isValid()) return;
- QStringList::ConstIterator it = m_ILVWidget->columnKeys().begin();
+ TQStringList::ConstIterator it = m_ILVWidget->columnKeys().begin();
for (int i = 1; it != m_ILVWidget->columnKeys().end(); ++it, ++i)
{
KFileMetaInfoItem kfmii = info.item(*it);
@@ -132,12 +132,12 @@ void KonqInfoListViewItem::gotMetaInfo()
if (!kfmii.isValid())
continue;
- QString s = kfmii.string().simplifyWhiteSpace();
- setText(i, s.isNull() ? QString("") : s);
+ TQString s = kfmii.string().simplifyWhiteSpace();
+ setText(i, s.isNull() ? TQString("") : s);
}
}
-int KonqInfoListViewItem::compare( QListViewItem *item, int col, bool ascending ) const
+int KonqInfoListViewItem::compare( TQListViewItem *item, int col, bool ascending ) const
{
if ( col == 0 )
return KonqBaseListViewItem::compare( item, 0, ascending );
@@ -150,16 +150,16 @@ int KonqInfoListViewItem::compare( QListViewItem *item, int col, bool ascending
if ( size1 < col || size2 < col )
return ascending ? ( size2 - size1 ) : ( size1 - size2 );
- QVariant value1 = m_columnValues[ col-1 ];
- QVariant value2 = i->m_columnValues[ col-1 ];
- QVariant::Type type1 = m_columnTypes[ col-1 ];
- QVariant::Type type2 = i->m_columnTypes[ col-1 ];
+ TQVariant value1 = m_columnValues[ col-1 ];
+ TQVariant value2 = i->m_columnValues[ col-1 ];
+ TQVariant::Type type1 = m_columnTypes[ col-1 ];
+ TQVariant::Type type2 = i->m_columnTypes[ col-1 ];
if ( type1 != type2 )
return ascending ? ( type1 - type2 ) : ( type2 - type1 );
#define KONQ_CASE( x ) \
- case QVariant::x:\
+ case TQVariant::x:\
return ( value1.to##x() > value2.to##x() ) ? 1 : ( value1.to##x() == value2.to##x() ) ? 0 : -1;
switch( type1 ) {
@@ -172,7 +172,7 @@ int KonqInfoListViewItem::compare( QListViewItem *item, int col, bool ascending
KONQ_CASE( Date )
KONQ_CASE( Time )
KONQ_CASE( DateTime )
- case QVariant::Size:
+ case TQVariant::Size:
{
int w1 = value1.toSize().width();
int w2 = value2.toSize().width();
@@ -187,8 +187,8 @@ int KonqInfoListViewItem::compare( QListViewItem *item, int col, bool ascending
}
#undef KONQ_CASE
- QString text1 = text(col);
- QString text2 = i->text(col);
+ TQString text1 = text(col);
+ TQString text2 = i->text(col);
if ( text1.isEmpty() )
return ascending ? 1 : -1;
@@ -206,19 +206,19 @@ void KonqInfoListViewItem::setDisabled( bool disabled )
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}
-void KonqInfoListViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
{
- QColorGroup cg( _cg );
+ TQColorGroup cg( _cg );
if ( _column == 0 )
{
_painter->setFont( m_pListViewWidget->itemFont() );
}
- cg.setColor( QColorGroup::Text, m_pListViewWidget->itemColor() );
+ cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() );
KListView *lv = static_cast< KListView* >( listView() );
- const QPixmap *pm = lv->viewport()->paletteBackgroundPixmap();
+ const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap();
if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() )
{
int newWidth = width( lv->fontMetrics(), lv, _column );
@@ -226,11 +226,11 @@ void KonqInfoListViewItem::paintCell( QPainter *_painter, const QColorGroup & _c
newWidth = _width;
if ( pm && !pm->isNull() )
{
- cg.setBrush( QColorGroup::Base, QBrush( backgroundColor(_column), *pm ) );
- QPoint o = _painter->brushOrigin();
+ cg.setBrush( TQColorGroup::Base, TQBrush( backgroundColor(_column), *pm ) );
+ TQPoint o = _painter->brushOrigin();
_painter->setBrushOrigin( o.x() - lv->contentsX(), o.y() - lv->contentsY() );
- const QColorGroup::ColorRole crole =
- QPalette::backgroundRoleFromMode( lv->viewport()->backgroundMode() );
+ const TQColorGroup::ColorRole crole =
+ TQPalette::backgroundRoleFromMode( lv->viewport()->backgroundMode() );
_painter->fillRect( newWidth, 0, _width - newWidth, height(), cg.brush( crole ) );
_painter->setBrushOrigin( o );
}
@@ -245,14 +245,14 @@ void KonqInfoListViewItem::paintCell( QPainter *_painter, const QColorGroup & _c
KListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
}
-void KonqInfoListViewItem::paintFocus( QPainter * _painter, const QColorGroup & cg, const QRect & _r )
+void KonqInfoListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r )
{
- QRect r( _r );
- QListView *lv = static_cast< QListView * >( listView() );
+ TQRect r( _r );
+ TQListView *lv = static_cast< TQListView * >( listView() );
r.setWidth( width( lv->fontMetrics(), lv, 0 ) );
if ( r.right() > lv->header()->sectionRect( 0 ).right() )
r.setRight( lv->header()->sectionRect( 0 ).right() );
- QListViewItem::paintFocus( _painter, cg, r );
+ TQListViewItem::paintFocus( _painter, cg, r );
}
#if 0
diff --git a/konqueror/listview/konq_infolistviewitem.h b/konqueror/listview/konq_infolistviewitem.h
index 886ba66af..8dec97ee5 100644
--- a/konqueror/listview/konq_infolistviewitem.h
+++ b/konqueror/listview/konq_infolistviewitem.h
@@ -21,7 +21,7 @@
#define __konq_infolistviewitems_h__
#include "konq_listview.h"
-#include <qstring.h>
+#include <tqstring.h>
#include <kicontheme.h>
// for mode_t
@@ -55,15 +55,15 @@ class KonqInfoListViewItem : public KonqBaseListViewItem
virtual ~KonqInfoListViewItem() { }
- virtual void paintCell( QPainter *_painter, const QColorGroup & cg,
+ virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg,
int column, int width, int alignment );
- virtual void paintFocus( QPainter * _painter, const QColorGroup & cg, const QRect & r );
+ virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r );
virtual void updateContents();
virtual void setDisabled( bool disabled );
virtual void gotMetaInfo();
- virtual int compare(QListViewItem *item, int col, bool ascending) const;
+ virtual int compare(TQListViewItem *item, int col, bool ascending) const;
protected:
/**
@@ -72,8 +72,8 @@ class KonqInfoListViewItem : public KonqBaseListViewItem
KonqInfoListViewWidget* m_ILVWidget;
private:
- QValueVector<QVariant::Type> m_columnTypes;
- QValueVector<QVariant> m_columnValues;
+ TQValueVector<TQVariant::Type> m_columnTypes;
+ TQValueVector<TQVariant> m_columnValues;
};
#endif
diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc
index c9ef4b0e4..783c6eef3 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -29,16 +29,16 @@
#include <kuserprofile.h>
#include <kio/metainfojob.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent,
- QWidget* parentWidget)
+ TQWidget* parentWidget)
: KonqBaseListViewWidget(parent, parentWidget)
{
m_metaInfoJob = 0;
m_mtSelector = new KSelectAction(i18n("View &As"), 0, this,
- SLOT(slotSelectMimeType()),
+ TQT_SLOT(slotSelectMimeType()),
parent->actionCollection(), "view_as" );
kdDebug(1203) << "created info list view\n";
@@ -52,10 +52,10 @@ KonqInfoListViewWidget::~KonqInfoListViewWidget()
void KonqInfoListViewWidget::slotSelectMimeType()
{
- QString comment = m_mtSelector->currentText();
+ TQString comment = m_mtSelector->currentText();
// find the mime type by comment
- QMapIterator<QString, KonqILVMimeType> it;
+ TQMapIterator<TQString, KonqILVMimeType> it;
for (it = m_counts.begin(); it!=m_counts.end(); ++it)
{
if ((*it).mimetype->comment() == comment)
@@ -94,26 +94,26 @@ void KonqInfoListViewWidget::createFavoriteColumns()
(mimeTypeInfo = KFileMetaInfoProvider::self()
->mimeTypeInfo(m_favorite.mimetype->name())))
{
- QStringList preferredCols = mimeTypeInfo->preferredKeys();
+ TQStringList preferredCols = mimeTypeInfo->preferredKeys();
m_columnKeys.clear(); //We create the columnKeys as we're creating
//the actual columns, to make sure they're synced
// get the translations
- QStringList groups = mimeTypeInfo->preferredGroups();
+ TQStringList groups = mimeTypeInfo->preferredGroups();
if (groups.isEmpty()) groups = mimeTypeInfo->supportedGroups();
- QStringList::Iterator prefKey = preferredCols.begin();
+ TQStringList::Iterator prefKey = preferredCols.begin();
for (; prefKey != preferredCols.end(); ++prefKey)
{
- QStringList::Iterator group = groups.begin();
+ TQStringList::Iterator group = groups.begin();
for (; group != groups.end(); ++group)
{
const KFileMimeTypeInfo::GroupInfo* groupInfo =
mimeTypeInfo->groupInfo(*group);
if(groupInfo)
{
- QStringList keys = groupInfo->supportedKeys();
- QStringList::Iterator key = keys.begin();
+ TQStringList keys = groupInfo->supportedKeys();
+ TQStringList::Iterator key = keys.begin();
for (; key != keys.end(); ++key)
{
if ( *key == *prefKey )
@@ -147,7 +147,7 @@ void KonqInfoListViewWidget::rebuildView()
// make a KFileItemList from all our Items
KFileItemList list;
- QListViewItemIterator it(this);
+ TQListViewItemIterator it(this);
for (; it.current(); ++it)
{
list.append(static_cast<KonqInfoListViewItem*>(it.current())->item());
@@ -157,7 +157,7 @@ void KonqInfoListViewWidget::rebuildView()
clear();
// and rebuild them
- for (QPtrListIterator<KFileItem> kit(list); kit.current(); ++kit)
+ for (TQPtrListIterator<KFileItem> kit(list); kit.current(); ++kit)
{
KonqInfoListViewItem* tmp = new KonqInfoListViewItem( this, *kit );
// if (m_goToFirstItem==false)
@@ -190,7 +190,7 @@ void KonqInfoListViewWidget::rebuildView()
void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list)
{
slotStarted(); // ############# WHY?
- for (QPtrListIterator<KFileItem> kit ( list ); kit.current(); ++kit )
+ for (TQPtrListIterator<KFileItem> kit ( list ); kit.current(); ++kit )
{
KonqInfoListViewItem * tmp = new KonqInfoListViewItem( this, *kit );
@@ -201,7 +201,7 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list)
}
if ( !m_itemsToSelect.isEmpty() ) {
- QStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
+ TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
if ( tsit != m_itemsToSelect.end() ) {
m_itemsToSelect.remove( tsit );
setSelected( tmp, true );
@@ -230,16 +230,16 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list)
// start getting metainfo from the files
if (m_metaInfoJob)
{
- for (QPtrListIterator<KFileItem> kit ( list ); kit.current(); ++kit )
+ for (TQPtrListIterator<KFileItem> kit ( list ); kit.current(); ++kit )
m_metaInfoTodo.append(kit.current());
}
else
{
m_metaInfoJob = KIO::fileMetaInfo(list);
- connect( m_metaInfoJob, SIGNAL( gotMetaInfo( const KFileItem*)),
- this, SLOT( slotMetaInfo( const KFileItem*)));
- connect( m_metaInfoJob, SIGNAL( result( KIO::Job*)),
- this, SLOT( slotMetaInfoResult()));
+ connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)),
+ this, TQT_SLOT( slotMetaInfo( const KFileItem*)));
+ connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)),
+ this, TQT_SLOT( slotMetaInfoResult()));
}
}
@@ -250,16 +250,16 @@ void KonqInfoListViewWidget::slotRefreshItems( const KFileItemList& list)
// start getting metainfo from the files
if (m_metaInfoJob)
{
- for (QPtrListIterator<KFileItem> kit ( list ); kit.current(); ++kit )
+ for (TQPtrListIterator<KFileItem> kit ( list ); kit.current(); ++kit )
m_metaInfoTodo.append(kit.current());
}
else
{
m_metaInfoJob = KIO::fileMetaInfo(list);
- connect( m_metaInfoJob, SIGNAL( gotMetaInfo( const KFileItem*)),
- this, SLOT( slotMetaInfo( const KFileItem*)));
- connect( m_metaInfoJob, SIGNAL( result( KIO::Job*)),
- this, SLOT( slotMetaInfoResult()));
+ connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)),
+ this, TQT_SLOT( slotMetaInfo( const KFileItem*)));
+ connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)),
+ this, TQT_SLOT( slotMetaInfoResult()));
}
KonqBaseListViewWidget::slotRefreshItems(list);
}
@@ -286,7 +286,7 @@ void KonqInfoListViewWidget::slotClear()
void KonqInfoListViewWidget::slotMetaInfo(const KFileItem* item)
{
// need to search for the item (any better way?)
- QListViewItemIterator it(this);
+ TQListViewItemIterator it(this);
for (; it.current(); ++it)
{
if (static_cast<KonqInfoListViewItem*>(it.current())->item()==item)
@@ -312,10 +312,10 @@ void KonqInfoListViewWidget::slotMetaInfoResult()
else
{
m_metaInfoJob = KIO::fileMetaInfo(m_metaInfoTodo);
- connect( m_metaInfoJob, SIGNAL( gotMetaInfo( const KFileItem*)),
- this, SLOT( slotMetaInfo( const KFileItem*)));
- connect( m_metaInfoJob, SIGNAL( result( KIO::Job*)),
- this, SLOT( slotMetaInfoResult()));
+ connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)),
+ this, TQT_SLOT( slotMetaInfo( const KFileItem*)));
+ connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)),
+ this, TQT_SLOT( slotMetaInfoResult()));
m_metaInfoTodo.clear();
}
}
@@ -327,7 +327,7 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list)
// get the counts
for (KFileItemListIterator it(list); it.current(); ++it)
{
- QString mt = it.current()->mimetype();
+ TQString mt = it.current()->mimetype();
m_counts[mt].count++;
if (!m_counts[mt].mimetype)
m_counts[mt].mimetype = it.current()->determineMimeType();
@@ -338,9 +338,9 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list)
KFileMetaInfoProvider* prov = KFileMetaInfoProvider::self();
- QStringList mtlist;
+ TQStringList mtlist;
- QMapIterator<QString, KonqILVMimeType> it;
+ TQMapIterator<TQString, KonqILVMimeType> it;
for (it = m_counts.begin(); it!=m_counts.end(); ++it)
{
// look if there is a plugin for this mimetype
@@ -365,12 +365,12 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list)
}
m_mtSelector->setItems(mtlist);
-// QPopupMenu* menu = m_mtSelector->popupMenu();
+// TQPopupMenu* menu = m_mtSelector->popupMenu();
// insert the icons
// for (int i=0; i<menu->count(); ++i)
// {
-// menu->changeItem(i, QIconSet(blah));
+// menu->changeItem(i, TQIconSet(blah));
// }
if (m_favorite.mimetype)
diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h
index 9d866dc1f..5ae497ac2 100644
--- a/konqueror/listview/konq_infolistviewwidget.h
+++ b/konqueror/listview/konq_infolistviewwidget.h
@@ -22,8 +22,8 @@
#include "konq_listviewwidget.h"
#include <kurl.h>
-#include <qmap.h>
-#include <qpair.h>
+#include <tqmap.h>
+#include <tqpair.h>
namespace KIO {class MetaInfoJob;}
class KonqListView;
@@ -37,10 +37,10 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget
// friend class KonqTextViewItem;
Q_OBJECT
public:
- KonqInfoListViewWidget( KonqListView *parent, QWidget *parentWidget );
+ KonqInfoListViewWidget( KonqListView *parent, TQWidget *parentWidget );
~KonqInfoListViewWidget();
- const QStringList columnKeys() {return m_columnKeys;}
+ const TQStringList columnKeys() {return m_columnKeys;}
virtual bool openURL( const KURL &url );
@@ -76,8 +76,8 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget
};
// all the mimetypes
- QMap<QString, KonqILVMimeType > m_counts;
- QStringList m_columnKeys;
+ TQMap<TQString, KonqILVMimeType > m_counts;
+ TQStringList m_columnKeys;
KonqILVMimeType m_favorite;
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index 1e67fce36..f256e8e3b 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -36,10 +36,10 @@
#include <klineedit.h>
#include <kmimetype.h>
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qheader.h>
-#include <qregexp.h>
+#include <tqapplication.h>
+#include <tqclipboard.h>
+#include <tqheader.h>
+#include <tqregexp.h>
#include <assert.h>
#include <string.h>
@@ -63,7 +63,7 @@ KonqListViewFactory::~KonqListViewFactory()
s_defaultViewProps = 0;
}
-KParts::Part* KonqListViewFactory::createPartObject( QWidget *parentWidget, const char *, QObject *parent, const char *name, const char*, const QStringList &args )
+KParts::Part* KonqListViewFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args )
{
if( args.count() < 1 )
kdWarning() << "KonqListView: Missing Parameter" << endl;
@@ -144,7 +144,7 @@ void ListViewBrowserExtension::updateActions()
void ListViewBrowserExtension::copySelection( bool move )
{
KonqDrag *urlData = new KonqDrag( m_listView->listViewWidget()->selectedUrls(false), m_listView->listViewWidget()->selectedUrls(true), move );
- QApplication::clipboard()->setData( urlData );
+ TQApplication::clipboard()->setData( urlData );
}
void ListViewBrowserExtension::paste()
@@ -159,15 +159,15 @@ void ListViewBrowserExtension::pasteTo( const KURL& url )
void ListViewBrowserExtension::rename()
{
- QListViewItem* item = m_listView->listViewWidget()->currentItem();
+ TQListViewItem* item = m_listView->listViewWidget()->currentItem();
Q_ASSERT ( item );
m_listView->listViewWidget()->rename( item, 0 );
// Enhanced rename: Don't highlight the file extension.
KLineEdit* le = m_listView->listViewWidget()->renameLineEdit();
if ( le ) {
- const QString txt = le->text();
- QString pattern;
+ const TQString txt = le->text();
+ TQString pattern;
KMimeType::diagnoseFileName( txt, pattern );
if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1)
le->setSelection(0, txt.length()-pattern.stripWhiteSpace().length()+1);
@@ -199,7 +199,7 @@ void ListViewBrowserExtension::setSaveViewPropertiesLocally(bool value)
m_listView->props()->setSaveViewPropertiesLocally( value );
}
-void ListViewBrowserExtension::setNameFilter( const QString &nameFilter )
+void ListViewBrowserExtension::setNameFilter( const TQString &nameFilter )
{
m_listView->setNameFilter( nameFilter );
}
@@ -216,7 +216,7 @@ void ListViewBrowserExtension::editMimeType()
KonqOperations::editMimeType( items.first()->mimetype() );
}
-KonqListView::KonqListView( QWidget *parentWidget, QObject *parent, const char *name, const QString& mode )
+KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode )
: KonqDirPart( parent, name )
,m_headerTimer(0)
{
@@ -228,7 +228,7 @@ KonqListView::KonqListView( QWidget *parentWidget, QObject *parent, const char *
setBrowserExtension( new ListViewBrowserExtension( this ) );
- QString xmlFile;
+ TQString xmlFile;
if (mode=="TextView")
{
@@ -278,20 +278,20 @@ KonqListView::KonqListView( QWidget *parentWidget, QObject *parent, const char *
m_pListView->confColumns[10].setData(I18N_NOOP("File Type"),"Type",KIO::UDS_FILE_TYPE,m_paShowType);
- connect( m_pListView, SIGNAL( selectionChanged() ),
- m_extension, SLOT( updateActions() ) );
- connect( m_pListView, SIGNAL( selectionChanged() ),
- this, SLOT( slotSelectionChanged() ) );
+ connect( m_pListView, TQT_SIGNAL( selectionChanged() ),
+ m_extension, TQT_SLOT( updateActions() ) );
+ connect( m_pListView, TQT_SIGNAL( selectionChanged() ),
+ this, TQT_SLOT( slotSelectionChanged() ) );
- connect( m_pListView, SIGNAL( currentChanged(QListViewItem*) ),
- m_extension, SLOT( updateActions() ) );
- connect(m_pListView->header(),SIGNAL(indexChange(int,int,int)),this,SLOT(headerDragged(int,int,int)));
- connect(m_pListView->header(),SIGNAL(clicked(int)),this,SLOT(slotHeaderClicked(int)));
- connect(m_pListView->header(),SIGNAL(sizeChange(int,int,int)),SLOT(slotHeaderSizeChanged()));
+ connect( m_pListView, TQT_SIGNAL( currentChanged(TQListViewItem*) ),
+ m_extension, TQT_SLOT( updateActions() ) );
+ connect(m_pListView->header(),TQT_SIGNAL(indexChange(int,int,int)),this,TQT_SLOT(headerDragged(int,int,int)));
+ connect(m_pListView->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(slotHeaderClicked(int)));
+ connect(m_pListView->header(),TQT_SIGNAL(sizeChange(int,int,int)),TQT_SLOT(slotHeaderSizeChanged()));
// signals from konqdirpart (for BC reasons)
- connect( this, SIGNAL( findOpened( KonqDirPart * ) ), SLOT( slotKFindOpened() ) );
- connect( this, SIGNAL( findClosed( KonqDirPart * ) ), SLOT( slotKFindClosed() ) );
+ connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) );
+ connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) );
loadPlugins( this, this, instance() );
}
@@ -312,7 +312,7 @@ void KonqListView::guiActivateEvent( KParts::GUIActivateEvent *event )
bool KonqListView::doOpenURL( const KURL &url )
{
KURL u( url );
- const QString prettyURL = url.pathOrURL();
+ const TQString prettyURL = url.pathOrURL();
emit setWindowCaption( prettyURL );
return m_pListView->openURL( url );
}
@@ -335,7 +335,7 @@ void KonqListView::determineIcon( KonqBaseListViewItem * item )
(void) item->item()->determineMimeType();
- //QPixmap newIcon = item->item()->pixmap( m_parent->iconSize(),
+ //TQPixmap newIcon = item->item()->pixmap( m_parent->iconSize(),
// item->state() );
//if ( oldSerial != newIcon.serialNumber() )
// item->setPixmap( 0, newIcon );
@@ -344,14 +344,14 @@ void KonqListView::determineIcon( KonqBaseListViewItem * item )
item->updateContents();
}
-void KonqListView::saveState( QDataStream &stream )
+void KonqListView::saveState( TQDataStream &stream )
{
//kdDebug(1202) << k_funcinfo << endl;
KonqDirPart::saveState( stream );
m_pListView->saveState( stream );
}
-void KonqListView::restoreState( QDataStream &stream )
+void KonqListView::restoreState( TQDataStream &stream )
{
//kdDebug(1202) << k_funcinfo << endl;
KonqDirPart::restoreState( stream );
@@ -366,12 +366,12 @@ void KonqListView::disableIcons( const KURL::List &lst )
void KonqListView::slotSelect()
{
bool ok;
- QString pattern = KInputDialog::getText( QString::null,
+ TQString pattern = KInputDialog::getText( TQString::null,
i18n( "Select files:" ), "*", &ok, m_pListView );
if ( !ok )
return;
- QRegExp re( pattern, true, true );
+ TQRegExp re( pattern, true, true );
m_pListView->blockSignals( true );
@@ -397,12 +397,12 @@ void KonqListView::slotSelect()
void KonqListView::slotUnselect()
{
bool ok;
- QString pattern = KInputDialog::getText( QString::null,
+ TQString pattern = KInputDialog::getText( TQString::null,
i18n( "Unselect files:" ), "*", &ok, m_pListView );
if ( !ok )
return;
- QRegExp re( pattern, TRUE, TRUE );
+ TQRegExp re( pattern, TRUE, TRUE );
m_pListView->blockSignals(TRUE);
@@ -494,7 +494,7 @@ void KonqListView::slotColumnToggled()
m_pListView->updateListContents();
//save the config
- QStringList lstColumns;
+ TQStringList lstColumns;
int currentColumn(m_pListView->m_filenameColumn+1);
for (int i=0; i<(int)m_pListView->NumberOfAtoms; i++)
{
@@ -523,7 +523,7 @@ void KonqListView::slotHeaderClicked(int sec)
for (uint i=0; i<m_pListView->NumberOfAtoms; i++)
if (m_pListView->confColumns[i].displayInColumn==sec) clickedColumn=i;
kdDebug(1202)<<"atom index "<<clickedColumn<<endl;
- QString nameOfSortColumn;
+ TQString nameOfSortColumn;
//we clicked the file name column
if (clickedColumn==-1)
nameOfSortColumn="FileName";
@@ -550,7 +550,7 @@ void KonqListView::headerDragged(int sec, int from, int to)
kdDebug(1202)<<"section: "<<sec<<" fromIndex: "<<from<<" toIndex "<<to<<endl;
//at this point the columns aren't moved yet, so I let the listview
//rearrange the stuff and use a single shot timer
- QTimer::singleShot(200,this,SLOT(slotSaveAfterHeaderDrag()));
+ TQTimer::singleShot(200,this,TQT_SLOT(slotSaveAfterHeaderDrag()));
}
const KFileItem * KonqListView::currentItem()
@@ -562,7 +562,7 @@ const KFileItem * KonqListView::currentItem()
void KonqListView::slotSaveAfterHeaderDrag()
{
- QStringList lstColumns;
+ TQStringList lstColumns;
for ( int i=0; i < m_pListView->columns(); i++ )
{
@@ -589,7 +589,7 @@ void KonqListView::slotSaveAfterHeaderDrag()
void KonqListView::slotSaveColumnWidths()
{
- QValueList<int> lstColumnWidths;
+ TQValueList<int> lstColumnWidths;
for ( int i=0; i < m_pListView->columns(); i++ )
{
@@ -620,8 +620,8 @@ void KonqListView::slotHeaderSizeChanged()
{
if ( !m_headerTimer )
{
- m_headerTimer = new QTimer( this );
- connect( m_headerTimer, SIGNAL( timeout() ), this, SLOT( slotSaveColumnWidths() ) );
+ m_headerTimer = new TQTimer( this );
+ connect( m_headerTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSaveColumnWidths() ) );
}
else
m_headerTimer->stop();
@@ -643,37 +643,37 @@ void KonqListView::slotKFindClosed()
void KonqListView::setupActions()
{
- m_paShowTime=new KToggleAction(i18n("Show &Modification Time"), 0,this, SLOT(slotColumnToggled()), actionCollection(), "show_time" );
+ m_paShowTime=new KToggleAction(i18n("Show &Modification Time"), 0,this, TQT_SLOT(slotColumnToggled()), actionCollection(), "show_time" );
m_paShowTime->setCheckedState(i18n("Hide &Modification Time"));
- m_paShowType=new KToggleAction(i18n("Show &File Type"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_type" );
+ m_paShowType=new KToggleAction(i18n("Show &File Type"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_type" );
m_paShowType->setCheckedState(i18n("Hide &File Type"));
- m_paShowMimeType=new KToggleAction(i18n("Show MimeType"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" );
+ m_paShowMimeType=new KToggleAction(i18n("Show MimeType"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" );
m_paShowMimeType->setCheckedState(i18n("Hide MimeType"));
- m_paShowAccessTime=new KToggleAction(i18n("Show &Access Time"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_access_time" );
+ m_paShowAccessTime=new KToggleAction(i18n("Show &Access Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" );
m_paShowAccessTime->setCheckedState(i18n("Hide &Access Time"));
- m_paShowCreateTime=new KToggleAction(i18n("Show &Creation Time"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" );
+ m_paShowCreateTime=new KToggleAction(i18n("Show &Creation Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" );
m_paShowCreateTime->setCheckedState(i18n("Hide &Creation Time"));
- m_paShowLinkDest=new KToggleAction(i18n("Show &Link Destination"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" );
+ m_paShowLinkDest=new KToggleAction(i18n("Show &Link Destination"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" );
m_paShowLinkDest->setCheckedState(i18n("Hide &Link Destination"));
- m_paShowSize=new KToggleAction(i18n("Show Filesize"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_size" );
+ m_paShowSize=new KToggleAction(i18n("Show Filesize"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_size" );
m_paShowSize->setCheckedState(i18n("Hide Filesize"));
- m_paShowOwner=new KToggleAction(i18n("Show Owner"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_owner" );
+ m_paShowOwner=new KToggleAction(i18n("Show Owner"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_owner" );
m_paShowOwner->setCheckedState(i18n("Hide Owner"));
- m_paShowGroup=new KToggleAction(i18n("Show Group"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_group" );
+ m_paShowGroup=new KToggleAction(i18n("Show Group"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_group" );
m_paShowGroup->setCheckedState(i18n("Hide Group"));
- m_paShowPermissions=new KToggleAction(i18n("Show Permissions"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_permissions" );
+ m_paShowPermissions=new KToggleAction(i18n("Show Permissions"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" );
m_paShowPermissions->setCheckedState(i18n("Hide Permissions"));
- m_paShowURL=new KToggleAction(i18n("Show URL"), 0, this, SLOT(slotColumnToggled()),actionCollection(), "show_url" );
+ m_paShowURL=new KToggleAction(i18n("Show URL"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_url" );
- m_paSelect = new KAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, SLOT( slotSelect() ), actionCollection(), "select" );
- m_paUnselect = new KAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, SLOT( slotUnselect() ), actionCollection(), "unselect" );
- m_paSelectAll = KStdAction::selectAll( this, SLOT( slotSelectAll() ), actionCollection(), "selectall" );
- m_paUnselectAll = new KAction( i18n( "Unselect All" ), CTRL+Key_U, this, SLOT( slotUnselectAll() ), actionCollection(), "unselectall" );
- m_paInvertSelection = new KAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, SLOT( slotInvertSelection() ), actionCollection(), "invertselection" );
+ m_paSelect = new KAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" );
+ m_paUnselect = new KAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" );
+ m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" );
+ m_paUnselectAll = new KAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" );
+ m_paInvertSelection = new KAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" );
- m_paShowDot = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, SLOT( slotShowDot() ), actionCollection(), "show_dot" );
+ m_paShowDot = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" );
// m_paShowDot->setCheckedState(i18n("Hide &Hidden Files"));
- m_paCaseInsensitive = new KToggleAction(i18n("Case Insensitive Sort"), 0, this, SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" );
+ m_paCaseInsensitive = new KToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" );
newIconSize( KIcon::SizeSmall /* default size */ );
}
diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h
index b149b703c..8665160d3 100644
--- a/konqueror/listview/konq_listview.h
+++ b/konqueror/listview/konq_listview.h
@@ -27,9 +27,9 @@
#include <konq_dirpart.h>
#include <kmimetyperesolver.h>
-#include <qvaluelist.h>
-#include <qlistview.h>
-#include <qstringlist.h>
+#include <tqvaluelist.h>
+#include <tqlistview.h>
+#include <tqstringlist.h>
#include <konq_propsview.h>
#include "konq_listviewwidget.h"
@@ -44,7 +44,7 @@ public:
KonqListViewFactory();
virtual ~KonqListViewFactory();
- virtual KParts::Part* createPartObject( QWidget *parentWidget, const char *, QObject *parent, const char *name, const char*, const QStringList &args );
+ virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args );
static KInstance *instance();
static KonqPropsView *defaultViewProps();
@@ -65,7 +65,7 @@ class KonqListView : public KonqDirPart
Q_OBJECT
Q_PROPERTY( bool supportsUndo READ supportsUndo )
public:
- KonqListView( QWidget *parentWidget, QObject *parent, const char *name, const QString& mode );
+ KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode );
virtual ~KonqListView();
virtual const KFileItem * currentItem();
@@ -75,8 +75,8 @@ public:
bool supportsUndo() const { return true; }
- virtual void saveState( QDataStream &stream );
- virtual void restoreState( QDataStream &stream );
+ virtual void saveState( TQDataStream &stream );
+ virtual void restoreState( TQDataStream &stream );
// "Cut" icons : disable those whose URL is in lst, enable the others
virtual void disableIcons( const KURL::List & lst );
@@ -86,7 +86,7 @@ public:
//int iconSize() { return m_pListView->iconSize(); }
void determineIcon( KonqBaseListViewItem * item );
- QPtrList<KonqBaseListViewItem> & lstPendingMimeIconItems() { return m_mimeTypeResolver->m_lstPendingMimeIconItems; }
+ TQPtrList<KonqBaseListViewItem> & lstPendingMimeIconItems() { return m_mimeTypeResolver->m_lstPendingMimeIconItems; }
void listingComplete();
virtual void newIconSize( int );
@@ -145,7 +145,7 @@ private:
KonqBaseListViewWidget *m_pListView;
KMimeTypeResolver<KonqBaseListViewItem,KonqListView> *m_mimeTypeResolver;
- QTimer *m_headerTimer;
+ TQTimer *m_headerTimer;
KAction *m_paSelect;
KAction *m_paUnselect;
@@ -195,7 +195,7 @@ class ListViewBrowserExtension : public KonqDirPartBrowserExtension
void reparseConfiguration();
void setSaveViewPropertiesLocally( bool value );
- void setNameFilter( const QString &nameFilter );
+ void setNameFilter( const TQString &nameFilter );
// void refreshMimeTypes is missing
void properties();
diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc
index f946856c4..3c70f1fb0 100644
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cc
@@ -23,11 +23,11 @@
#include <klocale.h>
#include <assert.h>
#include <stdio.h>
-#include <qpainter.h>
-#include <qheader.h>
+#include <tqpainter.h>
+#include <tqheader.h>
#include <kiconloader.h>
-static QString retrieveExtraEntry( KFileItem* fileitem, int numExtra )
+static TQString retrieveExtraEntry( KFileItem* fileitem, int numExtra )
{
/// ######## SLOOOOW
KIO::UDSEntry::ConstIterator it = fileitem->entry().begin();
@@ -44,7 +44,7 @@ static QString retrieveExtraEntry( KFileItem* fileitem, int numExtra )
}
}
}
- return QString::null;
+ return TQString::null;
}
@@ -70,7 +70,7 @@ KonqListViewItem::KonqListViewItem( KonqBaseListViewWidget *_listViewWidget, KFi
KonqListViewItem::~KonqListViewItem()
{
- for ( QValueVector<QPixmap*>::iterator
+ for ( TQValueVector<TQPixmap*>::iterator
it = m_pixmaps.begin(), itEnd = m_pixmaps.end();
it != itEnd; ++it )
delete *it;
@@ -130,7 +130,7 @@ void KonqListViewItem::updateContents()
case KIO::UDS_ACCESS_TIME:
case KIO::UDS_CREATION_TIME:
{
- QDateTime dt;
+ TQDateTime dt;
time_t _time = m_fileitem->time( tmpColumn->udsId );
if ( _time != 0 )
{
@@ -141,14 +141,14 @@ void KonqListViewItem::updateContents()
break;
case KIO::UDS_EXTRA:
{
- const QString entryStr = retrieveExtraEntry( m_fileitem, numExtra );
- if ( tmpColumn->type == QVariant::DateTime )
+ const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra );
+ if ( tmpColumn->type == TQVariant::DateTime )
{
- QDateTime dt = QDateTime::fromString( entryStr, Qt::ISODate );
+ TQDateTime dt = TQDateTime::fromString( entryStr, Qt::ISODate );
setText(tmpColumn->displayInColumn,
KGlobal::locale()->formatDateTime(dt));
}
- else // if ( tmpColumn->type == QVariant::String )
+ else // if ( tmpColumn->type == TQVariant::String )
setText(tmpColumn->displayInColumn, entryStr);
++numExtra;
break;
@@ -180,12 +180,12 @@ void KonqListViewItem::setActive( bool active )
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}
-void KonqListViewItem::setPixmap( int column, const QPixmap& pm )
+void KonqListViewItem::setPixmap( int column, const TQPixmap& pm )
{
if ( column < 0 )
return;
- const QPixmap *current = pixmap( column );
+ const TQPixmap *current = pixmap( column );
if ( ( pm.isNull() && !current ) ||
( current && pm.serialNumber() == current->serialNumber() ) )
@@ -198,7 +198,7 @@ void KonqListViewItem::setPixmap( int column, const QPixmap& pm )
m_pixmaps.resize( column+1 );
delete current;
- m_pixmaps[column] = pm.isNull() ? 0 : new QPixmap( pm );
+ m_pixmaps[column] = pm.isNull() ? 0 : new TQPixmap( pm );
int newWidth = pm.isNull() ? 0 : pm.width();
int newHeight = pm.isNull() ? 0 : pm.height();
@@ -218,7 +218,7 @@ void KonqListViewItem::setPixmap( int column, const QPixmap& pm )
// If we're just replacing the icon with another one its size -- i.e. a
// "highlighted" icon, don't bother repainting the whole widget.
- QListView *lv = m_pListViewWidget;
+ TQListView *lv = m_pListViewWidget;
int decorationWidth = lv->treeStepSize() * ( depth() + ( lv->rootIsDecorated() ? 1 : 0 ) );
int x = lv->header()->sectionPos( column ) + decorationWidth + lv->itemMargin();
@@ -228,19 +228,19 @@ void KonqListViewItem::setPixmap( int column, const QPixmap& pm )
lv->repaintContents( x, y, w, h );
}
-const QPixmap* KonqListViewItem::pixmap( int column ) const
+const TQPixmap* KonqListViewItem::pixmap( int column ) const
{
bool ok;
if ((int)m_pixmaps.count() <= column)
return 0;
- QPixmap *pm = m_pixmaps.at( column, &ok );
+ TQPixmap *pm = m_pixmaps.at( column, &ok );
if( !ok )
return 0;
return pm;
}
-int KonqBaseListViewItem::compare( QListViewItem* item, int col, bool ascending ) const
+int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending ) const
{
KonqListViewItem* k = static_cast<KonqListViewItem*>( item );
if ( sortChar != k->sortChar )
@@ -273,11 +273,11 @@ int KonqBaseListViewItem::compare( QListViewItem* item, int col, bool ascending
}
case KIO::UDS_EXTRA:
{
- if ( cInfo->type & QVariant::DateTime ) {
- const QString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra );
- QDateTime dt1 = QDateTime::fromString( entryStr1, Qt::ISODate );
- const QString entryStr2 = retrieveExtraEntry( k->m_fileitem, numExtra );
- QDateTime dt2 = QDateTime::fromString( entryStr2, Qt::ISODate );
+ if ( cInfo->type & TQVariant::DateTime ) {
+ const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra );
+ TQDateTime dt1 = TQDateTime::fromString( entryStr1, Qt::ISODate );
+ const TQString entryStr2 = retrieveExtraEntry( k->m_fileitem, numExtra );
+ TQDateTime dt2 = TQDateTime::fromString( entryStr2, Qt::ISODate );
return ( dt1 > dt2 ) ? 1 : ( dt1 < dt2 ) ? -1 : 0;
}
}
@@ -294,19 +294,19 @@ int KonqBaseListViewItem::compare( QListViewItem* item, int col, bool ascending
}
}
-void KonqListViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
{
- QColorGroup cg( _cg );
+ TQColorGroup cg( _cg );
if ( _column == 0 )
{
_painter->setFont( m_pListViewWidget->itemFont() );
}
- cg.setColor( QColorGroup::Text, m_pListViewWidget->itemColor() );
+ cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() );
KListView *lv = static_cast< KListView* >( listView() );
- const QPixmap *pm = lv->viewport()->paletteBackgroundPixmap();
+ const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap();
if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() )
{
int newWidth = width( lv->fontMetrics(), lv, _column );
@@ -314,11 +314,11 @@ void KonqListViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, i
newWidth = _width;
if ( pm && !pm->isNull() )
{
- cg.setBrush( QColorGroup::Base, QBrush( backgroundColor(_column), *pm ) );
- QPoint o = _painter->brushOrigin();
+ cg.setBrush( TQColorGroup::Base, TQBrush( backgroundColor(_column), *pm ) );
+ TQPoint o = _painter->brushOrigin();
_painter->setBrushOrigin( o.x() - lv->contentsX(), o.y() - lv->contentsY() );
- const QColorGroup::ColorRole crole =
- QPalette::backgroundRoleFromMode( lv->viewport()->backgroundMode() );
+ const TQColorGroup::ColorRole crole =
+ TQPalette::backgroundRoleFromMode( lv->viewport()->backgroundMode() );
_painter->fillRect( newWidth, 0, _width - newWidth, height(), cg.brush( crole ) );
_painter->setBrushOrigin( o );
}
@@ -333,14 +333,14 @@ void KonqListViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, i
KListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
}
-void KonqListViewItem::paintFocus( QPainter * _painter, const QColorGroup & cg, const QRect & _r )
+void KonqListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r )
{
- QRect r( _r );
- QListView *lv = static_cast< QListView * >( listView() );
+ TQRect r( _r );
+ TQListView *lv = static_cast< TQListView * >( listView() );
r.setWidth( width( lv->fontMetrics(), lv, 0 ) );
if ( r.right() > lv->header()->sectionRect( 0 ).right() )
r.setRight( lv->header()->sectionRect( 0 ).right() );
- QListViewItem::paintFocus( _painter, cg, r );
+ TQListViewItem::paintFocus( _painter, cg, r );
}
const char* KonqBaseListViewItem::makeAccessString( const mode_t mode)
@@ -419,10 +419,10 @@ KonqBaseListViewItem::~KonqBaseListViewItem()
m_pListViewWidget->m_selected->removeRef(this);
}
-QRect KonqBaseListViewItem::rect() const
+TQRect KonqBaseListViewItem::rect() const
{
- QRect r = m_pListViewWidget->itemRect(this);
- return QRect( m_pListViewWidget->viewportToContents( r.topLeft() ), QSize( r.width(), r.height() ) );
+ TQRect r = m_pListViewWidget->itemRect(this);
+ return TQRect( m_pListViewWidget->viewportToContents( r.topLeft() ), TQSize( r.width(), r.height() ) );
}
void KonqBaseListViewItem::mimetypeFound()
diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h
index 6e0cbc513..d3dd2b1ad 100644
--- a/konqueror/listview/konq_listviewitems.h
+++ b/konqueror/listview/konq_listviewitems.h
@@ -21,10 +21,10 @@
#define __konq_listviewitems_h__
#include <klistview.h>
-#include <qstring.h>
+#include <tqstring.h>
#include <kicontheme.h>
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
// for mode_t
#include <sys/types.h>
@@ -52,7 +52,7 @@ class KonqBaseListViewItem : public KListViewItem
virtual void updateContents() = 0;
virtual void setDisabled( bool disabled ) { m_bDisabled = disabled; }
virtual void setActive ( bool active ) { m_bActive = active; }
- virtual int compare( QListViewItem* i, int col, bool ascending ) const;
+ virtual int compare( TQListViewItem* i, int col, bool ascending ) const;
int state() const
{
@@ -64,7 +64,7 @@ class KonqBaseListViewItem : public KListViewItem
}
/** For KonqMimeTypeResolver */
- QRect rect() const;
+ TQRect rect() const;
protected:
short int sortChar;
@@ -106,18 +106,18 @@ class KonqListViewItem : public KonqBaseListViewItem
virtual ~KonqListViewItem();
- virtual void paintCell( QPainter *_painter, const QColorGroup & cg,
+ virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg,
int column, int width, int alignment );
- virtual void paintFocus( QPainter * _painter, const QColorGroup & cg, const QRect & r );
+ virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r );
virtual void updateContents();
virtual void setDisabled( bool disabled );
virtual void setActive ( bool active );
- virtual void setPixmap( int column, const QPixmap & pm );
- virtual const QPixmap * pixmap( int column ) const;
+ virtual void setPixmap( int column, const TQPixmap & pm );
+ virtual const TQPixmap * pixmap( int column ) const;
private:
- QValueVector<QPixmap *> m_pixmaps;
+ TQValueVector<TQPixmap *> m_pixmaps;
};
#endif
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index 7d9231758..8f166af0a 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -35,13 +35,13 @@
#include <kiconloader.h>
#include <kiconeffect.h>
-#include <qheader.h>
-#include <qpainter.h>
-#include <qstyle.h>
-#include <qtimer.h>
-#include <qevent.h>
-#include <qcursor.h>
-#include <qtooltip.h>
+#include <tqheader.h>
+#include <tqpainter.h>
+#include <tqstyle.h>
+#include <tqtimer.h>
+#include <tqevent.h>
+#include <tqcursor.h>
+#include <tqtooltip.h>
#include <stdlib.h>
#include <assert.h>
@@ -51,27 +51,27 @@ ColumnInfo::ColumnInfo()
,name()
,desktopFileName()
,udsId(0)
- ,type(QVariant::Invalid)
+ ,type(TQVariant::Invalid)
,displayThisOne(false)
,toggleThisOne(0)
{}
-void ColumnInfo::setData(const QString& n, const QString& desktopName, int kioUds,
+void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kioUds,
KToggleAction* someAction, int theWidth)
{
displayInColumn=-1;
name=n;
desktopFileName=desktopName;
udsId=kioUds;
- type=QVariant::Invalid;
+ type=TQVariant::Invalid;
displayThisOne=false;
toggleThisOne=someAction;
width=theWidth;
}
-void ColumnInfo::setData(const QString& n, const QString& desktopName, int kioUds,
- QVariant::Type t, KToggleAction* someAction, int theWidth)
+void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kioUds,
+ TQVariant::Type t, KToggleAction* someAction, int theWidth)
{
displayInColumn=-1;
name=n;
@@ -84,7 +84,7 @@ void ColumnInfo::setData(const QString& n, const QString& desktopName, int kioUd
}
-KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, QWidget *parentWidget)
+KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget)
: KListView(parentWidget)
,sortedByColumn(0)
,m_pBrowserView(parent)
@@ -119,62 +119,62 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, QWidget *p
initConfig();
#if 0
- connect( this, SIGNAL(rightButtonPressed(QListViewItem*,const QPoint&,int)),
- this, SLOT(slotRightButtonPressed(QListViewItem*,const QPoint&,int)));
+ connect( this, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),
+ this, TQT_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int)));
#endif
- connect( this, SIGNAL(returnPressed( QListViewItem * )),
- this, SLOT(slotReturnPressed( QListViewItem * )) );
- connect( this, SIGNAL( mouseButtonClicked( int, QListViewItem *, const QPoint&, int )),
- this, SLOT( slotMouseButtonClicked2( int, QListViewItem *, const QPoint&, int )) );
- connect( this, SIGNAL(executed( QListViewItem * )),
- this, SLOT(slotExecuted( QListViewItem * )) );
-
- connect( this, SIGNAL(currentChanged( QListViewItem * )),
- this, SLOT(slotCurrentChanged( QListViewItem * )) );
- connect( this, SIGNAL(itemRenamed( QListViewItem *, const QString &, int )),
- this, SLOT(slotItemRenamed( QListViewItem *, const QString &, int )) );
- connect( this, SIGNAL(contextMenuRequested( QListViewItem *, const QPoint&, int )),
- this, SLOT(slotPopupMenu( QListViewItem *, const QPoint&, int )) );
- connect( this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged()) );
-
- connect( horizontalScrollBar(), SIGNAL(valueChanged( int )),
- this, SIGNAL(viewportAdjusted()) );
- connect( verticalScrollBar(), SIGNAL(valueChanged( int )),
- this, SIGNAL(viewportAdjusted()) );
+ connect( this, TQT_SIGNAL(returnPressed( TQListViewItem * )),
+ this, TQT_SLOT(slotReturnPressed( TQListViewItem * )) );
+ connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )),
+ this, TQT_SLOT( slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) );
+ connect( this, TQT_SIGNAL(executed( TQListViewItem * )),
+ this, TQT_SLOT(slotExecuted( TQListViewItem * )) );
+
+ connect( this, TQT_SIGNAL(currentChanged( TQListViewItem * )),
+ this, TQT_SLOT(slotCurrentChanged( TQListViewItem * )) );
+ connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )),
+ this, TQT_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) );
+ connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )),
+ this, TQT_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) );
+ connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) );
+
+ connect( horizontalScrollBar(), TQT_SIGNAL(valueChanged( int )),
+ this, TQT_SIGNAL(viewportAdjusted()) );
+ connect( verticalScrollBar(), TQT_SIGNAL(valueChanged( int )),
+ this, TQT_SIGNAL(viewportAdjusted()) );
// Connect the directory lister
- connect( m_dirLister, SIGNAL(started( const KURL & )),
- this, SLOT(slotStarted()) );
- connect( m_dirLister, SIGNAL(completed()), this, SLOT(slotCompleted()) );
- connect( m_dirLister, SIGNAL(canceled()), this, SLOT(slotCanceled()) );
- connect( m_dirLister, SIGNAL(clear()), this, SLOT(slotClear()) );
- connect( m_dirLister, SIGNAL(newItems( const KFileItemList & ) ),
- this, SLOT(slotNewItems( const KFileItemList & )) );
- connect( m_dirLister, SIGNAL(deleteItem( KFileItem * )),
- this, SLOT(slotDeleteItem( KFileItem * )) );
- connect( m_dirLister, SIGNAL(refreshItems( const KFileItemList & )),
- this, SLOT( slotRefreshItems( const KFileItemList & )) );
- connect( m_dirLister, SIGNAL(redirection( const KURL & )),
- this, SLOT(slotRedirection( const KURL & )) );
- connect( m_dirLister, SIGNAL(itemsFilteredByMime( const KFileItemList & )),
- m_pBrowserView, SIGNAL(itemsFilteredByMime( const KFileItemList & )) );
-
- connect( m_dirLister, SIGNAL(infoMessage( const QString& )),
- m_pBrowserView->extension(), SIGNAL(infoMessage( const QString& )) );
- connect( m_dirLister, SIGNAL(percent( int )),
- m_pBrowserView->extension(), SIGNAL(loadingProgress( int )) );
- connect( m_dirLister, SIGNAL(speed( int )),
- m_pBrowserView->extension(), SIGNAL(speedProgress( int )) );
-
- connect( header(), SIGNAL(sizeChange( int, int, int )), SLOT(slotUpdateBackground()) );
+ connect( m_dirLister, TQT_SIGNAL(started( const KURL & )),
+ this, TQT_SLOT(slotStarted()) );
+ connect( m_dirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()) );
+ connect( m_dirLister, TQT_SIGNAL(canceled()), this, TQT_SLOT(slotCanceled()) );
+ connect( m_dirLister, TQT_SIGNAL(clear()), this, TQT_SLOT(slotClear()) );
+ connect( m_dirLister, TQT_SIGNAL(newItems( const KFileItemList & ) ),
+ this, TQT_SLOT(slotNewItems( const KFileItemList & )) );
+ connect( m_dirLister, TQT_SIGNAL(deleteItem( KFileItem * )),
+ this, TQT_SLOT(slotDeleteItem( KFileItem * )) );
+ connect( m_dirLister, TQT_SIGNAL(refreshItems( const KFileItemList & )),
+ this, TQT_SLOT( slotRefreshItems( const KFileItemList & )) );
+ connect( m_dirLister, TQT_SIGNAL(redirection( const KURL & )),
+ this, TQT_SLOT(slotRedirection( const KURL & )) );
+ connect( m_dirLister, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )),
+ m_pBrowserView, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )) );
+
+ connect( m_dirLister, TQT_SIGNAL(infoMessage( const TQString& )),
+ m_pBrowserView->extension(), TQT_SIGNAL(infoMessage( const TQString& )) );
+ connect( m_dirLister, TQT_SIGNAL(percent( int )),
+ m_pBrowserView->extension(), TQT_SIGNAL(loadingProgress( int )) );
+ connect( m_dirLister, TQT_SIGNAL(speed( int )),
+ m_pBrowserView->extension(), TQT_SIGNAL(speedProgress( int )) );
+
+ connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), TQT_SLOT(slotUpdateBackground()) );
viewport()->setMouseTracking( true );
- viewport()->setFocusPolicy( QWidget::WheelFocus );
- setFocusPolicy( QWidget::WheelFocus );
+ viewport()->setFocusPolicy( TQWidget::WheelFocus );
+ setFocusPolicy( TQWidget::WheelFocus );
setAcceptDrops( true );
//looks better with the statusbar
- setFrameStyle( QFrame::StyledPanel | QFrame::Sunken );
+ setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
setShowSortIndicator( true );
}
@@ -193,7 +193,7 @@ KonqBaseListViewWidget::~KonqBaseListViewWidget()
void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
{
- const QString protocol = url.protocol();
+ const TQString protocol = url.protocol();
KonqListViewSettings config( protocol );
config.readConfig();
sortedByColumn = config.sortBy();
@@ -201,8 +201,8 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
m_filenameColumnWidth = config.fileNameColumnWidth();
- QStringList lstColumns = config.columns();
- QValueList<int> lstColumnWidths = config.columnWidths();
+ TQStringList lstColumns = config.columns();
+ TQValueList<int> lstColumnWidths = config.columnWidths();
if (lstColumns.isEmpty())
{
// Default column selection
@@ -227,18 +227,18 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
KProtocolInfo::ExtraFieldList::Iterator extraFieldsIt = extraFields.begin();
for ( int num = 1; extraFieldsIt != extraFields.end(); ++extraFieldsIt, ++num )
{
- const QString column = (*extraFieldsIt).name;
+ const TQString column = (*extraFieldsIt).name;
if ( lstColumns.find(column) == lstColumns.end() )
lstColumns << column;
- const QString type = (*extraFieldsIt).type; // ## TODO use when sorting
- QVariant::Type t = QVariant::Invalid;
+ const TQString type = (*extraFieldsIt).type; // ## TODO use when sorting
+ TQVariant::Type t = TQVariant::Invalid;
if ( type.lower() == "qstring" )
- t = QVariant::String;
+ t = TQVariant::String;
else if ( type.lower() == "qdatetime" )
- t = QVariant::DateTime;
+ t = TQVariant::DateTime;
else
kdWarning() << "Unsupported ExtraType '" << type << "'" << endl;
- confColumns[extraIndex++].setData( column, QString("Extra%1").arg(num), KIO::UDS_EXTRA, t, 0);
+ confColumns[extraIndex++].setData( column, TQString("Extra%1").arg(num), KIO::UDS_EXTRA, t, 0);
}
//disable everything
@@ -273,7 +273,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
{
// Default Column widths
ColumnInfo *tmpColumn = &confColumns[j];
- QString str;
+ TQString str;
if ( tmpColumn->udsId == KIO::UDS_SIZE )
str = KGlobal::locale()->formatNumber( 888888888, 0 ) + " ";
@@ -293,9 +293,9 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
str = "a_long_lonq_long_very_long_url";
else if ( (tmpColumn->udsId & KIO::UDS_TIME)
|| (tmpColumn->udsId == KIO::UDS_EXTRA &&
- (tmpColumn->type & QVariant::DateTime)) )
+ (tmpColumn->type & TQVariant::DateTime)) )
{
- QDateTime dt( QDate( 2000, 10, 10 ), QTime( 20, 20, 20 ) );
+ TQDateTime dt( TQDate( 2000, 10, 10 ), TQTime( 20, 20, 20 ) );
str = KGlobal::locale()->formatDateTime( dt ) + "--";
}
else
@@ -308,7 +308,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
}
}
//check what the protocol provides
- QStringList listingList = KProtocolInfo::listing( url );
+ TQStringList listingList = KProtocolInfo::listing( url );
kdDebug(1202) << k_funcinfo << "protocol: " << protocol << endl;
// Even if this is not given by the protocol, we can determine it.
@@ -325,7 +325,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
continue;
}
- QStringList::Iterator listIt = listingList.find( confColumns[i].desktopFileName );
+ TQStringList::Iterator listIt = listingList.find( confColumns[i].desktopFileName );
if ( listIt == listingList.end() ) // not found -> hide
{
//move all columns behind one to the front
@@ -388,35 +388,35 @@ void KonqBaseListViewWidget::initConfig()
{
m_pSettings = KonqFMSettings::settings();
- QFont stdFont( m_pSettings->standardFont() );
+ TQFont stdFont( m_pSettings->standardFont() );
setFont( stdFont );
//TODO: create config GUI
- QFont itemFont( m_pSettings->standardFont() );
+ TQFont itemFont( m_pSettings->standardFont() );
itemFont.setUnderline( m_pSettings->underlineLink() );
setItemFont( itemFont );
setItemColor( m_pSettings->normalTextColor() );
- bool on = m_pSettings->showFileTips() && QToolTip::isGloballyEnabled();
+ bool on = m_pSettings->showFileTips() && TQToolTip::isGloballyEnabled();
m_fileTip->setOptions( on, m_pSettings->showPreviewsInFileTips(), m_pSettings->numFileTips() );
updateListContents();
}
-void KonqBaseListViewWidget::contentsMousePressEvent( QMouseEvent *e )
+void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e )
{
if ( m_rubber )
{
- QRect r( m_rubber->normalize() );
+ TQRect r( m_rubber->normalize() );
delete m_rubber;
m_rubber = 0;
repaintContents( r, FALSE );
}
delete m_selected;
- m_selected = new QPtrList<KonqBaseListViewItem>;
+ m_selected = new TQPtrList<KonqBaseListViewItem>;
- QPoint vp = contentsToViewport( e->pos() );
+ TQPoint vp = contentsToViewport( e->pos() );
KonqBaseListViewItem* item = isExecuteArea( vp ) ?
static_cast<KonqBaseListViewItem*>( itemAt( vp ) ) : 0L;
@@ -426,13 +426,13 @@ void KonqBaseListViewWidget::contentsMousePressEvent( QMouseEvent *e )
else {
if ( e->button() == LeftButton )
{
- m_rubber = new QRect( e->x(), e->y(), 0, 0 );
+ m_rubber = new TQRect( e->x(), e->y(), 0, 0 );
clearSelection();
emit selectionChanged();
m_fileTip->setItem( 0 );
}
if ( e->button() != RightButton )
- QListView::contentsMousePressEvent( e );
+ TQListView::contentsMousePressEvent( e );
}
// Store list of selected items at mouse-press time.
// This is used when autoscrolling (why?)
@@ -440,12 +440,12 @@ void KonqBaseListViewWidget::contentsMousePressEvent( QMouseEvent *e )
selectedItems( m_selected );
}
-void KonqBaseListViewWidget::contentsMouseReleaseEvent( QMouseEvent *e )
+void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e )
{
if ( m_rubber )
{
- QRect r( m_rubber->normalize() );
+ TQRect r( m_rubber->normalize() );
delete m_rubber;
m_rubber = 0;
repaintContents( r, FALSE );
@@ -453,8 +453,8 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( QMouseEvent *e )
if ( m_scrollTimer )
{
- disconnect( m_scrollTimer, SIGNAL( timeout() ),
- this, SLOT( slotAutoScroll() ) );
+ disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( slotAutoScroll() ) );
m_scrollTimer->stop();
delete m_scrollTimer;
m_scrollTimer = 0;
@@ -464,7 +464,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( QMouseEvent *e )
KListView::contentsMouseReleaseEvent( e );
}
-void KonqBaseListViewWidget::contentsMouseMoveEvent( QMouseEvent *e )
+void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e )
{
if ( m_rubber )
{
@@ -472,7 +472,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( QMouseEvent *e )
return;
}
- QPoint vp = contentsToViewport( e->pos() );
+ TQPoint vp = contentsToViewport( e->pos() );
KonqBaseListViewItem* item = isExecuteArea( vp ) ?
static_cast<KonqBaseListViewItem *>( itemAt( vp ) ) : 0;
@@ -490,7 +490,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( QMouseEvent *e )
m_pBrowserView->emitMouseOver( item->item() );
vp.setY( itemRect( item ).y() );
- QRect rect( viewportToContents( vp ), QSize(20, item->height()) );
+ TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) );
m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) );
m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) );
setShowToolTips( !m_pSettings->showFileTips() );
@@ -508,7 +508,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( QMouseEvent *e )
KListView::contentsMouseMoveEvent( e );
}
-void KonqBaseListViewWidget::contentsWheelEvent( QWheelEvent *e )
+void KonqBaseListViewWidget::contentsWheelEvent( TQWheelEvent *e )
{
// when scrolling with mousewheel, stop possible pending filetip
m_fileTip->setItem( 0 );
@@ -524,7 +524,7 @@ void KonqBaseListViewWidget::contentsWheelEvent( QWheelEvent *e )
KListView::contentsWheelEvent( e );
}
-void KonqBaseListViewWidget::leaveEvent( QEvent *e )
+void KonqBaseListViewWidget::leaveEvent( TQEvent *e )
{
if ( m_activeItem != 0 )
{
@@ -540,20 +540,20 @@ void KonqBaseListViewWidget::leaveEvent( QEvent *e )
KListView::leaveEvent( e );
}
-void KonqBaseListViewWidget::drawRubber( QPainter *p )
+void KonqBaseListViewWidget::drawRubber( TQPainter *p )
{
if ( !m_rubber )
return;
p->setRasterOp( NotROP );
- p->setPen( QPen( color0, 1 ) );
+ p->setPen( TQPen( color0, 1 ) );
p->setBrush( NoBrush );
- QPoint pt( m_rubber->x(), m_rubber->y() );
+ TQPoint pt( m_rubber->x(), m_rubber->y() );
pt = contentsToViewport( pt );
- style().drawPrimitive( QStyle::PE_RubberBand, p,
- QRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ),
- colorGroup(), QStyle::Style_Default, colorGroup().base() );
+ style().drawPrimitive( TQStyle::PE_RubberBand, p,
+ TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ),
+ colorGroup(), TQStyle::Style_Default, colorGroup().base() );
}
@@ -564,13 +564,13 @@ void KonqBaseListViewWidget::slotAutoScroll()
// this code assumes that all items have the same height
- const QPoint pos = viewport()->mapFromGlobal( QCursor::pos() );
- const QPoint vc = viewportToContents( pos );
+ const TQPoint pos = viewport()->mapFromGlobal( TQCursor::pos() );
+ const TQPoint vc = viewportToContents( pos );
if ( vc == m_rubber->bottomRight() )
return;
- QRect oldRubber = *m_rubber;
+ TQRect oldRubber = *m_rubber;
const int oldTop = m_rubber->normalize().top();
const int oldBottom = m_rubber->normalize().bottom();
@@ -578,18 +578,18 @@ void KonqBaseListViewWidget::slotAutoScroll()
m_rubber->setBottomRight( vc );
- QListViewItem *cur = itemAt( QPoint(0,0) );
+ TQListViewItem *cur = itemAt( TQPoint(0,0) );
bool block = signalsBlocked();
blockSignals( true );
- QRect rr;
- QRect nr = m_rubber->normalize();
+ TQRect rr;
+ TQRect nr = m_rubber->normalize();
bool changed = FALSE;
if ( cur )
{
- QRect rect;
+ TQRect rect;
if ( allColumnsShowFocus() )
rect = itemRect( cur );
else {
@@ -598,7 +598,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
}
- rect = QRect( viewportToContents( rect.topLeft() ),
+ rect = TQRect( viewportToContents( rect.topLeft() ),
viewportToContents( rect.bottomRight() ) );
if ( !allColumnsShowFocus() )
@@ -612,8 +612,8 @@ void KonqBaseListViewWidget::slotAutoScroll()
rect.setWidth( header()->headerWidth() );
}
- QRect r = rect;
- QListViewItem *tmp = cur;
+ TQRect r = rect;
+ TQListViewItem *tmp = cur;
while ( cur && rect.top() <= oldBottom )
{
@@ -687,21 +687,21 @@ void KonqBaseListViewWidget::slotAutoScroll()
blockSignals( block );
emit selectionChanged();
- QRect allRect = oldRubber.normalize();
+ TQRect allRect = oldRubber.normalize();
if ( changed )
{
allRect |= rr.normalize();
}
allRect |= m_rubber->normalize();
- QPoint point = contentsToViewport( allRect.topLeft() );
- allRect = QRect( point.x(), point.y(), allRect.width(), allRect.height() );
+ TQPoint point = contentsToViewport( allRect.topLeft() );
+ allRect = TQRect( point.x(), point.y(), allRect.width(), allRect.height() );
allRect &= viewport()->rect();
allRect.addCoords( -2, -2, 2, 2 );
- QPixmap backrubber( viewport()->rect().size() );
+ TQPixmap backrubber( viewport()->rect().size() );
backrubber.fill( viewport(), viewport()->rect().topLeft() );
- QPainter p( &backrubber );
+ TQPainter p( &backrubber );
p.save();
drawContentsOffset( &p,
contentsX(),
@@ -716,46 +716,46 @@ void KonqBaseListViewWidget::slotAutoScroll()
const int scroll_margin = 40;
ensureVisible( vc.x(), vc.y(), scroll_margin, scroll_margin );
- if ( !QRect( scroll_margin, scroll_margin,
+ if ( !TQRect( scroll_margin, scroll_margin,
viewport()->width() - 2*scroll_margin,
viewport()->height() - 2*scroll_margin ).contains( pos ) )
{
if ( !m_scrollTimer )
{
- m_scrollTimer = new QTimer( this );
+ m_scrollTimer = new TQTimer( this );
- connect( m_scrollTimer, SIGNAL( timeout() ),
- this, SLOT( slotAutoScroll() ) );
+ connect( m_scrollTimer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( slotAutoScroll() ) );
m_scrollTimer->start( 100, false );
}
}
else if ( m_scrollTimer )
{
- disconnect( m_scrollTimer, SIGNAL( timeout() ),
- this, SLOT( slotAutoScroll() ) );
+ disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( slotAutoScroll() ) );
m_scrollTimer->stop();
delete m_scrollTimer;
m_scrollTimer = 0;
}
}
-void KonqBaseListViewWidget::viewportPaintEvent( QPaintEvent *e )
+void KonqBaseListViewWidget::viewportPaintEvent( TQPaintEvent *e )
{
KListView::viewportPaintEvent( e );
- QPainter p( viewport() );
+ TQPainter p( viewport() );
drawRubber( &p );
p.end();
}
-void KonqBaseListViewWidget::viewportResizeEvent(QResizeEvent * e)
+void KonqBaseListViewWidget::viewportResizeEvent(TQResizeEvent * e)
{
KListView::viewportResizeEvent(e);
emit viewportAdjusted();
}
-void KonqBaseListViewWidget::viewportDragMoveEvent( QDragMoveEvent *_ev )
+void KonqBaseListViewWidget::viewportDragMoveEvent( TQDragMoveEvent *_ev )
{
KonqBaseListViewItem *item =
isExecuteArea( _ev->pos() ) ? (KonqBaseListViewItem*)itemAt( _ev->pos() ) : 0L;
@@ -788,7 +788,7 @@ void KonqBaseListViewWidget::viewportDragMoveEvent( QDragMoveEvent *_ev )
}
}
-void KonqBaseListViewWidget::viewportDragEnterEvent( QDragEnterEvent *_ev )
+void KonqBaseListViewWidget::viewportDragEnterEvent( TQDragEnterEvent *_ev )
{
m_dragOverItem = 0L;
@@ -796,14 +796,14 @@ void KonqBaseListViewWidget::viewportDragEnterEvent( QDragEnterEvent *_ev )
_ev->acceptAction();
}
-void KonqBaseListViewWidget::viewportDragLeaveEvent( QDragLeaveEvent * )
+void KonqBaseListViewWidget::viewportDragLeaveEvent( TQDragLeaveEvent * )
{
if ( m_dragOverItem != 0L )
setSelected( m_dragOverItem, false );
m_dragOverItem = 0L;
}
-void KonqBaseListViewWidget::viewportDropEvent( QDropEvent *ev )
+void KonqBaseListViewWidget::viewportDropEvent( TQDropEvent *ev )
{
if ( m_dirLister->url().isEmpty() )
return;
@@ -830,9 +830,9 @@ void KonqBaseListViewWidget::startDrag()
m_fileTip->setItem( 0 );
KURL::List urls = selectedUrls( false );
- QListViewItem * m_pressedItem = currentItem();
+ TQListViewItem * m_pressedItem = currentItem();
- QPixmap pixmap2;
+ TQPixmap pixmap2;
bool pixmap0Invalid = !m_pressedItem->pixmap(0) || m_pressedItem->pixmap(0)->isNull();
// Multiple URLs ?
@@ -855,7 +855,7 @@ void KonqBaseListViewWidget::startDrag()
drag->drag();
}
-void KonqBaseListViewWidget::slotItemRenamed( QListViewItem *item, const QString &name, int col )
+void KonqBaseListViewWidget::slotItemRenamed( TQListViewItem *item, const TQString &name, int col )
{
Q_ASSERT( col == 0 );
Q_ASSERT( item != 0 );
@@ -898,7 +898,7 @@ void KonqBaseListViewWidget::slotSelectionChanged()
}
void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button,
- QListViewItem *_item, const QPoint& pos, int )
+ TQListViewItem *_item, const TQPoint& pos, int )
{
if ( _button == MidButton )
{
@@ -909,7 +909,7 @@ void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button,
}
}
-void KonqBaseListViewWidget::slotExecuted( QListViewItem *item )
+void KonqBaseListViewWidget::slotExecuted( TQListViewItem *item )
{
if ( !item )
return;
@@ -917,11 +917,11 @@ void KonqBaseListViewWidget::slotExecuted( QListViewItem *item )
// isExecuteArea() checks whether the mouse pointer is
// over an area where an action should be triggered
// (i.e. the Name column, including pixmap and "+")
- if ( isExecuteArea( viewport()->mapFromGlobal( QCursor::pos() ) ) )
+ if ( isExecuteArea( viewport()->mapFromGlobal( TQCursor::pos() ) ) )
slotReturnPressed( item );
}
-void KonqBaseListViewWidget::selectedItems( QPtrList<KonqBaseListViewItem> *_list )
+void KonqBaseListViewWidget::selectedItems( TQPtrList<KonqBaseListViewItem> *_list )
{
iterator it = begin();
for ( ; it != end(); it++ )
@@ -967,7 +967,7 @@ KonqPropsView * KonqBaseListViewWidget::props() const
return m_pBrowserView->m_pProps;
}
-void KonqBaseListViewWidget::slotReturnPressed( QListViewItem *_item )
+void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
{
if ( !_item )
return;
@@ -985,11 +985,11 @@ void KonqBaseListViewWidget::slotReturnPressed( QListViewItem *_item )
if (_item->pixmap(0) != 0)
{
// Rect of the QListViewItem's pixmap area.
- QRect rect = _item->listView()->itemRect(_item);
+ TQRect rect = _item->listView()->itemRect(_item);
// calculate nesting depth
int nestingDepth = 0;
- for (QListViewItem *currentItem = _item->parent();
+ for (TQListViewItem *currentItem = _item->parent();
currentItem != 0;
currentItem = currentItem->parent())
nestingDepth++;
@@ -1007,7 +1007,7 @@ void KonqBaseListViewWidget::slotReturnPressed( QListViewItem *_item )
rect.setWidth(_item->pixmap(0)->width());
// gather pixmap
- QPixmap *pix = new QPixmap(*(_item->pixmap(0)));
+ TQPixmap *pix = new TQPixmap(*(_item->pixmap(0)));
// call the icon effect
KIconEffect::visualActivate(viewport(), rect, pix);
@@ -1019,13 +1019,13 @@ void KonqBaseListViewWidget::slotReturnPressed( QListViewItem *_item )
KMessageBox::information( 0, i18n("You must take the file out of the trash before being able to use it.") );
}
-void KonqBaseListViewWidget::slotPopupMenu( QListViewItem *i, const QPoint &point, int c )
+void KonqBaseListViewWidget::slotPopupMenu( TQListViewItem *i, const TQPoint &point, int c )
{
kdDebug(1202) << "KonqBaseListViewWidget::slotPopupMenu" << endl;
popupMenu( point, ( i != 0 && c == -1 ) ); // i != 0 && c == -1 when activated by keyboard
}
-void KonqBaseListViewWidget::popupMenu( const QPoint& _global, bool alwaysForSelectedFiles )
+void KonqBaseListViewWidget::popupMenu( const TQPoint& _global, bool alwaysForSelectedFiles )
{
m_fileTip->setItem( 0 );
@@ -1037,7 +1037,7 @@ void KonqBaseListViewWidget::popupMenu( const QPoint& _global, bool alwaysForSel
// a popup for the current dir instead.
if ( alwaysForSelectedFiles || isExecuteArea( viewport()->mapFromGlobal( _global ) ) )
{
- QPtrList<KonqBaseListViewItem> items;
+ TQPtrList<KonqBaseListViewItem> items;
selectedItems( &items );
for ( KonqBaseListViewItem *item = items.first(); item; item = items.next() )
lstItems.append( item->item() );
@@ -1224,7 +1224,7 @@ void KonqBaseListViewWidget::slotCanceled()
//kdDebug(1202) << k_funcinfo << endl;
setComplete();
- emit m_pBrowserView->canceled( QString::null );
+ emit m_pBrowserView->canceled( TQString::null );
}
void KonqBaseListViewWidget::slotClear()
@@ -1246,7 +1246,7 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries )
{
//kdDebug(1202) << k_funcinfo << entries.count() << endl;
- for ( QPtrListIterator<KFileItem> kit ( entries ); kit.current(); ++kit )
+ for ( TQPtrListIterator<KFileItem> kit ( entries ); kit.current(); ++kit )
{
KonqListViewItem * tmp = new KonqListViewItem( this, *kit );
if ( !m_itemFound && tmp->text(0) == m_itemToGoTo )
@@ -1255,7 +1255,7 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries )
m_itemFound = true;
}
if ( !m_itemsToSelect.isEmpty() ) {
- QStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
+ TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
if ( tsit != m_itemsToSelect.end() ) {
m_itemsToSelect.remove( tsit );
setSelected( tmp, true );
@@ -1325,7 +1325,7 @@ void KonqBaseListViewWidget::slotRefreshItems( const KFileItemList & entries )
{
//kdDebug(1202) << k_funcinfo << endl;
- QPtrListIterator<KFileItem> kit ( entries );
+ TQPtrListIterator<KFileItem> kit ( entries );
for ( ; kit.current(); ++kit )
{
iterator it = begin();
@@ -1349,7 +1349,7 @@ void KonqBaseListViewWidget::slotRedirection( const KURL & url )
readProtocolConfig( url );
createColumns();
}
- const QString prettyURL = url.pathOrURL();
+ const TQString prettyURL = url.pathOrURL();
emit m_pBrowserView->extension()->setLocationBarURL( prettyURL );
emit m_pBrowserView->setWindowCaption( prettyURL );
m_pBrowserView->m_url = url;
@@ -1416,22 +1416,22 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in
return it;
}
-void KonqBaseListViewWidget::paintEmptyArea( QPainter *p, const QRect &r )
+void KonqBaseListViewWidget::paintEmptyArea( TQPainter *p, const TQRect &r )
{
- const QPixmap *pm = viewport()->paletteBackgroundPixmap();
+ const TQPixmap *pm = viewport()->paletteBackgroundPixmap();
if (!pm || pm->isNull())
p->fillRect(r, viewport()->backgroundColor());
else
{
- QRect devRect = p->xForm( r );
+ TQRect devRect = p->xForm( r );
int ax = (devRect.x() + contentsX());
int ay = (devRect.y() + contentsY());
/* kdDebug() << "KonqBaseListViewWidget::paintEmptyArea "
<< r.x() << "," << r.y() << " " << r.width() << "x" << r.height()
<< " drawing pixmap with offset " << ax << "," << ay
<< endl;*/
- p->drawTiledPixmap(r, *pm, QPoint(ax, ay));
+ p->drawTiledPixmap(r, *pm, TQPoint(ax, ay));
}
}
@@ -1455,19 +1455,19 @@ void KonqBaseListViewWidget::disableIcons( const KURL::List & lst )
}
}
-void KonqBaseListViewWidget::saveState( QDataStream & ds )
+void KonqBaseListViewWidget::saveState( TQDataStream & ds )
{
- QString str;
+ TQString str;
if ( currentItem() )
str = static_cast<KonqBaseListViewItem*>(currentItem())->item()->url().fileName(true);
ds << str << m_url;
}
-void KonqBaseListViewWidget::restoreState( QDataStream & ds )
+void KonqBaseListViewWidget::restoreState( TQDataStream & ds )
{
m_restored = true;
- QString str;
+ TQString str;
KURL url;
ds >> str >> url;
if ( !str.isEmpty() )
@@ -1490,8 +1490,8 @@ void KonqBaseListViewWidget::slotUpdateBackground()
{
if ( !m_backgroundTimer )
{
- m_backgroundTimer = new QTimer( this );
- connect( m_backgroundTimer, SIGNAL( timeout() ), viewport(), SLOT( update() ) );
+ m_backgroundTimer = new TQTimer( this );
+ connect( m_backgroundTimer, TQT_SIGNAL( timeout() ), viewport(), TQT_SLOT( update() ) );
}
else
m_backgroundTimer->stop();
@@ -1506,7 +1506,7 @@ bool KonqBaseListViewWidget::caseInsensitiveSort() const
}
// based on isExecuteArea from klistview.cpp
-int KonqBaseListViewWidget::executeArea( QListViewItem *_item )
+int KonqBaseListViewWidget::executeArea( TQListViewItem *_item )
{
if ( !_item )
return 0;
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index d6451e50d..19cb4b16d 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -20,8 +20,8 @@
#ifndef __konq_listviewwidget_h__
#define __konq_listviewwidget_h__
-#include <qvaluelist.h>
-#include <qvaluevector.h>
+#include <tqvaluelist.h>
+#include <tqvaluevector.h>
#include <kurl.h>
#include <kfileitem.h>
@@ -55,15 +55,15 @@ class ColumnInfo
{
public:
ColumnInfo();
- void setData( const QString& n, const QString& desktopName, int kioUds,
+ void setData( const TQString& n, const TQString& desktopName, int kioUds,
KToggleAction *someAction, int theWith = -1 );
- void setData( const QString& n, const QString& desktopName, int kioUds /* UDS_EXTRA */,
- QVariant::Type type, KToggleAction *someAction, int theWith = -1 );
+ void setData( const TQString& n, const TQString& desktopName, int kioUds /* UDS_EXTRA */,
+ TQVariant::Type type, KToggleAction *someAction, int theWith = -1 );
int displayInColumn;
- QString name;
- QString desktopFileName;
+ TQString name;
+ TQString desktopFileName;
int udsId;
- QVariant::Type type; // only used if udsId == UDS_EXTRA
+ TQVariant::Type type; // only used if udsId == UDS_EXTRA
bool displayThisOne;
KToggleAction *toggleThisOne;
int width;
@@ -81,7 +81,7 @@ class KonqBaseListViewWidget : public KListView
Q_OBJECT
public:
- KonqBaseListViewWidget( KonqListView *parent, QWidget *parentWidget );
+ KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget );
virtual ~KonqBaseListViewWidget();
unsigned int NumberOfAtoms;
@@ -108,40 +108,40 @@ public:
virtual bool openURL( const KURL &url );
- void selectedItems( QPtrList<KonqBaseListViewItem> *_list );
+ void selectedItems( TQPtrList<KonqBaseListViewItem> *_list );
KFileItemList visibleFileItems();
KFileItemList selectedFileItems();
KURL::List selectedUrls( bool mostLocal = false );
/** @return the KonqListViewDir which handles the directory _url */
- //virtual KonqListViewDir *findDir ( const QString & _url );
+ //virtual KonqListViewDir *findDir ( const TQString & _url );
/**
* @return the Properties instance for this view. Used by the items.
*/
KonqPropsView *props() const;
- //QPtrList<ColumnInfo> *columnConfigInfo() { return &confColumns; };
- QValueVector<ColumnInfo>& columnConfigInfo() { return confColumns; };
- QString sortedByColumn;
+ //TQPtrList<ColumnInfo> *columnConfigInfo() { return &confColumns; };
+ TQValueVector<ColumnInfo>& columnConfigInfo() { return confColumns; };
+ TQString sortedByColumn;
virtual void setShowIcons( bool enable ) { m_showIcons = enable; }
virtual bool showIcons() { return m_showIcons; }
- void setItemFont( const QFont &f ) { m_itemFont = f; }
- QFont itemFont() const { return m_itemFont; }
- void setItemColor( const QColor &c ) { m_itemColor = c; }
- QColor itemColor() const { return m_itemColor; }
+ void setItemFont( const TQFont &f ) { m_itemFont = f; }
+ TQFont itemFont() const { return m_itemFont; }
+ void setItemColor( const TQColor &c ) { m_itemColor = c; }
+ TQColor itemColor() const { return m_itemColor; }
int iconSize() const { return props()->iconSize(); }
void setAscending( bool b ) { m_bAscending = b; }
bool ascending() const { return m_bAscending; }
bool caseInsensitiveSort() const;
- virtual void paintEmptyArea( QPainter *p, const QRect &r );
+ virtual void paintEmptyArea( TQPainter *p, const TQRect &r );
- virtual void saveState( QDataStream & );
- virtual void restoreState( QDataStream & );
+ virtual void saveState( TQDataStream & );
+ virtual void restoreState( TQDataStream & );
virtual void disableIcons( const KURL::List& lst );
@@ -154,16 +154,16 @@ signals:
public slots:
//virtual void slotOnItem( KonqBaseListViewItem* _item );
// The '2' was added to differentiate it from KListView::slotMouseButtonClicked()
- void slotMouseButtonClicked2( int _button, QListViewItem *_item, const QPoint& pos, int );
- virtual void slotExecuted( QListViewItem *_item );
- void slotItemRenamed( QListViewItem *, const QString &, int );
+ void slotMouseButtonClicked2( int _button, TQListViewItem *_item, const TQPoint& pos, int );
+ virtual void slotExecuted( TQListViewItem *_item );
+ void slotItemRenamed( TQListViewItem *, const TQString &, int );
protected slots:
void slotAutoScroll();
// from QListView
- virtual void slotReturnPressed( QListViewItem *_item );
- virtual void slotCurrentChanged( QListViewItem *_item ) { slotOnItem( _item ); }
+ virtual void slotReturnPressed( TQListViewItem *_item );
+ virtual void slotCurrentChanged( TQListViewItem *_item ) { slotOnItem( _item ); }
// slots connected to the directory lister
virtual void slotStarted();
@@ -174,7 +174,7 @@ protected slots:
virtual void slotDeleteItem( KFileItem * );
virtual void slotRefreshItems( const KFileItemList & );
virtual void slotRedirection( const KURL & );
- void slotPopupMenu( QListViewItem *, const QPoint&, int );
+ void slotPopupMenu( TQListViewItem *, const TQPoint&, int );
// forces a repaint on column size changes / branch expansion
// when there is a background pixmap
@@ -199,54 +199,54 @@ protected:
void initConfig();
virtual void startDrag();
- virtual void viewportDragMoveEvent( QDragMoveEvent *_ev );
- virtual void viewportDragEnterEvent( QDragEnterEvent *_ev );
- virtual void viewportDragLeaveEvent( QDragLeaveEvent *_ev );
- virtual void viewportDropEvent( QDropEvent *_ev );
- virtual void viewportPaintEvent( QPaintEvent *e );
- virtual void viewportResizeEvent( QResizeEvent *e );
+ virtual void viewportDragMoveEvent( TQDragMoveEvent *_ev );
+ virtual void viewportDragEnterEvent( TQDragEnterEvent *_ev );
+ virtual void viewportDragLeaveEvent( TQDragLeaveEvent *_ev );
+ virtual void viewportDropEvent( TQDropEvent *_ev );
+ virtual void viewportPaintEvent( TQPaintEvent *e );
+ virtual void viewportResizeEvent( TQResizeEvent *e );
- virtual void drawRubber( QPainter * );
- virtual void contentsMousePressEvent( QMouseEvent *e );
- virtual void contentsMouseReleaseEvent( QMouseEvent *e );
- virtual void contentsMouseMoveEvent( QMouseEvent *e );
- virtual void contentsWheelEvent( QWheelEvent * e );
+ virtual void drawRubber( TQPainter * );
+ virtual void contentsMousePressEvent( TQMouseEvent *e );
+ virtual void contentsMouseReleaseEvent( TQMouseEvent *e );
+ virtual void contentsMouseMoveEvent( TQMouseEvent *e );
+ virtual void contentsWheelEvent( TQWheelEvent * e );
- virtual void leaveEvent( QEvent *e );
+ virtual void leaveEvent( TQEvent *e );
/** Common method for slotCompleted and slotCanceled */
virtual void setComplete();
//the second parameter is set to true when the menu shortcut is pressed,
//so the position of the mouse pointer doesn't matter when using keyboard, aleXXX
- virtual void popupMenu( const QPoint& _global, bool alwaysForSelectedFiles = false );
+ virtual void popupMenu( const TQPoint& _global, bool alwaysForSelectedFiles = false );
//this one is called only by KListView, and this is friend anyways (Alex)
//KDirLister *dirLister() const { return m_dirLister; }
protected:
- int executeArea( QListViewItem *_item );
+ int executeArea( TQListViewItem *_item );
/** The directory lister for this URL */
KDirLister *m_dirLister;
- //QPtrList<ColumnInfo> confColumns;
+ //TQPtrList<ColumnInfo> confColumns;
// IMO there is really no need for an advanced data structure
//we have a fixed number of members,
//it consumes less memory and access should be faster (Alex)
// This might not be the case for ever... we should introduce custom fields in kio (David)
- QValueVector<ColumnInfo> confColumns;
+ TQValueVector<ColumnInfo> confColumns;
KonqBaseListViewItem *m_dragOverItem;
KonqBaseListViewItem *m_activeItem;
- QPtrList<KonqBaseListViewItem> *m_selected;
- QTimer *m_scrollTimer;
+ TQPtrList<KonqBaseListViewItem> *m_selected;
+ TQTimer *m_scrollTimer;
- QFont m_itemFont;
- QColor m_itemColor;
+ TQFont m_itemFont;
+ TQColor m_itemColor;
- QRect *m_rubber;
- QPixmap *m_backrubber;
+ TQRect *m_rubber;
+ TQPixmap *m_backrubber;
bool m_bTopLevelComplete:1;
bool m_showIcons:1;
@@ -261,9 +261,9 @@ protected:
KURL m_url;
- QString m_itemToGoTo;
- QStringList m_itemsToSelect;
- QTimer *m_backgroundTimer;
+ TQString m_itemToGoTo;
+ TQStringList m_itemsToSelect;
+ TQTimer *m_backgroundTimer;
KonqFileTip *m_fileTip;
};
diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc
index 71d1de833..8e03e171e 100644
--- a/konqueror/listview/konq_textviewitem.cc
+++ b/konqueror/listview/konq_textviewitem.cc
@@ -24,17 +24,17 @@
#include <stdio.h>
#include <kglobal.h>
-int KonqTextViewItem::compare( QListViewItem *item, int col, bool ascending ) const
+int KonqTextViewItem::compare( TQListViewItem *item, int col, bool ascending ) const
{
if (col==1)
return KonqBaseListViewItem::compare(item, 0, ascending);
return KonqBaseListViewItem::compare(item, col, ascending);
}
-/*QString KonqTextViewItem::key( int _column, bool asc) const
+/*TQString KonqTextViewItem::key( int _column, bool asc) const
{
if (_column==1) return key(0,asc);
- QString tmp = QString::number( sortChar );
+ TQString tmp = TQString::number( sortChar );
//check if it is a time column
if (_column>1)
{
@@ -48,7 +48,7 @@ int KonqTextViewItem::compare( QListViewItem *item, int col, bool ascending ) co
|| (cInfo->udsId==KIO::UDS_ACCESS_TIME)
|| (cInfo->udsId==KIO::UDS_CREATION_TIME))
{
- tmp += QString::number( m_fileitem->time(cInfo->udsId) ).rightJustify( 14, '0' );
+ tmp += TQString::number( m_fileitem->time(cInfo->udsId) ).rightJustify( 14, '0' );
return tmp;
}
else if (cInfo->udsId==KIO::UDS_SIZE)
@@ -67,7 +67,7 @@ int KonqTextViewItem::compare( QListViewItem *item, int col, bool ascending ) co
void KonqTextViewItem::updateContents()
{
- QString tmp;
+ TQString tmp;
KIO::filesize_t size=m_fileitem->size();
mode_t m=m_fileitem->mode();
@@ -185,7 +185,7 @@ void KonqTextViewItem::updateContents()
{
if ((*it).m_uds==(unsigned int)tmpColumn->udsId)
{
- QDateTime dt;
+ TQDateTime dt;
dt.setTime_t((time_t) (*it).m_long);
setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));
break;
@@ -200,25 +200,25 @@ void KonqTextViewItem::updateContents()
};
}
-void KonqTextViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
{
- QColorGroup cg( _cg );
- cg.setColor(QColorGroup::Text, static_cast<KonqTextViewWidget *>(listView())->colors[type]);
+ TQColorGroup cg( _cg );
+ cg.setColor(TQColorGroup::Text, static_cast<KonqTextViewWidget *>(listView())->colors[type]);
// Don't do that! Keep things readable whatever the selection background color is
-// cg.setColor(QColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]);
-// cg.setColor(QColorGroup::Highlight, Qt::darkGray);
+// cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]);
+// cg.setColor(TQColorGroup::Highlight, Qt::darkGray);
KListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
}
-/*void KonqTextViewItem::paintFocus( QPainter *_p, const QColorGroup &_cg, const QRect &_r )
+/*void KonqTextViewItem::paintFocus( TQPainter *_p, const TQColorGroup &_cg, const TQRect &_r )
{
listView()->style().drawFocusRect( _p, _r, _cg,
isSelected() ? &_cg.highlight() : &_cg.base(), isSelected() );
- QPixmap pix( _r.width(), _r.height() );
+ TQPixmap pix( _r.width(), _r.height() );
bitBlt( &pix, 0, 0, _p->device(), _r.left(), _r.top(), _r.width(), _r.height() );
- QImage im = pix.convertToImage();
+ TQImage im = pix.convertToImage();
im = KImageEffect::fade( im, 0.25, Qt::black );
_p->drawImage( _r.topLeft(), im );
}*/
diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h
index 413016bea..9aeb6d6be 100644
--- a/konqueror/listview/konq_textviewitem.h
+++ b/konqueror/listview/konq_textviewitem.h
@@ -20,8 +20,8 @@
#ifndef __konq_textviewitem_h__
#define __konq_textviewitem_h__
-#include <qlistview.h>
-#include <qstring.h>
+#include <tqlistview.h>
+#include <tqstring.h>
#include <kio/global.h>
#include <klocale.h>
#include "konq_listviewitems.h"
@@ -53,12 +53,12 @@ class KonqTextViewItem : public KonqBaseListViewItem
*/
KonqTextViewItem( KonqTextViewWidget *_parent, KFileItem* _fileitem );
virtual ~KonqTextViewItem() {/*cerr<<"~KonqTextViewItem: "<<text(1)<<endl;*/ };
- virtual int compare( QListViewItem* i, int col, bool ascending ) const;
-// virtual QString key( int _column, bool asc) const;
+ virtual int compare( TQListViewItem* i, int col, bool ascending ) const;
+// virtual TQString key( int _column, bool asc) const;
/** Call this before destroying the text view (decreases reference count
* on the view)*/
- virtual void paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment );
-// virtual void paintFocus( QPainter *_painter, const QColorGroup & _cg, const QRect & r );
+ virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment );
+// virtual void paintFocus( TQPainter *_painter, const TQColorGroup & _cg, const TQRect & r );
virtual void updateContents();
protected:
diff --git a/konqueror/listview/konq_textviewwidget.cc b/konqueror/listview/konq_textviewwidget.cc
index 96c498297..32de25351 100644
--- a/konqueror/listview/konq_textviewwidget.cc
+++ b/konqueror/listview/konq_textviewwidget.cc
@@ -20,7 +20,7 @@
#include "konq_listview.h"
#include "konq_textviewitem.h"
-#include <qheader.h>
+#include <tqheader.h>
#include <kdebug.h>
#include <kdirlister.h>
@@ -29,7 +29,7 @@
#include <assert.h>
-KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, QWidget *parentWidget )
+KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget )
:KonqBaseListViewWidget(parent,parentWidget)
{
kdDebug(1202) << "+KonqTextViewWidget" << endl;
@@ -44,7 +44,7 @@ KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, QWidget *parentWid
setRootIsDecorated(false);
colors[KTVI_REGULAR]=Qt::black;
- colors[KTVI_EXEC]=QColor(0,170,0);
+ colors[KTVI_EXEC]=TQColor(0,170,0);
colors[KTVI_REGULARLINK]=Qt::black;
colors[KTVI_DIR]=Qt::black;
colors[KTVI_DIRLINK]=Qt::black;
@@ -79,7 +79,7 @@ void KonqTextViewWidget::slotNewItems( const KFileItemList & entries )
{
//kdDebug(1202) << k_funcinfo << entries.count() << endl;
- for ( QPtrListIterator<KFileItem> kit ( entries ); kit.current(); ++kit )
+ for ( TQPtrListIterator<KFileItem> kit ( entries ); kit.current(); ++kit )
{
KonqTextViewItem *tmp = new KonqTextViewItem( this, *kit );
if ( !m_itemFound && tmp->text(0) == m_itemToGoTo )
@@ -88,7 +88,7 @@ void KonqTextViewWidget::slotNewItems( const KFileItemList & entries )
m_itemFound = true;
}
if ( !m_itemsToSelect.isEmpty() ) {
- QStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
+ TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
if ( tsit != m_itemsToSelect.end() ) {
m_itemsToSelect.remove( tsit );
setSelected( tmp, true );
@@ -152,7 +152,7 @@ void KonqTextViewWidget::setComplete()
}
}
-bool KonqTextViewWidget::isExecuteArea( const QPoint& point )
+bool KonqTextViewWidget::isExecuteArea( const TQPoint& point )
{
if (!itemAt( point ) )
return false;
@@ -168,7 +168,7 @@ bool KonqTextViewWidget::isExecuteArea( const QPoint& point )
return ( x > offset && x < ( offset + width ) );
}
-/*void KonqTextViewWidget::viewportDragMoveEvent( QDragMoveEvent *_ev )
+/*void KonqTextViewWidget::viewportDragMoveEvent( TQDragMoveEvent *_ev )
{
KonqBaseListViewItem *item =
isNameColumn( _ev->pos() ) ? (KonqBaseListViewItem*)itemAt( _ev->pos() ) : 0L;
@@ -200,7 +200,7 @@ bool KonqTextViewWidget::isExecuteArea( const QPoint& point )
}
}
-void KonqTextViewWidget::viewportDropEvent( QDropEvent *ev )
+void KonqTextViewWidget::viewportDropEvent( TQDropEvent *ev )
{
if ( m_dirLister->url().isEmpty() )
return;
diff --git a/konqueror/listview/konq_textviewwidget.h b/konqueror/listview/konq_textviewwidget.h
index f799286ff..06a5cbbb5 100644
--- a/konqueror/listview/konq_textviewwidget.h
+++ b/konqueror/listview/konq_textviewwidget.h
@@ -34,21 +34,21 @@ class KonqTextViewWidget : public KonqBaseListViewWidget
friend class KonqTextViewItem;
Q_OBJECT
public:
- KonqTextViewWidget( KonqListView *parent, QWidget *parentWidget );
+ KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget );
~KonqTextViewWidget();
- virtual bool isExecuteArea( const QPoint& point );
+ virtual bool isExecuteArea( const TQPoint& point );
protected slots:
// slots connected to the directory lister
virtual void setComplete();
virtual void slotNewItems( const KFileItemList & );
protected:
-// bool isNameColumn(const QPoint& point );
-// virtual void viewportDragMoveEvent( QDragMoveEvent *_ev );
-// virtual void viewportDropEvent( QDropEvent *ev );
+// bool isNameColumn(const TQPoint& point );
+// virtual void viewportDragMoveEvent( TQDragMoveEvent *_ev );
+// virtual void viewportDropEvent( TQDropEvent *ev );
virtual void createColumns();
- QColor colors[11];
+ TQColor colors[11];
};
#endif
diff --git a/konqueror/listview/konq_treeviewitem.cc b/konqueror/listview/konq_treeviewitem.cc
index 09b9d941b..32baf1c41 100644
--- a/konqueror/listview/konq_treeviewitem.cc
+++ b/konqueror/listview/konq_treeviewitem.cc
@@ -57,7 +57,7 @@ void KonqListViewDir::open( bool _open, bool _reload )
KFileItemList lst;
lst.setAutoDelete( false );
- QListViewItem* it = firstChild();
+ TQListViewItem* it = firstChild();
while ( it )
{
lst.append( static_cast<KonqListViewItem*>(it)->item() );
@@ -72,7 +72,7 @@ void KonqListViewDir::open( bool _open, bool _reload )
{
treeView->stopListingSubFolder( this );
- QListViewItem* it = firstChild();
+ TQListViewItem* it = firstChild();
while ( it )
{
// unselect the items in the closed folder
@@ -84,12 +84,12 @@ void KonqListViewDir::open( bool _open, bool _reload )
}
}
- QListViewItem::setOpen( _open );
+ TQListViewItem::setOpen( _open );
treeView->slotOnViewport();
}
}
-QString KonqListViewDir::url( int _trailing )
+TQString KonqListViewDir::url( int _trailing )
{
return item()->url().url( _trailing );
}
diff --git a/konqueror/listview/konq_treeviewitem.h b/konqueror/listview/konq_treeviewitem.h
index 5341a811a..b17adacaf 100644
--- a/konqueror/listview/konq_treeviewitem.h
+++ b/konqueror/listview/konq_treeviewitem.h
@@ -20,7 +20,7 @@
#ifndef __konq_treeviewitem_h__
#define __konq_treeviewitem_h__
-#include <qstring.h>
+#include <tqstring.h>
#include "konq_listviewitems.h"
class KFileItem;
@@ -48,7 +48,7 @@ public:
KonqListViewDir( KonqTreeViewWidget *_treeview, KonqListViewDir *_parent, KFileItem *_fileitem );
/**
- * Called when user opens the directory (inherited from QListViewItem).
+ * Called when user opens the directory (inherited from TQListViewItem).
* Just calls @ref #open().
*/
virtual void setOpen( bool _open );
@@ -70,7 +70,7 @@ public:
* URL of this directory
* @param _trailing set to true for a trailing slash (see KURL)
*/
- QString url( int _trailing );
+ TQString url( int _trailing );
protected:
bool m_bComplete;
diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cc
index 67844fa3d..4d04f2fa4 100644
--- a/konqueror/listview/konq_treeviewwidget.cc
+++ b/konqueror/listview/konq_treeviewwidget.cc
@@ -24,10 +24,10 @@
#include <kdirlister.h>
#include <kdebug.h>
-template class QDict<KonqListViewDir>;
+template class TQDict<KonqListViewDir>;
-KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, QWidget *parentWidget)
+KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget)
: KonqBaseListViewWidget( parent, parentWidget )
{
kdDebug(1202) << "+KonqTreeViewWidget" << endl;
@@ -35,12 +35,12 @@ KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, QWidget *parentWid
setRootIsDecorated( true );
setTreeStepSize( 20 );
- connect( m_dirLister, SIGNAL( completed( const KURL & ) ),
- this, SLOT( slotCompleted( const KURL & ) ) );
- connect( m_dirLister, SIGNAL( clear( const KURL & ) ),
- this, SLOT( slotClear( const KURL & ) ) );
- connect( m_dirLister, SIGNAL( redirection( const KURL &, const KURL & ) ),
- this, SLOT( slotRedirection( const KURL &, const KURL & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ),
+ this, TQT_SLOT( slotCompleted( const KURL & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( clear( const KURL & ) ),
+ this, TQT_SLOT( slotClear( const KURL & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ),
+ this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) );
}
KonqTreeViewWidget::~KonqTreeViewWidget()
@@ -59,7 +59,7 @@ bool KonqTreeViewWidget::openURL( const KURL &url )
if ( m_pBrowserView->extension()->urlArgs().reload )
{
- QDictIterator<KonqListViewDir> it( m_dictSubDirs );
+ TQDictIterator<KonqListViewDir> it( m_dictSubDirs );
for (; it.current(); ++it )
if ( it.current()->isOpen() )
m_urlsToReload.append( it.current()->url( -1 ) );
@@ -75,11 +75,11 @@ bool KonqTreeViewWidget::openURL( const KURL &url )
return KonqBaseListViewWidget::openURL( url );
}
-void KonqTreeViewWidget::saveState( QDataStream &stream )
+void KonqTreeViewWidget::saveState( TQDataStream &stream )
{
- QStringList openDirList;
+ TQStringList openDirList;
- QDictIterator<KonqListViewDir> it( m_dictSubDirs );
+ TQDictIterator<KonqListViewDir> it( m_dictSubDirs );
for (; it.current(); ++it )
{
if ( it.current()->isOpen() )
@@ -90,7 +90,7 @@ void KonqTreeViewWidget::saveState( QDataStream &stream )
KonqBaseListViewWidget::saveState( stream );
}
-void KonqTreeViewWidget::restoreState( QDataStream &stream )
+void KonqTreeViewWidget::restoreState( TQDataStream &stream )
{
stream >> m_urlsToOpen;
KonqBaseListViewWidget::restoreState( stream );
@@ -148,7 +148,7 @@ void KonqTreeViewWidget::slotClear( const KURL & _url )
if ( item )
{
// search all subdirs of _url (item)
- QDictIterator<KonqListViewDir> it( m_dictSubDirs );
+ TQDictIterator<KonqListViewDir> it( m_dictSubDirs );
while ( it.current() )
{
if ( !_url.equals( it.currentKey(), true )
@@ -168,7 +168,7 @@ void KonqTreeViewWidget::slotClear( const KURL & _url )
// the following code.
// delete all child items, their fileitems are no longer valid
- QListViewItem *child;
+ TQListViewItem *child;
while ( (child = item->firstChild()) )
delete child;
@@ -192,7 +192,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries )
if (!entries.count())
return;
// Find parent item - it's the same for all the items
- QPtrListIterator<KFileItem> kit( entries );
+ TQPtrListIterator<KFileItem> kit( entries );
KURL dir( (*kit)->url().upURL() );
KonqListViewDir *parentDir = 0L;
@@ -201,7 +201,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries )
if ( !parentDir ) // hack for zeroconf://domain/type/service listed in zeroconf:/type/ dir
{
- dir.setHost( QString::null );
+ dir.setHost( TQString::null );
parentDir = m_dictSubDirs[ dir.url(-1) ];
}
@@ -246,7 +246,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries )
}
if ( !m_itemsToSelect.isEmpty() ) {
- QStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
+ TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
if ( tsit != m_itemsToSelect.end() ) {
m_itemsToSelect.remove( tsit );
setSelected( fileItem ? fileItem : dirItem, true );
@@ -258,7 +258,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries )
if ( dirItem )
{
- QString u = (*kit)->url().url( 0 );
+ TQString u = (*kit)->url().url( 0 );
if ( m_urlsToOpen.remove( u ) )
dirItem->open( true, false );
else if ( m_urlsToReload.remove( u ) )
@@ -280,7 +280,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries )
void KonqTreeViewWidget::slotDeleteItem( KFileItem *_fileItem )
{
- QString url = _fileItem->url().url(-1);
+ TQString url = _fileItem->url().url(-1);
// Check if this item is in m_dictSubDirs, and if yes, then remove it
slotClear( _fileItem->url() );
diff --git a/konqueror/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h
index 86119a8bf..3f08cc3d5 100644
--- a/konqueror/listview/konq_treeviewwidget.h
+++ b/konqueror/listview/konq_treeviewwidget.h
@@ -21,7 +21,7 @@
#include "konq_listviewwidget.h"
#include "konq_treeviewitem.h"
-#include <qdict.h>
+#include <tqdict.h>
#include <kurl.h>
#include <klistview.h>
@@ -34,13 +34,13 @@ class KonqTreeViewWidget : public KonqBaseListViewWidget
Q_OBJECT
public:
- KonqTreeViewWidget( KonqListView *parent, QWidget *parentWidget );
+ KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget );
virtual ~KonqTreeViewWidget();
virtual bool openURL( const KURL &url );
- virtual void saveState( QDataStream &stream );
- virtual void restoreState( QDataStream &stream );
+ virtual void saveState( TQDataStream &stream );
+ virtual void restoreState( TQDataStream &stream );
protected slots:
// slots connected to the directory lister
@@ -53,15 +53,15 @@ protected slots:
virtual void slotDeleteItem( KFileItem *_fileTtem );
protected:
- KonqListViewDir *findDir( const QString &_url );
+ KonqListViewDir *findDir( const TQString &_url );
void openSubFolder( KonqListViewDir *_dir, bool _reload );
void stopListingSubFolder( KonqListViewDir *_dir );
// URL -> item (for directories only)
- QDict<KonqListViewDir> m_dictSubDirs;
+ TQDict<KonqListViewDir> m_dictSubDirs;
- QStringList m_urlsToOpen, m_urlsToReload;
+ TQStringList m_urlsToOpen, m_urlsToReload;
};
#endif
diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cc
index a60604e86..23c1704d9 100644
--- a/konqueror/preloader/preloader.cc
+++ b/konqueror/preloader/preloader.cc
@@ -26,14 +26,14 @@
#include <dcopclient.h>
#include <kdebug.h>
-KonqyPreloader::KonqyPreloader( const QCString& obj )
+KonqyPreloader::KonqyPreloader( const TQCString& obj )
: KDEDModule( obj )
{
reconfigure();
- connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString& )),
- SLOT( appRemoved( const QCString& )));
- connect( &check_always_preloaded_timer, SIGNAL( timeout()),
- SLOT( checkAlwaysPreloaded()));
+ connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& )),
+ TQT_SLOT( appRemoved( const TQCString& )));
+ connect( &check_always_preloaded_timer, TQT_SIGNAL( timeout()),
+ TQT_SLOT( checkAlwaysPreloaded()));
}
KonqyPreloader::~KonqyPreloader()
@@ -41,7 +41,7 @@ KonqyPreloader::~KonqyPreloader()
updateCount();
}
-bool KonqyPreloader::registerPreloadedKonqy( QCString id, int screen )
+bool KonqyPreloader::registerPreloadedKonqy( TQCString id, int screen )
{
if( instances.count() >= (uint)KonqSettings::maxPreloadCount() )
return false;
@@ -49,7 +49,7 @@ bool KonqyPreloader::registerPreloadedKonqy( QCString id, int screen )
return true;
}
-QCString KonqyPreloader::getPreloadedKonqy( int screen )
+TQCString KonqyPreloader::getPreloadedKonqy( int screen )
{
if( instances.count() == 0 )
return "";
@@ -59,7 +59,7 @@ QCString KonqyPreloader::getPreloadedKonqy( int screen )
{
if( (*it).screen == screen )
{
- QCString ret = (*it).id;
+ TQCString ret = (*it).id;
instances.remove( it );
check_always_preloaded_timer.start( 5000, true );
return ret;
@@ -68,7 +68,7 @@ QCString KonqyPreloader::getPreloadedKonqy( int screen )
return "";
}
-void KonqyPreloader::unregisterPreloadedKonqy( QCString id_P )
+void KonqyPreloader::unregisterPreloadedKonqy( TQCString id_P )
{
for( InstancesList::Iterator it = instances.begin();
it != instances.end();
@@ -80,7 +80,7 @@ void KonqyPreloader::unregisterPreloadedKonqy( QCString id_P )
}
}
-void KonqyPreloader::appRemoved( const QCString& id )
+void KonqyPreloader::appRemoved( const TQCString& id )
{
unregisterPreloadedKonqy( id );
}
@@ -109,8 +109,8 @@ void KonqyPreloader::updateCount()
{
if( !check_always_preloaded_timer.isActive())
{
- if( kapp->kdeinitExec( QString::fromLatin1( "konqueror" ),
- QStringList() << QString::fromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 )
+ if( kapp->kdeinitExec( TQString::fromLatin1( "konqueror" ),
+ TQStringList() << TQString::fromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 )
{
kdDebug( 1202 ) << "Preloading Konqueror instance" << endl;
check_always_preloaded_timer.start( 5000, true );
@@ -143,7 +143,7 @@ void KonqyPreloader::unloadAllPreloaded()
}
extern "C"
-KDE_EXPORT KDEDModule *create_konqy_preloader( const QCString& obj )
+KDE_EXPORT KDEDModule *create_konqy_preloader( const TQCString& obj )
{
return new KonqyPreloader( obj );
}
diff --git a/konqueror/preloader/preloader.h b/konqueror/preloader/preloader.h
index 2a667e462..c2767522b 100644
--- a/konqueror/preloader/preloader.h
+++ b/konqueror/preloader/preloader.h
@@ -21,7 +21,7 @@
#define _KONQUEROR_PRELOADER_H
#include <kdedmodule.h>
-#include <qtimer.h>
+#include <tqtimer.h>
class KonqyPreloader
: public KDEDModule
@@ -29,30 +29,30 @@ class KonqyPreloader
Q_OBJECT
K_DCOP
public:
- KonqyPreloader( const QCString& obj );
+ KonqyPreloader( const TQCString& obj );
virtual ~KonqyPreloader();
k_dcop:
- bool registerPreloadedKonqy( QCString id, int screen );
- QCString getPreloadedKonqy( int screen );
- ASYNC unregisterPreloadedKonqy( QCString id );
+ bool registerPreloadedKonqy( TQCString id, int screen );
+ TQCString getPreloadedKonqy( int screen );
+ ASYNC unregisterPreloadedKonqy( TQCString id );
void reconfigure();
void unloadAllPreloaded();
private slots:
- void appRemoved( const QCString& id );
+ void appRemoved( const TQCString& id );
void checkAlwaysPreloaded();
private:
void updateCount();
struct KonqyData
{
KonqyData() {}; // for QValueList
- KonqyData( const QCString& id_P, int screen_P )
+ KonqyData( const TQCString& id_P, int screen_P )
: id( id_P ), screen( screen_P ) {}
- QCString id;
+ TQCString id;
int screen;
};
- typedef QValueList< KonqyData > InstancesList;
+ typedef TQValueList< KonqyData > InstancesList;
InstancesList instances;
- QTimer check_always_preloaded_timer;
+ TQTimer check_always_preloaded_timer;
};
#endif
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index b771b0a09..7d84071fc 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -41,25 +41,25 @@
#include "kremoteencodingplugin.h"
-#define DATA_KEY QString::fromLatin1("Charset")
+#define DATA_KEY TQString::fromLatin1("Charset")
-KRemoteEncodingPlugin::KRemoteEncodingPlugin(QObject * parent,
+KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent,
const char *name,
- const QStringList &)
+ const TQStringList &)
: KParts::Plugin(parent, name), m_loaded(false), m_idDefault(0)
{
m_menu = new KActionMenu(i18n("Select Remote Charset"), "charset",
actionCollection(), "changeremoteencoding");
- connect(m_menu->popupMenu(), SIGNAL(aboutToShow()),
- this, SLOT(slotAboutToShow()));
+ connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()),
+ this, TQT_SLOT(slotAboutToShow()));
m_menu->setEnabled(false);
m_menu->setDelayed(false);
m_part = dynamic_cast<KonqDirPart*>(parent);
if (m_part)
// if parent is not a KonqDirPart, our menu will never show
- QObject::connect(m_part, SIGNAL(aboutToOpenURL()),
- this, SLOT(slotAboutToOpenURL()));
+ TQObject::connect(m_part, TQT_SIGNAL(aboutToOpenURL()),
+ this, TQT_SLOT(slotAboutToOpenURL()));
}
KRemoteEncodingPlugin::~KRemoteEncodingPlugin()
@@ -114,14 +114,14 @@ KRemoteEncodingPlugin::fillMenu()
KPopupMenu *menu = m_menu->popupMenu();
menu->clear();
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
int count = 0;
for (it = m_encodingDescriptions.begin(); it != m_encodingDescriptions.end(); ++it)
- menu->insertItem(*it, this, SLOT(slotItemSelected(int)), 0, ++count);
+ menu->insertItem(*it, this, TQT_SLOT(slotItemSelected(int)), 0, ++count);
menu->insertSeparator();
- menu->insertItem(i18n("Reload"), this, SLOT(slotReload()), 0, ++count);
- menu->insertItem(i18n("Default"), this, SLOT(slotDefault()), 0, ++count);
+ menu->insertItem(i18n("Reload"), this, TQT_SLOT(slotReload()), 0, ++count);
+ menu->insertItem(i18n("Default"), this, TQT_SLOT(slotDefault()), 0, ++count);
m_idDefault = count;
}
@@ -135,12 +135,12 @@ KRemoteEncodingPlugin::updateMenu()
for (unsigned i = 0; i < m_menu->popupMenu()->count(); i++)
m_menu->popupMenu()->setItemChecked(m_menu->popupMenu()->idAt(i), false);
- QString charset = KIO::SlaveConfig::self()->configData(m_currentURL.protocol(), m_currentURL.host(),
+ TQString charset = KIO::SlaveConfig::self()->configData(m_currentURL.protocol(), m_currentURL.host(),
DATA_KEY);
if (!charset.isEmpty())
{
int id = 1;
- QStringList::Iterator it;
+ TQStringList::Iterator it;
for (it = m_encodingDescriptions.begin(); it != m_encodingDescriptions.end(); ++it, ++id)
if ((*it).find(charset) != -1)
break;
@@ -168,11 +168,11 @@ void
KRemoteEncodingPlugin::slotItemSelected(int id)
{
KConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1());
- QString host = m_currentURL.host();
+ TQString host = m_currentURL.host();
if (!m_menu->popupMenu()->isItemChecked(id))
{
- QString charset = KGlobal::charsets()->encodingForName(m_encodingDescriptions[id - 1]);
+ TQString charset = KGlobal::charsets()->encodingForName(m_encodingDescriptions[id - 1]);
config.setGroup(host);
config.writeEntry(DATA_KEY, charset);
@@ -190,12 +190,12 @@ KRemoteEncodingPlugin::slotDefault()
// settings here since it affects what will be matched.
KConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1());
- QStringList partList = QStringList::split('.', m_currentURL.host(), false);
+ TQStringList partList = TQStringList::split('.', m_currentURL.host(), false);
if (!partList.isEmpty())
{
partList.remove(partList.begin());
- QStringList domains;
+ TQStringList domains;
// Remove the exact name match...
domains << m_currentURL.host();
@@ -212,7 +212,7 @@ KRemoteEncodingPlugin::slotDefault()
partList.remove(partList.begin());
}
- for (QStringList::Iterator it = domains.begin(); it != domains.end();
+ for (TQStringList::Iterator it = domains.begin(); it != domains.end();
it++)
{
kdDebug() << k_funcinfo << "Domain to remove: " << *it << endl;
@@ -237,18 +237,18 @@ KRemoteEncodingPlugin::updateBrowser()
if (!client->attach())
kdDebug() << "Can't connect with DCOP server." << endl;
- QByteArray data;
- QDataStream stream(data, IO_WriteOnly);
- stream << QString::null;
+ TQByteArray data;
+ TQDataStream stream(data, IO_WriteOnly);
+ stream << TQString::null;
// use call to make sure reparsing is done before reloading the url
QCStringList apps = client->registeredApplications();
for( QCStringList::ConstIterator it = apps.begin();
it != apps.end();
++it )
{
- QCString rtype;
- QByteArray rdata;
- client->call( *it, "KIO::Scheduler", "reparseSlaveConfiguration(QString)",
+ TQCString rtype;
+ TQByteArray rdata;
+ client->call( *it, "KIO::Scheduler", "reparseSlaveConfiguration(TQString)",
data, rtype, rdata);
}
delete client;
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.h b/konqueror/remoteencodingplugin/kremoteencodingplugin.h
index 85c77efa3..b518da326 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h
@@ -21,7 +21,7 @@
#ifndef REMOTEENCODING_PLUGIN_H
#define REMOTEENCODING_PLUGIN_H
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include <kurl.h>
#include <klibloader.h>
#include <kparts/plugin.h>
@@ -34,8 +34,8 @@ class KRemoteEncodingPlugin: public KParts::Plugin
{
Q_OBJECT
public:
- KRemoteEncodingPlugin(QObject * parent, const char *name,
- const QStringList &);
+ KRemoteEncodingPlugin(TQObject * parent, const char *name,
+ const TQStringList &);
~KRemoteEncodingPlugin();
protected slots:
@@ -53,7 +53,7 @@ private:
KonqDirPart *m_part;
KActionMenu *m_menu;
- QStringList m_encodingDescriptions;
+ TQStringList m_encodingDescriptions;
KURL m_currentURL;
bool m_loaded;
diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp
index b39e35cd3..eefa57337 100644
--- a/konqueror/shellcmdplugin/kshellcmddialog.cpp
+++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp
@@ -17,9 +17,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <qhbox.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqhbox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
#include <klocale.h>
#include <kstdguiitem.h>
@@ -28,15 +28,15 @@
#include "kshellcmddialog.h"
#include "kshellcmdexecutor.h"
-KShellCommandDialog::KShellCommandDialog(const QString& title, const QString& command, QWidget* parent, bool modal)
+KShellCommandDialog::KShellCommandDialog(const TQString& title, const TQString& command, TQWidget* parent, bool modal)
:KDialog(parent,"p",modal)
{
- QVBoxLayout * box=new QVBoxLayout (this,marginHint(),spacingHint());
+ TQVBoxLayout * box=new TQVBoxLayout (this,marginHint(),spacingHint());
- QLabel *label=new QLabel(title,this);
+ TQLabel *label=new TQLabel(title,this);
m_shell=new KShellCommandExecutor(command,this);
- QHBox *buttonsBox=new QHBox(this);
+ TQHBox *buttonsBox=new TQHBox(this);
buttonsBox->setSpacing(spacingHint());
cancelButton= new KPushButton(KStdGuiItem::cancel(), buttonsBox);
@@ -54,9 +54,9 @@ KShellCommandDialog::KShellCommandDialog(const QString& title, const QString& co
m_shell->setFocus();
- connect(cancelButton, SIGNAL(clicked()), m_shell, SLOT(slotFinished()));
- connect(m_shell, SIGNAL(finished()), this, SLOT(disableStopButton()));
- connect(closeButton,SIGNAL(clicked()), this, SLOT(slotClose()));
+ connect(cancelButton, TQT_SIGNAL(clicked()), m_shell, TQT_SLOT(slotFinished()));
+ connect(m_shell, TQT_SIGNAL(finished()), this, TQT_SLOT(disableStopButton()));
+ connect(closeButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()));
}
KShellCommandDialog::~KShellCommandDialog()
diff --git a/konqueror/shellcmdplugin/kshellcmddialog.h b/konqueror/shellcmdplugin/kshellcmddialog.h
index 790c8e0d0..868028050 100644
--- a/konqueror/shellcmdplugin/kshellcmddialog.h
+++ b/konqueror/shellcmdplugin/kshellcmddialog.h
@@ -20,7 +20,7 @@
#ifndef SHELLCOMMANDDIALOG_H
#define SHELLCOMMANDDIALOG_H
-#include <qstring.h>
+#include <tqstring.h>
#include <kpushbutton.h>
#include <kdialog.h>
@@ -31,7 +31,7 @@ class KShellCommandDialog:public KDialog
{
Q_OBJECT
public:
- KShellCommandDialog(const QString& title, const QString& command, QWidget* parent=0, bool modal=false);
+ KShellCommandDialog(const TQString& title, const TQString& command, TQWidget* parent=0, bool modal=false);
virtual ~KShellCommandDialog();
//blocking
int executeCommand();
diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
index c83488005..167f0f812 100644
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
@@ -24,15 +24,15 @@
#include <signal.h>
#include <stdlib.h>
-#include <qsocketnotifier.h>
+#include <tqsocketnotifier.h>
#include <kinputdialog.h>
#include <kglobalsettings.h>
#include <kdesu/process.h>
#include <klocale.h>
-KShellCommandExecutor::KShellCommandExecutor(const QString& command, QWidget* parent)
-:QTextView(parent)
+KShellCommandExecutor::KShellCommandExecutor(const TQString& command, TQWidget* parent)
+:TQTextView(parent)
,m_shellProcess(0)
,m_command(command)
,m_readNotifier(0)
@@ -73,7 +73,7 @@ int KShellCommandExecutor::exec()
args+=m_command.local8Bit();
//kdDebug()<<"------- executing: "<<m_command.local8Bit()<<endl;
- QCString shell( getenv("SHELL") );
+ TQCString shell( getenv("SHELL") );
if (shell.isEmpty())
shell = "sh";
@@ -84,11 +84,11 @@ int KShellCommandExecutor::exec()
return 0;
}
- m_readNotifier=new QSocketNotifier(m_shellProcess->fd(),QSocketNotifier::Read, this);
- m_writeNotifier=new QSocketNotifier(m_shellProcess->fd(),QSocketNotifier::Write, this);
+ m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, this);
+ m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, this);
m_writeNotifier->setEnabled(false);
- connect (m_readNotifier, SIGNAL(activated(int)), this,SLOT(readDataFromShell()));
- connect (m_writeNotifier, SIGNAL(activated(int)), this,SLOT(writeDataToShell()));
+ connect (m_readNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(readDataFromShell()));
+ connect (m_writeNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(writeDataToShell()));
return 1;
}
@@ -108,7 +108,7 @@ void KShellCommandExecutor::readDataFromShell()
{
//kdDebug()<<"***********************\n"<<buffer<<"###################\n"<<endl;
buffer[bytesRead]='\0';
- this->append(QString::fromLocal8Bit(buffer));
+ this->append(TQString::fromLocal8Bit(buffer));
setTextFormat(PlainText);
};
}
@@ -117,11 +117,11 @@ void KShellCommandExecutor::writeDataToShell()
{
//kdDebug()<<"--------- writing ------------"<<endl;
bool ok;
- QString str = KInputDialog::getText( QString::null,
- i18n( "Input Required:" ), QString::null, &ok, this );
+ TQString str = KInputDialog::getText( TQString::null,
+ i18n( "Input Required:" ), TQString::null, &ok, this );
if ( ok )
{
- QCString input=str.local8Bit();
+ TQCString input=str.local8Bit();
::write(m_shellProcess->fd(),input,input.length());
::write(m_shellProcess->fd(),"\n",1);
}
diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.h b/konqueror/shellcmdplugin/kshellcmdexecutor.h
index 66b066a85..db19e4105 100644
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.h
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.h
@@ -20,8 +20,8 @@
#ifndef SHELLCOMMANDEXECUTOR_H
#define SHELLCOMMANDEXECUTOR_H
-#include <qstring.h>
-#include <qtextview.h>
+#include <tqstring.h>
+#include <tqtextview.h>
class PtyProcess;
class QSocketNotifier;
@@ -30,7 +30,7 @@ class KShellCommandExecutor:public QTextView
{
Q_OBJECT
public:
- KShellCommandExecutor(const QString& command, QWidget* parent=0);
+ KShellCommandExecutor(const TQString& command, TQWidget* parent=0);
virtual ~KShellCommandExecutor();
int exec();
signals:
@@ -39,9 +39,9 @@ class KShellCommandExecutor:public QTextView
void slotFinished();
protected:
PtyProcess *m_shellProcess;
- QString m_command;
- QSocketNotifier *m_readNotifier;
- QSocketNotifier *m_writeNotifier;
+ TQString m_command;
+ TQSocketNotifier *m_readNotifier;
+ TQSocketNotifier *m_writeNotifier;
protected slots:
void readDataFromShell();
void writeDataToShell();
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
index b7f07ec81..7c39fb826 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
@@ -26,15 +26,15 @@
#include <kgenericfactory.h>
#include <kio/netaccess.h>
-KShellCmdPlugin::KShellCmdPlugin( QObject* parent, const char* name,
- const QStringList & )
+KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name,
+ const TQStringList & )
: KParts::Plugin( parent, name )
{
if (!kapp->authorize("shell_access"))
return;
new KAction( i18n( "&Execute Shell Command..." ), "run", CTRL+Key_E, this,
- SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" );
+ TQT_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" );
}
void KShellCmdPlugin::slotExecuteShellCommand()
@@ -51,7 +51,7 @@ void KShellCmdPlugin::slotExecuteShellCommand()
KMessageBox::sorry(part->widget(),i18n("Executing shell commands works only on local directories."));
return;
}
- QString path;
+ TQString path;
if ( part->currentItem() )
{
// Putting the complete path to the selected file isn't really necessary,
@@ -65,12 +65,12 @@ void KShellCmdPlugin::slotExecuteShellCommand()
path = url.path();
}
bool ok;
- QString cmd = KInputDialog::getText( i18n("Execute Shell Command"),
+ TQString cmd = KInputDialog::getText( i18n("Execute Shell Command"),
i18n( "Execute shell command in current directory:" ),
KProcess::quote( path ), &ok, part->widget() );
if ( ok )
{
- QString chDir;
+ TQString chDir;
chDir="cd ";
chDir+=KProcess::quote(part->url().path());
chDir+="; ";
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.h b/konqueror/shellcmdplugin/kshellcmdplugin.h
index 3e1415803..f942c82bf 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.h
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.h
@@ -26,7 +26,7 @@ class KShellCmdPlugin : public KParts::Plugin
{
Q_OBJECT
public:
- KShellCmdPlugin( QObject* parent, const char* name, const QStringList & );
+ KShellCmdPlugin( TQObject* parent, const char* name, const TQStringList & );
~KShellCmdPlugin() {}
public slots:
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index ae2880b13..bdc99a4ca 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -19,11 +19,11 @@
#include <konq_events.h>
#include <kdebug.h>
-#include <qapplication.h>
+#include <tqapplication.h>
#include <kaccelmanager.h>
-KonqSidebar::KonqSidebar( QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name, bool universalMode )
+KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name, bool universalMode )
: KParts::ReadOnlyPart(parent, name),KonqSidebarIface()
{
// we need an instance
@@ -32,11 +32,11 @@ KonqSidebar::KonqSidebar( QWidget *parentWidget, const char *widgetName,
// this should be your custom internal widget
m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() );
m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" );
- connect(m_widget,SIGNAL(started(KIO::Job *)),
- this, SIGNAL(started(KIO::Job*)));
- connect(m_widget,SIGNAL(completed()),this,SIGNAL(completed()));
- connect(m_extension, SIGNAL(addWebSideBar(const KURL&, const QString&)),
- m_widget, SLOT(addWebSideBar(const KURL&, const QString&)));
+ connect(m_widget,TQT_SIGNAL(started(KIO::Job *)),
+ this, TQT_SIGNAL(started(KIO::Job*)));
+ connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
+ connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)),
+ m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&)));
KAcceleratorManager::setNoAccel(m_widget);
setWidget(m_widget);
}
@@ -62,14 +62,14 @@ bool KonqSidebar::openURL(const KURL &url) {
else return false;
}
-void KonqSidebar::customEvent(QCustomEvent* ev)
+void KonqSidebar::customEvent(TQCustomEvent* ev)
{
if (KonqFileSelectionEvent::test(ev) ||
KonqFileMouseOverEvent::test(ev) ||
KonqConfigEvent::test(ev))
{
// Forward the event to the widget
- QApplication::sendEvent( m_widget, ev );
+ TQApplication::sendEvent( m_widget, ev );
}
}
@@ -97,15 +97,15 @@ KonqSidebarFactory::~KonqSidebarFactory()
s_about = 0L;
}
-KParts::Part* KonqSidebarFactory::createPartObject( QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name,
- const char * /*classname*/, const QStringList &args )
+KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name,
+ const char * /*classname*/, const TQStringList &args )
{
// Create an instance of our Part
KonqSidebar* obj = new KonqSidebar( parentWidget, widgetName, parent, name, args.contains("universal") );
// See if we are to be read-write or not
-// if (QCString(classname) == "KParts::ReadOnlyPart")
+// if (TQCString(classname) == "KParts::ReadOnlyPart")
// obj->setReadWrite(false);
return obj;
diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h
index 32a5f5679..cb321bf6d 100644
--- a/konqueror/sidebar/konqsidebar.h
+++ b/konqueror/sidebar/konqsidebar.h
@@ -21,7 +21,7 @@
#include <kparts/factory.h>
#include <kparts/event.h>
#include <kparts/browserextension.h>
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
#include "sidebar_widget.h"
#include "konqsidebariface_p.h"
@@ -43,7 +43,7 @@ class KonqSidebarBrowserExtension : public KParts::BrowserExtension
~KonqSidebarBrowserExtension(){;}
protected:
- QGuardedPtr<Sidebar_Widget> widget;
+ TQGuardedPtr<Sidebar_Widget> widget;
// The following slots are needed for konqueror's standard actions
@@ -77,8 +77,8 @@ public:
/**
* Default constructor
*/
- KonqSidebar(QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name,bool universalMode);
+ KonqSidebar(TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name,bool universalMode);
/**
* Destructor
@@ -97,7 +97,7 @@ protected:
KonqSidebarBrowserExtension * m_extension;
virtual bool openFile();
- virtual void customEvent(QCustomEvent* ev);
+ virtual void customEvent(TQCustomEvent* ev);
private:
class Sidebar_Widget *m_widget;
@@ -113,9 +113,9 @@ class KonqSidebarFactory : public KParts::Factory
public:
KonqSidebarFactory();
virtual ~KonqSidebarFactory();
- virtual KParts::Part* createPartObject( QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name,
- const char *classname, const QStringList &args );
+ virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name,
+ const char *classname, const TQStringList &args );
static KInstance* instance();
private:
diff --git a/konqueror/sidebar/konqsidebarplugin.cpp b/konqueror/sidebar/konqsidebarplugin.cpp
index b2b7d9f17..75e762d35 100644
--- a/konqueror/sidebar/konqsidebarplugin.cpp
+++ b/konqueror/sidebar/konqsidebarplugin.cpp
@@ -22,9 +22,9 @@
#include <kdebug.h>
-KonqSidebarPlugin::KonqSidebarPlugin(KInstance *instance,QObject *parent,
- QWidget * /*widgetParent*/, QString &desktopName_, const char* name)
- : QObject(parent,name), desktopName(desktopName_)
+KonqSidebarPlugin::KonqSidebarPlugin(KInstance *instance,TQObject *parent,
+ TQWidget * /*widgetParent*/, TQString &desktopName_, const char* name)
+ : TQObject(parent,name), desktopName(desktopName_)
{
m_parentInstance=instance;
}
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index ad931070f..d3ecf7ce4 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -18,14 +18,14 @@
*/
#ifndef _konqsidebarplugin_h_
#define _konqsidebarplugin_h_
-#include <qwidget.h>
-#include <qobject.h>
+#include <tqwidget.h>
+#include <tqobject.h>
#include <kurl.h>
-#include <qstring.h>
+#include <tqstring.h>
#include <kparts/part.h>
#include <kparts/browserextension.h>
#include <kio/job.h>
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
#include <kfileitem.h>
class KonqSidebarPluginPrivate;
@@ -34,16 +34,16 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject
{
Q_OBJECT
public:
- KonqSidebarPlugin(KInstance *instance,QObject *parent,QWidget *widgetParent,QString &desktopName_, const char* name=0);
+ KonqSidebarPlugin(KInstance *instance,TQObject *parent,TQWidget *widgetParent,TQString &desktopName_, const char* name=0);
~KonqSidebarPlugin();
- virtual QWidget *getWidget()=0;
- virtual void *provides(const QString &)=0;
+ virtual TQWidget *getWidget()=0;
+ virtual void *provides(const TQString &)=0;
KInstance *parentInstance();
protected:
virtual void handleURL(const KURL &url)=0;
virtual void handlePreview(const KFileItemList & items);
virtual void handlePreviewOnMouseOver(const KFileItem &items); //not used yet, perhaps in KDE 3.1
- QString desktopName;
+ TQString desktopName;
KInstance* m_parentInstance;
private:
@@ -53,8 +53,8 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject
void requestURL(KURL&);
void started(KIO::Job *);
void completed();
- void setIcon(const QString& icon);
- void setCaption(const QString& caption);
+ void setIcon(const TQString& icon);
+ void setCaption(const TQString& caption);
protected:
@@ -67,7 +67,7 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject
void openPreviewOnMouseOver(const KFileItem& item); // not used yet, perhaps KDE 3.1
/*
if your plugin supports a setup dialog, instead (replaces the url menu entry in the popup) (not supported yet)
- void setup(QWidget *parent);
+ void setup(TQWidget *parent);
*/
@@ -79,16 +79,16 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject
void enableAction( const char * name, bool enabled );
- void popupMenu( const QPoint &global, const KFileItemList &items );
- void popupMenu( KXMLGUIClient *client, const QPoint &global, const KFileItemList &items );
- void popupMenu( const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode = (mode_t)-1 );
+ void popupMenu( const TQPoint &global, const KFileItemList &items );
+ void popupMenu( KXMLGUIClient *client, const TQPoint &global, const KFileItemList &items );
+ void popupMenu( const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode = (mode_t)-1 );
void popupMenu( KXMLGUIClient *client,
- const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode = (mode_t)-1 );
+ const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode = (mode_t)-1 );
- void showError(QString &); //for later extension
- void showMessage(QString &); //for later extension
+ void showError(TQString &); //for later extension
+ void showMessage(TQString &); //for later extension
*/
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 3b402b25e..b4940e8e5 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -18,13 +18,13 @@
#include <limits.h>
-#include <qdir.h>
-#include <qpopupmenu.h>
-#include <qhbox.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
-#include <qlayout.h>
-#include <qstringlist.h>
+#include <tqdir.h>
+#include <tqpopupmenu.h>
+#include <tqhbox.h>
+#include <tqpushbutton.h>
+#include <tqwhatsthis.h>
+#include <tqlayout.h>
+#include <tqstringlist.h>
#include <klocale.h>
#include <ksimpleconfig.h>
@@ -49,17 +49,17 @@
#include "sidebar_widget.moc"
-addBackEnd::addBackEnd(QWidget *parent, class QPopupMenu *addmenu,
- bool universal, const QString &currentProfile,
+addBackEnd::addBackEnd(TQWidget *parent, class TQPopupMenu *addmenu,
+ bool universal, const TQString &currentProfile,
const char *name)
- : QObject(parent,name),
+ : TQObject(parent,name),
m_parent(parent)
{
m_universal=universal;
m_currentProfile = currentProfile;
menu = addmenu;
- connect(menu,SIGNAL(aboutToShow()),this,SLOT(aboutToShowAddMenu()));
- connect(menu,SIGNAL(activated(int)),this,SLOT(activatedAddMenu(int)));
+ connect(menu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(aboutToShowAddMenu()));
+ connect(menu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activatedAddMenu(int)));
}
void addBackEnd::aboutToShowAddMenu()
@@ -67,7 +67,7 @@ void addBackEnd::aboutToShowAddMenu()
if (!menu)
return;
KStandardDirs *dirs = KGlobal::dirs();
- QStringList list = dirs->findAllResources("data","konqsidebartng/add/*.desktop",true,true);
+ TQStringList list = dirs->findAllResources("data","konqsidebartng/add/*.desktop",true,true);
libNames.setAutoDelete(true);
libNames.resize(0);
libParam.setAutoDelete(true);
@@ -75,7 +75,7 @@ void addBackEnd::aboutToShowAddMenu()
menu->clear();
int i = 0;
- for (QStringList::Iterator it = list.begin(); it != list.end(); ++it, i++ )
+ for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it, i++ )
{
KDesktopFile *confFile;
@@ -98,7 +98,7 @@ void addBackEnd::aboutToShowAddMenu()
continue;
}
}
- QString icon = confFile->readIcon();
+ TQString icon = confFile->readIcon();
if (!icon.isEmpty())
{
menu->insertItem(SmallIcon(icon),
@@ -107,9 +107,9 @@ void addBackEnd::aboutToShowAddMenu()
menu->insertItem(confFile->readEntry("Name"), i);
}
libNames.resize(libNames.size()+1);
- libNames.insert(libNames.count(), new QString(confFile->readEntry("X-KDE-KonqSidebarAddModule")));
+ libNames.insert(libNames.count(), new TQString(confFile->readEntry("X-KDE-KonqSidebarAddModule")));
libParam.resize(libParam.size()+1);
- libParam.insert(libParam.count(), new QString(confFile->readEntry("X-KDE-KonqSidebarAddParam")));
+ libParam.insert(libParam.count(), new TQString(confFile->readEntry("X-KDE-KonqSidebarAddParam")));
delete confFile;
}
menu->insertSeparator();
@@ -122,12 +122,12 @@ void addBackEnd::doRollBack()
if (KMessageBox::warningContinueCancel(m_parent, i18n("<qt>This removes all your entries from the sidebar and adds the system default ones.<BR><B>This procedure is irreversible</B><BR>Do you want to proceed?</qt>"))==KMessageBox::Continue)
{
KStandardDirs *dirs = KGlobal::dirs();
- QString loc=dirs->saveLocation("data","konqsidebartng/" + m_currentProfile + "/",true);
- QDir dir(loc);
- QStringList dirEntries = dir.entryList( QDir::Dirs | QDir::NoSymLinks );
+ TQString loc=dirs->saveLocation("data","konqsidebartng/" + m_currentProfile + "/",true);
+ TQDir dir(loc);
+ TQStringList dirEntries = dir.entryList( TQDir::Dirs | TQDir::NoSymLinks );
dirEntries.remove(".");
dirEntries.remove("..");
- for ( QStringList::Iterator it = dirEntries.begin(); it != dirEntries.end(); ++it ) {
+ for ( TQStringList::Iterator it = dirEntries.begin(); it != dirEntries.end(); ++it ) {
if ((*it)!="add")
KIO::NetAccess::del(KURL( loc+(*it) ), m_parent);
}
@@ -136,10 +136,10 @@ void addBackEnd::doRollBack()
}
-static QString findFileName(const QString* tmpl,bool universal, const QString &profile) {
- QString myFile, filename;
+static TQString findFileName(const TQString* tmpl,bool universal, const TQString &profile) {
+ TQString myFile, filename;
KStandardDirs *dirs = KGlobal::dirs();
- QString tmp = *tmpl;
+ TQString tmp = *tmpl;
if (universal) {
dirs->saveLocation("data", "konqsidebartng/kicker_entries/", true);
@@ -151,14 +151,14 @@ static QString findFileName(const QString* tmpl,bool universal, const QString &p
filename = tmp.arg("");
myFile = locateLocal("data", filename);
- if (QFile::exists(myFile)) {
+ if (TQFile::exists(myFile)) {
for (ulong l = 0; l < ULONG_MAX; l++) {
filename = tmp.arg(l);
myFile = locateLocal("data", filename);
- if (!QFile::exists(myFile)) {
+ if (!TQFile::exists(myFile)) {
break;
} else {
- myFile = QString::null;
+ myFile = TQString::null;
}
}
}
@@ -168,7 +168,7 @@ static QString findFileName(const QString* tmpl,bool universal, const QString &p
void addBackEnd::activatedAddMenu(int id)
{
- kdDebug() << "activatedAddMenu: " << QString("%1").arg(id) << endl;
+ kdDebug() << "activatedAddMenu: " << TQString("%1").arg(id) << endl;
if (((uint)id) == libNames.size())
doRollBack();
if(((uint)id) >= libNames.size())
@@ -177,32 +177,32 @@ void addBackEnd::activatedAddMenu(int id)
KLibLoader *loader = KLibLoader::self();
// try to load the library
- QString libname = *libNames.at(id);
- KLibrary *lib = loader->library(QFile::encodeName(libname));
+ TQString libname = *libNames.at(id);
+ KLibrary *lib = loader->library(TQFile::encodeName(libname));
if (lib)
{
// get the create_ function
- QString factory("add_");
+ TQString factory("add_");
factory = factory+(*libNames.at(id));
- void *add = lib->symbol(QFile::encodeName(factory));
+ void *add = lib->symbol(TQFile::encodeName(factory));
if (add)
{
//call the add function
- bool (*func)(QString*, QString*, QMap<QString,QString> *);
- QMap<QString,QString> map;
- func = (bool (*)(QString*, QString*, QMap<QString,QString> *)) add;
- QString *tmp = new QString("");
+ bool (*func)(TQString*, TQString*, TQMap<TQString,TQString> *);
+ TQMap<TQString,TQString> map;
+ func = (bool (*)(TQString*, TQString*, TQMap<TQString,TQString> *)) add;
+ TQString *tmp = new TQString("");
if (func(tmp,libParam.at(id),&map))
{
- QString myFile = findFileName(tmp,m_universal,m_currentProfile);
+ TQString myFile = findFileName(tmp,m_universal,m_currentProfile);
if (!myFile.isEmpty())
{
kdDebug() <<"trying to save to file: "<<myFile << endl;
KSimpleConfig scf(myFile,false);
scf.setGroup("Desktop Entry");
- for (QMap<QString,QString>::ConstIterator it = map.begin(); it != map.end(); ++it) {
+ for (TQMap<TQString,TQString>::ConstIterator it = map.begin(); it != map.end(); ++it) {
kdDebug() <<"writing:"<<it.key()<<" / "<<it.data()<<endl;
scf.writePathEntry(it.key(), it.data());
}
@@ -228,8 +228,8 @@ void addBackEnd::activatedAddMenu(int id)
/* Sidebar_Widget */
/**************************************************************/
-Sidebar_Widget::Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par, const char *name,bool universalMode, const QString &currentProfile)
- :QWidget(parent,name),m_universalMode(universalMode),m_partParent(par),m_currentProfile(currentProfile)
+Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, const char *name,bool universalMode, const TQString &currentProfile)
+ :TQWidget(parent,name),m_universalMode(universalMode),m_partParent(par),m_currentProfile(currentProfile)
{
m_somethingVisible = false;
m_initial = true;
@@ -251,19 +251,19 @@ Sidebar_Widget::Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par, const
m_buttons.setAutoDelete(true);
m_hasStoredUrl = false;
m_latestViewed = -1;
- setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+ setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
- QSplitter *splitterWidget = splitter();
+ TQSplitter *splitterWidget = splitter();
if (splitterWidget) {
- splitterWidget->setResizeMode(parent, QSplitter::FollowSizeHint);
+ splitterWidget->setResizeMode(parent, TQSplitter::FollowSizeHint);
splitterWidget->setOpaqueResize( false );
- connect(splitterWidget,SIGNAL(setRubberbandCalled()),SLOT(userMovedSplitter()));
+ connect(splitterWidget,TQT_SIGNAL(setRubberbandCalled()),TQT_SLOT(userMovedSplitter()));
}
m_area = new KDockArea(this);
- m_area->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+ m_area->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
m_mainDockWidget = m_area->createDockWidget("free", 0);
- m_mainDockWidget->setWidget(new QWidget(m_mainDockWidget));
+ m_mainDockWidget->setWidget(new TQWidget(m_mainDockWidget));
m_area->setMainDockWidget(m_mainDockWidget);
m_area->setMinimumWidth(0);
m_mainDockWidget->setDockSite(KDockWidget::DockTop);
@@ -272,8 +272,8 @@ Sidebar_Widget::Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par, const
m_buttonBar = new KMultiTabBar(KMultiTabBar::Vertical,this);
m_buttonBar->showActiveTabTexts(true);
- m_menu = new QPopupMenu(this, "Sidebar_Widget::Menu");
- QPopupMenu *addMenu = new QPopupMenu(this, "Sidebar_Widget::addPopup");
+ m_menu = new TQPopupMenu(this, "Sidebar_Widget::Menu");
+ TQPopupMenu *addMenu = new TQPopupMenu(this, "Sidebar_Widget::addPopup");
m_menu->insertItem(i18n("Add New"), addMenu, 0);
m_menu->insertItem(i18n("Multiple Views"), 1);
m_menu->insertItem(i18n("Show Tabs Left"), 2);
@@ -281,22 +281,22 @@ Sidebar_Widget::Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par, const
if (!m_universalMode) {
m_menu->insertItem(SmallIconSet("remove"),
i18n("Close Navigation Panel"),
- par, SLOT(deleteLater()));
+ par, TQT_SLOT(deleteLater()));
}
- connect(m_menu, SIGNAL(aboutToShow()),
- this, SLOT(aboutToShowConfigMenu()));
- connect(m_menu, SIGNAL(activated(int)),
- this, SLOT(activatedMenu(int)));
+ connect(m_menu, TQT_SIGNAL(aboutToShow()),
+ this, TQT_SLOT(aboutToShowConfigMenu()));
+ connect(m_menu, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(activatedMenu(int)));
m_buttonPopup = 0;
addBackEnd *ab = new addBackEnd(this, addMenu, universalMode,
currentProfile,
"Sidebar_Widget-addBackEnd");
- connect(ab, SIGNAL(updateNeeded()),
- this, SLOT(updateButtons()));
- connect(ab, SIGNAL(initialCopyNeeded()),
- this, SLOT(finishRollBack()));
+ connect(ab, TQT_SIGNAL(updateNeeded()),
+ this, TQT_SLOT(updateButtons()));
+ connect(ab, TQT_SIGNAL(initialCopyNeeded()),
+ this, TQT_SLOT(finishRollBack()));
initialCopy();
@@ -316,31 +316,31 @@ Sidebar_Widget::Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par, const
m_menu->setItemVisible(2, !m_immutableShowTabsLeft);
m_menu->setItemVisible(3, !m_immutableShowExtraButtons);
- connect(&m_configTimer, SIGNAL(timeout()),
- this, SLOT(saveConfig()));
+ connect(&m_configTimer, TQT_SIGNAL(timeout()),
+ this, TQT_SLOT(saveConfig()));
m_somethingVisible = !m_openViews.isEmpty();
doLayout();
- QTimer::singleShot(0,this,SLOT(createButtons()));
- connect(m_area, SIGNAL(dockWidgetHasUndocked(KDockWidget*)),
- this, SLOT(dockWidgetHasUndocked(KDockWidget*)));
+ TQTimer::singleShot(0,this,TQT_SLOT(createButtons()));
+ connect(m_area, TQT_SIGNAL(dockWidgetHasUndocked(KDockWidget*)),
+ this, TQT_SLOT(dockWidgetHasUndocked(KDockWidget*)));
}
-void Sidebar_Widget::addWebSideBar(const KURL& url, const QString& /*name*/) {
+void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
//kdDebug() << "Web sidebar entry to be added: " << url.url()
// << " [" << name << "]" << endl;
// Look for existing ones with this URL
KStandardDirs *dirs = KGlobal::dirs();
- QString list;
+ TQString list;
dirs->saveLocation("data", m_relPath, true);
list = locateLocal("data", m_relPath);
// Go through list to see which ones exist. Check them for the URL
- QStringList files = QDir(list).entryList("websidebarplugin*.desktop");
- for (QStringList::Iterator it = files.begin(); it != files.end(); ++it){
+ TQStringList files = TQDir(list).entryList("websidebarplugin*.desktop");
+ for (TQStringList::Iterator it = files.begin(); it != files.end(); ++it){
KSimpleConfig scf(list + *it, false);
scf.setGroup("Desktop Entry");
- if (scf.readPathEntry("URL", QString::null) == url.url()) {
+ if (scf.readPathEntry("URL", TQString::null) == url.url()) {
// We already have this one!
KMessageBox::information(this,
i18n("This entry already exists."));
@@ -348,8 +348,8 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const QString& /*name*/) {
}
}
- QString tmpl = "websidebarplugin%1.desktop";
- QString myFile = findFileName(&tmpl,m_universalMode,m_currentProfile);
+ TQString tmpl = "websidebarplugin%1.desktop";
+ TQString myFile = findFileName(&tmpl,m_universalMode,m_currentProfile);
if (!myFile.isEmpty()) {
KSimpleConfig scf(myFile, false);
@@ -362,7 +362,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const QString& /*name*/) {
scf.writeEntry("X-KDE-KonqSidebarModule", "konqsidebar_web");
scf.sync();
- QTimer::singleShot(0,this,SLOT(updateButtons()));
+ TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
}
}
@@ -371,7 +371,7 @@ void Sidebar_Widget::finishRollBack()
{
m_path = KGlobal::dirs()->saveLocation("data",m_relPath,true);
initialCopy();
- QTimer::singleShot(0,this,SLOT(updateButtons()));
+ TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
}
@@ -390,7 +390,7 @@ void Sidebar_Widget::doLayout()
if (m_layout)
delete m_layout;
- m_layout = new QHBoxLayout(this);
+ m_layout = new TQHBoxLayout(this);
if (m_showTabsLeft)
{
m_layout->add(m_buttonBar);
@@ -418,7 +418,7 @@ void Sidebar_Widget::aboutToShowConfigMenu()
void Sidebar_Widget::initialCopy()
{
kdDebug()<<"Initial copy"<<endl;
- QStringList dirtree_dirs;
+ TQStringList dirtree_dirs;
if (m_universalMode)
dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/kicker_entries/");
else
@@ -431,8 +431,8 @@ void Sidebar_Widget::initialCopy()
int lVersion=lcfg.readNumEntry("Version",0);
- for (QStringList::const_iterator ddit=dirtree_dirs.begin();ddit!=dirtree_dirs.end();++ddit) {
- QString dirtree_dir=*ddit;
+ for (TQStringList::const_iterator ddit=dirtree_dirs.begin();ddit!=dirtree_dirs.end();++ddit) {
+ TQString dirtree_dir=*ddit;
if (dirtree_dir == m_path) continue;
@@ -446,18 +446,18 @@ void Sidebar_Widget::initialCopy()
if (lVersion >= gversion)
continue;
- QDir dir(m_path);
- QStringList entries = dir.entryList( QDir::Files );
- QStringList dirEntries = dir.entryList( QDir::Dirs | QDir::NoSymLinks );
+ TQDir dir(m_path);
+ TQStringList entries = dir.entryList( TQDir::Files );
+ TQStringList dirEntries = dir.entryList( TQDir::Dirs | TQDir::NoSymLinks );
dirEntries.remove( "." );
dirEntries.remove( ".." );
- QDir globalDir( dirtree_dir );
+ TQDir globalDir( dirtree_dir );
Q_ASSERT( globalDir.isReadable() );
// Only copy the entries that don't exist yet in the local dir
- QStringList globalDirEntries = globalDir.entryList();
- QStringList::ConstIterator eIt = globalDirEntries.begin();
- QStringList::ConstIterator eEnd = globalDirEntries.end();
+ TQStringList globalDirEntries = globalDir.entryList();
+ TQStringList::ConstIterator eIt = globalDirEntries.begin();
+ TQStringList::ConstIterator eEnd = globalDirEntries.end();
for (; eIt != eEnd; ++eIt )
{
//kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl;
@@ -465,12 +465,12 @@ void Sidebar_Widget::initialCopy()
!entries.contains( *eIt ) &&
!dirEntries.contains( *eIt ) )
{ // we don't have that one yet -> copy it.
- QString cp("cp -R -- ");
+ TQString cp("cp -R -- ");
cp += KProcess::quote(dirtree_dir + *eIt);
cp += " ";
cp += KProcess::quote(m_path);
kdDebug() << "SidebarWidget::intialCopy executing " << cp << endl;
- ::system( QFile::encodeName(cp) );
+ ::system( TQFile::encodeName(cp) );
}
}
}
@@ -489,7 +489,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
{
KIconDialog kicd(this);
// kicd.setStrictIconSize(true);
- QString iconname=kicd.selectIcon(KIcon::Small);
+ TQString iconname=kicd.selectIcon(KIcon::Small);
kdDebug()<<"New Icon Name:"<<iconname<<endl;
if (!iconname.isEmpty())
{
@@ -497,7 +497,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
ksc.setGroup("Desktop Entry");
ksc.writeEntry("Icon",iconname);
ksc.sync();
- QTimer::singleShot(0,this,SLOT(updateButtons()));
+ TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
}
break;
}
@@ -515,12 +515,12 @@ void Sidebar_Widget::buttonPopupActivate(int id)
}
else
{
- QString newurl= dlg->selectedURL().prettyURL();
+ TQString newurl= dlg->selectedURL().prettyURL();
//If we are going to set the name by 'set name', we don't set it here.
//ksc.writeEntry("Name",newurl);
ksc.writePathEntry("URL",newurl);
ksc.sync();
- QTimer::singleShot(0,this,SLOT(updateButtons()));
+ TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
}
}
delete dlg;
@@ -529,12 +529,12 @@ void Sidebar_Widget::buttonPopupActivate(int id)
case 3:
{
if (KMessageBox::warningContinueCancel(this,i18n("<qt>Do you really want to remove the <b>%1</b> tab?</qt>").arg(m_currentButton->displayName),
- QString::null,KStdGuiItem::del())==KMessageBox::Continue)
+ TQString::null,KStdGuiItem::del())==KMessageBox::Continue)
{
- QFile f(m_path+m_currentButton->file);
+ TQFile f(m_path+m_currentButton->file);
if (!f.remove())
qDebug("Error, file not deleted");
- QTimer::singleShot(0,this,SLOT(updateButtons()));
+ TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
}
break;
}
@@ -543,7 +543,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
bool ok;
// Pop up the dialog asking the user for name.
- const QString name = KInputDialog::getText(i18n("Set Name"), i18n("Enter the name:"),
+ const TQString name = KInputDialog::getText(i18n("Set Name"), i18n("Enter the name:"),
m_currentButton->displayName, &ok, this);
if(ok)
@@ -554,8 +554,8 @@ void Sidebar_Widget::buttonPopupActivate(int id)
ksc.writeEntry("Name", name, true, false, true /*localized*/ );
ksc.sync();
- // Update the buttons with a QTimer (why?)
- QTimer::singleShot(0,this,SLOT(updateButtons()));
+ // Update the buttons with a TQTimer (why?)
+ TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
}
break;
}
@@ -720,9 +720,9 @@ void Sidebar_Widget::createButtons()
if (!m_path.isEmpty())
{
kdDebug()<<"m_path: "<<m_path<<endl;
- QDir dir(m_path);
- QStringList list=dir.entryList("*.desktop");
- for (QStringList::Iterator it=list.begin(); it!=list.end(); ++it)
+ TQDir dir(m_path);
+ TQStringList list=dir.entryList("*.desktop");
+ for (TQStringList::Iterator it=list.begin(); it!=list.end(); ++it)
{
addButton(*it);
}
@@ -790,7 +790,7 @@ bool Sidebar_Widget::openURL(const class KURL &url)
return ret;
}
-bool Sidebar_Widget::addButton(const QString &desktoppath,int pos)
+bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
{
int lastbtn = m_buttons.count();
m_buttons.resize(m_buttons.size()+1);
@@ -802,11 +802,11 @@ bool Sidebar_Widget::addButton(const QString &desktoppath,int pos)
confFile = new KSimpleConfig(m_path+desktoppath,true);
confFile->setGroup("Desktop Entry");
- QString icon = confFile->readEntry("Icon");
- QString name = confFile->readEntry("Name");
- QString comment = confFile->readEntry("Comment");
- QString url = confFile->readPathEntry("URL",QString::null);
- QString lib = confFile->readEntry("X-KDE-KonqSidebarModule");
+ TQString icon = confFile->readEntry("Icon");
+ TQString name = confFile->readEntry("Name");
+ TQString comment = confFile->readEntry("Comment");
+ TQString url = confFile->readPathEntry("URL",TQString::null);
+ TQString lib = confFile->readEntry("X-KDE-KonqSidebarModule");
delete confFile;
@@ -818,11 +818,11 @@ bool Sidebar_Widget::addButton(const QString &desktoppath,int pos)
/*int id=*/m_buttons.insert(lastbtn, bi);
KMultiTabBarTab *tab = m_buttonBar->tab(lastbtn);
tab->installEventFilter(this);
- connect(tab,SIGNAL(clicked(int)),this,SLOT(showHidePage(int)));
+ connect(tab,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(showHidePage(int)));
// Set Whats This help
// This uses the comments in the .desktop files
- QWhatsThis::add(tab, comment);
+ TQWhatsThis::add(tab, comment);
}
return true;
@@ -830,10 +830,10 @@ bool Sidebar_Widget::addButton(const QString &desktoppath,int pos)
-bool Sidebar_Widget::eventFilter(QObject *obj, QEvent *ev)
+bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
{
- if (ev->type()==QEvent::MouseButtonPress && ((QMouseEvent *)ev)->button()==QMouseEvent::RightButton)
+ if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQMouseEvent::RightButton)
{
KMultiTabBarTab *bt=dynamic_cast<KMultiTabBarTab*>(obj);
if (bt)
@@ -862,14 +862,14 @@ bool Sidebar_Widget::eventFilter(QObject *obj, QEvent *ev)
m_buttonPopup->insertItem(SmallIconSet("editdelete"), i18n("Remove"),3);
m_buttonPopup->insertSeparator();
m_buttonPopup->insertItem(SmallIconSet("configure"), i18n("Configure Navigation Panel"), m_menu, 4);
- connect(m_buttonPopup, SIGNAL(activated(int)),
- this, SLOT(buttonPopupActivate(int)));
+ connect(m_buttonPopup, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(buttonPopupActivate(int)));
}
m_buttonPopup->setItemEnabled(2,!m_currentButton->URL.isEmpty());
m_buttonPopup->changeTitle(50,SmallIcon(m_currentButton->iconName),
m_currentButton->displayName);
if (!m_disableConfig)
- { m_buttonPopup->exec(QCursor::pos()); }
+ { m_buttonPopup->exec(TQCursor::pos()); }
}
return true;
@@ -878,33 +878,33 @@ bool Sidebar_Widget::eventFilter(QObject *obj, QEvent *ev)
return false;
}
-void Sidebar_Widget::mousePressEvent(QMouseEvent *ev)
+void Sidebar_Widget::mousePressEvent(TQMouseEvent *ev)
{
- if (ev->type()==QEvent::MouseButtonPress &&
- ((QMouseEvent *)ev)->button()==QMouseEvent::RightButton &&
+ if (ev->type()==TQEvent::MouseButtonPress &&
+ ((TQMouseEvent *)ev)->button()==TQMouseEvent::RightButton &&
!m_disableConfig)
- { m_menu->exec(QCursor::pos()); }
+ { m_menu->exec(TQCursor::pos()); }
}
-KonqSidebarPlugin *Sidebar_Widget::loadModule(QWidget *par,QString &desktopName,QString lib_name,ButtonInfo* bi)
+KonqSidebarPlugin *Sidebar_Widget::loadModule(TQWidget *par,TQString &desktopName,TQString lib_name,ButtonInfo* bi)
{
KLibLoader *loader = KLibLoader::self();
// try to load the library
- KLibrary *lib = loader->library(QFile::encodeName(lib_name));
+ KLibrary *lib = loader->library(TQFile::encodeName(lib_name));
if (lib)
{
// get the create_ function
- QString factory("create_%1");
- void *create = lib->symbol(QFile::encodeName(factory.arg(lib_name)));
+ TQString factory("create_%1");
+ void *create = lib->symbol(TQFile::encodeName(factory.arg(lib_name)));
if (create)
{
// create the module
- KonqSidebarPlugin* (*func)(KInstance*,QObject *, QWidget*, QString&, const char *);
- func = (KonqSidebarPlugin* (*)(KInstance*,QObject *, QWidget *, QString&, const char *)) create;
- QString fullPath(m_path+desktopName);
+ KonqSidebarPlugin* (*func)(KInstance*,TQObject *, TQWidget*, TQString&, const char *);
+ func = (KonqSidebarPlugin* (*)(KInstance*,TQObject *, TQWidget *, TQString&, const char *)) create;
+ TQString fullPath(m_path+desktopName);
return (KonqSidebarPlugin*)func(getInstance(),bi,par,fullPath,0);
}
} else {
@@ -939,11 +939,11 @@ bool Sidebar_Widget::createView( ButtonInfo *data)
KDockWidget::DockBottom/*|KDockWidget::DockDesktop*/);
data->dock->setDockSite(KDockWidget::DockTop|KDockWidget::DockBottom);
connectModule(data->module);
- connect(this, SIGNAL(fileSelection(const KFileItemList&)),
- data->module, SLOT(openPreview(const KFileItemList&)));
+ connect(this, TQT_SIGNAL(fileSelection(const KFileItemList&)),
+ data->module, TQT_SLOT(openPreview(const KFileItemList&)));
- connect(this, SIGNAL(fileMouseOver(const KFileItem&)),
- data->module, SLOT(openPreviewOnMouseOver(const KFileItem&)));
+ connect(this, TQT_SIGNAL(fileMouseOver(const KFileItem&)),
+ data->module, TQT_SLOT(openPreviewOnMouseOver(const KFileItem&)));
}
delete confFile;
@@ -976,14 +976,14 @@ void Sidebar_Widget::showHidePage(int page)
m_buttonBar->setTab(page,true);
connect(info->module,
- SIGNAL(setIcon(const QString&)),
+ TQT_SIGNAL(setIcon(const TQString&)),
m_buttonBar->tab(page),
- SLOT(setIcon(const QString&)));
+ TQT_SLOT(setIcon(const TQString&)));
connect(info->module,
- SIGNAL(setCaption(const QString&)),
+ TQT_SIGNAL(setCaption(const TQString&)),
m_buttonBar->tab(page),
- SLOT(setText(const QString&)));
+ TQT_SLOT(setText(const TQString&)));
if (m_singleWidgetMode)
{
@@ -1059,10 +1059,10 @@ void Sidebar_Widget::collapseExpandSidebar()
}
}
-QSize Sidebar_Widget::sizeHint() const
+TQSize Sidebar_Widget::sizeHint() const
{
if (m_somethingVisible)
- return QSize(m_savedWidth,200);
+ return TQSize(m_savedWidth,200);
return minimumSizeHint();
}
@@ -1089,17 +1089,17 @@ KInstance *Sidebar_Widget::getInstance()
}
void Sidebar_Widget::submitFormRequest(const char *action,
- const QString& url,
- const QByteArray& formData,
- const QString& /*target*/,
- const QString& contentType,
- const QString& /*boundary*/ )
+ const TQString& url,
+ const TQByteArray& formData,
+ const TQString& /*target*/,
+ const TQString& contentType,
+ const TQString& /*boundary*/ )
{
KParts::URLArgs args;
args.setContentType("Content-Type: " + contentType);
args.postData = formData;
- args.setDoPost(QCString(action).lower() == "post");
+ args.setDoPost(TQCString(action).lower() == "post");
// boundary?
emit getExtension()->openURLRequest(KURL( url ), args);
}
@@ -1127,7 +1127,7 @@ void Sidebar_Widget::enableAction( const char * name, bool enabled )
ButtonInfo *btninfo = static_cast<ButtonInfo*>(sender()->parent());
if (btninfo)
{
- QString n(name);
+ TQString n(name);
if (n == "copy")
btninfo->copy = enabled;
else if (n == "cut")
@@ -1164,82 +1164,82 @@ bool Sidebar_Widget::doEnableActions()
}
-void Sidebar_Widget::popupMenu( const QPoint &global, const KFileItemList &items )
+void Sidebar_Widget::popupMenu( const TQPoint &global, const KFileItemList &items )
{
if (doEnableActions())
getExtension()->popupMenu(global,items);
}
-void Sidebar_Widget::popupMenu( KXMLGUIClient *client, const QPoint &global, const KFileItemList &items )
+void Sidebar_Widget::popupMenu( KXMLGUIClient *client, const TQPoint &global, const KFileItemList &items )
{
if (doEnableActions())
getExtension()->popupMenu(client,global,items);
}
-void Sidebar_Widget::popupMenu( const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode)
+void Sidebar_Widget::popupMenu( const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode)
{
if (doEnableActions())
getExtension()->popupMenu(global,url,mimeType,mode);
}
void Sidebar_Widget::popupMenu( KXMLGUIClient *client,
- const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode )
+ const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode )
{
if (doEnableActions())
getExtension()->popupMenu(client,global,url,mimeType,mode);
}
-void Sidebar_Widget::connectModule(QObject *mod)
+void Sidebar_Widget::connectModule(TQObject *mod)
{
if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) {
- connect(mod,SIGNAL(started(KIO::Job *)),this, SIGNAL(started(KIO::Job*)));
+ connect(mod,TQT_SIGNAL(started(KIO::Job *)),this, TQT_SIGNAL(started(KIO::Job*)));
}
if (mod->metaObject()->findSignal("completed()") != -1) {
- connect(mod,SIGNAL(completed()),this,SIGNAL(completed()));
+ connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
}
- if (mod->metaObject()->findSignal("popupMenu(const QPoint&,const KURL&,const QString&,mode_t)") != -1) {
- connect(mod,SIGNAL(popupMenu( const QPoint &, const KURL &,
- const QString &, mode_t)),this,SLOT(popupMenu( const
- QPoint &, const KURL&, const QString &, mode_t)));
+ if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) {
+ connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &,
+ const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const
+ TQPoint &, const KURL&, const TQString &, mode_t)));
}
- if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const QPoint&,const KURL&,const QString&,mode_t)") != -1) {
- connect(mod,SIGNAL(popupMenu( KXMLGUIClient *, const QPoint &,
- const KURL &,const QString &, mode_t)),this,
- SLOT(popupMenu( KXMLGUIClient *, const QPoint &,
- const KURL &,const QString &, mode_t)));
+ if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) {
+ connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &,
+ const KURL &,const TQString &, mode_t)),this,
+ TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &,
+ const KURL &,const TQString &, mode_t)));
}
- if (mod->metaObject()->findSignal("popupMenu(const QPoint&,const KFileItemList&)") != -1) {
- connect(mod,SIGNAL(popupMenu( const QPoint &, const KFileItemList & )),
- this,SLOT(popupMenu( const QPoint &, const KFileItemList & )));
+ if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) {
+ connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
+ this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & )));
}
if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) {
- connect(mod,SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
- this,SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
+ connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
+ this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
}
- if (mod->metaObject()->findSignal("submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)") != -1) {
+ if (mod->metaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) {
connect(mod,
- SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)),
+ TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
this,
- SLOT(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)));
+ TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
}
if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) {
- connect(mod,SIGNAL(enableAction( const char *, bool)),
- this,SLOT(enableAction(const char *, bool)));
+ connect(mod,TQT_SIGNAL(enableAction( const char *, bool)),
+ this,TQT_SLOT(enableAction(const char *, bool)));
}
if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) {
- connect(mod,SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
- this,SLOT(createNewWindow( const KURL &, const KParts::URLArgs &)));
+ connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
+ this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &)));
}
}
@@ -1260,29 +1260,29 @@ Sidebar_Widget::~Sidebar_Widget()
}
}
-void Sidebar_Widget::customEvent(QCustomEvent* ev)
+void Sidebar_Widget::customEvent(TQCustomEvent* ev)
{
if (KonqFileSelectionEvent::test(ev))
{
emit fileSelection(static_cast<KonqFileSelectionEvent*>(ev)->selection());
} else if (KonqFileMouseOverEvent::test(ev)) {
if (!(static_cast<KonqFileMouseOverEvent*>(ev)->item())) {
- emit fileMouseOver(KFileItem(KURL(),QString::null,KFileItem::Unknown));
+ emit fileMouseOver(KFileItem(KURL(),TQString::null,KFileItem::Unknown));
} else {
emit fileMouseOver(*static_cast<KonqFileMouseOverEvent*>(ev)->item());
}
}
}
-void Sidebar_Widget::resizeEvent(QResizeEvent* ev)
+void Sidebar_Widget::resizeEvent(TQResizeEvent* ev)
{
if (m_somethingVisible && m_userMovedSplitter)
{
int newWidth = width();
- QSplitter *split = splitter();
+ TQSplitter *split = splitter();
if (split && (m_savedWidth != newWidth))
{
- QValueList<int> sizes = split->sizes();
+ TQValueList<int> sizes = split->sizes();
if ((sizes.count() >= 2) && (sizes[1]))
{
m_savedWidth = newWidth;
@@ -1292,16 +1292,16 @@ void Sidebar_Widget::resizeEvent(QResizeEvent* ev)
}
}
m_userMovedSplitter = false;
- QWidget::resizeEvent(ev);
+ TQWidget::resizeEvent(ev);
}
-QSplitter *Sidebar_Widget::splitter() const
+TQSplitter *Sidebar_Widget::splitter() const
{
if (m_universalMode) return 0;
- QObject *p = parent();
+ TQObject *p = parent();
if (!p) return 0;
p = p->parent();
- return static_cast<QSplitter*>(p);
+ return static_cast<TQSplitter*>(p);
}
void Sidebar_Widget::userMovedSplitter()
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index ccaba5224..d30fe3d65 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -17,10 +17,10 @@
#ifndef _SIDEBAR_WIDGET_
#define _SIDEBAR_WIDGET_
-#include <qptrvector.h>
-#include <qtimer.h>
-#include <qstring.h>
-#include <qguardedptr.h>
+#include <tqptrvector.h>
+#include <tqtimer.h>
+#include <tqstring.h>
+#include <tqguardedptr.h>
#include <kdockwidget.h>
#include <kurl.h>
@@ -36,15 +36,15 @@ class QHBoxLayout;
class QSplitter;
class QStringList;
-class ButtonInfo: public QObject, public KonqSidebarIface
+class ButtonInfo: public TQObject, public KonqSidebarIface
{
Q_OBJECT
public:
- ButtonInfo(const QString& file_, class KonqSidebarIface *part, class KDockWidget *dock_,
- const QString &url_,const QString &lib,
- const QString &dispName_, const QString &iconName_,
- QObject *parent)
- : QObject(parent), file(file_), dock(dock_), URL(url_),
+ ButtonInfo(const TQString& file_, class KonqSidebarIface *part, class KDockWidget *dock_,
+ const TQString &url_,const TQString &lib,
+ const TQString &dispName_, const TQString &iconName_,
+ TQObject *parent)
+ : TQObject(parent), file(file_), dock(dock_), URL(url_),
libName(lib), displayName(dispName_), iconName(iconName_), m_part(part)
{
copy = cut = paste = trash = del = rename =false;
@@ -52,13 +52,13 @@ public:
~ButtonInfo() {}
- QString file;
+ TQString file;
KDockWidget *dock;
KonqSidebarPlugin *module;
- QString URL;
- QString libName;
- QString displayName;
- QString iconName;
+ TQString URL;
+ TQString libName;
+ TQString displayName;
+ TQString iconName;
bool copy;
bool cut;
bool paste;
@@ -74,8 +74,8 @@ class addBackEnd: public QObject
{
Q_OBJECT
public:
- addBackEnd(QWidget *parent,class QPopupMenu *addmenu, bool universal,
- const QString &currentProfile, const char *name=0);
+ addBackEnd(TQWidget *parent,class TQPopupMenu *addmenu, bool universal,
+ const TQString &currentProfile, const char *name=0);
~addBackEnd(){;}
protected slots:
void aboutToShowAddMenu();
@@ -84,13 +84,13 @@ signals:
void updateNeeded();
void initialCopyNeeded();
private:
- QGuardedPtr<class QPopupMenu> menu;
- QPtrVector<QString> libNames;
- QPtrVector<QString> libParam;
+ TQGuardedPtr<class TQPopupMenu> menu;
+ TQPtrVector<TQString> libNames;
+ TQPtrVector<TQString> libParam;
bool m_universal;
- QString m_currentProfile;
+ TQString m_currentProfile;
void doRollBack();
- QWidget *m_parent;
+ TQWidget *m_parent;
};
class KDE_EXPORT Sidebar_Widget: public QWidget
@@ -99,24 +99,24 @@ class KDE_EXPORT Sidebar_Widget: public QWidget
public:
friend class ButtonInfo;
public:
- Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par,
+ Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par,
const char * name,bool universalMode,
- const QString &currentProfile);
+ const TQString &currentProfile);
~Sidebar_Widget();
bool openURL(const class KURL &url);
void stdAction(const char *handlestd);
//virtual KParts::ReadOnlyPart *getPart();
KParts::BrowserExtension *getExtension();
- virtual QSize sizeHint() const;
+ virtual TQSize sizeHint() const;
public slots:
- void addWebSideBar(const KURL& url, const QString& name);
+ void addWebSideBar(const KURL& url, const TQString& name);
protected:
- void customEvent(QCustomEvent* ev);
- void resizeEvent(QResizeEvent* ev);
- virtual bool eventFilter(QObject*,QEvent*);
- virtual void mousePressEvent(QMouseEvent*);
+ void customEvent(TQCustomEvent* ev);
+ void resizeEvent(TQResizeEvent* ev);
+ virtual bool eventFilter(TQObject*,TQEvent*);
+ virtual void mousePressEvent(TQMouseEvent*);
protected slots:
void showHidePage(int value);
@@ -138,8 +138,8 @@ signals:
public:
/* interface KonqSidebar_PluginInterface*/
KInstance *getInstance();
-// virtual void showError(QString &); for later extension
-// virtual void showMessage(QString &); for later extension
+// virtual void showError(TQString &); for later extension
+// virtual void showMessage(TQString &); for later extension
/* end of interface implementation */
@@ -150,30 +150,30 @@ public slots:
* @since 3.2
* ### KDE4 remove me
*/
- void submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&);
+ void submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&);
void createNewWindow( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
void createNewWindow( const KURL &url, const KParts::URLArgs &args,
const KParts::WindowArgs &windowArgs, KParts::ReadOnlyPart *&part );
- void popupMenu( const QPoint &global, const KFileItemList &items );
- void popupMenu( KXMLGUIClient *client, const QPoint &global, const KFileItemList &items );
- void popupMenu( const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode = (mode_t)-1 );
+ void popupMenu( const TQPoint &global, const KFileItemList &items );
+ void popupMenu( KXMLGUIClient *client, const TQPoint &global, const KFileItemList &items );
+ void popupMenu( const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode = (mode_t)-1 );
void popupMenu( KXMLGUIClient *client,
- const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode = (mode_t)-1 );
+ const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode = (mode_t)-1 );
void enableAction( const char * name, bool enabled );
void userMovedSplitter();
private:
- QSplitter *splitter() const;
- bool addButton(const QString &desktoppath,int pos=-1);
+ TQSplitter *splitter() const;
+ bool addButton(const TQString &desktoppath,int pos=-1);
bool createView(ButtonInfo *data);
- KonqSidebarPlugin *loadModule(QWidget *par,QString &desktopName,QString lib_name,ButtonInfo *bi);
+ KonqSidebarPlugin *loadModule(TQWidget *par,TQString &desktopName,TQString lib_name,ButtonInfo *bi);
void readConfig();
void initialCopy();
void doLayout();
- void connectModule(QObject *mod);
+ void connectModule(TQObject *mod);
void collapseExpandSidebar();
bool doEnableActions();
bool m_universalMode;
@@ -184,15 +184,15 @@ private:
KDockWidget *m_mainDockWidget;
KMultiTabBar *m_buttonBar;
- QPtrVector<ButtonInfo> m_buttons;
- QHBoxLayout *m_layout;
+ TQPtrVector<ButtonInfo> m_buttons;
+ TQHBoxLayout *m_layout;
KPopupMenu *m_buttonPopup;
- QPopupMenu *m_menu;
- QGuardedPtr<ButtonInfo> m_activeModule;
- QGuardedPtr<ButtonInfo> m_currentButton;
+ TQPopupMenu *m_menu;
+ TQGuardedPtr<ButtonInfo> m_activeModule;
+ TQGuardedPtr<ButtonInfo> m_currentButton;
KConfig *m_config;
- QTimer m_configTimer;
+ TQTimer m_configTimer;
KURL m_storedUrl;
int m_savedWidth;
@@ -212,11 +212,11 @@ private:
bool m_noUpdate;
bool m_initial;
- QString m_path;
- QString m_relPath;
- QString m_currentProfile;
- QStringList m_visibleViews; // The views that are actually open
- QStringList m_openViews; // The views that should be opened
+ TQString m_path;
+ TQString m_relPath;
+ TQString m_currentProfile;
+ TQStringList m_visibleViews; // The views that are actually open
+ TQStringList m_openViews; // The views that should be opened
signals:
void panelHasBeenExpanded(bool);
diff --git a/konqueror/sidebar/test/konqsidebartest.cpp b/konqueror/sidebar/test/konqsidebartest.cpp
index 56dfff2fe..a790ee7e1 100644
--- a/konqueror/sidebar/test/konqsidebartest.cpp
+++ b/konqueror/sidebar/test/konqsidebartest.cpp
@@ -19,7 +19,7 @@
extern "C"
{
- KDE_EXPORT void* create_konq_sidebartest(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name)
+ KDE_EXPORT void* create_konq_sidebartest(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
{
return new SidebarTest(instance,par,widp,desktopname,name);
}
diff --git a/konqueror/sidebar/test/konqsidebartest.h b/konqueror/sidebar/test/konqsidebartest.h
index 0c304e949..5c36080fd 100644
--- a/konqueror/sidebar/test/konqsidebartest.h
+++ b/konqueror/sidebar/test/konqsidebartest.h
@@ -17,23 +17,23 @@
#ifndef _konq_sidebar_test_h_
#define _konq_sidebar_test_h_
#include <konqsidebarplugin.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
class SidebarTest : public KonqSidebarPlugin
{
Q_OBJECT
public:
- SidebarTest(KInstance *inst,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name=0):
+ SidebarTest(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0):
KonqSidebarPlugin(inst,parent,widgetParent,desktopName_,name)
{
- widget=new QLabel("Init Value",widgetParent);
+ widget=new TQLabel("Init Value",widgetParent);
}
~SidebarTest(){;}
- virtual QWidget *getWidget(){return widget;}
- virtual void *provides(const QString &) {return 0;}
+ virtual TQWidget *getWidget(){return widget;}
+ virtual void *provides(const TQString &) {return 0;}
protected:
- QLabel *widget;
+ TQLabel *widget;
virtual void handleURL(const KURL &url)
{
widget->setText(url.url());
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp
index c0fae56cc..0bfe4ea67 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp
@@ -33,7 +33,7 @@ KonqSidebarBookmarkItem::KonqSidebarBookmarkItem( KonqSidebarTreeItem *parentIte
setPixmap( 0, SmallIcon(bk.icon()) );
}
-QDragObject * KonqSidebarBookmarkItem::dragObject( QWidget * parent, bool )
+TQDragObject * KonqSidebarBookmarkItem::dragObject( TQWidget * parent, bool )
{
KBookmarkDrag * drag = KBookmarkDrag::newDrag( m_bk, parent );
// TODO honour bool move ?
@@ -60,7 +60,7 @@ KURL KonqSidebarBookmarkItem::externalURL() const
return m_bk.isGroup() ? KURL() : m_bk.url();
}
-QString KonqSidebarBookmarkItem::toolTipText() const
+TQString KonqSidebarBookmarkItem::toolTipText() const
{
return m_bk.url().prettyURL();
}
@@ -70,9 +70,9 @@ void KonqSidebarBookmarkItem::itemSelected()
tree()->enableActions( false, false, false, false, false, false );
}
-QString KonqSidebarBookmarkItem::key( int /*column*/, bool /*ascending*/ ) const
+TQString KonqSidebarBookmarkItem::key( int /*column*/, bool /*ascending*/ ) const
{
- return QString::number(m_key).rightJustify( 5, '0' );
+ return TQString::number(m_key).rightJustify( 5, '0' );
}
KBookmark &KonqSidebarBookmarkItem::bookmark()
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_item.h b/konqueror/sidebar/trees/bookmark_module/bookmark_item.h
index 5ffe953e8..0cffd52ea 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_item.h
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_item.h
@@ -34,7 +34,7 @@ public:
virtual ~KonqSidebarBookmarkItem() {}
// Create a drag object from this item.
- virtual QDragObject * dragObject( QWidget * parent, bool move = false );
+ virtual TQDragObject * dragObject( TQWidget * parent, bool move = false );
virtual void middleButtonClicked();
virtual void rightButtonPressed();
@@ -45,12 +45,12 @@ public:
virtual KURL externalURL() const;
// overwrite this if you want a tooltip shown on your item
- virtual QString toolTipText() const;
+ virtual TQString toolTipText() const;
// Called when this item is selected
virtual void itemSelected();
- virtual QString key( int column, bool /*ascending*/ ) const;
+ virtual TQString key( int column, bool /*ascending*/ ) const;
virtual KBookmark &bookmark();
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index a931ac526..81b32923f 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -16,9 +16,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <qclipboard.h>
-#include <qcursor.h>
-#include <qpopupmenu.h>
+#include <tqclipboard.h>
+#include <tqcursor.h>
+#include <tqpopupmenu.h>
#include <kaction.h>
#include <kactioncollection.h>
@@ -37,47 +37,47 @@
#include <kdebug.h>
KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTree )
- : QObject( 0L ), KonqSidebarTreeModule( parentTree ),
+ : TQObject( 0L ), KonqSidebarTreeModule( parentTree ),
m_topLevelItem( 0L ), m_ignoreOpenChange(true)
{
// formats handled by KBookmarkDrag:
- QStringList formats;
+ TQStringList formats;
formats << "text/uri-list" << "application/x-xbel" << "text/plain";
tree()->setDropFormats(formats);
- connect(tree(), SIGNAL(moved(QListViewItem*,QListViewItem*,QListViewItem*)),
- this, SLOT(slotMoved(QListViewItem*,QListViewItem*,QListViewItem*)));
- connect(tree(), SIGNAL(dropped(KListView*,QDropEvent*,QListViewItem*,QListViewItem*)),
- this, SLOT(slotDropped(KListView*,QDropEvent*,QListViewItem*,QListViewItem*)));
+ connect(tree(), TQT_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)),
+ this, TQT_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*)));
+ connect(tree(), TQT_SIGNAL(dropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)),
+ this, TQT_SLOT(slotDropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)));
- connect(tree(), SIGNAL(expanded(QListViewItem*)),
- this, SLOT(slotOpenChange(QListViewItem*)));
- connect(tree(), SIGNAL(collapsed(QListViewItem*)),
- this, SLOT(slotOpenChange(QListViewItem*)));
+ connect(tree(), TQT_SIGNAL(expanded(TQListViewItem*)),
+ this, TQT_SLOT(slotOpenChange(TQListViewItem*)));
+ connect(tree(), TQT_SIGNAL(collapsed(TQListViewItem*)),
+ this, TQT_SLOT(slotOpenChange(TQListViewItem*)));
m_collection = new KActionCollection( this, "bookmark actions" );
(void) new KAction( i18n("&Create New Folder"), "folder_new", 0, this,
- SLOT( slotCreateFolder() ), m_collection, "create_folder");
+ TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
(void) new KAction( i18n("Delete Folder"), "editdelete", 0, this,
- SLOT( slotDelete() ), m_collection, "delete_folder");
+ TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
(void) new KAction( i18n("Delete Bookmark"), "editdelete", 0, this,
- SLOT( slotDelete() ), m_collection, "delete_bookmark");
+ TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark");
(void) new KAction( i18n("Properties"), "edit", 0, this,
- SLOT( slotProperties() ), m_collection, "item_properties");
+ TQT_SLOT( slotProperties() ), m_collection, "item_properties");
(void) new KAction( i18n("Open in New Window"), "window_new", 0, this,
- SLOT( slotOpenNewWindow() ), m_collection, "open_window");
+ TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
(void) new KAction( i18n("Open in New Tab"), "tab_new", 0, this,
- SLOT( slotOpenTab() ), m_collection, "open_tab");
+ TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
(void) new KAction( i18n("Open Folder in Tabs"), "tab_new", 0, this,
- SLOT( slotOpenTab() ), m_collection, "folder_open_tabs");
+ TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs");
(void) new KAction( i18n("Copy Link Address"), "editcopy", 0, this,
- SLOT( slotCopyLocation() ), m_collection, "copy_location");
+ TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
- KStdAction::editBookmarks( KonqBookmarkManager::self(), SLOT( slotEditBookmarks() ),
+ KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ),
m_collection, "edit_bookmarks" );
- connect( KonqBookmarkManager::self(), SIGNAL(changed(const QString &, const QString &) ),
- SLOT( slotBookmarksChanged(const QString &) ) );
+ connect( KonqBookmarkManager::self(), TQT_SIGNAL(changed(const TQString &, const TQString &) ),
+ TQT_SLOT( slotBookmarksChanged(const TQString &) ) );
}
KonqSidebarBookmarkModule::~KonqSidebarBookmarkModule()
@@ -94,9 +94,9 @@ void KonqSidebarBookmarkModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * i
m_ignoreOpenChange = false;
}
-bool KonqSidebarBookmarkModule::handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const QPoint& )
+bool KonqSidebarBookmarkModule::handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const TQPoint& )
{
- QPopupMenu *menu = new QPopupMenu;
+ TQPopupMenu *menu = new QPopupMenu;
if (tree()->tabSupport()) {
m_collection->action("folder_open_tabs")->plug(menu);
@@ -107,7 +107,7 @@ bool KonqSidebarBookmarkModule::handleTopLevelContextMenu( KonqSidebarTreeTopLev
menu->insertSeparator();
m_collection->action("edit_bookmarks")->plug(menu);
- menu->exec( QCursor::pos() );
+ menu->exec( TQCursor::pos() );
delete menu;
return true;
@@ -120,7 +120,7 @@ void KonqSidebarBookmarkModule::showPopupMenu()
return;
bool tabSupported = tree()->tabSupport();
- QPopupMenu *menu = new QPopupMenu;
+ TQPopupMenu *menu = new QPopupMenu;
if (bi->bookmark().isGroup()) {
if (tabSupported) {
@@ -141,11 +141,11 @@ void KonqSidebarBookmarkModule::showPopupMenu()
menu->insertSeparator();
m_collection->action("item_properties")->plug(menu);
- menu->exec( QCursor::pos() );
+ menu->exec( TQCursor::pos() );
delete menu;
}
-void KonqSidebarBookmarkModule::slotMoved(QListViewItem *i, QListViewItem*, QListViewItem *after)
+void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQListViewItem *after)
{
KonqSidebarBookmarkItem *item = dynamic_cast<KonqSidebarBookmarkItem*>( i );
if (!item)
@@ -159,7 +159,7 @@ void KonqSidebarBookmarkModule::slotMoved(QListViewItem *i, QListViewItem*, QLis
KBookmarkGroup oldParentGroup = bookmark.parentGroup();
KBookmarkGroup parentGroup;
- // try to get the parent group (assume that the QListViewItem has been reparented by KListView)...
+ // try to get the parent group (assume that the TQListViewItem has been reparented by KListView)...
// if anything goes wrong, use the root.
if (item->parent()) {
bool error = false;
@@ -191,20 +191,20 @@ void KonqSidebarBookmarkModule::slotMoved(QListViewItem *i, QListViewItem*, QLis
// inform others about the changed groups. quite expensive, so do
// our best to update them in only one emitChanged call.
- QString oldAddress = oldParentGroup.address();
- QString newAddress = parentGroup.address();
+ TQString oldAddress = oldParentGroup.address();
+ TQString newAddress = parentGroup.address();
if (oldAddress == newAddress) {
KonqBookmarkManager::self()->emitChanged( parentGroup );
} else {
int i = 0;
while (true) {
- QChar c1 = oldAddress[i];
- QChar c2 = newAddress[i];
- if (c1 == QChar::null) {
+ TQChar c1 = oldAddress[i];
+ TQChar c2 = newAddress[i];
+ if (c1 == TQChar::null) {
// oldParentGroup is probably parent of parentGroup.
KonqBookmarkManager::self()->emitChanged( oldParentGroup );
break;
- } else if (c2 == QChar::null) {
+ } else if (c2 == TQChar::null) {
// parentGroup is probably parent of oldParentGroup.
KonqBookmarkManager::self()->emitChanged( parentGroup );
break;
@@ -223,7 +223,7 @@ void KonqSidebarBookmarkModule::slotMoved(QListViewItem *i, QListViewItem*, QLis
}
}
-void KonqSidebarBookmarkModule::slotDropped(KListView *, QDropEvent *e, QListViewItem *parent, QListViewItem *after)
+void KonqSidebarBookmarkModule::slotDropped(KListView *, TQDropEvent *e, TQListViewItem *parent, TQListViewItem *after)
{
if (!KBookmarkDrag::canDecode(e))
return;
@@ -257,10 +257,10 @@ void KonqSidebarBookmarkModule::slotDropped(KListView *, QDropEvent *e, QListVie
parentGroup = KonqBookmarkManager::self()->root();
}
- QValueList<KBookmark> bookmarks = KBookmarkDrag::decode(e);
+ TQValueList<KBookmark> bookmarks = KBookmarkDrag::decode(e);
// copy
- QValueList<KBookmark>::iterator it = bookmarks.begin();
+ TQValueList<KBookmark>::iterator it = bookmarks.begin();
for (;it != bookmarks.end(); ++it) {
// insert new item.
parentGroup.moveItem(*it, afterBookmark);
@@ -320,21 +320,21 @@ void KonqSidebarBookmarkModule::slotDelete()
KonqBookmarkManager::self()->emitChanged( parentBookmark );
}
-void makeTextNodeMod(KBookmark bk, const QString &m_nodename, const QString &m_newText) {
- QDomNode subnode = bk.internalElement().namedItem(m_nodename);
+void makeTextNodeMod(KBookmark bk, const TQString &m_nodename, const TQString &m_newText) {
+ TQDomNode subnode = bk.internalElement().namedItem(m_nodename);
if (subnode.isNull()) {
subnode = bk.internalElement().ownerDocument().createElement(m_nodename);
bk.internalElement().appendChild(subnode);
}
if (subnode.firstChild().isNull()) {
- QDomText domtext = subnode.ownerDocument().createTextNode("");
+ TQDomText domtext = subnode.ownerDocument().createTextNode("");
subnode.appendChild(domtext);
}
- QDomText domtext = subnode.firstChild().toText();
+ TQDomText domtext = subnode.firstChild().toText();
- QString m_oldText = domtext.data();
+ TQString m_oldText = domtext.data();
domtext.setData(m_newText);
}
@@ -348,7 +348,7 @@ void KonqSidebarBookmarkModule::slotProperties(KonqSidebarBookmarkItem *bi)
KBookmark bookmark = bi->bookmark();
- QString folder = bookmark.isGroup() ? QString::null : bookmark.url().pathOrURL();
+ TQString folder = bookmark.isGroup() ? TQString::null : bookmark.url().pathOrURL();
BookmarkEditDialog dlg( bookmark.fullText(), folder, 0, 0,
i18n("Bookmark Properties") );
if ( dlg.exec() != KDialogBase::Accepted )
@@ -394,11 +394,11 @@ void KonqSidebarBookmarkModule::slotOpenTab()
bookmark = group.first();
while (!bookmark.isNull()) {
if (!bookmark.isGroup() && !bookmark.isSeparator())
- ref.call( "newTab(QString)", bookmark.url().url() );
+ ref.call( "newTab(TQString)", bookmark.url().url() );
bookmark = group.next(bookmark);
}
} else {
- ref.call( "newTab(QString)", bookmark.url().url() );
+ ref.call( "newTab(TQString)", bookmark.url().url() );
}
}
@@ -419,7 +419,7 @@ void KonqSidebarBookmarkModule::slotCopyLocation()
}
}
-void KonqSidebarBookmarkModule::slotOpenChange(QListViewItem* i)
+void KonqSidebarBookmarkModule::slotOpenChange(TQListViewItem* i)
{
if (m_ignoreOpenChange)
return;
@@ -438,7 +438,7 @@ void KonqSidebarBookmarkModule::slotOpenChange(QListViewItem* i)
m_folderOpenState[bookmark.address()] = open;
}
-void KonqSidebarBookmarkModule::slotBookmarksChanged( const QString & groupAddress )
+void KonqSidebarBookmarkModule::slotBookmarksChanged( const TQString & groupAddress )
{
m_ignoreOpenChange = true;
@@ -450,9 +450,9 @@ void KonqSidebarBookmarkModule::slotBookmarksChanged( const QString & groupAddre
if (!group.isNull() && item)
{
// Delete all children of item
- QListViewItem * child = item->firstChild();
+ TQListViewItem * child = item->firstChild();
while( child ) {
- QListViewItem * next = child->nextSibling();
+ TQListViewItem * next = child->nextSibling();
delete child;
child = next;
}
@@ -483,7 +483,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo
KBookmarkGroup grp = bk.toGroup();
fillGroup( item, grp );
- QString address(grp.address());
+ TQString address(grp.address());
if (m_folderOpenState.contains(address))
item->setOpen(m_folderOpenState[address]);
else
@@ -497,12 +497,12 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo
}
// Borrowed from KEditBookmarks
-KonqSidebarBookmarkItem * KonqSidebarBookmarkModule::findByAddress( const QString & address ) const
+KonqSidebarBookmarkItem * KonqSidebarBookmarkModule::findByAddress( const TQString & address ) const
{
- QListViewItem * item = m_topLevelItem;
+ TQListViewItem * item = m_topLevelItem;
// The address is something like /5/10/2
- QStringList addresses = QStringList::split('/',address);
- for ( QStringList::Iterator it = addresses.begin() ; it != addresses.end() ; ++it )
+ TQStringList addresses = TQStringList::split('/',address);
+ for ( TQStringList::Iterator it = addresses.begin() ; it != addresses.end() ; ++it )
{
uint number = (*it).toUInt();
item = item->firstChild();
@@ -514,8 +514,8 @@ KonqSidebarBookmarkItem * KonqSidebarBookmarkModule::findByAddress( const QStrin
}
// Borrowed&modified from KBookmarkMenu...
-BookmarkEditDialog::BookmarkEditDialog(const QString& title, const QString& url,
- QWidget * parent, const char * name, const QString& caption )
+BookmarkEditDialog::BookmarkEditDialog(const TQString& title, const TQString& url,
+ TQWidget * parent, const char * name, const TQString& caption )
: KDialogBase(parent, name, true, caption,
(Ok|Cancel),
Ok, false, KGuiItem()),
@@ -523,20 +523,20 @@ BookmarkEditDialog::BookmarkEditDialog(const QString& title, const QString& url,
{
setButtonOK( i18n( "&Update" ) );
- QWidget *main = new QWidget( this );
+ TQWidget *main = new TQWidget( this );
setMainWidget( main );
bool folder = url.isNull();
- QGridLayout *grid = new QGridLayout( main, 2, folder?1:2, spacingHint() );
+ TQGridLayout *grid = new TQGridLayout( main, 2, folder?1:2, spacingHint() );
- QLabel *nameLabel = new QLabel(i18n("Name:"), main, "title label");
+ TQLabel *nameLabel = new TQLabel(i18n("Name:"), main, "title label");
grid->addWidget(nameLabel, 0, 0);
m_title = new KLineEdit(main, "title edit");
m_title->setText(title);
nameLabel->setBuddy(m_title);
grid->addWidget(m_title, 0, 1);
if(!folder) {
- QLabel *locationLabel = new QLabel(i18n("Location:"), main, "location label");
+ TQLabel *locationLabel = new TQLabel(i18n("Location:"), main, "location label");
grid->addWidget(locationLabel, 1, 0);
m_location = new KLineEdit(main, "location edit");
m_location->setText(url);
@@ -556,20 +556,20 @@ void BookmarkEditDialog::slotCancel()
reject();
}
-QString BookmarkEditDialog::finalUrl() const
+TQString BookmarkEditDialog::finalUrl() const
{
if (m_location!=0)
return m_location->text();
else
- return QString::null;
+ return TQString::null;
}
-QString BookmarkEditDialog::finalTitle() const
+TQString BookmarkEditDialog::finalTitle() const
{
if (m_title!=0)
return m_title->text();
else
- return QString::null;
+ return TQString::null;
}
extern "C"
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h
index b38cdb540..738bd7566 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h
@@ -19,8 +19,8 @@
#ifndef bookmark_module_h
#define bookmark_module_h
-#include <qmap.h>
-#include <qobject.h>
+#include <tqmap.h>
+#include <tqobject.h>
#include <konq_sidebartreemodule.h>
#include <kbookmark.h>
#include <kdialogbase.h>
@@ -32,7 +32,7 @@ class KLineEdit;
/**
* This module displays bookmarks in the tree
*/
-class KonqSidebarBookmarkModule : public QObject, public KonqSidebarTreeModule
+class KonqSidebarBookmarkModule : public TQObject, public KonqSidebarTreeModule
{
Q_OBJECT
public:
@@ -41,15 +41,15 @@ public:
// Handle this new toplevel item [can only be called once currently]
virtual void addTopLevelItem( KonqSidebarTreeTopLevelItem * item );
- virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const QPoint& );
+ virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const TQPoint& );
void showPopupMenu();
protected slots:
- void slotBookmarksChanged( const QString & );
- void slotMoved(QListViewItem*,QListViewItem*,QListViewItem*);
- void slotDropped(KListView*,QDropEvent*,QListViewItem*,QListViewItem*);
+ void slotBookmarksChanged( const TQString & );
+ void slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*);
+ void slotDropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*);
void slotCreateFolder();
void slotDelete();
void slotProperties(KonqSidebarBookmarkItem *bi = 0);
@@ -60,10 +60,10 @@ protected slots:
protected:
void fillListView();
void fillGroup( KonqSidebarTreeItem * parentItem, KBookmarkGroup group );
- KonqSidebarBookmarkItem * findByAddress( const QString & address ) const;
+ KonqSidebarBookmarkItem * findByAddress( const TQString & address ) const;
private slots:
- void slotOpenChange(QListViewItem*);
+ void slotOpenChange(TQListViewItem*);
private:
KonqSidebarTreeTopLevelItem * m_topLevelItem;
@@ -72,7 +72,7 @@ private:
KActionCollection *m_collection;
bool m_ignoreOpenChange;
- QMap<QString, bool> m_folderOpenState;
+ TQMap<TQString, bool> m_folderOpenState;
};
class BookmarkEditDialog : public KDialogBase
@@ -80,12 +80,12 @@ class BookmarkEditDialog : public KDialogBase
Q_OBJECT
public:
- BookmarkEditDialog( const QString& title, const QString& url,
- QWidget * = 0, const char * = 0,
- const QString& caption = i18n( "Add Bookmark" ) );
+ BookmarkEditDialog( const TQString& title, const TQString& url,
+ TQWidget * = 0, const char * = 0,
+ const TQString& caption = i18n( "Add Bookmark" ) );
- QString finalUrl() const;
- QString finalTitle() const;
+ TQString finalUrl() const;
+ TQString finalTitle() const;
protected slots:
void slotOk();
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 7f7ee8849..811867b14 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -25,13 +25,13 @@
#include <kdebug.h>
#include <kglobalsettings.h>
#include <kuserprofile.h>
-#include <qapplication.h>
-#include <qclipboard.h>
+#include <tqapplication.h>
+#include <tqclipboard.h>
#include <kio/paste.h>
-#include <qfile.h>
-#include <qpainter.h>
+#include <tqfile.h>
+#include <tqpainter.h>
#include <kiconloader.h>
-#include <qcursor.h>
+#include <tqcursor.h>
#define MYMODULE static_cast<KonqSidebarDirTreeModule*>(module())
@@ -64,7 +64,7 @@ void KonqSidebarDirTreeItem::reset()
KURL url = m_fileItem->url();
if ( url.isLocalFile() )
{
- QCString path( QFile::encodeName(url.path()));
+ TQCString path( TQFile::encodeName(url.path()));
struct stat buff;
if ( ::stat( path.data(), &buff ) != -1 )
{
@@ -108,15 +108,15 @@ bool KonqSidebarDirTreeItem::hasStandardIcon()
return m_fileItem->iconName() == "folder";
}
-void KonqSidebarDirTreeItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
{
if (m_fileItem->isLink())
{
- QFont f( _painter->font() );
+ TQFont f( _painter->font() );
f.setItalic( TRUE );
_painter->setFont( f );
}
- QListViewItem::paintCell( _painter, _cg, _column, _width, _alignment );
+ TQListViewItem::paintCell( _painter, _cg, _column, _width, _alignment );
}
KURL KonqSidebarDirTreeItem::externalURL() const
@@ -124,27 +124,27 @@ KURL KonqSidebarDirTreeItem::externalURL() const
return m_fileItem->url();
}
-QString KonqSidebarDirTreeItem::externalMimeType() const
+TQString KonqSidebarDirTreeItem::externalMimeType() const
{
if (m_fileItem->isMimeTypeKnown())
return m_fileItem->mimetype();
else
- return QString::null;
+ return TQString::null;
}
-bool KonqSidebarDirTreeItem::acceptsDrops( const QStrList & formats )
+bool KonqSidebarDirTreeItem::acceptsDrops( const TQStrList & formats )
{
if ( formats.contains("text/uri-list") )
return m_fileItem->acceptsDrops();
return false;
}
-void KonqSidebarDirTreeItem::drop( QDropEvent * ev )
+void KonqSidebarDirTreeItem::drop( TQDropEvent * ev )
{
KonqOperations::doDrop( m_fileItem, externalURL(), ev, tree() );
}
-QDragObject * KonqSidebarDirTreeItem::dragObject( QWidget * parent, bool move )
+TQDragObject * KonqSidebarDirTreeItem::dragObject( TQWidget * parent, bool move )
{
KURL::List lst;
lst.append( m_fileItem->url() );
@@ -162,7 +162,7 @@ void KonqSidebarDirTreeItem::itemSelected()
if ( m_fileItem->url().directory(false) == KGlobalSettings::trashPath() )
bInTrash = true;
- QMimeSource *data = QApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
bool paste = ( data->encodedData( data->format() ).size() != 0 );
tree()->enableActions( true, true, paste, true && !bInTrash, true, true );
@@ -190,14 +190,14 @@ void KonqSidebarDirTreeItem::rightButtonPressed()
{
KFileItemList lstItems;
lstItems.append( m_fileItem );
- emit tree()->popupMenu( QCursor::pos(), lstItems );
+ emit tree()->popupMenu( TQCursor::pos(), lstItems );
}
void KonqSidebarDirTreeItem::paste()
{
// move or not move ?
bool move = false;
- QMimeSource *data = QApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1201) << "move (from clipboard data) = " << move << endl;
@@ -229,7 +229,7 @@ void KonqSidebarDirTreeItem::delOperation( int method )
KonqOperations::del(tree(), method, lst);
}
-QString KonqSidebarDirTreeItem::toolTipText() const
+TQString KonqSidebarDirTreeItem::toolTipText() const
{
return m_fileItem->url().pathOrURL();
}
@@ -239,7 +239,7 @@ void KonqSidebarDirTreeItem::rename()
tree()->rename( this, 0 );
}
-void KonqSidebarDirTreeItem::rename( const QString & name )
+void KonqSidebarDirTreeItem::rename( const TQString & name )
{
KonqOperations::rename( tree(), m_fileItem->url(), name );
}
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
index fe98595e6..f8025d230 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
@@ -21,7 +21,7 @@
#include "konq_sidebartreeitem.h"
#include <kurl.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
class QDropEvent;
class KFileItem;
@@ -36,11 +36,11 @@ public:
virtual void setOpen( bool open );
- virtual void paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment );
+ virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment );
- virtual bool acceptsDrops( const QStrList & formats );
- virtual void drop( QDropEvent * ev );
- virtual QDragObject * dragObject( QWidget * parent, bool move = false );
+ virtual bool acceptsDrops( const TQStrList & formats );
+ virtual void drop( TQDropEvent * ev );
+ virtual TQDragObject * dragObject( TQWidget * parent, bool move = false );
virtual void middleButtonClicked();
virtual void rightButtonPressed();
@@ -50,12 +50,12 @@ public:
virtual void del();
virtual void shred();
virtual void rename(); // start a rename operation
- void rename( const QString & name ); // do the actual renaming
+ void rename( const TQString & name ); // do the actual renaming
// The URL to open when this link is clicked
virtual KURL externalURL() const;
- virtual QString externalMimeType() const;
- virtual QString toolTipText() const;
+ virtual TQString externalMimeType() const;
+ virtual TQString toolTipText() const;
virtual void itemSelected();
@@ -63,7 +63,7 @@ public:
bool hasStandardIcon();
- QString id;
+ TQString id;
private:
void delOperation( int method );
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index 725927362..ac26b1285 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -53,8 +53,8 @@ KonqSidebarDirTreeModule::~KonqSidebarDirTreeModule()
// KDirLister may still emit canceled while being deleted.
if (m_dirLister)
{
- disconnect( m_dirLister, SIGNAL( canceled( const KURL & ) ),
- this, SLOT( slotListingStopped( const KURL & ) ) );
+ disconnect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ),
+ this, TQT_SLOT( slotListingStopped( const KURL & ) ) );
delete m_dirLister;
}
}
@@ -87,12 +87,12 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it
{
targetURL = cfg.readURL();
// some services might want to make their URL configurable in kcontrol
- QString configured = cfg.readEntry("X-KDE-ConfiguredURL");
+ TQString configured = cfg.readEntry("X-KDE-ConfiguredURL");
if (!configured.isEmpty()) {
- QStringList list = QStringList::split(':', configured);
+ TQStringList list = TQStringList::split(':', configured);
KConfig config(list[0]);
if (list[1] != "noGroup") config.setGroup(list[1]);
- QString conf_url = config.readEntry(list[2]);
+ TQString conf_url = config.readEntry(list[2]);
if (!conf_url.isEmpty()) {
targetURL = conf_url;
}
@@ -101,7 +101,7 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it
else if ( cfg.hasDeviceType() )
{
// Determine the mountpoint
- QString mp = cfg.readEntry("MountPoint");
+ TQString mp = cfg.readEntry("MountPoint");
if ( mp.isEmpty() )
return;
@@ -133,7 +133,7 @@ void KonqSidebarDirTreeModule::openTopLevelItem( KonqSidebarTreeTopLevelItem * i
void KonqSidebarDirTreeModule::addSubDir( KonqSidebarTreeItem *item )
{
- QString id = item->externalURL().url(-1);
+ TQString id = item->externalURL().url(-1);
kdDebug(1201) << this << " KonqSidebarDirTreeModule::addSubDir " << id << endl;
m_dictSubDirs.insert(id, item );
@@ -144,9 +144,9 @@ void KonqSidebarDirTreeModule::addSubDir( KonqSidebarTreeItem *item )
// Remove <key, item> from dict, taking into account that there maybe
// other items with the same key.
-static void remove(QDict<KonqSidebarTreeItem> &dict, const QString &key, KonqSidebarTreeItem *item)
+static void remove(TQDict<KonqSidebarTreeItem> &dict, const TQString &key, KonqSidebarTreeItem *item)
{
- QPtrList<KonqSidebarTreeItem> *otherItems = 0;
+ TQPtrList<KonqSidebarTreeItem> *otherItems = 0;
while(true) {
KonqSidebarTreeItem *takeItem = dict.take(key);
if (!takeItem || (takeItem == item))
@@ -164,7 +164,7 @@ static void remove(QDict<KonqSidebarTreeItem> &dict, const QString &key, KonqSid
}
// Not the item we are looking for
if (!otherItems)
- otherItems = new QPtrList<KonqSidebarTreeItem>();
+ otherItems = new TQPtrList<KonqSidebarTreeItem>();
otherItems->prepend(takeItem);
}
@@ -173,7 +173,7 @@ static void remove(QDict<KonqSidebarTreeItem> &dict, const QString &key, KonqSid
// Looks up key in dict and returns it in item, if there are multiple items
// with the same key, additional items are returned in itemList which should
// be deleted by the caller.
-static void lookupItems(QDict<KonqSidebarTreeItem> &dict, const QString &key, KonqSidebarTreeItem *&item, QPtrList<KonqSidebarTreeItem> *&itemList)
+static void lookupItems(TQDict<KonqSidebarTreeItem> &dict, const TQString &key, KonqSidebarTreeItem *&item, TQPtrList<KonqSidebarTreeItem> *&itemList)
{
itemList = 0;
item = dict.take(key);
@@ -196,7 +196,7 @@ static void lookupItems(QDict<KonqSidebarTreeItem> &dict, const QString &key, Ko
return;
}
if (!itemList)
- itemList = new QPtrList<KonqSidebarTreeItem>();
+ itemList = new TQPtrList<KonqSidebarTreeItem>();
itemList->prepend(takeItem);
}
@@ -204,9 +204,9 @@ static void lookupItems(QDict<KonqSidebarTreeItem> &dict, const QString &key, Ko
// Remove <key, item> from dict, taking into account that there maybe
// other items with the same key.
-static void remove(QPtrDict<KonqSidebarTreeItem> &dict, void *key, KonqSidebarTreeItem *item)
+static void remove(TQPtrDict<KonqSidebarTreeItem> &dict, void *key, KonqSidebarTreeItem *item)
{
- QPtrList<KonqSidebarTreeItem> *otherItems = 0;
+ TQPtrList<KonqSidebarTreeItem> *otherItems = 0;
while(true) {
KonqSidebarTreeItem *takeItem = dict.take(key);
if (!takeItem || (takeItem == item))
@@ -224,7 +224,7 @@ static void remove(QPtrDict<KonqSidebarTreeItem> &dict, void *key, KonqSidebarTr
}
// Not the item we are looking for
if (!otherItems)
- otherItems = new QPtrList<KonqSidebarTreeItem>();
+ otherItems = new TQPtrList<KonqSidebarTreeItem>();
otherItems->prepend(takeItem);
}
@@ -233,7 +233,7 @@ static void remove(QPtrDict<KonqSidebarTreeItem> &dict, void *key, KonqSidebarTr
// Looks up key in dict and returns it in item, if there are multiple items
// with the same key, additional items are returned in itemList which should
// be deleted by the caller.
-static void lookupItems(QPtrDict<KonqSidebarTreeItem> &dict, void *key, KonqSidebarTreeItem *&item, QPtrList<KonqSidebarTreeItem> *&itemList)
+static void lookupItems(TQPtrDict<KonqSidebarTreeItem> &dict, void *key, KonqSidebarTreeItem *&item, TQPtrList<KonqSidebarTreeItem> *&itemList)
{
itemList = 0;
item = dict.take(key);
@@ -256,7 +256,7 @@ static void lookupItems(QPtrDict<KonqSidebarTreeItem> &dict, void *key, KonqSide
return;
}
if (!itemList)
- itemList = new QPtrList<KonqSidebarTreeItem>();
+ itemList = new TQPtrList<KonqSidebarTreeItem>();
itemList->prepend(takeItem);
}
@@ -280,7 +280,7 @@ void KonqSidebarDirTreeModule::removeSubDir( KonqSidebarTreeItem *item, bool chi
if ( !childrenOnly )
{
- QString id = item->externalURL().url(-1);
+ TQString id = item->externalURL().url(-1);
remove(m_dictSubDirs, id, item);
while (!(item->alias.isEmpty()))
{
@@ -303,22 +303,22 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item )
{
m_dirLister = new KDirLister( true );
//m_dirLister->setDirOnlyMode( true );
-// QStringList mimetypes;
-// mimetypes<<QString("inode/directory");
+// TQStringList mimetypes;
+// mimetypes<<TQString("inode/directory");
// m_dirLister->setMimeFilter(mimetypes);
- connect( m_dirLister, SIGNAL( newItems( const KFileItemList & ) ),
- this, SLOT( slotNewItems( const KFileItemList & ) ) );
- connect( m_dirLister, SIGNAL( refreshItems( const KFileItemList & ) ),
- this, SLOT( slotRefreshItems( const KFileItemList & ) ) );
- connect( m_dirLister, SIGNAL( deleteItem( KFileItem * ) ),
- this, SLOT( slotDeleteItem( KFileItem * ) ) );
- connect( m_dirLister, SIGNAL( completed( const KURL & ) ),
- this, SLOT( slotListingStopped( const KURL & ) ) );
- connect( m_dirLister, SIGNAL( canceled( const KURL & ) ),
- this, SLOT( slotListingStopped( const KURL & ) ) );
- connect( m_dirLister, SIGNAL( redirection( const KURL &, const KURL & ) ),
- this, SLOT( slotRedirection( const KURL &, const KURL & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ),
+ this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ),
+ this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
+ this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
+ connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ),
+ this, TQT_SLOT( slotListingStopped( const KURL & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ),
+ this, TQT_SLOT( slotListingStopped( const KURL & ) ) );
+ connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ),
+ this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) );
}
@@ -326,7 +326,7 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item )
static_cast<KonqSidebarDirTreeItem *>(item)->hasStandardIcon() )
{
int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
- QPixmap pix = DesktopIcon( "folder_open", size );
+ TQPixmap pix = DesktopIcon( "folder_open", size );
m_pTree->startAnimation( item, "kde", 6, &pix );
}
else
@@ -338,10 +338,10 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item )
void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item )
{
// This causes a reparsing, but gets rid of the trailing slash
- QString strUrl = item->externalURL().url(-1);
+ TQString strUrl = item->externalURL().url(-1);
KURL url( strUrl );
- QPtrList<KonqSidebarTreeItem> *itemList;
+ TQPtrList<KonqSidebarTreeItem> *itemList;
KonqSidebarTreeItem * openItem;
lookupItems(m_dictSubDirs, strUrl, openItem, itemList);
@@ -407,13 +407,13 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )
dir.setFileName( "" );
kdDebug(1201) << this << " KonqSidebarDirTreeModule::slotNewItems dir=" << dir.url(-1) << endl;
- QPtrList<KonqSidebarTreeItem> *parentItemList;
+ TQPtrList<KonqSidebarTreeItem> *parentItemList;
KonqSidebarTreeItem * parentItem;
lookupItems(m_dictSubDirs, dir.url(-1), parentItem, parentItemList);
if ( !parentItem ) // hack for dnssd://domain/type/service listed in dnssd:/type/ dir
{
- dir.setHost( QString::null );
+ dir.setHost( TQString::null );
lookupItems( m_dictSubDirs, dir.url(-1), parentItem, parentItemList );
}
@@ -428,7 +428,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )
do
{
kdDebug()<<"Parent Item URL:"<<parentItem->externalURL()<<endl;
- QPtrListIterator<KFileItem> kit ( entries );
+ TQPtrListIterator<KFileItem> kit ( entries );
for( ; kit.current(); ++kit )
{
KFileItem * fileItem = *kit;
@@ -458,13 +458,13 @@ void KonqSidebarDirTreeModule::slotRefreshItems( const KFileItemList &entries )
{
int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
- QPtrListIterator<KFileItem> kit ( entries );
+ TQPtrListIterator<KFileItem> kit ( entries );
kdDebug(1201) << "KonqSidebarDirTreeModule::slotRefreshItems " << entries.count() << " entries. First: " << kit.current()->url().url() << endl;
for( ; kit.current(); ++kit )
{
KFileItem *fileItem = kit.current();
- QPtrList<KonqSidebarTreeItem> *itemList;
+ TQPtrList<KonqSidebarTreeItem> *itemList;
KonqSidebarTreeItem * item;
lookupItems(m_ptrdictSubDirs, fileItem, item, itemList);
@@ -517,7 +517,7 @@ void KonqSidebarDirTreeModule::slotDeleteItem( KFileItem *fileItem )
kdDebug(1201) << "KonqSidebarDirTreeModule::slotDeleteItem( " << fileItem->url().url(-1) << " )" << endl;
// All items are in m_ptrdictSubDirs, so look it up fast
- QPtrList<KonqSidebarTreeItem> *itemList;
+ TQPtrList<KonqSidebarTreeItem> *itemList;
KonqSidebarTreeItem * item;
lookupItems(m_ptrdictSubDirs, fileItem, item, itemList);
while(item)
@@ -534,10 +534,10 @@ void KonqSidebarDirTreeModule::slotRedirection( const KURL & oldUrl, const KURL
{
kdDebug(1201) << "******************************KonqSidebarDirTreeModule::slotRedirection(" << newUrl.prettyURL() << ")" << endl;
- QString oldUrlStr = oldUrl.url(-1);
- QString newUrlStr = newUrl.url(-1);
+ TQString oldUrlStr = oldUrl.url(-1);
+ TQString newUrlStr = newUrl.url(-1);
- QPtrList<KonqSidebarTreeItem> *itemList;
+ TQPtrList<KonqSidebarTreeItem> *itemList;
KonqSidebarTreeItem * item;
lookupItems(m_dictSubDirs, oldUrlStr, item, itemList);
@@ -565,7 +565,7 @@ void KonqSidebarDirTreeModule::slotListingStopped( const KURL & url )
{
kdDebug(1201) << "KonqSidebarDirTree::slotListingStopped " << url.url(-1) << endl;
- QPtrList<KonqSidebarTreeItem> *itemList;
+ TQPtrList<KonqSidebarTreeItem> *itemList;
KonqSidebarTreeItem * item;
lookupItems(m_dictSubDirs, url.url(-1), item, itemList);
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
index dc46d3b9e..af915aa46 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
@@ -21,9 +21,9 @@
#include <konq_sidebartreemodule.h>
#include <kfileitem.h>
-#include <qpixmap.h>
-#include <qdict.h>
-#include <qptrdict.h>
+#include <tqpixmap.h>
+#include <tqdict.h>
+#include <tqptrdict.h>
class KDirLister;
class KonqSidebarTree;
@@ -31,7 +31,7 @@ class KonqSidebarTreeItem;
class KonqSidebarDirTreeItem;
class KonqPropsView;
-class KonqSidebarDirTreeModule : public QObject, public KonqSidebarTreeModule
+class KonqSidebarDirTreeModule : public TQObject, public KonqSidebarTreeModule
{
Q_OBJECT
public:
@@ -64,10 +64,10 @@ private:
// URL -> item
// Each KonqSidebarDirTreeItem is indexed on item->id() and
// all item->alias'es
- QDict<KonqSidebarTreeItem> m_dictSubDirs;
+ TQDict<KonqSidebarTreeItem> m_dictSubDirs;
// KFileItem -> item
- QPtrDict<KonqSidebarTreeItem> m_ptrdictSubDirs;
+ TQPtrDict<KonqSidebarTreeItem> m_ptrdictSubDirs;
KDirLister * m_dirLister;
diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp
index bfda3152c..981be03bb 100644
--- a/konqueror/sidebar/trees/history_module/history_item.cpp
+++ b/konqueror/sidebar/trees/history_module/history_item.cpp
@@ -19,7 +19,7 @@
#include <kbookmarkdrag.h>
#include <kprotocolinfo.h>
#include <konq_faviconmgr.h>
-#include <qpainter.h>
+#include <tqpainter.h>
#include <assert.h>
@@ -53,12 +53,12 @@ void KonqSidebarHistoryItem::update( const KonqHistoryEntry *entry )
if (!entry)
return;
- QString title( entry->title );
+ TQString title( entry->title );
if ( !title.stripWhiteSpace().isEmpty() &&
title != entry->url.url() )
setText( 0, title );
else {
- QString path( entry->url.path() );
+ TQString path( entry->url.path() );
if ( path.isEmpty() )
path += '/';
setText( 0, path );
@@ -66,10 +66,10 @@ void KonqSidebarHistoryItem::update( const KonqHistoryEntry *entry )
KonqSidebarHistoryGroupItem *group = MYGROUP;
assert(group);
- QString path = entry->url.path();
+ TQString path = entry->url.path();
if ( group->hasFavIcon() && (path.isNull() || path == "/") )
{
- const QPixmap *pm = group->pixmap(0);
+ const TQPixmap *pm = group->pixmap(0);
if (pm)
setPixmap( 0, *pm );
}
@@ -91,9 +91,9 @@ void KonqSidebarHistoryItem::rightButtonPressed()
MYMODULE->showPopupMenu();
}
-QDragObject * KonqSidebarHistoryItem::dragObject( QWidget * parent, bool /*move*/ )
+TQDragObject * KonqSidebarHistoryItem::dragObject( TQWidget * parent, bool /*move*/ )
{
- QString icon = KonqFavIconMgr::iconForURL( m_entry->url.url() );
+ TQString icon = KonqFavIconMgr::iconForURL( m_entry->url.url() );
KBookmark bookmark = KBookmark::standaloneBookmark( m_entry->title,
m_entry->url, icon );
KBookmarkDrag *drag = KBookmarkDrag::newDrag( bookmark, parent );
@@ -101,35 +101,35 @@ QDragObject * KonqSidebarHistoryItem::dragObject( QWidget * parent, bool /*move*
}
// new items go on top
-QString KonqSidebarHistoryItem::key( int column, bool ascending ) const
+TQString KonqSidebarHistoryItem::key( int column, bool ascending ) const
{
if ( MYMODULE->sortsByName() )
return KonqSidebarTreeItem::key( column, ascending );
- QString tmp;
+ TQString tmp;
tmp.sprintf( "%08x", m_entry->lastVisited.secsTo(MYMODULE->currentTime()));
return tmp;
}
-QString KonqSidebarHistoryItem::toolTipText() const
+TQString KonqSidebarHistoryItem::toolTipText() const
{
if ( s_settings->m_detailedTips ) {
// this weird ordering of %4, %1, %2, %3 is due to the reason, that some
// urls seem to contain %N, which would get substituted in the next
// .arg() calls. So to fix this, we first substitute the last items
// and then put in the url.
- QString tip = i18n("<qt><center><b>%4</b></center><hr>Last visited: %1<br>First visited: %2<br>Number of times visited: %3</qt>");
+ TQString tip = i18n("<qt><center><b>%4</b></center><hr>Last visited: %1<br>First visited: %2<br>Number of times visited: %3</qt>");
return tip.arg( KGlobal::locale()->formatDateTime( m_entry->lastVisited ) ).arg( KGlobal::locale()->formatDateTime( m_entry->firstVisited ) ).arg( m_entry->numberOfTimesVisited ).arg( m_entry->url.url() );
}
return m_entry->url.url();
}
-void KonqSidebarHistoryItem::paintCell( QPainter *p, const QColorGroup & cg,
+void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg,
int column, int width, int alignment )
{
- QDateTime dt;
- QDateTime current = QDateTime::currentDateTime();
+ TQDateTime dt;
+ TQDateTime current = TQDateTime::currentDateTime();
if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS )
dt = current.addDays( - s_settings->m_valueYoungerThan );
@@ -164,7 +164,7 @@ KonqSidebarHistoryGroupItem::KonqSidebarHistoryGroupItem( const KURL& url,
{
}
-void KonqSidebarHistoryGroupItem::setFavIcon( const QPixmap& pix )
+void KonqSidebarHistoryGroupItem::setFavIcon( const TQPixmap& pix )
{
setPixmap( 0, pix );
m_hasFavIcon = true;
@@ -187,7 +187,7 @@ void KonqSidebarHistoryGroupItem::remove()
KonqSidebarHistoryItem * KonqSidebarHistoryGroupItem::findChild(const KonqHistoryEntry *entry) const
{
- QListViewItem *child = firstChild();
+ TQListViewItem *child = firstChild();
KonqSidebarHistoryItem *item = 0L;
while ( child ) {
@@ -220,12 +220,12 @@ void KonqSidebarHistoryGroupItem::setOpen( bool open )
}
// new items go on top
-QString KonqSidebarHistoryGroupItem::key( int column, bool ascending ) const
+TQString KonqSidebarHistoryGroupItem::key( int column, bool ascending ) const
{
if ( !m_lastVisited.isValid() || MYMODULE->sortsByName() )
return KonqSidebarTreeItem::key( column, ascending );
- QString tmp;
+ TQString tmp;
tmp.sprintf( "%08x", m_lastVisited.secsTo( MYMODULE->currentTime() ));
return tmp;
}
@@ -236,10 +236,10 @@ void KonqSidebarHistoryGroupItem::itemUpdated( KonqSidebarHistoryItem *item )
m_lastVisited = item->lastVisited();
}
-QDragObject * KonqSidebarHistoryGroupItem::dragObject( QWidget *parent, bool /*move*/)
+TQDragObject * KonqSidebarHistoryGroupItem::dragObject( TQWidget *parent, bool /*move*/)
{
- QString icon = KonqFavIconMgr::iconForURL( m_url.url() );
- KBookmark bookmark = KBookmark::standaloneBookmark( QString::null, m_url,
+ TQString icon = KonqFavIconMgr::iconForURL( m_url.url() );
+ KBookmark bookmark = KBookmark::standaloneBookmark( TQString::null, m_url,
icon );
KBookmarkDrag *drag = KBookmarkDrag::newDrag( bookmark, parent );
return drag;
diff --git a/konqueror/sidebar/trees/history_module/history_item.h b/konqueror/sidebar/trees/history_module/history_item.h
index a7c77a677..fb7786e60 100644
--- a/konqueror/sidebar/trees/history_module/history_item.h
+++ b/konqueror/sidebar/trees/history_module/history_item.h
@@ -43,23 +43,23 @@ public:
// The URL to open when this link is clicked
virtual KURL externalURL() const { return m_entry->url; }
const KURL& url() const { return m_entry->url; } // a faster one
- virtual QString toolTipText() const;
+ virtual TQString toolTipText() const;
- QString host() const { return m_entry->url.host(); }
- QString path() const { return m_entry->url.path(); }
+ TQString host() const { return m_entry->url.host(); }
+ TQString path() const { return m_entry->url.path(); }
- const QDateTime& lastVisited() const { return m_entry->lastVisited; }
+ const TQDateTime& lastVisited() const { return m_entry->lastVisited; }
void update( const KonqHistoryEntry *entry );
const KonqHistoryEntry *entry() const { return m_entry; }
- virtual QDragObject * dragObject( QWidget * parent, bool move = false );
+ virtual TQDragObject * dragObject( TQWidget * parent, bool move = false );
- virtual QString key( int column, bool ascending ) const;
+ virtual TQString key( int column, bool ascending ) const;
static void setSettings( KonqSidebarHistorySettings *s ) { s_settings = s; }
- virtual void paintCell( QPainter *, const QColorGroup & cg, int column,
+ virtual void paintCell( TQPainter *, const TQColorGroup & cg, int column,
int width, int alignment );
private:
@@ -85,25 +85,25 @@ public:
virtual void setOpen( bool open );
- virtual QString key( int column, bool ascending ) const;
+ virtual TQString key( int column, bool ascending ) const;
void itemUpdated( KonqSidebarHistoryItem *item );
bool hasFavIcon() const { return m_hasFavIcon; }
- void setFavIcon( const QPixmap& pix );
+ void setFavIcon( const TQPixmap& pix );
- virtual QDragObject * dragObject( QWidget *, bool );
+ virtual TQDragObject * dragObject( TQWidget *, bool );
virtual void itemSelected();
// we don't support the following of KonqSidebarTreeItem
- bool acceptsDrops( const QStrList& ) { return false; }
- virtual void drop( QDropEvent * ) {}
+ bool acceptsDrops( const TQStrList& ) { return false; }
+ virtual void drop( TQDropEvent * ) {}
virtual KURL externalURL() const { return KURL(); }
private:
bool m_hasFavIcon;
const KURL m_url;
- QDateTime m_lastVisited;
+ TQDateTime m_lastVisited;
};
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 832abd74e..2f80c26c0 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
-#include <qpopupmenu.h>
+#include <tqapplication.h>
+#include <tqpopupmenu.h>
#include <kapplication.h>
#include <kaction.h>
@@ -39,7 +39,7 @@ static KStaticDeleter<KonqSidebarHistorySettings> sd;
KonqSidebarHistorySettings * KonqSidebarHistoryModule::s_settings = 0L;
KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree, const char *name )
- : QObject( 0L, name ), KonqSidebarTreeModule( parentTree ),
+ : TQObject( 0L, name ), KonqSidebarTreeModule( parentTree ),
m_dict( 349 ),
m_topLevelItem( 0L ),
m_dlg( 0L ),
@@ -51,10 +51,10 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
s_settings->readSettings( true );
}
- connect( s_settings, SIGNAL( settingsChanged() ), SLOT( slotSettingsChanged() ));
+ connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() ));
m_dict.setAutoDelete( true );
- m_currentTime = QDateTime::currentDateTime();
+ m_currentTime = TQDateTime::currentDateTime();
KConfig *kc = KGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" );
@@ -63,35 +63,35 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
KonqHistoryManager *manager = KonqHistoryManager::kself();
- connect( manager, SIGNAL( loadingFinished() ), SLOT( slotCreateItems() ));
- connect( manager, SIGNAL( cleared() ), SLOT( clear() ));
+ connect( manager, TQT_SIGNAL( loadingFinished() ), TQT_SLOT( slotCreateItems() ));
+ connect( manager, TQT_SIGNAL( cleared() ), TQT_SLOT( clear() ));
- connect( manager, SIGNAL( entryAdded( const KonqHistoryEntry * ) ),
- SLOT( slotEntryAdded( const KonqHistoryEntry * ) ));
- connect( manager, SIGNAL( entryRemoved( const KonqHistoryEntry *) ),
- SLOT( slotEntryRemoved( const KonqHistoryEntry *) ));
+ connect( manager, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * ) ),
+ TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * ) ));
+ connect( manager, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry *) ),
+ TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry *) ));
- connect( parentTree, SIGNAL( expanded( QListViewItem * )),
- SLOT( slotItemExpanded( QListViewItem * )));
+ connect( parentTree, TQT_SIGNAL( expanded( TQListViewItem * )),
+ TQT_SLOT( slotItemExpanded( TQListViewItem * )));
m_collection = new KActionCollection( this, "history actions" );
(void) new KAction( i18n("New &Window"), "window_new", 0, this,
- SLOT( slotNewWindow() ), m_collection, "open_new");
+ TQT_SLOT( slotNewWindow() ), m_collection, "open_new");
(void) new KAction( i18n("&Remove Entry"), "editdelete", 0, this,
- SLOT( slotRemoveEntry() ), m_collection, "remove");
+ TQT_SLOT( slotRemoveEntry() ), m_collection, "remove");
(void) new KAction( i18n("C&lear History"), "history_clear", 0, this,
- SLOT( slotClearHistory() ), m_collection, "clear");
+ TQT_SLOT( slotClearHistory() ), m_collection, "clear");
(void) new KAction( i18n("&Preferences..."), "configure", 0, this,
- SLOT( slotPreferences()), m_collection, "preferences");
+ TQT_SLOT( slotPreferences()), m_collection, "preferences");
KRadioAction *sort;
sort = new KRadioAction( i18n("By &Name"), 0, this,
- SLOT( slotSortByName() ), m_collection, "byName");
+ TQT_SLOT( slotSortByName() ), m_collection, "byName");
sort->setExclusiveGroup("SortGroup");
sort->setChecked( m_sortsByName );
sort = new KRadioAction( i18n("By &Date"), 0, this,
- SLOT( slotSortByDate() ), m_collection, "byDate");
+ TQT_SLOT( slotSortByDate() ), m_collection, "byDate");
sort->setExclusiveGroup("SortGroup");
sort->setChecked( !m_sortsByName );
@@ -104,7 +104,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
KonqSidebarHistoryModule::~KonqSidebarHistoryModule()
{
HistoryItemIterator it( m_dict );
- QStringList openGroups;
+ TQStringList openGroups;
while ( it.current() ) {
if ( it.current()->isOpen() )
openGroups.append( it.currentKey() );
@@ -125,14 +125,14 @@ void KonqSidebarHistoryModule::slotSettingsChanged()
void KonqSidebarHistoryModule::slotCreateItems()
{
- QApplication::setOverrideCursor( KCursor::waitCursor() );
+ TQApplication::setOverrideCursor( KCursor::waitCursor() );
clear();
KonqSidebarHistoryItem *item;
KonqHistoryEntry *entry;
KonqHistoryList entries( KonqHistoryManager::kself()->entries() );
KonqHistoryIterator it( entries );
- m_currentTime = QDateTime::currentDateTime();
+ m_currentTime = TQDateTime::currentDateTime();
// the group item and the item of the serverroot '/' get a fav-icon
// if available. All others get the protocol icon.
@@ -145,8 +145,8 @@ void KonqSidebarHistoryModule::slotCreateItems()
KConfig *kc = KGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" );
- QStringList openGroups = kc->readListEntry("OpenGroups");
- QStringList::Iterator it2 = openGroups.begin();
+ TQStringList openGroups = kc->readListEntry("OpenGroups");
+ TQStringList::Iterator it2 = openGroups.begin();
KonqSidebarHistoryGroupItem *group;
while ( it2 != openGroups.end() ) {
group = m_dict.find( *it2 );
@@ -156,7 +156,7 @@ void KonqSidebarHistoryModule::slotCreateItems()
++it2;
}
- QApplication::restoreOverrideCursor();
+ TQApplication::restoreOverrideCursor();
m_initialized = true;
}
@@ -171,7 +171,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry )
if ( !m_initialized )
return;
- m_currentTime = QDateTime::currentDateTime();
+ m_currentTime = TQDateTime::currentDateTime();
KonqSidebarHistoryGroupItem *group = getGroupItem( entry->url );
KonqSidebarHistoryItem *item = group->findChild( entry );
if ( !item )
@@ -179,7 +179,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry )
else
item->update( entry );
- // QListView scrolls when calling sort(), so we have to hack around that
+ // TQListView scrolls when calling sort(), so we have to hack around that
// (we don't want no scrolling every time an entry is added)
KonqSidebarTree *t = tree();
t->lockScrolling( true );
@@ -194,7 +194,7 @@ void KonqSidebarHistoryModule::slotEntryRemoved( const KonqHistoryEntry *entry )
if ( !m_initialized )
return;
- QString groupKey = groupForURL( entry->url );
+ TQString groupKey = groupForURL( entry->url );
KonqSidebarHistoryGroupItem *group = m_dict.find( groupKey );
if ( !group )
return;
@@ -211,7 +211,7 @@ void KonqSidebarHistoryModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it
}
bool KonqSidebarHistoryModule::handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *,
- const QPoint& pos )
+ const TQPoint& pos )
{
showPopupMenu( ModuleContextMenu, pos );
return true;
@@ -219,16 +219,16 @@ bool KonqSidebarHistoryModule::handleTopLevelContextMenu( KonqSidebarTreeTopLeve
void KonqSidebarHistoryModule::showPopupMenu()
{
- showPopupMenu( EntryContextMenu | ModuleContextMenu, QCursor::pos() );
+ showPopupMenu( EntryContextMenu | ModuleContextMenu, TQCursor::pos() );
}
-void KonqSidebarHistoryModule::showPopupMenu( int which, const QPoint& pos )
+void KonqSidebarHistoryModule::showPopupMenu( int which, const TQPoint& pos )
{
- QPopupMenu *sortMenu = new QPopupMenu;
+ TQPopupMenu *sortMenu = new QPopupMenu;
m_collection->action("byName")->plug( sortMenu );
m_collection->action("byDate")->plug( sortMenu );
- QPopupMenu *menu = new QPopupMenu;
+ TQPopupMenu *menu = new QPopupMenu;
if ( which & EntryContextMenu )
{
@@ -252,7 +252,7 @@ void KonqSidebarHistoryModule::slotNewWindow()
{
kdDebug(1201)<<"void KonqSidebarHistoryModule::slotNewWindow()"<<endl;
- QListViewItem *item = tree()->selectedItem();
+ TQListViewItem *item = tree()->selectedItem();
KonqSidebarHistoryItem *hi = dynamic_cast<KonqSidebarHistoryItem*>( item );
if ( hi )
{
@@ -263,7 +263,7 @@ void KonqSidebarHistoryModule::slotNewWindow()
void KonqSidebarHistoryModule::slotRemoveEntry()
{
- QListViewItem *item = tree()->selectedItem();
+ TQListViewItem *item = tree()->selectedItem();
KonqSidebarHistoryItem *hi = dynamic_cast<KonqSidebarHistoryItem*>( item );
if ( hi ) // remove a single entry
KonqHistoryManager::kself()->emitRemoveFromHistory( hi->externalURL());
@@ -303,7 +303,7 @@ void KonqSidebarHistoryModule::sortingChanged()
kc->sync();
}
-void KonqSidebarHistoryModule::slotItemExpanded( QListViewItem *item )
+void KonqSidebarHistoryModule::slotItemExpanded( TQListViewItem *item )
{
if ( item == m_topLevelItem && !m_initialized )
slotCreateItems();
@@ -323,12 +323,12 @@ void KonqSidebarHistoryModule::groupOpened( KonqSidebarHistoryGroupItem *item, b
KonqSidebarHistoryGroupItem * KonqSidebarHistoryModule::getGroupItem( const KURL& url )
{
- const QString& groupKey = groupForURL( url );
+ const TQString& groupKey = groupForURL( url );
KonqSidebarHistoryGroupItem *group = m_dict.find( groupKey );
if ( !group ) {
group = new KonqSidebarHistoryGroupItem( url, m_topLevelItem );
- QString icon = KonqFavIconMgr::iconForURL( url.url() );
+ TQString icon = KonqFavIconMgr::iconForURL( url.url() );
if ( icon.isEmpty() )
group->setPixmap( 0, m_folderClosed );
else
diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h
index 30295fc3f..752ff57fd 100644
--- a/konqueror/sidebar/trees/history_module/history_module.h
+++ b/konqueror/sidebar/trees/history_module/history_module.h
@@ -19,10 +19,10 @@
#ifndef HISTORY_MODULE_H
#define HISTORY_MODULE_H
-#include <qdatetime.h>
-#include <qobject.h>
-#include <qdict.h>
-#include <qpixmap.h>
+#include <tqdatetime.h>
+#include <tqobject.h>
+#include <tqdict.h>
+#include <tqpixmap.h>
#include <kglobal.h>
#include <klocale.h>
@@ -36,7 +36,7 @@ class KonqSidebarHistorySettings;
class KonqSidebarTree;
class KonqSidebarTreeItem;
-class KonqSidebarHistoryModule : public QObject, public KonqSidebarTreeModule
+class KonqSidebarHistoryModule : public TQObject, public KonqSidebarTreeModule
{
Q_OBJECT
@@ -50,18 +50,18 @@ public:
virtual ~KonqSidebarHistoryModule();
virtual void addTopLevelItem( KonqSidebarTreeTopLevelItem * item );
- virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *item, const QPoint& pos );
+ virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *item, const TQPoint& pos );
- void showPopupMenu( int which, const QPoint& pos );
+ void showPopupMenu( int which, const TQPoint& pos );
// called by the items
void showPopupMenu();
void groupOpened( KonqSidebarHistoryGroupItem *item, bool open );
- const QDateTime& currentTime() const { return m_currentTime; }
+ const TQDateTime& currentTime() const { return m_currentTime; }
bool sortsByName() const { return m_sortsByName; }
- static QString groupForURL( const KURL& url ) {
- static const QString& misc = KGlobal::staticQString(i18n("Miscellaneous"));
+ static TQString groupForURL( const KURL& url ) {
+ static const TQString& misc = KGlobal::staticQString(i18n("Miscellaneous"));
return url.host().isEmpty() ? misc : url.host();
}
@@ -78,7 +78,7 @@ private slots:
void slotPreferences();
void slotSettingsChanged();
- void slotItemExpanded( QListViewItem * );
+ void slotItemExpanded( TQListViewItem * );
void slotSortByName();
void slotSortByDate();
@@ -89,19 +89,19 @@ private:
KonqSidebarHistoryGroupItem *getGroupItem( const KURL& url );
void sortingChanged();
- typedef QDictIterator<KonqSidebarHistoryGroupItem> HistoryItemIterator;
- QDict<KonqSidebarHistoryGroupItem> m_dict;
+ typedef TQDictIterator<KonqSidebarHistoryGroupItem> HistoryItemIterator;
+ TQDict<KonqSidebarHistoryGroupItem> m_dict;
KonqSidebarTreeTopLevelItem * m_topLevelItem;
KActionCollection *m_collection;
KDialogBase *m_dlg;
- QPixmap m_folderClosed;
- QPixmap m_folderOpen;
+ TQPixmap m_folderClosed;
+ TQPixmap m_folderOpen;
bool m_initialized;
bool m_sortsByName;
- QDateTime m_currentTime; // used for sorting the items by date
+ TQDateTime m_currentTime; // used for sorting the items by date
static KonqSidebarHistorySettings *s_settings;
};
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index ed8bc7756..6871415a0 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -6,22 +6,22 @@
#include "history_settings.h"
-KonqSidebarHistorySettings::KonqSidebarHistorySettings( QObject *parent, const char *name )
- : QObject( parent, name ),
+KonqSidebarHistorySettings::KonqSidebarHistorySettings( TQObject *parent, const char *name )
+ : TQObject( parent, name ),
DCOPObject( "KonqSidebarHistorySettings" )
{
m_fontOlderThan.setItalic( true ); // default
}
KonqSidebarHistorySettings::KonqSidebarHistorySettings()
- : QObject(),
+ : TQObject(),
DCOPObject( "KonqSidebarHistorySettings" )
{
m_fontOlderThan.setItalic( true ); // default
}
KonqSidebarHistorySettings::KonqSidebarHistorySettings( const KonqSidebarHistorySettings& s )
- : QObject(),
+ : TQObject(),
DCOPObject( "KonqSidebarHistorySettings" )
{
m_valueYoungerThan = s.m_valueYoungerThan;
@@ -43,7 +43,7 @@ KonqSidebarHistorySettings::~KonqSidebarHistorySettings()
void KonqSidebarHistorySettings::readSettings(bool global)
{
KConfig *config;
- QString oldgroup;
+ TQString oldgroup;
if (global) {
config = KGlobal::config();
@@ -56,9 +56,9 @@ void KonqSidebarHistorySettings::readSettings(bool global)
m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 );
m_valueOlderThan = config->readNumEntry("Value olderThan", 2 );
- QString minutes = QString::fromLatin1("minutes");
- QString days = QString::fromLatin1("days");
- QString metric = config->readEntry("Metric youngerThan", days );
+ TQString minutes = TQString::fromLatin1("minutes");
+ TQString days = TQString::fromLatin1("days");
+ TQString metric = config->readEntry("Metric youngerThan", days );
m_metricYoungerThan = (metric == days) ? DAYS : MINUTES;
metric = config->readEntry("Metric olderThan", days );
m_metricOlderThan = (metric == days) ? DAYS : MINUTES;
@@ -83,8 +83,8 @@ void KonqSidebarHistorySettings::applySettings()
config->writeEntry("Value youngerThan", m_valueYoungerThan );
config->writeEntry("Value olderThan", m_valueOlderThan );
- QString minutes = QString::fromLatin1("minutes");
- QString days = QString::fromLatin1("days");
+ TQString minutes = TQString::fromLatin1("minutes");
+ TQString days = TQString::fromLatin1("days");
config->writeEntry("Metric youngerThan", m_metricYoungerThan == DAYS ?
days : minutes );
config->writeEntry("Metric olderThan", m_metricOlderThan == DAYS ?
@@ -99,7 +99,7 @@ void KonqSidebarHistorySettings::applySettings()
// notify konqueror instances about the new configuration
kapp->dcopClient()->send( "konqueror*", "KonqSidebarHistorySettings",
- "notifySettingsChanged()", QByteArray() );
+ "notifySettingsChanged()", TQByteArray() );
}
void KonqSidebarHistorySettings::notifySettingsChanged()
diff --git a/konqueror/sidebar/trees/history_module/history_settings.h b/konqueror/sidebar/trees/history_module/history_settings.h
index 21bcd01db..7b7d75006 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.h
+++ b/konqueror/sidebar/trees/history_module/history_settings.h
@@ -20,12 +20,12 @@
#ifndef HISTORY_SETTINGS_H
#define HISTORY_SETTINGS_H
-#include <qfont.h>
-#include <qobject.h>
+#include <tqfont.h>
+#include <tqobject.h>
#include <dcopobject.h>
-class KonqSidebarHistorySettings : public QObject, public DCOPObject
+class KonqSidebarHistorySettings : public TQObject, public DCOPObject
{
K_DCOP
Q_OBJECT
@@ -33,7 +33,7 @@ class KonqSidebarHistorySettings : public QObject, public DCOPObject
public:
enum { MINUTES, DAYS };
- KonqSidebarHistorySettings( QObject *parent, const char *name );
+ KonqSidebarHistorySettings( TQObject *parent, const char *name );
virtual ~KonqSidebarHistorySettings();
void readSettings(bool global);
@@ -47,8 +47,8 @@ public:
bool m_detailedTips;
- QFont m_fontYoungerThan;
- QFont m_fontOlderThan;
+ TQFont m_fontYoungerThan;
+ TQFont m_fontOlderThan;
signals:
void settingsChanged();
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index e4b31b232..ccedf65d9 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -20,11 +20,11 @@
* along with this program; if not, write to the Free Software
*/
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
#include <dcopclient.h>
#include <dcopref.h>
@@ -45,10 +45,10 @@
#include "kcmhistory.h"
#include "history_settings.h"
-typedef KGenericFactory<HistorySidebarConfig, QWidget > KCMHistoryFactory;
+typedef KGenericFactory<HistorySidebarConfig, TQWidget > KCMHistoryFactory;
K_EXPORT_COMPONENT_FACTORY (kcm_history, KCMHistoryFactory("kcmhistory") )
-HistorySidebarConfig::HistorySidebarConfig( QWidget *parent, const char* name, const QStringList & )
+HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, const TQStringList & )
: KCModule (KCMHistoryFactory::instance(), parent, name)
{
KGlobal::locale()->insertCatalogue("konqueror");
@@ -56,7 +56,7 @@ HistorySidebarConfig::HistorySidebarConfig( QWidget *parent, const char* name, c
m_settings = new KonqSidebarHistorySettings( 0, "history settings" );
m_settings->readSettings( false );
- QVBoxLayout *topLayout = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
dialog = new KonqSidebarHistoryDlg(this);
dialog->spinEntries->setRange( 0, INT_MAX, 1, false );
@@ -75,33 +75,33 @@ HistorySidebarConfig::HistorySidebarConfig( QWidget *parent, const char* name, c
dialog->comboOlder->insertItem( i18n("Days"),
KonqSidebarHistorySettings::DAYS );
- connect( dialog->cbExpire, SIGNAL( toggled( bool )),
- dialog->spinExpire, SLOT( setEnabled( bool )));
- connect( dialog->spinExpire, SIGNAL( valueChanged( int )),
- this, SLOT( slotExpireChanged( int )));
-
- connect( dialog->spinNewer, SIGNAL( valueChanged( int )),
- SLOT( slotNewerChanged( int )));
- connect( dialog->spinOlder, SIGNAL( valueChanged( int )),
- SLOT( slotOlderChanged( int )));
-
- connect( dialog->btnFontNewer, SIGNAL( clicked() ),
- SLOT( slotGetFontNewer() ));
- connect( dialog->btnFontOlder, SIGNAL( clicked() ),
- SLOT( slotGetFontOlder() ));
- connect( dialog->btnClearHistory, SIGNAL( clicked() ),
- SLOT( slotClearHistory() ));
-
- connect( dialog->cbDetailedTips, SIGNAL( toggled( bool )),
- SLOT( configChanged() ));
- connect( dialog->cbExpire, SIGNAL( toggled( bool )),
- SLOT( configChanged() ));
- connect( dialog->spinEntries, SIGNAL( valueChanged( int )),
- SLOT( configChanged() ));
- connect( dialog->comboNewer, SIGNAL( activated( int )),
- SLOT( configChanged() ));
- connect( dialog->comboOlder, SIGNAL( activated( int )),
- SLOT( configChanged() ));
+ connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )),
+ dialog->spinExpire, TQT_SLOT( setEnabled( bool )));
+ connect( dialog->spinExpire, TQT_SIGNAL( valueChanged( int )),
+ this, TQT_SLOT( slotExpireChanged( int )));
+
+ connect( dialog->spinNewer, TQT_SIGNAL( valueChanged( int )),
+ TQT_SLOT( slotNewerChanged( int )));
+ connect( dialog->spinOlder, TQT_SIGNAL( valueChanged( int )),
+ TQT_SLOT( slotOlderChanged( int )));
+
+ connect( dialog->btnFontNewer, TQT_SIGNAL( clicked() ),
+ TQT_SLOT( slotGetFontNewer() ));
+ connect( dialog->btnFontOlder, TQT_SIGNAL( clicked() ),
+ TQT_SLOT( slotGetFontOlder() ));
+ connect( dialog->btnClearHistory, TQT_SIGNAL( clicked() ),
+ TQT_SLOT( slotClearHistory() ));
+
+ connect( dialog->cbDetailedTips, TQT_SIGNAL( toggled( bool )),
+ TQT_SLOT( configChanged() ));
+ connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )),
+ TQT_SLOT( configChanged() ));
+ connect( dialog->spinEntries, TQT_SIGNAL( valueChanged( int )),
+ TQT_SLOT( configChanged() ));
+ connect( dialog->comboNewer, TQT_SIGNAL( activated( int )),
+ TQT_SLOT( configChanged() ));
+ connect( dialog->comboOlder, TQT_SIGNAL( activated( int )),
+ TQT_SLOT( configChanged() ));
dialog->show();
topLayout->add(dialog);
@@ -152,17 +152,17 @@ void HistorySidebarConfig::save()
config.writeEntry( "Maximum of History entries", count );
config.writeEntry( "Maximum age of History entries", age );
- QByteArray dataAge;
- QDataStream streamAge( dataAge, IO_WriteOnly );
+ TQByteArray dataAge;
+ TQDataStream streamAge( dataAge, IO_WriteOnly );
streamAge << age << "foo";
kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
- "notifyMaxAge(Q_UINT32, QCString)", dataAge );
+ "notifyMaxAge(Q_UINT32, TQCString)", dataAge );
- QByteArray dataCount;
- QDataStream streamCount( dataCount, IO_WriteOnly );
+ TQByteArray dataCount;
+ TQDataStream streamCount( dataCount, IO_WriteOnly );
streamCount << count << "foo";
kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
- "notifyMaxCount(Q_UINT32, QCString)", dataCount );
+ "notifyMaxCount(Q_UINT32, TQCString)", dataCount );
m_settings->m_valueYoungerThan = dialog->spinNewer->value();
m_settings->m_valueOlderThan = dialog->spinOlder->value();
@@ -194,14 +194,14 @@ void HistorySidebarConfig::defaults()
dialog->cbDetailedTips->setChecked( true );
- m_fontNewer = QFont();
+ m_fontNewer = TQFont();
m_fontNewer.setItalic( true );
- m_fontOlder = QFont();
+ m_fontOlder = TQFont();
emit changed(true);
}
-QString HistorySidebarConfig::quickHelp() const
+TQString HistorySidebarConfig::quickHelp() const
{
return i18n("<h1>History Sidebar</h1>"
" You can configure the history sidebar here.");
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.h b/konqueror/sidebar/trees/history_module/kcmhistory.h
index 5eaaf3a64..0e354af65 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.h
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.h
@@ -32,13 +32,13 @@ class HistorySidebarConfig : public KCModule
Q_OBJECT
public:
- HistorySidebarConfig( QWidget *parent=0, const char* name=0, const QStringList &list=QStringList() );
+ HistorySidebarConfig( TQWidget *parent=0, const char* name=0, const TQStringList &list=TQStringList() );
void load();
void save();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
private slots:
void configChanged();
@@ -53,8 +53,8 @@ private slots:
void slotClearHistory();
private:
- QFont m_fontNewer;
- QFont m_fontOlder;
+ TQFont m_fontNewer;
+ TQFont m_fontOlder;
KonqSidebarHistoryDlg* dialog;
KonqSidebarHistorySettings *m_settings;
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index e30e21ac9..8117d5223 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -20,12 +20,12 @@
#include "konq_sidebartreemodule.h"
-#include <qclipboard.h>
-#include <qcursor.h>
-#include <qdir.h>
-#include <qheader.h>
-#include <qpopupmenu.h>
-#include <qtimer.h>
+#include <tqclipboard.h>
+#include <tqcursor.h>
+#include <tqdir.h>
+#include <tqheader.h>
+#include <tqpopupmenu.h>
+#include <tqtimer.h>
#include <dcopclient.h>
#include <dcopref.h>
@@ -53,18 +53,18 @@
static const int autoOpenTimeout = 750;
-getModule KonqSidebarTree::getPluginFactory(QString name)
+getModule KonqSidebarTree::getPluginFactory(TQString name)
{
if (!pluginFactories.contains(name))
{
KLibLoader *loader = KLibLoader::self();
- QString libName = pluginInfo[name];
- KLibrary *lib = loader->library(QFile::encodeName(libName));
+ TQString libName = pluginInfo[name];
+ KLibrary *lib = loader->library(TQFile::encodeName(libName));
if (lib)
{
// get the create_ function
- QString factory = "create_" + libName;
- void *create = lib->symbol(QFile::encodeName(factory));
+ TQString factory = "create_" + libName;
+ void *create = lib->symbol(TQFile::encodeName(factory));
if (create)
{
getModule func = (getModule)create;
@@ -88,15 +88,15 @@ void KonqSidebarTree::loadModuleFactories()
pluginFactories.clear();
pluginInfo.clear();
KStandardDirs *dirs=KGlobal::dirs();
- QStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
+ TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
- for (QStringList::ConstIterator it=list.begin();it!=list.end();++it)
+ for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it)
{
KSimpleConfig ksc(*it);
ksc.setGroup("Desktop Entry");
- QString name = ksc.readEntry("X-KDE-TreeModule");
- QString libName = ksc.readEntry("X-KDE-TreeModule-Lib");
+ TQString name = ksc.readEntry("X-KDE-TreeModule");
+ TQString libName = ksc.readEntry("X-KDE-TreeModule-Lib");
if ((name.isEmpty()) || (libName.isEmpty()))
{kdWarning()<<"Bad Configuration file for a dirtree module "<<*it<<endl; continue;}
@@ -110,11 +110,11 @@ class KonqSidebarTree_Internal
{
public:
DropAcceptType m_dropMode;
- QStringList m_dropFormats;
+ TQStringList m_dropFormats;
};
-KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, QWidget *parentWidget, int virt, const QString& path )
+KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path )
: KListView( parentWidget ),
m_currentTopLevelItem( 0 ),
m_toolTip( this ),
@@ -130,46 +130,46 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, QWidget *parentWidge
viewport()->setAcceptDrops( true );
m_lstModules.setAutoDelete( true );
- setSelectionMode( QListView::Single );
+ setSelectionMode( TQListView::Single );
setDragEnabled(true);
m_part = parent;
- m_animationTimer = new QTimer( this );
- connect( m_animationTimer, SIGNAL( timeout() ),
- this, SLOT( slotAnimation() ) );
+ m_animationTimer = new TQTimer( this );
+ connect( m_animationTimer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( slotAnimation() ) );
m_currentBeforeDropItem = 0;
m_dropItem = 0;
m_bOpeningFirstChild=false;
- addColumn( QString::null );
+ addColumn( TQString::null );
header()->hide();
setTreeStepSize(15);
- m_autoOpenTimer = new QTimer( this );
- connect( m_autoOpenTimer, SIGNAL( timeout() ),
- this, SLOT( slotAutoOpenFolder() ) );
+ m_autoOpenTimer = new TQTimer( this );
+ connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( slotAutoOpenFolder() ) );
- connect( this, SIGNAL( doubleClicked( QListViewItem * ) ),
- this, SLOT( slotDoubleClicked( QListViewItem * ) ) );
- connect( this, SIGNAL( mouseButtonPressed(int, QListViewItem*, const QPoint&, int)),
- this, SLOT( slotMouseButtonPressed(int, QListViewItem*, const QPoint&, int)) );
- connect( this, SIGNAL( mouseButtonClicked( int, QListViewItem*, const QPoint&, int ) ),
- this, SLOT( slotMouseButtonClicked( int, QListViewItem*, const QPoint&, int ) ) );
- connect( this, SIGNAL( returnPressed( QListViewItem * ) ),
- this, SLOT( slotDoubleClicked( QListViewItem * ) ) );
- connect( this, SIGNAL( selectionChanged() ),
- this, SLOT( slotSelectionChanged() ) );
+ connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
+ this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
+ connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
+ this, TQT_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) );
+ connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ),
+ this, TQT_SLOT( slotMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) );
+ connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
+ this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
+ connect( this, TQT_SIGNAL( selectionChanged() ),
+ this, TQT_SLOT( slotSelectionChanged() ) );
- connect( this, SIGNAL(itemRenamed(QListViewItem*, const QString &, int)),
- this, SLOT(slotItemRenamed(QListViewItem*, const QString &, int)));
+ connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)),
+ this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int)));
/* assert( m_part->getInterfaces()->getInstance()->dirs );
- QString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */
+ TQString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */
// assert( KGlobal::dirs() );
-// QString dirtreeDir = part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" );
+// TQString dirtreeDir = part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" );
if (virt==VIRT_Folder)
{
@@ -190,7 +190,7 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, QWidget *parentWidge
m_bOpeningFirstChild = false;
}
- setFrameStyle( QFrame::ToolBarPanel | QFrame::Raised );
+ setFrameStyle( TQFrame::ToolBarPanel | TQFrame::Raised );
}
KonqSidebarTree::~KonqSidebarTree()
@@ -210,7 +210,7 @@ void KonqSidebarTree::itemDestructed( KonqSidebarTreeItem *item )
}
}
-void KonqSidebarTree::setDropFormats(const QStringList &formats)
+void KonqSidebarTree::setDropFormats(const TQStringList &formats)
{
d->m_dropFormats = formats;
}
@@ -244,7 +244,7 @@ void KonqSidebarTree::followURL( const KURL &url )
}
kdDebug(1201) << "KonqDirTree::followURL: " << url.url() << endl;
- QPtrListIterator<KonqSidebarTreeTopLevelItem> topItem ( m_topLevelItems );
+ TQPtrListIterator<KonqSidebarTreeTopLevelItem> topItem ( m_topLevelItems );
for (; topItem.current(); ++topItem )
{
if ( topItem.current()->externalURL().isParentOf( url ) )
@@ -256,7 +256,7 @@ void KonqSidebarTree::followURL( const KURL &url )
kdDebug(1201) << "KonqDirTree::followURL: Not found" << endl;
}
-void KonqSidebarTree::contentsDragEnterEvent( QDragEnterEvent *ev )
+void KonqSidebarTree::contentsDragEnterEvent( TQDragEnterEvent *ev )
{
m_dropItem = 0;
m_currentBeforeDropItem = selectedItem();
@@ -267,9 +267,9 @@ void KonqSidebarTree::contentsDragEnterEvent( QDragEnterEvent *ev )
m_lstDropFormats.append( ev->format( i ) );
}
-void KonqSidebarTree::contentsDragMoveEvent( QDragMoveEvent *e )
+void KonqSidebarTree::contentsDragMoveEvent( TQDragMoveEvent *e )
{
- QListViewItem *item = itemAt( contentsToViewport( e->pos() ) );
+ TQListViewItem *item = itemAt( contentsToViewport( e->pos() ) );
// Accept drops on the background, if URLs
if ( !item && m_lstDropFormats.contains("text/uri-list") )
@@ -308,7 +308,7 @@ void KonqSidebarTree::contentsDragMoveEvent( QDragMoveEvent *e )
}
}
-void KonqSidebarTree::contentsDragLeaveEvent( QDragLeaveEvent *ev )
+void KonqSidebarTree::contentsDragLeaveEvent( TQDragLeaveEvent *ev )
{
// Restore the current item to what it was before the dragging (#17070)
if ( m_currentBeforeDropItem )
@@ -324,7 +324,7 @@ void KonqSidebarTree::contentsDragLeaveEvent( QDragLeaveEvent *ev )
}
}
-void KonqSidebarTree::contentsDropEvent( QDropEvent *ev )
+void KonqSidebarTree::contentsDropEvent( TQDropEvent *ev )
{
if (d->m_dropMode == SidebarTreeMode) {
m_autoOpenTimer->stop();
@@ -352,23 +352,23 @@ void KonqSidebarTree::contentsDropEvent( QDropEvent *ev )
}
}
-static QString findUniqueFilename(const QString &path, QString filename)
+static TQString findUniqueFilename(const TQString &path, TQString filename)
{
if (filename.endsWith(".desktop"))
filename.truncate(filename.length()-8);
- QString name = filename;
+ TQString name = filename;
int n = 2;
- while(QFile::exists(path + filename + ".desktop"))
+ while(TQFile::exists(path + filename + ".desktop"))
{
- filename = QString("%2_%1").arg(n++).arg(name);
+ filename = TQString("%2_%1").arg(n++).arg(name);
}
return path+filename+".desktop";
}
void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url)
{
- QString path;
+ TQString path;
if (item)
path = item->path();
else
@@ -378,23 +378,23 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url
if (url.isLocalFile() && url.fileName().endsWith(".desktop"))
{
- QString filename = findUniqueFilename(path, url.fileName());
+ TQString filename = findUniqueFilename(path, url.fileName());
destUrl.setPath(filename);
KIO::NetAccess::copy(url, destUrl, this);
}
else
{
- QString name = url.host();
+ TQString name = url.host();
if (name.isEmpty())
name = url.fileName();
- QString filename = findUniqueFilename(path, name);
+ TQString filename = findUniqueFilename(path, name);
destUrl.setPath(filename);
KDesktopFile cfg(filename);
cfg.writeEntry("Encoding", "UTF-8");
cfg.writeEntry("Type","Link");
cfg.writeEntry("URL", url.url());
- QString icon = "folder";
+ TQString icon = "folder";
if (!url.isLocalFile())
icon = KMimeType::favIconForURL(url);
if (icon.isEmpty())
@@ -413,7 +413,7 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url
item->setOpen(true);
}
-bool KonqSidebarTree::acceptDrag(QDropEvent* e) const
+bool KonqSidebarTree::acceptDrag(TQDropEvent* e) const
{
// for KListViewMode...
for( int i = 0; e->format( i ); i++ )
@@ -422,31 +422,31 @@ bool KonqSidebarTree::acceptDrag(QDropEvent* e) const
return false;
}
-QDragObject* KonqSidebarTree::dragObject()
+TQDragObject* KonqSidebarTree::dragObject()
{
KonqSidebarTreeItem* item = static_cast<KonqSidebarTreeItem *>( selectedItem() );
if ( !item )
return 0;
- QDragObject* drag = item->dragObject( viewport(), false );
+ TQDragObject* drag = item->dragObject( viewport(), false );
if ( !drag )
return 0;
- const QPixmap *pix = item->pixmap(0);
+ const TQPixmap *pix = item->pixmap(0);
if ( pix && drag->pixmap().isNull() )
drag->setPixmap( *pix );
return drag;
}
-void KonqSidebarTree::leaveEvent( QEvent *e )
+void KonqSidebarTree::leaveEvent( TQEvent *e )
{
KListView::leaveEvent( e );
-// emitStatusBarText( QString::null );
+// emitStatusBarText( TQString::null );
}
-void KonqSidebarTree::slotDoubleClicked( QListViewItem *item )
+void KonqSidebarTree::slotDoubleClicked( TQListViewItem *item )
{
//kdDebug(1201) << "KonqSidebarTree::slotDoubleClicked " << item << endl;
if ( !item )
@@ -459,7 +459,7 @@ void KonqSidebarTree::slotDoubleClicked( QListViewItem *item )
item->setOpen( !item->isOpen() );
}
-void KonqSidebarTree::slotExecuted( QListViewItem *item )
+void KonqSidebarTree::slotExecuted( TQListViewItem *item )
{
kdDebug(1201) << "KonqSidebarTree::slotExecuted " << item << endl;
if ( !item )
@@ -479,7 +479,7 @@ void KonqSidebarTree::slotExecuted( QListViewItem *item )
openURLRequest( externalURL, args );
}
-void KonqSidebarTree::slotMouseButtonPressed( int _button, QListViewItem* _item, const QPoint&, int col )
+void KonqSidebarTree::slotMouseButtonPressed( int _button, TQListViewItem* _item, const TQPoint&, int col )
{
KonqSidebarTreeItem * item = static_cast<KonqSidebarTreeItem*>( _item );
if (_button == RightButton)
@@ -492,7 +492,7 @@ void KonqSidebarTree::slotMouseButtonPressed( int _button, QListViewItem* _item,
}
}
-void KonqSidebarTree::slotMouseButtonClicked(int _button, QListViewItem* _item, const QPoint&, int col)
+void KonqSidebarTree::slotMouseButtonClicked(int _button, TQListViewItem* _item, const TQPoint&, int col)
{
KonqSidebarTreeItem * item = static_cast<KonqSidebarTreeItem*>(_item);
if(_item && col < 2)
@@ -554,7 +554,7 @@ void KonqSidebarTree::FilesAdded( const KURL & dir )
kdDebug(1201) << "KonqSidebarTree::FilesAdded " << dir.url() << endl;
if ( m_dirtreeDir.dir.isParentOf( dir ) )
// We use a timer in case of DCOP re-entrance..
- QTimer::singleShot( 0, this, SLOT( rescanConfiguration() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) );
}
void KonqSidebarTree::FilesRemoved( const KURL::List & urls )
@@ -565,7 +565,7 @@ void KonqSidebarTree::FilesRemoved( const KURL::List & urls )
//kdDebug(1201) << "KonqSidebarTree::FilesRemoved " << (*it).prettyURL() << endl;
if ( m_dirtreeDir.dir.isParentOf( *it ) )
{
- QTimer::singleShot( 0, this, SLOT( rescanConfiguration() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) );
kdDebug(1201) << "KonqSidebarTree::FilesRemoved done" << endl;
return;
}
@@ -579,17 +579,17 @@ void KonqSidebarTree::FilesChanged( const KURL::List & urls )
FilesRemoved( urls );
}
-void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path, bool isRoot )
+void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path, bool isRoot )
{
- QDir dir( path );
+ TQDir dir( path );
if ( !dir.isReadable() )
return;
kdDebug(1201) << "scanDir " << path << endl;
- QStringList entries = dir.entryList( QDir::Files );
- QStringList dirEntries = dir.entryList( QDir::Dirs | QDir::NoSymLinks );
+ TQStringList entries = dir.entryList( TQDir::Files );
+ TQStringList dirEntries = dir.entryList( TQDir::Dirs | TQDir::NoSymLinks );
dirEntries.remove( "." );
dirEntries.remove( ".." );
@@ -606,7 +606,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path,
// Version 5 includes the audiocd browser
// Version 6 includes the printmanager and lan browser
const int currentVersion = 6;
- QString key = QString::fromLatin1("X-KDE-DirTreeVersionNumber");
+ TQString key = TQString::fromLatin1("X-KDE-DirTreeVersionNumber");
KSimpleConfig versionCfg( path + "/.directory" );
int versionNumber = versionCfg.readNumEntry( key, 1 );
kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl;
@@ -620,64 +620,64 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path,
if (copyConfig)
{
// We will copy over the configuration for the dirtree, from the global directory
- QStringList dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/");
+ TQStringList dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/");
-// QString dirtree_dir = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/").last(); // most global
+// TQString dirtree_dir = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/").last(); // most global
// kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir=" << dirtree_dir << endl;
/*
// debug code
- QStringList blah = m_part->getInterfaces->getInstance()->dirs()->dirs()->findDirs( "data", "konqueror/dirtree" );
- QStringList::ConstIterator eIt = blah.begin();
- QStringList::ConstIterator eEnd = blah.end();
+ TQStringList blah = m_part->getInterfaces->getInstance()->dirs()->dirs()->findDirs( "data", "konqueror/dirtree" );
+ TQStringList::ConstIterator eIt = blah.begin();
+ TQStringList::ConstIterator eEnd = blah.end();
for (; eIt != eEnd; ++eIt )
kdDebug(1201) << "KonqSidebarTree::scanDir findDirs got me " << *eIt << endl;
// end debug code
*/
- for (QStringList::const_iterator ddit=dirtree_dirs.begin();ddit!=dirtree_dirs.end();++ddit) {
- QString dirtree_dir=*ddit;
+ for (TQStringList::const_iterator ddit=dirtree_dirs.begin();ddit!=dirtree_dirs.end();++ddit) {
+ TQString dirtree_dir=*ddit;
if (dirtree_dir==path) continue;
// if ( !dirtree_dir.isEmpty() && dirtree_dir != path )
{
- QDir globalDir( dirtree_dir );
+ TQDir globalDir( dirtree_dir );
Q_ASSERT( globalDir.isReadable() );
// Only copy the entries that don't exist yet in the local dir
- QStringList globalDirEntries = globalDir.entryList();
- QStringList::ConstIterator eIt = globalDirEntries.begin();
- QStringList::ConstIterator eEnd = globalDirEntries.end();
+ TQStringList globalDirEntries = globalDir.entryList();
+ TQStringList::ConstIterator eIt = globalDirEntries.begin();
+ TQStringList::ConstIterator eEnd = globalDirEntries.end();
for (; eIt != eEnd; ++eIt )
{
//kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl;
if ( *eIt != "." && *eIt != ".."
&& !entries.contains( *eIt ) && !dirEntries.contains( *eIt ) )
{ // we don't have that one yet -> copy it.
- QString cp("cp -R -- ");
+ TQString cp("cp -R -- ");
cp += KProcess::quote(dirtree_dir + *eIt);
cp += " ";
cp += KProcess::quote(path);
kdDebug(1201) << "KonqSidebarTree::scanDir executing " << cp << endl;
- ::system( QFile::encodeName(cp) );
+ ::system( TQFile::encodeName(cp) );
}
}
}
}
- // hack to make QDir refresh the lists
+ // hack to make TQDir refresh the lists
dir.setPath(path);
- entries = dir.entryList( QDir::Files );
- dirEntries = dir.entryList( QDir::Dirs );
+ entries = dir.entryList( TQDir::Files );
+ dirEntries = dir.entryList( TQDir::Dirs );
dirEntries.remove( "." );
dirEntries.remove( ".." );
}
}
- QStringList::ConstIterator eIt = entries.begin();
- QStringList::ConstIterator eEnd = entries.end();
+ TQStringList::ConstIterator eIt = entries.begin();
+ TQStringList::ConstIterator eEnd = entries.end();
for (; eIt != eEnd; ++eIt )
{
- QString filePath = QString( *eIt ).prepend( path );
+ TQString filePath = TQString( *eIt ).prepend( path );
KURL u;
u.setPath( filePath );
if ( KMimeType::findByURL( u, 0, true )->name() == "application/x-desktop" )
@@ -689,7 +689,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path,
for (; eIt != eEnd; eIt++ )
{
- QString newPath = QString( path ).append( *eIt ).append( '/' );
+ TQString newPath = TQString( path ).append( *eIt ).append( '/' );
if ( newPath == KGlobalSettings::autostartPath() )
continue;
@@ -698,18 +698,18 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path,
}
}
-void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const QString &path )
+void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const TQString &path )
{
- QDir dir( path );
- QString name = dir.dirName();
- QString icon = "folder";
+ TQDir dir( path );
+ TQString name = dir.dirName();
+ TQString icon = "folder";
bool open = false;
kdDebug(1201) << "Scanning " << path << endl;
- QString dotDirectoryFile = QString( path ).append( "/.directory" );
+ TQString dotDirectoryFile = TQString( path ).append( "/.directory" );
- if ( QFile::exists( dotDirectoryFile ) )
+ if ( TQFile::exists( dotDirectoryFile ) )
{
kdDebug(1201) << "Reading the .directory" << endl;
KSimpleConfig cfg( dotDirectoryFile, true );
@@ -745,15 +745,15 @@ void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const QStr
item->setExpandable( false );
}
-void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const QString &filename )
+void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const TQString &filename )
{
KDesktopFile cfg( filename, true );
cfg.setDollarExpansion(true);
- QFileInfo inf( filename );
+ TQFileInfo inf( filename );
- QString path = filename;
- QString name = KIO::decodeFileName( inf.fileName() );
+ TQString path = filename;
+ TQString name = KIO::decodeFileName( inf.fileName() );
if ( name.length() > 8 && name.right( 8 ) == ".desktop" )
name.truncate( name.length() - 8 );
if ( name.length() > 7 && name.right( 7 ) == ".kdelnk" )
@@ -764,8 +764,8 @@ void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const QStr
// Here's where we need to create the right module...
// ### TODO: make this KTrader/KLibrary based.
- QString moduleName = cfg.readEntry( "X-KDE-TreeModule" );
- QString showHidden=cfg.readEntry("X-KDE-TreeModule-ShowHidden");
+ TQString moduleName = cfg.readEntry( "X-KDE-TreeModule" );
+ TQString showHidden=cfg.readEntry("X-KDE-TreeModule-ShowHidden");
if (moduleName.isEmpty()) moduleName="Directory";
kdDebug(1201) << "##### Loading module: " << moduleName << " file: " << filename << endl;
@@ -806,7 +806,7 @@ void KonqSidebarTree::slotAnimation()
for (; it != end; ++it )
{
uint & iconNumber = it.data().iconNumber;
- QString icon = QString::fromLatin1( it.data().iconBaseName ).append( QString::number( iconNumber ) );
+ TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
it.key()->setPixmap( 0, SmallIcon( icon));
iconNumber++;
@@ -816,9 +816,9 @@ void KonqSidebarTree::slotAnimation()
}
-void KonqSidebarTree::startAnimation( KonqSidebarTreeItem * item, const char * iconBaseName, uint iconCount, const QPixmap * originalPixmap )
+void KonqSidebarTree::startAnimation( KonqSidebarTreeItem * item, const char * iconBaseName, uint iconCount, const TQPixmap * originalPixmap )
{
- const QPixmap *pix = originalPixmap ? originalPixmap : item->pixmap(0);
+ const TQPixmap *pix = originalPixmap ? originalPixmap : item->pixmap(0);
if (pix)
{
m_mapCurrentOpeningFolders.insert( item, AnimationInfo( iconBaseName, iconCount, *pix ) );
@@ -851,7 +851,7 @@ void KonqSidebarTree::setContentsPos( int x, int y )
KListView::setContentsPos( x, y );
}
-void KonqSidebarTree::slotItemRenamed(QListViewItem* item, const QString &name, int col)
+void KonqSidebarTree::slotItemRenamed(TQListViewItem* item, const TQString &name, int col)
{
Q_ASSERT(col==0);
if (col != 0) return;
@@ -881,7 +881,7 @@ bool KonqSidebarTree::tabSupport()
QCStringList funcs;
reply.get(funcs, "QCStringList");
for (QCStringList::ConstIterator it = funcs.begin(); it != funcs.end(); ++it) {
- if ((*it) == "void newTab(QString url)") {
+ if ((*it) == "void newTab(TQString url)") {
return true;
break;
}
@@ -901,24 +901,24 @@ void KonqSidebarTree::showToplevelContextMenu()
{
m_collection = new KActionCollection( this, "bookmark actions" );
(void) new KAction( i18n("&Create New Folder..."), "folder_new", 0, this,
- SLOT( slotCreateFolder() ), m_collection, "create_folder");
+ TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
(void) new KAction( i18n("Delete Folder"), "editdelete", 0, this,
- SLOT( slotDelete() ), m_collection, "delete_folder");
+ TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
(void) new KAction( i18n("Rename"), 0, this,
- SLOT( slotRename() ), m_collection, "rename");
+ TQT_SLOT( slotRename() ), m_collection, "rename");
(void) new KAction( i18n("Delete Link"), "editdelete", 0, this,
- SLOT( slotDelete() ), m_collection, "delete_link");
+ TQT_SLOT( slotDelete() ), m_collection, "delete_link");
(void) new KAction( i18n("Properties"), "edit", 0, this,
- SLOT( slotProperties() ), m_collection, "item_properties");
+ TQT_SLOT( slotProperties() ), m_collection, "item_properties");
(void) new KAction( i18n("Open in New Window"), "window_new", 0, this,
- SLOT( slotOpenNewWindow() ), m_collection, "open_window");
+ TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
(void) new KAction( i18n("Open in New Tab"), "tab_new", 0, this,
- SLOT( slotOpenTab() ), m_collection, "open_tab");
+ TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
(void) new KAction( i18n("Copy Link Address"), "editcopy", 0, this,
- SLOT( slotCopyLocation() ), m_collection, "copy_location");
+ TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
}
- QPopupMenu *menu = new QPopupMenu;
+ TQPopupMenu *menu = new QPopupMenu;
if (item) {
if (item->isTopLevelGroup()) {
@@ -943,7 +943,7 @@ void KonqSidebarTree::showToplevelContextMenu()
m_currentTopLevelItem = item;
- menu->exec( QCursor::pos() );
+ menu->exec( TQCursor::pos() );
delete menu;
m_currentTopLevelItem = 0;
@@ -951,8 +951,8 @@ void KonqSidebarTree::showToplevelContextMenu()
void KonqSidebarTree::slotCreateFolder()
{
- QString path;
- QString name = i18n("New Folder");
+ TQString path;
+ TQString name = i18n("New Folder");
while(true)
{
@@ -971,7 +971,7 @@ void KonqSidebarTree::slotCreateFolder()
path = path + name;
- if (!QFile::exists(path))
+ if (!TQFile::exists(path))
break;
name = name + "-2";
@@ -1017,7 +1017,7 @@ void KonqSidebarTree::slotOpenTab()
{
if (!m_currentTopLevelItem) return;
DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
- ref.call( "newTab(QString)", m_currentTopLevelItem->externalURL().url() );
+ ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() );
}
void KonqSidebarTree::slotCopyLocation()
@@ -1032,11 +1032,11 @@ void KonqSidebarTree::slotCopyLocation()
///////////////////////////////////////////////////////////////////
-void KonqSidebarTreeToolTip::maybeTip( const QPoint &point )
+void KonqSidebarTreeToolTip::maybeTip( const TQPoint &point )
{
- QListViewItem *item = m_view->itemAt( point );
+ TQListViewItem *item = m_view->itemAt( point );
if ( item ) {
- QString text = static_cast<KonqSidebarTreeItem*>( item )->toolTipText();
+ TQString text = static_cast<KonqSidebarTreeItem*>( item )->toolTipText();
if ( !text.isEmpty() )
tip ( m_view->itemRect( item ), text );
}
diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h
index cc2035466..b536355ba 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.h
+++ b/konqueror/sidebar/trees/konq_sidebartree.h
@@ -24,10 +24,10 @@
#include "konq_sidebartreetoplevelitem.h"
#include "konqsidebar_tree.h"
#include <kdirnotify.h>
-#include <qmap.h>
-#include <qpoint.h>
-#include <qstrlist.h>
-#include <qtooltip.h>
+#include <tqmap.h>
+#include <tqpoint.h>
+#include <tqstrlist.h>
+#include <tqtooltip.h>
class KonqSidebarTreeModule;
class KonqSidebarTreeItem;
@@ -46,20 +46,20 @@ typedef struct DirTreeConfigData_
{
KURL dir;
int type;
- QString relDir;
+ TQString relDir;
} DirTreeConfigData;
class KonqSidebarTreeToolTip : public QToolTip
{
public:
- KonqSidebarTreeToolTip( QListView *view ) : QToolTip( view->viewport() ), m_view( view ) {}
+ KonqSidebarTreeToolTip( TQListView *view ) : TQToolTip( view->viewport() ), m_view( view ) {}
protected:
- virtual void maybeTip( const QPoint & );
+ virtual void maybeTip( const TQPoint & );
private:
- QListView *m_view;
+ TQListView *m_view;
};
typedef enum {
@@ -77,7 +77,7 @@ class KonqSidebarTree : public KListView, public KDirNotify
{
Q_OBJECT
public:
- KonqSidebarTree( KonqSidebar_Tree *parent, QWidget *parentWidget, int virt, const QString& path );
+ KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path );
virtual ~KonqSidebarTree();
void followURL( const KURL &url );
@@ -87,7 +87,7 @@ public:
*/
KonqSidebarTreeItem * currentItem() const;
- void startAnimation( KonqSidebarTreeItem * item, const char * iconBaseName = "kde", uint iconCount = 6, const QPixmap * originalPixmap = 0L );
+ void startAnimation( KonqSidebarTreeItem * item, const char * iconBaseName = "kde", uint iconCount = 6, const TQPixmap * originalPixmap = 0L );
void stopAnimation( KonqSidebarTreeItem * item );
// Reimplemented from KDirNotify
@@ -106,7 +106,7 @@ public:
void itemDestructed( KonqSidebarTreeItem *item );
- void setDropFormats( const QStringList &formats ); // used in KListView mode
+ void setDropFormats( const TQStringList &formats ); // used in KListView mode
// Show context menu for toplevel items
void showToplevelContextMenu();
@@ -121,21 +121,21 @@ public slots:
virtual void setContentsPos( int x, int y );
protected:
- virtual void contentsDragEnterEvent( QDragEnterEvent *e );
- virtual void contentsDragMoveEvent( QDragMoveEvent *e );
- virtual void contentsDragLeaveEvent( QDragLeaveEvent *e );
- virtual void contentsDropEvent( QDropEvent *ev );
- virtual bool acceptDrag(QDropEvent* e) const; // used in KListView mode
+ virtual void contentsDragEnterEvent( TQDragEnterEvent *e );
+ virtual void contentsDragMoveEvent( TQDragMoveEvent *e );
+ virtual void contentsDragLeaveEvent( TQDragLeaveEvent *e );
+ virtual void contentsDropEvent( TQDropEvent *ev );
+ virtual bool acceptDrag(TQDropEvent* e) const; // used in KListView mode
- virtual void leaveEvent( QEvent * );
+ virtual void leaveEvent( TQEvent * );
- virtual QDragObject* dragObject();
+ virtual TQDragObject* dragObject();
private slots:
- void slotDoubleClicked( QListViewItem *item );
- void slotExecuted( QListViewItem *item );
- void slotMouseButtonPressed(int _button, QListViewItem* _item, const QPoint&, int col);
- void slotMouseButtonClicked(int _button, QListViewItem* _item, const QPoint&, int col);
+ void slotDoubleClicked( TQListViewItem *item );
+ void slotExecuted( TQListViewItem *item );
+ void slotMouseButtonPressed(int _button, TQListViewItem* _item, const TQPoint&, int col);
+ void slotMouseButtonClicked(int _button, TQListViewItem* _item, const TQPoint&, int col);
void slotSelectionChanged();
void slotAnimation();
@@ -144,7 +144,7 @@ private slots:
void rescanConfiguration();
- void slotItemRenamed(QListViewItem*, const QString &, int);
+ void slotItemRenamed(TQListViewItem*, const TQString &, int);
void slotCreateFolder();
void slotDelete();
@@ -156,41 +156,41 @@ private slots:
private:
void clearTree();
- void scanDir( KonqSidebarTreeItem *parent, const QString &path, bool isRoot = false );
- void loadTopLevelGroup( KonqSidebarTreeItem *parent, const QString &path );
- void loadTopLevelItem( KonqSidebarTreeItem *parent, const QString &filename );
+ void scanDir( KonqSidebarTreeItem *parent, const TQString &path, bool isRoot = false );
+ void loadTopLevelGroup( KonqSidebarTreeItem *parent, const TQString &path );
+ void loadTopLevelItem( KonqSidebarTreeItem *parent, const TQString &filename );
void loadModuleFactories();
private:
- QPtrList<KonqSidebarTreeTopLevelItem> m_topLevelItems;
+ TQPtrList<KonqSidebarTreeTopLevelItem> m_topLevelItems;
KonqSidebarTreeTopLevelItem *m_currentTopLevelItem;
- QPtrList<KonqSidebarTreeModule> m_lstModules;
+ TQPtrList<KonqSidebarTreeModule> m_lstModules;
KonqSidebarPlugin *m_part;
struct AnimationInfo
{
- AnimationInfo( const char * _iconBaseName, uint _iconCount, const QPixmap & _originalPixmap )
+ AnimationInfo( const char * _iconBaseName, uint _iconCount, const TQPixmap & _originalPixmap )
: iconBaseName(_iconBaseName), iconCount(_iconCount), iconNumber(1), originalPixmap(_originalPixmap) {}
AnimationInfo() : iconCount(0) {}
- QCString iconBaseName;
+ TQCString iconBaseName;
uint iconCount;
uint iconNumber;
- QPixmap originalPixmap;
+ TQPixmap originalPixmap;
};
- typedef QMap<KonqSidebarTreeItem *, AnimationInfo> MapCurrentOpeningFolders;
+ typedef TQMap<KonqSidebarTreeItem *, AnimationInfo> MapCurrentOpeningFolders;
MapCurrentOpeningFolders m_mapCurrentOpeningFolders;
- QTimer *m_animationTimer;
+ TQTimer *m_animationTimer;
- QListViewItem *m_currentBeforeDropItem; // The item that was current before the drag-enter event happened
- QListViewItem *m_dropItem; // The item we are moving the mouse over (during a drag)
- QStrList m_lstDropFormats;
+ TQListViewItem *m_currentBeforeDropItem; // The item that was current before the drag-enter event happened
+ TQListViewItem *m_dropItem; // The item we are moving the mouse over (during a drag)
+ TQStrList m_lstDropFormats;
- QTimer *m_autoOpenTimer;
+ TQTimer *m_autoOpenTimer;
// The base URL for our configuration directory
//KURL m_dirtreeDir;
@@ -199,10 +199,10 @@ private:
KonqSidebarTreeToolTip m_toolTip;
bool m_scrollingLocked;
- getModule getPluginFactory(QString name);
+ getModule getPluginFactory(TQString name);
- QMap<QString, QString> pluginInfo;
- QMap<QString, getModule> pluginFactories;
+ TQMap<TQString, TQString> pluginInfo;
+ TQMap<TQString, getModule> pluginFactories;
bool m_bOpeningFirstChild;
KActionCollection *m_collection;
@@ -216,9 +216,9 @@ signals:
#define signals protected
void openURLRequest( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
void createNewWindow( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
- void popupMenu( const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode = (mode_t)-1 );
- void popupMenu( const QPoint &global, const KFileItemList &items );
+ void popupMenu( const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode = (mode_t)-1 );
+ void popupMenu( const TQPoint &global, const KFileItemList &items );
void enableAction( const char * name, bool enabled );
};
diff --git a/konqueror/sidebar/trees/konq_sidebartreeitem.cpp b/konqueror/sidebar/trees/konq_sidebartreeitem.cpp
index daa0ae777..cc3f83950 100644
--- a/konqueror/sidebar/trees/konq_sidebartreeitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreeitem.cpp
@@ -22,13 +22,13 @@
//#include "konq_sidebartreepart.h"
KonqSidebarTreeItem::KonqSidebarTreeItem( KonqSidebarTreeItem *parentItem, KonqSidebarTreeTopLevelItem *topLevelItem )
- : QListViewItem( parentItem )
+ : TQListViewItem( parentItem )
{
initItem( topLevelItem );
}
KonqSidebarTreeItem::KonqSidebarTreeItem( KonqSidebarTree *parent, KonqSidebarTreeTopLevelItem *topLevelItem )
- : QListViewItem( parent )
+ : TQListViewItem( parent )
{
initItem( topLevelItem );
}
diff --git a/konqueror/sidebar/trees/konq_sidebartreeitem.h b/konqueror/sidebar/trees/konq_sidebartreeitem.h
index ef6f73931..0cb7a7d12 100644
--- a/konqueror/sidebar/trees/konq_sidebartreeitem.h
+++ b/konqueror/sidebar/trees/konq_sidebartreeitem.h
@@ -20,8 +20,8 @@
#ifndef konq_treeitem_h
#define konq_treeitem_h
-#include <qlistview.h>
-#include <qstringlist.h>
+#include <tqlistview.h>
+#include <tqstringlist.h>
#include <kurl.h>
class QPainter;
@@ -48,14 +48,14 @@ public:
virtual ~KonqSidebarTreeItem();
// Whether the item accepts a drop consisting in those @p formats
- virtual bool acceptsDrops( const QStrList & ) { return false; }
+ virtual bool acceptsDrops( const TQStrList & ) { return false; }
// Handle a drop on this item. If you didn't want it, you shouln't
// have return true in acceptsDrops :)
- virtual void drop( QDropEvent * ) {}
+ virtual void drop( TQDropEvent * ) {}
// Create a drag object from this item.
- virtual QDragObject * dragObject( QWidget * parent, bool move = false ) = 0;
+ virtual TQDragObject * dragObject( TQWidget * parent, bool move = false ) = 0;
virtual void middleButtonClicked();
virtual void rightButtonPressed() = 0;
@@ -65,17 +65,17 @@ public:
virtual void del() {}
virtual void shred() {}
virtual void rename() {}
- virtual void rename( const QString& ) {}
+ virtual void rename( const TQString& ) {}
// The URL to open when this link is clicked
virtual KURL externalURL() const = 0;
// The mimetype to use when this link is clicked
- // If unknown, return QString::null, konq will determine the mimetype itself
- virtual QString externalMimeType() const { return QString::null; }
+ // If unknown, return TQString::null, konq will determine the mimetype itself
+ virtual TQString externalMimeType() const { return TQString::null; }
// overwrite this if you want a tooltip shown on your item
- virtual QString toolTipText() const { return QString::null; }
+ virtual TQString toolTipText() const { return TQString::null; }
// Called when this item is selected
// Reimplement, and call tree()->part()->extension()->enableActions(...)
@@ -100,10 +100,10 @@ public:
// returns the tree inside which this item is
KonqSidebarTree *tree() const;
- virtual QString key( int column, bool ) const { return text( column ).lower(); }
+ virtual TQString key( int column, bool ) const { return text( column ).lower(); }
// List of alternative names (URLs) this entry is known under
- QStringList alias;
+ TQStringList alias;
protected:
// Create an item at the toplevel - only for toplevel items -> protected
KonqSidebarTreeItem( KonqSidebarTree *parent, KonqSidebarTreeTopLevelItem *topLevelItem );
diff --git a/konqueror/sidebar/trees/konq_sidebartreemodule.h b/konqueror/sidebar/trees/konq_sidebartreemodule.h
index 9f9863311..80d3ea062 100644
--- a/konqueror/sidebar/trees/konq_sidebartreemodule.h
+++ b/konqueror/sidebar/trees/konq_sidebartreemodule.h
@@ -19,7 +19,7 @@
#ifndef konq_treemodule_h
#define konq_treemodule_h
-#include <qobject.h>
+#include <tqobject.h>
#include "konq_sidebartree.h"
class QDragObject;
class KonqSidebarTreeItem;
@@ -53,7 +53,7 @@ public:
bool showHidden() { return m_showHidden;}
virtual void setShowHidden(bool showhidden) {m_showHidden=showhidden;}
- virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const QPoint& ) { return false; }
+ virtual bool handleTopLevelContextMenu( KonqSidebarTreeTopLevelItem *, const TQPoint& ) { return false; }
protected:
KonqSidebarTree * m_pTree;
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
index d71959c1e..4ce6fe445 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@@ -25,14 +25,14 @@
#include <kprotocolinfo.h>
#include <kurldrag.h>
#include <kmimetype.h>
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qcursor.h>
+#include <tqapplication.h>
+#include <tqclipboard.h>
+#include <tqcursor.h>
#include <konq_drag.h>
void KonqSidebarTreeTopLevelItem::init()
{
- QString desktopFile = m_path;
+ TQString desktopFile = m_path;
if ( isTopLevelGroup() )
desktopFile += "/.directory";
KSimpleConfig cfg( desktopFile, true );
@@ -50,18 +50,18 @@ void KonqSidebarTreeTopLevelItem::setOpen( bool open )
void KonqSidebarTreeTopLevelItem::itemSelected()
{
kdDebug() << "KonqSidebarTreeTopLevelItem::itemSelected" << endl;
- QMimeSource *data = QApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
bool paste = m_bTopLevelGroup && data->provides("text/uri-list");
tree()->enableActions( true, true, paste, true, true, true /*rename*/ );
}
-bool KonqSidebarTreeTopLevelItem::acceptsDrops( const QStrList & formats )
+bool KonqSidebarTreeTopLevelItem::acceptsDrops( const TQStrList & formats )
{
return formats.contains("text/uri-list") &&
( m_bTopLevelGroup || !externalURL().isEmpty() );
}
-void KonqSidebarTreeTopLevelItem::drop( QDropEvent * ev )
+void KonqSidebarTreeTopLevelItem::drop( TQDropEvent * ev )
{
if ( m_bTopLevelGroup )
{
@@ -85,7 +85,7 @@ void KonqSidebarTreeTopLevelItem::drop( QDropEvent * ev )
}
}
-QDragObject * KonqSidebarTreeTopLevelItem::dragObject( QWidget * parent, bool move )
+TQDragObject * KonqSidebarTreeTopLevelItem::dragObject( TQWidget * parent, bool move )
{
// 100% duplicated from KonqDirTreeItem::dragObject :(
KURL::List lst;
@@ -95,10 +95,10 @@ QDragObject * KonqSidebarTreeTopLevelItem::dragObject( QWidget * parent, bool mo
KonqDrag * drag = KonqDrag::newDrag( lst, false, parent );
- const QPixmap * pix = pixmap(0);
+ const TQPixmap * pix = pixmap(0);
if (pix)
{
- QPoint hotspot( pix->width() / 2, pix->height() / 2 );
+ TQPoint hotspot( pix->width() / 2, pix->height() / 2 );
drag->setPixmap( *pix, hotspot );
}
drag->setMoveSelection( move );
@@ -121,7 +121,7 @@ void KonqSidebarTreeTopLevelItem::rightButtonPressed()
// i.e. the filename instead of the Name field). There's the Rename item for that.
// Only missing thing is changing the URL of a link. Hmm...
- if ( !module() || !module()->handleTopLevelContextMenu( this, QCursor::pos() ) )
+ if ( !module() || !module()->handleTopLevelContextMenu( this, TQCursor::pos() ) )
{
tree()->showToplevelContextMenu();
}
@@ -157,7 +157,7 @@ void KonqSidebarTreeTopLevelItem::paste()
{
// move or not move ?
bool move = false;
- QMimeSource *data = QApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1201) << "move (from clipboard data) = " << move << endl;
@@ -177,7 +177,7 @@ void KonqSidebarTreeTopLevelItem::rename()
tree()->rename( this, 0 );
}
-void KonqSidebarTreeTopLevelItem::rename( const QString & name )
+void KonqSidebarTreeTopLevelItem::rename( const TQString & name )
{
KURL url;
url.setPath( m_path );
@@ -186,7 +186,7 @@ void KonqSidebarTreeTopLevelItem::rename( const QString & name )
// of the .directory or desktop file
//KonqOperations::rename( tree(), url, name );
- QString desktopFile = m_path;
+ TQString desktopFile = m_path;
if ( isTopLevelGroup() )
desktopFile += "/.directory";
KSimpleConfig cfg( desktopFile );
@@ -201,7 +201,7 @@ void KonqSidebarTreeTopLevelItem::rename( const QString & name )
allDirNotify.FilesChanged( lst );
}
-QString KonqSidebarTreeTopLevelItem::toolTipText() const
+TQString KonqSidebarTreeTopLevelItem::toolTipText() const
{
return m_comment;
}
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.h b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.h
index fc67e274e..6e20e7e03 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.h
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.h
@@ -38,7 +38,7 @@ public:
* @param module the module handling this toplevel item
* @param path the path to the desktop file that was the reason for creating this item
*/
- KonqSidebarTreeTopLevelItem( KonqSidebarTree *parent, KonqSidebarTreeModule * module, const QString & path )
+ KonqSidebarTreeTopLevelItem( KonqSidebarTree *parent, KonqSidebarTreeModule * module, const TQString & path )
: KonqSidebarTreeItem(parent, 0L), m_module(module), m_path(path), m_bTopLevelGroup(false) { init(); }
/**
@@ -46,14 +46,14 @@ public:
* @param module the module handling this toplevel item
* @param path the path to the desktop file that was the reason for creating this item
*/
- KonqSidebarTreeTopLevelItem( KonqSidebarTreeItem *parentItem, KonqSidebarTreeModule * module, const QString & path )
+ KonqSidebarTreeTopLevelItem( KonqSidebarTreeItem *parentItem, KonqSidebarTreeModule * module, const TQString & path )
: KonqSidebarTreeItem( parentItem, 0L), m_module(module), m_path(path), m_bTopLevelGroup(false) { init(); }
void init();
- virtual bool acceptsDrops( const QStrList & formats );
- virtual void drop( QDropEvent * ev );
- virtual QDragObject * dragObject( QWidget * parent, bool move = false );
+ virtual bool acceptsDrops( const TQStrList & formats );
+ virtual void drop( TQDropEvent * ev );
+ virtual TQDragObject * dragObject( TQWidget * parent, bool move = false );
virtual void middleButtonClicked();
virtual void rightButtonPressed();
@@ -62,7 +62,7 @@ public:
virtual void del();
virtual void shred();
virtual void rename(); // start a rename operation
- virtual void rename( const QString & name ); // do the actual renaming
+ virtual void rename( const TQString & name ); // do the actual renaming
virtual void setOpen( bool open );
@@ -71,7 +71,7 @@ public:
virtual KURL externalURL() const { return m_externalURL; }
- virtual QString toolTipText() const;
+ virtual TQString toolTipText() const;
virtual void itemSelected();
@@ -87,13 +87,13 @@ public:
KonqSidebarTreeModule *module() const { return m_module; }
// The path to the desktop file responsible for this toplevel item
- QString path() const { return m_path; }
+ TQString path() const { return m_path; }
protected:
void delOperation( int method );
KonqSidebarTreeModule *m_module;
- QString m_path;
- QString m_comment;
+ TQString m_path;
+ TQString m_comment;
KURL m_externalURL;
bool m_bTopLevelGroup;
};
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 9b53f195d..219063026 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -8,12 +8,12 @@
#include <kiconloader.h>
#include <klistviewsearchline.h>
-#include <qclipboard.h>
-#include <qdragobject.h>
-#include <qtoolbutton.h>
-#include <qvbox.h>
+#include <tqclipboard.h>
+#include <tqdragobject.h>
+#include <tqtoolbutton.h>
+#include <tqvbox.h>
-KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name):
+KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name):
KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name)
{
KSimpleConfig ksc(desktopName_);
@@ -21,48 +21,48 @@ KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,QObject *parent,QWidget *
int virt= ( (ksc.readEntry("X-KDE-TreeModule","")=="Virtual") ?VIRT_Folder:VIRT_Link);
if (virt==1) desktopName_=ksc.readEntry("X-KDE-RelURL","");
- widget = new QVBox(widgetParent);
+ widget = new TQVBox(widgetParent);
if (ksc.readBoolEntry("X-KDE-SearchableTreeModule",false)) {
- QHBox* searchline = new QHBox(widget);
+ TQHBox* searchline = new TQHBox(widget);
searchline->setSpacing(KDialog::spacingHint());
tree=new KonqSidebarTree(this,widget,virt,desktopName_);
- QToolButton *clearSearch = new QToolButton(searchline);
+ TQToolButton *clearSearch = new TQToolButton(searchline);
clearSearch->setTextLabel(i18n("Clear Search"), true);
- clearSearch->setIconSet(SmallIconSet(QApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
- QLabel* slbl = new QLabel(i18n("Se&arch:"), searchline);
+ clearSearch->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
+ TQLabel* slbl = new TQLabel(i18n("Se&arch:"), searchline);
KListViewSearchLine* listViewSearch = new KListViewSearchLine(searchline,tree);
slbl->setBuddy(listViewSearch);
- connect(clearSearch, SIGNAL(pressed()), listViewSearch, SLOT(clear()));
+ connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear()));
}
else
tree=new KonqSidebarTree(this,widget,virt,desktopName_);
- connect(tree, SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)),
- this,SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)));
+ connect(tree, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)),
+ this,TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)));
- connect(tree,SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
- this,SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)));
+ connect(tree,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
+ this,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)));
- connect(tree,SIGNAL(popupMenu( const QPoint &, const KURL &, const QString &, mode_t )),
- this,SIGNAL(popupMenu( const QPoint &, const KURL &, const QString &, mode_t )));
+ connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )),
+ this,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )));
- connect(tree,SIGNAL(popupMenu( const QPoint &, const KFileItemList & )),
- this,SIGNAL(popupMenu( const QPoint &, const KFileItemList & )));
+ connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
+ this,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )));
- connect(tree,SIGNAL(enableAction( const char *, bool )),
- this,SIGNAL(enableAction( const char *, bool)));
+ connect(tree,TQT_SIGNAL(enableAction( const char *, bool )),
+ this,TQT_SIGNAL(enableAction( const char *, bool)));
}
KonqSidebar_Tree::~KonqSidebar_Tree(){;}
-void* KonqSidebar_Tree::provides(const QString &) {return 0;}
+void* KonqSidebar_Tree::provides(const TQString &) {return 0;}
-//void KonqSidebar_Tree::emitStatusBarText (const QString &) {;}
+//void KonqSidebar_Tree::emitStatusBarText (const TQString &) {;}
-QWidget *KonqSidebar_Tree::getWidget(){return widget;}
+TQWidget *KonqSidebar_Tree::getWidget(){return widget;}
void KonqSidebar_Tree::handleURL(const KURL &url)
{
@@ -73,16 +73,16 @@ void KonqSidebar_Tree::handleURL(const KURL &url)
void KonqSidebar_Tree::cut()
{
- QDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L, true );
+ TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L, true );
if (drag)
- QApplication::clipboard()->setData( drag );
+ TQApplication::clipboard()->setData( drag );
}
void KonqSidebar_Tree::copy()
{
- QDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L );
+ TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L );
if (drag)
- QApplication::clipboard()->setData( drag );
+ TQApplication::clipboard()->setData( drag );
}
void KonqSidebar_Tree::paste()
@@ -123,7 +123,7 @@ void KonqSidebar_Tree::rename()
extern "C"
{
- KDE_EXPORT void* create_konqsidebar_tree(KInstance *inst,QObject *par,QWidget *widp,QString &desktopname,const char *name)
+ KDE_EXPORT void* create_konqsidebar_tree(KInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
{
return new KonqSidebar_Tree(inst,par,widp,desktopname,name);
}
@@ -131,19 +131,19 @@ extern "C"
extern "C"
{
- KDE_EXPORT bool add_konqsidebar_tree(QString* fn, QString*, QMap<QString,QString> *map)
+ KDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map)
{
KStandardDirs *dirs=KGlobal::dirs();
- QStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
- QStringList names;
- for (QStringList::ConstIterator it=list.begin();it!=list.end();++it)
+ TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
+ TQStringList names;
+ for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it)
{
KSimpleConfig sc(*it);
sc.setGroup("Desktop Entry");
names<<sc.readEntry("Name");
}
- QString item = KInputDialog::getItem( i18n( "Select Type" ),
+ TQString item = KInputDialog::getItem( i18n( "Select Type" ),
i18n( "Select type:" ), names );
if (!item.isEmpty())
{
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h
index 968a59585..9b95897ff 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.h
+++ b/konqueror/sidebar/trees/konqsidebar_tree.h
@@ -1,16 +1,16 @@
#ifndef _konq_sidebar_test_h_
#define _konq_sidebar_test_h_
#include <konqsidebarplugin.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
#include <kparts/part.h>
#include <kparts/factory.h>
#include <kparts/browserextension.h>
#include <kdialogbase.h>
-#include <qcombobox.h>
-#include <qstringlist.h>
+#include <tqcombobox.h>
+#include <tqstringlist.h>
#include <klocale.h>
-#include <qlineedit.h>
+#include <tqlineedit.h>
class KonqSidebarTree;
class QVBox;
@@ -18,13 +18,13 @@ class KonqSidebar_Tree: public KonqSidebarPlugin
{
Q_OBJECT
public:
- KonqSidebar_Tree(KInstance *instance,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name=0);
+ KonqSidebar_Tree(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0);
~KonqSidebar_Tree();
- virtual void *provides(const QString &);
-// void emitStatusBarText (const QString &);
- virtual QWidget *getWidget();
+ virtual void *provides(const TQString &);
+// void emitStatusBarText (const TQString &);
+ virtual TQWidget *getWidget();
protected:
- class QVBox *widget;
+ class TQVBox *widget;
class KonqSidebarTree *tree;
virtual void handleURL(const KURL &url);
protected slots:
@@ -38,9 +38,9 @@ class KonqSidebar_Tree: public KonqSidebarPlugin
signals:
void openURLRequest( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
void createNewWindow( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
- void popupMenu( const QPoint &global, const KURL &url,
- const QString &mimeType, mode_t mode = (mode_t)-1 );
- void popupMenu( const QPoint &global, const KFileItemList &items );
+ void popupMenu( const TQPoint &global, const KURL &url,
+ const TQString &mimeType, mode_t mode = (mode_t)-1 );
+ void popupMenu( const TQPoint &global, const KFileItemList &items );
void enableAction( const char * name, bool enabled );
};
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index ab77c40a0..2c8de18f8 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -17,10 +17,10 @@
*/
#include "web_module.h"
-#include <qfileinfo.h>
-#include <qhbox.h>
-#include <qspinbox.h>
-#include <qtimer.h>
+#include <tqfileinfo.h>
+#include <tqhbox.h>
+#include <tqspinbox.h>
+#include <tqtimer.h>
#include <dom/html_inline.h>
#include <kdebug.h>
@@ -32,34 +32,34 @@
#include <kstandarddirs.h>
-KonqSideBarWebModule::KonqSideBarWebModule(KInstance *instance, QObject *parent, QWidget *widgetParent, QString &desktopName, const char* name)
+KonqSideBarWebModule::KonqSideBarWebModule(KInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name)
: KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name)
{
_htmlPart = new KHTMLSideBar(universalMode());
- connect(_htmlPart, SIGNAL(reload()), this, SLOT(reload()));
- connect(_htmlPart, SIGNAL(completed()), this, SLOT(pageLoaded()));
+ connect(_htmlPart, TQT_SIGNAL(reload()), this, TQT_SLOT(reload()));
+ connect(_htmlPart, TQT_SIGNAL(completed()), this, TQT_SLOT(pageLoaded()));
connect(_htmlPart,
- SIGNAL(setWindowCaption(const QString&)),
+ TQT_SIGNAL(setWindowCaption(const TQString&)),
this,
- SLOT(setTitle(const QString&)));
+ TQT_SLOT(setTitle(const TQString&)));
connect(_htmlPart,
- SIGNAL(openURLRequest(const QString&, KParts::URLArgs)),
+ TQT_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)),
this,
- SLOT(urlClicked(const QString&, KParts::URLArgs)));
+ TQT_SLOT(urlClicked(const TQString&, KParts::URLArgs)));
connect(_htmlPart->browserExtension(),
- SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
+ TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
this,
- SLOT(formClicked(const KURL&, const KParts::URLArgs&)));
+ TQT_SLOT(formClicked(const KURL&, const KParts::URLArgs&)));
connect(_htmlPart,
- SIGNAL(setAutoReload()), this, SLOT( setAutoReload() ));
+ TQT_SIGNAL(setAutoReload()), this, TQT_SLOT( setAutoReload() ));
connect(_htmlPart,
- SIGNAL(openURLNewWindow(const QString&, KParts::URLArgs)),
+ TQT_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)),
this,
- SLOT(urlNewWindow(const QString&, KParts::URLArgs)));
+ TQT_SLOT(urlNewWindow(const TQString&, KParts::URLArgs)));
connect(_htmlPart,
- SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)),
+ TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
this,
- SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)));
+ TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
_desktopName = desktopName;
@@ -69,7 +69,7 @@ KonqSideBarWebModule::KonqSideBarWebModule(KInstance *instance, QObject *parent,
_url = ksc.readPathEntry("URL");
_htmlPart->openURL(_url );
// Must load this delayed
- QTimer::singleShot(0, this, SLOT(loadFavicon()));
+ TQTimer::singleShot(0, this, TQT_SLOT(loadFavicon()));
}
@@ -79,18 +79,18 @@ KonqSideBarWebModule::~KonqSideBarWebModule() {
}
-QWidget *KonqSideBarWebModule::getWidget() {
+TQWidget *KonqSideBarWebModule::getWidget() {
return _htmlPart->widget();
}
void KonqSideBarWebModule::setAutoReload(){
KDialogBase dlg(0, "", true, i18n("Set Refresh Timeout (0 disables)"),
KDialogBase::Ok|KDialogBase::Cancel);
- QHBox *hbox = dlg.makeHBoxMainWidget();
+ TQHBox *hbox = dlg.makeHBoxMainWidget();
- QSpinBox *mins = new QSpinBox( 0, 120, 1, hbox );
+ TQSpinBox *mins = new TQSpinBox( 0, 120, 1, hbox );
mins->setSuffix( i18n(" min") );
- QSpinBox *secs = new QSpinBox( 0, 59, 1, hbox );
+ TQSpinBox *secs = new TQSpinBox( 0, 59, 1, hbox );
secs->setSuffix( i18n(" sec") );
if( reloadTimeout > 0 ) {
@@ -99,7 +99,7 @@ void KonqSideBarWebModule::setAutoReload(){
mins->setValue( ( seconds - secs->value() ) / 60 );
}
- if( dlg.exec() == QDialog::Accepted ) {
+ if( dlg.exec() == TQDialog::Accepted ) {
int msec = ( mins->value() * 60 + secs->value() ) * 1000;
reloadTimeout = msec;
KSimpleConfig ksc(_desktopName);
@@ -109,7 +109,7 @@ void KonqSideBarWebModule::setAutoReload(){
}
}
-void *KonqSideBarWebModule::provides(const QString &) {
+void *KonqSideBarWebModule::provides(const TQString &) {
return 0L;
}
@@ -118,13 +118,13 @@ void KonqSideBarWebModule::handleURL(const KURL &) {
}
-void KonqSideBarWebModule::urlNewWindow(const QString& url, KParts::URLArgs args)
+void KonqSideBarWebModule::urlNewWindow(const TQString& url, KParts::URLArgs args)
{
emit createNewWindow(KURL(url), args);
}
-void KonqSideBarWebModule::urlClicked(const QString& url, KParts::URLArgs args)
+void KonqSideBarWebModule::urlClicked(const TQString& url, KParts::URLArgs args)
{
emit openURLRequest(KURL(url), args);
}
@@ -138,7 +138,7 @@ void KonqSideBarWebModule::formClicked(const KURL& url, const KParts::URLArgs& a
void KonqSideBarWebModule::loadFavicon() {
- QString icon = KonqPixmapProvider::iconForURL(_url.url());
+ TQString icon = KonqPixmapProvider::iconForURL(_url.url());
if (icon.isEmpty()) {
KonqFavIconMgr::downloadHostIcon(_url);
icon = KonqPixmapProvider::iconForURL(_url.url());
@@ -161,7 +161,7 @@ void KonqSideBarWebModule::reload() {
}
-void KonqSideBarWebModule::setTitle(const QString& title) {
+void KonqSideBarWebModule::setTitle(const TQString& title) {
if (!title.isEmpty()) {
emit setCaption(title);
@@ -176,27 +176,27 @@ void KonqSideBarWebModule::setTitle(const QString& title) {
void KonqSideBarWebModule::pageLoaded() {
if( reloadTimeout > 0 ) {
- QTimer::singleShot( reloadTimeout, this, SLOT( reload() ) );
+ TQTimer::singleShot( reloadTimeout, this, TQT_SLOT( reload() ) );
}
}
extern "C" {
- KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(KInstance *instance, QObject *parent, QWidget *widget, QString &desktopName, const char *name) {
+ KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(KInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) {
return new KonqSideBarWebModule(instance, parent, widget, desktopName, name);
}
}
extern "C" {
- KDE_EXPORT bool add_konqsidebar_web(QString* fn, QString* param, QMap<QString,QString> *map) {
+ KDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) {
Q_UNUSED(param);
KGlobal::dirs()->addResourceType("websidebardata", KStandardDirs::kde_default("data") + "konqsidebartng/websidebar");
KURL url;
url.setProtocol("file");
- QStringList paths = KGlobal::dirs()->resourceDirs("websidebardata");
- for (QStringList::Iterator i = paths.begin(); i != paths.end(); ++i) {
- if (QFileInfo(*i + "websidebar.html").exists()) {
+ TQStringList paths = KGlobal::dirs()->resourceDirs("websidebardata");
+ for (TQStringList::Iterator i = paths.begin(); i != paths.end(); ++i) {
+ if (TQFileInfo(*i + "websidebar.html").exists()) {
url.setPath(*i + "websidebar.html");
break;
}
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index 58650b309..eb10414a9 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -25,7 +25,7 @@
#include <klocale.h>
#include <konqsidebarplugin.h>
#include <kpopupmenu.h>
-#include <qobject.h>
+#include <tqobject.h>
// A wrapper for KHTMLPart to make it behave the way we want it to.
@@ -41,9 +41,9 @@ class KHTMLSideBar : public KHTMLPart
setFormNotification(KHTMLPart::Only);
connect(this,
- SIGNAL(formSubmitNotification(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)),
+ TQT_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
this,
- SLOT(formProxy(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&))
+ TQT_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))
);
@@ -51,36 +51,36 @@ class KHTMLSideBar : public KHTMLPart
"link context menu");
if (!universal) {
_linkMenu->insertItem(i18n("&Open Link"),
- this, SLOT(loadPage()));
+ this, TQT_SLOT(loadPage()));
_linkMenu->insertItem(i18n("Open in New &Window"),
- this, SLOT(loadNewWindow()));
+ this, TQT_SLOT(loadNewWindow()));
} else {
_linkMenu->insertItem(i18n("Open in New &Window"),
- this, SLOT(loadPage()));
+ this, TQT_SLOT(loadPage()));
}
_menu = new KPopupMenu(widget(), "context menu");
_menu->insertItem(SmallIcon("reload"), i18n("&Reload"),
- this, SIGNAL(reload()));
- _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, SIGNAL(setAutoReload()));
+ this, TQT_SIGNAL(reload()));
+ _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, TQT_SIGNAL(setAutoReload()));
connect(this,
- SIGNAL(popupMenu(const QString&,const QPoint&)),
+ TQT_SIGNAL(popupMenu(const TQString&,const TQPoint&)),
this,
- SLOT(showMenu(const QString&, const QPoint&)));
+ TQT_SLOT(showMenu(const TQString&, const TQPoint&)));
}
virtual ~KHTMLSideBar() {}
signals:
- void submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&);
- void openURLRequest(const QString& url, KParts::URLArgs args);
- void openURLNewWindow(const QString& url, KParts::URLArgs args);
+ void submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&);
+ void openURLRequest(const TQString& url, KParts::URLArgs args);
+ void openURLNewWindow(const TQString& url, KParts::URLArgs args);
void reload();
void setAutoReload();
protected:
- virtual void urlSelected( const QString &url, int button,
- int state, const QString &_target,
+ virtual void urlSelected( const TQString &url, int button,
+ int state, const TQString &_target,
KParts::URLArgs args = KParts::URLArgs()) {
if (button == LeftButton ){
if (_target.lower() == "_self") {
@@ -116,7 +116,7 @@ class KHTMLSideBar : public KHTMLPart
KParts::URLArgs());
}
- void showMenu(const QString& url, const QPoint& pos) {
+ void showMenu(const TQString& url, const TQPoint& pos) {
if (url.isEmpty()) {
_menu->popup(pos);
} else {
@@ -126,15 +126,15 @@ class KHTMLSideBar : public KHTMLPart
}
void formProxy(const char *action,
- const QString& url,
- const QByteArray& formData,
- const QString& target,
- const QString& contentType,
- const QString& boundary) {
- QString t = target.lower();
- QString u;
-
- if (QCString(action).lower() != "post") {
+ const TQString& url,
+ const TQByteArray& formData,
+ const TQString& target,
+ const TQString& contentType,
+ const TQString& boundary) {
+ TQString t = target.lower();
+ TQString u;
+
+ if (TQCString(action).lower() != "post") {
// GET
KURL kurl = completeURL(url);
kurl.setQuery(formData.data());
@@ -157,7 +157,7 @@ class KHTMLSideBar : public KHTMLPart
}
private:
KPopupMenu *_menu, *_linkMenu;
- QString _lastUrl;
+ TQString _lastUrl;
};
@@ -166,28 +166,28 @@ class KonqSideBarWebModule : public KonqSidebarPlugin
{
Q_OBJECT
public:
- KonqSideBarWebModule(KInstance *instance, QObject *parent,
- QWidget *widgetParent, QString &desktopName,
+ KonqSideBarWebModule(KInstance *instance, TQObject *parent,
+ TQWidget *widgetParent, TQString &desktopName,
const char *name);
virtual ~KonqSideBarWebModule();
- virtual QWidget *getWidget();
- virtual void *provides(const QString &);
+ virtual TQWidget *getWidget();
+ virtual void *provides(const TQString &);
signals:
- void submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&);
+ void submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&);
void openURLRequest(const KURL &url, const KParts::URLArgs &args);
void createNewWindow(const KURL &url, const KParts::URLArgs &args);
protected:
virtual void handleURL(const KURL &url);
private slots:
- void urlClicked(const QString& url, KParts::URLArgs args);
+ void urlClicked(const TQString& url, KParts::URLArgs args);
void formClicked(const KURL& url, const KParts::URLArgs& args);
- void urlNewWindow(const QString& url, KParts::URLArgs args);
+ void urlNewWindow(const TQString& url, KParts::URLArgs args);
void pageLoaded();
void loadFavicon();
- void setTitle(const QString&);
+ void setTitle(const TQString&);
void setAutoReload();
void reload();
@@ -195,7 +195,7 @@ class KonqSideBarWebModule : public KonqSidebarPlugin
KHTMLSideBar *_htmlPart;
KURL _url;
int reloadTimeout;
- QString _desktopName;
+ TQString _desktopName;
};
#endif
diff --git a/konsole/konsole/TECommon.h b/konsole/konsole/TECommon.h
index c541fe0f1..94b5ecc33 100644
--- a/konsole/konsole/TECommon.h
+++ b/konsole/konsole/TECommon.h
@@ -25,7 +25,7 @@
#ifndef TECOMMON_H
#define TECOMMON_H
-#include <qcolor.h>
+#include <tqcolor.h>
#ifndef UINT8
typedef unsigned char UINT8;
@@ -41,14 +41,14 @@ typedef unsigned short UINT16;
*/
struct ColorEntry
{
- ColorEntry(QColor c, bool tr, bool b) : color(c), transparent(tr), bold(b) {}
+ ColorEntry(TQColor c, bool tr, bool b) : color(c), transparent(tr), bold(b) {}
ColorEntry() : transparent(false), bold(false) {} // default constructors
void operator=(const ColorEntry& rhs) {
color = rhs.color;
transparent = rhs.transparent;
bold = rhs.bold;
}
- QColor color;
+ TQColor color;
bool transparent; // if used on bg
bool bold; // if used on fg
};
@@ -105,7 +105,7 @@ public:
UINT8 v; // ... color space. C++ does not do unions, so we cannot ...
UINT8 w; // ... express ourselfs here, properly.
void toggleIntensive(); // Hack or helper?
- QColor color(const ColorEntry* base) const;
+ TQColor color(const ColorEntry* base) const;
friend bool operator == (cacol a, cacol b);
friend bool operator != (cacol a, cacol b);
};
@@ -146,30 +146,30 @@ inline bool operator != (cacol a, cacol b)
return a.t != b.t || a.u != b.u || a.v != b.v || a.w != b.w;
}
-inline const QColor color256(UINT8 u, const ColorEntry* base)
+inline const TQColor color256(UINT8 u, const ColorEntry* base)
{
// 0.. 16: system colors
if (u < 8) return base[u+2 ].color; u -= 8;
if (u < 8) return base[u+2+BASE_COLORS].color; u -= 8;
// 16..231: 6x6x6 rgb color cube
- if (u < 216) return QColor(255*((u/36)%6)/5,
+ if (u < 216) return TQColor(255*((u/36)%6)/5,
255*((u/ 6)%6)/5,
255*((u/ 1)%6)/5); u -= 216;
// 232..255: gray, leaving out black and white
- int gray = u*10+8; return QColor(gray,gray,gray);
+ int gray = u*10+8; return TQColor(gray,gray,gray);
}
-inline QColor cacol::color(const ColorEntry* base) const
+inline TQColor cacol::color(const ColorEntry* base) const
{
switch (t)
{
case CO_DFT: return base[u+0+(v?BASE_COLORS:0)].color;
case CO_SYS: return base[u+2+(v?BASE_COLORS:0)].color;
case CO_256: return color256(u,base);
- case CO_RGB: return QColor(u,v,w);
- default : return QColor(255,0,0); // diagnostic catch all
+ case CO_RGB: return TQColor(u,v,w);
+ default : return TQColor(255,0,0); // diagnostic catch all
}
}
diff --git a/konsole/konsole/TEHistory.cpp b/konsole/konsole/TEHistory.cpp
index a24635acb..cbe8b199d 100644
--- a/konsole/konsole/TEHistory.cpp
+++ b/konsole/konsole/TEHistory.cpp
@@ -144,7 +144,7 @@ bool HistoryScroll::hasScroll()
at 0 in cells.
*/
-HistoryScrollFile::HistoryScrollFile(const QString &logFileName)
+HistoryScrollFile::HistoryScrollFile(const TQString &logFileName)
: HistoryScroll(new HistoryTypeFile(logFileName)),
m_logFileName(logFileName)
{
@@ -246,9 +246,9 @@ void HistoryScrollBuffer::addCells(ca a[], int count)
void HistoryScrollBuffer::normalize()
{
if (!m_buffFilled || !m_arrayIndex) return;
- QPtrVector<histline> newHistBuffer;
+ TQPtrVector<histline> newHistBuffer;
newHistBuffer.resize(m_maxNbLines);
- QBitArray newWrappedLine;
+ TQBitArray newWrappedLine;
newWrappedLine.resize(m_maxNbLines);
for(int i = 0; i < (int) m_maxNbLines-2; i++)
{
@@ -583,7 +583,7 @@ HistoryScroll* HistoryTypeBuffer::getScroll(HistoryScroll *old) const
//////////////////////////////
-HistoryTypeFile::HistoryTypeFile(const QString& fileName)
+HistoryTypeFile::HistoryTypeFile(const TQString& fileName)
: m_fileName(fileName)
{
}
@@ -593,7 +593,7 @@ bool HistoryTypeFile::isOn() const
return true;
}
-const QString& HistoryTypeFile::getFileName() const
+const TQString& HistoryTypeFile::getFileName() const
{
return m_fileName;
}
diff --git a/konsole/konsole/TEHistory.h b/konsole/konsole/TEHistory.h
index 446611e0a..dd5ba7a67 100644
--- a/konsole/konsole/TEHistory.h
+++ b/konsole/konsole/TEHistory.h
@@ -21,9 +21,9 @@
#ifndef TEHISTORY_H
#define TEHISTORY_H
-#include <qcstring.h>
-#include <qptrvector.h>
-#include <qbitarray.h>
+#include <tqcstring.h>
+#include <tqptrvector.h>
+#include <tqbitarray.h>
#include <ktempfile.h>
@@ -95,7 +95,7 @@ protected:
class HistoryScrollFile : public HistoryScroll
{
public:
- HistoryScrollFile(const QString &logFileName);
+ HistoryScrollFile(const TQString &logFileName);
virtual ~HistoryScrollFile();
virtual int getLines();
@@ -109,7 +109,7 @@ public:
private:
int startOfLine(int lineno);
- QString m_logFileName;
+ TQString m_logFileName;
HistoryFile index; // lines Row(int)
HistoryFile cells; // text Row(ca)
HistoryFile lineflags; // flags Row(unsigned char)
@@ -122,7 +122,7 @@ private:
class HistoryScrollBuffer : public HistoryScroll
{
public:
- typedef QMemArray<ca> histline;
+ typedef TQMemArray<ca> histline;
HistoryScrollBuffer(unsigned int maxNbLines = 1000);
virtual ~HistoryScrollBuffer();
@@ -146,8 +146,8 @@ private:
void normalize();
bool m_hasScroll;
- QPtrVector<histline> m_histBuffer;
- QBitArray m_wrappedLine;
+ TQPtrVector<histline> m_histBuffer;
+ TQBitArray m_wrappedLine;
unsigned int m_maxNbLines;
unsigned int m_nbLines;
unsigned int m_arrayIndex;
@@ -181,7 +181,7 @@ public:
// BlockArray-based history
//////////////////////////////////////////////////////////////////////
#include "BlockArray.h"
-#include <qintdict.h>
+#include <tqintdict.h>
class HistoryScrollBlockArray : public HistoryScroll
{
public:
@@ -198,7 +198,7 @@ public:
protected:
BlockArray m_blockArray;
- QIntDict<size_t> m_lineLengths;
+ TQIntDict<size_t> m_lineLengths;
};
//////////////////////////////////////////////////////////////////////
@@ -246,16 +246,16 @@ protected:
class HistoryTypeFile : public HistoryType
{
public:
- HistoryTypeFile(const QString& fileName=QString::null);
+ HistoryTypeFile(const TQString& fileName=TQString::null);
virtual bool isOn() const;
- virtual const QString& getFileName() const;
+ virtual const TQString& getFileName() const;
virtual unsigned int getSize() const;
virtual HistoryScroll* getScroll(HistoryScroll *) const;
protected:
- QString m_fileName;
+ TQString m_fileName;
};
diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp
index e68ea8ff5..86e916e57 100644
--- a/konsole/konsole/TEPty.cpp
+++ b/konsole/konsole/TEPty.cpp
@@ -126,14 +126,14 @@ void TEPty::setErase(char erase)
/*!
start the client program.
*/
-int TEPty::run(const char* _pgm, QStrList & _args, const char* _term, ulong winid, bool _addutmp,
+int TEPty::run(const char* _pgm, TQStrList & _args, const char* _term, ulong winid, bool _addutmp,
const char* _konsole_dcop, const char* _konsole_dcop_session)
{
clearArguments();
setBinaryExecutable(_pgm);
- QStrListIterator it( _args );
+ TQStrListIterator it( _args );
for (; it.current(); ++it )
arguments.append(it.current());
@@ -143,7 +143,7 @@ int TEPty::run(const char* _pgm, QStrList & _args, const char* _term, ulong wini
setEnvironment("KONSOLE_DCOP",_konsole_dcop);
if (_konsole_dcop_session && _konsole_dcop_session[0])
setEnvironment("KONSOLE_DCOP_SESSION", _konsole_dcop_session);
- setEnvironment("WINDOWID", QString::number(winid));
+ setEnvironment("WINDOWID", TQString::number(winid));
setUsePty(All, _addutmp);
@@ -171,12 +171,12 @@ void TEPty::setWriteable(bool writeable)
TEPty::TEPty()
{
m_bufferFull = false;
- connect(this, SIGNAL(receivedStdout(KProcess *, char *, int )),
- this, SLOT(dataReceived(KProcess *,char *, int)));
- connect(this, SIGNAL(processExited(KProcess *)),
- this, SLOT(donePty()));
- connect(this, SIGNAL(wroteStdin(KProcess *)),
- this, SLOT(writeReady()));
+ connect(this, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
+ this, TQT_SLOT(dataReceived(KProcess *,char *, int)));
+ connect(this, TQT_SIGNAL(processExited(KProcess *)),
+ this, TQT_SLOT(donePty()));
+ connect(this, TQT_SIGNAL(wroteStdin(KProcess *)),
+ this, TQT_SLOT(writeReady()));
setUsePty(All, false); // utmp will be overridden later
}
diff --git a/konsole/konsole/TEPty.h b/konsole/konsole/TEPty.h
index 1597d44d8..d6cee77dd 100644
--- a/konsole/konsole/TEPty.h
+++ b/konsole/konsole/TEPty.h
@@ -24,10 +24,10 @@
#include <config.h>
#include <kprocess.h>
-#include <qsocketnotifier.h>
-#include <qstrlist.h>
-#include <qvaluelist.h>
-#include <qmemarray.h>
+#include <tqsocketnotifier.h>
+#include <tqstrlist.h>
+#include <tqvaluelist.h>
+#include <tqmemarray.h>
class TEPty: public KProcess
{
@@ -52,10 +52,10 @@ Q_OBJECT
* the necessary connections to the signals and slots of the
* instance before starting the execution of the client.
*/
- int run( const char* pgm, QStrList & args, const char* term, ulong winid, bool _addutmp,
+ int run( const char* pgm, TQStrList & args, const char* term, ulong winid, bool _addutmp,
const char* konsole_dcop = "", const char* konsole_dcop_session = "" );
void setWriteable(bool writeable);
- QString error() { return m_strError; }
+ TQString error() { return m_strError; }
void setXonXoff(bool on);
void setSize(int lines, int cols);
void setErase(char erase);
@@ -112,7 +112,7 @@ Q_OBJECT
private:
- QString m_strError;
+ TQString m_strError;
struct SendJob {
SendJob() {}
@@ -120,10 +120,10 @@ Q_OBJECT
buffer.duplicate(b,len);
length = len;
}
- QMemArray<char> buffer;
+ TQMemArray<char> buffer;
int length;
};
- QValueList<SendJob> pendingSendJobs;
+ TQValueList<SendJob> pendingSendJobs;
bool m_bufferFull;
};
diff --git a/konsole/konsole/TEScreen.cpp b/konsole/konsole/TEScreen.cpp
index dba8ebd22..54b479844 100644
--- a/konsole/konsole/TEScreen.cpp
+++ b/konsole/konsole/TEScreen.cpp
@@ -422,7 +422,7 @@ void TEScreen::resizeImage(int new_lines, int new_columns)
// make new image
ca* newimg = new ca[(new_lines+1)*new_columns];
- QBitArray newwrapped(new_lines+1);
+ TQBitArray newwrapped(new_lines+1);
clearSelection();
// clear new image
@@ -599,9 +599,9 @@ ca* TEScreen::getCookedImage()
return merged;
}
-QBitArray TEScreen::getCookedLineWrapped()
+TQBitArray TEScreen::getCookedLineWrapped()
{
- QBitArray result(lines);
+ TQBitArray result(lines);
for (int y = 0; (y < lines) && (y < (hist->getLines()-histCursor)); y++)
result[y]=hist->isWrappedLine(y+histCursor);
@@ -775,12 +775,12 @@ void TEScreen::ShowCharacter(unsigned short c)
}
}
-void TEScreen::compose(QString compose)
+void TEScreen::compose(TQString compose)
{
if (lastPos == -1)
return;
- QChar c(image[lastPos].c);
+ TQChar c(image[lastPos].c);
compose.prepend(c);
compose.compose();
image[lastPos].c = compose[0].unicode();
@@ -1175,22 +1175,22 @@ static bool isSpace(UINT16 c)
return false;
if ((c == 32) || (c == 0))
return true;
- QChar qc(c);
+ TQChar qc(c);
return qc.isSpace();
}
-QString TEScreen::getSelText(bool preserve_line_breaks)
+TQString TEScreen::getSelText(bool preserve_line_breaks)
{
- QString result;
- QTextOStream stream(&result);
+ TQString result;
+ TQTextOStream stream(&result);
getSelText(preserve_line_breaks, &stream);
return result;
}
-static QString makeString(int *m, int d, bool stripTrailingSpaces)
+static TQString makeString(int *m, int d, bool stripTrailingSpaces)
{
- QChar* qc = new QChar[d];
+ TQChar* qc = new QChar[d];
int last_space = -1;
int j = 0;
@@ -1215,12 +1215,12 @@ static QString makeString(int *m, int d, bool stripTrailingSpaces)
j = last_space;
}
- QString res(qc, j);
+ TQString res(qc, j);
delete [] qc;
return res;
}
-void TEScreen::getSelText(bool preserve_line_breaks, QTextStream *stream)
+void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream)
{
if (sel_begin == -1)
return; // Selection got clear while selecting.
@@ -1446,7 +1446,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, QTextStream *stream)
delete [] m;
}
-void TEScreen::streamHistory(QTextStream* stream) {
+void TEScreen::streamHistory(TQTextStream* stream) {
sel_begin = 0;
sel_BR = sel_begin;
sel_TL = sel_begin;
@@ -1455,7 +1455,7 @@ void TEScreen::streamHistory(QTextStream* stream) {
clearSelection();
}
-QString TEScreen::getHistoryLine(int no)
+TQString TEScreen::getHistoryLine(int no)
{
sel_begin = loc(0,no);
sel_TL = sel_begin;
diff --git a/konsole/konsole/TEScreen.h b/konsole/konsole/TEScreen.h
index 55cbcb07c..9797b53ab 100644
--- a/konsole/konsole/TEScreen.h
+++ b/konsole/konsole/TEScreen.h
@@ -139,13 +139,13 @@ public: // these are all `Screen' operations
void ShowCharacter(unsigned short c);
// Do composition with last shown character
- void compose(QString compose);
+ void compose(TQString compose);
//
void resizeImage(int new_lines, int new_columns);
//
ca* getCookedImage();
- QBitArray getCookedLineWrapped();
+ TQBitArray getCookedLineWrapped();
/*! return the number of lines. */
int getLines() { return lines; }
@@ -171,10 +171,10 @@ public: // these are all `Screen' operations
void setBusySelecting(bool busy) { sel_busy = busy; }
bool testIsSelected(const int x,const int y);
- QString getSelText(bool preserve_line_breaks);
- void getSelText(bool preserve_line_breaks, QTextStream* stream);
- void streamHistory(QTextStream* stream);
- QString getHistoryLine(int no);
+ TQString getSelText(bool preserve_line_breaks);
+ void getSelText(bool preserve_line_breaks, TQTextStream* stream);
+ void streamHistory(TQTextStream* stream);
+ TQString getHistoryLine(int no);
void checkSelection(int from, int to);
@@ -208,7 +208,7 @@ private: // helper
int lines;
int columns;
ca *image; // [lines][columns]
- QBitArray line_wrapped; // [lines]
+ TQBitArray line_wrapped; // [lines]
// history buffer ---------------
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 03020a767..cb16ff497 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -55,14 +55,14 @@
#include "TEWidget.h"
#include "konsole_wcwidth.h"
-#include <qapplication.h>
-#include <qpainter.h>
-#include <qclipboard.h>
-#include <qstyle.h>
-#include <qfile.h>
-#include <qdragobject.h>
-#include <qlayout.h>
-#include <qregexp.h>
+#include <tqapplication.h>
+#include <tqpainter.h>
+#include <tqclipboard.h>
+#include <tqstyle.h>
+#include <tqfile.h>
+#include <tqdragobject.h>
+#include <tqlayout.h>
+#include <tqregexp.h>
#include <math.h>
#include <stdio.h>
@@ -82,8 +82,8 @@
#include <kshortcut.h>
#include <kurldrag.h>
#include <kio/netaccess.h>
-#include <qlabel.h>
-#include <qtimer.h>
+#include <tqlabel.h>
+#include <tqtimer.h>
#ifndef loc
#define loc(X,Y) ((Y)*columns+(X))
@@ -120,17 +120,17 @@ static const ColorEntry base_color_table[TABLE_COLORS] =
{
// Fixme: could add faint colors here, also.
// normal
- ColorEntry(QColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( QColor(0xB2,0xB2,0xB2), 1, 0 ), // Dfore, Dback
- ColorEntry(QColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0x18), 0, 0 ), // Black, Red
- ColorEntry(QColor(0x18,0xB2,0x18), 0, 0 ), ColorEntry( QColor(0xB2,0x68,0x18), 0, 0 ), // Green, Yellow
- ColorEntry(QColor(0x18,0x18,0xB2), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0xB2), 0, 0 ), // Blue, Magenta
- ColorEntry(QColor(0x18,0xB2,0xB2), 0, 0 ), ColorEntry( QColor(0xB2,0xB2,0xB2), 0, 0 ), // Cyan, White
+ ColorEntry(TQColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( TQColor(0xB2,0xB2,0xB2), 1, 0 ), // Dfore, Dback
+ ColorEntry(TQColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( TQColor(0xB2,0x18,0x18), 0, 0 ), // Black, Red
+ ColorEntry(TQColor(0x18,0xB2,0x18), 0, 0 ), ColorEntry( TQColor(0xB2,0x68,0x18), 0, 0 ), // Green, Yellow
+ ColorEntry(TQColor(0x18,0x18,0xB2), 0, 0 ), ColorEntry( TQColor(0xB2,0x18,0xB2), 0, 0 ), // Blue, Magenta
+ ColorEntry(TQColor(0x18,0xB2,0xB2), 0, 0 ), ColorEntry( TQColor(0xB2,0xB2,0xB2), 0, 0 ), // Cyan, White
// intensiv
- ColorEntry(QColor(0x00,0x00,0x00), 0, 1 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 1, 0 ),
- ColorEntry(QColor(0x68,0x68,0x68), 0, 0 ), ColorEntry( QColor(0xFF,0x54,0x54), 0, 0 ),
- ColorEntry(QColor(0x54,0xFF,0x54), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0x54), 0, 0 ),
- ColorEntry(QColor(0x54,0x54,0xFF), 0, 0 ), ColorEntry( QColor(0xFF,0x54,0xFF), 0, 0 ),
- ColorEntry(QColor(0x54,0xFF,0xFF), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 0, 0 )
+ ColorEntry(TQColor(0x00,0x00,0x00), 0, 1 ), ColorEntry( TQColor(0xFF,0xFF,0xFF), 1, 0 ),
+ ColorEntry(TQColor(0x68,0x68,0x68), 0, 0 ), ColorEntry( TQColor(0xFF,0x54,0x54), 0, 0 ),
+ ColorEntry(TQColor(0x54,0xFF,0x54), 0, 0 ), ColorEntry( TQColor(0xFF,0xFF,0x54), 0, 0 ),
+ ColorEntry(TQColor(0x54,0x54,0xFF), 0, 0 ), ColorEntry( TQColor(0xFF,0x54,0xFF), 0, 0 ),
+ ColorEntry(TQColor(0x54,0xFF,0xFF), 0, 0 ), ColorEntry( TQColor(0xFF,0xFF,0xFF), 0, 0 )
};
/* Note that we use ANSI color order (bgr), while IBMPC color order is (rgb)
@@ -141,14 +141,14 @@ static const ColorEntry base_color_table[TABLE_COLORS] =
IBMPC (rgb) Black Blue Green Cyan Red Magenta Yellow White
*/
-void TEWidget::setDefaultBackColor(const QColor& color)
+void TEWidget::setDefaultBackColor(const TQColor& color)
{
defaultBgColor = color;
if (qAlpha(blend_color) != 0xff && !backgroundPixmap())
setBackgroundColor(getDefaultBackColor());
}
-QColor TEWidget::getDefaultBackColor()
+TQColor TEWidget::getDefaultBackColor()
{
if (defaultBgColor.isValid())
return defaultBgColor;
@@ -163,7 +163,7 @@ const ColorEntry* TEWidget::getColorTable() const
void TEWidget::setColorTable(const ColorEntry table[])
{
for (int i = 0; i < TABLE_COLORS; i++) color_table[i] = table[i];
- const QPixmap* pm = backgroundPixmap();
+ const TQPixmap* pm = backgroundPixmap();
if (!pm)
if (!argb_visual || (qAlpha(blend_color) == 0xff))
setBackgroundColor(getDefaultBackColor());
@@ -173,7 +173,7 @@ void TEWidget::setColorTable(const ColorEntry table[])
int(qRed(blend_color) * alpha) << 16 |
int(qGreen(blend_color) * alpha) << 8 |
int(qBlue(blend_color) * alpha);
- setBackgroundColor(QColor(blend_color, pixel));
+ setBackgroundColor(TQColor(blend_color, pixel));
}
update();
}
@@ -211,7 +211,7 @@ unsigned short vt100_graphics[32] =
};
/*
-static QChar vt100extended(QChar c)
+static TQChar vt100extended(TQChar c)
{
switch (c.unicode())
{
@@ -250,15 +250,15 @@ static QChar vt100extended(QChar c)
return c;
}
-static QChar identicalMap(QChar c)
+static TQChar identicalMap(TQChar c)
{
return c;
}
*/
-void TEWidget::fontChange(const QFont &)
+void TEWidget::fontChange(const TQFont &)
{
- QFontMetrics fm(font());
+ TQFontMetrics fm(font());
font_h = fm.height() + m_lineSpacing;
// waba TEWidget 1.123:
@@ -276,7 +276,7 @@ void TEWidget::fontChange(const QFont &)
}
}
- if (font_w>200) // don't trust unrealistic value, fallback to QFontMetrics::maxWidth()
+ if (font_w>200) // don't trust unrealistic value, fallback to TQFontMetrics::maxWidth()
font_w=fm.maxWidth();
if (font_w<1)
font_w=1;
@@ -303,23 +303,23 @@ void TEWidget::fontChange(const QFont &)
update();
}
-void TEWidget::setVTFont(const QFont& f)
+void TEWidget::setVTFont(const TQFont& f)
{
- QFont font = f;
+ TQFont font = f;
// the font must be small enough to allow at least one line and one character of text to fit
// on screen
- QFontMetrics metrics(f);
+ TQFontMetrics metrics(f);
if ( metrics.height() < height() && metrics.maxWidth() < width() )
{
if (!s_antialias)
- font.setStyleStrategy( QFont::NoAntialias );
- QFrame::setFont(font);
+ font.setStyleStrategy( TQFont::NoAntialias );
+ TQFrame::setFont(font);
fontChange(font);
}
}
-void TEWidget::setFont(const QFont &)
+void TEWidget::setFont(const TQFont &)
{
// ignore font change request if not coming from konsole itself
}
@@ -330,8 +330,8 @@ void TEWidget::setFont(const QFont &)
/* */
/* ------------------------------------------------------------------------- */
-TEWidget::TEWidget(QWidget *parent, const char *name)
-:QFrame(parent,name,WNoAutoErase)
+TEWidget::TEWidget(TQWidget *parent, const char *name)
+:TQFrame(parent,name,WNoAutoErase)
,font_h(1)
,font_w(1)
,font_a(1)
@@ -371,7 +371,7 @@ TEWidget::TEWidget(QWidget *parent, const char *name)
,colorsSwapped(false)
,rimX(1)
,rimY(1)
-,m_imPreeditText(QString::null)
+,m_imPreeditText(TQString::null)
,m_imPreeditLength(0)
,m_imStart(0)
,m_imStartLine(0)
@@ -389,18 +389,18 @@ TEWidget::TEWidget(QWidget *parent, const char *name)
// konsole in opaque mode.
bY = bX = 1;
- cb = QApplication::clipboard();
- QObject::connect( (QObject*)cb, SIGNAL(selectionChanged()),
- this, SLOT(onClearSelection()) );
+ cb = TQApplication::clipboard();
+ TQObject::connect( (TQObject*)cb, TQT_SIGNAL(selectionChanged()),
+ this, TQT_SLOT(onClearSelection()) );
- scrollbar = new QScrollBar(this);
+ scrollbar = new TQScrollBar(this);
scrollbar->setCursor( arrowCursor );
- connect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int)));
+ connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int)));
- blinkT = new QTimer(this);
- connect(blinkT, SIGNAL(timeout()), this, SLOT(blinkEvent()));
- blinkCursorT = new QTimer(this);
- connect(blinkCursorT, SIGNAL(timeout()), this, SLOT(blinkCursorEvent()));
+ blinkT = new TQTimer(this);
+ connect(blinkT, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkEvent()));
+ blinkCursorT = new TQTimer(this);
+ connect(blinkCursorT, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkCursorEvent()));
setMouseMarks(true);
setColorTable(base_color_table); // init color table
@@ -488,7 +488,7 @@ enum LineEncode
#include "linefont.h"
-static void drawLineChar(QPainter& paint, int x, int y, int w, int h, uchar code)
+static void drawLineChar(TQPainter& paint, int x, int y, int w, int h, uchar code)
{
//Calculate cell midpoints, end points.
int cx = x + w/2;
@@ -554,10 +554,10 @@ static void drawLineChar(QPainter& paint, int x, int y, int w, int h, uchar code
}
-void TEWidget::drawTextFixed(QPainter &paint, int x, int y,
- QString& str, const ca *attr)
+void TEWidget::drawTextFixed(TQPainter &paint, int x, int y,
+ TQString& str, const ca *attr)
{
- QString drawstr;
+ TQString drawstr;
unsigned int nc=0;
int w;
for(unsigned int i=0;i<str.length();i++)
@@ -597,13 +597,13 @@ void TEWidget::drawTextFixed(QPainter &paint, int x, int y,
attributed string draw primitive
*/
-void TEWidget::drawAttrStr(QPainter &paint, QRect rect,
- QString& str, const ca *attr, bool pm, bool clear)
+void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
+ TQString& str, const ca *attr, bool pm, bool clear)
{
int a = font_a + m_lineSpacing / 2;
- QColor fColor = printerFriendly ? Qt::black : attr->f.color(color_table);
- QColor bColor = attr->b.color(color_table);
- QString drawstr;
+ TQColor fColor = printerFriendly ? Qt::black : attr->f.color(color_table);
+ TQColor bColor = attr->b.color(color_table);
+ TQString drawstr;
if ((attr->r & RE_CURSOR) && !isPrinting)
cursorRect = rect;
@@ -639,14 +639,14 @@ void TEWidget::drawAttrStr(QPainter &paint, QRect rect,
col = a << 24 | r << 16 | g << 8 | b;
int pixel = a << 24 | (r * a / 255) << 16 | (g * a / 255) << 8 | (b * a / 255);
- paint.fillRect(rect, QColor(col, pixel));
+ paint.fillRect(rect, TQColor(col, pixel));
} else
paint.fillRect(rect, bColor);
}
- QString tmpStr = str.simplifyWhiteSpace();
+ TQString tmpStr = str.simplifyWhiteSpace();
if ( m_isIMEdit && !tmpStr.isEmpty() ) { // imput method edit area background color
- QRect tmpRect = rect;
+ TQRect tmpRect = rect;
if ( str != m_imPreeditText ) { // ugly hack
tmpRect.setLeft( tmpRect.left() + font_w );
tmpRect.setWidth( tmpRect.width() + font_w );
@@ -661,7 +661,7 @@ void TEWidget::drawAttrStr(QPainter &paint, QRect rect,
int w = font_w * (m_imSelEnd - m_imSelStart);
int h = font_h;
- QRect tmpRect = QRect( x, y, w, h );
+ TQRect tmpRect = TQRect( x, y, w, h );
if ( str != m_imPreeditText ) { // ugly hack
tmpRect.setLeft( tmpRect.left() + font_w );
tmpRect.setWidth( tmpRect.width() + font_w );
@@ -675,7 +675,7 @@ void TEWidget::drawAttrStr(QPainter &paint, QRect rect,
if ((attr->r & RE_CURSOR) && !isPrinting) {
paint.setBackgroundMode( TransparentMode );
int h = font_h - m_lineSpacing;
- QRect r(rect.x(),rect.y()+m_lineSpacing/2,rect.width(),h);
+ TQRect r(rect.x(),rect.y()+m_lineSpacing/2,rect.width(),h);
if (hasFocus())
{
if (!cursorBlinking)
@@ -705,14 +705,14 @@ void TEWidget::drawAttrStr(QPainter &paint, QRect rect,
{
// When printing we use a bold font for bold
paint.save();
- QFont f = font();
+ TQFont f = font();
f.setBold(true);
paint.setFont(f);
}
if(!fixed_font)
{
- // The meaning of y differs between different versions of QPainter::drawText!!
+ // The meaning of y differs between different versions of TQPainter::drawText!!
int y = rect.y(); // top of rect
if ( shadow ) {
@@ -725,16 +725,16 @@ void TEWidget::drawAttrStr(QPainter &paint, QRect rect,
}
else
{
- // The meaning of y differs between different versions of QPainter::drawText!!
+ // The meaning of y differs between different versions of TQPainter::drawText!!
int y = rect.y()+a; // baseline
if ( shadow ) {
paint.setPen( Qt::black );
- paint.drawText(x+1,y+1, str, -1, bidiEnabled ? QPainter::Auto : QPainter::LTR );
+ paint.drawText(x+1,y+1, str, -1, bidiEnabled ? TQPainter::Auto : TQPainter::LTR );
paint.setPen(fColor);
}
- paint.drawText(x,y, str, -1, bidiEnabled ? QPainter::Auto : QPainter::LTR );
+ paint.drawText(x,y, str, -1, bidiEnabled ? TQPainter::Auto : TQPainter::LTR );
}
if (attr->isBold(color_table) && isPrinting)
@@ -751,18 +751,18 @@ void TEWidget::drawAttrStr(QPainter &paint, QRect rect,
int x = rect.x()+1;
if(!fixed_font)
{
- // The meaning of y differs between different versions of QPainter::drawText!!
+ // The meaning of y differs between different versions of TQPainter::drawText!!
int y = rect.y(); // top of rect
drawTextFixed(paint, x, y, str, attr);
}
else
{
- // The meaning of y differs between different versions of QPainter::drawText!!
+ // The meaning of y differs between different versions of TQPainter::drawText!!
int y = rect.y()+a; // baseline
if (bidiEnabled)
paint.drawText(x,y, str, -1);
else
- paint.drawText(x,y, str, -1, QPainter::LTR);
+ paint.drawText(x,y, str, -1, TQPainter::LTR);
}
paint.setClipping(false);
}
@@ -777,7 +777,7 @@ void TEWidget::drawAttrStr(QPainter &paint, QRect rect,
*/
void TEWidget::setCursorPos(const int curx, const int cury)
{
- QPoint tL = contentsRect().topLeft();
+ TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
int tLy = tL.y();
@@ -805,12 +805,12 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
updateImageSize(); // Create image
int y,x,len;
- const QPixmap* pm = backgroundPixmap();
- QPainter paint;
+ const TQPixmap* pm = backgroundPixmap();
+ TQPainter paint;
setUpdatesEnabled(false);
paint.begin( this );
- QPoint tL = contentsRect().topLeft();
+ TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
int tLy = tL.y();
hasBlinker = false;
@@ -821,7 +821,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
int lins = QMIN(this->lines, QMAX(0,lines ));
int cols = QMIN(this->columns,QMAX(0,columns));
- QChar *disstrU = new QChar[cols];
+ TQChar *disstrU = new QChar[cols];
char *dirtyMask = (char *) malloc(cols+2);
//{ static int cnt = 0; printf("setImage %d\n",cnt++); }
@@ -880,7 +880,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
disstrU[p++] = c; //fontMap(c);
}
- QString unistr(disstrU, p);
+ TQString unistr(disstrU, p);
// for XIM on the spot input style
m_isIMEdit = m_isIMSel = false;
@@ -905,7 +905,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
if (doubleWidth)
fixed_font = false;
drawAttrStr(paint,
- QRect(bX+tLx+font_w*x,bY+tLy+font_h*y,font_w*len,font_h),
+ TQRect(bX+tLx+font_w*x,bY+tLy+font_h*y,font_w*len,font_h),
unistr, &ext[x], pm != NULL, true);
fixed_font = save_fixed_font;
x += len - 1;
@@ -933,25 +933,25 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
}
if (!mResizeWidget)
{
- mResizeWidget = new QFrame(this);
- QFont f = KGlobalSettings::generalFont();
+ mResizeWidget = new TQFrame(this);
+ TQFont f = KGlobalSettings::generalFont();
int fs = f.pointSize();
if (fs == -1)
- fs = QFontInfo(f).pointSize();
+ fs = TQFontInfo(f).pointSize();
f.setPointSize((fs*3)/2);
f.setBold(true);
mResizeWidget->setFont(f);
- mResizeWidget->setFrameShape((QFrame::Shape) (QFrame::Box|QFrame::Raised));
+ mResizeWidget->setFrameShape((TQFrame::Shape) (TQFrame::Box|TQFrame::Raised));
mResizeWidget->setMidLineWidth(4);
- QBoxLayout *l = new QVBoxLayout( mResizeWidget, 10);
- mResizeLabel = new QLabel(i18n("Size: XXX x XXX"), mResizeWidget);
+ TQBoxLayout *l = new TQVBoxLayout( mResizeWidget, 10);
+ mResizeLabel = new TQLabel(i18n("Size: XXX x XXX"), mResizeWidget);
l->addWidget(mResizeLabel, 1, AlignCenter);
mResizeWidget->setMinimumWidth(mResizeLabel->fontMetrics().width(i18n("Size: XXX x XXX"))+20);
mResizeWidget->setMinimumHeight(mResizeLabel->sizeHint().height()+20);
- mResizeTimer = new QTimer(this);
- connect(mResizeTimer, SIGNAL(timeout()), mResizeWidget, SLOT(hide()));
+ mResizeTimer = new TQTimer(this);
+ connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide()));
}
- QString sizeStr = i18n("Size: %1 x %2").arg(columns).arg(lines);
+ TQString sizeStr = i18n("Size: %1 x %2").arg(columns).arg(lines);
mResizeLabel->setText(sizeStr);
mResizeWidget->move((width()-mResizeWidget->width())/2,
(height()-mResizeWidget->height())/2+20);
@@ -982,10 +982,10 @@ void TEWidget::setBlinkingCursor(bool blink)
image is used and the painting bound by the PaintEvent box.
*/
-void TEWidget::paintEvent( QPaintEvent* pe )
+void TEWidget::paintEvent( TQPaintEvent* pe )
{
- const QPixmap* pm = backgroundPixmap();
- QPainter paint;
+ const TQPixmap* pm = backgroundPixmap();
+ TQPainter paint;
setUpdatesEnabled(false);
paint.begin( this );
paint.setBackgroundMode( TransparentMode );
@@ -996,7 +996,7 @@ void TEWidget::paintEvent( QPaintEvent* pe )
// can thus be larger than the image, but less then the size
// of one character.
- QRect rect = pe->rect().intersect(contentsRect());
+ TQRect rect = pe->rect().intersect(contentsRect());
paintContents(paint, rect, pm != 0);
@@ -1008,7 +1008,7 @@ void TEWidget::paintEvent( QPaintEvent* pe )
// area between the terminal image and the frame border.
// Calculate the contents rect excluding scroll bar.
- QRect innerRect = contentsRect();
+ TQRect innerRect = contentsRect();
if( scrollLoc != SCRNONE )
innerRect.setWidth( innerRect.width() - scrollbar->width() );
@@ -1016,12 +1016,12 @@ void TEWidget::paintEvent( QPaintEvent* pe )
innerRect.setHeight( innerRect.height() );
// Calculate the emulation rect (area needed for actual terminal contents)
- QRect emurect( contentsRect().topLeft(), QSize( columns * font_w + 2 * rimX, lines * font_h + 2 * rimY ));
+ TQRect emurect( contentsRect().topLeft(), TQSize( columns * font_w + 2 * rimX, lines * font_h + 2 * rimY ));
// Now erase() the remaining pixels on all sides of the emulation
// Top
- QRect er( innerRect );
+ TQRect er( innerRect );
er.setBottom( emurect.top() );
erase( er );
@@ -1047,7 +1047,7 @@ void TEWidget::paintEvent( QPaintEvent* pe )
setUpdatesEnabled(true);
}
-void TEWidget::print(QPainter &paint, bool friendly, bool exact)
+void TEWidget::print(TQPainter &paint, bool friendly, bool exact)
{
bool save_fixed_font = fixed_font;
bool save_blinking = blinking;
@@ -1061,10 +1061,10 @@ void TEWidget::print(QPainter &paint, bool friendly, bool exact)
if (exact)
{
- QPixmap pm(contentsRect().right(), contentsRect().bottom());
+ TQPixmap pm(contentsRect().right(), contentsRect().bottom());
pm.fill();
- QPainter pm_paint;
+ TQPainter pm_paint;
pm_paint.begin(&pm, this);
paintContents(pm_paint, contentsRect(), true);
pm_paint.end();
@@ -1083,9 +1083,9 @@ void TEWidget::print(QPainter &paint, bool friendly, bool exact)
blinking = save_blinking;
}
-void TEWidget::paintContents(QPainter &paint, const QRect &rect, bool pm)
+void TEWidget::paintContents(TQPainter &paint, const TQRect &rect, bool pm)
{
- QPoint tL = contentsRect().topLeft();
+ TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
int tLy = tL.y();
@@ -1094,7 +1094,7 @@ void TEWidget::paintContents(QPainter &paint, const QRect &rect, bool pm)
int rlx = QMIN(columns-1, QMAX(0,(rect.right() - tLx - bX ) / font_w));
int rly = QMIN(lines-1, QMAX(0,(rect.bottom() - tLy - bY ) / font_h));
- QChar *disstrU = new QChar[columns];
+ TQChar *disstrU = new QChar[columns];
for (int y = luy; y <= rly; y++)
{
Q_UINT16 c = image[loc(lux,y)].c;
@@ -1136,9 +1136,9 @@ void TEWidget::paintContents(QPainter &paint, const QRect &rect, bool pm)
fixed_font = false;
if (doubleWidth)
fixed_font = false;
- QString unistr(disstrU,p);
+ TQString unistr(disstrU,p);
drawAttrStr(paint,
- QRect(bX+tLx+font_w*x,bY+tLy+font_h*y,font_w*len,font_h),
+ TQRect(bX+tLx+font_w*x,bY+tLy+font_h*y,font_w*len,font_h),
unistr, &image[loc(x,y)], pm, !(isBlinkEvent || isPrinting));
fixed_font = save_fixed_font;
}
@@ -1168,7 +1168,7 @@ void TEWidget::blinkCursorEvent()
/* */
/* ------------------------------------------------------------------------- */
-void TEWidget::resizeEvent(QResizeEvent*)
+void TEWidget::resizeEvent(TQResizeEvent*)
{
updateImageSize();
}
@@ -1178,7 +1178,7 @@ void TEWidget::propagateSize()
if (isFixedSize)
{
setSize(columns, lines);
- QFrame::setFixedSize(sizeHint());
+ TQFrame::setFixedSize(sizeHint());
parentWidget()->adjustSize();
parentWidget()->setFixedSize(parentWidget()->sizeHint());
return;
@@ -1226,13 +1226,13 @@ void TEWidget::scrollChanged(int)
void TEWidget::setScroll(int cursor, int slines)
{
//kdDebug(1211)<<"TEWidget::setScroll() disconnect()"<<endl;
- disconnect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int)));
+ disconnect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int)));
//kdDebug(1211)<<"TEWidget::setScroll() setRange()"<<endl;
scrollbar->setRange(0,slines);
//kdDebug(1211)<<"TEWidget::setScroll() setSteps()"<<endl;
scrollbar->setSteps(1,lines);
scrollbar->setValue(cursor);
- connect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int)));
+ connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int)));
//kdDebug(1211)<<"TEWidget::setScroll() done"<<endl;
}
@@ -1279,7 +1279,7 @@ void TEWidget::setScrollbarLocation(int loc)
/*!
*/
-void TEWidget::mousePressEvent(QMouseEvent* ev)
+void TEWidget::mousePressEvent(TQMouseEvent* ev)
{
//printf("press [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button());
@@ -1289,11 +1289,11 @@ void TEWidget::mousePressEvent(QMouseEvent* ev)
}
if ( !contentsRect().contains(ev->pos()) ) return;
- QPoint tL = contentsRect().topLeft();
+ TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
int tLy = tL.y();
- QPoint pos = QPoint((ev->x()-tLx-bX+(font_w/2))/font_w,(ev->y()-tLy-bY)/font_h);
+ TQPoint pos = TQPoint((ev->x()-tLx-bX+(font_w/2))/font_w,(ev->y()-tLy-bY)/font_h);
//printf("press top left [%d,%d] by=%d\n",tLx,tLy, bY);
if ( ev->button() == LeftButton)
@@ -1343,7 +1343,7 @@ void TEWidget::mousePressEvent(QMouseEvent* ev)
else if ( ev->button() == RightButton )
{
if (mouse_marks || (ev->state() & ShiftButton)) {
- configureRequestPoint = QPoint( ev->x(), ev->y() );
+ configureRequestPoint = TQPoint( ev->x(), ev->y() );
emit configureRequest( this, ev->state()&(ShiftButton|ControlButton), ev->x(), ev->y() );
}
else
@@ -1351,7 +1351,7 @@ void TEWidget::mousePressEvent(QMouseEvent* ev)
}
}
-void TEWidget::mouseMoveEvent(QMouseEvent* ev)
+void TEWidget::mouseMoveEvent(TQMouseEvent* ev)
{
// for auto-hiding the cursor, we need mouseTracking
if (ev->state() == NoButton ) return;
@@ -1388,10 +1388,10 @@ void TEWidget::setSelectionEnd()
extendSelection( configureRequestPoint );
}
-void TEWidget::extendSelection( QPoint pos )
+void TEWidget::extendSelection( TQPoint pos )
{
//if ( !contentsRect().contains(ev->pos()) ) return;
- QPoint tL = contentsRect().topLeft();
+ TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
int tLy = tL.y();
int scroll = scrollbar->value();
@@ -1401,7 +1401,7 @@ void TEWidget::extendSelection( QPoint pos )
// this widget.
// Adjust position within text area bounds. See FIXME above.
- QPoint oldpos = pos;
+ TQPoint oldpos = pos;
if ( pos.x() < tLx+bX ) pos.setX( tLx+bX );
if ( pos.x() > tLx+bX+columns*font_w-1 ) pos.setX( tLx+bX+columns*font_w );
if ( pos.y() < tLy+bY ) pos.setY( tLy+bY );
@@ -1419,11 +1419,11 @@ void TEWidget::extendSelection( QPoint pos )
scrollbar->setValue(scrollbar->value()-yMouseScroll); // scrollback
}
- QPoint here = QPoint((pos.x()-tLx-bX+(font_w/2))/font_w,(pos.y()-tLy-bY)/font_h);
- QPoint ohere;
- QPoint iPntSelCorr = iPntSel;
+ TQPoint here = TQPoint((pos.x()-tLx-bX+(font_w/2))/font_w,(pos.y()-tLy-bY)/font_h);
+ TQPoint ohere;
+ TQPoint iPntSelCorr = iPntSel;
iPntSelCorr.ry() -= scrollbar->value();
- QPoint pntSelCorr = pntSel;
+ TQPoint pntSelCorr = pntSel;
pntSelCorr.ry() -= scrollbar->value();
bool swapping = false;
@@ -1440,7 +1440,7 @@ void TEWidget::extendSelection( QPoint pos )
swapping = left_not_right != old_left_not_right;
// Find left (left_not_right ? from here : from start)
- QPoint left = left_not_right ? here : iPntSelCorr;
+ TQPoint left = left_not_right ? here : iPntSelCorr;
i = loc(left.x(),left.y());
if (i>=0 && i<=image_size) {
selClass = charClass(image[i].c);
@@ -1449,7 +1449,7 @@ void TEWidget::extendSelection( QPoint pos )
}
// Find left (left_not_right ? from start : from here)
- QPoint right = left_not_right ? iPntSelCorr : here;
+ TQPoint right = left_not_right ? iPntSelCorr : here;
i = loc(right.x(),right.y());
if (i>=0 && i<=image_size) {
selClass = charClass(image[i].c);
@@ -1474,8 +1474,8 @@ void TEWidget::extendSelection( QPoint pos )
// Extend to complete line
bool above_not_below = ( here.y() < iPntSelCorr.y() );
- QPoint above = above_not_below ? here : iPntSelCorr;
- QPoint below = above_not_below ? iPntSelCorr : here;
+ TQPoint above = above_not_below ? here : iPntSelCorr;
+ TQPoint below = above_not_below ? iPntSelCorr : here;
while (above.y()>0 && m_line_wrapped[above.y()-1])
above.ry()--;
@@ -1495,7 +1495,7 @@ void TEWidget::extendSelection( QPoint pos )
here = below; ohere = above;
}
- QPoint newSelBegin = QPoint( ohere.x(), ohere.y() );
+ TQPoint newSelBegin = TQPoint( ohere.x(), ohere.y() );
swapping = !(tripleSelBegin==newSelBegin);
tripleSelBegin = newSelBegin;
@@ -1515,10 +1515,10 @@ void TEWidget::extendSelection( QPoint pos )
swapping = left_not_right != old_left_not_right;
// Find left (left_not_right ? from here : from start)
- QPoint left = left_not_right ? here : iPntSelCorr;
+ TQPoint left = left_not_right ? here : iPntSelCorr;
// Find left (left_not_right ? from start : from here)
- QPoint right = left_not_right ? iPntSelCorr : here;
+ TQPoint right = left_not_right ? iPntSelCorr : here;
if ( right.x() > 0 && !column_selection_mode )
{
i = loc(right.x(),right.y());
@@ -1567,7 +1567,7 @@ void TEWidget::extendSelection( QPoint pos )
emit extendSelectionSignal( here.x()+offset, here.y() );
}
-void TEWidget::mouseReleaseEvent(QMouseEvent* ev)
+void TEWidget::mouseReleaseEvent(TQMouseEvent* ev)
{
//printf("release [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button());
if ( ev->button() == LeftButton)
@@ -1588,7 +1588,7 @@ void TEWidget::mouseReleaseEvent(QMouseEvent* ev)
// outside the range. The procedure used in `mouseMoveEvent'
// applies here, too.
- QPoint tL = contentsRect().topLeft();
+ TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
int tLy = tL.y();
@@ -1602,7 +1602,7 @@ void TEWidget::mouseReleaseEvent(QMouseEvent* ev)
}
if ( !mouse_marks && ((ev->button() == RightButton && !(ev->state() & ShiftButton))
|| ev->button() == MidButton) ) {
- QPoint tL = contentsRect().topLeft();
+ TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
int tLy = tL.y();
@@ -1611,14 +1611,14 @@ void TEWidget::mouseReleaseEvent(QMouseEvent* ev)
}
}
-void TEWidget::mouseDoubleClickEvent(QMouseEvent* ev)
+void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev)
{
if ( ev->button() != LeftButton) return;
- QPoint tL = contentsRect().topLeft();
+ TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
int tLy = tL.y();
- QPoint pos = QPoint((ev->x()-tLx-bX)/font_w,(ev->y()-tLy-bY)/font_h);
+ TQPoint pos = TQPoint((ev->x()-tLx-bX)/font_w,(ev->y()-tLy-bY)/font_h);
// pass on double click as two clicks.
if (!mouse_marks && !(ev->state() & ShiftButton))
@@ -1631,8 +1631,8 @@ void TEWidget::mouseDoubleClickEvent(QMouseEvent* ev)
emit clearSelectionSignal();
- QPoint bgnSel = pos;
- QPoint endSel = pos;
+ TQPoint bgnSel = pos;
+ TQPoint endSel = pos;
int i = loc(bgnSel.x(),bgnSel.y());
iPntSel = bgnSel;
iPntSel.ry() += scrollbar->value();
@@ -1657,7 +1657,7 @@ void TEWidget::mouseDoubleClickEvent(QMouseEvent* ev)
endSel.setX(x);
// In word selection mode don't select @ (64) if at end of word.
- if ( ( QChar( image[i].c ) == '@' ) && ( ( endSel.x() - bgnSel.x() ) > 0 ) )
+ if ( ( TQChar( image[i].c ) == '@' ) && ( ( endSel.x() - bgnSel.x() ) > 0 ) )
endSel.setX( x - 1 );
actSel = 2; // within selection
@@ -1666,22 +1666,22 @@ void TEWidget::mouseDoubleClickEvent(QMouseEvent* ev)
}
possibleTripleClick=true;
- QTimer::singleShot(QApplication::doubleClickInterval(),this,SLOT(tripleClickTimeout()));
+ TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout()));
}
-void TEWidget::wheelEvent( QWheelEvent* ev )
+void TEWidget::wheelEvent( TQWheelEvent* ev )
{
if (ev->orientation() != Qt::Vertical)
return;
if ( mouse_marks )
- QApplication::sendEvent(scrollbar, ev);
+ TQApplication::sendEvent(scrollbar, ev);
else
{
- QPoint tL = contentsRect().topLeft();
+ TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
int tLy = tL.y();
- QPoint pos = QPoint((ev->x()-tLx-bX)/font_w,(ev->y()-tLy-bY)/font_h);
+ TQPoint pos = TQPoint((ev->x()-tLx-bX)/font_w,(ev->y()-tLy-bY)/font_h);
emit mouseSignal( ev->delta() > 0 ? 4 : 5, pos.x() + 1, pos.y() + 1 +scrollbar->value() -scrollbar->maxValue() );
}
}
@@ -1691,12 +1691,12 @@ void TEWidget::tripleClickTimeout()
possibleTripleClick=false;
}
-void TEWidget::mouseTripleClickEvent(QMouseEvent* ev)
+void TEWidget::mouseTripleClickEvent(TQMouseEvent* ev)
{
- QPoint tL = contentsRect().topLeft();
+ TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
int tLy = tL.y();
- iPntSel = QPoint((ev->x()-tLx-bX)/font_w,(ev->y()-tLy-bY)/font_h);
+ iPntSel = TQPoint((ev->x()-tLx-bX)/font_w,(ev->y()-tLy-bY)/font_h);
emit clearSelectionSignal();
@@ -1717,11 +1717,11 @@ void TEWidget::mouseTripleClickEvent(QMouseEvent* ev)
{ i--; if (x>0) x--; else {x=columns-1; iPntSel.ry()--;} }
emit beginSelectionSignal( x, iPntSel.y(), false );
- tripleSelBegin = QPoint( x, iPntSel.y() );
+ tripleSelBegin = TQPoint( x, iPntSel.y() );
}
else {
emit beginSelectionSignal( 0, iPntSel.y(), false );
- tripleSelBegin = QPoint( 0, iPntSel.y() );
+ tripleSelBegin = TQPoint( 0, iPntSel.y() );
}
while (iPntSel.y()<lines-1 && m_line_wrapped[iPntSel.y()])
@@ -1733,14 +1733,14 @@ void TEWidget::mouseTripleClickEvent(QMouseEvent* ev)
iPntSel.ry() += scrollbar->value();
}
-void TEWidget::focusInEvent( QFocusEvent * )
+void TEWidget::focusInEvent( TQFocusEvent * )
{
repaint(cursorRect, true); // *do* erase area, to get rid of the
// hollow cursor rectangle.
}
-void TEWidget::focusOutEvent( QFocusEvent * )
+void TEWidget::focusOutEvent( TQFocusEvent * )
{
repaint(cursorRect, true); // don't erase area
}
@@ -1750,13 +1750,13 @@ bool TEWidget::focusNextPrevChild( bool next )
if (next)
return false; // This disables changing the active part in konqueror
// when pressing Tab
- return QFrame::focusNextPrevChild( next );
+ return TQFrame::focusNextPrevChild( next );
}
int TEWidget::charClass(UINT16 ch) const
{
- QChar qch=QChar(ch);
+ TQChar qch=TQChar(ch);
if ( qch.isSpace() ) return ' ';
if ( qch.isLetterOrNumber() || word_characters.contains(qch, false) )
@@ -1766,7 +1766,7 @@ int TEWidget::charClass(UINT16 ch) const
return 1;
}
-void TEWidget::setWordCharacters(QString wc)
+void TEWidget::setWordCharacters(TQString wc)
{
word_characters = wc;
}
@@ -1785,10 +1785,10 @@ void TEWidget::setMouseMarks(bool on)
#undef KeyPress
-void TEWidget::emitText(QString text)
+void TEWidget::emitText(TQString text)
{
if (!text.isEmpty()) {
- QKeyEvent e(QEvent::KeyPress, 0,-1,0, text);
+ TQKeyEvent e(TQEvent::KeyPress, 0,-1,0, text);
emit keyPressedSignal(&e); // expose as a big fat keypress event
}
}
@@ -1796,33 +1796,33 @@ void TEWidget::emitText(QString text)
void TEWidget::emitSelection(bool useXselection,bool appendReturn)
// Paste Clipboard by simulating keypress events
{
- QApplication::clipboard()->setSelectionMode( useXselection );
- QString text = QApplication::clipboard()->text();
+ TQApplication::clipboard()->setSelectionMode( useXselection );
+ TQString text = TQApplication::clipboard()->text();
if(appendReturn)
text.append("\r");
if ( ! text.isEmpty() )
{
text.replace("\n", "\r");
- QKeyEvent e(QEvent::KeyPress, 0,-1,0, text);
+ TQKeyEvent e(TQEvent::KeyPress, 0,-1,0, text);
emit keyPressedSignal(&e); // expose as a big fat keypress event
emit clearSelectionSignal();
}
- QApplication::clipboard()->setSelectionMode( false );
+ TQApplication::clipboard()->setSelectionMode( false );
}
-void TEWidget::setSelection(const QString& t)
+void TEWidget::setSelection(const TQString& t)
{
// Disconnect signal while WE set the clipboard
- QClipboard *cb = QApplication::clipboard();
- QObject::disconnect( cb, SIGNAL(selectionChanged()),
- this, SLOT(onClearSelection()) );
+ QClipboard *cb = TQApplication::clipboard();
+ TQObject::disconnect( cb, TQT_SIGNAL(selectionChanged()),
+ this, TQT_SLOT(onClearSelection()) );
cb->setSelectionMode( true );
cb->setText(t);
cb->setSelectionMode( false );
- QObject::connect( cb, SIGNAL(selectionChanged()),
- this, SLOT(onClearSelection()) );
+ TQObject::connect( cb, TQT_SIGNAL(selectionChanged()),
+ this, TQT_SLOT(onClearSelection()) );
}
void TEWidget::copyClipboard()
@@ -1870,19 +1870,19 @@ void TEWidget::doScroll(int lines)
scrollbar->setValue(scrollbar->value()+lines);
}
-bool TEWidget::eventFilter( QObject *obj, QEvent *e )
+bool TEWidget::eventFilter( TQObject *obj, TQEvent *e )
{
- if ( (e->type() == QEvent::Accel ||
- e->type() == QEvent::AccelAvailable ) && qApp->focusWidget() == this )
+ if ( (e->type() == TQEvent::Accel ||
+ e->type() == TQEvent::AccelAvailable ) && qApp->focusWidget() == this )
{
- static_cast<QKeyEvent *>( e )->ignore();
+ static_cast<TQKeyEvent *>( e )->ignore();
return false;
}
if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ )
return false; // not us
- if ( e->type() == QEvent::KeyPress )
+ if ( e->type() == TQEvent::KeyPress )
{
- QKeyEvent* ke = (QKeyEvent*)e;
+ TQKeyEvent* ke = (TQKeyEvent*)e;
actSel=0; // Key stroke implies a screen update, so TEWidget won't
// know where the current selection is.
@@ -1900,26 +1900,26 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
// in Qt2 when key events were propagated up the tree
// (unhandled? -> parent widget) they passed the event filter only once at
// the beginning. in qt3 this has changed, that is, the event filter is
- // called each time the event is sent (see loop in QApplication::notify,
+ // called each time the event is sent (see loop in TQApplication::notify,
// when internalNotify() is called for KeyPress, whereas internalNotify
// activates also the global event filter) . That's why we stop propagation
// here.
return true;
}
- if ( e->type() == QEvent::Enter )
+ if ( e->type() == TQEvent::Enter )
{
- QObject::disconnect( (QObject*)cb, SIGNAL(dataChanged()),
- this, SLOT(onClearSelection()) );
+ TQObject::disconnect( (TQObject*)cb, TQT_SIGNAL(dataChanged()),
+ this, TQT_SLOT(onClearSelection()) );
}
- if ( e->type() == QEvent::Leave )
+ if ( e->type() == TQEvent::Leave )
{
- QObject::connect( (QObject*)cb, SIGNAL(dataChanged()),
- this, SLOT(onClearSelection()) );
+ TQObject::connect( (TQObject*)cb, TQT_SIGNAL(dataChanged()),
+ this, TQT_SLOT(onClearSelection()) );
}
- return QFrame::eventFilter( obj, e );
+ return TQFrame::eventFilter( obj, e );
}
-void TEWidget::imStartEvent( QIMEvent */*e*/ )
+void TEWidget::imStartEvent( TQIMEvent */*e*/ )
{
m_imStart = m_cursorCol;
m_imStartLine = m_cursorLine;
@@ -1929,16 +1929,16 @@ void TEWidget::imStartEvent( QIMEvent */*e*/ )
m_isIMEdit = m_isIMSel = false;
}
-void TEWidget::imComposeEvent( QIMEvent *e )
+void TEWidget::imComposeEvent( TQIMEvent *e )
{
- QString text = QString::null;
+ TQString text = TQString::null;
if ( m_imPreeditLength > 0 ) {
text.fill( '\010', m_imPreeditLength );
}
m_imEnd = m_imStart + string_width( e->text() );
- QString tmpStr = e->text().left( e->cursorPos() );
+ TQString tmpStr = e->text().left( e->cursorPos() );
m_imSelStart = m_imStart + string_width( tmpStr );
tmpStr = e->text().mid( e->cursorPos(), e->selectionLength() );
@@ -1948,14 +1948,14 @@ void TEWidget::imComposeEvent( QIMEvent *e )
text += e->text();
if ( text.length() > 0 ) {
- QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
+ TQKeyEvent ke( TQEvent::KeyPress, 0, -1, 0, text );
emit keyPressedSignal( &ke );
}
}
-void TEWidget::imEndEvent( QIMEvent *e )
+void TEWidget::imEndEvent( TQIMEvent *e )
{
- QString text = QString::null;
+ TQString text = TQString::null;
if ( m_imPreeditLength > 0 ) {
text.fill( '\010', m_imPreeditLength );
}
@@ -1963,15 +1963,15 @@ void TEWidget::imEndEvent( QIMEvent *e )
m_imEnd = m_imSelStart = m_imSelEnd = 0;
text += e->text();
if ( text.length() > 0 ) {
- QKeyEvent ke( QEvent::KeyPress, 0, -1, 0, text );
+ TQKeyEvent ke( TQEvent::KeyPress, 0, -1, 0, text );
emit keyPressedSignal( &ke );
}
- QPoint tL = contentsRect().topLeft();
+ TQPoint tL = contentsRect().topLeft();
int tLx = tL.x();
int tLy = tL.y();
- QRect repaintRect = QRect( bX+tLx, bY+tLy+font_h*m_imStartLine,
+ TQRect repaintRect = TQRect( bX+tLx, bY+tLy+font_h*m_imStartLine,
contentsRect().width(), contentsRect().height() );
m_imStart = 0;
m_imPreeditLength = 0;
@@ -1982,11 +1982,11 @@ void TEWidget::imEndEvent( QIMEvent *e )
// Override any Ctrl+<key> accelerator when pressed with the keyboard
// focus in TEWidget, so that the key will be passed to the terminal instead.
-bool TEWidget::event( QEvent *e )
+bool TEWidget::event( TQEvent *e )
{
- if ( e->type() == QEvent::AccelOverride )
+ if ( e->type() == TQEvent::AccelOverride )
{
- QKeyEvent *ke = static_cast<QKeyEvent *>( e );
+ TQKeyEvent *ke = static_cast<TQKeyEvent *>( e );
KKey key( ke );
int keyCodeQt = key.keyCodeQt();
@@ -2005,7 +2005,7 @@ bool TEWidget::event( QEvent *e )
return true;
}
}
- return QFrame::event( e );
+ return TQFrame::event( e );
}
/* ------------------------------------------------------------------------- */
@@ -2031,7 +2031,7 @@ void TEWidget::setBellMode(int mode)
m_bellMode=mode;
}
-void TEWidget::Bell(bool visibleSession, QString message)
+void TEWidget::Bell(bool visibleSession, TQString message)
{
if (bellTimer.isActive())
return;
@@ -2060,7 +2060,7 @@ void TEWidget::Bell(bool visibleSession, QString message)
bellTimer.start(BELLVISUAL_DELAY,true);
swapColorTable();
- QTimer::singleShot(200,this,SLOT(swapColorTable()));
+ TQTimer::singleShot(200,this,TQT_SLOT(swapColorTable()));
}
}
@@ -2097,7 +2097,7 @@ void TEWidget::clearImage()
void TEWidget::calcGeometry()
{
- scrollbar->resize(QApplication::style().pixelMetric(QStyle::PM_ScrollBarExtent),
+ scrollbar->resize(TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent),
contentsRect().height());
switch(scrollLoc)
{
@@ -2115,7 +2115,7 @@ void TEWidget::calcGeometry()
case SCRRIGHT:
bX = rimX;
contentWidth = contentsRect().width() - 2 * rimX - scrollbar->width();
- scrollbar->move(contentsRect().topRight() - QPoint(scrollbar->width()-1,0));
+ scrollbar->move(contentsRect().topRight() - TQPoint(scrollbar->width()-1,0));
scrollbar->show();
break;
}
@@ -2152,7 +2152,7 @@ void TEWidget::setSize(int cols, int lins)
int frw = width() - contentsRect().width();
int frh = height() - contentsRect().height();
int scw = (scrollLoc==SCRNONE?0:scrollbar->width());
- m_size = QSize(font_w*cols + 2*rimX + frw + scw, font_h*lins + 2*rimY + frh + /* mysterious */ 1);
+ m_size = TQSize(font_w*cols + 2*rimX + frw + scw, font_h*lins + 2*rimY + frh + /* mysterious */ 1);
updateGeometry();
}
@@ -2167,15 +2167,15 @@ void TEWidget::setFixedSize(int cols, int lins)
makeImage();
}
setSize(cols, lins);
- QFrame::setFixedSize(m_size);
+ TQFrame::setFixedSize(m_size);
}
-QSize TEWidget::sizeHint() const
+TQSize TEWidget::sizeHint() const
{
return m_size;
}
-void TEWidget::styleChange(QStyle &)
+void TEWidget::styleChange(TQStyle &)
{
propagateSize();
}
@@ -2187,15 +2187,15 @@ void TEWidget::styleChange(QStyle &)
/* */
/* --------------------------------------------------------------------- */
-void TEWidget::dragEnterEvent(QDragEnterEvent* e)
+void TEWidget::dragEnterEvent(TQDragEnterEvent* e)
{
- e->accept(QTextDrag::canDecode(e) ||
+ e->accept(TQTextDrag::canDecode(e) ||
KURLDrag::canDecode(e));
}
enum dropPopupOptions { paste, cd, cp, ln, mv };
-void TEWidget::dropEvent(QDropEvent* event)
+void TEWidget::dropEvent(TQDropEvent* event)
{
if (m_drop==0)
{
@@ -2206,7 +2206,7 @@ void TEWidget::dropEvent(QDropEvent* event)
m_drop->insertItem( "cp", cp );
m_drop->insertItem( "ln", ln );
m_drop->insertItem( "mv", mv );
- connect(m_drop, SIGNAL(activated(int)), SLOT(drop_menu_activated(int)));
+ connect(m_drop, TQT_SIGNAL(activated(int)), TQT_SLOT(drop_menu_activated(int)));
};
// The current behaviour when url(s) are dropped is
// * if there is only ONE url and if it's a LOCAL one, ask for paste or cd/cp/ln/mv
@@ -2232,10 +2232,10 @@ void TEWidget::dropEvent(QDropEvent* event)
m_drop->setItemEnabled(cd,false);
}
KURL url = KIO::NetAccess::mostLocalURL( *it, 0 );
- QString tmp;
+ TQString tmp;
if (url.isLocalFile()) {
tmp = url.path(); // local URL : remove protocol. This helps "ln" & "cd" and doesn't harm the others
- } else if ( url.protocol() == QString::fromLatin1( "mailto" ) ) {
+ } else if ( url.protocol() == TQString::fromLatin1( "mailto" ) ) {
justPaste = true;
break;
} else {
@@ -2251,7 +2251,7 @@ void TEWidget::dropEvent(QDropEvent* event)
if (!justPaste) m_drop->popup(mapToGlobal(event->pos()));
}
}
- if(justPaste && QTextDrag::decode(event, dropText)) {
+ if(justPaste && TQTextDrag::decode(event, dropText)) {
kdDebug(1211) << "Drop:" << dropText.local8Bit() << "\n";
emit sendStringToEmu(dropText.local8Bit());
// Paste it
@@ -2261,9 +2261,9 @@ void TEWidget::dropEvent(QDropEvent* event)
void TEWidget::doDrag()
{
dragInfo.state = diDragging;
- dragInfo.dragObject = new QTextDrag(QApplication::clipboard()->text(QClipboard::Selection), this);
+ dragInfo.dragObject = new TQTextDrag(TQApplication::clipboard()->text(QClipboard::Selection), this);
dragInfo.dragObject->dragCopy();
- // Don't delete the QTextDrag object. Qt will delete it when it's done with it.
+ // Don't delete the TQTextDrag object. Qt will delete it when it's done with it.
}
void TEWidget::drop_menu_activated(int item)
@@ -2279,7 +2279,7 @@ void TEWidget::drop_menu_activated(int item)
case cd:
emit sendStringToEmu("cd ");
struct stat statbuf;
- if ( ::stat( QFile::encodeName( dropText ), &statbuf ) == 0 )
+ if ( ::stat( TQFile::encodeName( dropText ), &statbuf ) == 0 )
{
if ( !S_ISDIR(statbuf.st_mode) )
{
diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h
index bb4d2c610..35794167a 100644
--- a/konsole/konsole/TEWidget.h
+++ b/konsole/konsole/TEWidget.h
@@ -21,12 +21,12 @@
#ifndef TE_WIDGET_H
#define TE_WIDGET_H
-#include <qbitarray.h>
-#include <qwidget.h>
-#include <qcolor.h>
-#include <qkeycode.h>
-#include <qtimer.h>
-#include <qscrollbar.h>
+#include <tqbitarray.h>
+#include <tqwidget.h>
+#include <tqcolor.h>
+#include <tqkeycode.h>
+#include <tqtimer.h>
+#include <tqscrollbar.h>
#include <kpopupmenu.h>
@@ -47,13 +47,13 @@ class TEWidget : public QFrame
friend class Konsole;
public:
- TEWidget(QWidget *parent=0, const char *name=0);
+ TEWidget(TQWidget *parent=0, const char *name=0);
virtual ~TEWidget();
void setBlendColor(const QRgb color) { blend_color = color; }
- void setDefaultBackColor(const QColor& color);
- QColor getDefaultBackColor();
+ void setDefaultBackColor(const TQColor& color);
+ TQColor getDefaultBackColor();
const ColorEntry* getColorTable() const;
void setColorTable(const ColorEntry table[]);
@@ -78,10 +78,10 @@ public:
uint lineSpacing() const;
void emitSelection(bool useXselection,bool appendReturn);
- void emitText(QString text);
+ void emitText(TQString text);
void setImage(const ca* const newimg, int lines, int columns);
- void setLineWrapped(QBitArray line_wrapped) { m_line_wrapped=line_wrapped; }
+ void setLineWrapped(TQBitArray line_wrapped) { m_line_wrapped=line_wrapped; }
void setCursorPos(const int curx, const int cury);
@@ -96,32 +96,32 @@ public:
void updateImageSize();
void setSize(int cols, int lins);
void setFixedSize(int cols, int lins);
- QSize sizeHint() const;
+ TQSize sizeHint() const;
- void setWordCharacters(QString wc);
- QString wordCharacters() { return word_characters; }
+ void setWordCharacters(TQString wc);
+ TQString wordCharacters() { return word_characters; }
void setBellMode(int mode);
int bellMode() { return m_bellMode; }
enum { BELLSYSTEM=0, BELLNOTIFY=1, BELLVISUAL=2, BELLNONE=3 };
- void Bell(bool visibleSession, QString message);
+ void Bell(bool visibleSession, TQString message);
- void setSelection(const QString &t);
+ void setSelection(const TQString &t);
/**
* Reimplemented. Has no effect. Use setVTFont() to change the font
* used to draw characters in the display.
*/
- virtual void setFont(const QFont &);
+ virtual void setFont(const TQFont &);
/** Returns the font used to draw characters in the display */
- QFont getVTFont() { return font(); }
+ TQFont getVTFont() { return font(); }
/**
* Sets the font used to draw the display. Has no effect if @p font
* is larger than the size of the display itself.
*/
- void setVTFont(const QFont& font);
+ void setVTFont(const TQFont& font);
void setMouseMarks(bool on);
static void setAntialias( bool enable ) { s_antialias = enable; }
@@ -136,7 +136,7 @@ public:
void setBidiEnabled(bool set) { bidiEnabled=set; }
bool isBidiEnabled() { return bidiEnabled; }
- void print(QPainter &paint, bool friendly, bool exact);
+ void print(TQPainter &paint, bool friendly, bool exact);
void setRim(int rim) { rimX=rim; rimY=rim; }
@@ -150,7 +150,7 @@ public slots:
signals:
- void keyPressedSignal(QKeyEvent *e);
+ void keyPressedSignal(TQKeyEvent *e);
void mouseSignal(int cb, int cx, int cy);
void changedFontMetricSignal(int height, int width);
void changedContentSizeSignal(int height, int width);
@@ -168,56 +168,56 @@ signals:
protected:
- virtual void styleChange( QStyle& );
+ virtual void styleChange( TQStyle& );
- bool eventFilter( QObject *, QEvent * );
- bool event( QEvent * );
+ bool eventFilter( TQObject *, TQEvent * );
+ bool event( TQEvent * );
- void drawTextFixed(QPainter &paint, int x, int y,
- QString& str, const ca *attr);
+ void drawTextFixed(TQPainter &paint, int x, int y,
+ TQString& str, const ca *attr);
- void drawAttrStr(QPainter &paint, QRect rect,
- QString& str, const ca *attr, bool pm, bool clear);
- void paintEvent( QPaintEvent * );
+ void drawAttrStr(TQPainter &paint, TQRect rect,
+ TQString& str, const ca *attr, bool pm, bool clear);
+ void paintEvent( TQPaintEvent * );
- void paintContents(QPainter &paint, const QRect &rect, bool pm=false);
+ void paintContents(TQPainter &paint, const TQRect &rect, bool pm=false);
- void resizeEvent(QResizeEvent*);
+ void resizeEvent(TQResizeEvent*);
- void fontChange(const QFont &font);
+ void fontChange(const TQFont &font);
void frameChanged();
- void mouseDoubleClickEvent(QMouseEvent* ev);
- void mousePressEvent( QMouseEvent* );
- void mouseReleaseEvent( QMouseEvent* );
- void mouseMoveEvent( QMouseEvent* );
- void extendSelection( QPoint pos );
- void wheelEvent( QWheelEvent* );
+ void mouseDoubleClickEvent(TQMouseEvent* ev);
+ void mousePressEvent( TQMouseEvent* );
+ void mouseReleaseEvent( TQMouseEvent* );
+ void mouseMoveEvent( TQMouseEvent* );
+ void extendSelection( TQPoint pos );
+ void wheelEvent( TQWheelEvent* );
- void focusInEvent( QFocusEvent * );
- void focusOutEvent( QFocusEvent * );
+ void focusInEvent( TQFocusEvent * );
+ void focusOutEvent( TQFocusEvent * );
bool focusNextPrevChild( bool next );
// Dnd
- void dragEnterEvent(QDragEnterEvent* event);
- void dropEvent(QDropEvent* event);
+ void dragEnterEvent(TQDragEnterEvent* event);
+ void dropEvent(TQDropEvent* event);
void doDrag();
enum DragState { diNone, diPending, diDragging };
struct _dragInfo {
DragState state;
- QPoint start;
- QTextDrag *dragObject;
+ TQPoint start;
+ TQTextDrag *dragObject;
} dragInfo;
virtual int charClass(UINT16) const;
void clearImage();
- void mouseTripleClickEvent(QMouseEvent* ev);
+ void mouseTripleClickEvent(TQMouseEvent* ev);
- void imStartEvent( QIMEvent *e );
- void imComposeEvent( QIMEvent *e );
- void imEndEvent( QIMEvent *e );
+ void imStartEvent( TQIMEvent *e );
+ void imComposeEvent( TQIMEvent *e );
+ void imEndEvent( TQIMEvent *e );
protected slots:
@@ -227,7 +227,7 @@ protected slots:
private:
-// QChar (*fontMap)(QChar); // possible vt100 font extension
+// TQChar (*fontMap)(TQChar); // possible vt100 font extension
bool fixed_font; // has fixed pitch
int font_h; // height
@@ -243,10 +243,10 @@ private:
int contentWidth;
ca *image; // [lines][columns]
int image_size;
- QBitArray m_line_wrapped;
+ TQBitArray m_line_wrapped;
ColorEntry color_table[TABLE_COLORS];
- QColor defaultBgColor;
+ TQColor defaultBgColor;
bool resizing;
bool terminalSizeHint,terminalSizeStartup;
@@ -255,9 +255,9 @@ private:
void makeImage();
- QPoint iPntSel; // initial selection point
- QPoint pntSel; // current selection point
- QPoint tripleSelBegin; // help avoid flicker
+ TQPoint iPntSel; // initial selection point
+ TQPoint pntSel; // current selection point
+ TQPoint tripleSelBegin; // help avoid flicker
int actSel; // selection state
bool word_selection_mode;
bool line_selection_mode;
@@ -265,10 +265,10 @@ private:
bool column_selection_mode;
QClipboard* cb;
- QScrollBar* scrollbar;
+ TQScrollBar* scrollbar;
int scrollLoc;
- QString word_characters;
- QTimer bellTimer; //used to rate-limit bell events. started when a bell event occurs,
+ TQString word_characters;
+ TQTimer bellTimer; //used to rate-limit bell events. started when a bell event occurs,
//and prevents further bell events until it stops
int m_bellMode;
@@ -283,36 +283,36 @@ private:
bool printerFriendly; // paint printer friendly, save ink
bool printerBold; // Use a bold font instead of overstrike for bold
bool isFixedSize; //Columns / lines are locked.
- QTimer* blinkT; // active when hasBlinker
- QTimer* blinkCursorT; // active when hasBlinkingCursor
+ TQTimer* blinkT; // active when hasBlinker
+ TQTimer* blinkCursorT; // active when hasBlinkingCursor
KPopupMenu* m_drop;
- QString dropText;
+ TQString dropText;
int m_dnd_file_count;
bool possibleTripleClick; // is set in mouseDoubleClickEvent and deleted
- // after QApplication::doubleClickInterval() delay
+ // after TQApplication::doubleClickInterval() delay
static bool s_antialias; // do we antialias or not
static bool s_standalone; // are we part of a standalone konsole?
- QFrame *mResizeWidget;
- QLabel *mResizeLabel;
- QTimer *mResizeTimer;
+ TQFrame *mResizeWidget;
+ TQLabel *mResizeLabel;
+ TQTimer *mResizeTimer;
uint m_lineSpacing;
- QRect cursorRect; //for quick changing of cursor
+ TQRect cursorRect; //for quick changing of cursor
- QPoint configureRequestPoint; // remember right mouse button click position
+ TQPoint configureRequestPoint; // remember right mouse button click position
bool colorsSwapped; // true during visual bell
// the rim should normally be 1, 0 only when running in full screen mode.
int rimX; // left/right rim width
int rimY; // top/bottom rim high
- QSize m_size;
+ TQSize m_size;
- QString m_imPreeditText;
+ TQString m_imPreeditText;
int m_imPreeditLength;
int m_imStart;
int m_imStartLine;
diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp
index 47207de34..0bdb0f42c 100644
--- a/konsole/konsole/TEmuVt102.cpp
+++ b/konsole/konsole/TEmuVt102.cpp
@@ -81,10 +81,10 @@
TEmuVt102::TEmuVt102(TEWidget* gui) : TEmulation(gui)
{
//kdDebug(1211)<<"TEmuVt102 ctor() connecting"<<endl;
- QObject::connect(gui,SIGNAL(mouseSignal(int,int,int)),
- this,SLOT(onMouse(int,int,int)));
- QObject::connect(gui, SIGNAL(sendStringToEmu(const char*)),
- this, SLOT(sendString(const char*)));
+ TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)),
+ this,TQT_SLOT(onMouse(int,int,int)));
+ TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)),
+ this, TQT_SLOT(sendString(const char*)));
//kdDebug(1211)<<"TEmuVt102 ctor() initToken..."<<endl;
initTokenizer();
//kdDebug(1211)<<"TEmuVt102 ctor() reset()"<<endl;
@@ -100,16 +100,16 @@ void TEmuVt102::changeGUI(TEWidget* newgui)
if (static_cast<TEWidget *>( gui )==newgui) return;
if ( gui ) {
- QObject::disconnect(gui,SIGNAL(mouseSignal(int,int,int)),
- this,SLOT(onMouse(int,int,int)));
- QObject::disconnect(gui, SIGNAL(sendStringToEmu(const char*)),
- this, SLOT(sendString(const char*)));
+ TQObject::disconnect(gui,TQT_SIGNAL(mouseSignal(int,int,int)),
+ this,TQT_SLOT(onMouse(int,int,int)));
+ TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)),
+ this, TQT_SLOT(sendString(const char*)));
}
TEmulation::changeGUI(newgui);
- QObject::connect(gui,SIGNAL(mouseSignal(int,int,int)),
- this,SLOT(onMouse(int,int,int)));
- QObject::connect(gui, SIGNAL(sendStringToEmu(const char*)),
- this, SLOT(sendString(const char*)));
+ TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)),
+ this,TQT_SLOT(onMouse(int,int,int)));
+ TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)),
+ this, TQT_SLOT(sendString(const char*)));
}
/*!
@@ -382,9 +382,9 @@ void TEmuVt102::XtermHack()
for (i = 2; i < ppos && '0'<=pbuf[i] && pbuf[i]<'9' ; i++)
arg = 10*arg + (pbuf[i]-'0');
if (pbuf[i] != ';') { ReportErrorToken(); return; }
- QChar *str = new QChar[ppos-i-2];
+ TQChar *str = new QChar[ppos-i-2];
for (int j = 0; j < ppos-i-2; j++) str[j] = pbuf[i+1+j];
- QString unistr(str,ppos-i-2);
+ TQString unistr(str,ppos-i-2);
// arg == 1 doesn't change the title. In XTerm it only changes the icon name
// (btw: arg=0 changes title and icon, arg=1 only icon, arg=2 only title
emit changeTitle(arg,unistr);
@@ -927,7 +927,7 @@ void TEmuVt102::onScrollLock()
the complications towards a configuration file [see KeyTrans class].
*/
-void TEmuVt102::onKeyPress( QKeyEvent* ev )
+void TEmuVt102::onKeyPress( TQKeyEvent* ev )
{
if (!listenToKeyPress) return; // someone else gets the keys
emit notifySessionState(NOTIFYNORMAL);
@@ -986,8 +986,8 @@ void TEmuVt102::onKeyPress( QKeyEvent* ev )
if (!ev->text().isEmpty())
{
if (ev->state() & AltButton) sendString("\033"); // ESC, this is the ALT prefix
- QCString s = m_codec->fromUnicode(ev->text()); // encode for application
- // FIXME: In Qt 2, QKeyEvent::text() would return "\003" for Ctrl-C etc.
+ TQCString s = m_codec->fromUnicode(ev->text()); // encode for application
+ // FIXME: In Qt 2, TQKeyEvent::text() would return "\003" for Ctrl-C etc.
// while in Qt 3 it returns the actual key ("c" or "C") which caused
// the ControlButton to be ignored. This hack seems to work for
// latin1 locales at least. Please anyone find a clean solution (malte)
@@ -1195,8 +1195,8 @@ void TEmuVt102::setConnect(bool c)
TEmulation::setConnect(c);
if (gui)
{
- QObject::disconnect(gui, SIGNAL(sendStringToEmu(const char*)),
- this, SLOT(sendString(const char*)));
+ TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)),
+ this, TQT_SLOT(sendString(const char*)));
}
if (c)
{ // refresh mouse mode
@@ -1210,8 +1210,8 @@ void TEmuVt102::setConnect(bool c)
else
scrolllock_set_off();
#endif
- QObject::connect(gui, SIGNAL(sendStringToEmu(const char*)),
- this, SLOT(sendString(const char*)));
+ TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)),
+ this, TQT_SLOT(sendString(const char*)));
}
}
diff --git a/konsole/konsole/TEmuVt102.h b/konsole/konsole/TEmuVt102.h
index cd49cc089..05f30ac04 100644
--- a/konsole/konsole/TEmuVt102.h
+++ b/konsole/konsole/TEmuVt102.h
@@ -60,14 +60,14 @@ public:
void changeGUI(TEWidget* newgui);
~TEmuVt102();
- virtual void onKeyPress(QKeyEvent*);
+ virtual void onKeyPress(TQKeyEvent*);
public slots: // signals incoming from TEWidget
void onMouse(int cb, int cx, int cy);
signals:
- void changeTitle(int,const QString&);
+ void changeTitle(int,const TQString&);
public:
diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp
index 0ff2a5163..8dd6da437 100644
--- a/konsole/konsole/TEmulation.cpp
+++ b/konsole/konsole/TEmulation.cpp
@@ -75,8 +75,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <qregexp.h>
-#include <qclipboard.h>
+#include <tqregexp.h>
+#include <tqclipboard.h>
#include <assert.h>
@@ -108,8 +108,8 @@ TEmulation::TEmulation(TEWidget* w)
screen[1] = new TEScreen(gui->Lines(),gui->Columns());
scr = screen[0];
- QObject::connect(&bulk_timer1, SIGNAL(timeout()), this, SLOT(showBulk()) );
- QObject::connect(&bulk_timer2, SIGNAL(timeout()), this, SLOT(showBulk()) );
+ TQObject::connect(&bulk_timer1, TQT_SIGNAL(timeout()), this, TQT_SLOT(showBulk()) );
+ TQObject::connect(&bulk_timer2, TQT_SIGNAL(timeout()), this, TQT_SLOT(showBulk()) );
connectGUI();
setKeymap(0); // Default keymap
}
@@ -119,24 +119,24 @@ TEmulation::TEmulation(TEWidget* w)
void TEmulation::connectGUI()
{
- QObject::connect(gui,SIGNAL(changedHistoryCursor(int)),
- this,SLOT(onHistoryCursorChange(int)));
- QObject::connect(gui,SIGNAL(keyPressedSignal(QKeyEvent*)),
- this,SLOT(onKeyPress(QKeyEvent*)));
- QObject::connect(gui,SIGNAL(beginSelectionSignal(const int,const int,const bool)),
- this,SLOT(onSelectionBegin(const int,const int,const bool)) );
- QObject::connect(gui,SIGNAL(extendSelectionSignal(const int,const int)),
- this,SLOT(onSelectionExtend(const int,const int)) );
- QObject::connect(gui,SIGNAL(endSelectionSignal(const bool)),
- this,SLOT(setSelection(const bool)) );
- QObject::connect(gui,SIGNAL(copySelectionSignal()),
- this,SLOT(copySelection()) );
- QObject::connect(gui,SIGNAL(clearSelectionSignal()),
- this,SLOT(clearSelection()) );
- QObject::connect(gui,SIGNAL(isBusySelecting(bool)),
- this,SLOT(isBusySelecting(bool)) );
- QObject::connect(gui,SIGNAL(testIsSelected(const int, const int, bool &)),
- this,SLOT(testIsSelected(const int, const int, bool &)) );
+ TQObject::connect(gui,TQT_SIGNAL(changedHistoryCursor(int)),
+ this,TQT_SLOT(onHistoryCursorChange(int)));
+ TQObject::connect(gui,TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)),
+ this,TQT_SLOT(onKeyPress(TQKeyEvent*)));
+ TQObject::connect(gui,TQT_SIGNAL(beginSelectionSignal(const int,const int,const bool)),
+ this,TQT_SLOT(onSelectionBegin(const int,const int,const bool)) );
+ TQObject::connect(gui,TQT_SIGNAL(extendSelectionSignal(const int,const int)),
+ this,TQT_SLOT(onSelectionExtend(const int,const int)) );
+ TQObject::connect(gui,TQT_SIGNAL(endSelectionSignal(const bool)),
+ this,TQT_SLOT(setSelection(const bool)) );
+ TQObject::connect(gui,TQT_SIGNAL(copySelectionSignal()),
+ this,TQT_SLOT(copySelection()) );
+ TQObject::connect(gui,TQT_SIGNAL(clearSelectionSignal()),
+ this,TQT_SLOT(clearSelection()) );
+ TQObject::connect(gui,TQT_SIGNAL(isBusySelecting(bool)),
+ this,TQT_SLOT(isBusySelecting(bool)) );
+ TQObject::connect(gui,TQT_SIGNAL(testIsSelected(const int, const int, bool &)),
+ this,TQT_SLOT(testIsSelected(const int, const int, bool &)) );
}
/*!
@@ -147,24 +147,24 @@ void TEmulation::changeGUI(TEWidget* newgui)
if (static_cast<TEWidget *>( gui )==newgui) return;
if ( gui ) {
- QObject::disconnect(gui,SIGNAL(changedHistoryCursor(int)),
- this,SLOT(onHistoryCursorChange(int)));
- QObject::disconnect(gui,SIGNAL(keyPressedSignal(QKeyEvent*)),
- this,SLOT(onKeyPress(QKeyEvent*)));
- QObject::disconnect(gui,SIGNAL(beginSelectionSignal(const int,const int,const bool)),
- this,SLOT(onSelectionBegin(const int,const int,const bool)) );
- QObject::disconnect(gui,SIGNAL(extendSelectionSignal(const int,const int)),
- this,SLOT(onSelectionExtend(const int,const int)) );
- QObject::disconnect(gui,SIGNAL(endSelectionSignal(const bool)),
- this,SLOT(setSelection(const bool)) );
- QObject::disconnect(gui,SIGNAL(copySelectionSignal()),
- this,SLOT(copySelection()) );
- QObject::disconnect(gui,SIGNAL(clearSelectionSignal()),
- this,SLOT(clearSelection()) );
- QObject::disconnect(gui,SIGNAL(isBusySelecting(bool)),
- this,SLOT(isBusySelecting(bool)) );
- QObject::disconnect(gui,SIGNAL(testIsSelected(const int, const int, bool &)),
- this,SLOT(testIsSelected(const int, const int, bool &)) );
+ TQObject::disconnect(gui,TQT_SIGNAL(changedHistoryCursor(int)),
+ this,TQT_SLOT(onHistoryCursorChange(int)));
+ TQObject::disconnect(gui,TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)),
+ this,TQT_SLOT(onKeyPress(TQKeyEvent*)));
+ TQObject::disconnect(gui,TQT_SIGNAL(beginSelectionSignal(const int,const int,const bool)),
+ this,TQT_SLOT(onSelectionBegin(const int,const int,const bool)) );
+ TQObject::disconnect(gui,TQT_SIGNAL(extendSelectionSignal(const int,const int)),
+ this,TQT_SLOT(onSelectionExtend(const int,const int)) );
+ TQObject::disconnect(gui,TQT_SIGNAL(endSelectionSignal(const bool)),
+ this,TQT_SLOT(setSelection(const bool)) );
+ TQObject::disconnect(gui,TQT_SIGNAL(copySelectionSignal()),
+ this,TQT_SLOT(copySelection()) );
+ TQObject::disconnect(gui,TQT_SIGNAL(clearSelectionSignal()),
+ this,TQT_SLOT(clearSelection()) );
+ TQObject::disconnect(gui,TQT_SIGNAL(isBusySelecting(bool)),
+ this,TQT_SLOT(isBusySelecting(bool)) );
+ TQObject::disconnect(gui,TQT_SIGNAL(testIsSelected(const int, const int, bool &)),
+ this,TQT_SLOT(testIsSelected(const int, const int, bool &)) );
}
gui=newgui;
connectGUI();
@@ -204,7 +204,7 @@ const HistoryType& TEmulation::history()
return screen[0]->getScroll();
}
-void TEmulation::setCodec(const QTextCodec * qtc)
+void TEmulation::setCodec(const TQTextCodec * qtc)
{
m_codec = qtc;
delete decoder;
@@ -214,8 +214,8 @@ void TEmulation::setCodec(const QTextCodec * qtc)
void TEmulation::setCodec(int c)
{
- setCodec(c ? QTextCodec::codecForName("utf8")
- : QTextCodec::codecForLocale());
+ setCodec(c ? TQTextCodec::codecForName("utf8")
+ : TQTextCodec::codecForLocale());
}
void TEmulation::setKeymap(int no)
@@ -223,12 +223,12 @@ void TEmulation::setKeymap(int no)
keytrans = KeyTrans::find(no);
}
-void TEmulation::setKeymap(const QString &id)
+void TEmulation::setKeymap(const TQString &id)
{
keytrans = KeyTrans::find(id);
}
-QString TEmulation::keymap()
+TQString TEmulation::keymap()
{
return keytrans->id();
}
@@ -276,7 +276,7 @@ void TEmulation::onRcvChar(int c)
/*!
*/
-void TEmulation::onKeyPress( QKeyEvent* ev )
+void TEmulation::onKeyPress( TQKeyEvent* ev )
{
if (!listenToKeyPress) return; // someone else gets the keys
emit notifySessionState(NOTIFYNORMAL);
@@ -308,7 +308,7 @@ void TEmulation::onRcvBlock(const char *s, int len)
bulkStart();
- QString r;
+ TQString r;
int i, l;
for (i = 0; i < len; i++)
@@ -318,7 +318,7 @@ void TEmulation::onRcvBlock(const char *s, int len)
if ((unsigned char) s[i] < 32)
{
if (!r.length()) {
- QString tmp;
+ TQString tmp;
// Flush decoder
while(!tmp.length())
tmp = decoder->toUnicode(" ",1);
@@ -342,7 +342,7 @@ void TEmulation::onRcvBlock(const char *s, int len)
for (int j = 0; j < reslen; j++)
{
- if (r[j].category() == QChar::Mark_NonSpacing)
+ if (r[j].category() == TQChar::Mark_NonSpacing)
scr->compose(r.mid(j,1));
else
onRcvChar(r[j].unicode());
@@ -367,7 +367,7 @@ void TEmulation::onSelectionExtend(const int x, const int y) {
void TEmulation::setSelection(const bool preserve_line_breaks) {
if (!connected) return;
- QString t = scr->getSelText(preserve_line_breaks);
+ TQString t = scr->getSelText(preserve_line_breaks);
if (!t.isNull()) gui->setSelection(t);
}
@@ -391,11 +391,11 @@ void TEmulation::clearSelection() {
void TEmulation::copySelection() {
if (!connected) return;
- QString t = scr->getSelText(true);
- QApplication::clipboard()->setText(t);
+ TQString t = scr->getSelText(true);
+ TQApplication::clipboard()->setText(t);
}
-void TEmulation::streamHistory(QTextStream* stream) {
+void TEmulation::streamHistory(TQTextStream* stream) {
scr->streamHistory(stream);
}
@@ -404,16 +404,16 @@ void TEmulation::findTextBegin()
m_findPos = -1;
}
-bool TEmulation::findTextNext( const QString &str, bool forward, bool caseSensitive, bool regExp )
+bool TEmulation::findTextNext( const TQString &str, bool forward, bool caseSensitive, bool regExp )
{
int pos = -1;
- QString string;
+ TQString string;
if (forward) {
for (int i = (m_findPos==-1?0:m_findPos+1); i<(scr->getHistLines()+scr->getLines()); i++) {
string = scr->getHistoryLine(i);
if (regExp)
- pos = string.find( QRegExp(str,caseSensitive) );
+ pos = string.find( TQRegExp(str,caseSensitive) );
else
pos = string.find(str, 0, caseSensitive);
if(pos!=-1) {
@@ -431,7 +431,7 @@ bool TEmulation::findTextNext( const QString &str, bool forward, bool caseSensit
for(int i = (m_findPos==-1?(scr->getHistLines()+scr->getLines()):m_findPos-1); i>=0; i--) {
string = scr->getHistoryLine(i);
if (regExp)
- pos = string.find( QRegExp(str,caseSensitive) );
+ pos = string.find( TQRegExp(str,caseSensitive) );
else
pos = string.find(str, 0, caseSensitive);
if(pos!=-1) {
@@ -529,9 +529,9 @@ void TEmulation::onImageSizeChange(int lines, int columns)
//kdDebug(1211)<<"TEmulation::onImageSizeChange() done"<<endl;
}
-QSize TEmulation::imageSize()
+TQSize TEmulation::imageSize()
{
- return QSize(scr->getColumns(), scr->getLines());
+ return TQSize(scr->getColumns(), scr->getLines());
}
void TEmulation::onHistoryCursorChange(int cursor)
diff --git a/konsole/konsole/TEmulation.h b/konsole/konsole/TEmulation.h
index 53f05c6e7..7d3ba65d6 100644
--- a/konsole/konsole/TEmulation.h
+++ b/konsole/konsole/TEmulation.h
@@ -23,10 +23,10 @@
#include "TEWidget.h"
#include "TEScreen.h"
-#include <qtimer.h>
+#include <tqtimer.h>
#include <stdio.h>
-#include <qtextcodec.h>
-#include <qguardedptr.h>
+#include <tqtextcodec.h>
+#include <tqguardedptr.h>
#include <keytrans.h>
enum { NOTIFYNORMAL=0, NOTIFYBELL=1, NOTIFYACTIVITY=2, NOTIFYSILENCE=3 };
@@ -41,21 +41,21 @@ public:
~TEmulation();
public:
- QSize imageSize();
+ TQSize imageSize();
virtual void setHistory(const HistoryType&);
- const QTextCodec *codec() { return m_codec; }
- void setCodec(const QTextCodec *);
+ const TQTextCodec *codec() { return m_codec; }
+ void setCodec(const TQTextCodec *);
virtual const HistoryType& history();
- virtual void streamHistory(QTextStream*);
+ virtual void streamHistory(TQTextStream*);
virtual void findTextBegin();
- virtual bool findTextNext( const QString &str, bool forward, bool caseSensitive, bool regExp );
+ virtual bool findTextNext( const TQString &str, bool forward, bool caseSensitive, bool regExp );
public slots: // signals incoming from TEWidget
virtual void onImageSizeChange(int lines, int columns);
virtual void onHistoryCursorChange(int cursor);
- virtual void onKeyPress(QKeyEvent*);
+ virtual void onKeyPress(TQKeyEvent*);
virtual void clearSelection();
virtual void copySelection();
@@ -102,16 +102,16 @@ public:
void setColumns(int columns);
void setKeymap(int no);
- void setKeymap(const QString &id);
+ void setKeymap(const TQString &id);
int keymapNo();
- QString keymap();
+ TQString keymap();
virtual void clearEntireScreen() =0;
virtual void reset() =0;
protected:
- QGuardedPtr<TEWidget> gui;
+ TQGuardedPtr<TEWidget> gui;
TEScreen* scr; // referes to one `screen'
TEScreen* screen[2]; // 0 = primary, 1 = alternate
void setScreen(int n); // set `scr' to `screen[n]'
@@ -121,8 +121,8 @@ protected:
void setCodec(int c); // codec number, 0 = locale, 1=utf8
- const QTextCodec* m_codec;
- QTextDecoder* decoder;
+ const TQTextCodec* m_codec;
+ TQTextDecoder* decoder;
KeyTrans* keytrans;
@@ -140,8 +140,8 @@ private:
private:
- QTimer bulk_timer1;
- QTimer bulk_timer2;
+ TQTimer bulk_timer1;
+ TQTimer bulk_timer2;
int m_findPos;
};
diff --git a/konsole/konsole/fontembedder.cpp b/konsole/konsole/fontembedder.cpp
index f2a189598..dfbd88ce4 100644
--- a/konsole/konsole/fontembedder.cpp
+++ b/konsole/konsole/fontembedder.cpp
@@ -18,15 +18,15 @@
02110-1301 USA.
*/
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <stdlib.h>
#include <iostream>
#include <iomanip>
using namespace std;
-static Q_UINT32 charVal(QChar val)
+static Q_UINT32 charVal(TQChar val)
{
if (val == ' ')
return 0;
@@ -34,9 +34,9 @@ static Q_UINT32 charVal(QChar val)
return 1;
}
-static Q_UINT32 readGlyphLine(QTextStream& input)
+static Q_UINT32 readGlyphLine(TQTextStream& input)
{
- QString line = input.readLine();
+ TQString line = input.readLine();
while (line.length() < 5)
line += ' ';
@@ -48,7 +48,7 @@ static Q_UINT32 readGlyphLine(QTextStream& input)
return val;
}
-static Q_UINT32 readGlyph(QTextStream& input)
+static Q_UINT32 readGlyph(TQTextStream& input)
{
return readGlyphLine(input) |
(readGlyphLine(input) << 5) |
@@ -64,13 +64,13 @@ int main(int argc, char **argv)
qWarning("usage: fontembedder font.src > font.h");
exit(1);
}
- QFile inFile(argv[1]);
+ TQFile inFile(argv[1]);
if (!inFile.open(IO_ReadOnly))
{
qFatal("Can not open %s", argv[1]);
}
- QTextStream input(&inFile);
+ TQTextStream input(&inFile);
Q_UINT32 glyphStates[128];
for (int i = 0; i < 128; ++i)
@@ -78,7 +78,7 @@ int main(int argc, char **argv)
while (!input.atEnd())
{
- QString line = input.readLine();
+ TQString line = input.readLine();
line = line.stripWhiteSpace();
if (line.isEmpty())
continue; //Skip empty lines
diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp
index f0c8311a7..36e299bc0 100644
--- a/konsole/konsole/keytrans.cpp
+++ b/konsole/konsole/keytrans.cpp
@@ -26,10 +26,10 @@
*/
#include "keytrans.h"
-#include <qbuffer.h>
-#include <qobject.h>
-#include <qintdict.h>
-#include <qfile.h>
+#include <tqbuffer.h>
+#include <tqobject.h>
+#include <tqintdict.h>
+#include <tqfile.h>
#include <kstandarddirs.h>
#include <klocale.h>
@@ -41,7 +41,7 @@
instances represent the individual assignments
*/
-KeyTrans::KeyEntry::KeyEntry(int _ref, int _key, int _bits, int _mask, int _cmd, QString _txt)
+KeyTrans::KeyEntry::KeyEntry(int _ref, int _key, int _bits, int _mask, int _cmd, TQString _txt)
: ref(_ref), key(_key), bits(_bits), mask(_mask), cmd(_cmd), txt(_txt)
{
}
@@ -66,7 +66,7 @@ bool KeyTrans::KeyEntry::anymodspecified(void)
return (mask & (1 << BITS_AnyMod)) && (bits & (1 << BITS_AnyMod));
}
-QString KeyTrans::KeyEntry::text()
+TQString KeyTrans::KeyEntry::text()
{
return txt;
}
@@ -77,7 +77,7 @@ QString KeyTrans::KeyEntry::text()
Takes part in a collection themself.
*/
-KeyTrans::KeyTrans(const QString& path)
+KeyTrans::KeyTrans(const TQString& path)
:m_path(path)
,m_numb(0)
,m_fileRead(false)
@@ -110,10 +110,10 @@ KeyTrans::~KeyTrans()
{
}
-KeyTrans::KeyEntry* KeyTrans::addEntry(int ref, int key, int bits, int mask, int cmd, QString txt)
+KeyTrans::KeyEntry* KeyTrans::addEntry(int ref, int key, int bits, int mask, int cmd, TQString txt)
// returns conflicting entry
{
- for (QPtrListIterator<KeyEntry> it(tableX); it.current(); ++it)
+ for (TQPtrListIterator<KeyEntry> it(tableX); it.current(); ++it)
{
if (it.current()->matches(key,bits,mask))
{
@@ -132,7 +132,7 @@ bool KeyTrans::findEntry(int key, int bits, int* cmd, const char** txt, int* len
if (bits & ((1<<BITS_Shift)|(1<<BITS_Alt)|(1<<BITS_Control)))
bits |= (1<<BITS_AnyMod);
- for (QPtrListIterator<KeyEntry> it(tableX); it.current(); ++it)
+ for (TQPtrListIterator<KeyEntry> it(tableX); it.current(); ++it)
if (it.current()->matches(key,bits,0xffff))
{
*cmd = it.current()->cmd;
@@ -183,7 +183,7 @@ bool KeyTrans::findEntry(int key, int bits, int* cmd, const char** txt, int* len
class KeytabReader
{
public:
- KeytabReader(QString p, QIODevice &d);
+ KeytabReader(TQString p, TQIODevice &d);
public:
void getCc();
void getSymbol();
@@ -192,7 +192,7 @@ public:
void ReportToken(); // diagnostic
private:
int sym;
- QString res;
+ TQString res;
int len;
int slinno;
int scolno;
@@ -200,12 +200,12 @@ private:
int cc;
int linno;
int colno;
- QIODevice* buf;
- QString path;
+ TQIODevice* buf;
+ TQString path;
};
-KeytabReader::KeytabReader(QString p, QIODevice &d)
+KeytabReader::KeytabReader(TQString p, TQIODevice &d)
{
path = p;
buf = &d;
@@ -337,9 +337,9 @@ protected:
void defOprSym(const char* key, int val);
void defModSym(const char* key, int val);
public:
- QDict<QObject> keysyms;
- QDict<QObject> modsyms;
- QDict<QObject> oprsyms;
+ TQDict<TQObject> keysyms;
+ TQDict<TQObject> modsyms;
+ TQDict<TQObject> oprsyms;
};
static KeyTransSymbols * syms = 0L;
@@ -354,17 +354,17 @@ void KeyTrans::readConfig()
{
if (m_fileRead) return;
m_fileRead=true;
- QIODevice* buf(0);
+ TQIODevice* buf(0);
if (m_path=="[buildin]")
{
- QCString txt =
+ TQCString txt =
#include "default.keytab.h"
;
- buf=new QBuffer(txt);
+ buf=new TQBuffer(txt);
}
else
{
- buf=new QFile(m_path);
+ buf=new TQFile(m_path);
};
KeytabReader ktr(m_path,*buf);
ktr.parseTo(this);
@@ -474,17 +474,17 @@ ERROR:
void KeyTransSymbols::defKeySym(const char* key, int val)
{
- keysyms.insert(key,(QObject*)(val+1));
+ keysyms.insert(key,(TQObject*)(val+1));
}
void KeyTransSymbols::defOprSym(const char* key, int val)
{
- oprsyms.insert(key,(QObject*)(val+1));
+ oprsyms.insert(key,(TQObject*)(val+1));
}
void KeyTransSymbols::defModSym(const char* key, int val)
{
- modsyms.insert(key,(QObject*)(val+1));
+ modsyms.insert(key,(TQObject*)(val+1));
}
void KeyTransSymbols::defOprSyms()
@@ -666,7 +666,7 @@ KeyTransSymbols::KeyTransSymbols()
static int keytab_serial = 0; //FIXME: remove,localize
-static QIntDict<KeyTrans> * numb2keymap = 0L;
+static TQIntDict<KeyTrans> * numb2keymap = 0L;
KeyTrans* KeyTrans::find(int numb)
{
@@ -674,9 +674,9 @@ KeyTrans* KeyTrans::find(int numb)
return res ? res : numb2keymap->find(0);
}
-KeyTrans* KeyTrans::find(const QString &id)
+KeyTrans* KeyTrans::find(const TQString &id)
{
- QIntDictIterator<KeyTrans> it(*numb2keymap);
+ TQIntDictIterator<KeyTrans> it(*numb2keymap);
while(it.current())
{
if (it.current()->id() == id)
@@ -700,7 +700,7 @@ void KeyTrans::addKeyTrans()
void KeyTrans::loadAll()
{
if (!numb2keymap)
- numb2keymap = new QIntDict<KeyTrans>;
+ numb2keymap = new TQIntDict<KeyTrans>;
else { // Needed for konsole_part.
numb2keymap->clear();
keytab_serial = 0;
@@ -713,20 +713,20 @@ void KeyTrans::loadAll()
KeyTrans* sc = new KeyTrans("[buildin]");
sc->addKeyTrans();
- QStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
+ TQStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
- for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
+ for(TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
{
- //QFile file(QFile::encodeName(*it));
- sc = new KeyTrans(QFile::encodeName(*it));
- //KeyTrans* sc = KeyTrans::fromDevice(QFile::encodeName(*it),file);
+ //TQFile file(TQFile::encodeName(*it));
+ sc = new KeyTrans(TQFile::encodeName(*it));
+ //KeyTrans* sc = KeyTrans::fromDevice(TQFile::encodeName(*it),file);
if (sc) sc->addKeyTrans();
}
}
// Debugging material -----------------------------------------------------------
/*
-void TestTokenizer(QBuffer &buf)
+void TestTokenizer(TQBuffer &buf)
{
// opening sequence
@@ -745,10 +745,10 @@ void test()
{
// Opening sequence
- QCString txt =
+ TQCString txt =
#include "default.keytab.h"
;
- QBuffer buf(txt);
+ TQBuffer buf(txt);
if (0) TestTokenizer(buf);
if (1) { KeyTrans kt; kt.scanTable(buf); }
}
diff --git a/konsole/konsole/keytrans.h b/konsole/konsole/keytrans.h
index 62ccc9c72..2ddf5f776 100644
--- a/konsole/konsole/keytrans.h
+++ b/konsole/konsole/keytrans.h
@@ -21,9 +21,9 @@
#ifndef KEYTRANS_H
#define KEYTRANS_H
-#include <qstring.h>
-#include <qptrlist.h>
-#include <qiodevice.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
+#include <tqiodevice.h>
#define BITS_NewLine 0
#define BITS_BsHack 1
@@ -53,27 +53,27 @@ class KeyTrans
friend class KeytabReader;
public:
static KeyTrans* find(int numb);
- static KeyTrans* find(const QString &id);
+ static KeyTrans* find(const TQString &id);
static int count();
static void loadAll();
- KeyTrans(const QString& p);
+ KeyTrans(const TQString& p);
~KeyTrans();
bool findEntry(int key, int bits, int* cmd, const char** txt, int* len,
bool* metaspecified);
- const QString& hdr() {if (!m_fileRead) readConfig(); return m_hdr;}
+ const TQString& hdr() {if (!m_fileRead) readConfig(); return m_hdr;}
int numb() {return m_numb;}
- const QString& id() { return m_id;}
+ const TQString& id() { return m_id;}
class KeyEntry
{
public:
- KeyEntry(int ref, int key, int bits, int mask, int cmd, QString txt);
+ KeyEntry(int ref, int key, int bits, int mask, int cmd, TQString txt);
~KeyEntry();
bool matches(int key, int bits, int mask);
bool metaspecified(void);
bool anymodspecified(void);
- QString text();
+ TQString text();
int ref;
private:
int key;
@@ -81,17 +81,17 @@ class KeyTrans
int mask;
public:
int cmd;
- QString txt;
+ TQString txt;
};
private:
- KeyEntry* addEntry(int ref, int key, int bits, int mask, int cmd, QString txt);
+ KeyEntry* addEntry(int ref, int key, int bits, int mask, int cmd, TQString txt);
void addKeyTrans();
void readConfig();
- QPtrList<KeyEntry> tableX;
- QString m_hdr;
- QString m_path;
- QString m_id;
+ TQPtrList<KeyEntry> tableX;
+ TQString m_hdr;
+ TQString m_path;
+ TQString m_id;
int m_numb;
bool m_fileRead;
KeyTrans();
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 2b85b6f39..9c292daa2 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -82,14 +82,14 @@ Time to start a requirement list.
#include <config.h>
-#include <qspinbox.h>
-#include <qcheckbox.h>
-#include <qimage.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qhbox.h>
-#include <qtoolbutton.h>
-#include <qtooltip.h>
+#include <tqspinbox.h>
+#include <tqcheckbox.h>
+#include <tqimage.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqhbox.h>
+#include <tqtoolbutton.h>
+#include <tqtooltip.h>
#include <stdio.h>
#include <stdlib.h>
@@ -100,7 +100,7 @@ Time to start a requirement list.
#include <kfontdialog.h>
#include <kkeydialog.h>
#include <kstandarddirs.h>
-#include <qpainter.h>
+#include <tqpainter.h>
#include <kmenubar.h>
#include <kmessagebox.h>
#include <krootpixmap.h>
@@ -117,7 +117,7 @@ Time to start a requirement list.
#include <kaction.h>
#include <kshell.h>
-#include <qlabel.h>
+#include <tqlabel.h>
#include <kpopupmenu.h>
#include <klocale.h>
#include <sys/wait.h>
@@ -155,13 +155,13 @@ extern bool argb_visual; // declared in main.cpp and konsole_part.cpp
// KonsoleFontSelectAction is now also used for selectSize!
class KonsoleFontSelectAction : public KSelectAction {
public:
- KonsoleFontSelectAction(const QString &text, int accel,
- const QObject* receiver, const char* slot,
- QObject* parent, const char* name = 0 )
+ KonsoleFontSelectAction(const TQString &text, int accel,
+ const TQObject* receiver, const char* slot,
+ TQObject* parent, const char* name = 0 )
: KSelectAction(text, accel, receiver, slot, parent, name) {}
- KonsoleFontSelectAction( const QString &text, const QIconSet& pix,
- int accel, const QObject* receiver,
- const char* slot, QObject* parent,
+ KonsoleFontSelectAction( const TQString &text, const TQIconSet& pix,
+ int accel, const TQObject* receiver,
+ const char* slot, TQObject* parent,
const char* name = 0 )
: KSelectAction(text, pix, accel, receiver, slot, parent, name) {}
@@ -178,14 +178,14 @@ void KonsoleFontSelectAction::slotActivated(int index) {
}
}
-template class QPtrDict<TESession>;
-template class QIntDict<KSimpleConfig>;
-template class QPtrDict<KRadioAction>;
+template class TQPtrDict<TESession>;
+template class TQIntDict<KSimpleConfig>;
+template class TQPtrDict<KRadioAction>;
#define DEFAULT_HISTORY_SIZE 1000
Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bool frameon, bool scrollbaron,
- QCString type, bool b_inRestore, const int wanted_tabbar, const QString &workdir )
+ TQCString type, bool b_inRestore, const int wanted_tabbar, const TQString &workdir )
:DCOPObject( "konsole" )
,KMainWindow(0, name)
,m_defaultSession(0)
@@ -270,16 +270,16 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
,s_workDir(workdir)
{
isRestored = b_inRestore;
- connect( &m_closeTimeout, SIGNAL(timeout()), this, SLOT(slotCouldNotClose()));
+ connect( &m_closeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCouldNotClose()));
no2command.setAutoDelete(true);
menubar = menuBar();
KAcceleratorManager::setNoAccel( menubar );
- sessionNumberMapper = new QSignalMapper( this );
- connect( sessionNumberMapper, SIGNAL( mapped( int ) ),
- this, SLOT( newSessionTabbar( int ) ) );
+ sessionNumberMapper = new TQSignalMapper( this );
+ connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ),
+ this, TQT_SLOT( newSessionTabbar( int ) ) );
colors = new ColorSchemaList();
colors->checkSchemas();
@@ -290,7 +290,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
// create applications /////////////////////////////////////////////////////
// read and apply default values ///////////////////////////////////////////
resize(321, 321); // Dummy.
- QSize currentSize = size();
+ TQSize currentSize = size();
KConfig * config = KGlobal::config();
config->setDesktopGroup();
applyMainWindowSettings(config);
@@ -303,7 +303,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
co = defaultSession();
co->setDesktopGroup();
- QString schema = co->readEntry("Schema");
+ TQString schema = co->readEntry("Schema");
readProperties(config, schema, false);
makeBasicGUI();
@@ -331,14 +331,14 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
menubar->hide();
if (!frameon) {
b_framevis=false;
- if (te) te->setFrameStyle( QFrame::NoFrame );
+ if (te) te->setFrameStyle( TQFrame::NoFrame );
}
if (!scrollbaron) {
n_scroll = TEWidget::SCRNONE;
if (te) te->setScrollbarLocation(TEWidget::SCRNONE);
}
-// connect(kapp, SIGNAL(kdisplayFontChanged()), this, SLOT(slotFontChanged()));
+// connect(kapp, TQT_SIGNAL(kdisplayFontChanged()), this, TQT_SLOT(slotFontChanged()));
kapp->dcopClient()->setDefaultObject( "konsole" );
}
@@ -378,7 +378,7 @@ void Konsole::setAutoClose(bool on)
void Konsole::showTip()
{
- KTipDialog::showTip(this,QString::null,true);
+ KTipDialog::showTip(this,TQString::null,true);
}
void Konsole::showTipOnStart()
@@ -453,31 +453,31 @@ void Konsole::makeGUI()
if (m_menuCreated) return;
if (m_tabbarSessionsCommands)
- disconnect(m_tabbarSessionsCommands,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
- disconnect(m_session,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
+ disconnect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+ disconnect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
if (m_options)
- disconnect(m_options,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
+ disconnect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
if (m_help)
- disconnect(m_help,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
+ disconnect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
if (m_rightButton)
- disconnect(m_rightButton,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
- disconnect(m_edit,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
- disconnect(m_view,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
+ disconnect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+ disconnect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+ disconnect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
if (m_bookmarks)
- disconnect(m_bookmarks,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
+ disconnect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
if (m_bookmarksSession)
- disconnect(m_bookmarksSession,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
+ disconnect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
if (m_tabbarSessionsCommands)
- connect(m_tabbarSessionsCommands,SIGNAL(aboutToShow()),this,SLOT(loadScreenSessions()));
- connect(m_session,SIGNAL(aboutToShow()),this,SLOT(loadScreenSessions()));
+ connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions()));
+ connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions()));
m_menuCreated=true;
// Remove the empty separator Qt inserts if the menu is empty on popup,
// not sure if this will be "fixed" in Qt, for now use this hack (malte)
if(!(isRestored)) {
- if (sender() && sender()->inherits("QPopupMenu") &&
- static_cast<const QPopupMenu *>(sender())->count() == 1)
- const_cast<QPopupMenu *>(static_cast<const QPopupMenu *>(sender()))->removeItemAt(0);
+ if (sender() && sender()->inherits("TQPopupMenu") &&
+ static_cast<const TQPopupMenu *>(sender())->count() == 1)
+ const_cast<TQPopupMenu *>(static_cast<const TQPopupMenu *>(sender()))->removeItemAt(0);
}
KActionCollection* actions = actionCollection();
@@ -494,7 +494,7 @@ void Konsole::makeGUI()
m_signals->insertItem( i18n( "&Kill Task" ) + " (KILL)", SIGKILL);
m_signals->insertItem( i18n( "User Signal &1") + " (USR1)", SIGUSR1);
m_signals->insertItem( i18n( "User Signal &2") + " (USR2)", SIGUSR2);
- connect(m_signals, SIGNAL(activated(int)), SLOT(sendSignal(int)));
+ connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int)));
KAcceleratorManager::manage( m_signals );
}
@@ -548,28 +548,28 @@ void Konsole::makeGUI()
//bookmarks menu
if (bookmarkHandler)
- connect( bookmarkHandler, SIGNAL( openURL( const QString&, const QString& )),
- SLOT( enterURL( const QString&, const QString& )));
+ connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString&, const TQString& )),
+ TQT_SLOT( enterURL( const TQString&, const TQString& )));
if (bookmarkHandlerSession)
- connect( bookmarkHandlerSession, SIGNAL( openURL( const QString&, const QString& )),
- SLOT( newSession( const QString&, const QString& )));
+ connect( bookmarkHandlerSession, TQT_SIGNAL( openURL( const TQString&, const TQString& )),
+ TQT_SLOT( newSession( const TQString&, const TQString& )));
if (m_bookmarks)
- connect(m_bookmarks, SIGNAL(aboutToShow()), SLOT(bookmarks_menu_check()));
+ connect(m_bookmarks, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check()));
if (m_bookmarksSession)
- connect(m_bookmarksSession, SIGNAL(aboutToShow()), SLOT(bookmarks_menu_check()));
+ connect(m_bookmarksSession, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check()));
// Schema Options Menu -----------------------------------------------------
m_schema = new KPopupMenu(this);
m_schema->setCheckable(true);
KAcceleratorManager::manage( m_schema );
- connect(m_schema, SIGNAL(activated(int)), SLOT(schema_menu_activated(int)));
- connect(m_schema, SIGNAL(aboutToShow()), SLOT(schema_menu_check()));
+ connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int)));
+ connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check()));
// Keyboard Options Menu ---------------------------------------------------
m_keytab = new KPopupMenu(this);
m_keytab->setCheckable(true);
KAcceleratorManager::manage( m_keytab );
- connect(m_keytab, SIGNAL(activated(int)), SLOT(keytab_menu_activated(int)));
+ connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int)));
//options menu
if (m_options)
@@ -579,16 +579,16 @@ void Konsole::makeGUI()
// Tabbar
selectTabbar = new KSelectAction(i18n("&Tab Bar"), 0, this,
- SLOT(slotSelectTabbar()), actions, "tabbar" );
- QStringList tabbaritems;
+ TQT_SLOT(slotSelectTabbar()), actions, "tabbar" );
+ TQStringList tabbaritems;
tabbaritems << i18n("&Hide") << i18n("&Top") << i18n("&Bottom");
selectTabbar->setItems(tabbaritems);
selectTabbar->plug(m_options);
// Scrollbar
selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, this,
- SLOT(slotSelectScrollbar()), actions, "scrollbar" );
- QStringList scrollitems;
+ TQT_SLOT(slotSelectScrollbar()), actions, "scrollbar" );
+ TQStringList scrollitems;
scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right");
selectScrollbar->setItems(scrollitems);
selectScrollbar->plug(m_options);
@@ -603,8 +603,8 @@ void Konsole::makeGUI()
// Select Bell
selectBell = new KSelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this,
- SLOT(slotSelectBell()), actions, "bell");
- QStringList bellitems;
+ TQT_SLOT(slotSelectBell()), actions, "bell");
+ TQStringList bellitems;
bellitems << i18n("System &Bell")
<< i18n("System &Notification")
<< i18n("&Visible Bell")
@@ -618,28 +618,28 @@ void Konsole::makeGUI()
actions, 0L );
m_fontsizes->insert( new KAction( i18n( "&Enlarge Font" ),
SmallIconSet( "fontsizeup" ), 0, this,
- SLOT( biggerFont() ), actions,
+ TQT_SLOT( biggerFont() ), actions,
"enlarge_font" ) );
m_fontsizes->insert( new KAction( i18n( "&Shrink Font" ),
SmallIconSet( "fontsizedown" ), 0, this,
- SLOT( smallerFont() ), actions,
+ TQT_SLOT( smallerFont() ), actions,
"shrink_font" ) );
m_fontsizes->insert( new KAction( i18n( "Se&lect..." ),
SmallIconSet( "font" ), 0, this,
- SLOT( slotSelectFont() ), actions,
+ TQT_SLOT( slotSelectFont() ), actions,
"select_font" ) );
if ( b_installBitmapFonts )
{
m_fontsizes->insert( new KAction( i18n( "&Install Bitmap..." ),
SmallIconSet( "font" ), 0, this,
- SLOT( slotInstallBitmapFonts() ), actions,
+ TQT_SLOT( slotInstallBitmapFonts() ), actions,
"install_fonts" ) );
}
m_fontsizes->plug(m_options);
// encoding menu, start with default checked !
- selectSetEncoding = new KSelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, this, SLOT(slotSetEncoding()), actions, "set_encoding" );
- QStringList list = KGlobal::charsets()->descriptiveEncodingNames();
+ selectSetEncoding = new KSelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, this, TQT_SLOT(slotSetEncoding()), actions, "set_encoding" );
+ TQStringList list = KGlobal::charsets()->descriptiveEncodingNames();
list.prepend( i18n( "Default" ) );
selectSetEncoding->setItems(list);
selectSetEncoding->setCurrentItem (0);
@@ -656,8 +656,8 @@ void Konsole::makeGUI()
if (!b_fixedSize)
{
selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, this,
- SLOT(slotSelectSize()), actions, "size");
- QStringList sizeitems;
+ TQT_SLOT(slotSelectSize()), actions, "size");
+ TQStringList sizeitems;
sizeitems << i18n("40x15 (&Small)")
<< i18n("80x24 (&VT100)")
<< i18n("80x25 (&IBM PC)")
@@ -670,13 +670,13 @@ void Konsole::makeGUI()
}
KAction *historyType = new KAction(i18n("Hist&ory..."), "history", 0, this,
- SLOT(slotHistoryType()), actions, "history");
+ TQT_SLOT(slotHistoryType()), actions, "history");
historyType->plug(m_options);
m_options->insertSeparator();
KAction *save_settings = new KAction(i18n("&Save as Default"), "filesave", 0, this,
- SLOT(slotSaveSettings()), actions, "save_default");
+ TQT_SLOT(slotSaveSettings()), actions, "save_default");
save_settings->plug(m_options);
m_options->insertSeparator();
@@ -685,9 +685,9 @@ void Konsole::makeGUI()
m_options->insertSeparator();
- KStdAction::configureNotifications(this, SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options);
- KStdAction::keyBindings(this, SLOT(slotConfigureKeys()), actionCollection())->plug(m_options);
- KAction *configure = KStdAction::preferences(this, SLOT(slotConfigure()), actions);
+ KStdAction::configureNotifications(this, TQT_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options);
+ KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options);
+ KAction *configure = KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actions);
configure->plug(m_options);
if (KGlobalSettings::insertTearOffHandle())
@@ -699,13 +699,13 @@ void Konsole::makeGUI()
{
m_help->insertSeparator(1);
m_help->insertItem(SmallIcon( "idea" ), i18n("&Tip of the Day"),
- this, SLOT(showTip()), 0, -1, 2);
+ this, TQT_SLOT(showTip()), 0, -1, 2);
}
//the different session menus
buildSessionMenus();
- connect(m_session, SIGNAL(activated(int)), SLOT(newSession(int)));
+ connect(m_session, TQT_SIGNAL(activated(int)), TQT_SLOT(newSession(int)));
// Right mouse button menu
if (m_rightButton)
@@ -713,7 +713,7 @@ void Konsole::makeGUI()
updateRMBMenu(); // show menubar / exit fullscreen
KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, this,
- SLOT(slotSetSelectionEnd()), actions, "selection_end");
+ TQT_SLOT(slotSetSelectionEnd()), actions, "selection_end");
selectionEnd->plug(m_rightButton);
m_copyClipboard->plug(m_rightButton);
@@ -763,23 +763,23 @@ void Konsole::makeGUI()
// insert keymaps into menu
// This sorting seems a bit cumbersome; but it is not called often.
- QStringList kt_titles;
- typedef QMap<QString,KeyTrans*> QStringKeyTransMap;
+ TQStringList kt_titles;
+ typedef TQMap<TQString,KeyTrans*> QStringKeyTransMap;
QStringKeyTransMap kt_map;
for (int i = 0; i < KeyTrans::count(); i++)
{
KeyTrans* ktr = KeyTrans::find(i);
assert( ktr );
- QString title=ktr->hdr().lower();
+ TQString title=ktr->hdr().lower();
kt_titles << title;
kt_map[title] = ktr;
}
kt_titles.sort();
- for ( QStringList::Iterator it = kt_titles.begin(); it != kt_titles.end(); ++it ) {
+ for ( TQStringList::Iterator it = kt_titles.begin(); it != kt_titles.end(); ++it ) {
KeyTrans* ktr = kt_map[*it];
assert( ktr );
- QString title=ktr->hdr();
+ TQString title=ktr->hdr();
m_keytab->insertItem(title.replace('&',"&&"),ktr->numb());
}
@@ -791,39 +791,39 @@ void Konsole::makeGUI()
m_tabPopupMenu = new KPopupMenu( this );
KAcceleratorManager::manage( m_tabPopupMenu );
- m_tabDetachSession= new KAction( i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, SLOT(slotTabDetachSession()), this );
+ m_tabDetachSession= new KAction( i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, TQT_SLOT(slotTabDetachSession()), this );
m_tabDetachSession->plug(m_tabPopupMenu);
m_tabPopupMenu->insertItem( i18n("&Rename Session..."), this,
- SLOT(slotTabRenameSession()) );
+ TQT_SLOT(slotTabRenameSession()) );
m_tabPopupMenu->insertSeparator();
m_tabMonitorActivity = new KToggleAction ( i18n( "Monitor for &Activity" ),
- SmallIconSet("activity"), 0, this, SLOT( slotTabToggleMonitor() ), this );
+ SmallIconSet("activity"), 0, this, TQT_SLOT( slotTabToggleMonitor() ), this );
m_tabMonitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) );
m_tabMonitorActivity->plug(m_tabPopupMenu);
m_tabMonitorSilence = new KToggleAction ( i18n( "Monitor for &Silence" ),
- SmallIconSet("silence"), 0, this, SLOT( slotTabToggleMonitor() ), this );
+ SmallIconSet("silence"), 0, this, TQT_SLOT( slotTabToggleMonitor() ), this );
m_tabMonitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) );
m_tabMonitorSilence->plug(m_tabPopupMenu);
m_tabMasterMode = new KToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this,
- SLOT( slotTabToggleMasterMode() ), this);
+ TQT_SLOT( slotTabToggleMasterMode() ), this);
m_tabMasterMode->plug(m_tabPopupMenu);
m_tabPopupMenu->insertSeparator();
- m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, SLOT(slotTabSelectColor()) );
+ m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, TQT_SLOT(slotTabSelectColor()) );
m_tabPopupMenu->insertSeparator();
m_tabPopupTabsMenu = new KPopupMenu( m_tabPopupMenu );
m_tabPopupMenu->insertItem( i18n("Switch to Tab" ), m_tabPopupTabsMenu );
- connect( m_tabPopupTabsMenu, SIGNAL( activated ( int ) ),
- SLOT( activateSession( int ) ) );
+ connect( m_tabPopupTabsMenu, TQT_SIGNAL( activated ( int ) ),
+ TQT_SLOT( activateSession( int ) ) );
m_tabPopupMenu->insertSeparator();
m_tabPopupMenu->insertItem( SmallIcon("fileclose"), i18n("C&lose Session"), this,
- SLOT(slotTabCloseSession()) );
+ TQT_SLOT(slotTabCloseSession()) );
if (m_options) {
// Fill tab bar context menu
@@ -833,21 +833,21 @@ void Konsole::makeGUI()
KSelectAction *viewOptions = new KSelectAction(this);
viewOptions->setText(i18n("Tab &Options"));
- QStringList options;
+ TQStringList options;
options << i18n("&Text && Icons") << i18n("Text &Only") << i18n("&Icons Only");
viewOptions->setItems(options);
viewOptions->setCurrentItem(m_tabViewMode);
viewOptions->plug(m_tabbarPopupMenu);
- connect(viewOptions, SIGNAL(activated(int)), this, SLOT(slotTabSetViewOptions(int)));
+ connect(viewOptions, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTabSetViewOptions(int)));
slotTabSetViewOptions(m_tabViewMode);
KToggleAction *dynamicTabHideOption = new KToggleAction ( i18n( "&Dynamic Hide" ), 0, this,
- SLOT( slotTabbarToggleDynamicHide() ), this);
+ TQT_SLOT( slotTabbarToggleDynamicHide() ), this);
dynamicTabHideOption->setChecked(b_dynamicTabHide);
dynamicTabHideOption->plug(m_tabbarPopupMenu);
KToggleAction *m_autoResizeTabs = new KToggleAction( i18n("&Auto Resize Tabs"),
- 0, this, SLOT( slotToggleAutoResizeTabs() ), this);
+ 0, this, TQT_SLOT( slotToggleAutoResizeTabs() ), this);
m_autoResizeTabs->setChecked(b_autoResizeTabs);
m_autoResizeTabs->plug(m_tabbarPopupMenu);
}
@@ -858,28 +858,28 @@ void Konsole::slotSetEncoding()
{
if (!se) return;
- QTextCodec * qtc;
+ TQTextCodec * qtc;
if (selectSetEncoding->currentItem() == 0)
{
- qtc = QTextCodec::codecForLocale();
+ qtc = TQTextCodec::codecForLocale();
}
else
{
bool found;
- QString enc = KGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
+ TQString enc = KGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
qtc = KGlobal::charsets()->codecForName(enc, found);
// BR114535 : Remove jis7 due to infinite loop.
if ( enc == "jis7" ) {
kdWarning()<<"Encoding Japanese (jis7) currently does not work! BR114535"<<endl;
- qtc = QTextCodec::codecForLocale();
+ qtc = TQTextCodec::codecForLocale();
selectSetEncoding->setCurrentItem( 0 );
}
if(!found)
{
kdWarning() << "Codec " << selectSetEncoding->currentText() << " not found! Using default..." << endl;
- qtc = QTextCodec::codecForLocale();
+ qtc = TQTextCodec::codecForLocale();
selectSetEncoding->setCurrentItem( 0 );
}
}
@@ -896,57 +896,57 @@ void Konsole::makeTabWidget()
tabwidget->setTabCloseActivatePrevious( true );
if (n_tabbar==TabTop)
- tabwidget->setTabPosition(QTabWidget::Top);
+ tabwidget->setTabPosition(TQTabWidget::Top);
else
- tabwidget->setTabPosition(QTabWidget::Bottom);
+ tabwidget->setTabPosition(TQTabWidget::Bottom);
KAcceleratorManager::setNoAccel( tabwidget );
- connect(tabwidget, SIGNAL(movedTab(int,int)), SLOT(slotMovedTab(int,int)));
- connect(tabwidget, SIGNAL(mouseDoubleClick(QWidget*)), SLOT(slotRenameSession()));
- connect(tabwidget, SIGNAL(currentChanged(QWidget*)), SLOT(activateSession(QWidget*)));
- connect( tabwidget, SIGNAL(contextMenu(QWidget*, const QPoint &)),
- SLOT(slotTabContextMenu(QWidget*, const QPoint &)));
- connect( tabwidget, SIGNAL(contextMenu(const QPoint &)),
- SLOT(slotTabbarContextMenu(const QPoint &)));
+ connect(tabwidget, TQT_SIGNAL(movedTab(int,int)), TQT_SLOT(slotMovedTab(int,int)));
+ connect(tabwidget, TQT_SIGNAL(mouseDoubleClick(TQWidget*)), TQT_SLOT(slotRenameSession()));
+ connect(tabwidget, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(activateSession(TQWidget*)));
+ connect( tabwidget, TQT_SIGNAL(contextMenu(TQWidget*, const TQPoint &)),
+ TQT_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &)));
+ connect( tabwidget, TQT_SIGNAL(contextMenu(const TQPoint &)),
+ TQT_SLOT(slotTabbarContextMenu(const TQPoint &)));
if (kapp->authorize("shell_access")) {
- connect(tabwidget, SIGNAL(mouseDoubleClick()), SLOT(newSession()));
+ connect(tabwidget, TQT_SIGNAL(mouseDoubleClick()), TQT_SLOT(newSession()));
- m_newSessionButton = new QToolButton( tabwidget );
- QToolTip::add(m_newSessionButton,i18n("Click for new standard session\nClick and hold for session menu"));
+ m_newSessionButton = new TQToolButton( tabwidget );
+ TQToolTip::add(m_newSessionButton,i18n("Click for new standard session\nClick and hold for session menu"));
m_newSessionButton->setIconSet( SmallIcon( "tab_new" ) );
m_newSessionButton->adjustSize();
m_newSessionButton->setPopup( m_tabbarSessionsCommands );
- connect(m_newSessionButton, SIGNAL(clicked()), SLOT(newSession()));
+ connect(m_newSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(newSession()));
tabwidget->setCornerWidget( m_newSessionButton, BottomLeft );
m_newSessionButton->installEventFilter(this);
- m_removeSessionButton = new QToolButton( tabwidget );
- QToolTip::add(m_removeSessionButton,i18n("Close the current session"));
+ m_removeSessionButton = new TQToolButton( tabwidget );
+ TQToolTip::add(m_removeSessionButton,i18n("Close the current session"));
m_removeSessionButton->setIconSet( SmallIconSet( "tab_remove" ) );
m_removeSessionButton->adjustSize();
m_removeSessionButton->setEnabled(false);
- connect(m_removeSessionButton, SIGNAL(clicked()), SLOT(confirmCloseCurrentSession()));
+ connect(m_removeSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(confirmCloseCurrentSession()));
tabwidget->setCornerWidget( m_removeSessionButton, BottomRight );
}
}
-bool Konsole::eventFilter( QObject *o, QEvent *ev )
+bool Konsole::eventFilter( TQObject *o, TQEvent *ev )
{
if (o == m_newSessionButton)
{
// Popup the menu when the left mousebutton is pressed and the mouse
// is moved by a small distance.
- if (ev->type() == QEvent::MouseButtonPress)
+ if (ev->type() == TQEvent::MouseButtonPress)
{
- QMouseEvent* mev = static_cast<QMouseEvent*>(ev);
+ TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
m_newSessionButtonMousePressPos = mev->pos();
}
- else if (ev->type() == QEvent::MouseMove)
+ else if (ev->type() == TQEvent::MouseMove)
{
- QMouseEvent* mev = static_cast<QMouseEvent*>(ev);
+ TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
if ((mev->pos() - m_newSessionButtonMousePressPos).manhattanLength()
> KGlobalSettings::dndEventDelay())
{
@@ -954,9 +954,9 @@ bool Konsole::eventFilter( QObject *o, QEvent *ev )
return true;
}
}
- else if (ev->type() == QEvent::ContextMenu)
+ else if (ev->type() == TQEvent::ContextMenu)
{
- QMouseEvent* mev = static_cast<QMouseEvent*>(ev);
+ TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
slotTabbarContextMenu(mev->globalPos());
return true;
}
@@ -969,7 +969,7 @@ void Konsole::makeBasicGUI()
if (kapp->authorize("shell_access")) {
m_tabbarSessionsCommands = new KPopupMenu( this );
KAcceleratorManager::manage( m_tabbarSessionsCommands );
- connect(m_tabbarSessionsCommands, SIGNAL(activated(int)), SLOT(newSessionTabbar(int)));
+ connect(m_tabbarSessionsCommands, TQT_SIGNAL(activated(int)), TQT_SLOT(newSessionTabbar(int)));
}
m_session = new KPopupMenu(this);
@@ -1012,20 +1012,20 @@ void Konsole::makeBasicGUI()
// programs.
if (m_tabbarSessionsCommands)
- connect(m_tabbarSessionsCommands,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
- connect(m_session,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
+ connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+ connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
if (m_options)
- connect(m_options,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
+ connect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
if (m_help)
- connect(m_help,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
+ connect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
if (m_rightButton)
- connect(m_rightButton,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
- connect(m_edit,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
- connect(m_view,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
+ connect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+ connect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+ connect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
if (m_bookmarks)
- connect(m_bookmarks,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
+ connect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
if (m_bookmarksSession)
- connect(m_bookmarksSession,SIGNAL(aboutToShow()),this,SLOT(makeGUI()));
+ connect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
menubar->insertItem(i18n("Session") , m_session);
menubar->insertItem(i18n("Edit"), m_edit);
@@ -1040,113 +1040,113 @@ void Konsole::makeBasicGUI()
m_shortcuts = new KActionCollection(this);
m_copyClipboard = new KAction(i18n("&Copy"), "editcopy", 0, this,
- SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy");
+ TQT_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy");
m_pasteClipboard = new KAction(i18n("&Paste"), "editpaste", Qt::SHIFT+Qt::Key_Insert, this,
- SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste");
+ TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste");
m_pasteSelection = new KAction(i18n("Paste Selection"), Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, this,
- SLOT(slotPasteSelection()), m_shortcuts, "pasteselection");
+ TQT_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection");
m_clearTerminal = new KAction(i18n("C&lear Terminal"), 0, this,
- SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal");
+ TQT_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal");
m_resetClearTerminal = new KAction(i18n("&Reset && Clear Terminal"), 0, this,
- SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal");
+ TQT_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal");
m_findHistory = new KAction(i18n("&Find in History..."), "find", 0, this,
- SLOT(slotFindHistory()), m_shortcuts, "find_history");
+ TQT_SLOT(slotFindHistory()), m_shortcuts, "find_history");
m_findHistory->setEnabled(b_histEnabled);
m_findNext = new KAction(i18n("Find &Next"), "next", 0, this,
- SLOT(slotFindNext()), m_shortcuts, "find_next");
+ TQT_SLOT(slotFindNext()), m_shortcuts, "find_next");
m_findNext->setEnabled(b_histEnabled);
m_findPrevious = new KAction(i18n("Find Pre&vious"), "previous", 0, this,
- SLOT(slotFindPrevious()), m_shortcuts, "find_previous");
+ TQT_SLOT(slotFindPrevious()), m_shortcuts, "find_previous");
m_findPrevious->setEnabled( b_histEnabled );
m_saveHistory = new KAction(i18n("S&ave History As..."), "filesaveas", 0, this,
- SLOT(slotSaveHistory()), m_shortcuts, "save_history");
+ TQT_SLOT(slotSaveHistory()), m_shortcuts, "save_history");
m_saveHistory->setEnabled(b_histEnabled );
m_clearHistory = new KAction(i18n("Clear &History"), "history_clear", 0, this,
- SLOT(slotClearHistory()), m_shortcuts, "clear_history");
+ TQT_SLOT(slotClearHistory()), m_shortcuts, "clear_history");
m_clearHistory->setEnabled(b_histEnabled);
m_clearAllSessionHistories = new KAction(i18n("Clear All H&istories"), "history_clear", 0,
- this, SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories");
+ this, TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories");
m_detachSession = new KAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this,
- SLOT(slotDetachSession()), m_shortcuts, "detach_session");
+ TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session");
m_detachSession->setEnabled(false);
m_renameSession = new KAction(i18n("&Rename Session..."), Qt::CTRL+Qt::ALT+Qt::Key_S, this,
- SLOT(slotRenameSession()), m_shortcuts, "rename_session");
+ TQT_SLOT(slotRenameSession()), m_shortcuts, "rename_session");
if (kapp->authorizeKAction("zmodem_upload"))
m_zmodemUpload = new KAction( i18n( "&ZModem Upload..." ),
Qt::CTRL+Qt::ALT+Qt::Key_U, this,
- SLOT( slotZModemUpload() ),
+ TQT_SLOT( slotZModemUpload() ),
m_shortcuts, "zmodem_upload" );
monitorActivity = new KToggleAction ( i18n( "Monitor for &Activity" ),
SmallIconSet("activity"), 0, this,
- SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" );
+ TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" );
monitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) );
monitorSilence = new KToggleAction ( i18n( "Monitor for &Silence" ),
SmallIconSet("silence"), 0, this,
- SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" );
+ TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" );
monitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) );
masterMode = new KToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this,
- SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" );
+ TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" );
showMenubar = new KToggleAction ( i18n( "Show &Menubar" ), "showmenu", 0, this,
- SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" );
- showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", QString::null, QString::null ) );
+ TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" );
+ showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) );
m_fullscreen = KStdAction::fullScreen(0, 0, m_shortcuts, this );
- connect( m_fullscreen,SIGNAL(toggled(bool)), this,SLOT(updateFullScreen(bool)));
+ connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(updateFullScreen(bool)));
m_fullscreen->setChecked(b_fullscreen);
m_saveProfile = new KAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("filesaveas"), 0, this,
- SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" );
+ TQT_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" );
//help menu
if (m_help)
- m_help->setAccel(QKeySequence(),m_help->idAt(0));
+ m_help->setAccel(TQKeySequence(),m_help->idAt(0));
// Don't steal F1 (handbook) accel (esp. since it not visible in
// "Configure Shortcuts").
m_closeSession = new KAction(i18n("C&lose Session"), "fileclose", 0, this,
- SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session");
- m_print = new KAction(i18n("&Print Screen..."), "fileprint", 0, this, SLOT( slotPrint() ), m_shortcuts, "file_print");
- m_quit = new KAction(i18n("&Quit"), "exit", 0, this, SLOT( close() ), m_shortcuts, "file_quit");
+ TQT_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session");
+ m_print = new KAction(i18n("&Print Screen..."), "fileprint", 0, this, TQT_SLOT( slotPrint() ), m_shortcuts, "file_print");
+ m_quit = new KAction(i18n("&Quit"), "exit", 0, this, TQT_SLOT( close() ), m_shortcuts, "file_quit");
KShortcut shortcut(Qt::CTRL+Qt::ALT+Qt::Key_N);
shortcut.append(KShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_N));
- new KAction(i18n("New Session"), shortcut, this, SLOT(newSession()), m_shortcuts, "new_session");
- new KAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::Key_M, this, SLOT(activateMenu()), m_shortcuts, "activate_menu");
- new KAction(i18n("List Sessions"), 0, this, SLOT(listSessions()), m_shortcuts, "list_sessions");
-
- m_moveSessionLeft = new KAction(i18n("&Move Session Left"), QApplication::reverseLayout() ? "forward" : "back",
- QApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, this,
- SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
- m_moveSessionRight = new KAction(i18n("M&ove Session Right"), QApplication::reverseLayout() ? "back" : "forward",
- QApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, this,
- SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
-
- new KAction(i18n("Go to Previous Session"), QApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left,
- this, SLOT(prevSession()), m_shortcuts, "previous_session");
- new KAction(i18n("Go to Next Session"), QApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Left : Qt::SHIFT+Qt::Key_Right,
- this, SLOT(nextSession()), m_shortcuts, "next_session");
+ new KAction(i18n("New Session"), shortcut, this, TQT_SLOT(newSession()), m_shortcuts, "new_session");
+ new KAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::Key_M, this, TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu");
+ new KAction(i18n("List Sessions"), 0, this, TQT_SLOT(listSessions()), m_shortcuts, "list_sessions");
+
+ m_moveSessionLeft = new KAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back",
+ TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, this,
+ TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
+ m_moveSessionRight = new KAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward",
+ TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, this,
+ TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
+
+ new KAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left,
+ this, TQT_SLOT(prevSession()), m_shortcuts, "previous_session");
+ new KAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Left : Qt::SHIFT+Qt::Key_Right,
+ this, TQT_SLOT(nextSession()), m_shortcuts, "next_session");
for (int i=1;i<13;i++) { // Due to 12 function keys?
- new KAction(i18n("Switch to Session %1").arg(i), 0, this, SLOT(switchToSession()), m_shortcuts, QString().sprintf("switch_to_session_%02d", i).latin1());
+ new KAction(i18n("Switch to Session %1").arg(i), 0, this, TQT_SLOT(switchToSession()), m_shortcuts, TQString().sprintf("switch_to_session_%02d", i).latin1());
}
- new KAction(i18n("Enlarge Font"), 0, this, SLOT(biggerFont()), m_shortcuts, "bigger_font");
- new KAction(i18n("Shrink Font"), 0, this, SLOT(smallerFont()), m_shortcuts, "smaller_font");
+ new KAction(i18n("Enlarge Font"), 0, this, TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font");
+ new KAction(i18n("Shrink Font"), 0, this, TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font");
- new KAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, this, SLOT(toggleBidi()), m_shortcuts, "toggle_bidi");
+ new KAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, this, TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi");
// Should we load all *.desktop files now? Required for Session shortcuts.
if ( KConfigGroup(KGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) {
@@ -1158,7 +1158,7 @@ void Konsole::makeBasicGUI()
m_sessionList = new KPopupMenu(this);
KAcceleratorManager::manage( m_sessionList );
- connect(m_sessionList, SIGNAL(activated(int)), SLOT(activateSession(int)));
+ connect(m_sessionList, TQT_SIGNAL(activated(int)), TQT_SLOT(activateSession(int)));
}
/**
@@ -1287,10 +1287,10 @@ void Konsole::configureRequest(TEWidget* _te, int state, int x, int y)
makeGUI();
KPopupMenu *menu = (state & ControlButton) ? m_session : m_rightButton;
if (menu)
- menu->popup(_te->mapToGlobal(QPoint(x,y)));
+ menu->popup(_te->mapToGlobal(TQPoint(x,y)));
}
-void Konsole::slotTabContextMenu(QWidget* _te, const QPoint & pos)
+void Konsole::slotTabContextMenu(TQWidget* _te, const TQPoint & pos)
{
if (!m_menuCreated)
makeGUI();
@@ -1306,7 +1306,7 @@ void Konsole::slotTabContextMenu(QWidget* _te, const QPoint & pos)
m_tabPopupTabsMenu->clear();
int counter=0;
for (TESession *ses = sessions.first(); ses; ses = sessions.next()) {
- QString title=ses->Title();
+ TQString title=ses->Title();
m_tabPopupTabsMenu->insertItem(SmallIcon(ses->IconName()),title.replace('&',"&&"),counter++);
}
@@ -1323,7 +1323,7 @@ void Konsole::slotTabRenameSession() {
void Konsole::slotTabSelectColor()
{
- QColor color = tabwidget->tabColor( m_contextMenuSession->widget() );
+ TQColor color = tabwidget->tabColor( m_contextMenuSession->widget() );
int result = KColorDialog::getColor( color );
if ( result == KColorDialog::Accepted )
@@ -1351,7 +1351,7 @@ void Konsole::slotTabCloseSession()
confirmCloseCurrentSession(m_contextMenuSession);
}
-void Konsole::slotTabbarContextMenu(const QPoint & pos)
+void Konsole::slotTabbarContextMenu(const TQPoint & pos)
{
if (!m_menuCreated)
makeGUI();
@@ -1365,9 +1365,9 @@ void Konsole::slotTabSetViewOptions(int mode)
for(int i = 0; i < tabwidget->count(); i++) {
- QWidget *page = tabwidget->page(i);
- QIconSet icon = iconSetForSession(sessions.at(i));
- QString title;
+ TQWidget *page = tabwidget->page(i);
+ TQIconSet icon = iconSetForSession(sessions.at(i));
+ TQString title;
if (b_matchTabWinTitle)
title = sessions.at(i)->fullTitle();
else
@@ -1379,10 +1379,10 @@ void Konsole::slotTabSetViewOptions(int mode)
tabwidget->changeTab(page, icon, title);
break;
case ShowTextOnly:
- tabwidget->changeTab(page, QIconSet(), title);
+ tabwidget->changeTab(page, TQIconSet(), title);
break;
case ShowIconOnly:
- tabwidget->changeTab(page, icon, QString::null);
+ tabwidget->changeTab(page, icon, TQString::null);
break;
}
}
@@ -1414,16 +1414,16 @@ void Konsole::slotSaveSessionsProfile()
{
bool ok;
- QString prof = KInputDialog::getText( i18n( "Save Sessions Profile" ),
+ TQString prof = KInputDialog::getText( i18n( "Save Sessions Profile" ),
i18n( "Enter name under which the profile should be saved:" ),
- QString::null, &ok, this );
+ TQString::null, &ok, this );
if ( ok ) {
- QString path = locateLocal( "data",
- QString::fromLatin1( "konsole/profiles/" ) + prof,
+ TQString path = locateLocal( "data",
+ TQString::fromLatin1( "konsole/profiles/" ) + prof,
KGlobal::instance() );
- if ( QFile::exists( path ) )
- QFile::remove( path );
+ if ( TQFile::exists( path ) )
+ TQFile::remove( path );
KSimpleConfig cfg( path );
savePropertiesInternal(&cfg,1);
@@ -1434,7 +1434,7 @@ void Konsole::slotSaveSessionsProfile()
void Konsole::saveProperties(KConfig* config) {
uint counter=0;
uint active=0;
- QString key;
+ TQString key;
if (config != KGlobal::config())
{
@@ -1443,42 +1443,42 @@ void Konsole::saveProperties(KConfig* config) {
sessions.first();
while(counter < sessions.count())
{
- key = QString("Title%1").arg(counter);
+ key = TQString("Title%1").arg(counter);
config->writeEntry(key, sessions.current()->Title());
- key = QString("Schema%1").arg(counter);
+ key = TQString("Schema%1").arg(counter);
config->writeEntry(key, colors->find( sessions.current()->schemaNo() )->relPath());
- key = QString("Encoding%1").arg(counter);
+ key = TQString("Encoding%1").arg(counter);
config->writeEntry(key, sessions.current()->encodingNo());
- key = QString("Args%1").arg(counter);
+ key = TQString("Args%1").arg(counter);
config->writeEntry(key, sessions.current()->getArgs());
- key = QString("Pgm%1").arg(counter);
+ key = TQString("Pgm%1").arg(counter);
config->writeEntry(key, sessions.current()->getPgm());
- key = QString("SessionFont%1").arg(counter);
+ key = TQString("SessionFont%1").arg(counter);
config->writeEntry(key, (sessions.current()->widget())->getVTFont());
- key = QString("Term%1").arg(counter);
+ key = TQString("Term%1").arg(counter);
config->writeEntry(key, sessions.current()->Term());
- key = QString("KeyTab%1").arg(counter);
+ key = TQString("KeyTab%1").arg(counter);
config->writeEntry(key, sessions.current()->keymap());
- key = QString("Icon%1").arg(counter);
+ key = TQString("Icon%1").arg(counter);
config->writeEntry(key, sessions.current()->IconName());
- key = QString("MonitorActivity%1").arg(counter);
+ key = TQString("MonitorActivity%1").arg(counter);
config->writeEntry(key, sessions.current()->isMonitorActivity());
- key = QString("MonitorSilence%1").arg(counter);
+ key = TQString("MonitorSilence%1").arg(counter);
config->writeEntry(key, sessions.current()->isMonitorSilence());
- key = QString("MasterMode%1").arg(counter);
+ key = TQString("MasterMode%1").arg(counter);
config->writeEntry(key, sessions.current()->isMasterMode());
- key = QString("TabColor%1").arg(counter);
+ key = TQString("TabColor%1").arg(counter);
config->writeEntry(key, tabwidget->tabColor((sessions.current())->widget()));
- key = QString("History%1").arg(counter);
+ key = TQString("History%1").arg(counter);
config->writeEntry(key, sessions.current()->history().getSize());
- key = QString("HistoryEnabled%1").arg(counter);
+ key = TQString("HistoryEnabled%1").arg(counter);
config->writeEntry(key, sessions.current()->history().isOn());
- QString cwd=sessions.current()->getCwd();
+ TQString cwd=sessions.current()->getCwd();
if (cwd.isEmpty())
cwd=sessions.current()->getInitial_cwd();
- key = QString("Cwd%1").arg(counter);
+ key = TQString("Cwd%1").arg(counter);
config->writePathEntry(key, cwd);
if (sessions.current()==se)
@@ -1508,7 +1508,7 @@ void Konsole::saveProperties(KConfig* config) {
if (selectSetEncoding)
{
- QString encoding = KGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
+ TQString encoding = KGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
config->writeEntry("EncodingName", encoding);
} else { // This will not always work (ie 'winsami' saves as 'ws2')
if (se) config->writeEntry("EncodingName", se->encoding());
@@ -1538,7 +1538,7 @@ void Konsole::saveProperties(KConfig* config) {
// So it has to apply the settings when reading them.
void Konsole::readProperties(KConfig* config)
{
- readProperties(config, QString::null, false);
+ readProperties(config, TQString::null, false);
}
// If --type option was given, load the corresponding schema instead of
@@ -1546,7 +1546,7 @@ void Konsole::readProperties(KConfig* config)
//
// When globalConfigOnly is true only the options that are shared among all
// konsoles are being read.
-void Konsole::readProperties(KConfig* config, const QString &schema, bool globalConfigOnly)
+void Konsole::readProperties(KConfig* config, const TQString &schema, bool globalConfigOnly)
{
if (config==KGlobal::config())
@@ -1557,11 +1557,11 @@ void Konsole::readProperties(KConfig* config, const QString &schema, bool global
b_bidiEnabled = config->readBoolEntry("EnableBidi",false);
s_word_seps= config->readEntry("wordseps",":@-./_~");
b_framevis = config->readBoolEntry("has frame",true);
- QPtrList<TEWidget> tes = activeTEs();
+ TQPtrList<TEWidget> tes = activeTEs();
for (TEWidget *_te = tes.first(); _te; _te = tes.next()) {
_te->setWordCharacters(s_word_seps);
_te->setTerminalSizeHint( config->readBoolEntry("TerminalSizeHint",false) );
- _te->setFrameStyle( b_framevis?(QFrame::WinPanel|QFrame::Sunken):QFrame::NoFrame );
+ _te->setFrameStyle( b_framevis?(TQFrame::WinPanel|TQFrame::Sunken):TQFrame::NoFrame );
_te->setBlinkingCursor(config->readBoolEntry("BlinkingCursor",false));
_te->setCtrlDrag(config->readBoolEntry("CtrlDrag",true));
_te->setCutToBeginningOfLine(config->readBoolEntry("CutToBeginningOfLine",false));
@@ -1596,7 +1596,7 @@ void Konsole::readProperties(KConfig* config, const QString &schema, bool global
// (1) set menu items and Konsole members
- QFont tmpFont = KGlobalSettings::fixedFont();
+ TQFont tmpFont = KGlobalSettings::fixedFont();
defaultFont = config->readFontEntry("defaultfont", &tmpFont);
//set the schema
@@ -1618,7 +1618,7 @@ void Konsole::readProperties(KConfig* config, const QString &schema, bool global
{
if (!rootxpms[te])
rootxpms.insert( te, new KRootPixmap(te) );
- rootxpms[te]->setFadeEffect(sch->tr_x(), QColor(sch->tr_r(), sch->tr_g(), sch->tr_b()));
+ rootxpms[te]->setFadeEffect(sch->tr_x(), TQColor(sch->tr_r(), sch->tr_g(), sch->tr_b()));
}
else
{
@@ -1648,7 +1648,7 @@ void Konsole::readProperties(KConfig* config, const QString &schema, bool global
// The scrollbar location only needs to be changed when the given
// profile scrollbar entry differs from the konsolerc scrollbar entry.
- QPtrList<TEWidget> tes = activeTEs();
+ TQPtrList<TEWidget> tes = activeTEs();
for (TEWidget *_te = tes.first(); _te; _te = tes.next()) {
if (_te->getScrollbarLocation() != n_scroll)
_te->setScrollbarLocation(n_scroll);
@@ -1705,7 +1705,7 @@ void Konsole::pixmap_menu_activated(int item, TEWidget* tewidget)
if (!tewidget)
tewidget=te;
if (item <= 1) pmPath = "";
- QPixmap pm(pmPath);
+ TQPixmap pm(pmPath);
if (pm.isNull()) {
pmPath = "";
item = 1;
@@ -1721,7 +1721,7 @@ void Konsole::pixmap_menu_activated(int item, TEWidget* tewidget)
tewidget->setBackgroundPixmap(pm);
break;
case 3: // center
- { QPixmap bgPixmap;
+ { TQPixmap bgPixmap;
bgPixmap.resize(tewidget->size());
bgPixmap.fill(tewidget->getDefaultBackColor());
bitBlt( &bgPixmap, ( tewidget->size().width() - pm.width() ) / 2,
@@ -1736,7 +1736,7 @@ void Konsole::pixmap_menu_activated(int item, TEWidget* tewidget)
{
float sx = (float)tewidget->size().width() / pm.width();
float sy = (float)tewidget->size().height() / pm.height();
- QWMatrix matrix;
+ TQWMatrix matrix;
matrix.scale( sx, sy );
tewidget->setBackgroundPixmap(pm.xForm( matrix ));
}
@@ -1755,7 +1755,7 @@ void Konsole::slotSelectScrollbar() {
if (m_menuCreated)
n_scroll = selectScrollbar->currentItem();
- QPtrList<TEWidget> tes = activeTEs();
+ TQPtrList<TEWidget> tes = activeTEs();
for (TEWidget *_te = tes.first(); _te; _te = tes.next())
_te->setScrollbarLocation(n_scroll);
activateSession(); // maybe helps in bg
@@ -1764,16 +1764,16 @@ void Konsole::slotSelectScrollbar() {
void Konsole::checkBitmapFonts()
{
{
- QFont f;
+ TQFont f;
f.setRawName("-misc-console-medium-r-normal--16-160-72-72-c-80-iso10646-1");
- QFontInfo fi( f );
+ TQFontInfo fi( f );
if ( !fi.exactMatch() )
b_installBitmapFonts = true;
}
{
- QFont f;
+ TQFont f;
f.setRawName("-misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1");
- QFontInfo fi( f );
+ TQFontInfo fi( f );
if ( !fi.exactMatch() )
b_installBitmapFonts = true;
}
@@ -1787,18 +1787,18 @@ void Konsole::slotInstallBitmapFonts()
if ( !b_installBitmapFonts )
return;
- QStringList sl_installFonts;
+ TQStringList sl_installFonts;
{
- QFont f;
+ TQFont f;
f.setRawName("-misc-console-medium-r-normal--16-160-72-72-c-80-iso10646-1");
- QFontInfo fi( f );
+ TQFontInfo fi( f );
if ( !fi.exactMatch() )
sl_installFonts << "console8x16.pcf.gz";
}
{
- QFont f;
+ TQFont f;
f.setRawName("-misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1");
- QFontInfo fi( f );
+ TQFontInfo fi( f );
if ( !fi.exactMatch() )
sl_installFonts << "9x15.pcf.gz";
}
@@ -1812,10 +1812,10 @@ void Konsole::slotInstallBitmapFonts()
KGuiItem( i18n("&Install" ) ),
i18n("Do Not Install") ) == KMessageBox::Yes )
{
- for ( QStringList::iterator it = sl_installFonts.begin();
+ for ( TQStringList::iterator it = sl_installFonts.begin();
it != sl_installFonts.end(); ++it )
{
- QString sf = "fonts/" + *it;
+ TQString sf = "fonts/" + *it;
if ( KIO::NetAccess::copy( locate( "appdata", sf ),
"fonts:/Personal/", 0 ) )
{
@@ -1833,8 +1833,8 @@ void Konsole::slotInstallBitmapFonts()
void Konsole::slotSelectFont() {
if ( !se ) return;
- QFont font = se->widget()->getVTFont();
- if ( KFontDialog::getFont( font, true ) != QDialog::Accepted )
+ TQFont font = se->widget()->getVTFont();
+ if ( KFontDialog::getFont( font, true ) != TQDialog::Accepted )
return;
se->widget()->setVTFont( font );
@@ -1864,7 +1864,7 @@ void Konsole::updateSchemaMenu()
{
ColorSchema* s = (ColorSchema*)colors->at(i);
assert( s );
- QString title=s->title();
+ TQString title=s->title();
m_schema->insertItem(title.replace('&',"&&"),s->numb(),0);
}
@@ -1907,7 +1907,7 @@ void Konsole::slotToggleMenubar() {
}
if (!showMenubar->isChecked()) {
setCaption(i18n("Use the right mouse button to bring back the menu"));
- QTimer::singleShot(5000,this,SLOT(updateTitle()));
+ TQTimer::singleShot(5000,this,TQT_SLOT(updateTitle()));
}
updateRMBMenu();
}
@@ -1917,7 +1917,7 @@ void Konsole::initTEWidget(TEWidget* new_te, TEWidget* default_te)
new_te->setWordCharacters(default_te->wordCharacters());
new_te->setTerminalSizeHint(default_te->isTerminalSizeHint());
new_te->setTerminalSizeStartup(false);
- new_te->setFrameStyle(b_framevis?(QFrame::WinPanel|QFrame::Sunken):QFrame::NoFrame);
+ new_te->setFrameStyle(b_framevis?(TQFrame::WinPanel|TQFrame::Sunken):TQFrame::NoFrame);
new_te->setBlinkingCursor(default_te->blinkingCursor());
new_te->setCtrlDrag(default_te->ctrlDrag());
new_te->setCutToBeginningOfLine(default_te->cutToBeginningOfLine());
@@ -1931,28 +1931,28 @@ void Konsole::initTEWidget(TEWidget* new_te, TEWidget* default_te)
new_te->setMinimumSize(150,70);
}
-void Konsole::createSessionTab(TEWidget *widget, const QIconSet &iconSet,
- const QString &text, int index)
+void Konsole::createSessionTab(TEWidget *widget, const TQIconSet &iconSet,
+ const TQString &text, int index)
{
switch(m_tabViewMode) {
case ShowIconAndText:
tabwidget->insertTab(widget, iconSet, text, index);
break;
case ShowTextOnly:
- tabwidget->insertTab(widget, QIconSet(), text, index);
+ tabwidget->insertTab(widget, TQIconSet(), text, index);
break;
case ShowIconOnly:
- tabwidget->insertTab(widget, iconSet, QString::null, index);
+ tabwidget->insertTab(widget, iconSet, TQString::null, index);
break;
}
if ( m_tabColor.isValid() )
tabwidget->setTabColor(widget, m_tabColor);
}
-QIconSet Konsole::iconSetForSession(TESession *session) const
+TQIconSet Konsole::iconSetForSession(TESession *session) const
{
if (m_tabViewMode == ShowTextOnly)
- return QIconSet();
+ return TQIconSet();
return SmallIconSet(session->isMasterMode() ? "remote" : session->IconName());
}
@@ -1970,13 +1970,13 @@ void Konsole::slotSelectTabbar() {
if ( tabwidget->isTabBarHidden() )
tabwidget->setTabBarHidden( false );
if ( n_tabbar == TabTop )
- tabwidget->setTabPosition( QTabWidget::Top );
+ tabwidget->setTabPosition( TQTabWidget::Top );
else
- tabwidget->setTabPosition( QTabWidget::Bottom );
+ tabwidget->setTabPosition( TQTabWidget::Bottom );
}
/* FIXME: Still necessary ? */
- QPtrDictIterator<KRootPixmap> it(rootxpms);
+ TQPtrDictIterator<KRootPixmap> it(rootxpms);
for (;it.current();++it)
it.current()->repaint(true);
@@ -2006,7 +2006,7 @@ void Konsole::slotConfigureKeys()
KKeyDialog::configure(m_shortcuts);
m_shortcuts->writeShortcutSettings();
- QStringList ctrlKeys;
+ TQStringList ctrlKeys;
for ( uint i = 0; i < m_shortcuts->count(); i++ )
{
@@ -2021,7 +2021,7 @@ void Konsole::slotConfigureKeys()
// Are there any shortcuts for Session Menu entries?
if ( !b_sessionShortcutsEnabled &&
m_shortcuts->action( i )->shortcut().count() &&
- QString(m_shortcuts->action( i )->name()).startsWith("SSC_") ) {
+ TQString(m_shortcuts->action( i )->name()).startsWith("SSC_") ) {
b_sessionShortcutsEnabled = true;
KConfigGroup group(KGlobal::config(), "General");
group.writeEntry("SessionShortcutsEnabled", true);
@@ -2047,7 +2047,7 @@ void Konsole::slotConfigureKeys()
void Konsole::slotConfigure()
{
- QStringList args;
+ TQStringList args;
args << "kcmkonsole";
KApplication::kdeinitExec( "kcmshell", args );
}
@@ -2055,18 +2055,18 @@ void Konsole::slotConfigure()
void Konsole::reparseConfiguration()
{
KGlobal::config()->reparseConfiguration();
- readProperties(KGlobal::config(), QString::null, true);
+ readProperties(KGlobal::config(), TQString::null, true);
// The .desktop files may have been changed by user...
b_sessionShortcutsMapped = false;
// Mappings may have to be changed...get a fresh mapper.
- disconnect( sessionNumberMapper, SIGNAL( mapped( int ) ),
- this, SLOT( newSessionTabbar( int ) ) );
+ disconnect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ),
+ this, TQT_SLOT( newSessionTabbar( int ) ) );
delete sessionNumberMapper;
- sessionNumberMapper = new QSignalMapper( this );
- connect( sessionNumberMapper, SIGNAL( mapped( int ) ),
- this, SLOT( newSessionTabbar( int ) ) );
+ sessionNumberMapper = new TQSignalMapper( this );
+ connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ),
+ this, TQT_SLOT( newSessionTabbar( int ) ) );
sl_sessionShortCuts.clear();
buildSessionMenus();
@@ -2077,12 +2077,12 @@ void Konsole::reparseConfiguration()
{
KAction* action = m_shortcuts->action( i );
bool b_foundSession = false;
- if ( QString(action->name()).startsWith("SSC_") ) {
- QString name = QString(action->name());
+ if ( TQString(action->name()).startsWith("SSC_") ) {
+ TQString name = TQString(action->name());
// Check to see if shortcut's session has been loaded.
- for ( QStringList::Iterator it = sl_sessionShortCuts.begin(); it != sl_sessionShortCuts.end(); ++it ) {
- if ( QString::compare( *it, name ) == 0 ) {
+ for ( TQStringList::Iterator it = sl_sessionShortCuts.begin(); it != sl_sessionShortCuts.end(); ++it ) {
+ if ( TQString::compare( *it, name ) == 0 ) {
b_foundSession = true;
break;
}
@@ -2128,7 +2128,7 @@ void Konsole::reparseConfiguration()
void Konsole::changeTabTextColor( TESession* ses, int rgb )
{
if ( !ses ) return;
- QColor color;
+ TQColor color;
color.setRgb( rgb );
if ( !color.isValid() ) {
kdWarning()<<" Invalid RGB color "<<rgb<<endl;
@@ -2208,21 +2208,21 @@ void Konsole::updateTitle(TESession* _se)
setIconText( _se->IconText() );
}
tabwidget->setTabIconSet(_se->widget(), iconSetForSession(_se));
- QString icon = _se->IconName();
+ TQString icon = _se->IconName();
KRadioAction *ra = session2action.find(_se);
if (ra && (ra->icon() != icon))
ra->setIcon(icon);
if (m_tabViewMode == ShowIconOnly)
- tabwidget->changeTab( _se->widget(), QString::null );
+ tabwidget->changeTab( _se->widget(), TQString::null );
else if (b_matchTabWinTitle)
tabwidget->setTabLabel( _se->widget(), _se->fullTitle().replace('&',"&&"));
}
-void Konsole::initSessionFont(QFont font) {
+void Konsole::initSessionFont(TQFont font) {
te->setVTFont( font );
}
-void Konsole::initSessionKeyTab(const QString &keyTab) {
+void Konsole::initSessionKeyTab(const TQString &keyTab) {
se->setKeymap(keyTab);
updateKeytabMenu();
}
@@ -2269,7 +2269,7 @@ void Konsole::updateFullScreen( bool on )
updateTitle(); // restore caption of window
}
updateRMBMenu();
- te->setFrameStyle( b_framevis && !b_fullscreen ?(QFrame::WinPanel|QFrame::Sunken):QFrame::NoFrame );
+ te->setFrameStyle( b_framevis && !b_fullscreen ?(TQFrame::WinPanel|TQFrame::Sunken):TQFrame::NoFrame );
}
/* --| sessions |------------------------------------------------------------ */
@@ -2285,16 +2285,16 @@ void Konsole::updateFullScreen( bool on )
void Konsole::disableMasterModeConnections()
{
- QPtrListIterator<TESession> from_it(sessions);
+ TQPtrListIterator<TESession> from_it(sessions);
for (; from_it.current(); ++from_it) {
TESession *from = from_it.current();
if (from->isMasterMode()) {
- QPtrListIterator<TESession> to_it(sessions);
+ TQPtrListIterator<TESession> to_it(sessions);
for (; to_it.current(); ++to_it) {
TESession *to = to_it.current();
if (to!=from)
- disconnect(from->widget(),SIGNAL(keyPressedSignal(QKeyEvent*)),
- to->getEmulation(),SLOT(onKeyPress(QKeyEvent*)));
+ disconnect(from->widget(),TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)),
+ to->getEmulation(),TQT_SLOT(onKeyPress(TQKeyEvent*)));
}
}
}
@@ -2302,16 +2302,16 @@ void Konsole::disableMasterModeConnections()
void Konsole::enableMasterModeConnections()
{
- QPtrListIterator<TESession> from_it(sessions);
+ TQPtrListIterator<TESession> from_it(sessions);
for (; from_it.current(); ++from_it) {
TESession *from = from_it.current();
if (from->isMasterMode()) {
- QPtrListIterator<TESession> to_it(sessions);
+ TQPtrListIterator<TESession> to_it(sessions);
for (; to_it.current(); ++to_it) {
TESession *to = to_it.current();
if (to!=from) {
- connect(from->widget(),SIGNAL(keyPressedSignal(QKeyEvent*)),
- to->getEmulation(),SLOT(onKeyPress(QKeyEvent*)));
+ connect(from->widget(),TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)),
+ to->getEmulation(),TQT_SLOT(onKeyPress(TQKeyEvent*)));
}
}
}
@@ -2319,7 +2319,7 @@ void Konsole::enableMasterModeConnections()
}
}
-void Konsole::feedAllSessions(const QString &text)
+void Konsole::feedAllSessions(const TQString &text)
{
if (!te) return;
bool oldMasterMode = se->isMasterMode();
@@ -2329,9 +2329,9 @@ void Konsole::feedAllSessions(const QString &text)
setMasterMode(false);
}
-void Konsole::sendAllSessions(const QString &text)
+void Konsole::sendAllSessions(const TQString &text)
{
- QString newtext=text;
+ TQString newtext=text;
newtext.append("\r");
feedAllSessions(newtext);
}
@@ -2343,9 +2343,9 @@ KURL Konsole::baseURL() const
return url;
}
-void Konsole::enterURL(const QString& URL, const QString&)
+void Konsole::enterURL(const TQString& URL, const TQString&)
{
- QString path, login, host, newtext;
+ TQString path, login, host, newtext;
if (URL.startsWith("file:")) {
KURL uglyurl(URL);
@@ -2358,7 +2358,7 @@ void Konsole::enterURL(const QString& URL, const QString&)
newtext = u.protocol();
bool isSSH = (newtext == "ssh");
if (u.port() && isSSH)
- newtext += " -p " + QString().setNum(u.port());
+ newtext += " -p " + TQString().setNum(u.port());
if (u.hasUser())
newtext += " -l " + u.user();
@@ -2368,7 +2368,7 @@ void Konsole::enterURL(const QString& URL, const QString&)
if (u.hasHost()) {
newtext = newtext + " " + u.host();
if (u.port() && !isSSH)
- newtext += QString(" %1").arg(u.port());
+ newtext += TQString(" %1").arg(u.port());
se->setUserTitle(31,""); // we don't know remote cwd
te->emitText(newtext + "\r");
}
@@ -2406,12 +2406,12 @@ void Konsole::runSession(TESession* s)
// give some time to get through the
// resize events before starting up.
- QTimer::singleShot(100,s,SLOT(run()));
+ TQTimer::singleShot(100,s,TQT_SLOT(run()));
}
void Konsole::addSession(TESession* s)
{
- QString newTitle = s->Title();
+ TQString newTitle = s->Title();
bool nameOk;
int count = 1;
@@ -2440,7 +2440,7 @@ void Konsole::addSession(TESession* s)
s->IconName(),
0,
this,
- SLOT(activateSession()),
+ TQT_SLOT(activateSession()),
m_shortcuts);
ra->setExclusiveGroup("sessions");
ra->setChecked(true);
@@ -2466,12 +2466,12 @@ void Konsole::addSession(TESession* s)
m_removeSessionButton->setEnabled(tabwidget->count()>1);
}
-QString Konsole::currentSession()
+TQString Konsole::currentSession()
{
return se->SessionId();
}
-QString Konsole::sessionId(const int position)
+TQString Konsole::sessionId(const int position)
{
if (position<=0 || position>(int)sessions.count())
return "";
@@ -2486,16 +2486,16 @@ void Konsole::listSessions()
m_sessionList->insertTitle(i18n("Session List"));
m_sessionList->setKeyboardShortcutsEnabled(true);
for (TESession *ses = sessions.first(); ses; ses = sessions.next()) {
- QString title=ses->Title();
+ TQString title=ses->Title();
m_sessionList->insertItem(SmallIcon(ses->IconName()),title.replace('&',"&&"),counter++);
}
m_sessionList->adjustSize();
- m_sessionList->popup(mapToGlobal(QPoint((width()/2)-(m_sessionList->width()/2),(height()/2)-(m_sessionList->height()/2))));
+ m_sessionList->popup(mapToGlobal(TQPoint((width()/2)-(m_sessionList->width()/2),(height()/2)-(m_sessionList->height()/2))));
}
void Konsole::switchToSession()
{
- activateSession( QString( sender()->name() ).right( 2 ).toInt() -1 );
+ activateSession( TQString( sender()->name() ).right( 2 ).toInt() -1 );
}
void Konsole::activateSession(int position)
@@ -2505,13 +2505,13 @@ void Konsole::activateSession(int position)
activateSession( sessions.at(position) );
}
-void Konsole::activateSession(QWidget* w)
+void Konsole::activateSession(TQWidget* w)
{
activateSession(tabwidget->indexOf(w));
w->setFocus();
}
-void Konsole::activateSession(const QString &sessionId)
+void Konsole::activateSession(const TQString &sessionId)
{
TESession* activate=NULL;
@@ -2534,7 +2534,7 @@ void Konsole::activateSession()
{
TESession* s = NULL;
// finds the session based on which button was activated
- QPtrDictIterator<TESession> it( action2session ); // iterator for dict
+ TQPtrDictIterator<TESession> it( action2session ); // iterator for dict
while ( it.current() )
{
KRadioAction *ra = (KRadioAction*)it.currentKey();
@@ -2579,7 +2579,7 @@ void Konsole::activateSession(TESession *s)
}
ra->setChecked(true);
- QTimer::singleShot(1,this,SLOT(allowPrevNext())); // hack, hack, hack
+ TQTimer::singleShot(1,this,TQT_SLOT(allowPrevNext())); // hack, hack, hack
tabwidget->showPage( se->widget() );
te = se->widget();
@@ -2619,7 +2619,7 @@ void Konsole::slotUpdateSessionConfig(TESession *session)
activateSession(se);
}
-void Konsole::slotResizeSession(TESession *session, QSize size)
+void Konsole::slotResizeSession(TESession *session, TQSize size)
{
TESession *oldSession = se;
if (se != session)
@@ -2629,7 +2629,7 @@ void Konsole::slotResizeSession(TESession *session, QSize size)
}
// Called by newSession and DCOP function below
-void Konsole::setSessionEncoding( const QString &encoding, TESession *session )
+void Konsole::setSessionEncoding( const TQString &encoding, TESession *session )
{
if ( encoding.isEmpty() )
return;
@@ -2638,8 +2638,8 @@ void Konsole::setSessionEncoding( const QString &encoding, TESession *session )
session = se;
bool found = false;
- QString enc = KGlobal::charsets()->encodingForName(encoding);
- QTextCodec * qtc = KGlobal::charsets()->codecForName(enc, found);
+ TQString enc = KGlobal::charsets()->encodingForName(encoding);
+ TQTextCodec * qtc = KGlobal::charsets()->codecForName(enc, found);
if ( !found || !qtc )
return;
@@ -2647,13 +2647,13 @@ void Konsole::setSessionEncoding( const QString &encoding, TESession *session )
// it corresponds to.
int i = 0;
bool found_encoding = false;
- QStringList encodingNames = KGlobal::charsets()->descriptiveEncodingNames();
- QStringList::ConstIterator it = encodingNames.begin();
- QString t_encoding = encoding.lower();
+ TQStringList encodingNames = KGlobal::charsets()->descriptiveEncodingNames();
+ TQStringList::ConstIterator it = encodingNames.begin();
+ TQString t_encoding = encoding.lower();
while ( it != encodingNames.end() && !found_encoding )
{
- if ( QString::compare( KGlobal::charsets()->encodingForName(*it),
+ if ( TQString::compare( KGlobal::charsets()->encodingForName(*it),
t_encoding ) == 0 ) {
found_encoding = true;
}
@@ -2676,19 +2676,19 @@ void Konsole::setSessionEncoding( const QString &encoding, TESession *session )
}
// Called via DCOP only
-void Konsole::slotSetSessionEncoding(TESession *session, const QString &encoding)
+void Konsole::slotSetSessionEncoding(TESession *session, const TQString &encoding)
{
setSessionEncoding( encoding, session );
}
-void Konsole::slotGetSessionSchema(TESession *session, QString &schema)
+void Konsole::slotGetSessionSchema(TESession *session, TQString &schema)
{
int no = session->schemaNo();
ColorSchema* s = colors->find( no );
schema = s->relPath();
}
-void Konsole::slotSetSessionSchema(TESession *session, const QString &schema)
+void Konsole::slotSetSessionSchema(TESession *session, const TQString &schema)
{
ColorSchema* s = colors->find( schema );
setSchema(s, session->widget());
@@ -2710,7 +2710,7 @@ KSimpleConfig *Konsole::defaultSession()
return m_defaultSession;
}
-void Konsole::setDefaultSession(const QString &filename)
+void Konsole::setDefaultSession(const TQString &filename)
{
delete m_defaultSession;
m_defaultSession = new KSimpleConfig(locate("appdata", filename), true /* read only */);
@@ -2720,16 +2720,16 @@ void Konsole::setDefaultSession(const QString &filename)
m_defaultSessionFilename=filename;
}
-void Konsole::newSession(const QString &pgm, const QStrList &args, const QString &term, const QString &icon, const QString &title, const QString &cwd)
+void Konsole::newSession(const TQString &pgm, const TQStrList &args, const TQString &term, const TQString &icon, const TQString &title, const TQString &cwd)
{
KSimpleConfig *co = defaultSession();
newSession(co, pgm, args, term, icon, title, cwd);
}
-QString Konsole::newSession()
+TQString Konsole::newSession()
{
KSimpleConfig *co = defaultSession();
- return newSession(co, QString::null, QStrList());
+ return newSession(co, TQString::null, TQStrList());
}
void Konsole::newSession(int i)
@@ -2778,7 +2778,7 @@ void Konsole::newSessionTabbar(int i)
}
}
-QString Konsole::newSession(const QString &type)
+TQString Konsole::newSession(const TQString &type)
{
KSimpleConfig *co;
if (type.isEmpty())
@@ -2788,18 +2788,18 @@ QString Konsole::newSession(const QString &type)
return newSession(co);
}
-QString Konsole::newSession(KSimpleConfig *co, QString program, const QStrList &args,
- const QString &_term,const QString &_icon,
- const QString &_title, const QString &_cwd)
+TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrList &args,
+ const TQString &_term,const TQString &_icon,
+ const TQString &_title, const TQString &_cwd)
{
- QString emu = "xterm";
- QString icon = "konsole";
- QString key;
- QString sch = s_kconfigSchema;
- QString txt;
- QString cwd;
- QFont font = defaultFont;
- QStrList cmdArgs;
+ TQString emu = "xterm";
+ TQString icon = "konsole";
+ TQString key;
+ TQString sch = s_kconfigSchema;
+ TQString txt;
+ TQString cwd;
+ TQFont font = defaultFont;
+ TQStrList cmdArgs;
if (co) {
co->setDesktopGroup();
@@ -2833,14 +2833,14 @@ QString Konsole::newSession(KSimpleConfig *co, QString program, const QStrList &
cmdArgs = args;
}
else {
- program = QFile::decodeName(konsole_shell(cmdArgs));
+ program = TQFile::decodeName(konsole_shell(cmdArgs));
if (co) {
co->setDesktopGroup();
- QString cmd = co->readPathEntry("Exec");
+ TQString cmd = co->readPathEntry("Exec");
if (!cmd.isEmpty()) {
cmdArgs.append("-c");
- cmdArgs.append(QFile::encodeName(cmd));
+ cmdArgs.append(TQFile::encodeName(cmd));
}
}
}
@@ -2856,8 +2856,8 @@ QString Konsole::newSession(KSimpleConfig *co, QString program, const QStrList &
TEWidget* te_old = te;
te=new TEWidget(tabwidget);
- connect( te, SIGNAL(configureRequest(TEWidget*, int, int, int)),
- this, SLOT(configureRequest(TEWidget*,int,int,int)) );
+ connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)),
+ this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) );
if (te_old) {
initTEWidget(te, te_old);
}
@@ -2870,44 +2870,44 @@ QString Konsole::newSession(KSimpleConfig *co, QString program, const QStrList &
te->setMinimumSize(150,70);
- QString sessionId="session-"+QString::number(++sessionIdCounter);
+ TQString sessionId="session-"+TQString::number(++sessionIdCounter);
TESession* s = new TESession(te, emu,winId(),sessionId,cwd);
- s->setProgram(QFile::encodeName(program),cmdArgs);
+ s->setProgram(TQFile::encodeName(program),cmdArgs);
s->setMonitorSilenceSeconds(monitorSilenceSeconds);
s->enableFullScripting(b_fullScripting);
// If you add any new signal-slot connection below, think about doing it in konsolePart too
- connect( s,SIGNAL(done(TESession*)),
- this,SLOT(doneSession(TESession*)) );
- connect( s, SIGNAL( updateTitle(TESession*) ),
- this, SLOT( updateTitle(TESession*) ) );
- connect( s, SIGNAL( notifySessionState(TESession*, int) ),
- this, SLOT( notifySessionState(TESession*, int)) );
- connect( s, SIGNAL(disableMasterModeConnections()),
- this, SLOT(disableMasterModeConnections()) );
- connect( s, SIGNAL(enableMasterModeConnections()),
- this, SLOT(enableMasterModeConnections()) );
- connect( s, SIGNAL(renameSession(TESession*,const QString&)),
- this, SLOT(slotRenameSession(TESession*, const QString&)) );
- connect( s->getEmulation(), SIGNAL(changeColumns(int)),
- this, SLOT(changeColumns(int)) );
- connect( s->getEmulation(), SIGNAL(changeColLin(int,int)),
- this, SLOT(changeColLin(int,int)) );
- connect( s->getEmulation(), SIGNAL(ImageSizeChanged(int,int)),
- this, SLOT(notifySize(int,int)));
- connect( s, SIGNAL(zmodemDetected(TESession*)),
- this, SLOT(slotZModemDetected(TESession*)));
- connect( s, SIGNAL(updateSessionConfig(TESession*)),
- this, SLOT(slotUpdateSessionConfig(TESession*)));
- connect( s, SIGNAL(resizeSession(TESession*, QSize)),
- this, SLOT(slotResizeSession(TESession*, QSize)));
- connect( s, SIGNAL(setSessionEncoding(TESession*, const QString &)),
- this, SLOT(slotSetSessionEncoding(TESession*, const QString &)));
- connect( s, SIGNAL(getSessionSchema(TESession*, QString &)),
- this, SLOT(slotGetSessionSchema(TESession*, QString &)));
- connect( s, SIGNAL(setSessionSchema(TESession*, const QString &)),
- this, SLOT(slotSetSessionSchema(TESession*, const QString &)));
- connect( s, SIGNAL(changeTabTextColor(TESession*, int)),
- this,SLOT(changeTabTextColor(TESession*, int)) );
+ connect( s,TQT_SIGNAL(done(TESession*)),
+ this,TQT_SLOT(doneSession(TESession*)) );
+ connect( s, TQT_SIGNAL( updateTitle(TESession*) ),
+ this, TQT_SLOT( updateTitle(TESession*) ) );
+ connect( s, TQT_SIGNAL( notifySessionState(TESession*, int) ),
+ this, TQT_SLOT( notifySessionState(TESession*, int)) );
+ connect( s, TQT_SIGNAL(disableMasterModeConnections()),
+ this, TQT_SLOT(disableMasterModeConnections()) );
+ connect( s, TQT_SIGNAL(enableMasterModeConnections()),
+ this, TQT_SLOT(enableMasterModeConnections()) );
+ connect( s, TQT_SIGNAL(renameSession(TESession*,const TQString&)),
+ this, TQT_SLOT(slotRenameSession(TESession*, const TQString&)) );
+ connect( s->getEmulation(), TQT_SIGNAL(changeColumns(int)),
+ this, TQT_SLOT(changeColumns(int)) );
+ connect( s->getEmulation(), TQT_SIGNAL(changeColLin(int,int)),
+ this, TQT_SLOT(changeColLin(int,int)) );
+ connect( s->getEmulation(), TQT_SIGNAL(ImageSizeChanged(int,int)),
+ this, TQT_SLOT(notifySize(int,int)));
+ connect( s, TQT_SIGNAL(zmodemDetected(TESession*)),
+ this, TQT_SLOT(slotZModemDetected(TESession*)));
+ connect( s, TQT_SIGNAL(updateSessionConfig(TESession*)),
+ this, TQT_SLOT(slotUpdateSessionConfig(TESession*)));
+ connect( s, TQT_SIGNAL(resizeSession(TESession*, TQSize)),
+ this, TQT_SLOT(slotResizeSession(TESession*, TQSize)));
+ connect( s, TQT_SIGNAL(setSessionEncoding(TESession*, const TQString &)),
+ this, TQT_SLOT(slotSetSessionEncoding(TESession*, const TQString &)));
+ connect( s, TQT_SIGNAL(getSessionSchema(TESession*, TQString &)),
+ this, TQT_SLOT(slotGetSessionSchema(TESession*, TQString &)));
+ connect( s, TQT_SIGNAL(setSessionSchema(TESession*, const TQString &)),
+ this, TQT_SLOT(slotSetSessionSchema(TESession*, const TQString &)));
+ connect( s, TQT_SIGNAL(changeTabTextColor(TESession*, int)),
+ this,TQT_SLOT(changeTabTextColor(TESession*, int)) );
s->widget()->setVTFont(defaultFont);// Hack to set font again after newSession
s->setSchemaNo(schmno);
@@ -2942,16 +2942,16 @@ QString Konsole::newSession(KSimpleConfig *co, QString program, const QStrList &
/*
* Starts a new session based on URL.
*/
-void Konsole::newSession(const QString& sURL, const QString& title)
+void Konsole::newSession(const TQString& sURL, const TQString& title)
{
- QStrList args;
- QString protocol, path, login, host;
+ TQStrList args;
+ TQString protocol, path, login, host;
KURL url = KURL(sURL);
if ((url.protocol() == "file") && (url.hasPath())) {
KSimpleConfig *co = defaultSession();
path = url.path();
- newSession(co, QString::null, QStrList(), QString::null, QString::null,
+ newSession(co, TQString::null, TQStrList(), TQString::null, TQString::null,
title.isEmpty() ? path : title, path);
return;
}
@@ -2962,7 +2962,7 @@ void Konsole::newSession(const QString& sURL, const QString& title)
host = url.host();
if (url.port() && isSSH) {
args.append("-p");
- args.append(QCString().setNum(url.port()));
+ args.append(TQCString().setNum(url.port()));
}
if (url.hasUser()) {
login = url.user();
@@ -2971,10 +2971,10 @@ void Konsole::newSession(const QString& sURL, const QString& title)
}
args.append(host.latin1());
if (url.port() && !isSSH)
- args.append(QCString().setNum(url.port()));
+ args.append(TQCString().setNum(url.port()));
newSession( NULL, protocol.latin1() /* protocol */, args /* arguments */,
- QString::null /*term*/, QString::null /*icon*/,
- title.isEmpty() ? path : title /*title*/, QString::null /*cwd*/);
+ TQString::null /*term*/, TQString::null /*icon*/,
+ title.isEmpty() ? path : title /*title*/, TQString::null /*cwd*/);
return;
}
/*
@@ -3050,7 +3050,7 @@ void Konsole::doneSession(TESession* s)
// Since the timer approach only works at good weather,
// the whole construction is not suited to what it
// should do. Affected is the TEEmulation::setConnect.
- QTimer::singleShot(1,this,SLOT(activateSession()));
+ TQTimer::singleShot(1,this,TQT_SLOT(activateSession()));
}
else
close();
@@ -3122,12 +3122,12 @@ void Konsole::moveSessionLeft()
ra->unplug(m_view);
ra->plug(m_view,(m_view->count()-sessions.count()+1)+position-1);
- QColor oldcolor = tabwidget->tabColor(se->widget());
+ TQColor oldcolor = tabwidget->tabColor(se->widget());
tabwidget->blockSignals(true);
tabwidget->removePage(se->widget());
tabwidget->blockSignals(false);
- QString title = se->Title();
+ TQString title = se->Title();
createSessionTab(se->widget(), iconSetForSession(se),
title.replace('&', "&&"), position-1);
tabwidget->showPage(se->widget());
@@ -3155,12 +3155,12 @@ void Konsole::moveSessionRight()
ra->unplug(m_view);
ra->plug(m_view,(m_view->count()-sessions.count()+1)+position+1);
- QColor oldcolor = tabwidget->tabColor(se->widget());
+ TQColor oldcolor = tabwidget->tabColor(se->widget());
tabwidget->blockSignals(true);
tabwidget->removePage(se->widget());
tabwidget->blockSignals(false);
- QString title = se->Title();
+ TQString title = se->Title();
createSessionTab(se->widget(), iconSetForSession(se),
title.replace('&', "&&"), position+1);
tabwidget->showPage(se->widget());
@@ -3197,7 +3197,7 @@ void Konsole::initMasterMode(bool state)
slotToggleMasterMode();
}
-void Konsole::initTabColor(QColor color)
+void Konsole::initTabColor(TQColor color)
{
if ( color.isValid() )
tabwidget->setTabColor( se->widget(), color );
@@ -3244,7 +3244,7 @@ void Konsole::setMasterMode(bool _state, TESession* _se)
void Konsole::notifySessionState(TESession* session, int state)
{
- QString state_iconname;
+ TQString state_iconname;
switch(state)
{
case NOTIFYNORMAL : if(session->isMasterMode())
@@ -3263,9 +3263,9 @@ void Konsole::notifySessionState(TESession* session, int state)
&& session->testAndSetStateIconName(state_iconname)
&& m_tabViewMode != ShowTextOnly) {
- QPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(state_iconname,
+ TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(state_iconname,
KIcon::Small, 0, KIcon::DefaultState, 0L, true);
- QPixmap active = KGlobal::instance()->iconLoader()->loadIcon(state_iconname,
+ TQPixmap active = KGlobal::instance()->iconLoader()->loadIcon(state_iconname,
KIcon::Small, 0, KIcon::ActiveState, 0L, true);
// make sure they are not larger than 16x16
@@ -3274,9 +3274,9 @@ void Konsole::notifySessionState(TESession* session, int state)
if (active.width() > 16 || active.height() > 16)
active.convertFromImage(active.convertToImage().smoothScale(16,16));
- QIconSet iconset;
- iconset.setPixmap(normal, QIconSet::Small, QIconSet::Normal);
- iconset.setPixmap(active, QIconSet::Small, QIconSet::Active);
+ TQIconSet iconset;
+ iconset.setPixmap(normal, TQIconSet::Small, TQIconSet::Normal);
+ iconset.setPixmap(active, TQIconSet::Small, TQIconSet::Active);
tabwidget->setTabIconSet(session->widget(), iconset);
}
@@ -3308,7 +3308,7 @@ void Konsole::buildSessionMenus()
m_quit->plug(m_session);
}
-static void insertItemSorted(KPopupMenu *menu, const QIconSet &iconSet, const QString &txt, int id)
+static void insertItemSorted(KPopupMenu *menu, const TQIconSet &iconSet, const TQString &txt, int id)
{
const int defaultId = SESSION_NEW_SHELL_ID; // The id of the 'new' item.
int index = menu->indexOf(defaultId);
@@ -3332,7 +3332,7 @@ static void insertItemSorted(KPopupMenu *menu, const QIconSet &iconSet, const QS
menu->insertItem(iconSet, txt, id, index);
}
-void Konsole::addSessionCommand(const QString &path)
+void Konsole::addSessionCommand(const TQString &path)
{
KSimpleConfig* co;
if (path.isEmpty())
@@ -3340,18 +3340,18 @@ void Konsole::addSessionCommand(const QString &path)
else
co = new KSimpleConfig(path,true);
co->setDesktopGroup();
- QString typ = co->readEntry("Type");
- QString txt = co->readEntry("Name");
+ TQString typ = co->readEntry("Type");
+ TQString txt = co->readEntry("Name");
// try to locate the binary
- QString exec= co->readPathEntry("Exec");
+ TQString exec= co->readPathEntry("Exec");
if (exec.startsWith("sudo su -c \'")) {
exec = exec.mid(12,exec.length()-13);
}
exec = KRun::binaryName(exec, false);
exec = KShell::tildeExpand(exec);
- QString pexec = KGlobal::dirs()->findExe(exec);
+ TQString pexec = KGlobal::dirs()->findExe(exec);
if (typ.isEmpty() || txt.isEmpty() || typ != "KonsoleApplication"
|| ( !exec.isEmpty() && pexec.isEmpty() ) )
@@ -3368,11 +3368,11 @@ void Konsole::addSessionCommand(const QString &path)
if ( ( b_sessionShortcutsMapped == true ) || ( cmd_serial == SESSION_NEW_SHELL_ID ) ) return;
// Add an empty shortcut for each Session.
- QString comment = co->readEntry("Comment");
+ TQString comment = co->readEntry("Comment");
if (comment.isEmpty())
comment=txt.prepend(i18n("New "));
- QString name = comment;
+ TQString name = comment;
name.prepend("SSC_"); // Allows easy searching for Session ShortCuts
name.replace(" ", "_");
sl_sessionShortCuts << name;
@@ -3384,7 +3384,7 @@ void Konsole::addSessionCommand(const QString &path)
} else {
sessionAction = new KAction( comment, 0, this, 0, m_shortcuts, name.latin1() );
}
- connect( sessionAction, SIGNAL( activated() ), sessionNumberMapper, SLOT( map() ) );
+ connect( sessionAction, TQT_SIGNAL( activated() ), sessionNumberMapper, TQT_SLOT( map() ) );
sessionNumberMapper->setMapping( sessionAction, cmd_serial );
}
@@ -3399,11 +3399,11 @@ void Konsole::loadSessionCommands()
if (!kapp->authorize("shell_access"))
return;
- addSessionCommand(QString::null);
+ addSessionCommand(TQString::null);
- QStringList lst = KGlobal::dirs()->findAllResources("appdata", "*.desktop", false, true);
+ TQStringList lst = KGlobal::dirs()->findAllResources("appdata", "*.desktop", false, true);
- for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
+ for(TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
if (!(*it).endsWith("/shell.desktop"))
addSessionCommand(*it);
@@ -3421,12 +3421,12 @@ void Konsole::createSessionMenus()
}
KSimpleConfig *cfg = no2command[SESSION_NEW_SHELL_ID];
- QString txt = cfg->readEntry("Name");
- QString icon = cfg->readEntry("Icon", "konsole");
+ TQString txt = cfg->readEntry("Name");
+ TQString icon = cfg->readEntry("Icon", "konsole");
insertItemSorted(m_tabbarSessionsCommands, SmallIconSet(icon),
txt.replace('&',"&&"), SESSION_NEW_SHELL_ID );
- QString comment = cfg->readEntry("Comment");
+ TQString comment = cfg->readEntry("Comment");
if (comment.isEmpty())
comment=txt.prepend(i18n("New "));
insertItemSorted(m_session, SmallIconSet(icon),
@@ -3438,16 +3438,16 @@ void Konsole::createSessionMenus()
m_session->insertSeparator();
m_tabbarSessionsCommands->insertSeparator();
- QIntDictIterator<KSimpleConfig> it( no2command );
+ TQIntDictIterator<KSimpleConfig> it( no2command );
for ( ; it.current(); ++it ) {
if ( it.currentKey() == SESSION_NEW_SHELL_ID )
continue;
- QString txt = (*it).readEntry("Name");
- QString icon = (*it).readEntry("Icon", "konsole");
+ TQString txt = (*it).readEntry("Name");
+ TQString icon = (*it).readEntry("Icon", "konsole");
insertItemSorted(m_tabbarSessionsCommands, SmallIconSet(icon),
txt.replace('&',"&&"), it.currentKey() );
- QString comment = (*it).readEntry("Comment");
+ TQString comment = (*it).readEntry("Comment");
if (comment.isEmpty())
comment=txt.prepend(i18n("New "));
insertItemSorted(m_session, SmallIconSet(icon),
@@ -3465,18 +3465,18 @@ void Konsole::createSessionMenus()
}
}
-void Konsole::addScreenSession(const QString &path, const QString &socket)
+void Konsole::addScreenSession(const TQString &path, const TQString &socket)
{
KTempFile *tmpFile = new KTempFile();
tmpFile->setAutoDelete(true);
KSimpleConfig *co = new KSimpleConfig(tmpFile->name());
co->setDesktopGroup();
co->writeEntry("Name", socket);
- QString txt = i18n("Screen is a program controlling screens!", "Screen at %1").arg(socket);
+ TQString txt = i18n("Screen is a program controlling screens!", "Screen at %1").arg(socket);
co->writeEntry("Comment", txt);
- co->writePathEntry("Exec", QString::fromLatin1("SCREENDIR=%1 screen -r %2")
+ co->writePathEntry("Exec", TQString::fromLatin1("SCREENDIR=%1 screen -r %2")
.arg(path).arg(socket));
- QString icon = "konsole";
+ TQString icon = "konsole";
cmd_serial++;
m_session->insertItem( SmallIconSet( icon ), txt, cmd_serial, cmd_serial - 1 );
m_tabbarSessionsCommands->insertItem( SmallIconSet( icon ), txt, cmd_serial );
@@ -3487,22 +3487,22 @@ void Konsole::loadScreenSessions()
{
if (!kapp->authorize("shell_access"))
return;
- QCString screenDir = getenv("SCREENDIR");
+ TQCString screenDir = getenv("SCREENDIR");
if (screenDir.isEmpty())
- screenDir = QFile::encodeName(QDir::homeDirPath()) + "/.screen/";
+ screenDir = TQFile::encodeName(TQDir::homeDirPath()) + "/.screen/";
// Some distributions add a shell function called screen that sets
// $SCREENDIR to ~/tmp. In this case the variable won't be set here.
- if (!QFile::exists(screenDir))
- screenDir = QFile::encodeName(QDir::homeDirPath()) + "/tmp/";
- QStringList sessions;
- // Can't use QDir as it doesn't support FIFOs :(
+ if (!TQFile::exists(screenDir))
+ screenDir = TQFile::encodeName(TQDir::homeDirPath()) + "/tmp/";
+ TQStringList sessions;
+ // Can't use TQDir as it doesn't support FIFOs :(
DIR *dir = opendir(screenDir);
if (dir)
{
struct dirent *entry;
while ((entry = readdir(dir)))
{
- QCString path = screenDir + "/" + entry->d_name;
+ TQCString path = screenDir + "/" + entry->d_name;
struct stat st;
if (stat(path, &st) != 0)
continue;
@@ -3512,13 +3512,13 @@ void Konsole::loadScreenSessions()
(fd = open(path, O_WRONLY | O_NONBLOCK)) != -1)
{
::close(fd);
- sessions.append(QFile::decodeName(entry->d_name));
+ sessions.append(TQFile::decodeName(entry->d_name));
}
}
closedir(dir);
}
resetScreenSessions();
- for (QStringList::ConstIterator it = sessions.begin(); it != sessions.end(); ++it)
+ for (TQStringList::ConstIterator it = sessions.begin(); it != sessions.end(); ++it)
addScreenSession(screenDir, *it);
}
@@ -3558,7 +3558,7 @@ void Konsole::setSchema(int numb, TEWidget* tewidget)
if (s) setSchema(s, tewidget);
}
-void Konsole::setSchema(const QString & path)
+void Konsole::setSchema(const TQString & path)
{
ColorSchema* s = colors->find(path);
if (!s)
@@ -3605,10 +3605,10 @@ void Konsole::setSchema(ColorSchema* s, TEWidget* tewidget)
if (!argb_visual) {
if (!rootxpms[tewidget])
rootxpms.insert( tewidget, new KRootPixmap(tewidget) );
- rootxpms[tewidget]->setFadeEffect(s->tr_x(), QColor(s->tr_r(), s->tr_g(), s->tr_b()));
+ rootxpms[tewidget]->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b()));
} else {
tewidget->setBlendColor(qRgba(s->tr_r(), s->tr_g(), s->tr_b(), int(s->tr_x() * 255)));
- tewidget->setErasePixmap( QPixmap() ); // make sure any background pixmap is unset
+ tewidget->setErasePixmap( TQPixmap() ); // make sure any background pixmap is unset
}
} else {
if (rootxpms[tewidget]) {
@@ -3620,7 +3620,7 @@ void Konsole::setSchema(ColorSchema* s, TEWidget* tewidget)
}
tewidget->setColorTable(s->table());
- QPtrListIterator<TESession> ses_it(sessions);
+ TQPtrListIterator<TESession> ses_it(sessions);
for (; ses_it.current(); ++ses_it)
if (tewidget==ses_it.current()->widget()) {
ses_it.current()->setSchemaNo(s->numb());
@@ -3649,30 +3649,30 @@ void Konsole::detachSession(TESession* _se) {
// Disable master mode when detaching master
setMasterMode(false);
} else {
- QPtrListIterator<TESession> from_it(sessions);
+ TQPtrListIterator<TESession> from_it(sessions);
for(; from_it.current(); ++from_it) {
TESession *from = from_it.current();
if(from->isMasterMode())
- disconnect(from->widget(), SIGNAL(keyPressedSignal(QKeyEvent*)),
- _se->getEmulation(), SLOT(onKeyPress(QKeyEvent*)));
+ disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)),
+ _se->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*)));
}
}
- QColor se_tabtextcolor = tabwidget->tabColor( _se->widget() );
+ TQColor se_tabtextcolor = tabwidget->tabColor( _se->widget() );
- disconnect( _se,SIGNAL(done(TESession*)),
- this,SLOT(doneSession(TESession*)) );
+ disconnect( _se,TQT_SIGNAL(done(TESession*)),
+ this,TQT_SLOT(doneSession(TESession*)) );
- disconnect( _se->getEmulation(),SIGNAL(ImageSizeChanged(int,int)), this,SLOT(notifySize(int,int)));
- disconnect( _se->getEmulation(),SIGNAL(changeColLin(int, int)), this,SLOT(changeColLin(int,int)) );
- disconnect( _se->getEmulation(),SIGNAL(changeColumns(int)), this,SLOT(changeColumns(int)) );
- disconnect( _se, SIGNAL(changeTabTextColor(TESession*, int)), this, SLOT(changeTabTextColor(TESession*, int)) );
+ disconnect( _se->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int)));
+ disconnect( _se->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) );
+ disconnect( _se->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) );
+ disconnect( _se, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) );
- disconnect( _se,SIGNAL(updateTitle(TESession*)), this,SLOT(updateTitle(TESession*)) );
- disconnect( _se,SIGNAL(notifySessionState(TESession*,int)), this,SLOT(notifySessionState(TESession*,int)) );
- disconnect( _se,SIGNAL(disableMasterModeConnections()), this,SLOT(disableMasterModeConnections()) );
- disconnect( _se,SIGNAL(enableMasterModeConnections()), this,SLOT(enableMasterModeConnections()) );
- disconnect( _se,SIGNAL(renameSession(TESession*,const QString&)), this,SLOT(slotRenameSession(TESession*,const QString&)) );
+ disconnect( _se,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) );
+ disconnect( _se,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) );
+ disconnect( _se,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) );
+ disconnect( _se,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) );
+ disconnect( _se,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) );
// TODO: "type" isn't passed properly
Konsole* konsole = new Konsole(name(), b_histEnabled, !menubar->isHidden(), n_tabbar != TabNone, b_framevis,
@@ -3696,7 +3696,7 @@ void Konsole::detachSession(TESession* _se) {
else
se = sessions.at(sessionIndex ? sessionIndex - 1 : 0);
session2action.find(se)->setChecked(true);
- QTimer::singleShot(1,this,SLOT(activateSession()));
+ TQTimer::singleShot(1,this,TQT_SLOT(activateSession()));
}
if (sessions.count()==1)
@@ -3724,8 +3724,8 @@ void Konsole::attachSession(TESession* session)
te=new TEWidget(tabwidget);
- connect( te, SIGNAL(configureRequest(TEWidget*, int, int, int)),
- this, SLOT(configureRequest(TEWidget*,int,int,int)) );
+ connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)),
+ this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) );
te->resize(se_widget->size());
te->setSize(se_widget->Columns(), se_widget->Lines());
@@ -3739,9 +3739,9 @@ void Konsole::attachSession(TESession* session)
enableMasterModeConnections();
}
- QString title=session->Title();
+ TQString title=session->Title();
KRadioAction *ra = new KRadioAction(title.replace('&',"&&"), session->IconName(),
- 0, this, SLOT(activateSession()), m_shortcuts);
+ 0, this, TQT_SLOT(activateSession()), m_shortcuts);
ra->setExclusiveGroup("sessions");
ra->setChecked(true);
@@ -3755,25 +3755,25 @@ void Konsole::attachSession(TESession* session)
if (m_menuCreated)
ra->plug(m_view);
- connect( session,SIGNAL(done(TESession*)),
- this,SLOT(doneSession(TESession*)) );
+ connect( session,TQT_SIGNAL(done(TESession*)),
+ this,TQT_SLOT(doneSession(TESession*)) );
- connect( session,SIGNAL(updateTitle(TESession*)), this,SLOT(updateTitle(TESession*)) );
- connect( session,SIGNAL(notifySessionState(TESession*,int)), this,SLOT(notifySessionState(TESession*,int)) );
+ connect( session,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) );
+ connect( session,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) );
- connect( session,SIGNAL(disableMasterModeConnections()), this,SLOT(disableMasterModeConnections()) );
- connect( session,SIGNAL(enableMasterModeConnections()), this,SLOT(enableMasterModeConnections()) );
- connect( session,SIGNAL(renameSession(TESession*,const QString&)), this,SLOT(slotRenameSession(TESession*,const QString&)) );
- connect( session->getEmulation(),SIGNAL(ImageSizeChanged(int,int)), this,SLOT(notifySize(int,int)));
- connect( session->getEmulation(),SIGNAL(changeColumns(int)), this,SLOT(changeColumns(int)) );
- connect( session->getEmulation(),SIGNAL(changeColLin(int, int)), this,SLOT(changeColLin(int,int)) );
+ connect( session,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) );
+ connect( session,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) );
+ connect( session,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) );
+ connect( session->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int)));
+ connect( session->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) );
+ connect( session->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) );
- connect( session, SIGNAL(changeTabTextColor(TESession*, int)), this, SLOT(changeTabTextColor(TESession*, int)) );
+ connect( session, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) );
activateSession(session);
}
-void Konsole::setSessionTitle( QString& title, TESession* ses )
+void Konsole::setSessionTitle( TQString& title, TESession* ses )
{
if ( !ses )
ses = se;
@@ -3782,7 +3782,7 @@ void Konsole::setSessionTitle( QString& title, TESession* ses )
}
void Konsole::renameSession(TESession* ses) {
- QString title = ses->Title();
+ TQString title = ses->Title();
bool ok;
title = KInputDialog::getText( i18n( "Rename Session" ),
@@ -3798,10 +3798,10 @@ void Konsole::slotRenameSession() {
renameSession(se);
}
-void Konsole::slotRenameSession(TESession* ses, const QString &name)
+void Konsole::slotRenameSession(TESession* ses, const TQString &name)
{
KRadioAction *ra = session2action.find(ses);
- QString title=name;
+ TQString title=name;
title=title.replace('&',"&&");
ra->setText(title);
ra->setIcon( ses->IconName() ); // I don't know why it is needed here
@@ -3820,28 +3820,28 @@ void Konsole::slotClearAllSessionHistories() {
HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType,
unsigned int histSize,
- QWidget *parent)
+ TQWidget *parent)
: KDialogBase(Plain, i18n("History Configuration"),
Help | Default | Ok | Cancel, Ok,
parent, 0, true, true)
{
- QFrame *mainFrame = plainPage();
+ TQFrame *mainFrame = plainPage();
- QHBoxLayout *hb = new QHBoxLayout(mainFrame);
+ TQHBoxLayout *hb = new TQHBoxLayout(mainFrame);
- m_btnEnable = new QCheckBox(i18n("&Enable"), mainFrame);
- connect(m_btnEnable, SIGNAL(toggled(bool)), SLOT(slotHistEnable(bool)));
+ m_btnEnable = new TQCheckBox(i18n("&Enable"), mainFrame);
+ connect(m_btnEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotHistEnable(bool)));
- m_label = new QLabel(i18n("&Number of lines: "), mainFrame);
+ m_label = new TQLabel(i18n("&Number of lines: "), mainFrame);
- m_size = new QSpinBox(0, 10 * 1000 * 1000, 100, mainFrame);
+ m_size = new TQSpinBox(0, 10 * 1000 * 1000, 100, mainFrame);
m_size->setValue(histSize);
m_size->setSpecialValueText(i18n("Unlimited (number of lines)", "Unlimited"));
m_label->setBuddy( m_size );
- m_setUnlimited = new QPushButton(i18n("&Set Unlimited"), mainFrame);
- connect( m_setUnlimited,SIGNAL(clicked()), this,SLOT(slotSetUnlimited()) );
+ m_setUnlimited = new TQPushButton(i18n("&Set Unlimited"), mainFrame);
+ connect( m_setUnlimited,TQT_SIGNAL(clicked()), this,TQT_SLOT(slotSetUnlimited()) );
hb->addWidget(m_btnEnable);
hb->addSpacing(10);
@@ -3935,11 +3935,11 @@ void Konsole::slotFindHistory()
{
if( !m_finddialog ) {
m_finddialog = new KonsoleFind( this, "konsolefind", false);
- connect(m_finddialog,SIGNAL(search()),this,SLOT(slotFind()));
- connect(m_finddialog,SIGNAL(done()),this,SLOT(slotFindDone()));
+ connect(m_finddialog,TQT_SIGNAL(search()),this,TQT_SLOT(slotFind()));
+ connect(m_finddialog,TQT_SIGNAL(done()),this,TQT_SLOT(slotFindDone()));
}
- QString string;
+ TQString string;
string = m_finddialog->getText();
m_finddialog->setText(string.isEmpty() ? m_find_pattern : string);
@@ -3957,7 +3957,7 @@ void Konsole::slotFindNext()
return;
}
- QString string;
+ TQString string;
string = m_finddialog->getText();
m_finddialog->setText(string.isEmpty() ? m_find_pattern : string);
@@ -3971,7 +3971,7 @@ void Konsole::slotFindPrevious()
return;
}
- QString string;
+ TQString string;
string = m_finddialog->getText();
m_finddialog->setText(string.isEmpty() ? m_find_pattern : string);
@@ -4031,7 +4031,7 @@ void Konsole::slotSaveHistory()
{
// FIXME - mostLocalURL can't handle non-existing files yet, so this
// code doesn't work.
- KURL s_url = KFileDialog::getSaveURL(QString::null, QString::null, 0L, i18n("Save History"));
+ KURL s_url = KFileDialog::getSaveURL(TQString::null, TQString::null, 0L, i18n("Save History"));
if( s_url.isEmpty())
return;
KURL url = KIO::NetAccess::mostLocalURL( s_url, 0 );
@@ -4042,21 +4042,21 @@ void Konsole::slotSaveHistory()
}
int query = KMessageBox::Continue;
- QFileInfo info;
- QString name( url.path() );
+ TQFileInfo info;
+ TQString name( url.path() );
info.setFile( name );
if( info.exists() )
query = KMessageBox::warningContinueCancel( this,
i18n( "A file with this name already exists.\nDo you want to overwrite it?" ), i18n("File Exists"), i18n("Overwrite") );
if (query==KMessageBox::Continue) {
- QFile file(url.path());
+ TQFile file(url.path());
if(!file.open(IO_WriteOnly)) {
KMessageBox::sorry(this, i18n("Unable to write to file."));
return;
}
- QTextStream textStream(&file);
+ TQTextStream textStream(&file);
assert( se && se->getEmulation() );
se->getEmulation()->streamHistory( &textStream );
@@ -4076,7 +4076,7 @@ void Konsole::slotZModemUpload()
i18n("<p>The current session already has a ZModem file transfer in progress."));
return;
}
- QString zmodem = KGlobal::dirs()->findExe("sz");
+ TQString zmodem = KGlobal::dirs()->findExe("sz");
if (zmodem.isEmpty())
zmodem = KGlobal::dirs()->findExe("lsz");
if (zmodem.isEmpty())
@@ -4088,12 +4088,12 @@ void Konsole::slotZModemUpload()
return;
}
- QStringList files = KFileDialog::getOpenFileNames(QString::null, QString::null, this,
+ TQStringList files = KFileDialog::getOpenFileNames(TQString::null, TQString::null, this,
i18n("Select Files to Upload"));
if (files.isEmpty())
return;
- se->startZModem(zmodem, QString::null, files);
+ se->startZModem(zmodem, TQString::null, files);
}
void Konsole::slotZModemDetected(TESession *session)
@@ -4103,7 +4103,7 @@ void Konsole::slotZModemDetected(TESession *session)
if(se != session)
activateSession(session);
- QString zmodem = KGlobal::dirs()->findExe("rz");
+ TQString zmodem = KGlobal::dirs()->findExe("rz");
if (zmodem.isEmpty())
zmodem = KGlobal::dirs()->findExe("lrz");
if (zmodem.isEmpty())
@@ -4129,7 +4129,7 @@ void Konsole::slotZModemDetected(TESession *session)
else
{
const KURL &url = dlg.selectedURL();
- session->startZModem(zmodem, url.path(), QStringList());
+ session->startZModem(zmodem, url.path(), TQStringList());
}
}
@@ -4141,7 +4141,7 @@ void Konsole::slotPrint()
{
printer.setFullPage(false);
printer.setCreator("Konsole");
- QPainter paint;
+ TQPainter paint;
paint.begin(&printer);
se->print(paint, printer.option("app-konsole-printfriendly") == "true",
printer.option("app-konsole-printexact") == "true");
@@ -4152,7 +4152,7 @@ void Konsole::slotPrint()
void Konsole::toggleBidi()
{
b_bidiEnabled=!b_bidiEnabled;
- QPtrList<TEWidget> tes = activeTEs();
+ TQPtrList<TEWidget> tes = activeTEs();
for (TEWidget *_te = tes.first(); _te; _te = tes.next()) {
_te->setBidiEnabled(b_bidiEnabled);
_te->repaint();
@@ -4163,25 +4163,25 @@ void Konsole::toggleBidi()
SizeDialog::SizeDialog(const unsigned int columns,
const unsigned int lines,
- QWidget *parent)
+ TQWidget *parent)
: KDialogBase(Plain, i18n("Size Configuration"),
Help | Default | Ok | Cancel, Ok,
parent)
{
- QFrame *mainFrame = plainPage();
+ TQFrame *mainFrame = plainPage();
- QHBoxLayout *hb = new QHBoxLayout(mainFrame);
+ TQHBoxLayout *hb = new TQHBoxLayout(mainFrame);
- m_columns = new QSpinBox(20,1000,1,mainFrame);
+ m_columns = new TQSpinBox(20,1000,1,mainFrame);
m_columns->setValue(columns);
- m_lines = new QSpinBox(4,1000,1,mainFrame);
+ m_lines = new TQSpinBox(4,1000,1,mainFrame);
m_lines->setValue(lines);
- hb->addWidget(new QLabel(i18n("Number of columns:"), mainFrame));
+ hb->addWidget(new TQLabel(i18n("Number of columns:"), mainFrame));
hb->addWidget(m_columns);
hb->addSpacing(10);
- hb->addWidget(new QLabel(i18n("Number of lines:"), mainFrame));
+ hb->addWidget(new TQLabel(i18n("Number of lines:"), mainFrame));
hb->addWidget(m_lines);
setHelp("configure-size");
@@ -4205,16 +4205,16 @@ unsigned int SizeDialog::lines() const
//////////////////////////////////////////////////////////////////////
-KonsoleFind::KonsoleFind( QWidget *parent, const char *name, bool /*modal*/ )
+KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ )
: KEdFind( parent, name, false ), m_editorDialog(0), m_editRegExp(0)
{
- QHBox* row = new QHBox( (QWidget*)group );
- m_asRegExp = new QCheckBox( i18n("As &regular expression"), row, "asRegexp" );
+ TQHBox* row = new TQHBox( (TQWidget*)group );
+ m_asRegExp = new TQCheckBox( i18n("As &regular expression"), row, "asRegexp" );
if (!KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()) {
- m_editRegExp = new QPushButton( i18n("&Edit..."), row, "editRegExp" );
- connect( m_asRegExp, SIGNAL( toggled(bool) ), m_editRegExp, SLOT( setEnabled(bool) ) );
- connect( m_editRegExp, SIGNAL( clicked() ), this, SLOT( slotEditRegExp() ) );
+ m_editRegExp = new TQPushButton( i18n("&Edit..."), row, "editRegExp" );
+ connect( m_asRegExp, TQT_SIGNAL( toggled(bool) ), m_editRegExp, TQT_SLOT( setEnabled(bool) ) );
+ connect( m_editRegExp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditRegExp() ) );
m_editRegExp->setEnabled( false );
}
}
@@ -4222,7 +4222,7 @@ KonsoleFind::KonsoleFind( QWidget *parent, const char *name, bool /*modal*/ )
void KonsoleFind::slotEditRegExp()
{
if ( m_editorDialog == 0 )
- m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<QDialog>( "KRegExpEditor/KRegExpEditor", QString::null, this );
+ m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString::null, this );
assert( m_editorDialog );
@@ -4231,7 +4231,7 @@ void KonsoleFind::slotEditRegExp()
iface->setRegExp( getText() );
bool ret = m_editorDialog->exec();
- if ( ret == QDialog::Accepted)
+ if ( ret == TQDialog::Accepted)
setText( iface->regExp() );
}
@@ -4246,7 +4246,7 @@ bool KonsoleFind::reg_exp() const
void Konsole::slotFontChanged()
{
TEWidget *oldTe = te;
- QPtrList<TEWidget> tes = activeTEs();
+ TQPtrList<TEWidget> tes = activeTEs();
for (TEWidget *_te = tes.first(); _te; _te = tes.next()) {
te = _te;
// setFont(n_font);
@@ -4257,7 +4257,7 @@ void Konsole::slotFontChanged()
void Konsole::biggerFont(void) {
if ( !se ) return;
- QFont f = te->getVTFont();
+ TQFont f = te->getVTFont();
f.setPointSize( f.pointSize() + 1 );
te->setVTFont( f );
activateSession();
@@ -4266,30 +4266,30 @@ void Konsole::biggerFont(void) {
void Konsole::smallerFont(void) {
if ( !se ) return;
- QFont f = te->getVTFont();
+ TQFont f = te->getVTFont();
if ( f.pointSize() < 6 ) return; // A minimum size
f.setPointSize( f.pointSize() - 1 );
te->setVTFont( f );
activateSession();
}
-bool Konsole::processDynamic(const QCString &fun, const QByteArray &data, QCString& replyType, QByteArray &replyData)
+bool Konsole::processDynamic(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData)
{
if (b_fullScripting)
{
- if (fun == "feedAllSessions(QString)")
+ if (fun == "feedAllSessions(TQString)")
{
- QString arg0;
- QDataStream arg( data, IO_ReadOnly );
+ TQString arg0;
+ TQDataStream arg( data, IO_ReadOnly );
arg >> arg0;
feedAllSessions(arg0);
replyType = "void";
return true;
}
- else if (fun == "sendAllSessions(QString)")
+ else if (fun == "sendAllSessions(TQString)")
{
- QString arg0;
- QDataStream arg( data, IO_ReadOnly );
+ TQString arg0;
+ TQDataStream arg( data, IO_ReadOnly );
arg >> arg0;
sendAllSessions(arg0);
replyType = "void";
@@ -4304,8 +4304,8 @@ QCStringList Konsole::functionsDynamic()
QCStringList funcs = KonsoleIface::functionsDynamic();
if (b_fullScripting)
{
- funcs << "void feedAllSessions(QString text)";
- funcs << "void sendAllSessions(QString text)";
+ funcs << "void feedAllSessions(TQString text)";
+ funcs << "void sendAllSessions(TQString text)";
}
return funcs;
}
@@ -4327,9 +4327,9 @@ void Konsole::enableFixedSize(bool b)
}
}
-QPtrList<TEWidget> Konsole::activeTEs()
+TQPtrList<TEWidget> Konsole::activeTEs()
{
- QPtrList<TEWidget> ret;
+ TQPtrList<TEWidget> ret;
if (sessions.count()>0)
for (TESession *_se = sessions.first(); _se; _se = sessions.next())
ret.append(_se->widget());
diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h
index df9157f7b..df9cd714e 100644
--- a/konsole/konsole/konsole.h
+++ b/konsole/konsole/konsole.h
@@ -33,10 +33,10 @@
#include <kwinmodule.h>
-#include <qstrlist.h>
-#include <qintdict.h>
-#include <qptrdict.h>
-#include <qsignalmapper.h>
+#include <tqstrlist.h>
+#include <tqintdict.h>
+#include <tqptrdict.h>
+#include <tqsignalmapper.h>
#include "TEPty.h"
#include "TEWidget.h"
@@ -63,7 +63,7 @@ class KTabWidget;
class QToolButton;
// Defined in main.C
-const char *konsole_shell(QStrList &args);
+const char *konsole_shell(TQStrList &args);
class Konsole : public KMainWindow, virtual public KonsoleIface
{
@@ -74,47 +74,47 @@ public:
Konsole(const char * name, int histon, bool menubaron, bool tabbaron,
bool frameon, bool scrollbaron,
- QCString type = 0, bool b_inRestore = false, const int wanted_tabbar = 0,
- const QString &workdir=QString::null);
+ TQCString type = 0, bool b_inRestore = false, const int wanted_tabbar = 0,
+ const TQString &workdir=TQString::null);
~Konsole();
void setColLin(int columns, int lines);
void setAutoClose(bool on);
void initFullScreen();
void initSessionFont(int fontNo);
- void initSessionFont(QFont f);
- void initSessionKeyTab(const QString &keyTab);
+ void initSessionFont(TQFont f);
+ void initSessionKeyTab(const TQString &keyTab);
void initMonitorActivity(bool on);
void initMonitorSilence(bool on);
void initMasterMode(bool on);
- void initTabColor(QColor color);
+ void initTabColor(TQColor color);
void initHistory(int lines, bool enable);
- void newSession(const QString &program, const QStrList &args, const QString &term, const QString &icon, const QString &title, const QString &cwd);
- void setSchema(const QString & path);
+ void newSession(const TQString &program, const TQStrList &args, const TQString &term, const TQString &icon, const TQString &title, const TQString &cwd);
+ void setSchema(const TQString & path);
void setEncoding(int);
- void setSessionTitle(QString&, TESession* = 0);
- void setSessionEncoding(const QString&, TESession* = 0);
+ void setSessionTitle(TQString&, TESession* = 0);
+ void setSessionEncoding(const TQString&, TESession* = 0);
void enableFullScripting(bool b);
void enableFixedSize(bool b);
- void setDefaultSession(const QString &filename);
+ void setDefaultSession(const TQString &filename);
void showTipOnStart();
// Additional functions for DCOP
int sessionCount() { return sessions.count(); }
- QString currentSession();
- QString newSession(const QString &type);
- QString sessionId(const int position);
+ TQString currentSession();
+ TQString newSession(const TQString &type);
+ TQString sessionId(const int position);
- void activateSession(const QString& sessionId);
- void feedAllSessions(const QString &text);
- void sendAllSessions(const QString &text);
+ void activateSession(const TQString& sessionId);
+ void feedAllSessions(const TQString &text);
+ void sendAllSessions(const TQString &text);
KURL baseURL() const;
- virtual bool processDynamic(const QCString &fun, const QByteArray &data, QCString& replyType, QByteArray &replyData);
+ virtual bool processDynamic(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData);
virtual QCStringList functionsDynamic();
void callReadPropertiesInternal(KConfig *config, int number) { readPropertiesInternal(config,number); }
@@ -124,15 +124,15 @@ public:
public slots:
void activateSession(int position);
- void activateSession(QWidget*);
+ void activateSession(TQWidget*);
void slotUpdateSessionConfig(TESession *session);
- void slotResizeSession(TESession*, QSize);
- void slotSetSessionEncoding(TESession *session, const QString &encoding);
- void slotGetSessionSchema(TESession *session, QString &schema);
- void slotSetSessionSchema(TESession *session, const QString &schema);
+ void slotResizeSession(TESession*, TQSize);
+ void slotSetSessionEncoding(TESession *session, const TQString &encoding);
+ void slotGetSessionSchema(TESession *session, TQString &schema);
+ void slotSetSessionSchema(TESession *session, const TQString &schema);
void makeGUI();
- QString newSession();
+ TQString newSession();
protected:
@@ -184,7 +184,7 @@ private slots:
void slotSelectTabbar();
void slotToggleMenubar();
void slotRenameSession();
- void slotRenameSession(TESession* ses, const QString &name);
+ void slotRenameSession(TESession* ses, const TQString &name);
void slotToggleMonitor();
void slotToggleMasterMode();
void slotClearAllSessionHistories();
@@ -209,8 +209,8 @@ private slots:
void disableMasterModeConnections();
void enableMasterModeConnections();
- void enterURL( const QString&, const QString& );
- void newSession( const QString&, const QString& );
+ void enterURL( const TQString&, const TQString& );
+ void newSession( const TQString&, const TQString& );
void slotFind();
void slotFindDone();
@@ -237,14 +237,14 @@ private slots:
void toggleBidi();
- void slotTabContextMenu(QWidget*, const QPoint &);
+ void slotTabContextMenu(TQWidget*, const TQPoint &);
void slotTabDetachSession();
void slotTabRenameSession();
void slotTabSelectColor();
void slotTabCloseSession();
void slotTabToggleMonitor();
void slotTabToggleMasterMode();
- void slotTabbarContextMenu(const QPoint &);
+ void slotTabbarContextMenu(const TQPoint &);
void slotTabSetViewOptions(int);
void slotTabbarToggleDynamicHide();
void slotToggleAutoResizeTabs();
@@ -253,10 +253,10 @@ private slots:
void slotSetEncoding();
private:
KSimpleConfig *defaultSession();
- QString newSession(KSimpleConfig *co, QString pgm = QString::null, const QStrList &args = QStrList(),
- const QString &_term = QString::null, const QString &_icon = QString::null,
- const QString &_title = QString::null, const QString &_cwd = QString::null);
- void readProperties(KConfig *config, const QString &schema, bool globalConfigOnly);
+ TQString newSession(KSimpleConfig *co, TQString pgm = TQString::null, const TQStrList &args = TQStrList(),
+ const TQString &_term = TQString::null, const TQString &_icon = TQString::null,
+ const TQString &_title = TQString::null, const TQString &_cwd = TQString::null);
+ void readProperties(KConfig *config, const TQString &schema, bool globalConfigOnly);
void applySettingsToGUI();
void makeTabWidget();
void makeBasicGUI();
@@ -270,31 +270,31 @@ private:
void setMasterMode(bool _state, TESession* _se=0);
void buildSessionMenus();
- void addSessionCommand(const QString & path);
+ void addSessionCommand(const TQString & path);
void loadSessionCommands();
void createSessionMenus();
- void addScreenSession(const QString & path, const QString & socket);
+ void addScreenSession(const TQString & path, const TQString & socket);
void resetScreenSessions();
void checkBitmapFonts();
void initTEWidget(TEWidget* new_te, TEWidget* default_te);
- void createSessionTab(TEWidget *widget, const QIconSet& iconSet,
- const QString &text, int index = -1);
- QIconSet iconSetForSession(TESession *session) const;
+ void createSessionTab(TEWidget *widget, const TQIconSet& iconSet,
+ const TQString &text, int index = -1);
+ TQIconSet iconSetForSession(TESession *session) const;
- bool eventFilter( QObject *o, QEvent *e );
+ bool eventFilter( TQObject *o, TQEvent *e );
- QPtrList<TEWidget> activeTEs();
+ TQPtrList<TEWidget> activeTEs();
- QPtrDict<TESession> action2session;
- QPtrDict<KRadioAction> session2action;
- QPtrList<TESession> sessions;
+ TQPtrDict<TESession> action2session;
+ TQPtrDict<KRadioAction> session2action;
+ TQPtrList<TESession> sessions;
- QIntDict<KSimpleConfig> no2command; //QT4 - convert to QList
+ TQIntDict<KSimpleConfig> no2command; //QT4 - convert to QList
KSimpleConfig* m_defaultSession;
- QString m_defaultSessionFilename;
+ TQString m_defaultSessionFilename;
KTabWidget* tabwidget;
TEWidget* te; // the visible TEWidget, either sole one or one of many
@@ -302,9 +302,9 @@ private:
TESession* se_previous;
TESession* m_initialSession;
ColorSchemaList* colors;
- QString s_encodingName;
+ TQString s_encodingName;
- QPtrDict<KRootPixmap> rootxpms;
+ TQPtrDict<KRootPixmap> rootxpms;
KWinModule* kWinModule;
KMenuBar* menubar;
@@ -371,7 +371,7 @@ private:
KonsoleFind* m_finddialog;
bool m_find_first;
bool m_find_found;
- QString m_find_pattern;
+ TQString m_find_pattern;
int cmd_serial;
int cmd_first_screen;
@@ -386,17 +386,17 @@ private:
int sessionIdCounter;
int monitorSilenceSeconds;
- QString s_schema;
- QString s_kconfigSchema;
- QString s_word_seps; // characters that are considered part of a word
- QString pmPath; // pixmap path
- QString dropText;
- QFont defaultFont;
- QSize defaultSize;
+ TQString s_schema;
+ TQString s_kconfigSchema;
+ TQString s_word_seps; // characters that are considered part of a word
+ TQString pmPath; // pixmap path
+ TQString dropText;
+ TQFont defaultFont;
+ TQSize defaultSize;
- QRect _saveGeometry;
+ TQRect _saveGeometry;
- QTimer m_closeTimeout;
+ TQTimer m_closeTimeout;
TabViewModes m_tabViewMode;
bool b_dynamicTabHide;
@@ -426,15 +426,15 @@ private:
TESession* m_contextMenuSession;
- QToolButton* m_newSessionButton;
- QToolButton* m_removeSessionButton;
- QPoint m_newSessionButtonMousePressPos;
+ TQToolButton* m_newSessionButton;
+ TQToolButton* m_removeSessionButton;
+ TQPoint m_newSessionButtonMousePressPos;
- QSignalMapper* sessionNumberMapper;
- QStringList sl_sessionShortCuts;
- QString s_workDir;
+ TQSignalMapper* sessionNumberMapper;
+ TQStringList sl_sessionShortCuts;
+ TQString s_workDir;
- QColor m_tabColor;
+ TQColor m_tabColor;
};
class QSpinBox;
@@ -445,7 +445,7 @@ class HistoryTypeDialog : public KDialogBase
public:
HistoryTypeDialog(const HistoryType& histType,
unsigned int histSize,
- QWidget *parent);
+ TQWidget *parent);
public slots:
@@ -457,10 +457,10 @@ public slots:
bool isOn() const;
protected:
- QLabel* m_label;
- QSpinBox* m_size;
- QCheckBox* m_btnEnable;
- QPushButton* m_setUnlimited;
+ TQLabel* m_label;
+ TQSpinBox* m_size;
+ TQCheckBox* m_btnEnable;
+ TQPushButton* m_setUnlimited;
};
class SizeDialog : public KDialogBase
@@ -469,7 +469,7 @@ class SizeDialog : public KDialogBase
public:
SizeDialog(unsigned int const columns,
unsigned int const lines,
- QWidget *parent);
+ TQWidget *parent);
public slots:
void slotDefault();
@@ -478,24 +478,24 @@ public slots:
unsigned int lines() const;
protected:
- QSpinBox* m_columns;
- QSpinBox* m_lines;
+ TQSpinBox* m_columns;
+ TQSpinBox* m_lines;
};
class KonsoleFind : public KEdFind
{
Q_OBJECT
public:
- KonsoleFind( QWidget *parent = 0, const char *name=0, bool modal=true );
+ KonsoleFind( TQWidget *parent = 0, const char *name=0, bool modal=true );
bool reg_exp() const;
private slots:
void slotEditRegExp();
private:
- QCheckBox* m_asRegExp;
- QDialog* m_editorDialog;
- QPushButton* m_editRegExp;
+ TQCheckBox* m_asRegExp;
+ TQDialog* m_editorDialog;
+ TQPushButton* m_editRegExp;
};
#endif
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index 68ca36024..620a0ebdb 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -23,9 +23,9 @@
#include <assert.h>
-#include <qfile.h>
-#include <qlayout.h>
-#include <qwmatrix.h>
+#include <tqfile.h>
+#include <tqlayout.h>
+#include <tqwmatrix.h>
#include <kaboutdata.h>
#include <kcharsets.h>
@@ -38,12 +38,12 @@
#include <kmessagebox.h>
#include <krun.h>
#include <kstdaction.h>
-#include <qlabel.h>
+#include <tqlabel.h>
#include <kprocctrl.h>
-#include <qcheckbox.h>
-#include <qspinbox.h>
-#include <qpushbutton.h>
+#include <tqcheckbox.h>
+#include <tqspinbox.h>
+#include <tqpushbutton.h>
#include <kpopupmenu.h>
#include <krootpixmap.h>
#include <kconfig.h>
@@ -76,9 +76,9 @@ konsoleFactory::~konsoleFactory()
s_aboutData = 0;
}
-KParts::Part *konsoleFactory::createPartObject(QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name, const char *classname,
- const QStringList&)
+KParts::Part *konsoleFactory::createPartObject(TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name, const char *classname,
+ const TQStringList&)
{
// kdDebug(1211) << "konsoleFactory::createPart parentWidget=" << parentWidget << " parent=" << parent << endl;
KParts::Part *obj = new konsolePart(parentWidget, widgetName, parent, name, classname);
@@ -97,7 +97,7 @@ KInstance *konsoleFactory::instance()
#define DEFAULT_HISTORY_SIZE 1000
-konsolePart::konsolePart(QWidget *_parentWidget, const char *widgetName, QObject *parent, const char *name, const char *classname)
+konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname)
: KParts::ReadOnlyPart(parent, name)
,te(0)
,se(0)
@@ -131,7 +131,7 @@ konsolePart::konsolePart(QWidget *_parentWidget, const char *widgetName, QObject
m_streamEnabled = ( classname && strcmp( classname, "TerminalEmulator" ) == 0 );
- QStrList eargs;
+ TQStrList eargs;
const char* shell = getenv("SHELL");
@@ -142,8 +142,8 @@ konsolePart::konsolePart(QWidget *_parentWidget, const char *widgetName, QObject
setWidget(te);
te->setFocus();
- connect( te,SIGNAL(configureRequest(TEWidget*,int,int,int)),
- this,SLOT(configureRequest(TEWidget*,int,int,int)) );
+ connect( te,TQT_SIGNAL(configureRequest(TEWidget*,int,int,int)),
+ this,TQT_SLOT(configureRequest(TEWidget*,int,int,int)) );
colors = new ColorSchemaList();
colors->checkSchemas();
@@ -180,30 +180,30 @@ konsolePart::konsolePart(QWidget *_parentWidget, const char *widgetName, QObject
{
m_keytab->clear();
- QStringList kt_titles;
- typedef QMap<QString,KeyTrans*> QStringKeyTransMap;
+ TQStringList kt_titles;
+ typedef TQMap<TQString,KeyTrans*> QStringKeyTransMap;
QStringKeyTransMap kt_map;
for (int i = 0; i < KeyTrans::count(); i++)
{
KeyTrans* ktr = KeyTrans::find(i);
assert( ktr );
- QString title=ktr->hdr().lower();
+ TQString title=ktr->hdr().lower();
kt_titles << title;
kt_map[title] = ktr;
}
kt_titles.sort();
- for ( QStringList::Iterator it = kt_titles.begin(); it != kt_titles.end(); ++it ) {
+ for ( TQStringList::Iterator it = kt_titles.begin(); it != kt_titles.end(); ++it ) {
KeyTrans* ktr = kt_map[*it];
assert( ktr );
- QString title=ktr->hdr();
+ TQString title=ktr->hdr();
m_keytab->insertItem(title.replace('&',"&&"),ktr->numb());
}
}
applySettingsToGUI();
- QTimer::singleShot( 0, this, SLOT( autoShowShell() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( autoShowShell() ) );
}
void konsolePart::autoShowShell()
@@ -229,10 +229,10 @@ void konsolePart::doneSession(TESession*)
if (se && b_autoDestroy)
{
// kdDebug(1211) << "doneSession - disconnecting done" << endl;
- disconnect( se,SIGNAL(done(TESession*)),
- this,SLOT(doneSession(TESession*)) );
+ disconnect( se,TQT_SIGNAL(done(TESession*)),
+ this,TQT_SLOT(doneSession(TESession*)) );
se->setConnect(false);
- //QTimer::singleShot(100,se,SLOT(terminate()));
+ //TQTimer::singleShot(100,se,TQT_SLOT(terminate()));
// kdDebug(1211) << "se->terminate()" << endl;
se->terminate();
}
@@ -241,7 +241,7 @@ void konsolePart::doneSession(TESession*)
void konsolePart::sessionDestroyed()
{
// kdDebug(1211) << "sessionDestroyed()" << endl;
- disconnect( se, SIGNAL( destroyed() ), this, SLOT( sessionDestroyed() ) );
+ disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) );
se = 0;
if (b_autoDestroy)
delete this;
@@ -250,7 +250,7 @@ void konsolePart::sessionDestroyed()
void konsolePart::configureRequest(TEWidget*_te,int,int x,int y)
{
if (m_popupMenu)
- m_popupMenu->popup(_te->mapToGlobal(QPoint(x,y)));
+ m_popupMenu->popup(_te->mapToGlobal(TQPoint(x,y)));
}
konsolePart::~konsolePart()
@@ -264,7 +264,7 @@ konsolePart::~konsolePart()
while(se && KProcessController::theKProcessController->waitForProcessExit(1))
;
- disconnect( se, SIGNAL( destroyed() ), this, SLOT( sessionDestroyed() ) );
+ disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) );
// kdDebug(1211) << "Deleting se session" << endl;
delete se;
se=0;
@@ -292,8 +292,8 @@ bool konsolePart::openURL( const KURL & url )
if ( url.isLocalFile() ) {
struct stat buff;
- stat( QFile::encodeName( url.path() ), &buff );
- QString text = ( S_ISDIR( buff.st_mode ) ? url.path() : url.directory() );
+ stat( TQFile::encodeName( url.path() ), &buff );
+ TQString text = ( S_ISDIR( buff.st_mode ) ? url.path() : url.directory() );
showShellInDir( text );
}
@@ -301,7 +301,7 @@ bool konsolePart::openURL( const KURL & url )
return true;
}
-void konsolePart::emitOpenURLRequest(const QString &cwd)
+void konsolePart::emitOpenURLRequest(const TQString &cwd)
{
KURL url;
url.setPath(cwd);
@@ -332,7 +332,7 @@ void konsolePart::makeGUI()
m_signals->insertItem( i18n( "&Kill Task" ) + " (KILL)", SIGKILL);
m_signals->insertItem( i18n( "User Signal &1") + " (USR1)", SIGUSR1);
m_signals->insertItem( i18n( "User Signal &2") + " (USR2)", SIGUSR2);
- connect(m_signals, SIGNAL(activated(int)), SLOT(sendSignal(int)));
+ connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int)));
}
// Settings Menu ----------------------------------------------------------------
@@ -342,9 +342,9 @@ void konsolePart::makeGUI()
// Scrollbar
selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, this,
- SLOT(slotSelectScrollbar()), settingsActions);
+ TQT_SLOT(slotSelectScrollbar()), settingsActions);
- QStringList scrollitems;
+ TQStringList scrollitems;
scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right");
selectScrollbar->setItems(scrollitems);
selectScrollbar->plug(m_options);
@@ -352,9 +352,9 @@ void konsolePart::makeGUI()
// Select Bell
m_options->insertSeparator();
selectBell = new KSelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this,
- SLOT(slotSelectBell()), settingsActions, "bell");
+ TQT_SLOT(slotSelectBell()), settingsActions, "bell");
- QStringList bellitems;
+ TQStringList bellitems;
bellitems << i18n("System &Bell")
<< i18n("System &Notification")
<< i18n("&Visible Bell")
@@ -363,14 +363,14 @@ void konsolePart::makeGUI()
selectBell->plug(m_options);
m_fontsizes = new KActionMenu( i18n( "Font" ), SmallIconSet( "text" ), settingsActions, 0L );
- m_fontsizes->insert( new KAction( i18n( "&Enlarge Font" ), SmallIconSet( "viewmag+" ), 0, this, SLOT( biggerFont() ), settingsActions, "enlarge_font" ) );
- m_fontsizes->insert( new KAction( i18n( "&Shrink Font" ), SmallIconSet( "viewmag-" ), 0, this, SLOT( smallerFont() ), settingsActions, "shrink_font" ) );
- m_fontsizes->insert( new KAction( i18n( "Se&lect..." ), SmallIconSet( "font" ), 0, this, SLOT( slotSelectFont() ), settingsActions, "select_font" ) );
+ m_fontsizes->insert( new KAction( i18n( "&Enlarge Font" ), SmallIconSet( "viewmag+" ), 0, this, TQT_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) );
+ m_fontsizes->insert( new KAction( i18n( "&Shrink Font" ), SmallIconSet( "viewmag-" ), 0, this, TQT_SLOT( smallerFont() ), settingsActions, "shrink_font" ) );
+ m_fontsizes->insert( new KAction( i18n( "Se&lect..." ), SmallIconSet( "font" ), 0, this, TQT_SLOT( slotSelectFont() ), settingsActions, "select_font" ) );
m_fontsizes->plug(m_options);
// encoding menu, start with default checked !
- selectSetEncoding = new KSelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, SLOT(slotSetEncoding()), settingsActions, "set_encoding" );
- QStringList list = KGlobal::charsets()->descriptiveEncodingNames();
+ selectSetEncoding = new KSelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQT_SLOT(slotSetEncoding()), settingsActions, "set_encoding" );
+ TQStringList list = KGlobal::charsets()->descriptiveEncodingNames();
list.prepend( i18n( "Default" ) );
selectSetEncoding->setItems(list);
selectSetEncoding->setCurrentItem (0);
@@ -381,7 +381,7 @@ void konsolePart::makeGUI()
{
m_keytab = new KPopupMenu((KMainWindow*)parentWidget);
m_keytab->setCheckable(true);
- connect(m_keytab, SIGNAL(activated(int)), SLOT(keytab_menu_activated(int)));
+ connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int)));
m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab );
}
@@ -390,23 +390,23 @@ void konsolePart::makeGUI()
{
m_schema = new KPopupMenu((KMainWindow*)parentWidget);
m_schema->setCheckable(true);
- connect(m_schema, SIGNAL(activated(int)), SLOT(schema_menu_activated(int)));
- connect(m_schema, SIGNAL(aboutToShow()), SLOT(schema_menu_check()));
+ connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int)));
+ connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check()));
m_options->insertItem( SmallIconSet( "colorize" ), i18n( "Sch&ema" ), m_schema);
}
KAction *historyType = new KAction(i18n("&History..."), "history", 0, this,
- SLOT(slotHistoryType()), settingsActions, "history");
+ TQT_SLOT(slotHistoryType()), settingsActions, "history");
historyType->plug(m_options);
m_options->insertSeparator();
// Select line spacing
selectLineSpacing = new KSelectAction(i18n("Li&ne Spacing"),
SmallIconSet("leftjust"), 0, this,
- SLOT(slotSelectLineSpacing()), settingsActions );
+ TQT_SLOT(slotSelectLineSpacing()), settingsActions );
- QStringList lineSpacingList;
+ TQStringList lineSpacingList;
lineSpacingList
<< i18n("&0")
<< i18n("&1")
@@ -422,30 +422,30 @@ void konsolePart::makeGUI()
// Blinking Cursor
blinkingCursor = new KToggleAction (i18n("Blinking &Cursor"),
- 0, this,SLOT(slotBlinkingCursor()), settingsActions);
+ 0, this,TQT_SLOT(slotBlinkingCursor()), settingsActions);
blinkingCursor->plug(m_options);
// Frame on/off
showFrame = new KToggleAction(i18n("Show Fr&ame"), 0,
- this, SLOT(slotToggleFrame()), settingsActions);
+ this, TQT_SLOT(slotToggleFrame()), settingsActions);
showFrame->setCheckedState(i18n("Hide Fr&ame"));
showFrame->plug(m_options);
// Word Connectors
KAction *WordSeps = new KAction(i18n("Wor&d Connectors..."), 0, this,
- SLOT(slotWordSeps()), settingsActions);
+ TQT_SLOT(slotWordSeps()), settingsActions);
WordSeps->plug(m_options);
// Use Konsole's Settings
m_options->insertSeparator();
m_useKonsoleSettings = new KToggleAction( i18n("&Use Konsole's Settings"),
- 0, this, SLOT(slotUseKonsoleSettings()), 0, "use_konsole_settings" );
+ 0, this, TQT_SLOT(slotUseKonsoleSettings()), 0, "use_konsole_settings" );
m_useKonsoleSettings->plug(m_options);
// Save Settings
m_options->insertSeparator();
KAction *saveSettings = new KAction(i18n("&Save as Default"), "filesave", 0, this,
- SLOT(saveProperties()), actions, "save_default");
+ TQT_SLOT(saveProperties()), actions, "save_default");
saveSettings->plug(m_options);
if (KGlobalSettings::insertTearOffHandle())
m_options->insertTearOffHandle();
@@ -454,15 +454,15 @@ void konsolePart::makeGUI()
// Popup Menu -------------------------------------------------------------------
m_popupMenu = new KPopupMenu((KMainWindow*)parentWidget);
KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, te,
- SLOT(setSelectionEnd()), actions, "selection_end");
+ TQT_SLOT(setSelectionEnd()), actions, "selection_end");
selectionEnd->plug(m_popupMenu);
KAction *copyClipboard = new KAction(i18n("&Copy"), "editcopy", 0,
- te, SLOT(copyClipboard()), actions, "edit_copy");
+ te, TQT_SLOT(copyClipboard()), actions, "edit_copy");
copyClipboard->plug(m_popupMenu);
KAction *pasteClipboard = new KAction(i18n("&Paste"), "editpaste", 0,
- te, SLOT(pasteClipboard()), actions, "edit_paste");
+ te, TQT_SLOT(pasteClipboard()), actions, "edit_paste");
pasteClipboard->plug(m_popupMenu);
if (m_signals)
@@ -478,7 +478,7 @@ void konsolePart::makeGUI()
}
KAction *closeSession = new KAction(i18n("&Close Terminal Emulator"), "fileclose", 0, this,
- SLOT(closeCurrentSession()), actions, "close_session");
+ TQT_SLOT(closeCurrentSession()), actions, "close_session");
closeSession->plug(m_popupMenu);
if (KGlobalSettings::insertTearOffHandle())
m_popupMenu->insertTearOffHandle();
@@ -569,10 +569,10 @@ void konsolePart::readProperties()
n_encoding = config->readNumEntry("encoding",0);
- QFont tmpFont = KGlobalSettings::fixedFont();
+ TQFont tmpFont = KGlobalSettings::fixedFont();
defaultFont = config->readFontEntry("defaultfont", &tmpFont);
- QString schema = config->readEntry("Schema");
+ TQString schema = config->readEntry("Schema");
s_kconfigSchema=config->readEntry("schema");
ColorSchema* sch = colors->find(schema.isEmpty() ? s_kconfigSchema : schema);
@@ -588,7 +588,7 @@ void konsolePart::readProperties()
if (sch->useTransparency()) {
if (!rootxpm)
rootxpm = new KRootPixmap(te);
- rootxpm->setFadeEffect(sch->tr_x(), QColor(sch->tr_r(), sch->tr_g(), sch->tr_b()));
+ rootxpm->setFadeEffect(sch->tr_x(), TQColor(sch->tr_r(), sch->tr_g(), sch->tr_b()));
rootxpm->start();
rootxpm->repaint(true);
}
@@ -603,7 +603,7 @@ void konsolePart::readProperties()
te->setBellMode(n_bell);
te->setBlinkingCursor(config->readBoolEntry("BlinkingCursor",false));
- te->setFrameStyle( b_framevis?(QFrame::WinPanel|QFrame::Sunken):QFrame::NoFrame );
+ te->setFrameStyle( b_framevis?(TQFrame::WinPanel|TQFrame::Sunken):TQFrame::NoFrame );
te->setLineSpacing( config->readUnsignedNumEntry( "LineSpacing", 0 ) );
te->setScrollbarLocation(n_scroll);
te->setWordCharacters(s_word_seps);
@@ -656,7 +656,7 @@ void konsolePart::closeCurrentSession()
void konsolePart::slotToggleFrame()
{
b_framevis = showFrame->isChecked();
- te->setFrameStyle( b_framevis?(QFrame::WinPanel|QFrame::Sunken):QFrame::NoFrame);
+ te->setFrameStyle( b_framevis?(TQFrame::WinPanel|TQFrame::Sunken):TQFrame::NoFrame);
}
void konsolePart::slotSelectScrollbar()
@@ -669,8 +669,8 @@ void konsolePart::slotSelectScrollbar()
void konsolePart::slotSelectFont() {
if ( !se ) return;
- QFont font = se->widget()->getVTFont();
- if ( KFontDialog::getFont( font, true ) != QDialog::Accepted )
+ TQFont font = se->widget()->getVTFont();
+ if ( KFontDialog::getFont( font, true ) != TQDialog::Accepted )
return;
se->widget()->setVTFont( font );
@@ -679,7 +679,7 @@ void konsolePart::slotSelectFont() {
void konsolePart::biggerFont(void) {
if ( !se ) return;
- QFont f = te->getVTFont();
+ TQFont f = te->getVTFont();
f.setPointSize( f.pointSize() + 1 );
te->setVTFont( f );
}
@@ -687,7 +687,7 @@ void konsolePart::biggerFont(void) {
void konsolePart::smallerFont(void) {
if ( !se ) return;
- QFont f = te->getVTFont();
+ TQFont f = te->getVTFont();
if ( f.pointSize() < 6 ) return; // A minimum size
f.setPointSize( f.pointSize() - 1 );
te->setVTFont( f );
@@ -732,7 +732,7 @@ void konsolePart::updateSchemaMenu()
m_schema->clear();
for (int i = 0; i < (int) colors->count(); i++) {
ColorSchema* s = (ColorSchema*)colors->at(i);
- QString title=s->title();
+ TQString title=s->title();
m_schema->insertItem(title.replace('&',"&&"),s->numb(),0);
}
@@ -776,7 +776,7 @@ void konsolePart::setSchema(ColorSchema* s)
if (s->useTransparency()) {
if (!rootxpm)
rootxpm = new KRootPixmap(te);
- rootxpm->setFadeEffect(s->tr_x(), QColor(s->tr_r(), s->tr_g(), s->tr_b()));
+ rootxpm->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b()));
rootxpm->start();
rootxpm->repaint(true);
}
@@ -804,7 +804,7 @@ void konsolePart::notifySize(int /* columns */, int /* lines */)
void konsolePart::pixmap_menu_activated(int item)
{
if (item <= 1) pmPath = "";
- QPixmap pm(pmPath);
+ TQPixmap pm(pmPath);
if (pm.isNull()) {
pmPath = "";
item = 1;
@@ -819,7 +819,7 @@ void konsolePart::pixmap_menu_activated(int item)
te->setBackgroundPixmap(pm);
break;
case 3: // center
- { QPixmap bgPixmap;
+ { TQPixmap bgPixmap;
bgPixmap.resize(te->size());
bgPixmap.fill(te->getDefaultBackColor());
bitBlt( &bgPixmap, ( te->size().width() - pm.width() ) / 2,
@@ -834,7 +834,7 @@ void konsolePart::pixmap_menu_activated(int item)
{
float sx = (float)te->size().width() / pm.width();
float sy = (float)te->size().height() / pm.height();
- QWMatrix matrix;
+ TQWMatrix matrix;
matrix.scale( sx, sy );
te->setBackgroundPixmap(pm.xForm( matrix ));
}
@@ -879,12 +879,12 @@ void konsolePart::slotSetEncoding()
if (!se) return;
bool found;
- QString enc = KGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
- QTextCodec * qtc = KGlobal::charsets()->codecForName(enc, found);
+ TQString enc = KGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
+ TQTextCodec * qtc = KGlobal::charsets()->codecForName(enc, found);
if(!found)
{
kdDebug() << "Codec " << selectSetEncoding->currentText() << " not found!" << endl;
- qtc = QTextCodec::codecForLocale();
+ qtc = TQTextCodec::codecForLocale();
}
n_encoding = selectSetEncoding->currentItem();
@@ -916,7 +916,7 @@ void konsolePart::slotUseKonsoleSettings()
void konsolePart::slotWordSeps() {
bool ok;
- QString seps = KInputDialog::getText( i18n( "Word Connectors" ),
+ TQString seps = KInputDialog::getText( i18n( "Word Connectors" ),
i18n( "Characters other than alphanumerics considered part of a word when double clicking:" ), s_word_seps, &ok, parentWidget );
if ( ok )
{
@@ -940,16 +940,16 @@ void konsolePart::guiActivateEvent( KParts::GUIActivateEvent * )
// Don't let ReadOnlyPart::guiActivateEvent reset the window caption
}
-bool konsolePart::doOpenStream( const QString& )
+bool konsolePart::doOpenStream( const TQString& )
{
return m_streamEnabled;
}
-bool konsolePart::doWriteStream( const QByteArray& data )
+bool konsolePart::doWriteStream( const TQByteArray& data )
{
if ( m_streamEnabled )
{
- QString cmd = QString::fromLocal8Bit( data.data(), data.size() );
+ TQString cmd = TQString::fromLocal8Bit( data.data(), data.size() );
se->sendSession( cmd );
return true;
}
@@ -965,30 +965,30 @@ bool konsolePart::doCloseStream()
HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType,
unsigned int histSize,
- QWidget *parent)
+ TQWidget *parent)
: KDialogBase(Plain, i18n("History Configuration"),
Help | Default | Ok | Cancel, Ok,
parent)
{
- QFrame *mainFrame = plainPage();
+ TQFrame *mainFrame = plainPage();
- QHBoxLayout *hb = new QHBoxLayout(mainFrame);
+ TQHBoxLayout *hb = new TQHBoxLayout(mainFrame);
- m_btnEnable = new QCheckBox(i18n("&Enable"), mainFrame);
+ m_btnEnable = new TQCheckBox(i18n("&Enable"), mainFrame);
- QObject::connect(m_btnEnable, SIGNAL(toggled(bool)),
- this, SLOT(slotHistEnable(bool)));
+ TQObject::connect(m_btnEnable, TQT_SIGNAL(toggled(bool)),
+ this, TQT_SLOT(slotHistEnable(bool)));
- m_size = new QSpinBox(0, 10 * 1000 * 1000, 100, mainFrame);
+ m_size = new TQSpinBox(0, 10 * 1000 * 1000, 100, mainFrame);
m_size->setValue(histSize);
m_size->setSpecialValueText(i18n("Unlimited (number of lines)", "Unlimited"));
- m_setUnlimited = new QPushButton(i18n("&Set Unlimited"), mainFrame);
- connect( m_setUnlimited,SIGNAL(clicked()), this,SLOT(slotSetUnlimited()) );
+ m_setUnlimited = new TQPushButton(i18n("&Set Unlimited"), mainFrame);
+ connect( m_setUnlimited,TQT_SIGNAL(clicked()), this,TQT_SLOT(slotSetUnlimited()) );
hb->addWidget(m_btnEnable);
hb->addSpacing(10);
- hb->addWidget(new QLabel(i18n("Number of lines:"), mainFrame));
+ hb->addWidget(new TQLabel(i18n("Number of lines:"), mainFrame));
hb->addWidget(m_size);
hb->addSpacing(10);
hb->addWidget(m_setUnlimited);
@@ -1054,8 +1054,8 @@ const char* sensibleShell()
return shell;
}
-void konsolePart::startProgram( const QString& program,
- const QStrList& args )
+void konsolePart::startProgram( const TQString& program,
+ const TQStrList& args )
{
// kdDebug(1211) << "konsolePart::startProgram for " << program << endl;
if ( !se )
@@ -1078,44 +1078,44 @@ void konsolePart::newSession()
{
if ( se ) delete se;
se = new TESession(te, "xterm", parentWidget->winId());
- connect( se,SIGNAL(done(TESession*)),
- this,SLOT(doneSession(TESession*)) );
- connect( se,SIGNAL(openURLRequest(const QString &)),
- this,SLOT(emitOpenURLRequest(const QString &)) );
- connect( se, SIGNAL( updateTitle(TESession*) ),
- this, SLOT( updateTitle(TESession*) ) );
- connect( se, SIGNAL(enableMasterModeConnections()),
- this, SLOT(enableMasterModeConnections()) );
- connect( se, SIGNAL( processExited(KProcess *) ),
- this, SIGNAL( processExited(KProcess *) ) );
- connect( se, SIGNAL( receivedData( const QString& ) ),
- this, SIGNAL( receivedData( const QString& ) ) );
- connect( se, SIGNAL( forkedChild() ),
- this, SIGNAL( forkedChild() ));
+ connect( se,TQT_SIGNAL(done(TESession*)),
+ this,TQT_SLOT(doneSession(TESession*)) );
+ connect( se,TQT_SIGNAL(openURLRequest(const TQString &)),
+ this,TQT_SLOT(emitOpenURLRequest(const TQString &)) );
+ connect( se, TQT_SIGNAL( updateTitle(TESession*) ),
+ this, TQT_SLOT( updateTitle(TESession*) ) );
+ connect( se, TQT_SIGNAL(enableMasterModeConnections()),
+ this, TQT_SLOT(enableMasterModeConnections()) );
+ connect( se, TQT_SIGNAL( processExited(KProcess *) ),
+ this, TQT_SIGNAL( processExited(KProcess *) ) );
+ connect( se, TQT_SIGNAL( receivedData( const TQString& ) ),
+ this, TQT_SIGNAL( receivedData( const TQString& ) ) );
+ connect( se, TQT_SIGNAL( forkedChild() ),
+ this, TQT_SIGNAL( forkedChild() ));
// We ignore the following signals
- //connect( se, SIGNAL(renameSession(TESession*,const QString&)),
- // this, SLOT(slotRenameSession(TESession*, const QString&)) );
- //connect( se->getEmulation(), SIGNAL(changeColumns(int)),
- // this, SLOT(changeColumns(int)) );
- //connect( se, SIGNAL(disableMasterModeConnections()),
- // this, SLOT(disableMasterModeConnections()) );
+ //connect( se, TQT_SIGNAL(renameSession(TESession*,const TQString&)),
+ // this, TQT_SLOT(slotRenameSession(TESession*, const TQString&)) );
+ //connect( se->getEmulation(), TQT_SIGNAL(changeColumns(int)),
+ // this, TQT_SLOT(changeColumns(int)) );
+ //connect( se, TQT_SIGNAL(disableMasterModeConnections()),
+ // this, TQT_SLOT(disableMasterModeConnections()) );
applyProperties();
se->setConnect(true);
// se->run();
- connect( se, SIGNAL( destroyed() ), this, SLOT( sessionDestroyed() ) );
+ connect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) );
// setFont( n_font ); // we do this here, to make TEWidget recalculate
// its geometry..
}
-void konsolePart::showShellInDir( const QString& dir )
+void konsolePart::showShellInDir( const TQString& dir )
{
if ( ! m_runningShell )
{
const char* s = sensibleShell();
- QStrList args;
+ TQStrList args;
args.append( s );
startProgram( s, args );
m_runningShell = true;
@@ -1123,19 +1123,19 @@ void konsolePart::showShellInDir( const QString& dir )
if ( ! dir.isNull() )
{
- QString text = dir;
+ TQString text = dir;
KRun::shellQuote(text);
- text = QString::fromLatin1("cd ") + text + '\n';
+ text = TQString::fromLatin1("cd ") + text + '\n';
te->emitText( text );
};
}
void konsolePart::showShell()
{
- if ( ! se ) showShellInDir( QString::null );
+ if ( ! se ) showShellInDir( TQString::null );
}
-void konsolePart::sendInput( const QString& text )
+void konsolePart::sendInput( const TQString& text )
{
te->emitText( text );
}
diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h
index 5cff68c4e..2f49a5866 100644
--- a/konsole/konsole/konsole_part.h
+++ b/konsole/konsole/konsole_part.h
@@ -52,10 +52,10 @@ public:
konsoleFactory();
virtual ~konsoleFactory();
- virtual KParts::Part* createPartObject(QWidget *parentWidget = 0, const char *widgetName = 0,
- QObject* parent = 0, const char* name = 0,
+ virtual KParts::Part* createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0,
+ TQObject* parent = 0, const char* name = 0,
const char* classname = "KParts::Part",
- const QStringList &args = QStringList());
+ const TQStringList &args = TQStringList());
static KInstance *instance();
@@ -70,12 +70,12 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public
{
Q_OBJECT
public:
- konsolePart(QWidget *parentWidget, const char *widgetName, QObject * parent, const char *name, const char *classname = 0);
+ konsolePart(TQWidget *parentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0);
virtual ~konsolePart();
signals:
void processExited( KProcess * );
- void receivedData( const QString& s );
+ void receivedData( const TQString& s );
void forkedChild();
protected:
virtual bool openURL( const KURL & url );
@@ -93,7 +93,7 @@ signals:
void enableMasterModeConnections();
private slots:
- void emitOpenURLRequest(const QString &url);
+ void emitOpenURLRequest(const TQString &url);
void readProperties();
void saveProperties();
@@ -136,11 +136,11 @@ signals:
void setSchema(ColorSchema* s);
void updateKeytabMenu();
- bool doOpenStream( const QString& );
- bool doWriteStream( const QByteArray& );
+ bool doOpenStream( const TQString& );
+ bool doWriteStream( const TQByteArray& );
bool doCloseStream();
- QWidget* parentWidget;
+ TQWidget* parentWidget;
TEWidget* te;
TESession* se;
ColorSchemaList* colors;
@@ -166,12 +166,12 @@ signals:
KPopupMenu* m_options;
KPopupMenu* m_popupMenu;
- QFont defaultFont;
+ TQFont defaultFont;
- QString pmPath; // pixmap path
- QString s_schema;
- QString s_kconfigSchema;
- QString s_word_seps; // characters that are considered part of a word
+ TQString pmPath; // pixmap path
+ TQString s_schema;
+ TQString s_kconfigSchema;
+ TQString s_word_seps; // characters that are considered part of a word
bool b_framevis:1;
bool b_histEnabled:1;
@@ -194,11 +194,11 @@ public:
// these are the implementations for the TermEmuInterface
// functions...
- void startProgram( const QString& program,
- const QStrList& args );
+ void startProgram( const TQString& program,
+ const TQStrList& args );
void newSession();
- void showShellInDir( const QString& dir );
- void sendInput( const QString& text );
+ void showShellInDir( const TQString& dir );
+ void sendInput( const TQString& text );
void setAutoDestroy( bool );
void setAutoStartShell( bool );
};
@@ -211,7 +211,7 @@ class HistoryTypeDialog : public KDialogBase
public:
HistoryTypeDialog(const HistoryType& histType,
unsigned int histSize,
- QWidget *parent);
+ TQWidget *parent);
public slots:
void slotDefault();
@@ -222,9 +222,9 @@ public slots:
bool isOn() const;
protected:
- QCheckBox* m_btnEnable;
- QSpinBox* m_size;
- QPushButton* m_setUnlimited;
+ TQCheckBox* m_btnEnable;
+ TQSpinBox* m_size;
+ TQPushButton* m_setUnlimited;
};
//////////////////////////////////////////////////////////////////////
diff --git a/konsole/konsole/konsole_wcwidth.cpp b/konsole/konsole/konsole_wcwidth.cpp
index 1592e2de3..73d7c7131 100644
--- a/konsole/konsole/konsole_wcwidth.cpp
+++ b/konsole/konsole/konsole_wcwidth.cpp
@@ -209,7 +209,7 @@ int konsole_wcwidth_cjk(Q_UINT16 ucs)
}
// single byte char: +1, multi byte char: +2
-int string_width( const QString &txt )
+int string_width( const TQString &txt )
{
int w = 0;
diff --git a/konsole/konsole/konsole_wcwidth.h b/konsole/konsole/konsole_wcwidth.h
index 15f6ef9a8..b070beb02 100644
--- a/konsole/konsole/konsole_wcwidth.h
+++ b/konsole/konsole/konsole_wcwidth.h
@@ -6,12 +6,12 @@
#ifndef _KONSOLE_WCWIDTH_H_
#define _KONSOLE_WCWIDTH_H_
-#include <qglobal.h>
-#include <qstring.h>
+#include <tqglobal.h>
+#include <tqstring.h>
int konsole_wcwidth(Q_UINT16 ucs);
//int konsole_wcwidth_cjk(Q_UINT16 ucs);
-int string_width( const QString &txt );
+int string_width( const TQString &txt );
#endif
diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp
index 27bdb4f87..9de6fe3ab 100644
--- a/konsole/konsole/konsolebookmarkhandler.cpp
+++ b/konsole/konsole/konsolebookmarkhandler.cpp
@@ -24,14 +24,14 @@
#include <kio/job.h>
#include <kio/netaccess.h>
#include <kdebug.h>
-#include <qfile.h>
+#include <tqfile.h>
#include "konsole.h"
#include "konsolebookmarkmenu.h"
#include "konsolebookmarkhandler.h"
KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel )
- : QObject( konsole, "KonsoleBookmarkHandler" ),
+ : TQObject( konsole, "KonsoleBookmarkHandler" ),
KBookmarkOwner(),
m_konsole( konsole )
{
@@ -39,10 +39,10 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel
// KDE3.5 - Konsole's bookmarks are now in konsole/bookmarks.xml
// TODO: Consider removing for KDE4
- QString new_bm_file = locateLocal( "data", "konsole/bookmarks.xml" );
- if ( !QFile::exists( new_bm_file ) ) {
- QString old_bm_file = locateLocal( "data", "kfile/bookmarks.xml" );
- if ( QFile::exists( old_bm_file ) )
+ TQString new_bm_file = locateLocal( "data", "konsole/bookmarks.xml" );
+ if ( !TQFile::exists( new_bm_file ) ) {
+ TQString old_bm_file = locateLocal( "data", "kfile/bookmarks.xml" );
+ if ( TQFile::exists( old_bm_file ) )
// We want sync here...
if ( !KIO::NetAccess::copy( KURL( old_bm_file ),
KURL ( new_bm_file ), 0 ) ) {
@@ -59,8 +59,8 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel
manager->setUpdate( true );
manager->setShowNSBookmarks( false );
- connect( manager, SIGNAL( changed(const QString &, const QString &) ),
- SLOT( slotBookmarksChanged(const QString &, const QString &) ) );
+ connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
+ TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) );
if (toplevel) {
m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu,
@@ -77,25 +77,25 @@ KonsoleBookmarkHandler::~KonsoleBookmarkHandler()
delete m_bookmarkMenu;
}
-QString KonsoleBookmarkHandler::currentURL() const
+TQString KonsoleBookmarkHandler::currentURL() const
{
return m_konsole->baseURL().prettyURL();
}
-QString KonsoleBookmarkHandler::currentTitle() const
+TQString KonsoleBookmarkHandler::currentTitle() const
{
const KURL &u = m_konsole->baseURL();
if (u.isLocalFile())
{
- QString path = u.path();
+ TQString path = u.path();
path = KShell::tildeExpand(path);
return path;
}
return u.prettyURL();
}
-void KonsoleBookmarkHandler::slotBookmarksChanged( const QString &,
- const QString &)
+void KonsoleBookmarkHandler::slotBookmarksChanged( const TQString &,
+ const TQString &)
{
// This is called when someone changes bookmarks in konsole....
m_bookmarkMenu->slotBookmarksChanged("");
diff --git a/konsole/konsole/konsolebookmarkhandler.h b/konsole/konsole/konsolebookmarkhandler.h
index 63ab747d9..a90b8e016 100644
--- a/konsole/konsole/konsolebookmarkhandler.h
+++ b/konsole/konsole/konsolebookmarkhandler.h
@@ -28,7 +28,7 @@ class KPopupMenu;
class KonsoleBookmarkMenu;
class KBookmarkManager;
-class KonsoleBookmarkHandler : public QObject, public KBookmarkOwner
+class KonsoleBookmarkHandler : public TQObject, public KBookmarkOwner
{
Q_OBJECT
@@ -36,27 +36,27 @@ public:
KonsoleBookmarkHandler( Konsole *konsole, bool toplevel );
~KonsoleBookmarkHandler();
- QPopupMenu * popupMenu();
+ TQPopupMenu * popupMenu();
// KBookmarkOwner interface:
- virtual void openBookmarkURL( const QString& url, const QString& title )
+ virtual void openBookmarkURL( const TQString& url, const TQString& title )
{ emit openURL( url, title ); }
- virtual QString currentURL() const;
- virtual QString currentTitle() const;
+ virtual TQString currentURL() const;
+ virtual TQString currentTitle() const;
KPopupMenu *menu() const { return m_menu; }
private slots:
- void slotBookmarksChanged( const QString &, const QString & caller );
+ void slotBookmarksChanged( const TQString &, const TQString & caller );
signals:
- void openURL( const QString& url, const QString& title );
+ void openURL( const TQString& url, const TQString& title );
private:
Konsole *m_konsole;
KPopupMenu *m_menu;
KonsoleBookmarkMenu *m_bookmarkMenu;
- QString m_file;
+ TQString m_file;
};
#endif // KONSOLEBOOKMARKHANDLER_H
diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp
index ea82a75e3..0686cfbf1 100644
--- a/konsole/konsole/konsolebookmarkmenu.cpp
+++ b/konsole/konsole/konsolebookmarkmenu.cpp
@@ -27,7 +27,7 @@
KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu,
KActionCollection *collec, bool _isRoot, bool _add,
- const QString & parentAddress )
+ const TQString & parentAddress )
: KBookmarkMenu( mgr, _owner, _parentMenu, collec, _isRoot, _add,
parentAddress),
m_kOwner(_owner)
@@ -36,14 +36,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
/*
* First, we disconnect KBookmarkMenu::slotAboutToShow()
* Then, we connect KonsoleBookmarkMenu::slotAboutToShow().
- * They are named differently because the SLOT() macro thinks we want
+ * They are named differently because the TQT_SLOT() macro thinks we want
* KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow()
* Could this be solved if slotAboutToShow() is virtual in KBookmarMenu?
*/
- disconnect( _parentMenu, SIGNAL( aboutToShow() ), this,
- SLOT( slotAboutToShow() ) );
- connect( _parentMenu, SIGNAL( aboutToShow() ),
- SLOT( slotAboutToShow2() ) );
+ disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this,
+ TQT_SLOT( slotAboutToShow() ) );
+ connect( _parentMenu, TQT_SIGNAL( aboutToShow() ),
+ TQT_SLOT( slotAboutToShow2() ) );
}
/*
@@ -68,7 +68,7 @@ void KonsoleBookmarkMenu::slotAboutToShow2()
void KonsoleBookmarkMenu::refill()
{
m_lstSubMenus.clear();
- QPtrListIterator<KAction> it( m_actions );
+ TQPtrListIterator<KAction> it( m_actions );
for (; it.current(); ++it )
it.current()->unplug( m_parentMenu );
m_parentMenu->clear();
@@ -96,7 +96,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
for ( KBookmark bm = parentBookmark.first(); !bm.isNull();
bm = parentBookmark.next(bm) )
{
- QString text = bm.text();
+ TQString text = bm.text();
text.replace( '&', "&&" );
if ( !separatorInserted && m_bIsRoot) { // inserted before the first konq bookmark, to avoid the separator if no konq bookmark
m_parentMenu->insertSeparator();
@@ -113,7 +113,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
// kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl;
// create a normal URL item, with ID as a name
KAction * action = new KAction( text, bm.icon(), 0,
- this, SLOT( slotBookmarkSelected() ),
+ this, TQT_SLOT( slotBookmarkSelected() ),
m_actionCollection, bm.url().url().utf8() );
action->setStatusText( bm.url().prettyURL() );
@@ -149,7 +149,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
void KonsoleBookmarkMenu::slotBookmarkSelected()
{
if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
- m_kOwner->openBookmarkURL( QString::fromUtf8(sender()->name()), /* URL */
+ m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */
( (KAction *)sender() )->text() /* Title */ );
}
diff --git a/konsole/konsole/konsolebookmarkmenu.h b/konsole/konsole/konsolebookmarkmenu.h
index e4540da69..2c3576390 100644
--- a/konsole/konsole/konsolebookmarkmenu.h
+++ b/konsole/konsole/konsolebookmarkmenu.h
@@ -19,7 +19,7 @@
#ifndef KONSOLEBOOKMARKMENU_H
#define KONSOLEBOOKMARKMENU_H
-#include <qptrlist.h>
+#include <tqptrlist.h>
#include <kbookmark.h>
#include <kbookmarkmenu.h>
@@ -44,7 +44,7 @@ public:
KonsoleBookmarkMenu( KBookmarkManager* mgr,
KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu,
KActionCollection *collec, bool _isRoot,
- bool _add = true, const QString & parentAddress = "");
+ bool _add = true, const TQString & parentAddress = "");
void fillBookmarkMenu();
diff --git a/konsole/konsole/konsoleiface.h b/konsole/konsole/konsoleiface.h
index fc3002a35..653a945e5 100644
--- a/konsole/konsole/konsoleiface.h
+++ b/konsole/konsole/konsoleiface.h
@@ -30,12 +30,12 @@ class KonsoleIface : virtual public DCOPObject
virtual int sessionCount() = 0;
- virtual QString currentSession() = 0;
- virtual QString newSession() = 0;
- virtual QString newSession(const QString &type) = 0;
- virtual QString sessionId(const int position) = 0;
+ virtual TQString currentSession() = 0;
+ virtual TQString newSession() = 0;
+ virtual TQString newSession(const TQString &type) = 0;
+ virtual TQString sessionId(const int position) = 0;
- virtual void activateSession(const QString &sessionId) = 0;
+ virtual void activateSession(const TQString &sessionId) = 0;
virtual void nextSession() = 0;
virtual void prevSession() = 0;
diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp
index 7b0e1167b..4255c1938 100644
--- a/konsole/konsole/kwrited.cpp
+++ b/konsole/konsole/kwrited.cpp
@@ -31,7 +31,7 @@
// Qt
#include <dcopclient.h>
-#include <qsocketnotifier.h>
+#include <tqsocketnotifier.h>
// KDE
#include <kuniqueapplication.h>
@@ -61,7 +61,7 @@
- add client complements.
*/
-KWrited::KWrited() : QTextEdit()
+KWrited::KWrited() : TQTextEdit()
{
int pref_width, pref_height;
@@ -71,17 +71,17 @@ KWrited::KWrited() : QTextEdit()
setMinimumWidth(pref_width);
setMinimumHeight(pref_height);
setReadOnly(true);
- setFocusPolicy(QWidget::NoFocus);
- setWordWrap(QTextEdit::WidgetWidth);
+ setFocusPolicy(TQWidget::NoFocus);
+ setWordWrap(TQTextEdit::WidgetWidth);
setTextFormat(Qt::PlainText);
pty = new KPty();
pty->open();
pty->login(KUser().loginName().local8Bit().data(), getenv("DISPLAY"));
- QSocketNotifier *sn = new QSocketNotifier(pty->masterFd(), QSocketNotifier::Read, this);
- connect(sn, SIGNAL(activated(int)), this, SLOT(block_in(int)));
+ TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, this);
+ connect(sn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(block_in(int)));
- QString txt = i18n("KWrited - Listening on Device %1").arg(pty->ttyName());
+ TQString txt = i18n("KWrited - Listening on Device %1").arg(pty->ttyName());
setCaption(txt);
kdDebug() << txt << endl;
@@ -100,7 +100,7 @@ void KWrited::block_in(int fd)
if (len <= 0)
return;
- insert( QString::fromLocal8Bit( buf, len ).remove('\r') );
+ insert( TQString::fromLocal8Bit( buf, len ).remove('\r') );
show();
raise();
}
@@ -110,18 +110,18 @@ void KWrited::clearText()
clear();
}
-QPopupMenu *KWrited::createPopupMenu( const QPoint &pos )
+TQPopupMenu *KWrited::createPopupMenu( const TQPoint &pos )
{
- QPopupMenu *menu = QTextEdit::createPopupMenu( pos );
+ TQPopupMenu *menu = TQTextEdit::createPopupMenu( pos );
menu->insertItem( i18n( "Clear Messages" ),
- this, SLOT( clearText() ),
+ this, TQT_SLOT( clearText() ),
0, -1, 0 );
return menu;
}
-KWritedModule::KWritedModule( const QCString& obj )
+KWritedModule::KWritedModule( const TQCString& obj )
: KDEDModule( obj )
{
KGlobal::locale()->insertCatalogue("konsole");
@@ -135,7 +135,7 @@ KWritedModule::~KWritedModule()
}
extern "C"
-KDE_EXPORT KDEDModule* create_kwrited( const QCString& obj )
+KDE_EXPORT KDEDModule* create_kwrited( const TQCString& obj )
{
return new KWritedModule( obj );
}
diff --git a/konsole/konsole/kwrited.h b/konsole/konsole/kwrited.h
index 71da6eff1..04cfca548 100644
--- a/konsole/konsole/kwrited.h
+++ b/konsole/konsole/kwrited.h
@@ -21,10 +21,10 @@
#ifndef KWRITED_H
#define KWRITED_H
-#include <qtextedit.h>
+#include <tqtextedit.h>
#include <kdedmodule.h>
-#include <qpopupmenu.h>
-#include <qtextedit.h>
+#include <tqpopupmenu.h>
+#include <tqtextedit.h>
class KPty;
@@ -34,7 +34,7 @@ public:
KWrited();
~KWrited();
protected:
- virtual QPopupMenu *createPopupMenu(const QPoint &);
+ virtual TQPopupMenu *createPopupMenu(const TQPoint &);
private slots:
void block_in(int fd);
void clearText(void);
@@ -47,7 +47,7 @@ class KWritedModule : public KDEDModule
Q_OBJECT
K_DCOP
public:
- KWritedModule( const QCString& obj );
+ KWritedModule( const TQCString& obj );
~KWritedModule();
private:
KWrited* pro;
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index 48e9eab2a..7be5e5146 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -26,9 +26,9 @@
#include <stdio.h>
#include <stdlib.h>
-#include <qdir.h>
-#include <qsessionmanager.h>
-#include <qwidgetlist.h>
+#include <tqdir.h>
+#include <tqsessionmanager.h>
+#include <tqwidgetlist.h>
#include <dcopclient.h>
@@ -105,7 +105,7 @@ static bool fixed_size = false;
bool argb_visual = false;
-const char *konsole_shell(QStrList &args)
+const char *konsole_shell(TQStrList &args)
{
const char* shell = getenv("SHELL");
if (shell == NULL || *shell == '\0') shell = "/bin/sh";
@@ -134,7 +134,7 @@ const char *konsole_shell(QStrList &args)
class KonsoleSessionManaged: public KSessionManaged {
public:
bool saveState( QSessionManager&sm) {
- QStringList restartCommand = sm.restartCommand();
+ TQStringList restartCommand = sm.restartCommand();
if (has_noxft)
restartCommand.append("--noxft");
if (login_shell)
@@ -288,7 +288,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
}
}
}
- // The QApplication ctor used is normally intended for applications not using Qt
+ // The TQApplication ctor used is normally intended for applications not using Qt
// as the primary toolkit (e.g. Motif apps also using Qt), with some slightly
// unpleasant side effects (e.g. #83974). This code checks if qt-copy patch #0078
// is applied, which allows turning this off.
@@ -308,27 +308,27 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
KApplication* a = new KApplication;
#endif
- QString dataPathBase = KStandardDirs::kde_default("data").append("konsole/");
+ TQString dataPathBase = KStandardDirs::kde_default("data").append("konsole/");
KGlobal::dirs()->addResourceType("wallpaper", dataPathBase + "wallpapers");
KImageIO::registerFormats(); // add io for additional image formats
//2.1 secs
- QString title;
+ TQString title;
if(args->isSet("T")) {
- title = QFile::decodeName(args->getOption("T"));
+ title = TQFile::decodeName(args->getOption("T"));
}
if(qtargs->isSet("title")) {
- title = QFile::decodeName(qtargs->getOption("title"));
+ title = TQFile::decodeName(qtargs->getOption("title"));
}
- QString term = "";
+ TQString term = "";
if(args->isSet("tn")) {
- term=QString::fromLatin1(args->getOption("tn"));
+ term=TQString::fromLatin1(args->getOption("tn"));
}
login_shell = args->isSet("ls");
- QStrList eargs;
+ TQStrList eargs;
const char* shell = 0;
if (!args->getOption("e").isEmpty())
@@ -343,19 +343,19 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
if (title.isEmpty() &&
(kapp->caption() == kapp->aboutData()->programName()))
{
- title = QFile::decodeName(shell); // program executed in the title bar
+ title = TQFile::decodeName(shell); // program executed in the title bar
}
showtip = false;
}
- QCString sz = "";
+ TQCString sz = "";
sz = args->getOption("vt_sz");
histon = args->isSet("hist");
menubaron = args->isSet("menubar");
tabbaron = args->isSet("tabbar") && args->isSet("toolbar");
frameon = args->isSet("frame");
scrollbaron = args->isSet("scrollbar");
- QCString wname = qtargs->getOption("name");
+ TQCString wname = qtargs->getOption("name");
full_script = args->isSet("script");
auto_close = args->isSet("close");
fixed_size = !args->isSet("resize");
@@ -363,22 +363,22 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
if (!full_script)
a->dcopClient()->setQtBridgeEnabled(false);
- QCString type = "";
+ TQCString type = "";
if(args->isSet("type")) {
type = args->getOption("type");
}
if(args->isSet("types")) {
- QStringList types = KGlobal::dirs()->findAllResources("appdata", "*.desktop", false, true);
+ TQStringList types = KGlobal::dirs()->findAllResources("appdata", "*.desktop", false, true);
types.sort();
- for(QStringList::ConstIterator it = types.begin();
+ for(TQStringList::ConstIterator it = types.begin();
it != types.end(); ++it)
{
- QString file = *it;
+ TQString file = *it;
file = file.mid(file.findRev('/')+1);
if (file.endsWith(".desktop"))
file = file.left(file.length()-8);
- printf("%s\n", QFile::encodeName(file).data());
+ printf("%s\n", TQFile::encodeName(file).data());
}
return 0;
}
@@ -388,57 +388,57 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
for(int i = 0; i < (int) colors.count(); i++)
{
ColorSchema *schema = colors.find(i);
- QString relPath = schema->relPath();
+ TQString relPath = schema->relPath();
if (!relPath.isEmpty())
- printf("%s\n", QFile::encodeName(relPath).data());
+ printf("%s\n", TQFile::encodeName(relPath).data());
}
return 0;
}
if(args->isSet("keytabs")) {
- QStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
+ TQStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
printf("default\n"); // 'buildin' keytab
lst.sort();
- for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
+ for(TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
{
- QFileInfo fi(*it);
- QString file = fi.baseName();
- printf("%s\n", QFile::encodeName(file).data());
+ TQFileInfo fi(*it);
+ TQString file = fi.baseName();
+ printf("%s\n", TQFile::encodeName(file).data());
}
return 0;
}
- QString workDir = QFile::decodeName( args->getOption("workdir") );
+ TQString workDir = TQFile::decodeName( args->getOption("workdir") );
- QString keytab = "";
+ TQString keytab = "";
if (args->isSet("keytab"))
- keytab = QFile::decodeName(args->getOption("keytab"));
+ keytab = TQFile::decodeName(args->getOption("keytab"));
- QString schema = "";
+ TQString schema = "";
if (args->isSet("schema"))
schema = args->getOption("schema");
KConfig * sessionconfig = 0;
- QString profile = "";
+ TQString profile = "";
if (args->isSet("profile")) {
profile = args->getOption("profile");
- QString path = locate( "data", "konsole/profiles/" + profile );
- if ( QFile::exists( path ) )
+ TQString path = locate( "data", "konsole/profiles/" + profile );
+ if ( TQFile::exists( path ) )
sessionconfig=new KConfig( path, true );
else
profile = "";
}
if (args->isSet("profiles"))
{
- QStringList profiles = KGlobal::dirs()->findAllResources("data", "konsole/profiles/*", false, true);
+ TQStringList profiles = KGlobal::dirs()->findAllResources("data", "konsole/profiles/*", false, true);
profiles.sort();
- for(QStringList::ConstIterator it = profiles.begin();
+ for(TQStringList::ConstIterator it = profiles.begin();
it != profiles.end(); ++it)
{
- QString file = *it;
+ TQString file = *it;
file = file.mid(file.findRev('/')+1);
- printf("%s\n", QFile::encodeName(file).data());
+ printf("%s\n", TQFile::encodeName(file).data());
}
return 0;
}
@@ -487,19 +487,19 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
sessionconfig->setDesktopGroup();
int n = 1;
- QString key;
- QString sTitle;
- QString sPgm;
- QString sTerm;
- QString sIcon;
- QString sCwd;
+ TQString key;
+ TQString sTitle;
+ TQString sPgm;
+ TQString sTerm;
+ TQString sIcon;
+ TQString sCwd;
int n_tabbar;
// TODO: Session management stores everything in same group,
// should use one group / mainwindow
while (KMainWindow::canBeRestored(n) || !profile.isEmpty())
{
- sessionconfig->setGroup(QString("%1").arg(n));
+ sessionconfig->setGroup(TQString("%1").arg(n));
if (!sessionconfig->hasKey("Pgm0"))
sessionconfig->setDesktopGroup(); // Backwards compatible
@@ -523,14 +523,14 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
m->enableFullScripting(full_script);
m->enableFixedSize(fixed_size);
m->restore(n);
- sessionconfig->setGroup(QString("%1").arg(n));
+ sessionconfig->setGroup(TQString("%1").arg(n));
if (!sessionconfig->hasKey("Pgm0"))
sessionconfig->setDesktopGroup(); // Backwards compatible
m->makeGUI();
m->setEncoding(sessionconfig->readNumEntry("Encoding0"));
m->setSchema(sessionconfig->readEntry("Schema0"));
// Use konsolerc default as tmpFont instead?
- QFont tmpFont = KGlobalSettings::fixedFont();
+ TQFont tmpFont = KGlobalSettings::fixedFont();
m->initSessionFont(sessionconfig->readFontEntry("SessionFont0", &tmpFont));
m->initSessionKeyTab(sessionconfig->readEntry("KeyTab0"));
m->initMonitorActivity(sessionconfig->readBoolEntry("MonitorActivity0",false));
@@ -548,48 +548,48 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
while (counter < session_count)
{
- key = QString("Title%1").arg(counter);
+ key = TQString("Title%1").arg(counter);
sTitle = sessionconfig->readEntry(key, title);
- key = QString("Args%1").arg(counter);
+ key = TQString("Args%1").arg(counter);
sessionconfig->readListEntry(key, eargs);
- key = QString("Pgm%1").arg(counter);
+ key = TQString("Pgm%1").arg(counter);
// if the -e option is passed on the command line, this overrides the program specified
// in the profile file
if ( args->isSet("e") )
- sPgm = (shell ? QFile::decodeName(shell) : QString::null);
+ sPgm = (shell ? TQFile::decodeName(shell) : TQString::null);
else
sPgm = sessionconfig->readEntry(key, shell);
- key = QString("Term%1").arg(counter);
+ key = TQString("Term%1").arg(counter);
sTerm = sessionconfig->readEntry(key);
- key = QString("Icon%1").arg(counter);
+ key = TQString("Icon%1").arg(counter);
sIcon = sessionconfig->readEntry(key,"konsole");
- key = QString("Cwd%1").arg(counter);
+ key = TQString("Cwd%1").arg(counter);
sCwd = sessionconfig->readPathEntry(key);
m->newSession(sPgm, eargs, sTerm, sIcon, sTitle, sCwd);
m->setSessionTitle(sTitle); // Use title as is
- key = QString("Schema%1").arg(counter);
+ key = TQString("Schema%1").arg(counter);
m->setSchema(sessionconfig->readEntry(key));
- key = QString("Encoding%1").arg(counter);
+ key = TQString("Encoding%1").arg(counter);
m->setEncoding(sessionconfig->readNumEntry(key));
- key = QString("SessionFont%1").arg(counter);
- QFont tmpFont = KGlobalSettings::fixedFont();
+ key = TQString("SessionFont%1").arg(counter);
+ TQFont tmpFont = KGlobalSettings::fixedFont();
m->initSessionFont(sessionconfig->readFontEntry(key, &tmpFont));
- key = QString("KeyTab%1").arg(counter);
+ key = TQString("KeyTab%1").arg(counter);
m->initSessionKeyTab(sessionconfig->readEntry(key));
- key = QString("MonitorActivity%1").arg(counter);
+ key = TQString("MonitorActivity%1").arg(counter);
m->initMonitorActivity(sessionconfig->readBoolEntry(key,false));
- key = QString("MonitorSilence%1").arg(counter);
+ key = TQString("MonitorSilence%1").arg(counter);
m->initMonitorSilence(sessionconfig->readBoolEntry(key,false));
- key = QString("MasterMode%1").arg(counter);
+ key = TQString("MasterMode%1").arg(counter);
m->initMasterMode(sessionconfig->readBoolEntry(key,false));
- key = QString("TabColor%1").arg(counter);
+ key = TQString("TabColor%1").arg(counter);
m->initTabColor(sessionconfig->readColorEntry(key));
// -1 will be changed to the default history in konsolerc
- key = QString("History%1").arg(counter);
- QString key2 = QString("HistoryEnabled%1").arg(counter);
+ key = TQString("History%1").arg(counter);
+ TQString key2 = TQString("HistoryEnabled%1").arg(counter);
m->initHistory(sessionconfig->readNumEntry(key, -1),
sessionconfig->readBoolEntry(key2, true));
counter++;
@@ -614,7 +614,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
else
{
Konsole* m = new Konsole(wname,histon,menubaron,tabbaron,frameon,scrollbaron,type, false, 0, workDir);
- m->newSession((shell ? QFile::decodeName(shell) : QString::null), eargs, term, QString::null, title, workDir);
+ m->newSession((shell ? TQFile::decodeName(shell) : TQString::null), eargs, term, TQString::null, title, workDir);
m->enableFullScripting(full_script);
m->enableFixedSize(fixed_size);
//3.8 :-(
@@ -644,7 +644,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
//// Temporary code, waiting for Qt to do this properly
// Delete all toplevel widgets that have WDestructiveClose
- QWidgetList *list = QApplication::topLevelWidgets();
+ TQWidgetList *list = TQApplication::topLevelWidgets();
// remove all toplevel widgets that have a parent (i.e. they
// got WTopLevel explicitly), they'll be deleted by the parent
list->first();
@@ -657,8 +657,8 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
}
list->next();
}
- QWidgetListIt it(*list);
- QWidget * w;
+ TQWidgetListIt it(*list);
+ TQWidget * w;
while( (w=it.current()) != 0 ) {
++it;
delete w;
diff --git a/konsole/konsole/printsettings.cpp b/konsole/konsole/printsettings.cpp
index 22997ba28..f27194c14 100644
--- a/konsole/konsole/printsettings.cpp
+++ b/konsole/konsole/printsettings.cpp
@@ -21,24 +21,24 @@
#include "printsettings.h"
#include <klocale.h>
-#include <qcheckbox.h>
-#include <qlayout.h>
+#include <tqcheckbox.h>
+#include <tqlayout.h>
-PrintSettings::PrintSettings(QWidget *parent, const char *name)
+PrintSettings::PrintSettings(TQWidget *parent, const char *name)
: KPrintDialogPage(parent, name)
{
setTitle(i18n("Options"));
- m_printfriendly = new QCheckBox(i18n("Printer &friendly mode (black text, no background)"), this);
+ m_printfriendly = new TQCheckBox(i18n("Printer &friendly mode (black text, no background)"), this);
m_printfriendly->setChecked(true);
- m_printexact = new QCheckBox(i18n("&Pixel for pixel"), this);
+ m_printexact = new TQCheckBox(i18n("&Pixel for pixel"), this);
m_printexact->setChecked(false);
- m_printheader = new QCheckBox(i18n("Print &header"), this);
+ m_printheader = new TQCheckBox(i18n("Print &header"), this);
m_printheader->setChecked(true);
m_printheader->hide(); // Not yet implemented.
- QVBoxLayout *l0 = new QVBoxLayout(this, 0, 10);
+ QVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10);
l0->addWidget(m_printfriendly);
l0->addWidget(m_printexact);
l0->addWidget(m_printheader);
@@ -49,14 +49,14 @@ PrintSettings::~PrintSettings()
{
}
-void PrintSettings::getOptions(QMap<QString,QString>& opts, bool /*incldef*/)
+void PrintSettings::getOptions(TQMap<TQString,TQString>& opts, bool /*incldef*/)
{
opts["app-konsole-printfriendly"] = (m_printfriendly->isChecked() ? "true" : "false");
opts["app-konsole-printexact"] = (m_printexact->isChecked() ? "true" : "false");
opts["app-konsole-printheader"] = (m_printheader->isChecked() ? "true" : "false");
}
-void PrintSettings::setOptions(const QMap<QString,QString>& opts)
+void PrintSettings::setOptions(const TQMap<TQString,TQString>& opts)
{
m_printfriendly->setChecked(opts["app-konsole-printfriendly"] != "false");
m_printexact->setChecked(opts["app-konsole-printexact"] == "true");
diff --git a/konsole/konsole/printsettings.h b/konsole/konsole/printsettings.h
index 5d2f4389e..d4c12a770 100644
--- a/konsole/konsole/printsettings.h
+++ b/konsole/konsole/printsettings.h
@@ -29,11 +29,11 @@ class PrintSettings : public KPrintDialogPage
{
Q_OBJECT
public:
- PrintSettings(QWidget *parent = 0, const char *name = 0);
+ PrintSettings(TQWidget *parent = 0, const char *name = 0);
~PrintSettings();
- void getOptions(QMap<QString,QString>& opts, bool incldef = false);
- void setOptions(const QMap<QString,QString>& opts);
+ void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false);
+ void setOptions(const TQMap<TQString,TQString>& opts);
private:
QCheckBox *m_printfriendly;
diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp
index 0002e198b..8d85329eb 100644
--- a/konsole/konsole/schema.cpp
+++ b/konsole/konsole/schema.cpp
@@ -53,15 +53,15 @@
#include "schema.h"
#include "kapplication.h"
-#include <qdir.h>
-#include <qdatetime.h>
+#include <tqdir.h>
+#include <tqdatetime.h>
#include <kstandarddirs.h>
#include <klocale.h>
#include <kconfig.h>
#include <kdebug.h>
-typedef QPtrListIterator<ColorSchema> ColorSchemaListIterator;
+typedef TQPtrListIterator<ColorSchema> ColorSchemaListIterator;
// Number all the new color schema's (non-default) from 1.
@@ -103,39 +103,39 @@ static const ColorEntry default_table[TABLE_COLORS] =
// gamma correction for the dim colors to compensate for bright X screens.
// It contains the 8 ansiterm/xterm colors in 2 intensities.
{
- ColorEntry( QColor(0x00,0x00,0x00), 0, 0 ), ColorEntry(
-QColor(0xFF,0xFF,0xFF), 1, 0 ), // Dfore, Dback
- ColorEntry( QColor(0x00,0x00,0x00), 0, 0 ), ColorEntry(
-QColor(0xB2,0x18,0x18), 0, 0 ), // Black, Red
- ColorEntry( QColor(0x18,0xB2,0x18), 0, 0 ), ColorEntry(
-QColor(0xB2,0x68,0x18), 0, 0 ), // Green, Yellow
- ColorEntry( QColor(0x18,0x18,0xB2), 0, 0 ), ColorEntry(
-QColor(0xB2,0x18,0xB2), 0, 0 ), // Blue, Magenta
- ColorEntry( QColor(0x18,0xB2,0xB2), 0, 0 ), ColorEntry(
-QColor(0xB2,0xB2,0xB2), 0, 0 ), // Cyan, White
+ ColorEntry( TQColor(0x00,0x00,0x00), 0, 0 ), ColorEntry(
+TQColor(0xFF,0xFF,0xFF), 1, 0 ), // Dfore, Dback
+ ColorEntry( TQColor(0x00,0x00,0x00), 0, 0 ), ColorEntry(
+TQColor(0xB2,0x18,0x18), 0, 0 ), // Black, Red
+ ColorEntry( TQColor(0x18,0xB2,0x18), 0, 0 ), ColorEntry(
+TQColor(0xB2,0x68,0x18), 0, 0 ), // Green, Yellow
+ ColorEntry( TQColor(0x18,0x18,0xB2), 0, 0 ), ColorEntry(
+TQColor(0xB2,0x18,0xB2), 0, 0 ), // Blue, Magenta
+ ColorEntry( TQColor(0x18,0xB2,0xB2), 0, 0 ), ColorEntry(
+TQColor(0xB2,0xB2,0xB2), 0, 0 ), // Cyan, White
// intensive
- ColorEntry( QColor(0x00,0x00,0x00), 0, 1 ), ColorEntry(
-QColor(0xFF,0xFF,0xFF), 1, 0 ),
- ColorEntry( QColor(0x68,0x68,0x68), 0, 0 ), ColorEntry(
-QColor(0xFF,0x54,0x54), 0, 0 ),
- ColorEntry( QColor(0x54,0xFF,0x54), 0, 0 ), ColorEntry(
-QColor(0xFF,0xFF,0x54), 0, 0 ),
- ColorEntry( QColor(0x54,0x54,0xFF), 0, 0 ), ColorEntry(
-QColor(0xFF,0x54,0xFF), 0, 0 ),
- ColorEntry( QColor(0x54,0xFF,0xFF), 0, 0 ), ColorEntry(
-QColor(0xFF,0xFF,0xFF), 0, 0 )
+ ColorEntry( TQColor(0x00,0x00,0x00), 0, 1 ), ColorEntry(
+TQColor(0xFF,0xFF,0xFF), 1, 0 ),
+ ColorEntry( TQColor(0x68,0x68,0x68), 0, 0 ), ColorEntry(
+TQColor(0xFF,0x54,0x54), 0, 0 ),
+ ColorEntry( TQColor(0x54,0xFF,0x54), 0, 0 ), ColorEntry(
+TQColor(0xFF,0xFF,0x54), 0, 0 ),
+ ColorEntry( TQColor(0x54,0x54,0xFF), 0, 0 ), ColorEntry(
+TQColor(0xFF,0x54,0xFF), 0, 0 ),
+ ColorEntry( TQColor(0x54,0xFF,0xFF), 0, 0 ), ColorEntry(
+TQColor(0xFF,0xFF,0xFF), 0, 0 )
};
-ColorSchema::ColorSchema(const QString& pathname)
+ColorSchema::ColorSchema(const TQString& pathname)
:m_fileRead(false)
-,lastRead(new QDateTime())
+,lastRead(new TQDateTime())
{
//start with a valid time, aleXXX
- *lastRead = QDateTime::currentDateTime();
- QString fPath = pathname.startsWith("/") ? pathname : locate("data", "konsole/"+pathname);
- if (fPath.isEmpty() || !QFile::exists(fPath))
+ *lastRead = TQDateTime::currentDateTime();
+ TQString fPath = pathname.startsWith("/") ? pathname : locate("data", "konsole/"+pathname);
+ if (fPath.isEmpty() || !TQFile::exists(fPath))
{
- fRelPath = QString::null;
+ fRelPath = TQString::null;
setDefaultSchema();
}
else
@@ -151,7 +151,7 @@ ColorSchema::ColorSchema(const QString& pathname)
ColorSchema::ColorSchema()
:m_fileRead(false)
-,fRelPath(QString::null)
+,fRelPath(TQString::null)
,lastRead(0L)
{
setDefaultSchema();
@@ -160,7 +160,7 @@ ColorSchema::ColorSchema()
ColorSchema::ColorSchema(KConfig& c)
:m_fileRead(false)
-,fRelPath(QString::null)
+,fRelPath(TQString::null)
,lastRead(0L)
{
clearSchema();
@@ -197,7 +197,7 @@ void ColorSchema::clearSchema()
for (i = 0; i < TABLE_COLORS; i++)
{
- m_table[i].color = QColor(0,0,0);
+ m_table[i].color = TQColor(0,0,0);
m_table[i].transparent = 0;
m_table[i].bold = 0;
}
@@ -226,7 +226,7 @@ void ColorSchema::setDefaultSchema()
}
}
-/* static */ QString ColorSchema::colorName(int i)
+/* static */ TQString ColorSchema::colorName(int i)
{
if ((i<0) || (i>=TABLE_COLORS))
{
@@ -234,14 +234,14 @@ void ColorSchema::setDefaultSchema()
<< i
<< " out of range."
<< endl;
- return QString::null;
+ return TQString::null;
}
- return QString(colornames[i]);
+ return TQString(colornames[i]);
}
void ColorSchema::writeConfigColor(KConfig& c,
- const QString& name,
+ const TQString& name,
const ColorEntry& e) const
{
KConfigGroupSaver(&c,name);
@@ -252,7 +252,7 @@ void ColorSchema::writeConfigColor(KConfig& c,
}
void ColorSchema::readConfigColor(KConfig& c,
- const QString& name,
+ const TQString& name,
ColorEntry& e)
{
KConfigGroupSaver(&c,name);
@@ -264,7 +264,7 @@ void ColorSchema::readConfigColor(KConfig& c,
}
-void ColorSchema::writeConfig(const QString& path) const
+void ColorSchema::writeConfig(const TQString& path) const
{
// KONSOLEDEBUG << "Writing schema " << relPath << " to file " << path << endl;
@@ -291,13 +291,13 @@ static int random_hue = -1;
bool ColorSchema::rereadSchemaFile()
{
- QString fPath = fRelPath.isEmpty() ? "" : (fRelPath.startsWith("/") ? fRelPath : locate("data", "konsole/"+fRelPath));
- if (fPath.isEmpty() || !QFile::exists(fPath))
+ TQString fPath = fRelPath.isEmpty() ? "" : (fRelPath.startsWith("/") ? fRelPath : locate("data", "konsole/"+fRelPath));
+ if (fPath.isEmpty() || !TQFile::exists(fPath))
return false;
//KONSOLEDEBUG << "Rereading schema file " << fPath << endl;
- FILE *sysin = fopen(QFile::encodeName(fPath),"r");
+ FILE *sysin = fopen(TQFile::encodeName(fPath),"r");
if (!sysin)
{
int e = errno;
@@ -313,7 +313,7 @@ bool ColorSchema::rereadSchemaFile()
char line[100];
- *lastRead = QDateTime::currentDateTime();
+ *lastRead = TQDateTime::currentDateTime();
while (fscanf(sysin,"%80[^\n]\n",line) > 0)
{
@@ -332,7 +332,7 @@ bool ColorSchema::rereadSchemaFile()
if (!strcmp(rend,"full" )) attr = 4; else
continue;
- QString qline(line);
+ TQString qline(line);
m_imagePath = locate("wallpaper", qline.mid( qline.find(" ",7)+1 ) );
m_alignment = attr;
}
@@ -362,7 +362,7 @@ bool ColorSchema::rereadSchemaFile()
if (!(0 <= cv && cv <= 255 )) continue;
if (!(0 <= tr && tr <= 1 )) continue;
if (!(0 <= bo && bo <= 1 )) continue;
- m_table[fi].color = QColor();
+ m_table[fi].color = TQColor();
m_table[fi].color.setHsv(ch,cs,cv);
m_table[fi].transparent = tr;
m_table[fi].bold = bo;
@@ -377,7 +377,7 @@ bool ColorSchema::rereadSchemaFile()
if (!(0 <= cb && cb <= 255 )) continue;
if (!(0 <= tr && tr <= 1 )) continue;
if (!(0 <= bo && bo <= 1 )) continue;
- m_table[fi].color = QColor(cr,cg,cb);
+ m_table[fi].color = TQColor(cr,cg,cb);
m_table[fi].transparent = tr;
m_table[fi].bold = bo;
}
@@ -412,7 +412,7 @@ bool ColorSchema::rereadSchemaFile()
bool ColorSchema::hasSchemaFileChanged() const
{
- QString fPath = fRelPath.isEmpty() ? "" : locate("data", "konsole/"+fRelPath);
+ TQString fPath = fRelPath.isEmpty() ? "" : locate("data", "konsole/"+fRelPath);
//KONSOLEDEBUG << "Checking schema file " << fPath << endl;
@@ -421,11 +421,11 @@ bool ColorSchema::hasSchemaFileChanged() const
//
if (fPath.isEmpty()) return false;
- QFileInfo i(fPath);
+ TQFileInfo i(fPath);
if (i.exists())
{
- QDateTime written = i.lastModified();
+ TQDateTime written = i.lastModified();
if (written != (*lastRead))
{
@@ -446,7 +446,7 @@ bool ColorSchema::hasSchemaFileChanged() const
}
}
-void ColorSchema::updateLastRead(const QDateTime& dt)
+void ColorSchema::updateLastRead(const TQDateTime& dt)
{
if (lastRead)
{
@@ -456,7 +456,7 @@ void ColorSchema::updateLastRead(const QDateTime& dt)
ColorSchemaList::ColorSchemaList() :
- QPtrList<ColorSchema> ()
+ TQPtrList<ColorSchema> ()
{
// KONSOLEDEBUG << "Got new color list" << endl;
@@ -473,7 +473,7 @@ ColorSchemaList::~ColorSchemaList()
}
-ColorSchema *ColorSchemaList::find(const QString& path)
+ColorSchema *ColorSchemaList::find(const TQString& path)
{
if (path.isEmpty())
return find(0);
@@ -525,18 +525,18 @@ ColorSchema *ColorSchemaList::find(int i)
return 0;
}
-bool ColorSchemaList::updateAllSchemaTimes(const QDateTime& now)
+bool ColorSchemaList::updateAllSchemaTimes(const TQDateTime& now)
{
// KONSOLEDEBUG << "Updating time stamps" << endl;
- QStringList list;
+ TQStringList list;
KGlobal::dirs()->findAllResources("data", "konsole/*.schema", false, true, list);
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
bool r = false;
for (it=list.begin(); it!=list.end(); ++it)
{
- QString filename=*it;
+ TQString filename=*it;
int j=filename.findRev('/');
if (j>-1)
filename = filename.mid(8);
@@ -571,7 +571,7 @@ bool ColorSchemaList::updateAllSchemaTimes(const QDateTime& now)
return r;
}
-bool ColorSchemaList::deleteOldSchemas(const QDateTime& now)
+bool ColorSchemaList::deleteOldSchemas(const TQDateTime& now)
{
// KONSOLEDEBUG << "Checking for vanished schemas" << endl;
@@ -615,7 +615,7 @@ bool ColorSchemaList::checkSchemas()
// now.
//
//
- QDateTime now = QDateTime::currentDateTime();
+ TQDateTime now = TQDateTime::currentDateTime();
r = updateAllSchemaTimes(now);
@@ -624,11 +624,11 @@ bool ColorSchemaList::checkSchemas()
return r;
}
-int ColorSchemaList::compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2)
+int ColorSchemaList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2)
{
ColorSchema* schema1=(ColorSchema*)item1;
ColorSchema* schema2=(ColorSchema*)item2;
- return -1*QString::compare(schema1->title(),schema2->title());
+ return -1*TQString::compare(schema1->title(),schema2->title());
}
diff --git a/konsole/konsole/schema.h b/konsole/konsole/schema.h
index 3ba718350..fc222ebe5 100644
--- a/konsole/konsole/schema.h
+++ b/konsole/konsole/schema.h
@@ -41,8 +41,8 @@
#ifndef SCHEMA_include
#define SCHEMA_include
-#include <qstring.h>
-#include <qptrlist.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
#include "TECommon.h"
@@ -68,7 +68,7 @@ public:
* If the given pathname does not exist, a ColorSchema
* with the same settings as the default schema is returned.
*/
- ColorSchema(const QString& pathname);
+ ColorSchema(const TQString& pathname);
~ColorSchema();
/**
* Construct a color schema from the given config file.
@@ -83,7 +83,7 @@ public:
*/
ColorSchema();
- QString relPath() const { return fRelPath; } ;
+ TQString relPath() const { return fRelPath; } ;
/**
* Check if the schema file whose pathname was given
@@ -101,21 +101,21 @@ public:
* Writes a ColorSchema to a config file with the
* given name.
*/
- void writeConfig(const QString& filename) const;
+ void writeConfig(const TQString& filename) const;
/**
* Returns the (non-i18n) name of the i'th color,
- * or QString::null if i is not a color name. This
+ * or TQString::null if i is not a color name. This
* should be used as a group name to store the
* information about the i'th color.
*/
- static QString colorName(int i);
+ static TQString colorName(int i);
/**
* Update the timestamp in the color schema indicating
* when the schema's file whas last checked and read.
*/
- void updateLastRead(const QDateTime& dt);
+ void updateLastRead(const TQDateTime& dt);
protected:
@@ -137,19 +137,19 @@ protected:
* under the given name (ie. in the group name).
*/
void writeConfigColor(KConfig& c,
- const QString& name,
+ const TQString& name,
const ColorEntry& e) const;
/**
* Read a single ColorEntry from the config file.
*/
void readConfigColor(KConfig& c,
- const QString& name,
+ const TQString& name,
ColorEntry& e) ;
public:
int numb() {if (!m_fileRead) rereadSchemaFile();return m_numb;};
- const QString& title() {if (!m_fileRead) rereadSchemaFile();return m_title;};
- const QString& imagePath() {if (!m_fileRead) rereadSchemaFile();return m_imagePath;};
+ const TQString& title() {if (!m_fileRead) rereadSchemaFile();return m_title;};
+ const TQString& imagePath() {if (!m_fileRead) rereadSchemaFile();return m_imagePath;};
int alignment() {if (!m_fileRead) rereadSchemaFile();return m_alignment;};
const ColorEntry* table() {if (!m_fileRead) rereadSchemaFile();return m_table;};
bool useTransparency() {if (!m_fileRead) rereadSchemaFile();return m_useTransparency;};
@@ -157,38 +157,38 @@ protected:
int tr_r() {if (!m_fileRead) rereadSchemaFile();return m_tr_r;};
int tr_g() {if (!m_fileRead) rereadSchemaFile();return m_tr_g;};
int tr_b() {if (!m_fileRead) rereadSchemaFile();return m_tr_b;};
- QDateTime* getLastRead() {return lastRead;}; // Time last checked for updates
+ TQDateTime* getLastRead() {return lastRead;}; // Time last checked for updates
private:
int m_numb;
int m_tr_r, m_tr_g, m_tr_b;
int m_alignment;
- QString m_title;
- QString m_imagePath;
+ TQString m_title;
+ TQString m_imagePath;
ColorEntry m_table[TABLE_COLORS];
bool m_useTransparency:1;
bool m_fileRead:1;
double m_tr_x;
- QString fRelPath; // File name of schema file
+ TQString fRelPath; // File name of schema file
QDateTime *lastRead; // Time last checked for updates
static int serial; // Serial number so that every
// ColorSchema has a unique number.
};
-class ColorSchemaList : protected QPtrList<ColorSchema>
+class ColorSchemaList : protected TQPtrList<ColorSchema>
{
public:
/**
* The following functions are redeclared public since
* they're needed, but we still want to inherit protected
- * from QPtrList to prevent unsightly -- and perhaps dangerous --
+ * from TQPtrList to prevent unsightly -- and perhaps dangerous --
* tampering with the ColorSchemaList.
*/
- uint count() const { return QPtrList<ColorSchema>::count(); } ;
+ uint count() const { return TQPtrList<ColorSchema>::count(); } ;
const ColorSchema *at(unsigned int i)
- { return QPtrList<ColorSchema>::at(i); } ;
+ { return TQPtrList<ColorSchema>::at(i); } ;
- void sort() {QPtrList<ColorSchema>::sort();};
+ void sort() {TQPtrList<ColorSchema>::sort();};
ColorSchemaList();
virtual ~ColorSchemaList();
@@ -206,20 +206,20 @@ public:
* Returns the color schema read from the given path,
* or NULL if no color schema with the given path is found.
*/
- ColorSchema *find(const QString & path);
+ ColorSchema *find(const TQString & path);
/**
* Returns the serial number of the color schema
* with the given serial number, or NULL if there is none.
*/
ColorSchema *find(int);
- ColorSchema *findAny(const QString& path)
+ ColorSchema *findAny(const TQString& path)
{
ColorSchema *p = find(path);
if (p) return p;
return defaultSchema;
} ;
protected:
- virtual int compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2);
+ virtual int compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2);
private:
/**
@@ -229,8 +229,8 @@ private:
* can still be found, and deleteOldSchema's does the
* actual removal of schema's without a config file.
*/
- bool updateAllSchemaTimes(const QDateTime&);
- bool deleteOldSchemas(const QDateTime&);
+ bool updateAllSchemaTimes(const TQDateTime&);
+ bool deleteOldSchemas(const TQDateTime&);
/**
* This isn't really used, but it could be. A newly
diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp
index 2310255a8..53990af2f 100644
--- a/konsole/konsole/session.cpp
+++ b/konsole/konsole/session.cpp
@@ -32,10 +32,10 @@
#include <kstandarddirs.h>
#include <stdlib.h>
-#include <qfile.h>
-#include <qdir.h>
-#include <qregexp.h>
-#include <qtextedit.h>
+#include <tqfile.h>
+#include <tqdir.h>
+#include <tqregexp.h>
+#include <tqtextedit.h>
/*! \class TESession
@@ -47,7 +47,7 @@
of the abilities of the framework - multible sessions.
*/
-TESession::TESession(TEWidget* _te, const QString &_term, ulong _winId, const QString &_sessionId, const QString &_initial_cwd)
+TESession::TESession(TEWidget* _te, const TQString &_term, ulong _winId, const TQString &_sessionId, const TQString &_initial_cwd)
: DCOPObject( _sessionId.latin1() )
, sh(0)
, connected(true)
@@ -62,8 +62,8 @@ TESession::TESession(TEWidget* _te, const QString &_term, ulong _winId, const QS
, silence_seconds(10)
, add_to_utmp(true)
, xon_xoff(false)
- , pgm(QString())
- , args(QStrList())
+ , pgm(TQString())
+ , args(TQStrList())
, sessionId(_sessionId)
, cwd("")
, initial_cwd(_initial_cwd)
@@ -78,10 +78,10 @@ TESession::TESession(TEWidget* _te, const QString &_term, ulong _winId, const QS
em = new TEmuVt102(te);
font_h = te-> fontHeight();
font_w = te-> fontWidth();
- QObject::connect(te,SIGNAL(changedContentSizeSignal(int,int)),
- this,SLOT(onContentSizeChange(int,int)));
- QObject::connect(te,SIGNAL(changedFontMetricSignal(int,int)),
- this,SLOT(onFontMetricChange(int,int)));
+ TQObject::connect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)),
+ this,TQT_SLOT(onContentSizeChange(int,int)));
+ TQObject::connect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)),
+ this,TQT_SLOT(onFontMetricChange(int,int)));
term = _term;
winId = _winId;
@@ -89,17 +89,17 @@ TESession::TESession(TEWidget* _te, const QString &_term, ulong _winId, const QS
setPty( new TEPty() );
- connect( em, SIGNAL( changeTitle( int, const QString & ) ),
- this, SLOT( setUserTitle( int, const QString & ) ) );
- connect( em, SIGNAL( notifySessionState(int) ),
- this, SLOT( notifySessionState(int) ) );
- monitorTimer = new QTimer(this);
- connect(monitorTimer, SIGNAL(timeout()), this, SLOT(monitorTimerDone()));
+ connect( em, TQT_SIGNAL( changeTitle( int, const TQString & ) ),
+ this, TQT_SLOT( setUserTitle( int, const TQString & ) ) );
+ connect( em, TQT_SIGNAL( notifySessionState(int) ),
+ this, TQT_SLOT( notifySessionState(int) ) );
+ monitorTimer = new TQTimer(this);
+ connect(monitorTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(monitorTimerDone()));
- connect( em, SIGNAL( zmodemDetected() ), this, SLOT(slotZModemDetected()));
+ connect( em, TQT_SIGNAL( zmodemDetected() ), this, TQT_SLOT(slotZModemDetected()));
- connect( em, SIGNAL( changeTabTextColor( int ) ),
- this, SLOT( changeTabTextColor( int ) ) );
+ connect( em, TQT_SIGNAL( changeTabTextColor( int ) ),
+ this, TQT_SLOT( changeTabTextColor( int ) ) );
//kdDebug(1211)<<"TESession ctor() done"<<endl;
}
@@ -110,23 +110,23 @@ void TESession::setPty(TEPty *_sh)
delete sh;
}
sh = _sh;
- connect( sh, SIGNAL( forkedChild() ),
- this, SIGNAL( forkedChild() ));
+ connect( sh, TQT_SIGNAL( forkedChild() ),
+ this, TQT_SIGNAL( forkedChild() ));
//kdDebug(1211)<<"TESession ctor() sh->setSize()"<<endl;
sh->setSize(te->Lines(),te->Columns()); // not absolutely nessesary
sh->useUtf8(em->utf8());
//kdDebug(1211)<<"TESession ctor() connecting"<<endl;
- connect( sh,SIGNAL(block_in(const char*,int)),this,SLOT(onRcvBlock(const char*,int)) );
+ connect( sh,TQT_SIGNAL(block_in(const char*,int)),this,TQT_SLOT(onRcvBlock(const char*,int)) );
- connect( em,SIGNAL(sndBlock(const char*,int)),sh,SLOT(send_bytes(const char*,int)) );
- connect( em,SIGNAL(lockPty(bool)),sh,SLOT(lockPty(bool)) );
- connect( em,SIGNAL(useUtf8(bool)),sh,SLOT(useUtf8(bool)) );
+ connect( em,TQT_SIGNAL(sndBlock(const char*,int)),sh,TQT_SLOT(send_bytes(const char*,int)) );
+ connect( em,TQT_SIGNAL(lockPty(bool)),sh,TQT_SLOT(lockPty(bool)) );
+ connect( em,TQT_SIGNAL(useUtf8(bool)),sh,TQT_SLOT(useUtf8(bool)) );
- connect( sh,SIGNAL(done(int)), this,SLOT(done(int)) );
+ connect( sh,TQT_SIGNAL(done(int)), this,TQT_SLOT(done(int)) );
if (!sh->error().isEmpty())
- QTimer::singleShot(0, this, SLOT(ptyError()));
+ TQTimer::singleShot(0, this, TQT_SLOT(ptyError()));
}
void TESession::ptyError()
@@ -143,10 +143,10 @@ void TESession::ptyError()
void TESession::changeWidget(TEWidget* w)
{
- QObject::disconnect(te,SIGNAL(changedContentSizeSignal(int,int)),
- this,SLOT(onContentSizeChange(int,int)));
- QObject::disconnect(te,SIGNAL(changedFontMetricSignal(int,int)),
- this,SLOT(onFontMetricChange(int,int)));
+ TQObject::disconnect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)),
+ this,TQT_SLOT(onContentSizeChange(int,int)));
+ TQObject::disconnect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)),
+ this,TQT_SLOT(onFontMetricChange(int,int)));
te=w;
em->changeGUI(w);
font_h = te->fontHeight();
@@ -155,13 +155,13 @@ void TESession::changeWidget(TEWidget* w)
te->setDefaultBackColor(modifiedBackground);
- QObject::connect(te,SIGNAL(changedContentSizeSignal(int,int)),
- this,SLOT(onContentSizeChange(int,int)));
- QObject::connect(te,SIGNAL(changedFontMetricSignal(int,int)),
- this,SLOT(onFontMetricChange(int,int)));
+ TQObject::connect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)),
+ this,TQT_SLOT(onContentSizeChange(int,int)));
+ TQObject::connect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)),
+ this,TQT_SLOT(onFontMetricChange(int,int)));
}
-void TESession::setProgram( const QString &_pgm, const QStrList &_args )
+void TESession::setProgram( const TQString &_pgm, const TQStrList &_args )
{
pgm = _pgm;
args = _args;
@@ -171,35 +171,35 @@ void TESession::run()
{
// Upon a KPty error, there is no description on what that error was...
// Check to see if the given program is executable.
- QString exec = QFile::encodeName(pgm);
+ TQString exec = TQFile::encodeName(pgm);
exec = KRun::binaryName(exec, false);
exec = KShell::tildeExpand(exec);
- QString pexec = KGlobal::dirs()->findExe(exec);
+ TQString pexec = KGlobal::dirs()->findExe(exec);
if ( pexec.isEmpty() ) {
kdError()<<"can not execute "<<exec<<endl;
- QTimer::singleShot(1, this, SLOT(done()));
+ TQTimer::singleShot(1, this, TQT_SLOT(done()));
return;
}
- QString appId=kapp->dcopClient()->appId();
+ TQString appId=kapp->dcopClient()->appId();
- QString cwd_save = QDir::currentDirPath();
+ TQString cwd_save = TQDir::currentDirPath();
if (!initial_cwd.isEmpty())
- QDir::setCurrent(initial_cwd);
+ TQDir::setCurrent(initial_cwd);
sh->setXonXoff(xon_xoff);
- int result = sh->run(QFile::encodeName(pgm), args, term.latin1(),
+ int result = sh->run(TQFile::encodeName(pgm), args, term.latin1(),
winId, add_to_utmp,
("DCOPRef("+appId+",konsole)").latin1(),
("DCOPRef("+appId+","+sessionId+")").latin1());
if (result < 0) { // Error in opening pseudo teletype
kdWarning()<<"Unable to open a pseudo teletype!"<<endl;
- QTimer::singleShot(0, this, SLOT(ptyError()));
+ TQTimer::singleShot(0, this, TQT_SLOT(ptyError()));
}
sh->setErase(em->getErase());
if (!initial_cwd.isEmpty())
- QDir::setCurrent(cwd_save);
+ TQDir::setCurrent(cwd_save);
else
initial_cwd=cwd_save;
@@ -211,7 +211,7 @@ void TESession::changeTabTextColor( int color )
emit changeTabTextColor( this, color );
}
-void TESession::setUserTitle( int what, const QString &caption )
+void TESession::setUserTitle( int what, const TQString &caption )
{
// (btw: what=0 changes title and icon, what=1 only icon, what=2 only title
if ((what == 0) || (what == 2))
@@ -219,8 +219,8 @@ void TESession::setUserTitle( int what, const QString &caption )
if ((what == 0) || (what == 1))
iconText = caption;
if (what == 11) {
- QString colorString = caption.section(';',0,0);
- QColor backColor = QColor(colorString);
+ TQString colorString = caption.section(';',0,0);
+ TQColor backColor = TQColor(colorString);
if (backColor.isValid()){// change color via \033]11;Color\007
if (backColor != modifiedBackground) {
modifiedBackground = backColor;
@@ -232,7 +232,7 @@ void TESession::setUserTitle( int what, const QString &caption )
renameSession(caption);
if (what == 31) {
cwd=caption;
- cwd=cwd.replace( QRegExp("^~"), QDir::homeDirPath() );
+ cwd=cwd.replace( TQRegExp("^~"), TQDir::homeDirPath() );
emit openURLRequest(cwd);
}
if (what == 32) { // change icon via \033]32;Icon\007
@@ -243,9 +243,9 @@ void TESession::setUserTitle( int what, const QString &caption )
emit updateTitle(this);
}
-QString TESession::fullTitle() const
+TQString TESession::fullTitle() const
{
- QString res = title;
+ TQString res = title;
if ( !userTitle.isEmpty() )
res = userTitle + " - " + res;
return res;
@@ -311,12 +311,12 @@ bool TESession::closeSession()
if (!sh->isRunning() || !sendSignal(SIGHUP))
{
// Forced close.
- QTimer::singleShot(1, this, SLOT(done()));
+ TQTimer::singleShot(1, this, TQT_SLOT(done()));
}
return true;
}
-void TESession::feedSession(const QString &text)
+void TESession::feedSession(const TQString &text)
{
emit disableMasterModeConnections();
setListenToKeyPress(true);
@@ -325,14 +325,14 @@ void TESession::feedSession(const QString &text)
emit enableMasterModeConnections();
}
-void TESession::sendSession(const QString &text)
+void TESession::sendSession(const TQString &text)
{
- QString newtext=text;
+ TQString newtext=text;
newtext.append("\r");
feedSession(newtext);
}
-void TESession::renameSession(const QString &name)
+void TESession::renameSession(const TQString &name)
{
title=name;
emit renameSession(this,name);
@@ -341,8 +341,8 @@ void TESession::renameSession(const QString &name)
TESession::~TESession()
{
//kdDebug(1211) << "disconnnecting..." << endl;
- QObject::disconnect( sh, SIGNAL( done(int) ),
- this, SLOT( done(int) ) );
+ TQObject::disconnect( sh, TQT_SIGNAL( done(int) ),
+ this, TQT_SLOT( done(int) ) );
delete em;
delete sh;
@@ -419,7 +419,7 @@ int TESession::keymapNo()
return em->keymapNo();
}
-QString TESession::keymap()
+TQString TESession::keymap()
{
return em->keymap();
}
@@ -429,12 +429,12 @@ int TESession::fontNo()
return font_no;
}
-const QString & TESession::Term()
+const TQString & TESession::Term()
{
return term;
}
-const QString & TESession::SessionId()
+const TQString & TESession::SessionId()
{
return sessionId;
}
@@ -454,7 +454,7 @@ void TESession::setKeymapNo(int kn)
em->setKeymap(kn);
}
-void TESession::setKeymap(const QString &id)
+void TESession::setKeymap(const TQString &id)
{
em->setKeymap(id);
}
@@ -464,39 +464,39 @@ void TESession::setFontNo(int fn)
font_no = fn;
}
-void TESession::setTitle(const QString& _title)
+void TESession::setTitle(const TQString& _title)
{
title = _title;
//kdDebug(1211)<<"Session setTitle " << title <<endl;
}
-const QString& TESession::Title()
+const TQString& TESession::Title()
{
return title;
}
-void TESession::setIconName(const QString& _iconName)
+void TESession::setIconName(const TQString& _iconName)
{
iconName = _iconName;
}
-void TESession::setIconText(const QString& _iconText)
+void TESession::setIconText(const TQString& _iconText)
{
iconText = _iconText;
//kdDebug(1211)<<"Session setIconText " << iconText <<endl;
}
-const QString& TESession::IconName()
+const TQString& TESession::IconName()
{
return iconName;
}
-const QString& TESession::IconText()
+const TQString& TESession::IconText()
{
return iconText;
}
-bool TESession::testAndSetStateIconName (const QString& newname)
+bool TESession::testAndSetStateIconName (const TQString& newname)
{
if (newname != stateIconName)
{
@@ -528,21 +528,21 @@ void TESession::clearHistory()
}
}
-QStrList TESession::getArgs()
+TQStrList TESession::getArgs()
{
return args;
}
-QString TESession::getPgm()
+TQString TESession::getPgm()
{
return pgm;
}
-QString TESession::getCwd()
+TQString TESession::getCwd()
{
#ifdef HAVE_PROC_CWD
if (cwd.isEmpty()) {
- QFileInfo Cwd(QString("/proc/%1/cwd").arg(sh->pid()));
+ TQFileInfo Cwd(TQString("/proc/%1/cwd").arg(sh->pid()));
if(Cwd.isSymLink())
return Cwd.readLink();
}
@@ -599,7 +599,7 @@ void TESession::slotZModemDetected()
{
if (!zmodemBusy)
{
- QTimer::singleShot(10, this, SLOT(emitZModemDetected()));
+ TQTimer::singleShot(10, this, TQT_SLOT(emitZModemDetected()));
zmodemBusy = true;
}
}
@@ -615,13 +615,13 @@ void TESession::cancelZModem()
zmodemBusy = false;
}
-void TESession::startZModem(const QString &zmodem, const QString &dir, const QStringList &list)
+void TESession::startZModem(const TQString &zmodem, const TQString &dir, const TQStringList &list)
{
zmodemBusy = true;
zmodemProc = new KProcIO;
(*zmodemProc) << zmodem << "-v";
- for(QStringList::ConstIterator it = list.begin();
+ for(TQStringList::ConstIterator it = list.begin();
it != list.end();
++it)
{
@@ -633,23 +633,23 @@ void TESession::startZModem(const QString &zmodem, const QString &dir, const QSt
zmodemProc->start(KProcIO::NotifyOnExit, false);
// Override the read-processing of KProcIO
- disconnect(zmodemProc,SIGNAL (receivedStdout (KProcess *, char *, int)), 0, 0);
- connect(zmodemProc,SIGNAL (receivedStdout (KProcess *, char *, int)),
- this, SLOT(zmodemSendBlock(KProcess *, char *, int)));
- connect(zmodemProc,SIGNAL (receivedStderr (KProcess *, char *, int)),
- this, SLOT(zmodemStatus(KProcess *, char *, int)));
- connect(zmodemProc,SIGNAL (processExited(KProcess *)),
- this, SLOT(zmodemDone()));
-
- disconnect( sh,SIGNAL(block_in(const char*,int)), this, SLOT(onRcvBlock(const char*,int)) );
- connect( sh,SIGNAL(block_in(const char*,int)), this, SLOT(zmodemRcvBlock(const char*,int)) );
- connect( sh,SIGNAL(buffer_empty()), this, SLOT(zmodemContinue()));
+ disconnect(zmodemProc,TQT_SIGNAL (receivedStdout (KProcess *, char *, int)), 0, 0);
+ connect(zmodemProc,TQT_SIGNAL (receivedStdout (KProcess *, char *, int)),
+ this, TQT_SLOT(zmodemSendBlock(KProcess *, char *, int)));
+ connect(zmodemProc,TQT_SIGNAL (receivedStderr (KProcess *, char *, int)),
+ this, TQT_SLOT(zmodemStatus(KProcess *, char *, int)));
+ connect(zmodemProc,TQT_SIGNAL (processExited(KProcess *)),
+ this, TQT_SLOT(zmodemDone()));
+
+ disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) );
+ connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(zmodemRcvBlock(const char*,int)) );
+ connect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue()));
zmodemProgress = new ZModemDialog(te->topLevelWidget(), false,
i18n("ZModem Progress"));
- connect(zmodemProgress, SIGNAL(user1Clicked()),
- this, SLOT(zmodemDone()));
+ connect(zmodemProgress, TQT_SIGNAL(user1Clicked()),
+ this, TQT_SLOT(zmodemDone()));
zmodemProgress->show();
}
@@ -673,12 +673,12 @@ void TESession::zmodemContinue()
void TESession::zmodemStatus(KProcess *, char *data, int len)
{
- QCString msg(data, len+1);
+ TQCString msg(data, len+1);
while(!msg.isEmpty())
{
int i = msg.find('\015');
int j = msg.find('\012');
- QCString txt;
+ TQCString txt;
if ((i != -1) && ((j == -1) || (i < j)))
{
msg = msg.mid(i+1);
@@ -694,13 +694,13 @@ void TESession::zmodemStatus(KProcess *, char *data, int len)
msg.truncate(0);
}
if (!txt.isEmpty())
- zmodemProgress->addProgressText(QString::fromLocal8Bit(txt));
+ zmodemProgress->addProgressText(TQString::fromLocal8Bit(txt));
}
}
void TESession::zmodemRcvBlock(const char *data, int len)
{
- QByteArray ba;
+ TQByteArray ba;
ba.duplicate(data, len);
zmodemProc->writeStdin(ba);
// qWarning("--> %d bytes", len);
@@ -714,9 +714,9 @@ void TESession::zmodemDone()
zmodemProc = 0;
zmodemBusy = false;
- disconnect( sh,SIGNAL(block_in(const char*,int)), this ,SLOT(zmodemRcvBlock(const char*,int)) );
- disconnect( sh,SIGNAL(buffer_empty()), this, SLOT(zmodemContinue()));
- connect( sh,SIGNAL(block_in(const char*,int)), this, SLOT(onRcvBlock(const char*,int)) );
+ disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this ,TQT_SLOT(zmodemRcvBlock(const char*,int)) );
+ disconnect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue()));
+ connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) );
sh->send_bytes("\030\030\030\030", 4); // Abort
sh->send_bytes("\001\013\n", 3); // Try to get prompt back
@@ -725,23 +725,23 @@ void TESession::zmodemDone()
}
-bool TESession::processDynamic(const QCString &fun, const QByteArray &data, QCString& replyType, QByteArray &replyData)
+bool TESession::processDynamic(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData)
{
if (fullScripting)
{
- if (fun == "feedSession(QString)")
+ if (fun == "feedSession(TQString)")
{
- QString arg0;
- QDataStream arg( data, IO_ReadOnly );
+ TQString arg0;
+ TQDataStream arg( data, IO_ReadOnly );
arg >> arg0;
feedSession(arg0);
replyType = "void";
return true;
}
- else if (fun == "sendSession(QString)")
+ else if (fun == "sendSession(TQString)")
{
- QString arg0;
- QDataStream arg( data, IO_ReadOnly );
+ TQString arg0;
+ TQDataStream arg( data, IO_ReadOnly );
arg >> arg0;
sendSession(arg0);
replyType = "void";
@@ -757,8 +757,8 @@ QCStringList TESession::functionsDynamic()
QCStringList funcs = SessionIface::functionsDynamic();
if (fullScripting)
{
- funcs << "void feedSession(QString text)";
- funcs << "void sendSession(QString text)";
+ funcs << "void feedSession(TQString text)";
+ funcs << "void sendSession(TQString text)";
}
return funcs;
}
@@ -767,67 +767,67 @@ QCStringList TESession::functionsDynamic()
void TESession::onRcvBlock( const char* buf, int len )
{
em->onRcvBlock( buf, len );
- emit receivedData( QString::fromLatin1( buf, len ) );
+ emit receivedData( TQString::fromLatin1( buf, len ) );
}
-void TESession::print( QPainter &paint, bool friendly, bool exact )
+void TESession::print( TQPainter &paint, bool friendly, bool exact )
{
te->print(paint, friendly, exact);
}
-QString TESession::schema()
+TQString TESession::schema()
{
- QString currentSchema;
+ TQString currentSchema;
emit getSessionSchema(this, currentSchema);
return currentSchema;
}
-void TESession::setSchema(const QString &schema)
+void TESession::setSchema(const TQString &schema)
{
emit setSessionSchema(this, schema);
}
-QString TESession::font()
+TQString TESession::font()
{
return te->getVTFont().toString();
}
-void TESession::setFont(const QString &font)
+void TESession::setFont(const TQString &font)
{
- QFont tmp;
+ TQFont tmp;
if (tmp.fromString(font))
te->setVTFont(tmp);
else
kdWarning()<<"unknown font: "<<font<<endl;
}
-QString TESession::encoding()
+TQString TESession::encoding()
{
return em->codec()->name();
}
-void TESession::setEncoding(const QString &encoding)
+void TESession::setEncoding(const TQString &encoding)
{
emit setSessionEncoding(this, encoding);
}
-QString TESession::keytab()
+TQString TESession::keytab()
{
return keymap();
}
-void TESession::setKeytab(const QString &keytab)
+void TESession::setKeytab(const TQString &keytab)
{
setKeymap(keytab);
emit updateSessionConfig(this);
}
-QSize TESession::size()
+TQSize TESession::size()
{
return em->imageSize();
}
-void TESession::setSize(QSize size)
+void TESession::setSize(TQSize size)
{
if ((size.width() <= 1) || (size.height() <= 1))
return;
diff --git a/konsole/konsole/session.h b/konsole/konsole/session.h
index 90352cb5e..cbe41ab50 100644
--- a/konsole/konsole/session.h
+++ b/konsole/konsole/session.h
@@ -23,7 +23,7 @@
#include <kapplication.h>
#include <kmainwindow.h>
-#include <qstrlist.h>
+#include <tqstrlist.h>
#include "TEPty.h"
#include "TEWidget.h"
@@ -35,14 +35,14 @@ class KProcIO;
class KProcess;
class ZModemDialog;
-class TESession : public QObject, virtual public SessionIface
+class TESession : public TQObject, virtual public SessionIface
{ Q_OBJECT
public:
TESession(TEWidget* w,
- const QString &term, ulong winId, const QString &sessionId="session-1",
- const QString &initial_cwd = QString::null);
+ const TQString &term, ulong winId, const TQString &sessionId="session-1",
+ const TQString &initial_cwd = TQString::null);
void changeWidget(TEWidget* w);
void setPty( TEPty *_sh );
TEWidget* widget() { return te; }
@@ -58,19 +58,19 @@ public:
int schemaNo();
int encodingNo();
int fontNo();
- const QString& Term();
- const QString& SessionId();
- const QString& Title();
- const QString& IconName();
- const QString& IconText();
- QString fullTitle() const;
+ const TQString& Term();
+ const TQString& SessionId();
+ const TQString& Title();
+ const TQString& IconName();
+ const TQString& IconText();
+ TQString fullTitle() const;
int keymapNo();
- QString keymap();
- QStrList getArgs();
- QString getPgm();
- QString getCwd();
- QString getInitial_cwd() { return initial_cwd; }
- void setInitial_cwd(const QString& _cwd) { initial_cwd=_cwd; }
+ TQString keymap();
+ TQStrList getArgs();
+ TQString getPgm();
+ TQString getCwd();
+ TQString getInitial_cwd() { return initial_cwd; }
+ void setInitial_cwd(const TQString& _cwd) { initial_cwd=_cwd; }
void setHistory(const HistoryType&);
const HistoryType& history();
@@ -82,14 +82,14 @@ public:
void setSchemaNo(int sn);
void setEncodingNo(int index);
void setKeymapNo(int kn);
- void setKeymap(const QString& _id);
+ void setKeymap(const TQString& _id);
void setFontNo(int fn);
- void setTitle(const QString& _title);
- void setIconName(const QString& _iconName);
- void setIconText(const QString& _iconText);
+ void setTitle(const TQString& _title);
+ void setIconName(const TQString& _iconName);
+ void setIconText(const TQString& _iconText);
void setAddToUtmp(bool);
void setXonXoff(bool);
- bool testAndSetStateIconName (const QString& newname);
+ bool testAndSetStateIconName (const TQString& newname);
bool sendSignal(int signal);
void setAutoClose(bool b) { autoClose = b; }
@@ -97,41 +97,41 @@ public:
// Additional functions for DCOP
bool closeSession();
void clearHistory();
- void feedSession(const QString &text);
- void sendSession(const QString &text);
- void renameSession(const QString &name);
- QString sessionName() { return title; }
+ void feedSession(const TQString &text);
+ void sendSession(const TQString &text);
+ void renameSession(const TQString &name);
+ TQString sessionName() { return title; }
int sessionPID() { return sh->pid(); }
- virtual bool processDynamic(const QCString &fun, const QByteArray &data, QCString& replyType, QByteArray &replyData);
+ virtual bool processDynamic(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData);
virtual QCStringList functionsDynamic();
void enableFullScripting(bool b) { fullScripting = b; }
- void startZModem(const QString &rz, const QString &dir, const QStringList &list);
+ void startZModem(const TQString &rz, const TQString &dir, const TQStringList &list);
void cancelZModem();
bool zmodemIsBusy() { return zmodemBusy; }
- void print(QPainter &paint, bool friendly, bool exact);
+ void print(TQPainter &paint, bool friendly, bool exact);
- QString schema();
- void setSchema(const QString &schema);
- QString encoding();
- void setEncoding(const QString &encoding);
- QString keytab();
- void setKeytab(const QString &keytab);
- QSize size();
- void setSize(QSize size);
- void setFont(const QString &font);
- QString font();
+ TQString schema();
+ void setSchema(const TQString &schema);
+ TQString encoding();
+ void setEncoding(const TQString &encoding);
+ TQString keytab();
+ void setKeytab(const TQString &keytab);
+ TQSize size();
+ void setSize(TQSize size);
+ void setFont(const TQString &font);
+ TQString font();
public slots:
void run();
- void setProgram( const QString &_pgm, const QStrList &_args );
+ void setProgram( const TQString &_pgm, const TQStrList &_args );
void done();
void done(int);
void terminate();
- void setUserTitle( int, const QString &caption );
+ void setUserTitle( int, const TQString &caption );
void changeTabTextColor( int );
void ptyError();
void slotZModemDetected();
@@ -147,7 +147,7 @@ signals:
void processExited(KProcess *);
void forkedChild();
- void receivedData( const QString& text );
+ void receivedData( const TQString& text );
void done(TESession*);
void updateTitle(TESession*);
void notifySessionState(TESession* session, int state);
@@ -155,16 +155,16 @@ signals:
void disableMasterModeConnections();
void enableMasterModeConnections();
- void renameSession(TESession* ses, const QString &name);
+ void renameSession(TESession* ses, const TQString &name);
- void openURLRequest(const QString &cwd);
+ void openURLRequest(const TQString &cwd);
void zmodemDetected(TESession *);
void updateSessionConfig(TESession *);
- void resizeSession(TESession *session, QSize size);
- void setSessionEncoding(TESession *session, const QString &encoding);
- void getSessionSchema(TESession *session, QString &schema);
- void setSessionSchema(TESession *session, const QString &schema);
+ void resizeSession(TESession *session, TQSize size);
+ void setSessionEncoding(TESession *session, const TQString &encoding);
+ void getSessionSchema(TESession *session, TQString &schema);
+ void setSessionSchema(TESession *session, const TQString &schema);
private slots:
void onRcvBlock( const char* buf, int len );
@@ -186,7 +186,7 @@ private:
bool masterMode;
bool autoClose;
bool wantedClose;
- QTimer* monitorTimer;
+ TQTimer* monitorTimer;
//FIXME: using the indices here
// is propably very bad. We should
@@ -198,25 +198,25 @@ private:
int font_h;
int font_w;
- QString title;
- QString userTitle;
- QString iconName;
- QString iconText; // as set by: echo -en '\033]1;IconText\007
+ TQString title;
+ TQString userTitle;
+ TQString iconName;
+ TQString iconText; // as set by: echo -en '\033]1;IconText\007
bool add_to_utmp;
bool xon_xoff;
bool fullScripting;
QString stateIconName;
- QString pgm;
- QStrList args;
+ TQString pgm;
+ TQStrList args;
- QString term;
+ TQString term;
ulong winId;
- QString sessionId;
+ TQString sessionId;
- QString cwd;
- QString initial_cwd;
+ TQString cwd;
+ TQString initial_cwd;
// ZModem
bool zmodemBusy;
@@ -225,7 +225,7 @@ private:
// Color/Font Changes by ESC Sequences
- QColor modifiedBackground; // as set by: echo -en '\033]11;Color\007
+ TQColor modifiedBackground; // as set by: echo -en '\033]11;Color\007
int encoding_no;
};
diff --git a/konsole/konsole/sessioniface.h b/konsole/konsole/sessioniface.h
index 51ee5ca80..b77e01bda 100644
--- a/konsole/konsole/sessioniface.h
+++ b/konsole/konsole/sessioniface.h
@@ -32,20 +32,20 @@ class SessionIface : virtual public DCOPObject
virtual bool sendSignal(int signal) =0;
virtual void clearHistory() =0;
- virtual void renameSession(const QString &name) =0;
- virtual QString sessionName() =0;
+ virtual void renameSession(const TQString &name) =0;
+ virtual TQString sessionName() =0;
virtual int sessionPID() =0;
- virtual QString schema() =0;
- virtual void setSchema(const QString &schema) =0;
- virtual QString encoding() =0;
- virtual void setEncoding(const QString &encoding) =0;
- virtual QString keytab() =0;
- virtual void setKeytab(const QString &keyboard) =0;
- virtual QSize size() =0;
- virtual void setSize(QSize size) =0;
- virtual QString font() =0;
- virtual void setFont(const QString &font) =0;
+ virtual TQString schema() =0;
+ virtual void setSchema(const TQString &schema) =0;
+ virtual TQString encoding() =0;
+ virtual void setEncoding(const TQString &encoding) =0;
+ virtual TQString keytab() =0;
+ virtual void setKeytab(const TQString &keyboard) =0;
+ virtual TQSize size() =0;
+ virtual void setSize(TQSize size) =0;
+ virtual TQString font() =0;
+ virtual void setFont(const TQString &font) =0;
};
#endif // SESSIONIFACE_H
diff --git a/konsole/konsole/zmodem_dialog.cpp b/konsole/konsole/zmodem_dialog.cpp
index 31148ddc6..421501c40 100644
--- a/konsole/konsole/zmodem_dialog.cpp
+++ b/konsole/konsole/zmodem_dialog.cpp
@@ -18,24 +18,24 @@
#include "zmodem_dialog.h"
-#include <qtextedit.h>
+#include <tqtextedit.h>
#include <klocale.h>
-ZModemDialog::ZModemDialog(QWidget *parent, bool modal, const QString &caption)
+ZModemDialog::ZModemDialog(TQWidget *parent, bool modal, const TQString &caption)
: KDialogBase(parent, "zmodem_progress", modal, caption,
User1|Close, User1, true,
i18n("&Stop"))
{
setEscapeButton(User1);
enableButton(Close, false);
- textEdit = new QTextEdit(this);
+ textEdit = new TQTextEdit(this);
textEdit->setMinimumSize(400, 100);
setMainWidget(textEdit);
- connect(this, SIGNAL(user1Clicked()), this, SLOT(slotClose()));
+ connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClose()));
}
-void ZModemDialog::addProgressText(const QString &txt)
+void ZModemDialog::addProgressText(const TQString &txt)
{
int p = textEdit->paragraphs();
textEdit->insertParagraph(txt, p);
diff --git a/konsole/konsole/zmodem_dialog.h b/konsole/konsole/zmodem_dialog.h
index 045e1c566..26302cdfb 100644
--- a/konsole/konsole/zmodem_dialog.h
+++ b/konsole/konsole/zmodem_dialog.h
@@ -27,12 +27,12 @@ class ZModemDialog : public KDialogBase
{
Q_OBJECT
public:
- ZModemDialog(QWidget *parent, bool modal, const QString &caption);
+ ZModemDialog(TQWidget *parent, bool modal, const TQString &caption);
/**
* Adds a line of text to the progress window
*/
- void addProgressText(const QString &);
+ void addProgressText(const TQString &);
/**
* To indicate the process is finished.
@@ -43,7 +43,7 @@ public slots:
void slotClose();
private:
- QTextEdit *textEdit;
+ TQTextEdit *textEdit;
};
#endif
diff --git a/kpager/config.cpp b/kpager/config.cpp
index 60aa85f2a..5ff0d3def 100644
--- a/kpager/config.cpp
+++ b/kpager/config.cpp
@@ -21,13 +21,13 @@
***************************************************************************/
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
-#include <qwidget.h>
-#include <qvbox.h>
-#include <qhbox.h>
-#include <qlayout.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqbuttongroup.h>
+#include <tqwidget.h>
+#include <tqvbox.h>
+#include <tqhbox.h>
+#include <tqlayout.h>
#include <kdialogbase.h>
#include <klocale.h>
@@ -42,51 +42,51 @@
#include "kpager.h"
-KPagerConfigDialog::KPagerConfigDialog (QWidget *parent)
+KPagerConfigDialog::KPagerConfigDialog (TQWidget *parent)
: KDialogBase ( parent, "configdialog", true, i18n("Configuration"), Ok|Cancel, Ok, true )
{
- QVBox *box = new QVBox( this );
- m_chkWindowDragging=new QCheckBox(i18n("Enable window dragging"),box,0);
+ TQVBox *box = new TQVBox( this );
+ m_chkWindowDragging=new TQCheckBox(i18n("Enable window dragging"),box,0);
(void ) new KSeparator( box );
- connect(m_chkWindowDragging, SIGNAL(toggled(bool)), this, SLOT(enableWindowDragging(bool)));
+ connect(m_chkWindowDragging, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableWindowDragging(bool)));
- QHBox *page = new QHBox( box );
- QVBox *lpage = new QVBox( page );
+ TQHBox *page = new TQHBox( box );
+ TQVBox *lpage = new TQVBox( page );
setMainWidget(box);
- m_chkShowName=new QCheckBox(i18n("Show name"),lpage,0);
- connect(m_chkShowName, SIGNAL(toggled(bool)), this, SLOT(setShowName(bool)));
- m_chkShowNumber=new QCheckBox(i18n("Show number"),lpage,0);
- connect(m_chkShowNumber, SIGNAL(toggled(bool)), this, SLOT(setShowNumber(bool)));
- m_chkShowBackground=new QCheckBox(i18n("Show background"),lpage,0);
- connect(m_chkShowBackground, SIGNAL(toggled(bool)), this, SLOT(setShowBackground(bool)));
- m_chkShowWindows=new QCheckBox(i18n("Show windows"),lpage,0);
- connect(m_chkShowWindows, SIGNAL(toggled(bool)), this, SLOT(setShowWindows(bool)));
+ m_chkShowName=new TQCheckBox(i18n("Show name"),lpage,0);
+ connect(m_chkShowName, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowName(bool)));
+ m_chkShowNumber=new TQCheckBox(i18n("Show number"),lpage,0);
+ connect(m_chkShowNumber, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowNumber(bool)));
+ m_chkShowBackground=new TQCheckBox(i18n("Show background"),lpage,0);
+ connect(m_chkShowBackground, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowBackground(bool)));
+ m_chkShowWindows=new TQCheckBox(i18n("Show windows"),lpage,0);
+ connect(m_chkShowWindows, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowWindows(bool)));
- m_grpWindowDrawMode=new QButtonGroup(i18n("Type of Window"),page);
+ m_grpWindowDrawMode=new TQButtonGroup(i18n("Type of Window"),page);
m_grpWindowDrawMode->setExclusive(true);
- QVBoxLayout *vbox = new QVBoxLayout(m_grpWindowDrawMode, KDialog::marginHint(),
+ TQVBoxLayout *vbox = new TQVBoxLayout(m_grpWindowDrawMode, KDialog::marginHint(),
KDialog::spacingHint());
vbox->addSpacing(fontMetrics().lineSpacing());
- vbox->addWidget(new QRadioButton(i18n("Plain"),m_grpWindowDrawMode));
- vbox->addWidget(new QRadioButton(i18n("Icon"),m_grpWindowDrawMode));
+ vbox->addWidget(new TQRadioButton(i18n("Plain"),m_grpWindowDrawMode));
+ vbox->addWidget(new TQRadioButton(i18n("Icon"),m_grpWindowDrawMode));
- QRadioButton *rbpix = new QRadioButton(i18n("Pixmap"),m_grpWindowDrawMode);
+ TQRadioButton *rbpix = new TQRadioButton(i18n("Pixmap"),m_grpWindowDrawMode);
// rbpix->setEnabled(false);
vbox->addWidget(rbpix);
- connect(m_grpWindowDrawMode, SIGNAL(clicked(int)), this, SLOT(setWindowDrawMode(int)));
+ connect(m_grpWindowDrawMode, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setWindowDrawMode(int)));
- m_grpLayoutType=new QButtonGroup(i18n("Layout"),page);
+ m_grpLayoutType=new TQButtonGroup(i18n("Layout"),page);
m_grpLayoutType->setExclusive(true);
- vbox = new QVBoxLayout(m_grpLayoutType, KDialog::marginHint(), KDialog::spacingHint());
+ vbox = new TQVBoxLayout(m_grpLayoutType, KDialog::marginHint(), KDialog::spacingHint());
vbox->addSpacing(fontMetrics().lineSpacing());
- vbox->addWidget(new QRadioButton(i18n("Classical"),m_grpLayoutType));
- vbox->addWidget(new QRadioButton(i18n("Horizontal"),m_grpLayoutType));
- vbox->addWidget(new QRadioButton(i18n("Vertical"),m_grpLayoutType));
+ vbox->addWidget(new TQRadioButton(i18n("Classical"),m_grpLayoutType));
+ vbox->addWidget(new TQRadioButton(i18n("Horizontal"),m_grpLayoutType));
+ vbox->addWidget(new TQRadioButton(i18n("Vertical"),m_grpLayoutType));
- connect(m_grpLayoutType, SIGNAL(clicked(int)), this, SLOT(setLayout(int)));
- connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
+ connect(m_grpLayoutType, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setLayout(int)));
+ connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotOk()));
loadConfiguration();
setMinimumSize(360, 160);
}
diff --git a/kpager/config.h b/kpager/config.h
index 153e025f9..683ee0176 100644
--- a/kpager/config.h
+++ b/kpager/config.h
@@ -33,7 +33,7 @@ class KPagerConfigDialog : public KDialogBase
Q_OBJECT
public:
- KPagerConfigDialog(QWidget *parent);
+ KPagerConfigDialog(TQWidget *parent);
public slots:
void setShowName(bool show);
@@ -59,13 +59,13 @@ public:
static bool m_windowDragging;
protected:
- QCheckBox *m_chkShowName;
- QCheckBox *m_chkShowNumber;
- QCheckBox *m_chkShowBackground;
- QCheckBox *m_chkShowWindows;
- QButtonGroup *m_grpWindowDrawMode;
- QButtonGroup *m_grpLayoutType;
- QCheckBox* m_chkWindowDragging;
+ TQCheckBox *m_chkShowName;
+ TQCheckBox *m_chkShowNumber;
+ TQCheckBox *m_chkShowBackground;
+ TQCheckBox *m_chkShowWindows;
+ TQButtonGroup *m_grpWindowDrawMode;
+ TQButtonGroup *m_grpLayoutType;
+ TQCheckBox* m_chkWindowDragging;
bool m_tmpShowName;
bool m_tmpShowNumber;
bool m_tmpShowBackground;
diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp
index cb41bb04c..311378171 100644
--- a/kpager/desktop.cpp
+++ b/kpager/desktop.cpp
@@ -39,17 +39,17 @@
#include <kpixmapio.h>
#include <kpopupmenu.h>
#include <netwm.h>
-#include <qcstring.h>
-#include <qpixmap.h>
-#include <qpainter.h>
-#include <qdrawutil.h>
-#include <qpoint.h>
+#include <tqcstring.h>
+#include <tqpixmap.h>
+#include <tqpainter.h>
+#include <tqdrawutil.h>
+#include <tqpoint.h>
#include "desktop.h"
#include "config.h"
#include "windowdrag.h"
-Desktop::Desktop( int desk, QString desktopName, QWidget *parent, const char *name): QWidget(parent,name)
+Desktop::Desktop( int desk, TQString desktopName, TQWidget *parent, const char *name): TQWidget(parent,name)
{
m_desk = desk;
m_name = desktopName;
@@ -74,18 +74,18 @@ Desktop::~Desktop()
delete m_bgSmallPixmap;
}
-void Desktop::mouseMoveEvent( QMouseEvent *ev )
+void Desktop::mouseMoveEvent( TQMouseEvent *ev )
{
if ( !KPagerConfigDialog::m_windowDragging )
return;
if ( (ev->state() & LeftButton) == 0 )
return;
- QPoint p( ev->pos() - pressPos );
+ TQPoint p( ev->pos() - pressPos );
if ( p.manhattanLength() >= qApp->startDragDistance() )
startDrag( pressPos );
}
-void Desktop::mousePressEvent( QMouseEvent * ev)
+void Desktop::mousePressEvent( TQMouseEvent * ev)
{
bool showWindows= KPagerConfigDialog::m_showWindows;
if (ev->button()==LeftButton){
@@ -94,7 +94,7 @@ void Desktop::mousePressEvent( QMouseEvent * ev)
else if ((ev->button()==MidButton)&&(showWindows))
startDrag(ev->pos());
else if (ev->button()==RightButton) {
- QPoint pos;
+ TQPoint pos;
KWin::WindowInfo *info = windowAtPosition(ev->pos(), &pos);
if ( info && showWindows )
pager()->showPopupMenu(info->win(), mapToGlobal(ev->pos()));
@@ -103,14 +103,14 @@ void Desktop::mousePressEvent( QMouseEvent * ev)
}
}
-void Desktop::mouseReleaseEvent( QMouseEvent *ev )
+void Desktop::mouseReleaseEvent( TQMouseEvent *ev )
{
/** Note that mouseReleaseEvent is not called when releasing the mouse
to drop a window in this desktop */
if (ev->button()==LeftButton)
{
bool showWindows= KPagerConfigDialog::m_showWindows;
- QPoint pos;
+ TQPoint pos;
KWin::setCurrentDesktop(m_desk);
if (showWindows)
{
@@ -126,14 +126,14 @@ void Desktop::mouseReleaseEvent( QMouseEvent *ev )
}
}
-KWin::WindowInfo *Desktop::windowAtPosition(const QPoint &p, QPoint *internalpos)
+KWin::WindowInfo *Desktop::windowAtPosition(const TQPoint &p, TQPoint *internalpos)
{
- QRect r;
- const QValueList<WId> &list(pager()->kwin()->stackingOrder());
+ TQRect r;
+ const TQValueList<WId> &list(pager()->kwin()->stackingOrder());
if (list.count() <= 0)
return 0L;
- for (QValueList<WId>::ConstIterator it = list.fromLast(); ; --it)
+ for (TQValueList<WId>::ConstIterator it = list.fromLast(); ; --it)
{
KWin::WindowInfo* info = pager()->info( *it );
if (shouldPaintWindow(info))
@@ -157,9 +157,9 @@ KWin::WindowInfo *Desktop::windowAtPosition(const QPoint &p, QPoint *internalpos
return 0L;
}
-void Desktop::convertRectS2P(QRect &r)
+void Desktop::convertRectS2P(TQRect &r)
{
- QRect tmp(r);
+ TQRect tmp(r);
r.setRect(deskX()+tmp.x()*deskWidth()/kapp->desktop()->width(),
deskY()+tmp.y()*deskHeight()/kapp->desktop()->height(),
tmp.width()*deskWidth()/kapp->desktop()->width(),
@@ -172,25 +172,25 @@ void Desktop::convertCoordP2S(int &x, int &y)
y=(y-deskY())*(kapp->desktop()->height())/deskHeight();
}
-QPixmap scalePixmap(const QPixmap &pixmap, int width, int height)
+TQPixmap scalePixmap(const TQPixmap &pixmap, int width, int height)
{
if (pixmap.width()>100)
{
KPixmapIO io;
- QImage img(io.convertToImage(pixmap));
+ TQImage img(io.convertToImage(pixmap));
return io.convertToPixmap(img.smoothScale(width,height));
}
- QImage img(pixmap.convertToImage().smoothScale(width,height));
- QPixmap pix;
+ TQImage img(pixmap.convertToImage().smoothScale(width,height));
+ TQPixmap pix;
pix.convertFromImage(img);
return pix;
}
-QPixmap fastScalePixmap(const QPixmap &pixmap, int width, int height)
+TQPixmap fastScalePixmap(const TQPixmap &pixmap, int width, int height)
{
- QWMatrix m;
+ TQWMatrix m;
m.scale(width/(double)pixmap.width(),
height/(double)pixmap.height());
return pixmap.xForm(m);
@@ -204,12 +204,12 @@ void Desktop::loadBgPixmap(void)
DCOPClient *client = kapp->dcopClient();
if (!client->isAttached())
client->attach();
- QByteArray data, data2, replyData;
- QCString replyType;
+ TQByteArray data, data2, replyData;
+ TQCString replyType;
if (client->call("kdesktop", "KBackgroundIface", "isCommon()",
data, replyType, replyData))
{
- QDataStream reply(replyData, IO_ReadOnly);
+ TQDataStream reply(replyData, IO_ReadOnly);
if (replyType == "bool") {
reply >> m_isCommon;
}
@@ -217,14 +217,14 @@ void Desktop::loadBgPixmap(void)
if ( m_isCommon && m_desk!=1 ) return;
/*
- QDataStream args2( data2, IO_WriteOnly );
+ TQDataStream args2( data2, IO_WriteOnly );
args2 << m_desk-1 << 0 << 0 << -1 << -1 << 200 << 150 ;
if (client->call("kdesktop", "KBackgroundIface",
"wallpaper(int,int,int,int,int,int,int)", data2, replyType, replyData))
{
- QDataStream reply(replyData, IO_ReadOnly);
- if (replyType == "QPixmap") {
- QPixmap pixmap;
+ TQDataStream reply(replyData, IO_ReadOnly);
+ if (replyType == "TQPixmap") {
+ TQPixmap pixmap;
reply >> pixmap;
if (!pixmap.isNull())
{
@@ -233,7 +233,7 @@ void Desktop::loadBgPixmap(void)
{
if (m_bgSmallPixmap) { delete m_bgSmallPixmap; m_bgSmallPixmap=0L; }
- if (!m_bgCommonSmallPixmap) m_bgCommonSmallPixmap=new QPixmap(pixmap);
+ if (!m_bgCommonSmallPixmap) m_bgCommonSmallPixmap=new TQPixmap(pixmap);
else *m_bgCommonSmallPixmap=pixmap;
}
else
@@ -244,7 +244,7 @@ void Desktop::loadBgPixmap(void)
m_bgCommonSmallPixmap=0L;
}
- if (!m_bgSmallPixmap) m_bgSmallPixmap=new QPixmap(pixmap);
+ if (!m_bgSmallPixmap) m_bgSmallPixmap=new TQPixmap(pixmap);
else *m_bgSmallPixmap=pixmap;
}
return;
@@ -257,20 +257,20 @@ void Desktop::loadBgPixmap(void)
if (!m_bgPixmap)
{
m_bgPixmap = new KSharedPixmap;
- connect(m_bgPixmap, SIGNAL(done(bool)), SLOT(backgroundLoaded(bool)));
+ connect(m_bgPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(backgroundLoaded(bool)));
}
- retval = m_bgPixmap->loadFromShared(QString("DESKTOP%1").arg(m_isCommon?1:m_desk));
+ retval = m_bgPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_isCommon?1:m_desk));
if (retval == false) {
- QDataStream args( data, IO_WriteOnly );
+ TQDataStream args( data, IO_WriteOnly );
args << 1; // Argument is 1 (true)
client->send("kdesktop", "KBackgroundIface", "setExport(int)", data);
- retval = m_bgPixmap->loadFromShared(QString("DESKTOP%1").arg(m_isCommon?1:m_desk));
+ retval = m_bgPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_isCommon?1:m_desk));
}
}
-void Desktop::paintWindow(QPainter &p, const KWin::WindowInfo *info, bool onDesktop)
+void Desktop::paintWindow(TQPainter &p, const KWin::WindowInfo *info, bool onDesktop)
{
switch (static_cast<WindowDrawMode>(KPagerConfigDialog::m_windowDrawMode ) )
{
@@ -280,59 +280,59 @@ void Desktop::paintWindow(QPainter &p, const KWin::WindowInfo *info, bool onDesk
}
}
-QPixmap *Desktop::paintNewWindow(const KWin::WindowInfo *info)
+TQPixmap *Desktop::paintNewWindow(const KWin::WindowInfo *info)
{
- QRect r = info->frameGeometry();
- int dw = QApplication::desktop()->width();
- int dh = QApplication::desktop()->height();
- r = QRect( r.x() * width() / dw, 2 + r.y() * height() / dh,
+ TQRect r = info->frameGeometry();
+ int dw = TQApplication::desktop()->width();
+ int dh = TQApplication::desktop()->height();
+ r = TQRect( r.x() * width() / dw, 2 + r.y() * height() / dh,
r.width() * width() / dw, r.height() * height() / dh );
- r.moveTopLeft(QPoint(0,0));
+ r.moveTopLeft(TQPoint(0,0));
- QPixmap *pixmap=new QPixmap(r.width(),r.height());
- QPainter p;
+ TQPixmap *pixmap=new TQPixmap(r.width(),r.height());
+ TQPainter p;
p.begin(pixmap);
p.setFont(font());
- p.fillRect( r, colorGroup().brush(QColorGroup::Dark));
+ p.fillRect( r, colorGroup().brush(TQColorGroup::Dark));
paintWindow(p, info, false);
p.end();
return pixmap;
}
-void Desktop::startDrag(const QPoint &p)
+void Desktop::startDrag(const TQPoint &p)
{
- QPoint dragpos;
+ TQPoint dragpos;
KWin::WindowInfo *info=windowAtPosition(p,&dragpos);
if ( (!info)/* || (info->state & NET::Max)*/ ) return;
- QPixmap *pixmap=paintNewWindow(info);
+ TQPixmap *pixmap=paintNewWindow(info);
int deltax=dragpos.x();
int deltay=dragpos.y();
PagerWindowDrag *wdrag= new PagerWindowDrag( info->win(), deltax, deltay,
m_desk, this);
- wdrag->setPixmap( *pixmap, QPoint( deltax, deltay) );
+ wdrag->setPixmap( *pixmap, TQPoint( deltax, deltay) );
delete pixmap;
wdrag->dragCopy();
}
-void Desktop::dragEnterEvent(QDragEnterEvent *ev)
+void Desktop::dragEnterEvent(TQDragEnterEvent *ev)
{
if (PagerWindowDrag::canDecode( ev )) ev->accept();
}
-void Desktop::dragMoveEvent(QDragMoveEvent *)
+void Desktop::dragMoveEvent(TQDragMoveEvent *)
{
// TODO Moving the window while dragging would be cool, wouldn't it ?
// Matthias: No, is way to slow on low end machines.
// Antonio:Ok, I'll make it configurable after 2.0 (it would add a string)
}
-void Desktop::dropEvent(QDropEvent *ev)
+void Desktop::dropEvent(TQDropEvent *ev)
{
WId win=0;
int deltax,deltay;
@@ -408,24 +408,24 @@ bool Desktop::shouldPaintWindow( KWin::WindowInfo *info )
void Desktop::paintFrame(bool active)
{
- QPainter p(this);
+ TQPainter p(this);
if ( active )
p.setPen(yellow);
else
- p.setPen(QColorGroup::Base);
+ p.setPen(TQColorGroup::Base);
p.drawRect(rect());
p.end();
}
-void Desktop::paintEvent( QPaintEvent * )
+void Desktop::paintEvent( TQPaintEvent * )
{
- QPixmap pixmap(width(),height());
- QPainter p;
+ TQPixmap pixmap(width(),height());
+ TQPainter p;
p.begin(&pixmap);
// p.setFont(font());
-// p.fillRect(rect(), colorGroup().brush(QColorGroup::Dark));
+// p.fillRect(rect(), colorGroup().brush(TQColorGroup::Dark));
// p.setPen(Qt::black);
// p.drawRect(rect());
@@ -439,7 +439,7 @@ void Desktop::paintEvent( QPaintEvent * )
|| ( m_isCommon &&
m_bgCommonSmallPixmap && !m_bgCommonSmallPixmap->isNull() ) )
{
- QPixmap tmp;
+ TQPixmap tmp;
if ( m_isCommon )
tmp=fastScalePixmap(*m_bgCommonSmallPixmap, width(),height());
else
@@ -450,43 +450,43 @@ void Desktop::paintEvent( QPaintEvent * )
else pixmap.fill(Qt::gray);
}
else
- p.fillRect(rect(), colorGroup().brush(QColorGroup::Mid));
+ p.fillRect(rect(), colorGroup().brush(TQColorGroup::Mid));
// set in/active pen
if (isCurrent())
p.setPen(yellow);
else
- p.setPen(QColorGroup::Base);
+ p.setPen(TQColorGroup::Base);
// paint number & name
bool sname=KPagerConfigDialog::m_showName;
bool snumber=KPagerConfigDialog::m_showNumber;
if ( sname || snumber ) {
- QString txt;
+ TQString txt;
// set font
if (sname) {
- QFont f(KGlobalSettings::generalFont().family(), 10, QFont::Bold);
+ TQFont f(KGlobalSettings::generalFont().family(), 10, TQFont::Bold);
p.setFont(f);
}
else {
- QFont f(KGlobalSettings::generalFont().family(), 12, QFont::Bold);
+ TQFont f(KGlobalSettings::generalFont().family(), 12, TQFont::Bold);
p.setFont(f);
}
// draw text
if ( sname && snumber )
- txt=QString("%1. %2").arg(m_desk).arg(pager()->kwin()->desktopName( m_desk ));
+ txt=TQString("%1. %2").arg(m_desk).arg(pager()->kwin()->desktopName( m_desk ));
else if ( sname )
txt=pager()->kwin()->desktopName( m_desk );
else if ( snumber )
- txt=QString::number( m_desk );
+ txt=TQString::number( m_desk );
p.drawText(2, 0, width()-4, height(), AlignCenter, txt );
}
// paint windows
if ( KPagerConfigDialog::m_showWindows ) {
- QValueList<WId>::ConstIterator it;
+ TQValueList<WId>::ConstIterator it;
for ( it = pager()->kwin()->stackingOrder().begin();
it != pager()->kwin()->stackingOrder().end(); ++it ) {
@@ -509,26 +509,26 @@ void Desktop::paintEvent( QPaintEvent * )
m_grabWindows=false;
}
-void Desktop::paintWindowPlain(QPainter &p, const KWin::WindowInfo *info, bool onDesktop)
+void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool onDesktop)
{
- QRect r = info->frameGeometry();
- int dw = QApplication::desktop()->width();
- int dh = QApplication::desktop()->height();
- r = QRect( r.x() * width() / dw, 2 + r.y() * height() / dh,
+ TQRect r = info->frameGeometry();
+ int dw = TQApplication::desktop()->width();
+ int dh = TQApplication::desktop()->height();
+ r = TQRect( r.x() * width() / dw, 2 + r.y() * height() / dh,
r.width() * width() / dw, r.height() * height() / dh );
if ( !onDesktop )
- r.moveTopLeft(QPoint(0,0));
+ r.moveTopLeft(TQPoint(0,0));
bool isActive=(pager()->kwin()->activeWindow() == info->win());
- QBrush brush;
+ TQBrush brush;
- if ( isActive ) brush=colorGroup().brush( QColorGroup::Highlight );
- else brush=colorGroup().brush( QColorGroup::Button );
+ if ( isActive ) brush=colorGroup().brush( TQColorGroup::Highlight );
+ else brush=colorGroup().brush( TQColorGroup::Button );
if ( m_transparentMode==AllWindows
|| (m_transparentMode==MaximizedWindows && ( info->state() & NET::Max )) )
- brush.setStyle(QBrush::Dense4Pattern);
+ brush.setStyle(TQBrush::Dense4Pattern);
if ( isActive )
{
@@ -543,14 +543,14 @@ void Desktop::paintWindowPlain(QPainter &p, const KWin::WindowInfo *info, bool o
}
-void Desktop::paintWindowIcon(QPainter &p, const KWin::WindowInfo *info, bool onDesktop)
+void Desktop::paintWindowIcon(TQPainter &p, const KWin::WindowInfo *info, bool onDesktop)
{
- QRect r = info->frameGeometry();
- int dw = QApplication::desktop()->width();
- int dh = QApplication::desktop()->height();
- r = QRect( r.x() * width() / dw, 2 + r.y() * height() / dh,
+ TQRect r = info->frameGeometry();
+ int dw = TQApplication::desktop()->width();
+ int dh = TQApplication::desktop()->height();
+ r = TQRect( r.x() * width() / dw, 2 + r.y() * height() / dh,
r.width() * width() / dw, r.height() * height() / dh );
- QPixmap icon=KWin::icon( info->win(), int(r.width()*0.8),
+ TQPixmap icon=KWin::icon( info->win(), int(r.width()*0.8),
int(r.height()*0.8), true);
NET::WindowType type = info->windowType( NET::NormalMask | NET::DesktopMask
@@ -560,36 +560,36 @@ void Desktop::paintWindowIcon(QPainter &p, const KWin::WindowInfo *info, bool on
paintWindowPlain(p,info,onDesktop);
if ( !onDesktop )
- r.moveTopLeft(QPoint(0,0));
+ r.moveTopLeft(TQPoint(0,0));
- p.drawPixmap( r.topLeft()+ QPoint(int(r.width()*0.1),int(r.height()*0.1)),
+ p.drawPixmap( r.topLeft()+ TQPoint(int(r.width()*0.1),int(r.height()*0.1)),
icon );
}
-void Desktop::paintWindowPixmap(QPainter &p, const KWin::WindowInfo *info,
+void Desktop::paintWindowPixmap(TQPainter &p, const KWin::WindowInfo *info,
bool onDesktop)
{
const int knDefaultPixmapWd = 100;
const int knDefaultPixmapHg = 75;
- QRect rSmall, r = info->frameGeometry();
+ TQRect rSmall, r = info->frameGeometry();
- int dw = QApplication::desktop()->width();
- int dh = QApplication::desktop()->height();
- rSmall = QRect( r.x() * width() / dw, 2 + r.y() * height() / dh,
+ int dw = TQApplication::desktop()->width();
+ int dh = TQApplication::desktop()->height();
+ rSmall = TQRect( r.x() * width() / dw, 2 + r.y() * height() / dh,
r.width() * width() / dw, r.height() * height() / dh );
- QPixmap *pixmap=m_windowPixmaps[info->win()];
+ TQPixmap *pixmap=m_windowPixmaps[info->win()];
bool isDirty=m_windowPixmapsDirty[info->win()];
if ( !pixmap || isDirty || m_grabWindows )
{
if ( isCurrent() )
{
- QPixmap tmp=QPixmap::grabWindow(info->win(),
+ TQPixmap tmp=TQPixmap::grabWindow(info->win(),
0,0,r.width(),r.height());
if (!tmp.isNull() && tmp.width() > 0 && tmp.height() > 0)
{
- tmp.setOptimization(QPixmap::BestOptim);
+ tmp.setOptimization(TQPixmap::BestOptim);
int nWd, nHg;
if (rSmall.width() > knDefaultPixmapWd || rSmall.height() > knDefaultPixmapHg)
{
@@ -601,7 +601,7 @@ void Desktop::paintWindowPixmap(QPainter &p, const KWin::WindowInfo *info,
nWd = rSmall.width();
nHg = rSmall.height();
}
- pixmap=new QPixmap(fastScalePixmap(tmp, nWd, nHg));
+ pixmap=new TQPixmap(fastScalePixmap(tmp, nWd, nHg));
m_windowPixmaps.replace(info->win(),pixmap);
m_windowPixmapsDirty.replace(info->win(),false);
}
@@ -617,11 +617,11 @@ void Desktop::paintWindowPixmap(QPainter &p, const KWin::WindowInfo *info,
}
if ( !onDesktop )
- rSmall.moveTopLeft(QPoint(0,0));
+ rSmall.moveTopLeft(TQPoint(0,0));
if (rSmall.width() != pixmap->width() || rSmall.height() != pixmap->height())
{
- QPixmap pixmapSmall(fastScalePixmap(*pixmap,rSmall.width(),rSmall.height()));
+ TQPixmap pixmapSmall(fastScalePixmap(*pixmap,rSmall.width(),rSmall.height()));
p.drawPixmap( rSmall.topLeft(), pixmapSmall );
}
else
@@ -669,15 +669,15 @@ void Desktop::backgroundLoaded(bool b)
} else kdDebug() << "Error getting the background\n";
}
-QSize Desktop::sizeHint() const
+TQSize Desktop::sizeHint() const
{
- return QSize(67,50);
+ return TQSize(67,50);
}
-QPixmap *Desktop::m_bgCommonSmallPixmap=0L;
+TQPixmap *Desktop::m_bgCommonSmallPixmap=0L;
bool Desktop::m_isCommon=false;
-QIntDict<QPixmap> Desktop::m_windowPixmaps;
-QMap<int,bool> Desktop::m_windowPixmapsDirty;
+TQIntDict<TQPixmap> Desktop::m_windowPixmaps;
+TQMap<int,bool> Desktop::m_windowPixmapsDirty;
// Default Configuration -------------------------------------------------
diff --git a/kpager/desktop.h b/kpager/desktop.h
index acdf4f517..067555b58 100644
--- a/kpager/desktop.h
+++ b/kpager/desktop.h
@@ -25,8 +25,8 @@
#ifndef __DESKTOP_H
#define __DESKTOP_H
-#include <qwidget.h>
-#include <qintdict.h>
+#include <tqwidget.h>
+#include <tqintdict.h>
#include <kwin.h>
class KSharedPixmap;
@@ -40,7 +40,7 @@ class Desktop : public QWidget
Q_OBJECT
public:
- Desktop( int desk, QString desktopName, QWidget *parent=0,
+ Desktop( int desk, TQString desktopName, TQWidget *parent=0,
const char *name=0);
~Desktop();
@@ -65,16 +65,16 @@ public:
virtual int deskWidth() const { return width(); };
virtual int deskHeight() const { return height(); };
- void startDrag(const QPoint &point);
- void dragEnterEvent(QDragEnterEvent *ev);
- void dragMoveEvent(QDragMoveEvent *);
- void dropEvent(QDropEvent *ev);
- void convertRectS2P(QRect &r);
+ void startDrag(const TQPoint &point);
+ void dragEnterEvent(TQDragEnterEvent *ev);
+ void dragMoveEvent(TQDragMoveEvent *);
+ void dropEvent(TQDropEvent *ev);
+ void convertRectS2P(TQRect &r);
void convertCoordP2S(int &x, int &y);
static void removeCachedPixmap(int nWin) { m_windowPixmaps.remove(nWin); };
- QSize sizeHint() const;
+ TQSize sizeHint() const;
/**
* active is a bool that specifies if the frame is the active
@@ -89,41 +89,41 @@ public slots:
void loadBgPixmap();
protected:
- void mousePressEvent( QMouseEvent *ev );
- void mouseMoveEvent( QMouseEvent *ev );
- void mouseReleaseEvent( QMouseEvent *ev );
+ void mousePressEvent( TQMouseEvent *ev );
+ void mouseMoveEvent( TQMouseEvent *ev );
+ void mouseReleaseEvent( TQMouseEvent *ev );
- void paintEvent( QPaintEvent *ev );
+ void paintEvent( TQPaintEvent *ev );
- KWin::WindowInfo *windowAtPosition (const QPoint &p, QPoint *internalpos);
+ KWin::WindowInfo *windowAtPosition (const TQPoint &p, TQPoint *internalpos);
bool shouldPaintWindow( KWin::WindowInfo *info );
int m_desk;
- QString m_name;
+ TQString m_name;
KSharedPixmap *m_bgPixmap;
bool m_bgDirty;
- QPixmap *m_bgSmallPixmap;
- static QPixmap *m_bgCommonSmallPixmap;
+ TQPixmap *m_bgSmallPixmap;
+ static TQPixmap *m_bgCommonSmallPixmap;
static bool m_isCommon;
- static QIntDict<QPixmap> m_windowPixmaps;
- static QMap<int,bool> m_windowPixmapsDirty;
+ static TQIntDict<TQPixmap> m_windowPixmaps;
+ static TQMap<int,bool> m_windowPixmapsDirty;
WindowTransparentMode m_transparentMode;
- QPixmap *paintNewWindow(const KWin::WindowInfo *info);
+ TQPixmap *paintNewWindow(const KWin::WindowInfo *info);
- void paintWindow(QPainter &p, const KWin::WindowInfo *info,
+ void paintWindow(TQPainter &p, const KWin::WindowInfo *info,
bool onDesktop=true);
- void paintWindowPlain(QPainter &p, const KWin::WindowInfo *info,
+ void paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info,
bool onDesktop=true);
- void paintWindowIcon(QPainter &p, const KWin::WindowInfo *info,
+ void paintWindowIcon(TQPainter &p, const KWin::WindowInfo *info,
bool onDesktop=true);
- void paintWindowPixmap(QPainter &p, const KWin::WindowInfo *info,
+ void paintWindowPixmap(TQPainter &p, const KWin::WindowInfo *info,
bool onDesktop=true);
private:
class KPager* pager() const;
- QPoint pressPos;
+ TQPoint pressPos;
};
diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp
index b405e633b..e521f1e28 100644
--- a/kpager/kpager.cpp
+++ b/kpager/kpager.cpp
@@ -36,11 +36,11 @@
#include "config.h"
#include "kpager.h"
-#include <qintdict.h>
-#include <qptrlist.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qtimer.h>
+#include <tqintdict.h>
+#include <tqptrlist.h>
+#include <tqlayout.h>
+#include <tqtooltip.h>
+#include <tqtimer.h>
#include <kapplication.h>
#include <kglobalsettings.h>
@@ -54,12 +54,12 @@
#include <kwinmodule.h>
#include <netwm.h>
#include "desktop.h"
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
#include <kpopupmenu.h>
#include <kiconloader.h>
#include <assert.h>
-KPagerMainWindow::KPagerMainWindow(QWidget *parent, const char *name)
+KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name)
: DCOPObject("KPagerIface"), KMainWindow(parent, name)
{
m_reallyClose=false;
@@ -110,8 +110,8 @@ KPagerMainWindow::KPagerMainWindow(QWidget *parent, const char *name)
XSetWMHints(x11Display(), winId(), hints);
XFree(reinterpret_cast<char *>(hints));
- timeout=new QTimer(this,"timeoutToQuit");
- connect(timeout,SIGNAL(timeout()),this, SLOT(reallyClose()));
+ timeout=new TQTimer(this,"timeoutToQuit");
+ connect(timeout,TQT_SIGNAL(timeout()),this, TQT_SLOT(reallyClose()));
}
KPagerMainWindow::~KPagerMainWindow()
@@ -141,7 +141,7 @@ bool KPagerMainWindow::queryClose()
return false;
}
-void KPagerMainWindow::showEvent( QShowEvent *ev )
+void KPagerMainWindow::showEvent( TQShowEvent *ev )
{
timeout->stop();
KMainWindow::showEvent(ev);
@@ -178,7 +178,7 @@ void KPagerMainWindow::toggleShow(int x, int y)
}
KPager::KPager(KPagerMainWindow *parent, const char *name)
- : QFrame (parent, name, WStyle_Customize | WStyle_NoBorder | WStyle_Tool)
+ : TQFrame (parent, name, WStyle_Customize | WStyle_NoBorder | WStyle_Tool)
, m_layout(0)
, m_mnu(0)
, m_smnu(0)
@@ -190,8 +190,8 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
m_winmodule=new KWinModule(this);
m_currentDesktop=m_winmodule->currentDesktop();
- m_grabWinTimer=new QTimer(this,"grabWinTimer");
- connect(m_grabWinTimer, SIGNAL(timeout()), this, SLOT(slotGrabWindows()));
+ m_grabWinTimer=new TQTimer(this,"grabWinTimer");
+ connect(m_grabWinTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotGrabWindows()));
KPagerConfigDialog::initConfiguration();
@@ -208,31 +208,31 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
m_layoutType=static_cast<enum KPager::LayoutTypes>( KPagerConfigDialog::m_layoutType );
- connect( m_winmodule, SIGNAL( activeWindowChanged(WId)),
- SLOT(slotActiveWindowChanged(WId)));
- connect( m_winmodule, SIGNAL( windowAdded(WId) ),
- SLOT( slotWindowAdded(WId) ) );
- connect( m_winmodule, SIGNAL( windowRemoved(WId) ),
- SLOT( slotWindowRemoved(WId) ) );
- connect( m_winmodule, SIGNAL( windowChanged(WId,unsigned int) ),
- SLOT( slotWindowChanged(WId,unsigned int) ) );
- connect( m_winmodule, SIGNAL( stackingOrderChanged() ),
- SLOT( slotStackingOrderChanged() ) );
- connect( m_winmodule, SIGNAL( desktopNamesChanged() ),
- SLOT( slotDesktopNamesChanged() ) );
- connect( m_winmodule, SIGNAL( numberOfDesktopsChanged(int) ),
- SLOT( slotNumberOfDesktopsChanged(int) ) );
- connect( m_winmodule, SIGNAL( currentDesktopChanged(int)),
- SLOT( slotCurrentDesktopChanged(int) ) );
- connect(kapp, SIGNAL(backgroundChanged(int)),
- SLOT(slotBackgroundChanged(int)));
-
- QFont defFont(KGlobalSettings::generalFont().family(), 10, QFont::Bold);
+ connect( m_winmodule, TQT_SIGNAL( activeWindowChanged(WId)),
+ TQT_SLOT(slotActiveWindowChanged(WId)));
+ connect( m_winmodule, TQT_SIGNAL( windowAdded(WId) ),
+ TQT_SLOT( slotWindowAdded(WId) ) );
+ connect( m_winmodule, TQT_SIGNAL( windowRemoved(WId) ),
+ TQT_SLOT( slotWindowRemoved(WId) ) );
+ connect( m_winmodule, TQT_SIGNAL( windowChanged(WId,unsigned int) ),
+ TQT_SLOT( slotWindowChanged(WId,unsigned int) ) );
+ connect( m_winmodule, TQT_SIGNAL( stackingOrderChanged() ),
+ TQT_SLOT( slotStackingOrderChanged() ) );
+ connect( m_winmodule, TQT_SIGNAL( desktopNamesChanged() ),
+ TQT_SLOT( slotDesktopNamesChanged() ) );
+ connect( m_winmodule, TQT_SIGNAL( numberOfDesktopsChanged(int) ),
+ TQT_SLOT( slotNumberOfDesktopsChanged(int) ) );
+ connect( m_winmodule, TQT_SIGNAL( currentDesktopChanged(int)),
+ TQT_SLOT( slotCurrentDesktopChanged(int) ) );
+ connect(kapp, TQT_SIGNAL(backgroundChanged(int)),
+ TQT_SLOT(slotBackgroundChanged(int)));
+
+ TQFont defFont(KGlobalSettings::generalFont().family(), 10, TQFont::Bold);
defFont = cfg->readFontEntry("Font", &defFont);
setFont(defFont);
- m_prefs_action = KStdAction::preferences(this, SLOT(configureDialog()), parent->actionCollection());
- m_quit_action = KStdAction::quit(kapp, SLOT(quit()), parent->actionCollection());
+ m_prefs_action = KStdAction::preferences(this, TQT_SLOT(configureDialog()), parent->actionCollection());
+ m_quit_action = KStdAction::quit(kapp, TQT_SLOT(quit()), parent->actionCollection());
updateLayout();
}
@@ -242,7 +242,7 @@ KPager::~KPager()
}
-const QString KPager::lWidth()
+const TQString KPager::lWidth()
{
switch (m_layoutType) {
case (Classical) : return "layoutClassicalWidth";break;
@@ -252,7 +252,7 @@ const QString KPager::lWidth()
return "Width";
}
-const QString KPager::lHeight()
+const TQString KPager::lHeight()
{
switch (m_layoutType) {
case (Classical) : return "layoutClassicalHeight";break;
@@ -271,12 +271,12 @@ void KPager::updateLayout()
switch (m_layoutType)
{
- case (Classical) : m_layout=new QGridLayout(this, 2, 0); break;
- case (Horizontal) : m_layout=new QGridLayout(this, 0, 1); break;
- case (Vertical) : m_layout=new QGridLayout(this, 1, 0); break;
+ case (Classical) : m_layout=new TQGridLayout(this, 2, 0); break;
+ case (Horizontal) : m_layout=new TQGridLayout(this, 0, 1); break;
+ case (Vertical) : m_layout=new TQGridLayout(this, 1, 0); break;
};
- QValueList <Desktop *>::Iterator it;
+ TQValueList <Desktop *>::Iterator it;
int i,j;
i=j=0;
int ndesks=0;
@@ -305,11 +305,11 @@ void KPager::updateLayout()
}
-void KPager::showPopupMenu( WId wid, QPoint pos)
+void KPager::showPopupMenu( WId wid, TQPoint pos)
{
if (wid <= 0) {
if(!m_smnu) {
- m_smnu = new QPopupMenu(this);
+ m_smnu = new TQPopupMenu(this);
m_prefs_action->plug(m_smnu);
m_quit_action->plug(m_smnu);
}
@@ -321,20 +321,20 @@ void KPager::showPopupMenu( WId wid, QPoint pos)
if (!m_mnu) {
m_mnu = new KPopupMenu(this);
- m_mnu->insertTitle( QString::fromUtf8("KPager"), 1);
+ m_mnu->insertTitle( TQString::fromUtf8("KPager"), 1);
m_mnu->setCheckable(true);
- connect(m_mnu, SIGNAL(aboutToShow()), SLOT(clientPopupAboutToShow()));
- connect(m_mnu, SIGNAL(activated(int)), SLOT(clientPopupActivated(int)));
+ connect(m_mnu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(clientPopupAboutToShow()));
+ connect(m_mnu, TQT_SIGNAL(activated(int)), TQT_SLOT(clientPopupActivated(int)));
- m_dmnu = new QPopupMenu(m_mnu);
+ m_dmnu = new TQPopupMenu(m_mnu);
m_dmnu->setCheckable(true);
- connect(m_dmnu, SIGNAL(aboutToShow()), SLOT(desktopPopupAboutToShow()));
- connect(m_dmnu, SIGNAL(activated(int)), SLOT(sendToDesktop(int)));
+ connect(m_dmnu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(desktopPopupAboutToShow()));
+ connect(m_dmnu, TQT_SIGNAL(activated(int)), TQT_SLOT(sendToDesktop(int)));
m_mnu->insertItem( i18n("Mi&nimize"), IconifyOp );
m_mnu->insertItem( i18n("Ma&ximize"), MaximizeOp );
if (m_showStickyOption)
- m_mnu->insertItem( QString("&Sticky"), StickyOp ); // Add translation
+ m_mnu->insertItem( TQString("&Sticky"), StickyOp ); // Add translation
m_mnu->insertSeparator();
m_mnu->insertItem(i18n("&To Desktop"), m_dmnu );
@@ -357,8 +357,8 @@ void KPager::configureDialog()
{
m_layoutType=static_cast<enum KPager::LayoutTypes>(KPagerConfigDialog::m_layoutType);
KConfig *cfg=KGlobal::config();
- int nWd = (parent() ? ((QWidget *)parent())->width() : width());
- int nHg = (parent() ? ((QWidget *)parent())->width() : width());
+ int nWd = (parent() ? ((TQWidget *)parent())->width() : width());
+ int nHg = (parent() ? ((TQWidget *)parent())->width() : width());
cfg->setGroup("KPager");
@@ -373,7 +373,7 @@ void KPager::configureDialog()
cfg->writeEntry("windowDragging",KPagerConfigDialog::m_windowDragging);
updateLayout();
- for( QValueList <Desktop *>::Iterator it = m_desktops.begin(); it != m_desktops.end(); ++it )
+ for( TQValueList <Desktop *>::Iterator it = m_desktops.begin(); it != m_desktops.end(); ++it )
(*it)->repaint();
}
}
@@ -494,8 +494,8 @@ void KPager::slotDesktopNamesChanged()
{
for ( int i=1; i <= (int) m_desktops.count(); ++i)
{
- QToolTip::remove(m_desktops[i-1]);
- QToolTip::add(m_desktops[i-1], kwin()->desktopName(i));
+ TQToolTip::remove(m_desktops[i-1]);
+ TQToolTip::add(m_desktops[i-1], kwin()->desktopName(i));
}
update();
@@ -507,7 +507,7 @@ void KPager::slotNumberOfDesktopsChanged(int ndesktops)
unsigned int nDesktops=static_cast<unsigned int>(ndesktops);
if (nDesktops<m_desktops.count())
{
- QValueList <Desktop *>::Iterator it;
+ TQValueList <Desktop *>::Iterator it;
for ( int i=m_desktops.count()-nDesktops; i > 0; i--)
{
it = m_desktops.fromLast();
@@ -581,7 +581,7 @@ void KPager::clientPopupAboutToShow()
m_mnu->setItemChecked(MaximizeOp, m_winfo.state() & NET::Max);
if (m_showStickyOption) // Add translation
m_mnu->changeItem(StickyOp,
- (m_winfo.onAllDesktops()) ? QString("Un&sticky"):QString("&Sticky"));
+ (m_winfo.onAllDesktops()) ? TQString("Un&sticky"):TQString("&Sticky"));
}
void KPager::desktopPopupAboutToShow()
@@ -597,7 +597,7 @@ void KPager::desktopPopupAboutToShow()
int id;
for ( int i = 1; i <= m_winmodule->numberOfDesktops(); i++ ) {
- id = m_dmnu->insertItem( QString("&")+QString::number(i )+QString(" ")
+ id = m_dmnu->insertItem( TQString("&")+TQString::number(i )+TQString(" ")
+ m_winmodule->desktopName(i), i );
if ( m_winfo.desktop() == i )
m_dmnu->setItemChecked( id, TRUE );
@@ -641,7 +641,7 @@ void KPager::clientPopupActivated( int id )
void KPager::redrawDesktops()
{
- QValueList <Desktop *>::Iterator it;
+ TQValueList <Desktop *>::Iterator it;
for( it = m_desktops.begin(); it != m_desktops.end(); ++it )
(*it)->repaint();
}
@@ -652,12 +652,12 @@ void KPager::slotGrabWindows()
m_desktops[m_currentDesktop-1]->repaint();
}
-QSize KPager::sizeHint() const
+TQSize KPager::sizeHint() const
{
int n=m_desktops.count();
int w=-1,h=-1;
- QSize size=m_desktops[0]->sizeHint();
+ TQSize size=m_desktops[0]->sizeHint();
int wDsk=size.width();
int hDsk=size.height();
switch (m_layoutType)
@@ -666,7 +666,7 @@ QSize KPager::sizeHint() const
case (Horizontal) : w=wDsk*n; h=hDsk;break;
case (Vertical) : w=wDsk; h=hDsk*n;break;
};
- return QSize(w,h);
+ return TQSize(w,h);
}
const KPager::LayoutTypes KPager::c_defLayout=KPager::Horizontal;
diff --git a/kpager/kpager.h b/kpager/kpager.h
index 9fe67942c..a659c7592 100644
--- a/kpager/kpager.h
+++ b/kpager/kpager.h
@@ -25,8 +25,8 @@
#ifndef __KPAGER_H
#define __KPAGER_H
-#include <qwidget.h>
-#include <qintdict.h>
+#include <tqwidget.h>
+#include <tqintdict.h>
#include <kmainwindow.h>
#include <kwin.h>
#include "kpagerIface.h"
@@ -39,7 +39,7 @@ class KPagerMainWindow : public KMainWindow, public virtual KPagerIface
Q_OBJECT
public:
- KPagerMainWindow(QWidget *parent=0, const char *name=0);
+ KPagerMainWindow(TQWidget *parent=0, const char *name=0);
~KPagerMainWindow();
virtual void showAt(int x, int y);
@@ -50,10 +50,10 @@ public slots:
protected:
bool queryClose();
- void showEvent(QShowEvent *ev);
+ void showEvent(TQShowEvent *ev);
KPager *m_pPager;
- class QTimer *timeout;
+ class TQTimer *timeout;
bool m_reallyClose;
};
@@ -72,11 +72,11 @@ public:
void redrawDesktops();
- void showPopupMenu( WId wid, QPoint pos);
+ void showPopupMenu( WId wid, TQPoint pos);
KWin::WindowInfo* info( WId win );
- QSize sizeHint() const;
+ TQSize sizeHint() const;
enum LayoutTypes { Classical=0, Horizontal, Vertical };
@@ -111,25 +111,25 @@ protected:
protected:
KWinModule *m_winmodule;
- QValueList<class Desktop *> m_desktops;
+ TQValueList<class Desktop *> m_desktops;
- QIntDict<KWin::WindowInfo> m_windows;
+ TQIntDict<KWin::WindowInfo> m_windows;
WId m_activeWin;
- const QString lWidth();
- const QString lHeight();
+ const TQString lWidth();
+ const TQString lHeight();
LayoutTypes m_layoutType;
- class QGridLayout *m_layout;
+ class TQGridLayout *m_layout;
KPopupMenu *m_mnu;
- QPopupMenu *m_smnu, *m_dmnu;
+ TQPopupMenu *m_smnu, *m_dmnu;
KAction *m_quit_action;
KAction *m_prefs_action;
KWin::WindowInfo m_winfo;
bool m_showStickyOption; // To be removed after the message freeze
- QTimer *m_grabWinTimer;
+ TQTimer *m_grabWinTimer;
int m_currentDesktop;
public:
diff --git a/kpager/main.cpp b/kpager/main.cpp
index cf943f4f0..c2932478b 100644
--- a/kpager/main.cpp
+++ b/kpager/main.cpp
@@ -25,10 +25,10 @@
#include <klocale.h>
#include <kcmdlineargs.h>
#include <kaboutdata.h>
-#include <qcolor.h>
+#include <tqcolor.h>
#include <kdebug.h>
#include <stdlib.h>
-#include <qsessionmanager.h>
+#include <tqsessionmanager.h>
#include "kpager.h"
diff --git a/kpager/windowdrag.cpp b/kpager/windowdrag.cpp
index 2f9c59cbd..fc854b8a9 100644
--- a/kpager/windowdrag.cpp
+++ b/kpager/windowdrag.cpp
@@ -25,12 +25,12 @@
#include "windowdrag.h"
-PagerWindowDrag::PagerWindowDrag(WId w,int deltax,int deltay, int origdesk,QWidget *parent)
- : QStoredDrag("application/x-kpager",parent,"windowdrag")
+PagerWindowDrag::PagerWindowDrag(WId w,int deltax,int deltay, int origdesk,TQWidget *parent)
+ : TQStoredDrag("application/x-kpager",parent,"windowdrag")
{
- QString tmp;
+ TQString tmp;
tmp.sprintf("%d %d %d %d", static_cast<int>(w), deltax, deltay, origdesk);
- QByteArray data;
+ TQByteArray data;
data.setRawData(tmp.latin1(),tmp.length()+1);
setEncodedData(data);
@@ -41,14 +41,14 @@ PagerWindowDrag::~PagerWindowDrag()
{
}
-bool PagerWindowDrag::canDecode (QDragMoveEvent *e)
+bool PagerWindowDrag::canDecode (TQDragMoveEvent *e)
{
return e->provides("application/x-kpager");
}
-bool PagerWindowDrag::decode( QDropEvent *e, WId &w,int &deltax,int &deltay,int &origdesk)
+bool PagerWindowDrag::decode( TQDropEvent *e, WId &w,int &deltax,int &deltay,int &origdesk)
{
- QByteArray data=e->data("application/x-kpager");
+ TQByteArray data=e->data("application/x-kpager");
if (data.size())
{
char *tmp=data.data();
diff --git a/kpager/windowdrag.h b/kpager/windowdrag.h
index d1886ba68..e42927459 100644
--- a/kpager/windowdrag.h
+++ b/kpager/windowdrag.h
@@ -24,17 +24,17 @@
#ifndef WINDOWDRAG_H
#define WINDOWDRAG_H
-#include <qdragobject.h>
+#include <tqdragobject.h>
#include <X11/Xlib.h>
class PagerWindowDrag : public QStoredDrag
{
public:
- PagerWindowDrag(WId w,int deltax,int deltay,int origdesk,QWidget *parent);
+ PagerWindowDrag(WId w,int deltax,int deltay,int origdesk,TQWidget *parent);
virtual ~PagerWindowDrag();
- static bool canDecode( QDragMoveEvent *e);
- static bool decode ( QDropEvent *e, WId &w,int &deltax,int &deltay,int &origdesk);
+ static bool canDecode( TQDragMoveEvent *e);
+ static bool decode ( TQDropEvent *e, WId &w,int &deltax,int &deltay,int &origdesk);
};
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index 699739580..ee8f44b87 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -15,9 +15,9 @@
* *
***************************************************************************/
-#include <qstringlist.h>
-#include <qlabel.h>
-#include <qmap.h>
+#include <tqstringlist.h>
+#include <tqlabel.h>
+#include <tqmap.h>
#include <kapplication.h>
#include <ksimpleconfig.h>
@@ -33,12 +33,12 @@
#include "kcountrypage.h"
-KCountryPage::KCountryPage(QWidget *parent, const char *name ) : KCountryPageDlg(parent,name) {
+KCountryPage::KCountryPage(TQWidget *parent, const char *name ) : KCountryPageDlg(parent,name) {
px_introSidebar->setPixmap(UserIcon("step1.png"));
- connect(cb_country, SIGNAL(activated(const QString &)), SLOT(setLangForCountry(const QString &)));
- connect(cb_language, SIGNAL(activated(const QString &)), SLOT(setLanguageChanged()));
+ connect(cb_country, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLangForCountry(const TQString &)));
+ connect(cb_language, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLanguageChanged()));
// naturally, the language is not changed on startup
b_savedLanguageChanged = false;
@@ -76,20 +76,20 @@ KCountryPage::~KCountryPage(){
void KCountryPage::loadCountryList(KLanguageButton *combo) {
- QString sub = QString::fromLatin1("l10n/");
+ TQString sub = TQString::fromLatin1("l10n/");
// clear the list
combo->clear();
- QStringList regionfiles = KGlobal::dirs()->findAllResources("locale", sub + "*.desktop");
- QMap<QString,QString> regionnames;
+ TQStringList regionfiles = KGlobal::dirs()->findAllResources("locale", sub + "*.desktop");
+ TQMap<TQString,TQString> regionnames;
- for ( QStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) {
+ for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) {
KSimpleConfig entry(*it);
- entry.setGroup(QString::fromLatin1("KCM Locale"));
- QString name = entry.readEntry(QString::fromLatin1("Name"), i18n("without name"));
+ entry.setGroup(TQString::fromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
- QString tag = *it;
+ TQString tag = *it;
int index;
index = tag.findRev('/');
@@ -103,43 +103,43 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
regionnames.insert(name, tag);
}
- for ( QMap<QString,QString>::ConstIterator mit = regionnames.begin(); mit != regionnames.end(); ++mit ) {
+ for ( TQMap<TQString,TQString>::ConstIterator mit = regionnames.begin(); mit != regionnames.end(); ++mit ) {
combo->insertSubmenu( mit.key(), '-' + mit.data(), sub );
}
// add all languages to the list
- QStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + "*/entry.desktop");
+ TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + "*/entry.desktop");
countrylist.sort();
- for ( QStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) {
+ for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) {
KSimpleConfig entry(*it);
- entry.setGroup(QString::fromLatin1("KCM Locale"));
- QString name = entry.readEntry(QString::fromLatin1("Name"), i18n("without name"));
- QString submenu = '-' + entry.readEntry("Region");
+ entry.setGroup(TQString::fromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
+ TQString submenu = '-' + entry.readEntry("Region");
- QString tag = *it;
+ TQString tag = *it;
int index = tag.findRev('/');
tag.truncate(index);
index = tag.findRev('/');
tag = tag.mid(index+1);
- QPixmap flag( locate( "locale", QString::fromLatin1("l10n/%1/flag.png").arg(tag) ) );
- QIconSet icon( flag );
+ TQPixmap flag( locate( "locale", TQString::fromLatin1("l10n/%1/flag.png").arg(tag) ) );
+ TQIconSet icon( flag );
combo->insertItem( icon, name, tag, submenu );
}
}
void KCountryPage::fillLanguageMenu(KLanguageButton *combo) {
combo->clear();
- QString submenu; // we are working on this menu
- QStringList langlist = flang->getLangList();
- QMap<QString,QString> langmap = flang->getLangMap();
- QStringList::ConstIterator it;
+ TQString submenu; // we are working on this menu
+ TQStringList langlist = flang->getLangList();
+ TQMap<TQString,TQString> langmap = flang->getLangMap();
+ TQStringList::ConstIterator it;
for ( it = langlist.begin(); it != langlist.end(); ++it ) {
if ((*it).isNull()) {
combo->insertSeparator();
- submenu = QString::fromLatin1("all");
- combo->insertSubmenu(i18n("All"), submenu, QString::null);
+ submenu = TQString::fromLatin1("all");
+ combo->insertSubmenu(i18n("All"), submenu, TQString::null);
continue;
}
combo->insertItem(langmap[(*it)], (*it), submenu );
@@ -151,43 +151,43 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan
kdDebug() << "KCountryPage::save()" << endl;
KConfigBase *config = KGlobal::config();
- config->setGroup(QString::fromLatin1("Locale"));
- config->writeEntry(QString::fromLatin1("Country"), comboCountry->current(), true, true);
- config->writeEntry(QString::fromLatin1("Language"), comboLang->current(), true, true);
+ config->setGroup(TQString::fromLatin1("Locale"));
+ config->writeEntry(TQString::fromLatin1("Country"), comboCountry->current(), true, true);
+ config->writeEntry(TQString::fromLatin1("Language"), comboLang->current(), true, true);
config->sync();
// only make the system reload the language, if the selected one deferes from the old saved one.
if (b_savedLanguageChanged) {
// Tell kdesktop about the new language
- QCString replyType; QByteArray replyData;
- QByteArray data, da;
- QDataStream stream( data, IO_WriteOnly );
+ TQCString replyType; TQByteArray replyData;
+ TQByteArray data, da;
+ TQDataStream stream( data, IO_WriteOnly );
stream << comboLang->current();
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
// ksycoca needs to be rebuilt
KProcess proc;
- proc << QString::fromLatin1("kbuildsycoca");
+ proc << TQString::fromLatin1("kbuildsycoca");
proc.start(KProcess::DontCare);
kdDebug() << "KLocaleConfig::save : sending signal to kdesktop" << endl;
// inform kicker and kdeskop about the new language
- kapp->dcopClient()->send( "kicker", "Panel", "restart()", QString::null);
+ kapp->dcopClient()->send( "kicker", "Panel", "restart()", TQString::null);
// call, not send, so that we know it's done before coming back
// (we both access kdeglobals...)
- kapp->dcopClient()->call( "kdesktop", "KDesktopIface", "languageChanged(QString)", data, replyType, replyData );
+ kapp->dcopClient()->call( "kdesktop", "KDesktopIface", "languageChanged(TQString)", data, replyType, replyData );
}
// KPersonalizer::next() probably waits for a return-value
return true;
}
-void KCountryPage::setLangForCountry(const QString &country) {
+void KCountryPage::setLangForCountry(const TQString &country) {
KSimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true);
- ent.setGroup(QString::fromLatin1("KCM Locale"));
- langs = ent.readListEntry(QString::fromLatin1("Languages"));
+ ent.setGroup(TQString::fromLatin1("KCM Locale"));
+ langs = ent.readListEntry(TQString::fromLatin1("Languages"));
- QString lang = QString::fromLatin1("en_US");
+ TQString lang = TQString::fromLatin1("en_US");
// use the first INSTALLED langauge in the list, or default to C
- for ( QStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) {
+ for ( TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) {
if (cb_language->contains(*it)) {
lang = *it;
break;
diff --git a/kpersonalizer/kcountrypage.h b/kpersonalizer/kcountrypage.h
index 7b30b5ba4..eade9fc67 100644
--- a/kpersonalizer/kcountrypage.h
+++ b/kpersonalizer/kcountrypage.h
@@ -31,7 +31,7 @@ class KFindLanguage;
class KCountryPage : public KCountryPageDlg {
Q_OBJECT
public:
- KCountryPage(QWidget *parent=0, const char *name=0);
+ KCountryPage(TQWidget *parent=0, const char *name=0);
~KCountryPage();
void loadCountryList(KLanguageButton *combo);
@@ -44,12 +44,12 @@ public:
bool b_startedLanguageChanged;
private:
- QStringList langs;
- QString s_oldlocale;
+ TQStringList langs;
+ TQString s_oldlocale;
KFindLanguage *flang;
private slots: // Private slots
- void setLangForCountry(const QString &);
+ void setLangForCountry(const TQString &);
void setLanguageChanged();
};
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index f7794724c..3349ab4c3 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -14,15 +14,15 @@
* (at your option) any later version. *
* *
***************************************************************************/
-#include <qpushbutton.h>
-#include <qbuttongroup.h>
-#include <qlabel.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qslider.h>
-#include <qcolor.h>
-#include <qsettings.h>
-#include <qfont.h>
+#include <tqpushbutton.h>
+#include <tqbuttongroup.h>
+#include <tqlabel.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqslider.h>
+#include <tqcolor.h>
+#include <tqsettings.h>
+#include <tqfont.h>
#include <ksimpleconfig.h>
#include <kglobal.h>
@@ -45,7 +45,7 @@
#include "ksysinfo.h"
#include "keyecandypage.h"
-KEyeCandyPage::KEyeCandyPage(QWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) {
+KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) {
kwinconf = new KConfig("kwinrc", false, true);
kwineventconf = new KConfig("kwin.eventsrc", false, false);
@@ -68,61 +68,61 @@ KEyeCandyPage::KEyeCandyPage(QWidget *parent, const char *name ) : KEyeCandyPage
klv_features->setFullWidth (true);
// Level 1
- desktop_wallpaper = new QCheckListItem(klv_features, i18n("Desktop Wallpaper"),
- QCheckListItem::CheckBox);
- desktop_window_effects= new QCheckListItem(klv_features, i18n("Window Moving/Resizing Effects"),
- QCheckListItem::CheckBox);
- desktop_window_moving_contents= new QCheckListItem(klv_features, i18n("Display Contents in Moving/Resizing Windows"),
- QCheckListItem::CheckBox);
+ desktop_wallpaper = new TQCheckListItem(klv_features, i18n("Desktop Wallpaper"),
+ TQCheckListItem::CheckBox);
+ desktop_window_effects= new TQCheckListItem(klv_features, i18n("Window Moving/Resizing Effects"),
+ TQCheckListItem::CheckBox);
+ desktop_window_moving_contents= new TQCheckListItem(klv_features, i18n("Display Contents in Moving/Resizing Windows"),
+ TQCheckListItem::CheckBox);
// Level 2
- backgrounds_konqueror= new QCheckListItem(klv_features, i18n("File Manager Background Picture"),
- QCheckListItem::CheckBox);
- backgrounds_panel= new QCheckListItem(klv_features, i18n("Panel Background Picture"),
- QCheckListItem::CheckBox);
+ backgrounds_konqueror= new TQCheckListItem(klv_features, i18n("File Manager Background Picture"),
+ TQCheckListItem::CheckBox);
+ backgrounds_panel= new TQCheckListItem(klv_features, i18n("Panel Background Picture"),
+ TQCheckListItem::CheckBox);
// Level 3
- icon_zooming_panel = new QCheckListItem(klv_features, i18n("Panel Icon Popups"),
- QCheckListItem::CheckBox);
- icon_effect_gamma = new QCheckListItem(klv_features, i18n("Icon Highlighting"),
- QCheckListItem::CheckBox);
- icon_mng_animation = new QCheckListItem(klv_features, i18n("File Manager Icon Animation"),
- QCheckListItem::CheckBox);
+ icon_zooming_panel = new TQCheckListItem(klv_features, i18n("Panel Icon Popups"),
+ TQCheckListItem::CheckBox);
+ icon_effect_gamma = new TQCheckListItem(klv_features, i18n("Icon Highlighting"),
+ TQCheckListItem::CheckBox);
+ icon_mng_animation = new TQCheckListItem(klv_features, i18n("File Manager Icon Animation"),
+ TQCheckListItem::CheckBox);
- sound_scheme = new QCheckListItem(klv_features, i18n("Sound Theme"),
- QCheckListItem::CheckBox);
+ sound_scheme = new TQCheckListItem(klv_features, i18n("Sound Theme"),
+ TQCheckListItem::CheckBox);
// Level 4
///////////////////////////////////////////////////////////////////////////////////
/// DEPENDEND ON RESOLUTION; DEFAULT: DON`T USE IN LEVELS
- icon_effect_size_desktop = new QCheckListItem(klv_features, i18n("Large Desktop Icons"),
- QCheckListItem::CheckBox);
- icon_effect_size_panel = new QCheckListItem(klv_features, i18n("Large Panel Icons"),
- QCheckListItem::CheckBox);
+ icon_effect_size_desktop = new TQCheckListItem(klv_features, i18n("Large Desktop Icons"),
+ TQCheckListItem::CheckBox);
+ icon_effect_size_panel = new TQCheckListItem(klv_features, i18n("Large Panel Icons"),
+ TQCheckListItem::CheckBox);
/// DEPENDEND ON RESOLUTION; DEFAULT: DON`T USE IN LEVELS
///////////////////////////////////////////////////////////////////////////////////
- antialiasing_fonts = new QCheckListItem(klv_features, i18n("Smoothed Fonts "
- "(Antialiasing)"), QCheckListItem::CheckBox);
+ antialiasing_fonts = new TQCheckListItem(klv_features, i18n("Smoothed Fonts "
+ "(Antialiasing)"), TQCheckListItem::CheckBox);
// Level 5
- preview_images = new QCheckListItem(klv_features, i18n("Preview Images"),
- QCheckListItem::CheckBox);
- pushbutton_icons = new QCheckListItem(klv_features, i18n("Icons on Buttons"),
- QCheckListItem::CheckBox);
+ preview_images = new TQCheckListItem(klv_features, i18n("Preview Images"),
+ TQCheckListItem::CheckBox);
+ pushbutton_icons = new TQCheckListItem(klv_features, i18n("Icons on Buttons"),
+ TQCheckListItem::CheckBox);
// Level 6
- animated_combo = new QCheckListItem(klv_features, i18n("Animated Combo Boxes"),
- QCheckListItem::CheckBox);
+ animated_combo = new TQCheckListItem(klv_features, i18n("Animated Combo Boxes"),
+ TQCheckListItem::CheckBox);
// Level 7
- fading_tooltips = new QCheckListItem(klv_features, i18n("Fading Tooltips"), QCheckListItem::CheckBox);
+ fading_tooltips = new TQCheckListItem(klv_features, i18n("Fading Tooltips"), TQCheckListItem::CheckBox);
// Level 8
- preview_text = new QCheckListItem(klv_features, i18n("Preview Text Files"),
- QCheckListItem::CheckBox);
+ preview_text = new TQCheckListItem(klv_features, i18n("Preview Text Files"),
+ TQCheckListItem::CheckBox);
// Level 9
- fading_menus= new QCheckListItem(klv_features, i18n("Fading Menus"),
- QCheckListItem::CheckBox);
- preview_other = new QCheckListItem(klv_features, i18n("Preview Other Files"),
- QCheckListItem::CheckBox);
+ fading_menus= new TQCheckListItem(klv_features, i18n("Fading Menus"),
+ TQCheckListItem::CheckBox);
+ preview_other = new TQCheckListItem(klv_features, i18n("Preview Other Files"),
+ TQCheckListItem::CheckBox);
getUserDefaults(); // get user's current settings
setDefaults(); // set the initial level on the slider and checkboxes
@@ -191,10 +191,10 @@ void KEyeCandyPage::slotEyeCandySliderMoved(int value){
// Level 4
icon_mng_animation->setOn(true);
if(osStyle=="mac" || osStyle=="CDE"){
- for (int i = 0; i < QApplication::desktop()->numScreens(); i++) {
- if(QApplication::desktop()->screenGeometry(i).width() >= 1024)
+ for (int i = 0; i < TQApplication::desktop()->numScreens(); i++) {
+ if(TQApplication::desktop()->screenGeometry(i).width() >= 1024)
icon_effect_size_desktop->setOn(true); // enable 48x48 icons by default if a screen size is wider than 1024
- if(QApplication::desktop()->screenGeometry(i).width() >= 1280)
+ if(TQApplication::desktop()->screenGeometry(i).width() >= 1280)
icon_effect_size_panel->setOn(true);
}
}
@@ -217,10 +217,10 @@ void KEyeCandyPage::slotEyeCandySliderMoved(int value){
// Level 8
preview_text->setOn(true);
// icon-size (now for all selections)
- for (int i = 0; i < QApplication::desktop()->numScreens(); i++) {
- if(QApplication::desktop()->screenGeometry(i).width() >= 1024)
+ for (int i = 0; i < TQApplication::desktop()->numScreens(); i++) {
+ if(TQApplication::desktop()->screenGeometry(i).width() >= 1024)
icon_effect_size_desktop->setOn(true);
- if(QApplication::desktop()->screenGeometry(i).width() >= 1280)
+ if(TQApplication::desktop()->screenGeometry(i).width() >= 1280)
icon_effect_size_panel->setOn(true);
}
}
@@ -252,7 +252,7 @@ void KEyeCandyPage::enableDesktopWallpaper(bool enable, bool user){
//here we change the kdesktop font color to white as it fits better
// to the KDE34png.png gray background
kdesktopconf->setGroup("FMSettings");
- kdesktopconf->writeEntry("NormalTextColor", QColor("#FFFFFF") );
+ kdesktopconf->writeEntry("NormalTextColor", TQColor("#FFFFFF") );
kdesktopconf->setGroup("Desktop0");
}
else{
@@ -359,7 +359,7 @@ void KEyeCandyPage::enableBackgroundsKonqueror(bool enable){
konqbgimage="kde4ever.png";
konquerorconf->writePathEntry("BgImage", konqbgimage);
} else
- konquerorconf->writePathEntry("BgImage", QString::null);
+ konquerorconf->writePathEntry("BgImage", TQString::null);
}
//----------------------------BACKGROUNDS-------------------------------------------------
@@ -406,8 +406,8 @@ void KEyeCandyPage::enableIconMngAnimation(bool enable) {
/** No descriptions */
void KEyeCandyPage::enableIconEffectSizePanel(bool enable){
- QByteArray data;
- QDataStream stream( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream stream( data, IO_WriteOnly );
if(enable)
stream << 56;
@@ -486,8 +486,8 @@ and ask them here, set the according string list here.
kdesktoprc's stringlist holds the preview-types wich are supposed to be shown, while konquiconviewrc's
one holds the types, wich are NOT supposed to be shown. We need to take care of that here, too.*/
void KEyeCandyPage::enablePreview(bool currSettings){
- QStringList desktopPreviews;
- QStringList konquerorNoPreviews;
+ TQStringList desktopPreviews;
+ TQStringList konquerorNoPreviews;
KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) {
if(prevOther){
@@ -595,12 +595,12 @@ void KEyeCandyPage::enableAntialiasingFonts(bool enable, bool reset){
if (!reset){
if ( ( (sys->isXfromXFreeInc() && (sys->getXRelease() > 40000000)) || sys->isXfromXOrg() )
&& sys->getRenderSupport()) {
- QSettings().writeEntry("/qt/useXft", enable);
- QSettings().writeEntry("/qt/enableXft", enable);
+ TQSettings().writeEntry("/qt/useXft", enable);
+ TQSettings().writeEntry("/qt/enableXft", enable);
}
} else {
- QSettings().writeEntry("/qt/useXft", b_useXft);
- QSettings().writeEntry("/qt/enableXft", b_enableXft);
+ TQSettings().writeEntry("/qt/useXft", b_useXft);
+ TQSettings().writeEntry("/qt/enableXft", b_enableXft);
}
}
//----------------------------OTHER STUFF-------------------------------------------------
@@ -625,7 +625,7 @@ void KEyeCandyPage::save(bool currSettings){
kapp->dcopClient()->send("kwin*", "", "reconfigure()", "");
// set the display options (style effects)
KIPC::sendMessageAll(KIPC::SettingsChanged);
- QApplication::syncX();
+ TQApplication::syncX();
// kicker stuff: Iconzooming etc.
kapp->dcopClient()->send( "kicker", "Panel", "configure()", "" );
// Icon stuff
@@ -672,16 +672,16 @@ void KEyeCandyPage::setDefaults(){
/** retrieves the user's local values. In case he doesn't have these set, use the default values of KDE, level 4. */
void KEyeCandyPage::getUserDefaults(){
- QByteArray replydata;
- QByteArray data;
- QCString replytype;
+ TQByteArray replydata;
+ TQByteArray data;
+ TQCString replytype;
kapp->dcopClient()->call( "kicker", "Panel", "panelSize()",data, replytype, replydata);
- QDataStream stream( replydata, IO_ReadOnly );
+ TQDataStream stream( replydata, IO_ReadOnly );
stream >> panelsize;
// Wallpaper-User-Defaults
kdesktopconf->setGroup("FMSettings");
- QColor tempcolor=KGlobalSettings::textColor();
+ TQColor tempcolor=KGlobalSettings::textColor();
desktopTextColor = kdesktopconf->readColorEntry("NormalTextColor", &tempcolor );
kdesktopconf->setGroup("Background Common");
st_UserWallpaper.CommonDesktop = kdesktopconf->readBoolEntry("CommonDesktop", true);
@@ -695,8 +695,8 @@ void KEyeCandyPage::getUserDefaults(){
KGlobal::config()->setGroup("KDE");
// Font-User-Defaults
- b_useXft=QSettings().readBoolEntry("/qt/useXft");
- b_enableXft=QSettings().readBoolEntry("/qt/enableXft");
+ b_useXft=TQSettings().readBoolEntry("/qt/useXft");
+ b_enableXft=TQSettings().readBoolEntry("/qt/enableXft");
KGlobal::config()->setGroup("PanelIcons");
st_UserGamma.EffectPanel=KGlobal::config()->readEntry("ActiveEffect", "none");
@@ -845,7 +845,7 @@ void KEyeCandyPage::saveCheckState(bool currSettings){ // currSettings= true ->
/** to be connected to the OS page. changes default values of features according
to the desktop selection*/
-void KEyeCandyPage::slotPresetSlider(const QString& style){
+void KEyeCandyPage::slotPresetSlider(const TQString& style){
osStyle=style;
slotEyeCandySliderMoved( sld_effects-> value()); //apply changes (slider is not moved)
}
diff --git a/kpersonalizer/keyecandypage.h b/kpersonalizer/keyecandypage.h
index 9cb0e4596..2e68b2d9c 100644
--- a/kpersonalizer/keyecandypage.h
+++ b/kpersonalizer/keyecandypage.h
@@ -31,7 +31,7 @@ class KSysInfo;
class KEyeCandyPage : public KEyeCandyPageDlg {
Q_OBJECT
public:
- KEyeCandyPage(QWidget *parent=0, const char *name=0);
+ KEyeCandyPage(TQWidget *parent=0, const char *name=0);
~KEyeCandyPage();
//---------------------------------------------------------------------------------------------------------
@@ -125,34 +125,34 @@ public slots:
void slotEyeCandyShowDetails(bool details);
/** to be connected to the OS page. changes default values of features according
to the desktop selection*/
- void slotPresetSlider(const QString& style);
+ void slotPresetSlider(const TQString& style);
private:
// DEFAULT VALUES SET BY USER
int panelsize; // kicker panelsize 0,1,2,3 before the big icons are set to reset that
int desktopiconsize;
- QString osStyle; //stores OS-Style selection (page 2)
+ TQString osStyle; //stores OS-Style selection (page 2)
bool b_EffectFadeMenu, b_EffectAnimateCombo, b_EffectFadeTooltip, b_EnableIconZoom,
b_AnimateMinimize, b_AnimateShade, b_MoveResizeMaximizedWindows,
b_ShadeHover, b_useXft, b_enableXft, b_PushButtonIcons, b_EffectsEnabled,
b_iconMngAnim, b_konq_prev_sound, b_konq_prev_enable, b_OpaqueResize;
- QString konqbgimage, s_ResizeMode, s_MoveMode, deskbgimage;
- QStringList konq_dont_prev, kdesktop_prev;
- QColor desktopTextColor;
+ TQString konqbgimage, s_ResizeMode, s_MoveMode, deskbgimage;
+ TQStringList konq_dont_prev, kdesktop_prev;
+ TQColor desktopTextColor;
struct st_Gamma{
- QString EffectDesktop;
- QString EffectPanel;
- QString ValueDesktop;
- QString ValuePanel;
+ TQString EffectDesktop;
+ TQString EffectPanel;
+ TQString ValueDesktop;
+ TQString ValuePanel;
} st_UserGamma;
struct st_Wallpaper{
bool CommonDesktop;
- QString MultiWallpaperMode;
- QString WallpaperMode;
- QString Wallpaper;
+ TQString MultiWallpaperMode;
+ TQString WallpaperMode;
+ TQString Wallpaper;
} st_UserWallpaper;
struct st_Sound {
@@ -191,37 +191,37 @@ private:
bool prevImage, prevText, prevOther;
- QCheckListItem* alpha_blending_desktop;
- QCheckListItem* alpha_blending_panel;
+ TQCheckListItem* alpha_blending_desktop;
+ TQCheckListItem* alpha_blending_panel;
- QCheckListItem* animated_combo;
+ TQCheckListItem* animated_combo;
- QCheckListItem* antialiasing_fonts;
+ TQCheckListItem* antialiasing_fonts;
- QCheckListItem* backgrounds_konqueror;
- QCheckListItem* backgrounds_panel;
+ TQCheckListItem* backgrounds_konqueror;
+ TQCheckListItem* backgrounds_panel;
- QCheckListItem* desktop_wallpaper;
- QCheckListItem* desktop_window_effects;
- QCheckListItem* desktop_window_moving_contents;
+ TQCheckListItem* desktop_wallpaper;
+ TQCheckListItem* desktop_window_effects;
+ TQCheckListItem* desktop_window_moving_contents;
- QCheckListItem* icon_effect_gamma;
- QCheckListItem* icon_effect_size_desktop;
- QCheckListItem* icon_effect_size_panel;
+ TQCheckListItem* icon_effect_gamma;
+ TQCheckListItem* icon_effect_size_desktop;
+ TQCheckListItem* icon_effect_size_panel;
- QCheckListItem* icon_zooming_panel;
- QCheckListItem* icon_mng_animation;
+ TQCheckListItem* icon_zooming_panel;
+ TQCheckListItem* icon_mng_animation;
- QCheckListItem* fading_menus;
- QCheckListItem* fading_tooltips;
+ TQCheckListItem* fading_menus;
+ TQCheckListItem* fading_tooltips;
- QCheckListItem* pushbutton_icons;
+ TQCheckListItem* pushbutton_icons;
- QCheckListItem* preview_text;
- QCheckListItem* preview_images;
- QCheckListItem* preview_other;
+ TQCheckListItem* preview_text;
+ TQCheckListItem* preview_images;
+ TQCheckListItem* preview_other;
- QCheckListItem* sound_scheme;
+ TQCheckListItem* sound_scheme;
};
#endif
diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp
index b1ebb419b..a23f98322 100644
--- a/kpersonalizer/kfindlanguage.cpp
+++ b/kpersonalizer/kfindlanguage.cpp
@@ -17,9 +17,9 @@
#include <stdlib.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qmap.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqmap.h>
#include <ksimpleconfig.h>
#include <kglobal.h>
@@ -38,7 +38,7 @@ KFindLanguage::KFindLanguage() {
m_country = config->readEntry("Country", "C");
if (m_country == "C") {
- m_country = QString::fromLatin1(getenv("LANG"));
+ m_country = TQString::fromLatin1(getenv("LANG"));
if(m_country.left(5) == "nn_NO") // glibc's nn_NO is KDE's no_NY
m_country = "no";
if(m_country.contains("_"))
@@ -54,34 +54,34 @@ KFindLanguage::KFindLanguage() {
}
// get the users primary Languages
- KSimpleConfig ent(locate("locale", QString::fromLatin1("l10n/%1/entry.desktop").arg(m_country)), true);
+ KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop").arg(m_country)), true);
ent.setGroup("KCM Locale");
- QStringList langs = ent.readListEntry("Languages");
+ TQStringList langs = ent.readListEntry("Languages");
if (langs.isEmpty())
langs.append("en_US");
// add the primary languages for the country to the list
- QStringList prilang;
- for ( QStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it ) {
- QString str = locate("locale", *it + "/entry.desktop");
+ TQStringList prilang;
+ for ( TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it ) {
+ TQString str = locate("locale", *it + "/entry.desktop");
if (!str.isNull())
prilang << str;
}
// add all languages to the list
- QStringList alllang = KGlobal::dirs()->findAllResources("locale", "*/entry.desktop", false, true);
+ TQStringList alllang = KGlobal::dirs()->findAllResources("locale", "*/entry.desktop", false, true);
alllang.sort();
- QStringList langlist = prilang;
+ TQStringList langlist = prilang;
if (langlist.count() > 0)
- langlist << QString::null; // separator
+ langlist << TQString::null; // separator
langlist += alllang;
- for ( QStringList::ConstIterator it = langlist.begin(); it != langlist.end(); ++it ) {
+ for ( TQStringList::ConstIterator it = langlist.begin(); it != langlist.end(); ++it ) {
KSimpleConfig entry(*it);
entry.setGroup("KCM Locale");
- QString name = entry.readEntry("Name", i18n("without name"));
+ TQString name = entry.readEntry("Name", i18n("without name"));
- QString tag = *it;
+ TQString tag = *it;
int index = tag.findRev('/');
tag = tag.left(index);
index = tag.findRev('/');
@@ -92,11 +92,11 @@ KFindLanguage::KFindLanguage() {
}
// now find the best language for the user
- QString compare = m_oldlang;
+ TQString compare = m_oldlang;
if (m_oldlang.isEmpty()) {
compare = langs.first();
- for(QStringList::Iterator it = langs.begin(); it != langs.end(); ++it) {
- if (*it == QString::fromLatin1(getenv("LANG")).mid(3, 2).lower())
+ for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) {
+ if (*it == TQString::fromLatin1(getenv("LANG")).mid(3, 2).lower())
compare = *it;
}
}
@@ -106,10 +106,10 @@ KFindLanguage::KFindLanguage() {
// Find the users's language
int bestmatch = -1;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for( it = m_langlist.begin(); it != m_langlist.end(); ++it) {
int match=0;
- QString l = (*it).left((*it).find(";"));
+ TQString l = (*it).left((*it).find(";"));
if (l == "C")
match++;
if(l.contains(compare))
@@ -130,22 +130,22 @@ KFindLanguage::KFindLanguage() {
KFindLanguage::~KFindLanguage() {
}
-QStringList KFindLanguage::getLangList() const {
+TQStringList KFindLanguage::getLangList() const {
return m_langlist;
}
-QMap<QString,QString> KFindLanguage::getLangMap() const {
+TQMap<TQString,TQString> KFindLanguage::getLangMap() const {
return m_langmap;
}
-QString KFindLanguage::getBestLang() const {
+TQString KFindLanguage::getBestLang() const {
return m_bestlang;
}
-QString KFindLanguage::getOldLang() const {
+TQString KFindLanguage::getOldLang() const {
return m_oldlang;
}
-QString KFindLanguage::getCountry() const {
+TQString KFindLanguage::getCountry() const {
return m_country;
}
diff --git a/kpersonalizer/kfindlanguage.h b/kpersonalizer/kfindlanguage.h
index 1c57f3017..961c14092 100644
--- a/kpersonalizer/kfindlanguage.h
+++ b/kpersonalizer/kfindlanguage.h
@@ -22,17 +22,17 @@ class KFindLanguage {
public:
KFindLanguage();
~KFindLanguage();
- QStringList getLangList() const;
- QMap<QString,QString> getLangMap() const;
- QString getBestLang() const;
- QString getOldLang() const;
- QString getCountry() const;
+ TQStringList getLangList() const;
+ TQMap<TQString,TQString> getLangMap() const;
+ TQString getBestLang() const;
+ TQString getOldLang() const;
+ TQString getCountry() const;
private:
- QStringList m_langlist; // stores tags like "en_US"
- QMap<QString,QString> m_langmap; // stores tag -> name pairs
- QString m_country;
- QString m_oldlang;
- QString m_bestlang;
+ TQStringList m_langlist; // stores tags like "en_US"
+ TQMap<TQString,TQString> m_langmap; // stores tag -> name pairs
+ TQString m_country;
+ TQString m_oldlang;
+ TQString m_bestlang;
};
#endif
diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp
index 81c2e57b6..839cc241a 100644
--- a/kpersonalizer/kospage.cpp
+++ b/kpersonalizer/kospage.cpp
@@ -15,11 +15,11 @@
* *
***************************************************************************/
-#include <qlabel.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qtextview.h>
-#include <qmap.h>
+#include <tqlabel.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqtextview.h>
+#include <tqmap.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
@@ -36,7 +36,7 @@
#include "kospage.h"
-KOSPage::KOSPage(QWidget *parent, const char *name ) : KOSPageDlg(parent,name) {
+KOSPage::KOSPage(TQWidget *parent, const char *name ) : KOSPageDlg(parent,name) {
px_osSidebar->setPixmap(UserIcon("step2.png"));
// initialize the textview with the default description - KDE of course
slotKDEDescription();
@@ -87,10 +87,10 @@ void KOSPage::save(bool currSettings){
///////////////////////////////////////////
// kcmdisplay changes
KIPC::sendMessageAll(KIPC::SettingsChanged);
- QApplication::syncX();
+ TQApplication::syncX();
// enable/disable the mac menu, call dcop
// Tell kdesktop about the new config file
- kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", QByteArray());
+ kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray());
///////////////////////////////////////////
/// restart kwin for window effects
kapp->dcopClient()->send("kwin*", "", "reconfigure()", "");
@@ -305,7 +305,7 @@ void KOSPage::writeMacOS(){
/** write Keyscheme to kdeglobals (called by saveCheckState) */
-void KOSPage::writeKeyEntrys(QString keyfile){
+void KOSPage::writeKeyEntrys(TQString keyfile){
kdDebug() << "KOSPage::writeKeyEntrys()" << endl;
// load the given .kksrc - file
@@ -314,13 +314,13 @@ void KOSPage::writeKeyEntrys(QString keyfile){
KSimpleConfig* defScheme = new KSimpleConfig(locate("keys", "kde3.kksrc"), true);
// we need the entries from the default - file, so we can compare with them
- QMap<QString, QString> defMap = defScheme->entryMap("Global Shortcuts");
+ TQMap<TQString, TQString> defMap = defScheme->entryMap("Global Shortcuts");
// first delete the group in kdeglobals, then write the non-default entries from the global .kksrc - file
cglobal->deleteGroup("Global Shortcuts", true, true);
// get the Global - Shortcuts and write them to kdeglobals
cglobal->setGroup("Global Shortcuts");
- QMap<QString, QString> givenMap = scheme->entryMap("Global Shortcuts");
- for ( QMap<QString, QString>::Iterator it = givenMap.begin(); it != givenMap.end(); ++it ) {
+ TQMap<TQString, TQString> givenMap = scheme->entryMap("Global Shortcuts");
+ for ( TQMap<TQString, TQString>::Iterator it = givenMap.begin(); it != givenMap.end(); ++it ) {
if ( (defMap[it.key()] == it.data()) && (it.data() != "none") ) {
cglobal->writeEntry(it.key(), "default("+it.data()+")", true, true);
} else {
@@ -334,7 +334,7 @@ void KOSPage::writeKeyEntrys(QString keyfile){
cglobal->deleteGroup("Shortcuts", true, true);
cglobal->setGroup("Shortcuts");
givenMap = scheme->entryMap("Shortcuts");
- for ( QMap<QString, QString>::Iterator it = givenMap.begin(); it != givenMap.end(); ++it ) {
+ for ( TQMap<TQString, TQString>::Iterator it = givenMap.begin(); it != givenMap.end(); ++it ) {
// only write the entry, if it defers from kde3.kksrc
if ( defMap[it.key()] != it.data() ) {
cglobal->writeEntry(it.key(), it.data(), true, true);
@@ -485,7 +485,7 @@ void KOSPage::writeUserKeys(){
kdDebug() << "KOSPage::writeUserKeys()" << endl;
cglobal->setGroup("Global Shortcuts");
- QMap<QString, QString>::Iterator it;
+ TQMap<TQString, TQString>::Iterator it;
for ( it = map_GlobalUserKeys.begin(); it != map_GlobalUserKeys.end(); ++it ) {
cglobal->writeEntry(it.key(), it.data(), true, true);
}
diff --git a/kpersonalizer/kospage.h b/kpersonalizer/kospage.h
index 05756e887..b28719dc1 100644
--- a/kpersonalizer/kospage.h
+++ b/kpersonalizer/kospage.h
@@ -28,7 +28,7 @@
class KOSPage : public KOSPageDlg {
Q_OBJECT
public:
- KOSPage(QWidget *parent=0, const char *name=0);
+ KOSPage(TQWidget *parent=0, const char *name=0);
~KOSPage();
void save(bool currSettings=true);
void saveCheckState(bool currSettings);
@@ -36,7 +36,7 @@ public:
void writeUNIX();
void writeWindows();
void writeMacOS();
- void writeKeyEntrys(QString keyfile);
+ void writeKeyEntrys(TQString keyfile);
void writeUserKeys();
void writeUserDefaults();
/** retrieve the user's local values */
@@ -50,7 +50,7 @@ public:
signals: // Signals
/** emits either of: KDE, CDE, win or mac in save() depending
on the selection made by the user. */
- void selectedOS(const QString&);
+ void selectedOS(const TQString&);
private:
KConfig* cglobal;
KConfig* claunch;
@@ -66,7 +66,7 @@ private:
b_DesktopUnderline, b_KonqUnderline, b_ChangeCursor, b_syncClipboards;
QString s_TitlebarDCC, s_FocusPolicy, s_AltTabStyle, s_MMB,
s_TitlebarMMB, s_TitlebarRMB;
- QMap<QString, QString> map_AppUserKeys, map_GlobalUserKeys;
+ TQMap<TQString, TQString> map_AppUserKeys, map_GlobalUserKeys;
// DEFAULT VALLUES SET BY USER (END)
};
#endif
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index 0f92f8bb1..6b3692a04 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -17,13 +17,13 @@
#include <unistd.h>
-#include <qpushbutton.h>
-#include <qlabel.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qfile.h>
-#include <qtimer.h>
-#include <qcursor.h>
+#include <tqpushbutton.h>
+#include <tqlabel.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqfile.h>
+#include <tqtimer.h>
+#include <tqcursor.h>
#include <ksimpleconfig.h>
#include <kglobal.h>
@@ -53,7 +53,7 @@
bool KPersonalizer::before_session = false;
-KPersonalizer::KPersonalizer(QWidget *parent, const char *name)
+KPersonalizer::KPersonalizer(TQWidget *parent, const char *name)
: KWizard(parent, name, true) {
// first, reset the startup from true (see desktop file in share/autostart) to false
@@ -65,34 +65,34 @@ KPersonalizer::KPersonalizer(QWidget *parent, const char *name)
countrypage= new KCountryPage(this);
addPage( countrypage, i18n( "Step 1: Introduction" ) );
- setHelpEnabled(QWizard::page(0), false);
+ setHelpEnabled(TQWizard::page(0), false);
ospage= new KOSPage(this);
addPage(ospage, i18n( "Step 2: I want it my Way..." ) );
- setHelpEnabled(QWizard::page(1), false);
+ setHelpEnabled(TQWizard::page(1), false);
eyecandy= new KEyeCandyPage(this);
addPage( eyecandy, i18n( "Step 3: Eyecandy-O-Meter" ) );
- setHelpEnabled(QWizard::page(2), false);
+ setHelpEnabled(TQWizard::page(2), false);
stylepage= new KStylePage(this);
addPage( stylepage, i18n( "Step 4: Everybody loves Themes" ) );
- setHelpEnabled(QWizard::page(3), false);
+ setHelpEnabled(TQWizard::page(3), false);
refinepage=new KRefinePage(this);
addPage( refinepage, i18n( "Step 5: Time to Refine" ) );
- setHelpEnabled(QWizard::page(4), false);
+ setHelpEnabled(TQWizard::page(4), false);
cancelButton()->setText(i18n("S&kip Wizard"));
- setFinishEnabled(QWizard::page(4), true);
+ setFinishEnabled(TQWizard::page(4), true);
locale = new KLocale("kpersonalizer");
locale->setLanguage(KLocale::defaultLanguage());
- connect(ospage, SIGNAL(selectedOS(const QString&)), stylepage, SLOT(presetStyle(const QString&)));
- connect(ospage, SIGNAL(selectedOS(const QString&)), eyecandy, SLOT(slotPresetSlider(const QString&)));
- connect(refinepage->pb_kcontrol, SIGNAL(clicked()), this, SLOT(accept()));
+ connect(ospage, TQT_SIGNAL(selectedOS(const TQString&)), stylepage, TQT_SLOT(presetStyle(const TQString&)));
+ connect(ospage, TQT_SIGNAL(selectedOS(const TQString&)), eyecandy, TQT_SLOT(slotPresetSlider(const TQString&)));
+ connect(refinepage->pb_kcontrol, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
setPosition();
@@ -114,23 +114,23 @@ void KPersonalizer::next() {
delayedRestart();
} else {
(void)countrypage->save(countrypage->cb_country, countrypage->cb_language);
- QWizard::next();
+ TQWizard::next();
}
}
else if(currentPage()==ospage){
os_dirty=true; // set the dirty flag, changes done that need reverting
ospage->save();
- QWizard::next();
+ TQWizard::next();
}
else if(currentPage()==eyecandy){
eye_dirty=true; // set the dirty flag, changes done that need reverting
eyecandy->save();
- QTimer::singleShot(0, this, SLOT(slotNext()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotNext()));
}
else if(currentPage()==stylepage){
style_dirty=true; // set the dirty flag, changes done that need reverting
stylepage->save();
- QWizard::next();
+ TQWizard::next();
}
if(currentPage()==refinepage) {
finishButton()->setFocus();
@@ -138,16 +138,16 @@ void KPersonalizer::next() {
}
void KPersonalizer::slotNext() {
- QWizard::next();
+ TQWizard::next();
stylepage->switchPrevStyle(); // We need to update the preview-widget, after the page changed
}
void KPersonalizer::back() {
- QWizard::back();
+ TQWizard::back();
}
bool KPersonalizer::askClose(){
- QString text;
+ TQString text;
if (currentPage()==countrypage) {
text = i18n("<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
"<p>The Desktop Settings Wizard helps you to configure the KDE desktop to your personal liking.</p>"
@@ -166,7 +166,7 @@ bool KPersonalizer::askClose(){
}
}
-/** the cancel button is connected to the reject() slot of QDialog,
+/** the cancel button is connected to the reject() slot of TQDialog,
* so we have to reimplement this here to add a dialogbox to ask if we
* really want to quit the wizard.
*/
@@ -176,7 +176,7 @@ void KPersonalizer::reject(){
}
}
-void KPersonalizer::closeEvent(QCloseEvent* e){
+void KPersonalizer::closeEvent(TQCloseEvent* e){
if ( askClose() )
exit(0);
else
@@ -215,7 +215,7 @@ void KPersonalizer::slotRestart() {
}
void KPersonalizer::delayedRestart() {
- QTimer::singleShot(0, this, SLOT(slotRestart()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotRestart()));
}
/** this session is restarted, so we want to start with ospage */
@@ -230,13 +230,13 @@ void KPersonalizer::setBeforeSession(){
before_session = true;
}
-/** there seems to be a bug in QWizard, that makes this evil hack necessary */
+/** there seems to be a bug in TQWizard, that makes this evil hack necessary */
void KPersonalizer::setPosition() {
- QSize hint = countrypage->sizeHint();
- QSize os_size = ospage->sizeHint();
- QSize candy_size = eyecandy->sizeHint();
- QSize style_size = stylepage->sizeHint();
- QSize refine_size = refinepage->sizeHint();
+ TQSize hint = countrypage->sizeHint();
+ TQSize os_size = ospage->sizeHint();
+ TQSize candy_size = eyecandy->sizeHint();
+ TQSize style_size = stylepage->sizeHint();
+ TQSize refine_size = refinepage->sizeHint();
// get the width of the broadest child-widget
if ( hint.width() < os_size.width() )
@@ -259,7 +259,7 @@ void KPersonalizer::setPosition() {
hint.setHeight(refine_size.height());
// set the position
- QRect rect = KGlobalSettings::desktopGeometry(QCursor::pos());
+ TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
int w = rect.x() + (rect.width() - hint.width())/2 - 9;
int h = rect.y() + (rect.height() - hint.height())/2;
move(w, h);
diff --git a/kpersonalizer/kpersonalizer.h b/kpersonalizer/kpersonalizer.h
index 00bd5ed03..5eeb7907e 100644
--- a/kpersonalizer/kpersonalizer.h
+++ b/kpersonalizer/kpersonalizer.h
@@ -40,7 +40,7 @@ class KPersonalizer : public KWizard {
Q_OBJECT
public:
/** construtor */
- KPersonalizer(QWidget* parent=0, const char *name=0);
+ KPersonalizer(TQWidget* parent=0, const char *name=0);
/** destructor */
~KPersonalizer();
@@ -57,7 +57,7 @@ public:
public slots: // Public slots
/** calls all save functions after resetting all features/ OS/ theme selections to KDE default */
void setDefaults();
- /** the cancel button is connected to the reject() slot of QDialog,
+ /** the cancel button is connected to the reject() slot of TQDialog,
* so we have to reimplement this here to add a dialogbox to
* ask if we really want to quit the wizard.
*/
@@ -66,7 +66,7 @@ public slots: // Public slots
* Calls applySettings() to save the current selection.
*/
void accept();
- /** We need this to use it in a QTimer */
+ /** We need this to use it in a TQTimer */
void slotNext();
private:
@@ -89,7 +89,7 @@ protected slots: // Public slots
protected: // Protected methods
// the close button on the titlebar sets e->accept() which we don´t want.
- virtual void closeEvent(QCloseEvent*);
+ virtual void closeEvent(TQCloseEvent*);
bool askClose();
};
diff --git a/kpersonalizer/krefinepage.cpp b/kpersonalizer/krefinepage.cpp
index ce748caa3..1c9a553c0 100644
--- a/kpersonalizer/krefinepage.cpp
+++ b/kpersonalizer/krefinepage.cpp
@@ -14,8 +14,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
-#include <qlabel.h>
-#include <qpushbutton.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
#include <krun.h>
#include <kconfig.h>
@@ -26,9 +26,9 @@
#include "kpersonalizer.h"
-KRefinePage::KRefinePage(QWidget *parent, const char *name ) : KRefinePageDlg(parent,name) {
+KRefinePage::KRefinePage(TQWidget *parent, const char *name ) : KRefinePageDlg(parent,name) {
px_finishSidebar->setPixmap(UserIcon("step5.png"));
- connect( pb_kcontrol, SIGNAL(clicked()), SLOT(startKControl()) );
+ connect( pb_kcontrol, TQT_SIGNAL(clicked()), TQT_SLOT(startKControl()) );
if( KPersonalizer::beforeSession()) {
pb_kcontrol->hide();
lb_kcontrol->hide();
diff --git a/kpersonalizer/krefinepage.h b/kpersonalizer/krefinepage.h
index dda893b93..4065b5a28 100644
--- a/kpersonalizer/krefinepage.h
+++ b/kpersonalizer/krefinepage.h
@@ -27,7 +27,7 @@
class KRefinePage : public KRefinePageDlg {
Q_OBJECT
public:
- KRefinePage(QWidget *parent=0, const char *name=0);
+ KRefinePage(TQWidget *parent=0, const char *name=0);
~KRefinePage();
public slots: // Public slots
/** starts kcontrol via krun when the user presses the
diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp
index b634acaff..1323d94fe 100644
--- a/kpersonalizer/kstylepage.cpp
+++ b/kpersonalizer/kstylepage.cpp
@@ -16,14 +16,14 @@
***************************************************************************/
#include <stdlib.h>
-#include <qdir.h>
-#include <qlabel.h>
-#include <qlistview.h>
-#include <qcolor.h>
-#include <qstylefactory.h>
-#include <qpixmapcache.h>
-#include <qstyle.h>
-#include <qobjectlist.h>
+#include <tqdir.h>
+#include <tqlabel.h>
+#include <tqlistview.h>
+#include <tqcolor.h>
+#include <tqstylefactory.h>
+#include <tqpixmapcache.h>
+#include <tqstyle.h>
+#include <tqobjectlist.h>
#include <kconfig.h>
#include <kstandarddirs.h>
@@ -43,7 +43,7 @@
#include "stylepreview.h"
#include "kstylepage.h"
-KStylePage::KStylePage(QWidget *parent, const char *name ) : KStylePageDlg(parent,name) {
+KStylePage::KStylePage(TQWidget *parent, const char *name ) : KStylePageDlg(parent,name) {
px_stylesSidebar->setPixmap(UserIcon("step4.png"));
@@ -51,36 +51,36 @@ KStylePage::KStylePage(QWidget *parent, const char *name ) : KStylePageDlg(paren
klv_styles->addColumn( i18n( "Description" ) );
klv_styles->setAllColumnsShowFocus(true);
- kde = new QListViewItem( klv_styles);
- kde->setText( 0, QPixmap::defaultDepth() > 8 ? i18n( "Plastik" ) : i18n( "Light" ) );
+ kde = new TQListViewItem( klv_styles);
+ kde->setText( 0, TQPixmap::defaultDepth() > 8 ? i18n( "Plastik" ) : i18n( "Light" ) );
kde->setText( 1, i18n( "KDE default style" ) );
- classic = new QListViewItem( klv_styles);
+ classic = new TQListViewItem( klv_styles);
classic->setText( 0, i18n( "KDE Classic" ) );
classic->setText( 1, i18n( "Classic KDE style" ) );
- keramik = new QListViewItem( klv_styles );
+ keramik = new TQListViewItem( klv_styles );
keramik->setText( 0, i18n( "Keramik" ) );
keramik->setText( 1, i18n( "The previous default style" ) );
- cde = new QListViewItem( klv_styles);
+ cde = new TQListViewItem( klv_styles);
cde->setText( 0, i18n( "Sunshine" ) );
cde->setText( 1, i18n( "A very common desktop" ) );
- win = new QListViewItem( klv_styles );
+ win = new TQListViewItem( klv_styles );
win->setText( 0, i18n( "Redmond" ) );
win->setText( 1, i18n( "A style from the northwest of the USA" ) );
- platinum = new QListViewItem( klv_styles );
+ platinum = new TQListViewItem( klv_styles );
platinum->setText( 0, i18n( "Platinum" ) );
platinum->setText( 1, i18n( "The platinum style" ) );
- connect(klv_styles, SIGNAL(selectionChanged()),
- this, SLOT(slotCurrentChanged()));
+ connect(klv_styles, TQT_SIGNAL(selectionChanged()),
+ this, TQT_SLOT(slotCurrentChanged()));
// Note: if the default is changed here it needs to be changed in kdebase/kwin/plugins.cpp
// and kdebase/kwin/kcmkwin/kwindecoration/kwindecoration.cpp as well.
- defaultKWinStyle = QPixmap::defaultDepth() > 8 ? "kwin_plastik" : "kwin_quartz";
+ defaultKWinStyle = TQPixmap::defaultDepth() > 8 ? "kwin_plastik" : "kwin_quartz";
appliedStyle = NULL;
getAvailability();
@@ -105,7 +105,7 @@ void KStylePage::save(bool curSettings){
/** save the widget-style */
void KStylePage::saveStyle(bool curSettings){
- QString style = curSettings ? currentStyle : origStyle;
+ TQString style = curSettings ? currentStyle : origStyle;
KConfig cfg( "kdeglobals" );
cfg.setGroup("General");
cfg.writeEntry( "widgetStyle", style, true, true );
@@ -115,7 +115,7 @@ void KStylePage::saveStyle(bool curSettings){
/** save the KWin-style*/
void KStylePage::saveKWin(bool curSettings){
- QString kwin = origKWinStyle;
+ TQString kwin = origKWinStyle;
if(curSettings) {
KDesktopFile* kdf = 0L;
KStandardDirs* kstd = KGlobal::dirs();
@@ -128,7 +128,7 @@ void KStylePage::saveKWin(bool curSettings){
else if (keramik->isSelected() && kwin_keramik_exist)
kdf = new KDesktopFile(kstd->findResource("data", "kwin/keramik.desktop"));
else if (kde->isSelected()) {
- if (kwin_plastik_exist && (QColor::numBitPlanes() > 8))
+ if (kwin_plastik_exist && (TQColor::numBitPlanes() > 8))
kdf = new KDesktopFile(kstd->findResource("data", "kwin/plastik.desktop"));
else if (kwin_quartz_exist)
kdf = new KDesktopFile(kstd->findResource("data", "kwin/quartz.desktop"));
@@ -188,7 +188,7 @@ void KStylePage::saveColors(bool curSettings){
////////////////////////////////////////////////////
// KDE-1.x support
KSimpleConfig *kconfig =
- new KSimpleConfig( QDir::homeDirPath() + "/.kderc" );
+ new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" );
kconfig->setGroup( "General" );
kconfig->writeEntry("background", toSave->background );
kconfig->writeEntry("selectBackground", toSave->selectBackground );
@@ -218,16 +218,16 @@ void KStylePage::saveColors(bool curSettings){
/** save the icon-theme*/
void KStylePage::saveIcons(bool curSettings) {
- QString theme = origIcons;
+ TQString theme = origIcons;
if (curSettings) {
if ( (kde->isSelected() || platinum->isSelected() || keramik->isSelected())
&& icon_crystalsvg_exist)
theme = "crystalsvg";
else if ( (classic->isSelected() || cde->isSelected() || win->isSelected())
- && (QColor::numBitPlanes() > 8) && icon_kdeclassic_exist)
+ && (TQColor::numBitPlanes() > 8) && icon_kdeclassic_exist)
theme = "kdeclassic";
else if ( (classic->isSelected() || cde->isSelected() || win->isSelected())
- && (QColor::numBitPlanes() <= 8) && icon_Locolor_exist)
+ && (TQColor::numBitPlanes() <= 8) && icon_Locolor_exist)
theme = "Locolor";
}
// save, what we got
@@ -238,7 +238,7 @@ void KStylePage::saveIcons(bool curSettings) {
for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++) {
if (groups[i] == 0L)
break;
- KGlobal::config()->setGroup(QString::fromLatin1(groups[i]) + "Icons");
+ KGlobal::config()->setGroup(TQString::fromLatin1(groups[i]) + "Icons");
KGlobal::config()->writeEntry("Size", icontheme.defaultSize(i));
}
KGlobal::config()->sync();
@@ -270,7 +270,7 @@ void KStylePage::changeCurrentStyle() {
}
else if (classic->isSelected()) {
// Use the highcolor style if the display supports it
- if ( (QColor::numBitPlanes() > 8) && kde_hc_exist ) {
+ if ( (TQColor::numBitPlanes() > 8) && kde_hc_exist ) {
currentStyle="HighColor";
}
else if (kde_def_exist) {
@@ -279,7 +279,7 @@ void KStylePage::changeCurrentStyle() {
}
else if (kde->isSelected()) {
// Use the plastik style if the display supports it
- if ( (QColor::numBitPlanes() > 8) && kde_plastik_exist ) {
+ if ( (TQColor::numBitPlanes() > 8) && kde_plastik_exist ) {
currentStyle="Plastik";
}
else if (kde_light_exist) {
@@ -297,7 +297,7 @@ void KStylePage::changeCurrentStyle() {
/** to be connected to the OS page. Catches
* either KDE, CDE, win or mac and pre-sets the style.
*/
-void KStylePage::presetStyle(const QString& style){
+void KStylePage::presetStyle(const TQString& style){
kdDebug() << "KStylePage::presetStyle(): "<< style << endl;
if(style=="KDE") {
if (kde_plastik_exist)
@@ -373,8 +373,8 @@ void KStylePage::getColors(colorSet *set, bool colorfile ){
kdesktop.setGroup("Desktop0");
// set Background (userSettings if available, else default)
set->bgMode=kdesktop.readEntry("BackgroundMode", "Flat");
- QColor tmp1("#003082");
- QColor tmp2("#C0C0C0");
+ TQColor tmp1("#003082");
+ TQColor tmp2("#C0C0C0");
set->usrCol1=kdesktop.readColorEntry("Color1", &tmp1);
set->usrCol2=kdesktop.readColorEntry("Color2", &tmp2);
// write the color scheme filename and the contrast, default 7, otherwise from file
@@ -416,8 +416,8 @@ void KStylePage::getAvailability() {
// test, wich styles are available
kde_keramik_exist = kde_hc_exist = kde_def_exist = cde_exist
= kde_plastik_exist = win_exist = platinum_exist = false;
- QStringList styles = QStyleFactory::keys();
- for (QStringList::iterator it = styles.begin(); it != styles.end(); it++) {
+ TQStringList styles = TQStyleFactory::keys();
+ for (TQStringList::iterator it = styles.begin(); it != styles.end(); it++) {
if (*it == "Keramik") kde_keramik_exist = true;
else if (*it == "HighColor") kde_hc_exist = true;
else if (*it == "Default") kde_def_exist = true;
@@ -430,7 +430,7 @@ void KStylePage::getAvailability() {
// and disable the ListItems, if they are not.
if ( !(kde_plastik_exist || kde_light_exist) ) kde->setVisible(false);
if ( !(kde_hc_exist || kde_def_exist) ) classic->setVisible(false);
- if (!kde_keramik_exist || QPixmap::defaultDepth() <= 8) keramik->setVisible(false);
+ if (!kde_keramik_exist || TQPixmap::defaultDepth() <= 8) keramik->setVisible(false);
if (!cde_exist) cde->setVisible(false);
if (!win_exist) win->setVisible(false);
if (!platinum_exist) platinum->setVisible(false);
@@ -456,8 +456,8 @@ void KStylePage::getAvailability() {
// check, wich Icon-themes are available
icon_crystalsvg_exist = icon_kdeclassic_exist = icon_Locolor_exist = false;
- QStringList icons(KIconTheme::list());
- for (QStringList::iterator it=icons.begin(); it != icons.end(); it++) {
+ TQStringList icons(KIconTheme::list());
+ for (TQStringList::iterator it=icons.begin(); it != icons.end(); it++) {
KIconTheme icontheme(*it);
if (icontheme.isHidden() || !icontheme.isValid()) continue;
if (*it == "crystalsvg") icon_crystalsvg_exist = true;
@@ -502,7 +502,7 @@ void KStylePage::initColors() {
inactiveTitleBtnBg.setRgb(167,181,199);
alternateBackground.setRgb(237,244,249);
- if (QPixmap::defaultDepth() > 8)
+ if (TQPixmap::defaultDepth() > 8)
button.setRgb(221, 223, 228);
else
button.setRgb(220, 220, 220);
@@ -529,16 +529,16 @@ void KStylePage::liveUpdate() {
/** show the previewWidget styled with the selected one */
void KStylePage::switchPrevStyle() {
- QStyle* style = QStyleFactory::create(currentStyle);
+ TQStyle* style = TQStyleFactory::create(currentStyle);
if (!style) return;
stylePreview->unsetPalette();
- QPalette palette = createPalette();
+ TQPalette palette = createPalette();
style->polish(palette);
stylePreview->setPalette(palette);
// Prevent Qt from wrongly caching radio button images
- QPixmapCache::clear();
+ TQPixmapCache::clear();
// go ahead
setStyleRecursive( stylePreview, palette, style );
// this flickers, but reliably draws the widgets corretly.
@@ -548,37 +548,37 @@ void KStylePage::switchPrevStyle() {
appliedStyle = style;
}
-void KStylePage::setStyleRecursive(QWidget* w, QPalette &palette, QStyle* s) {
+void KStylePage::setStyleRecursive(TQWidget* w, TQPalette &palette, TQStyle* s) {
// Apply the new style.
w->setStyle(s);
// Recursively update all children.
- const QObjectList *children = w->children();
+ const TQObjectList *children = w->children();
if (!children)
return;
// Apply the style to each child widget.
- QPtrListIterator<QObject> childit(*children);
- QObject *child;
+ TQPtrListIterator<TQObject> childit(*children);
+ TQObject *child;
while ((child = childit.current()) != 0) {
++childit;
if (child->isWidgetType())
- setStyleRecursive((QWidget *) child, palette, s);
+ setStyleRecursive((TQWidget *) child, palette, s);
}
}
-/** create a QPalette of our current colorset */
-QPalette KStylePage::createPalette() {
+/** create a TQPalette of our current colorset */
+TQPalette KStylePage::createPalette() {
colorSet *cc = &currentColors;
- QColorGroup disabledgrp(cc->windowForeground, cc->background, cc->background.light(150),
+ TQColorGroup disabledgrp(cc->windowForeground, cc->background, cc->background.light(150),
cc->background.dark(), cc->background.dark(120), cc->background.dark(120),
cc->windowBackground);
- QColorGroup colgrp(cc->windowForeground, cc->background, cc->background.light(150),
+ TQColorGroup colgrp(cc->windowForeground, cc->background, cc->background.light(150),
cc->background.dark(), cc->background.dark(120), cc->foreground,
cc->windowBackground);
- colgrp.setColor(QColorGroup::Highlight, cc->selectBackground);
- colgrp.setColor(QColorGroup::HighlightedText, cc->selectForeground);
- colgrp.setColor(QColorGroup::Button, cc->buttonBackground);
- colgrp.setColor(QColorGroup::ButtonText, cc->buttonForeground);
- return QPalette( colgrp, disabledgrp, colgrp);
+ colgrp.setColor(TQColorGroup::Highlight, cc->selectBackground);
+ colgrp.setColor(TQColorGroup::HighlightedText, cc->selectForeground);
+ colgrp.setColor(TQColorGroup::Button, cc->buttonBackground);
+ colgrp.setColor(TQColorGroup::ButtonText, cc->buttonForeground);
+ return TQPalette( colgrp, disabledgrp, colgrp);
}
#include "kstylepage.moc"
diff --git a/kpersonalizer/kstylepage.h b/kpersonalizer/kstylepage.h
index f017f5b99..0c6bf82b7 100644
--- a/kpersonalizer/kstylepage.h
+++ b/kpersonalizer/kstylepage.h
@@ -18,7 +18,7 @@
#ifndef KSTYLEPAGE_H
#define KSTYLEPAGE_H
-#include <qcolor.h>
+#include <tqcolor.h>
#include "kstylepagedlg.h"
/**Abstract class for the style page
@@ -30,7 +30,7 @@ class KStylePage : public KStylePageDlg {
Q_OBJECT
public:
- KStylePage(QWidget *parent=0, const char *name=0);
+ KStylePage(TQWidget *parent=0, const char *name=0);
~KStylePage();
void save(bool curSettings=true);
/** resets to KDE style as default */
@@ -39,58 +39,58 @@ public:
void switchPrevStyle();
private:
- QString origStyle;
- QString origKWinStyle;
- QString origIcons;
- QString defaultKWinStyle;
- QString currentStyle;
+ TQString origStyle;
+ TQString origKWinStyle;
+ TQString origIcons;
+ TQString defaultKWinStyle;
+ TQString currentStyle;
KConfig* ckwin;
struct colorSet {
- QString colorFile, bgMode;
+ TQString colorFile, bgMode;
int contrast;
- QColor usrCol1, usrCol2;
- QColor foreground;
- QColor background;
- QColor windowForeground;
- QColor windowBackground;
- QColor selectForeground;
- QColor selectBackground;
- QColor buttonForeground;
- QColor buttonBackground;
- QColor linkColor;
- QColor visitedLinkColor;
- QColor activeForeground;
- QColor inactiveForeground;
- QColor activeBackground;
- QColor inactiveBackground;
- QColor activeBlend;
- QColor inactiveBlend;
- QColor activeTitleBtnBg;
- QColor inactiveTitleBtnBg;
- QColor alternateBackground;
+ TQColor usrCol1, usrCol2;
+ TQColor foreground;
+ TQColor background;
+ TQColor windowForeground;
+ TQColor windowBackground;
+ TQColor selectForeground;
+ TQColor selectBackground;
+ TQColor buttonForeground;
+ TQColor buttonBackground;
+ TQColor linkColor;
+ TQColor visitedLinkColor;
+ TQColor activeForeground;
+ TQColor inactiveForeground;
+ TQColor activeBackground;
+ TQColor inactiveBackground;
+ TQColor activeBlend;
+ TQColor inactiveBlend;
+ TQColor activeTitleBtnBg;
+ TQColor inactiveTitleBtnBg;
+ TQColor alternateBackground;
} usrColors, currentColors;
// first, the KDE 2 default color values
- QColor widget;
- QColor kde34Blue;
- QColor inactiveBackground;
- QColor activeBackground;
- QColor button;
- QColor link;
- QColor visitedLink;
- QColor activeBlend;
- QColor activeTitleBtnBg;
- QColor inactiveTitleBtnBg;
- QColor inactiveForeground;
- QColor alternateBackground;
-
- QListViewItem * kde;
- QListViewItem * classic;
- QListViewItem * keramik;
- QListViewItem * cde;
- QListViewItem * win;
- QListViewItem * platinum;
-
- QStyle *appliedStyle;
+ TQColor widget;
+ TQColor kde34Blue;
+ TQColor inactiveBackground;
+ TQColor activeBackground;
+ TQColor button;
+ TQColor link;
+ TQColor visitedLink;
+ TQColor activeBlend;
+ TQColor activeTitleBtnBg;
+ TQColor inactiveTitleBtnBg;
+ TQColor inactiveForeground;
+ TQColor alternateBackground;
+
+ TQListViewItem * kde;
+ TQListViewItem * classic;
+ TQListViewItem * keramik;
+ TQListViewItem * cde;
+ TQListViewItem * win;
+ TQListViewItem * platinum;
+
+ TQStyle *appliedStyle;
// widget-style existence
bool kde_hc_exist, kde_def_exist, kde_keramik_exist, kde_light_exist,
@@ -105,7 +105,7 @@ private:
public slots: // Public slots
/** to be connected to the OS page. Catches either KDE, CDE, win or mac and pre-sets the style. */
- void presetStyle(const QString& style);
+ void presetStyle(const TQString& style);
private:
void saveColors(bool curSettings=true);
@@ -117,9 +117,9 @@ private:
void initColors();
void liveUpdate();
void getColors(colorSet *set, bool colorfile );
- void setStyleRecursive(QWidget* w, QPalette &, QStyle* s);
+ void setStyleRecursive(TQWidget* w, TQPalette &, TQStyle* s);
void changeCurrentStyle();
- QPalette createPalette();
+ TQPalette createPalette();
private slots:
void slotCurrentChanged();
diff --git a/kpersonalizer/ksysinfo.cpp b/kpersonalizer/ksysinfo.cpp
index a16c707be..20a089b8f 100644
--- a/kpersonalizer/ksysinfo.cpp
+++ b/kpersonalizer/ksysinfo.cpp
@@ -19,10 +19,10 @@
* Code partly taken from kcontrol/info and kcontrol/fonts
*/
-#include <qfontdatabase.h>
-#include <qfont.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqfontdatabase.h>
+#include <tqfont.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <kdebug.h>
@@ -31,7 +31,7 @@
#include "ksysinfo.h"
KSysInfo::KSysInfo() {
- m_fdb = new QFontDatabase();
+ m_fdb = new TQFontDatabase();
initXInfo();
initFontFamilies();
initHWInfo();
@@ -55,7 +55,7 @@ KSysInfo::~KSysInfo() {
void KSysInfo::initXInfo() {
Display *dpy = XOpenDisplay(0);
// vendor
- m_xvendor = !dpy ? QString::null : (QString)ServerVendor(dpy);
+ m_xvendor = !dpy ? TQString::null : (TQString)ServerVendor(dpy);
// XFree-Inc?
m_xfree_inc = m_xvendor.contains("XFree86");
// X.org ?
@@ -65,10 +65,10 @@ void KSysInfo::initXInfo() {
// RENDER-support
m_xrender = false;
int extCount;
- QString extension;
+ TQString extension;
char **extensions = XListExtensions( dpy, &extCount );
for (int i = 0; i < extCount; i++ ) {
- extension=QString( extensions[i] );
+ extension=TQString( extensions[i] );
extension=extension.stripWhiteSpace();
if (!extension.compare("RENDER"))
m_xrender=true;
@@ -98,13 +98,13 @@ bool KSysInfo::getRenderSupport(){
*/
void KSysInfo::initFontFamilies() {
- QFontDatabase fdb;
- QStringList families = fdb.families();
- m_normal_font = QString::null;
- m_fixed_font = QString::null;
+ TQFontDatabase fdb;
+ TQStringList families = fdb.families();
+ m_normal_font = TQString::null;
+ m_fixed_font = TQString::null;
int normal_priority = 0, fixed_priority = 0;
for (uint i=0; i < families.count(); i++) {
- QString font = *families.at(i);
+ TQString font = *families.at(i);
//add further NORMAL fonts here
if ( (font.contains("Arial [") || font=="Arial") && normal_priority < 15 ) {
m_normal_font = font;
@@ -154,19 +154,19 @@ void KSysInfo::initFontFamilies() {
}
}
-QFont KSysInfo::getNormalFont() {
+TQFont KSysInfo::getNormalFont() {
return m_fdb->font(m_normal_font,"Normal",12); // this will return the current font, if !m_normal_font
}
-QFont KSysInfo::getSmallFont(){
+TQFont KSysInfo::getSmallFont(){
return m_fdb->font(m_normal_font,"Normal",11);
}
-QFont KSysInfo::getBoldFont(){
+TQFont KSysInfo::getBoldFont(){
return m_fdb->font(m_normal_font,"Bold",12);
}
-QFont KSysInfo::getFixedWidthFont(){
+TQFont KSysInfo::getFixedWidthFont(){
return m_fdb->font(m_fixed_font,"Normal",10);
}
@@ -179,12 +179,12 @@ QFont KSysInfo::getFixedWidthFont(){
#ifdef __linux__
///////////////////
- #include <qfile.h>
+ #include <tqfile.h>
#include <math.h>
void KSysInfo::initHWInfo() {
char buf[512];
- QFile *file = new QFile("/proc/cpuinfo");
+ TQFile *file = new TQFile("/proc/cpuinfo");
m_cpu_speed = 0;
@@ -200,8 +200,8 @@ QFont KSysInfo::getFixedWidthFont(){
// File Parser
while (file->readLine(buf, sizeof(buf) - 1) > 0) {
- QString s1 = QString::fromLocal8Bit(buf);
- QString s2 = s1.mid(s1.find(":") + 1);
+ TQString s1 = TQString::fromLocal8Bit(buf);
+ TQString s2 = s1.mid(s1.find(":") + 1);
s1.truncate(s1.find(":"));
s1=s1.stripWhiteSpace();
s2=s2.stripWhiteSpace();
diff --git a/kpersonalizer/ksysinfo.h b/kpersonalizer/ksysinfo.h
index 2d6fcddb8..a78051578 100644
--- a/kpersonalizer/ksysinfo.h
+++ b/kpersonalizer/ksysinfo.h
@@ -32,10 +32,10 @@ public:
int getXRelease();
bool getRenderSupport();
/* font - info */
- QFont getNormalFont();
- QFont getSmallFont();
- QFont getBoldFont();
- QFont getFixedWidthFont();
+ TQFont getNormalFont();
+ TQFont getSmallFont();
+ TQFont getBoldFont();
+ TQFont getFixedWidthFont();
/* Hardware - info */
int getCpuSpeed();
private:
@@ -44,15 +44,15 @@ private:
void initHWInfo();
private:
/* XServer - info */
- QString m_xvendor;
+ TQString m_xvendor;
bool m_xfree_inc;
bool m_xorg;
int m_xrelease;
bool m_xrender;
/* font - info */
- QFontDatabase* m_fdb;
- QString m_normal_font;
- QString m_fixed_font;
+ TQFontDatabase* m_fdb;
+ TQString m_normal_font;
+ TQString m_fixed_font;
/* Hardware - info */
int m_cpu_speed;
};
diff --git a/kpersonalizer/stylepreview.ui.h b/kpersonalizer/stylepreview.ui.h
index 6bd47d62a..d073ddc34 100644
--- a/kpersonalizer/stylepreview.ui.h
+++ b/kpersonalizer/stylepreview.ui.h
@@ -27,7 +27,7 @@
** a constructor, and a destroy() slot in place of a destructor.
*****************************************************************************/
-#include <qobjectlist.h>
+#include <tqobjectlist.h>
#ifdef KeyPress
#undef KeyPress
@@ -41,32 +41,32 @@ void StylePreview::init()
{
// Ensure that the user can't toy with the child widgets.
// Method borrowed from Qt's qtconfig.
- QObjectList* l = queryList("QWidget");
- QObjectListIt it(*l);
- QObject* obj;
+ TQObjectList* l = queryList("TQWidget");
+ TQObjectListIt it(*l);
+ TQObject* obj;
while ((obj = it.current()) != 0)
{
++it;
obj->installEventFilter(this);
- ((QWidget*)obj)->setFocusPolicy(NoFocus);
+ ((TQWidget*)obj)->setFocusPolicy(NoFocus);
}
delete l;
}
-bool StylePreview::eventFilter( QObject* /* obj */, QEvent* ev )
+bool StylePreview::eventFilter( TQObject* /* obj */, TQEvent* ev )
{
switch( ev->type() )
{
- case QEvent::MouseButtonPress:
- case QEvent::MouseButtonRelease:
- case QEvent::MouseButtonDblClick:
- case QEvent::MouseMove:
- case QEvent::KeyPress:
- case QEvent::KeyRelease:
- case QEvent::Enter:
- case QEvent::Leave:
- case QEvent::Wheel:
- case QEvent::ContextMenu:
+ case TQEvent::MouseButtonPress:
+ case TQEvent::MouseButtonRelease:
+ case TQEvent::MouseButtonDblClick:
+ case TQEvent::MouseMove:
+ case TQEvent::KeyPress:
+ case TQEvent::KeyRelease:
+ case TQEvent::Enter:
+ case TQEvent::Leave:
+ case TQEvent::Wheel:
+ case TQEvent::ContextMenu:
return TRUE; // ignore
default:
break;
diff --git a/kreadconfig/kreadconfig.cpp b/kreadconfig/kreadconfig.cpp
index 8ad4d79f1..709d7b781 100644
--- a/kreadconfig/kreadconfig.cpp
+++ b/kreadconfig/kreadconfig.cpp
@@ -53,11 +53,11 @@ int main(int argc, char **argv)
KCmdLineArgs::addCmdLineOptions(options);
KCmdLineArgs *args=KCmdLineArgs::parsedArgs();
- QString group=QString::fromLocal8Bit(args->getOption("group"));
- QString key=QString::fromLocal8Bit(args->getOption("key"));
- QString file=QString::fromLocal8Bit(args->getOption("file"));
- QCString dflt=args->getOption("default");
- QCString type=args->getOption("type").lower();
+ TQString group=TQString::fromLocal8Bit(args->getOption("group"));
+ TQString key=TQString::fromLocal8Bit(args->getOption("key"));
+ TQString file=TQString::fromLocal8Bit(args->getOption("file"));
+ TQCString dflt=args->getOption("default");
+ TQCString type=args->getOption("type").lower();
if (key.isNull()) {
KCmdLineArgs::usage();
diff --git a/kreadconfig/kwriteconfig.cpp b/kreadconfig/kwriteconfig.cpp
index 0246ec709..83d1afe23 100644
--- a/kreadconfig/kwriteconfig.cpp
+++ b/kreadconfig/kwriteconfig.cpp
@@ -36,23 +36,23 @@ int main(int argc, char **argv)
KCmdLineArgs::addCmdLineOptions(options);
KCmdLineArgs *args=KCmdLineArgs::parsedArgs();
- QString group=QString::fromLocal8Bit(args->getOption("group"));
- QString key=QString::fromLocal8Bit(args->getOption("key"));
- QString file=QString::fromLocal8Bit(args->getOption("file"));
- QCString type=args->getOption("type").lower();
+ TQString group=TQString::fromLocal8Bit(args->getOption("group"));
+ TQString key=TQString::fromLocal8Bit(args->getOption("key"));
+ TQString file=TQString::fromLocal8Bit(args->getOption("file"));
+ TQCString type=args->getOption("type").lower();
if (key.isNull() || !args->count()) {
KCmdLineArgs::usage();
return 1;
}
- QCString value = args->arg( 0 );
+ TQCString value = args->arg( 0 );
KInstance inst(&aboutData);
KConfig *konfig;
if (file.isEmpty())
- konfig = new KConfig(QString::fromLatin1("kdeglobals"), false, false);
+ konfig = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
else
konfig = new KConfig(file, false, false);
@@ -64,9 +64,9 @@ int main(int argc, char **argv)
bool boolvalue=(value=="true" || value=="on" || value=="yes" || value=="1");
konfig->writeEntry( key, boolvalue );
} else if (type=="path") {
- konfig->writePathEntry( key, QString::fromLocal8Bit( value ) );
+ konfig->writePathEntry( key, TQString::fromLocal8Bit( value ) );
} else {
- konfig->writeEntry( key, QString::fromLocal8Bit( value ) );
+ konfig->writeEntry( key, TQString::fromLocal8Bit( value ) );
}
konfig->sync();
delete konfig;
diff --git a/kscreensaver/blankscrn.cpp b/kscreensaver/blankscrn.cpp
index 6b0b974c9..1f57726b2 100644
--- a/kscreensaver/blankscrn.cpp
+++ b/kscreensaver/blankscrn.cpp
@@ -8,8 +8,8 @@
// 2001/03/04 Converted to use libkscreensaver by Martin R. Jones
#include <stdlib.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
#include <kapplication.h>
#include <klocale.h>
#include <kconfig.h>
@@ -32,7 +32,7 @@ extern "C"
return new KBlankSaver( id );
}
- KDE_EXPORT QDialog* kss_setup()
+ KDE_EXPORT TQDialog* kss_setup()
{
return new KBlankSetup();
}
@@ -41,25 +41,25 @@ extern "C"
//-----------------------------------------------------------------------------
// dialog to setup screen saver parameters
//
-KBlankSetup::KBlankSetup( QWidget *parent, const char *name )
+KBlankSetup::KBlankSetup( TQWidget *parent, const char *name )
: KDialogBase( parent, name, true, i18n( "Setup Blank Screen Saver" ),
Ok|Cancel, Ok, true )
{
readSettings();
- QFrame *main = makeMainWidget();
- QGridLayout *grid = new QGridLayout(main, 4, 2, 0, spacingHint() );
+ TQFrame *main = makeMainWidget();
+ TQGridLayout *grid = new TQGridLayout(main, 4, 2, 0, spacingHint() );
- QLabel *label = new QLabel( i18n("Color:"), main );
+ TQLabel *label = new TQLabel( i18n("Color:"), main );
grid->addWidget(label, 0, 0);
KColorButton *colorPush = new KColorButton( color, main );
colorPush->setMinimumWidth(80);
- connect( colorPush, SIGNAL( changed(const QColor &) ),
- SLOT( slotColor(const QColor &) ) );
+ connect( colorPush, TQT_SIGNAL( changed(const TQColor &) ),
+ TQT_SLOT( slotColor(const TQColor &) ) );
grid->addWidget(colorPush, 1, 0);
- preview = new QWidget( main );
+ preview = new TQWidget( main );
preview->setFixedSize( 220, 165 );
preview->setBackgroundColor( black );
preview->show(); // otherwise saver does not get correct size
@@ -81,7 +81,7 @@ void KBlankSetup::readSettings()
color = config->readColorEntry( "Color", &black );
}
-void KBlankSetup::slotColor( const QColor &col )
+void KBlankSetup::slotColor( const TQColor &col )
{
color = col;
saver->setColor( color );
@@ -112,7 +112,7 @@ KBlankSaver::~KBlankSaver()
}
// set the color
-void KBlankSaver::setColor( const QColor &col )
+void KBlankSaver::setColor( const TQColor &col )
{
color = col;
blank();
diff --git a/kscreensaver/blankscrn.h b/kscreensaver/blankscrn.h
index 667920cb1..ce9e129b4 100644
--- a/kscreensaver/blankscrn.h
+++ b/kscreensaver/blankscrn.h
@@ -8,7 +8,7 @@
#ifndef __BLANKSCRN_H__
#define __BLANKSCRN_H__
-#include <qcolor.h>
+#include <tqcolor.h>
#include <kdialogbase.h>
#include <kscreensaver.h>
@@ -22,34 +22,34 @@ public:
KBlankSaver( WId drawable );
virtual ~KBlankSaver();
- void setColor( const QColor &col );
+ void setColor( const TQColor &col );
private:
void readSettings();
void blank();
private:
- QColor color;
+ TQColor color;
};
class KBlankSetup : public KDialogBase
{
Q_OBJECT
public:
- KBlankSetup( QWidget *parent = NULL, const char *name = NULL );
+ KBlankSetup( TQWidget *parent = NULL, const char *name = NULL );
protected:
void readSettings();
private slots:
- void slotColor( const QColor & );
+ void slotColor( const TQColor & );
void slotOk();
private:
- QWidget *preview;
+ TQWidget *preview;
KBlankSaver *saver;
- QColor color;
+ TQColor color;
};
#endif
diff --git a/kscreensaver/random.cpp b/kscreensaver/random.cpp
index df971d238..c1cd8dcad 100644
--- a/kscreensaver/random.cpp
+++ b/kscreensaver/random.cpp
@@ -14,11 +14,11 @@
#include <time.h>
#include <unistd.h>
-#include <qtextstream.h>
-#include <qlayout.h>
-#include <qframe.h>
-#include <qcheckbox.h>
-#include <qwidget.h>
+#include <tqtextstream.h>
+#include <tqlayout.h>
+#include <tqframe.h>
+#include <tqcheckbox.h>
+#include <tqwidget.h>
#include <kapplication.h>
#include <kstandarddirs.h>
@@ -96,10 +96,10 @@ int main(int argc, char *argv[])
KGlobal::dirs()->addResourceType("scrsav",
KGlobal::dirs()->kde_default("apps") +
"System/ScreenSavers/");
- QStringList tempSaverFileList = KGlobal::dirs()->findAllResources("scrsav",
+ TQStringList tempSaverFileList = KGlobal::dirs()->findAllResources("scrsav",
"*.desktop", false, true);
- QStringList saverFileList;
+ TQStringList saverFileList;
KConfig type("krandom.kssrc");
type.setGroup("Settings");
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
if(!saver.tryExec())
continue;
kdDebug() << "read X-KDE-Type" << endl;
- QString saverType = saver.readEntry("X-KDE-Type");
+ TQString saverType = saver.readEntry("X-KDE-Type");
if (saverType.isEmpty()) // no X-KDE-Type defined so must be OK
{
@@ -122,8 +122,8 @@ int main(int argc, char *argv[])
}
else
{
- QStringList saverTypes = QStringList::split(";", saverType);
- for (QStringList::ConstIterator it = saverTypes.begin(); it != saverTypes.end(); ++it )
+ TQStringList saverTypes = TQStringList::split(";", saverType);
+ for (TQStringList::ConstIterator it = saverTypes.begin(); it != saverTypes.end(); ++it )
{
kdDebug() << "saverTypes is "<< *it << endl;
if (*it == "ManipulateScreen")
@@ -155,11 +155,11 @@ int main(int argc, char *argv[])
KRandomSequence rnd;
int indx = rnd.getLong(saverFileList.count());
- QString filename = *(saverFileList.at(indx));
+ TQString filename = *(saverFileList.at(indx));
KDesktopFile config(filename, true);
- QString cmd;
+ TQString cmd;
if (windowId && config.hasActionGroup("InWindow"))
{
config.setActionGroup("InWindow");
@@ -170,10 +170,10 @@ int main(int argc, char *argv[])
}
cmd = config.readPathEntry("Exec");
- QTextStream ts(&cmd, IO_ReadOnly);
- QString word;
+ TQTextStream ts(&cmd, IO_ReadOnly);
+ TQString word;
ts >> word;
- QString exeFile = KStandardDirs::findExe(word);
+ TQString exeFile = KStandardDirs::findExe(word);
if (!exeFile.isEmpty())
{
@@ -211,18 +211,18 @@ int main(int argc, char *argv[])
}
-KRandomSetup::KRandomSetup( QWidget *parent, const char *name )
+KRandomSetup::KRandomSetup( TQWidget *parent, const char *name )
: KDialogBase( parent, name, true, i18n( "Setup Random Screen Saver" ),
Ok|Cancel, Ok, true )
{
- QFrame *main = makeMainWidget();
- QGridLayout *grid = new QGridLayout(main, 4, 2, 0, spacingHint() );
+ TQFrame *main = makeMainWidget();
+ TQGridLayout *grid = new TQGridLayout(main, 4, 2, 0, spacingHint() );
- openGL = new QCheckBox( i18n("Use OpenGL screen savers"), main );
+ openGL = new TQCheckBox( i18n("Use OpenGL screen savers"), main );
grid->addWidget(openGL, 0, 0);
- manipulateScreen = new QCheckBox(i18n("Use screen savers that manipulate the screen"), main);
+ manipulateScreen = new TQCheckBox(i18n("Use screen savers that manipulate the screen"), main);
grid->addWidget(manipulateScreen, 1, 0);
setMinimumSize( sizeHint() );
diff --git a/kscreensaver/random.h b/kscreensaver/random.h
index 9f47a1002..aa69fcb71 100644
--- a/kscreensaver/random.h
+++ b/kscreensaver/random.h
@@ -21,13 +21,13 @@ class KRandomSetup : public KDialogBase
{
Q_OBJECT
public:
- KRandomSetup( QWidget *parent = NULL, const char *name = NULL );
+ KRandomSetup( TQWidget *parent = NULL, const char *name = NULL );
private:
- QWidget *preview;
- QCheckBox *openGL;
- QCheckBox *manipulateScreen;
+ TQWidget *preview;
+ TQCheckBox *openGL;
+ TQCheckBox *manipulateScreen;
private slots:
diff --git a/ksmserver/KSMServerInterface.h b/ksmserver/KSMServerInterface.h
index 904b50927..52fdf0942 100644
--- a/ksmserver/KSMServerInterface.h
+++ b/ksmserver/KSMServerInterface.h
@@ -2,7 +2,7 @@
#define KSMSERVER_INTERFACE_H
#include <dcopobject.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
class KSMServerInterface : virtual public DCOPObject
{
@@ -12,16 +12,16 @@ k_dcop:
virtual void logout(int, int, int ) = 0;
virtual void restoreSessionInternal() = 0;
virtual void restoreSessionDoneInternal() = 0;
- virtual QStringList sessionList() = 0;
+ virtual TQStringList sessionList() = 0;
- virtual QString currentSession() = 0;
+ virtual TQString currentSession() = 0;
virtual void saveCurrentSession() = 0;
- virtual void saveCurrentSessionAs( QString ) = 0;
+ virtual void saveCurrentSessionAs( TQString ) = 0;
virtual void autoStart2() = 0;
- virtual void suspendStartup( QCString ) = 0;
- virtual void resumeStartup( QCString ) = 0;
+ virtual void suspendStartup( TQCString ) = 0;
+ virtual void resumeStartup( TQCString ) = 0;
};
#endif
diff --git a/ksmserver/client.cpp b/ksmserver/client.cpp
index 784de496c..2f6708963 100644
--- a/ksmserver/client.cpp
+++ b/ksmserver/client.cpp
@@ -63,7 +63,7 @@ KSMClient::~KSMClient()
SmProp* KSMClient::property( const char* name ) const
{
- for ( QPtrListIterator<SmProp> it( properties ); it.current(); ++it ) {
+ for ( TQPtrListIterator<SmProp> it( properties ); it.current(); ++it ) {
if ( !qstrcmp( it.current()->name, name ) )
return it.current();
}
@@ -83,17 +83,17 @@ void KSMClient::resetState()
* In this case SmsGenerateClientID() returns NULL, but we really want a
* client ID, so we fake one.
*/
-static KStaticDeleter<QString> smy_addr;
+static KStaticDeleter<TQString> smy_addr;
static char * safeSmsGenerateClientID( SmsConn /*c*/ )
{
// Causes delays with misconfigured network :-/.
// char *ret = SmsGenerateClientID(c);
char* ret = NULL;
if (!ret) {
- static QString *my_addr = 0;
+ static TQString *my_addr = 0;
if (!my_addr) {
// qWarning("Can't get own host name. Your system is severely misconfigured\n");
- smy_addr.setObject(my_addr,new QString);
+ smy_addr.setObject(my_addr,new TQString);
/* Faking our IP address, the 0 below is "unknown" address format
(1 would be IP, 2 would be DEC-NET format) */
@@ -112,7 +112,7 @@ static char * safeSmsGenerateClientID( SmsConn /*c*/ )
for( int i = 0;
i < 4;
++i )
- *my_addr += QString::number( addr[ i ], 16 );
+ *my_addr += TQString::number( addr[ i ], 16 );
}
}
/* Needs to be malloc(), to look the same as libSM */
@@ -141,33 +141,33 @@ void KSMClient::registerClient( const char* previousId )
}
-QString KSMClient::program() const
+TQString KSMClient::program() const
{
SmProp* p = property( SmProgram );
if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1)
- return QString::null;
- return QString::fromLatin1( (const char*) p->vals[0].value );
+ return TQString::null;
+ return TQString::fromLatin1( (const char*) p->vals[0].value );
}
-QStringList KSMClient::restartCommand() const
+TQStringList KSMClient::restartCommand() const
{
- QStringList result;
+ TQStringList result;
SmProp* p = property( SmRestartCommand );
if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1)
return result;
for ( int i = 0; i < p->num_vals; i++ )
- result +=QString::fromLatin1( (const char*) p->vals[i].value );
+ result +=TQString::fromLatin1( (const char*) p->vals[i].value );
return result;
}
-QStringList KSMClient::discardCommand() const
+TQStringList KSMClient::discardCommand() const
{
- QStringList result;
+ TQStringList result;
SmProp* p = property( SmDiscardCommand );
if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1)
return result;
for ( int i = 0; i < p->num_vals; i++ )
- result +=QString::fromLatin1( (const char*) p->vals[i].value );
+ result +=TQString::fromLatin1( (const char*) p->vals[i].value );
return result;
}
@@ -179,12 +179,12 @@ int KSMClient::restartStyleHint() const
return *((int*)p->vals[0].value);
}
-QString KSMClient::userId() const
+TQString KSMClient::userId() const
{
SmProp* p = property( SmUserID );
if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1)
- return QString::null;
- return QString::fromLatin1( (const char*) p->vals[0].value );
+ return TQString::null;
+ return TQString::fromLatin1( (const char*) p->vals[0].value );
}
diff --git a/ksmserver/client.h b/ksmserver/client.h
index 46dc28fa2..d950275ce 100644
--- a/ksmserver/client.h
+++ b/ksmserver/client.h
@@ -9,18 +9,18 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
// needed to avoid clash with INT8 defined in X11/Xmd.h on solaris
#define QT_CLEAN_NAMESPACE 1
-#include <qobject.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qsocketnotifier.h>
-#include <qptrlist.h>
-#include <qvaluelist.h>
-#include <qcstring.h>
-#include <qdict.h>
-#include <qptrqueue.h>
-#include <qptrdict.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqsocketnotifier.h>
+#include <tqptrlist.h>
+#include <tqvaluelist.h>
+#include <tqcstring.h>
+#include <tqdict.h>
+#include <tqptrqueue.h>
+#include <tqptrdict.h>
#include <kapplication.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include <dcopobject.h>
#include "server2.h"
@@ -42,14 +42,14 @@ public:
uint waitForPhase2 : 1;
uint wasPhase2 : 1;
- QPtrList<SmProp> properties;
+ TQPtrList<SmProp> properties;
SmProp* property( const char* name ) const;
- QString program() const;
- QStringList restartCommand() const;
- QStringList discardCommand() const;
+ TQString program() const;
+ TQStringList restartCommand() const;
+ TQStringList discardCommand() const;
int restartStyleHint() const;
- QString userId() const;
+ TQString userId() const;
const char* clientId() { return id ? id : ""; }
private:
diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp
index 464ded3d8..a8f439745 100644
--- a/ksmserver/legacy.cpp
+++ b/ksmserver/legacy.cpp
@@ -46,7 +46,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <unistd.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include <kconfig.h>
#include <kdebug.h>
@@ -100,7 +100,7 @@ void KSMServer::performLegacySessionSave()
wm_protocols = atoms[ 1 ];
wm_client_leader = atoms[ 2 ];
}
- for ( QValueList<WId>::ConstIterator it = module.windows().begin();
+ for ( TQValueList<WId>::ConstIterator it = module.windows().begin();
it != module.windows().end(); ++it) {
WId leader = windowWmClientLeader( *it );
if (!legacyWindows.contains(leader) && windowSessionId( *it, leader ).isEmpty()) {
@@ -160,7 +160,7 @@ void KSMServer::performLegacySessionSave()
}
// Wait for change in WM_COMMAND with timeout
XFlush(newdisplay);
- QTime start = QTime::currentTime();
+ TQTime start = TQTime::currentTime();
while (awaiting_replies > 0) {
if (XPending(newdisplay)) {
/* Process pending event */
@@ -224,9 +224,9 @@ void KSMServer::storeLegacySession( KConfig* config )
continue;
if ( !(*it).wmCommand.isEmpty() && !(*it).wmClientMachine.isEmpty() ) {
count++;
- QString n = QString::number(count);
- config->writeEntry( QString("command")+n, (*it).wmCommand );
- config->writeEntry( QString("clientMachine")+n, (*it).wmClientMachine );
+ TQString n = TQString::number(count);
+ config->writeEntry( TQString("command")+n, (*it).wmCommand );
+ config->writeEntry( TQString("clientMachine")+n, (*it).wmClientMachine );
}
}
}
@@ -245,12 +245,12 @@ void KSMServer::restoreLegacySession( KConfig* config )
KConfigGroupSaver saver( config, sessionGroup );
int count = config->readNumEntry( "count", 0 );
for ( int i = 1; i <= count; i++ ) {
- QString n = QString::number(i);
- if ( config->readEntry( QString("program")+n ) != wm )
+ TQString n = TQString::number(i);
+ if ( config->readEntry( TQString("program")+n ) != wm )
continue;
- QStringList restartCommand =
- config->readListEntry( QString("restartCommand")+n );
- for( QStringList::ConstIterator it = restartCommand.begin();
+ TQStringList restartCommand =
+ config->readListEntry( TQString("restartCommand")+n );
+ for( TQStringList::ConstIterator it = restartCommand.begin();
it != restartCommand.end();
++it ) {
if( (*it) == "-session" ) {
@@ -270,26 +270,26 @@ void KSMServer::restoreLegacySessionInternal( KConfig* config, char sep )
{
int count = config->readNumEntry( "count" );
for ( int i = 1; i <= count; i++ ) {
- QString n = QString::number(i);
- QStringList wmCommand = config->readListEntry( QString("command")+n, sep );
+ TQString n = TQString::number(i);
+ TQStringList wmCommand = config->readListEntry( TQString("command")+n, sep );
if( wmCommand.isEmpty())
continue;
if( isWM( wmCommand.first()))
continue;
startApplication( wmCommand,
- config->readEntry( QString("clientMachine")+n ),
- config->readEntry( QString("userId")+n ));
+ config->readEntry( TQString("clientMachine")+n ),
+ config->readEntry( TQString("userId")+n ));
}
}
-static QCString getQCStringProperty(WId w, Atom prop)
+static TQCString getQCStringProperty(WId w, Atom prop)
{
Atom type;
int format, status;
unsigned long nitems = 0;
unsigned long extra = 0;
unsigned char *data = 0;
- QCString result = "";
+ TQCString result = "";
status = XGetWindowProperty( qt_xdisplay(), w, prop, 0, 10000,
FALSE, XA_STRING, &type, &format,
&nitems, &extra, &data );
@@ -301,14 +301,14 @@ static QCString getQCStringProperty(WId w, Atom prop)
return result;
}
-static QStringList getQStringListProperty(WId w, Atom prop)
+static TQStringList getQStringListProperty(WId w, Atom prop)
{
Atom type;
int format, status;
unsigned long nitems = 0;
unsigned long extra = 0;
unsigned char *data = 0;
- QStringList result;
+ TQStringList result;
status = XGetWindowProperty( qt_xdisplay(), w, prop, 0, 10000,
FALSE, XA_STRING, &type, &format,
@@ -317,7 +317,7 @@ static QStringList getQStringListProperty(WId w, Atom prop)
if (!data)
return result;
for (int i=0; i<(int)nitems; i++) {
- result << QString::fromLatin1( (const char*)data + i );
+ result << TQString::fromLatin1( (const char*)data + i );
while(data[i]) i++;
}
XFree(data);
@@ -325,30 +325,30 @@ static QStringList getQStringListProperty(WId w, Atom prop)
return result;
}
-QStringList KSMServer::windowWmCommand(WId w)
+TQStringList KSMServer::windowWmCommand(WId w)
{
- QStringList ret = getQStringListProperty(w, XA_WM_COMMAND);
+ TQStringList ret = getQStringListProperty(w, XA_WM_COMMAND);
// hacks here
if( ret.count() == 1 ) {
- QString command = ret.first();
+ TQString command = ret.first();
// Mozilla is launched using wrapper scripts, so it's launched using "mozilla",
// but the actual binary is "mozilla-bin" or "<path>/mozilla-bin", and that's what
// will be also in WM_COMMAND - using this "mozilla-bin" doesn't work at all though
if( command.endsWith( "mozilla-bin" ))
- return QStringList() << "mozilla";
+ return TQStringList() << "mozilla";
if( command.endsWith( "firefox-bin" ))
- return QStringList() << "firefox";
+ return TQStringList() << "firefox";
if( command.endsWith( "thunderbird-bin" ))
- return QStringList() << "thunderbird";
+ return TQStringList() << "thunderbird";
if( command.endsWith( "sunbird-bin" ))
- return QStringList() << "sunbird";
+ return TQStringList() << "sunbird";
}
return ret;
}
-QString KSMServer::windowWmClientMachine(WId w)
+TQString KSMServer::windowWmClientMachine(WId w)
{
- QCString result = getQCStringProperty(w, XA_WM_CLIENT_MACHINE);
+ TQCString result = getQCStringProperty(w, XA_WM_CLIENT_MACHINE);
if (result.isEmpty()) {
result = "localhost";
} else {
@@ -365,7 +365,7 @@ QString KSMServer::windowWmClientMachine(WId w)
}
}
}
- return QString::fromLatin1(result);
+ return TQString::fromLatin1(result);
}
WId KSMServer::windowWmClientLeader(WId w)
@@ -393,9 +393,9 @@ WId KSMServer::windowWmClientLeader(WId w)
taken either from its window or from the leader window.
*/
extern Atom qt_sm_client_id;
-QCString KSMServer::windowSessionId(WId w, WId leader)
+TQCString KSMServer::windowSessionId(WId w, WId leader)
{
- QCString result = getQCStringProperty(w, qt_sm_client_id);
+ TQCString result = getQCStringProperty(w, qt_sm_client_id);
if (result.isEmpty() && leader != (WId)None && leader != w)
result = getQCStringProperty(leader, qt_sm_client_id);
return result;
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index 8602e1b02..d41cfc1fa 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -13,8 +13,8 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
#include <string.h>
#include <dcopclient.h>
-#include <qmessagebox.h>
-#include <qdir.h>
+#include <tqmessagebox.h>
+#include <tqdir.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
@@ -46,7 +46,7 @@ void IoErrorHandler ( IceConn iceConn)
the_server->ioError( iceConn );
}
-bool writeTest(QCString path)
+bool writeTest(TQCString path)
{
path += "/XXXXXX";
int fd = mkstemp(path.data());
@@ -67,9 +67,9 @@ bool writeTest(QCString path)
void sanity_check( int argc, char* argv[] )
{
- QCString msg;
- QCString path = getenv("HOME");
- QCString readOnly = getenv("KDE_HOME_READONLY");
+ TQCString msg;
+ TQCString path = getenv("HOME");
+ TQCString readOnly = getenv("KDE_HOME_READONLY");
if (path.isEmpty())
{
msg = "$HOME not set!";
@@ -94,7 +94,7 @@ void sanity_check( int argc, char* argv[] )
msg = "$HOME directory (%s) is out of disk space.";
else
msg = "Writing to the $HOME directory (%s) failed with\n "
- "the error '"+QCString(strerror(errno))+"'";
+ "the error '"+TQCString(strerror(errno))+"'";
}
if (msg.isEmpty())
{
@@ -131,7 +131,7 @@ void sanity_check( int argc, char* argv[] )
msg = "Temp directory (%s) is out of disk space.";
else
msg = "Writing to the temp directory (%s) failed with\n "
- "the error '"+QCString(strerror(errno))+"'";
+ "the error '"+TQCString(strerror(errno))+"'";
}
}
if (msg.isEmpty() && (path != "/tmp"))
@@ -143,7 +143,7 @@ void sanity_check( int argc, char* argv[] )
msg = "Temp directory (%s) is out of disk space.";
else
msg = "Writing to the temp directory (%s) failed with\n "
- "the error '"+QCString(strerror(errno))+"'";
+ "the error '"+TQCString(strerror(errno))+"'";
}
}
if (msg.isEmpty())
@@ -165,12 +165,12 @@ void sanity_check( int argc, char* argv[] )
fprintf(stderr, msg.data(), path.data());
fputs(msg_post, stderr);
- QApplication a(argc, argv);
- QCString qmsg(256+path.length());
+ TQApplication a(argc, argv);
+ TQCString qmsg(256+path.length());
qmsg.sprintf(msg.data(), path.data());
qmsg = msg_pre+qmsg+msg_post;
- QMessageBox::critical(0, "KDE Installation Problem!",
- QString::fromLatin1(qmsg.data()));
+ TQMessageBox::critical(0, "KDE Installation Problem!",
+ TQString::fromLatin1(qmsg.data()));
exit(255);
}
}
@@ -202,7 +202,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
return 1;
}
- QCString wm = args->getOption("windowmanager");
+ TQCString wm = args->getOption("windowmanager");
if ( wm.isEmpty() )
wm = "kwin";
@@ -218,7 +218,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
only_local = false;
#endif
- KSMServer *server = new KSMServer( QString::fromLatin1(wm), only_local);
+ KSMServer *server = new KSMServer( TQString::fromLatin1(wm), only_local);
kapp->dcopClient()->setDefaultObject( server->objId() );
IceSetIOErrorHandler( IoErrorHandler );
@@ -230,7 +230,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
bool screenCountChanged =
( config->readNumEntry( "screenCount", realScreenCount ) != realScreenCount );
- QString loginMode = config->readEntry( "loginMode", "restorePreviousLogout" );
+ TQString loginMode = config->readEntry( "loginMode", "restorePreviousLogout" );
if ( args->isSet("restore") && ! screenCountChanged )
server->restoreSession( SESSION_BY_USER );
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index 1bcdea9ac..d98faf09a 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -56,15 +56,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <limits.h>
#endif
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qdatastream.h>
-#include <qptrstack.h>
-#include <qpushbutton.h>
-#include <qmessagebox.h>
-#include <qguardedptr.h>
-#include <qtimer.h>
-#include <qregexp.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqdatastream.h>
+#include <tqptrstack.h>
+#include <tqpushbutton.h>
+#include <tqmessagebox.h>
+#include <tqguardedptr.h>
+#include <tqtimer.h>
+#include <tqregexp.h>
#include <klocale.h>
#include <kglobal.h>
@@ -98,14 +98,14 @@ KSMServer* KSMServer::self()
/*! Utility function to execute a command on the local machine. Used
* to restart applications.
*/
-void KSMServer::startApplication( QStringList command, const QString& clientMachine,
- const QString& userId )
+void KSMServer::startApplication( TQStringList command, const TQString& clientMachine,
+ const TQString& userId )
{
if ( command.isEmpty() )
return;
if ( !userId.isEmpty()) {
struct passwd* pw = getpwuid( getuid());
- if( pw != NULL && userId != QString::fromLocal8Bit( pw->pw_name )) {
+ if( pw != NULL && userId != TQString::fromLocal8Bit( pw->pw_name )) {
command.prepend( "--" );
command.prepend( userId );
command.prepend( "-u" );
@@ -117,22 +117,22 @@ void KSMServer::startApplication( QStringList command, const QString& clientMach
command.prepend( xonCommand ); // "xon" by default
}
int n = command.count();
- QCString app = command[0].latin1();
- QValueList<QCString> argList;
+ TQCString app = command[0].latin1();
+ TQValueList<TQCString> argList;
for ( int i=1; i < n; i++)
- argList.append( QCString(command[i].latin1()));
- DCOPRef( launcher ).send( "exec_blind", app, DCOPArg( argList, "QValueList<QCString>" ) );
+ argList.append( TQCString(command[i].latin1()));
+ DCOPRef( launcher ).send( "exec_blind", app, DCOPArg( argList, "TQValueList<TQCString>" ) );
}
/*! Utility function to execute a command on the local machine. Used
* to discard session data
*/
-void KSMServer::executeCommand( const QStringList& command )
+void KSMServer::executeCommand( const TQStringList& command )
{
if ( command.isEmpty() )
return;
KProcess proc;
- for ( QStringList::ConstIterator it = command.begin();
+ for ( TQStringList::ConstIterator it = command.begin();
it != command.end(); ++it )
proc << (*it).latin1();
proc.start( KProcess::Block );
@@ -301,8 +301,8 @@ class KSMListener : public QSocketNotifier
{
public:
KSMListener( IceListenObj obj )
- : QSocketNotifier( IceGetListenConnectionNumber( obj ),
- QSocketNotifier::Read, 0, 0)
+ : TQSocketNotifier( IceGetListenConnectionNumber( obj ),
+ TQSocketNotifier::Read, 0, 0)
{
listenObj = obj;
}
@@ -314,8 +314,8 @@ class KSMConnection : public QSocketNotifier
{
public:
KSMConnection( IceConn conn )
- : QSocketNotifier( IceConnectionNumber( conn ),
- QSocketNotifier::Read, 0, 0 )
+ : TQSocketNotifier( IceConnectionNumber( conn ),
+ TQSocketNotifier::Read, 0, 0 )
{
iceConn = conn;
}
@@ -432,7 +432,7 @@ Status SetAuthentication (int count, IceListenObj *listenObjs,
addAuthFile.close();
remAuthFile->close();
- QString iceAuth = KGlobal::dirs()->findExe("iceauth");
+ TQString iceAuth = KGlobal::dirs()->findExe("iceauth");
if (iceAuth.isEmpty())
{
qWarning("KSMServer: could not find iceauth");
@@ -462,7 +462,7 @@ void FreeAuthenticationData(int count, IceAuthDataEntry *authDataEntries)
free (authDataEntries);
- QString iceAuth = KGlobal::dirs()->findExe("iceauth");
+ TQString iceAuth = KGlobal::dirs()->findExe("iceauth");
if (iceAuth.isEmpty())
{
qWarning("KSMServer: could not find iceauth");
@@ -578,7 +578,7 @@ static Status KSMNewClientProc ( SmsConn conn, SmPointer manager_data,
extern "C" int _IceTransNoListen(const char * protocol);
#endif
-KSMServer::KSMServer( const QString& windowManager, bool _only_local )
+KSMServer::KSMServer( const TQString& windowManager, bool _only_local )
: DCOPObject("ksmserver"), sessionGroup( "" )
{
the_server = this;
@@ -596,9 +596,9 @@ KSMServer::KSMServer( const QString& windowManager, bool _only_local )
clientInteracting = 0;
xonCommand = config->readEntry( "xonCommand", "xon" );
- connect( &knotifyTimeoutTimer, SIGNAL( timeout()), SLOT( knotifyTimeout()));
- connect( &startupSuspendTimeoutTimer, SIGNAL( timeout()), SLOT( startupSuspendTimeout()));
- connect( &pendingShutdown, SIGNAL( timeout()), SLOT( pendingShutdownTimeout()));
+ connect( &knotifyTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( knotifyTimeout()));
+ connect( &startupSuspendTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( startupSuspendTimeout()));
+ connect( &pendingShutdown, TQT_SIGNAL( timeout()), TQT_SLOT( pendingShutdownTimeout()));
only_local = _only_local;
#ifdef HAVE__ICETRANSNOLISTEN
@@ -629,10 +629,10 @@ KSMServer::KSMServer( const QString& windowManager, bool _only_local )
{
// publish available transports.
- QCString fName = QFile::encodeName(locateLocal("socket", "KSMserver"));
- QCString display = ::getenv("DISPLAY");
+ TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver"));
+ TQCString display = ::getenv("DISPLAY");
// strip the screen number from the display
- display.replace(QRegExp("\\.[0-9]+$"), "");
+ display.replace(TQRegExp("\\.[0-9]+$"), "");
int i;
while( (i = display.find(':')) >= 0)
display[i] = '_';
@@ -669,7 +669,7 @@ KSMServer::KSMServer( const QString& windowManager, bool _only_local )
for ( int i = 0; i < numTransports; i++) {
con = new KSMListener( listenObjs[i] );
listener.append( con );
- connect( con, SIGNAL( activated(int) ), this, SLOT( newConnection(int) ) );
+ connect( con, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( newConnection(int) ) );
}
signal(SIGHUP, sighandler);
@@ -677,9 +677,9 @@ KSMServer::KSMServer( const QString& windowManager, bool _only_local )
signal(SIGINT, sighandler);
signal(SIGPIPE, SIG_IGN);
- connect( &protectionTimer, SIGNAL( timeout() ), this, SLOT( protectionTimeout() ) );
- connect( &restoreTimer, SIGNAL( timeout() ), this, SLOT( tryRestoreNext() ) );
- connect( kapp, SIGNAL( shutDown() ), this, SLOT( cleanUp() ) );
+ connect( &protectionTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( protectionTimeout() ) );
+ connect( &restoreTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( tryRestoreNext() ) );
+ connect( kapp, TQT_SIGNAL( shutDown() ), this, TQT_SLOT( cleanUp() ) );
}
KSMServer::~KSMServer()
@@ -694,10 +694,10 @@ void KSMServer::cleanUp()
clean = true;
IceFreeListenObjs (numTransports, listenObjs);
- QCString fName = QFile::encodeName(locateLocal("socket", "KSMserver"));
- QCString display = ::getenv("DISPLAY");
+ TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver"));
+ TQCString display = ::getenv("DISPLAY");
// strip the screen number from the display
- display.replace(QRegExp("\\.[0-9]+$"), "");
+ display.replace(TQRegExp("\\.[0-9]+$"), "");
int i;
while( (i = display.find(':')) >= 0)
display[i] = '_';
@@ -717,7 +717,7 @@ void KSMServer::cleanUp()
void* KSMServer::watchConnection( IceConn iceConn )
{
KSMConnection* conn = new KSMConnection( iceConn );
- connect( conn, SIGNAL( activated(int) ), this, SLOT( processData(int) ) );
+ connect( conn, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( processData(int) ) );
return (void*) conn;
}
@@ -740,7 +740,7 @@ void KSMServer::processData( int /*socket*/ )
IceProcessMessagesStatus status = IceProcessMessages( iceConn, 0, 0 );
if ( status == IceProcessMessagesIOError ) {
IceSetShutdownNegotiation( iceConn, False );
- QPtrListIterator<KSMClient> it ( clients );
+ TQPtrListIterator<KSMClient> it ( clients );
while ( it.current() &&SmsGetIceConnection( it.current()->connection() ) != iceConn )
++it;
if ( it.current() ) {
@@ -797,7 +797,7 @@ void KSMServer::newConnection( int /*socket*/ )
}
-QString KSMServer::currentSession()
+TQString KSMServer::currentSession()
{
if ( sessionGroup.startsWith( "Session: " ) )
return sessionGroup.mid( 9 );
@@ -810,7 +810,7 @@ void KSMServer::discardSession()
config->setGroup( sessionGroup );
int count = config->readNumEntry( "count", 0 );
for ( KSMClient* c = clients.first(); c; c = clients.next() ) {
- QStringList discardCommand = c->discardCommand();
+ TQStringList discardCommand = c->discardCommand();
if ( discardCommand.isEmpty())
continue;
// check that non of the old clients used the exactly same
@@ -818,7 +818,7 @@ void KSMServer::discardSession()
// case up to KDE and Qt < 3.1
int i = 1;
while ( i <= count &&
- config->readPathListEntry( QString("discardCommand") + QString::number(i) ) != discardCommand )
+ config->readPathListEntry( TQString("discardCommand") + TQString::number(i) ) != discardCommand )
i++;
if ( i <= count )
executeCommand( discardCommand );
@@ -830,11 +830,11 @@ void KSMServer::storeSession()
KConfig* config = KGlobal::config();
config->reparseConfiguration(); // config may have changed in the KControl module
config->setGroup("General" );
- excludeApps = QStringList::split( QRegExp( "[,:]" ), config->readEntry( "excludeApps" ).lower());
+ excludeApps = TQStringList::split( TQRegExp( "[,:]" ), config->readEntry( "excludeApps" ).lower());
config->setGroup( sessionGroup );
int count = config->readNumEntry( "count" );
for ( int i = 1; i <= count; i++ ) {
- QStringList discardCommand = config->readPathListEntry( QString("discardCommand") + QString::number(i) );
+ TQStringList discardCommand = config->readPathListEntry( TQString("discardCommand") + TQString::number(i) );
if ( discardCommand.isEmpty())
continue;
// check that non of the new clients uses the exactly same
@@ -864,22 +864,22 @@ void KSMServer::storeSession()
int restartHint = c->restartStyleHint();
if (restartHint == SmRestartNever)
continue;
- QString program = c->program();
- QStringList restartCommand = c->restartCommand();
+ TQString program = c->program();
+ TQStringList restartCommand = c->restartCommand();
if (program.isEmpty() && restartCommand.isEmpty())
continue;
if (excludeApps.contains( program.lower()))
continue;
count++;
- QString n = QString::number(count);
- config->writeEntry( QString("program")+n, program );
- config->writeEntry( QString("clientId")+n, c->clientId() );
- config->writeEntry( QString("restartCommand")+n, restartCommand );
- config->writePathEntry( QString("discardCommand")+n, c->discardCommand() );
- config->writeEntry( QString("restartStyleHint")+n, restartHint );
- config->writeEntry( QString("userId")+n, c->userId() );
- config->writeEntry( QString("wasWm")+n, isWM( c ));
+ TQString n = TQString::number(count);
+ config->writeEntry( TQString("program")+n, program );
+ config->writeEntry( TQString("clientId")+n, c->clientId() );
+ config->writeEntry( TQString("restartCommand")+n, restartCommand );
+ config->writePathEntry( TQString("discardCommand")+n, c->discardCommand() );
+ config->writeEntry( TQString("restartStyleHint")+n, restartHint );
+ config->writeEntry( TQString("userId")+n, c->userId() );
+ config->writeEntry( TQString("wasWm")+n, isWM( c ));
}
config->writeEntry( "count", count );
@@ -891,12 +891,12 @@ void KSMServer::storeSession()
}
-QStringList KSMServer::sessionList()
+TQStringList KSMServer::sessionList()
{
- QStringList sessions = "default";
+ TQStringList sessions = "default";
KConfig* config = KGlobal::config();
- QStringList groups = config->groupList();
- for ( QStringList::ConstIterator it = groups.begin(); it != groups.end(); it++ )
+ TQStringList groups = config->groupList();
+ for ( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); it++ )
if ( (*it).startsWith( "Session: " ) )
sessions << (*it).mid( 9 );
return sessions;
@@ -907,7 +907,7 @@ bool KSMServer::isWM( const KSMClient* client ) const
return isWM( client->program());
}
-bool KSMServer::isWM( const QString& program ) const
+bool KSMServer::isWM( const TQString& program ) const
{
// KWin relies on ksmserver's special treatment in phase1,
// therefore make sure it's recognized even if ksmserver
diff --git a/ksmserver/server.h b/ksmserver/server.h
index feb6004ef..3d5904e53 100644
--- a/ksmserver/server.h
+++ b/ksmserver/server.h
@@ -9,18 +9,18 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
// needed to avoid clash with INT8 defined in X11/Xmd.h on solaris
#define QT_CLEAN_NAMESPACE 1
-#include <qobject.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qsocketnotifier.h>
-#include <qptrlist.h>
-#include <qvaluelist.h>
-#include <qcstring.h>
-#include <qdict.h>
-#include <qptrqueue.h>
-#include <qptrdict.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqsocketnotifier.h>
+#include <tqptrlist.h>
+#include <tqvaluelist.h>
+#include <tqcstring.h>
+#include <tqdict.h>
+#include <tqptrqueue.h>
+#include <tqptrdict.h>
#include <kapplication.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include <dcopobject.h>
#include "server2.h"
@@ -30,7 +30,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
#define SESSION_PREVIOUS_LOGOUT "saved at previous logout"
#define SESSION_BY_USER "saved by user"
-typedef QValueList<QCString> QCStringList;
+typedef TQValueList<TQCString> QCStringList;
class KSMListener;
class KSMConnection;
class KSMClient;
@@ -39,18 +39,18 @@ enum SMType { SM_ERROR, SM_WMCOMMAND, SM_WMSAVEYOURSELF };
struct SMData
{
SMType type;
- QStringList wmCommand;
- QString wmClientMachine;
- QString wmclass1, wmclass2;
+ TQStringList wmCommand;
+ TQString wmClientMachine;
+ TQString wmclass1, wmclass2;
};
-typedef QMap<WId,SMData> WindowMap;
+typedef TQMap<WId,SMData> WindowMap;
-class KSMServer : public QObject, public KSMServerInterface
+class KSMServer : public TQObject, public KSMServerInterface
{
Q_OBJECT
K_DCOP
k_dcop:
- void notifySlot(QString,QString,QString,QString,QString,int,int,int,int);
+ void notifySlot(TQString,TQString,TQString,TQString,TQString,int,int,int,int);
void logoutSoundFinished(int,int);
void autoStart0Done();
void autoStart1Done();
@@ -58,7 +58,7 @@ k_dcop:
void kcmPhase1Done();
void kcmPhase2Done();
public:
- KSMServer( const QString& windowManager, bool only_local );
+ KSMServer( const TQString& windowManager, bool only_local );
~KSMServer();
static KSMServer* self();
@@ -83,14 +83,14 @@ public:
void clientRegistered( const char* previousId );
// public API
- void restoreSession( QString sessionName );
+ void restoreSession( TQString sessionName );
void startDefaultSession();
void shutdown( KApplication::ShutdownConfirm confirm,
KApplication::ShutdownType sdtype,
KApplication::ShutdownMode sdmode );
- virtual void suspendStartup( QCString app );
- virtual void resumeStartup( QCString app );
+ virtual void suspendStartup( TQCString app );
+ virtual void resumeStartup( TQCString app );
public slots:
void cleanUp();
@@ -132,13 +132,13 @@ private:
void startProtection();
void endProtection();
- void startApplication( QStringList command,
- const QString& clientMachine = QString::null,
- const QString& userId = QString::null );
- void executeCommand( const QStringList& command );
+ void startApplication( TQStringList command,
+ const TQString& clientMachine = TQString::null,
+ const TQString& userId = TQString::null );
+ void executeCommand( const TQStringList& command );
bool isWM( const KSMClient* client ) const;
- bool isWM( const QString& program ) const;
+ bool isWM( const TQString& program ) const;
bool defaultSession() const; // empty session
void setupXIOErrorHandler();
@@ -146,10 +146,10 @@ private:
void storeLegacySession( KConfig* config );
void restoreLegacySession( KConfig* config );
void restoreLegacySessionInternal( KConfig* config, char sep = ',' );
- QStringList windowWmCommand(WId w);
- QString windowWmClientMachine(WId w);
+ TQStringList windowWmCommand(WId w);
+ TQString windowWmClientMachine(WId w);
WId windowWmClientLeader(WId w);
- QCString windowSessionId(WId w, WId leader);
+ TQCString windowSessionId(WId w, WId leader);
bool checkStartupSuspend();
void finishStartup();
@@ -157,14 +157,14 @@ private:
// public dcop interface
void logout( int, int, int );
- QStringList sessionList();
- QString currentSession();
+ TQStringList sessionList();
+ TQString currentSession();
void saveCurrentSession();
- void saveCurrentSessionAs( QString );
+ void saveCurrentSessionAs( TQString );
private:
- QPtrList<KSMListener> listener;
- QPtrList<KSMClient> clients;
+ TQPtrList<KSMListener> listener;
+ TQPtrList<KSMClient> clients;
enum State
{
@@ -177,41 +177,41 @@ private:
bool saveSession;
int wmPhase1WaitingCount;
int saveType;
- QMap< QCString, int > startupSuspendCount;
+ TQMap< TQCString, int > startupSuspendCount;
KApplication::ShutdownType shutdownType;
KApplication::ShutdownMode shutdownMode;
- QString bootOption;
+ TQString bootOption;
bool clean;
KSMClient* clientInteracting;
- QString wm;
- QString sessionGroup;
- QString sessionName;
- QCString launcher;
- QTimer protectionTimer;
- QTimer restoreTimer;
- QString xonCommand;
+ TQString wm;
+ TQString sessionGroup;
+ TQString sessionName;
+ TQCString launcher;
+ TQTimer protectionTimer;
+ TQTimer restoreTimer;
+ TQString xonCommand;
int logoutSoundEvent;
- QTimer knotifyTimeoutTimer;
- QTimer startupSuspendTimeoutTimer;
+ TQTimer knotifyTimeoutTimer;
+ TQTimer startupSuspendTimeoutTimer;
bool waitAutoStart2;
bool waitKcmInit2;
- QTimer pendingShutdown;
+ TQTimer pendingShutdown;
KApplication::ShutdownConfirm pendingShutdown_confirm;
KApplication::ShutdownType pendingShutdown_sdtype;
KApplication::ShutdownMode pendingShutdown_sdmode;
// ksplash interface
- void upAndRunning( const QString& msg );
+ void upAndRunning( const TQString& msg );
void publishProgress( int progress, bool max = false );
// sequential startup
int appsToStart;
int lastAppStarted;
- QString lastIdStarted;
+ TQString lastIdStarted;
- QStringList excludeApps;
+ TQStringList excludeApps;
WindowMap legacyWindows;
};
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index 1c3906e44..16fab8b4d 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -56,15 +56,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <limits.h>
#endif
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qdatastream.h>
-#include <qptrstack.h>
-#include <qpushbutton.h>
-#include <qmessagebox.h>
-#include <qguardedptr.h>
-#include <qtimer.h>
-#include <qregexp.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqdatastream.h>
+#include <tqptrstack.h>
+#include <tqpushbutton.h>
+#include <tqmessagebox.h>
+#include <tqguardedptr.h>
+#include <tqtimer.h>
+#include <tqregexp.h>
#include <klocale.h>
#include <kglobal.h>
@@ -138,7 +138,7 @@ void KSMServer::shutdown( KApplication::ShutdownConfirm confirm,
sdmode = KApplication::ShutdownModeInteractive;
dialogActive = true;
- QString bopt;
+ TQString bopt;
if ( !logoutConfirmed ) {
KSMShutdownFeedback::start(); // make the screen gray
logoutConfirmed =
@@ -160,7 +160,7 @@ void KSMServer::shutdown( KApplication::ShutdownConfirm confirm,
saveSession = ( config->readEntry( "loginMode", "restorePreviousLogout" ) == "restorePreviousLogout" );
if ( saveSession )
- sessionGroup = QString("Session: ") + SESSION_PREVIOUS_LOGOUT;
+ sessionGroup = TQString("Session: ") + SESSION_PREVIOUS_LOGOUT;
// Set the real desktop background to black so that exit looks
// clean regardless of what was on "our" desktop.
@@ -215,7 +215,7 @@ void KSMServer::saveCurrentSession()
return;
if ( currentSession().isEmpty() || currentSession() == SESSION_PREVIOUS_LOGOUT )
- sessionGroup = QString("Session: ") + SESSION_BY_USER;
+ sessionGroup = TQString("Session: ") + SESSION_BY_USER;
state = Checkpoint;
wmPhase1WaitingCount = 0;
@@ -237,7 +237,7 @@ void KSMServer::saveCurrentSession()
completeShutdownOrCheckpoint();
}
-void KSMServer::saveCurrentSessionAs( QString session )
+void KSMServer::saveCurrentSessionAs( TQString session )
{
if ( state != Idle || dialogActive )
return;
@@ -253,7 +253,7 @@ void KSMServer::saveYourselfDone( KSMClient* client, bool success )
// a shutdown was cancelled and the client is finished saving
// only now. Discard the saved state in order to avoid
// the saved data building up.
- QStringList discard = client->discardCommand();
+ TQStringList discard = client->discardCommand();
if( !discard.isEmpty())
executeCommand( discard );
return;
@@ -352,7 +352,7 @@ void KSMServer::cancelShutdown( KSMClient* c )
SmsShutdownCancelled( c->connection() );
if( c->saveYourselfDone ) {
// Discard also saved state.
- QStringList discard = c->discardCommand();
+ TQStringList discard = c->discardCommand();
if( !discard.isEmpty())
executeCommand( discard );
}
@@ -419,8 +419,8 @@ void KSMServer::completeShutdownOrCheckpoint()
if ( state == Shutdown ) {
bool waitForKNotify = true;
if( !kapp->dcopClient()->connectDCOPSignal( "knotify", "",
- "notifySignal(QString,QString,QString,QString,QString,int,int,int,int)",
- "ksmserver", "notifySlot(QString,QString,QString,QString,QString,int,int,int,int)", false )) {
+ "notifySignal(TQString,TQString,TQString,TQString,TQString,int,int,int,int)",
+ "ksmserver", "notifySlot(TQString,TQString,TQString,TQString,TQString,int,int,int,int)", false )) {
waitForKNotify = false;
}
if( !kapp->dcopClient()->connectDCOPSignal( "knotify", "",
@@ -461,7 +461,7 @@ void KSMServer::startKilling()
kdDebug( 1218 ) << " We killed all clients. We have now clients.count()=" <<
clients.count() << endl;
completeKilling();
- QTimer::singleShot( 10000, this, SLOT( timeoutQuit() ) );
+ TQTimer::singleShot( 10000, this, TQT_SLOT( timeoutQuit() ) );
}
void KSMServer::completeKilling()
@@ -494,7 +494,7 @@ void KSMServer::killWM()
}
if( iswm ) {
completeKillingWM();
- QTimer::singleShot( 5000, this, SLOT( timeoutWMQuit() ) );
+ TQTimer::singleShot( 5000, this, TQT_SLOT( timeoutWMQuit() ) );
}
else
killingCompleted();
@@ -517,7 +517,7 @@ void KSMServer::killingCompleted()
}
// called when KNotify performs notification for logout (not when sound is finished though)
-void KSMServer::notifySlot(QString event ,QString app,QString,QString,QString,int present,int,int,int)
+void KSMServer::notifySlot(TQString event ,TQString app,TQString,TQString,TQString,int present,int,int,int)
{
if( state != WaitingForKNotify )
return;
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index 25e4aaf30..7b0493559 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -7,26 +7,26 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
#include <config.h>
#include "shutdowndlg.h"
-#include <qapplication.h>
-#include <qlayout.h>
-#include <qgroupbox.h>
-#include <qvbuttongroup.h>
-#include <qlabel.h>
-#include <qvbox.h>
-#include <qtimer.h>
-#include <qstyle.h>
-#include <qcombobox.h>
-#include <qcursor.h>
-#include <qmessagebox.h>
-#include <qbuttongroup.h>
-#include <qiconset.h>
-#include <qpixmap.h>
-#include <qpopupmenu.h>
-#include <qtooltip.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qfontmetrics.h>
-#include <qregexp.h>
+#include <tqapplication.h>
+#include <tqlayout.h>
+#include <tqgroupbox.h>
+#include <tqvbuttongroup.h>
+#include <tqlabel.h>
+#include <tqvbox.h>
+#include <tqtimer.h>
+#include <tqstyle.h>
+#include <tqcombobox.h>
+#include <tqcursor.h>
+#include <tqmessagebox.h>
+#include <tqbuttongroup.h>
+#include <tqiconset.h>
+#include <tqpixmap.h>
+#include <tqpopupmenu.h>
+#include <tqtooltip.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqfontmetrics.h>
+#include <tqregexp.h>
#include <klocale.h>
#include <kapplication.h>
@@ -63,7 +63,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
KSMShutdownFeedback * KSMShutdownFeedback::s_pSelf = 0L;
KSMShutdownFeedback::KSMShutdownFeedback()
- : QWidget( 0L, "feedbackwidget", WType_Popup ),
+ : TQWidget( 0L, "feedbackwidget", WType_Popup ),
m_currentY( 0 ),
m_grayOpacity( 0.0f ),
m_compensation( 0.0f ),
@@ -74,11 +74,11 @@ KSMShutdownFeedback::KSMShutdownFeedback()
m_pmio()
{
- m_grayImage = QImage::QImage();
- m_unfadedImage = QImage::QImage();
+ m_grayImage = TQImage::TQImage();
+ m_unfadedImage = TQImage::TQImage();
resize(0, 0);
setShown(true);
- QTimer::singleShot( 500, this, SLOT( slotPaintEffect() ) );
+ TQTimer::singleShot( 500, this, TQT_SLOT( slotPaintEffect() ) );
}
// called after stopping shutdown-feedback -> smooth fade-back to color-mode
@@ -111,11 +111,11 @@ void KSMShutdownFeedback::slotPaintEffect()
// logout-UI would be too much delayed...
if ( m_grayImage.isNull() )
{
- setBackgroundMode( QWidget::NoBackground );
- setGeometry( QApplication::desktop()->geometry() );
+ setBackgroundMode( TQWidget::NoBackground );
+ setGeometry( TQApplication::desktop()->geometry() );
m_root.resize( width(), height() ); // for the default logout
- m_grayImage = QPixmap::grabWindow(qt_xrootwin(), 0, 0, QApplication::desktop()->width(), QApplication::desktop()->height()).convertToImage();
+ m_grayImage = TQPixmap::grabWindow(qt_xrootwin(), 0, 0, TQApplication::desktop()->width(), TQApplication::desktop()->height()).convertToImage();
m_unfadedImage = m_grayImage.copy();
register uchar * r = m_grayImage.bits();
register uchar * g = m_grayImage.bits() + 1;
@@ -169,12 +169,12 @@ void KSMShutdownFeedback::slotPaintEffect()
{
if( y1 > 0 && y1 < imgHeight && y1-m_rowsDone > 0 && m_rowsDone < imgHeight )
{
- QImage img( imgWidth, y1-m_rowsDone, 32 );
+ TQImage img( imgWidth, y1-m_rowsDone, 32 );
memcpy( img.bits(), m_grayImage.scanLine( m_rowsDone ), imgWidth*(y1-m_rowsDone)*4 );
// conversion is slow as hell if desktop-depth != 24bpp...
//Pixmap pm = m_pmio.convertToPixmap( img );
//bitBlt( this, 0, m_rowsDone, &pm );
-// QImage pm = m_pmio.convertToImage( img );
+// TQImage pm = m_pmio.convertToImage( img );
bitBlt( this, 0, m_rowsDone, &img );
m_rowsDone = y1;
}
@@ -184,10 +184,10 @@ void KSMShutdownFeedback::slotPaintEffect()
// when fading back we have to blit area which isnt gray anymore to unfaded image
if( y2 > 0 && y2 < imgHeight && m_rowsDone > y2 )
{
- QImage img( imgWidth, m_rowsDone-y2, 32 );
+ TQImage img( imgWidth, m_rowsDone-y2, 32 );
memcpy( img.bits(), m_unfadedImage.scanLine( y2 ), imgWidth*(m_rowsDone-y2)*4 );
// conversion is slow as hell if desktop-depth != 24bpp...
- //QPixmap pm = m_pmio.convertToPixmap( img );
+ //TQPixmap pm = m_pmio.convertToPixmap( img );
//bitBlt( this, 0, y2, &pm );
bitBlt( this, 0, y2, &img );
m_rowsDone = y2;
@@ -199,7 +199,7 @@ void KSMShutdownFeedback::slotPaintEffect()
start_y1 = 0;
if( y2 > start_y1 )
{
- QImage img( imgWidth, y2-start_y1, 32 );
+ TQImage img( imgWidth, y2-start_y1, 32 );
memcpy( img.bits(), m_grayImage.scanLine( start_y1 ), ( y2-start_y1 ) * imgWidth * 4 );
register uchar * rs = m_unfadedImage.scanLine( start_y1 );
register uchar * gs = rs + 1;
@@ -222,59 +222,59 @@ void KSMShutdownFeedback::slotPaintEffect()
}
}
// conversion is slow as hell if desktop-depth != 24bpp...
- //QPixmap pm = m_pmio.convertToPixmap( img );
+ //TQPixmap pm = m_pmio.convertToPixmap( img );
//bitBlt( this, 0, start_y1, &pm );
bitBlt( this, 0, start_y1, &img );
}
- QTimer::singleShot( 5, this, SLOT( slotPaintEffect() ) );
+ TQTimer::singleShot( 5, this, TQT_SLOT( slotPaintEffect() ) );
}
// standard logout fade
else
{
if ( m_currentY >= height() ) {
- if ( backgroundMode() == QWidget::NoBackground ) {
- setBackgroundMode( QWidget::NoBackground );
+ if ( backgroundMode() == TQWidget::NoBackground ) {
+ setBackgroundMode( TQWidget::NoBackground );
setBackgroundPixmap( m_root );
}
return;
}
KPixmap pixmap;
- pixmap = QPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 );
- QImage image = pixmap.convertToImage();
+ pixmap = TQPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 );
+ TQImage image = pixmap.convertToImage();
KImageEffect::blend( Qt::black, image, 0.4 );
KImageEffect::toGray( image, true );
pixmap.convertFromImage( image );
bitBlt( this, 0, m_currentY, &pixmap );
bitBlt( &m_root, 0, m_currentY, &pixmap );
m_currentY += 10;
- QTimer::singleShot( 1, this, SLOT( slotPaintEffect() ) );
+ TQTimer::singleShot( 1, this, TQT_SLOT( slotPaintEffect() ) );
}
}
//////
-KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
+KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
bool maysd, KApplication::ShutdownType sdtype )
- : QDialog( parent, 0, TRUE, WType_Popup ), targets(0)
+ : TQDialog( parent, 0, TRUE, WType_Popup ), targets(0)
// this is a WType_Popup on purpose. Do not change that! Not
// having a popup here has severe side effects.
{
- QVBoxLayout* vbox = new QVBoxLayout( this );
+ TQVBoxLayout* vbox = new TQVBoxLayout( this );
- QFrame* frame = new QFrame( this );
- frame->setFrameStyle( QFrame::StyledPanel | QFrame::Raised );
- frame->setLineWidth( style().pixelMetric( QStyle::PM_DefaultFrameWidth, frame ) );
+ TQFrame* frame = new TQFrame( this );
+ frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
+ frame->setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) );
// we need to set the minimum size for the logout box, since it
// gets too small if there isn't all options available
frame->setMinimumWidth(400);
vbox->addWidget( frame );
- vbox = new QVBoxLayout( frame, 2 * KDialog::marginHint(),
+ vbox = new TQVBoxLayout( frame, 2 * KDialog::marginHint(),
2 * KDialog::spacingHint() );
// default factor
@@ -288,8 +288,8 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
factor = 8;
}
else {
- QLabel* label = new QLabel( i18n("End Session for \"%1\"").arg(KUser().loginName()), frame );
- QFont fnt = label->font();
+ TQLabel* label = new TQLabel( i18n("End Session for \"%1\"").arg(KUser().loginName()), frame );
+ TQFont fnt = label->font();
fnt.setBold( true );
fnt.setPointSize( fnt.pointSize() * 3 / 2 );
label->setFont( fnt );
@@ -298,41 +298,41 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
// for the basic layout, within this box either the ubuntu dialog or
// standard konqy+buttons will be placed.
- QHBoxLayout* hbox = new QHBoxLayout( vbox, factor * KDialog::spacingHint() );
+ TQHBoxLayout* hbox = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
// from here on we have to adapt to the two different dialogs
- QFrame* lfrm;
- QVBoxLayout* buttonlay;
- QHBoxLayout* hbuttonbox;
- QFont btnFont;
+ TQFrame* lfrm;
+ TQVBoxLayout* buttonlay;
+ TQHBoxLayout* hbuttonbox;
+ TQFont btnFont;
if(doUbuntuLogout)
{
// first line of buttons
- hbuttonbox = new QHBoxLayout( hbox, factor * KDialog::spacingHint() );
+ hbuttonbox = new TQHBoxLayout( hbox, factor * KDialog::spacingHint() );
hbuttonbox->setAlignment( Qt::AlignHCenter );
// End session
FlatButton* btnLogout = new FlatButton( frame );
- btnLogout->setTextLabel( QString("&") + i18n("Log out"), false );
+ btnLogout->setTextLabel( TQString("&") + i18n("Log out"), false );
btnLogout->setPixmap( DesktopIcon( "back") );
- int i = btnLogout->textLabel().find( QRegExp("\\&"), 0 ); // i == 1
+ int i = btnLogout->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnLogout->setAccel( "ALT+" + btnLogout->textLabel().lower()[i+1] ) ;
hbuttonbox->addWidget ( btnLogout );
- connect(btnLogout, SIGNAL(clicked()), SLOT(slotLogout()));
+ connect(btnLogout, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogout()));
}
else
{
// konqy
- lfrm = new QFrame( frame );
- lfrm->setFrameStyle( QFrame::Panel | QFrame::Sunken );
+ lfrm = new TQFrame( frame );
+ lfrm->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
hbox->addWidget( lfrm, AlignCenter );
- buttonlay = new QVBoxLayout( hbox, factor * KDialog::spacingHint() );
+ buttonlay = new TQVBoxLayout( hbox, factor * KDialog::spacingHint() );
buttonlay->setAlignment( Qt::AlignHCenter );
- QLabel* icon = new QLabel( lfrm );
+ TQLabel* icon = new TQLabel( lfrm );
icon->setPixmap( UserIcon( "shutdownkonq" ) );
lfrm->setFixedSize( icon->sizeHint());
icon->setFixedSize( icon->sizeHint());
@@ -342,7 +342,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
KPushButton* btnLogout = new KPushButton( KGuiItem( i18n("&End Current Session"), "undo"), frame );
btnFont = btnLogout->font();
buttonlay->addWidget( btnLogout );
- connect(btnLogout, SIGNAL(clicked()), SLOT(slotLogout()));
+ connect(btnLogout, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogout()));
}
@@ -425,10 +425,10 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
FlatButton* btnSuspend = new FlatButton( frame );
btnSuspend->setTextLabel( i18n("&Suspend"), false );
btnSuspend->setPixmap( DesktopIcon( "suspend") );
- int i = btnSuspend->textLabel().find( QRegExp("\\&"), 0 ); // i == 1
+ int i = btnSuspend->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnSuspend->setAccel( "ALT+" + btnSuspend->textLabel().lower()[i+1] ) ;
hbuttonbox->addWidget ( btnSuspend);
- connect(btnSuspend, SIGNAL(clicked()), SLOT(slotSuspend()));
+ connect(btnSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotSuspend()));
}
if (canHibernate && !disableHibernate)
@@ -437,27 +437,27 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
FlatButton* btnHibernate = new FlatButton( frame );
btnHibernate->setTextLabel( i18n("&Hibernate"), false );
btnHibernate->setPixmap( DesktopIcon( "hibernate") );
- int i = btnHibernate->textLabel().find( QRegExp("\\&"), 0 ); // i == 1
+ int i = btnHibernate->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnHibernate->setAccel( "ALT+" + btnHibernate->textLabel().lower()[i+1] ) ;
hbuttonbox->addWidget ( btnHibernate);
- connect(btnHibernate, SIGNAL(clicked()), SLOT(slotHibernate()));
+ connect(btnHibernate, TQT_SIGNAL(clicked()), TQT_SLOT(slotHibernate()));
}
// Separator (within buttonlay)
vbox->addWidget( new KSeparator( frame ) );
// bottom buttons
- QHBoxLayout* hbuttonbox2 = new QHBoxLayout( vbox, factor * KDialog::spacingHint() );
+ TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
hbuttonbox2->setAlignment( Qt::AlignHCenter );
// Reboot
FlatButton* btnReboot = new FlatButton( frame );
btnReboot->setTextLabel( i18n("&Restart"), false );
btnReboot->setPixmap( DesktopIcon( "reload") );
- int i = btnReboot->textLabel().find( QRegExp("\\&"), 0 ); // i == 1
+ int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ;
hbuttonbox2->addWidget ( btnReboot);
- connect(btnReboot, SIGNAL(clicked()), SLOT(slotReboot()));
+ connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
if ( sdtype == KApplication::ShutdownTypeReboot )
btnReboot->setFocus();
@@ -465,14 +465,14 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
int def, cur;
if ( DM().bootOptions( rebootOptions, def, cur ) ) {
btnReboot->setPopupDelay(300); // visually add dropdown
- targets = new QPopupMenu( frame );
+ targets = new TQPopupMenu( frame );
if ( cur == -1 )
cur = def;
int index = 0;
- for (QStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index)
+ for (TQStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index)
{
- QString label = (*it);
+ TQString label = (*it);
label=label.replace('&',"&&");
if (index == cur)
targets->insertItem( label + i18n("current option in boot loader", " (current)"), index);
@@ -481,7 +481,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
}
btnReboot->setPopup(targets);
- connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) );
+ connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) );
}
// BAD CARMA .. this code is copied line by line from standard konqy dialog [EOF]
@@ -489,21 +489,21 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
FlatButton* btnHalt = new FlatButton( frame );
btnHalt->setTextLabel( i18n("&Turn Off"), false );
btnHalt->setPixmap( DesktopIcon( "exit") );
- i = btnHalt->textLabel().find( QRegExp("\\&"), 0 ); // i == 1
+ i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ;
hbuttonbox2->addWidget ( btnHalt );
- connect(btnHalt, SIGNAL(clicked()), SLOT(slotHalt()));
+ connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
if ( sdtype == KApplication::ShutdownTypeHalt )
btnHalt->setFocus();
// cancel buttonbox
- QHBoxLayout* hbuttonbox3 = new QHBoxLayout( vbox, factor * KDialog::spacingHint() );
+ TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
hbuttonbox3->setAlignment( Qt::AlignRight );
// Back to Desktop
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
hbuttonbox3->addWidget( btnBack );
- connect(btnBack, SIGNAL(clicked()), SLOT(reject()));
+ connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
}
else
@@ -512,7 +512,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
KPushButton* btnHalt = new KPushButton( KGuiItem( i18n("&Turn Off Computer"), "exit"), frame );
btnHalt->setFont( btnFont );
buttonlay->addWidget( btnHalt );
- connect(btnHalt, SIGNAL(clicked()), SLOT(slotHalt()));
+ connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
if ( sdtype == KApplication::ShutdownTypeHalt )
btnHalt->setFocus();
@@ -521,21 +521,21 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
btnReboot->setFont( btnFont );
buttonlay->addWidget( btnReboot );
- connect(btnReboot, SIGNAL(clicked()), SLOT(slotReboot()));
+ connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
if ( sdtype == KApplication::ShutdownTypeReboot )
btnReboot->setFocus();
// this section is copied as-is into ubuntulogout as well
int def, cur;
if ( DM().bootOptions( rebootOptions, def, cur ) ) {
- targets = new QPopupMenu( frame );
+ targets = new TQPopupMenu( frame );
if ( cur == -1 )
cur = def;
int index = 0;
- for (QStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index)
+ for (TQStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index)
{
- QString label = (*it);
+ TQString label = (*it);
label=label.replace('&',"&&");
if (index == cur)
targets->insertItem( label + i18n("current option in boot loader", " (current)"), index);
@@ -544,7 +544,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
}
btnReboot->setPopup(targets);
- connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) );
+ connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) );
}
@@ -553,7 +553,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
KPushButton* btnSuspend = new KPushButton( KGuiItem( i18n("&Suspend Computer"), "suspend"), frame );
btnSuspend->setFont( btnFont );
buttonlay->addWidget( btnSuspend );
- connect(btnSuspend, SIGNAL(clicked()), SLOT(slotSuspend()));
+ connect(btnSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotSuspend()));
}
if (canHibernate && !disableHibernate)
@@ -561,7 +561,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
KPushButton* btnHibernate = new KPushButton( KGuiItem( i18n("&Hibernate Computer"), "hibernate"), frame );
btnHibernate->setFont( btnFont );
buttonlay->addWidget( btnHibernate );
- connect(btnHibernate, SIGNAL(clicked()), SLOT(slotHibernate()));
+ connect(btnHibernate, TQT_SIGNAL(clicked()), TQT_SLOT(slotHibernate()));
}
buttonlay->addStretch( 1 );
@@ -572,7 +572,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
// Back to Desktop
KPushButton* btnBack = new KPushButton( KStdGuiItem::cancel(), frame );
buttonlay->addWidget( btnBack );
- connect(btnBack, SIGNAL(clicked()), SLOT(reject()));
+ connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
}
@@ -582,14 +582,14 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
if(doUbuntuLogout)
{
// cancel buttonbox
- QHBoxLayout* hbuttonbox3 = new QHBoxLayout( vbox, factor * KDialog::spacingHint() );
+ TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
hbuttonbox3->setAlignment( Qt::AlignRight );
// Back to Desktop
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
hbuttonbox3->addWidget( btnBack );
- connect(btnBack, SIGNAL(clicked()), SLOT(reject()));
+ connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
}
else
{
@@ -600,7 +600,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
KPushButton* btnBack = new KPushButton( KStdGuiItem::cancel(), frame );
buttonlay->addWidget( btnBack );
- connect(btnBack, SIGNAL(clicked()), SLOT(reject()));
+ connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
}
@@ -632,7 +632,7 @@ void KSMShutdownDlg::slotLogout()
void KSMShutdownDlg::slotReboot()
{
// no boot option selected -> current
- m_bootOption = QString::null;
+ m_bootOption = TQString::null;
m_shutdownType = KApplication::ShutdownTypeReboot;
accept();
}
@@ -648,7 +648,7 @@ void KSMShutdownDlg::slotReboot(int opt)
void KSMShutdownDlg::slotHalt()
{
- m_bootOption = QString::null;
+ m_bootOption = TQString::null;
m_shutdownType = KApplication::ShutdownTypeHalt;
accept();
}
@@ -700,7 +700,7 @@ void KSMShutdownDlg::slotHibernate()
reject(); // continue on resume
}
-bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sdtype, QString& bootOption )
+bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sdtype, TQString& bootOption )
{
kapp->enableStyles();
KSMShutdownDlg* l = new KSMShutdownDlg( 0,
@@ -708,8 +708,8 @@ bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sd
maysd, sdtype );
// Show dialog (will save the background in showEvent)
- QSize sh = l->sizeHint();
- QRect rect = KGlobalSettings::desktopGeometry(QCursor::pos());
+ TQSize sh = l->sizeHint();
+ TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
l->move(rect.x() + (rect.width() - sh.width())/2,
rect.y() + (rect.height() - sh.height())/2);
@@ -724,17 +724,17 @@ bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sd
}
KSMDelayedPushButton::KSMDelayedPushButton( const KGuiItem &item,
- QWidget *parent,
+ TQWidget *parent,
const char *name)
: KPushButton( item, parent, name), pop(0), popt(0)
{
- connect(this, SIGNAL(pressed()), SLOT(slotPressed()));
- connect(this, SIGNAL(released()), SLOT(slotReleased()));
- popt = new QTimer(this);
- connect(popt, SIGNAL(timeout()), SLOT(slotTimeout()));
+ connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()));
+ connect(this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()));
+ popt = new TQTimer(this);
+ connect(popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
}
-void KSMDelayedPushButton::setPopup(QPopupMenu *p)
+void KSMDelayedPushButton::setPopup(TQPopupMenu *p)
{
pop = p;
setIsMenuButton(p != 0);
@@ -743,7 +743,7 @@ void KSMDelayedPushButton::setPopup(QPopupMenu *p)
void KSMDelayedPushButton::slotPressed()
{
if (pop)
- popt->start(QApplication::startDragTime());
+ popt->start(TQApplication::startDragTime());
}
void KSMDelayedPushButton::slotReleased()
@@ -753,16 +753,16 @@ void KSMDelayedPushButton::slotReleased()
void KSMDelayedPushButton::slotTimeout()
{
- QPoint bl = mapToGlobal(rect().bottomLeft());
- QWidget *par = (QWidget*)parent();
- QPoint br = par->mapToGlobal(par->rect().bottomRight());
+ TQPoint bl = mapToGlobal(rect().bottomLeft());
+ TQWidget *par = (TQWidget*)parent();
+ TQPoint br = par->mapToGlobal(par->rect().bottomRight());
pop->popup( bl );
popt->stop();
setDown(false);
}
KSMPushButton::KSMPushButton( const KGuiItem &item,
- QWidget *parent,
+ TQWidget *parent,
const char *name)
: KPushButton( item, parent, name),
m_pressed(false)
@@ -772,7 +772,7 @@ KSMPushButton::KSMPushButton( const KGuiItem &item,
}
-void KSMPushButton::keyPressEvent( QKeyEvent* e )
+void KSMPushButton::keyPressEvent( TQKeyEvent* e )
{
switch ( e->key() )
{
@@ -790,11 +790,11 @@ switch ( e->key() )
e->ignore();
}
- QPushButton::keyPressEvent(e);
+ TQPushButton::keyPressEvent(e);
}
-void KSMPushButton::keyReleaseEvent( QKeyEvent* e )
+void KSMPushButton::keyReleaseEvent( TQKeyEvent* e )
{
switch ( e->key() )
{
@@ -821,8 +821,8 @@ void KSMPushButton::keyReleaseEvent( QKeyEvent* e )
-FlatButton::FlatButton( QWidget *parent, const char *name )
- : QToolButton( parent, name/*, WNoAutoErase*/ ),
+FlatButton::FlatButton( TQWidget *parent, const char *name )
+ : TQToolButton( parent, name/*, WNoAutoErase*/ ),
m_pressed(false)
{
init();
@@ -837,12 +837,12 @@ void FlatButton::init()
setUsesTextLabel(true);
setUsesBigPixmap(true);
setAutoRaise(true);
- setTextPosition( QToolButton::Under );
- setFocusPolicy(QWidget::StrongFocus);
+ setTextPosition( TQToolButton::Under );
+ setFocusPolicy(TQWidget::StrongFocus);
}
-void FlatButton::keyPressEvent( QKeyEvent* e )
+void FlatButton::keyPressEvent( TQKeyEvent* e )
{
switch ( e->key() )
{
@@ -860,11 +860,11 @@ void FlatButton::keyPressEvent( QKeyEvent* e )
e->ignore();
}
- QToolButton::keyPressEvent(e);
+ TQToolButton::keyPressEvent(e);
}
-void FlatButton::keyReleaseEvent( QKeyEvent* e )
+void FlatButton::keyReleaseEvent( TQKeyEvent* e )
{
switch ( e->key() )
{
diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h
index d696dff71..8361d30a8 100644
--- a/ksmserver/shutdowndlg.h
+++ b/ksmserver/shutdowndlg.h
@@ -7,15 +7,15 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
#ifndef SHUTDOWNDLG_H
#define SHUTDOWNDLG_H
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qdatetime.h>
-#include <qdialog.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
+#include <tqdatetime.h>
+#include <tqdialog.h>
#include <kpushbutton.h>
-#include <qpushbutton.h>
-#include <qframe.h>
+#include <tqpushbutton.h>
+#include <tqframe.h>
#include <kguiitem.h>
-#include <qtoolbutton.h>
+#include <tqtoolbutton.h>
class QPushButton;
class QVButtonGroup;
@@ -54,15 +54,15 @@ private:
static KSMShutdownFeedback * s_pSelf;
KSMShutdownFeedback();
int m_currentY;
- QPixmap m_root;
+ TQPixmap m_root;
void fadeBack( void );
float m_grayOpacity;
float m_compensation;
bool m_fadeBackwards;
bool m_readDelayComplete;
- QImage m_unfadedImage;
- QImage m_grayImage;
- QTime m_fadeTime;
+ TQImage m_unfadedImage;
+ TQImage m_grayImage;
+ TQTime m_fadeTime;
int m_rowsDone;
KPixmapIO m_pmio;
@@ -75,7 +75,7 @@ class KSMShutdownDlg : public QDialog
Q_OBJECT
public:
- static bool confirmShutdown( bool maysd, KApplication::ShutdownType& sdtype, QString& bopt );
+ static bool confirmShutdown( bool maysd, KApplication::ShutdownType& sdtype, TQString& bopt );
public slots:
void slotLogout();
@@ -89,11 +89,11 @@ protected:
~KSMShutdownDlg();
private:
- KSMShutdownDlg( QWidget* parent, bool maysd, KApplication::ShutdownType sdtype );
+ KSMShutdownDlg( TQWidget* parent, bool maysd, KApplication::ShutdownType sdtype );
KApplication::ShutdownType m_shutdownType;
- QString m_bootOption;
- QPopupMenu *targets;
- QStringList rebootOptions;
+ TQString m_bootOption;
+ TQPopupMenu *targets;
+ TQStringList rebootOptions;
LibHalContext* m_halCtx;
DBusConnection *m_dbusConn;
bool m_lockOnResume;
@@ -105,8 +105,8 @@ class KSMDelayedPushButton : public KPushButton
public:
- KSMDelayedPushButton( const KGuiItem &item, QWidget *parent, const char *name = 0 );
- void setPopup( QPopupMenu *pop);
+ KSMDelayedPushButton( const KGuiItem &item, TQWidget *parent, const char *name = 0 );
+ void setPopup( TQPopupMenu *pop);
private slots:
void slotTimeout();
@@ -114,8 +114,8 @@ private slots:
void slotReleased();
private:
- QPopupMenu *pop;
- QTimer *popt;
+ TQPopupMenu *pop;
+ TQTimer *popt;
};
class KSMPushButton : public KPushButton
@@ -124,11 +124,11 @@ class KSMPushButton : public KPushButton
public:
- KSMPushButton( const KGuiItem &item, QWidget *parent, const char *name = 0 );
+ KSMPushButton( const KGuiItem &item, TQWidget *parent, const char *name = 0 );
protected:
- virtual void keyPressEvent(QKeyEvent*e);
- virtual void keyReleaseEvent(QKeyEvent*e);
+ virtual void keyPressEvent(TQKeyEvent*e);
+ virtual void keyReleaseEvent(TQKeyEvent*e);
private:
@@ -144,12 +144,12 @@ class FlatButton : public QToolButton
public:
- FlatButton( QWidget *parent = 0, const char *name = 0 );
+ FlatButton( TQWidget *parent = 0, const char *name = 0 );
~FlatButton();
protected:
- virtual void keyPressEvent(QKeyEvent*e);
- virtual void keyReleaseEvent(QKeyEvent*e);
+ virtual void keyPressEvent(TQKeyEvent*e);
+ virtual void keyReleaseEvent(TQKeyEvent*e);
private slots:
@@ -157,8 +157,8 @@ class FlatButton : public QToolButton
void init();
bool m_pressed;
- QString m_text;
- QPixmap m_pixmap;
+ TQString m_text;
+ TQPixmap m_pixmap;
};
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index 9bc984a79..2778b9dd9 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -56,14 +56,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <limits.h>
#endif
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qdatastream.h>
-#include <qptrstack.h>
-#include <qpushbutton.h>
-#include <qmessagebox.h>
-#include <qguardedptr.h>
-#include <qtimer.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqdatastream.h>
+#include <tqptrstack.h>
+#include <tqpushbutton.h>
+#include <tqmessagebox.h>
+#include <tqguardedptr.h>
+#include <tqtimer.h>
#include <klocale.h>
#include <kglobal.h>
@@ -88,7 +88,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/*! Restores the previous session. Ensures the window manager is
running (if specified).
*/
-void KSMServer::restoreSession( QString sessionName )
+void KSMServer::restoreSession( TQString sessionName )
{
if( state != Idle )
return;
@@ -104,17 +104,17 @@ void KSMServer::restoreSession( QString sessionName )
int count = config->readNumEntry( "count" );
appsToStart = count;
- QValueList<QStringList> wmCommands;
+ TQValueList<TQStringList> wmCommands;
if ( !wm.isEmpty() ) {
for ( int i = 1; i <= count; i++ ) {
- QString n = QString::number(i);
- if ( wm == config->readEntry( QString("program")+n ) ) {
- wmCommands << config->readListEntry( QString("restartCommand")+n );
+ TQString n = TQString::number(i);
+ if ( wm == config->readEntry( TQString("program")+n ) ) {
+ wmCommands << config->readListEntry( TQString("restartCommand")+n );
}
}
}
if ( wmCommands.isEmpty() )
- wmCommands << ( QStringList() << wm );
+ wmCommands << ( TQStringList() << wm );
publishProgress( appsToStart, true );
connectDCOPSignal( launcher, launcher, "autoStart0Done()",
@@ -131,7 +131,7 @@ void KSMServer::restoreSession( QString sessionName )
// visually more appealing startup.
for (uint i = 0; i < wmCommands.count(); i++)
startApplication( wmCommands[i] );
- QTimer::singleShot( 4000, this, SLOT( autoStart0() ) );
+ TQTimer::singleShot( 4000, this, TQT_SLOT( autoStart0() ) );
} else {
autoStart0();
}
@@ -158,7 +158,7 @@ void KSMServer::startDefaultSession()
connectDCOPSignal( launcher, launcher, "autoStart2Done()",
"autoStart2Done()", true);
startApplication( wm );
- QTimer::singleShot( 4000, this, SLOT( autoStart0() ) );
+ TQTimer::singleShot( 4000, this, TQT_SLOT( autoStart0() ) );
}
@@ -192,7 +192,7 @@ void KSMServer::autoStart0Done()
connectDCOPSignal( "kcminit", "kcminit", "phase1Done()",
"kcmPhase1Done()", true);
state = KcmInitPhase1;
- QTimer::singleShot( 10000, this, SLOT( kcmPhase1Timeout())); // protection
+ TQTimer::singleShot( 10000, this, TQT_SLOT( kcmPhase1Timeout())); // protection
DCOPRef( "kcminit", "kcminit" ).send( "runPhase1" );
}
@@ -232,7 +232,7 @@ void KSMServer::autoStart1Done()
return;
kdDebug( 1218 ) << "Autostart 1 done" << endl;
lastAppStarted = 0;
- lastIdStarted = QString::null;
+ lastIdStarted = TQString::null;
state = Restoring;
if( defaultSession()) {
autoStart2();
@@ -258,20 +258,20 @@ void KSMServer::tryRestoreNext()
while ( lastAppStarted < appsToStart ) {
publishProgress ( appsToStart - lastAppStarted );
lastAppStarted++;
- QString n = QString::number(lastAppStarted);
- QStringList restartCommand = config->readListEntry( QString("restartCommand")+n );
+ TQString n = TQString::number(lastAppStarted);
+ TQStringList restartCommand = config->readListEntry( TQString("restartCommand")+n );
if ( restartCommand.isEmpty() ||
- (config->readNumEntry( QString("restartStyleHint")+n ) == SmRestartNever)) {
+ (config->readNumEntry( TQString("restartStyleHint")+n ) == SmRestartNever)) {
continue;
}
- if ( wm == config->readEntry( QString("program")+n ) )
+ if ( wm == config->readEntry( TQString("program")+n ) )
continue; // wm already started
- if( config->readBoolEntry( QString( "wasWm" )+n, false ))
+ if( config->readBoolEntry( TQString( "wasWm" )+n, false ))
continue; // it was wm before, but not now, don't run it (some have --replace in command :( )
startApplication( restartCommand,
- config->readEntry( QString("clientMachine")+n ),
- config->readEntry( QString("userId")+n ));
- lastIdStarted = config->readEntry( QString("clientId")+n );
+ config->readEntry( TQString("clientMachine")+n ),
+ config->readEntry( TQString("userId")+n ));
+ lastIdStarted = config->readEntry( TQString("clientId")+n );
if ( !lastIdStarted.isEmpty() ) {
restoreTimer.start( 2000, TRUE );
return; // we get called again from the clientRegistered handler
@@ -279,7 +279,7 @@ void KSMServer::tryRestoreNext()
}
appsToStart = 0;
- lastIdStarted = QString::null;
+ lastIdStarted = TQString::null;
publishProgress( 0 );
autoStart2();
@@ -299,7 +299,7 @@ void KSMServer::autoStart2()
DCOPRef( "kdesktop", "KDesktopIface" ).send( "runAutoStart" );
connectDCOPSignal( "kcminit", "kcminit", "phase2Done()",
"kcmPhase2Done()", true);
- QTimer::singleShot( 10000, this, SLOT( kcmPhase2Timeout())); // protection
+ TQTimer::singleShot( 10000, this, TQT_SLOT( kcmPhase2Timeout())); // protection
DCOPRef( "kcminit", "kcminit" ).send( "runPhase2" );
if( !defaultSession())
restoreLegacySession( KGlobal::config());
@@ -361,14 +361,14 @@ bool KSMServer::checkStartupSuspend()
return false;
}
-void KSMServer::suspendStartup( QCString app )
+void KSMServer::suspendStartup( TQCString app )
{
if( !startupSuspendCount.contains( app ))
startupSuspendCount[ app ] = 0;
++startupSuspendCount[ app ];
}
-void KSMServer::resumeStartup( QCString app )
+void KSMServer::resumeStartup( TQCString app )
{
if( !startupSuspendCount.contains( app ))
return;
@@ -415,7 +415,7 @@ void KSMServer::publishProgress( int progress, bool max )
}
-void KSMServer::upAndRunning( const QString& msg )
+void KSMServer::upAndRunning( const TQString& msg )
{
DCOPRef( "ksplash" ).send( "upAndRunning", msg );
XEvent e;
diff --git a/ksmserver/test.cpp b/ksmserver/test.cpp
index 57a6c51d6..846c449db 100644
--- a/ksmserver/test.cpp
+++ b/ksmserver/test.cpp
@@ -15,7 +15,7 @@ main(int argc, char *argv[])
KSMShutdownFeedback::start();
KApplication::ShutdownType sdtype = KApplication::ShutdownTypeNone;
- QString bopt;
+ TQString bopt;
(void)KSMShutdownDlg::confirmShutdown( true,
sdtype,
bopt );
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp
index a2850ecfa..335611a9f 100644
--- a/ksplashml/kcmksplash/installer.cpp
+++ b/ksplashml/kcmksplash/installer.cpp
@@ -12,10 +12,10 @@
#include <unistd.h>
#include <stdlib.h>
-#include <qdir.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qtextedit.h>
+#include <tqdir.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqtextedit.h>
#include "installer.h"
@@ -32,20 +32,20 @@
#include <kurldrag.h>
#include <kio/netaccess.h>
-ThemeListBox::ThemeListBox(QWidget *parent)
+ThemeListBox::ThemeListBox(TQWidget *parent)
: KListBox(parent)
{
setAcceptDrops(true);
- connect(this, SIGNAL(mouseButtonPressed(int, QListBoxItem *, const QPoint &)),
- this, SLOT(slotMouseButtonPressed(int, QListBoxItem *, const QPoint &)));
+ connect(this, TQT_SIGNAL(mouseButtonPressed(int, TQListBoxItem *, const TQPoint &)),
+ this, TQT_SLOT(slotMouseButtonPressed(int, TQListBoxItem *, const TQPoint &)));
}
-void ThemeListBox::dragEnterEvent(QDragEnterEvent* event)
+void ThemeListBox::dragEnterEvent(TQDragEnterEvent* event)
{
event->accept((event->source() != this) && KURLDrag::canDecode(event));
}
-void ThemeListBox::dropEvent(QDropEvent* event)
+void ThemeListBox::dropEvent(TQDropEvent* event)
{
KURL::List urls;
if (KURLDrag::decode(event, urls))
@@ -54,22 +54,22 @@ void ThemeListBox::dropEvent(QDropEvent* event)
}
}
-void ThemeListBox::slotMouseButtonPressed(int button, QListBoxItem *item, const QPoint &p)
+void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &p)
{
if ((button & LeftButton) == 0) return;
mOldPos = p;
- mDragFile = QString::null;
+ mDragFile = TQString::null;
int cur = index(item);
if (cur >= 0)
mDragFile = text2path[text(cur)];
}
-void ThemeListBox::mouseMoveEvent(QMouseEvent *e)
+void ThemeListBox::mouseMoveEvent(TQMouseEvent *e)
{
if (((e->state() & LeftButton) != 0) && !mDragFile.isEmpty())
{
int delay = KGlobalSettings::dndEventDelay();
- QPoint newPos = e->globalPos();
+ TQPoint newPos = e->globalPos();
if(newPos.x() > mOldPos.x()+delay || newPos.x() < mOldPos.x()-delay ||
newPos.y() > mOldPos.y()+delay || newPos.y() < mOldPos.y()-delay)
{
@@ -85,50 +85,50 @@ void ThemeListBox::mouseMoveEvent(QMouseEvent *e)
}
//-----------------------------------------------------------------------------
-SplashInstaller::SplashInstaller (QWidget *aParent, const char *aName, bool aInit)
- : QWidget(aParent, aName), mGui(!aInit)
+SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aInit)
+ : TQWidget(aParent, aName), mGui(!aInit)
{
KGlobal::dirs()->addResourceType("ksplashthemes", KStandardDirs::kde_default("data") + "ksplash/Themes");
if (!mGui)
return;
- QHBoxLayout* hbox = new QHBoxLayout( this, 0, KDialog::spacingHint() );
+ TQHBoxLayout* hbox = new TQHBoxLayout( this, 0, KDialog::spacingHint() );
- QVBoxLayout* leftbox = new QVBoxLayout( hbox, KDialog::spacingHint() );
+ TQVBoxLayout* leftbox = new TQVBoxLayout( hbox, KDialog::spacingHint() );
hbox->setStretchFactor( leftbox, 1 );
mThemesList = new ThemeListBox(this);
- mThemesList->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
- connect(mThemesList, SIGNAL(highlighted(int)), SLOT(slotSetTheme(int)));
- connect(mThemesList, SIGNAL(filesDropped(const KURL::List&)), SLOT(slotFilesDropped(const KURL::List&)));
+ mThemesList->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
+ connect(mThemesList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSetTheme(int)));
+ connect(mThemesList, TQT_SIGNAL(filesDropped(const KURL::List&)), TQT_SLOT(slotFilesDropped(const KURL::List&)));
leftbox->addWidget(mThemesList);
mBtnAdd = new KPushButton( i18n("Add..."), this );
leftbox->addWidget( mBtnAdd );
- connect(mBtnAdd, SIGNAL(clicked()), SLOT(slotAdd()));
+ connect(mBtnAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()));
mBtnRemove = new KPushButton( i18n("Remove"), this );
leftbox->addWidget( mBtnRemove );
- connect(mBtnRemove, SIGNAL(clicked()), SLOT(slotRemove()));
+ connect(mBtnRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
mBtnTest = new KPushButton( i18n("Test"), this );
leftbox->addWidget( mBtnTest );
- connect(mBtnTest, SIGNAL(clicked()), SLOT(slotTest()));
+ connect(mBtnTest, TQT_SIGNAL(clicked()), TQT_SLOT(slotTest()));
- QVBoxLayout* rightbox = new QVBoxLayout( hbox, KDialog::spacingHint() );
+ TQVBoxLayout* rightbox = new TQVBoxLayout( hbox, KDialog::spacingHint() );
hbox->setStretchFactor( rightbox, 3 );
- mPreview = new QLabel(this);
- mPreview->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
- mPreview->setFrameStyle(QFrame::Panel|QFrame::Sunken);
- mPreview->setMinimumSize(QSize(320,240));
+ mPreview = new TQLabel(this);
+ mPreview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+ mPreview->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
+ mPreview->setMinimumSize(TQSize(320,240));
mPreview->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
rightbox->addWidget(mPreview);
rightbox->setStretchFactor( mPreview, 3 );
- mText = new QTextEdit(this);
- mText->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
+ mText = new TQTextEdit(this);
+ mText->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
mText->setMinimumSize(mText->sizeHint());
mText->setReadOnly(true);
rightbox->addWidget(mText);
@@ -144,10 +144,10 @@ SplashInstaller::~SplashInstaller()
{
}
-int SplashInstaller::addTheme(const QString &path, const QString &name)
+int SplashInstaller::addTheme(const TQString &path, const TQString &name)
{
//kdDebug() << "SplashInstaller::addTheme: " << path << " " << name << endl;
- QString tmp(i18n( name.utf8() ));
+ TQString tmp(i18n( name.utf8() ));
int i = mThemesList->count();
while((i > 0) && (mThemesList->text(i-1) > tmp))
i--;
@@ -161,9 +161,9 @@ int SplashInstaller::addTheme(const QString &path, const QString &name)
// Copy theme package into themes directory
void SplashInstaller::addNewTheme(const KURL &srcURL)
{
- QString dir = KGlobal::dirs()->saveLocation("ksplashthemes");
+ TQString dir = KGlobal::dirs()->saveLocation("ksplashthemes");
KURL url;
- QString filename = srcURL.fileName();
+ TQString filename = srcURL.fileName();
int i = filename.findRev('.');
// Convert extension to lower case.
if (i >= 0)
@@ -191,11 +191,11 @@ void SplashInstaller::addNewTheme(const KURL &srcURL)
}
KArchiveDirectory const *ad = tarFile.directory();
// Find first directory entry.
- QStringList entries = ad->entries();
- QString themeName( entries.first() );
+ TQStringList entries = ad->entries();
+ TQString themeName( entries.first() );
#if 0
// The isDirectory() call always returns false; why?
- for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
+ for ( TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
{
if ( ad->entry( *it )->isDirectory() )
{
@@ -222,21 +222,21 @@ void SplashInstaller::readThemesList()
mThemesList->clear();
// Read local themes
- QStringList entryList = KGlobal::dirs()->resourceDirs("ksplashthemes");
+ TQStringList entryList = KGlobal::dirs()->resourceDirs("ksplashthemes");
//kdDebug() << "readThemesList: " << entryList << endl;
- QDir dir;
- QStringList subdirs;
- QStringList::ConstIterator name;
+ TQDir dir;
+ TQStringList subdirs;
+ TQStringList::ConstIterator name;
for(name = entryList.begin(); name != entryList.end(); name++)
{
dir = *name;
if (!dir.exists())
continue;
- subdirs = dir.entryList( QDir::Dirs );
+ subdirs = dir.entryList( TQDir::Dirs );
// kdDebug() << "readThemesList: " << subdirs << endl;
// TODO: Make sure it contains a *.rc file.
- for (QStringList::Iterator l = subdirs.begin(); l != subdirs.end(); l++ )
- if ( !(*l).startsWith(QString(".")) )
+ for (TQStringList::Iterator l = subdirs.begin(); l != subdirs.end(); l++ )
+ if ( !(*l).startsWith(TQString(".")) )
{
mThemesList->blockSignals( true ); // Don't activate any theme until all themes are loaded.
addTheme(dir.path(),*l);
@@ -261,7 +261,7 @@ void SplashInstaller::load( bool useDefaults )
KConfig cnf("ksplashrc");
cnf.setReadDefaults( useDefaults );
cnf.setGroup("KSplash");
- QString curTheme = cnf.readEntry("Theme","Default");
+ TQString curTheme = cnf.readEntry("Theme","Default");
mThemesList->setCurrentItem(findTheme(curTheme));
emit changed( useDefaults );
}
@@ -274,7 +274,7 @@ void SplashInstaller::save()
int cur = mThemesList->currentItem();
if (cur < 0)
return;
- QString path = mThemesList->text(cur);
+ TQString path = mThemesList->text(cur);
if ( mThemesList->text2path.contains( path ) )
path = mThemesList->text2path[path];
cur = path.findRev('/');
@@ -291,8 +291,8 @@ void SplashInstaller::slotRemove()
return;
bool rc = false;
- QString themeName = mThemesList->text(cur);
- QString themeDir = mThemesList->text2path[themeName];
+ TQString themeName = mThemesList->text(cur);
+ TQString themeDir = mThemesList->text2path[themeName];
if (!themeDir.isEmpty())
{
KURL url;
@@ -318,24 +318,24 @@ void SplashInstaller::slotRemove()
void SplashInstaller::slotSetTheme(int id)
{
bool enabled;
- QString path(QString::null);
- QString infoTxt;
+ TQString path(TQString::null);
+ TQString infoTxt;
if (id < 0)
{
- mPreview->setText(QString::null);
- mText->setText(QString::null);
+ mPreview->setText(TQString::null);
+ mText->setText(TQString::null);
enabled = false;
}
else
{
- QString error = i18n("(Could not load theme)");
+ TQString error = i18n("(Could not load theme)");
path = mThemesList->text(id);
if ( mThemesList->text2path.contains( path ) )
path = mThemesList->text2path[path];
enabled = false;
KURL url;
- QString themeName;
+ TQString themeName;
if (!path.isEmpty())
{
// Make sure the correct plugin is installed.
@@ -356,7 +356,7 @@ void SplashInstaller::slotSetTheme(int id)
if (KIO::NetAccess::exists(url, true, 0))
{
KConfig cnf(url.path());
- cnf.setGroup( QString("KSplash Theme: %1").arg(themeName) );
+ cnf.setGroup( TQString("KSplash Theme: %1").arg(themeName) );
// Get theme information.
infoTxt = "<qt>";
@@ -372,8 +372,8 @@ void SplashInstaller::slotSetTheme(int id)
infoTxt += i18n( "<b>Homepage:</b> %1<br>" ).arg( cnf.readEntry( "Homepage", i18n( "Unknown" ) ) );
infoTxt += "</qt>";
- QString pluginName( cnf.readEntry( "Engine", "Default" ) ); // Perhaps no default is better?
- if ((KTrader::self()->query("KSplash/Plugin", QString("[X-KSplash-PluginName] == '%1'").arg(pluginName))).isEmpty())
+ TQString pluginName( cnf.readEntry( "Engine", "Default" ) ); // Perhaps no default is better?
+ if ((KTrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName))).isEmpty())
{
enabled = false;
error = i18n("This theme requires the plugin %1 which is not installed.").arg(pluginName);
@@ -392,7 +392,7 @@ void SplashInstaller::slotSetTheme(int id)
{
url.setPath( path + "/" + "Preview.png" );
if (KIO::NetAccess::exists(url, true, 0))
- mPreview->setPixmap(QPixmap(url.path()));
+ mPreview->setPixmap(TQPixmap(url.path()));
else
mPreview->setText(i18n("(Could not load theme)"));
KMessageBox::sorry(this, error);
@@ -401,21 +401,21 @@ void SplashInstaller::slotSetTheme(int id)
{
url.setPath( path + "/" + "Preview.png" );
if (KIO::NetAccess::exists(url, true, 0))
- mPreview->setPixmap(QPixmap(url.path()));
+ mPreview->setPixmap(TQPixmap(url.path()));
else
mPreview->setText(i18n("No preview available."));
emit changed(true);
}
}
- mBtnRemove->setEnabled( !path.isEmpty() && QFileInfo(path).isWritable());
+ mBtnRemove->setEnabled( !path.isEmpty() && TQFileInfo(path).isWritable());
}
//-----------------------------------------------------------------------------
void SplashInstaller::slotAdd()
{
- static QString path;
- if (path.isEmpty()) path = QDir::homeDirPath();
+ static TQString path;
+ if (path.isEmpty()) path = TQDir::homeDirPath();
KFileDialog dlg(path, "*.tgz *.tar.gz *.tar.bz2|" + i18n( "KSplash Theme Files" ), 0, 0, true);
dlg.setCaption(i18n("Add Theme"));
@@ -436,10 +436,10 @@ void SplashInstaller::slotFilesDropped(const KURL::List &urls)
}
//-----------------------------------------------------------------------------
-int SplashInstaller::findTheme( const QString &theme )
+int SplashInstaller::findTheme( const TQString &theme )
{
// theme is untranslated, but the listbox contains translated items
- QString tmp(i18n( theme.utf8() ));
+ TQString tmp(i18n( theme.utf8() ));
int id = mThemesList->count()-1;
while (id >= 0)
@@ -458,7 +458,7 @@ void SplashInstaller::slotTest()
int i = mThemesList->currentItem();
if (i < 0)
return;
- QString themeName = mThemesList->text2path[mThemesList->text(i)];
+ TQString themeName = mThemesList->text2path[mThemesList->text(i)];
int r = themeName.findRev('/');
if (r >= 0)
themeName = themeName.mid(r+1);
diff --git a/ksplashml/kcmksplash/installer.h b/ksplashml/kcmksplash/installer.h
index 43e37d0fc..98dc1fc39 100644
--- a/ksplashml/kcmksplash/installer.h
+++ b/ksplashml/kcmksplash/installer.h
@@ -11,8 +11,8 @@
#ifndef SPLASHINSTALLER_H
#define SPLASHINSTALLER_H
-#include <qmap.h>
-#include <qpoint.h>
+#include <tqmap.h>
+#include <tqpoint.h>
#include <klistbox.h>
#include <kurl.h>
@@ -26,7 +26,7 @@ class SplashInstaller : public QWidget
{
Q_OBJECT
public:
- SplashInstaller(QWidget *parent=0, const char *aName=0, bool aInit=FALSE);
+ SplashInstaller(TQWidget *parent=0, const char *aName=0, bool aInit=FALSE);
~SplashInstaller();
virtual void load();
@@ -48,39 +48,39 @@ protected:
/** Scan Themes directory for available theme packages */
virtual void readThemesList();
/** add a theme to the list, returns the list index */
- int addTheme(const QString &path, const QString &name);
+ int addTheme(const TQString &path, const TQString &name);
void addNewTheme(const KURL &srcURL);
- int findTheme( const QString &theme );
+ int findTheme( const TQString &theme );
private:
bool mGui;
ThemeListBox *mThemesList;
- QPushButton *mBtnAdd, *mBtnRemove, *mBtnTest;
- QTextEdit *mText;
- QLabel *mPreview;
+ TQPushButton *mBtnAdd, *mBtnRemove, *mBtnTest;
+ TQTextEdit *mText;
+ TQLabel *mPreview;
};
class ThemeListBox: public KListBox
{
Q_OBJECT
public:
- ThemeListBox(QWidget *parent);
- QMap<QString, QString> text2path;
+ ThemeListBox(TQWidget *parent);
+ TQMap<TQString, TQString> text2path;
signals:
void filesDropped(const KURL::List &urls);
protected:
- void dragEnterEvent(QDragEnterEvent* event);
- void dropEvent(QDropEvent* event);
- void mouseMoveEvent(QMouseEvent *e);
+ void dragEnterEvent(TQDragEnterEvent* event);
+ void dropEvent(TQDropEvent* event);
+ void mouseMoveEvent(TQMouseEvent *e);
protected slots:
- void slotMouseButtonPressed(int button, QListBoxItem *item, const QPoint &p);
+ void slotMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &p);
private:
- QString mDragFile;
- QPoint mOldPos;
+ TQString mDragFile;
+ TQPoint mOldPos;
};
diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp
index d48923a28..7b4557608 100644
--- a/ksplashml/kcmksplash/main.cpp
+++ b/ksplashml/kcmksplash/main.cpp
@@ -12,8 +12,8 @@
#include "config.h"
#endif
-#include <qlayout.h>
-#include <qtabwidget.h>
+#include <tqlayout.h>
+#include <tqtabwidget.h>
#include <kaboutdata.h>
#include <kcmodule.h>
@@ -26,10 +26,10 @@
class KSplashThemeMgr : public KCModule
{
public:
- KSplashThemeMgr( QWidget *parent, const char *name, const QStringList &/*unused*/);
+ KSplashThemeMgr( TQWidget *parent, const char *name, const TQStringList &/*unused*/);
~KSplashThemeMgr();
- QString quickHelp() const;
+ TQString quickHelp() const;
virtual void init();
virtual void save();
@@ -40,26 +40,26 @@ private:
SplashInstaller *mInstaller;
};
-typedef KGenericFactory< KSplashThemeMgr, QWidget > KSplashThemeMgrFactory;
+typedef KGenericFactory< KSplashThemeMgr, TQWidget > KSplashThemeMgrFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_ksplashthemes, KSplashThemeMgrFactory("ksplashthemes") )
// -----------------------------------------------------------------------------------------
-KSplashThemeMgr::KSplashThemeMgr( QWidget *parent, const char *name, const QStringList &)
+KSplashThemeMgr::KSplashThemeMgr( TQWidget *parent, const char *name, const TQStringList &)
: KCModule( KSplashThemeMgrFactory::instance(), parent, name ), mInstaller(new SplashInstaller(this))
{
init();
#if 0
- QHBoxLayout *box = new QHBoxLayout(this);
- QTabWidget *tab = new QTabWidget(this); // There will be more tabs in the future.
+ TQHBoxLayout *box = new TQHBoxLayout(this);
+ TQTabWidget *tab = new TQTabWidget(this); // There will be more tabs in the future.
box->addWidget(tab);
tab->addTab( mInstaller, i18n("&Theme Installer") );
#else
- QHBoxLayout *box = new QHBoxLayout(this, 0, 0);
+ TQHBoxLayout *box = new TQHBoxLayout(this, 0, 0);
box->addWidget(mInstaller);
#endif
- connect( mInstaller, SIGNAL(changed(bool)), SIGNAL(changed(bool)) );
+ connect( mInstaller, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
KAboutData *about = new KAboutData( "kcmksplash"
,I18N_NOOP("KDE splash screen theme manager")
,"0.1"
@@ -79,7 +79,7 @@ KSplashThemeMgr::~KSplashThemeMgr()
// Do not delete the installer as it is now owned by the tab widget.
}
-QString KSplashThemeMgr::quickHelp() const
+TQString KSplashThemeMgr::quickHelp() const
{
return i18n("<h1>Splash Screen Theme Manager </h1> Install and view splash screen themes.");
}
diff --git a/ksplashml/ksplashiface.h b/ksplashml/ksplashiface.h
index 2e8e7a8fc..a3093c0a7 100644
--- a/ksplashml/ksplashiface.h
+++ b/ksplashml/ksplashiface.h
@@ -14,7 +14,7 @@
#include <dcopobject.h>
-#include <qstring.h>
+#include <tqstring.h>
/** @short DCOP interface for KSplash. */
class KSplashIface : virtual public DCOPObject
@@ -24,11 +24,11 @@ public:
KSplashIface( const char *name = "ksplash" ) : DCOPObject(name) {}
k_dcop:
- virtual ASYNC upAndRunning( QString ) = 0;
+ virtual ASYNC upAndRunning( TQString ) = 0;
virtual ASYNC setMaxProgress(int) = 0;
virtual ASYNC setProgress(int) = 0;
virtual ASYNC setStartupItemCount( int count ) = 0;
- virtual ASYNC programStarted( QString programIcon, QString programName, QString description ) = 0;
+ virtual ASYNC programStarted( TQString programIcon, TQString programName, TQString description ) = 0;
virtual ASYNC startupComplete() = 0;
virtual ASYNC close() = 0;
virtual ASYNC hide() = 0;
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index 35d47241b..77274da99 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -18,34 +18,34 @@
#include <kstandarddirs.h>
#include <kprogress.h>
-#include <qcheckbox.h>
-#include <qdesktopwidget.h>
-#include <qlabel.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qwidget.h>
-#include <qtimer.h>
+#include <tqcheckbox.h>
+#include <tqdesktopwidget.h>
+#include <tqlabel.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqwidget.h>
+#include <tqtimer.h>
#include "objkstheme.h"
#include "themeengine.h"
#include "themelegacy.h"
#include "themelegacy.moc"
-DefaultConfig::DefaultConfig( QWidget *parent, KConfig *config )
+DefaultConfig::DefaultConfig( TQWidget *parent, KConfig *config )
:ThemeEngineConfig( parent, config )
{
- mConfig->setGroup( QString("KSplash Theme: Default") );
- QVBox *hbox = new QVBox( this );
- mFlash = new QCheckBox( i18n("Icons flash while they are starting"), hbox );
+ mConfig->setGroup( TQString("KSplash Theme: Default") );
+ TQVBox *hbox = new TQVBox( this );
+ mFlash = new TQCheckBox( i18n("Icons flash while they are starting"), hbox );
mFlash->setChecked( mConfig->readBoolEntry("Icons Flashing",true) );
- mAlwaysShow = new QCheckBox( i18n("Always show progress bar"), hbox );
+ mAlwaysShow = new TQCheckBox( i18n("Always show progress bar"), hbox );
mAlwaysShow->setChecked( mConfig->readBoolEntry("Always Show Progress",true) );
}
void DefaultConfig::save()
{
kdDebug() << "DefaultConfig::save()" << endl;
- mConfig->setGroup( QString("KSplash Theme: Default") );
+ mConfig->setGroup( TQString("KSplash Theme: Default") );
mConfig->writeEntry( "Icons Flashing", mFlash->isChecked() );
mConfig->writeEntry( "Always Show Progress", mAlwaysShow->isChecked() );
mConfig->sync();
@@ -53,7 +53,7 @@ void DefaultConfig::save()
#define BIDI 0
-ThemeDefault::ThemeDefault( QWidget *parent, const char *name, const QStringList &args )
+ThemeDefault::ThemeDefault( TQWidget *parent, const char *name, const TQStringList &args )
:ThemeEngine( parent, name, args )
{
@@ -65,10 +65,10 @@ ThemeDefault::ThemeDefault( QWidget *parent, const char *name, const QStringList
if( mIconsFlashing )
{
- mFlashTimer = new QTimer( this );
- connect( mFlashTimer, SIGNAL(timeout()), this, SLOT(flash()) );
- mFlashPixmap1 = new QPixmap();
- mFlashPixmap2 = new QPixmap();
+ mFlashTimer = new TQTimer( this );
+ connect( mFlashTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(flash()) );
+ mFlashPixmap1 = new TQPixmap();
+ mFlashPixmap2 = new TQPixmap();
}
else
@@ -87,30 +87,30 @@ ThemeDefault::~ThemeDefault()
void ThemeDefault::_initUi()
{
- QString resource_prefix;
+ TQString resource_prefix;
- QVBox *vbox = new QVBox( this );
+ TQVBox *vbox = new TQVBox( this );
vbox->setBackgroundMode(NoBackground);
- QString activePix, inactivePix;
+ TQString activePix, inactivePix;
#if BIDI
- if ( QApplication::reverseLayout() )
+ if ( TQApplication::reverseLayout() )
{
- activePix = _findPicture(QString("splash_active_bar_bidi.png"));
- inactivePix = _findPicture(QString("splash_inactive_bar_bidi.png"));
+ activePix = _findPicture(TQString("splash_active_bar_bidi.png"));
+ inactivePix = _findPicture(TQString("splash_inactive_bar_bidi.png"));
}
else
#endif
{
- activePix = _findPicture(QString("splash_active_bar.png"));
- inactivePix = _findPicture(QString("splash_inactive_bar.png"));
+ activePix = _findPicture(TQString("splash_active_bar.png"));
+ inactivePix = _findPicture(TQString("splash_inactive_bar.png"));
}
kdDebug() << "Inactive pixmap: " << inactivePix << endl;
kdDebug() << "Active pixmap: " << activePix << endl;
- mActivePixmap = new QPixmap( activePix );
- mInactivePixmap = new QPixmap( inactivePix );
+ mActivePixmap = new TQPixmap( activePix );
+ mInactivePixmap = new TQPixmap( inactivePix );
if (mActivePixmap->isNull())
{
@@ -123,44 +123,44 @@ void ThemeDefault::_initUi()
mInactivePixmap->fill(Qt::black);
}
- QPixmap tlimage( _findPicture(QString("splash_top.png")) );
+ TQPixmap tlimage( _findPicture(TQString("splash_top.png")) );
if (tlimage.isNull())
{
tlimage.resize(200,100);
tlimage.fill(Qt::blue);
}
- QLabel *top_label = new QLabel( vbox );
+ TQLabel *top_label = new TQLabel( vbox );
top_label->setPixmap( tlimage );
top_label->setFixedSize( tlimage.width(), tlimage.height() );
top_label->setBackgroundMode(NoBackground);
- mBarLabel = new QLabel( vbox );
+ mBarLabel = new TQLabel( vbox );
mBarLabel->setPixmap(*mInactivePixmap);
mBarLabel->setBackgroundMode(NoBackground);
- QPixmap blimage( _findPicture(QString("splash_bottom.png")) );
+ TQPixmap blimage( _findPicture(TQString("splash_bottom.png")) );
if (blimage.isNull())
{
blimage.resize(200,100);
blimage.fill(Qt::black);
}
- QLabel *bottom_label = new QLabel( vbox );
+ TQLabel *bottom_label = new TQLabel( vbox );
bottom_label->setPaletteBackgroundPixmap( blimage );
- mLabel = new QLabel( bottom_label );
- mLabel->setBackgroundOrigin( QWidget::ParentOrigin );
+ mLabel = new TQLabel( bottom_label );
+ mLabel->setBackgroundOrigin( TQWidget::ParentOrigin );
mLabel->setPaletteForegroundColor( mLabelForeground );
mLabel->setPaletteBackgroundPixmap( blimage );
- QFont f(mLabel->font());
+ TQFont f(mLabel->font());
f.setBold(TRUE);
mLabel->setFont(f);
mProgressBar = new KProgress( mLabel );
int h, s, v;
mLabelForeground.getHsv( &h, &s, &v );
- mProgressBar->setPalette( QPalette( v > 128 ? black : white ));
- mProgressBar->setBackgroundOrigin( QWidget::ParentOrigin );
+ mProgressBar->setPalette( TQPalette( v > 128 ? black : white ));
+ mProgressBar->setBackgroundOrigin( TQWidget::ParentOrigin );
mProgressBar->setPaletteBackgroundPixmap( blimage );
bottom_label->setFixedWidth( QMAX(blimage.width(),tlimage.width()) );
@@ -171,7 +171,7 @@ void ThemeDefault::_initUi()
mProgressBar->setFixedSize( 120, mLabel->height() );
- if (QApplication::reverseLayout()){
+ if (TQApplication::reverseLayout()){
mProgressBar->move( 2, 0 );
// mLabel->move( mProgressBar->width() + 4, 0);
}
@@ -186,7 +186,7 @@ void ThemeDefault::_initUi()
setFixedHeight( mInactivePixmap->height() +
top_label->height() + bottom_label->height() );
- const QRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+ const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
// KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
// kdDebug() << "ThemeDefault::_initUi" << rect << endl;
@@ -204,10 +204,10 @@ void ThemeDefault::_readSettings()
if( !cfg )
return;
- cfg->setGroup( QString("KSplash Theme: %1").arg(mTheme->theme()) );
+ cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) );
mIconsFlashing = cfg->readBoolEntry( "Icons Flashing", true );
- QColor df(Qt::white);
+ TQColor df(Qt::white);
mLabelForeground = cfg->readColorEntry( "Label Foreground", &df );
}
@@ -245,16 +245,16 @@ void ThemeDefault::slotUpdateState()
* does NOT support our "Restoring Session..." state. We will need
* to reflect that somehow.
*/
-QPixmap ThemeDefault::updateBarPixmap( int state )
+TQPixmap ThemeDefault::updateBarPixmap( int state )
{
int offs;
- QPixmap x;
+ TQPixmap x;
if( !mActivePixmap ) return( x );
#if BIDI
- if( QApplication::reverseLayout() )
+ if( TQApplication::reverseLayout() )
{
if ( state > 7 )
return ( x );
@@ -267,10 +267,10 @@ QPixmap ThemeDefault::updateBarPixmap( int state )
else if (state == 6)
offs -= 8;
- QPixmap tmp(*mActivePixmap);
- QPainter p(&tmp);
+ TQPixmap tmp(*mActivePixmap);
+ TQPainter p(&tmp);
#if BIDI
- if ( QApplication::reverseLayout() )
+ if ( TQApplication::reverseLayout() )
p.drawPixmap(0, 0, *mInactivePixmap, 0, 0, tmp.width()-offs );
else
#endif
@@ -282,28 +282,28 @@ void ThemeDefault::flash()
{
if( !mIconsFlashing )
return;
- QPixmap *swap = mFlashPixmap1;
+ TQPixmap *swap = mFlashPixmap1;
mFlashPixmap1 = mFlashPixmap2;
mFlashPixmap2 = swap;
mBarLabel->setPixmap(*mFlashPixmap2);
}
-QString ThemeDefault::_findPicture( const QString &pic )
+TQString ThemeDefault::_findPicture( const TQString &pic )
{
// Don't use ObjKsTheme::locateThemeData here for compatibility reasons.
- QString f = pic;
+ TQString f = pic;
if (mTheme->loColor())
- f = QString("locolor/")+f;
+ f = TQString("locolor/")+f;
//kdDebug() << "Searching for " << f << endl;
//kdDebug() << "Theme directory: " << mTheme->themeDir() << endl;
//kdDebug() << "Theme name: " << mTheme->theme() << endl;
- QString p = QString::null;
+ TQString p = TQString::null;
if ((p = locate("appdata",mTheme->themeDir()+f)).isEmpty())
if ((p = locate("appdata",mTheme->themeDir()+"pics/"+f)).isEmpty())
- if ((p = locate("appdata", QString("pics/")+mTheme->theme()+"/"+f)).isEmpty())
+ if ((p = locate("appdata", TQString("pics/")+mTheme->theme()+"/"+f)).isEmpty())
if ((p = locate("appdata",f)).isEmpty())
- if ((p = locate("appdata",QString("pics/")+f)).isEmpty())
- if ((p = locate("data",QString("pics/")+f)).isEmpty()) {
+ if ((p = locate("appdata",TQString("pics/")+f)).isEmpty())
+ if ((p = locate("data",TQString("pics/")+f)).isEmpty()) {
; // No more places to search
}
return p;
diff --git a/ksplashml/themeengine/default/themelegacy.h b/ksplashml/themeengine/default/themelegacy.h
index b0a6138a9..ed0b8025b 100644
--- a/ksplashml/themeengine/default/themelegacy.h
+++ b/ksplashml/themeengine/default/themelegacy.h
@@ -15,8 +15,8 @@
#include <kprogress.h>
-#include <qlabel.h>
-#include <qwidget.h>
+#include <tqlabel.h>
+#include <tqwidget.h>
#include "themeengine.h"
class QPixmap;
@@ -28,10 +28,10 @@ class DefaultConfig: public ThemeEngineConfig
{
Q_OBJECT
public:
- DefaultConfig( QWidget *, KConfig * );
+ DefaultConfig( TQWidget *, KConfig * );
void save();
protected:
- QCheckBox *mFlash, *mAlwaysShow;
+ TQCheckBox *mFlash, *mAlwaysShow;
};
/**
@@ -42,17 +42,17 @@ class KDE_EXPORT ThemeDefault : public ThemeEngine
{
Q_OBJECT
public:
- ThemeDefault( QWidget *, const char *, const QStringList& );
+ ThemeDefault( TQWidget *, const char *, const TQStringList& );
virtual ~ThemeDefault();
- inline const DefaultConfig *config( QWidget *p, KConfig *c )
+ inline const DefaultConfig *config( TQWidget *p, KConfig *c )
{
return new DefaultConfig( p, c );
};
- static QStringList names()
+ static TQStringList names()
{
- QStringList Names;
+ TQStringList Names;
Names << "Default";
Names << "Classic";
Names << "Klassic";
@@ -60,7 +60,7 @@ public:
}
public slots:
- inline void slotSetText( const QString& s )
+ inline void slotSetText( const TQString& s )
{
if( mLabel )
mLabel->setText( s );
@@ -79,25 +79,25 @@ public slots:
private slots:
void slotUpdateState();
- QPixmap updateBarPixmap( int );
+ TQPixmap updateBarPixmap( int );
void flash();
private:
void _initUi();
void _readSettings();
- QString _findPicture( const QString &pic );
+ TQString _findPicture( const TQString &pic );
// Configurable Options
bool mIconsFlashing;
- QColor mLabelForeground;
+ TQColor mLabelForeground;
// Internals.
KProgress *mProgressBar;
- QLabel *mLabel, *mBarLabel;
- QPixmap *mActivePixmap, *mInactivePixmap;
+ TQLabel *mLabel, *mBarLabel;
+ TQPixmap *mActivePixmap, *mInactivePixmap;
int mState;
- QTimer *mFlashTimer;
- QPixmap *mFlashPixmap1, *mFlashPixmap2;
+ TQTimer *mFlashTimer;
+ TQPixmap *mFlashPixmap1, *mFlashPixmap2;
};
#endif
diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp
index 955b5f903..8ed1cad2f 100644
--- a/ksplashml/themeengine/objkstheme.cpp
+++ b/ksplashml/themeengine/objkstheme.cpp
@@ -17,32 +17,32 @@
#include <klocale.h>
#include <kstandarddirs.h>
-#include <qcolor.h>
-#include <qcursor.h>
-#include <qdesktopwidget.h>
-#include <qfont.h>
-#include <qpixmap.h>
-#include <qrect.h>
-#include <qstring.h>
+#include <tqcolor.h>
+#include <tqcursor.h>
+#include <tqdesktopwidget.h>
+#include <tqfont.h>
+#include <tqpixmap.h>
+#include <tqrect.h>
+#include <tqstring.h>
#include "objkstheme.h"
#include "objkstheme.moc"
-ObjKsTheme::ObjKsTheme( const QString& theme )
+ObjKsTheme::ObjKsTheme( const TQString& theme )
:mActiveTheme (theme), mThemeDir("/"), mThemeConfig (0L), mThemePrefix( "Themes/" ), d(0)
{
// Get Xinerama config.
KConfig *config = kapp->config();
config->setGroup( "Xinerama" );
- QDesktopWidget *desktop = kapp->desktop();
+ TQDesktopWidget *desktop = kapp->desktop();
mXineramaScreen = config->readNumEntry("KSplashScreen", desktop->primaryScreen());
// For Xinerama, let's put the mouse on the first head. Otherwise it could appear anywhere!
if (desktop->isVirtualDesktop() && mXineramaScreen != -2)
{
- QRect rect = desktop->screenGeometry( mXineramaScreen );
- if (!rect.contains(QCursor::pos()))
- QCursor::setPos(rect.center());
+ TQRect rect = desktop->screenGeometry( mXineramaScreen );
+ if (!rect.contains(TQCursor::pos()))
+ TQCursor::setPos(rect.center());
}
// Does the active theme exist?
@@ -58,18 +58,18 @@ ObjKsTheme::~ObjKsTheme()
{
}
-bool ObjKsTheme::loadThemeRc( const QString& activeTheme, bool force )
+bool ObjKsTheme::loadThemeRc( const TQString& activeTheme, bool force )
{
//kdDebug() << "ObjKsTheme::loadThemeRc: " << activeTheme << endl;
- QString prefix("Themes/");
- QString themeFile;
+ TQString prefix("Themes/");
+ TQString themeFile;
KConfig *cf = 0L;
// Try our best to find a theme file.
- themeFile = locate( "appdata", prefix + activeTheme + "/" + QString("Theme.rc") );
- themeFile = themeFile.isEmpty() ? locate("appdata",prefix+activeTheme+"/"+QString("Theme.RC")):themeFile;
- themeFile = themeFile.isEmpty() ? locate("appdata",prefix+activeTheme+"/"+QString("theme.rc")):themeFile;
- themeFile = themeFile.isEmpty() ? locate("appdata",prefix+activeTheme+"/"+activeTheme+QString(".rc")):themeFile;
+ themeFile = locate( "appdata", prefix + activeTheme + "/" + TQString("Theme.rc") );
+ themeFile = themeFile.isEmpty() ? locate("appdata",prefix+activeTheme+"/"+TQString("Theme.RC")):themeFile;
+ themeFile = themeFile.isEmpty() ? locate("appdata",prefix+activeTheme+"/"+TQString("theme.rc")):themeFile;
+ themeFile = themeFile.isEmpty() ? locate("appdata",prefix+activeTheme+"/"+activeTheme+TQString(".rc")):themeFile;
if( !themeFile.isEmpty() )
cf = new KConfig( themeFile );
@@ -89,7 +89,7 @@ bool ObjKsTheme::loadThemeRc( const QString& activeTheme, bool force )
return false;
}
-bool ObjKsTheme::loadLocalConfig( const QString& activeTheme, bool force )
+bool ObjKsTheme::loadLocalConfig( const TQString& activeTheme, bool force )
{
//kdDebug() << "ObjKsTheme::loadLocalConfig" << endl;
KConfig *cfg = kapp->config();
@@ -97,7 +97,7 @@ bool ObjKsTheme::loadLocalConfig( const QString& activeTheme, bool force )
}
// ObjKsConfig::loadKConfig(): Load our settings from a KConfig object.
-bool ObjKsTheme::loadKConfig( KConfig *cfg, const QString& activeTheme, bool force )
+bool ObjKsTheme::loadKConfig( KConfig *cfg, const TQString& activeTheme, bool force )
{
//kdDebug() << "ObjKsTheme::loadKConfig" << endl;
if( !cfg )
@@ -106,10 +106,10 @@ bool ObjKsTheme::loadKConfig( KConfig *cfg, const QString& activeTheme, bool for
// Themes are always stored in the group [KSplash Theme: ThemeName],
// and ThemeName should always be the same name as the themedir, if any.
// If we can't find this theme group, then we can't load.
- if( !cfg->hasGroup( QString("KSplash Theme: %1").arg(activeTheme) ) && !force )
+ if( !cfg->hasGroup( TQString("KSplash Theme: %1").arg(activeTheme) ) && !force )
return false;
- cfg->setGroup( QString("KSplash Theme: %1").arg(activeTheme) );
+ cfg->setGroup( TQString("KSplash Theme: %1").arg(activeTheme) );
mThemeConfig = cfg;
mThemeEngine = cfg->readEntry( "Engine", "Default" );
@@ -146,21 +146,21 @@ void ObjKsTheme::loadCmdLineArgs( KCmdLineArgs *args )
mManagedMode = args->isSet( "managed" );
mTesting = args->isSet("test");
- mLoColor = ( QPixmap::defaultDepth() <= 8 );
- QString theme = args->getOption( "theme" );
+ mLoColor = ( TQPixmap::defaultDepth() <= 8 );
+ TQString theme = args->getOption( "theme" );
if( theme != mActiveTheme && !theme.isNull() )
if( loadThemeRc( theme, false ) )
mActiveTheme = theme;
//args->clear();
}
-QString ObjKsTheme::locateThemeData( const QString &resource )
+TQString ObjKsTheme::locateThemeData( const TQString &resource )
{
if ( !mLoColor )
return locate( "appdata", mThemePrefix+resource );
else
{
- QString res = locate( "appdata", mThemePrefix+"locolor/"+resource );
+ TQString res = locate( "appdata", mThemePrefix+"locolor/"+resource );
if ( res.isEmpty() )
res = locate( "appdata", mThemePrefix+resource );
return res;
diff --git a/ksplashml/themeengine/objkstheme.h b/ksplashml/themeengine/objkstheme.h
index 9685d4529..504fe2860 100644
--- a/ksplashml/themeengine/objkstheme.h
+++ b/ksplashml/themeengine/objkstheme.h
@@ -14,8 +14,8 @@
#include <kcmdlineargs.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
class KConfig;
/**
@@ -30,38 +30,38 @@ class KDE_EXPORT ObjKsTheme : public QObject
{
Q_OBJECT
public:
- explicit ObjKsTheme( const QString& );
+ explicit ObjKsTheme( const TQString& );
virtual ~ObjKsTheme();
void loadCmdLineArgs( KCmdLineArgs * );
- QString theme() const { return( mActiveTheme ); }
- QString themeEngine() const { return( mThemeEngine ); }
+ TQString theme() const { return( mActiveTheme ); }
+ TQString themeEngine() const { return( mThemeEngine ); }
KConfig *themeConfig() const { return( mThemeConfig ); }
- QString themeDir() const { return( mThemeDir ); }
+ TQString themeDir() const { return( mThemeDir ); }
bool loColor() const { return( mLoColor ); }
bool testing() const { return( mTesting ); }
bool managedMode() const { return( mManagedMode ); }
- QString icon( int i ) { return (m_icons[i-1].isNull()?(QString::null):m_icons[i-1]); }
- QString text( int i ) { return (m_text[i-1].isNull()?(QString::null):m_text[i-1]); }
- QString locateThemeData( const QString &resource );
+ TQString icon( int i ) { return (m_icons[i-1].isNull()?(TQString::null):m_icons[i-1]); }
+ TQString text( int i ) { return (m_text[i-1].isNull()?(TQString::null):m_text[i-1]); }
+ TQString locateThemeData( const TQString &resource );
int xineramaScreen() const { return mXineramaScreen; }
protected:
- bool loadThemeRc( const QString&, bool );
- bool loadLocalConfig( const QString&, bool );
- bool loadKConfig( KConfig *, const QString&, bool );
+ bool loadThemeRc( const TQString&, bool );
+ bool loadLocalConfig( const TQString&, bool );
+ bool loadKConfig( KConfig *, const TQString&, bool );
private:
- QString mActiveTheme, mThemeDir;
+ TQString mActiveTheme, mThemeDir;
KConfig *mThemeConfig;
int mXineramaScreen;
bool mLoColor, mTesting, mManagedMode;
- QString mThemeEngine;
- QString mThemePrefix;
+ TQString mThemeEngine;
+ TQString mThemePrefix;
- QStringList m_icons, m_text;
+ TQStringList m_icons, m_text;
class ObjKsThemePrivate;
ObjKsThemePrivate *d;
diff --git a/ksplashml/themeengine/redmond/main.cpp b/ksplashml/themeengine/redmond/main.cpp
index 2da3c5f09..3f4dc0124 100644
--- a/ksplashml/themeengine/redmond/main.cpp
+++ b/ksplashml/themeengine/redmond/main.cpp
@@ -12,25 +12,25 @@
#include <kstandarddirs.h>
-#include <qlabel.h>
-#include <qpixmap.h>
-#include <qwidget.h>
+#include <tqlabel.h>
+#include <tqpixmap.h>
+#include <tqwidget.h>
#include "themeredmond.h"
extern "C"
{
- ThemeEngineConfig *KsThemeConfig( QWidget *parent, KConfig *config )
+ ThemeEngineConfig *KsThemeConfig( TQWidget *parent, KConfig *config )
{
return new CfgRedmond( parent, config );
}
- QStringList KsThemeSupports()
+ TQStringList KsThemeSupports()
{
return ThemeRedmond::names();
}
- void* KsThemeInit( QWidget *parent, ObjKsTheme *theme )
+ void* KsThemeInit( TQWidget *parent, ObjKsTheme *theme )
{
return new ThemeRedmond( parent, theme );
}
diff --git a/ksplashml/themeengine/redmond/previewredmond.cpp b/ksplashml/themeengine/redmond/previewredmond.cpp
index 6685a6987..3bfb80203 100644
--- a/ksplashml/themeengine/redmond/previewredmond.cpp
+++ b/ksplashml/themeengine/redmond/previewredmond.cpp
@@ -12,9 +12,9 @@
#include <klocale.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qwidget.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqwidget.h>
#include "previewredmond.h"
#include "previewredmond.moc"
@@ -22,16 +22,16 @@
* PreviewRedmond::PreviewRedmond(): Constructor. Set up some basic
* things.
*/
-PreviewRedmond::PreviewRedmond( QWidget* parent )
- :QWidget( parent ),
+PreviewRedmond::PreviewRedmond( TQWidget* parent )
+ :TQWidget( parent ),
/* Using direct constructors to prevent memory blit. */
m_welcomeString (i18n("Welcome")),
m_userString (i18n("(Your Name)")),
- m_welcomeFont (QFont( "Arial", 16, QFont::Bold )),
- m_userFont (QFont( "Arial", 16 )),
- m_statusFont (QFont( "Arial", 12, QFont::Bold )),
+ m_welcomeFont (TQFont( "Arial", 16, TQFont::Bold )),
+ m_userFont (TQFont( "Arial", 16 )),
+ m_statusFont (TQFont( "Arial", 12, TQFont::Bold )),
m_welcomeColor (Qt::white),
m_welcomeShadowColor (Qt::darkGray),
@@ -48,17 +48,17 @@ PreviewRedmond::PreviewRedmond( QWidget* parent )
_updateCache();
}
-void PreviewRedmond::paintEvent( QPaintEvent* pe )
+void PreviewRedmond::paintEvent( TQPaintEvent* pe )
{
- QPainter p;
+ TQPainter p;
p.begin( this );
p.drawPixmap( pe->rect(), m_cache );
p.end();
}
-void PreviewRedmond::resizeEvent( QResizeEvent *re )
+void PreviewRedmond::resizeEvent( TQResizeEvent *re )
{
- QWidget::resizeEvent( re );
+ TQWidget::resizeEvent( re );
_updateCache();
}
@@ -67,8 +67,8 @@ void PreviewRedmond::resizeEvent( QResizeEvent *re )
// from size(), just to be sure we're not missing anything.
void PreviewRedmond::_updateCache()
{
- m_cache = QPixmap( size() );
- QPainter p;
+ m_cache = TQPixmap( size() );
+ TQPainter p;
p.begin( &m_cache );
p.fillRect( rect(), Qt::gray );
@@ -76,7 +76,7 @@ void PreviewRedmond::_updateCache()
m_welcomeFont.setItalic( true );
p.setFont( m_welcomeFont );
- QPoint welcomeTextPos( rect().width()/2 - p.fontMetrics().width( m_welcomeString ),
+ TQPoint welcomeTextPos( rect().width()/2 - p.fontMetrics().width( m_welcomeString ),
rect().height()/2 + p.fontMetrics().height()/2 );
if( m_showWelcomeString )
@@ -91,7 +91,7 @@ void PreviewRedmond::_updateCache()
{
p.setPen( m_userColor );
p.setFont( m_userFont );
- QPoint userTextPos( rect().width()/2 + m_icon.width() + 20,
+ TQPoint userTextPos( rect().width()/2 + m_icon.width() + 20,
rect().height()/2 + p.fontMetrics().height()/2 );
p.drawText( userTextPos, m_userString );
}
@@ -101,7 +101,7 @@ void PreviewRedmond::_updateCache()
if( m_showStatusString )
{
- QPoint statusTextPos( rect().width()/2 + m_icon.width() + 20,
+ TQPoint statusTextPos( rect().width()/2 + m_icon.width() + 20,
rect().height()/2 + (int)(p.fontMetrics().height()*0.85) + 15 );
p.setPen( m_statusColor );
p.setFont( m_statusFont );
diff --git a/ksplashml/themeengine/redmond/previewredmond.h b/ksplashml/themeengine/redmond/previewredmond.h
index 3b67f293b..69bef6b43 100644
--- a/ksplashml/themeengine/redmond/previewredmond.h
+++ b/ksplashml/themeengine/redmond/previewredmond.h
@@ -15,9 +15,9 @@
#include <kiconloader.h>
-#include <qcolor.h>
-#include <qfont.h>
-#include <qwidget.h>
+#include <tqcolor.h>
+#include <tqfont.h>
+#include <tqwidget.h>
/*
* class PreviewRedmond: Provides a sneak peek at how certain Redmond
@@ -30,57 +30,57 @@ class PreviewRedmond: public QWidget
Q_OBJECT
public:
- PreviewRedmond( QWidget* );
+ PreviewRedmond( TQWidget* );
- inline void setWelcomeString( const QString& s )
+ inline void setWelcomeString( const TQString& s )
{
m_welcomeString = s;
_updateCache();
}
- inline void setUserString( const QString& s )
+ inline void setUserString( const TQString& s )
{
m_userString = s;
_updateCache();
}
- inline void setWelcomeFont( const QFont& f )
+ inline void setWelcomeFont( const TQFont& f )
{
m_welcomeFont = f;
_updateCache();
}
- inline void setUserFont( const QFont& f )
+ inline void setUserFont( const TQFont& f )
{
m_userFont = f;
_updateCache();
}
- inline void setStatusFont( const QFont& f )
+ inline void setStatusFont( const TQFont& f )
{
m_statusFont = f;
_updateCache();
}
- inline void setWelcomeColor( const QColor& c )
+ inline void setWelcomeColor( const TQColor& c )
{
m_welcomeColor = c;
_updateCache();
}
- inline void setWelcomeShadowColor( const QColor& c )
+ inline void setWelcomeShadowColor( const TQColor& c )
{
m_welcomeShadowColor = c;
_updateCache();
}
- inline void setUserColor( const QColor& c )
+ inline void setUserColor( const TQColor& c )
{
m_userColor = c;
_updateCache();
}
- inline void setStatusColor( const QColor& c )
+ inline void setStatusColor( const TQColor& c )
{
m_statusColor = c;
_updateCache();
}
- inline void setIcon( const QString& s )
+ inline void setIcon( const TQString& s )
{
m_icon = DesktopIcon( s );
_updateCache();
@@ -88,15 +88,15 @@ public:
protected:
void _updateCache();
- void paintEvent( QPaintEvent* );
- void resizeEvent( QResizeEvent* );
+ void paintEvent( TQPaintEvent* );
+ void resizeEvent( TQResizeEvent* );
- QPixmap m_cache;
+ TQPixmap m_cache;
- QString m_welcomeString, m_userString;
- QFont m_welcomeFont, m_userFont, m_statusFont;
- QColor m_welcomeColor, m_welcomeShadowColor, m_userColor, m_statusColor;
- QPixmap m_icon;
+ TQString m_welcomeString, m_userString;
+ TQFont m_welcomeFont, m_userFont, m_statusFont;
+ TQColor m_welcomeColor, m_welcomeShadowColor, m_userColor, m_statusColor;
+ TQPixmap m_icon;
bool m_showWelcomeString, m_showUserString, m_showUserIcon, m_showStatusString;
};
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index 6181980b6..5c7118441 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -26,13 +26,13 @@
#include <kuser.h>
#include <kemailsettings.h>
-#include <qcheckbox.h>
-#include <qdesktopwidget.h>
-#include <qlabel.h>
-#include <qpainter.h>
-#include <qrect.h>
-#include <qstringlist.h>
-#include <qwidget.h>
+#include <tqcheckbox.h>
+#include <tqdesktopwidget.h>
+#include <tqlabel.h>
+#include <tqpainter.h>
+#include <tqrect.h>
+#include <tqstringlist.h>
+#include <tqwidget.h>
#include <objkstheme.h>
#include "themeredmond.h"
@@ -41,22 +41,22 @@
K_EXPORT_COMPONENT_FACTORY( ksplashredmond, KGenericFactory<ThemeRedmond>( "ksplash" ) )
-CfgRedmond::CfgRedmond( QWidget *p, KConfig *c )
+CfgRedmond::CfgRedmond( TQWidget *p, KConfig *c )
:ThemeEngineConfig( p, c )
{
- QVBox *vbox = new QVBox( this );
+ TQVBox *vbox = new TQVBox( this );
vbox->setSpacing( KDialog::spacingHint() );
- QFont defaultFont( "Arial", 48, QFont::Bold );
+ TQFont defaultFont( "Arial", 48, TQFont::Bold );
defaultFont.setItalic( true );
- QFont defaultUsernameFont( "Arial", 16, QFont::Bold );
- QFont defaultActionFont( "Arial", 12, QFont::Bold );
- QColor defaultDarkColor( 3, 47, 156 );
- QColor defaultWhiteColor( Qt::white );
-
- QHBox *hbox = new QHBox( vbox );
- hbox->setFrameStyle( QFrame::WinPanel );
- hbox->setFrameShadow( QFrame::Sunken );
+ TQFont defaultUsernameFont( "Arial", 16, TQFont::Bold );
+ TQFont defaultActionFont( "Arial", 12, TQFont::Bold );
+ TQColor defaultDarkColor( 3, 47, 156 );
+ TQColor defaultWhiteColor( Qt::white );
+
+ TQHBox *hbox = new TQHBox( vbox );
+ hbox->setFrameStyle( TQFrame::WinPanel );
+ hbox->setFrameShadow( TQFrame::Sunken );
PreviewRedmond* _preview = new PreviewRedmond( hbox );
_preview->setFixedSize( 320, 200 );
@@ -73,11 +73,11 @@ CfgRedmond::CfgRedmond( QWidget *p, KConfig *c )
_preview->setIcon( c->readEntry( "User Icon", "kmenu" ) );
- QLabel *lbl = new QLabel( vbox );
+ TQLabel *lbl = new TQLabel( vbox );
lbl->setText( i18n("(Sorry, but I haven't finished writing this one yet...)") );
}
-ThemeRedmond::ThemeRedmond( QWidget *parent, const char *name, const QStringList &args )
+ThemeRedmond::ThemeRedmond( TQWidget *parent, const char *name, const TQStringList &args )
:ThemeEngine( parent, name, args )
{
_readSettings();
@@ -86,17 +86,17 @@ ThemeRedmond::ThemeRedmond( QWidget *parent, const char *name, const QStringList
void ThemeRedmond::_initUi()
{
- const QRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
- //QRect fullScreen = KGlobalSettings::desktopGeometry(0L);
+ const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+ //TQRect fullScreen = KGlobalSettings::desktopGeometry(0L);
mImage.resize( screen.width(), screen.height() );
- QPainter p;
+ TQPainter p;
p.begin( &mImage );
- p.fillRect( screen, QColor(3,47,156) );
+ p.fillRect( screen, TQColor(3,47,156) );
p.setPen( mActionTextColor );
- QString bgimg;
+ TQString bgimg;
// Start by seeing if the theme prefers a particular image.
if( !mBackgroundImage.isEmpty() )
@@ -119,7 +119,7 @@ void ThemeRedmond::_initUi()
* 1024x768 images.)
*/
if( bgimg.isEmpty() )
- bgimg = mTheme->locateThemeData( QString( "Background-%2x%3.png" ).arg( screen.width() ).arg( screen.height() ) );
+ bgimg = mTheme->locateThemeData( TQString( "Background-%2x%3.png" ).arg( screen.width() ).arg( screen.height() ) );
// If that can't be found, look for THEMEDIR/Background.png
if( bgimg.isNull() && !mTheme->themeDir().isNull() )
@@ -128,36 +128,36 @@ void ThemeRedmond::_initUi()
if( mPixmap.isNull() )
mPixmap = DesktopIcon( "kmenu", 48 );
- QPixmap pix( bgimg );
+ TQPixmap pix( bgimg );
if( !pix.isNull() )
{
- QPixmap tmp( QSize(screen.width(), screen.height() ) );
+ TQPixmap tmp( TQSize(screen.width(), screen.height() ) );
float sw = (float)screen.width() / pix.width();
float sh = (float)(screen.height()) / pix.height();
- QWMatrix matrix;
+ TQWMatrix matrix;
matrix.scale( sw, sh );
tmp = pix.xForm( matrix );
p.drawPixmap( 0, 0, tmp );
}
- QFont f = mWelcomeFont;
+ TQFont f = mWelcomeFont;
if( mWelcomeFontItalic )
- f.setItalic( true ); // this SHOULD BE stored in the QFont entry, dang it.
+ f.setItalic( true ); // this SHOULD BE stored in the TQFont entry, dang it.
p.setFont( f );
- QFontMetrics met( f );
- QSize fmet = met.size( 0L, mWelcomeText );
+ TQFontMetrics met( f );
+ TQSize fmet = met.size( 0L, mWelcomeText );
// Paint the "Welcome" message, if we are instructed to. Optionally dispense with the
// shadow.
if ( mShowWelcomeText )
{
- if( mWelcomeTextPosition == QPoint( 0, 0 ) )
+ if( mWelcomeTextPosition == TQPoint( 0, 0 ) )
{
- mWelcomeTextPosition = QPoint( (screen.width()/2) - fmet.width() - 25,
+ mWelcomeTextPosition = TQPoint( (screen.width()/2) - fmet.width() - 25,
(screen.height()/2) - (fmet.height()/2) + fmet.height() );
}
}
@@ -167,7 +167,7 @@ void ThemeRedmond::_initUi()
if( mShowWelcomeTextShadow )
{
p.setPen( mWelcomeTextShadowColor );
- p.drawText( mWelcomeTextPosition+QPoint(2,2), mWelcomeText );
+ p.drawText( mWelcomeTextPosition+TQPoint(2,2), mWelcomeText );
}
p.setPen( mWelcomeTextColor );
p.drawText( mWelcomeTextPosition, mWelcomeText );
@@ -176,7 +176,7 @@ void ThemeRedmond::_initUi()
// The current theme wants to say something in particular, rather than display the
// account's fullname.
KUser user;
- QString greetingString = ( !mUsernameText.isNull() ) ? mUsernameText : user.fullName();
+ TQString greetingString = ( !mUsernameText.isNull() ) ? mUsernameText : user.fullName();
// when we use KUser (system account data) we should also check KEMailSettings (e-mail settings and kcm_useraccount)
// people often write real names only in e-mail settings
if ( greetingString.isEmpty() )
@@ -188,7 +188,7 @@ void ThemeRedmond::_initUi()
// Try to load the user's KDM icon... TODO: Make this overridable by the Theme.
if( mUseKdmUserIcon )
{
- const QString defSys( ".default.face.icon" ); // The system-wide default image
+ const TQString defSys( ".default.face.icon" ); // The system-wide default image
const int fAdminOnly = 1;
const int fAdminFirst = fAdminOnly+1;
const int fUserFirst = fAdminFirst+1;
@@ -197,41 +197,41 @@ void ThemeRedmond::_initUi()
int faceSource = fAdminOnly;
KConfig *kdmconfig = new KConfig("kdm/kdmrc", true);
kdmconfig->setGroup("X-*-Greeter");
- QString userPicsDir = kdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/';
- QString fs = kdmconfig->readEntry( "FaceSource" );
- if (fs == QString::fromLatin1("UserOnly"))
+ TQString userPicsDir = kdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/';
+ TQString fs = kdmconfig->readEntry( "FaceSource" );
+ if (fs == TQString::fromLatin1("UserOnly"))
faceSource = fUserOnly;
- else if (fs == QString::fromLatin1("PreferUser"))
+ else if (fs == TQString::fromLatin1("PreferUser"))
faceSource = fUserFirst;
- else if (fs == QString::fromLatin1("PreferAdmin"))
+ else if (fs == TQString::fromLatin1("PreferAdmin"))
faceSource = fAdminFirst;
else
faceSource = fAdminOnly; // Admin Only
delete kdmconfig;
- QPixmap userp;
+ TQPixmap userp;
if ( faceSource == fAdminFirst )
{
// If the administrator's choice takes preference
- userp = QPixmap( userPicsDir + user.loginName() + ".face.icon" );
+ userp = TQPixmap( userPicsDir + user.loginName() + ".face.icon" );
if ( userp.isNull() )
faceSource = fUserOnly;
}
if ( faceSource >= fUserFirst)
{
// If the user's choice takes preference
- userp = QPixmap( user.homeDir() + "/.face.icon" );
+ userp = TQPixmap( user.homeDir() + "/.face.icon" );
if ( userp.isNull() && faceSource == fUserFirst ) // The user has no face, should we check for the admin's setting?
- userp = QPixmap( userPicsDir + user.loginName() + ".face.icon" );
+ userp = TQPixmap( userPicsDir + user.loginName() + ".face.icon" );
if ( userp.isNull() )
- userp = QPixmap( userPicsDir + defSys );
+ userp = TQPixmap( userPicsDir + defSys );
}
else if ( faceSource <= fAdminOnly )
{
// Admin only
- userp = QPixmap( userPicsDir + user.loginName() + ".face.icon" );
+ userp = TQPixmap( userPicsDir + user.loginName() + ".face.icon" );
if ( userp.isNull() )
- userp = QPixmap( userPicsDir + defSys );
+ userp = TQPixmap( userPicsDir + defSys );
}
if( !userp.isNull() )
mPixmap = userp;
@@ -239,10 +239,10 @@ void ThemeRedmond::_initUi()
if( mShowIcon )
{
- QPoint pos = mIconPosition;
- if( pos == QPoint( 0, 0 ) )
+ TQPoint pos = mIconPosition;
+ if( pos == TQPoint( 0, 0 ) )
{
- pos = QPoint( (screen.width()/2) + 10, (screen.height()/2) );
+ pos = TQPoint( (screen.width()/2) + 10, (screen.height()/2) );
}
p.drawPixmap( pos, mPixmap );
}
@@ -250,15 +250,15 @@ void ThemeRedmond::_initUi()
// User name font. Leave this nailed-up for now.
f = mUsernameFont;
p.setFont( f );
- met = QFontMetrics( f );
+ met = TQFontMetrics( f );
fmet = met.size( 0L, greetingString );
if( mShowUsernameText )
{
- QPoint pos = mUsernameTextPosition;
- if( pos == QPoint( 0, 0 ) )
+ TQPoint pos = mUsernameTextPosition;
+ if( pos == TQPoint( 0, 0 ) )
{
- pos = QPoint(
+ pos = TQPoint(
(screen.width()/2) + mPixmap.width() + 20,
(screen.height()/2) - (fmet.height()/2) + fmet.height()
);
@@ -273,14 +273,14 @@ void ThemeRedmond::_initUi()
move( screen.topLeft() );
}
-void ThemeRedmond::paintEvent( QPaintEvent *pe )
+void ThemeRedmond::paintEvent( TQPaintEvent *pe )
{
- const QRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+ const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
- QPainter p;
+ TQPainter p;
p.begin( this );
- QRect r = pe->rect();
+ TQRect r = pe->rect();
bitBlt( this, r.x(), r.y(),
&mImage, r.x(), r.y(), r.width(), r.height() );
@@ -288,15 +288,15 @@ void ThemeRedmond::paintEvent( QPaintEvent *pe )
if (mShowActionText)
{
p.setPen( mActionTextColor );
- QFont f = mActionFont;
+ TQFont f = mActionFont;
p.setFont( f );
- QFontMetrics met( f );
- QSize fmet = met.size( 0L, mText );
+ TQFontMetrics met( f );
+ TQSize fmet = met.size( 0L, mText );
mMsgPos = mActionTextPosition;
- if( mMsgPos == QPoint( 0, 0 ) )
+ if( mMsgPos == TQPoint( 0, 0 ) )
{
- mMsgPos = QPoint(
+ mMsgPos = TQPoint(
(screen.width()/2) + mPixmap.width() + 20,
(screen.height()/2) + (int)(fmet.height()*0.85) + 15
);
@@ -308,8 +308,8 @@ void ThemeRedmond::paintEvent( QPaintEvent *pe )
void ThemeRedmond::_readSettings()
{
- const QRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
- //QRect fullScreen = KGlobalSettings::desktopGeometry(0L);
+ const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+ //TQRect fullScreen = KGlobalSettings::desktopGeometry(0L);
if( !mTheme )
return;
@@ -317,23 +317,23 @@ void ThemeRedmond::_readSettings()
if( !cfg )
return;
- //if( !cfg->hasGroup( QString("KSplash Theme: %1").arg(mTheme->theme()) ) )
+ //if( !cfg->hasGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) ) )
// return;
- cfg->setGroup( QString("KSplash Theme: %1").arg(mTheme->theme()) );
+ cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) );
// Overall appearance
- mBackgroundImage = cfg->readEntry( "Background Image", QString::null );
+ mBackgroundImage = cfg->readEntry( "Background Image", TQString::null );
mIcon = cfg->readEntry( "User Icon", "kmenu" );
mWelcomeText = cfg->readEntry( "Welcome Text", i18n("Welcome") );
- mUsernameText = cfg->readEntry( "Username Text", QString::null );
+ mUsernameText = cfg->readEntry( "Username Text", TQString::null );
// If any of these are set to (0,0), then we will autoposition the text later (and it _will_
// be centered on the screen!). The Theme may move this text however the author desires.
- QPoint absZero( 0, 0 );
- mWelcomeTextPosition = cfg->readPointEntry( QString("Welcome Text Position %1").arg(screen.width()), &absZero );
- mUsernameTextPosition = cfg->readPointEntry( QString("Username Text Position %1").arg(screen.width()), &absZero );
- mActionTextPosition = cfg->readPointEntry( QString("Action Text Position %1").arg(screen.width()), &absZero );
- mIconPosition = cfg->readPointEntry( QString("Icon Position %1").arg(screen.width()), &absZero );
+ TQPoint absZero( 0, 0 );
+ mWelcomeTextPosition = cfg->readPointEntry( TQString("Welcome Text Position %1").arg(screen.width()), &absZero );
+ mUsernameTextPosition = cfg->readPointEntry( TQString("Username Text Position %1").arg(screen.width()), &absZero );
+ mActionTextPosition = cfg->readPointEntry( TQString("Action Text Position %1").arg(screen.width()), &absZero );
+ mIconPosition = cfg->readPointEntry( TQString("Icon Position %1").arg(screen.width()), &absZero );
// Allow the Theme to hide particular components.
mShowWelcomeText = cfg->readBoolEntry( "Show Welcome Text", true );
@@ -345,18 +345,18 @@ void ThemeRedmond::_readSettings()
// Setup our fonts. There are only 3 elements which use 'em, so this is fairly
// straightforward.
- QFont defaultFont( "Arial", 48, QFont::Bold );
+ TQFont defaultFont( "Arial", 48, TQFont::Bold );
defaultFont.setItalic( true );
- QFont defaultUsernameFont( "Arial", 16, QFont::Bold );
- QFont defaultActionFont( "Arial", 12, QFont::Bold );
+ TQFont defaultUsernameFont( "Arial", 16, TQFont::Bold );
+ TQFont defaultActionFont( "Arial", 12, TQFont::Bold );
mWelcomeFont = cfg->readFontEntry( "Welcome Font", &defaultFont );
mWelcomeFontItalic = cfg->readBoolEntry( "Welcome Font Italic", true );
mUsernameFont = cfg->readFontEntry( "Username Font", &defaultUsernameFont );
mActionFont = cfg->readFontEntry( "Action Font", &defaultActionFont );
- QColor defaultDarkColor( 3, 47, 156 );
- QColor defaultWhiteColor( Qt::white );
+ TQColor defaultDarkColor( 3, 47, 156 );
+ TQColor defaultWhiteColor( Qt::white );
mWelcomeTextColor = cfg->readColorEntry( "Welcome Text Color", &defaultWhiteColor );
mWelcomeTextShadowColor = cfg->readColorEntry( "Welcome Shadow Color", &defaultDarkColor );
diff --git a/ksplashml/themeengine/redmond/themeredmond.h b/ksplashml/themeengine/redmond/themeredmond.h
index a35662181..bbde2ddf6 100644
--- a/ksplashml/themeengine/redmond/themeredmond.h
+++ b/ksplashml/themeengine/redmond/themeredmond.h
@@ -25,12 +25,12 @@ class CfgRedmond: public ThemeEngineConfig
{
Q_OBJECT
public:
- CfgRedmond( QWidget *, KConfig * );
+ CfgRedmond( TQWidget *, KConfig * );
protected:
- QCheckBox *mShowUsername;
- QCheckBox *mShowIcon;
- QCheckBox *mShowWelcome;
+ TQCheckBox *mShowUsername;
+ TQCheckBox *mShowIcon;
+ TQCheckBox *mShowWelcome;
KFontCombo *mWelcomeFont;
KFontCombo *mUsernameFont;
KFontCombo *mActionFont;
@@ -41,18 +41,18 @@ class ThemeRedmond: public ThemeEngine
{
Q_OBJECT
public:
- ThemeRedmond( QWidget *, const char *, const QStringList& );
+ ThemeRedmond( TQWidget *, const char *, const TQStringList& );
- inline const QString name() { return( QString("Redmond") ); }
- static QStringList names()
+ inline const TQString name() { return( TQString("Redmond") ); }
+ static TQStringList names()
{
- QStringList Names;
+ TQStringList Names;
Names << "Redmond";
return( Names );
};
public slots:
- inline void slotSetText( const QString& s )
+ inline void slotSetText( const TQString& s )
{
if( mText != s )
{
@@ -62,15 +62,15 @@ public slots:
};
private:
- void paintEvent( QPaintEvent * );
+ void paintEvent( TQPaintEvent * );
void _initUi();
void _readSettings();
- QString mText;
- QPixmap mPixmap;
+ TQString mText;
+ TQPixmap mPixmap;
bool mRedrawKonqi;
- QPoint mMsgPos;
+ TQPoint mMsgPos;
KPixmap mImage;
// ThemeEngine configuration.
@@ -81,21 +81,21 @@ private:
bool mShowActionText;
bool mShowIcon;
bool mUseKdmUserIcon;
- QString mBackgroundImage;
- QString mWelcomeText;
- QString mUsernameText; // Leave this undefined to autodetect the username.
- QString mIcon;
- QFont mWelcomeFont;
- QFont mUsernameFont;
- QFont mActionFont;
- QColor mWelcomeTextColor;
- QColor mWelcomeTextShadowColor;
- QColor mUsernameTextColor;
- QColor mActionTextColor;
- QPoint mWelcomeTextPosition; // Set this to (0,0) to autoposition the text.
- QPoint mUsernameTextPosition; // Likewise.
- QPoint mActionTextPosition; // Likewise likewise.
- QPoint mIconPosition; // ...
+ TQString mBackgroundImage;
+ TQString mWelcomeText;
+ TQString mUsernameText; // Leave this undefined to autodetect the username.
+ TQString mIcon;
+ TQFont mWelcomeFont;
+ TQFont mUsernameFont;
+ TQFont mActionFont;
+ TQColor mWelcomeTextColor;
+ TQColor mWelcomeTextShadowColor;
+ TQColor mUsernameTextColor;
+ TQColor mActionTextColor;
+ TQPoint mWelcomeTextPosition; // Set this to (0,0) to autoposition the text.
+ TQPoint mUsernameTextPosition; // Likewise.
+ TQPoint mActionTextPosition; // Likewise likewise.
+ TQPoint mIconPosition; // ...
}
;
diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp
index ff7929bfe..c7e9220e2 100644
--- a/ksplashml/themeengine/standard/themestandard.cpp
+++ b/ksplashml/themeengine/standard/themestandard.cpp
@@ -18,11 +18,11 @@
#include <kstandarddirs.h>
#include <kconfig.h>
-#include <qdesktopwidget.h>
-#include <qlabel.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qwidget.h>
+#include <tqdesktopwidget.h>
+#include <tqlabel.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqwidget.h>
#include <objkstheme.h>
#include "themestandard.h"
@@ -30,10 +30,10 @@
#include "wndicon.h"
#include "wndstatus.h"
-ThemeStandard::ThemeStandard( QWidget *parent, const char *name, const QStringList &args )
+ThemeStandard::ThemeStandard( TQWidget *parent, const char *name, const TQStringList &args )
:ThemeEngine( parent, name, args ), mIcon(0L), mPrevIcon(0L), mIconCount(0), mStdIconWidth(-1),
mIconPos(WndIcon::HBottomLeft), mSbAtTop(false), mSbVisible(true), mSbPbVisible(true), mSbFontName("helvetica"),
- mSbFontSz(16), mSbFontBold(true), mSbFontItalic(false), mSbFont(QFont()), mSbFg(QColor()), mSbBg(QColor()),
+ mSbFontSz(16), mSbFontBold(true), mSbFontItalic(false), mSbFont(TQFont()), mSbFg(TQColor()), mSbBg(TQColor()),
mSbIcon("run"), mIconsVisible(true), mIconsJumping(true), mSplashScreen("(Default)")
{
_readSettings();
@@ -42,19 +42,19 @@ ThemeStandard::ThemeStandard( QWidget *parent, const char *name, const QStringLi
void ThemeStandard::_initUi()
{
- setFrameStyle( QFrame::NoFrame );
+ setFrameStyle( TQFrame::NoFrame );
- QString pixName = mTheme->locateThemeData( mSplashScreen );
+ TQString pixName = mTheme->locateThemeData( mSplashScreen );
if( mSplashScreen == "(Default)" || pixName.isEmpty() )
{
- QString resource_prefix = "pics/";
+ TQString resource_prefix = "pics/";
if ( mTheme->loColor() )
resource_prefix += "locolor/";
pixName = locate( "appdata", resource_prefix + "splash.png");
}
- QPixmap px = QPixmap( pixName );
+ TQPixmap px = TQPixmap( pixName );
if( !px.isNull() )
{
@@ -62,7 +62,7 @@ void ThemeStandard::_initUi()
int pw = px.width();
int ph = px.height();
- QLabel *lbl = new QLabel( this );
+ TQLabel *lbl = new TQLabel( this );
lbl->setBackgroundMode( NoBackground );
lbl->setFixedSize( pw, ph );
lbl->setPixmap( px );
@@ -75,16 +75,16 @@ void ThemeStandard::_initUi()
resize( 0, 0 );
}
- const QRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+ const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
// KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
move( rect.x() + (rect.width() - size().width())/2,
rect.y() + (rect.height() - size().height())/2 );
- mStatus = new WndStatus( QPalette(), mTheme->xineramaScreen(), mSbAtTop, mSbPbVisible, mSbFont, mSbFg, mSbBg, mSbIcon );
+ mStatus = new WndStatus( TQPalette(), mTheme->xineramaScreen(), mSbAtTop, mSbPbVisible, mSbFont, mSbFg, mSbBg, mSbIcon );
}
-void ThemeStandard::showEvent( QShowEvent * )
+void ThemeStandard::showEvent( TQShowEvent * )
{
ThemeEngine::show();
@@ -101,9 +101,9 @@ void ThemeStandard::showEvent( QShowEvent * )
}
// Adjust the visible icon.
-void ThemeStandard::slotSetPixmap( const QString& pxn )
+void ThemeStandard::slotSetPixmap( const TQString& pxn )
{
- QPixmap px = DesktopIcon( pxn );
+ TQPixmap px = DesktopIcon( pxn );
if ( px.isNull() )
px = DesktopIcon( "go" );
@@ -119,7 +119,7 @@ void ThemeStandard::slotSetPixmap( const QString& pxn )
mStdIconWidth = DesktopIcon( "go" ).width();
mIcon = new WndIcon( ++mIconCount, mStdIconWidth, mStatusBarHeight, mTheme->xineramaScreen(),
- px, QString::null, mIconPos, mSbAtTop, mIconsJumping );
+ px, TQString::null, mIconPos, mSbAtTop, mIconsJumping );
mIcon->show();
if( mIconsJumping )
@@ -139,11 +139,11 @@ void ThemeStandard::_readSettings()
if ( !cfg )
return;
- //if ( !cfg->hasGroup( QString("KSplash Theme: %1").arg(mTheme->theme()) ) )
+ //if ( !cfg->hasGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) ) )
// return;
- cfg->setGroup( QString("KSplash Theme: %1").arg(mTheme->theme()) );
+ cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) );
- QString sbpos = cfg->readEntry( "Statusbar Position", "Bottom" ).upper();
+ TQString sbpos = cfg->readEntry( "Statusbar Position", "Bottom" ).upper();
mSbAtTop = ( sbpos == "TOP" );
mSbVisible = cfg->readBoolEntry( "Statusbar Visible", true);
mSbPbVisible = cfg->readBoolEntry( "Progress Visible", true);
@@ -152,7 +152,7 @@ void ThemeStandard::_readSettings()
mSbFontSz = cfg->readNumEntry( "Statusbar Font Size", 16 );
mSbFontBold = cfg->readBoolEntry( "Statusbar Font Bold", true );
mSbFontItalic = cfg->readBoolEntry( "Statusbar Font Italic", false );
- mSbFont = QFont( mSbFontName, mSbFontSz, ( mSbFontBold? QFont::Bold : QFont::Normal ) );
+ mSbFont = TQFont( mSbFontName, mSbFontSz, ( mSbFontBold? TQFont::Bold : TQFont::Normal ) );
if( mSbFontItalic )
mSbFont.setItalic( true );
diff --git a/ksplashml/themeengine/standard/themestandard.h b/ksplashml/themeengine/standard/themestandard.h
index a24f668db..2e5d1aeb0 100644
--- a/ksplashml/themeengine/standard/themestandard.h
+++ b/ksplashml/themeengine/standard/themestandard.h
@@ -44,8 +44,8 @@ class ThemeStandard: public ThemeEngine
{
Q_OBJECT
public:
- ThemeStandard( QWidget *, const char*, const QStringList& );
- //inline const ThemeEngineConfig *config( QWidget *p, KConfig *kc ) { return 0L; }
+ ThemeStandard( TQWidget *, const char*, const TQStringList& );
+ //inline const ThemeEngineConfig *config( TQWidget *p, KConfig *kc ) { return 0L; }
public slots:
inline void slotUpdateProgress( int i )
@@ -56,14 +56,14 @@ public slots:
{
if( mStatus ) mStatus->slotUpdateSteps( i );
}
- inline void slotSetText( const QString& s )
+ inline void slotSetText( const TQString& s )
{
if( mStatus ) mStatus->slotSetMessage( s );
}
- void slotSetPixmap( const QString& );
+ void slotSetPixmap( const TQString& );
private:
- void showEvent( QShowEvent * );
+ void showEvent( TQShowEvent * );
void _readSettings();
void _initUi();
@@ -77,17 +77,17 @@ private:
bool mSbAtTop;
bool mSbVisible;
bool mSbPbVisible;
- QString mSbFontName;
+ TQString mSbFontName;
int mSbFontSz;
bool mSbFontBold;
bool mSbFontItalic;
- QFont mSbFont;
- QColor mSbFg;
- QColor mSbBg;
- QString mSbIcon;
+ TQFont mSbFont;
+ TQColor mSbFg;
+ TQColor mSbBg;
+ TQString mSbIcon;
bool mIconsVisible;
bool mIconsJumping;
- QString mSplashScreen;
+ TQString mSplashScreen;
};
#endif
diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp
index 0440a0181..ce153e461 100644
--- a/ksplashml/themeengine/standard/wndicon.cpp
+++ b/ksplashml/themeengine/standard/wndicon.cpp
@@ -21,13 +21,13 @@
#include <kglobalsettings.h>
#include <kwin.h>
-#include <qdesktopwidget.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qpixmap.h>
-#include <qpoint.h>
-#include <qtimer.h>
-#include <qwidget.h>
+#include <tqdesktopwidget.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
+#include <tqpixmap.h>
+#include <tqpoint.h>
+#include <tqtimer.h>
+#include <tqwidget.h>
#include "wndicon.h"
#include "wndicon.moc"
@@ -38,19 +38,19 @@ WndIcon::WndIcon(
unsigned int status_height,
int xineramaScreen,
const KPixmap& pix,
- const QString& text,
+ const TQString& text,
Position icon_position,
bool statusAtTop,
bool iconsJumping )
- :QHBox( 0, "wndSplash", WStyle_Customize|WX11BypassWM ),
+ :TQHBox( 0, "wndSplash", WStyle_Customize|WX11BypassWM ),
mStatusText(text), mIconPos(icon_position), mXineramaScreen( xineramaScreen ), mPosX(0), mPosY(0), mGroundX(0), mGroundY(0),
mVelocity(8.0), mInitialVelocity(8.0), mGravity(0.8),
mIconNum(icon_num), mStatusHeight(status_height), mIconSize(icon_std_width), mStatusAtTop(statusAtTop),
mStopJump(false), mIconJumping(iconsJumping)
{
- setFrameStyle( QFrame::NoFrame );
+ setFrameStyle( TQFrame::NoFrame );
- QLabel *w = new QLabel( this );
+ TQLabel *w = new TQLabel( this );
w->setFixedSize( pix.width(), pix.height() );
w->setPixmap( pix );
if(pix.mask())
@@ -62,15 +62,15 @@ WndIcon::WndIcon(
resize( pix.width(), pix.height() );
// Set initial position of icon, and ground.
- QPoint p = determinePosition();
+ TQPoint p = determinePosition();
mGroundX = mPosX = p.x();
mGroundY = mPosY = p.y();
move( p + kapp->desktop()->screenGeometry( mXineramaScreen ).topLeft() );
if( mIconJumping )
{
- QTimer *t = new QTimer( this );
- connect(t, SIGNAL(timeout()), SLOT(slotJump()));
+ TQTimer *t = new TQTimer( this );
+ connect(t, TQT_SIGNAL(timeout()), TQT_SLOT(slotJump()));
t->start( 50, false );
}
}
@@ -78,7 +78,7 @@ WndIcon::WndIcon(
void WndIcon::show()
{
emit setStatusText( mStatusText );
- QHBox::show();
+ TQHBox::show();
}
// Emit our EXTRA signal without becoming visible.
@@ -93,12 +93,12 @@ void WndIcon::noshow()
* screen. This is placed in its own function due to the massive
* complexity required by the variables involved.
*/
-QPoint WndIcon::determinePosition()
+TQPoint WndIcon::determinePosition()
{
int DW, DH, SBH, wid, X, Y, x, y, nSlot, topshift, bottomshift;
bottomshift = topshift = 0;
- const QRect srect = kapp->desktop()->screenGeometry( mXineramaScreen );
+ const TQRect srect = kapp->desktop()->screenGeometry( mXineramaScreen );
// KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
DW = srect.width();
DH = srect.height();
@@ -220,7 +220,7 @@ QPoint WndIcon::determinePosition()
return(determinePosition());
break;
}
- return( QPoint( X, Y ) );
+ return( TQPoint( X, Y ) );
}
// Make the icons jump in a macosx-like way (Thanks, Jone!:)
@@ -301,7 +301,7 @@ void WndIcon::slotJump()
mPosY = (int)((float)mPosY - mVelocity );
break;
}
- move( QPoint( mPosX, mPosY ) + kapp->desktop()->screenGeometry( mXineramaScreen ).topLeft() );
+ move( TQPoint( mPosX, mPosY ) + kapp->desktop()->screenGeometry( mXineramaScreen ).topLeft() );
}
void WndIcon::slotStopJumping()
diff --git a/ksplashml/themeengine/standard/wndicon.h b/ksplashml/themeengine/standard/wndicon.h
index a47082ae6..d488f85df 100644
--- a/ksplashml/themeengine/standard/wndicon.h
+++ b/ksplashml/themeengine/standard/wndicon.h
@@ -20,7 +20,7 @@
#include <kpixmap.h>
-#include <qhbox.h>
+#include <tqhbox.h>
/**
* @short Displays an icon on the screen.
@@ -43,10 +43,10 @@ public:
VTopRight = 13
};
- WndIcon( unsigned int, unsigned int, unsigned int, int, const KPixmap&, const QString&, Position, bool, bool );
+ WndIcon( unsigned int, unsigned int, unsigned int, int, const KPixmap&, const TQString&, Position, bool, bool );
signals:
- void setStatusText( const QString& );
+ void setStatusText( const TQString& );
public slots:
void show();
@@ -55,10 +55,10 @@ public slots:
void slotJump();
private:
- QPoint determinePosition();
+ TQPoint determinePosition();
protected:
- QString mStatusText;
+ TQString mStatusText;
Position mIconPos;
int mXineramaScreen;
int mPosX, mPosY, mGroundX, mGroundY;
diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp
index 3b8582c89..04685d9cf 100644
--- a/ksplashml/themeengine/standard/wndstatus.cpp
+++ b/ksplashml/themeengine/standard/wndstatus.cpp
@@ -18,11 +18,11 @@
#include <kprogress.h>
#include <kwin.h>
-#include <qdesktopwidget.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qpoint.h>
-#include <qrect.h>
+#include <tqdesktopwidget.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
+#include <tqpoint.h>
+#include <tqrect.h>
#include "wndstatus.h"
#include "wndstatus.moc"
@@ -30,38 +30,38 @@
// WndStatus::WndStatus(): Display a nifty status bar at
// the bottom of the screen, so the user always knows what's
// happening to his system.
-WndStatus::WndStatus( QPalette /*pal*/,
+WndStatus::WndStatus( TQPalette /*pal*/,
int xineramaScreen,
bool atTop, bool pbVisible,
- const QFont& font,
- const QColor& fgc, const QColor & bgc,
- const QString& icon
+ const TQFont& font,
+ const TQColor& fgc, const TQColor & bgc,
+ const TQString& icon
)
- :QHBox( 0, "wndStatus", WStyle_Customize|WX11BypassWM )
+ :TQHBox( 0, "wndStatus", WStyle_Customize|WX11BypassWM )
{
- setFrameStyle( QFrame::NoFrame );
+ setFrameStyle( TQFrame::NoFrame );
//setPalette( pal );
setPaletteBackgroundColor( bgc );
setPaletteForegroundColor( fgc );
setCursor( KCursor::blankCursor() );
setSpacing( 5 );
- const QRect rect = kapp->desktop()->screenGeometry( xineramaScreen );
+ const TQRect rect = kapp->desktop()->screenGeometry( xineramaScreen );
// KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
- QLabel *pix = new QLabel( this );
- QPixmap _icon( SmallIcon(icon.isNull()||icon.isEmpty()?QString("run"):icon) );
+ TQLabel *pix = new TQLabel( this );
+ TQPixmap _icon( SmallIcon(icon.isNull()||icon.isEmpty()?TQString("run"):icon) );
pix->setPixmap( _icon );
setStretchFactor(pix,0);
pix->setFixedWidth(16);
- m_label = new QLabel( this );
+ m_label = new TQLabel( this );
m_label->setFont( font );
m_label->setPaletteBackgroundColor( bgc );
m_label->setPaletteForegroundColor( fgc );
- //QFontMetrics metrics( font );
+ //TQFontMetrics metrics( font );
//m_label->setFixedHeight( metrics.height() );
- m_label->setText(QString(""));
+ m_label->setText(TQString(""));
m_label->setFixedWidth(rect.width()-105-16-10); // What's this magic number?
m_label->show();
@@ -69,7 +69,7 @@ WndStatus::WndStatus( QPalette /*pal*/,
setStretchFactor(m_progress,0);
m_progress->setFixedWidth(100);
- QWidget *widg = new QWidget( this );
+ TQWidget *widg = new TQWidget( this );
setStretchFactor(widg,50);
setFixedSize( rect.width(), QMAX(m_progress->height(),m_label->height()) );
@@ -83,7 +83,7 @@ WndStatus::WndStatus( QPalette /*pal*/,
m_progress->hide();
}
-void WndStatus::slotSetMessage( const QString& msg )
+void WndStatus::slotSetMessage( const TQString& msg )
{
raise();
m_label->setText( msg );
diff --git a/ksplashml/themeengine/standard/wndstatus.h b/ksplashml/themeengine/standard/wndstatus.h
index fa1d735d9..effcd458f 100644
--- a/ksplashml/themeengine/standard/wndstatus.h
+++ b/ksplashml/themeengine/standard/wndstatus.h
@@ -18,7 +18,7 @@
#ifndef __WNDSTATUS_H__
#define __WNDSTATUS_H__
-#include <qhbox.h>
+#include <tqhbox.h>
class QLabel;
class KProgress;
@@ -29,22 +29,22 @@ class WndStatus:
{
Q_OBJECT
public:
- WndStatus( QPalette,
+ WndStatus( TQPalette,
int, // Xinerama screen
bool, // At top?
bool, // Progress indicator visible?
- const QFont&, // Status bar font
- const QColor&, const QColor &, // Foreground/Background color
- const QString& // Icon
+ const TQFont&, // Status bar font
+ const TQColor&, const TQColor &, // Foreground/Background color
+ const TQString& // Icon
);
public slots:
- void slotSetMessage( const QString& );
+ void slotSetMessage( const TQString& );
void slotUpdateProgress( int );
void slotUpdateSteps( int );
protected:
- QLabel *m_label;
+ TQLabel *m_label;
KProgress *m_progress;
};
#endif
diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp
index 0b58587f7..79e47bfe1 100644
--- a/ksplashml/themeengine/themeengine.cpp
+++ b/ksplashml/themeengine/themeengine.cpp
@@ -20,9 +20,9 @@
#include <kglobal.h>
#include <kwin.h>
-#include <qevent.h>
-#include <qfile.h>
-#include <qwidget.h>
+#include <tqevent.h>
+#include <tqfile.h>
+#include <tqwidget.h>
#include <X11/Xlib.h>
@@ -37,11 +37,11 @@
struct ThemeEngine::ThemeEnginePrivate
{
- QValueList< Window > mSplashWindows;
+ TQValueList< Window > mSplashWindows;
};
-ThemeEngine::ThemeEngine( QWidget *, const char *, const QStringList& args )
- : QVBox( 0, "wndSplash", WStyle_Customize|WX11BypassWM ), d(0)
+ThemeEngine::ThemeEngine( TQWidget *, const char *, const TQStringList& args )
+ : TQVBox( 0, "wndSplash", WStyle_Customize|WX11BypassWM ), d(0)
{
d = new ThemeEnginePrivate;
kapp->installX11EventFilter( this );
@@ -71,19 +71,19 @@ ThemeEngine::~ThemeEngine()
force them to be WX11BypassWM (so that ksplash can handle their stacking),
and keep them on top, even above all windows handled by KWin.
*/
-bool ThemeEngine::eventFilter( QObject* o, QEvent* e )
+bool ThemeEngine::eventFilter( TQObject* o, TQEvent* e )
{
- if( e->type() == QEvent::Show && o->isWidgetType())
- addSplashWindow( static_cast< QWidget* >( o ));
+ if( e->type() == TQEvent::Show && o->isWidgetType())
+ addSplashWindow( static_cast< TQWidget* >( o ));
return false;
}
namespace
{
-class HackWidget : public QWidget { friend class ::ThemeEngine; };
+class HackWidget : public TQWidget { friend class ::ThemeEngine; };
}
-void ThemeEngine::addSplashWindow( QWidget* w )
+void ThemeEngine::addSplashWindow( TQWidget* w )
{
if( !w->isTopLevel())
return;
@@ -98,13 +98,13 @@ void ThemeEngine::addSplashWindow( QWidget* w )
XChangeWindowAttributes( qt_xdisplay(), w->winId(), CWOverrideRedirect, &attrs );
}
d->mSplashWindows.prepend( w->winId());
- connect( w, SIGNAL( destroyed( QObject* )), SLOT( splashWindowDestroyed( QObject* )));
+ connect( w, TQT_SIGNAL( destroyed( TQObject* )), TQT_SLOT( splashWindowDestroyed( TQObject* )));
w->raise();
}
-void ThemeEngine::splashWindowDestroyed( QObject* obj )
+void ThemeEngine::splashWindowDestroyed( TQObject* obj )
{
- d->mSplashWindows.remove( static_cast< QWidget* >( obj )->winId());
+ d->mSplashWindows.remove( static_cast< TQWidget* >( obj )->winId());
}
bool ThemeEngine::x11Event( XEvent* e )
@@ -126,7 +126,7 @@ bool ThemeEngine::x11Event( XEvent* e )
// and stack others below it
Window* stack = new Window[ d->mSplashWindows.count() ];
int count = 0;
- for( QValueList< Window >::ConstIterator it = d->mSplashWindows.begin();
+ for( TQValueList< Window >::ConstIterator it = d->mSplashWindows.begin();
it != d->mSplashWindows.end();
++it )
stack[ count++ ] = *it;
diff --git a/ksplashml/themeengine/themeengine.h b/ksplashml/themeengine/themeengine.h
index 62461cd4e..876eb19d6 100644
--- a/ksplashml/themeengine/themeengine.h
+++ b/ksplashml/themeengine/themeengine.h
@@ -12,9 +12,9 @@
#ifndef THEMEENGINE_H
#define THEMEENGINE_H
-#include <qstringlist.h>
-#include <qvbox.h>
-#include <qwidget.h>
+#include <tqstringlist.h>
+#include <tqvbox.h>
+#include <tqwidget.h>
#include <kdemacros.h>
@@ -30,8 +30,8 @@ class KDE_EXPORT ThemeEngineConfig: public QVBox
Q_OBJECT
public:
- ThemeEngineConfig( QWidget *p, KConfig *c )
- :QVBox( p ), mConfig( c )
+ ThemeEngineConfig( TQWidget *p, KConfig *c )
+ :TQVBox( p ), mConfig( c )
{}
KConfig* config()const { return mConfig; }
@@ -52,27 +52,27 @@ class KDE_EXPORT ThemeEngine: public QVBox
{
Q_OBJECT
public:
- ThemeEngine( QWidget *parent, const char *name, const QStringList &args );
+ ThemeEngine( TQWidget *parent, const char *name, const TQStringList &args );
virtual ~ThemeEngine() = 0;
- virtual const ThemeEngineConfig *config( QWidget *, KConfig * ) { return 0L; }
+ virtual const ThemeEngineConfig *config( TQWidget *, KConfig * ) { return 0L; }
virtual ObjKsTheme *ksTheme() { return mTheme; }
- virtual bool eventFilter( QObject* o, QEvent* e );
+ virtual bool eventFilter( TQObject* o, TQEvent* e );
public slots:
virtual void slotUpdateProgress( int ) {}
virtual void slotUpdateSteps( int ) {}
- virtual void slotSetText( const QString& ) {}
- virtual void slotSetPixmap( const QString& ) {} // use DesktopIcon() to load this.
+ virtual void slotSetText( const TQString& ) {}
+ virtual void slotSetPixmap( const TQString& ) {} // use DesktopIcon() to load this.
protected:
- void addSplashWindow( QWidget* );
+ void addSplashWindow( TQWidget* );
protected:
ObjKsTheme *mTheme;
virtual bool x11Event( XEvent* );
private slots:
- void splashWindowDestroyed( QObject* );
+ void splashWindowDestroyed( TQObject* );
private:
class ThemeEnginePrivate;
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index b5cc45c12..091d70e9e 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -24,9 +24,9 @@
#include <kwin.h>
#include <dcopclient.h>
-#include <qdir.h>
-#include <qpixmap.h>
-#include <qtimer.h>
+#include <tqdir.h>
+#include <tqpixmap.h>
+#include <tqtimer.h>
#include "objkstheme.h"
#include "wndmain.h"
@@ -38,11 +38,11 @@
// KSplash::KSplash(): This is a hidden object. Its sole purpose
// is to manage the other objects, which are presented on the screen.
KSplash::KSplash(const char *name)
- : DCOPObject( name ), QWidget( 0, name, WStyle_Customize|WStyle_NoBorder|WX11BypassWM ),
+ : DCOPObject( name ), TQWidget( 0, name, WStyle_Customize|WStyle_NoBorder|WX11BypassWM ),
mState( 0 ), mMaxProgress( 0 ), mStep( 0 )
{
hide(); // We never show this object.
- mThemeLibName = QString::null;
+ mThemeLibName = TQString::null;
mSessMgrCalled = false;
mTimeToGo = false;
@@ -58,23 +58,23 @@ KSplash::KSplash(const char *name)
if ( config->readBoolEntry( "CloseOnClick", TRUE ) )
mThemeEngine->installEventFilter( this );
- connect( mThemeEngine, SIGNAL(destroyed()), this, SLOT(close()) );
- connect( this, SIGNAL(stepsChanged(int)), SLOT(slotUpdateSteps(int)) );
- connect( this, SIGNAL(progressChanged(int)), SLOT(slotUpdateProgress(int)) );
+ connect( mThemeEngine, TQT_SIGNAL(destroyed()), this, TQT_SLOT(close()) );
+ connect( this, TQT_SIGNAL(stepsChanged(int)), TQT_SLOT(slotUpdateSteps(int)) );
+ connect( this, TQT_SIGNAL(progressChanged(int)), TQT_SLOT(slotUpdateProgress(int)) );
if( mKsTheme->testing() )
{
slotUpdateSteps(7);
- QTimer::singleShot( 1000, this, SLOT(slotExec()));
+ TQTimer::singleShot( 1000, this, TQT_SLOT(slotExec()));
}
else
- QTimer::singleShot( 100, this, SLOT(initDcop()));
+ TQTimer::singleShot( 100, this, TQT_SLOT(initDcop()));
// Make sure we don't stay up forever.
if (!mKsTheme->managedMode())
{
- close_timer = new QTimer( this );
- connect( close_timer, SIGNAL( timeout() ), this, SLOT( close() ) );
+ close_timer = new TQTimer( this );
+ connect( close_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( close() ) );
close_timer->start( 60000, TRUE );
}
}
@@ -122,7 +122,7 @@ void KSplash::prepareSplashScreen()
mThemeEngine->show();
}
-void KSplash::slotInsertAction( const QString& pix, const QString& msg )
+void KSplash::slotInsertAction( const TQString& pix, const TQString& msg )
{
Action *a = new Action;
a->ItemText = msg;
@@ -132,14 +132,14 @@ void KSplash::slotInsertAction( const QString& pix, const QString& msg )
void KSplash::slotExec()
{
- QTimer::singleShot( 200, this, SLOT(nextIcon()));
+ TQTimer::singleShot( 200, this, TQT_SLOT(nextIcon()));
}
void KSplash::nextIcon()
{
if( !mCurrentAction || mTimeToGo )
{
- QTimer::singleShot( 1000, this, SLOT(close()));
+ TQTimer::singleShot( 1000, this, TQT_SLOT(close()));
return;
}
@@ -153,12 +153,12 @@ void KSplash::nextIcon()
}
if( mKsTheme->testing() )
- QTimer::singleShot( 1000, this, SLOT(nextIcon()));
+ TQTimer::singleShot( 1000, this, TQT_SLOT(nextIcon()));
}
void KSplash::initDcop()
{
- disconnect( kapp->dcopClient(), SIGNAL( attachFailed(const QString&) ), kapp, SLOT( dcopFailure(const QString&) ) );
+ disconnect( kapp->dcopClient(), TQT_SIGNAL( attachFailed(const TQString&) ), kapp, TQT_SLOT( dcopFailure(const TQString&) ) );
if ( kapp->dcopClient()->isAttached() )
return;
@@ -172,7 +172,7 @@ void KSplash::initDcop()
}
else
{
- QTimer::singleShot( 100, this, SLOT(initDcop()) );
+ TQTimer::singleShot( 100, this, TQT_SLOT(initDcop()) );
}
}
@@ -191,7 +191,7 @@ void KSplash::updateState( unsigned int state )
}
// For KDE startup only.
-void KSplash::upAndRunning( QString s )
+void KSplash::upAndRunning( TQString s )
{
// This code is written to match ksmserver. Touch it without knowing
// what you are doing and prepare to bite the dust.
@@ -245,7 +245,7 @@ void KSplash::upAndRunning( QString s )
//if(!mSessMgrCalled) emit nextIcon();
mTimeToGo = true;
close_timer->stop();
- QTimer::singleShot( 1000, this, SLOT(close()));
+ TQTimer::singleShot( 1000, this, TQT_SLOT(close()));
}
else
{
@@ -279,9 +279,9 @@ void KSplash::setProgress(int step)
* name of the process being started, and (c) a description of what the
* process is handling. Some examples:
*
- * programStarted( QString("desktop"), QString("kdesktop"), QString("Preparing your desktop..."));
+ * programStarted( TQString("desktop"), TQString("kdesktop"), TQString("Preparing your desktop..."));
*/
-void KSplash::programStarted( QString icon, QString name, QString desc )
+void KSplash::programStarted( TQString icon, TQString name, TQString desc )
{
if (mTimeToGo)
return;
@@ -305,26 +305,26 @@ void KSplash::setStartupItemCount( int count )
void KSplash::startupComplete()
{
mTimeToGo = true;
- QTimer::singleShot( 1000, this, SLOT(close()));
+ TQTimer::singleShot( 1000, this, TQT_SLOT(close()));
}
void KSplash::close()
{
- QWidget::close();
+ TQWidget::close();
}
void KSplash::hide()
{
- QWidget::hide();
+ TQWidget::hide();
}
void KSplash::show()
{
- QWidget::show();
+ TQWidget::show();
}
// Guaranteed to return a valid theme.
-void KSplash::loadTheme( const QString& theme )
+void KSplash::loadTheme( const TQString& theme )
{
mKsTheme = new ObjKsTheme( theme );
// kdDebug() << "KSplash::loadTheme: " << theme << " : "<< mKsTheme->themeEngine() << endl;
@@ -339,37 +339,37 @@ void KSplash::loadTheme( const QString& theme )
mKsTheme = mThemeEngine->ksTheme();
}
-ThemeEngine *KSplash::_loadThemeEngine( const QString& pluginName, const QString& theme )
+ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQString& theme )
{
// Since we may be called before the DCOP server is active, we cannot use the KTrader framework for obtaining plugins. In its
// place, we use the following naive heuristic to locate plugins. If we are not in managed mode, and we are not in testing mode
// either, we assume that we have been called by startkde. In this case, we simply try to load the library whose name should
// conform to the following specification:
- // QString("ksplash") + pluginName.lower()
+ // TQString("ksplash") + pluginName.lower()
// The object should be called as follows:
- // QString("Theme") + pluginName
+ // TQString("Theme") + pluginName
KLibFactory *factory = 0L;
- QString libName;
- QString objName;
+ TQString libName;
+ TQString objName;
// Replace this test by a "nodcop" command line option.
if ( /*!mKsTheme->managedMode() ||*/ !KCmdLineArgs::parsedArgs()->isSet( "dcop" ) )
{
- libName = QString("ksplash%1").arg(pluginName.lower());
- objName = QString("Theme%1").arg(pluginName);
+ libName = TQString("ksplash%1").arg(pluginName.lower());
+ objName = TQString("Theme%1").arg(pluginName);
// kdDebug() << "*KSplash::_loadThemeEngine: Loading " << objName << " from " << libName << endl;
- // libname.latin1() instead of QFile::encodeName() because these are not user-modifiable files.
+ // libname.latin1() instead of TQFile::encodeName() because these are not user-modifiable files.
if ( (factory = KLibLoader::self()->factory ( libName.latin1() )) )
mThemeLibName = libName;
}
else
{
// Fancier way of locating plugins.
- KService::List list= KTrader::self()->query("KSplash/Plugin", QString("[X-KSplash-PluginName] == '%1'").arg(pluginName));
+ KService::List list= KTrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName));
KService::Ptr ptr;
if (!list.isEmpty())
{
ptr = list.first();
- // libname.latin1() instead of QFile::encodeName() because these are not user-modifiable files.
+ // libname.latin1() instead of TQFile::encodeName() because these are not user-modifiable files.
if( (factory = KLibLoader::self()->factory( ptr->library().latin1() )) )
{
mThemeLibName = ptr->library();
@@ -379,7 +379,7 @@ ThemeEngine *KSplash::_loadThemeEngine( const QString& pluginName, const QString
}
if (factory)
{
- QStringList themeTitle;
+ TQStringList themeTitle;
themeTitle << theme;
return static_cast<ThemeEngine *>(factory->create(this, "theme", objName.latin1(), themeTitle));
}
@@ -387,13 +387,13 @@ ThemeEngine *KSplash::_loadThemeEngine( const QString& pluginName, const QString
return 0L;
}
-void KSplash::slotSetText( const QString& s )
+void KSplash::slotSetText( const TQString& s )
{
if( mThemeEngine )
mThemeEngine->slotSetText( s );
}
-void KSplash::slotSetPixmap( const QString& px )
+void KSplash::slotSetPixmap( const TQString& px )
{
if( mThemeEngine )
mThemeEngine->slotSetPixmap( px );
@@ -409,16 +409,16 @@ void KSplash::slotUpdateProgress( int )
// ??
}
-QPtrList<Action> KSplash::actionList()
+TQPtrList<Action> KSplash::actionList()
{
return mActionList;
}
-bool KSplash::eventFilter( QObject *o, QEvent *e )
+bool KSplash::eventFilter( TQObject *o, TQEvent *e )
{
- if ( ( e->type() == QEvent::MouseButtonRelease ) && ( o == mThemeEngine ) )
+ if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( o == mThemeEngine ) )
{
- QTimer::singleShot( 0, this, SLOT(close()));
+ TQTimer::singleShot( 0, this, TQT_SLOT(close()));
return TRUE;
}
else
diff --git a/ksplashml/wndmain.h b/ksplashml/wndmain.h
index 1bed2b734..c1fa4ae45 100644
--- a/ksplashml/wndmain.h
+++ b/ksplashml/wndmain.h
@@ -14,9 +14,9 @@
#include <kapplication.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qobject.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqobject.h>
#include "ksplashiface.h"
@@ -27,8 +27,8 @@
// in knowing this.
typedef struct
{
- QString ItemPixmap;
- QString ItemText;
+ TQString ItemPixmap;
+ TQString ItemText;
} Action;
class WndStatus;
@@ -36,7 +36,7 @@ class ObjKsTheme;
class ThemeEngine;
class KConfig;
-class KSplash: public QWidget, virtual public KSplashIface
+class KSplash: public TQWidget, virtual public KSplashIface
{
Q_OBJECT
@@ -44,14 +44,14 @@ public:
KSplash(const char *name = "ksplash");
~KSplash();
- QPtrList<Action> actionList();
+ TQPtrList<Action> actionList();
// DCOP interface
- ASYNC upAndRunning( QString );
+ ASYNC upAndRunning( TQString );
ASYNC setMaxProgress(int);
ASYNC setProgress(int);
ASYNC setStartupItemCount( int count );
- ASYNC programStarted( QString programIcon, QString programName, QString description );
+ ASYNC programStarted( TQString programIcon, TQString programName, TQString description );
ASYNC startupComplete();
ASYNC close();
ASYNC hide();
@@ -63,7 +63,7 @@ signals:
void actionListChanged();
protected:
- bool eventFilter( QObject *o, QEvent *e );
+ bool eventFilter( TQObject *o, TQEvent *e );
public slots:
void slotUpdateSteps( int );
@@ -75,35 +75,35 @@ private slots:
void prepareSplashScreen();
void slotExec();
void nextIcon();
- void slotInsertAction( const QString&, const QString& );
+ void slotInsertAction( const TQString&, const TQString& );
void slotReadProperties( KConfig * );
- void slotSetText( const QString& );
- void slotSetPixmap( const QString& );
+ void slotSetText( const TQString& );
+ void slotSetPixmap( const TQString& );
- void loadTheme( const QString& );
+ void loadTheme( const TQString& );
private:
- ThemeEngine *_loadThemeEngine( const QString& pluginName, const QString& theme );
+ ThemeEngine *_loadThemeEngine( const TQString& pluginName, const TQString& theme );
void updateState( unsigned int state );
protected:
unsigned int mState;
unsigned int mMaxProgress;
unsigned int mStep; // ??
- QTimer* close_timer;
+ TQTimer* close_timer;
bool mSessMgrCalled;
bool mTimeToGo;
- QString mTheme;
+ TQString mTheme;
ObjKsTheme *mKsTheme;
ThemeEngine *mThemeEngine;
- QPtrList<Action> mActionList;
+ TQPtrList<Action> mActionList;
Action *mCurrentAction, *mPreviousAction;
- QString mThemeLibName;
+ TQString mThemeLibName;
};
#endif
diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp
index 83105c86d..f3be8e607 100644
--- a/kstart/kstart.cpp
+++ b/kstart/kstart.cpp
@@ -13,8 +13,8 @@
#include <fcntl.h>
#include <stdlib.h>
-#include <qregexp.h>
-#include <qtimer.h>
+#include <tqregexp.h>
+#include <tqtimer.h>
#include <kdebug.h>
#include <kprocess.h>
@@ -33,8 +33,8 @@
// some globals
static KProcess proc;
-static QCString windowtitle = 0;
-static QCString windowclass = 0;
+static TQCString windowtitle = 0;
+static TQCString windowclass = 0;
static int desktop = 0;
static bool activate = false;
static bool iconify = false;
@@ -46,7 +46,7 @@ static NET::WindowType windowtype = NET::Unknown;
static KWinModule* kwinmodule;
KStart::KStart()
- :QObject()
+ :TQObject()
{
NETRootInfo i( qt_xdisplay(), NET::Supported );
bool useRule = !toSysTray && i.isSupported( NET::WM2KDETemporaryRules );
@@ -55,7 +55,7 @@ KStart::KStart()
sendRule();
else {
// connect to window add to get the NEW windows
- connect(kwinmodule, SIGNAL(windowAdded(WId)), SLOT(windowAdded(WId)));
+ connect(kwinmodule, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)));
if (windowtitle)
kwinmodule->doNotManage( windowtitle );
}
@@ -68,7 +68,7 @@ KStart::KStart()
if( proc.start(KProcess::DontCare) ) {
KStartupInfoData data;
data.addPid( proc.pid() );
- QCString bin = proc.args().first();
+ TQCString bin = proc.args().first();
data.setName( bin );
data.setBin( bin.mid( bin.findRev( '/' ) + 1 ));
KStartupInfo::sendChange( id, data );
@@ -76,12 +76,12 @@ KStart::KStart()
else
KStartupInfo::sendFinish( id ); // failed to start
- QTimer::singleShot( useRule ? 0 : 120 * 1000, kapp, SLOT( quit()));
+ TQTimer::singleShot( useRule ? 0 : 120 * 1000, kapp, TQT_SLOT( quit()));
}
void KStart::sendRule() {
KXMessages msg;
- QCString message;
+ TQCString message;
if( windowtitle )
message += "title=" + windowtitle + "\ntitlematch=3\n"; // 3 = regexp match
if( windowclass )
@@ -91,22 +91,22 @@ void KStart::sendRule() {
+ ( windowclass.contains( ' ' ) ? "true" : "false" ) + "\n";
if( windowtitle || windowclass ) {
// always ignore these window types
- message += "types=" + QCString().setNum( -1U &
+ message += "types=" + TQCString().setNum( -1U &
~( NET::TopMenuMask | NET::ToolbarMask | NET::DesktopMask | NET::SplashMask | NET::MenuMask )) + "\n";
} else {
// accept only "normal" windows
- message += "types=" + QCString().setNum( NET::NormalMask | NET::DialogMask ) + "\n";
+ message += "types=" + TQCString().setNum( NET::NormalMask | NET::DialogMask ) + "\n";
}
if ( ( desktop > 0 && desktop <= kwinmodule->numberOfDesktops() )
|| desktop == NETWinInfo::OnAllDesktops ) {
- message += "desktop=" + QCString().setNum( desktop ) + "\ndesktoprule=3\n";
+ message += "desktop=" + TQCString().setNum( desktop ) + "\ndesktoprule=3\n";
}
if (activate)
message += "fsplevel=0\nfsplevelrule=2\n";
if (iconify)
message += "minimize=true\nminimizerule=3\n";
if ( windowtype != NET::Unknown ) {
- message += "type=" + QCString().setNum( windowtype ) + "\ntyperule=2";
+ message += "type=" + TQCString().setNum( windowtype ) + "\ntyperule=2";
}
if ( state ) {
if( state & NET::KeepAbove )
@@ -144,8 +144,8 @@ void KStart::windowAdded(WId w){
return;
if ( windowtitle ) {
- QString title = info.name().lower();
- QRegExp r( windowtitle.lower());
+ TQString title = info.name().lower();
+ TQRegExp r( windowtitle.lower());
if (r.match(title) == -1)
return; // no match
}
@@ -153,8 +153,8 @@ void KStart::windowAdded(WId w){
XClassHint hint;
if( !XGetClassHint( qt_xdisplay(), w, &hint ))
return;
- QCString cls = windowclass.contains( ' ' )
- ? QCString( hint.res_name ) + ' ' + hint.res_class : QCString( hint.res_class );
+ TQCString cls = windowclass.contains( ' ' )
+ ? TQCString( hint.res_name ) + ' ' + hint.res_class : TQCString( hint.res_class );
cls = cls.lower();
XFree( hint.res_name );
XFree( hint.res_class );
@@ -169,7 +169,7 @@ void KStart::windowAdded(WId w){
return;
}
applyStyle( w );
- QApplication::exit();
+ TQApplication::exit();
}
@@ -198,7 +198,7 @@ void KStart::applyStyle(WId w ) {
if ( toSysTray || state || iconify || windowtype != NET::Unknown || desktop >= 1 ) {
XWithdrawWindow(qt_xdisplay(), w, qt_xscreen());
- QApplication::flushX();
+ TQApplication::flushX();
while ( !wstate_withdrawn(w) )
;
@@ -228,12 +228,12 @@ void KStart::applyStyle(WId w ) {
info.setState( state, mask );
if ( toSysTray ) {
- QApplication::beep();
+ TQApplication::beep();
KWin::setSystemTrayWindowFor( w, qt_xrootwin() );
}
if ( fullscreen ) {
- QRect r = QApplication::desktop()->geometry();
+ TQRect r = TQApplication::desktop()->geometry();
XMoveResizeWindow( qt_xdisplay(), w, r.x(), r.y(), r.width(), r.height() );
}
@@ -246,7 +246,7 @@ void KStart::applyStyle(WId w ) {
if (activate)
KWin::forceActiveWindow( w );
- QApplication::flushX();
+ TQApplication::flushX();
}
// David, 05/03/2000
@@ -328,7 +328,7 @@ int main( int argc, char *argv[] )
if( windowtitle.isEmpty() && windowclass.isEmpty())
kdWarning() << "Omitting both --window and --windowclass arguments is not recommended" << endl;
- QCString s = args->getOption( "type" );
+ TQCString s = args->getOption( "type" );
if ( !s.isEmpty() ) {
s = s.lower();
if ( s == "desktop" )
diff --git a/kstart/kstart.h b/kstart/kstart.h
index 0b5013387..c35d460d3 100644
--- a/kstart/kstart.h
+++ b/kstart/kstart.h
@@ -11,11 +11,11 @@
#define KSTART_H
-#include <qobject.h>
+#include <tqobject.h>
class KWinModule;
-class KStart: public QObject {
+class KStart: public TQObject {
Q_OBJECT
public:
diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cc
index df4748cb8..5160dbddb 100644
--- a/ksysguard/gui/KSGAppletSettings.cc
+++ b/ksysguard/gui/KSGAppletSettings.cc
@@ -18,54 +18,54 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qspinbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqspinbox.h>
#include <kaccelmanager.h>
#include <klocale.h>
#include "KSGAppletSettings.h"
-KSGAppletSettings::KSGAppletSettings( QWidget *parent, const char *name )
- : KDialogBase( parent, name, false, QString::null, Ok|Apply|Cancel,
+KSGAppletSettings::KSGAppletSettings( TQWidget *parent, const char *name )
+ : KDialogBase( parent, name, false, TQString::null, Ok|Apply|Cancel,
Ok, true )
{
setCaption( i18n( "System Guard Settings" ) );
- QWidget *page = new QWidget( this );
+ TQWidget *page = new TQWidget( this );
setMainWidget( page );
- QGridLayout *topLayout = new QGridLayout( page, 3, 2, KDialog::marginHint(),
+ TQGridLayout *topLayout = new TQGridLayout( page, 3, 2, KDialog::marginHint(),
KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n( "Number of displays:" ), page );
+ TQLabel *label = new TQLabel( i18n( "Number of displays:" ), page );
topLayout->addWidget( label, 0, 0 );
- mNumDisplay = new QSpinBox( 1, 32, 1, page );
+ mNumDisplay = new TQSpinBox( 1, 32, 1, page );
mNumDisplay->setValue(2);
topLayout->addWidget( mNumDisplay, 0, 1 );
label->setBuddy( mNumDisplay );
- label = new QLabel( i18n( "Size ratio:" ), page );
+ label = new TQLabel( i18n( "Size ratio:" ), page );
topLayout->addWidget( label, 1, 0 );
- mSizeRatio = new QSpinBox( 50, 500, 50, page );
+ mSizeRatio = new TQSpinBox( 50, 500, 50, page );
mSizeRatio->setSuffix( i18n( "%" ) );
mSizeRatio->setValue(100);
topLayout->addWidget( mSizeRatio, 1, 1 );
label->setBuddy( mSizeRatio );
- label = new QLabel( i18n( "Update interval:" ), page );
+ label = new TQLabel( i18n( "Update interval:" ), page );
topLayout->addWidget( label, 2, 0 );
- mInterval = new QSpinBox( 1, 300, 1, page );
+ mInterval = new TQSpinBox( 1, 300, 1, page );
mInterval->setValue(2);
mInterval->setSuffix( i18n( " sec" ) );
topLayout->addWidget( mInterval, 2, 1 );
label->setBuddy( mInterval );
- resize( QSize( 250, 130 ).expandedTo( minimumSizeHint() ) );
+ resize( TQSize( 250, 130 ).expandedTo( minimumSizeHint() ) );
KAcceleratorManager::manage( page );
}
diff --git a/ksysguard/gui/KSGAppletSettings.h b/ksysguard/gui/KSGAppletSettings.h
index a825e2841..5fca4aa35 100644
--- a/ksysguard/gui/KSGAppletSettings.h
+++ b/ksysguard/gui/KSGAppletSettings.h
@@ -28,7 +28,7 @@ class QSpinBox;
class KSGAppletSettings : public KDialogBase
{
public:
- KSGAppletSettings( QWidget *parent = 0, const char *name = 0 );
+ KSGAppletSettings( TQWidget *parent = 0, const char *name = 0 );
~KSGAppletSettings();
void setNumDisplay( int );
@@ -41,9 +41,9 @@ class KSGAppletSettings : public KDialogBase
int updateInterval() const;
private:
- QSpinBox *mInterval;
- QSpinBox *mNumDisplay;
- QSpinBox *mSizeRatio;
+ TQSpinBox *mInterval;
+ TQSpinBox *mNumDisplay;
+ TQSpinBox *mSizeRatio;
};
#endif
diff --git a/ksysguard/gui/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cc
index 5240a068b..245600cb6 100644
--- a/ksysguard/gui/KSysGuardApplet.cc
+++ b/ksysguard/gui/KSysGuardApplet.cc
@@ -22,13 +22,13 @@
*/
-#include <qcursor.h>
-#include <qdom.h>
-#include <qdragobject.h>
-#include <qfile.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qtooltip.h>
+#include <tqcursor.h>
+#include <tqdom.h>
+#include <tqdragobject.h>
+#include <tqfile.h>
+#include <tqpushbutton.h>
+#include <tqspinbox.h>
+#include <tqtooltip.h>
#include <kdebug.h>
#include <klocale.h>
@@ -50,7 +50,7 @@
extern "C"
{
- KDE_EXPORT KPanelApplet* init( QWidget *parent, const QString& configFile )
+ KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile )
{
KGlobal::locale()->insertCatalogue( "ksysguard" );
return new KSysGuardApplet( configFile, KPanelApplet::Normal,
@@ -59,8 +59,8 @@ extern "C"
}
}
-KSysGuardApplet::KSysGuardApplet( const QString& configFile, Type type,
- int actions, QWidget *parent,
+KSysGuardApplet::KSysGuardApplet( const TQString& configFile, Type type,
+ int actions, TQWidget *parent,
const char *name )
: KPanelApplet( configFile, type, actions, parent, name)
{
@@ -71,7 +71,7 @@ KSysGuardApplet::KSysGuardApplet( const QString& configFile, Type type,
KSGRD::Style = new KSGRD::StyleEngine();
mDockCount = 1;
- mDockList = new QWidget*[ mDockCount ];
+ mDockList = new TQWidget*[ mDockCount ];
mSizeRatio = 1.0;
addEmptyDisplay( mDockList, 0 );
@@ -108,7 +108,7 @@ int KSysGuardApplet::heightForWidth( int width ) const
return ( (int) ( width * mSizeRatio + 0.5 ) * mDockCount );
}
-void KSysGuardApplet::resizeEvent( QResizeEvent* )
+void KSysGuardApplet::resizeEvent( TQResizeEvent* )
{
layout();
}
@@ -120,9 +120,9 @@ void KSysGuardApplet::preferences()
}
mSettingsDlg = new KSGAppletSettings( this );
- connect( mSettingsDlg, SIGNAL( applyClicked() ), SLOT( applySettings() ) );
- connect( mSettingsDlg, SIGNAL( okClicked() ), SLOT( applySettings() ) );
- connect( mSettingsDlg, SIGNAL( finished() ), SLOT( preferencesFinished() ) );
+ connect( mSettingsDlg, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) );
+ connect( mSettingsDlg, TQT_SIGNAL( okClicked() ), TQT_SLOT( applySettings() ) );
+ connect( mSettingsDlg, TQT_SIGNAL( finished() ), TQT_SLOT( preferencesFinished() ) );
mSettingsDlg->setNumDisplay( mDockCount );
mSettingsDlg->setSizeRatio( (int) ( mSizeRatio * 100.0 + 0.5 ) );
@@ -142,7 +142,7 @@ void KSysGuardApplet::applySettings()
resizeDocks( mSettingsDlg->numDisplay() );
for ( uint i = 0; i < mDockCount; ++i )
- if ( !mDockList[ i ]->isA( "QFrame" ) )
+ if ( !mDockList[ i ]->isA( "TQFrame" ) )
((KSGRD::SensorDisplay*)mDockList[ i ])->setUpdateInterval( updateInterval() );
save();
@@ -171,7 +171,7 @@ void KSysGuardApplet::layout()
}
}
-int KSysGuardApplet::findDock( const QPoint& point )
+int KSysGuardApplet::findDock( const TQPoint& point )
{
if ( orientation() == Horizontal )
return ( point.x() / (int) ( height() * mSizeRatio + 0.5 ) );
@@ -179,38 +179,38 @@ int KSysGuardApplet::findDock( const QPoint& point )
return ( point.y() / (int) ( width() * mSizeRatio + 0.5 ) );
}
-void KSysGuardApplet::dragEnterEvent( QDragEnterEvent *e )
+void KSysGuardApplet::dragEnterEvent( TQDragEnterEvent *e )
{
- e->accept( QTextDrag::canDecode( e ) );
+ e->accept( TQTextDrag::canDecode( e ) );
}
-void KSysGuardApplet::dropEvent( QDropEvent *e )
+void KSysGuardApplet::dropEvent( TQDropEvent *e )
{
- QString dragObject;
+ TQString dragObject;
- if ( QTextDrag::decode( e, dragObject ) ) {
+ if ( TQTextDrag::decode( e, dragObject ) ) {
// The host name, sensor name and type are seperated by a ' '.
- QStringList parts = QStringList::split( ' ', dragObject );
+ TQStringList parts = TQStringList::split( ' ', dragObject );
- QString hostName = parts[ 0 ];
- QString sensorName = parts[ 1 ];
- QString sensorType = parts[ 2 ];
- QString sensorDescr = parts[ 3 ];
+ TQString hostName = parts[ 0 ];
+ TQString sensorName = parts[ 1 ];
+ TQString sensorType = parts[ 2 ];
+ TQString sensorDescr = parts[ 3 ];
if ( hostName.isEmpty() || sensorName.isEmpty() || sensorType.isEmpty() )
return;
int dock = findDock( e->pos() );
- if ( mDockList[ dock ]->isA( "QFrame" ) ) {
+ if ( mDockList[ dock ]->isA( "TQFrame" ) ) {
if ( sensorType == "integer" || sensorType == "float" ) {
KPopupMenu popup;
- QWidget *wdg = 0;
+ TQWidget *wdg = 0;
popup.insertTitle( i18n( "Select Display Type" ) );
popup.insertItem( i18n( "&Signal Plotter" ), 1 );
popup.insertItem( i18n( "&Multimeter" ), 2 );
popup.insertItem( i18n( "&Dancing Bars" ), 3 );
- switch ( popup.exec( QCursor::pos() ) ) {
+ switch ( popup.exec( TQCursor::pos() ) ) {
case 1:
wdg = new FancyPlotter( this, "FancyPlotter", sensorDescr,
100.0, 100.0, true );
@@ -232,8 +232,8 @@ void KSysGuardApplet::dropEvent( QDropEvent *e )
mDockList[ dock ] = wdg;
layout();
- connect( wdg, SIGNAL( modified( bool ) ),
- SLOT( sensorDisplayModified( bool ) ) );
+ connect( wdg, TQT_SIGNAL( modified( bool ) ),
+ TQT_SLOT( sensorDisplayModified( bool ) ) );
mDockList[ dock ]->show();
}
@@ -246,7 +246,7 @@ void KSysGuardApplet::dropEvent( QDropEvent *e )
}
}
- if ( !mDockList[ dock ]->isA( "QFrame" ) )
+ if ( !mDockList[ dock ]->isA( "TQFrame" ) )
((KSGRD::SensorDisplay*)mDockList[ dock ])->
addSensor( hostName, sensorName, sensorType, sensorDescr );
}
@@ -254,9 +254,9 @@ void KSysGuardApplet::dropEvent( QDropEvent *e )
save();
}
-void KSysGuardApplet::customEvent( QCustomEvent *e )
+void KSysGuardApplet::customEvent( TQCustomEvent *e )
{
- if ( e->type() == QEvent::User ) {
+ if ( e->type() == TQEvent::User ) {
// SensorDisplays send out this event if they want to be removed.
removeDisplay( (KSGRD::SensorDisplay*)e->data() );
save();
@@ -286,7 +286,7 @@ void KSysGuardApplet::resizeDocks( uint newDockCount )
}
// Create and initialize new dock array.
- QWidget** tmp = new QWidget*[ newDockCount ];
+ TQWidget** tmp = new TQWidget*[ newDockCount ];
uint i;
for ( i = 0; ( i < newDockCount ) && ( i < mDockCount ); ++i )
@@ -311,16 +311,16 @@ bool KSysGuardApplet::load()
{
KStandardDirs* kstd = KGlobal::dirs();
kstd->addResourceType( "data", "share/apps/ksysguard" );
- QString fileName = kstd->findResource( "data", "KSysGuardApplet.xml" );
+ TQString fileName = kstd->findResource( "data", "KSysGuardApplet.xml" );
- QFile file( fileName );
+ TQFile file( fileName );
if ( !file.open( IO_ReadOnly ) ) {
KMessageBox::sorry( this, i18n( "Cannot open the file %1." ).arg( fileName ) );
return false;
}
// Parse the XML file.
- QDomDocument doc;
+ TQDomDocument doc;
// Read in file and check for a valid XML header.
if ( !doc.setContent( &file ) ) {
@@ -337,7 +337,7 @@ bool KSysGuardApplet::load()
return false;
}
- QDomElement element = doc.documentElement();
+ TQDomElement element = doc.documentElement();
bool ok;
uint count = element.attribute( "dockCnt" ).toUInt( &ok );
if ( !ok )
@@ -355,10 +355,10 @@ bool KSysGuardApplet::load()
/* Load lists of hosts that are needed for the work sheet and try
* to establish a connection. */
- QDomNodeList dnList = element.elementsByTagName( "host" );
+ TQDomNodeList dnList = element.elementsByTagName( "host" );
uint i;
for ( i = 0; i < dnList.count(); ++i ) {
- QDomElement element = dnList.item( i ).toElement();
+ TQDomElement element = dnList.item( i ).toElement();
int port = element.attribute( "port" ).toInt( &ok );
if ( !ok )
port = -1;
@@ -374,7 +374,7 @@ bool KSysGuardApplet::load()
// Load the displays and place them into the work sheet.
dnList = element.elementsByTagName( "display" );
for ( i = 0; i < dnList.count(); ++i ) {
- QDomElement element = dnList.item( i ).toElement();
+ TQDomElement element = dnList.item( i ).toElement();
uint dock = element.attribute( "dock" ).toUInt();
if ( i >= mDockCount ) {
kdDebug (1215) << "Dock number " << i << " out of range "
@@ -382,7 +382,7 @@ bool KSysGuardApplet::load()
return false;
}
- QString classType = element.attribute( "class" );
+ TQString classType = element.attribute( "class" );
KSGRD::SensorDisplay* newDisplay;
if ( classType == "FancyPlotter" )
newDisplay = new FancyPlotter( this, "FancyPlotter", "Dummy", 100.0, 100.0, true /*no frame*/, true /*run ksysguard menu*/);
@@ -405,8 +405,8 @@ bool KSysGuardApplet::load()
delete mDockList[ dock ];
mDockList[ dock ] = newDisplay;
- connect( newDisplay, SIGNAL( modified( bool ) ),
- SLOT( sensorDisplayModified( bool ) ) );
+ connect( newDisplay, TQT_SIGNAL( modified( bool ) ),
+ TQT_SLOT( sensorDisplayModified( bool ) ) );
}
return true;
@@ -415,31 +415,31 @@ bool KSysGuardApplet::load()
bool KSysGuardApplet::save()
{
// Parse the XML file.
- QDomDocument doc( "KSysGuardApplet" );
+ TQDomDocument doc( "KSysGuardApplet" );
doc.appendChild( doc.createProcessingInstruction(
"xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
// save work sheet information
- QDomElement ws = doc.createElement( "WorkSheet" );
+ TQDomElement ws = doc.createElement( "WorkSheet" );
doc.appendChild( ws );
ws.setAttribute( "dockCnt", mDockCount );
ws.setAttribute( "sizeRatio", mSizeRatio );
ws.setAttribute( "interval", updateInterval() );
- QStringList hosts;
+ TQStringList hosts;
uint i;
for ( i = 0; i < mDockCount; ++i )
- if ( !mDockList[ i ]->isA( "QFrame" ) )
+ if ( !mDockList[ i ]->isA( "TQFrame" ) )
((KSGRD::SensorDisplay*)mDockList[ i ])->hosts( hosts );
// save host information (name, shell, etc.)
- QStringList::Iterator it;
+ TQStringList::Iterator it;
for ( it = hosts.begin(); it != hosts.end(); ++it ) {
- QString shell, command;
+ TQString shell, command;
int port;
if ( KSGRD::SensorMgr->hostInfo( *it, shell, command, port ) ) {
- QDomElement host = doc.createElement( "host" );
+ TQDomElement host = doc.createElement( "host" );
ws.appendChild( host );
host.setAttribute( "name", *it );
host.setAttribute( "shell", shell );
@@ -449,8 +449,8 @@ bool KSysGuardApplet::save()
}
for ( i = 0; i < mDockCount; ++i )
- if ( !mDockList[ i ]->isA( "QFrame" ) ) {
- QDomElement element = doc.createElement( "display" );
+ if ( !mDockList[ i ]->isA( "TQFrame" ) ) {
+ TQDomElement element = doc.createElement( "display" );
ws.appendChild( element );
element.setAttribute( "dock", i );
element.setAttribute( "class", mDockList[ i ]->className() );
@@ -460,14 +460,14 @@ bool KSysGuardApplet::save()
KStandardDirs* kstd = KGlobal::dirs();
kstd->addResourceType( "data", "share/apps/ksysguard" );
- QString fileName = kstd->saveLocation( "data", "ksysguard" );
+ TQString fileName = kstd->saveLocation( "data", "ksysguard" );
fileName += "/KSysGuardApplet.xml";
KSaveFile file( fileName, 0644 );
if ( file.status() == 0 )
{
- file.textStream()->setEncoding( QTextStream::UnicodeUTF8 );
+ file.textStream()->setEncoding( TQTextStream::UnicodeUTF8 );
*(file.textStream()) << doc;
file.close();
}
@@ -480,11 +480,11 @@ bool KSysGuardApplet::save()
return true;
}
-void KSysGuardApplet::addEmptyDisplay( QWidget **dock, uint pos )
+void KSysGuardApplet::addEmptyDisplay( TQWidget **dock, uint pos )
{
- dock[ pos ] = new QFrame( this );
- ((QFrame*)dock[ pos ])->setFrameStyle( QFrame::WinPanel | QFrame::Sunken );
- QToolTip::add( dock[ pos ],
+ dock[ pos ] = new TQFrame( this );
+ ((TQFrame*)dock[ pos ])->setFrameStyle( TQFrame::WinPanel | TQFrame::Sunken );
+ TQToolTip::add( dock[ pos ],
i18n( "Drag sensors from the KDE System Guard into this cell." ) );
layout();
diff --git a/ksysguard/gui/KSysGuardApplet.h b/ksysguard/gui/KSysGuardApplet.h
index b9d91091e..063df2154 100644
--- a/ksysguard/gui/KSysGuardApplet.h
+++ b/ksysguard/gui/KSysGuardApplet.h
@@ -43,8 +43,8 @@ class KSysGuardApplet : public KPanelApplet, public KSGRD::SensorBoard
Q_OBJECT
public:
- KSysGuardApplet( const QString& configFile, Type type = Normal,
- int actions = 0, QWidget *parent = 0,
+ KSysGuardApplet( const TQString& configFile, Type type = Normal,
+ int actions = 0, TQWidget *parent = 0,
const char *name = 0 );
virtual ~KSysGuardApplet();
@@ -54,10 +54,10 @@ class KSysGuardApplet : public KPanelApplet, public KSGRD::SensorBoard
virtual void preferences();
protected:
- void resizeEvent( QResizeEvent* );
- void dragEnterEvent( QDragEnterEvent* );
- void dropEvent( QDropEvent* );
- void customEvent( QCustomEvent* );
+ void resizeEvent( TQResizeEvent* );
+ void dragEnterEvent( TQDragEnterEvent* );
+ void dropEvent( TQDropEvent* );
+ void customEvent( TQCustomEvent* );
private slots:
@@ -68,18 +68,18 @@ class KSysGuardApplet : public KPanelApplet, public KSGRD::SensorBoard
private:
void layout();
void resizeDocks( uint newDockCount );
- void addEmptyDisplay( QWidget **dock, uint pos );
+ void addEmptyDisplay( TQWidget **dock, uint pos );
bool load();
bool save();
- int findDock( const QPoint& );
+ int findDock( const TQPoint& );
void removeDisplay( KSGRD::SensorDisplay* );
double mSizeRatio;
uint mDockCount;
KSGAppletSettings* mSettingsDlg;
- QWidget** mDockList;
+ TQWidget** mDockList;
};
#endif
diff --git a/ksysguard/gui/SensorBrowser.cc b/ksysguard/gui/SensorBrowser.cc
index 969978947..1e51a5631 100644
--- a/ksysguard/gui/SensorBrowser.cc
+++ b/ksysguard/gui/SensorBrowser.cc
@@ -21,9 +21,9 @@
*/
-#include <qdragobject.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <tqdragobject.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
#include <kdebug.h>
#include <kiconloader.h>
@@ -36,9 +36,9 @@
class HostItem : public QListViewItem
{
public:
- HostItem( SensorBrowser *parent, const QString &text, int id,
+ HostItem( SensorBrowser *parent, const TQString &text, int id,
KSGRD::SensorAgent *host)
- : QListViewItem( parent, text ), mInited( false ), mId( id ),
+ : TQListViewItem( parent, text ), mInited( false ), mId( id ),
mHost( host ), mParent( parent )
{
setExpandable( true );
@@ -52,7 +52,7 @@ class HostItem : public QListViewItem
mHost->sendRequest( "monitors", mParent, mId );
}
- QListViewItem::setOpen( open );
+ TQListViewItem::setOpen( open );
}
private:
@@ -62,30 +62,30 @@ class HostItem : public QListViewItem
SensorBrowser* mParent;
};
-SensorBrowser::SensorBrowser( QWidget* parent, KSGRD::SensorManager* sm,
+SensorBrowser::SensorBrowser( TQWidget* parent, KSGRD::SensorManager* sm,
const char* name)
: KListView( parent, name ), mSensorManager( sm )
{
mHostInfoList.setAutoDelete(true);
- connect( mSensorManager, SIGNAL( update() ), SLOT( update() ) );
- connect( this, SIGNAL( clicked( QListViewItem* ) ),
- SLOT( newItemSelected( QListViewItem* ) ) );
- connect( this, SIGNAL( returnPressed( QListViewItem* ) ),
- SLOT( newItemSelected( QListViewItem* ) ) );
+ connect( mSensorManager, TQT_SIGNAL( update() ), TQT_SLOT( update() ) );
+ connect( this, TQT_SIGNAL( clicked( TQListViewItem* ) ),
+ TQT_SLOT( newItemSelected( TQListViewItem* ) ) );
+ connect( this, TQT_SIGNAL( returnPressed( TQListViewItem* ) ),
+ TQT_SLOT( newItemSelected( TQListViewItem* ) ) );
addColumn( i18n( "Sensor Browser" ) );
addColumn( i18n( "Sensor Type" ) );
setFullWidth( true );
- QToolTip::add( this, i18n( "Drag sensors to empty cells of a worksheet "
+ TQToolTip::add( this, i18n( "Drag sensors to empty cells of a worksheet "
"or the panel applet." ) );
setRootIsDecorated( true );
// The sensor browser can be completely hidden.
setMinimumWidth( 1 );
- QWhatsThis::add( this, i18n( "The sensor browser lists the connected hosts and the sensors "
+ TQWhatsThis::add( this, i18n( "The sensor browser lists the connected hosts and the sensors "
"that they provide. Click and drag sensors into drop zones "
"of a worksheet or the panel applet. A display will appear "
"that visualizes the "
@@ -100,7 +100,7 @@ SensorBrowser::~SensorBrowser()
void SensorBrowser::disconnect()
{
- QPtrListIterator<HostInfo> it( mHostInfoList );
+ TQPtrListIterator<HostInfo> it( mHostInfoList );
for ( ; it.current(); ++it )
if ( (*it)->listViewItem()->isSelected() ) {
@@ -109,7 +109,7 @@ void SensorBrowser::disconnect()
}
}
-void SensorBrowser::hostReconfigured( const QString& )
+void SensorBrowser::hostReconfigured( const TQString& )
{
// TODO: not yet implemented.
}
@@ -125,10 +125,10 @@ void SensorBrowser::update()
KSGRD::SensorAgent* host;
for ( int i = 0 ; ( host = it.current() ); ++it, ++i ) {
- QString hostName = mSensorManager->hostName( host );
+ TQString hostName = mSensorManager->hostName( host );
HostItem* lvi = new HostItem( this, hostName, id, host );
- QPixmap pix = KGlobal::iconLoader()->loadIcon( "computer", KIcon::Desktop, KIcon::SizeSmall );
+ TQPixmap pix = KGlobal::iconLoader()->loadIcon( "computer", KIcon::Desktop, KIcon::SizeSmall );
lvi->setPixmap( 0, pix );
HostInfo* hostInfo = new HostInfo( id, host, hostName, lvi );
@@ -139,18 +139,18 @@ void SensorBrowser::update()
setMouseTracking( false );
}
-void SensorBrowser::newItemSelected( QListViewItem *item )
+void SensorBrowser::newItemSelected( TQListViewItem *item )
{
static bool showAnnoyingPopup = true;
if ( item && item->pixmap( 0 ) && showAnnoyingPopup)
{
showAnnoyingPopup = false;
KMessageBox::information( this, i18n( "Drag sensors to empty fields in a worksheet." ),
- QString::null, "ShowSBUseInfo" );
+ TQString::null, "ShowSBUseInfo" );
}
}
-void SensorBrowser::answerReceived( int id, const QString &answer )
+void SensorBrowser::answerReceived( int id, const TQString &answer )
{
/* An answer has the following format:
@@ -161,7 +161,7 @@ void SensorBrowser::answerReceived( int id, const QString &answer )
ps table
*/
- QPtrListIterator<HostInfo> it( mHostInfoList );
+ TQPtrListIterator<HostInfo> it( mHostInfoList );
/* Check if id is still valid. It can get obsolete by rapid calls
* of update() or when the sensor died. */
@@ -179,8 +179,8 @@ void SensorBrowser::answerReceived( int id, const QString &answer )
break;
KSGRD::SensorTokenizer words( lines[ i ], '\t' );
- QString sensorName = words[ 0 ];
- QString sensorType = words[ 1 ];
+ TQString sensorName = words[ 0 ];
+ TQString sensorType = words[ 1 ];
/* Calling update() a rapid sequence will create pending
* requests that do not get erased by calling
@@ -197,13 +197,13 @@ void SensorBrowser::answerReceived( int id, const QString &answer )
* depth of nodes. */
KSGRD::SensorTokenizer absolutePath( sensorName, '/' );
- QListViewItem* parent = (*it)->listViewItem();
+ TQListViewItem* parent = (*it)->listViewItem();
for ( uint j = 0; j < absolutePath.count(); ++j ) {
// Localize the sensor name part by part.
- QString name = KSGRD::SensorMgr->translateSensorPath( absolutePath[ j ] );
+ TQString name = KSGRD::SensorMgr->translateSensorPath( absolutePath[ j ] );
bool found = false;
- QListViewItem* sibling = parent->firstChild();
+ TQListViewItem* sibling = parent->firstChild();
while ( sibling && !found ) {
if (sibling->text( 0 ) == name ) {
// The node or sensor is already known.
@@ -212,9 +212,9 @@ void SensorBrowser::answerReceived( int id, const QString &answer )
sibling = sibling->nextSibling();
}
if ( !found ) {
- QListViewItem* lvi = new QListViewItem( parent, name );
+ TQListViewItem* lvi = new TQListViewItem( parent, name );
if ( j == absolutePath.count() - 1 ) {
- QPixmap pix = KGlobal::iconLoader()->loadIcon( "ksysguardd", KIcon::Desktop,
+ TQPixmap pix = KGlobal::iconLoader()->loadIcon( "ksysguardd", KIcon::Desktop,
KIcon::SizeSmall );
lvi->setPixmap( 0, pix );
lvi->setText( 1, KSGRD::SensorMgr->translateSensorType( sensorType ) );
@@ -234,7 +234,7 @@ void SensorBrowser::answerReceived( int id, const QString &answer )
repaintItem( (*it)->listViewItem() );
}
-void SensorBrowser::viewportMouseMoveEvent( QMouseEvent *e )
+void SensorBrowser::viewportMouseMoveEvent( TQMouseEvent *e )
{
/* setMouseTracking(false) seems to be broken. With current Qt
* mouse tracking cannot be turned off. So we have to check each event
@@ -243,12 +243,12 @@ void SensorBrowser::viewportMouseMoveEvent( QMouseEvent *e )
if ( !( e->state() & LeftButton ) )
return;
- QListViewItem* item = itemAt( e->pos() );
+ TQListViewItem* item = itemAt( e->pos() );
if ( !item ) // no item under cursor
return;
// Make sure that a sensor and not a node or hostname has been picked.
- QPtrListIterator<HostInfo> it( mHostInfoList );
+ TQPtrListIterator<HostInfo> it( mHostInfoList );
for ( ; it.current() && !(*it)->isRegistered( item ); ++it );
if ( !it.current() )
return;
@@ -261,64 +261,64 @@ void SensorBrowser::viewportMouseMoveEvent( QMouseEvent *e )
(*it)->sensorType( item ) + " " +
(*it)->sensorDescription( item );
- QDragObject* dragObject = new QTextDrag( mDragText, this );
+ TQDragObject* dragObject = new TQTextDrag( mDragText, this );
dragObject->dragCopy();
}
-QStringList SensorBrowser::listHosts()
+TQStringList SensorBrowser::listHosts()
{
- QStringList hostList;
+ TQStringList hostList;
- QPtrListIterator<HostInfo> it( mHostInfoList );
+ TQPtrListIterator<HostInfo> it( mHostInfoList );
for ( ; it.current(); ++it )
hostList.append( (*it)->hostName() );
return hostList;
}
-QStringList SensorBrowser::listSensors( const QString &hostName )
+TQStringList SensorBrowser::listSensors( const TQString &hostName )
{
- QPtrListIterator<HostInfo> it( mHostInfoList );
+ TQPtrListIterator<HostInfo> it( mHostInfoList );
for ( ; it.current(); ++it ) {
if ( (*it)->hostName() == hostName ) {
return (*it)->allSensorNames();
}
}
- return QStringList();
+ return TQStringList();
}
/**
Helper classes
*/
-SensorInfo::SensorInfo( QListViewItem *lvi, const QString &name,
- const QString &desc, const QString &type )
+SensorInfo::SensorInfo( TQListViewItem *lvi, const TQString &name,
+ const TQString &desc, const TQString &type )
: mLvi( lvi ), mName( name ), mDesc( desc ), mType( type )
{
}
-QListViewItem* SensorInfo::listViewItem() const
+TQListViewItem* SensorInfo::listViewItem() const
{
return mLvi;
}
-const QString& SensorInfo::name() const
+const TQString& SensorInfo::name() const
{
return mName;
}
-const QString& SensorInfo::type() const
+const TQString& SensorInfo::type() const
{
return mType;
}
-const QString& SensorInfo::description() const
+const TQString& SensorInfo::description() const
{
return mDesc;
}
HostInfo::HostInfo( int id, const KSGRD::SensorAgent *agent,
- const QString &name, QListViewItem *lvi )
+ const TQString &name, TQListViewItem *lvi )
: mId( id ), mSensorAgent( agent ), mHostName( name ), mLvi( lvi )
{
mSensorList.setAutoDelete( true );
@@ -334,64 +334,64 @@ const KSGRD::SensorAgent* HostInfo::sensorAgent() const
return mSensorAgent;
}
-const QString& HostInfo::hostName() const
+const TQString& HostInfo::hostName() const
{
return mHostName;
}
-QListViewItem* HostInfo::listViewItem() const
+TQListViewItem* HostInfo::listViewItem() const
{
return mLvi;
}
-const QString& HostInfo::sensorName( const QListViewItem *lvi ) const
+const TQString& HostInfo::sensorName( const TQListViewItem *lvi ) const
{
- QPtrListIterator<SensorInfo> it( mSensorList );
+ TQPtrListIterator<SensorInfo> it( mSensorList );
for ( ; it.current() && (*it)->listViewItem() != lvi; ++it );
Q_ASSERT( it.current() );
return ( (*it)->name() );
}
-QStringList HostInfo::allSensorNames() const
+TQStringList HostInfo::allSensorNames() const
{
- QStringList list;
+ TQStringList list;
- QPtrListIterator<SensorInfo> it( mSensorList );
+ TQPtrListIterator<SensorInfo> it( mSensorList );
for ( ; it.current(); ++it )
list.append( it.current()->name() );
return list;
}
-const QString& HostInfo::sensorType( const QListViewItem *lvi ) const
+const TQString& HostInfo::sensorType( const TQListViewItem *lvi ) const
{
- QPtrListIterator<SensorInfo> it( mSensorList );
+ TQPtrListIterator<SensorInfo> it( mSensorList );
for ( ; it.current() && (*it)->listViewItem() != lvi; ++it );
Q_ASSERT( it.current() );
return ( (*it)->type() );
}
-const QString& HostInfo::sensorDescription( const QListViewItem *lvi ) const
+const TQString& HostInfo::sensorDescription( const TQListViewItem *lvi ) const
{
- QPtrListIterator<SensorInfo> it( mSensorList );
+ TQPtrListIterator<SensorInfo> it( mSensorList );
for ( ; it.current() && (*it)->listViewItem() != lvi; ++it );
Q_ASSERT( it.current() );
return ( (*it)->description() );
}
-void HostInfo::addSensor( QListViewItem *lvi, const QString& name,
- const QString& desc, const QString& type )
+void HostInfo::addSensor( TQListViewItem *lvi, const TQString& name,
+ const TQString& desc, const TQString& type )
{
SensorInfo* info = new SensorInfo( lvi, name, desc, type );
mSensorList.append( info );
}
-bool HostInfo::isRegistered( const QString& name ) const
+bool HostInfo::isRegistered( const TQString& name ) const
{
- QPtrListIterator<SensorInfo> it( mSensorList );
+ TQPtrListIterator<SensorInfo> it( mSensorList );
for ( ; it.current(); ++it )
if ( (*it)->name() == name )
return true;
@@ -399,9 +399,9 @@ bool HostInfo::isRegistered( const QString& name ) const
return false;
}
-bool HostInfo::isRegistered( QListViewItem *lvi ) const
+bool HostInfo::isRegistered( TQListViewItem *lvi ) const
{
- QPtrListIterator<SensorInfo> it( mSensorList );
+ TQPtrListIterator<SensorInfo> it( mSensorList );
for ( ; it.current(); ++it )
if ( (*it)->listViewItem() == lvi )
return true;
diff --git a/ksysguard/gui/SensorBrowser.h b/ksysguard/gui/SensorBrowser.h
index 9021166d9..996ffeb39 100644
--- a/ksysguard/gui/SensorBrowser.h
+++ b/ksysguard/gui/SensorBrowser.h
@@ -24,7 +24,7 @@
#ifndef KSG_SENSORBROWSER_H
#define KSG_SENSORBROWSER_H
-#include <qdict.h>
+#include <tqdict.h>
#include <klistview.h>
#include <ksgrd/SensorClient.h>
@@ -48,28 +48,28 @@ class SensorBrowser : public KListView, public KSGRD::SensorClient
Q_OBJECT
public:
- SensorBrowser( QWidget* parent, KSGRD::SensorManager* sm, const char* name = 0 );
+ SensorBrowser( TQWidget* parent, KSGRD::SensorManager* sm, const char* name = 0 );
~SensorBrowser();
- QStringList listHosts();
- QStringList listSensors( const QString &hostName );
+ TQStringList listHosts();
+ TQStringList listSensors( const TQString &hostName );
public slots:
void disconnect();
- void hostReconfigured( const QString &hostName );
+ void hostReconfigured( const TQString &hostName );
void update();
- void newItemSelected( QListViewItem *item );
+ void newItemSelected( TQListViewItem *item );
protected:
- virtual void viewportMouseMoveEvent( QMouseEvent* );
+ virtual void viewportMouseMoveEvent( TQMouseEvent* );
private:
- void answerReceived( int id, const QString& );
+ void answerReceived( int id, const TQString& );
KSGRD::SensorManager* mSensorManager;
- QPtrList<HostInfo> mHostInfoList;
- QString mDragText;
+ TQPtrList<HostInfo> mHostInfoList;
+ TQString mDragText;
};
@@ -79,42 +79,42 @@ class SensorBrowser : public KListView, public KSGRD::SensorClient
class SensorInfo
{
public:
- SensorInfo( QListViewItem *lvi, const QString &name, const QString &desc,
- const QString &type );
+ SensorInfo( TQListViewItem *lvi, const TQString &name, const TQString &desc,
+ const TQString &type );
~SensorInfo() {}
/**
Returns a pointer to the list view item of the sensor.
*/
- QListViewItem* listViewItem() const;
+ TQListViewItem* listViewItem() const;
/**
Returns the name of the sensor.
*/
- const QString& name() const;
+ const TQString& name() const;
/**
Returns the description of the sensor.
*/
- const QString& description() const;
+ const TQString& description() const;
/**
Returns the type of the sensor.
*/
- const QString& type() const;
+ const TQString& type() const;
private:
- QListViewItem* mLvi;
- QString mName;
- QString mDesc;
- QString mType;
+ TQListViewItem* mLvi;
+ TQString mName;
+ TQString mDesc;
+ TQString mType;
};
class HostInfo
{
public:
- HostInfo( int id, const KSGRD::SensorAgent *agent, const QString &name,
- QListViewItem *lvi );
+ HostInfo( int id, const KSGRD::SensorAgent *agent, const TQString &name,
+ TQListViewItem *lvi );
~HostInfo() { }
/**
@@ -130,32 +130,32 @@ class HostInfo
/**
Returns the name of the host.
*/
- const QString& hostName() const;
+ const TQString& hostName() const;
/**
Returns the a pointer to the list view item of the host.
*/
- QListViewItem* listViewItem() const;
+ TQListViewItem* listViewItem() const;
/**
Returns the sensor name of a special list view item.
*/
- const QString& sensorName( const QListViewItem *lvi ) const;
+ const TQString& sensorName( const TQListViewItem *lvi ) const;
/**
Returns all sensor names of the host.
*/
- QStringList allSensorNames() const;
+ TQStringList allSensorNames() const;
/**
Returns the type of a special list view item.
*/
- const QString& sensorType( const QListViewItem *lvi ) const;
+ const TQString& sensorType( const TQListViewItem *lvi ) const;
/**
Returns the description of a special list view item.
*/
- const QString& sensorDescription( const QListViewItem *lvi ) const;
+ const TQString& sensorDescription( const TQListViewItem *lvi ) const;
/**
Adds a new Sensor to the host.
@@ -165,29 +165,29 @@ class HostInfo
@param desc A description.
@param type The type of the sensor.
*/
- void addSensor( QListViewItem *lvi, const QString& name,
- const QString& desc, const QString& type );
+ void addSensor( TQListViewItem *lvi, const TQString& name,
+ const TQString& desc, const TQString& type );
/**
Returns whether the sensor with @ref name
is registered at the host.
*/
- bool isRegistered( const QString& name ) const;
+ bool isRegistered( const TQString& name ) const;
/**
Returns whether the sensor with @ref lvi
is registered at the host.
*/
- bool isRegistered( QListViewItem *lvi ) const;
+ bool isRegistered( TQListViewItem *lvi ) const;
private:
int mId;
const KSGRD::SensorAgent* mSensorAgent;
- const QString mHostName;
- QListViewItem* mLvi;
+ const TQString mHostName;
+ TQListViewItem* mLvi;
- QPtrList<SensorInfo> mSensorList;
+ TQPtrList<SensorInfo> mSensorList;
};
#endif
diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cc b/ksysguard/gui/SensorDisplayLib/BarGraph.cc
index f6dc741cb..8d2b5e302 100644
--- a/ksysguard/gui/SensorDisplayLib/BarGraph.cc
+++ b/ksysguard/gui/SensorDisplayLib/BarGraph.cc
@@ -24,7 +24,7 @@
#include <assert.h>
#include <string.h>
-#include <qpainter.h>
+#include <tqpainter.h>
#include <kdebug.h>
#include <kiconloader.h>
@@ -33,8 +33,8 @@
#include "BarGraph.h"
-BarGraph::BarGraph( QWidget *parent, const char *name )
- : QWidget( parent, name )
+BarGraph::BarGraph( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
// paintEvent covers whole widget so we use no background to avoid flicker
setBackgroundMode( NoBackground );
@@ -52,15 +52,15 @@ BarGraph::BarGraph( QWidget *parent, const char *name )
// Anything smaller than this does not make sense.
setMinimumSize( 16, 16 );
- setSizePolicy( QSizePolicy( QSizePolicy::Expanding,
- QSizePolicy::Expanding, false ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+ TQSizePolicy::Expanding, false ) );
}
BarGraph::~BarGraph()
{
}
-bool BarGraph::addBar( const QString &footer )
+bool BarGraph::addBar( const TQString &footer )
{
samples.resize( bars + 1 );
samples[ bars++ ] = 0.0;
@@ -84,7 +84,7 @@ bool BarGraph::removeBar( uint idx )
return true;
}
-void BarGraph::updateSamples( const QMemArray<double> &newSamples )
+void BarGraph::updateSamples( const TQMemArray<double> &newSamples )
{
samples = newSamples;
update();
@@ -96,22 +96,22 @@ void BarGraph::changeRange( double min, double max )
maxValue = max;
}
-void BarGraph::paintEvent( QPaintEvent* )
+void BarGraph::paintEvent( TQPaintEvent* )
{
int w = width();
int h = height();
- QPixmap pm( w, h );
- QPainter p;
+ TQPixmap pm( w, h );
+ TQPainter p;
p.begin( &pm, this );
- p.setFont( QFont( p.font().family(), fontSize ) );
- QFontMetrics fm( p.font() );
+ p.setFont( TQFont( p.font().family(), fontSize ) );
+ TQFontMetrics fm( p.font() );
pm.fill( backgroundColor );
/* Draw white line along the bottom and the right side of the
* widget to create a 3D like look. */
- p.setPen( QColor( colorGroup().light() ) );
+ p.setPen( TQColor( colorGroup().light() ) );
p.drawLine( 0, h - 1, w - 1, h - 1 );
p.drawLine( w - 1, 0, w - 1, h - 1 );
@@ -165,7 +165,7 @@ void BarGraph::paintEvent( QPaintEvent* )
footers[ b ] );
p.drawText( b * barWidth + 3, h - fm.lineSpacing() - 2,
barWidth - 2 * 3, fm.lineSpacing(), Qt::AlignCenter,
- QString( "%1" ).arg( samples[ b ] ) );
+ TQString( "%1" ).arg( samples[ b ] ) );
}
}
}
diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.h b/ksysguard/gui/SensorDisplayLib/BarGraph.h
index aca20c629..744faf777 100644
--- a/ksysguard/gui/SensorDisplayLib/BarGraph.h
+++ b/ksysguard/gui/SensorDisplayLib/BarGraph.h
@@ -24,9 +24,9 @@
#ifndef KSG_BARGRAPH_H
#define KSG_BARGRAPH_H
-#include <qmemarray.h>
-#include <qptrvector.h>
-#include <qwidget.h>
+#include <tqmemarray.h>
+#include <tqptrvector.h>
+#include <tqwidget.h>
class BarGraph : public QWidget
{
@@ -35,13 +35,13 @@ class BarGraph : public QWidget
friend class DancingBars;
public:
- BarGraph( QWidget *parent, const char *name = 0 );
+ BarGraph( TQWidget *parent, const char *name = 0 );
~BarGraph();
- bool addBar( const QString &footer );
+ bool addBar( const TQString &footer );
bool removeBar( uint idx );
- void updateSamples( const QMemArray<double> &newSamples );
+ void updateSamples( const TQMemArray<double> &newSamples );
double getMin() const
{
@@ -72,7 +72,7 @@ class BarGraph : public QWidget
void changeRange( double min, double max );
protected:
- virtual void paintEvent( QPaintEvent* );
+ virtual void paintEvent( TQPaintEvent* );
private:
double minValue;
@@ -82,12 +82,12 @@ class BarGraph : public QWidget
double upperLimit;
bool upperLimitActive;
bool autoRange;
- QMemArray<double> samples;
- QStringList footers;
+ TQMemArray<double> samples;
+ TQStringList footers;
uint bars;
- QColor normalColor;
- QColor alarmColor;
- QColor backgroundColor;
+ TQColor normalColor;
+ TQColor alarmColor;
+ TQColor backgroundColor;
int fontSize;
};
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cc b/ksysguard/gui/SensorDisplayLib/DancingBars.cc
index 48c360713..3917fc86b 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBars.cc
+++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cc
@@ -21,13 +21,13 @@
*/
-#include <qcheckbox.h>
-#include <qdom.h>
-#include <qlineedit.h>
-#include <qlistview.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qtooltip.h>
+#include <tqcheckbox.h>
+#include <tqdom.h>
+#include <tqlineedit.h>
+#include <tqlistview.h>
+#include <tqpushbutton.h>
+#include <tqspinbox.h>
+#include <tqtooltip.h>
#include <kdebug.h>
#include <klocale.h>
@@ -40,12 +40,12 @@
#include "DancingBars.h"
-DancingBars::DancingBars( QWidget *parent, const char *name, const QString &title,
+DancingBars::DancingBars( TQWidget *parent, const char *name, const TQString &title,
int, int, bool noFrame_, bool isApplet )
: KSGRD::SensorDisplay( parent, name, title, noFrame_, isApplet )
{
mBars = 0;
- mFlags = QBitArray(100);
+ mFlags = TQBitArray(100);
mFlags.fill( false );
if ( noFrame() )
@@ -91,9 +91,9 @@ void DancingBars::configureSettings()
mSettingsDialog->setBackgroundColor( mPlotter->backgroundColor );
mSettingsDialog->setFontSize( mPlotter->fontSize );
- QValueList< QStringList > list;
+ TQValueList< TQStringList > list;
for ( uint i = mBars - 1; i < mBars; i-- ) {
- QStringList entry;
+ TQStringList entry;
entry << sensors().at( i )->hostName();
entry << KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() );
entry << mPlotter->footers[ i ];
@@ -104,7 +104,7 @@ void DancingBars::configureSettings()
}
mSettingsDialog->setSensors( list );
- connect( mSettingsDialog, SIGNAL( applyClicked() ), SLOT( applySettings() ) );
+ connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) );
if ( mSettingsDialog->exec() )
applySettings();
@@ -129,8 +129,8 @@ void DancingBars::applySettings()
mPlotter->backgroundColor = mSettingsDialog->backgroundColor();
mPlotter->fontSize = mSettingsDialog->fontSize();
- QValueList< QStringList > list = mSettingsDialog->sensors();
- QValueList< QStringList >::Iterator it;
+ TQValueList< TQStringList > list = mSettingsDialog->sensors();
+ TQValueList< TQStringList >::Iterator it;
for ( uint i = 0; i < sensors().count(); i++ ) {
bool found = false;
@@ -162,8 +162,8 @@ void DancingBars::applyStyle()
setModified( true );
}
-bool DancingBars::addSensor( const QString &hostName, const QString &name,
- const QString &type, const QString &title )
+bool DancingBars::addSensor( const TQString &hostName, const TQString &name,
+ const TQString &type, const TQString &title )
{
if ( type != "integer" && type != "float" )
return false;
@@ -182,14 +182,14 @@ bool DancingBars::addSensor( const QString &hostName, const QString &name,
++mBars;
mSampleBuffer.resize( mBars );
- QString tooltip;
+ TQString tooltip;
for ( uint i = 0; i < mBars; ++i ) {
- tooltip += QString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" )
+ tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" )
.arg( sensors().at( i )->hostName() )
.arg( sensors().at( i )->name() );
}
- QToolTip::remove( mPlotter );
- QToolTip::add( mPlotter, tooltip );
+ TQToolTip::remove( mPlotter );
+ TQToolTip::add( mPlotter, tooltip );
return true;
}
@@ -206,24 +206,24 @@ bool DancingBars::removeSensor( uint pos )
mBars--;
KSGRD::SensorDisplay::removeSensor( pos );
- QString tooltip;
+ TQString tooltip;
for ( uint i = 0; i < mBars; ++i ) {
- tooltip += QString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" )
+ tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" )
.arg( sensors().at( i )->hostName() )
.arg( sensors().at( i )->name() );
}
- QToolTip::remove( mPlotter );
- QToolTip::add( mPlotter, tooltip );
+ TQToolTip::remove( mPlotter );
+ TQToolTip::add( mPlotter, tooltip );
return true;
}
-void DancingBars::updateSamples( const QMemArray<double> &samples )
+void DancingBars::updateSamples( const TQMemArray<double> &samples )
{
mPlotter->updateSamples( samples );
}
-void DancingBars::resizeEvent( QResizeEvent* )
+void DancingBars::resizeEvent( TQResizeEvent* )
{
if ( noFrame() )
mPlotter->setGeometry( 0, 0, width(), height() );
@@ -231,7 +231,7 @@ void DancingBars::resizeEvent( QResizeEvent* )
frame()->setGeometry( 0, 0, width(), height() );
}
-QSize DancingBars::sizeHint()
+TQSize DancingBars::sizeHint()
{
if ( noFrame() )
return ( mPlotter->sizeHint() );
@@ -239,7 +239,7 @@ QSize DancingBars::sizeHint()
return ( frame()->sizeHint() );
}
-void DancingBars::answerReceived( int id, const QString &answer )
+void DancingBars::answerReceived( int id, const TQString &answer )
{
/* We received something, so the sensor is probably ok. */
sensorError( id, false );
@@ -276,7 +276,7 @@ void DancingBars::answerReceived( int id, const QString &answer )
}
}
-bool DancingBars::restoreSettings( QDomElement &element )
+bool DancingBars::restoreSettings( TQDomElement &element )
{
SensorDisplay::restoreSettings( element );
@@ -294,12 +294,12 @@ bool DancingBars::restoreSettings( QDomElement &element )
KSGRD::Style->alarmColor() );
mPlotter->backgroundColor = restoreColor( element, "backgroundColor",
KSGRD::Style->backgroundColor() );
- mPlotter->fontSize = element.attribute( "fontSize", QString( "%1" ).arg(
+ mPlotter->fontSize = element.attribute( "fontSize", TQString( "%1" ).arg(
KSGRD::Style->fontSize() ) ).toInt();
- QDomNodeList dnList = element.elementsByTagName( "beam" );
+ TQDomNodeList dnList = element.elementsByTagName( "beam" );
for ( uint i = 0; i < dnList.count(); ++i ) {
- QDomElement el = dnList.item( i ).toElement();
+ TQDomElement el = dnList.item( i ).toElement();
addSensor( el.attribute( "hostName" ), el.attribute( "sensorName" ),
( el.attribute( "sensorType" ).isEmpty() ? "integer" :
el.attribute( "sensorType" ) ), el.attribute( "sensorDescr" ) );
@@ -310,7 +310,7 @@ bool DancingBars::restoreSettings( QDomElement &element )
return true;
}
-bool DancingBars::saveSettings( QDomDocument &doc, QDomElement &element,
+bool DancingBars::saveSettings( TQDomDocument &doc, TQDomElement &element,
bool save )
{
element.setAttribute( "min", mPlotter->getMin() );
@@ -329,7 +329,7 @@ bool DancingBars::saveSettings( QDomDocument &doc, QDomElement &element,
element.setAttribute( "fontSize", mPlotter->fontSize );
for ( uint i = 0; i < mBars; ++i ) {
- QDomElement beam = doc.createElement( "beam" );
+ TQDomElement beam = doc.createElement( "beam" );
element.appendChild( beam );
beam.setAttribute( "hostName", sensors().at( i )->hostName() );
beam.setAttribute( "sensorName", sensors().at( i )->name() );
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.h b/ksysguard/gui/SensorDisplayLib/DancingBars.h
index ad671dfe7..7fa2c7456 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBars.h
+++ b/ksysguard/gui/SensorDisplayLib/DancingBars.h
@@ -25,7 +25,7 @@
#define KSG_DANCINGBARS_H
#include <SensorDisplay.h>
-#include <qbitarray.h>
+#include <tqbitarray.h>
class KIntNumInput;
@@ -41,25 +41,25 @@ class DancingBars : public KSGRD::SensorDisplay
Q_OBJECT
public:
- DancingBars( QWidget *parent = 0, const char *name = 0,
- const QString &title = QString::null, int min = 0,
+ DancingBars( TQWidget *parent = 0, const char *name = 0,
+ const TQString &title = TQString::null, int min = 0,
int max = 100, bool noFrame = false, bool isApplet = false );
virtual ~DancingBars();
void configureSettings();
- bool addSensor( const QString &hostName, const QString &name,
- const QString &type, const QString &title );
+ bool addSensor( const TQString &hostName, const TQString &name,
+ const TQString &type, const TQString &title );
bool removeSensor( uint pos );
- void updateSamples( const QMemArray<double> &samples );
+ void updateSamples( const TQMemArray<double> &samples );
- virtual QSize sizeHint();
+ virtual TQSize sizeHint();
- virtual void answerReceived( int id, const QString &answer );
+ virtual void answerReceived( int id, const TQString &answer );
- bool restoreSettings( QDomElement& );
- bool saveSettings( QDomDocument&, QDomElement&, bool save = true );
+ bool restoreSettings( TQDomElement& );
+ bool saveSettings( TQDomDocument&, TQDomElement&, bool save = true );
virtual bool hasSettingsDialog() const;
@@ -68,7 +68,7 @@ class DancingBars : public KSGRD::SensorDisplay
virtual void applyStyle();
protected:
- virtual void resizeEvent( QResizeEvent* );
+ virtual void resizeEvent( TQResizeEvent* );
private:
uint mBars;
@@ -83,8 +83,8 @@ class DancingBars : public KSGRD::SensorDisplay
received. The flags variable is used to ensure that all samples have
been received.
*/
- QMemArray<double> mSampleBuffer;
- QBitArray mFlags;
+ TQMemArray<double> mSampleBuffer;
+ TQBitArray mFlags;
};
#endif
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
index 15e6b6ec3..1b97cc25f 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
@@ -29,50 +29,50 @@
#include <klocale.h>
#include <knuminput.h>
-#include <qcheckbox.h>
-#include <qframe.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqframe.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqwhatsthis.h>
#include "DancingBarsSettings.h"
-DancingBarsSettings::DancingBarsSettings( QWidget* parent, const char* name )
+DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
: KDialogBase( Tabbed, i18n( "Edit BarGraph Preferences" ),
Ok | Apply | Cancel, Ok, parent, name, true, true )
{
// Range page
- QFrame *page = addPage( i18n( "Range" ) );
- QGridLayout *pageLayout = new QGridLayout( page, 3, 1, 0, spacingHint() );
+ TQFrame *page = addPage( i18n( "Range" ) );
+ TQGridLayout *pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() );
- QGroupBox *groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Title" ), page );
- QGridLayout *boxLayout = new QGridLayout( groupBox->layout(), 1, 1 );
+ TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page );
+ TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 1, 1 );
mTitle = new KLineEdit( groupBox );
- QWhatsThis::add( mTitle, i18n( "Enter the title of the display here." ) );
+ TQWhatsThis::add( mTitle, i18n( "Enter the title of the display here." ) );
boxLayout->addWidget( mTitle, 0, 0 );
pageLayout->addWidget( groupBox, 0, 0 );
- groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Display Range" ), page );
- boxLayout = new QGridLayout( groupBox->layout(), 1, 5 );
+ groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Display Range" ), page );
+ boxLayout = new TQGridLayout( groupBox->layout(), 1, 5 );
boxLayout->setColStretch( 2, 1 );
- QLabel *label = new QLabel( i18n( "Minimum value:" ), groupBox );
+ TQLabel *label = new TQLabel( i18n( "Minimum value:" ), groupBox );
boxLayout->addWidget( label, 0, 0 );
mMinValue = new KDoubleSpinBox( 0, 100, 0.5, 0, 2, groupBox );
- QWhatsThis::add( mMinValue, i18n( "Enter the minimum value for the display here. If both values are 0, automatic range detection is enabled." ) );
+ TQWhatsThis::add( mMinValue, i18n( "Enter the minimum value for the display here. If both values are 0, automatic range detection is enabled." ) );
boxLayout->addWidget( mMinValue, 0, 1 );
label->setBuddy( mMinValue );
- label = new QLabel( i18n( "Maximum value:" ), groupBox );
+ label = new TQLabel( i18n( "Maximum value:" ), groupBox );
boxLayout->addWidget( label, 0, 3 );
mMaxValue = new KDoubleSpinBox( 0, 10000, 0.5, 100, 2, groupBox );
- QWhatsThis::add( mMaxValue, i18n( "Enter the maximum value for the display here. If both values are 0, automatic range detection is enabled." ) );
+ TQWhatsThis::add( mMaxValue, i18n( "Enter the maximum value for the display here. If both values are 0, automatic range detection is enabled." ) );
boxLayout->addWidget( mMaxValue, 0, 4 );
label->setBuddy( mMaxValue );
@@ -82,17 +82,17 @@ DancingBarsSettings::DancingBarsSettings( QWidget* parent, const char* name )
// Alarm page
page = addPage( i18n( "Alarms" ) );
- pageLayout = new QGridLayout( page, 3, 1, 0, spacingHint() );
+ pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() );
- groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Alarm for Minimum Value" ), page );
- boxLayout = new QGridLayout( groupBox->layout(), 1, 4 );
+ groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Minimum Value" ), page );
+ boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 );
boxLayout->setColStretch( 1, 1 );
- mUseLowerLimit = new QCheckBox( i18n( "Enable alarm" ), groupBox );
- QWhatsThis::add( mUseLowerLimit, i18n( "Enable the minimum value alarm." ) );
+ mUseLowerLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox );
+ TQWhatsThis::add( mUseLowerLimit, i18n( "Enable the minimum value alarm." ) );
boxLayout->addWidget( mUseLowerLimit, 0, 0 );
- label = new QLabel( i18n( "Lower limit:" ), groupBox );
+ label = new TQLabel( i18n( "Lower limit:" ), groupBox );
boxLayout->addWidget( label, 0, 2 );
mLowerLimit = new KDoubleSpinBox( 0, 100, 0.5, 0, 2, groupBox );
@@ -102,15 +102,15 @@ DancingBarsSettings::DancingBarsSettings( QWidget* parent, const char* name )
pageLayout->addWidget( groupBox, 0, 0 );
- groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Alarm for Maximum Value" ), page );
- boxLayout = new QGridLayout( groupBox->layout(), 1, 4 );
+ groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Maximum Value" ), page );
+ boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 );
boxLayout->setColStretch( 1, 1 );
- mUseUpperLimit = new QCheckBox( i18n( "Enable alarm" ), groupBox );
- QWhatsThis::add( mUseUpperLimit, i18n( "Enable the maximum value alarm." ) );
+ mUseUpperLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox );
+ TQWhatsThis::add( mUseUpperLimit, i18n( "Enable the maximum value alarm." ) );
boxLayout->addWidget( mUseUpperLimit, 0, 0 );
- label = new QLabel( i18n( "Upper limit:" ), groupBox );
+ label = new TQLabel( i18n( "Upper limit:" ), groupBox );
boxLayout->addWidget( label, 0, 2 );
mUpperLimit = new KDoubleSpinBox( 0, 100, 0.5, 0, 2, groupBox );
@@ -124,34 +124,34 @@ DancingBarsSettings::DancingBarsSettings( QWidget* parent, const char* name )
// Look page
page = addPage( i18n( "Look" ) );
- pageLayout = new QGridLayout( page, 5, 2, 0, spacingHint() );
+ pageLayout = new TQGridLayout( page, 5, 2, 0, spacingHint() );
- label = new QLabel( i18n( "Normal bar color:" ), page );
+ label = new TQLabel( i18n( "Normal bar color:" ), page );
pageLayout->addWidget( label, 0, 0 );
mForegroundColor = new KColorButton( page );
pageLayout->addWidget( mForegroundColor, 0, 1 );
label->setBuddy( mForegroundColor );
- label = new QLabel( i18n( "Out-of-range color:" ), page );
+ label = new TQLabel( i18n( "Out-of-range color:" ), page );
pageLayout->addWidget( label, 1, 0 );
mAlarmColor = new KColorButton( page );
pageLayout->addWidget( mAlarmColor, 1, 1 );
label->setBuddy( mAlarmColor );
- label = new QLabel( i18n( "Background color:" ), page );
+ label = new TQLabel( i18n( "Background color:" ), page );
pageLayout->addWidget( label, 2, 0 );
mBackgroundColor = new KColorButton( page );
pageLayout->addWidget( mBackgroundColor, 2, 1 );
label->setBuddy( mBackgroundColor );
- label = new QLabel( i18n( "Font size:" ), page );
+ label = new TQLabel( i18n( "Font size:" ), page );
pageLayout->addWidget( label, 3, 0 );
mFontSize = new KIntNumInput( 9, page );
- QWhatsThis::add( mFontSize, i18n( "This determines the size of the font used to print a label underneath the bars. Bars are automatically suppressed if text becomes too large, so it is advisable to use a small font size here." ) );
+ TQWhatsThis::add( mFontSize, i18n( "This determines the size of the font used to print a label underneath the bars. Bars are automatically suppressed if text becomes too large, so it is advisable to use a small font size here." ) );
pageLayout->addWidget( mFontSize, 3, 1 );
label->setBuddy( mFontSize );
@@ -159,7 +159,7 @@ DancingBarsSettings::DancingBarsSettings( QWidget* parent, const char* name )
// Sensor page
page = addPage( i18n( "Sensors" ) );
- pageLayout = new QGridLayout( page, 3, 2, 0, spacingHint() );
+ pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() );
pageLayout->setRowStretch( 2, 1 );
mSensorView = new KListView( page );
@@ -171,25 +171,25 @@ DancingBarsSettings::DancingBarsSettings( QWidget* parent, const char* name )
mSensorView->setAllColumnsShowFocus( true );
pageLayout->addMultiCellWidget( mSensorView, 0, 2, 0, 0 );
- mEditButton = new QPushButton( i18n( "Edit..." ), page );
+ mEditButton = new TQPushButton( i18n( "Edit..." ), page );
mEditButton->setEnabled( false );
- QWhatsThis::add( mEditButton, i18n( "Push this button to configure the label." ) );
+ TQWhatsThis::add( mEditButton, i18n( "Push this button to configure the label." ) );
pageLayout->addWidget( mEditButton, 0, 1 );
- mRemoveButton = new QPushButton( i18n( "Delete" ), page );
+ mRemoveButton = new TQPushButton( i18n( "Delete" ), page );
mRemoveButton->setEnabled( false );
- QWhatsThis::add( mRemoveButton, i18n( "Push this button to delete the sensor." ) );
+ TQWhatsThis::add( mRemoveButton, i18n( "Push this button to delete the sensor." ) );
pageLayout->addWidget( mRemoveButton, 1, 1 );
- connect( mUseLowerLimit, SIGNAL( toggled( bool ) ),
- mLowerLimit, SLOT( setEnabled( bool ) ) );
- connect( mUseUpperLimit, SIGNAL( toggled( bool ) ),
- mUpperLimit, SLOT( setEnabled( bool ) ) );
+ connect( mUseLowerLimit, TQT_SIGNAL( toggled( bool ) ),
+ mLowerLimit, TQT_SLOT( setEnabled( bool ) ) );
+ connect( mUseUpperLimit, TQT_SIGNAL( toggled( bool ) ),
+ mUpperLimit, TQT_SLOT( setEnabled( bool ) ) );
- connect( mSensorView, SIGNAL( selectionChanged( QListViewItem* ) ),
- SLOT( selectionChanged( QListViewItem* ) ) );
- connect( mEditButton, SIGNAL( clicked() ), SLOT( editSensor() ) );
- connect( mRemoveButton, SIGNAL( clicked() ), SLOT( removeSensor() ) );
+ connect( mSensorView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
+ TQT_SLOT( selectionChanged( TQListViewItem* ) ) );
+ connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensor() ) );
+ connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSensor() ) );
KAcceleratorManager::manage( this );
@@ -200,12 +200,12 @@ DancingBarsSettings::~DancingBarsSettings()
{
}
-void DancingBarsSettings::setTitle( const QString& title )
+void DancingBarsSettings::setTitle( const TQString& title )
{
mTitle->setText( title );
}
-QString DancingBarsSettings::title() const
+TQString DancingBarsSettings::title() const
{
return mTitle->text();
}
@@ -270,32 +270,32 @@ double DancingBarsSettings::upperLimit() const
return mUpperLimit->value();
}
-void DancingBarsSettings::setForegroundColor( const QColor &color )
+void DancingBarsSettings::setForegroundColor( const TQColor &color )
{
mForegroundColor->setColor( color );
}
-QColor DancingBarsSettings::foregroundColor() const
+TQColor DancingBarsSettings::foregroundColor() const
{
return mForegroundColor->color();
}
-void DancingBarsSettings::setAlarmColor( const QColor &color )
+void DancingBarsSettings::setAlarmColor( const TQColor &color )
{
mAlarmColor->setColor( color );
}
-QColor DancingBarsSettings::alarmColor() const
+TQColor DancingBarsSettings::alarmColor() const
{
return mAlarmColor->color();
}
-void DancingBarsSettings::setBackgroundColor( const QColor &color )
+void DancingBarsSettings::setBackgroundColor( const TQColor &color )
{
mBackgroundColor->setColor( color );
}
-QColor DancingBarsSettings::backgroundColor() const
+TQColor DancingBarsSettings::backgroundColor() const
{
return mBackgroundColor->color();
}
@@ -310,13 +310,13 @@ int DancingBarsSettings::fontSize() const
return mFontSize->value();
}
-void DancingBarsSettings::setSensors( const QValueList< QStringList > &list )
+void DancingBarsSettings::setSensors( const TQValueList< TQStringList > &list )
{
mSensorView->clear();
- QValueList< QStringList >::ConstIterator it;
+ TQValueList< TQStringList >::ConstIterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
- new QListViewItem( mSensorView,
+ new TQListViewItem( mSensorView,
(*it)[ 0 ], // host name
(*it)[ 1 ], // sensor name
(*it)[ 2 ], // footer title
@@ -325,13 +325,13 @@ void DancingBarsSettings::setSensors( const QValueList< QStringList > &list )
}
}
-QValueList< QStringList > DancingBarsSettings::sensors() const
+TQValueList< TQStringList > DancingBarsSettings::sensors() const
{
- QValueList< QStringList > list;
+ TQValueList< TQStringList > list;
- QListViewItemIterator it( mSensorView );
+ TQListViewItemIterator it( mSensorView );
while ( it.current() && !it.current()->text( 0 ).isEmpty() ) {
- QStringList entry;
+ TQStringList entry;
entry << it.current()->text( 0 );
entry << it.current()->text( 1 );
entry << it.current()->text( 2 );
@@ -347,13 +347,13 @@ QValueList< QStringList > DancingBarsSettings::sensors() const
void DancingBarsSettings::editSensor()
{
- QListViewItem *lvi = mSensorView->currentItem();
+ TQListViewItem *lvi = mSensorView->currentItem();
if ( !lvi )
return;
bool ok;
- QString str = KInputDialog::getText( i18n( "Label of Bar Graph" ),
+ TQString str = KInputDialog::getText( i18n( "Label of Bar Graph" ),
i18n( "Enter new label:" ), lvi->text( 2 ), &ok, this );
if ( ok )
lvi->setText( 2, str );
@@ -361,7 +361,7 @@ void DancingBarsSettings::editSensor()
void DancingBarsSettings::removeSensor()
{
- QListViewItem *lvi = mSensorView->currentItem();
+ TQListViewItem *lvi = mSensorView->currentItem();
if ( lvi ) {
/* Before we delete the currently selected item, we determine a
@@ -369,7 +369,7 @@ void DancingBarsSettings::removeSensor()
* items can be deleted without forcing the user to select a new
* item between the deletes. If all items are deleted, the buttons
* are disabled again. */
- QListViewItem* newSelected = 0;
+ TQListViewItem* newSelected = 0;
if ( lvi->itemBelow() ) {
lvi->itemBelow()->setSelected( true );
newSelected = lvi->itemBelow();
@@ -386,7 +386,7 @@ void DancingBarsSettings::removeSensor()
}
}
-void DancingBarsSettings::selectionChanged( QListViewItem* lvi )
+void DancingBarsSettings::selectionChanged( TQListViewItem* lvi )
{
bool state = ( lvi != 0 );
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h
index 12e559dc0..996413535 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h
@@ -41,11 +41,11 @@ class DancingBarsSettings : public KDialogBase
Q_OBJECT
public:
- DancingBarsSettings( QWidget* parent = 0, const char* name = 0 );
+ DancingBarsSettings( TQWidget* parent = 0, const char* name = 0 );
~DancingBarsSettings();
- void setTitle( const QString& title );
- QString title() const;
+ void setTitle( const TQString& title );
+ TQString title() const;
void setMinValue( double min );
double minValue() const;
@@ -65,25 +65,25 @@ class DancingBarsSettings : public KDialogBase
void setUpperLimit( double limit );
double upperLimit() const;
- void setForegroundColor( const QColor &color );
- QColor foregroundColor() const;
+ void setForegroundColor( const TQColor &color );
+ TQColor foregroundColor() const;
- void setAlarmColor( const QColor &color );
- QColor alarmColor() const;
+ void setAlarmColor( const TQColor &color );
+ TQColor alarmColor() const;
- void setBackgroundColor( const QColor &color );
- QColor backgroundColor() const;
+ void setBackgroundColor( const TQColor &color );
+ TQColor backgroundColor() const;
void setFontSize( int size );
int fontSize() const;
- void setSensors( const QValueList< QStringList > &list );
- QValueList< QStringList > sensors() const;
+ void setSensors( const TQValueList< TQStringList > &list );
+ TQValueList< TQStringList > sensors() const;
private slots:
void editSensor();
void removeSensor();
- void selectionChanged( QListViewItem* );
+ void selectionChanged( TQListViewItem* );
private:
KColorButton *mForegroundColor;
@@ -97,10 +97,10 @@ class DancingBarsSettings : public KDialogBase
KListView *mSensorView;
KIntNumInput *mFontSize;
- QCheckBox *mUseLowerLimit;
- QCheckBox *mUseUpperLimit;
- QPushButton *mEditButton;
- QPushButton *mRemoveButton;
+ TQCheckBox *mUseLowerLimit;
+ TQCheckBox *mUseUpperLimit;
+ TQPushButton *mEditButton;
+ TQPushButton *mRemoveButton;
};
#endif
diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc
index a4ea6afb4..2e499e852 100644
--- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc
+++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc
@@ -24,35 +24,35 @@
#include <klocale.h>
#include <ksgrd/SensorManager.h>
-#include <qwhatsthis.h>
+#include <tqwhatsthis.h>
#include "DummyDisplay.h"
-DummyDisplay::DummyDisplay( QWidget* parent, const char* name,
- const QString&, double, double )
+DummyDisplay::DummyDisplay( TQWidget* parent, const char* name,
+ const TQString&, double, double )
: KSGRD::SensorDisplay( parent, name, i18n( "Drop Sensor Here" ) )
{
setMinimumSize( 16, 16 );
- QWhatsThis::add( this, i18n(
+ TQWhatsThis::add( this, i18n(
"This is an empty space in a worksheet. Drag a sensor from "
"the Sensor Browser and drop it here. A sensor display will "
"appear that allows you to monitor the values of the sensor "
"over time." ) );
}
-void DummyDisplay::resizeEvent( QResizeEvent* )
+void DummyDisplay::resizeEvent( TQResizeEvent* )
{
frame()->setGeometry( 0, 0, width(), height() );
}
-bool DummyDisplay::eventFilter( QObject* object, QEvent* event )
+bool DummyDisplay::eventFilter( TQObject* object, TQEvent* event )
{
- if ( event->type() == QEvent::MouseButtonRelease &&
- ( (QMouseEvent*)event)->button() == LeftButton )
+ if ( event->type() == TQEvent::MouseButtonRelease &&
+ ( (TQMouseEvent*)event)->button() == LeftButton )
setFocus();
- return QWidget::eventFilter( object, event );
+ return TQWidget::eventFilter( object, event );
}
#include "DummyDisplay.moc"
diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.h b/ksysguard/gui/SensorDisplayLib/DummyDisplay.h
index 53098fa0c..cd00a6fd6 100644
--- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.h
+++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.h
@@ -31,14 +31,14 @@ class DummyDisplay : public KSGRD::SensorDisplay
Q_OBJECT
public:
- DummyDisplay( QWidget* parent = 0, const char* name = 0,
- const QString& = QString::null, double min = 0,
+ DummyDisplay( TQWidget* parent = 0, const char* name = 0,
+ const TQString& = TQString::null, double min = 0,
double max = 0 );
virtual ~DummyDisplay() {}
- void resizeEvent( QResizeEvent* );
+ void resizeEvent( TQResizeEvent* );
- virtual bool eventFilter( QObject*, QEvent* );
+ virtual bool eventFilter( TQObject*, TQEvent* );
};
#endif
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
index 361ce16e7..0434877bb 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
@@ -21,9 +21,9 @@
*/
-#include <qdom.h>
-#include <qimage.h>
-#include <qtooltip.h>
+#include <tqdom.h>
+#include <tqimage.h>
+#include <tqtooltip.h>
#include <kdebug.h>
#include <klocale.h>
@@ -36,8 +36,8 @@
#include "FancyPlotter.h"
-FancyPlotter::FancyPlotter( QWidget* parent, const char* name,
- const QString &title, double, double,
+FancyPlotter::FancyPlotter( TQWidget* parent, const char* name,
+ const TQString &title, double, double,
bool nf, bool isApplet)
: KSGRD::SensorDisplay( parent, name, title, nf, isApplet )
{
@@ -97,10 +97,10 @@ void FancyPlotter::configureSettings()
mSettingsDialog->setBackgroundColor( mPlotter->backgroundColor() );
- QValueList< QStringList > list;
+ TQValueList< TQStringList > list;
for ( uint i = 0; i < mBeams; ++i ) {
- QStringList entry;
- entry << QString::number(i);
+ TQStringList entry;
+ entry << TQString::number(i);
entry << sensors().at( i )->hostName();
entry << KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() );
entry << KSGRD::SensorMgr->translateUnit( sensors().at( i )->unit() );
@@ -111,9 +111,9 @@ void FancyPlotter::configureSettings()
}
mSettingsDialog->setSensors( list );
- connect( mSettingsDialog, SIGNAL( applyClicked() ), SLOT( applySettings() ) );
- connect( mSettingsDialog, SIGNAL( okClicked() ), SLOT( applySettings() ) );
- connect( mSettingsDialog, SIGNAL( finished() ), SLOT( killDialog() ) );
+ connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) );
+ connect( mSettingsDialog, TQT_SIGNAL( okClicked() ), TQT_SLOT( applySettings() ) );
+ connect( mSettingsDialog, TQT_SIGNAL( finished() ), TQT_SLOT( killDialog() ) );
mSettingsDialog->show();
}
@@ -143,7 +143,7 @@ void FancyPlotter::applySettings()
if ( mPlotter->horizontalScale() != mSettingsDialog->horizontalScale() ) {
mPlotter->setHorizontalScale( mSettingsDialog->horizontalScale() );
- // Can someone think of a useful QResizeEvent to pass?
+ // Can someone think of a useful TQResizeEvent to pass?
// It doesn't really matter anyway because it's not used.
emit resizeEvent( 0 );
}
@@ -164,23 +164,23 @@ void FancyPlotter::applySettings()
mPlotter->setBackgroundColor( mSettingsDialog->backgroundColor() );
- QValueList<int> orderOfSensors = mSettingsDialog->order();
- QValueList<int> deletedSensors = mSettingsDialog->deleted();
+ TQValueList<int> orderOfSensors = mSettingsDialog->order();
+ TQValueList<int> deletedSensors = mSettingsDialog->deleted();
mSettingsDialog->clearDeleted();
mSettingsDialog->resetOrder();
- QValueList< int >::Iterator itDelete;
+ TQValueList< int >::Iterator itDelete;
for ( itDelete = deletedSensors.begin(); itDelete != deletedSensors.end(); ++itDelete )
removeSensor(*itDelete);
- QValueList< int >::Iterator itOrder;
+ TQValueList< int >::Iterator itOrder;
mPlotter->reorderBeams(orderOfSensors);
reorderSensors(orderOfSensors);
- QValueList< QStringList > list = mSettingsDialog->sensors();
- QValueList< QStringList >::Iterator it;
+ TQValueList< TQStringList > list = mSettingsDialog->sensors();
+ TQValueList< TQStringList >::Iterator it;
for ( uint i = 0; i < sensors().count(); ++i )
- mPlotter->beamColors()[ i ] = QColor( list[i][ 5 ] );
+ mPlotter->beamColors()[ i ] = TQColor( list[i][ 5 ] );
mPlotter->repaint();
setModified( true );
@@ -200,22 +200,22 @@ void FancyPlotter::applyStyle()
setModified( true );
}
-bool FancyPlotter::addSensor( const QString &hostName, const QString &name,
- const QString &type, const QString &title )
+bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name,
+ const TQString &type, const TQString &title )
{
return addSensor( hostName, name, type, title,
KSGRD::Style->sensorColor( mBeams ) );
}
-bool FancyPlotter::addSensor( const QString &hostName, const QString &name,
- const QString &type, const QString &title,
- const QColor &color )
+bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name,
+ const TQString &type, const TQString &title,
+ const TQColor &color )
{
if ( type != "integer" && type != "float" )
return false;
if ( mBeams > 0 && hostName != sensors().at( 0 )->hostName() ) {
- KMessageBox::sorry( this, QString( "All sensors of this display need "
+ KMessageBox::sorry( this, TQString( "All sensors of this display need "
"to be from the host %1!" )
.arg( sensors().at( 0 )->hostName() ) );
@@ -235,15 +235,15 @@ bool FancyPlotter::addSensor( const QString &hostName, const QString &name,
++mBeams;
- QString tooltip;
+ TQString tooltip;
for ( uint i = 0; i < mBeams; ++i ) {
- tooltip += QString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" )
+ tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" )
.arg( sensors().at( mBeams - i - 1 )->hostName() )
.arg( sensors().at( mBeams - i - 1 )->name() );
}
- QToolTip::remove( mPlotter );
- QToolTip::add( mPlotter, tooltip );
+ TQToolTip::remove( mPlotter );
+ TQToolTip::add( mPlotter, tooltip );
return true;
}
@@ -260,20 +260,20 @@ bool FancyPlotter::removeSensor( uint pos )
mBeams--;
KSGRD::SensorDisplay::removeSensor( pos );
- QString tooltip;
+ TQString tooltip;
for ( uint i = 0; i < mBeams; ++i ) {
- tooltip += QString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" )
+ tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" )
.arg( sensors().at( mBeams - i - 1 )->hostName() )
.arg( sensors().at( mBeams - i - 1 )->name() );
}
- QToolTip::remove( mPlotter );
- QToolTip::add( mPlotter, tooltip );
+ TQToolTip::remove( mPlotter );
+ TQToolTip::add( mPlotter, tooltip );
return true;
}
-void FancyPlotter::resizeEvent( QResizeEvent* )
+void FancyPlotter::resizeEvent( TQResizeEvent* )
{
if ( noFrame() )
mPlotter->setGeometry( 0, 0, width(), height() );
@@ -281,7 +281,7 @@ void FancyPlotter::resizeEvent( QResizeEvent* )
frame()->setGeometry( 0, 0, width(), height() );
}
-QSize FancyPlotter::sizeHint()
+TQSize FancyPlotter::sizeHint()
{
if ( noFrame() )
return mPlotter->sizeHint();
@@ -289,7 +289,7 @@ QSize FancyPlotter::sizeHint()
return frame()->sizeHint();
}
-void FancyPlotter::answerReceived( int id, const QString &answer )
+void FancyPlotter::answerReceived( int id, const TQString &answer )
{
if ( (uint)id < mBeams ) {
if ( id != (int)mSampleBuf.count() ) {
@@ -323,7 +323,7 @@ void FancyPlotter::answerReceived( int id, const QString &answer )
}
}
-bool FancyPlotter::restoreSettings( QDomElement &element )
+bool FancyPlotter::restoreSettings( TQDomElement &element )
{
/* autoRage was added after KDE 2.x and was brokenly emulated by
* min == 0.0 and max == 0.0. Since we have to be able to read old
@@ -354,14 +354,14 @@ bool FancyPlotter::restoreSettings( QDomElement &element )
mPlotter->setShowLabels( element.attribute( "labels", "1" ).toUInt() );
mPlotter->setShowTopBar( element.attribute( "topBar", "0" ).toUInt() );
mPlotter->setFontSize( element.attribute( "fontSize",
- QString( "%1" ).arg( KSGRD::Style->fontSize() ) ).toUInt() );
+ TQString( "%1" ).arg( KSGRD::Style->fontSize() ) ).toUInt() );
mPlotter->setBackgroundColor( restoreColor( element, "bColor",
KSGRD::Style->backgroundColor() ) );
- QDomNodeList dnList = element.elementsByTagName( "beam" );
+ TQDomNodeList dnList = element.elementsByTagName( "beam" );
for ( uint i = 0; i < dnList.count(); ++i ) {
- QDomElement el = dnList.item( i ).toElement();
+ TQDomElement el = dnList.item( i ).toElement();
addSensor( el.attribute( "hostName" ), el.attribute( "sensorName" ),
( el.attribute( "sensorType" ).isEmpty() ? "integer" :
el.attribute( "sensorType" ) ), "", restoreColor( el, "color",
@@ -378,7 +378,7 @@ bool FancyPlotter::restoreSettings( QDomElement &element )
return true;
}
-bool FancyPlotter::saveSettings( QDomDocument &doc, QDomElement &element,
+bool FancyPlotter::saveSettings( TQDomDocument &doc, TQDomElement &element,
bool save )
{
element.setAttribute( "min", mPlotter->minValue() );
@@ -403,7 +403,7 @@ bool FancyPlotter::saveSettings( QDomDocument &doc, QDomElement &element,
saveColor( element, "bColor", mPlotter->backgroundColor() );
for ( uint i = 0; i < mBeams; ++i ) {
- QDomElement beam = doc.createElement( "beam" );
+ TQDomElement beam = doc.createElement( "beam" );
element.appendChild( beam );
beam.setAttribute( "hostName", sensors().at( i )->hostName() );
beam.setAttribute( "sensorName", sensors().at( i )->name() );
@@ -430,11 +430,11 @@ FPSensorProperties::FPSensorProperties()
{
}
-FPSensorProperties::FPSensorProperties( const QString &hostName,
- const QString &name,
- const QString &type,
- const QString &description,
- const QColor &color )
+FPSensorProperties::FPSensorProperties( const TQString &hostName,
+ const TQString &name,
+ const TQString &type,
+ const TQString &description,
+ const TQColor &color )
: KSGRD::SensorProperties( hostName, name, type, description ),
mColor( color )
{
@@ -444,12 +444,12 @@ FPSensorProperties::~FPSensorProperties()
{
}
-void FPSensorProperties::setColor( const QColor &color )
+void FPSensorProperties::setColor( const TQColor &color )
{
mColor = color;
}
-QColor FPSensorProperties::color() const
+TQColor FPSensorProperties::color() const
{
return mColor;
}
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h
index d19c28760..ddb5f7328 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h
@@ -34,16 +34,16 @@ class FPSensorProperties : public KSGRD::SensorProperties
{
public:
FPSensorProperties();
- FPSensorProperties( const QString &hostName, const QString &name,
- const QString &type, const QString &description,
- const QColor &color );
+ FPSensorProperties( const TQString &hostName, const TQString &name,
+ const TQString &type, const TQString &description,
+ const TQColor &color );
~FPSensorProperties();
- void setColor( const QColor &color );
- QColor color() const;
+ void setColor( const TQColor &color );
+ TQColor color() const;
private:
- QColor mColor;
+ TQColor mColor;
};
class FancyPlotter : public KSGRD::SensorDisplay
@@ -51,27 +51,27 @@ class FancyPlotter : public KSGRD::SensorDisplay
Q_OBJECT
public:
- FancyPlotter( QWidget* parent = 0, const char* name = 0,
- const QString& title = QString::null, double min = 0,
+ FancyPlotter( TQWidget* parent = 0, const char* name = 0,
+ const TQString& title = TQString::null, double min = 0,
double max = 100, bool noFrame = false, bool isApplet = false );
virtual ~FancyPlotter();
void configureSettings();
- bool addSensor( const QString &hostName, const QString &name,
- const QString &type, const QString &title );
- bool addSensor( const QString &hostName, const QString &name,
- const QString &type, const QString &title,
- const QColor &color );
+ bool addSensor( const TQString &hostName, const TQString &name,
+ const TQString &type, const TQString &title );
+ bool addSensor( const TQString &hostName, const TQString &name,
+ const TQString &type, const TQString &title,
+ const TQColor &color );
bool removeSensor( uint pos );
- virtual QSize sizeHint(void);
+ virtual TQSize sizeHint(void);
- virtual void answerReceived( int id, const QString &answer );
+ virtual void answerReceived( int id, const TQString &answer );
- virtual bool restoreSettings( QDomElement &element );
- virtual bool saveSettings( QDomDocument &doc, QDomElement &element,
+ virtual bool restoreSettings( TQDomElement &element );
+ virtual bool saveSettings( TQDomDocument &doc, TQDomElement &element,
bool save = true );
virtual bool hasSettingsDialog() const;
@@ -82,7 +82,7 @@ class FancyPlotter : public KSGRD::SensorDisplay
void killDialog();
protected:
- virtual void resizeEvent( QResizeEvent* );
+ virtual void resizeEvent( TQResizeEvent* );
private:
uint mBeams;
@@ -97,7 +97,7 @@ class FancyPlotter : public KSGRD::SensorDisplay
received. The flags variable is used to ensure that all samples have
been received.
*/
- QValueList<double> mSampleBuf;
+ TQValueList<double> mSampleBuf;
};
#endif
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
index 9d4114bd3..de345e7b8 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
@@ -29,87 +29,87 @@
#include <klocale.h>
#include <knuminput.h>
-#include <qcheckbox.h>
-#include <qbuttongroup.h>
-#include <qgroupbox.h>
-#include <qimage.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpixmap.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qwhatsthis.h>
-#include <qheader.h>
+#include <tqcheckbox.h>
+#include <tqbuttongroup.h>
+#include <tqgroupbox.h>
+#include <tqimage.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpixmap.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqwhatsthis.h>
+#include <tqheader.h>
#include "FancyPlotterSettings.h"
-FancyPlotterSettings::FancyPlotterSettings( QWidget* parent, const char* name )
+FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
: KDialogBase( Tabbed, i18n( "Signal Plotter Settings" ), Ok | Apply | Cancel,
Ok, parent, name, false, true )
{
- QFrame *page = 0;
- QGridLayout *pageLayout = 0;
- QGridLayout *boxLayout = 0;
- QGroupBox *groupBox = 0;
- QLabel *label = 0;
+ TQFrame *page = 0;
+ TQGridLayout *pageLayout = 0;
+ TQGridLayout *boxLayout = 0;
+ TQGroupBox *groupBox = 0;
+ TQLabel *label = 0;
// Style page
page = addPage( i18n( "Style" ) );
- pageLayout = new QGridLayout( page, 3, 2, 0, spacingHint() );
+ pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() );
- label = new QLabel( i18n( "Title:" ), page );
+ label = new TQLabel( i18n( "Title:" ), page );
pageLayout->addWidget( label, 0, 0 );
mTitle = new KLineEdit( page );
- QWhatsThis::add( mTitle, i18n( "Enter the title of the display here." ) );
+ TQWhatsThis::add( mTitle, i18n( "Enter the title of the display here." ) );
pageLayout->addWidget( mTitle, 0, 1 );
label->setBuddy( mTitle );
- QButtonGroup *buttonBox = new QButtonGroup( 2, Qt::Vertical,
+ TQButtonGroup *buttonBox = new TQButtonGroup( 2, Qt::Vertical,
i18n( "Graph Drawing Style" ), page );
- mUsePolygonStyle = new QRadioButton( i18n( "Basic polygons" ), buttonBox );
+ mUsePolygonStyle = new TQRadioButton( i18n( "Basic polygons" ), buttonBox );
mUsePolygonStyle->setChecked( true );
- mUseOriginalStyle = new QRadioButton( i18n( "Original - single line per data point" ), buttonBox );
+ mUseOriginalStyle = new TQRadioButton( i18n( "Original - single line per data point" ), buttonBox );
pageLayout->addMultiCellWidget( buttonBox, 1, 1, 0, 1 );
// Scales page
page = addPage( i18n( "Scales" ) );
- pageLayout = new QGridLayout( page, 2, 1, 0, spacingHint() );
+ pageLayout = new TQGridLayout( page, 2, 1, 0, spacingHint() );
- groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Vertical Scale" ), page );
- boxLayout = new QGridLayout( groupBox->layout(), 2, 5, spacingHint() );
+ groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Vertical Scale" ), page );
+ boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() );
boxLayout->setColStretch( 2, 1 );
- mUseAutoRange = new QCheckBox( i18n( "Automatic range detection" ), groupBox );
- QWhatsThis::add( mUseAutoRange, i18n( "Check this box if you want the display range to adapt dynamically to the currently displayed values; if you do not check this, you have to specify the range you want in the fields below." ) );
+ mUseAutoRange = new TQCheckBox( i18n( "Automatic range detection" ), groupBox );
+ TQWhatsThis::add( mUseAutoRange, i18n( "Check this box if you want the display range to adapt dynamically to the currently displayed values; if you do not check this, you have to specify the range you want in the fields below." ) );
boxLayout->addMultiCellWidget( mUseAutoRange, 0, 0, 0, 4 );
- label = new QLabel( i18n( "Minimum value:" ), groupBox );
+ label = new TQLabel( i18n( "Minimum value:" ), groupBox );
boxLayout->addWidget( label, 1, 0 );
mMinValue = new KLineEdit( groupBox );
mMinValue->setAlignment( AlignRight );
mMinValue->setEnabled( false );
- QWhatsThis::add( mMinValue, i18n( "Enter the minimum value for the display here. If both values are 0, automatic range detection is enabled." ) );
+ TQWhatsThis::add( mMinValue, i18n( "Enter the minimum value for the display here. If both values are 0, automatic range detection is enabled." ) );
boxLayout->addWidget( mMinValue, 1, 1 );
label->setBuddy( mMinValue );
- label = new QLabel( i18n( "Maximum value:" ), groupBox );
+ label = new TQLabel( i18n( "Maximum value:" ), groupBox );
boxLayout->addWidget( label, 1, 3 );
mMaxValue = new KLineEdit( groupBox );
mMaxValue->setAlignment( AlignRight );
mMaxValue->setEnabled( false );
- QWhatsThis::add( mMaxValue, i18n( "Enter the maximum value for the display here. If both values are 0, automatic range detection is enabled." ) );
+ TQWhatsThis::add( mMaxValue, i18n( "Enter the maximum value for the display here. If both values are 0, automatic range detection is enabled." ) );
boxLayout->addWidget( mMaxValue, 1, 4 );
label->setBuddy( mMaxValue );
pageLayout->addWidget( groupBox, 0, 0 );
- groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Horizontal Scale" ), page );
- boxLayout = new QGridLayout( groupBox->layout(), 2, 2, spacingHint() );
+ groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Horizontal Scale" ), page );
+ boxLayout = new TQGridLayout( groupBox->layout(), 2, 2, spacingHint() );
boxLayout->setRowStretch( 1, 1 );
mHorizontalScale = new KIntNumInput( 1, groupBox );
@@ -117,47 +117,47 @@ FancyPlotterSettings::FancyPlotterSettings( QWidget* parent, const char* name )
mHorizontalScale->setMaxValue( 50 );
boxLayout->addWidget( mHorizontalScale, 0, 0 );
- label = new QLabel( i18n( "pixel(s) per time period" ), groupBox );
+ label = new TQLabel( i18n( "pixel(s) per time period" ), groupBox );
boxLayout->addWidget( label, 0, 1 );
pageLayout->addWidget( groupBox, 1, 0 );
// Grid page
page = addPage( i18n( "Grid" ) );
- pageLayout = new QGridLayout( page, 3, 2, 0, spacingHint() );
+ pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() );
- groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Lines" ), page );
- boxLayout = new QGridLayout( groupBox->layout(), 2, 5, spacingHint() );
+ groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Lines" ), page );
+ boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() );
boxLayout->setColStretch( 1, 1 );
- mShowVerticalLines = new QCheckBox( i18n( "Vertical lines" ), groupBox );
- QWhatsThis::add( mShowVerticalLines, i18n( "Check this to activate the vertical lines if display is large enough." ) );
+ mShowVerticalLines = new TQCheckBox( i18n( "Vertical lines" ), groupBox );
+ TQWhatsThis::add( mShowVerticalLines, i18n( "Check this to activate the vertical lines if display is large enough." ) );
boxLayout->addWidget( mShowVerticalLines, 0, 0 );
- label = new QLabel( i18n( "Distance:" ), groupBox );
+ label = new TQLabel( i18n( "Distance:" ), groupBox );
boxLayout->addWidget( label, 0, 2 );
mVerticalLinesDistance = new KIntNumInput( 0, groupBox );
mVerticalLinesDistance->setMinValue( 10 );
mVerticalLinesDistance->setMaxValue( 120 );
- QWhatsThis::add( mVerticalLinesDistance, i18n( "Enter the distance between two vertical lines here." ) );
+ TQWhatsThis::add( mVerticalLinesDistance, i18n( "Enter the distance between two vertical lines here." ) );
boxLayout->addWidget( mVerticalLinesDistance , 0, 3 );
label->setBuddy( mVerticalLinesDistance );
- mVerticalLinesScroll = new QCheckBox( i18n( "Vertical lines scroll" ), groupBox );
+ mVerticalLinesScroll = new TQCheckBox( i18n( "Vertical lines scroll" ), groupBox );
boxLayout->addWidget( mVerticalLinesScroll, 0, 4 );
- mShowHorizontalLines = new QCheckBox( i18n( "Horizontal lines" ), groupBox );
- QWhatsThis::add( mShowHorizontalLines, i18n( "Check this to enable horizontal lines if display is large enough." ) );
+ mShowHorizontalLines = new TQCheckBox( i18n( "Horizontal lines" ), groupBox );
+ TQWhatsThis::add( mShowHorizontalLines, i18n( "Check this to enable horizontal lines if display is large enough." ) );
boxLayout->addWidget( mShowHorizontalLines, 1, 0 );
- label = new QLabel( i18n( "Count:" ), groupBox );
+ label = new TQLabel( i18n( "Count:" ), groupBox );
boxLayout->addWidget( label, 1, 2 );
mHorizontalLinesCount = new KIntNumInput( 0, groupBox );
mHorizontalLinesCount->setMinValue( 1 );
mHorizontalLinesCount->setMaxValue( 100 );
- QWhatsThis::add( mHorizontalLinesCount, i18n( "Enter the number of horizontal lines here." ) );
+ TQWhatsThis::add( mHorizontalLinesCount, i18n( "Enter the number of horizontal lines here." ) );
boxLayout->addWidget( mHorizontalLinesCount , 1, 3 );
label->setBuddy( mHorizontalLinesCount );
@@ -165,15 +165,15 @@ FancyPlotterSettings::FancyPlotterSettings( QWidget* parent, const char* name )
pageLayout->addMultiCellWidget( groupBox, 0, 0, 0, 1 );
- groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Text" ), page );
- boxLayout = new QGridLayout( groupBox->layout(), 3, 4, spacingHint() );
+ groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Text" ), page );
+ boxLayout = new TQGridLayout( groupBox->layout(), 3, 4, spacingHint() );
boxLayout->setColStretch( 1, 1 );
- mShowLabels = new QCheckBox( i18n( "Labels" ), groupBox );
- QWhatsThis::add( mShowLabels, i18n( "Check this box if horizontal lines should be decorated with the values they mark." ) );
+ mShowLabels = new TQCheckBox( i18n( "Labels" ), groupBox );
+ TQWhatsThis::add( mShowLabels, i18n( "Check this box if horizontal lines should be decorated with the values they mark." ) );
boxLayout->addWidget( mShowLabels, 0, 0 );
- label = new QLabel( i18n( "Font size:" ), groupBox );
+ label = new TQLabel( i18n( "Font size:" ), groupBox );
boxLayout->addWidget( label, 0, 2 );
mFontSize = new KIntNumInput( 9, groupBox );
@@ -182,32 +182,32 @@ FancyPlotterSettings::FancyPlotterSettings( QWidget* parent, const char* name )
boxLayout->addWidget( mFontSize, 0, 3 );
label->setBuddy( mFontSize );
- mShowTopBar = new QCheckBox( i18n( "Top bar" ), groupBox );
- QWhatsThis::add( mShowTopBar, i18n( "Check this to active the display title bar. This is probably only useful for applet displays. The bar is only visible if the display is large enough." ) );
+ mShowTopBar = new TQCheckBox( i18n( "Top bar" ), groupBox );
+ TQWhatsThis::add( mShowTopBar, i18n( "Check this to active the display title bar. This is probably only useful for applet displays. The bar is only visible if the display is large enough." ) );
boxLayout->addWidget( mShowTopBar, 1, 0 );
boxLayout->setRowStretch( 2, 1 );
pageLayout->addWidget( groupBox, 1, 0 );
- groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Colors" ), page );
- boxLayout = new QGridLayout( groupBox->layout(), 4, 2, spacingHint() );
+ groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Colors" ), page );
+ boxLayout = new TQGridLayout( groupBox->layout(), 4, 2, spacingHint() );
- label = new QLabel( i18n( "Vertical lines:" ), groupBox );
+ label = new TQLabel( i18n( "Vertical lines:" ), groupBox );
boxLayout->addWidget( label, 0, 0 );
mVerticalLinesColor = new KColorButton( groupBox );
boxLayout->addWidget( mVerticalLinesColor, 0, 1 );
label->setBuddy( mVerticalLinesColor );
- label = new QLabel( i18n( "Horizontal lines:" ), groupBox );
+ label = new TQLabel( i18n( "Horizontal lines:" ), groupBox );
boxLayout->addWidget( label, 1, 0 );
mHorizontalLinesColor = new KColorButton( groupBox );
boxLayout->addWidget( mHorizontalLinesColor, 1, 1 );
label->setBuddy( mHorizontalLinesColor );
- label = new QLabel( i18n( "Background:" ), groupBox );
+ label = new TQLabel( i18n( "Background:" ), groupBox );
boxLayout->addWidget( label, 2, 0 );
mBackgroundColor = new KColorButton( groupBox );
@@ -222,7 +222,7 @@ FancyPlotterSettings::FancyPlotterSettings( QWidget* parent, const char* name )
// Sensors page
page = addPage( i18n( "Sensors" ) );
- pageLayout = new QGridLayout( page, 6, 2, 0, spacingHint() );
+ pageLayout = new TQGridLayout( page, 6, 2, 0, spacingHint() );
pageLayout->setRowStretch( 2, 1 );
pageLayout->setRowStretch( 5, 1 );
@@ -232,55 +232,55 @@ FancyPlotterSettings::FancyPlotterSettings( QWidget* parent, const char* name )
mSensorView->addColumn( i18n( "Sensor" ) );
mSensorView->addColumn( i18n( "Unit" ) );
mSensorView->addColumn( i18n( "Status" ) );
- mSensorView->setResizeMode(QListView::LastColumn);
+ mSensorView->setResizeMode(TQListView::LastColumn);
mSensorView->header()->setResizeEnabled(false, 0);
mSensorView->hideColumn(0);
mSensorView->header()->resizeSection(0, 0);
mSensorView->setAllColumnsShowFocus( true );
pageLayout->addMultiCellWidget( mSensorView, 0, 5, 0, 0 );
mSensorView->setSortColumn ( -1 );
- mEditButton = new QPushButton( i18n( "Set Color..." ), page );
+ mEditButton = new TQPushButton( i18n( "Set Color..." ), page );
mEditButton->setEnabled( false );
- QWhatsThis::add( mEditButton, i18n( "Push this button to configure the color of the sensor in the diagram." ) );
+ TQWhatsThis::add( mEditButton, i18n( "Push this button to configure the color of the sensor in the diagram." ) );
pageLayout->addWidget( mEditButton, 0, 1 );
- mRemoveButton = new QPushButton( i18n( "Delete" ), page );
+ mRemoveButton = new TQPushButton( i18n( "Delete" ), page );
mRemoveButton->setEnabled( false );
- QWhatsThis::add( mRemoveButton, i18n( "Push this button to delete the sensor." ) );
+ TQWhatsThis::add( mRemoveButton, i18n( "Push this button to delete the sensor." ) );
pageLayout->addWidget( mRemoveButton, 1, 1 );
- mMoveUpButton = new QPushButton( i18n( "Move Up" ), page );
+ mMoveUpButton = new TQPushButton( i18n( "Move Up" ), page );
mMoveUpButton->setEnabled( false );
pageLayout->addWidget( mMoveUpButton, 3, 1 );
- mMoveDownButton = new QPushButton( i18n( "Move Down" ), page );
+ mMoveDownButton = new TQPushButton( i18n( "Move Down" ), page );
mMoveDownButton->setEnabled( false );
pageLayout->addWidget( mMoveDownButton, 4, 1 );
- connect( mUseAutoRange, SIGNAL( toggled( bool ) ), mMinValue,
- SLOT( setDisabled( bool ) ) );
- connect( mUseAutoRange, SIGNAL( toggled( bool ) ), mMaxValue,
- SLOT( setDisabled( bool ) ) );
- connect( mShowVerticalLines, SIGNAL( toggled( bool ) ), mVerticalLinesDistance,
- SLOT( setEnabled( bool ) ) );
- connect( mShowVerticalLines, SIGNAL( toggled( bool ) ), mVerticalLinesScroll,
- SLOT( setEnabled( bool ) ) );
- connect( mShowVerticalLines, SIGNAL( toggled( bool ) ), mVerticalLinesColor,
- SLOT( setEnabled( bool ) ) );
- connect( mShowHorizontalLines, SIGNAL( toggled( bool ) ), mHorizontalLinesCount,
- SLOT( setEnabled( bool ) ) );
- connect( mShowHorizontalLines, SIGNAL( toggled( bool ) ), mHorizontalLinesColor,
- SLOT( setEnabled( bool ) ) );
- connect( mShowHorizontalLines, SIGNAL( toggled( bool ) ), mShowLabels,
- SLOT( setEnabled( bool ) ) );
- connect( mSensorView, SIGNAL( selectionChanged( QListViewItem* ) ),
- SLOT( selectionChanged( QListViewItem* ) ) );
-
- connect( mEditButton, SIGNAL( clicked() ), SLOT( editSensor() ) );
- connect( mRemoveButton, SIGNAL( clicked() ), SLOT( removeSensor() ) );
- connect( mMoveUpButton, SIGNAL( clicked() ), SLOT( moveUpSensor() ) );
- connect( mMoveDownButton, SIGNAL( clicked() ), SLOT( moveDownSensor() ) );
- connect ( mSensorView, SIGNAL( doubleClicked( QListViewItem *, const QPoint &, int )), SLOT(editSensor()));
+ connect( mUseAutoRange, TQT_SIGNAL( toggled( bool ) ), mMinValue,
+ TQT_SLOT( setDisabled( bool ) ) );
+ connect( mUseAutoRange, TQT_SIGNAL( toggled( bool ) ), mMaxValue,
+ TQT_SLOT( setDisabled( bool ) ) );
+ connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesDistance,
+ TQT_SLOT( setEnabled( bool ) ) );
+ connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesScroll,
+ TQT_SLOT( setEnabled( bool ) ) );
+ connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesColor,
+ TQT_SLOT( setEnabled( bool ) ) );
+ connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mHorizontalLinesCount,
+ TQT_SLOT( setEnabled( bool ) ) );
+ connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mHorizontalLinesColor,
+ TQT_SLOT( setEnabled( bool ) ) );
+ connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mShowLabels,
+ TQT_SLOT( setEnabled( bool ) ) );
+ connect( mSensorView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
+ TQT_SLOT( selectionChanged( TQListViewItem* ) ) );
+
+ connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensor() ) );
+ connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSensor() ) );
+ connect( mMoveUpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( moveUpSensor() ) );
+ connect( mMoveDownButton, TQT_SIGNAL( clicked() ), TQT_SLOT( moveDownSensor() ) );
+ connect ( mSensorView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), TQT_SLOT(editSensor()));
KAcceleratorManager::manage( this );
}
@@ -289,12 +289,12 @@ FancyPlotterSettings::~FancyPlotterSettings()
{
}
-void FancyPlotterSettings::setTitle( const QString &title )
+void FancyPlotterSettings::setTitle( const TQString &title )
{
mTitle->setText( title );
}
-QString FancyPlotterSettings::title() const
+TQString FancyPlotterSettings::title() const
{
return mTitle->text();
}
@@ -313,7 +313,7 @@ bool FancyPlotterSettings::useAutoRange() const
void FancyPlotterSettings::setMinValue( double min )
{
- mMinValue->setText( QString::number( min ) );
+ mMinValue->setText( TQString::number( min ) );
}
double FancyPlotterSettings::minValue() const
@@ -323,7 +323,7 @@ double FancyPlotterSettings::minValue() const
void FancyPlotterSettings::setMaxValue( double max )
{
- mMaxValue->setText( QString::number( max ) );
+ mMaxValue->setText( TQString::number( max ) );
}
double FancyPlotterSettings::maxValue() const
@@ -367,12 +367,12 @@ bool FancyPlotterSettings::showVerticalLines() const
return mShowVerticalLines->isChecked();
}
-void FancyPlotterSettings::setVerticalLinesColor( const QColor &color )
+void FancyPlotterSettings::setVerticalLinesColor( const TQColor &color )
{
mVerticalLinesColor->setColor( color );
}
-QColor FancyPlotterSettings::verticalLinesColor() const
+TQColor FancyPlotterSettings::verticalLinesColor() const
{
return mVerticalLinesColor->color();
}
@@ -411,12 +411,12 @@ bool FancyPlotterSettings::showHorizontalLines() const
return mShowHorizontalLines->isChecked();
}
-void FancyPlotterSettings::setHorizontalLinesColor( const QColor &color )
+void FancyPlotterSettings::setHorizontalLinesColor( const TQColor &color )
{
mHorizontalLinesColor->setColor( color );
}
-QColor FancyPlotterSettings::horizontalLinesColor() const
+TQColor FancyPlotterSettings::horizontalLinesColor() const
{
return mHorizontalLinesColor->color();
}
@@ -461,12 +461,12 @@ int FancyPlotterSettings::fontSize() const
return mFontSize->value();
}
-void FancyPlotterSettings::setBackgroundColor( const QColor &color )
+void FancyPlotterSettings::setBackgroundColor( const TQColor &color )
{
mBackgroundColor->setColor( color );
}
-QColor FancyPlotterSettings::backgroundColor() const
+TQColor FancyPlotterSettings::backgroundColor() const
{
return mBackgroundColor->color();
}
@@ -474,16 +474,16 @@ void FancyPlotterSettings::clearDeleted()
{
mDeleted.clear();
}
-QValueList<int> FancyPlotterSettings::deleted() const
+TQValueList<int> FancyPlotterSettings::deleted() const
{
return mDeleted;
}
-QValueList<int> FancyPlotterSettings::order() const
+TQValueList<int> FancyPlotterSettings::order() const
{
- QValueList<int> newOrder;
+ TQValueList<int> newOrder;
- QListViewItemIterator it( mSensorView );
+ TQListViewItemIterator it( mSensorView );
for ( ; it.current(); ++it ) {
newOrder.prepend(it.current()->text(0).toInt());
}
@@ -493,46 +493,46 @@ QValueList<int> FancyPlotterSettings::order() const
void FancyPlotterSettings::resetOrder()
{
int i = mSensorView->childCount()-1;
- QListViewItemIterator it( mSensorView );
+ TQListViewItemIterator it( mSensorView );
for ( ; it.current(); ++it, --i) {
- it.current()->setText(0, QString::number(i));
+ it.current()->setText(0, TQString::number(i));
}
}
-void FancyPlotterSettings::setSensors( const QValueList< QStringList > &list )
+void FancyPlotterSettings::setSensors( const TQValueList< TQStringList > &list )
{
mSensorView->clear();
- QValueList< QStringList >::ConstIterator it;
+ TQValueList< TQStringList >::ConstIterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
- QListViewItem* lvi = new QListViewItem( mSensorView,
+ TQListViewItem* lvi = new TQListViewItem( mSensorView,
(*it)[ 0 ], // id
(*it)[ 1 ], // host name
(*it)[ 2 ], // sensor name
(*it)[ 3 ], // unit
(*it)[ 4 ] ); // status
- QPixmap pm( 12, 12 );
- pm.fill( QColor( (*it)[ 5 ] ) );
+ TQPixmap pm( 12, 12 );
+ pm.fill( TQColor( (*it)[ 5 ] ) );
lvi->setPixmap( 2, pm );
mSensorView->insertItem( lvi );
}
}
-QValueList< QStringList > FancyPlotterSettings::sensors() const
+TQValueList< TQStringList > FancyPlotterSettings::sensors() const
{
- QValueList< QStringList > list;
+ TQValueList< TQStringList > list;
- QListViewItemIterator it( mSensorView );
+ TQListViewItemIterator it( mSensorView );
for ( ; it.current(); ++it ) {
- QStringList entry;
+ TQStringList entry;
entry << it.current()->text( 0 );
entry << it.current()->text( 1 );
entry << it.current()->text( 2 );
entry << it.current()->text( 3 );
entry << it.current()->text( 4 );
QRgb rgb = it.current()->pixmap( 2 )->convertToImage().pixel( 1, 1 );
- QColor color( qRed( rgb ), qGreen( rgb ), qBlue( rgb ) );
+ TQColor color( qRed( rgb ), qGreen( rgb ), qBlue( rgb ) );
entry << ( color.name() );
list.prepend( entry );
@@ -543,15 +543,15 @@ QValueList< QStringList > FancyPlotterSettings::sensors() const
void FancyPlotterSettings::editSensor()
{
- QListViewItem* lvi = mSensorView->currentItem();
+ TQListViewItem* lvi = mSensorView->currentItem();
if ( !lvi )
return;
- QColor color = lvi->pixmap( 2 )->convertToImage().pixel( 1, 1 );
+ TQColor color = lvi->pixmap( 2 )->convertToImage().pixel( 1, 1 );
int result = KColorDialog::getColor( color, parentWidget() );
if ( result == KColorDialog::Accepted ) {
- QPixmap newPm( 12, 12 );
+ TQPixmap newPm( 12, 12 );
newPm.fill( color );
lvi->setPixmap( 2, newPm );
}
@@ -559,7 +559,7 @@ void FancyPlotterSettings::editSensor()
void FancyPlotterSettings::removeSensor()
{
- QListViewItem* lvi = mSensorView->currentItem();
+ TQListViewItem* lvi = mSensorView->currentItem();
if ( lvi ) {
//Note down the id of the one we are deleting
@@ -571,7 +571,7 @@ void FancyPlotterSettings::removeSensor()
* items can be deleted without forcing the user to select a new
* item between the deletes. If all items are deleted, the buttons
* are disabled again. */
- QListViewItem* newSelected = 0;
+ TQListViewItem* newSelected = 0;
if ( lvi->itemBelow() ) {
lvi->itemBelow()->setSelected( true );
newSelected = lvi->itemBelow();
@@ -583,10 +583,10 @@ void FancyPlotterSettings::removeSensor()
delete lvi;
- QListViewItemIterator it( mSensorView );
+ TQListViewItemIterator it( mSensorView );
for ( ; it.current(); ++it ) {
if(it.current()->text(0).toInt() > id)
- it.current()->setText(0, QString::number(it.current()->text(0).toInt() -1));
+ it.current()->setText(0, TQString::number(it.current()->text(0).toInt() -1));
}
@@ -598,7 +598,7 @@ void FancyPlotterSettings::removeSensor()
void FancyPlotterSettings::moveUpSensor()
{
if ( mSensorView->currentItem() != 0 ) {
- QListViewItem* item = mSensorView->currentItem()->itemAbove();
+ TQListViewItem* item = mSensorView->currentItem()->itemAbove();
if ( item ) {
if ( item->itemAbove() )
{
@@ -624,7 +624,7 @@ void FancyPlotterSettings::moveDownSensor()
}
}
-void FancyPlotterSettings::selectionChanged( QListViewItem *item )
+void FancyPlotterSettings::selectionChanged( TQListViewItem *item )
{
bool state = ( item != 0 );
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h
index b813bee34..08e73feca 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h
@@ -41,11 +41,11 @@ class FancyPlotterSettings : public KDialogBase
Q_OBJECT
public:
- FancyPlotterSettings( QWidget* parent = 0, const char* name = 0 );
+ FancyPlotterSettings( TQWidget* parent = 0, const char* name = 0 );
~FancyPlotterSettings();
- void setTitle( const QString &title );
- QString title() const;
+ void setTitle( const TQString &title );
+ TQString title() const;
void setUseAutoRange( bool value );
bool useAutoRange() const;
@@ -65,8 +65,8 @@ class FancyPlotterSettings : public KDialogBase
void setShowVerticalLines( bool value );
bool showVerticalLines() const;
- void setVerticalLinesColor( const QColor &color );
- QColor verticalLinesColor() const;
+ void setVerticalLinesColor( const TQColor &color );
+ TQColor verticalLinesColor() const;
void setVerticalLinesDistance( int distance );
int verticalLinesDistance() const;
@@ -77,8 +77,8 @@ class FancyPlotterSettings : public KDialogBase
void setShowHorizontalLines( bool value );
bool showHorizontalLines() const;
- void setHorizontalLinesColor( const QColor &color );
- QColor horizontalLinesColor() const;
+ void setHorizontalLinesColor( const TQColor &color );
+ TQColor horizontalLinesColor() const;
void setHorizontalLinesCount( int count );
int horizontalLinesCount() const;
@@ -92,13 +92,13 @@ class FancyPlotterSettings : public KDialogBase
void setFontSize( int size );
int fontSize() const;
- void setBackgroundColor( const QColor &color );
- QColor backgroundColor() const;
+ void setBackgroundColor( const TQColor &color );
+ TQColor backgroundColor() const;
- void setSensors( const QValueList< QStringList > &list );
- QValueList< QStringList > sensors() const;
- QValueList<int> order() const;
- QValueList<int> deleted() const;
+ void setSensors( const TQValueList< TQStringList > &list );
+ TQValueList< TQStringList > sensors() const;
+ TQValueList<int> order() const;
+ TQValueList<int> deleted() const;
void clearDeleted();
void resetOrder();
@@ -107,7 +107,7 @@ class FancyPlotterSettings : public KDialogBase
void removeSensor();
void moveUpSensor();
void moveDownSensor();
- void selectionChanged( QListViewItem* );
+ void selectionChanged( TQListViewItem* );
private:
@@ -123,21 +123,21 @@ class FancyPlotterSettings : public KDialogBase
KIntNumInput *mFontSize;
KListView *mSensorView;
- QCheckBox *mShowVerticalLines;
- QCheckBox *mShowHorizontalLines;
- QCheckBox *mVerticalLinesScroll;
- QCheckBox *mUseAutoRange;
- QCheckBox *mShowLabels;
- QCheckBox *mShowTopBar;
- QPushButton *mEditButton;
- QPushButton *mRemoveButton;
- QPushButton *mMoveUpButton;
- QPushButton *mMoveDownButton;
- QRadioButton *mUsePolygonStyle;
- QRadioButton *mUseOriginalStyle;
+ TQCheckBox *mShowVerticalLines;
+ TQCheckBox *mShowHorizontalLines;
+ TQCheckBox *mVerticalLinesScroll;
+ TQCheckBox *mUseAutoRange;
+ TQCheckBox *mShowLabels;
+ TQCheckBox *mShowTopBar;
+ TQPushButton *mEditButton;
+ TQPushButton *mRemoveButton;
+ TQPushButton *mMoveUpButton;
+ TQPushButton *mMoveDownButton;
+ TQRadioButton *mUsePolygonStyle;
+ TQRadioButton *mUseOriginalStyle;
/** The numbers of the sensors to be delete.*/
- QValueList<int> mDeleted;
+ TQValueList<int> mDeleted;
};
#endif
diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cc
index 885daded6..c980196e6 100644
--- a/ksysguard/gui/SensorDisplayLib/ListView.cc
+++ b/ksysguard/gui/SensorDisplayLib/ListView.cc
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <config.h>
-#include <qdom.h>
+#include <tqdom.h>
#include <kcolorbutton.h>
#include <kdebug.h>
@@ -41,12 +41,12 @@
#include "ListViewSettings.h"
PrivateListViewItem::PrivateListViewItem(PrivateListView *parent)
- : QListViewItem(parent)
+ : TQListViewItem(parent)
{
_parent = parent;
}
-int PrivateListViewItem::compare( QListViewItem *item, int col, bool ascending ) const
+int PrivateListViewItem::compare( TQListViewItem *item, int col, bool ascending ) const
{
int type = ((PrivateListView*)listView())->columnType( col );
@@ -79,9 +79,9 @@ int PrivateListViewItem::compare( QListViewItem *item, int col, bool ascending )
else
return 1;
} else if ( type == PrivateListView::DiskStat ) {
- QString prev = key( col, ascending );
- QString next = item->key( col, ascending );
- QString prevKey, nextKey;
+ TQString prev = key( col, ascending );
+ TQString next = item->key( col, ascending );
+ TQString prevKey, nextKey;
uint counter = prev.length();
for ( uint i = 0; i < counter; ++i )
@@ -102,19 +102,19 @@ int PrivateListViewItem::compare( QListViewItem *item, int col, bool ascending )
return key( col, ascending ).localeAwareCompare( item->key( col, ascending ) );
}
-PrivateListView::PrivateListView(QWidget *parent, const char *name)
- : QListView(parent, name)
+PrivateListView::PrivateListView(TQWidget *parent, const char *name)
+ : TQListView(parent, name)
{
- QColorGroup cg = colorGroup();
+ TQColorGroup cg = colorGroup();
- cg.setColor(QColorGroup::Link, KSGRD::Style->firstForegroundColor());
- cg.setColor(QColorGroup::Text, KSGRD::Style->secondForegroundColor());
- cg.setColor(QColorGroup::Base, KSGRD::Style->backgroundColor());
+ cg.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor());
+ cg.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor());
+ cg.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
- setPalette(QPalette(cg, cg, cg));
+ setPalette(TQPalette(cg, cg, cg));
}
-void PrivateListView::update(const QString& answer)
+void PrivateListView::update(const TQString& answer)
{
setUpdatesEnabled(false);
viewport()->setUpdatesEnabled(false);
@@ -172,9 +172,9 @@ void PrivateListView::removeColumns(void)
removeColumn(i);
}
-void PrivateListView::addColumn(const QString& label, const QString& type)
+void PrivateListView::addColumn(const TQString& label, const TQString& type)
{
- QListView::addColumn( label );
+ TQListView::addColumn( label );
int col = columns() - 1;
if (type == "s" || type == "S")
@@ -197,18 +197,18 @@ void PrivateListView::addColumn(const QString& label, const QString& type)
mColumnTypes.append( type );
/* Just use some sensible default values as initial setting. */
- QFontMetrics fm = fontMetrics();
+ TQFontMetrics fm = fontMetrics();
setColumnWidth(col, fm.width(label) + 10);
}
-ListView::ListView(QWidget* parent, const char* name, const QString& title, int, int)
+ListView::ListView(TQWidget* parent, const char* name, const TQString& title, int, int)
: KSGRD::SensorDisplay(parent, name, title)
{
setBackgroundColor(KSGRD::Style->backgroundColor());
monitor = new PrivateListView( frame() );
Q_CHECK_PTR(monitor);
- monitor->setSelectionMode(QListView::NoSelection);
+ monitor->setSelectionMode(TQListView::NoSelection);
monitor->setItemMargin(2);
setMinimumSize(50, 25);
@@ -219,7 +219,7 @@ ListView::ListView(QWidget* parent, const char* name, const QString& title, int,
}
bool
-ListView::addSensor(const QString& hostName, const QString& sensorName, const QString& sensorType, const QString& title)
+ListView::addSensor(const TQString& hostName, const TQString& sensorName, const TQString& sensorType, const TQString& title)
{
if (sensorType != "listview")
return (false);
@@ -243,7 +243,7 @@ ListView::updateList()
}
void
-ListView::answerReceived(int id, const QString& answer)
+ListView::answerReceived(int id, const TQString& answer)
{
/* We received something, so the sensor is probably ok. */
sensorError(id, false);
@@ -279,23 +279,23 @@ ListView::answerReceived(int id, const QString& answer)
}
void
-ListView::resizeEvent(QResizeEvent*)
+ListView::resizeEvent(TQResizeEvent*)
{
frame()->setGeometry(0, 0, width(), height());
monitor->setGeometry(10, 20, width() - 20, height() - 30);
}
bool
-ListView::restoreSettings(QDomElement& element)
+ListView::restoreSettings(TQDomElement& element)
{
addSensor(element.attribute("hostName"), element.attribute("sensorName"), (element.attribute("sensorType").isEmpty() ? "listview" : element.attribute("sensorType")), element.attribute("title"));
- QColorGroup colorGroup = monitor->colorGroup();
- colorGroup.setColor(QColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor()));
- colorGroup.setColor(QColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor()));
- colorGroup.setColor(QColorGroup::Base, restoreColor(element, "backgroundColor", KSGRD::Style->backgroundColor()));
+ TQColorGroup colorGroup = monitor->colorGroup();
+ colorGroup.setColor(TQColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor()));
+ colorGroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor()));
+ colorGroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", KSGRD::Style->backgroundColor()));
- monitor->setPalette(QPalette(colorGroup, colorGroup, colorGroup));
+ monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup));
SensorDisplay::restoreSettings(element);
@@ -305,16 +305,16 @@ ListView::restoreSettings(QDomElement& element)
}
bool
-ListView::saveSettings(QDomDocument& doc, QDomElement& element, bool save)
+ListView::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
{
element.setAttribute("hostName", sensors().at(0)->hostName());
element.setAttribute("sensorName", sensors().at(0)->name());
element.setAttribute("sensorType", sensors().at(0)->type());
- QColorGroup colorGroup = monitor->colorGroup();
- saveColor(element, "gridColor", colorGroup.color(QColorGroup::Link));
- saveColor(element, "textColor", colorGroup.color(QColorGroup::Text));
- saveColor(element, "backgroundColor", colorGroup.color(QColorGroup::Base));
+ TQColorGroup colorGroup = monitor->colorGroup();
+ saveColor(element, "gridColor", colorGroup.color(TQColorGroup::Link));
+ saveColor(element, "textColor", colorGroup.color(TQColorGroup::Text));
+ saveColor(element, "backgroundColor", colorGroup.color(TQColorGroup::Base));
SensorDisplay::saveSettings(doc, element);
@@ -329,12 +329,12 @@ ListView::configureSettings()
{
lvs = new ListViewSettings(this, "ListViewSettings");
Q_CHECK_PTR(lvs);
- connect(lvs, SIGNAL(applyClicked()), SLOT(applySettings()));
+ connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings()));
- QColorGroup colorGroup = monitor->colorGroup();
- lvs->setGridColor(colorGroup.color(QColorGroup::Link));
- lvs->setTextColor(colorGroup.color(QColorGroup::Text));
- lvs->setBackgroundColor(colorGroup.color(QColorGroup::Base));
+ TQColorGroup colorGroup = monitor->colorGroup();
+ lvs->setGridColor(colorGroup.color(TQColorGroup::Link));
+ lvs->setTextColor(colorGroup.color(TQColorGroup::Text));
+ lvs->setBackgroundColor(colorGroup.color(TQColorGroup::Base));
lvs->setTitle(title());
if (lvs->exec())
@@ -347,11 +347,11 @@ ListView::configureSettings()
void
ListView::applySettings()
{
- QColorGroup colorGroup = monitor->colorGroup();
- colorGroup.setColor(QColorGroup::Link, lvs->gridColor());
- colorGroup.setColor(QColorGroup::Text, lvs->textColor());
- colorGroup.setColor(QColorGroup::Base, lvs->backgroundColor());
- monitor->setPalette(QPalette(colorGroup, colorGroup, colorGroup));
+ TQColorGroup colorGroup = monitor->colorGroup();
+ colorGroup.setColor(TQColorGroup::Link, lvs->gridColor());
+ colorGroup.setColor(TQColorGroup::Text, lvs->textColor());
+ colorGroup.setColor(TQColorGroup::Base, lvs->backgroundColor());
+ monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup));
setTitle(lvs->title());
@@ -361,11 +361,11 @@ ListView::applySettings()
void
ListView::applyStyle()
{
- QColorGroup colorGroup = monitor->colorGroup();
- colorGroup.setColor(QColorGroup::Link, KSGRD::Style->firstForegroundColor());
- colorGroup.setColor(QColorGroup::Text, KSGRD::Style->secondForegroundColor());
- colorGroup.setColor(QColorGroup::Base, KSGRD::Style->backgroundColor());
- monitor->setPalette(QPalette(colorGroup, colorGroup, colorGroup));
+ TQColorGroup colorGroup = monitor->colorGroup();
+ colorGroup.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor());
+ colorGroup.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor());
+ colorGroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
+ monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup));
setModified(true);
}
diff --git a/ksysguard/gui/SensorDisplayLib/ListView.h b/ksysguard/gui/SensorDisplayLib/ListView.h
index 4b96329c0..c5e0a550c 100644
--- a/ksysguard/gui/SensorDisplayLib/ListView.h
+++ b/ksysguard/gui/SensorDisplayLib/ListView.h
@@ -24,8 +24,8 @@
#ifndef _ListView_h_
#define _ListView_h_
-#include <qlistview.h>
-#include <qpainter.h>
+#include <tqlistview.h>
+#include <tqpainter.h>
#include <SensorDisplay.h>
@@ -41,15 +41,15 @@ class PrivateListView : public QListView
public:
enum ColumnType { Text, Int, Float, Time, DiskStat };
- PrivateListView(QWidget *parent = 0, const char *name = 0);
+ PrivateListView(TQWidget *parent = 0, const char *name = 0);
- void addColumn(const QString& label, const QString& type);
+ void addColumn(const TQString& label, const TQString& type);
void removeColumns(void);
- void update(const QString& answer);
+ void update(const TQString& answer);
int columnType( uint pos ) const;
private:
- QStringList mColumnTypes;
+ TQStringList mColumnTypes;
};
class PrivateListViewItem : public QListViewItem
@@ -57,43 +57,43 @@ class PrivateListViewItem : public QListViewItem
public:
PrivateListViewItem(PrivateListView *parent = 0);
- void paintCell(QPainter *p, const QColorGroup &, int column, int width, int alignment) {
- QColorGroup cgroup = _parent->colorGroup();
- QListViewItem::paintCell(p, cgroup, column, width, alignment);
- p->setPen(cgroup.color(QColorGroup::Link));
+ void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int alignment) {
+ TQColorGroup cgroup = _parent->colorGroup();
+ TQListViewItem::paintCell(p, cgroup, column, width, alignment);
+ p->setPen(cgroup.color(TQColorGroup::Link));
p->drawLine(0, height() - 1, width - 1, height() - 1);
}
- void paintFocus(QPainter *, const QColorGroup, const QRect) {}
+ void paintFocus(TQPainter *, const TQColorGroup, const TQRect) {}
- virtual int compare( QListViewItem*, int column, bool ascending ) const;
+ virtual int compare( TQListViewItem*, int column, bool ascending ) const;
private:
- QWidget *_parent;
+ TQWidget *_parent;
};
class ListView : public KSGRD::SensorDisplay
{
Q_OBJECT
public:
- ListView(QWidget* parent = 0, const char* name = 0,
- const QString& = QString::null, int min = 0, int max = 0);
+ ListView(TQWidget* parent = 0, const char* name = 0,
+ const TQString& = TQString::null, int min = 0, int max = 0);
~ListView() {}
- bool addSensor(const QString& hostName, const QString& sensorName, const QString& sensorType, const QString& sensorDescr);
- void answerReceived(int id, const QString& answer);
- void resizeEvent(QResizeEvent*);
+ bool addSensor(const TQString& hostName, const TQString& sensorName, const TQString& sensorType, const TQString& sensorDescr);
+ void answerReceived(int id, const TQString& answer);
+ void resizeEvent(TQResizeEvent*);
void updateList();
- bool restoreSettings(QDomElement& element);
- bool saveSettings(QDomDocument& doc, QDomElement& element, bool save = true);
+ bool restoreSettings(TQDomElement& element);
+ bool saveSettings(TQDomDocument& doc, TQDomElement& element, bool save = true);
virtual bool hasSettingsDialog() const
{
return (true);
}
- virtual void timerEvent(QTimerEvent*)
+ virtual void timerEvent(TQTimerEvent*)
{
updateList();
}
diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc b/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc
index 15822206e..81a9b2d41 100644
--- a/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc
@@ -22,7 +22,7 @@
#include <klocale.h>
-ListViewSettings::ListViewSettings( QWidget *parent, const char *name )
+ListViewSettings::ListViewSettings( TQWidget *parent, const char *name )
: KDialogBase( parent, name, true, i18n( "List View Settings" ),
Ok|Apply|Cancel, Ok, true )
{
@@ -30,42 +30,42 @@ ListViewSettings::ListViewSettings( QWidget *parent, const char *name )
setMainWidget( m_settingsWidget );
}
-QString ListViewSettings::title() const
+TQString ListViewSettings::title() const
{
return m_settingsWidget->title();
}
-QColor ListViewSettings::textColor() const
+TQColor ListViewSettings::textColor() const
{
return m_settingsWidget->textColor();
}
-QColor ListViewSettings::backgroundColor() const
+TQColor ListViewSettings::backgroundColor() const
{
return m_settingsWidget->backgroundColor();
}
-QColor ListViewSettings::gridColor() const
+TQColor ListViewSettings::gridColor() const
{
return m_settingsWidget->gridColor();
}
-void ListViewSettings::setTitle( const QString &title )
+void ListViewSettings::setTitle( const TQString &title )
{
m_settingsWidget->setTitle( title );
}
-void ListViewSettings::setBackgroundColor( const QColor &c )
+void ListViewSettings::setBackgroundColor( const TQColor &c )
{
m_settingsWidget->setBackgroundColor( c );
}
-void ListViewSettings::setTextColor( const QColor &c )
+void ListViewSettings::setTextColor( const TQColor &c )
{
m_settingsWidget->setTextColor( c );
}
-void ListViewSettings::setGridColor( const QColor &c )
+void ListViewSettings::setGridColor( const TQColor &c )
{
m_settingsWidget->setGridColor( c );
}
diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettings.h b/ksysguard/gui/SensorDisplayLib/ListViewSettings.h
index 9a9790791..06a0b4002 100644
--- a/ksysguard/gui/SensorDisplayLib/ListViewSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/ListViewSettings.h
@@ -23,8 +23,8 @@
#include <kdialogbase.h>
-#include <qstring.h>
-#include <qcolor.h>
+#include <tqstring.h>
+#include <tqcolor.h>
class ListViewSettingsWidget;
@@ -34,17 +34,17 @@ class ListViewSettings : public KDialogBase
public:
- ListViewSettings( QWidget *parent=0, const char *name=0 );
+ ListViewSettings( TQWidget *parent=0, const char *name=0 );
- QString title() const;
- QColor textColor() const;
- QColor backgroundColor() const;
- QColor gridColor() const;
+ TQString title() const;
+ TQColor textColor() const;
+ TQColor backgroundColor() const;
+ TQColor gridColor() const;
- void setTitle( const QString & );
- void setTextColor( const QColor & );
- void setBackgroundColor( const QColor & );
- void setGridColor( const QColor & );
+ void setTitle( const TQString & );
+ void setTextColor( const TQColor & );
+ void setBackgroundColor( const TQColor & );
+ void setGridColor( const TQColor & );
private:
diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui.h b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui.h
index 14ff5990d..e12bf2132 100644
--- a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui.h
+++ b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui.h
@@ -8,49 +8,49 @@
*****************************************************************************/
-QString ListViewSettingsWidget::title()
+TQString ListViewSettingsWidget::title()
{
return m_title->text();
}
-QColor ListViewSettingsWidget::gridColor()
+TQColor ListViewSettingsWidget::gridColor()
{
return m_gridColor->color();
}
-QColor ListViewSettingsWidget::backgroundColor()
+TQColor ListViewSettingsWidget::backgroundColor()
{
return m_backgroundColor->color();
}
-QColor ListViewSettingsWidget::textColor()
+TQColor ListViewSettingsWidget::textColor()
{
return m_textColor->color();
}
-void ListViewSettingsWidget::setTitle( const QString &t )
+void ListViewSettingsWidget::setTitle( const TQString &t )
{
m_title->setText(t);
}
-void ListViewSettingsWidget::setBackgroundColor( const QColor &c )
+void ListViewSettingsWidget::setBackgroundColor( const TQColor &c )
{
m_backgroundColor->setColor(c);
}
-void ListViewSettingsWidget::setTextColor( const QColor &c )
+void ListViewSettingsWidget::setTextColor( const TQColor &c )
{
m_textColor->setColor(c);
}
-void ListViewSettingsWidget::setGridColor( const QColor &c )
+void ListViewSettingsWidget::setGridColor( const TQColor &c )
{
m_gridColor->setColor(c);
}
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc
index 9db4c7116..7de7899ab 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.cc
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc
@@ -21,11 +21,11 @@
#include <stdio.h>
#include <sys/types.h>
-#include <qpushbutton.h>
-#include <qregexp.h>
+#include <tqpushbutton.h>
+#include <tqregexp.h>
-#include <qfile.h>
-#include <qlistbox.h>
+#include <tqfile.h>
+#include <tqlistbox.h>
#include <kfontdialog.h>
#include <kdebug.h>
@@ -36,10 +36,10 @@
#include "LogFile.moc"
-LogFile::LogFile(QWidget *parent, const char *name, const QString& title)
+LogFile::LogFile(TQWidget *parent, const char *name, const TQString& title)
: KSGRD::SensorDisplay(parent, name, title)
{
- monitor = new QListBox(this);
+ monitor = new TQListBox(this);
Q_CHECK_PTR(monitor);
setMinimumSize(50, 25);
@@ -51,20 +51,20 @@ LogFile::LogFile(QWidget *parent, const char *name, const QString& title)
LogFile::~LogFile(void)
{
- sendRequest(sensors().at(0)->hostName(), QString("logfile_unregister %1" ).arg(logFileID), 43);
+ sendRequest(sensors().at(0)->hostName(), TQString("logfile_unregister %1" ).arg(logFileID), 43);
}
bool
-LogFile::addSensor(const QString& hostName, const QString& sensorName, const QString& sensorType, const QString& title)
+LogFile::addSensor(const TQString& hostName, const TQString& sensorName, const TQString& sensorType, const TQString& title)
{
if (sensorType != "logfile")
return (false);
registerSensor(new KSGRD::SensorProperties(hostName, sensorName, sensorType, title));
- QString sensorID = sensorName.right(sensorName.length() - (sensorName.findRev("/") + 1));
+ TQString sensorID = sensorName.right(sensorName.length() - (sensorName.findRev("/") + 1));
- sendRequest(sensors().at(0)->hostName(), QString("logfile_register %1" ).arg(sensorID), 42);
+ sendRequest(sensors().at(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42);
if (title.isEmpty())
setTitle(sensors().at(0)->hostName() + ":" + sensorID);
@@ -79,7 +79,7 @@ LogFile::addSensor(const QString& hostName, const QString& sensorName, const QSt
void LogFile::configureSettings(void)
{
- QColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->colorGroup();
lfs = new LogFileSettings(this);
Q_CHECK_PTR(lfs);
@@ -92,16 +92,16 @@ void LogFile::configureSettings(void)
lfs->ruleList->insertStringList(filterRules);
lfs->title->setText(title());
- connect(lfs->okButton, SIGNAL(clicked()), lfs, SLOT(accept()));
- connect(lfs->applyButton, SIGNAL(clicked()), this, SLOT(applySettings()));
- connect(lfs->cancelButton, SIGNAL(clicked()), lfs, SLOT(reject()));
+ connect(lfs->okButton, TQT_SIGNAL(clicked()), lfs, TQT_SLOT(accept()));
+ connect(lfs->applyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(applySettings()));
+ connect(lfs->cancelButton, TQT_SIGNAL(clicked()), lfs, TQT_SLOT(reject()));
- connect(lfs->fontButton, SIGNAL(clicked()), this, SLOT(settingsFontSelection()));
- connect(lfs->addButton, SIGNAL(clicked()), this, SLOT(settingsAddRule()));
- connect(lfs->deleteButton, SIGNAL(clicked()), this, SLOT(settingsDeleteRule()));
- connect(lfs->changeButton, SIGNAL(clicked()), this, SLOT(settingsChangeRule()));
- connect(lfs->ruleList, SIGNAL(selected(int)), this, SLOT(settingsRuleListSelected(int)));
- connect(lfs->ruleText, SIGNAL(returnPressed()), this, SLOT(settingsAddRule()));
+ connect(lfs->fontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsFontSelection()));
+ connect(lfs->addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsAddRule()));
+ connect(lfs->deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsDeleteRule()));
+ connect(lfs->changeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsChangeRule()));
+ connect(lfs->ruleList, TQT_SIGNAL(selected(int)), this, TQT_SLOT(settingsRuleListSelected(int)));
+ connect(lfs->ruleText, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(settingsAddRule()));
if (lfs->exec()) {
applySettings();
@@ -113,7 +113,7 @@ void LogFile::configureSettings(void)
void LogFile::settingsFontSelection()
{
- QFont tmpFont = lfs->fontButton->font();
+ TQFont tmpFont = lfs->fontButton->font();
if (KFontDialog::getFont(tmpFont) == KFontDialog::Accepted) {
lfs->fontButton->setFont(tmpFont);
@@ -147,11 +147,11 @@ void LogFile::settingsRuleListSelected(int index)
void LogFile::applySettings(void)
{
- QColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->colorGroup();
- cgroup.setColor(QColorGroup::Text, lfs->fgColor->color());
- cgroup.setColor(QColorGroup::Base, lfs->bgColor->color());
- monitor->setPalette(QPalette(cgroup, cgroup, cgroup));
+ cgroup.setColor(TQColorGroup::Text, lfs->fgColor->color());
+ cgroup.setColor(TQColorGroup::Base, lfs->bgColor->color());
+ monitor->setPalette(TQPalette(cgroup, cgroup, cgroup));
monitor->setFont(lfs->fontButton->font());
filterRules.clear();
@@ -166,33 +166,33 @@ void LogFile::applySettings(void)
void
LogFile::applyStyle()
{
- QColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->colorGroup();
- cgroup.setColor(QColorGroup::Text, KSGRD::Style->firstForegroundColor());
- cgroup.setColor(QColorGroup::Base, KSGRD::Style->backgroundColor());
- monitor->setPalette(QPalette(cgroup, cgroup, cgroup));
+ cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor());
+ cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
+ monitor->setPalette(TQPalette(cgroup, cgroup, cgroup));
setModified(true);
}
bool
-LogFile::restoreSettings(QDomElement& element)
+LogFile::restoreSettings(TQDomElement& element)
{
- QFont font;
- QColorGroup cgroup = monitor->colorGroup();
+ TQFont font;
+ TQColorGroup cgroup = monitor->colorGroup();
- cgroup.setColor(QColorGroup::Text, restoreColor(element, "textColor", Qt::green));
- cgroup.setColor(QColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black));
- monitor->setPalette(QPalette(cgroup, cgroup, cgroup));
+ cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green));
+ cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black));
+ monitor->setPalette(TQPalette(cgroup, cgroup, cgroup));
addSensor(element.attribute("hostName"), element.attribute("sensorName"), (element.attribute("sensorType").isEmpty() ? "logfile" : element.attribute("sensorType")), element.attribute("title"));
font.fromString( element.attribute( "font" ) );
monitor->setFont(font);
- QDomNodeList dnList = element.elementsByTagName("filter");
+ TQDomNodeList dnList = element.elementsByTagName("filter");
for (uint i = 0; i < dnList.count(); i++) {
- QDomElement element = dnList.item(i).toElement();
+ TQDomElement element = dnList.item(i).toElement();
filterRules.append(element.attribute("rule"));
}
@@ -204,7 +204,7 @@ LogFile::restoreSettings(QDomElement& element)
}
bool
-LogFile::saveSettings(QDomDocument& doc, QDomElement& element, bool save)
+LogFile::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
{
element.setAttribute("hostName", sensors().at(0)->hostName());
element.setAttribute("sensorName", sensors().at(0)->name());
@@ -215,10 +215,10 @@ LogFile::saveSettings(QDomDocument& doc, QDomElement& element, bool save)
saveColor(element, "textColor", monitor->colorGroup().text());
saveColor(element, "backgroundColor", monitor->colorGroup().base());
- for (QStringList::Iterator it = filterRules.begin();
+ for (TQStringList::Iterator it = filterRules.begin();
it != filterRules.end(); it++)
{
- QDomElement filter = doc.createElement("filter");
+ TQDomElement filter = doc.createElement("filter");
filter.setAttribute("rule", (*it));
element.appendChild(filter);
}
@@ -235,11 +235,11 @@ void
LogFile::updateMonitor()
{
sendRequest(sensors().at(0)->hostName(),
- QString("%1 %2" ).arg(sensors().at(0)->name()).arg(logFileID), 19);
+ TQString("%1 %2" ).arg(sensors().at(0)->name()).arg(logFileID), 19);
}
void
-LogFile::answerReceived(int id, const QString& answer)
+LogFile::answerReceived(int id, const TQString& answer)
{
/* We received something, so the sensor is probably ok. */
sensorError(id, false);
@@ -255,10 +255,10 @@ LogFile::answerReceived(int id, const QString& answer)
monitor->insertItem(lines[i], -1);
- for (QStringList::Iterator it = filterRules.begin(); it != filterRules.end(); it++) {
- QRegExp *expr = new QRegExp((*it).latin1());
+ for (TQStringList::Iterator it = filterRules.begin(); it != filterRules.end(); it++) {
+ TQRegExp *expr = new TQRegExp((*it).latin1());
if (expr->search(lines[i].latin1()) != -1) {
- KNotifyClient::event(winId(), "pattern_match", QString("rule '%1' matched").arg((*it).latin1()));
+ KNotifyClient::event(winId(), "pattern_match", TQString("rule '%1' matched").arg((*it).latin1()));
}
delete expr;
}
@@ -278,7 +278,7 @@ LogFile::answerReceived(int id, const QString& answer)
}
void
-LogFile::resizeEvent(QResizeEvent*)
+LogFile::resizeEvent(TQResizeEvent*)
{
frame()->setGeometry(0, 0, this->width(), this->height());
monitor->setGeometry(10, 20, this->width() - 20, this->height() - 30);
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.h b/ksysguard/gui/SensorDisplayLib/LogFile.h
index 9428f934d..c17cc91eb 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.h
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.h
@@ -26,10 +26,10 @@
class QFile;
class QListBox;
-#include <qdom.h>
-#include <qpopupmenu.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqdom.h>
+#include <tqpopupmenu.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <SensorDisplay.h>
@@ -39,22 +39,22 @@ class LogFile : public KSGRD::SensorDisplay
{
Q_OBJECT
public:
- LogFile(QWidget *parent = 0, const char *name = 0, const QString& title = 0);
+ LogFile(TQWidget *parent = 0, const char *name = 0, const TQString& title = 0);
~LogFile(void);
- bool addSensor(const QString& hostName, const QString& sensorName,
- const QString& sensorType, const QString& sensorDescr);
- void answerReceived(int id, const QString& answer);
- void resizeEvent(QResizeEvent*);
+ bool addSensor(const TQString& hostName, const TQString& sensorName,
+ const TQString& sensorType, const TQString& sensorDescr);
+ void answerReceived(int id, const TQString& answer);
+ void resizeEvent(TQResizeEvent*);
- bool restoreSettings(QDomElement& element);
- bool saveSettings(QDomDocument& doc, QDomElement& element, bool save = true);
+ bool restoreSettings(TQDomElement& element);
+ bool saveSettings(TQDomDocument& doc, TQDomElement& element, bool save = true);
void updateMonitor(void);
void configureSettings(void);
- virtual void timerEvent(QTimerEvent*)
+ virtual void timerEvent(TQTimerEvent*)
{
updateMonitor();
}
@@ -76,8 +76,8 @@ public slots:
private:
LogFileSettings* lfs;
- QListBox* monitor;
- QStringList filterRules;
+ TQListBox* monitor;
+ TQStringList filterRules;
unsigned long logFileID;
};
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc
index 14e805b9d..8a9cc9b60 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc
@@ -24,9 +24,9 @@
#include <math.h>
#include <stdlib.h>
-#include <qdom.h>
-#include <qlcdnumber.h>
-#include <qtooltip.h>
+#include <tqdom.h>
+#include <tqlcdnumber.h>
+#include <tqtooltip.h>
#include <kdebug.h>
@@ -36,8 +36,8 @@
#include "MultiMeter.moc"
#include "MultiMeterSettings.h"
-MultiMeter::MultiMeter(QWidget* parent, const char* name,
- const QString& title, double, double, bool nf, bool isApplet)
+MultiMeter::MultiMeter(TQWidget* parent, const char* name,
+ const TQString& title, double, double, bool nf, bool isApplet)
: KSGRD::SensorDisplay(parent, name, title, nf, isApplet)
{
setShowUnit( true );
@@ -47,14 +47,14 @@ MultiMeter::MultiMeter(QWidget* parent, const char* name,
normalDigitColor = KSGRD::Style->firstForegroundColor();
alarmDigitColor = KSGRD::Style->alarmColor();
if (noFrame())
- lcd = new QLCDNumber(this, "meterLCD");
+ lcd = new TQLCDNumber(this, "meterLCD");
else
- lcd = new QLCDNumber(frame(), "meterLCD");
+ lcd = new TQLCDNumber(frame(), "meterLCD");
Q_CHECK_PTR(lcd);
- lcd->setSegmentStyle(QLCDNumber::Filled);
+ lcd->setSegmentStyle(TQLCDNumber::Filled);
setDigitColor(KSGRD::Style->backgroundColor());
- lcd->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,
- QSizePolicy::Expanding, false));
+ lcd->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
+ TQSizePolicy::Expanding, false));
setBackgroundColor(KSGRD::Style->backgroundColor());
/* All RMB clicks to the lcd widget will be handled by
@@ -68,8 +68,8 @@ MultiMeter::MultiMeter(QWidget* parent, const char* name,
}
bool
-MultiMeter::addSensor(const QString& hostName, const QString& sensorName,
- const QString& sensorType, const QString& title)
+MultiMeter::addSensor(const TQString& hostName, const TQString& sensorName,
+ const TQString& sensorType, const TQString& title)
{
if (sensorType != "integer" && sensorType != "float")
return (false);
@@ -80,15 +80,15 @@ MultiMeter::addSensor(const QString& hostName, const QString& sensorName,
* requests we use 100 for info requests. */
sendRequest(hostName, sensorName + "?", 100);
- QToolTip::remove(lcd);
- QToolTip::add(lcd, QString("%1:%2").arg(hostName).arg(sensorName));
+ TQToolTip::remove(lcd);
+ TQToolTip::add(lcd, TQString("%1:%2").arg(hostName).arg(sensorName));
setModified(true);
return (true);
}
void
-MultiMeter::answerReceived(int id, const QString& answer)
+MultiMeter::answerReceived(int id, const TQString& answer)
{
/* We received something, so the sensor is probably ok. */
sensorError(id, false);
@@ -131,7 +131,7 @@ MultiMeter::answerReceived(int id, const QString& answer)
}
void
-MultiMeter::resizeEvent(QResizeEvent*)
+MultiMeter::resizeEvent(TQResizeEvent*)
{
if (noFrame())
lcd->setGeometry(0, 0, width(), height());
@@ -140,7 +140,7 @@ MultiMeter::resizeEvent(QResizeEvent*)
}
bool
-MultiMeter::restoreSettings(QDomElement& element)
+MultiMeter::restoreSettings(TQDomElement& element)
{
lowerLimitActive = element.attribute("lowerLimitActive").toInt();
lowerLimit = element.attribute("lowerLimit").toLong();
@@ -164,7 +164,7 @@ MultiMeter::restoreSettings(QDomElement& element)
}
bool
-MultiMeter::saveSettings(QDomDocument& doc, QDomElement& element, bool save)
+MultiMeter::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
{
element.setAttribute("hostName", sensors().at(0)->hostName());
element.setAttribute("sensorName", sensors().at(0)->name());
@@ -202,7 +202,7 @@ MultiMeter::configureSettings()
mms->setAlarmDigitColor(alarmDigitColor);
mms->setMeterBackgroundColor(lcd->backgroundColor());
- connect(mms, SIGNAL(applyClicked()), SLOT(applySettings()));
+ connect(mms, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings()));
if (mms->exec())
applySettings();
@@ -239,20 +239,20 @@ MultiMeter::applyStyle()
}
void
-MultiMeter::setDigitColor(const QColor& col)
+MultiMeter::setDigitColor(const TQColor& col)
{
- QPalette p = lcd->palette();
- p.setColor(QColorGroup::Foreground, col);
+ TQPalette p = lcd->palette();
+ p.setColor(TQColorGroup::Foreground, col);
lcd->setPalette(p);
}
void
-MultiMeter::setBackgroundColor(const QColor& col)
+MultiMeter::setBackgroundColor(const TQColor& col)
{
lcd->setBackgroundColor(col);
- QPalette p = lcd->palette();
- p.setColor(QColorGroup::Light, col);
- p.setColor(QColorGroup::Dark, col);
+ TQPalette p = lcd->palette();
+ p.setColor(TQColorGroup::Light, col);
+ p.setColor(TQColorGroup::Dark, col);
lcd->setPalette(p);
}
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.h b/ksysguard/gui/SensorDisplayLib/MultiMeter.h
index 58d2477c1..43c85be24 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeter.h
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.h
@@ -36,19 +36,19 @@ class MultiMeter : public KSGRD::SensorDisplay
Q_OBJECT
public:
- MultiMeter(QWidget* parent = 0, const char* name = 0,
- const QString& = QString::null, double min = 0, double max = 0, bool nf = false, bool isApplet = false);
+ MultiMeter(TQWidget* parent = 0, const char* name = 0,
+ const TQString& = TQString::null, double min = 0, double max = 0, bool nf = false, bool isApplet = false);
virtual ~MultiMeter()
{
}
- bool addSensor(const QString& hostName, const QString& sensorName,
- const QString& sensorType, const QString& sensorDescr);
- void answerReceived(int id, const QString& answer);
- void resizeEvent(QResizeEvent*);
+ bool addSensor(const TQString& hostName, const TQString& sensorName,
+ const TQString& sensorType, const TQString& sensorDescr);
+ void answerReceived(int id, const TQString& answer);
+ void resizeEvent(TQResizeEvent*);
- bool restoreSettings(QDomElement& element);
- bool saveSettings(QDomDocument& doc, QDomElement& element, bool save = true);
+ bool restoreSettings(TQDomElement& element);
+ bool saveSettings(TQDomDocument& doc, TQDomElement& element, bool save = true);
virtual bool hasSettingsDialog() const
{
@@ -62,12 +62,12 @@ public slots:
void applyStyle();
private:
- void setDigitColor(const QColor& col);
- void setBackgroundColor(const QColor& col);
+ void setDigitColor(const TQColor& col);
+ void setBackgroundColor(const TQColor& col);
- QLCDNumber* lcd;
- QColor normalDigitColor;
- QColor alarmDigitColor;
+ TQLCDNumber* lcd;
+ TQColor normalDigitColor;
+ TQColor alarmDigitColor;
MultiMeterSettings* mms;
bool lowerLimitActive;
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc
index 9114c583b..436c8540f 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc
@@ -22,7 +22,7 @@
#include <klocale.h>
-MultiMeterSettings::MultiMeterSettings( QWidget *parent, const char *name )
+MultiMeterSettings::MultiMeterSettings( TQWidget *parent, const char *name )
: KDialogBase( parent, name, true, i18n( "Multimeter Settings" ),
Ok|Apply|Cancel, Ok, true )
{
@@ -30,7 +30,7 @@ MultiMeterSettings::MultiMeterSettings( QWidget *parent, const char *name )
setMainWidget( m_settingsWidget );
}
-QString MultiMeterSettings::title()
+TQString MultiMeterSettings::title()
{
return m_settingsWidget->title();
}
@@ -60,22 +60,22 @@ double MultiMeterSettings::upperLimit()
return m_settingsWidget->upperLimit();
}
-QColor MultiMeterSettings::normalDigitColor()
+TQColor MultiMeterSettings::normalDigitColor()
{
return m_settingsWidget->normalDigitColor();
}
-QColor MultiMeterSettings::alarmDigitColor()
+TQColor MultiMeterSettings::alarmDigitColor()
{
return m_settingsWidget->alarmDigitColor();
}
-QColor MultiMeterSettings::meterBackgroundColor()
+TQColor MultiMeterSettings::meterBackgroundColor()
{
return m_settingsWidget->meterBackgroundColor();
}
-void MultiMeterSettings::setTitle( const QString &title )
+void MultiMeterSettings::setTitle( const TQString &title )
{
m_settingsWidget->setTitle( title );
}
@@ -105,17 +105,17 @@ void MultiMeterSettings::setUpperLimit( double limit )
m_settingsWidget->setUpperLimit( limit );
}
-void MultiMeterSettings::setNormalDigitColor( const QColor &c )
+void MultiMeterSettings::setNormalDigitColor( const TQColor &c )
{
m_settingsWidget->setNormalDigitColor( c );
}
-void MultiMeterSettings::setAlarmDigitColor( const QColor &c )
+void MultiMeterSettings::setAlarmDigitColor( const TQColor &c )
{
m_settingsWidget->setAlarmDigitColor( c );
}
-void MultiMeterSettings::setMeterBackgroundColor( const QColor &c )
+void MultiMeterSettings::setMeterBackgroundColor( const TQColor &c )
{
m_settingsWidget->setMeterBackgroundColor( c );
}
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h
index 516a02128..e05946a08 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h
@@ -23,8 +23,8 @@
#include <kdialogbase.h>
-#include <qstring.h>
-#include <qcolor.h>
+#include <tqstring.h>
+#include <tqcolor.h>
class MultiMeterSettingsWidget;
@@ -34,27 +34,27 @@ class MultiMeterSettings : public KDialogBase
public:
- MultiMeterSettings( QWidget *parent=0, const char *name=0 );
+ MultiMeterSettings( TQWidget *parent=0, const char *name=0 );
- QString title();
+ TQString title();
bool showUnit();
bool lowerLimitActive();
bool upperLimitActive();
double lowerLimit();
double upperLimit();
- QColor normalDigitColor();
- QColor alarmDigitColor();
- QColor meterBackgroundColor();
+ TQColor normalDigitColor();
+ TQColor alarmDigitColor();
+ TQColor meterBackgroundColor();
- void setTitle( const QString & );
+ void setTitle( const TQString & );
void setShowUnit( bool );
void setLowerLimitActive( bool );
void setUpperLimitActive( bool );
void setLowerLimit( double );
void setUpperLimit( double );
- void setNormalDigitColor( const QColor & );
- void setAlarmDigitColor( const QColor & );
- void setMeterBackgroundColor( const QColor & );
+ void setNormalDigitColor( const TQColor & );
+ void setAlarmDigitColor( const TQColor & );
+ void setMeterBackgroundColor( const TQColor & );
private:
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
index 81d6e73f6..e97fabffc 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
@@ -15,7 +15,7 @@ void MultiMeterSettingsWidget::init()
m_title->setFocus();
}
-QString MultiMeterSettingsWidget::title()
+TQString MultiMeterSettingsWidget::title()
{
return m_title->text();
}
@@ -51,25 +51,25 @@ double MultiMeterSettingsWidget::upperLimit()
}
-QColor MultiMeterSettingsWidget::normalDigitColor()
+TQColor MultiMeterSettingsWidget::normalDigitColor()
{
return m_normalDigitColor->color();
}
-QColor MultiMeterSettingsWidget::alarmDigitColor()
+TQColor MultiMeterSettingsWidget::alarmDigitColor()
{
return m_alarmDigitColor->color();
}
-QColor MultiMeterSettingsWidget::meterBackgroundColor()
+TQColor MultiMeterSettingsWidget::meterBackgroundColor()
{
return m_backgroundColor->color();
}
-void MultiMeterSettingsWidget::setTitle( const QString &s )
+void MultiMeterSettingsWidget::setTitle( const TQString &s )
{
m_title->setText(s);
}
@@ -89,7 +89,7 @@ void MultiMeterSettingsWidget::setLowerLimitActive( bool b )
void MultiMeterSettingsWidget::setLowerLimit( double d )
{
- m_lowerLimit->setText(QString("%1").arg(d));
+ m_lowerLimit->setText(TQString("%1").arg(d));
}
@@ -101,23 +101,23 @@ void MultiMeterSettingsWidget::setUpperLimitActive( bool b )
void MultiMeterSettingsWidget::setUpperLimit( double d )
{
- m_upperLimit->setText(QString("%1").arg(d));
+ m_upperLimit->setText(TQString("%1").arg(d));
}
-void MultiMeterSettingsWidget::setNormalDigitColor( const QColor &c )
+void MultiMeterSettingsWidget::setNormalDigitColor( const TQColor &c )
{
m_normalDigitColor->setColor(c);
}
-void MultiMeterSettingsWidget::setAlarmDigitColor( const QColor &c )
+void MultiMeterSettingsWidget::setAlarmDigitColor( const TQColor &c )
{
m_alarmDigitColor->setColor(c);
}
-void MultiMeterSettingsWidget::setMeterBackgroundColor( const QColor &c )
+void MultiMeterSettingsWidget::setMeterBackgroundColor( const TQColor &c )
{
m_backgroundColor->setColor(c);
}
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
index b9fcd4f06..f02b02af9 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
@@ -23,7 +23,7 @@
#include <assert.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -37,40 +37,40 @@
#include "ProcessController.moc"
#include "SignalIDs.h"
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qgroupbox.h>
-#include <qlayout.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqgroupbox.h>
+#include <tqlayout.h>
#include <kapplication.h>
#include <kpushbutton.h>
-ProcessController::ProcessController(QWidget* parent, const char* name, const QString &title, bool nf)
+ProcessController::ProcessController(TQWidget* parent, const char* name, const TQString &title, bool nf)
: KSGRD::SensorDisplay(parent, name, title, nf)
{
dict.setAutoDelete(true);
- dict.insert("Name", new QString(i18n("Name")));
- dict.insert("PID", new QString(i18n("PID")));
- dict.insert("PPID", new QString(i18n("PPID")));
- dict.insert("UID", new QString(i18n("UID")));
- dict.insert("GID", new QString(i18n("GID")));
- dict.insert("Status", new QString(i18n("Status")));
- dict.insert("User%", new QString(i18n("User%")));
- dict.insert("System%", new QString(i18n("System%")));
- dict.insert("Nice", new QString(i18n("Nice")));
- dict.insert("VmSize", new QString(i18n("VmSize")));
- dict.insert("VmRss", new QString(i18n("VmRss")));
- dict.insert("Login", new QString(i18n("Login")));
- dict.insert("Command", new QString(i18n("Command")));
+ dict.insert("Name", new TQString(i18n("Name")));
+ dict.insert("PID", new TQString(i18n("PID")));
+ dict.insert("PPID", new TQString(i18n("PPID")));
+ dict.insert("UID", new TQString(i18n("UID")));
+ dict.insert("GID", new TQString(i18n("GID")));
+ dict.insert("Status", new TQString(i18n("Status")));
+ dict.insert("User%", new TQString(i18n("User%")));
+ dict.insert("System%", new TQString(i18n("System%")));
+ dict.insert("Nice", new TQString(i18n("Nice")));
+ dict.insert("VmSize", new TQString(i18n("VmSize")));
+ dict.insert("VmRss", new TQString(i18n("VmRss")));
+ dict.insert("Login", new TQString(i18n("Login")));
+ dict.insert("Command", new TQString(i18n("Command")));
// Setup the geometry management.
- gm = new QVBoxLayout(this, 10);
+ gm = new TQVBoxLayout(this, 10);
Q_CHECK_PTR(gm);
gm->addSpacing(15);
- gmSearch = new QHBoxLayout();
+ gmSearch = new TQHBoxLayout();
Q_CHECK_PTR(gmSearch);
gm->addLayout(gmSearch, 0);
@@ -81,17 +81,17 @@ ProcessController::ProcessController(QWidget* parent, const char* name, const QS
pListSearchLine = new KListViewSearchLineWidget(pList, this, "process_list_search_line");
gmSearch->addWidget(pListSearchLine, 1);
- connect(pList, SIGNAL(killProcess(int, int)),
- this, SLOT(killProcess(int, int)));
- connect(pList, SIGNAL(reniceProcess(const QValueList<int> &, int)),
- this, SLOT(reniceProcess(const QValueList<int> &, int)));
- connect(pList, SIGNAL(listModified(bool)),
- this, SLOT(setModified(bool)));
+ connect(pList, TQT_SIGNAL(killProcess(int, int)),
+ this, TQT_SLOT(killProcess(int, int)));
+ connect(pList, TQT_SIGNAL(reniceProcess(const TQValueList<int> &, int)),
+ this, TQT_SLOT(reniceProcess(const TQValueList<int> &, int)));
+ connect(pList, TQT_SIGNAL(listModified(bool)),
+ this, TQT_SLOT(setModified(bool)));
/* Create the combo box to configure the process filter. The
* cbFilter must be created prior to constructing pList as the
* pList constructor sets cbFilter to its start value. */
- cbFilter = new QComboBox(this, "pList_cbFilter");
+ cbFilter = new TQComboBox(this, "pList_cbFilter");
Q_CHECK_PTR(cbFilter);
gmSearch->addWidget(cbFilter,0);
cbFilter->insertItem(i18n("All Processes"), 0);
@@ -100,30 +100,30 @@ ProcessController::ProcessController(QWidget* parent, const char* name, const QS
cbFilter->insertItem(i18n("Own Processes"), 3);
cbFilter->setMinimumSize(cbFilter->sizeHint());
// Create the check box to switch between tree view and list view.
- xbTreeView = new QCheckBox(i18n("&Tree"), this, "xbTreeView");
+ xbTreeView = new TQCheckBox(i18n("&Tree"), this, "xbTreeView");
Q_CHECK_PTR(xbTreeView);
xbTreeView->setMinimumSize(xbTreeView->sizeHint());
- connect(xbTreeView, SIGNAL(toggled(bool)),
- this, SLOT(setTreeView(bool)));
+ connect(xbTreeView, TQT_SIGNAL(toggled(bool)),
+ this, TQT_SLOT(setTreeView(bool)));
/* When the both cbFilter and pList are constructed we can connect the
* missing link. */
- connect(cbFilter, SIGNAL(activated(int)),
- this, SLOT(filterModeChanged(int)));
+ connect(cbFilter, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(filterModeChanged(int)));
// Create the 'Refresh' button.
bRefresh = new KPushButton( KGuiItem( i18n( "&Refresh" ), "reload" ),
this, "bRefresh" );
Q_CHECK_PTR(bRefresh);
bRefresh->setMinimumSize(bRefresh->sizeHint());
- connect(bRefresh, SIGNAL(clicked()), this, SLOT(updateList()));
+ connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList()));
// Create the 'Kill' button.
bKill = new KPushButton(i18n("&Kill"), this, "bKill");
Q_CHECK_PTR(bKill);
bKill->setMinimumSize(bKill->sizeHint());
- connect(bKill, SIGNAL(clicked()), this, SLOT(killProcess()));
+ connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess()));
/* Disable the kill button until we know that the daemon supports the
* kill command. */
bKill->setEnabled(false);
@@ -131,7 +131,7 @@ ProcessController::ProcessController(QWidget* parent, const char* name, const QS
gm->addWidget(pList, 1);
- gm1 = new QHBoxLayout();
+ gm1 = new TQHBoxLayout();
Q_CHECK_PTR(gm1);
gm->addLayout(gm1, 0);
gm1->addStretch();
@@ -154,7 +154,7 @@ ProcessController::ProcessController(QWidget* parent, const char* name, const QS
void ProcessController::setSearchFocus() {
//stupid search line widget. See rant in fixTabOrder
if(!pListSearchLine->searchLine())
- QTimer::singleShot(100, this, SLOT(setSearchFocus()));
+ TQTimer::singleShot(100, this, TQT_SLOT(setSearchFocus()));
else {
pListSearchLine->searchLine()->setFocus();
}
@@ -167,7 +167,7 @@ void ProcessController::fixTabOrder() {
//
//Did i mention I hate this?
if(!pListSearchLine->searchLine())
- QTimer::singleShot(100, this, SLOT(fixTabOrder()));
+ TQTimer::singleShot(100, this, TQT_SLOT(fixTabOrder()));
else {
setTabOrder(pListSearchLine->searchLine(), cbFilter);
setTabOrder(cbFilter, pList);
@@ -178,19 +178,19 @@ void ProcessController::fixTabOrder() {
}
void
-ProcessController::resizeEvent(QResizeEvent* ev)
+ProcessController::resizeEvent(TQResizeEvent* ev)
{
if(frame())
frame()->setGeometry(0, 0, width(), height());
- QWidget::resizeEvent(ev);
+ TQWidget::resizeEvent(ev);
}
bool
-ProcessController::addSensor(const QString& hostName,
- const QString& sensorName,
- const QString& sensorType,
- const QString& title)
+ProcessController::addSensor(const TQString& hostName,
+ const TQString& sensorName,
+ const TQString& sensorType,
+ const TQString& title)
{
if (sensorType != "table")
return (false);
@@ -220,11 +220,11 @@ void
ProcessController::killProcess(int pid, int sig)
{
sendRequest(sensors().at(0)->hostName(),
- QString("kill %1 %2" ).arg(pid).arg(sig), 3);
+ TQString("kill %1 %2" ).arg(pid).arg(sig), 3);
if ( !timerOn() )
// give ksysguardd time to update its proccess list
- QTimer::singleShot(3000, this, SLOT(updateList()));
+ TQTimer::singleShot(3000, this, TQT_SLOT(updateList()));
else
updateList();
}
@@ -232,7 +232,7 @@ ProcessController::killProcess(int pid, int sig)
void
ProcessController::killProcess()
{
- const QStringList& selectedAsStrings = pList->getSelectedAsStrings();
+ const TQStringList& selectedAsStrings = pList->getSelectedAsStrings();
if (selectedAsStrings.isEmpty())
{
KMessageBox::sorry(this,
@@ -241,7 +241,7 @@ ProcessController::killProcess()
}
else
{
- QString msg = i18n("Do you want to kill the selected process?",
+ TQString msg = i18n("Do you want to kill the selected process?",
"Do you want to kill the %n selected processes?",
selectedAsStrings.count());
@@ -253,7 +253,7 @@ ProcessController::killProcess()
bool dontAgain = false;
- int res = KMessageBox::createKMessageBox(dlg, QMessageBox::Question,
+ int res = KMessageBox::createKMessageBox(dlg, TQMessageBox::Question,
msg, selectedAsStrings,
i18n("Do not ask again"), &dontAgain,
KMessageBox::Notify);
@@ -264,32 +264,32 @@ ProcessController::killProcess()
}
}
- const QValueList<int>& selectedPIds = pList->getSelectedPIds();
+ const TQValueList<int>& selectedPIds = pList->getSelectedPIds();
// send kill signal to all seleted processes
- QValueListConstIterator<int> it;
+ TQValueListConstIterator<int> it;
for (it = selectedPIds.begin(); it != selectedPIds.end(); ++it)
- sendRequest(sensors().at(0)->hostName(), QString("kill %1 %2" ).arg(*it)
+ sendRequest(sensors().at(0)->hostName(), TQString("kill %1 %2" ).arg(*it)
.arg(MENU_ID_SIGKILL), 3);
if ( !timerOn())
// give ksysguardd time to update its proccess list
- QTimer::singleShot(3000, this, SLOT(updateList()));
+ TQTimer::singleShot(3000, this, TQT_SLOT(updateList()));
else
updateList();
}
void
-ProcessController::reniceProcess(const QValueList<int> &pids, int niceValue)
+ProcessController::reniceProcess(const TQValueList<int> &pids, int niceValue)
{
- for( QValueList<int>::ConstIterator it = pids.constBegin(), end = pids.constEnd(); it != end; ++it )
+ for( TQValueList<int>::ConstIterator it = pids.constBegin(), end = pids.constEnd(); it != end; ++it )
sendRequest(sensors().at(0)->hostName(),
- QString("setpriority %1 %2" ).arg(*it).arg(niceValue), 5);
+ TQString("setpriority %1 %2" ).arg(*it).arg(niceValue), 5);
sendRequest(sensors().at(0)->hostName(), "ps", 2); //update the display afterwards
}
void
-ProcessController::answerReceived(int id, const QString& answer)
+ProcessController::answerReceived(int id, const TQString& answer)
{
/* We received something, so the sensor is probably ok. */
sensorError(id, false);
@@ -314,7 +314,7 @@ ProcessController::answerReceived(int id, const QString& answer)
pList->removeColumns();
for (unsigned int i = 0; i < headers.count(); i++)
{
- QString header;
+ TQString header;
if (dict[headers[i]])
header = *dict[headers[i]];
else
@@ -421,11 +421,11 @@ ProcessController::sensorError(int, bool err)
}
bool
-ProcessController::restoreSettings(QDomElement& element)
+ProcessController::restoreSettings(TQDomElement& element)
{
bool result = addSensor(element.attribute("hostName"),
element.attribute("sensorName"), (element.attribute("sensorType").isEmpty() ? "table" : element.attribute("sensorType")),
- QString::null);
+ TQString::null);
xbTreeView->setChecked(element.attribute("tree").toInt());
setTreeView(element.attribute("tree").toInt());
@@ -450,7 +450,7 @@ ProcessController::restoreSettings(QDomElement& element)
}
bool
-ProcessController::saveSettings(QDomDocument& doc, QDomElement& element, bool save)
+ProcessController::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
{
element.setAttribute("hostName", sensors().at(0)->hostName());
element.setAttribute("sensorName", sensors().at(0)->name());
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.h b/ksysguard/gui/SensorDisplayLib/ProcessController.h
index f834efbb6..45b5e5df8 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.h
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.h
@@ -24,8 +24,8 @@
#ifndef _ProcessController_h_
#define _ProcessController_h_
-#include <qdict.h>
-#include <qwidget.h>
+#include <tqdict.h>
+#include <tqwidget.h>
#include <kapplication.h>
@@ -54,28 +54,28 @@ class ProcessController : public KSGRD::SensorDisplay
Q_OBJECT
public:
- ProcessController(QWidget* parent = 0, const char* name = 0, const QString &title = QString::null, bool nf = false);
+ ProcessController(TQWidget* parent = 0, const char* name = 0, const TQString &title = TQString::null, bool nf = false);
virtual ~ProcessController() { }
- void resizeEvent(QResizeEvent*);
+ void resizeEvent(TQResizeEvent*);
- bool restoreSettings(QDomElement& element);
+ bool restoreSettings(TQDomElement& element);
- bool saveSettings(QDomDocument& doc, QDomElement& element, bool save = true);
+ bool saveSettings(TQDomDocument& doc, TQDomElement& element, bool save = true);
void refreshList(void)
{
updateList();
}
- virtual void timerEvent(QTimerEvent*)
+ virtual void timerEvent(TQTimerEvent*)
{
updateList();
}
- virtual bool addSensor(const QString&, const QString&, const QString&, const QString&);
+ virtual bool addSensor(const TQString&, const TQString&, const TQString&, const TQString&);
- virtual void answerReceived(int id, const QString& answer);
+ virtual void answerReceived(int id, const TQString& answer);
virtual void sensorError(int, bool err);
@@ -117,7 +117,7 @@ public slots:
void killProcess();
void killProcess(int pid, int sig);
- void reniceProcess(const QValueList<int> &pids, int niceValue);
+ void reniceProcess(const TQValueList<int> &pids, int niceValue);
void updateList();
@@ -125,30 +125,30 @@ signals:
void setFilterMode(int);
private:
- QVBoxLayout* gm;
+ TQVBoxLayout* gm;
bool killSupported;
/// The process list.
ProcessList* pList;
///Layout for the search line and process filter combo box
- QHBoxLayout* gmSearch;
+ TQHBoxLayout* gmSearch;
KListViewSearchLineWidget *pListSearchLine;
- QHBoxLayout* gm1;
+ TQHBoxLayout* gm1;
/// Checkbox to switch between tree and list view
- QCheckBox* xbTreeView;
+ TQCheckBox* xbTreeView;
/// This combo boxes control the process filter.
- QComboBox* cbFilter;
+ TQComboBox* cbFilter;
/// These buttons force an immedeate refresh or kill a process.
KPushButton* bRefresh;
KPushButton* bKill;
/// Dictionary for header translations.
- QDict<QString> dict;
+ TQDict<TQString> dict;
};
#endif
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
index 6d158c872..2f5b3fe51 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
@@ -35,10 +35,10 @@
#include <sys/types.h>
#include <unistd.h>
-#include <qbitmap.h>
-#include <qheader.h>
-#include <qimage.h>
-#include <qpopupmenu.h>
+#include <tqbitmap.h>
+#include <tqheader.h>
+#include <tqimage.h>
+#include <tqpopupmenu.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -57,9 +57,9 @@
//extern const char* timeKey(const char* text);
//extern const char* floatKey(const char* text);
-QDict<QString> ProcessList::aliases;
+TQDict<TQString> ProcessList::aliases;
-int ProcessLVI::compare( QListViewItem *item, int col, bool ascending ) const
+int ProcessLVI::compare( TQListViewItem *item, int col, bool ascending ) const
{
int type = ((ProcessList*)listView())->columnType( col );
@@ -100,133 +100,133 @@ int ProcessLVI::compare( QListViewItem *item, int col, bool ascending ) const
return key( col, ascending ).localeAwareCompare( item->key( col, ascending ) );
}
-ProcessList::ProcessList(QWidget *parent, const char* name)
+ProcessList::ProcessList(TQWidget *parent, const char* name)
: KListView(parent, name)
{
iconCache.setAutoDelete(true);
columnDict.setAutoDelete(true);
columnDict.insert("running",
- new QString(i18n("process status", "running")));
+ new TQString(i18n("process status", "running")));
columnDict.insert("sleeping",
- new QString(i18n("process status", "sleeping")));
+ new TQString(i18n("process status", "sleeping")));
columnDict.insert("disk sleep",
- new QString(i18n("process status", "disk sleep")));
- columnDict.insert("zombie", new QString(i18n("process status", "zombie")));
+ new TQString(i18n("process status", "disk sleep")));
+ columnDict.insert("zombie", new TQString(i18n("process status", "zombie")));
columnDict.insert("stopped",
- new QString(i18n("process status", "stopped")));
- columnDict.insert("paging", new QString(i18n("process status", "paging")));
- columnDict.insert("idle", new QString(i18n("process status", "idle")));
+ new TQString(i18n("process status", "stopped")));
+ columnDict.insert("paging", new TQString(i18n("process status", "paging")));
+ columnDict.insert("idle", new TQString(i18n("process status", "idle")));
if (aliases.isEmpty())
{
#ifdef Q_OS_LINUX
- aliases.insert("init", new QString("penguin"));
+ aliases.insert("init", new TQString("penguin"));
#else
- aliases.insert("init", new QString("system"));
+ aliases.insert("init", new TQString("system"));
#endif
/* kernel stuff */
- aliases.insert("bdflush", new QString("kernel"));
- aliases.insert("dhcpcd", new QString("kernel"));
- aliases.insert("kapm-idled", new QString("kernel"));
- aliases.insert("keventd", new QString("kernel"));
- aliases.insert("khubd", new QString("kernel"));
- aliases.insert("klogd", new QString("kernel"));
- aliases.insert("kreclaimd", new QString("kernel"));
- aliases.insert("kreiserfsd", new QString("kernel"));
- aliases.insert("ksoftirqd_CPU0", new QString("kernel"));
- aliases.insert("ksoftirqd_CPU1", new QString("kernel"));
- aliases.insert("ksoftirqd_CPU2", new QString("kernel"));
- aliases.insert("ksoftirqd_CPU3", new QString("kernel"));
- aliases.insert("ksoftirqd_CPU4", new QString("kernel"));
- aliases.insert("ksoftirqd_CPU5", new QString("kernel"));
- aliases.insert("ksoftirqd_CPU6", new QString("kernel"));
- aliases.insert("ksoftirqd_CPU7", new QString("kernel"));
- aliases.insert("kswapd", new QString("kernel"));
- aliases.insert("kupdated", new QString("kernel"));
- aliases.insert("mdrecoveryd", new QString("kernel"));
- aliases.insert("scsi_eh_0", new QString("kernel"));
- aliases.insert("scsi_eh_1", new QString("kernel"));
- aliases.insert("scsi_eh_2", new QString("kernel"));
- aliases.insert("scsi_eh_3", new QString("kernel"));
- aliases.insert("scsi_eh_4", new QString("kernel"));
- aliases.insert("scsi_eh_5", new QString("kernel"));
- aliases.insert("scsi_eh_6", new QString("kernel"));
- aliases.insert("scsi_eh_7", new QString("kernel"));
+ aliases.insert("bdflush", new TQString("kernel"));
+ aliases.insert("dhcpcd", new TQString("kernel"));
+ aliases.insert("kapm-idled", new TQString("kernel"));
+ aliases.insert("keventd", new TQString("kernel"));
+ aliases.insert("khubd", new TQString("kernel"));
+ aliases.insert("klogd", new TQString("kernel"));
+ aliases.insert("kreclaimd", new TQString("kernel"));
+ aliases.insert("kreiserfsd", new TQString("kernel"));
+ aliases.insert("ksoftirqd_CPU0", new TQString("kernel"));
+ aliases.insert("ksoftirqd_CPU1", new TQString("kernel"));
+ aliases.insert("ksoftirqd_CPU2", new TQString("kernel"));
+ aliases.insert("ksoftirqd_CPU3", new TQString("kernel"));
+ aliases.insert("ksoftirqd_CPU4", new TQString("kernel"));
+ aliases.insert("ksoftirqd_CPU5", new TQString("kernel"));
+ aliases.insert("ksoftirqd_CPU6", new TQString("kernel"));
+ aliases.insert("ksoftirqd_CPU7", new TQString("kernel"));
+ aliases.insert("kswapd", new TQString("kernel"));
+ aliases.insert("kupdated", new TQString("kernel"));
+ aliases.insert("mdrecoveryd", new TQString("kernel"));
+ aliases.insert("scsi_eh_0", new TQString("kernel"));
+ aliases.insert("scsi_eh_1", new TQString("kernel"));
+ aliases.insert("scsi_eh_2", new TQString("kernel"));
+ aliases.insert("scsi_eh_3", new TQString("kernel"));
+ aliases.insert("scsi_eh_4", new TQString("kernel"));
+ aliases.insert("scsi_eh_5", new TQString("kernel"));
+ aliases.insert("scsi_eh_6", new TQString("kernel"));
+ aliases.insert("scsi_eh_7", new TQString("kernel"));
/* daemon and other service providers */
- aliases.insert("artsd", new QString("daemon"));
- aliases.insert("atd", new QString("daemon"));
- aliases.insert("automount", new QString("daemon"));
- aliases.insert("cardmgr", new QString("daemon"));
- aliases.insert("cron", new QString("daemon"));
- aliases.insert("cupsd", new QString("daemon"));
- aliases.insert("in.identd", new QString("daemon"));
- aliases.insert("lpd", new QString("daemon"));
- aliases.insert("mingetty", new QString("daemon"));
- aliases.insert("nscd", new QString("daemon"));
- aliases.insert("portmap", new QString("daemon"));
- aliases.insert("rpc.statd", new QString("daemon"));
- aliases.insert("rpciod", new QString("daemon"));
- aliases.insert("sendmail", new QString("daemon"));
- aliases.insert("sshd", new QString("daemon"));
- aliases.insert("syslogd", new QString("daemon"));
- aliases.insert("usbmgr", new QString("daemon"));
- aliases.insert("wwwoffled", new QString("daemon"));
- aliases.insert("xntpd", new QString("daemon"));
- aliases.insert("ypbind", new QString("daemon"));
+ aliases.insert("artsd", new TQString("daemon"));
+ aliases.insert("atd", new TQString("daemon"));
+ aliases.insert("automount", new TQString("daemon"));
+ aliases.insert("cardmgr", new TQString("daemon"));
+ aliases.insert("cron", new TQString("daemon"));
+ aliases.insert("cupsd", new TQString("daemon"));
+ aliases.insert("in.identd", new TQString("daemon"));
+ aliases.insert("lpd", new TQString("daemon"));
+ aliases.insert("mingetty", new TQString("daemon"));
+ aliases.insert("nscd", new TQString("daemon"));
+ aliases.insert("portmap", new TQString("daemon"));
+ aliases.insert("rpc.statd", new TQString("daemon"));
+ aliases.insert("rpciod", new TQString("daemon"));
+ aliases.insert("sendmail", new TQString("daemon"));
+ aliases.insert("sshd", new TQString("daemon"));
+ aliases.insert("syslogd", new TQString("daemon"));
+ aliases.insert("usbmgr", new TQString("daemon"));
+ aliases.insert("wwwoffled", new TQString("daemon"));
+ aliases.insert("xntpd", new TQString("daemon"));
+ aliases.insert("ypbind", new TQString("daemon"));
/* kde applications */
- aliases.insert("appletproxy", new QString("kdeapp"));
- aliases.insert("dcopserver", new QString("kdeapp"));
- aliases.insert("kcookiejar", new QString("kdeapp"));
- aliases.insert("kde", new QString("kdeapp"));
- aliases.insert("kded", new QString("kdeapp"));
- aliases.insert("kdeinit", new QString("kdeapp"));
- aliases.insert("kdesktop", new QString("kdeapp"));
- aliases.insert("kdesud", new QString("kdeapp"));
- aliases.insert("kdm", new QString("kdeapp"));
- aliases.insert("khotkeys", new QString("kdeapp"));
- aliases.insert("kio_file", new QString("kdeapp"));
- aliases.insert("kio_uiserver", new QString("kdeapp"));
- aliases.insert("klauncher", new QString("kdeapp"));
- aliases.insert("ksmserver", new QString("kdeapp"));
- aliases.insert("kwrapper", new QString("kdeapp"));
- aliases.insert("kwrited", new QString("kdeapp"));
- aliases.insert("kxmlrpcd", new QString("kdeapp"));
- aliases.insert("startkde", new QString("kdeapp"));
+ aliases.insert("appletproxy", new TQString("kdeapp"));
+ aliases.insert("dcopserver", new TQString("kdeapp"));
+ aliases.insert("kcookiejar", new TQString("kdeapp"));
+ aliases.insert("kde", new TQString("kdeapp"));
+ aliases.insert("kded", new TQString("kdeapp"));
+ aliases.insert("kdeinit", new TQString("kdeapp"));
+ aliases.insert("kdesktop", new TQString("kdeapp"));
+ aliases.insert("kdesud", new TQString("kdeapp"));
+ aliases.insert("kdm", new TQString("kdeapp"));
+ aliases.insert("khotkeys", new TQString("kdeapp"));
+ aliases.insert("kio_file", new TQString("kdeapp"));
+ aliases.insert("kio_uiserver", new TQString("kdeapp"));
+ aliases.insert("klauncher", new TQString("kdeapp"));
+ aliases.insert("ksmserver", new TQString("kdeapp"));
+ aliases.insert("kwrapper", new TQString("kdeapp"));
+ aliases.insert("kwrited", new TQString("kdeapp"));
+ aliases.insert("kxmlrpcd", new TQString("kdeapp"));
+ aliases.insert("startkde", new TQString("kdeapp"));
/* other processes */
- aliases.insert("bash", new QString("shell"));
- aliases.insert("cat", new QString("tools"));
- aliases.insert("egrep", new QString("tools"));
- aliases.insert("emacs", new QString("wordprocessing"));
- aliases.insert("fgrep", new QString("tools"));
- aliases.insert("find", new QString("tools"));
- aliases.insert("grep", new QString("tools"));
- aliases.insert("ksh", new QString("shell"));
- aliases.insert("screen", new QString("openterm"));
- aliases.insert("sh", new QString("shell"));
- aliases.insert("sort", new QString("tools"));
- aliases.insert("ssh", new QString("shell"));
- aliases.insert("su", new QString("tools"));
- aliases.insert("tcsh", new QString("shell"));
- aliases.insert("tee", new QString("tools"));
- aliases.insert("vi", new QString("wordprocessing"));
+ aliases.insert("bash", new TQString("shell"));
+ aliases.insert("cat", new TQString("tools"));
+ aliases.insert("egrep", new TQString("tools"));
+ aliases.insert("emacs", new TQString("wordprocessing"));
+ aliases.insert("fgrep", new TQString("tools"));
+ aliases.insert("find", new TQString("tools"));
+ aliases.insert("grep", new TQString("tools"));
+ aliases.insert("ksh", new TQString("shell"));
+ aliases.insert("screen", new TQString("openterm"));
+ aliases.insert("sh", new TQString("shell"));
+ aliases.insert("sort", new TQString("tools"));
+ aliases.insert("ssh", new TQString("shell"));
+ aliases.insert("su", new TQString("tools"));
+ aliases.insert("tcsh", new TQString("shell"));
+ aliases.insert("tee", new TQString("tools"));
+ aliases.insert("vi", new TQString("wordprocessing"));
}
/* The filter mode is controlled by a combo box of the parent. If
* the mode is changed we get a signal. */
- connect(parent, SIGNAL(setFilterMode(int)),
- this, SLOT(setFilterMode(int)));
+ connect(parent, TQT_SIGNAL(setFilterMode(int)),
+ this, TQT_SLOT(setFilterMode(int)));
/* We need to catch this signal to show various popup menues. */
connect(this,
- SIGNAL(rightButtonPressed(QListViewItem*, const QPoint&, int)),
+ TQT_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)),
this,
- SLOT(handleRMBPressed(QListViewItem*, const QPoint&, int)));
+ TQT_SLOT(handleRMBPressed(TQListViewItem*, const TQPoint&, int)));
/* Since Qt does not tell us the sorting details we have to do our
* own bookkeping, so we can save and restore the sorting
* settings. */
- connect(header(), SIGNAL(clicked(int)), this, SLOT(sortingChanged(int)));
+ connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(sortingChanged(int)));
treeViewEnabled = false;
openAll = true;
@@ -243,18 +243,18 @@ ProcessList::ProcessList(QWidget *parent, const char* name)
setAllColumnsShowFocus(true);
setTreeStepSize(17);
setSorting(sortColumn, increasing);
- setSelectionMode(QListView::Extended);
+ setSelectionMode(TQListView::Extended);
// Create popup menu for RMB clicks on table header
- headerPM = new QPopupMenu();
+ headerPM = new TQPopupMenu();
headerPM->insertItem(i18n("Remove Column"), HEADER_REMOVE);
headerPM->insertItem(i18n("Add Column"), HEADER_ADD);
headerPM->insertItem(i18n("Help on Column"), HEADER_HELP);
- connect(header(), SIGNAL(sizeChange(int, int, int)),
- this, SLOT(sizeChanged(int, int, int)));
- connect(header(), SIGNAL(indexChange(int, int, int)),
- this, SLOT(indexChanged(int, int, int)));
+ connect(header(), TQT_SIGNAL(sizeChange(int, int, int)),
+ this, TQT_SLOT(sizeChanged(int, int, int)));
+ connect(header(), TQT_SIGNAL(indexChange(int, int, int)),
+ this, TQT_SLOT(indexChanged(int, int, int)));
killSupported = false;
setModified(false);
@@ -265,34 +265,34 @@ ProcessList::~ProcessList()
delete(headerPM);
}
-const QValueList<int>&
+const TQValueList<int>&
ProcessList::getSelectedPIds()
{
selectedPIds.clear();
// iterate through all selected visible items of the listview
- QListViewItemIterator it(this, QListViewItemIterator::Visible | QListViewItemIterator::Selected );
+ TQListViewItemIterator it(this, TQListViewItemIterator::Visible | TQListViewItemIterator::Selected );
for ( ; it.current(); ++it )
selectedPIds.append(it.current()->text(1).toInt());
return (selectedPIds);
}
-const QStringList&
+const TQStringList&
ProcessList::getSelectedAsStrings()
{
selectedAsStrings.clear();
// iterate through all selected visible items of the listview
- QListViewItemIterator it(this, QListViewItemIterator::Visible | QListViewItemIterator::Selected );
- QString spaces;
+ TQListViewItemIterator it(this, TQListViewItemIterator::Visible | TQListViewItemIterator::Selected );
+ TQString spaces;
for ( ; it.current(); ++it ) {
- spaces.fill(QChar(' '), 7 - it.current()->text(1).length());
+ spaces.fill(TQChar(' '), 7 - it.current()->text(1).length());
selectedAsStrings.append("(PID: " + it.current()->text(1) + ")" + spaces + " " + it.current()->text(0));
}
return (selectedAsStrings);
}
bool
-ProcessList::update(const QString& list)
+ProcessList::update(const TQString& list)
{
/* Disable painting to avoid flickering effects,
* especially when in tree view mode.
@@ -312,7 +312,7 @@ ProcessList::update(const QString& list)
#if 0
// This is needed for debugging only.
kdDebug(1215) << list << endl;
- QString l;
+ TQString l;
for (uint j = 0; j < line->count(); j++)
l += (*line)[j] + "|";
kdDebug(1215) << "Incomplete ps line:" << l << endl;
@@ -336,7 +336,7 @@ ProcessList::update(const QString& list)
else
buildList();
- QListViewItemIterator it( this );
+ TQListViewItemIterator it( this );
while ( it.current() ) {
if ( itemPos( it.current() ) == currItemPos ) {
setCurrentItem( it.current() );
@@ -378,12 +378,12 @@ ProcessList::setTreeView(bool tv)
}
bool
-ProcessList::load(QDomElement& el)
+ProcessList::load(TQDomElement& el)
{
- QDomNodeList dnList = el.elementsByTagName("column");
+ TQDomNodeList dnList = el.elementsByTagName("column");
for (uint i = 0; i < dnList.count(); ++i)
{
- QDomElement lel = dnList.item(i).toElement();
+ TQDomElement lel = dnList.item(i).toElement();
if (savedWidth.count() <= i)
savedWidth.append(lel.attribute("savedWidth").toInt());
else
@@ -404,11 +404,11 @@ ProcessList::load(QDomElement& el)
}
bool
-ProcessList::save(QDomDocument& doc, QDomElement& display)
+ProcessList::save(TQDomDocument& doc, TQDomElement& display)
{
for (int i = 0; i < columns(); ++i)
{
- QDomElement col = doc.createElement("column");
+ TQDomElement col = doc.createElement("column");
display.appendChild(col);
col.setAttribute("currentWidth", columnWidth(i));
col.setAttribute("savedWidth", savedWidth[i]);
@@ -475,7 +475,7 @@ void
ProcessList::buildList()
{
/* Get the first process in the list, check whether it matches the
- * filter and append it to QListView widget if so. */
+ * filter and append it to TQListView widget if so. */
while (!pl.isEmpty())
{
KSGRD::SensorPSLine* p = pl.first();
@@ -553,7 +553,7 @@ ProcessList::isLeafProcess(int pid)
}
void
-ProcessList::extendTree(QPtrList<KSGRD::SensorPSLine>* pl, ProcessLVI* parent, int ppid)
+ProcessList::extendTree(TQPtrList<KSGRD::SensorPSLine>* pl, ProcessLVI* parent, int ppid)
{
KSGRD::SensorPSLine* ps;
@@ -599,13 +599,13 @@ ProcessList::extendTree(QPtrList<KSGRD::SensorPSLine>* pl, ProcessLVI* parent, i
void
ProcessList::addProcess(KSGRD::SensorPSLine* p, ProcessLVI* pli)
{
- QString name = p->name();
+ TQString name = p->name();
if (aliases[name])
name = *aliases[name];
/* Get icon from icon list that might be appropriate for a process
* with this name. */
- QPixmap pix;
+ TQPixmap pix;
if (!iconCache[name])
{
pix = KGlobal::iconLoader()->loadIcon(name, KIcon::Small,
@@ -621,7 +621,7 @@ ProcessList::addProcess(KSGRD::SensorPSLine* p, ProcessLVI* pli)
* scale the pixmaps already appropriately. Since I got a bug
* report claiming that it doesn't work with GNOME apps I've
* added this safeguard. */
- QImage img;
+ TQImage img;
img = pix;
img.smoothScale(16, 16);
pix = img;
@@ -629,17 +629,17 @@ ProcessList::addProcess(KSGRD::SensorPSLine* p, ProcessLVI* pli)
/* We copy the icon into a 24x16 pixmap to add a 4 pixel margin on
* the left and right side. In tree view mode we use the original
* icon. */
- QPixmap icon(24, 16, pix.depth());
+ TQPixmap icon(24, 16, pix.depth());
if (!treeViewEnabled)
{
icon.fill();
bitBlt(&icon, 4, 0, &pix, 0, 0, pix.width(), pix.height());
- QBitmap mask(24, 16, true);
+ TQBitmap mask(24, 16, true);
bitBlt(&mask, 4, 0, pix.mask(), 0, 0, pix.width(), pix.height());
icon.setMask(mask);
pix = icon;
}
- iconCache.insert(name, new QPixmap(pix));
+ iconCache.insert(name, new TQPixmap(pix));
}
else
pix = *(iconCache[name]);
@@ -668,7 +668,7 @@ ProcessList::updateMetaInfo(void)
selectedPIds.clear();
closedSubTrees.clear();
- QListViewItemIterator it(this);
+ TQListViewItemIterator it(this);
// iterate through all items of the listview
for ( ; it.current(); ++it )
@@ -679,7 +679,7 @@ ProcessList::updateMetaInfo(void)
closedSubTrees.append(it.current()->text(1).toInt());
}
- /* In list view mode all list items are set to closed by QListView.
+ /* In list view mode all list items are set to closed by TQListView.
* If the tree view is now selected, all item will be closed. This is
* annoying. So we use the openAll flag to force all trees to open when
* the treeViewEnbled flag was set to true. */
@@ -699,9 +699,9 @@ ProcessList::removeColumns(void)
}
void
-ProcessList::addColumn(const QString& label, const QString& type)
+ProcessList::addColumn(const TQString& label, const TQString& type)
{
- QListView::addColumn(label);
+ TQListView::addColumn(label);
uint col = columns() - 1;
if (type == "s" || type == "S")
setColumnAlignment(col, AlignLeft);
@@ -721,7 +721,7 @@ ProcessList::addColumn(const QString& label, const QString& type)
mColumnTypes.append(type);
/* Just use some sensible default values as initial setting. */
- QFontMetrics fm = fontMetrics();
+ TQFontMetrics fm = fontMetrics();
setColumnWidth(col, fm.width(label) + 10);
if (currentWidth.count() - 1 == col)
@@ -746,7 +746,7 @@ ProcessList::addColumn(const QString& label, const QString& type)
setColumnWidth(i, currentWidth[i]);
}
setColumnWidthMode(i, currentWidth[i] == 0 ?
- QListView::Manual : QListView::Maximum);
+ TQListView::Manual : TQListView::Maximum);
header()->moveSection(i, index[i]);
}
setSorting(sortColumn, increasing);
@@ -754,7 +754,7 @@ ProcessList::addColumn(const QString& label, const QString& type)
}
void
-ProcessList::handleRMBPressed(QListViewItem* lvi, const QPoint& p, int col)
+ProcessList::handleRMBPressed(TQListViewItem* lvi, const TQPoint& p, int col)
{
if (!lvi)
return;
@@ -768,13 +768,13 @@ ProcessList::handleRMBPressed(QListViewItem* lvi, const QPoint& p, int col)
int currentNiceValue = 0;
for (int i = 0; i < columns(); ++i)
- if (QString::compare(header()->label(i), i18n("Nice")) == 0)
+ if (TQString::compare(header()->label(i), i18n("Nice")) == 0)
currentNiceValue = lvi->text(i).toInt();
- QPopupMenu processPM;
+ TQPopupMenu processPM;
if (columnWidth(col) != 0)
processPM.insertItem(i18n("Hide Column"), 5);
- QPopupMenu* hiddenPM = new QPopupMenu(&processPM);
+ TQPopupMenu* hiddenPM = new TQPopupMenu(&processPM);
for (int i = 0; i < columns(); ++i)
if (columnWidth(i) == 0)
hiddenPM->insertItem(header()->label(i), i + 100);
@@ -786,7 +786,7 @@ ProcessList::handleRMBPressed(QListViewItem* lvi, const QPoint& p, int col)
processPM.insertItem(i18n("Select All Processes"), 1);
processPM.insertItem(i18n("Unselect All Processes"), 2);
- QPopupMenu* signalPM = new QPopupMenu(&processPM);
+ TQPopupMenu* signalPM = new TQPopupMenu(&processPM);
if (killSupported && lvi->isSelected())
{
processPM.insertSeparator();
@@ -839,7 +839,7 @@ ProcessList::handleRMBPressed(QListViewItem* lvi, const QPoint& p, int col)
selectAllChilds(currentPId, id & 1);
break;
case 5:
- setColumnWidthMode(col, QListView::Manual);
+ setColumnWidthMode(col, TQListView::Manual);
savedWidth[col] = columnWidth(col);
setColumnWidth(col, 0);
setModified(true);
@@ -861,7 +861,7 @@ ProcessList::handleRMBPressed(QListViewItem* lvi, const QPoint& p, int col)
/* we go through list to get all task also
when update interval is paused */
selectedPIds.clear();
- QListViewItemIterator it(this, QListViewItemIterator::Visible | QListViewItemIterator::Selected);
+ TQListViewItemIterator it(this, TQListViewItemIterator::Visible | TQListViewItemIterator::Selected);
// iterate through all selected visible items of the listview
for ( ; it.current(); ++it )
@@ -869,16 +869,16 @@ ProcessList::handleRMBPressed(QListViewItem* lvi, const QPoint& p, int col)
selectedPIds.append(it.current()->text(1).toInt());
}
- QString msg = i18n("Do you really want to send signal %1 to the selected process?",
+ TQString msg = i18n("Do you really want to send signal %1 to the selected process?",
"Do you really want to send signal %1 to the %n selected processes?",
selectedPIds.count())
.arg(signalPM->text(id));
int answ;
- switch(answ = KMessageBox::questionYesNo(this, msg, QString::null, i18n("Send"), KStdGuiItem::cancel()))
+ switch(answ = KMessageBox::questionYesNo(this, msg, TQString::null, i18n("Send"), KStdGuiItem::cancel()))
{
case KMessageBox::Yes:
{
- QValueList<int>::Iterator it;
+ TQValueList<int>::Iterator it;
for (it = selectedPIds.begin(); it != selectedPIds.end(); ++it)
emit (killProcess(*it, id));
break;
@@ -891,7 +891,7 @@ ProcessList::handleRMBPressed(QListViewItem* lvi, const QPoint& p, int col)
{
/* IDs >= 100 are used for hidden columns. */
int col = id - 100;
- setColumnWidthMode(col, QListView::Maximum);
+ setColumnWidthMode(col, TQListView::Maximum);
setColumnWidth(col, savedWidth[col]);
setModified(true);
}
@@ -903,7 +903,7 @@ ProcessList::selectAllItems(bool select)
{
selectedPIds.clear();
- QListViewItemIterator it(this, QListViewItemIterator::Visible);
+ TQListViewItemIterator it(this, TQListViewItemIterator::Visible);
// iterate through all items of the listview
for ( ; it.current(); ++it )
@@ -918,7 +918,7 @@ ProcessList::selectAllItems(bool select)
void
ProcessList::selectAllChilds(int pid, bool select)
{
- QListViewItemIterator it(this, QListViewItemIterator::Visible );
+ TQListViewItemIterator it(this, TQListViewItemIterator::Visible );
// iterate through all items of the listview
for ( ; it.current(); ++it )
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.h b/ksysguard/gui/SensorDisplayLib/ProcessList.h
index b3f484484..aac28a227 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.h
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.h
@@ -25,11 +25,11 @@
#ifndef _ProcessList_h_
#define _ProcessList_h_
-#include <qdict.h>
-#include <qdom.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qwidget.h>
+#include <tqdict.h>
+#include <tqdom.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
+#include <tqwidget.h>
#include <kiconloader.h>
#include <klistview.h>
@@ -40,22 +40,22 @@ typedef const char* (*KeyFunc)(const char*);
/**
* To support bi-directional sorting, and sorting of text, integers etc. we
- * need a specialized version of QListViewItem.
+ * need a specialized version of TQListViewItem.
*/
class ProcessLVI : public KListViewItem
{
public:
- ProcessLVI(QListView* lv) : KListViewItem(lv) { }
- ProcessLVI(QListViewItem* lvi) : KListViewItem(lvi) { }
+ ProcessLVI(TQListView* lv) : KListViewItem(lv) { }
+ ProcessLVI(TQListViewItem* lvi) : KListViewItem(lvi) { }
- virtual int compare( QListViewItem *item, int column, bool ) const;
+ virtual int compare( TQListViewItem *item, int column, bool ) const;
};
class QPopupMenu;
/**
* This class implementes a table filled with information about the running
- * processes. The table is derived from QListView.
+ * processes. The table is derived from TQListView.
*/
class ProcessList : public KListView
{
@@ -74,14 +74,14 @@ public:
enum ColumnType { Text, Int, Float, Time };
/// The constructor.
- ProcessList(QWidget* parent = 0, const char* name = 0);
+ ProcessList(TQWidget* parent = 0, const char* name = 0);
/// The destructor.
~ProcessList();
void removeColumns();
- void addColumn(const QString& header, const QString& type);
+ void addColumn(const TQString& header, const TQString& type);
void setSortColumn(uint col, bool inc)
{
@@ -100,8 +100,8 @@ public:
return increasing;
}
- const QValueList<int>& getSelectedPIds();
- const QStringList& getSelectedAsStrings();
+ const TQValueList<int>& getSelectedPIds();
+ const TQStringList& getSelectedAsStrings();
/**
* The udpate function can be used to update the displayed process
@@ -109,7 +109,7 @@ public:
* case the list contains invalid or corrupted info, FALSE is
* returned.
*/
- bool update(const QString& list);
+ bool update(const TQString& list);
int columnType( uint col ) const;
@@ -120,8 +120,8 @@ public:
killSupported = supported;
}
- bool load(QDomElement& el);
- bool save(QDomDocument& doc, QDomElement& display);
+ bool load(TQDomElement& el);
+ bool save(TQDomDocument& doc, TQDomElement& display);
public slots:
void setTreeView(bool tv);
@@ -140,7 +140,7 @@ public slots:
void sortingChanged(int col);
- void handleRMBPressed(QListViewItem* lvi, const QPoint& p, int col);
+ void handleRMBPressed(TQListViewItem* lvi, const TQPoint& p, int col);
void sizeChanged(int, int, int)
{
@@ -166,7 +166,7 @@ signals:
void killProcess(int pid, int sig);
// This signal is emitted when process pid should be reniced.
- void reniceProcess(const QValueList<int> &pids, int niceValue);
+ void reniceProcess(const TQValueList<int> &pids, int niceValue);
void listModified(bool);
@@ -195,7 +195,7 @@ private:
/**
* This function constructs the list of processes for list
* mode. It's a straightforward appending operation to the
- * QListView widget.
+ * TQListView widget.
*/
void buildList();
@@ -224,7 +224,7 @@ private:
* removing processes from the process list an inserting them into
* the tree.
*/
- void extendTree(QPtrList<KSGRD::SensorPSLine>* pl, ProcessLVI* parent, int ppid);
+ void extendTree(TQPtrList<KSGRD::SensorPSLine>* pl, ProcessLVI* parent, int ppid);
/**
* This function adds a process to the list/tree.
@@ -247,24 +247,24 @@ private:
/* The following lists are primarily used to store table specs between
* load() and the actual table creation in addColumn(). */
- QValueList<int> savedWidth;
- QValueList<int> currentWidth;
- QValueList<int> index;
+ TQValueList<int> savedWidth;
+ TQValueList<int> currentWidth;
+ TQValueList<int> index;
- QPtrList<KSGRD::SensorPSLine> pl;
+ TQPtrList<KSGRD::SensorPSLine> pl;
- QStringList mColumnTypes;
- QDict<QString> columnDict;
+ TQStringList mColumnTypes;
+ TQDict<TQString> columnDict;
- QValueList<int> selectedPIds;
- QValueList<int> closedSubTrees;
- QStringList selectedAsStrings;
+ TQValueList<int> selectedPIds;
+ TQValueList<int> closedSubTrees;
+ TQStringList selectedAsStrings;
- static QDict<QString> aliases;
+ static TQDict<TQString> aliases;
- QDict<QPixmap> iconCache;
+ TQDict<TQPixmap> iconCache;
- QPopupMenu* headerPM;
+ TQPopupMenu* headerPM;
};
#endif
diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
index 39c05eecf..dfd535883 100644
--- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
+++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
@@ -27,22 +27,22 @@
#include "ReniceDlg.moc"
-ReniceDlg::ReniceDlg(QWidget* parent, const char* name, int currentPPrio,
+ReniceDlg::ReniceDlg(TQWidget* parent, const char* name, int currentPPrio,
int pid)
: KDialogBase( parent, name, true, i18n("Renice Process"),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true )
{
- QWidget *page = new QWidget( this );
+ TQWidget *page = new TQWidget( this );
setMainWidget(page);
- vLay = new QVBoxLayout(page, 20, -1, "ReniceLayout");
+ vLay = new TQVBoxLayout(page, 20, -1, "ReniceLayout");
- QString msg;
+ TQString msg;
msg = i18n("You are about to change the scheduling priority of\n"
"process %1. Be aware that only the Superuser (root)\n"
"can decrease the nice level of a process. The lower\n"
"the number is the higher the priority.\n\n"
"Please enter the desired nice level:").arg(pid);
- message = new QLabel(msg, page);
+ message = new TQLabel(msg, page);
message->setMinimumSize(message->sizeHint());
vLay->addWidget(message);
diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.h b/ksysguard/gui/SensorDisplayLib/ReniceDlg.h
index d8f0d2685..1d490973c 100644
--- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.h
+++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.h
@@ -26,11 +26,11 @@
#define _ReniceDlg_h_
#include <kdialogbase.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlcdnumber.h>
-#include <qpushbutton.h>
-#include <qslider.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlcdnumber.h>
+#include <tqpushbutton.h>
+#include <tqslider.h>
class KIntNumInput;
@@ -43,18 +43,18 @@ class ReniceDlg : public KDialogBase
Q_OBJECT
public:
- ReniceDlg(QWidget* parent, const char* name, int currentPPrio, int pid);
+ ReniceDlg(TQWidget* parent, const char* name, int currentPPrio, int pid);
public slots:
void slotOk();
void slotCancel();
private:
- QBoxLayout* vLay;
- QBoxLayout* butLay;
- QBoxLayout* sldLay;
+ TQBoxLayout* vLay;
+ TQBoxLayout* butLay;
+ TQBoxLayout* sldLay;
- QLabel* message;
+ TQLabel* message;
KIntNumInput* input;
};
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
index 805c9a492..c80ad65ee 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
@@ -21,12 +21,12 @@
*/
-#include <qcheckbox.h>
-#include <qdom.h>
-#include <qpopupmenu.h>
-#include <qspinbox.h>
-#include <qwhatsthis.h>
-#include <qbitmap.h>
+#include <tqcheckbox.h>
+#include <tqdom.h>
+#include <tqpopupmenu.h>
+#include <tqspinbox.h>
+#include <tqwhatsthis.h>
+#include <tqbitmap.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -43,9 +43,9 @@
using namespace KSGRD;
-SensorDisplay::SensorDisplay( QWidget *parent, const char *name,
- const QString &title, bool nf, bool isApplet)
- : QWidget( parent, name )
+SensorDisplay::SensorDisplay( TQWidget *parent, const char *name,
+ const TQString &title, bool nf, bool isApplet)
+ : TQWidget( parent, name )
{
mIsApplet = isApplet;
mSensors.setAutoDelete( true );
@@ -61,10 +61,10 @@ SensorDisplay::SensorDisplay( QWidget *parent, const char *name,
mPlotterWdg = 0;
setTimerOn( true );
- QWhatsThis::add( this, "dummy" );
+ TQWhatsThis::add( this, "dummy" );
if(!nf) {
- mFrame = new QGroupBox( 2, Qt::Vertical, "", this, "displayFrame");
+ mFrame = new TQGroupBox( 2, Qt::Vertical, "", this, "displayFrame");
mFrame->setFlat(true);
mFrame->setAlignment(Qt::AlignHCenter);
mFrame->setInsideMargin(2);
@@ -101,7 +101,7 @@ void SensorDisplay::registerSensor( SensorProperties *sp )
* a case the user can re-enter the connect information and the
* connection will be established. */
if ( !SensorMgr->engageHost( sp->hostName() ) ) {
- QString msg = i18n( "It is impossible to connect to \'%1\'." ).arg( sp->hostName() );
+ TQString msg = i18n( "It is impossible to connect to \'%1\'." ).arg( sp->hostName() );
KMessageBox::error( this, msg );
}
@@ -140,24 +140,24 @@ void SensorDisplay::configureUpdateInterval()
}
}
-void SensorDisplay::timerEvent( QTimerEvent* )
+void SensorDisplay::timerEvent( TQTimerEvent* )
{
int i = 0;
for ( SensorProperties *s = mSensors.first(); s; s = mSensors.next(), ++i )
sendRequest( s->hostName(), s->name(), i );
}
-void SensorDisplay::resizeEvent( QResizeEvent* )
+void SensorDisplay::resizeEvent( TQResizeEvent* )
{
if(mFrame)
mFrame->setGeometry( rect() );
}
-bool SensorDisplay::eventFilter( QObject *object, QEvent *event )
+bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event )
{
- if ( event->type() == QEvent::MouseButtonPress &&
- ( (QMouseEvent*)event)->button() == RightButton ) {
- QPopupMenu pm;
+ if ( event->type() == TQEvent::MouseButtonPress &&
+ ( (TQMouseEvent*)event)->button() == RightButton ) {
+ TQPopupMenu pm;
if ( mIsApplet ) {
pm.insertItem( i18n( "Launch &System Guard"), 1 );
pm.insertSeparator();
@@ -172,7 +172,7 @@ bool SensorDisplay::eventFilter( QObject *object, QEvent *event )
else
pm.insertItem( i18n( "P&ause Update" ), 6 );
- switch ( pm.exec( QCursor::pos() ) ) {
+ switch ( pm.exec( TQCursor::pos() ) ) {
case 1:
KRun::run(*KService::serviceByDesktopName("ksysguard"), KURL::List());
break;
@@ -180,7 +180,7 @@ bool SensorDisplay::eventFilter( QObject *object, QEvent *event )
configureSettings();
break;
case 3: {
- QCustomEvent *e = new QCustomEvent( QEvent::User );
+ TQCustomEvent *e = new TQCustomEvent( TQEvent::User );
e->setData( this );
kapp->postEvent( parent(), e );
}
@@ -199,16 +199,16 @@ bool SensorDisplay::eventFilter( QObject *object, QEvent *event )
}
return true;
- } else if ( event->type() == QEvent::MouseButtonRelease &&
- ( ( QMouseEvent*)event)->button() == LeftButton ) {
+ } else if ( event->type() == TQEvent::MouseButtonRelease &&
+ ( ( TQMouseEvent*)event)->button() == LeftButton ) {
setFocus();
}
- return QWidget::eventFilter( object, event );
+ return TQWidget::eventFilter( object, event );
}
-void SensorDisplay::sendRequest( const QString &hostName,
- const QString &command, int id )
+void SensorDisplay::sendRequest( const TQString &hostName,
+ const TQString &command, int id )
{
if ( !SensorMgr->sendRequest( hostName, command, (SensorClient*)this, id ) )
sensorError( id, true );
@@ -236,7 +236,7 @@ void SensorDisplay::sensorError( int sensorId, bool err )
void SensorDisplay::updateWhatsThis()
{
- QWhatsThis::add( this, i18n(
+ TQWhatsThis::add( this, i18n(
"<qt><p>This is a sensor display. To customize a sensor display click "
"and hold the right mouse button on either the frame or the "
"display box and select the <i>Properties</i> entry from the popup "
@@ -244,34 +244,34 @@ void SensorDisplay::updateWhatsThis()
"</p>%1</qt>" ).arg( additionalWhatsThis() ) );
}
-void SensorDisplay::hosts( QStringList& list )
+void SensorDisplay::hosts( TQStringList& list )
{
for ( SensorProperties *s = mSensors.first(); s; s = mSensors.next() )
if ( !list.contains( s->hostName() ) )
list.append( s->hostName() );
}
-QColor SensorDisplay::restoreColor( QDomElement &element, const QString &attr,
- const QColor& fallback )
+TQColor SensorDisplay::restoreColor( TQDomElement &element, const TQString &attr,
+ const TQColor& fallback )
{
bool ok;
uint c = element.attribute( attr ).toUInt( &ok );
if ( !ok )
return fallback;
else
- return QColor( (c >> 16) & 0xFF, (c >> 8) & 0xFF, c & 0xFF );
+ return TQColor( (c >> 16) & 0xFF, (c >> 8) & 0xFF, c & 0xFF );
}
-void SensorDisplay::saveColor( QDomElement &element, const QString &attr,
- const QColor &color )
+void SensorDisplay::saveColor( TQDomElement &element, const TQString &attr,
+ const TQColor &color )
{
int r, g, b;
color.rgb( &r, &g, &b );
element.setAttribute( attr, (r << 16) | (g << 8) | b );
}
-bool SensorDisplay::addSensor( const QString &hostName, const QString &name,
- const QString &type, const QString &description )
+bool SensorDisplay::addSensor( const TQString &hostName, const TQString &name,
+ const TQString &type, const TQString &description )
{
registerSensor( new SensorProperties( hostName, name, type, description ) );
return true;
@@ -315,9 +315,9 @@ bool SensorDisplay::useGlobalUpdateInterval() const
return mUseGlobalUpdateInterval;
}
-QString SensorDisplay::additionalWhatsThis()
+TQString SensorDisplay::additionalWhatsThis()
{
- return QString::null;
+ return TQString::null;
}
void SensorDisplay::sensorLost( int reqId )
@@ -325,20 +325,20 @@ void SensorDisplay::sensorLost( int reqId )
sensorError( reqId, true );
}
-bool SensorDisplay::restoreSettings( QDomElement &element )
+bool SensorDisplay::restoreSettings( TQDomElement &element )
{
- QString str = element.attribute( "showUnit", "X" );
+ TQString str = element.attribute( "showUnit", "X" );
if(!str.isEmpty() && str != "X") {
mShowUnit = str.toInt();
}
- str = element.attribute( "unit", QString::null );
+ str = element.attribute( "unit", TQString::null );
if(!str.isEmpty())
setUnit(str);
- str = element.attribute( "title", QString::null );
+ str = element.attribute( "title", TQString::null );
if(!str.isEmpty())
setTitle(str);
- if ( element.attribute( "updateInterval" ) != QString::null ) {
+ if ( element.attribute( "updateInterval" ) != TQString::null ) {
mUseGlobalUpdateInterval = false;
setUpdateInterval( element.attribute( "updateInterval", "2" ).toInt() );
} else {
@@ -360,7 +360,7 @@ bool SensorDisplay::restoreSettings( QDomElement &element )
return true;
}
-bool SensorDisplay::saveSettings( QDomDocument&, QDomElement &element, bool )
+bool SensorDisplay::saveSettings( TQDomDocument&, TQDomElement &element, bool )
{
element.setAttribute( "title", title() );
element.setAttribute( "unit", unit() );
@@ -404,7 +404,7 @@ bool SensorDisplay::modified() const
return mModified;
}
-QPtrList<SensorProperties> &SensorDisplay::sensors()
+TQPtrList<SensorProperties> &SensorDisplay::sensors()
{
return mSensors;
}
@@ -439,12 +439,12 @@ void SensorDisplay::setSensorOk( bool ok )
if ( mErrorIndicator )
return;
- QPixmap errorIcon = KGlobal::iconLoader()->loadIcon( "connect_creating", KIcon::Desktop,
+ TQPixmap errorIcon = KGlobal::iconLoader()->loadIcon( "connect_creating", KIcon::Desktop,
KIcon::SizeSmall );
if ( !mPlotterWdg )
return;
- mErrorIndicator = new QWidget( mPlotterWdg );
+ mErrorIndicator = new TQWidget( mPlotterWdg );
mErrorIndicator->setErasePixmap( errorIcon );
mErrorIndicator->resize( errorIcon.size() );
if ( errorIcon.mask() )
@@ -454,7 +454,7 @@ void SensorDisplay::setSensorOk( bool ok )
}
}
-void SensorDisplay::setTitle( const QString &title )
+void SensorDisplay::setTitle( const TQString &title )
{
mTitle = title;
@@ -465,7 +465,7 @@ void SensorDisplay::setTitle( const QString &title )
/* Changing the frame title may increase the width of the frame and
* hence breaks the layout. To avoid this, we save the original size
* and restore it after we have set the frame title. */
- QSize s = mFrame->size();
+ TQSize s = mFrame->size();
if ( mShowUnit && !mUnit.isEmpty() )
mFrame->setTitle( mTitle + " [" + mUnit + "]" );
@@ -474,17 +474,17 @@ void SensorDisplay::setTitle( const QString &title )
mFrame->setGeometry( 0, 0, s.width(), s.height() );
}
-QString SensorDisplay::title() const
+TQString SensorDisplay::title() const
{
return mTitle;
}
-void SensorDisplay::setUnit( const QString &unit )
+void SensorDisplay::setUnit( const TQString &unit )
{
mUnit = unit;
}
-QString SensorDisplay::unit() const
+TQString SensorDisplay::unit() const
{
return mUnit;
}
@@ -499,13 +499,13 @@ bool SensorDisplay::showUnit() const
return mShowUnit;
}
-void SensorDisplay::setPlotterWidget( QWidget *wdg )
+void SensorDisplay::setPlotterWidget( TQWidget *wdg )
{
mPlotterWdg = wdg;
}
-QWidget *SensorDisplay::frame()
+TQWidget *SensorDisplay::frame()
{
return mFrame;
}
@@ -520,9 +520,9 @@ bool SensorDisplay::noFrame() const
return !mFrame;
}
-void SensorDisplay::reorderSensors(const QValueList<int> &orderOfSensors)
+void SensorDisplay::reorderSensors(const TQValueList<int> &orderOfSensors)
{
- QPtrList<SensorProperties> newSensors;
+ TQPtrList<SensorProperties> newSensors;
for ( uint i = 0; i < orderOfSensors.count(); ++i ) {
newSensors.append( mSensors.at(orderOfSensors[i] ));
}
@@ -537,8 +537,8 @@ SensorProperties::SensorProperties()
{
}
-SensorProperties::SensorProperties( const QString &hostName, const QString &name,
- const QString &type, const QString &description )
+SensorProperties::SensorProperties( const TQString &hostName, const TQString &name,
+ const TQString &type, const TQString &description )
: mHostName( hostName ), mName( name ), mType( type ), mDescription( description )
{
mOk = false;
@@ -548,52 +548,52 @@ SensorProperties::~SensorProperties()
{
}
-void SensorProperties::setHostName( const QString &hostName )
+void SensorProperties::setHostName( const TQString &hostName )
{
mHostName = hostName;
}
-QString SensorProperties::hostName() const
+TQString SensorProperties::hostName() const
{
return mHostName;
}
-void SensorProperties::setName( const QString &name )
+void SensorProperties::setName( const TQString &name )
{
mName = name;
}
-QString SensorProperties::name() const
+TQString SensorProperties::name() const
{
return mName;
}
-void SensorProperties::setType( const QString &type )
+void SensorProperties::setType( const TQString &type )
{
mType = type;
}
-QString SensorProperties::type() const
+TQString SensorProperties::type() const
{
return mType;
}
-void SensorProperties::setDescription( const QString &description )
+void SensorProperties::setDescription( const TQString &description )
{
mDescription = description;
}
-QString SensorProperties::description() const
+TQString SensorProperties::description() const
{
return mDescription;
}
-void SensorProperties::setUnit( const QString &unit )
+void SensorProperties::setUnit( const TQString &unit )
{
mUnit = unit;
}
-QString SensorProperties::unit() const
+TQString SensorProperties::unit() const
{
return mUnit;
}
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.h b/ksysguard/gui/SensorDisplayLib/SensorDisplay.h
index e5e867a01..72f1af543 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.h
@@ -24,10 +24,10 @@
#ifndef KSG_SENSORDISPLAY_H
#define KSG_SENSORDISPLAY_H
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qvaluelist.h>
-#include <qwidget.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
+#include <tqvaluelist.h>
+#include <tqwidget.h>
#include <knotifyclient.h>
@@ -48,7 +48,7 @@ class SensorProperties;
more sensors in any form. It must be inherited by all displays that
should be inserted into the work sheet.
*/
-class SensorDisplay : public QWidget, public SensorClient
+class SensorDisplay : public TQWidget, public SensorClient
{
Q_OBJECT
@@ -56,8 +56,8 @@ class SensorDisplay : public QWidget, public SensorClient
/**
Constructor.
*/
- SensorDisplay( QWidget *parent = 0, const char *name = 0,
- const QString& title = 0, bool nf = false, bool isApplet = false );
+ SensorDisplay( TQWidget *parent = 0, const char *name = 0,
+ const TQString& title = 0, bool nf = false, bool isApplet = false );
/**
Destructor.
@@ -67,22 +67,22 @@ class SensorDisplay : public QWidget, public SensorClient
/**
Sets the title of the display.
*/
- void setTitle( const QString &title );
+ void setTitle( const TQString &title );
/**
Returns the title of the display.
*/
- QString title() const;
+ TQString title() const;
/**
Sets the unit of the display.
*/
- void setUnit( const QString &unit );
+ void setUnit( const TQString &unit );
/**
Returns the unit of the display.
*/
- QString unit() const;
+ TQString unit() const;
/**
Sets whether the unit string should be displayed at the top
@@ -123,17 +123,17 @@ class SensorDisplay : public QWidget, public SensorClient
/**
This method appends all hosts of the display to @ref list.
*/
- void hosts( QStringList& list );
+ void hosts( TQStringList& list );
/**
Sets the widget on which the error icon can be drawn.
*/
- void setPlotterWidget( QWidget *plotter );
+ void setPlotterWidget( TQWidget *plotter );
/**
Returns the widget on which the error icon can be drawn.
*/
- QWidget *plotterWidget() const;
+ TQWidget *plotterWidget() const;
/**
Add a sensor to the display.
@@ -143,8 +143,8 @@ class SensorDisplay : public QWidget, public SensorClient
@param type The type of the sensor.
@param description A short description of the sensor.
*/
- virtual bool addSensor( const QString &hostName, const QString &name,
- const QString &type, const QString &description );
+ virtual bool addSensor( const TQString &hostName, const TQString &name,
+ const TQString &type, const TQString &description );
/**
Removes the sensor from the display, that is at the position
@@ -158,7 +158,7 @@ class SensorDisplay : public QWidget, public SensorClient
a request to a sensor since it performs an appropriate error
handling by removing the display of necessary.
*/
- void sendRequest( const QString &hostName, const QString &cmd, int id );
+ void sendRequest( const TQString &hostName, const TQString &cmd, int id );
/**
Raises the configure dialog to setup the update interval.
@@ -180,12 +180,12 @@ class SensorDisplay : public QWidget, public SensorClient
/**
Reimplement this method to setup the display from config data.
*/
- virtual bool restoreSettings( QDomElement& );
+ virtual bool restoreSettings( TQDomElement& );
/**
Reimplement this method to save the displays config data.
*/
- virtual bool saveSettings( QDomDocument&, QDomElement&, bool = true );
+ virtual bool saveSettings( TQDomDocument&, TQDomElement&, bool = true );
/**
Reimplement this method to catch error messages from the SensorManager.
@@ -237,32 +237,32 @@ class SensorDisplay : public QWidget, public SensorClient
void modified( bool modified );
protected:
- virtual bool eventFilter( QObject*, QEvent* );
- virtual void resizeEvent( QResizeEvent* );
- virtual void timerEvent( QTimerEvent* );
+ virtual bool eventFilter( TQObject*, TQEvent* );
+ virtual void resizeEvent( TQResizeEvent* );
+ virtual void timerEvent( TQTimerEvent* );
void registerSensor( SensorProperties *sp );
void unregisterSensor( uint pos );
- QColor restoreColor( QDomElement &element, const QString &attr,
- const QColor& fallback );
- void saveColor( QDomElement &element, const QString &attr,
- const QColor &color );
+ TQColor restoreColor( TQDomElement &element, const TQString &attr,
+ const TQColor& fallback );
+ void saveColor( TQDomElement &element, const TQString &attr,
+ const TQColor &color );
- virtual QString additionalWhatsThis();
+ virtual TQString additionalWhatsThis();
void setSensorOk( bool ok );
bool modified() const;
bool timerOn() const;
- QWidget *frame();
+ TQWidget *frame();
// void setNoFrame( bool value );
bool noFrame() const;
- void reorderSensors(const QValueList<int> &orderOfSensors);
- QPtrList<SensorProperties> &sensors();
+ void reorderSensors(const TQValueList<int> &orderOfSensors);
+ TQPtrList<SensorProperties> &sensors();
private:
void updateWhatsThis();
@@ -277,49 +277,49 @@ class SensorDisplay : public QWidget, public SensorClient
int mUpdateInterval;
// The frame around the other widgets.
- QGroupBox* mFrame;
+ TQGroupBox* mFrame;
- QPtrList<SensorProperties> mSensors;
+ TQPtrList<SensorProperties> mSensors;
- QString mTitle;
- QString mUnit;
+ TQString mTitle;
+ TQString mUnit;
- QWidget* mErrorIndicator;
- QWidget* mPlotterWdg;
+ TQWidget* mErrorIndicator;
+ TQWidget* mPlotterWdg;
};
class SensorProperties
{
public:
SensorProperties();
- SensorProperties( const QString &hostName, const QString &name,
- const QString &type, const QString &description );
+ SensorProperties( const TQString &hostName, const TQString &name,
+ const TQString &type, const TQString &description );
~SensorProperties();
- void setHostName( const QString &hostName );
- QString hostName() const;
+ void setHostName( const TQString &hostName );
+ TQString hostName() const;
- void setName( const QString &name );
- QString name() const;
+ void setName( const TQString &name );
+ TQString name() const;
- void setType( const QString &type );
- QString type() const;
+ void setType( const TQString &type );
+ TQString type() const;
- void setDescription( const QString &description );
- QString description() const;
+ void setDescription( const TQString &description );
+ TQString description() const;
- void setUnit( const QString &unit );
- QString unit() const;
+ void setUnit( const TQString &unit );
+ TQString unit() const;
void setIsOk( bool value );
bool isOk() const;
private:
- QString mHostName;
- QString mName;
- QString mType;
- QString mDescription;
- QString mUnit;
+ TQString mHostName;
+ TQString mName;
+ TQString mType;
+ TQString mDescription;
+ TQString mUnit;
/* This flag indicates whether the communication to the sensor is
* ok or not. */
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
index b51ba67e0..383bf525e 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
@@ -25,17 +25,17 @@
#include <ksgrd/SensorManager.h>
#include <ksgrd/StyleEngine.h>
-#include <qfile.h>
+#include <tqfile.h>
#include "SensorLogger.moc"
#include "SensorLoggerSettings.h"
-SLListViewItem::SLListViewItem(QListView *parent)
- : QListViewItem(parent)
+SLListViewItem::SLListViewItem(TQListView *parent)
+ : TQListViewItem(parent)
{
}
-LogSensor::LogSensor(QListView *parent)
+LogSensor::LogSensor(TQListView *parent)
: timerID( NONE ), lowerLimitActive( 0 ), upperLimitActive( 0 ),
lowerLimit( 0 ), upperLimit( 0 )
{
@@ -78,15 +78,15 @@ LogSensor::stopLogging(void)
}
void
-LogSensor::timerEvent(QTimerEvent*)
+LogSensor::timerEvent(TQTimerEvent*)
{
KSGRD::SensorMgr->sendRequest(hostName, sensorName, (KSGRD::SensorClient*) this, 42);
}
void
-LogSensor::answerReceived(int id, const QString& answer)
+LogSensor::answerReceived(int id, const TQString& answer)
{
- QFile logFile(fileName);
+ TQFile logFile(fileName);
if (!logFile.open(IO_ReadWrite | IO_Append))
{
@@ -97,7 +97,7 @@ LogSensor::answerReceived(int id, const QString& answer)
switch (id)
{
case 42: {
- QTextStream stream(&logFile);
+ TQTextStream stream(&logFile);
double value = answer.toDouble();
if (lowerLimitActive && value < lowerLimit)
@@ -106,7 +106,7 @@ LogSensor::answerReceived(int id, const QString& answer)
lowerLimitActive = false;
lvi->setTextColor(monitor->colorGroup().foreground());
lvi->repaint();
- KNotifyClient::event(monitor->winId(), "sensor_alarm", QString("sensor '%1' at '%2' reached lower limit").arg(sensorName).arg(hostName));
+ KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached lower limit").arg(sensorName).arg(hostName));
timerOn();
} else if (upperLimitActive && value > upperLimit)
{
@@ -114,23 +114,23 @@ LogSensor::answerReceived(int id, const QString& answer)
upperLimitActive = false;
lvi->setTextColor(monitor->colorGroup().foreground());
lvi->repaint();
- KNotifyClient::event(monitor->winId(), "sensor_alarm", QString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName));
+ KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName));
timerOn();
}
- QDate date = QDateTime::currentDateTime().date();
- QTime time = QDateTime::currentDateTime().time();
+ TQDate date = TQDateTime::currentDateTime().date();
+ TQTime time = TQDateTime::currentDateTime().time();
- stream << QString("%1 %2 %3 %4 %5: %6\n").arg(date.shortMonthName(date.month())).arg(date.day()).arg(time.toString()).arg(hostName).arg(sensorName).arg(value);
+ stream << TQString("%1 %2 %3 %4 %5: %6\n").arg(date.shortMonthName(date.month())).arg(date.day()).arg(time.toString()).arg(hostName).arg(sensorName).arg(value);
}
}
logFile.close();
}
-SensorLogger::SensorLogger(QWidget *parent, const char *name, const QString& title)
+SensorLogger::SensorLogger(TQWidget *parent, const char *name, const TQString& title)
: KSGRD::SensorDisplay(parent, name, title)
{
- monitor = new QListView(this, "monitor");
+ monitor = new TQListView(this, "monitor");
Q_CHECK_PTR(monitor);
monitor->addColumn(i18n("Logging"));
@@ -139,14 +139,14 @@ SensorLogger::SensorLogger(QWidget *parent, const char *name, const QString& tit
monitor->addColumn(i18n("Host Name"));
monitor->addColumn(i18n("Log File"));
- QColorGroup cgroup = monitor->colorGroup();
- cgroup.setColor(QColorGroup::Text, KSGRD::Style->firstForegroundColor());
- cgroup.setColor(QColorGroup::Base, KSGRD::Style->backgroundColor());
- cgroup.setColor(QColorGroup::Foreground, KSGRD::Style->alarmColor());
- monitor->setPalette(QPalette(cgroup, cgroup, cgroup));
- monitor->setSelectionMode(QListView::NoSelection);
+ TQColorGroup cgroup = monitor->colorGroup();
+ cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor());
+ cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
+ cgroup.setColor(TQColorGroup::Foreground, KSGRD::Style->alarmColor());
+ monitor->setPalette(TQPalette(cgroup, cgroup, cgroup));
+ monitor->setSelectionMode(TQListView::NoSelection);
- connect(monitor, SIGNAL(rightButtonClicked(QListViewItem*, const QPoint&, int)), this, SLOT(RMBClicked(QListViewItem*, const QPoint&, int)));
+ connect(monitor, TQT_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(RMBClicked(TQListViewItem*, const TQPoint&, int)));
setTitle(i18n("Sensor Logger"));
@@ -163,7 +163,7 @@ SensorLogger::~SensorLogger(void)
}
bool
-SensorLogger::addSensor(const QString& hostName, const QString& sensorName, const QString& sensorType, const QString&)
+SensorLogger::addSensor(const TQString& hostName, const TQString& sensorName, const TQString& sensorType, const TQString&)
{
if (sensorType != "integer" && sensorType != "float")
return (false);
@@ -232,12 +232,12 @@ SensorLogger::editSensor(LogSensor* sensor)
void
SensorLogger::configureSettings()
{
- QColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->colorGroup();
sls = new SensorLoggerSettings(this, "SensorLoggerSettings");
Q_CHECK_PTR(sls);
- connect( sls, SIGNAL( applyClicked() ), SLOT( applySettings() ) );
+ connect( sls, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) );
sls->setTitle(title());
sls->setForegroundColor(cgroup.text());
@@ -254,14 +254,14 @@ SensorLogger::configureSettings()
void
SensorLogger::applySettings()
{
- QColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->colorGroup();
setTitle(sls->title());
- cgroup.setColor(QColorGroup::Text, sls->foregroundColor());
- cgroup.setColor(QColorGroup::Base, sls->backgroundColor());
- cgroup.setColor(QColorGroup::Foreground, sls->alarmColor());
- monitor->setPalette(QPalette(cgroup, cgroup, cgroup));
+ cgroup.setColor(TQColorGroup::Text, sls->foregroundColor());
+ cgroup.setColor(TQColorGroup::Base, sls->backgroundColor());
+ cgroup.setColor(TQColorGroup::Foreground, sls->alarmColor());
+ monitor->setPalette(TQPalette(cgroup, cgroup, cgroup));
setModified(true);
}
@@ -269,31 +269,31 @@ SensorLogger::applySettings()
void
SensorLogger::applyStyle(void)
{
- QColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->colorGroup();
- cgroup.setColor(QColorGroup::Text, KSGRD::Style->firstForegroundColor());
- cgroup.setColor(QColorGroup::Base, KSGRD::Style->backgroundColor());
- cgroup.setColor(QColorGroup::Foreground, KSGRD::Style->alarmColor());
- monitor->setPalette(QPalette(cgroup, cgroup, cgroup));
+ cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor());
+ cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
+ cgroup.setColor(TQColorGroup::Foreground, KSGRD::Style->alarmColor());
+ monitor->setPalette(TQPalette(cgroup, cgroup, cgroup));
setModified(true);
}
bool
-SensorLogger::restoreSettings(QDomElement& element)
+SensorLogger::restoreSettings(TQDomElement& element)
{
- QColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->colorGroup();
- cgroup.setColor(QColorGroup::Text, restoreColor(element, "textColor", Qt::green));
- cgroup.setColor(QColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black));
- cgroup.setColor(QColorGroup::Foreground, restoreColor(element, "alarmColor", Qt::red));
- monitor->setPalette(QPalette(cgroup, cgroup, cgroup));
+ cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green));
+ cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black));
+ cgroup.setColor(TQColorGroup::Foreground, restoreColor(element, "alarmColor", Qt::red));
+ monitor->setPalette(TQPalette(cgroup, cgroup, cgroup));
logSensors.clear();
- QDomNodeList dnList = element.elementsByTagName("logsensors");
+ TQDomNodeList dnList = element.elementsByTagName("logsensors");
for (uint i = 0; i < dnList.count(); i++) {
- QDomElement element = dnList.item(i).toElement();
+ TQDomElement element = dnList.item(i).toElement();
LogSensor* sensor = new LogSensor(monitor);
Q_CHECK_PTR(sensor);
@@ -317,7 +317,7 @@ SensorLogger::restoreSettings(QDomElement& element)
}
bool
-SensorLogger::saveSettings(QDomDocument& doc, QDomElement& element, bool save)
+SensorLogger::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
{
saveColor(element, "textColor", monitor->colorGroup().text());
saveColor(element, "backgroundColor", monitor->colorGroup().base());
@@ -325,15 +325,15 @@ SensorLogger::saveSettings(QDomDocument& doc, QDomElement& element, bool save)
for (LogSensor* sensor = logSensors.first(); sensor != 0; sensor = logSensors.next())
{
- QDomElement log = doc.createElement("logsensors");
+ TQDomElement log = doc.createElement("logsensors");
log.setAttribute("sensorName", sensor->getSensorName());
log.setAttribute("hostName", sensor->getHostName());
log.setAttribute("fileName", sensor->getFileName());
log.setAttribute("timerInterval", sensor->getTimerInterval());
- log.setAttribute("lowerLimitActive", QString("%1").arg(sensor->getLowerLimitActive()));
- log.setAttribute("lowerLimit", QString("%1").arg(sensor->getLowerLimit()));
- log.setAttribute("upperLimitActive", QString("%1").arg(sensor->getUpperLimitActive()));
- log.setAttribute("upperLimit", QString("%1").arg(sensor->getUpperLimit()));
+ log.setAttribute("lowerLimitActive", TQString("%1").arg(sensor->getLowerLimitActive()));
+ log.setAttribute("lowerLimit", TQString("%1").arg(sensor->getLowerLimit()));
+ log.setAttribute("upperLimitActive", TQString("%1").arg(sensor->getUpperLimitActive()));
+ log.setAttribute("upperLimit", TQString("%1").arg(sensor->getUpperLimit()));
element.appendChild(log);
}
@@ -347,20 +347,20 @@ SensorLogger::saveSettings(QDomDocument& doc, QDomElement& element, bool save)
}
void
-SensorLogger::answerReceived(int, const QString&)
+SensorLogger::answerReceived(int, const TQString&)
{
// we do not use this, since all answers are received by the LogSensors
}
void
-SensorLogger::resizeEvent(QResizeEvent*)
+SensorLogger::resizeEvent(TQResizeEvent*)
{
frame()->setGeometry(0, 0, this->width(), this->height());
monitor->setGeometry(10, 20, this->width() - 20, this->height() - 30);
}
LogSensor*
-SensorLogger::getLogSensor(QListViewItem* item)
+SensorLogger::getLogSensor(TQListViewItem* item)
{
for (LogSensor* sensor = logSensors.first(); sensor != 0; sensor = logSensors.next())
{
@@ -373,9 +373,9 @@ SensorLogger::getLogSensor(QListViewItem* item)
}
void
-SensorLogger::RMBClicked(QListViewItem* item, const QPoint& point, int)
+SensorLogger::RMBClicked(TQListViewItem* item, const TQPoint& point, int)
{
- QPopupMenu pm;
+ TQPopupMenu pm;
if (hasSettingsDialog())
pm.insertItem(i18n("&Properties"), 1);
pm.insertItem(i18n("&Remove Display"), 2);
@@ -404,7 +404,7 @@ SensorLogger::RMBClicked(QListViewItem* item, const QPoint& point, int)
configureSettings();
break;
case 2: {
- QCustomEvent* ev = new QCustomEvent(QEvent::User);
+ TQCustomEvent* ev = new TQCustomEvent(TQEvent::User);
ev->setData(this);
kapp->postEvent(parent(), ev);
break;
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.h b/ksysguard/gui/SensorDisplayLib/SensorLogger.h
index 835e62401..018e36bf9 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.h
@@ -21,13 +21,13 @@
#ifndef _SensorLogger_h
#define _SensorLogger_h
-#include <qdom.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qlistview.h>
-#include <qpopupmenu.h>
-#include <qspinbox.h>
-#include <qstring.h>
+#include <tqdom.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
+#include <tqlistview.h>
+#include <tqpopupmenu.h>
+#include <tqspinbox.h>
+#include <tqstring.h>
#include <SensorDisplay.h>
@@ -40,35 +40,35 @@ class SensorLoggerSettings;
class SLListViewItem : public QListViewItem
{
public:
- SLListViewItem(QListView *parent = 0);
+ SLListViewItem(TQListView *parent = 0);
- void setTextColor(const QColor& color) { textColor = color; }
+ void setTextColor(const TQColor& color) { textColor = color; }
- void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) {
- QColorGroup cgroup(cg);
- cgroup.setColor(QColorGroup::Text, textColor);
- QListViewItem::paintCell(p, cgroup, column, width, alignment);
+ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) {
+ TQColorGroup cgroup(cg);
+ cgroup.setColor(TQColorGroup::Text, textColor);
+ TQListViewItem::paintCell(p, cgroup, column, width, alignment);
}
- void paintFocus(QPainter *, const QColorGroup, const QRect) {}
+ void paintFocus(TQPainter *, const TQColorGroup, const TQRect) {}
private:
- QColor textColor;
+ TQColor textColor;
};
-class LogSensor : public QObject, public KSGRD::SensorClient
+class LogSensor : public TQObject, public KSGRD::SensorClient
{
Q_OBJECT
public:
- LogSensor(QListView *parent);
+ LogSensor(TQListView *parent);
~LogSensor(void);
- void answerReceived(int id, const QString& answer);
+ void answerReceived(int id, const TQString& answer);
- void setHostName(const QString& name) { hostName = name; lvi->setText(3, name); }
- void setSensorName(const QString& name) { sensorName = name; lvi->setText(2, name); }
- void setFileName(const QString& name)
+ void setHostName(const TQString& name) { hostName = name; lvi->setText(3, name); }
+ void setSensorName(const TQString& name) { sensorName = name; lvi->setText(2, name); }
+ void setFileName(const TQString& name)
{
fileName = name;
lvi->setText(4, name);
@@ -87,18 +87,18 @@ public:
timerOn();
}
- lvi->setText(1, QString("%1").arg(interval));
+ lvi->setText(1, TQString("%1").arg(interval));
}
- QString getSensorName(void) { return sensorName; }
- QString getHostName(void) { return hostName; }
- QString getFileName(void) { return fileName; }
+ TQString getSensorName(void) { return sensorName; }
+ TQString getHostName(void) { return hostName; }
+ TQString getFileName(void) { return fileName; }
int getTimerInterval(void) { return timerInterval; }
bool getUpperLimitActive(void) { return upperLimitActive; }
bool getLowerLimitActive(void) { return lowerLimitActive; }
double getUpperLimit(void) { return upperLimit; }
double getLowerLimit(void) { return lowerLimit; }
- QListViewItem* getListViewItem(void) { return lvi; }
+ TQListViewItem* getListViewItem(void) { return lvi; }
public slots:
void timerOff()
@@ -118,16 +118,16 @@ public slots:
void stopLogging(void);
protected:
- virtual void timerEvent(QTimerEvent*);
+ virtual void timerEvent(TQTimerEvent*);
private:
- QListView* monitor;
+ TQListView* monitor;
SLListViewItem* lvi;
- QPixmap pixmap_running;
- QPixmap pixmap_waiting;
- QString sensorName;
- QString hostName;
- QString fileName;
+ TQPixmap pixmap_running;
+ TQPixmap pixmap_waiting;
+ TQString sensorName;
+ TQString hostName;
+ TQString fileName;
int timerInterval;
int timerID;
@@ -143,19 +143,19 @@ class SensorLogger : public KSGRD::SensorDisplay
{
Q_OBJECT
public:
- SensorLogger(QWidget *parent = 0, const char *name = 0, const QString& title = 0);
+ SensorLogger(TQWidget *parent = 0, const char *name = 0, const TQString& title = 0);
~SensorLogger(void);
- bool addSensor(const QString& hostName, const QString& sensorName, const QString& sensorType,
- const QString& sensorDescr);
+ bool addSensor(const TQString& hostName, const TQString& sensorName, const TQString& sensorType,
+ const TQString& sensorDescr);
bool editSensor(LogSensor*);
- void answerReceived(int id, const QString& answer);
- void resizeEvent(QResizeEvent*);
+ void answerReceived(int id, const TQString& answer);
+ void resizeEvent(TQResizeEvent*);
- bool restoreSettings(QDomElement& element);
- bool saveSettings(QDomDocument& doc, QDomElement& element, bool save = true);
+ bool restoreSettings(TQDomElement& element);
+ bool saveSettings(TQDomDocument& doc, TQDomElement& element, bool save = true);
void configureSettings(void);
@@ -167,15 +167,15 @@ public:
public slots:
void applySettings();
void applyStyle();
- void RMBClicked(QListViewItem*, const QPoint&, int);
+ void RMBClicked(TQListViewItem*, const TQPoint&, int);
protected:
- LogSensor* getLogSensor(QListViewItem*);
+ LogSensor* getLogSensor(TQListViewItem*);
private:
- QListView* monitor;
+ TQListView* monitor;
- QPtrList<LogSensor> logSensors;
+ TQPtrList<LogSensor> logSensors;
SensorLoggerDlg *sld;
SensorLoggerSettings *sls;
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc
index f07b55ae4..a6f686db3 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc
@@ -20,17 +20,17 @@
#include "SensorLoggerDlg.h"
#include "SensorLoggerDlgWidget.h"
-#include <qlayout.h>
+#include <tqlayout.h>
#include <klocale.h>
-SensorLoggerDlg::SensorLoggerDlg( QWidget *parent, const char *name )
+SensorLoggerDlg::SensorLoggerDlg( TQWidget *parent, const char *name )
: KDialogBase( parent, name, true, i18n( "Sensor Logger" ),
Ok|Cancel, Ok, true )
{
- QWidget *main = new QWidget( this );
+ TQWidget *main = new TQWidget( this );
- QVBoxLayout *topLayout = new QVBoxLayout( main, 0, KDialog::spacingHint() );
+ TQVBoxLayout *topLayout = new TQVBoxLayout( main, 0, KDialog::spacingHint() );
m_loggerWidget = new SensorLoggerDlgWidget( main, "m_loggerWidget" );
topLayout->addWidget( m_loggerWidget );
@@ -39,7 +39,7 @@ SensorLoggerDlg::SensorLoggerDlg( QWidget *parent, const char *name )
setMainWidget( main );
}
-QString SensorLoggerDlg::fileName() const
+TQString SensorLoggerDlg::fileName() const
{
return m_loggerWidget->fileName();
}
@@ -69,7 +69,7 @@ double SensorLoggerDlg::upperLimit() const
return m_loggerWidget->upperLimit();
}
-void SensorLoggerDlg::setFileName( const QString &url )
+void SensorLoggerDlg::setFileName( const TQString &url )
{
m_loggerWidget->setFileName( url );
}
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h
index 3af8290c8..e5061c722 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h
@@ -23,8 +23,8 @@
#include <kdialogbase.h>
-#include <qstring.h>
-#include <qcolor.h>
+#include <tqstring.h>
+#include <tqcolor.h>
class SensorLoggerDlgWidget;
@@ -34,16 +34,16 @@ class SensorLoggerDlg : public KDialogBase
public:
- SensorLoggerDlg( QWidget *parent=0, const char *name=0 );
+ SensorLoggerDlg( TQWidget *parent=0, const char *name=0 );
- QString fileName() const;
+ TQString fileName() const;
int timerInterval() const;
bool lowerLimitActive() const;
bool upperLimitActive() const;
double lowerLimit() const;
double upperLimit() const;
- void setFileName( const QString & );
+ void setFileName( const TQString & );
void setTimerInterval( int );
void setLowerLimitActive( bool );
void setUpperLimitActive( bool );
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
index afe0767e9..ad1f2687b 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
@@ -17,7 +17,7 @@ void SensorLoggerDlgWidget::init()
}
-QString SensorLoggerDlgWidget::fileName()
+TQString SensorLoggerDlgWidget::fileName()
{
return m_fileName->url();
}
@@ -53,7 +53,7 @@ double SensorLoggerDlgWidget::upperLimit()
}
-void SensorLoggerDlgWidget::setFileName( const QString &url )
+void SensorLoggerDlgWidget::setFileName( const TQString &url )
{
m_fileName->setURL(url);
}
@@ -73,7 +73,7 @@ void SensorLoggerDlgWidget::setLowerLimitActive( bool b )
void SensorLoggerDlgWidget::setLowerLimit( double d )
{
- m_lowerLimit->setText(QString("%1").arg(d));
+ m_lowerLimit->setText(TQString("%1").arg(d));
}
@@ -85,5 +85,5 @@ void SensorLoggerDlgWidget::setUpperLimitActive( bool b )
void SensorLoggerDlgWidget::setUpperLimit( double d )
{
- m_upperLimit->setText(QString("%1").arg(d));
+ m_upperLimit->setText(TQString("%1").arg(d));
}
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc
index 568108547..2935242fd 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc
@@ -22,7 +22,7 @@
#include <klocale.h>
-SensorLoggerSettings::SensorLoggerSettings( QWidget *parent, const char *name )
+SensorLoggerSettings::SensorLoggerSettings( TQWidget *parent, const char *name )
: KDialogBase( parent, name, true, i18n( "Sensor Logger Settings" ),
Ok|Apply|Cancel, Ok, true )
{
@@ -30,42 +30,42 @@ SensorLoggerSettings::SensorLoggerSettings( QWidget *parent, const char *name )
setMainWidget( m_settingsWidget );
}
-QString SensorLoggerSettings::title()
+TQString SensorLoggerSettings::title()
{
return m_settingsWidget->title();
}
-QColor SensorLoggerSettings::foregroundColor()
+TQColor SensorLoggerSettings::foregroundColor()
{
return m_settingsWidget->foregroundColor();
}
-QColor SensorLoggerSettings::backgroundColor()
+TQColor SensorLoggerSettings::backgroundColor()
{
return m_settingsWidget->backgroundColor();
}
-QColor SensorLoggerSettings::alarmColor()
+TQColor SensorLoggerSettings::alarmColor()
{
return m_settingsWidget->alarmColor();
}
-void SensorLoggerSettings::setTitle( const QString &title )
+void SensorLoggerSettings::setTitle( const TQString &title )
{
m_settingsWidget->setTitle( title );
}
-void SensorLoggerSettings::setBackgroundColor( const QColor &c )
+void SensorLoggerSettings::setBackgroundColor( const TQColor &c )
{
m_settingsWidget->setBackgroundColor( c );
}
-void SensorLoggerSettings::setForegroundColor( const QColor &c )
+void SensorLoggerSettings::setForegroundColor( const TQColor &c )
{
m_settingsWidget->setForegroundColor( c );
}
-void SensorLoggerSettings::setAlarmColor( const QColor &c )
+void SensorLoggerSettings::setAlarmColor( const TQColor &c )
{
m_settingsWidget->setAlarmColor( c );
}
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h
index 639f55944..e3f937166 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h
@@ -23,8 +23,8 @@
#include <kdialogbase.h>
-#include <qstring.h>
-#include <qcolor.h>
+#include <tqstring.h>
+#include <tqcolor.h>
class SensorLoggerSettingsWidget;
@@ -34,17 +34,17 @@ class SensorLoggerSettings : public KDialogBase
public:
- SensorLoggerSettings( QWidget *parent=0, const char *name=0 );
+ SensorLoggerSettings( TQWidget *parent=0, const char *name=0 );
- QString title();
- QColor foregroundColor();
- QColor backgroundColor();
- QColor alarmColor();
+ TQString title();
+ TQColor foregroundColor();
+ TQColor backgroundColor();
+ TQColor alarmColor();
- void setTitle( const QString & );
- void setForegroundColor( const QColor & );
- void setBackgroundColor( const QColor & );
- void setAlarmColor( const QColor & );
+ void setTitle( const TQString & );
+ void setForegroundColor( const TQColor & );
+ void setBackgroundColor( const TQColor & );
+ void setAlarmColor( const TQColor & );
private:
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui.h
index 751366466..a655a1751 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui.h
@@ -8,49 +8,49 @@
*****************************************************************************/
-QString SensorLoggerSettingsWidget::title()
+TQString SensorLoggerSettingsWidget::title()
{
return m_title->text();
}
-QColor SensorLoggerSettingsWidget::foregroundColor()
+TQColor SensorLoggerSettingsWidget::foregroundColor()
{
return m_foregroundColor->color();
}
-QColor SensorLoggerSettingsWidget::backgroundColor()
+TQColor SensorLoggerSettingsWidget::backgroundColor()
{
return m_backgroundColor->color();
}
-QColor SensorLoggerSettingsWidget::alarmColor()
+TQColor SensorLoggerSettingsWidget::alarmColor()
{
return m_alarmColor->color();
}
-void SensorLoggerSettingsWidget::setTitle( const QString &t )
+void SensorLoggerSettingsWidget::setTitle( const TQString &t )
{
m_title->setText(t);
}
-void SensorLoggerSettingsWidget::setForegroundColor( const QColor &c )
+void SensorLoggerSettingsWidget::setForegroundColor( const TQColor &c )
{
m_foregroundColor->setColor(c);
}
-void SensorLoggerSettingsWidget::setBackgroundColor( const QColor &c )
+void SensorLoggerSettingsWidget::setBackgroundColor( const TQColor &c )
{
m_backgroundColor->setColor(c);
}
-void SensorLoggerSettingsWidget::setAlarmColor( const QColor &c )
+void SensorLoggerSettingsWidget::setAlarmColor( const TQColor &c )
{
m_alarmColor->setColor(c);
}
diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
index f8ad121f1..3d4d9c6f6 100644
--- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
+++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
@@ -24,8 +24,8 @@
#include <math.h>
#include <string.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -34,8 +34,8 @@
#include "SignalPlotter.h"
-SignalPlotter::SignalPlotter( QWidget *parent, const char *name )
- : QWidget( parent, name )
+SignalPlotter::SignalPlotter( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
// Auto deletion does not work for pointer to arrays.
mBeamData.setAutoDelete( false );
@@ -50,8 +50,8 @@ SignalPlotter::SignalPlotter( QWidget *parent, const char *name )
// Anything smaller than this does not make sense.
setMinimumSize( 16, 16 );
- setSizePolicy( QSizePolicy( QSizePolicy::Expanding,
- QSizePolicy::Expanding, false ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+ TQSizePolicy::Expanding, false ) );
mShowVerticalLines = true;
mVerticalLinesColor = KSGRD::Style->firstForegroundColor();
@@ -77,7 +77,7 @@ SignalPlotter::~SignalPlotter()
delete [] p;
}
-bool SignalPlotter::addBeam( const QColor &color )
+bool SignalPlotter::addBeam( const TQColor &color )
{
double* d = new double[ mSamples ];
memset( d, 0, sizeof(double) * mSamples );
@@ -87,7 +87,7 @@ bool SignalPlotter::addBeam( const QColor &color )
return true;
}
-void SignalPlotter::addSample( const QValueList<double>& sampleBuf )
+void SignalPlotter::addSample( const TQValueList<double>& sampleBuf )
{
if ( mBeamData.count() != sampleBuf.count() )
return;
@@ -114,7 +114,7 @@ void SignalPlotter::addSample( const QValueList<double>& sampleBuf )
}
// Shift data buffers one sample down and insert new samples.
- QValueList<double>::ConstIterator s;
+ TQValueList<double>::ConstIterator s;
for ( d = mBeamData.first(), s = sampleBuf.begin(); d; d = mBeamData.next(), ++s ) {
memmove( d, d + 1, ( mSamples - 1 ) * sizeof( double ) );
d[ mSamples - 1 ] = *s;
@@ -123,14 +123,14 @@ void SignalPlotter::addSample( const QValueList<double>& sampleBuf )
update();
}
-void SignalPlotter::reorderBeams( const QValueList<int>& newOrder )
+void SignalPlotter::reorderBeams( const TQValueList<int>& newOrder )
{
if(newOrder.count() != mBeamData.count()) {
kdDebug() << "Serious problem in move sample" << endl;
return;
}
- QPtrList<double> newBeamData;
- QValueList<QColor> newBeamColor;
+ TQPtrList<double> newBeamData;
+ TQValueList<TQColor> newBeamColor;
for(uint i = 0; i < newOrder.count(); i++) {
int newIndex = newOrder[i];
@@ -152,7 +152,7 @@ void SignalPlotter::changeRange( int beam, double min, double max )
mMaxValue = max;
}
-QValueList<QColor> &SignalPlotter::beamColors()
+TQValueList<TQColor> &SignalPlotter::beamColors()
{
return mBeamColor;
}
@@ -164,12 +164,12 @@ void SignalPlotter::removeBeam( uint pos )
delete [] p;
}
-void SignalPlotter::setTitle( const QString &title )
+void SignalPlotter::setTitle( const TQString &title )
{
mTitle = title;
}
-QString SignalPlotter::title() const
+TQString SignalPlotter::title() const
{
return mTitle;
}
@@ -239,12 +239,12 @@ bool SignalPlotter::showVerticalLines() const
return mShowVerticalLines;
}
-void SignalPlotter::setVerticalLinesColor( const QColor &color )
+void SignalPlotter::setVerticalLinesColor( const TQColor &color )
{
mVerticalLinesColor = color;
}
-QColor SignalPlotter::verticalLinesColor() const
+TQColor SignalPlotter::verticalLinesColor() const
{
return mVerticalLinesColor;
}
@@ -279,12 +279,12 @@ bool SignalPlotter::showHorizontalLines() const
return mShowHorizontalLines;
}
-void SignalPlotter::setHorizontalLinesColor( const QColor &color )
+void SignalPlotter::setHorizontalLinesColor( const TQColor &color )
{
mHorizontalLinesColor = color;
}
-QColor SignalPlotter::horizontalLinesColor() const
+TQColor SignalPlotter::horizontalLinesColor() const
{
return mHorizontalLinesColor;
}
@@ -329,17 +329,17 @@ int SignalPlotter::fontSize() const
return mFontSize;
}
-void SignalPlotter::setBackgroundColor( const QColor &color )
+void SignalPlotter::setBackgroundColor( const TQColor &color )
{
mBackgroundColor = color;
}
-QColor SignalPlotter::backgroundColor() const
+TQColor SignalPlotter::backgroundColor() const
{
return mBackgroundColor;
}
-void SignalPlotter::resizeEvent( QResizeEvent* )
+void SignalPlotter::resizeEvent( TQResizeEvent* )
{
Q_ASSERT( width() > 2 );
@@ -385,7 +385,7 @@ void SignalPlotter::updateDataBuffers()
mSamples = newSampleNum;
}
-void SignalPlotter::paintEvent( QPaintEvent* )
+void SignalPlotter::paintEvent( TQPaintEvent* )
{
uint w = width();
uint h = height();
@@ -394,14 +394,14 @@ void SignalPlotter::paintEvent( QPaintEvent* )
if ( w <= 2 )
return;
- QPixmap pm( w, h );
- QPainter p;
+ TQPixmap pm( w, h );
+ TQPainter p;
p.begin( &pm, this );
pm.fill( mBackgroundColor );
/* Draw white line along the bottom and the right side of the
* widget to create a 3D like look. */
- p.setPen( QColor( colorGroup().light() ) );
+ p.setPen( TQColor( colorGroup().light() ) );
if(mShowThinFrame) {
p.drawLine( 0, h - 1, w - 1, h - 1 );
p.drawLine( w - 1, 0, w - 1, h - 1 );
@@ -441,7 +441,7 @@ void SignalPlotter::paintEvent( QPaintEvent* )
/* Draw horizontal bar with current sensor values at top of display. */
p.setPen( mHorizontalLinesColor );
int x0 = w / 2;
- p.setFont( QFont( p.font().family(), mFontSize ) );
+ p.setFont( TQFont( p.font().family(), mFontSize ) );
top = p.fontMetrics().height();
h -= top;
int h0 = top - 2; // h0 is our new top. It's at least 5 pixels high
@@ -452,7 +452,7 @@ void SignalPlotter::paintEvent( QPaintEvent* )
double bias = -minValue;
double scaleFac = ( w - x0 - 2 ) / range;
- QValueList<QColor>::Iterator col;
+ TQValueList<TQColor>::Iterator col;
col = mBeamColor.begin();
for ( double* d = mBeamData.first(); d; d = mBeamData.next(), ++col ) {
int start = x0 + (int)( bias * scaleFac );
@@ -502,7 +502,7 @@ void SignalPlotter::paintEvent( QPaintEvent* )
int xPos = 0;
for ( int i = 0; i < mSamples; i++, xPos += mHorizontalScale ) {
double bias = -minValue;
- QValueList<QColor>::Iterator col;
+ TQValueList<TQColor>::Iterator col;
col = mBeamColor.begin();
double sum = 0.0;
for ( double* d = mBeamData.first(); d; d = mBeamData.next(), ++col ) {
@@ -537,7 +537,7 @@ void SignalPlotter::paintEvent( QPaintEvent* )
int x1 = w - ( ( mSamples + 1 ) * mHorizontalScale );
for ( int i = 0; i < mSamples; i++ ) {
- QValueList<QColor>::Iterator col;
+ TQValueList<TQColor>::Iterator col;
col = mBeamColor.begin();
double sum = 0.0;
int y = top + h - 2;
@@ -563,10 +563,10 @@ void SignalPlotter::paintEvent( QPaintEvent* )
/* If the line is longer than 2 pixels we draw only the last
* 2 pixels with the bright color. The rest is painted with
* a 50% darker color. */
- QPen lastPen = QPen( p.pen() );
+ TQPen lastPen = TQPen( p.pen() );
p.setPen( (*col).dark( 150 ) );
p.setBrush( (*col).dark( 150 ) );
- QPointArray pa( 4 );
+ TQPointArray pa( 4 );
int prevY = ( i == 0 ) ? y : prevVals[ j ];
pa.putPoints( 0, 1, x1, prevY );
pa.putPoints( 1, 1, x2, y );
@@ -612,8 +612,8 @@ void SignalPlotter::paintEvent( QPaintEvent* )
* Values are only draw when width is greater than 60 */
if ( mShowHorizontalLines ) {
p.setPen( mHorizontalLinesColor );
- p.setFont( QFont( p.font().family(), mFontSize ) );
- QString val;
+ p.setFont( TQFont( p.font().family(), mFontSize ) );
+ TQString val;
/* top = 0 or font.height depending on whether there's a topbar or not
* h = graphing area.height - i.e. the actual space we have to draw inside
@@ -628,7 +628,7 @@ void SignalPlotter::paintEvent( QPaintEvent* )
if ( mShowLabels && h > ( mFontSize + 1 ) * ( mHorizontalLinesCount + 1 )
&& w > 60 ) {
- val = QString::number(maxValue - (y * range) / (mHorizontalLinesCount+1 ) );
+ val = TQString::number(maxValue - (y * range) / (mHorizontalLinesCount+1 ) );
p.drawText( 6, y_coord - 1, val ); //draw the text one pixel raised above the line
}
}
@@ -636,7 +636,7 @@ void SignalPlotter::paintEvent( QPaintEvent* )
//Draw the bottom most (minimum) number as well
if ( mShowLabels && h > ( mFontSize + 1 ) * ( mHorizontalLinesCount + 1 )
&& w > 60 ) {
- val = QString::number( minValue );
+ val = TQString::number( minValue );
p.drawText( 6, top + h - 2, val );
}
}
diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.h b/ksysguard/gui/SensorDisplayLib/SignalPlotter.h
index 9a9544b3c..1ac227212 100644
--- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.h
+++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.h
@@ -24,10 +24,10 @@
#ifndef KSG_SIGNALPLOTTER_H
#define KSG_SIGNALPLOTTER_H
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qvaluelist.h>
-#include <qwidget.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
+#include <tqwidget.h>
#define GRAPH_POLYGON 0
#define GRAPH_ORIGINAL 1
@@ -39,20 +39,20 @@ class SignalPlotter : public QWidget
Q_OBJECT
public:
- SignalPlotter( QWidget *parent = 0, const char *name = 0 );
+ SignalPlotter( TQWidget *parent = 0, const char *name = 0 );
~SignalPlotter();
- bool addBeam( const QColor &color );
- void addSample( const QValueList<double> &samples );
+ bool addBeam( const TQColor &color );
+ void addSample( const TQValueList<double> &samples );
void removeBeam( uint pos );
void changeRange( int beam, double min, double max );
- QValueList<QColor> &beamColors();
+ TQValueList<TQColor> &beamColors();
- void setTitle( const QString &title );
- QString title() const;
+ void setTitle( const TQString &title );
+ TQString title() const;
void setUseAutoRange( bool value );
bool useAutoRange() const;
@@ -72,8 +72,8 @@ class SignalPlotter : public QWidget
void setShowVerticalLines( bool value );
bool showVerticalLines() const;
- void setVerticalLinesColor( const QColor &color );
- QColor verticalLinesColor() const;
+ void setVerticalLinesColor( const TQColor &color );
+ TQColor verticalLinesColor() const;
void setVerticalLinesDistance( int distance );
int verticalLinesDistance() const;
@@ -84,8 +84,8 @@ class SignalPlotter : public QWidget
void setShowHorizontalLines( bool value );
bool showHorizontalLines() const;
- void setHorizontalLinesColor( const QColor &color );
- QColor horizontalLinesColor() const;
+ void setHorizontalLinesColor( const TQColor &color );
+ TQColor horizontalLinesColor() const;
void setHorizontalLinesCount( int count );
int horizontalLinesCount() const;
@@ -99,17 +99,17 @@ class SignalPlotter : public QWidget
void setFontSize( int size );
int fontSize() const;
- void setBackgroundColor( const QColor &color );
- QColor backgroundColor() const;
- void reorderBeams( const QValueList<int>& newOrder );
+ void setBackgroundColor( const TQColor &color );
+ TQColor backgroundColor() const;
+ void reorderBeams( const TQValueList<int>& newOrder );
void setThinFrame(bool set) { mShowThinFrame = set; }
protected:
void updateDataBuffers();
- virtual void resizeEvent( QResizeEvent* );
- virtual void paintEvent( QPaintEvent* );
+ virtual void resizeEvent( TQResizeEvent* );
+ virtual void paintEvent( TQPaintEvent* );
private:
double mMinValue;
@@ -120,28 +120,28 @@ class SignalPlotter : public QWidget
uint mGraphStyle;
bool mShowVerticalLines;
- QColor mVerticalLinesColor;
+ TQColor mVerticalLinesColor;
uint mVerticalLinesDistance;
bool mVerticalLinesScroll;
uint mVerticalLinesOffset;
uint mHorizontalScale;
bool mShowHorizontalLines;
- QColor mHorizontalLinesColor;
+ TQColor mHorizontalLinesColor;
uint mHorizontalLinesCount;
bool mShowLabels;
bool mShowTopBar;
uint mFontSize;
- QColor mBackgroundColor;
+ TQColor mBackgroundColor;
- QPtrList<double> mBeamData;
- QValueList<QColor> mBeamColor;
+ TQPtrList<double> mBeamData;
+ TQValueList<TQColor> mBeamColor;
unsigned int mSamples;
- QString mTitle;
+ TQString mTitle;
};
#endif
diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc
index f6555a1c6..8d53edb6b 100644
--- a/ksysguard/gui/WorkSheet.cc
+++ b/ksysguard/gui/WorkSheet.cc
@@ -21,11 +21,11 @@
*/
-#include <qclipboard.h>
-#include <qcursor.h>
-#include <qdragobject.h>
-#include <qfile.h>
-#include <qlayout.h>
+#include <tqclipboard.h>
+#include <tqcursor.h>
+#include <tqdragobject.h>
+#include <tqfile.h>
+#include <tqlayout.h>
#include <kdebug.h>
#include <klocale.h>
@@ -45,8 +45,8 @@
#include "WorkSheet.h"
#include "WorkSheetSettings.h"
-WorkSheet::WorkSheet( QWidget *parent, const char *name )
- : QWidget( parent, name )
+WorkSheet::WorkSheet( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
mGridLayout = 0;
mRows = mColumns = 0;
@@ -57,9 +57,9 @@ WorkSheet::WorkSheet( QWidget *parent, const char *name )
setAcceptDrops( true );
}
-WorkSheet::WorkSheet( uint rows, uint columns, uint interval, QWidget* parent,
+WorkSheet::WorkSheet( uint rows, uint columns, uint interval, TQWidget* parent,
const char *name )
- : QWidget( parent, name )
+ : TQWidget( parent, name )
{
mRows = mColumns = 0;
mGridLayout = 0;
@@ -84,18 +84,18 @@ WorkSheet::~WorkSheet()
{
}
-bool WorkSheet::load( const QString &fileName )
+bool WorkSheet::load( const TQString &fileName )
{
setModified( false );
mFileName = fileName;
- QFile file( mFileName );
+ TQFile file( mFileName );
if ( !file.open( IO_ReadOnly ) ) {
KMessageBox::sorry( this, i18n( "Cannot open the file %1." ).arg( mFileName ) );
return false;
}
- QDomDocument doc;
+ TQDomDocument doc;
// Read in file and check for a valid XML header.
if ( !doc.setContent( &file) ) {
@@ -113,7 +113,7 @@ bool WorkSheet::load( const QString &fileName )
}
// Check for proper size.
- QDomElement element = doc.documentElement();
+ TQDomElement element = doc.documentElement();
updateInterval( element.attribute( "interval" ).toUInt() );
if ( updateInterval() < 1 || updateInterval() > 300 )
updateInterval( 2 );
@@ -132,9 +132,9 @@ bool WorkSheet::load( const QString &fileName )
uint i;
/* Load lists of hosts that are needed for the work sheet and try
* to establish a connection. */
- QDomNodeList dnList = element.elementsByTagName( "host" );
+ TQDomNodeList dnList = element.elementsByTagName( "host" );
for ( i = 0; i < dnList.count(); ++i ) {
- QDomElement element = dnList.item( i ).toElement();
+ TQDomElement element = dnList.item( i ).toElement();
bool ok;
int port = element.attribute( "port" ).toInt( &ok );
if ( !ok )
@@ -150,7 +150,7 @@ bool WorkSheet::load( const QString &fileName )
// Load the displays and place them into the work sheet.
dnList = element.elementsByTagName( "display" );
for ( i = 0; i < dnList.count(); ++i ) {
- QDomElement element = dnList.item( i ).toElement();
+ TQDomElement element = dnList.item( i ).toElement();
uint row = element.attribute( "row" ).toUInt();
uint column = element.attribute( "column" ).toUInt();
if ( row >= mRows || column >= mColumns) {
@@ -173,32 +173,32 @@ bool WorkSheet::load( const QString &fileName )
return true;
}
-bool WorkSheet::save( const QString &fileName )
+bool WorkSheet::save( const TQString &fileName )
{
mFileName = fileName;
- QDomDocument doc( "KSysGuardWorkSheet" );
+ TQDomDocument doc( "KSysGuardWorkSheet" );
doc.appendChild( doc.createProcessingInstruction(
"xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
// save work sheet information
- QDomElement ws = doc.createElement( "WorkSheet" );
+ TQDomElement ws = doc.createElement( "WorkSheet" );
doc.appendChild( ws );
ws.setAttribute( "interval", updateInterval() );
ws.setAttribute( "rows", mRows );
ws.setAttribute( "columns", mColumns );
- QStringList hosts;
+ TQStringList hosts;
collectHosts( hosts );
// save host information (name, shell, etc.)
- QStringList::Iterator it;
+ TQStringList::Iterator it;
for ( it = hosts.begin(); it != hosts.end(); ++it ) {
- QString shell, command;
+ TQString shell, command;
int port;
if ( KSGRD::SensorMgr->hostInfo( *it, shell, command, port ) ) {
- QDomElement host = doc.createElement( "host" );
+ TQDomElement host = doc.createElement( "host" );
ws.appendChild( host );
host.setAttribute( "name", *it );
host.setAttribute( "shell", shell );
@@ -211,7 +211,7 @@ bool WorkSheet::save( const QString &fileName )
for (uint c = 0; c < mColumns; ++c )
if ( !mDisplayList[ r ][ c ]->isA( "DummyDisplay" ) ) {
KSGRD::SensorDisplay* display = (KSGRD::SensorDisplay*)mDisplayList[ r ][ c ];
- QDomElement element = doc.createElement( "display" );
+ TQDomElement element = doc.createElement( "display" );
ws.appendChild( element );
element.setAttribute( "row", r );
element.setAttribute( "column", c );
@@ -220,14 +220,14 @@ bool WorkSheet::save( const QString &fileName )
display->saveSettings( doc, element );
}
- QFile file( mFileName );
+ TQFile file( mFileName );
if ( !file.open( IO_WriteOnly ) ) {
KMessageBox::sorry( this, i18n( "Cannot save file %1" ).arg( mFileName ) );
return false;
}
- QTextStream s( &file );
- s.setEncoding( QTextStream::UnicodeUTF8 );
+ TQTextStream s( &file );
+ s.setEncoding( TQTextStream::UnicodeUTF8 );
s << doc;
file.close();
@@ -241,7 +241,7 @@ void WorkSheet::cut()
if ( !currentDisplay() || currentDisplay()->isA( "DummyDisplay" ) )
return;
- QClipboard* clip = QApplication::clipboard();
+ QClipboard* clip = TQApplication::clipboard();
clip->setText( currentDisplayAsXML() );
@@ -253,7 +253,7 @@ void WorkSheet::copy()
if ( !currentDisplay() || currentDisplay()->isA( "DummyDisplay" ) )
return;
- QClipboard* clip = QApplication::clipboard();
+ QClipboard* clip = TQApplication::clipboard();
clip->setText( currentDisplayAsXML() );
}
@@ -264,9 +264,9 @@ void WorkSheet::paste()
if ( !currentDisplay( &row, &column ) )
return;
- QClipboard* clip = QApplication::clipboard();
+ QClipboard* clip = TQApplication::clipboard();
- QDomDocument doc;
+ TQDomDocument doc;
/* Get text from clipboard and check for a valid XML header and
* proper document type. */
if ( !doc.setContent( clip->text() ) || doc.doctype().name() != "KSysGuardDisplay" ) {
@@ -275,17 +275,17 @@ void WorkSheet::paste()
return;
}
- QDomElement element = doc.documentElement();
+ TQDomElement element = doc.documentElement();
replaceDisplay( row, column, element );
}
-void WorkSheet::setFileName( const QString &fileName )
+void WorkSheet::setFileName( const TQString &fileName )
{
mFileName = fileName;
setModified( true );
}
-const QString& WorkSheet::fileName() const
+const TQString& WorkSheet::fileName() const
{
return mFileName;
}
@@ -295,30 +295,30 @@ bool WorkSheet::modified() const
return mModified;
}
-void WorkSheet::setTitle( const QString &title )
+void WorkSheet::setTitle( const TQString &title )
{
mTitle = title;
}
-QString WorkSheet::title() const
+TQString WorkSheet::title() const
{
return mTitle;
}
-KSGRD::SensorDisplay *WorkSheet::addDisplay( const QString &hostName,
- const QString &sensorName,
- const QString &sensorType,
- const QString& sensorDescr,
+KSGRD::SensorDisplay *WorkSheet::addDisplay( const TQString &hostName,
+ const TQString &sensorName,
+ const TQString &sensorType,
+ const TQString& sensorDescr,
uint row, uint column )
{
if ( !KSGRD::SensorMgr->engageHost( hostName ) ) {
- QString msg = i18n( "It is impossible to connect to \'%1\'." ).arg( hostName );
+ TQString msg = i18n( "It is impossible to connect to \'%1\'." ).arg( hostName );
KMessageBox::error( this, msg );
return 0;
}
- /* If the by 'row' and 'column' specified display is a QGroupBox dummy
+ /* If the by 'row' and 'column' specified display is a TQGroupBox dummy
* display we replace the widget. Otherwise we just try to add
* the new sensor to an existing display. */
if ( mDisplayList[ row ][ column ]->isA( "DummyDisplay" ) ) {
@@ -333,7 +333,7 @@ KSGRD::SensorDisplay *WorkSheet::addDisplay( const QString &hostName,
pm.insertItem( i18n( "&Multimeter" ), 2 );
pm.insertItem( i18n( "&BarGraph" ), 3 );
pm.insertItem( i18n( "S&ensorLogger" ), 4 );
- switch ( pm.exec( QCursor::pos() ) ) {
+ switch ( pm.exec( TQCursor::pos() ) ) {
case 1:
newDisplay = new FancyPlotter( this, "FancyPlotter", sensorDescr );
break;
@@ -424,23 +424,23 @@ void WorkSheet::applyStyle()
mDisplayList[ r ][ c ]->applyStyle();
}
-void WorkSheet::dragEnterEvent( QDragEnterEvent *e )
+void WorkSheet::dragEnterEvent( TQDragEnterEvent *e )
{
- e->accept( QTextDrag::canDecode( e ) );
+ e->accept( TQTextDrag::canDecode( e ) );
}
-void WorkSheet::dropEvent( QDropEvent *e )
+void WorkSheet::dropEvent( TQDropEvent *e )
{
- QString dragObject;
+ TQString dragObject;
- if ( QTextDrag::decode( e, dragObject) ) {
+ if ( TQTextDrag::decode( e, dragObject) ) {
// The host name, sensor name and type are seperated by a ' '.
- QStringList parts = QStringList::split( ' ', dragObject );
+ TQStringList parts = TQStringList::split( ' ', dragObject );
- QString hostName = parts[ 0 ];
- QString sensorName = parts[ 1 ];
- QString sensorType = parts[ 2 ];
- QString sensorDescr = parts[ 3 ];
+ TQString hostName = parts[ 0 ];
+ TQString sensorName = parts[ 1 ];
+ TQString sensorType = parts[ 2 ];
+ TQString sensorDescr = parts[ 3 ];
if ( hostName.isEmpty() || sensorName.isEmpty() || sensorType.isEmpty() ) {
return;
@@ -457,23 +457,23 @@ void WorkSheet::dropEvent( QDropEvent *e )
}
}
-QSize WorkSheet::sizeHint() const
+TQSize WorkSheet::sizeHint() const
{
- return QSize( 200,150 );
+ return TQSize( 200,150 );
}
-void WorkSheet::customEvent( QCustomEvent *e )
+void WorkSheet::customEvent( TQCustomEvent *e )
{
- if ( e->type() == QEvent::User ) {
+ if ( e->type() == TQEvent::User ) {
// SensorDisplays send out this event if they want to be removed.
removeDisplay( (KSGRD::SensorDisplay*)e->data() );
}
}
-bool WorkSheet::replaceDisplay( uint row, uint column, QDomElement& element )
+bool WorkSheet::replaceDisplay( uint row, uint column, TQDomElement& element )
{
- QString classType = element.attribute( "class" );
+ TQString classType = element.attribute( "class" );
KSGRD::SensorDisplay* newDisplay;
if ( classType == "FancyPlotter" )
newDisplay = new FancyPlotter( this );
@@ -518,10 +518,10 @@ void WorkSheet::replaceDisplay( uint row, uint column, KSGRD::SensorDisplay* new
mDisplayList[ row ][ column ] = newDisplay;
if ( mDisplayList[ row ][ column ]->useGlobalUpdateInterval() )
mDisplayList[ row ][ column ]->setUpdateInterval( updateInterval() );
- connect( newDisplay, SIGNAL( showPopupMenu( KSGRD::SensorDisplay* ) ),
- SLOT( showPopupMenu( KSGRD::SensorDisplay* ) ) );
- connect( newDisplay, SIGNAL( modified( bool ) ),
- SLOT( setModified( bool ) ) );
+ connect( newDisplay, TQT_SIGNAL( showPopupMenu( KSGRD::SensorDisplay* ) ),
+ TQT_SLOT( showPopupMenu( KSGRD::SensorDisplay* ) ) );
+ connect( newDisplay, TQT_SIGNAL( modified( bool ) ),
+ TQT_SLOT( setModified( bool ) ) );
}
@@ -550,7 +550,7 @@ void WorkSheet::removeDisplay( KSGRD::SensorDisplay *display )
}
}
-void WorkSheet::collectHosts( QStringList &list )
+void WorkSheet::collectHosts( TQStringList &list )
{
for ( uint r = 0; r < mRows; ++r )
for ( uint c = 0; c < mColumns; ++c )
@@ -564,7 +564,7 @@ void WorkSheet::createGrid( uint rows, uint columns )
mColumns = columns;
// create grid layout with specified dimentions
- mGridLayout = new QGridLayout( this, mRows, mColumns, 5 );
+ mGridLayout = new TQGridLayout( this, mRows, mColumns, 5 );
mDisplayList = new KSGRD::SensorDisplay**[ mRows ];
for ( uint r = 0; r < mRows; ++r ) {
@@ -667,18 +667,18 @@ void WorkSheet::fixTabOrder()
}
}
-QString WorkSheet::currentDisplayAsXML()
+TQString WorkSheet::currentDisplayAsXML()
{
KSGRD::SensorDisplay* display = currentDisplay();
if ( !display )
- return QString::null;
+ return TQString::null;
/* We create an XML description of the current display. */
- QDomDocument doc( "KSysGuardDisplay" );
+ TQDomDocument doc( "KSysGuardDisplay" );
doc.appendChild( doc.createProcessingInstruction(
"xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
- QDomElement element = doc.createElement( "display" );
+ TQDomElement element = doc.createElement( "display" );
doc.appendChild( element );
element.setAttribute( "class", display->className() );
display->saveSettings( doc, element );
diff --git a/ksysguard/gui/WorkSheet.h b/ksysguard/gui/WorkSheet.h
index f706f36dc..7715276fd 100644
--- a/ksysguard/gui/WorkSheet.h
+++ b/ksysguard/gui/WorkSheet.h
@@ -24,7 +24,7 @@
#ifndef KSG_WORKSHEET_H
#define KSG_WORKSHEET_H
-#include <qwidget.h>
+#include <tqwidget.h>
#include <SensorDisplay.h>
@@ -42,35 +42,35 @@ class QStringList;
layout. The number of columns can not be changed. Displays are added by
dragging a sensor from the sensor browser over the WorkSheet.
*/
-class WorkSheet : public QWidget, public KSGRD::SensorBoard
+class WorkSheet : public TQWidget, public KSGRD::SensorBoard
{
Q_OBJECT
public:
- WorkSheet( QWidget* parent, const char *name = 0 );
- WorkSheet( uint rows, uint columns, uint interval, QWidget* parent,
+ WorkSheet( TQWidget* parent, const char *name = 0 );
+ WorkSheet( uint rows, uint columns, uint interval, TQWidget* parent,
const char *name = 0 );
~WorkSheet();
- bool load( const QString &fileName );
- bool save( const QString &fileName );
+ bool load( const TQString &fileName );
+ bool save( const TQString &fileName );
void cut();
void copy();
void paste();
- void setFileName( const QString &fileName );
- const QString& fileName() const;
+ void setFileName( const TQString &fileName );
+ const TQString& fileName() const;
bool modified() const;
- void setTitle( const QString &title );
- QString title() const;
+ void setTitle( const TQString &title );
+ TQString title() const;
- KSGRD::SensorDisplay* addDisplay( const QString &hostname,
- const QString &monitor,
- const QString &sensorType,
- const QString &sensorDescr,
+ KSGRD::SensorDisplay* addDisplay( const TQString &hostname,
+ const TQString &monitor,
+ const TQString &sensorType,
+ const TQString &sensorDescr,
uint rows, uint columns );
//Returns the sensor at position row,column.
//Return NULL if invalid row or column
@@ -86,24 +86,24 @@ class WorkSheet : public QWidget, public KSGRD::SensorBoard
void applyStyle();
signals:
- void sheetModified( QWidget *sheet );
- void titleChanged( QWidget *sheet );
+ void sheetModified( TQWidget *sheet );
+ void titleChanged( TQWidget *sheet );
protected:
- virtual QSize sizeHint() const;
- void dragEnterEvent( QDragEnterEvent* );
- void dropEvent( QDropEvent* );
- void customEvent( QCustomEvent* );
+ virtual TQSize sizeHint() const;
+ void dragEnterEvent( TQDragEnterEvent* );
+ void dropEvent( TQDropEvent* );
+ void customEvent( TQCustomEvent* );
private:
void removeDisplay( KSGRD::SensorDisplay *display );
- bool replaceDisplay( uint row, uint column, QDomElement& element );
+ bool replaceDisplay( uint row, uint column, TQDomElement& element );
void replaceDisplay( uint row, uint column,
KSGRD::SensorDisplay* display = 0 );
- void collectHosts( QStringList &list );
+ void collectHosts( TQStringList &list );
void createGrid( uint rows, uint columns );
@@ -113,16 +113,16 @@ class WorkSheet : public QWidget, public KSGRD::SensorBoard
void fixTabOrder();
- QString currentDisplayAsXML();
+ TQString currentDisplayAsXML();
bool mModified;
uint mRows;
uint mColumns;
- QGridLayout* mGridLayout;
- QString mFileName;
- QString mTitle;
+ TQGridLayout* mGridLayout;
+ TQString mFileName;
+ TQString mTitle;
/**
This two dimensional array stores the pointers to the sensor displays
diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc
index e9ba0da08..3e4c28e50 100644
--- a/ksysguard/gui/WorkSheetSettings.cc
+++ b/ksysguard/gui/WorkSheetSettings.cc
@@ -26,30 +26,30 @@
#include <knuminput.h>
#include <klocale.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
+#include <tqspinbox.h>
+#include <tqlayout.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
#include "WorkSheetSettings.h"
-WorkSheetSettings::WorkSheetSettings( QWidget* parent, const char* name )
- : KDialogBase( parent, name, true, QString::null, Ok|Cancel, Ok, true )
+WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
+ : KDialogBase( parent, name, true, TQString::null, Ok|Cancel, Ok, true )
{
setCaption( i18n( "Worksheet Properties" ) );
- QWidget *page = new QWidget( this );
+ TQWidget *page = new TQWidget( this );
setMainWidget( page );
- QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() );
+ TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
- QGroupBox *group = new QGroupBox( 0, Qt::Vertical, i18n( "Title" ), page );
+ TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page );
group->layout()->setMargin( marginHint() );
group->layout()->setSpacing( spacingHint() );
- QGridLayout *groupLayout = new QGridLayout( group->layout(), 1, 1 );
+ TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 1, 1 );
groupLayout->setAlignment( Qt::AlignTop );
mSheetTitle = new KLineEdit( group );
@@ -57,14 +57,14 @@ WorkSheetSettings::WorkSheetSettings( QWidget* parent, const char* name )
topLayout->addWidget( group );
- group = new QGroupBox( 0, Qt::Vertical, i18n( "Properties" ), page );
+ group = new TQGroupBox( 0, Qt::Vertical, i18n( "Properties" ), page );
group->layout()->setMargin( marginHint() );
group->layout()->setSpacing( spacingHint() );
- groupLayout = new QGridLayout( group->layout(), 3, 2 );
+ groupLayout = new TQGridLayout( group->layout(), 3, 2 );
groupLayout->setAlignment( Qt::AlignTop );
- QLabel *label = new QLabel( i18n( "Rows:" ), group );
+ TQLabel *label = new TQLabel( i18n( "Rows:" ), group );
groupLayout->addWidget( label, 0, 0 );
mRows = new KIntNumInput( 1, group );
@@ -73,7 +73,7 @@ WorkSheetSettings::WorkSheetSettings( QWidget* parent, const char* name )
groupLayout->addWidget( mRows, 0, 1 );
label->setBuddy( mRows );
- label = new QLabel( i18n( "Columns:" ), group );
+ label = new TQLabel( i18n( "Columns:" ), group );
groupLayout->addWidget( label, 1, 0 );
mColumns = new KIntNumInput( 1, group );
@@ -82,7 +82,7 @@ WorkSheetSettings::WorkSheetSettings( QWidget* parent, const char* name )
groupLayout->addWidget( mColumns, 1, 1 );
label->setBuddy( mColumns );
- label = new QLabel( i18n( "Update interval:" ), group );
+ label = new TQLabel( i18n( "Update interval:" ), group );
groupLayout->addWidget( label, 2, 0 );
mInterval = new KIntNumInput( 2, group );
@@ -94,16 +94,16 @@ WorkSheetSettings::WorkSheetSettings( QWidget* parent, const char* name )
topLayout->addWidget( group );
- QWhatsThis::add( mRows, i18n( "Enter the number of rows the sheet should have." ) );
- QWhatsThis::add( mColumns, i18n( "Enter the number of columns the sheet should have." ) );
- QWhatsThis::add( mInterval, i18n( "All displays of the sheet are updated at the rate specified here." ) );
- QToolTip::add( mSheetTitle, i18n( "Enter the title of the worksheet here." ) );
+ TQWhatsThis::add( mRows, i18n( "Enter the number of rows the sheet should have." ) );
+ TQWhatsThis::add( mColumns, i18n( "Enter the number of columns the sheet should have." ) );
+ TQWhatsThis::add( mInterval, i18n( "All displays of the sheet are updated at the rate specified here." ) );
+ TQToolTip::add( mSheetTitle, i18n( "Enter the title of the worksheet here." ) );
KAcceleratorManager::manage( page );
mSheetTitle->setFocus();
- resize( QSize( 250, 230 ).expandedTo( minimumSizeHint() ) );
+ resize( TQSize( 250, 230 ).expandedTo( minimumSizeHint() ) );
}
WorkSheetSettings::~WorkSheetSettings()
@@ -140,12 +140,12 @@ int WorkSheetSettings::interval() const
return mInterval->value();
}
-void WorkSheetSettings::setSheetTitle( const QString &title )
+void WorkSheetSettings::setSheetTitle( const TQString &title )
{
mSheetTitle->setText( title );
}
-QString WorkSheetSettings::sheetTitle() const
+TQString WorkSheetSettings::sheetTitle() const
{
return mSheetTitle->text();
}
diff --git a/ksysguard/gui/WorkSheetSettings.h b/ksysguard/gui/WorkSheetSettings.h
index 8fe5641a5..5f7d8da0c 100644
--- a/ksysguard/gui/WorkSheetSettings.h
+++ b/ksysguard/gui/WorkSheetSettings.h
@@ -34,7 +34,7 @@ class WorkSheetSettings : public KDialogBase
Q_OBJECT
public:
- WorkSheetSettings( QWidget* parent = 0, const char* name = 0 );
+ WorkSheetSettings( TQWidget* parent = 0, const char* name = 0 );
~WorkSheetSettings();
void setRows( int rows );
@@ -46,8 +46,8 @@ class WorkSheetSettings : public KDialogBase
void setInterval( int interval );
int interval() const;
- void setSheetTitle( const QString &title );
- QString sheetTitle() const;
+ void setSheetTitle( const TQString &title );
+ TQString sheetTitle() const;
private:
KLineEdit* mSheetTitle;
diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc
index c179317c0..3c1a92a56 100644
--- a/ksysguard/gui/Workspace.cc
+++ b/ksysguard/gui/Workspace.cc
@@ -21,9 +21,9 @@
*/
-#include <qlineedit.h>
-#include <qspinbox.h>
-#include <qwhatsthis.h>
+#include <tqlineedit.h>
+#include <tqspinbox.h>
+#include <tqwhatsthis.h>
#include <kdebug.h>
#include <kfiledialog.h>
@@ -39,18 +39,18 @@
#include "Workspace.h"
-Workspace::Workspace( QWidget* parent, const char* name )
- : QTabWidget( parent, name )
+Workspace::Workspace( TQWidget* parent, const char* name )
+ : TQTabWidget( parent, name )
{
KAcceleratorManager::setNoAccel(this);
mSheetList.setAutoDelete( true );
mAutoSave = true;
- connect( this, SIGNAL( currentChanged( QWidget* ) ),
- SLOT( updateCaption( QWidget* ) ) );
+ connect( this, TQT_SIGNAL( currentChanged( TQWidget* ) ),
+ TQT_SLOT( updateCaption( TQWidget* ) ) );
- QWhatsThis::add( this, i18n( "This is your work space. It holds your worksheets. You need "
+ TQWhatsThis::add( this, i18n( "This is your work space. It holds your worksheets. You need "
"to create a new worksheet (Menu File->New) before "
"you can drag sensors here." ) );
}
@@ -62,8 +62,8 @@ Workspace::~Workspace()
* administration data is already deleted but slots are still
* being triggered. TODO: I need to ask the Trolls about this. */
- disconnect( this, SIGNAL( currentChanged( QWidget* ) ), this,
- SLOT( updateCaption( QWidget* ) ) );
+ disconnect( this, TQT_SIGNAL( currentChanged( TQWidget* ) ), this,
+ TQT_SLOT( updateCaption( TQWidget* ) ) );
}
void Workspace::saveProperties( KConfig *cfg )
@@ -71,9 +71,9 @@ void Workspace::saveProperties( KConfig *cfg )
cfg->writePathEntry( "WorkDir", mWorkDir );
cfg->writeEntry( "CurrentSheet", tabLabel( currentPage() ) );
- QPtrListIterator<WorkSheet> it( mSheetList);
+ TQPtrListIterator<WorkSheet> it( mSheetList);
- QStringList list;
+ TQStringList list;
for ( int i = 0; it.current(); ++it, ++i )
if ( !(*it)->fileName().isEmpty() )
list.append( (*it)->fileName() );
@@ -83,7 +83,7 @@ void Workspace::saveProperties( KConfig *cfg )
void Workspace::readProperties( KConfig *cfg )
{
- QString currentSheet;
+ TQString currentSheet;
mWorkDir = cfg->readPathEntry( "WorkDir" );
@@ -96,8 +96,8 @@ void Workspace::readProperties( KConfig *cfg )
mWorkDir = kstd->saveLocation( "data", "ksysguard" );
- QString origFile = kstd->findResource( "data", "SystemLoad.sgrd" );
- QString newFile = mWorkDir + "/" + i18n( "System Load" ) + ".sgrd";
+ TQString origFile = kstd->findResource( "data", "SystemLoad.sgrd" );
+ TQString newFile = mWorkDir + "/" + i18n( "System Load" ) + ".sgrd";
if ( !origFile.isEmpty() )
restoreWorkSheet( origFile, newFile );
@@ -109,13 +109,13 @@ void Workspace::readProperties( KConfig *cfg )
currentSheet = i18n( "System Load" );
} else {
currentSheet = cfg->readEntry( "CurrentSheet" );
- QStringList list = cfg->readPathListEntry( "Sheets" );
- for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+ TQStringList list = cfg->readPathListEntry( "Sheets" );
+ for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
restoreWorkSheet( *it );
}
// Determine visible sheet.
- QPtrListIterator<WorkSheet> it( mSheetList );
+ TQPtrListIterator<WorkSheet> it( mSheetList );
for ( ; it.current(); ++it )
if ( currentSheet == tabLabel(*it) ) {
showPage( *it );
@@ -127,13 +127,13 @@ void Workspace::newWorkSheet()
{
/* Find a name of the form "Sheet %d" that is not yet used by any
* of the existing worksheets. */
- QString sheetName;
+ TQString sheetName;
bool found;
int i = 1;
do {
sheetName = i18n( "Sheet %1" ).arg( i++ );
- QPtrListIterator<WorkSheet> it( mSheetList );
+ TQPtrListIterator<WorkSheet> it( mSheetList );
found = false;
for ( ; it.current() && !found; ++it )
if ( tabLabel(*it) == sheetName )
@@ -148,23 +148,23 @@ void Workspace::newWorkSheet()
insertTab( sheet, dlg.sheetTitle() );
mSheetList.append( sheet );
showPage( sheet );
- connect( sheet, SIGNAL( sheetModified( QWidget* ) ),
- SLOT( updateCaption( QWidget* ) ) );
- connect( sheet, SIGNAL( titleChanged( QWidget* ) ),
- SLOT( updateSheetTitle( QWidget* ) ) );
+ connect( sheet, TQT_SIGNAL( sheetModified( TQWidget* ) ),
+ TQT_SLOT( updateCaption( TQWidget* ) ) );
+ connect( sheet, TQT_SIGNAL( titleChanged( TQWidget* ) ),
+ TQT_SLOT( updateSheetTitle( TQWidget* ) ) );
}
}
bool Workspace::saveOnQuit()
{
- QPtrListIterator<WorkSheet> it( mSheetList );
+ TQPtrListIterator<WorkSheet> it( mSheetList );
for ( ; it.current(); ++it )
if ( (*it)->modified() ) {
if ( !mAutoSave || (*it)->fileName().isEmpty() ) {
int res = KMessageBox::warningYesNoCancel( this,
i18n( "The worksheet '%1' contains unsaved data.\n"
"Do you want to save the worksheet?")
- .arg( tabLabel( *it ) ), QString::null, KStdGuiItem::save(), KStdGuiItem::discard() );
+ .arg( tabLabel( *it ) ), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() );
if ( res == KMessageBox::Yes )
saveWorkSheet( *it );
else if ( res == KMessageBox::Cancel )
@@ -194,7 +194,7 @@ void Workspace::loadWorkSheet( const KURL &url )
/* It's probably not worth the effort to make this really network
* transparent. Unless s/o beats me up I use this pseudo transparent
* code. */
- QString tmpFile;
+ TQString tmpFile;
KIO::NetAccess::download( url, tmpFile, this );
mWorkDir = tmpFile.left( tmpFile.findRev( '/' ) );
@@ -207,7 +207,7 @@ void Workspace::loadWorkSheet( const KURL &url )
KURL tmpFileUrl;
tmpFileUrl.setPath( tmpFile );
if ( tmpFileUrl != url.url() )
- mSheetList.last()->setFileName( QString::null );
+ mSheetList.last()->setFileName( TQString::null );
KIO::NetAccess::removeTempFile( tmpFile );
emit announceRecentURL( KURL( url ) );
@@ -230,7 +230,7 @@ void Workspace::saveWorkSheet( WorkSheet *sheet )
return;
}
- QString fileName = sheet->fileName();
+ TQString fileName = sheet->fileName();
if ( fileName.isEmpty() ) {
KFileDialog dlg( 0, i18n( "*.sgrd|Sensor Files" ), this,
"LoadFileDialog", true );
@@ -243,7 +243,7 @@ void Workspace::saveWorkSheet( WorkSheet *sheet )
mWorkDir = fileName.left( fileName.findRev( '/' ) );
// extract filename without path
- QString baseName = fileName.right( fileName.length() - fileName.findRev( '/' ) - 1 );
+ TQString baseName = fileName.right( fileName.length() - fileName.findRev( '/' ) - 1 );
// chop off extension (usually '.sgrd')
baseName = baseName.left( baseName.findRev( '.' ) );
@@ -270,7 +270,7 @@ void Workspace::saveWorkSheetAs( WorkSheet *sheet )
return;
}
- QString fileName;
+ TQString fileName;
do {
KFileDialog dlg( 0, "*.sgrd", this, "LoadFileDialog", true );
fileName = dlg.getSaveFileName( mWorkDir + "/" + tabLabel( currentPage() ) +
@@ -281,7 +281,7 @@ void Workspace::saveWorkSheetAs( WorkSheet *sheet )
mWorkDir = fileName.left( fileName.findRev( '/' ) );
// extract filename without path
- QString baseName = fileName.right( fileName.length() - fileName.findRev( '/' ) - 1 );
+ TQString baseName = fileName.right( fileName.length() - fileName.findRev( '/' ) - 1 );
// chop off extension (usually '.sgrd')
baseName = baseName.left( baseName.findRev( '.' ) );
@@ -304,7 +304,7 @@ void Workspace::deleteWorkSheet()
int res = KMessageBox::warningYesNoCancel( this,
i18n( "The worksheet '%1' contains unsaved data.\n"
"Do you want to save the worksheet?" )
- .arg( tabLabel( current ) ), QString::null, KStdGuiItem::save(), KStdGuiItem::discard() );
+ .arg( tabLabel( current ) ), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() );
if ( res == KMessageBox::Cancel )
return;
@@ -317,7 +317,7 @@ void Workspace::deleteWorkSheet()
removePage( current );
mSheetList.remove( current );
} else {
- QString msg = i18n( "There are no worksheets that could be deleted." );
+ TQString msg = i18n( "There are no worksheets that could be deleted." );
KMessageBox::error( this, msg );
}
}
@@ -331,9 +331,9 @@ void Workspace::removeAllWorkSheets()
}
}
-void Workspace::deleteWorkSheet( const QString &fileName )
+void Workspace::deleteWorkSheet( const TQString &fileName )
{
- QPtrListIterator<WorkSheet> it( mSheetList );
+ TQPtrListIterator<WorkSheet> it( mSheetList );
for ( ; it.current(); ++it )
if ( (*it)->fileName() == fileName ) {
removePage( *it );
@@ -342,19 +342,19 @@ void Workspace::deleteWorkSheet( const QString &fileName )
}
}
-WorkSheet *Workspace::restoreWorkSheet( const QString &fileName, const QString &newName )
+WorkSheet *Workspace::restoreWorkSheet( const TQString &fileName, const TQString &newName )
{
/* We might want to save the worksheet under a different name later. This
* name can be specified by newName. If newName is empty we use the
* original name to save the work sheet. */
- QString tmpStr;
+ TQString tmpStr;
if ( newName.isEmpty() )
tmpStr = fileName;
else
tmpStr = newName;
// extract filename without path
- QString baseName = tmpStr.right( tmpStr.length() - tmpStr.findRev( '/' ) - 1 );
+ TQString baseName = tmpStr.right( tmpStr.length() - tmpStr.findRev( '/' ) - 1 );
// chop off extension (usually '.sgrd')
baseName = baseName.left( baseName.findRev( '.' ) );
@@ -370,8 +370,8 @@ WorkSheet *Workspace::restoreWorkSheet( const QString &fileName, const QString &
}
mSheetList.append( sheet );
- connect( sheet, SIGNAL( sheetModified( QWidget* ) ),
- SLOT( updateCaption( QWidget* ) ) );
+ connect( sheet, TQT_SIGNAL( sheetModified( TQWidget* ) ),
+ TQT_SLOT( updateCaption( TQWidget* ) ) );
/* Force the file name to be the new name. This also sets the modified
* flag, so that the file will get saved on exit. */
@@ -415,18 +415,18 @@ void Workspace::configure()
current->settings();
}
-void Workspace::updateCaption( QWidget* wdg )
+void Workspace::updateCaption( TQWidget* wdg )
{
if ( wdg )
emit setCaption( tabLabel( wdg ), ((WorkSheet*)wdg)->modified() );
else
- emit setCaption( QString::null, false );
+ emit setCaption( TQString::null, false );
for ( WorkSheet* s = mSheetList.first(); s != 0; s = mSheetList.next() )
((WorkSheet*)s)->setIsOnTop( s == wdg );
}
-void Workspace::updateSheetTitle( QWidget* wdg )
+void Workspace::updateSheetTitle( TQWidget* wdg )
{
if ( wdg )
changeTab( wdg, static_cast<WorkSheet*>( wdg )->title() );
@@ -443,7 +443,7 @@ void Workspace::showProcesses()
KStandardDirs* kstd = KGlobal::dirs();
kstd->addResourceType( "data", "share/apps/ksysguard" );
- QString file = kstd->findResource( "data", "ProcessTable.sgrd" );
+ TQString file = kstd->findResource( "data", "ProcessTable.sgrd" );
if ( file.isEmpty() ) {
KMessageBox::error( this, i18n( "Cannot find file ProcessTable.sgrd." ) );
return;
diff --git a/ksysguard/gui/Workspace.h b/ksysguard/gui/Workspace.h
index af27f6303..3c0f8c523 100644
--- a/ksysguard/gui/Workspace.h
+++ b/ksysguard/gui/Workspace.h
@@ -24,8 +24,8 @@
#ifndef KSG_WORKSPACE_H
#define KSG_WORKSPACE_H
-#include <qptrlist.h>
-#include <qtabwidget.h>
+#include <tqptrlist.h>
+#include <tqtabwidget.h>
class KConfig;
class KURL;
@@ -37,7 +37,7 @@ class Workspace : public QTabWidget
Q_OBJECT
public:
- Workspace( QWidget* parent, const char* name = 0 );
+ Workspace( TQWidget* parent, const char* name = 0 );
~Workspace();
void saveProperties( KConfig* );
@@ -47,9 +47,9 @@ class Workspace : public QTabWidget
void showProcesses();
- WorkSheet *restoreWorkSheet( const QString &fileName,
- const QString &newName = QString::null );
- void deleteWorkSheet( const QString &fileName );
+ WorkSheet *restoreWorkSheet( const TQString &fileName,
+ const TQString &newName = TQString::null );
+ void deleteWorkSheet( const TQString &fileName );
public slots:
void newWorkSheet();
@@ -65,19 +65,19 @@ class Workspace : public QTabWidget
void copy();
void paste();
void configure();
- void updateCaption( QWidget* );
- void updateSheetTitle( QWidget* );
+ void updateCaption( TQWidget* );
+ void updateSheetTitle( TQWidget* );
void applyStyle();
signals:
void announceRecentURL( const KURL &url );
- void setCaption( const QString &text, bool modified );
+ void setCaption( const TQString &text, bool modified );
private:
- QPtrList<WorkSheet> mSheetList;
+ TQPtrList<WorkSheet> mSheetList;
// Directory that was used for the last load/save.
- QString mWorkDir;
+ TQString mWorkDir;
bool mAutoSave;
};
diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc
index 5762d08b3..3885a9518 100644
--- a/ksysguard/gui/ksgrd/HostConnector.cc
+++ b/ksysguard/gui/ksgrd/HostConnector.cc
@@ -23,100 +23,100 @@
#include <kcombobox.h>
#include <klocale.h>
-#include <qbuttongroup.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
-#include <qspinbox.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <tqbuttongroup.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqradiobutton.h>
+#include <tqspinbox.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
#include "HostConnector.h"
-HostConnector::HostConnector( QWidget *parent, const char *name )
+HostConnector::HostConnector( TQWidget *parent, const char *name )
: KDialogBase( Plain, i18n( "Connect Host" ), Help | Ok | Cancel, Ok,
parent, name, true, true )
{
- QFrame *page = plainPage();
- QGridLayout *layout = new QGridLayout( page, 2, 2, 0, spacingHint() );
+ TQFrame *page = plainPage();
+ TQGridLayout *layout = new TQGridLayout( page, 2, 2, 0, spacingHint() );
layout->setColStretch( 1, 1 );
- QLabel *label = new QLabel( i18n( "Host:" ), page );
+ TQLabel *label = new TQLabel( i18n( "Host:" ), page );
layout->addWidget( label, 0, 0 );
mHostNames = new KComboBox( true, page );
mHostNames->setMaxCount( 20 );
- mHostNames->setInsertionPolicy( QComboBox::AtTop );
+ mHostNames->setInsertionPolicy( TQComboBox::AtTop );
mHostNames->setAutoCompletion( true );
mHostNames->setDuplicatesEnabled( false );
layout->addWidget( mHostNames, 0, 1 );
label->setBuddy( mHostNames );
- QWhatsThis::add( mHostNames, i18n( "Enter the name of the host you want to connect to." ) );
+ TQWhatsThis::add( mHostNames, i18n( "Enter the name of the host you want to connect to." ) );
- mHostNameLabel = new QLabel( page );
+ mHostNameLabel = new TQLabel( page );
mHostNameLabel->hide();
layout->addWidget( mHostNameLabel, 0, 1 );
- QButtonGroup *group = new QButtonGroup( 0, Qt::Vertical,
+ TQButtonGroup *group = new TQButtonGroup( 0, Qt::Vertical,
i18n( "Connection Type" ), page );
- QGridLayout *groupLayout = new QGridLayout( group->layout(), 4, 4,
+ TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 4, 4,
spacingHint() );
groupLayout->setAlignment( Qt::AlignTop );
- mUseSsh = new QRadioButton( i18n( "ssh" ), group );
+ mUseSsh = new TQRadioButton( i18n( "ssh" ), group );
mUseSsh->setEnabled( true );
mUseSsh->setChecked( true );
- QWhatsThis::add( mUseSsh, i18n( "Select this to use the secure shell to login to the remote host." ) );
+ TQWhatsThis::add( mUseSsh, i18n( "Select this to use the secure shell to login to the remote host." ) );
groupLayout->addWidget( mUseSsh, 0, 0 );
- mUseRsh = new QRadioButton( i18n( "rsh" ), group );
- QWhatsThis::add( mUseRsh, i18n( "Select this to use the remote shell to login to the remote host." ) );
+ mUseRsh = new TQRadioButton( i18n( "rsh" ), group );
+ TQWhatsThis::add( mUseRsh, i18n( "Select this to use the remote shell to login to the remote host." ) );
groupLayout->addWidget( mUseRsh, 0, 1 );
- mUseDaemon = new QRadioButton( i18n( "Daemon" ), group );
- QWhatsThis::add( mUseDaemon, i18n( "Select this if you want to connect to a ksysguard daemon that is running on the machine you want to connect to, and is listening for client requests." ) );
+ mUseDaemon = new TQRadioButton( i18n( "Daemon" ), group );
+ TQWhatsThis::add( mUseDaemon, i18n( "Select this if you want to connect to a ksysguard daemon that is running on the machine you want to connect to, and is listening for client requests." ) );
groupLayout->addWidget( mUseDaemon, 0, 2 );
- mUseCustom = new QRadioButton( i18n( "Custom command" ), group );
- QWhatsThis::add( mUseCustom, i18n( "Select this to use the command you entered below to start ksysguardd on the remote host." ) );
+ mUseCustom = new TQRadioButton( i18n( "Custom command" ), group );
+ TQWhatsThis::add( mUseCustom, i18n( "Select this to use the command you entered below to start ksysguardd on the remote host." ) );
groupLayout->addWidget( mUseCustom, 0, 3 );
- label = new QLabel( i18n( "Port:" ), group );
+ label = new TQLabel( i18n( "Port:" ), group );
groupLayout->addWidget( label, 1, 0 );
- mPort = new QSpinBox( 1, 65535, 1, group );
+ mPort = new TQSpinBox( 1, 65535, 1, group );
mPort->setEnabled( false );
mPort->setValue( 3112 );
- QToolTip::add( mPort, i18n( "Enter the port number on which the ksysguard daemon is listening for connections." ) );
+ TQToolTip::add( mPort, i18n( "Enter the port number on which the ksysguard daemon is listening for connections." ) );
groupLayout->addWidget( mPort, 1, 2 );
- label = new QLabel( i18n( "e.g. 3112" ), group );
+ label = new TQLabel( i18n( "e.g. 3112" ), group );
groupLayout->addWidget( label, 1, 3 );
- label = new QLabel( i18n( "Command:" ), group );
+ label = new TQLabel( i18n( "Command:" ), group );
groupLayout->addWidget( label, 2, 0 );
mCommands = new KComboBox( true, group );
mCommands->setEnabled( false );
mCommands->setMaxCount( 20 );
- mCommands->setInsertionPolicy( QComboBox::AtTop );
+ mCommands->setInsertionPolicy( TQComboBox::AtTop );
mCommands->setAutoCompletion( true );
mCommands->setDuplicatesEnabled( false );
- QWhatsThis::add( mCommands, i18n( "Enter the command that runs ksysguardd on the host you want to monitor." ) );
+ TQWhatsThis::add( mCommands, i18n( "Enter the command that runs ksysguardd on the host you want to monitor." ) );
groupLayout->addMultiCellWidget( mCommands, 2, 2, 2, 3 );
label->setBuddy( mCommands );
- label = new QLabel( i18n( "e.g. ssh -l root remote.host.org ksysguardd" ), group );
+ label = new TQLabel( i18n( "e.g. ssh -l root remote.host.org ksysguardd" ), group );
groupLayout->addMultiCellWidget( label, 3, 3, 2, 3 );
layout->addMultiCellWidget( group, 1, 1, 0, 1 );
- connect( mUseCustom, SIGNAL( toggled( bool ) ),
- mCommands, SLOT( setEnabled( bool ) ) );
- connect( mUseDaemon, SIGNAL( toggled( bool ) ),
- mPort, SLOT( setEnabled( bool ) ) );
- connect( mHostNames->lineEdit(), SIGNAL( textChanged ( const QString & ) ),
- this, SLOT( slotHostNameChanged( const QString & ) ) );
+ connect( mUseCustom, TQT_SIGNAL( toggled( bool ) ),
+ mCommands, TQT_SLOT( setEnabled( bool ) ) );
+ connect( mUseDaemon, TQT_SIGNAL( toggled( bool ) ),
+ mPort, TQT_SLOT( setEnabled( bool ) ) );
+ connect( mHostNames->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ),
+ this, TQT_SLOT( slotHostNameChanged( const TQString & ) ) );
enableButtonOK( !mHostNames->lineEdit()->text().isEmpty() );
KAcceleratorManager::manage( this );
}
@@ -125,19 +125,19 @@ HostConnector::~HostConnector()
{
}
-void HostConnector::slotHostNameChanged( const QString &_text )
+void HostConnector::slotHostNameChanged( const TQString &_text )
{
enableButtonOK( !_text.isEmpty() );
}
-void HostConnector::setHostNames( const QStringList &list )
+void HostConnector::setHostNames( const TQStringList &list )
{
mHostNames->insertStringList( list );
}
-QStringList HostConnector::hostNames() const
+TQStringList HostConnector::hostNames() const
{
- QStringList list;
+ TQStringList list;
for ( int i = 0; i < mHostNames->count(); ++i )
list.append( mHostNames->text( i ) );
@@ -145,14 +145,14 @@ QStringList HostConnector::hostNames() const
return list;
}
-void HostConnector::setCommands( const QStringList &list )
+void HostConnector::setCommands( const TQStringList &list )
{
mCommands->insertStringList( list );
}
-QStringList HostConnector::commands() const
+TQStringList HostConnector::commands() const
{
- QStringList list;
+ TQStringList list;
for ( int i = 0; i < mCommands->count(); ++i )
list.append( mCommands->text( i ) );
@@ -160,7 +160,7 @@ QStringList HostConnector::commands() const
return list;
}
-void HostConnector::setCurrentHostName( const QString &hostName )
+void HostConnector::setCurrentHostName( const TQString &hostName )
{
if ( !hostName.isEmpty() ) {
mHostNames->hide();
@@ -174,12 +174,12 @@ void HostConnector::setCurrentHostName( const QString &hostName )
}
}
-QString HostConnector::currentHostName() const
+TQString HostConnector::currentHostName() const
{
return mHostNames->currentText();
}
-QString HostConnector::currentCommand() const
+TQString HostConnector::currentCommand() const
{
return mCommands->currentText();
}
diff --git a/ksysguard/gui/ksgrd/HostConnector.h b/ksysguard/gui/ksgrd/HostConnector.h
index eadf728cd..12893ff08 100644
--- a/ksysguard/gui/ksgrd/HostConnector.h
+++ b/ksysguard/gui/ksgrd/HostConnector.h
@@ -34,19 +34,19 @@ class HostConnector : public KDialogBase
Q_OBJECT
public:
- HostConnector( QWidget *parent, const char *name = 0 );
+ HostConnector( TQWidget *parent, const char *name = 0 );
~HostConnector();
- void setHostNames( const QStringList &list );
- QStringList hostNames() const;
+ void setHostNames( const TQStringList &list );
+ TQStringList hostNames() const;
- void setCommands( const QStringList &list );
- QStringList commands() const;
+ void setCommands( const TQStringList &list );
+ TQStringList commands() const;
- void setCurrentHostName( const QString &hostName );
+ void setCurrentHostName( const TQString &hostName );
- QString currentHostName() const;
- QString currentCommand() const;
+ TQString currentHostName() const;
+ TQString currentCommand() const;
int port() const;
bool useSsh() const;
@@ -56,19 +56,19 @@ class HostConnector : public KDialogBase
protected slots:
virtual void slotHelp();
- void slotHostNameChanged( const QString &_text );
+ void slotHostNameChanged( const TQString &_text );
private:
KComboBox *mCommands;
KComboBox *mHostNames;
- QLabel *mHostNameLabel;
+ TQLabel *mHostNameLabel;
- QRadioButton *mUseSsh;
- QRadioButton *mUseRsh;
- QRadioButton *mUseDaemon;
- QRadioButton *mUseCustom;
+ TQRadioButton *mUseSsh;
+ TQRadioButton *mUseRsh;
+ TQRadioButton *mUseDaemon;
+ TQRadioButton *mUseCustom;
- QSpinBox *mPort;
+ TQSpinBox *mPort;
};
#endif
diff --git a/ksysguard/gui/ksgrd/SensorAgent.cc b/ksysguard/gui/ksgrd/SensorAgent.cc
index a24bf5594..5fcb14a9c 100644
--- a/ksysguard/gui/ksgrd/SensorAgent.cc
+++ b/ksysguard/gui/ksgrd/SensorAgent.cc
@@ -55,7 +55,7 @@ SensorAgent::~SensorAgent()
{
}
-bool SensorAgent::sendRequest( const QString &req, SensorClient *client, int id )
+bool SensorAgent::sendRequest( const TQString &req, SensorClient *client, int id )
{
/* The request is registered with the FIFO so that the answer can be
* routed back to the requesting client. */
@@ -70,7 +70,7 @@ bool SensorAgent::sendRequest( const QString &req, SensorClient *client, int id
return false;
}
-void SensorAgent::processAnswer( const QString &buffer )
+void SensorAgent::processAnswer( const TQString &buffer )
{
#if SA_TRACE
kdDebug(1215) << "<- " << buffer << endl;
@@ -89,7 +89,7 @@ void SensorAgent::processAnswer( const QString &buffer )
.arg( mHostName )
.arg( mErrorBuffer ) );
}
- mErrorBuffer = QString::null;
+ mErrorBuffer = TQString::null;
}
} else if ( mState == 0 ) // receiving to answerBuffer
mAnswerBuffer += buffer[ i ];
@@ -112,7 +112,7 @@ void SensorAgent::processAnswer( const QString &buffer )
#if SA_TRACE
kdDebug(1215) << "Daemon now online!" << endl;
#endif
- mAnswerBuffer = QString::null;
+ mAnswerBuffer = TQString::null;
break;
}
@@ -121,7 +121,7 @@ void SensorAgent::processAnswer( const QString &buffer )
if ( !req ) {
kdDebug(1215) << "ERROR: Received answer but have no pending "
<< "request! : " << mAnswerBuffer.left( end ) << endl;
- mAnswerBuffer = QString::null;
+ mAnswerBuffer = TQString::null;
} else {
if ( !req->client() ) {
/* The client has disappeared before receiving the answer
@@ -161,7 +161,7 @@ void SensorAgent::executeCommand()
<< "/" << mProcessingFIFO.count() << ")" << endl;
#endif
// send request to daemon
- QString cmdWithNL = req->request() + "\n";
+ TQString cmdWithNL = req->request() + "\n";
if ( writeMsg( cmdWithNL.ascii(), cmdWithNL.length() ) )
mTransmitting = true;
else
@@ -207,18 +207,18 @@ bool SensorAgent::transmitting() const
return mTransmitting;
}
-void SensorAgent::setHostName( const QString &hostName )
+void SensorAgent::setHostName( const TQString &hostName )
{
mHostName = hostName;
}
-const QString &SensorAgent::hostName() const
+const TQString &SensorAgent::hostName() const
{
return mHostName;
}
-SensorRequest::SensorRequest( const QString &request, SensorClient *client, int id )
+SensorRequest::SensorRequest( const TQString &request, SensorClient *client, int id )
: mRequest( request ), mClient( client ), mId( id )
{
}
@@ -227,12 +227,12 @@ SensorRequest::~SensorRequest()
{
}
-void SensorRequest::setRequest( const QString &request )
+void SensorRequest::setRequest( const TQString &request )
{
mRequest = request;
}
-QString SensorRequest::request() const
+TQString SensorRequest::request() const
{
return mRequest;
}
diff --git a/ksysguard/gui/ksgrd/SensorAgent.h b/ksysguard/gui/ksgrd/SensorAgent.h
index e30deb510..0bf776547 100644
--- a/ksysguard/gui/ksgrd/SensorAgent.h
+++ b/ksysguard/gui/ksgrd/SensorAgent.h
@@ -21,8 +21,8 @@
#ifndef KSG_SENSORAGENT_H
#define KSG_SENSORAGENT_H
-#include <qobject.h>
-#include <qptrlist.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
class KProcess;
class KShellProcess;
@@ -51,8 +51,8 @@ class KDE_EXPORT SensorAgent : public QObject
SensorAgent( SensorManager *sm );
virtual ~SensorAgent();
- virtual bool start( const QString &host, const QString &shell,
- const QString &command = "", int port = -1 ) = 0;
+ virtual bool start( const TQString &host, const TQString &shell,
+ const TQString &command = "", int port = -1 ) = 0;
/**
This function should only be used by the the SensorManager and
@@ -66,19 +66,19 @@ class KDE_EXPORT SensorAgent : public QObject
used by the SensorAgent. So it can be any value the client suits to
use.
*/
- bool sendRequest( const QString &req, SensorClient *client, int id = 0 );
+ bool sendRequest( const TQString &req, SensorClient *client, int id = 0 );
- virtual void hostInfo( QString &sh, QString &cmd, int &port ) const = 0;
+ virtual void hostInfo( TQString &sh, TQString &cmd, int &port ) const = 0;
void disconnectClient( SensorClient *client );
- const QString &hostName() const;
+ const TQString &hostName() const;
signals:
void reconfigure( const SensorAgent* );
protected:
- void processAnswer( const QString &buffer );
+ void processAnswer( const TQString &buffer );
void executeCommand();
SensorManager *sensorManager();
@@ -89,23 +89,23 @@ class KDE_EXPORT SensorAgent : public QObject
void setTransmitting( bool value );
bool transmitting() const;
- void setHostName( const QString &hostName );
+ void setHostName( const TQString &hostName );
private:
virtual bool writeMsg( const char *msg, int len ) = 0;
virtual bool txReady() = 0;
int mState;
- QPtrList<SensorRequest> mInputFIFO;
- QPtrList<SensorRequest> mProcessingFIFO;
- QString mAnswerBuffer;
- QString mErrorBuffer;
+ TQPtrList<SensorRequest> mInputFIFO;
+ TQPtrList<SensorRequest> mProcessingFIFO;
+ TQString mAnswerBuffer;
+ TQString mErrorBuffer;
SensorManager *mSensorManager;
bool mDaemonOnLine;
bool mTransmitting;
- QString mHostName;
+ TQString mHostName;
};
/**
@@ -114,11 +114,11 @@ class KDE_EXPORT SensorAgent : public QObject
class SensorRequest
{
public:
- SensorRequest( const QString &request, SensorClient *client, int id );
+ SensorRequest( const TQString &request, SensorClient *client, int id );
~SensorRequest();
- void setRequest( const QString& );
- QString request() const;
+ void setRequest( const TQString& );
+ TQString request() const;
void setClient( SensorClient* );
SensorClient *client();
@@ -127,7 +127,7 @@ class SensorRequest
int id();
private:
- QString mRequest;
+ TQString mRequest;
SensorClient *mClient;
int mId;
};
diff --git a/ksysguard/gui/ksgrd/SensorClient.h b/ksysguard/gui/ksgrd/SensorClient.h
index 30586a8a2..d4e286cb1 100644
--- a/ksysguard/gui/ksgrd/SensorClient.h
+++ b/ksysguard/gui/ksgrd/SensorClient.h
@@ -24,8 +24,8 @@
#ifndef KSG_SENSORCLIENT_H
#define KSG_SENSORCLIENT_H
-#include <qptrlist.h>
-#include <qstring.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
namespace KSGRD {
@@ -46,7 +46,7 @@ class SensorClient
been received by the sensor agent. This function must be reimplemented
by the sensor client to receive and process this information.
*/
- virtual void answerReceived( int, const QString& ) { }
+ virtual void answerReceived( int, const TQString& ) { }
/**
In case of an unexpected fatal problem with the sensor the sensor
@@ -81,14 +81,14 @@ class SensorBoard
class SensorTokenizer
{
public:
- SensorTokenizer( const QString &info, QChar separator )
+ SensorTokenizer( const TQString &info, TQChar separator )
{
- mTokens = QStringList::split( separator, info );
+ mTokens = TQStringList::split( separator, info );
}
~SensorTokenizer() { }
- const QString& operator[]( unsigned idx )
+ const TQString& operator[]( unsigned idx )
{
return mTokens[ idx ];
}
@@ -99,7 +99,7 @@ class SensorTokenizer
}
private:
- QStringList mTokens;
+ TQStringList mTokens;
};
/**
@@ -110,12 +110,12 @@ class SensorTokenizer
class SensorIntegerInfo : public SensorTokenizer
{
public:
- SensorIntegerInfo( const QString &info )
+ SensorIntegerInfo( const TQString &info )
: SensorTokenizer( info, '\t' ) { }
~SensorIntegerInfo() { }
- const QString &name()
+ const TQString &name()
{
return (*this)[ 0 ];
}
@@ -130,7 +130,7 @@ class SensorIntegerInfo : public SensorTokenizer
return (*this)[ 2 ].toLong();
}
- const QString &unit()
+ const TQString &unit()
{
return (*this)[ 3 ];
}
@@ -144,12 +144,12 @@ class SensorIntegerInfo : public SensorTokenizer
class SensorFloatInfo : public SensorTokenizer
{
public:
- SensorFloatInfo( const QString &info )
+ SensorFloatInfo( const TQString &info )
: SensorTokenizer( info, '\t' ) { }
~SensorFloatInfo() { }
- const QString &name()
+ const TQString &name()
{
return (*this)[ 0 ];
}
@@ -164,7 +164,7 @@ class SensorFloatInfo : public SensorTokenizer
return (*this)[ 2 ].toDouble();
}
- const QString &unit()
+ const TQString &unit()
{
return (*this)[ 3 ];
}
@@ -178,12 +178,12 @@ class SensorFloatInfo : public SensorTokenizer
class SensorPSLine : public SensorTokenizer
{
public:
- SensorPSLine( const QString &line )
+ SensorPSLine( const TQString &line )
: SensorTokenizer( line, '\t' ) { }
~SensorPSLine() { }
- const QString& name()
+ const TQString& name()
{
return (*this)[ 0 ];
}
diff --git a/ksysguard/gui/ksgrd/SensorManager.cc b/ksysguard/gui/ksgrd/SensorManager.cc
index 065da717a..43f878cda 100644
--- a/ksysguard/gui/ksgrd/SensorManager.cc
+++ b/ksysguard/gui/ksgrd/SensorManager.cc
@@ -21,11 +21,11 @@
*/
-#include <qcombobox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qspinbox.h>
+#include <tqcombobox.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqspinbox.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -47,106 +47,106 @@ SensorManager::SensorManager()
mDict.setAutoDelete( true );
// Fill the sensor description dictionary.
- mDict.insert( "cpu", new QString( i18n( "CPU Load" ) ) );
- mDict.insert( "idle", new QString( i18n( "Idle Load" ) ) );
- mDict.insert( "sys", new QString( i18n( "System Load" ) ) );
- mDict.insert( "nice", new QString( i18n( "Nice Load" ) ) );
- mDict.insert( "user", new QString( i18n( "User Load" ) ) );
- mDict.insert( "mem", new QString( i18n( "Memory" ) ) );
- mDict.insert( "physical", new QString( i18n( "Physical Memory" ) ) );
- mDict.insert( "swap", new QString( i18n( "Swap Memory" ) ) );
- mDict.insert( "cached", new QString( i18n( "Cached Memory" ) ) );
- mDict.insert( "buf", new QString( i18n( "Buffered Memory" ) ) );
- mDict.insert( "used", new QString( i18n( "Used Memory" ) ) );
- mDict.insert( "application", new QString( i18n( "Application Memory" ) ) );
- mDict.insert( "free", new QString( i18n( "Free Memory" ) ) );
- mDict.insert( "pscount", new QString( i18n( "Process Count" ) ) );
- mDict.insert( "ps", new QString( i18n( "Process Controller" ) ) );
- mDict.insert( "disk", new QString( i18n( "Disk Throughput" ) ) );
- mDict.insert( "load", new QString( i18n( "CPU Load", "Load" ) ) );
- mDict.insert( "total", new QString( i18n( "Total Accesses" ) ) );
- mDict.insert( "rio", new QString( i18n( "Read Accesses" ) ) );
- mDict.insert( "wio", new QString( i18n( "Write Accesses" ) ) );
- mDict.insert( "rblk", new QString( i18n( "Read Data" ) ) );
- mDict.insert( "wblk", new QString( i18n( "Write Data" ) ) );
- mDict.insert( "pageIn", new QString( i18n( "Pages In" ) ) );
- mDict.insert( "pageOut", new QString( i18n( "Pages Out" ) ) );
- mDict.insert( "context", new QString( i18n( "Context Switches" ) ) );
- mDict.insert( "network", new QString( i18n( "Network" ) ) );
- mDict.insert( "interfaces", new QString( i18n( "Interfaces" ) ) );
- mDict.insert( "receiver", new QString( i18n( "Receiver" ) ) );
- mDict.insert( "transmitter", new QString( i18n( "Transmitter" ) ) );
- mDict.insert( "data", new QString( i18n( "Data" ) ) );
- mDict.insert( "compressed", new QString( i18n( "Compressed Packets" ) ) );
- mDict.insert( "drops", new QString( i18n( "Dropped Packets" ) ) );
- mDict.insert( "errors", new QString( i18n( "Errors" ) ) );
- mDict.insert( "fifo", new QString( i18n( "FIFO Overruns" ) ) );
- mDict.insert( "frame", new QString( i18n( "Frame Errors" ) ) );
- mDict.insert( "multicast", new QString( i18n( "Multicast" ) ) );
- mDict.insert( "packets", new QString( i18n( "Packets" ) ) );
- mDict.insert( "carrier", new QString( i18n( "Carrier" ) ) );
- mDict.insert( "collisions", new QString( i18n( "Collisions" ) ) );
- mDict.insert( "sockets", new QString( i18n( "Sockets" ) ) );
- mDict.insert( "count", new QString( i18n( "Total Number" ) ) );
- mDict.insert( "list", new QString( i18n( "Table" ) ) );
- mDict.insert( "apm", new QString( i18n( "Advanced Power Management" ) ) );
- mDict.insert( "acpi", new QString( i18n( "ACPI" ) ) );
- mDict.insert( "thermal_zone", new QString( i18n( "Thermal Zone" ) ) );
- mDict.insert( "temperature", new QString( i18n( "Temperature" ) ) );
- mDict.insert( "fan", new QString( i18n( "Fan" ) ) );
- mDict.insert( "state", new QString( i18n( "State" ) ) );
- mDict.insert( "battery", new QString( i18n( "Battery" ) ) );
- mDict.insert( "batterycharge", new QString( i18n( "Battery Charge" ) ) );
- mDict.insert( "batteryusage", new QString( i18n( "Battery Usage" ) ) );
- mDict.insert( "remainingtime", new QString( i18n( "Remaining Time" ) ) );
- mDict.insert( "interrupts", new QString( i18n( "Interrupts" ) ) );
- mDict.insert( "loadavg1", new QString( i18n( "Load Average (1 min)" ) ) );
- mDict.insert( "loadavg5", new QString( i18n( "Load Average (5 min)" ) ) );
- mDict.insert( "loadavg15", new QString( i18n( "Load Average (15 min)" ) ) );
- mDict.insert( "clock", new QString( i18n( "Clock Frequency" ) ) );
- mDict.insert( "lmsensors", new QString( i18n( "Hardware Sensors" ) ) );
- mDict.insert( "partitions", new QString( i18n( "Partition Usage" ) ) );
- mDict.insert( "usedspace", new QString( i18n( "Used Space" ) ) );
- mDict.insert( "freespace", new QString( i18n( "Free Space" ) ) );
- mDict.insert( "filllevel", new QString( i18n( "Fill Level" ) ) );
+ mDict.insert( "cpu", new TQString( i18n( "CPU Load" ) ) );
+ mDict.insert( "idle", new TQString( i18n( "Idle Load" ) ) );
+ mDict.insert( "sys", new TQString( i18n( "System Load" ) ) );
+ mDict.insert( "nice", new TQString( i18n( "Nice Load" ) ) );
+ mDict.insert( "user", new TQString( i18n( "User Load" ) ) );
+ mDict.insert( "mem", new TQString( i18n( "Memory" ) ) );
+ mDict.insert( "physical", new TQString( i18n( "Physical Memory" ) ) );
+ mDict.insert( "swap", new TQString( i18n( "Swap Memory" ) ) );
+ mDict.insert( "cached", new TQString( i18n( "Cached Memory" ) ) );
+ mDict.insert( "buf", new TQString( i18n( "Buffered Memory" ) ) );
+ mDict.insert( "used", new TQString( i18n( "Used Memory" ) ) );
+ mDict.insert( "application", new TQString( i18n( "Application Memory" ) ) );
+ mDict.insert( "free", new TQString( i18n( "Free Memory" ) ) );
+ mDict.insert( "pscount", new TQString( i18n( "Process Count" ) ) );
+ mDict.insert( "ps", new TQString( i18n( "Process Controller" ) ) );
+ mDict.insert( "disk", new TQString( i18n( "Disk Throughput" ) ) );
+ mDict.insert( "load", new TQString( i18n( "CPU Load", "Load" ) ) );
+ mDict.insert( "total", new TQString( i18n( "Total Accesses" ) ) );
+ mDict.insert( "rio", new TQString( i18n( "Read Accesses" ) ) );
+ mDict.insert( "wio", new TQString( i18n( "Write Accesses" ) ) );
+ mDict.insert( "rblk", new TQString( i18n( "Read Data" ) ) );
+ mDict.insert( "wblk", new TQString( i18n( "Write Data" ) ) );
+ mDict.insert( "pageIn", new TQString( i18n( "Pages In" ) ) );
+ mDict.insert( "pageOut", new TQString( i18n( "Pages Out" ) ) );
+ mDict.insert( "context", new TQString( i18n( "Context Switches" ) ) );
+ mDict.insert( "network", new TQString( i18n( "Network" ) ) );
+ mDict.insert( "interfaces", new TQString( i18n( "Interfaces" ) ) );
+ mDict.insert( "receiver", new TQString( i18n( "Receiver" ) ) );
+ mDict.insert( "transmitter", new TQString( i18n( "Transmitter" ) ) );
+ mDict.insert( "data", new TQString( i18n( "Data" ) ) );
+ mDict.insert( "compressed", new TQString( i18n( "Compressed Packets" ) ) );
+ mDict.insert( "drops", new TQString( i18n( "Dropped Packets" ) ) );
+ mDict.insert( "errors", new TQString( i18n( "Errors" ) ) );
+ mDict.insert( "fifo", new TQString( i18n( "FIFO Overruns" ) ) );
+ mDict.insert( "frame", new TQString( i18n( "Frame Errors" ) ) );
+ mDict.insert( "multicast", new TQString( i18n( "Multicast" ) ) );
+ mDict.insert( "packets", new TQString( i18n( "Packets" ) ) );
+ mDict.insert( "carrier", new TQString( i18n( "Carrier" ) ) );
+ mDict.insert( "collisions", new TQString( i18n( "Collisions" ) ) );
+ mDict.insert( "sockets", new TQString( i18n( "Sockets" ) ) );
+ mDict.insert( "count", new TQString( i18n( "Total Number" ) ) );
+ mDict.insert( "list", new TQString( i18n( "Table" ) ) );
+ mDict.insert( "apm", new TQString( i18n( "Advanced Power Management" ) ) );
+ mDict.insert( "acpi", new TQString( i18n( "ACPI" ) ) );
+ mDict.insert( "thermal_zone", new TQString( i18n( "Thermal Zone" ) ) );
+ mDict.insert( "temperature", new TQString( i18n( "Temperature" ) ) );
+ mDict.insert( "fan", new TQString( i18n( "Fan" ) ) );
+ mDict.insert( "state", new TQString( i18n( "State" ) ) );
+ mDict.insert( "battery", new TQString( i18n( "Battery" ) ) );
+ mDict.insert( "batterycharge", new TQString( i18n( "Battery Charge" ) ) );
+ mDict.insert( "batteryusage", new TQString( i18n( "Battery Usage" ) ) );
+ mDict.insert( "remainingtime", new TQString( i18n( "Remaining Time" ) ) );
+ mDict.insert( "interrupts", new TQString( i18n( "Interrupts" ) ) );
+ mDict.insert( "loadavg1", new TQString( i18n( "Load Average (1 min)" ) ) );
+ mDict.insert( "loadavg5", new TQString( i18n( "Load Average (5 min)" ) ) );
+ mDict.insert( "loadavg15", new TQString( i18n( "Load Average (15 min)" ) ) );
+ mDict.insert( "clock", new TQString( i18n( "Clock Frequency" ) ) );
+ mDict.insert( "lmsensors", new TQString( i18n( "Hardware Sensors" ) ) );
+ mDict.insert( "partitions", new TQString( i18n( "Partition Usage" ) ) );
+ mDict.insert( "usedspace", new TQString( i18n( "Used Space" ) ) );
+ mDict.insert( "freespace", new TQString( i18n( "Free Space" ) ) );
+ mDict.insert( "filllevel", new TQString( i18n( "Fill Level" ) ) );
for ( int i = 0; i < 32; i++ ) {
- mDict.insert( "cpu" + QString::number( i ),
- new QString( QString( i18n( "CPU%1" ) ).arg( i ) ) );
- mDict.insert( "disk" + QString::number( i ),
- new QString( QString( i18n( "Disk%1" ) ).arg( i ) ) );
+ mDict.insert( "cpu" + TQString::number( i ),
+ new TQString( TQString( i18n( "CPU%1" ) ).arg( i ) ) );
+ mDict.insert( "disk" + TQString::number( i ),
+ new TQString( TQString( i18n( "Disk%1" ) ).arg( i ) ) );
}
for ( int i = 0; i < 6; i++) {
- mDict.insert( "fan" + QString::number( i ),
- new QString( QString( i18n( "Fan%1" ) ).arg( i ) ) );
- mDict.insert( "temp" + QString::number( i ),
- new QString( QString( i18n( "Temperature%1" ) ).arg( i ) ) );
+ mDict.insert( "fan" + TQString::number( i ),
+ new TQString( TQString( i18n( "Fan%1" ) ).arg( i ) ) );
+ mDict.insert( "temp" + TQString::number( i ),
+ new TQString( TQString( i18n( "Temperature%1" ) ).arg( i ) ) );
}
- mDict.insert( "int00", new QString( i18n( "Total" ) ) );
+ mDict.insert( "int00", new TQString( i18n( "Total" ) ) );
- QString num;
+ TQString num;
for ( int i = 1; i < 25; i++ ) {
num.sprintf( "%.2d", i );
mDict.insert( "int" + num,
- new QString( QString( i18n( "Int%1" ) ).arg( i - 1, 3 ) ) );
+ new TQString( TQString( i18n( "Int%1" ) ).arg( i - 1, 3 ) ) );
}
mDescriptions.setAutoDelete( true );
// TODO: translated descriptions not yet implemented.
mUnits.setAutoDelete( true );
- mUnits.insert( "1/s", new QString( i18n( "the unit 1 per second", "1/s" ) ) );
- mUnits.insert( "kBytes", new QString( i18n( "kBytes" ) ) );
- mUnits.insert( "min", new QString( i18n( "the unit minutes", "min" ) ) );
- mUnits.insert( "MHz", new QString( i18n( "the frequency unit", "MHz" ) ) );
+ mUnits.insert( "1/s", new TQString( i18n( "the unit 1 per second", "1/s" ) ) );
+ mUnits.insert( "kBytes", new TQString( i18n( "kBytes" ) ) );
+ mUnits.insert( "min", new TQString( i18n( "the unit minutes", "min" ) ) );
+ mUnits.insert( "MHz", new TQString( i18n( "the frequency unit", "MHz" ) ) );
mTypes.setAutoDelete( true );
- mTypes.insert( "integer", new QString( i18n( "Integer Value" ) ) );
- mTypes.insert( "float", new QString( i18n( "Floating Point Value" ) ) );
- mTypes.insert( "table", new QString( i18n( "Process Controller" ) ) );
- mTypes.insert( "listview", new QString( i18n( "Table" ) ) );
+ mTypes.insert( "integer", new TQString( i18n( "Integer Value" ) ) );
+ mTypes.insert( "float", new TQString( i18n( "Floating Point Value" ) ) );
+ mTypes.insert( "table", new TQString( i18n( "Process Controller" ) ) );
+ mTypes.insert( "listview", new TQString( i18n( "Table" ) ) );
mBroadcaster = 0;
@@ -158,7 +158,7 @@ SensorManager::~SensorManager()
delete mHostConnector;
}
-bool SensorManager::engageHost( const QString &hostName )
+bool SensorManager::engageHost( const TQString &hostName )
{
bool retVal = true;
@@ -171,8 +171,8 @@ bool SensorManager::engageHost( const QString &hostName )
mHostConnector->setCurrentHostName( hostName );
if ( mHostConnector->exec() ) {
- QString shell = "";
- QString command = "";
+ TQString shell = "";
+ TQString command = "";
int port = -1;
/* Check which radio button is selected and set parameters
@@ -197,8 +197,8 @@ bool SensorManager::engageHost( const QString &hostName )
return retVal;
}
-bool SensorManager::engage( const QString &hostName, const QString &shell,
- const QString &command, int port )
+bool SensorManager::engage( const TQString &hostName, const TQString &shell,
+ const TQString &command, int port )
{
SensorAgent *agent;
@@ -214,8 +214,8 @@ bool SensorManager::engage( const QString &hostName, const QString &shell,
}
mAgents.insert( hostName, agent );
- connect( agent, SIGNAL( reconfigure( const SensorAgent* ) ),
- SLOT( reconfigure( const SensorAgent* ) ) );
+ connect( agent, TQT_SIGNAL( reconfigure( const SensorAgent* ) ),
+ TQT_SLOT( reconfigure( const SensorAgent* ) ) );
emit update();
return true;
@@ -232,13 +232,13 @@ void SensorManager::requestDisengage( const SensorAgent *agent )
* while we are still in a SensorAgent member function.
* So we have to post an event which is later caught by
* SensorManger::customEvent(). */
- QCustomEvent* event = new QCustomEvent( QEvent::User, (void*)agent );
+ TQCustomEvent* event = new TQCustomEvent( TQEvent::User, (void*)agent );
kapp->postEvent( this, event );
}
bool SensorManager::disengage( const SensorAgent *agent )
{
- QDictIterator<SensorAgent> it( mAgents );
+ TQDictIterator<SensorAgent> it( mAgents );
for ( ; it.current(); ++it )
if ( it.current() == agent ) {
@@ -250,7 +250,7 @@ bool SensorManager::disengage( const SensorAgent *agent )
return false;
}
-bool SensorManager::disengage( const QString &hostName )
+bool SensorManager::disengage( const TQString &hostName )
{
SensorAgent *agent;
if ( ( agent = mAgents.find( hostName ) ) != 0 ) {
@@ -262,14 +262,14 @@ bool SensorManager::disengage( const QString &hostName )
return false;
}
-bool SensorManager::resynchronize( const QString &hostName )
+bool SensorManager::resynchronize( const TQString &hostName )
{
SensorAgent *agent;
if ( ( agent = mAgents.find( hostName ) ) == 0 )
return false;
- QString shell, command;
+ TQString shell, command;
int port;
hostInfo( hostName, shell, command, port );
@@ -285,26 +285,26 @@ void SensorManager::hostLost( const SensorAgent *agent )
emit hostConnectionLost( agent->hostName() );
if ( mBroadcaster ) {
- QCustomEvent *event = new QCustomEvent( QEvent::User );
- event->setData( new QString( i18n( "Connection to %1 has been lost." )
+ TQCustomEvent *event = new TQCustomEvent( TQEvent::User );
+ event->setData( new TQString( i18n( "Connection to %1 has been lost." )
.arg( agent->hostName() ) ) );
kapp->postEvent( mBroadcaster, event );
}
}
-void SensorManager::notify( const QString &msg ) const
+void SensorManager::notify( const TQString &msg ) const
{
/* This function relays text messages to the toplevel widget that
* displays the message in a pop-up box. It must be used for objects
* that might have been deleted before the pop-up box is closed. */
if ( mBroadcaster ) {
- QCustomEvent *event = new QCustomEvent( QEvent::User );
- event->setData( new QString( msg ) );
+ TQCustomEvent *event = new TQCustomEvent( TQEvent::User );
+ event->setData( new TQString( msg ) );
kapp->postEvent( mBroadcaster, event );
}
}
-void SensorManager::setBroadcaster( QWidget *wdg )
+void SensorManager::setBroadcaster( TQWidget *wdg )
{
mBroadcaster = wdg;
}
@@ -314,17 +314,17 @@ void SensorManager::reconfigure( const SensorAgent* )
emit update();
}
-bool SensorManager::event( QEvent *event )
+bool SensorManager::event( TQEvent *event )
{
- if ( event->type() == QEvent::User ) {
- disengage( (const SensorAgent*)((QCustomEvent*)event)->data() );
+ if ( event->type() == TQEvent::User ) {
+ disengage( (const SensorAgent*)((TQCustomEvent*)event)->data() );
return true;
}
return false;
}
-bool SensorManager::sendRequest( const QString &hostName, const QString &req,
+bool SensorManager::sendRequest( const TQString &hostName, const TQString &req,
SensorClient *client, int id )
{
SensorAgent *agent = mAgents.find( hostName );
@@ -341,9 +341,9 @@ bool SensorManager::sendRequest( const QString &hostName, const QString &req,
return false;
}
-const QString SensorManager::hostName( const SensorAgent *agent) const
+const TQString SensorManager::hostName( const SensorAgent *agent) const
{
- QDictIterator<SensorAgent> it( mAgents );
+ TQDictIterator<SensorAgent> it( mAgents );
while ( it.current() ) {
if ( it.current() == agent )
@@ -351,11 +351,11 @@ const QString SensorManager::hostName( const SensorAgent *agent) const
++it;
}
- return QString::null;
+ return TQString::null;
}
-bool SensorManager::hostInfo( const QString &hostName, QString &shell,
- QString &command, int &port )
+bool SensorManager::hostInfo( const TQString &hostName, TQString &shell,
+ TQString &command, int &port )
{
SensorAgent *agent;
if ( ( agent = mAgents.find( hostName ) ) != 0 ) {
@@ -366,7 +366,7 @@ bool SensorManager::hostInfo( const QString &hostName, QString &shell,
return false;
}
-const QString &SensorManager::translateUnit( const QString &unit ) const
+const TQString &SensorManager::translateUnit( const TQString &unit ) const
{
if ( !unit.isEmpty() && mUnits[ unit ] )
return *mUnits[ unit ];
@@ -374,7 +374,7 @@ const QString &SensorManager::translateUnit( const QString &unit ) const
return unit;
}
-const QString &SensorManager::translateSensorPath( const QString &path ) const
+const TQString &SensorManager::translateSensorPath( const TQString &path ) const
{
if ( !path.isEmpty() && mDict[ path ] )
return *mDict[ path ];
@@ -382,7 +382,7 @@ const QString &SensorManager::translateSensorPath( const QString &path ) const
return path;
}
-const QString &SensorManager::translateSensorType( const QString &type ) const
+const TQString &SensorManager::translateSensorType( const TQString &type ) const
{
if ( !type.isEmpty() && mTypes[ type ] )
return *mTypes[ type ];
@@ -390,9 +390,9 @@ const QString &SensorManager::translateSensorType( const QString &type ) const
return type;
}
-QString SensorManager::translateSensor( const QString &sensor ) const
+TQString SensorManager::translateSensor( const TQString &sensor ) const
{
- QString token, out;
+ TQString token, out;
int start = 0, end = 0;
for ( ; ; ) {
end = sensor.find( '/', start );
@@ -423,7 +423,7 @@ SensorManager::saveProperties( KConfig *cfg )
void SensorManager::disconnectClient( SensorClient *client )
{
- QDictIterator<SensorAgent> it( mAgents );
+ TQDictIterator<SensorAgent> it( mAgents );
for ( ; it.current(); ++it)
it.current()->disconnectClient( client );
diff --git a/ksysguard/gui/ksgrd/SensorManager.h b/ksysguard/gui/ksgrd/SensorManager.h
index 8eb778009..7f4e85da7 100644
--- a/ksysguard/gui/ksgrd/SensorManager.h
+++ b/ksysguard/gui/ksgrd/SensorManager.h
@@ -23,8 +23,8 @@
#include <kconfig.h>
-#include <qdict.h>
-#include <qobject.h>
+#include <tqdict.h>
+#include <tqobject.h>
#include <SensorAgent.h>
@@ -53,32 +53,32 @@ class KDE_EXPORT SensorManager : public QObject
SensorManager();
~SensorManager();
- bool engageHost( const QString &hostName );
- bool engage( const QString &hostName, const QString &shell = "ssh",
- const QString &command = "", int port = -1 );
+ bool engageHost( const TQString &hostName );
+ bool engage( const TQString &hostName, const TQString &shell = "ssh",
+ const TQString &command = "", int port = -1 );
void requestDisengage( const SensorAgent *agent );
bool disengage( const SensorAgent *agent );
- bool disengage( const QString &hostName );
- bool resynchronize( const QString &hostName );
+ bool disengage( const TQString &hostName );
+ bool resynchronize( const TQString &hostName );
void hostLost( const SensorAgent *agent );
- void notify( const QString &msg ) const;
+ void notify( const TQString &msg ) const;
- void setBroadcaster( QWidget *wdg );
+ void setBroadcaster( TQWidget *wdg );
- virtual bool event( QEvent *event );
+ virtual bool event( TQEvent *event );
- bool sendRequest( const QString &hostName, const QString &request,
+ bool sendRequest( const TQString &hostName, const TQString &request,
SensorClient *client, int id = 0 );
- const QString hostName( const SensorAgent *sensor ) const;
- bool hostInfo( const QString &host, QString &shell,
- QString &command, int &port );
+ const TQString hostName( const SensorAgent *sensor ) const;
+ bool hostInfo( const TQString &host, TQString &shell,
+ TQString &command, int &port );
- const QString& translateUnit( const QString &unit ) const;
- const QString& translateSensorPath( const QString &path ) const;
- const QString& translateSensorType( const QString &type ) const;
- QString translateSensor(const QString& u) const;
+ const TQString& translateUnit( const TQString &unit ) const;
+ const TQString& translateSensorPath( const TQString &path ) const;
+ const TQString& translateSensorType( const TQString &type ) const;
+ TQString translateSensor(const TQString& u) const;
void readProperties( KConfig *cfg );
void saveProperties( KConfig *cfg );
@@ -90,33 +90,33 @@ class KDE_EXPORT SensorManager : public QObject
signals:
void update();
- void hostConnectionLost( const QString &hostName );
+ void hostConnectionLost( const TQString &hostName );
protected:
- QDict<SensorAgent> mAgents;
+ TQDict<SensorAgent> mAgents;
private:
/**
These dictionary stores the localized versions of the sensor
descriptions and units.
*/
- QDict<QString> mDescriptions;
- QDict<QString> mUnits;
- QDict<QString> mDict;
- QDict<QString> mTypes;
+ TQDict<TQString> mDescriptions;
+ TQDict<TQString> mUnits;
+ TQDict<TQString> mDict;
+ TQDict<TQString> mTypes;
- QWidget* mBroadcaster;
+ TQWidget* mBroadcaster;
HostConnector* mHostConnector;
};
KDE_EXPORT extern SensorManager* SensorMgr;
-class KDE_EXPORT SensorManagerIterator : public QDictIterator<SensorAgent>
+class KDE_EXPORT SensorManagerIterator : public TQDictIterator<SensorAgent>
{
public:
SensorManagerIterator( const SensorManager *sm )
- : QDictIterator<SensorAgent>( sm->mAgents ) { }
+ : TQDictIterator<SensorAgent>( sm->mAgents ) { }
~SensorManagerIterator() { }
};
diff --git a/ksysguard/gui/ksgrd/SensorShellAgent.cc b/ksysguard/gui/ksgrd/SensorShellAgent.cc
index 0f06e88fe..8081aa49d 100644
--- a/ksysguard/gui/ksgrd/SensorShellAgent.cc
+++ b/ksysguard/gui/ksgrd/SensorShellAgent.cc
@@ -45,8 +45,8 @@ SensorShellAgent::~SensorShellAgent()
}
}
-bool SensorShellAgent::start( const QString &host, const QString &shell,
- const QString &command, int )
+bool SensorShellAgent::start( const TQString &host, const TQString &shell,
+ const TQString &command, int )
{
mRetryCount = 3;
mDaemon = new KProcess;
@@ -55,16 +55,16 @@ bool SensorShellAgent::start( const QString &host, const QString &shell,
mShell = shell;
mCommand = command;
- connect( mDaemon, SIGNAL( processExited( KProcess* ) ),
- SLOT( daemonExited( KProcess* ) ) );
- connect( mDaemon, SIGNAL( receivedStdout( KProcess*, char*, int ) ),
- SLOT( msgRcvd( KProcess*, char*, int ) ) );
- connect( mDaemon, SIGNAL( receivedStderr( KProcess*, char*, int ) ),
- SLOT( errMsgRcvd( KProcess*, char*, int ) ) );
- connect( mDaemon, SIGNAL( wroteStdin( KProcess* ) ),
- SLOT( msgSent( KProcess* ) ) );
+ connect( mDaemon, TQT_SIGNAL( processExited( KProcess* ) ),
+ TQT_SLOT( daemonExited( KProcess* ) ) );
+ connect( mDaemon, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ),
+ TQT_SLOT( msgRcvd( KProcess*, char*, int ) ) );
+ connect( mDaemon, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
+ TQT_SLOT( errMsgRcvd( KProcess*, char*, int ) ) );
+ connect( mDaemon, TQT_SIGNAL( wroteStdin( KProcess* ) ),
+ TQT_SLOT( msgSent( KProcess* ) ) );
- QString cmd;
+ TQString cmd;
if ( !command.isEmpty() )
cmd = command;
else
@@ -80,7 +80,7 @@ bool SensorShellAgent::start( const QString &host, const QString &shell,
return true;
}
-void SensorShellAgent::hostInfo( QString &shell, QString &command,
+void SensorShellAgent::hostInfo( TQString &shell, TQString &command,
int &port) const
{
shell = mShell;
@@ -101,7 +101,7 @@ void SensorShellAgent::msgRcvd( KProcess*, char *buffer, int buflen )
if ( !buffer || buflen == 0 )
return;
mRetryCount = 3; //we recieved an answer, so reset our retry count back to 3
- QString aux = QString::fromLocal8Bit( buffer, buflen );
+ TQString aux = TQString::fromLocal8Bit( buffer, buflen );
processAnswer( aux );
}
@@ -111,7 +111,7 @@ void SensorShellAgent::errMsgRcvd( KProcess*, char *buffer, int buflen )
if ( !buffer || buflen == 0 )
return;
- QString buf = QString::fromLocal8Bit( buffer, buflen );
+ TQString buf = TQString::fromLocal8Bit( buffer, buflen );
kdDebug(1215) << "SensorShellAgent: Warning, received text over stderr!"
<< endl << buf << endl;
diff --git a/ksysguard/gui/ksgrd/SensorShellAgent.h b/ksysguard/gui/ksgrd/SensorShellAgent.h
index e13413d55..7b588c7e1 100644
--- a/ksysguard/gui/ksgrd/SensorShellAgent.h
+++ b/ksysguard/gui/ksgrd/SensorShellAgent.h
@@ -21,9 +21,9 @@
#ifndef KSG_SENSORSHELLAGENT_H
#define KSG_SENSORSHELLAGENT_H
-#include <qobject.h>
-#include <qptrlist.h>
-#include <qguardedptr.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
+#include <tqguardedptr.h>
#include <SensorAgent.h>
@@ -51,10 +51,10 @@ class SensorShellAgent : public SensorAgent
SensorShellAgent( SensorManager *sm );
~SensorShellAgent();
- bool start( const QString &host, const QString &shell,
- const QString &command = "", int port = -1 );
+ bool start( const TQString &host, const TQString &shell,
+ const TQString &command = "", int port = -1 );
- void hostInfo( QString &shell, QString &command, int &port) const;
+ void hostInfo( TQString &shell, TQString &command, int &port) const;
private slots:
void msgSent( KProcess* );
@@ -66,9 +66,9 @@ class SensorShellAgent : public SensorAgent
bool writeMsg( const char *msg, int len );
bool txReady();
- QGuardedPtr<KProcess> mDaemon;
- QString mShell;
- QString mCommand;
+ TQGuardedPtr<KProcess> mDaemon;
+ TQString mShell;
+ TQString mCommand;
int mRetryCount;
};
diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.cc b/ksysguard/gui/ksgrd/SensorSocketAgent.cc
index dcb5b7f3b..0fee27c95 100644
--- a/ksysguard/gui/ksgrd/SensorSocketAgent.cc
+++ b/ksysguard/gui/ksgrd/SensorSocketAgent.cc
@@ -34,10 +34,10 @@ using namespace KSGRD;
SensorSocketAgent::SensorSocketAgent( SensorManager *sm )
: SensorAgent( sm )
{
- connect( &mSocket, SIGNAL( gotError( int ) ), SLOT( error( int ) ) );
- connect( &mSocket, SIGNAL( bytesWritten( int ) ), SLOT( msgSent( int ) ) );
- connect( &mSocket, SIGNAL( readyRead() ), SLOT( msgRcvd() ) );
- connect( &mSocket, SIGNAL( closed() ), SLOT( connectionClosed() ) );
+ connect( &mSocket, TQT_SIGNAL( gotError( int ) ), TQT_SLOT( error( int ) ) );
+ connect( &mSocket, TQT_SIGNAL( bytesWritten( int ) ), TQT_SLOT( msgSent( int ) ) );
+ connect( &mSocket, TQT_SIGNAL( readyRead() ), TQT_SLOT( msgRcvd() ) );
+ connect( &mSocket, TQT_SIGNAL( closed() ), TQT_SLOT( connectionClosed() ) );
}
SensorSocketAgent::~SensorSocketAgent()
@@ -46,8 +46,8 @@ SensorSocketAgent::~SensorSocketAgent()
mSocket.flush();
}
-bool SensorSocketAgent::start( const QString &host, const QString&,
- const QString&, int port )
+bool SensorSocketAgent::start( const TQString &host, const TQString&,
+ const TQString&, int port )
{
if ( port <= 0 )
kdDebug(1215) << "SensorSocketAgent::start: Illegal port " << port << endl;
@@ -55,15 +55,15 @@ bool SensorSocketAgent::start( const QString &host, const QString&,
setHostName( host );
mPort = port;
- mSocket.connect( hostName(), QString::number(mPort) );
+ mSocket.connect( hostName(), TQString::number(mPort) );
return true;
}
-void SensorSocketAgent::hostInfo( QString &shell, QString &command, int &port ) const
+void SensorSocketAgent::hostInfo( TQString &shell, TQString &command, int &port ) const
{
- shell = QString::null;
- command = QString::null;
+ shell = TQString::null;
+ command = TQString::null;
port = mPort;
}
@@ -84,7 +84,7 @@ void SensorSocketAgent::msgRcvd()
char* buffer = new char[ buflen ];
mSocket.readBlock( buffer, buflen );
- QString buf = QString::fromLocal8Bit( buffer, buflen );
+ TQString buf = TQString::fromLocal8Bit( buffer, buflen );
delete [] buffer;
processAnswer( buf );
diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.h b/ksysguard/gui/ksgrd/SensorSocketAgent.h
index b422d3a9b..183b6d122 100644
--- a/ksysguard/gui/ksgrd/SensorSocketAgent.h
+++ b/ksysguard/gui/ksgrd/SensorSocketAgent.h
@@ -21,7 +21,7 @@
#ifndef KSG_SENSORSOCKETAGENT_H
#define KSG_SENSORSOCKETAGENT_H
-#include <qptrlist.h>
+#include <tqptrlist.h>
#include <kbufferedsocket.h>
#include <SensorAgent.h>
@@ -47,10 +47,10 @@ class SensorSocketAgent : public SensorAgent
SensorSocketAgent( SensorManager *sm );
~SensorSocketAgent();
- bool start( const QString &host, const QString &shell,
- const QString &command = "", int port = -1 );
+ bool start( const TQString &host, const TQString &shell,
+ const TQString &command = "", int port = -1 );
- void hostInfo( QString &shell, QString &command, int &port ) const;
+ void hostInfo( TQString &shell, TQString &command, int &port ) const;
private slots:
void connectionClosed();
diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cc
index ccea0a7c2..d05af4ec8 100644
--- a/ksysguard/gui/ksgrd/StyleEngine.cc
+++ b/ksysguard/gui/ksgrd/StyleEngine.cc
@@ -21,9 +21,9 @@
*/
-#include <qimage.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
+#include <tqimage.h>
+#include <tqpushbutton.h>
+#include <tqspinbox.h>
#include <kconfig.h>
#include <klocale.h>
@@ -38,20 +38,20 @@ StyleEngine* KSGRD::Style;
StyleEngine::StyleEngine()
{
- mFirstForegroundColor = QColor( 0x6894c9 ); // light blue
- mSecondForegroundColor = QColor( 0x6894c9 ); // light blue
- mAlarmColor = QColor( 255, 0, 0 );
- mBackgroundColor = QColor( 0x313031 ); // almost black
+ mFirstForegroundColor = TQColor( 0x6894c9 ); // light blue
+ mSecondForegroundColor = TQColor( 0x6894c9 ); // light blue
+ mAlarmColor = TQColor( 255, 0, 0 );
+ mBackgroundColor = TQColor( 0x313031 ); // almost black
mFontSize = 9;
- mSensorColors.append( QColor( 0x1889ff ) ); // soft blue
- mSensorColors.append( QColor( 0xff7f08 ) ); // reddish
- mSensorColors.append( QColor( 0xffeb14 ) ); // bright yellow
+ mSensorColors.append( TQColor( 0x1889ff ) ); // soft blue
+ mSensorColors.append( TQColor( 0xff7f08 ) ); // reddish
+ mSensorColors.append( TQColor( 0xffeb14 ) ); // bright yellow
uint v = 0x00ff00;
for ( uint i = mSensorColors.count(); i < 32; ++i ) {
v = ( ( ( v + 82 ) & 0xff ) << 23 ) | ( v >> 8 );
- mSensorColors.append( QColor( v & 0xff, ( v >> 16 ) & 0xff, ( v >> 8 ) & 0xff ) );
+ mSensorColors.append( TQColor( v & 0xff, ( v >> 16 ) & 0xff, ( v >> 8 ) & 0xff ) );
}
}
@@ -67,12 +67,12 @@ void StyleEngine::readProperties( KConfig *cfg )
mBackgroundColor = cfg->readColorEntry( "backgroundColor", &mBackgroundColor );
mFontSize = cfg->readNumEntry( "fontSize", mFontSize );
- QStringList list = cfg->readListEntry( "sensorColors" );
+ TQStringList list = cfg->readListEntry( "sensorColors" );
if ( !list.isEmpty() ) {
mSensorColors.clear();
- QStringList::Iterator it;
+ TQStringList::Iterator it;
for ( it = list.begin(); it != list.end(); ++it )
- mSensorColors.append( QColor( *it ) );
+ mSensorColors.append( TQColor( *it ) );
}
}
@@ -84,30 +84,30 @@ void StyleEngine::saveProperties( KConfig *cfg )
cfg->writeEntry( "backgroundColor", mBackgroundColor );
cfg->writeEntry( "fontSize", mFontSize );
- QStringList list;
- QValueList<QColor>::Iterator it;
+ TQStringList list;
+ TQValueList<TQColor>::Iterator it;
for ( it = mSensorColors.begin(); it != mSensorColors.end(); ++it )
list.append( (*it).name() );
cfg->writeEntry( "sensorColors", list );
}
-const QColor &StyleEngine::firstForegroundColor() const
+const TQColor &StyleEngine::firstForegroundColor() const
{
return mFirstForegroundColor;
}
-const QColor &StyleEngine::secondForegroundColor() const
+const TQColor &StyleEngine::secondForegroundColor() const
{
return mSecondForegroundColor;
}
-const QColor &StyleEngine::alarmColor() const
+const TQColor &StyleEngine::alarmColor() const
{
return mAlarmColor;
}
-const QColor &StyleEngine::backgroundColor() const
+const TQColor &StyleEngine::backgroundColor() const
{
return mBackgroundColor;
}
@@ -117,9 +117,9 @@ uint StyleEngine::fontSize() const
return mFontSize;
}
-const QColor& StyleEngine::sensorColor( uint pos )
+const TQColor& StyleEngine::sensorColor( uint pos )
{
- static QColor dummy;
+ static TQColor dummy;
if ( pos < mSensorColors.count() )
return *mSensorColors.at( pos );
@@ -143,8 +143,8 @@ void StyleEngine::configure()
mSettingsDialog->setFontSize( mFontSize );
mSettingsDialog->setSensorColors( mSensorColors );
- connect( mSettingsDialog, SIGNAL( applyClicked() ),
- this, SLOT( applyToWorksheet() ) );
+ connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ),
+ this, TQT_SLOT( applyToWorksheet() ) );
if ( mSettingsDialog->exec() )
apply();
diff --git a/ksysguard/gui/ksgrd/StyleEngine.h b/ksysguard/gui/ksgrd/StyleEngine.h
index d896a2422..8056bd52f 100644
--- a/ksysguard/gui/ksgrd/StyleEngine.h
+++ b/ksysguard/gui/ksgrd/StyleEngine.h
@@ -24,9 +24,9 @@
#ifndef KSG_STYLEENGINE_H
#define KSG_STYLEENGINE_H
-#include <qcolor.h>
-#include <qobject.h>
-#include <qptrlist.h>
+#include <tqcolor.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
#include <kdemacros.h>
@@ -49,14 +49,14 @@ class KDE_EXPORT StyleEngine : public QObject
void readProperties( KConfig* );
void saveProperties( KConfig* );
- const QColor& firstForegroundColor() const;
- const QColor& secondForegroundColor() const;
- const QColor& alarmColor() const;
- const QColor& backgroundColor() const;
+ const TQColor& firstForegroundColor() const;
+ const TQColor& secondForegroundColor() const;
+ const TQColor& alarmColor() const;
+ const TQColor& backgroundColor() const;
uint fontSize() const;
- const QColor& sensorColor( uint pos );
+ const TQColor& sensorColor( uint pos );
uint numSensorColors() const;
public slots:
@@ -69,12 +69,12 @@ class KDE_EXPORT StyleEngine : public QObject
private:
void apply();
- QColor mFirstForegroundColor;
- QColor mSecondForegroundColor;
- QColor mAlarmColor;
- QColor mBackgroundColor;
+ TQColor mFirstForegroundColor;
+ TQColor mSecondForegroundColor;
+ TQColor mAlarmColor;
+ TQColor mBackgroundColor;
uint mFontSize;
- QValueList<QColor> mSensorColors;
+ TQValueList<TQColor> mSensorColors;
StyleSettings *mSettingsDialog;
};
diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cc
index 19a924cbe..6c7faf771 100644
--- a/ksysguard/gui/ksgrd/StyleSettings.cc
+++ b/ksysguard/gui/ksgrd/StyleSettings.cc
@@ -21,14 +21,14 @@
*/
-#include <qimage.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlistbox.h>
-#include <qpixmap.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qtabwidget.h>
+#include <tqimage.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlistbox.h>
+#include <tqpixmap.h>
+#include <tqpushbutton.h>
+#include <tqspinbox.h>
+#include <tqtabwidget.h>
#include <kaccelmanager.h>
#include <kcolorbutton.h>
@@ -37,45 +37,45 @@
#include "StyleSettings.h"
-StyleSettings::StyleSettings( QWidget *parent, const char *name )
+StyleSettings::StyleSettings( TQWidget *parent, const char *name )
: KDialogBase( Tabbed, i18n( "Global Style Settings" ), Help | Ok | Apply |
Cancel, Ok, parent, name, true, true )
{
- QFrame *page = addPage( i18n( "Display Style" ) );
- QGridLayout *layout = new QGridLayout( page, 6, 2, 0, spacingHint() );
+ TQFrame *page = addPage( i18n( "Display Style" ) );
+ TQGridLayout *layout = new TQGridLayout( page, 6, 2, 0, spacingHint() );
- QLabel *label = new QLabel( i18n( "First foreground color:" ), page );
+ TQLabel *label = new TQLabel( i18n( "First foreground color:" ), page );
layout->addWidget( label, 0, 0 );
mFirstForegroundColor = new KColorButton( page );
layout->addWidget( mFirstForegroundColor, 0, 1 );
label->setBuddy( mFirstForegroundColor );
- label = new QLabel( i18n( "Second foreground color:" ), page );
+ label = new TQLabel( i18n( "Second foreground color:" ), page );
layout->addWidget( label, 1, 0 );
mSecondForegroundColor = new KColorButton( page );
layout->addWidget( mSecondForegroundColor, 1, 1 );
label->setBuddy( mSecondForegroundColor );
- label = new QLabel( i18n( "Alarm color:" ), page );
+ label = new TQLabel( i18n( "Alarm color:" ), page );
layout->addWidget( label, 2, 0 );
mAlarmColor = new KColorButton( page );
layout->addWidget( mAlarmColor, 2, 1 );
label->setBuddy( mAlarmColor );
- label = new QLabel( i18n( "Background color:" ), page );
+ label = new TQLabel( i18n( "Background color:" ), page );
layout->addWidget( label, 3, 0 );
mBackgroundColor = new KColorButton( page );
layout->addWidget( mBackgroundColor, 3, 1 );
label->setBuddy( mBackgroundColor );
- label = new QLabel( i18n( "Font size:" ), page );
+ label = new TQLabel( i18n( "Font size:" ), page );
layout->addWidget( label, 4, 0 );
- mFontSize = new QSpinBox( 7, 48, 1, page );
+ mFontSize = new TQSpinBox( 7, 48, 1, page );
mFontSize->setValue( 8 );
layout->addWidget( mFontSize, 4, 1 );
label->setBuddy( mFontSize );
@@ -83,21 +83,21 @@ StyleSettings::StyleSettings( QWidget *parent, const char *name )
layout->setRowStretch( 5, 1 );
page = addPage( i18n( "Sensor Colors" ) );
- layout = new QGridLayout( page, 1, 2, 0, spacingHint() );
+ layout = new TQGridLayout( page, 1, 2, 0, spacingHint() );
- mColorListBox = new QListBox( page );
+ mColorListBox = new TQListBox( page );
layout->addWidget( mColorListBox, 0, 0 );
- mEditColorButton = new QPushButton( i18n( "Change Color..." ), page );
+ mEditColorButton = new TQPushButton( i18n( "Change Color..." ), page );
mEditColorButton->setEnabled( false );
layout->addWidget( mEditColorButton, 0, 1, Qt::AlignTop );
- connect( mColorListBox, SIGNAL( selectionChanged( QListBoxItem* ) ),
- SLOT( selectionChanged( QListBoxItem* ) ) );
- connect( mColorListBox, SIGNAL( doubleClicked( QListBoxItem* ) ),
- SLOT( editSensorColor() ) );
- connect( mEditColorButton, SIGNAL( clicked() ),
- SLOT( editSensorColor() ) );
+ connect( mColorListBox, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ),
+ TQT_SLOT( selectionChanged( TQListBoxItem* ) ) );
+ connect( mColorListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ),
+ TQT_SLOT( editSensorColor() ) );
+ connect( mEditColorButton, TQT_SIGNAL( clicked() ),
+ TQT_SLOT( editSensorColor() ) );
KAcceleratorManager::manage( this );
}
@@ -106,42 +106,42 @@ StyleSettings::~StyleSettings()
{
}
-void StyleSettings::setFirstForegroundColor( const QColor &color )
+void StyleSettings::setFirstForegroundColor( const TQColor &color )
{
mFirstForegroundColor->setColor( color );
}
-QColor StyleSettings::firstForegroundColor() const
+TQColor StyleSettings::firstForegroundColor() const
{
return mFirstForegroundColor->color();
}
-void StyleSettings::setSecondForegroundColor( const QColor &color )
+void StyleSettings::setSecondForegroundColor( const TQColor &color )
{
mSecondForegroundColor->setColor( color );
}
-QColor StyleSettings::secondForegroundColor() const
+TQColor StyleSettings::secondForegroundColor() const
{
return mSecondForegroundColor->color();
}
-void StyleSettings::setAlarmColor( const QColor &color )
+void StyleSettings::setAlarmColor( const TQColor &color )
{
mAlarmColor->setColor( color );
}
-QColor StyleSettings::alarmColor() const
+TQColor StyleSettings::alarmColor() const
{
return mAlarmColor->color();
}
-void StyleSettings::setBackgroundColor( const QColor &color )
+void StyleSettings::setBackgroundColor( const TQColor &color )
{
mBackgroundColor->setColor( color );
}
-QColor StyleSettings::backgroundColor() const
+TQColor StyleSettings::backgroundColor() const
{
return mBackgroundColor->color();
}
@@ -156,23 +156,23 @@ uint StyleSettings::fontSize() const
return mFontSize->value();
}
-void StyleSettings::setSensorColors( const QValueList<QColor> &list )
+void StyleSettings::setSensorColors( const TQValueList<TQColor> &list )
{
mColorListBox->clear();
for ( uint i = 0; i < list.count(); ++i ) {
- QPixmap pm( 12, 12 );
+ TQPixmap pm( 12, 12 );
pm.fill( *list.at( i ) );
mColorListBox->insertItem( pm, i18n( "Color %1" ).arg( i ) );
}
}
-QValueList<QColor> StyleSettings::sensorColors()
+TQValueList<TQColor> StyleSettings::sensorColors()
{
- QValueList<QColor> list;
+ TQValueList<TQColor> list;
for ( uint i = 0; i < mColorListBox->count(); ++i )
- list.append( QColor( mColorListBox->pixmap( i )->convertToImage().pixel( 1, 1 ) ) );
+ list.append( TQColor( mColorListBox->pixmap( i )->convertToImage().pixel( 1, 1 ) ) );
return list;
}
@@ -184,16 +184,16 @@ void StyleSettings::editSensorColor()
if ( pos < 0 )
return;
- QColor color = mColorListBox->pixmap( pos )->convertToImage().pixel( 1, 1 );
+ TQColor color = mColorListBox->pixmap( pos )->convertToImage().pixel( 1, 1 );
if ( KColorDialog::getColor( color ) == KColorDialog::Accepted ) {
- QPixmap pm( 12, 12 );
+ TQPixmap pm( 12, 12 );
pm.fill( color );
mColorListBox->changeItem( pm, mColorListBox->text( pos ), pos );
}
}
-void StyleSettings::selectionChanged( QListBoxItem *item )
+void StyleSettings::selectionChanged( TQListBoxItem *item )
{
mEditColorButton->setEnabled( item != 0 );
}
diff --git a/ksysguard/gui/ksgrd/StyleSettings.h b/ksysguard/gui/ksgrd/StyleSettings.h
index d16b5e723..0f662f20f 100644
--- a/ksysguard/gui/ksgrd/StyleSettings.h
+++ b/ksysguard/gui/ksgrd/StyleSettings.h
@@ -26,7 +26,7 @@
#include <kdialogbase.h>
-#include <qcolor.h>
+#include <tqcolor.h>
class KColorButton;
@@ -38,30 +38,30 @@ class StyleSettings : public KDialogBase
Q_OBJECT
public:
- StyleSettings( QWidget *parent = 0, const char *name = 0 );
+ StyleSettings( TQWidget *parent = 0, const char *name = 0 );
~StyleSettings();
- void setFirstForegroundColor( const QColor &color );
- QColor firstForegroundColor() const;
+ void setFirstForegroundColor( const TQColor &color );
+ TQColor firstForegroundColor() const;
- void setSecondForegroundColor( const QColor &color );
- QColor secondForegroundColor() const;
+ void setSecondForegroundColor( const TQColor &color );
+ TQColor secondForegroundColor() const;
- void setAlarmColor( const QColor &color );
- QColor alarmColor() const;
+ void setAlarmColor( const TQColor &color );
+ TQColor alarmColor() const;
- void setBackgroundColor( const QColor &color );
- QColor backgroundColor() const;
+ void setBackgroundColor( const TQColor &color );
+ TQColor backgroundColor() const;
void setFontSize( uint size );
uint fontSize() const;
- void setSensorColors( const QValueList<QColor> &list );
- QValueList<QColor> sensorColors();
+ void setSensorColors( const TQValueList<TQColor> &list );
+ TQValueList<TQColor> sensorColors();
private slots:
void editSensorColor();
- void selectionChanged( QListBoxItem* );
+ void selectionChanged( TQListBoxItem* );
private:
KColorButton *mFirstForegroundColor;
@@ -69,10 +69,10 @@ class StyleSettings : public KDialogBase
KColorButton *mAlarmColor;
KColorButton *mBackgroundColor;
- QSpinBox *mFontSize;
+ TQSpinBox *mFontSize;
- QListBox *mColorListBox;
- QPushButton *mEditColorButton;
+ TQListBox *mColorListBox;
+ TQPushButton *mEditColorButton;
};
#endif
diff --git a/ksysguard/gui/ksgrd/TimerSettings.cc b/ksysguard/gui/ksgrd/TimerSettings.cc
index 4806f7d8a..5e1d8d8b2 100644
--- a/ksysguard/gui/ksgrd/TimerSettings.cc
+++ b/ksysguard/gui/ksgrd/TimerSettings.cc
@@ -24,37 +24,37 @@
#include <kaccelmanager.h>
#include <klocale.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqspinbox.h>
+#include <tqwhatsthis.h>
#include "TimerSettings.h"
-TimerSettings::TimerSettings( QWidget *parent, const char *name )
+TimerSettings::TimerSettings( TQWidget *parent, const char *name )
: KDialogBase( Plain, i18n( "Timer Settings" ), Ok | Cancel,
Ok, parent, name, true, true )
{
- QFrame *page = plainPage();
+ TQFrame *page = plainPage();
- QGridLayout *layout = new QGridLayout( page, 2, 2, 0, spacingHint() );
+ TQGridLayout *layout = new TQGridLayout( page, 2, 2, 0, spacingHint() );
- mUseGlobalUpdate = new QCheckBox( i18n( "Use update interval of worksheet" ), page );
+ mUseGlobalUpdate = new TQCheckBox( i18n( "Use update interval of worksheet" ), page );
layout->addMultiCellWidget( mUseGlobalUpdate, 0, 0, 0, 1 );
- mLabel = new QLabel( i18n( "Update interval:" ), page );
+ mLabel = new TQLabel( i18n( "Update interval:" ), page );
layout->addWidget( mLabel, 1, 0 );
- mInterval = new QSpinBox( 1, 300, 1, page );
+ mInterval = new TQSpinBox( 1, 300, 1, page );
mInterval->setValue( 2 );
mInterval->setSuffix( i18n( " sec" ) );
layout->addWidget( mInterval, 1, 1 );
mLabel->setBuddy( mInterval );
- QWhatsThis::add( mInterval, i18n( "All displays of the sheet are updated at the rate specified here." ) );
+ TQWhatsThis::add( mInterval, i18n( "All displays of the sheet are updated at the rate specified here." ) );
- connect( mUseGlobalUpdate, SIGNAL( toggled( bool ) ),
- SLOT( globalUpdateChanged( bool ) ) );
+ connect( mUseGlobalUpdate, TQT_SIGNAL( toggled( bool ) ),
+ TQT_SLOT( globalUpdateChanged( bool ) ) );
mUseGlobalUpdate->setChecked( true );
diff --git a/ksysguard/gui/ksgrd/TimerSettings.h b/ksysguard/gui/ksgrd/TimerSettings.h
index daf2eda6f..73c43c8b4 100644
--- a/ksysguard/gui/ksgrd/TimerSettings.h
+++ b/ksysguard/gui/ksgrd/TimerSettings.h
@@ -35,7 +35,7 @@ class KDE_EXPORT TimerSettings : public KDialogBase
Q_OBJECT
public:
- TimerSettings( QWidget *parent, const char *name = 0 );
+ TimerSettings( TQWidget *parent, const char *name = 0 );
~TimerSettings();
void setUseGlobalUpdate( bool value );
@@ -48,9 +48,9 @@ class KDE_EXPORT TimerSettings : public KDialogBase
void globalUpdateChanged( bool );
private:
- QCheckBox* mUseGlobalUpdate;
- QLabel* mLabel;
- QSpinBox* mInterval;
+ TQCheckBox* mUseGlobalUpdate;
+ TQLabel* mLabel;
+ TQSpinBox* mInterval;
};
#endif
diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc
index 4750a380f..2be851232 100644
--- a/ksysguard/gui/ksysguard.cc
+++ b/ksysguard/gui/ksysguard.cc
@@ -75,7 +75,7 @@ TopLevel::TopLevel( const char *name )
mDontSaveSession = false;
mTimerId = -1;
- mSplitter = new QSplitter( this );
+ mSplitter = new TQSplitter( this );
mSplitter->setOrientation( Horizontal );
mSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
setCentralWidget( mSplitter );
@@ -83,16 +83,16 @@ TopLevel::TopLevel( const char *name )
mSensorBrowser = new SensorBrowser( mSplitter, KSGRD::SensorMgr );
mServiceBrowser = new DNSSD::ServiceBrowser("_ksysguard._tcp", 0, true);
- connect(mServiceBrowser,SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this,
- SLOT(serviceAdded(DNSSD::RemoteService::Ptr)));
+ connect(mServiceBrowser,TQT_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this,
+ TQT_SLOT(serviceAdded(DNSSD::RemoteService::Ptr)));
mWorkSpace = new Workspace( mSplitter );
- connect( mWorkSpace, SIGNAL( announceRecentURL( const KURL& ) ),
- SLOT( registerRecentURL( const KURL& ) ) );
- connect( mWorkSpace, SIGNAL( setCaption( const QString&, bool ) ),
- SLOT( setCaption( const QString&, bool ) ) );
- connect( KSGRD::Style, SIGNAL( applyStyleToWorksheet() ), mWorkSpace,
- SLOT( applyStyle() ) );
+ connect( mWorkSpace, TQT_SIGNAL( announceRecentURL( const KURL& ) ),
+ TQT_SLOT( registerRecentURL( const KURL& ) ) );
+ connect( mWorkSpace, TQT_SIGNAL( setCaption( const TQString&, bool ) ),
+ TQT_SLOT( setCaption( const TQString&, bool ) ) );
+ connect( KSGRD::Style, TQT_SIGNAL( applyStyleToWorksheet() ), mWorkSpace,
+ TQT_SLOT( applyStyle() ) );
/* Create the status bar. It displays some information about the
* number of processes and the memory consumption of the local
@@ -106,39 +106,39 @@ TopLevel::TopLevel( const char *name )
// create actions for menue entries
new KAction( i18n( "&New Worksheet..." ), "tab_new", 0, mWorkSpace,
- SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" );
+ TQT_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" );
new KAction( i18n( "Import Worksheet..." ), "fileopen", 0, mWorkSpace,
- SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" );
+ TQT_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" );
mActionOpenRecent = new KRecentFilesAction( i18n( "&Import Recent Worksheet" ),"fileopen", 0,
- mWorkSpace, SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" );
+ mWorkSpace, TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" );
new KAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, mWorkSpace,
- SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" );
+ TQT_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" );
new KAction( i18n( "&Export Worksheet..." ), "filesaveas", 0, mWorkSpace,
- SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" );
+ TQT_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" );
- KStdAction::quit( this, SLOT( close() ), actionCollection() );
+ KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
new KAction( i18n( "C&onnect Host..." ), "connect_established", 0, this,
- SLOT( connectHost() ), actionCollection(), "connect_host" );
+ TQT_SLOT( connectHost() ), actionCollection(), "connect_host" );
new KAction( i18n( "D&isconnect Host" ), "connect_no", 0, this,
- SLOT( disconnectHost() ), actionCollection(), "disconnect_host" );
+ TQT_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" );
-// KStdAction::cut( mWorkSpace, SLOT( cut() ), actionCollection() );
-// KStdAction::copy( mWorkSpace, SLOT( copy() ), actionCollection() );
-// KStdAction::paste( mWorkSpace, SLOT( paste() ), actionCollection() );
+// KStdAction::cut( mWorkSpace, TQT_SLOT( cut() ), actionCollection() );
+// KStdAction::copy( mWorkSpace, TQT_SLOT( copy() ), actionCollection() );
+// KStdAction::paste( mWorkSpace, TQT_SLOT( paste() ), actionCollection() );
new KAction( i18n( "&Worksheet Properties" ), "configure", 0, mWorkSpace,
- SLOT( configure() ), actionCollection(), "configure_sheet" );
+ TQT_SLOT( configure() ), actionCollection(), "configure_sheet" );
new KAction( i18n( "Load Standard Sheets" ), "revert",
- 0, this, SLOT( resetWorkSheets() ),
+ 0, this, TQT_SLOT( resetWorkSheets() ),
actionCollection(), "revert_all_worksheets" );
new KAction( i18n( "Configure &Style..." ), "colorize", 0, this,
- SLOT( editStyle() ), actionCollection(), "configure_style" );
+ TQT_SLOT( editStyle() ), actionCollection(), "configure_style" );
// TODO remove resize and fix so sizeHints() determines default size.
if (!initialGeometrySet())
@@ -165,10 +165,10 @@ void TopLevel::resetWorkSheets()
KStandardDirs* kstd = KGlobal::dirs();
kstd->addResourceType( "data", "share/apps/ksysguard" );
- QString workDir = kstd->saveLocation( "data", "ksysguard" );
+ TQString workDir = kstd->saveLocation( "data", "ksysguard" );
- QString file = kstd->findResource( "data", "SystemLoad.sgrd" );
- QString newFile = workDir + "/" + i18n( "System Load" ) + ".sgrd";
+ TQString file = kstd->findResource( "data", "SystemLoad.sgrd" );
+ TQString newFile = workDir + "/" + i18n( "System Load" ) + ".sgrd";
if ( !file.isEmpty() )
mWorkSpace->restoreWorkSheet( file, newFile );
@@ -190,30 +190,30 @@ void TopLevel::showOnCurrentDesktop()
KWin::forceActiveWindow( winId() );
}
-void TopLevel::loadWorkSheet( const QString &fileName )
+void TopLevel::loadWorkSheet( const TQString &fileName )
{
mWorkSpace->loadWorkSheet( KURL( fileName ) );
}
-void TopLevel::removeWorkSheet( const QString &fileName )
+void TopLevel::removeWorkSheet( const TQString &fileName )
{
mWorkSpace->deleteWorkSheet( fileName );
}
-QStringList TopLevel::listSensors( const QString &hostName )
+TQStringList TopLevel::listSensors( const TQString &hostName )
{
return mSensorBrowser->listSensors( hostName );
}
-QStringList TopLevel::listHosts()
+TQStringList TopLevel::listHosts()
{
return mSensorBrowser->listHosts();
}
-QString TopLevel::readIntegerSensor( const QString &sensorLocator )
+TQString TopLevel::readIntegerSensor( const TQString &sensorLocator )
{
- QString host = sensorLocator.left( sensorLocator.find( ':' ) );
- QString sensor = sensorLocator.right( sensorLocator.length() -
+ TQString host = sensorLocator.left( sensorLocator.find( ':' ) );
+ TQString sensor = sensorLocator.right( sensorLocator.length() -
sensorLocator.find( ':' ) - 1 );
DCOPClientTransaction *dcopTransaction = kapp->dcopClient()->beginTransaction();
@@ -222,15 +222,15 @@ QString TopLevel::readIntegerSensor( const QString &sensorLocator )
KSGRD::SensorMgr->engage( host, "", "ksysguardd" );
KSGRD::SensorMgr->sendRequest( host, sensor, (KSGRD::SensorClient*)this, 133 );
- return QString::null;
+ return TQString::null;
}
-QStringList TopLevel::readListSensor( const QString& sensorLocator )
+TQStringList TopLevel::readListSensor( const TQString& sensorLocator )
{
- QStringList retval;
+ TQStringList retval;
- QString host = sensorLocator.left( sensorLocator.find( ':' ) );
- QString sensor = sensorLocator.right( sensorLocator.length() -
+ TQString host = sensorLocator.left( sensorLocator.find( ':' ) );
+ TQString sensor = sensorLocator.right( sensorLocator.length() -
sensorLocator.find( ':' ) - 1 );
DCOPClientTransaction *dcopTransaction = kapp->dcopClient()->beginTransaction();
@@ -274,7 +274,7 @@ void TopLevel::showRequestedSheets()
{
toolBar( "mainToolBar" )->hide();
- QValueList<int> sizes;
+ TQValueList<int> sizes;
sizes.append( 0 );
sizes.append( 100 );
mSplitter->setSizes( sizes );
@@ -293,7 +293,7 @@ void TopLevel::initStatusBar()
KToggleAction *sb = dynamic_cast<KToggleAction*>(action("options_show_statusbar"));
if (sb)
- connect(sb, SIGNAL(toggled(bool)), this, SLOT(updateStatusBar()));
+ connect(sb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateStatusBar()));
}
void TopLevel::updateStatusBar()
@@ -319,8 +319,8 @@ void TopLevel::editToolbars()
{
saveMainWindowSettings( kapp->config() );
KEditToolbar dlg( actionCollection() );
- connect( &dlg, SIGNAL( newToolbarConfig() ), this,
- SLOT( slotNewToolbarConfig() ) );
+ connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), this,
+ TQT_SLOT( slotNewToolbarConfig() ) );
dlg.exec();
}
@@ -336,18 +336,18 @@ void TopLevel::editStyle()
KSGRD::Style->configure();
}
-void TopLevel::customEvent( QCustomEvent *e )
+void TopLevel::customEvent( TQCustomEvent *e )
{
- if ( e->type() == QEvent::User ) {
+ if ( e->type() == TQEvent::User ) {
/* Due to the asynchronous communication between ksysguard and its
* back-ends, we sometimes need to show message boxes that were
* triggered by objects that have died already. */
- KMessageBox::error( this, *((QString*)e->data()) );
- delete (QString*)e->data();
+ KMessageBox::error( this, *((TQString*)e->data()) );
+ delete (TQString*)e->data();
}
}
-void TopLevel::timerEvent( QTimerEvent* )
+void TopLevel::timerEvent( TQTimerEvent* )
{
if ( statusBar()->isVisibleTo( this ) ) {
/* Request some info about the memory status. The requested
@@ -385,7 +385,7 @@ void TopLevel::readProperties( KConfig *cfg )
if ( cfg->readBoolEntry( "isMinimized" ) == true )
showMinimized();
- QValueList<int> sizes = cfg->readIntListEntry( "SplitterSizeList" );
+ TQValueList<int> sizes = cfg->readIntListEntry( "SplitterSizeList" );
if ( sizes.isEmpty() ) {
// start with a 30/70 ratio
sizes.append( 30 );
@@ -417,10 +417,10 @@ void TopLevel::saveProperties( KConfig *cfg )
mWorkSpace->saveProperties( cfg );
}
-void TopLevel::answerReceived( int id, const QString &answer )
+void TopLevel::answerReceived( int id, const TQString &answer )
{
- QString s;
- static QString unit;
+ TQString s;
+ static TQString unit;
static long mUsed = 0;
static long mFree = 0;
static long sUsed = 0;
@@ -432,7 +432,7 @@ void TopLevel::answerReceived( int id, const QString &answer )
// singular vs. plural works :/
//
// To use pluralForms, though, you need to convert to
- // an integer, not use the QString straight.
+ // an integer, not use the TQString straight.
s = i18n( "1 Process", "%n Processes", answer.toInt() );
statusBar()->changeItem( s, 0 );
break;
@@ -465,9 +465,9 @@ void TopLevel::answerReceived( int id, const QString &answer )
}
case 133: {
- QCString replyType = "QString";
- QByteArray replyData;
- QDataStream reply( replyData, IO_WriteOnly );
+ TQCString replyType = "TQString";
+ TQByteArray replyData;
+ TQDataStream reply( replyData, IO_WriteOnly );
reply << answer;
DCOPClientTransaction *dcopTransaction = mDCopFIFO.last();
@@ -477,10 +477,10 @@ void TopLevel::answerReceived( int id, const QString &answer )
}
case 134: {
- QStringList resultList;
- QCString replyType = "QStringList";
- QByteArray replyData;
- QDataStream reply( replyData, IO_WriteOnly );
+ TQStringList resultList;
+ TQCString replyType = "TQStringList";
+ TQByteArray replyData;
+ TQDataStream reply( replyData, IO_WriteOnly );
KSGRD::SensorTokenizer lines( answer, '\n' );
@@ -497,9 +497,9 @@ void TopLevel::answerReceived( int id, const QString &answer )
}
}
-void TopLevel::setSwapInfo( long used, long free, const QString &unit )
+void TopLevel::setSwapInfo( long used, long free, const TQString &unit )
{
- QString msg;
+ TQString msg;
if ( used == 0 && free == 0 ) // no swap available
msg = i18n( "No swap space available" );
else {
@@ -602,7 +602,7 @@ int main( int argc, char** argv )
// run the application
result = app->exec();
} else {
- QByteArray data;
+ TQByteArray data;
app->dcopClient()->send( "ksysguard_taskmanager", "KSysGuardIface",
"showOnCurrentDesktop()", data );
}
diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h
index 8d2ef15d9..64dc73ef9 100644
--- a/ksysguard/gui/ksysguard.h
+++ b/ksysguard/gui/ksysguard.h
@@ -24,7 +24,7 @@
#ifndef KSG_KSYSGUARD_H
#define KSG_KSYSGUARD_H
-#include <qevent.h>
+#include <tqevent.h>
#include <dcopclient.h>
#include <dcopobject.h>
@@ -52,7 +52,7 @@ class TopLevel : public KMainWindow, public KSGRD::SensorClient, public DCOPObje
virtual void saveProperties( KConfig* );
virtual void readProperties( KConfig* );
- virtual void answerReceived( int id, const QString& );
+ virtual void answerReceived( int id, const TQString& );
void beATaskManager();
void showRequestedSheets();
@@ -62,20 +62,20 @@ class TopLevel : public KMainWindow, public KSGRD::SensorClient, public DCOPObje
// calling ksysguard with kwin/kicker hot-key
ASYNC showProcesses();
ASYNC showOnCurrentDesktop();
- ASYNC loadWorkSheet( const QString &fileName );
- ASYNC removeWorkSheet( const QString &fileName );
- QStringList listHosts();
- QStringList listSensors( const QString &hostName );
- QString readIntegerSensor( const QString &sensorLocator );
- QStringList readListSensor( const QString &sensorLocator );
+ ASYNC loadWorkSheet( const TQString &fileName );
+ ASYNC removeWorkSheet( const TQString &fileName );
+ TQStringList listHosts();
+ TQStringList listSensors( const TQString &hostName );
+ TQString readIntegerSensor( const TQString &sensorLocator );
+ TQStringList readListSensor( const TQString &sensorLocator );
public slots:
void registerRecentURL( const KURL &url );
void resetWorkSheets();
protected:
- virtual void customEvent( QCustomEvent* );
- virtual void timerEvent( QTimerEvent* );
+ virtual void customEvent( TQCustomEvent* );
+ virtual void timerEvent( TQTimerEvent* );
virtual bool queryClose();
protected slots:
@@ -88,11 +88,11 @@ class TopLevel : public KMainWindow, public KSGRD::SensorClient, public DCOPObje
void serviceAdded(DNSSD::RemoteService::Ptr srv);
private:
- void setSwapInfo( long, long, const QString& );
+ void setSwapInfo( long, long, const TQString& );
- QPtrList<DCOPClientTransaction> mDCopFIFO;
+ TQPtrList<DCOPClientTransaction> mDCopFIFO;
- QSplitter* mSplitter;
+ TQSplitter* mSplitter;
KRecentFilesAction* mActionOpenRecent;
SensorBrowser* mSensorBrowser;
@@ -118,7 +118,7 @@ class DCOPClientTransaction
public:
Q_INT32 id;
CARD32 key;
- QCString senderId;
+ TQCString senderId;
};
#endif
diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp
index 77edf73ea..f912c1221 100644
--- a/ksystraycmd/ksystraycmd.cpp
+++ b/ksystraycmd/ksystraycmd.cpp
@@ -1,7 +1,7 @@
-#include <qtooltip.h>
-#include <qtextstream.h>
-#include <qimage.h>
-#include <qregexp.h>
+#include <tqtooltip.h>
+#include <tqtextstream.h>
+#include <tqimage.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <kapplication.h>
@@ -21,7 +21,7 @@
KSysTrayCmd::KSysTrayCmd()
- : QLabel( 0, "systray_cmd" ),
+ : TQLabel( 0, "systray_cmd" ),
isVisible(true), lazyStart( false ), noquit( false ), quitOnHide( false ), onTop(false), ownIcon(false),
win(0), client(0), kwinmodule(0), top(0), left(0)
{
@@ -114,8 +114,8 @@ void KSysTrayCmd::setTargetWindow( WId w )
void KSysTrayCmd::setTargetWindow( const KWin::WindowInfo &info )
{
- disconnect( kwinmodule, SIGNAL(windowAdded(WId)), this, SLOT(windowAdded(WId)) );
- connect( kwinmodule, SIGNAL(windowChanged(WId)), SLOT(windowChanged(WId)) );
+ disconnect( kwinmodule, TQT_SIGNAL(windowAdded(WId)), this, TQT_SLOT(windowAdded(WId)) );
+ connect( kwinmodule, TQT_SIGNAL(windowChanged(WId)), TQT_SLOT(windowChanged(WId)) );
win = info.win();
KWin::setSystemTrayWindowFor( winId(), win );
refresh();
@@ -141,7 +141,7 @@ void KSysTrayCmd::refresh()
{
KWin::setSystemTrayWindowFor( winId(), win ? win : winId() );
- QToolTip::remove( this );
+ TQToolTip::remove( this );
if ( win ) {
KConfig *appCfg = kapp->config();
KConfigGroupSaver configSaver(appCfg, "System Tray");
@@ -157,15 +157,15 @@ void KSysTrayCmd::refresh()
setPixmap( KWin::icon( win, iconWidth, iconWidth, true ) );
}
- QToolTip::add( this, KWin::windowInfo( win ).name() );
+ TQToolTip::add( this, KWin::windowInfo( win ).name() );
}
else {
if ( !tooltip.isEmpty() )
- QToolTip::add( this, tooltip );
+ TQToolTip::add( this, tooltip );
else if ( !command.isEmpty() )
- QToolTip::add( this, command );
+ TQToolTip::add( this, command );
else
- QToolTip::add( this, window );
+ TQToolTip::add( this, window );
setPixmap( KSystemTray::loadIcon( kapp->iconName() ) );
}
@@ -179,9 +179,9 @@ bool KSysTrayCmd::startClient()
{
client = new KShellProcess();
*client << command;
- connect( kwinmodule, SIGNAL(windowAdded(WId)), SLOT(windowAdded(WId)) );
- connect( client, SIGNAL( processExited(KProcess *) ),
- this, SLOT( clientExited() ) );
+ connect( kwinmodule, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)) );
+ connect( client, TQT_SIGNAL( processExited(KProcess *) ),
+ this, TQT_SLOT( clientExited() ) );
return client->start();
}
@@ -228,7 +228,7 @@ void KSysTrayCmd::quit()
qApp->quit();
}
-void KSysTrayCmd::execContextMenu( const QPoint &pos )
+void KSysTrayCmd::execContextMenu( const TQPoint &pos )
{
KPopupMenu *menu = new KPopupMenu();
menu->insertTitle( *pixmap(), i18n( "KSysTrayCmd" ) );
@@ -264,7 +264,7 @@ void KSysTrayCmd::execContextMenu( const QPoint &pos )
void KSysTrayCmd::checkExistingWindows()
{
- QValueList<WId>::ConstIterator it;
+ TQValueList<WId>::ConstIterator it;
for ( it = kwinmodule->windows().begin(); it != kwinmodule->windows().end(); ++it ) {
windowAdded( *it );
if ( win )
@@ -274,7 +274,7 @@ void KSysTrayCmd::checkExistingWindows()
void KSysTrayCmd::windowAdded(WId w)
{
- if ( !window.isEmpty() && ( QRegExp( window ).search( KWin::windowInfo(w).name() ) == -1 ) )
+ if ( !window.isEmpty() && ( TQRegExp( window ).search( KWin::windowInfo(w).name() ) == -1 ) )
return; // no match
setTargetWindow( w );
}
@@ -290,7 +290,7 @@ void KSysTrayCmd::windowChanged( WId w )
// Tray icon event handlers
//
-void KSysTrayCmd::mousePressEvent( QMouseEvent *e )
+void KSysTrayCmd::mousePressEvent( TQMouseEvent *e )
{
if ( e->button() == RightButton )
execContextMenu( e->globalPos() );
diff --git a/ksystraycmd/ksystraycmd.h b/ksystraycmd/ksystraycmd.h
index ecb670fd5..90e3bc36f 100644
--- a/ksystraycmd/ksystraycmd.h
+++ b/ksystraycmd/ksystraycmd.h
@@ -3,7 +3,7 @@
#ifndef KSYSTRAYCMD_H
#define KSYSTRAYCMD_H
-#include <qlabel.h>
+#include <tqlabel.h>
#include <kwin.h>
class KShellProcess;
@@ -22,17 +22,17 @@ public:
~KSysTrayCmd();
void setWindow( WId w ) { win = w; }
- void setCommand( const QString &cmd ) { command = cmd; }
- void setPattern( const QString &regexp ) { window = regexp; }
+ void setCommand( const TQString &cmd ) { command = cmd; }
+ void setPattern( const TQString &regexp ) { window = regexp; }
void setStartOnShow( bool enable ) { lazyStart = enable; isVisible = !enable; }
void setNoQuit( bool enable ) { noquit = enable; }
void setQuitOnHide( bool enable ) { quitOnHide = enable; }
void setOnTop( bool enable ) { onTop = enable; }
void setOwnIcon( bool enable ) { ownIcon = enable; }
- void setDefaultTip( const QString &tip ) { tooltip = tip; }
+ void setDefaultTip( const TQString &tip ) { tooltip = tip; }
bool hasTargetWindow() const { return (win != 0); }
bool hasRunningClient() const { return (client != 0); }
- const QString &errorMsg() const { return errStr; }
+ const TQString &errorMsg() const { return errStr; }
bool start();
@@ -46,7 +46,7 @@ public slots:
void toggleWindow() { if ( isVisible ) hideWindow(); else showWindow(); }
void setTargetWindow( WId w );
- void execContextMenu( const QPoint &pos );
+ void execContextMenu( const TQPoint &pos );
void quit();
void quitClient();
@@ -62,12 +62,12 @@ protected:
void checkExistingWindows();
void setTargetWindow( const KWin::WindowInfo &info );
- void mousePressEvent( QMouseEvent *e );
+ void mousePressEvent( TQMouseEvent *e );
private:
- QString command;
- QString window;
- QString tooltip;
+ TQString command;
+ TQString window;
+ TQString tooltip;
bool isVisible;
bool lazyStart;
bool noquit;
@@ -78,7 +78,7 @@ private:
WId win;
KShellProcess *client;
KWinModule *kwinmodule;
- QString errStr;
+ TQString errStr;
/** Memorized 'top' position of the window*/
int top;
diff --git a/ksystraycmd/main.cpp b/ksystraycmd/main.cpp
index b10728fd9..ac6b94d74 100644
--- a/ksystraycmd/main.cpp
+++ b/ksystraycmd/main.cpp
@@ -67,7 +67,7 @@ int main( int argc, char *argv[] )
KSysTrayCmd cmd;
// Read the window id
- QString wid = args->getOption( "wid" );
+ TQString wid = args->getOption( "wid" );
if ( !wid.isEmpty() ) {
int base = 10;
if ( wid.startsWith( "0x" ) ) {
@@ -85,7 +85,7 @@ int main( int argc, char *argv[] )
}
// Read window title regexp
- QString title = args->getOption( "window" );
+ TQString title = args->getOption( "window" );
if ( !title.isEmpty() )
cmd.setPattern( title );
@@ -93,14 +93,14 @@ int main( int argc, char *argv[] )
KCmdLineArgs::usage(i18n("No command or window specified"));
// Read the command
- QString command;
+ TQString command;
for ( int i = 0; i < args->count(); i++ )
- command += KProcess::quote(QString::fromLocal8Bit( args->arg(i) )) + " ";
+ command += KProcess::quote(TQString::fromLocal8Bit( args->arg(i) )) + " ";
if ( !command.isEmpty() )
cmd.setCommand( command );
// Tooltip
- QString tip = args->getOption( "tooltip" );
+ TQString tip = args->getOption( "tooltip" );
if ( !tip.isEmpty() )
cmd.setDefaultTip( tip );
diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp
index 4da55ed08..85fb78324 100644
--- a/ktip/ktipwindow.cpp
+++ b/ktip/ktipwindow.cpp
@@ -44,16 +44,16 @@ int main(int argc, char *argv[])
KUniqueApplication app;
- KTipDialog *tipDialog = new KTipDialog(new KTipDatabase(locate("data", QString("kdewizard/tips"))));
+ KTipDialog *tipDialog = new KTipDialog(new KTipDatabase(locate("data", TQString("kdewizard/tips"))));
Q_CHECK_PTR(tipDialog);
#ifdef Q_WS_X11
KWin::setState(tipDialog->winId(), NET::StaysOnTop);
#endif
tipDialog->setCaption(i18n("Useful Tips"));
- app.dcopClient()->send("ksplash", "ksplash", "close()", QByteArray()); // Close splash screen
+ app.dcopClient()->send("ksplash", "ksplash", "close()", TQByteArray()); // Close splash screen
tipDialog->show();
- QObject::connect(qApp, SIGNAL(lastWindowClosed()), qApp, SLOT(quit()));
+ TQObject::connect(qApp, TQT_SIGNAL(lastWindowClosed()), qApp, TQT_SLOT(quit()));
app.setMainWidget(tipDialog);
diff --git a/kwin/KWinInterface.h b/kwin/KWinInterface.h
index bca7354b5..eff3a88f2 100644
--- a/kwin/KWinInterface.h
+++ b/kwin/KWinInterface.h
@@ -14,7 +14,7 @@ class KWinInterface : virtual public DCOPObject
virtual ASYNC reconfigure() = 0;
virtual ASYNC killWindow() = 0;
virtual void refresh() = 0;
- virtual void doNotManage(QString)= 0;
+ virtual void doNotManage(TQString)= 0;
virtual void showWindowMenuAt(unsigned long winId, int x, int y)= 0;
virtual void kDestopResized() = 0;
virtual void setDesktopLayout(int orientation, int x, int y)= 0;
diff --git a/kwin/activation.cpp b/kwin/activation.cpp
index a6844b737..f80a00f9a 100644
--- a/kwin/activation.cpp
+++ b/kwin/activation.cpp
@@ -20,7 +20,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include "workspace.h"
#include <fixx11h.h>
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
#include <kxerrorhandler.h>
#include <kstartupinfo.h>
#include <kstringhandler.h>
@@ -44,7 +44,7 @@ namespace KWinInternal
to force focus change even in cases when ICCCM 4.2.7 doesn't allow it
(e.g. they may try to activate their main window because the user
definitely "needs" to see something happened - misusing
- of QWidget::setActiveWindow() may be such case).
+ of TQWidget::setActiveWindow() may be such case).
There are 4 ways how a window may become active:
- the user changes the active window (e.g. focus follows mouse, clicking
@@ -221,7 +221,7 @@ void Workspace::setActiveClient( Client* c, allowed_t )
closeActivePopup();
StackingUpdatesBlocker blocker( this );
++set_active_client_recursion;
- updateFocusMousePosition( QCursor::pos());
+ updateFocusMousePosition( TQCursor::pos());
if( active_client != NULL )
{ // note that this may call setActiveClient( NULL ), therefore the recursion counter
active_client->setActive( false, !c || !c->isModal() || c != active_client->transientFor() );
@@ -713,8 +713,8 @@ void Client::demandAttention( bool set )
if( demandAttentionKNotifyTimer == NULL )
{
- demandAttentionKNotifyTimer = new QTimer( this );
- connect( demandAttentionKNotifyTimer, SIGNAL( timeout()), SLOT( demandAttentionKNotify()));
+ demandAttentionKNotifyTimer = new TQTimer( this );
+ connect( demandAttentionKNotifyTimer, TQT_SIGNAL( timeout()), TQT_SLOT( demandAttentionKNotify()));
}
demandAttentionKNotifyTimer->start( 1000, true );
}
diff --git a/kwin/atoms.cpp b/kwin/atoms.cpp
index 08d95c9d6..8b838fdec 100644
--- a/kwin/atoms.cpp
+++ b/kwin/atoms.cpp
@@ -10,7 +10,7 @@ License. See the file "COPYING" for the exact licensing terms.
******************************************************************/
-#include <qapplication.h>
+#include <tqapplication.h>
#include "atoms.h"
#include <assert.h>
diff --git a/kwin/bridge.cpp b/kwin/bridge.cpp
index 6b37c0eaa..49840e248 100644
--- a/kwin/bridge.cpp
+++ b/kwin/bridge.cpp
@@ -41,9 +41,9 @@ BRIDGE_HELPER( bool, keepAbove,,, const )
BRIDGE_HELPER( bool, keepBelow,,, const )
BRIDGE_HELPER( bool, isMovable,,, const )
BRIDGE_HELPER( bool, isResizable,,, const )
-BRIDGE_HELPER( QString, caption,,, const )
-BRIDGE_HELPER( void, processMousePressEvent, QMouseEvent* e, e, )
-BRIDGE_HELPER( QRect, geometry,,, const )
+BRIDGE_HELPER( TQString, caption,,, const )
+BRIDGE_HELPER( void, processMousePressEvent, TQMouseEvent* e, e, )
+BRIDGE_HELPER( TQRect, geometry,,, const )
BRIDGE_HELPER( void, closeWindow,,, )
BRIDGE_HELPER( void, maximize, MaximizeMode m, m, )
BRIDGE_HELPER( void, minimize,,, )
@@ -67,9 +67,9 @@ NET::WindowType Bridge::windowType( unsigned long supported_types ) const
return c->windowType( false, supported_types );
}
-QIconSet Bridge::icon() const
+TQIconSet Bridge::icon() const
{
- return QIconSet( c->miniIcon(), c->icon());
+ return TQIconSet( c->miniIcon(), c->icon());
}
bool Bridge::isSetShade() const
@@ -77,12 +77,12 @@ bool Bridge::isSetShade() const
return c->shadeMode() != ShadeNone;
}
-void Bridge::showWindowMenu( QPoint p )
+void Bridge::showWindowMenu( TQPoint p )
{
c->workspace()->showWindowMenu( p, c );
}
-void Bridge::showWindowMenu( const QRect &p )
+void Bridge::showWindowMenu( const TQRect &p )
{
c->workspace()->showWindowMenu( p, c );
}
@@ -92,7 +92,7 @@ void Bridge::performWindowOperation( WindowOperation op )
c->workspace()->performWindowOperation( c, op );
}
-void Bridge::setMask( const QRegion& r, int mode )
+void Bridge::setMask( const TQRegion& r, int mode )
{
c->setMask( r, mode );
}
@@ -102,13 +102,13 @@ bool Bridge::isPreview() const
return false;
}
-QRect Bridge::iconGeometry() const
+TQRect Bridge::iconGeometry() const
{
NETRect r = c->info->iconGeometry();
- return QRect( r.pos.x, r.pos.y, r.size.width, r.size.height );
+ return TQRect( r.pos.x, r.pos.y, r.size.width, r.size.height );
}
-QWidget* Bridge::workspaceWidget() const
+TQWidget* Bridge::workspaceWidget() const
{
return c->workspace()->desktopWidget();
}
@@ -125,7 +125,7 @@ void Bridge::titlebarDblClickOperation()
void Bridge::titlebarMouseWheelOperation( int delta )
{
- c->performMouseCommand( options->operationTitlebarMouseWheel( delta ), QCursor::pos());
+ c->performMouseCommand( options->operationTitlebarMouseWheel( delta ), TQCursor::pos());
}
void Bridge::setShade( bool set )
@@ -138,7 +138,7 @@ int Bridge::currentDesktop() const
return c->workspace()->currentDesktop();
}
-QWidget* Bridge::initialParentWidget() const
+TQWidget* Bridge::initialParentWidget() const
{
return NULL;
}
@@ -156,9 +156,9 @@ void Bridge::helperShowHide( bool show )
c->rawHide();
}
-QRegion Bridge::unobscuredRegion( const QRegion& r ) const
+TQRegion Bridge::unobscuredRegion( const TQRegion& r ) const
{
- QRegion reg( r );
+ TQRegion reg( r );
const ClientList stacking_order = c->workspace()->stackingOrder();
ClientList::ConstIterator it = stacking_order.find( c );
++it;
@@ -183,7 +183,7 @@ QRegion Bridge::unobscuredRegion( const QRegion& r ) const
we choose ours */
int dx = (*it)->x() - c->x();
int dy = (*it)->y() - c->y();
- QRegion creg = (*it)->mask();
+ TQRegion creg = (*it)->mask();
creg.translate(dx, dy);
reg -= creg;
if (reg.isEmpty())
diff --git a/kwin/bridge.h b/kwin/bridge.h
index 155970f04..0989a64b5 100644
--- a/kwin/bridge.h
+++ b/kwin/bridge.h
@@ -38,18 +38,18 @@ class Bridge : public KDecorationBridge
virtual bool isMovable() const;
virtual bool isResizable() const;
virtual NET::WindowType windowType( unsigned long supported_types ) const;
- virtual QIconSet icon() const;
- virtual QString caption() const;
- virtual void processMousePressEvent( QMouseEvent* );
- virtual void showWindowMenu( QPoint );
- virtual void showWindowMenu( const QRect & );
+ virtual TQIconSet icon() const;
+ virtual TQString caption() const;
+ virtual void processMousePressEvent( TQMouseEvent* );
+ virtual void showWindowMenu( TQPoint );
+ virtual void showWindowMenu( const TQRect & );
virtual void performWindowOperation( WindowOperation );
- virtual void setMask( const QRegion&, int );
+ virtual void setMask( const TQRegion&, int );
virtual bool isPreview() const;
- virtual QRect geometry() const;
- virtual QRect iconGeometry() const;
- virtual QRegion unobscuredRegion( const QRegion& r ) const;
- virtual QWidget* workspaceWidget() const;
+ virtual TQRect geometry() const;
+ virtual TQRect iconGeometry() const;
+ virtual TQRegion unobscuredRegion( const TQRegion& r ) const;
+ virtual TQWidget* workspaceWidget() const;
virtual WId windowId() const;
virtual void closeWindow();
virtual void maximize( MaximizeMode mode );
@@ -62,7 +62,7 @@ class Bridge : public KDecorationBridge
virtual void setKeepAbove( bool );
virtual void setKeepBelow( bool );
virtual int currentDesktop() const;
- virtual QWidget* initialParentWidget() const;
+ virtual TQWidget* initialParentWidget() const;
virtual Qt::WFlags initialWFlags() const;
virtual void helperShowHide( bool show );
virtual void grabXServer( bool grab );
diff --git a/kwin/client.cpp b/kwin/client.cpp
index 9fc5353df..5f281f2ab 100644
--- a/kwin/client.cpp
+++ b/kwin/client.cpp
@@ -11,13 +11,13 @@ License. See the file "COPYING" for the exact licensing terms.
#include "client.h"
-#include <qapplication.h>
-#include <qpainter.h>
-#include <qdatetime.h>
+#include <tqapplication.h>
+#include <tqpainter.h>
+#include <tqdatetime.h>
#include <kprocess.h>
#include <unistd.h>
#include <kstandarddirs.h>
-#include <qwhatsthis.h>
+#include <tqwhatsthis.h>
#include <kwin.h>
#include <kiconloader.h>
#include <stdlib.h>
@@ -67,7 +67,7 @@ namespace KWinInternal
is done in manage().
*/
Client::Client( Workspace *ws )
- : QObject( NULL ),
+ : TQObject( NULL ),
client( None ),
wrapper( None ),
frame( None ),
@@ -146,8 +146,8 @@ Client::Client( Workspace *ws )
cmap = None;
- frame_geometry = QRect( 0, 0, 100, 100 ); // so that decorations don't start with size being (0,0)
- client_size = QSize( 100, 100 );
+ frame_geometry = TQRect( 0, 0, 100, 100 ); // so that decorations don't start with size being (0,0)
+ client_size = TQSize( 100, 100 );
custom_opacity = false;
rule_opacity_active = 0;; //translucency rules
rule_opacity_inactive = 0; //dito.
@@ -277,7 +277,7 @@ void Client::updateDecoration( bool check_workspace_pos, bool force )
destroyDecoration();
if( !noBorder())
{
- setMask( QRegion()); // reset shape mask
+ setMask( TQRegion()); // reset shape mask
decoration = workspace()->createDecoration( bridge );
// TODO check decoration's minimum size?
decoration->init();
@@ -312,9 +312,9 @@ void Client::destroyDecoration()
{
delete decoration;
decoration = NULL;
- QPoint grav = calculateGravitation( true );
+ TQPoint grav = calculateGravitation( true );
border_left = border_right = border_top = border_bottom = 0;
- setMask( QRegion()); // reset shape mask
+ setMask( TQRegion()); // reset shape mask
int save_workarea_diff_x = workarea_diff_x;
int save_workarea_diff_y = workarea_diff_y;
plainResize( sizeForClientSize( clientSize()), ForceGeometrySet );
@@ -423,16 +423,16 @@ void Client::updateFrameExtents()
// re-layouts (e.g. when options()->moveResizeMaximizedWindows() changes,
// the decoration may turn on/off some borders, but the actual size
// of the decoration stays the same).
-void Client::resizeDecoration( const QSize& s )
+void Client::resizeDecoration( const TQSize& s )
{
if( decoration == NULL )
return;
- QSize oldsize = decoration->widget()->size();
+ TQSize oldsize = decoration->widget()->size();
decoration->resize( s );
if( oldsize == s )
{
- QResizeEvent e( s, oldsize );
- QApplication::sendEvent( decoration->widget(), &e );
+ TQResizeEvent e( s, oldsize );
+ TQApplication::sendEvent( decoration->widget(), &e );
}
}
@@ -509,7 +509,7 @@ void Client::updateShape()
}
}
-void Client::setMask( const QRegion& reg, int mode )
+void Client::setMask( const TQRegion& reg, int mode )
{
_mask = reg;
if( reg.isNull())
@@ -520,7 +520,7 @@ void Client::setMask( const QRegion& reg, int mode )
reg.handle(), ShapeSet );
else
{
- QMemArray< QRect > rects = reg.rects();
+ TQMemArray< TQRect > rects = reg.rects();
XRectangle* xrects = new XRectangle[ rects.count() ];
for( unsigned int i = 0;
i < rects.count();
@@ -538,10 +538,10 @@ void Client::setMask( const QRegion& reg, int mode )
updateShape();
}
-QRegion Client::mask() const
+TQRegion Client::mask() const
{
if( _mask.isEmpty())
- return QRegion( 0, 0, width(), height());
+ return TQRegion( 0, 0, width(), height());
return _mask;
}
@@ -658,22 +658,22 @@ void Client::animateMinimizeOrUnminimize( bool minimize )
step = 40. * (11 - speed );
NETRect r = info->iconGeometry();
- QRect icongeom( r.pos.x, r.pos.y, r.size.width, r.size.height );
+ TQRect icongeom( r.pos.x, r.pos.y, r.size.width, r.size.height );
if ( !icongeom.isValid() )
return;
- QPixmap pm = animationPixmap( minimize ? width() : icongeom.width() );
+ TQPixmap pm = animationPixmap( minimize ? width() : icongeom.width() );
- QRect before, after;
+ TQRect before, after;
if ( minimize )
{
- before = QRect( x(), y(), width(), pm.height() );
- after = QRect( icongeom.x(), icongeom.y(), icongeom.width(), pm.height() );
+ before = TQRect( x(), y(), width(), pm.height() );
+ after = TQRect( icongeom.x(), icongeom.y(), icongeom.width(), pm.height() );
}
else
{
- before = QRect( icongeom.x(), icongeom.y(), icongeom.width(), pm.height() );
- after = QRect( x(), y(), width(), pm.height() );
+ before = TQRect( icongeom.x(), icongeom.y(), icongeom.width(), pm.height() );
+ after = TQRect( x(), y(), width(), pm.height() );
}
lf = (after.left() - before.left())/step;
@@ -683,23 +683,23 @@ void Client::animateMinimizeOrUnminimize( bool minimize )
grabXServer();
- QRect area = before;
- QRect area2;
- QPixmap pm2;
+ TQRect area = before;
+ TQRect area2;
+ TQPixmap pm2;
- QTime t;
+ TQTime t;
t.start();
float diff;
- QPainter p ( workspace()->desktopWidget() );
+ TQPainter p ( workspace()->desktopWidget() );
bool need_to_clear = FALSE;
- QPixmap pm3;
+ TQPixmap pm3;
do
{
if (area2 != area)
{
pm = animationPixmap( area.width() );
- pm2 = QPixmap::grabWindow( qt_xrootwin(), area.x(), area.y(), area.width(), area.height() );
+ pm2 = TQPixmap::grabWindow( qt_xrootwin(), area.x(), area.y(), area.width(), area.height() );
p.drawPixmap( area.x(), area.y(), pm );
if ( need_to_clear )
{
@@ -739,13 +739,13 @@ void Client::animateMinimizeOrUnminimize( bool minimize )
/*!
The pixmap shown during (un)minimalization animation
*/
-QPixmap Client::animationPixmap( int w )
+TQPixmap Client::animationPixmap( int w )
{
- QFont font = options->font(isActive());
- QFontMetrics fm( font );
- QPixmap pm( w, fm.lineSpacing() );
+ TQFont font = options->font(isActive());
+ TQFontMetrics fm( font );
+ TQPixmap pm( w, fm.lineSpacing() );
pm.fill( options->color(Options::ColorTitleBar, isActive() || isMinimized() ) );
- QPainter p( &pm );
+ TQPainter p( &pm );
p.setPen(options->color(Options::ColorFont, isActive() || isMinimized() ));
p.setFont(options->font(isActive()));
p.drawText( pm.rect(), AlignLeft|AlignVCenter|SingleLine, caption() );
@@ -801,7 +801,7 @@ void Client::setShade( ShadeMode mode )
// shade
int h = height();
shade_geometry_change = true;
- QSize s( sizeForClientSize( QSize( clientSize())));
+ TQSize s( sizeForClientSize( TQSize( clientSize())));
s.setHeight( border_top + border_bottom );
XSelectInput( qt_xdisplay(), wrapper, ClientWinMask ); // avoid getting UnmapNotify
XUnmapWindow( qt_xdisplay(), wrapper );
@@ -817,8 +817,8 @@ void Client::setShade( ShadeMode mode )
{
h -= step;
XResizeWindow( qt_xdisplay(), frameId(), s.width(), h );
- resizeDecoration( QSize( s.width(), h ));
- QApplication::syncX();
+ resizeDecoration( TQSize( s.width(), h ));
+ TQApplication::syncX();
} while ( h > s.height() + step );
// if ( !wasStaticContents )
// clearWFlags( WStaticContents );
@@ -839,7 +839,7 @@ void Client::setShade( ShadeMode mode )
{
int h = height();
shade_geometry_change = true;
- QSize s( sizeForClientSize( clientSize()));
+ TQSize s( sizeForClientSize( clientSize()));
// FRAME bool wasStaticContents = testWFlags( WStaticContents );
// setWFlags( WStaticContents );
int step = QMAX( 4, QABS( h - s.height() ) / as )+1;
@@ -847,11 +847,11 @@ void Client::setShade( ShadeMode mode )
{
h += step;
XResizeWindow( qt_xdisplay(), frameId(), s.width(), h );
- resizeDecoration( QSize( s.width(), h ));
+ resizeDecoration( TQSize( s.width(), h ));
// assume a border
// we do not have time to wait for X to send us paint events
// FRAME repaint( 0, h - step-5, width(), step+5, TRUE);
- QApplication::syncX();
+ TQApplication::syncX();
} while ( h < s.height() - step );
// if ( !wasStaticContents )
// clearWFlags( WStaticContents );
@@ -1099,8 +1099,8 @@ void Client::pingWindow()
return; // turned off
if( ping_timer != NULL )
return; // pinging already
- ping_timer = new QTimer( this );
- connect( ping_timer, SIGNAL( timeout()), SLOT( pingTimeout()));
+ ping_timer = new TQTimer( this );
+ connect( ping_timer, TQT_SIGNAL( timeout()), TQT_SLOT( pingTimeout()));
ping_timer->start( options->killPingTimeout, true );
ping_timestamp = qt_x_time;
workspace()->sendPingToWindow( window(), ping_timestamp );
@@ -1134,7 +1134,7 @@ void Client::killProcess( bool ask, Time timestamp )
if( process_killer != NULL )
return;
Q_ASSERT( !ask || timestamp != CurrentTime );
- QCString machine = wmClientMachine( true );
+ TQCString machine = wmClientMachine( true );
pid_t pid = info->pid();
if( pid <= 0 || machine.isEmpty()) // needed properties missing
return;
@@ -1154,13 +1154,13 @@ void Client::killProcess( bool ask, Time timestamp )
{ // SELI TODO handle the window created by handler specially (on top,urgent?)
process_killer = new KProcess( this );
*process_killer << KStandardDirs::findExe( "kwin_killer_helper" )
- << "--pid" << QCString().setNum( pid ) << "--hostname" << machine
+ << "--pid" << TQCString().setNum( pid ) << "--hostname" << machine
<< "--windowname" << caption().utf8()
<< "--applicationname" << resourceClass()
- << "--wid" << QCString().setNum( window())
- << "--timestamp" << QCString().setNum( timestamp );
- connect( process_killer, SIGNAL( processExited( KProcess* )),
- SLOT( processKillerExited()));
+ << "--wid" << TQCString().setNum( window())
+ << "--timestamp" << TQCString().setNum( timestamp );
+ connect( process_killer, TQT_SIGNAL( processExited( KProcess* )),
+ TQT_SLOT( processKillerExited()));
if( !process_killer->start( KProcess::NotifyOnExit ))
{
delete process_killer;
@@ -1342,7 +1342,7 @@ void Client::showContextHelp()
if ( Pcontexthelp )
{
sendClientMessage(window(), atoms->wm_protocols, atoms->net_wm_context_help);
- QWhatsThis::enterWhatsThisMode(); // SELI?
+ TQWhatsThis::enterWhatsThisMode(); // SELI?
}
}
@@ -1356,17 +1356,17 @@ void Client::fetchName()
setCaption( readName());
}
-QString Client::readName() const
+TQString Client::readName() const
{
if ( info->name() && info->name()[ 0 ] != '\0' )
- return QString::fromUtf8( info->name() );
+ return TQString::fromUtf8( info->name() );
else
return KWin::readNameProperty( window(), XA_WM_NAME );
}
KWIN_COMPARE_PREDICATE( FetchNameInternalPredicate, const Client*, (!cl->isSpecialWindow() || cl->isToolbar()) && cl != value && cl->caption() == value->caption());
-void Client::setCaption( const QString& s, bool force )
+void Client::setCaption( const TQString& s, bool force )
{
if ( s != cap_normal || force )
{
@@ -1378,17 +1378,17 @@ void Client::setCaption( const QString& s, bool force )
s[ i ] = ' ';
cap_normal = s;
bool was_suffix = ( !cap_suffix.isEmpty());
- QString machine_suffix;
+ TQString machine_suffix;
if( wmClientMachine( false ) != "localhost" && !isLocalMachine( wmClientMachine( false )))
machine_suffix = " <@" + wmClientMachine( true ) + ">";
- QString shortcut_suffix = !shortcut().isNull() ? ( " {" + shortcut().toString() + "}" ) : "";
+ TQString shortcut_suffix = !shortcut().isNull() ? ( " {" + shortcut().toString() + "}" ) : "";
cap_suffix = machine_suffix + shortcut_suffix;
if ( ( !isSpecialWindow() || isToolbar()) && workspace()->findClient( FetchNameInternalPredicate( this )))
{
int i = 2;
do
{
- cap_suffix = machine_suffix + " <" + QString::number(i) + ">" + shortcut_suffix;
+ cap_suffix = machine_suffix + " <" + TQString::number(i) + ">" + shortcut_suffix;
i++;
} while ( workspace()->findClient( FetchNameInternalPredicate( this )));
info->setVisibleName( caption().utf8() );
@@ -1415,9 +1415,9 @@ void Client::updateCaption()
void Client::fetchIconicName()
{
- QString s;
+ TQString s;
if ( info->iconName() && info->iconName()[ 0 ] != '\0' )
- s = QString::fromUtf8( info->iconName() );
+ s = TQString::fromUtf8( info->iconName() );
else
s = KWin::readNameProperty( window(), XA_WM_ICON_NAME );
if ( s != cap_iconic )
@@ -1436,7 +1436,7 @@ void Client::fetchIconicName()
/*!\reimp
*/
-QString Client::caption( bool full ) const
+TQString Client::caption( bool full ) const
{
return full ? cap_normal + cap_suffix : cap_normal;
}
@@ -1480,7 +1480,7 @@ void Client::getMotifHints()
updateDecoration( true ); // check if noborder state has changed
}
-void Client::readIcons( Window win, QPixmap* icon, QPixmap* miniicon )
+void Client::readIcons( Window win, TQPixmap* icon, TQPixmap* miniicon )
{
// get the icons, allow scaling
if( icon != NULL )
@@ -1489,7 +1489,7 @@ void Client::readIcons( Window win, QPixmap* icon, QPixmap* miniicon )
if( icon == NULL || !icon->isNull())
*miniicon = KWin::icon( win, 16, 16, TRUE, KWin::NETWM | KWin::WMHints );
else
- *miniicon = QPixmap();
+ *miniicon = TQPixmap();
}
void Client::getIcons()
@@ -1558,7 +1558,7 @@ static int nullErrorHandler(Display *, XErrorEvent *)
/*!
Returns WM_WINDOW_ROLE property for a given window.
*/
-QCString Client::staticWindowRole(WId w)
+TQCString Client::staticWindowRole(WId w)
{
return getStringProperty(w, qt_window_role).lower();
}
@@ -1566,7 +1566,7 @@ QCString Client::staticWindowRole(WId w)
/*!
Returns SM_CLIENT_ID property for a given window.
*/
-QCString Client::staticSessionId(WId w)
+TQCString Client::staticSessionId(WId w)
{
return getStringProperty(w, qt_sm_client_id);
}
@@ -1574,7 +1574,7 @@ QCString Client::staticSessionId(WId w)
/*!
Returns WM_COMMAND property for a given window.
*/
-QCString Client::staticWmCommand(WId w)
+TQCString Client::staticWmCommand(WId w)
{
return getStringProperty(w, XA_WM_COMMAND, ' ');
}
@@ -1614,9 +1614,9 @@ void Client::getWmClientLeader()
Returns sessionId for this client,
taken either from its window or from the leader window.
*/
-QCString Client::sessionId()
+TQCString Client::sessionId()
{
- QCString result = staticSessionId(window());
+ TQCString result = staticSessionId(window());
if (result.isEmpty() && wmClientLeaderWin && wmClientLeaderWin!=window())
result = staticSessionId(wmClientLeaderWin);
return result;
@@ -1626,9 +1626,9 @@ QCString Client::sessionId()
Returns command property for this client,
taken either from its window or from the leader window.
*/
-QCString Client::wmCommand()
+TQCString Client::wmCommand()
{
- QCString result = staticWmCommand(window());
+ TQCString result = staticWmCommand(window());
if (result.isEmpty() && wmClientLeaderWin && wmClientLeaderWin!=window())
result = staticWmCommand(wmClientLeaderWin);
return result;
@@ -1647,9 +1647,9 @@ void Client::getWmClientMachine()
Returns client machine for this client,
taken either from its window or from the leader window.
*/
-QCString Client::wmClientMachine( bool use_localhost ) const
+TQCString Client::wmClientMachine( bool use_localhost ) const
{
- QCString result = client_machine;
+ TQCString result = client_machine;
if( use_localhost )
{ // special name for the local machine (localhost)
if( result != "localhost" && isLocalMachine( result ))
@@ -1754,7 +1754,7 @@ NET::WindowType Client::windowType( bool direct, int supported_types ) const
wt = NET::TopMenu;
}
// TODO change this to rule
- const char* const oo_prefix = "openoffice.org"; // QCString has no startsWith()
+ const char* const oo_prefix = "openoffice.org"; // TQCString has no startsWith()
// oo_prefix is lowercase, because resourceClass() is forced to be lowercase
if( qstrncmp( resourceClass(), oo_prefix, strlen( oo_prefix )) == 0 && wt == NET::Dialog )
wt = NET::Normal; // see bug #66065
@@ -1801,7 +1801,7 @@ void Client::setCursor( Position m )
}
// TODO mit nejake checkCursor(), ktere se zavola v manage() a pri vecech, kdy by se kurzor mohl zmenit?
-void Client::setCursor( const QCursor& c )
+void Client::setCursor( const TQCursor& c )
{
if( c.handle() == cursor.handle())
return;
@@ -1811,7 +1811,7 @@ void Client::setCursor( const QCursor& c )
XDefineCursor( qt_xdisplay(), frameId(), cursor.handle());
}
-Client::Position Client::mousePosition( const QPoint& p ) const
+Client::Position Client::mousePosition( const TQPoint& p ) const
{
if( decoration != NULL )
return decoration->mousePosition( p );
@@ -2166,9 +2166,9 @@ kdbgstream& operator<<( kdbgstream& stream, const ConstClientList& list )
}
#endif
-QPixmap * kwin_get_menu_pix_hack()
+TQPixmap * kwin_get_menu_pix_hack()
{
- static QPixmap p;
+ static TQPixmap p;
if ( p.isNull() )
p = SmallIcon( "bx2" );
return &p;
diff --git a/kwin/client.h b/kwin/client.h
index 0905b5794..806e01bec 100644
--- a/kwin/client.h
+++ b/kwin/client.h
@@ -12,9 +12,9 @@ License. See the file "COPYING" for the exact licensing terms.
#ifndef KWIN_CLIENT_H
#define KWIN_CLIENT_H
-#include <qframe.h>
-#include <qvbox.h>
-#include <qpixmap.h>
+#include <tqframe.h>
+#include <tqvbox.h>
+#include <tqpixmap.h>
#include <netwm.h>
#include <kdebug.h>
#include <assert.h>
@@ -43,7 +43,7 @@ class WinInfo;
class SessionInfo;
class Bridge;
-class Client : public QObject, public KDecorationDefines
+class Client : public TQObject, public KDecorationDefines
{
Q_OBJECT
public:
@@ -76,21 +76,21 @@ class Client : public QObject, public KDecorationDefines
void applyWindowRules();
void updateWindowRules();
- QRect geometry() const;
- QSize size() const;
- QSize minSize() const;
- QSize maxSize() const;
- QPoint pos() const;
- QRect rect() const;
+ TQRect geometry() const;
+ TQSize size() const;
+ TQSize minSize() const;
+ TQSize maxSize() const;
+ TQPoint pos() const;
+ TQRect rect() const;
int x() const;
int y() const;
int width() const;
int height() const;
- QPoint clientPos() const; // inside of geometry()
- QSize clientSize() const;
+ TQPoint clientPos() const; // inside of geometry()
+ TQSize clientSize() const;
bool windowEvent( XEvent* e );
- virtual bool eventFilter( QObject* o, QEvent* e );
+ virtual bool eventFilter( TQObject* o, TQEvent* e );
bool manage( Window w, bool isMapped );
@@ -103,11 +103,11 @@ class Client : public QObject, public KDecorationDefines
SizemodeFixedH, // try not to affect height
SizemodeMax // try not to make it larger in either direction
};
- QSize adjustedSize( const QSize&, Sizemode mode = SizemodeAny ) const;
- QSize adjustedSize() const;
+ TQSize adjustedSize( const TQSize&, Sizemode mode = SizemodeAny ) const;
+ TQSize adjustedSize() const;
- QPixmap icon() const;
- QPixmap miniIcon() const;
+ TQPixmap icon() const;
+ TQPixmap miniIcon() const;
bool isActive() const;
void setActive( bool, bool updateOpacity = true );
@@ -132,7 +132,7 @@ class Client : public QObject, public KDecorationDefines
bool isMinimized() const;
bool isMaximizable() const;
- QRect geometryRestore() const;
+ TQRect geometryRestore() const;
MaximizeMode maximizeModeRestore() const;
MaximizeMode maximizeMode() const;
bool isMinimizable() const;
@@ -142,7 +142,7 @@ class Client : public QObject, public KDecorationDefines
bool isFullScreen() const;
bool isFullScreenable( bool fullscreen_hack = false ) const;
bool userCanSetFullScreen() const;
- QRect geometryFSRestore() const { return geom_fs_restore; } // only for session saving
+ TQRect geometryFSRestore() const { return geom_fs_restore; } // only for session saving
int fullScreenMode() const { return fullscreen_mode; } // only for session saving
bool isUserNoBorder() const;
@@ -194,8 +194,8 @@ class Client : public QObject, public KDecorationDefines
void takeFocus( allowed_t );
void demandAttention( bool set = true );
- void setMask( const QRegion& r, int mode = X::Unsorted );
- QRegion mask() const;
+ void setMask( const TQRegion& r, int mode = X::Unsorted );
+ TQRegion mask() const;
void updateDecoration( bool check_workspace_pos, bool force = false );
void checkBorderSizes();
@@ -205,16 +205,16 @@ class Client : public QObject, public KDecorationDefines
void updateShape();
void setGeometry( int x, int y, int w, int h, ForceGeometry_t force = NormalGeometrySet );
- void setGeometry( const QRect& r, ForceGeometry_t force = NormalGeometrySet );
+ void setGeometry( const TQRect& r, ForceGeometry_t force = NormalGeometrySet );
void move( int x, int y, ForceGeometry_t force = NormalGeometrySet );
- void move( const QPoint & p, ForceGeometry_t force = NormalGeometrySet );
+ void move( const TQPoint & p, ForceGeometry_t force = NormalGeometrySet );
// plainResize() simply resizes
void plainResize( int w, int h, ForceGeometry_t force = NormalGeometrySet );
- void plainResize( const QSize& s, ForceGeometry_t force = NormalGeometrySet );
+ void plainResize( const TQSize& s, ForceGeometry_t force = NormalGeometrySet );
// resizeWithChecks() resizes according to gravity, and checks workarea position
void resizeWithChecks( int w, int h, ForceGeometry_t force = NormalGeometrySet );
- void resizeWithChecks( const QSize& s, ForceGeometry_t force = NormalGeometrySet );
- void keepInArea( QRect area, bool partial = false );
+ void resizeWithChecks( const TQSize& s, ForceGeometry_t force = NormalGeometrySet );
+ void keepInArea( TQRect area, bool partial = false );
void growHorizontal();
void shrinkHorizontal();
@@ -223,20 +223,20 @@ class Client : public QObject, public KDecorationDefines
bool providesContextHelp() const;
KShortcut shortcut() const;
- void setShortcut( const QString& cut );
+ void setShortcut( const TQString& cut );
- bool performMouseCommand( Options::MouseCommand, QPoint globalPos, bool handled = false );
+ bool performMouseCommand( Options::MouseCommand, TQPoint globalPos, bool handled = false );
- QCString windowRole() const;
- QCString sessionId();
- QCString resourceName() const;
- QCString resourceClass() const;
- QCString wmCommand();
- QCString wmClientMachine( bool use_localhost ) const;
+ TQCString windowRole() const;
+ TQCString sessionId();
+ TQCString resourceName() const;
+ TQCString resourceClass() const;
+ TQCString wmCommand();
+ TQCString wmClientMachine( bool use_localhost ) const;
Window wmClientLeader() const;
pid_t pid() const;
- QRect adjustedClientArea( const QRect& desktop, const QRect& area ) const;
+ TQRect adjustedClientArea( const TQRect& desktop, const TQRect& area ) const;
Colormap colormap() const;
@@ -245,14 +245,14 @@ class Client : public QObject, public KDecorationDefines
// hides a client - basically like minimize, but without effects, it's simply hidden
void hideClient( bool hide );
- QString caption( bool full = true ) const;
+ TQString caption( bool full = true ) const;
void updateCaption();
void keyPressEvent( uint key_code ); // FRAME ??
void updateMouseGrab();
Window moveResizeGrabWindow() const;
- const QPoint calculateGravitation( bool invert, int gravity = 0 ) const; // FRAME public?
+ const TQPoint calculateGravitation( bool invert, int gravity = 0 ) const; // FRAME public?
void NETMoveResize( int x_root, int y_root, NET::Direction direction );
void NETMoveResizeWindow( int flags, int x, int y, int width, int height );
@@ -260,10 +260,10 @@ class Client : public QObject, public KDecorationDefines
void gotPing( Time timestamp );
- static QCString staticWindowRole(WId);
- static QCString staticSessionId(WId);
- static QCString staticWmCommand(WId);
- static QCString staticWmClientMachine(WId);
+ static TQCString staticWindowRole(WId);
+ static TQCString staticSessionId(WId);
+ static TQCString staticWmCommand(WId);
+ static TQCString staticWmClientMachine(WId);
static Window staticWmClientLeader(WId);
void checkWorkspacePosition();
@@ -277,7 +277,7 @@ class Client : public QObject, public KDecorationDefines
static bool resourceMatch( const Client* c1, const Client* c2 );
static bool belongToSameApplication( const Client* c1, const Client* c2, bool active_hack = false );
- static void readIcons( Window win, QPixmap* icon, QPixmap* miniicon );
+ static void readIcons( Window win, TQPixmap* icon, TQPixmap* miniicon );
void minimize( bool avoid_animation = false );
void unminimize( bool avoid_animation = false );
@@ -315,22 +315,22 @@ class Client : public QObject, public KDecorationDefines
private:
friend class Bridge; // FRAME
- virtual void processMousePressEvent( QMouseEvent* e );
+ virtual void processMousePressEvent( TQMouseEvent* e );
private: // TODO cleanup the order of things in the .h file
// use Workspace::createClient()
virtual ~Client(); // use destroyClient() or releaseWindow()
- Position mousePosition( const QPoint& ) const;
+ Position mousePosition( const TQPoint& ) const;
void setCursor( Position m );
- void setCursor( const QCursor& c );
+ void setCursor( const TQCursor& c );
void animateMinimizeOrUnminimize( bool minimize );
- QPixmap animationPixmap( int w );
+ TQPixmap animationPixmap( int w );
// transparent stuff
- void drawbound( const QRect& geom );
+ void drawbound( const TQRect& geom );
void clearbound();
- void doDrawbound( const QRect& geom, bool clear );
+ void doDrawbound( const TQRect& geom, bool clear );
// handlers for X11 events
bool mapRequestEvent( XMapRequestEvent* e );
@@ -363,11 +363,11 @@ class Client : public QObject, public KDecorationDefines
bool isNormalState() const;
bool isManaged() const; // returns false if this client is not yet managed
void updateAllowedActions( bool force = false );
- QSize sizeForClientSize( const QSize&, Sizemode mode = SizemodeAny, bool noframe = false ) const;
+ TQSize sizeForClientSize( const TQSize&, Sizemode mode = SizemodeAny, bool noframe = false ) const;
void changeMaximize( bool horizontal, bool vertical, bool adjust );
void checkMaximizeGeometry();
- int checkFullScreenHack( const QRect& geom ) const; // 0 - none, 1 - one xinerama screen, 2 - full area
- void updateFullScreenHack( const QRect& geom );
+ int checkFullScreenHack( const TQRect& geom ) const; // 0 - none, 1 - one xinerama screen, 2 - full area
+ void updateFullScreenHack( const TQRect& geom );
void getWmNormalHints();
void getMotifHints();
void getIcons();
@@ -375,14 +375,14 @@ class Client : public QObject, public KDecorationDefines
void getWmClientMachine();
void fetchName();
void fetchIconicName();
- QString readName() const;
- void setCaption( const QString& s, bool force = false );
+ TQString readName() const;
+ void setCaption( const TQString& s, bool force = false );
bool hasTransientInternal( const Client* c, bool indirect, ConstClientList& set ) const;
void finishWindowRules();
void setShortcutInternal( const KShortcut& cut );
void updateWorkareaDiffs();
- void checkDirection( int new_diff, int old_diff, QRect& rect, const QRect& area );
+ void checkDirection( int new_diff, int old_diff, TQRect& rect, const TQRect& area );
static int computeWorkareaDiff( int left, int right, int a_left, int a_right );
void configureRequest( int value_mask, int rx, int ry, int rw, int rh, int gravity, bool from_tool );
NETExtendedStrut strut() const;
@@ -398,7 +398,7 @@ class Client : public QObject, public KDecorationDefines
void grabButton( int mod );
void ungrabButton( int mod );
void resetMaximize();
- void resizeDecoration( const QSize& s );
+ void resizeDecoration( const TQSize& s );
void setDecoHashProperty(uint topHeight, uint rightWidth, uint bottomHeight, uint leftWidth);
void unsetDecoHashProperty();
@@ -445,10 +445,10 @@ class Client : public QObject, public KDecorationDefines
}
Position mode;
- QPoint moveOffset;
- QPoint invertedMoveOffset;
- QRect moveResizeGeom;
- QRect initialMoveResizeGeom;
+ TQPoint moveOffset;
+ TQPoint invertedMoveOffset;
+ TQRect moveResizeGeom;
+ TQRect initialMoveResizeGeom;
XSizeHints xSizeHint;
void sendSyntheticConfigureNotify();
int mapping_state;
@@ -495,43 +495,43 @@ class Client : public QObject, public KDecorationDefines
void getWMHints();
void readIcons();
void getWindowProtocols();
- QPixmap icon_pix;
- QPixmap miniicon_pix;
- QCursor cursor;
+ TQPixmap icon_pix;
+ TQPixmap miniicon_pix;
+ TQCursor cursor;
// FullScreenHack - non-NETWM fullscreen (noborder,size of desktop)
// DON'T reorder - saved to config files !!!
enum FullScreenMode { FullScreenNone, FullScreenNormal, FullScreenHack };
FullScreenMode fullscreen_mode;
MaximizeMode max_mode;
- QRect geom_restore;
- QRect geom_fs_restore;
+ TQRect geom_restore;
+ TQRect geom_fs_restore;
MaximizeMode maxmode_restore;
int workarea_diff_x, workarea_diff_y;
WinInfo* info;
- QTimer* autoRaiseTimer;
- QTimer* shadeHoverTimer;
+ TQTimer* autoRaiseTimer;
+ TQTimer* shadeHoverTimer;
Colormap cmap;
- QCString resource_name;
- QCString resource_class;
- QCString client_machine;
- QString cap_normal, cap_iconic, cap_suffix;
+ TQCString resource_name;
+ TQCString resource_class;
+ TQCString client_machine;
+ TQString cap_normal, cap_iconic, cap_suffix;
WId wmClientLeaderWin;
- QCString window_role;
+ TQCString window_role;
Group* in_group;
Window window_group;
Layer in_layer;
- QTimer* ping_timer;
+ TQTimer* ping_timer;
KProcess* process_killer;
Time ping_timestamp;
Time user_time;
unsigned long allowed_actions;
- QRect frame_geometry;
- QSize client_size;
+ TQRect frame_geometry;
+ TQSize client_size;
int postpone_geometry_updates; // >0 - new geometry is remembered, but not actually set
bool pending_geometry_update;
bool shade_geometry_change;
int border_left, border_right, border_top, border_bottom;
- QRegion _mask;
+ TQRegion _mask;
static bool check_active_modal; // see Client::checkActiveModal()
KShortcut _shortcut;
friend struct FetchNameInternalPredicate;
@@ -547,7 +547,7 @@ class Client : public QObject, public KDecorationDefines
uint rule_opacity_inactive; //dto.
//int shadeOriginalHeight;
bool isBMP_;
- QTimer* demandAttentionKNotifyTimer;
+ TQTimer* demandAttentionKNotifyTimer;
friend bool performTransiencyCheck();
};
@@ -651,12 +651,12 @@ inline int Client::mappingState() const
return mapping_state;
}
-inline QCString Client::resourceName() const
+inline TQCString Client::resourceName() const
{
return resource_name; // it is always lowercase
}
-inline QCString Client::resourceClass() const
+inline TQCString Client::resourceClass() const
{
return resource_class; // it is always lowercase
}
@@ -714,17 +714,17 @@ ShadeMode Client::shadeMode() const
return shade_mode;
}
-inline QPixmap Client::icon() const
+inline TQPixmap Client::icon() const
{
return icon_pix;
}
-inline QPixmap Client::miniIcon() const
+inline TQPixmap Client::miniIcon() const
{
return miniicon_pix;
}
-inline QRect Client::geometryRestore() const
+inline TQRect Client::geometryRestore() const
{
return geom_restore;
}
@@ -810,22 +810,22 @@ inline bool Client::isManaged() const
return mapping_state != WithdrawnState;
}
-inline QCString Client::windowRole() const
+inline TQCString Client::windowRole() const
{
return window_role;
}
-inline QRect Client::geometry() const
+inline TQRect Client::geometry() const
{
return frame_geometry;
}
-inline QSize Client::size() const
+inline TQSize Client::size() const
{
return frame_geometry.size();
}
-inline QPoint Client::pos() const
+inline TQPoint Client::pos() const
{
return frame_geometry.topLeft();
}
@@ -850,37 +850,37 @@ inline int Client::height() const
return frame_geometry.height();
}
-inline QRect Client::rect() const
+inline TQRect Client::rect() const
{
- return QRect( 0, 0, width(), height());
+ return TQRect( 0, 0, width(), height());
}
-inline QPoint Client::clientPos() const
+inline TQPoint Client::clientPos() const
{
- return QPoint( border_left, border_top );
+ return TQPoint( border_left, border_top );
}
-inline QSize Client::clientSize() const
+inline TQSize Client::clientSize() const
{
return client_size;
}
-inline void Client::setGeometry( const QRect& r, ForceGeometry_t force )
+inline void Client::setGeometry( const TQRect& r, ForceGeometry_t force )
{
setGeometry( r.x(), r.y(), r.width(), r.height(), force );
}
-inline void Client::move( const QPoint & p, ForceGeometry_t force )
+inline void Client::move( const TQPoint & p, ForceGeometry_t force )
{
move( p.x(), p.y(), force );
}
-inline void Client::plainResize( const QSize& s, ForceGeometry_t force )
+inline void Client::plainResize( const TQSize& s, ForceGeometry_t force )
{
plainResize( s.width(), s.height(), force );
}
-inline void Client::resizeWithChecks( const QSize& s, ForceGeometry_t force )
+inline void Client::resizeWithChecks( const TQSize& s, ForceGeometry_t force )
{
resizeWithChecks( s.width(), s.height(), force );
}
diff --git a/kwin/clients/b2/b2client.cpp b/kwin/clients/b2/b2client.cpp
index 6a5d821b2..97d049ffb 100644
--- a/kwin/clients/b2/b2client.cpp
+++ b/kwin/clients/b2/b2client.cpp
@@ -11,9 +11,9 @@
*/
#include "b2client.h"
-#include <qapplication.h>
-#include <qlayout.h>
-#include <qdrawutil.h>
+#include <tqapplication.h>
+#include <tqlayout.h>
+#include <tqdrawutil.h>
#include <kpixmapeffect.h>
#include <kimageeffect.h>
#include <kicontheme.h>
@@ -21,9 +21,9 @@
#include <kdrawutil.h>
#include <klocale.h>
#include <kconfig.h>
-#include <qbitmap.h>
-#include <qlabel.h>
-#include <qtooltip.h>
+#include <tqbitmap.h>
+#include <tqlabel.h>
+#include <tqtooltip.h>
#include <X11/Xlib.h>
@@ -99,7 +99,7 @@ static void read_config(B2ClientFactory *f)
{
// Force button size to be in a reasonable range.
// If the frame width is large, the button size must be large too.
- buttonSize = (QFontMetrics(options()->font(true)).height() + 1) & 0x3e;
+ buttonSize = (TQFontMetrics(options()->font(true)).height() + 1) & 0x3e;
if (buttonSize < 16) buttonSize = 16;
KConfig conf("kwinb2rc");
@@ -108,7 +108,7 @@ static void read_config(B2ClientFactory *f)
do_draw_handle = conf.readBoolEntry("DrawGrabHandle", true);
drawSmallBorders = !options()->moveResizeMaximizedWindows();
- QString opString = conf.readEntry("MenuButtonDoubleClickOperation", "NoOp");
+ TQString opString = conf.readEntry("MenuButtonDoubleClickOperation", "NoOp");
if (opString == "Close") {
menu_dbl_click_op = B2::CloseOp;
} else if (opString == "Minimize") {
@@ -140,15 +140,15 @@ static void read_config(B2ClientFactory *f)
}
}
-static void drawB2Rect(KPixmap *pix, const QColor &primary, bool down)
+static void drawB2Rect(KPixmap *pix, const TQColor &primary, bool down)
{
- QPainter p(pix);
- QColor hColor = primary.light(150);
- QColor lColor = primary.dark(150);
+ TQPainter p(pix);
+ TQColor hColor = primary.light(150);
+ TQColor lColor = primary.dark(150);
if (down) qSwap(hColor, lColor);
- if (QPixmap::defaultDepth() > 8) {
+ if (TQPixmap::defaultDepth() > 8) {
KPixmapEffect::gradient(*pix, hColor, lColor,
KPixmapEffect::DiagonalGradient);
}
@@ -166,7 +166,7 @@ static void drawB2Rect(KPixmap *pix, const QColor &primary, bool down)
}
-QPixmap* kwin_get_menu_pix_hack()
+TQPixmap* kwin_get_menu_pix_hack()
{
//return menu_pix; FIXME
return PIXMAP_A(P_MENU);
@@ -200,27 +200,27 @@ static void create_pixmaps()
// there seems to be no way to load X bitmaps from data properly, so
// we need to create new ones for each mask :P
- QBitmap pinupMask(16, 16, pinup_mask_bits, true);
+ TQBitmap pinupMask(16, 16, pinup_mask_bits, true);
PIXMAP_A(P_PINUP)->setMask(pinupMask);
PIXMAP_I(P_PINUP)->setMask(pinupMask);
- QBitmap pindownMask(16, 16, pindown_mask_bits, true);
+ TQBitmap pindownMask(16, 16, pindown_mask_bits, true);
PIXMAP_AD(P_PINUP)->setMask(pindownMask);
PIXMAP_ID(P_PINUP)->setMask(pindownMask);
- QBitmap menuMask(16, 16, menu_mask_bits, true);
+ TQBitmap menuMask(16, 16, menu_mask_bits, true);
for (i = 0; i < NumStates; i++)
pixmap[P_MENU * NumStates + i]->setMask(menuMask);
- QBitmap helpMask(16, 16, help_mask_bits, true);
+ TQBitmap helpMask(16, 16, help_mask_bits, true);
for (i = 0; i < NumStates; i++)
pixmap[P_HELP * NumStates + i]->setMask(helpMask);
- QBitmap normalizeMask(16, 16, true);
+ TQBitmap normalizeMask(16, 16, true);
// draw normalize icon mask
- QPainter mask;
+ TQPainter mask;
mask.begin(&normalizeMask);
- QBrush one(Qt::color1);
+ TQBrush one(Qt::color1);
mask.fillRect(normalizeMask.width() - 12, normalizeMask.height() - 12,
12, 12, one);
mask.fillRect(0, 0, 10, 10, one);
@@ -229,7 +229,7 @@ static void create_pixmaps()
for (i = 0; i < NumStates; i++)
pixmap[P_NORMALIZE * NumStates + i]->setMask(normalizeMask);
- QBitmap shadeMask(bsize, bsize, true);
+ TQBitmap shadeMask(bsize, bsize, true);
mask.begin(&shadeMask);
mask.fillRect(0, 0, bsize, 6, one);
mask.end();
@@ -311,10 +311,10 @@ bool B2ClientFactory::supports( Ability ability )
};
}
-QValueList< B2ClientFactory::BorderSize > B2ClientFactory::borderSizes() const
+TQValueList< B2ClientFactory::BorderSize > B2ClientFactory::borderSizes() const
{
// the list must be sorted
- return QValueList< BorderSize >() << BorderTiny << BorderNormal <<
+ return TQValueList< BorderSize >() << BorderTiny << BorderNormal <<
BorderLarge << BorderVeryLarge << BorderHuge;
}
@@ -342,7 +342,7 @@ B2Client::B2Client(KDecorationBridge *b, KDecorationFactory *f)
void B2Client::init()
{
- const QString tips[] = {
+ const TQString tips[] = {
i18n("Menu"),
isOnAllDesktops() ?
i18n("Not on all desktops") : i18n("On all desktops"),
@@ -364,35 +364,35 @@ void B2Client::init()
for (int i = 0; i < BtnCount; i++)
button[i] = NULL;
- g = new QGridLayout(widget(), 3, 3);
+ g = new TQGridLayout(widget(), 3, 3);
// Left and right border width
- leftSpacer = new QSpacerItem(thickness, 16,
- QSizePolicy::Fixed, QSizePolicy::Expanding);
- rightSpacer = new QSpacerItem(thickness, 16,
- QSizePolicy::Fixed, QSizePolicy::Expanding);
+ leftSpacer = new TQSpacerItem(thickness, 16,
+ TQSizePolicy::Fixed, TQSizePolicy::Expanding);
+ rightSpacer = new TQSpacerItem(thickness, 16,
+ TQSizePolicy::Fixed, TQSizePolicy::Expanding);
g->addItem(leftSpacer, 1, 0);
g->addItem(rightSpacer, 1, 2);
// Top border height
- topSpacer = new QSpacerItem(10, buttonSize + 4,
- QSizePolicy::Expanding, QSizePolicy::Fixed);
+ topSpacer = new TQSpacerItem(10, buttonSize + 4,
+ TQSizePolicy::Expanding, TQSizePolicy::Fixed);
g->addItem(topSpacer, 0, 1);
// Bottom border height.
- bottomSpacer = new QSpacerItem(10,
+ bottomSpacer = new TQSpacerItem(10,
thickness + (mustDrawHandle() ? 4 : 0),
- QSizePolicy::Expanding, QSizePolicy::Fixed);
+ TQSizePolicy::Expanding, TQSizePolicy::Fixed);
g->addItem(bottomSpacer, 2, 1);
if (isPreview()) {
- QLabel *previewLabel = new QLabel(
+ TQLabel *previewLabel = new TQLabel(
i18n("<b><center>B II preview</center></b>"),
widget());
g->addWidget(previewLabel, 1, 1);
} else {
- g->addItem(new QSpacerItem(0, 0), 1, 1);
+ g->addItem(new TQSpacerItem(0, 0), 1, 1);
}
// titlebar
@@ -402,8 +402,8 @@ void B2Client::init()
titlebar->setMinimumWidth(buttonSize + 4);
titlebar->setFixedHeight(buttonSize + 4);
- QBoxLayout *titleLayout = new QBoxLayout(titlebar,
- QBoxLayout::LeftToRight, 0, 1, 0);
+ TQBoxLayout *titleLayout = new TQBoxLayout(titlebar,
+ TQBoxLayout::LeftToRight, 0, 1, 0);
titleLayout->addSpacing(3);
if (options()->customButtonPositions()) {
@@ -418,8 +418,8 @@ void B2Client::init()
titleLayout->addSpacing(3);
- QColor c = options()->colorGroup(KDecoration::ColorTitleBar, isActive()).
- color(QColorGroup::Button);
+ TQColor c = options()->colorGroup(KDecoration::ColorTitleBar, isActive()).
+ color(TQColorGroup::Button);
for (int i = 0; i < BtnCount; i++) {
if (button[i])
@@ -432,8 +432,8 @@ void B2Client::init()
titlebar->installEventFilter(this);
}
-void B2Client::addButtons(const QString& s, const QString tips[],
- B2Titlebar* tb, QBoxLayout* titleLayout)
+void B2Client::addButtons(const TQString& s, const TQString tips[],
+ B2Titlebar* tb, TQBoxLayout* titleLayout)
{
if (s.length() <= 0)
return;
@@ -446,8 +446,8 @@ void B2Client::addButtons(const QString& s, const QString tips[],
LeftButton | RightButton);
button[BtnMenu]->setPixmaps(P_MENU);
button[BtnMenu]->setUseMiniIcon();
- connect(button[BtnMenu], SIGNAL(pressed()),
- this, SLOT(menuButtonPressed()));
+ connect(button[BtnMenu], TQT_SIGNAL(pressed()),
+ this, TQT_SLOT(menuButtonPressed()));
titleLayout->addWidget(button[BtnMenu]);
}
break;
@@ -457,8 +457,8 @@ void B2Client::addButtons(const QString& s, const QString tips[],
button[BtnSticky]->setPixmaps(P_PINUP);
button[BtnSticky]->setToggle();
button[BtnSticky]->setDown(isOnAllDesktops());
- connect(button[BtnSticky], SIGNAL(clicked()),
- this, SLOT(toggleOnAllDesktops()));
+ connect(button[BtnSticky], TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(toggleOnAllDesktops()));
titleLayout->addWidget(button[BtnSticky]);
}
break;
@@ -466,8 +466,8 @@ void B2Client::addButtons(const QString& s, const QString tips[],
if (providesContextHelp() && (!button[BtnHelp])) {
button[BtnHelp] = new B2Button(this, tb, tips[BtnHelp]);
button[BtnHelp]->setPixmaps(P_HELP);
- connect(button[BtnHelp], SIGNAL(clicked()),
- this, SLOT(showContextHelp()));
+ connect(button[BtnHelp], TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(showContextHelp()));
titleLayout->addWidget(button[BtnHelp]);
}
break;
@@ -475,8 +475,8 @@ void B2Client::addButtons(const QString& s, const QString tips[],
if (isMinimizable() && (!button[BtnIconify])) {
button[BtnIconify] = new B2Button(this, tb,tips[BtnIconify]);
button[BtnIconify]->setPixmaps(P_ICONIFY);
- connect(button[BtnIconify], SIGNAL(clicked()),
- this, SLOT(minimize()));
+ connect(button[BtnIconify], TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(minimize()));
titleLayout->addWidget(button[BtnIconify]);
}
break;
@@ -486,8 +486,8 @@ void B2Client::addButtons(const QString& s, const QString tips[],
LeftButton | MidButton | RightButton);
button[BtnMax]->setPixmaps(maximizeMode() == MaximizeFull ?
P_NORMALIZE : P_MAX);
- connect(button[BtnMax], SIGNAL(clicked()),
- this, SLOT(maxButtonClicked()));
+ connect(button[BtnMax], TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(maxButtonClicked()));
titleLayout->addWidget(button[BtnMax]);
}
break;
@@ -495,8 +495,8 @@ void B2Client::addButtons(const QString& s, const QString tips[],
if (isCloseable() && !button[BtnClose]) {
button[BtnClose] = new B2Button(this, tb, tips[BtnClose]);
button[BtnClose]->setPixmaps(P_CLOSE);
- connect(button[BtnClose], SIGNAL(clicked()),
- this, SLOT(closeWindow()));
+ connect(button[BtnClose], TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(closeWindow()));
titleLayout->addWidget(button[BtnClose]);
}
break;
@@ -504,8 +504,8 @@ void B2Client::addButtons(const QString& s, const QString tips[],
if (isShadeable() && !button[BtnShade]) {
button[BtnShade] = new B2Button(this, tb, tips[BtnShade]);
button[BtnShade]->setPixmaps(P_SHADE);
- connect(button[BtnShade], SIGNAL(clicked()),
- this, SLOT(shadeButtonClicked()));
+ connect(button[BtnShade], TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(shadeButtonClicked()));
titleLayout->addWidget(button[BtnShade]);
}
break;
@@ -513,8 +513,8 @@ void B2Client::addButtons(const QString& s, const QString tips[],
if (resizable && !button[BtnResize]) {
button[BtnResize] = new B2Button(this, tb, tips[BtnResize]);
button[BtnResize]->setPixmaps(P_RESIZE);
- connect(button[BtnResize], SIGNAL(pressed()),
- this, SLOT(resizeButtonPressed()));
+ connect(button[BtnResize], TQT_SIGNAL(pressed()),
+ this, TQT_SLOT(resizeButtonPressed()));
titleLayout->addWidget(button[BtnResize]);
}
break;
@@ -575,7 +575,7 @@ void B2Client::calcHiddenButtons()
}
}
-void B2Client::resizeEvent(QResizeEvent * /*e*/)
+void B2Client::resizeEvent(TQResizeEvent * /*e*/)
{
calcHiddenButtons();
titlebar->layout()->activate();
@@ -598,14 +598,14 @@ void B2Client::captionChange()
titlebar->repaint(false);
}
-void B2Client::paintEvent(QPaintEvent* e)
+void B2Client::paintEvent(TQPaintEvent* e)
{
- QPainter p(widget());
+ TQPainter p(widget());
KDecoration::ColorType frameColorGroup = colored_frame ?
KDecoration::ColorTitleBar : KDecoration::ColorFrame;
- QRect t = titlebar->geometry();
+ TQRect t = titlebar->geometry();
// Frame height, this is used a lot of times
int fHeight = height() - t.height();
@@ -614,8 +614,8 @@ void B2Client::paintEvent(QPaintEvent* e)
int bb = mustDrawHandle() ? 4 : 0;
int bDepth = thickness + bb;
- QColorGroup fillColor = options()->colorGroup(frameColorGroup, isActive());
- QBrush fillBrush(options()->color(frameColorGroup, isActive()));
+ TQColorGroup fillColor = options()->colorGroup(frameColorGroup, isActive());
+ TQBrush fillBrush(options()->color(frameColorGroup, isActive()));
// outer frame rect
p.drawRect(0, t.bottom() - thickness + 1,
@@ -690,7 +690,7 @@ void B2Client::paintEvent(QPaintEvent* e)
*/
if (titlebar->isFullyObscured()) {
/* We first see, if our repaint contained the titlebar area */
- QRegion reg(QRect(0, 0, width(), buttonSize + 4));
+ TQRegion reg(TQRect(0, 0, width(), buttonSize + 4));
reg = reg.intersect(e->region());
if (!reg.isEmpty())
unobscureTitlebar();
@@ -699,49 +699,49 @@ void B2Client::paintEvent(QPaintEvent* e)
void B2Client::doShape()
{
- QRect t = titlebar->geometry();
- QRegion mask(widget()->rect());
+ TQRect t = titlebar->geometry();
+ TQRegion mask(widget()->rect());
// top to the tilebar right
if (bar_x_ofs) {
// left from bar
- mask -= QRect(0, 0, bar_x_ofs, t.height() - thickness);
+ mask -= TQRect(0, 0, bar_x_ofs, t.height() - thickness);
// top left point
- mask -= QRect(0, t.height() - thickness, 1, 1);
+ mask -= TQRect(0, t.height() - thickness, 1, 1);
}
if (t.right() < width() - 1) {
- mask -= QRect(width() - 1,
+ mask -= TQRect(width() - 1,
t.height() - thickness, 1, 1); //top right point
- mask -= QRect(t.right() + 1, 0,
+ mask -= TQRect(t.right() + 1, 0,
width() - t.right() - 1, t.height() - thickness);
}
// bottom right point
- mask -= QRect(width() - 1, height() - 1, 1, 1);
+ mask -= TQRect(width() - 1, height() - 1, 1, 1);
if (mustDrawHandle()) {
// bottom left point
- mask -= QRect(0, height() - 5, 1, 1);
+ mask -= TQRect(0, height() - 5, 1, 1);
// handle left point
- mask -= QRect(width() - 40, height() - 1, 1, 1);
+ mask -= TQRect(width() - 40, height() - 1, 1, 1);
// bottom left
- mask -= QRect(0, height() - 4, width() - 40, 4);
+ mask -= TQRect(0, height() - 4, width() - 40, 4);
} else {
// bottom left point
- mask -= QRect(0, height() - 1, 1, 1);
+ mask -= TQRect(0, height() - 1, 1, 1);
}
setMask(mask);
}
-void B2Client::showEvent(QShowEvent *)
+void B2Client::showEvent(TQShowEvent *)
{
calcHiddenButtons();
positionButtons();
doShape();
}
-KDecoration::Position B2Client::mousePosition(const QPoint& p) const
+KDecoration::Position B2Client::mousePosition(const TQPoint& p) const
{
const int range = 16;
- QRect t = titlebar->geometry();
+ TQRect t = titlebar->geometry();
t.setHeight(buttonSize + 4 - thickness);
int ly = t.bottom();
int lx = t.right();
@@ -809,8 +809,8 @@ void B2Client::desktopChange()
bool on = isOnAllDesktops();
if (B2Button *b = button[BtnSticky]) {
b->setDown(on);
- QToolTip::remove(b);
- QToolTip::add(b,
+ TQToolTip::remove(b);
+ TQToolTip::add(b,
on ? i18n("Not on all desktops") : i18n("On all desktops"));
}
}
@@ -821,12 +821,12 @@ void B2Client::maximizeChange()
if (button[BtnMax]) {
button[BtnMax]->setPixmaps(m ? P_NORMALIZE : P_MAX);
button[BtnMax]->repaint();
- QToolTip::remove(button[BtnMax]);
- QToolTip::add(button[BtnMax],
+ TQToolTip::remove(button[BtnMax]);
+ TQToolTip::add(button[BtnMax],
m ? i18n("Restore") : i18n("Maximize"));
}
bottomSpacer->changeSize(10, thickness + (mustDrawHandle() ? 4 : 0),
- QSizePolicy::Expanding, QSizePolicy::Minimum);
+ TQSizePolicy::Expanding, TQSizePolicy::Minimum);
g->activate();
doShape();
@@ -838,8 +838,8 @@ void B2Client::activeChange()
widget()->repaint(false);
titlebar->repaint(false);
- QColor c = options()->colorGroup(
- KDecoration::ColorTitleBar, isActive()).color(QColorGroup::Button);
+ TQColor c = options()->colorGroup(
+ KDecoration::ColorTitleBar, isActive()).color(TQColorGroup::Button);
for (int i = 0; i < BtnCount; i++)
if (button[i]) {
@@ -851,23 +851,23 @@ void B2Client::activeChange()
void B2Client::shadeChange()
{
bottomSpacer->changeSize(10, thickness + (mustDrawHandle() ? 4 : 0),
- QSizePolicy::Expanding, QSizePolicy::Minimum);
+ TQSizePolicy::Expanding, TQSizePolicy::Minimum);
g->activate();
doShape();
if (B2Button *b = button[BtnShade]) {
- QToolTip::remove(b);
- QToolTip::add(b, isSetShade() ? i18n("Unshade") : i18n("Shade"));
+ TQToolTip::remove(b);
+ TQToolTip::add(b, isSetShade() ? i18n("Unshade") : i18n("Shade"));
}
}
-QSize B2Client::minimumSize() const
+TQSize B2Client::minimumSize() const
{
int left, right, top, bottom;
borders(left, right, top, bottom);
- return QSize(left + right + 2 * buttonSize, top + bottom);
+ return TQSize(left + right + 2 * buttonSize, top + bottom);
}
-void B2Client::resize(const QSize& s)
+void B2Client::resize(const TQSize& s)
{
widget()->resize(s);
}
@@ -884,15 +884,15 @@ void B2Client::menuButtonPressed()
static B2Client *lastClient = NULL;
bool dbl = (lastClient == this &&
- time.elapsed() <= QApplication::doubleClickInterval());
+ time.elapsed() <= TQApplication::doubleClickInterval());
lastClient = this;
time.start();
if (!dbl) {
KDecorationFactory* f = factory();
- QRect menuRect = button[BtnMenu]->rect();
- QPoint menuTop = button[BtnMenu]->mapToGlobal(menuRect.topLeft());
- QPoint menuBottom = button[BtnMenu]->mapToGlobal(menuRect.bottomRight());
- showWindowMenu(QRect(menuTop, menuBottom));
+ TQRect menuRect = button[BtnMenu]->rect();
+ TQPoint menuTop = button[BtnMenu]->mapToGlobal(menuRect.topLeft());
+ TQPoint menuBottom = button[BtnMenu]->mapToGlobal(menuRect.bottomRight());
+ showWindowMenu(TQRect(menuTop, menuBottom));
if (!f->exists(this)) // 'this' was destroyed
return;
button[BtnMenu]->setDown(false);
@@ -924,7 +924,7 @@ void B2Client::unobscureTitlebar()
return;
}
in_unobs = 1;
- QRegion reg(QRect(0,0,width(), buttonSize + 4));
+ TQRegion reg(TQRect(0,0,width(), buttonSize + 4));
reg = unobscuredRegion(reg);
if (!reg.isEmpty()) {
// there is at least _one_ pixel from our title area, which is not
@@ -939,8 +939,8 @@ void B2Client::unobscureTitlebar()
static void redraw_pixmaps()
{
int i;
- QColorGroup aGrp = options()->colorGroup(KDecoration::ColorButtonBg, true);
- QColorGroup iGrp = options()->colorGroup(KDecoration::ColorButtonBg, false);
+ TQColorGroup aGrp = options()->colorGroup(KDecoration::ColorButtonBg, true);
+ TQColorGroup iGrp = options()->colorGroup(KDecoration::ColorButtonBg, false);
// close
drawB2Rect(PIXMAP_A(P_CLOSE), aGrp.button(), false);
@@ -958,7 +958,7 @@ static void redraw_pixmaps()
bool is_act = (i < 2);
bool is_down = ((i & 1) == 1);
KPixmap *pix = pixmap[P_SHADE * NumStates + i];
- QColor color = is_act ? aGrp.button() : iGrp.button();
+ TQColor color = is_act ? aGrp.button() : iGrp.button();
drawB2Rect(&thinBox, color, is_down);
pix->fill(Qt::black);
bitBlt(pix, 0, 0, &thinBox,
@@ -1004,7 +1004,7 @@ static void redraw_pixmaps()
}
- QPainter p;
+ TQPainter p;
// x for close + menu + help
for (int j = 0; j < 3; j++) {
int pix;
@@ -1043,7 +1043,7 @@ static void redraw_pixmaps()
// Apply the hilight effect to the 'Hover' icons
KIconEffect ie;
- QPixmap hilighted;
+ TQPixmap hilighted;
for (i = 0; i < P_NUM_BUTTON_TYPES; i++) {
int offset = i * NumStates;
hilighted = ie.apply(*pixmap[offset + Norm],
@@ -1057,8 +1057,8 @@ static void redraw_pixmaps()
// Create the titlebar gradients
- if (QPixmap::defaultDepth() > 8) {
- QColor titleColor[4] = {
+ if (TQPixmap::defaultDepth() > 8) {
+ TQColor titleColor[4] = {
options()->color(KDecoration::ColorTitleBar, true),
options()->color(KDecoration::ColorFrame, true),
@@ -1090,13 +1090,13 @@ static void redraw_pixmaps()
void B2Client::positionButtons()
{
- QFontMetrics fm(options()->font(isActive()));
- QString cap = caption();
+ TQFontMetrics fm(options()->font(isActive()));
+ TQString cap = caption();
if (cap.length() < 5) // make sure the titlebar has sufficiently wide
cap = "XXXXX"; // area for dragging the window
int textLen = fm.width(cap);
- QRect t = titlebar->captionSpacer->geometry();
+ TQRect t = titlebar->captionSpacer->geometry();
int titleWidth = titlebar->width() - t.width() + textLen + 2;
if (titleWidth > width()) titleWidth = width();
@@ -1106,24 +1106,24 @@ void B2Client::positionButtons()
// Transparent bound stuff.
-static QRect *visible_bound;
-static QPointArray bound_shape;
+static TQRect *visible_bound;
+static TQPointArray bound_shape;
-bool B2Client::drawbound(const QRect& geom, bool clear)
+bool B2Client::drawbound(const TQRect& geom, bool clear)
{
if (clear) {
if (!visible_bound) return true;
}
if (!visible_bound) {
- visible_bound = new QRect(geom);
- QRect t = titlebar->geometry();
+ visible_bound = new TQRect(geom);
+ TQRect t = titlebar->geometry();
int frameTop = geom.top() + t.bottom();
int barLeft = geom.left() + bar_x_ofs;
int barRight = barLeft + t.width() - 1;
if (barRight > geom.right()) barRight = geom.right();
// line width is 5 pixels, so compensate for the 2 outer pixels (#88657)
- QRect g = geom;
+ TQRect g = geom;
g.setLeft( g.left() + 2 );
g.setTop( g.top() + 2 );
g.setRight( g.right() - 2 );
@@ -1144,8 +1144,8 @@ bool B2Client::drawbound(const QRect& geom, bool clear)
} else {
*visible_bound = geom;
}
- QPainter p(workspaceWidget());
- p.setPen(QPen(Qt::white, 5));
+ TQPainter p(workspaceWidget());
+ p.setPen(TQPen(Qt::white, 5));
p.setRasterOp(Qt::XorROP);
p.drawPolygon(bound_shape);
@@ -1156,28 +1156,28 @@ bool B2Client::drawbound(const QRect& geom, bool clear)
return true;
}
-bool B2Client::eventFilter(QObject *o, QEvent *e)
+bool B2Client::eventFilter(TQObject *o, TQEvent *e)
{
if (o != widget())
return false;
switch (e->type()) {
- case QEvent::Resize:
- resizeEvent(static_cast< QResizeEvent* >(e));
+ case TQEvent::Resize:
+ resizeEvent(static_cast< TQResizeEvent* >(e));
return true;
- case QEvent::Paint:
- paintEvent(static_cast< QPaintEvent* >(e));
+ case TQEvent::Paint:
+ paintEvent(static_cast< TQPaintEvent* >(e));
return true;
- case QEvent::MouseButtonDblClick:
- titlebar->mouseDoubleClickEvent(static_cast< QMouseEvent* >(e));
+ case TQEvent::MouseButtonDblClick:
+ titlebar->mouseDoubleClickEvent(static_cast< TQMouseEvent* >(e));
return true;
- case QEvent::Wheel:
- titlebar->wheelEvent(static_cast< QWheelEvent* >(e));
+ case TQEvent::Wheel:
+ titlebar->wheelEvent(static_cast< TQWheelEvent* >(e));
return true;
- case QEvent::MouseButtonPress:
- processMousePressEvent(static_cast< QMouseEvent* >(e));
+ case TQEvent::MouseButtonPress:
+ processMousePressEvent(static_cast< TQMouseEvent* >(e));
return true;
- case QEvent::Show:
- showEvent(static_cast< QShowEvent* >(e));
+ case TQEvent::Show:
+ showEvent(static_cast< TQShowEvent* >(e));
return true;
default:
break;
@@ -1187,9 +1187,9 @@ bool B2Client::eventFilter(QObject *o, QEvent *e)
// =====================================
-B2Button::B2Button(B2Client *_client, QWidget *parent,
- const QString& tip, const int realizeBtns)
- : QButton(parent, 0), hover(false)
+B2Button::B2Button(B2Client *_client, TQWidget *parent,
+ const TQString& tip, const int realizeBtns)
+ : TQButton(parent, 0), hover(false)
{
setBackgroundMode(NoBackground);
setCursor(arrowCursor);
@@ -1197,21 +1197,21 @@ B2Button::B2Button(B2Client *_client, QWidget *parent,
client = _client;
useMiniIcon = false;
setFixedSize(buttonSize, buttonSize);
- QToolTip::add(this, tip);
+ TQToolTip::add(this, tip);
}
-QSize B2Button::sizeHint() const
+TQSize B2Button::sizeHint() const
{
- return QSize(buttonSize, buttonSize);
+ return TQSize(buttonSize, buttonSize);
}
-QSizePolicy B2Button::sizePolicy() const
+TQSizePolicy B2Button::sizePolicy() const
{
- return(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+ return(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
}
-void B2Button::drawButton(QPainter *p)
+void B2Button::drawButton(TQPainter *p)
{
KPixmap* gradient = titleGradient[client->isActive() ? 0 : 1];
if (gradient) {
@@ -1220,8 +1220,8 @@ void B2Button::drawButton(QPainter *p)
p->fillRect(rect(), bg);
}
if (useMiniIcon) {
- QPixmap miniIcon = client->icon().pixmap(QIconSet::Small,
- client->isActive() ? QIconSet::Normal : QIconSet::Disabled);
+ TQPixmap miniIcon = client->icon().pixmap(TQIconSet::Small,
+ client->isActive() ? TQIconSet::Normal : TQIconSet::Disabled);
p->drawPixmap((width() - miniIcon.width()) / 2,
(height() - miniIcon.height()) / 2, miniIcon);
} else {
@@ -1255,48 +1255,48 @@ void B2Button::setPixmaps(int button_id)
repaint(false);
}
-void B2Button::mousePressEvent(QMouseEvent * e)
+void B2Button::mousePressEvent(TQMouseEvent * e)
{
last_button = e->button();
- QMouseEvent me(e->type(), e->pos(), e->globalPos(),
+ TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
(e->button() & realizeButtons) ? LeftButton : NoButton,
e->state());
- QButton::mousePressEvent(&me);
+ TQButton::mousePressEvent(&me);
}
-void B2Button::mouseReleaseEvent(QMouseEvent * e)
+void B2Button::mouseReleaseEvent(TQMouseEvent * e)
{
last_button = e->button();
- QMouseEvent me(e->type(), e->pos(), e->globalPos(),
+ TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
(e->button() & realizeButtons) ? LeftButton : NoButton,
e->state());
- QButton::mouseReleaseEvent(&me);
+ TQButton::mouseReleaseEvent(&me);
}
-void B2Button::enterEvent(QEvent *e)
+void B2Button::enterEvent(TQEvent *e)
{
hover = true;
repaint(false);
- QButton::enterEvent(e);
+ TQButton::enterEvent(e);
}
-void B2Button::leaveEvent(QEvent *e)
+void B2Button::leaveEvent(TQEvent *e)
{
hover = false;
repaint(false);
- QButton::leaveEvent(e);
+ TQButton::leaveEvent(e);
}
// =====================================
B2Titlebar::B2Titlebar(B2Client *parent)
- : QWidget(parent->widget(), 0, WStyle_Customize | WRepaintNoErase),
+ : TQWidget(parent->widget(), 0, WStyle_Customize | WRepaintNoErase),
client(parent),
set_x11mask(false), isfullyobscured(false), shift_move(false)
{
setBackgroundMode(NoBackground);
- captionSpacer = new QSpacerItem(buttonSize, buttonSize + 4,
- QSizePolicy::Expanding, QSizePolicy::Fixed);
+ captionSpacer = new TQSpacerItem(buttonSize, buttonSize + 4,
+ TQSizePolicy::Expanding, TQSizePolicy::Fixed);
}
bool B2Titlebar::x11Event(XEvent *e)
@@ -1326,14 +1326,14 @@ bool B2Titlebar::x11Event(XEvent *e)
default:
break;
}
- return QWidget::x11Event(e);
+ return TQWidget::x11Event(e);
}
-void B2Titlebar::drawTitlebar(QPainter &p, bool state)
+void B2Titlebar::drawTitlebar(TQPainter &p, bool state)
{
KPixmap* gradient = titleGradient[state ? 0 : 1];
- QRect t = rect();
+ TQRect t = rect();
// black titlebar frame
p.setPen(Qt::black);
p.drawLine(0, 0, 0, t.bottom());
@@ -1341,9 +1341,9 @@ void B2Titlebar::drawTitlebar(QPainter &p, bool state)
p.drawLine(t.right(), 0, t.right(), t.bottom());
// titlebar fill
- const QColorGroup cg =
+ const TQColorGroup cg =
options()->colorGroup(KDecoration::ColorTitleBar, state);
- QBrush brush(cg.background());
+ TQBrush brush(cg.background());
if (gradient) brush.setPixmap(*gradient);
qDrawShadeRect(&p, 1, 1, t.right() - 1, t.height() - 1,
cg, false, 1, 0, &brush);
@@ -1359,43 +1359,43 @@ void B2Titlebar::recalcBuffer()
{
titleBuffer.resize(width(), height());
- QPainter p(&titleBuffer);
+ TQPainter p(&titleBuffer);
drawTitlebar(p, true);
oldTitle = caption();
}
-void B2Titlebar::resizeEvent(QResizeEvent *)
+void B2Titlebar::resizeEvent(TQResizeEvent *)
{
recalcBuffer();
repaint(false);
}
-void B2Titlebar::paintEvent(QPaintEvent *)
+void B2Titlebar::paintEvent(TQPaintEvent *)
{
if(client->isActive())
bitBlt(this, 0, 0, &titleBuffer, 0, 0, titleBuffer.width(),
titleBuffer.height(), Qt::CopyROP, true);
else {
- QPainter p(this);
+ TQPainter p(this);
drawTitlebar(p, false);
}
}
-void B2Titlebar::mouseDoubleClickEvent(QMouseEvent *e)
+void B2Titlebar::mouseDoubleClickEvent(TQMouseEvent *e)
{
if (e->button() == LeftButton && e->y() < height()) {
client->titlebarDblClickOperation();
}
}
-void B2Titlebar::wheelEvent(QWheelEvent *e)
+void B2Titlebar::wheelEvent(TQWheelEvent *e)
{
if (client->isSetShade() || rect().contains(e->pos()))
client->titlebarMouseWheelOperation( e->delta());
}
-void B2Titlebar::mousePressEvent(QMouseEvent * e)
+void B2Titlebar::mousePressEvent(TQMouseEvent * e)
{
shift_move = e->state() & ShiftButton;
if (shift_move) {
@@ -1405,13 +1405,13 @@ void B2Titlebar::mousePressEvent(QMouseEvent * e)
}
}
-void B2Titlebar::mouseReleaseEvent(QMouseEvent * e)
+void B2Titlebar::mouseReleaseEvent(TQMouseEvent * e)
{
if (shift_move) shift_move = false;
else e->ignore();
}
-void B2Titlebar::mouseMoveEvent(QMouseEvent * e)
+void B2Titlebar::mouseMoveEvent(TQMouseEvent * e)
{
if (shift_move) {
int oldx = mapFromGlobal(moveOffset).x();
diff --git a/kwin/clients/b2/b2client.h b/kwin/clients/b2/b2client.h
index 008b65af3..7df9a2f7d 100644
--- a/kwin/clients/b2/b2client.h
+++ b/kwin/clients/b2/b2client.h
@@ -9,10 +9,10 @@
#ifndef __B2CLIENT_H
#define __B2CLIENT_H
-#include <qvariant.h>
-#include <qdatetime.h>
-#include <qbutton.h>
-#include <qbitmap.h>
+#include <tqvariant.h>
+#include <tqdatetime.h>
+#include <tqbutton.h>
+#include <tqbitmap.h>
#include <kpixmap.h>
#include <kdecoration.h>
#include <kdecorationfactory.h>
@@ -28,31 +28,31 @@ class B2Client;
class B2Button : public QButton
{
public:
- B2Button(B2Client *_client=0, QWidget *parent=0, const QString& tip=NULL, const int realizeBtns = LeftButton);
+ B2Button(B2Client *_client=0, TQWidget *parent=0, const TQString& tip=NULL, const int realizeBtns = LeftButton);
~B2Button() {};
- void setBg(const QColor &c){bg = c;}
+ void setBg(const TQColor &c){bg = c;}
void setPixmaps(KPixmap *pix, KPixmap *pixDown, KPixmap *iPix,
KPixmap *iPixDown);
void setPixmaps(int button_id);
void setToggle(){setToggleType(Toggle);}
void setActive(bool on){setOn(on);}
void setUseMiniIcon(){useMiniIcon = true;}
- QSize sizeHint() const;
- QSizePolicy sizePolicy() const;
+ TQSize sizeHint() const;
+ TQSizePolicy sizePolicy() const;
protected:
- virtual void drawButton(QPainter *p);
- void drawButtonLabel(QPainter *){;}
+ virtual void drawButton(TQPainter *p);
+ void drawButtonLabel(TQPainter *){;}
- void mousePressEvent( QMouseEvent* e );
- void mouseReleaseEvent( QMouseEvent* e );
+ void mousePressEvent( TQMouseEvent* e );
+ void mouseReleaseEvent( TQMouseEvent* e );
private:
- void enterEvent(QEvent *e);
- void leaveEvent(QEvent *e);
+ void enterEvent(TQEvent *e);
+ void leaveEvent(TQEvent *e);
bool useMiniIcon;
KPixmap *icon[6];
- QColor bg; //only use one color (the rest is pixmap) so forget QPalette ;)
+ TQColor bg; //only use one color (the rest is pixmap) so forget TQPalette ;)
public:
B2Client* client;
@@ -69,23 +69,23 @@ public:
~B2Titlebar(){;}
bool isFullyObscured() const {return isfullyobscured;}
void recalcBuffer();
- QSpacerItem *captionSpacer;
+ TQSpacerItem *captionSpacer;
protected:
- void paintEvent( QPaintEvent* );
+ void paintEvent( TQPaintEvent* );
bool x11Event(XEvent *e);
- void mouseDoubleClickEvent( QMouseEvent * );
- void wheelEvent(QWheelEvent *);
- void mousePressEvent( QMouseEvent * );
- void mouseReleaseEvent( QMouseEvent * );
- void mouseMoveEvent(QMouseEvent *);
- void resizeEvent(QResizeEvent *ev);
+ void mouseDoubleClickEvent( TQMouseEvent * );
+ void wheelEvent(TQWheelEvent *);
+ void mousePressEvent( TQMouseEvent * );
+ void mouseReleaseEvent( TQMouseEvent * );
+ void mouseMoveEvent(TQMouseEvent *);
+ void resizeEvent(TQResizeEvent *ev);
private:
- void drawTitlebar(QPainter &p, bool state);
+ void drawTitlebar(TQPainter &p, bool state);
B2Client *client;
- QString oldTitle;
+ TQString oldTitle;
KPixmap titleBuffer;
- QPoint moveOffset;
+ TQPoint moveOffset;
bool set_x11mask;
bool isfullyobscured;
bool shift_move;
@@ -103,12 +103,12 @@ public:
void titleMoveAbs(int new_ofs);
void titleMoveRel(int xdiff);
// transparent stuff
- virtual bool drawbound(const QRect& geom, bool clear);
+ virtual bool drawbound(const TQRect& geom, bool clear);
protected:
- void resizeEvent( QResizeEvent* );
- void paintEvent( QPaintEvent* );
- void showEvent( QShowEvent* );
- void windowWrapperShowEvent( QShowEvent* );
+ void resizeEvent( TQResizeEvent* );
+ void paintEvent( TQPaintEvent* );
+ void showEvent( TQShowEvent* );
+ void windowWrapperShowEvent( TQShowEvent* );
void captionChange();
void desktopChange();
void shadeChange();
@@ -116,11 +116,11 @@ protected:
void maximizeChange();
void iconChange();
void doShape();
- Position mousePosition( const QPoint& p ) const;
- void resize(const QSize&);
+ Position mousePosition( const TQPoint& p ) const;
+ void resize(const TQSize&);
void borders(int &, int &, int &, int &) const;
- QSize minimumSize() const;
- bool eventFilter(QObject *, QEvent *);
+ TQSize minimumSize() const;
+ bool eventFilter(TQObject *, TQEvent *);
private slots:
void menuButtonPressed();
//void slotReset();
@@ -128,8 +128,8 @@ private slots:
void shadeButtonClicked();
void resizeButtonPressed();
private:
- void addButtons(const QString& s, const QString tips[],
- B2Titlebar* tb, QBoxLayout* titleLayout);
+ void addButtons(const TQString& s, const TQString tips[],
+ B2Titlebar* tb, TQBoxLayout* titleLayout);
void positionButtons();
void calcHiddenButtons();
bool mustDrawHandle() const;
@@ -137,20 +137,20 @@ private:
enum ButtonType{BtnMenu=0, BtnSticky, BtnIconify, BtnMax, BtnClose,
BtnHelp, BtnShade, BtnResize, BtnCount};
B2Button* button[BtnCount];
- QGridLayout *g;
+ TQGridLayout *g;
// Border spacers
- QSpacerItem *topSpacer;
- QSpacerItem *bottomSpacer;
- QSpacerItem *leftSpacer;
- QSpacerItem *rightSpacer;
+ TQSpacerItem *topSpacer;
+ TQSpacerItem *bottomSpacer;
+ TQSpacerItem *leftSpacer;
+ TQSpacerItem *rightSpacer;
B2Titlebar *titlebar;
int bar_x_ofs;
int in_unobs;
- QTime time;
+ TQTime time;
bool resizable;
};
-class B2ClientFactory : public QObject, public KDecorationFactory
+class B2ClientFactory : public TQObject, public KDecorationFactory
{
public:
B2ClientFactory();
@@ -158,7 +158,7 @@ public:
virtual KDecoration *createDecoration(KDecorationBridge *);
virtual bool reset(unsigned long changed);
virtual bool supports( Ability ability );
- QValueList< B2ClientFactory::BorderSize > borderSizes() const;
+ TQValueList< B2ClientFactory::BorderSize > borderSizes() const;
};
}
diff --git a/kwin/clients/b2/config/config.cpp b/kwin/clients/b2/config/config.cpp
index d16a90307..ca1dccc65 100644
--- a/kwin/clients/b2/config/config.cpp
+++ b/kwin/clients/b2/config/config.cpp
@@ -8,14 +8,14 @@
#include "config.h"
#include <kglobal.h>
-#include <qwhatsthis.h>
-#include <qvbox.h>
+#include <tqwhatsthis.h>
+#include <tqvbox.h>
#include <klocale.h>
extern "C"
{
- KDE_EXPORT QObject* allocate_config( KConfig* conf, QWidget* parent )
+ KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent )
{
return(new B2Config(conf, parent));
}
@@ -26,43 +26,43 @@ extern "C"
* 'conf' is a pointer to the kwindecoration modules open kwin config,
* and is by default set to the "Style" group.
*
- * 'parent' is the parent of the QObject, which is a VBox inside the
+ * 'parent' is the parent of the TQObject, which is a VBox inside the
* Configure tab in kwindecoration
*/
-B2Config::B2Config( KConfig* conf, QWidget* parent )
- : QObject( parent )
+B2Config::B2Config( KConfig* conf, TQWidget* parent )
+ : TQObject( parent )
{
KGlobal::locale()->insertCatalogue("kwin_b2_config");
b2Config = new KConfig("kwinb2rc");
- gb = new QVBox(parent);
+ gb = new TQVBox(parent);
- cbColorBorder = new QCheckBox(
+ cbColorBorder = new TQCheckBox(
i18n("Draw window frames using &titlebar colors"), gb);
- QWhatsThis::add(cbColorBorder,
+ TQWhatsThis::add(cbColorBorder,
i18n("When selected, the window borders "
"are drawn using the titlebar colors; otherwise, they are "
"drawn using normal border colors."));
// Grab Handle
- showGrabHandleCb = new QCheckBox(
+ showGrabHandleCb = new TQCheckBox(
i18n("Draw &resize handle"), gb);
- QWhatsThis::add(showGrabHandleCb,
+ TQWhatsThis::add(showGrabHandleCb,
i18n("When selected, decorations are drawn with a \"grab handle\" "
"in the bottom right corner of the windows; "
"otherwise, no grab handle is drawn."));
// Double click menu option support
- actionsGB = new QHGroupBox(i18n("Actions Settings"), gb);
- QLabel *menuDblClickLabel = new QLabel(actionsGB);
+ actionsGB = new TQHGroupBox(i18n("Actions Settings"), gb);
+ TQLabel *menuDblClickLabel = new TQLabel(actionsGB);
menuDblClickLabel->setText(i18n("Double click on menu button:"));
- menuDblClickOp = new QComboBox(actionsGB);
+ menuDblClickOp = new TQComboBox(actionsGB);
menuDblClickOp->insertItem(i18n("Do Nothing"));
menuDblClickOp->insertItem(i18n("Minimize Window"));
menuDblClickOp->insertItem(i18n("Shade Window"));
menuDblClickOp->insertItem(i18n("Close Window"));
- QWhatsThis::add(menuDblClickOp,
+ TQWhatsThis::add(menuDblClickOp,
i18n("An action can be associated to a double click "
"of the menu button. Leave it to none if in doubt."));
@@ -70,12 +70,12 @@ B2Config::B2Config( KConfig* conf, QWidget* parent )
load(conf);
// Ensure we track user changes properly
- connect(cbColorBorder, SIGNAL(clicked()),
- this, SLOT(slotSelectionChanged()));
- connect(showGrabHandleCb, SIGNAL(clicked()),
- this, SLOT(slotSelectionChanged()));
- connect(menuDblClickOp, SIGNAL(activated(int)),
- this, SLOT(slotSelectionChanged()));
+ connect(cbColorBorder, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(slotSelectionChanged()));
+ connect(showGrabHandleCb, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(slotSelectionChanged()));
+ connect(menuDblClickOp, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(slotSelectionChanged()));
// Make the widgets visible in kwindecoration
gb->show();
}
@@ -106,7 +106,7 @@ void B2Config::load(KConfig * /*conf*/)
override = b2Config->readBoolEntry( "DrawGrabHandle", true );
showGrabHandleCb->setChecked(override);
- QString returnString = b2Config->readEntry(
+ TQString returnString = b2Config->readEntry(
"MenuButtonDoubleClickOperation", "NoOp");
int op;
@@ -124,7 +124,7 @@ void B2Config::load(KConfig * /*conf*/)
}
-static QString opToString(int op)
+static TQString opToString(int op)
{
switch (op) {
case 1:
diff --git a/kwin/clients/b2/config/config.h b/kwin/clients/b2/config/config.h
index 9985f3f4f..92c255ae6 100644
--- a/kwin/clients/b2/config/config.h
+++ b/kwin/clients/b2/config/config.h
@@ -9,11 +9,11 @@
#ifndef _KDE_B2CONFIG_H
#define _KDE_B2CONFIG_H
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qhgroupbox.h>
-#include <qlabel.h>
-#include <qcombobox.h>
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
+#include <tqhgroupbox.h>
+#include <tqlabel.h>
+#include <tqcombobox.h>
#include <kconfig.h>
class B2Config: public QObject
@@ -21,7 +21,7 @@ class B2Config: public QObject
Q_OBJECT
public:
- B2Config( KConfig* conf, QWidget* parent );
+ B2Config( KConfig* conf, TQWidget* parent );
~B2Config();
// These public signals/slots work similar to KCM modules
@@ -38,11 +38,11 @@ class B2Config: public QObject
private:
KConfig* b2Config;
- QCheckBox* cbColorBorder;
- QCheckBox* showGrabHandleCb;
- QHGroupBox* actionsGB;
- QComboBox* menuDblClickOp;
- QWidget* gb;
+ TQCheckBox* cbColorBorder;
+ TQCheckBox* showGrabHandleCb;
+ TQHGroupBox* actionsGB;
+ TQComboBox* menuDblClickOp;
+ TQWidget* gb;
};
#endif
diff --git a/kwin/clients/default/config/config.cpp b/kwin/clients/default/config/config.cpp
index 2ad494fa9..c98fb1366 100644
--- a/kwin/clients/default/config/config.cpp
+++ b/kwin/clients/default/config/config.cpp
@@ -9,15 +9,15 @@
#include "config.h"
#include <kglobal.h>
-#include <qwhatsthis.h>
+#include <tqwhatsthis.h>
#include <kdialog.h>
#include <klocale.h>
-#include <qpixmap.h>
-#include <qvbox.h>
+#include <tqpixmap.h>
+#include <tqvbox.h>
extern "C"
{
- KDE_EXPORT QObject* allocate_config( KConfig* conf, QWidget* parent )
+ KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent )
{
return(new KDEDefaultConfig(conf, parent));
}
@@ -26,33 +26,33 @@ extern "C"
// NOTE:
// 'conf' is a pointer to the kwindecoration modules open kwin config,
// and is by default set to the "Style" group.
-// 'parent' is the parent of the QObject, which is a VBox inside the
+// 'parent' is the parent of the TQObject, which is a VBox inside the
// Configure tab in kwindecoration
-KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, QWidget* parent )
- : QObject( parent )
+KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, TQWidget* parent )
+ : TQObject( parent )
{
KGlobal::locale()->insertCatalogue("kwin_clients");
- highcolor = QPixmap::defaultDepth() > 8;
- gb = new QVBox( parent );
+ highcolor = TQPixmap::defaultDepth() > 8;
+ gb = new TQVBox( parent );
gb->setSpacing( KDialog::spacingHint() );
- cbShowStipple = new QCheckBox( i18n("Draw titlebar &stipple effect"), gb );
- QWhatsThis::add( cbShowStipple,
+ cbShowStipple = new TQCheckBox( i18n("Draw titlebar &stipple effect"), gb );
+ TQWhatsThis::add( cbShowStipple,
i18n("When selected, active titlebars are drawn "
"with a stipple (dotted) effect; otherwise, they are "
"drawn without the stipple."));
- cbShowGrabBar = new QCheckBox( i18n("Draw g&rab bar below windows"), gb );
- QWhatsThis::add( cbShowGrabBar,
+ cbShowGrabBar = new TQCheckBox( i18n("Draw g&rab bar below windows"), gb );
+ TQWhatsThis::add( cbShowGrabBar,
i18n("When selected, decorations are drawn with a \"grab bar\" "
"below windows; otherwise, no grab bar is drawn."));
// Only show the gradient checkbox for highcolor displays
if (highcolor)
{
- cbUseGradients = new QCheckBox( i18n("Draw &gradients"), gb );
- QWhatsThis::add( cbUseGradients,
+ cbUseGradients = new TQCheckBox( i18n("Draw &gradients"), gb );
+ TQWhatsThis::add( cbUseGradients,
i18n("When selected, decorations are drawn with gradients "
"for high-color displays; otherwise, no gradients are drawn.") );
}
@@ -61,13 +61,13 @@ KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, QWidget* parent )
load( conf );
// Ensure we track user changes properly
- connect( cbShowStipple, SIGNAL(clicked()),
- this, SLOT(slotSelectionChanged()) );
- connect( cbShowGrabBar, SIGNAL(clicked()),
- this, SLOT(slotSelectionChanged()) );
+ connect( cbShowStipple, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(slotSelectionChanged()) );
+ connect( cbShowGrabBar, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(slotSelectionChanged()) );
if (highcolor)
- connect( cbUseGradients, SIGNAL(clicked()),
- this, SLOT(slotSelectionChanged()) );
+ connect( cbUseGradients, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(slotSelectionChanged()) );
// Make the widgets visible in kwindecoration
gb->show();
diff --git a/kwin/clients/default/config/config.h b/kwin/clients/default/config/config.h
index 248d851df..5857910b1 100644
--- a/kwin/clients/default/config/config.h
+++ b/kwin/clients/default/config/config.h
@@ -10,19 +10,19 @@
#ifndef _KDE_DEFAULT_CONFIG_H
#define _KDE_DEFAULT_CONFIG_H
-#include <qcheckbox.h>
-#include <qgroupbox.h>
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
#include <kconfig.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qvbox.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
+#include <tqvbox.h>
class KDEDefaultConfig: public QObject
{
Q_OBJECT
public:
- KDEDefaultConfig( KConfig* conf, QWidget* parent );
+ KDEDefaultConfig( KConfig* conf, TQWidget* parent );
~KDEDefaultConfig();
// These public signals/slots work similar to KCM modules
@@ -38,10 +38,10 @@ class KDEDefaultConfig: public QObject
void slotSelectionChanged(); // Internal use
private:
- QCheckBox* cbShowStipple;
- QCheckBox* cbShowGrabBar;
- QCheckBox* cbUseGradients;
- QVBox* gb;
+ TQCheckBox* cbShowStipple;
+ TQCheckBox* cbShowGrabBar;
+ TQCheckBox* cbUseGradients;
+ TQVBox* gb;
bool highcolor;
};
diff --git a/kwin/clients/default/kdedefault.cpp b/kwin/clients/default/kdedefault.cpp
index aeb1b2065..d91ccf56b 100644
--- a/kwin/clients/default/kdedefault.cpp
+++ b/kwin/clients/default/kdedefault.cpp
@@ -18,13 +18,13 @@
#include <kimageeffect.h>
#include <kdrawutil.h>
#include <klocale.h>
-#include <qlayout.h>
-#include <qdrawutil.h>
-#include <qbitmap.h>
-#include <qimage.h>
-#include <qtooltip.h>
-#include <qapplication.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqdrawutil.h>
+#include <tqbitmap.h>
+#include <tqimage.h>
+#include <tqtooltip.h>
+#include <tqapplication.h>
+#include <tqlabel.h>
#include <kdebug.h>
namespace Default
@@ -116,7 +116,7 @@ static const unsigned char pinup_mask_bits[] = {
// ===========================================================================
-static QPixmap* titlePix;
+static TQPixmap* titlePix;
static KPixmap* titleBuffer;
static KPixmap* aUpperGradient;
static KPixmap* iUpperGradient;
@@ -198,8 +198,8 @@ unsigned long KDEDefaultHandler::readConfig( bool update )
bool new_showGrabBar = conf->readBoolEntry("ShowGrabBar", true);
bool new_showTitleBarStipple = conf->readBoolEntry("ShowTitleBarStipple", true);
bool new_useGradients = conf->readBoolEntry("UseGradients", true);
- int new_titleHeight = QFontMetrics(options()->font(true)).height();
- int new_toolTitleHeight = QFontMetrics(options()->font(true, true)).height()-2;
+ int new_titleHeight = TQFontMetrics(options()->font(true)).height();
+ int new_toolTitleHeight = TQFontMetrics(options()->font(true, true)).height()-2;
int new_borderWidth;
switch(options()->preferredBorderSize(this)) {
@@ -257,16 +257,16 @@ unsigned long KDEDefaultHandler::readConfig( bool update )
// This paints the button pixmaps upon loading the style.
void KDEDefaultHandler::createPixmaps()
{
- bool highcolor = useGradients && (QPixmap::defaultDepth() > 8);
+ bool highcolor = useGradients && (TQPixmap::defaultDepth() > 8);
// Make the titlebar stipple optional
if (showTitleBarStipple)
{
- QPainter p;
- QPainter maskPainter;
+ TQPainter p;
+ TQPainter maskPainter;
int i, x, y;
- titlePix = new QPixmap(132, normalTitleHeight+2);
- QBitmap mask(132, normalTitleHeight+2);
+ titlePix = new TQPixmap(132, normalTitleHeight+2);
+ TQBitmap mask(132, normalTitleHeight+2);
mask.fill(Qt::color0);
p.begin(titlePix);
@@ -288,11 +288,11 @@ void KDEDefaultHandler::createPixmaps()
} else
titlePix = NULL;
- QColor activeTitleColor1(options()->color(ColorTitleBar, true));
- QColor activeTitleColor2(options()->color(ColorTitleBlend, true));
+ TQColor activeTitleColor1(options()->color(ColorTitleBar, true));
+ TQColor activeTitleColor2(options()->color(ColorTitleBlend, true));
- QColor inactiveTitleColor1(options()->color(ColorTitleBar, false));
- QColor inactiveTitleColor2(options()->color(ColorTitleBlend, false));
+ TQColor inactiveTitleColor1(options()->color(ColorTitleBar, false));
+ TQColor inactiveTitleColor2(options()->color(ColorTitleBlend, false));
// Create titlebar gradient images if required
aUpperGradient = NULL;
@@ -324,8 +324,8 @@ void KDEDefaultHandler::createPixmaps()
}
// Set the sticky pin pixmaps;
- QColorGroup g;
- QPainter p;
+ TQColorGroup g;
+ TQPainter p;
// Active pins
g = options()->colorGroup( ColorButtonBg, true );
@@ -335,7 +335,7 @@ void KDEDefaultHandler::createPixmaps()
kColorBitmaps( &p, g, 0, 0, 16, 16, true, pinup_white_bits,
pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL );
p.end();
- pinUpPix->setMask( QBitmap(16, 16, pinup_mask_bits, true) );
+ pinUpPix->setMask( TQBitmap(16, 16, pinup_mask_bits, true) );
pinDownPix = new KPixmap();
pinDownPix->resize(16, 16);
@@ -343,7 +343,7 @@ void KDEDefaultHandler::createPixmaps()
kColorBitmaps( &p, g, 0, 0, 16, 16, true, pindown_white_bits,
pindown_gray_bits, NULL, NULL, pindown_dgray_bits, NULL );
p.end();
- pinDownPix->setMask( QBitmap(16, 16, pindown_mask_bits, true) );
+ pinDownPix->setMask( TQBitmap(16, 16, pindown_mask_bits, true) );
// Inactive pins
g = options()->colorGroup( ColorButtonBg, false );
@@ -353,7 +353,7 @@ void KDEDefaultHandler::createPixmaps()
kColorBitmaps( &p, g, 0, 0, 16, 16, true, pinup_white_bits,
pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL );
p.end();
- ipinUpPix->setMask( QBitmap(16, 16, pinup_mask_bits, true) );
+ ipinUpPix->setMask( TQBitmap(16, 16, pinup_mask_bits, true) );
ipinDownPix = new KPixmap();
ipinDownPix->resize(16, 16);
@@ -361,7 +361,7 @@ void KDEDefaultHandler::createPixmaps()
kColorBitmaps( &p, g, 0, 0, 16, 16, true, pindown_white_bits,
pindown_gray_bits, NULL, NULL, pindown_dgray_bits, NULL );
p.end();
- ipinDownPix->setMask( QBitmap(16, 16, pindown_mask_bits, true) );
+ ipinDownPix->setMask( TQBitmap(16, 16, pindown_mask_bits, true) );
// Create a title buffer for flicker-free painting
titleBuffer = new KPixmap();
@@ -492,16 +492,16 @@ void KDEDefaultHandler::freePixmaps()
void KDEDefaultHandler::drawButtonBackground(KPixmap *pix,
- const QColorGroup &g, bool sunken)
+ const TQColorGroup &g, bool sunken)
{
- QPainter p;
+ TQPainter p;
int w = pix->width();
int h = pix->height();
int x2 = w-1;
int y2 = h-1;
- bool highcolor = useGradients && (QPixmap::defaultDepth() > 8);
- QColor c = g.background();
+ bool highcolor = useGradients && (TQPixmap::defaultDepth() > 8);
+ TQColor c = g.background();
// Fill the background with a gradient if possible
if (highcolor)
@@ -528,9 +528,9 @@ void KDEDefaultHandler::drawButtonBackground(KPixmap *pix,
p.drawLine(2, x2-2, y2-2, x2-2);
}
-QValueList< KDEDefaultHandler::BorderSize > KDEDefaultHandler::borderSizes() const
+TQValueList< KDEDefaultHandler::BorderSize > KDEDefaultHandler::borderSizes() const
{ // the list must be sorted
- return QValueList< BorderSize >() << BorderNormal << BorderLarge <<
+ return TQValueList< BorderSize >() << BorderNormal << BorderLarge <<
BorderVeryLarge << BorderHuge << BorderVeryHuge << BorderOversized;
}
@@ -560,7 +560,7 @@ bool KDEDefaultHandler::supports( Ability ability )
KDEDefaultButton::KDEDefaultButton(ButtonType type, KDEDefaultClient *parent, const char *name)
: KCommonDecorationButton(type, parent, name)
{
- setBackgroundMode( QWidget::NoBackground );
+ setBackgroundMode( TQWidget::NoBackground );
isMouseOver = false;
deco = NULL;
@@ -619,13 +619,13 @@ void KDEDefaultButton::setBitmap(const unsigned char *bitmap)
deco = 0;
if (bitmap) {
- deco = new QBitmap(10, 10, bitmap, true);
+ deco = new TQBitmap(10, 10, bitmap, true);
deco->setMask( *deco );
}
}
-void KDEDefaultButton::drawButton(QPainter *p)
+void KDEDefaultButton::drawButton(TQPainter *p)
{
if (!KDEDefault_initialized)
return;
@@ -660,14 +660,14 @@ void KDEDefaultButton::drawButton(QPainter *p)
// This is for sticky and menu buttons
KPixmap* grad = active ? aUpperGradient : iUpperGradient;
if (!grad) {
- QColor c = KDecoration::options()->color(KDecoration::ColorTitleBar, active);
+ TQColor c = KDecoration::options()->color(KDecoration::ColorTitleBar, active);
p->fillRect(0, 0, width(), height(), c );
} else
p->drawPixmap( 0, 0, *grad, 0,1, width(), height() );
} else {
// Draw a plain background for menus or sticky buttons on RHS
- QColor c = KDecoration::options()->color(KDecoration::ColorFrame, active);
+ TQColor c = KDecoration::options()->color(KDecoration::ColorFrame, active);
p->fillRect(0, 0, width(), height(), c);
}
@@ -698,7 +698,7 @@ void KDEDefaultButton::drawButton(QPainter *p)
else
btnpix = isOn() ? *ipinDownPix : *ipinUpPix;
} else
- btnpix = decoration()->icon().pixmap( QIconSet::Small, QIconSet::Normal );
+ btnpix = decoration()->icon().pixmap( TQIconSet::Small, TQIconSet::Normal );
// Intensify the image if required
if (isMouseOver) {
@@ -717,19 +717,19 @@ void KDEDefaultButton::drawButton(QPainter *p)
}
-void KDEDefaultButton::enterEvent(QEvent *e)
+void KDEDefaultButton::enterEvent(TQEvent *e)
{
isMouseOver=true;
repaint(false);
- QButton::enterEvent(e);
+ TQButton::enterEvent(e);
}
-void KDEDefaultButton::leaveEvent(QEvent *e)
+void KDEDefaultButton::leaveEvent(TQEvent *e)
{
isMouseOver=false;
repaint(false);
- QButton::leaveEvent(e);
+ TQButton::leaveEvent(e);
}
@@ -741,17 +741,17 @@ KDEDefaultClient::KDEDefaultClient( KDecorationBridge* b, KDecorationFactory* f
{
}
-QString KDEDefaultClient::visibleName() const
+TQString KDEDefaultClient::visibleName() const
{
return i18n("KDE2");
}
-QString KDEDefaultClient::defaultButtonsLeft() const
+TQString KDEDefaultClient::defaultButtonsLeft() const
{
return "MS";
}
-QString KDEDefaultClient::defaultButtonsRight() const
+TQString KDEDefaultClient::defaultButtonsRight() const
{
return "HIAX";
}
@@ -871,20 +871,20 @@ bool KDEDefaultClient::mustDrawHandle() const
}
}
-void KDEDefaultClient::paintEvent( QPaintEvent* )
+void KDEDefaultClient::paintEvent( TQPaintEvent* )
{
if (!KDEDefault_initialized)
return;
- QColorGroup g;
+ TQColorGroup g;
int offset;
KPixmap* upperGradient = isActive() ? aUpperGradient : iUpperGradient;
- QPainter p(widget());
+ TQPainter p(widget());
// Obtain widget bounds.
- QRect r(widget()->rect());
+ TQRect r(widget()->rect());
int x = r.x();
int y = r.y();
int x2 = r.width() - 1;
@@ -938,8 +938,8 @@ void KDEDefaultClient::paintEvent( QPaintEvent* )
p.drawLine(x+1, y2-1, x2-1, y2-1);
p.setPen(options()->color(ColorFrame, isActive()));
- QPointArray a;
- QBrush brush( options()->color(ColorFrame, isActive()), Qt::SolidPattern );
+ TQPointArray a;
+ TQBrush brush( options()->color(ColorFrame, isActive()), Qt::SolidPattern );
p.setBrush( brush ); // use solid, yellow brush
a.setPoints( 4, x+2, leftFrameStart+borderWidth-4,
x+borderWidth-2, leftFrameStart,
@@ -956,18 +956,18 @@ void KDEDefaultClient::paintEvent( QPaintEvent* )
if(w > 50)
{
qDrawShadePanel(&p, x+1, y2-grabBorderWidth+2, 2*borderWidth+12, grabBorderWidth-2,
- g, false, 1, &g.brush(QColorGroup::Mid));
+ g, false, 1, &g.brush(TQColorGroup::Mid));
qDrawShadePanel(&p, x+2*borderWidth+13, y2-grabBorderWidth+2, w-4*borderWidth-26, grabBorderWidth-2,
g, false, 1, isActive() ?
- &g.brush(QColorGroup::Background) :
- &g.brush(QColorGroup::Mid));
+ &g.brush(TQColorGroup::Background) :
+ &g.brush(TQColorGroup::Mid));
qDrawShadePanel(&p, x2-2*borderWidth-12, y2-grabBorderWidth+2, 2*borderWidth+12, grabBorderWidth-2,
- g, false, 1, &g.brush(QColorGroup::Mid));
+ g, false, 1, &g.brush(TQColorGroup::Mid));
} else
qDrawShadePanel(&p, x+1, y2-grabBorderWidth+2, w-2, grabBorderWidth-2,
g, false, 1, isActive() ?
- &g.brush(QColorGroup::Background) :
- &g.brush(QColorGroup::Mid));
+ &g.brush(TQColorGroup::Background) :
+ &g.brush(TQColorGroup::Mid));
offset = grabBorderWidth;
} else
{
@@ -984,13 +984,13 @@ void KDEDefaultClient::paintEvent( QPaintEvent* )
r = titleRect();
// Obtain titlebar blend colours
- QColor c1 = options()->color(ColorTitleBar, isActive() );
- QColor c2 = options()->color(ColorFrame, isActive() );
+ TQColor c1 = options()->color(ColorTitleBar, isActive() );
+ TQColor c2 = options()->color(ColorFrame, isActive() );
// Fill with frame color behind RHS buttons
p.fillRect( rightOffset, y+2, x2-rightOffset-1, titleHeight+1, c2);
- QPainter p2( titleBuffer, this );
+ TQPainter p2( titleBuffer, this );
// Draw the titlebar gradient
if (upperGradient)
@@ -1000,7 +1000,7 @@ void KDEDefaultClient::paintEvent( QPaintEvent* )
// Draw the title text on the pixmap, and with a smaller font
// for toolwindows than the default.
- QFont fnt = options()->font(true);
+ TQFont fnt = options()->font(true);
if ( isToolWindow() )
fnt.setPointSize( fnt.pointSize()-2 ); // Shrink font by 2pt
@@ -1010,7 +1010,7 @@ void KDEDefaultClient::paintEvent( QPaintEvent* )
// Draw the titlebar stipple if active and available
if (isActive() && titlePix)
{
- QFontMetrics fm(fnt);
+ TQFontMetrics fm(fnt);
int captionWidth = fm.width(caption());
if (caption().isRightToLeft())
p2.drawTiledPixmap( r.x(), 0, r.width()-captionWidth-4,
@@ -1037,23 +1037,23 @@ void KDEDefaultClient::paintEvent( QPaintEvent* )
#endif
}
-QRegion KDEDefaultClient::cornerShape(WindowCorner corner)
+TQRegion KDEDefaultClient::cornerShape(WindowCorner corner)
{
switch (corner) {
case WC_TopLeft:
- return QRect(0, 0, 1, 1);
+ return TQRect(0, 0, 1, 1);
case WC_TopRight:
- return QRect(width()-1, 0, 1, 1);
+ return TQRect(width()-1, 0, 1, 1);
case WC_BottomLeft:
- return QRect(0, height()-1, 1, 1);
+ return TQRect(0, height()-1, 1, 1);
case WC_BottomRight:
- return QRect(width()-1, height()-1, 1, 1);
+ return TQRect(width()-1, height()-1, 1, 1);
default:
- return QRegion();
+ return TQRegion();
}
}
diff --git a/kwin/clients/default/kdedefault.h b/kwin/clients/default/kdedefault.h
index 53ad23fa2..6e09025f1 100644
--- a/kwin/clients/default/kdedefault.h
+++ b/kwin/clients/default/kdedefault.h
@@ -13,9 +13,9 @@
#ifndef _KDE_DEFAULT_H
#define _KDE_DEFAULT_H
-#include <qbutton.h>
-#include <qbitmap.h>
-#include <qdatetime.h>
+#include <tqbutton.h>
+#include <tqbitmap.h>
+#include <tqdatetime.h>
#include <kpixmap.h>
#include <kcommondecoration.h>
#include <kdecorationfactory.h>
@@ -35,7 +35,7 @@ class KDEDefaultHandler: public KDecorationFactory
~KDEDefaultHandler();
KDecoration* createDecoration( KDecorationBridge* b );
bool reset( unsigned long changed );
- virtual QValueList< BorderSize > borderSizes() const;
+ virtual TQValueList< BorderSize > borderSizes() const;
virtual bool supports( Ability ability );
private:
@@ -43,11 +43,11 @@ class KDEDefaultHandler: public KDecorationFactory
void createPixmaps();
void freePixmaps();
void drawButtonBackground(KPixmap *pix,
- const QColorGroup &g, bool sunken);
+ const TQColorGroup &g, bool sunken);
};
-// class KDEDefaultButton : public QButton, public KDecorationDefines
+// class KDEDefaultButton : public TQButton, public KDecorationDefines
class KDEDefaultButton : public KCommonDecorationButton
{
public:
@@ -59,12 +59,12 @@ class KDEDefaultButton : public KCommonDecorationButton
void setBitmap(const unsigned char *bitmap);
protected:
- void enterEvent(QEvent *);
- void leaveEvent(QEvent *);
- void drawButton(QPainter *p);
- void drawButtonLabel(QPainter*) {;}
+ void enterEvent(TQEvent *);
+ void leaveEvent(TQEvent *);
+ void drawButton(TQPainter *p);
+ void drawButtonLabel(TQPainter*) {;}
- QBitmap* deco;
+ TQBitmap* deco;
bool large;
bool isMouseOver;
};
@@ -76,20 +76,20 @@ class KDEDefaultClient : public KCommonDecoration
KDEDefaultClient( KDecorationBridge* b, KDecorationFactory* f );
~KDEDefaultClient() {;}
- virtual QString visibleName() const;
- virtual QString defaultButtonsLeft() const;
- virtual QString defaultButtonsRight() const;
+ virtual TQString visibleName() const;
+ virtual TQString defaultButtonsLeft() const;
+ virtual TQString defaultButtonsRight() const;
virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
virtual KCommonDecorationButton *createButton(ButtonType type);
- virtual QRegion cornerShape(WindowCorner corner);
+ virtual TQRegion cornerShape(WindowCorner corner);
void init();
void reset( unsigned long changed );
protected:
- void paintEvent( QPaintEvent* );
+ void paintEvent( TQPaintEvent* );
private:
bool mustDrawHandle() const;
diff --git a/kwin/clients/keramik/config/config.cpp b/kwin/clients/keramik/config/config.cpp
index c548ca184..b4b6ced9b 100644
--- a/kwin/clients/keramik/config/config.cpp
+++ b/kwin/clients/keramik/config/config.cpp
@@ -26,14 +26,14 @@
#include <kglobal.h>
#include <klocale.h>
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
#include "config.h"
#include "config.moc"
extern "C"
{
- KDE_EXPORT QObject* allocate_config( KConfig* conf, QWidget* parent )
+ KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent )
{
return ( new KeramikConfig( conf, parent ) );
}
@@ -44,21 +44,21 @@ extern "C"
* 'conf' is a pointer to the kwindecoration modules open kwin config,
* and is by default set to the "Style" group.
*
- * 'parent' is the parent of the QObject, which is a VBox inside the
+ * 'parent' is the parent of the TQObject, which is a VBox inside the
* Configure tab in kwindecoration
*/
-KeramikConfig::KeramikConfig( KConfig* conf, QWidget* parent )
- : QObject( parent )
+KeramikConfig::KeramikConfig( KConfig* conf, TQWidget* parent )
+ : TQObject( parent )
{
KGlobal::locale()->insertCatalogue("kwin_clients");
c = new KConfig( "kwinkeramikrc" );
ui = new KeramikConfigUI( parent );
- connect( ui->showAppIcons, SIGNAL(clicked()), SIGNAL(changed()) );
- connect( ui->smallCaptions, SIGNAL(clicked()), SIGNAL(changed()) );
- connect( ui->largeGrabBars, SIGNAL(clicked()), SIGNAL(changed()) );
- connect( ui->useShadowedText, SIGNAL(clicked()), SIGNAL(changed()) );
+ connect( ui->showAppIcons, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) );
+ connect( ui->smallCaptions, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) );
+ connect( ui->largeGrabBars, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) );
+ connect( ui->useShadowedText, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) );
load( conf );
ui->show();
diff --git a/kwin/clients/keramik/config/config.h b/kwin/clients/keramik/config/config.h
index 71090531d..4207424c7 100644
--- a/kwin/clients/keramik/config/config.h
+++ b/kwin/clients/keramik/config/config.h
@@ -34,7 +34,7 @@ class KeramikConfig: public QObject
Q_OBJECT
public:
- KeramikConfig( KConfig* conf, QWidget* parent );
+ KeramikConfig( KConfig* conf, TQWidget* parent );
~KeramikConfig();
// These public signals/slots work similar to KCM modules
diff --git a/kwin/clients/keramik/embedtool.cpp b/kwin/clients/keramik/embedtool.cpp
index b0e5f1c72..4f5135a3f 100644
--- a/kwin/clients/keramik/embedtool.cpp
+++ b/kwin/clients/keramik/embedtool.cpp
@@ -19,12 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#include <qimage.h>
-#include <qtextstream.h>
-#include <qregexp.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qdatetime.h>
+#include <tqimage.h>
+#include <tqtextstream.h>
+#include <tqregexp.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqdatetime.h>
#include <iostream>
@@ -37,11 +37,11 @@ static int primes[] = {
};
struct EmbedImage {
- QString string;
+ TQString string;
int width;
int height;
bool alpha;
- QString name;
+ TQString name;
};
class KeramikEmbedder {
@@ -53,17 +53,17 @@ public:
void writeIndex();
private:
- QFile *file;
- QPtrList<EmbedImage> *index;
- QTextStream stream;
+ TQFile *file;
+ TQPtrList<EmbedImage> *index;
+ TQTextStream stream;
};
KeramikEmbedder::KeramikEmbedder()
{
- QDateTime date( QDateTime::currentDateTime() );
- QString datestring( date.toString() );
+ TQDateTime date( TQDateTime::currentDateTime() );
+ TQString datestring( date.toString() );
- file = new QFile( "tiles.h" );
+ file = new TQFile( "tiles.h" );
file->open( IO_WriteOnly | IO_Truncate );
stream.setDevice( file );
@@ -74,11 +74,11 @@ KeramikEmbedder::KeramikEmbedder()
stream << "#ifndef __TILES_H\n";
stream << "#define __TILES_H\n\n";
- stream << "#include <qimage.h>\n";
- stream << "#include <qdict.h>\n\n";
+ stream << "#include <tqimage.h>\n";
+ stream << "#include <tqdict.h>\n\n";
stream << "namespace Keramik {\n\n";
- index = new QPtrList<EmbedImage>;
+ index = new TQPtrList<EmbedImage>;
index->setAutoDelete( true );
}
@@ -95,15 +95,15 @@ KeramikEmbedder::~KeramikEmbedder()
void KeramikEmbedder::embed( const char *name )
{
- QFileInfo fileinfo( name );
- QString basename( fileinfo.baseName() );
- QString codename( basename );
- QImage image( name );
+ TQFileInfo fileinfo( name );
+ TQString basename( fileinfo.baseName() );
+ TQString codename( basename );
+ TQImage image( name );
- codename = codename.replace( QRegExp("[^a-zA-Z0-9]"), "_" );
+ codename = codename.replace( TQRegExp("[^a-zA-Z0-9]"), "_" );
stream << "\tstatic const QRgb " << codename << "_data[] = {" << endl << "\t\t";
- stream.setf( QTextStream::hex | QTextStream::right );
+ stream.setf( TQTextStream::hex | TQTextStream::right );
stream.fill( '0' );
int pixels = image.width() * image.height();
@@ -174,14 +174,14 @@ void KeramikEmbedder::writeIndex()
stream << "\tclass KeramikImageDb {\n";
stream << "\tprivate:\n";
stream << "\t\tstatic KeramikImageDb *m_inst;\n";
- stream << "\t\tQDict<QImage> *db;\n\n";
+ stream << "\t\tQDict<TQImage> *db;\n\n";
stream << "\t\tKeramikImageDb() {\n";
- stream << "\t\t\tdb = new QDict<QImage>( " << prime << " );\n";
+ stream << "\t\t\tdb = new TQDict<TQImage>( " << prime << " );\n";
stream << "\t\t\tdb->setAutoDelete( true );\n\n";
stream << "\t\t\tfor ( int i = 0; i < " << index->count() << "; i++ ) {\n";
- stream << "\t\t\t\tQImage *img = new QImage( (uchar*)image_db[i].data,\n";
+ stream << "\t\t\t\tQImage *img = new TQImage( (uchar*)image_db[i].data,\n";
stream << "\t\t\t\t\t\timage_db[i].width, image_db[i].height,\n";
- stream << "\t\t\t\t\t\t32, NULL, 0, QImage::LittleEndian );\n\n";
+ stream << "\t\t\t\t\t\t32, NULL, 0, TQImage::LittleEndian );\n\n";
stream << "\t\t\t\tif ( image_db[i].alpha )\n";
stream << "\t\t\t\t\timg->setAlphaBuffer( true );\n\n";
stream << "\t\t\t\tdb->insert( image_db[i].name, img );\n";
@@ -199,7 +199,7 @@ void KeramikEmbedder::writeIndex()
stream << "\t\t\tif ( m_inst ) delete m_inst;\n";
stream << "\t\t\tm_inst = NULL;\n";
stream << "\t\t}\n\n";
- stream << "\t\tQImage *image( const QString &name ) const {\n";
+ stream << "\t\tQImage *image( const TQString &name ) const {\n";
stream << "\t\t\treturn db->find( name );\n";
stream << "\t\t}\n\n";
stream << "\t}; // class KeramikImageDb\n\n";
diff --git a/kwin/clients/keramik/keramik.cpp b/kwin/clients/keramik/keramik.cpp
index 57a51bce1..48a187098 100644
--- a/kwin/clients/keramik/keramik.cpp
+++ b/kwin/clients/keramik/keramik.cpp
@@ -24,13 +24,13 @@
#include <klocale.h>
#include <kiconeffect.h>
-#include <qpainter.h>
-#include <qlayout.h>
-#include <qbitmap.h>
-#include <qstyle.h>
-#include <qtooltip.h>
-#include <qwidget.h>
-#include <qlabel.h>
+#include <tqpainter.h>
+#include <tqlayout.h>
+#include <tqbitmap.h>
+#include <tqstyle.h>
+#include <tqtooltip.h>
+#include <tqwidget.h>
+#include <tqlabel.h>
#include <X11/Xlib.h>
@@ -41,16 +41,16 @@
// -------------------------------------------------------------------------------------------
-static void flip( QPixmap *&pix )
+static void flip( TQPixmap *&pix )
{
- QPixmap *tmp = new QPixmap( pix->xForm( QWMatrix(-1,0,0,1,pix->width(),0) ) );
+ TQPixmap *tmp = new TQPixmap( pix->xForm( TQWMatrix(-1,0,0,1,pix->width(),0) ) );
delete pix;
pix = tmp;
}
-static void flip( QBitmap *&pix )
+static void flip( TQBitmap *&pix )
{
- QBitmap *tmp = new QBitmap( pix->xForm( QWMatrix(-1,0,0,1,pix->width(),0) ) );
+ TQBitmap *tmp = new TQBitmap( pix->xForm( TQWMatrix(-1,0,0,1,pix->width(),0) ) );
delete pix;
pix = tmp;
}
@@ -186,27 +186,27 @@ KeramikHandler::KeramikHandler()
imageDb = KeramikImageDb::instance();
// Create the button deco bitmaps
- buttonDecos[ Menu ] = new QBitmap( 17, 17, menu_bits, true );
- buttonDecos[ OnAllDesktops ] = new QBitmap( 17, 17, on_all_desktops_bits, true );
- buttonDecos[ NotOnAllDesktops ] = new QBitmap( 17, 17, not_on_all_desktops_bits, true );
- buttonDecos[ Help ] = new QBitmap( 17, 17, help_bits, true );
- buttonDecos[ Minimize ] = new QBitmap( 17, 17, minimize_bits, true );
- buttonDecos[ Maximize ] = new QBitmap( 17, 17, maximize_bits, true );
- buttonDecos[ Restore ] = new QBitmap( 17, 17, restore_bits, true );
- buttonDecos[ Close ] = new QBitmap( 17, 17, close_bits, true );
- buttonDecos[ AboveOn ] = new QBitmap( 17, 17, above_on_bits, true );
- buttonDecos[ AboveOff ] = new QBitmap( 17, 17, above_off_bits, true );
- buttonDecos[ BelowOn ] = new QBitmap( 17, 17, below_on_bits, true );
- buttonDecos[ BelowOff ] = new QBitmap( 17, 17, below_off_bits, true );
- buttonDecos[ ShadeOn ] = new QBitmap( 17, 17, shade_on_bits, true );
- buttonDecos[ ShadeOff ] = new QBitmap( 17, 17, shade_off_bits, true );
+ buttonDecos[ Menu ] = new TQBitmap( 17, 17, menu_bits, true );
+ buttonDecos[ OnAllDesktops ] = new TQBitmap( 17, 17, on_all_desktops_bits, true );
+ buttonDecos[ NotOnAllDesktops ] = new TQBitmap( 17, 17, not_on_all_desktops_bits, true );
+ buttonDecos[ Help ] = new TQBitmap( 17, 17, help_bits, true );
+ buttonDecos[ Minimize ] = new TQBitmap( 17, 17, minimize_bits, true );
+ buttonDecos[ Maximize ] = new TQBitmap( 17, 17, maximize_bits, true );
+ buttonDecos[ Restore ] = new TQBitmap( 17, 17, restore_bits, true );
+ buttonDecos[ Close ] = new TQBitmap( 17, 17, close_bits, true );
+ buttonDecos[ AboveOn ] = new TQBitmap( 17, 17, above_on_bits, true );
+ buttonDecos[ AboveOff ] = new TQBitmap( 17, 17, above_off_bits, true );
+ buttonDecos[ BelowOn ] = new TQBitmap( 17, 17, below_on_bits, true );
+ buttonDecos[ BelowOff ] = new TQBitmap( 17, 17, below_off_bits, true );
+ buttonDecos[ ShadeOn ] = new TQBitmap( 17, 17, shade_on_bits, true );
+ buttonDecos[ ShadeOff ] = new TQBitmap( 17, 17, shade_off_bits, true );
// Selfmask the bitmaps
for ( int i = 0; i < NumButtonDecos; i++ )
buttonDecos[i]->setMask( *buttonDecos[i] );
// Flip the bitmaps horizontally in right-to-left mode
- if ( QApplication::reverseLayout() ) {
+ if ( TQApplication::reverseLayout() ) {
for ( int i = 0; i < Help; ++i )
::flip( buttonDecos[i] );
@@ -268,14 +268,14 @@ void KeramikHandler::createPixmaps()
widthOffset = 0;
heightOffset = 0;
}
- int fontHeight = QFontMetrics(options()->font(true)).height();
+ int fontHeight = TQFontMetrics(options()->font(true)).height();
if (fontHeight > heightOffset + 20)
heightOffset = fontHeight - 20;
- QString size = (heightOffset < 8) ? "" : (heightOffset < 20) ? "-large" : "-huge";
+ TQString size = (heightOffset < 8) ? "" : (heightOffset < 20) ? "-large" : "-huge";
- QColor titleColor, captionColor, buttonColor;
- QImage *titleCenter = NULL, *captionLeft = NULL,
+ TQColor titleColor, captionColor, buttonColor;
+ TQImage *titleCenter = NULL, *captionLeft = NULL,
*captionRight = NULL, *captionCenter = NULL;
@@ -320,7 +320,7 @@ void KeramikHandler::createPixmaps()
delete captionCenter;
// Create the titlebar center tile
- activeTiles[ TitleCenter ] = new QPixmap( *titleCenter );
+ activeTiles[ TitleCenter ] = new TQPixmap( *titleCenter );
delete titleCenter;
@@ -361,7 +361,7 @@ void KeramikHandler::createPixmaps()
delete captionRight;
delete captionCenter;
- inactiveTiles[ TitleCenter ] = new QPixmap( *titleCenter );
+ inactiveTiles[ TitleCenter ] = new TQPixmap( *titleCenter );
delete titleCenter;
@@ -380,7 +380,7 @@ void KeramikHandler::createPixmaps()
// Buttons
// -------------------------------------------------------------------------
- buttonColor = QColor(); //KDecoration::options()->color( ButtonBg, true );
+ buttonColor = TQColor(); //KDecoration::options()->color( ButtonBg, true );
titleButtonRound = loadPixmap( "titlebutton-round"+size, buttonColor );
titleButtonSquare = loadPixmap( "titlebutton-square"+size, buttonColor );
@@ -388,7 +388,7 @@ void KeramikHandler::createPixmaps()
// Prepare the tiles for use
// -------------------------------------------------------------------------
- if ( QApplication::reverseLayout() ) {
+ if ( TQApplication::reverseLayout() ) {
// Fix lighting
flip( activeTiles[CaptionSmallLeft], activeTiles[CaptionSmallRight] );
@@ -476,13 +476,13 @@ void KeramikHandler::destroyPixmaps()
}
-void KeramikHandler::addWidth (int width, QPixmap *&pix, bool left, QPixmap *bottomPix) {
+void KeramikHandler::addWidth (int width, TQPixmap *&pix, bool left, TQPixmap *bottomPix) {
int w = pix->width()+width;
int h = pix->height();
- QPixmap *tmp = new QPixmap (w, h);
+ TQPixmap *tmp = new TQPixmap (w, h);
tmp->fill ();
- QPainter p;
+ TQPainter p;
p.begin (tmp);
for (int i = 0; i < h; i++)
@@ -500,12 +500,12 @@ void KeramikHandler::addWidth (int width, QPixmap *&pix, bool left, QPixmap *bot
}
-void KeramikHandler::addHeight (int height, QPixmap *&pix) {
+void KeramikHandler::addHeight (int height, TQPixmap *&pix) {
int w = pix->width();
int h = pix->height()+height;
- QPixmap *tmp = new QPixmap (w, h);
- QPainter p;
+ TQPixmap *tmp = new TQPixmap (w, h);
+ TQPainter p;
p.begin (tmp);
if (pix->height() > 10) {
p.drawPixmap(0, 0, *pix, 0, 0, w, 11);
@@ -527,28 +527,28 @@ void KeramikHandler::addHeight (int height, QPixmap *&pix) {
}
-void KeramikHandler::flip( QPixmap *&pix1, QPixmap *&pix2 )
+void KeramikHandler::flip( TQPixmap *&pix1, TQPixmap *&pix2 )
{
// Flip the pixmaps horizontally
- QPixmap *tmp = new QPixmap( pix1->xForm( QWMatrix(-1,0,0,1,pix1->width(),0) ) );
+ TQPixmap *tmp = new TQPixmap( pix1->xForm( TQWMatrix(-1,0,0,1,pix1->width(),0) ) );
delete pix1;
- pix1 = new QPixmap( pix2->xForm( QWMatrix(-1,0,0,1,pix2->width(),0) ) );
+ pix1 = new TQPixmap( pix2->xForm( TQWMatrix(-1,0,0,1,pix2->width(),0) ) );
delete pix2;
pix2 = tmp;
}
-void KeramikHandler::pretile( QPixmap *&pix, int size, Qt::Orientation dir )
+void KeramikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir )
{
- QPixmap *newpix;
- QPainter p;
+ TQPixmap *newpix;
+ TQPainter p;
if ( dir == Qt::Horizontal )
- newpix = new QPixmap( size, pix->height() );
+ newpix = new TQPixmap( size, pix->height() );
else
- newpix = new QPixmap( pix->width(), size );
+ newpix = new TQPixmap( pix->width(), size );
p.begin( newpix );
p.drawTiledPixmap( newpix->rect(), *pix ) ;
@@ -579,9 +579,9 @@ void KeramikHandler::readConfig()
}
-QPixmap *KeramikHandler::composite( QImage *over, QImage *under )
+TQPixmap *KeramikHandler::composite( TQImage *over, TQImage *under )
{
- QImage dest( over->width(), over->height(), 32 );
+ TQImage dest( over->width(), over->height(), 32 );
int width = over->width(), height = over->height();
// Clear the destination image
@@ -624,25 +624,25 @@ QPixmap *KeramikHandler::composite( QImage *over, QImage *under )
}
// Create the final pixmap and return it
- return new QPixmap( dest );
+ return new TQPixmap( dest );
}
-QImage *KeramikHandler::loadImage( const QString &name, const QColor &col )
+TQImage *KeramikHandler::loadImage( const TQString &name, const TQColor &col )
{
if ( col.isValid() ) {
- QImage *img = new QImage( imageDb->image(name)->copy() );
+ TQImage *img = new TQImage( imageDb->image(name)->copy() );
KIconEffect::colorize( *img, col, 1.0 );
return img;
} else
- return new QImage( imageDb->image(name)->copy() );
+ return new TQImage( imageDb->image(name)->copy() );
}
-QPixmap *KeramikHandler::loadPixmap( const QString &name, const QColor &col )
+TQPixmap *KeramikHandler::loadPixmap( const TQString &name, const TQColor &col )
{
- QImage *img = loadImage( name, col );
- QPixmap *pix = new QPixmap( *img );
+ TQImage *img = loadImage( name, col );
+ TQPixmap *pix = new TQPixmap( *img );
delete img;
return pix;
@@ -735,7 +735,7 @@ bool KeramikHandler::supports( Ability ability )
}
-const QPixmap *KeramikHandler::tile( TilePixmap tilePix, bool active ) const
+const TQPixmap *KeramikHandler::tile( TilePixmap tilePix, bool active ) const
{
return ( active ? activeTiles[ tilePix ] : inactiveTiles[ tilePix ] );
}
@@ -745,9 +745,9 @@ KDecoration* KeramikHandler::createDecoration( KDecorationBridge* bridge )
return new KeramikClient( bridge, this );
}
-QValueList< KeramikHandler::BorderSize > KeramikHandler::borderSizes() const
+TQValueList< KeramikHandler::BorderSize > KeramikHandler::borderSizes() const
{ // the list must be sorted
- return QValueList< BorderSize >() << BorderNormal << BorderLarge <<
+ return TQValueList< BorderSize >() << BorderNormal << BorderLarge <<
BorderVeryLarge << BorderHuge << BorderVeryHuge << BorderOversized;
}
@@ -756,13 +756,13 @@ QValueList< KeramikHandler::BorderSize > KeramikHandler::borderSizes() const
-KeramikButton::KeramikButton( KeramikClient* c, const char *name, Button btn, const QString &tip, const int realizeBtns )
- : QButton( c->widget(), name ),
+KeramikButton::KeramikButton( KeramikClient* c, const char *name, Button btn, const TQString &tip, const int realizeBtns )
+ : TQButton( c->widget(), name ),
client( c ), button( btn ), hover( false ), lastbutton( NoButton )
{
realizeButtons = realizeBtns;
- QToolTip::add( this, tip ); // FRAME
+ TQToolTip::add( this, tip ); // FRAME
setBackgroundMode( NoBackground );
setCursor( arrowCursor );
int size = clientHandler->roundButton()->height();
@@ -778,44 +778,44 @@ KeramikButton::~KeramikButton()
}
-void KeramikButton::enterEvent( QEvent *e )
+void KeramikButton::enterEvent( TQEvent *e )
{
- QButton::enterEvent( e );
+ TQButton::enterEvent( e );
hover = true;
repaint( false );
}
-void KeramikButton::leaveEvent( QEvent *e )
+void KeramikButton::leaveEvent( TQEvent *e )
{
- QButton::leaveEvent( e );
+ TQButton::leaveEvent( e );
hover = false;
repaint( false );
}
-void KeramikButton::mousePressEvent( QMouseEvent *e )
+void KeramikButton::mousePressEvent( TQMouseEvent *e )
{
lastbutton = e->button();
- QMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?LeftButton:NoButton, e->state() );
- QButton::mousePressEvent( &me );
+ TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?LeftButton:NoButton, e->state() );
+ TQButton::mousePressEvent( &me );
}
-void KeramikButton::mouseReleaseEvent( QMouseEvent *e )
+void KeramikButton::mouseReleaseEvent( TQMouseEvent *e )
{
lastbutton = e->button();
- QMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?LeftButton:NoButton, e->state() );
- QButton::mouseReleaseEvent( &me );
+ TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?LeftButton:NoButton, e->state() );
+ TQButton::mouseReleaseEvent( &me );
}
-void KeramikButton::drawButton( QPainter *p )
+void KeramikButton::drawButton( TQPainter *p )
{
- const QPixmap *pix;
- const QBitmap *deco;
+ const TQPixmap *pix;
+ const TQBitmap *deco;
int size = clientHandler->roundButton()->height();
// Get the bevel from the client handler
@@ -825,20 +825,20 @@ void KeramikButton::drawButton( QPainter *p )
pix = clientHandler->squareButton();
// Draw the button background
- const QPixmap *background = clientHandler->tile( TitleCenter, client->isActive() );
+ const TQPixmap *background = clientHandler->tile( TitleCenter, client->isActive() );
p->drawPixmap( 0, 0, *background,
0, (background->height()-size+1)/2, size, size );
if ( isDown() ) {
// Pressed
- p->drawPixmap( QPoint(), *pix, QStyle::visualRect( QRect(2*size, 0, size, size), pix->rect() ) );
- p->translate( QApplication::reverseLayout() ? -1 : 1, 1 );
+ p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(2*size, 0, size, size), pix->rect() ) );
+ p->translate( TQApplication::reverseLayout() ? -1 : 1, 1 );
} else if ( hover )
// Mouse over
- p->drawPixmap( QPoint(), *pix, QStyle::visualRect( QRect(size, 0, size, size), pix->rect() ) );
+ p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(size, 0, size, size), pix->rect() ) );
else
// Normal
- p->drawPixmap( QPoint(), *pix, QStyle::visualRect( QRect(0, 0, size, size), pix->rect() ) );
+ p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(0, 0, size, size), pix->rect() ) );
// Draw the button deco on the bevel
@@ -856,7 +856,7 @@ void KeramikButton::drawButton( QPainter *p )
// The '?' won't be flipped around in the ctor, so we need to
// shift it to the right to compensate for the button shadow
// being on the left side of the button in RTL mode.
- if ( QApplication::reverseLayout() )
+ if ( TQApplication::reverseLayout() )
p->translate( 2, 0 );
break;
@@ -906,8 +906,8 @@ KeramikClient::KeramikClient( KDecorationBridge* bridge, KDecorationFactory* fac
void KeramikClient::init()
{
- connect( this, SIGNAL( keepAboveChanged( bool )), SLOT( keepAboveChange( bool )));
- connect( this, SIGNAL( keepBelowChanged( bool )), SLOT( keepBelowChange( bool )));
+ connect( this, TQT_SIGNAL( keepAboveChanged( bool )), TQT_SLOT( keepAboveChange( bool )));
+ connect( this, TQT_SIGNAL( keepBelowChanged( bool )), TQT_SLOT( keepBelowChange( bool )));
createMainWidget( WStaticContents | WResizeNoErase | WRepaintNoErase );
widget()->installEventFilter( this );
@@ -924,9 +924,9 @@ void KeramikClient::init()
void KeramikClient::createLayout()
{
- QVBoxLayout *mainLayout = new QVBoxLayout( widget() );
- QBoxLayout *titleLayout = new QBoxLayout( 0, QBoxLayout::LeftToRight, 0, 0, 0 );
- QHBoxLayout *windowLayout = new QHBoxLayout();
+ TQVBoxLayout *mainLayout = new TQVBoxLayout( widget() );
+ TQBoxLayout *titleLayout = new TQBoxLayout( 0, TQBoxLayout::LeftToRight, 0, 0, 0 );
+ TQHBoxLayout *windowLayout = new TQHBoxLayout();
largeTitlebar = ( !maximizedVertical() && clientHandler->largeCaptionBubbles() );
largeCaption = ( isActive() && largeTitlebar );
@@ -935,8 +935,8 @@ void KeramikClient::createLayout()
int topSpacing = ( largeTitlebar ? 4 : 1 );
int leftBorderWidth = clientHandler->tile( BorderLeft, true )->width();
int rightBorderWidth = clientHandler->tile( BorderRight, true )->width();
- topSpacer = new QSpacerItem( 10, topSpacing,
- QSizePolicy::Expanding, QSizePolicy::Minimum );
+ topSpacer = new TQSpacerItem( 10, topSpacing,
+ TQSizePolicy::Expanding, TQSizePolicy::Minimum );
mainLayout->addItem( topSpacer );
@@ -948,22 +948,22 @@ void KeramikClient::createLayout()
titleLayout->addSpacing( buttonMargin ); // Left button margin
addButtons( titleLayout, options()->customButtonPositions() ?
- options()->titleButtonsLeft() : QString(default_left) );
+ options()->titleButtonsLeft() : TQString(default_left) );
- titlebar = new QSpacerItem( 10, clientHandler->titleBarHeight(largeTitlebar)
- - topSpacing, QSizePolicy::Expanding, QSizePolicy::Minimum );
+ titlebar = new TQSpacerItem( 10, clientHandler->titleBarHeight(largeTitlebar)
+ - topSpacing, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
titleLayout->addItem( titlebar );
titleLayout->addSpacing( buttonSpacing );
addButtons( titleLayout, options()->customButtonPositions() ?
- options()->titleButtonsRight() : QString(default_right) );
+ options()->titleButtonsRight() : TQString(default_right) );
titleLayout->addSpacing( buttonMargin - 1 ); // Right button margin
windowLayout->addSpacing( leftBorderWidth ); // Left border
if( isPreview())
- windowLayout->addWidget( new QLabel( i18n( "<center><b>Keramik preview</b></center>" ), widget()));
+ windowLayout->addWidget( new TQLabel( i18n( "<center><b>Keramik preview</b></center>" ), widget()));
else
- windowLayout->addItem( new QSpacerItem( 0, 0 )); //no widget in the middle
+ windowLayout->addItem( new TQSpacerItem( 0, 0 )); //no widget in the middle
windowLayout->addSpacing( rightBorderWidth ); // Right border
}
@@ -983,7 +983,7 @@ void KeramikClient::reset( unsigned long )
{
// We're switching from small caption bubbles to large
if ( !maximizedVertical() ) {
- topSpacer->changeSize( 10, 4, QSizePolicy::Expanding, QSizePolicy::Minimum );
+ topSpacer->changeSize( 10, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
largeTitlebar = true;
largeCaption = isActive();
@@ -999,7 +999,7 @@ void KeramikClient::reset( unsigned long )
else if ( !clientHandler->largeCaptionBubbles() && largeTitlebar )
{
// We're switching from large caption bubbles to small
- topSpacer->changeSize( 10, 1, QSizePolicy::Expanding, QSizePolicy::Minimum );
+ topSpacer->changeSize( 10, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
largeTitlebar = largeCaption = false;
widget()->layout()->activate();
@@ -1024,7 +1024,7 @@ void KeramikClient::reset( unsigned long )
}
-void KeramikClient::addButtons( QBoxLayout *layout, const QString &s )
+void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
{
for ( uint i=0; i < s.length(); i++ )
{
@@ -1034,7 +1034,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s )
case 'M' :
if ( !button[MenuButton] ) {
button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), LeftButton|RightButton );
- connect( button[MenuButton], SIGNAL( pressed() ), SLOT( menuButtonPressed() ) );
+ connect( button[MenuButton], TQT_SIGNAL( pressed() ), TQT_SLOT( menuButtonPressed() ) );
layout->addWidget( button[MenuButton] );
}
break;
@@ -1046,7 +1046,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s )
OnAllDesktopsButton, isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops") );
if(isOnAllDesktops())
button[OnAllDesktopsButton]->toggle();
- connect( button[OnAllDesktopsButton], SIGNAL( clicked() ), SLOT( toggleOnAllDesktops() ) );
+ connect( button[OnAllDesktopsButton], TQT_SIGNAL( clicked() ), TQT_SLOT( toggleOnAllDesktops() ) );
layout->addWidget( button[OnAllDesktopsButton] );
}
break;
@@ -1055,7 +1055,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s )
case 'H' :
if ( !button[HelpButton] && providesContextHelp() ) {
button[HelpButton] = new KeramikButton( this, "help", HelpButton, i18n("Help") );
- connect( button[HelpButton], SIGNAL( clicked() ), SLOT( showContextHelp() ) );
+ connect( button[HelpButton], TQT_SIGNAL( clicked() ), TQT_SLOT( showContextHelp() ) );
layout->addWidget( button[HelpButton] );
}
break;
@@ -1064,7 +1064,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s )
case 'I' :
if ( !button[MinButton] && isMinimizable() ) {
button[MinButton] = new KeramikButton( this, "minimize", MinButton, i18n("Minimize") );
- connect( button[MinButton], SIGNAL( clicked() ), SLOT( minimize() ) );
+ connect( button[MinButton], TQT_SIGNAL( clicked() ), TQT_SLOT( minimize() ) );
layout->addWidget( button[MinButton] );
}
break;
@@ -1073,7 +1073,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s )
case 'A' :
if ( !button[MaxButton] && isMaximizable() ) {
button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), LeftButton|MidButton|RightButton );
- connect( button[MaxButton], SIGNAL( clicked() ), SLOT( slotMaximize() ) );
+ connect( button[MaxButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotMaximize() ) );
layout->addWidget( button[MaxButton] );
}
break;
@@ -1082,7 +1082,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s )
case 'X' :
if ( !button[CloseButton] && isCloseable() ) {
button[CloseButton] = new KeramikButton( this, "close", CloseButton, i18n("Close") );
- connect( button[CloseButton], SIGNAL( clicked() ), SLOT( closeWindow() ) );
+ connect( button[CloseButton], TQT_SIGNAL( clicked() ), TQT_SLOT( closeWindow() ) );
layout->addWidget( button[CloseButton] );
}
break;
@@ -1091,7 +1091,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s )
case 'F' :
if ( !button[AboveButton]) {
button[AboveButton] = new KeramikButton( this, "above", AboveButton, i18n("Keep Above Others") );
- connect( button[AboveButton], SIGNAL( clicked() ), SLOT( slotAbove() ) );
+ connect( button[AboveButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotAbove() ) );
layout->addWidget( button[AboveButton] );
}
break;
@@ -1100,7 +1100,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s )
case 'B' :
if ( !button[BelowButton]) {
button[BelowButton] = new KeramikButton( this, "below", BelowButton, i18n("Keep Below Others") );
- connect( button[BelowButton], SIGNAL( clicked() ), SLOT( slotBelow() ) );
+ connect( button[BelowButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotBelow() ) );
layout->addWidget( button[BelowButton] );
}
break;
@@ -1110,7 +1110,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s )
if ( !button[ShadeButton] && isShadeable() ) {
button[ShadeButton] = new KeramikButton( this, "shade", ShadeButton,
isSetShade() ? i18n("Unshade") : i18n( "Shade" ));
- connect( button[ShadeButton], SIGNAL( clicked() ), SLOT( slotShade() ) );
+ connect( button[ShadeButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotShade() ) );
layout->addWidget( button[ShadeButton] );
}
break;
@@ -1134,19 +1134,19 @@ void KeramikClient::updateMask()
// pixmap, paint the mask on it and then have the X server iterate
// over the pixels to compute the bounding rects from it.
- QRegion r;
+ TQRegion r;
register int w, y = 0;
int nrects;
- if ( QApplication::reverseLayout() ) {
+ if ( TQApplication::reverseLayout() ) {
// If the caption bubble is visible and extends above the titlebar
if ( largeCaption && captionRect.width() >= 25 ) {
register int x = captionRect.left();
w = captionRect.width();
- r += QRegion( x + 11, y++, w - 19, 1 );
- r += QRegion( x + 9, y++, w - 15, 1 );
- r += QRegion( x + 7, y++, w - 12, 1 );
+ r += TQRegion( x + 11, y++, w - 19, 1 );
+ r += TQRegion( x + 9, y++, w - 15, 1 );
+ r += TQRegion( x + 7, y++, w - 12, 1 );
} else {
nrects = 8;
@@ -1160,13 +1160,13 @@ void KeramikClient::updateMask()
w = width(); // FRAME
// The rounded titlebar corners
- r += QRegion( 9, y++, w - 17, 1 );
- r += QRegion( 7, y++, w - 13, 1 );
- r += QRegion( 5, y++, w - 9, 1 );
- r += QRegion( 4, y++, w - 7, 1 );
- r += QRegion( 3, y++, w - 5, 1 );
- r += QRegion( 2, y++, w - 4, 1 );
- r += QRegion( 1, y++, w - 2, 2 );
+ r += TQRegion( 9, y++, w - 17, 1 );
+ r += TQRegion( 7, y++, w - 13, 1 );
+ r += TQRegion( 5, y++, w - 9, 1 );
+ r += TQRegion( 4, y++, w - 7, 1 );
+ r += TQRegion( 3, y++, w - 5, 1 );
+ r += TQRegion( 2, y++, w - 4, 1 );
+ r += TQRegion( 1, y++, w - 2, 2 );
} else {
// If the caption bubble is visible and extends above the titlebar
@@ -1174,9 +1174,9 @@ void KeramikClient::updateMask()
nrects = 11;
register int x = captionRect.left();
w = captionRect.width();
- r += QRegion( x + 8, y++, w - 19, 1 );
- r += QRegion( x + 6, y++, w - 15, 1 );
- r += QRegion( x + 5, y++, w - 12, 1 );
+ r += TQRegion( x + 8, y++, w - 19, 1 );
+ r += TQRegion( x + 6, y++, w - 15, 1 );
+ r += TQRegion( x + 5, y++, w - 12, 1 );
} else {
nrects = 8;
@@ -1190,19 +1190,19 @@ void KeramikClient::updateMask()
w = width(); // FRAME
// The rounded titlebar corners
- r += QRegion( 8, y++, w - 17, 1 );
- r += QRegion( 6, y++, w - 13, 1 );
- r += QRegion( 4, y++, w - 9, 1 );
- r += QRegion( 3, y++, w - 7, 1 );
- r += QRegion( 2, y++, w - 5, 1 );
- r += QRegion( 2, y++, w - 4, 1 );
- r += QRegion( 1, y++, w - 2, 2 );
+ r += TQRegion( 8, y++, w - 17, 1 );
+ r += TQRegion( 6, y++, w - 13, 1 );
+ r += TQRegion( 4, y++, w - 9, 1 );
+ r += TQRegion( 3, y++, w - 7, 1 );
+ r += TQRegion( 2, y++, w - 5, 1 );
+ r += TQRegion( 2, y++, w - 4, 1 );
+ r += TQRegion( 1, y++, w - 2, 2 );
}
y++;
// The part of the window below the titlebar
- r += QRegion( 0, y, w, height() - y );
+ r += TQRegion( 0, y, w, height() - y );
setMask( r, YXBanded );
@@ -1216,7 +1216,7 @@ void KeramikClient::updateCaptionBuffer()
return;
bool active = isActive();
- QPixmap *icon = NULL;
+ TQPixmap *icon = NULL;
if ( captionBuffer.size() != captionRect.size() )
captionBuffer.resize( captionRect.size() );
@@ -1224,7 +1224,7 @@ void KeramikClient::updateCaptionBuffer()
if ( captionBuffer.isNull() )
return;
- QPainter p( &captionBuffer );
+ TQPainter p( &captionBuffer );
// Draw the caption bubble
if ( active && largeCaption ) {
@@ -1243,13 +1243,13 @@ void KeramikClient::updateCaptionBuffer()
{
if ( active ) {
if ( ! activeIcon )
- activeIcon = new QPixmap( this->icon().pixmap( QIconSet::Small, QIconSet::Normal )); // FRAME
+ activeIcon = new TQPixmap( this->icon().pixmap( TQIconSet::Small, TQIconSet::Normal )); // FRAME
icon = activeIcon;
} else {
if ( ! inactiveIcon ) {
- QImage img = this->icon().pixmap( QIconSet::Small, QIconSet::Normal ).convertToImage();
+ TQImage img = this->icon().pixmap( TQIconSet::Small, TQIconSet::Normal ).convertToImage();
KIconEffect::semiTransparent( img );
- inactiveIcon = new QPixmap( img );
+ inactiveIcon = new TQPixmap( img );
}
icon = inactiveIcon;
}
@@ -1260,7 +1260,7 @@ void KeramikClient::updateCaptionBuffer()
( clientHandler->showAppIcons() ? 16 + iconSpacing : 0 );
int xpos = QMAX( (captionRect.width() - tw) / 3, 8 );
- QRect tr = QStyle::visualRect( QRect(xpos, 1, captionRect.width() - xpos - 10,
+ TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10,
captionRect.height() - 4), captionBuffer.rect() );
//p.setPen( Qt::red ); // debug
@@ -1269,17 +1269,17 @@ void KeramikClient::updateCaptionBuffer()
// Application icon
if ( clientHandler->showAppIcons() )
{
- QRect iconRect = QStyle::visualRect( QRect(tr.x(),
+ TQRect iconRect = TQStyle::visualRect( TQRect(tr.x(),
1 + (captionRect.height() - 4 - 16) / 2, 16, 16), tr );
- QRect r( icon->rect() );
+ TQRect r( icon->rect() );
r.moveCenter( iconRect.center() );
if ( tr.width() > 16 ) {
p.drawPixmap( r, *icon );
} else {
- QRect sr( 0, 0, icon->width(), icon->height() );
+ TQRect sr( 0, 0, icon->width(), icon->height() );
- if ( QApplication::reverseLayout() )
+ if ( TQApplication::reverseLayout() )
sr.addCoords( icon->width() - tr.width(), 0, 0, 0 );
else
sr.addCoords( 0, 0, -( icon->width() - tr.width() ), 0 );
@@ -1290,7 +1290,7 @@ void KeramikClient::updateCaptionBuffer()
//p.drawRect( r ); // debug
- if ( QApplication::reverseLayout() )
+ if ( TQApplication::reverseLayout() )
tr.addCoords( 0, 0, -(16 + iconSpacing), 0 );
else
tr.addCoords( (16 + iconSpacing), 0, 0, 0 );
@@ -1298,18 +1298,18 @@ void KeramikClient::updateCaptionBuffer()
// Draw the titlebar text
int flags = AlignVCenter | SingleLine;
- flags |= ( QApplication::reverseLayout() ? AlignRight : AlignLeft );
+ flags |= ( TQApplication::reverseLayout() ? AlignRight : AlignLeft );
if ( clientHandler->useShadowedText() )
{
- p.translate( QApplication::reverseLayout() ? -1 : 1, 1 );
+ p.translate( TQApplication::reverseLayout() ? -1 : 1, 1 );
//p.setPen( options()->color(ColorTitleBar, active).dark() );
if (qGray(options()->color(ColorFont, active).rgb()) < 100)
- p.setPen( QColor(200,200,200) );
+ p.setPen( TQColor(200,200,200) );
else
p.setPen( black );
p.drawText( tr, flags, caption() );
- p.translate( QApplication::reverseLayout() ? 1 : -1, -1 );
+ p.translate( TQApplication::reverseLayout() ? 1 : -1, -1 );
}
p.setPen( options()->color( ColorFont, active ) );
@@ -1321,7 +1321,7 @@ void KeramikClient::updateCaptionBuffer()
void KeramikClient::calculateCaptionRect()
{
- QFontMetrics fm( options()->font(isActive()) );
+ TQFontMetrics fm( options()->font(isActive()) );
int cw = fm.width( caption() ) + 95;
int titleBaseY = ( largeTitlebar ? 3 : 0 );
@@ -1329,7 +1329,7 @@ void KeramikClient::calculateCaptionRect()
cw += 16 + 4; // icon width + space
cw = QMIN( cw, titlebar->geometry().width() );
- captionRect = QStyle::visualRect( QRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY),
+ captionRect = TQStyle::visualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY),
cw, clientHandler->titleBarHeight(largeCaption) ),
titlebar->geometry() );
}
@@ -1337,7 +1337,7 @@ void KeramikClient::calculateCaptionRect()
void KeramikClient::captionChange()
{
- QRect r( captionRect );
+ TQRect r( captionRect );
calculateCaptionRect();
if ( r.size() != captionRect.size() )
@@ -1393,7 +1393,7 @@ void KeramikClient::maximizeChange()
{
if ( maximizeMode() & MaximizeVertical ) {
// We've been maximized - shrink the titlebar by 3 pixels
- topSpacer->changeSize( 10, 1, QSizePolicy::Expanding, QSizePolicy::Minimum );
+ topSpacer->changeSize( 10, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
largeCaption = largeTitlebar = false;
calculateCaptionRect();
@@ -1403,7 +1403,7 @@ void KeramikClient::maximizeChange()
widget()->repaint( false );
} else if (( maximizeMode() & MaximizeVertical ) == 0 && !largeTitlebar ) {
// We've been restored - enlarge the titlebar by 3 pixels
- topSpacer->changeSize( 10, 4, QSizePolicy::Expanding, QSizePolicy::Minimum );
+ topSpacer->changeSize( 10, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
largeCaption = largeTitlebar = true;
calculateCaptionRect();
@@ -1415,8 +1415,8 @@ void KeramikClient::maximizeChange()
}
if ( button[ MaxButton ] ) {
- QToolTip::remove( button[ MaxButton ] );
- QToolTip::add( button[ MaxButton ], maximizeMode() == MaximizeFull ? i18n("Restore") : i18n("Maximize") );
+ TQToolTip::remove( button[ MaxButton ] );
+ TQToolTip::add( button[ MaxButton ], maximizeMode() == MaximizeFull ? i18n("Restore") : i18n("Maximize") );
button[ MaxButton ]->repaint();
}
}
@@ -1427,8 +1427,8 @@ void KeramikClient::desktopChange()
if ( button[ OnAllDesktopsButton ] )
{
button[ OnAllDesktopsButton ]->repaint( true );
- QToolTip::remove( button[ OnAllDesktopsButton ] );
- QToolTip::add( button[ OnAllDesktopsButton ], isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops") );
+ TQToolTip::remove( button[ OnAllDesktopsButton ] );
+ TQToolTip::add( button[ OnAllDesktopsButton ], isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops") );
}
}
@@ -1438,8 +1438,8 @@ void KeramikClient::shadeChange()
if ( button[ ShadeButton ] )
{
button[ ShadeButton ]->repaint( true );
- QToolTip::remove( button[ ShadeButton ] );
- QToolTip::add( button[ ShadeButton ], isSetShade() ? i18n("Unshade") : i18n("Shade") );
+ TQToolTip::remove( button[ ShadeButton ] );
+ TQToolTip::add( button[ ShadeButton ], isSetShade() ? i18n("Unshade") : i18n("Shade") );
}
}
@@ -1460,12 +1460,12 @@ void KeramikClient::keepBelowChange( bool )
void KeramikClient::menuButtonPressed()
{
- QPoint menuTop ( button[MenuButton]->rect().topLeft() );
- QPoint menuBottom ( button[MenuButton]->rect().bottomRight() );
- menuTop += QPoint(-6, -3);
- menuBottom += QPoint(6, 3);
+ TQPoint menuTop ( button[MenuButton]->rect().topLeft() );
+ TQPoint menuBottom ( button[MenuButton]->rect().bottomRight() );
+ menuTop += TQPoint(-6, -3);
+ menuBottom += TQPoint(6, 3);
KDecorationFactory* f = factory();
- showWindowMenu( QRect( button[MenuButton]->mapToGlobal( menuTop ),
+ showWindowMenu( TQRect( button[MenuButton]->mapToGlobal( menuTop ),
button[MenuButton]->mapToGlobal( menuBottom )) );
if( !f->exists( this )) // 'this' was destroyed
return;
@@ -1500,13 +1500,13 @@ void KeramikClient::slotShade()
}
-void KeramikClient::paintEvent( QPaintEvent *e )
+void KeramikClient::paintEvent( TQPaintEvent *e )
{
if ( !keramik_initialized )
return;
- QPainter p( widget());
- QRect updateRect( e->rect() );
+ TQPainter p( widget());
+ TQRect updateRect( e->rect() );
bool active = isActive();
int titleBaseY = ( largeTitlebar ? 3 : 0 );
@@ -1607,18 +1607,18 @@ void KeramikClient::paintEvent( QPaintEvent *e )
*clientHandler->tile( GrabBarRight, active ) );
}
- // Extra drawline for the 1 pixel empty space QLayout leaves when a window is shaded.
+ // Extra drawline for the 1 pixel empty space TQLayout leaves when a window is shaded.
p.setPen( options()->color( ColorTitleBlend, active ) );
p.drawLine( leftBorderWidth, height() - grabBarHeight - 1,
width() - rightBorderWidth - 1, height() - grabBarHeight - 1 );
}
-void KeramikClient::resizeEvent( QResizeEvent *e )
+void KeramikClient::resizeEvent( TQResizeEvent *e )
{
// FRAME Client::resizeEvent( e );
- QRect r( captionRect );
+ TQRect r( captionRect );
calculateCaptionRect();
if ( r.size() != captionRect.size() )
@@ -1644,31 +1644,31 @@ void KeramikClient::resizeEvent( QResizeEvent *e )
if ( dx )
{
widget()->update( width() - dx + 1, 0, dx, height() );
- widget()->update( QRect( QPoint(4,4), titlebar->geometry().bottomLeft() - QPoint(1,0) ) );
- widget()->update( QRect( titlebar->geometry().topRight(), QPoint( width() - 4,
+ widget()->update( TQRect( TQPoint(4,4), titlebar->geometry().bottomLeft() - TQPoint(1,0) ) );
+ widget()->update( TQRect( titlebar->geometry().topRight(), TQPoint( width() - 4,
titlebar->geometry().bottom() ) ) );
// Titlebar needs no paint event
- QApplication::postEvent( this, new QPaintEvent( titlebar->geometry(), FALSE ) );
+ TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), FALSE ) );
}
}
}
-void KeramikClient::mouseDoubleClickEvent( QMouseEvent *e )
+void KeramikClient::mouseDoubleClickEvent( TQMouseEvent *e )
{
if ( e->button() == LeftButton
- && QRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) )
+ && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) )
titlebarDblClickOperation();
}
-void KeramikClient::wheelEvent( QWheelEvent *e )
+void KeramikClient::wheelEvent( TQWheelEvent *e )
{
if (isSetShade()
- || QRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) )
+ || TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) )
titlebarMouseWheelOperation( e->delta());
}
-KeramikClient::Position KeramikClient::mousePosition( const QPoint &p ) const
+KeramikClient::Position KeramikClient::mousePosition( const TQPoint &p ) const
{
int titleBaseY = (largeTitlebar ? 3 : 0);
@@ -1745,7 +1745,7 @@ KeramikClient::Position KeramikClient::mousePosition( const QPoint &p ) const
}
-void KeramikClient::resize( const QSize& s )
+void KeramikClient::resize( const TQSize& s )
{
widget()->resize( s );
}
@@ -1774,37 +1774,37 @@ void KeramikClient::borders( int& left, int& right, int& top, int& bottom ) cons
}
-QSize KeramikClient::minimumSize() const
+TQSize KeramikClient::minimumSize() const
{
return widget()->minimumSize();
}
-bool KeramikClient::eventFilter( QObject* o, QEvent* e )
+bool KeramikClient::eventFilter( TQObject* o, TQEvent* e )
{
if ( o != widget() )
return false;
switch ( e->type() )
{
- case QEvent::Resize:
- resizeEvent( static_cast< QResizeEvent* >( e ) );
+ case TQEvent::Resize:
+ resizeEvent( static_cast< TQResizeEvent* >( e ) );
return true;
- case QEvent::Paint:
- paintEvent( static_cast< QPaintEvent* >( e ) );
+ case TQEvent::Paint:
+ paintEvent( static_cast< TQPaintEvent* >( e ) );
return true;
- case QEvent::MouseButtonDblClick:
- mouseDoubleClickEvent( static_cast< QMouseEvent* >( e ) );
+ case TQEvent::MouseButtonDblClick:
+ mouseDoubleClickEvent( static_cast< TQMouseEvent* >( e ) );
return true;
- case QEvent::MouseButtonPress:
- processMousePressEvent( static_cast< QMouseEvent* >( e ) );
+ case TQEvent::MouseButtonPress:
+ processMousePressEvent( static_cast< TQMouseEvent* >( e ) );
return true;
- case QEvent::Wheel:
- wheelEvent( static_cast< QWheelEvent* >( e ));
+ case TQEvent::Wheel:
+ wheelEvent( static_cast< TQWheelEvent* >( e ));
return true;
default:
diff --git a/kwin/clients/keramik/keramik.h b/kwin/clients/keramik/keramik.h
index 40a24a058..6f5a4a6e4 100644
--- a/kwin/clients/keramik/keramik.h
+++ b/kwin/clients/keramik/keramik.h
@@ -24,7 +24,7 @@
#ifndef __KERAMIK_H
#define __KERAMIK_H
-#include <qbutton.h>
+#include <tqbutton.h>
#include <kdecoration.h>
#include <kdecorationfactory.h>
@@ -60,7 +60,7 @@ namespace Keramik {
KeramikHandler();
~KeramikHandler();
- virtual QValueList< BorderSize > borderSizes() const;
+ virtual TQValueList< BorderSize > borderSizes() const;
virtual bool reset( unsigned long changed );
virtual KDecoration* createDecoration( KDecorationBridge* );
virtual bool supports( Ability ability );
@@ -77,36 +77,36 @@ namespace Keramik {
int grabBarHeight() const
{ return activeTiles[GrabBarCenter]->height(); }
- const QPixmap *roundButton() const { return titleButtonRound; }
- const QPixmap *squareButton() const { return titleButtonSquare; }
- const QBitmap *buttonDeco( ButtonDeco deco ) const
+ const TQPixmap *roundButton() const { return titleButtonRound; }
+ const TQPixmap *squareButton() const { return titleButtonSquare; }
+ const TQBitmap *buttonDeco( ButtonDeco deco ) const
{ return buttonDecos[ deco ]; }
- inline const QPixmap *tile( TilePixmap tilePix, bool active ) const;
+ inline const TQPixmap *tile( TilePixmap tilePix, bool active ) const;
private:
void readConfig();
void createPixmaps();
void destroyPixmaps();
- void addWidth (int width, QPixmap *&pix, bool left, QPixmap *bottomPix);
- void addHeight (int height, QPixmap *&pix);
- void flip( QPixmap *&, QPixmap *& );
- void pretile( QPixmap *&, int, Qt::Orientation );
- QPixmap *composite( QImage *, QImage * );
- QImage *loadImage( const QString &, const QColor & );
- QPixmap *loadPixmap( const QString &, const QColor & );
+ void addWidth (int width, TQPixmap *&pix, bool left, TQPixmap *bottomPix);
+ void addHeight (int height, TQPixmap *&pix);
+ void flip( TQPixmap *&, TQPixmap *& );
+ void pretile( TQPixmap *&, int, Qt::Orientation );
+ TQPixmap *composite( TQImage *, TQImage * );
+ TQImage *loadImage( const TQString &, const TQColor & );
+ TQPixmap *loadPixmap( const TQString &, const TQColor & );
bool showIcons:1, shadowedText:1,
smallCaptionBubbles:1, largeGrabBars:1;
SettingsCache *settings_cache;
KeramikImageDb *imageDb;
- QPixmap *activeTiles[ NumTiles ];
- QPixmap *inactiveTiles[ NumTiles ];
- QBitmap *buttonDecos[ NumButtonDecos ];
+ TQPixmap *activeTiles[ NumTiles ];
+ TQPixmap *inactiveTiles[ NumTiles ];
+ TQBitmap *buttonDecos[ NumButtonDecos ];
- QPixmap *titleButtonRound, *titleButtonSquare;
+ TQPixmap *titleButtonRound, *titleButtonSquare;
}; // class KeramikHandler
@@ -114,17 +114,17 @@ namespace Keramik {
class KeramikButton : public QButton
{
public:
- KeramikButton( KeramikClient *, const char *, Button, const QString &, const int realizeBtns = LeftButton );
+ KeramikButton( KeramikClient *, const char *, Button, const TQString &, const int realizeBtns = LeftButton );
~KeramikButton();
ButtonState lastButton() const { return lastbutton; }
private:
- void enterEvent( QEvent * );
- void leaveEvent( QEvent * );
- void mousePressEvent( QMouseEvent * );
- void mouseReleaseEvent( QMouseEvent * );
- void drawButton( QPainter * );
+ void enterEvent( TQEvent * );
+ void leaveEvent( TQEvent * );
+ void mousePressEvent( TQMouseEvent * );
+ void mouseReleaseEvent( TQMouseEvent * );
+ void drawButton( TQPainter * );
private:
KeramikClient *client;
@@ -145,11 +145,11 @@ namespace Keramik {
~KeramikClient();
virtual void init();
virtual void reset( unsigned long changed );
- virtual Position mousePosition( const QPoint& p ) const;
+ virtual Position mousePosition( const TQPoint& p ) const;
virtual void borders( int& left, int& right, int& top, int& bottom ) const;
- virtual void resize( const QSize& s );
- virtual QSize minimumSize() const;
- virtual bool eventFilter( QObject* o, QEvent* e );
+ virtual void resize( const TQSize& s );
+ virtual TQSize minimumSize() const;
+ virtual bool eventFilter( TQObject* o, TQEvent* e );
virtual void activeChange();
virtual void captionChange();
virtual void maximizeChange();
@@ -158,14 +158,14 @@ namespace Keramik {
private:
void createLayout();
- void addButtons( QBoxLayout*, const QString & );
+ void addButtons( TQBoxLayout*, const TQString & );
void updateMask(); // FRAME
void updateCaptionBuffer();
void iconChange();
- void resizeEvent( QResizeEvent *); // FRAME
- void paintEvent( QPaintEvent *); // FRAME
- void mouseDoubleClickEvent( QMouseEvent * ); // FRAME
- void wheelEvent( QWheelEvent *); //FRAME
+ void resizeEvent( TQResizeEvent *); // FRAME
+ void paintEvent( TQPaintEvent *); // FRAME
+ void mouseDoubleClickEvent( TQMouseEvent * ); // FRAME
+ void wheelEvent( TQWheelEvent *); //FRAME
int width() const { return widget()->width(); }
int height() const { return widget()->height(); }
@@ -185,11 +185,11 @@ namespace Keramik {
void keepBelowChange( bool );
private:
- QSpacerItem *topSpacer, *titlebar;
+ TQSpacerItem *topSpacer, *titlebar;
KeramikButton *button[ NumButtons ];
- QRect captionRect;
- QPixmap captionBuffer;
- QPixmap *activeIcon, *inactiveIcon;
+ TQRect captionRect;
+ TQPixmap captionBuffer;
+ TQPixmap *activeIcon, *inactiveIcon;
bool captionBufferDirty:1, maskDirty:1;
bool largeCaption:1, largeTitlebar:1;
}; // class KeramikClient
diff --git a/kwin/clients/kwmtheme/cli_installer/main.cpp b/kwin/clients/kwmtheme/cli_installer/main.cpp
index bdc04a1de..abf2bad3d 100644
--- a/kwin/clients/kwmtheme/cli_installer/main.cpp
+++ b/kwin/clients/kwmtheme/cli_installer/main.cpp
@@ -1,5 +1,5 @@
-#include <qfile.h>
-#include <qdir.h>
+#include <tqfile.h>
+#include <tqdir.h>
#include <kapplication.h>
#include <ksimpleconfig.h>
#include <kglobal.h>
@@ -17,10 +17,10 @@ static KCmdLineOptions options[] =
KCmdLineLastOption
};
-void copy(const QString &src, const QString &dest)
+void copy(const TQString &src, const TQString &dest)
{
- QFile copyInput(src);
- QFile copyOutput(dest);
+ TQFile copyInput(src);
+ TQFile copyOutput(dest);
if(!copyInput.open(IO_ReadOnly)){
kdWarning() << "Couldn't open " << src << endl;
return;
@@ -48,25 +48,25 @@ int main(int argc, char **argv)
return(1);
}
- QString srcStr = QString(QFile::decodeName(args->arg(0)));
- QFile f(srcStr);
- QString tmpStr;
+ TQString srcStr = TQString(TQFile::decodeName(args->arg(0)));
+ TQFile f(srcStr);
+ TQString tmpStr;
if(!f.exists()){
kdWarning() << "Specified theme config file doesn't exist!" << endl;
return(2);
}
- QStringList appDirs = KGlobal::dirs()->findDirs("data", "kwin");
- QString localDirStr = *(appDirs.end());
+ TQStringList appDirs = KGlobal::dirs()->findDirs("data", "kwin");
+ TQString localDirStr = *(appDirs.end());
if(localDirStr.isEmpty()){
localDirStr = KGlobal::dirs()->saveLocation("data", "kwin");
}
localDirStr += "/pics/";
- if(!QFile::exists(localDirStr))
- QDir().mkdir(localDirStr);
+ if(!TQFile::exists(localDirStr))
+ TQDir().mkdir(localDirStr);
- QFileInfo fi(f);
+ TQFileInfo fi(f);
KSimpleConfig input(fi.absFilePath());
srcStr = fi.dirPath(true) + "/";
KConfig *output = KGlobal::config();
diff --git a/kwin/clients/kwmtheme/kwmthemeclient.cpp b/kwin/clients/kwmtheme/kwmthemeclient.cpp
index a422f31fb..89dc6a564 100644
--- a/kwin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/kwin/clients/kwmtheme/kwmthemeclient.cpp
@@ -1,26 +1,26 @@
#include <kconfig.h>
#include "kwmthemeclient.h"
#include <kglobal.h>
-#include <qlayout.h>
-#include <qdrawutil.h>
-#include <qpainter.h>
+#include <tqlayout.h>
+#include <tqdrawutil.h>
+#include <tqpainter.h>
#include <kpixmapeffect.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <klocale.h>
-#include <qbitmap.h>
-#include <qstyle.h>
-#include <qlabel.h>
-#include <qtooltip.h>
+#include <tqbitmap.h>
+#include <tqstyle.h>
+#include <tqlabel.h>
+#include <tqtooltip.h>
namespace KWMTheme {
-/* static QPixmap stretchPixmap(QPixmap& src, bool stretchVert){
- QPixmap dest;
- QBitmap *srcMask, *destMask;
+/* static TQPixmap stretchPixmap(TQPixmap& src, bool stretchVert){
+ TQPixmap dest;
+ TQBitmap *srcMask, *destMask;
int w, h, w2, h2;
- QPainter p;
+ TQPainter p;
if (src.isNull()) return src;
@@ -46,9 +46,9 @@ namespace KWMTheme {
p.drawTiledPixmap(0, 0, w2, h2, src);
p.end();
- srcMask = (QBitmap*)src.mask();
+ srcMask = (TQBitmap*)src.mask();
if (srcMask){
- destMask = (QBitmap*)dest.mask();
+ destMask = (TQBitmap*)dest.mask();
p.begin(destMask);
p.drawTiledPixmap(0, 0, w2, h2, *srcMask);
p.end();
@@ -62,8 +62,8 @@ inline const KDecorationOptions* options() { return KDecoration::options(); }
enum FramePixmap{FrameTop=0, FrameBottom, FrameLeft, FrameRight, FrameTopLeft,
FrameTopRight, FrameBottomLeft, FrameBottomRight};
-static QPixmap *framePixmaps[8];
-static QPixmap *menuPix, *iconifyPix, *closePix, *maxPix, *minmaxPix,
+static TQPixmap *framePixmaps[8];
+static TQPixmap *menuPix, *iconifyPix, *closePix, *maxPix, *minmaxPix,
*pinupPix, *pindownPix;
static KPixmap *aTitlePix = 0;
static KPixmap *iTitlePix = 0;
@@ -85,11 +85,11 @@ static void create_pixmaps()
KConfig *config = KGlobal::config();
config->setGroup("General");
- QString tmpStr;
+ TQString tmpStr;
for(int i=0; i < 8; ++i)
{
- framePixmaps[i] = new QPixmap(locate("data",
+ framePixmaps[i] = new TQPixmap(locate("data",
"kwin/pics/"+config->readEntry(keys[i], " ")));
if(framePixmaps[i]->isNull())
kdWarning() << "Unable to load frame pixmap for " << keys[i] << endl;
@@ -110,19 +110,19 @@ static void create_pixmaps()
maxExtent++;
- menuPix = new QPixmap(locate("data",
+ menuPix = new TQPixmap(locate("data",
"kwin/pics/"+config->readEntry("menu", " ")));
- iconifyPix = new QPixmap(locate("data",
+ iconifyPix = new TQPixmap(locate("data",
"kwin/pics/"+config->readEntry("iconify", " ")));
- maxPix = new QPixmap(locate("appdata",
+ maxPix = new TQPixmap(locate("appdata",
"pics/"+config->readEntry("maximize", " ")));
- minmaxPix = new QPixmap(locate("data",
+ minmaxPix = new TQPixmap(locate("data",
"kwin/pics/"+config->readEntry("maximizedown", " ")));
- closePix = new QPixmap(locate("data",
+ closePix = new TQPixmap(locate("data",
"kwin/pics/"+config->readEntry("close", " ")));
- pinupPix = new QPixmap(locate("data",
+ pinupPix = new TQPixmap(locate("data",
"kwin/pics/"+config->readEntry("pinup", " ")));
- pindownPix = new QPixmap(locate("data",
+ pindownPix = new TQPixmap(locate("data",
"kwin/pics/"+config->readEntry("pindown", " ")));
if(menuPix->isNull())
menuPix->load(locate("data", "kwin/pics/menu.png"));
@@ -222,7 +222,7 @@ static void delete_pixmaps()
titleSunken = false;
}
-void MyButton::drawButtonLabel(QPainter *p)
+void MyButton::drawButtonLabel(TQPainter *p)
{
if(pixmap()){
// If we have a theme who's button covers the entire width or
@@ -230,9 +230,9 @@ void MyButton::drawButtonLabel(QPainter *p)
// some visual notification of button presses. i.e. for MGBriezh
int offset = (isDown() && ((pixmap()->width() >= width()) ||
(pixmap()->height() >= height()))) ? 1 : 0;
- style().drawItem(p, QRect( offset, offset, width(), height() ),
+ style().drawItem(p, TQRect( offset, offset, width(), height() ),
AlignCenter, colorGroup(),
- true, pixmap(), QString::null);
+ true, pixmap(), TQString::null);
}
}
@@ -247,32 +247,32 @@ void KWMThemeClient::init()
widget()->installEventFilter( this );
stickyBtn = maxBtn = mnuBtn = 0;
- layout = new QGridLayout(widget());
+ layout = new TQGridLayout(widget());
layout->addColSpacing(0, maxExtent);
layout->addColSpacing(2, maxExtent);
layout->addRowSpacing(0, maxExtent);
- layout->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed,
- QSizePolicy::Expanding));
+ layout->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed,
+ TQSizePolicy::Expanding));
if( isPreview())
- layout->addWidget( new QLabel( i18n( "<center><b>KWMTheme</b></center>" ), widget()), 2, 1);
+ layout->addWidget( new TQLabel( i18n( "<center><b>KWMTheme</b></center>" ), widget()), 2, 1);
else
- layout->addItem( new QSpacerItem( 0, 0 ), 2, 1);
+ layout->addItem( new TQSpacerItem( 0, 0 ), 2, 1);
// Without the next line, shading flickers
- layout->addItem( new QSpacerItem(0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding) );
+ layout->addItem( new TQSpacerItem(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Expanding) );
layout->addRowSpacing(3, maxExtent);
layout->setRowStretch(2, 10);
layout->setColStretch(1, 10);
- QBoxLayout* hb = new QBoxLayout(0, QBoxLayout::LeftToRight, 0, 0, 0);
+ TQBoxLayout* hb = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0);
layout->addLayout( hb, 1, 1 );
KConfig *config = KGlobal::config();
config->setGroup("Buttons");
- QString val;
+ TQString val;
MyButton *btn;
int i;
static const char *defaultButtons[]={"Menu","Sticky","Off","Iconify",
@@ -280,54 +280,54 @@ void KWMThemeClient::init()
static const char keyOffsets[]={"ABCDEF"};
for(i=0; i < 6; ++i){
if(i == 3){
- titlebar = new QSpacerItem(10, 20, QSizePolicy::Expanding,
- QSizePolicy::Minimum );
+ titlebar = new TQSpacerItem(10, 20, TQSizePolicy::Expanding,
+ TQSizePolicy::Minimum );
hb->addItem( titlebar );
}
- QString key("Button");
- key += QChar(keyOffsets[i]);
+ TQString key("Button");
+ key += TQChar(keyOffsets[i]);
val = config->readEntry(key, defaultButtons[i]);
if(val == "Menu"){
mnuBtn = new MyButton(widget(), "menu");
- QToolTip::add( mnuBtn, i18n("Menu"));
+ TQToolTip::add( mnuBtn, i18n("Menu"));
iconChange();
hb->addWidget(mnuBtn);
mnuBtn->setFixedSize(20, 20);
- connect(mnuBtn, SIGNAL(pressed()), this,
- SLOT(menuButtonPressed()));
+ connect(mnuBtn, TQT_SIGNAL(pressed()), this,
+ TQT_SLOT(menuButtonPressed()));
}
else if(val == "Sticky"){
stickyBtn = new MyButton(widget(), "sticky");
- QToolTip::add( stickyBtn, i18n("Sticky"));
+ TQToolTip::add( stickyBtn, i18n("Sticky"));
if (isOnAllDesktops())
stickyBtn->setPixmap(*pindownPix);
else
stickyBtn->setPixmap(*pinupPix);
- connect(stickyBtn, SIGNAL( clicked() ), this, SLOT(toggleOnAllDesktops()));
+ connect(stickyBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT(toggleOnAllDesktops()));
hb->addWidget(stickyBtn);
stickyBtn->setFixedSize(20, 20);
}
else if((val == "Iconify") && isMinimizable()){
btn = new MyButton(widget(), "iconify");
- QToolTip::add( btn, i18n("Minimize"));
+ TQToolTip::add( btn, i18n("Minimize"));
btn->setPixmap(*iconifyPix);
- connect(btn, SIGNAL(clicked()), this, SLOT(minimize()));
+ connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(minimize()));
hb->addWidget(btn);
btn->setFixedSize(20, 20);
}
else if((val == "Maximize") && isMaximizable()){
maxBtn = new MyButton(widget(), "max");
- QToolTip::add( maxBtn, i18n("Maximize"));
+ TQToolTip::add( maxBtn, i18n("Maximize"));
maxBtn->setPixmap(*maxPix);
- connect(maxBtn, SIGNAL(clicked()), this, SLOT(maximize()));
+ connect(maxBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(maximize()));
hb->addWidget(maxBtn);
maxBtn->setFixedSize(20, 20);
}
else if((val == "Close") && isCloseable()){
btn = new MyButton(widget(), "close");
- QToolTip::add( btn, i18n("Close"));
+ TQToolTip::add( btn, i18n("Close"));
btn->setPixmap(*closePix);
- connect(btn, SIGNAL(clicked()), this, SLOT(closeWindow()));
+ connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeWindow()));
hb->addWidget(btn);
btn->setFixedSize(20, 20);
}
@@ -350,17 +350,17 @@ void KWMThemeClient::init()
widget()->setBackgroundMode(NoBackground);
}
-void KWMThemeClient::drawTitle(QPainter &dest)
+void KWMThemeClient::drawTitle(TQPainter &dest)
{
- QRect titleRect = titlebar->geometry();
- QRect r(0, 0, titleRect.width(), titleRect.height());
- QPixmap buffer;
+ TQRect titleRect = titlebar->geometry();
+ TQRect r(0, 0, titleRect.width(), titleRect.height());
+ TQPixmap buffer;
if(buffer.width() == r.width())
return;
buffer.resize(r.size());
- QPainter p;
+ TQPainter p;
p.begin(&buffer);
if(titleSunken){
@@ -385,7 +385,7 @@ void KWMThemeClient::drawTitle(QPainter &dest)
}
else{
p.fillRect(r, options()->colorGroup(KDecorationOptions::ColorTitleBar, isActive()).
- brush(QColorGroup::Button));
+ brush(TQColorGroup::Button));
}
p.setFont(options()->font(isActive()));
p.setPen(options()->color(KDecorationOptions::ColorFont, isActive()));
@@ -399,7 +399,7 @@ void KWMThemeClient::drawTitle(QPainter &dest)
}
-void KWMThemeClient::resizeEvent( QResizeEvent* )
+void KWMThemeClient::resizeEvent( TQResizeEvent* )
{
doShape();
widget()->repaint();
@@ -410,9 +410,9 @@ void KWMThemeClient::captionChange()
widget()->repaint( titlebar->geometry(), false );
}
-void KWMThemeClient::paintEvent( QPaintEvent *)
+void KWMThemeClient::paintEvent( TQPaintEvent *)
{
- QPainter p;
+ TQPainter p;
p.begin(widget());
int x,y;
// first the corners
@@ -445,8 +445,8 @@ void KWMThemeClient::paintEvent( QPaintEvent *)
framePixmaps[FrameBottomRight]->height()-h4,
w4, h4);
- QPixmap pm;
- QWMatrix m;
+ TQPixmap pm;
+ TQWMatrix m;
int n,s,w;
//top
pm = *framePixmaps[FrameTop];
@@ -557,7 +557,7 @@ void KWMThemeClient::paintEvent( QPaintEvent *)
}
drawTitle(p);
- QColor c = widget()->colorGroup().background();
+ TQColor c = widget()->colorGroup().background();
// KWM evidently had a 1 pixel border around the client window. We
// emulate it here, but should be removed at some point in order to
@@ -568,7 +568,7 @@ void KWMThemeClient::paintEvent( QPaintEvent *)
// We fill the area behind the wrapped widget to ensure that
// shading animation is drawn as smoothly as possible
- QRect r(layout->cellGeometry(2, 1));
+ TQRect r(layout->cellGeometry(2, 1));
p.fillRect( r.x(), r.y(), r.width(), r.height(), c);
p.end();
}
@@ -576,9 +576,9 @@ void KWMThemeClient::paintEvent( QPaintEvent *)
void KWMThemeClient::doShape()
{
- QBitmap shapemask(width(), height());
+ TQBitmap shapemask(width(), height());
shapemask.fill(color0);
- QPainter p;
+ TQPainter p;
p.begin(&shapemask);
p.setBrush(color1);
p.setPen(color1);
@@ -625,8 +625,8 @@ void KWMThemeClient::doShape()
else
p.fillRect(width()-w4,height()-h4,w4,h4,color1);
- QPixmap pm;
- QWMatrix m;
+ TQPixmap pm;
+ TQWMatrix m;
int n,s,w;
//top
if (framePixmaps[FrameTop]->mask())
@@ -744,13 +744,13 @@ void KWMThemeClient::doShape()
}
-void KWMThemeClient::showEvent(QShowEvent *)
+void KWMThemeClient::showEvent(TQShowEvent *)
{
doShape();
widget()->repaint(false);
}
-void KWMThemeClient::mouseDoubleClickEvent( QMouseEvent * e )
+void KWMThemeClient::mouseDoubleClickEvent( TQMouseEvent * e )
{
if (e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) )
titlebarDblClickOperation();
@@ -761,8 +761,8 @@ void KWMThemeClient::desktopChange()
if (stickyBtn) {
bool on = isOnAllDesktops();
stickyBtn->setPixmap(on ? *pindownPix : *pinupPix);
- QToolTip::remove( stickyBtn );
- QToolTip::add( stickyBtn, on ? i18n("Unsticky") : i18n("Sticky") );
+ TQToolTip::remove( stickyBtn );
+ TQToolTip::add( stickyBtn, on ? i18n("Unsticky") : i18n("Sticky") );
}
}
@@ -771,8 +771,8 @@ void KWMThemeClient::maximizeChange()
if (maxBtn) {
bool m = maximizeMode() == MaximizeFull;
maxBtn->setPixmap(m ? *minmaxPix : *maxPix);
- QToolTip::remove( maxBtn );
- QToolTip::add( maxBtn, m ? i18n("Restore") : i18n("Maximize"));
+ TQToolTip::remove( maxBtn );
+ TQToolTip::add( maxBtn, m ? i18n("Restore") : i18n("Maximize"));
}
}
@@ -786,7 +786,7 @@ void KWMThemeClient::activeChange()
widget()->update();
}
-KDecoration::Position KWMThemeClient::mousePosition(const QPoint &p) const
+KDecoration::Position KWMThemeClient::mousePosition(const TQPoint &p) const
{
Position m = KDecoration::mousePosition(p);
// corners
@@ -820,47 +820,47 @@ KDecoration::Position KWMThemeClient::mousePosition(const QPoint &p) const
void KWMThemeClient::menuButtonPressed()
{
mnuBtn->setDown(false); // will stay down if I don't do this
- QPoint pos = mnuBtn->mapToGlobal(mnuBtn->rect().bottomLeft());
+ TQPoint pos = mnuBtn->mapToGlobal(mnuBtn->rect().bottomLeft());
showWindowMenu( pos );
}
void KWMThemeClient::iconChange()
{
if(mnuBtn){
- if( icon().pixmap( QIconSet::Small, QIconSet::Normal ).isNull()){
+ if( icon().pixmap( TQIconSet::Small, TQIconSet::Normal ).isNull()){
mnuBtn->setPixmap(*menuPix);
}
else{
- mnuBtn->setPixmap(icon().pixmap( QIconSet::Small, QIconSet::Normal ));
+ mnuBtn->setPixmap(icon().pixmap( TQIconSet::Small, TQIconSet::Normal ));
}
}
}
-bool KWMThemeClient::eventFilter( QObject* o, QEvent* e )
+bool KWMThemeClient::eventFilter( TQObject* o, TQEvent* e )
{
if ( o != widget() )
return false;
switch ( e->type() )
{
- case QEvent::Resize:
- resizeEvent( static_cast< QResizeEvent* >( e ) );
+ case TQEvent::Resize:
+ resizeEvent( static_cast< TQResizeEvent* >( e ) );
return true;
- case QEvent::Paint:
- paintEvent( static_cast< QPaintEvent* >( e ) );
+ case TQEvent::Paint:
+ paintEvent( static_cast< TQPaintEvent* >( e ) );
return true;
- case QEvent::MouseButtonDblClick:
- mouseDoubleClickEvent( static_cast< QMouseEvent* >( e ) );
+ case TQEvent::MouseButtonDblClick:
+ mouseDoubleClickEvent( static_cast< TQMouseEvent* >( e ) );
return true;
- case QEvent::MouseButtonPress:
- processMousePressEvent( static_cast< QMouseEvent* >( e ) );
+ case TQEvent::MouseButtonPress:
+ processMousePressEvent( static_cast< TQMouseEvent* >( e ) );
return true;
- case QEvent::Show:
- showEvent( static_cast< QShowEvent* >( e ) );
+ case TQEvent::Show:
+ showEvent( static_cast< TQShowEvent* >( e ) );
return true;
default:
@@ -868,12 +868,12 @@ bool KWMThemeClient::eventFilter( QObject* o, QEvent* e )
}
}
-QSize KWMThemeClient::minimumSize() const
+TQSize KWMThemeClient::minimumSize() const
{
- return widget()->minimumSize().expandedTo( QSize( 100, 50 ));
+ return widget()->minimumSize().expandedTo( TQSize( 100, 50 ));
}
-void KWMThemeClient::resize( const QSize& s )
+void KWMThemeClient::resize( const TQSize& s )
{
widget()->resize( s );
}
diff --git a/kwin/clients/kwmtheme/kwmthemeclient.h b/kwin/clients/kwmtheme/kwmthemeclient.h
index b1d623965..7357f6c26 100644
--- a/kwin/clients/kwmtheme/kwmthemeclient.h
+++ b/kwin/clients/kwmtheme/kwmthemeclient.h
@@ -1,8 +1,8 @@
#ifndef __KWMTHEMECLIENT_H
#define __KWMTHEMECLIENT_H
-#include <qbutton.h>
-#include <qtoolbutton.h>
+#include <tqbutton.h>
+#include <tqtoolbutton.h>
#include <kpixmap.h>
#include <kdecoration.h>
#include <kdecorationfactory.h>
@@ -16,10 +16,10 @@ namespace KWMTheme {
class MyButton : public QToolButton
{
public:
- MyButton(QWidget *parent=0, const char *name=0)
- : QToolButton(parent, name){setAutoRaise(true);setCursor( arrowCursor ); }
+ MyButton(TQWidget *parent=0, const char *name=0)
+ : TQToolButton(parent, name){setAutoRaise(true);setCursor( arrowCursor ); }
protected:
- void drawButtonLabel(QPainter *p);
+ void drawButtonLabel(TQPainter *p);
};
class KWMThemeClient : public KDecoration
@@ -29,34 +29,34 @@ public:
KWMThemeClient( KDecorationBridge* b, KDecorationFactory* f );
~KWMThemeClient(){;}
void init();
- void resize( const QSize& s );
- QSize minimumSize() const;
+ void resize( const TQSize& s );
+ TQSize minimumSize() const;
void borders( int& left, int& right, int& top, int& bottom ) const;
protected:
void doShape();
- void drawTitle(QPainter &p);
- void resizeEvent( QResizeEvent* );
- void paintEvent( QPaintEvent* );
- void showEvent( QShowEvent* );
- void mouseDoubleClickEvent( QMouseEvent * );
- bool eventFilter( QObject* o, QEvent* e );
+ void drawTitle(TQPainter &p);
+ void resizeEvent( TQResizeEvent* );
+ void paintEvent( TQPaintEvent* );
+ void showEvent( TQShowEvent* );
+ void mouseDoubleClickEvent( TQMouseEvent * );
+ bool eventFilter( TQObject* o, TQEvent* e );
void captionChange();
void desktopChange();
void maximizeChange();
void iconChange();
void activeChange();
void shadeChange() {};
- Position mousePosition(const QPoint &) const;
+ Position mousePosition(const TQPoint &) const;
protected slots:
//void slotReset();
void menuButtonPressed();
void slotMaximize();
private:
- QPixmap buffer;
+ TQPixmap buffer;
KPixmap *aGradient, *iGradient;
MyButton *maxBtn, *stickyBtn, *mnuBtn;
- QSpacerItem *titlebar;
- QGridLayout* layout;
+ TQSpacerItem *titlebar;
+ TQGridLayout* layout;
};
class KWMThemeFactory : public KDecorationFactory
diff --git a/kwin/clients/laptop/laptopclient.cpp b/kwin/clients/laptop/laptopclient.cpp
index 4d959ff8c..db91cf15d 100644
--- a/kwin/clients/laptop/laptopclient.cpp
+++ b/kwin/clients/laptop/laptopclient.cpp
@@ -8,12 +8,12 @@
#include <kconfig.h> // up here to avoid X11 header conflict :P
#include "laptopclient.h"
-#include <qdrawutil.h>
+#include <tqdrawutil.h>
#include <kpixmapeffect.h>
#include <kdrawutil.h>
#include <kglobal.h>
#include <klocale.h>
-#include <qbitmap.h>
+#include <tqbitmap.h>
namespace Laptop {
@@ -41,7 +41,7 @@ static const unsigned char unsticky_bits[] = {
static const unsigned char sticky_bits[] = {
0x3c, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x3c};
-static QPixmap *titlePix;
+static TQPixmap *titlePix;
static KPixmap *aUpperGradient;
static KPixmap *iUpperGradient;
// buttons active, inactive, up, down, and 2 sizes :P
@@ -53,7 +53,7 @@ static KPixmap *btnPix2;
static KPixmap *btnDownPix2;
static KPixmap *iBtnPix2;
static KPixmap *iBtnDownPix2;
-static QColor btnForeground;
+static TQColor btnForeground;
static int titleHeight = 14;
static int btnWidth1 = 17;
@@ -77,9 +77,9 @@ static inline const KDecorationOptions* options()
return KDecoration::options();
}
-static void drawButtonFrame(KPixmap *pix, const QColorGroup &g, bool sunken)
+static void drawButtonFrame(KPixmap *pix, const TQColorGroup &g, bool sunken)
{
- QPainter p;
+ TQPainter p;
int w = pix->width();
int h = pix->height();
int x2 = w-1;
@@ -107,7 +107,7 @@ static void create_pixmaps()
return;
pixmaps_created = true;
- titleHeight = QFontMetrics(options()->font(true)).height() + 2;
+ titleHeight = TQFontMetrics(options()->font(true)).height() + 2;
if (titleHeight < handleSize) titleHeight = handleSize;
titleHeight &= ~1; // Make title height even
if (titleHeight < 14) titleHeight = 14;
@@ -116,11 +116,11 @@ static void create_pixmaps()
btnWidth2 = 3*titleHeight/2 + 6;
// titlebar
- QPainter p;
- QPainter maskPainter;
+ TQPainter p;
+ TQPainter maskPainter;
int i, x, y;
- titlePix = new QPixmap(33, 12);
- QBitmap mask(33, 12);
+ titlePix = new TQPixmap(33, 12);
+ TQBitmap mask(33, 12);
mask.fill(Qt::color0);
p.begin(titlePix);
@@ -140,12 +140,12 @@ static void create_pixmaps()
maskPainter.end();
titlePix->setMask(mask);
- if(QPixmap::defaultDepth() > 8){
+ if(TQPixmap::defaultDepth() > 8){
aUpperGradient = new KPixmap;
aUpperGradient->resize(32, titleHeight+2);
iUpperGradient = new KPixmap;
iUpperGradient->resize(32, titleHeight+2);
- QColor bgColor = options()->color(KDecoration::ColorTitleBar, true);
+ TQColor bgColor = options()->color(KDecoration::ColorTitleBar, true);
KPixmapEffect::gradient(*aUpperGradient,
bgColor.light(120),
bgColor.dark(120),
@@ -157,8 +157,8 @@ static void create_pixmaps()
KPixmapEffect::VerticalGradient);
}
// buttons (active/inactive, sunken/unsunken, 2 sizes each)
- QColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true);
- QColor c = g.background();
+ TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true);
+ TQColor c = g.background();
btnPix1 = new KPixmap;
btnPix1->resize(btnWidth1, titleHeight);
btnDownPix1 = new KPixmap;
@@ -175,7 +175,7 @@ static void create_pixmaps()
iBtnPix2->resize(btnWidth2, titleHeight);
iBtnDownPix2 = new KPixmap;
iBtnDownPix2->resize(btnWidth2, titleHeight);
- if(QPixmap::defaultDepth() > 8){
+ if(TQPixmap::defaultDepth() > 8){
KPixmapEffect::gradient(*btnPix1, c.light(120), c.dark(130),
KPixmapEffect::DiagonalGradient);
KPixmapEffect::gradient(*btnDownPix1, c.dark(130), c.light(120),
@@ -249,7 +249,7 @@ static void delete_pixmaps()
LaptopButton::LaptopButton(ButtonType type, LaptopClient *parent, const char *name)
: KCommonDecorationButton(type, parent, name)
{
- setBackgroundMode(QWidget::NoBackground);
+ setBackgroundMode(TQWidget::NoBackground);
}
void LaptopButton::reset(unsigned long changed)
@@ -287,16 +287,16 @@ void LaptopButton::reset(unsigned long changed)
void LaptopButton::setBitmap(const unsigned char *bitmap)
{
if (bitmap)
- deco = QBitmap(8, 8, bitmap, true);
+ deco = TQBitmap(8, 8, bitmap, true);
else {
- deco = QBitmap(8,8);
+ deco = TQBitmap(8,8);
deco.fill(Qt::color0);
}
deco.setMask(deco);
repaint();
}
-void LaptopButton::drawButton(QPainter *p)
+void LaptopButton::drawButton(TQPainter *p)
{
bool smallBtn = width() == btnWidth1;
if(btnPix1){
@@ -314,7 +314,7 @@ void LaptopButton::drawButton(QPainter *p)
}
}
else{
- QColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, decoration()->isActive());
+ TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, decoration()->isActive());
int w = width();
int h = height();
p->fillRect(1, 1, w-2, h-2, isDown() ? g.mid() : g.button());
@@ -348,17 +348,17 @@ LaptopClient::~LaptopClient()
{
}
-QString LaptopClient::visibleName() const
+TQString LaptopClient::visibleName() const
{
return i18n("Laptop");
}
-QString LaptopClient::defaultButtonsLeft() const
+TQString LaptopClient::defaultButtonsLeft() const
{
return "X";
}
-QString LaptopClient::defaultButtonsRight() const
+TQString LaptopClient::defaultButtonsRight() const
{
return "HSIA";
}
@@ -466,12 +466,12 @@ void LaptopClient::captionChange()
KCommonDecoration::captionChange();
}
-void LaptopClient::paintEvent( QPaintEvent* )
+void LaptopClient::paintEvent( TQPaintEvent* )
{
- QPainter p(widget());
- QColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive());
+ TQPainter p(widget());
+ TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive());
- QRect r(widget()->rect());
+ TQRect r(widget()->rect());
p.setPen(Qt::black);
p.drawRect(r);
@@ -511,18 +511,18 @@ void LaptopClient::paintEvent( QPaintEvent* )
if (r.width() > 3*handleSize + 20) {
int range = 8 + 3*handleSize/2;
qDrawShadePanel(&p, r.x() + 1, r.bottom() - bs, range,
- handleSize - 2, g, false, 1, &g.brush(QColorGroup::Mid));
+ handleSize - 2, g, false, 1, &g.brush(TQColorGroup::Mid));
qDrawShadePanel(&p, r.x() + range + 1, r.bottom() - bs,
r.width() - 2*range - 2, handleSize - 2, g, false, 1,
- isActive() ? &g.brush(QColorGroup::Background) :
- &g.brush(QColorGroup::Mid));
+ isActive() ? &g.brush(TQColorGroup::Background) :
+ &g.brush(TQColorGroup::Mid));
qDrawShadePanel(&p, r.right() - range, r.bottom() - bs,
- range, bs, g, false, 1, &g.brush(QColorGroup::Mid));
+ range, bs, g, false, 1, &g.brush(TQColorGroup::Mid));
} else {
qDrawShadePanel(&p, r.x() + 1, r.bottom() - bs,
r.width() - 2, bs, g, false, 1,
- isActive() ? &g.brush(QColorGroup::Background) :
- &g.brush(QColorGroup::Mid));
+ isActive() ? &g.brush(TQColorGroup::Background) :
+ &g.brush(TQColorGroup::Mid));
}
}
@@ -545,7 +545,7 @@ void LaptopClient::paintEvent( QPaintEvent* )
options()->color(KDecoration::ColorTitleBar, false));
p.setFont(options()->font(false, isToolWindow() ));
- QFontMetrics fm(options()->font(false));
+ TQFontMetrics fm(options()->font(false));
g = options()->colorGroup(KDecoration::ColorTitleBar, false);
if(iUpperGradient)
p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4,
@@ -554,7 +554,7 @@ void LaptopClient::paintEvent( QPaintEvent* )
else
p.fillRect(r.x()+((r.width()-fm.width(caption()))/2)-4, r.y(),
fm.width(caption())+8, r.height()-1,
- g.brush(QColorGroup::Background));
+ g.brush(TQColorGroup::Background));
p.setPen(g.mid());
p.drawLine(r.x(), r.y(), r.right(), r.y());
p.drawLine(r.x(), r.y(), r.x(), r.bottom());
@@ -572,23 +572,23 @@ void LaptopClient::paintEvent( QPaintEvent* )
}
}
-QRegion LaptopClient::cornerShape(WindowCorner corner)
+TQRegion LaptopClient::cornerShape(WindowCorner corner)
{
switch (corner) {
case WC_TopLeft:
- return QRect(0, 0, 1, 1);
+ return TQRect(0, 0, 1, 1);
case WC_TopRight:
- return QRect(width()-1, 0, 1, 1);
+ return TQRect(width()-1, 0, 1, 1);
case WC_BottomLeft:
- return QRect(0, height()-1, 1, 1);
+ return TQRect(0, height()-1, 1, 1);
case WC_BottomRight:
- return QRect(width()-1, height()-1, 1, 1);
+ return TQRect(width()-1, height()-1, 1, 1);
default:
- return QRegion();
+ return TQRegion();
}
}
@@ -605,7 +605,7 @@ bool LaptopClient::mustDrawHandle() const
void LaptopClient::updateActiveBuffer( )
{
- QRect rTitle = titleRect();
+ TQRect rTitle = titleRect();
if( !bufferDirty && (lastBufferWidth == rTitle.width()))
return;
if ( rTitle.width() <= 0 || rTitle.height() <= 0 )
@@ -615,8 +615,8 @@ void LaptopClient::updateActiveBuffer( )
activeBuffer.resize(rTitle.width(),
rTitle.height());
- QPainter p;
- QRect r(0, 0, activeBuffer.width(), activeBuffer.height());
+ TQPainter p;
+ TQRect r(0, 0, activeBuffer.width(), activeBuffer.height());
p.begin(&activeBuffer);
if(aUpperGradient){
p.drawTiledPixmap(r, *aUpperGradient);
@@ -628,8 +628,8 @@ void LaptopClient::updateActiveBuffer( )
p.drawTiledPixmap(r, *titlePix);
p.setFont(options()->font(true, isToolWindow() ));
- QFontMetrics fm(options()->font(true));
- QColorGroup g = options()->colorGroup(KDecoration::ColorTitleBar, true);
+ TQFontMetrics fm(options()->font(true));
+ TQColorGroup g = options()->colorGroup(KDecoration::ColorTitleBar, true);
if(aUpperGradient)
p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4,
r.y(), fm.width(caption())+8, r.height()-1,
@@ -637,7 +637,7 @@ void LaptopClient::updateActiveBuffer( )
else
p.fillRect(r.x()+((r.width()-fm.width(caption()))/2)-4, 0,
fm.width(caption())+8, r.height(),
- g.brush(QColorGroup::Background));
+ g.brush(TQColorGroup::Background));
p.setPen(g.mid());
p.drawLine(r.x(), r.y(), r.right(), r.y());
p.drawLine(r.x(), r.y(), r.x(), r.bottom());
@@ -723,11 +723,11 @@ bool LaptopClientFactory::supports( Ability ability )
};
}
-QValueList< LaptopClientFactory::BorderSize >
+TQValueList< LaptopClientFactory::BorderSize >
LaptopClientFactory::borderSizes() const
{
// the list must be sorted
- return QValueList< BorderSize >() << BorderNormal << BorderLarge <<
+ return TQValueList< BorderSize >() << BorderNormal << BorderLarge <<
BorderVeryLarge << BorderHuge << BorderVeryHuge << BorderOversized;
}
diff --git a/kwin/clients/laptop/laptopclient.h b/kwin/clients/laptop/laptopclient.h
index b2e8c3555..3413b490a 100644
--- a/kwin/clients/laptop/laptopclient.h
+++ b/kwin/clients/laptop/laptopclient.h
@@ -7,7 +7,7 @@
#ifndef __KDECLIENT_H
#define __KDECLIENT_H
-#include <qbitmap.h>
+#include <tqbitmap.h>
#include <kpixmap.h>
#include <kcommondecoration.h>
#include <kdecorationfactory.h>
@@ -24,8 +24,8 @@ public:
virtual void reset(unsigned long changed);
protected:
- virtual void drawButton(QPainter *p);
- QBitmap deco;
+ virtual void drawButton(TQPainter *p);
+ TQBitmap deco;
};
class LaptopClient : public KCommonDecoration
@@ -34,18 +34,18 @@ public:
LaptopClient( KDecorationBridge* b, KDecorationFactory* f );
~LaptopClient();
- virtual QString visibleName() const;
- virtual QString defaultButtonsLeft() const;
- virtual QString defaultButtonsRight() const;
+ virtual TQString visibleName() const;
+ virtual TQString defaultButtonsLeft() const;
+ virtual TQString defaultButtonsRight() const;
virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
virtual KCommonDecorationButton *createButton(ButtonType type);
- virtual QRegion cornerShape(WindowCorner corner);
+ virtual TQRegion cornerShape(WindowCorner corner);
void init();
protected:
- void paintEvent( QPaintEvent* );
+ void paintEvent( TQPaintEvent* );
void reset( unsigned long );
void updateActiveBuffer();
void captionChange();
@@ -58,7 +58,7 @@ private:
bool bufferDirty;
};
-class LaptopClientFactory : public QObject, public KDecorationFactory
+class LaptopClientFactory : public TQObject, public KDecorationFactory
{
public:
LaptopClientFactory();
@@ -66,7 +66,7 @@ public:
virtual KDecoration* createDecoration( KDecorationBridge* );
virtual bool reset( unsigned long changed );
virtual bool supports( Ability ability );
- virtual QValueList< BorderSize > borderSizes() const;
+ virtual TQValueList< BorderSize > borderSizes() const;
private:
void findPreferredHandleSize();
};
diff --git a/kwin/clients/modernsystem/config/config.cpp b/kwin/clients/modernsystem/config/config.cpp
index 542494d28..8a94c1748 100644
--- a/kwin/clients/modernsystem/config/config.cpp
+++ b/kwin/clients/modernsystem/config/config.cpp
@@ -5,14 +5,14 @@
#include <kdialog.h>
#include <klocale.h>
#include <kglobal.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
#include "config.h"
extern "C"
{
- KDE_EXPORT QObject* allocate_config(KConfig* conf, QWidget* parent)
+ KDE_EXPORT TQObject* allocate_config(KConfig* conf, TQWidget* parent)
{
return(new ModernSysConfig(conf, parent));
}
@@ -22,54 +22,54 @@ extern "C"
// 'conf' is a pointer to the kwindecoration modules open kwin config,
// and is by default set to the "Style" group.
//
-// 'parent' is the parent of the QObject, which is a VBox inside the
+// 'parent' is the parent of the TQObject, which is a VBox inside the
// Configure tab in kwindecoration
-ModernSysConfig::ModernSysConfig(KConfig* conf, QWidget* parent) : QObject(parent)
+ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(parent)
{
clientrc = new KConfig("kwinmodernsysrc");
KGlobal::locale()->insertCatalogue("kwin_clients");
- mainw = new QWidget(parent);
- vbox = new QVBoxLayout(mainw);
+ mainw = new TQWidget(parent);
+ vbox = new TQVBoxLayout(mainw);
vbox->setSpacing(6);
vbox->setMargin(0);
- handleBox = new QWidget(mainw);
- QGridLayout* layout = new QGridLayout(handleBox, 0, KDialog::spacingHint());
+ handleBox = new TQWidget(mainw);
+ TQGridLayout* layout = new TQGridLayout(handleBox, 0, KDialog::spacingHint());
- cbShowHandle = new QCheckBox(i18n("&Show window resize handle"), handleBox);
- QWhatsThis::add(cbShowHandle,
+ cbShowHandle = new TQCheckBox(i18n("&Show window resize handle"), handleBox);
+ TQWhatsThis::add(cbShowHandle,
i18n("When selected, all windows are drawn with a resize "
"handle at the lower right corner. This makes window resizing "
"easier, especially for trackballs and other mouse replacements "
"on laptops."));
layout->addMultiCellWidget(cbShowHandle, 0, 0, 0, 1);
- connect(cbShowHandle, SIGNAL(clicked()), this, SLOT(slotSelectionChanged()));
+ connect(cbShowHandle, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()));
- sliderBox = new QVBox(handleBox);
- handleSizeSlider = new QSlider(0, 4, 1, 0, QSlider::Horizontal, sliderBox);
- QWhatsThis::add(handleSizeSlider,
+ sliderBox = new TQVBox(handleBox);
+ handleSizeSlider = new TQSlider(0, 4, 1, 0, TQSlider::Horizontal, sliderBox);
+ TQWhatsThis::add(handleSizeSlider,
i18n("Here you can change the size of the resize handle."));
handleSizeSlider->setTickInterval(1);
- handleSizeSlider->setTickmarks(QSlider::Below);
- connect(handleSizeSlider, SIGNAL(valueChanged(int)), this, SLOT(slotSelectionChanged()));
+ handleSizeSlider->setTickmarks(TQSlider::Below);
+ connect(handleSizeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSelectionChanged()));
- hbox = new QHBox(sliderBox);
+ hbox = new TQHBox(sliderBox);
hbox->setSpacing(6);
bool rtl = kapp->reverseLayout();
- label1 = new QLabel(i18n("Small"), hbox);
+ label1 = new TQLabel(i18n("Small"), hbox);
label1->setAlignment(rtl ? AlignRight : AlignLeft);
- label2 = new QLabel(i18n("Medium"), hbox);
+ label2 = new TQLabel(i18n("Medium"), hbox);
label2->setAlignment(AlignHCenter);
- label3 = new QLabel(i18n("Large"), hbox);
+ label3 = new TQLabel(i18n("Large"), hbox);
label3->setAlignment(rtl ? AlignLeft : AlignRight);
vbox->addWidget(handleBox);
vbox->addStretch(1);
// layout->setColSpacing(0, 30);
- layout->addItem(new QSpacerItem(30, 10, QSizePolicy::Fixed, QSizePolicy::Fixed), 1, 0);
+ layout->addItem(new TQSpacerItem(30, 10, TQSizePolicy::Fixed, TQSizePolicy::Fixed), 1, 0);
layout->addWidget(sliderBox, 1, 1);
load(conf);
diff --git a/kwin/clients/modernsystem/config/config.h b/kwin/clients/modernsystem/config/config.h
index 4f4b97123..dcf4a588f 100644
--- a/kwin/clients/modernsystem/config/config.h
+++ b/kwin/clients/modernsystem/config/config.h
@@ -1,19 +1,19 @@
#ifndef __KDE_MODSYSTEMCONFIG_H
#define __KDE_MODSYSTEMCONFIG_H
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qlayout.h>
-#include <qvbox.h>
-#include <qslider.h>
-#include <qlabel.h>
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
+#include <tqlayout.h>
+#include <tqvbox.h>
+#include <tqslider.h>
+#include <tqlabel.h>
class ModernSysConfig : public QObject
{
Q_OBJECT
public:
- ModernSysConfig(KConfig* conf, QWidget* parent);
+ ModernSysConfig(KConfig* conf, TQWidget* parent);
~ModernSysConfig();
// These public signals/slots work similar to KCM modules
@@ -32,8 +32,8 @@ class ModernSysConfig : public QObject
KConfig *clientrc;
QWidget *mainw;
QVBoxLayout *vbox;
- QWidget *handleBox;
- QCheckBox *cbShowHandle;
+ TQWidget *handleBox;
+ TQCheckBox *cbShowHandle;
QVBox *sliderBox;
QSlider *handleSizeSlider;
QHBox *hbox;
diff --git a/kwin/clients/modernsystem/modernsys.cpp b/kwin/clients/modernsystem/modernsys.cpp
index d75816343..ce7545cdf 100644
--- a/kwin/clients/modernsystem/modernsys.cpp
+++ b/kwin/clients/modernsystem/modernsys.cpp
@@ -4,19 +4,19 @@
#include <kconfig.h>
#include <kglobal.h>
#include <klocale.h>
-#include <qlayout.h>
-#include <qdrawutil.h>
+#include <tqlayout.h>
+#include <tqdrawutil.h>
#include <kpixmapeffect.h>
#include <kdrawutil.h>
-#include <qbitmap.h>
-#include <qtooltip.h>
-#include <qapplication.h>
-#include <qlabel.h>
+#include <tqbitmap.h>
+#include <tqtooltip.h>
+#include <tqapplication.h>
+#include <tqlabel.h>
#include "modernsys.h"
#include "buttondata.h"
#include "btnhighcolor.h"
-#include <qimage.h>
+#include <tqimage.h>
namespace ModernSystem {
@@ -73,19 +73,19 @@ static unsigned char btnhighcolor_mask_bits[] = {
static KPixmap *aUpperGradient=0;
static KPixmap *iUpperGradient=0;
-static QPixmap *buttonPix=0;
-static QPixmap *buttonPixDown=0;
-static QPixmap *iButtonPix=0;
-static QPixmap *iButtonPixDown=0;
+static TQPixmap *buttonPix=0;
+static TQPixmap *buttonPixDown=0;
+static TQPixmap *iButtonPix=0;
+static TQPixmap *iButtonPixDown=0;
-static QColor *buttonFg;
+static TQColor *buttonFg;
static bool pixmaps_created = false;
-static QBitmap *lcDark1;
-static QBitmap *lcDark2;
-static QBitmap *lcDark3;
-static QBitmap *lcLight1;
-static QImage *btnSource;
+static TQBitmap *lcDark1;
+static TQBitmap *lcDark2;
+static TQBitmap *lcDark3;
+static TQBitmap *lcLight1;
+static TQImage *btnSource;
static bool show_handle;
static int handle_size;
@@ -98,25 +98,25 @@ static inline const KDecorationOptions* options()
return KDecoration::options();
}
-static void make_button_fx(const QColorGroup &g, QPixmap *pix, bool light=false)
+static void make_button_fx(const TQColorGroup &g, TQPixmap *pix, bool light=false)
{
pix->fill(g.background());
- QPainter p(pix);
+ TQPainter p(pix);
- if(QPixmap::defaultDepth() > 8){
+ if(TQPixmap::defaultDepth() > 8){
int i, destH, destS, destV, srcH, srcS, srcV;
- QColor btnColor = g.background();
+ TQColor btnColor = g.background();
if(btnSource->depth() < 32)
*btnSource = btnSource->convertDepth(32);
if(light)
btnColor = btnColor.light(120);
btnColor.hsv(&destH, &destS, &destV);
- QImage btnDest(14, 15, 32);
+ TQImage btnDest(14, 15, 32);
unsigned int *srcData = (unsigned int *)btnSource->bits();
unsigned int *destData = (unsigned int *)btnDest.bits();
- QColor srcColor;
+ TQColor srcColor;
for(i=0; i < btnSource->width()*btnSource->height(); ++i){
srcColor.setRgb(srcData[i]);
srcColor.hsv(&srcH, &srcS, &srcV);
@@ -150,13 +150,13 @@ static void create_pixmaps()
return;
pixmaps_created = true;
- lcDark1 = new QBitmap(14, 15, lowcolor_6a696a_bits, true);
- lcDark2 = new QBitmap(14, 15, lowcolor_949194_bits, true);
- lcDark3 = new QBitmap(14, 15, lowcolor_b4b6b4_bits, true);
- lcLight1 = new QBitmap(14, 15, lowcolor_e6e6e6_bits, true);
- btnSource = new QImage(btnhighcolor_xpm);
+ lcDark1 = new TQBitmap(14, 15, lowcolor_6a696a_bits, true);
+ lcDark2 = new TQBitmap(14, 15, lowcolor_949194_bits, true);
+ lcDark3 = new TQBitmap(14, 15, lowcolor_b4b6b4_bits, true);
+ lcLight1 = new TQBitmap(14, 15, lowcolor_e6e6e6_bits, true);
+ btnSource = new TQImage(btnhighcolor_xpm);
- if(QPixmap::defaultDepth() > 8){
+ if(TQPixmap::defaultDepth() > 8){
aUpperGradient = new KPixmap;
aUpperGradient->resize(32, title_height+2);
iUpperGradient = new KPixmap;
@@ -171,23 +171,23 @@ static void create_pixmaps()
KPixmapEffect::VerticalGradient);
}
// buttons
- QColorGroup btnColor(options()->colorGroup(KDecoration::ColorButtonBg, true));
- buttonPix = new QPixmap(14, 15);
+ TQColorGroup btnColor(options()->colorGroup(KDecoration::ColorButtonBg, true));
+ buttonPix = new TQPixmap(14, 15);
make_button_fx(btnColor, buttonPix);
- buttonPixDown = new QPixmap(14, 15);
+ buttonPixDown = new TQPixmap(14, 15);
make_button_fx(btnColor, buttonPixDown, true);
btnColor = options()->colorGroup(KDecoration::ColorButtonBg, false);
- iButtonPix = new QPixmap(14, 15);
+ iButtonPix = new TQPixmap(14, 15);
make_button_fx(btnColor, iButtonPix);
- iButtonPixDown = new QPixmap(14, 15);
+ iButtonPixDown = new TQPixmap(14, 15);
make_button_fx(btnColor, iButtonPixDown, true);
if(qGray(btnColor.background().rgb()) < 150)
- buttonFg = new QColor(Qt::white);
+ buttonFg = new TQColor(Qt::white);
else
- buttonFg = new QColor(Qt::black);
+ buttonFg = new TQColor(Qt::black);
delete lcDark1;
delete lcDark2;
@@ -263,7 +263,7 @@ void ModernSysFactory::read_config()
bwidth = 4;
}
- theight = QFontMetrics(options()->font(true)).height() + 2;
+ theight = TQFontMetrics(options()->font(true)).height() + 2;
if (theight < 16)
theight = 16;
if (theight < bwidth)
@@ -276,9 +276,9 @@ void ModernSysFactory::read_config()
title_height = theight;
}
-QValueList< ModernSysFactory::BorderSize > ModernSysFactory::borderSizes() const
+TQValueList< ModernSysFactory::BorderSize > ModernSysFactory::borderSizes() const
{ // the list must be sorted
- return QValueList< BorderSize >() << BorderNormal << BorderLarge <<
+ return TQValueList< BorderSize >() << BorderNormal << BorderLarge <<
BorderVeryLarge << BorderHuge;
// as long as the buttons don't scale don't offer the largest two sizes.
// BorderVeryLarge << BorderHuge << BorderVeryHuge << BorderOversized;
@@ -289,7 +289,7 @@ ModernButton::ModernButton(ButtonType type, ModernSys *parent, const char *name)
{
setBackgroundMode( NoBackground );
- QBitmap mask(14, 15, QPixmap::defaultDepth() > 8 ?
+ TQBitmap mask(14, 15, TQPixmap::defaultDepth() > 8 ?
btnhighcolor_mask_bits : lowcolor_mask_bits, true);
resize(14, 15);
@@ -339,15 +339,15 @@ void ModernButton::reset(unsigned long changed)
void ModernButton::setBitmap(const unsigned char *bitmap)
{
if (bitmap)
- deco = QBitmap(8, 8, bitmap, true);
+ deco = TQBitmap(8, 8, bitmap, true);
else {
- deco = QBitmap(8,8);
+ deco = TQBitmap(8,8);
deco.fill(Qt::color0);
}
deco.setMask(deco);
}
-void ModernButton::drawButton(QPainter *p)
+void ModernButton::drawButton(TQPainter *p)
{
if(decoration()->isActive()){
if(buttonPix)
@@ -378,17 +378,17 @@ ModernSys::ModernSys( KDecorationBridge* b, KDecorationFactory* f )
{
}
-QString ModernSys::visibleName() const
+TQString ModernSys::visibleName() const
{
return i18n("Modern System");
}
-QString ModernSys::defaultButtonsLeft() const
+TQString ModernSys::defaultButtonsLeft() const
{
return "X";
}
-QString ModernSys::defaultButtonsRight() const
+TQString ModernSys::defaultButtonsRight() const
{
return "HSIA";
}
@@ -495,7 +495,7 @@ KCommonDecorationButton *ModernSys::createButton(ButtonType type)
void ModernSys::init()
{
- reverse = QApplication::reverseLayout();
+ reverse = TQApplication::reverseLayout();
KCommonDecoration::init();
@@ -507,24 +507,24 @@ void ModernSys::recalcTitleBuffer()
if(oldTitle == caption() && width() == titleBuffer.width())
return;
- QFontMetrics fm(options()->font(true));
+ TQFontMetrics fm(options()->font(true));
titleBuffer.resize(width(), title_height+2);
- QPainter p;
+ TQPainter p;
p.begin(&titleBuffer);
if(aUpperGradient)
p.drawTiledPixmap(0, 0, width(), title_height+2, *aUpperGradient);
else
p.fillRect(0, 0, width(), title_height+2,
options()->colorGroup(ColorTitleBar, true).
- brush(QColorGroup::Button));
+ brush(TQColorGroup::Button));
- QRect t = titleRect(); // titlebar->geometry();
+ TQRect t = titleRect(); // titlebar->geometry();
t.setTop( 2 );
t.setLeft( t.left() );
t.setRight( t.right() - 2 );
- QRegion r(t.x(), 0, t.width(), title_height+2);
- r -= QRect(t.x()+((t.width()-fm.width(caption()))/2)-4,
+ TQRegion r(t.x(), 0, t.width(), title_height+2);
+ r -= TQRect(t.x()+((t.width()-fm.width(caption()))/2)-4,
0, fm.width(caption())+8, title_height+2);
p.setClipRegion(r);
int i, ly;
@@ -551,14 +551,14 @@ void ModernSys::updateCaption()
widget()->update(titleRect() );
}
-void ModernSys::drawRoundFrame(QPainter &p, int x, int y, int w, int h)
+void ModernSys::drawRoundFrame(TQPainter &p, int x, int y, int w, int h)
{
kDrawRoundButton(&p, x, y, w, h,
options()->colorGroup(ColorFrame, isActive()), false);
}
-void ModernSys::paintEvent( QPaintEvent* )
+void ModernSys::paintEvent( TQPaintEvent* )
{
// update title buffer...
if (oldTitle != caption() || width() != titleBuffer.width() )
@@ -567,13 +567,13 @@ void ModernSys::paintEvent( QPaintEvent* )
int hs = handle_size;
int hw = handle_width;
- QPainter p( widget() );
- QRect t = titleRect(); // titlebar->geometry();
+ TQPainter p( widget() );
+ TQRect t = titleRect(); // titlebar->geometry();
- QBrush fillBrush(widget()->colorGroup().brush(QColorGroup::Background).pixmap() ?
- widget()->colorGroup().brush(QColorGroup::Background) :
+ TQBrush fillBrush(widget()->colorGroup().brush(TQColorGroup::Background).pixmap() ?
+ widget()->colorGroup().brush(TQColorGroup::Background) :
options()->colorGroup(ColorFrame, isActive()).
- brush(QColorGroup::Button));
+ brush(TQColorGroup::Button));
p.fillRect(1, title_height+3, width()-2, height()-(title_height+3), fillBrush);
p.fillRect(width()-6, 0, width()-1, height(), fillBrush);
@@ -586,7 +586,7 @@ void ModernSys::paintEvent( QPaintEvent* )
int h = height() - hw;
// titlebar
- QColorGroup g = options()->colorGroup(ColorTitleBar, isActive());
+ TQColorGroup g = options()->colorGroup(ColorTitleBar, isActive());
if(isActive()){
p.drawPixmap(1, 1, titleBuffer, 0, 0, w-2, title_height+2);
}
@@ -649,20 +649,20 @@ void ModernSys::updateWindowShape()
{
int hs = handle_size;
int hw = handle_width;
- QRegion mask;
- mask += QRect(0, 0, width()-hw, height()-hw);
+ TQRegion mask;
+ mask += TQRect(0, 0, width()-hw, height()-hw);
//single points
- mask -= QRect(0, 0, 1, 1);
- mask -= QRect(width()-hw-1, 0, 1, 1);
- mask -= QRect(0, height()-hw-1, 1, 1);
+ mask -= TQRect(0, 0, 1, 1);
+ mask -= TQRect(width()-hw-1, 0, 1, 1);
+ mask -= TQRect(0, height()-hw-1, 1, 1);
if (show_handle) {
- mask += QRect(width()-hs, height()-hs, hs-1, hs-1);
- mask -= QRect(width()-2, height()-2, 1, 1);
- mask -= QRect(width()-2, height()-hs, 1, 1);
- mask -= QRect(width()-hs, height()-2, 1, 1);
+ mask += TQRect(width()-hs, height()-hs, hs-1, hs-1);
+ mask -= TQRect(width()-2, height()-2, 1, 1);
+ mask -= TQRect(width()-2, height()-hs, 1, 1);
+ mask -= TQRect(width()-hs, height()-2, 1, 1);
} else
- mask -= QRect(width()-1, height()-1, 1, 1);
+ mask -= TQRect(width()-1, height()-1, 1, 1);
setMask(mask);
}
diff --git a/kwin/clients/modernsystem/modernsys.h b/kwin/clients/modernsystem/modernsys.h
index d185be048..2606d8786 100644
--- a/kwin/clients/modernsystem/modernsys.h
+++ b/kwin/clients/modernsystem/modernsys.h
@@ -1,7 +1,7 @@
#ifndef __MODSYSTEMCLIENT_H
#define __MODSYSTEMCLIENT_H
-#include <qbitmap.h>
+#include <tqbitmap.h>
#include <kpixmap.h>
#include <kcommondecoration.h>
#include <kdecorationfactory.h>
@@ -21,9 +21,9 @@ public:
virtual void reset(unsigned long changed);
protected:
- virtual void drawButton(QPainter *p);
- void drawButtonLabel(QPainter *){;}
- QBitmap deco;
+ virtual void drawButton(TQPainter *p);
+ void drawButtonLabel(TQPainter *){;}
+ TQBitmap deco;
};
class ModernSys : public KCommonDecoration
@@ -32,9 +32,9 @@ public:
ModernSys( KDecorationBridge* b, KDecorationFactory* f );
~ModernSys(){;}
- virtual QString visibleName() const;
- virtual QString defaultButtonsLeft() const;
- virtual QString defaultButtonsRight() const;
+ virtual TQString visibleName() const;
+ virtual TQString defaultButtonsLeft() const;
+ virtual TQString defaultButtonsRight() const;
virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
virtual KCommonDecorationButton *createButton(ButtonType type);
@@ -44,17 +44,17 @@ public:
void init();
protected:
- void drawRoundFrame(QPainter &p, int x, int y, int w, int h);
- void paintEvent( QPaintEvent* );
+ void drawRoundFrame(TQPainter &p, int x, int y, int w, int h);
+ void paintEvent( TQPaintEvent* );
void recalcTitleBuffer();
void reset( unsigned long );
private:
- QPixmap titleBuffer;
- QString oldTitle;
+ TQPixmap titleBuffer;
+ TQString oldTitle;
bool reverse;
};
-class ModernSysFactory : public QObject, public KDecorationFactory
+class ModernSysFactory : public TQObject, public KDecorationFactory
{
public:
ModernSysFactory();
@@ -62,7 +62,7 @@ public:
virtual KDecoration* createDecoration( KDecorationBridge* );
virtual bool reset( unsigned long changed );
virtual bool supports( Ability ability );
- QValueList< BorderSize > borderSizes() const;
+ TQValueList< BorderSize > borderSizes() const;
private:
void read_config();
};
diff --git a/kwin/clients/plastik/config/config.cpp b/kwin/clients/plastik/config/config.cpp
index 91ec501d0..0352bff91 100644
--- a/kwin/clients/plastik/config/config.cpp
+++ b/kwin/clients/plastik/config/config.cpp
@@ -20,12 +20,12 @@
Boston, MA 02110-1301, USA.
*/
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qslider.h>
-#include <qspinbox.h>
-#include <qwhatsthis.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqslider.h>
+#include <tqspinbox.h>
+#include <tqwhatsthis.h>
#include <kconfig.h>
#include <klocale.h>
@@ -34,8 +34,8 @@
#include "config.h"
#include "configdialog.h"
-PlastikConfig::PlastikConfig(KConfig* config, QWidget* parent)
- : QObject(parent), m_config(0), m_dialog(0)
+PlastikConfig::PlastikConfig(KConfig* config, TQWidget* parent)
+ : TQObject(parent), m_config(0), m_dialog(0)
{
// create the configuration object
m_config = new KConfig("kwinplastikrc");
@@ -49,16 +49,16 @@ PlastikConfig::PlastikConfig(KConfig* config, QWidget* parent)
load(config);
// setup the connections
- connect(m_dialog->titleAlign, SIGNAL(clicked(int)),
- this, SIGNAL(changed()));
- connect(m_dialog->animateButtons, SIGNAL(toggled(bool)),
- this, SIGNAL(changed()));
- connect(m_dialog->menuClose, SIGNAL(toggled(bool)),
- this, SIGNAL(changed()));
- connect(m_dialog->titleShadow, SIGNAL(toggled(bool)),
- this, SIGNAL(changed()));
- connect(m_dialog->coloredBorder, SIGNAL(toggled(bool)),
- this, SIGNAL(changed()));
+ connect(m_dialog->titleAlign, TQT_SIGNAL(clicked(int)),
+ this, TQT_SIGNAL(changed()));
+ connect(m_dialog->animateButtons, TQT_SIGNAL(toggled(bool)),
+ this, TQT_SIGNAL(changed()));
+ connect(m_dialog->menuClose, TQT_SIGNAL(toggled(bool)),
+ this, TQT_SIGNAL(changed()));
+ connect(m_dialog->titleShadow, TQT_SIGNAL(toggled(bool)),
+ this, TQT_SIGNAL(changed()));
+ connect(m_dialog->coloredBorder, TQT_SIGNAL(toggled(bool)),
+ this, TQT_SIGNAL(changed()));
}
PlastikConfig::~PlastikConfig()
@@ -72,8 +72,8 @@ void PlastikConfig::load(KConfig*)
m_config->setGroup("General");
- QString value = m_config->readEntry("TitleAlignment", "AlignLeft");
- QRadioButton *button = (QRadioButton*)m_dialog->titleAlign->child(value.latin1());
+ TQString value = m_config->readEntry("TitleAlignment", "AlignLeft");
+ TQRadioButton *button = (TQRadioButton*)m_dialog->titleAlign->child(value.latin1());
if (button) button->setChecked(true);
bool animateButtons = m_config->readBoolEntry("AnimateButtons", true);
m_dialog->animateButtons->setChecked(animateButtons);
@@ -89,8 +89,8 @@ void PlastikConfig::save(KConfig*)
{
m_config->setGroup("General");
- QRadioButton *button = (QRadioButton*)m_dialog->titleAlign->selected();
- if (button) m_config->writeEntry("TitleAlignment", QString(button->name()));
+ TQRadioButton *button = (TQRadioButton*)m_dialog->titleAlign->selected();
+ if (button) m_config->writeEntry("TitleAlignment", TQString(button->name()));
m_config->writeEntry("AnimateButtons", m_dialog->animateButtons->isChecked() );
m_config->writeEntry("CloseOnMenuDoubleClick", m_dialog->menuClose->isChecked() );
m_config->writeEntry("TitleShadow", m_dialog->titleShadow->isChecked() );
@@ -100,8 +100,8 @@ void PlastikConfig::save(KConfig*)
void PlastikConfig::defaults()
{
- QRadioButton *button =
- (QRadioButton*)m_dialog->titleAlign->child("AlignLeft");
+ TQRadioButton *button =
+ (TQRadioButton*)m_dialog->titleAlign->child("AlignLeft");
if (button) button->setChecked(true);
m_dialog->animateButtons->setChecked(true);
m_dialog->menuClose->setChecked(false);
@@ -115,7 +115,7 @@ void PlastikConfig::defaults()
extern "C"
{
- KDE_EXPORT QObject* allocate_config(KConfig* config, QWidget* parent) {
+ KDE_EXPORT TQObject* allocate_config(KConfig* config, TQWidget* parent) {
return (new PlastikConfig(config, parent));
}
}
diff --git a/kwin/clients/plastik/config/config.h b/kwin/clients/plastik/config/config.h
index 540a27cda..249f5f7dd 100644
--- a/kwin/clients/plastik/config/config.h
+++ b/kwin/clients/plastik/config/config.h
@@ -23,7 +23,7 @@
#ifndef KNIFTYCONFIG_H
#define KNIFTYCONFIG_H
-#include <qobject.h>
+#include <tqobject.h>
class QButtonGroup;
class QGroupBox;
@@ -34,7 +34,7 @@ class PlastikConfig : public QObject
{
Q_OBJECT
public:
- PlastikConfig(KConfig* config, QWidget* parent);
+ PlastikConfig(KConfig* config, TQWidget* parent);
~PlastikConfig();
signals:
diff --git a/kwin/clients/plastik/misc.cpp b/kwin/clients/plastik/misc.cpp
index da491b2ba..43786fe46 100644
--- a/kwin/clients/plastik/misc.cpp
+++ b/kwin/clients/plastik/misc.cpp
@@ -23,13 +23,13 @@
#include <kpixmap.h>
#include <kpixmapeffect.h>
-#include <qcolor.h>
-#include <qimage.h>
-#include <qpainter.h>
+#include <tqcolor.h>
+#include <tqimage.h>
+#include <tqpainter.h>
#include "misc.h"
-QColor hsvRelative(const QColor& baseColor, int relativeH, int relativeS, int relativeV)
+TQColor hsvRelative(const TQColor& baseColor, int relativeH, int relativeS, int relativeV)
{
int h, s, v;
baseColor.hsv(&h, &s, &v);
@@ -45,12 +45,12 @@ QColor hsvRelative(const QColor& baseColor, int relativeH, int relativeS, int re
if(v < 0) { v = 0; }
else if(v > 255) { v = 255; }
- QColor c;
+ TQColor c;
c.setHsv( h, s, v );
return c;
}
-QColor alphaBlendColors(const QColor &bgColor, const QColor &fgColor, const int a)
+TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const int a)
{
// normal button...
@@ -61,15 +61,15 @@ QColor alphaBlendColors(const QColor &bgColor, const QColor &fgColor, const int
if(alpha<0) alpha = 0;
int inv_alpha = 255 - alpha;
- QColor result = QColor( qRgb(qRed(rgb_b)*inv_alpha/255 + qRed(rgb)*alpha/255,
+ TQColor result = TQColor( qRgb(qRed(rgb_b)*inv_alpha/255 + qRed(rgb)*alpha/255,
qGreen(rgb_b)*inv_alpha/255 + qGreen(rgb)*alpha/255,
qBlue(rgb_b)*inv_alpha/255 + qBlue(rgb)*alpha/255) );
return result;
}
-QImage recolorImage(QImage *img, QColor color) {
- QImage destImg(img->width(),img->height(),32);
+TQImage recolorImage(TQImage *img, TQColor color) {
+ TQImage destImg(img->width(),img->height(),32);
destImg.setAlphaBuffer(true);
for (int x = 0; x < img->width(); x++) {
for (int y = 0; y < img->height(); y++) {
diff --git a/kwin/clients/plastik/misc.h b/kwin/clients/plastik/misc.h
index 6c06b282b..985b405e8 100644
--- a/kwin/clients/plastik/misc.h
+++ b/kwin/clients/plastik/misc.h
@@ -23,8 +23,8 @@
#ifndef MISC_H
#define MISC_H
-QColor hsvRelative(const QColor& baseColor, int relativeH, int relativeS = 0, int relativeV = 0);
-QColor alphaBlendColors(const QColor &backgroundColor, const QColor &foregroundColor, const int alpha);
-QImage recolorImage(QImage *img, QColor color);
+TQColor hsvRelative(const TQColor& baseColor, int relativeH, int relativeS = 0, int relativeV = 0);
+TQColor alphaBlendColors(const TQColor &backgroundColor, const TQColor &foregroundColor, const int alpha);
+TQImage recolorImage(TQImage *img, TQColor color);
#endif // MISC_H
diff --git a/kwin/clients/plastik/plastik.cpp b/kwin/clients/plastik/plastik.cpp
index 25e6d2563..a6313cd1c 100644
--- a/kwin/clients/plastik/plastik.cpp
+++ b/kwin/clients/plastik/plastik.cpp
@@ -20,9 +20,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <qbitmap.h>
-#include <qpainter.h>
-#include <qimage.h>
+#include <tqbitmap.h>
+#include <tqpainter.h>
+#include <tqimage.h>
#include <kconfig.h>
#include <kpixmap.h>
@@ -39,8 +39,8 @@ namespace KWinPlastik
PlastikHandler::PlastikHandler()
{
- memset(m_pixmaps, 0, sizeof(QPixmap*)*NumPixmaps*2*2); // set elements to 0
- memset(m_bitmaps, 0, sizeof(QBitmap*)*NumButtonIcons*2);
+ memset(m_pixmaps, 0, sizeof(TQPixmap*)*NumPixmaps*2*2); // set elements to 0
+ memset(m_bitmaps, 0, sizeof(TQBitmap*)*NumButtonIcons*2);
reset(0);
}
@@ -88,7 +88,7 @@ bool PlastikHandler::reset(unsigned long changed)
}
// check if we are in reverse layout mode
- m_reverse = QApplication::reverseLayout();
+ m_reverse = TQApplication::reverseLayout();
// read in the configuration
readConfig();
@@ -168,7 +168,7 @@ void PlastikHandler::readConfig()
// grab settings
m_titleShadow = config.readBoolEntry("TitleShadow", true);
- QFontMetrics fm(m_titleFont); // active font = inactive font
+ TQFontMetrics fm(m_titleFont); // active font = inactive font
int titleHeightMin = config.readNumEntry("MinTitleHeight", 16);
// The title should strech with bigger font sizes!
m_titleHeight = QMAX(titleHeightMin, fm.height() + 4); // 4 px for the shadow etc.
@@ -176,7 +176,7 @@ void PlastikHandler::readConfig()
if ( m_titleHeight%2 == 0)
m_titleHeight++;
- fm = QFontMetrics(m_titleFontTool); // active font = inactive font
+ fm = TQFontMetrics(m_titleFontTool); // active font = inactive font
int titleHeightToolMin = config.readNumEntry("MinTitleHeightTool", 13);
// The title should strech with bigger font sizes!
m_titleHeightTool = QMAX(titleHeightToolMin, fm.height() ); // don't care about the shadow etc.
@@ -184,7 +184,7 @@ void PlastikHandler::readConfig()
if ( m_titleHeightTool%2 == 0)
m_titleHeightTool++;
- QString value = config.readEntry("TitleAlignment", "AlignLeft");
+ TQString value = config.readEntry("TitleAlignment", "AlignLeft");
if (value == "AlignLeft") m_titleAlign = Qt::AlignLeft;
else if (value == "AlignHCenter") m_titleAlign = Qt::AlignHCenter;
else if (value == "AlignRight") m_titleAlign = Qt::AlignRight;
@@ -194,7 +194,7 @@ void PlastikHandler::readConfig()
m_menuClose = config.readBoolEntry("CloseOnMenuDoubleClick", true);
}
-QColor PlastikHandler::getColor(KWinPlastik::ColorType type, const bool active)
+TQColor PlastikHandler::getColor(KWinPlastik::ColorType type, const bool active)
{
switch (type) {
case WindowContour:
@@ -225,15 +225,15 @@ QColor PlastikHandler::getColor(KWinPlastik::ColorType type, const bool active)
}
}
-void PlastikHandler::pretile( QPixmap *&pix, int size, Qt::Orientation dir ) const
+void PlastikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir ) const
{
- QPixmap *newpix;
- QPainter p;
+ TQPixmap *newpix;
+ TQPainter p;
if ( dir == Qt::Horizontal )
- newpix = new QPixmap( size, pix->height() );
+ newpix = new TQPixmap( size, pix->height() );
else
- newpix = new QPixmap( pix->width(), size );
+ newpix = new TQPixmap( pix->width(), size );
p.begin( newpix );
p.drawTiledPixmap( newpix->rect(), *pix ) ;
@@ -243,12 +243,12 @@ void PlastikHandler::pretile( QPixmap *&pix, int size, Qt::Orientation dir ) con
pix = newpix;
}
-const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow)
+const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow)
{
if (m_pixmaps[toolWindow][active][type])
return *m_pixmaps[toolWindow][active][type];
- QPixmap *pm = 0;
+ TQPixmap *pm = 0;
switch (type) {
case TitleBarTileTop:
@@ -257,8 +257,8 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
const int titleBarTileHeight = (toolWindow ? m_titleHeightTool : m_titleHeight) + 2;
// gradient used as well in TitleBarTileTop as TitleBarTile
const int gradientHeight = 2 + titleBarTileHeight-1;
- QPixmap gradient(1, gradientHeight);
- QPainter painter(&gradient);
+ TQPixmap gradient(1, gradientHeight);
+ TQPainter painter(&gradient);
KPixmap tempPixmap;
tempPixmap.resize(1, 4);
KPixmapEffect::gradient(tempPixmap,
@@ -276,7 +276,7 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
// actual titlebar tiles
if (type == TitleBarTileTop) {
- pm = new QPixmap(1, 4);
+ pm = new TQPixmap(1, 4);
painter.begin(pm);
// contour
painter.setPen(getColor(WindowContour, active) );
@@ -288,7 +288,7 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
painter.drawPixmap(0, 2, gradient);
painter.end();
} else {
- pm = new QPixmap(1, titleBarTileHeight);
+ pm = new TQPixmap(1, titleBarTileHeight);
painter.begin(pm);
painter.drawPixmap(0, 0, gradient, 0,2);
if (m_coloredBorder) {
@@ -310,8 +310,8 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
const int w = m_borderSize;
const int h = 4 + (toolWindow ? m_titleHeightTool : m_titleHeight) + 2;
- pm = new QPixmap(w, h);
- QPainter painter(pm);
+ pm = new TQPixmap(w, h);
+ TQPainter painter(pm);
painter.drawTiledPixmap(0,0, w, 4, pixmap(TitleBarTileTop, active, toolWindow) );
painter.drawTiledPixmap(0,4, w, h-4, pixmap(TitleBarTile, active, toolWindow) );
@@ -320,7 +320,7 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
painter.drawLine(0,0, 0,h);
painter.drawPoint(1,1);
- const QColor highlightTitleLeft = getColor(ShadeTitleLight, active);
+ const TQColor highlightTitleLeft = getColor(ShadeTitleLight, active);
painter.setPen(highlightTitleLeft);
painter.drawLine(1,2, 1,h);
@@ -330,7 +330,7 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
}
// outside the region normally masked by doShape
- painter.setPen(QColor(0,0,0) );
+ painter.setPen(TQColor(0,0,0) );
painter.drawLine(0, 0, 1, 0 );
painter.drawPoint(0, 1);
@@ -342,8 +342,8 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
const int w = m_borderSize;
const int h = 4 + (toolWindow ? m_titleHeightTool : m_titleHeight) + 2;
- pm = new QPixmap(w, h);
- QPainter painter(pm);
+ pm = new TQPixmap(w, h);
+ TQPainter painter(pm);
painter.drawTiledPixmap(0,0, w, 4, pixmap(TitleBarTileTop, active, toolWindow) );
painter.drawTiledPixmap(0,4, w, h-4, pixmap(TitleBarTile, active, toolWindow) );
@@ -352,7 +352,7 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
painter.drawLine(w-1,0, w-1,h);
painter.drawPoint(w-2,1);
- const QColor highlightTitleRight = getColor(ShadeTitleDark, active);
+ const TQColor highlightTitleRight = getColor(ShadeTitleDark, active);
painter.setPen(highlightTitleRight);
painter.drawLine(w-2,2, w-2,h);
@@ -362,7 +362,7 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
}
// outside the region normally masked by doShape
- painter.setPen(QColor(0,0,0) );
+ painter.setPen(TQColor(0,0,0) );
painter.drawLine(w-2, 0, w-1, 0 );
painter.drawPoint(w-1, 1);
@@ -373,8 +373,8 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
{
const int w = m_borderSize;
- pm = new QPixmap(w, 1);
- QPainter painter(pm);
+ pm = new TQPixmap(w, 1);
+ TQPainter painter(pm);
if (m_coloredBorder) {
painter.setPen(getColor(WindowContour, active) );
painter.drawPoint(0, 0);
@@ -408,8 +408,8 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
{
const int w = m_borderSize;
- pm = new QPixmap(w, 1);
- QPainter painter(pm);
+ pm = new TQPixmap(w, 1);
+ TQPainter painter(pm);
if (m_coloredBorder) {
painter.setPen(getColor(TitleGradient3, active).dark(110) );
painter.drawPoint(0,0);
@@ -443,8 +443,8 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
const int w = m_borderSize;
const int h = m_borderSize;
- pm = new QPixmap(w, h);
- QPainter painter(pm);
+ pm = new TQPixmap(w, h);
+ TQPainter painter(pm);
painter.drawTiledPixmap(0,0,w,h, pixmap(BorderBottomTile, active, toolWindow) );
painter.setPen(getColor(WindowContour, active) );
painter.drawLine(0,0, 0,h);
@@ -473,8 +473,8 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
const int w = m_borderSize;
const int h = m_borderSize;
- pm = new QPixmap(w, h);
- QPainter painter(pm);
+ pm = new TQPixmap(w, h);
+ TQPainter painter(pm);
painter.drawTiledPixmap(0,0,w,h, pixmap(BorderBottomTile, active, toolWindow) );
painter.setPen(getColor(WindowContour, active) );
painter.drawLine(w-1,0, w-1,h);
@@ -501,8 +501,8 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
{
const int h = m_borderSize;
- pm = new QPixmap(1, m_borderSize);
- QPainter painter(pm);
+ pm = new TQPixmap(1, m_borderSize);
+ TQPainter painter(pm);
if (m_coloredBorder) {
painter.setPen(getColor(TitleGradient3, active).dark(110) );
@@ -533,7 +533,7 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
return *pm;
}
-const QBitmap &PlastikHandler::buttonBitmap(ButtonIcon type, const QSize &size, bool toolWindow)
+const TQBitmap &PlastikHandler::buttonBitmap(ButtonIcon type, const TQSize &size, bool toolWindow)
{
int typeIndex = type;
@@ -552,7 +552,7 @@ const QBitmap &PlastikHandler::buttonBitmap(ButtonIcon type, const QSize &size,
int w = size.width() - reduceW;
int h = size.height() - reduceH;
- if (m_bitmaps[toolWindow][typeIndex] && m_bitmaps[toolWindow][typeIndex]->size()==QSize(w,h) )
+ if (m_bitmaps[toolWindow][typeIndex] && m_bitmaps[toolWindow][typeIndex]->size()==TQSize(w,h) )
return *m_bitmaps[toolWindow][typeIndex];
// no matching pixmap found, create a new one...
@@ -560,17 +560,17 @@ const QBitmap &PlastikHandler::buttonBitmap(ButtonIcon type, const QSize &size,
delete m_bitmaps[toolWindow][typeIndex];
m_bitmaps[toolWindow][typeIndex] = 0;
- QBitmap bmp = IconEngine::icon(type /*icon*/, QMIN(w,h) );
- QBitmap *bitmap = new QBitmap(bmp);
+ TQBitmap bmp = IconEngine::icon(type /*icon*/, QMIN(w,h) );
+ TQBitmap *bitmap = new TQBitmap(bmp);
m_bitmaps[toolWindow][typeIndex] = bitmap;
return *bitmap;
}
-QValueList< PlastikHandler::BorderSize >
+TQValueList< PlastikHandler::BorderSize >
PlastikHandler::borderSizes() const
{
// the list must be sorted
- return QValueList< BorderSize >() << BorderTiny << BorderNormal <<
+ return TQValueList< BorderSize >() << BorderTiny << BorderNormal <<
BorderLarge << BorderVeryLarge << BorderHuge <<
BorderVeryHuge << BorderOversized;
}
diff --git a/kwin/clients/plastik/plastik.h b/kwin/clients/plastik/plastik.h
index 16972c9ac..974df622b 100644
--- a/kwin/clients/plastik/plastik.h
+++ b/kwin/clients/plastik/plastik.h
@@ -23,7 +23,7 @@
#ifndef PLASTIK_H
#define PLASTIK_H
-#include <qfont.h>
+#include <tqfont.h>
#include <kdecoration.h>
#include <kdecorationfactory.h>
@@ -71,7 +71,7 @@ enum ButtonIcon {
NumButtonIcons
};
-class PlastikHandler: public QObject, public KDecorationFactory
+class PlastikHandler: public TQObject, public KDecorationFactory
{
Q_OBJECT
public:
@@ -82,26 +82,26 @@ public:
virtual KDecoration* createDecoration( KDecorationBridge* );
virtual bool supports( Ability ability );
- const QPixmap &pixmap(Pixmaps type, bool active, bool toolWindow);
- const QBitmap &buttonBitmap(ButtonIcon type, const QSize &size, bool toolWindow);
+ const TQPixmap &pixmap(Pixmaps type, bool active, bool toolWindow);
+ const TQBitmap &buttonBitmap(ButtonIcon type, const TQSize &size, bool toolWindow);
int titleHeight() { return m_titleHeight; }
int titleHeightTool() { return m_titleHeightTool; }
- const QFont &titleFont() { return m_titleFont; }
- const QFont &titleFontTool() { return m_titleFontTool; }
+ const TQFont &titleFont() { return m_titleFont; }
+ const TQFont &titleFontTool() { return m_titleFontTool; }
bool titleShadow() { return m_titleShadow; }
int borderSize() { return m_borderSize; }
bool animateButtons() { return m_animateButtons; }
bool menuClose() { return m_menuClose; }
Qt::AlignmentFlags titleAlign() { return m_titleAlign; }
bool reverseLayout() { return m_reverse; }
- QColor getColor(KWinPlastik::ColorType type, const bool active = true);
+ TQColor getColor(KWinPlastik::ColorType type, const bool active = true);
- QValueList< PlastikHandler::BorderSize > borderSizes() const;
+ TQValueList< PlastikHandler::BorderSize > borderSizes() const;
private:
void readConfig();
- void pretile(QPixmap *&pix, int size, Qt::Orientation dir) const;
+ void pretile(TQPixmap *&pix, int size, Qt::Orientation dir) const;
bool m_coloredBorder;
bool m_titleShadow;
@@ -111,13 +111,13 @@ private:
int m_borderSize;
int m_titleHeight;
int m_titleHeightTool;
- QFont m_titleFont;
- QFont m_titleFontTool;
+ TQFont m_titleFont;
+ TQFont m_titleFontTool;
Qt::AlignmentFlags m_titleAlign;
// pixmap cache
- QPixmap *m_pixmaps[2][2][NumPixmaps]; // button pixmaps have normal+pressed state...
- QBitmap *m_bitmaps[2][NumButtonIcons];
+ TQPixmap *m_pixmaps[2][2][NumPixmaps]; // button pixmaps have normal+pressed state...
+ TQBitmap *m_bitmaps[2][NumButtonIcons];
};
PlastikHandler* Handler();
diff --git a/kwin/clients/plastik/plastikbutton.cpp b/kwin/clients/plastik/plastikbutton.cpp
index 5917465ab..27a3eb127 100644
--- a/kwin/clients/plastik/plastikbutton.cpp
+++ b/kwin/clients/plastik/plastikbutton.cpp
@@ -22,12 +22,12 @@
// #include <kwin/options.h>
-#include <qbitmap.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <tqbitmap.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
#include <kpixmap.h>
#include <kpixmapeffect.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include "plastikbutton.h"
#include "plastikbutton.moc"
@@ -50,8 +50,8 @@ PlastikButton::PlastikButton(ButtonType type, PlastikClient *parent, const char
// no need to reset here as the button will be resetted on first resize.
- animTmr = new QTimer(this);
- connect(animTmr, SIGNAL(timeout() ), this, SLOT(animate() ) );
+ animTmr = new TQTimer(this);
+ connect(animTmr, TQT_SIGNAL(timeout() ), this, TQT_SLOT(animate() ) );
animProgress = 0;
}
@@ -143,43 +143,43 @@ void PlastikButton::animate()
repaint(false);
}
-void PlastikButton::enterEvent(QEvent *e)
+void PlastikButton::enterEvent(TQEvent *e)
{
- QButton::enterEvent(e);
+ TQButton::enterEvent(e);
hover = true;
animate();
}
-void PlastikButton::leaveEvent(QEvent *e)
+void PlastikButton::leaveEvent(TQEvent *e)
{
- QButton::leaveEvent(e);
+ TQButton::leaveEvent(e);
hover = false;
animate();
}
-void PlastikButton::drawButton(QPainter *painter)
+void PlastikButton::drawButton(TQPainter *painter)
{
- QRect r(0,0,width(),height());
+ TQRect r(0,0,width(),height());
bool active = m_client->isActive();
KPixmap tempKPixmap;
- QColor highlightColor;
+ TQColor highlightColor;
if(type() == CloseButton) {
- highlightColor = QColor(255,64,0);
+ highlightColor = TQColor(255,64,0);
} else {
highlightColor = Qt::white;
}
- QColor contourTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active),
+ TQColor contourTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active),
Qt::black, 215);
- QColor contourBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active),
+ TQColor contourBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active),
Qt::black, 215);
- QColor sourfaceTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active),
+ TQColor sourfaceTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active),
Qt::white, 210);
- QColor sourfaceBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active),
+ TQColor sourfaceBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active),
Qt::white, 210);
int highlightAlpha = static_cast<int>(255-((60/static_cast<double>(ANIMATIONSTEPS))*
@@ -196,9 +196,9 @@ void PlastikButton::drawButton(QPainter *painter)
sourfaceBottom = alphaBlendColors(sourfaceBottom, Qt::black, 200);
}
- QPixmap buffer;
+ TQPixmap buffer;
buffer.resize(width(), height());
- QPainter bP(&buffer);
+ TQPainter bP(&buffer);
// fake the titlebar background
bP.drawTiledPixmap(0, 0, width(), width(), m_client->getTitleBarTile(active) );
@@ -251,7 +251,7 @@ void PlastikButton::drawButton(QPainter *painter)
if (type() == MenuButton)
{
- QPixmap menuIcon(m_client->icon().pixmap( QIconSet::Small, QIconSet::Normal));
+ TQPixmap menuIcon(m_client->icon().pixmap( TQIconSet::Small, TQIconSet::Normal));
if (width() < menuIcon.width() || height() < menuIcon.height() ) {
menuIcon.convertFromImage( menuIcon.convertToImage().smoothScale(width(), height()));
}
@@ -260,7 +260,7 @@ void PlastikButton::drawButton(QPainter *painter)
else
{
int dX,dY;
- const QBitmap &icon = Handler()->buttonBitmap(m_iconType, size(), decoration()->isToolWindow() );
+ const TQBitmap &icon = Handler()->buttonBitmap(m_iconType, size(), decoration()->isToolWindow() );
dX = r.x()+(r.width()-icon.width())/2;
dY = r.y()+(r.height()-icon.height())/2;
if (isDown() ) {
@@ -268,11 +268,11 @@ void PlastikButton::drawButton(QPainter *painter)
}
if(!isDown() && Handler()->titleShadow() ) {
- QColor shadowColor;
+ TQColor shadowColor;
if (qGray(Handler()->getColor(TitleFont,active).rgb()) < 100)
- shadowColor = QColor(255, 255, 255);
+ shadowColor = TQColor(255, 255, 255);
else
- shadowColor = QColor(0,0,0);
+ shadowColor = TQColor(0,0,0);
bP.setPen(alphaBlendColors(sourfaceTop, shadowColor, 180) );
bP.drawPixmap(dX+1, dY+1, icon);
}
@@ -285,18 +285,18 @@ void PlastikButton::drawButton(QPainter *painter)
painter->drawPixmap(0, 0, buffer);
}
-QBitmap IconEngine::icon(ButtonIcon icon, int size)
+TQBitmap IconEngine::icon(ButtonIcon icon, int size)
{
if (size%2 == 0)
--size;
- QBitmap bitmap(size,size);
+ TQBitmap bitmap(size,size);
bitmap.fill(Qt::color0);
- QPainter p(&bitmap);
+ TQPainter p(&bitmap);
p.setPen(Qt::color1);
- QRect r = bitmap.rect();
+ TQRect r = bitmap.rect();
// line widths
int lwTitleBar = 1;
@@ -554,7 +554,7 @@ QBitmap IconEngine::icon(ButtonIcon icon, int size)
return bitmap;
}
-void IconEngine::drawObject(QPainter &p, Object object, int x, int y, int length, int lineWidth)
+void IconEngine::drawObject(TQPainter &p, Object object, int x, int y, int length, int lineWidth)
{
switch(object) {
case DiagonalLine:
diff --git a/kwin/clients/plastik/plastikbutton.h b/kwin/clients/plastik/plastikbutton.h
index 0be8dddea..69ba6d8e0 100644
--- a/kwin/clients/plastik/plastikbutton.h
+++ b/kwin/clients/plastik/plastikbutton.h
@@ -23,8 +23,8 @@
#ifndef PLASTIKBUTTON_H
#define PLASTIKBUTTON_H
-#include <qbutton.h>
-#include <qimage.h>
+#include <tqbutton.h>
+#include <tqimage.h>
#include "plastik.h"
#include <kcommondecoration.h>
@@ -49,30 +49,30 @@ protected slots:
void animate();
private:
- void enterEvent(QEvent *e);
- void leaveEvent(QEvent *e);
- void drawButton(QPainter *painter);
+ void enterEvent(TQEvent *e);
+ void leaveEvent(TQEvent *e);
+ void drawButton(TQPainter *painter);
private:
PlastikClient *m_client;
ButtonIcon m_iconType;
bool hover;
- QTimer *animTmr;
+ TQTimer *animTmr;
uint animProgress;
};
/**
* This class creates bitmaps which can be used as icons on buttons. The icons
* are "hardcoded".
- * Over the previous "Gimp->xpm->QImage->recolor->SmoothScale->QPixmap" solution
+ * Over the previous "Gimp->xpm->QImage->recolor->SmoothScale->TQPixmap" solution
* it has the important advantage that icons are more scalable and at the same
* time sharp and not blurred.
*/
class IconEngine
{
public:
- static QBitmap icon(ButtonIcon icon, int size);
+ static TQBitmap icon(ButtonIcon icon, int size);
private:
enum Object {
@@ -82,7 +82,7 @@ class IconEngine
CrossDiagonalLine
};
- static void drawObject(QPainter &p, Object object, int x, int y, int length, int lineWidth);
+ static void drawObject(TQPainter &p, Object object, int x, int y, int length, int lineWidth);
};
} // namespace KWinPlastik
diff --git a/kwin/clients/plastik/plastikclient.cpp b/kwin/clients/plastik/plastikclient.cpp
index 722761a5f..604c66641 100644
--- a/kwin/clients/plastik/plastikclient.cpp
+++ b/kwin/clients/plastik/plastikclient.cpp
@@ -22,15 +22,15 @@
#include <klocale.h>
-#include <qbitmap.h>
-#include <qdatetime.h>
-#include <qfontmetrics.h>
-#include <qimage.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qdesktopwidget.h>
+#include <tqbitmap.h>
+#include <tqdatetime.h>
+#include <tqfontmetrics.h>
+#include <tqimage.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqdesktopwidget.h>
#include "plastikclient.h"
#include "plastikbutton.h"
@@ -41,9 +41,9 @@ namespace KWinPlastik
PlastikClient::PlastikClient(KDecorationBridge* bridge, KDecorationFactory* factory)
: KCommonDecoration (bridge, factory),
- s_titleFont(QFont() )
+ s_titleFont(TQFont() )
{
- memset(m_captionPixmaps, 0, sizeof(QPixmap*)*2);
+ memset(m_captionPixmaps, 0, sizeof(TQPixmap*)*2);
}
PlastikClient::~PlastikClient()
@@ -51,17 +51,17 @@ PlastikClient::~PlastikClient()
clearCaptionPixmaps();
}
-QString PlastikClient::visibleName() const
+TQString PlastikClient::visibleName() const
{
return i18n("Plastik");
}
-QString PlastikClient::defaultButtonsLeft() const
+TQString PlastikClient::defaultButtonsLeft() const
{
return "M";
}
-QString PlastikClient::defaultButtonsRight() const
+TQString PlastikClient::defaultButtonsRight() const
{
return "HIAX";
}
@@ -197,7 +197,7 @@ void PlastikClient::init()
KCommonDecoration::init();
}
-QRegion PlastikClient::cornerShape(WindowCorner corner)
+TQRegion PlastikClient::cornerShape(WindowCorner corner)
{
int w = widget()->width();
int h = widget()->height();
@@ -205,37 +205,37 @@ QRegion PlastikClient::cornerShape(WindowCorner corner)
switch (corner) {
case WC_TopLeft:
if (layoutMetric(LM_TitleEdgeLeft) > 0)
- return QRegion(0, 0, 1, 2) + QRegion(1, 0, 1, 1);
+ return TQRegion(0, 0, 1, 2) + TQRegion(1, 0, 1, 1);
else
- return QRegion();
+ return TQRegion();
case WC_TopRight:
if (layoutMetric(LM_TitleEdgeRight) > 0)
- return QRegion(w-1, 0, 1, 2) + QRegion(w-2, 0, 1, 1);
+ return TQRegion(w-1, 0, 1, 2) + TQRegion(w-2, 0, 1, 1);
else
- return QRegion();
+ return TQRegion();
case WC_BottomLeft:
if (layoutMetric(LM_BorderBottom) > 0)
- return QRegion(0, h-1, 1, 1);
+ return TQRegion(0, h-1, 1, 1);
else
- return QRegion();
+ return TQRegion();
case WC_BottomRight:
if (layoutMetric(LM_BorderBottom) > 0)
- return QRegion(w-1, h-1, 1, 1);
+ return TQRegion(w-1, h-1, 1, 1);
else
- return QRegion();
+ return TQRegion();
default:
- return QRegion();
+ return TQRegion();
}
}
-void PlastikClient::paintEvent(QPaintEvent *e)
+void PlastikClient::paintEvent(TQPaintEvent *e)
{
- QRegion region = e->region();
+ TQRegion region = e->region();
PlastikHandler *handler = Handler();
@@ -245,10 +245,10 @@ void PlastikClient::paintEvent(QPaintEvent *e)
bool active = isActive();
bool toolWindow = isToolWindow();
- QPainter painter(widget() );
+ TQPainter painter(widget() );
// often needed coordinates
- QRect r = widget()->rect();
+ TQRect r = widget()->rect();
int r_w = r.width();
// int r_h = r.height();
@@ -270,11 +270,11 @@ void PlastikClient::paintEvent(QPaintEvent *e)
const int sideHeight = borderBottomTop-titleEdgeBottomBottom-1;
- QRect Rtitle = QRect(r_x+titleEdgeLeft+buttonsLeftWidth(), r_y+titleEdgeTop,
+ TQRect Rtitle = TQRect(r_x+titleEdgeLeft+buttonsLeftWidth(), r_y+titleEdgeTop,
r_x2-titleEdgeRight-buttonsRightWidth()-(r_x+titleEdgeLeft+buttonsLeftWidth()),
titleEdgeBottomBottom-(r_y+titleEdgeTop) );
- QRect tempRect;
+ TQRect tempRect;
// topSpacer
if(titleEdgeTop > 0)
@@ -308,7 +308,7 @@ void PlastikClient::paintEvent(QPaintEvent *e)
}
// titleSpacer
- const QPixmap &caption = captionPixmap();
+ const TQPixmap &caption = captionPixmap();
if(Rtitle.width() > 0)
{
m_captionRect = captionRect(); // also update m_captionRect!
@@ -376,10 +376,10 @@ void PlastikClient::paintEvent(QPaintEvent *e)
}
}
-QRect PlastikClient::captionRect() const
+TQRect PlastikClient::captionRect() const
{
- const QPixmap &caption = captionPixmap();
- QRect r = widget()->rect();
+ const TQPixmap &caption = captionPixmap();
+ TQRect r = widget()->rect();
const int titleHeight = layoutMetric(LM_TitleHeight);
const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom);
@@ -413,12 +413,12 @@ QRect PlastikClient::captionRect() const
tX = titleLeft+titleWidth-caption.width();
}
- return QRect(tX, r.top()+titleEdgeTop, tW, titleHeight+titleEdgeBottom);
+ return TQRect(tX, r.top()+titleEdgeTop, tW, titleHeight+titleEdgeBottom);
}
void PlastikClient::updateCaption()
{
- QRect oldCaptionRect = m_captionRect;
+ TQRect oldCaptionRect = m_captionRect;
if (oldCaption != caption() )
clearCaptionPixmaps();
@@ -453,12 +453,12 @@ void PlastikClient::reset( unsigned long changed )
KCommonDecoration::reset(changed);
}
-const QPixmap &PlastikClient::getTitleBarTile(bool active) const
+const TQPixmap &PlastikClient::getTitleBarTile(bool active) const
{
return Handler()->pixmap(TitleBarTile, active, isToolWindow() );
}
-const QPixmap &PlastikClient::captionPixmap() const
+const TQPixmap &PlastikClient::captionPixmap() const
{
bool active = isActive();
@@ -469,44 +469,44 @@ const QPixmap &PlastikClient::captionPixmap() const
// not found, create new pixmap...
const uint maxCaptionLength = 300; // truncate captions longer than this!
- QString c(caption() );
+ TQString c(caption() );
if (c.length() > maxCaptionLength) {
c.truncate(maxCaptionLength);
c.append(" [...]");
}
- QFontMetrics fm(s_titleFont);
+ TQFontMetrics fm(s_titleFont);
int captionWidth = fm.width(c);
int captionHeight = fm.height();
const int th = layoutMetric(LM_TitleHeight, false) + layoutMetric(LM_TitleEdgeBottom, false);
- QPainter painter;
+ TQPainter painter;
const int thickness = 2;
- QPixmap *captionPixmap = new QPixmap(captionWidth+2*thickness, th);
+ TQPixmap *captionPixmap = new TQPixmap(captionWidth+2*thickness, th);
painter.begin(captionPixmap);
painter.drawTiledPixmap(captionPixmap->rect(),
Handler()->pixmap(TitleBarTile, active, isToolWindow()) );
painter.setFont(s_titleFont);
- QPoint tp(1, captionHeight-1);
+ TQPoint tp(1, captionHeight-1);
if(Handler()->titleShadow())
{
- QColor shadowColor;
+ TQColor shadowColor;
if (qGray(Handler()->getColor(TitleFont,active).rgb()) < 100)
- shadowColor = QColor(255, 255, 255);
+ shadowColor = TQColor(255, 255, 255);
else
- shadowColor = QColor(0,0,0);
+ shadowColor = TQColor(0,0,0);
painter.setPen(alphaBlendColors(options()->color(ColorTitleBar, active), shadowColor, 205) );
- painter.drawText(tp+QPoint(1,2), c);
+ painter.drawText(tp+TQPoint(1,2), c);
painter.setPen(alphaBlendColors(options()->color(ColorTitleBar, active), shadowColor, 225) );
- painter.drawText(tp+QPoint(2,2), c);
+ painter.drawText(tp+TQPoint(2,2), c);
painter.setPen(alphaBlendColors(options()->color(ColorTitleBar, active), shadowColor, 165) );
- painter.drawText(tp+QPoint(1,1), c);
+ painter.drawText(tp+TQPoint(1,1), c);
}
painter.setPen(Handler()->getColor(TitleFont,active) );
painter.drawText(tp, c );
diff --git a/kwin/clients/plastik/plastikclient.h b/kwin/clients/plastik/plastikclient.h
index 28b611b8e..e83bf75a5 100644
--- a/kwin/clients/plastik/plastikclient.h
+++ b/kwin/clients/plastik/plastikclient.h
@@ -37,35 +37,35 @@ public:
PlastikClient(KDecorationBridge* bridge, KDecorationFactory* factory);
~PlastikClient();
- virtual QString visibleName() const;
- virtual QString defaultButtonsLeft() const;
- virtual QString defaultButtonsRight() const;
+ virtual TQString visibleName() const;
+ virtual TQString defaultButtonsLeft() const;
+ virtual TQString defaultButtonsRight() const;
virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
- virtual QRegion cornerShape(WindowCorner corner);
+ virtual TQRegion cornerShape(WindowCorner corner);
virtual KCommonDecorationButton *createButton(ButtonType type);
virtual void init();
virtual void reset( unsigned long changed );
- virtual void paintEvent(QPaintEvent *e);
+ virtual void paintEvent(TQPaintEvent *e);
virtual void updateCaption();
- const QPixmap &getTitleBarTile(bool active) const;
+ const TQPixmap &getTitleBarTile(bool active) const;
private:
- QRect captionRect() const;
+ TQRect captionRect() const;
- const QPixmap &captionPixmap() const;
+ const TQPixmap &captionPixmap() const;
void clearCaptionPixmaps();
- mutable QPixmap *m_captionPixmaps[2];
+ mutable TQPixmap *m_captionPixmaps[2];
- QRect m_captionRect;
- QString oldCaption;
+ TQRect m_captionRect;
+ TQString oldCaption;
// settings...
- QFont s_titleFont;
+ TQFont s_titleFont;
};
} // KWinPlastik
diff --git a/kwin/clients/quartz/config/config.cpp b/kwin/clients/quartz/config/config.cpp
index 8c7070b9d..d15eb4da1 100644
--- a/kwin/clients/quartz/config/config.cpp
+++ b/kwin/clients/quartz/config/config.cpp
@@ -9,13 +9,13 @@
#include "config.h"
#include <kglobal.h>
-#include <qwhatsthis.h>
+#include <tqwhatsthis.h>
#include <klocale.h>
extern "C"
{
- KDE_EXPORT QObject* allocate_config( KConfig* conf, QWidget* parent )
+ KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent )
{
return(new QuartzConfig(conf, parent));
}
@@ -26,31 +26,31 @@ extern "C"
* 'conf' is a pointer to the kwindecoration modules open kwin config,
* and is by default set to the "Style" group.
*
- * 'parent' is the parent of the QObject, which is a VBox inside the
+ * 'parent' is the parent of the TQObject, which is a VBox inside the
* Configure tab in kwindecoration
*/
-QuartzConfig::QuartzConfig( KConfig* conf, QWidget* parent )
- : QObject( parent )
+QuartzConfig::QuartzConfig( KConfig* conf, TQWidget* parent )
+ : TQObject( parent )
{
quartzConfig = new KConfig("kwinquartzrc");
KGlobal::locale()->insertCatalogue("kwin_clients");
- gb = new QVBox( parent );
- cbColorBorder = new QCheckBox(
+ gb = new TQVBox( parent );
+ cbColorBorder = new TQCheckBox(
i18n("Draw window frames using &titlebar colors"), gb );
- QWhatsThis::add( cbColorBorder,
+ TQWhatsThis::add( cbColorBorder,
i18n("When selected, the window decoration borders "
"are drawn using the titlebar colors; otherwise, they are "
"drawn using normal border colors instead.") );
- cbExtraSmall = new QCheckBox( i18n("Quartz &extra slim"), gb );
- QWhatsThis::add( cbExtraSmall,
+ cbExtraSmall = new TQCheckBox( i18n("Quartz &extra slim"), gb );
+ TQWhatsThis::add( cbExtraSmall,
i18n("Quartz window decorations with extra-small title bar.") );
// Load configuration options
load( conf );
// Ensure we track user changes properly
- connect( cbColorBorder, SIGNAL(clicked()), this, SLOT(slotSelectionChanged()) );
- connect( cbExtraSmall, SIGNAL(clicked()), this, SLOT(slotSelectionChanged()) );
+ connect( cbColorBorder, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) );
+ connect( cbExtraSmall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) );
// Make the widgets visible in kwindecoration
gb->show();
diff --git a/kwin/clients/quartz/config/config.h b/kwin/clients/quartz/config/config.h
index 815cc9644..0a952c4e9 100644
--- a/kwin/clients/quartz/config/config.h
+++ b/kwin/clients/quartz/config/config.h
@@ -10,8 +10,8 @@
#ifndef __KDE_QUARTZCONFIG_H
#define __KDE_QUARTZCONFIG_H
-#include <qcheckbox.h>
-#include <qvbox.h>
+#include <tqcheckbox.h>
+#include <tqvbox.h>
#include <kconfig.h>
class QuartzConfig: public QObject
@@ -19,7 +19,7 @@ class QuartzConfig: public QObject
Q_OBJECT
public:
- QuartzConfig( KConfig* conf, QWidget* parent );
+ QuartzConfig( KConfig* conf, TQWidget* parent );
~QuartzConfig();
// These public signals/slots work similar to KCM modules
@@ -36,9 +36,9 @@ class QuartzConfig: public QObject
private:
KConfig* quartzConfig;
- QCheckBox* cbColorBorder;
- QCheckBox* cbExtraSmall;
- QVBox* gb;
+ TQCheckBox* cbColorBorder;
+ TQCheckBox* cbExtraSmall;
+ TQVBox* gb;
};
diff --git a/kwin/clients/quartz/quartz.cpp b/kwin/clients/quartz/quartz.cpp
index 857971780..82caabb45 100644
--- a/kwin/clients/quartz/quartz.cpp
+++ b/kwin/clients/quartz/quartz.cpp
@@ -19,10 +19,10 @@
#include <kglobal.h>
#include <klocale.h>
#include <kpixmapeffect.h>
-#include <qbitmap.h>
-#include <qdrawutil.h>
-#include <qimage.h>
-#include <qapplication.h>
+#include <tqbitmap.h>
+#include <tqdrawutil.h>
+#include <tqimage.h>
+#include <tqapplication.h>
#include "quartz.h"
@@ -208,7 +208,7 @@ void QuartzHandler::readConfig()
// A small hack to make the on all desktops button look nicer
onAllDesktopsButtonOnLeft = KDecoration::options()->titleButtonsLeft().contains( 'S' );
- if ( QApplication::reverseLayout() )
+ if ( TQApplication::reverseLayout() )
onAllDesktopsButtonOnLeft = !onAllDesktopsButtonOnLeft;
switch(options()->preferredBorderSize(this)) {
case BorderLarge:
@@ -232,13 +232,13 @@ void QuartzHandler::readConfig()
borderWidth = extraSlim?2:4;
}
- normalTitleHeight = QFontMetrics(options()->font(true)).height();
+ normalTitleHeight = TQFontMetrics(options()->font(true)).height();
int nTH_limit=extraSlim?14:18;
- normalTitleHeight = QFontMetrics(options()->font(true)).height()-(extraSlim?1:0);
+ normalTitleHeight = TQFontMetrics(options()->font(true)).height()-(extraSlim?1:0);
if (normalTitleHeight < nTH_limit) normalTitleHeight = nTH_limit;
if (normalTitleHeight < borderWidth) normalTitleHeight = borderWidth;
- toolTitleHeight = QFontMetrics(options()->font(true, true)).height();
+ toolTitleHeight = TQFontMetrics(options()->font(true, true)).height();
if (toolTitleHeight < 12) toolTitleHeight = 12;
if (toolTitleHeight < borderWidth) toolTitleHeight = borderWidth;
}
@@ -246,9 +246,9 @@ void QuartzHandler::readConfig()
// This does the colour transition magic. (You say "Oh, is that it?")
// This may be made configurable at a later stage
-void QuartzHandler::drawBlocks( KPixmap *pi, KPixmap &p, const QColor &c1, const QColor &c2 )
+void QuartzHandler::drawBlocks( KPixmap *pi, KPixmap &p, const TQColor &c1, const TQColor &c2 )
{
- QPainter px;
+ TQPainter px;
px.begin( pi );
@@ -291,10 +291,10 @@ void QuartzHandler::drawBlocks( KPixmap *pi, KPixmap &p, const QColor &c1, const
void QuartzHandler::createPixmaps()
{
// Obtain titlebar blend colours, and create the block stuff on pixmaps.
- QColorGroup g2 = options()->colorGroup(ColorTitleBlend, true);
- QColor c2 = g2.background();
+ TQColorGroup g2 = options()->colorGroup(ColorTitleBlend, true);
+ TQColor c2 = g2.background();
g2 = options()->colorGroup(ColorTitleBar, true );
- QColor c = g2.background().light(130);
+ TQColor c = g2.background().light(130);
titleBlocks = new KPixmap();
titleBlocks->resize( normalTitleHeight*25/18, normalTitleHeight );
@@ -310,8 +310,8 @@ void QuartzHandler::createPixmaps()
drawBlocks( ititleBlocks, *ititleBlocks, c, c2 );
// Set the on all desktops pin pixmaps;
- QColorGroup g;
- QPainter p;
+ TQColorGroup g;
+ TQPainter p;
g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true );
c = onAllDesktopsButtonOnLeft ? g.background().light(130) : g.background();
@@ -370,9 +370,9 @@ void QuartzHandler::freePixmaps()
}
-QValueList< QuartzHandler::BorderSize > QuartzHandler::borderSizes() const
+TQValueList< QuartzHandler::BorderSize > QuartzHandler::borderSizes() const
{ // the list must be sorted
- return QValueList< BorderSize >() << BorderNormal << BorderLarge <<
+ return TQValueList< BorderSize >() << BorderNormal << BorderLarge <<
BorderVeryLarge << BorderHuge << BorderVeryHuge << BorderOversized;
}
@@ -381,7 +381,7 @@ QuartzButton::QuartzButton(ButtonType type, QuartzClient *parent, const char *na
: KCommonDecorationButton(type, parent, name)
{
// Eliminate any possible background flicker
- setBackgroundMode( QWidget::NoBackground );
+ setBackgroundMode( TQWidget::NoBackground );
deco = 0;
}
@@ -435,19 +435,19 @@ void QuartzButton::setBitmap(const unsigned char *bitmap)
deco = 0;
if (bitmap) {
- deco = new QBitmap(10, 10, bitmap, true);
+ deco = new TQBitmap(10, 10, bitmap, true);
deco->setMask( *deco );
repaint( false );
}
}
-void QuartzButton::drawButton(QPainter *p)
+void QuartzButton::drawButton(TQPainter *p)
{
// Never paint if the pixmaps have not been created
if (!quartz_initialized)
return;
- QColor c;
+ TQColor c;
if (isLeft() )
c = KDecoration::options()->color(KDecoration::ColorTitleBar, decoration()->isActive()).light(130);
@@ -469,7 +469,7 @@ void QuartzButton::drawButton(QPainter *p)
p->drawPixmap(isDown() ? xOff+1: xOff, isDown() ? yOff+1 : yOff, *deco);
} else
{
- QPixmap btnpix;
+ TQPixmap btnpix;
int Offset = 0;
if (type() == OnAllDesktopsButton)
@@ -484,12 +484,12 @@ void QuartzButton::drawButton(QPainter *p)
btnpix = isOn() ? *ipinDownPix : *ipinUpPix;
} else
- btnpix = decoration()->icon().pixmap( QIconSet::Small, QIconSet::Normal);
+ btnpix = decoration()->icon().pixmap( TQIconSet::Small, TQIconSet::Normal);
// Shrink the miniIcon for tiny titlebars.
if ( height() < 16)
{
- QPixmap tmpPix;
+ TQPixmap tmpPix;
// Smooth scale the image
tmpPix.convertFromImage( btnpix.convertToImage().smoothScale(height(), height()));
@@ -508,17 +508,17 @@ QuartzClient::QuartzClient(KDecorationBridge* bridge, KDecorationFactory* factor
{
}
-QString QuartzClient::visibleName() const
+TQString QuartzClient::visibleName() const
{
return i18n("Quartz");
}
-QString QuartzClient::defaultButtonsLeft() const
+TQString QuartzClient::defaultButtonsLeft() const
{
return "M";
}
-QString QuartzClient::defaultButtonsRight() const
+TQString QuartzClient::defaultButtonsRight() const
{
return "HIAX";
}
@@ -652,7 +652,7 @@ void QuartzClient::reset( unsigned long changed )
// Quartz Paint magic goes here.
-void QuartzClient::paintEvent( QPaintEvent* )
+void QuartzClient::paintEvent( TQPaintEvent* )
{
// Never paint if the pixmaps have not been created
if (!quartz_initialized)
@@ -660,11 +660,11 @@ void QuartzClient::paintEvent( QPaintEvent* )
const bool maxFull = (maximizeMode()==MaximizeFull) && !options()->moveResizeMaximizedWindows();
- QColorGroup g;
- QPainter p(widget());
+ TQColorGroup g;
+ TQPainter p(widget());
// Obtain widget bounds.
- QRect r(widget()->rect());
+ TQRect r(widget()->rect());
int x = r.x();
int y = r.y();
int x2 = r.width() - 1;
@@ -688,7 +688,7 @@ void QuartzClient::paintEvent( QPaintEvent* )
p.drawLine( x, y2, x2, y2 );
// Fill out the border edges
- QColor frameColor;
+ TQColor frameColor;
if ( coloredFrame)
frameColor = g.background().light(130);
else
@@ -730,19 +730,19 @@ void QuartzClient::paintEvent( QPaintEvent* )
const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom);
const int ttlHeight = layoutMetric(LM_TitleHeight);
const int titleEdgeBottomBottom = r_y+titleEdgeTop+ttlHeight+titleEdgeBottom-1;
- r = QRect(r_x+titleEdgeLeft+buttonsLeftWidth(), r_y+titleEdgeTop,
+ r = TQRect(r_x+titleEdgeLeft+buttonsLeftWidth(), r_y+titleEdgeTop,
r_x2-titleEdgeRight-buttonsRightWidth()-(r_x+titleEdgeLeft+buttonsLeftWidth()),
titleEdgeBottomBottom-(r_y+titleEdgeTop) );
// Obtain titlebar blend colours
- QColor c1 = options()->color(ColorTitleBar, isActive() ).light(130);
- QColor c2 = options()->color(ColorTitleBlend, isActive() );
+ TQColor c1 = options()->color(ColorTitleBar, isActive() ).light(130);
+ TQColor c2 = options()->color(ColorTitleBlend, isActive() );
// Create a disposable pixmap buffer for the titlebar
KPixmap* titleBuffer = new KPixmap;
titleBuffer->resize( maxFull?w-2:(w-2*(borderSize-1)), titleHeight );
- QPainter p2( titleBuffer, this );
+ TQPainter p2( titleBuffer, this );
// subtract titleBlocks pixmap width and some
int rightoffset = r.x()+r.width()-titleBlocks->width()-borderSize;
@@ -758,12 +758,12 @@ void QuartzClient::paintEvent( QPaintEvent* )
// Draw the title text on the pixmap, and with a smaller font
// for toolwindows than the default.
- QFont fnt;
+ TQFont fnt;
if ( largeButtons ) {
fnt = options()->font(true, false); // font not small
} else {
fnt = options()->font(true, true); // font small
- fnt.setWeight( QFont::Normal ); // and disable bold
+ fnt.setWeight( TQFont::Normal ); // and disable bold
}
p2.setFont( fnt );
diff --git a/kwin/clients/quartz/quartz.h b/kwin/clients/quartz/quartz.h
index 37f3dff6e..1133a7ae4 100644
--- a/kwin/clients/quartz/quartz.h
+++ b/kwin/clients/quartz/quartz.h
@@ -16,7 +16,7 @@
#ifndef __KDEGALLIUM_QUARTZ_H
#define __KDEGALLIUM_QUARTZ_H
-#include <qbitmap.h>
+#include <tqbitmap.h>
#include <kpixmap.h>
#include "../../lib/kcommondecoration.h"
#include "../../lib/kdecorationfactory.h"
@@ -28,7 +28,7 @@ namespace Quartz {
class QuartzClient;
-class QuartzHandler: public QObject, public KDecorationFactory
+class QuartzHandler: public TQObject, public KDecorationFactory
{
Q_OBJECT
public:
@@ -38,13 +38,13 @@ class QuartzHandler: public QObject, public KDecorationFactory
virtual KDecoration* createDecoration( KDecorationBridge* );
virtual bool reset(unsigned long changed);
virtual bool supports( Ability ability );
- virtual QValueList< BorderSize > borderSizes() const;
+ virtual TQValueList< BorderSize > borderSizes() const;
private:
void readConfig();
void createPixmaps();
void freePixmaps();
- void drawBlocks(KPixmap* pi, KPixmap &p, const QColor &c1, const QColor &c2);
+ void drawBlocks(KPixmap* pi, KPixmap &p, const TQColor &c1, const TQColor &c2);
};
@@ -58,9 +58,9 @@ class QuartzButton : public KCommonDecorationButton
void reset(unsigned long changed);
protected:
- void drawButton(QPainter *p);
+ void drawButton(TQPainter *p);
- QBitmap* deco;
+ TQBitmap* deco;
};
@@ -70,9 +70,9 @@ class QuartzClient : public KCommonDecoration
QuartzClient(KDecorationBridge* bridge, KDecorationFactory* factory);
~QuartzClient() {;}
- virtual QString visibleName() const;
- virtual QString defaultButtonsLeft() const;
- virtual QString defaultButtonsRight() const;
+ virtual TQString visibleName() const;
+ virtual TQString defaultButtonsLeft() const;
+ virtual TQString defaultButtonsRight() const;
virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
virtual KCommonDecorationButton *createButton(ButtonType type);
@@ -81,7 +81,7 @@ class QuartzClient : public KCommonDecoration
protected:
virtual void reset( unsigned long changed );
- void paintEvent( QPaintEvent* );
+ void paintEvent( TQPaintEvent* );
private:
int titleHeight, borderSize;
diff --git a/kwin/clients/redmond/redmond.cpp b/kwin/clients/redmond/redmond.cpp
index e41eb6353..7f74479ed 100644
--- a/kwin/clients/redmond/redmond.cpp
+++ b/kwin/clients/redmond/redmond.cpp
@@ -14,16 +14,16 @@
#include "redmond.h"
-#include <qdrawutil.h>
-#include <qdatetime.h>
+#include <tqdrawutil.h>
+#include <tqdatetime.h>
#include <kpixmapeffect.h>
#include <kimageeffect.h>
#include <kdrawutil.h>
#include <klocale.h>
-#include <qbitmap.h>
-#include <qimage.h>
-#include <qapplication.h>
+#include <tqbitmap.h>
+#include <tqimage.h>
+#include <tqapplication.h>
namespace Redmond {
@@ -87,8 +87,8 @@ static KPixmap *iMiniBtnPix1;
static KPixmap *miniBtnDownPix1;
static KPixmap *iMiniBtnDownPix1;
-static QPixmap *defaultMenuPix;
-static QColor *btnForeground;
+static TQPixmap *defaultMenuPix;
+static TQColor *btnForeground;
static bool pixmaps_created = false;
static int toolTitleHeight;
@@ -100,9 +100,9 @@ static inline const KDecorationOptions *options()
return KDecoration::options();
}
-static void drawButtonFrame( KPixmap *pix, const QColorGroup &g, bool sunken )
+static void drawButtonFrame( KPixmap *pix, const TQColorGroup &g, bool sunken )
{
- QPainter p;
+ TQPainter p;
int x2 = pix->width() - 1;
int y2 = pix->height() - 1;
p.begin(pix);
@@ -136,7 +136,7 @@ static void create_pixmaps ()
pixmaps_created = true;
- bool highcolor = QPixmap::defaultDepth() > 8;
+ bool highcolor = TQPixmap::defaultDepth() > 8;
btnPix1 = new KPixmap;
btnDownPix1 = new KPixmap;
@@ -146,11 +146,11 @@ static void create_pixmaps ()
miniBtnDownPix1 = new KPixmap;
iMiniBtnPix1 = new KPixmap;
iMiniBtnDownPix1 = new KPixmap;
- defaultMenuPix = new QPixmap(kdelogo);
+ defaultMenuPix = new TQPixmap(kdelogo);
// buttons (active/inactive, sunken/unsunken)
- QColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true);
- QColor c = g.background();
+ TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true);
+ TQColor c = g.background();
btnPix1->resize(normalTitleHeight, normalTitleHeight-2);
btnDownPix1->resize(normalTitleHeight, normalTitleHeight-2);
iBtnPix1->resize(normalTitleHeight, normalTitleHeight-2);
@@ -210,9 +210,9 @@ static void create_pixmaps ()
// Make sure button pixmaps contrast with the current colour scheme.
if (qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127)
- btnForeground = new QColor(Qt::black);
+ btnForeground = new TQColor(Qt::black);
else
- btnForeground = new QColor(Qt::white);
+ btnForeground = new TQColor(Qt::white);
}
void delete_pixmaps()
@@ -257,7 +257,7 @@ void RedmondButton::reset(unsigned long changed)
break;
case MenuButton:
{
- QPixmap miniIcon = decoration()->icon().pixmap(QIconSet::Small, QIconSet::Normal);
+ TQPixmap miniIcon = decoration()->icon().pixmap(TQIconSet::Small, TQIconSet::Normal);
if (!miniIcon.isNull()) {
setPixmap(miniIcon);
} else {
@@ -280,16 +280,16 @@ void RedmondButton::setBitmap(const unsigned char *bitmap)
pix.resize(0, 0);
if (bitmap)
- deco = QBitmap(10, 10, bitmap, true);
+ deco = TQBitmap(10, 10, bitmap, true);
else {
- deco = QBitmap(10,10);
+ deco = TQBitmap(10,10);
deco.fill(Qt::color0);
}
deco.setMask(deco);
}
-void RedmondButton::setPixmap( const QPixmap &p )
+void RedmondButton::setPixmap( const TQPixmap &p )
{
deco.resize(0, 0);
pix = p;
@@ -298,7 +298,7 @@ void RedmondButton::setPixmap( const QPixmap &p )
}
-void RedmondButton::drawButton(QPainter *p)
+void RedmondButton::drawButton(TQPainter *p)
{
if ( pix.isNull() ) {
if ( decoration()->isActive() ) {
@@ -327,7 +327,7 @@ void RedmondButton::drawButton(QPainter *p)
}
if ( type()==MenuButton && height() < 16) {
- QPixmap tmpPix;
+ TQPixmap tmpPix;
// Smooth scale the menu button pixmap
tmpPix.convertFromImage(
@@ -348,17 +348,17 @@ RedmondDeco::RedmondDeco(KDecorationBridge *b, KDecorationFactory *f)
{
}
-QString RedmondDeco::visibleName() const
+TQString RedmondDeco::visibleName() const
{
return i18n("Redmond");
}
-QString RedmondDeco::defaultButtonsLeft() const
+TQString RedmondDeco::defaultButtonsLeft() const
{
return "M";
}
-QString RedmondDeco::defaultButtonsRight() const
+TQString RedmondDeco::defaultButtonsRight() const
{
return "HIA_X";
}
@@ -463,19 +463,19 @@ void RedmondDeco::reset( unsigned long changed )
KCommonDecoration::reset(changed);
}
-void RedmondDeco::paintEvent( QPaintEvent* )
+void RedmondDeco::paintEvent( TQPaintEvent* )
{
- bool hicolor = QPixmap::defaultDepth() > 8;
+ bool hicolor = TQPixmap::defaultDepth() > 8;
int fontoffset = 1;
// Modify borderWith used by titlebar to 0, when maximized and not move or resize able
bool border = !(maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows());
int modBorderWidth = border ? borderWidth : 0;
- QPainter p(widget());
+ TQPainter p(widget());
// Obtain widget bounds.
- QRect r(widget()->rect());
+ TQRect r(widget()->rect());
int x = r.x();
int y = r.y();
int x2 = r.width()-1;
@@ -485,7 +485,7 @@ void RedmondDeco::paintEvent( QPaintEvent* )
// Draw part of the frame that is the frame color
// ==============================================
- QColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive());
+ TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive());
p.setPen( g.background() );
p.drawLine( x, y, x2-1, y );
p.drawLine( x, y, x, y2-1 );
@@ -520,15 +520,15 @@ void RedmondDeco::paintEvent( QPaintEvent* )
// Draw the title bar.
// ===================
r = titleRect();
-// QFontMetrics fm(options()->font(true));
+// TQFontMetrics fm(options()->font(true));
// Obtain blend colours.
- QColor c1 = options()->color(KDecoration::ColorTitleBar, isActive() );
- QColor c2 = options()->color(KDecoration::ColorTitleBlend, isActive() );
+ TQColor c1 = options()->color(KDecoration::ColorTitleBar, isActive() );
+ TQColor c2 = options()->color(KDecoration::ColorTitleBlend, isActive() );
- QFont fnt = options()->font(true, isToolWindow() );
+ TQFont fnt = options()->font(true, isToolWindow() );
if (isToolWindow() ) {
- fnt.setWeight( QFont::Normal );
+ fnt.setWeight( TQFont::Normal );
fontoffset = 0;
}
@@ -547,13 +547,13 @@ void RedmondDeco::paintEvent( QPaintEvent* )
} else {
// This enables dithering on 15 and 16bit displays, preventing
// some pretty horrible banding effects
- QImage image = KImageEffect::gradient(titleBuffer->size(), c1, c2,
+ TQImage image = KImageEffect::gradient(titleBuffer->size(), c1, c2,
KImageEffect::HorizontalGradient);
titleBuffer->convertFromImage(image, Qt::OrderedDither);
}
- QPainter p2( titleBuffer, this );
+ TQPainter p2( titleBuffer, this );
// Since drawing the gradient is (relatively) slow, it is best
// to draw the title text on the pixmap.
@@ -583,10 +583,10 @@ void RedmondDeco::paintEvent( QPaintEvent* )
}
void RedmondDecoFactory::readConfig() {
- normalTitleHeight = QFontMetrics(options()->font(true)).height();
- QFont toolFont = options()->font(true, true);
- toolFont.setWeight(QFont::Normal);
- toolTitleHeight = QFontMetrics(toolFont).height();
+ normalTitleHeight = TQFontMetrics(options()->font(true)).height();
+ TQFont toolFont = options()->font(true, true);
+ toolFont.setWeight(TQFont::Normal);
+ toolTitleHeight = TQFontMetrics(toolFont).height();
switch(options()->preferredBorderSize(this)) {
case BorderLarge:
borderWidth = 8;
@@ -670,9 +670,9 @@ bool RedmondDecoFactory::supports( Ability ability )
}
}
-QValueList< RedmondDecoFactory::BorderSize > RedmondDecoFactory::borderSizes() const
+TQValueList< RedmondDecoFactory::BorderSize > RedmondDecoFactory::borderSizes() const
{ // the list must be sorted
- return QValueList< BorderSize >() << BorderNormal << BorderLarge <<
+ return TQValueList< BorderSize >() << BorderNormal << BorderLarge <<
BorderVeryLarge << BorderHuge << BorderVeryHuge << BorderOversized;
}
diff --git a/kwin/clients/redmond/redmond.h b/kwin/clients/redmond/redmond.h
index 340fdd1b0..fdc5047bc 100644
--- a/kwin/clients/redmond/redmond.h
+++ b/kwin/clients/redmond/redmond.h
@@ -18,7 +18,7 @@
#ifndef __KDE_REDMOND_H
#define __KDE_REDMOND_H
-#include <qbitmap.h>
+#include <tqbitmap.h>
#include <kpixmap.h>
#include <kcommondecoration.h>
#include <kdecorationfactory.h>
@@ -33,15 +33,15 @@ class RedmondButton : public KCommonDecorationButton
public:
RedmondButton(ButtonType type, RedmondDeco *parent, const char *name);
void setBitmap(const unsigned char *bitmap);
- void setPixmap(const QPixmap &p);
+ void setPixmap(const TQPixmap &p);
void reset(unsigned long changed);
protected:
- virtual void drawButton(QPainter *p);
- void drawButtonLabel(QPainter *){;}
+ virtual void drawButton(TQPainter *p);
+ void drawButtonLabel(TQPainter *){;}
- QBitmap deco;
- QPixmap pix;
+ TQBitmap deco;
+ TQPixmap pix;
bool miniBtn;
};
@@ -52,9 +52,9 @@ public:
RedmondDeco(KDecorationBridge *, KDecorationFactory *);
~RedmondDeco() {;}
- virtual QString visibleName() const;
- virtual QString defaultButtonsLeft() const;
- virtual QString defaultButtonsRight() const;
+ virtual TQString visibleName() const;
+ virtual TQString defaultButtonsLeft() const;
+ virtual TQString defaultButtonsRight() const;
virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
virtual KCommonDecorationButton *createButton(ButtonType type);
@@ -64,13 +64,13 @@ public:
protected:
virtual void reset( unsigned long changed );
- void paintEvent(QPaintEvent*);
+ void paintEvent(TQPaintEvent*);
private:
int titleHeight;
};
-class RedmondDecoFactory : public QObject, public KDecorationFactory
+class RedmondDecoFactory : public TQObject, public KDecorationFactory
{
Q_OBJECT
public:
@@ -79,7 +79,7 @@ public:
virtual KDecoration *createDecoration(KDecorationBridge *);
virtual bool reset(unsigned long);
virtual bool supports( Ability ability );
- virtual QValueList< BorderSize > borderSizes() const;
+ virtual TQValueList< BorderSize > borderSizes() const;
private:
void readConfig();
};
diff --git a/kwin/clients/test/test.cpp b/kwin/clients/test/test.cpp
index abac77e64..a04437067 100644
--- a/kwin/clients/test/test.cpp
+++ b/kwin/clients/test/test.cpp
@@ -1,6 +1,6 @@
#include "test.h"
-#include <qtooltip.h>
+#include <tqtooltip.h>
#include <kglobal.h>
#include <kdebug.h>
@@ -20,16 +20,16 @@ void Decoration::init()
widget()->installEventFilter( this );
if( isCloseable())
{
- button = new QPushButton( widget());
+ button = new TQPushButton( widget());
button->show();
button->setCursor( arrowCursor );
button->move( 0, 0 );
- connect( button, SIGNAL( clicked()), SLOT( closeWindow()));
- QToolTip::add( button, "Zelva Mana" );
+ connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( closeWindow()));
+ TQToolTip::add( button, "Zelva Mana" );
}
}
-Decoration::MousePosition Decoration::mousePosition( const QPoint& p ) const
+Decoration::MousePosition Decoration::mousePosition( const TQPoint& p ) const
{
const int range = 16;
const int border = 4;
@@ -88,30 +88,30 @@ void Decoration::reset( unsigned long )
{
}
-void Decoration::resize( const QSize& s )
+void Decoration::resize( const TQSize& s )
{
widget()->resize( s );
}
-QSize Decoration::minimumSize() const
+TQSize Decoration::minimumSize() const
{
- return QSize( 100, 50 );
+ return TQSize( 100, 50 );
}
-bool Decoration::eventFilter( QObject* o, QEvent* e )
+bool Decoration::eventFilter( TQObject* o, TQEvent* e )
{
if( o == widget())
{
switch( e->type())
{
- case QEvent::MouseButtonPress:
+ case TQEvent::MouseButtonPress:
{ // FRAME
- processMousePressEvent( static_cast< QMouseEvent* >( e ));
+ processMousePressEvent( static_cast< TQMouseEvent* >( e ));
return true;
}
- case QEvent::Show:
+ case TQEvent::Show:
break;
- case QEvent::Hide:
+ case TQEvent::Hide:
break;
default:
break;
@@ -121,8 +121,8 @@ bool Decoration::eventFilter( QObject* o, QEvent* e )
}
}
-#include <qapplication.h>
-#include <qpainter.h>
+#include <tqapplication.h>
+#include <tqpainter.h>
#include <X11/Xlib.h>
#include <math.h>
#include <unistd.h>
@@ -146,7 +146,7 @@ bool Decoration::animateMinimize(bool iconify)
helperShowHide( false );
qApp->syncX();
- QRect r = iconGeometry();
+ TQRect r = iconGeometry();
if (!r.isValid())
return true;
@@ -178,7 +178,7 @@ bool Decoration::animateMinimize(bool iconify)
double delta = finalAngle / steps;
- QPainter p( workspaceWidget());
+ TQPainter p( workspaceWidget());
p.setRasterOp(Qt::NotROP);
for (double angle = 0; ; angle += delta) {
@@ -190,10 +190,10 @@ bool Decoration::animateMinimize(bool iconify)
double dch = (ch / 2) * cos(angle);
double midy = cy + (ch / 2);
- QPoint p1(int(cx + dx), int(midy - dch));
- QPoint p2(int(cx + cw - dx), p1.y());
- QPoint p3(int(cx + dw + dx), int(midy + dch));
- QPoint p4(int(cx - dx), p3.y());
+ TQPoint p1(int(cx + dx), int(midy - dch));
+ TQPoint p2(int(cx + cw - dx), p1.y());
+ TQPoint p3(int(cx + dw + dx), int(midy + dch));
+ TQPoint p4(int(cx - dx), p3.y());
grabXServer();
@@ -240,12 +240,12 @@ bool Decoration::animateMinimize(bool iconify)
int stepCount = 12;
- QRect r(geometry());
+ TQRect r(geometry());
int dx = r.width() / (stepCount * 2);
int dy = r.height() / (stepCount * 2);
- QPainter p( workspaceWidget());
+ TQPainter p( workspaceWidget());
p.setRasterOp(Qt::NotROP);
for (int step = 0; step < stepCount; step++) {
@@ -271,21 +271,21 @@ bool Decoration::animateMinimize(bool iconify)
default:
{
- QRect icongeom = iconGeometry();
+ TQRect icongeom = iconGeometry();
if (!icongeom.isValid())
return true;
- QRect wingeom = geometry();
+ TQRect wingeom = geometry();
- QPainter p( workspaceWidget());
+ TQPainter p( workspaceWidget());
p.setRasterOp(Qt::NotROP);
#if 0
if (iconify)
p.setClipRegion(
- QRegion( workspaceWidget()->rect()) - wingeom
+ TQRegion( workspaceWidget()->rect()) - wingeom
);
#endif
diff --git a/kwin/clients/test/test.h b/kwin/clients/test/test.h
index 56e21dbc0..bfe36fa7c 100644
--- a/kwin/clients/test/test.h
+++ b/kwin/clients/test/test.h
@@ -3,7 +3,7 @@
#include <kdecoration.h>
#include <kdecorationfactory.h>
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
namespace KWinTest
{
@@ -19,21 +19,21 @@ class Decoration
public:
Decoration( KDecorationBridge* bridge, KDecorationFactory* factory );
virtual void init();
- virtual MousePosition mousePosition( const QPoint& p ) const;
+ virtual MousePosition mousePosition( const TQPoint& p ) const;
virtual void borders( int& left, int& right, int& top, int& bottom ) const;
- virtual void resize( const QSize& s );
- virtual QSize minimumSize() const;
+ virtual void resize( const TQSize& s );
+ virtual TQSize minimumSize() const;
virtual void activeChange() {};
virtual void captionChange() {};
virtual void maximizeChange() {};
virtual void desktopChange() {};
virtual void shadeChange() {};
virtual void iconChange() {};
- virtual bool eventFilter( QObject* o, QEvent* e );
+ virtual bool eventFilter( TQObject* o, TQEvent* e );
virtual void reset( unsigned long changed );
virtual bool animateMinimize( bool minimize );
private:
- QPushButton* button;
+ TQPushButton* button;
};
class Factory
diff --git a/kwin/clients/web/Web.cpp b/kwin/clients/web/Web.cpp
index 7d63b7d72..43d1b9f42 100644
--- a/kwin/clients/web/Web.cpp
+++ b/kwin/clients/web/Web.cpp
@@ -20,7 +20,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <qpainter.h>
+#include <tqpainter.h>
#include <kconfig.h>
@@ -48,17 +48,17 @@ WebClient::~WebClient()
// Empty.
}
-QString WebClient::visibleName() const
+TQString WebClient::visibleName() const
{
return i18n("Web");
}
-QString WebClient::defaultButtonsLeft() const
+TQString WebClient::defaultButtonsLeft() const
{
return "S";
}
-QString WebClient::defaultButtonsRight() const
+TQString WebClient::defaultButtonsRight() const
{
return "HIAX";
}
@@ -156,7 +156,7 @@ WebClient::init()
{
// title height
const int textVMargin = 2;
- QFontMetrics fm(options()->font(isActive(), isToolWindow()));
+ TQFontMetrics fm(options()->font(isActive(), isToolWindow()));
// border size
switch(options()->preferredBorderSize( factory())) {
@@ -201,7 +201,7 @@ WebClient::reset( unsigned long changed )
// font has changed -- update title height
// title height
const int textVMargin = 2;
- QFontMetrics fm(options()->font(isActive(), isToolWindow()));
+ TQFontMetrics fm(options()->font(isActive(), isToolWindow()));
titleHeight_ = QMAX(QMAX(14, fm.height() + textVMargin * 2), borderSize_);
if (0 != titleHeight_ % 2)
titleHeight_ += 1;
@@ -213,7 +213,7 @@ WebClient::reset( unsigned long changed )
}
void
-WebClient::paintEvent(QPaintEvent * pe)
+WebClient::paintEvent(TQPaintEvent * pe)
{
int r_x, r_y, r_x2, r_y2;
widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2);
@@ -223,12 +223,12 @@ WebClient::paintEvent(QPaintEvent * pe)
const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom);
const int ttlHeight = layoutMetric(LM_TitleHeight);
const int titleEdgeBottomBottom = r_y+titleEdgeTop+ttlHeight+titleEdgeBottom-1;
- QRect titleRect = QRect(r_x+titleEdgeLeft+buttonsLeftWidth(), r_y+titleEdgeTop,
+ TQRect titleRect = TQRect(r_x+titleEdgeLeft+buttonsLeftWidth(), r_y+titleEdgeTop,
r_x2-titleEdgeRight-buttonsRightWidth()-(r_x+titleEdgeLeft+buttonsLeftWidth()),
titleEdgeBottomBottom-(r_y+titleEdgeTop) );
titleRect.setTop(1);
- QPainter p(widget());
+ TQPainter p(widget());
p.setPen(Qt::black);
p.setBrush(options()->colorGroup(ColorFrame, isActive()).background());
@@ -291,38 +291,38 @@ void WebClient::updateWindowShape()
if (!shape_)
return;
- QRegion mask(0, 0, width(), height());
+ TQRegion mask(0, 0, width(), height());
int r(width());
int b(height());
// Remove top-left corner.
- mask -= QRegion(0, 0, 5, 1);
- mask -= QRegion(0, 1, 3, 1);
- mask -= QRegion(0, 2, 2, 1);
- mask -= QRegion(0, 3, 1, 2);
+ mask -= TQRegion(0, 0, 5, 1);
+ mask -= TQRegion(0, 1, 3, 1);
+ mask -= TQRegion(0, 2, 2, 1);
+ mask -= TQRegion(0, 3, 1, 2);
// Remove top-right corner.
- mask -= QRegion(r - 5, 0, 5, 1);
- mask -= QRegion(r - 3, 1, 3, 1);
- mask -= QRegion(r - 2, 2, 2, 1);
- mask -= QRegion(r - 1, 3, 1, 2);
+ mask -= TQRegion(r - 5, 0, 5, 1);
+ mask -= TQRegion(r - 3, 1, 3, 1);
+ mask -= TQRegion(r - 2, 2, 2, 1);
+ mask -= TQRegion(r - 1, 3, 1, 2);
// Remove bottom-left corner.
- mask -= QRegion(0, b - 5, 1, 3);
- mask -= QRegion(0, b - 3, 2, 1);
- mask -= QRegion(0, b - 2, 3, 1);
- mask -= QRegion(0, b - 1, 5, 1);
+ mask -= TQRegion(0, b - 5, 1, 3);
+ mask -= TQRegion(0, b - 3, 2, 1);
+ mask -= TQRegion(0, b - 2, 3, 1);
+ mask -= TQRegion(0, b - 1, 5, 1);
// Remove bottom-right corner.
- mask -= QRegion(r - 5, b - 1, 5, 1);
- mask -= QRegion(r - 3, b - 2, 3, 1);
- mask -= QRegion(r - 2, b - 3, 2, 1);
- mask -= QRegion(r - 1, b - 5, 1, 2);
+ mask -= TQRegion(r - 5, b - 1, 5, 1);
+ mask -= TQRegion(r - 3, b - 2, 3, 1);
+ mask -= TQRegion(r - 2, b - 3, 2, 1);
+ mask -= TQRegion(r - 1, b - 5, 1, 2);
setMask(mask);
}
@@ -372,9 +372,9 @@ bool WebFactory::supports( Ability ability )
};
}
-QValueList< WebFactory::BorderSize > WebFactory::borderSizes() const
+TQValueList< WebFactory::BorderSize > WebFactory::borderSizes() const
{ // the list must be sorted
- return QValueList< BorderSize >() << BorderNormal << BorderLarge <<
+ return TQValueList< BorderSize >() << BorderNormal << BorderLarge <<
BorderVeryLarge << BorderHuge << BorderVeryHuge << BorderOversized;
}
diff --git a/kwin/clients/web/Web.h b/kwin/clients/web/Web.h
index 183829e8d..7d7d53bfb 100644
--- a/kwin/clients/web/Web.h
+++ b/kwin/clients/web/Web.h
@@ -42,9 +42,9 @@ namespace Web
WebClient(KDecorationBridge* bridge, KDecorationFactory* factory);
~WebClient();
- virtual QString visibleName() const;
- virtual QString defaultButtonsLeft() const;
- virtual QString defaultButtonsRight() const;
+ virtual TQString visibleName() const;
+ virtual TQString defaultButtonsLeft() const;
+ virtual TQString defaultButtonsRight() const;
virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
virtual KCommonDecorationButton *createButton(ButtonType type);
@@ -56,7 +56,7 @@ namespace Web
protected:
virtual void reset( unsigned long changed );
- virtual void paintEvent(QPaintEvent *);
+ virtual void paintEvent(TQPaintEvent *);
private:
@@ -64,10 +64,10 @@ namespace Web
bool shape_;
- QBitmap _buttonBitmap(ButtonType t) const;
+ TQBitmap _buttonBitmap(ButtonType t) const;
};
- class WebFactory : public QObject, public KDecorationFactory
+ class WebFactory : public TQObject, public KDecorationFactory
{
Q_OBJECT
@@ -78,7 +78,7 @@ namespace Web
virtual KDecoration* createDecoration( KDecorationBridge* );
virtual bool reset( unsigned long changed );
virtual bool supports( Ability ability );
- virtual QValueList< BorderSize > borderSizes() const;
+ virtual TQValueList< BorderSize > borderSizes() const;
};
}
diff --git a/kwin/clients/web/WebButton.cpp b/kwin/clients/web/WebButton.cpp
index 66bedc19f..61811accc 100644
--- a/kwin/clients/web/WebButton.cpp
+++ b/kwin/clients/web/WebButton.cpp
@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <qpainter.h>
+#include <tqpainter.h>
#include "WebButton.h"
#include "Web.h"
@@ -124,35 +124,35 @@ void WebButton::reset(unsigned long changed)
}
void
-WebButton::enterEvent(QEvent * e)
+WebButton::enterEvent(TQEvent * e)
{
mouseOver_ = true;
repaint();
- QButton::enterEvent(e);
+ TQButton::enterEvent(e);
}
void
-WebButton::leaveEvent(QEvent * e)
+WebButton::leaveEvent(TQEvent * e)
{
mouseOver_ = false;
repaint();
- QButton::leaveEvent(e);
+ TQButton::leaveEvent(e);
}
void
-WebButton::drawButton(QPainter *p)
+WebButton::drawButton(TQPainter *p)
{
- QPen highlightPen;
+ TQPen highlightPen;
if (isDown() )
- highlightPen = QPen(colorGroup().light());
+ highlightPen = TQPen(colorGroup().light());
else
{
if (mouseOver_)
- highlightPen = QPen(colorGroup().highlight());
+ highlightPen = TQPen(colorGroup().highlight());
else
- highlightPen = QPen(NoPen);
+ highlightPen = TQPen(NoPen);
}
p->fillRect(rect(), colorGroup().background());
@@ -188,7 +188,7 @@ WebButton::drawButton(QPainter *p)
p->setPen(highlightPen);
if (shape_)
- p->setClipRegion(QRegion(rect()) - QRect(0, 0, 6, 6));
+ p->setClipRegion(TQRegion(rect()) - TQRect(0, 0, 6, 6));
p->drawRect(2, 2, width() - 4, height() - 4);
if (shape_)
@@ -224,7 +224,7 @@ WebButton::drawButton(QPainter *p)
p->setPen(highlightPen);
if (shape_)
- p->setClipRegion(QRegion(rect()) - QRect(width() - 6, 0, 6, 6));
+ p->setClipRegion(TQRegion(rect()) - TQRect(width() - 6, 0, 6, 6));
p->drawRect(2, 2, width() - 4, height() - 4);
if (shape_)
@@ -260,7 +260,7 @@ WebButton::drawButton(QPainter *p)
// Draw icon.
- QPoint center(rect().center());
+ TQPoint center(rect().center());
int bwby2(bitmap_.width() / 2); // Bitmap Width BY 2
int bhby2(bitmap_.height() / 2); // Bitmap Height BY 2
@@ -275,9 +275,9 @@ WebButton::drawButton(QPainter *p)
WebButton::setBitmap(const unsigned char *bitmap)
{
if (bitmap)
- bitmap_ = QBitmap(8,8, bitmap, true);
+ bitmap_ = TQBitmap(8,8, bitmap, true);
else
- bitmap_ = QBitmap(8,8);
+ bitmap_ = TQBitmap(8,8);
bitmap_.setMask(bitmap_);
}
diff --git a/kwin/clients/web/WebButton.h b/kwin/clients/web/WebButton.h
index 6c1530f42..da94ea3f7 100644
--- a/kwin/clients/web/WebButton.h
+++ b/kwin/clients/web/WebButton.h
@@ -22,8 +22,8 @@
#ifndef KWIN_WEB_BUTTON_H
#define KWIN_WEB_BUTTON_H
-#include <qwidget.h>
-#include <qbitmap.h>
+#include <tqwidget.h>
+#include <tqbitmap.h>
#include <klocale.h>
#include "../../lib/kcommondecoration.h"
@@ -50,12 +50,12 @@ namespace Web
protected:
void setBitmap(const unsigned char *bitmap);
- void enterEvent(QEvent *);
- void leaveEvent(QEvent *);
- void drawButton(QPainter *p);
+ void enterEvent(TQEvent *);
+ void leaveEvent(TQEvent *);
+ void drawButton(TQPainter *p);
private:
- QBitmap bitmap_;
+ TQBitmap bitmap_;
bool mouseOver_;
diff --git a/kwin/data/update_default_rules.cpp b/kwin/data/update_default_rules.cpp
index 78adc6164..e43323ec9 100644
--- a/kwin/data/update_default_rules.cpp
+++ b/kwin/data/update_default_rules.cpp
@@ -21,7 +21,7 @@ int main( int argc, char* argv[] )
if( argc != 2 )
return 1;
KInstance inst( "kwin_update_default_rules" );
- QString file = locate( "data", QString( "kwin/default_rules/" ) + argv[ 1 ] );
+ TQString file = locate( "data", TQString( "kwin/default_rules/" ) + argv[ 1 ] );
if( file.isEmpty())
{
kdWarning() << "File " << argv[ 1 ] << " not found!" << endl;
@@ -37,11 +37,11 @@ int main( int argc, char* argv[] )
group <= count;
++group )
{
- QMap< QString, QString > entries = src_cfg.entryMap( QString::number( group ));
+ TQMap< TQString, TQString > entries = src_cfg.entryMap( TQString::number( group ));
++pos;
- dest_cfg.deleteGroup( QString::number( pos ));
- dest_cfg.setGroup( QString::number( pos ));
- for( QMap< QString, QString >::ConstIterator it = entries.begin();
+ dest_cfg.deleteGroup( TQString::number( pos ));
+ dest_cfg.setGroup( TQString::number( pos ));
+ for( TQMap< TQString, TQString >::ConstIterator it = entries.begin();
it != entries.end();
++it )
dest_cfg.writeEntry( it.key(), *it );
diff --git a/kwin/data/update_window_settings.cpp b/kwin/data/update_window_settings.cpp
index 369c1e4ea..0a39850d7 100644
--- a/kwin/data/update_window_settings.cpp
+++ b/kwin/data/update_window_settings.cpp
@@ -17,16 +17,16 @@ License. See the file "COPYING" for the exact licensing terms.
struct SessionInfo
{
- QCString sessionId;
- QCString windowRole;
- QCString wmCommand;
- QCString wmClientMachine;
- QCString resourceName;
- QCString resourceClass;
+ TQCString sessionId;
+ TQCString windowRole;
+ TQCString wmCommand;
+ TQCString wmClientMachine;
+ TQCString resourceName;
+ TQCString resourceClass;
- QRect geometry;
- QRect restore;
- QRect fsrestore;
+ TQRect geometry;
+ TQRect restore;
+ TQRect fsrestore;
int maximized;
int fullscreen;
int desktop;
@@ -43,7 +43,7 @@ struct SessionInfo
bool fake; // fake session, i.e. 'save window settings', not SM restored
};
-QPtrList<SessionInfo> fakeSession;
+TQPtrList<SessionInfo> fakeSession;
static const char* const window_type_names[] =
{
@@ -69,28 +69,28 @@ void loadFakeSessionInfo( KConfig* config )
int count = config->readNumEntry( "count" );
for ( int i = 1; i <= count; i++ )
{
- QString n = QString::number(i);
+ TQString n = TQString::number(i);
SessionInfo* info = new SessionInfo;
fakeSession.append( info );
- info->windowRole = config->readEntry( QString("windowRole")+n ).latin1();
- info->resourceName = config->readEntry( QString("resourceName")+n ).latin1();
- info->resourceClass = config->readEntry( QString("resourceClass")+n ).lower().latin1();
- info->wmClientMachine = config->readEntry( QString("clientMachine")+n ).latin1();
- info->geometry = config->readRectEntry( QString("geometry")+n );
- info->restore = config->readRectEntry( QString("restore")+n );
- info->fsrestore = config->readRectEntry( QString("fsrestore")+n );
- info->maximized = config->readNumEntry( QString("maximize")+n, 0 );
- info->fullscreen = config->readNumEntry( QString("fullscreen")+n, 0 );
- info->desktop = config->readNumEntry( QString("desktop")+n, 0 );
- info->minimized = config->readBoolEntry( QString("iconified")+n, FALSE );
- info->onAllDesktops = config->readBoolEntry( QString("sticky")+n, FALSE );
- info->shaded = config->readBoolEntry( QString("shaded")+n, FALSE );
- info->keepAbove = config->readBoolEntry( QString("staysOnTop")+n, FALSE );
- info->keepBelow = config->readBoolEntry( QString("keepBelow")+n, FALSE );
- info->skipTaskbar = config->readBoolEntry( QString("skipTaskbar")+n, FALSE );
- info->skipPager = config->readBoolEntry( QString("skipPager")+n, FALSE );
- info->userNoBorder = config->readBoolEntry( QString("userNoBorder")+n, FALSE );
- info->windowType = txtToWindowType( config->readEntry( QString("windowType")+n ).latin1());
+ info->windowRole = config->readEntry( TQString("windowRole")+n ).latin1();
+ info->resourceName = config->readEntry( TQString("resourceName")+n ).latin1();
+ info->resourceClass = config->readEntry( TQString("resourceClass")+n ).lower().latin1();
+ info->wmClientMachine = config->readEntry( TQString("clientMachine")+n ).latin1();
+ info->geometry = config->readRectEntry( TQString("geometry")+n );
+ info->restore = config->readRectEntry( TQString("restore")+n );
+ info->fsrestore = config->readRectEntry( TQString("fsrestore")+n );
+ info->maximized = config->readNumEntry( TQString("maximize")+n, 0 );
+ info->fullscreen = config->readNumEntry( TQString("fullscreen")+n, 0 );
+ info->desktop = config->readNumEntry( TQString("desktop")+n, 0 );
+ info->minimized = config->readBoolEntry( TQString("iconified")+n, FALSE );
+ info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, FALSE );
+ info->shaded = config->readBoolEntry( TQString("shaded")+n, FALSE );
+ info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, FALSE );
+ info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, FALSE );
+ info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, FALSE );
+ info->skipPager = config->readBoolEntry( TQString("skipPager")+n, FALSE );
+ info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, FALSE );
+ info->windowType = txtToWindowType( config->readEntry( TQString("windowType")+n ).latin1());
info->active = false;
info->fake = true;
}
@@ -106,7 +106,7 @@ void writeRules( KConfig& cfg )
if( info->resourceName.isEmpty() && info->resourceClass.isEmpty())
continue;
++pos;
- cfg.setGroup( QString::number( pos ));
+ cfg.setGroup( TQString::number( pos ));
cfg.writeEntry( "description", ( const char* ) ( info->resourceClass + " (KDE3.2)" ));
cfg.writeEntry( "wmclass", ( const char* )( info->resourceName + ' ' + info->resourceClass ));
cfg.writeEntry( "wmclasscomplete", true );
diff --git a/kwin/events.cpp b/kwin/events.cpp
index 039c760b4..ba6321a7c 100644
--- a/kwin/events.cpp
+++ b/kwin/events.cpp
@@ -22,9 +22,9 @@ License. See the file "COPYING" for the exact licensing terms.
#include "group.h"
#include "rules.h"
-#include <qwhatsthis.h>
+#include <tqwhatsthis.h>
#include <kkeynative.h>
-#include <qapplication.h>
+#include <tqapplication.h>
#include <X11/extensions/shape.h>
#include <X11/Xatom.h>
@@ -289,7 +289,7 @@ bool Workspace::workspaceEvent( XEvent * e )
{
case CreateNotify:
if ( e->xcreatewindow.parent == root &&
- !QWidget::find( e->xcreatewindow.window) &&
+ !TQWidget::find( e->xcreatewindow.window) &&
!e->xcreatewindow.override_redirect )
{
// see comments for allowClientActivation()
@@ -365,7 +365,7 @@ bool Workspace::workspaceEvent( XEvent * e )
c = createClient( e->xmaprequest.window, false );
if ( c != NULL && root != qt_xrootwin() )
{ // TODO what is this?
- // TODO may use QWidget::create
+ // TODO may use TQWidget::create
XReparentWindow( qt_xdisplay(), c->frameId(), root, 0, 0 );
}
if( c == NULL ) // refused to manage, simply map it (most probably override redirect)
@@ -382,11 +382,11 @@ bool Workspace::workspaceEvent( XEvent * e )
}
case EnterNotify:
{
- if ( QWhatsThis::inWhatsThisMode() )
+ if ( TQWhatsThis::inWhatsThisMode() )
{
- QWidget* w = QWidget::find( e->xcrossing.window );
+ TQWidget* w = TQWidget::find( e->xcrossing.window );
if ( w )
- QWhatsThis::leaveWhatsThisMode();
+ TQWhatsThis::leaveWhatsThisMode();
}
if( electricBorder(e))
return true;
@@ -394,12 +394,12 @@ bool Workspace::workspaceEvent( XEvent * e )
}
case LeaveNotify:
{
- if ( !QWhatsThis::inWhatsThisMode() )
+ if ( !TQWhatsThis::inWhatsThisMode() )
break;
// TODO is this cliente ever found, given that client events are searched above?
Client* c = findClient( FrameIdMatchPredicate( e->xcrossing.window ));
if ( c && e->xcrossing.detail != NotifyInferior )
- QWhatsThis::leaveWhatsThisMode();
+ TQWhatsThis::leaveWhatsThisMode();
break;
}
case ConfigureRequest:
@@ -430,7 +430,7 @@ bool Workspace::workspaceEvent( XEvent * e )
return FALSE;
break;
case FocusIn:
- if( e->xfocus.window == rootWin() && QCString( getenv("KDE_MULTIHEAD")).lower() != "true"
+ if( e->xfocus.window == rootWin() && TQCString( getenv("KDE_MULTIHEAD")).lower() != "true"
&& ( e->xfocus.detail == NotifyDetailNone || e->xfocus.detail == NotifyPointerRoot ))
{
updateXTime(); // focusToNull() uses qt_x_time, which is old now (FocusIn has no timestamp)
@@ -583,7 +583,7 @@ bool Client::windowEvent( XEvent* e )
case MotionNotify:
motionNotifyEvent( e->xmotion.window, e->xmotion.state,
e->xmotion.x, e->xmotion.y, e->xmotion.x_root, e->xmotion.y_root );
- workspace()->updateFocusMousePosition( QPoint( e->xmotion.x_root, e->xmotion.y_root ));
+ workspace()->updateFocusMousePosition( TQPoint( e->xmotion.x_root, e->xmotion.y_root ));
break;
case EnterNotify:
enterNotifyEvent( &e->xcrossing );
@@ -594,14 +594,14 @@ bool Client::windowEvent( XEvent* e )
// events simpler (Qt does that too).
motionNotifyEvent( e->xcrossing.window, e->xcrossing.state,
e->xcrossing.x, e->xcrossing.y, e->xcrossing.x_root, e->xcrossing.y_root );
- workspace()->updateFocusMousePosition( QPoint( e->xcrossing.x_root, e->xcrossing.y_root ));
+ workspace()->updateFocusMousePosition( TQPoint( e->xcrossing.x_root, e->xcrossing.y_root ));
break;
case LeaveNotify:
motionNotifyEvent( e->xcrossing.window, e->xcrossing.state,
e->xcrossing.x, e->xcrossing.y, e->xcrossing.x_root, e->xcrossing.y_root );
leaveNotifyEvent( &e->xcrossing );
// not here, it'd break following enter notify handling
- // workspace()->updateFocusMousePosition( QPoint( e->xcrossing.x_root, e->xcrossing.y_root ));
+ // workspace()->updateFocusMousePosition( TQPoint( e->xcrossing.x_root, e->xcrossing.y_root ));
break;
case FocusIn:
focusInEvent( &e->xfocus );
@@ -879,8 +879,8 @@ void Client::enterNotifyEvent( XCrossingEvent* e )
if (options->shadeHover && isShade())
{
delete shadeHoverTimer;
- shadeHoverTimer = new QTimer( this );
- connect( shadeHoverTimer, SIGNAL( timeout() ), this, SLOT( shadeHover() ));
+ shadeHoverTimer = new TQTimer( this );
+ connect( shadeHoverTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( shadeHover() ));
shadeHoverTimer->start( options->shadeHoverInterval, TRUE );
}
@@ -892,12 +892,12 @@ void Client::enterNotifyEvent( XCrossingEvent* e )
workspace()->topClientOnDesktop( workspace()->currentDesktop()) != this )
{
delete autoRaiseTimer;
- autoRaiseTimer = new QTimer( this );
- connect( autoRaiseTimer, SIGNAL( timeout() ), this, SLOT( autoRaise() ) );
+ autoRaiseTimer = new TQTimer( this );
+ connect( autoRaiseTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoRaise() ) );
autoRaiseTimer->start( options->autoRaiseInterval, TRUE );
}
- QPoint currentPos( e->x_root, e->y_root );
+ TQPoint currentPos( e->x_root, e->y_root );
if ( options->focusPolicy != Options::FocusStrictlyUnderMouse && ( isDesktop() || isDock() || isTopMenu() ) )
return;
// for FocusFollowsMouse, change focus only if the mouse has actually been moved, not if the focus
@@ -925,7 +925,7 @@ void Client::leaveNotifyEvent( XCrossingEvent* e )
mode = PositionCenter;
setCursor( arrowCursor );
}
- bool lostMouse = !rect().contains( QPoint( e->x, e->y ) );
+ bool lostMouse = !rect().contains( TQPoint( e->x, e->y ) );
// 'lostMouse' wouldn't work with e.g. B2 or Keramik, which have non-rectangular decorations
// (i.e. the LeaveNotify event comes before leaving the rect and no LeaveNotify event
// comes after leaving the rect) - so lets check if the pointer is really outside the window
@@ -1076,41 +1076,41 @@ int qtToX11State( Qt::ButtonState state )
// Qt propagates mouse events up the widget hierachy, which means events
// for the decoration window cannot be (easily) intercepted as X11 events
-bool Client::eventFilter( QObject* o, QEvent* e )
+bool Client::eventFilter( TQObject* o, TQEvent* e )
{
if( decoration == NULL
|| o != decoration->widget())
return false;
- if( e->type() == QEvent::MouseButtonPress )
+ if( e->type() == TQEvent::MouseButtonPress )
{
- QMouseEvent* ev = static_cast< QMouseEvent* >( e );
+ TQMouseEvent* ev = static_cast< TQMouseEvent* >( e );
return buttonPressEvent( decorationId(), qtToX11Button( ev->button()), qtToX11State( ev->state()),
ev->x(), ev->y(), ev->globalX(), ev->globalY() );
}
- if( e->type() == QEvent::MouseButtonRelease )
+ if( e->type() == TQEvent::MouseButtonRelease )
{
- QMouseEvent* ev = static_cast< QMouseEvent* >( e );
+ TQMouseEvent* ev = static_cast< TQMouseEvent* >( e );
return buttonReleaseEvent( decorationId(), qtToX11Button( ev->button()), qtToX11State( ev->state()),
ev->x(), ev->y(), ev->globalX(), ev->globalY() );
}
- if( e->type() == QEvent::MouseMove ) // FRAME i fake z enter/leave?
+ if( e->type() == TQEvent::MouseMove ) // FRAME i fake z enter/leave?
{
- QMouseEvent* ev = static_cast< QMouseEvent* >( e );
+ TQMouseEvent* ev = static_cast< TQMouseEvent* >( e );
return motionNotifyEvent( decorationId(), qtToX11State( ev->state()),
ev->x(), ev->y(), ev->globalX(), ev->globalY() );
}
- if( e->type() == QEvent::Wheel )
+ if( e->type() == TQEvent::Wheel )
{
- QWheelEvent* ev = static_cast< QWheelEvent* >( e );
+ TQWheelEvent* ev = static_cast< TQWheelEvent* >( e );
bool r = buttonPressEvent( decorationId(), ev->delta() > 0 ? Button4 : Button5, qtToX11State( ev->state()),
ev->x(), ev->y(), ev->globalX(), ev->globalY() );
r = r || buttonReleaseEvent( decorationId(), ev->delta() > 0 ? Button4 : Button5, qtToX11State( ev->state()),
ev->x(), ev->y(), ev->globalX(), ev->globalY() );
return r;
}
- if( e->type() == QEvent::Resize )
+ if( e->type() == TQEvent::Resize )
{
- QResizeEvent* ev = static_cast< QResizeEvent* >( e );
+ TQResizeEvent* ev = static_cast< TQResizeEvent* >( e );
// Filter out resize events that inform about size different than frame size.
// This will ensure that decoration->width() etc. and decoration->widget()->width() will be in sync.
// These events only seem to be delayed events from initial resizing before show() was called
@@ -1204,7 +1204,7 @@ bool Client::buttonPressEvent( Window w, int button, int state, int x, int y, in
}
if( was_action )
{
- bool replay = performMouseCommand( com, QPoint( x_root, y_root), perform_handled );
+ bool replay = performMouseCommand( com, TQPoint( x_root, y_root), perform_handled );
if ( isSpecialWindow())
replay = TRUE;
@@ -1247,20 +1247,20 @@ void Client::processDecorationButtonPress( int button, int /*state*/, int x, int
&& com != Options::MouseOperationsMenu // actions where it's not possible to get the matching
&& com != Options::MouseMinimize ) // mouse release event
{
- mode = mousePosition( QPoint( x, y ));
+ mode = mousePosition( TQPoint( x, y ));
buttonDown = TRUE;
- moveOffset = QPoint( x, y );
+ moveOffset = TQPoint( x, y );
invertedMoveOffset = rect().bottomRight() - moveOffset;
unrestrictedMoveResize = false;
setCursor( mode ); // update to sizeAllCursor if about to move
}
- performMouseCommand( com, QPoint( x_root, y_root ));
+ performMouseCommand( com, TQPoint( x_root, y_root ));
}
// called from decoration
-void Client::processMousePressEvent( QMouseEvent* e )
+void Client::processMousePressEvent( TQMouseEvent* e )
{
- if( e->type() != QEvent::MouseButtonPress )
+ if( e->type() != TQEvent::MouseButtonPress )
{
kdWarning() << "processMousePressEvent()" << endl;
return;
@@ -1304,7 +1304,7 @@ bool Client::buttonReleaseEvent( Window w, int /*button*/, int state, int x, int
{
finishMoveResize( false );
// mouse position is still relative to old Client position, adjust it
- QPoint mousepos( x_root - x, y_root - y );
+ TQPoint mousepos( x_root - x, y_root - y );
mode = mousePosition( mousepos );
}
setCursor( mode );
@@ -1353,7 +1353,7 @@ bool Client::motionNotifyEvent( Window w, int /*state*/, int x, int y, int x_roo
return true; // care only about the whole frame
if ( !buttonDown )
{
- Position newmode = mousePosition( QPoint( x, y ));
+ Position newmode = mousePosition( TQPoint( x, y ));
if( newmode != mode )
setCursor( newmode );
mode = newmode;
@@ -1452,7 +1452,7 @@ void Client::focusOutEvent( XFocusOutEvent* e )
&& e->detail != NotifyNonlinearVirtual )
// SELI check all this
return; // hack for motif apps like netscape
- if ( QApplication::activePopupWidget() )
+ if ( TQApplication::activePopupWidget() )
return;
if( !check_follows_focusin( this ))
setActive( FALSE );
@@ -1462,7 +1462,7 @@ void Client::focusOutEvent( XFocusOutEvent* e )
void Client::NETMoveResize( int x_root, int y_root, NET::Direction direction )
{
if( direction == NET::Move )
- performMouseCommand( Options::MouseMove, QPoint( x_root, y_root ));
+ performMouseCommand( Options::MouseMove, TQPoint( x_root, y_root ));
else if( moveResizeMode && direction == NET::MoveResizeCancel )
{
finishMoveResize( true );
@@ -1487,7 +1487,7 @@ void Client::NETMoveResize( int x_root, int y_root, NET::Direction direction )
if( moveResizeMode )
finishMoveResize( false );
buttonDown = TRUE;
- moveOffset = QPoint( x_root - x(), y_root - y()); // map from global
+ moveOffset = TQPoint( x_root - x(), y_root - y()); // map from global
invertedMoveOffset = rect().bottomRight() - moveOffset;
unrestrictedMoveResize = false;
mode = convert[ direction ];
@@ -1500,12 +1500,12 @@ void Client::NETMoveResize( int x_root, int y_root, NET::Direction direction )
}
else if( direction == NET::KeyboardMove )
{ // ignore mouse coordinates given in the message, mouse position is used by the moving algorithm
- QCursor::setPos( geometry().center() );
+ TQCursor::setPos( geometry().center() );
performMouseCommand( Options::MouseUnrestrictedMove, geometry().center());
}
else if( direction == NET::KeyboardSize )
{ // ignore mouse coordinates given in the message, mouse position is used by the resizing algorithm
- QCursor::setPos( geometry().bottomRight());
+ TQCursor::setPos( geometry().bottomRight());
performMouseCommand( Options::MouseUnrestrictedResize, geometry().bottomRight());
}
}
@@ -1519,7 +1519,7 @@ void Client::keyPressEvent( uint key_code )
bool is_alt = key_code & Qt::ALT;
key_code = key_code & 0xffff;
int delta = is_control?1:is_alt?32:8;
- QPoint pos = QCursor::pos();
+ TQPoint pos = TQCursor::pos();
switch ( key_code )
{
case Key_Left:
@@ -1549,7 +1549,7 @@ void Client::keyPressEvent( uint key_code )
default:
return;
}
- QCursor::setPos( pos );
+ TQCursor::setPos( pos );
}
// ****************************************
diff --git a/kwin/geometry.cpp b/kwin/geometry.cpp
index 4aa520d6f..f531bdfb8 100644
--- a/kwin/geometry.cpp
+++ b/kwin/geometry.cpp
@@ -21,7 +21,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <kapplication.h>
#include <kglobal.h>
-#include <qpainter.h>
+#include <tqpainter.h>
#include <kwin.h>
#include "placement.h"
@@ -44,7 +44,7 @@ namespace KWinInternal
void Workspace::desktopResized()
{
//printf("Workspace::desktopResized()\n\r");
- QRect geom = KApplication::desktop()->geometry();
+ TQRect geom = KApplication::desktop()->geometry();
NETSize desktop_geometry;
desktop_geometry.width = geom.width();
desktop_geometry.height = geom.height();
@@ -60,7 +60,7 @@ void Workspace::desktopResized()
void Workspace::kDestopResized()
{
//printf("Workspace::kDesktopResized()\n\r");
- QRect geom = KApplication::desktop()->geometry();
+ TQRect geom = KApplication::desktop()->geometry();
NETSize desktop_geometry;
desktop_geometry.width = geom.width();
desktop_geometry.height = geom.height();
@@ -84,13 +84,13 @@ void Workspace::kDestopResized()
void Workspace::updateClientArea( bool force )
{
- QDesktopWidget *desktopwidget = KApplication::desktop();
+ TQDesktopWidget *desktopwidget = KApplication::desktop();
int nscreens = desktopwidget -> numScreens ();
// kdDebug () << "screens: " << nscreens << endl;
- QRect* new_wareas = new QRect[ numberOfDesktops() + 1 ];
- QRect** new_sareas = new QRect*[ numberOfDesktops() + 1];
- QRect* screens = new QRect [ nscreens ];
- QRect desktopArea = desktopwidget -> geometry ();
+ TQRect* new_wareas = new QRect[ numberOfDesktops() + 1 ];
+ TQRect** new_sareas = new TQRect*[ numberOfDesktops() + 1];
+ TQRect* screens = new TQRect [ nscreens ];
+ TQRect desktopArea = desktopwidget -> geometry ();
for( int iS = 0;
iS < nscreens;
iS ++ )
@@ -102,7 +102,7 @@ void Workspace::updateClientArea( bool force )
++i )
{
new_wareas[ i ] = desktopArea;
- new_sareas[ i ] = new QRect [ nscreens ];
+ new_sareas[ i ] = new TQRect [ nscreens ];
for( int iS = 0;
iS < nscreens;
iS ++ )
@@ -112,7 +112,7 @@ void Workspace::updateClientArea( bool force )
{
if( !(*it)->hasStrut())
continue;
- QRect r = (*it)->adjustedClientArea( desktopArea, desktopArea );
+ TQRect r = (*it)->adjustedClientArea( desktopArea, desktopArea );
if( (*it)->isOnAllDesktops())
for( int i = 1;
i <= numberOfDesktops();
@@ -156,7 +156,7 @@ void Workspace::updateClientArea( bool force )
// TODO topmenu update for screenarea changes?
if( topmenu_space != NULL )
{
- QRect topmenu_area = desktopArea;
+ TQRect topmenu_area = desktopArea;
topmenu_area.setTop( topMenuHeight());
for( int i = 1;
i <= numberOfDesktops();
@@ -228,15 +228,15 @@ void Workspace::updateClientArea()
\sa geometry()
*/
-QRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) const
+TQRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) const
{
if( desktop == NETWinInfo::OnAllDesktops || desktop == 0 )
desktop = currentDesktop();
- QDesktopWidget *desktopwidget = kapp->desktop();
- QRect sarea = screenarea // may be NULL during KWin initialization
+ TQDesktopWidget *desktopwidget = kapp->desktop();
+ TQRect sarea = screenarea // may be NULL during KWin initialization
? screenarea[ desktop ][ screen ]
: desktopwidget->screenGeometry( screen );
- QRect warea = workarea[ desktop ].isNull()
+ TQRect warea = workarea[ desktop ].isNull()
? kapp->desktop()->geometry()
: workarea[ desktop ];
switch (opt)
@@ -292,19 +292,19 @@ QRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) con
return desktopwidget->screenGeometry( screen );
}
assert( false );
- return QRect();
+ return TQRect();
}
-QRect Workspace::clientArea( clientAreaOption opt, const QPoint& p, int desktop ) const
+TQRect Workspace::clientArea( clientAreaOption opt, const TQPoint& p, int desktop ) const
{
- QDesktopWidget *desktopwidget = KApplication::desktop();
+ TQDesktopWidget *desktopwidget = KApplication::desktop();
int screen = desktopwidget->screenNumber( p );
if( screen < 0 )
screen = desktopwidget->primaryScreen();
return clientArea( opt, screen, desktop );
}
-QRect Workspace::clientArea( clientAreaOption opt, const Client* c ) const
+TQRect Workspace::clientArea( clientAreaOption opt, const Client* c ) const
{
return clientArea( opt, c->geometry().center(), c->desktop());
}
@@ -315,7 +315,7 @@ QRect Workspace::clientArea( clientAreaOption opt, const Client* c ) const
workspace the opportunity to interveniate and to implement
snap-to-windows functionality.
*/
-QPoint Workspace::adjustClientPosition( Client* c, QPoint pos )
+TQPoint Workspace::adjustClientPosition( Client* c, TQPoint pos )
{
//CT 16mar98, 27May98 - magics: BorderSnapZone, WindowSnapZone
//CT adapted for kwin on 25Nov1999
@@ -323,7 +323,7 @@ QPoint Workspace::adjustClientPosition( Client* c, QPoint pos )
if (options->windowSnapZone || options->borderSnapZone )
{
const bool sOWO=options->snapOnlyWhenOverlapping;
- const QRect maxRect = clientArea(MovementArea, pos+c->rect().center(), c->desktop());
+ const TQRect maxRect = clientArea(MovementArea, pos+c->rect().center(), c->desktop());
const int xmin = maxRect.left();
const int xmax = maxRect.right()+1; //desk size
const int ymin = maxRect.top();
@@ -373,7 +373,7 @@ QPoint Workspace::adjustClientPosition( Client* c, QPoint pos )
snap = options->windowSnapZone;
if (snap)
{
- QValueList<Client *>::ConstIterator l;
+ TQValueList<Client *>::ConstIterator l;
for (l = clients.begin();l != clients.end();++l )
{
if ((*l)->isOnDesktop(currentDesktop()) &&
@@ -420,12 +420,12 @@ QPoint Workspace::adjustClientPosition( Client* c, QPoint pos )
}
}
}
- pos = QPoint(nx, ny);
+ pos = TQPoint(nx, ny);
}
return pos;
}
-QRect Workspace::adjustClientSize( Client* c, QRect moveResizeGeom, int mode )
+TQRect Workspace::adjustClientSize( Client* c, TQRect moveResizeGeom, int mode )
{
//adapted from adjustClientPosition on 29May2004
//this function is called when resizing a window and will modify
@@ -434,7 +434,7 @@ QRect Workspace::adjustClientSize( Client* c, QRect moveResizeGeom, int mode )
{
const bool sOWO=options->snapOnlyWhenOverlapping;
- const QRect maxRect = clientArea(MovementArea, c->rect().center(), c->desktop());
+ const TQRect maxRect = clientArea(MovementArea, c->rect().center(), c->desktop());
const int xmin = maxRect.left();
const int xmax = maxRect.right(); //desk size
const int ymin = maxRect.top();
@@ -530,7 +530,7 @@ QRect Workspace::adjustClientSize( Client* c, QRect moveResizeGeom, int mode )
{
deltaX = int(snap);
deltaY = int(snap);
- QValueList<Client *>::ConstIterator l;
+ TQValueList<Client *>::ConstIterator l;
for (l = clients.begin();l != clients.end();++l )
{
if ((*l)->isOnDesktop(currentDesktop()) &&
@@ -616,7 +616,7 @@ QRect Workspace::adjustClientSize( Client* c, QRect moveResizeGeom, int mode )
}
}
}
- moveResizeGeom = QRect(QPoint(newcx, newcy), QPoint(newrx, newry));
+ moveResizeGeom = TQRect(TQPoint(newcx, newcy), TQPoint(newrx, newry));
}
return moveResizeGeom;
}
@@ -644,7 +644,7 @@ void Workspace::cascadeDesktop()
Q_ASSERT( block_stacking_updates == 0 );
ClientList::ConstIterator it(stackingOrder().begin());
initPositioning->reinitCascading( currentDesktop());
- QRect area = clientArea( PlacementArea, QPoint( 0, 0 ), currentDesktop());
+ TQRect area = clientArea( PlacementArea, TQPoint( 0, 0 ), currentDesktop());
for (; it != stackingOrder().end(); ++it)
{
if((!(*it)->isOnDesktop(currentDesktop())) ||
@@ -670,7 +670,7 @@ void Workspace::unclutterDesktop()
((*it)->isOnAllDesktops()) ||
(!(*it)->isMovable()) )
continue;
- initPositioning->placeSmart(*it, QRect());
+ initPositioning->placeSmart(*it, TQRect());
}
}
@@ -699,8 +699,8 @@ void Workspace::updateTopMenuGeometry( Client* c )
return;
}
// c == NULL - update all, including topmenu_space
- QRect area;
- area = clientArea( MaximizeFullArea, QPoint( 0, 0 ), 1 ); // HACK desktop ?
+ TQRect area;
+ area = clientArea( MaximizeFullArea, TQPoint( 0, 0 ), 1 ); // HACK desktop ?
area.setHeight( topMenuHeight());
topmenu_space->setGeometry( area );
for( ClientList::ConstIterator it = topmenus.begin();
@@ -714,7 +714,7 @@ void Workspace::updateTopMenuGeometry( Client* c )
//********************************************
-void Client::keepInArea( QRect area, bool partial )
+void Client::keepInArea( TQRect area, bool partial )
{
if( partial )
{
@@ -747,29 +747,29 @@ void Client::keepInArea( QRect area, bool partial )
*/
// TODO move to Workspace?
-QRect Client::adjustedClientArea( const QRect &desktopArea, const QRect& area ) const
+TQRect Client::adjustedClientArea( const TQRect &desktopArea, const TQRect& area ) const
{
- QRect r = area;
+ TQRect r = area;
// topmenu area is reserved in updateClientArea()
if( isTopMenu())
return r;
NETExtendedStrut str = strut();
- QRect stareaL = QRect(
+ TQRect stareaL = TQRect(
0,
str . left_start,
str . left_width,
str . left_end - str . left_start + 1 );
- QRect stareaR = QRect (
+ TQRect stareaR = TQRect (
desktopArea . right () - str . right_width + 1,
str . right_start,
str . right_width,
str . right_end - str . right_start + 1 );
- QRect stareaT = QRect (
+ TQRect stareaT = TQRect (
str . top_start,
0,
str . top_end - str . top_start + 1,
str . top_width);
- QRect stareaB = QRect (
+ TQRect stareaB = TQRect (
str . bottom_start,
desktopArea . bottom () - str . bottom_width + 1,
str . bottom_end - str . bottom_start + 1,
@@ -807,20 +807,20 @@ QRect Client::adjustedClientArea( const QRect &desktopArea, const QRect& area )
}
}
- QRect screenarea = workspace()->clientArea( ScreenArea, this );
+ TQRect screenarea = workspace()->clientArea( ScreenArea, this );
// HACK: workarea handling is not xinerama aware, so if this strut
// reserves place at a xinerama edge that's inside the virtual screen,
// ignore the strut for workspace setting.
if( area == kapp->desktop()->geometry())
{
if( stareaL.left() < screenarea.left())
- stareaL = QRect();
+ stareaL = TQRect();
if( stareaR.right() > screenarea.right())
- stareaR = QRect();
+ stareaR = TQRect();
if( stareaT.top() < screenarea.top())
- stareaT = QRect();
+ stareaT = TQRect();
if( stareaB.bottom() < screenarea.bottom())
- stareaB = QRect();
+ stareaB = TQRect();
}
// Handle struts at xinerama edges that are inside the virtual screen.
// They're given in virtual screen coordinates, make them affect only
@@ -897,8 +897,8 @@ bool Client::hasStrut() const
// updates differences to workarea edges for all directions
void Client::updateWorkareaDiffs()
{
- QRect area = workspace()->clientArea( WorkArea, this );
- QRect geom = geometry();
+ TQRect area = workspace()->clientArea( WorkArea, this );
+ TQRect geom = geometry();
workarea_diff_x = computeWorkareaDiff( geom.left(), geom.right(), area.left(), area.right());
workarea_diff_y = computeWorkareaDiff( geom.top(), geom.bottom(), area.top(), area.bottom());
}
@@ -933,14 +933,14 @@ void Client::checkWorkspacePosition()
{
if( isDesktop())
{
- QRect area = workspace()->clientArea( FullArea, this );
+ TQRect area = workspace()->clientArea( FullArea, this );
if( geometry() != area )
setGeometry( area );
return;
}
if( isFullScreen())
{
- QRect area = workspace()->clientArea( FullScreenArea, this );
+ TQRect area = workspace()->clientArea( FullScreenArea, this );
if( geometry() != area )
setGeometry( area );
return;
@@ -951,12 +951,12 @@ void Client::checkWorkspacePosition()
{
if( workspace()->managingTopMenus())
{
- QRect area;
+ TQRect area;
ClientList mainclients = mainClients();
if( mainclients.count() == 1 )
area = workspace()->clientArea( MaximizeFullArea, mainclients.first());
else
- area = workspace()->clientArea( MaximizeFullArea, QPoint( 0, 0 ), desktop());
+ area = workspace()->clientArea( MaximizeFullArea, TQPoint( 0, 0 ), desktop());
area.setHeight( workspace()->topMenuHeight());
// kdDebug() << "TOPMENU size adjust: " << area << ":" << this << endl;
setGeometry( area );
@@ -982,17 +982,17 @@ void Client::checkWorkspacePosition()
if( workspace()->initializing())
return;
- QRect area = workspace()->clientArea( WorkArea, this );
- QRect new_geom = geometry();
- QRect tmp_rect_x( new_geom.left(), 0, new_geom.width(), 0 );
- QRect tmp_area_x( area.left(), 0, area.width(), 0 );
+ TQRect area = workspace()->clientArea( WorkArea, this );
+ TQRect new_geom = geometry();
+ TQRect tmp_rect_x( new_geom.left(), 0, new_geom.width(), 0 );
+ TQRect tmp_area_x( area.left(), 0, area.width(), 0 );
checkDirection( workarea_diff_x, old_diff_x, tmp_rect_x, tmp_area_x );
// the x<->y swapping
- QRect tmp_rect_y( new_geom.top(), 0, new_geom.height(), 0 );
- QRect tmp_area_y( area.top(), 0, area.height(), 0 );
+ TQRect tmp_rect_y( new_geom.top(), 0, new_geom.height(), 0 );
+ TQRect tmp_area_y( area.top(), 0, area.height(), 0 );
checkDirection( workarea_diff_y, old_diff_y, tmp_rect_y, tmp_area_y );
- new_geom = QRect( tmp_rect_x.left(), tmp_rect_y.left(), tmp_rect_x.width(), tmp_rect_y.width());
- QRect final_geom( new_geom.topLeft(), adjustedSize( new_geom.size()));
+ new_geom = TQRect( tmp_rect_x.left(), tmp_rect_y.left(), tmp_rect_x.width(), tmp_rect_y.width());
+ TQRect final_geom( new_geom.topLeft(), adjustedSize( new_geom.size()));
if( final_geom != new_geom ) // size increments, or size restrictions
{ // adjusted size differing matters only for right and bottom edge
if( old_diff_x != INT_MAX && old_diff_x > 0 )
@@ -1016,7 +1016,7 @@ void Client::checkWorkspacePosition()
// again (not fully, as that could(?) be potentionally annoying) by
// moving it slightly inside the workarea (those '+ 5').
// Again, this is done for the x direction, y direction will be done by x<->y swapping
-void Client::checkDirection( int new_diff, int old_diff, QRect& rect, const QRect& area )
+void Client::checkDirection( int new_diff, int old_diff, TQRect& rect, const TQRect& area )
{
if( old_diff != INT_MIN ) // was inside workarea
{
@@ -1068,21 +1068,21 @@ void Client::checkDirection( int new_diff, int old_diff, QRect& rect, const QRec
/*!
Adjust the frame size \a frame according to he window's size hints.
*/
-QSize Client::adjustedSize( const QSize& frame, Sizemode mode ) const
+TQSize Client::adjustedSize( const TQSize& frame, Sizemode mode ) const
{
// first, get the window size for the given frame size s
- QSize wsize( frame.width() - ( border_left + border_right ),
+ TQSize wsize( frame.width() - ( border_left + border_right ),
frame.height() - ( border_top + border_bottom ));
if( wsize.isEmpty())
- wsize = QSize( 1, 1 );
+ wsize = TQSize( 1, 1 );
return sizeForClientSize( wsize, mode, false );
}
// this helper returns proper size even if the window is shaded
// see also the comment in Client::setGeometry()
-QSize Client::adjustedSize() const
+TQSize Client::adjustedSize() const
{
return sizeForClientSize( clientSize());
}
@@ -1095,7 +1095,7 @@ QSize Client::adjustedSize() const
maximum and incremental size changes).
*/
-QSize Client::sizeForClientSize( const QSize& wsize, Sizemode mode, bool noframe ) const
+TQSize Client::sizeForClientSize( const TQSize& wsize, Sizemode mode, bool noframe ) const
{
int w = wsize.width();
int h = wsize.height();
@@ -1109,12 +1109,12 @@ QSize Client::sizeForClientSize( const QSize& wsize, Sizemode mode, bool noframe
// basesize, minsize, maxsize, paspect and resizeinc have all values defined,
// even if they're not set in flags - see getWmNormalHints()
- QSize min_size = minSize();
- QSize max_size = maxSize();
+ TQSize min_size = minSize();
+ TQSize max_size = maxSize();
if( decoration != NULL )
{
- QSize decominsize = decoration->minimumSize();
- QSize border_size( border_left + border_right, border_top + border_bottom );
+ TQSize decominsize = decoration->minimumSize();
+ TQSize border_size( border_left + border_right, border_top + border_bottom );
if( border_size.width() > decominsize.width()) // just in case
decominsize.setWidth( border_size.width());
if( border_size.height() > decominsize.height())
@@ -1268,7 +1268,7 @@ QSize Client::sizeForClientSize( const QSize& wsize, Sizemode mode, bool noframe
w += border_left + border_right;
h += border_top + border_bottom;
}
- return rules()->checkSize( QSize( w, h ));
+ return rules()->checkSize( TQSize( w, h ));
}
/*!
@@ -1329,16 +1329,16 @@ void Client::getWmNormalHints()
xSizeHint.win_gravity = NorthWestGravity;
if( isManaged())
{ // update to match restrictions
- QSize new_size = adjustedSize();
+ TQSize new_size = adjustedSize();
if( new_size != size() && !isFullScreen())
{
- QRect orig_geometry = geometry();
+ TQRect orig_geometry = geometry();
resizeWithChecks( new_size );
if( ( !isSpecialWindow() || isToolbar()) && !isFullScreen())
{
// try to keep the window in its xinerama screen if possible,
// if that fails at least keep it visible somewhere
- QRect area = workspace()->clientArea( MovementArea, this );
+ TQRect area = workspace()->clientArea( MovementArea, this );
if( area.contains( orig_geometry ))
keepInArea( area );
area = workspace()->clientArea( WorkArea, this );
@@ -1350,14 +1350,14 @@ void Client::getWmNormalHints()
updateAllowedActions(); // affects isResizeable()
}
-QSize Client::minSize() const
+TQSize Client::minSize() const
{
- return rules()->checkMinSize( QSize( xSizeHint.min_width, xSizeHint.min_height ));
+ return rules()->checkMinSize( TQSize( xSizeHint.min_width, xSizeHint.min_height ));
}
-QSize Client::maxSize() const
+TQSize Client::maxSize() const
{
- return rules()->checkMaxSize( QSize( xSizeHint.max_width, xSizeHint.max_height ));
+ return rules()->checkMaxSize( TQSize( xSizeHint.max_width, xSizeHint.max_height ));
}
/*!
@@ -1382,7 +1382,7 @@ void Client::sendSyntheticConfigureNotify()
XSendEvent( qt_xdisplay(), c.event, TRUE, StructureNotifyMask, (XEvent*)&c );
}
-const QPoint Client::calculateGravitation( bool invert, int gravity ) const
+const TQPoint Client::calculateGravitation( bool invert, int gravity ) const
{
int dx, dy;
dx = dy = 0;
@@ -1444,9 +1444,9 @@ const QPoint Client::calculateGravitation( bool invert, int gravity ) const
dy = - ( border_top + border_bottom ) / 2;
}
if( !invert )
- return QPoint( x() + dx, y() + dy );
+ return TQPoint( x() + dx, y() + dy );
else
- return QPoint( x() - dx, y() - dy );
+ return TQPoint( x() - dx, y() - dy );
}
void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, int gravity, bool from_tool )
@@ -1455,7 +1455,7 @@ void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, i
gravity = xSizeHint.win_gravity;
if( value_mask & ( CWX | CWY ))
{
- QPoint new_pos = calculateGravitation( true, gravity ); // undo gravitation
+ TQPoint new_pos = calculateGravitation( true, gravity ); // undo gravitation
if ( value_mask & CWX )
new_pos.setX( rx );
if ( value_mask & CWY )
@@ -1478,20 +1478,20 @@ void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, i
nw = rw;
if ( value_mask & CWHeight )
nh = rh;
- QSize ns = sizeForClientSize( QSize( nw, nh ) );
+ TQSize ns = sizeForClientSize( TQSize( nw, nh ) );
new_pos = rules()->checkPosition( new_pos );
// TODO what to do with maximized windows?
if ( maximizeMode() != MaximizeFull
|| ns != size())
{
- QRect orig_geometry = geometry();
+ TQRect orig_geometry = geometry();
GeometryUpdatesPostponer blocker( this );
move( new_pos );
plainResize( ns );
- setGeometry( QRect( calculateGravitation( false, gravity ), size()));
- updateFullScreenHack( QRect( new_pos, QSize( nw, nh )));
- QRect area = workspace()->clientArea( WorkArea, this );
+ setGeometry( TQRect( calculateGravitation( false, gravity ), size()));
+ updateFullScreenHack( TQRect( new_pos, TQSize( nw, nh )));
+ TQRect area = workspace()->clientArea( WorkArea, this );
if( !from_tool && ( !isSpecialWindow() || isToolbar()) && !isFullScreen()
&& area.contains( orig_geometry ))
keepInArea( area );
@@ -1514,22 +1514,22 @@ void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, i
nw = rw;
if ( value_mask & CWHeight )
nh = rh;
- QSize ns = sizeForClientSize( QSize( nw, nh ) );
+ TQSize ns = sizeForClientSize( TQSize( nw, nh ) );
if( ns != size()) // don't restore if some app sets its own size again
{
- QRect orig_geometry = geometry();
+ TQRect orig_geometry = geometry();
GeometryUpdatesPostponer blocker( this );
int save_gravity = xSizeHint.win_gravity;
xSizeHint.win_gravity = gravity;
resizeWithChecks( ns );
xSizeHint.win_gravity = save_gravity;
- updateFullScreenHack( QRect( calculateGravitation( true, xSizeHint.win_gravity ), QSize( nw, nh )));
+ updateFullScreenHack( TQRect( calculateGravitation( true, xSizeHint.win_gravity ), TQSize( nw, nh )));
if( !from_tool && ( !isSpecialWindow() || isToolbar()) && !isFullScreen())
{
// try to keep the window in its xinerama screen if possible,
// if that fails at least keep it visible somewhere
- QRect area = workspace()->clientArea( MovementArea, this );
+ TQRect area = workspace()->clientArea( MovementArea, this );
if( area.contains( orig_geometry ))
keepInArea( area );
area = workspace()->clientArea( WorkArea, this );
@@ -1557,13 +1557,13 @@ void Client::resizeWithChecks( int w, int h, ForceGeometry_t force )
}
int newx = x();
int newy = y();
- QRect area = workspace()->clientArea( WorkArea, this );
+ TQRect area = workspace()->clientArea( WorkArea, this );
// don't allow growing larger than workarea
if( w > area.width())
w = area.width();
if( h > area.height())
h = area.height();
- QSize tmp = adjustedSize( QSize( w, h )); // checks size constraints, including min/max size
+ TQSize tmp = adjustedSize( TQSize( w, h )); // checks size constraints, including min/max size
w = tmp.width();
h = tmp.height();
switch( xSizeHint.win_gravity )
@@ -1668,11 +1668,11 @@ bool Client::isResizable() const
return false;
if( maximizeMode() == MaximizeFull && !options->moveResizeMaximizedWindows() )
return false;
- if( rules()->checkSize( QSize()).isValid()) // forced size
+ if( rules()->checkSize( TQSize()).isValid()) // forced size
return false;
- QSize min = minSize();
- QSize max = maxSize();
+ TQSize min = minSize();
+ TQSize max = maxSize();
return min.width() < max.width() || min.height() < max.height();
}
@@ -1689,14 +1689,14 @@ bool Client::isMaximizable() const
}
if ( maximizeMode() != MaximizeRestore )
return TRUE;
- QSize max = maxSize();
+ TQSize max = maxSize();
#if 0
if( max.width() < 32767 || max.height() < 32767 ) // sizes are 16bit with X
return false;
#else
// apparently there are enough apps which specify some arbitrary value
// for their maximum size just for the fun of it
- QSize areasize = workspace()->clientArea( MaximizeArea, this ).size();
+ TQSize areasize = workspace()->clientArea( MaximizeArea, this ).size();
if( max.width() < areasize.width() || max.height() < areasize.height())
return false;
#endif
@@ -1731,29 +1731,29 @@ void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force )
}
else
{
- client_size = QSize( w - border_left - border_right, h - border_top - border_bottom );
+ client_size = TQSize( w - border_left - border_right, h - border_top - border_bottom );
h = border_top + border_bottom;
}
}
else
{
- client_size = QSize( w - border_left - border_right, h - border_top - border_bottom );
+ client_size = TQSize( w - border_left - border_right, h - border_top - border_bottom );
}
- if( force == NormalGeometrySet && frame_geometry == QRect( x, y, w, h ))
+ if( force == NormalGeometrySet && frame_geometry == TQRect( x, y, w, h ))
return;
- frame_geometry = QRect( x, y, w, h );
+ frame_geometry = TQRect( x, y, w, h );
updateWorkareaDiffs();
if( postpone_geometry_updates != 0 )
{
pending_geometry_update = true;
return;
}
- resizeDecoration( QSize( w, h ));
+ resizeDecoration( TQSize( w, h ));
XMoveResizeWindow( qt_xdisplay(), frameId(), x, y, w, h );
-// resizeDecoration( QSize( w, h ));
+// resizeDecoration( TQSize( w, h ));
if( !isShade())
{
- QSize cs = clientSize();
+ TQSize cs = clientSize();
XMoveResizeWindow( qt_xdisplay(), wrapperId(), clientPos().x(), clientPos().y(),
cs.width(), cs.height());
XMoveResizeWindow( qt_xdisplay(), window(), 0, 0, cs.width(), cs.height());
@@ -1781,34 +1781,34 @@ void Client::plainResize( int w, int h, ForceGeometry_t force )
}
else
{
- client_size = QSize( w - border_left - border_right, h - border_top - border_bottom );
+ client_size = TQSize( w - border_left - border_right, h - border_top - border_bottom );
h = border_top + border_bottom;
}
}
else
{
- client_size = QSize( w - border_left - border_right, h - border_top - border_bottom );
+ client_size = TQSize( w - border_left - border_right, h - border_top - border_bottom );
}
- if( QSize( w, h ) != rules()->checkSize( QSize( w, h )))
+ if( TQSize( w, h ) != rules()->checkSize( TQSize( w, h )))
{
- kdDebug() << "forced size fail:" << QSize( w,h ) << ":" << rules()->checkSize( QSize( w, h )) << endl;
+ kdDebug() << "forced size fail:" << TQSize( w,h ) << ":" << rules()->checkSize( TQSize( w, h )) << endl;
kdDebug() << kdBacktrace() << endl;
}
- if( force == NormalGeometrySet && frame_geometry.size() == QSize( w, h ))
+ if( force == NormalGeometrySet && frame_geometry.size() == TQSize( w, h ))
return;
- frame_geometry.setSize( QSize( w, h ));
+ frame_geometry.setSize( TQSize( w, h ));
updateWorkareaDiffs();
if( postpone_geometry_updates != 0 )
{
pending_geometry_update = true;
return;
}
- resizeDecoration( QSize( w, h ));
+ resizeDecoration( TQSize( w, h ));
XResizeWindow( qt_xdisplay(), frameId(), w, h );
-// resizeDecoration( QSize( w, h ));
+// resizeDecoration( TQSize( w, h ));
if( !isShade())
{
- QSize cs = clientSize();
+ TQSize cs = clientSize();
XMoveResizeWindow( qt_xdisplay(), wrapperId(), clientPos().x(), clientPos().y(),
cs.width(), cs.height());
XMoveResizeWindow( qt_xdisplay(), window(), 0, 0, cs.width(), cs.height());
@@ -1826,9 +1826,9 @@ void Client::plainResize( int w, int h, ForceGeometry_t force )
*/
void Client::move( int x, int y, ForceGeometry_t force )
{
- if( force == NormalGeometrySet && frame_geometry.topLeft() == QPoint( x, y ))
+ if( force == NormalGeometrySet && frame_geometry.topLeft() == TQPoint( x, y ))
return;
- frame_geometry.moveTopLeft( QPoint( x, y ));
+ frame_geometry.moveTopLeft( TQPoint( x, y ));
updateWorkareaDiffs();
if( postpone_geometry_updates != 0 )
{
@@ -1858,7 +1858,7 @@ void Client::postponeGeometryUpdates( bool postpone )
if( pending_geometry_update )
{
if( isShade())
- setGeometry( QRect( pos(), adjustedSize()), ForceGeometrySet );
+ setGeometry( TQRect( pos(), adjustedSize()), ForceGeometrySet );
else
setGeometry( geometry(), ForceGeometrySet );
pending_geometry_update = false;
@@ -1908,7 +1908,7 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
Q_ASSERT( !( vertical && horizontal )
|| ((( max_mode & MaximizeVertical ) != 0 ) == (( max_mode & MaximizeHorizontal ) != 0 )));
- QRect clientArea = workspace()->clientArea( MaximizeArea, this );
+ TQRect clientArea = workspace()->clientArea( MaximizeArea, this );
// save sizes for restoring, if maximalizing
if( !adjust && !( y() == clientArea.top() && height() == clientArea.height()))
@@ -1958,16 +1958,16 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
{
if( geom_restore.width() == 0 )
{ // needs placement
- plainResize( adjustedSize(QSize(width(), clientArea.height()), SizemodeFixedH ));
+ plainResize( adjustedSize(TQSize(width(), clientArea.height()), SizemodeFixedH ));
workspace()->placeSmart( this, clientArea );
}
else
- setGeometry( QRect(QPoint( geom_restore.x(), clientArea.top()),
- adjustedSize(QSize( geom_restore.width(), clientArea.height()), SizemodeFixedH )), ForceGeometrySet);
+ setGeometry( TQRect(TQPoint( geom_restore.x(), clientArea.top()),
+ adjustedSize(TQSize( geom_restore.width(), clientArea.height()), SizemodeFixedH )), ForceGeometrySet);
}
else
- setGeometry( QRect(QPoint(x(), clientArea.top()),
- adjustedSize(QSize(width(), clientArea.height()), SizemodeFixedH )), ForceGeometrySet);
+ setGeometry( TQRect(TQPoint(x(), clientArea.top()),
+ adjustedSize(TQSize(width(), clientArea.height()), SizemodeFixedH )), ForceGeometrySet);
info->setState( NET::MaxVert, NET::Max );
break;
}
@@ -1978,23 +1978,23 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
{
if( geom_restore.height() == 0 )
{ // needs placement
- plainResize( adjustedSize(QSize(clientArea.width(), height()), SizemodeFixedW ));
+ plainResize( adjustedSize(TQSize(clientArea.width(), height()), SizemodeFixedW ));
workspace()->placeSmart( this, clientArea );
}
else
- setGeometry( QRect( QPoint(clientArea.left(), geom_restore.y()),
- adjustedSize(QSize(clientArea.width(), geom_restore.height()), SizemodeFixedW )), ForceGeometrySet);
+ setGeometry( TQRect( TQPoint(clientArea.left(), geom_restore.y()),
+ adjustedSize(TQSize(clientArea.width(), geom_restore.height()), SizemodeFixedW )), ForceGeometrySet);
}
else
- setGeometry( QRect( QPoint(clientArea.left(), y()),
- adjustedSize(QSize(clientArea.width(), height()), SizemodeFixedW )), ForceGeometrySet);
+ setGeometry( TQRect( TQPoint(clientArea.left(), y()),
+ adjustedSize(TQSize(clientArea.width(), height()), SizemodeFixedW )), ForceGeometrySet);
info->setState( NET::MaxHoriz, NET::Max );
break;
}
case MaximizeRestore:
{
- QRect restore = geometry();
+ TQRect restore = geometry();
// when only partially maximized, geom_restore may not have the other dimension remembered
if( old_mode & MaximizeVertical )
{
@@ -2008,7 +2008,7 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
}
if( !restore.isValid())
{
- QSize s = QSize( clientArea.width()*2/3, clientArea.height()*2/3 );
+ TQSize s = TQSize( clientArea.width()*2/3, clientArea.height()*2/3 );
if( geom_restore.width() > 0 )
s.setWidth( geom_restore.width());
if( geom_restore.height() > 0 )
@@ -2035,8 +2035,8 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
if( old_mode & MaximizeHorizontal )
maxmode_restore = MaximizeHorizontal;
}
- QSize adjSize = adjustedSize(clientArea.size(), SizemodeMax );
- QRect r = QRect(clientArea.topLeft(), adjSize);
+ TQSize adjSize = adjustedSize(clientArea.size(), SizemodeMax );
+ TQRect r = TQRect(clientArea.topLeft(), adjSize);
setGeometry( r, ForceGeometrySet );
info->setState( NET::Max, NET::Max );
break;
@@ -2062,7 +2062,7 @@ void Client::resetMaximize()
if( decoration != NULL )
decoration->borders( border_left, border_right, border_top, border_bottom );
if( isShade())
- setGeometry( QRect( pos(), sizeForClientSize( clientSize())), ForceGeometrySet );
+ setGeometry( TQRect( pos(), sizeForClientSize( clientSize())), ForceGeometrySet );
else
setGeometry( geometry(), ForceGeometrySet );
if( decoration != NULL )
@@ -2086,7 +2086,7 @@ void Client::checkMaximizeGeometry()
return;
}
++recursion_protection;
- QRect max_area = workspace()->clientArea( MaximizeArea, this );
+ TQRect max_area = workspace()->clientArea( MaximizeArea, this );
if( geometry() == max_area )
{
if( max_mode != MaximizeFull )
@@ -2118,7 +2118,7 @@ bool Client::isFullScreenable( bool fullscreen_hack ) const
if( rules()->checkStrictGeometry( false ))
{
// the app wouldn't fit exactly fullscreen geometry due its strict geometry requirements
- QRect fsarea = workspace()->clientArea( FullScreenArea, this );
+ TQRect fsarea = workspace()->clientArea( FullScreenArea, this );
if( sizeForClientSize( fsarea.size(), SizemodeAny, true ) != fsarea.size())
return false;
}
@@ -2163,7 +2163,7 @@ void Client::setFullScreen( bool set, bool user )
else
{
if( !geom_fs_restore.isNull())
- setGeometry( QRect( geom_fs_restore.topLeft(), adjustedSize( geom_fs_restore.size())));
+ setGeometry( TQRect( geom_fs_restore.topLeft(), adjustedSize( geom_fs_restore.size())));
// TODO isShaded() ?
else
{ // does this ever happen?
@@ -2173,7 +2173,7 @@ void Client::setFullScreen( bool set, bool user )
updateWindowRules();
}
-int Client::checkFullScreenHack( const QRect& geom ) const
+int Client::checkFullScreenHack( const TQRect& geom ) const
{
// if it's noborder window, and has size of one screen or the whole desktop geometry, it's fullscreen hack
if( noBorder() && !isUserNoBorder() && isFullScreenable( true ))
@@ -2186,14 +2186,14 @@ int Client::checkFullScreenHack( const QRect& geom ) const
return 0;
}
-void Client::updateFullScreenHack( const QRect& geom )
+void Client::updateFullScreenHack( const TQRect& geom )
{
int type = checkFullScreenHack( geom );
if( fullscreen_mode == FullScreenNone && type != 0 )
{
fullscreen_mode = FullScreenHack;
updateDecoration( false, false );
- QRect geom;
+ TQRect geom;
if( rules()->checkStrictGeometry( false ))
{
geom = type == 2 // 1 - it's xinerama-aware fullscreen hack, 2 - it's full area
@@ -2214,13 +2214,13 @@ void Client::updateFullScreenHack( const QRect& geom )
workspace()->updateClientLayer( this ); // active fullscreens get different layer
}
-static QRect* visible_bound = 0;
+static TQRect* visible_bound = 0;
static GeometryTip* geometryTip = 0;
-void Client::drawbound( const QRect& geom )
+void Client::drawbound( const TQRect& geom )
{
assert( visible_bound == NULL );
- visible_bound = new QRect( geom );
+ visible_bound = new TQRect( geom );
doDrawbound( *visible_bound, false );
}
@@ -2233,16 +2233,16 @@ void Client::clearbound()
visible_bound = 0;
}
-void Client::doDrawbound( const QRect& geom, bool clear )
+void Client::doDrawbound( const TQRect& geom, bool clear )
{
if( decoration != NULL && decoration->drawbound( geom, clear ))
return; // done by decoration
- QPainter p ( workspace()->desktopWidget() );
- p.setPen( QPen( Qt::white, 5 ) );
+ TQPainter p ( workspace()->desktopWidget() );
+ p.setPen( TQPen( Qt::white, 5 ) );
p.setRasterOp( Qt::XorROP );
// the line is 5 pixel thick, so compensate for the extra two pixels
// on outside (#88657)
- QRect g = geom;
+ TQRect g = geom;
if( g.width() > 5 )
{
g.setLeft( g.left() + 2 );
@@ -2268,7 +2268,7 @@ void Client::positionGeometryTip()
|| ( isResize() && rules()->checkMoveResizeMode( options->resizeMode ) != Options::Opaque );
geometryTip = new GeometryTip( &xSizeHint, save_under );
}
- QRect wgeom( moveResizeGeom ); // position of the frame, size of the window itself
+ TQRect wgeom( moveResizeGeom ); // position of the frame, size of the window itself
wgeom.setWidth( wgeom.width() - ( width() - clientSize().width()));
wgeom.setHeight( wgeom.height() - ( height() - clientSize().height()));
if( isShade())
@@ -2286,8 +2286,8 @@ class EatAllPaintEvents
: public QObject
{
protected:
- virtual bool eventFilter( QObject* o, QEvent* e )
- { return e->type() == QEvent::Paint && o != geometryTip; }
+ virtual bool eventFilter( TQObject* o, TQEvent* e )
+ { return e->type() == TQEvent::Paint && o != geometryTip; }
};
static EatAllPaintEvents* eater = 0;
@@ -2295,16 +2295,16 @@ static EatAllPaintEvents* eater = 0;
bool Client::startMoveResize()
{
assert( !moveResizeMode );
- assert( QWidget::keyboardGrabber() == NULL );
- assert( QWidget::mouseGrabber() == NULL );
- if( QApplication::activePopupWidget() != NULL )
+ assert( TQWidget::keyboardGrabber() == NULL );
+ assert( TQWidget::mouseGrabber() == NULL );
+ if( TQApplication::activePopupWidget() != NULL )
return false; // popups have grab
bool has_grab = false;
// This reportedly improves smoothness of the moveresize operation,
// something with Enter/LeaveNotify events, looks like XFree performance problem or something *shrug*
// (http://lists.kde.org/?t=107302193400001&r=1&w=2)
XSetWindowAttributes attrs;
- QRect r = workspace()->clientArea( FullArea, this );
+ TQRect r = workspace()->clientArea( FullArea, this );
move_resize_grab_window = XCreateWindow( qt_xdisplay(), workspace()->rootWin(), r.x(), r.y(),
r.width(), r.height(), 0, CopyFromParent, InputOnly, CopyFromParent, 0, &attrs );
XMapRaised( qt_xdisplay(), move_resize_grab_window );
@@ -2400,7 +2400,7 @@ void Client::checkUnrestrictedMoveResize()
{
if( unrestrictedMoveResize )
return;
- QRect desktopArea = workspace()->clientArea( WorkArea, moveResizeGeom.center(), desktop());
+ TQRect desktopArea = workspace()->clientArea( WorkArea, moveResizeGeom.center(), desktop());
int left_marge, right_marge, top_marge, bottom_marge, titlebar_marge;
// restricted move/resize - keep at least part of the titlebar always visible
// how much must remain visible when moved away in that direction
@@ -2445,7 +2445,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
if ( !moveResizeMode )
{
- QPoint p( QPoint( x, y ) - moveOffset );
+ TQPoint p( TQPoint( x, y ) - moveOffset );
if (p.manhattanLength() >= 6)
{
if( !startMoveResize())
@@ -2463,18 +2463,18 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
if ( mode != PositionCenter && shade_mode != ShadeNone )
setShade( ShadeNone );
- QPoint globalPos( x_root, y_root );
+ TQPoint globalPos( x_root, y_root );
// these two points limit the geometry rectangle, i.e. if bottomleft resizing is done,
// the bottomleft corner should be at is at (topleft.x(), bottomright().y())
- QPoint topleft = globalPos - moveOffset;
- QPoint bottomright = globalPos + invertedMoveOffset;
- QRect previousMoveResizeGeom = moveResizeGeom;
+ TQPoint topleft = globalPos - moveOffset;
+ TQPoint bottomright = globalPos + invertedMoveOffset;
+ TQRect previousMoveResizeGeom = moveResizeGeom;
// TODO move whole group when moving its leader or when the leader is not mapped?
// compute bounds
// NOTE: This is duped in checkUnrestrictedMoveResize().
- QRect desktopArea = workspace()->clientArea( WorkArea, globalPos, desktop());
+ TQRect desktopArea = workspace()->clientArea( WorkArea, globalPos, desktop());
int left_marge, right_marge, top_marge, bottom_marge, titlebar_marge;
if( unrestrictedMoveResize ) // unrestricted, just don't let it go out completely
left_marge = right_marge = top_marge = bottom_marge = titlebar_marge = 5;
@@ -2493,36 +2493,36 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
if( isResize())
{
// first resize (without checking constrains), then snap, then check bounds, then check constrains
- QRect orig = initialMoveResizeGeom;
+ TQRect orig = initialMoveResizeGeom;
Sizemode sizemode = SizemodeAny;
switch ( mode )
{
case PositionTopLeft:
- moveResizeGeom = QRect( topleft, orig.bottomRight() ) ;
+ moveResizeGeom = TQRect( topleft, orig.bottomRight() ) ;
break;
case PositionBottomRight:
- moveResizeGeom = QRect( orig.topLeft(), bottomright ) ;
+ moveResizeGeom = TQRect( orig.topLeft(), bottomright ) ;
break;
case PositionBottomLeft:
- moveResizeGeom = QRect( QPoint( topleft.x(), orig.y() ), QPoint( orig.right(), bottomright.y()) ) ;
+ moveResizeGeom = TQRect( TQPoint( topleft.x(), orig.y() ), TQPoint( orig.right(), bottomright.y()) ) ;
break;
case PositionTopRight:
- moveResizeGeom = QRect( QPoint( orig.x(), topleft.y() ), QPoint( bottomright.x(), orig.bottom()) ) ;
+ moveResizeGeom = TQRect( TQPoint( orig.x(), topleft.y() ), TQPoint( bottomright.x(), orig.bottom()) ) ;
break;
case PositionTop:
- moveResizeGeom = QRect( QPoint( orig.left(), topleft.y() ), orig.bottomRight() ) ;
+ moveResizeGeom = TQRect( TQPoint( orig.left(), topleft.y() ), orig.bottomRight() ) ;
sizemode = SizemodeFixedH; // try not to affect height
break;
case PositionBottom:
- moveResizeGeom = QRect( orig.topLeft(), QPoint( orig.right(), bottomright.y() ) ) ;
+ moveResizeGeom = TQRect( orig.topLeft(), TQPoint( orig.right(), bottomright.y() ) ) ;
sizemode = SizemodeFixedH;
break;
case PositionLeft:
- moveResizeGeom = QRect( QPoint( topleft.x(), orig.top() ), orig.bottomRight() ) ;
+ moveResizeGeom = TQRect( TQPoint( topleft.x(), orig.top() ), orig.bottomRight() ) ;
sizemode = SizemodeFixedW;
break;
case PositionRight:
- moveResizeGeom = QRect( orig.topLeft(), QPoint( bottomright.x(), orig.bottom() ) ) ;
+ moveResizeGeom = TQRect( orig.topLeft(), TQPoint( bottomright.x(), orig.bottom() ) ) ;
sizemode = SizemodeFixedW;
break;
case PositionCenter:
@@ -2546,39 +2546,39 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
if( !unrestrictedMoveResize && moveResizeGeom.top() < desktopArea.top() ) // titlebar mustn't go out
moveResizeGeom.setTop( desktopArea.top());
- QSize size = adjustedSize( moveResizeGeom.size(), sizemode );
+ TQSize size = adjustedSize( moveResizeGeom.size(), sizemode );
// the new topleft and bottomright corners (after checking size constrains), if they'll be needed
- topleft = QPoint( moveResizeGeom.right() - size.width() + 1, moveResizeGeom.bottom() - size.height() + 1 );
- bottomright = QPoint( moveResizeGeom.left() + size.width() - 1, moveResizeGeom.top() + size.height() - 1 );
+ topleft = TQPoint( moveResizeGeom.right() - size.width() + 1, moveResizeGeom.bottom() - size.height() + 1 );
+ bottomright = TQPoint( moveResizeGeom.left() + size.width() - 1, moveResizeGeom.top() + size.height() - 1 );
orig = moveResizeGeom;
switch ( mode )
{ // these 4 corners ones are copied from above
case PositionTopLeft:
- moveResizeGeom = QRect( topleft, orig.bottomRight() ) ;
+ moveResizeGeom = TQRect( topleft, orig.bottomRight() ) ;
break;
case PositionBottomRight:
- moveResizeGeom = QRect( orig.topLeft(), bottomright ) ;
+ moveResizeGeom = TQRect( orig.topLeft(), bottomright ) ;
break;
case PositionBottomLeft:
- moveResizeGeom = QRect( QPoint( topleft.x(), orig.y() ), QPoint( orig.right(), bottomright.y()) ) ;
+ moveResizeGeom = TQRect( TQPoint( topleft.x(), orig.y() ), TQPoint( orig.right(), bottomright.y()) ) ;
break;
case PositionTopRight:
- moveResizeGeom = QRect( QPoint( orig.x(), topleft.y() ), QPoint( bottomright.x(), orig.bottom()) ) ;
+ moveResizeGeom = TQRect( TQPoint( orig.x(), topleft.y() ), TQPoint( bottomright.x(), orig.bottom()) ) ;
break;
// The side ones can't be copied exactly - if aspect ratios are specified, both dimensions may change.
// Therefore grow to the right/bottom if needed.
// TODO it should probably obey gravity rather than always using right/bottom ?
case PositionTop:
- moveResizeGeom = QRect( QPoint( orig.left(), topleft.y() ), QPoint( bottomright.x(), orig.bottom()) ) ;
+ moveResizeGeom = TQRect( TQPoint( orig.left(), topleft.y() ), TQPoint( bottomright.x(), orig.bottom()) ) ;
break;
case PositionBottom:
- moveResizeGeom = QRect( orig.topLeft(), QPoint( bottomright.x(), bottomright.y() ) ) ;
+ moveResizeGeom = TQRect( orig.topLeft(), TQPoint( bottomright.x(), bottomright.y() ) ) ;
break;
case PositionLeft:
- moveResizeGeom = QRect( QPoint( topleft.x(), orig.top() ), QPoint( orig.right(), bottomright.y()));
+ moveResizeGeom = TQRect( TQPoint( topleft.x(), orig.top() ), TQPoint( orig.right(), bottomright.y()));
break;
case PositionRight:
- moveResizeGeom = QRect( orig.topLeft(), QPoint( bottomright.x(), bottomright.y() ) ) ;
+ moveResizeGeom = TQRect( orig.topLeft(), TQPoint( bottomright.x(), bottomright.y() ) ) ;
break;
case PositionCenter:
default:
diff --git a/kwin/geometrytip.cpp b/kwin/geometrytip.cpp
index c8a046950..8577abfbc 100644
--- a/kwin/geometrytip.cpp
+++ b/kwin/geometrytip.cpp
@@ -14,12 +14,12 @@ namespace KWinInternal
{
GeometryTip::GeometryTip( const XSizeHints* xSizeHints, bool save_under ):
- QLabel(NULL, "kwingeometry" )
+ TQLabel(NULL, "kwingeometry" )
{
setMargin(1);
setIndent(0);
setLineWidth(1);
- setFrameStyle( QFrame::Raised | QFrame::StyledPanel );
+ setFrameStyle( TQFrame::Raised | TQFrame::StyledPanel );
setAlignment( AlignCenter | AlignTop );
sizeHints = xSizeHints;
if( save_under )
@@ -34,7 +34,7 @@ GeometryTip::~GeometryTip()
{
}
-void GeometryTip::setGeometry( const QRect& geom )
+void GeometryTip::setGeometry( const TQRect& geom )
{
int w = geom.width();
int h = geom.height();
@@ -49,7 +49,7 @@ void GeometryTip::setGeometry( const QRect& geom )
}
h = QMAX( h, 0 ); // in case of isShade() and PBaseSize
- QString pos;
+ TQString pos;
pos.sprintf( "%+d,%+d<br>(<b>%d&nbsp;x&nbsp;%d</b>)",
geom.x(), geom.y(), w, h );
setText( pos );
diff --git a/kwin/geometrytip.h b/kwin/geometrytip.h
index 6fdd2599d..6dac49f2f 100644
--- a/kwin/geometrytip.h
+++ b/kwin/geometrytip.h
@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
#ifndef KWIN_GEOMETRY_TIP_H
#define KWIN_GEOMETRY_TIP_H
-#include <qlabel.h>
+#include <tqlabel.h>
#include "client.h"
namespace KWinInternal
@@ -23,7 +23,7 @@ class GeometryTip: public QLabel
public:
GeometryTip( const XSizeHints* xSizeHints, bool save_under );
~GeometryTip();
- void setGeometry( const QRect& geom );
+ void setGeometry( const TQRect& geom );
private:
const XSizeHints* sizeHints;
diff --git a/kwin/group.cpp b/kwin/group.cpp
index 405e32927..0d543dc4a 100644
--- a/kwin/group.cpp
+++ b/kwin/group.cpp
@@ -141,11 +141,11 @@ bool performTransiencyCheck()
return ret;
}
-static QString transiencyCheckStartBt;
+static TQString transiencyCheckStartBt;
static const Client* transiencyCheckClient;
static int transiencyCheck = 0;
-static void startTransiencyCheck( const QString& bt, const Client* c, bool ne )
+static void startTransiencyCheck( const TQString& bt, const Client* c, bool ne )
{
if( ++transiencyCheck == 1 )
{
@@ -171,7 +171,7 @@ static void checkTransiency()
class TransiencyChecker
{
public:
- TransiencyChecker( const QString& bt, const Client*c ) { startTransiencyCheck( bt, c, false ); }
+ TransiencyChecker( const TQString& bt, const Client*c ) { startTransiencyCheck( bt, c, false ); }
~TransiencyChecker() { checkTransiency(); }
};
@@ -220,30 +220,30 @@ Group::~Group()
delete leader_info;
}
-QPixmap Group::icon() const
+TQPixmap Group::icon() const
{
if( leader_client != NULL )
return leader_client->icon();
else if( leader_wid != None )
{
- QPixmap ic;
+ TQPixmap ic;
Client::readIcons( leader_wid, &ic, NULL );
return ic;
}
- return QPixmap();
+ return TQPixmap();
}
-QPixmap Group::miniIcon() const
+TQPixmap Group::miniIcon() const
{
if( leader_client != NULL )
return leader_client->miniIcon();
else if( leader_wid != None )
{
- QPixmap ic;
+ TQPixmap ic;
Client::readIcons( leader_wid, NULL, &ic );
return ic;
}
- return QPixmap();
+ return TQPixmap();
}
void Group::addMember( Client* member_P )
diff --git a/kwin/group.h b/kwin/group.h
index 21ebb8d17..081239291 100644
--- a/kwin/group.h
+++ b/kwin/group.h
@@ -31,8 +31,8 @@ class Group
const Client* leaderClient() const;
Client* leaderClient();
const ClientList& members() const;
- QPixmap icon() const;
- QPixmap miniIcon() const;
+ TQPixmap icon() const;
+ TQPixmap miniIcon() const;
void addMember( Client* member );
void removeMember( Client* member );
void gotLeader( Client* leader );
diff --git a/kwin/kcmkwin/kwindecoration/buttons.cpp b/kwin/kcmkwin/kwindecoration/buttons.cpp
index 888e092e7..5d1d96d85 100644
--- a/kwin/kcmkwin/kwindecoration/buttons.cpp
+++ b/kwin/kcmkwin/kwindecoration/buttons.cpp
@@ -28,11 +28,11 @@
*/
-#include <qheader.h>
-#include <qpainter.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qstyle.h>
+#include <tqheader.h>
+#include <tqpainter.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqstyle.h>
#include <kdebug.h>
@@ -47,11 +47,11 @@
#define BUTTONDRAGMIMETYPE "application/x-kde_kwindecoration_buttons"
-ButtonDrag::ButtonDrag( Button btn, QWidget* parent, const char* name)
- : QStoredDrag( BUTTONDRAGMIMETYPE, parent, name)
+ButtonDrag::ButtonDrag( Button btn, TQWidget* parent, const char* name)
+ : TQStoredDrag( BUTTONDRAGMIMETYPE, parent, name)
{
- QByteArray data;
- QDataStream stream(data, IO_WriteOnly);
+ TQByteArray data;
+ TQDataStream stream(data, IO_WriteOnly);
stream << btn.name;
stream << btn.icon;
stream << btn.type.unicode();
@@ -61,23 +61,23 @@ ButtonDrag::ButtonDrag( Button btn, QWidget* parent, const char* name)
}
-bool ButtonDrag::canDecode( QDropEvent* e )
+bool ButtonDrag::canDecode( TQDropEvent* e )
{
return e->provides( BUTTONDRAGMIMETYPE );
}
-bool ButtonDrag::decode( QDropEvent* e, Button& btn )
+bool ButtonDrag::decode( TQDropEvent* e, Button& btn )
{
- QByteArray data = e->data( BUTTONDRAGMIMETYPE );
+ TQByteArray data = e->data( BUTTONDRAGMIMETYPE );
if ( data.size() )
{
e->accept();
- QDataStream stream(data, IO_ReadOnly);
+ TQDataStream stream(data, IO_ReadOnly);
stream >> btn.name;
stream >> btn.icon;
ushort type;
stream >> type;
- btn.type = QChar(type);
+ btn.type = TQChar(type);
int duplicate;
stream >> duplicate;
btn.duplicate = duplicate;
@@ -94,7 +94,7 @@ Button::Button()
{
}
-Button::Button(const QString& n, const QBitmap& i, QChar t, bool d, bool s)
+Button::Button(const TQString& n, const TQBitmap& i, TQChar t, bool d, bool s)
: name(n),
icon(i),
type(t),
@@ -108,11 +108,11 @@ Button::~Button()
}
// helper function to deal with the Button's bitmaps more easily...
-QPixmap bitmapPixmap(const QBitmap& bm, const QColor& color)
+TQPixmap bitmapPixmap(const TQBitmap& bm, const TQColor& color)
{
- QPixmap pm(bm.size() );
+ TQPixmap pm(bm.size() );
pm.setMask(bm);
- QPainter p(&pm);
+ TQPainter p(&pm);
p.setPen(color);
p.drawPixmap(0,0,bm);
p.end();
@@ -120,12 +120,12 @@ QPixmap bitmapPixmap(const QBitmap& bm, const QColor& color)
}
-ButtonSource::ButtonSource(QWidget *parent, const char* name)
+ButtonSource::ButtonSource(TQWidget *parent, const char* name)
: KListView(parent, name)
{
- setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
- setResizeMode(QListView::AllColumns);
+ setResizeMode(TQListView::AllColumns);
setDragEnabled(true);
setAcceptDrops(true);
setDropVisualizer(false);
@@ -140,20 +140,20 @@ ButtonSource::~ButtonSource()
{
}
-QSize ButtonSource::sizeHint() const
+TQSize ButtonSource::sizeHint() const
{
- // make the sizeHint height a bit smaller than the one of QListView...
+ // make the sizeHint height a bit smaller than the one of TQListView...
if ( cachedSizeHint().isValid() )
return cachedSizeHint();
constPolish();
- QSize s( header()->sizeHint() );
+ TQSize s( header()->sizeHint() );
if ( verticalScrollBar()->isVisible() )
- s.setWidth( s.width() + style().pixelMetric(QStyle::PM_ScrollBarExtent) );
- s += QSize(frameWidth()*2,frameWidth()*2);
+ s.setWidth( s.width() + style().pixelMetric(TQStyle::PM_ScrollBarExtent) );
+ s += TQSize(frameWidth()*2,frameWidth()*2);
// size hint: 4 lines of text...
s.setHeight( s.height() + fontMetrics().lineSpacing()*3 );
@@ -165,7 +165,7 @@ QSize ButtonSource::sizeHint() const
void ButtonSource::hideAllButtons()
{
- QListViewItemIterator it(this);
+ TQListViewItemIterator it(this);
while (it.current() ) {
it.current()->setVisible(false);
++it;
@@ -174,16 +174,16 @@ void ButtonSource::hideAllButtons()
void ButtonSource::showAllButtons()
{
- QListViewItemIterator it(this);
+ TQListViewItemIterator it(this);
while (it.current() ) {
it.current()->setVisible(true);
++it;
}
}
-void ButtonSource::showButton( QChar btn )
+void ButtonSource::showButton( TQChar btn )
{
- QListViewItemIterator it(this);
+ TQListViewItemIterator it(this);
while (it.current() ) {
ButtonSourceItem *item = dynamic_cast<ButtonSourceItem*>(it.current() );
if (item && item->button().type == btn) {
@@ -194,9 +194,9 @@ void ButtonSource::showButton( QChar btn )
}
}
-void ButtonSource::hideButton( QChar btn )
+void ButtonSource::hideButton( TQChar btn )
{
- QListViewItemIterator it(this);
+ TQListViewItemIterator it(this);
while (it.current() ) {
ButtonSourceItem *item = dynamic_cast<ButtonSourceItem*>(it.current() );
if (item && item->button().type == btn && !item->button().duplicate) {
@@ -207,12 +207,12 @@ void ButtonSource::hideButton( QChar btn )
}
}
-bool ButtonSource::acceptDrag(QDropEvent* e) const
+bool ButtonSource::acceptDrag(TQDropEvent* e) const
{
return acceptDrops() && ButtonDrag::canDecode(e);
}
-QDragObject *ButtonSource::dragObject()
+TQDragObject *ButtonSource::dragObject()
{
ButtonSourceItem *i = dynamic_cast<ButtonSourceItem*>(selectedItem() );
@@ -251,20 +251,20 @@ int ButtonDropSiteItem::height()
return 20;
}
-void ButtonDropSiteItem::draw(QPainter *p, const QColorGroup& cg, QRect r)
+void ButtonDropSiteItem::draw(TQPainter *p, const TQColorGroup& cg, TQRect r)
{
// p->fillRect(r, cg.base() );
if (m_button.supported)
p->setPen(cg.foreground() );
else
p->setPen(cg.mid() );
- QBitmap &i = m_button.icon;
+ TQBitmap &i = m_button.icon;
p->drawPixmap(r.left()+(r.width()-i.width())/2, r.top()+(r.height()-i.height())/2, i);
}
-ButtonDropSite::ButtonDropSite( QWidget* parent, const char* name )
- : QFrame( parent, name ),
+ButtonDropSite::ButtonDropSite( TQWidget* parent, const char* name )
+ : TQFrame( parent, name ),
m_selected(0)
{
setAcceptDrops( TRUE );
@@ -303,14 +303,14 @@ void ButtonDropSite::clearRight()
}
}
-void ButtonDropSite::dragMoveEvent( QDragMoveEvent* e )
+void ButtonDropSite::dragMoveEvent( TQDragMoveEvent* e )
{
- QPoint p = e->pos();
+ TQPoint p = e->pos();
if (leftDropArea().contains(p) || rightDropArea().contains(p) || buttonAt(p) ) {
e->accept();
// 2 pixel wide drop visualizer...
- QRect r = contentsRect();
+ TQRect r = contentsRect();
int x = -1;
if (leftDropArea().contains(p) ) {
x = leftDropArea().left();
@@ -327,7 +327,7 @@ void ButtonDropSite::dragMoveEvent( QDragMoveEvent* e )
}
}
if (x != -1) {
- QRect tmpRect(x, r.y(), 2, r.height() );
+ TQRect tmpRect(x, r.y(), 2, r.height() );
if (tmpRect != m_oldDropVisualizer) {
cleanDropVisualizer();
m_oldDropVisualizer = tmpRect;
@@ -346,28 +346,28 @@ void ButtonDropSite::cleanDropVisualizer()
{
if (m_oldDropVisualizer.isValid())
{
- QRect rect = m_oldDropVisualizer;
- m_oldDropVisualizer = QRect(); // rect is invalid
+ TQRect rect = m_oldDropVisualizer;
+ m_oldDropVisualizer = TQRect(); // rect is invalid
update(rect);
}
}
-void ButtonDropSite::dragEnterEvent( QDragEnterEvent* e )
+void ButtonDropSite::dragEnterEvent( TQDragEnterEvent* e )
{
if ( ButtonDrag::canDecode( e ) )
e->accept();
}
-void ButtonDropSite::dragLeaveEvent( QDragLeaveEvent* /* e */ )
+void ButtonDropSite::dragLeaveEvent( TQDragLeaveEvent* /* e */ )
{
cleanDropVisualizer();
}
-void ButtonDropSite::dropEvent( QDropEvent* e )
+void ButtonDropSite::dropEvent( TQDropEvent* e )
{
cleanDropVisualizer();
- QPoint p = e->pos();
+ TQPoint p = e->pos();
// collect information where to insert the dropped button
ButtonList *buttonList = 0;
@@ -393,7 +393,7 @@ void ButtonDropSite::dropEvent( QDropEvent* e )
// got the list and the aboveItem position. now determine if the item should be inserted
// before aboveItem or after aboveItem.
- QRect aboveItemRect = aboveItem->rect;
+ TQRect aboveItemRect = aboveItem->rect;
if (!aboveItemRect.isValid() )
return;
@@ -463,25 +463,25 @@ bool ButtonDropSite::getItemIterator(ButtonDropSiteItem *item, ButtonList* &list
return true;
}
-QRect ButtonDropSite::leftDropArea()
+TQRect ButtonDropSite::leftDropArea()
{
// return a 10 pixel drop area...
- QRect r = contentsRect();
+ TQRect r = contentsRect();
int leftButtonsWidth = calcButtonListWidth(buttonsLeft);
- return QRect(r.left()+leftButtonsWidth, r.top(), 10, r.height() );
+ return TQRect(r.left()+leftButtonsWidth, r.top(), 10, r.height() );
}
-QRect ButtonDropSite::rightDropArea()
+TQRect ButtonDropSite::rightDropArea()
{
// return a 10 pixel drop area...
- QRect r = contentsRect();
+ TQRect r = contentsRect();
int rightButtonsWidth = calcButtonListWidth(buttonsRight);
- return QRect(r.right()-rightButtonsWidth-10, r.top(), 10, r.height() );
+ return TQRect(r.right()-rightButtonsWidth-10, r.top(), 10, r.height() );
}
-void ButtonDropSite::mousePressEvent( QMouseEvent* e )
+void ButtonDropSite::mousePressEvent( TQMouseEvent* e )
{
// TODO: only start the real drag after some drag distance
m_selected = buttonAt(e->pos() );
@@ -492,20 +492,20 @@ void ButtonDropSite::mousePressEvent( QMouseEvent* e )
}
}
-void ButtonDropSite::resizeEvent(QResizeEvent*)
+void ButtonDropSite::resizeEvent(TQResizeEvent*)
{
recalcItemGeometry();
}
void ButtonDropSite::recalcItemGeometry()
{
- QRect r = contentsRect();
+ TQRect r = contentsRect();
// update the geometry of the items in the left button list
int offset = r.left();
for (ButtonList::const_iterator it = buttonsLeft.begin(); it != buttonsLeft.end(); ++it) {
int w = (*it)->width();
- (*it)->rect = QRect(offset, r.top(), w, (*it)->height() );
+ (*it)->rect = TQRect(offset, r.top(), w, (*it)->height() );
offset += w;
}
@@ -513,12 +513,12 @@ void ButtonDropSite::recalcItemGeometry()
offset = r.right() - calcButtonListWidth(buttonsRight);
for (ButtonList::const_iterator it = buttonsRight.begin(); it != buttonsRight.end(); ++it) {
int w = (*it)->width();
- (*it)->rect = QRect(offset, r.top(), w, (*it)->height() );
+ (*it)->rect = TQRect(offset, r.top(), w, (*it)->height() );
offset += w;
}
}
-ButtonDropSiteItem *ButtonDropSite::buttonAt(QPoint p) {
+ButtonDropSiteItem *ButtonDropSite::buttonAt(TQPoint p) {
// try to find the item in the left button list
for (ButtonList::const_iterator it = buttonsLeft.begin(); it != buttonsLeft.end(); ++it) {
if ( (*it)->rect.contains(p) ) {
@@ -578,10 +578,10 @@ bool ButtonDropSite::removeSelectedButton()
return succ;
}
-void ButtonDropSite::drawButtonList(QPainter *p, const ButtonList& btns, int offset)
+void ButtonDropSite::drawButtonList(TQPainter *p, const ButtonList& btns, int offset)
{
for (ButtonList::const_iterator it = btns.begin(); it != btns.end(); ++it) {
- QRect itemRect = (*it)->rect;
+ TQRect itemRect = (*it)->rect;
if (itemRect.isValid() ) {
(*it)->draw(p, colorGroup(), itemRect);
}
@@ -589,13 +589,13 @@ void ButtonDropSite::drawButtonList(QPainter *p, const ButtonList& btns, int off
}
}
-void ButtonDropSite::drawContents( QPainter* p )
+void ButtonDropSite::drawContents( TQPainter* p )
{
int leftoffset = calcButtonListWidth( buttonsLeft );
int rightoffset = calcButtonListWidth( buttonsRight );
int offset = 3;
- QRect r = contentsRect();
+ TQRect r = contentsRect();
// Shrink by 1
r.moveBy(1 + leftoffset, 1);
@@ -604,10 +604,10 @@ void ButtonDropSite::drawContents( QPainter* p )
drawButtonList( p, buttonsLeft, offset );
- QColor c1( 0x0A, 0x5F, 0x89 ); // KDE 2 titlebar default colour
+ TQColor c1( 0x0A, 0x5F, 0x89 ); // KDE 2 titlebar default colour
p->fillRect( r, c1 );
p->setPen( Qt::white );
- p->setFont( QFont( KGlobalSettings::generalFont().family(), 12, QFont::Bold) );
+ p->setFont( TQFont( KGlobalSettings::generalFont().family(), 12, TQFont::Bold) );
p->drawText( r, AlignLeft | AlignVCenter, i18n("KDE") );
offset = geometry().width() - 3 - rightoffset;
@@ -619,8 +619,8 @@ void ButtonDropSite::drawContents( QPainter* p )
}
}
-ButtonSourceItem::ButtonSourceItem(QListView * parent, const Button& btn)
- : QListViewItem(parent),
+ButtonSourceItem::ButtonSourceItem(TQListView * parent, const Button& btn)
+ : TQListViewItem(parent),
m_button(btn),
m_dirty(true)
{
@@ -631,7 +631,7 @@ ButtonSourceItem::~ButtonSourceItem()
{
}
-void ButtonSourceItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align)
+void ButtonSourceItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align)
{
// we need the color group cg, so to the work here, not in setButton...
if (m_dirty) {
@@ -644,12 +644,12 @@ void ButtonSourceItem::paintCell(QPainter *p, const QColorGroup &cg, int column,
}
if (m_button.supported) {
- QListViewItem::paintCell(p,cg,column,width,align);
+ TQListViewItem::paintCell(p,cg,column,width,align);
} else {
// grey out unsupported buttons
- QColorGroup cg2 = cg;
- cg2.setColor(QColorGroup::Text, cg.mid() );
- QListViewItem::paintCell(p,cg2,column,width,align);
+ TQColorGroup cg2 = cg;
+ cg2.setColor(TQColorGroup::Text, cg.mid() );
+ TQListViewItem::paintCell(p,cg2,column,width,align);
}
}
@@ -670,16 +670,16 @@ Button ButtonSourceItem::button() const
}
-ButtonPositionWidget::ButtonPositionWidget(QWidget *parent, const char* name)
- : QWidget(parent,name),
+ButtonPositionWidget::ButtonPositionWidget(TQWidget *parent, const char* name)
+ : TQWidget(parent,name),
m_factory(0)
{
- QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint() );
- setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
+ setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum);
- QLabel* label = new QLabel( this );
+ TQLabel* label = new TQLabel( this );
m_dropSite = new ButtonDropSite( this );
- label->setAlignment( int( QLabel::WordBreak ) );
+ label->setAlignment( int( TQLabel::WordBreak ) );
label->setText( i18n( "To add or remove titlebar buttons, simply <i>drag</i> items "
"between the available item list and the titlebar preview. Similarly, "
"drag items within the titlebar preview to re-position them.") );
@@ -689,11 +689,11 @@ ButtonPositionWidget::ButtonPositionWidget(QWidget *parent, const char* name)
layout->addWidget(m_dropSite);
layout->addWidget(m_buttonSource);
- connect( m_dropSite, SIGNAL(buttonAdded(QChar)), m_buttonSource, SLOT(hideButton(QChar)) );
- connect( m_dropSite, SIGNAL(buttonRemoved(QChar)), m_buttonSource, SLOT(showButton(QChar)) );
- connect( m_buttonSource, SIGNAL(dropped(QDropEvent*, QListViewItem*)), m_dropSite, SLOT(removeSelectedButton()) );
+ connect( m_dropSite, TQT_SIGNAL(buttonAdded(TQChar)), m_buttonSource, TQT_SLOT(hideButton(TQChar)) );
+ connect( m_dropSite, TQT_SIGNAL(buttonRemoved(TQChar)), m_buttonSource, TQT_SLOT(showButton(TQChar)) );
+ connect( m_buttonSource, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), m_dropSite, TQT_SLOT(removeSelectedButton()) );
- connect( m_dropSite, SIGNAL(changed()), SIGNAL(changed()) );
+ connect( m_dropSite, TQT_SIGNAL(changed()), TQT_SIGNAL(changed()) );
// insert all possible buttons into the source (backwards to keep the preferred order...)
bool dummy;
@@ -723,7 +723,7 @@ void ButtonPositionWidget::setDecorationFactory(KDecorationFactory *factory)
// get the list of supported buttons
if (m_factory->supports(KDecorationDefines::AbilityAnnounceButtons) ) {
- QString supportedButtons;
+ TQString supportedButtons;
if (m_factory->supports(KDecorationDefines::AbilityButtonMenu) )
supportedButtons.append('M');
@@ -756,7 +756,7 @@ void ButtonPositionWidget::setDecorationFactory(KDecorationFactory *factory)
// update the button lists...
// 1. set status on the source items...
- QListViewItemIterator it(m_buttonSource);
+ TQListViewItemIterator it(m_buttonSource);
while (it.current() ) {
ButtonSourceItem *i = dynamic_cast<ButtonSourceItem*>(it.current() );
if (i) {
@@ -771,51 +771,51 @@ void ButtonPositionWidget::setDecorationFactory(KDecorationFactory *factory)
setButtonsRight(buttonsRight() );
}
-Button ButtonPositionWidget::getButton(QChar type, bool& success) {
+Button ButtonPositionWidget::getButton(TQChar type, bool& success) {
success = true;
if (type == 'R') {
- QBitmap bmp(resize_width, resize_height, resize_bits, true);
+ TQBitmap bmp(resize_width, resize_height, resize_bits, true);
bmp.setMask(bmp);
return Button(i18n("Resize"), bmp, 'R', false, m_supportedButtons.contains('R') );
} else if (type == 'L') {
- QBitmap bmp(shade_width, shade_height, shade_bits, true);
+ TQBitmap bmp(shade_width, shade_height, shade_bits, true);
bmp.setMask(bmp);
return Button(i18n("Shade"), bmp, 'L', false, m_supportedButtons.contains('L') );
} else if (type == 'B') {
- QBitmap bmp(keepbelowothers_width, keepbelowothers_height, keepbelowothers_bits, true);
+ TQBitmap bmp(keepbelowothers_width, keepbelowothers_height, keepbelowothers_bits, true);
bmp.setMask(bmp);
return Button(i18n("Keep Below Others"), bmp, 'B', false, m_supportedButtons.contains('B') );
} else if (type == 'F') {
- QBitmap bmp(keepaboveothers_width, keepaboveothers_height, keepaboveothers_bits, true);
+ TQBitmap bmp(keepaboveothers_width, keepaboveothers_height, keepaboveothers_bits, true);
bmp.setMask(bmp);
return Button(i18n("Keep Above Others"), bmp, 'F', false, m_supportedButtons.contains('F') );
} else if (type == 'X') {
- QBitmap bmp(close_width, close_height, close_bits, true);
+ TQBitmap bmp(close_width, close_height, close_bits, true);
bmp.setMask(bmp);
return Button(i18n("Close"), bmp, 'X', false, m_supportedButtons.contains('X') );
} else if (type == 'A') {
- QBitmap bmp(maximize_width, maximize_height, maximize_bits, true);
+ TQBitmap bmp(maximize_width, maximize_height, maximize_bits, true);
bmp.setMask(bmp);
return Button(i18n("Maximize"), bmp, 'A', false, m_supportedButtons.contains('A') );
} else if (type == 'I') {
- QBitmap bmp(minimize_width, minimize_height, minimize_bits, true);
+ TQBitmap bmp(minimize_width, minimize_height, minimize_bits, true);
bmp.setMask(bmp);
return Button(i18n("Minimize"), bmp, 'I', false, m_supportedButtons.contains('I') );
} else if (type == 'H') {
- QBitmap bmp(help_width, help_height, help_bits, true);
+ TQBitmap bmp(help_width, help_height, help_bits, true);
bmp.setMask(bmp);
return Button(i18n("Help"), bmp, 'H', false, m_supportedButtons.contains('H') );
} else if (type == 'S') {
- QBitmap bmp(onalldesktops_width, onalldesktops_height, onalldesktops_bits, true);
+ TQBitmap bmp(onalldesktops_width, onalldesktops_height, onalldesktops_bits, true);
bmp.setMask(bmp);
return Button(i18n("On All Desktops"), bmp, 'S', false, m_supportedButtons.contains('S') );
} else if (type == 'M') {
- QBitmap bmp(menu_width, menu_height, menu_bits, true);
+ TQBitmap bmp(menu_width, menu_height, menu_bits, true);
bmp.setMask(bmp);
return Button(i18n("Menu"), bmp, 'M', false, m_supportedButtons.contains('M') );
} else if (type == '_') {
- QBitmap bmp(spacer_width, spacer_height, spacer_bits, true);
+ TQBitmap bmp(spacer_width, spacer_height, spacer_bits, true);
bmp.setMask(bmp);
return Button(i18n("--- spacer ---"), bmp, '_', true, m_supportedButtons.contains('_') );
} else {
@@ -824,27 +824,27 @@ Button ButtonPositionWidget::getButton(QChar type, bool& success) {
}
}
-QString ButtonPositionWidget::buttonsLeft() const
+TQString ButtonPositionWidget::buttonsLeft() const
{
ButtonList btns = m_dropSite->buttonsLeft;
- QString btnString = "";
+ TQString btnString = "";
for (ButtonList::const_iterator it = btns.begin(); it != btns.end(); ++it) {
btnString.append( (*it)->button().type );
}
return btnString;
}
-QString ButtonPositionWidget::buttonsRight() const
+TQString ButtonPositionWidget::buttonsRight() const
{
ButtonList btns = m_dropSite->buttonsRight;
- QString btnString = "";
+ TQString btnString = "";
for (ButtonList::const_iterator it = btns.begin(); it != btns.end(); ++it) {
btnString.append( (*it)->button().type );
}
return btnString;
}
-void ButtonPositionWidget::setButtonsLeft(const QString &buttons)
+void ButtonPositionWidget::setButtonsLeft(const TQString &buttons)
{
// to keep the button lists consistent, first remove all left buttons, then add buttons again...
m_dropSite->clearLeft();
@@ -861,7 +861,7 @@ void ButtonPositionWidget::setButtonsLeft(const QString &buttons)
m_dropSite->update();
}
-void ButtonPositionWidget::setButtonsRight(const QString &buttons)
+void ButtonPositionWidget::setButtonsRight(const TQString &buttons)
{
// to keep the button lists consistent, first remove all left buttons, then add buttons again...
m_dropSite->clearRight();
diff --git a/kwin/kcmkwin/kwindecoration/buttons.h b/kwin/kcmkwin/kwindecoration/buttons.h
index a3db6266e..0fcbff085 100644
--- a/kwin/kcmkwin/kwindecoration/buttons.h
+++ b/kwin/kcmkwin/kwindecoration/buttons.h
@@ -31,10 +31,10 @@
#ifndef __BUTTONS_H_
#define __BUTTONS_H_
-#include <qbitmap.h>
-#include <qevent.h>
-#include <qdragobject.h>
-#include <qlistbox.h>
+#include <tqbitmap.h>
+#include <tqevent.h>
+#include <tqdragobject.h>
+#include <tqlistbox.h>
#include <klistview.h>
@@ -47,12 +47,12 @@ class Button
{
public:
Button();
- Button(const QString& name, const QBitmap& icon, QChar type, bool duplicate, bool supported);
+ Button(const TQString& name, const TQBitmap& icon, TQChar type, bool duplicate, bool supported);
virtual ~Button();
- QString name;
- QBitmap icon;
- QChar type;
+ TQString name;
+ TQBitmap icon;
+ TQChar type;
bool duplicate;
bool supported;
};
@@ -60,11 +60,11 @@ class Button
class ButtonDrag : public QStoredDrag
{
public:
- ButtonDrag( Button btn, QWidget* parent, const char* name=0 );
+ ButtonDrag( Button btn, TQWidget* parent, const char* name=0 );
~ButtonDrag() {};
- static bool canDecode( QDropEvent* e );
- static bool decode( QDropEvent* e, Button& btn );
+ static bool canDecode( TQDropEvent* e );
+ static bool decode( TQDropEvent* e, Button& btn );
};
/**
@@ -78,11 +78,11 @@ class ButtonDropSiteItem
Button button();
- QRect rect;
+ TQRect rect;
int width();
int height();
- void draw(QPainter *p, const QColorGroup& cg, QRect rect);
+ void draw(TQPainter *p, const TQColorGroup& cg, TQRect rect);
private:
Button m_button;
@@ -94,10 +94,10 @@ class ButtonDropSiteItem
class ButtonSourceItem : public QListViewItem
{
public:
- ButtonSourceItem(QListView * parent, const Button& btn);
+ ButtonSourceItem(TQListView * parent, const Button& btn);
virtual ~ButtonSourceItem();
- void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align);
+ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align);
void setButton(const Button& btn);
Button button() const;
@@ -114,24 +114,24 @@ class ButtonSource : public KListView
Q_OBJECT
public:
- ButtonSource(QWidget *parent = 0, const char* name = 0);
+ ButtonSource(TQWidget *parent = 0, const char* name = 0);
virtual ~ButtonSource();
- QSize sizeHint() const;
+ TQSize sizeHint() const;
void hideAllButtons();
void showAllButtons();
public slots:
- void hideButton(QChar btn);
- void showButton(QChar btn);
+ void hideButton(TQChar btn);
+ void showButton(TQChar btn);
protected:
- bool acceptDrag(QDropEvent* e) const;
- virtual QDragObject *dragObject();
+ bool acceptDrag(TQDropEvent* e) const;
+ virtual TQDragObject *dragObject();
};
-typedef QValueList<ButtonDropSiteItem*> ButtonList;
+typedef TQValueList<ButtonDropSiteItem*> ButtonList;
/**
* This class renders and handles the demo titlebar dropsite
@@ -141,7 +141,7 @@ class ButtonDropSite: public QFrame
Q_OBJECT
public:
- ButtonDropSite( QWidget* parent=0, const char* name=0 );
+ ButtonDropSite( TQWidget* parent=0, const char* name=0 );
~ButtonDropSite();
// Allow external classes access our buttons - ensure buttons are
@@ -152,8 +152,8 @@ class ButtonDropSite: public QFrame
void clearRight();
signals:
- void buttonAdded(QChar btn);
- void buttonRemoved(QChar btn);
+ void buttonAdded(TQChar btn);
+ void buttonRemoved(TQChar btn);
void changed();
public slots:
@@ -161,21 +161,21 @@ class ButtonDropSite: public QFrame
void recalcItemGeometry(); ///< Call this whenever the item list changes... updates the items' rect property
protected:
- void resizeEvent(QResizeEvent*);
- void dragEnterEvent( QDragEnterEvent* e );
- void dragMoveEvent( QDragMoveEvent* e );
- void dragLeaveEvent( QDragLeaveEvent* e );
- void dropEvent( QDropEvent* e );
- void mousePressEvent( QMouseEvent* e ); ///< Starts dragging a button...
-
- void drawContents( QPainter* p );
- ButtonDropSiteItem *buttonAt(QPoint p);
+ void resizeEvent(TQResizeEvent*);
+ void dragEnterEvent( TQDragEnterEvent* e );
+ void dragMoveEvent( TQDragMoveEvent* e );
+ void dragLeaveEvent( TQDragLeaveEvent* e );
+ void dropEvent( TQDropEvent* e );
+ void mousePressEvent( TQMouseEvent* e ); ///< Starts dragging a button...
+
+ void drawContents( TQPainter* p );
+ ButtonDropSiteItem *buttonAt(TQPoint p);
bool removeButton(ButtonDropSiteItem *item);
int calcButtonListWidth(const ButtonList& buttons); ///< Computes the total space the buttons will take in the titlebar
- void drawButtonList(QPainter *p, const ButtonList& buttons, int offset);
+ void drawButtonList(TQPainter *p, const ButtonList& buttons, int offset);
- QRect leftDropArea();
- QRect rightDropArea();
+ TQRect leftDropArea();
+ TQRect rightDropArea();
private:
/**
@@ -184,7 +184,7 @@ class ButtonDropSite: public QFrame
bool getItemIterator(ButtonDropSiteItem *item, ButtonList* &list, ButtonList::iterator &iterator);
void cleanDropVisualizer();
- QRect m_oldDropVisualizer;
+ TQRect m_oldDropVisualizer;
ButtonDropSiteItem *m_selected;
};
@@ -194,7 +194,7 @@ class ButtonPositionWidget : public QWidget
Q_OBJECT
public:
- ButtonPositionWidget(QWidget *parent = 0, const char* name = 0);
+ ButtonPositionWidget(TQWidget *parent = 0, const char* name = 0);
~ButtonPositionWidget();
/**
@@ -202,23 +202,23 @@ class ButtonPositionWidget : public QWidget
*/
void setDecorationFactory(KDecorationFactory *factory);
- QString buttonsLeft() const;
- QString buttonsRight() const;
- void setButtonsLeft(const QString &buttons);
- void setButtonsRight(const QString &buttons);
+ TQString buttonsLeft() const;
+ TQString buttonsRight() const;
+ void setButtonsLeft(const TQString &buttons);
+ void setButtonsRight(const TQString &buttons);
signals:
void changed();
private:
void clearButtonList(const ButtonList& btns);
- Button getButton(QChar type, bool& success);
+ Button getButton(TQChar type, bool& success);
ButtonDropSite* m_dropSite;
ButtonSource *m_buttonSource;
KDecorationFactory *m_factory;
- QString m_supportedButtons;
+ TQString m_supportedButtons;
};
diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
index 7435781bc..68aec85ff 100644
--- a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -28,17 +28,17 @@
*/
#include <assert.h>
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qgroupbox.h>
-#include <qcheckbox.h>
-#include <qtabwidget.h>
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qfile.h>
-#include <qslider.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
+#include <tqgroupbox.h>
+#include <tqcheckbox.h>
+#include <tqtabwidget.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
+#include <tqfile.h>
+#include <tqslider.h>
#include <kapplication.h>
#include <kcombobox.h>
@@ -59,10 +59,10 @@
// KCModule plugin interface
// =========================
-typedef KGenericFactory<KWinDecorationModule, QWidget> KWinDecoFactory;
+typedef KGenericFactory<KWinDecorationModule, TQWidget> KWinDecoFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kwindecoration, KWinDecoFactory("kcmkwindecoration") )
-KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, const QStringList &)
+KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, const TQStringList &)
: DCOPObject("KWinClientDecoration"),
KCModule(KWinDecoFactory::instance(), parent, name),
kwinConfig("kwinrc"),
@@ -71,28 +71,28 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, co
kwinConfig.setGroup("Style");
plugins = new KDecorationPreviewPlugins( &kwinConfig );
- QVBoxLayout* layout = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout* layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
// Save this for later...
-// cbUseMiniWindows = new QCheckBox( i18n( "Render mini &titlebars for all windows"), checkGroup );
-// QWhatsThis::add( cbUseMiniWindows, i18n( "Note that this option is not available on all styles yet!" ) );
+// cbUseMiniWindows = new TQCheckBox( i18n( "Render mini &titlebars for all windows"), checkGroup );
+// TQWhatsThis::add( cbUseMiniWindows, i18n( "Note that this option is not available on all styles yet!" ) );
- tabWidget = new QTabWidget( this );
+ tabWidget = new TQTabWidget( this );
layout->addWidget( tabWidget );
// Page 1 (General Options)
- QWidget *pluginPage = new QWidget( tabWidget );
+ TQWidget *pluginPage = new TQWidget( tabWidget );
- QVBoxLayout* pluginLayout = new QVBoxLayout(pluginPage, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout* pluginLayout = new TQVBoxLayout(pluginPage, KDialog::marginHint(), KDialog::spacingHint());
// decoration chooser
decorationList = new KComboBox( pluginPage );
- QString whatsThis = i18n("Select the window decoration. This is the look and feel of both "
+ TQString whatsThis = i18n("Select the window decoration. This is the look and feel of both "
"the window borders and the window handle.");
- QWhatsThis::add(decorationList, whatsThis);
+ TQWhatsThis::add(decorationList, whatsThis);
pluginLayout->addWidget(decorationList);
- QGroupBox *pluginSettingsGrp = new QGroupBox( i18n("Decoration Options"), pluginPage );
+ TQGroupBox *pluginSettingsGrp = new TQGroupBox( i18n("Decoration Options"), pluginPage );
pluginSettingsGrp->setColumnLayout( 0, Vertical );
pluginSettingsGrp->setFlat( true );
pluginSettingsGrp->layout()->setMargin( 0 );
@@ -102,33 +102,33 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, co
pluginLayout->addStretch();
// Border size chooser
- lBorder = new QLabel (i18n("B&order size:"), pluginSettingsGrp);
- cBorder = new QComboBox(pluginSettingsGrp);
+ lBorder = new TQLabel (i18n("B&order size:"), pluginSettingsGrp);
+ cBorder = new TQComboBox(pluginSettingsGrp);
lBorder->setBuddy(cBorder);
- QWhatsThis::add( cBorder, i18n( "Use this combobox to change the border size of the decoration." ));
+ TQWhatsThis::add( cBorder, i18n( "Use this combobox to change the border size of the decoration." ));
lBorder->hide();
cBorder->hide();
- QHBoxLayout *borderSizeLayout = new QHBoxLayout(pluginSettingsGrp->layout() );
+ TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->layout() );
borderSizeLayout->addWidget(lBorder);
borderSizeLayout->addWidget(cBorder);
borderSizeLayout->addStretch();
- pluginConfigWidget = new QVBox(pluginSettingsGrp);
+ pluginConfigWidget = new TQVBox(pluginSettingsGrp);
pluginSettingsGrp->layout()->add( pluginConfigWidget );
// Page 2 (Button Selector)
- QWidget* buttonPage = new QWidget( tabWidget );
- QVBoxLayout* buttonLayout = new QVBoxLayout(buttonPage, KDialog::marginHint(), KDialog::spacingHint());
+ TQWidget* buttonPage = new TQWidget( tabWidget );
+ TQVBoxLayout* buttonLayout = new TQVBoxLayout(buttonPage, KDialog::marginHint(), KDialog::spacingHint());
- cbShowToolTips = new QCheckBox(
+ cbShowToolTips = new TQCheckBox(
i18n("&Show window button tooltips"), buttonPage );
- QWhatsThis::add( cbShowToolTips,
+ TQWhatsThis::add( cbShowToolTips,
i18n( "Enabling this checkbox will show window button tooltips. "
"If this checkbox is off, no window button tooltips will be shown."));
- cbUseCustomButtonPositions = new QCheckBox(
+ cbUseCustomButtonPositions = new TQCheckBox(
i18n("Use custom titlebar button &positions"), buttonPage );
- QWhatsThis::add( cbUseCustomButtonPositions,
+ TQWhatsThis::add( cbUseCustomButtonPositions,
i18n( "The appropriate settings can be found in the \"Buttons\" Tab; "
"please note that this option is not available on all styles yet." ) );
@@ -138,20 +138,20 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, co
// Add nifty dnd button modification widgets
buttonPositionWidget = new ButtonPositionWidget(buttonPage, "button_position_widget");
buttonPositionWidget->setDecorationFactory(plugins->factory() );
- QHBoxLayout* buttonControlLayout = new QHBoxLayout(buttonLayout);
+ TQHBoxLayout* buttonControlLayout = new TQHBoxLayout(buttonLayout);
buttonControlLayout->addSpacing(20);
buttonControlLayout->addWidget(buttonPositionWidget);
// buttonLayout->addStretch();
// preview
- QVBoxLayout* previewLayout = new QVBoxLayout(layout, KDialog::spacingHint() );
+ TQVBoxLayout* previewLayout = new TQVBoxLayout(layout, KDialog::spacingHint() );
previewLayout->setMargin( KDialog::marginHint() );
preview = new KDecorationPreview( this );
previewLayout->addWidget(preview);
- preview->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- tabWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+ preview->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ tabWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum);
// Load all installed decorations into memory
// Set up the decoration lists and other UI settings
@@ -163,17 +163,17 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, co
tabWidget->insertTab( pluginPage, i18n("&Window Decoration") );
tabWidget->insertTab( buttonPage, i18n("&Buttons") );
- connect( buttonPositionWidget, SIGNAL(changed()), this, SLOT(slotButtonsChanged()) ); // update preview etc.
- connect( buttonPositionWidget, SIGNAL(changed()), this, SLOT(slotSelectionChanged()) ); // emit changed()...
- connect( decorationList, SIGNAL(activated(const QString&)), SLOT(slotSelectionChanged()) );
- connect( decorationList, SIGNAL(activated(const QString&)),
- SLOT(slotChangeDecoration(const QString&)) );
- connect( cbUseCustomButtonPositions, SIGNAL(clicked()), SLOT(slotSelectionChanged()) );
- connect(cbUseCustomButtonPositions, SIGNAL(toggled(bool)), buttonPositionWidget, SLOT(setEnabled(bool)));
- connect(cbUseCustomButtonPositions, SIGNAL(toggled(bool)), this, SLOT(slotButtonsChanged()) );
- connect( cbShowToolTips, SIGNAL(clicked()), SLOT(slotSelectionChanged()) );
- connect( cBorder, SIGNAL( activated( int )), SLOT( slotBorderChanged( int )));
-// connect( cbUseMiniWindows, SIGNAL(clicked()), SLOT(slotSelectionChanged()) );
+ connect( buttonPositionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(slotButtonsChanged()) ); // update preview etc.
+ connect( buttonPositionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) ); // emit changed()...
+ connect( decorationList, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotSelectionChanged()) );
+ connect( decorationList, TQT_SIGNAL(activated(const TQString&)),
+ TQT_SLOT(slotChangeDecoration(const TQString&)) );
+ connect( cbUseCustomButtonPositions, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
+ connect(cbUseCustomButtonPositions, TQT_SIGNAL(toggled(bool)), buttonPositionWidget, TQT_SLOT(setEnabled(bool)));
+ connect(cbUseCustomButtonPositions, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotButtonsChanged()) );
+ connect( cbShowToolTips, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
+ connect( cBorder, TQT_SIGNAL( activated( int )), TQT_SLOT( slotBorderChanged( int )));
+// connect( cbUseMiniWindows, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
// Allow kwin dcop signal to update our selection list
connectDCOPSignal("kwin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false);
@@ -199,20 +199,20 @@ KWinDecorationModule::~KWinDecorationModule()
// And insert these into a DecorationInfo structure
void KWinDecorationModule::findDecorations()
{
- QStringList dirList = KGlobal::dirs()->findDirs("data", "kwin");
- QStringList::ConstIterator it;
+ TQStringList dirList = KGlobal::dirs()->findDirs("data", "kwin");
+ TQStringList::ConstIterator it;
for (it = dirList.begin(); it != dirList.end(); it++)
{
- QDir d(*it);
+ TQDir d(*it);
if (d.exists())
for (QFileInfoListIterator it(*d.entryInfoList()); it.current(); ++it)
{
- QString filename(it.current()->absFilePath());
+ TQString filename(it.current()->absFilePath());
if (KDesktopFile::isDesktopFile(filename))
{
KDesktopFile desktopFile(filename);
- QString libName = desktopFile.readEntry("X-KDE-Library");
+ TQString libName = desktopFile.readEntry("X-KDE-Library");
if (!libName.isEmpty() && libName.startsWith( "kwin3_" ))
{
@@ -230,10 +230,10 @@ void KWinDecorationModule::findDecorations()
// Fills the decorationList with a list of available kwin decorations
void KWinDecorationModule::createDecorationList()
{
- QValueList<DecorationInfo>::ConstIterator it;
+ TQValueList<DecorationInfo>::ConstIterator it;
// Sync with kwin hardcoded KDE2 style which has no desktop item
- QStringList decorationNames;
+ TQStringList decorationNames;
decorationNames.append( i18n("KDE 2") );
for (it = decorations.begin(); it != decorations.end(); ++it)
{
@@ -245,7 +245,7 @@ void KWinDecorationModule::createDecorationList()
// Reset the decoration plugin to what the user just selected
-void KWinDecorationModule::slotChangeDecoration( const QString & text)
+void KWinDecorationModule::slotChangeDecoration( const TQString & text)
{
KConfig kwinConfig("kwinrc");
kwinConfig.setGroup("Style");
@@ -272,10 +272,10 @@ static const char* const border_names[ KDecorationDefines::BordersCount ] =
I18N_NOOP( "Oversized" )
};
-int KWinDecorationModule::borderSizeToIndex( BorderSize size, QValueList< BorderSize > sizes )
+int KWinDecorationModule::borderSizeToIndex( BorderSize size, TQValueList< BorderSize > sizes )
{
int pos = 0;
- for( QValueList< BorderSize >::ConstIterator it = sizes.begin();
+ for( TQValueList< BorderSize >::ConstIterator it = sizes.begin();
it != sizes.end();
++it, ++pos )
if( size <= *it )
@@ -284,9 +284,9 @@ int KWinDecorationModule::borderSizeToIndex( BorderSize size, QValueList< Border
}
KDecorationDefines::BorderSize KWinDecorationModule::indexToBorderSize( int index,
- QValueList< BorderSize > sizes )
+ TQValueList< BorderSize > sizes )
{
- QValueList< BorderSize >::ConstIterator it = sizes.begin();
+ TQValueList< BorderSize >::ConstIterator it = sizes.begin();
for(;
it != sizes.end();
++it, --index )
@@ -300,7 +300,7 @@ void KWinDecorationModule::slotBorderChanged( int size )
if( lBorder->isHidden())
return;
emit KCModule::changed( true );
- QValueList< BorderSize > sizes;
+ TQValueList< BorderSize > sizes;
if( plugins->factory() != NULL )
sizes = plugins->factory()->borderSizes();
assert( sizes.count() >= 2 );
@@ -316,11 +316,11 @@ void KWinDecorationModule::slotButtonsChanged()
preview->setTempButtons(plugins, cbUseCustomButtonPositions->isChecked(), buttonPositionWidget->buttonsLeft(), buttonPositionWidget->buttonsRight() );
}
-QString KWinDecorationModule::decorationName( QString& libName )
+TQString KWinDecorationModule::decorationName( TQString& libName )
{
- QString decoName;
+ TQString decoName;
- QValueList<DecorationInfo>::Iterator it;
+ TQValueList<DecorationInfo>::Iterator it;
for( it = decorations.begin(); it != decorations.end(); ++it )
if ( (*it).libraryName == libName )
{
@@ -332,13 +332,13 @@ QString KWinDecorationModule::decorationName( QString& libName )
}
-QString KWinDecorationModule::decorationLibName( const QString& name )
+TQString KWinDecorationModule::decorationLibName( const TQString& name )
{
- QString libName;
+ TQString libName;
// Find the corresponding library name to that of
// the current plugin name
- QValueList<DecorationInfo>::Iterator it;
+ TQValueList<DecorationInfo>::Iterator it;
for( it = decorations.begin(); it != decorations.end(); ++it )
if ( (*it).name == name )
{
@@ -355,14 +355,14 @@ QString KWinDecorationModule::decorationLibName( const QString& name )
// Loads/unloads and inserts the decoration config plugin into the
// pluginConfigWidget, allowing for dynamic configuration of decorations
-void KWinDecorationModule::resetPlugin( KConfig* conf, const QString& currentDecoName )
+void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDecoName )
{
// Config names are "kwin_icewm_config"
// for "kwin3_icewm" kwin client
- QString oldName = styleToConfigLib( oldLibraryName );
+ TQString oldName = styleToConfigLib( oldLibraryName );
- QString currentName;
+ TQString currentName;
if (!currentDecoName.isEmpty())
currentName = decorationLibName( currentDecoName ); // Use what the user selected
else
@@ -391,23 +391,23 @@ void KWinDecorationModule::resetPlugin( KConfig* conf, const QString& currentDec
// Free the old library if possible
if (!oldLibraryName.isNull())
- loader->unloadLibrary( QFile::encodeName(oldName) );
+ loader->unloadLibrary( TQFile::encodeName(oldName) );
- KLibrary* library = loader->library( QFile::encodeName(currentName) );
+ KLibrary* library = loader->library( TQFile::encodeName(currentName) );
if (library != NULL)
{
void* alloc_ptr = library->symbol("allocate_config");
if (alloc_ptr != NULL)
{
- allocatePlugin = (QObject* (*)(KConfig* conf, QWidget* parent))alloc_ptr;
- pluginObject = (QObject*)(allocatePlugin( conf, pluginConfigWidget ));
+ allocatePlugin = (TQObject* (*)(KConfig* conf, TQWidget* parent))alloc_ptr;
+ pluginObject = (TQObject*)(allocatePlugin( conf, pluginConfigWidget ));
// connect required signals and slots together...
- connect( pluginObject, SIGNAL(changed()), this, SLOT(slotSelectionChanged()) );
- connect( this, SIGNAL(pluginLoad(KConfig*)), pluginObject, SLOT(load(KConfig*)) );
- connect( this, SIGNAL(pluginSave(KConfig*)), pluginObject, SLOT(save(KConfig*)) );
- connect( this, SIGNAL(pluginDefaults()), pluginObject, SLOT(defaults()) );
+ connect( pluginObject, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) );
+ connect( this, TQT_SIGNAL(pluginLoad(KConfig*)), pluginObject, TQT_SLOT(load(KConfig*)) );
+ connect( this, TQT_SIGNAL(pluginSave(KConfig*)), pluginObject, TQT_SLOT(save(KConfig*)) );
+ connect( this, TQT_SIGNAL(pluginDefaults()), pluginObject, TQT_SLOT(defaults()) );
pluginConfigWidget->show();
return;
}
@@ -431,8 +431,8 @@ void KWinDecorationModule::readConfig( KConfig* conf )
oldLibraryName = currentLibraryName;
currentLibraryName = conf->readEntry("PluginLib",
- ((QPixmap::defaultDepth() > 8) ? "kwin_plastik" : "kwin_quartz"));
- QString decoName = decorationName( currentLibraryName );
+ ((TQPixmap::defaultDepth() > 8) ? "kwin_plastik" : "kwin_quartz"));
+ TQString decoName = decorationName( currentLibraryName );
// If we are using the "default" kde client, use the "default" entry.
if (decoName.isEmpty())
@@ -472,8 +472,8 @@ void KWinDecorationModule::readConfig( KConfig* conf )
// Writes the selected user configuration to the kwin config file
void KWinDecorationModule::writeConfig( KConfig* conf )
{
- QString name = decorationList->currentText();
- QString libName = decorationLibName( name );
+ TQString name = decorationList->currentText();
+ TQString libName = decorationLibName( name );
KConfig kwinConfig("kwinrc");
kwinConfig.setGroup("Style");
@@ -558,7 +558,7 @@ void KWinDecorationModule::defaults()
void KWinDecorationModule::checkSupportedBorderSizes()
{
- QValueList< BorderSize > sizes;
+ TQValueList< BorderSize > sizes;
if( plugins->factory() != NULL )
sizes = plugins->factory()->borderSizes();
if( sizes.count() < 2 ) {
@@ -566,7 +566,7 @@ void KWinDecorationModule::checkSupportedBorderSizes()
cBorder->hide();
} else {
cBorder->clear();
- for (QValueList<BorderSize>::const_iterator it = sizes.begin(); it != sizes.end(); ++it) {
+ for (TQValueList<BorderSize>::const_iterator it = sizes.begin(); it != sizes.end(); ++it) {
BorderSize size = *it;
cBorder->insertItem(i18n(border_names[size]), borderSizeToIndex(size,sizes) );
}
@@ -578,7 +578,7 @@ void KWinDecorationModule::checkSupportedBorderSizes()
}
}
-QString KWinDecorationModule::styleToConfigLib( QString& styleLib )
+TQString KWinDecorationModule::styleToConfigLib( TQString& styleLib )
{
if( styleLib.startsWith( "kwin3_" ))
return "kwin_" + styleLib.mid( 6 ) + "_config";
@@ -586,7 +586,7 @@ QString KWinDecorationModule::styleToConfigLib( QString& styleLib )
return styleLib + "_config";
}
-QString KWinDecorationModule::quickHelp() const
+TQString KWinDecorationModule::quickHelp() const
{
return i18n( "<h1>Window Manager Decoration</h1>"
"<p>This module allows you to choose the window border decorations, "
@@ -602,7 +602,7 @@ QString KWinDecorationModule::quickHelp() const
void KWinDecorationModule::resetKWin()
{
bool ok = kapp->dcopClient()->send("kwin*", "KWinInterface",
- "reconfigure()", QByteArray());
+ "reconfigure()", TQByteArray());
if (!ok)
kdDebug() << "kcmkwindecoration: Could not reconfigure kwin" << endl;
}
diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.h b/kwin/kcmkwin/kwindecoration/kwindecoration.h
index eea091ebc..126f20fa9 100644
--- a/kwin/kcmkwin/kwindecoration/kwindecoration.h
+++ b/kwin/kcmkwin/kwindecoration/kwindecoration.h
@@ -53,8 +53,8 @@ class KDecorationPreview;
// Stores themeName and its corresponding library Name
struct DecorationInfo
{
- QString name;
- QString libraryName;
+ TQString name;
+ TQString libraryName;
};
@@ -63,14 +63,14 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface
Q_OBJECT
public:
- KWinDecorationModule(QWidget* parent, const char* name, const QStringList &);
+ KWinDecorationModule(TQWidget* parent, const char* name, const TQStringList &);
~KWinDecorationModule();
virtual void load();
virtual void save();
virtual void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
virtual void dcopUpdateClientList();
@@ -82,7 +82,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface
protected slots:
// Allows us to turn "save" on
void slotSelectionChanged();
- void slotChangeDecoration( const QString & );
+ void slotChangeDecoration( const TQString & );
void slotBorderChanged( int );
void slotButtonsChanged();
@@ -92,41 +92,41 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface
void findDecorations();
void createDecorationList();
void updateSelection();
- QString decorationLibName( const QString& name );
- QString decorationName ( QString& libName );
- static QString styleToConfigLib( QString& styleLib );
- void resetPlugin( KConfig* conf, const QString& currentDecoName = QString::null );
+ TQString decorationLibName( const TQString& name );
+ TQString decorationName ( TQString& libName );
+ static TQString styleToConfigLib( TQString& styleLib );
+ void resetPlugin( KConfig* conf, const TQString& currentDecoName = TQString::null );
void resetKWin();
void checkSupportedBorderSizes();
- static int borderSizeToIndex( BorderSize size, QValueList< BorderSize > sizes );
- static BorderSize indexToBorderSize( int index, QValueList< BorderSize > sizes );
+ static int borderSizeToIndex( BorderSize size, TQValueList< BorderSize > sizes );
+ static BorderSize indexToBorderSize( int index, TQValueList< BorderSize > sizes );
- QTabWidget* tabWidget;
+ TQTabWidget* tabWidget;
// Page 1
KComboBox* decorationList;
- QValueList<DecorationInfo> decorations;
+ TQValueList<DecorationInfo> decorations;
KDecorationPreview* preview;
KDecorationPlugins* plugins;
KConfig kwinConfig;
- QCheckBox* cbUseCustomButtonPositions;
- // QCheckBox* cbUseMiniWindows;
- QCheckBox* cbShowToolTips;
- QLabel* lBorder;
- QComboBox* cBorder;
+ TQCheckBox* cbUseCustomButtonPositions;
+ // TQCheckBox* cbUseMiniWindows;
+ TQCheckBox* cbShowToolTips;
+ TQLabel* lBorder;
+ TQComboBox* cBorder;
BorderSize border_size;
- QObject* pluginObject;
- QWidget* pluginConfigWidget;
- QString currentLibraryName;
- QString oldLibraryName;
- QObject* (*allocatePlugin)( KConfig* conf, QWidget* parent );
+ TQObject* pluginObject;
+ TQWidget* pluginConfigWidget;
+ TQString currentLibraryName;
+ TQString oldLibraryName;
+ TQObject* (*allocatePlugin)( KConfig* conf, TQWidget* parent );
// Page 2
ButtonPositionWidget *buttonPositionWidget;
- QVBox* buttonPage;
+ TQVBox* buttonPage;
};
diff --git a/kwin/kcmkwin/kwindecoration/preview.cpp b/kwin/kcmkwin/kwindecoration/preview.cpp
index 8c88a3604..c9a0174f4 100644
--- a/kwin/kcmkwin/kwindecoration/preview.cpp
+++ b/kwin/kcmkwin/kwindecoration/preview.cpp
@@ -23,8 +23,8 @@
#include <klocale.h>
#include <kconfig.h>
#include <kglobal.h>
-#include <qlabel.h>
-#include <qstyle.h>
+#include <tqlabel.h>
+#include <tqstyle.h>
#include <kiconloader.h>
#include <X11/Xlib.h>
@@ -35,8 +35,8 @@
// FRAME the preview doesn't update to reflect the changes done in the kcm
-KDecorationPreview::KDecorationPreview( QWidget* parent, const char* name )
- : QWidget( parent, name )
+KDecorationPreview::KDecorationPreview( TQWidget* parent, const char* name )
+ : TQWidget( parent, name )
{
options = new KDecorationPreviewOptions;
@@ -45,7 +45,7 @@ KDecorationPreview::KDecorationPreview( QWidget* parent, const char* name )
deco[Active] = deco[Inactive] = NULL;
- no_preview = new QLabel( i18n( "No preview available.\n"
+ no_preview = new TQLabel( i18n( "No preview available.\n"
"Most probably there\n"
"was a problem loading the plugin." ), this );
@@ -99,9 +99,9 @@ void KDecorationPreview::disablePreview()
no_preview->show();
}
-void KDecorationPreview::resizeEvent( QResizeEvent* e )
+void KDecorationPreview::resizeEvent( TQResizeEvent* e )
{
- QWidget::resizeEvent( e );
+ TQWidget::resizeEvent( e );
positionPreviews();
}
@@ -109,8 +109,8 @@ void KDecorationPreview::positionPreviews()
{
int titleBarHeight, leftBorder, rightBorder, xoffset,
dummy1, dummy2, dummy3;
- QRect geometry;
- QSize size;
+ TQRect geometry;
+ TQSize size;
no_preview->resize( this->size() );
@@ -122,25 +122,25 @@ void KDecorationPreview::positionPreviews()
deco[Inactive]->borders( leftBorder, rightBorder, dummy1, dummy2 );
titleBarHeight = kMin( int( titleBarHeight * .9 ), 30 );
- xoffset = kMin( kMax( 10, QApplication::reverseLayout()
+ xoffset = kMin( kMax( 10, TQApplication::reverseLayout()
? leftBorder : rightBorder ), 30 );
// Resize the active window
- size = QSize( width() - xoffset, height() - titleBarHeight )
+ size = TQSize( width() - xoffset, height() - titleBarHeight )
.expandedTo( deco[Active]->minimumSize() );
- geometry = QRect( QPoint( 0, titleBarHeight ), size );
- deco[Active]->widget()->setGeometry( QStyle::visualRect( geometry, this ) );
+ geometry = TQRect( TQPoint( 0, titleBarHeight ), size );
+ deco[Active]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) );
// Resize the inactive window
- size = QSize( width() - xoffset, height() - titleBarHeight )
+ size = TQSize( width() - xoffset, height() - titleBarHeight )
.expandedTo( deco[Inactive]->minimumSize() );
- geometry = QRect( QPoint( xoffset, 0 ), size );
- deco[Inactive]->widget()->setGeometry( QStyle::visualRect( geometry, this ) );
+ geometry = TQRect( TQPoint( xoffset, 0 ), size );
+ deco[Inactive]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) );
}
-void KDecorationPreview::setPreviewMask( const QRegion& reg, int mode, bool active )
+void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool active )
{
- QWidget *widget = active ? deco[Active]->widget() : deco[Inactive]->widget();
+ TQWidget *widget = active ? deco[Active]->widget() : deco[Inactive]->widget();
// FRAME duped from client.cpp
if( mode == Unsorted )
@@ -150,7 +150,7 @@ void KDecorationPreview::setPreviewMask( const QRegion& reg, int mode, bool acti
}
else
{
- QMemArray< QRect > rects = reg.rects();
+ TQMemArray< TQRect > rects = reg.rects();
XRectangle* xrects = new XRectangle[ rects.count() ];
for( unsigned int i = 0;
i < rects.count();
@@ -169,9 +169,9 @@ void KDecorationPreview::setPreviewMask( const QRegion& reg, int mode, bool acti
mask = reg; // keep shape of the active window for unobscuredRegion()
}
-QRect KDecorationPreview::windowGeometry( bool active ) const
+TQRect KDecorationPreview::windowGeometry( bool active ) const
{
- QWidget *widget = active ? deco[Active]->widget() : deco[Inactive]->widget();
+ TQWidget *widget = active ? deco[Active]->widget() : deco[Inactive]->widget();
return widget->geometry();
}
@@ -190,7 +190,7 @@ void KDecorationPreview::setTempBorderSize(KDecorationPlugins* plugin, KDecorati
}
}
-void KDecorationPreview::setTempButtons(KDecorationPlugins* plugin, bool customEnabled, const QString &left, const QString &right)
+void KDecorationPreview::setTempButtons(KDecorationPlugins* plugin, bool customEnabled, const TQString &left, const TQString &right)
{
options->setCustomTitleButtonsEnabled(customEnabled);
options->setCustomTitleButtons(left, right);
@@ -206,17 +206,17 @@ void KDecorationPreview::setTempButtons(KDecorationPlugins* plugin, bool customE
}
}
-QRegion KDecorationPreview::unobscuredRegion( bool active, const QRegion& r ) const
+TQRegion KDecorationPreview::unobscuredRegion( bool active, const TQRegion& r ) const
{
if( active ) // this one is not obscured
return r;
else
{
// copied from KWin core's code
- QRegion ret = r;
- QRegion r2 = mask;
+ TQRegion ret = r;
+ TQRegion r2 = mask;
if( r2.isEmpty())
- r2 = QRegion( windowGeometry( true ));
+ r2 = TQRegion( windowGeometry( true ));
r2.translate( windowGeometry( true ).x() - windowGeometry( false ).x(),
windowGeometry( true ).y() - windowGeometry( false ).y());
ret -= r2;
@@ -229,7 +229,7 @@ KDecorationPreviewBridge::KDecorationPreviewBridge( KDecorationPreview* p, bool
{
}
-QWidget* KDecorationPreviewBridge::initialParentWidget() const
+TQWidget* KDecorationPreviewBridge::initialParentWidget() const
{
return preview;
}
@@ -319,26 +319,26 @@ NET::WindowType KDecorationPreviewBridge::windowType( unsigned long ) const
return NET::Normal;
}
-QIconSet KDecorationPreviewBridge::icon() const
+TQIconSet KDecorationPreviewBridge::icon() const
{
- return QIconSet( KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 16 ),
+ return TQIconSet( KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 16 ),
KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 32 ));
}
-QString KDecorationPreviewBridge::caption() const
+TQString KDecorationPreviewBridge::caption() const
{
return active ? i18n( "Active Window" ) : i18n( "Inactive Window" );
}
-void KDecorationPreviewBridge::processMousePressEvent( QMouseEvent* )
+void KDecorationPreviewBridge::processMousePressEvent( TQMouseEvent* )
{
}
-void KDecorationPreviewBridge::showWindowMenu( const QRect &)
+void KDecorationPreviewBridge::showWindowMenu( const TQRect &)
{
}
-void KDecorationPreviewBridge::showWindowMenu( QPoint )
+void KDecorationPreviewBridge::showWindowMenu( TQPoint )
{
}
@@ -346,7 +346,7 @@ void KDecorationPreviewBridge::performWindowOperation( WindowOperation )
{
}
-void KDecorationPreviewBridge::setMask( const QRegion& reg, int mode )
+void KDecorationPreviewBridge::setMask( const TQRegion& reg, int mode )
{
preview->setPreviewMask( reg, mode, active );
}
@@ -356,22 +356,22 @@ bool KDecorationPreviewBridge::isPreview() const
return true;
}
-QRect KDecorationPreviewBridge::geometry() const
+TQRect KDecorationPreviewBridge::geometry() const
{
return preview->windowGeometry( active );
}
-QRect KDecorationPreviewBridge::iconGeometry() const
+TQRect KDecorationPreviewBridge::iconGeometry() const
{
- return QRect();
+ return TQRect();
}
-QRegion KDecorationPreviewBridge::unobscuredRegion( const QRegion& r ) const
+TQRegion KDecorationPreviewBridge::unobscuredRegion( const TQRegion& r ) const
{
return preview->unobscuredRegion( active, r );
}
-QWidget* KDecorationPreviewBridge::workspaceWidget() const
+TQWidget* KDecorationPreviewBridge::workspaceWidget() const
{
return preview;
}
@@ -439,8 +439,8 @@ KDecorationPreviewOptions::KDecorationPreviewOptions()
customBorderSize = BordersCount; // invalid
customButtonsChanged = false; // invalid
customButtons = true;
- customTitleButtonsLeft = QString::null; // invalid
- customTitleButtonsRight = QString::null; // invalid
+ customTitleButtonsLeft = TQString::null; // invalid
+ customTitleButtonsRight = TQString::null; // invalid
d = new KDecorationOptionsPrivate;
d->defaultKWinSettings();
@@ -491,7 +491,7 @@ void KDecorationPreviewOptions::setCustomTitleButtonsEnabled(bool enabled)
updateSettings();
}
-void KDecorationPreviewOptions::setCustomTitleButtons(const QString &left, const QString &right)
+void KDecorationPreviewOptions::setCustomTitleButtons(const TQString &left, const TQString &right)
{
customTitleButtonsLeft = left;
customTitleButtonsRight = right;
diff --git a/kwin/kcmkwin/kwindecoration/preview.h b/kwin/kcmkwin/kwindecoration/preview.h
index 1c1943486..a7f50d682 100644
--- a/kwin/kcmkwin/kwindecoration/preview.h
+++ b/kwin/kcmkwin/kwindecoration/preview.h
@@ -20,7 +20,7 @@
#ifndef KWINDECORATION_PREVIEW_H
#define KWINDECORATION_PREVIEW_H
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kdecoration_p.h>
#include <kdecoration_plugins_p.h>
@@ -39,25 +39,25 @@ class KDecorationPreview
// and an inactive window.
enum Windows { Inactive = 0, Active, NumWindows };
- KDecorationPreview( QWidget* parent = NULL, const char* name = NULL );
+ KDecorationPreview( TQWidget* parent = NULL, const char* name = NULL );
virtual ~KDecorationPreview();
bool recreateDecoration( KDecorationPlugins* plugin );
void enablePreview();
void disablePreview();
- void setPreviewMask( const QRegion&, int, bool );
- QRegion unobscuredRegion( bool, const QRegion& ) const;
- QRect windowGeometry( bool ) const;
+ void setPreviewMask( const TQRegion&, int, bool );
+ TQRegion unobscuredRegion( bool, const TQRegion& ) const;
+ TQRect windowGeometry( bool ) const;
void setTempBorderSize(KDecorationPlugins* plugin, KDecorationDefines::BorderSize size);
- void setTempButtons(KDecorationPlugins* plugin, bool customEnabled, const QString &left, const QString &right);
+ void setTempButtons(KDecorationPlugins* plugin, bool customEnabled, const TQString &left, const TQString &right);
protected:
- virtual void resizeEvent( QResizeEvent* );
+ virtual void resizeEvent( TQResizeEvent* );
private:
void positionPreviews();
KDecorationPreviewOptions* options;
KDecorationPreviewBridge* bridge[NumWindows];
KDecoration* deco[NumWindows];
- QLabel* no_preview;
- QRegion mask;
+ TQLabel* no_preview;
+ TQRegion mask;
};
class KDecorationPreviewBridge
@@ -81,18 +81,18 @@ class KDecorationPreviewBridge
virtual bool isMovable() const;
virtual bool isResizable() const;
virtual NET::WindowType windowType( unsigned long supported_types ) const;
- virtual QIconSet icon() const;
- virtual QString caption() const;
- virtual void processMousePressEvent( QMouseEvent* );
- virtual void showWindowMenu( const QRect &);
- virtual void showWindowMenu( QPoint );
+ virtual TQIconSet icon() const;
+ virtual TQString caption() const;
+ virtual void processMousePressEvent( TQMouseEvent* );
+ virtual void showWindowMenu( const TQRect &);
+ virtual void showWindowMenu( TQPoint );
virtual void performWindowOperation( WindowOperation );
- virtual void setMask( const QRegion&, int );
+ virtual void setMask( const TQRegion&, int );
virtual bool isPreview() const;
- virtual QRect geometry() const;
- virtual QRect iconGeometry() const;
- virtual QRegion unobscuredRegion( const QRegion& r ) const;
- virtual QWidget* workspaceWidget() const;
+ virtual TQRect geometry() const;
+ virtual TQRect iconGeometry() const;
+ virtual TQRegion unobscuredRegion( const TQRegion& r ) const;
+ virtual TQWidget* workspaceWidget() const;
virtual WId windowId() const;
virtual void closeWindow();
virtual void maximize( MaximizeMode mode );
@@ -105,7 +105,7 @@ class KDecorationPreviewBridge
virtual void setKeepAbove( bool );
virtual void setKeepBelow( bool );
virtual int currentDesktop() const;
- virtual QWidget* initialParentWidget() const;
+ virtual TQWidget* initialParentWidget() const;
virtual Qt::WFlags initialWFlags() const;
virtual void helperShowHide( bool show );
virtual void grabXServer( bool grab );
@@ -124,14 +124,14 @@ class KDecorationPreviewOptions
void setCustomBorderSize(BorderSize size);
void setCustomTitleButtonsEnabled(bool enabled);
- void setCustomTitleButtons(const QString &left, const QString &right);
+ void setCustomTitleButtons(const TQString &left, const TQString &right);
private:
BorderSize customBorderSize;
bool customButtonsChanged;
bool customButtons;
- QString customTitleButtonsLeft;
- QString customTitleButtonsRight;
+ TQString customTitleButtonsLeft;
+ TQString customTitleButtonsRight;
};
class KDecorationPreviewPlugins
diff --git a/kwin/kcmkwin/kwinoptions/main.cpp b/kwin/kcmkwin/kwinoptions/main.cpp
index fbc70e4c8..ac19a5d30 100644
--- a/kwin/kcmkwin/kwinoptions/main.cpp
+++ b/kwin/kcmkwin/kwinoptions/main.cpp
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlayout.h>
+#include <tqlayout.h>
#include <dcopclient.h>
@@ -36,7 +36,7 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kwinfocus(QWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_kwinfocus(TQWidget *parent, const char *name)
{
//CT there's need for decision: kwm or kwin?
KGlobal::locale()->insertCatalogue("kcmkwm");
@@ -44,14 +44,14 @@ extern "C"
return new KFocusConfig(true, c, parent, name);
}
- KDE_EXPORT KCModule *create_kwinactions(QWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_kwinactions(TQWidget *parent, const char *name)
{
//CT there's need for decision: kwm or kwin?
KGlobal::locale()->insertCatalogue("kcmkwm");
return new KActionsOptions( parent, name);
}
- KDE_EXPORT KCModule *create_kwinmoving(QWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_kwinmoving(TQWidget *parent, const char *name)
{
//CT there's need for decision: kwm or kwin?
KGlobal::locale()->insertCatalogue("kcmkwm");
@@ -59,7 +59,7 @@ extern "C"
return new KMovingConfig(true, c, parent, name);
}
- KDE_EXPORT KCModule *create_kwinadvanced(QWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_kwinadvanced(TQWidget *parent, const char *name)
{
//CT there's need for decision: kwm or kwin?
KGlobal::locale()->insertCatalogue("kcmkwm");
@@ -67,7 +67,7 @@ extern "C"
return new KAdvancedConfig(true, c, parent, name);
}
- KDE_EXPORT KCModule *create_kwintranslucency(QWidget *parent, const char *name)
+ KDE_EXPORT KCModule *create_kwintranslucency(TQWidget *parent, const char *name)
{
//CT there's need for decision: kwm or kwin?
KGlobal::locale()->insertCatalogue("kcmkwm");
@@ -75,7 +75,7 @@ extern "C"
return new KTranslucencyConfig(true, c, parent, name);
}
- KDE_EXPORT KCModule *create_kwinoptions ( QWidget *parent, const char* name)
+ KDE_EXPORT KCModule *create_kwinoptions ( TQWidget *parent, const char* name)
{
//CT there's need for decision: kwm or kwin?
KGlobal::locale()->insertCatalogue("kcmkwm");
@@ -83,44 +83,44 @@ extern "C"
}
}
-KWinOptions::KWinOptions(QWidget *parent, const char *name)
+KWinOptions::KWinOptions(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
mConfig = new KConfig("kwinrc", false, true);
- QVBoxLayout *layout = new QVBoxLayout(this);
- tab = new QTabWidget(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
+ tab = new TQTabWidget(this);
layout->addWidget(tab);
mFocus = new KFocusConfig(false, mConfig, this, "KWin Focus Config");
mFocus->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mFocus, i18n("&Focus"));
- connect(mFocus, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
+ connect(mFocus, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "KWin TitleBar Actions");
mTitleBarActions->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mTitleBarActions, i18n("&Titlebar Actions"));
- connect(mTitleBarActions, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
+ connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
mWindowActions = new KWindowActionsConfig(false, mConfig, this, "KWin Window Actions");
mWindowActions->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mWindowActions, i18n("Window Actio&ns"));
- connect(mWindowActions, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
+ connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
mMoving = new KMovingConfig(false, mConfig, this, "KWin Moving");
mMoving->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mMoving, i18n("&Moving"));
- connect(mMoving, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
+ connect(mMoving, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
mAdvanced = new KAdvancedConfig(false, mConfig, this, "KWin Advanced");
mAdvanced->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mAdvanced, i18n("Ad&vanced"));
- connect(mAdvanced, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
+ connect(mAdvanced, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
mTranslucency = new KTranslucencyConfig(false, mConfig, this, "KWin Translucency");
mTranslucency->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mTranslucency, i18n("&Translucency"));
- connect(mTranslucency, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
+ connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
KAboutData *about =
new KAboutData(I18N_NOOP("kcmkwinoptions"), I18N_NOOP("Window Behavior Configuration Module"),
@@ -185,7 +185,7 @@ void KWinOptions::defaults()
mTranslucency->defaults();
}
-QString KWinOptions::quickHelp() const
+TQString KWinOptions::quickHelp() const
{
return i18n("<h1>Window Behavior</h1> Here you can customize the way windows behave when being"
" moved, resized or clicked on. You can also specify a focus policy as well as a placement"
@@ -201,24 +201,24 @@ void KWinOptions::moduleChanged(bool state)
}
-KActionsOptions::KActionsOptions(QWidget *parent, const char *name)
+KActionsOptions::KActionsOptions(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
mConfig = new KConfig("kwinrc", false, true);
- QVBoxLayout *layout = new QVBoxLayout(this);
- tab = new QTabWidget(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
+ tab = new TQTabWidget(this);
layout->addWidget(tab);
mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "KWin TitleBar Actions");
mTitleBarActions->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mTitleBarActions, i18n("&Titlebar Actions"));
- connect(mTitleBarActions, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
+ connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
mWindowActions = new KWindowActionsConfig(false, mConfig, this, "KWin Window Actions");
mWindowActions->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mWindowActions, i18n("Window Actio&ns"));
- connect(mWindowActions, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
+ connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
}
KActionsOptions::~KActionsOptions()
diff --git a/kwin/kcmkwin/kwinoptions/main.h b/kwin/kcmkwin/kwinoptions/main.h
index e8591c13f..2465c6766 100644
--- a/kwin/kcmkwin/kwinoptions/main.h
+++ b/kwin/kcmkwin/kwinoptions/main.h
@@ -25,7 +25,7 @@
#ifndef __MAIN_H__
#define __MAIN_H__
-#include <qtabwidget.h>
+#include <tqtabwidget.h>
#include <kcmodule.h>
class KConfig;
@@ -41,13 +41,13 @@ class KWinOptions : public KCModule
public:
- KWinOptions(QWidget *parent, const char *name);
+ KWinOptions(TQWidget *parent, const char *name);
virtual ~KWinOptions();
void load();
void save();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
protected slots:
@@ -57,7 +57,7 @@ protected slots:
private:
- QTabWidget *tab;
+ TQTabWidget *tab;
KFocusConfig *mFocus;
KTitleBarActionsConfig *mTitleBarActions;
@@ -75,7 +75,7 @@ class KActionsOptions : public KCModule
public:
- KActionsOptions(QWidget *parent, const char *name);
+ KActionsOptions(TQWidget *parent, const char *name);
virtual ~KActionsOptions();
void load();
@@ -89,7 +89,7 @@ protected slots:
private:
- QTabWidget *tab;
+ TQTabWidget *tab;
KTitleBarActionsConfig *mTitleBarActions;
KWindowActionsConfig *mWindowActions;
diff --git a/kwin/kcmkwin/kwinoptions/mouse.cpp b/kwin/kcmkwin/kwinoptions/mouse.cpp
index f220bbfa9..6adba1f89 100644
--- a/kwin/kcmkwin/kwinoptions/mouse.cpp
+++ b/kwin/kcmkwin/kwinoptions/mouse.cpp
@@ -17,16 +17,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qcombobox.h>
-#include <qwhatsthis.h>
-#include <qlayout.h>
-#include <qvgroupbox.h>
-#include <qgrid.h>
-#include <qsizepolicy.h>
-#include <qbitmap.h>
-#include <qhgroupbox.h>
-#include <qtooltip.h>
+#include <tqlabel.h>
+#include <tqcombobox.h>
+#include <tqwhatsthis.h>
+#include <tqlayout.h>
+#include <tqvgroupbox.h>
+#include <tqgrid.h>
+#include <tqsizepolicy.h>
+#include <tqbitmap.h>
+#include <tqhgroupbox.h>
+#include <tqtooltip.h>
#include <dcopclient.h>
#include <klocale.h>
@@ -60,7 +60,7 @@ char const * const tbl_Max[] = {
"Maximize (horizontal only)",
"" };
-QPixmap maxButtonPixmaps[3];
+TQPixmap maxButtonPixmaps[3];
void createMaxButtonPixmaps()
{
@@ -109,14 +109,14 @@ void createMaxButtonPixmaps()
"..............."},
};
- QString baseColor(". c " + KGlobalSettings::baseColor().name());
- QString textColor("# c " + KGlobalSettings::textColor().name());
+ TQString baseColor(". c " + KGlobalSettings::baseColor().name());
+ TQString textColor("# c " + KGlobalSettings::textColor().name());
for (int t = 0; t < 3; ++t)
{
maxButtonXpms[t][0] = "15 13 2 1";
maxButtonXpms[t][1] = baseColor.ascii();
maxButtonXpms[t][2] = textColor.ascii();
- maxButtonPixmaps[t] = QPixmap(maxButtonXpms[t]);
+ maxButtonPixmaps[t] = TQPixmap(maxButtonXpms[t]);
maxButtonPixmaps[t].setMask(maxButtonPixmaps[t].createHeuristicMask());
}
}
@@ -132,29 +132,29 @@ void KTitleBarActionsConfig::paletteChanged()
}
-KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_config, QWidget * parent, const char *)
+KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_config, TQWidget * parent, const char *)
: KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
- QString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3;
- QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint());
- QGrid *grid;
- QGroupBox *box;
- QLabel *label;
- QString strMouseButton1, strMouseButton3, strMouseWheel;
- QString txtButton1, txtButton3, txtButton4;
- QStringList items;
+ TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3;
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ TQGrid *grid;
+ TQGroupBox *box;
+ TQLabel *label;
+ TQString strMouseButton1, strMouseButton3, strMouseWheel;
+ TQString txtButton1, txtButton3, txtButton4;
+ TQStringList items;
bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded);
/** Titlebar doubleclick ************/
- QHBoxLayout *hlayout = new QHBoxLayout(layout);
+ TQHBoxLayout *hlayout = new TQHBoxLayout(layout);
- label = new QLabel(i18n("&Titlebar double-click:"), this);
+ label = new TQLabel(i18n("&Titlebar double-click:"), this);
hlayout->addWidget(label);
- QWhatsThis::add( label, i18n("Here you can customize mouse click behavior when double clicking on the"
+ TQWhatsThis::add( label, i18n("Here you can customize mouse click behavior when double clicking on the"
" titlebar of a window.") );
- QComboBox* combo = new QComboBox(this);
+ TQComboBox* combo = new TQComboBox(this);
combo->insertItem(i18n("Maximize"));
combo->insertItem(i18n("Maximize (vertical only)"));
combo->insertItem(i18n("Maximize (horizontal only)"));
@@ -163,24 +163,24 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
combo->insertItem(i18n("Lower"));
combo->insertItem(i18n("On All Desktops"));
combo->insertItem(i18n("Nothing"));
- combo->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed));
- connect(combo, SIGNAL(activated(int)), SLOT(changed()));
+ combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
+ connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
hlayout->addWidget(combo);
coTiDbl = combo;
- QWhatsThis::add(combo, i18n("Behavior on <em>double</em> click into the titlebar."));
+ TQWhatsThis::add(combo, i18n("Behavior on <em>double</em> click into the titlebar."));
label->setBuddy(combo);
/** Mouse Wheel Events **************/
- QHBoxLayout *hlayoutW = new QHBoxLayout(layout);
+ TQHBoxLayout *hlayoutW = new TQHBoxLayout(layout);
strMouseWheel = i18n("Titlebar wheel event:");
- label = new QLabel(strMouseWheel, this);
+ label = new TQLabel(strMouseWheel, this);
hlayoutW->addWidget(label);
txtButton4 = i18n("Handle mouse wheel events");
- QWhatsThis::add( label, txtButton4);
+ TQWhatsThis::add( label, txtButton4);
// Titlebar and frame mouse Wheel
- QComboBox* comboW = new QComboBox(this);
+ TQComboBox* comboW = new TQComboBox(this);
comboW->insertItem(i18n("Raise/Lower"));
comboW->insertItem(i18n("Shade/Unshade"));
comboW->insertItem(i18n("Maximize/Restore"));
@@ -188,26 +188,26 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
comboW->insertItem(i18n("Move to Previous/Next Desktop"));
comboW->insertItem(i18n("Change Opacity"));
comboW->insertItem(i18n("Nothing"));
- comboW->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed));
- connect(comboW, SIGNAL(activated(int)), SLOT(changed()));
+ comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
+ connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
hlayoutW->addWidget(comboW);
coTiAct4 = comboW;
- QWhatsThis::add(comboW, txtButton4);
+ TQWhatsThis::add(comboW, txtButton4);
label->setBuddy(comboW);
/** Titlebar and frame **************/
- box = new QVGroupBox( i18n("Titlebar && Frame"), this, "Titlebar and Frame");
+ box = new TQVGroupBox( i18n("Titlebar && Frame"), this, "Titlebar and Frame");
box->layout()->setMargin(KDialog::marginHint());
box->layout()->setSpacing(KDialog::spacingHint());
layout->addWidget(box);
- QWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on the"
+ TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on the"
" titlebar or the frame of a window.") );
- grid = new QGrid(4, Qt::Vertical, box);
+ grid = new TQGrid(4, Qt::Vertical, box);
- new QLabel(grid); // dummy
+ new TQLabel(grid); // dummy
strMouseButton1 = i18n("Left button:");
txtButton1 = i18n("In this row you can customize left click behavior when clicking into"
@@ -223,30 +223,30 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
qSwap(txtButton1, txtButton3);
}
- label = new QLabel(strMouseButton1, grid);
- QWhatsThis::add( label, txtButton1);
+ label = new TQLabel(strMouseButton1, grid);
+ TQWhatsThis::add( label, txtButton1);
- label = new QLabel(i18n("Middle button:"), grid);
- QWhatsThis::add( label, i18n("In this row you can customize middle click behavior when clicking into"
+ label = new TQLabel(i18n("Middle button:"), grid);
+ TQWhatsThis::add( label, i18n("In this row you can customize middle click behavior when clicking into"
" the titlebar or the frame.") );
- label = new QLabel(strMouseButton3, grid);
- QWhatsThis::add( label, txtButton3);
+ label = new TQLabel(strMouseButton3, grid);
+ TQWhatsThis::add( label, txtButton3);
- label = new QLabel(i18n("Active"), grid);
+ label = new TQLabel(i18n("Active"), grid);
label->setAlignment(AlignCenter);
- QWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar"
+ TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar"
" or the frame of an active window.") );
// Titlebar and frame, active, mouse button 1
- combo = new QComboBox(grid);
+ combo = new TQComboBox(grid);
combo->insertItem(i18n("Raise"));
combo->insertItem(i18n("Lower"));
combo->insertItem(i18n("Operations Menu"));
combo->insertItem(i18n("Toggle Raise & Lower"));
combo->insertItem(i18n("Nothing"));
- connect(combo, SIGNAL(activated(int)), SLOT(changed()));
+ connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
coTiAct1 = combo;
txtButton1 = i18n("Behavior on <em>left</em> click into the titlebar or frame of an "
@@ -258,7 +258,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
// Be nice to left handed users
if ( leftHandedMouse ) qSwap(txtButton1, txtButton3);
- QWhatsThis::add(combo, txtButton1);
+ TQWhatsThis::add(combo, txtButton1);
// Titlebar and frame, active, mouse button 2
@@ -269,18 +269,18 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
<< i18n("Nothing")
<< i18n("Shade");
- combo = new QComboBox(grid);
+ combo = new TQComboBox(grid);
combo->insertStringList(items);
- connect(combo, SIGNAL(activated(int)), SLOT(changed()));
+ connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
coTiAct2 = combo;
- QWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>active</em> window."));
+ TQWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>active</em> window."));
// Titlebar and frame, active, mouse button 3
- combo = new QComboBox(grid);
+ combo = new TQComboBox(grid);
combo->insertStringList(items);
- connect(combo, SIGNAL(activated(int)), SLOT(changed()));
+ connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
coTiAct3 = combo;
- QWhatsThis::add(combo, txtButton3 );
+ TQWhatsThis::add(combo, txtButton3 );
txtButton1 = i18n("Behavior on <em>left</em> click into the titlebar or frame of an "
"<em>inactive</em> window.");
@@ -291,9 +291,9 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
// Be nice to left handed users
if ( leftHandedMouse ) qSwap(txtButton1, txtButton3);
- label = new QLabel(i18n("Inactive"), grid);
+ label = new TQLabel(i18n("Inactive"), grid);
label->setAlignment(AlignCenter);
- QWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar"
+ TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar"
" or the frame of an inactive window.") );
items.clear();
@@ -306,39 +306,39 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
<< i18n("Lower")
<< i18n("Nothing");
- combo = new QComboBox(grid);
+ combo = new TQComboBox(grid);
combo->insertStringList(items);
- connect(combo, SIGNAL(activated(int)), SLOT(changed()));
+ connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
coTiInAct1 = combo;
- QWhatsThis::add(combo, txtButton1);
+ TQWhatsThis::add(combo, txtButton1);
- combo = new QComboBox(grid);
+ combo = new TQComboBox(grid);
combo->insertStringList(items);
- connect(combo, SIGNAL(activated(int)), SLOT(changed()));
+ connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
coTiInAct2 = combo;
- QWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>inactive</em> window."));
+ TQWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>inactive</em> window."));
- combo = new QComboBox(grid);
+ combo = new TQComboBox(grid);
combo->insertStringList(items);
- connect(combo, SIGNAL(activated(int)), SLOT(changed()));
+ connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
coTiInAct3 = combo;
- QWhatsThis::add(combo, txtButton3);
+ TQWhatsThis::add(combo, txtButton3);
/** Maximize Button ******************/
- box = new QHGroupBox(i18n("Maximize Button"), this, "Maximize Button");
+ box = new TQHGroupBox(i18n("Maximize Button"), this, "Maximize Button");
box->layout()->setMargin(KDialog::marginHint());
box->layout()->setSpacing(KDialog::spacingHint());
layout->addWidget(box);
- QWhatsThis::add( box,
+ TQWhatsThis::add( box,
i18n("Here you can customize behavior when clicking on the maximize button.") );
- QString strMouseButton[] = {
+ TQString strMouseButton[] = {
i18n("Left button:"),
i18n("Middle button:"),
i18n("Right button:")};
- QString txtButton[] = {
+ TQString txtButton[] = {
i18n("Behavior on <em>left</em> click onto the maximize button." ),
i18n("Behavior on <em>middle</em> click onto the maximize button." ),
i18n("Behavior on <em>right</em> click onto the maximize button." )};
@@ -352,21 +352,21 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
createMaxButtonPixmaps();
for (int b = 0; b < 3; ++b)
{
- if (b != 0) new QWidget(box); // Spacer
+ if (b != 0) new TQWidget(box); // Spacer
- QLabel * label = new QLabel(strMouseButton[b], box);
- QWhatsThis::add( label, txtButton[b] );
- label ->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Minimum ));
+ TQLabel * label = new TQLabel(strMouseButton[b], box);
+ TQWhatsThis::add( label, txtButton[b] );
+ label ->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
coMax[b] = new ToolTipComboBox(box, tbl_Max);
for (int t = 0; t < 3; ++t) coMax[b]->insertItem(maxButtonPixmaps[t]);
- connect(coMax[b], SIGNAL(activated(int)), SLOT(changed()));
- connect(coMax[b], SIGNAL(activated(int)), coMax[b], SLOT(changed()));
- QWhatsThis::add( coMax[b], txtButton[b] );
- coMax[b]->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Minimum ));
+ connect(coMax[b], TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+ connect(coMax[b], TQT_SIGNAL(activated(int)), coMax[b], TQT_SLOT(changed()));
+ TQWhatsThis::add( coMax[b], txtButton[b] );
+ coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
}
- connect(kapp, SIGNAL(kdisplayPaletteChanged()), SLOT(paletteChanged()));
+ connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
layout->addStretch();
@@ -483,7 +483,7 @@ static int tbl_txt_lookup( const char* const arr[], const char* txt )
return 0;
}
-void KTitleBarActionsConfig::setComboText( QComboBox* combo, const char*txt )
+void KTitleBarActionsConfig::setComboText( TQComboBox* combo, const char*txt )
{
if( combo == coTiDbl )
combo->setCurrentItem( tbl_txt_lookup( tbl_TiDbl, txt ));
@@ -584,29 +584,29 @@ void KTitleBarActionsConfig::defaults()
}
-KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, QWidget * parent, const char *)
+KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, TQWidget * parent, const char *)
: KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
- QString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3, strAllW;
- QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint());
- QGrid *grid;
- QGroupBox *box;
- QLabel *label;
- QString strMouseButton1, strMouseButton3;
- QString txtButton1, txtButton3;
- QStringList items;
+ TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3, strAllW;
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ TQGrid *grid;
+ TQGroupBox *box;
+ TQLabel *label;
+ TQString strMouseButton1, strMouseButton3;
+ TQString txtButton1, txtButton3;
+ TQStringList items;
bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded);
/** Inactive inner window ******************/
- box = new QVGroupBox(i18n("Inactive Inner Window"), this, "Inactive Inner Window");
+ box = new TQVGroupBox(i18n("Inactive Inner Window"), this, "Inactive Inner Window");
box->layout()->setMargin(KDialog::marginHint());
box->layout()->setSpacing(KDialog::spacingHint());
layout->addWidget(box);
- QWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on an inactive"
+ TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on an inactive"
" inner window ('inner' means: not titlebar, not frame).") );
- grid = new QGrid(3, Qt::Vertical, box);
+ grid = new TQGrid(3, Qt::Vertical, box);
strMouseButton1 = i18n("Left button:");
txtButton1 = i18n("In this row you can customize left click behavior when clicking into"
@@ -631,16 +631,16 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
// Be nice to lefties
if ( leftHandedMouse ) qSwap(strWin1, strWin3);
- label = new QLabel(strMouseButton1, grid);
- QWhatsThis::add( label, strWin1 );
+ label = new TQLabel(strMouseButton1, grid);
+ TQWhatsThis::add( label, strWin1 );
- label = new QLabel(i18n("Middle button:"), grid);
+ label = new TQLabel(i18n("Middle button:"), grid);
strWin2 = i18n("In this row you can customize middle click behavior when clicking into"
" an inactive inner window ('inner' means: not titlebar, not frame).");
- QWhatsThis::add( label, strWin2 );
+ TQWhatsThis::add( label, strWin2 );
- label = new QLabel(strMouseButton3, grid);
- QWhatsThis::add( label, strWin3 );
+ label = new TQLabel(strMouseButton3, grid);
+ TQWhatsThis::add( label, strWin3 );
items.clear();
items << i18n("Activate, Raise & Pass Click")
@@ -648,42 +648,42 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
<< i18n("Activate")
<< i18n("Activate & Raise");
- QComboBox* combo = new QComboBox(grid);
+ TQComboBox* combo = new TQComboBox(grid);
combo->insertStringList(items);
- connect(combo, SIGNAL(activated(int)), SLOT(changed()));
+ connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
coWin1 = combo;
- QWhatsThis::add( combo, strWin1 );
+ TQWhatsThis::add( combo, strWin1 );
- combo = new QComboBox(grid);
+ combo = new TQComboBox(grid);
combo->insertStringList(items);
- connect(combo, SIGNAL(activated(int)), SLOT(changed()));
+ connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
coWin2 = combo;
- QWhatsThis::add( combo, strWin2 );
+ TQWhatsThis::add( combo, strWin2 );
- combo = new QComboBox(grid);
+ combo = new TQComboBox(grid);
combo->insertStringList(items);
- connect(combo, SIGNAL(activated(int)), SLOT(changed()));
+ connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
coWin3 = combo;
- QWhatsThis::add( combo, strWin3 );
+ TQWhatsThis::add( combo, strWin3 );
/** Inner window, titlebar and frame **************/
- box = new QVGroupBox(i18n("Inner Window, Titlebar && Frame"), this, "Inner Window, Titlebar and Frame");
+ box = new TQVGroupBox(i18n("Inner Window, Titlebar && Frame"), this, "Inner Window, Titlebar and Frame");
box->layout()->setMargin(KDialog::marginHint());
box->layout()->setSpacing(KDialog::spacingHint());
layout->addWidget(box);
- QWhatsThis::add( box, i18n("Here you can customize KDE's behavior when clicking somewhere into"
+ TQWhatsThis::add( box, i18n("Here you can customize KDE's behavior when clicking somewhere into"
" a window while pressing a modifier key."));
- grid = new QGrid(5, Qt::Vertical, box);
+ grid = new TQGrid(5, Qt::Vertical, box);
// Labels
- label = new QLabel(i18n("Modifier key:"), grid);
+ label = new TQLabel(i18n("Modifier key:"), grid);
strAllKey = i18n("Here you select whether holding the Meta key or Alt key "
"will allow you to perform the following actions.");
- QWhatsThis::add( label, strAllKey );
+ TQWhatsThis::add( label, strAllKey );
strMouseButton1 = i18n("Modifier key + left button:");
@@ -700,29 +700,29 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
qSwap(strAll1, strAll3);
}
- label = new QLabel(strMouseButton1, grid);
- QWhatsThis::add( label, strAll1);
+ label = new TQLabel(strMouseButton1, grid);
+ TQWhatsThis::add( label, strAll1);
- label = new QLabel(i18n("Modifier key + middle button:"), grid);
+ label = new TQLabel(i18n("Modifier key + middle button:"), grid);
strAll2 = i18n("Here you can customize KDE's behavior when middle clicking into a window"
" while pressing the modifier key.");
- QWhatsThis::add( label, strAll2 );
+ TQWhatsThis::add( label, strAll2 );
- label = new QLabel(strMouseButton3, grid);
- QWhatsThis::add( label, strAll3);
+ label = new TQLabel(strMouseButton3, grid);
+ TQWhatsThis::add( label, strAll3);
- label = new QLabel(i18n("Modifier key + mouse wheel:"), grid);
+ label = new TQLabel(i18n("Modifier key + mouse wheel:"), grid);
strAllW = i18n("Here you can customize KDE's behavior when scrolling with the mouse wheel"
" in a window while pressing the modifier key.");
- QWhatsThis::add( label, strAllW);
+ TQWhatsThis::add( label, strAllW);
// Combo's
- combo = new QComboBox(grid);
+ combo = new TQComboBox(grid);
combo->insertItem(i18n("Meta"));
combo->insertItem(i18n("Alt"));
- connect(combo, SIGNAL(activated(int)), SLOT(changed()));
+ connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
coAllKey = combo;
- QWhatsThis::add( combo, strAllKey );
+ TQWhatsThis::add( combo, strAllKey );
items.clear();
items << i18n("Move")
@@ -734,25 +734,25 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
<< i18n("Minimize")
<< i18n("Nothing");
- combo = new QComboBox(grid);
+ combo = new TQComboBox(grid);
combo->insertStringList(items);
- connect(combo, SIGNAL(activated(int)), SLOT(changed()));
+ connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
coAll1 = combo;
- QWhatsThis::add( combo, strAll1 );
+ TQWhatsThis::add( combo, strAll1 );
- combo = new QComboBox(grid);
+ combo = new TQComboBox(grid);
combo->insertStringList(items);
- connect(combo, SIGNAL(activated(int)), SLOT(changed()));
+ connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
coAll2 = combo;
- QWhatsThis::add( combo, strAll2 );
+ TQWhatsThis::add( combo, strAll2 );
- combo = new QComboBox(grid);
+ combo = new TQComboBox(grid);
combo->insertStringList(items);
- connect(combo, SIGNAL(activated(int)), SLOT(changed()));
+ connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
coAll3 = combo;
- QWhatsThis::add( combo, strAll3 );
+ TQWhatsThis::add( combo, strAll3 );
- combo = new QComboBox(grid);
+ combo = new TQComboBox(grid);
combo->insertItem(i18n("Raise/Lower"));
combo->insertItem(i18n("Shade/Unshade"));
combo->insertItem(i18n("Maximize/Restore"));
@@ -760,9 +760,9 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
combo->insertItem(i18n("Move to Previous/Next Desktop"));
combo->insertItem(i18n("Change Opacity"));
combo->insertItem(i18n("Nothing"));
- connect(combo, SIGNAL(activated(int)), SLOT(changed()));
+ connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
coAllW = combo;
- QWhatsThis::add( combo, strAllW );
+ TQWhatsThis::add( combo, strAllW );
layout->addStretch();
@@ -775,7 +775,7 @@ KWindowActionsConfig::~KWindowActionsConfig()
delete config;
}
-void KWindowActionsConfig::setComboText( QComboBox* combo, const char*txt )
+void KWindowActionsConfig::setComboText( TQComboBox* combo, const char*txt )
{
if( combo == coWin1 || combo == coWin2 || combo == coWin3 )
combo->setCurrentItem( tbl_txt_lookup( tbl_Win, txt ));
diff --git a/kwin/kcmkwin/kwinoptions/mouse.h b/kwin/kcmkwin/kwinoptions/mouse.h
index 24b2d4030..b28437511 100644
--- a/kwin/kcmkwin/kwinoptions/mouse.h
+++ b/kwin/kcmkwin/kwinoptions/mouse.h
@@ -24,10 +24,10 @@
class KConfig;
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kcmodule.h>
-#include <qcombobox.h>
-#include <qtooltip.h>
+#include <tqcombobox.h>
+#include <tqtooltip.h>
class ToolTipComboBox: public QComboBox
@@ -35,12 +35,12 @@ class ToolTipComboBox: public QComboBox
Q_OBJECT
public:
- ToolTipComboBox(QWidget * owner, char const * const * toolTips_)
- : QComboBox(owner)
+ ToolTipComboBox(TQWidget * owner, char const * const * toolTips_)
+ : TQComboBox(owner)
, toolTips(toolTips_) {}
public slots:
- void changed() {QToolTip::add( this, i18n(toolTips[currentItem()]) );}
+ void changed() {TQToolTip::add( this, i18n(toolTips[currentItem()]) );}
protected:
char const * const * toolTips;
@@ -54,7 +54,7 @@ class KTitleBarActionsConfig : public KCModule
public:
- KTitleBarActionsConfig( bool _standAlone, KConfig *_config, QWidget *parent=0, const char* name=0 );
+ KTitleBarActionsConfig( bool _standAlone, KConfig *_config, TQWidget *parent=0, const char* name=0 );
~KTitleBarActionsConfig( );
void load();
@@ -65,15 +65,15 @@ public slots:
void changed() { emit KCModule::changed(true); }
private:
- QComboBox* coTiDbl;
+ TQComboBox* coTiDbl;
- QComboBox* coTiAct1;
- QComboBox* coTiAct2;
- QComboBox* coTiAct3;
- QComboBox* coTiAct4;
- QComboBox* coTiInAct1;
- QComboBox* coTiInAct2;
- QComboBox* coTiInAct3;
+ TQComboBox* coTiAct1;
+ TQComboBox* coTiAct2;
+ TQComboBox* coTiAct3;
+ TQComboBox* coTiAct4;
+ TQComboBox* coTiInAct1;
+ TQComboBox* coTiInAct2;
+ TQComboBox* coTiInAct3;
ToolTipComboBox * coMax[3];
@@ -86,7 +86,7 @@ private:
const char* functionTiInAc(int);
const char* functionMax(int);
- void setComboText(QComboBox* combo, const char* text);
+ void setComboText(TQComboBox* combo, const char* text);
const char* fixup( const char* s );
private slots:
@@ -100,7 +100,7 @@ class KWindowActionsConfig : public KCModule
public:
- KWindowActionsConfig( bool _standAlone, KConfig *_config, QWidget *parent=0, const char* name=0 );
+ KWindowActionsConfig( bool _standAlone, KConfig *_config, TQWidget *parent=0, const char* name=0 );
~KWindowActionsConfig( );
void load();
@@ -111,15 +111,15 @@ public slots:
void changed() { emit KCModule::changed(true); }
private:
- QComboBox* coWin1;
- QComboBox* coWin2;
- QComboBox* coWin3;
+ TQComboBox* coWin1;
+ TQComboBox* coWin2;
+ TQComboBox* coWin3;
- QComboBox* coAllKey;
- QComboBox* coAll1;
- QComboBox* coAll2;
- QComboBox* coAll3;
- QComboBox* coAllW;
+ TQComboBox* coAllKey;
+ TQComboBox* coAll1;
+ TQComboBox* coAll2;
+ TQComboBox* coAll3;
+ TQComboBox* coAllW;
KConfig *config;
bool standAlone;
@@ -129,7 +129,7 @@ private:
const char* functionAll(int);
const char* functionAllW(int);
- void setComboText(QComboBox* combo, const char* text);
+ void setComboText(TQComboBox* combo, const char* text);
const char* fixup( const char* s );
};
diff --git a/kwin/kcmkwin/kwinoptions/windows.cpp b/kwin/kcmkwin/kwinoptions/windows.cpp
index aa779125b..1a9e88f15 100644
--- a/kwin/kcmkwin/kwinoptions/windows.cpp
+++ b/kwin/kcmkwin/kwinoptions/windows.cpp
@@ -23,15 +23,15 @@
#include <config.h>
-#include <qdir.h>
-#include <qlayout.h>
-#include <qslider.h>
-#include <qwhatsthis.h>
-#include <qvbuttongroup.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qlabel.h>
-#include <qcombobox.h>
+#include <tqdir.h>
+#include <tqlayout.h>
+#include <tqslider.h>
+#include <tqwhatsthis.h>
+#include <tqvbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqlabel.h>
+#include <tqcombobox.h>
#include <kmessagebox.h>
#include <kactivelabel.h>
@@ -44,7 +44,7 @@
#include <dcopclient.h>
#include <kglobal.h>
#include <kprocess.h>
-#include <qtabwidget.h>
+#include <tqtabwidget.h>
#include <X11/X.h>
#include <X11/Xlib.h>
@@ -101,19 +101,19 @@ KFocusConfig::~KFocusConfig ()
}
// removed the LCD display over the slider - this is not good GUI design :) RNolden 051701
-KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent, const char *)
+KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * parent, const char *)
: KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
- QString wtstr;
- QBoxLayout *lay = new QVBoxLayout (this, 0, KDialog::spacingHint());
+ TQString wtstr;
+ TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint());
- //iTLabel = new QLabel(i18n(" Allowed overlap:\n"
+ //iTLabel = new TQLabel(i18n(" Allowed overlap:\n"
// "(% of desktop space)"),
// plcBox);
//iTLabel->setAlignment(AlignTop|AlignHCenter);
//pLay->addWidget(iTLabel,1,1);
- //interactiveTrigger = new QSpinBox(0, 500, 1, plcBox);
+ //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox);
//pLay->addWidget(interactiveTrigger,1,2);
//pLay->addRowSpacing(2,KDialog::spacingHint());
@@ -121,16 +121,16 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent
//lay->addWidget(plcBox);
// focus policy
- fcsBox = new QButtonGroup(i18n("Focus"),this);
+ fcsBox = new TQButtonGroup(i18n("Focus"),this);
fcsBox->setColumnLayout( 0, Qt::Horizontal );
- QBoxLayout *fLay = new QVBoxLayout(fcsBox->layout(),
+ TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(),
KDialog::spacingHint());
- QBoxLayout *cLay = new QHBoxLayout(fLay);
- QLabel *fLabel = new QLabel(i18n("&Policy:"), fcsBox);
+ TQBoxLayout *cLay = new TQHBoxLayout(fLay);
+ TQLabel *fLabel = new TQLabel(i18n("&Policy:"), fcsBox);
cLay->addWidget(fLabel, 0);
- focusCombo = new QComboBox(false, fcsBox);
+ focusCombo = new TQComboBox(false, fcsBox);
focusCombo->insertItem(i18n("Click to Focus"), CLICK_TO_FOCUS);
focusCombo->insertItem(i18n("Focus Follows Mouse"), FOCUS_FOLLOWS_MOUSE);
focusCombo->insertItem(i18n("Focus Under Mouse"), FOCUS_UNDER_MOUSE);
@@ -158,15 +158,15 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent
" features such as the Alt+Tab walk through windows dialog in the KDE mode"
" from working properly."
);
- QWhatsThis::add( focusCombo, wtstr);
- QWhatsThis::add(fLabel, wtstr);
+ TQWhatsThis::add( focusCombo, wtstr);
+ TQWhatsThis::add(fLabel, wtstr);
- connect(focusCombo, SIGNAL(activated(int)), this, SLOT(setAutoRaiseEnabled()) );
+ connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setAutoRaiseEnabled()) );
// autoraise delay
- autoRaiseOn = new QCheckBox(i18n("Auto &raise"), fcsBox);
+ autoRaiseOn = new TQCheckBox(i18n("Auto &raise"), fcsBox);
fLay->addWidget(autoRaiseOn);
- connect(autoRaiseOn,SIGNAL(toggled(bool)), this, SLOT(autoRaiseOnTog(bool)));
+ connect(autoRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(autoRaiseOnTog(bool)));
autoRaise = new KIntNumInput(500, fcsBox);
autoRaise->setLabel(i18n("Dela&y:"), Qt::AlignVCenter|Qt::AlignLeft);
@@ -175,11 +175,11 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent
autoRaise->setSuffix(i18n(" msec"));
fLay->addWidget(autoRaise);
- connect(focusCombo, SIGNAL(activated(int)), this, SLOT(setDelayFocusEnabled()) );
+ connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDelayFocusEnabled()) );
- delayFocusOn = new QCheckBox(i18n("Delay focus"), fcsBox);
+ delayFocusOn = new TQCheckBox(i18n("Delay focus"), fcsBox);
fLay->addWidget(delayFocusOn);
- connect(delayFocusOn,SIGNAL(toggled(bool)), this, SLOT(delayFocusOnTog(bool)));
+ connect(delayFocusOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(delayFocusOnTog(bool)));
delayFocus = new KIntNumInput(500, fcsBox);
delayFocus->setLabel(i18n("Dela&y:"), Qt::AlignVCenter|Qt::AlignLeft);
@@ -188,45 +188,45 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent
delayFocus->setSuffix(i18n(" msec"));
fLay->addWidget(delayFocus);
- clickRaiseOn = new QCheckBox(i18n("C&lick raise active window"), fcsBox);
- connect(clickRaiseOn,SIGNAL(toggled(bool)), this, SLOT(clickRaiseOnTog(bool)));
+ clickRaiseOn = new TQCheckBox(i18n("C&lick raise active window"), fcsBox);
+ connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool)));
fLay->addWidget(clickRaiseOn);
// fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(),
// clickRaiseOn->sizeHint().width()) + 15);
- QWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically"
+ TQWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically"
" come to the front when the mouse pointer has been over it for some time.") );
wtstr = i18n("This is the delay after which the window that the mouse pointer is over will automatically"
" come to the front.");
- QWhatsThis::add( autoRaise, wtstr );
+ TQWhatsThis::add( autoRaise, wtstr );
- QWhatsThis::add( clickRaiseOn, i18n("When this option is enabled, the active window will be brought to the"
+ TQWhatsThis::add( clickRaiseOn, i18n("When this option is enabled, the active window will be brought to the"
" front when you click somewhere into the window contents. To change"
" it for inactive windows, you need to change the settings"
" in the Actions tab.") );
- QWhatsThis::add( delayFocusOn, i18n("When this option is enabled, there will be a delay after which the"
+ TQWhatsThis::add( delayFocusOn, i18n("When this option is enabled, there will be a delay after which the"
" window the mouse pointer is over will become active (receive focus).") );
- QWhatsThis::add( delayFocus, i18n("This is the delay after which the window the mouse pointer is over"
+ TQWhatsThis::add( delayFocus, i18n("This is the delay after which the window the mouse pointer is over"
" will automatically receive focus.") );
- separateScreenFocus = new QCheckBox( i18n( "S&eparate screen focus" ), fcsBox );
+ separateScreenFocus = new TQCheckBox( i18n( "S&eparate screen focus" ), fcsBox );
fLay->addWidget( separateScreenFocus );
wtstr = i18n( "When this option is enabled, focus operations are limited only to the active Xinerama screen" );
- QWhatsThis::add( separateScreenFocus, wtstr );
+ TQWhatsThis::add( separateScreenFocus, wtstr );
- activeMouseScreen = new QCheckBox( i18n( "Active &mouse screen" ), fcsBox );
+ activeMouseScreen = new TQCheckBox( i18n( "Active &mouse screen" ), fcsBox );
fLay->addWidget( activeMouseScreen );
wtstr = i18n( "When this option is enabled, active Xinerama screen (where for example new windows appear)"
" is the screen with the mouse pointer. When disabled, the active Xinerama screen is the screen"
" with the focused window. This option is by default disabled for Click to focus and"
" enabled for other focus policies." );
- QWhatsThis::add( activeMouseScreen, wtstr );
- connect(focusCombo, SIGNAL(activated(int)), this, SLOT(updateActiveMouseScreen()));
+ TQWhatsThis::add( activeMouseScreen, wtstr );
+ connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateActiveMouseScreen()));
- if (!QApplication::desktop()->isVirtualDesktop() ||
- QApplication::desktop()->numScreens() == 1) // No Ximerama
+ if (!TQApplication::desktop()->isVirtualDesktop() ||
+ TQApplication::desktop()->numScreens() == 1) // No Ximerama
{
separateScreenFocus->hide();
activeMouseScreen->hide();
@@ -234,11 +234,11 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent
lay->addWidget(fcsBox);
- kbdBox = new QButtonGroup(i18n("Navigation"), this);
+ kbdBox = new TQButtonGroup(i18n("Navigation"), this);
kbdBox->setColumnLayout( 0, Qt::Horizontal );
- QVBoxLayout *kLay = new QVBoxLayout(kbdBox->layout(), KDialog::spacingHint());
+ TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), KDialog::spacingHint());
- altTabPopup = new QCheckBox( i18n("Show window list while switching windows"), kbdBox );
+ altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox );
kLay->addWidget( altTabPopup );
wtstr = i18n("Hold down the Alt key and press the Tab key repeatedly to walk"
@@ -250,45 +250,45 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent
"Otherwise, the focus is passed to a new window each time Tab"
" is pressed, with no popup widget. In addition, the previously"
" activated window will be sent to the back in this mode.");
- QWhatsThis::add( altTabPopup, wtstr );
- connect(focusCombo, SIGNAL(activated(int)), this, SLOT(updateAltTabMode()));
+ TQWhatsThis::add( altTabPopup, wtstr );
+ connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateAltTabMode()));
- traverseAll = new QCheckBox( i18n( "&Traverse windows on all desktops" ), kbdBox );
+ traverseAll = new TQCheckBox( i18n( "&Traverse windows on all desktops" ), kbdBox );
kLay->addWidget( traverseAll );
wtstr = i18n( "Leave this option disabled if you want to limit walking through"
" windows to the current desktop." );
- QWhatsThis::add( traverseAll, wtstr );
+ TQWhatsThis::add( traverseAll, wtstr );
- rollOverDesktops = new QCheckBox( i18n("Desktop navi&gation wraps around"), kbdBox );
+ rollOverDesktops = new TQCheckBox( i18n("Desktop navi&gation wraps around"), kbdBox );
kLay->addWidget(rollOverDesktops);
wtstr = i18n( "Enable this option if you want keyboard or active desktop border navigation beyond"
" the edge of a desktop to take you to the opposite edge of the new desktop." );
- QWhatsThis::add( rollOverDesktops, wtstr );
+ TQWhatsThis::add( rollOverDesktops, wtstr );
- showPopupinfo = new QCheckBox( i18n("Popup desktop name on desktop &switch"), kbdBox );
+ showPopupinfo = new TQCheckBox( i18n("Popup desktop name on desktop &switch"), kbdBox );
kLay->addWidget(showPopupinfo);
wtstr = i18n( "Enable this option if you wish to see the current desktop"
" name popup whenever the current desktop is changed." );
- QWhatsThis::add( showPopupinfo, wtstr );
+ TQWhatsThis::add( showPopupinfo, wtstr );
lay->addWidget(kbdBox);
lay->addStretch();
// Any changes goes to slotChanged()
- connect(focusCombo, SIGNAL(activated(int)), SLOT(changed()));
- connect(fcsBox, SIGNAL(clicked(int)), SLOT(changed()));
- connect(autoRaise, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect(delayFocus, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect(separateScreenFocus, SIGNAL(clicked()), SLOT(changed()));
- connect(activeMouseScreen, SIGNAL(clicked()), SLOT(changed()));
- connect(altTabPopup, SIGNAL(clicked()), SLOT(changed()));
- connect(traverseAll, SIGNAL(clicked()), SLOT(changed()));
- connect(rollOverDesktops, SIGNAL(clicked()), SLOT(changed()));
- connect(showPopupinfo, SIGNAL(clicked()), SLOT(changed()));
+ connect(focusCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+ connect(fcsBox, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed()));
+ connect(autoRaise, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(delayFocus, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(separateScreenFocus, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+ connect(activeMouseScreen, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+ connect(altTabPopup, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+ connect(traverseAll, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+ connect(rollOverDesktops, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+ connect(showPopupinfo, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
load();
}
@@ -425,7 +425,7 @@ void KFocusConfig::setShowPopupinfo(bool a) {
void KFocusConfig::load( void )
{
- QString key;
+ TQString key;
config->setGroup( "Windows" );
@@ -564,34 +564,34 @@ KAdvancedConfig::~KAdvancedConfig ()
delete config;
}
-KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, QWidget *parent, const char *)
+KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, TQWidget *parent, const char *)
: KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
- QString wtstr;
- QBoxLayout *lay = new QVBoxLayout (this, 0, KDialog::spacingHint());
+ TQString wtstr;
+ TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint());
- //iTLabel = new QLabel(i18n(" Allowed overlap:\n"
+ //iTLabel = new TQLabel(i18n(" Allowed overlap:\n"
// "(% of desktop space)"),
// plcBox);
//iTLabel->setAlignment(AlignTop|AlignHCenter);
//pLay->addWidget(iTLabel,1,1);
- //interactiveTrigger = new QSpinBox(0, 500, 1, plcBox);
+ //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox);
//pLay->addWidget(interactiveTrigger,1,2);
//pLay->addRowSpacing(2,KDialog::spacingHint());
//lay->addWidget(plcBox);
- shBox = new QVButtonGroup(i18n("Shading"), this);
+ shBox = new TQVButtonGroup(i18n("Shading"), this);
- animateShade = new QCheckBox(i18n("Anima&te"), shBox);
- QWhatsThis::add(animateShade, i18n("Animate the action of reducing the window to its titlebar (shading)"
+ animateShade = new TQCheckBox(i18n("Anima&te"), shBox);
+ TQWhatsThis::add(animateShade, i18n("Animate the action of reducing the window to its titlebar (shading)"
" as well as the expansion of a shaded window") );
- shadeHoverOn = new QCheckBox(i18n("&Enable hover"), shBox);
+ shadeHoverOn = new TQCheckBox(i18n("&Enable hover"), shBox);
- connect(shadeHoverOn, SIGNAL(toggled(bool)), this, SLOT(shadeHoverChanged(bool)));
+ connect(shadeHoverOn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shadeHoverChanged(bool)));
shadeHover = new KIntNumInput(500, shBox);
shadeHover->setLabel(i18n("Dela&y:"), Qt::AlignVCenter|Qt::AlignLeft);
@@ -599,49 +599,49 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, QWidget *p
shadeHover->setSteps(100, 100);
shadeHover->setSuffix(i18n(" msec"));
- QWhatsThis::add(shadeHoverOn, i18n("If Shade Hover is enabled, a shaded window will un-shade automatically "
+ TQWhatsThis::add(shadeHoverOn, i18n("If Shade Hover is enabled, a shaded window will un-shade automatically "
"when the mouse pointer has been over the title bar for some time."));
wtstr = i18n("Sets the time in milliseconds before the window unshades "
"when the mouse pointer goes over the shaded window.");
- QWhatsThis::add(shadeHover, wtstr);
+ TQWhatsThis::add(shadeHover, wtstr);
lay->addWidget(shBox);
// Any changes goes to slotChanged()
- connect(animateShade, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(shadeHoverOn, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(shadeHover, SIGNAL(valueChanged(int)), SLOT(changed()));
+ connect(animateShade, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(shadeHoverOn, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(shadeHover, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
- electricBox = new QVButtonGroup(i18n("Active Desktop Borders"), this);
+ electricBox = new TQVButtonGroup(i18n("Active Desktop Borders"), this);
electricBox->setMargin(15);
- QWhatsThis::add( electricBox, i18n("If this option is enabled, moving the mouse to a screen border"
+ TQWhatsThis::add( electricBox, i18n("If this option is enabled, moving the mouse to a screen border"
" will change your desktop. This is e.g. useful if you want to drag windows from one desktop"
" to the other.") );
- active_disable = new QRadioButton(i18n("D&isabled"), electricBox);
- active_move = new QRadioButton(i18n("Only &when moving windows"), electricBox);
- active_always = new QRadioButton(i18n("A&lways enabled"), electricBox);
+ active_disable = new TQRadioButton(i18n("D&isabled"), electricBox);
+ active_move = new TQRadioButton(i18n("Only &when moving windows"), electricBox);
+ active_always = new TQRadioButton(i18n("A&lways enabled"), electricBox);
delays = new KIntNumInput(10, electricBox);
delays->setRange(0, MAX_EDGE_RES, 50, true);
delays->setSuffix(i18n(" msec"));
delays->setLabel(i18n("Desktop &switch delay:"));
- QWhatsThis::add( delays, i18n("Here you can set a delay for switching desktops using the active"
+ TQWhatsThis::add( delays, i18n("Here you can set a delay for switching desktops using the active"
" borders feature. Desktops will be switched after the mouse has been pushed against a screen border"
" for the specified number of milliseconds.") );
- connect( electricBox, SIGNAL(clicked(int)), this, SLOT(setEBorders()));
+ connect( electricBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setEBorders()));
// Any changes goes to slotChanged()
- connect(electricBox, SIGNAL(clicked(int)), SLOT(changed()));
- connect(delays, SIGNAL(valueChanged(int)), SLOT(changed()));
+ connect(electricBox, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed()));
+ connect(delays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
lay->addWidget(electricBox);
- QHBoxLayout* focusStealingLayout = new QHBoxLayout( lay,KDialog::spacingHint());
- QLabel* focusStealingLabel = new QLabel( i18n( "Focus stealing prevention level:" ), this );
- focusStealing = new QComboBox( this );
+ TQHBoxLayout* focusStealingLayout = new TQHBoxLayout( lay,KDialog::spacingHint());
+ TQLabel* focusStealingLabel = new TQLabel( i18n( "Focus stealing prevention level:" ), this );
+ focusStealing = new TQComboBox( this );
focusStealing->insertItem( i18n( "Focus Stealing Prevention Level", "None" ));
focusStealing->insertItem( i18n( "Focus Stealing Prevention Level", "Low" ));
focusStealing->insertItem( i18n( "Focus Stealing Prevention Level", "Normal" ));
@@ -669,16 +669,16 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, QWidget *p
"<p>Windows that are prevented from stealing focus are marked as demanding attention, "
"which by default means their taskbar entry will be highlighted. This can be changed "
"in the Notifications control module.</p>" );
- QWhatsThis::add( focusStealing, wtstr );
- QWhatsThis::add( focusStealingLabel, wtstr );
- connect(focusStealing, SIGNAL(activated(int)), SLOT(changed()));
+ TQWhatsThis::add( focusStealing, wtstr );
+ TQWhatsThis::add( focusStealingLabel, wtstr );
+ connect(focusStealing, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
- hideUtilityWindowsForInactive = new QCheckBox( i18n( "Hide utility windows for inactive applications" ), this );
- QWhatsThis::add( hideUtilityWindowsForInactive,
+ hideUtilityWindowsForInactive = new TQCheckBox( i18n( "Hide utility windows for inactive applications" ), this );
+ TQWhatsThis::add( hideUtilityWindowsForInactive,
i18n( "When turned on, utility windows (tool windows, torn-off menus,...) of inactive applications will be"
" hidden and will be shown only when the application becomes active. Note that applications"
" have to mark the windows with the proper window type for this feature to work." ));
- connect(hideUtilityWindowsForInactive, SIGNAL(toggled(bool)), SLOT(changed()));
+ connect(hideUtilityWindowsForInactive, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
lay->addWidget( hideUtilityWindowsForInactive );
lay->addStretch();
@@ -822,85 +822,85 @@ KMovingConfig::~KMovingConfig ()
delete config;
}
-KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, QWidget *parent, const char *)
+KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *parent, const char *)
: KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
- QString wtstr;
- QBoxLayout *lay = new QVBoxLayout (this, 0, KDialog::spacingHint());
+ TQString wtstr;
+ TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint());
- windowsBox = new QButtonGroup(i18n("Windows"), this);
+ windowsBox = new TQButtonGroup(i18n("Windows"), this);
windowsBox->setColumnLayout( 0, Qt::Horizontal );
- QBoxLayout *wLay = new QVBoxLayout (windowsBox->layout(), KDialog::spacingHint());
+ TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint());
- QBoxLayout *bLay = new QVBoxLayout;
+ TQBoxLayout *bLay = new QVBoxLayout;
wLay->addLayout(bLay);
- opaque = new QCheckBox(i18n("Di&splay content in moving windows"), windowsBox);
+ opaque = new TQCheckBox(i18n("Di&splay content in moving windows"), windowsBox);
bLay->addWidget(opaque);
- QWhatsThis::add( opaque, i18n("Enable this option if you want a window's content to be fully shown"
+ TQWhatsThis::add( opaque, i18n("Enable this option if you want a window's content to be fully shown"
" while moving it, instead of just showing a window 'skeleton'. The result may not be satisfying"
" on slow machines without graphic acceleration.") );
- resizeOpaqueOn = new QCheckBox(i18n("Display content in &resizing windows"), windowsBox);
+ resizeOpaqueOn = new TQCheckBox(i18n("Display content in &resizing windows"), windowsBox);
bLay->addWidget(resizeOpaqueOn);
- QWhatsThis::add( resizeOpaqueOn, i18n("Enable this option if you want a window's content to be shown"
+ TQWhatsThis::add( resizeOpaqueOn, i18n("Enable this option if you want a window's content to be shown"
" while resizing it, instead of just showing a window 'skeleton'. The result may not be satisfying"
" on slow machines.") );
- geometryTipOn = new QCheckBox(i18n("Display window &geometry when moving or resizing"), windowsBox);
+ geometryTipOn = new TQCheckBox(i18n("Display window &geometry when moving or resizing"), windowsBox);
bLay->addWidget(geometryTipOn);
- QWhatsThis::add(geometryTipOn, i18n("Enable this option if you want a window's geometry to be displayed"
+ TQWhatsThis::add(geometryTipOn, i18n("Enable this option if you want a window's geometry to be displayed"
" while it is being moved or resized. The window position relative"
" to the top-left corner of the screen is displayed together with"
" its size."));
- QGridLayout *rLay = new QGridLayout(2,3);
+ TQGridLayout *rLay = new TQGridLayout(2,3);
bLay->addLayout(rLay);
rLay->setColStretch(0,0);
rLay->setColStretch(1,1);
- minimizeAnimOn = new QCheckBox(i18n("Animate minimi&ze and restore"),
+ minimizeAnimOn = new TQCheckBox(i18n("Animate minimi&ze and restore"),
windowsBox);
- QWhatsThis::add( minimizeAnimOn, i18n("Enable this option if you want an animation shown when"
+ TQWhatsThis::add( minimizeAnimOn, i18n("Enable this option if you want an animation shown when"
" windows are minimized or restored." ) );
rLay->addWidget(minimizeAnimOn,0,0);
- minimizeAnimSlider = new QSlider(0,10,10,0,QSlider::Horizontal, windowsBox);
+ minimizeAnimSlider = new TQSlider(0,10,10,0,TQSlider::Horizontal, windowsBox);
minimizeAnimSlider->setSteps(1, 1);
- // QSlider::Below clashes with a X11/X.h #define
+ // TQSlider::Below clashes with a X11/X.h #define
#undef Below
- minimizeAnimSlider->setTickmarks(QSlider::Below);
+ minimizeAnimSlider->setTickmarks(TQSlider::Below);
rLay->addMultiCellWidget(minimizeAnimSlider,0,0,1,2);
- connect(minimizeAnimOn, SIGNAL(toggled(bool)), this, SLOT(setMinimizeAnim(bool)));
- connect(minimizeAnimSlider, SIGNAL(valueChanged(int)), this, SLOT(setMinimizeAnimSpeed(int)));
+ connect(minimizeAnimOn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setMinimizeAnim(bool)));
+ connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int)));
- minimizeAnimSlowLabel= new QLabel(i18n("Slow"),windowsBox);
+ minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox);
minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft);
rLay->addWidget(minimizeAnimSlowLabel,1,1);
- minimizeAnimFastLabel= new QLabel(i18n("Fast"),windowsBox);
+ minimizeAnimFastLabel= new TQLabel(i18n("Fast"),windowsBox);
minimizeAnimFastLabel->setAlignment(Qt::AlignTop|Qt::AlignRight);
rLay->addWidget(minimizeAnimFastLabel,1,2);
wtstr = i18n("Here you can set the speed of the animation shown when windows are"
" minimized and restored. ");
- QWhatsThis::add( minimizeAnimSlider, wtstr );
- QWhatsThis::add( minimizeAnimSlowLabel, wtstr );
- QWhatsThis::add( minimizeAnimFastLabel, wtstr );
+ TQWhatsThis::add( minimizeAnimSlider, wtstr );
+ TQWhatsThis::add( minimizeAnimSlowLabel, wtstr );
+ TQWhatsThis::add( minimizeAnimFastLabel, wtstr );
- moveResizeMaximized = new QCheckBox( i18n("Allow moving and resizing o&f maximized windows"), windowsBox);
+ moveResizeMaximized = new TQCheckBox( i18n("Allow moving and resizing o&f maximized windows"), windowsBox);
bLay->addWidget(moveResizeMaximized);
- QWhatsThis::add(moveResizeMaximized, i18n("When enabled, this feature activates the border of maximized windows"
+ TQWhatsThis::add(moveResizeMaximized, i18n("When enabled, this feature activates the border of maximized windows"
" and allows you to move or resize them,"
" just like for normal windows"));
- QBoxLayout *vLay = new QHBoxLayout(bLay);
+ TQBoxLayout *vLay = new TQHBoxLayout(bLay);
- QLabel *plcLabel = new QLabel(i18n("&Placement:"),windowsBox);
+ TQLabel *plcLabel = new TQLabel(i18n("&Placement:"),windowsBox);
- placementCombo = new QComboBox(false, windowsBox);
+ placementCombo = new TQComboBox(false, windowsBox);
placementCombo->insertItem(i18n("Smart"), SMART_PLACEMENT);
placementCombo->insertItem(i18n("Maximizing"), MAXIMIZING_PLACEMENT);
placementCombo->insertItem(i18n("Cascade"), CASCADE_PLACEMENT);
@@ -926,8 +926,8 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, QWidget *paren
" <li><em>Zero-Cornered</em> will place the window in the top-left corner</li>"
"</ul>") ;
- QWhatsThis::add( plcLabel, wtstr);
- QWhatsThis::add( placementCombo, wtstr);
+ TQWhatsThis::add( plcLabel, wtstr);
+ TQWhatsThis::add( placementCombo, wtstr);
plcLabel->setBuddy(placementCombo);
vLay->addWidget(plcLabel, 0);
@@ -937,13 +937,13 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, QWidget *paren
lay->addWidget(windowsBox);
- //iTLabel = new QLabel(i18n(" Allowed overlap:\n"
+ //iTLabel = new TQLabel(i18n(" Allowed overlap:\n"
// "(% of desktop space)"),
// plcBox);
//iTLabel->setAlignment(AlignTop|AlignHCenter);
//pLay->addWidget(iTLabel,1,1);
- //interactiveTrigger = new QSpinBox(0, 500, 1, plcBox);
+ //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox);
//pLay->addWidget(interactiveTrigger,1,2);
//pLay->addRowSpacing(2,KDialog::spacingHint());
@@ -952,7 +952,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, QWidget *paren
//CT 15mar98 - add EdgeResistance, BorderAttractor, WindowsAttractor config
- MagicBox = new QVButtonGroup(i18n("Snap Zones"), this);
+ MagicBox = new TQVButtonGroup(i18n("Snap Zones"), this);
MagicBox->setMargin(15);
BrdrSnap = new KIntNumInput(10, MagicBox);
@@ -960,7 +960,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, QWidget *paren
BrdrSnap->setRange( 0, MAX_BRDR_SNAP);
BrdrSnap->setLabel(i18n("&Border snap zone:"));
BrdrSnap->setSteps(1,10);
- QWhatsThis::add( BrdrSnap, i18n("Here you can set the snap zone for screen borders, i.e."
+ TQWhatsThis::add( BrdrSnap, i18n("Here you can set the snap zone for screen borders, i.e."
" the 'strength' of the magnetic field which will make windows snap to the border when"
" moved near it.") );
@@ -969,12 +969,12 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, QWidget *paren
WndwSnap->setRange( 0, MAX_WNDW_SNAP);
WndwSnap->setLabel(i18n("&Window snap zone:"));
BrdrSnap->setSteps(1,10);
- QWhatsThis::add( WndwSnap, i18n("Here you can set the snap zone for windows, i.e."
+ TQWhatsThis::add( WndwSnap, i18n("Here you can set the snap zone for windows, i.e."
" the 'strength' of the magnetic field which will make windows snap to each other when"
" they're moved near another window.") );
- OverlapSnap=new QCheckBox(i18n("Snap windows onl&y when overlapping"),MagicBox);
- QWhatsThis::add( OverlapSnap, i18n("Here you can set that windows will be only"
+ OverlapSnap=new TQCheckBox(i18n("Snap windows onl&y when overlapping"),MagicBox);
+ TQWhatsThis::add( OverlapSnap, i18n("Here you can set that windows will be only"
" snapped if you try to overlap them, i.e. they will not be snapped if the windows"
" comes only near another window or border.") );
@@ -984,18 +984,18 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, QWidget *paren
load();
// Any changes goes to slotChanged()
- connect( opaque, SIGNAL(clicked()), SLOT(changed()));
- connect( resizeOpaqueOn, SIGNAL(clicked()), SLOT(changed()));
- connect( geometryTipOn, SIGNAL(clicked()), SLOT(changed()));
- connect( minimizeAnimOn, SIGNAL(clicked() ), SLOT(changed()));
- connect( minimizeAnimSlider, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect( moveResizeMaximized, SIGNAL(toggled(bool)), SLOT(changed()));
- connect( placementCombo, SIGNAL(activated(int)), SLOT(changed()));
- connect( BrdrSnap, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect( BrdrSnap, SIGNAL(valueChanged(int)), SLOT(slotBrdrSnapChanged(int)));
- connect( WndwSnap, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect( WndwSnap, SIGNAL(valueChanged(int)), SLOT(slotWndwSnapChanged(int)));
- connect( OverlapSnap, SIGNAL(clicked()), SLOT(changed()));
+ connect( opaque, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+ connect( resizeOpaqueOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+ connect( geometryTipOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+ connect( minimizeAnimOn, TQT_SIGNAL(clicked() ), TQT_SLOT(changed()));
+ connect( minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect( moveResizeMaximized, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect( placementCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+ connect( BrdrSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect( BrdrSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotBrdrSnapChanged(int)));
+ connect( WndwSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect( WndwSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWndwSnapChanged(int)));
+ connect( OverlapSnap, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
// To get suffix to BrdrSnap and WndwSnap inputs with default values.
slotBrdrSnapChanged(BrdrSnap->value());
@@ -1080,7 +1080,7 @@ void KMovingConfig::slotWndwSnapChanged(int value) {
void KMovingConfig::load( void )
{
- QString key;
+ TQString key;
config->setGroup( "Windows" );
@@ -1192,7 +1192,7 @@ void KMovingConfig::save( void )
// else if (v == MANUAL_PLACEMENT)
// config->writeEntry(KWIN_PLACEMENT, "Manual");
// else if (v == INTERACTIVE_PLACEMENT) {
-// QString tmpstr = QString("Interactive,%1").arg(interactiveTrigger->value());
+// TQString tmpstr = TQString("Interactive,%1").arg(interactiveTrigger->value());
// config->writeEntry(KWIN_PLACEMENT, tmpstr);
// }
else
@@ -1266,12 +1266,12 @@ KTranslucencyConfig::~KTranslucencyConfig ()
kompmgr->detach();
}
-KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, QWidget *parent, const char *)
+KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, TQWidget *parent, const char *)
: KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
kompmgr = 0L;
resetKompmgr_ = FALSE;
- QVBoxLayout *lay = new QVBoxLayout (this);
+ TQVBoxLayout *lay = new TQVBoxLayout (this);
kompmgrAvailable_ = kompmgrAvailable();
if (!kompmgrAvailable_){
KActiveLabel *label = new KActiveLabel(i18n("<qt><b>It seems that alpha channel support is not available.</b><br><br>"
@@ -1289,41 +1289,41 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, QW
}
else
{
- QTabWidget *tabW = new QTabWidget(this);
- QWidget *tGroup = new QWidget(tabW);
- QVBoxLayout *vLay = new QVBoxLayout (tGroup,KDialog::marginHint(), KDialog::spacingHint());
+ TQTabWidget *tabW = new TQTabWidget(this);
+ TQWidget *tGroup = new TQWidget(tabW);
+ TQVBoxLayout *vLay = new TQVBoxLayout (tGroup,KDialog::marginHint(), KDialog::spacingHint());
vLay->addSpacing(11); // to get the proper gb top offset
- onlyDecoTranslucent = new QCheckBox(i18n("Apply translucency only to decoration"),tGroup);
+ onlyDecoTranslucent = new TQCheckBox(i18n("Apply translucency only to decoration"),tGroup);
vLay->addWidget(onlyDecoTranslucent);
vLay->addSpacing(11);
- QGridLayout *gLay = new QGridLayout(vLay,4,2,KDialog::spacingHint());
+ TQGridLayout *gLay = new TQGridLayout(vLay,4,2,KDialog::spacingHint());
gLay->setColStretch(1,1);
- activeWindowTransparency = new QCheckBox(i18n("Active windows:"),tGroup);
+ activeWindowTransparency = new TQCheckBox(i18n("Active windows:"),tGroup);
gLay->addWidget(activeWindowTransparency,0,0);
activeWindowOpacity = new KIntNumInput(100, tGroup);
activeWindowOpacity->setRange(0,100);
activeWindowOpacity->setSuffix("%");
gLay->addWidget(activeWindowOpacity,0,1);
- inactiveWindowTransparency = new QCheckBox(i18n("Inactive windows:"),tGroup);
+ inactiveWindowTransparency = new TQCheckBox(i18n("Inactive windows:"),tGroup);
gLay->addWidget(inactiveWindowTransparency,1,0);
inactiveWindowOpacity = new KIntNumInput(100, tGroup);
inactiveWindowOpacity->setRange(0,100);
inactiveWindowOpacity->setSuffix("%");
gLay->addWidget(inactiveWindowOpacity,1,1);
- movingWindowTransparency = new QCheckBox(i18n("Moving windows:"),tGroup);
+ movingWindowTransparency = new TQCheckBox(i18n("Moving windows:"),tGroup);
gLay->addWidget(movingWindowTransparency,2,0);
movingWindowOpacity = new KIntNumInput(100, tGroup);
movingWindowOpacity->setRange(0,100);
movingWindowOpacity->setSuffix("%");
gLay->addWidget(movingWindowOpacity,2,1);
- dockWindowTransparency = new QCheckBox(i18n("Dock windows:"),tGroup);
+ dockWindowTransparency = new TQCheckBox(i18n("Dock windows:"),tGroup);
gLay->addWidget(dockWindowTransparency,3,0);
dockWindowOpacity = new KIntNumInput(100, tGroup);
dockWindowOpacity->setRange(0,100);
@@ -1332,80 +1332,80 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, QW
vLay->addSpacing(11);
- keepAboveAsActive = new QCheckBox(i18n("Treat 'keep above' windows as active ones"),tGroup);
+ keepAboveAsActive = new TQCheckBox(i18n("Treat 'keep above' windows as active ones"),tGroup);
vLay->addWidget(keepAboveAsActive);
- disableARGB = new QCheckBox(i18n("Disable ARGB windows (ignores window alpha maps, fixes gtk1 apps)"),tGroup);
+ disableARGB = new TQCheckBox(i18n("Disable ARGB windows (ignores window alpha maps, fixes gtk1 apps)"),tGroup);
vLay->addWidget(disableARGB);
vLay->addStretch();
tabW->addTab(tGroup, i18n("Opacity"));
- QWidget *sGroup = new QWidget(tabW);
+ TQWidget *sGroup = new TQWidget(tabW);
// sGroup->setCheckable(TRUE);
- QVBoxLayout *vLay2 = new QVBoxLayout (sGroup,11,6);
+ TQVBoxLayout *vLay2 = new TQVBoxLayout (sGroup,11,6);
vLay2->addSpacing(11); // to get the proper gb top offset
- useShadows = new QCheckBox(i18n("Use shadows"),sGroup);
+ useShadows = new TQCheckBox(i18n("Use shadows"),sGroup);
vLay2->addWidget(useShadows);
vLay2->addSpacing(11);
- QGridLayout *gLay2 = new QGridLayout(vLay2,6,2);
+ TQGridLayout *gLay2 = new TQGridLayout(vLay2,6,2);
gLay2->setColStretch(1,1);
- QLabel *label1 = new QLabel(i18n("Active window size:"),sGroup);
+ TQLabel *label1 = new TQLabel(i18n("Active window size:"),sGroup);
gLay2->addWidget(label1,0,0);
activeWindowShadowSize = new KIntNumInput(12,sGroup);
activeWindowShadowSize->setRange(0,32);
// activeWindowShadowSize->setSuffix("px");
gLay2->addWidget(activeWindowShadowSize,0,1);
- QLabel *label2 = new QLabel(i18n("Inactive window size:"),sGroup);
+ TQLabel *label2 = new TQLabel(i18n("Inactive window size:"),sGroup);
gLay2->addWidget(label2,1,0);
inactiveWindowShadowSize = new KIntNumInput(6,sGroup);
inactiveWindowShadowSize->setRange(0,32);
// inactiveWindowShadowSize->setSuffix("px");
gLay2->addWidget(inactiveWindowShadowSize,1,1);
- QLabel *label3 = new QLabel(i18n("Dock window size:"),sGroup);
+ TQLabel *label3 = new TQLabel(i18n("Dock window size:"),sGroup);
gLay2->addWidget(label3,2,0);
dockWindowShadowSize = new KIntNumInput(6,sGroup);
dockWindowShadowSize->setRange(0,32);
// dockWindowShadowSize->setSuffix("px");
gLay2->addWidget(dockWindowShadowSize,2,1);
- QLabel *label4 = new QLabel(i18n("Vertical offset:"),sGroup);
+ TQLabel *label4 = new TQLabel(i18n("Vertical offset:"),sGroup);
gLay2->addWidget(label4,3,0);
shadowTopOffset = new KIntNumInput(80,sGroup);
shadowTopOffset->setSuffix("%");
shadowTopOffset->setRange(-200,200);
gLay2->addWidget(shadowTopOffset,3,1);
- QLabel *label5 = new QLabel(i18n("Horizontal offset:"),sGroup);
+ TQLabel *label5 = new TQLabel(i18n("Horizontal offset:"),sGroup);
gLay2->addWidget(label5,4,0);
shadowLeftOffset = new KIntNumInput(0,sGroup);
shadowLeftOffset->setSuffix("%");
shadowLeftOffset->setRange(-200,200);
gLay2->addWidget(shadowLeftOffset,4,1);
- QLabel *label6 = new QLabel(i18n("Shadow color:"),sGroup);
+ TQLabel *label6 = new TQLabel(i18n("Shadow color:"),sGroup);
gLay2->addWidget(label6,5,0);
shadowColor = new KColorButton(Qt::black,sGroup);
gLay2->addWidget(shadowColor,5,1);
gLay2->setColStretch(1,1);
vLay2->addSpacing(11);
- removeShadowsOnMove = new QCheckBox(i18n("Remove shadows on move"),sGroup);
+ removeShadowsOnMove = new TQCheckBox(i18n("Remove shadows on move"),sGroup);
vLay2->addWidget(removeShadowsOnMove);
- removeShadowsOnResize = new QCheckBox(i18n("Remove shadows on resize"),sGroup);
+ removeShadowsOnResize = new TQCheckBox(i18n("Remove shadows on resize"),sGroup);
vLay2->addWidget(removeShadowsOnResize);
vLay2->addStretch();
tabW->addTab(sGroup, i18n("Shadows"));
- QWidget *eGroup = new QWidget(this);
- QVBoxLayout *vLay3 = new QVBoxLayout (eGroup,11,6);
+ TQWidget *eGroup = new TQWidget(this);
+ TQVBoxLayout *vLay3 = new TQVBoxLayout (eGroup,11,6);
- fadeInWindows = new QCheckBox(i18n("Fade-in windows (including popups)"),eGroup);
- fadeOnOpacityChange = new QCheckBox(i18n("Fade between opacity changes"),eGroup);
+ fadeInWindows = new TQCheckBox(i18n("Fade-in windows (including popups)"),eGroup);
+ fadeOnOpacityChange = new TQCheckBox(i18n("Fade between opacity changes"),eGroup);
fadeInSpeed = new KIntNumInput(100, eGroup);
fadeInSpeed->setRange(1,100);
fadeInSpeed->setLabel(i18n("Fade-in speed:"));
@@ -1420,69 +1420,69 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, QW
tabW->addTab(eGroup, i18n("Effects"));
- useTranslucency = new QCheckBox(i18n("Use translucency/shadows"),this);
+ useTranslucency = new TQCheckBox(i18n("Use translucency/shadows"),this);
lay->addWidget(useTranslucency);
lay->addWidget(tabW);
- connect(useTranslucency, SIGNAL(toggled(bool)), tabW, SLOT(setEnabled(bool)));
-
- connect(activeWindowTransparency, SIGNAL(toggled(bool)), activeWindowOpacity, SLOT(setEnabled(bool)));
- connect(inactiveWindowTransparency, SIGNAL(toggled(bool)), inactiveWindowOpacity, SLOT(setEnabled(bool)));
- connect(movingWindowTransparency, SIGNAL(toggled(bool)), movingWindowOpacity, SLOT(setEnabled(bool)));
- connect(dockWindowTransparency, SIGNAL(toggled(bool)), dockWindowOpacity, SLOT(setEnabled(bool)));
-
- connect(useTranslucency, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(onlyDecoTranslucent, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(activeWindowTransparency, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(inactiveWindowTransparency, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(movingWindowTransparency, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(dockWindowTransparency, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(keepAboveAsActive, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(disableARGB, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(useShadows, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(removeShadowsOnResize, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(removeShadowsOnMove, SIGNAL(toggled(bool)), SLOT(changed()));
-
- connect(activeWindowOpacity, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect(inactiveWindowOpacity, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect(movingWindowOpacity, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect(dockWindowOpacity, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect(dockWindowShadowSize, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect(activeWindowShadowSize, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect(inactiveWindowShadowSize, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect(shadowTopOffset, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect(shadowLeftOffset, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect(shadowColor, SIGNAL(changed(const QColor&)), SLOT(changed()));
- connect(fadeInWindows, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(fadeOnOpacityChange, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(fadeInSpeed, SIGNAL(valueChanged(int)), SLOT(changed()));
- connect(fadeOutSpeed, SIGNAL(valueChanged(int)), SLOT(changed()));
-
- connect(useShadows, SIGNAL(toggled(bool)), dockWindowShadowSize, SLOT(setEnabled(bool)));
- connect(useShadows, SIGNAL(toggled(bool)), activeWindowShadowSize, SLOT(setEnabled(bool)));
- connect(useShadows, SIGNAL(toggled(bool)), inactiveWindowShadowSize, SLOT(setEnabled(bool)));
- connect(useShadows, SIGNAL(toggled(bool)), shadowTopOffset, SLOT(setEnabled(bool)));
- connect(useShadows, SIGNAL(toggled(bool)), shadowLeftOffset, SLOT(setEnabled(bool)));
- connect(useShadows, SIGNAL(toggled(bool)), shadowColor, SLOT(setEnabled(bool)));
+ connect(useTranslucency, TQT_SIGNAL(toggled(bool)), tabW, TQT_SLOT(setEnabled(bool)));
+
+ connect(activeWindowTransparency, TQT_SIGNAL(toggled(bool)), activeWindowOpacity, TQT_SLOT(setEnabled(bool)));
+ connect(inactiveWindowTransparency, TQT_SIGNAL(toggled(bool)), inactiveWindowOpacity, TQT_SLOT(setEnabled(bool)));
+ connect(movingWindowTransparency, TQT_SIGNAL(toggled(bool)), movingWindowOpacity, TQT_SLOT(setEnabled(bool)));
+ connect(dockWindowTransparency, TQT_SIGNAL(toggled(bool)), dockWindowOpacity, TQT_SLOT(setEnabled(bool)));
+
+ connect(useTranslucency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(onlyDecoTranslucent, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(activeWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(inactiveWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(movingWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(dockWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(keepAboveAsActive, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(disableARGB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(removeShadowsOnResize, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(removeShadowsOnMove, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+
+ connect(activeWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(inactiveWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(movingWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(dockWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(dockWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(activeWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(inactiveWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(shadowTopOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(shadowLeftOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(shadowColor, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(changed()));
+ connect(fadeInWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(fadeOnOpacityChange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(fadeInSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+ connect(fadeOutSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+
+ connect(useShadows, TQT_SIGNAL(toggled(bool)), dockWindowShadowSize, TQT_SLOT(setEnabled(bool)));
+ connect(useShadows, TQT_SIGNAL(toggled(bool)), activeWindowShadowSize, TQT_SLOT(setEnabled(bool)));
+ connect(useShadows, TQT_SIGNAL(toggled(bool)), inactiveWindowShadowSize, TQT_SLOT(setEnabled(bool)));
+ connect(useShadows, TQT_SIGNAL(toggled(bool)), shadowTopOffset, TQT_SLOT(setEnabled(bool)));
+ connect(useShadows, TQT_SIGNAL(toggled(bool)), shadowLeftOffset, TQT_SLOT(setEnabled(bool)));
+ connect(useShadows, TQT_SIGNAL(toggled(bool)), shadowColor, TQT_SLOT(setEnabled(bool)));
load();
tabW->setEnabled(useTranslucency->isChecked());
- connect(useTranslucency, SIGNAL(toggled(bool)), this, SLOT(showWarning(bool)));
+ connect(useTranslucency, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showWarning(bool)));
// handle kompmgr restarts if necessary
- connect(useTranslucency, SIGNAL(toggled(bool)), SLOT(resetKompmgr()));
- connect(disableARGB, SIGNAL(toggled(bool)), SLOT(resetKompmgr()));
- connect(useShadows, SIGNAL(toggled(bool)), SLOT(resetKompmgr()));
- connect(inactiveWindowShadowSize, SIGNAL(valueChanged(int)), SLOT(resetKompmgr()));
- connect(shadowTopOffset, SIGNAL(valueChanged(int)), SLOT(resetKompmgr()));
- connect(shadowLeftOffset, SIGNAL(valueChanged(int)), SLOT(resetKompmgr()));
- connect(shadowColor, SIGNAL(changed(const QColor&)), SLOT(resetKompmgr()));
- connect(fadeInWindows, SIGNAL(toggled(bool)), SLOT(resetKompmgr()));
- connect(fadeOnOpacityChange, SIGNAL(toggled(bool)), SLOT(resetKompmgr()));
- connect(fadeInSpeed, SIGNAL(valueChanged(int)), SLOT(resetKompmgr()));
- connect(fadeOutSpeed, SIGNAL(valueChanged(int)), SLOT(resetKompmgr()));
+ connect(useTranslucency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
+ connect(disableARGB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
+ connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
+ connect(inactiveWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
+ connect(shadowTopOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
+ connect(shadowLeftOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
+ connect(shadowColor, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(resetKompmgr()));
+ connect(fadeInWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
+ connect(fadeOnOpacityChange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
+ connect(fadeInSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
+ connect(fadeOutSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
}
}
@@ -1524,7 +1524,7 @@ void KTranslucencyConfig::load( void )
movingWindowOpacity->setEnabled(movingWindowTransparency->isChecked());
dockWindowOpacity->setEnabled(dockWindowTransparency->isChecked());
- KConfig conf_(QDir::homeDirPath() + "/.xcompmgrrc");
+ KConfig conf_(TQDir::homeDirPath() + "/.xcompmgrrc");
conf_.setGroup("xcompmgr");
disableARGB->setChecked(conf_.readBoolEntry("DisableARGB",FALSE));
@@ -1538,14 +1538,14 @@ void KTranslucencyConfig::load( void )
activeWindowShadowSize->setValue((int)(ass*ss/100.0));
inactiveWindowShadowSize->setValue((int)(iss*ss/100.0));
- QString hex = conf_.readEntry("ShadowColor","#000000");
+ TQString hex = conf_.readEntry("ShadowColor","#000000");
uint r, g, b;
r = g = b = 256;
if (sscanf(hex.latin1(), "0x%02x%02x%02x", &r, &g, &b)!=3 || r > 255 || g > 255 || b > 255)
shadowColor->setColor(Qt::black);
else
- shadowColor->setColor(QColor(r,g,b));
+ shadowColor->setColor(TQColor(r,g,b));
fadeInWindows->setChecked(conf_.readBoolEntry("FadeWindows",TRUE));
fadeOnOpacityChange->setChecked(conf_.readBoolEntry("FadeTrans",FALSE));
@@ -1587,7 +1587,7 @@ void KTranslucencyConfig::save( void )
config->writeEntry("OnlyDecoTranslucent", onlyDecoTranslucent->isChecked());
config->writeEntry("ResetKompmgr",resetKompmgr_);
- KConfig *conf_ = new KConfig(QDir::homeDirPath() + "/.xcompmgrrc");
+ KConfig *conf_ = new KConfig(TQDir::homeDirPath() + "/.xcompmgrrc");
conf_->setGroup("xcompmgr");
conf_->writeEntry("Compmode",useShadows->isChecked()?"CompClientShadows":"");
@@ -1598,7 +1598,7 @@ void KTranslucencyConfig::save( void )
int r, g, b;
shadowColor->color().rgb( &r, &g, &b );
- QString hex;
+ TQString hex;
hex.sprintf("0x%02X%02X%02X", r,g,b);
conf_->writeEntry("ShadowColor",hex);
conf_->writeEntry("ShadowRadius",(activeWindowShadowSize->value() + inactiveWindowShadowSize->value()) / 2);
diff --git a/kwin/kcmkwin/kwinoptions/windows.h b/kwin/kcmkwin/kwinoptions/windows.h
index 14537b922..d236b001c 100644
--- a/kwin/kcmkwin/kwinoptions/windows.h
+++ b/kwin/kcmkwin/kwinoptions/windows.h
@@ -22,7 +22,7 @@
#ifndef __KWINDOWCONFIG_H__
#define __KWINDOWCONFIG_H__
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kcmodule.h>
#include <config.h>
@@ -72,7 +72,7 @@ class KFocusConfig : public KCModule
{
Q_OBJECT
public:
- KFocusConfig( bool _standAlone, KConfig *_config, QWidget *parent=0, const char* name=0 );
+ KFocusConfig( bool _standAlone, KConfig *_config, TQWidget *parent=0, const char* name=0 );
~KFocusConfig();
void load();
@@ -109,21 +109,21 @@ private:
void setRollOverDesktops(bool);
void setShowPopupinfo(bool);
- QButtonGroup *fcsBox;
- QComboBox *focusCombo;
- QCheckBox *autoRaiseOn;
- QCheckBox *delayFocusOn;
- QCheckBox *clickRaiseOn;
+ TQButtonGroup *fcsBox;
+ TQComboBox *focusCombo;
+ TQCheckBox *autoRaiseOn;
+ TQCheckBox *delayFocusOn;
+ TQCheckBox *clickRaiseOn;
KIntNumInput *autoRaise;
KIntNumInput *delayFocus;
- QCheckBox *separateScreenFocus;
- QCheckBox *activeMouseScreen;
+ TQCheckBox *separateScreenFocus;
+ TQCheckBox *activeMouseScreen;
- QButtonGroup *kbdBox;
- QCheckBox *altTabPopup;
- QCheckBox *traverseAll;
- QCheckBox *rollOverDesktops;
- QCheckBox *showPopupinfo;
+ TQButtonGroup *kbdBox;
+ TQCheckBox *altTabPopup;
+ TQCheckBox *traverseAll;
+ TQCheckBox *rollOverDesktops;
+ TQCheckBox *showPopupinfo;
KConfig *config;
bool standAlone;
@@ -133,7 +133,7 @@ class KMovingConfig : public KCModule
{
Q_OBJECT
public:
- KMovingConfig( bool _standAlone, KConfig *config, QWidget *parent=0, const char* name=0 );
+ KMovingConfig( bool _standAlone, KConfig *config, TQWidget *parent=0, const char* name=0 );
~KMovingConfig();
void load();
@@ -161,16 +161,16 @@ private:
void setPlacement(int); //CT
void setMoveResizeMaximized(bool);
- QButtonGroup *windowsBox;
- QCheckBox *opaque;
- QCheckBox *resizeOpaqueOn;
- QCheckBox *geometryTipOn;
- QCheckBox* minimizeAnimOn;
- QSlider *minimizeAnimSlider;
- QLabel *minimizeAnimSlowLabel, *minimizeAnimFastLabel;
- QCheckBox *moveResizeMaximized;
+ TQButtonGroup *windowsBox;
+ TQCheckBox *opaque;
+ TQCheckBox *resizeOpaqueOn;
+ TQCheckBox *geometryTipOn;
+ TQCheckBox* minimizeAnimOn;
+ TQSlider *minimizeAnimSlider;
+ TQLabel *minimizeAnimSlowLabel, *minimizeAnimFastLabel;
+ TQCheckBox *moveResizeMaximized;
- QComboBox *placementCombo;
+ TQComboBox *placementCombo;
KConfig *config;
bool standAlone;
@@ -180,9 +180,9 @@ private:
int getWindowSnapZone();
void setWindowSnapZone( int );
- QVButtonGroup *MagicBox;
+ TQVButtonGroup *MagicBox;
KIntNumInput *BrdrSnap, *WndwSnap;
- QCheckBox *OverlapSnap;
+ TQCheckBox *OverlapSnap;
};
@@ -190,7 +190,7 @@ class KAdvancedConfig : public KCModule
{
Q_OBJECT
public:
- KAdvancedConfig( bool _standAlone, KConfig *config, QWidget *parent=0, const char* name=0 );
+ KAdvancedConfig( bool _standAlone, KConfig *config, TQWidget *parent=0, const char* name=0 );
~KAdvancedConfig();
void load();
@@ -212,9 +212,9 @@ private:
void setShadeHover(bool);
void setShadeHoverInterval(int);
- QCheckBox *animateShade;
- QButtonGroup *shBox;
- QCheckBox *shadeHoverOn;
+ TQCheckBox *animateShade;
+ TQButtonGroup *shBox;
+ TQCheckBox *shadeHoverOn;
KIntNumInput *shadeHover;
KConfig *config;
@@ -225,17 +225,17 @@ private:
void setElectricBorders( int );
void setElectricBorderDelay( int );
- QVButtonGroup *electricBox;
- QRadioButton *active_disable;
- QRadioButton *active_move;
- QRadioButton *active_always;
+ TQVButtonGroup *electricBox;
+ TQRadioButton *active_disable;
+ TQRadioButton *active_move;
+ TQRadioButton *active_always;
KIntNumInput *delays;
void setFocusStealing( int );
void setHideUtilityWindowsForInactive( bool );
- QComboBox* focusStealing;
- QCheckBox* hideUtilityWindowsForInactive;
+ TQComboBox* focusStealing;
+ TQCheckBox* hideUtilityWindowsForInactive;
};
class KProcess;
@@ -243,7 +243,7 @@ class KTranslucencyConfig : public KCModule
{
Q_OBJECT
public:
- KTranslucencyConfig( bool _standAlone, KConfig *config, QWidget *parent=0, const char* name=0 );
+ KTranslucencyConfig( bool _standAlone, KConfig *config, TQWidget *parent=0, const char* name=0 );
~KTranslucencyConfig();
void load();
@@ -251,21 +251,21 @@ public:
void defaults();
private:
- QCheckBox *useTranslucency;
- QCheckBox *activeWindowTransparency;
- QCheckBox *inactiveWindowTransparency;
- QCheckBox *movingWindowTransparency;
- QCheckBox *dockWindowTransparency;
- QCheckBox *keepAboveAsActive;
- QCheckBox *disableARGB;
- QCheckBox *fadeInWindows;
- QCheckBox *fadeOnOpacityChange;
- QCheckBox *useShadows;
- QCheckBox *removeShadowsOnResize;
- QCheckBox *removeShadowsOnMove;
- QGroupBox *sGroup;
- QCheckBox *onlyDecoTranslucent;
-// QPushButton *xcompmgrButton;
+ TQCheckBox *useTranslucency;
+ TQCheckBox *activeWindowTransparency;
+ TQCheckBox *inactiveWindowTransparency;
+ TQCheckBox *movingWindowTransparency;
+ TQCheckBox *dockWindowTransparency;
+ TQCheckBox *keepAboveAsActive;
+ TQCheckBox *disableARGB;
+ TQCheckBox *fadeInWindows;
+ TQCheckBox *fadeOnOpacityChange;
+ TQCheckBox *useShadows;
+ TQCheckBox *removeShadowsOnResize;
+ TQCheckBox *removeShadowsOnMove;
+ TQGroupBox *sGroup;
+ TQCheckBox *onlyDecoTranslucent;
+// TQPushButton *xcompmgrButton;
KIntNumInput *activeWindowOpacity;
KIntNumInput *inactiveWindowOpacity;
KIntNumInput *movingWindowOpacity;
diff --git a/kwin/kcmkwin/kwinrules/detectwidget.cpp b/kwin/kcmkwin/kwinrules/detectwidget.cpp
index 1a8fa5af5..1a497c8bc 100644
--- a/kwin/kcmkwin/kwinrules/detectwidget.cpp
+++ b/kwin/kcmkwin/kwinrules/detectwidget.cpp
@@ -22,9 +22,9 @@
#include <klocale.h>
#include <kdebug.h>
#include <kwin.h>
-#include <qlabel.h>
-#include <qradiobutton.h>
-#include <qcheckbox.h>
+#include <tqlabel.h>
+#include <tqradiobutton.h>
+#include <tqcheckbox.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
@@ -34,12 +34,12 @@
namespace KWinInternal
{
-DetectWidget::DetectWidget( QWidget* parent, const char* name )
+DetectWidget::DetectWidget( TQWidget* parent, const char* name )
: DetectWidgetBase( parent, name )
{
}
-DetectDialog::DetectDialog( QWidget* parent, const char* name )
+DetectDialog::DetectDialog( TQWidget* parent, const char* name )
: KDialogBase( parent, name, true, "", Ok | Cancel )
, grabber( NULL )
{
@@ -109,10 +109,10 @@ void DetectDialog::executeDialog()
widget->title_label->setText( title );
widget->extrarole_label->setText( extrarole );
widget->machine_label->setText( machine );
- emit detectionDone( exec() == QDialog::Accepted );
+ emit detectionDone( exec() == TQDialog::Accepted );
}
-QCString DetectDialog::selectedClass() const
+TQCString DetectDialog::selectedClass() const
{
if( widget->use_class->isChecked() || widget->use_role->isChecked())
return wmclass_class;
@@ -124,14 +124,14 @@ bool DetectDialog::selectedWholeClass() const
return widget->use_whole_class->isChecked();
}
-QCString DetectDialog::selectedRole() const
+TQCString DetectDialog::selectedRole() const
{
if( widget->use_role->isChecked())
return role;
return "";
}
-QString DetectDialog::selectedTitle() const
+TQString DetectDialog::selectedTitle() const
{
return title;
}
@@ -151,7 +151,7 @@ NET::WindowType DetectDialog::selectedType() const
return type;
}
-QCString DetectDialog::selectedMachine() const
+TQCString DetectDialog::selectedMachine() const
{
return machine;
}
@@ -161,22 +161,22 @@ void DetectDialog::selectWindow()
// use a dialog, so that all user input is blocked
// use WX11BypassWM and moving away so that it's not actually visible
// grab only mouse, so that keyboard can be used e.g. for switching windows
- grabber = new QDialog( NULL, NULL, true, WX11BypassWM );
+ grabber = new TQDialog( NULL, NULL, true, WX11BypassWM );
grabber->move( -1000, -1000 );
grabber->show();
grabber->grabMouse( crossCursor );
grabber->installEventFilter( this );
}
-bool DetectDialog::eventFilter( QObject* o, QEvent* e )
+bool DetectDialog::eventFilter( TQObject* o, TQEvent* e )
{
if( o != grabber )
return false;
- if( e->type() != QEvent::MouseButtonRelease )
+ if( e->type() != TQEvent::MouseButtonRelease )
return false;
delete grabber;
grabber = NULL;
- if( static_cast< QMouseEvent* >( e )->button() != LeftButton )
+ if( static_cast< TQMouseEvent* >( e )->button() != LeftButton )
{
emit detectionDone( false );
return true;
diff --git a/kwin/kcmkwin/kwinrules/detectwidget.h b/kwin/kcmkwin/kwinrules/detectwidget.h
index 593f4e056..9a2cca3d2 100644
--- a/kwin/kcmkwin/kwinrules/detectwidget.h
+++ b/kwin/kcmkwin/kwinrules/detectwidget.h
@@ -35,7 +35,7 @@ class DetectWidget
{
Q_OBJECT
public:
- DetectWidget( QWidget* parent = NULL, const char* name = NULL );
+ DetectWidget( TQWidget* parent = NULL, const char* name = NULL );
};
class DetectDialog
@@ -43,35 +43,35 @@ class DetectDialog
{
Q_OBJECT
public:
- DetectDialog( QWidget* parent = NULL, const char* name = NULL );
+ DetectDialog( TQWidget* parent = NULL, const char* name = NULL );
void detect( WId window );
- QCString selectedClass() const;
+ TQCString selectedClass() const;
bool selectedWholeClass() const;
- QCString selectedRole() const;
+ TQCString selectedRole() const;
bool selectedWholeApp() const;
NET::WindowType selectedType() const;
- QString selectedTitle() const;
+ TQString selectedTitle() const;
Rules::StringMatch titleMatch() const;
- QCString selectedMachine() const;
+ TQCString selectedMachine() const;
const KWin::WindowInfo& windowInfo() const;
signals:
void detectionDone( bool );
protected:
- virtual bool eventFilter( QObject* o, QEvent* e );
+ virtual bool eventFilter( TQObject* o, TQEvent* e );
private:
void selectWindow();
void readWindow( WId window );
void executeDialog();
WId findWindow();
- QCString wmclass_class;
- QCString wmclass_name;
- QCString role;
+ TQCString wmclass_class;
+ TQCString wmclass_name;
+ TQCString role;
NET::WindowType type;
- QString title;
- QCString extrarole;
- QCString machine;
+ TQString title;
+ TQCString extrarole;
+ TQCString machine;
DetectWidget* widget;
- QDialog* grabber;
+ TQDialog* grabber;
KWin::WindowInfo info;
};
diff --git a/kwin/kcmkwin/kwinrules/kcm.cpp b/kwin/kcmkwin/kwinrules/kcm.cpp
index b40cfa8b2..19b714311 100644
--- a/kwin/kcmkwin/kwinrules/kcm.cpp
+++ b/kwin/kcmkwin/kwinrules/kcm.cpp
@@ -19,7 +19,7 @@
#include "kcm.h"
#include <kglobal.h>
-#include <qlayout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include <kapplication.h>
#include <dcopclient.h>
@@ -28,7 +28,7 @@
#include "ruleslist.h"
extern "C"
- KDE_EXPORT KCModule *create_kwinrules( QWidget *parent, const char *name )
+ KDE_EXPORT KCModule *create_kwinrules( TQWidget *parent, const char *name )
{
//CT there's need for decision: kwm or kwin?
KGlobal::locale()->insertCatalogue( "kcmkwinrules" );
@@ -38,14 +38,14 @@ extern "C"
namespace KWinInternal
{
-KCMRules::KCMRules( QWidget *parent, const char *name )
+KCMRules::KCMRules( TQWidget *parent, const char *name )
: KCModule( parent, name )
, config( "kwinrulesrc" )
{
- QVBoxLayout *layout = new QVBoxLayout( this );
+ TQVBoxLayout *layout = new TQVBoxLayout( this );
widget = new KCMRulesList( this );
layout->addWidget( widget );
- connect( widget, SIGNAL( changed( bool )), SLOT( moduleChanged( bool )));
+ connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool )));
KAboutData *about = new KAboutData(I18N_NOOP( "kcmkwinrules" ),
I18N_NOOP( "Window-Specific Settings Configuration Module" ),
0, 0, KAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" ));
@@ -76,7 +76,7 @@ void KCMRules::defaults()
widget->defaults();
}
-QString KCMRules::quickHelp() const
+TQString KCMRules::quickHelp() const
{
return i18n("<h1>Window-specific Settings</h1> Here you can customize window settings specifically only"
" for some windows."
diff --git a/kwin/kcmkwin/kwinrules/kcm.h b/kwin/kcmkwin/kwinrules/kcm.h
index 47fba75d2..9fb307458 100644
--- a/kwin/kcmkwin/kwinrules/kcm.h
+++ b/kwin/kcmkwin/kwinrules/kcm.h
@@ -36,11 +36,11 @@ class KCMRules
{
Q_OBJECT
public:
- KCMRules( QWidget *parent, const char *name );
+ KCMRules( TQWidget *parent, const char *name );
virtual void load();
virtual void save();
virtual void defaults();
- virtual QString quickHelp() const;
+ virtual TQString quickHelp() const;
protected slots:
void moduleChanged( bool state );
private:
diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp
index 9657e3649..b58c96239 100644
--- a/kwin/kcmkwin/kwinrules/main.cpp
+++ b/kwin/kcmkwin/kwinrules/main.cpp
@@ -32,7 +32,7 @@
namespace KWinInternal
{
-static void loadRules( QValueList< Rules* >& rules )
+static void loadRules( TQValueList< Rules* >& rules )
{
KConfig cfg( "kwinrulesrc", true );
cfg.setGroup( "General" );
@@ -41,52 +41,52 @@ static void loadRules( QValueList< Rules* >& rules )
i <= count;
++i )
{
- cfg.setGroup( QString::number( i ));
+ cfg.setGroup( TQString::number( i ));
Rules* rule = new Rules( cfg );
rules.append( rule );
}
}
-static void saveRules( const QValueList< Rules* >& rules )
+static void saveRules( const TQValueList< Rules* >& rules )
{
KConfig cfg( "kwinrulesrc" );
- QStringList groups = cfg.groupList();
- for( QStringList::ConstIterator it = groups.begin();
+ TQStringList groups = cfg.groupList();
+ for( TQStringList::ConstIterator it = groups.begin();
it != groups.end();
++it )
cfg.deleteGroup( *it );
cfg.setGroup( "General" );
cfg.writeEntry( "count", rules.count());
int i = 1;
- for( QValueList< Rules* >::ConstIterator it = rules.begin();
+ for( TQValueList< Rules* >::ConstIterator it = rules.begin();
it != rules.end();
++it )
{
- cfg.setGroup( QString::number( i ));
+ cfg.setGroup( TQString::number( i ));
(*it)->write( cfg );
++i;
}
}
-static Rules* findRule( const QValueList< Rules* >& rules, Window wid, bool whole_app )
+static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool whole_app )
{
KWin::WindowInfo info = KWin::windowInfo( wid,
NET::WMName | NET::WMWindowType,
NET::WM2WindowClass | NET::WM2WindowRole | NET::WM2ClientMachine );
if( !info.valid()) // shouldn't really happen
return NULL;
- QCString wmclass_class = info.windowClassClass().lower();
- QCString wmclass_name = info.windowClassName().lower();
- QCString role = info.windowRole().lower();
+ TQCString wmclass_class = info.windowClassClass().lower();
+ TQCString wmclass_name = info.windowClassName().lower();
+ TQCString role = info.windowRole().lower();
NET::WindowType type = info.windowType( NET::NormalMask | NET::DesktopMask | NET::DockMask
| NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::OverrideMask | NET::TopMenuMask
| NET::UtilityMask | NET::SplashMask );
- QString title = info.name();
-// QCString extrarole = ""; // TODO
- QCString machine = info.clientMachine().lower();
+ TQString title = info.name();
+// TQCString extrarole = ""; // TODO
+ TQCString machine = info.clientMachine().lower();
Rules* best_match = NULL;
int match_quality = 0;
- for( QValueList< Rules* >::ConstIterator it = rules.begin();
+ for( TQValueList< Rules* >::ConstIterator it = rules.begin();
it != rules.end();
++it )
{
@@ -233,7 +233,7 @@ static Rules* findRule( const QValueList< Rules* >& rules, Window wid, bool whol
static int edit( Window wid, bool whole_app )
{
- QValueList< Rules* > rules;
+ TQValueList< Rules* > rules;
loadRules( rules );
Rules* orig_rule = findRule( rules, wid, whole_app );
RulesDialog dlg;
@@ -248,7 +248,7 @@ static int edit( Window wid, bool whole_app )
}
else if( edited_rule != orig_rule )
{
- QValueList< Rules* >::Iterator pos = rules.find( orig_rule );
+ TQValueList< Rules* >::Iterator pos = rules.find( orig_rule );
if( pos != rules.end())
*pos = edited_rule;
else
diff --git a/kwin/kcmkwin/kwinrules/ruleslist.cpp b/kwin/kcmkwin/kwinrules/ruleslist.cpp
index f4704089f..e525e472f 100644
--- a/kwin/kcmkwin/kwinrules/ruleslist.cpp
+++ b/kwin/kcmkwin/kwinrules/ruleslist.cpp
@@ -29,39 +29,39 @@
namespace KWinInternal
{
-KCMRulesList::KCMRulesList( QWidget* parent, const char* name )
+KCMRulesList::KCMRulesList( TQWidget* parent, const char* name )
: KCMRulesListBase( parent, name )
{
- // connect both current/selected, so that current==selected (stupid QListBox :( )
- connect( rules_listbox, SIGNAL( currentChanged( QListBoxItem* )),
- SLOT( activeChanged( QListBoxItem*)));
- connect( rules_listbox, SIGNAL( selectionChanged( QListBoxItem* )),
- SLOT( activeChanged( QListBoxItem*)));
- connect( new_button, SIGNAL( clicked()),
- SLOT( newClicked()));
- connect( modify_button, SIGNAL( clicked()),
- SLOT( modifyClicked()));
- connect( delete_button, SIGNAL( clicked()),
- SLOT( deleteClicked()));
- connect( moveup_button, SIGNAL( clicked()),
- SLOT( moveupClicked()));
- connect( movedown_button, SIGNAL( clicked()),
- SLOT( movedownClicked()));
- connect( rules_listbox, SIGNAL( doubleClicked ( QListBoxItem * ) ),
- SLOT( modifyClicked()));
+ // connect both current/selected, so that current==selected (stupid TQListBox :( )
+ connect( rules_listbox, TQT_SIGNAL( currentChanged( TQListBoxItem* )),
+ TQT_SLOT( activeChanged( TQListBoxItem*)));
+ connect( rules_listbox, TQT_SIGNAL( selectionChanged( TQListBoxItem* )),
+ TQT_SLOT( activeChanged( TQListBoxItem*)));
+ connect( new_button, TQT_SIGNAL( clicked()),
+ TQT_SLOT( newClicked()));
+ connect( modify_button, TQT_SIGNAL( clicked()),
+ TQT_SLOT( modifyClicked()));
+ connect( delete_button, TQT_SIGNAL( clicked()),
+ TQT_SLOT( deleteClicked()));
+ connect( moveup_button, TQT_SIGNAL( clicked()),
+ TQT_SLOT( moveupClicked()));
+ connect( movedown_button, TQT_SIGNAL( clicked()),
+ TQT_SLOT( movedownClicked()));
+ connect( rules_listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ),
+ TQT_SLOT( modifyClicked()));
load();
}
KCMRulesList::~KCMRulesList()
{
- for( QValueVector< Rules* >::Iterator it = rules.begin();
+ for( TQValueVector< Rules* >::Iterator it = rules.begin();
it != rules.end();
++it )
delete *it;
rules.clear();
}
-void KCMRulesList::activeChanged( QListBoxItem* item )
+void KCMRulesList::activeChanged( TQListBoxItem* item )
{
if( item != NULL )
rules_listbox->setSelected( item, true ); // make current==selected
@@ -114,7 +114,7 @@ void KCMRulesList::moveupClicked()
assert( pos != -1 );
if( pos > 0 )
{
- QString txt = rules_listbox->text( pos );
+ TQString txt = rules_listbox->text( pos );
rules_listbox->removeItem( pos );
rules_listbox->insertItem( txt, pos - 1 );
rules_listbox->setSelected( pos - 1, true );
@@ -131,7 +131,7 @@ void KCMRulesList::movedownClicked()
assert( pos != -1 );
if( pos < int( rules_listbox->count()) - 1 )
{
- QString txt = rules_listbox->text( pos );
+ TQString txt = rules_listbox->text( pos );
rules_listbox->removeItem( pos );
rules_listbox->insertItem( txt, pos + 1 );
rules_listbox->setSelected( pos + 1, true );
@@ -145,7 +145,7 @@ void KCMRulesList::movedownClicked()
void KCMRulesList::load()
{
rules_listbox->clear();
- for( QValueVector< Rules* >::Iterator it = rules.begin();
+ for( TQValueVector< Rules* >::Iterator it = rules.begin();
it != rules.end();
++it )
delete *it;
@@ -158,7 +158,7 @@ void KCMRulesList::load()
i <= count;
++i )
{
- cfg.setGroup( QString::number( i ));
+ cfg.setGroup( TQString::number( i ));
Rules* rule = new Rules( cfg );
rules.append( rule );
rules_listbox->insertItem( rule->description );
@@ -172,19 +172,19 @@ void KCMRulesList::load()
void KCMRulesList::save()
{
KConfig cfg( "kwinrulesrc" );
- QStringList groups = cfg.groupList();
- for( QStringList::ConstIterator it = groups.begin();
+ TQStringList groups = cfg.groupList();
+ for( TQStringList::ConstIterator it = groups.begin();
it != groups.end();
++it )
cfg.deleteGroup( *it );
cfg.setGroup( "General" );
cfg.writeEntry( "count", rules.count());
int i = 1;
- for( QValueVector< Rules* >::ConstIterator it = rules.begin();
+ for( TQValueVector< Rules* >::ConstIterator it = rules.begin();
it != rules.end();
++it )
{
- cfg.setGroup( QString::number( i ));
+ cfg.setGroup( TQString::number( i ));
(*it)->write( cfg );
++i;
}
diff --git a/kwin/kcmkwin/kwinrules/ruleslist.h b/kwin/kcmkwin/kwinrules/ruleslist.h
index b192d2f4e..9dacde63e 100644
--- a/kwin/kcmkwin/kwinrules/ruleslist.h
+++ b/kwin/kcmkwin/kwinrules/ruleslist.h
@@ -22,7 +22,7 @@
#include "ruleslistbase.h"
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
#include "../../rules.h"
@@ -36,7 +36,7 @@ class KCMRulesList
{
Q_OBJECT
public:
- KCMRulesList( QWidget* parent = NULL, const char* name = NULL );
+ KCMRulesList( TQWidget* parent = NULL, const char* name = NULL );
virtual ~KCMRulesList();
void load();
void save();
@@ -49,9 +49,9 @@ class KCMRulesList
void deleteClicked();
void moveupClicked();
void movedownClicked();
- void activeChanged( QListBoxItem* );
+ void activeChanged( TQListBoxItem* );
private:
- QValueVector< Rules* > rules;
+ TQValueVector< Rules* > rules;
};
} // namespace
diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.cpp b/kwin/kcmkwin/kwinrules/ruleswidget.cpp
index 7a8afe292..2525644d9 100644
--- a/kwin/kcmkwin/kwinrules/ruleswidget.cpp
+++ b/kwin/kcmkwin/kwinrules/ruleswidget.cpp
@@ -21,17 +21,17 @@
#include <klineedit.h>
#include <krestrictedline.h>
#include <kcombobox.h>
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
#include <kpushbutton.h>
-#include <qlabel.h>
+#include <tqlabel.h>
#include <kwinmodule.h>
#include <klocale.h>
-#include <qregexp.h>
-#include <qwhatsthis.h>
+#include <tqregexp.h>
+#include <tqwhatsthis.h>
#include <assert.h>
#include <kmessagebox.h>
-#include <qtabwidget.h>
-#include <qtimer.h>
+#include <tqtabwidget.h>
+#include <tqtimer.h>
#include "../../rules.h"
@@ -41,19 +41,19 @@ namespace KWinInternal
{
#define SETUP( var, type ) \
- connect( enable_##var, SIGNAL( toggled( bool )), rule_##var, SLOT( setEnabled( bool ))); \
- connect( enable_##var, SIGNAL( toggled( bool )), this, SLOT( updateEnable##var())); \
- connect( rule_##var, SIGNAL( activated( int )), this, SLOT( updateEnable##var())); \
- QWhatsThis::add( enable_##var, enableDesc ); \
- QWhatsThis::add( rule_##var, type##RuleDesc );
+ connect( enable_##var, TQT_SIGNAL( toggled( bool )), rule_##var, TQT_SLOT( setEnabled( bool ))); \
+ connect( enable_##var, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( updateEnable##var())); \
+ connect( rule_##var, TQT_SIGNAL( activated( int )), this, TQT_SLOT( updateEnable##var())); \
+ TQWhatsThis::add( enable_##var, enableDesc ); \
+ TQWhatsThis::add( rule_##var, type##RuleDesc );
-RulesWidget::RulesWidget( QWidget* parent, const char* name )
+RulesWidget::RulesWidget( TQWidget* parent, const char* name )
: RulesWidgetBase( parent, name )
, detect_dlg( NULL )
{
- QString enableDesc =
+ TQString enableDesc =
i18n( "Enable this checkbox to alter this window property for the specified window(s)." );
- QString setRuleDesc =
+ TQString setRuleDesc =
i18n( "Specify how the window property should be affected:<ul>"
"<li><em>Do Not Affect:</em> The window property will not be affected and therefore"
" the default handling for it will be used. Specifying this will block more generic"
@@ -68,7 +68,7 @@ RulesWidget::RulesWidget( QWidget* parent, const char* name )
"<li><em>Force temporarily:</em> The window property will be forced to the given value"
" until it is hidden (this action will be deleted after the window is hidden).</li>"
"</ul>" );
- QString forceRuleDesc =
+ TQString forceRuleDesc =
i18n( "Specify how the window property should be affected:<ul>"
"<li><em>Do Not Affect:</em> The window property will not be affected and therefore"
" the default handling for it will be used. Specifying this will block more generic"
@@ -113,7 +113,7 @@ RulesWidget::RulesWidget( QWidget* parent, const char* name )
for( i = 1;
i <= module.numberOfDesktops();
++i )
- desktop->insertItem( QString::number( i ).rightJustify( 2 ) + ":" + module.desktopName( i ));
+ desktop->insertItem( TQString::number( i ).rightJustify( 2 ) + ":" + module.desktopName( i ));
desktop->insertItem( i18n( "All Desktops" ));
}
@@ -202,45 +202,45 @@ static const Rules::ForceRule combo_to_force_rule[] =
( Rules::ForceRule )Rules::ForceTemporarily
};
-static QString positionToStr( const QPoint& p )
+static TQString positionToStr( const TQPoint& p )
{
if( p == invalidPoint )
- return QString::null;
- return QString::number( p.x()) + "," + QString::number( p.y());
+ return TQString::null;
+ return TQString::number( p.x()) + "," + TQString::number( p.y());
}
-static QPoint strToPosition( const QString& str )
+static TQPoint strToPosition( const TQString& str )
{ // two numbers, with + or -, separated by any of , x X :
- QRegExp reg( "\\s*([+-]?[0-9]*)\\s*[,xX:]\\s*([+-]?[0-9]*)\\s*" );
+ TQRegExp reg( "\\s*([+-]?[0-9]*)\\s*[,xX:]\\s*([+-]?[0-9]*)\\s*" );
if( !reg.exactMatch( str ))
return invalidPoint;
- return QPoint( reg.cap( 1 ).toInt(), reg.cap( 2 ).toInt());
+ return TQPoint( reg.cap( 1 ).toInt(), reg.cap( 2 ).toInt());
}
-static QString sizeToStr( const QSize& s )
+static TQString sizeToStr( const TQSize& s )
{
if( !s.isValid())
- return QString::null;
- return QString::number( s.width()) + "," + QString::number( s.height());
+ return TQString::null;
+ return TQString::number( s.width()) + "," + TQString::number( s.height());
}
-static QSize strToSize( const QString& str )
+static TQSize strToSize( const TQString& str )
{ // two numbers, with + or -, separated by any of , x X :
- QRegExp reg( "\\s*([+-]?[0-9]*)\\s*[,xX:]\\s*([+-]?[0-9]*)\\s*" );
+ TQRegExp reg( "\\s*([+-]?[0-9]*)\\s*[,xX:]\\s*([+-]?[0-9]*)\\s*" );
if( !reg.exactMatch( str ))
- return QSize();
- return QSize( reg.cap( 1 ).toInt(), reg.cap( 2 ).toInt());
+ return TQSize();
+ return TQSize( reg.cap( 1 ).toInt(), reg.cap( 2 ).toInt());
}
//used for opacity settings
-static QString intToStr( const int& s )
+static TQString intToStr( const int& s )
{
if( s < 1 || s > 100 )
- return QString::null;
- return QString::number(s);
+ return TQString::null;
+ return TQString::number(s);
}
-static int strToInt( const QString& str )
+static int strToInt( const TQString& str )
{
int tmp = str.toInt();
if( tmp < 1 || tmp > 100 )
@@ -550,7 +550,7 @@ void RulesWidget::detectClicked()
{
assert( detect_dlg == NULL );
detect_dlg = new DetectDialog;
- connect( detect_dlg, SIGNAL( detectionDone( bool )), this, SLOT( detected( bool )));
+ connect( detect_dlg, TQT_SIGNAL( detectionDone( bool )), this, TQT_SLOT( detected( bool )));
detect_dlg->detect( 0 );
}
@@ -682,11 +682,11 @@ void RulesWidget::shortcutEditClicked()
{
EditShortcutDialog dlg( topLevelWidget());
dlg.setShortcut( shortcut->text());
- if( dlg.exec() == QDialog::Accepted )
+ if( dlg.exec() == TQDialog::Accepted )
shortcut->setText( dlg.shortcut());
}
-RulesDialog::RulesDialog( QWidget* parent, const char* name )
+RulesDialog::RulesDialog( TQWidget* parent, const char* name )
: KDialogBase( parent, name, true, i18n( "Edit Window-Specific Settings" ), Ok | Cancel )
{
widget = new RulesWidget( this );
@@ -702,14 +702,14 @@ Rules* RulesDialog::edit( Rules* r, WId window, bool show_hints )
if( window != 0 )
widget->prepareWindowSpecific( window );
if( show_hints )
- QTimer::singleShot( 0, this, SLOT( displayHints()));
+ TQTimer::singleShot( 0, this, TQT_SLOT( displayHints()));
exec();
return rules;
}
void RulesDialog::displayHints()
{
- QString str = "<qt><p>";
+ TQString str = "<qt><p>";
str += i18n( "This configuration dialog allows altering settings only for the selected window"
" or application. Find the setting you want to affect, enable the setting using the checkbox,"
" select in what way the setting should be affected and to which value." );
@@ -717,7 +717,7 @@ void RulesDialog::displayHints()
str += "</p><p>" + i18n( "Consult the documentation for more details." );
#endif
str += "</p></qt>";
- KMessageBox::information( this, str, QString::null, "displayhints" );
+ KMessageBox::information( this, str, TQString::null, "displayhints" );
}
void RulesDialog::accept()
@@ -728,7 +728,7 @@ void RulesDialog::accept()
KDialogBase::accept();
}
-EditShortcut::EditShortcut( QWidget* parent, const char* name )
+EditShortcut::EditShortcut( TQWidget* parent, const char* name )
: EditShortcutBase( parent, name )
{
}
@@ -736,7 +736,7 @@ EditShortcut::EditShortcut( QWidget* parent, const char* name )
void EditShortcut::editShortcut()
{
ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget());
- if( dlg.exec() == QDialog::Accepted )
+ if( dlg.exec() == TQDialog::Accepted )
shortcut->setText( dlg.shortcut().toString());
}
@@ -745,24 +745,24 @@ void EditShortcut::clearShortcut()
shortcut->setText( "" );
}
-EditShortcutDialog::EditShortcutDialog( QWidget* parent, const char* name )
+EditShortcutDialog::EditShortcutDialog( TQWidget* parent, const char* name )
: KDialogBase( parent, name, true, i18n( "Edit Shortcut" ), Ok | Cancel )
{
widget = new EditShortcut( this );
setMainWidget( widget );
}
-void EditShortcutDialog::setShortcut( const QString& cut )
+void EditShortcutDialog::setShortcut( const TQString& cut )
{
widget->shortcut->setText( cut );
}
-QString EditShortcutDialog::shortcut() const
+TQString EditShortcutDialog::shortcut() const
{
return widget->shortcut->text();
}
-ShortcutDialog::ShortcutDialog( const KShortcut& cut, QWidget* parent, const char* name )
+ShortcutDialog::ShortcutDialog( const KShortcut& cut, TQWidget* parent, const char* name )
: KShortcutDialog( cut, false /*TODO???*/, parent, name )
{
}
diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.h b/kwin/kcmkwin/kwinrules/ruleswidget.h
index 94af87ef4..b47ad88ab 100644
--- a/kwin/kcmkwin/kwinrules/ruleswidget.h
+++ b/kwin/kcmkwin/kwinrules/ruleswidget.h
@@ -38,7 +38,7 @@ class RulesWidget
{
Q_OBJECT
public:
- RulesWidget( QWidget* parent = NULL, const char* name = NULL );
+ RulesWidget( TQWidget* parent = NULL, const char* name = NULL );
void setRules( Rules* r );
Rules* rules() const;
bool finalCheck();
@@ -99,7 +99,7 @@ class RulesDialog
{
Q_OBJECT
public:
- RulesDialog( QWidget* parent = NULL, const char* name = NULL );
+ RulesDialog( TQWidget* parent = NULL, const char* name = NULL );
Rules* edit( Rules* r, WId window, bool show_hints );
protected:
virtual void accept();
@@ -115,7 +115,7 @@ class EditShortcut
{
Q_OBJECT
public:
- EditShortcut( QWidget* parent = NULL, const char* name = NULL );
+ EditShortcut( TQWidget* parent = NULL, const char* name = NULL );
protected:
void editShortcut();
void clearShortcut();
@@ -126,9 +126,9 @@ class EditShortcutDialog
{
Q_OBJECT
public:
- EditShortcutDialog( QWidget* parent = NULL, const char* name = NULL );
- void setShortcut( const QString& cut );
- QString shortcut() const;
+ EditShortcutDialog( TQWidget* parent = NULL, const char* name = NULL );
+ void setShortcut( const TQString& cut );
+ TQString shortcut() const;
private:
EditShortcut* widget;
};
@@ -139,7 +139,7 @@ class ShortcutDialog
{
Q_OBJECT
public:
- ShortcutDialog( const KShortcut& cut, QWidget* parent = NULL, const char* name = NULL );
+ ShortcutDialog( const KShortcut& cut, TQWidget* parent = NULL, const char* name = NULL );
virtual void accept();
};
diff --git a/kwin/killer/killer.cpp b/kwin/killer/killer.cpp
index eed473cf5..ae31fc3e0 100644
--- a/kwin/killer/killer.cpp
+++ b/kwin/killer/killer.cpp
@@ -51,11 +51,11 @@ int main( int argc, char* argv[] )
KCmdLineArgs::addCmdLineOptions( options );
KApplication app;
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
- QCString hostname = args->getOption( "hostname" );
+ TQCString hostname = args->getOption( "hostname" );
bool pid_ok = false;
pid_t pid = args->getOption( "pid" ).toULong( &pid_ok );
- QString caption = QString::fromUtf8( args->getOption( "windowname" ));
- QString appname = QString::fromLatin1( args->getOption( "applicationname" ));
+ TQString caption = TQString::fromUtf8( args->getOption( "windowname" ));
+ TQString appname = TQString::fromLatin1( args->getOption( "applicationname" ));
bool id_ok = false;
Window id = args->getOption( "wid" ).toULong( &id_ok );
bool time_ok = false;
@@ -67,13 +67,13 @@ int main( int argc, char* argv[] )
KCmdLineArgs::usage( i18n( "This helper utility is not supposed to be called directly." ));
return 1;
}
- QString question = i18n(
+ TQString question = i18n(
"<qt>Window with title \"<b>%2</b>\" is not responding. "
"This window belongs to application <b>%1</b> (PID=%3, hostname=%4).<p>"
"Do you wish to terminate this application? (All unsaved data in this application will be lost.)</qt>" )
.arg( appname ).arg( caption ).arg( pid ).arg( hostname );
app.updateUserTimestamp( timestamp );
- if( KMessageBox::warningYesNoWId( id, question, QString::null, i18n("Terminate"), i18n("Keep Running") ) == KMessageBox::Yes )
+ if( KMessageBox::warningYesNoWId( id, question, TQString::null, i18n("Terminate"), i18n("Keep Running") ) == KMessageBox::Yes )
{
if( hostname != "localhost" )
{
diff --git a/kwin/killwindow.cpp b/kwin/killwindow.cpp
index 6d0152349..7dc6504f9 100644
--- a/kwin/killwindow.cpp
+++ b/kwin/killwindow.cpp
@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
//#define QT_CLEAN_NAMESPACE
//#endif
#include "killwindow.h"
-#include <qcursor.h>
+#include <tqcursor.h>
#include <X11/Xlib.h>
#include <X11/keysym.h>
#include <X11/keysymdef.h>
@@ -75,7 +75,7 @@ void KillWindow::start()
mx /= 10;
my /= 10;
}
- QCursor::setPos(QCursor::pos()+QPoint(mx, my));
+ TQCursor::setPos(TQCursor::pos()+TQPoint(mx, my));
}
if (ev.type == ButtonRelease)
diff --git a/kwin/kwinbindings.cpp b/kwin/kwinbindings.cpp
index 9dee0a071..45a927f48 100644
--- a/kwin/kwinbindings.cpp
+++ b/kwin/kwinbindings.cpp
@@ -1,13 +1,13 @@
#ifndef NOSLOTS
# define DEF2( name, descr, key3, key4, fnSlot ) \
- keys->insert( name, i18n(descr), QString::null, key3, key4, this, SLOT(fnSlot) )
+ keys->insert( name, i18n(descr), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) )
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4, this, SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) )
#else
# define DEF2( name, descr, key3, key4, fnSlot ) \
- keys->insert( name, i18n(descr), QString::null, key3, key4 )
+ keys->insert( name, i18n(descr), TQString::null, key3, key4 )
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4 )
+ keys->insert( name, i18n(name), TQString::null, key3, key4 )
#endif
#define WIN KKey::QtWIN
diff --git a/kwin/layers.cpp b/kwin/layers.cpp
index 28085cf27..40a7583a4 100644
--- a/kwin/layers.cpp
+++ b/kwin/layers.cpp
@@ -515,7 +515,7 @@ ClientList Workspace::constrainedStackingOrder()
kdDebug() << "stacking1:" << endl;
#endif
// build the order from layers
- QMap< Group*, Layer > minimum_layer;
+ TQMap< Group*, Layer > minimum_layer;
for( ClientList::ConstIterator it = unconstrained_stacking_order.begin();
it != unconstrained_stacking_order.end();
++it )
diff --git a/kwin/lib/kcommondecoration.cpp b/kwin/lib/kcommondecoration.cpp
index 58a95b599..32a297683 100644
--- a/kwin/lib/kcommondecoration.cpp
+++ b/kwin/lib/kcommondecoration.cpp
@@ -22,12 +22,12 @@
DEALINGS IN THE SOFTWARE.
*/
-#include <qapplication.h>
-#include <qcursor.h>
-#include <qdatetime.h>
-#include <qlabel.h>
-#include <qtooltip.h>
-#include <qwidget.h>
+#include <tqapplication.h>
+#include <tqcursor.h>
+#include <tqdatetime.h>
+#include <tqlabel.h>
+#include <tqtooltip.h>
+#include <tqwidget.h>
#include <kdebug.h>
@@ -118,8 +118,8 @@ void KCommonDecoration::init()
resetLayout();
- connect(this, SIGNAL(keepAboveChanged(bool) ), SLOT(keepAboveChange(bool) ) );
- connect(this, SIGNAL(keepBelowChanged(bool) ), SLOT(keepBelowChange(bool) ) );
+ connect(this, TQT_SIGNAL(keepAboveChanged(bool) ), TQT_SLOT(keepAboveChange(bool) ) );
+ connect(this, TQT_SIGNAL(keepBelowChanged(bool) ), TQT_SLOT(keepBelowChange(bool) ) );
updateCaption();
}
@@ -132,9 +132,9 @@ void KCommonDecoration::reset( unsigned long changed )
}
}
-QRegion KCommonDecoration::cornerShape(WindowCorner)
+TQRegion KCommonDecoration::cornerShape(WindowCorner)
{
- return QRegion();
+ return TQRegion();
}
void KCommonDecoration::updateCaption()
@@ -157,7 +157,7 @@ void KCommonDecoration::borders( int& left, int& right, int& top, int& bottom )
void KCommonDecoration::updateLayout() const
{
- QRect r = widget()->rect();
+ TQRect r = widget()->rect();
int r_x, r_y, r_x2, r_y2;
r.coords(&r_x, &r_y, &r_x2, &r_y2);
@@ -182,7 +182,7 @@ void KCommonDecoration::updateLayout() const
// resize buttons...
for (int n=0; n<NumButtons; n++) {
if (m_button[n]) {
- QSize newSize = QSize(layoutMetric(LM_ButtonWidth, true, m_button[n]),
+ TQSize newSize = TQSize(layoutMetric(LM_ButtonWidth, true, m_button[n]),
layoutMetric(LM_ButtonHeight, true, m_button[n]) );
if (newSize != m_button[n]->size() )
m_button[n]->setSize(newSize);
@@ -262,7 +262,7 @@ void KCommonDecoration::resetLayout()
// shown instead of the window contents in decoration previews
if(isPreview() ) {
- m_previewWidget = new QLabel(i18n("%1 is the name of window decoration style", "<center><b>%1 preview</b></center>").arg(visibleName() ), widget());
+ m_previewWidget = new TQLabel(i18n("%1 is the name of window decoration style", "<center><b>%1 preview</b></center>").arg(visibleName() ), widget());
m_previewWidget->show();
}
@@ -316,7 +316,7 @@ int KCommonDecoration::buttonContainerWidth(const ButtonContainer &btnContainer,
return w;
}
-void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const QString& s, bool isLeft)
+void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString& s, bool isLeft)
{
if (s.length() > 0) {
for (unsigned n=0; n < s.length(); n++) {
@@ -328,8 +328,8 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const QString&
if (!btn) break;
btn->setTipText(i18n("Menu") );
btn->setRealizeButtons(LeftButton|RightButton);
- connect(btn, SIGNAL(pressed()), SLOT(menuButtonPressed()));
- connect(btn, SIGNAL(released()), this, SLOT(menuButtonReleased()));
+ connect(btn, TQT_SIGNAL(pressed()), TQT_SLOT(menuButtonPressed()));
+ connect(btn, TQT_SIGNAL(released()), this, TQT_SLOT(menuButtonReleased()));
m_button[MenuButton] = btn;
}
@@ -342,7 +342,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const QString&
btn->setTipText(oad?i18n("Not on all desktops"):i18n("On all desktops") );
btn->setToggleButton(true);
btn->setOn( oad );
- connect(btn, SIGNAL(clicked()), SLOT(toggleOnAllDesktops()));
+ connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(toggleOnAllDesktops()));
m_button[OnAllDesktopsButton] = btn;
}
@@ -352,7 +352,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const QString&
btn = createButton(HelpButton);
if (!btn) break;
btn->setTipText(i18n("Help") );
- connect(btn, SIGNAL(clicked()), SLOT(showContextHelp()));
+ connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(showContextHelp()));
m_button[HelpButton] = btn;
}
@@ -362,7 +362,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const QString&
btn = createButton(MinButton);
if (!btn) break;
btn->setTipText(i18n("Minimize") );
- connect(btn, SIGNAL(clicked()), SLOT(minimize()));
+ connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(minimize()));
m_button[MinButton] = btn;
}
@@ -376,7 +376,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const QString&
btn->setTipText(max?i18n("Restore"):i18n("Maximize") );
btn->setToggleButton(true);
btn->setOn( max );
- connect(btn, SIGNAL(clicked()), SLOT(slotMaximize()));
+ connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotMaximize()));
m_button[MaxButton] = btn;
}
@@ -386,7 +386,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const QString&
btn = createButton(CloseButton);
if (!btn) break;
btn->setTipText(i18n("Close") );
- connect(btn, SIGNAL(clicked()), SLOT(closeWindow()));
+ connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(closeWindow()));
m_button[CloseButton] = btn;
}
@@ -399,7 +399,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const QString&
btn->setTipText(above?i18n("Do not keep above others"):i18n("Keep above others") );
btn->setToggleButton(true);
btn->setOn( above );
- connect(btn, SIGNAL(clicked()), SLOT(slotKeepAbove()));
+ connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepAbove()));
m_button[AboveButton] = btn;
}
@@ -412,7 +412,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const QString&
btn->setTipText(below?i18n("Do not keep below others"):i18n("Keep below others") );
btn->setToggleButton(true);
btn->setOn( below );
- connect(btn, SIGNAL(clicked()), SLOT(slotKeepBelow()));
+ connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepBelow()));
m_button[BelowButton] = btn;
}
@@ -425,7 +425,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const QString&
btn->setTipText(shaded?i18n("Unshade"):i18n("Shade") );
btn->setToggleButton(true);
btn->setOn( shaded );
- connect(btn, SIGNAL(clicked()), SLOT(slotShade()));
+ connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotShade()));
m_button[ShadeButton] = btn;
}
@@ -437,7 +437,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const QString&
if (btn) {
btn->setLeft(isLeft);
- btn->setSize(QSize(layoutMetric(LM_ButtonWidth, true, btn),layoutMetric(LM_ButtonHeight, true, btn)) );
+ btn->setSize(TQSize(layoutMetric(LM_ButtonWidth, true, btn),layoutMetric(LM_ButtonHeight, true, btn)) );
btn->show();
btnContainer.append(btn);
}
@@ -492,17 +492,17 @@ void KCommonDecoration::show()
widget()->show();
}
-void KCommonDecoration::resize( const QSize& s )
+void KCommonDecoration::resize( const TQSize& s )
{
widget()->resize( s );
}
-QSize KCommonDecoration::minimumSize() const
+TQSize KCommonDecoration::minimumSize() const
{
const int minWidth = QMAX(layoutMetric(LM_TitleEdgeLeft), layoutMetric(LM_BorderLeft))
+QMAX(layoutMetric(LM_TitleEdgeRight), layoutMetric(LM_BorderRight))
+layoutMetric(LM_TitleBorderLeft)+layoutMetric(LM_TitleBorderRight);
- return QSize(minWidth,
+ return TQSize(minWidth,
layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)
+layoutMetric(LM_TitleEdgeBottom)
+layoutMetric(LM_BorderBottom) );
@@ -623,19 +623,19 @@ void KCommonDecoration::slotKeepBelow()
void KCommonDecoration::menuButtonPressed()
{
- static QTime* t = NULL;
+ static TQTime* t = NULL;
static KCommonDecoration* lastClient = NULL;
if (t == NULL)
t = new QTime;
- bool dbl = (lastClient==this && t->elapsed() <= QApplication::doubleClickInterval());
+ bool dbl = (lastClient==this && t->elapsed() <= TQApplication::doubleClickInterval());
lastClient = this;
t->start();
if (!dbl || !decorationBehaviour(DB_MenuClose) ) {
- QRect menuRect = m_button[MenuButton]->rect();
- QPoint menutop = m_button[MenuButton]->mapToGlobal(menuRect.topLeft());
- QPoint menubottom = m_button[MenuButton]->mapToGlobal(menuRect.bottomRight())+QPoint(0,2);
+ TQRect menuRect = m_button[MenuButton]->rect();
+ TQPoint menutop = m_button[MenuButton]->mapToGlobal(menuRect.topLeft());
+ TQPoint menubottom = m_button[MenuButton]->mapToGlobal(menuRect.bottomRight())+TQPoint(0,2);
KDecorationFactory* f = factory();
- showWindowMenu(QRect(menutop, menubottom));
+ showWindowMenu(TQRect(menutop, menubottom));
if( !f->exists( this )) // 'this' was deleted
return;
m_button[MenuButton]->setDown(false);
@@ -650,7 +650,7 @@ void KCommonDecoration::menuButtonReleased()
closeWindow();
}
-void KCommonDecoration::resizeEvent(QResizeEvent */*e*/)
+void KCommonDecoration::resizeEvent(TQResizeEvent */*e*/)
{
if (decorationBehaviour(DB_ButtonHide) )
calcHiddenButtons();
@@ -663,9 +663,9 @@ void KCommonDecoration::resizeEvent(QResizeEvent */*e*/)
// widget()->update();
}
-void KCommonDecoration::moveWidget(int x, int y, QWidget *widget) const
+void KCommonDecoration::moveWidget(int x, int y, TQWidget *widget) const
{
- QPoint p = widget->pos();
+ TQPoint p = widget->pos();
int oldX = p.y();
int oldY = p.x();
@@ -673,9 +673,9 @@ void KCommonDecoration::moveWidget(int x, int y, QWidget *widget) const
widget->move(x,y);
}
-void KCommonDecoration::resizeWidget(int w, int h, QWidget *widget) const
+void KCommonDecoration::resizeWidget(int w, int h, TQWidget *widget) const
{
- QSize s = widget->size();
+ TQSize s = widget->size();
int oldW = s.width();
int oldH = s.height();
@@ -683,7 +683,7 @@ void KCommonDecoration::resizeWidget(int w, int h, QWidget *widget) const
widget->resize(w,h);
}
-void KCommonDecoration::mouseDoubleClickEvent(QMouseEvent *e)
+void KCommonDecoration::mouseDoubleClickEvent(TQMouseEvent *e)
{
if( e->button() != LeftButton )
return;
@@ -695,19 +695,19 @@ void KCommonDecoration::mouseDoubleClickEvent(QMouseEvent *e)
titlebarDblClickOperation();
}
-void KCommonDecoration::wheelEvent(QWheelEvent *e)
+void KCommonDecoration::wheelEvent(TQWheelEvent *e)
{
int tb = layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeBottom);
if (isSetShade() || e->pos().y() <= tb )
titlebarMouseWheelOperation( e->delta());
}
-KCommonDecoration::Position KCommonDecoration::mousePosition(const QPoint &point) const
+KCommonDecoration::Position KCommonDecoration::mousePosition(const TQPoint &point) const
{
const int corner = 18+3*layoutMetric(LM_BorderBottom, false)/2;
Position pos = PositionCenter;
- QRect r = widget()->rect();
+ TQRect r = widget()->rect();
int r_x, r_y, r_x2, r_y2;
r.coords(&r_x, &r_y, &r_x2, &r_y2);
int p_x = point.x();
@@ -778,12 +778,12 @@ void KCommonDecoration::updateWindowShape()
bool tl=true,tr=true,bl=true,br=true; // is there a transparent rounded corner in top-left? etc
- QDesktopWidget *desktop=KApplication::desktop();
+ TQDesktopWidget *desktop=KApplication::desktop();
// no transparent rounded corners if this window corner lines up with a screen corner
for(int screen=0; screen < desktop->numScreens(); ++screen)
{
- QRect fullscreen(desktop->screenGeometry(screen));
- QRect window = geometry();
+ TQRect fullscreen(desktop->screenGeometry(screen));
+ TQRect window = geometry();
if(window.topLeft() == fullscreen.topLeft() ) tl = false;
if(window.topRight() == fullscreen.topRight() ) tr = false;
@@ -791,7 +791,7 @@ void KCommonDecoration::updateWindowShape()
if(window.bottomRight()== fullscreen.bottomRight() ) br = false;
}
- QRegion mask(0, 0, w, h);
+ TQRegion mask(0, 0, w, h);
// Remove top-left corner.
if(tl)
@@ -817,26 +817,26 @@ void KCommonDecoration::updateWindowShape()
setMask( mask );
}
-bool KCommonDecoration::eventFilter( QObject* o, QEvent* e )
+bool KCommonDecoration::eventFilter( TQObject* o, TQEvent* e )
{
if( o != widget())
return false;
switch( e->type())
{
- case QEvent::Resize:
- resizeEvent(static_cast<QResizeEvent*>(e) );
+ case TQEvent::Resize:
+ resizeEvent(static_cast<TQResizeEvent*>(e) );
return true;
- case QEvent::Paint:
- paintEvent( static_cast< QPaintEvent* >( e ));
+ case TQEvent::Paint:
+ paintEvent( static_cast< TQPaintEvent* >( e ));
return true;
- case QEvent::MouseButtonDblClick:
- mouseDoubleClickEvent( static_cast< QMouseEvent* >( e ));
+ case TQEvent::MouseButtonDblClick:
+ mouseDoubleClickEvent( static_cast< TQMouseEvent* >( e ));
return true;
- case QEvent::MouseButtonPress:
- processMousePressEvent( static_cast< QMouseEvent* >( e ));
+ case TQEvent::MouseButtonPress:
+ processMousePressEvent( static_cast< TQMouseEvent* >( e ));
return true;
- case QEvent::Wheel:
- wheelEvent( static_cast< QWheelEvent* >( e ));
+ case TQEvent::Wheel:
+ wheelEvent( static_cast< TQWheelEvent* >( e ));
return true;
default:
return false;
@@ -853,7 +853,7 @@ bool KCommonDecoration::isToolWindow() const
return ((type==NET::Toolbar)||(type==NET::Utility)||(type==NET::Menu));
}
-QRect KCommonDecoration::titleRect() const
+TQRect KCommonDecoration::titleRect() const
{
int r_x, r_y, r_x2, r_y2;
widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2);
@@ -865,14 +865,14 @@ QRect KCommonDecoration::titleRect() const
const int titleBorderRight = layoutMetric(LM_TitleBorderRight);
const int ttlHeight = layoutMetric(LM_TitleHeight);
const int titleEdgeBottomBottom = r_y+titleEdgeTop+ttlHeight+titleEdgeBottom-1;
- return QRect(r_x+titleEdgeLeft+buttonsLeftWidth()+titleBorderLeft, r_y+titleEdgeTop,
+ return TQRect(r_x+titleEdgeLeft+buttonsLeftWidth()+titleBorderLeft, r_y+titleEdgeTop,
r_x2-titleEdgeRight-buttonsRightWidth()-titleBorderRight-(r_x+titleEdgeLeft+buttonsLeftWidth()+titleBorderLeft),
titleEdgeBottomBottom-(r_y+titleEdgeTop) );
}
KCommonDecorationButton::KCommonDecorationButton(ButtonType type, KCommonDecoration *parent, const char *name)
- : QButton(parent->widget(), name),
+ : TQButton(parent->widget(), name),
m_decoration(parent),
m_type(type),
m_realizeButtons(LeftButton),
@@ -911,7 +911,7 @@ void KCommonDecorationButton::setRealizeButtons(int btns)
m_realizeButtons = btns;
}
-void KCommonDecorationButton::setSize(const QSize &s)
+void KCommonDecorationButton::setSize(const TQSize &s)
{
if (!m_size.isValid() || s != size() ) {
m_size = s;
@@ -921,46 +921,46 @@ void KCommonDecorationButton::setSize(const QSize &s)
}
}
-QSize KCommonDecorationButton::sizeHint() const
+TQSize KCommonDecorationButton::sizeHint() const
{
return m_size;
}
-void KCommonDecorationButton::setTipText(const QString &tip) {
- QToolTip::remove(this );
- QToolTip::add(this, tip );
+void KCommonDecorationButton::setTipText(const TQString &tip) {
+ TQToolTip::remove(this );
+ TQToolTip::add(this, tip );
}
void KCommonDecorationButton::setToggleButton(bool toggle)
{
- QButton::setToggleButton(toggle);
+ TQButton::setToggleButton(toggle);
reset(ToggleChange);
}
void KCommonDecorationButton::setOn(bool on)
{
if (on != isOn() ) {
- QButton::setOn(on);
+ TQButton::setOn(on);
reset(StateChange);
}
}
-void KCommonDecorationButton::mousePressEvent(QMouseEvent* e)
+void KCommonDecorationButton::mousePressEvent(TQMouseEvent* e)
{
m_lastMouse = e->button();
// pass on event after changing button to LeftButton
- QMouseEvent me(e->type(), e->pos(), e->globalPos(),
+ TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
(e->button()&m_realizeButtons)?LeftButton:NoButton, e->state());
- QButton::mousePressEvent(&me);
+ TQButton::mousePressEvent(&me);
}
-void KCommonDecorationButton::mouseReleaseEvent(QMouseEvent* e)
+void KCommonDecorationButton::mouseReleaseEvent(TQMouseEvent* e)
{
m_lastMouse = e->button();
// pass on event after changing button to LeftButton
- QMouseEvent me(e->type(), e->pos(), e->globalPos(),
+ TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
(e->button()&m_realizeButtons)?LeftButton:NoButton, e->state());
- QButton::mouseReleaseEvent(&me);
+ TQButton::mouseReleaseEvent(&me);
}
diff --git a/kwin/lib/kcommondecoration.h b/kwin/lib/kcommondecoration.h
index 9495cf148..f515a7da7 100644
--- a/kwin/lib/kcommondecoration.h
+++ b/kwin/lib/kcommondecoration.h
@@ -25,8 +25,8 @@
#ifndef KCOMMONDECORATION_H
#define KCOMMONDECORATION_H
-#include <qbutton.h>
-#include <qvaluevector.h>
+#include <tqbutton.h>
+#include <tqvaluevector.h>
#include "kdecoration.h"
@@ -134,19 +134,19 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration
/**
* The name of the decoration used in the decoration preview.
*/
- virtual QString visibleName() const = 0;
+ virtual TQString visibleName() const = 0;
/**
* The default title button order on the left.
* @see KDecoration::titleButtonsLeft()
* @see KDecoration::titleButtonsRight()
*/
- virtual QString defaultButtonsLeft() const = 0;
+ virtual TQString defaultButtonsLeft() const = 0;
/**
* The default title button order on the left.
* @see KDecoration::titleButtonsLeft()
* @see KDecoration::titleButtonsRight()
*/
- virtual QString defaultButtonsRight() const = 0;
+ virtual TQString defaultButtonsRight() const = 0;
/**
* This controls whether some specific behaviour should be enabled or not.
@@ -172,7 +172,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration
/**
* @return the mask for the specific window corner.
*/
- virtual QRegion cornerShape(WindowCorner corner);
+ virtual TQRegion cornerShape(WindowCorner corner);
/**
* This updates the window mask using the information provided by
@@ -186,7 +186,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration
/**
* Draw the window decoration.
*/
- virtual void paintEvent(QPaintEvent *e) = 0;
+ virtual void paintEvent(TQPaintEvent *e) = 0;
/**
* This is used to update the painting of the title bar after the caption has been changed.
@@ -219,7 +219,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration
* Convenience method.
* @returns the title rect.
*/
- QRect titleRect() const;
+ TQRect titleRect() const;
public:
/**
@@ -232,8 +232,8 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration
virtual void reset( unsigned long changed );
virtual void borders( int& left, int& right, int& top, int& bottom ) const;
virtual void show();
- virtual void resize(const QSize& s);
- virtual QSize minimumSize() const;
+ virtual void resize(const TQSize& s);
+ virtual TQSize minimumSize() const;
virtual void maximizeChange();
virtual void desktopChange();
virtual void shadeChange();
@@ -250,29 +250,29 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration
void menuButtonPressed();
void menuButtonReleased();
public:
- virtual Position mousePosition(const QPoint &point) const;
+ virtual Position mousePosition(const TQPoint &point) const;
- virtual bool eventFilter( QObject* o, QEvent* e );
- virtual void resizeEvent(QResizeEvent *e);
- virtual void mouseDoubleClickEvent(QMouseEvent *e);
- virtual void wheelEvent(QWheelEvent *e);
+ virtual bool eventFilter( TQObject* o, TQEvent* e );
+ virtual void resizeEvent(TQResizeEvent *e);
+ virtual void mouseDoubleClickEvent(TQMouseEvent *e);
+ virtual void wheelEvent(TQWheelEvent *e);
private:
void resetLayout();
- void moveWidget(int x, int y, QWidget *widget) const;
- void resizeWidget(int w, int h, QWidget *widget) const;
+ void moveWidget(int x, int y, TQWidget *widget) const;
+ void resizeWidget(int w, int h, TQWidget *widget) const;
- typedef QValueVector <KCommonDecorationButton*> ButtonContainer; ///< If the entry is 0, it's a spacer.
+ typedef TQValueVector <KCommonDecorationButton*> ButtonContainer; ///< If the entry is 0, it's a spacer.
int buttonContainerWidth(const ButtonContainer &btnContainer, bool countHidden = false) const;
- void addButtons(ButtonContainer &btnContainer, const QString& buttons, bool isLeft);
+ void addButtons(ButtonContainer &btnContainer, const TQString& buttons, bool isLeft);
KCommonDecorationButton *m_button[NumButtons];
ButtonContainer m_buttonsLeft;
ButtonContainer m_buttonsRight;
- QWidget *m_previewWidget;
+ TQWidget *m_previewWidget;
// button hiding for small windows
void calcHiddenButtons();
@@ -333,30 +333,30 @@ class KWIN_EXPORT KCommonDecorationButton : public QButton
/**
* Set the button size.
*/
- void setSize(const QSize &s);
+ void setSize(const TQSize &s);
/**
* Set/update the button's tool tip
*/
- void setTipText(const QString &tip);
+ void setTipText(const TQString &tip);
/**
* The mouse button that has been clicked last time.
*/
ButtonState lastMousePress() const { return m_lastMouse; }
- QSize sizeHint() const;
+ TQSize sizeHint() const;
protected:
void setToggleButton(bool toggle);
void setOn(bool on);
void setLeft(bool left);
- void mousePressEvent(QMouseEvent *e);
- void mouseReleaseEvent(QMouseEvent *e);
+ void mousePressEvent(TQMouseEvent *e);
+ void mouseReleaseEvent(TQMouseEvent *e);
private:
KCommonDecoration *m_decoration;
ButtonType m_type;
int m_realizeButtons;
- QSize m_size;
+ TQSize m_size;
ButtonState m_lastMouse;
bool m_isLeft;
diff --git a/kwin/lib/kdecoration.cpp b/kwin/lib/kdecoration.cpp
index c7b3d6929..97c8965e9 100644
--- a/kwin/lib/kdecoration.cpp
+++ b/kwin/lib/kdecoration.cpp
@@ -25,7 +25,7 @@ DEALINGS IN THE SOFTWARE.
#include "kdecoration.h"
#include <kdebug.h>
-#include <qapplication.h>
+#include <tqapplication.h>
#include <kglobal.h>
#include <assert.h>
#if defined Q_WS_X11 && ! defined K_WS_QTONLY
@@ -60,10 +60,10 @@ const KDecorationOptions* KDecoration::options()
void KDecoration::createMainWidget( WFlags flags )
{
// FRAME check flags?
- setMainWidget( new QWidget( initialParentWidget(), "decoration widget", initialWFlags() | flags ));
+ setMainWidget( new TQWidget( initialParentWidget(), "decoration widget", initialWFlags() | flags ));
}
-void KDecoration::setMainWidget( QWidget* w )
+void KDecoration::setMainWidget( TQWidget* w )
{
assert( w_ == NULL );
w_ = w;
@@ -71,7 +71,7 @@ void KDecoration::setMainWidget( QWidget* w )
widget()->resize( geometry().size());
}
-QWidget* KDecoration::initialParentWidget() const
+TQWidget* KDecoration::initialParentWidget() const
{
return bridge_->initialParentWidget();
}
@@ -161,27 +161,27 @@ NET::WindowType KDecoration::windowType( unsigned long supported_types ) const
return bridge_->windowType( supported_types );
}
-QIconSet KDecoration::icon() const
+TQIconSet KDecoration::icon() const
{
return bridge_->icon();
}
-QString KDecoration::caption() const
+TQString KDecoration::caption() const
{
return bridge_->caption();
}
-void KDecoration::processMousePressEvent( QMouseEvent* e )
+void KDecoration::processMousePressEvent( TQMouseEvent* e )
{
return bridge_->processMousePressEvent( e );
}
-void KDecoration::showWindowMenu( const QRect &pos )
+void KDecoration::showWindowMenu( const TQRect &pos )
{
bridge_->showWindowMenu( pos );
}
-void KDecoration::showWindowMenu( QPoint pos )
+void KDecoration::showWindowMenu( TQPoint pos )
{
bridge_->showWindowMenu( pos );
}
@@ -191,14 +191,14 @@ void KDecoration::performWindowOperation( WindowOperation op )
bridge_->performWindowOperation( op );
}
-void KDecoration::setMask( const QRegion& reg, int mode )
+void KDecoration::setMask( const TQRegion& reg, int mode )
{
bridge_->setMask( reg, mode );
}
void KDecoration::clearMask()
{
- bridge_->setMask( QRegion(), 0 );
+ bridge_->setMask( TQRegion(), 0 );
}
bool KDecoration::isPreview() const
@@ -206,22 +206,22 @@ bool KDecoration::isPreview() const
return bridge_->isPreview();
}
-QRect KDecoration::geometry() const
+TQRect KDecoration::geometry() const
{
return bridge_->geometry();
}
-QRect KDecoration::iconGeometry() const
+TQRect KDecoration::iconGeometry() const
{
return bridge_->iconGeometry();
}
-QRegion KDecoration::unobscuredRegion( const QRegion& r ) const
+TQRegion KDecoration::unobscuredRegion( const TQRegion& r ) const
{
return bridge_->unobscuredRegion( r );
}
-QWidget* KDecoration::workspaceWidget() const
+TQWidget* KDecoration::workspaceWidget() const
{
return bridge_->workspaceWidget();
}
@@ -294,7 +294,7 @@ void KDecoration::setKeepBelow( bool set )
bridge_->setKeepBelow( set );
}
-bool KDecoration::drawbound( const QRect&, bool )
+bool KDecoration::drawbound( const TQRect&, bool )
{
return false;
}
@@ -328,7 +328,7 @@ void KDecoration::ungrabXServer()
bridge_->grabXServer( false );
}
-KDecoration::Position KDecoration::mousePosition( const QPoint& p ) const
+KDecoration::Position KDecoration::mousePosition( const TQPoint& p ) const
{
const int range = 16;
int bleft, bright, btop, bbottom;
@@ -375,12 +375,12 @@ KDecorationOptions::~KDecorationOptions()
KDecoration::options_ = NULL;
}
-const QColor& KDecorationOptions::color(ColorType type, bool active) const
+const TQColor& KDecorationOptions::color(ColorType type, bool active) const
{
return(d->colors[type + (active ? 0 : NUM_COLORS)]);
}
-const QFont& KDecorationOptions::font(bool active, bool small) const
+const TQFont& KDecorationOptions::font(bool active, bool small) const
{
if ( small )
return(active ? d->activeFontSmall : d->inactiveFontSmall);
@@ -388,14 +388,14 @@ const QFont& KDecorationOptions::font(bool active, bool small) const
return(active ? d->activeFont : d->inactiveFont);
}
-const QColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active) const
+const TQColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active) const
{
int idx = type + (active ? 0 : NUM_COLORS);
if(d->cg[idx])
return(*d->cg[idx]);
- d->cg[idx] = new QColorGroup(Qt::black, d->colors[idx], d->colors[idx].light(150),
+ d->cg[idx] = new TQColorGroup(Qt::black, d->colors[idx], d->colors[idx].light(150),
d->colors[idx].dark(), d->colors[idx].dark(120),
- Qt::black, QApplication::palette().active().
+ Qt::black, TQApplication::palette().active().
base());
return(*d->cg[idx]);
}
@@ -405,12 +405,12 @@ bool KDecorationOptions::customButtonPositions() const
return d->custom_button_positions;
}
-QString KDecorationOptions::titleButtonsLeft() const
+TQString KDecorationOptions::titleButtonsLeft() const
{
return d->title_buttons_left;
}
-QString KDecorationOptions::titleButtonsRight() const
+TQString KDecorationOptions::titleButtonsRight() const
{
return d->title_buttons_right;
}
diff --git a/kwin/lib/kdecoration.h b/kwin/lib/kdecoration.h
index 2fd1fc451..b4f62d6f8 100644
--- a/kwin/lib/kdecoration.h
+++ b/kwin/lib/kdecoration.h
@@ -25,10 +25,10 @@ DEALINGS IN THE SOFTWARE.
#ifndef KDECORATION_H
#define KDECORATION_H
-#include <qcolor.h>
-#include <qfont.h>
-#include <qobject.h>
-#include <qiconset.h>
+#include <tqcolor.h>
+#include <tqfont.h>
+#include <tqobject.h>
+#include <tqiconset.h>
#include <netwm_def.h>
#include <kdeversion.h>
@@ -196,7 +196,7 @@ public:
* @param type The requested color type.
* @param active Whether the color should be for active or inactive windows.
*/
- const QColor& color(ColorType type, bool active=true) const;
+ const TQColor& color(ColorType type, bool active=true) const;
/**
* Returns a colorgroup using the given decoration color as the background.
* The changed flags for this setting is SettingColors.
@@ -204,7 +204,7 @@ public:
* @param type The requested color type.
* @param active Whether to return the color for active or inactive windows.
*/
- const QColorGroup& colorGroup(ColorType type, bool active=true) const;
+ const TQColorGroup& colorGroup(ColorType type, bool active=true) const;
/**
* Returns the active or inactive decoration font.
* The changed flags for this setting is SettingFont.
@@ -212,7 +212,7 @@ public:
* @param active Whether to return the color for active or inactive windows.
* @param small If @a true, returns a font that's suitable for tool windows.
*/
- const QFont& font(bool active=true, bool small = false) const;
+ const TQFont& font(bool active=true, bool small = false) const;
/**
* Returns @a true if the style should use custom button positions
* The changed flags for this setting is SettingButtons.
@@ -242,7 +242,7 @@ public:
* Unknown buttons in the returned string must be ignored.
* The changed flags for this setting is SettingButtons.
*/
- QString titleButtonsLeft() const;
+ TQString titleButtonsLeft() const;
/**
* If customButtonPositions() returns true, titleButtonsRight
* returns which buttons should be on the right side of the titlebar from left
@@ -254,7 +254,7 @@ public:
* Unknown buttons in the returned string must be ignored.
* The changed flags for this setting is SettingButtons.
*/
- QString titleButtonsRight() const;
+ TQString titleButtonsRight() const;
/**
* @returns true if the style should use tooltips for window buttons
@@ -308,7 +308,7 @@ protected:
* @since 3.2
*/
class KWIN_EXPORT KDecoration
- : public QObject, public KDecorationDefines
+ : public TQObject, public KDecorationDefines
{
Q_OBJECT
public:
@@ -436,11 +436,11 @@ class KWIN_EXPORT KDecoration
/**
* Returns an icon set with the decorated window's icon.
*/
- QIconSet icon() const;
+ TQIconSet icon() const;
/**
* Returns the decorated window's caption that should be shown in the titlebar.
*/
- QString caption() const;
+ TQString caption() const;
/**
* This function invokes the window operations menu.
* \param pos specifies the place on the screen where the menu should
@@ -467,12 +467,12 @@ class KWIN_EXPORT KDecoration
* button[MenuButton]->setDown(false);
* \endcode
*/
- void showWindowMenu( const QRect &pos );
+ void showWindowMenu( const TQRect &pos );
/**
* Overloaded version of the above.
*/
- void showWindowMenu( QPoint pos );
+ void showWindowMenu( TQPoint pos );
/**
* This function performs the given window operation. This function may destroy
* the current decoration object, just like showWindowMenu().
@@ -486,7 +486,7 @@ class KWIN_EXPORT KDecoration
* @param mode The X11 values Unsorted, YSorted, YXSorted and YXBanded that specify
* the sorting of the rectangles, default value is Unsorted.
*/
- void setMask( const QRegion& reg, int mode = 0 );
+ void setMask( const TQRegion& reg, int mode = 0 );
/**
* This convenience function resets the shape mask.
*/
@@ -500,13 +500,13 @@ class KWIN_EXPORT KDecoration
/**
* Returns the geometry of the decoration.
*/
- QRect geometry() const;
+ TQRect geometry() const;
/**
* Returns the icon geometry for the window, i.e. the geometry of the taskbar
* entry. This is used mainly for window minimize animations. Note that
* the geometry may be null.
*/
- QRect iconGeometry() const;
+ TQRect iconGeometry() const;
/**
* Returns the intersection of the given region with the region left
* unobscured by the windows stacked above the current one. You can use
@@ -515,12 +515,12 @@ class KWIN_EXPORT KDecoration
* space of the decoration.
* @param r The region you want to check for holes
*/
- QRegion unobscuredRegion( const QRegion& r ) const;
+ TQRegion unobscuredRegion( const TQRegion& r ) const;
/**
* Returns the main workspace widget. The main purpose of this function is to
* allow painting the minimize animation or the transparent move bound on it.
*/
- QWidget* workspaceWidget() const;
+ TQWidget* workspaceWidget() const;
/**
* Returns the handle of the window that is being decorated. It is possible
* the returned value will be 0.
@@ -548,7 +548,7 @@ class KWIN_EXPORT KDecoration
* that are not handled by the decoration itself should be passed to it
* in order to make work operations like window resizing by dragging borders etc.
*/
- void processMousePressEvent( QMouseEvent* e );
+ void processMousePressEvent( TQMouseEvent* e );
// requests to decoration
@@ -564,7 +564,7 @@ class KWIN_EXPORT KDecoration
* Positions at the edge will result in window resizing with mouse button
* pressed, center position will result in moving.
*/
- virtual Position mousePosition( const QPoint& p ) const = 0;
+ virtual Position mousePosition( const TQPoint& p ) const = 0;
/**
* This function should return the distance from each window side to the inner
@@ -587,13 +587,13 @@ class KWIN_EXPORT KDecoration
*
* @param s Specifies the new size of the decoration window.
*/
- virtual void resize( const QSize& s ) = 0;
+ virtual void resize( const TQSize& s ) = 0;
/**
* This function should return the minimum required size for the decoration.
* Note that the returned size shouldn't be too large, because it will be
* used to keep the decorated window at least as large.
*/
- virtual QSize minimumSize() const = 0;
+ virtual TQSize minimumSize() const = 0;
/**
* This function is called whenever the window either becomes or stops being active.
* Use isActive() to find out the current state.
@@ -651,7 +651,7 @@ class KWIN_EXPORT KDecoration
*
* @see workspaceWidget() and geometry().
*/
- virtual bool drawbound( const QRect& geom, bool clear );
+ virtual bool drawbound( const TQRect& geom, bool clear );
/**
* This function may be reimplemented to provide custom minimize/restore animations
* The reimplementation is allowed to perform X server grabs if necessary
@@ -684,7 +684,7 @@ class KWIN_EXPORT KDecoration
* with parent specified by initialParentWidget() and flags
* specified by initialWFlags().
*/
- void setMainWidget( QWidget* );
+ void setMainWidget( TQWidget* );
/**
* Convenience functions that creates and sets a main widget as necessary.
* In such case, it's usually needed to install an event filter
@@ -698,7 +698,7 @@ class KWIN_EXPORT KDecoration
/**
* The parent widget that should be used for the main widget.
*/
- QWidget* initialParentWidget() const;
+ TQWidget* initialParentWidget() const;
/**
* The flags that should be used when creating the main widget.
* It is possible to add more flags when creating the main widget, but only flags
@@ -716,11 +716,11 @@ class KWIN_EXPORT KDecoration
/**
* Returns the main widget for the decoration.
*/
- QWidget* widget();
+ TQWidget* widget();
/**
* Returns the main widget for the decoration.
*/
- const QWidget* widget() const;
+ const TQWidget* widget() const;
/**
* Returns the factory that created this decoration.
*/
@@ -829,7 +829,7 @@ class KWIN_EXPORT KDecoration
void emitKeepBelowChanged( bool below ) { emit keepBelowChanged( below ); }
private:
KDecorationBridge* bridge_;
- QWidget* w_;
+ TQWidget* w_;
KDecorationFactory* factory_;
friend class KDecorationOptions; // for options_
static KDecorationOptions* options_;
@@ -854,12 +854,12 @@ KDecorationDefines::MaximizeMode operator|( KDecorationDefines::MaximizeMode m1,
return KDecorationDefines::MaximizeMode( int(m1) | int(m2) );
}
-inline QWidget* KDecoration::widget()
+inline TQWidget* KDecoration::widget()
{
return w_;
}
-inline const QWidget* KDecoration::widget() const
+inline const TQWidget* KDecoration::widget() const
{
return w_;
}
diff --git a/kwin/lib/kdecoration_p.cpp b/kwin/lib/kdecoration_p.cpp
index 0117e4ec4..1e063d099 100644
--- a/kwin/lib/kdecoration_p.cpp
+++ b/kwin/lib/kdecoration_p.cpp
@@ -26,8 +26,8 @@ DEALINGS IN THE SOFTWARE.
#include <kconfig.h>
#include <kglobalsettings.h>
-#include <qpalette.h>
-#include <qapplication.h>
+#include <tqpalette.h>
+#include <tqapplication.h>
#include <assert.h>
KDecorationOptionsPrivate::KDecorationOptionsPrivate()
@@ -66,17 +66,17 @@ void KDecorationOptionsPrivate::defaultKWinSettings()
unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
{
unsigned long changed = 0;
- QString old_group = config->group();
+ TQString old_group = config->group();
config->setGroup( "WM" );
// SettingColors
- QColor old_colors[NUM_COLORS*2];
+ TQColor old_colors[NUM_COLORS*2];
for( int i = 0;
i < NUM_COLORS*2;
++i )
old_colors[ i ] = colors[ i ];
- QPalette pal = QApplication::palette();
+ TQPalette pal = TQApplication::palette();
// normal colors
colors[ColorFrame] = pal.active().background();
colors[ColorFrame] = config->readColorEntry("frame", &colors[ColorFrame]);
@@ -84,7 +84,7 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
colors[ColorHandle] = config->readColorEntry("handle", &colors[ColorHandle]);
// full button configuration (background, blend, and foreground
- if(QPixmap::defaultDepth() > 8)
+ if(TQPixmap::defaultDepth() > 8)
colors[ColorButtonBg] = colors[ColorFrame].light(130);
else
colors[ColorButtonBg] = colors[ColorFrame];
@@ -93,7 +93,7 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
colors[ColorTitleBar] = pal.active().highlight();
colors[ColorTitleBar] = config->readColorEntry("activeBackground",
&colors[ColorTitleBar]);
- if(QPixmap::defaultDepth() > 8)
+ if(TQPixmap::defaultDepth() > 8)
colors[ColorTitleBlend] = colors[ ColorTitleBar ].dark(110);
else
colors[ColorTitleBlend] = colors[ ColorTitleBar ];
@@ -110,7 +110,7 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
colors[ColorTitleBar+NUM_COLORS] = config->
readColorEntry("inactiveBackground", &colors[ColorTitleBar+NUM_COLORS]);
- if(QPixmap::defaultDepth() > 8)
+ if(TQPixmap::defaultDepth() > 8)
colors[ColorTitleBlend+NUM_COLORS] = colors[ ColorTitleBar+NUM_COLORS ].dark(110);
else
colors[ColorTitleBlend+NUM_COLORS] = colors[ ColorTitleBar+NUM_COLORS ];
@@ -118,7 +118,7 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
config->readColorEntry("inactiveBlend", &colors[ColorTitleBlend+NUM_COLORS]);
// full button configuration
- if(QPixmap::defaultDepth() > 8)
+ if(TQPixmap::defaultDepth() > 8)
colors[ColorButtonBg+NUM_COLORS] = colors[ColorFrame+NUM_COLORS].light(130);
else
colors[ColorButtonBg+NUM_COLORS] = colors[ColorFrame+NUM_COLORS];
@@ -140,12 +140,12 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
changed |= SettingColors;
// SettingFont
- QFont old_activeFont = activeFont;
- QFont old_inactiveFont = inactiveFont;
- QFont old_activeFontSmall = activeFontSmall;
- QFont old_inactiveFontSmall = inactiveFontSmall;
+ TQFont old_activeFont = activeFont;
+ TQFont old_inactiveFont = inactiveFont;
+ TQFont old_activeFontSmall = activeFontSmall;
+ TQFont old_inactiveFontSmall = inactiveFontSmall;
- QFont activeFontGuess = KGlobalSettings::windowTitleFont();
+ TQFont activeFontGuess = KGlobalSettings::windowTitleFont();
activeFont = config->readFontEntry("activeFont", &activeFontGuess);
inactiveFont = config->readFontEntry("inactiveFont", &activeFont);
@@ -163,8 +163,8 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
config->setGroup( "Style" );
// SettingsButtons
- QString old_title_buttons_left = title_buttons_left;
- QString old_title_buttons_right = title_buttons_right;
+ TQString old_title_buttons_left = title_buttons_left;
+ TQString old_title_buttons_right = title_buttons_right;
bool old_custom_button_positions = custom_button_positions;
custom_button_positions = config->readBoolEntry("CustomButtonPositions", false);
if (custom_button_positions)
@@ -224,9 +224,9 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
}
KDecorationDefines::BorderSize KDecorationOptionsPrivate::findPreferredBorderSize( BorderSize size,
- QValueList< BorderSize > sizes ) const
+ TQValueList< BorderSize > sizes ) const
{
- for( QValueList< BorderSize >::ConstIterator it = sizes.begin();
+ for( TQValueList< BorderSize >::ConstIterator it = sizes.begin();
it != sizes.end();
++it )
if( size <= *it ) // size is either a supported size, or *it is the closest larger supported
diff --git a/kwin/lib/kdecoration_p.h b/kwin/lib/kdecoration_p.h
index 8d0e5e15a..58f386c9b 100644
--- a/kwin/lib/kdecoration_p.h
+++ b/kwin/lib/kdecoration_p.h
@@ -30,8 +30,8 @@ DEALINGS IN THE SOFTWARE.
//
#include "kdecoration.h"
-#include <qwidget.h>
-#include <qvaluelist.h>
+#include <tqwidget.h>
+#include <tqvaluelist.h>
class KConfig;
@@ -42,13 +42,13 @@ class KWIN_EXPORT KDecorationOptionsPrivate : public KDecorationDefines
virtual ~KDecorationOptionsPrivate();
void defaultKWinSettings(); // shared implementation
unsigned long updateKWinSettings( KConfig* ); // shared implementation
- BorderSize findPreferredBorderSize( BorderSize size, QValueList< BorderSize > ) const; // shared implementation
+ BorderSize findPreferredBorderSize( BorderSize size, TQValueList< BorderSize > ) const; // shared implementation
- QColor colors[NUM_COLORS*2];
- QColorGroup *cg[NUM_COLORS*2];
- QFont activeFont, inactiveFont, activeFontSmall, inactiveFontSmall;
- QString title_buttons_left;
- QString title_buttons_right;
+ TQColor colors[NUM_COLORS*2];
+ TQColorGroup *cg[NUM_COLORS*2];
+ TQFont activeFont, inactiveFont, activeFontSmall, inactiveFontSmall;
+ TQString title_buttons_left;
+ TQString title_buttons_right;
bool custom_button_positions;
bool show_tooltips;
BorderSize border_size, cached_border_size;
@@ -77,18 +77,18 @@ class KDecorationBridge : public KDecorationDefines
virtual bool isMovable() const = 0;
virtual bool isResizable() const = 0;
virtual NET::WindowType windowType( unsigned long supported_types ) const = 0;
- virtual QIconSet icon() const = 0;
- virtual QString caption() const = 0;
- virtual void processMousePressEvent( QMouseEvent* ) = 0;
- virtual void showWindowMenu( const QRect &) = 0;
- virtual void showWindowMenu( QPoint ) = 0;
+ virtual TQIconSet icon() const = 0;
+ virtual TQString caption() const = 0;
+ virtual void processMousePressEvent( TQMouseEvent* ) = 0;
+ virtual void showWindowMenu( const TQRect &) = 0;
+ virtual void showWindowMenu( TQPoint ) = 0;
virtual void performWindowOperation( WindowOperation ) = 0;
- virtual void setMask( const QRegion&, int ) = 0;
+ virtual void setMask( const TQRegion&, int ) = 0;
virtual bool isPreview() const = 0;
- virtual QRect geometry() const = 0;
- virtual QRect iconGeometry() const = 0;
- virtual QRegion unobscuredRegion( const QRegion& r ) const = 0;
- virtual QWidget* workspaceWidget() const = 0;
+ virtual TQRect geometry() const = 0;
+ virtual TQRect iconGeometry() const = 0;
+ virtual TQRegion unobscuredRegion( const TQRegion& r ) const = 0;
+ virtual TQWidget* workspaceWidget() const = 0;
virtual WId windowId() const = 0;
virtual void closeWindow() = 0;
virtual void maximize( MaximizeMode mode ) = 0;
@@ -102,7 +102,7 @@ class KDecorationBridge : public KDecorationDefines
virtual void setKeepBelow( bool ) = 0;
// not part of public API
virtual int currentDesktop() const = 0;
- virtual QWidget* initialParentWidget() const = 0;
+ virtual TQWidget* initialParentWidget() const = 0;
virtual Qt::WFlags initialWFlags() const = 0;
virtual void helperShowHide( bool ) = 0;
virtual void grabXServer( bool grab ) = 0;
diff --git a/kwin/lib/kdecoration_plugins_p.cpp b/kwin/lib/kdecoration_plugins_p.cpp
index 85d496105..0490e4755 100644
--- a/kwin/lib/kdecoration_plugins_p.cpp
+++ b/kwin/lib/kdecoration_plugins_p.cpp
@@ -31,8 +31,8 @@ DEALINGS IN THE SOFTWARE.
#include <klibloader.h>
#include <assert.h>
-#include <qdir.h>
-#include <qfile.h>
+#include <tqdir.h>
+#include <tqfile.h>
#include "kdecorationfactory.h"
@@ -65,7 +65,7 @@ KDecorationPlugins::~KDecorationPlugins()
bool KDecorationPlugins::reset( unsigned long changed )
{
- QString oldPlugin = pluginStr;
+ TQString oldPlugin = pluginStr;
config->reparseConfiguration();
bool ret = false;
if(( !loadPlugin( "" ) && library ) // "" = read the one in cfg file
@@ -91,7 +91,7 @@ KDecoration* KDecorationPlugins::createDecoration( KDecorationBridge* bridge )
}
// returns true if plugin was loaded successfully
-bool KDecorationPlugins::loadPlugin( QString nameStr )
+bool KDecorationPlugins::loadPlugin( TQString nameStr )
{
if( nameStr.isEmpty())
{
@@ -105,13 +105,13 @@ bool KDecorationPlugins::loadPlugin( QString nameStr )
KLibrary *oldLibrary = library;
KDecorationFactory* oldFactory = fact;
- QString path = KLibLoader::findLibrary(QFile::encodeName(nameStr));
+ TQString path = KLibLoader::findLibrary(TQFile::encodeName(nameStr));
// If the plugin was not found, try to find the default
if (path.isEmpty())
{
nameStr = defaultPlugin;
- path = KLibLoader::findLibrary(QFile::encodeName(nameStr));
+ path = KLibLoader::findLibrary(TQFile::encodeName(nameStr));
}
// If no library was found, exit kwin with an error message
@@ -126,7 +126,7 @@ bool KDecorationPlugins::loadPlugin( QString nameStr )
return true;
// Try loading the requested plugin
- library = KLibLoader::self()->library(QFile::encodeName(path));
+ library = KLibLoader::self()->library(TQFile::encodeName(path));
// If that fails, fall back to the default plugin
if (!library)
@@ -135,9 +135,9 @@ bool KDecorationPlugins::loadPlugin( QString nameStr )
nameStr = defaultPlugin;
if ( pluginStr == nameStr )
return true;
- path = KLibLoader::findLibrary(QFile::encodeName(nameStr));
+ path = KLibLoader::findLibrary(TQFile::encodeName(nameStr));
if (!path.isEmpty())
- library = KLibLoader::self()->library(QFile::encodeName(path));
+ library = KLibLoader::self()->library(TQFile::encodeName(path));
}
if (!library)
@@ -166,7 +166,7 @@ bool KDecorationPlugins::loadPlugin( QString nameStr )
pluginStr = nameStr;
// For clients in kdeartwork
- QString catalogue = nameStr;
+ TQString catalogue = nameStr;
catalogue.replace( "kwin3_", "kwin_" );
KGlobal::locale()->insertCatalogue( catalogue );
// For KCommonDecoration based clients
@@ -194,6 +194,6 @@ void KDecorationPlugins::destroyPreviousPlugin()
}
}
-void KDecorationPlugins::error( const QString& )
+void KDecorationPlugins::error( const TQString& )
{
}
diff --git a/kwin/lib/kdecoration_plugins_p.h b/kwin/lib/kdecoration_plugins_p.h
index b82f7f914..81dbb6b68 100644
--- a/kwin/lib/kdecoration_plugins_p.h
+++ b/kwin/lib/kdecoration_plugins_p.h
@@ -30,9 +30,9 @@ DEALINGS IN THE SOFTWARE.
// This header file is internal. I mean it.
//
-#include <qcstring.h>
-#include <qstring.h>
-#include <qwidget.h>
+#include <tqcstring.h>
+#include <tqstring.h>
+#include <tqwidget.h>
#include "kdecoration.h"
@@ -48,22 +48,22 @@ class KWIN_EXPORT KDecorationPlugins
public:
KDecorationPlugins( KConfig* cfg );
virtual ~KDecorationPlugins();
- bool loadPlugin( QString name );
+ bool loadPlugin( TQString name );
void destroyPreviousPlugin();
KDecorationFactory* factory();
KDecoration* createDecoration( KDecorationBridge* );
- QString currentPlugin() { return pluginStr; }
+ TQString currentPlugin() { return pluginStr; }
bool reset( unsigned long changed ); // returns true if decorations need to be recreated
protected:
- virtual void error( const QString& error_msg );
- QCString defaultPlugin; // FRAME normalne protected?
+ virtual void error( const TQString& error_msg );
+ TQCString defaultPlugin; // FRAME normalne protected?
private:
KDecorationFactory* (*create_ptr)();
KLibrary *library;
KDecorationFactory* fact;
KLibrary *old_library;
KDecorationFactory* old_fact;
- QString pluginStr;
+ TQString pluginStr;
KConfig* config;
};
diff --git a/kwin/lib/kdecorationfactory.cpp b/kwin/lib/kdecorationfactory.cpp
index 74508501b..7ad1aefbe 100644
--- a/kwin/lib/kdecorationfactory.cpp
+++ b/kwin/lib/kdecorationfactory.cpp
@@ -51,9 +51,9 @@ void KDecorationFactory::checkRequirements( KDecorationProvides* )
{
}
-QValueList< KDecorationDefines::BorderSize > KDecorationFactory::borderSizes() const
+TQValueList< KDecorationDefines::BorderSize > KDecorationFactory::borderSizes() const
{
- return QValueList< BorderSize >() << BorderNormal;
+ return TQValueList< BorderSize >() << BorderNormal;
}
bool KDecorationFactory::exists( const KDecoration* deco ) const
@@ -73,7 +73,7 @@ void KDecorationFactory::removeDecoration( KDecoration* deco )
void KDecorationFactory::resetDecorations( unsigned long changed )
{
- for( QValueList< KDecoration* >::ConstIterator it = _decorations.begin();
+ for( TQValueList< KDecoration* >::ConstIterator it = _decorations.begin();
it != _decorations.end();
++it )
(*it)->reset( changed );
diff --git a/kwin/lib/kdecorationfactory.h b/kwin/lib/kdecorationfactory.h
index 08e733c8b..7396ad987 100644
--- a/kwin/lib/kdecorationfactory.h
+++ b/kwin/lib/kdecorationfactory.h
@@ -68,7 +68,7 @@ class KWIN_EXPORT KDecorationFactory
* sizes, ordered from the smallest to the largest one. By default, only
* BorderNormal is returned.
*/
- virtual QValueList< BorderSize > borderSizes() const;
+ virtual TQValueList< BorderSize > borderSizes() const;
virtual bool supports( Ability ability );
@@ -108,7 +108,7 @@ class KWIN_EXPORT KDecorationFactory
*/
NET::WindowType windowType( unsigned long supported_types, KDecorationBridge* bridge ) const;
private:
- QValueList< KDecoration* > _decorations;
+ TQValueList< KDecoration* > _decorations;
KDecorationFactoryPrivate* d;
};
diff --git a/kwin/main.cpp b/kwin/main.cpp
index 82410d6a4..edceeb6bf 100644
--- a/kwin/main.cpp
+++ b/kwin/main.cpp
@@ -101,7 +101,7 @@ Application::Application( )
fputs(i18n("kwin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr);
::exit(1);
}
- connect( &owner, SIGNAL( lostOwnership()), SLOT( lostSelection()));
+ connect( &owner, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection()));
// if there was already kwin running, it saved its configuration after loosing the selection -> reread
config()->reparseConfiguration();
@@ -124,11 +124,11 @@ Application::Application( )
syncX(); // trigger possible errors, there's still a chance to abort
DCOPRef ref( "kded", "kded" );
- ref.send( "unloadModule", QCString( "kdetrayproxy" ));
+ ref.send( "unloadModule", TQCString( "kdetrayproxy" ));
initting = FALSE; // startup done, we are up and running now.
- dcopClient()->send( "ksplash", "", "upAndRunning(QString)", QString("wm started"));
+ dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("wm started"));
XEvent e;
e.xclient.type = ClientMessage;
e.xclient.message_type = XInternAtom( qt_xdisplay(), "_KDE_SPLASH_PROGRESS", False );
@@ -146,7 +146,7 @@ Application::~Application()
{
XSetInputFocus( qt_xdisplay(), PointerRoot, RevertToPointerRoot, qt_x_time );
DCOPRef ref( "kded", "kded" );
- if( !ref.send( "loadModule", QCString( "kdetrayproxy" )))
+ if( !ref.send( "loadModule", TQCString( "kdetrayproxy" )))
kdWarning( 176 ) << "Loading of kdetrayproxy failed." << endl;
}
delete options;
@@ -158,7 +158,7 @@ void Application::lostSelection()
// remove windowmanager privileges
XSelectInput(qt_xdisplay(), qt_xrootwin(), PropertyChangeMask );
DCOPRef ref( "kded", "kded" );
- if( !ref.send( "loadModule", QCString( "kdetrayproxy" )))
+ if( !ref.send( "loadModule", TQCString( "kdetrayproxy" )))
kdWarning( 176 ) << "Loading of kdetrayproxy failed." << endl;
quit();
}
@@ -172,7 +172,7 @@ bool Application::x11EventFilter( XEvent *e )
static void sighandler(int)
{
- QApplication::exit();
+ TQApplication::exit();
}
@@ -206,7 +206,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
// we only do the multihead fork if we are not restored by the session
// manager, since the session manager will register multiple kwins,
// one for each screen...
- QCString multiHead = getenv("KDE_MULTIHEAD");
+ TQCString multiHead = getenv("KDE_MULTIHEAD");
if (multiHead.lower() == "true")
{
@@ -221,14 +221,14 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
int number_of_screens = ScreenCount( dpy );
KWinInternal::screen_number = DefaultScreen( dpy );
int pos; // temporarily needed to reconstruct DISPLAY var if multi-head
- QCString display_name = XDisplayString( dpy );
+ TQCString display_name = XDisplayString( dpy );
XCloseDisplay( dpy );
dpy = 0;
if ((pos = display_name.findRev('.')) != -1 )
display_name.remove(pos,10); // 10 is enough to be sure we removed ".s"
- QCString envir;
+ TQCString envir;
if (number_of_screens != 1)
{
for (int i = 0; i < number_of_screens; i++ )
@@ -285,7 +285,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
fcntl(ConnectionNumber(qt_xdisplay()), F_SETFD, 1);
- QCString appname;
+ TQCString appname;
if (KWinInternal::screen_number == 0)
appname = "kwin";
else
diff --git a/kwin/manage.cpp b/kwin/manage.cpp
index 24398dcae..e56a877b4 100644
--- a/kwin/manage.cpp
+++ b/kwin/manage.cpp
@@ -87,8 +87,8 @@ bool Client::manage( Window w, bool isMapped )
{
// Qt3.2 and older had this all lowercase, Qt3.3 capitalized resource class
// force lowercase, so that workarounds listing resource classes still work
- resource_name = QCString( classHint.res_name ).lower();
- resource_class = QCString( classHint.res_class ).lower();
+ resource_name = TQCString( classHint.res_name ).lower();
+ resource_class = TQCString( classHint.res_class ).lower();
XFree( classHint.res_name );
XFree( classHint.res_class );
}
@@ -136,7 +136,7 @@ bool Client::manage( Window w, bool isMapped )
setUserNoBorder( true );
}
- setShortcut( rules()->checkShortcut( session ? session->shortcut : QString::null, true ));
+ setShortcut( rules()->checkShortcut( session ? session->shortcut : TQString::null, true ));
init_minimize = rules()->checkMinimize( init_minimize, !isMapped );
if( rules()->checkNoBorder( false, !isMapped ))
@@ -191,13 +191,13 @@ bool Client::manage( Window w, bool isMapped )
workspace()->updateOnAllDesktopsOfTransients( this ); // SELI
// onAllDesktopsChange(); decoration doesn't exist here yet
- QRect geom( attr.x, attr.y, attr.width, attr.height );
+ TQRect geom( attr.x, attr.y, attr.width, attr.height );
bool placementDone = FALSE;
if ( session )
geom = session->geometry;
- QRect area;
+ TQRect area;
bool partial_keep_in_area = isMapped || session;
if( isMapped || session )
area = workspace()->clientArea( FullArea, geom.center(), desktop());
@@ -209,7 +209,7 @@ bool Client::manage( Window w, bool isMapped )
area = workspace()->clientArea( PlacementArea, workspace()->screenGeometry( screen ).center(), desktop());
}
else
- area = workspace()->clientArea( PlacementArea, QCursor::pos(), desktop());
+ area = workspace()->clientArea( PlacementArea, TQCursor::pos(), desktop());
if( int type = checkFullScreenHack( geom ))
{
@@ -266,7 +266,7 @@ bool Client::manage( Window w, bool isMapped )
usePosition = true;
if( !rules()->checkIgnoreGeometry( !usePosition ))
{
- bool ignorePPosition = ( options->ignorePositionClasses.contains(QString::fromLatin1(resourceClass())));
+ bool ignorePPosition = ( options->ignorePositionClasses.contains(TQString::fromLatin1(resourceClass())));
if ( ( (xSizeHint.flags & PPosition) && !ignorePPosition ) ||
(xSizeHint.flags & USPosition) )
@@ -284,10 +284,10 @@ bool Client::manage( Window w, bool isMapped )
if (xSizeHint.flags & PMaxSize)
geom.setSize( geom.size().boundedTo(
- rules()->checkMaxSize( QSize(xSizeHint.max_width, xSizeHint.max_height ) ) ) );
+ rules()->checkMaxSize( TQSize(xSizeHint.max_width, xSizeHint.max_height ) ) ) );
if (xSizeHint.flags & PMinSize)
geom.setSize( geom.size().expandedTo(
- rules()->checkMinSize( QSize(xSizeHint.min_width, xSizeHint.min_height ) ) ) );
+ rules()->checkMinSize( TQSize(xSizeHint.min_width, xSizeHint.min_height ) ) ) );
if( isMovable())
{
@@ -302,7 +302,7 @@ bool Client::manage( Window w, bool isMapped )
// TODO is CentralGravity right here, when resizing is done after gravitating?
plainResize( rules()->checkSize( sizeForClientSize( geom.size()), !isMapped ));
- QPoint forced_pos = rules()->checkPosition( invalidPoint, !isMapped );
+ TQPoint forced_pos = rules()->checkPosition( invalidPoint, !isMapped );
if( forced_pos != invalidPoint )
{
move( forced_pos );
@@ -396,19 +396,19 @@ bool Client::manage( Window w, bool isMapped )
if ( width() >= area.width() && height() >= area.height() )
{
maximize( Client::MaximizeFull );
- geom_restore = QRect(); // use placement when unmaximizing
+ geom_restore = TQRect(); // use placement when unmaximizing
}
else if ( width() >= area.width() )
{
maximize( Client::MaximizeHorizontal );
- geom_restore = QRect(); // use placement when unmaximizing
+ geom_restore = TQRect(); // use placement when unmaximizing
geom_restore.setY( y()); // but only for horizontal direction
geom_restore.setHeight( height());
}
else if ( height() >= area.height() )
{
maximize( Client::MaximizeVertical );
- geom_restore = QRect(); // use placement when unmaximizing
+ geom_restore = TQRect(); // use placement when unmaximizing
geom_restore.setX( x()); // but only for vertical direction
geom_restore.setWidth( width());
}
diff --git a/kwin/notifications.cpp b/kwin/notifications.cpp
index a2d72d697..288cbd029 100644
--- a/kwin/notifications.cpp
+++ b/kwin/notifications.cpp
@@ -17,9 +17,9 @@ License. See the file "COPYING" for the exact licensing terms.
namespace KWinInternal
{
-QString Notify::eventToName( Event e )
+TQString Notify::eventToName( Event e )
{
- QString event;
+ TQString event;
switch ( e )
{
case Activate:
@@ -85,7 +85,7 @@ QString Notify::eventToName( Event e )
default:
if ((e > DesktopChange) && (e <= DesktopChange+20))
{
- event = QString("desktop%1").arg(e-DesktopChange);
+ event = TQString("desktop%1").arg(e-DesktopChange);
}
break;
}
@@ -93,14 +93,14 @@ QString Notify::eventToName( Event e )
}
static bool forgetIt = FALSE;
-QValueList< Notify::EventData > Notify::pending_events;
+TQValueList< Notify::EventData > Notify::pending_events;
-bool Notify::raise( Event e, const QString& message, Client* c )
+bool Notify::raise( Event e, const TQString& message, Client* c )
{
if ( forgetIt )
return false; // no connection was possible, don't try each time
- QString event = eventToName( e );
+ TQString event = eventToName( e );
if ( !event )
return false;
@@ -135,7 +135,7 @@ void Notify::sendPendingEvents()
bool Notify::makeDemandAttention( Event e )
{
- QString event = eventToName( e );
+ TQString event = eventToName( e );
if( !event )
return false;
int rep = KNotifyClient::getPresentation( event );
diff --git a/kwin/notifications.h b/kwin/notifications.h
index dd7c79323..8d50cb1fe 100644
--- a/kwin/notifications.h
+++ b/kwin/notifications.h
@@ -13,8 +13,8 @@ License. See the file "COPYING" for the exact licensing terms.
#define KWIN_NOTIFICATIONS_H
#include <stdlib.h>
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
namespace KWinInternal
{
@@ -50,18 +50,18 @@ class Notify
DesktopChange = 100
};
- static bool raise( Event, const QString& message = QString::null, Client* c = NULL );
+ static bool raise( Event, const TQString& message = TQString::null, Client* c = NULL );
static bool makeDemandAttention( Event );
static void sendPendingEvents();
private:
- static QString eventToName( Event );
+ static TQString eventToName( Event );
struct EventData
{
- QString event;
- QString message;
+ TQString event;
+ TQString message;
long window;
};
- static QValueList< EventData > pending_events;
+ static TQValueList< EventData > pending_events;
};
} // namespace
diff --git a/kwin/options.cpp b/kwin/options.cpp
index f74051bbb..5f0190347 100644
--- a/kwin/options.cpp
+++ b/kwin/options.cpp
@@ -13,13 +13,13 @@ License. See the file "COPYING" for the exact licensing terms.
#ifndef KCMRULES
-#include <qpalette.h>
-#include <qpixmap.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
#include <kapplication.h>
#include <kconfig.h>
#include <kglobal.h>
#include <kglobalsettings.h>
-#include <qtooltip.h>
+#include <tqtooltip.h>
#include "client.h"
@@ -56,7 +56,7 @@ unsigned long Options::updateSettings()
show_geometry_tip = config->readBoolEntry("GeometryTip", false);
tabboxOutline = config->readBoolEntry("TabboxOutline", true);
- QString val;
+ TQString val;
val = config->readEntry ("FocusPolicy", "ClickToFocus");
focusPolicy = ClickToFocus; // what a default :-)
@@ -137,11 +137,11 @@ unsigned long Options::updateSettings()
ignoreFocusStealingClasses = config->readListEntry("IgnoreFocusStealingClasses");
// Qt3.2 and older had resource class all lowercase, but Qt3.3 has it capitalized
// therefore Client::resourceClass() forces lowercase, force here lowercase as well
- for( QStringList::Iterator it = ignorePositionClasses.begin();
+ for( TQStringList::Iterator it = ignorePositionClasses.begin();
it != ignorePositionClasses.end();
++it )
(*it) = (*it).lower();
- for( QStringList::Iterator it = ignoreFocusStealingClasses.begin();
+ for( TQStringList::Iterator it = ignoreFocusStealingClasses.begin();
it != ignoreFocusStealingClasses.end();
++it )
(*it) = (*it).lower();
@@ -209,7 +209,7 @@ unsigned long Options::updateSettings()
if( desktop_topmenu )
topmenus = true;
- QToolTip::setGloballyEnabled( d->show_tooltips );
+ TQToolTip::setGloballyEnabled( d->show_tooltips );
return changed;
}
@@ -219,7 +219,7 @@ unsigned long Options::updateSettings()
// if the window is moved out of the workspace (e.g. if the user moves a window
// by the titlebar, and moves it too high beneath Kicker at the top edge, they
// may not be able to move it back, unless they know about Alt+LMB)
-Options::WindowOperation Options::windowOperation(const QString &name, bool restricted )
+Options::WindowOperation Options::windowOperation(const TQString &name, bool restricted )
{
if (name == "Move")
return restricted ? MoveOp : UnrestrictedMoveOp;
@@ -246,9 +246,9 @@ Options::WindowOperation Options::windowOperation(const QString &name, bool rest
return NoOp;
}
-Options::MouseCommand Options::mouseCommand(const QString &name, bool restricted )
+Options::MouseCommand Options::mouseCommand(const TQString &name, bool restricted )
{
- QString lowerName = name.lower();
+ TQString lowerName = name.lower();
if (lowerName == "raise") return MouseRaise;
if (lowerName == "lower") return MouseLower;
if (lowerName == "operations menu") return MouseOperationsMenu;
@@ -268,9 +268,9 @@ Options::MouseCommand Options::mouseCommand(const QString &name, bool restricted
return MouseNothing;
}
-Options::MouseWheelCommand Options::mouseWheelCommand(const QString &name)
+Options::MouseWheelCommand Options::mouseWheelCommand(const TQString &name)
{
- QString lowerName = name.lower();
+ TQString lowerName = name.lower();
if (lowerName == "raise/lower") return MouseWheelRaiseLower;
if (lowerName == "shade/unshade") return MouseWheelShadeUnshade;
if (lowerName == "maximize/restore") return MouseWheelMaximizeRestore;
@@ -297,7 +297,7 @@ int Options::electricBorderDelay()
bool Options::checkIgnoreFocusStealing( const Client* c )
{
- return ignoreFocusStealingClasses.contains(QString::fromLatin1(c->resourceClass()));
+ return ignoreFocusStealingClasses.contains(TQString::fromLatin1(c->resourceClass()));
}
Options::MouseCommand Options::wheelToMouseCommand( MouseWheelCommand com, int delta )
@@ -322,7 +322,7 @@ Options::MouseCommand Options::wheelToMouseCommand( MouseWheelCommand com, int d
}
#endif
-Options::MoveResizeMode Options::stringToMoveResizeMode( const QString& s )
+Options::MoveResizeMode Options::stringToMoveResizeMode( const TQString& s )
{
return s == "Opaque" ? Opaque : Transparent;
}
diff --git a/kwin/options.h b/kwin/options.h
index 034c9759b..82dc6cdc1 100644
--- a/kwin/options.h
+++ b/kwin/options.h
@@ -12,10 +12,10 @@ License. See the file "COPYING" for the exact licensing terms.
#ifndef KWIN_OPTIONS_H
#define KWIN_OPTIONS_H
-#include <qobject.h>
-#include <qfont.h>
-#include <qpalette.h>
-#include <qstringlist.h>
+#include <tqobject.h>
+#include <tqfont.h>
+#include <tqpalette.h>
+#include <tqstringlist.h>
#include <kdecoration_p.h>
#include "placement.h"
@@ -150,7 +150,7 @@ class Options : public KDecorationOptions
MoveResizeMode resizeMode;
MoveResizeMode moveMode;
- static MoveResizeMode stringToMoveResizeMode( const QString& s );
+ static MoveResizeMode stringToMoveResizeMode( const TQString& s );
static const char* moveResizeModeToString( MoveResizeMode mode );
Placement::Policy placement;
@@ -204,7 +204,7 @@ class Options : public KDecorationOptions
/**
* List of window classes to ignore PPosition size hint
*/
- QStringList ignorePositionClasses;
+ TQStringList ignorePositionClasses;
bool checkIgnoreFocusStealing( const Client* c );
@@ -258,9 +258,9 @@ class Options : public KDecorationOptions
uint keyCmdAllModKey() { return CmdAllModKey; }
- static WindowOperation windowOperation(const QString &name, bool restricted );
- static MouseCommand mouseCommand(const QString &name, bool restricted );
- static MouseWheelCommand mouseWheelCommand(const QString &name);
+ static WindowOperation windowOperation(const TQString &name, bool restricted );
+ static MouseCommand mouseCommand(const TQString &name, bool restricted );
+ static MouseWheelCommand mouseWheelCommand(const TQString &name);
/**
* @returns true if the Geometry Tip should be shown during a window move/resize.
@@ -337,7 +337,7 @@ class Options : public KDecorationOptions
bool topmenus;
bool desktop_topmenu;
// List of window classes for which not to use focus stealing prevention
- QStringList ignoreFocusStealingClasses;
+ TQStringList ignoreFocusStealingClasses;
MouseCommand wheelToMouseCommand( MouseWheelCommand com, int delta );
};
diff --git a/kwin/placement.cpp b/kwin/placement.cpp
index e9ae1b95e..a9862ce27 100644
--- a/kwin/placement.cpp
+++ b/kwin/placement.cpp
@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include "placement.h"
-#include <qrect.h>
+#include <tqrect.h>
#include <assert.h>
#ifndef KCMRULES
@@ -37,7 +37,7 @@ Placement::Placement(Workspace* w)
/*!
Places the client \a c according to the workspace's layout policy
*/
-void Placement::place(Client* c, QRect& area )
+void Placement::place(Client* c, TQRect& area )
{
Policy policy = c->rules()->checkPlacement( Default );
if( policy != Default )
@@ -56,7 +56,7 @@ void Placement::place(Client* c, QRect& area )
place(c, area, options->placement);
}
-void Placement::place(Client* c, QRect& area, Policy policy, Policy nextPlacement )
+void Placement::place(Client* c, TQRect& area, Policy policy, Policy nextPlacement )
{
if( policy == Unknown )
policy = Default;
@@ -85,14 +85,14 @@ void Placement::place(Client* c, QRect& area, Policy policy, Policy nextPlacemen
/*!
Place the client \a c according to a simply "random" placement algorithm.
*/
-void Placement::placeAtRandom(Client* c, const QRect& area, Policy /*next*/ )
+void Placement::placeAtRandom(Client* c, const TQRect& area, Policy /*next*/ )
{
const int step = 24;
static int px = step;
static int py = 2 * step;
int tx,ty;
- const QRect maxRect = checkArea( c, area );
+ const TQRect maxRect = checkArea( c, area );
if (px < maxRect.x())
px = maxRect.x();
@@ -128,7 +128,7 @@ void Placement::placeAtRandom(Client* c, const QRect& area, Policy /*next*/ )
/*!
Place the client \a c according to a really smart placement algorithm :-)
*/
-void Placement::placeSmart(Client* c, const QRect& area, Policy /*next*/ )
+void Placement::placeSmart(Client* c, const TQRect& area, Policy /*next*/ )
{
/*
* SmartPlacement by Cristian Tibirna (tibirna@kde.org)
@@ -150,7 +150,7 @@ void Placement::placeSmart(Client* c, const QRect& area, Policy /*next*/ )
int basket; //temp holder
// get the maximum allowed windows space
- const QRect maxRect = checkArea( c, area );
+ const TQRect maxRect = checkArea( c, area );
int x = maxRect.left(), y = maxRect.top();
x_optimal = x; y_optimal = y;
@@ -304,7 +304,7 @@ void Placement::reinitCascading( int desktop )
for( int i = 0; i < m_WorkspacePtr->numberOfDesktops(); i++)
{
DesktopCascadingInfo inf;
- inf.pos = QPoint(-1,-1);
+ inf.pos = TQPoint(-1,-1);
inf.col = 0;
inf.row = 0;
cci.append(inf);
@@ -312,7 +312,7 @@ void Placement::reinitCascading( int desktop )
}
else
{
- cci[desktop - 1].pos = QPoint(-1, -1);
+ cci[desktop - 1].pos = TQPoint(-1, -1);
cci[desktop - 1].col = cci[desktop - 1].row = 0;
}
}
@@ -320,7 +320,7 @@ void Placement::reinitCascading( int desktop )
/*!
Place windows in a cascading order, remembering positions for each desktop
*/
-void Placement::placeCascaded (Client* c, QRect& area, Policy nextPlacement)
+void Placement::placeCascaded (Client* c, TQRect& area, Policy nextPlacement)
{
/* cascadePlacement by Cristian Tibirna (tibirna@kde.org) (30Jan98)
*/
@@ -334,7 +334,7 @@ void Placement::placeCascaded (Client* c, QRect& area, Policy nextPlacement)
const int dn = c->desktop() == 0 || c->isOnAllDesktops() ? (m_WorkspacePtr->currentDesktop() - 1) : (c->desktop() - 1);
// get the maximum allowed windows space and desk's origin
- QRect maxRect = checkArea( c, area );
+ TQRect maxRect = checkArea( c, area );
// initialize often used vars: width and height of c; we gain speed
const int ch = c->height();
@@ -350,7 +350,7 @@ void Placement::placeCascaded (Client* c, QRect& area, Policy nextPlacement)
//initialize if needed
if (cci[dn].pos.x() < 0 || cci[dn].pos.x() < X || cci[dn].pos.y() < Y )
{
- cci[dn].pos = QPoint(X, Y);
+ cci[dn].pos = TQPoint(X, Y);
cci[dn].col = cci[dn].row = 0;
}
@@ -399,41 +399,41 @@ void Placement::placeCascaded (Client* c, QRect& area, Policy nextPlacement)
}
// place the window
- c->move(QPoint(xp, yp));
+ c->move(TQPoint(xp, yp));
// new position
- cci[dn].pos = QPoint(xp + delta_x, yp + delta_y);
+ cci[dn].pos = TQPoint(xp + delta_x, yp + delta_y);
}
/*!
Place windows centered, on top of all others
*/
-void Placement::placeCentered (Client* c, const QRect& area, Policy /*next*/ )
+void Placement::placeCentered (Client* c, const TQRect& area, Policy /*next*/ )
{
// get the maximum allowed windows space and desk's origin
- const QRect maxRect = checkArea( c, area );
+ const TQRect maxRect = checkArea( c, area );
const int xp = maxRect.left() + (maxRect.width() - c->width()) / 2;
const int yp = maxRect.top() + (maxRect.height() - c->height()) / 2;
// place the window
- c->move(QPoint(xp, yp));
+ c->move(TQPoint(xp, yp));
}
/*!
Place windows in the (0,0) corner, on top of all others
*/
-void Placement::placeZeroCornered(Client* c, const QRect& area, Policy /*next*/ )
+void Placement::placeZeroCornered(Client* c, const TQRect& area, Policy /*next*/ )
{
// get the maximum allowed windows space and desk's origin
- const QRect maxRect = checkArea( c, area );
+ const TQRect maxRect = checkArea( c, area );
// place the window
- c->move(QPoint(maxRect.left(), maxRect.top()));
+ c->move(TQPoint(maxRect.left(), maxRect.top()));
}
-void Placement::placeUtility(Client* c, QRect& area, Policy /*next*/ )
+void Placement::placeUtility(Client* c, TQRect& area, Policy /*next*/ )
{
// TODO kwin should try to place utility windows next to their mainwindow,
// preferably at the right edge, and going down if there are more of them
@@ -444,21 +444,21 @@ void Placement::placeUtility(Client* c, QRect& area, Policy /*next*/ )
}
-void Placement::placeDialog(Client* c, QRect& area, Policy nextPlacement )
+void Placement::placeDialog(Client* c, TQRect& area, Policy nextPlacement )
{
placeOnMainWindow( c, area, nextPlacement );
}
-void Placement::placeUnderMouse(Client* c, QRect& area, Policy /*next*/ )
+void Placement::placeUnderMouse(Client* c, TQRect& area, Policy /*next*/ )
{
area = checkArea( c, area );
- QRect geom = c->geometry();
- geom.moveCenter( QCursor::pos());
+ TQRect geom = c->geometry();
+ geom.moveCenter( TQCursor::pos());
c->move( geom.topLeft());
c->keepInArea( area ); // make sure it's kept inside workarea
}
-void Placement::placeOnMainWindow(Client* c, QRect& area, Policy nextPlacement )
+void Placement::placeOnMainWindow(Client* c, TQRect& area, Policy nextPlacement )
{
if( nextPlacement == Unknown )
nextPlacement = Centered;
@@ -507,15 +507,15 @@ void Placement::placeOnMainWindow(Client* c, QRect& area, Policy nextPlacement )
place( c, area, Centered );
return;
}
- QRect geom = c->geometry();
+ TQRect geom = c->geometry();
geom.moveCenter( place_on->geometry().center());
c->move( geom.topLeft());
// get area again, because the mainwindow may be on different xinerama screen
- area = checkArea( c, QRect());
+ area = checkArea( c, TQRect());
c->keepInArea( area ); // make sure it's kept inside workarea
}
-void Placement::placeMaximizing(Client* c, QRect& area, Policy nextPlacement )
+void Placement::placeMaximizing(Client* c, TQRect& area, Policy nextPlacement )
{
if( nextPlacement == Unknown )
nextPlacement = Smart;
@@ -535,7 +535,7 @@ void Placement::placeMaximizing(Client* c, QRect& area, Policy nextPlacement )
}
}
-QRect Placement::checkArea( const Client* c, const QRect& area )
+TQRect Placement::checkArea( const Client* c, const TQRect& area )
{
if( area.isNull())
return m_WorkspacePtr->clientArea( PlacementArea, c->geometry().center(), c->desktop());
@@ -545,7 +545,7 @@ QRect Placement::checkArea( const Client* c, const QRect& area )
#endif
-Placement::Policy Placement::policyFromString( const QString& policy, bool no_special )
+Placement::Policy Placement::policyFromString( const TQString& policy, bool no_special )
{
if( policy == "NoPlacement" )
return NoPlacement;
@@ -627,16 +627,16 @@ void Client::growHorizontal()
{
if( !isResizable() || isShade())
return;
- QRect geom = geometry();
+ TQRect geom = geometry();
geom.setRight( workspace()->packPositionRight( this, geom.right(), true ));
- QSize adjsize = adjustedSize( geom.size(), SizemodeFixedW );
+ TQSize adjsize = adjustedSize( geom.size(), SizemodeFixedW );
if( geometry().size() == adjsize && geom.size() != adjsize && xSizeHint.width_inc > 1 ) // take care of size increments
{
int newright = workspace()->packPositionRight( this, geom.right() + xSizeHint.width_inc - 1, true );
// check that it hasn't grown outside of the area, due to size increments
// TODO this may be wrong?
if( workspace()->clientArea( MovementArea,
- QPoint(( x() + newright ) / 2, geometry().center().y()), desktop()).right() >= newright )
+ TQPoint(( x() + newright ) / 2, geometry().center().y()), desktop()).right() >= newright )
geom.setRight( newright );
}
geom.setSize( adjustedSize( geom.size(), SizemodeFixedW ));
@@ -653,7 +653,7 @@ void Client::shrinkHorizontal()
{
if( !isResizable() || isShade())
return;
- QRect geom = geometry();
+ TQRect geom = geometry();
geom.setRight( workspace()->packPositionLeft( this, geom.right(), false ));
if( geom.width() <= 1 )
return;
@@ -672,15 +672,15 @@ void Client::growVertical()
{
if( !isResizable() || isShade())
return;
- QRect geom = geometry();
+ TQRect geom = geometry();
geom.setBottom( workspace()->packPositionDown( this, geom.bottom(), true ));
- QSize adjsize = adjustedSize( geom.size(), SizemodeFixedH );
+ TQSize adjsize = adjustedSize( geom.size(), SizemodeFixedH );
if( geometry().size() == adjsize && geom.size() != adjsize && xSizeHint.height_inc > 1 ) // take care of size increments
{
int newbottom = workspace()->packPositionDown( this, geom.bottom() + xSizeHint.height_inc - 1, true );
// check that it hasn't grown outside of the area, due to size increments
if( workspace()->clientArea( MovementArea,
- QPoint( geometry().center().x(), ( y() + newbottom ) / 2 ), desktop()).bottom() >= newbottom )
+ TQPoint( geometry().center().x(), ( y() + newbottom ) / 2 ), desktop()).bottom() >= newbottom )
geom.setBottom( newbottom );
}
geom.setSize( adjustedSize( geom.size(), SizemodeFixedH ));
@@ -698,7 +698,7 @@ void Client::shrinkVertical()
{
if( !isResizable() || isShade())
return;
- QRect geom = geometry();
+ TQRect geom = geometry();
geom.setBottom( workspace()->packPositionUp( this, geom.bottom(), false ));
if( geom.height() <= 1 )
return;
@@ -712,7 +712,7 @@ int Workspace::packPositionLeft( const Client* cl, int oldx, bool left_edge ) co
int newx = clientArea( MovementArea, cl ).left();
if( oldx <= newx ) // try another Xinerama screen
newx = clientArea( MovementArea,
- QPoint( cl->geometry().left() - 1, cl->geometry().center().y()), cl->desktop()).left();
+ TQPoint( cl->geometry().left() - 1, cl->geometry().center().y()), cl->desktop()).left();
if( oldx <= newx )
return oldx;
for( ClientList::ConstIterator it = clients.begin();
@@ -735,7 +735,7 @@ int Workspace::packPositionRight( const Client* cl, int oldx, bool right_edge )
int newx = clientArea( MovementArea, cl ).right();
if( oldx >= newx ) // try another Xinerama screen
newx = clientArea( MovementArea,
- QPoint( cl->geometry().right() + 1, cl->geometry().center().y()), cl->desktop()).right();
+ TQPoint( cl->geometry().right() + 1, cl->geometry().center().y()), cl->desktop()).right();
if( oldx >= newx )
return oldx;
for( ClientList::ConstIterator it = clients.begin();
@@ -758,7 +758,7 @@ int Workspace::packPositionUp( const Client* cl, int oldy, bool top_edge ) const
int newy = clientArea( MovementArea, cl ).top();
if( oldy <= newy ) // try another Xinerama screen
newy = clientArea( MovementArea,
- QPoint( cl->geometry().center().x(), cl->geometry().top() - 1 ), cl->desktop()).top();
+ TQPoint( cl->geometry().center().x(), cl->geometry().top() - 1 ), cl->desktop()).top();
if( oldy <= newy )
return oldy;
for( ClientList::ConstIterator it = clients.begin();
@@ -781,7 +781,7 @@ int Workspace::packPositionDown( const Client* cl, int oldy, bool bottom_edge )
int newy = clientArea( MovementArea, cl ).bottom();
if( oldy >= newy ) // try another Xinerama screen
newy = clientArea( MovementArea,
- QPoint( cl->geometry().center().x(), cl->geometry().bottom() + 1 ), cl->desktop()).bottom();
+ TQPoint( cl->geometry().center().x(), cl->geometry().bottom() + 1 ), cl->desktop()).bottom();
if( oldy >= newy )
return oldy;
for( ClientList::ConstIterator it = clients.begin();
@@ -802,12 +802,12 @@ int Workspace::packPositionDown( const Client* cl, int oldy, bool bottom_edge )
/*!
Asks the internal positioning object to place a client
*/
-void Workspace::place(Client* c, QRect& area)
+void Workspace::place(Client* c, TQRect& area)
{
initPositioning->place( c, area );
}
-void Workspace::placeSmart(Client* c, const QRect& area)
+void Workspace::placeSmart(Client* c, const TQRect& area)
{
initPositioning->placeSmart( c, area );
}
diff --git a/kwin/placement.h b/kwin/placement.h
index 49b436d49..65db2df34 100644
--- a/kwin/placement.h
+++ b/kwin/placement.h
@@ -13,8 +13,8 @@ License. See the file "COPYING" for the exact licensing terms.
#ifndef KWIN_PLACEMENT_H
#define KWIN_PLACEMENT_H
-#include <qpoint.h>
-#include <qvaluelist.h>
+#include <tqpoint.h>
+#include <tqvaluelist.h>
namespace KWinInternal
{
@@ -49,40 +49,40 @@ class Placement
Maximizing
};
- void place(Client* c, QRect& area );
+ void place(Client* c, TQRect& area );
- void placeAtRandom (Client* c, const QRect& area, Policy next = Unknown );
- void placeCascaded (Client* c, QRect& area, Policy next = Unknown );
- void placeSmart (Client* c, const QRect& area, Policy next = Unknown );
- void placeMaximizing (Client* c, QRect& area, Policy next = Unknown );
- void placeCentered (Client* c, const QRect& area, Policy next = Unknown );
- void placeZeroCornered(Client* c, const QRect& area, Policy next = Unknown );
- void placeDialog (Client* c, QRect& area, Policy next = Unknown );
- void placeUtility (Client* c, QRect& area, Policy next = Unknown );
+ void placeAtRandom (Client* c, const TQRect& area, Policy next = Unknown );
+ void placeCascaded (Client* c, TQRect& area, Policy next = Unknown );
+ void placeSmart (Client* c, const TQRect& area, Policy next = Unknown );
+ void placeMaximizing (Client* c, TQRect& area, Policy next = Unknown );
+ void placeCentered (Client* c, const TQRect& area, Policy next = Unknown );
+ void placeZeroCornered(Client* c, const TQRect& area, Policy next = Unknown );
+ void placeDialog (Client* c, TQRect& area, Policy next = Unknown );
+ void placeUtility (Client* c, TQRect& area, Policy next = Unknown );
void reinitCascading( int desktop );
- static Policy policyFromString( const QString& policy, bool no_special );
+ static Policy policyFromString( const TQString& policy, bool no_special );
static const char* policyToString( Policy policy );
private:
- void place(Client* c, QRect& area, Policy policy, Policy nextPlacement = Unknown );
- void placeUnderMouse(Client* c, QRect& area, Policy next = Unknown );
- void placeOnMainWindow(Client* c, QRect& area, Policy next = Unknown );
- QRect checkArea( const Client*c, const QRect& area );
+ void place(Client* c, TQRect& area, Policy policy, Policy nextPlacement = Unknown );
+ void placeUnderMouse(Client* c, TQRect& area, Policy next = Unknown );
+ void placeOnMainWindow(Client* c, TQRect& area, Policy next = Unknown );
+ TQRect checkArea( const Client*c, const TQRect& area );
Placement();
//CT needed for cascading+
struct DesktopCascadingInfo
{
- QPoint pos;
+ TQPoint pos;
int col;
int row;
};
- QValueList<DesktopCascadingInfo> cci;
+ TQValueList<DesktopCascadingInfo> cci;
Workspace* m_WorkspacePtr;
};
diff --git a/kwin/plugins.cpp b/kwin/plugins.cpp
index c7a4fcc15..75e7b3498 100644
--- a/kwin/plugins.cpp
+++ b/kwin/plugins.cpp
@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <kglobal.h>
#include <klocale.h>
#include <stdlib.h>
-#include <qpixmap.h>
+#include <tqpixmap.h>
namespace KWinInternal
{
@@ -22,12 +22,12 @@ namespace KWinInternal
PluginMgr::PluginMgr()
: KDecorationPlugins( KGlobal::config())
{
- defaultPlugin = (QPixmap::defaultDepth() > 8) ?
+ defaultPlugin = (TQPixmap::defaultDepth() > 8) ?
"kwin3_plastik" : "kwin3_quartz";
loadPlugin( "" ); // load the plugin specified in cfg file
}
-void PluginMgr::error( const QString &error_msg )
+void PluginMgr::error( const TQString &error_msg )
{
qWarning( "%s", (i18n("KWin: ") + error_msg +
i18n("\nKWin will now exit...")).local8Bit().data() );
diff --git a/kwin/plugins.h b/kwin/plugins.h
index 7e779098c..b10e29122 100644
--- a/kwin/plugins.h
+++ b/kwin/plugins.h
@@ -24,7 +24,7 @@ class PluginMgr
PluginMgr();
virtual bool provides( Requirement );
protected:
- virtual void error( const QString& error_msg );
+ virtual void error( const TQString& error_msg );
};
} // namespace
diff --git a/kwin/popupinfo.cpp b/kwin/popupinfo.cpp
index 906489e67..f0e80640a 100644
--- a/kwin/popupinfo.cpp
+++ b/kwin/popupinfo.cpp
@@ -14,17 +14,17 @@ License. See the file "COPYING" for the exact licensing terms.
#include "popupinfo.h"
#include "workspace.h"
#include "client.h"
-#include <qpainter.h>
-#include <qlabel.h>
-#include <qdrawutil.h>
-#include <qstyle.h>
+#include <tqpainter.h>
+#include <tqlabel.h>
+#include <tqdrawutil.h>
+#include <tqstyle.h>
#include <kglobal.h>
#include <fixx11h.h>
#include <kconfig.h>
#include <kdebug.h>
#include <klocale.h>
-#include <qapplication.h>
-#include <qdesktopwidget.h>
+#include <tqapplication.h>
+#include <tqdesktopwidget.h>
#include <kstringhandler.h>
#include <kglobalsettings.h>
@@ -34,15 +34,15 @@ namespace KWinInternal
{
PopupInfo::PopupInfo( Workspace* ws, const char *name )
- : QWidget( 0, name ), workspace( ws )
+ : TQWidget( 0, name ), workspace( ws )
{
m_infoString = "";
m_shown = false;
reset();
reconfigure();
- connect(&m_delayedHideTimer, SIGNAL(timeout()), this, SLOT(hide()));
+ connect(&m_delayedHideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hide()));
- QFont f = font();
+ TQFont f = font();
f.setBold( TRUE );
f.setPointSize( 14 );
setFont( f );
@@ -59,7 +59,7 @@ PopupInfo::~PopupInfo()
*/
void PopupInfo::reset()
{
- QRect r = workspace->screenGeometry( workspace->activeScreen());
+ TQRect r = workspace->screenGeometry( workspace->activeScreen());
int w = fontMetrics().width( m_infoString ) + 30;
@@ -72,11 +72,11 @@ void PopupInfo::reset()
/*!
Paints the popup info
*/
-void PopupInfo::paintEvent( QPaintEvent* )
+void PopupInfo::paintEvent( TQPaintEvent* )
{
- QPainter p( this );
- style().drawPrimitive( QStyle::PE_Panel, &p, QRect( 0, 0, width(), height() ),
- colorGroup(), QStyle::Style_Default );
+ TQPainter p( this );
+ style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ),
+ colorGroup(), TQStyle::Style_Default );
paintContents();
}
@@ -87,10 +87,10 @@ void PopupInfo::paintEvent( QPaintEvent* )
*/
void PopupInfo::paintContents()
{
- QPainter p( this );
- QRect r( 6, 6, width()-12, height()-12 );
+ TQPainter p( this );
+ TQRect r( 6, 6, width()-12, height()-12 );
- p.fillRect( r, colorGroup().brush( QColorGroup::Background ) );
+ p.fillRect( r, colorGroup().brush( TQColorGroup::Background ) );
/*
p.setPen(Qt::white);
@@ -106,8 +106,8 @@ void PopupInfo::paintContents()
void PopupInfo::hide()
{
m_delayedHideTimer.stop();
- QWidget::hide();
- QApplication::syncX();
+ TQWidget::hide();
+ TQApplication::syncX();
XEvent otherEvent;
while (XCheckTypedEvent (qt_xdisplay(), EnterNotify, &otherEvent ) )
;
@@ -122,7 +122,7 @@ void PopupInfo::reconfigure()
m_delayTime = c->readNumEntry("PopupHideDelay", 350 );
}
-void PopupInfo::showInfo(QString infoString)
+void PopupInfo::showInfo(TQString infoString)
{
if (m_show)
{
diff --git a/kwin/popupinfo.h b/kwin/popupinfo.h
index 0b31846ed..734a44cbe 100644
--- a/kwin/popupinfo.h
+++ b/kwin/popupinfo.h
@@ -11,9 +11,9 @@ License. See the file "COPYING" for the exact licensing terms.
#ifndef KWIN_POPUPINFO_H
#define KWIN_POPUPINFO_H
-#include <qwidget.h>
-#include <qtimer.h>
-#include <qvaluelist.h>
+#include <tqwidget.h>
+#include <tqtimer.h>
+#include <tqvaluelist.h>
namespace KWinInternal
{
@@ -29,20 +29,20 @@ class PopupInfo : public QWidget
void reset();
void hide();
- void showInfo(QString infoString);
+ void showInfo(TQString infoString);
void reconfigure();
protected:
- void paintEvent( QPaintEvent* );
+ void paintEvent( TQPaintEvent* );
void paintContents();
private:
- QTimer m_delayedHideTimer;
+ TQTimer m_delayedHideTimer;
int m_delayTime;
bool m_show;
bool m_shown;
- QString m_infoString;
+ TQString m_infoString;
Workspace* workspace;
};
diff --git a/kwin/rules.cpp b/kwin/rules.cpp
index 1aab4466a..cfcf4bc43 100644
--- a/kwin/rules.cpp
+++ b/kwin/rules.cpp
@@ -12,10 +12,10 @@ License. See the file "COPYING" for the exact licensing terms.
#include <fixx11h.h>
#include <kconfig.h>
-#include <qregexp.h>
+#include <tqregexp.h>
#include <ktempfile.h>
#include <ksimpleconfig.h>
-#include <qfile.h>
+#include <tqfile.h>
#ifndef KCMRULES
#include "client.h"
@@ -64,14 +64,14 @@ Rules::Rules()
{
}
-Rules::Rules( const QString& str, bool temporary )
+Rules::Rules( const TQString& str, bool temporary )
: temporary_state( temporary ? 2 : 0 )
{
KTempFile file;
- QFile* f = file.file();
+ TQFile* f = file.file();
if( f != NULL )
{
- QCString s = str.utf8();
+ TQCString s = str.utf8();
f->writeBlock( s.data(), s.length());
}
file.close();
@@ -134,10 +134,10 @@ void Rules::readFromCfg( KConfig& cfg )
sizerule = UnusedSetRule;
READ_FORCE_RULE( minsize, Size, );
if( !minsize.isValid())
- minsize = QSize( 1, 1 );
+ minsize = TQSize( 1, 1 );
READ_FORCE_RULE( maxsize, Size, );
if( maxsize.isEmpty())
- maxsize = QSize( 32767, 32767 );
+ maxsize = TQSize( 32767, 32767 );
READ_FORCE_RULE( opacityactive, Num, );
if( opacityactive < 0 || opacityactive > 100 )
opacityactive = 100;
@@ -293,7 +293,7 @@ bool Rules::isEmpty() const
&& disableglobalshortcutsrule == UnusedForceRule );
}
-Rules::SetRule Rules::readSetRule( KConfig& cfg, const QString& key )
+Rules::SetRule Rules::readSetRule( KConfig& cfg, const TQString& key )
{
int v = cfg.readNumEntry( key );
if( v >= DontAffect && v <= ForceTemporarily )
@@ -301,7 +301,7 @@ Rules::SetRule Rules::readSetRule( KConfig& cfg, const QString& key )
return UnusedSetRule;
}
-Rules::ForceRule Rules::readForceRule( KConfig& cfg, const QString& key )
+Rules::ForceRule Rules::readForceRule( KConfig& cfg, const TQString& key )
{
int v = cfg.readNumEntry( key );
if( v == DontAffect || v == Force || v == ForceTemporarily )
@@ -309,7 +309,7 @@ Rules::ForceRule Rules::readForceRule( KConfig& cfg, const QString& key )
return UnusedForceRule;
}
-NET::WindowType Rules::readType( KConfig& cfg, const QString& key )
+NET::WindowType Rules::readType( KConfig& cfg, const TQString& key )
{
int v = cfg.readNumEntry( key );
if( v >= NET::Normal && v <= NET::Splash )
@@ -329,13 +329,13 @@ bool Rules::matchType( NET::WindowType match_type ) const
return true;
}
-bool Rules::matchWMClass( const QCString& match_class, const QCString& match_name ) const
+bool Rules::matchWMClass( const TQCString& match_class, const TQCString& match_name ) const
{
if( wmclassmatch != UnimportantMatch )
{ // TODO optimize?
- QCString cwmclass = wmclasscomplete
+ TQCString cwmclass = wmclasscomplete
? match_name + ' ' + match_class : match_class;
- if( wmclassmatch == RegExpMatch && QRegExp( wmclass ).search( cwmclass ) == -1 )
+ if( wmclassmatch == RegExpMatch && TQRegExp( wmclass ).search( cwmclass ) == -1 )
return false;
if( wmclassmatch == ExactMatch && wmclass != cwmclass )
return false;
@@ -345,11 +345,11 @@ bool Rules::matchWMClass( const QCString& match_class, const QCString& match_nam
return true;
}
-bool Rules::matchRole( const QCString& match_role ) const
+bool Rules::matchRole( const TQCString& match_role ) const
{
if( windowrolematch != UnimportantMatch )
{
- if( windowrolematch == RegExpMatch && QRegExp( windowrole ).search( match_role ) == -1 )
+ if( windowrolematch == RegExpMatch && TQRegExp( windowrole ).search( match_role ) == -1 )
return false;
if( windowrolematch == ExactMatch && windowrole != match_role )
return false;
@@ -359,11 +359,11 @@ bool Rules::matchRole( const QCString& match_role ) const
return true;
}
-bool Rules::matchTitle( const QString& match_title ) const
+bool Rules::matchTitle( const TQString& match_title ) const
{
if( titlematch != UnimportantMatch )
{
- if( titlematch == RegExpMatch && QRegExp( title ).search( match_title ) == -1 )
+ if( titlematch == RegExpMatch && TQRegExp( title ).search( match_title ) == -1 )
return false;
if( titlematch == ExactMatch && title != match_title )
return false;
@@ -373,7 +373,7 @@ bool Rules::matchTitle( const QString& match_title ) const
return true;
}
-bool Rules::matchClientMachine( const QCString& match_machine ) const
+bool Rules::matchClientMachine( const TQCString& match_machine ) const
{
if( clientmachinematch != UnimportantMatch )
{
@@ -382,7 +382,7 @@ bool Rules::matchClientMachine( const QCString& match_machine ) const
&& matchClientMachine( "localhost" ))
return true;
if( clientmachinematch == RegExpMatch
- && QRegExp( clientmachine ).search( match_machine ) == -1 )
+ && TQRegExp( clientmachine ).search( match_machine ) == -1 )
return false;
if( clientmachinematch == ExactMatch
&& clientmachine != match_machine )
@@ -419,7 +419,7 @@ bool Rules::update( Client* c )
{
if( !c->isFullScreen())
{
- QPoint new_pos = position;
+ TQPoint new_pos = position;
// don't use the position in the direction which is maximized
if(( c->maximizeMode() & MaximizeHorizontal ) == 0 )
new_pos.setX( c->pos().x());
@@ -433,7 +433,7 @@ bool Rules::update( Client* c )
{
if( !c->isFullScreen())
{
- QSize new_size = size;
+ TQSize new_size = size;
// don't use the position in the direction which is maximized
if(( c->maximizeMode() & MaximizeHorizontal ) == 0 )
new_size.setWidth( c->size().width());
@@ -529,10 +529,10 @@ bool Rules::apply##name( type& arg ) const \
APPLY_FORCE_RULE( placement, Placement, Placement::Policy )
-bool Rules::applyGeometry( QRect& rect, bool init ) const
+bool Rules::applyGeometry( TQRect& rect, bool init ) const
{
- QPoint p = rect.topLeft();
- QSize s = rect.size();
+ TQPoint p = rect.topLeft();
+ TQSize s = rect.size();
bool ret = false; // no short-circuiting
if( applyPosition( p, init ))
{
@@ -547,22 +547,22 @@ bool Rules::applyGeometry( QRect& rect, bool init ) const
return ret;
}
-bool Rules::applyPosition( QPoint& pos, bool init ) const
+bool Rules::applyPosition( TQPoint& pos, bool init ) const
{
if( this->position != invalidPoint && checkSetRule( positionrule, init ))
pos = this->position;
return checkSetStop( positionrule );
}
-bool Rules::applySize( QSize& s, bool init ) const
+bool Rules::applySize( TQSize& s, bool init ) const
{
if( this->size.isValid() && checkSetRule( sizerule, init ))
s = this->size;
return checkSetStop( sizerule );
}
-APPLY_FORCE_RULE( minsize, MinSize, QSize )
-APPLY_FORCE_RULE( maxsize, MaxSize, QSize )
+APPLY_FORCE_RULE( minsize, MinSize, TQSize )
+APPLY_FORCE_RULE( maxsize, MaxSize, TQSize )
APPLY_FORCE_RULE( opacityactive, OpacityActive, int )
APPLY_FORCE_RULE( opacityinactive, OpacityInactive, int )
APPLY_FORCE_RULE( ignoreposition, IgnorePosition, bool )
@@ -615,7 +615,7 @@ APPLY_FORCE_RULE( acceptfocus, AcceptFocus, bool )
APPLY_FORCE_RULE( moveresizemode, MoveResizeMode, Options::MoveResizeMode )
APPLY_FORCE_RULE( closeable, Closeable, bool )
APPLY_FORCE_RULE( strictgeometry, StrictGeometry, bool )
-APPLY_RULE( shortcut, Shortcut, QString )
+APPLY_RULE( shortcut, Shortcut, TQString )
APPLY_FORCE_RULE( disableglobalshortcuts, DisableGlobalShortcuts, bool )
@@ -695,8 +695,8 @@ kdbgstream& operator<<( kdbgstream& stream, const Rules* r )
#ifndef KCMRULES
void WindowRules::discardTemporary()
{
- QValueVector< Rules* >::Iterator it2 = rules.begin();
- for( QValueVector< Rules* >::Iterator it = rules.begin();
+ TQValueVector< Rules* >::Iterator it2 = rules.begin();
+ for( TQValueVector< Rules* >::Iterator it = rules.begin();
it != rules.end();
)
{
@@ -713,7 +713,7 @@ void WindowRules::discardTemporary()
void WindowRules::update( Client* c )
{
bool updated = false;
- for( QValueVector< Rules* >::ConstIterator it = rules.begin();
+ for( TQValueVector< Rules* >::ConstIterator it = rules.begin();
it != rules.end();
++it )
if( (*it)->update( c )) // no short-circuiting here
@@ -728,7 +728,7 @@ type WindowRules::check##rule( type arg, bool init ) const \
if( rules.count() == 0 ) \
return arg; \
type ret = arg; \
- for( QValueVector< Rules* >::ConstIterator it = rules.begin(); \
+ for( TQValueVector< Rules* >::ConstIterator it = rules.begin(); \
it != rules.end(); \
++it ) \
{ \
@@ -744,7 +744,7 @@ type WindowRules::check##rule( type arg ) const \
if( rules.count() == 0 ) \
return arg; \
type ret = arg; \
- for( QValueVector< Rules* >::ConstIterator it = rules.begin(); \
+ for( TQValueVector< Rules* >::ConstIterator it = rules.begin(); \
it != rules.end(); \
++it ) \
{ \
@@ -756,15 +756,15 @@ type WindowRules::check##rule( type arg ) const \
CHECK_FORCE_RULE( Placement, Placement::Policy )
-QRect WindowRules::checkGeometry( QRect rect, bool init ) const
+TQRect WindowRules::checkGeometry( TQRect rect, bool init ) const
{
- return QRect( checkPosition( rect.topLeft(), init ), checkSize( rect.size(), init ));
+ return TQRect( checkPosition( rect.topLeft(), init ), checkSize( rect.size(), init ));
}
-CHECK_RULE( Position, QPoint )
-CHECK_RULE( Size, QSize )
-CHECK_FORCE_RULE( MinSize, QSize )
-CHECK_FORCE_RULE( MaxSize, QSize )
+CHECK_RULE( Position, TQPoint )
+CHECK_RULE( Size, TQSize )
+CHECK_FORCE_RULE( MinSize, TQSize )
+CHECK_FORCE_RULE( MaxSize, TQSize )
CHECK_FORCE_RULE( OpacityActive, int )
CHECK_FORCE_RULE( OpacityInactive, int )
CHECK_FORCE_RULE( IgnorePosition, bool )
@@ -799,7 +799,7 @@ CHECK_FORCE_RULE( AcceptFocus, bool )
CHECK_FORCE_RULE( MoveResizeMode, Options::MoveResizeMode )
CHECK_FORCE_RULE( Closeable, bool )
CHECK_FORCE_RULE( StrictGeometry, bool )
-CHECK_RULE( Shortcut, QString )
+CHECK_RULE( Shortcut, TQString )
CHECK_FORCE_RULE( DisableGlobalShortcuts, bool )
#undef CHECK_RULE
@@ -823,8 +823,8 @@ void Client::applyWindowRules()
// apply force rules
// Placement - does need explicit update, just like some others below
// Geometry : setGeometry() doesn't check rules
- QRect orig_geom = QRect( pos(), sizeForClientSize( clientSize())); // handle shading
- QRect geom = client_rules.checkGeometry( orig_geom );
+ TQRect orig_geom = TQRect( pos(), sizeForClientSize( clientSize())); // handle shading
+ TQRect geom = client_rules.checkGeometry( orig_geom );
if( geom != orig_geom )
setGeometry( geom );
// MinSize, MaxSize handled by Geometry
@@ -851,7 +851,7 @@ void Client::applyWindowRules()
workspace()->activateNextClient( this );
// MoveResizeMode
// Closeable
- QSize s = adjustedSize();
+ TQSize s = adjustedSize();
if( s != size())
resizeWithChecks( s );
// StrictGeometry
@@ -917,8 +917,8 @@ void Client::checkAndSetInitialRuledOpacity()
WindowRules Workspace::findWindowRules( const Client* c, bool ignore_temporary )
{
- QValueVector< Rules* > ret;
- for( QValueList< Rules* >::Iterator it = rules.begin();
+ TQValueVector< Rules* > ret;
+ for( TQValueList< Rules* >::Iterator it = rules.begin();
it != rules.end();
)
{
@@ -946,8 +946,8 @@ WindowRules Workspace::findWindowRules( const Client* c, bool ignore_temporary )
void Workspace::editWindowRules( Client* c, bool whole_app )
{
writeWindowRules();
- QStringList args;
- args << "--wid" << QString::number( c->window());
+ TQStringList args;
+ args << "--wid" << TQString::number( c->window());
if( whole_app )
args << "--whole-app";
KApplication::kdeinitExec( "kwin_rules_dialog", args );
@@ -967,7 +967,7 @@ void Workspace::loadWindowRules()
i <= count;
++i )
{
- cfg.setGroup( QString::number( i ));
+ cfg.setGroup( TQString::number( i ));
Rules* rule = new Rules( cfg );
rules.append( rule );
}
@@ -977,30 +977,30 @@ void Workspace::writeWindowRules()
{
rulesUpdatedTimer.stop();
KConfig cfg( "kwinrulesrc" );
- QStringList groups = cfg.groupList();
- for( QStringList::ConstIterator it = groups.begin();
+ TQStringList groups = cfg.groupList();
+ for( TQStringList::ConstIterator it = groups.begin();
it != groups.end();
++it )
cfg.deleteGroup( *it );
cfg.setGroup( "General" );
cfg.writeEntry( "count", rules.count());
int i = 1;
- for( QValueList< Rules* >::ConstIterator it = rules.begin();
+ for( TQValueList< Rules* >::ConstIterator it = rules.begin();
it != rules.end();
++it )
{
if( (*it)->isTemporary())
continue;
- cfg.setGroup( QString::number( i ));
+ cfg.setGroup( TQString::number( i ));
(*it)->write( cfg );
++i;
}
}
-void Workspace::gotTemporaryRulesMessage( const QString& message )
+void Workspace::gotTemporaryRulesMessage( const TQString& message )
{
bool was_temporary = false;
- for( QValueList< Rules* >::ConstIterator it = rules.begin();
+ for( TQValueList< Rules* >::ConstIterator it = rules.begin();
it != rules.end();
++it )
if( (*it)->isTemporary())
@@ -1008,13 +1008,13 @@ void Workspace::gotTemporaryRulesMessage( const QString& message )
Rules* rule = new Rules( message, true );
rules.prepend( rule ); // highest priority first
if( !was_temporary )
- QTimer::singleShot( 60000, this, SLOT( cleanupTemporaryRules()));
+ TQTimer::singleShot( 60000, this, TQT_SLOT( cleanupTemporaryRules()));
}
void Workspace::cleanupTemporaryRules()
{
bool has_temporary = false;
- for( QValueList< Rules* >::Iterator it = rules.begin();
+ for( TQValueList< Rules* >::Iterator it = rules.begin();
it != rules.end();
)
{
@@ -1028,13 +1028,13 @@ void Workspace::cleanupTemporaryRules()
}
}
if( has_temporary )
- QTimer::singleShot( 60000, this, SLOT( cleanupTemporaryRules()));
+ TQTimer::singleShot( 60000, this, TQT_SLOT( cleanupTemporaryRules()));
}
void Workspace::discardUsedWindowRules( Client* c, bool withdrawn )
{
bool updated = false;
- for( QValueList< Rules* >::Iterator it = rules.begin();
+ for( TQValueList< Rules* >::Iterator it = rules.begin();
it != rules.end();
)
{
diff --git a/kwin/rules.h b/kwin/rules.h
index 65a8b9963..584e6a952 100644
--- a/kwin/rules.h
+++ b/kwin/rules.h
@@ -11,10 +11,10 @@ License. See the file "COPYING" for the exact licensing terms.
#ifndef KWIN_RULES_H
#define KWIN_RULES_H
-#include <qstring.h>
+#include <tqstring.h>
#include <netwm_def.h>
-#include <qrect.h>
-#include <qvaluevector.h>
+#include <tqrect.h>
+#include <tqvaluevector.h>
#include <kdebug.h>
#include "placement.h"
@@ -36,19 +36,19 @@ class WindowRules
: public KDecorationDefines
{
public:
- WindowRules( const QValueVector< Rules* >& rules );
+ WindowRules( const TQValueVector< Rules* >& rules );
WindowRules();
void update( Client* );
void discardTemporary();
bool contains( const Rules* rule ) const;
void remove( Rules* rule );
Placement::Policy checkPlacement( Placement::Policy placement ) const;
- QRect checkGeometry( QRect rect, bool init = false ) const;
- // use 'invalidPoint' with checkPosition, unlike QSize() and QRect(), QPoint() is a valid point
- QPoint checkPosition( QPoint pos, bool init = false ) const;
- QSize checkSize( QSize s, bool init = false ) const;
- QSize checkMinSize( QSize s ) const;
- QSize checkMaxSize( QSize s ) const;
+ TQRect checkGeometry( TQRect rect, bool init = false ) const;
+ // use 'invalidPoint' with checkPosition, unlike TQSize() and TQRect(), TQPoint() is a valid point
+ TQPoint checkPosition( TQPoint pos, bool init = false ) const;
+ TQSize checkSize( TQSize s, bool init = false ) const;
+ TQSize checkMinSize( TQSize s ) const;
+ TQSize checkMaxSize( TQSize s ) const;
int checkOpacityActive(int s) const;
int checkOpacityInactive(int s) const;
bool checkIgnoreGeometry( bool ignore ) const;
@@ -68,13 +68,13 @@ class WindowRules
Options::MoveResizeMode checkMoveResizeMode( Options::MoveResizeMode mode ) const;
bool checkCloseable( bool closeable ) const;
bool checkStrictGeometry( bool strict ) const;
- QString checkShortcut( QString s, bool init = false ) const;
+ TQString checkShortcut( TQString s, bool init = false ) const;
bool checkDisableGlobalShortcuts( bool disable ) const;
bool checkIgnorePosition( bool ignore ) const; // obsolete
private:
MaximizeMode checkMaximizeVert( MaximizeMode mode, bool init ) const;
MaximizeMode checkMaximizeHoriz( MaximizeMode mode, bool init ) const;
- QValueVector< Rules* > rules;
+ TQValueVector< Rules* > rules;
};
#endif
@@ -84,7 +84,7 @@ class Rules
public:
Rules();
Rules( KConfig& );
- Rules( const QString&, bool temporary );
+ Rules( const TQString&, bool temporary );
void write( KConfig& ) const;
bool isEmpty() const;
#ifndef KCMRULES
@@ -94,12 +94,12 @@ class Rules
bool isTemporary() const;
bool discardTemporary( bool force ); // removes if temporary and forced or too old
bool applyPlacement( Placement::Policy& placement ) const;
- bool applyGeometry( QRect& rect, bool init ) const;
- // use 'invalidPoint' with applyPosition, unlike QSize() and QRect(), QPoint() is a valid point
- bool applyPosition( QPoint& pos, bool init ) const;
- bool applySize( QSize& s, bool init ) const;
- bool applyMinSize( QSize& s ) const;
- bool applyMaxSize( QSize& s ) const;
+ bool applyGeometry( TQRect& rect, bool init ) const;
+ // use 'invalidPoint' with applyPosition, unlike TQSize() and TQRect(), TQPoint() is a valid point
+ bool applyPosition( TQPoint& pos, bool init ) const;
+ bool applySize( TQSize& s, bool init ) const;
+ bool applyMinSize( TQSize& s ) const;
+ bool applyMaxSize( TQSize& s ) const;
bool applyOpacityActive(int& s) const;
bool applyOpacityInactive(int& s) const;
bool applyIgnoreGeometry( bool& ignore ) const;
@@ -120,16 +120,16 @@ class Rules
bool applyMoveResizeMode( Options::MoveResizeMode& mode ) const;
bool applyCloseable( bool& closeable ) const;
bool applyStrictGeometry( bool& strict ) const;
- bool applyShortcut( QString& shortcut, bool init ) const;
+ bool applyShortcut( TQString& shortcut, bool init ) const;
bool applyDisableGlobalShortcuts( bool& disable ) const;
bool applyIgnorePosition( bool& ignore ) const; // obsolete
private:
#endif
bool matchType( NET::WindowType match_type ) const;
- bool matchWMClass( const QCString& match_class, const QCString& match_name ) const;
- bool matchRole( const QCString& match_role ) const;
- bool matchTitle( const QString& match_title ) const;
- bool matchClientMachine( const QCString& match_machine ) const;
+ bool matchWMClass( const TQCString& match_class, const TQCString& match_name ) const;
+ bool matchRole( const TQCString& match_role ) const;
+ bool matchTitle( const TQString& match_title ) const;
+ bool matchClientMachine( const TQCString& match_machine ) const;
// All these values are saved to the cfg file, and are also used in kstart!
enum
{
@@ -161,9 +161,9 @@ class Rules
LastStringMatch = RegExpMatch
};
void readFromCfg( KConfig& cfg );
- static SetRule readSetRule( KConfig&, const QString& key );
- static ForceRule readForceRule( KConfig&, const QString& key );
- static NET::WindowType readType( KConfig&, const QString& key );
+ static SetRule readSetRule( KConfig&, const TQString& key );
+ static ForceRule readForceRule( KConfig&, const TQString& key );
+ static NET::WindowType readType( KConfig&, const TQString& key );
#ifndef KCMRULES
static bool checkSetRule( SetRule rule, bool init );
static bool checkForceRule( ForceRule rule );
@@ -171,28 +171,28 @@ class Rules
static bool checkForceStop( ForceRule rule );
#endif
int temporary_state; // e.g. for kstart
- QString description;
- QCString wmclass;
+ TQString description;
+ TQCString wmclass;
StringMatch wmclassmatch;
bool wmclasscomplete;
- QCString windowrole;
+ TQCString windowrole;
StringMatch windowrolematch;
- QString title; // TODO "caption" ?
+ TQString title; // TODO "caption" ?
StringMatch titlematch;
- QCString extrarole;
+ TQCString extrarole;
StringMatch extrarolematch;
- QCString clientmachine;
+ TQCString clientmachine;
StringMatch clientmachinematch;
unsigned long types; // types for matching
Placement::Policy placement;
ForceRule placementrule;
- QPoint position;
+ TQPoint position;
SetRule positionrule;
- QSize size;
+ TQSize size;
SetRule sizerule;
- QSize minsize;
+ TQSize minsize;
ForceRule minsizerule;
- QSize maxsize;
+ TQSize maxsize;
ForceRule maxsizerule;
int opacityactive;
ForceRule opacityactiverule;
@@ -234,7 +234,7 @@ class Rules
ForceRule closeablerule;
bool strictgeometry;
ForceRule strictgeometryrule;
- QString shortcut;
+ TQString shortcut;
SetRule shortcutrule;
bool disableglobalshortcuts;
ForceRule disableglobalshortcutsrule;
@@ -273,7 +273,7 @@ bool Rules::checkForceStop( ForceRule rule )
}
inline
-WindowRules::WindowRules( const QValueVector< Rules* >& r )
+WindowRules::WindowRules( const TQValueVector< Rules* >& r )
: rules( r )
{
}
@@ -292,7 +292,7 @@ bool WindowRules::contains( const Rules* rule ) const
inline
void WindowRules::remove( Rules* rule )
{
- QValueVector< Rules* >::Iterator pos = qFind( rules.begin(), rules.end(), rule );
+ TQValueVector< Rules* >::Iterator pos = qFind( rules.begin(), rules.end(), rule );
if( pos != rules.end())
rules.erase( pos );
}
diff --git a/kwin/sm.cpp b/kwin/sm.cpp
index 37b9526c7..d13c6b18b 100644
--- a/kwin/sm.cpp
+++ b/kwin/sm.cpp
@@ -11,8 +11,8 @@ License. See the file "COPYING" for the exact licensing terms.
#include "sm.h"
-#include <qsocketnotifier.h>
-#include <qsessionmanager.h>
+#include <tqsocketnotifier.h>
+#include <tqsessionmanager.h>
#include <kdebug.h>
#include <unistd.h>
#include <stdlib.h>
@@ -75,8 +75,8 @@ void Workspace::storeSession( KConfig* config, SMSavePhase phase )
for (ClientList::Iterator it = clients.begin(); it != clients.end(); ++it)
{
Client* c = (*it);
- QCString sessionId = c->sessionId();
- QCString wmCommand = c->wmCommand();
+ TQCString sessionId = c->sessionId();
+ TQCString wmCommand = c->wmCommand();
if ( sessionId.isEmpty() )
// remember also applications that are not XSMP capable
// and use the obsolete WM_COMMAND / WM_SAVE_YOURSELF
@@ -85,35 +85,35 @@ void Workspace::storeSession( KConfig* config, SMSavePhase phase )
count++;
if( c->isActive())
active_client = count;
- QString n = QString::number(count);
+ TQString n = TQString::number(count);
if( phase == SMSavePhase2 || phase == SMSavePhase2Full )
{
- config->writeEntry( QString("sessionId")+n, sessionId.data() );
- config->writeEntry( QString("windowRole")+n, c->windowRole().data() );
- config->writeEntry( QString("wmCommand")+n, wmCommand.data() );
- config->writeEntry( QString("wmClientMachine")+n, c->wmClientMachine( true ).data() );
- config->writeEntry( QString("resourceName")+n, c->resourceName().data() );
- config->writeEntry( QString("resourceClass")+n, c->resourceClass().data() );
- config->writeEntry( QString("geometry")+n, QRect( c->calculateGravitation(TRUE), c->clientSize() ) ); // FRAME
- config->writeEntry( QString("restore")+n, c->geometryRestore() );
- config->writeEntry( QString("fsrestore")+n, c->geometryFSRestore() );
- config->writeEntry( QString("maximize")+n, (int) c->maximizeMode() );
- config->writeEntry( QString("fullscreen")+n, (int) c->fullScreenMode() );
- config->writeEntry( QString("desktop")+n, c->desktop() );
+ config->writeEntry( TQString("sessionId")+n, sessionId.data() );
+ config->writeEntry( TQString("windowRole")+n, c->windowRole().data() );
+ config->writeEntry( TQString("wmCommand")+n, wmCommand.data() );
+ config->writeEntry( TQString("wmClientMachine")+n, c->wmClientMachine( true ).data() );
+ config->writeEntry( TQString("resourceName")+n, c->resourceName().data() );
+ config->writeEntry( TQString("resourceClass")+n, c->resourceClass().data() );
+ config->writeEntry( TQString("geometry")+n, TQRect( c->calculateGravitation(TRUE), c->clientSize() ) ); // FRAME
+ config->writeEntry( TQString("restore")+n, c->geometryRestore() );
+ config->writeEntry( TQString("fsrestore")+n, c->geometryFSRestore() );
+ config->writeEntry( TQString("maximize")+n, (int) c->maximizeMode() );
+ config->writeEntry( TQString("fullscreen")+n, (int) c->fullScreenMode() );
+ config->writeEntry( TQString("desktop")+n, c->desktop() );
// the config entry is called "iconified" for back. comp. reasons
// (kconf_update script for updating session files would be too complicated)
- config->writeEntry( QString("iconified")+n, c->isMinimized() );
+ config->writeEntry( TQString("iconified")+n, c->isMinimized() );
// the config entry is called "sticky" for back. comp. reasons
- config->writeEntry( QString("sticky")+n, c->isOnAllDesktops() );
- config->writeEntry( QString("shaded")+n, c->isShade() );
+ config->writeEntry( TQString("sticky")+n, c->isOnAllDesktops() );
+ config->writeEntry( TQString("shaded")+n, c->isShade() );
// the config entry is called "staysOnTop" for back. comp. reasons
- config->writeEntry( QString("staysOnTop")+n, c->keepAbove() );
- config->writeEntry( QString("keepBelow")+n, c->keepBelow() );
- config->writeEntry( QString("skipTaskbar")+n, c->skipTaskbar( true ) );
- config->writeEntry( QString("skipPager")+n, c->skipPager() );
- config->writeEntry( QString("userNoBorder")+n, c->isUserNoBorder() );
- config->writeEntry( QString("windowType")+n, windowTypeToTxt( c->windowType()));
- config->writeEntry( QString("shortcut")+n, c->shortcut().toStringInternal());
+ config->writeEntry( TQString("staysOnTop")+n, c->keepAbove() );
+ config->writeEntry( TQString("keepBelow")+n, c->keepBelow() );
+ config->writeEntry( TQString("skipTaskbar")+n, c->skipTaskbar( true ) );
+ config->writeEntry( TQString("skipPager")+n, c->skipPager() );
+ config->writeEntry( TQString("userNoBorder")+n, c->isUserNoBorder() );
+ config->writeEntry( TQString("windowType")+n, windowTypeToTxt( c->windowType()));
+ config->writeEntry( TQString("shortcut")+n, c->shortcut().toStringInternal());
}
}
// TODO store also stacking order
@@ -154,31 +154,31 @@ void Workspace::loadSessionInfo()
int active_client = config->readNumEntry( "active" );
for ( int i = 1; i <= count; i++ )
{
- QString n = QString::number(i);
+ TQString n = TQString::number(i);
SessionInfo* info = new SessionInfo;
session.append( info );
- info->sessionId = config->readEntry( QString("sessionId")+n ).latin1();
- info->windowRole = config->readEntry( QString("windowRole")+n ).latin1();
- info->wmCommand = config->readEntry( QString("wmCommand")+n ).latin1();
- info->wmClientMachine = config->readEntry( QString("wmClientMachine")+n ).latin1();
- info->resourceName = config->readEntry( QString("resourceName")+n ).latin1();
- info->resourceClass = config->readEntry( QString("resourceClass")+n ).lower().latin1();
- info->geometry = config->readRectEntry( QString("geometry")+n );
- info->restore = config->readRectEntry( QString("restore")+n );
- info->fsrestore = config->readRectEntry( QString("fsrestore")+n );
- info->maximized = config->readNumEntry( QString("maximize")+n, 0 );
- info->fullscreen = config->readNumEntry( QString("fullscreen")+n, 0 );
- info->desktop = config->readNumEntry( QString("desktop")+n, 0 );
- info->minimized = config->readBoolEntry( QString("iconified")+n, FALSE );
- info->onAllDesktops = config->readBoolEntry( QString("sticky")+n, FALSE );
- info->shaded = config->readBoolEntry( QString("shaded")+n, FALSE );
- info->keepAbove = config->readBoolEntry( QString("staysOnTop")+n, FALSE );
- info->keepBelow = config->readBoolEntry( QString("keepBelow")+n, FALSE );
- info->skipTaskbar = config->readBoolEntry( QString("skipTaskbar")+n, FALSE );
- info->skipPager = config->readBoolEntry( QString("skipPager")+n, FALSE );
- info->userNoBorder = config->readBoolEntry( QString("userNoBorder")+n, FALSE );
- info->windowType = txtToWindowType( config->readEntry( QString("windowType")+n ).latin1());
- info->shortcut = config->readEntry( QString("shortcut")+n );
+ info->sessionId = config->readEntry( TQString("sessionId")+n ).latin1();
+ info->windowRole = config->readEntry( TQString("windowRole")+n ).latin1();
+ info->wmCommand = config->readEntry( TQString("wmCommand")+n ).latin1();
+ info->wmClientMachine = config->readEntry( TQString("wmClientMachine")+n ).latin1();
+ info->resourceName = config->readEntry( TQString("resourceName")+n ).latin1();
+ info->resourceClass = config->readEntry( TQString("resourceClass")+n ).lower().latin1();
+ info->geometry = config->readRectEntry( TQString("geometry")+n );
+ info->restore = config->readRectEntry( TQString("restore")+n );
+ info->fsrestore = config->readRectEntry( TQString("fsrestore")+n );
+ info->maximized = config->readNumEntry( TQString("maximize")+n, 0 );
+ info->fullscreen = config->readNumEntry( TQString("fullscreen")+n, 0 );
+ info->desktop = config->readNumEntry( TQString("desktop")+n, 0 );
+ info->minimized = config->readBoolEntry( TQString("iconified")+n, FALSE );
+ info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, FALSE );
+ info->shaded = config->readBoolEntry( TQString("shaded")+n, FALSE );
+ info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, FALSE );
+ info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, FALSE );
+ info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, FALSE );
+ info->skipPager = config->readBoolEntry( TQString("skipPager")+n, FALSE );
+ info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, FALSE );
+ info->windowType = txtToWindowType( config->readEntry( TQString("windowType")+n ).latin1());
+ info->shortcut = config->readEntry( TQString("shortcut")+n );
info->active = ( active_client == i );
}
}
@@ -195,12 +195,12 @@ void Workspace::loadSessionInfo()
SessionInfo* Workspace::takeSessionInfo( Client* c )
{
SessionInfo *realInfo = 0;
- QCString sessionId = c->sessionId();
- QCString windowRole = c->windowRole();
- QCString wmCommand = c->wmCommand();
- QCString wmClientMachine = c->wmClientMachine( true );
- QCString resourceName = c->resourceName();
- QCString resourceClass = c->resourceClass();
+ TQCString sessionId = c->sessionId();
+ TQCString windowRole = c->windowRole();
+ TQCString wmCommand = c->wmCommand();
+ TQCString wmClientMachine = c->wmClientMachine( true );
+ TQCString resourceName = c->resourceName();
+ TQCString resourceClass = c->resourceClass();
// First search ``session''
if (! sessionId.isEmpty() )
@@ -253,7 +253,7 @@ bool Workspace::sessionInfoWindowTypeMatch( Client* c, SessionInfo* info )
// of <appname>-mainwindow#<number>
// when comparing them for fake session info, it's probably better to check
// them without the trailing number
-bool Workspace::windowRoleMatch( const QCString& role1, const QCString& role2 )
+bool Workspace::windowRoleMatch( const TQCString& role1, const TQCString& role2 )
{
if( role1.isEmpty() && role2.isEmpty())
return true;
@@ -413,9 +413,9 @@ SessionSaveDoneHelper::SessionSaveDoneHelper()
props[ 4 ].vals = &propvalue[ 4 ];
SmProp* p[ 5 ] = { &props[ 0 ], &props[ 1 ], &props[ 2 ], &props[ 3 ], &props[ 4 ] };
SmcSetProperties( conn, 5, p );
- notifier = new QSocketNotifier( IceConnectionNumber( SmcGetIceConnection( conn )),
- QSocketNotifier::Read, this );
- connect( notifier, SIGNAL( activated( int )), SLOT( processData()));
+ notifier = new TQSocketNotifier( IceConnectionNumber( SmcGetIceConnection( conn )),
+ TQSocketNotifier::Read, this );
+ connect( notifier, TQT_SIGNAL( activated( int )), TQT_SLOT( processData()));
}
SessionSaveDoneHelper::~SessionSaveDoneHelper()
diff --git a/kwin/sm.h b/kwin/sm.h
index 0a23b7bad..eebbffd56 100644
--- a/kwin/sm.h
+++ b/kwin/sm.h
@@ -23,16 +23,16 @@ namespace KWinInternal
struct SessionInfo
{
- QCString sessionId;
- QCString windowRole;
- QCString wmCommand;
- QCString wmClientMachine;
- QCString resourceName;
- QCString resourceClass;
+ TQCString sessionId;
+ TQCString windowRole;
+ TQCString wmCommand;
+ TQCString wmClientMachine;
+ TQCString resourceName;
+ TQCString resourceClass;
- QRect geometry;
- QRect restore;
- QRect fsrestore;
+ TQRect geometry;
+ TQRect restore;
+ TQRect fsrestore;
int maximized;
int fullscreen;
int desktop;
@@ -45,7 +45,7 @@ struct SessionInfo
bool skipPager;
bool userNoBorder;
NET::WindowType windowType;
- QString shortcut;
+ TQString shortcut;
bool active; // means 'was active in the saved session'
};
@@ -70,7 +70,7 @@ class SessionSaveDoneHelper
private slots:
void processData();
private:
- QSocketNotifier* notifier;
+ TQSocketNotifier* notifier;
SmcConn conn;
};
diff --git a/kwin/tabbox.cpp b/kwin/tabbox.cpp
index 29bef47b8..a79c10233 100644
--- a/kwin/tabbox.cpp
+++ b/kwin/tabbox.cpp
@@ -13,16 +13,16 @@ License. See the file "COPYING" for the exact licensing terms.
#include "tabbox.h"
#include "workspace.h"
#include "client.h"
-#include <qpainter.h>
-#include <qlabel.h>
-#include <qdrawutil.h>
-#include <qstyle.h>
+#include <tqpainter.h>
+#include <tqlabel.h>
+#include <tqdrawutil.h>
+#include <tqstyle.h>
#include <kglobal.h>
#include <fixx11h.h>
#include <kconfig.h>
#include <klocale.h>
-#include <qapplication.h>
-#include <qdesktopwidget.h>
+#include <tqapplication.h>
+#include <tqdesktopwidget.h>
#include <kstringhandler.h>
#include <stdarg.h>
#include <kdebug.h>
@@ -40,12 +40,12 @@ extern Time qt_x_time;
namespace KWinInternal
{
-extern QPixmap* kwin_get_menu_pix_hack();
+extern TQPixmap* kwin_get_menu_pix_hack();
TabBox::TabBox( Workspace *ws, const char *name )
- : QFrame( 0, name, Qt::WNoAutoErase ), current_client( NULL ), wspace(ws)
+ : TQFrame( 0, name, Qt::WNoAutoErase ), current_client( NULL ), wspace(ws)
{
- setFrameStyle(QFrame::StyledPanel | QFrame::Plain);
+ setFrameStyle(TQFrame::StyledPanel | TQFrame::Plain);
setLineWidth(2);
setMargin(2);
@@ -55,7 +55,7 @@ TabBox::TabBox( Workspace *ws, const char *name )
m = DesktopMode; // init variables
reconfigure();
reset();
- connect(&delayedShowTimer, SIGNAL(timeout()), this, SLOT(show()));
+ connect(&delayedShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(show()));
XSetWindowAttributes attr;
attr.override_redirect = 1;
@@ -165,7 +165,7 @@ void TabBox::reset()
{
int w, h, cw = 0, wmax = 0;
- QRect r = workspace()->screenGeometry( workspace()->activeScreen());
+ TQRect r = workspace()->screenGeometry( workspace()->activeScreen());
// calculate height of 1 line
// fontheight + 1 pixel above + 1 pixel below, or 32x32 icon + 2 pixel above + below
@@ -189,11 +189,11 @@ void TabBox::reset()
// calculate height for the popup
if ( clients.count() == 0 ) // height for the "not tasks" text
{
- QFont f = font();
+ TQFont f = font();
f.setBold( TRUE );
f.setPointSize( 14 );
- h = QFontMetrics(f).height()*4;
+ h = TQFontMetrics(f).height()*4;
}
else
{
@@ -343,7 +343,7 @@ int TabBox::currentDesktop()
/*!
Reimplemented to raise the tab box as well
*/
-void TabBox::showEvent( QShowEvent* )
+void TabBox::showEvent( TQShowEvent* )
{
updateOutline();
XRaiseWindow( qt_xdisplay(), outline_left );
@@ -357,7 +357,7 @@ void TabBox::showEvent( QShowEvent* )
/*!
hide the icon box if necessary
*/
-void TabBox::hideEvent( QHideEvent* )
+void TabBox::hideEvent( TQHideEvent* )
{
XUnmapWindow( qt_xdisplay(), outline_left );
XUnmapWindow( qt_xdisplay(), outline_right );
@@ -368,16 +368,16 @@ void TabBox::hideEvent( QHideEvent* )
/*!
Paints the tab box
*/
-void TabBox::drawContents( QPainter * )
+void TabBox::drawContents( TQPainter * )
{
- QRect r(contentsRect());
- QPixmap pix(r.size()); // do double buffering to avoid flickers
+ TQRect r(contentsRect());
+ TQPixmap pix(r.size()); // do double buffering to avoid flickers
pix.fill(this, 0, 0);
- QPainter p;
+ TQPainter p;
p.begin(&pix, this);
- QPixmap* menu_pix = kwin_get_menu_pix_hack();
+ TQPixmap* menu_pix = kwin_get_menu_pix_hack();
int iconWidth = showMiniIcon ? 16 : 32;
int x = 0;
@@ -387,7 +387,7 @@ void TabBox::drawContents( QPainter * )
{
if ( !currentClient() )
{
- QFont f = font();
+ TQFont f = font();
f.setBold( TRUE );
f.setPointSize( 14 );
@@ -405,7 +405,7 @@ void TabBox::drawContents( QPainter * )
p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight());
// draw icon
- QPixmap icon;
+ TQPixmap icon;
if ( showMiniIcon )
{
if ( !(*it)->miniIcon().isNull() )
@@ -425,13 +425,13 @@ void TabBox::drawContents( QPainter * )
}
// generate text to display
- QString s;
+ TQString s;
if ( !(*it)->isOnDesktop(workspace()->currentDesktop()) )
s = workspace()->desktopName((*it)->desktop()) + ": ";
if ( (*it)->isMinimized() )
- s += QString("(") + (*it)->caption() + ")";
+ s += TQString("(") + (*it)->caption() + ")";
else
s += (*it)->caption();
@@ -442,8 +442,8 @@ void TabBox::drawContents( QPainter * )
p.setPen(colorGroup().highlightedText());
else if( (*it)->isMinimized())
{
- QColor c1 = colorGroup().text();
- QColor c2 = colorGroup().background();
+ TQColor c1 = colorGroup().text();
+ TQColor c2 = colorGroup().background();
// from kicker's TaskContainer::blendColors()
int r1, g1, b1;
int r2, g2, b2;
@@ -455,7 +455,7 @@ void TabBox::drawContents( QPainter * )
g1 += (int) ( .5 * ( g2 - g1 ) );
b1 += (int) ( .5 * ( b2 - b1 ) );
- p.setPen(QColor( r1, g1, b1 ));
+ p.setPen(TQColor( r1, g1, b1 ));
}
else
p.setPen(colorGroup().text());
@@ -474,10 +474,10 @@ void TabBox::drawContents( QPainter * )
int iconHeight = iconWidth;
// get widest desktop name/number
- QFont f(font());
+ TQFont f(font());
f.setBold(true);
f.setPixelSize(iconHeight - 4); // pixel, not point because I need to know the pixels
- QFontMetrics fm(f);
+ TQFontMetrics fm(f);
int wmax = 0;
for ( int i = 1; i <= workspace()->numberOfDesktops(); i++ )
@@ -485,7 +485,7 @@ void TabBox::drawContents( QPainter * )
wmax = QMAX(wmax, fontMetrics().width(workspace()->desktopName(i)));
// calculate max width of desktop-number text
- QString num = QString::number(i);
+ TQString num = TQString::number(i);
iconWidth = QMAX(iconWidth - 4, fm.boundingRect(num).width()) + 4;
}
@@ -507,7 +507,7 @@ void TabBox::drawContents( QPainter * )
// draw desktop-number
p.setFont(f);
- QString num = QString::number(iDesktop);
+ TQString num = TQString::number(iDesktop);
p.drawText(x+5, y+2, iconWidth, iconHeight, Qt::AlignCenter, num);
p.restore();
@@ -571,8 +571,8 @@ void TabBox::updateOutline()
XMoveResizeWindow( qt_xdisplay(), outline_top, c->x(), c->y(), c->width(), 5 );
XMoveResizeWindow( qt_xdisplay(), outline_bottom, c->x(), c->y() + c->height() - 5, c->width(), 5 );
{
- QPixmap pix( 5, c->height() - 10 );
- QPainter p( &pix );
+ TQPixmap pix( 5, c->height() - 10 );
+ TQPainter p( &pix );
p.setPen( white );
p.drawLine( 0, 0, 0, pix.height() - 1 );
p.drawLine( 4, 0, 4, pix.height() - 1 );
@@ -586,8 +586,8 @@ void TabBox::updateOutline()
XSetWindowBackgroundPixmap( qt_xdisplay(), outline_right, pix.handle());
}
{
- QPixmap pix( c->width(), 5 );
- QPainter p( &pix );
+ TQPixmap pix( c->width(), 5 );
+ TQPainter p( &pix );
p.setPen( white );
p.drawLine( 0, 0, pix.width() - 1 - 0, 0 );
p.drawLine( 4, 4, pix.width() - 1 - 4, 4 );
@@ -608,8 +608,8 @@ void TabBox::updateOutline()
XSetWindowBackgroundPixmap( qt_xdisplay(), outline_top, pix.handle());
}
{
- QPixmap pix( c->width(), 5 );
- QPainter p( &pix );
+ TQPixmap pix( c->width(), 5 );
+ TQPainter p( &pix );
p.setPen( white );
p.drawLine( 4, 0, pix.width() - 1 - 4, 0 );
p.drawLine( 0, 4, pix.width() - 1 - 0, 4 );
@@ -642,8 +642,8 @@ void TabBox::updateOutline()
void TabBox::hide()
{
delayedShowTimer.stop();
- QWidget::hide();
- QApplication::syncX();
+ TQWidget::hide();
+ TQApplication::syncX();
XEvent otherEvent;
while (XCheckTypedEvent (qt_xdisplay(), EnterNotify, &otherEvent ) )
;
@@ -697,7 +697,7 @@ void TabBox::handleMouseEvent( XEvent* e )
XAllowEvents( qt_xdisplay(), AsyncPointer, qt_x_time );
if( e->type != ButtonPress )
return;
- QPoint pos( e->xbutton.x_root, e->xbutton.y_root );
+ TQPoint pos( e->xbutton.x_root, e->xbutton.y_root );
if( !geometry().contains( pos ))
{
workspace()->closeTabBox(); // click outside closes tab
@@ -768,9 +768,9 @@ bool areKeySymXsDepressed( bool bAll, const uint keySyms[], int nKeySyms )
int i = keyCodeX / 8;
char mask = 1 << (keyCodeX - (i * 8));
- kdDebug(125) << iKeySym << ": keySymX=0x" << QString::number( keySymX, 16 )
- << " i=" << i << " mask=0x" << QString::number( mask, 16 )
- << " keymap[i]=0x" << QString::number( keymap[i], 16 ) << endl;
+ kdDebug(125) << iKeySym << ": keySymX=0x" << TQString::number( keySymX, 16 )
+ << " i=" << i << " mask=0x" << TQString::number( mask, 16 )
+ << " keymap[i]=0x" << TQString::number( keymap[i], 16 ) << endl;
// Abort if bad index value,
if( i < 0 || i >= 32 )
diff --git a/kwin/tabbox.h b/kwin/tabbox.h
index b2d8e4bc0..e2c11d106 100644
--- a/kwin/tabbox.h
+++ b/kwin/tabbox.h
@@ -12,9 +12,9 @@ License. See the file "COPYING" for the exact licensing terms.
#ifndef KWIN_TABBOX_H
#define KWIN_TABBOX_H
-#include <qframe.h>
-#include <qtimer.h>
-#include <qvaluelist.h>
+#include <tqframe.h>
+#include <tqtimer.h>
+#include <tqvaluelist.h>
#include "utils.h"
class QLabel;
@@ -56,9 +56,9 @@ class TabBox : public QFrame
void reconfigure();
protected:
- void showEvent( QShowEvent* );
- void hideEvent( QHideEvent* );
- void drawContents( QPainter * );
+ void showEvent( TQShowEvent* );
+ void hideEvent( TQHideEvent* );
+ void drawContents( TQPainter * );
private:
void createClientList(ClientList &list, int desktop /*-1 = all*/, Client *start, bool chain);
@@ -72,8 +72,8 @@ class TabBox : public QFrame
int desk;
int lineHeight;
bool showMiniIcon;
- QTimer delayedShowTimer;
- QString no_tasks;
+ TQTimer delayedShowTimer;
+ TQString no_tasks;
bool options_traverse_all;
Window outline_left, outline_right, outline_top, outline_bottom;
};
diff --git a/kwin/tools/decobenchmark/main.cpp b/kwin/tools/decobenchmark/main.cpp
index 847fef69c..d0d165005 100644
--- a/kwin/tools/decobenchmark/main.cpp
+++ b/kwin/tools/decobenchmark/main.cpp
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qtimer.h>
+#include <tqtimer.h>
#include <kdebug.h>
#include <kconfig.h>
@@ -45,7 +45,7 @@ static KCmdLineOptions options[] =
{ 0, 0, 0 }
};
-DecoBenchApplication::DecoBenchApplication(const QString &library, Tests tests, int count) :
+DecoBenchApplication::DecoBenchApplication(const TQString &library, Tests tests, int count) :
m_tests(tests),
m_count(count)
{
@@ -99,7 +99,7 @@ void DecoBenchApplication::executeTest()
int main(int argc, char** argv)
{
- QString style = "keramik";
+ TQString style = "keramik";
// KApplication app(argc, argv);
KAboutData about("decobenchmark", "DecoBenchmark", "0.1", "kwin decoration performance tester...", KAboutData::License_LGPL, "(C) 2005 Sandro Giessl");
KCmdLineArgs::init(argc, argv, &about);
@@ -110,9 +110,9 @@ int main(int argc, char** argv)
if (args->count() != 3)
KCmdLineArgs::usage("Wrong number of arguments!");
- QString library = QString(args->arg(0) );
- QString t = QString(args->arg(1) );
- int count = QString(args->arg(2) ).toInt();
+ TQString library = TQString(args->arg(0) );
+ TQString t = TQString(args->arg(1) );
+ int count = TQString(args->arg(2) ).toInt();
Tests test;
if (t == "all")
@@ -130,7 +130,7 @@ int main(int argc, char** argv)
DecoBenchApplication app(library, test, count);
- QTimer::singleShot(0, &app, SLOT(executeTest()));
+ TQTimer::singleShot(0, &app, TQT_SLOT(executeTest()));
app.exec();
}
#include "main.moc"
diff --git a/kwin/tools/decobenchmark/main.h b/kwin/tools/decobenchmark/main.h
index 4073238a1..65c0c78ae 100644
--- a/kwin/tools/decobenchmark/main.h
+++ b/kwin/tools/decobenchmark/main.h
@@ -33,7 +33,7 @@ class DecoBenchApplication : public KApplication
{
Q_OBJECT
public:
- DecoBenchApplication(const QString &library, Tests tests, int count);
+ DecoBenchApplication(const TQString &library, Tests tests, int count);
~DecoBenchApplication();
public slots:
diff --git a/kwin/tools/decobenchmark/preview.cpp b/kwin/tools/decobenchmark/preview.cpp
index 35301c513..3cbcdcb5f 100644
--- a/kwin/tools/decobenchmark/preview.cpp
+++ b/kwin/tools/decobenchmark/preview.cpp
@@ -25,8 +25,8 @@
#include <klocale.h>
#include <kconfig.h>
#include <kglobal.h>
-#include <qlabel.h>
-#include <qstyle.h>
+#include <tqlabel.h>
+#include <tqstyle.h>
#include <kiconloader.h>
#include <X11/Xlib.h>
@@ -37,8 +37,8 @@
// FRAME the preview doesn't update to reflect the changes done in the kcm
-KDecorationPreview::KDecorationPreview( KDecorationPlugins* plugin, QWidget* parent, const char* name )
- : QWidget( parent, name ),
+KDecorationPreview::KDecorationPreview( KDecorationPlugins* plugin, TQWidget* parent, const char* name )
+ : TQWidget( parent, name ),
m_plugin(plugin)
{
options = new KDecorationPreviewOptions;
@@ -74,7 +74,7 @@ void KDecorationPreview::performRepaintTest(int n)
void KDecorationPreview::performCaptionTest(int n)
{
kdDebug() << "start " << n << " caption changes..." << endl;
- QString caption = "Deco Benchmark %1";
+ TQString caption = "Deco Benchmark %1";
positionPreviews(0);
for (int i = 0; i < n; ++i) {
bridge->setCaption(caption.arg(i) );
@@ -127,15 +127,15 @@ void KDecorationPreview::positionPreviews(int shrink)
if ( !deco )
return;
- QSize size = QSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->minimumSize()*/;
+ TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->minimumSize()*/;
- QRect geometry(QPoint(10, 10), size);
+ TQRect geometry(TQPoint(10, 10), size);
deco->widget()->setGeometry(geometry);
}
-void KDecorationPreview::setPreviewMask( const QRegion& reg, int mode )
+void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode )
{
- QWidget *widget = deco->widget();
+ TQWidget *widget = deco->widget();
// FRAME duped from client.cpp
if( mode == Unsorted )
@@ -145,7 +145,7 @@ void KDecorationPreview::setPreviewMask( const QRegion& reg, int mode )
}
else
{
- QMemArray< QRect > rects = reg.rects();
+ TQMemArray< TQRect > rects = reg.rects();
XRectangle* xrects = new XRectangle[ rects.count() ];
for( unsigned int i = 0;
i < rects.count();
@@ -162,28 +162,28 @@ void KDecorationPreview::setPreviewMask( const QRegion& reg, int mode )
}
}
-QRect KDecorationPreview::windowGeometry( bool active ) const
+TQRect KDecorationPreview::windowGeometry( bool active ) const
{
- QWidget *widget = deco->widget();
+ TQWidget *widget = deco->widget();
return widget->geometry();
}
-QRegion KDecorationPreview::unobscuredRegion( bool active, const QRegion& r ) const
+TQRegion KDecorationPreview::unobscuredRegion( bool active, const TQRegion& r ) const
{
return r;
}
-KDecorationPreviewBridge::KDecorationPreviewBridge( KDecorationPreview* p, bool a, const QString &c )
+KDecorationPreviewBridge::KDecorationPreviewBridge( KDecorationPreview* p, bool a, const TQString &c )
: preview( p ), active( a ), m_caption( c )
{
}
-void KDecorationPreviewBridge::setCaption(const QString &c)
+void KDecorationPreviewBridge::setCaption(const TQString &c)
{
m_caption = c;
}
-QWidget* KDecorationPreviewBridge::initialParentWidget() const
+TQWidget* KDecorationPreviewBridge::initialParentWidget() const
{
return preview;
}
@@ -273,25 +273,25 @@ NET::WindowType KDecorationPreviewBridge::windowType( unsigned long ) const
return NET::Normal;
}
-QIconSet KDecorationPreviewBridge::icon() const
+TQIconSet KDecorationPreviewBridge::icon() const
{
return SmallIconSet( "xapp" );
}
-QString KDecorationPreviewBridge::caption() const
+TQString KDecorationPreviewBridge::caption() const
{
return m_caption;
}
-void KDecorationPreviewBridge::processMousePressEvent( QMouseEvent* )
+void KDecorationPreviewBridge::processMousePressEvent( TQMouseEvent* )
{
}
-void KDecorationPreviewBridge::showWindowMenu( const QRect &)
+void KDecorationPreviewBridge::showWindowMenu( const TQRect &)
{
}
-void KDecorationPreviewBridge::showWindowMenu( QPoint )
+void KDecorationPreviewBridge::showWindowMenu( TQPoint )
{
}
@@ -299,7 +299,7 @@ void KDecorationPreviewBridge::performWindowOperation( WindowOperation )
{
}
-void KDecorationPreviewBridge::setMask( const QRegion& reg, int mode )
+void KDecorationPreviewBridge::setMask( const TQRegion& reg, int mode )
{
preview->setPreviewMask( reg, mode );
}
@@ -309,22 +309,22 @@ bool KDecorationPreviewBridge::isPreview() const
return false;
}
-QRect KDecorationPreviewBridge::geometry() const
+TQRect KDecorationPreviewBridge::geometry() const
{
return preview->windowGeometry( active );
}
-QRect KDecorationPreviewBridge::iconGeometry() const
+TQRect KDecorationPreviewBridge::iconGeometry() const
{
- return QRect();
+ return TQRect();
}
-QRegion KDecorationPreviewBridge::unobscuredRegion( const QRegion& r ) const
+TQRegion KDecorationPreviewBridge::unobscuredRegion( const TQRegion& r ) const
{
return preview->unobscuredRegion( active, r );
}
-QWidget* KDecorationPreviewBridge::workspaceWidget() const
+TQWidget* KDecorationPreviewBridge::workspaceWidget() const
{
return preview;
}
diff --git a/kwin/tools/decobenchmark/preview.h b/kwin/tools/decobenchmark/preview.h
index 4c82ac0a1..c503695e1 100644
--- a/kwin/tools/decobenchmark/preview.h
+++ b/kwin/tools/decobenchmark/preview.h
@@ -20,7 +20,7 @@
#ifndef KWINDECORATION_PREVIEW_H
#define KWINDECORATION_PREVIEW_H
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kdecoration_p.h>
#include <kdecoration_plugins_p.h>
@@ -33,7 +33,7 @@ class KDecorationPreview
: public QWidget
{
public:
- KDecorationPreview( KDecorationPlugins* plugin, QWidget* parent = NULL, const char* name = NULL );
+ KDecorationPreview( KDecorationPlugins* plugin, TQWidget* parent = NULL, const char* name = NULL );
virtual ~KDecorationPreview();
void performRepaintTest(int n);
@@ -42,9 +42,9 @@ class KDecorationPreview
void performRecreationTest(int n);
bool recreateDecoration();
- void setPreviewMask( const QRegion&, int );
- QRegion unobscuredRegion( bool, const QRegion& ) const;
- QRect windowGeometry( bool ) const;
+ void setPreviewMask( const TQRegion&, int );
+ TQRegion unobscuredRegion( bool, const TQRegion& ) const;
+ TQRect windowGeometry( bool ) const;
private:
void positionPreviews(int shrink = 0);
KDecorationPreviewOptions* options;
@@ -57,9 +57,9 @@ class KDecorationPreviewBridge
: public KDecorationBridge
{
public:
- KDecorationPreviewBridge( KDecorationPreview* preview, bool active, const QString &caption );
+ KDecorationPreviewBridge( KDecorationPreview* preview, bool active, const TQString &caption );
- void setCaption(const QString &caption);
+ void setCaption(const TQString &caption);
virtual bool isActive() const;
virtual bool isCloseable() const;
@@ -77,18 +77,18 @@ class KDecorationPreviewBridge
virtual bool isMovable() const;
virtual bool isResizable() const;
virtual NET::WindowType windowType( unsigned long supported_types ) const;
- virtual QIconSet icon() const;
- virtual QString caption() const;
- virtual void processMousePressEvent( QMouseEvent* );
- virtual void showWindowMenu( const QRect &);
- virtual void showWindowMenu( QPoint );
+ virtual TQIconSet icon() const;
+ virtual TQString caption() const;
+ virtual void processMousePressEvent( TQMouseEvent* );
+ virtual void showWindowMenu( const TQRect &);
+ virtual void showWindowMenu( TQPoint );
virtual void performWindowOperation( WindowOperation );
- virtual void setMask( const QRegion&, int );
+ virtual void setMask( const TQRegion&, int );
virtual bool isPreview() const;
- virtual QRect geometry() const;
- virtual QRect iconGeometry() const;
- virtual QRegion unobscuredRegion( const QRegion& r ) const;
- virtual QWidget* workspaceWidget() const;
+ virtual TQRect geometry() const;
+ virtual TQRect iconGeometry() const;
+ virtual TQRegion unobscuredRegion( const TQRegion& r ) const;
+ virtual TQWidget* workspaceWidget() const;
virtual WId windowId() const;
virtual void closeWindow();
virtual void maximize( MaximizeMode mode );
@@ -100,14 +100,14 @@ class KDecorationPreviewBridge
virtual void setKeepAbove( bool );
virtual void setKeepBelow( bool );
virtual int currentDesktop() const;
- virtual QWidget* initialParentWidget() const;
+ virtual TQWidget* initialParentWidget() const;
virtual Qt::WFlags initialWFlags() const;
virtual void helperShowHide( bool show );
virtual void grabXServer( bool grab );
private:
KDecorationPreview* preview;
bool active;
- QString m_caption;
+ TQString m_caption;
};
class KDecorationPreviewOptions
diff --git a/kwin/useractions.cpp b/kwin/useractions.cpp
index 4a431b339..2c3ea8d4d 100644
--- a/kwin/useractions.cpp
+++ b/kwin/useractions.cpp
@@ -21,18 +21,18 @@ License. See the file "COPYING" for the exact licensing terms.
#include "workspace.h"
#include <fixx11h.h>
-#include <qhbox.h>
-#include <qpushbutton.h>
-#include <qslider.h>
-#include <qtooltip.h>
-#include <qpopupmenu.h>
+#include <tqhbox.h>
+#include <tqpushbutton.h>
+#include <tqslider.h>
+#include <tqtooltip.h>
+#include <tqpopupmenu.h>
#include <kglobalsettings.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kconfig.h>
#include <kglobalaccel.h>
#include <kapplication.h>
-#include <qregexp.h>
+#include <tqregexp.h>
#include "killwindow.h"
#include "tabbox.h"
@@ -44,20 +44,20 @@ namespace KWinInternal
// Workspace
//****************************************
-QPopupMenu* Workspace::clientPopup()
+TQPopupMenu* Workspace::clientPopup()
{
if ( !popup )
{
popup = new QPopupMenu;
popup->setCheckable( TRUE );
popup->setFont(KGlobalSettings::menuFont());
- connect( popup, SIGNAL( aboutToShow() ), this, SLOT( clientPopupAboutToShow() ) );
- connect( popup, SIGNAL( activated(int) ), this, SLOT( clientPopupActivated(int) ) );
+ connect( popup, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( clientPopupAboutToShow() ) );
+ connect( popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( clientPopupActivated(int) ) );
- advanced_popup = new QPopupMenu( popup );
+ advanced_popup = new TQPopupMenu( popup );
advanced_popup->setCheckable( TRUE );
advanced_popup->setFont(KGlobalSettings::menuFont());
- connect( advanced_popup, SIGNAL( activated(int) ), this, SLOT( clientPopupActivated(int) ) );
+ connect( advanced_popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( clientPopupActivated(int) ) );
advanced_popup->insertItem( SmallIconSet( "up" ),
i18n("Keep &Above Others")+'\t'+keys->shortcut("Window Above Other Windows").seq(0).toString(), Options::KeepAboveOp );
advanced_popup->insertItem( SmallIconSet( "down" ),
@@ -74,17 +74,17 @@ QPopupMenu* Workspace::clientPopup()
desk_popup_index = popup->count();
if (options->useTranslucency){
- QPopupMenu *trans_popup = new QPopupMenu( popup );
- QVBox *transBox = new QVBox(trans_popup);
- transButton = new QPushButton(transBox, "transButton");
- QToolTip::add(transButton, i18n("Reset opacity to default value"));
- transSlider = new QSlider(0, 100, 1, 100, Qt::Vertical, transBox, "transSlider");
- QToolTip::add(transSlider, i18n("Slide this to set the window's opacity"));
- connect(transButton, SIGNAL(clicked()), SLOT(resetClientOpacity()));
- connect(transButton, SIGNAL(clicked()), trans_popup, SLOT(hide()));
- connect(transSlider, SIGNAL(valueChanged(int)), SLOT(setTransButtonText(int)));
- connect(transSlider, SIGNAL(valueChanged(int)), this, SLOT(setPopupClientOpacity(int)));
-// connect(transSlider, SIGNAL(sliderReleased()), trans_popup, SLOT(hide()));
+ TQPopupMenu *trans_popup = new TQPopupMenu( popup );
+ TQVBox *transBox = new TQVBox(trans_popup);
+ transButton = new TQPushButton(transBox, "transButton");
+ TQToolTip::add(transButton, i18n("Reset opacity to default value"));
+ transSlider = new TQSlider(0, 100, 1, 100, Qt::Vertical, transBox, "transSlider");
+ TQToolTip::add(transSlider, i18n("Slide this to set the window's opacity"));
+ connect(transButton, TQT_SIGNAL(clicked()), TQT_SLOT(resetClientOpacity()));
+ connect(transButton, TQT_SIGNAL(clicked()), trans_popup, TQT_SLOT(hide()));
+ connect(transSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setTransButtonText(int)));
+ connect(transSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setPopupClientOpacity(int)));
+// connect(transSlider, TQT_SIGNAL(sliderReleased()), trans_popup, TQT_SLOT(hide()));
trans_popup->insertItem(transBox);
popup->insertItem(i18n("&Opacity"), trans_popup );
}
@@ -100,7 +100,7 @@ QPopupMenu* Workspace::clientPopup()
if (!KGlobal::config()->isImmutable() &&
!kapp->authorizeControlModules(Workspace::configModules(true)).isEmpty())
{
- popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior..."), this, SLOT( configureWM() ));
+ popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior..."), this, TQT_SLOT( configureWM() ));
popup->insertSeparator();
}
@@ -125,9 +125,9 @@ void Workspace::setTransButtonText(int value)
else if (value >= 100 )
transButton->setText("100 %");
else if(value < 10)
- transButton->setText("00"+QString::number(value)+" %");
+ transButton->setText("00"+TQString::number(value)+" %");
else if(value < 100)
- transButton->setText("0"+QString::number(value)+" %");
+ transButton->setText("0"+TQString::number(value)+" %");
}
void Workspace::resetClientOpacity()
@@ -187,13 +187,13 @@ void Workspace::initDesktopPopup()
if (desk_popup)
return;
- desk_popup = new QPopupMenu( popup );
+ desk_popup = new TQPopupMenu( popup );
desk_popup->setCheckable( TRUE );
desk_popup->setFont(KGlobalSettings::menuFont());
- connect( desk_popup, SIGNAL( activated(int) ),
- this, SLOT( slotSendToDesktop(int) ) );
- connect( desk_popup, SIGNAL( aboutToShow() ),
- this, SLOT( desktopPopupAboutToShow() ) );
+ connect( desk_popup, TQT_SIGNAL( activated(int) ),
+ this, TQT_SLOT( slotSendToDesktop(int) ) );
+ connect( desk_popup, TQT_SIGNAL( aboutToShow() ),
+ this, TQT_SLOT( desktopPopupAboutToShow() ) );
popup->insertItem(i18n("To &Desktop"), desk_popup, -1, desk_popup_index );
}
@@ -216,7 +216,7 @@ void Workspace::desktopPopupAboutToShow()
const int BASE = 10;
for ( int i = 1; i <= numberOfDesktops(); i++ )
{
- QString basic_name("%1 %2");
+ TQString basic_name("%1 %2");
if (i<BASE)
{
basic_name.prepend('&');
@@ -286,10 +286,10 @@ void Workspace::setupWindowShortcut( Client* c )
client_keys->suspend( true );
client_keys_dialog = new ShortcutDialog( c->shortcut());
client_keys_client = c;
- connect( client_keys_dialog, SIGNAL( dialogDone( bool )), SLOT( setupWindowShortcutDone( bool )));
- QRect r = clientArea( ScreenArea, c );
- QSize size = client_keys_dialog->sizeHint();
- QPoint pos = c->pos() + c->clientPos();
+ connect( client_keys_dialog, TQT_SIGNAL( dialogDone( bool )), TQT_SLOT( setupWindowShortcutDone( bool )));
+ TQRect r = clientArea( ScreenArea, c );
+ TQSize size = client_keys_dialog->sizeHint();
+ TQPoint pos = c->pos() + c->clientPos();
if( pos.x() + size.width() >= r.right())
pos.setX( r.right() - size.width());
if( pos.y() + size.height() >= r.bottom())
@@ -317,13 +317,13 @@ void Workspace::setupWindowShortcutDone( bool ok )
void Workspace::clientShortcutUpdated( Client* c )
{
- QString key = QString::number( c->window());
+ TQString key = TQString::number( c->window());
client_keys->remove( key );
if( !c->shortcut().isNull())
{
client_keys->insert( key, key );
client_keys->setShortcut( key, c->shortcut());
- client_keys->setSlot( key, c, SLOT( shortcutActivated()));
+ client_keys->setSlot( key, c, TQT_SLOT( shortcutActivated()));
client_keys->setActionEnabled( key, true );
}
client_keys->updateConnections();
@@ -333,7 +333,7 @@ void Workspace::clientPopupActivated( int id )
{
WindowOperation op = static_cast< WindowOperation >( id );
Client* c = active_popup_client ? active_popup_client : active_client;
- QString type;
+ TQString type;
switch( op )
{
case FullScreenOp:
@@ -359,22 +359,22 @@ void Workspace::performWindowOperation( Client* c, Options::WindowOperation op )
return;
if (op == Options::MoveOp || op == Options::UnrestrictedMoveOp )
- QCursor::setPos( c->geometry().center() );
+ TQCursor::setPos( c->geometry().center() );
if (op == Options::ResizeOp || op == Options::UnrestrictedResizeOp )
- QCursor::setPos( c->geometry().bottomRight());
+ TQCursor::setPos( c->geometry().bottomRight());
switch ( op )
{
case Options::MoveOp:
- c->performMouseCommand( Options::MouseMove, QCursor::pos() );
+ c->performMouseCommand( Options::MouseMove, TQCursor::pos() );
break;
case Options::UnrestrictedMoveOp:
- c->performMouseCommand( Options::MouseUnrestrictedMove, QCursor::pos() );
+ c->performMouseCommand( Options::MouseUnrestrictedMove, TQCursor::pos() );
break;
case Options::ResizeOp:
- c->performMouseCommand( Options::MouseResize, QCursor::pos() );
+ c->performMouseCommand( Options::MouseResize, TQCursor::pos() );
break;
case Options::UnrestrictedResizeOp:
- c->performMouseCommand( Options::MouseUnrestrictedResize, QCursor::pos() );
+ c->performMouseCommand( Options::MouseUnrestrictedResize, TQCursor::pos() );
break;
case Options::CloseOp:
c->closeWindow();
@@ -396,7 +396,7 @@ void Workspace::performWindowOperation( Client* c, Options::WindowOperation op )
c->minimize();
break;
case Options::ShadeOp:
- c->performMouseCommand( Options::MouseShade, QCursor::pos());
+ c->performMouseCommand( Options::MouseShade, TQCursor::pos());
break;
case Options::OnAllDesktopsOp:
c->setOnAllDesktops( !c->isOnAllDesktops() );
@@ -426,7 +426,7 @@ void Workspace::performWindowOperation( Client* c, Options::WindowOperation op )
break;
}
case Options::OperationsOp:
- c->performMouseCommand( Options::MouseShade, QCursor::pos());
+ c->performMouseCommand( Options::MouseShade, TQCursor::pos());
break;
case Options::WindowRulesOp:
editWindowRules( c, false );
@@ -448,7 +448,7 @@ void Workspace::performWindowOperation( Client* c, Options::WindowOperation op )
/*!
Performs a mouse command on this client (see options.h)
*/
-bool Client::performMouseCommand( Options::MouseCommand command, QPoint globalPos, bool handled )
+bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalPos, bool handled )
{
bool replay = FALSE;
switch (command)
@@ -521,7 +521,7 @@ bool Client::performMouseCommand( Options::MouseCommand command, QPoint globalPo
finishMoveResize( false );
mode = PositionCenter;
buttonDown = TRUE;
- moveOffset = QPoint( globalPos.x() - x(), globalPos.y() - y()); // map from global
+ moveOffset = TQPoint( globalPos.x() - x(), globalPos.y() - y()); // map from global
invertedMoveOffset = rect().bottomRight() - moveOffset;
unrestrictedMoveResize = ( command == Options::MouseActivateRaiseAndUnrestrictedMove
|| command == Options::MouseUnrestrictedMove );
@@ -541,7 +541,7 @@ bool Client::performMouseCommand( Options::MouseCommand command, QPoint globalPo
if( moveResizeMode )
finishMoveResize( false );
buttonDown = TRUE;
- moveOffset = QPoint( globalPos.x() - x(), globalPos.y() - y()); // map from global
+ moveOffset = TQPoint( globalPos.x() - x(), globalPos.y() - y()); // map from global
int x = moveOffset.x(), y = moveOffset.y();
bool left = x < width() / 3;
bool right = x >= 2 * width() / 3;
@@ -1009,11 +1009,11 @@ void Workspace::slotWindowOperations()
{
if ( !active_client )
return;
- QPoint pos = active_client->pos() + active_client->clientPos();
+ TQPoint pos = active_client->pos() + active_client->clientPos();
showWindowMenu( pos.x(), pos.y(), active_client );
}
-void Workspace::showWindowMenu( const QRect &pos, Client* cl )
+void Workspace::showWindowMenu( const TQRect &pos, Client* cl )
{
if (!kapp->authorizeKAction("kwin_rmb"))
return;
@@ -1027,21 +1027,21 @@ void Workspace::showWindowMenu( const QRect &pos, Client* cl )
return;
active_popup_client = cl;
- QPopupMenu* p = clientPopup();
+ TQPopupMenu* p = clientPopup();
active_popup = p;
int x = pos.left();
int y = pos.bottom();
if (y == pos.top())
- p->exec( QPoint( x, y ) );
+ p->exec( TQPoint( x, y ) );
else
{
- QRect area = clientArea(ScreenArea, QPoint(x, y), currentDesktop());
+ TQRect area = clientArea(ScreenArea, TQPoint(x, y), currentDesktop());
clientPopupAboutToShow(); // needed for sizeHint() to be correct :-/
int popupHeight = p->sizeHint().height();
if (y + popupHeight < area.height())
- p->exec( QPoint( x, y ) );
+ p->exec( TQPoint( x, y ) );
else
- p->exec( QPoint( x, pos.top() - popupHeight ) );
+ p->exec( TQPoint( x, pos.top() - popupHeight ) );
}
// active popup may be already changed (e.g. the window shortcut dialog)
if( active_popup == p )
@@ -1077,9 +1077,9 @@ void Workspace::slotWindowResize()
performWindowOperation( c, Options::UnrestrictedResizeOp );
}
-void Client::setShortcut( const QString& _cut )
+void Client::setShortcut( const TQString& _cut )
{
- QString cut = rules()->checkShortcut( _cut );
+ TQString cut = rules()->checkShortcut( _cut );
if( cut.isEmpty())
return setShortcutInternal( KShortcut());
// Format:
@@ -1093,17 +1093,17 @@ void Client::setShortcut( const QString& _cut )
setShortcutInternal( KShortcut());
return;
}
- QValueList< KShortcut > keys;
- QStringList groups = QStringList::split( ' ', cut );
- for( QStringList::ConstIterator it = groups.begin();
+ TQValueList< KShortcut > keys;
+ TQStringList groups = TQStringList::split( ' ', cut );
+ for( TQStringList::ConstIterator it = groups.begin();
it != groups.end();
++it )
{
- QRegExp reg( "(.*\\+)\\((.*)\\)" );
+ TQRegExp reg( "(.*\\+)\\((.*)\\)" );
if( reg.search( *it ) > -1 )
{
- QString base = reg.cap( 1 );
- QString list = reg.cap( 2 );
+ TQString base = reg.cap( 1 );
+ TQString list = reg.cap( 2 );
for( unsigned int i = 0;
i < list.length();
++i )
@@ -1114,14 +1114,14 @@ void Client::setShortcut( const QString& _cut )
}
}
}
- for( QValueList< KShortcut >::ConstIterator it = keys.begin();
+ for( TQValueList< KShortcut >::ConstIterator it = keys.begin();
it != keys.end();
++it )
{
if( _shortcut == *it ) // current one is in the list
return;
}
- for( QValueList< KShortcut >::ConstIterator it = keys.begin();
+ for( TQValueList< KShortcut >::ConstIterator it = keys.begin();
it != keys.end();
++it )
{
diff --git a/kwin/utils.cpp b/kwin/utils.cpp
index 7c4fd00eb..7a3e3541d 100644
--- a/kwin/utils.cpp
+++ b/kwin/utils.cpp
@@ -183,14 +183,14 @@ bool KWinSelectionOwner::genericReply( Atom target_P, Atom property_P, Window re
Atom KWinSelectionOwner::xa_version = None;
-QCString getStringProperty(WId w, Atom prop, char separator)
+TQCString getStringProperty(WId w, Atom prop, char separator)
{
Atom type;
int format, status;
unsigned long nitems = 0;
unsigned long extra = 0;
unsigned char *data = 0;
- QCString result = "";
+ TQCString result = "";
KXErrorHandler handler; // ignore errors
status = XGetWindowProperty( qt_xdisplay(), w, prop, 0, 10000,
FALSE, XA_STRING, &type, &format,
@@ -256,7 +256,7 @@ static Bool update_x_time_predicate( Display*, XEvent* event, XPointer )
*/
void updateXTime()
{
- static QWidget* w = 0;
+ static TQWidget* w = 0;
if ( !w )
w = new QWidget;
long data = 1;
@@ -302,7 +302,7 @@ bool grabbedXServer()
#endif
-bool isLocalMachine( const QCString& host )
+bool isLocalMachine( const TQCString& host )
{
#ifdef HOST_NAME_MAX
char hostnamebuf[HOST_NAME_MAX];
diff --git a/kwin/utils.h b/kwin/utils.h
index eb762c0c3..b1b2b2e2c 100644
--- a/kwin/utils.h
+++ b/kwin/utils.h
@@ -12,8 +12,8 @@ License. See the file "COPYING" for the exact licensing terms.
#ifndef KWIN_UTILS_H
#define KWIN_UTILS_H
-#include <qvaluelist.h>
-#include <qwidget.h>
+#include <tqvaluelist.h>
+#include <tqwidget.h>
#include <kmanagerselection.h>
#include <netwm_def.h>
#include <kshortcutdialog.h>
@@ -36,17 +36,17 @@ const long ClientWinMask = KeyPressMask | KeyReleaseMask |
StructureNotifyMask |
SubstructureRedirectMask;
-const QPoint invalidPoint( INT_MIN, INT_MIN );
+const TQPoint invalidPoint( INT_MIN, INT_MIN );
class Client;
class Group;
class Options;
-typedef QValueList< Client* > ClientList;
-typedef QValueList< const Client* > ConstClientList;
+typedef TQValueList< Client* > ClientList;
+typedef TQValueList< const Client* > ConstClientList;
-typedef QValueList< Group* > GroupList;
-typedef QValueList< const Group* > ConstGroupList;
+typedef TQValueList< Group* > GroupList;
+typedef TQValueList< const Group* > ConstGroupList;
extern Options* options;
@@ -189,7 +189,7 @@ class TemporaryAssign
T orig;
};
-QCString getStringProperty(WId w, Atom prop, char separator=0);
+TQCString getStringProperty(WId w, Atom prop, char separator=0);
void updateXTime();
void grabXServer();
void ungrabXServer();
@@ -247,7 +247,7 @@ Time timestampDiff( Time time1, Time time2 ) // returns time2 - time1
return NET::timestampDiff( time1, time2 );
}
-bool isLocalMachine( const QCString& host );
+bool isLocalMachine( const TQCString& host );
void checkNonExistentClients();
diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp
index e04f0590d..7b87818f0 100644
--- a/kwin/workspace.cpp
+++ b/kwin/workspace.cpp
@@ -18,12 +18,12 @@ License. See the file "COPYING" for the exact licensing terms.
#include <fixx11h.h>
#include <kconfig.h>
#include <kglobal.h>
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
#include <klocale.h>
-#include <qregexp.h>
-#include <qpainter.h>
-#include <qbitmap.h>
-#include <qclipboard.h>
+#include <tqregexp.h>
+#include <tqpainter.h>
+#include <tqbitmap.h>
+#include <tqclipboard.h>
#include <kmenubar.h>
#include <kprocess.h>
#include <kglobalaccel.h>
@@ -68,7 +68,7 @@ bool allowKompmgrRestart = TRUE;
// code.
Workspace::Workspace( bool restore )
: DCOPObject ("KWinInterface"),
- QObject (0, "workspace"),
+ TQObject (0, "workspace"),
current_desktop (0),
number_of_desktops(0),
active_screen (0),
@@ -133,9 +133,9 @@ Workspace::Workspace( bool restore )
installed_colormap = default_colormap;
session.setAutoDelete( TRUE );
- connect( &temporaryRulesMessages, SIGNAL( gotMessage( const QString& )),
- this, SLOT( gotTemporaryRulesMessage( const QString& )));
- connect( &rulesUpdatedTimer, SIGNAL( timeout()), this, SLOT( writeWindowRules()));
+ connect( &temporaryRulesMessages, TQT_SIGNAL( gotMessage( const TQString& )),
+ this, TQT_SLOT( gotTemporaryRulesMessage( const TQString& )));
+ connect( &rulesUpdatedTimer, TQT_SIGNAL( timeout()), this, TQT_SLOT( writeWindowRules()));
updateXTime(); // needed for proper initialization of user_time in Client ctor
@@ -149,10 +149,10 @@ Workspace::Workspace( bool restore )
loadWindowRules();
- (void) QApplication::desktop(); // trigger creation of desktop widget
+ (void) TQApplication::desktop(); // trigger creation of desktop widget
desktop_widget =
- new QWidget(
+ new TQWidget(
0,
"desktop_widget",
Qt::WType_Desktop | Qt::WPaintUnclipped
@@ -197,14 +197,14 @@ Workspace::Workspace( bool restore )
init();
#if (QT_VERSION-0 >= 0x030200) // XRANDR support
- connect( kapp->desktop(), SIGNAL( resized( int )), SLOT( desktopResized()));
+ connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
#endif
// start kompmgr - i wanted to put this into main.cpp, but that would prevent dcop support, as long as Application was no dcop_object
if (options->useTranslucency)
{
kompmgr = new KProcess;
- connect(kompmgr, SIGNAL(receivedStderr(KProcess*, char*, int)), SLOT(handleKompmgrOutput(KProcess*, char*, int)));
+ connect(kompmgr, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), TQT_SLOT(handleKompmgrOutput(KProcess*, char*, int)));
*kompmgr << "kompmgr";
startKompmgr();
}
@@ -330,15 +330,15 @@ void Workspace::init()
// now we know how many desktops we'll, thus, we initialise the positioning object
initPositioning = new Placement(this);
- connect(&reconfigureTimer, SIGNAL(timeout()), this,
- SLOT(slotReconfigure()));
- connect( &updateToolWindowsTimer, SIGNAL( timeout()), this, SLOT( slotUpdateToolWindows()));
+ connect(&reconfigureTimer, TQT_SIGNAL(timeout()), this,
+ TQT_SLOT(slotReconfigure()));
+ connect( &updateToolWindowsTimer, TQT_SIGNAL( timeout()), this, TQT_SLOT( slotUpdateToolWindows()));
- connect(kapp, SIGNAL(appearanceChanged()), this,
- SLOT(slotReconfigure()));
- connect(kapp, SIGNAL(settingsChanged(int)), this,
- SLOT(slotSettingsChanged(int)));
- connect(kapp, SIGNAL( kipcMessage( int, int )), this, SLOT( kipcMessage( int, int )));
+ connect(kapp, TQT_SIGNAL(appearanceChanged()), this,
+ TQT_SLOT(slotReconfigure()));
+ connect(kapp, TQT_SIGNAL(settingsChanged(int)), this,
+ TQT_SLOT(slotSettingsChanged(int)));
+ connect(kapp, TQT_SIGNAL( kipcMessage( int, int )), this, TQT_SLOT( kipcMessage( int, int )));
active_client = NULL;
rootInfo->setActiveWindow( None );
@@ -379,7 +379,7 @@ void Workspace::init()
Client* c = createClient( wins[i], true );
if ( c != NULL && root != qt_xrootwin() )
{ // TODO what is this?
- // TODO may use QWidget:.create
+ // TODO may use TQWidget:.create
XReparentWindow( qt_xdisplay(), c->frameId(), root, 0, 0 );
c->move(0,0);
}
@@ -397,7 +397,7 @@ void Workspace::init()
NETPoint* viewports = new NETPoint[ number_of_desktops ];
rootInfo->setDesktopViewport( number_of_desktops, *viewports );
delete[] viewports;
- QRect geom = QApplication::desktop()->geometry();
+ TQRect geom = TQApplication::desktop()->geometry();
NETSize desktop_geometry;
desktop_geometry.width = geom.width();
desktop_geometry.height = geom.height();
@@ -558,7 +558,7 @@ void Workspace::removeClient( Client* c, allowed_t )
if( client_keys_client == c )
setupWindowShortcutDone( false );
if( !c->shortcut().isNull())
- c->setShortcut( QString::null ); // remove from client_keys
+ c->setShortcut( TQString::null ); // remove from client_keys
if( c->isDialog())
Notify::raise( Notify::TransDelete );
@@ -935,9 +935,9 @@ void Workspace::slotReconfigure()
if( mgr->reset( changed ))
{ // decorations need to be recreated
#if 0 // This actually seems to make things worse now
- QWidget curtain;
+ TQWidget curtain;
curtain.setBackgroundMode( NoBackground );
- curtain.setGeometry( QApplication::desktop()->geometry() );
+ curtain.setGeometry( TQApplication::desktop()->geometry() );
curtain.show();
#endif
for( ClientList::ConstIterator it = clients.begin();
@@ -989,14 +989,14 @@ void Workspace::slotReconfigure()
bool tmp = options->useTranslucency;
stopKompmgr();
if (tmp)
- QTimer::singleShot( 200, this, SLOT(startKompmgr()) ); // wait some time to ensure system's ready for restart
+ TQTimer::singleShot( 200, this, TQT_SLOT(startKompmgr()) ); // wait some time to ensure system's ready for restart
}
}
void Workspace::loadDesktopSettings()
{
KConfig* c = KGlobal::config();
- QCString groupname;
+ TQCString groupname;
if (screen_number == 0)
groupname = "Desktops";
else
@@ -1015,7 +1015,7 @@ void Workspace::loadDesktopSettings()
focus_chain.resize( n + 1 );
for(int i = 1; i <= n; i++)
{
- QString s = c->readEntry(QString("Name_%1").arg(i),
+ TQString s = c->readEntry(TQString("Name_%1").arg(i),
i18n("Desktop %1").arg(i));
rootInfo->setDesktopName( i, s.utf8().data() );
desktop_focus_chain[i-1] = i;
@@ -1025,7 +1025,7 @@ void Workspace::loadDesktopSettings()
void Workspace::saveDesktopSettings()
{
KConfig* c = KGlobal::config();
- QCString groupname;
+ TQCString groupname;
if (screen_number == 0)
groupname = "Desktops";
else
@@ -1035,8 +1035,8 @@ void Workspace::saveDesktopSettings()
c->writeEntry("Number", number_of_desktops );
for(int i = 1; i <= number_of_desktops; i++)
{
- QString s = desktopName( i );
- QString defaultvalue = i18n("Desktop %1").arg(i);
+ TQString s = desktopName( i );
+ TQString defaultvalue = i18n("Desktop %1").arg(i);
if ( s.isEmpty() )
{
s = defaultvalue;
@@ -1045,20 +1045,20 @@ void Workspace::saveDesktopSettings()
if (s != defaultvalue)
{
- c->writeEntry( QString("Name_%1").arg(i), s );
+ c->writeEntry( TQString("Name_%1").arg(i), s );
}
else
{
- QString currentvalue = c->readEntry(QString("Name_%1").arg(i));
+ TQString currentvalue = c->readEntry(TQString("Name_%1").arg(i));
if (currentvalue != defaultvalue)
- c->writeEntry( QString("Name_%1").arg(i), "" );
+ c->writeEntry( TQString("Name_%1").arg(i), "" );
}
}
}
-QStringList Workspace::configModules(bool controlCenter)
+TQStringList Workspace::configModules(bool controlCenter)
{
- QStringList args;
+ TQStringList args;
args << "kde-kwindecoration.desktop";
if (controlCenter)
args << "kde-kwinoptions.desktop";
@@ -1075,7 +1075,7 @@ void Workspace::configureWM()
/*!
avoids managing a window with title \a title
*/
-void Workspace::doNotManage( QString title )
+void Workspace::doNotManage( TQString title )
{
doNotManageList.append( title );
}
@@ -1083,11 +1083,11 @@ void Workspace::doNotManage( QString title )
/*!
Hack for java applets
*/
-bool Workspace::isNotManaged( const QString& title )
+bool Workspace::isNotManaged( const TQString& title )
{
- for ( QStringList::Iterator it = doNotManageList.begin(); it != doNotManageList.end(); ++it )
+ for ( TQStringList::Iterator it = doNotManageList.begin(); it != doNotManageList.end(); ++it )
{
- QRegExp r( (*it) );
+ TQRegExp r( (*it) );
if (r.search(title) != -1)
{
doNotManageList.remove( it );
@@ -1102,11 +1102,11 @@ bool Workspace::isNotManaged( const QString& title )
*/
void Workspace::refresh()
{
- QWidget w;
- w.setGeometry( QApplication::desktop()->geometry() );
+ TQWidget w;
+ w.setGeometry( TQApplication::desktop()->geometry() );
w.show();
w.hide();
- QApplication::flushX();
+ TQApplication::flushX();
}
/*!
@@ -1122,18 +1122,18 @@ class ObscuringWindows
~ObscuringWindows();
void create( Client* c );
private:
- QValueList<Window> obscuring_windows;
- static QValueList<Window>* cached;
+ TQValueList<Window> obscuring_windows;
+ static TQValueList<Window>* cached;
static unsigned int max_cache_size;
};
-QValueList<Window>* ObscuringWindows::cached = 0;
+TQValueList<Window>* ObscuringWindows::cached = 0;
unsigned int ObscuringWindows::max_cache_size = 0;
void ObscuringWindows::create( Client* c )
{
if( cached == 0 )
- cached = new QValueList<Window>;
+ cached = new TQValueList<Window>;
Window obs_win;
XWindowChanges chngs;
int mask = CWSibling | CWStackMode;
@@ -1165,7 +1165,7 @@ void ObscuringWindows::create( Client* c )
ObscuringWindows::~ObscuringWindows()
{
max_cache_size = QMAX( max_cache_size, obscuring_windows.count() + 4 ) - 1;
- for( QValueList<Window>::ConstIterator it = obscuring_windows.begin();
+ for( TQValueList<Window>::ConstIterator it = obscuring_windows.begin();
it != obscuring_windows.end();
++it )
{
@@ -1280,15 +1280,15 @@ bool Workspace::setCurrentDesktop( int new_desktop )
// Update focus chain:
// If input: chain = { 1, 2, 3, 4 } and current_desktop = 3,
// Output: chain = { 3, 1, 2, 4 }.
-// kdDebug(1212) << QString("Switching to desktop #%1, at focus_chain[currentDesktop()] index %2\n")
+// kdDebug(1212) << TQString("Switching to desktop #%1, at focus_chain[currentDesktop()] index %2\n")
// .arg(currentDesktop()).arg(desktop_focus_chain.find( currentDesktop() ));
for( int i = desktop_focus_chain.find( currentDesktop() ); i > 0; i-- )
desktop_focus_chain[i] = desktop_focus_chain[i-1];
desktop_focus_chain[0] = currentDesktop();
-// QString s = "desktop_focus_chain[] = { ";
+// TQString s = "desktop_focus_chain[] = { ";
// for( uint i = 0; i < desktop_focus_chain.size(); i++ )
-// s += QString::number(desktop_focus_chain[i]) + ", ";
+// s += TQString::number(desktop_focus_chain[i]) + ", ";
// kdDebug(1212) << s << "}\n";
if( old_desktop != 0 ) // not for the very first time
@@ -1542,7 +1542,7 @@ int Workspace::activeScreen() const
return qApp->desktop()->screenNumber( activeClient()->geometry().center());
return active_screen;
}
- return qApp->desktop()->screenNumber( QCursor::pos());
+ return qApp->desktop()->screenNumber( TQCursor::pos());
}
// check whether a client moved completely out of what's considered the active screen,
@@ -1559,21 +1559,21 @@ void Workspace::checkActiveScreen( const Client* c )
// called e.g. when a user clicks on a window, set active screen to be the screen
// where the click occured
-void Workspace::setActiveScreenMouse( QPoint mousepos )
+void Workspace::setActiveScreenMouse( TQPoint mousepos )
{
if( !options->xineramaEnabled )
return;
active_screen = qApp->desktop()->screenNumber( mousepos );
}
-QRect Workspace::screenGeometry( int screen ) const
+TQRect Workspace::screenGeometry( int screen ) const
{
if (( !options->xineramaEnabled ) || (kapp->desktop()->numScreens() < 2))
return qApp->desktop()->geometry();
return qApp->desktop()->screenGeometry( screen );
}
-int Workspace::screenNumber( QPoint pos ) const
+int Workspace::screenNumber( TQPoint pos ) const
{
if( !options->xineramaEnabled )
return 0;
@@ -1585,8 +1585,8 @@ void Workspace::sendClientToScreen( Client* c, int screen )
if( c->screen() == screen ) // don't use isOnScreen(), that's true even when only partially
return;
GeometryUpdatesPostponer blocker( c );
- QRect old_sarea = clientArea( MaximizeArea, c );
- QRect sarea = clientArea( MaximizeArea, screen, c->desktop());
+ TQRect old_sarea = clientArea( MaximizeArea, c );
+ TQRect sarea = clientArea( MaximizeArea, screen, c->desktop());
c->setGeometry( sarea.x() - old_sarea.x() + c->x(), sarea.y() - old_sarea.y() + c->y(),
c->size().width(), c->size().height());
c->checkWorkspacePosition();
@@ -1756,7 +1756,7 @@ void Workspace::slotGrabWindow()
{
if ( active_client )
{
- QPixmap snapshot = QPixmap::grabWindow( active_client->frameId() );
+ TQPixmap snapshot = TQPixmap::grabWindow( active_client->frameId() );
//No XShape - no work.
if( Shape::available())
@@ -1771,23 +1771,23 @@ void Workspace::slotGrabWindow()
// to limit our work region
if (rects)
{
- //Create a QRegion from the rectangles describing the bounding mask.
- QRegion contents;
+ //Create a TQRegion from the rectangles describing the bounding mask.
+ TQRegion contents;
for (int pos = 0; pos < count; pos++)
- contents += QRegion(rects[pos].x, rects[pos].y,
+ contents += TQRegion(rects[pos].x, rects[pos].y,
rects[pos].width, rects[pos].height);
XFree(rects);
//Create the bounding box.
- QRegion bbox(0, 0, snapshot.width(), snapshot.height());
+ TQRegion bbox(0, 0, snapshot.width(), snapshot.height());
//Get the masked away area.
- QRegion maskedAway = bbox - contents;
- QMemArray<QRect> maskedAwayRects = maskedAway.rects();
+ TQRegion maskedAway = bbox - contents;
+ TQMemArray<TQRect> maskedAwayRects = maskedAway.rects();
//Construct a bitmap mask from the rectangles
- QBitmap mask( snapshot.width(), snapshot.height());
- QPainter p(&mask);
+ TQBitmap mask( snapshot.width(), snapshot.height());
+ TQPainter p(&mask);
p.fillRect(0, 0, mask.width(), mask.height(), Qt::color1);
for (uint pos = 0; pos < maskedAwayRects.count(); pos++)
p.fillRect(maskedAwayRects[pos], Qt::color0);
@@ -1796,7 +1796,7 @@ void Workspace::slotGrabWindow()
}
}
- QClipboard *cb = QApplication::clipboard();
+ QClipboard *cb = TQApplication::clipboard();
cb->setPixmap( snapshot );
}
else
@@ -1808,8 +1808,8 @@ void Workspace::slotGrabWindow()
*/
void Workspace::slotGrabDesktop()
{
- QPixmap p = QPixmap::grabWindow( qt_xrootwin() );
- QClipboard *cb = QApplication::clipboard();
+ TQPixmap p = TQPixmap::grabWindow( qt_xrootwin() );
+ QClipboard *cb = TQApplication::clipboard();
cb->setPixmap( p );
}
@@ -1869,12 +1869,12 @@ WId Workspace::getMouseEmulationWindow()
/*!
Sends a faked mouse event to the specified window. Returns the new button state.
*/
-unsigned int Workspace::sendFakedMouseEvent( QPoint pos, WId w, MouseEmulation type, int button, unsigned int state )
+unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation type, int button, unsigned int state )
{
if ( !w )
return state;
- QWidget* widget = QWidget::find( w );
- if ( (!widget || widget->inherits("QToolButton") ) && !findClient( WindowMatchPredicate( w )) )
+ TQWidget* widget = TQWidget::find( w );
+ if ( (!widget || widget->inherits("TQToolButton") ) && !findClient( WindowMatchPredicate( w )) )
{
int x, y;
Window xw;
@@ -1960,7 +1960,7 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev )
bool is_alt = km & Mod1Mask;
bool is_shift = km & ShiftMask;
int delta = is_control?1:is_alt?32:8;
- QPoint pos = QCursor::pos();
+ TQPoint pos = TQCursor::pos();
switch ( kc )
{
@@ -2035,7 +2035,7 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev )
return FALSE;
}
- QCursor::setPos( pos );
+ TQCursor::setPos( pos );
if ( mouse_emulation_state )
mouse_emulation_state = sendFakedMouseEvent( pos, mouse_emulation_window, EmuMove, 0, mouse_emulation_state );
return TRUE;
@@ -2047,7 +2047,7 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev )
sometimes required by clients to draw on it, for example outlines on
moving or resizing.
*/
-QWidget* Workspace::desktopWidget()
+TQWidget* Workspace::desktopWidget()
{
return desktop_widget;
}
@@ -2063,8 +2063,8 @@ void Workspace::requestDelayFocus( Client* c )
{
delayfocus_client = c;
delete delayFocusTimer;
- delayFocusTimer = new QTimer( this );
- connect( delayFocusTimer, SIGNAL( timeout() ), this, SLOT( delayFocus() ) );
+ delayFocusTimer = new TQTimer( this );
+ connect( delayFocusTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( delayFocus() ) );
delayFocusTimer->start( options->delayFocusInterval, TRUE );
}
@@ -2088,7 +2088,7 @@ void Workspace::checkElectricBorders( bool force )
electric_current_border = 0;
- QRect r = QApplication::desktop()->geometry();
+ TQRect r = TQApplication::desktop()->geometry();
electricTop = r.top();
electricBottom = r.bottom();
electricLeft = r.left();
@@ -2107,7 +2107,7 @@ void Workspace::createBorderWindows()
electric_have_borders = true;
- QRect r = QApplication::desktop()->geometry();
+ TQRect r = TQApplication::desktop()->geometry();
XSetWindowAttributes attributes;
unsigned long valuemask;
attributes.override_redirect = True;
@@ -2196,7 +2196,7 @@ void Workspace::destroyBorderWindows()
electric_right_border = None;
}
-void Workspace::clientMoved(const QPoint &pos, Time now)
+void Workspace::clientMoved(const TQPoint &pos, Time now)
{
if (options->electricBorders() == Options::ElectricDisabled)
return;
@@ -2231,7 +2231,7 @@ void Workspace::clientMoved(const QPoint &pos, Time now)
{
electric_current_border = 0;
- QRect r = QApplication::desktop()->geometry();
+ TQRect r = TQApplication::desktop()->geometry();
int offset;
int desk_before = currentDesktop();
@@ -2242,7 +2242,7 @@ void Workspace::clientMoved(const QPoint &pos, Time now)
if (currentDesktop() != desk_before)
{
offset = r.width() / 5;
- QCursor::setPos(r.width() - offset, pos.y());
+ TQCursor::setPos(r.width() - offset, pos.y());
}
break;
@@ -2251,7 +2251,7 @@ void Workspace::clientMoved(const QPoint &pos, Time now)
if (currentDesktop() != desk_before)
{
offset = r.width() / 5;
- QCursor::setPos(offset, pos.y());
+ TQCursor::setPos(offset, pos.y());
}
break;
@@ -2260,7 +2260,7 @@ void Workspace::clientMoved(const QPoint &pos, Time now)
if (currentDesktop() != desk_before)
{
offset = r.height() / 5;
- QCursor::setPos(pos.x(), r.height() - offset);
+ TQCursor::setPos(pos.x(), r.height() - offset);
}
break;
@@ -2269,7 +2269,7 @@ void Workspace::clientMoved(const QPoint &pos, Time now)
if (currentDesktop() != desk_before)
{
offset = r.height() / 5;
- QCursor::setPos(pos.x(), offset);
+ TQCursor::setPos(pos.x(), offset);
}
break;
}
@@ -2289,10 +2289,10 @@ void Workspace::clientMoved(const QPoint &pos, Time now)
// reset the pointer to find out wether the user is really pushing
switch( border)
{
- case 1: QCursor::setPos(pos.x()+mouse_warp, pos.y()); break;
- case 2: QCursor::setPos(pos.x()-mouse_warp, pos.y()); break;
- case 3: QCursor::setPos(pos.x(), pos.y()+mouse_warp); break;
- case 4: QCursor::setPos(pos.x(), pos.y()-mouse_warp); break;
+ case 1: TQCursor::setPos(pos.x()+mouse_warp, pos.y()); break;
+ case 2: TQCursor::setPos(pos.x()-mouse_warp, pos.y()); break;
+ case 3: TQCursor::setPos(pos.x(), pos.y()+mouse_warp); break;
+ case 4: TQCursor::setPos(pos.x(), pos.y()-mouse_warp); break;
}
}
@@ -2310,7 +2310,7 @@ bool Workspace::electricBorder(XEvent *e)
e->xcrossing.window == electric_right_border)
// the user entered an electric border
{
- clientMoved( QPoint( e->xcrossing.x_root, e->xcrossing.y_root ), e->xcrossing.time );
+ clientMoved( TQPoint( e->xcrossing.x_root, e->xcrossing.y_root ), e->xcrossing.time );
return true;
}
}
@@ -2323,7 +2323,7 @@ bool Workspace::electricBorder(XEvent *e)
|| e->xclient.window == electric_right_border ))
{
updateXTime();
- clientMoved( QPoint( e->xclient.data.l[2]>>16, e->xclient.data.l[2]&0xffff), qt_x_time );
+ clientMoved( TQPoint( e->xclient.data.l[2]>>16, e->xclient.data.l[2]&0xffff), qt_x_time );
return true;
}
}
@@ -2379,12 +2379,12 @@ void Workspace::lostTopMenuSelection()
{
// kdDebug() << "lost TopMenu selection" << endl;
// make sure this signal is always set when not owning the selection
- disconnect( topmenu_watcher, SIGNAL( lostOwner()), this, SLOT( lostTopMenuOwner()));
- connect( topmenu_watcher, SIGNAL( lostOwner()), this, SLOT( lostTopMenuOwner()));
+ disconnect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner()));
+ connect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner()));
if( !managing_topmenus )
return;
- connect( topmenu_watcher, SIGNAL( lostOwner()), this, SLOT( lostTopMenuOwner()));
- disconnect( topmenu_selection, SIGNAL( lostOwnership()), this, SLOT( lostTopMenuSelection()));
+ connect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner()));
+ disconnect( topmenu_selection, TQT_SIGNAL( lostOwnership()), this, TQT_SLOT( lostTopMenuSelection()));
managing_topmenus = false;
delete topmenu_space;
topmenu_space = NULL;
@@ -2413,8 +2413,8 @@ void Workspace::setupTopMenuHandling()
{
if( managing_topmenus )
return;
- connect( topmenu_selection, SIGNAL( lostOwnership()), this, SLOT( lostTopMenuSelection()));
- disconnect( topmenu_watcher, SIGNAL( lostOwner()), this, SLOT( lostTopMenuOwner()));
+ connect( topmenu_selection, TQT_SIGNAL( lostOwnership()), this, TQT_SLOT( lostTopMenuSelection()));
+ disconnect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner()));
managing_topmenus = true;
topmenu_space = new QWidget;
Window stack[ 2 ];
@@ -2443,9 +2443,9 @@ KDecoration* Workspace::createDecoration( KDecorationBridge* bridge )
return mgr->createDecoration( bridge );
}
-QString Workspace::desktopName( int desk ) const
+TQString Workspace::desktopName( int desk ) const
{
- return QString::fromUtf8( rootInfo->desktopName( desk ) );
+ return TQString::fromUtf8( rootInfo->desktopName( desk ) );
}
bool Workspace::checkStartupNotification( Window w, KStartupInfoId& id, KStartupInfoData& data )
@@ -2462,13 +2462,13 @@ void Workspace::focusToNull()
XSetInputFocus(qt_xdisplay(), null_focus_window, RevertToPointerRoot, qt_x_time );
}
-void Workspace::helperDialog( const QString& message, const Client* c )
+void Workspace::helperDialog( const TQString& message, const Client* c )
{
- QStringList args;
- QString type;
+ TQStringList args;
+ TQString type;
if( message == "noborderaltf3" )
{
- QString shortcut = QString( "%1 (%2)" ).arg( keys->label( "Window Operations Menu" ))
+ TQString shortcut = TQString( "%1 (%2)" ).arg( keys->label( "Window Operations Menu" ))
.arg( keys->shortcut( "Window Operations Menu" ).seq( 0 ).toString());
args << "--msgbox" <<
i18n( "You have selected to show a window without its border.\n"
@@ -2480,7 +2480,7 @@ void Workspace::helperDialog( const QString& message, const Client* c )
}
else if( message == "fullscreenaltf3" )
{
- QString shortcut = QString( "%1 (%2)" ).arg( keys->label( "Window Operations Menu" ))
+ TQString shortcut = TQString( "%1 (%2)" ).arg( keys->label( "Window Operations Menu" ))
.arg( keys->shortcut( "Window Operations Menu" ).seq( 0 ).toString());
args << "--msgbox" <<
i18n( "You have selected to show a window in fullscreen mode.\n"
@@ -2504,7 +2504,7 @@ void Workspace::helperDialog( const QString& message, const Client* c )
proc << "--dontagain" << "kwin_dialogsrc:" + type;
}
if( c != NULL )
- proc << "--embed" << QString::number( c->window());
+ proc << "--embed" << TQString::number( c->window());
proc.start( KProcess::DontCare );
}
@@ -2530,14 +2530,14 @@ void Workspace::startKompmgr()
char selection_name[ 100 ];
sprintf( selection_name, "_NET_WM_CM_S%d", DefaultScreen( qt_xdisplay()));
kompmgr_selection = new KSelectionOwner( selection_name );
- connect( kompmgr_selection, SIGNAL( lostOwnership()), SLOT( stopKompmgr()));
+ connect( kompmgr_selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( stopKompmgr()));
kompmgr_selection->claim( true );
- connect(kompmgr, SIGNAL(processExited(KProcess*)), SLOT(restartKompmgr()));
+ connect(kompmgr, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(restartKompmgr()));
options->useTranslucency = TRUE;
allowKompmgrRestart = FALSE;
- QTimer::singleShot( 60000, this, SLOT(unblockKompmgrRestart()) );
- QByteArray ba;
- QDataStream arg(ba, IO_WriteOnly);
+ TQTimer::singleShot( 60000, this, TQT_SLOT(unblockKompmgrRestart()) );
+ TQByteArray ba;
+ TQDataStream arg(ba, IO_WriteOnly);
arg << "";
kapp->dcopClient()->emitDCOPSignal("default", "kompmgrStarted()", ba);
}
@@ -2550,12 +2550,12 @@ void Workspace::stopKompmgr()
return;
delete kompmgr_selection;
kompmgr_selection = NULL;
- kompmgr->disconnect(this, SLOT(restartKompmgr()));
+ kompmgr->disconnect(this, TQT_SLOT(restartKompmgr()));
options->useTranslucency = FALSE;
if (popup){ delete popup; popup = 0L; } // to add/remove opacity slider
kompmgr->kill();
- QByteArray ba;
- QDataStream arg(ba, IO_WriteOnly);
+ TQByteArray ba;
+ TQDataStream arg(ba, IO_WriteOnly);
arg << "";
kapp->dcopClient()->emitDCOPSignal("default", "kompmgrStopped()", ba);
}
@@ -2571,7 +2571,7 @@ void Workspace::unblockKompmgrRestart()
}
void Workspace::restartKompmgr()
-// this is for inernal purpose (crashhandling) only, usually you want to use workspace->stopKompmgr(); QTimer::singleShot(200, workspace, SLOT(startKompmgr()));
+// this is for inernal purpose (crashhandling) only, usually you want to use workspace->stopKompmgr(); TQTimer::singleShot(200, workspace, TQT_SLOT(startKompmgr()));
{
if (!allowKompmgrRestart) // uh-ohh
{
@@ -2609,14 +2609,14 @@ void Workspace::restartKompmgr()
else
{
allowKompmgrRestart = FALSE;
- QTimer::singleShot( 60000, this, SLOT(unblockKompmgrRestart()) );
+ TQTimer::singleShot( 60000, this, TQT_SLOT(unblockKompmgrRestart()) );
}
}
void Workspace::handleKompmgrOutput( KProcess* , char *buffer, int buflen)
{
- QString message;
- QString output = QString::fromLocal8Bit( buffer, buflen );
+ TQString message;
+ TQString output = TQString::fromLocal8Bit( buffer, buflen );
if (output.contains("Started",false))
; // don't do anything, just pass to the connection release
else if (output.contains("Can't open display",false))
@@ -2635,7 +2635,7 @@ void Workspace::handleKompmgrOutput( KProcess* , char *buffer, int buflen)
else return; //skip others
// kompmgr startup failed or succeeded, release connection
kompmgr->closeStderr();
- disconnect(kompmgr, SIGNAL(receivedStderr(KProcess*, char*, int)), this, SLOT(handleKompmgrOutput(KProcess*, char*, int)));
+ disconnect(kompmgr, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(handleKompmgrOutput(KProcess*, char*, int)));
if( !message.isEmpty())
{
KProcess proc;
diff --git a/kwin/workspace.h b/kwin/workspace.h
index efb31de8a..64622d435 100644
--- a/kwin/workspace.h
+++ b/kwin/workspace.h
@@ -12,10 +12,10 @@ License. See the file "COPYING" for the exact licensing terms.
#ifndef KWIN_WORKSPACE_H
#define KWIN_WORKSPACE_H
-#include <qtimer.h>
-#include <qvaluevector.h>
+#include <tqtimer.h>
+#include <tqvaluevector.h>
#include <kshortcut.h>
-#include <qcursor.h>
+#include <tqcursor.h>
#include <netwm.h>
#include <kxmessages.h>
@@ -68,9 +68,9 @@ class SystemTrayWindow
WId winFor;
};
-typedef QValueList<SystemTrayWindow> SystemTrayWindowList;
+typedef TQValueList<SystemTrayWindow> SystemTrayWindowList;
-class Workspace : public QObject, public KWinInterface, public KDecorationDefines
+class Workspace : public TQObject, public KWinInterface, public KDecorationDefines
{
Q_OBJECT
public:
@@ -89,9 +89,9 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
template< typename T1, typename T2 > void forEachClient( T1 procedure, T2 predicate );
template< typename T > void forEachClient( T procedure );
- QRect clientArea( clientAreaOption, const QPoint& p, int desktop ) const;
- QRect clientArea( clientAreaOption, const Client* c ) const;
- QRect clientArea( clientAreaOption, int screen, int desktop ) const;
+ TQRect clientArea( clientAreaOption, const TQPoint& p, int desktop ) const;
+ TQRect clientArea( clientAreaOption, const Client* c ) const;
+ TQRect clientArea( clientAreaOption, int screen, int desktop ) const;
/**
* @internal
@@ -134,11 +134,11 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
*/
void setClientIsMoving( Client *c );
- void place( Client *c, QRect& area );
- void placeSmart( Client* c, const QRect& area );
+ void place( Client *c, TQRect& area );
+ void placeSmart( Client* c, const TQRect& area );
- QPoint adjustClientPosition( Client* c, QPoint pos );
- QRect adjustClientSize( Client* c, QRect moveResizeGeom, int mode );
+ TQPoint adjustClientPosition( Client* c, TQPoint pos );
+ TQRect adjustClientSize( Client* c, TQRect moveResizeGeom, int mode );
void raiseClient( Client* c );
void lowerClient( Client* c );
void raiseClientRequest( Client* c, NET::RequestSource src, Time timestamp );
@@ -151,7 +151,7 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
void clientHidden( Client* );
void clientAttentionChanged( Client* c, bool set );
- void clientMoved(const QPoint &pos, Time time);
+ void clientMoved(const TQPoint &pos, Time time);
/**
* Returns the current virtual desktop of this workspace
@@ -166,11 +166,11 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
int activeScreen() const;
int numScreens() const;
void checkActiveScreen( const Client* c );
- void setActiveScreenMouse( QPoint mousepos );
- QRect screenGeometry( int screen ) const;
- int screenNumber( QPoint pos ) const;
+ void setActiveScreenMouse( TQPoint mousepos );
+ TQRect screenGeometry( int screen ) const;
+ int screenNumber( TQPoint pos ) const;
- QWidget* desktopWidget();
+ TQWidget* desktopWidget();
// for TabBox
Client* nextFocusChainClient(Client*) const;
@@ -204,12 +204,12 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
* Shows the menu operations menu for the client and makes it active if
* it's not already.
*/
- void showWindowMenu( const QRect &pos, Client* cl );
+ void showWindowMenu( const TQRect &pos, Client* cl );
/**
* Backwards compatibility.
*/
void showWindowMenu( int x, int y, Client* cl );
- void showWindowMenu( QPoint pos, Client* cl );
+ void showWindowMenu( TQPoint pos, Client* cl );
void updateMinimizedOfTransients( Client* );
void updateOnAllDesktopsOfTransients( Client* );
@@ -229,21 +229,21 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
// dcop interface
void cascadeDesktop();
void unclutterDesktop();
- void doNotManage(QString);
+ void doNotManage(TQString);
bool setCurrentDesktop( int new_desktop );
void nextDesktop();
void previousDesktop();
void circulateDesktopApplications();
void setCurrentScreen( int new_screen );
- QString desktopName( int desk ) const;
+ TQString desktopName( int desk ) const;
virtual void setDesktopLayout(int , int , int );
void updateDesktopLayout();
void setShowingDesktop( bool showing );
void resetShowingDesktop( bool keep_hidden );
bool showingDesktop() const;
- bool isNotManaged( const QString& title ); // ### setter or getter ?
+ bool isNotManaged( const TQString& title ); // ### setter or getter ?
void sendPingToWindow( Window w, Time timestamp ); // called from Client::pingWindow()
void sendTakeActivity( Client* c, Time timestamp, long flags ); // called from Client::takeActivity()
@@ -289,12 +289,12 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
int packPositionUp( const Client* cl, int oldy, bool top_edge ) const;
int packPositionDown( const Client* cl, int oldy, bool bottom_edge ) const;
- static QStringList configModules(bool controlCenter);
+ static TQStringList configModules(bool controlCenter);
void cancelDelayFocus();
void requestDelayFocus( Client* );
- void updateFocusMousePosition( const QPoint& pos );
- QPoint focusMousePosition() const;
+ void updateFocusMousePosition( const TQPoint& pos );
+ TQPoint focusMousePosition() const;
void toggleTopDockShadows(bool on);
@@ -390,7 +390,7 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
void lostTopMenuSelection();
void lostTopMenuOwner();
void delayFocus();
- void gotTemporaryRulesMessage( const QString& );
+ void gotTemporaryRulesMessage( const TQString& );
void cleanupTemporaryRules();
void writeWindowRules();
void kipcMessage( int id, int data );
@@ -468,7 +468,7 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
// mouse emulation
WId getMouseEmulationWindow();
enum MouseEmulation { EmuPress, EmuRelease, EmuMove };
- unsigned int sendFakedMouseEvent( QPoint pos, WId win, MouseEmulation type, int button, unsigned int state ); // returns the new state
+ unsigned int sendFakedMouseEvent( TQPoint pos, WId win, MouseEmulation type, int button, unsigned int state ); // returns the new state
void tabBoxKeyPress( const KKeyNative& keyX );
void tabBoxKeyRelease( const XKeyEvent& ev );
@@ -482,11 +482,11 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
// ------------------
- void helperDialog( const QString& message, const Client* c );
+ void helperDialog( const TQString& message, const Client* c );
void calcDesktopLayout(int &x, int &y) const;
- QPopupMenu* clientPopup();
+ TQPopupMenu* clientPopup();
void closeActivePopup();
void updateClientArea( bool force );
@@ -495,22 +495,22 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
int current_desktop;
int number_of_desktops;
- QMemArray<int> desktop_focus_chain;
+ TQMemArray<int> desktop_focus_chain;
int active_screen;
- QWidget* active_popup;
+ TQWidget* active_popup;
Client* active_popup_client;
- QWidget* desktop_widget;
+ TQWidget* desktop_widget;
void loadSessionInfo();
void loadWindowRules();
void editWindowRules( Client* c, bool whole_app );
- QPtrList<SessionInfo> session;
- QValueList<Rules*> rules;
+ TQPtrList<SessionInfo> session;
+ TQValueList<Rules*> rules;
KXMessages temporaryRulesMessages;
- QTimer rulesUpdatedTimer;
+ TQTimer rulesUpdatedTimer;
bool rules_updates_disabled;
static const char* windowTypeToTxt( NET::WindowType type );
static NET::WindowType txtToWindowType( const char* txt );
@@ -523,16 +523,16 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
Client* pending_take_activity;
// delay(ed) window focus timer and client
- QTimer* delayFocusTimer;
+ TQTimer* delayFocusTimer;
Client* delayfocus_client;
- QPoint focusMousePos;
+ TQPoint focusMousePos;
ClientList clients;
ClientList desktops;
ClientList unconstrained_stacking_order; // topmost last
ClientList stacking_order; // topmost last
- QValueVector< ClientList > focus_chain; // currently active last
+ TQValueVector< ClientList > focus_chain; // currently active last
ClientList global_focus_chain; // this one is only for things like tabbox's MRU
ClientList should_get_focus; // last is most recent
ClientList attention_chain;
@@ -564,9 +564,9 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
TabBox* tab_box;
PopupInfo* popupinfo;
- QPopupMenu *popup;
- QPopupMenu *advanced_popup;
- QPopupMenu *desk_popup;
+ TQPopupMenu *popup;
+ TQPopupMenu *advanced_popup;
+ TQPopupMenu *desk_popup;
int desk_popup_index;
KGlobalAccel *keys;
@@ -582,19 +582,19 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
PluginMgr *mgr;
RootInfo *rootInfo;
- QWidget* supportWindow;
+ TQWidget* supportWindow;
// swallowing
- QStringList doNotManageList;
+ TQStringList doNotManageList;
// colormap handling
Colormap default_colormap;
Colormap installed_colormap;
// Timer to collect requests for 'reconfigure'
- QTimer reconfigureTimer;
+ TQTimer reconfigureTimer;
- QTimer updateToolWindowsTimer;
+ TQTimer updateToolWindowsTimer;
static Workspace *_self;
@@ -614,7 +614,7 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
int electricBottom;
Time electric_time_first;
Time electric_time_last;
- QPoint electric_push_point;
+ TQPoint electric_push_point;
Qt::Orientation layoutOrientation;
int layoutX;
@@ -622,15 +622,15 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
Placement *initPositioning;
- QRect* workarea; // array of workareas for virtual desktops
- QRect** screenarea; // array of workareas per xinerama screen for all virtual desktops
+ TQRect* workarea; // array of workareas for virtual desktops
+ TQRect** screenarea; // array of workareas per xinerama screen for all virtual desktops
bool managing_topmenus;
KSelectionOwner* topmenu_selection;
KSelectionWatcher* topmenu_watcher;
ClientList topmenus; // doesn't own them
mutable int topmenu_height;
- QWidget* topmenu_space;
+ TQWidget* topmenu_space;
int set_active_client_recursion;
int block_stacking_updates; // when >0, stacking updates are temporarily disabled
@@ -640,8 +640,8 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
friend class StackingUpdatesBlocker;
//kompmgr
- QSlider *transSlider;
- QPushButton *transButton;
+ TQSlider *transSlider;
+ TQPushButton *transButton;
// not used yet
/*Client* topDock;
int maximizedWindowCounter;
@@ -738,14 +738,14 @@ inline const ClientList& Workspace::stackingOrder() const
return stacking_order;
}
-inline void Workspace::showWindowMenu(QPoint pos, Client* cl)
+inline void Workspace::showWindowMenu(TQPoint pos, Client* cl)
{
- showWindowMenu(QRect(pos, pos), cl);
+ showWindowMenu(TQRect(pos, pos), cl);
}
inline void Workspace::showWindowMenu(int x, int y, Client* cl)
{
- showWindowMenu(QRect(QPoint(x, y), QPoint(x, y)), cl);
+ showWindowMenu(TQRect(TQPoint(x, y), TQPoint(x, y)), cl);
}
inline
@@ -803,13 +803,13 @@ bool Workspace::rulesUpdatesDisabled() const
}
inline
-void Workspace::updateFocusMousePosition( const QPoint& pos )
+void Workspace::updateFocusMousePosition( const TQPoint& pos )
{
focusMousePos = pos;
}
inline
-QPoint Workspace::focusMousePosition() const
+TQPoint Workspace::focusMousePosition() const
{
return focusMousePos;
}
diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp
index 405208020..5e9d58ea3 100644
--- a/kxkb/extension.cpp
+++ b/kxkb/extension.cpp
@@ -1,10 +1,10 @@
#include <string.h>
#include <errno.h>
-#include <qstring.h>
-#include <qmap.h>
-#include <qfile.h>
-#include <qdir.h>
+#include <tqstring.h>
+#include <tqmap.h>
+#include <tqfile.h>
+#include <tqdir.h>
#include <kdebug.h>
#include <kstandarddirs.h>
@@ -21,17 +21,17 @@
#include "extension.h"
-QMap<QString, FILE*> XKBExtension::fileCache; //TODO: move to class?
+TQMap<TQString, FILE*> XKBExtension::fileCache; //TODO: move to class?
-static QString getLayoutKey(const QString& layout, const QString& variant)
+static TQString getLayoutKey(const TQString& layout, const TQString& variant)
{
return layout + "." + variant;
}
-QString XKBExtension::getPrecompiledLayoutFilename(const QString& layoutKey)
+TQString XKBExtension::getPrecompiledLayoutFilename(const TQString& layoutKey)
{
- QString compiledLayoutFileName = m_tempDir + layoutKey + ".xkm";
+ TQString compiledLayoutFileName = m_tempDir + layoutKey + ".xkm";
return compiledLayoutFileName;
}
@@ -41,7 +41,7 @@ XKBExtension::XKBExtension(Display *d)
d = qt_xdisplay();
m_dpy = d;
-// QStringList dirs = KGlobal::dirs()->findDirs ( "tmp", "" );
+// TQStringList dirs = KGlobal::dirs()->findDirs ( "tmp", "" );
// m_tempDir = dirs.count() == 0 ? "/tmp/" : dirs[0];
m_tempDir = locateLocal("tmp", "");
}
@@ -81,9 +81,9 @@ bool XKBExtension::init()
void XKBExtension::reset()
{
- for(QMap<QString, FILE*>::ConstIterator it = fileCache.begin(); it != fileCache.end(); it++) {
+ for(TQMap<TQString, FILE*>::ConstIterator it = fileCache.begin(); it != fileCache.end(); it++) {
fclose(*it);
-// remove( QFile::encodeName(getPrecompiledLayoutFileName(*it)) );
+// remove( TQFile::encodeName(getPrecompiledLayoutFileName(*it)) );
}
fileCache.clear();
}
@@ -94,12 +94,12 @@ XKBExtension::~XKBExtension()
deletePrecompiledLayouts();*/
}
-bool XKBExtension::setXkbOptions(const QString& options, bool resetOld)
+bool XKBExtension::setXkbOptions(const TQString& options, bool resetOld)
{
if (options.isEmpty())
return true;
- QString exe = KGlobal::dirs()->findExe("setxkbmap");
+ TQString exe = KGlobal::dirs()->findExe("setxkbmap");
if (exe.isEmpty())
return false;
@@ -114,15 +114,15 @@ bool XKBExtension::setXkbOptions(const QString& options, bool resetOld)
return p.normalExit() && (p.exitStatus() == 0);
}
-bool XKBExtension::setLayout(const QString& model,
- const QString& layout, const QString& variant,
- const QString& includeGroup, bool useCompiledLayouts)
+bool XKBExtension::setLayout(const TQString& model,
+ const TQString& layout, const TQString& variant,
+ const TQString& includeGroup, bool useCompiledLayouts)
{
if( useCompiledLayouts == false ) {
return setLayoutInternal( model, layout, variant, includeGroup );
}
- const QString layoutKey = getLayoutKey(layout, variant);
+ const TQString layoutKey = getLayoutKey(layout, variant);
bool res;
if( fileCache.contains(layoutKey) ) {
@@ -143,21 +143,21 @@ bool XKBExtension::setLayout(const QString& model,
}
// private
-bool XKBExtension::setLayoutInternal(const QString& model,
- const QString& layout, const QString& variant,
- const QString& includeGroup)
+bool XKBExtension::setLayoutInternal(const TQString& model,
+ const TQString& layout, const TQString& variant,
+ const TQString& includeGroup)
{
if ( layout.isEmpty() )
return false;
- QString exe = KGlobal::dirs()->findExe("setxkbmap");
+ TQString exe = KGlobal::dirs()->findExe("setxkbmap");
if( exe.isEmpty() ) {
kdError() << "Can't find setxkbmap" << endl;
return false;
}
- QString fullLayout = layout;
- QString fullVariant = variant;
+ TQString fullLayout = layout;
+ TQString fullVariant = variant;
if( includeGroup.isEmpty() == false ) {
fullLayout = includeGroup;
fullLayout += ",";
@@ -185,7 +185,7 @@ bool XKBExtension::setLayoutInternal(const QString& model,
pXmodmap.start(KProcess::Block);
KProcess pXmodmapHome;
- pXmodmapHome << "/usr/bin/xmodmap" << QDir::home().path() + "/.Xmodmap";
+ pXmodmapHome << "/usr/bin/xmodmap" << TQDir::home().path() + "/.Xmodmap";
pXmodmapHome.start(KProcess::Block);
return p.normalExit() && (p.exitStatus() == 0);
@@ -210,14 +210,14 @@ unsigned int XKBExtension::getGroup() const
* @param[in] fileName file to store compiled layout to
* @return true if no problem, false otherwise
*/
-bool XKBExtension::compileCurrentLayout(const QString &layoutKey)
+bool XKBExtension::compileCurrentLayout(const TQString &layoutKey)
{
XkbFileInfo result;
memset(&result, 0, sizeof(result));
result.type = XkmKeymapFile;
XkbReadFromServer(m_dpy, XkbAllMapComponentsMask, XkbAllMapComponentsMask, &result);
- const QString fileName = getPrecompiledLayoutFilename(layoutKey);
+ const TQString fileName = getPrecompiledLayoutFilename(layoutKey);
kdDebug() << "compiling layout " << this << " cache size: " << fileCache.count() << endl;
if( fileCache.contains(layoutKey) ) {
@@ -227,7 +227,7 @@ bool XKBExtension::compileCurrentLayout(const QString &layoutKey)
fileCache.remove(fileName);
}
- FILE *output = fopen(QFile::encodeName(fileName), "w");
+ FILE *output = fopen(TQFile::encodeName(fileName), "w");
if ( output == NULL )
{
@@ -243,7 +243,7 @@ bool XKBExtension::compileCurrentLayout(const QString &layoutKey)
}
fclose(output); // TODO: can we change mode w/out reopening?
- FILE *input = fopen(QFile::encodeName(fileName), "r");
+ FILE *input = fopen(TQFile::encodeName(fileName), "r");
fileCache[ layoutKey ] = input;
XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
@@ -255,7 +255,7 @@ bool XKBExtension::compileCurrentLayout(const QString &layoutKey)
* and sets it as current
* TODO: cache layout in memory rather than in file
*/
-bool XKBExtension::setCompiledLayout(const QString &layoutKey)
+bool XKBExtension::setCompiledLayout(const TQString &layoutKey)
{
FILE *input = NULL;
@@ -265,10 +265,10 @@ bool XKBExtension::setCompiledLayout(const QString &layoutKey)
if( input == NULL ) {
kdWarning() << "setCompiledLayout trying to reopen xkb file" << endl; // should never happen
- const QString fileName = getPrecompiledLayoutFilename(layoutKey);
- input = fopen(QFile::encodeName(fileName), "r");
+ const TQString fileName = getPrecompiledLayoutFilename(layoutKey);
+ input = fopen(TQFile::encodeName(fileName), "r");
- // FILE *input = fopen(QFile::encodeName(fileName), "r");
+ // FILE *input = fopen(TQFile::encodeName(fileName), "r");
if ( input == NULL ) {
kdDebug() << "Unable to open " << fileName << ": " << strerror(errno) << endl;
fileCache.remove(layoutKey);
@@ -323,11 +323,11 @@ bool XKBExtension::setCompiledLayout(const QString &layoutKey)
// Deletes the precompiled layouts stored in temporary files
// void XKBExtension::deletePrecompiledLayouts()
// {
-// QMapConstIterator<LayoutUnit, QString> it, end;
+// TQMapConstIterator<LayoutUnit, TQString> it, end;
// end = m_compiledLayoutFileNames.end();
// for (it = m_compiledLayoutFileNames.begin(); it != end; ++it)
// {
-// unlink(QFile::encodeName(it.data()));
+// unlink(TQFile::encodeName(it.data()));
// }
// m_compiledLayoutFileNames.clear();
// }
diff --git a/kxkb/extension.h b/kxkb/extension.h
index 24a0324bc..bf4293d2b 100644
--- a/kxkb/extension.h
+++ b/kxkb/extension.h
@@ -12,25 +12,25 @@ public:
bool init();
void reset();
- static bool setXkbOptions(const QString& options, bool resetOldOptions);
- bool setLayout(const QString& model,
- const QString& layout, const QString& variant,
- const QString& includeGroup, bool useCompiledLayouts=true);
+ static bool setXkbOptions(const TQString& options, bool resetOldOptions);
+ bool setLayout(const TQString& model,
+ const TQString& layout, const TQString& variant,
+ const TQString& includeGroup, bool useCompiledLayouts=true);
bool setGroup(unsigned int group);
unsigned int getGroup() const;
private:
Display *m_dpy;
- QString m_tempDir;
- static QMap<QString, FILE*> fileCache;
+ TQString m_tempDir;
+ static TQMap<TQString, FILE*> fileCache;
- bool setLayoutInternal(const QString& model,
- const QString& layout, const QString& variant,
- const QString& includeGroup);
- bool compileCurrentLayout(const QString& layoutKey);
- bool setCompiledLayout(const QString& layoutKey);
+ bool setLayoutInternal(const TQString& model,
+ const TQString& layout, const TQString& variant,
+ const TQString& includeGroup);
+ bool compileCurrentLayout(const TQString& layoutKey);
+ bool setCompiledLayout(const TQString& layoutKey);
- QString getPrecompiledLayoutFilename(const QString& layoutKey);
+ TQString getPrecompiledLayoutFilename(const TQString& layoutKey);
// void deletePrecompiledLayouts();
};
diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp
index 5f5b1ff84..502bf7972 100644
--- a/kxkb/kcmlayout.cpp
+++ b/kxkb/kcmlayout.cpp
@@ -1,18 +1,18 @@
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qcombobox.h>
-#include <qtabwidget.h>
-#include <qvgroupbox.h>
-#include <qpushbutton.h>
-#include <qlistview.h>
-#include <qheader.h>
-#include <qwhatsthis.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qlineedit.h>
-#include <qlistview.h>
-#include <qbuttongroup.h>
-#include <qspinbox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqcombobox.h>
+#include <tqtabwidget.h>
+#include <tqvgroupbox.h>
+#include <tqpushbutton.h>
+#include <tqlistview.h>
+#include <tqheader.h>
+#include <tqwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqlineedit.h>
+#include <tqlistview.h>
+#include <tqbuttongroup.h>
+#include <tqspinbox.h>
#include <kkeydialog.h>
#include <kglobal.h>
@@ -45,31 +45,31 @@ enum {
DST_LAYOUT_COLUMN_COUNT = 6
};
-static const QString DEFAULT_VARIANT_NAME("<default>");
+static const TQString DEFAULT_VARIANT_NAME("<default>");
class OptionListItem : public QCheckListItem
{
public:
- OptionListItem( OptionListItem *parent, const QString &text, Type tt,
- const QString &optionName );
- OptionListItem( QListView *parent, const QString &text, Type tt,
- const QString &optionName );
+ OptionListItem( OptionListItem *parent, const TQString &text, Type tt,
+ const TQString &optionName );
+ OptionListItem( TQListView *parent, const TQString &text, Type tt,
+ const TQString &optionName );
~OptionListItem() {}
- QString optionName() const { return m_OptionName; }
+ TQString optionName() const { return m_OptionName; }
- OptionListItem *findChildItem( const QString& text );
+ OptionListItem *findChildItem( const TQString& text );
protected:
- QString m_OptionName;
+ TQString m_OptionName;
};
-static QString lookupLocalized(const QDict<char> &dict, const QString& text)
+static TQString lookupLocalized(const TQDict<char> &dict, const TQString& text)
{
- QDictIterator<char> it(dict);
+ TQDictIterator<char> it(dict);
while (it.current())
{
if ( i18n(it.current()) == text )
@@ -77,12 +77,12 @@ static QString lookupLocalized(const QDict<char> &dict, const QString& text)
++it;
}
- return QString::null;
+ return TQString::null;
}
-static QListViewItem* copyLVI(const QListViewItem* src, QListView* parent)
+static TQListViewItem* copyLVI(const TQListViewItem* src, TQListView* parent)
{
- QListViewItem* ret = new QListViewItem(parent);
+ TQListViewItem* ret = new TQListViewItem(parent);
for(int i = 0; i < SRC_LAYOUT_COLUMN_COUNT; i++)
{
ret->setText(i, src->text(i));
@@ -94,46 +94,46 @@ static QListViewItem* copyLVI(const QListViewItem* src, QListView* parent)
}
-LayoutConfig::LayoutConfig(QWidget *parent, const char *name)
+LayoutConfig::LayoutConfig(TQWidget *parent, const char *name)
: KCModule(parent, name),
m_rules(NULL)
{
- QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *main = new TQVBoxLayout(this, 0, KDialog::spacingHint());
widget = new LayoutConfigWidget(this, "widget");
main->addWidget(widget);
- connect( widget->chkEnable, SIGNAL( toggled( bool )), this, SLOT(changed()));
- connect( widget->chkShowSingle, SIGNAL( toggled( bool )), this, SLOT(changed()));
- connect( widget->chkShowFlag, SIGNAL( toggled( bool )), this, SLOT(changed()));
- connect( widget->comboModel, SIGNAL(activated(int)), this, SLOT(changed()));
+ connect( widget->chkEnable, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT(changed()));
+ connect( widget->chkShowSingle, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT(changed()));
+ connect( widget->chkShowFlag, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT(changed()));
+ connect( widget->comboModel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()));
- connect( widget->listLayoutsSrc, SIGNAL(doubleClicked(QListViewItem*,const QPoint&, int)),
- this, SLOT(add()));
- connect( widget->btnAdd, SIGNAL(clicked()), this, SLOT(add()));
- connect( widget->btnRemove, SIGNAL(clicked()), this, SLOT(remove()));
+ connect( widget->listLayoutsSrc, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&, int)),
+ this, TQT_SLOT(add()));
+ connect( widget->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(add()));
+ connect( widget->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove()));
- connect( widget->comboVariant, SIGNAL(activated(int)), this, SLOT(changed()));
- connect( widget->comboVariant, SIGNAL(activated(int)), this, SLOT(variantChanged()));
- connect( widget->listLayoutsDst, SIGNAL(selectionChanged(QListViewItem *)),
- this, SLOT(layoutSelChanged(QListViewItem *)));
+ connect( widget->comboVariant, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()));
+ connect( widget->comboVariant, TQT_SIGNAL(activated(int)), this, TQT_SLOT(variantChanged()));
+ connect( widget->listLayoutsDst, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
+ this, TQT_SLOT(layoutSelChanged(TQListViewItem *)));
- connect( widget->editDisplayName, SIGNAL(textChanged(const QString&)), this, SLOT(displayNameChanged(const QString&)));
+ connect( widget->editDisplayName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(displayNameChanged(const TQString&)));
- connect( widget->chkLatin, SIGNAL(clicked()), this, SLOT(changed()));
- connect( widget->chkLatin, SIGNAL(clicked()), this, SLOT(latinChanged()));
+ connect( widget->chkLatin, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect( widget->chkLatin, TQT_SIGNAL(clicked()), this, TQT_SLOT(latinChanged()));
widget->btnUp->setIconSet(SmallIconSet("1uparrow"));
- connect( widget->btnUp, SIGNAL(clicked()), this, SLOT(changed()));
- connect( widget->btnUp, SIGNAL(clicked()), this, SLOT(moveUp()));
+ connect( widget->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect( widget->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveUp()));
widget->btnDown->setIconSet(SmallIconSet("1downarrow"));
- connect( widget->btnDown, SIGNAL(clicked()), this, SLOT(changed()));
- connect( widget->btnDown, SIGNAL(clicked()), this, SLOT(moveDown()));
+ connect( widget->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect( widget->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveDown()));
- connect( widget->grpSwitching, SIGNAL( clicked( int ) ), SLOT(changed()));
+ connect( widget->grpSwitching, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed()));
- connect( widget->chkEnableSticky, SIGNAL(toggled(bool)), this, SLOT(changed()));
- connect( widget->spinStickyDepth, SIGNAL(valueChanged(int)), this, SLOT(changed()));
+ connect( widget->chkEnableSticky, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed()));
+ connect( widget->spinStickyDepth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
widget->listLayoutsSrc->setColumnText(LAYOUT_COLUMN_FLAG, "");
widget->listLayoutsDst->setColumnText(LAYOUT_COLUMN_FLAG, "");
@@ -145,16 +145,16 @@ LayoutConfig::LayoutConfig(QWidget *parent, const char *name)
widget->listLayoutsDst->header()->setResizeEnabled(FALSE, LAYOUT_COLUMN_INCLUDE);
widget->listLayoutsDst->header()->setResizeEnabled(FALSE, LAYOUT_COLUMN_DISPLAY_NAME);
- widget->listLayoutsDst->setColumnWidthMode(LAYOUT_COLUMN_INCLUDE, QListView::Manual);
+ widget->listLayoutsDst->setColumnWidthMode(LAYOUT_COLUMN_INCLUDE, TQListView::Manual);
widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_INCLUDE, 0);
// widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_DISPLAY_NAME, 0);
widget->listLayoutsDst->setSorting(-1);
#if 0
- widget->listLayoutsDst->setResizeMode(QListView::LastColumn);
- widget->listLayoutsSrc->setResizeMode(QListView::LastColumn);
+ widget->listLayoutsDst->setResizeMode(TQListView::LastColumn);
+ widget->listLayoutsSrc->setResizeMode(TQListView::LastColumn);
#endif
- widget->listLayoutsDst->setResizeMode(QListView::LastColumn);
+ widget->listLayoutsDst->setResizeMode(TQListView::LastColumn);
//Read rules - we _must_ read _before_ creating xkb-options comboboxes
loadRules();
@@ -185,19 +185,19 @@ void LayoutConfig::initUI() {
widget->comboModel->setCurrentText(i18n(modelName));
- QValueList<LayoutUnit> otherLayouts = m_kxkbConfig.m_layouts;
+ TQValueList<LayoutUnit> otherLayouts = m_kxkbConfig.m_layouts;
widget->listLayoutsDst->clear();
// to optimize we should have gone from it.end to it.begin
- QValueList<LayoutUnit>::ConstIterator it;
+ TQValueList<LayoutUnit>::ConstIterator it;
for (it = otherLayouts.begin(); it != otherLayouts.end(); ++it ) {
- QListViewItemIterator src_it( widget->listLayoutsSrc );
+ TQListViewItemIterator src_it( widget->listLayoutsSrc );
LayoutUnit layoutUnit = *it;
for ( ; src_it.current(); ++src_it ) {
- QListViewItem* srcItem = src_it.current();
+ TQListViewItem* srcItem = src_it.current();
if ( layoutUnit.layout == src_it.current()->text(LAYOUT_COLUMN_MAP) ) { // check if current config knows about this layout
- QListViewItem* newItem = copyLVI(srcItem, widget->listLayoutsDst);
+ TQListViewItem* newItem = copyLVI(srcItem, widget->listLayoutsDst);
newItem->setText(LAYOUT_COLUMN_VARIANT, layoutUnit.variant);
newItem->setText(LAYOUT_COLUMN_INCLUDE, layoutUnit.includeGroup);
@@ -241,19 +241,19 @@ void LayoutConfig::initUI() {
widget->optionsFrame->setEnabled( m_kxkbConfig.m_useKxkb );
// display xkb options
- QStringList options = QStringList::split(',', m_kxkbConfig.m_options);
- for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
+ TQStringList options = TQStringList::split(',', m_kxkbConfig.m_options);
+ for (TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
{
- QString option = *it;
- QString optionKey = option.mid(0, option.find(':'));
- QString optionName = m_rules->options()[option];
+ TQString option = *it;
+ TQString optionKey = option.mid(0, option.find(':'));
+ TQString optionName = m_rules->options()[option];
OptionListItem *item = m_optionGroups[i18n(optionKey.latin1())];
if (item != NULL) {
OptionListItem *child = item->findChildItem( option );
if ( child )
- child->setState( QCheckListItem::On );
+ child->setState( TQCheckListItem::On );
else
kdDebug() << "load: Unknown option: " << option << endl;
}
@@ -269,20 +269,20 @@ void LayoutConfig::initUI() {
void LayoutConfig::save()
{
- QString model = lookupLocalized(m_rules->models(), widget->comboModel->currentText());
+ TQString model = lookupLocalized(m_rules->models(), widget->comboModel->currentText());
m_kxkbConfig.m_model = model;
m_kxkbConfig.m_enableXkbOptions = widget->chkEnableOptions->isChecked();
m_kxkbConfig.m_resetOldOptions = widget->checkResetOld->isChecked();
m_kxkbConfig.m_options = createOptionString();
- QListViewItem *item = widget->listLayoutsDst->firstChild();
- QValueList<LayoutUnit> layouts;
+ TQListViewItem *item = widget->listLayoutsDst->firstChild();
+ TQValueList<LayoutUnit> layouts;
while (item) {
- QString layout = item->text(LAYOUT_COLUMN_MAP);
- QString variant = item->text(LAYOUT_COLUMN_VARIANT);
- QString includes = item->text(LAYOUT_COLUMN_INCLUDE);
- QString displayName = item->text(LAYOUT_COLUMN_DISPLAY_NAME);
+ TQString layout = item->text(LAYOUT_COLUMN_MAP);
+ TQString variant = item->text(LAYOUT_COLUMN_VARIANT);
+ TQString includes = item->text(LAYOUT_COLUMN_INCLUDE);
+ TQString displayName = item->text(LAYOUT_COLUMN_DISPLAY_NAME);
LayoutUnit layoutUnit(layout, variant);
layoutUnit.includeGroup = includes;
@@ -345,13 +345,13 @@ void LayoutConfig::updateStickyLimit()
void LayoutConfig::add()
{
- QListViewItem* sel = widget->listLayoutsSrc->selectedItem();
+ TQListViewItem* sel = widget->listLayoutsSrc->selectedItem();
if( sel == 0 )
return;
// Create a copy of the sel widget, as one might add the same layout more
// than one time, with different variants.
- QListViewItem* toadd = copyLVI(sel, widget->listLayoutsDst);
+ TQListViewItem* toadd = copyLVI(sel, widget->listLayoutsDst);
widget->listLayoutsDst->insertItem(toadd);
if( widget->listLayoutsDst->childCount() > 1 )
@@ -366,8 +366,8 @@ void LayoutConfig::add()
void LayoutConfig::remove()
{
- QListViewItem* sel = widget->listLayoutsDst->selectedItem();
- QListViewItem* newSel = 0;
+ TQListViewItem* sel = widget->listLayoutsDst->selectedItem();
+ TQListViewItem* newSel = 0;
if( sel == 0 )
return;
@@ -389,7 +389,7 @@ void LayoutConfig::remove()
void LayoutConfig::moveUp()
{
- QListViewItem* sel = widget->listLayoutsDst->selectedItem();
+ TQListViewItem* sel = widget->listLayoutsDst->selectedItem();
if( sel == 0 || sel->itemAbove() == 0 )
return;
@@ -404,7 +404,7 @@ void LayoutConfig::moveUp()
void LayoutConfig::moveDown()
{
- QListViewItem* sel = widget->listLayoutsDst->selectedItem();
+ TQListViewItem* sel = widget->listLayoutsDst->selectedItem();
if( sel == 0 || sel->itemBelow() == 0 )
return;
@@ -413,37 +413,37 @@ void LayoutConfig::moveDown()
void LayoutConfig::variantChanged()
{
- QListViewItem* selLayout = widget->listLayoutsDst->selectedItem();
+ TQListViewItem* selLayout = widget->listLayoutsDst->selectedItem();
if( selLayout == NULL ) {
widget->comboVariant->clear();
widget->comboVariant->setEnabled(false);
return;
}
- QString selectedVariant = widget->comboVariant->currentText();
+ TQString selectedVariant = widget->comboVariant->currentText();
if( selectedVariant == DEFAULT_VARIANT_NAME )
selectedVariant = "";
selLayout->setText(LAYOUT_COLUMN_VARIANT, selectedVariant);
}
// helper
-LayoutUnit LayoutConfig::getLayoutUnitKey(QListViewItem *sel)
+LayoutUnit LayoutConfig::getLayoutUnitKey(TQListViewItem *sel)
{
- QString kbdLayout = sel->text(LAYOUT_COLUMN_MAP);
- QString kbdVariant = sel->text(LAYOUT_COLUMN_VARIANT);
+ TQString kbdLayout = sel->text(LAYOUT_COLUMN_MAP);
+ TQString kbdVariant = sel->text(LAYOUT_COLUMN_VARIANT);
return LayoutUnit(kbdLayout, kbdVariant);
}
-void LayoutConfig::displayNameChanged(const QString& newDisplayName)
+void LayoutConfig::displayNameChanged(const TQString& newDisplayName)
{
- QListViewItem* selLayout = widget->listLayoutsDst->selectedItem();
+ TQListViewItem* selLayout = widget->listLayoutsDst->selectedItem();
if( selLayout == NULL )
return;
const LayoutUnit layoutUnitKey = getLayoutUnitKey( selLayout );
LayoutUnit& layoutUnit = *m_kxkbConfig.m_layouts.find(layoutUnitKey);
- QString oldName = selLayout->text(LAYOUT_COLUMN_DISPLAY_NAME);
+ TQString oldName = selLayout->text(LAYOUT_COLUMN_DISPLAY_NAME);
if( oldName.isEmpty() )
oldName = KxkbConfig::getDefaultDisplayName( layoutUnit );
@@ -458,21 +458,21 @@ void LayoutConfig::displayNameChanged(const QString& newDisplayName)
/** will update flag with label if layout label has been edited
*/
-void LayoutConfig::updateIndicator(QListViewItem* selLayout)
+void LayoutConfig::updateIndicator(TQListViewItem* selLayout)
{
}
void LayoutConfig::latinChanged()
{
- QListViewItem* selLayout = widget->listLayoutsDst->selectedItem();
+ TQListViewItem* selLayout = widget->listLayoutsDst->selectedItem();
if ( !selLayout ) {
widget->chkLatin->setChecked( false );
widget->chkLatin->setEnabled( false );
return;
}
- QString include;
+ TQString include;
if( widget->chkLatin->isChecked() )
include = "us";
else
@@ -483,7 +483,7 @@ void LayoutConfig::latinChanged()
kdDebug() << "layout " << layoutUnitKey.toPair() << ", inc: " << include << endl;
}
-void LayoutConfig::layoutSelChanged(QListViewItem *sel)
+void LayoutConfig::layoutSelChanged(TQListViewItem *sel)
{
widget->comboVariant->clear();
widget->comboVariant->setEnabled( sel != NULL );
@@ -497,7 +497,7 @@ void LayoutConfig::layoutSelChanged(QListViewItem *sel)
LayoutUnit layoutUnitKey = getLayoutUnitKey(sel);
- QString kbdLayout = layoutUnitKey.layout;
+ TQString kbdLayout = layoutUnitKey.layout;
// TODO: need better algorithm here for determining if needs us group
if ( ! m_rules->isSingleGroup(kbdLayout)
@@ -505,7 +505,7 @@ void LayoutConfig::layoutSelChanged(QListViewItem *sel)
widget->chkLatin->setEnabled( false );
}
else {
- QString inc = sel->text(LAYOUT_COLUMN_INCLUDE);
+ TQString inc = sel->text(LAYOUT_COLUMN_INCLUDE);
if ( inc.startsWith("us") || inc.startsWith("en") ) {
widget->chkLatin->setChecked(true);
}
@@ -514,14 +514,14 @@ void LayoutConfig::layoutSelChanged(QListViewItem *sel)
}
}
- QStringList vars = m_rules->getAvailableVariants(kbdLayout);
+ TQStringList vars = m_rules->getAvailableVariants(kbdLayout);
kdDebug() << "layout " << kbdLayout << " has " << vars.count() << " variants" << endl;
if( vars.count() > 0 ) {
vars.prepend(DEFAULT_VARIANT_NAME);
widget->comboVariant->insertStringList(vars);
- QString variant = sel->text(LAYOUT_COLUMN_VARIANT);
+ TQString variant = sel->text(LAYOUT_COLUMN_VARIANT);
if( variant != NULL && variant.isEmpty() == false ) {
widget->comboVariant->setCurrentText(variant);
}
@@ -532,25 +532,25 @@ void LayoutConfig::layoutSelChanged(QListViewItem *sel)
updateLayoutCommand();
}
-QWidget* LayoutConfig::makeOptionsTab()
+TQWidget* LayoutConfig::makeOptionsTab()
{
- QListView *listView = widget->listOptions;
+ TQListView *listView = widget->listOptions;
listView->setMinimumHeight(150);
listView->setSortColumn( -1 );
listView->setColumnText( 0, i18n( "Options" ) );
listView->clear();
- connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed()));
- connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand()));
+ connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(changed()));
+ connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(updateOptionsCommand()));
- connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed()));
+ connect(widget->chkEnableOptions, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand()));
+ connect(widget->checkResetOld, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(widget->checkResetOld, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateOptionsCommand()));
//Create controllers for all options
- QDictIterator<char> it(m_rules->options());
+ TQDictIterator<char> it(m_rules->options());
OptionListItem *parent;
for (; it.current(); ++it)
{
@@ -559,14 +559,14 @@ QWidget* LayoutConfig::makeOptionsTab()
if( it.currentKey() == "ctrl" || it.currentKey() == "caps"
|| it.currentKey() == "altwin" ) {
parent = new OptionListItem(listView, i18n( it.current() ),
- QCheckListItem::RadioButtonController, it.currentKey());
+ TQCheckListItem::RadioButtonController, it.currentKey());
OptionListItem *item = new OptionListItem(parent, i18n( "None" ),
- QCheckListItem::RadioButton, "none");
- item->setState(QCheckListItem::On);
+ TQCheckListItem::RadioButton, "none");
+ item->setState(TQCheckListItem::On);
}
else {
parent = new OptionListItem(listView, i18n( it.current() ),
- QCheckListItem::CheckBoxController, it.currentKey());
+ TQCheckListItem::CheckBoxController, it.currentKey());
}
parent->setOpen(true);
m_optionGroups.insert(i18n(it.currentKey().local8Bit()), parent);
@@ -576,7 +576,7 @@ QWidget* LayoutConfig::makeOptionsTab()
it.toFirst();
for( ; it.current(); ++it)
{
- QString key = it.currentKey();
+ TQString key = it.currentKey();
int pos = key.find(':');
if (pos >= 0)
{
@@ -585,14 +585,14 @@ QWidget* LayoutConfig::makeOptionsTab()
parent = m_optionGroups["misc"];
if (parent != NULL) {
// workaroung for mistake in rules file for xkb options in XFree 4.2.0
- QString text(it.current());
+ TQString text(it.current());
text = text.replace( "Cap$", "Caps." );
- if( parent->type() == QCheckListItem::RadioButtonController )
+ if( parent->type() == TQCheckListItem::RadioButtonController )
new OptionListItem(parent, i18n(text.utf8()),
- QCheckListItem::RadioButton, key);
+ TQCheckListItem::RadioButton, key);
else
new OptionListItem(parent, i18n(text.utf8()),
- QCheckListItem::CheckBox, key);
+ TQCheckListItem::CheckBox, key);
}
}
}
@@ -604,8 +604,8 @@ QWidget* LayoutConfig::makeOptionsTab()
void LayoutConfig::updateOptionsCommand()
{
- QString setxkbmap;
- QString options = createOptionString();
+ TQString setxkbmap;
+ TQString options = createOptionString();
if( !options.isEmpty() ) {
setxkbmap = "setxkbmap -option "; //-rules " + m_rule
@@ -618,13 +618,13 @@ void LayoutConfig::updateOptionsCommand()
void LayoutConfig::updateLayoutCommand()
{
- QString setxkbmap;
- QString layoutDisplayName;
- QListViewItem* sel = widget->listLayoutsDst->selectedItem();
+ TQString setxkbmap;
+ TQString layoutDisplayName;
+ TQListViewItem* sel = widget->listLayoutsDst->selectedItem();
if( sel != NULL ) {
- QString kbdLayout = sel->text(LAYOUT_COLUMN_MAP);
- QString variant = widget->comboVariant->currentText();
+ TQString kbdLayout = sel->text(LAYOUT_COLUMN_MAP);
+ TQString variant = widget->comboVariant->currentText();
if( variant == DEFAULT_VARIANT_NAME )
variant = "";
@@ -640,9 +640,9 @@ void LayoutConfig::updateLayoutCommand()
layoutDisplayName = sel->text(LAYOUT_COLUMN_DISPLAY_NAME);
if( layoutDisplayName.isEmpty() ) {
int count = 0;
- QListViewItem *item = widget->listLayoutsDst->firstChild();
+ TQListViewItem *item = widget->listLayoutsDst->firstChild();
while (item) {
- QString layout_ = item->text(LAYOUT_COLUMN_MAP);
+ TQString layout_ = item->text(LAYOUT_COLUMN_MAP);
if( layout_ == kbdLayout )
++count;
item = item->nextSibling();
@@ -680,8 +680,8 @@ void LayoutConfig::loadRules()
delete m_rules;
m_rules = new XkbRules();
- QStringList modelsList;
- QDictIterator<char> it(m_rules->models());
+ TQStringList modelsList;
+ TQDictIterator<char> it(m_rules->models());
while (it.current()) {
modelsList.append(i18n(it.current()));
++it;
@@ -695,35 +695,35 @@ void LayoutConfig::loadRules()
// fill in the additional layouts
widget->listLayoutsSrc->clear();
widget->listLayoutsDst->clear();
- QDictIterator<char> it2(m_rules->layouts());
+ TQDictIterator<char> it2(m_rules->layouts());
while (it2.current())
{
- QString layout = it2.currentKey();
- QString layoutName = it2.current();
- QListViewItem *item = new QListViewItem(widget->listLayoutsSrc);
+ TQString layout = it2.currentKey();
+ TQString layoutName = it2.current();
+ TQListViewItem *item = new TQListViewItem(widget->listLayoutsSrc);
item->setPixmap(LAYOUT_COLUMN_FLAG, LayoutIcon::getInstance().findPixmap(layout, true));
item->setText(LAYOUT_COLUMN_NAME, i18n(layoutName.latin1()));
item->setText(LAYOUT_COLUMN_MAP, layout);
++it2;
}
- widget->listLayoutsSrc->setSorting(LAYOUT_COLUMN_NAME); // from Qt3 QListView sorts by language
+ widget->listLayoutsSrc->setSorting(LAYOUT_COLUMN_NAME); // from Qt3 TQListView sorts by language
//TODO: reset options and xkb options
}
-QString LayoutConfig::createOptionString()
+TQString LayoutConfig::createOptionString()
{
- QString options;
- for (QDictIterator<char> it(m_rules->options()); it.current(); ++it)
+ TQString options;
+ for (TQDictIterator<char> it(m_rules->options()); it.current(); ++it)
{
- QString option(it.currentKey());
+ TQString option(it.currentKey());
if (option.contains(':')) {
- QString optionKey = option.mid(0, option.find(':'));
+ TQString optionKey = option.mid(0, option.find(':'));
OptionListItem *item = m_optionGroups[optionKey];
if( !item ) {
@@ -735,8 +735,8 @@ QString LayoutConfig::createOptionString()
OptionListItem *child = item->findChildItem( option );
if ( child ) {
- if ( child->state() == QCheckListItem::On ) {
- QString selectedName = child->optionName();
+ if ( child->state() == TQCheckListItem::On ) {
+ TQString selectedName = child->optionName();
if ( !selectedName.isEmpty() && selectedName != "none" ) {
if (!options.isEmpty())
options.append(',');
@@ -763,19 +763,19 @@ void LayoutConfig::defaults()
}
-OptionListItem::OptionListItem( OptionListItem *parent, const QString &text,
- Type tt, const QString &optionName )
- : QCheckListItem( parent, text, tt ), m_OptionName( optionName )
+OptionListItem::OptionListItem( OptionListItem *parent, const TQString &text,
+ Type tt, const TQString &optionName )
+ : TQCheckListItem( parent, text, tt ), m_OptionName( optionName )
{
}
-OptionListItem::OptionListItem( QListView *parent, const QString &text,
- Type tt, const QString &optionName )
- : QCheckListItem( parent, text, tt ), m_OptionName( optionName )
+OptionListItem::OptionListItem( TQListView *parent, const TQString &text,
+ Type tt, const TQString &optionName )
+ : TQCheckListItem( parent, text, tt ), m_OptionName( optionName )
{
}
-OptionListItem * OptionListItem::findChildItem( const QString& optionName )
+OptionListItem * OptionListItem::findChildItem( const TQString& optionName )
{
OptionListItem *child = static_cast<OptionListItem *>( firstChild() );
@@ -792,12 +792,12 @@ OptionListItem * OptionListItem::findChildItem( const QString& optionName )
extern "C"
{
- KDE_EXPORT KCModule *create_keyboard_layout(QWidget *parent, const char *)
+ KDE_EXPORT KCModule *create_keyboard_layout(TQWidget *parent, const char *)
{
return new LayoutConfig(parent, "kcmlayout");
}
- KDE_EXPORT KCModule *create_keyboard(QWidget *parent, const char *)
+ KDE_EXPORT KCModule *create_keyboard(TQWidget *parent, const char *)
{
return new KeyboardConfig(parent, "kcmlayout");
}
diff --git a/kxkb/kcmlayout.h b/kxkb/kcmlayout.h
index 76c8b6d55..6f61e9e06 100644
--- a/kxkb/kcmlayout.h
+++ b/kxkb/kcmlayout.h
@@ -4,8 +4,8 @@
#include <kcmodule.h>
-#include <qstring.h>
-#include <qlistview.h>
+#include <tqstring.h>
+#include <tqlistview.h>
#include "kxkbconfig.h"
@@ -19,7 +19,7 @@ class LayoutConfig : public KCModule
Q_OBJECT
public:
- LayoutConfig(QWidget *parent = 0L, const char *name = 0L);
+ LayoutConfig(TQWidget *parent = 0L, const char *name = 0L);
virtual ~LayoutConfig();
void load();
@@ -28,16 +28,16 @@ public:
void initUI();
protected:
- QString createOptionString();
- void updateIndicator(QListViewItem* selLayout);
+ TQString createOptionString();
+ void updateIndicator(TQListViewItem* selLayout);
protected slots:
void moveUp();
void moveDown();
void variantChanged();
- void displayNameChanged(const QString& name);
+ void displayNameChanged(const TQString& name);
void latinChanged();
- void layoutSelChanged(QListViewItem *);
+ void layoutSelChanged(TQListViewItem *);
void loadRules();
void updateLayoutCommand();
void updateOptionsCommand();
@@ -51,11 +51,11 @@ private:
XkbRules *m_rules;
KxkbConfig m_kxkbConfig;
- QDict<OptionListItem> m_optionGroups;
+ TQDict<OptionListItem> m_optionGroups;
- QWidget* makeOptionsTab();
+ TQWidget* makeOptionsTab();
void updateStickyLimit();
- static LayoutUnit getLayoutUnitKey(QListViewItem *sel);
+ static LayoutUnit getLayoutUnitKey(TQListViewItem *sel);
};
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
index 3453c4abb..f66ea587c 100644
--- a/kxkb/kcmmisc.cpp
+++ b/kxkb/kcmmisc.cpp
@@ -28,14 +28,14 @@
#include <config.h>
#include <math.h>
-#include <qslider.h>
-#include <qfileinfo.h>
-#include <qcheckbox.h>
-#include <qstring.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qvbuttongroup.h>
-#include <qradiobutton.h>
+#include <tqslider.h>
+#include <tqfileinfo.h>
+#include <tqcheckbox.h>
+#include <tqstring.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
+#include <tqvbuttongroup.h>
+#include <tqradiobutton.h>
#include <klocale.h>
#include <kconfig.h>
@@ -50,11 +50,11 @@
#include "kcmmiscwidget.h"
#include <X11/Xlib.h>
-KeyboardConfig::KeyboardConfig (QWidget * parent, const char *)
+KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *)
: KCModule (parent, "kcmlayout")
{
- QString wtstr;
- QBoxLayout* lay = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQString wtstr;
+ TQBoxLayout* lay = new TQVBoxLayout(this, 0, KDialog::spacingHint());
ui = new KeyboardConfigWidget(this, "ui");
lay->addWidget(ui);
lay->addStretch();
@@ -73,14 +73,14 @@ KeyboardConfig::KeyboardConfig (QWidget * parent, const char *)
ui->rateSlider->setSteps(30, 500);
ui->rateSlider->setTickInterval(498);
- connect(ui->repeatBox, SIGNAL(clicked()), this, SLOT(changed()));
- connect(ui->delay, SIGNAL(valueChanged(int)), this, SLOT(delaySpinboxChanged(int)));
- connect(ui->delaySlider, SIGNAL(valueChanged(int)), this, SLOT(delaySliderChanged(int)));
- connect(ui->rate, SIGNAL(valueChanged(double)), this, SLOT(rateSpinboxChanged(double)));
- connect(ui->rateSlider, SIGNAL(valueChanged(int)), this, SLOT(rateSliderChanged(int)));
+ connect(ui->repeatBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(ui->delay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(delaySpinboxChanged(int)));
+ connect(ui->delaySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(delaySliderChanged(int)));
+ connect(ui->rate, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(rateSpinboxChanged(double)));
+ connect(ui->rateSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rateSliderChanged(int)));
- connect(ui->click, SIGNAL(valueChanged(int)), this, SLOT(changed()));
- connect(ui->numlockGroup, SIGNAL(released(int)), this, SLOT(changed()));
+ connect(ui->click, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+ connect(ui->numlockGroup, TQT_SIGNAL(released(int)), this, TQT_SLOT(changed()));
#if !defined(HAVE_XTEST) && !defined(HAVE_XKB)
ui->numlockGroup->setDisabled( true );
@@ -113,7 +113,7 @@ void KeyboardConfig::setClick(int v)
int KeyboardConfig::getNumLockState()
{
- QButton* selected = ui->numlockGroup->selected();
+ TQButton* selected = ui->numlockGroup->selected();
if( selected == NULL )
return 2;
int ret = ui->numlockGroup->id( selected );
@@ -183,9 +183,9 @@ void KeyboardConfig::defaults()
setNumLockState( 2 );
}
-QString KeyboardConfig::quickHelp() const
+TQString KeyboardConfig::quickHelp() const
{
- return QString::null;
+ return TQString::null;
/* "<h1>Keyboard</h1> This module allows you to choose options"
" for the way in which your keyboard works. The actual effect of"
@@ -470,12 +470,12 @@ void set_repeatrate(int delay, double rate)
else
r = (int)floor(rate + 0.5);
- QString exe = KGlobal::dirs()->findExe("xset");
+ TQString exe = KGlobal::dirs()->findExe("xset");
if (exe.isEmpty())
return;
KProcess p;
- p << exe << "r" << "rate" << QString::number(delay) << QString::number(r);
+ p << exe << "r" << "rate" << TQString::number(delay) << TQString::number(r);
p.start(KProcess::Block);
}
diff --git a/kxkb/kcmmisc.h b/kxkb/kcmmisc.h
index 02829cd20..52b7a046f 100644
--- a/kxkb/kcmmisc.h
+++ b/kxkb/kcmmisc.h
@@ -34,13 +34,13 @@ class KeyboardConfig : public KCModule
{
Q_OBJECT
public:
- KeyboardConfig( QWidget *parent=0, const char* name=0);
+ KeyboardConfig( TQWidget *parent=0, const char* name=0);
void save();
void load();
void defaults();
- QString quickHelp() const;
+ TQString quickHelp() const;
static void init_keyboard();
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp
index 114ddc7a9..43e9f8046 100644
--- a/kxkb/kxkb.cpp
+++ b/kxkb/kxkb.cpp
@@ -27,10 +27,10 @@ DESCRIPTION
#include <stdlib.h>
#include <assert.h>
-#include <qregexp.h>
-#include <qfile.h>
-#include <qstringlist.h>
-#include <qimage.h>
+#include <tqregexp.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
+#include <tqimage.h>
#include <kaboutdata.h>
#include <kcmdlineargs.h>
@@ -79,7 +79,7 @@ KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled)
m_layoutOwnerMap = new LayoutMap(kxkbConfig);
- connect( this, SIGNAL(settingsChanged(int)), SLOT(slotSettingsChanged(int)) );
+ connect( this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)) );
addKipcEventMask( KIPC::SettingsChanged );
}
@@ -129,7 +129,7 @@ bool KXKBApp::settingsRead()
kWinModule = NULL;
}
else {
- QDesktopWidget desktopWidget;
+ TQDesktopWidget desktopWidget;
if( desktopWidget.numScreens() > 1 && desktopWidget.isVirtualDesktop() == false ) {
kdWarning() << "With non-virtual desktop only global switching policy supported on non-primary screens" << endl;
//TODO: find out how to handle that
@@ -137,7 +137,7 @@ bool KXKBApp::settingsRead()
if( kWinModule == NULL ) {
kWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP);
- connect(kWinModule, SIGNAL(activeWindowChanged(WId)), SLOT(windowChanged(WId)));
+ connect(kWinModule, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(windowChanged(WId)));
}
m_prevWinId = kWinModule->activeWindow();
kdDebug() << "Active window " << m_prevWinId << endl;
@@ -158,9 +158,9 @@ bool KXKBApp::settingsRead()
m_currentLayout = kxkbConfig.getDefaultLayout();
if( kxkbConfig.m_layouts.count() == 1 ) {
- QString layoutName = m_currentLayout.layout;
- QString variantName = m_currentLayout.variant;
- QString includeName = m_currentLayout.includeGroup;
+ TQString layoutName = m_currentLayout.layout;
+ TQString variantName = m_currentLayout.variant;
+ TQString includeName = m_currentLayout.includeGroup;
int group = m_currentLayout.defaultGroup;
if( !m_extension->setLayout(kxkbConfig.m_model, layoutName, variantName, includeName, false)
@@ -196,8 +196,8 @@ void KXKBApp::initTray()
// popupMenu->insertTitle( kapp->miniIcon(), kapp->caption() );
m_tray = new KxkbLabelController(sysTray, popupMenu);
- connect(popupMenu, SIGNAL(activated(int)), this, SLOT(menuActivated(int)));
- connect(sysTray, SIGNAL(toggled()), this, SLOT(toggled()));
+ connect(popupMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuActivated(int)));
+ connect(sysTray, TQT_SIGNAL(toggled()), this, TQT_SLOT(toggled()));
}
m_tray->setShowFlag(kxkbConfig.m_showFlag);
@@ -214,7 +214,7 @@ void KXKBApp::layoutApply()
}
// kdcop
-bool KXKBApp::setLayout(const QString& layoutPair)
+bool KXKBApp::setLayout(const TQString& layoutPair)
{
const LayoutUnit layoutUnitKey(layoutPair);
if( kxkbConfig.m_layouts.contains(layoutUnitKey) ) {
@@ -347,18 +347,18 @@ This is done by loading each one of them and then dumping the compiled
map from the X server into our local buffer.*/
// void KXKBApp::initPrecompiledLayouts()
// {
-// QStringList dirs = KGlobal::dirs()->findDirs ( "tmp", "" );
-// QString tempDir = dirs.count() == 0 ? "/tmp/" : dirs[0];
+// TQStringList dirs = KGlobal::dirs()->findDirs ( "tmp", "" );
+// TQString tempDir = dirs.count() == 0 ? "/tmp/" : dirs[0];
//
-// QValueList<LayoutUnit>::ConstIterator end = kxkbConfig.m_layouts.end();
+// TQValueList<LayoutUnit>::ConstIterator end = kxkbConfig.m_layouts.end();
//
-// for (QValueList<LayoutUnit>::ConstIterator it = kxkbConfig.m_layouts.begin(); it != end; ++it)
+// for (TQValueList<LayoutUnit>::ConstIterator it = kxkbConfig.m_layouts.begin(); it != end; ++it)
// {
// LayoutUnit layoutUnit(*it);
// // const char* baseGr = m_includes[layout];
// // int group = m_rules->getGroup(layout, baseGr);
// // if( m_extension->setLayout(m_model, layout, m_variants[layout], group, baseGr) ) {
-// QString compiledLayoutFileName = tempDir + layoutUnit.layout + "." + layoutUnit.variant + ".xkm";
+// TQString compiledLayoutFileName = tempDir + layoutUnit.layout + "." + layoutUnit.variant + ".xkm";
// // if( m_extension->getCompiledLayout(compiledLayoutFileName) )
// m_compiledLayoutFileNames[layoutUnit.toPair()] = compiledLayoutFileName;
// // }
diff --git a/kxkb/kxkb.h b/kxkb/kxkb.h
index 914ae0f92..fc05c620a 100644
--- a/kxkb/kxkb.h
+++ b/kxkb/kxkb.h
@@ -26,10 +26,10 @@ DESCRIPTION
#define __K_XKB_H__
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qdict.h>
-#include <qptrqueue.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqdict.h>
+#include <tqptrqueue.h>
#include <kuniqueapplication.h>
@@ -60,9 +60,9 @@ public:
bool setLayout(const LayoutUnit& layoutUnit, int group=-1);
k_dcop:
- bool setLayout(const QString& layoutPair);
- QString getCurrentLayout() { return m_currentLayout.toPair(); }
- QStringList getLayoutsList() { return kxkbConfig.getLayoutStringList(); }
+ bool setLayout(const TQString& layoutPair);
+ TQString getCurrentLayout() { return m_currentLayout.toPair(); }
+ TQStringList getLayoutsList() { return kxkbConfig.getLayoutStringList(); }
void forceSetXKBMap( bool set );
protected slots:
diff --git a/kxkb/kxkbbindings.cpp b/kxkb/kxkbbindings.cpp
index d8cfc36d5..3a6137ee1 100644
--- a/kxkb/kxkbbindings.cpp
+++ b/kxkb/kxkbbindings.cpp
@@ -1,9 +1,9 @@
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4, this, SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) )
#else
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), QString::null, key3, key4 )
+ keys->insert( name, i18n(name), TQString::null, key3, key4 )
#endif
keys->insert( "Program:kxkb", i18n("Keyboard") );
diff --git a/kxkb/kxkbconfig.cpp b/kxkb/kxkbconfig.cpp
index 4164a06c3..0e62fbc21 100644
--- a/kxkb/kxkbconfig.cpp
+++ b/kxkb/kxkbconfig.cpp
@@ -11,9 +11,9 @@
//
#include <assert.h>
-#include <qregexp.h>
-#include <qstringlist.h>
-#include <qdict.h>
+#include <tqregexp.h>
+#include <tqstringlist.h>
+#include <tqdict.h>
#include <kconfig.h>
#include <kdebug.h>
@@ -63,12 +63,12 @@ bool KxkbConfig::load(int loadMode)
m_model = config->readEntry("Model", DEFAULT_MODEL);
kdDebug() << "Model: " << m_model << endl;
- QStringList layoutList;
+ TQStringList layoutList;
if( config->hasKey("LayoutList") ) {
layoutList = config->readListEntry("LayoutList");
}
else { // old config
- QString mainLayout = config->readEntry("Layout", DEFAULT_LAYOUT_UNIT.toPair());
+ TQString mainLayout = config->readEntry("Layout", DEFAULT_LAYOUT_UNIT.toPair());
layoutList = config->readListEntry("Additional");
layoutList.prepend(mainLayout);
}
@@ -76,16 +76,16 @@ bool KxkbConfig::load(int loadMode)
layoutList.append("us");
m_layouts.clear();
- for(QStringList::ConstIterator it = layoutList.begin(); it != layoutList.end() ; ++it) {
+ for(TQStringList::ConstIterator it = layoutList.begin(); it != layoutList.end() ; ++it) {
m_layouts.append( LayoutUnit(*it) );
kdDebug() << " layout " << LayoutUnit(*it).toPair() << " in list: " << m_layouts.contains( LayoutUnit(*it) ) << endl;
}
kdDebug() << "Found " << m_layouts.count() << " layouts, default is " << getDefaultLayout().toPair() << endl;
- QStringList displayNamesList = config->readListEntry("DisplayNames", ',');
- for(QStringList::ConstIterator it = displayNamesList.begin(); it != displayNamesList.end() ; ++it) {
- QStringList displayNamePair = QStringList::split(':', *it );
+ TQStringList displayNamesList = config->readListEntry("DisplayNames", ',');
+ for(TQStringList::ConstIterator it = displayNamesList.begin(); it != displayNamesList.end() ; ++it) {
+ TQStringList displayNamePair = TQStringList::split(':', *it );
if( displayNamePair.count() == 2 ) {
LayoutUnit layoutUnit( displayNamePair[0] );
if( m_layouts.contains( layoutUnit ) ) {
@@ -97,9 +97,9 @@ bool KxkbConfig::load(int loadMode)
// m_includes.clear();
if( X11Helper::areSingleGroupsSupported() ) {
if( config->hasKey("IncludeGroups") ) {
- QStringList includeList = config->readListEntry("IncludeGroups", ',');
- for(QStringList::ConstIterator it = includeList.begin(); it != includeList.end() ; ++it) {
- QStringList includePair = QStringList::split(':', *it );
+ TQStringList includeList = config->readListEntry("IncludeGroups", ',');
+ for(TQStringList::ConstIterator it = includeList.begin(); it != includeList.end() ; ++it) {
+ TQStringList includePair = TQStringList::split(':', *it );
if( includePair.count() == 2 ) {
LayoutUnit layoutUnit( includePair[0] );
if( m_layouts.contains( layoutUnit ) ) {
@@ -111,13 +111,13 @@ bool KxkbConfig::load(int loadMode)
}
else { //old includes format
kdDebug() << "Old includes..." << endl;
- QStringList includeList = config->readListEntry("Includes");
- for(QStringList::ConstIterator it = includeList.begin(); it != includeList.end() ; ++it) {
- QString layoutName = LayoutUnit::parseLayout( *it );
+ TQStringList includeList = config->readListEntry("Includes");
+ for(TQStringList::ConstIterator it = includeList.begin(); it != includeList.end() ; ++it) {
+ TQString layoutName = LayoutUnit::parseLayout( *it );
LayoutUnit layoutUnit( layoutName, "" );
kdDebug() << "old layout for inc: " << layoutUnit.toPair() << " included " << m_layouts.contains( layoutUnit ) << endl;
if( m_layouts.contains( layoutUnit ) ) {
- QString variantName = LayoutUnit::parseVariant(*it);
+ TQString variantName = LayoutUnit::parseVariant(*it);
m_layouts[m_layouts.findIndex(layoutUnit)].includeGroup = variantName;
kdDebug() << "Got inc group: " << layoutUnit.toPair() << ": " << variantName << endl;
}
@@ -128,7 +128,7 @@ bool KxkbConfig::load(int loadMode)
m_showSingle = config->readBoolEntry("ShowSingle", false);
m_showFlag = config->readBoolEntry("ShowFlag", true);
- QString layoutOwner = config->readEntry("SwitchMode", "Global");
+ TQString layoutOwner = config->readEntry("SwitchMode", "Global");
if( layoutOwner == "WinClass" ) {
m_switchingPolicy = SWITCH_POLICY_WIN_CLASS;
@@ -180,25 +180,25 @@ void KxkbConfig::save()
config->writeEntry("ResetOldOptions", m_resetOldOptions);
config->writeEntry("Options", m_options );
- QStringList layoutList;
- QStringList includeList;
- QStringList displayNamesList;
+ TQStringList layoutList;
+ TQStringList includeList;
+ TQStringList displayNamesList;
- QValueList<LayoutUnit>::ConstIterator it;
+ TQValueList<LayoutUnit>::ConstIterator it;
for(it = m_layouts.begin(); it != m_layouts.end(); ++it) {
const LayoutUnit& layoutUnit = *it;
layoutList.append( layoutUnit.toPair() );
if( layoutUnit.includeGroup.isEmpty() == false ) {
- QString incGroupUnit = QString("%1:%2").arg(layoutUnit.toPair(), layoutUnit.includeGroup);
+ TQString incGroupUnit = TQString("%1:%2").arg(layoutUnit.toPair(), layoutUnit.includeGroup);
includeList.append( incGroupUnit );
}
- QString displayName( layoutUnit.displayName );
+ TQString displayName( layoutUnit.displayName );
kdDebug() << " displayName " << layoutUnit.toPair() << " : " << displayName << endl;
if( displayName.isEmpty() == false && displayName != layoutUnit.layout ) {
- displayName = QString("%1:%2").arg(layoutUnit.toPair(), displayName);
+ displayName = TQString("%1:%2").arg(layoutUnit.toPair(), displayName);
displayNamesList.append( displayName );
}
}
@@ -257,10 +257,10 @@ void KxkbConfig::setDefaults()
m_stickySwitchingDepth = 2;
}
-QStringList KxkbConfig::getLayoutStringList(/*bool compact*/)
+TQStringList KxkbConfig::getLayoutStringList(/*bool compact*/)
{
- QStringList layoutList;
- for(QValueList<LayoutUnit>::ConstIterator it = m_layouts.begin(); it != m_layouts.end(); ++it) {
+ TQStringList layoutList;
+ for(TQValueList<LayoutUnit>::ConstIterator it = m_layouts.begin(); it != m_layouts.end(); ++it) {
const LayoutUnit& layoutUnit = *it;
layoutList.append( layoutUnit.toPair() );
}
@@ -268,17 +268,17 @@ QStringList KxkbConfig::getLayoutStringList(/*bool compact*/)
}
-QString KxkbConfig::getDefaultDisplayName(const QString& code_)
+TQString KxkbConfig::getDefaultDisplayName(const TQString& code_)
{
- QString displayName;
+ TQString displayName;
if( code_.length() <= 2 ) {
displayName = code_;
}
else {
- int sepPos = code_.find(QRegExp("[-_]"));
- QString leftCode = code_.mid(0, sepPos);
- QString rightCode;
+ int sepPos = code_.find(TQRegExp("[-_]"));
+ TQString leftCode = code_.mid(0, sepPos);
+ TQString rightCode;
if( sepPos != -1 )
rightCode = code_.mid(sepPos+1);
@@ -291,12 +291,12 @@ QString KxkbConfig::getDefaultDisplayName(const QString& code_)
return displayName;
}
-QString KxkbConfig::getDefaultDisplayName(const LayoutUnit& layoutUnit, bool single)
+TQString KxkbConfig::getDefaultDisplayName(const LayoutUnit& layoutUnit, bool single)
{
if( layoutUnit.variant == "" )
return getDefaultDisplayName( layoutUnit.layout );
- QString displayName = layoutUnit.layout.left(2);
+ TQString displayName = layoutUnit.layout.left(2);
if( single == false )
displayName += layoutUnit.variant.left(1);
return displayName;
@@ -307,11 +307,11 @@ QString KxkbConfig::getDefaultDisplayName(const LayoutUnit& layoutUnit, bool sin
* @param[in] layvar String in form layout(variant) to parse
* @return The layout found in the string
*/
-const QString LayoutUnit::parseLayout(const QString &layvar)
+const TQString LayoutUnit::parseLayout(const TQString &layvar)
{
static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_/-]*";
- QString varLine = layvar.stripWhiteSpace();
- QRegExp rx(LAYOUT_PATTERN);
+ TQString varLine = layvar.stripWhiteSpace();
+ TQRegExp rx(LAYOUT_PATTERN);
int pos = rx.search(varLine, 0);
int len = rx.matchedLength();
// check for errors
@@ -326,11 +326,11 @@ const QString LayoutUnit::parseLayout(const QString &layvar)
* @param[in] layvar String in form layout(variant) to parse
* @return The variant found in the string, no check is performed
*/
-const QString LayoutUnit::parseVariant(const QString &layvar)
+const TQString LayoutUnit::parseVariant(const TQString &layvar)
{
static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)";
- QString varLine = layvar.stripWhiteSpace();
- QRegExp rx(VARIANT_PATTERN);
+ TQString varLine = layvar.stripWhiteSpace();
+ TQRegExp rx(VARIANT_PATTERN);
int pos = rx.search(varLine, 0);
int len = rx.matchedLength();
// check for errors
diff --git a/kxkb/kxkbconfig.h b/kxkb/kxkbconfig.h
index df32b026c..82fe610c9 100644
--- a/kxkb/kxkbconfig.h
+++ b/kxkb/kxkbconfig.h
@@ -12,10 +12,10 @@
#ifndef KXKBCONFIG_H
#define KXKBCONFIG_H
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qptrqueue.h>
-#include <qmap.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqptrqueue.h>
+#include <tqmap.h>
/* Utility classes for per-window/per-application layout implementation
@@ -29,37 +29,37 @@ enum SwitchingPolicy {
-inline QString createPair(QString key, QString value)
+inline TQString createPair(TQString key, TQString value)
{
if( value.isEmpty() )
return key;
- return QString("%1(%2)").arg(key, value);
+ return TQString("%1(%2)").arg(key, value);
}
struct LayoutUnit {
- QString layout;
- QString variant;
- QString includeGroup;
- QString displayName;
+ TQString layout;
+ TQString variant;
+ TQString includeGroup;
+ TQString displayName;
int defaultGroup;
LayoutUnit() {}
- LayoutUnit(QString layout_, QString variant_):
+ LayoutUnit(TQString layout_, TQString variant_):
layout(layout_),
variant(variant_)
{}
- LayoutUnit(QString pair) {
+ LayoutUnit(TQString pair) {
setFromPair( pair );
}
- void setFromPair(const QString& pair) {
+ void setFromPair(const TQString& pair) {
layout = parseLayout(pair);
variant = parseVariant(pair);
}
- QString toPair() const {
+ TQString toPair() const {
return createPair(layout, variant);
}
@@ -78,8 +78,8 @@ struct LayoutUnit {
}
//private:
- static const QString parseLayout(const QString &layvar);
- static const QString parseVariant(const QString &layvar);
+ static const TQString parseLayout(const TQString &layvar);
+ static const TQString parseVariant(const TQString &layvar);
};
extern const LayoutUnit DEFAULT_LAYOUT_UNIT;
@@ -100,9 +100,9 @@ public:
bool m_stickySwitching;
int m_stickySwitchingDepth;
- QString m_model;
- QString m_options;
- QValueList<LayoutUnit> m_layouts;
+ TQString m_model;
+ TQString m_options;
+ TQValueList<LayoutUnit> m_layouts;
LayoutUnit getDefaultLayout();
@@ -110,12 +110,12 @@ public:
void save();
void setDefaults();
- QStringList getLayoutStringList(/*bool compact*/);
- static QString getDefaultDisplayName(const QString& code_);
- static QString getDefaultDisplayName(const LayoutUnit& layoutUnit, bool single=false);
+ TQStringList getLayoutStringList(/*bool compact*/);
+ static TQString getDefaultDisplayName(const TQString& code_);
+ static TQString getDefaultDisplayName(const LayoutUnit& layoutUnit, bool single=false);
private:
- static const QMap<QString, QString> parseIncludesMap(const QStringList& pairList);
+ static const TQMap<TQString, TQString> parseIncludesMap(const TQStringList& pairList);
};
diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp
index 50fab7323..749ef4353 100644
--- a/kxkb/kxkbtraywindow.cpp
+++ b/kxkb/kxkbtraywindow.cpp
@@ -9,7 +9,7 @@
// Copyright: See COPYING file that comes with this distribution
//
//
-#include <qtooltip.h>
+#include <tqtooltip.h>
#include <kdebug.h>
#include <klocale.h>
@@ -25,7 +25,7 @@
#include "kxkbconfig.h"
-KxkbLabelController::KxkbLabelController(QLabel* label_, QPopupMenu* contextMenu_) :
+KxkbLabelController::KxkbLabelController(TQLabel* label_, TQPopupMenu* contextMenu_) :
label(label_),
contextMenu(contextMenu_),
m_menuStartIndex(contextMenu_->count()),
@@ -35,13 +35,13 @@ KxkbLabelController::KxkbLabelController(QLabel* label_, QPopupMenu* contextMenu
// kdDebug() << "Creating KxkbLabelController with startMenuIndex " << m_menuStartIndex << endl;
}
-void KxkbLabelController::setToolTip(const QString& tip)
+void KxkbLabelController::setToolTip(const TQString& tip)
{
- QToolTip::remove(label);
- QToolTip::add(label, tip);
+ TQToolTip::remove(label);
+ TQToolTip::add(label, tip);
}
-void KxkbLabelController::setPixmap(const QPixmap& pixmap)
+void KxkbLabelController::setPixmap(const TQPixmap& pixmap)
{
KIconEffect iconeffect;
label->setPixmap( iconeffect.apply(pixmap, KIcon::Panel, KIcon::DefaultState) );
@@ -55,19 +55,19 @@ void KxkbLabelController::setCurrentLayout(const LayoutUnit& layoutUnit)
}
-void KxkbLabelController::setError(const QString& layoutInfo)
+void KxkbLabelController::setError(const TQString& layoutInfo)
{
- QString msg = i18n("Error changing keyboard layout to '%1'").arg(layoutInfo);
+ TQString msg = i18n("Error changing keyboard layout to '%1'").arg(layoutInfo);
setToolTip(msg);
label->setPixmap(LayoutIcon::getInstance().findPixmap("error", m_showFlag));
}
-void KxkbLabelController::initLayoutList(const QValueList<LayoutUnit>& layouts, const XkbRules& rules)
+void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts, const XkbRules& rules)
{
// KPopupMenu* menu = contextMenu();
- QPopupMenu* menu = contextMenu;
+ TQPopupMenu* menu = contextMenu;
// int index = menu->indexOf(0);
m_descriptionMap.clear();
@@ -84,16 +84,16 @@ void KxkbLabelController::initLayoutList(const QValueList<LayoutUnit>& layouts,
KIconEffect iconeffect;
int cnt = 0;
- QValueList<LayoutUnit>::ConstIterator it;
+ TQValueList<LayoutUnit>::ConstIterator it;
for (it=layouts.begin(); it != layouts.end(); ++it)
{
- const QString layoutName = (*it).layout;
- const QString variantName = (*it).variant;
+ const TQString layoutName = (*it).layout;
+ const TQString variantName = (*it).variant;
- const QPixmap& layoutPixmap = LayoutIcon::getInstance().findPixmap(layoutName, m_showFlag, (*it).displayName);
- const QPixmap pix = iconeffect.apply(layoutPixmap, KIcon::Small, KIcon::DefaultState);
+ const TQPixmap& layoutPixmap = LayoutIcon::getInstance().findPixmap(layoutName, m_showFlag, (*it).displayName);
+ const TQPixmap pix = iconeffect.apply(layoutPixmap, KIcon::Small, KIcon::DefaultState);
- QString fullName = i18n((rules.layouts()[layoutName]));
+ TQString fullName = i18n((rules.layouts()[layoutName]));
if( variantName.isEmpty() == false )
fullName += " (" + variantName + ")";
contextMenu->insertItem(pix, fullName, START_MENU_ID + cnt, m_menuStartIndex + cnt);
@@ -114,15 +114,15 @@ void KxkbLabelController::initLayoutList(const QValueList<LayoutUnit>& layouts,
/* if( index != -1 ) { //not first start
menu->insertSeparator();
- KAction* quitAction = KStdAction::quit(this, SIGNAL(quitSelected()), actionCollection());
+ KAction* quitAction = KStdAction::quit(this, TQT_SIGNAL(quitSelected()), actionCollection());
if (quitAction)
quitAction->plug(menu);
}*/
}
-// void KxkbLabelController::mouseReleaseEvent(QMouseEvent *ev)
+// void KxkbLabelController::mouseReleaseEvent(TQMouseEvent *ev)
// {
-// if (ev->button() == QMouseEvent::LeftButton)
+// if (ev->button() == TQMouseEvent::LeftButton)
// emit toggled();
// KSystemTray::mouseReleaseEvent(ev);
// }
diff --git a/kxkb/kxkbtraywindow.h b/kxkb/kxkbtraywindow.h
index 9c2c070c6..4c58c5871 100644
--- a/kxkb/kxkbtraywindow.h
+++ b/kxkb/kxkbtraywindow.h
@@ -14,8 +14,8 @@
#include <ksystemtray.h>
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
#include "kxkbconfig.h"
@@ -35,12 +35,12 @@ class KxkbLabelController: public QObject
public:
enum { START_MENU_ID = 100, CONFIG_MENU_ID = 130, HELP_MENU_ID = 131 };
- KxkbLabelController(QLabel *label, QPopupMenu* contextMenu);
+ KxkbLabelController(TQLabel *label, TQPopupMenu* contextMenu);
- void initLayoutList(const QValueList<LayoutUnit>& layouts, const XkbRules& rule);
+ void initLayoutList(const TQValueList<LayoutUnit>& layouts, const XkbRules& rule);
void setCurrentLayout(const LayoutUnit& layout);
-// void setCurrentLayout(const QString& layout, const QString &variant);
- void setError(const QString& layoutInfo="");
+// void setCurrentLayout(const TQString& layout, const TQString &variant);
+ void setError(const TQString& layoutInfo="");
void setShowFlag(bool showFlag) { m_showFlag = showFlag; }
void show() { label->show(); }
@@ -51,19 +51,19 @@ public:
// protected:
//
-// void mouseReleaseEvent(QMouseEvent *);
+// void mouseReleaseEvent(TQMouseEvent *);
private:
- QLabel* label;
- QPopupMenu* contextMenu;
+ TQLabel* label;
+ TQPopupMenu* contextMenu;
const int m_menuStartIndex;
bool m_showFlag;
int m_prevLayoutCount;
- QMap<QString, QString> m_descriptionMap;
+ TQMap<TQString, TQString> m_descriptionMap;
- void setToolTip(const QString& tip);
- void setPixmap(const QPixmap& pixmap);
+ void setToolTip(const TQString& tip);
+ void setPixmap(const TQPixmap& pixmap);
};
@@ -76,9 +76,9 @@ class KxkbSystemTray : public KSystemTray
KSystemTray(NULL)
{}
- void mouseReleaseEvent(QMouseEvent *ev)
+ void mouseReleaseEvent(TQMouseEvent *ev)
{
- if (ev->button() == QMouseEvent::LeftButton)
+ if (ev->button() == TQMouseEvent::LeftButton)
emit toggled();
KSystemTray::mouseReleaseEvent(ev);
}
diff --git a/kxkb/layoutmap.cpp b/kxkb/layoutmap.cpp
index f6273c967..9c13fc49b 100644
--- a/kxkb/layoutmap.cpp
+++ b/kxkb/layoutmap.cpp
@@ -47,14 +47,14 @@ void LayoutMap::setCurrentWindow(WId winId)
// private
//LayoutQueue&
-QPtrQueue<LayoutState>& LayoutMap::getCurrentLayoutQueueInternal(WId winId)
+TQPtrQueue<LayoutState>& LayoutMap::getCurrentLayoutQueueInternal(WId winId)
{
if( winId == X11Helper::UNKNOWN_WINDOW_ID )
return m_globalLayouts;
switch( m_kxkbConfig.m_switchingPolicy ) {
case SWITCH_POLICY_WIN_CLASS: {
-// QString winClass = X11Helper::getWindowClass(winId, qt_xdisplay());
+// TQString winClass = X11Helper::getWindowClass(winId, qt_xdisplay());
return m_appLayouts[ m_currentWinClass ];
}
case SWITCH_POLICY_WINDOW:
@@ -67,9 +67,9 @@ QPtrQueue<LayoutState>& LayoutMap::getCurrentLayoutQueueInternal(WId winId)
// private
//LayoutQueue&
-QPtrQueue<LayoutState>& LayoutMap::getCurrentLayoutQueue(WId winId)
+TQPtrQueue<LayoutState>& LayoutMap::getCurrentLayoutQueue(WId winId)
{
- QPtrQueue<LayoutState>& layoutQueue = getCurrentLayoutQueueInternal(winId);
+ TQPtrQueue<LayoutState>& layoutQueue = getCurrentLayoutQueueInternal(winId);
if( layoutQueue.count() == 0 ) {
initLayoutQueue(layoutQueue);
kdDebug() << "map: Created queue for " << winId << " size: " << layoutQueue.count() << endl;
diff --git a/kxkb/layoutmap.h b/kxkb/layoutmap.h
index 198990327..4be4cdfb2 100644
--- a/kxkb/layoutmap.h
+++ b/kxkb/layoutmap.h
@@ -15,8 +15,8 @@
#include <assert.h>
-#include <qptrqueue.h>
-#include <qmap.h>
+#include <tqptrqueue.h>
+#include <tqmap.h>
#include <kwinmodule.h>
#include <kdebug.h>
@@ -40,9 +40,9 @@ struct LayoutState {
// LayoutMap is used for per-window or per-application switching policy
class LayoutMap {
- typedef QPtrQueue<LayoutState> LayoutQueue;
- typedef QMap<WId, LayoutQueue> WinLayoutMap;
- typedef QMap<QString, LayoutQueue> WinClassLayoutMap;
+ typedef TQPtrQueue<LayoutState> LayoutQueue;
+ typedef TQMap<WId, LayoutQueue> WinLayoutMap;
+ typedef TQMap<TQString, LayoutQueue> WinClassLayoutMap;
public:
LayoutMap(const KxkbConfig& kxkbConfig);
@@ -64,7 +64,7 @@ private:
const KxkbConfig& m_kxkbConfig;
WId m_currentWinId;
- QString m_currentWinClass; // only for SWITCH_POLICY_WIN_CLASS
+ TQString m_currentWinClass; // only for SWITCH_POLICY_WIN_CLASS
void initLayoutQueue(LayoutQueue& layoutQueue);
LayoutQueue& getCurrentLayoutQueue(WId winId);
diff --git a/kxkb/pixmap.cpp b/kxkb/pixmap.cpp
index 37176b097..0ca1500e3 100644
--- a/kxkb/pixmap.cpp
+++ b/kxkb/pixmap.cpp
@@ -1,9 +1,9 @@
-#include <qimage.h>
-//#include <qbitmap.h>
-#include <qfont.h>
-#include <qpainter.h>
-#include <qregexp.h>
-#include <qdict.h>
+#include <tqimage.h>
+//#include <tqbitmap.h>
+#include <tqfont.h>
+#include <tqpainter.h>
+#include <tqregexp.h>
+#include <tqdict.h>
#include <kstandarddirs.h>
#include <klocale.h>
@@ -17,8 +17,8 @@
static const int FLAG_MAX_WIDTH = 21;
static const int FLAG_MAX_HEIGHT = 14;
-const QString LayoutIcon::flagTemplate("l10n/%1/flag.png");
-const QString& LayoutIcon::ERROR_CODE("error");
+const TQString LayoutIcon::flagTemplate("l10n/%1/flag.png");
+const TQString& LayoutIcon::ERROR_CODE("error");
LayoutIcon* LayoutIcon::instance;
@@ -34,13 +34,13 @@ LayoutIcon::LayoutIcon():
m_labelFont("sans")
{
m_labelFont.setPixelSize(10);
- m_labelFont.setWeight(QFont::Bold);
+ m_labelFont.setWeight(TQFont::Bold);
}
-const QPixmap&
-LayoutIcon::findPixmap(const QString& code_, bool showFlag, const QString& displayName_)
+const TQPixmap&
+LayoutIcon::findPixmap(const TQString& code_, bool showFlag, const TQString& displayName_)
{
- QPixmap* pm = NULL;
+ TQPixmap* pm = NULL;
if( code_ == ERROR_CODE ) {
pm = m_pixmapCache[ERROR_CODE];
@@ -51,7 +51,7 @@ LayoutIcon::findPixmap(const QString& code_, bool showFlag, const QString& displ
return *pm;
}
- QString displayName(displayName_);
+ TQString displayName(displayName_);
if( displayName.isEmpty() ) {
displayName = KxkbConfig::getDefaultDisplayName(code_);
@@ -59,38 +59,38 @@ LayoutIcon::findPixmap(const QString& code_, bool showFlag, const QString& displ
if( displayName.length() > 3 )
displayName = displayName.left(3);
- const QString pixmapKey( showFlag ? code_ + "." + displayName : displayName );
+ const TQString pixmapKey( showFlag ? code_ + "." + displayName : displayName );
pm = m_pixmapCache[pixmapKey];
if( pm )
return *pm;
- QString flag;
+ TQString flag;
if( showFlag ) {
- QString countryCode = getCountryFromLayoutName( code_ );
+ TQString countryCode = getCountryFromLayoutName( code_ );
flag = locate("locale", flagTemplate.arg(countryCode));
}
if( flag.isEmpty() ) {
- pm = new QPixmap(FLAG_MAX_WIDTH, FLAG_MAX_HEIGHT);
+ pm = new TQPixmap(FLAG_MAX_WIDTH, FLAG_MAX_HEIGHT);
pm->fill(Qt::gray);
}
else {
- pm = new QPixmap(flag);
+ pm = new TQPixmap(flag);
dimPixmap( *pm );
#if 0
if( pm->height() < FLAG_MAX_HEIGHT ) {
- QPixmap* pix = new QPixmap(FLAG_MAX_WIDTH, FLAG_MAX_HEIGHT);
+ TQPixmap* pix = new TQPixmap(FLAG_MAX_WIDTH, FLAG_MAX_HEIGHT);
pix->fill( Qt::lightGray );
-// pix->fill( QColor(qRgba(127,127,127,255)) );
-// QBitmap mask;
+// pix->fill( TQColor(qRgba(127,127,127,255)) );
+// TQBitmap mask;
// mask.fill(1);
// pix->setMask(mask);
int dy = (pix->height() - pm->height()) / 2;
copyBlt( pix, 0, dy, pm, 0, 0, -1, -1 );
-// QPixmap* px = new QPixmap(21, 14);
+// TQPixmap* px = new TQPixmap(21, 14);
// px->convertFromImage(img);*/
delete pm;
pm = pix;
@@ -98,7 +98,7 @@ LayoutIcon::findPixmap(const QString& code_, bool showFlag, const QString& displ
#endif
}
- QPainter p(pm);
+ TQPainter p(pm);
p.setFont(m_labelFont);
p.setPen(Qt::black);
@@ -114,16 +114,16 @@ LayoutIcon::findPixmap(const QString& code_, bool showFlag, const QString& displ
/**
@brief Try to get country code from layout name in xkb before xorg 6.9.0
*/
-QString LayoutIcon::getCountryFromLayoutName(const QString& layoutName)
+TQString LayoutIcon::getCountryFromLayoutName(const TQString& layoutName)
{
- QString flag;
+ TQString flag;
if( X11Helper::areLayoutsClean() ) { // >= Xorg 6.9.0
if( layoutName == "mkd" )
flag = "mk";
else
if( layoutName == "srp" ) {
- QString csFlagFile = locate("locale", flagTemplate.arg("cs"));
+ TQString csFlagFile = locate("locale", flagTemplate.arg("cs"));
flag = csFlagFile.isEmpty() ? "yu" : "cs";
}
else
@@ -183,15 +183,15 @@ QString LayoutIcon::getCountryFromLayoutName(const QString& layoutName)
|| layoutName == "tel" || layoutName == "tml" || layoutName == "ben" ) // some Indian languages
flag = "in";
else {
- int sepPos = layoutName.find(QRegExp("[-_]"));
- QString leftCode = layoutName.mid(0, sepPos);
- QString rightCode;
+ int sepPos = layoutName.find(TQRegExp("[-_]"));
+ TQString leftCode = layoutName.mid(0, sepPos);
+ TQString rightCode;
if( sepPos != -1 )
rightCode = layoutName.mid(sepPos+1);
// kdDebug() << "layout name breakup: " << leftCode << ":" << rightCode << endl;
if( rightCode.length() == 2
- && QRegExp("[A-Z][A-Z]").exactMatch(rightCode) ) {
+ && TQRegExp("[A-Z][A-Z]").exactMatch(rightCode) ) {
flag = rightCode.lower();
}
else {
@@ -204,9 +204,9 @@ QString LayoutIcon::getCountryFromLayoutName(const QString& layoutName)
}
-void LayoutIcon::dimPixmap(QPixmap& pm)
+void LayoutIcon::dimPixmap(TQPixmap& pm)
{
- QImage image = pm.convertToImage();
+ TQImage image = pm.convertToImage();
for (int y=0; y<image.height(); y++)
for(int x=0; x<image.width(); x++)
{
@@ -220,12 +220,12 @@ void LayoutIcon::dimPixmap(QPixmap& pm)
static const char* ERROR_LABEL = "err";
//private
-QPixmap* LayoutIcon::createErrorPixmap()
+TQPixmap* LayoutIcon::createErrorPixmap()
{
- QPixmap* pm = new QPixmap(21, 14);
+ TQPixmap* pm = new TQPixmap(21, 14);
pm->fill(Qt::white);
- QPainter p(pm);
+ TQPainter p(pm);
p.setFont(m_labelFont);
p.setPen(Qt::red);
diff --git a/kxkb/pixmap.h b/kxkb/pixmap.h
index 42764c04f..7070d91b2 100644
--- a/kxkb/pixmap.h
+++ b/kxkb/pixmap.h
@@ -2,30 +2,30 @@
#define __PIXMAP_H__
-#include <qpixmap.h>
-#include <qdict.h>
-#include <qstring.h>
+#include <tqpixmap.h>
+#include <tqdict.h>
+#include <tqstring.h>
class LayoutIcon {
private:
static LayoutIcon* instance;
- static const QString flagTemplate;
+ static const TQString flagTemplate;
- QDict<QPixmap> m_pixmapCache;
- QFont m_labelFont;
+ TQDict<TQPixmap> m_pixmapCache;
+ TQFont m_labelFont;
LayoutIcon();
- QPixmap* createErrorPixmap();
- void dimPixmap(QPixmap& pixmap);
- QString getCountryFromLayoutName(const QString& layoutName);
+ TQPixmap* createErrorPixmap();
+ void dimPixmap(TQPixmap& pixmap);
+ TQString getCountryFromLayoutName(const TQString& layoutName);
public:
- static const QString& ERROR_CODE;
+ static const TQString& ERROR_CODE;
static LayoutIcon& getInstance();
- const QPixmap& findPixmap(const QString& code, bool showFlag, const QString& displayName="");
+ const TQPixmap& findPixmap(const TQString& code, bool showFlag, const TQString& displayName="");
};
#endif
diff --git a/kxkb/rules.cpp b/kxkb/rules.cpp
index 85c93f72b..dbf5b823d 100644
--- a/kxkb/rules.cpp
+++ b/kxkb/rules.cpp
@@ -1,9 +1,9 @@
-#include <qwindowdefs.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qregexp.h>
-#include <qstringlist.h>
-#include <qdir.h>
+#include <tqwindowdefs.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqregexp.h>
+#include <tqstringlist.h>
+#include <tqdir.h>
#include <kstandarddirs.h>
#include <kglobal.h>
@@ -26,7 +26,7 @@ XkbRules::XkbRules(bool layoutsOnly):
return;
}
- QString rulesFile = X11Helper::findXkbRulesFile(X11_DIR, qt_xdisplay());
+ TQString rulesFile = X11Helper::findXkbRulesFile(X11_DIR, qt_xdisplay());
if( rulesFile.isEmpty() ) {
kdError() << "Cannot find rules file in " << X11_DIR << endl;
@@ -40,7 +40,7 @@ XkbRules::XkbRules(bool layoutsOnly):
}
-void XkbRules::loadRules(QString file, bool layoutsOnly)
+void XkbRules::loadRules(TQString file, bool layoutsOnly)
{
RulesInfo* rules = X11Helper::loadRules(file, layoutsOnly);
@@ -79,7 +79,7 @@ void XkbRules::loadRules(QString file, bool layoutsOnly)
// }
// }
-bool XkbRules::isSingleGroup(const QString& layout)
+bool XkbRules::isSingleGroup(const TQString& layout)
{
return X11Helper::areSingleGroupsSupported()
&& !m_oldLayouts.contains(layout)
@@ -88,7 +88,7 @@ bool XkbRules::isSingleGroup(const QString& layout)
// check $oldlayouts and $nonlatin groups for XFree 4.3 and later
-void XkbRules::loadOldLayouts(QString rulesFile)
+void XkbRules::loadOldLayouts(TQString rulesFile)
{
OldLayouts* oldLayoutsStruct = X11Helper::loadOldLayouts( rulesFile );
m_oldLayouts = oldLayoutsStruct->oldLayouts;
@@ -97,13 +97,13 @@ void XkbRules::loadOldLayouts(QString rulesFile)
// for multi-group layouts in XFree 4.2 and older
// or if layout is present in $oldlayout or $nonlatin groups
-void XkbRules::loadGroups(QString file)
+void XkbRules::loadGroups(TQString file)
{
- QFile f(file);
+ TQFile f(file);
if (f.open(IO_ReadOnly))
{
- QTextStream ts(&f);
- QString locale;
+ TQTextStream ts(&f);
+ TQString locale;
unsigned int grp;
while (!ts.eof()) {
@@ -121,7 +121,7 @@ void XkbRules::loadGroups(QString file)
}
unsigned int
-XkbRules::getDefaultGroup(const QString& layout, const QString& includeGroup)
+XkbRules::getDefaultGroup(const TQString& layout, const TQString& includeGroup)
{
// check for new one-group layouts in XFree 4.3 and older
if( isSingleGroup(layout) ) {
@@ -131,23 +131,23 @@ XkbRules::getDefaultGroup(const QString& layout, const QString& includeGroup)
return 0;
}
- QMap<QString, unsigned int>::iterator it = m_initialGroups.find(layout);
+ TQMap<TQString, unsigned int>::iterator it = m_initialGroups.find(layout);
return it == m_initialGroups.end() ? 0 : it.data();
}
QStringList
-XkbRules::getAvailableVariants(const QString& layout)
+XkbRules::getAvailableVariants(const TQString& layout)
{
if( layout.isEmpty() || !layouts().find(layout) )
- return QStringList();
+ return TQStringList();
- QStringList* result1 = m_varLists[layout];
+ TQStringList* result1 = m_varLists[layout];
if( result1 )
return *result1;
bool oldLayouts = m_oldLayouts.contains(layout);
- QStringList* result = X11Helper::getVariants(layout, X11_DIR, oldLayouts);
+ TQStringList* result = X11Helper::getVariants(layout, X11_DIR, oldLayouts);
m_varLists.insert(layout, result);
diff --git a/kxkb/rules.h b/kxkb/rules.h
index d3e72b7a6..a4955317e 100644
--- a/kxkb/rules.h
+++ b/kxkb/rules.h
@@ -1,9 +1,9 @@
#ifndef __RULES_H__
#define __RULES_H__
-#include <qstring.h>
-#include <qdict.h>
-#include <qmap.h>
+#include <tqstring.h>
+#include <tqdict.h>
+#include <tqmap.h>
class XkbRules
@@ -12,32 +12,32 @@ public:
XkbRules(bool layoutsOnly=false);
- const QDict<char> &models() const { return m_models; };
- const QDict<char> &layouts() const { return m_layouts; };
- const QDict<char> &options() const { return m_options; };
+ const TQDict<char> &models() const { return m_models; };
+ const TQDict<char> &layouts() const { return m_layouts; };
+ const TQDict<char> &options() const { return m_options; };
- QStringList getAvailableVariants(const QString& layout);
- unsigned int getDefaultGroup(const QString& layout, const QString& includeGroup);
+ TQStringList getAvailableVariants(const TQString& layout);
+ unsigned int getDefaultGroup(const TQString& layout, const TQString& includeGroup);
- bool isSingleGroup(const QString& layout);
+ bool isSingleGroup(const TQString& layout);
protected:
- void loadRules(QString filename, bool layoutsOnly=false);
- void loadGroups(QString filename);
- void loadOldLayouts(QString filename);
+ void loadRules(TQString filename, bool layoutsOnly=false);
+ void loadGroups(TQString filename);
+ void loadOldLayouts(TQString filename);
private:
- QDict<char> m_models;
- QDict<char> m_layouts;
- QDict<char> m_options;
- QMap<QString, unsigned int> m_initialGroups;
- QDict<QStringList> m_varLists;
- QStringList m_oldLayouts;
- QStringList m_nonLatinLayouts;
+ TQDict<char> m_models;
+ TQDict<char> m_layouts;
+ TQDict<char> m_options;
+ TQMap<TQString, unsigned int> m_initialGroups;
+ TQDict<TQStringList> m_varLists;
+ TQStringList m_oldLayouts;
+ TQStringList m_nonLatinLayouts;
- QString X11_DIR; // pseudo-constant
+ TQString X11_DIR; // pseudo-constant
// void fixLayouts();
};
diff --git a/kxkb/x11helper.cpp b/kxkb/x11helper.cpp
index 7e3c83c0b..e8f13f6aa 100644
--- a/kxkb/x11helper.cpp
+++ b/kxkb/x11helper.cpp
@@ -1,10 +1,10 @@
-#include <qdir.h>
-#include <qstring.h>
-#include <qwindowdefs.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qdict.h>
-#include <qregexp.h>
+#include <tqdir.h>
+#include <tqstring.h>
+#include <tqwindowdefs.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqdict.h>
+#include <tqregexp.h>
#include <kdebug.h>
@@ -52,10 +52,10 @@ static const char* rulesFileList[] =
static const int X11_DIR_COUNT = ARRAY_SIZE(X11DirList);
static const int X11_RULES_COUNT = ARRAY_SIZE(rulesFileList);
-const QString X11Helper::X11_WIN_CLASS_ROOT = "<root>";
-const QString X11Helper::X11_WIN_CLASS_UNKNOWN = "<unknown>";
+const TQString X11Helper::X11_WIN_CLASS_ROOT = "<root>";
+const TQString X11Helper::X11_WIN_CLASS_UNKNOWN = "<unknown>";
-static const QRegExp NON_CLEAN_LAYOUT_REGEXP("[^a-z]");
+static const TQRegExp NON_CLEAN_LAYOUT_REGEXP("[^a-z]");
bool X11Helper::m_layoutsClean = true;
@@ -64,11 +64,11 @@ X11Helper::findX11Dir()
{
for(int ii=0; ii<X11_DIR_COUNT; ii++) {
const char* xDir = X11DirList[ii];
- if( xDir != NULL && QDir(QString(xDir) + "xkb").exists() ) {
+ if( xDir != NULL && TQDir(TQString(xDir) + "xkb").exists() ) {
// for(int jj=0; jj<X11_RULES_COUNT; jj++) {
//
// }
- return QString(xDir);
+ return TQString(xDir);
}
// if( X11_DIR.isEmpty() ) {
@@ -79,24 +79,24 @@ X11Helper::findX11Dir()
}
const QString
-X11Helper::findXkbRulesFile(QString x11Dir, Display *dpy)
+X11Helper::findXkbRulesFile(TQString x11Dir, Display *dpy)
{
- QString rulesFile;
+ TQString rulesFile;
XkbRF_VarDefsRec vd;
char *tmp = NULL;
if (XkbRF_GetNamesProp(dpy, &tmp, &vd) && tmp != NULL ) {
// kdDebug() << "namesprop " << tmp << endl;
- rulesFile = x11Dir + QString("xkb/rules/%1").arg(tmp);
+ rulesFile = x11Dir + TQString("xkb/rules/%1").arg(tmp);
// kdDebug() << "rulesF " << rulesFile << endl;
}
else {
// old way
for(int ii=0; ii<X11_RULES_COUNT; ii++) {
const char* ruleFile = rulesFileList[ii];
- QString xruleFilePath = x11Dir + ruleFile;
+ TQString xruleFilePath = x11Dir + ruleFile;
// kdDebug() << "trying " << xruleFilePath << endl;
- if( QFile(xruleFilePath).exists() ) {
+ if( TQFile(xruleFilePath).exists() ) {
rulesFile = xruleFilePath;
break;
}
@@ -107,9 +107,9 @@ X11Helper::findXkbRulesFile(QString x11Dir, Display *dpy)
}
RulesInfo*
-X11Helper::loadRules(const QString& file, bool layoutsOnly)
+X11Helper::loadRules(const TQString& file, bool layoutsOnly)
{
- XkbRF_RulesPtr xkbRules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true);
+ XkbRF_RulesPtr xkbRules = XkbRF_Load(TQFile::encodeName(file).data(), "", true, true);
if (xkbRules == NULL) {
// throw Exception
@@ -119,7 +119,7 @@ X11Helper::loadRules(const QString& file, bool layoutsOnly)
RulesInfo* rulesInfo = new RulesInfo();
for (int i = 0; i < xkbRules->layouts.num_desc; ++i) {
- QString layoutName(xkbRules->layouts.desc[i].name);
+ TQString layoutName(xkbRules->layouts.desc[i].name);
rulesInfo->layouts.replace( layoutName, qstrdup( xkbRules->layouts.desc[i].desc ) );
if( m_layoutsClean == true
@@ -147,12 +147,12 @@ X11Helper::loadRules(const QString& file, bool layoutsOnly)
rulesInfo->options.replace("compose", "Compose Key Position");
}
- for(QDictIterator<char> it(rulesInfo->options) ; it.current() != NULL; ++it ) {
- QString option(it.currentKey());
+ for(TQDictIterator<char> it(rulesInfo->options) ; it.current() != NULL; ++it ) {
+ TQString option(it.currentKey());
int columnPos = option.find(":");
if( columnPos != -1 ) {
- QString group = option.mid(0, columnPos);
+ TQString group = option.mid(0, columnPos);
if( rulesInfo->options.find(group) == NULL ) {
rulesInfo->options.replace(group, group.latin1());
kdDebug() << "Added missing option group: " << group << endl;
@@ -170,19 +170,19 @@ X11Helper::loadRules(const QString& file, bool layoutsOnly)
// check $oldlayouts and $nonlatin groups for XFree 4.3 and later
OldLayouts*
-X11Helper::loadOldLayouts(const QString& rulesFile)
+X11Helper::loadOldLayouts(const TQString& rulesFile)
{
static const char* oldLayoutsTag = "! $oldlayouts";
static const char* nonLatinLayoutsTag = "! $nonlatin";
- QStringList m_oldLayouts;
- QStringList m_nonLatinLayouts;
+ TQStringList m_oldLayouts;
+ TQStringList m_nonLatinLayouts;
- QFile f(rulesFile);
+ TQFile f(rulesFile);
if (f.open(IO_ReadOnly))
{
- QTextStream ts(&f);
- QString line;
+ TQTextStream ts(&f);
+ TQString line;
while (!ts.eof()) {
line = ts.readLine().simplifyWhiteSpace();
@@ -195,7 +195,7 @@ X11Helper::loadOldLayouts(const QString& rulesFile)
line = line.left(line.length()-1) + ts.readLine();
line = line.simplifyWhiteSpace();
- m_oldLayouts = QStringList::split(QRegExp("\\s"), line);
+ m_oldLayouts = TQStringList::split(TQRegExp("\\s"), line);
// kdDebug() << "oldlayouts " << m_oldLayouts.join("|") << endl;
if( !m_nonLatinLayouts.empty() )
break;
@@ -210,7 +210,7 @@ X11Helper::loadOldLayouts(const QString& rulesFile)
line = line.left(line.length()-1) + ts.readLine();
line = line.simplifyWhiteSpace();
- m_nonLatinLayouts = QStringList::split(QRegExp("\\s"), line);
+ m_nonLatinLayouts = TQStringList::split(TQRegExp("\\s"), line);
// kdDebug() << "nonlatin " << m_nonLatinLayouts.join("|") << endl;
if( !m_oldLayouts.empty() )
break;
@@ -233,27 +233,27 @@ X11Helper::loadOldLayouts(const QString& rulesFile)
tries to find "xkb_symbols"
also checks whether previous line contains "hidden" to skip it
*/
-QStringList*
-X11Helper::getVariants(const QString& layout, const QString& x11Dir, bool oldLayouts)
+TQStringList*
+X11Helper::getVariants(const TQString& layout, const TQString& x11Dir, bool oldLayouts)
{
- QStringList* result = new QStringList();
+ TQStringList* result = new TQStringList();
- QString file = x11Dir + "xkb/symbols/";
+ TQString file = x11Dir + "xkb/symbols/";
// workaround for XFree 4.3 new directory for one-group layouts
- if( QDir(file+"pc").exists() && !oldLayouts )
+ if( TQDir(file+"pc").exists() && !oldLayouts )
file += "pc/";
file += layout;
// kdDebug() << "reading variants from " << file << endl;
- QFile f(file);
+ TQFile f(file);
if (f.open(IO_ReadOnly))
{
- QTextStream ts(&f);
+ TQTextStream ts(&f);
- QString line;
- QString prev_line;
+ TQString line;
+ TQString prev_line;
while (!ts.eof()) {
prev_line = line;
@@ -284,7 +284,7 @@ X11Helper::getVariants(const QString& layout, const QString& x11Dir, bool oldLay
return result;
}
-QString
+TQString
X11Helper::getWindowClass(WId winId, Display* dpy)
{
unsigned long nitems_ret, bytes_after_ret;
@@ -292,7 +292,7 @@ X11Helper::getWindowClass(WId winId, Display* dpy)
Atom type_ret;
int format_ret;
Window w = (Window)winId; // suppose WId == Window
- QString property;
+ TQString property;
if( winId == X11Helper::UNKNOWN_WINDOW_ID ) {
kdDebug() << "Got window class for " << winId << ": '" << X11_WIN_CLASS_ROOT << "'" << endl;
@@ -303,7 +303,7 @@ X11Helper::getWindowClass(WId winId, Display* dpy)
if((XGetWindowProperty(dpy, w, XA_WM_CLASS, 0L, 256L, 0, XA_STRING,
&type_ret, &format_ret, &nitems_ret,
&bytes_after_ret, &prop_ret) == Success) && (type_ret != None)) {
- property = QString::fromLocal8Bit(reinterpret_cast<char*>(prop_ret));
+ property = TQString::fromLocal8Bit(reinterpret_cast<char*>(prop_ret));
XFree(prop_ret);
}
else {
diff --git a/kxkb/x11helper.h b/kxkb/x11helper.h
index a4faba899..042fb4ce5 100644
--- a/kxkb/x11helper.h
+++ b/kxkb/x11helper.h
@@ -1,19 +1,19 @@
#ifndef X11HELPER_H_
#define X11HELPER_H_
-#include <qdict.h>
-#include <qstringlist.h>
+#include <tqdict.h>
+#include <tqstringlist.h>
struct RulesInfo {
- QDict<char> models;
- QDict<char> layouts;
- QDict<char> options;
+ TQDict<char> models;
+ TQDict<char> layouts;
+ TQDict<char> options;
};
struct OldLayouts {
- QStringList oldLayouts;
- QStringList nonLatinLayouts;
+ TQStringList oldLayouts;
+ TQStringList nonLatinLayouts;
};
class X11Helper
@@ -22,17 +22,17 @@ class X11Helper
public:
static const WId UNKNOWN_WINDOW_ID = (WId) 0;
- static const QString X11_WIN_CLASS_ROOT;
- static const QString X11_WIN_CLASS_UNKNOWN;
+ static const TQString X11_WIN_CLASS_ROOT;
+ static const TQString X11_WIN_CLASS_UNKNOWN;
/**
* Tries to find X11 xkb config dir
*/
- static const QString findX11Dir();
- static const QString findXkbRulesFile(QString x11Dir, Display* dpy);
- static QString getWindowClass(WId winId, Display* dpy);
- static QStringList* getVariants(const QString& layout, const QString& x11Dir, bool oldLayouts=false);
- static RulesInfo* loadRules(const QString& rulesFile, bool layoutsOnly=false);
- static OldLayouts* loadOldLayouts(const QString& rulesFile);
+ static const TQString findX11Dir();
+ static const TQString findXkbRulesFile(TQString x11Dir, Display* dpy);
+ static TQString getWindowClass(WId winId, Display* dpy);
+ static TQStringList* getVariants(const TQString& layout, const TQString& x11Dir, bool oldLayouts=false);
+ static RulesInfo* loadRules(const TQString& rulesFile, bool layoutsOnly=false);
+ static OldLayouts* loadOldLayouts(const TQString& rulesFile);
static bool areLayoutsClean() { return m_layoutsClean; }
static bool areSingleGroupsSupported();
diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp
index 9419b4b03..82b4aeb17 100644
--- a/libkonq/favicons/favicons.cpp
+++ b/libkonq/favicons/favicons.cpp
@@ -20,11 +20,11 @@
#include <string.h>
#include <time.h>
-#include <qbuffer.h>
-#include <qfile.h>
-#include <qcache.h>
-#include <qimage.h>
-#include <qtimer.h>
+#include <tqbuffer.h>
+#include <tqfile.h>
+#include <tqcache.h>
+#include <tqimage.h>
+#include <tqtimer.h>
#include <kdatastream.h> // DO NOT REMOVE, otherwise bool marshalling breaks
#include <kicontheme.h>
@@ -41,20 +41,20 @@ struct FaviconsModulePrivate
struct DownloadInfo
{
- QString hostOrURL;
+ TQString hostOrURL;
bool isHost;
- QByteArray iconData;
+ TQByteArray iconData;
};
- QMap<KIO::Job *, DownloadInfo> downloads;
- QStringList failedDownloads;
+ TQMap<KIO::Job *, DownloadInfo> downloads;
+ TQStringList failedDownloads;
KSimpleConfig *config;
- QPtrList<KIO::Job> killJobs;
+ TQPtrList<KIO::Job> killJobs;
KIO::MetaData metaData;
- QString faviconsDir;
- QCache<QString> faviconsCache;
+ TQString faviconsDir;
+ TQCache<TQString> faviconsCache;
};
-FaviconsModule::FaviconsModule(const QCString &obj)
+FaviconsModule::FaviconsModule(const TQCString &obj)
: KDEDModule(obj)
{
// create our favicons folder so that KIconLoader knows about it
@@ -76,7 +76,7 @@ FaviconsModule::~FaviconsModule()
delete d;
}
-QString removeSlash(QString result)
+TQString removeSlash(TQString result)
{
for (unsigned int i = result.length() - 1; i > 0; --i)
if (result[i] != '/')
@@ -89,15 +89,15 @@ QString removeSlash(QString result)
}
-QString FaviconsModule::iconForURL(const KURL &url)
+TQString FaviconsModule::iconForURL(const KURL &url)
{
if (url.host().isEmpty())
- return QString::null;
+ return TQString::null;
- QString icon;
- QString simplifiedURL = simplifyURL(url);
+ TQString icon;
+ TQString simplifiedURL = simplifyURL(url);
- QString *iconURL = d->faviconsCache.find( removeSlash(simplifiedURL) );
+ TQString *iconURL = d->faviconsCache.find( removeSlash(simplifiedURL) );
if (iconURL)
icon = *iconURL;
else
@@ -110,44 +110,44 @@ QString FaviconsModule::iconForURL(const KURL &url)
icon = "favicons/" + icon;
- if (QFile::exists(d->faviconsDir+icon+".png"))
+ if (TQFile::exists(d->faviconsDir+icon+".png"))
return icon;
- return QString::null;
+ return TQString::null;
}
-QString FaviconsModule::simplifyURL(const KURL &url)
+TQString FaviconsModule::simplifyURL(const KURL &url)
{
// splat any = in the URL so it can be safely used as a config key
- QString result = url.host() + url.path();
+ TQString result = url.host() + url.path();
for (unsigned int i = 0; i < result.length(); ++i)
if (result[i] == '=')
result[i] = '_';
return result;
}
-QString FaviconsModule::iconNameFromURL(const KURL &iconURL)
+TQString FaviconsModule::iconNameFromURL(const KURL &iconURL)
{
if (iconURL.path() == "/favicon.ico")
return iconURL.host();
- QString result = simplifyURL(iconURL);
+ TQString result = simplifyURL(iconURL);
// splat / so it can be safely used as a file name
for (unsigned int i = 0; i < result.length(); ++i)
if (result[i] == '/')
result[i] = '_';
- QString ext = result.right(4);
+ TQString ext = result.right(4);
if (ext == ".ico" || ext == ".png" || ext == ".xpm")
result.remove(result.length() - 4, 4);
return result;
}
-bool FaviconsModule::isIconOld(const QString &icon)
+bool FaviconsModule::isIconOld(const TQString &icon)
{
struct stat st;
- if (stat(QFile::encodeName(icon), &st) != 0)
+ if (stat(TQFile::encodeName(icon), &st) != 0)
return true; // Trigger a new download on error
return (time(0) - st.st_mtime) > 604800; // arbitrary value (one week)
@@ -155,12 +155,12 @@ bool FaviconsModule::isIconOld(const QString &icon)
void FaviconsModule::setIconForURL(const KURL &url, const KURL &iconURL)
{
- QString simplifiedURL = simplifyURL(url);
+ TQString simplifiedURL = simplifyURL(url);
- d->faviconsCache.insert(removeSlash(simplifiedURL), new QString(iconURL.url()) );
+ d->faviconsCache.insert(removeSlash(simplifiedURL), new TQString(iconURL.url()) );
- QString iconName = "favicons/" + iconNameFromURL(iconURL);
- QString iconFile = d->faviconsDir + iconName + ".png";
+ TQString iconName = "favicons/" + iconNameFromURL(iconURL);
+ TQString iconFile = d->faviconsDir + iconName + ".png";
if (!isIconOld(iconFile)) {
emit iconChanged(false, simplifiedURL, iconName);
@@ -172,37 +172,37 @@ void FaviconsModule::setIconForURL(const KURL &url, const KURL &iconURL)
void FaviconsModule::downloadHostIcon(const KURL &url)
{
- QString iconFile = d->faviconsDir + "favicons/" + url.host() + ".png";
+ TQString iconFile = d->faviconsDir + "favicons/" + url.host() + ".png";
if (!isIconOld(iconFile))
return;
startDownload(url.host(), true, KURL(url, "/favicon.ico"));
}
-void FaviconsModule::startDownload(const QString &hostOrURL, bool isHost, const KURL &iconURL)
+void FaviconsModule::startDownload(const TQString &hostOrURL, bool isHost, const KURL &iconURL)
{
if (d->failedDownloads.contains(iconURL.url()))
return;
KIO::Job *job = KIO::get(iconURL, false, false);
job->addMetaData(d->metaData);
- connect(job, SIGNAL(data(KIO::Job *, const QByteArray &)), SLOT(slotData(KIO::Job *, const QByteArray &)));
- connect(job, SIGNAL(result(KIO::Job *)), SLOT(slotResult(KIO::Job *)));
- connect(job, SIGNAL(infoMessage(KIO::Job *, const QString &)), SLOT(slotInfoMessage(KIO::Job *, const QString &)));
+ connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
+ connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(infoMessage(KIO::Job *, const TQString &)), TQT_SLOT(slotInfoMessage(KIO::Job *, const TQString &)));
FaviconsModulePrivate::DownloadInfo download;
download.hostOrURL = hostOrURL;
download.isHost = isHost;
d->downloads.insert(job, download);
}
-void FaviconsModule::slotData(KIO::Job *job, const QByteArray &data)
+void FaviconsModule::slotData(KIO::Job *job, const TQByteArray &data)
{
FaviconsModulePrivate::DownloadInfo &download = d->downloads[job];
unsigned int oldSize = download.iconData.size();
if (oldSize > 0x10000)
{
d->killJobs.append(job);
- QTimer::singleShot(0, this, SLOT(slotKill()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotKill()));
}
download.iconData.resize(oldSize + data.size());
memcpy(download.iconData.data() + oldSize, data.data(), data.size());
@@ -213,12 +213,12 @@ void FaviconsModule::slotResult(KIO::Job *job)
FaviconsModulePrivate::DownloadInfo download = d->downloads[job];
d->downloads.remove(job);
KURL iconURL = static_cast<KIO::TransferJob *>(job)->url();
- QString iconName;
+ TQString iconName;
if (!job->error())
{
- QBuffer buffer(download.iconData);
+ TQBuffer buffer(download.iconData);
buffer.open(IO_ReadOnly);
- QImageIO io;
+ TQImageIO io;
io.setIODevice(&buffer);
io.setParameters("size=16");
// Check here too, the job might have had no error, but the downloaded
@@ -243,7 +243,7 @@ void FaviconsModule::slotResult(KIO::Job *job)
io.setFileName(d->faviconsDir + iconName + ".png");
io.setFormat("PNG");
if (!io.write())
- iconName = QString::null;
+ iconName = TQString::null;
else if (!download.isHost)
d->config->writeEntry( removeSlash(download.hostOrURL), iconURL.url());
}
@@ -254,7 +254,7 @@ void FaviconsModule::slotResult(KIO::Job *job)
emit iconChanged(download.isHost, download.hostOrURL, iconName);
}
-void FaviconsModule::slotInfoMessage(KIO::Job *job, const QString &msg)
+void FaviconsModule::slotInfoMessage(KIO::Job *job, const TQString &msg)
{
emit infoMessage(static_cast<KIO::TransferJob *>( job )->url(), msg);
}
@@ -265,7 +265,7 @@ void FaviconsModule::slotKill()
}
extern "C" {
- KDE_EXPORT KDEDModule *create_favicons(const QCString &obj)
+ KDE_EXPORT KDEDModule *create_favicons(const TQCString &obj)
{
KImageIO::registerFormats();
return new FaviconsModule(obj);
diff --git a/libkonq/favicons/favicons.h b/libkonq/favicons/favicons.h
index 021ea3b9b..1ca337713 100644
--- a/libkonq/favicons/favicons.h
+++ b/libkonq/favicons/favicons.h
@@ -31,7 +31,7 @@ namespace KIO { class Job; }
* place.
*
* After a successful download, the DCOP signal iconChanged() is emitted.
- * It has the signature void iconChanged(bool, QString, QString);
+ * It has the signature void iconChanged(bool, TQString, TQString);
* The first parameter is true if the icon is a "host" icon, that is it is
* the default icon for all URLs on the given host. In this case, the
* second parameter is a host name, otherwise the second parameter is the
@@ -47,20 +47,20 @@ class FaviconsModule : public KDEDModule
Q_OBJECT
K_DCOP
public:
- FaviconsModule(const QCString &obj);
+ FaviconsModule(const TQCString &obj);
virtual ~FaviconsModule();
k_dcop:
/**
* Looks up an icon name for a given URL. This function does not
* initiate any download. If no icon for the URL or its host has
- * been downloaded yet, QString::null is returned.
+ * been downloaded yet, TQString::null is returned.
*
* @param url the URL for which the icon is queried
* @return the icon name suitable to pass to @ref KIconLoader or
- * QString::null if no icon for this URL was found.
+ * TQString::null if no icon for this URL was found.
*/
- QString iconForURL(const KURL &url);
+ TQString iconForURL(const KURL &url);
/**
* Assiciates an icon with the given URL. If the icon was not
* downloaded before or the downloaded was too long ago, a
@@ -81,19 +81,19 @@ k_dcop:
ASYNC downloadHostIcon(const KURL &url);
k_dcop_signals:
- void iconChanged(bool isHost, QString hostOrURL, QString iconName);
- void infoMessage(KURL iconURL, QString msg);
+ void iconChanged(bool isHost, TQString hostOrURL, TQString iconName);
+ void infoMessage(KURL iconURL, TQString msg);
private:
- void startDownload(const QString &, bool, const KURL &);
- QString simplifyURL(const KURL &);
- QString iconNameFromURL(const KURL &);
- bool isIconOld(const QString &);
+ void startDownload(const TQString &, bool, const KURL &);
+ TQString simplifyURL(const KURL &);
+ TQString iconNameFromURL(const KURL &);
+ bool isIconOld(const TQString &);
private slots:
- void slotData(KIO::Job *, const QByteArray &);
+ void slotData(KIO::Job *, const TQByteArray &);
void slotResult(KIO::Job *);
- void slotInfoMessage(KIO::Job *, const QString &);
+ void slotInfoMessage(KIO::Job *, const TQString &);
void slotKill();
private:
diff --git a/libkonq/kfileivi.cc b/libkonq/kfileivi.cc
index 6775f115a..3bc303bae 100644
--- a/libkonq/kfileivi.cc
+++ b/libkonq/kfileivi.cc
@@ -23,7 +23,7 @@
#include "konq_operations.h"
#include "konq_settings.h"
-#include <qpainter.h>
+#include <tqpainter.h>
#include <kurldrag.h>
#include <kiconeffect.h>
@@ -38,14 +38,14 @@
*/
struct KFileIVI::Private
{
- QIconSet icons; // Icon states (cached to prevent re-applying icon effects
+ TQIconSet icons; // Icon states (cached to prevent re-applying icon effects
// every time)
- QPixmap thumb; // Raw unprocessed thumbnail
- QString m_animatedIcon; // Name of animation
+ TQPixmap thumb; // Raw unprocessed thumbnail
+ TQString m_animatedIcon; // Name of animation
bool m_animated; // Animation currently running ?
KIVDirectoryOverlay* m_directoryOverlay;
- QPixmap m_overlay;
- QString m_overlayName;
+ TQPixmap m_overlay;
+ TQString m_overlayName;
};
KFileIVI::KFileIVI( KonqIconViewWidget *iconview, KFileItem* fileitem, int size )
@@ -60,13 +60,13 @@ KFileIVI::KFileIVI( KonqIconViewWidget *iconview, KFileItem* fileitem, int size
setDropEnabled( S_ISDIR( m_fileitem->mode() ) );
// Cache entry for the icon effects
- d->icons.reset( *pixmap(), QIconSet::Large );
+ d->icons.reset( *pixmap(), TQIconSet::Large );
d->m_animated = false;
// iconName() requires the mimetype to be known
if ( fileitem->isMimeTypeKnown() )
{
- QString icon = fileitem->iconName();
+ TQString icon = fileitem->iconName();
if ( !icon.isEmpty() )
setMouseOverAnimation( icon );
else
@@ -83,27 +83,27 @@ KFileIVI::~KFileIVI()
void KFileIVI::invalidateThumb( int state, bool redraw )
{
- QIconSet::Mode mode;
+ TQIconSet::Mode mode;
switch( state )
{
case KIcon::DisabledState:
- mode = QIconSet::Disabled;
+ mode = TQIconSet::Disabled;
break;
case KIcon::ActiveState:
- mode = QIconSet::Active;
+ mode = TQIconSet::Active;
break;
case KIcon::DefaultState:
default:
- mode = QIconSet::Normal;
+ mode = TQIconSet::Normal;
break;
}
- d->icons = QIconSet();
+ d->icons = TQIconSet();
d->icons.setPixmap( KGlobal::iconLoader()->iconEffect()->
apply( d->thumb, KIcon::Desktop, state ),
- QIconSet::Large, mode );
+ TQIconSet::Large, mode );
m_state = state;
- QIconViewItem::setPixmap( d->icons.pixmap( QIconSet::Large, mode ),
+ TQIconViewItem::setPixmap( d->icons.pixmap( TQIconSet::Large, mode ),
false, redraw );
}
@@ -117,7 +117,7 @@ void KFileIVI::setIcon( int size, int state, bool recalc, bool redraw )
m_state = state;
if ( d->m_overlayName.isNull() )
- d->m_overlay = QPixmap();
+ d->m_overlay = TQPixmap();
else {
int halfSize;
if (m_size == 0) {
@@ -131,7 +131,7 @@ void KFileIVI::setIcon( int size, int state, bool recalc, bool redraw )
setPixmapDirect(m_fileitem->pixmap( m_size, m_state ) , recalc, redraw );
}
-void KFileIVI::setOverlay( const QString& iconName )
+void KFileIVI::setOverlay( const TQString& iconName )
{
d->m_overlayName = iconName;
@@ -150,7 +150,7 @@ KIVDirectoryOverlay* KFileIVI::setShowDirectoryOverlay( bool show )
} else {
delete d->m_directoryOverlay;
d->m_directoryOverlay = 0;
- setOverlay(QString());
+ setOverlay(TQString());
return 0;
}
}
@@ -160,31 +160,31 @@ bool KFileIVI::showDirectoryOverlay( )
return (bool)d->m_directoryOverlay;
}
-void KFileIVI::setPixmapDirect( const QPixmap& pixmap, bool recalc, bool redraw )
+void KFileIVI::setPixmapDirect( const TQPixmap& pixmap, bool recalc, bool redraw )
{
- QIconSet::Mode mode;
+ TQIconSet::Mode mode;
switch( m_state )
{
case KIcon::DisabledState:
- mode = QIconSet::Disabled;
+ mode = TQIconSet::Disabled;
break;
case KIcon::ActiveState:
- mode = QIconSet::Active;
+ mode = TQIconSet::Active;
break;
case KIcon::DefaultState:
default:
- mode = QIconSet::Normal;
+ mode = TQIconSet::Normal;
break;
}
// We cannot just reset() the iconset here, because setIcon can be
// called with any state and not just normal state. So we just
// create a dummy empty iconset as base object.
- d->icons = QIconSet();
- d->icons.setPixmap( pixmap, QIconSet::Large, mode );
+ d->icons = TQIconSet();
+ d->icons.setPixmap( pixmap, TQIconSet::Large, mode );
updatePixmapSize();
- QIconViewItem::setPixmap( d->icons.pixmap( QIconSet::Large, mode ),
+ TQIconViewItem::setPixmap( d->icons.pixmap( TQIconSet::Large, mode ),
recalc, redraw );
}
@@ -199,23 +199,23 @@ void KFileIVI::setDisabled( bool disabled )
}
}
-void KFileIVI::setThumbnailPixmap( const QPixmap & pixmap )
+void KFileIVI::setThumbnailPixmap( const TQPixmap & pixmap )
{
m_bThumbnail = true;
d->thumb = pixmap;
- // QIconSet::reset() doesn't seem to clear the other generated pixmaps,
- // so we just create a blank QIconSet here
- d->icons = QIconSet();
+ // TQIconSet::reset() doesn't seem to clear the other generated pixmaps,
+ // so we just create a blank TQIconSet here
+ d->icons = TQIconSet();
d->icons.setPixmap( KGlobal::iconLoader()->iconEffect()->
apply( pixmap, KIcon::Desktop, KIcon::DefaultState ),
- QIconSet::Large, QIconSet::Normal );
+ TQIconSet::Large, TQIconSet::Normal );
m_state = KIcon::DefaultState;
// Recalc when setting this pixmap!
updatePixmapSize();
- QIconViewItem::setPixmap( d->icons.pixmap( QIconSet::Large,
- QIconSet::Normal ), true );
+ TQIconViewItem::setPixmap( d->icons.pixmap( TQIconSet::Large,
+ TQIconSet::Normal ), true );
}
void KFileIVI::setActive( bool active )
@@ -228,18 +228,18 @@ void KFileIVI::setActive( bool active )
void KFileIVI::setEffect( int state )
{
- QIconSet::Mode mode;
+ TQIconSet::Mode mode;
switch( state )
{
case KIcon::DisabledState:
- mode = QIconSet::Disabled;
+ mode = TQIconSet::Disabled;
break;
case KIcon::ActiveState:
- mode = QIconSet::Active;
+ mode = TQIconSet::Active;
break;
case KIcon::DefaultState:
default:
- mode = QIconSet::Normal;
+ mode = TQIconSet::Normal;
break;
}
// Do not update if the fingerprint is identical (prevents flicker)!
@@ -264,17 +264,17 @@ void KFileIVI::setEffect( int state )
// save memory. Do this now when needed
if( m_bThumbnail )
{
- if( d->icons.isGenerated( QIconSet::Large, mode ) )
+ if( d->icons.isGenerated( TQIconSet::Large, mode ) )
d->icons.setPixmap( effect->apply( d->thumb, KIcon::Desktop, state ),
- QIconSet::Large, mode );
+ TQIconSet::Large, mode );
}
else
{
- if( d->icons.isGenerated( QIconSet::Large, mode ) )
+ if( d->icons.isGenerated( TQIconSet::Large, mode ) )
d->icons.setPixmap( m_fileitem->pixmap( m_size, state ),
- QIconSet::Large, mode );
+ TQIconSet::Large, mode );
}
- QIconViewItem::setPixmap( d->icons.pixmap( QIconSet::Large, mode ) );
+ TQIconViewItem::setPixmap( d->icons.pixmap( TQIconSet::Large, mode ) );
}
m_state = state;
}
@@ -287,7 +287,7 @@ void KFileIVI::refreshIcon( bool redraw )
void KFileIVI::invalidateThumbnail()
{
- d->thumb = QPixmap();
+ d->thumb = TQPixmap();
}
bool KFileIVI::isThumbnailInvalid() const
@@ -295,7 +295,7 @@ bool KFileIVI::isThumbnailInvalid() const
return d->thumb.isNull();
}
-bool KFileIVI::acceptDrop( const QMimeSource *mime ) const
+bool KFileIVI::acceptDrop( const TQMimeSource *mime ) const
{
if ( mime->provides( "text/uri-list" ) ) // We're dragging URLs
{
@@ -314,16 +314,16 @@ bool KFileIVI::acceptDrop( const QMimeSource *mime ) const
return true;
}
}
- return QIconViewItem::acceptDrop( mime );
+ return TQIconViewItem::acceptDrop( mime );
}
-void KFileIVI::setKey( const QString &key )
+void KFileIVI::setKey( const TQString &key )
{
- QString theKey = key;
+ TQString theKey = key;
- QVariant sortDirProp = iconView()->property( "sortDirectoriesFirst" );
+ TQVariant sortDirProp = iconView()->property( "sortDirectoriesFirst" );
- bool isdir = ( S_ISDIR( m_fileitem->mode() ) && ( !sortDirProp.isValid() || ( sortDirProp.type() == QVariant::Bool && sortDirProp.toBool() ) ) );
+ bool isdir = ( S_ISDIR( m_fileitem->mode() ) && ( !sortDirProp.isValid() || ( sortDirProp.type() == TQVariant::Bool && sortDirProp.toBool() ) ) );
// The order is: .dir (0), dir (1), .file (2), file (3)
int sortChar = isdir ? 1 : 3;
@@ -333,12 +333,12 @@ void KFileIVI::setKey( const QString &key )
if ( !iconView()->sortDirection() ) // reverse sorting
sortChar = 3 - sortChar;
- theKey.prepend( QChar( sortChar + '0' ) );
+ theKey.prepend( TQChar( sortChar + '0' ) );
- QIconViewItem::setKey( theKey );
+ TQIconViewItem::setKey( theKey );
}
-void KFileIVI::dropped( QDropEvent *e, const QValueList<QIconDragItem> & )
+void KFileIVI::dropped( TQDropEvent *e, const TQValueList<TQIconDragItem> & )
{
KonqOperations::doDrop( item(), item()->url(), e, iconView() );
}
@@ -359,16 +359,16 @@ void KFileIVI::returnPressed()
}
-void KFileIVI::paintItem( QPainter *p, const QColorGroup &c )
+void KFileIVI::paintItem( TQPainter *p, const TQColorGroup &c )
{
- QColorGroup cg = updateColors(c);
+ TQColorGroup cg = updateColors(c);
paintFontUpdate( p );
//*** TEMPORARY CODE - MUST BE MADE CONFIGURABLE FIRST - Martijn
// SET UNDERLINE ON HOVER ONLY
/*if ( ( ( KonqIconViewWidget* ) iconView() )->m_pActiveItem == this )
{
- QFont f( p->font() );
+ TQFont f( p->font() );
f.setUnderline( TRUE );
p->setFont( f );
}*/
@@ -378,28 +378,28 @@ void KFileIVI::paintItem( QPainter *p, const QColorGroup &c )
}
-void KFileIVI::paintOverlay( QPainter *p ) const
+void KFileIVI::paintOverlay( TQPainter *p ) const
{
if ( !d->m_overlay.isNull() ) {
- QRect rect = pixmapRect(true);
+ TQRect rect = pixmapRect(true);
p->drawPixmap(x() + rect.x() , y() + pixmapRect().height() - d->m_overlay.height(), d->m_overlay);
}
}
-void KFileIVI::paintFontUpdate( QPainter *p ) const
+void KFileIVI::paintFontUpdate( TQPainter *p ) const
{
if ( m_fileitem->isLink() )
{
- QFont f( p->font() );
+ TQFont f( p->font() );
f.setItalic( TRUE );
p->setFont( f );
}
}
-QColorGroup KFileIVI::updateColors( const QColorGroup &c ) const
+TQColorGroup KFileIVI::updateColors( const TQColorGroup &c ) const
{
- QColorGroup cg( c );
- cg.setColor( QColorGroup::Text, static_cast<KonqIconViewWidget*>(iconView())->itemColor() );
+ TQColorGroup cg( c );
+ cg.setColor( TQColorGroup::Text, static_cast<KonqIconViewWidget*>(iconView())->itemColor() );
return cg;
}
@@ -415,7 +415,7 @@ bool KFileIVI::move( int x, int y )
if ( y > iconView()->viewport()->height() - ( height() + 5 ) )
y = iconView()->viewport()->height() - ( height() + 5 );
}
- return QIconViewItem::move( x, y );
+ return TQIconViewItem::move( x, y );
}
bool KFileIVI::hasAnimation() const
@@ -423,7 +423,7 @@ bool KFileIVI::hasAnimation() const
return !d->m_animatedIcon.isEmpty() && !m_bThumbnail;
}
-void KFileIVI::setMouseOverAnimation( const QString& movieFileName )
+void KFileIVI::setMouseOverAnimation( const TQString& movieFileName )
{
if ( !movieFileName.isEmpty() )
{
@@ -432,7 +432,7 @@ void KFileIVI::setMouseOverAnimation( const QString& movieFileName )
}
}
-QString KFileIVI::mouseOverAnimation() const
+TQString KFileIVI::mouseOverAnimation() const
{
return d->m_animatedIcon;
}
@@ -447,7 +447,7 @@ void KFileIVI::setAnimated( bool a )
d->m_animated = a;
}
-int KFileIVI::compare( QIconViewItem *i ) const
+int KFileIVI::compare( TQIconViewItem *i ) const
{
KonqIconViewWidget* view = static_cast<KonqIconViewWidget*>(iconView());
if ( view->caseInsensitiveSort() )
@@ -465,10 +465,10 @@ void KFileIVI::updatePixmapSize()
if ( view && view->canPreview( item() ) ) {
int previewSize = view->previewIconSize( size );
- setPixmapSize( QSize( previewSize, previewSize ) );
+ setPixmapSize( TQSize( previewSize, previewSize ) );
}
else {
- QSize pixSize = QSize( size, size );
+ TQSize pixSize = TQSize( size, size );
if ( pixSize != pixmapSize() )
setPixmapSize( pixSize );
}
diff --git a/libkonq/kfileivi.h b/libkonq/kfileivi.h
index d1f1d9ab7..6c16907ec 100644
--- a/libkonq/kfileivi.h
+++ b/libkonq/kfileivi.h
@@ -60,9 +60,9 @@ public:
/**
* @return true if dropping on this file is allowed
- * Overloads QIconView::acceptDrop()
+ * Overloads TQIconView::acceptDrop()
*/
- virtual bool acceptDrop( const QMimeSource *mime ) const;
+ virtual bool acceptDrop( const TQMimeSource *mime ) const;
/**
* Changes the icon for this item.
@@ -83,7 +83,7 @@ public:
* @param recalc whether to update the layout of the icon view when setting the icon
* @param redraw whether to redraw the item after setting the icon
*/
- void setPixmapDirect( const QPixmap & pixmap,
+ void setPixmapDirect( const TQPixmap & pixmap,
bool recalc=false,
bool redraw=false);
@@ -125,7 +125,7 @@ public:
/**
* Set this when the thumbnail was loaded
*/
- void setThumbnailPixmap( const QPixmap & pixmap );
+ void setThumbnailPixmap( const TQPixmap & pixmap );
/**
* Set the icon to use the specified KIconEffect
@@ -141,9 +141,9 @@ public:
/**
* Sets an icon to be shown over the bottom left corner of the icon.
* Currently used for directory overlays.
- * setOverlay(QString::null) to remove icon.
+ * setOverlay(TQString::null) to remove icon.
*/
- void setOverlay( const QString & iconName);
+ void setOverlay( const TQString & iconName);
/**
* Redetermines the icon (useful if KFileItem might return another icon).
@@ -151,13 +151,13 @@ public:
*/
virtual void refreshIcon( bool redraw );
- virtual void setKey( const QString &key );
+ virtual void setKey( const TQString &key );
/**
* Paints this item. Takes care of using the normal or alpha
* blending methods depending on the configuration.
*/
- virtual void paintItem( QPainter *p, const QColorGroup &cg );
+ virtual void paintItem( TQPainter *p, const TQColorGroup &cg );
virtual bool move( int x, int y );
@@ -166,13 +166,13 @@ public:
* @param movieFileName the base name for the mng, e.g. "folder".
* Nothing happens if there is no animation available.
*/
- void setMouseOverAnimation( const QString& movieFileName );
- QString mouseOverAnimation() const;
+ void setMouseOverAnimation( const TQString& movieFileName );
+ TQString mouseOverAnimation() const;
/**
* Return true if the icon _might_ have an animation available.
* This doesn't mean the .mng exists (only determined when hovering on the
- * icon - and if it doesn't exist setMouseOverAnimation(QString::null) is called),
+ * icon - and if it doesn't exist setMouseOverAnimation(TQString::null) is called),
* and it doesn't mean that it's currently running either.
*/
bool hasAnimation() const;
@@ -191,31 +191,31 @@ public:
KIVDirectoryOverlay* setShowDirectoryOverlay( bool );
bool showDirectoryOverlay( );
- virtual int compare( QIconViewItem *i ) const;
+ virtual int compare( TQIconViewItem *i ) const;
protected:
- virtual void dropped( QDropEvent *e, const QValueList<QIconDragItem> & );
+ virtual void dropped( TQDropEvent *e, const TQValueList<TQIconDragItem> & );
/**
* Contains the logic and code for painting the overlay pixmap.
*/
- void paintOverlay( QPainter *p ) const;
+ void paintOverlay( TQPainter *p ) const;
/**
* Updates the colorgroup.
*/
- QColorGroup updateColors(const QColorGroup &c) const;
+ TQColorGroup updateColors(const TQColorGroup &c) const;
/**
* Contains the logic and code for painting links.
*/
- void paintFontUpdate( QPainter *p ) const;
+ void paintFontUpdate( TQPainter *p ) const;
private:
/** You are not supposed to call this on a KFileIVI, from the outside,
* it bypasses the icons cache */
- virtual void setPixmap ( const QPixmap & icon ) { KIconViewItem::setPixmap( icon ); }
- virtual void setPixmap ( const QPixmap & icon, bool recalc, bool redraw = TRUE )
+ virtual void setPixmap ( const TQPixmap & icon ) { KIconViewItem::setPixmap( icon ); }
+ virtual void setPixmap ( const TQPixmap & icon, bool recalc, bool redraw = TRUE )
{ KIconViewItem::setPixmap( icon, recalc, redraw ); }
/** Check if a thumbnail will be generated and calc the size of the icon */
diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cc
index 5c9d14783..2b32129c2 100644
--- a/libkonq/kivdirectoryoverlay.cc
+++ b/libkonq/kivdirectoryoverlay.cc
@@ -17,11 +17,11 @@
Boston, MA 02110-1301, USA.
*/
-#include <qdict.h>
-#include <qpixmap.h>
-#include <qpainter.h>
-#include <qbitmap.h>
-#include <qimage.h>
+#include <tqdict.h>
+#include <tqpixmap.h>
+#include <tqpainter.h>
+#include <tqbitmap.h>
+#include <tqimage.h>
#include <kfileivi.h>
#include <kfileitem.h>
@@ -43,8 +43,8 @@ KIVDirectoryOverlay::KIVDirectoryOverlay(KFileIVI* directory)
{
m_lister = new KDirLister;
m_lister->setAutoErrorHandlingEnabled(false, 0);
- connect(m_lister, SIGNAL(completed()), SLOT(slotCompleted()));
- connect(m_lister, SIGNAL(newItems( const KFileItemList& )), SLOT(slotNewItems( const KFileItemList& )));
+ connect(m_lister, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted()));
+ connect(m_lister, TQT_SIGNAL(newItems( const KFileItemList& )), TQT_SLOT(slotNewItems( const KFileItemList& )));
m_lister->setShowingDotFiles(false);
}
m_directory = directory;
@@ -60,7 +60,7 @@ KIVDirectoryOverlay::~KIVDirectoryOverlay()
void KIVDirectoryOverlay::start()
{
if ( m_directory->item()->isReadable() ) {
- m_popularIcons = new QDict<int>;
+ m_popularIcons = new TQDict<int>;
m_popularIcons->setAutoDelete(true);
m_lister->openURL(m_directory->item()->url());
} else {
@@ -68,7 +68,7 @@ void KIVDirectoryOverlay::start()
}
}
-void KIVDirectoryOverlay::timerEvent(QTimerEvent *)
+void KIVDirectoryOverlay::timerEvent(TQTimerEvent *)
{
m_lister->stop();
}
@@ -78,7 +78,7 @@ void KIVDirectoryOverlay::slotCompleted()
if (!m_popularIcons) return;
// Look through the histogram for the most popular mimetype
- QDictIterator<int> currentIcon( (*m_popularIcons) );
+ TQDictIterator<int> currentIcon( (*m_popularIcons) );
unsigned int best = 0;
unsigned int total = 0;
for ( ; currentIcon.current(); ++currentIcon ) {
@@ -120,7 +120,7 @@ void KIVDirectoryOverlay::slotNewItems( const KFileItemList& items )
for ( ; (file = files.current()) != 0; ++files ) {
if ( file -> isFile() ) {
- QString iconName = file -> iconName();
+ TQString iconName = file -> iconName();
if (!iconName) continue;
int* iconCount = m_popularIcons -> find( file -> iconName() );
diff --git a/libkonq/kivdirectoryoverlay.h b/libkonq/kivdirectoryoverlay.h
index 5ebd07959..27fba34d9 100644
--- a/libkonq/kivdirectoryoverlay.h
+++ b/libkonq/kivdirectoryoverlay.h
@@ -23,7 +23,7 @@
#include <kfileitem.h>
#include <libkonq_export.h>
-#include <qdict.h>
+#include <tqdict.h>
class KDirLister;
class KFileIVI;
@@ -40,7 +40,7 @@ signals:
void finished();
protected:
- virtual void timerEvent(QTimerEvent *);
+ virtual void timerEvent(TQTimerEvent *);
private slots:
void slotCompleted();
@@ -50,8 +50,8 @@ private:
KDirLister* m_lister;
bool m_foundItems;
bool m_containsFolder;
- QDict<int>* m_popularIcons;
- QString m_bestIcon;
+ TQDict<int>* m_popularIcons;
+ TQString m_bestIcon;
KFileIVI* m_directory;
};
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc
index 168ade6f7..d592a0617 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cc
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <qdir.h>
+#include <tqdir.h>
#include <kdebug.h>
#include <kdesktopfile.h>
@@ -41,14 +41,14 @@
#include <utime.h>
// For KURLDesktopFileDlg
-#include <qlayout.h>
-#include <qhbox.h>
+#include <tqlayout.h>
+#include <tqhbox.h>
#include <klineedit.h>
#include <kurlrequester.h>
-#include <qlabel.h>
-#include <qpopupmenu.h>
+#include <tqlabel.h>
+#include <tqpopupmenu.h>
-QValueList<KNewMenu::Entry> * KNewMenu::s_templatesList = 0L;
+TQValueList<KNewMenu::Entry> * KNewMenu::s_templatesList = 0L;
int KNewMenu::s_templatesVersion = 0;
bool KNewMenu::s_filesParsed = false;
KDirWatch * KNewMenu::s_pDirWatch = 0L;
@@ -58,8 +58,8 @@ class KNewMenu::KNewMenuPrivate
public:
KNewMenuPrivate() : m_parentWidget(0) {}
KActionCollection * m_actionCollection;
- QString m_destPath;
- QWidget *m_parentWidget;
+ TQString m_destPath;
+ TQWidget *m_parentWidget;
KActionMenu *m_menuDev;
};
@@ -75,7 +75,7 @@ KNewMenu::KNewMenu( KActionCollection * _collec, const char *name ) :
makeMenus();
}
-KNewMenu::KNewMenu( KActionCollection * _collec, QWidget *parentWidget, const char *name ) :
+KNewMenu::KNewMenu( KActionCollection * _collec, TQWidget *parentWidget, const char *name ) :
KActionMenu( i18n( "Create New" ), "filenew", _collec, name ),
menuItemsVersion( 0 )
{
@@ -106,15 +106,15 @@ void KNewMenu::slotCheckUpToDate( )
//kdDebug(1203) << "KNewMenu::slotCheckUpToDate() : recreating actions" << endl;
// We need to clean up the action collection
// We look for our actions using the group
- QValueList<KAction*> actions = d->m_actionCollection->actions( "KNewMenu" );
- for( QValueListIterator<KAction*> it = actions.begin(); it != actions.end(); ++it )
+ TQValueList<KAction*> actions = d->m_actionCollection->actions( "KNewMenu" );
+ for( TQValueListIterator<KAction*> it = actions.begin(); it != actions.end(); ++it )
{
remove( *it );
d->m_actionCollection->remove( *it );
}
if (!s_templatesList) { // No templates list up to now
- s_templatesList = new QValueList<Entry>();
+ s_templatesList = new TQValueList<Entry>();
slotFillTemplates();
parseFiles();
}
@@ -134,15 +134,15 @@ void KNewMenu::parseFiles()
{
//kdDebug(1203) << "KNewMenu::parseFiles()" << endl;
s_filesParsed = true;
- QValueList<Entry>::Iterator templ = s_templatesList->begin();
+ TQValueList<Entry>::Iterator templ = s_templatesList->begin();
for ( /*++templ*/; templ != s_templatesList->end(); ++templ)
{
- QString iconname;
- QString filePath = (*templ).filePath;
+ TQString iconname;
+ TQString filePath = (*templ).filePath;
if ( !filePath.isEmpty() )
{
- QString text;
- QString templatePath;
+ TQString text;
+ TQString templatePath;
// If a desktop file, then read the name from it.
// Otherwise (or if no name in it?) use file name
if ( KDesktopFile::isDesktopFile( filePath ) ) {
@@ -151,7 +151,7 @@ void KNewMenu::parseFiles()
text = config.readEntry("Name");
(*templ).icon = config.readEntry("Icon");
(*templ).comment = config.readEntry("Comment");
- QString type = config.readEntry( "Type" );
+ TQString type = config.readEntry( "Type" );
if ( type == "Link" )
{
templatePath = config.readPathEntry("URL");
@@ -162,7 +162,7 @@ void KNewMenu::parseFiles()
else
{
// A relative path, then (that's the default in the files we ship)
- QString linkDir = filePath.left( filePath.findRev( '/' ) + 1 /*keep / */ );
+ TQString linkDir = filePath.left( filePath.findRev( '/' ) + 1 /*keep / */ );
//kdDebug(1203) << "linkDir=" << linkDir << endl;
templatePath = linkDir + templatePath;
}
@@ -207,7 +207,7 @@ void KNewMenu::fillMenu()
KAction *linkURL = 0, *linkApp = 0; // these shall be put at special positions
int i = 1; // was 2 when there was Folder
- QValueList<Entry>::Iterator templ = s_templatesList->begin();
+ TQValueList<Entry>::Iterator templ = s_templatesList->begin();
for ( ; templ != s_templatesList->end(); ++templ, ++i)
{
if ( (*templ).entryType != SEPARATOR )
@@ -220,8 +220,8 @@ void KNewMenu::fillMenu()
bool bSkip = false;
- QValueList<KAction*> actions = d->m_actionCollection->actions();
- QValueListIterator<KAction*> it = actions.begin();
+ TQValueList<KAction*> actions = d->m_actionCollection->actions();
+ TQValueListIterator<KAction*> it = actions.begin();
for( ; it != actions.end() && !bSkip; ++it )
{
if ( (*it)->text() == (*templ).text )
@@ -238,8 +238,8 @@ void KNewMenu::fillMenu()
// The best way to identify the "Create Directory", "Link to Location", "Link to Application" was the template
if ( (*templ).templatePath.endsWith( "emptydir" ) )
{
- KAction * act = new KAction( (*templ).text, (*templ).icon, 0, this, SLOT( slotNewDir() ),
- d->m_actionCollection, QCString().sprintf("newmenu%d", i ) );
+ KAction * act = new KAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewDir() ),
+ d->m_actionCollection, TQCString().sprintf("newmenu%d", i ) );
act->setGroup( "KNewMenu" );
act->plug( popupMenu() );
@@ -248,8 +248,8 @@ void KNewMenu::fillMenu()
}
else
{
- KAction * act = new KAction( (*templ).text, (*templ).icon, 0, this, SLOT( slotNewFile() ),
- d->m_actionCollection, QCString().sprintf("newmenu%d", i ) );
+ KAction * act = new KAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewFile() ),
+ d->m_actionCollection, TQCString().sprintf("newmenu%d", i ) );
act->setGroup( "KNewMenu" );
if ( (*templ).templatePath.endsWith( "URL.desktop" ) )
@@ -296,18 +296,18 @@ void KNewMenu::slotFillTemplates()
if ( ! s_pDirWatch )
{
s_pDirWatch = new KDirWatch;
- QStringList dirs = d->m_actionCollection->instance()->dirs()->resourceDirs("templates");
- for ( QStringList::Iterator it = dirs.begin() ; it != dirs.end() ; ++it )
+ TQStringList dirs = d->m_actionCollection->instance()->dirs()->resourceDirs("templates");
+ for ( TQStringList::Iterator it = dirs.begin() ; it != dirs.end() ; ++it )
{
//kdDebug(1203) << "Templates resource dir: " << *it << endl;
s_pDirWatch->addDir( *it );
}
- connect ( s_pDirWatch, SIGNAL( dirty( const QString & ) ),
- this, SLOT ( slotFillTemplates() ) );
- connect ( s_pDirWatch, SIGNAL( created( const QString & ) ),
- this, SLOT ( slotFillTemplates() ) );
- connect ( s_pDirWatch, SIGNAL( deleted( const QString & ) ),
- this, SLOT ( slotFillTemplates() ) );
+ connect ( s_pDirWatch, TQT_SIGNAL( dirty( const TQString & ) ),
+ this, TQT_SLOT ( slotFillTemplates() ) );
+ connect ( s_pDirWatch, TQT_SIGNAL( created( const TQString & ) ),
+ this, TQT_SLOT ( slotFillTemplates() ) );
+ connect ( s_pDirWatch, TQT_SIGNAL( deleted( const TQString & ) ),
+ this, TQT_SLOT ( slotFillTemplates() ) );
// Ok, this doesn't cope with new dirs in KDEDIRS, but that's another story
}
s_templatesVersion++;
@@ -316,9 +316,9 @@ void KNewMenu::slotFillTemplates()
s_templatesList->clear();
// Look into "templates" dirs.
- QStringList files = d->m_actionCollection->instance()->dirs()->findAllResources("templates");
- KSortableValueList<Entry,QString> slist;
- for ( QStringList::Iterator it = files.begin() ; it != files.end() ; ++it )
+ TQStringList files = d->m_actionCollection->instance()->dirs()->findAllResources("templates");
+ KSortableValueList<Entry,TQString> slist;
+ for ( TQStringList::Iterator it = files.begin() ; it != files.end() ; ++it )
{
//kdDebug(1203) << *it << endl;
if ( (*it)[0] != '.' )
@@ -338,7 +338,7 @@ void KNewMenu::slotFillTemplates()
// tricky solution to ensure that TextFile is at the beginning
// because this filetype is the most used (according kde-core discussion)
- QString key = config.readEntry("Name");
+ TQString key = config.readEntry("Name");
if ( (*it).endsWith( "TextFile.desktop" ) )
key = "1_" + key;
else
@@ -349,7 +349,7 @@ void KNewMenu::slotFillTemplates()
}
}
slist.sort();
- for(KSortableValueList<Entry, QString>::ConstIterator it = slist.begin(); it != slist.end(); ++it)
+ for(KSortableValueList<Entry, TQString>::ConstIterator it = slist.begin(); it != slist.end(); ++it)
{
s_templatesList->append( (*it).value() );
}
@@ -368,26 +368,26 @@ void KNewMenu::slotNewDir()
void KNewMenu::slotNewFile()
{
- int id = QString( sender()->name() + 7 ).toInt(); // skip "newmenu"
+ int id = TQString( sender()->name() + 7 ).toInt(); // skip "newmenu"
if (id == 0)
{
// run the command for the templates
- KRun::runCommand(QString(sender()->name()));
+ KRun::runCommand(TQString(sender()->name()));
return;
}
emit activated(); // for KDIconView::slotNewMenuActivated()
Entry entry = *(s_templatesList->at( id - 1 ));
- //kdDebug(1203) << QString("sFile = %1").arg(sFile) << endl;
+ //kdDebug(1203) << TQString("sFile = %1").arg(sFile) << endl;
- if ( !QFile::exists( entry.templatePath ) ) {
+ if ( !TQFile::exists( entry.templatePath ) ) {
kdWarning(1203) << entry.templatePath << " doesn't exist" << endl;
KMessageBox::sorry( 0L, i18n("<qt>The template file <b>%1</b> does not exist.</qt>").arg(entry.templatePath));
return;
}
m_isURLDesktopFile = false;
- QString name;
+ TQString name;
if ( KDesktopFile::isDesktopFile( entry.templatePath ) )
{
KDesktopFile df( entry.templatePath );
@@ -418,12 +418,12 @@ void KNewMenu::slotNewFile()
//kdDebug(1203) << "first arg=" << entry.templatePath << endl;
//kdDebug(1203) << "second arg=" << (*it).url() << endl;
//kdDebug(1203) << "third arg=" << entry.text << endl;
- QString text = entry.text;
- text.replace( "...", QString::null ); // the ... is fine for the menu item but not for the default filename
+ TQString text = entry.text;
+ text.replace( "...", TQString::null ); // the ... is fine for the menu item but not for the default filename
KURL defaultFile( *it );
defaultFile.addPath( KIO::encodeFileName( text ) );
- if ( defaultFile.isLocalFile() && QFile::exists( defaultFile.path() ) )
+ if ( defaultFile.isLocalFile() && TQFile::exists( defaultFile.path() ) )
text = KIO::RenameDlg::suggestName( *it, text);
KURL templateURL;
@@ -438,15 +438,15 @@ void KNewMenu::slotNewFile()
// The template is not a desktop file
// Show the small dialog for getting the destination filename
bool ok;
- QString text = entry.text;
- text.replace( "...", QString::null ); // the ... is fine for the menu item but not for the default filename
+ TQString text = entry.text;
+ text.replace( "...", TQString::null ); // the ... is fine for the menu item but not for the default filename
KURL defaultFile( *(popupFiles.begin()) );
defaultFile.addPath( KIO::encodeFileName( text ) );
- if ( defaultFile.isLocalFile() && QFile::exists( defaultFile.path() ) )
+ if ( defaultFile.isLocalFile() && TQFile::exists( defaultFile.path() ) )
text = KIO::RenameDlg::suggestName( *(popupFiles.begin()), text);
- name = KInputDialog::getText( QString::null, entry.comment,
+ name = KInputDialog::getText( TQString::null, entry.comment,
text, &ok, d->m_parentWidget );
if ( !ok )
return;
@@ -456,7 +456,7 @@ void KNewMenu::slotNewFile()
// Copy it.
KURL::List::Iterator it = popupFiles.begin();
- QString src = entry.templatePath;
+ TQString src = entry.templatePath;
for ( ; it != popupFiles.end(); ++it )
{
KURL dest( *it );
@@ -468,11 +468,11 @@ void KNewMenu::slotNewFile()
//kdDebug(1203) << "KNewMenu : KIO::copyAs( " << uSrc.url() << ", " << dest.url() << ")" << endl;
KIO::CopyJob * job = KIO::copyAs( uSrc, dest );
job->setDefaultPermissions( true );
- connect( job, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotResult( KIO::Job * ) ) );
if ( m_isURLDesktopFile )
- connect( job, SIGNAL( renamed( KIO::Job *, const KURL&, const KURL& ) ),
- SLOT( slotRenamed( KIO::Job *, const KURL&, const KURL& ) ) );
+ connect( job, TQT_SIGNAL( renamed( KIO::Job *, const KURL&, const KURL& ) ),
+ TQT_SLOT( slotRenamed( KIO::Job *, const KURL&, const KURL& ) ) );
KURL::List lst;
lst.append( uSrc );
(void)new KonqCommandRecorder( KonqCommand::COPY, lst, dest, job );
@@ -513,7 +513,7 @@ void KNewMenu::slotResult( KIO::Job * job )
else
{
// Normal (local) file. Need to "touch" it, kio_file copied the mtime.
- (void) ::utime( QFile::encodeName( destURL.path() ), 0 );
+ (void) ::utime( TQFile::encodeName( destURL.path() ), 0 );
}
}
}
@@ -521,86 +521,86 @@ void KNewMenu::slotResult( KIO::Job * job )
//////////
-KURLDesktopFileDlg::KURLDesktopFileDlg( const QString& textFileName, const QString& textUrl )
- : KDialogBase( Plain, QString::null, Ok|Cancel|User1, Ok, 0L /*parent*/, 0L, true,
+KURLDesktopFileDlg::KURLDesktopFileDlg( const TQString& textFileName, const TQString& textUrl )
+ : KDialogBase( Plain, TQString::null, Ok|Cancel|User1, Ok, 0L /*parent*/, 0L, true,
true, KStdGuiItem::clear() )
{
- initDialog( textFileName, QString::null, textUrl, QString::null );
+ initDialog( textFileName, TQString::null, textUrl, TQString::null );
}
-KURLDesktopFileDlg::KURLDesktopFileDlg( const QString& textFileName, const QString& textUrl, QWidget *parent )
- : KDialogBase( Plain, QString::null, Ok|Cancel|User1, Ok, parent, 0L, true,
+KURLDesktopFileDlg::KURLDesktopFileDlg( const TQString& textFileName, const TQString& textUrl, TQWidget *parent )
+ : KDialogBase( Plain, TQString::null, Ok|Cancel|User1, Ok, parent, 0L, true,
true, KStdGuiItem::clear() )
{
- initDialog( textFileName, QString::null, textUrl, QString::null );
+ initDialog( textFileName, TQString::null, textUrl, TQString::null );
}
-void KURLDesktopFileDlg::initDialog( const QString& textFileName, const QString& defaultName, const QString& textUrl, const QString& defaultUrl )
+void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQString& defaultName, const TQString& textUrl, const TQString& defaultUrl )
{
- QVBoxLayout * topLayout = new QVBoxLayout( plainPage(), 0, spacingHint() );
+ TQVBoxLayout * topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
// First line: filename
- QHBox * fileNameBox = new QHBox( plainPage() );
+ TQHBox * fileNameBox = new TQHBox( plainPage() );
topLayout->addWidget( fileNameBox );
- QLabel * label = new QLabel( textFileName, fileNameBox );
+ TQLabel * label = new TQLabel( textFileName, fileNameBox );
m_leFileName = new KLineEdit( fileNameBox, 0L );
m_leFileName->setMinimumWidth(m_leFileName->sizeHint().width() * 3);
label->setBuddy(m_leFileName); // please "scheck" style
m_leFileName->setText( defaultName );
m_leFileName->setSelection(0, m_leFileName->text().length()); // autoselect
- connect( m_leFileName, SIGNAL(textChanged(const QString&)),
- SLOT(slotNameTextChanged(const QString&)) );
+ connect( m_leFileName, TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(slotNameTextChanged(const TQString&)) );
// Second line: url
- QHBox * urlBox = new QHBox( plainPage() );
+ TQHBox * urlBox = new TQHBox( plainPage() );
topLayout->addWidget( urlBox );
- label = new QLabel( textUrl, urlBox );
+ label = new TQLabel( textUrl, urlBox );
m_urlRequester = new KURLRequester( defaultUrl, urlBox, "urlRequester" );
m_urlRequester->setMode( KFile::File | KFile::Directory );
m_urlRequester->setMinimumWidth( m_urlRequester->sizeHint().width() * 3 );
- connect( m_urlRequester->lineEdit(), SIGNAL(textChanged(const QString&)),
- SLOT(slotURLTextChanged(const QString&)) );
+ connect( m_urlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(slotURLTextChanged(const TQString&)) );
label->setBuddy(m_urlRequester); // please "scheck" style
m_urlRequester->setFocus();
enableButtonOK( !defaultName.isEmpty() && !defaultUrl.isEmpty() );
- connect( this, SIGNAL(user1Clicked()), this, SLOT(slotClear()) );
+ connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClear()) );
m_fileNameEdited = false;
}
-QString KURLDesktopFileDlg::url() const
+TQString KURLDesktopFileDlg::url() const
{
- if ( result() == QDialog::Accepted )
+ if ( result() == TQDialog::Accepted )
return m_urlRequester->url();
else
- return QString::null;
+ return TQString::null;
}
-QString KURLDesktopFileDlg::fileName() const
+TQString KURLDesktopFileDlg::fileName() const
{
- if ( result() == QDialog::Accepted )
+ if ( result() == TQDialog::Accepted )
return m_leFileName->text();
else
- return QString::null;
+ return TQString::null;
}
void KURLDesktopFileDlg::slotClear()
{
- m_leFileName->setText( QString::null );
+ m_leFileName->setText( TQString::null );
m_urlRequester->clear();
m_fileNameEdited = false;
}
-void KURLDesktopFileDlg::slotNameTextChanged( const QString& )
+void KURLDesktopFileDlg::slotNameTextChanged( const TQString& )
{
kdDebug() << k_funcinfo << endl;
m_fileNameEdited = true;
enableButtonOK( !m_leFileName->text().isEmpty() && !m_urlRequester->url().isEmpty() );
}
-void KURLDesktopFileDlg::slotURLTextChanged( const QString& )
+void KURLDesktopFileDlg::slotURLTextChanged( const TQString& )
{
if ( !m_fileNameEdited )
{
diff --git a/libkonq/knewmenu.h b/libkonq/knewmenu.h
index ecba301e5..9039c2878 100644
--- a/libkonq/knewmenu.h
+++ b/libkonq/knewmenu.h
@@ -20,8 +20,8 @@
#ifndef __knewmenu_h
#define __knewmenu_h
-#include <qintdict.h>
-#include <qstringlist.h>
+#include <tqintdict.h>
+#include <tqstringlist.h>
#include <kaction.h>
#include <kdialogbase.h>
@@ -58,7 +58,7 @@ public:
* Constructor
*/
KNewMenu( KActionCollection * _collec, const char *name=0L );
- KNewMenu( KActionCollection * _collec, QWidget *parentWidget, const char *name=0L );
+ KNewMenu( KActionCollection * _collec, TQWidget *parentWidget, const char *name=0L );
virtual ~KNewMenu();
/**
@@ -128,12 +128,12 @@ private:
enum { LINKTOTEMPLATE = 1, TEMPLATE, SEPARATOR };
struct Entry {
- QString text;
- QString filePath; // empty for SEPARATOR
- QString templatePath; // same as filePath for TEMPLATE
- QString icon;
+ TQString text;
+ TQString filePath; // empty for SEPARATOR
+ TQString templatePath; // same as filePath for TEMPLATE
+ TQString icon;
int entryType;
- QString comment;
+ TQString comment;
};
// NOTE: only filePath is known before we call parseFiles
@@ -141,7 +141,7 @@ private:
* List of all template files. It is important that they are in
* the same order as the 'New' menu.
*/
- static QValueList<Entry> * s_templatesList;
+ static TQValueList<Entry> * s_templatesList;
class KNewMenuPrivate;
KNewMenuPrivate* d;
@@ -171,7 +171,7 @@ private:
* True when a desktop file with Type=URL is being copied
*/
bool m_isURLDesktopFile;
- QString m_linkURL; // the url to put in the file
+ TQString m_linkURL; // the url to put in the file
static KDirWatch * s_pDirWatch;
};
@@ -186,25 +186,25 @@ class KURLDesktopFileDlg : public KDialogBase
{
Q_OBJECT
public:
- KURLDesktopFileDlg( const QString& textFileName, const QString& textUrl );
- KURLDesktopFileDlg( const QString& textFileName, const QString& textUrl, QWidget *parent );
+ KURLDesktopFileDlg( const TQString& textFileName, const TQString& textUrl );
+ KURLDesktopFileDlg( const TQString& textFileName, const TQString& textUrl, TQWidget *parent );
virtual ~KURLDesktopFileDlg() {}
/**
* @return the filename the user entered (no path)
*/
- QString fileName() const;
+ TQString fileName() const;
/**
* @return the URL the user entered
*/
- QString url() const;
+ TQString url() const;
protected slots:
void slotClear();
- void slotNameTextChanged( const QString& );
- void slotURLTextChanged( const QString& );
+ void slotNameTextChanged( const TQString& );
+ void slotURLTextChanged( const TQString& );
private:
- void initDialog( const QString& textFileName, const QString& defaultName, const QString& textUrl, const QString& defaultUrl );
+ void initDialog( const TQString& textFileName, const TQString& defaultName, const TQString& textUrl, const TQString& defaultUrl );
/**
* The line edit widget for the fileName
diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cc
index bb871d2fc..ca21c69a3 100644
--- a/libkonq/konq_bgnddlg.cc
+++ b/libkonq/konq_bgnddlg.cc
@@ -18,10 +18,10 @@
Boston, MA 02110-1301, USA.
*/
-#include <qbuttongroup.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
+#include <tqbuttongroup.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqradiobutton.h>
#include <kcolorbutton.h>
#include <kcombobox.h>
@@ -35,72 +35,72 @@
#include "konq_bgnddlg.h"
-KonqBgndDialog::KonqBgndDialog( QWidget* parent,
- const QString& pixmapFile,
- const QColor& theColor,
- const QColor& defaultColor )
+KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
+ const TQString& pixmapFile,
+ const TQColor& theColor,
+ const TQColor& defaultColor )
: KDialogBase( parent, "KonqBgndDialog", false,
i18n("Background Settings"), Ok|Cancel, Ok, true )
{
- QWidget* page = new QWidget( this );
+ TQWidget* page = new TQWidget( this );
setMainWidget( page );
- QVBoxLayout* mainLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+ TQVBoxLayout* mainLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
- m_buttonGroup = new QButtonGroup( i18n("Background"), page );
+ m_buttonGroup = new TQButtonGroup( i18n("Background"), page );
m_buttonGroup->setColumnLayout( 0, Qt::Vertical );
m_buttonGroup->layout()->setMargin( KDialog::marginHint() );
m_buttonGroup->layout()->setSpacing( KDialog::spacingHint() );
- QGridLayout* groupLayout = new QGridLayout( m_buttonGroup->layout() );
+ TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->layout() );
groupLayout->setAlignment( Qt::AlignTop );
mainLayout->addWidget( m_buttonGroup );
- connect( m_buttonGroup, SIGNAL( clicked(int) ),
- this, SLOT( slotBackgroundModeChanged() ) );
+ connect( m_buttonGroup, TQT_SIGNAL( clicked(int) ),
+ this, TQT_SLOT( slotBackgroundModeChanged() ) );
// color
- m_radioColor = new QRadioButton( i18n("Co&lor:"), m_buttonGroup );
+ m_radioColor = new TQRadioButton( i18n("Co&lor:"), m_buttonGroup );
groupLayout->addWidget( m_radioColor, 0, 0 );
m_buttonColor = new KColorButton( theColor, defaultColor, m_buttonGroup );
- m_buttonColor->setSizePolicy( QSizePolicy::Preferred,
- QSizePolicy::Minimum );
+ m_buttonColor->setSizePolicy( TQSizePolicy::Preferred,
+ TQSizePolicy::Minimum );
groupLayout->addWidget( m_buttonColor, 0, 1 );
- connect( m_buttonColor, SIGNAL( changed( const QColor& ) ),
- this, SLOT( slotColorChanged() ) );
+ connect( m_buttonColor, TQT_SIGNAL( changed( const TQColor& ) ),
+ this, TQT_SLOT( slotColorChanged() ) );
// picture
- m_radioPicture = new QRadioButton( i18n("&Picture:"), m_buttonGroup );
+ m_radioPicture = new TQRadioButton( i18n("&Picture:"), m_buttonGroup );
groupLayout->addWidget( m_radioPicture, 1, 0 );
m_comboPicture = new KURLComboRequester( m_buttonGroup );
groupLayout->addMultiCellWidget( m_comboPicture, 1, 1, 1, 2 );
initPictures();
- connect( m_comboPicture->comboBox(), SIGNAL( activated( int ) ),
- this, SLOT( slotPictureChanged() ) );
- connect( m_comboPicture, SIGNAL( urlSelected(const QString &) ),
- this, SLOT( slotPictureChanged() ) );
+ connect( m_comboPicture->comboBox(), TQT_SIGNAL( activated( int ) ),
+ this, TQT_SLOT( slotPictureChanged() ) );
+ connect( m_comboPicture, TQT_SIGNAL( urlSelected(const TQString &) ),
+ this, TQT_SLOT( slotPictureChanged() ) );
- QSpacerItem* spacer1 = new QSpacerItem( 0, 0, QSizePolicy::Expanding,
- QSizePolicy::Minimum );
+ TQSpacerItem* spacer1 = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding,
+ TQSizePolicy::Minimum );
groupLayout->addItem( spacer1, 0, 2 );
// preview title
- QHBoxLayout* hlay = new QHBoxLayout( mainLayout, KDialog::spacingHint() );
+ TQHBoxLayout* hlay = new TQHBoxLayout( mainLayout, KDialog::spacingHint() );
//mainLayout->addLayout( hlay );
- QLabel* lbl = new QLabel( i18n("Preview"), page );
+ TQLabel* lbl = new TQLabel( i18n("Preview"), page );
hlay->addWidget( lbl );
- QFrame* frame = new QFrame( page );
- frame->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum );
- frame->setFrameShape( QFrame::HLine );
- frame->setFrameShadow( QFrame::Sunken );
+ TQFrame* frame = new TQFrame( page );
+ frame->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+ frame->setFrameShape( TQFrame::HLine );
+ frame->setFrameShadow( TQFrame::Sunken );
hlay->addWidget( frame );
// preview frame
- m_preview = new QFrame( page );
- m_preview->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
+ m_preview = new TQFrame( page );
+ m_preview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
m_preview->setMinimumSize( 370, 180 );
- m_preview->setFrameShape( QFrame::Panel );
- m_preview->setFrameShadow( QFrame::Raised );
+ m_preview->setFrameShape( TQFrame::Panel );
+ m_preview->setFrameShadow( TQFrame::Raised );
mainLayout->addWidget( m_preview );
if ( !pixmapFile.isEmpty() ) {
@@ -120,12 +120,12 @@ KonqBgndDialog::~KonqBgndDialog()
{
}
-QColor KonqBgndDialog::color() const
+TQColor KonqBgndDialog::color() const
{
if ( m_radioColor->isChecked() )
return m_buttonColor->color();
- return QColor();
+ return TQColor();
}
void KonqBgndDialog::initPictures()
@@ -134,12 +134,12 @@ void KonqBgndDialog::initPictures()
KGlobal::dirs()->kde_default("data") + "konqueror/tiles/");
kdDebug(1203) << KGlobal::dirs()->kde_default("data") + "konqueror/tiles/" << endl;
- QStringList list = KGlobal::dirs()->findAllResources("tiles");
+ TQStringList list = KGlobal::dirs()->findAllResources("tiles");
if ( list.isEmpty() )
m_comboPicture->comboBox()->insertItem( i18n("None") );
else {
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for ( it = list.begin(); it != list.end(); it++ )
m_comboPicture->comboBox()->insertItem(
( (*it).at(0) == '/' ) ? // if absolute path
@@ -148,7 +148,7 @@ void KonqBgndDialog::initPictures()
}
}
-void KonqBgndDialog::loadPicture( const QString& fileName )
+void KonqBgndDialog::loadPicture( const TQString& fileName )
{
int i ;
for ( i = 0; i < m_comboPicture->comboBox()->count(); i++ ) {
@@ -169,13 +169,13 @@ void KonqBgndDialog::loadPicture( const QString& fileName )
void KonqBgndDialog::slotPictureChanged()
{
m_pixmapFile = m_comboPicture->comboBox()->currentText();
- QString file = locate( "tiles", m_pixmapFile );
+ TQString file = locate( "tiles", m_pixmapFile );
if ( file.isEmpty() )
file = locate("wallpaper", m_pixmapFile); // add fallback for compatibility
if ( file.isEmpty() ) {
kdWarning(1203) << "Couldn't locate wallpaper " << m_pixmapFile << endl;
m_preview->unsetPalette();
- m_pixmap = QPixmap();
+ m_pixmap = TQPixmap();
m_pixmapFile = "";
}
else {
diff --git a/libkonq/konq_bgnddlg.h b/libkonq/konq_bgnddlg.h
index 3a1e3c67d..b5366f863 100644
--- a/libkonq/konq_bgnddlg.h
+++ b/libkonq/konq_bgnddlg.h
@@ -21,8 +21,8 @@
#ifndef __konq_bgnd_h
#define __konq_bgnd_h
-#include <qstring.h>
-#include <qpixmap.h>
+#include <tqstring.h>
+#include <tqpixmap.h>
#include <kdialogbase.h>
@@ -42,12 +42,12 @@ public:
/**
* Constructor
*/
- KonqBgndDialog( QWidget* parent, const QString& pixmapFile,
- const QColor& theColor, const QColor& defaultColor );
+ KonqBgndDialog( TQWidget* parent, const TQString& pixmapFile,
+ const TQColor& theColor, const TQColor& defaultColor );
~KonqBgndDialog();
- QColor color() const;
- const QString& pixmapFile() const { return m_pixmapFile; }
+ TQColor color() const;
+ const TQString& pixmapFile() const { return m_pixmapFile; }
private slots:
void slotBackgroundModeChanged();
@@ -56,16 +56,16 @@ private slots:
private:
void initPictures();
- void loadPicture( const QString& fileName );
+ void loadPicture( const TQString& fileName );
- QColor m_color;
- QPixmap m_pixmap;
- QString m_pixmapFile;
- QFrame* m_preview;
+ TQColor m_color;
+ TQPixmap m_pixmap;
+ TQString m_pixmapFile;
+ TQFrame* m_preview;
- QButtonGroup* m_buttonGroup;
- QRadioButton* m_radioColor;
- QRadioButton* m_radioPicture;
+ TQButtonGroup* m_buttonGroup;
+ TQRadioButton* m_radioColor;
+ TQRadioButton* m_radioPicture;
KURLRequester* m_comboPicture;
KColorButton* m_buttonColor;
diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc
index 0e46ec0c9..d64dde7ef 100644
--- a/libkonq/konq_dirpart.cc
+++ b/libkonq/konq_dirpart.cc
@@ -38,21 +38,21 @@
#include <kurifilter.h>
#include <kglobalsettings.h>
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qfile.h>
-#include <qguardedptr.h>
+#include <tqapplication.h>
+#include <tqclipboard.h>
+#include <tqfile.h>
+#include <tqguardedptr.h>
#include <assert.h>
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
class KonqDirPart::KonqDirPartPrivate
{
public:
KonqDirPartPrivate() : dirLister( 0 ) {}
- QStringList mimeFilters;
+ TQStringList mimeFilters;
KToggleAction *aEnormousIcons;
KToggleAction *aSmallMediumIcons;
- QValueVector<int> iconSize;
+ TQValueVector<int> iconSize;
KDirLister* dirLister;
bool dirSizeDirty;
@@ -67,13 +67,13 @@ void KonqDirPart::KonqDirPartPrivate::findAvailableIconSizes(void)
KIconTheme *root = KGlobal::instance()->iconLoader()->theme();
iconSize.resize(1);
if (root) {
- QValueList<int> avSizes = root->querySizes(KIcon::Desktop);
+ TQValueList<int> avSizes = root->querySizes(KIcon::Desktop);
kdDebug(1203) << "The icon theme handles the sizes:" << avSizes << endl;
qHeapSort(avSizes);
int oldSize = -1;
if (avSizes.count() < 10) {
// Fixed or threshold type icons
- QValueListConstIterator<int> i;
+ TQValueListConstIterator<int> i;
for (i = avSizes.begin(); i != avSizes.end(); i++) {
// Skip duplicated values (sanity check)
if (*i != oldSize) iconSize.append(*i);
@@ -83,7 +83,7 @@ void KonqDirPart::KonqDirPartPrivate::findAvailableIconSizes(void)
// Scalable icons.
const int progression[] = {16, 22, 32, 48, 64, 96, 128, 192, 256};
- QValueListConstIterator<int> j = avSizes.begin();
+ TQValueListConstIterator<int> j = avSizes.begin();
for (uint i = 0; i < 9; i++) {
while (j++ != avSizes.end()) {
if (*j >= progression[i]) {
@@ -124,7 +124,7 @@ int KonqDirPart::KonqDirPartPrivate::nearestIconSizeError(int size)
return QABS(size - findNearestIconSize(size));
}
-KonqDirPart::KonqDirPart( QObject *parent, const char *name )
+KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
:KParts::ReadOnlyPart( parent, name ),
m_pProps( 0L ),
m_findPart( 0L )
@@ -133,12 +133,12 @@ KonqDirPart::KonqDirPart( QObject *parent, const char *name )
resetCount();
//m_bMultipleItemsSelected = false;
- connect( QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(slotClipboardDataChanged()) );
+ connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
actionCollection()->setHighlightingEnabled( true );
- m_paIncIconSize = new KAction( i18n( "Enlarge Icons" ), "viewmag+", 0, this, SLOT( slotIncIconSize() ), actionCollection(), "incIconSize" );
- m_paDecIconSize = new KAction( i18n( "Shrink Icons" ), "viewmag-", 0, this, SLOT( slotDecIconSize() ), actionCollection(), "decIconSize" );
+ m_paIncIconSize = new KAction( i18n( "Enlarge Icons" ), "viewmag+", 0, this, TQT_SLOT( slotIncIconSize() ), actionCollection(), "incIconSize" );
+ m_paDecIconSize = new KAction( i18n( "Shrink Icons" ), "viewmag-", 0, this, TQT_SLOT( slotDecIconSize() ), actionCollection(), "decIconSize" );
m_paDefaultIcons = new KRadioAction( i18n( "&Default Size" ), 0, actionCollection(), "modedefault" );
d->aEnormousIcons = new KRadioAction( i18n( "&Huge" ), 0,
@@ -158,17 +158,17 @@ KonqDirPart::KonqDirPart( QObject *parent, const char *name )
d->aSmallMediumIcons->setExclusiveGroup( "ViewMode" );
m_paSmallIcons->setExclusiveGroup( "ViewMode" );
- connect( m_paDefaultIcons, SIGNAL( toggled( bool ) ), this, SLOT( slotIconSizeToggled( bool ) ) );
- connect( d->aEnormousIcons, SIGNAL( toggled( bool ) ),
- this, SLOT( slotIconSizeToggled( bool ) ) );
- connect( m_paHugeIcons, SIGNAL( toggled( bool ) ), this, SLOT( slotIconSizeToggled( bool ) ) );
- connect( m_paLargeIcons, SIGNAL( toggled( bool ) ), this, SLOT( slotIconSizeToggled( bool ) ) );
- connect( m_paMediumIcons, SIGNAL( toggled( bool ) ), this, SLOT( slotIconSizeToggled( bool ) ) );
- connect( d->aSmallMediumIcons, SIGNAL( toggled( bool ) ),
- this, SLOT( slotIconSizeToggled( bool ) ) );
- connect( m_paSmallIcons, SIGNAL( toggled( bool ) ), this, SLOT( slotIconSizeToggled( bool ) ) );
-
- connect( kapp, SIGNAL(iconChanged(int)), SLOT(slotIconChanged(int)) );
+ connect( m_paDefaultIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
+ connect( d->aEnormousIcons, TQT_SIGNAL( toggled( bool ) ),
+ this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
+ connect( m_paHugeIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
+ connect( m_paLargeIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
+ connect( m_paMediumIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
+ connect( d->aSmallMediumIcons, TQT_SIGNAL( toggled( bool ) ),
+ this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
+ connect( m_paSmallIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
+
+ connect( kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int)) );
#if 0
// Extract 6 icon sizes from the icon theme.
// Use 16,22,32,48,64,128 as default.
@@ -186,13 +186,13 @@ KonqDirPart::KonqDirPart( QObject *parent, const char *name )
KIconTheme *root = KGlobal::instance()->iconLoader()->theme();
if (root)
{
- QValueList<int> avSizes = root->querySizes(KIcon::Desktop);
+ TQValueList<int> avSizes = root->querySizes(KIcon::Desktop);
kdDebug(1203) << "the icon theme handles the following sizes:" << avSizes << endl;
if (avSizes.count() < 10) {
// Use the icon sizes supplied by the theme.
// If avSizes contains more than 10 entries, assume a scalable
// icon theme.
- QValueList<int>::Iterator it;
+ TQValueList<int>::Iterator it;
for (i=1, it=avSizes.begin(); (it!=avSizes.end()) && (i<7); it++, i++)
{
d->iconSize[i] = *it;
@@ -219,7 +219,7 @@ KonqDirPart::KonqDirPart( QObject *parent, const char *name )
m_iIconSize[4] = KIcon::SizeHuge;
// ... up to here
- KAction *a = new KAction( i18n( "Configure Background..." ), "background", 0, this, SLOT( slotBackgroundSettings() ),
+ KAction *a = new KAction( i18n( "Configure Background..." ), "background", 0, this, TQT_SLOT( slotBackgroundSettings() ),
actionCollection(), "bgsettings" );
a->setToolTip( i18n( "Allows choosing of background settings for this view" ) );
@@ -254,9 +254,9 @@ void KonqDirPart::adjustIconSizes()
}
}
-void KonqDirPart::setMimeFilter (const QStringList& mime)
+void KonqDirPart::setMimeFilter (const TQStringList& mime)
{
- QString u = url().url();
+ TQString u = url().url();
if ( u.isEmpty () )
return;
@@ -267,23 +267,23 @@ void KonqDirPart::setMimeFilter (const QStringList& mime)
d->mimeFilters = mime;
}
-QStringList KonqDirPart::mimeFilter() const
+TQStringList KonqDirPart::mimeFilter() const
{
return d->mimeFilters;
}
-QScrollView * KonqDirPart::scrollWidget()
+TQScrollView * KonqDirPart::scrollWidget()
{
- return static_cast<QScrollView *>(widget());
+ return static_cast<TQScrollView *>(widget());
}
void KonqDirPart::slotBackgroundSettings()
{
- QColor bgndColor = m_pProps->bgColor( widget() );
- QColor defaultColor = KGlobalSettings::baseColor();
+ TQColor bgndColor = m_pProps->bgColor( widget() );
+ TQColor defaultColor = KGlobalSettings::baseColor();
// dlg must be created on the heap as widget() can get deleted while dlg.exec(),
// trying to delete dlg as its child then (#124210) - Frank Osterfeld
- QGuardedPtr<KonqBgndDialog> dlg = new KonqBgndDialog( widget(),
+ TQGuardedPtr<KonqBgndDialog> dlg = new KonqBgndDialog( widget(),
m_pProps->bgPixmapFile(),
bgndColor,
defaultColor );
@@ -313,7 +313,7 @@ void KonqDirPart::lmbClicked( KFileItem * fileItem )
if ( !fileItem->isReadable() )
{
// No permissions or local file that doesn't exist - need to find out which
- if ( ( !fileItem->isLocalFile() ) || QFile::exists( url.path() ) )
+ if ( ( !fileItem->isLocalFile() ) || TQFile::exists( url.path() ) )
{
KMessageBox::error( widget(), i18n("<p>You do not have enough permissions to read <b>%1</b></p>").arg(url.prettyURL()) );
return;
@@ -369,17 +369,17 @@ void KonqDirPart::mmbClicked( KFileItem * fileItem )
}
}
-void KonqDirPart::saveState( QDataStream& stream )
+void KonqDirPart::saveState( TQDataStream& stream )
{
stream << m_nameFilter;
}
-void KonqDirPart::restoreState( QDataStream& stream )
+void KonqDirPart::restoreState( TQDataStream& stream )
{
stream >> m_nameFilter;
}
-void KonqDirPart::saveFindState( QDataStream& stream )
+void KonqDirPart::saveFindState( TQDataStream& stream )
{
// assert only doable in KDE4.
//assert( m_findPart ); // test done by caller.
@@ -397,7 +397,7 @@ void KonqDirPart::saveFindState( QDataStream& stream )
ext->saveState( stream );
}
-void KonqDirPart::restoreFindState( QDataStream& stream )
+void KonqDirPart::restoreFindState( TQDataStream& stream )
{
// Restore our own URL
stream >> m_url;
@@ -418,7 +418,7 @@ void KonqDirPart::slotClipboardDataChanged()
// This is very related to KDIconView::slotClipboardDataChanged
KURL::List lst;
- QMimeSource *data = QApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) && data->provides( "text/uri-list" ) )
if ( KonqDrag::decodeIsCutSelection( data ) )
(void) KURLDrag::decode( data, lst );
@@ -430,7 +430,7 @@ void KonqDirPart::slotClipboardDataChanged()
void KonqDirPart::updatePasteAction() // KDE4: merge into method above
{
- QString actionText = KIO::pasteActionText();
+ TQString actionText = KIO::pasteActionText();
bool paste = !actionText.isEmpty();
if ( paste )
emit m_extension->setActionText( "paste", actionText );
@@ -475,7 +475,7 @@ void KonqDirPart::emitTotalCount()
d->dirSizeDirty = false;
}
- QString summary =
+ TQString summary =
KIO::itemsSummaryString(m_lFileCount + m_lDirCount,
m_lFileCount,
m_lDirCount,
@@ -484,7 +484,7 @@ void KonqDirPart::emitTotalCount()
bool bShowsResult = false;
if (m_findPart)
{
- QVariant prop = m_findPart->property( "showsResult" );
+ TQVariant prop = m_findPart->property( "showsResult" );
bShowsResult = prop.isValid() && prop.toBool();
}
//kdDebug(1203) << "KonqDirPart::emitTotalCount bShowsResult=" << bShowsResult << endl;
@@ -527,7 +527,7 @@ void KonqDirPart::emitCounts( const KFileItemList & lst, bool selectionChanged )
emitCounts( lst );
// Yes, the caller could do that too :)
- // But this bool could also be used to cache the QString for the last
+ // But this bool could also be used to cache the TQString for the last
// selection, as long as selectionChanged is false.
// Not sure it's worth it though.
// MiB: no, I don't think it's worth it. Especially regarding the
@@ -650,25 +650,25 @@ void KonqDirPart::setFindPart( KParts::ReadOnlyPart * part )
{
assert(part);
m_findPart = part;
- connect( m_findPart, SIGNAL( started() ),
- this, SLOT( slotStarted() ) );
- connect( m_findPart, SIGNAL( started() ),
- this, SLOT( slotStartAnimationSearching() ) );
- connect( m_findPart, SIGNAL( clear() ),
- this, SLOT( slotClear() ) );
- connect( m_findPart, SIGNAL( newItems( const KFileItemList & ) ),
- this, SLOT( slotNewItems( const KFileItemList & ) ) );
- connect( m_findPart, SIGNAL( finished() ), // can't name it completed, it conflicts with a KROP signal
- this, SLOT( slotCompleted() ) );
- connect( m_findPart, SIGNAL( finished() ),
- this, SLOT( slotStopAnimationSearching() ) );
- connect( m_findPart, SIGNAL( canceled() ),
- this, SLOT( slotCanceled() ) );
- connect( m_findPart, SIGNAL( canceled() ),
- this, SLOT( slotStopAnimationSearching() ) );
-
- connect( m_findPart, SIGNAL( findClosed() ),
- this, SLOT( slotFindClosed() ) );
+ connect( m_findPart, TQT_SIGNAL( started() ),
+ this, TQT_SLOT( slotStarted() ) );
+ connect( m_findPart, TQT_SIGNAL( started() ),
+ this, TQT_SLOT( slotStartAnimationSearching() ) );
+ connect( m_findPart, TQT_SIGNAL( clear() ),
+ this, TQT_SLOT( slotClear() ) );
+ connect( m_findPart, TQT_SIGNAL( newItems( const KFileItemList & ) ),
+ this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
+ connect( m_findPart, TQT_SIGNAL( finished() ), // can't name it completed, it conflicts with a KROP signal
+ this, TQT_SLOT( slotCompleted() ) );
+ connect( m_findPart, TQT_SIGNAL( finished() ),
+ this, TQT_SLOT( slotStopAnimationSearching() ) );
+ connect( m_findPart, TQT_SIGNAL( canceled() ),
+ this, TQT_SLOT( slotCanceled() ) );
+ connect( m_findPart, TQT_SIGNAL( canceled() ),
+ this, TQT_SLOT( slotStopAnimationSearching() ) );
+
+ connect( m_findPart, TQT_SIGNAL( findClosed() ),
+ this, TQT_SLOT( slotFindClosed() ) );
emit findOpened( this );
@@ -702,7 +702,7 @@ void KonqDirPart::slotStopAnimationSearching()
completed();
}
-void KonqDirPartBrowserExtension::saveState( QDataStream &stream )
+void KonqDirPartBrowserExtension::saveState( TQDataStream &stream )
{
m_dirPart->saveState( stream );
bool hasFindPart = m_dirPart->findPart();
@@ -715,7 +715,7 @@ void KonqDirPartBrowserExtension::saveState( QDataStream &stream )
}
}
-void KonqDirPartBrowserExtension::restoreState( QDataStream &stream )
+void KonqDirPartBrowserExtension::restoreState( TQDataStream &stream )
{
m_dirPart->restoreState( stream );
bool hasFindPart;
diff --git a/libkonq/konq_dirpart.h b/libkonq/konq_dirpart.h
index df76e93bd..0b890e240 100644
--- a/libkonq/konq_dirpart.h
+++ b/libkonq/konq_dirpart.h
@@ -20,7 +20,7 @@
#ifndef __konqdirpart_h
#define __konqdirpart_h
-#include <qstring.h>
+#include <tqstring.h>
#include <kparts/part.h>
#include <kparts/browserextension.h>
#include <kfileitem.h>
@@ -43,7 +43,7 @@ class LIBKONQ_EXPORT KonqDirPart: public KParts::ReadOnlyPart
friend class KonqDirPartBrowserExtension;
public:
- KonqDirPart( QObject *parent, const char *name );
+ KonqDirPart( TQObject *parent, const char *name );
virtual ~KonqDirPart();
@@ -62,10 +62,10 @@ public:
void setDirLister( KDirLister* lister );
// TODO KDE4 create the KDirLister here and simplify the parts?
- QScrollView * scrollWidget();
+ TQScrollView * scrollWidget();
- virtual void saveState( QDataStream &stream );
- virtual void restoreState( QDataStream &stream );
+ virtual void saveState( TQDataStream &stream );
+ virtual void restoreState( TQDataStream &stream );
/** Called when LMB'ing an item in a directory view.
* @param fileItem must be set
@@ -76,11 +76,11 @@ public:
* @param fileItem if 0 it means we MMB'ed the background. */
void mmbClicked( KFileItem * fileItem );
- void setNameFilter( const QString & nameFilter ) { m_nameFilter = nameFilter; }
+ void setNameFilter( const TQString & nameFilter ) { m_nameFilter = nameFilter; }
- QString nameFilter() const { return m_nameFilter; }
+ TQString nameFilter() const { return m_nameFilter; }
- void setFilesToSelect( const QStringList & filesToSelect ) { m_filesToSelect = filesToSelect; }
+ void setFilesToSelect( const TQStringList & filesToSelect ) { m_filesToSelect = filesToSelect; }
/**
* Sets per directory mime-type based filtering.
@@ -96,13 +96,13 @@ public:
*
* @param filter mime-type(s) to filter directory by.
*/
- void setMimeFilter (const QStringList& filters);
+ void setMimeFilter (const TQStringList& filters);
/**
* Completely clears the internally stored list of mime filters
* set by call to @ref #setMimeFilter.
*/
- QStringList mimeFilter() const;
+ TQStringList mimeFilter() const;
KonqPropsView * props() const { return m_pProps; }
@@ -294,8 +294,8 @@ protected:
protected:
- QString m_nameFilter;
- QStringList m_filesToSelect;
+ TQString m_nameFilter;
+ TQStringList m_filesToSelect;
KonqPropsView * m_pProps;
@@ -317,8 +317,8 @@ protected:
uint m_lDirCount;
private:
- void saveFindState( QDataStream& );
- void restoreFindState( QDataStream& );
+ void saveFindState( TQDataStream& );
+ void restoreFindState( TQDataStream& );
void adjustIconSizes();
@@ -341,8 +341,8 @@ public:
* you should probably override KonqDirPart::saveState
* and KonqDirPart::restoreState, not the following methods.
*/
- virtual void saveState( QDataStream &stream );
- virtual void restoreState( QDataStream &stream );
+ virtual void saveState( TQDataStream &stream );
+ virtual void restoreState( TQDataStream &stream );
private:
KonqDirPart* m_dirPart;
diff --git a/libkonq/konq_drag.cc b/libkonq/konq_drag.cc
index 3333061c2..0fdca5722 100644
--- a/libkonq/konq_drag.cc
+++ b/libkonq/konq_drag.cc
@@ -21,8 +21,8 @@
#include <kdebug.h>
#include <kurldrag.h>
-KonqIconDrag::KonqIconDrag( QWidget * dragSource, const char* name )
- : QIconDrag( dragSource, name ),
+KonqIconDrag::KonqIconDrag( TQWidget * dragSource, const char* name )
+ : TQIconDrag( dragSource, name ),
m_bCutSelection( false )
{
}
@@ -47,31 +47,31 @@ const char* KonqIconDrag::format( int i ) const
else return 0;
}
-QByteArray KonqIconDrag::encodedData( const char* mime ) const
+TQByteArray KonqIconDrag::encodedData( const char* mime ) const
{
- QByteArray a;
- QCString mimetype( mime );
+ TQByteArray a;
+ TQCString mimetype( mime );
if ( mimetype == "application/x-qiconlist" )
- a = QIconDrag::encodedData( mime );
+ a = TQIconDrag::encodedData( mime );
else if ( mimetype == "text/uri-list" ) {
- QCString s = urls.join( "\r\n" ).latin1();
+ TQCString s = urls.join( "\r\n" ).latin1();
if( urls.count() > 0 )
s.append( "\r\n" );
a.resize( s.length() + 1 ); // trailing zero
memcpy( a.data(), s.data(), s.length() + 1 );
}
else if ( mimetype == "application/x-kde-cutselection" ) {
- QCString s ( m_bCutSelection ? "1" : "0" );
+ TQCString s ( m_bCutSelection ? "1" : "0" );
a.resize( s.length() + 1 ); // trailing zero
memcpy( a.data(), s.data(), s.length() + 1 );
}
else if ( mimetype == "text/plain" ) {
if (!urls.isEmpty())
{
- QStringList uris;
- for (QStringList::ConstIterator it = urls.begin(); it != urls.end(); ++it)
+ TQStringList uris;
+ for (TQStringList::ConstIterator it = urls.begin(); it != urls.end(); ++it)
uris.append(KURLDrag::stringToUrl((*it).latin1()).prettyURL());
- QCString s = uris.join( "\n" ).local8Bit();
+ TQCString s = uris.join( "\n" ).local8Bit();
if( uris.count() > 1 )
s.append( "\n" );
a.resize( s.length()); // no trailing zero in clipboard text
@@ -82,12 +82,12 @@ QByteArray KonqIconDrag::encodedData( const char* mime ) const
{
if (!urls.isEmpty())
{
- QStringList uris;
+ TQStringList uris;
- for (QStringList::ConstIterator it = urls.begin(); it != urls.end(); ++it)
+ for (TQStringList::ConstIterator it = urls.begin(); it != urls.end(); ++it)
uris.append(KURLDrag::stringToUrl((*it).latin1()).url(0, 4)); // 4 for latin1
- QCString s = uris.join( "\n" ).latin1();
+ TQCString s = uris.join( "\n" ).latin1();
if( uris.count() > 1 )
s.append( "\n" );
a.resize( s.length());
@@ -98,10 +98,10 @@ QByteArray KonqIconDrag::encodedData( const char* mime ) const
{
if (!urls.isEmpty())
{
- QStringList uris;
- for (QStringList::ConstIterator it = urls.begin(); it != urls.end(); ++it)
+ TQStringList uris;
+ for (TQStringList::ConstIterator it = urls.begin(); it != urls.end(); ++it)
uris.append(KURLDrag::stringToUrl((*it).latin1()).prettyURL());
- QCString s = uris.join( "\n" ).utf8();
+ TQCString s = uris.join( "\n" ).utf8();
if( uris.count() > 1 )
s.append( "\n" );
a.resize( s.length());
@@ -111,29 +111,29 @@ QByteArray KonqIconDrag::encodedData( const char* mime ) const
return a;
}
-bool KonqIconDrag::canDecode( const QMimeSource* e )
+bool KonqIconDrag::canDecode( const TQMimeSource* e )
{
return e->provides( "application/x-qiconlist" ) ||
e->provides( "text/uri-list" ) ||
e->provides( "application/x-kde-cutselection" );
}
-void KonqIconDrag::append( const QIconDragItem &item, const QRect &pr,
- const QRect &tr, const QString &url )
+void KonqIconDrag::append( const TQIconDragItem &item, const TQRect &pr,
+ const TQRect &tr, const TQString &url )
{
- QIconDrag::append( item, pr, tr );
+ TQIconDrag::append( item, pr, tr );
urls.append( url );
}
-KonqIconDrag2::KonqIconDrag2( QWidget * dragSource )
+KonqIconDrag2::KonqIconDrag2( TQWidget * dragSource )
: KonqIconDrag( dragSource )
{
}
-void KonqIconDrag2::append( const QIconDragItem &item, const QRect &pr,
- const QRect &tr, const QString& url, const KURL &mostLocalURL )
+void KonqIconDrag2::append( const TQIconDragItem &item, const TQRect &pr,
+ const TQRect &tr, const TQString& url, const KURL &mostLocalURL )
{
- QString mostLocalURLStr = KURLDrag::urlToString(mostLocalURL);
+ TQString mostLocalURLStr = KURLDrag::urlToString(mostLocalURL);
m_kdeURLs.append( url );
KonqIconDrag::append( item, pr, tr, mostLocalURLStr );
}
@@ -145,15 +145,15 @@ const char* KonqIconDrag2::format( int i ) const
return KonqIconDrag::format( i );
}
-QByteArray KonqIconDrag2::encodedData( const char* mime ) const
+TQByteArray KonqIconDrag2::encodedData( const char* mime ) const
{
- QCString mimetype( mime );
+ TQCString mimetype( mime );
if ( mimetype == "application/x-kde-urilist" )
{
- QByteArray a;
+ TQByteArray a;
int c=0;
- for (QStringList::ConstIterator it = m_kdeURLs.begin(); it != m_kdeURLs.end(); ++it) {
- QCString url = (*it).utf8();
+ for (TQStringList::ConstIterator it = m_kdeURLs.begin(); it != m_kdeURLs.end(); ++it) {
+ TQCString url = (*it).utf8();
int l = url.length();
a.resize(c+l+2);
memcpy(a.data()+c, url.data(), l);
@@ -169,10 +169,10 @@ QByteArray KonqIconDrag2::encodedData( const char* mime ) const
//
-KonqDrag * KonqDrag::newDrag( const KURL::List & urls, bool cut, QWidget * dragSource, const char* name )
+KonqDrag * KonqDrag::newDrag( const KURL::List & urls, bool cut, TQWidget * dragSource, const char* name )
{
// See KURLDrag::newDrag
- QStrList uris;
+ TQStrList uris;
KURL::List::ConstIterator uit = urls.begin();
KURL::List::ConstIterator uEnd = urls.end();
// Get each URL encoded in utf8 - and since we get it in escaped
@@ -183,25 +183,25 @@ KonqDrag * KonqDrag::newDrag( const KURL::List & urls, bool cut, QWidget * dragS
}
// urls must be already checked to have hostname in file URLs
-KonqDrag::KonqDrag( const QStrList & urls, bool cut, QWidget * dragSource, const char* name )
- : QUriDrag( urls, dragSource, name ),
+KonqDrag::KonqDrag( const TQStrList & urls, bool cut, TQWidget * dragSource, const char* name )
+ : TQUriDrag( urls, dragSource, name ),
m_bCutSelection( cut ), m_urls( urls )
{}
// urls must be already checked to have hostname in file URLs
KonqDrag::KonqDrag( const KURL::List & urls, const KURL::List& mostLocalUrls,
- bool cut, QWidget * dragSource )
- : QUriDrag( dragSource ),
+ bool cut, TQWidget * dragSource )
+ : TQUriDrag( dragSource ),
m_bCutSelection( cut )
{
- QStrList uris;
+ TQStrList uris;
KURL::List::ConstIterator uit = urls.begin();
KURL::List::ConstIterator uEnd = urls.end();
// Get each URL encoded in utf8 - and since we get it in escaped
// form on top of that, .latin1() is fine.
for ( ; uit != uEnd ; ++uit )
uris.append( KURLDrag::urlToString( *uit ).latin1() );
- setUris( uris ); // we give the KDE uris to QUriDrag. TODO: do the opposite in KDE4 and add a m_mostLocalUris member.
+ setUris( uris ); // we give the KDE uris to TQUriDrag. TODO: do the opposite in KDE4 and add a m_mostLocalUris member.
uit = mostLocalUrls.begin();
uEnd = mostLocalUrls.end();
@@ -223,15 +223,15 @@ const char* KonqDrag::format( int i ) const
else return 0;
}
-QByteArray KonqDrag::encodedData( const char* mime ) const
+TQByteArray KonqDrag::encodedData( const char* mime ) const
{
- QByteArray a;
- QCString mimetype( mime );
+ TQByteArray a;
+ TQCString mimetype( mime );
if ( mimetype == "text/uri-list" )
{
- // Code taken from QUriDrag::setUris
+ // Code taken from TQUriDrag::setUris
int c=0;
- for (QStrListIterator it(m_urls); *it; ++it) {
+ for (TQStrListIterator it(m_urls); *it; ++it) {
int l = qstrlen(*it);
a.resize(c+l+2);
memcpy(a.data()+c,*it,l);
@@ -243,20 +243,20 @@ QByteArray KonqDrag::encodedData( const char* mime ) const
}
else if ( mimetype == "application/x-kde-urilist" )
{
- return QUriDrag::encodedData( "text/uri-list" );
+ return TQUriDrag::encodedData( "text/uri-list" );
}
else if ( mimetype == "application/x-kde-cutselection" )
{
- QCString s ( m_bCutSelection ? "1" : "0" );
+ TQCString s ( m_bCutSelection ? "1" : "0" );
a.resize( s.length() + 1 ); // trailing zero
memcpy( a.data(), s.data(), s.length() + 1 );
}
else if ( mimetype == "text/plain" )
{
- QStringList uris;
- for (QStrListIterator it(m_urls); *it; ++it)
+ TQStringList uris;
+ for (TQStrListIterator it(m_urls); *it; ++it)
uris.append(KURLDrag::stringToUrl(*it).prettyURL());
- QCString s = uris.join( "\n" ).local8Bit();
+ TQCString s = uris.join( "\n" ).local8Bit();
if( uris.count() > 1 )
s.append( "\n" );
a.resize( s.length() + 1 ); // trailing zero
@@ -269,14 +269,14 @@ QByteArray KonqDrag::encodedData( const char* mime ) const
// Used for KonqIconDrag too
-bool KonqDrag::decodeIsCutSelection( const QMimeSource *e )
+bool KonqDrag::decodeIsCutSelection( const TQMimeSource *e )
{
- QByteArray a = e->encodedData( "application/x-kde-cutselection" );
+ TQByteArray a = e->encodedData( "application/x-kde-cutselection" );
if ( a.isEmpty() )
return false;
else
{
- kdDebug(1203) << "KonqDrag::decodeIsCutSelection : a=" << QCString(a.data(), a.size() + 1) << endl;
+ kdDebug(1203) << "KonqDrag::decodeIsCutSelection : a=" << TQCString(a.data(), a.size() + 1) << endl;
return (a.at(0) == '1'); // true if 1
}
}
diff --git a/libkonq/konq_drag.h b/libkonq/konq_drag.h
index dca79676f..e5e49a837 100644
--- a/libkonq/konq_drag.h
+++ b/libkonq/konq_drag.h
@@ -19,10 +19,10 @@
#ifndef __konqdrag_h__
#define __konqdrag_h__
-#include <qdragobject.h>
-#include <qrect.h>
-#include <qstring.h>
-#include <qiconview.h>
+#include <tqdragobject.h>
+#include <tqrect.h>
+#include <tqstring.h>
+#include <tqiconview.h>
#include <libkonq_export.h>
@@ -40,21 +40,21 @@ class LIBKONQ_EXPORT KonqIconDrag : public QIconDrag
Q_OBJECT
public:
- KonqIconDrag( QWidget * dragSource, const char* name = 0 );
+ KonqIconDrag( TQWidget * dragSource, const char* name = 0 );
virtual ~KonqIconDrag() {}
const char* format( int i ) const;
- QByteArray encodedData( const char* mime ) const;
+ TQByteArray encodedData( const char* mime ) const;
- void append( const QIconDragItem &item, const QRect &pr,
- const QRect &tr, const QString &url );
+ void append( const TQIconDragItem &item, const TQRect &pr,
+ const TQRect &tr, const TQString &url );
void setMoveSelection( bool move ) { m_bCutSelection = move; }
- static bool canDecode( const QMimeSource* e );
+ static bool canDecode( const TQMimeSource* e );
protected: // KDE4: private. And d pointer...
- QStringList urls;
+ TQStringList urls;
bool m_bCutSelection;
};
@@ -68,17 +68,17 @@ class LIBKONQ_EXPORT KonqIconDrag2 : public KonqIconDrag
Q_OBJECT
public:
- KonqIconDrag2( QWidget * dragSource );
+ KonqIconDrag2( TQWidget * dragSource );
virtual ~KonqIconDrag2() {}
virtual const char* format( int i ) const;
- virtual QByteArray encodedData( const char* mime ) const;
+ virtual TQByteArray encodedData( const char* mime ) const;
- void append( const QIconDragItem &item, const QRect &pr,
- const QRect &tr, const QString &url, const KURL &mostLocalURL );
+ void append( const TQIconDragItem &item, const TQRect &pr,
+ const TQRect &tr, const TQString &url, const KURL &mostLocalURL );
private:
- QStringList m_kdeURLs;
+ TQStringList m_kdeURLs;
};
// Clipboard/dnd data for: URLS + isCut
@@ -87,7 +87,7 @@ class LIBKONQ_EXPORT KonqDrag : public QUriDrag
public:
// KDE4: remove, use KonqDrag constructor instead
static KonqDrag * newDrag( const KURL::List & urls,
- bool move, QWidget * dragSource = 0, const char* name = 0 );
+ bool move, TQWidget * dragSource = 0, const char* name = 0 );
/**
* Create a KonqDrag object.
@@ -97,26 +97,26 @@ public:
* @param dragSource parent object
* @since 3.5
*/
- KonqDrag( const KURL::List & urls, const KURL::List& mostLocalUrls, bool cut, QWidget * dragSource = 0 );
+ KonqDrag( const KURL::List & urls, const KURL::List& mostLocalUrls, bool cut, TQWidget * dragSource = 0 );
protected:
// KDE4: remove
- KonqDrag( const QStrList & urls, bool cut, QWidget * dragSource, const char* name );
+ KonqDrag( const TQStrList & urls, bool cut, TQWidget * dragSource, const char* name );
public:
virtual ~KonqDrag() {}
virtual const char* format( int i ) const;
- virtual QByteArray encodedData( const char* mime ) const;
+ virtual TQByteArray encodedData( const char* mime ) const;
void setMoveSelection( bool move ) { m_bCutSelection = move; }
// Returns true if the data was cut (used for KonqIconDrag too)
- static bool decodeIsCutSelection( const QMimeSource *e );
+ static bool decodeIsCutSelection( const TQMimeSource *e );
protected: // KDE4: private. And d pointer...
bool m_bCutSelection;
- QStrList m_urls; // this is set to the "most local urls". KDE4: KURL::List
+ TQStrList m_urls; // this is set to the "most local urls". KDE4: KURL::List
};
#endif
diff --git a/libkonq/konq_events.h b/libkonq/konq_events.h
index b76469717..cade20d63 100644
--- a/libkonq/konq_events.h
+++ b/libkonq/konq_events.h
@@ -2,7 +2,7 @@
#define __konq_events_h__
#include <kparts/event.h>
-#include <qptrlist.h>
+#include <tqptrlist.h>
#include <libkonq_export.h>
namespace KParts
@@ -12,7 +12,7 @@ namespace KParts
class KConfig;
class KFileItem;
-typedef QPtrList<KFileItem> KFileItemList;
+typedef TQPtrList<KFileItem> KFileItemList;
class LIBKONQ_EXPORT KonqFileSelectionEvent : public KParts::Event
{
@@ -22,7 +22,7 @@ public:
KFileItemList selection() const { return m_selection; }
KParts::ReadOnlyPart *part() const { return m_part; }
- static bool test( const QEvent *event ) { return KParts::Event::test( event, s_fileItemSelectionEventName ); }
+ static bool test( const TQEvent *event ) { return KParts::Event::test( event, s_fileItemSelectionEventName ); }
private:
static const char *s_fileItemSelectionEventName;
@@ -39,7 +39,7 @@ public:
const KFileItem* item() const { return m_item; }
KParts::ReadOnlyPart *part() const { return m_part; }
- static bool test( const QEvent *event ) { return KParts::Event::test( event, s_fileItemMouseOverEventName ); }
+ static bool test( const TQEvent *event ) { return KParts::Event::test( event, s_fileItemMouseOverEventName ); }
private:
static const char *s_fileItemMouseOverEventName;
@@ -51,19 +51,19 @@ private:
class LIBKONQ_EXPORT KonqConfigEvent : public KParts::Event
{
public:
- KonqConfigEvent( KConfig *config, const QString &prefix, bool save ) : KParts::Event( s_configEventName ), m_config( config ), m_prefix( prefix ), m_save( save ) {}
+ KonqConfigEvent( KConfig *config, const TQString &prefix, bool save ) : KParts::Event( s_configEventName ), m_config( config ), m_prefix( prefix ), m_save( save ) {}
KConfig * config() const { return m_config; }
- QString prefix() const { return m_prefix; }
+ TQString prefix() const { return m_prefix; }
bool save() const { return m_save; }
- static bool test( const QEvent *event ) { return KParts::Event::test( event, s_configEventName ); }
+ static bool test( const TQEvent *event ) { return KParts::Event::test( event, s_configEventName ); }
private:
static const char *s_configEventName;
KConfig *m_config;
- QString m_prefix;
+ TQString m_prefix;
bool m_save;
};
diff --git a/libkonq/konq_faviconmgr.cc b/libkonq/konq_faviconmgr.cc
index 782beca91..37b01741f 100644
--- a/libkonq/konq_faviconmgr.cc
+++ b/libkonq/konq_faviconmgr.cc
@@ -25,32 +25,32 @@
#include "konq_faviconmgr.moc"
-KonqFavIconMgr::KonqFavIconMgr(QObject *parent, const char *name)
- : QObject(parent, name),
+KonqFavIconMgr::KonqFavIconMgr(TQObject *parent, const char *name)
+ : TQObject(parent, name),
DCOPObject("KonqFavIconMgr")
{
connectDCOPSignal("kded", "favicons",
- "iconChanged(bool, QString, QString)",
- "notifyChange(bool, QString, QString)", false);
+ "iconChanged(bool, TQString, TQString)",
+ "notifyChange(bool, TQString, TQString)", false);
}
-QString KonqFavIconMgr::iconForURL(const QString &url)
+TQString KonqFavIconMgr::iconForURL(const TQString &url)
{
return KMimeType::favIconForURL( KURL(url) );
}
void KonqFavIconMgr::setIconForURL(const KURL &url, const KURL &iconURL)
{
- QByteArray data;
- QDataStream str(data, IO_WriteOnly);
+ TQByteArray data;
+ TQDataStream str(data, IO_WriteOnly);
str << url << iconURL;
kapp->dcopClient()->send("kded", "favicons", "setIconForURL(KURL, KURL)", data);
}
void KonqFavIconMgr::downloadHostIcon(const KURL &url)
{
- QByteArray data;
- QDataStream str(data, IO_WriteOnly);
+ TQByteArray data;
+ TQDataStream str(data, IO_WriteOnly);
str << url;
kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data);
}
diff --git a/libkonq/konq_faviconmgr.h b/libkonq/konq_faviconmgr.h
index 66175f682..48c345bcd 100644
--- a/libkonq/konq_faviconmgr.h
+++ b/libkonq/konq_faviconmgr.h
@@ -28,7 +28,7 @@
* Maintains a list of custom icons per URL. This is only a stub
* for the "favicons" KDED Module
*/
-class LIBKONQ_EXPORT KonqFavIconMgr : public QObject, public DCOPObject
+class LIBKONQ_EXPORT KonqFavIconMgr : public TQObject, public DCOPObject
{
Q_OBJECT
K_DCOP
@@ -36,7 +36,7 @@ public:
/**
* Constructor.
*/
- KonqFavIconMgr(QObject *parent = 0, const char *name = 0);
+ KonqFavIconMgr(TQObject *parent = 0, const char *name = 0);
/**
* Downloads an icon from @p iconURL and associates @p url with it.
@@ -52,15 +52,15 @@ public:
/**
* Looks up an icon for @p url and returns its name if found
- * or QString::null otherwise
+ * or TQString::null otherwise
*/
- static QString iconForURL(const QString &url);
+ static TQString iconForURL(const TQString &url);
k_dcop:
/**
* an icon changed, updates the combo box
*/
- virtual ASYNC notifyChange( bool, QString, QString ) = 0;
+ virtual ASYNC notifyChange( bool, TQString, TQString ) = 0;
signals:
void changed();
diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cc
index c9c661c57..81262ae99 100644
--- a/libkonq/konq_filetip.cc
+++ b/libkonq/konq_filetip.cc
@@ -26,18 +26,18 @@
#include <kstandarddirs.h>
#include <kapplication.h>
-#include <qlabel.h>
-#include <qtooltip.h>
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qscrollview.h>
-#include <qtimer.h>
+#include <tqlabel.h>
+#include <tqtooltip.h>
+#include <tqlayout.h>
+#include <tqpainter.h>
+#include <tqscrollview.h>
+#include <tqtimer.h>
#include <fixx11h.h>
//--------------------------------------------------------------------------------
-KonqFileTip::KonqFileTip( QScrollView* parent )
- : QFrame( 0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM ),
+KonqFileTip::KonqFileTip( TQScrollView* parent )
+ : TQFrame( 0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM ),
m_on( false ),
m_preview( false ),
m_filter( false ),
@@ -47,20 +47,20 @@ KonqFileTip::KonqFileTip( QScrollView* parent )
m_item( 0 ),
m_previewJob( 0 )
{
- m_iconLabel = new QLabel(this);
- m_textLabel = new QLabel(this);
+ m_iconLabel = new TQLabel(this);
+ m_textLabel = new TQLabel(this);
m_textLabel->setAlignment(Qt::AlignAuto | Qt::AlignTop);
- QGridLayout* layout = new QGridLayout(this, 1, 2, 8, 0);
+ TQGridLayout* layout = new TQGridLayout(this, 1, 2, 8, 0);
layout->addWidget(m_iconLabel, 0, 0);
layout->addWidget(m_textLabel, 0, 1);
- layout->setResizeMode(QLayout::Fixed);
+ layout->setResizeMode(TQLayout::Fixed);
- setPalette( QToolTip::palette() );
+ setPalette( TQToolTip::palette() );
setMargin( 1 );
- setFrameStyle( QFrame::Plain | QFrame::Box );
+ setFrameStyle( TQFrame::Plain | TQFrame::Box );
- m_timer = new QTimer(this);
+ m_timer = new TQTimer(this);
hide();
}
@@ -89,7 +89,7 @@ void KonqFileTip::setOptions( bool on, bool preview, int num )
m_num = num;
}
-void KonqFileTip::setItem( KFileItem *item, const QRect &rect, const QPixmap *pixmap )
+void KonqFileTip::setItem( KFileItem *item, const TQRect &rect, const TQPixmap *pixmap )
{
hideTip();
@@ -108,13 +108,13 @@ void KonqFileTip::setItem( KFileItem *item, const QRect &rect, const QPixmap *pi
if ( pixmap )
m_iconLabel->setPixmap( *pixmap );
else
- m_iconLabel->setPixmap( QPixmap() );
+ m_iconLabel->setPixmap( TQPixmap() );
}
// Don't start immediately, because the user could move the mouse over another item
// This avoids a quick sequence of started preview-jobs
m_timer->disconnect( this );
- connect(m_timer, SIGNAL(timeout()), this, SLOT(startDelayed()));
+ connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(startDelayed()));
m_timer->start( 300, true );
}
}
@@ -123,11 +123,11 @@ void KonqFileTip::reposition()
{
if ( m_rect.isEmpty() || !m_view || !m_view->viewport() ) return;
- QRect rect = m_rect;
- QPoint off = m_view->viewport()->mapToGlobal( m_view->contentsToViewport( rect.topRight() ) );
+ TQRect rect = m_rect;
+ TQPoint off = m_view->viewport()->mapToGlobal( m_view->contentsToViewport( rect.topRight() ) );
rect.moveTopRight( off );
- QPoint pos = rect.center();
+ TQPoint pos = rect.center();
// m_corner:
// 0: upperleft
// 1: upperright
@@ -136,7 +136,7 @@ void KonqFileTip::reposition()
// 4+: none
m_corner = 0;
// should the tooltip be shown to the left or to the right of the ivi ?
- QRect desk = KGlobalSettings::desktopGeometry(rect.center());
+ TQRect desk = KGlobalSettings::desktopGeometry(rect.center());
if (rect.center().x() + width() > desk.right())
{
// to the left
@@ -161,7 +161,7 @@ void KonqFileTip::reposition()
update();
}
-void KonqFileTip::gotPreview( const KFileItem* item, const QPixmap& pixmap )
+void KonqFileTip::gotPreview( const KFileItem* item, const TQPixmap& pixmap )
{
m_previewJob = 0;
if (item != m_item) return;
@@ -174,7 +174,7 @@ void KonqFileTip::gotPreviewResult()
m_previewJob = 0;
}
-void KonqFileTip::drawContents( QPainter *p )
+void KonqFileTip::drawContents( TQPainter *p )
{
static const char * const names[] = {
"arrow_topleft",
@@ -184,14 +184,14 @@ void KonqFileTip::drawContents( QPainter *p )
};
if (m_corner >= 4) { // 4 is empty, so don't draw anything
- QFrame::drawContents( p );
+ TQFrame::drawContents( p );
return;
}
if ( m_corners[m_corner].isNull())
- m_corners[m_corner].load( locate( "data", QString::fromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) );
+ m_corners[m_corner].load( locate( "data", TQString::fromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) );
- QPixmap &pix = m_corners[m_corner];
+ TQPixmap &pix = m_corners[m_corner];
switch ( m_corner )
{
@@ -209,7 +209,7 @@ void KonqFileTip::drawContents( QPainter *p )
break;
}
- QFrame::drawContents( p );
+ TQFrame::drawContents( p );
}
void KonqFileTip::setFilter( bool enable )
@@ -218,10 +218,10 @@ void KonqFileTip::setFilter( bool enable )
if ( enable ) {
kapp->installEventFilter( this );
- QApplication::setGlobalMouseTracking( true );
+ TQApplication::setGlobalMouseTracking( true );
}
else {
- QApplication::setGlobalMouseTracking( false );
+ TQApplication::setGlobalMouseTracking( false );
kapp->removeEventFilter( this );
}
m_filter = enable;
@@ -229,12 +229,12 @@ void KonqFileTip::setFilter( bool enable )
void KonqFileTip::showTip()
{
- QString text = m_item->getToolTipText(m_num);
+ TQString text = m_item->getToolTipText(m_num);
if ( text.isEmpty() ) return;
m_timer->disconnect( this );
- connect(m_timer, SIGNAL(timeout()), this, SLOT(hideTip()));
+ connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hideTip()));
m_timer->start( 15000, true );
m_textLabel->setText( text );
@@ -261,35 +261,35 @@ void KonqFileTip::startDelayed()
oneItem.append( m_item );
m_previewJob = KIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0);
- connect( m_previewJob, SIGNAL( gotPreview( const KFileItem *, const QPixmap & ) ),
- this, SLOT( gotPreview( const KFileItem *, const QPixmap & ) ) );
- connect( m_previewJob, SIGNAL( result( KIO::Job * ) ),
- this, SLOT( gotPreviewResult() ) );
+ connect( m_previewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
+ this, TQT_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) );
+ connect( m_previewJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ this, TQT_SLOT( gotPreviewResult() ) );
}
m_timer->disconnect( this );
- connect(m_timer, SIGNAL(timeout()), this, SLOT(showTip()));
+ connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showTip()));
m_timer->start( 400, true );
}
-void KonqFileTip::resizeEvent( QResizeEvent* event )
+void KonqFileTip::resizeEvent( TQResizeEvent* event )
{
- QFrame::resizeEvent(event);
+ TQFrame::resizeEvent(event);
reposition();
}
-bool KonqFileTip::eventFilter( QObject *, QEvent *e )
+bool KonqFileTip::eventFilter( TQObject *, TQEvent *e )
{
switch ( e->type() )
{
- case QEvent::Leave:
- case QEvent::MouseButtonPress:
- case QEvent::MouseButtonRelease:
- case QEvent::KeyPress:
- case QEvent::KeyRelease:
- case QEvent::FocusIn:
- case QEvent::FocusOut:
- case QEvent::Wheel:
+ case TQEvent::Leave:
+ case TQEvent::MouseButtonPress:
+ case TQEvent::MouseButtonRelease:
+ case TQEvent::KeyPress:
+ case TQEvent::KeyRelease:
+ case TQEvent::FocusIn:
+ case TQEvent::FocusOut:
+ case TQEvent::Wheel:
hideTip();
default: break;
}
diff --git a/libkonq/konq_filetip.h b/libkonq/konq_filetip.h
index fc878c074..667204e6c 100644
--- a/libkonq/konq_filetip.h
+++ b/libkonq/konq_filetip.h
@@ -22,8 +22,8 @@
#ifndef KONQ_FILETIP_H
#define KONQ_FILETIP_H
-#include <qframe.h>
-#include <qpixmap.h>
+#include <tqframe.h>
+#include <tqpixmap.h>
#include <kio/previewjob.h>
#include <libkonq_export.h>
@@ -40,7 +40,7 @@ class LIBKONQ_EXPORT KonqFileTip : public QFrame
Q_OBJECT
public:
- KonqFileTip( QScrollView *parent );
+ KonqFileTip( TQScrollView *parent );
~KonqFileTip();
void setPreview(bool on);
@@ -57,17 +57,17 @@ class LIBKONQ_EXPORT KonqFileTip : public QFrame
@param rect the rectangle around which the tip will be shown
@param pixmap the pixmap to be shown. If 0, no pixmap is shown
*/
- void setItem( KFileItem *item, const QRect &rect = QRect(),
- const QPixmap *pixmap = 0 );
+ void setItem( KFileItem *item, const TQRect &rect = TQRect(),
+ const TQPixmap *pixmap = 0 );
- virtual bool eventFilter( QObject *, QEvent *e );
+ virtual bool eventFilter( TQObject *, TQEvent *e );
protected:
- virtual void drawContents( QPainter *p );
- virtual void resizeEvent( QResizeEvent * );
+ virtual void drawContents( TQPainter *p );
+ virtual void resizeEvent( TQResizeEvent * );
private slots:
- void gotPreview( const KFileItem*, const QPixmap& );
+ void gotPreview( const KFileItem*, const TQPixmap& );
void gotPreviewResult();
void startDelayed();
@@ -79,19 +79,19 @@ class LIBKONQ_EXPORT KonqFileTip : public QFrame
void reposition();
- QLabel* m_iconLabel;
- QLabel* m_textLabel;
+ TQLabel* m_iconLabel;
+ TQLabel* m_textLabel;
bool m_on : 1;
bool m_preview : 1; // shall the preview icon be shown
bool m_filter : 1;
- QPixmap m_corners[4];
+ TQPixmap m_corners[4];
int m_corner;
int m_num;
- QScrollView* m_view;
+ TQScrollView* m_view;
KFileItem* m_item;
KIO::PreviewJob* m_previewJob;
- QRect m_rect;
- QTimer* m_timer;
+ TQRect m_rect;
+ TQTimer* m_timer;
};
#endif
diff --git a/libkonq/konq_historycomm.cc b/libkonq/konq_historycomm.cc
index 0875a7945..6cfd9b53f 100644
--- a/libkonq/konq_historycomm.cc
+++ b/libkonq/konq_historycomm.cc
@@ -2,9 +2,9 @@
bool KonqHistoryEntry::marshalURLAsStrings;
-// QDataStream operators (read and write a KonqHistoryEntry
-// from/into a QDataStream)
-QDataStream& operator<< (QDataStream& s, const KonqHistoryEntry& e) {
+// TQDataStream operators (read and write a KonqHistoryEntry
+// from/into a TQDataStream)
+TQDataStream& operator<< (TQDataStream& s, const KonqHistoryEntry& e) {
if (KonqHistoryEntry::marshalURLAsStrings)
s << e.url.url();
else
@@ -19,10 +19,10 @@ QDataStream& operator<< (QDataStream& s, const KonqHistoryEntry& e) {
return s;
}
-QDataStream& operator>> (QDataStream& s, KonqHistoryEntry& e) {
+TQDataStream& operator>> (TQDataStream& s, KonqHistoryEntry& e) {
if (KonqHistoryEntry::marshalURLAsStrings)
{
- QString url;
+ TQString url;
s >> url;
e.url = url;
}
diff --git a/libkonq/konq_historycomm.h b/libkonq/konq_historycomm.h
index e02e10a61..ea2a387df 100644
--- a/libkonq/konq_historycomm.h
+++ b/libkonq/konq_historycomm.h
@@ -20,8 +20,8 @@
#ifndef KONQ_HISTORYCOMM_H
#define KONQ_HISTORYCOMM_H
-#include <qdatetime.h>
-#include <qstringlist.h>
+#include <tqdatetime.h>
+#include <tqstringlist.h>
#include <dcopobject.h>
#include <kurl.h>
@@ -35,18 +35,18 @@ public:
: numberOfTimesVisited(1) {}
KURL url;
- QString typedURL;
- QString title;
+ TQString typedURL;
+ TQString title;
Q_UINT32 numberOfTimesVisited;
- QDateTime firstVisited;
- QDateTime lastVisited;
+ TQDateTime firstVisited;
+ TQDateTime lastVisited;
};
-// QDataStream operators (read and write a KonqHistoryEntry
+// TQDataStream operators (read and write a KonqHistoryEntry
// from/into a QDataStream
-QDataStream& operator<< (QDataStream& s, const KonqHistoryEntry& e);
-QDataStream& operator>> (QDataStream& s, KonqHistoryEntry& e);
+TQDataStream& operator<< (TQDataStream& s, const KonqHistoryEntry& e);
+TQDataStream& operator>> (TQDataStream& s, KonqHistoryEntry& e);
///////////////////////////////////////////////////////////////////
@@ -61,16 +61,16 @@ class KonqHistoryComm : public DCOPObject
K_DCOP
protected:
- KonqHistoryComm( QCString objId ) : DCOPObject( objId ) {}
+ KonqHistoryComm( TQCString objId ) : DCOPObject( objId ) {}
k_dcop:
- virtual ASYNC notifyHistoryEntry( KonqHistoryEntry e, QCString saveId) = 0;
- virtual ASYNC notifyMaxCount( Q_UINT32 count, QCString saveId ) = 0;
- virtual ASYNC notifyMaxAge( Q_UINT32 days, QCString saveId ) = 0;
- virtual ASYNC notifyClear( QCString saveId ) = 0;
- virtual ASYNC notifyRemove( KURL url, QCString saveId ) = 0;
- virtual ASYNC notifyRemove( KURL::List url, QCString saveId ) = 0;
- virtual QStringList allURLs() const = 0;
+ virtual ASYNC notifyHistoryEntry( KonqHistoryEntry e, TQCString saveId) = 0;
+ virtual ASYNC notifyMaxCount( Q_UINT32 count, TQCString saveId ) = 0;
+ virtual ASYNC notifyMaxAge( Q_UINT32 days, TQCString saveId ) = 0;
+ virtual ASYNC notifyClear( TQCString saveId ) = 0;
+ virtual ASYNC notifyRemove( KURL url, TQCString saveId ) = 0;
+ virtual ASYNC notifyRemove( KURL::List url, TQCString saveId ) = 0;
+ virtual TQStringList allURLs() const = 0;
};
diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cc
index 72c6be3de..b971d39b3 100644
--- a/libkonq/konq_historymgr.cc
+++ b/libkonq/konq_historymgr.cc
@@ -33,11 +33,11 @@
const Q_UINT32 KonqHistoryManager::s_historyVersion = 3;
-KonqHistoryManager::KonqHistoryManager( QObject *parent, const char *name )
+KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name )
: KParts::HistoryProvider( parent, name ),
KonqHistoryComm( "KonqHistoryManager" )
{
- m_updateTimer = new QTimer( this );
+ m_updateTimer = new TQTimer( this );
// defaults
KConfig *config = KGlobal::config();
@@ -48,7 +48,7 @@ KonqHistoryManager::KonqHistoryManager( QObject *parent, const char *name )
m_history.setAutoDelete( true );
m_filename = locateLocal( "data",
- QString::fromLatin1("konqueror/konq_history" ));
+ TQString::fromLatin1("konqueror/konq_history" ));
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
@@ -61,7 +61,7 @@ KonqHistoryManager::KonqHistoryManager( QObject *parent, const char *name )
// and load the history
loadHistory();
- connect( m_updateTimer, SIGNAL( timeout() ), SLOT( slotEmitUpdated() ));
+ connect( m_updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotEmitUpdated() ));
}
@@ -84,7 +84,7 @@ bool KonqHistoryManager::loadHistory()
m_history.clear();
m_pCompletion->clear();
- QFile file( m_filename );
+ TQFile file( m_filename );
if ( !file.open( IO_ReadOnly ) ) {
if ( file.exists() )
kdWarning() << "Can't open " << file.name() << endl;
@@ -95,17 +95,17 @@ bool KonqHistoryManager::loadHistory()
return ret;
}
- QDataStream fileStream( &file );
- QByteArray data; // only used for version == 2
+ TQDataStream fileStream( &file );
+ TQByteArray data; // only used for version == 2
// we construct the stream object now but fill in the data later.
// thanks to QBA's explicit sharing this works :)
- QDataStream crcStream( data, IO_ReadOnly );
+ TQDataStream crcStream( data, IO_ReadOnly );
if ( !fileStream.atEnd() ) {
Q_UINT32 version;
fileStream >> version;
- QDataStream *stream = &fileStream;
+ TQDataStream *stream = &fileStream;
bool crcChecked = false;
bool crcOk = false;
@@ -154,12 +154,12 @@ bool KonqHistoryManager::loadHistory()
*stream >> *entry;
// kdDebug(1203) << "## loaded entry: " << entry->url << ", Title: " << entry->title << endl;
m_history.append( entry );
- QString urlString2 = entry->url.prettyURL();
+ TQString urlString2 = entry->url.prettyURL();
addToCompletion( urlString2, entry->typedURL, entry->numberOfTimesVisited );
// and fill our baseclass.
- QString urlString = entry->url.url();
+ TQString urlString = entry->url.url();
KParts::HistoryProvider::insert( urlString );
// DF: also insert the "pretty" version if different
// This helps getting 'visited' links on websites which don't use fully-escaped urls.
@@ -205,16 +205,16 @@ bool KonqHistoryManager::saveHistory()
return false;
}
- QDataStream *fileStream = file.dataStream();
+ TQDataStream *fileStream = file.dataStream();
*fileStream << s_historyVersion;
- QByteArray data;
- QDataStream stream( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream stream( data, IO_WriteOnly );
//We use KURL for marshalling URLs in entries in the V3
//file format
KonqHistoryEntry::marshalURLAsStrings = false;
- QPtrListIterator<KonqHistoryEntry> it( m_history );
+ TQPtrListIterator<KonqHistoryEntry> it( m_history );
KonqHistoryEntry *entry;
while ( (entry = it.current()) ) {
stream << *entry;
@@ -240,7 +240,7 @@ void KonqHistoryManager::adjustSize()
while ( m_history.count() > m_maxCount || isExpired( entry ) ) {
removeFromCompletion( entry->url.prettyURL(), entry->typedURL );
- QString urlString = entry->url.url();
+ TQString urlString = entry->url.url();
KParts::HistoryProvider::remove( urlString );
addToUpdateList( urlString );
@@ -253,23 +253,23 @@ void KonqHistoryManager::adjustSize()
}
-void KonqHistoryManager::addPending( const KURL& url, const QString& typedURL,
- const QString& title )
+void KonqHistoryManager::addPending( const KURL& url, const TQString& typedURL,
+ const TQString& title )
{
addToHistory( true, url, typedURL, title );
}
void KonqHistoryManager::confirmPending( const KURL& url,
- const QString& typedURL,
- const QString& title )
+ const TQString& typedURL,
+ const TQString& title )
{
addToHistory( false, url, typedURL, title );
}
void KonqHistoryManager::addToHistory( bool pending, const KURL& _url,
- const QString& typedURL,
- const QString& title )
+ const TQString& typedURL,
+ const TQString& title )
{
kdDebug(1203) << "## addToHistory: " << _url.prettyURL() << " Typed URL: " << typedURL << ", Title: " << title << endl;
@@ -282,10 +282,10 @@ void KonqHistoryManager::addToHistory( bool pending, const KURL& _url,
KURL url( _url );
bool hasPass = url.hasPass();
- url.setPass( QString::null ); // No password in the history, especially not in the completion!
+ url.setPass( TQString::null ); // No password in the history, especially not in the completion!
url.setHost( url.host().lower() ); // All host parts lower case
KonqHistoryEntry entry;
- QString u = url.prettyURL();
+ TQString u = url.prettyURL();
entry.url = url;
if ( (u != typedURL) && !hasPass )
entry.typedURL = typedURL;
@@ -295,12 +295,12 @@ void KonqHistoryManager::addToHistory( bool pending, const KURL& _url,
// konqueror's window caption).
if ( !pending && u != title )
entry.title = title;
- entry.firstVisited = QDateTime::currentDateTime();
+ entry.firstVisited = TQDateTime::currentDateTime();
entry.lastVisited = entry.firstVisited;
// always remove from pending if available, otherwise the else branch leaks
// if the map already contains an entry for this key.
- QMapIterator<QString,KonqHistoryEntry*> it = m_pending.find( u );
+ TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.find( u );
if ( it != m_pending.end() ) {
delete it.data();
m_pending.remove( it );
@@ -333,7 +333,7 @@ void KonqHistoryManager::addToHistory( bool pending, const KURL& _url,
// returns false). But when using the HistoryProvider interface, we record
// exactly those filtered-out urls.
// Moreover, we don't get any pending/confirming entries, just one insert()
-void KonqHistoryManager::insert( const QString& url )
+void KonqHistoryManager::insert( const TQString& url )
{
KURL u ( url );
if ( !filterOut( u ) || u.protocol() == "about" ) { // remote URL
@@ -342,21 +342,21 @@ void KonqHistoryManager::insert( const QString& url )
// Local URL -> add to history
KonqHistoryEntry entry;
entry.url = u;
- entry.firstVisited = QDateTime::currentDateTime();
+ entry.firstVisited = TQDateTime::currentDateTime();
entry.lastVisited = entry.firstVisited;
emitAddToHistory( entry );
}
void KonqHistoryManager::emitAddToHistory( const KonqHistoryEntry& entry )
{
- QByteArray data;
- QDataStream stream( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream stream( data, IO_WriteOnly );
stream << entry << objId();
// Protection against very long urls (like data:)
if ( data.size() > 4096 )
return;
kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
- "notifyHistoryEntry(KonqHistoryEntry, QCString)",
+ "notifyHistoryEntry(KonqHistoryEntry, TQCString)",
data );
}
@@ -368,7 +368,7 @@ void KonqHistoryManager::removePending( const KURL& url )
if ( url.isLocalFile() )
return;
- QMapIterator<QString,KonqHistoryEntry*> it = m_pending.find( url.prettyURL() );
+ TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.find( url.prettyURL() );
if ( it != m_pending.end() ) {
KonqHistoryEntry *oldEntry = it.data(); // the old entry, may be 0L
emitRemoveFromHistory( url ); // remove the current pending entry
@@ -384,7 +384,7 @@ void KonqHistoryManager::removePending( const KURL& url )
// clears the pending list and makes sure the entries get deleted.
void KonqHistoryManager::clearPending()
{
- QMapIterator<QString,KonqHistoryEntry*> it = m_pending.begin();
+ TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.begin();
while ( it != m_pending.end() ) {
delete it.data();
++it;
@@ -394,59 +394,59 @@ void KonqHistoryManager::clearPending()
void KonqHistoryManager::emitRemoveFromHistory( const KURL& url )
{
- QByteArray data;
- QDataStream stream( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream stream( data, IO_WriteOnly );
stream << url << objId();
kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
- "notifyRemove(KURL, QCString)", data );
+ "notifyRemove(KURL, TQCString)", data );
}
void KonqHistoryManager::emitRemoveFromHistory( const KURL::List& urls )
{
- QByteArray data;
- QDataStream stream( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream stream( data, IO_WriteOnly );
stream << urls << objId();
kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
- "notifyRemove(KURL::List, QCString)", data );
+ "notifyRemove(KURL::List, TQCString)", data );
}
void KonqHistoryManager::emitClear()
{
- QByteArray data;
- QDataStream stream( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream stream( data, IO_WriteOnly );
stream << objId();
kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
- "notifyClear(QCString)", data );
+ "notifyClear(TQCString)", data );
}
void KonqHistoryManager::emitSetMaxCount( Q_UINT32 count )
{
- QByteArray data;
- QDataStream stream( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream stream( data, IO_WriteOnly );
stream << count << objId();
kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
- "notifyMaxCount(Q_UINT32, QCString)", data );
+ "notifyMaxCount(Q_UINT32, TQCString)", data );
}
void KonqHistoryManager::emitSetMaxAge( Q_UINT32 days )
{
- QByteArray data;
- QDataStream stream( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream stream( data, IO_WriteOnly );
stream << days << objId();
kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
- "notifyMaxAge(Q_UINT32, QCString)", data );
+ "notifyMaxAge(Q_UINT32, TQCString)", data );
}
///////////////////////////////////////////////////////////////////
// DCOP called methods
void KonqHistoryManager::notifyHistoryEntry( KonqHistoryEntry e,
- QCString )
+ TQCString )
{
//kdDebug(1203) << "Got new entry from Broadcast: " << e.url.prettyURL() << endl;
KonqHistoryEntry *entry = findEntry( e.url );
- QString urlString = e.url.url();
+ TQString urlString = e.url.url();
if ( !entry ) { // create a new history entry
entry = new KonqHistoryEntry;
@@ -487,7 +487,7 @@ void KonqHistoryManager::notifyHistoryEntry( KonqHistoryEntry e,
emit entryAdded( entry );
}
-void KonqHistoryManager::notifyMaxCount( Q_UINT32 count, QCString )
+void KonqHistoryManager::notifyMaxCount( Q_UINT32 count, TQCString )
{
m_maxCount = count;
clearPending();
@@ -503,7 +503,7 @@ void KonqHistoryManager::notifyMaxCount( Q_UINT32 count, QCString )
}
}
-void KonqHistoryManager::notifyMaxAge( Q_UINT32 days, QCString )
+void KonqHistoryManager::notifyMaxAge( Q_UINT32 days, TQCString )
{
m_maxAgeDays = days;
clearPending();
@@ -519,7 +519,7 @@ void KonqHistoryManager::notifyMaxAge( Q_UINT32 days, QCString )
}
}
-void KonqHistoryManager::notifyClear( QCString )
+void KonqHistoryManager::notifyClear( TQCString )
{
clearPending();
m_history.clear();
@@ -531,7 +531,7 @@ void KonqHistoryManager::notifyClear( QCString )
KParts::HistoryProvider::clear(); // also emits the cleared() signal
}
-void KonqHistoryManager::notifyRemove( KURL url, QCString )
+void KonqHistoryManager::notifyRemove( KURL url, TQCString )
{
kdDebug(1203) << "#### Broadcast: remove entry:: " << url.prettyURL() << endl;
@@ -541,7 +541,7 @@ void KonqHistoryManager::notifyRemove( KURL url, QCString )
if ( entry ) { // entry is now the current item
removeFromCompletion( entry->url.prettyURL(), entry->typedURL );
- QString urlString = entry->url.url();
+ TQString urlString = entry->url.url();
KParts::HistoryProvider::remove( urlString );
addToUpdateList( urlString );
@@ -555,7 +555,7 @@ void KonqHistoryManager::notifyRemove( KURL url, QCString )
}
}
-void KonqHistoryManager::notifyRemove( KURL::List urls, QCString )
+void KonqHistoryManager::notifyRemove( KURL::List urls, TQCString )
{
kdDebug(1203) << "#### Broadcast: removing list!" << endl;
@@ -567,7 +567,7 @@ void KonqHistoryManager::notifyRemove( KURL::List urls, QCString )
if ( entry ) { // entry is now the current item
removeFromCompletion( entry->url.prettyURL(), entry->typedURL );
- QString urlString = entry->url.url();
+ TQString urlString = entry->url.url();
KParts::HistoryProvider::remove( urlString );
addToUpdateList( urlString );
@@ -589,21 +589,21 @@ void KonqHistoryManager::notifyRemove( KURL::List urls, QCString )
// compatibility fallback, try to load the old completion history
bool KonqHistoryManager::loadFallback()
{
- QString file = locateLocal( "config", QString::fromLatin1("konq_history"));
+ TQString file = locateLocal( "config", TQString::fromLatin1("konq_history"));
if ( file.isEmpty() )
return false;
KonqHistoryEntry *entry;
KSimpleConfig config( file );
config.setGroup("History");
- QStringList items = config.readListEntry( "CompletionItems" );
- QStringList::Iterator it = items.begin();
+ TQStringList items = config.readListEntry( "CompletionItems" );
+ TQStringList::Iterator it = items.begin();
while ( it != items.end() ) {
entry = createFallbackEntry( *it );
if ( entry ) {
m_history.append( entry );
- addToCompletion( entry->url.prettyURL(), QString::null, entry->numberOfTimesVisited );
+ addToCompletion( entry->url.prettyURL(), TQString::null, entry->numberOfTimesVisited );
KParts::HistoryProvider::insert( entry->url.url() );
}
@@ -620,7 +620,7 @@ bool KonqHistoryManager::loadFallback()
// tries to create a small KonqHistoryEntry out of a string, where the string
// looks like "http://www.bla.com/bla.html:23"
// the attached :23 is the weighting from KCompletion
-KonqHistoryEntry * KonqHistoryManager::createFallbackEntry(const QString& item) const
+KonqHistoryEntry * KonqHistoryManager::createFallbackEntry(const TQString& item) const
{
// code taken from KCompletion::addItem(), adjusted to use weight = 1
uint len = item.length();
@@ -646,7 +646,7 @@ KonqHistoryEntry * KonqHistoryManager::createFallbackEntry(const QString& item)
entry->url = u;
entry->numberOfTimesVisited = weight;
// to make it not expire immediately...
- entry->lastVisited = QDateTime::currentDateTime();
+ entry->lastVisited = TQDateTime::currentDateTime();
}
return entry;
@@ -672,9 +672,9 @@ void KonqHistoryManager::slotEmitUpdated()
m_updateURLs.clear();
}
-QStringList KonqHistoryManager::allURLs() const
+TQStringList KonqHistoryManager::allURLs() const
{
- QStringList list;
+ TQStringList list;
KonqHistoryIterator it ( m_history );
for ( ; it.current(); ++it )
list.append( it.current()->url.url() );
@@ -682,7 +682,7 @@ QStringList KonqHistoryManager::allURLs() const
return list;
}
-void KonqHistoryManager::addToCompletion( const QString& url, const QString& typedURL,
+void KonqHistoryManager::addToCompletion( const TQString& url, const TQString& typedURL,
int numberOfTimesVisited )
{
m_pCompletion->addItem( url, numberOfTimesVisited );
@@ -690,7 +690,7 @@ void KonqHistoryManager::addToCompletion( const QString& url, const QString& typ
m_pCompletion->addItem( typedURL, numberOfTimesVisited +10 );
}
-void KonqHistoryManager::removeFromCompletion( const QString& url, const QString& typedURL )
+void KonqHistoryManager::removeFromCompletion( const TQString& url, const TQString& typedURL )
{
m_pCompletion->removeItem( url );
m_pCompletion->removeItem( typedURL );
@@ -714,8 +714,8 @@ KonqHistoryEntry * KonqHistoryList::findEntry( const KURL& url )
}
// sort by lastVisited date (oldest go first)
-int KonqHistoryList::compareItems( QPtrCollection::Item item1,
- QPtrCollection::Item item2 )
+int KonqHistoryList::compareItems( TQPtrCollection::Item item1,
+ TQPtrCollection::Item item2 )
{
KonqHistoryEntry *entry1 = static_cast<KonqHistoryEntry *>( item1 );
KonqHistoryEntry *entry2 = static_cast<KonqHistoryEntry *>( item2 );
diff --git a/libkonq/konq_historymgr.h b/libkonq/konq_historymgr.h
index 4ddcb5e83..11b14603b 100644
--- a/libkonq/konq_historymgr.h
+++ b/libkonq/konq_historymgr.h
@@ -20,12 +20,12 @@
#ifndef KONQ_HISTORY_H
#define KONQ_HISTORY_H
-#include <qdatastream.h>
-#include <qfile.h>
-#include <qptrlist.h>
-#include <qobject.h>
-#include <qmap.h>
-#include <qtimer.h>
+#include <tqdatastream.h>
+#include <tqfile.h>
+#include <tqptrlist.h>
+#include <tqobject.h>
+#include <tqmap.h>
+#include <tqtimer.h>
#include <dcopobject.h>
@@ -40,8 +40,8 @@
class KCompletion;
-typedef QPtrList<KonqHistoryEntry> KonqBaseHistoryList;
-typedef QPtrListIterator<KonqHistoryEntry> KonqHistoryIterator;
+typedef TQPtrList<KonqHistoryEntry> KonqBaseHistoryList;
+typedef TQPtrListIterator<KonqHistoryEntry> KonqHistoryIterator;
class LIBKONQ_EXPORT KonqHistoryList : public KonqBaseHistoryList
{
@@ -57,7 +57,7 @@ protected:
/**
* Ensures that the items are sorted by the lastVisited date
*/
- virtual int compareItems( QPtrCollection::Item, QPtrCollection::Item );
+ virtual int compareItems( TQPtrCollection::Item, TQPtrCollection::Item );
};
@@ -81,7 +81,7 @@ public:
return static_cast<KonqHistoryManager*>( KParts::HistoryProvider::self() );
}
- KonqHistoryManager( QObject *parent, const char *name );
+ KonqHistoryManager( TQObject *parent, const char *name );
~KonqHistoryManager();
/**
@@ -147,15 +147,15 @@ public:
* @param title The title of the URL. If you don't know it (yet), you may
specify it in @ref confirmPending().
*/
- void addPending( const KURL& url, const QString& typedURL = QString::null,
- const QString& title = QString::null );
+ void addPending( const KURL& url, const TQString& typedURL = TQString::null,
+ const TQString& title = TQString::null );
/**
* Confirms and updates the entry for @p url.
*/
void confirmPending( const KURL& url,
- const QString& typedURL = QString::null,
- const QString& title = QString::null );
+ const TQString& typedURL = TQString::null,
+ const TQString& title = TQString::null );
/**
* Removes a pending url from the history, e.g. when the url does not
@@ -181,8 +181,8 @@ public:
* By default, file:/ urls will be filtered out, but if they come thru
* the HistoryProvider interface, they are added to the history.
*/
- virtual void insert( const QString& );
- virtual void remove( const QString& ) {}
+ virtual void insert( const TQString& );
+ virtual void remove( const TQString& ) {}
virtual void clear() {}
@@ -236,7 +236,7 @@ protected:
*/
inline bool isExpired( KonqHistoryEntry *entry ) {
return (entry && m_maxAgeDays > 0 && entry->lastVisited <
- QDate::currentDate().addDays( -m_maxAgeDays ));
+ TQDate::currentDate().addDays( -m_maxAgeDays ));
}
/**
@@ -253,41 +253,41 @@ protected:
* @param saveId is the DCOPObject::objId() of the sender so that
* only the sender saves the new history.
*/
- virtual void notifyHistoryEntry( KonqHistoryEntry e, QCString saveId );
+ virtual void notifyHistoryEntry( KonqHistoryEntry e, TQCString saveId );
/**
* Called when the configuration of the maximum count changed.
* Called via DCOP by some config-module
*/
- virtual void notifyMaxCount( Q_UINT32 count, QCString saveId );
+ virtual void notifyMaxCount( Q_UINT32 count, TQCString saveId );
/**
* Called when the configuration of the maximum age of history-entries
* changed. Called via DCOP by some config-module
*/
- virtual void notifyMaxAge( Q_UINT32 days, QCString saveId );
+ virtual void notifyMaxAge( Q_UINT32 days, TQCString saveId );
/**
* Clears the history completely. Called via DCOP by some config-module
*/
- virtual void notifyClear( QCString saveId );
+ virtual void notifyClear( TQCString saveId );
/**
* Notifes about a url that has to be removed from the history.
* The instance where saveId == objId() has to save the history.
*/
- virtual void notifyRemove( KURL url, QCString saveId );
+ virtual void notifyRemove( KURL url, TQCString saveId );
/**
* Notifes about a list of urls that has to be removed from the history.
* The instance where saveId == objId() has to save the history.
*/
- virtual void notifyRemove( KURL::List urls, QCString saveId );
+ virtual void notifyRemove( KURL::List urls, TQCString saveId );
/**
* @returns a list of all urls in the history.
*/
- virtual QStringList allURLs() const;
+ virtual TQStringList allURLs() const;
/**
* Does the work for @ref addPending() and @ref confirmPending().
@@ -301,8 +301,8 @@ protected:
* (if available) and NOT be added again in that case.
*/
void addToHistory( bool pending, const KURL& url,
- const QString& typedURL = QString::null,
- const QString& title = QString::null );
+ const TQString& typedURL = TQString::null,
+ const TQString& title = TQString::null );
/**
@@ -312,7 +312,7 @@ protected:
*/
virtual bool filterOut( const KURL& url );
- void addToUpdateList( const QString& url ) {
+ void addToUpdateList( const TQString& url ) {
m_updateURLs.append( url );
m_updateTimer->start( 500, true );
}
@@ -322,7 +322,7 @@ protected:
* urls to it whenever you modify the list of history entries and start
* m_updateTimer.
*/
- QStringList m_updateURLs;
+ TQStringList m_updateURLs;
private slots:
/**
@@ -351,12 +351,12 @@ private:
* completion.
*/
bool loadFallback();
- KonqHistoryEntry * createFallbackEntry( const QString& ) const;
+ KonqHistoryEntry * createFallbackEntry( const TQString& ) const;
- void addToCompletion( const QString& url, const QString& typedURL, int numberOfTimesVisited = 1 );
- void removeFromCompletion( const QString& url, const QString& typedURL );
+ void addToCompletion( const TQString& url, const TQString& typedURL, int numberOfTimesVisited = 1 );
+ void removeFromCompletion( const TQString& url, const TQString& typedURL );
- QString m_filename;
+ TQString m_filename;
KonqHistoryList m_history;
/**
@@ -365,7 +365,7 @@ private:
* Note: when removing an entry, you have to delete the KonqHistoryEntry
* of the item you remove.
*/
- QMap<QString,KonqHistoryEntry*> m_pending;
+ TQMap<TQString,KonqHistoryEntry*> m_pending;
Q_UINT32 m_maxCount; // maximum of history entries
Q_UINT32 m_maxAgeDays; // maximum age of a history entry
@@ -376,7 +376,7 @@ private:
* A timer that will emit the KParts::HistoryProvider::updated() signal
* thru the slotEmitUpdated slot.
*/
- QTimer *m_updateTimer;
+ TQTimer *m_updateTimer;
static const Q_UINT32 s_historyVersion;
};
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index f30873a9e..c3b255cc2 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -23,15 +23,15 @@
#include "konq_sound.h"
#include "konq_filetip.h"
-#include <qclipboard.h>
-#include <qlayout.h>
-#include <qtimer.h>
-#include <qpainter.h>
-#include <qtooltip.h>
-#include <qlabel.h>
-#include <qmovie.h>
-#include <qregexp.h>
-#include <qcursor.h>
+#include <tqclipboard.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
+#include <tqpainter.h>
+#include <tqtooltip.h>
+#include <tqlabel.h>
+#include <tqmovie.h>
+#include <tqregexp.h>
+#include <tqcursor.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -88,7 +88,7 @@ struct KonqIconViewWidgetPrivate
// Sound preview
KFileIVI *pSoundItem;
KonqSoundPlayer *pSoundPlayer;
- QTimer *pSoundTimer;
+ TQTimer *pSoundTimer;
bool bSoundPreviews;
bool bSoundItemClicked;
bool bAllowSetWallpaper;
@@ -97,48 +97,48 @@ struct KonqIconViewWidgetPrivate
// Animated icons support
bool doAnimations;
- QMovie* m_movie;
+ TQMovie* m_movie;
int m_movieBlocked;
- QString movieFileName;
+ TQString movieFileName;
KIO::PreviewJob *pPreviewJob;
KonqFileTip* pFileTip;
- QStringList previewSettings;
+ TQStringList previewSettings;
bool renameItem;
bool firstClick;
bool releaseMouseEvent;
- QPoint mousePos;
+ TQPoint mousePos;
int mouseState;
- QTimer *pActivateDoubleClick;
- QStringList* pPreviewMimeTypes;
+ TQTimer *pActivateDoubleClick;
+ TQStringList* pPreviewMimeTypes;
bool bProgramsURLdrag;
};
-KonqIconViewWidget::KonqIconViewWidget( QWidget * parent, const char * name, WFlags f, bool kdesktop )
+KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WFlags f, bool kdesktop )
: KIconView( parent, name, f ),
m_rootItem( 0L ), m_size( 0 ) /* default is DesktopIcon size */,
m_bDesktop( kdesktop ),
m_bSetGridX( !kdesktop ) /* No line breaking on the desktop */
{
d = new KonqIconViewWidgetPrivate;
- connect( this, SIGNAL( dropped( QDropEvent *, const QValueList<QIconDragItem> & ) ),
- this, SLOT( slotDropped( QDropEvent*, const QValueList<QIconDragItem> & ) ) );
+ connect( this, TQT_SIGNAL( dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ),
+ this, TQT_SLOT( slotDropped( TQDropEvent*, const TQValueList<TQIconDragItem> & ) ) );
- connect( this, SIGNAL( selectionChanged() ),
- this, SLOT( slotSelectionChanged() ) );
+ connect( this, TQT_SIGNAL( selectionChanged() ),
+ this, TQT_SLOT( slotSelectionChanged() ) );
kapp->addKipcEventMask( KIPC::IconChanged );
- connect( kapp, SIGNAL(iconChanged(int)), SLOT(slotIconChanged(int)) );
- connect( this, SIGNAL(onItem(QIconViewItem *)), SLOT(slotOnItem(QIconViewItem *)) );
- connect( this, SIGNAL(onViewport()), SLOT(slotOnViewport()) );
- connect( this, SIGNAL(itemRenamed(QIconViewItem *, const QString &)), SLOT(slotItemRenamed(QIconViewItem *, const QString &)) );
+ connect( kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int)) );
+ connect( this, TQT_SIGNAL(onItem(TQIconViewItem *)), TQT_SLOT(slotOnItem(TQIconViewItem *)) );
+ connect( this, TQT_SIGNAL(onViewport()), TQT_SLOT(slotOnViewport()) );
+ connect( this, TQT_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)), TQT_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
m_pSettings = KonqFMSettings::settings(); // already needed in setItemTextPos(), calculateGridX()
d->bBoostPreview = boostPreview();
// hardcoded settings
- setSelectionMode( QIconView::Extended );
- setItemTextPos( QIconView::Bottom );
+ setSelectionMode( TQIconView::Extended );
+ setItemTextPos( TQIconView::Bottom );
d->releaseMouseEvent = false;
d->pFileTip = new KonqFileTip(this);
d->firstClick = false;
@@ -151,7 +151,7 @@ KonqIconViewWidget::KonqIconViewWidget( QWidget * parent, const char * name, WFl
m_LineupMode = LineupBoth;
// emit our signals
slotSelectionChanged();
- m_iconPositionGroupPrefix = QString::fromLatin1( "IconPosition::" );
+ m_iconPositionGroupPrefix = TQString::fromLatin1( "IconPosition::" );
KonqUndoManager::incRef();
}
@@ -172,7 +172,7 @@ void KonqIconViewWidget::setMaySetWallpaper(bool b)
d->bAllowSetWallpaper = b;
}
-void KonqIconViewWidget::focusOutEvent( QFocusEvent * ev )
+void KonqIconViewWidget::focusOutEvent( TQFocusEvent * ev )
{
// We can't possibly have the mouse pressed and still lose focus.
// Well, we can, but when we regain focus we should assume the mouse is
@@ -189,7 +189,7 @@ void KonqIconViewWidget::focusOutEvent( QFocusEvent * ev )
KIconView::focusOutEvent( ev );
}
-void KonqIconViewWidget::slotItemRenamed(QIconViewItem *item, const QString &name)
+void KonqIconViewWidget::slotItemRenamed(TQIconViewItem *item, const TQString &name)
{
kdDebug(1203) << "KonqIconViewWidget::slotItemRenamed" << endl;
KFileIVI *viewItem = static_cast<KFileIVI *>(item);
@@ -231,7 +231,7 @@ void KonqIconViewWidget::readAnimatedIconsConfig()
d->doAnimations = cfgGroup.readBoolEntry( "Animated", true /*default*/ );
}
-void KonqIconViewWidget::slotOnItem( QIconViewItem *_item )
+void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
{
KFileIVI* item = static_cast<KFileIVI *>( _item );
// Reset icon of previous item
@@ -284,7 +284,7 @@ void KonqIconViewWidget::slotOnItem( QIconViewItem *_item )
else {
kdDebug(1203) << "we go ahead.." << endl;
d->m_movieBlocked++;
- QTimer::singleShot(300, this, SLOT(slotReenableAnimation()));
+ TQTimer::singleShot(300, this, TQT_SLOT(slotReenableAnimation()));
d->m_movie->restart();
d->m_movie->unpause();
}
@@ -292,14 +292,14 @@ void KonqIconViewWidget::slotOnItem( QIconViewItem *_item )
else
#endif
{
- QMovie movie = KGlobal::iconLoader()->loadMovie( d->pActiveItem->mouseOverAnimation(), KIcon::Desktop, d->pActiveItem->iconSize() );
+ TQMovie movie = KGlobal::iconLoader()->loadMovie( d->pActiveItem->mouseOverAnimation(), KIcon::Desktop, d->pActiveItem->iconSize() );
if ( !movie.isNull() )
{
delete d->m_movie;
- d->m_movie = new QMovie( movie ); // shallow copy, don't worry
+ d->m_movie = new TQMovie( movie ); // shallow copy, don't worry
// Fix alpha-channel - currently only if no background pixmap,
// the bg pixmap case requires to uncomment the code at qmovie.cpp:404
- const QPixmap* pm = backgroundPixmap();
+ const TQPixmap* pm = backgroundPixmap();
bool hasPixmap = pm && !pm->isNull();
if ( !hasPixmap ) {
pm = viewport()->backgroundPixmap();
@@ -307,8 +307,8 @@ void KonqIconViewWidget::slotOnItem( QIconViewItem *_item )
}
if (!hasPixmap && backgroundMode() != NoBackground)
d->m_movie->setBackgroundColor( viewport()->backgroundColor() );
- d->m_movie->connectUpdate( this, SLOT( slotMovieUpdate(const QRect &) ) );
- d->m_movie->connectStatus( this, SLOT( slotMovieStatus(int) ) );
+ d->m_movie->connectUpdate( this, TQT_SLOT( slotMovieUpdate(const TQRect &) ) );
+ d->m_movie->connectStatus( this, TQT_SLOT( slotMovieStatus(int) ) );
d->movieFileName = d->pActiveItem->mouseOverAnimation();
d->pActiveItem->setAnimated( true );
}
@@ -318,7 +318,7 @@ void KonqIconViewWidget::slotOnItem( QIconViewItem *_item )
if (d->m_movie)
d->m_movie->pause();
// No movie available, remember it
- d->pActiveItem->setMouseOverAnimation( QString::null );
+ d->pActiveItem->setMouseOverAnimation( TQString::null );
}
}
} // animations
@@ -355,8 +355,8 @@ void KonqIconViewWidget::slotOnItem( QIconViewItem *_item )
d->bSoundItemClicked = false;
if (!d->pSoundTimer)
{
- d->pSoundTimer = new QTimer(this);
- connect(d->pSoundTimer, SIGNAL(timeout()), SLOT(slotStartSoundPreview()));
+ d->pSoundTimer = new TQTimer(this);
+ connect(d->pSoundTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotStartSoundPreview()));
}
if (d->pSoundTimer->isActive())
d->pSoundTimer->stop();
@@ -394,7 +394,7 @@ void KonqIconViewWidget::slotOnViewport()
d->m_movie->pause();
d->m_movieBlocked++;
kdDebug(1203) << "on viewport, blocking" << endl;
- QTimer::singleShot(300, this, SLOT(slotReenableAnimation()));
+ TQTimer::singleShot(300, this, TQT_SLOT(slotReenableAnimation()));
}
#endif
d->pActiveItem->refreshIcon( true );
@@ -419,16 +419,16 @@ void KonqIconViewWidget::slotStartSoundPreview()
}
-void KonqIconViewWidget::slotPreview(const KFileItem *item, const QPixmap &pix)
+void KonqIconViewWidget::slotPreview(const KFileItem *item, const TQPixmap &pix)
{
// ### slow. Idea: move KonqKfmIconView's m_itemDict into this class
- for (QIconViewItem *it = firstItem(); it; it = it->nextItem())
+ for (TQIconViewItem *it = firstItem(); it; it = it->nextItem())
{
KFileIVI* current = static_cast<KFileIVI *>(it);
if (current->item() == item)
{
if (item->overlays() & KIcon::HiddenOverlay) {
- QPixmap p(pix);
+ TQPixmap p(pix);
KIconEffect::semiTransparent(p);
current->setThumbnailPixmap(p);
@@ -446,7 +446,7 @@ void KonqIconViewWidget::slotPreviewResult()
emit imagePreviewFinished();
}
-void KonqIconViewWidget::slotToolTipPreview(const KFileItem* , const QPixmap &)
+void KonqIconViewWidget::slotToolTipPreview(const KFileItem* , const TQPixmap &)
{
// unused - remove for KDE4
}
@@ -456,14 +456,14 @@ void KonqIconViewWidget::slotToolTipPreviewResult()
// unused - remove for KDE4
}
-void KonqIconViewWidget::slotMovieUpdate( const QRect& rect )
+void KonqIconViewWidget::slotMovieUpdate( const TQRect& rect )
{
//kdDebug(1203) << "KonqIconViewWidget::slotMovieUpdate " << rect.x() << "," << rect.y() << " " << rect.width() << "x" << rect.height() << endl;
Q_ASSERT( d );
Q_ASSERT( d->m_movie );
// seems stopAnimation triggers one last update
if ( d->pActiveItem && d->m_movie && d->pActiveItem->isAnimated() ) {
- const QPixmap &frame = d->m_movie->framePixmap();
+ const TQPixmap &frame = d->m_movie->framePixmap();
// This can happen if the icon was scaled to the desired size, so KIconLoader
// will happily return a movie with different dimensions than the icon
int iconSize=d->pActiveItem->iconSize();
@@ -472,12 +472,12 @@ void KonqIconViewWidget::slotMovieUpdate( const QRect& rect )
d->pActiveItem->setAnimated( false );
d->m_movie->pause();
// No movie available, remember it
- d->pActiveItem->setMouseOverAnimation( QString::null );
+ d->pActiveItem->setMouseOverAnimation( TQString::null );
d->pActiveItem->setActive( true );
return;
}
d->pActiveItem->setPixmapDirect( frame, false, false /*no redraw*/ );
- QRect pixRect = d->pActiveItem->pixmapRect(false);
+ TQRect pixRect = d->pActiveItem->pixmapRect(false);
repaintContents( pixRect.x() + rect.x(), pixRect.y() + rect.y(), rect.width(), rect.height(), false );
}
}
@@ -488,7 +488,7 @@ void KonqIconViewWidget::slotMovieStatus( int status )
// Error playing the MNG -> forget about it and do normal iconeffect
if ( d->pActiveItem && d->pActiveItem->isAnimated() ) {
d->pActiveItem->setAnimated( false );
- d->pActiveItem->setMouseOverAnimation( QString::null );
+ d->pActiveItem->setMouseOverAnimation( TQString::null );
d->pActiveItem->setActive( true );
}
}
@@ -513,7 +513,7 @@ void KonqIconViewWidget::clear()
d->pActiveItem = 0L;
}
-void KonqIconViewWidget::takeItem( QIconViewItem *item )
+void KonqIconViewWidget::takeItem( TQIconViewItem *item )
{
if ( d->pActiveItem == static_cast<KFileIVI *>(item) )
{
@@ -528,7 +528,7 @@ void KonqIconViewWidget::takeItem( QIconViewItem *item )
}
// Currently unused - remove in KDE 4.0
-void KonqIconViewWidget::setThumbnailPixmap( KFileIVI * item, const QPixmap & pixmap )
+void KonqIconViewWidget::setThumbnailPixmap( KFileIVI * item, const TQPixmap & pixmap )
{
if ( item )
{
@@ -552,19 +552,19 @@ bool KonqIconViewWidget::initConfig( bool bInit )
bool fontChanged = false;
// Color settings
- QColor normalTextColor = m_pSettings->normalTextColor();
+ TQColor normalTextColor = m_pSettings->normalTextColor();
setItemColor( normalTextColor );
if (m_bDesktop)
{
- QColor itemTextBg = m_pSettings->itemTextBackground();
+ TQColor itemTextBg = m_pSettings->itemTextBackground();
if ( itemTextBg.isValid() )
setItemTextBackground( itemTextBg );
else
setItemTextBackground( NoBrush );
}
- bool on = m_pSettings->showFileTips() && QToolTip::isGloballyEnabled();
+ bool on = m_pSettings->showFileTips() && TQToolTip::isGloballyEnabled();
d->pFileTip->setOptions(on,
m_pSettings->showPreviewsInFileTips(),
m_pSettings->numFileTips());
@@ -573,7 +573,7 @@ bool KonqIconViewWidget::initConfig( bool bInit )
setShowToolTips(!on);
// Font settings
- QFont font( m_pSettings->standardFont() );
+ TQFont font( m_pSettings->standardFont() );
if (!m_bDesktop)
font.setUnderline( m_pSettings->underlineLink() );
@@ -582,7 +582,7 @@ bool KonqIconViewWidget::initConfig( bool bInit )
setFont( font );
if (!bInit)
{
- // QIconView doesn't do it by default... but if the font is made much
+ // TQIconView doesn't do it by default... but if the font is made much
// bigger, we really need to give more space between the icons
fontChanged = true;
}
@@ -590,7 +590,7 @@ bool KonqIconViewWidget::initConfig( bool bInit )
setIconTextHeight( m_pSettings->iconTextHeight() );
- if ( (itemTextPos() == QIconView::Right) && (maxItemWidth() != gridXValue()) )
+ if ( (itemTextPos() == TQIconView::Right) && (maxItemWidth() != gridXValue()) )
{
int size = m_size;
m_size = -1; // little trick to force grid change in setIcons
@@ -622,7 +622,7 @@ void KonqIconViewWidget::disableSoundPreviews()
d->pSoundTimer->stop();
}
-void KonqIconViewWidget::setIcons( int size, const QStringList& stopImagePreviewFor )
+void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePreviewFor )
{
// size has changed?
bool sizeChanged = (m_size != size);
@@ -639,7 +639,7 @@ void KonqIconViewWidget::setIcons( int size, const QStringList& stopImagePreview
int realSize = size ? size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
// choose spacing depending on font, but min 5 (due to KFileIVI move limit)
setSpacing( ( m_bDesktop || ( realSize > KIcon::SizeSmall ) ) ?
- QMAX( 5, QFontMetrics(font()).width('n') ) : 0 );
+ QMAX( 5, TQFontMetrics(font()).width('n') ) : 0 );
}
if ( sizeChanged || previewSizeChanged || !stopImagePreviewFor.isEmpty() )
@@ -656,7 +656,7 @@ void KonqIconViewWidget::setIcons( int size, const QStringList& stopImagePreview
viewport()->setUpdatesEnabled( false );
// Do this even if size didn't change, since this is used by refreshMimeTypes...
- for ( QIconViewItem *it = firstItem(); it; it = it->nextItem() ) {
+ for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) {
KFileIVI * ivi = static_cast<KFileIVI *>( it );
// Set a normal icon for files that are not thumbnails, and for files
// that are thumbnails but for which it should be stopped
@@ -682,22 +682,22 @@ void KonqIconViewWidget::setIcons( int size, const QStringList& stopImagePreview
viewport()->update(); //Repaint later..
}
-bool KonqIconViewWidget::mimeTypeMatch( const QString& mimeType, const QStringList& mimeList ) const
+bool KonqIconViewWidget::mimeTypeMatch( const TQString& mimeType, const TQStringList& mimeList ) const
{
// Code duplication from KIO::PreviewJob
KMimeType::Ptr mime = KMimeType::mimeType( mimeType );
- for (QStringList::ConstIterator mt = mimeList.begin(); mt != mimeList.end(); ++mt)
+ for (TQStringList::ConstIterator mt = mimeList.begin(); mt != mimeList.end(); ++mt)
{
if ( mime->is( *mt ) )
return true;
// Support for *mt == "image/*"
- QString tmp( mimeType );
- if ( (*mt).endsWith("*") && tmp.replace(QRegExp("/.*"), "/*") == (*mt) )
+ TQString tmp( mimeType );
+ if ( (*mt).endsWith("*") && tmp.replace(TQRegExp("/.*"), "/*") == (*mt) )
return true;
if ( (*mt) == "text/plain" )
{
- QVariant textProperty = mime->property( "X-KDE-text" );
- if ( textProperty.type() == QVariant::Bool && textProperty.toBool() )
+ TQVariant textProperty = mime->property( "X-KDE-text" );
+ if ( textProperty.type() == TQVariant::Bool && textProperty.toBool() )
return true;
}
}
@@ -710,7 +710,7 @@ void KonqIconViewWidget::setItemTextPos( ItemTextPos pos )
int sz = m_size ? m_size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
if ( m_bSetGridX )
- if ( pos == QIconView::Bottom )
+ if ( pos == TQIconView::Bottom )
setGridX( QMAX( sz + 50, previewIconSize( sz ) + 13 ) );
else
{
@@ -774,7 +774,7 @@ void KonqIconViewWidget::gridValues( int* x, int* y, int* dx, int* dy,
void KonqIconViewWidget::calculateGridX()
{
if ( m_bSetGridX )
- if ( itemTextPos() == QIconView::Bottom )
+ if ( itemTextPos() == TQIconView::Bottom )
setGridX( gridXValue() );
else
{
@@ -789,7 +789,7 @@ int KonqIconViewWidget::gridXValue() const
int sz = m_size ? m_size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
int newGridX;
- if ( itemTextPos() == QIconView::Bottom )
+ if ( itemTextPos() == TQIconView::Bottom )
newGridX = QMAX( sz + 50, previewIconSize( sz ) + 13 );
else
newGridX = QMAX( sz, previewIconSize( sz ) ) + m_pSettings->iconTextWidth();
@@ -801,7 +801,7 @@ int KonqIconViewWidget::gridXValue() const
void KonqIconViewWidget::refreshMimeTypes()
{
updatePreviewMimeTypes();
- for ( QIconViewItem *it = firstItem(); it; it = it->nextItem() )
+ for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() )
(static_cast<KFileIVI *>( it ))->item()->refreshMimeType();
setIcons( m_size );
}
@@ -816,10 +816,10 @@ void KonqIconViewWidget::setURL( const KURL &kurl )
if ( m_url.isLocalFile() )
m_dotDirectoryPath = m_url.path(1).append( ".directory" );
else
- m_dotDirectoryPath = QString::null;
+ m_dotDirectoryPath = TQString::null;
}
-void KonqIconViewWidget::startImagePreview( const QStringList &, bool force )
+void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force )
{
stopImagePreview(); // just in case
@@ -841,12 +841,12 @@ void KonqIconViewWidget::startImagePreview( const QStringList &, bool force )
}
KFileItemList items;
- for ( QIconViewItem *it = firstItem(); it; it = it->nextItem() )
+ for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() )
if ( force || !static_cast<KFileIVI *>( it )->hasValidThumbnail() )
items.append( static_cast<KFileIVI *>( it )->item() );
bool onlyAudio = true;
- for ( QStringList::ConstIterator it = d->previewSettings.begin(); it != d->previewSettings.end(); ++it ) {
+ for ( TQStringList::ConstIterator it = d->previewSettings.begin(); it != d->previewSettings.end(); ++it ) {
if ( (*it).startsWith( "audio/" ) )
d->bSoundPreviews = true;
else
@@ -870,10 +870,10 @@ void KonqIconViewWidget::startImagePreview( const QStringList &, bool force )
d->pPreviewJob = KIO::filePreview( items, size, size, iconSize,
m_pSettings->textPreviewIconTransparency(), true /* scale */,
true /* save */, &(d->previewSettings) );
- connect( d->pPreviewJob, SIGNAL( gotPreview( const KFileItem *, const QPixmap & ) ),
- this, SLOT( slotPreview( const KFileItem *, const QPixmap & ) ) );
- connect( d->pPreviewJob, SIGNAL( result( KIO::Job * ) ),
- this, SLOT( slotPreviewResult() ) );
+ connect( d->pPreviewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
+ this, TQT_SLOT( slotPreview( const KFileItem *, const TQPixmap & ) ) );
+ connect( d->pPreviewJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ this, TQT_SLOT( slotPreviewResult() ) );
}
void KonqIconViewWidget::stopImagePreview()
@@ -896,7 +896,7 @@ KFileItemList KonqIconViewWidget::selectedFileItems()
{
KFileItemList lstItems;
- QIconViewItem *it = firstItem();
+ TQIconViewItem *it = firstItem();
for (; it; it = it->nextItem() )
if ( it->isSelected() ) {
KFileItem *fItem = (static_cast<KFileIVI *>(it))->item();
@@ -905,7 +905,7 @@ KFileItemList KonqIconViewWidget::selectedFileItems()
return lstItems;
}
-void KonqIconViewWidget::slotDropped( QDropEvent *ev, const QValueList<QIconDragItem> & )
+void KonqIconViewWidget::slotDropped( TQDropEvent *ev, const TQValueList<TQIconDragItem> & )
{
// Drop on background
KURL dirURL = url();
@@ -916,26 +916,26 @@ void KonqIconViewWidget::slotDropped( QDropEvent *ev, const QValueList<QIconDrag
KonqOperations::doDrop( m_rootItem /* may be 0L */, dirURL, ev, this );
}
-void KonqIconViewWidget::slotAboutToCreate(const QPoint &, const QValueList<KIO::CopyInfo> &)
+void KonqIconViewWidget::slotAboutToCreate(const TQPoint &, const TQValueList<KIO::CopyInfo> &)
{
// Do nothing :-)
}
-void KonqIconViewWidget::drawBackground( QPainter *p, const QRect &r )
+void KonqIconViewWidget::drawBackground( TQPainter *p, const TQRect &r )
{
drawBackground(p, r, r.topLeft());
}
-void KonqIconViewWidget::drawBackground( QPainter *p, const QRect &r , const QPoint &pt)
+void KonqIconViewWidget::drawBackground( TQPainter *p, const TQRect &r , const TQPoint &pt)
{
- const QPixmap *pm = backgroundPixmap();
+ const TQPixmap *pm = backgroundPixmap();
bool hasPixmap = pm && !pm->isNull();
if ( !hasPixmap ) {
pm = viewport()->backgroundPixmap();
hasPixmap = pm && !pm->isNull();
}
- QRect rtgt(r);
+ TQRect rtgt(r);
rtgt.moveTopLeft(pt);
if (!hasPixmap && backgroundMode() != NoBackground) {
p->fillRect(rtgt, viewport()->backgroundColor());
@@ -945,11 +945,11 @@ void KonqIconViewWidget::drawBackground( QPainter *p, const QRect &r , const QPo
if (hasPixmap) {
int ax = (r.x() + contentsX() + leftMargin()) % pm->width();
int ay = (r.y() + contentsY() + topMargin()) % pm->height();
- p->drawTiledPixmap(rtgt, *pm, QPoint(ax, ay));
+ p->drawTiledPixmap(rtgt, *pm, TQPoint(ax, ay));
}
}
-QDragObject * KonqIconViewWidget::dragObject()
+TQDragObject * KonqIconViewWidget::dragObject()
{
if ( !currentItem() )
return 0;
@@ -957,14 +957,14 @@ QDragObject * KonqIconViewWidget::dragObject()
return konqDragObject( viewport() );
}
-KonqIconDrag * KonqIconViewWidget::konqDragObject( QWidget * dragSource )
+KonqIconDrag * KonqIconViewWidget::konqDragObject( TQWidget * dragSource )
{
//kdDebug(1203) << "KonqIconViewWidget::konqDragObject" << endl;
KonqIconDrag2 * drag = new KonqIconDrag2( dragSource );
- QIconViewItem *primaryItem = currentItem();
+ TQIconViewItem *primaryItem = currentItem();
// Append all items to the drag object
- for ( QIconViewItem *it = firstItem(); it; it = it->nextItem() ) {
+ for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) {
if ( it->isSelected() ) {
if (!primaryItem)
primaryItem = it;
@@ -972,14 +972,14 @@ KonqIconDrag * KonqIconViewWidget::konqDragObject( QWidget * dragSource )
KURL url = fileItem->url();
bool dummy;
KURL mostLocalURL = fileItem->mostLocalURL(dummy);
- QString itemURL = KURLDrag::urlToString(url);
+ TQString itemURL = KURLDrag::urlToString(url);
kdDebug(1203) << "itemURL=" << itemURL << endl;
- QIconDragItem id;
- id.setData( QCString(itemURL.latin1()) );
+ TQIconDragItem id;
+ id.setData( TQCString(itemURL.latin1()) );
drag->append( id,
- QRect( it->pixmapRect(false).topLeft() - m_mousePos,
+ TQRect( it->pixmapRect(false).topLeft() - m_mousePos,
it->pixmapRect().size() ),
- QRect( it->textRect(false).topLeft() - m_mousePos,
+ TQRect( it->textRect(false).topLeft() - m_mousePos,
it->textRect().size() ),
itemURL, mostLocalURL );
}
@@ -991,11 +991,11 @@ KonqIconDrag * KonqIconViewWidget::konqDragObject( QWidget * dragSource )
return drag;
}
-void KonqIconViewWidget::contentsDragEnterEvent( QDragEnterEvent *e )
+void KonqIconViewWidget::contentsDragEnterEvent( TQDragEnterEvent *e )
{
if ( e->provides( "text/uri-list" ) )
{
- QByteArray payload = e->encodedData( "text/uri-list" );
+ TQByteArray payload = e->encodedData( "text/uri-list" );
if ( !payload.size() )
kdError() << "Empty data !" << endl;
// Cache the URLs, since we need them every time we move over a file
@@ -1021,7 +1021,7 @@ void KonqIconViewWidget::contentsDragEnterEvent( QDragEnterEvent *e )
emit dragEntered( true /*accepted*/ );
}
-void KonqIconViewWidget::contentsDragMoveEvent( QDragMoveEvent *e )
+void KonqIconViewWidget::contentsDragMoveEvent( TQDragMoveEvent *e )
{
if ( d->bProgramsURLdrag ) {
emit dragMove( false );
@@ -1030,7 +1030,7 @@ void KonqIconViewWidget::contentsDragMoveEvent( QDragMoveEvent *e )
return;
}
- QIconViewItem *item = findItem( e->pos() );
+ TQIconViewItem *item = findItem( e->pos() );
if ( e->source() != viewport() &&
!item && m_rootItem && !m_rootItem->isWritable() ) {
emit dragMove( false );
@@ -1042,7 +1042,7 @@ void KonqIconViewWidget::contentsDragMoveEvent( QDragMoveEvent *e )
KIconView::contentsDragMoveEvent( e );
}
-void KonqIconViewWidget::contentsDragLeaveEvent( QDragLeaveEvent *e )
+void KonqIconViewWidget::contentsDragLeaveEvent( TQDragLeaveEvent *e )
{
d->bProgramsURLdrag = false;
KIconView::contentsDragLeaveEvent(e);
@@ -1050,19 +1050,19 @@ void KonqIconViewWidget::contentsDragLeaveEvent( QDragLeaveEvent *e )
}
-void KonqIconViewWidget::setItemColor( const QColor &c )
+void KonqIconViewWidget::setItemColor( const TQColor &c )
{
iColor = c;
}
-QColor KonqIconViewWidget::itemColor() const
+TQColor KonqIconViewWidget::itemColor() const
{
return iColor;
}
void KonqIconViewWidget::disableIcons( const KURL::List & lst )
{
- for ( QIconViewItem *kit = firstItem(); kit; kit = kit->nextItem() )
+ for ( TQIconViewItem *kit = firstItem(); kit; kit = kit->nextItem() )
{
bool bFound = false;
// Wow. This is ugly. Matching two lists together....
@@ -1088,7 +1088,7 @@ void KonqIconViewWidget::slotSelectionChanged()
bool bInTrash = false;
int iCount = 0;
- for ( QIconViewItem *it = firstItem(); it; it = it->nextItem() )
+ for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() )
{
if ( it->isSelected() )
{
@@ -1097,7 +1097,7 @@ void KonqIconViewWidget::slotSelectionChanged()
KFileItem *item = ( static_cast<KFileIVI *>( it ) )->item();
KURL url = item->url();
- QString local_path = item->localPath();
+ TQString local_path = item->localPath();
if ( url.directory(false) == KGlobalSettings::trashPath() )
bInTrash = true;
@@ -1126,8 +1126,8 @@ void KonqIconViewWidget::renameCurrentItem()
void KonqIconViewWidget::renameSelectedItem()
{
kdDebug(1203) << " -- KonqIconViewWidget::renameSelectedItem() -- " << endl;
- QIconViewItem * item = 0L;
- QIconViewItem *it = firstItem();
+ TQIconViewItem * item = 0L;
+ TQIconViewItem *it = firstItem();
for (; it; it = it->nextItem() )
if ( it->isSelected() && !item )
{
@@ -1147,14 +1147,14 @@ void KonqIconViewWidget::cutSelection()
kdDebug(1203) << " -- KonqIconViewWidget::cutSelection() -- " << endl;
KonqIconDrag * obj = konqDragObject( /* no parent ! */ );
obj->setMoveSelection( true );
- QApplication::clipboard()->setData( obj );
+ TQApplication::clipboard()->setData( obj );
}
void KonqIconViewWidget::copySelection()
{
kdDebug(1203) << " -- KonqIconViewWidget::copySelection() -- " << endl;
KonqIconDrag * obj = konqDragObject( /* no parent ! */ );
- QApplication::clipboard()->setData( obj );
+ TQApplication::clipboard()->setData( obj );
}
void KonqIconViewWidget::pasteSelection()
@@ -1176,7 +1176,7 @@ KURL::List KonqIconViewWidget::selectedUrls( UrlFlags flags ) const
{
KURL::List lstURLs;
bool dummy;
- for ( QIconViewItem *it = firstItem(); it; it = it->nextItem() )
+ for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() )
if ( it->isSelected() ) {
KFileItem* item = (static_cast<KFileIVI *>( it ))->item();
lstURLs.append( flags == MostLocalUrls ? item->mostLocalURL( dummy ) : item->url() );
@@ -1184,12 +1184,12 @@ KURL::List KonqIconViewWidget::selectedUrls( UrlFlags flags ) const
return lstURLs;
}
-QRect KonqIconViewWidget::iconArea() const
+TQRect KonqIconViewWidget::iconArea() const
{
return m_IconRect;
}
-void KonqIconViewWidget::setIconArea(const QRect &rect)
+void KonqIconViewWidget::setIconArea(const TQRect &rect)
{
m_IconRect = rect;
}
@@ -1214,14 +1214,14 @@ void KonqIconViewWidget::setSortDirectoriesFirst( bool b )
m_bSortDirsFirst = b;
}
-void KonqIconViewWidget::contentsMouseMoveEvent( QMouseEvent *e )
+void KonqIconViewWidget::contentsMouseMoveEvent( TQMouseEvent *e )
{
if ( (d->pSoundPlayer && d->pSoundPlayer->isPlaying()) || (d->pSoundTimer && d->pSoundTimer->isActive()))
{
// The following call is SO expensive (the ::widgetAt call eats up to 80%
// of the mouse move cpucycles!), so it's mandatory to place that function
// under strict checks, such as d->pSoundPlayer->isPlaying()
- if ( QApplication::widgetAt( QCursor::pos() ) != topLevelWidget() )
+ if ( TQApplication::widgetAt( TQCursor::pos() ) != topLevelWidget() )
{
if (d->pSoundPlayer)
d->pSoundPlayer->stop();
@@ -1234,9 +1234,9 @@ void KonqIconViewWidget::contentsMouseMoveEvent( QMouseEvent *e )
KIconView::contentsMouseMoveEvent( e );
}
-void KonqIconViewWidget::contentsDropEvent( QDropEvent * ev )
+void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev )
{
- QIconViewItem *i = findItem( ev->pos() );
+ TQIconViewItem *i = findItem( ev->pos() );
if ( ev->source() != viewport() &&
!i && m_rootItem && !m_rootItem->isWritable() ) {
@@ -1244,18 +1244,18 @@ void KonqIconViewWidget::contentsDropEvent( QDropEvent * ev )
return;
}
- // Short-circuit QIconView if Ctrl is pressed, so that it's possible
+ // Short-circuit TQIconView if Ctrl is pressed, so that it's possible
// to drop a file into its own parent widget to copy it.
- if ( !i && (ev->action() == QDropEvent::Copy || ev->action() == QDropEvent::Link)
+ if ( !i && (ev->action() == TQDropEvent::Copy || ev->action() == TQDropEvent::Link)
&& ev->source() && ev->source() == viewport())
{
- // First we need to call QIconView though, to clear the drag shape
+ // First we need to call TQIconView though, to clear the drag shape
bool bMovable = itemsMovable();
setItemsMovable(false); // hack ? call it what you want :-)
KIconView::contentsDropEvent( ev );
setItemsMovable(bMovable);
- QValueList<QIconDragItem> lst;
+ TQValueList<TQIconDragItem> lst;
slotDropped(ev, lst);
}
else
@@ -1280,8 +1280,8 @@ void KonqIconViewWidget::doubleClickTimeout()
mousePressChangeValue();
if ( d->releaseMouseEvent )
{
- QMouseEvent e( QEvent::MouseButtonPress,d->mousePos , 1, d->mouseState);
- QIconViewItem* item = findItem( e.pos() );
+ TQMouseEvent e( TQEvent::MouseButtonPress,d->mousePos , 1, d->mouseState);
+ TQIconViewItem* item = findItem( e.pos() );
KURL url;
if ( item )
{
@@ -1301,7 +1301,7 @@ void KonqIconViewWidget::doubleClickTimeout()
}
else
{
- QMouseEvent e( QEvent::MouseMove,d->mousePos , 1, d->mouseState);
+ TQMouseEvent e( TQEvent::MouseMove,d->mousePos , 1, d->mouseState);
KIconView::contentsMousePressEvent( &e );
}
if( d->pActivateDoubleClick->isActive() )
@@ -1311,7 +1311,7 @@ void KonqIconViewWidget::doubleClickTimeout()
d->renameItem= false;
}
-void KonqIconViewWidget::wheelEvent(QWheelEvent* e)
+void KonqIconViewWidget::wheelEvent(TQWheelEvent* e)
{
// when scrolling with mousewheel, stop possible pending filetip
d->pFileTip->setItem( 0 );
@@ -1333,7 +1333,7 @@ void KonqIconViewWidget::wheelEvent(QWheelEvent* e)
KIconView::wheelEvent(e);
}
-void KonqIconViewWidget::leaveEvent( QEvent *e )
+void KonqIconViewWidget::leaveEvent( TQEvent *e )
{
// when leaving the widget, stop possible pending filetip and icon effect
slotOnViewport();
@@ -1355,11 +1355,11 @@ void KonqIconViewWidget::mousePressChangeValue()
d->pFileTip->setItem( 0 );
}
-void KonqIconViewWidget::contentsMousePressEvent( QMouseEvent *e )
+void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e )
{
if(d->pActivateDoubleClick && d->pActivateDoubleClick->isActive ())
d->pActivateDoubleClick->stop();
- QIconViewItem* item = findItem( e->pos() );
+ TQIconViewItem* item = findItem( e->pos() );
m_mousePos = e->pos();
KURL url;
if ( item )
@@ -1375,13 +1375,13 @@ void KonqIconViewWidget::contentsMousePressEvent( QMouseEvent *e )
d->mouseState = e->state();
if (!d->pActivateDoubleClick)
{
- d->pActivateDoubleClick = new QTimer(this);
- connect(d->pActivateDoubleClick, SIGNAL(timeout()), this, SLOT(doubleClickTimeout()));
+ d->pActivateDoubleClick = new TQTimer(this);
+ connect(d->pActivateDoubleClick, TQT_SIGNAL(timeout()), this, TQT_SLOT(doubleClickTimeout()));
}
if( d->pActivateDoubleClick->isActive () )
d->pActivateDoubleClick->stop();
else
- d->pActivateDoubleClick->start(QApplication::doubleClickInterval());
+ d->pActivateDoubleClick->start(TQApplication::doubleClickInterval());
d->releaseMouseEvent = false;
return;
}
@@ -1397,7 +1397,7 @@ void KonqIconViewWidget::contentsMousePressEvent( QMouseEvent *e )
}
-void KonqIconViewWidget::contentsMouseReleaseEvent( QMouseEvent *e )
+void KonqIconViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e )
{
KIconView::contentsMouseReleaseEvent( e );
if(d->releaseMouseEvent && d->pActivateDoubleClick && d->pActivateDoubleClick->isActive ())
@@ -1422,7 +1422,7 @@ void KonqIconViewWidget::slotSaveIconPositions()
return; // Currently not available in Konqueror
kdDebug(1214) << "KonqIconViewWidget::slotSaveIconPositions" << endl;
KSimpleConfig dotDirectory( m_dotDirectoryPath );
- QIconViewItem *it = firstItem();
+ TQIconViewItem *it = firstItem();
if ( !it )
return; // No more icons. Maybe we're closing and they've been removed already
while ( it )
@@ -1430,18 +1430,18 @@ void KonqIconViewWidget::slotSaveIconPositions()
KFileIVI *ivi = static_cast<KFileIVI *>( it );
KFileItem *item = ivi->item();
- dotDirectory.setGroup( QString( m_iconPositionGroupPrefix ).append( item->url().fileName() ) );
+ dotDirectory.setGroup( TQString( m_iconPositionGroupPrefix ).append( item->url().fileName() ) );
kdDebug(1214) << "KonqIconViewWidget::slotSaveIconPositions " << item->url().fileName() << " " << it->x() << " " << it->y() << endl;
- dotDirectory.writeEntry( QString( "X %1" ).arg( width() ), it->x() );
- dotDirectory.writeEntry( QString( "Y %1" ).arg( height() ), it->y() );
+ dotDirectory.writeEntry( TQString( "X %1" ).arg( width() ), it->x() );
+ dotDirectory.writeEntry( TQString( "Y %1" ).arg( height() ), it->y() );
dotDirectory.writeEntry( "Exists", true );
it = it->nextItem();
}
- QStringList groups = dotDirectory.groupList();
- QStringList::ConstIterator gIt = groups.begin();
- QStringList::ConstIterator gEnd = groups.end();
+ TQStringList groups = dotDirectory.groupList();
+ TQStringList::ConstIterator gIt = groups.begin();
+ TQStringList::ConstIterator gEnd = groups.end();
for (; gIt != gEnd; ++gIt )
if ( (*gIt).left( m_iconPositionGroupPrefix.length() ) == m_iconPositionGroupPrefix )
{
@@ -1465,10 +1465,10 @@ void KonqIconViewWidget::slotSaveIconPositions()
// WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
}
-// Adapted version of QIconView::insertInGrid, that works relative to
+// Adapted version of TQIconView::insertInGrid, that works relative to
// m_IconRect, instead of the entire viewport.
-void KonqIconViewWidget::insertInGrid(QIconViewItem *item)
+void KonqIconViewWidget::insertInGrid(TQIconViewItem *item)
{
if (0L == item)
return;
@@ -1479,8 +1479,8 @@ void KonqIconViewWidget::insertInGrid(QIconViewItem *item)
return;
}
- QRegion r(m_IconRect);
- QIconViewItem *i = firstItem();
+ TQRegion r(m_IconRect);
+ TQIconViewItem *i = firstItem();
int y = -1;
for (; i; i = i->nextItem() )
{
@@ -1488,12 +1488,12 @@ void KonqIconViewWidget::insertInGrid(QIconViewItem *item)
y = QMAX(y, i->y() + i->height());
}
- QMemArray<QRect> rects = r.rects();
- QMemArray<QRect>::Iterator it = rects.begin();
+ TQMemArray<TQRect> rects = r.rects();
+ TQMemArray<TQRect>::Iterator it = rects.begin();
bool foundPlace = FALSE;
for (; it != rects.end(); ++it)
{
- QRect rect = *it;
+ TQRect rect = *it;
if (rect.width() >= item->width() && rect.height() >= item->height())
{
int sx = 0, sy = 0;
@@ -1566,7 +1566,7 @@ void KonqIconViewWidget::lineupIcons()
int iconSize = m_size ? m_size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
- typedef QValueList<QIconViewItem*> Bin;
+ typedef TQValueList<TQIconViewItem*> Bin;
Bin*** bins = new Bin**[nx];
int i;
int j;
@@ -1579,7 +1579,7 @@ void KonqIconViewWidget::lineupIcons()
// Insert items into grid
int textHeight = iconTextHeight() * fontMetrics().height();
- for ( QIconViewItem* item = firstItem(); item; item = item->nextItem() ) {
+ for ( TQIconViewItem* item = firstItem(); item; item = item->nextItem() ) {
int x = item->x() + item->width() / 2 - x0;
int y = item->pixmapRect( false ).bottom() - iconSize / 2
- ( dy - ( iconSize + textHeight ) ) / 2 - y0;
@@ -1640,7 +1640,7 @@ void KonqIconViewWidget::lineupIcons()
}
// Move one item in the direction of the least friction
- QIconViewItem* movedItem;
+ TQIconViewItem* movedItem;
Bin* items = bins[i][j];
int mini = QMIN( QMIN( tf, bf ), QMIN( lf, rf ) );
@@ -1703,8 +1703,8 @@ void KonqIconViewWidget::lineupIcons()
}
// Perform the actual moving
- QRegion repaintRegion;
- QValueList<QIconViewItem*> movedItems;
+ TQRegion repaintRegion;
+ TQValueList<TQIconViewItem*> movedItems;
for ( i = 0; i < nx; i++ ) {
for ( j = 0; j < ny; j++ ) {
@@ -1712,13 +1712,13 @@ void KonqIconViewWidget::lineupIcons()
if ( !bin )
continue;
if ( !bin->isEmpty() ) {
- QIconViewItem* item = bin->first();
+ TQIconViewItem* item = bin->first();
int newX = x0 + i*dx + spacing() +
QMAX(0, ( (dx-spacing()) - item->width() ) / 2); // pixmap can be larger as iconsize
// align all icons vertically to their text
int newY = y0 + j*dy + dy - spacing() - ( item->pixmapRect().bottom() + 2 + textHeight );
if ( item->x() != newX || item->y() != newY ) {
- QRect oldRect = item->rect();
+ TQRect oldRect = item->rect();
movedItems.prepend( item );
item->move( newX, newY );
if ( item->rect() != oldRect )
@@ -1735,7 +1735,7 @@ void KonqIconViewWidget::lineupIcons()
updateContents();
else {
// Repaint only repaintRegion...
- QMemArray<QRect> rects = repaintRegion.rects();
+ TQMemArray<TQRect> rects = repaintRegion.rects();
for ( uint l = 0; l < rects.count(); l++ ) {
kdDebug( 1203 ) << "Repainting (" << rects[l].x() << ","
<< rects[l].y() << ")\n";
@@ -1754,30 +1754,30 @@ void KonqIconViewWidget::lineupIcons()
delete [] bins;
}
-void KonqIconViewWidget::lineupIcons( QIconView::Arrangement arrangement )
+void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement )
{
int x0, y0, dx, dy, nxmax, nymax;
gridValues( &x0, &y0, &dx, &dy, &nxmax, &nymax );
int textHeight = iconTextHeight() * fontMetrics().height();
- QRegion repaintRegion;
- QValueList<QIconViewItem*> movedItems;
+ TQRegion repaintRegion;
+ TQValueList<TQIconViewItem*> movedItems;
int nx = 0, ny = 0;
- QIconViewItem* item;
+ TQIconViewItem* item;
for ( item = firstItem(); item; item = item->nextItem() ) {
int newX = x0 + nx*dx + spacing() +
QMAX(0, ( (dx-spacing()) - item->width() ) / 2); // icon can be larger as defined
// align all icons vertically to their text
int newY = y0 + ny*dy + dy - spacing() - ( item->pixmapRect().bottom() + 2 + textHeight );
if ( item->x() != newX || item->y() != newY ) {
- QRect oldRect = item->rect();
+ TQRect oldRect = item->rect();
movedItems.prepend( item );
item->move( newX, newY );
if ( item->rect() != oldRect )
repaintRegion = repaintRegion.unite( oldRect );
}
- if ( arrangement == QIconView::LeftToRight ) {
+ if ( arrangement == TQIconView::LeftToRight ) {
nx++;
if ( nx >= nxmax ) {
ny++;
@@ -1794,7 +1794,7 @@ void KonqIconViewWidget::lineupIcons( QIconView::Arrangement arrangement )
}
// Repaint only repaintRegion...
- QMemArray<QRect> rects = repaintRegion.rects();
+ TQMemArray<TQRect> rects = repaintRegion.rects();
for ( uint l = 0; l < rects.count(); l++ ) {
kdDebug( 1203 ) << "Repainting (" << rects[l].x() << ","
<< rects[l].y() << ")\n";
@@ -1833,13 +1833,13 @@ int KonqIconViewWidget::previewIconSize( int size ) const
return largestPreviewIconSize( iconSize );
}
-void KonqIconViewWidget::visualActivate(QIconViewItem * item)
+void KonqIconViewWidget::visualActivate(TQIconViewItem * item)
{
- // Rect of the QIconViewItem.
- QRect irect = item->rect();
+ // Rect of the TQIconViewItem.
+ TQRect irect = item->rect();
// Rect of the QIconViewItem's pixmap area.
- QRect rect = item->pixmapRect();
+ TQRect rect = item->pixmapRect();
// Adjust to correct position. If this isn't done, the fact that the
// text may be wider than the pixmap puts us off-centre.
@@ -1851,12 +1851,12 @@ void KonqIconViewWidget::visualActivate(QIconViewItem * item)
KIconEffect::visualActivate(viewport(), rect, item->pixmap());
}
-void KonqIconViewWidget::backgroundPixmapChange( const QPixmap & )
+void KonqIconViewWidget::backgroundPixmapChange( const TQPixmap & )
{
viewport()->update();
}
-void KonqIconViewWidget::setPreviewSettings( const QStringList& settings )
+void KonqIconViewWidget::setPreviewSettings( const TQStringList& settings )
{
d->previewSettings = settings;
updatePreviewMimeTypes();
@@ -1866,12 +1866,12 @@ void KonqIconViewWidget::setPreviewSettings( const QStringList& settings )
setIcons( size ); // force re-determining all icons
}
-const QStringList& KonqIconViewWidget::previewSettings()
+const TQStringList& KonqIconViewWidget::previewSettings()
{
return d->previewSettings;
}
-void KonqIconViewWidget::setNewURL( const QString& url )
+void KonqIconViewWidget::setNewURL( const TQString& url )
{
KURL u;
if ( url.startsWith( "/" ) )
@@ -1915,8 +1915,8 @@ void KonqIconViewWidget::updatePreviewMimeTypes()
for ( it = plugins.begin(); it != plugins.end(); ++it ) {
if ( d->previewSettings.contains((*it)->desktopEntryName()) ) {
- QStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
- for (QStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt)
+ TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
+ for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt)
d->pPreviewMimeTypes->append(*mt);
}
}
diff --git a/libkonq/konq_iconviewwidget.h b/libkonq/konq_iconviewwidget.h
index 6f18cc020..04db9029a 100644
--- a/libkonq/konq_iconviewwidget.h
+++ b/libkonq/konq_iconviewwidget.h
@@ -23,7 +23,7 @@
#include <kiconloader.h>
#include <kiconview.h>
#include <kurl.h>
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
#include <kfileitem.h>
#include <kio/jobclasses.h>
#include <libkonq_export.h>
@@ -43,9 +43,9 @@ class LIBKONQ_EXPORT KonqIconViewWidget : public KIconView
{
Q_OBJECT
Q_PROPERTY( bool sortDirectoriesFirst READ sortDirectoriesFirst WRITE setSortDirectoriesFirst )
- Q_PROPERTY( QRect iconArea READ iconArea WRITE setIconArea )
+ Q_PROPERTY( TQRect iconArea READ iconArea WRITE setIconArea )
Q_PROPERTY( int lineupMode READ lineupMode WRITE setLineupMode )
- Q_PROPERTY( QString url READ urlString WRITE setNewURL )
+ Q_PROPERTY( TQString url READ urlString WRITE setNewURL )
friend class KFileIVI;
@@ -56,7 +56,7 @@ public:
/**
* Constructor
*/
- KonqIconViewWidget( QWidget *parent = 0L, const char *name = 0L, WFlags f = 0, bool kdesktop = FALSE );
+ KonqIconViewWidget( TQWidget *parent = 0L, const char *name = 0L, WFlags f = 0, bool kdesktop = FALSE );
virtual ~KonqIconViewWidget();
/**
@@ -74,17 +74,17 @@ public:
* drag icons outside this area; this only applies to automatically placed
* icons.
*/
- void setIconArea( const QRect &rect );
+ void setIconArea( const TQRect &rect );
/**
* Reimplemented to make the slotOnItem highlighting work.
*/
- virtual void focusOutEvent( QFocusEvent * /* ev */ );
+ virtual void focusOutEvent( TQFocusEvent * /* ev */ );
/**
* Returns the icon area.
*/
- QRect iconArea() const;
+ TQRect iconArea() const;
/**
* Set the lineup mode. This determines in which direction(s) icons are
@@ -107,11 +107,11 @@ public:
/**
* Line up the icons to a regular grid horizontally or vertically.
*
- * @param arrangement the arrangement to use (QIconView::LeftToRight
- * for a horizontal arrangement and QIconView::TopToBottom
+ * @param arrangement the arrangement to use (TQIconView::LeftToRight
+ * for a horizontal arrangement and TQIconView::TopToBottom
* for vertical)
*/
- void lineupIcons( QIconView::Arrangement arrangement );
+ void lineupIcons( TQIconView::Arrangement arrangement );
/**
* Sets the icons of all items, and stores the @p size
@@ -123,7 +123,7 @@ public:
* For instance "text/plain,image/wmf".
* Can be set to "*" for "all mimetypes" and to "image/"+"*" for "all images".
*/
- void setIcons( int size, const QStringList& stopImagePreviewFor = QStringList() );
+ void setIcons( int size, const TQStringList& stopImagePreviewFor = TQStringList() );
/**
* Called on databaseChanged
@@ -135,7 +135,7 @@ public:
void calculateGridX();
/**
* The horizontal distance between two icons
- * (whether or not a grid has been given to QIconView)
+ * (whether or not a grid has been given to TQIconView)
*/
int gridXValue() const;
@@ -160,17 +160,17 @@ public:
*
* @todo figure out the parameter meanings again
*/
- void startImagePreview( const QStringList &ignored, bool force );
+ void startImagePreview( const TQStringList &ignored, bool force );
void stopImagePreview();
bool isPreviewRunning() const;
// unused
- void setThumbnailPixmap( KFileIVI * item, const QPixmap & pixmap );
+ void setThumbnailPixmap( KFileIVI * item, const TQPixmap & pixmap );
void disableSoundPreviews();
void setURL ( const KURL & kurl );
// ### KDE4: make const
const KURL & url() { return m_url; }
- QString urlString() const { return m_url.url(); }
+ TQString urlString() const { return m_url.url(); }
void setRootItem ( const KFileItem * item ) { m_rootItem = item; }
/**
@@ -178,8 +178,8 @@ public:
*/
KFileItemList selectedFileItems();
- void setItemColor( const QColor &c );
- QColor itemColor() const;
+ void setItemColor( const TQColor &c );
+ TQColor itemColor() const;
virtual void cutSelection();
virtual void copySelection();
@@ -208,22 +208,22 @@ public:
/**
* Reimplemented from QIconView
*/
- virtual void takeItem( QIconViewItem *item );
+ virtual void takeItem( TQIconViewItem *item );
/**
- * Reimplemented from QIconView to take into account iconArea.
+ * Reimplemented from TQIconView to take into account iconArea.
*/
- virtual void insertInGrid( QIconViewItem *item );
+ virtual void insertInGrid( TQIconViewItem *item );
/**
- * Reimplemented from QIconView to update the gridX
+ * Reimplemented from TQIconView to update the gridX
*/
virtual void setItemTextPos( ItemTextPos pos );
/**
* Give feedback when item is activated.
*/
- virtual void visualActivate(QIconViewItem *);
+ virtual void visualActivate(TQIconViewItem *);
bool isDesktop() const { return m_bDesktop; }
@@ -237,12 +237,12 @@ public:
void disableIcons( const KURL::List & lst );
- QString iconPositionGroupPrefix() const { return m_iconPositionGroupPrefix; }
- QString dotDirectoryPath() const { return m_dotDirectoryPath; }
+ TQString iconPositionGroupPrefix() const { return m_iconPositionGroupPrefix; }
+ TQString dotDirectoryPath() const { return m_dotDirectoryPath; }
- void setPreviewSettings(const QStringList& mimeTypes);
- const QStringList& previewSettings();
- void setNewURL( const QString& url );
+ void setPreviewSettings(const TQStringList& mimeTypes);
+ const TQStringList& previewSettings();
+ void setNewURL( const TQString& url );
public slots:
/**
@@ -255,7 +255,7 @@ public slots:
void renameSelectedItem();
void renameCurrentItem();
- void slotToolTipPreview( const KFileItem *, const QPixmap & ); // ### unused - remove for KDE4
+ void slotToolTipPreview( const KFileItem *, const TQPixmap & ); // ### unused - remove for KDE4
void slotToolTipPreviewResult() ; // ### unused - remove for KDE4
signals:
@@ -284,47 +284,47 @@ signals:
void dragFinished();
protected slots:
- virtual void slotDropped( QDropEvent *e, const QValueList<QIconDragItem> & );
+ virtual void slotDropped( TQDropEvent *e, const TQValueList<TQIconDragItem> & );
- void slotItemRenamed(QIconViewItem *item, const QString &name);
+ void slotItemRenamed(TQIconViewItem *item, const TQString &name);
void slotIconChanged(int);
- void slotOnItem(QIconViewItem *);
+ void slotOnItem(TQIconViewItem *);
void slotOnViewport();
void slotStartSoundPreview();
- void slotPreview(const KFileItem *, const QPixmap &);
+ void slotPreview(const KFileItem *, const TQPixmap &);
void slotPreviewResult();
- void slotMovieUpdate( const QRect& rect );
+ void slotMovieUpdate( const TQRect& rect );
void slotMovieStatus( int status );
void slotReenableAnimation();
- void slotAboutToCreate(const QPoint &pos, const QValueList<KIO::CopyInfo> &files);
+ void slotAboutToCreate(const TQPoint &pos, const TQValueList<KIO::CopyInfo> &files);
void doubleClickTimeout();
protected:
- virtual QDragObject *dragObject();
- KonqIconDrag *konqDragObject( QWidget * dragSource = 0L );
- bool mimeTypeMatch( const QString& mimeType, const QStringList& mimeList ) const;
+ virtual TQDragObject *dragObject();
+ KonqIconDrag *konqDragObject( TQWidget * dragSource = 0L );
+ bool mimeTypeMatch( const TQString& mimeType, const TQStringList& mimeList ) const;
- virtual void drawBackground( QPainter *p, const QRect &r );
+ virtual void drawBackground( TQPainter *p, const TQRect &r );
/**
* r is the rectangle which you want to paint from the background.
* pt is the upper left point in the painter device where you want to paint
* the rectangle r.
*/
- virtual void drawBackground( QPainter *p, const QRect &r,
- const QPoint &pt );
- virtual void contentsDragEnterEvent( QDragEnterEvent *e );
- virtual void contentsDragLeaveEvent( QDragLeaveEvent *e );
- virtual void contentsDragMoveEvent( QDragMoveEvent *e );
- virtual void contentsDropEvent( QDropEvent *e );
- virtual void contentsMousePressEvent( QMouseEvent *e );
- virtual void contentsMouseReleaseEvent ( QMouseEvent * e );
- virtual void contentsMouseMoveEvent( QMouseEvent *e );
- virtual void backgroundPixmapChange( const QPixmap & );
- virtual void wheelEvent( QWheelEvent* );
- virtual void leaveEvent( QEvent *e );
+ virtual void drawBackground( TQPainter *p, const TQRect &r,
+ const TQPoint &pt );
+ virtual void contentsDragEnterEvent( TQDragEnterEvent *e );
+ virtual void contentsDragLeaveEvent( TQDragLeaveEvent *e );
+ virtual void contentsDragMoveEvent( TQDragMoveEvent *e );
+ virtual void contentsDropEvent( TQDropEvent *e );
+ virtual void contentsMousePressEvent( TQMouseEvent *e );
+ virtual void contentsMouseReleaseEvent ( TQMouseEvent * e );
+ virtual void contentsMouseMoveEvent( TQMouseEvent *e );
+ virtual void backgroundPixmapChange( const TQPixmap & );
+ virtual void wheelEvent( TQWheelEvent* );
+ virtual void leaveEvent( TQEvent *e );
void readAnimatedIconsConfig();
void mousePressChangeValue();
@@ -347,17 +347,17 @@ private:
KonqFMSettings * m_pSettings;
bool m_bMousePressed;
- QPoint m_mousePos;
+ TQPoint m_mousePos;
- QColor iColor;
+ TQColor iColor;
bool m_bSortDirsFirst;
- QString m_iconPositionGroupPrefix;
- QString m_dotDirectoryPath;
+ TQString m_iconPositionGroupPrefix;
+ TQString m_dotDirectoryPath;
int m_LineupMode;
- QRect m_IconRect;
+ TQRect m_IconRect;
bool m_bDesktop;
bool m_bSetGridX;
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc
index 5e9e8269b..6c7a2ba81 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cc
@@ -16,7 +16,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qclipboard.h>
+#include <tqclipboard.h>
#include "konq_operations.h"
#include <kautomount.h>
@@ -36,7 +36,7 @@
#include "konqbookmarkmanager.h"
// For doDrop
-#include <qdir.h>//first
+#include <tqdir.h>//first
#include <assert.h>
#include <kapplication.h>
#include <kipc.h>
@@ -56,14 +56,14 @@
#include <kprotocolinfo.h>
#include <kprocess.h>
#include <kstringhandler.h>
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
#include <unistd.h>
#include <X11/Xlib.h>
KBookmarkManager * KonqBookmarkManager::s_bookmarkManager;
-KonqOperations::KonqOperations( QWidget *parent )
- : QObject( parent, "KonqOperations" ),
+KonqOperations::KonqOperations( TQWidget *parent )
+ : TQObject( parent, "KonqOperations" ),
m_method( UNKNOWN ), m_info(0L), m_pasteInfo(0L)
{
}
@@ -74,14 +74,14 @@ KonqOperations::~KonqOperations()
delete m_pasteInfo;
}
-void KonqOperations::editMimeType( const QString & mimeType )
+void KonqOperations::editMimeType( const TQString & mimeType )
{
- QString keditfiletype = QString::fromLatin1("keditfiletype");
+ TQString keditfiletype = TQString::fromLatin1("keditfiletype");
KRun::runCommand( keditfiletype + " " + KProcess::quote(mimeType),
keditfiletype, keditfiletype /*unused*/);
}
-void KonqOperations::del( QWidget * parent, int method, const KURL::List & selectedURLs )
+void KonqOperations::del( TQWidget * parent, int method, const KURL::List & selectedURLs )
{
kdDebug(1203) << "KonqOperations::del " << parent->className() << endl;
if ( selectedURLs.isEmpty() )
@@ -107,7 +107,7 @@ void KonqOperations::restoreTrashedItems( const KURL::List& urls )
op->_restoreTrashedItems( urls );
}
-void KonqOperations::mkdir( QWidget *parent, const KURL & url )
+void KonqOperations::mkdir( TQWidget *parent, const KURL & url )
{
KIO::Job * job = KIO::mkdir( url );
KonqOperations * op = new KonqOperations( parent );
@@ -115,16 +115,16 @@ void KonqOperations::mkdir( QWidget *parent, const KURL & url )
(void) new KonqCommandRecorder( KonqCommand::MKDIR, KURL(), url, job ); // no support yet, apparently
}
-void KonqOperations::doPaste( QWidget * parent, const KURL & destURL )
+void KonqOperations::doPaste( TQWidget * parent, const KURL & destURL )
{
- doPaste(parent, destURL, QPoint());
+ doPaste(parent, destURL, TQPoint());
}
-void KonqOperations::doPaste( QWidget * parent, const KURL & destURL, const QPoint &pos )
+void KonqOperations::doPaste( TQWidget * parent, const KURL & destURL, const TQPoint &pos )
{
// move or not move ?
bool move = false;
- QMimeSource *data = QApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1203) << "move (from clipboard data) = " << move << endl;
@@ -143,7 +143,7 @@ void KonqOperations::doPaste( QWidget * parent, const KURL & destURL, const QPoi
}
}
-void KonqOperations::copy( QWidget * parent, int method, const KURL::List & selectedURLs, const KURL& destUrl )
+void KonqOperations::copy( TQWidget * parent, int method, const KURL::List & selectedURLs, const KURL& destUrl )
{
kdDebug(1203) << "KonqOperations::copy() " << parent->className() << endl;
if ((method!=COPY) && (method!=MOVE) && (method!=LINK))
@@ -201,8 +201,8 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm
case EMPTYTRASH:
{
// Same as in ktrash --empty
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)1;
job = KIO::special( "trash:/", packedArgs );
KNotifyClient::event(0, "Trash: emptied");
@@ -219,8 +219,8 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm
delete this;
return;
}
- connect( job, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotResult( KIO::Job * ) ) );
} else
delete this;
}
@@ -229,15 +229,15 @@ void KonqOperations::_restoreTrashedItems( const KURL::List& urls )
{
m_method = RESTORE;
KonqMultiRestoreJob* job = new KonqMultiRestoreJob( urls, true );
- connect( job, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotResult( KIO::Job * ) ) );
}
-bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int method, ConfirmationType confirmation, QWidget* widget )
+bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int method, ConfirmationType confirmation, TQWidget* widget )
{
if ( confirmation == SKIP_CONFIRMATION )
return true;
- QString keyName;
+ TQString keyName;
bool ask = ( confirmation == FORCE_CONFIRMATION );
if ( !ask )
{
@@ -250,13 +250,13 @@ bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int
if ( ask )
{
KURL::List::ConstIterator it = selectedURLs.begin();
- QStringList prettyList;
+ TQStringList prettyList;
for ( ; it != selectedURLs.end(); ++it ) {
if ( (*it).protocol() == "trash" ) {
- QString path = (*it).path();
+ TQString path = (*it).path();
// HACK (#98983): remove "0-foo". Note that it works better than
// displaying KFileItem::name(), for files under a subdir.
- prettyList.append( path.remove(QRegExp("^/[0-9]*-")) );
+ prettyList.append( path.remove(TQRegExp("^/[0-9]*-")) );
} else
prettyList.append( (*it).pathOrURL() );
}
@@ -310,11 +310,11 @@ bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int
return true;
}
-void KonqOperations::doDrop( const KFileItem * destItem, const KURL & dest, QDropEvent * ev, QWidget * parent )
+void KonqOperations::doDrop( const KFileItem * destItem, const KURL & dest, TQDropEvent * ev, TQWidget * parent )
{
kdDebug(1203) << "doDrop: dest : " << dest.url() << endl;
KURL::List lst;
- QMap<QString, QString> metaData;
+ TQMap<TQString, TQString> metaData;
if ( KURLDrag::decode( ev, lst, metaData ) ) // Are they urls ?
{
if( lst.count() == 0 )
@@ -324,7 +324,7 @@ void KonqOperations::doDrop( const KFileItem * destItem, const KURL & dest, QDro
return;
}
kdDebug(1203) << "KonqOperations::doDrop metaData: " << metaData.count() << " entries." << endl;
- QMap<QString,QString>::ConstIterator mit;
+ TQMap<TQString,TQString>::ConstIterator mit;
for( mit = metaData.begin(); mit != metaData.end(); ++mit )
{
kdDebug(1203) << "metaData: key=" << mit.key() << " value=" << mit.data() << endl;
@@ -354,12 +354,12 @@ void KonqOperations::doDrop( const KFileItem * destItem, const KURL & dest, QDro
XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child,
&root_x, &root_y, &win_x, &win_y, &keybstate );
- QDropEvent::Action action = ev->action();
+ TQDropEvent::Action action = ev->action();
// Check for the drop of a bookmark -> we want a Link action
if ( ev->provides("application/x-xbel") )
{
keybstate |= ControlMask | ShiftMask;
- action = QDropEvent::Link;
+ action = TQDropEvent::Link;
kdDebug(1203) << "KonqOperations::doDrop Bookmark -> emulating Link" << endl;
}
@@ -374,7 +374,7 @@ void KonqOperations::doDrop( const KFileItem * destItem, const KURL & dest, QDro
else
{
// we need to stat to get it.
- op->_statURL( dest, op, SLOT( asyncDrop( const KFileItem * ) ) );
+ op->_statURL( dest, op, TQT_SLOT( asyncDrop( const KFileItem * ) ) );
}
// In both cases asyncDrop will delete op when done
@@ -423,8 +423,8 @@ void KonqOperations::asyncDrop( const KFileItem * destItem )
KDesktopFile desktopFile( m_destURL.path() );
if ( desktopFile.hasApplicationType() )
{
- QString error;
- QStringList stringList;
+ TQString error;
+ TQStringList stringList;
KURL::List lst = m_info->lst;
KURL::List::Iterator it = lst.begin();
for ( ; it != lst.end() ; it++ )
@@ -438,19 +438,19 @@ void KonqOperations::asyncDrop( const KFileItem * destItem )
{
// Device or Link -> adjust dest
if ( desktopFile.hasDeviceType() && desktopFile.hasKey("MountPoint") ) {
- QString point = desktopFile.readEntry( "MountPoint" );
+ TQString point = desktopFile.readEntry( "MountPoint" );
m_destURL.setPath( point );
- QString dev = desktopFile.readDevice();
- QString mp = KIO::findDeviceMountPoint( dev );
+ TQString dev = desktopFile.readDevice();
+ TQString mp = KIO::findDeviceMountPoint( dev );
// Is the device already mounted ?
if ( !mp.isNull() )
doFileCopy();
else
{
bool ro = desktopFile.readBoolEntry( "ReadOnly", false );
- QString fstype = desktopFile.readEntry( "FSType" );
+ TQString fstype = desktopFile.readEntry( "FSType" );
KAutoMount* am = new KAutoMount( ro, fstype, dev, point, m_destURL.path(), false );
- connect( am, SIGNAL( finished() ), this, SLOT( doFileCopy() ) );
+ connect( am, TQT_SIGNAL( finished() ), this, TQT_SLOT( doFileCopy() ) );
}
return;
}
@@ -467,7 +467,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem )
// Should be a local executable
// (If this fails, there is a bug in KFileItem::acceptsDrops)
kdDebug(1203) << "KonqOperations::doDrop " << m_destURL.path() << "should be an executable" << endl;
- Q_ASSERT ( access( QFile::encodeName(m_destURL.path()), X_OK ) == 0 );
+ Q_ASSERT ( access( TQFile::encodeName(m_destURL.path()), X_OK ) == 0 );
KProcess proc;
proc << m_destURL.path() ;
// Launch executable for each of the files
@@ -485,7 +485,7 @@ void KonqOperations::doFileCopy()
{
assert(m_info); // setDropInfo - and asyncDrop - should have been called before asyncDrop
KURL::List lst = m_info->lst;
- QDropEvent::Action action = m_info->action;
+ TQDropEvent::Action action = m_info->action;
bool isDesktopFile = false;
bool itemIsOnDesktop = false;
bool allItemsAreFromTrash = true;
@@ -493,7 +493,7 @@ void KonqOperations::doFileCopy()
for (KURL::List::ConstIterator it = lst.begin(); it != lst.end(); ++it)
{
bool local = (*it).isLocalFile();
- if ( KProtocolInfo::supportsDeleting( *it ) && (!local || QFileInfo((*it).directory()).isWritable() ))
+ if ( KProtocolInfo::supportsDeleting( *it ) && (!local || TQFileInfo((*it).directory()).isWritable() ))
mlst.append(*it);
if ( local && KDesktopFile::isDesktopFile((*it).path()))
isDesktopFile = true;
@@ -520,7 +520,7 @@ void KonqOperations::doFileCopy()
m_method = TRASH;
if ( askDeleteConfirmation( mlst, TRASH, DEFAULT_CONFIRMATION, parentWidget() ) )
- action = QDropEvent::Move;
+ action = TQDropEvent::Move;
else
{
delete this;
@@ -529,7 +529,7 @@ void KonqOperations::doFileCopy()
}
else if ( allItemsAreFromTrash || m_destURL.protocol() == "trash" ) {
// No point in asking copy/move/link when using dnd from or to the trash.
- action = QDropEvent::Move;
+ action = TQDropEvent::Move;
}
else if ( (((m_info->keybstate & ControlMask) == 0) && ((m_info->keybstate & ShiftMask) == 0)) ||
linkOnly )
@@ -562,7 +562,7 @@ void KonqOperations::doFileCopy()
return;
}
- QPopupMenu popup;
+ TQPopupMenu popup;
if (!mlst.isEmpty() && (sMoving || (sReading && sDeleting)) && !linkOnly )
popup.insertItem(SmallIconSet("goto"), i18n( "&Move Here" ) + "\t" + KKey::modFlagLabel( KKey::SHIFT ), 2 );
if ( sReading && !linkOnly)
@@ -576,9 +576,9 @@ void KonqOperations::doFileCopy()
int result = popup.exec( m_info->mousePos );
switch (result) {
- case 1 : action = QDropEvent::Copy; break;
- case 2 : action = QDropEvent::Move; break;
- case 3 : action = QDropEvent::Link; break;
+ case 1 : action = TQDropEvent::Copy; break;
+ case 2 : action = TQDropEvent::Move; break;
+ case 3 : action = TQDropEvent::Link; break;
case 4 :
{
kdDebug(1203) << "setWallpaper iconView=" << iconView << " url=" << lst.first().url() << endl;
@@ -593,7 +593,7 @@ void KonqOperations::doFileCopy()
KIO::Job * job = 0;
switch ( action ) {
- case QDropEvent::Move :
+ case TQDropEvent::Move :
job = KIO::move( lst, m_destURL );
job->setMetaData( m_info->metaData );
setOperation( job, m_method == TRASH ? TRASH : MOVE, lst, m_destURL );
@@ -601,13 +601,13 @@ void KonqOperations::doFileCopy()
m_method == TRASH ? KonqCommand::TRASH : KonqCommand::MOVE,
lst, m_destURL, job );
return; // we still have stuff to do -> don't delete ourselves
- case QDropEvent::Copy :
+ case TQDropEvent::Copy :
job = KIO::copy( lst, m_destURL );
job->setMetaData( m_info->metaData );
setOperation( job, COPY, lst, m_destURL );
(void) new KonqCommandRecorder( KonqCommand::COPY, lst, m_destURL, job );
return;
- case QDropEvent::Link :
+ case TQDropEvent::Link :
kdDebug(1203) << "KonqOperations::asyncDrop lst.count=" << lst.count() << endl;
job = KIO::link( lst, m_destURL );
job->setMetaData( m_info->metaData );
@@ -619,7 +619,7 @@ void KonqOperations::doFileCopy()
delete this;
}
-void KonqOperations::rename( QWidget * parent, const KURL & oldurl, const KURL& newurl )
+void KonqOperations::rename( TQWidget * parent, const KURL & oldurl, const KURL& newurl )
{
kdDebug(1203) << "KonqOperations::rename oldurl=" << oldurl << " newurl=" << newurl << endl;
if ( oldurl == newurl )
@@ -650,46 +650,46 @@ void KonqOperations::setOperation( KIO::Job * job, int method, const KURL::List
m_destURL = dest;
if ( job )
{
- connect( job, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotResult( KIO::Job * ) ) );
KIO::CopyJob *copyJob = dynamic_cast<KIO::CopyJob*>(job);
KonqIconViewWidget *iconView = dynamic_cast<KonqIconViewWidget*>(parent());
if (copyJob && iconView)
{
- connect(copyJob, SIGNAL(aboutToCreate(KIO::Job *,const QValueList<KIO::CopyInfo> &)),
- this, SLOT(slotAboutToCreate(KIO::Job *,const QValueList<KIO::CopyInfo> &)));
- connect(this, SIGNAL(aboutToCreate(const QPoint &, const QValueList<KIO::CopyInfo> &)),
- iconView, SLOT(slotAboutToCreate(const QPoint &, const QValueList<KIO::CopyInfo> &)));
+ connect(copyJob, TQT_SIGNAL(aboutToCreate(KIO::Job *,const TQValueList<KIO::CopyInfo> &)),
+ this, TQT_SLOT(slotAboutToCreate(KIO::Job *,const TQValueList<KIO::CopyInfo> &)));
+ connect(this, TQT_SIGNAL(aboutToCreate(const TQPoint &, const TQValueList<KIO::CopyInfo> &)),
+ iconView, TQT_SLOT(slotAboutToCreate(const TQPoint &, const TQValueList<KIO::CopyInfo> &)));
}
}
else // for link
slotResult( 0L );
}
-void KonqOperations::slotAboutToCreate(KIO::Job *, const QValueList<KIO::CopyInfo> &files)
+void KonqOperations::slotAboutToCreate(KIO::Job *, const TQValueList<KIO::CopyInfo> &files)
{
- emit aboutToCreate( m_info ? m_info->mousePos : m_pasteInfo ? m_pasteInfo->mousePos : QPoint(), files);
+ emit aboutToCreate( m_info ? m_info->mousePos : m_pasteInfo ? m_pasteInfo->mousePos : TQPoint(), files);
}
-void KonqOperations::statURL( const KURL & url, const QObject *receiver, const char *member )
+void KonqOperations::statURL( const KURL & url, const TQObject *receiver, const char *member )
{
KonqOperations * op = new KonqOperations( 0L );
op->_statURL( url, receiver, member );
op->m_method = STAT;
}
-void KonqOperations::_statURL( const KURL & url, const QObject *receiver, const char *member )
+void KonqOperations::_statURL( const KURL & url, const TQObject *receiver, const char *member )
{
- connect( this, SIGNAL( statFinished( const KFileItem * ) ), receiver, member );
+ connect( this, TQT_SIGNAL( statFinished( const KFileItem * ) ), receiver, member );
KIO::StatJob * job = KIO::stat( url /*, false?*/ );
- connect( job, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotStatResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotStatResult( KIO::Job * ) ) );
}
void KonqOperations::slotStatResult( KIO::Job * job )
{
if ( job->error())
- job->showErrorDialog( (QWidget*)parent() );
+ job->showErrorDialog( (TQWidget*)parent() );
else
{
KIO::StatJob * statJob = static_cast<KIO::StatJob*>(job);
@@ -705,7 +705,7 @@ void KonqOperations::slotStatResult( KIO::Job * job )
void KonqOperations::slotResult( KIO::Job * job )
{
if (job && job->error())
- job->showErrorDialog( (QWidget*)parent() );
+ job->showErrorDialog( (TQWidget*)parent() );
if ( m_method == EMPTYTRASH ) {
// Update konq windows opened on trash:/
KDirNotify_stub allDirNotify("*", "KDirNotify*");
@@ -714,7 +714,7 @@ void KonqOperations::slotResult( KIO::Job * job )
delete this;
}
-void KonqOperations::rename( QWidget * parent, const KURL & oldurl, const QString & name )
+void KonqOperations::rename( TQWidget * parent, const KURL & oldurl, const TQString & name )
{
KURL newurl( oldurl );
newurl.setPath( oldurl.directory(false, true) + name );
@@ -722,11 +722,11 @@ void KonqOperations::rename( QWidget * parent, const KURL & oldurl, const QStrin
rename( parent, oldurl, newurl );
}
-void KonqOperations::newDir( QWidget * parent, const KURL & baseURL )
+void KonqOperations::newDir( TQWidget * parent, const KURL & baseURL )
{
bool ok;
- QString name = i18n( "New Folder" );
- if ( baseURL.isLocalFile() && QFileInfo( baseURL.path(+1) + name ).exists() )
+ TQString name = i18n( "New Folder" );
+ if ( baseURL.isLocalFile() && TQFileInfo( baseURL.path(+1) + name ).exists() )
name = KIO::RenameDlg::suggestName( baseURL, i18n( "New Folder" ) );
name = KInputDialog::getText ( i18n( "New Folder" ),
@@ -755,7 +755,7 @@ KonqMultiRestoreJob::KonqMultiRestoreJob( const KURL::List& urls, bool showProgr
m_urls( urls ), m_urlsIterator( m_urls.begin() ),
m_progress( 0 )
{
- QTimer::singleShot(0, this, SLOT(slotStart()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
}
void KonqMultiRestoreJob::slotStart()
@@ -772,15 +772,15 @@ void KonqMultiRestoreJob::slotStart()
if ( new_url.protocol()=="system"
&& new_url.path().startsWith("/trash") )
{
- QString path = new_url.path();
+ TQString path = new_url.path();
path.remove(0, 6);
new_url.setProtocol("trash");
new_url.setPath(path);
}
Q_ASSERT( new_url.protocol() == "trash" );
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)3 << new_url;
KIO::Job* job = KIO::special( new_url, packedArgs );
addSubjob( job );
@@ -809,9 +809,9 @@ void KonqMultiRestoreJob::slotResult( KIO::Job *job )
slotStart();
}
-QWidget* KonqOperations::parentWidget() const
+TQWidget* KonqOperations::parentWidget() const
{
- return static_cast<QWidget *>( parent() );
+ return static_cast<TQWidget *>( parent() );
}
#include "konq_operations.moc"
diff --git a/libkonq/konq_operations.h b/libkonq/konq_operations.h
index 82d021c55..42a00e814 100644
--- a/libkonq/konq_operations.h
+++ b/libkonq/konq_operations.h
@@ -22,8 +22,8 @@
#include <kurl.h>
#include <libkonq_export.h>
-#include <qobject.h>
-#include <qevent.h>
+#include <tqobject.h>
+#include <tqevent.h>
namespace KIO { class Job; class CopyInfo; }
class QWidget;
@@ -38,14 +38,14 @@ class LIBKONQ_EXPORT KonqOperations : public QObject
{
Q_OBJECT
protected:
- KonqOperations( QWidget * parent );
+ KonqOperations( TQWidget * parent );
virtual ~KonqOperations();
public:
/**
* Pop up properties dialog for mimetype @p mimeType.
*/
- static void editMimeType( const QString & mimeType );
+ static void editMimeType( const TQString & mimeType );
enum { TRASH, DEL, SHRED, COPY, MOVE, LINK, EMPTYTRASH, STAT, MKDIR, RESTORE, UNKNOWN };
/**
@@ -55,7 +55,7 @@ public:
* @param method should be TRASH, DEL or SHRED
* @param selectedURLs the URLs to be deleted
*/
- static void del( QWidget * parent, int method, const KURL::List & selectedURLs );
+ static void del( TQWidget * parent, int method, const KURL::List & selectedURLs );
/**
* Copy the @p selectedURLs to the destination @p destURL.
@@ -67,7 +67,7 @@ public:
*
* @todo document restrictions on the kind of destination
*/
- static void copy( QWidget * parent, int method, const KURL::List & selectedURLs, const KURL& destURL );
+ static void copy( TQWidget * parent, int method, const KURL::List & selectedURLs, const KURL& destURL );
/**
* Drop
* @param destItem destination KFileItem for the drop (background or item)
@@ -77,13 +77,13 @@ public:
*
* If destItem is 0L, doDrop will stat the URL to determine it.
*/
- static void doDrop( const KFileItem * destItem, const KURL & destURL, QDropEvent * ev, QWidget * parent );
+ static void doDrop( const KFileItem * destItem, const KURL & destURL, TQDropEvent * ev, TQWidget * parent );
/**
* Paste the clipboard contents
*/
- static void doPaste( QWidget * parent, const KURL & destURL, const QPoint &pos );
- static void doPaste( QWidget * parent, const KURL & destURL );
+ static void doPaste( TQWidget * parent, const KURL & destURL, const TQPoint &pos );
+ static void doPaste( TQWidget * parent, const KURL & destURL );
static void emptyTrash();
static void restoreTrashedItems( const KURL::List& urls );
@@ -91,7 +91,7 @@ public:
/**
* Create a directory
*/
- static void mkdir( QWidget *parent, const KURL & url );
+ static void mkdir( TQWidget *parent, const KURL & url );
/**
* Get info about a given URL, and when that's done (it's asynchronous!),
@@ -99,7 +99,7 @@ public:
* The KFileItem will be deleted by statURL after calling the slot. Make a copy
* if you need one !
*/
- static void statURL( const KURL & url, const QObject *receiver, const char *member );
+ static void statURL( const KURL & url, const TQObject *receiver, const char *member );
/**
* Do a renaming.
@@ -107,7 +107,7 @@ public:
* @param oldurl the current url of the file to be renamed
* @param name the new name for the file. Shouldn't include '/'.
*/
- static void rename( QWidget * parent, const KURL & oldurl, const QString & name );
+ static void rename( TQWidget * parent, const KURL & oldurl, const TQString & name );
/**
* Do a renaming.
@@ -117,14 +117,14 @@ public:
* Use this version if the other one wouldn't work :) (e.g. because name could
* be a relative path, including a '/').
*/
- static void rename( QWidget * parent, const KURL & oldurl, const KURL & newurl );
+ static void rename( TQWidget * parent, const KURL & oldurl, const KURL & newurl );
/**
* Ask for the name of a new directory and create it.
* @param parent the parent widget
* @param baseURL the directory to create the new directory in
*/
- static void newDir( QWidget * parent, const KURL & baseURL );
+ static void newDir( TQWidget * parent, const KURL & baseURL );
enum ConfirmationType { DEFAULT_CONFIRMATION, SKIP_CONFIRMATION, FORCE_CONFIRMATION };
/**
@@ -135,49 +135,49 @@ public:
* @param widget parent widget for message boxes
* @return true if confirmed
*/
- static bool askDeleteConfirmation( const KURL::List & selectedURLs, int method, ConfirmationType confirmation, QWidget* widget );
+ static bool askDeleteConfirmation( const KURL::List & selectedURLs, int method, ConfirmationType confirmation, TQWidget* widget );
signals:
void statFinished( const KFileItem * item );
- void aboutToCreate(const QPoint &pos, const QValueList<KIO::CopyInfo> &files);
+ void aboutToCreate(const TQPoint &pos, const TQValueList<KIO::CopyInfo> &files);
protected:
void _del( int method, const KURL::List & selectedURLs, ConfirmationType confirmation );
void _restoreTrashedItems( const KURL::List& urls );
- void _statURL( const KURL & url, const QObject *receiver, const char *member );
+ void _statURL( const KURL & url, const TQObject *receiver, const char *member );
// internal, for COPY/MOVE/LINK/MKDIR
void setOperation( KIO::Job * job, int method, const KURL::List & src, const KURL & dest );
struct DropInfo
{
- DropInfo( uint k, KURL::List & l, const QMap<QString,QString> &m,
- int x, int y, QDropEvent::Action a ) :
+ DropInfo( uint k, KURL::List & l, const TQMap<TQString,TQString> &m,
+ int x, int y, TQDropEvent::Action a ) :
keybstate(k), lst(l), metaData(m), mousePos(x,y), action(a) {}
uint keybstate;
KURL::List lst;
- QMap<QString,QString> metaData;
- QPoint mousePos;
- QDropEvent::Action action;
+ TQMap<TQString,TQString> metaData;
+ TQPoint mousePos;
+ TQDropEvent::Action action;
};
// internal, for doDrop
void setDropInfo( DropInfo * info ) { m_info = info; }
- struct KIOPasteInfo // KDE4: remove and use DropInfo instead or a QPoint member
+ struct KIOPasteInfo // KDE4: remove and use DropInfo instead or a TQPoint member
{
- QByteArray data; // unused
+ TQByteArray data; // unused
KURL destURL; // unused
- QPoint mousePos;
- QString dialogText; // unused
+ TQPoint mousePos;
+ TQString dialogText; // unused
};
void setPasteInfo( KIOPasteInfo * info ) { m_pasteInfo = info; }
private:
- QWidget* parentWidget() const;
+ TQWidget* parentWidget() const;
protected slots:
- void slotAboutToCreate(KIO::Job *job, const QValueList<KIO::CopyInfo> &files);
+ void slotAboutToCreate(KIO::Job *job, const TQValueList<KIO::CopyInfo> &files);
void slotResult( KIO::Job * job );
void slotStatResult( KIO::Job * job );
void asyncDrop( const KFileItem * item );
diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc
index a666aa6cf..3cff83453 100644
--- a/libkonq/konq_pixmapprovider.cc
+++ b/libkonq/konq_pixmapprovider.cc
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <qbitmap.h>
+#include <tqbitmap.h>
#include <kapplication.h>
#include <kiconloader.h>
@@ -37,7 +37,7 @@ KonqPixmapProvider * KonqPixmapProvider::self()
return s_self;
}
-KonqPixmapProvider::KonqPixmapProvider( QObject *parent, const char *name )
+KonqPixmapProvider::KonqPixmapProvider( TQObject *parent, const char *name )
: KPixmapProvider(),
KonqFavIconMgr( parent, name )
{
@@ -52,10 +52,10 @@ KonqPixmapProvider::~KonqPixmapProvider()
// if not available, tries to find the pixmap for the mimetype of url
// if that fails, gets the icon for the protocol
// finally, inserts the url/icon pair into the cache
-QString KonqPixmapProvider::iconNameFor( const QString& url )
+TQString KonqPixmapProvider::iconNameFor( const TQString& url )
{
- QMapIterator<QString,QString> it = iconMap.find( url );
- QString icon;
+ TQMapIterator<TQString,TQString> it = iconMap.find( url );
+ TQString icon;
if ( it != iconMap.end() ) {
icon = it.data();
if ( !icon.isEmpty() )
@@ -88,18 +88,18 @@ QString KonqPixmapProvider::iconNameFor( const QString& url )
return icon;
}
-QPixmap KonqPixmapProvider::pixmapFor( const QString& url, int size )
+TQPixmap KonqPixmapProvider::pixmapFor( const TQString& url, int size )
{
return loadIcon( url, iconNameFor( url ), size );
}
-void KonqPixmapProvider::load( KConfig *kc, const QString& key )
+void KonqPixmapProvider::load( KConfig *kc, const TQString& key )
{
iconMap.clear();
- QStringList list;
+ TQStringList list;
list = kc->readPathListEntry( key );
- QStringList::Iterator it = list.begin();
- QString url, icon;
+ TQStringList::Iterator it = list.begin();
+ TQString url, icon;
while ( it != list.end() ) {
url = (*it);
if ( ++it == list.end() )
@@ -113,12 +113,12 @@ void KonqPixmapProvider::load( KConfig *kc, const QString& key )
// only saves the cache for the given list of items to prevent the cache
// from growing forever.
-void KonqPixmapProvider::save( KConfig *kc, const QString& key,
- const QStringList& items )
+void KonqPixmapProvider::save( KConfig *kc, const TQString& key,
+ const TQStringList& items )
{
- QStringList list;
- QStringList::ConstIterator it = items.begin();
- QMapConstIterator<QString,QString> mit;
+ TQStringList list;
+ TQStringList::ConstIterator it = items.begin();
+ TQMapConstIterator<TQString,TQString> mit;
while ( it != items.end() ) {
mit = iconMap.find( *it );
if ( mit != iconMap.end() ) {
@@ -131,10 +131,10 @@ void KonqPixmapProvider::save( KConfig *kc, const QString& key,
kc->writePathEntry( key, list );
}
-void KonqPixmapProvider::notifyChange( bool isHost, QString hostOrURL,
- QString iconName )
+void KonqPixmapProvider::notifyChange( bool isHost, TQString hostOrURL,
+ TQString iconName )
{
- for ( QMapIterator<QString,QString> it = iconMap.begin();
+ for ( TQMapIterator<TQString,TQString> it = iconMap.begin();
it != iconMap.end();
++it )
{
@@ -145,7 +145,7 @@ void KonqPixmapProvider::notifyChange( bool isHost, QString hostOrURL,
{
// For host default-icons still query the favicon manager to get
// the correct icon for pages that have an own one.
- QString icon = isHost ? KMimeType::favIconForURL( url ) : iconName;
+ TQString icon = isHost ? KMimeType::favIconForURL( url ) : iconName;
if ( !icon.isEmpty() )
*it = icon;
}
@@ -159,7 +159,7 @@ void KonqPixmapProvider::clear()
iconMap.clear();
}
-QPixmap KonqPixmapProvider::loadIcon( const QString& url, const QString& icon,
+TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon,
int size )
{
if ( size <= KIcon::SizeSmall )
@@ -171,11 +171,11 @@ QPixmap KonqPixmapProvider::loadIcon( const QString& url, const QString& icon,
else
u = url;
- QPixmap big;
+ TQPixmap big;
// favicon? => blend the favicon in the large
if ( url.startsWith( "http:/" ) && icon.startsWith("favicons/") ) {
- QPixmap small = SmallIcon( icon, size );
+ TQPixmap small = SmallIcon( icon, size );
big = KGlobal::iconLoader()->loadIcon( KProtocolInfo::icon("http"),
KIcon::Panel, size );
@@ -183,9 +183,9 @@ QPixmap KonqPixmapProvider::loadIcon( const QString& url, const QString& icon,
int y = 0;
if ( big.mask() ) {
- QBitmap mask = *big.mask();
+ TQBitmap mask = *big.mask();
bitBlt( &mask, x, y,
- small.mask() ? const_cast<QBitmap *>(small.mask()) : &small, 0, 0,
+ small.mask() ? const_cast<TQBitmap *>(small.mask()) : &small, 0, 0,
small.width(), small.height(),
small.mask() ? OrROP : SetROP );
big.setMask( mask );
diff --git a/libkonq/konq_pixmapprovider.h b/libkonq/konq_pixmapprovider.h
index b313652f3..cb20879a6 100644
--- a/libkonq/konq_pixmapprovider.h
+++ b/libkonq/konq_pixmapprovider.h
@@ -20,7 +20,7 @@
#ifndef KONQ_PIXMAPPROVIDER_H
#define KONQ_PIXMAPPROVIDER_H
-#include <qmap.h>
+#include <tqmap.h>
#include <kpixmapprovider.h>
#include "konq_faviconmgr.h"
@@ -39,17 +39,17 @@ public:
/**
* Looks up a pixmap for @p url. Uses a cache for the iconname of url.
*/
- virtual QPixmap pixmapFor( const QString& url, int size = 0 );
+ virtual TQPixmap pixmapFor( const TQString& url, int size = 0 );
/**
* Loads the cache to @p kc from the current KConfig-group from key @p key.
*/
- void load( KConfig * kc, const QString& key );
+ void load( KConfig * kc, const TQString& key );
/**
* Saves the cache to @p kc into the current KConfig-group as key @p key.
* Only those @p items are saved, otherwise the cache would grow forever.
*/
- void save( KConfig *, const QString& key, const QStringList& items );
+ void save( KConfig *, const TQString& key, const TQStringList& items );
/**
* Clears the pixmap cache
@@ -60,20 +60,20 @@ public:
* Looks up an iconname for @p url. Uses a cache for the iconname of url.
* @since 3.4.1
*/
- QString iconNameFor( const QString& url );
+ TQString iconNameFor( const TQString& url );
protected:
- KonqPixmapProvider( QObject *parent=0, const char *name=0 );
+ KonqPixmapProvider( TQObject *parent=0, const char *name=0 );
/**
* Overridden from KonqFavIconMgr to update the cache
*/
- virtual void notifyChange( bool isHost, QString hostOrURL, QString iconName );
+ virtual void notifyChange( bool isHost, TQString hostOrURL, TQString iconName );
- QPixmap loadIcon( const QString& url, const QString& icon, int size );
+ TQPixmap loadIcon( const TQString& url, const TQString& icon, int size );
private:
- QMap<QString,QString> iconMap;
+ TQMap<TQString,TQString> iconMap;
static KonqPixmapProvider * s_self;
};
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index 9238122c0..4adfbc01d 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <qdir.h>
+#include <tqdir.h>
#include <klocale.h>
#include <kapplication.h>
@@ -70,7 +70,7 @@
class KonqPopupMenuGUIBuilder : public KXMLGUIBuilder
{
public:
- KonqPopupMenuGUIBuilder( QPopupMenu *menu )
+ KonqPopupMenuGUIBuilder( TQPopupMenu *menu )
: KXMLGUIBuilder( 0 )
{
m_menu = menu;
@@ -79,8 +79,8 @@ public:
{
}
- virtual QWidget *createContainer( QWidget *parent, int index,
- const QDomElement &element,
+ virtual TQWidget *createContainer( TQWidget *parent, int index,
+ const TQDomElement &element,
int &id )
{
if ( !parent && element.attribute( "name" ) == "popupmenu" )
@@ -89,7 +89,7 @@ public:
return KXMLGUIBuilder::createContainer( parent, index, element, id );
}
- QPopupMenu *m_menu;
+ TQPopupMenu *m_menu;
};
class KonqPopupMenu::KonqPopupMenuPrivate
@@ -99,8 +99,8 @@ public:
m_itemFlags( KParts::BrowserExtension::DefaultPopupItems )
{
}
- QString m_urlTitle;
- QWidget *m_parentWidget;
+ TQString m_urlTitle;
+ TQWidget *m_parentWidget;
KParts::BrowserExtension::PopupFlags m_itemFlags;
};
@@ -143,14 +143,14 @@ bool KonqPopupMenu::ProtocolInfo::trashIncluded() const
class PopupServices
{
public:
- ServiceList* selectList( const QString& priority, const QString& submenuName );
+ ServiceList* selectList( const TQString& priority, const TQString& submenuName );
ServiceList builtin;
ServiceList user, userToplevel, userPriority;
- QMap<QString, ServiceList> userSubmenus, userToplevelSubmenus, userPrioritySubmenus;
+ TQMap<TQString, ServiceList> userSubmenus, userToplevelSubmenus, userPrioritySubmenus;
};
-ServiceList* PopupServices::selectList( const QString& priority, const QString& submenuName )
+ServiceList* PopupServices::selectList( const TQString& priority, const TQString& submenuName )
{
// we use the categories .desktop entry to define submenus
// if none is defined, we just pop it in the main menu
@@ -187,8 +187,8 @@ KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items,
KActionCollection & actions,
KNewMenu * newMenu,
bool showProperties )
- : QPopupMenu( 0L, "konq_popupmenu" ),
- m_actions( actions ), m_ownActions( static_cast<QWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ),
+ : TQPopupMenu( 0L, "konq_popupmenu" ),
+ m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ),
m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
{
KonqPopupFlags kpf = ( showProperties ? ShowProperties : IsLink ) | ShowNewWindow;
@@ -199,9 +199,9 @@ KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items,
KURL viewURL,
KActionCollection & actions,
KNewMenu * newMenu,
- QWidget * parentWidget,
+ TQWidget * parentWidget,
bool showProperties )
- : QPopupMenu( parentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<QWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
+ : TQPopupMenu( parentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
{
KonqPopupFlags kpf = ( showProperties ? ShowProperties : IsLink ) | ShowNewWindow;
init(parentWidget, kpf, KParts::BrowserExtension::DefaultPopupItems);
@@ -211,15 +211,15 @@ KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items,
const KURL& viewURL,
KActionCollection & actions,
KNewMenu * newMenu,
- QWidget * parentWidget,
+ TQWidget * parentWidget,
KonqPopupFlags kpf,
KParts::BrowserExtension::PopupFlags flags)
- : QPopupMenu( parentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<QWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
+ : TQPopupMenu( parentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
{
init(parentWidget, kpf, flags);
}
-void KonqPopupMenu::init (QWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags flags)
+void KonqPopupMenu::init (TQWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags flags)
{
d = new KonqPopupMenuPrivate;
d->m_parentWidget = parentWidget;
@@ -227,12 +227,12 @@ void KonqPopupMenu::init (QWidget * parentWidget, KonqPopupFlags kpf, KParts::Br
setup(kpf);
}
-int KonqPopupMenu::insertServicesSubmenus(const QMap<QString, ServiceList>& submenus,
- QDomElement& menu,
+int KonqPopupMenu::insertServicesSubmenus(const TQMap<TQString, ServiceList>& submenus,
+ TQDomElement& menu,
bool isBuiltin)
{
int count = 0;
- QMap<QString, ServiceList>::ConstIterator it;
+ TQMap<TQString, ServiceList>::ConstIterator it;
for (it = submenus.begin(); it != submenus.end(); ++it)
{
@@ -242,10 +242,10 @@ int KonqPopupMenu::insertServicesSubmenus(const QMap<QString, ServiceList>& subm
continue;
}
- QDomElement actionSubmenu = m_doc.createElement( "menu" );
+ TQDomElement actionSubmenu = m_doc.createElement( "menu" );
actionSubmenu.setAttribute( "name", "actions " + it.key() );
menu.appendChild( actionSubmenu );
- QDomElement subtext = m_doc.createElement( "text" );
+ TQDomElement subtext = m_doc.createElement( "text" );
actionSubmenu.appendChild( subtext );
subtext.appendChild( m_doc.createTextNode( it.key() ) );
count += insertServices(it.data(), actionSubmenu, isBuiltin);
@@ -255,7 +255,7 @@ int KonqPopupMenu::insertServicesSubmenus(const QMap<QString, ServiceList>& subm
}
int KonqPopupMenu::insertServices(const ServiceList& list,
- QDomElement& menu,
+ TQDomElement& menu,
bool isBuiltin)
{
static int id = 1000;
@@ -269,7 +269,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list,
if (!menu.firstChild().isNull() &&
menu.lastChild().toElement().tagName().lower() != "separator")
{
- QDomElement separator = m_doc.createElement( "separator" );
+ TQDomElement separator = m_doc.createElement( "separator" );
menu.appendChild(separator);
}
continue;
@@ -277,16 +277,16 @@ int KonqPopupMenu::insertServices(const ServiceList& list,
if (isBuiltin || (*it).m_display == true)
{
- QCString name;
+ TQCString name;
name.setNum( id );
name.prepend( isBuiltin ? "builtinservice_" : "userservice_" );
- KAction * act = new KAction( QString((*it).m_strName).replace('&',"&&"), 0,
- this, SLOT( slotRunService() ),
+ KAction * act = new KAction( TQString((*it).m_strName).replace('&',"&&"), 0,
+ this, TQT_SLOT( slotRunService() ),
&m_ownActions, name );
if ( !(*it).m_strIcon.isEmpty() )
{
- QPixmap pix = SmallIcon( (*it).m_strIcon );
+ TQPixmap pix = SmallIcon( (*it).m_strIcon );
act->setIconSet( pix );
}
@@ -307,10 +307,10 @@ bool KonqPopupMenu::KIOSKAuthorizedAction(KConfig& cfg)
return true;
}
- QStringList list = cfg.readListEntry("X-KDE-AuthorizeAction");
+ TQStringList list = cfg.readListEntry("X-KDE-AuthorizeAction");
if (kapp && !list.isEmpty())
{
- for(QStringList::ConstIterator it = list.begin();
+ for(TQStringList::ConstIterator it = list.begin();
it != list.end();
++it)
{
@@ -338,7 +338,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
bool sMoving = sDeleting;
bool sWriting = sDeleting && m_lstItems.first()->isWritable();
m_sMimeType = m_lstItems.first()->mimetype();
- QString mimeGroup = m_sMimeType.left(m_sMimeType.find('/'));
+ TQString mimeGroup = m_sMimeType.left(m_sMimeType.find('/'));
mode_t mode = m_lstItems.first()->mode();
bool isDirectory = S_ISDIR(mode);
bool bTrashIncluded = false;
@@ -354,7 +354,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
m_pluginList.setAutoDelete( true );
m_ownActions.setHighlightingEnabled( true );
- attrName = QString::fromLatin1( "name" );
+ attrName = TQString::fromLatin1( "name" );
prepareXMLGUIStuff();
m_builder = new KonqPopupMenuGUIBuilder( this );
@@ -362,7 +362,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
KURL url;
KFileItemListIterator it ( m_lstItems );
- QStringList mimeTypeList;
+ TQStringList mimeTypeList;
// Check whether all URLs are correct
for ( ; it.current(); ++it )
{
@@ -378,10 +378,10 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
// Determine if common mimetype among all URLs
if ( m_sMimeType != (*it)->mimetype() )
{
- m_sMimeType = QString::null; // mimetypes are different => null
+ m_sMimeType = TQString::null; // mimetypes are different => null
if ( mimeGroup != (*it)->mimetype().left((*it)->mimetype().find('/')))
- mimeGroup = QString::null; // mimetype groups are different as well!
+ mimeGroup = TQString::null; // mimetype groups are different as well!
}
if ( mimeTypeList.findIndex( (*it)->mimetype() ) == -1 )
@@ -455,7 +455,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if (!isCurrentTrash)
addMerge( "konqueror" );
- bool isKDesktop = QCString( kapp->name() ) == "kdesktop";
+ bool isKDesktop = TQCString( kapp->name() ) == "kdesktop";
KAction *actNewWindow = 0;
if (( kpf & ShowProperties ) && isKDesktop &&
@@ -468,8 +468,8 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
// or we need to insert it ourselves (e.g. for kdesktop). In the first case, actNewWindow must remain 0.
if ( ((kpf & ShowNewWindow) != 0) && sReading )
{
- QString openStr = isKDesktop ? i18n( "&Open" ) : i18n( "Open in New &Window" );
- actNewWindow = new KAction( openStr, "window_new", 0, this, SLOT( slotPopupNewView() ), &m_ownActions, "newview" );
+ TQString openStr = isKDesktop ? i18n( "&Open" ) : i18n( "Open in New &Window" );
+ actNewWindow = new KAction( openStr, "window_new", 0, this, TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" );
}
if ( actNewWindow && !isKDesktop )
@@ -498,14 +498,14 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
{
if (d->m_itemFlags & KParts::BrowserExtension::ShowCreateDirectory)
{
- KAction *actNewDir = new KAction( i18n( "Create &Folder..." ), "folder_new", 0, this, SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
+ KAction *actNewDir = new KAction( i18n( "Create &Folder..." ), "folder_new", 0, this, TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
addAction( actNewDir );
addSeparator();
}
}
} else if ( isIntoTrash ) {
// Trashed item, offer restoring
- act = new KAction( i18n( "&Restore" ), 0, this, SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" );
+ act = new KAction( i18n( "&Restore" ), 0, this, TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" );
addAction( act );
}
@@ -576,7 +576,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
}
if ( isCurrentTrash )
{
- act = new KAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" );
+ act = new KAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, TQT_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" );
KSimpleConfig trashConfig( "trashrc", true );
trashConfig.setGroup( "Status" );
act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) );
@@ -593,7 +593,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( !isCurrentTrash && !isIntoTrash && (d->m_itemFlags & KParts::BrowserExtension::ShowBookmark))
{
addSeparator();
- QString caption;
+ TQString caption;
if (currentDir)
{
bool httpPage = (m_sViewURL.protocol().find("http", 0, false) == 0);
@@ -609,7 +609,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
else
caption = i18n("&Bookmark This File");
- act = new KAction( caption, "bookmark_add", 0, this, SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" );
+ act = new KAction( caption, "bookmark_add", 0, this, TQT_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" );
if (m_lstItems.count() > 1)
act->setEnabled(false);
if (kapp->authorizeKAction("bookmarks"))
@@ -633,11 +633,11 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
{
// get builtin services, like mount/unmount
s.builtin = KDEDesktopMimeType::builtinServices( urlForServiceMenu );
- const QString path = urlForServiceMenu.path();
+ const TQString path = urlForServiceMenu.path();
KSimpleConfig cfg( path, true );
cfg.setDesktopGroup();
- const QString priority = cfg.readEntry("X-KDE-Priority");
- const QString submenuName = cfg.readEntry( "X-KDE-Submenu" );
+ const TQString priority = cfg.readEntry("X-KDE-Priority");
+ const TQString submenuName = cfg.readEntry( "X-KDE-Submenu" );
if ( cfg.readEntry("Type") == "Link" ) {
urlForServiceMenu = cfg.readEntry("URL");
// TODO: Do we want to make all the actions apply on the target
@@ -655,26 +655,26 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
// first check the .directory if this is a directory
if (isDirectory && isSingleLocal)
{
- QString dotDirectoryFile = urlForServiceMenu.path(1).append(".directory");
+ TQString dotDirectoryFile = urlForServiceMenu.path(1).append(".directory");
KSimpleConfig cfg( dotDirectoryFile, true );
cfg.setDesktopGroup();
if (KIOSKAuthorizedAction(cfg))
{
- const QString priority = cfg.readEntry("X-KDE-Priority");
- const QString submenuName = cfg.readEntry( "X-KDE-Submenu" );
+ const TQString priority = cfg.readEntry("X-KDE-Priority");
+ const TQString submenuName = cfg.readEntry( "X-KDE-Submenu" );
ServiceList* list = s.selectList( priority, submenuName );
(*list) += KDEDesktopMimeType::userDefinedServices( dotDirectoryFile, cfg, true );
}
}
// findAllResources() also removes duplicates
- const QStringList entries = KGlobal::dirs()->findAllResources("data",
+ const TQStringList entries = KGlobal::dirs()->findAllResources("data",
"konqueror/servicemenus/*.desktop",
false /* recursive */,
true /* unique */);
- QStringList::ConstIterator eIt = entries.begin();
- const QStringList::ConstIterator eEnd = entries.end();
+ TQStringList::ConstIterator eIt = entries.begin();
+ const TQStringList::ConstIterator eEnd = entries.end();
for (; eIt != eEnd; ++eIt )
{
KSimpleConfig cfg( *eIt, true );
@@ -687,26 +687,26 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( cfg.hasKey( "X-KDE-ShowIfRunning" ) )
{
- const QString app = cfg.readEntry( "X-KDE-ShowIfRunning" );
+ const TQString app = cfg.readEntry( "X-KDE-ShowIfRunning" );
if ( !kapp->dcopClient()->isApplicationRegistered( app.utf8() ) )
continue;
}
if ( cfg.hasKey( "X-KDE-ShowIfDcopCall" ) )
{
- QString dcopcall = cfg.readEntry( "X-KDE-ShowIfDcopCall" );
- const QCString app = dcopcall.section(' ', 0,0).utf8();
+ TQString dcopcall = cfg.readEntry( "X-KDE-ShowIfDcopCall" );
+ const TQCString app = dcopcall.section(' ', 0,0).utf8();
//if( !kapp->dcopClient()->isApplicationRegistered( app ))
// continue; //app does not exist so cannot send call
- QByteArray dataToSend;
- QDataStream dataStream(dataToSend, IO_WriteOnly);
+ TQByteArray dataToSend;
+ TQDataStream dataStream(dataToSend, IO_WriteOnly);
dataStream << m_lstPopupURLs;
- QCString replyType;
- QByteArray replyData;
- QCString object = dcopcall.section(' ', 1,-2).utf8();
- QString function = dcopcall.section(' ', -1);
+ TQCString replyType;
+ TQByteArray replyData;
+ TQCString object = dcopcall.section(' ', 1,-2).utf8();
+ TQString function = dcopcall.section(' ', -1);
if(!function.endsWith("(KURL::List)")) {
kdWarning() << "Desktop file " << *eIt << " contains an invalid X-KDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl;
continue; //Be safe.
@@ -722,13 +722,13 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
}
if ( cfg.hasKey( "X-KDE-Protocol" ) )
{
- const QString protocol = cfg.readEntry( "X-KDE-Protocol" );
+ const TQString protocol = cfg.readEntry( "X-KDE-Protocol" );
if ( protocol != urlForServiceMenu.protocol() )
continue;
}
else if ( cfg.hasKey( "X-KDE-Protocols" ) )
{
- QStringList protocols = QStringList::split( "," , cfg.readEntry( "X-KDE-Protocols" ) );
+ TQStringList protocols = TQStringList::split( "," , cfg.readEntry( "X-KDE-Protocols" ) );
if ( !protocols.contains( urlForServiceMenu.protocol() ) )
continue;
}
@@ -742,18 +742,18 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( cfg.hasKey( "X-KDE-Require" ) )
{
- const QStringList capabilities = cfg.readListEntry( "X-KDE-Require" );
+ const TQStringList capabilities = cfg.readListEntry( "X-KDE-Require" );
if ( capabilities.contains( "Write" ) && !sWriting )
continue;
}
if ( (cfg.hasKey( "Actions" ) || cfg.hasKey( "X-KDE-GetActionMenu") ) && cfg.hasKey( "ServiceTypes" ) )
{
- const QStringList types = cfg.readListEntry( "ServiceTypes" );
- const QStringList excludeTypes = cfg.readListEntry( "ExcludeServiceTypes" );
+ const TQStringList types = cfg.readListEntry( "ServiceTypes" );
+ const TQStringList excludeTypes = cfg.readListEntry( "ExcludeServiceTypes" );
bool ok = false;
// check for exact matches or a typeglob'd mimetype if we have a mimetype
- for (QStringList::ConstIterator it = types.begin();
+ for (TQStringList::ConstIterator it = types.begin();
it != types.end() && !ok;
++it)
{
@@ -787,7 +787,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if (checkTheMimetypes)
{
ok = true;
- for (QStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex)
+ for (TQStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex)
{
if( ((*itex).right(1) == "*" && (*itex).left((*itex).find('/')) == mimeGroup) ||
((*itex) == m_sMimeType) )
@@ -801,8 +801,8 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( ok )
{
- const QString priority = cfg.readEntry("X-KDE-Priority");
- const QString submenuName = cfg.readEntry( "X-KDE-Submenu" );
+ const TQString priority = cfg.readEntry("X-KDE-Priority");
+ const TQString submenuName = cfg.readEntry( "X-KDE-Submenu" );
ServiceList* list = s.selectList( priority, submenuName );
(*list) += KDEDesktopMimeType::userDefinedServices( *eIt, cfg, url.isLocalFile(), m_lstPopupURLs );
@@ -814,13 +814,13 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if (kapp->authorizeKAction("openwith"))
{
- QString constraint = "Type == 'Application' and DesktopEntryName != 'kfmclient' and DesktopEntryName != 'kfmclient_dir' and DesktopEntryName != 'kfmclient_html'";
- QString subConstraint = " and '%1' in ServiceTypes";
+ TQString constraint = "Type == 'Application' and DesktopEntryName != 'kfmclient' and DesktopEntryName != 'kfmclient_dir' and DesktopEntryName != 'kfmclient_html'";
+ TQString subConstraint = " and '%1' in ServiceTypes";
- QStringList::ConstIterator it = mimeTypeList.begin();
- QStringList::ConstIterator end = mimeTypeList.end();
+ TQStringList::ConstIterator it = mimeTypeList.begin();
+ TQStringList::ConstIterator end = mimeTypeList.end();
Q_ASSERT( it != end );
- QString first = *it;
+ TQString first = *it;
++it;
while ( it != end ) {
constraint += subConstraint.arg( *it );
@@ -846,14 +846,14 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
// First block, app and preview offers
id = 1;
- QDomElement menu = m_menuElement;
+ TQDomElement menu = m_menuElement;
if ( offers.count() > 1 ) // submenu 'open with'
{
menu = m_doc.createElement( "menu" );
menu.setAttribute( "name", "openwith submenu" );
m_menuElement.appendChild( menu );
- QDomElement text = m_doc.createElement( "text" );
+ TQDomElement text = m_doc.createElement( "text" );
menu.appendChild( text );
text.appendChild( m_doc.createTextNode( i18n("&Open With") ) );
}
@@ -867,35 +867,35 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
// but still offer NoDisplay=true entries, that's the
// whole point of such desktop files. This is why we don't
// use service->noDisplay() here.
- const QString onlyShowIn = service->property("OnlyShowIn", QVariant::String).toString();
+ const TQString onlyShowIn = service->property("OnlyShowIn", TQVariant::String).toString();
if ( !onlyShowIn.isEmpty() ) {
- const QStringList aList = QStringList::split(';', onlyShowIn);
+ const TQStringList aList = TQStringList::split(';', onlyShowIn);
if (!aList.contains("KDE"))
continue;
}
- const QString notShowIn = service->property("NotShowIn", QVariant::String).toString();
+ const TQString notShowIn = service->property("NotShowIn", TQVariant::String).toString();
if ( !notShowIn.isEmpty() ) {
- const QStringList aList = QStringList::split(';', notShowIn);
+ const TQStringList aList = TQStringList::split(';', notShowIn);
if (aList.contains("KDE"))
continue;
}
- QCString nam;
+ TQCString nam;
nam.setNum( id );
- QString actionName( (*it)->name().replace("&", "&&") );
+ TQString actionName( (*it)->name().replace("&", "&&") );
if ( menu == m_menuElement ) // no submenu -> prefix single offer
actionName = i18n( "Open with %1" ).arg( actionName );
act = new KAction( actionName, (*it)->pixmap( KIcon::Small ), 0,
- this, SLOT( slotRunService() ),
+ this, TQT_SLOT( slotRunService() ),
&m_ownActions, nam.prepend( "appservice_" ) );
addAction( act, menu );
m_mapPopup[ id++ ] = *it;
}
- QString openWithActionName;
+ TQString openWithActionName;
if ( menu != m_menuElement ) // submenu
{
addSeparator( menu );
@@ -905,12 +905,12 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
{
openWithActionName = i18n( "&Open With..." );
}
- KAction *openWithAct = new KAction( openWithActionName, 0, this, SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
+ KAction *openWithAct = new KAction( openWithActionName, 0, this, TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
addAction( openWithAct, menu );
}
else // no app offers -> Open With...
{
- act = new KAction( i18n( "&Open With..." ), 0, this, SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
+ act = new KAction( i18n( "&Open With..." ), 0, this, TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
addAction( act );
}
@@ -919,7 +919,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
}
// Second block, builtin + user
- QDomElement actionMenu = m_menuElement;
+ TQDomElement actionMenu = m_menuElement;
int userItemCount = 0;
if (s.user.count() + s.userSubmenus.count() +
s.userPriority.count() + s.userPrioritySubmenus.count() > 1)
@@ -928,7 +928,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
actionMenu = m_doc.createElement( "menu" );
actionMenu.setAttribute( "name", "actions submenu" );
m_menuElement.appendChild( actionMenu );
- QDomElement text = m_doc.createElement( "text" );
+ TQDomElement text = m_doc.createElement( "text" );
actionMenu.appendChild( text );
text.appendChild( m_doc.createTextNode( i18n("Ac&tions") ) );
}
@@ -943,7 +943,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
s.builtin.count() > 0) &&
actionMenu.lastChild().toElement().tagName().lower() != "separator")
{
- QDomElement separator = m_doc.createElement( "separator" );
+ TQDomElement separator = m_doc.createElement( "separator" );
actionMenu.appendChild(separator);
}
@@ -964,7 +964,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( KPropertiesDialog::canDisplay( m_lstItems ) && (kpf & ShowProperties) )
{
- act = new KAction( i18n( "&Properties" ), 0, this, SLOT( slotPopupProperties() ),
+ act = new KAction( i18n( "&Properties" ), 0, this, TQT_SLOT( slotPopupProperties() ),
&m_ownActions, "properties" );
addAction( act );
}
@@ -978,7 +978,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( KFileShare::authorization() == KFileShare::Authorized )
{
addSeparator();
- act = new KAction( i18n("Share"), 0, this, SLOT( slotOpenShareFileDialog() ),
+ act = new KAction( i18n("Share"), 0, this, TQT_SLOT( slotOpenShareFileDialog() ),
&m_ownActions, "sharefile" );
addAction( act );
}
@@ -1005,7 +1005,7 @@ KonqPopupMenu::~KonqPopupMenu()
//kdDebug(1203) << "~KonqPopupMenu leave" << endl;
}
-void KonqPopupMenu::setURLTitle( const QString& urlTitle )
+void KonqPopupMenu::setURLTitle( const TQString& urlTitle )
{
d->m_urlTitle = urlTitle;
}
@@ -1045,7 +1045,7 @@ void KonqPopupMenu::slotPopupAddToBookmark()
KBookmarkGroup root;
if ( m_lstPopupURLs.count() == 1 ) {
KURL url = m_lstPopupURLs.first();
- QString title = d->m_urlTitle.isEmpty() ? url.prettyURL() : d->m_urlTitle;
+ TQString title = d->m_urlTitle.isEmpty() ? url.prettyURL() : d->m_urlTitle;
root = m_pManager->addBookmarkDialog( url.prettyURL(), title );
}
else
@@ -1060,11 +1060,11 @@ void KonqPopupMenu::slotPopupAddToBookmark()
void KonqPopupMenu::slotRunService()
{
- QCString senderName = sender()->name();
+ TQCString senderName = sender()->name();
int id = senderName.mid( senderName.find( '_' ) + 1 ).toInt();
// Is it a usual service (application)
- QMap<int,KService::Ptr>::Iterator it = m_mapPopup.find( id );
+ TQMap<int,KService::Ptr>::Iterator it = m_mapPopup.find( id );
if ( it != m_mapPopup.end() )
{
KRun::run( **it, m_lstPopupURLs );
@@ -1072,7 +1072,7 @@ void KonqPopupMenu::slotRunService()
}
// Is it a service specific to desktop entry files ?
- QMap<int,KDEDesktopMimeType::Service>::Iterator it2 = m_mapPopupServices.find( id );
+ TQMap<int,KDEDesktopMimeType::Service>::Iterator it2 = m_mapPopupServices.find( id );
if ( it2 != m_mapPopupServices.end() )
{
KDEDesktopMimeType::executeService( m_lstPopupURLs, it2.data() );
@@ -1109,9 +1109,9 @@ KPropertiesDialog* KonqPopupMenu::showPropertiesDialog()
return new KPropertiesDialog( m_lstItems, d->m_parentWidget );
}
-KAction *KonqPopupMenu::action( const QDomElement &element ) const
+KAction *KonqPopupMenu::action( const TQDomElement &element ) const
{
- QCString name = element.attribute( attrName ).ascii();
+ TQCString name = element.attribute( attrName ).ascii();
KAction *res = m_ownActions.action( name );
if ( !res )
@@ -1128,7 +1128,7 @@ KActionCollection *KonqPopupMenu::actionCollection() const
return const_cast<KActionCollection *>( &m_ownActions );
}
-QString KonqPopupMenu::mimeType() const
+TQString KonqPopupMenu::mimeType() const
{
return m_sMimeType;
}
@@ -1144,7 +1144,7 @@ void KonqPopupMenu::addPlugins()
//search for a plugin with the right protocol
KTrader::OfferList plugin_offers;
unsigned int pluginCount = 0;
- plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? QString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes");
+ plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes");
if ( plugin_offers.isEmpty() )
return; // no plugins installed do not bother about it
@@ -1157,13 +1157,13 @@ void KonqPopupMenu::addPlugins()
//kdDebug() << (*iterator)->library() << endl;
KonqPopupMenuPlugin *plugin =
KParts::ComponentFactory::
- createInstanceFromLibrary<KonqPopupMenuPlugin>( QFile::encodeName( (*iterator)->library() ),
+ createInstanceFromLibrary<KonqPopupMenuPlugin>( TQFile::encodeName( (*iterator)->library() ),
this,
(*iterator)->name().latin1() );
if ( !plugin )
continue;
// This make the kuick plugin insert its stuff above "Properties"
- QString pluginClientName = QString::fromLatin1( "Plugin%1" ).arg( pluginCount );
+ TQString pluginClientName = TQString::fromLatin1( "Plugin%1" ).arg( pluginCount );
addMerge( pluginClientName );
plugin->domDocument().documentElement().setAttribute( "name", pluginClientName );
m_pluginList.append( plugin );
@@ -1194,7 +1194,7 @@ KURL::List KonqPopupMenu::popupURLList() const
*/
KonqPopupMenuPlugin::KonqPopupMenuPlugin( KonqPopupMenu *parent, const char *name )
- : QObject( parent, name )
+ : TQObject( parent, name )
{
}
diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h
index 44021713f..ee528bc9e 100644
--- a/libkonq/konq_popupmenu.h
+++ b/libkonq/konq_popupmenu.h
@@ -23,11 +23,11 @@
#include <sys/types.h>
-#include <qpopupmenu.h>
-#include <qmap.h>
+#include <tqpopupmenu.h>
+#include <tqmap.h>
#include <kaction.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include <kfileitem.h>
#include <kmimetype.h> // for KDEDesktopMimeType
@@ -37,7 +37,7 @@
#include "konq_xmlguiclient.h"
-typedef QValueList<KDEDesktopMimeType::Service> ServiceList;
+typedef TQValueList<KDEDesktopMimeType::Service> ServiceList;
class KPropertiesDialog;
class KNewMenu;
@@ -52,7 +52,7 @@ class KBookmarkManager;
* with the correct arguments, then exec() to make it appear, then destroy it.
*
*/
-class LIBKONQ_EXPORT KonqPopupMenu : public QPopupMenu, public KonqXMLGUIClient
+class LIBKONQ_EXPORT KonqPopupMenu : public TQPopupMenu, public KonqXMLGUIClient
{
Q_OBJECT
public:
@@ -89,7 +89,7 @@ public:
KURL viewURL,
KActionCollection & actions,
KNewMenu * newMenu,
- QWidget * parentWidget,
+ TQWidget * parentWidget,
bool showPropertiesAndFileType = true ) KDE_DEPRECATED;
/**
@@ -117,7 +117,7 @@ public:
const KURL& viewURL,
KActionCollection & actions,
KNewMenu * newMenu,
- QWidget * parentWidget,
+ TQWidget * parentWidget,
KonqPopupFlags kpf,
KParts::BrowserExtension::PopupFlags f /*= KParts::BrowserExtension::DefaultPopupItems*/);
@@ -130,7 +130,7 @@ public:
* Set the title of the URL, when the popupmenu is opened for a single URL.
* This is used if the user chooses to add a bookmark for this URL.
*/
- void setURLTitle( const QString& urlTitle );
+ void setURLTitle( const TQString& urlTitle );
class LIBKONQ_EXPORT ProtocolInfo {
public:
@@ -151,11 +151,11 @@ public:
/**
* Reimplemented for internal purpose
*/
- virtual KAction *action( const QDomElement &element ) const;
+ virtual KAction *action( const TQDomElement &element ) const;
virtual KActionCollection *actionCollection() const;
- QString mimeType( ) const;
+ TQString mimeType( ) const;
KURL url( ) const;
KFileItemList fileItemList() const;
KURL::List popupURLList( ) const;
@@ -177,11 +177,11 @@ protected:
KActionCollection m_ownActions;
private:
- void init (QWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags itemFlags);
+ void init (TQWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags itemFlags);
void setup(KonqPopupFlags kpf);
void addPlugins( );
- int insertServicesSubmenus(const QMap<QString, ServiceList>& list, QDomElement& menu, bool isBuiltin);
- int insertServices(const ServiceList& list, QDomElement& menu, bool isBuiltin);
+ int insertServicesSubmenus(const TQMap<TQString, ServiceList>& list, TQDomElement& menu, bool isBuiltin);
+ int insertServices(const ServiceList& list, TQDomElement& menu, bool isBuiltin);
bool KIOSKAuthorizedAction(KConfig& cfg);
KPropertiesDialog* showPropertiesDialog();
@@ -189,21 +189,21 @@ private:
KonqPopupMenuPrivate *d;
KNewMenu *m_pMenuNew;
KURL m_sViewURL;
- QString m_sMimeType;
+ TQString m_sMimeType;
KFileItemList m_lstItems;
KURL::List m_lstPopupURLs;
- QMap<int,KService::Ptr> m_mapPopup;
- QMap<int,KDEDesktopMimeType::Service> m_mapPopupServices;
+ TQMap<int,KService::Ptr> m_mapPopup;
+ TQMap<int,KDEDesktopMimeType::Service> m_mapPopupServices;
bool m_bHandleEditOperations;
KXMLGUIFactory *m_factory;
KXMLGUIBuilder *m_builder;
- QString attrName;
+ TQString attrName;
ProtocolInfo m_info;
- QPtrList<KonqPopupMenuPlugin> m_pluginList;
+ TQPtrList<KonqPopupMenuPlugin> m_pluginList;
KBookmarkManager* m_pManager;
};
-class LIBKONQ_EXPORT KonqPopupMenuPlugin : public QObject, public KonqXMLGUIClient {
+class LIBKONQ_EXPORT KonqPopupMenuPlugin : public TQObject, public KonqXMLGUIClient {
Q_OBJECT
public:
/**
diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc
index c2cc3dd3d..62ec8da48 100644
--- a/libkonq/konq_propsview.cc
+++ b/libkonq/konq_propsview.cc
@@ -23,10 +23,10 @@
#include <kdebug.h>
#include <kstandarddirs.h>
#include <kpixmap.h>
-#include <qpixmapcache.h>
-#include <qiconview.h>
+#include <tqpixmapcache.h>
+#include <tqiconview.h>
#include <unistd.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <iostream>
#include <ktrader.h>
#include <kinstance.h>
@@ -34,16 +34,16 @@
#include <ksimpleconfig.h>
-static QPixmap wallpaperPixmap( const QString & _wallpaper )
+static TQPixmap wallpaperPixmap( const TQString & _wallpaper )
{
- QString key = "wallpapers/";
+ TQString key = "wallpapers/";
key += _wallpaper;
KPixmap pix;
- if ( QPixmapCache::find( key, pix ) )
+ if ( TQPixmapCache::find( key, pix ) )
return pix;
- QString path = locate("tiles", _wallpaper);
+ TQString path = locate("tiles", _wallpaper);
if (path.isEmpty())
path = locate("wallpaper", _wallpaper);
if (!path.isEmpty())
@@ -56,20 +56,20 @@ static QPixmap wallpaperPixmap( const QString & _wallpaper )
if ( pix.isNull() )
kdWarning(1203) << "Could not load wallpaper " << path << endl;
else
- QPixmapCache::insert( key, pix );
+ TQPixmapCache::insert( key, pix );
return pix;
} else kdWarning(1203) << "Couldn't locate wallpaper " << _wallpaper << endl;
- return QPixmap();
+ return TQPixmap();
}
struct KonqPropsView::Private
{
- QStringList* previewsToShow;
+ TQStringList* previewsToShow;
bool previewsEnabled:1;
bool caseInsensitiveSort:1;
bool dirsfirst:1;
bool descending:1;
- QString sortcriterion;
+ TQString sortcriterion;
};
KonqPropsView::KonqPropsView( KInstance * instance, KonqPropsView * defaultProps )
@@ -88,7 +88,7 @@ KonqPropsView::KonqPropsView( KInstance * instance, KonqPropsView * defaultProps
d->caseInsensitiveSort=config->readBoolEntry( "CaseInsensitiveSort", true );
m_iIconSize = config->readNumEntry( "IconSize", 0 );
- m_iItemTextPos = config->readNumEntry( "ItemTextPos", QIconView::Bottom );
+ m_iItemTextPos = config->readNumEntry( "ItemTextPos", TQIconView::Bottom );
d->sortcriterion = config->readEntry( "SortingCriterion", "sort_nci" );
d->dirsfirst = config->readBoolEntry( "SortDirsFirst", true );
d->descending = config->readBoolEntry( "SortDescending", false );
@@ -109,9 +109,9 @@ KonqPropsView::KonqPropsView( KInstance * instance, KonqPropsView * defaultProps
d->previewsEnabled = config->readBoolEntry( "PreviewsEnabled", true );
- QColor tc = KonqFMSettings::settings()->normalTextColor();
+ TQColor tc = KonqFMSettings::settings()->normalTextColor();
m_textColor = config->readColorEntry( "TextColor", &tc );
- m_bgColor = config->readColorEntry( "BgColor" ); // will be set to QColor() if not found
+ m_bgColor = config->readColorEntry( "BgColor" ); // will be set to TQColor() if not found
m_bgPixmapFile = config->readPathEntry( "BgImage" );
//kdDebug(1203) << "KonqPropsView::KonqPropsView from \"config\" : BgImage=" << m_bgPixmapFile << endl;
@@ -188,8 +188,8 @@ bool KonqPropsView::enterDir( const KURL & dir )
// Check for .directory
KURL u ( dir );
u.addPath(".directory");
- bool dotDirExists = u.isLocalFile() && QFile::exists( u.path() );
- dotDirectory = u.isLocalFile() ? u.path() : QString::null;
+ bool dotDirExists = u.isLocalFile() && TQFile::exists( u.path() );
+ dotDirectory = u.isLocalFile() ? u.path() : TQString::null;
// Revert to default setting first - unless there is no .directory
// in the previous dir nor in this one (then we can keep the current settings)
@@ -300,7 +300,7 @@ void KonqPropsView::setItemTextPos( int pos )
}
}
-void KonqPropsView::setSortCriterion( const QString &criterion )
+void KonqPropsView::setSortCriterion( const TQString &criterion )
{
d->sortcriterion = criterion;
if ( m_defaultProps && !m_bSaveViewPropertiesLocally )
@@ -393,7 +393,7 @@ void KonqPropsView::setShowingDirectoryOverlays( bool show )
}
}
-void KonqPropsView::setShowingPreview( const QString &preview, bool show )
+void KonqPropsView::setShowingPreview( const TQString &preview, bool show )
{
if ( m_dontPreview.contains( preview ) != show )
return;
@@ -452,7 +452,7 @@ bool KonqPropsView::isShowingPreview()
return d->previewsEnabled;
}
-void KonqPropsView::setBgColor( const QColor & color )
+void KonqPropsView::setBgColor( const TQColor & color )
{
m_bgColor = color;
if ( m_defaultProps && !m_bSaveViewPropertiesLocally )
@@ -471,7 +471,7 @@ void KonqPropsView::setBgColor( const QColor & color )
}
}
-const QColor & KonqPropsView::bgColor( QWidget * widget ) const
+const TQColor & KonqPropsView::bgColor( TQWidget * widget ) const
{
if ( !m_bgColor.isValid() )
return widget->colorGroup().base();
@@ -479,7 +479,7 @@ const QColor & KonqPropsView::bgColor( QWidget * widget ) const
return m_bgColor;
}
-void KonqPropsView::setTextColor( const QColor & color )
+void KonqPropsView::setTextColor( const TQColor & color )
{
m_textColor = color;
if ( m_defaultProps && !m_bSaveViewPropertiesLocally )
@@ -498,7 +498,7 @@ void KonqPropsView::setTextColor( const QColor & color )
}
}
-const QColor & KonqPropsView::textColor( QWidget * widget ) const
+const TQColor & KonqPropsView::textColor( TQWidget * widget ) const
{
if ( !m_textColor.isValid() )
return widget->colorGroup().text();
@@ -506,7 +506,7 @@ const QColor & KonqPropsView::textColor( QWidget * widget ) const
return m_textColor;
}
-void KonqPropsView::setBgPixmapFile( const QString & file )
+void KonqPropsView::setBgPixmapFile( const TQString & file )
{
m_bgPixmapFile = file;
@@ -526,22 +526,22 @@ void KonqPropsView::setBgPixmapFile( const QString & file )
}
}
-QPixmap KonqPropsView::loadPixmap() const
+TQPixmap KonqPropsView::loadPixmap() const
{
//kdDebug(1203) << "KonqPropsView::loadPixmap " << m_bgPixmapFile << endl;
- QPixmap bgPixmap;
+ TQPixmap bgPixmap;
if ( !m_bgPixmapFile.isEmpty() )
bgPixmap = wallpaperPixmap( m_bgPixmapFile );
return bgPixmap;
}
-void KonqPropsView::applyColors(QWidget * widget) const
+void KonqPropsView::applyColors(TQWidget * widget) const
{
if ( m_bgPixmapFile.isEmpty() )
widget->setPaletteBackgroundColor( bgColor( widget ) );
else
{
- QPixmap pix = loadPixmap();
+ TQPixmap pix = loadPixmap();
// don't set an null pixmap, as this leads to
// undefined results with regards to the background of widgets
// that have the iconview as a parent and on the iconview itself
@@ -556,7 +556,7 @@ void KonqPropsView::applyColors(QWidget * widget) const
widget->setPaletteForegroundColor( m_textColor );
}
-const QStringList& KonqPropsView::previewSettings()
+const TQStringList& KonqPropsView::previewSettings()
{
if ( ! d->previewsToShow )
{
@@ -566,7 +566,7 @@ const QStringList& KonqPropsView::previewSettings()
KTrader::OfferList plugins = KTrader::self()->query( "ThumbCreator" );
for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
{
- QString name = (*it)->desktopEntryName();
+ TQString name = (*it)->desktopEntryName();
if ( ! m_dontPreview.contains(name) )
d->previewsToShow->append( name );
}
@@ -578,7 +578,7 @@ const QStringList& KonqPropsView::previewSettings()
return *(d->previewsToShow);
}
-const QString& KonqPropsView::sortCriterion() const {
+const TQString& KonqPropsView::sortCriterion() const {
return d->sortcriterion;
}
diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h
index 679ce8a0e..c69b97966 100644
--- a/libkonq/konq_propsview.h
+++ b/libkonq/konq_propsview.h
@@ -20,8 +20,8 @@
#ifndef __konq_viewprops_h__
#define __konq_viewprops_h__
-#include <qpixmap.h>
-#include <qstringlist.h>
+#include <tqpixmap.h>
+#include <tqstringlist.h>
#include <kurl.h>
#include <libkonq_export.h>
@@ -84,11 +84,11 @@ public:
void setIconSize( int size ); // in pixel, 0 for default
int iconSize() const { return m_iIconSize; }
- void setItemTextPos( int pos ); // QIconView::Bottom or QIconView::Right, currently
+ void setItemTextPos( int pos ); // TQIconView::Bottom or TQIconView::Right, currently
int itemTextPos() const { return m_iItemTextPos; }
- void setSortCriterion( const QString &criterion );
- const QString& sortCriterion() const;
+ void setSortCriterion( const TQString &criterion );
+ const TQString& sortCriterion() const;
void setDirsFirst ( bool first );
bool isDirsFirst() const;
@@ -105,25 +105,25 @@ public:
void setShowingDirectoryOverlays( bool show );
bool isShowingDirectoryOverlays() const { return m_bShowDirectoryOverlays; }
- void setShowingPreview( const QString &preview, bool show );
+ void setShowingPreview( const TQString &preview, bool show );
void setShowingPreview( bool show );
- bool isShowingPreview( const QString &preview ) const { return ! m_dontPreview.contains(preview); }
+ bool isShowingPreview( const TQString &preview ) const { return ! m_dontPreview.contains(preview); }
bool isShowingPreview();
- const QStringList &previewSettings();
+ const TQStringList &previewSettings();
- void setBgColor( const QColor & color );
- const QColor& bgColor(QWidget * widget) const;
- void setTextColor( const QColor & color );
- const QColor& textColor(QWidget * widget) const;
- void setBgPixmapFile( const QString & file );
- const QString& bgPixmapFile() const { return m_bgPixmapFile; }
+ void setBgColor( const TQColor & color );
+ const TQColor& bgColor(TQWidget * widget) const;
+ void setTextColor( const TQColor & color );
+ const TQColor& textColor(TQWidget * widget) const;
+ void setBgPixmapFile( const TQString & file );
+ const TQString& bgPixmapFile() const { return m_bgPixmapFile; }
// Applies bgcolor, textcolor, pixmap to the @p widget
- void applyColors( QWidget * widget ) const;
+ void applyColors( TQWidget * widget ) const;
protected:
- QPixmap loadPixmap() const;
+ TQPixmap loadPixmap() const;
// Current config object for _saving_
KConfigBase * currentConfig();
@@ -131,9 +131,9 @@ protected:
// Current config object for _saving_ settings related to colors
KConfigBase * currentColorConfig();
- QString currentGroup() const {
+ TQString currentGroup() const {
return isDefaultProperties() ?
- QString::fromLatin1("Settings") : QString::fromLatin1("URL properties");
+ TQString::fromLatin1("Settings") : TQString::fromLatin1("URL properties");
}
private:
@@ -143,13 +143,13 @@ private:
int m_iItemTextPos;
bool m_bShowDot;
bool m_bShowDirectoryOverlays;
- QStringList m_dontPreview;
- QColor m_textColor;
- QColor m_bgColor;
- QString m_bgPixmapFile;
+ TQStringList m_dontPreview;
+ TQColor m_textColor;
+ TQColor m_bgColor;
+ TQString m_bgPixmapFile;
// Path to .directory file, whether it exists or not
- QString dotDirectory;
+ TQString dotDirectory;
bool m_bSaveViewPropertiesLocally;
diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc
index 07866b08b..d48c7af10 100644
--- a/libkonq/konq_settings.cc
+++ b/libkonq/konq_settings.cc
@@ -25,7 +25,7 @@
#include <kdesktopfile.h>
#include <kdebug.h>
#include <assert.h>
-#include <qfontmetrics.h>
+#include <tqfontmetrics.h>
struct KonqFMSettingsPrivate
{
@@ -90,7 +90,7 @@ void KonqFMSettings::init( KConfig * config )
d->m_iconTextWidth = config->readNumEntry( "TextWidth", DEFAULT_TEXTWIDTH );
if ( d->m_iconTextWidth == DEFAULT_TEXTWIDTH )
- d->m_iconTextWidth = QFontMetrics(m_standardFont).width("0000000000");
+ d->m_iconTextWidth = TQFontMetrics(m_standardFont).width("0000000000");
m_iconTextHeight = config->readNumEntry( "TextHeight", 0 );
if ( m_iconTextHeight == 0 ) {
@@ -119,11 +119,11 @@ void KonqFMSettings::init( KConfig * config )
m_embedMap = config->entryMap( "EmbedSettings" );
- /// true if QString::localeAwareCompare is case sensitive (it usually isn't, when LC_COLLATE is set)
- d->localeAwareCompareIsCaseSensitive = QString( "a" ).localeAwareCompare( "B" ) > 0; // see #40131
+ /// true if TQString::localeAwareCompare is case sensitive (it usually isn't, when LC_COLLATE is set)
+ d->localeAwareCompareIsCaseSensitive = TQString( "a" ).localeAwareCompare( "B" ) > 0; // see #40131
}
-bool KonqFMSettings::shouldEmbed( const QString & serviceType ) const
+bool KonqFMSettings::shouldEmbed( const TQString & serviceType ) const
{
// First check in user's settings whether to embed or not
// 1 - in the mimetype file itself
@@ -132,7 +132,7 @@ bool KonqFMSettings::shouldEmbed( const QString & serviceType ) const
if ( serviceTypePtr )
{
hasLocalProtocolRedirect = !serviceTypePtr->property( "X-KDE-LocalProtocol" ).toString().isEmpty();
- QVariant autoEmbedProp = serviceTypePtr->property( "X-KDE-AutoEmbed" );
+ TQVariant autoEmbedProp = serviceTypePtr->property( "X-KDE-AutoEmbed" );
if ( autoEmbedProp.isValid() )
{
bool autoEmbed = autoEmbedProp.toBool();
@@ -142,14 +142,14 @@ bool KonqFMSettings::shouldEmbed( const QString & serviceType ) const
kdDebug(1203) << "No X-KDE-AutoEmbed, looking for group" << endl;
}
// 2 - in the configuration for the group if nothing was found in the mimetype
- QString serviceTypeGroup = serviceType.left(serviceType.find("/"));
+ TQString serviceTypeGroup = serviceType.left(serviceType.find("/"));
kdDebug(1203) << "KonqFMSettings::shouldEmbed : serviceTypeGroup=" << serviceTypeGroup << endl;
if ( serviceTypeGroup == "inode" || serviceTypeGroup == "Browser" || serviceTypeGroup == "Konqueror" )
return true; //always embed mimetype inode/*, Browser/* and Konqueror/*
- QMap<QString, QString>::ConstIterator it = m_embedMap.find( QString::fromLatin1("embed-")+serviceTypeGroup );
+ TQMap<TQString, TQString>::ConstIterator it = m_embedMap.find( TQString::fromLatin1("embed-")+serviceTypeGroup );
if ( it != m_embedMap.end() ) {
kdDebug(1203) << "KonqFMSettings::shouldEmbed: " << it.data() << endl;
- return it.data() == QString::fromLatin1("true");
+ return it.data() == TQString::fromLatin1("true");
}
// 3 - if no config found, use default.
// Note: if you change those defaults, also change kcontrol/filetypes/typeslistitem.cpp !
@@ -169,12 +169,12 @@ bool KonqFMSettings::renameIconDirectly() const
return d->m_renameIconDirectly;
}
-int KonqFMSettings::caseSensitiveCompare( const QString& a, const QString& b ) const
+int KonqFMSettings::caseSensitiveCompare( const TQString& a, const TQString& b ) const
{
if ( d->localeAwareCompareIsCaseSensitive ) {
return a.localeAwareCompare( b );
}
- else // can't use localeAwareCompare, have to fallback to normal QString compare
+ else // can't use localeAwareCompare, have to fallback to normal TQString compare
return a.compare( b );
}
diff --git a/libkonq/konq_settings.h b/libkonq/konq_settings.h
index 8f3d981fc..365e03fc9 100644
--- a/libkonq/konq_settings.h
+++ b/libkonq/konq_settings.h
@@ -21,10 +21,10 @@
#define __konq_settings_h__
class KConfig;
-#include <qcolor.h>
-#include <qstring.h>
-#include <qfont.h>
-#include <qmap.h>
+#include <tqcolor.h>
+#include <tqstring.h>
+#include <tqfont.h>
+#include <tqmap.h>
#include <libkonq_export.h>
@@ -72,7 +72,7 @@ public:
// Use settings (and mimetype definition files)
// to find whether to embed a certain service type or not
// Only makes sense in konqueror.
- bool shouldEmbed( const QString & serviceType ) const;
+ bool shouldEmbed( const TQString & serviceType ) const;
// Behaviour settings
bool wordWrapText() const { return m_bWordWrapText; }
@@ -81,7 +81,7 @@ public:
bool underlineLink() const { return m_underlineLink; }
bool fileSizeInBytes() const { return m_fileSizeInBytes; }
bool alwaysNewWin() const { return m_alwaysNewWin; }
- const QString & homeURL() const { return m_homeURL; }
+ const TQString & homeURL() const { return m_homeURL; }
bool showFileTips() const {return m_showFileTips; }
bool showPreviewsInFileTips() const;
@@ -89,16 +89,16 @@ public:
bool renameIconDirectly() const;
// Font settings
- const QFont& standardFont() const { return m_standardFont; }
+ const TQFont& standardFont() const { return m_standardFont; }
// Color settings
- const QColor& normalTextColor() const { return m_normalTextColor; }
- const QColor& highlightedTextColor() const { return m_highlightedTextColor; }
- const QColor& itemTextBackground() const { return m_itemTextBackground; }
+ const TQColor& normalTextColor() const { return m_normalTextColor; }
+ const TQColor& highlightedTextColor() const { return m_highlightedTextColor; }
+ const TQColor& itemTextBackground() const { return m_itemTextBackground; }
int textPreviewIconTransparency() const { return m_iconTransparency; }
- int caseSensitiveCompare( const QString& a, const QString& b ) const;
+ int caseSensitiveCompare( const TQString& a, const TQString& b ) const;
private:
@@ -109,18 +109,18 @@ private:
bool m_alwaysNewWin;
bool m_bTreeFollow;
- QMap<QString, QString> m_embedMap;
+ TQMap<TQString, TQString> m_embedMap;
- QFont m_standardFont;
+ TQFont m_standardFont;
- QColor m_normalTextColor;
- QColor m_highlightedTextColor;
- QColor m_itemTextBackground;
+ TQColor m_normalTextColor;
+ TQColor m_highlightedTextColor;
+ TQColor m_itemTextBackground;
bool m_bWordWrapText;
int m_iconTextHeight;
- QString m_homeURL;
+ TQString m_homeURL;
bool m_showFileTips;
int m_numFileTips;
diff --git a/libkonq/konq_sound.cc b/libkonq/konq_sound.cc
index c609df553..577dd5dc4 100644
--- a/libkonq/konq_sound.cc
+++ b/libkonq/konq_sound.cc
@@ -31,13 +31,13 @@ public:
KonqSoundPlayerImpl();
virtual ~KonqSoundPlayerImpl();
- virtual const QStringList &mimeTypes();
- virtual void play(const QString &fileName);
+ virtual const TQStringList &mimeTypes();
+ virtual void play(const TQString &fileName);
virtual void stop();
virtual bool isPlaying();
private:
- QStringList m_mimeTypes;
+ TQStringList m_mimeTypes;
KArtsDispatcher m_dispatcher;
Arts::SoundServerV2 m_soundServer;
@@ -58,7 +58,7 @@ KonqSoundPlayerImpl::~KonqSoundPlayerImpl()
delete m_factory;
}
-const QStringList &KonqSoundPlayerImpl::mimeTypes()
+const TQStringList &KonqSoundPlayerImpl::mimeTypes()
{
if (m_mimeTypes.isEmpty())
{
@@ -80,7 +80,7 @@ const QStringList &KonqSoundPlayerImpl::mimeTypes()
return m_mimeTypes;
}
-void KonqSoundPlayerImpl::play(const QString &fileName)
+void KonqSoundPlayerImpl::play(const TQString &fileName)
{
if (m_soundServer.isNull())
return;
@@ -109,17 +109,17 @@ bool KonqSoundPlayerImpl::isPlaying()
class KonqSoundFactory : public KLibFactory
{
public:
- KonqSoundFactory(QObject *parent = 0, const char *name = 0)
+ KonqSoundFactory(TQObject *parent = 0, const char *name = 0)
: KLibFactory(parent, name) {};
virtual ~KonqSoundFactory() {};
protected:
- virtual QObject *createObject(QObject * = 0, const char * = 0,
- const char *className = "QObject", const QStringList &args = QStringList());
+ virtual TQObject *createObject(TQObject * = 0, const char * = 0,
+ const char *className = "TQObject", const TQStringList &args = TQStringList());
};
-QObject *KonqSoundFactory::createObject(QObject *, const char *,
- const char *className, const QStringList &)
+TQObject *KonqSoundFactory::createObject(TQObject *, const char *,
+ const char *className, const TQStringList &)
{
if (qstrcmp(className, "KonqSoundPlayer") == 0)
return new KonqSoundPlayerImpl();
diff --git a/libkonq/konq_sound.h b/libkonq/konq_sound.h
index 78fcc968b..32bddc40f 100644
--- a/libkonq/konq_sound.h
+++ b/libkonq/konq_sound.h
@@ -24,8 +24,8 @@
class KonqSoundPlayer : public QObject
{
public:
- virtual const QStringList &mimeTypes() = 0;
- virtual void play(const QString &fileName) = 0;
+ virtual const TQStringList &mimeTypes() = 0;
+ virtual void play(const TQString &fileName) = 0;
virtual void stop() = 0;
virtual bool isPlaying() = 0;
};
diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cc
index 7f8d1a4c6..91eece83b 100644
--- a/libkonq/konq_undo.cc
+++ b/libkonq/konq_undo.cc
@@ -86,21 +86,21 @@ public:
};
KonqCommandRecorder::KonqCommandRecorder( KonqCommand::Type op, const KURL::List &src, const KURL &dst, KIO::Job *job )
- : QObject( job, "konqcmdrecorder" )
+ : TQObject( job, "konqcmdrecorder" )
{
d = new KonqCommandRecorderPrivate;
d->m_cmd.m_type = op;
d->m_cmd.m_valid = true;
d->m_cmd.m_src = src;
d->m_cmd.m_dst = dst;
- connect( job, SIGNAL( result( KIO::Job * ) ),
- this, SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
+ this, TQT_SLOT( slotResult( KIO::Job * ) ) );
if ( op != KonqCommand::MKDIR ) {
- connect( job, SIGNAL( copyingDone( KIO::Job *, const KURL &, const KURL &, bool, bool ) ),
- this, SLOT( slotCopyingDone( KIO::Job *, const KURL &, const KURL &, bool, bool ) ) );
- connect( job, SIGNAL( copyingLinkDone( KIO::Job *, const KURL &, const QString &, const KURL & ) ),
- this, SLOT( slotCopyingLinkDone( KIO::Job *, const KURL &, const QString &, const KURL & ) ) );
+ connect( job, TQT_SIGNAL( copyingDone( KIO::Job *, const KURL &, const KURL &, bool, bool ) ),
+ this, TQT_SLOT( slotCopyingDone( KIO::Job *, const KURL &, const KURL &, bool, bool ) ) );
+ connect( job, TQT_SIGNAL( copyingLinkDone( KIO::Job *, const KURL &, const TQString &, const KURL & ) ),
+ this, TQT_SLOT( slotCopyingLinkDone( KIO::Job *, const KURL &, const TQString &, const KURL & ) ) );
}
KonqUndoManager::incRef();
@@ -134,8 +134,8 @@ void KonqCommandRecorder::slotCopyingDone( KIO::Job *job, const KURL &from, cons
{
Q_ASSERT( from.isLocalFile() );
Q_ASSERT( to.protocol() == "trash" );
- QMap<QString, QString> metaData = job->metaData();
- QMap<QString, QString>::ConstIterator it = metaData.find( "trashURL-" + from.path() );
+ TQMap<TQString, TQString> metaData = job->metaData();
+ TQMap<TQString, TQString>::ConstIterator it = metaData.find( "trashURL-" + from.path() );
if ( it != metaData.end() ) {
// Update URL
op.m_dst = it.data();
@@ -145,7 +145,7 @@ void KonqCommandRecorder::slotCopyingDone( KIO::Job *job, const KURL &from, cons
d->m_cmd.m_opStack.prepend( op );
}
-void KonqCommandRecorder::slotCopyingLinkDone( KIO::Job *, const KURL &from, const QString &target, const KURL &to )
+void KonqCommandRecorder::slotCopyingLinkDone( KIO::Job *, const KURL &from, const TQString &target, const KURL &to )
{
KonqBasicOperation op;
op.m_valid = true;
@@ -181,10 +181,10 @@ public:
KonqCommand m_current;
KIO::Job *m_currentJob;
UndoState m_undoState;
- QValueStack<KURL> m_dirStack;
- QValueStack<KURL> m_dirCleanupStack;
- QValueStack<KURL> m_fileCleanupStack;
- QValueList<KURL> m_dirsToUpdate;
+ TQValueStack<KURL> m_dirStack;
+ TQValueStack<KURL> m_dirCleanupStack;
+ TQValueStack<KURL> m_fileCleanupStack;
+ TQValueList<KURL> m_dirsToUpdate;
bool m_lock;
@@ -247,7 +247,7 @@ bool KonqUndoManager::undoAvailable() const
return ( d->m_commands.count() > 0 ) && !d->m_lock;
}
-QString KonqUndoManager::undoText() const
+TQString KonqUndoManager::undoText() const
{
if ( d->m_commands.count() == 0 )
return i18n( "Und&o" );
@@ -266,7 +266,7 @@ QString KonqUndoManager::undoText() const
else
assert( false );
/* NOTREACHED */
- return QString::null;
+ return TQString::null;
}
void KonqUndoManager::undo()
@@ -276,11 +276,11 @@ void KonqUndoManager::undo()
d->m_current = cmd;
- QValueList<KonqBasicOperation>& opStack = d->m_current.m_opStack;
+ TQValueList<KonqBasicOperation>& opStack = d->m_current.m_opStack;
// Let's first ask for confirmation if we need to delete any file (#99898)
KURL::List fileCleanupStack;
- QValueList<KonqBasicOperation>::Iterator it = opStack.begin();
+ TQValueList<KonqBasicOperation>::Iterator it = opStack.begin();
for ( ; it != opStack.end() ; ++it ) {
if ( !(*it).m_directory && !(*it).m_link && d->m_current.m_type == KonqCommand::COPY ) {
fileCleanupStack.append( (*it).m_dst );
@@ -304,7 +304,7 @@ void KonqUndoManager::undo()
broadcastLock();
it = opStack.begin();
- QValueList<KonqBasicOperation>::Iterator end = opStack.end();
+ TQValueList<KonqBasicOperation>::Iterator end = opStack.end();
while ( it != end )
{
if ( (*it).m_directory && !(*it).m_renamed )
@@ -411,8 +411,8 @@ void KonqUndoManager::undoStep()
undoRemovingDirectories();
if ( d->m_currentJob )
- connect( d->m_currentJob, SIGNAL( result( KIO::Job * ) ),
- this, SLOT( slotResult( KIO::Job * ) ) );
+ connect( d->m_currentJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ this, TQT_SLOT( slotResult( KIO::Job * ) ) );
}
void KonqUndoManager::undoMakingDirectories()
@@ -523,7 +523,7 @@ void KonqUndoManager::undoRemovingDirectories()
d->m_undoJob = 0;
}
KDirNotify_stub allDirNotify( "*", "KDirNotify*" );
- QValueList<KURL>::ConstIterator it = d->m_dirsToUpdate.begin();
+ TQValueList<KURL>::ConstIterator it = d->m_dirsToUpdate.begin();
for( ; it != d->m_dirsToUpdate.end(); ++it ) {
kdDebug() << "Notifying FilesAdded for " << *it << endl;
allDirNotify.FilesAdded( *it );
@@ -637,26 +637,26 @@ bool KonqUndoManager::initializeFromKDesky()
return true;
}
-QDataStream &operator<<( QDataStream &stream, const KonqBasicOperation &op )
+TQDataStream &operator<<( TQDataStream &stream, const KonqBasicOperation &op )
{
stream << op.m_valid << op.m_directory << op.m_renamed << op.m_link
<< op.m_src << op.m_dst << op.m_target;
return stream;
}
-QDataStream &operator>>( QDataStream &stream, KonqBasicOperation &op )
+TQDataStream &operator>>( TQDataStream &stream, KonqBasicOperation &op )
{
stream >> op.m_valid >> op.m_directory >> op.m_renamed >> op.m_link
>> op.m_src >> op.m_dst >> op.m_target;
return stream;
}
-QDataStream &operator<<( QDataStream &stream, const KonqCommand &cmd )
+TQDataStream &operator<<( TQDataStream &stream, const KonqCommand &cmd )
{
stream << cmd.m_valid << (Q_INT8)cmd.m_type << cmd.m_opStack << cmd.m_src << cmd.m_dst;
return stream;
}
-QDataStream &operator>>( QDataStream &stream, KonqCommand &cmd )
+TQDataStream &operator>>( TQDataStream &stream, KonqCommand &cmd )
{
Q_INT8 type;
stream >> cmd.m_valid >> type >> cmd.m_opStack >> cmd.m_src >> cmd.m_dst;
diff --git a/libkonq/konq_undo.h b/libkonq/konq_undo.h
index fae2b5e61..3e704a8d2 100644
--- a/libkonq/konq_undo.h
+++ b/libkonq/konq_undo.h
@@ -19,9 +19,9 @@
#ifndef __konq_undo_h__
#define __konq_undo_h__
-#include <qobject.h>
-#include <qstring.h>
-#include <qvaluestack.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqvaluestack.h>
#include <dcopobject.h>
@@ -37,7 +37,7 @@ class KonqUndoJob;
struct KonqBasicOperation
{
- typedef QValueStack<KonqBasicOperation> Stack;
+ typedef TQValueStack<KonqBasicOperation> Stack;
KonqBasicOperation()
{ m_valid = false; }
@@ -48,12 +48,12 @@ struct KonqBasicOperation
bool m_link;
KURL m_src;
KURL m_dst;
- QString m_target;
+ TQString m_target;
};
struct KonqCommand
{
- typedef QValueStack<KonqCommand> Stack;
+ typedef TQValueStack<KonqCommand> Stack;
enum Type { COPY, MOVE, LINK, MKDIR, TRASH };
@@ -79,14 +79,14 @@ private slots:
void slotResult( KIO::Job *job );
void slotCopyingDone( KIO::Job *, const KURL &from, const KURL &to, bool directory, bool renamed );
- void slotCopyingLinkDone( KIO::Job *, const KURL &from, const QString &target, const KURL &to );
+ void slotCopyingLinkDone( KIO::Job *, const KURL &from, const TQString &target, const KURL &to );
private:
class KonqCommandRecorderPrivate;
KonqCommandRecorderPrivate *d;
};
-class LIBKONQ_EXPORT KonqUndoManager : public QObject, public DCOPObject
+class LIBKONQ_EXPORT KonqUndoManager : public TQObject, public DCOPObject
{
Q_OBJECT
K_DCOP
@@ -104,14 +104,14 @@ public:
void addCommand( const KonqCommand &cmd );
bool undoAvailable() const;
- QString undoText() const;
+ TQString undoText() const;
public slots:
void undo();
signals:
void undoAvailable( bool avail );
- void undoTextChanged( const QString &text );
+ void undoTextChanged( const TQString &text );
protected:
/**
@@ -153,10 +153,10 @@ private:
static unsigned long s_refCnt;
};
-QDataStream &operator<<( QDataStream &stream, const KonqBasicOperation &op );
-QDataStream &operator>>( QDataStream &stream, KonqBasicOperation &op );
+TQDataStream &operator<<( TQDataStream &stream, const KonqBasicOperation &op );
+TQDataStream &operator>>( TQDataStream &stream, KonqBasicOperation &op );
-QDataStream &operator<<( QDataStream &stream, const KonqCommand &cmd );
-QDataStream &operator>>( QDataStream &stream, KonqCommand &cmd );
+TQDataStream &operator<<( TQDataStream &stream, const KonqCommand &cmd );
+TQDataStream &operator>>( TQDataStream &stream, KonqCommand &cmd );
#endif
diff --git a/libkonq/konq_xmlguiclient.cc b/libkonq/konq_xmlguiclient.cc
index 7737acd7c..5561ced8e 100644
--- a/libkonq/konq_xmlguiclient.cc
+++ b/libkonq/konq_xmlguiclient.cc
@@ -27,7 +27,7 @@ class KonqXMLGUIClient::Private
{
public:
Private() : attrName( "name" ), separatorPending( false ), hasAction( false ) {}
- QString attrName;
+ TQString attrName;
bool separatorPending;
bool hasAction;
};
@@ -46,9 +46,9 @@ KonqXMLGUIClient::KonqXMLGUIClient( KXMLGUIClient *parent ) : KXMLGUIClient(pare
void KonqXMLGUIClient::prepareXMLGUIStuff()
{
- m_doc = QDomDocument( "kpartgui" );
+ m_doc = TQDomDocument( "kpartgui" );
- QDomElement root = m_doc.createElement( "kpartgui" );
+ TQDomElement root = m_doc.createElement( "kpartgui" );
m_doc.appendChild( root );
root.setAttribute( d->attrName, "popupmenu" );
@@ -60,45 +60,45 @@ void KonqXMLGUIClient::prepareXMLGUIStuff()
m_factory = new KXMLGUIFactory( m_builder ); */
}
-QDomElement KonqXMLGUIClient::DomElement() const
+TQDomElement KonqXMLGUIClient::DomElement() const
{
return m_menuElement;
}
-QDomDocument KonqXMLGUIClient::domDocument() const
+TQDomDocument KonqXMLGUIClient::domDocument() const
{
return m_doc;
}
-void KonqXMLGUIClient::addAction( KAction *act, const QDomElement &menu )
+void KonqXMLGUIClient::addAction( KAction *act, const TQDomElement &menu )
{
addAction( act->name(), menu );
}
-void KonqXMLGUIClient::addAction( const char *name, const QDomElement &menu )
+void KonqXMLGUIClient::addAction( const char *name, const TQDomElement &menu )
{
- static const QString& tagAction = KGlobal::staticQString( "action" );
+ static const TQString& tagAction = KGlobal::staticQString( "action" );
if (!kapp->authorizeKAction(name))
return;
handlePendingSeparator();
- QDomElement parent = menu;
+ TQDomElement parent = menu;
if ( parent.isNull() ) {
parent = m_menuElement;
}
- QDomElement e = m_doc.createElement( tagAction );
+ TQDomElement e = m_doc.createElement( tagAction );
parent.appendChild( e );
e.setAttribute( d->attrName, name );
d->hasAction = true;
}
-void KonqXMLGUIClient::addSeparator( const QDomElement &menu )
+void KonqXMLGUIClient::addSeparator( const TQDomElement &menu )
{
- static const QString& tagSeparator = KGlobal::staticQString( "separator" );
+ static const TQString& tagSeparator = KGlobal::staticQString( "separator" );
- QDomElement parent = menu;
+ TQDomElement parent = menu;
if ( parent.isNull() ) {
parent = m_menuElement;
}
@@ -110,24 +110,24 @@ void KonqXMLGUIClient::addSeparator( const QDomElement &menu )
//void KonqXMLGUIClient::addWeakSeparator()
//{
-// static const QString& tagWeakSeparator = KGlobal::staticQString( "weakSeparator" );
+// static const TQString& tagWeakSeparator = KGlobal::staticQString( "weakSeparator" );
// m_menuElement.appendChild( m_doc.createElement( tagWeakSeparator ) );
//}
-void KonqXMLGUIClient::addMerge( const QString &name )
+void KonqXMLGUIClient::addMerge( const TQString &name )
{
// can't call handlePendingSeparator. Merge could be empty
// (testcase: RMB in embedded katepart)
- QDomElement merge = m_doc.createElement( "merge" );
+ TQDomElement merge = m_doc.createElement( "merge" );
m_menuElement.appendChild( merge );
if ( !name.isEmpty() )
merge.setAttribute( d->attrName, name );
}
-void KonqXMLGUIClient::addGroup( const QString &grp )
+void KonqXMLGUIClient::addGroup( const TQString &grp )
{
handlePendingSeparator();
- QDomElement group = m_doc.createElement( "definegroup" );
+ TQDomElement group = m_doc.createElement( "definegroup" );
m_menuElement.appendChild( group );
group.setAttribute( d->attrName, grp );
}
diff --git a/libkonq/konq_xmlguiclient.h b/libkonq/konq_xmlguiclient.h
index 175d991c7..772554dd2 100644
--- a/libkonq/konq_xmlguiclient.h
+++ b/libkonq/konq_xmlguiclient.h
@@ -24,7 +24,7 @@
#include <kaction.h>
#include <kxmlguiclient.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include <libkonq_export.h>
/**
@@ -40,26 +40,26 @@ public:
/**
* Reimplemented for internal purpose
*/
- QDomDocument domDocument( ) const;
+ TQDomDocument domDocument( ) const;
- QDomElement DomElement( ) const; // KDE4: s/D/d/
+ TQDomElement DomElement( ) const; // KDE4: s/D/d/
protected:
- void addAction( KAction *action, const QDomElement &menu = QDomElement() );
- void addAction( const char *name, const QDomElement &menu = QDomElement() );
- void addSeparator( const QDomElement &menu = QDomElement() );
+ void addAction( KAction *action, const TQDomElement &menu = TQDomElement() );
+ void addAction( const char *name, const TQDomElement &menu = TQDomElement() );
+ void addSeparator( const TQDomElement &menu = TQDomElement() );
/// only add a separator if an action is added afterwards
void addPendingSeparator();
- void addGroup( const QString &grp );
- void addMerge( const QString &name );
+ void addGroup( const TQString &grp );
+ void addMerge( const TQString &name );
// @return true if addAction was called at least once
bool hasAction() const;
void prepareXMLGUIStuff();
// KDE4: make private
- QDomElement m_menuElement;
- QDomDocument m_doc;
+ TQDomElement m_menuElement;
+ TQDomDocument m_doc;
private:
void handlePendingSeparator();
diff --git a/libkonq/konqbookmarkmanager.h b/libkonq/konqbookmarkmanager.h
index 5fb45f3e6..9774d92e9 100644
--- a/libkonq/konqbookmarkmanager.h
+++ b/libkonq/konqbookmarkmanager.h
@@ -11,7 +11,7 @@ public:
static KBookmarkManager * self() {
if ( !s_bookmarkManager )
{
- QString bookmarksFile = locateLocal("data", QString::fromLatin1("konqueror/bookmarks.xml"));
+ TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
}
return s_bookmarkManager;
diff --git a/libkonq/libkonq_export.h b/libkonq/libkonq_export.h
index 88192c0c4..4e10a4ec0 100644
--- a/libkonq/libkonq_export.h
+++ b/libkonq/libkonq_export.h
@@ -25,7 +25,7 @@
#include <kdemacros.h>
/* needed, because e.g. Q_OS_UNIX is so frequently used */
-#include <qglobal.h>
+#include <tqglobal.h>
#ifdef Q_WS_WIN
diff --git a/libkonq/tests/konqdragtest.cpp b/libkonq/tests/konqdragtest.cpp
index ad03b21fc..43d1a28df 100644
--- a/libkonq/tests/konqdragtest.cpp
+++ b/libkonq/tests/konqdragtest.cpp
@@ -20,7 +20,7 @@
#include <kdebug.h>
#include <kurldrag.h>
#include <assert.h>
-#include <qiconview.h>
+#include <tqiconview.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
@@ -36,8 +36,8 @@ void testKonqIconDrag2()
KURL mediaURL = "media:/hda1/tmp/Mat%C3%A9riel";
KURL localURL = "file:///tmp/Mat%C3%A9riel";
KonqIconDrag2 iconDrag( 0 );
- QIconDragItem item;
- iconDrag.append( item, QRect( 1, 2, 3, 4 ), QRect( 5, 6, 7, 8 ),
+ TQIconDragItem item;
+ iconDrag.append( item, TQRect( 1, 2, 3, 4 ), TQRect( 5, 6, 7, 8 ),
mediaURL.url(), localURL.url() );
diff --git a/nsplugins/NSPluginCallbackIface.h b/nsplugins/NSPluginCallbackIface.h
index 5c74bdd7b..33e9f85c3 100644
--- a/nsplugins/NSPluginCallbackIface.h
+++ b/nsplugins/NSPluginCallbackIface.h
@@ -24,7 +24,7 @@
#define __NSPluginCallbackIface_h__
-#include <qcstring.h>
+#include <tqcstring.h>
#include <dcopobject.h>
@@ -34,10 +34,10 @@ class NSPluginCallbackIface : virtual public DCOPObject
k_dcop:
- virtual ASYNC requestURL(QString url, QString target) = 0;
- virtual ASYNC postURL(QString url, QString target, QByteArray data, QString mime) = 0;
- virtual ASYNC statusMessage( QString msg ) = 0;
- virtual ASYNC evalJavaScript( Q_INT32 id, QString script ) = 0;
+ virtual ASYNC requestURL(TQString url, TQString target) = 0;
+ virtual ASYNC postURL(TQString url, TQString target, TQByteArray data, TQString mime) = 0;
+ virtual ASYNC statusMessage( TQString msg ) = 0;
+ virtual ASYNC evalJavaScript( Q_INT32 id, TQString script ) = 0;
};
diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp
index 0e5c88e6c..dbb5cb1af 100644
--- a/nsplugins/kcm_nsplugins.cpp
+++ b/nsplugins/kcm_nsplugins.cpp
@@ -20,16 +20,16 @@
#include <stdio.h>
#include <unistd.h>
-#include <qregexp.h>
-#include <qlayout.h>
+#include <tqregexp.h>
+#include <tqlayout.h>
#include <kstandarddirs.h>
#include <klocale.h>
#include <kiconloader.h>
#include <kfiledialog.h>
#include <kurlrequester.h>
-#include <qwhatsthis.h>
-#include <qvgroupbox.h>
+#include <tqwhatsthis.h>
+#include <tqvgroupbox.h>
#include <kdebug.h>
#include <kapplication.h>
@@ -38,38 +38,38 @@
#include "plugin_paths.h"
-static QDateTime lastChanged( QString dir )
+static TQDateTime lastChanged( TQString dir )
{
- QDateTime t = QFileInfo( dir ).lastModified();
+ TQDateTime t = TQFileInfo( dir ).lastModified();
if( t.isNull())
return t;
- QStringList subdirs = QDir( dir ).entryList();
- for( QStringList::ConstIterator it = subdirs.begin();
+ TQStringList subdirs = TQDir( dir ).entryList();
+ for( TQStringList::ConstIterator it = subdirs.begin();
it != subdirs.end();
++it )
{
if( *it == "." || *it == ".." )
continue;
- QDateTime t2 = lastChanged( *it );
+ TQDateTime t2 = lastChanged( *it );
if( !t2.isNull() && t2 > t )
t = t2;
}
return t;
}
-static bool checkSearchPathTimestamps( QStringList paths, QStringList timestamps )
+static bool checkSearchPathTimestamps( TQStringList paths, TQStringList timestamps )
{
- QStringList currentTimestamps;
+ TQStringList currentTimestamps;
bool changed = false;
- QStringList::ConstIterator t = timestamps.begin();
- for( QStringList::ConstIterator it = paths.begin();
+ TQStringList::ConstIterator t = timestamps.begin();
+ for( TQStringList::ConstIterator it = paths.begin();
it != paths.end();
++it, ++t )
{
- QDateTime current = lastChanged( *it );
+ TQDateTime current = lastChanged( *it );
// store non-existent directory as "N" string rather than empty string, KConfig
// has a bug with storing a list of empty items
- if( *t == "N" ? !current.isNull() : current != QDateTime::fromString( *t, Qt::ISODate ))
+ if( *t == "N" ? !current.isNull() : current != TQDateTime::fromString( *t, Qt::ISODate ))
changed = true;
currentTimestamps.append( current.isNull() ? "N" : current.toString( Qt::ISODate ));
}
@@ -98,9 +98,9 @@ extern "C"
// check if plugins have changed, as just ignoring everything and requiring the user
// to trigger the check manually is not reasonable - that probably actually obsoletes
// both options
- QStringList searchPaths = getSearchPaths();
- QStringList lastSearchPaths = config->readListEntry( "lastSearchPaths" );
- QStringList lastTimestamps = config->readListEntry ( "lastSearchTimestamps" );
+ TQStringList searchPaths = getSearchPaths();
+ TQStringList lastSearchPaths = config->readListEntry( "lastSearchPaths" );
+ TQStringList lastTimestamps = config->readListEntry ( "lastSearchTimestamps" );
if( searchPaths != lastSearchPaths || lastTimestamps.count() != lastSearchPaths.count())
{ // count changed, set empty timestamps, still call checkSearchPathTimestamps()
// in order to save the current timestamps for the next time
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index 91afa150d..e9c502169 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -24,7 +24,7 @@
*/
-#include <qdir.h>
+#include <tqdir.h>
#include <kapplication.h>
@@ -36,13 +36,13 @@
#include <kconfig.h>
#include <dcopclient.h>
#include <dcopstub.h>
-#include <qlayout.h>
-#include <qobject.h>
-#include <qpushbutton.h>
+#include <tqlayout.h>
+#include <tqobject.h>
+#include <tqpushbutton.h>
#include <qxembed.h>
-#include <qtextstream.h>
-#include <qtimer.h>
-#include <qregexp.h>
+#include <tqtextstream.h>
+#include <tqtimer.h>
+#include <tqregexp.h>
#include "nspluginloader.h"
#include "nspluginloader.moc"
@@ -55,21 +55,21 @@ NSPluginLoader *NSPluginLoader::s_instance = 0;
int NSPluginLoader::s_refCount = 0;
-NSPluginInstance::NSPluginInstance(QWidget *parent)
+NSPluginInstance::NSPluginInstance(TQWidget *parent)
: EMBEDCLASS(parent), _loader( NULL ), shown( false ), inited( false ), resize_count( 0 ), stub( NULL )
{
}
-void NSPluginInstance::init(const QCString& app, const QCString& obj)
+void NSPluginInstance::init(const TQCString& app, const TQCString& obj)
{
stub = new NSPluginInstanceIface_stub( app, obj );
- QGridLayout *_layout = new QGridLayout(this, 1, 1);
+ TQGridLayout *_layout = new TQGridLayout(this, 1, 1);
KConfig cfg("kcmnspluginrc", false);
cfg.setGroup("Misc");
if (cfg.readBoolEntry("demandLoad", false)) {
- _button = new QPushButton(i18n("Start Plugin"), dynamic_cast<EMBEDCLASS*>(this));
+ _button = new TQPushButton(i18n("Start Plugin"), dynamic_cast<EMBEDCLASS*>(this));
_layout->addWidget(_button, 0, 0);
- connect(_button, SIGNAL(clicked()), this, SLOT(loadPlugin()));
+ connect(_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadPlugin()));
show();
} else {
_button = 0L;
@@ -80,7 +80,7 @@ void NSPluginInstance::init(const QCString& app, const QCString& obj)
// and use 'resize_count' to wait for that one more resize to come (plus a timer
// for a possible timeout). Only then flash is actually initialized ('inited' is true).
resize_count = 1;
- QTimer::singleShot( 1000, this, SLOT( doLoadPlugin()));
+ TQTimer::singleShot( 1000, this, TQT_SLOT( doLoadPlugin()));
}
}
@@ -94,7 +94,7 @@ void NSPluginInstance::loadPlugin()
void NSPluginInstance::doLoadPlugin() {
if (!inited && !_button) {
_loader = NSPluginLoader::instance();
- setBackgroundMode(QWidget::NoBackground);
+ setBackgroundMode(TQWidget::NoBackground);
WId winid = stub->winId();
if( winid != 0 ) {
setProtocol(QXEmbed::XPLAIN);
@@ -127,7 +127,7 @@ NSPluginInstance::~NSPluginInstance()
void NSPluginInstance::windowChanged(WId w)
{
- setBackgroundMode(w == 0 ? QWidget::PaletteBackground : QWidget::NoBackground);
+ setBackgroundMode(w == 0 ? TQWidget::PaletteBackground : TQWidget::NoBackground);
if (w == 0) {
// FIXME: Put a notice here to tell the user that it crashed.
repaint();
@@ -135,7 +135,7 @@ void NSPluginInstance::windowChanged(WId w)
}
-void NSPluginInstance::resizeEvent(QResizeEvent *event)
+void NSPluginInstance::resizeEvent(TQResizeEvent *event)
{
if (shown == false) // ignore all resizes before being shown
return;
@@ -152,7 +152,7 @@ void NSPluginInstance::resizeEvent(QResizeEvent *event)
kdDebug() << "NSPluginInstance(client)::resizeEvent" << endl;
}
-void NSPluginInstance::showEvent(QShowEvent *event)
+void NSPluginInstance::showEvent(TQShowEvent *event)
{
EMBEDCLASS::showEvent(event);
shown = true;
@@ -162,12 +162,12 @@ void NSPluginInstance::showEvent(QShowEvent *event)
resizePlugin(width(), height());
}
-void NSPluginInstance::focusInEvent( QFocusEvent* event )
+void NSPluginInstance::focusInEvent( TQFocusEvent* event )
{
stub->gotFocusIn();
}
-void NSPluginInstance::focusOutEvent( QFocusEvent* event )
+void NSPluginInstance::focusOutEvent( TQFocusEvent* event )
{
stub->gotFocusOut();
}
@@ -194,7 +194,7 @@ void NSPluginInstance::shutdown()
NSPluginLoader::NSPluginLoader()
- : QObject(), _mapping(7, false), _viewer(0)
+ : TQObject(), _mapping(7, false), _viewer(0)
{
scanPlugins();
_mapping.setAutoDelete( true );
@@ -202,9 +202,9 @@ NSPluginLoader::NSPluginLoader()
// trap dcop register events
kapp->dcopClient()->setNotifications(true);
- QObject::connect(kapp->dcopClient(),
- SIGNAL(applicationRegistered(const QCString&)),
- this, SLOT(applicationRegistered(const QCString&)));
+ TQObject::connect(kapp->dcopClient(),
+ TQT_SIGNAL(applicationRegistered(const TQCString&)),
+ this, TQT_SLOT(applicationRegistered(const TQCString&)));
// load configuration
KConfig cfg("kcmnspluginrc", false);
@@ -248,19 +248,19 @@ NSPluginLoader::~NSPluginLoader()
void NSPluginLoader::scanPlugins()
{
- QRegExp version(";version=[^:]*:");
+ TQRegExp version(";version=[^:]*:");
// open the cache file
- QFile cachef(locate("data", "nsplugins/cache"));
+ TQFile cachef(locate("data", "nsplugins/cache"));
if (!cachef.open(IO_ReadOnly)) {
kdDebug() << "Could not load plugin cache file!" << endl;
return;
}
- QTextStream cache(&cachef);
+ TQTextStream cache(&cachef);
// read in cache
- QString line, plugin;
+ TQString line, plugin;
while (!cache.atEnd()) {
line = cache.readLine();
if (line.isEmpty() || (line.left(1) == "#"))
@@ -272,20 +272,20 @@ void NSPluginLoader::scanPlugins()
continue;
}
- QStringList desc = QStringList::split(':', line, TRUE);
- QString mime = desc[0].stripWhiteSpace();
- QStringList suffixes = QStringList::split(',', desc[1].stripWhiteSpace());
+ TQStringList desc = TQStringList::split(':', line, TRUE);
+ TQString mime = desc[0].stripWhiteSpace();
+ TQStringList suffixes = TQStringList::split(',', desc[1].stripWhiteSpace());
if (!mime.isEmpty())
{
// insert the mimetype -> plugin mapping
- _mapping.insert(mime, new QString(plugin));
+ _mapping.insert(mime, new TQString(plugin));
// insert the suffix -> mimetype mapping
- QStringList::Iterator suffix;
+ TQStringList::Iterator suffix;
for (suffix = suffixes.begin(); suffix != suffixes.end(); ++suffix) {
// strip whitspaces and any preceding '.'
- QString stripped = (*suffix).stripWhiteSpace();
+ TQString stripped = (*suffix).stripWhiteSpace();
unsigned p=0;
for ( ; p<stripped.length() && stripped[p]=='.'; p++ );
@@ -293,30 +293,30 @@ void NSPluginLoader::scanPlugins()
// add filetype to list
if ( !stripped.isEmpty() && !_filetype.find(stripped) )
- _filetype.insert( stripped, new QString(mime));
+ _filetype.insert( stripped, new TQString(mime));
}
}
}
}
-QString NSPluginLoader::lookupMimeType(const QString &url)
+TQString NSPluginLoader::lookupMimeType(const TQString &url)
{
- QDictIterator<QString> dit2(_filetype);
+ TQDictIterator<TQString> dit2(_filetype);
while (dit2.current())
{
- QString ext = QString(".")+dit2.currentKey();
+ TQString ext = TQString(".")+dit2.currentKey();
if (url.right(ext.length()) == ext)
return *dit2.current();
++dit2;
}
- return QString::null;
+ return TQString::null;
}
-QString NSPluginLoader::lookup(const QString &mimeType)
+TQString NSPluginLoader::lookup(const TQString &mimeType)
{
- QString plugin;
+ TQString plugin;
if ( _mapping[mimeType] )
plugin = *_mapping[mimeType];
@@ -337,11 +337,11 @@ bool NSPluginLoader::loadViewer()
int pid = (int)getpid();
_dcopid.sprintf("nspluginviewer-%d", pid);
- connect( _process, SIGNAL(processExited(KProcess*)),
- this, SLOT(processTerminated(KProcess*)) );
+ connect( _process, TQT_SIGNAL(processExited(KProcess*)),
+ this, TQT_SLOT(processTerminated(KProcess*)) );
// find the external viewer process
- QString viewer = KGlobal::dirs()->findExe("nspluginviewer");
+ TQString viewer = KGlobal::dirs()->findExe("nspluginviewer");
if (!viewer)
{
kdDebug() << "can't find nspluginviewer" << endl;
@@ -352,7 +352,7 @@ bool NSPluginLoader::loadViewer()
// find the external artsdsp process
if( _useArtsdsp ) {
kdDebug() << "trying to use artsdsp" << endl;
- QString artsdsp = KGlobal::dirs()->findExe("artsdsp");
+ TQString artsdsp = KGlobal::dirs()->findExe("artsdsp");
if (!artsdsp)
{
kdDebug() << "can't find artsdsp" << endl;
@@ -429,7 +429,7 @@ void NSPluginLoader::unloadViewer()
}
-void NSPluginLoader::applicationRegistered( const QCString& appId )
+void NSPluginLoader::applicationRegistered( const TQCString& appId )
{
kdDebug() << "DCOP application " << appId.data() << " just registered!" << endl;
@@ -454,10 +454,10 @@ void NSPluginLoader::processTerminated(KProcess *proc)
}
-NSPluginInstance *NSPluginLoader::newInstance(QWidget *parent, QString url,
- QString mimeType, bool embed,
- QStringList argn, QStringList argv,
- QString appId, QString callbackId, bool reload, bool doPost, QByteArray postData)
+NSPluginInstance *NSPluginLoader::newInstance(TQWidget *parent, TQString url,
+ TQString mimeType, bool embed,
+ TQStringList argn, TQStringList argv,
+ TQString appId, TQString callbackId, bool reload, bool doPost, TQByteArray postData)
{
kdDebug() << "-> NSPluginLoader::NewInstance( parent=" << (void*)parent << ", url=" << url << ", mime=" << mimeType << ", ...)" << endl;
@@ -474,7 +474,7 @@ NSPluginInstance *NSPluginLoader::newInstance(QWidget *parent, QString url,
}
// check the mime type
- QString mime = mimeType;
+ TQString mime = mimeType;
if (mime.isEmpty())
{
mime = lookupMimeType( url );
@@ -488,7 +488,7 @@ NSPluginInstance *NSPluginLoader::newInstance(QWidget *parent, QString url,
}
// lookup plugin for mime type
- QString plugin_name = lookup(mime);
+ TQString plugin_name = lookup(mime);
if (plugin_name.isEmpty())
{
kdDebug() << "No suitable plugin" << endl;
diff --git a/nsplugins/nspluginloader.h b/nsplugins/nspluginloader.h
index fab3c1364..c8baa7f5a 100644
--- a/nsplugins/nspluginloader.h
+++ b/nsplugins/nspluginloader.h
@@ -28,11 +28,11 @@
#define __NS_PLUGINLOADER_H__
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qdict.h>
-#include <qobject.h>
-#include <qwidget.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqdict.h>
+#include <tqobject.h>
+#include <tqwidget.h>
#include <qxembed.h>
#include "NSPluginClassIface_stub.h"
@@ -48,28 +48,28 @@ class NSPluginInstance : public EMBEDCLASS
Q_OBJECT
public:
- NSPluginInstance(QWidget *parent);
- void init( const QCString& app, const QCString& obj );
+ NSPluginInstance(TQWidget *parent);
+ void init( const TQCString& app, const TQCString& obj );
~NSPluginInstance();
public: // wrappers
- void javascriptResult( int id, QString result ) { stub->javascriptResult( id, result ); }
+ void javascriptResult( int id, TQString result ) { stub->javascriptResult( id, result ); }
private slots:
void loadPlugin();
void doLoadPlugin();
protected:
- void resizeEvent(QResizeEvent *event);
- void showEvent (QShowEvent *);
+ void resizeEvent(TQResizeEvent *event);
+ void showEvent (TQShowEvent *);
void windowChanged(WId w);
- virtual void focusInEvent( QFocusEvent* event );
- virtual void focusOutEvent( QFocusEvent* event );
+ virtual void focusInEvent( TQFocusEvent* event );
+ virtual void focusOutEvent( TQFocusEvent* event );
class NSPluginLoader *_loader;
bool shown;
bool inited;
int resize_count;
- QPushButton *_button;
- QGridLayout *_layout;
+ TQPushButton *_button;
+ TQGridLayout *_layout;
NSPluginInstanceIface_stub* stub;
private: // wrappers
void displayPlugin();
@@ -86,11 +86,11 @@ public:
NSPluginLoader();
~NSPluginLoader();
- NSPluginInstance *newInstance(QWidget *parent,
- QString url, QString mimeType, bool embed,
- QStringList argn, QStringList argv,
- QString appId, QString callbackId, bool reload,
- bool doPost, QByteArray postData);
+ NSPluginInstance *newInstance(TQWidget *parent,
+ TQString url, TQString mimeType, bool embed,
+ TQStringList argn, TQStringList argv,
+ TQString appId, TQString callbackId, bool reload,
+ bool doPost, TQByteArray postData);
static NSPluginLoader *instance();
void release();
@@ -98,23 +98,23 @@ public:
protected:
void scanPlugins();
- QString lookup(const QString &mimeType);
- QString lookupMimeType(const QString &url);
+ TQString lookup(const TQString &mimeType);
+ TQString lookupMimeType(const TQString &url);
bool loadViewer();
void unloadViewer();
protected slots:
- void applicationRegistered( const QCString& appId );
+ void applicationRegistered( const TQCString& appId );
void processTerminated( KProcess *proc );
private:
- QStringList _searchPaths;
- QDict<QString> _mapping, _filetype;
+ TQStringList _searchPaths;
+ TQDict<TQString> _mapping, _filetype;
KProcess *_process;
bool _running;
- QCString _dcopid;
+ TQCString _dcopid;
NSPluginViewerIface_stub *_viewer;
bool _useArtsdsp;
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index 58dae2fc2..e7580db93 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -31,7 +31,7 @@
#include <kparts/browserinterface.h>
#include <kparts/browserextension.h>
-#include <qlabel.h>
+#include <tqlabel.h>
#include "nspluginloader.h"
#include "plugin_part.h"
@@ -57,7 +57,7 @@ PluginLiveConnectExtension::PluginLiveConnectExtension(PluginPart* part)
PluginLiveConnectExtension::~PluginLiveConnectExtension() {
}
-bool PluginLiveConnectExtension::get(const unsigned long, const QString &field, Type &type, unsigned long &retobj, QString &value) {
+bool PluginLiveConnectExtension::get(const unsigned long, const TQString &field, Type &type, unsigned long &retobj, TQString &value) {
Q_UNUSED(type);
Q_UNUSED(retobj);
Q_UNUSED(value);
@@ -65,7 +65,7 @@ Q_UNUSED(value);
return false;
}
-bool PluginLiveConnectExtension::call(const unsigned long, const QString &func, const QStringList &args, Type &type, unsigned long &retobjid, QString &value) {
+bool PluginLiveConnectExtension::call(const unsigned long, const TQString &func, const TQStringList &args, Type &type, unsigned long &retobjid, TQString &value) {
Q_UNUSED(type);
Q_UNUSED(retobjid);
Q_UNUSED(value);
@@ -73,7 +73,7 @@ Q_UNUSED(value);
return false;
}
-bool PluginLiveConnectExtension::put( const unsigned long, const QString &field, const QString &value) {
+bool PluginLiveConnectExtension::put( const unsigned long, const TQString &field, const TQString &value) {
kdDebug(1432) << "PLUGIN:LiveConnect::put " << field << " " << value << endl;
if (_retval && field == "__nsplugin") {
*_retval = value;
@@ -85,15 +85,15 @@ bool PluginLiveConnectExtension::put( const unsigned long, const QString &field,
return false;
}
-QString PluginLiveConnectExtension::evalJavaScript( const QString & script )
+TQString PluginLiveConnectExtension::evalJavaScript( const TQString & script )
{
kdDebug(1432) << "PLUGIN:LiveConnect::evalJavaScript " << script << endl;
ArgList args;
- QString jscode;
- jscode.sprintf("this.__nsplugin=eval(\"%s\")", QString(script).replace('\\', "\\\\").replace('"', "\\\"").latin1());
+ TQString jscode;
+ jscode.sprintf("this.__nsplugin=eval(\"%s\")", TQString(script).replace('\\', "\\\\").replace('"', "\\\"").latin1());
//kdDebug(1432) << "String is [" << jscode << "]" << endl;
args.push_back(qMakePair(KParts::LiveConnectExtension::TypeString, jscode));
- QString nsplugin("Undefined");
+ TQString nsplugin("Undefined");
_retval = &nsplugin;
emit partEvent(0, "eval", args);
_retval = 0L;
@@ -119,25 +119,25 @@ NSPluginCallback::NSPluginCallback(PluginPart *part)
}
-void NSPluginCallback::postURL(QString url, QString target, QByteArray data, QString mime)
+void NSPluginCallback::postURL(TQString url, TQString target, TQByteArray data, TQString mime)
{
_part->postURL( url, target, data, mime );
}
-void NSPluginCallback::requestURL(QString url, QString target)
+void NSPluginCallback::requestURL(TQString url, TQString target)
{
_part->requestURL( url, target );
}
-void NSPluginCallback::statusMessage( QString msg )
+void NSPluginCallback::statusMessage( TQString msg )
{
_part->statusMessage( msg );
}
-void NSPluginCallback::evalJavaScript( int id, QString script )
+void NSPluginCallback::evalJavaScript( int id, TQString script )
{
_part->evalJavaScript( id, script );
}
@@ -171,9 +171,9 @@ PluginFactory::~PluginFactory()
s_instance = 0;
}
-KParts::Part * PluginFactory::createPartObject(QWidget *parentWidget, const char *widgetName,
- QObject *parent, const char *name,
- const char *classname, const QStringList &args)
+KParts::Part * PluginFactory::createPartObject(TQWidget *parentWidget, const char *widgetName,
+ TQObject *parent, const char *name,
+ const char *classname, const TQStringList &args)
{
Q_UNUSED(classname)
kdDebug(1432) << "PluginFactory::create" << endl;
@@ -201,8 +201,8 @@ KAboutData *PluginFactory::aboutData()
/**************************************************************************/
-PluginPart::PluginPart(QWidget *parentWidget, const char *widgetName, QObject *parent,
- const char *name, const QStringList &args)
+PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
+ const char *name, const TQStringList &args)
: KParts::ReadOnlyPart(parent, name), _widget(0), _args(args),
_destructed(0L)
{
@@ -217,7 +217,7 @@ PluginPart::PluginPart(QWidget *parentWidget, const char *widgetName, QObject *p
// Only create this if we have no parent since the parent part is
// responsible for "Save As" then
if (!parent || !parent->inherits("Part")) {
- new KAction(i18n("&Save As..."), CTRL+Key_S, this, SLOT(saveAs()), actionCollection(), "saveDocument");
+ new KAction(i18n("&Save As..."), CTRL+Key_S, this, TQT_SLOT(saveAs()), actionCollection(), "saveDocument");
setXMLFile("nspluginpart.rc");
}
@@ -227,13 +227,13 @@ PluginPart::PluginPart(QWidget *parentWidget, const char *widgetName, QObject *p
// create a canvas to insert our widget
_canvas = new PluginCanvasWidget( parentWidget, widgetName );
- //_canvas->setFocusPolicy( QWidget::ClickFocus );
- _canvas->setFocusPolicy( QWidget::WheelFocus );
- _canvas->setBackgroundMode( QWidget::NoBackground );
+ //_canvas->setFocusPolicy( TQWidget::ClickFocus );
+ _canvas->setFocusPolicy( TQWidget::WheelFocus );
+ _canvas->setBackgroundMode( TQWidget::NoBackground );
setWidget(_canvas);
_canvas->show();
- QObject::connect( _canvas, SIGNAL(resized(int,int)),
- this, SLOT(pluginResized(int,int)) );
+ TQObject::connect( _canvas, TQT_SIGNAL(resized(int,int)),
+ this, TQT_SLOT(pluginResized(int,int)) );
}
@@ -254,23 +254,23 @@ bool PluginPart::openURL(const KURL &url)
kdDebug(1432) << "-> PluginPart::openURL" << endl;
m_url = url;
- QString surl = url.url();
- QString smime = _extension->urlArgs().serviceType;
+ TQString surl = url.url();
+ TQString smime = _extension->urlArgs().serviceType;
bool reload = _extension->urlArgs().reload;
bool embed = false;
bool post = _extension->urlArgs().doPost();
// handle arguments
- QStringList argn, argv;
+ TQStringList argn, argv;
- QStringList::Iterator it = _args.begin();
+ TQStringList::Iterator it = _args.begin();
for ( ; it != _args.end(); ) {
int equalPos = (*it).find("=");
if (equalPos>0) {
- QString name = (*it).left(equalPos).upper();
- QString value = (*it).mid(equalPos+1);
+ TQString name = (*it).left(equalPos).upper();
+ TQString value = (*it).mid(equalPos+1);
if (value[0] == '"' && value[value.length()-1] == '"')
value = value.mid(1, value.length()-2);
@@ -306,7 +306,7 @@ bool PluginPart::openURL(const KURL &url)
if ( inst ) {
_widget = inst;
} else {
- QLabel *label = new QLabel( i18n("Unable to load Netscape plugin for %1").arg(url.url()), _canvas );
+ TQLabel *label = new TQLabel( i18n("Unable to load Netscape plugin for %1").arg(url.url()), _canvas );
label->setAlignment( AlignCenter | WordBreak );
_widget = label;
}
@@ -334,7 +334,7 @@ void PluginPart::reloadPage()
_extension->browserInterface()->callMethod("goHistory(int)", 0);
}
-void PluginPart::postURL(const QString& url, const QString& target, const QByteArray& data, const QString& mime)
+void PluginPart::postURL(const TQString& url, const TQString& target, const TQByteArray& data, const TQString& mime)
{
kdDebug(1432) << "PluginPart::postURL( url=" << url
<< ", target=" << target << endl;
@@ -349,7 +349,7 @@ void PluginPart::postURL(const QString& url, const QString& target, const QByteA
emit _extension->openURLRequest(new_url, args);
}
-void PluginPart::requestURL(const QString& url, const QString& target)
+void PluginPart::requestURL(const TQString& url, const TQString& target)
{
kdDebug(1432) << "PluginPart::requestURL( url=" << url
<< ", target=" << target << endl;
@@ -362,14 +362,14 @@ void PluginPart::requestURL(const QString& url, const QString& target)
emit _extension->openURLRequest(new_url, args);
}
-void PluginPart::evalJavaScript(int id, const QString & script)
+void PluginPart::evalJavaScript(int id, const TQString & script)
{
kdDebug(1432) <<"evalJavascript: before widget check"<<endl;
if (_widget) {
bool destructed = false;
_destructed = &destructed;
kdDebug(1432) <<"evalJavascript: there is a widget" <<endl;
- QString rc = _liveconnect->evalJavaScript(script);
+ TQString rc = _liveconnect->evalJavaScript(script);
if (destructed)
return;
_destructed = 0L;
@@ -380,7 +380,7 @@ void PluginPart::evalJavaScript(int id, const QString & script)
}
}
-void PluginPart::statusMessage(QString msg)
+void PluginPart::statusMessage(TQString msg)
{
kdDebug(1422) << "PluginPart::statusMessage " << msg << endl;
emit setStatusBarText(msg);
@@ -397,21 +397,21 @@ void PluginPart::pluginResized(int w, int h)
}
-void PluginPart::changeSrc(const QString& url) {
+void PluginPart::changeSrc(const TQString& url) {
closeURL();
openURL(KURL( url ));
}
void PluginPart::saveAs() {
- KURL savefile = KFileDialog::getSaveURL(QString::null, QString::null, _widget);
+ KURL savefile = KFileDialog::getSaveURL(TQString::null, TQString::null, _widget);
KIO::NetAccess::copy(m_url, savefile, _widget);
}
-void PluginCanvasWidget::resizeEvent(QResizeEvent *ev)
+void PluginCanvasWidget::resizeEvent(TQResizeEvent *ev)
{
- QWidget::resizeEvent(ev);
+ TQWidget::resizeEvent(ev);
emit resized(width(), height());
}
diff --git a/nsplugins/plugin_part.h b/nsplugins/plugin_part.h
index a6ac548a2..910004c79 100644
--- a/nsplugins/plugin_part.h
+++ b/nsplugins/plugin_part.h
@@ -28,8 +28,8 @@
#include <kparts/factory.h>
#include <kparts/part.h>
#include <klibloader.h>
-#include <qwidget.h>
-#include <qguardedptr.h>
+#include <tqwidget.h>
+#include <tqguardedptr.h>
class KAboutData;
class KInstance;
@@ -49,10 +49,10 @@ public:
NSPluginCallback(PluginPart *part);
ASYNC reloadPage();
- ASYNC requestURL(QString url, QString target);
- ASYNC postURL(QString url, QString target, QByteArray data, QString mime);
- ASYNC statusMessage( QString msg );
- ASYNC evalJavaScript( int id, QString script );
+ ASYNC requestURL(TQString url, TQString target);
+ ASYNC postURL(TQString url, TQString target, TQByteArray data, TQString mime);
+ ASYNC statusMessage( TQString msg );
+ ASYNC evalJavaScript( int id, TQString script );
private:
PluginPart *_part;
@@ -67,10 +67,10 @@ public:
PluginFactory();
virtual ~PluginFactory();
- virtual KParts::Part * createPartObject(QWidget *parentWidget = 0, const char *widgetName = 0,
- QObject *parent = 0, const char *name = 0,
+ virtual KParts::Part * createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0,
+ TQObject *parent = 0, const char *name = 0,
const char *classname = "KParts::Part",
- const QStringList &args = QStringList());
+ const TQStringList &args = TQStringList());
static KInstance *instance();
static KAboutData *aboutData();
@@ -87,11 +87,11 @@ class PluginCanvasWidget : public QWidget
Q_OBJECT
public:
- PluginCanvasWidget(QWidget *parent=0, const char *name=0)
- : QWidget(parent,name) {}
+ PluginCanvasWidget(TQWidget *parent=0, const char *name=0)
+ : TQWidget(parent,name) {}
protected:
- void resizeEvent(QResizeEvent *e);
+ void resizeEvent(TQResizeEvent *e);
signals:
void resized(int,int);
@@ -102,17 +102,17 @@ class PluginPart: public KParts::ReadOnlyPart
{
Q_OBJECT
public:
- PluginPart(QWidget *parentWidget, const char *widgetName, QObject *parent,
- const char *name, const QStringList &args = QStringList());
+ PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
+ const char *name, const TQStringList &args = TQStringList());
virtual ~PluginPart();
- void postURL(const QString& url, const QString& target, const QByteArray& data, const QString& mime);
- void requestURL(const QString& url, const QString& target);
- void statusMessage( QString msg );
- void evalJavaScript( int id, const QString& script );
+ void postURL(const TQString& url, const TQString& target, const TQByteArray& data, const TQString& mime);
+ void requestURL(const TQString& url, const TQString& target);
+ void statusMessage( TQString msg );
+ void evalJavaScript( int id, const TQString& script );
void reloadPage();
- void changeSrc(const QString& url);
+ void changeSrc(const TQString& url);
protected:
virtual bool openURL(const KURL &url);
@@ -124,12 +124,12 @@ protected slots:
void saveAs();
private:
- QGuardedPtr<QWidget> _widget;
+ TQGuardedPtr<TQWidget> _widget;
PluginCanvasWidget *_canvas;
PluginBrowserExtension *_extension;
PluginLiveConnectExtension *_liveconnect;
NSPluginCallback *_callback;
- QStringList _args;
+ TQStringList _args;
class NSPluginLoader *_loader;
bool *_destructed;
};
@@ -141,18 +141,18 @@ Q_OBJECT
public:
PluginLiveConnectExtension(PluginPart* part);
virtual ~PluginLiveConnectExtension();
- virtual bool put(const unsigned long, const QString &field, const QString &value);
- virtual bool get(const unsigned long, const QString&, Type&, unsigned long&, QString&);
- virtual bool call(const unsigned long, const QString&, const QStringList&, Type&, unsigned long&, QString&);
+ virtual bool put(const unsigned long, const TQString &field, const TQString &value);
+ virtual bool get(const unsigned long, const TQString&, Type&, unsigned long&, TQString&);
+ virtual bool call(const unsigned long, const TQString&, const TQStringList&, Type&, unsigned long&, TQString&);
- QString evalJavaScript( const QString & script );
+ TQString evalJavaScript( const TQString & script );
signals:
- virtual void partEvent( const unsigned long objid, const QString & event, const KParts::LiveConnectExtension::ArgList & args );
+ virtual void partEvent( const unsigned long objid, const TQString & event, const KParts::LiveConnectExtension::ArgList & args );
private:
PluginPart *_part;
- QString *_retval;
+ TQString *_retval;
};
diff --git a/nsplugins/plugin_paths.cpp b/nsplugins/plugin_paths.cpp
index 2c228ac25..8406ecebc 100644
--- a/nsplugins/plugin_paths.cpp
+++ b/nsplugins/plugin_paths.cpp
@@ -28,16 +28,16 @@
#include <kconfig.h>
#include <stdlib.h>
-QStringList getSearchPaths()
+TQStringList getSearchPaths()
{
- QStringList searchPaths;
+ TQStringList searchPaths;
KConfig *config = new KConfig("kcmnspluginrc", false);
config->setGroup("Misc");
// setup default paths
if ( !config->hasKey("scanPaths") ) {
- QStringList paths;
+ TQStringList paths;
// keep sync with kdebase/kcontrol/konqhtml
paths.append("$HOME/.mozilla/plugins");
paths.append("$HOME/.netscape/plugins");
@@ -67,8 +67,8 @@ QStringList getSearchPaths()
delete config;
// append environment variable NPX_PLUGIN_PATH
- QStringList envs = QStringList::split(':', getenv("NPX_PLUGIN_PATH"));
- QStringList::Iterator it;
+ TQStringList envs = TQStringList::split(':', getenv("NPX_PLUGIN_PATH"));
+ TQStringList::Iterator it;
for (it = envs.begin(); it != envs.end(); ++it)
searchPaths.append(*it);
diff --git a/nsplugins/plugin_paths.h b/nsplugins/plugin_paths.h
index bd2cbbcf4..126d65665 100644
--- a/nsplugins/plugin_paths.h
+++ b/nsplugins/plugin_paths.h
@@ -1,8 +1,8 @@
#ifndef PLUGIN_PATHS_H
#define PLUGIN_PATHS_H
-#include <qstringlist.h>
+#include <tqstringlist.h>
-extern QStringList getSearchPaths();
+extern TQStringList getSearchPaths();
#endif
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index cfa544429..82a5defb2 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -32,11 +32,11 @@
#include <signal.h>
#include <unistd.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qregexp.h>
-#include <qbuffer.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqregexp.h>
+#include <tqbuffer.h>
#include <dcopclient.h>
@@ -110,7 +110,7 @@ void pullInXt()
KConfig *infoConfig = 0;
-bool isPluginMimeType( QString fname )
+bool isPluginMimeType( TQString fname )
{
KDesktopFile cfg( fname, true );
cfg.setDesktopGroup();
@@ -121,9 +121,9 @@ bool isPluginMimeType( QString fname )
void deletePluginMimeTypes()
{
// iterate through local mime type directories
- QString dir = KGlobal::dirs()->saveLocation( "mime" );
+ TQString dir = KGlobal::dirs()->saveLocation( "mime" );
kdDebug(1433) << "Removing nsplugin MIME types in " << dir << endl;
- QDir dirs( dir, QString::null, QDir::Name|QDir::IgnoreCase, QDir::Dirs );
+ TQDir dirs( dir, TQString::null, TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs );
if ( !dirs.exists() ) {
kdDebug(1433) << "Directory not found" << endl;
return;
@@ -134,8 +134,8 @@ void deletePluginMimeTypes()
// check all mime types for X-KDE-nsplugin flag
kdDebug(1433) << " - Looking in " << dirs[i] << endl;
- QDir files( dirs.absFilePath(dirs[i]), QString::null,
- QDir::Name|QDir::IgnoreCase, QDir::Files );
+ TQDir files( dirs.absFilePath(dirs[i]), TQString::null,
+ TQDir::Name|TQDir::IgnoreCase, TQDir::Files );
if ( files.exists( dir ) ) {
for (unsigned int i=0; i<files.count(); i++) {
@@ -155,13 +155,13 @@ void deletePluginMimeTypes()
}
-void generateMimeType( QString mime, QString extensions, QString pluginName, QString description )
+void generateMimeType( TQString mime, TQString extensions, TQString pluginName, TQString description )
{
kdDebug(1433) << "-> generateMimeType mime=" << mime << " ext="<< extensions << endl;
// get directory from mime string
- QString dir;
- QString name;
+ TQString dir;
+ TQString name;
int pos = mime.findRev('/');
if ( pos<0 ) {
kdDebug(1433) << "Invalid MIME type " << mime << endl;
@@ -172,11 +172,11 @@ void generateMimeType( QString mime, QString extensions, QString pluginName, QSt
name = mime.mid(pos);
// create mimelnk file
- QFile f( dir + name + ".desktop" );
+ TQFile f( dir + name + ".desktop" );
if ( f.open(IO_WriteOnly) ) {
// write .desktop file
- QTextStream ts(&f);
+ TQTextStream ts(&f);
ts << "[Desktop Entry]" << endl;
ts << "Type=MimeType" << endl;
@@ -187,9 +187,9 @@ void generateMimeType( QString mime, QString extensions, QString pluginName, QSt
ts << "X-KDE-nsplugin=true" << endl;
if (!extensions.isEmpty()) {
- QStringList exts = QStringList::split(",", extensions);
- QStringList patterns;
- for (QStringList::Iterator it=exts.begin(); it != exts.end(); ++it)
+ TQStringList exts = TQStringList::split(",", extensions);
+ TQStringList patterns;
+ for (TQStringList::Iterator it=exts.begin(); it != exts.end(); ++it)
patterns.append( "*." + (*it).stripWhiteSpace() );
ts << "Patterns=" << patterns.join( ";" ) << endl;
@@ -207,16 +207,16 @@ void generateMimeType( QString mime, QString extensions, QString pluginName, QSt
}
-void registerPlugin( const QString &name, const QString &description,
- const QString &file, const QString &mimeInfo )
+void registerPlugin( const TQString &name, const TQString &description,
+ const TQString &file, const TQString &mimeInfo )
{
// global stuff
- infoConfig->setGroup( QString::null );
+ infoConfig->setGroup( TQString::null );
int num = infoConfig->readNumEntry( "number", 0 );
infoConfig->writeEntry( "number", num+1 );
// create plugin info
- infoConfig->setGroup( QString::number(num) );
+ infoConfig->setGroup( TQString::number(num) );
infoConfig->writeEntry( "name", name );
infoConfig->writeEntry( "description", description );
infoConfig->writeEntry( "file", file );
@@ -228,9 +228,9 @@ static void segv_handler(int)
_exit(255);
}
-int tryCheck(int write_fd, const QString &absFile)
+int tryCheck(int write_fd, const TQString &absFile)
{
- KLibrary *_handle = KLibLoader::self()->library( QFile::encodeName(absFile) );
+ KLibrary *_handle = KLibLoader::self()->library( TQFile::encodeName(absFile) );
if (!_handle) {
kdDebug(1433) << " - open failed with message " <<
KLibLoader::self()->lastErrorMessage() << ", skipping " << endl;
@@ -238,8 +238,8 @@ int tryCheck(int write_fd, const QString &absFile)
}
// ask for name and description
- QString name = i18n("Unnamed plugin");
- QString description;
+ TQString name = i18n("Unnamed plugin");
+ TQString description;
NPError (*func_GetValue)(void *, NPPVariable, void *) =
(NPError(*)(void *, NPPVariable, void *))
@@ -251,14 +251,14 @@ int tryCheck(int write_fd, const QString &absFile)
NPError err = func_GetValue( 0, NPPVpluginNameString,
(void*)&buf );
if ( err==NPERR_NO_ERROR )
- name = QString::fromLatin1( buf );
+ name = TQString::fromLatin1( buf );
kdDebug() << "name = " << name << endl;
// get name
NPError nperr = func_GetValue( 0, NPPVpluginDescriptionString,
(void*)&buf );
if ( nperr==NPERR_NO_ERROR )
- description = QString::fromLatin1( buf );
+ description = TQString::fromLatin1( buf );
kdDebug() << "description = " << description << endl;
}
else
@@ -269,31 +269,31 @@ int tryCheck(int write_fd, const QString &absFile)
(char *(*)())_handle->symbol("NP_GetMIMEDescription");
if ( !func_GetMIMEDescription ) {
kdDebug(1433) << " - no GetMIMEDescription, skipping" << endl;
- KLibLoader::self()->unloadLibrary( QFile::encodeName(absFile) );
+ KLibLoader::self()->unloadLibrary( TQFile::encodeName(absFile) );
return 1;
}
// ask for mime information
- QString mimeInfo = func_GetMIMEDescription();
+ TQString mimeInfo = func_GetMIMEDescription();
if ( mimeInfo.isEmpty() ) {
kdDebug(1433) << " - no mime info returned, skipping" << endl;
- KLibLoader::self()->unloadLibrary( QFile::encodeName(absFile) );
+ KLibLoader::self()->unloadLibrary( TQFile::encodeName(absFile) );
return 1;
}
// remove version info, as it is not used at the moment
- QRegExp versionRegExp(";version=[^:]*:");
+ TQRegExp versionRegExp(";version=[^:]*:");
mimeInfo.replace( versionRegExp, ":");
// unload plugin lib
kdDebug(1433) << " - unloading plugin" << endl;
- KLibLoader::self()->unloadLibrary( QFile::encodeName(absFile) );
+ KLibLoader::self()->unloadLibrary( TQFile::encodeName(absFile) );
- // create a QDataStream for our IPC pipe (to send plugin info back to the parent)
+ // create a TQDataStream for our IPC pipe (to send plugin info back to the parent)
FILE *write_pipe = fdopen(write_fd, "w");
- QFile stream_file;
+ TQFile stream_file;
stream_file.open(IO_WriteOnly, write_pipe);
- QDataStream stream(&stream_file);
+ TQDataStream stream(&stream_file);
// return the gathered info to the parent
stream << name;
@@ -303,13 +303,13 @@ int tryCheck(int write_fd, const QString &absFile)
return 0;
}
-void scanDirectory( QString dir, QStringList &mimeInfoList,
- QTextStream &cache )
+void scanDirectory( TQString dir, TQStringList &mimeInfoList,
+ TQTextStream &cache )
{
kdDebug(1433) << "-> scanDirectory dir=" << dir << endl;
// iterate over all files
- QDir files( dir, QString::null, QDir::Name|QDir::IgnoreCase, QDir::Files );
+ TQDir files( dir, TQString::null, TQDir::Name|TQDir::IgnoreCase, TQDir::Files );
if ( !files.exists( dir ) ) {
kdDebug(1433) << "No files found" << endl;
kdDebug(1433) << "<- scanDirectory dir=" << dir << endl;
@@ -317,7 +317,7 @@ void scanDirectory( QString dir, QStringList &mimeInfoList,
}
for (unsigned int i=0; i<files.count(); i++) {
- QString extension;
+ TQString extension;
int j = files[i].findRev('.');
if (j > 0)
extension = files[i].mid(j+1);
@@ -340,7 +340,7 @@ void scanDirectory( QString dir, QStringList &mimeInfoList,
continue;
// get absolute file path
- QString absFile = files.absFilePath( files[i] );
+ TQString absFile = files.absFilePath( files[i] );
kdDebug(1433) << "Checking library " << absFile << endl;
// open the library and ask for the mimetype
@@ -363,11 +363,11 @@ void scanDirectory( QString dir, QStringList &mimeInfoList,
} else {
close(pipes[1]);
- QBuffer m_buffer;
+ TQBuffer m_buffer;
m_buffer.open(IO_WriteOnly);
FILE *read_pipe = fdopen(pipes[0], "r");
- QFile q_read_pipe;
+ TQFile q_read_pipe;
q_read_pipe.open(IO_ReadOnly, read_pipe);
char *data = (char *)malloc(4096);
@@ -386,12 +386,12 @@ void scanDirectory( QString dir, QStringList &mimeInfoList,
m_buffer.close();
m_buffer.open(IO_ReadOnly);
- // create a QDataStream for our buffer
- QDataStream stream(&m_buffer);
+ // create a TQDataStream for our buffer
+ TQDataStream stream(&m_buffer);
if (stream.atEnd()) continue;
- QString name, description, mimeInfo;
+ TQString name, description, mimeInfo;
stream >> name;
stream >> description;
stream >> mimeInfo;
@@ -399,14 +399,14 @@ void scanDirectory( QString dir, QStringList &mimeInfoList,
bool actuallyUsing = false;
// get mime types from string
- QStringList types = QStringList::split( ';', mimeInfo );
- QStringList::Iterator type;
+ TQStringList types = TQStringList::split( ';', mimeInfo );
+ TQStringList::Iterator type;
for ( type=types.begin(); type!=types.end(); ++type ) {
kdDebug(1433) << " - type=" << *type << endl;
name = name.replace( ':', "%3A" );
- QString entry = name + ":" + *type;
+ TQString entry = name + ":" + *type;
if ( !mimeInfoList.contains( entry ) ) {
if (!actuallyUsing) {
// note the plugin name
@@ -415,8 +415,8 @@ void scanDirectory( QString dir, QStringList &mimeInfoList,
}
// write into type cache
- QStringList tokens = QStringList::split(':', *type, TRUE);
- QStringList::Iterator token;
+ TQStringList tokens = TQStringList::split(':', *type, TRUE);
+ TQStringList::Iterator token;
token = tokens.begin();
cache << (*token).lower();
++token;
@@ -437,7 +437,7 @@ void scanDirectory( QString dir, QStringList &mimeInfoList,
// iterate over all sub directories
// NOTE: Mozilla doesn't iterate over subdirectories of the plugin dir.
// We still do (as Netscape 4 did).
- QDir dirs( dir, QString::null, QDir::Name|QDir::IgnoreCase, QDir::Dirs );
+ TQDir dirs( dir, TQString::null, TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs );
if ( !dirs.exists() )
return;
@@ -453,16 +453,16 @@ void scanDirectory( QString dir, QStringList &mimeInfoList,
}
-void writeServicesFile( QStringList mimeTypes )
+void writeServicesFile( TQStringList mimeTypes )
{
- QString fname = KGlobal::dirs()->saveLocation("services", "")
+ TQString fname = KGlobal::dirs()->saveLocation("services", "")
+ "/nsplugin.desktop";
kdDebug(1433) << "Creating services file " << fname << endl;
- QFile f(fname);
+ TQFile f(fname);
if ( f.open(IO_WriteOnly) ) {
- QTextStream ts(&f);
+ TQTextStream ts(&f);
ts << "[Desktop Entry]" << endl;
ts << "Name=" << i18n("Netscape plugin viewer") << endl;
@@ -483,12 +483,12 @@ void writeServicesFile( QStringList mimeTypes )
}
-void removeExistingExtensions( QString &extension )
+void removeExistingExtensions( TQString &extension )
{
- QStringList filtered;
- QStringList exts = QStringList::split( ",", extension );
- for ( QStringList::Iterator it=exts.begin(); it!=exts.end(); ++it ) {
- QString ext = (*it).stripWhiteSpace();
+ TQStringList filtered;
+ TQStringList exts = TQStringList::split( ",", extension );
+ for ( TQStringList::Iterator it=exts.begin(); it!=exts.end(); ++it ) {
+ TQString ext = (*it).stripWhiteSpace();
if ( ext == "*" ) // some plugins have that, but we don't want to associate a mimetype with *.*!
continue;
@@ -563,20 +563,20 @@ int main( int argc, char **argv )
pullInXt();
// set up the paths used to look for plugins
- QStringList searchPaths = getSearchPaths();
- QStringList mimeInfoList;
+ TQStringList searchPaths = getSearchPaths();
+ TQStringList mimeInfoList;
infoConfig = new KConfig( KGlobal::dirs()->saveLocation("data", "nsplugins") +
"/pluginsinfo" );
infoConfig->writeEntry( "number", 0 );
// open the cache file for the mime information
- QString cacheName = KGlobal::dirs()->saveLocation("data", "nsplugins")+"/cache";
+ TQString cacheName = KGlobal::dirs()->saveLocation("data", "nsplugins")+"/cache";
kdDebug(1433) << "Creating MIME cache file " << cacheName << endl;
- QFile cachef(cacheName);
+ TQFile cachef(cacheName);
if (!cachef.open(IO_WriteOnly))
return -1;
- QTextStream cache(&cachef);
+ TQTextStream cache(&cachef);
if (showProgress) {
printf("20\n"); fflush(stdout);
}
@@ -585,7 +585,7 @@ int main( int argc, char **argv )
kdDebug(1433) << "Scanning directories" << endl;
int count = searchPaths.count();
int i = 0;
- for ( QStringList::Iterator it = searchPaths.begin();
+ for ( TQStringList::Iterator it = searchPaths.begin();
it != searchPaths.end(); ++it, ++i)
{
scanDirectory( *it, mimeInfoList, cache );
@@ -606,18 +606,18 @@ int main( int argc, char **argv )
// write mimetype files
kdDebug(1433) << "Creating MIME type descriptions" << endl;
- QStringList mimeTypes;
- for ( QStringList::Iterator it=mimeInfoList.begin();
+ TQStringList mimeTypes;
+ for ( TQStringList::Iterator it=mimeInfoList.begin();
it!=mimeInfoList.end(); ++it) {
kdDebug(1433) << "Handling MIME type " << *it << endl;
- QStringList info = QStringList::split(":", *it, true);
+ TQStringList info = TQStringList::split(":", *it, true);
if ( info.count()==4 ) {
- QString pluginName = info[0];
- QString type = info[1].lower();
- QString extension = info[2];
- QString desc = info[3];
+ TQString pluginName = info[0];
+ TQString type = info[1].lower();
+ TQString extension = info[2];
+ TQString desc = info[3];
// append to global mime type list
if ( !mimeTypes.contains(type) ) {
@@ -625,7 +625,7 @@ int main( int argc, char **argv )
mimeTypes.append( type );
// check mimelnk file
- QString fname = KGlobal::dirs()->findResource("mime", type+".desktop");
+ TQString fname = KGlobal::dirs()->findResource("mime", type+".desktop");
if ( fname.isEmpty() || isPluginMimeType(fname) ) {
kdDebug(1433) << " - creating MIME type description" << endl;
removeExistingExtensions( extension );
@@ -657,5 +657,5 @@ int main( int argc, char **argv )
if ( !dcc->isAttached() )
dcc->attach();
// Tel kded to update sycoca database.
- dcc->send("kded", "kbuildsycoca", "recreate()", QByteArray());
+ dcc->send("kded", "kbuildsycoca", "recreate()", TQByteArray());
}
diff --git a/nsplugins/sdk/npruntime.h b/nsplugins/sdk/npruntime.h
index a6f3e81ad..5a8423390 100644
--- a/nsplugins/sdk/npruntime.h
+++ b/nsplugins/sdk/npruntime.h
@@ -65,7 +65,7 @@
#ifndef _NP_RUNTIME_H_
#define _NP_RUNTIME_H_
-#include <qglobal.h>
+#include <tqglobal.h>
typedef Q_UINT32 uint32_t;
#ifdef __cplusplus
diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp
index 561b4d02d..0d9eadf29 100644
--- a/nsplugins/test/testnsplugin.cpp
+++ b/nsplugins/test/testnsplugin.cpp
@@ -20,7 +20,7 @@
*/
#include <stdio.h>
-#include <qstring.h>
+#include <tqstring.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
#include <dcopclient.h>
@@ -38,15 +38,15 @@ TestNSPlugin::TestNSPlugin()
m_loader = NSPluginLoader::instance();
// client area
- m_client = new QWidget( this, "m_client" );
+ m_client = new TQWidget( this, "m_client" );
setCentralWidget( m_client );
m_client->show();
- m_layout = new QHBoxLayout( m_client );
+ m_layout = new TQHBoxLayout( m_client );
// file menu
- KStdAction::openNew( this, SLOT(newView()), actionCollection());
- KStdAction::close( this, SLOT(closeView()), actionCollection());
- KStdAction::quit( kapp, SLOT(quit()), actionCollection());
+ KStdAction::openNew( this, TQT_SLOT(newView()), actionCollection());
+ KStdAction::close( this, TQT_SLOT(closeView()), actionCollection());
+ KStdAction::quit( kapp, TQT_SLOT(quit()), actionCollection());
createGUI( "testnspluginui.rc" );
}
@@ -62,34 +62,34 @@ TestNSPlugin::~TestNSPlugin()
void TestNSPlugin::newView()
{
- QStringList _argn, _argv;
+ TQStringList _argn, _argv;
- //QString src = "file:/home/sschimanski/kimble_themovie.swf";
- //QString src = "file:/home/sschimanski/in_ani.swf";
- //QString src = "http://homepages.tig.com.au/~dkl/swf/promo.swf";
- //QString mime = "application/x-shockwave-flash";
+ //TQString src = "file:/home/sschimanski/kimble_themovie.swf";
+ //TQString src = "file:/home/sschimanski/in_ani.swf";
+ //TQString src = "http://homepages.tig.com.au/~dkl/swf/promo.swf";
+ //TQString mime = "application/x-shockwave-flash";
_argn << "name" << "controls" << "console";
_argv << "audio" << "ControlPanel" << "Clip1";
- QString src = "http://welt.is-kunden.de:554/ramgen/welt/avmedia/realaudio/0701lw177135.rm";
-// QString src = "nothing";
- QString mime = "audio/x-pn-realaudio-plugin";
+ TQString src = "http://welt.is-kunden.de:554/ramgen/welt/avmedia/realaudio/0701lw177135.rm";
+// TQString src = "nothing";
+ TQString mime = "audio/x-pn-realaudio-plugin";
_argn << "SRC" << "TYPE" << "WIDTH" << "HEIGHT";
_argv << src << mime << "400" << "100";
- QWidget *win = m_loader->newInstance( m_client, src, mime, 1, _argn, _argv, "appid", "callbackid" );
+ TQWidget *win = m_loader->newInstance( m_client, src, mime, 1, _argn, _argv, "appid", "callbackid" );
/*
_argn << "TYPE" << "WIDTH" << "HEIGHT" << "java_docbase" << "CODE";
_argv << "application/x-java-applet" << "450" << "350" << "file:///none" << "sun/plugin/panel/ControlPanelApplet.class";
- QWidget *win = loader->NewInstance(0, "", "application/x-java-applet", 1, _argn, _argv);
+ TQWidget *win = loader->NewInstance(0, "", "application/x-java-applet", 1, _argn, _argv);
*/
if ( win )
{
m_plugins.append( win );
- connect( win, SIGNAL(destroyed(NSPluginInstance *)),
- this, SLOT(viewDestroyed(NSPluginInstance *)) );
+ connect( win, TQT_SIGNAL(destroyed(NSPluginInstance *)),
+ this, TQT_SLOT(viewDestroyed(NSPluginInstance *)) );
m_layout->addWidget( win );
win->show();
} else
@@ -101,7 +101,7 @@ void TestNSPlugin::newView()
void TestNSPlugin::closeView()
{
kdDebug() << "closeView" << endl;
- QWidget *win = m_plugins.last();
+ TQWidget *win = m_plugins.last();
if ( win )
{
m_plugins.remove( win );
diff --git a/nsplugins/test/testnsplugin.h b/nsplugins/test/testnsplugin.h
index ac123c175..949de2986 100644
--- a/nsplugins/test/testnsplugin.h
+++ b/nsplugins/test/testnsplugin.h
@@ -23,11 +23,11 @@
#ifndef __TESTNSPLUGIN_H__
#define __TESTNSPLUGIN_H__
-#include <qstring.h>
-#include <qwidget.h>
+#include <tqstring.h>
+#include <tqwidget.h>
#include <kmainwindow.h>
-#include <qlayout.h>
-#include <qptrlist.h>
+#include <tqlayout.h>
+#include <tqptrlist.h>
class NSPluginLoader;
class NSPluginInstance;
@@ -47,9 +47,9 @@ public slots:
protected:
NSPluginLoader *m_loader;
- QPtrList<QWidget> m_plugins;
- QWidget *m_client;
- QBoxLayout *m_layout;
+ TQPtrList<TQWidget> m_plugins;
+ TQWidget *m_client;
+ TQBoxLayout *m_layout;
};
diff --git a/nsplugins/viewer/NSPluginClassIface.h b/nsplugins/viewer/NSPluginClassIface.h
index 20fd6ed03..7eb71f27d 100644
--- a/nsplugins/viewer/NSPluginClassIface.h
+++ b/nsplugins/viewer/NSPluginClassIface.h
@@ -25,8 +25,8 @@
#define __NSPluginClassIface_h__
-#include <qstringlist.h>
-#include <qcstring.h>
+#include <tqstringlist.h>
+#include <tqcstring.h>
#include <dcopobject.h>
#include <dcopref.h>
@@ -37,7 +37,7 @@ class NSPluginViewerIface : virtual public DCOPObject
k_dcop:
virtual void shutdown() = 0;
- virtual DCOPRef newClass(QString plugin) = 0;
+ virtual DCOPRef newClass(TQString plugin) = 0;
};
@@ -47,11 +47,11 @@ class NSPluginClassIface : virtual public DCOPObject
k_dcop:
- virtual DCOPRef newInstance(QString url, QString mimeType, Q_INT8 embed,
- QStringList argn, QStringList argv,
- QString appId, QString callbackId, Q_INT8 reload,
- Q_INT8 doPost, QByteArray postData, Q_UINT32 xembed) = 0;
- virtual QString getMIMEDescription() = 0;
+ virtual DCOPRef newInstance(TQString url, TQString mimeType, Q_INT8 embed,
+ TQStringList argn, TQStringList argv,
+ TQString appId, TQString callbackId, Q_INT8 reload,
+ Q_INT8 doPost, TQByteArray postData, Q_UINT32 xembed) = 0;
+ virtual TQString getMIMEDescription() = 0;
};
@@ -70,7 +70,7 @@ k_dcop:
virtual void resizePlugin(Q_INT32 w, Q_INT32 h) = 0;
- virtual void javascriptResult(Q_INT32 id, QString result) = 0;
+ virtual void javascriptResult(Q_INT32 id, TQString result) = 0;
virtual void displayPlugin() = 0;
diff --git a/nsplugins/viewer/glibevents.cpp b/nsplugins/viewer/glibevents.cpp
index b1012675b..fe059d1ee 100644
--- a/nsplugins/viewer/glibevents.cpp
+++ b/nsplugins/viewer/glibevents.cpp
@@ -19,12 +19,12 @@
#include "glibevents.h"
-#include <qapplication.h>
+#include <tqapplication.h>
GlibEvents::GlibEvents()
{
g_main_context_ref( g_main_context_default());
- connect( &timer, SIGNAL( timeout()), SLOT( process()));
+ connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( process()));
// TODO Poll for now
timer.start( 10 );
}
diff --git a/nsplugins/viewer/glibevents.h b/nsplugins/viewer/glibevents.h
index 8a890807b..396273a85 100644
--- a/nsplugins/viewer/glibevents.h
+++ b/nsplugins/viewer/glibevents.h
@@ -20,8 +20,8 @@
#ifndef GLIBEVENTS_H
#define GLIBEVENTS_H
-#include <qwidget.h>
-#include <qtimer.h>
+#include <tqwidget.h>
+#include <tqtimer.h>
#include <glib.h>
@@ -35,7 +35,7 @@ class GlibEvents
private slots:
void process();
private:
- QTimer timer;
+ TQTimer timer;
};
#endif
diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp
index 7f2e04b54..9f5f43d51 100644
--- a/nsplugins/viewer/kxt.cpp
+++ b/nsplugins/viewer/kxt.cpp
@@ -44,15 +44,15 @@
**
*****************************************************************************/
-#include <qglobal.h>
+#include <tqglobal.h>
#if QT_VERSION < 0x030100
#include <kapplication.h>
-#include <qwidget.h>
-#include <qobjectlist.h>
-#include <qwidgetlist.h>
+#include <tqwidget.h>
+#include <tqobjectlist.h>
+#include <tqwidgetlist.h>
#include <kdebug.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include "kxt.h"
@@ -136,15 +136,15 @@ typedef struct _QWidgetRec {
static
-void reparentChildrenOf(QWidget* parent)
+void reparentChildrenOf(TQWidget* parent)
{
if ( !parent->children() )
return; // nothing to do
- for ( QObjectListIt it( *parent->children() ); it.current(); ++it ) {
+ for ( TQObjectListIt it( *parent->children() ); it.current(); ++it ) {
if ( it.current()->isWidgetType() ) {
- QWidget* widget = (QWidget*)it.current();
+ TQWidget* widget = (TQWidget*)it.current();
XReparentWindow( qt_xdisplay(),
widget->winId(),
parent->winId(),
@@ -177,7 +177,7 @@ static
QWidgetClassRec qwidgetClassRec = {
{ /* core fields */
/* superclass */ (WidgetClass) &widgetClassRec,
- /* class_name */ (char*)"QWidget",
+ /* class_name */ (char*)"TQWidget",
/* widget_size */ sizeof(QWidgetRec),
/* class_initialize */ 0,
/* class_part_initialize */ 0,
@@ -249,7 +249,7 @@ void removeXtEventFilters()
filters_installed = FALSE;
}
-// When we are in an event loop of QApplication rather than the browser's
+// When we are in an event loop of TQApplication rather than the browser's
// event loop (eg. for a modal dialog), we still send events to Xt.
static
void np_event_proc( XEvent* e )
@@ -263,7 +263,7 @@ void np_event_proc( XEvent* e )
static void np_set_timer( int interval )
{
- // Ensure we only have one timeout in progress - QApplication is
+ // Ensure we only have one timeout in progress - TQApplication is
// computing the one amount of time we need to wait.
if ( qt_np_timerid ) {
XtRemoveTimeOut( qt_np_timerid );
@@ -302,7 +302,7 @@ static void np_do_timers( void*, void* )
static bool my_xt;
/*!
- Constructs a QApplication and initializes the Xt toolkit.
+ Constructs a TQApplication and initializes the Xt toolkit.
The \a appclass, \a options, \a num_options, and \a resources
arguments are passed on to XtAppSetFallbackResources and
XtDisplayInitialize.
@@ -311,7 +311,7 @@ static bool my_xt;
needs to use some existing Xt/Motif widgets.
*/
KXtApplication::KXtApplication(int& argc, char** argv,
- const QCString& rAppName, bool allowStyles, bool GUIenabled,
+ const TQCString& rAppName, bool allowStyles, bool GUIenabled,
XrmOptionDescRec *options, int num_options,
char** resources)
: KApplication(argc, argv, rAppName, allowStyles, GUIenabled)
@@ -327,14 +327,14 @@ KXtApplication::KXtApplication(int& argc, char** argv,
}
/*!
- Constructs a QApplication from the \a display of an already-initialized
+ Constructs a TQApplication from the \a display of an already-initialized
Xt application.
Use this constructor when introducing Qt widgets into an existing
Xt/Motif application.
*/
KXtApplication::KXtApplication(Display* dpy, int& argc, char** argv,
- const QCString& rAppName, bool allowStyles, bool GUIenabled)
+ const TQCString& rAppName, bool allowStyles, bool GUIenabled)
: KApplication(dpy, argc, argv, rAppName, allowStyles, GUIenabled)
{
my_xt = FALSE;
@@ -367,7 +367,7 @@ void KXtApplication::init()
qt_np_add_timer_setter(np_set_timer);
qt_np_add_event_proc(np_event_proc);
qt_np_count++;
-/* QTimer *timer = new QTimer( this );
+/* TQTimer *timer = new TQTimer( this );
timer->start(500);*/
}
@@ -381,11 +381,11 @@ void KXtApplication::init()
Xt widgets, it can be a QWidget
based on a Xt widget class. For including Qt widgets in an existing
Xt/Motif application, it can be a special Xt widget class that is
- a QWidget. See the constructors for the different behaviors.
+ a TQWidget. See the constructors for the different behaviors.
*/
void KXtWidget::init(const char* name, WidgetClass widget_class,
- Widget parent, QWidget* qparent,
+ Widget parent, TQWidget* qparent,
ArgList args, Cardinal num_args,
bool managed)
{
@@ -438,14 +438,14 @@ void KXtWidget::init(const char* name, WidgetClass widget_class,
/*!
Constructs a KXtWidget of the special Xt widget class known as
- "QWidget" to the resource manager.
+ "TQWidget" to the resource manager.
Use this constructor to utilize Qt widgets in an Xt/Motif
- application. The KXtWidget is a QWidget, so you can create
+ application. The KXtWidget is a TQWidget, so you can create
subwidgets, layouts, etc. using Qt functionality.
*/
KXtWidget::KXtWidget(const char* name, Widget parent, bool managed) :
- QWidget( 0, name, WResizeNoErase )
+ TQWidget( 0, name, WResizeNoErase )
{
init(name, qWidgetClass, parent, 0, 0, 0, managed);
Arg reqargs[20];
@@ -460,21 +460,21 @@ KXtWidget::KXtWidget(const char* name, Widget parent, bool managed) :
Use this constructor to utilize Xt or Motif widgets in a Qt
application. The KXtWidget looks and behaves
- like the Xt class, but can be used like any QWidget.
+ like the Xt class, but can be used like any TQWidget.
Note that Xt requires that the most toplevel Xt widget is a shell.
That means, if \a parent is a KXtWidget, the \a widget_class can be
of any kind. If there isn't a parent or the parent is just a normal
- QWidget, \a widget_class should be something like \c
+ TQWidget, \a widget_class should be something like \c
topLevelShellWidgetClass.
If the \a managed parameter is TRUE and \a parent in not NULL,
XtManageChild it used to manage the child.
*/
KXtWidget::KXtWidget(const char* name, WidgetClass widget_class,
- QWidget *parent, ArgList args, Cardinal num_args,
+ TQWidget *parent, ArgList args, Cardinal num_args,
bool managed) :
- QWidget( parent, name, WResizeNoErase )
+ TQWidget( parent, name, WResizeNoErase )
{
if ( !parent )
init(name, widget_class, 0, 0, args, num_args, managed);
@@ -492,11 +492,11 @@ KXtWidget::~KXtWidget()
{
// Delete children first, as Xt will destroy their windows
//
- QObjectList* list = queryList("QWidget", 0, FALSE, FALSE);
+ TQObjectList* list = queryList("TQWidget", 0, FALSE, FALSE);
if ( list ) {
- QWidget* c;
- QObjectListIt it( *list );
- while ( (c = (QWidget*)it.current()) ) {
+ TQWidget* c;
+ TQObjectListIt it( *list );
+ while ( (c = (TQWidget*)it.current()) ) {
delete c;
++it;
}
@@ -530,7 +530,7 @@ bool KXtWidget::x11Event( XEvent * e )
if ( xtparent )
setActiveWindow();
}
- return QWidget::x11Event( e );
+ return TQWidget::x11Event( e );
}
@@ -540,7 +540,7 @@ bool KXtWidget::x11Event( XEvent * e )
void KXtWidget::setActiveWindow()
{
if ( xtparent ) {
- if ( !QWidget::isActiveWindow() && isActiveWindow() ) {
+ if ( !TQWidget::isActiveWindow() && isActiveWindow() ) {
XFocusChangeEvent e;
e.type = FocusIn;
e.window = winId();
@@ -549,12 +549,12 @@ void KXtWidget::setActiveWindow()
XSendEvent( qt_xdisplay(), e.window, TRUE, NoEventMask, (XEvent*)&e );
}
} else {
- QWidget::setActiveWindow();
+ TQWidget::setActiveWindow();
}
}
/*!
- Different from QWidget::isActiveWindow()
+ Different from TQWidget::isActiveWindow()
*/
bool KXtWidget::isActiveWindow() const
{
@@ -564,7 +564,7 @@ bool KXtWidget::isActiveWindow() const
if ( win == None) return FALSE;
- QWidget *w = find( (WId)win );
+ TQWidget *w = find( (WId)win );
if ( w ) {
// We know that window
return w->topLevelWidget() == topLevelWidget();
@@ -586,7 +586,7 @@ bool KXtWidget::isActiveWindow() const
/*!\reimp
*/
-void KXtWidget::moveEvent( QMoveEvent* )
+void KXtWidget::moveEvent( TQMoveEvent* )
{
if ( xtparent )
return;
@@ -605,7 +605,7 @@ void KXtWidget::moveEvent( QMoveEvent* )
/*!\reimp
*/
-void KXtWidget::resizeEvent( QResizeEvent* )
+void KXtWidget::resizeEvent( TQResizeEvent* )
{
if ( xtparent )
return;
diff --git a/nsplugins/viewer/kxt.h b/nsplugins/viewer/kxt.h
index 1d594b328..44f05db19 100644
--- a/nsplugins/viewer/kxt.h
+++ b/nsplugins/viewer/kxt.h
@@ -46,11 +46,11 @@
#ifndef KXT_H
#define KXT_H
-#include <qglobal.h>
+#include <tqglobal.h>
#if QT_VERSION < 0x030100
#include <kapplication.h>
-#include <qwidget.h>
+#include <tqwidget.h>
#include <X11/Intrinsic.h>
class KXtApplication : public KApplication {
@@ -59,20 +59,20 @@ class KXtApplication : public KApplication {
public:
KXtApplication(int& argc, char** argv,
- const QCString& rAppName, bool allowStyles=true, bool GUIenabled=true,
+ const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true,
XrmOptionDescRec *options=0, int num_options=0, char** resources=0);
- KXtApplication(Display*, int& argc, char** argv, const QCString& rAppName,
+ KXtApplication(Display*, int& argc, char** argv, const TQCString& rAppName,
bool allowStyles=true, bool GUIenabled=true);
~KXtApplication();
};
-class KXtWidget : public QWidget {
+class KXtWidget : public TQWidget {
Q_OBJECT
Widget xtw;
Widget xtparent;
bool need_reroot;
void init(const char* name, WidgetClass widget_class,
- Widget parent, QWidget* qparent,
+ Widget parent, TQWidget* qparent,
ArgList args, Cardinal num_args,
bool managed);
friend void qwidget_realize( Widget widget, XtValueMask* mask,
@@ -81,7 +81,7 @@ class KXtWidget : public QWidget {
public:
KXtWidget(const char* name, Widget parent, bool managed=FALSE);
KXtWidget(const char* name, WidgetClass widget_class,
- QWidget *parent=0, ArgList args=0, Cardinal num_args=0,
+ TQWidget *parent=0, ArgList args=0, Cardinal num_args=0,
bool managed=FALSE);
~KXtWidget();
@@ -90,8 +90,8 @@ public:
void setActiveWindow();
protected:
- void moveEvent( QMoveEvent* );
- void resizeEvent( QResizeEvent* );
+ void moveEvent( TQMoveEvent* );
+ void resizeEvent( TQResizeEvent* );
bool x11Event( XEvent * );
};
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index cb39aa107..be313b52b 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -30,10 +30,10 @@
#include <stdlib.h>
#include <unistd.h>
-#include <qdict.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qtimer.h>
+#include <tqdict.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqtimer.h>
#include "kxt.h"
#include "nsplugin.h"
@@ -252,8 +252,8 @@ NPError g_NPN_GetURL(NPP instance, const char *url, const char *target)
NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata);
if (inst) {
- inst->requestURL( QString::fromLatin1(url), QString::null,
- QString::fromLatin1(target), 0 );
+ inst->requestURL( TQString::fromLatin1(url), TQString::null,
+ TQString::fromLatin1(target), 0 );
}
return NPERR_NO_ERROR;
@@ -267,8 +267,8 @@ NPError g_NPN_GetURLNotify(NPP instance, const char *url, const char *target,
NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata);
if (inst) {
kdDebug(1431) << "g_NPN_GetURLNotify: ndata=" << (void*)inst << endl;
- inst->requestURL( QString::fromLatin1(url), QString::null,
- QString::fromLatin1(target), notifyData, true );
+ inst->requestURL( TQString::fromLatin1(url), TQString::null,
+ TQString::fromLatin1(target), notifyData, true );
}
return NPERR_NO_ERROR;
@@ -281,7 +281,7 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target,
// http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api14.html
kdDebug(1431) << "g_NPN_PostURLNotify() [incomplete]" << endl;
kdDebug(1431) << "url=[" << url << "] target=[" << target << "]" << endl;
- QByteArray postdata;
+ TQByteArray postdata;
KParts::URLArgs args;
if (len == 0) {
@@ -289,7 +289,7 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target,
}
if (file) { // buf is a filename
- QFile f(buf);
+ TQFile f(buf);
if (!f.open(IO_ReadOnly)) {
return NPERR_FILE_NOT_FOUND;
}
@@ -318,7 +318,7 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target,
break;
}
- QString thisLine = QString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace();
+ TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace();
previousStart = &buf[l];
previousCR = true;
@@ -337,7 +337,7 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target,
kdDebug(1431) << "Post data: " << postdata.size() << " bytes" << endl;
#if 0
- QFile f("/tmp/nspostdata");
+ TQFile f("/tmp/nspostdata");
f.open(IO_WriteOnly);
f.writeBlock(postdata);
f.close();
@@ -360,9 +360,9 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target,
}
NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata);
- if (inst && !inst->normalizedURL(QString::fromLatin1(url)).isNull()) {
- inst->postURL( QString::fromLatin1(url), postdata, args.contentType(),
- QString::fromLatin1(target), notifyData, args, true );
+ if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) {
+ inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(),
+ TQString::fromLatin1(target), notifyData, args, true );
} else {
// Unsupported / insecure
return NPERR_INVALID_URL;
@@ -378,7 +378,7 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target,
// http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api13.html
kdDebug(1431) << "g_NPN_PostURL()" << endl;
kdDebug(1431) << "url=[" << url << "] target=[" << target << "]" << endl;
- QByteArray postdata;
+ TQByteArray postdata;
KParts::URLArgs args;
if (len == 0) {
@@ -386,7 +386,7 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target,
}
if (file) { // buf is a filename
- QFile f(buf);
+ TQFile f(buf);
if (!f.open(IO_ReadOnly)) {
return NPERR_FILE_NOT_FOUND;
}
@@ -415,7 +415,7 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target,
break;
}
- QString thisLine = QString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace();
+ TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace();
previousStart = &buf[l];
previousCR = true;
@@ -434,7 +434,7 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target,
kdDebug(1431) << "Post data: " << postdata.size() << " bytes" << endl;
#if 0
- QFile f("/tmp/nspostdata");
+ TQFile f("/tmp/nspostdata");
f.open(IO_WriteOnly);
f.writeBlock(postdata);
f.close();
@@ -457,9 +457,9 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target,
}
NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata);
- if (inst && !inst->normalizedURL(QString::fromLatin1(url)).isNull()) {
- inst->postURL( QString::fromLatin1(url), postdata, args.contentType(),
- QString::fromLatin1(target), 0L, args, false );
+ if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) {
+ inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(),
+ TQString::fromLatin1(target), 0L, args, false );
} else {
// Unsupported / insecure
return NPERR_INVALID_URL;
@@ -488,7 +488,7 @@ void g_NPN_Status(NPP instance, const char *message)
const char *g_NPN_UserAgent(NPP /*instance*/)
{
KProtocolManager kpm;
- QString agent = kpm.userAgentForHost("nspluginviewer");
+ TQString agent = kpm.userAgentForHost("nspluginviewer");
kdDebug(1431) << "g_NPN_UserAgent() = " << agent << endl;
// flash crashes without Firefox UA
agent = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.10) Gecko/2007101500 Firefox/2.0.0.10";
@@ -589,11 +589,11 @@ NSPluginInstance::forwarder(Widget w, XtPointer cl_data, XEvent * event, Boolean
NSPluginInstance::NSPluginInstance(NPP privateData, NPPluginFuncs *pluginFuncs,
KLibrary *handle, int width, int height,
- QString src, QString /*mime*/,
- QString appId, QString callbackId,
+ TQString src, TQString /*mime*/,
+ TQString appId, TQString callbackId,
bool embed, WId xembed,
- QObject *parent, const char* name )
- : DCOPObject(), QObject( parent, name )
+ TQObject *parent, const char* name )
+ : DCOPObject(), TQObject( parent, name )
{
Q_UNUSED(embed);
_visible = false;
@@ -611,13 +611,13 @@ NSPluginInstance::NSPluginInstance(NPP privateData, NPPluginFuncs *pluginFuncs,
_toplevel = _form = 0;
KURL base(src);
- base.setFileName( QString::null );
+ base.setFileName( TQString::null );
_baseURL = base.url();
memcpy(&_pluginFuncs, pluginFuncs, sizeof(_pluginFuncs));
- _timer = new QTimer( this );
- connect( _timer, SIGNAL(timeout()), SLOT(timer()) );
+ _timer = new TQTimer( this );
+ connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(timer()) );
kdDebug(1431) << "NSPluginInstance::NSPluginInstance" << endl;
kdDebug(1431) << "pdata = " << _npp->pdata << endl;
@@ -651,9 +651,9 @@ NSPluginInstance::NSPluginInstance(NPP privateData, NPPluginFuncs *pluginFuncs,
// Create form window that is searched for by flash plugin
_form = XtVaCreateWidget("form", compositeWidgetClass, _toplevel, NULL);
- XtSetArg(args[nargs], XtNvisual, QPaintDevice::x11AppVisual()); nargs++;
- XtSetArg(args[nargs], XtNdepth, QPaintDevice::x11AppDepth()); nargs++;
- XtSetArg(args[nargs], XtNcolormap, QPaintDevice::x11AppColormap()); nargs++;
+ XtSetArg(args[nargs], XtNvisual, TQPaintDevice::x11AppVisual()); nargs++;
+ XtSetArg(args[nargs], XtNdepth, TQPaintDevice::x11AppDepth()); nargs++;
+ XtSetArg(args[nargs], XtNcolormap, TQPaintDevice::x11AppColormap()); nargs++;
XtSetValues(_form, args, nargs);
XSync(qt_xdisplay(), false);
@@ -772,7 +772,7 @@ void NSPluginInstance::timer()
Request req( *_waitingRequests.head() );
_waitingRequests.remove();
- QString url;
+ TQString url;
// make absolute url
if ( req.url.left(11).lower()=="javascript:" )
@@ -810,8 +810,8 @@ void NSPluginInstance::timer()
if (req.post) {
// create stream
NSPluginStream *s = new NSPluginStream( this );
- connect( s, SIGNAL(finished(NSPluginStreamBase*)),
- SLOT(streamFinished(NSPluginStreamBase*)) );
+ connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)),
+ TQT_SLOT(streamFinished(NSPluginStreamBase*)) );
_streams.append( s );
kdDebug() << "posting to " << url << endl;
@@ -829,8 +829,8 @@ void NSPluginInstance::timer()
} else {
// create stream
NSPluginStream *s = new NSPluginStream( this );
- connect( s, SIGNAL(finished(NSPluginStreamBase*)),
- SLOT(streamFinished(NSPluginStreamBase*)) );
+ connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)),
+ TQT_SLOT(streamFinished(NSPluginStreamBase*)) );
_streams.append( s );
kdDebug() << "getting " << url << endl;
@@ -846,7 +846,7 @@ void NSPluginInstance::timer()
}
-QString NSPluginInstance::normalizedURL(const QString& url) const {
+TQString NSPluginInstance::normalizedURL(const TQString& url) const {
KURL bu( _baseURL );
KURL inURL(bu, url);
KConfig cfg("kcmnspluginrc", true);
@@ -861,15 +861,15 @@ QString NSPluginInstance::normalizedURL(const QString& url) const {
// Allow: javascript:, http, https, or no protocol (match loading)
kdDebug(1431) << "NSPluginInstance::normalizedURL - I don't think so. http or https only!" << endl;
- return QString::null;
+ return TQString::null;
}
-void NSPluginInstance::requestURL( const QString &url, const QString &mime,
- const QString &target, void *notify, bool forceNotify, bool reload )
+void NSPluginInstance::requestURL( const TQString &url, const TQString &mime,
+ const TQString &target, void *notify, bool forceNotify, bool reload )
{
// Generally this should already be done, but let's be safe for now.
- QString nurl = normalizedURL(url);
+ TQString nurl = normalizedURL(url);
if (nurl.isNull()) {
return;
}
@@ -880,13 +880,13 @@ void NSPluginInstance::requestURL( const QString &url, const QString &mime,
}
-void NSPluginInstance::postURL( const QString &url, const QByteArray& data,
- const QString &mime,
- const QString &target, void *notify,
+void NSPluginInstance::postURL( const TQString &url, const TQByteArray& data,
+ const TQString &mime,
+ const TQString &target, void *notify,
const KParts::URLArgs& args, bool forceNotify )
{
// Generally this should already be done, but let's be safe for now.
- QString nurl = normalizedURL(url);
+ TQString nurl = normalizedURL(url);
if (nurl.isNull()) {
return;
}
@@ -897,7 +897,7 @@ void NSPluginInstance::postURL( const QString &url, const QByteArray& data,
}
-void NSPluginInstance::emitStatus(const QString &message)
+void NSPluginInstance::emitStatus(const TQString &message)
{
if( _callback )
_callback->statusMessage( message );
@@ -907,7 +907,7 @@ void NSPluginInstance::emitStatus(const QString &message)
void NSPluginInstance::streamFinished( NSPluginStreamBase* strm )
{
kdDebug(1431) << "-> NSPluginInstance::streamFinished" << endl;
- emitStatus( QString::null );
+ emitStatus( TQString::null );
_streams.setAutoDelete(false); // Don't delete it yet!! we get called from
// its slot!
_streams.remove(strm);
@@ -998,9 +998,9 @@ void NSPluginInstance::resizePlugin(Q_INT32 w, Q_INT32 h)
Cardinal nargs = 0;
XtSetArg(args[nargs], XtNwidth, _width); nargs++;
XtSetArg(args[nargs], XtNheight, _height); nargs++;
- XtSetArg(args[nargs], XtNvisual, QPaintDevice::x11AppVisual()); nargs++;
- XtSetArg(args[nargs], XtNdepth, QPaintDevice::x11AppDepth()); nargs++;
- XtSetArg(args[nargs], XtNcolormap, QPaintDevice::x11AppColormap()); nargs++;
+ XtSetArg(args[nargs], XtNvisual, TQPaintDevice::x11AppVisual()); nargs++;
+ XtSetArg(args[nargs], XtNdepth, TQPaintDevice::x11AppDepth()); nargs++;
+ XtSetArg(args[nargs], XtNcolormap, TQPaintDevice::x11AppColormap()); nargs++;
XtSetArg(args[nargs], XtNborderWidth, 0); nargs++;
XtSetValues(_toplevel, args, nargs);
@@ -1021,27 +1021,27 @@ void NSPluginInstance::resizePlugin(Q_INT32 w, Q_INT32 h)
}
-void NSPluginInstance::javascriptResult(Q_INT32 id, QString result) {
- QMap<int, Request*>::iterator i = _jsrequests.find( id );
+void NSPluginInstance::javascriptResult(Q_INT32 id, TQString result) {
+ TQMap<int, Request*>::iterator i = _jsrequests.find( id );
if (i != _jsrequests.end()) {
Request *req = i.data();
_jsrequests.remove( i );
NSPluginStream *s = new NSPluginStream( this );
- connect( s, SIGNAL(finished(NSPluginStreamBase*)),
- SLOT(streamFinished(NSPluginStreamBase*)) );
+ connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)),
+ TQT_SLOT(streamFinished(NSPluginStreamBase*)) );
_streams.append( s );
int len = result.length();
- s->create( req->url, QString("text/plain"), req->notify, req->forceNotify );
+ s->create( req->url, TQString("text/plain"), req->notify, req->forceNotify );
kdDebug(1431) << "javascriptResult has been called with: "<<result<<endl;
if (len > 0) {
- QByteArray data(len + 1);
+ TQByteArray data(len + 1);
memcpy(data.data(), result.latin1(), len);
data[len] = 0;
s->process(data, 0);
} else {
len = 7; // "unknown"
- QByteArray data(len + 1);
+ TQByteArray data(len + 1);
memcpy(data.data(), "unknown", len);
data[len] = 0;
s->process(data, 0);
@@ -1190,7 +1190,7 @@ int32 NSPluginInstance::NPWriteReady(NPStream *stream)
}
-void NSPluginInstance::NPURLNotify(QString url, NPReason reason, void *notifyData)
+void NSPluginInstance::NPURLNotify(TQString url, NPReason reason, void *notifyData)
{
if (!_pluginFuncs.urlnotify)
return;
@@ -1249,15 +1249,15 @@ int XQueryKeymap( Display* dpy, char k[32] )
/***************************************************************************/
-NSPluginViewer::NSPluginViewer( QCString dcopId,
- QObject *parent, const char *name )
- : DCOPObject(dcopId), QObject( parent, name )
+NSPluginViewer::NSPluginViewer( TQCString dcopId,
+ TQObject *parent, const char *name )
+ : DCOPObject(dcopId), TQObject( parent, name )
{
_classes.setAutoDelete( true );
connect(KApplication::dcopClient(),
- SIGNAL(applicationRemoved(const QCString&)),
+ TQT_SIGNAL(applicationRemoved(const TQCString&)),
this,
- SLOT(appUnregistered(const QCString&)));
+ TQT_SLOT(appUnregistered(const TQCString&)));
}
@@ -1267,15 +1267,15 @@ NSPluginViewer::~NSPluginViewer()
}
-void NSPluginViewer::appUnregistered(const QCString& id) {
+void NSPluginViewer::appUnregistered(const TQCString& id) {
if (id.isEmpty()) {
return;
}
- QDictIterator<NSPluginClass> it(_classes);
+ TQDictIterator<NSPluginClass> it(_classes);
NSPluginClass *c;
while ( (c = it.current()) ) {
- QString key = it.currentKey();
+ TQString key = it.currentKey();
++it;
if (c->app() == id) {
_classes.remove(key);
@@ -1300,7 +1300,7 @@ void NSPluginViewer::shutdown()
}
-DCOPRef NSPluginViewer::newClass( QString plugin )
+DCOPRef NSPluginViewer::newClass( TQString plugin )
{
kdDebug(1431) << "NSPluginViewer::NewClass( " << plugin << ")" << endl;
@@ -1309,7 +1309,7 @@ DCOPRef NSPluginViewer::newClass( QString plugin )
if ( !cls ) {
// create new class
cls = new NSPluginClass( plugin, this );
- QCString id = "";
+ TQCString id = "";
DCOPClient *dc = callingDcopClient();
if (dc) {
id = dc->senderId();
@@ -1331,12 +1331,12 @@ DCOPRef NSPluginViewer::newClass( QString plugin )
/****************************************************************************/
-NSPluginClass::NSPluginClass( const QString &library,
- QObject *parent, const char *name )
- : DCOPObject(), QObject( parent, name )
+NSPluginClass::NSPluginClass( const TQString &library,
+ TQObject *parent, const char *name )
+ : DCOPObject(), TQObject( parent, name )
{
// initialize members
- _handle = KLibLoader::self()->library(QFile::encodeName(library));
+ _handle = KLibLoader::self()->library(TQFile::encodeName(library));
_libname = library;
_constructed = false;
_error = true;
@@ -1345,8 +1345,8 @@ NSPluginClass::NSPluginClass( const QString &library,
_NP_Initialize = 0;
_NP_Shutdown = 0;
- _timer = new QTimer( this );
- connect( _timer, SIGNAL(timeout()), SLOT(timer()) );
+ _timer = new TQTimer( this );
+ connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(timer()) );
// check lib handle
if (!_handle) {
@@ -1444,7 +1444,7 @@ int NSPluginClass::initialize()
}
-QString NSPluginClass::getMIMEDescription()
+TQString NSPluginClass::getMIMEDescription()
{
return _NP_GetMIMEDescription();
}
@@ -1458,10 +1458,10 @@ void NSPluginClass::shutdown()
}
-DCOPRef NSPluginClass::newInstance( QString url, QString mimeType, Q_INT8 embed,
- QStringList argn, QStringList argv,
- QString appId, QString callbackId,
- Q_INT8 reload, Q_INT8 doPost, QByteArray postData, Q_UINT32 xembed )
+DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, Q_INT8 embed,
+ TQStringList argn, TQStringList argv,
+ TQString appId, TQString callbackId,
+ Q_INT8 reload, Q_INT8 doPost, TQByteArray postData, Q_UINT32 xembed )
{
kdDebug(1431) << "-> NSPluginClass::NewInstance" << endl;
@@ -1472,15 +1472,15 @@ DCOPRef NSPluginClass::newInstance( QString url, QString mimeType, Q_INT8 embed,
unsigned int argc = argn.count();
char **_argn = new char*[argc];
char **_argv = new char*[argc];
- QString src = url;
+ TQString src = url;
int width = 0;
int height = 0;
- QString baseURL = url;
+ TQString baseURL = url;
for (unsigned int i=0; i<argc; i++)
{
- QCString encN = argn[i].utf8();
- QCString encV = argv[i].utf8();
+ TQCString encN = argn[i].utf8();
+ TQCString encV = argv[i].utf8();
const char *n = encN;
const char *v = encV;
@@ -1540,9 +1540,9 @@ DCOPRef NSPluginClass::newInstance( QString url, QString mimeType, Q_INT8 embed,
// create source stream
if ( !src.isEmpty() ) {
if (doPost) {
- inst->postURL(src, postData, mimeType, QString::null, 0, KParts::URLArgs(), false);
+ inst->postURL(src, postData, mimeType, TQString::null, 0, KParts::URLArgs(), false);
} else {
- inst->requestURL( src, mimeType, QString::null, 0, false, reload );
+ inst->requestURL( src, mimeType, TQString::null, 0, false, reload );
}
}
@@ -1561,7 +1561,7 @@ void NSPluginClass::destroyInstance( NSPluginInstance* inst )
/****************************************************************************/
NSPluginStreamBase::NSPluginStreamBase( NSPluginInstance *instance )
- : QObject( instance ), _instance(instance), _stream(0), _tempFile(0L),
+ : TQObject( instance ), _instance(instance), _stream(0), _tempFile(0L),
_pos(0), _queue(0), _queuePos(0), _error(false)
{
_informed = false;
@@ -1632,7 +1632,7 @@ void NSPluginStreamBase::inform()
}
-bool NSPluginStreamBase::create( const QString& url, const QString& mimeType, void *notify, bool forceNotify)
+bool NSPluginStreamBase::create( const TQString& url, const TQString& mimeType, void *notify, bool forceNotify)
{
if ( _stream )
return false;
@@ -1667,7 +1667,7 @@ void NSPluginStreamBase::updateURL( const KURL& newURL )
_stream->url = strdup(_url.url().ascii());
}
-int NSPluginStreamBase::process( const QByteArray &data, int start )
+int NSPluginStreamBase::process( const TQByteArray &data, int start )
{
int32 max, sent, to_sent, len;
char *d = data.data() + start;
@@ -1742,7 +1742,7 @@ bool NSPluginStreamBase::pump()
}
-void NSPluginStreamBase::queue( const QByteArray &data )
+void NSPluginStreamBase::queue( const TQByteArray &data )
{
_queue = data;
_queue.detach();
@@ -1811,8 +1811,8 @@ void NSPluginStreamBase::finish( bool err )
NSPluginBufStream::NSPluginBufStream( class NSPluginInstance *instance )
: NSPluginStreamBase( instance )
{
- _timer = new QTimer( this );
- connect( _timer, SIGNAL(timeout()), this, SLOT(timer()) );
+ _timer = new TQTimer( this );
+ connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timer()) );
}
@@ -1822,8 +1822,8 @@ NSPluginBufStream::~NSPluginBufStream()
}
-bool NSPluginBufStream::get( const QString& url, const QString& mimeType,
- const QByteArray &buf, void *notifyData,
+bool NSPluginBufStream::get( const TQString& url, const TQString& mimeType,
+ const TQByteArray &buf, void *notifyData,
bool singleShot )
{
_singleShot = singleShot;
@@ -1857,8 +1857,8 @@ void NSPluginBufStream::timer()
NSPluginStream::NSPluginStream( NSPluginInstance *instance )
: NSPluginStreamBase( instance ), _job(0)
{
- _resumeTimer = new QTimer( this );
- connect(_resumeTimer, SIGNAL(timeout()), this, SLOT(resume()));
+ _resumeTimer = new TQTimer( this );
+ connect(_resumeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(resume()));
}
@@ -1869,7 +1869,7 @@ NSPluginStream::~NSPluginStream()
}
-bool NSPluginStream::get( const QString& url, const QString& mimeType,
+bool NSPluginStream::get( const TQString& url, const TQString& mimeType,
void *notify, bool reload )
{
// create new stream
@@ -1881,23 +1881,23 @@ bool NSPluginStream::get( const QString& url, const QString& mimeType,
if (reload) {
_job->addMetaData("cache", "reload");
}
- connect(_job, SIGNAL(data(KIO::Job *, const QByteArray &)),
- SLOT(data(KIO::Job *, const QByteArray &)));
- connect(_job, SIGNAL(result(KIO::Job *)), SLOT(result(KIO::Job *)));
- connect(_job, SIGNAL(totalSize(KIO::Job *, KIO::filesize_t )),
- SLOT(totalSize(KIO::Job *, KIO::filesize_t)));
- connect(_job, SIGNAL(mimetype(KIO::Job *, const QString &)),
- SLOT(mimetype(KIO::Job *, const QString &)));
- connect(_job, SIGNAL(redirection(KIO::Job *, const KURL&)),
- SLOT(redirection(KIO::Job *, const KURL&)));
+ connect(_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
+ TQT_SLOT(data(KIO::Job *, const TQByteArray &)));
+ connect(_job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(result(KIO::Job *)));
+ connect(_job, TQT_SIGNAL(totalSize(KIO::Job *, KIO::filesize_t )),
+ TQT_SLOT(totalSize(KIO::Job *, KIO::filesize_t)));
+ connect(_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)),
+ TQT_SLOT(mimetype(KIO::Job *, const TQString &)));
+ connect(_job, TQT_SIGNAL(redirection(KIO::Job *, const KURL&)),
+ TQT_SLOT(redirection(KIO::Job *, const KURL&)));
}
return false;
}
-bool NSPluginStream::post( const QString& url, const QByteArray& data,
- const QString& mimeType, void *notify, const KParts::URLArgs& args )
+bool NSPluginStream::post( const TQString& url, const TQByteArray& data,
+ const TQString& mimeType, void *notify, const KParts::URLArgs& args )
{
// create new stream
if ( create( url, mimeType, notify ) ) {
@@ -1906,22 +1906,22 @@ bool NSPluginStream::post( const QString& url, const QByteArray& data,
_job->addMetaData("content-type", args.contentType());
_job->addMetaData("errorPage", "false");
_job->addMetaData("AllowCompressedPage", "false");
- connect(_job, SIGNAL(data(KIO::Job *, const QByteArray &)),
- SLOT(data(KIO::Job *, const QByteArray &)));
- connect(_job, SIGNAL(result(KIO::Job *)), SLOT(result(KIO::Job *)));
- connect(_job, SIGNAL(totalSize(KIO::Job *, KIO::filesize_t )),
- SLOT(totalSize(KIO::Job *, KIO::filesize_t)));
- connect(_job, SIGNAL(mimetype(KIO::Job *, const QString &)),
- SLOT(mimetype(KIO::Job *, const QString &)));
- connect(_job, SIGNAL(redirection(KIO::Job *, const KURL&)),
- SLOT(redirection(KIO::Job *, const KURL&)));
+ connect(_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
+ TQT_SLOT(data(KIO::Job *, const TQByteArray &)));
+ connect(_job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(result(KIO::Job *)));
+ connect(_job, TQT_SIGNAL(totalSize(KIO::Job *, KIO::filesize_t )),
+ TQT_SLOT(totalSize(KIO::Job *, KIO::filesize_t)));
+ connect(_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)),
+ TQT_SLOT(mimetype(KIO::Job *, const TQString &)));
+ connect(_job, TQT_SIGNAL(redirection(KIO::Job *, const KURL&)),
+ TQT_SLOT(redirection(KIO::Job *, const KURL&)));
}
return false;
}
-void NSPluginStream::data(KIO::Job * job, const QByteArray &data)
+void NSPluginStream::data(KIO::Job * job, const TQByteArray &data)
{
//kdDebug(1431) << "NSPluginStream::data - job=" << (void*)job << " data size=" << data.size() << endl;
queue( data );
@@ -1942,9 +1942,9 @@ void NSPluginStream::totalSize(KIO::Job * job, KIO::filesize_t size)
_stream->end = size;
}
-void NSPluginStream::mimetype(KIO::Job * job, const QString &mimeType)
+void NSPluginStream::mimetype(KIO::Job * job, const TQString &mimeType)
{
- kdDebug(1431) << "NSPluginStream::QByteArray - job=" << (void*)job << " mimeType=" << mimeType << endl;
+ kdDebug(1431) << "NSPluginStream::TQByteArray - job=" << (void*)job << " mimeType=" << mimeType << endl;
_mimeType = mimeType;
}
diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h
index 76d2e659b..c68eb1bcf 100644
--- a/nsplugins/viewer/nsplugin.h
+++ b/nsplugins/viewer/nsplugin.h
@@ -32,14 +32,14 @@
#include "NSPluginCallbackIface_stub.h"
-#include <qobject.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qptrqueue.h>
-#include <qdict.h>
-#include <qmap.h>
-#include <qintdict.h>
-#include <qguardedptr.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqptrqueue.h>
+#include <tqdict.h>
+#include <tqmap.h>
+#include <tqintdict.h>
+#include <tqguardedptr.h>
#include <kparts/browserextension.h> // for URLArgs
#include <kio/job.h>
@@ -82,8 +82,8 @@ protected:
void finish( bool err );
bool pump();
bool error() { return _error; }
- void queue( const QByteArray &data );
- bool create( const QString& url, const QString& mimeType, void *notify, bool forceNotify = false );
+ void queue( const TQByteArray &data );
+ bool create( const TQString& url, const TQString& mimeType, void *notify, bool forceNotify = false );
int tries() { return _tries; }
void inform( );
void updateURL( const KURL& newURL );
@@ -93,16 +93,16 @@ protected:
NPStream *_stream;
void *_notifyData;
KURL _url;
- QString _fileURL;
- QString _mimeType;
- QByteArray _data;
+ TQString _fileURL;
+ TQString _mimeType;
+ TQByteArray _data;
class KTempFile *_tempFile;
private:
- int process( const QByteArray &data, int start );
+ int process( const TQByteArray &data, int start );
unsigned int _pos;
- QByteArray _queue;
+ TQByteArray _queue;
unsigned int _queuePos;
int _tries;
bool _onlyAsFile;
@@ -120,20 +120,20 @@ public:
NSPluginStream( class NSPluginInstance *instance );
~NSPluginStream();
- bool get(const QString& url, const QString& mimeType, void *notifyData, bool reload = false);
- bool post(const QString& url, const QByteArray& data, const QString& mimeType, void *notifyData, const KParts::URLArgs& args);
+ bool get(const TQString& url, const TQString& mimeType, void *notifyData, bool reload = false);
+ bool post(const TQString& url, const TQByteArray& data, const TQString& mimeType, void *notifyData, const KParts::URLArgs& args);
protected slots:
- void data(KIO::Job *job, const QByteArray &data);
+ void data(KIO::Job *job, const TQByteArray &data);
void totalSize(KIO::Job *job, KIO::filesize_t size);
- void mimetype(KIO::Job * job, const QString &mimeType);
+ void mimetype(KIO::Job * job, const TQString &mimeType);
void result(KIO::Job *job);
void redirection(KIO::Job *job, const KURL& url);
void resume();
protected:
- QGuardedPtr<KIO::TransferJob> _job;
- QTimer *_resumeTimer;
+ TQGuardedPtr<KIO::TransferJob> _job;
+ TQTimer *_resumeTimer;
};
@@ -145,18 +145,18 @@ public:
NSPluginBufStream( class NSPluginInstance *instance );
~NSPluginBufStream();
- bool get( const QString& url, const QString& mimeType, const QByteArray &buf, void *notifyData, bool singleShot=false );
+ bool get( const TQString& url, const TQString& mimeType, const TQByteArray &buf, void *notifyData, bool singleShot=false );
protected slots:
void timer();
protected:
- QTimer *_timer;
+ TQTimer *_timer;
bool _singleShot;
};
-class NSPluginInstance : public QObject, public virtual NSPluginInstanceIface
+class NSPluginInstance : public TQObject, public virtual NSPluginInstanceIface
{
Q_OBJECT
@@ -164,9 +164,9 @@ public:
// constructor, destructor
NSPluginInstance( NPP privateData, NPPluginFuncs *pluginFuncs, KLibrary *handle,
- int width, int height, QString src, QString mime,
- QString appId, QString callbackId, bool embed, WId xembed,
- QObject *parent, const char* name=0 );
+ int width, int height, TQString src, TQString mime,
+ TQString appId, TQString callbackId, bool embed, WId xembed,
+ TQObject *parent, const char* name=0 );
~NSPluginInstance();
// DCOP functions
@@ -174,7 +174,7 @@ public:
int winId() { return _form != 0 ? XtWindow(_form) : 0; }
int setWindow(Q_INT8 remove=0);
void resizePlugin(Q_INT32 w, Q_INT32 h);
- void javascriptResult(Q_INT32 id, QString result);
+ void javascriptResult(Q_INT32 id, TQString result);
void displayPlugin();
void gotFocusIn();
void gotFocusOut();
@@ -194,19 +194,19 @@ public:
int32 NPWriteReady(NPStream *stream);
// URL functions
- void NPURLNotify(QString url, NPReason reason, void *notifyData);
+ void NPURLNotify(TQString url, NPReason reason, void *notifyData);
// Event handling
uint16 HandleEvent(void *event);
// signal emitters
- void emitStatus( const QString &message);
- void requestURL( const QString &url, const QString &mime,
- const QString &target, void *notify, bool forceNotify = false, bool reload = false );
- void postURL( const QString &url, const QByteArray& data, const QString &mime,
- const QString &target, void *notify, const KParts::URLArgs& args, bool forceNotify = false );
+ void emitStatus( const TQString &message);
+ void requestURL( const TQString &url, const TQString &mime,
+ const TQString &target, void *notify, bool forceNotify = false, bool reload = false );
+ void postURL( const TQString &url, const TQByteArray& data, const TQString &mime,
+ const TQString &target, void *notify, const KParts::URLArgs& args, bool forceNotify = false );
- QString normalizedURL(const QString& url) const;
+ TQString normalizedURL(const TQString& url) const;
public slots:
void streamFinished( NSPluginStreamBase *strm );
@@ -224,40 +224,40 @@ private:
bool _destroyed;
bool _visible;
void addTempFile(KTempFile *tmpFile);
- QPtrList<KTempFile> _tempFiles;
+ TQPtrList<KTempFile> _tempFiles;
NSPluginCallbackIface_stub *_callback;
- QPtrList<NSPluginStreamBase> _streams;
+ TQPtrList<NSPluginStreamBase> _streams;
KLibrary *_handle;
- QTimer *_timer;
+ TQTimer *_timer;
NPP _npp;
NPPluginFuncs _pluginFuncs;
Widget _area, _form, _toplevel;
WId _xembed_window;
- QString _baseURL;
+ TQString _baseURL;
int _width, _height;
struct Request
{
// A GET request
- Request( const QString &_url, const QString &_mime,
- const QString &_target, void *_notify, bool _forceNotify = false,
+ Request( const TQString &_url, const TQString &_mime,
+ const TQString &_target, void *_notify, bool _forceNotify = false,
bool _reload = false)
{ url=_url; mime=_mime; target=_target; notify=_notify; post=false; forceNotify = _forceNotify; reload = _reload; }
// A POST request
- Request( const QString &_url, const QByteArray& _data,
- const QString &_mime, const QString &_target, void *_notify,
+ Request( const TQString &_url, const TQByteArray& _data,
+ const TQString &_mime, const TQString &_target, void *_notify,
const KParts::URLArgs& _args, bool _forceNotify = false)
{ url=_url; mime=_mime; target=_target;
notify=_notify; post=true; data=_data; args=_args;
forceNotify = _forceNotify; }
- QString url;
- QString mime;
- QString target;
- QByteArray data;
+ TQString url;
+ TQString mime;
+ TQString target;
+ TQByteArray data;
bool post;
bool forceNotify;
bool reload;
@@ -267,29 +267,29 @@ private:
NPWindow _win;
NPSetWindowCallbackStruct _win_info;
- QPtrQueue<Request> _waitingRequests;
- QMap<int, Request*> _jsrequests;
+ TQPtrQueue<Request> _waitingRequests;
+ TQMap<int, Request*> _jsrequests;
};
-class NSPluginClass : public QObject, virtual public NSPluginClassIface
+class NSPluginClass : public TQObject, virtual public NSPluginClassIface
{
Q_OBJECT
public:
- NSPluginClass( const QString &library, QObject *parent, const char *name=0 );
+ NSPluginClass( const TQString &library, TQObject *parent, const char *name=0 );
~NSPluginClass();
- QString getMIMEDescription();
- DCOPRef newInstance(QString url, QString mimeType, Q_INT8 embed,
- QStringList argn, QStringList argv,
- QString appId, QString callbackId, Q_INT8 reload, Q_INT8 post,
- QByteArray postData, Q_UINT32 xembed );
+ TQString getMIMEDescription();
+ DCOPRef newInstance(TQString url, TQString mimeType, Q_INT8 embed,
+ TQStringList argn, TQStringList argv,
+ TQString appId, TQString callbackId, Q_INT8 reload, Q_INT8 post,
+ TQByteArray postData, Q_UINT32 xembed );
void destroyInstance( NSPluginInstance* inst );
bool error() { return _error; }
- void setApp(const QCString& app) { _app = app; }
- const QCString& app() const { return _app; }
+ void setApp(const TQCString& app) { _app = app; }
+ const TQCString& app() const { return _app; }
protected slots:
void timer();
@@ -299,10 +299,10 @@ private:
void shutdown();
KLibrary *_handle;
- QString _libname;
+ TQString _libname;
bool _constructed;
bool _error;
- QTimer *_timer;
+ TQTimer *_timer;
NP_GetMIMEDescriptionUPP *_NP_GetMIMEDescription;
NP_InitializeUPP *_NP_Initialize;
@@ -311,28 +311,28 @@ private:
NPPluginFuncs _pluginFuncs;
NPNetscapeFuncs _nsFuncs;
- QPtrList<NSPluginInstance> _instances;
- QPtrList<NSPluginInstance> _trash;
+ TQPtrList<NSPluginInstance> _instances;
+ TQPtrList<NSPluginInstance> _trash;
- QCString _app;
+ TQCString _app;
};
-class NSPluginViewer : public QObject, virtual public NSPluginViewerIface
+class NSPluginViewer : public TQObject, virtual public NSPluginViewerIface
{
Q_OBJECT
public:
- NSPluginViewer( QCString dcopId, QObject *parent, const char *name=0 );
+ NSPluginViewer( TQCString dcopId, TQObject *parent, const char *name=0 );
virtual ~NSPluginViewer();
void shutdown();
- DCOPRef newClass( QString plugin );
+ DCOPRef newClass( TQString plugin );
private slots:
- void appUnregistered(const QCString& id);
+ void appUnregistered(const TQCString& id);
private:
- QDict<NSPluginClass> _classes;
+ TQDict<NSPluginClass> _classes;
};
diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp
index 856cfe67c..b34c1e03c 100644
--- a/nsplugins/viewer/qxteventloop.cpp
+++ b/nsplugins/viewer/qxteventloop.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** Implementation of QWidget class
+** Implementation of TQWidget class
**
** Created : 931031
**
@@ -39,11 +39,11 @@
#if QT_VERSION >= 0x030100
-#include <qapplication.h>
-#include <qwidgetintdict.h>
+#include <tqapplication.h>
+#include <tqwidgetintdict.h>
#include <kglobal.h>
-// resolve the conflict between X11's FocusIn and QEvent::FocusIn
+// resolve the conflict between X11's FocusIn and TQEvent::FocusIn
const int XFocusOut = FocusOut;
const int XFocusIn = FocusIn;
#undef FocusOut
@@ -65,10 +65,10 @@ public:
void unhook();
XtAppContext appContext, ownContext;
- QMemArray<XtEventDispatchProc> dispatchers;
- QWidgetIntDict mapper;
+ TQMemArray<XtEventDispatchProc> dispatchers;
+ TQWidgetIntDict mapper;
- QIntDict<QSocketNotifier> socknotDict;
+ TQIntDict<TQSocketNotifier> socknotDict;
bool activate_timers;
XtIntervalId timerid;
@@ -87,7 +87,7 @@ static XEvent* last_xevent = 0;
Rationale: An XEvent handled by Qt does not go through the Xt event
handlers, and the internal state of Xt/Motif widgets will not be
updated. This function should only be used if an event delivered by
- Qt to a QWidget needs to be sent to an Xt/Motif widget.
+ Qt to a TQWidget needs to be sent to an Xt/Motif widget.
*/
bool QXtEventLoop::redeliverEvent( XEvent *event )
{
@@ -123,7 +123,7 @@ void QXtEventLoopPrivate::hookMeUp()
int et;
for ( et = 2; et < LASTEvent; et++ )
dispatchers[ et ] =
- XtSetEventDispatcher( QPaintDevice::x11AppDisplay(),
+ XtSetEventDispatcher( TQPaintDevice::x11AppDisplay(),
et, ::qmotif_event_dispatcher );
}
@@ -135,29 +135,29 @@ void QXtEventLoopPrivate::unhook()
// ### TODO extensions?
int et;
for ( et = 2; et < LASTEvent; et++ )
- (void) XtSetEventDispatcher( QPaintDevice::x11AppDisplay(),
+ (void) XtSetEventDispatcher( TQPaintDevice::x11AppDisplay(),
et, dispatchers[ et ] );
dispatchers.resize( 0 );
/*
We cannot destroy the app context here because it closes the X
- display, something QApplication does as well a bit later.
+ display, something TQApplication does as well a bit later.
if ( ownContext )
XtDestroyApplicationContext( ownContext );
*/
appContext = ownContext = 0;
}
-extern bool qt_try_modal( QWidget *, XEvent * ); // defined in qapplication_x11.cpp
+extern bool qt_try_modal( TQWidget *, XEvent * ); // defined in qapplication_x11.cpp
Boolean qmotif_event_dispatcher( XEvent *event )
{
- QApplication::sendPostedEvents();
+ TQApplication::sendPostedEvents();
- QWidgetIntDict *mapper = &static_d->mapper;
- QWidget* qMotif = mapper->find( event->xany.window );
- if ( !qMotif && QWidget::find( event->xany.window) == 0 ) {
+ TQWidgetIntDict *mapper = &static_d->mapper;
+ TQWidget* qMotif = mapper->find( event->xany.window );
+ if ( !qMotif && TQWidget::find( event->xany.window) == 0 ) {
// event is not for Qt, try Xt
- Display* dpy = QPaintDevice::x11AppDisplay();
+ Display* dpy = TQPaintDevice::x11AppDisplay();
Widget w = XtWindowToWidget( dpy, event->xany.window );
while ( w && ! ( qMotif = mapper->find( XtWindow( w ) ) ) ) {
if ( XtIsShell( w ) ) {
@@ -201,11 +201,11 @@ Boolean qmotif_event_dispatcher( XEvent *event )
return True;
- if ( QApplication::activePopupWidget() )
+ if ( TQApplication::activePopupWidget() )
// we get all events through the popup grabs. discard the event
return True;
- if ( qMotif && QApplication::activeModalWidget() ) {
+ if ( qMotif && TQApplication::activeModalWidget() ) {
if ( !qt_try_modal(qMotif, event) )
return True;
@@ -229,13 +229,13 @@ Boolean qmotif_event_dispatcher( XEvent *event )
QXtEventLoop only provides a few public functions, but is the brains
behind the integration. QXtEventLoop is responsible for initializing
the Xt toolkit and the Xt application context. It does not open a
- connection to the X server, this is done by using QApplication.
+ connection to the X server, this is done by using TQApplication.
The only member function in QXtEventLoop that depends on an X server
connection is QXtEventLoop::initialize(). QXtEventLoop must be created before
- QApplication.
+ TQApplication.
- Example usage of QXtEventLoop and QApplication:
+ Example usage of QXtEventLoop and TQApplication:
\code
static char *resources[] = {
@@ -247,7 +247,7 @@ Boolean qmotif_event_dispatcher( XEvent *event )
QXtEventLoop integrator( "AppClass" );
XtAppSetFallbackResources( integrator.applicationContext(),
resources );
- QApplication app( argc, argv );
+ TQApplication app( argc, argv );
...
@@ -264,7 +264,7 @@ Boolean qmotif_event_dispatcher( XEvent *event )
All arguments passed to this function (\a applicationClass, \a
options and \a numOptions) are used to call XtDisplayInitialize()
- after QApplication has been constructed.
+ after TQApplication has been constructed.
*/
@@ -311,7 +311,7 @@ void QXtEventLoop::appStartingUp()
{
int argc = qApp->argc();
XtDisplayInitialize( d->appContext,
- QPaintDevice::x11AppDisplay(),
+ TQPaintDevice::x11AppDisplay(),
qApp->name(),
d->applicationClass,
d->options,
@@ -329,7 +329,7 @@ void QXtEventLoop::appClosingDown()
/*!\internal
*/
-void QXtEventLoop::registerWidget( QWidget* w )
+void QXtEventLoop::registerWidget( TQWidget* w )
{
if ( !static_d )
return;
@@ -339,7 +339,7 @@ void QXtEventLoop::registerWidget( QWidget* w )
/*!\internal
*/
-void QXtEventLoop::unregisterWidget( QWidget* w )
+void QXtEventLoop::unregisterWidget( TQWidget* w )
{
if ( !static_d )
return;
@@ -352,7 +352,7 @@ void QXtEventLoop::unregisterWidget( QWidget* w )
void qmotif_socknot_handler( XtPointer pointer, int *, XtInputId *id )
{
QXtEventLoop *eventloop = (QXtEventLoop *) pointer;
- QSocketNotifier *socknot = static_d->socknotDict.find( *id );
+ TQSocketNotifier *socknot = static_d->socknotDict.find( *id );
if ( ! socknot ) // this shouldn't happen
return;
eventloop->setSocketNotifierPending( socknot );
@@ -360,19 +360,19 @@ void qmotif_socknot_handler( XtPointer pointer, int *, XtInputId *id )
/*! \reimp
*/
-void QXtEventLoop::registerSocketNotifier( QSocketNotifier *notifier )
+void QXtEventLoop::registerSocketNotifier( TQSocketNotifier *notifier )
{
XtInputMask mask;
switch ( notifier->type() ) {
- case QSocketNotifier::Read:
+ case TQSocketNotifier::Read:
mask = XtInputReadMask;
break;
- case QSocketNotifier::Write:
+ case TQSocketNotifier::Write:
mask = XtInputWriteMask;
break;
- case QSocketNotifier::Exception:
+ case TQSocketNotifier::Exception:
mask = XtInputExceptMask;
break;
@@ -386,14 +386,14 @@ void QXtEventLoop::registerSocketNotifier( QSocketNotifier *notifier )
qmotif_socknot_handler, this );
d->socknotDict.insert( id, notifier );
- QEventLoop::registerSocketNotifier( notifier );
+ TQEventLoop::registerSocketNotifier( notifier );
}
/*! \reimp
*/
-void QXtEventLoop::unregisterSocketNotifier( QSocketNotifier *notifier )
+void QXtEventLoop::unregisterSocketNotifier( TQSocketNotifier *notifier )
{
- QIntDictIterator<QSocketNotifier> it( d->socknotDict );
+ TQIntDictIterator<TQSocketNotifier> it( d->socknotDict );
while ( it.current() && notifier != it.current() )
++it;
if ( ! it.current() ) {
@@ -405,7 +405,7 @@ void QXtEventLoop::unregisterSocketNotifier( QSocketNotifier *notifier )
XtRemoveInput( it.currentKey() );
d->socknotDict.remove( it.currentKey() );
- QEventLoop::unregisterSocketNotifier( notifier );
+ TQEventLoop::unregisterSocketNotifier( notifier );
}
/*! \internal
@@ -422,7 +422,7 @@ bool QXtEventLoop::processEvents( ProcessEventsFlags flags )
{
// Qt uses posted events to do lots of delayed operations, like repaints... these
// need to be delivered before we go to sleep
- QApplication::sendPostedEvents();
+ TQApplication::sendPostedEvents();
// make sure we fire off Qt's timers
int ttw = timeToWait();
diff --git a/nsplugins/viewer/qxteventloop.h b/nsplugins/viewer/qxteventloop.h
index 0bed590b2..02ed69541 100644
--- a/nsplugins/viewer/qxteventloop.h
+++ b/nsplugins/viewer/qxteventloop.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Implementation of QWidget class
+** Implementation of TQWidget class
**
** Created : 931031
**
@@ -36,10 +36,10 @@
#ifndef QXTEVENTLOOP_H
#define QXTEVENTLOOP_H
-#include <qglobal.h>
+#include <tqglobal.h>
#if QT_VERSION >= 0x030100
-#include <qeventloop.h>
+#include <tqeventloop.h>
@@ -57,11 +57,11 @@ public:
XtAppContext applicationContext() const;
- void registerSocketNotifier( QSocketNotifier * );
- void unregisterSocketNotifier( QSocketNotifier * );
+ void registerSocketNotifier( TQSocketNotifier * );
+ void unregisterSocketNotifier( TQSocketNotifier * );
- static void registerWidget( QWidget* );
- static void unregisterWidget( QWidget* );
+ static void registerWidget( TQWidget* );
+ static void unregisterWidget( TQWidget* );
static bool redeliverEvent( XEvent *event );
static XEvent* lastEvent();
diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp
index 3e23a944a..ba14b0990 100644
--- a/nsplugins/viewer/viewer.cpp
+++ b/nsplugins/viewer/viewer.cpp
@@ -34,8 +34,8 @@
#include <kglobal.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <qptrlist.h>
-#include <qsocketnotifier.h>
+#include <tqptrlist.h>
+#include <tqsocketnotifier.h>
#include <stdlib.h>
#include <sys/resource.h>
#include <sys/time.h>
@@ -85,7 +85,7 @@ static int x_errhandler(Display *dpy, XErrorEvent *error)
* the "old style" and keep lot's of global vars. :-)
*/
-static QCString g_dcopId;
+static TQCString g_dcopId;
/**
* parseCommandLine - get command line parameters
@@ -122,11 +122,11 @@ void quitXt()
struct SocketNot
{
int fd;
- QObject *obj;
+ TQObject *obj;
XtInputId id;
};
-QPtrList<SocketNot> _notifiers[3];
+TQPtrList<SocketNot> _notifiers[3];
/**
* socketCallback - send event to the socket notifier
@@ -136,10 +136,10 @@ void socketCallback(void *client_data, int* /*source*/, XtInputId* /*id*/)
{
kdDebug(1430) << "-> socketCallback( client_data=" << client_data << " )" << endl;
- QEvent event( QEvent::SockAct );
+ TQEvent event( TQEvent::SockAct );
SocketNot *socknot = (SocketNot *)client_data;
kdDebug(1430) << "obj=" << (void*)socknot->obj << endl;
- QApplication::sendEvent( socknot->obj, &event );
+ TQApplication::sendEvent( socknot->obj, &event );
kdDebug(1430) << "<- socketCallback" << endl;
}
@@ -151,12 +151,12 @@ void socketCallback(void *client_data, int* /*source*/, XtInputId* /*id*/)
* the original one in Qt. I hope this works with every dynamic library loader on any OS.
*
*/
-extern bool qt_set_socket_handler( int, int, QObject *, bool );
-bool qt_set_socket_handler( int sockfd, int type, QObject *obj, bool enable )
+extern bool qt_set_socket_handler( int, int, TQObject *, bool );
+bool qt_set_socket_handler( int sockfd, int type, TQObject *obj, bool enable )
{
if ( sockfd < 0 || type < 0 || type > 2 || obj == 0 ) {
#if defined(CHECK_RANGE)
- qWarning( "QSocketNotifier: Internal error" );
+ qWarning( "TQSocketNotifier: Internal error" );
#endif
return FALSE;
}
@@ -164,9 +164,9 @@ bool qt_set_socket_handler( int sockfd, int type, QObject *obj, bool enable )
XtPointer inpMask = 0;
switch (type) {
- case QSocketNotifier::Read: inpMask = (XtPointer)XtInputReadMask; break;
- case QSocketNotifier::Write: inpMask = (XtPointer)XtInputWriteMask; break;
- case QSocketNotifier::Exception: inpMask = (XtPointer)XtInputExceptMask; break;
+ case TQSocketNotifier::Read: inpMask = (XtPointer)XtInputReadMask; break;
+ case TQSocketNotifier::Write: inpMask = (XtPointer)XtInputWriteMask; break;
+ case TQSocketNotifier::Exception: inpMask = (XtPointer)XtInputExceptMask; break;
default: return FALSE;
}
@@ -185,7 +185,7 @@ bool qt_set_socket_handler( int sockfd, int type, QObject *obj, bool enable )
#if defined(CHECK_STATE)
if ( p && p->fd==sockfd ) {
static const char *t[] = { "read", "write", "exception" };
- qWarning( "QSocketNotifier: Multiple socket notifiers for "
+ qWarning( "TQSocketNotifier: Multiple socket notifiers for "
"same socket %d and type %s", sockfd, t[type] );
}
#endif