summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
-rw-r--r--doc/kinfocenter/samba/index.docbook2
-rw-r--r--doc/ksplashml/index.docbook2
-rw-r--r--drkonqi/backtrace.cpp18
-rw-r--r--drkonqi/backtrace.h8
-rw-r--r--drkonqi/debugger.cpp2
-rw-r--r--drkonqi/krashconf.cpp2
-rw-r--r--drkonqi/toplevel.cpp4
-rw-r--r--kappfinder/common.cpp8
-rw-r--r--kappfinder/main_install.cpp2
-rw-r--r--kappfinder/toplevel.cpp4
-rw-r--r--kate/app/kateapp.cpp2
-rw-r--r--kate/app/kateconsole.cpp2
-rw-r--r--kate/app/kategrepdialog.cpp20
-rw-r--r--kate/app/kategrepdialog.h8
-rw-r--r--kate/app/katemain.h2
-rw-r--r--kate/app/katemdi.cpp6
-rw-r--r--kate/app/katemwmodonhddialog.cpp10
-rw-r--r--kate/app/katemwmodonhddialog.h4
-rw-r--r--kate/app/katesavemodifieddialog.cpp2
-rw-r--r--kate/app/katesession.cpp6
-rw-r--r--kate/app/kateviewspace.cpp4
-rw-r--r--kate/app/kateviewspacecontainer.cpp2
-rw-r--r--kate/app/kwritemain.cpp2
-rw-r--r--kate/utils/messageview.h2
-rw-r--r--kcontrol/access/kaccess.cpp10
-rw-r--r--kcontrol/access/kcmaccess.cpp2
-rw-r--r--kcontrol/arts/arts.cpp38
-rw-r--r--kcontrol/arts/arts.h6
-rw-r--r--kcontrol/arts/krichtextlabel.cpp4
-rw-r--r--kcontrol/background/bgdialog.cpp10
-rw-r--r--kcontrol/background/bgdialog.h2
-rw-r--r--kcontrol/background/bgrender.cpp8
-rw-r--r--kcontrol/background/bgrender.h4
-rw-r--r--kcontrol/background/bgsettings.cpp54
-rw-r--r--kcontrol/background/bgsettings.h4
-rw-r--r--kcontrol/background/bgwallpaper.cpp2
-rw-r--r--kcontrol/clock/dtime.cpp18
-rw-r--r--kcontrol/clock/main.cpp2
-rw-r--r--kcontrol/colors/colorscm.cpp16
-rw-r--r--kcontrol/colors/widgetcanvas.cpp6
-rw-r--r--kcontrol/componentchooser/componentchooser.cpp6
-rw-r--r--kcontrol/componentchooser/kcm_componentchooser.cpp2
-rw-r--r--kcontrol/crypto/crypto.cpp14
-rw-r--r--kcontrol/css/kcmcss.cpp2
-rw-r--r--kcontrol/displayconfig/displayconfig.cpp2
-rw-r--r--kcontrol/dnssd/kcmdnssd.cpp6
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp2
-rw-r--r--kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp10
-rw-r--r--kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h4
-rw-r--r--kcontrol/fonts/fonts.cpp8
-rw-r--r--kcontrol/hwmanager/devicepropsdlg.cpp2
-rw-r--r--kcontrol/hwmanager/hwmanager.cpp8
-rw-r--r--kcontrol/icons/icons.cpp10
-rw-r--r--kcontrol/icons/iconthemes.cpp4
-rw-r--r--kcontrol/info/info.cpp12
-rw-r--r--kcontrol/info/info_linux.cpp2
-rw-r--r--kcontrol/info/memory.cpp8
-rw-r--r--kcontrol/input/core/themepage.cpp8
-rw-r--r--kcontrol/input/mouse.cpp2
-rw-r--r--kcontrol/ioslaveinfo/kcmioslaveinfo.cpp2
-rw-r--r--kcontrol/joystick/joywidget.cpp2
-rw-r--r--kcontrol/kcontrol/aboutwidget.cpp2
-rw-r--r--kcontrol/kcontrol/dockcontainer.cpp2
-rw-r--r--kcontrol/kcontrol/helpwidget.cpp4
-rw-r--r--kcontrol/kcontrol/main.cpp8
-rw-r--r--kcontrol/kcontrol/modulemenu.cpp4
-rw-r--r--kcontrol/kcontrol/modules.cpp12
-rw-r--r--kcontrol/kcontrol/modules.h6
-rw-r--r--kcontrol/kcontrol/moduletreeview.cpp2
-rw-r--r--kcontrol/kcontrol/searchwidget.cpp2
-rw-r--r--kcontrol/kcontrol/toplevel.cpp10
-rw-r--r--kcontrol/kded/kcmkded.cpp4
-rw-r--r--kcontrol/keys/ChangeLog4
-rw-r--r--kcontrol/keys/keyconfig.cpp12
-rw-r--r--kcontrol/keys/main.cpp24
-rw-r--r--kcontrol/keys/modifiers.cpp26
-rw-r--r--kcontrol/keys/shortcuts.cpp14
-rw-r--r--kcontrol/keys/treeview.cpp4
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp2
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp4
-rw-r--r--kcontrol/kfontinst/kfile-plugin/KFileFont.cpp2
-rw-r--r--kcontrol/kfontinst/kio/KioFonts.cpp32
-rw-r--r--kcontrol/kfontinst/lib/FcEngine.cpp2
-rw-r--r--kcontrol/kfontinst/lib/Misc.cpp4
-rw-r--r--kcontrol/kfontinst/thumbnail/FontThumbnail.cpp2
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp2
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewerApp.cpp2
-rw-r--r--kcontrol/kicker/applettab_impl.cpp2
-rw-r--r--kcontrol/kicker/lookandfeeltab_impl.cpp2
-rw-r--r--kcontrol/kicker/main.cpp14
-rw-r--r--kcontrol/kicker/menutab_impl.cpp6
-rw-r--r--kcontrol/kicker/positiontab_impl.cpp2
-rw-r--r--kcontrol/kio/cache.cpp4
-rw-r--r--kcontrol/kio/fakeuaprovider.cpp2
-rw-r--r--kcontrol/kio/kcookiesmanagement.cpp2
-rw-r--r--kcontrol/kio/smbrodlg.cpp4
-rw-r--r--kcontrol/knotify/knotify.cpp2
-rw-r--r--kcontrol/konq/desktopbehavior_impl.cpp2
-rw-r--r--kcontrol/konq/fontopts.cpp6
-rw-r--r--kcontrol/konq/previews.cpp8
-rw-r--r--kcontrol/konq/rootopts.cpp16
-rw-r--r--kcontrol/konqhtml/appearance.cpp6
-rw-r--r--kcontrol/konqhtml/khttpoptdlg.cpp2
-rw-r--r--kcontrol/konqhtml/pluginopts.cpp4
-rw-r--r--kcontrol/konsole/schemaeditor.cpp8
-rw-r--r--kcontrol/konsole/sessioneditor.cpp12
-rw-r--r--kcontrol/krdb/krdb.cpp26
-rw-r--r--kcontrol/kthememanager/ktheme.cpp16
-rw-r--r--kcontrol/kthememanager/ktheme.h2
-rw-r--r--kcontrol/kthememanager/kthememanager.cpp16
-rw-r--r--kcontrol/locale/kcmlocale.cpp52
-rw-r--r--kcontrol/locale/kcmlocale.h2
-rw-r--r--kcontrol/locale/localemon.cpp2
-rw-r--r--kcontrol/locale/localenum.cpp8
-rw-r--r--kcontrol/locale/localeother.cpp2
-rw-r--r--kcontrol/locale/localetime.cpp8
-rw-r--r--kcontrol/locale/toplevel.cpp8
-rw-r--r--kcontrol/privacy/kprivacymanager.cpp6
-rw-r--r--kcontrol/privacy/privacy.cpp2
-rw-r--r--kcontrol/randr/configdialog.cpp2
-rw-r--r--kcontrol/randr/configdialog.h4
-rw-r--r--kcontrol/randr/krandrtray.cpp8
-rw-r--r--kcontrol/randr/krandrtray.h2
-rw-r--r--kcontrol/randr/main.cpp2
-rw-r--r--kcontrol/samba/AUTHORS2
-rw-r--r--kcontrol/samba/kcmsambastatistics.cpp4
-rw-r--r--kcontrol/samba/ksmbstatus.cpp18
-rw-r--r--kcontrol/samba/ksmbstatus.h6
-rw-r--r--kcontrol/screensaver/scrnsave.cpp30
-rw-r--r--kcontrol/screensaver/scrnsave.h12
-rw-r--r--kcontrol/style/kcmstyle.cpp8
-rw-r--r--kcontrol/style/keramik/keramikconf.cpp4
-rw-r--r--kcontrol/style/menupreview.cpp2
-rw-r--r--kcontrol/tdm/background.h2
-rw-r--r--kcontrol/tdm/main.cpp2
-rw-r--r--kcontrol/tdm/tdm-appear.cpp10
-rw-r--r--kcontrol/tdm/tdm-users.cpp4
-rw-r--r--kcontrol/view1394/view1394.cpp2
-rw-r--r--kcontrol/xinerama/kcmxinerama.cpp4
-rw-r--r--kdcop/kdcopwindow.cpp2
-rw-r--r--kdepasswd/kcm/kcm_useraccount.kcfg2
-rw-r--r--kdepasswd/kcm/main.cpp10
-rw-r--r--kdesktop/bgmanager.cc4
-rw-r--r--kdesktop/desktop.cc26
-rw-r--r--kdesktop/desktop.h4
-rw-r--r--kdesktop/init.cc18
-rw-r--r--kdesktop/kcustommenu.cc4
-rw-r--r--kdesktop/kdesktop.kcfg4
-rw-r--r--kdesktop/kdiconview.cc16
-rw-r--r--kdesktop/kfileividesktop.cpp2
-rw-r--r--kdesktop/krootwm.cc12
-rw-r--r--kdesktop/lock/lockdlg.cc2
-rw-r--r--kdesktop/lock/lockprocess.cc26
-rw-r--r--kdesktop/lock/lockprocess.h6
-rw-r--r--kdesktop/lock/main.cc4
-rw-r--r--kdesktop/lock/sakdlg.cc18
-rw-r--r--kdesktop/lock/sakdlg.h4
-rw-r--r--kdesktop/lockeng.cc26
-rw-r--r--kdesktop/lockeng.h6
-rw-r--r--kdesktop/main.cc4
-rw-r--r--kdesktop/minicli.cpp8
-rw-r--r--kdesktop/startupid.cpp2
-rw-r--r--kfind/ChangeLog4
-rw-r--r--kfind/kdatecombo.cpp4
-rw-r--r--kfind/kftabdlg.cpp14
-rw-r--r--kfind/kfwin.cpp6
-rw-r--r--kfind/kquery.cpp16
-rw-r--r--kfind/kquery.h8
-rw-r--r--khelpcenter/docmetainfo.cpp4
-rw-r--r--khelpcenter/fontdialog.cpp6
-rw-r--r--khelpcenter/formatter.cpp2
-rw-r--r--khelpcenter/glossary.cpp10
-rw-r--r--khelpcenter/glossary.h4
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.cpp42
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.h14
-rw-r--r--khelpcenter/htmlsearch/index.cpp2
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.cpp18
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.h6
-rw-r--r--khelpcenter/kcmhelpcenter.cpp32
-rw-r--r--khelpcenter/kcmhelpcenter.h10
-rw-r--r--khelpcenter/khc_indexbuilder.cpp22
-rw-r--r--khelpcenter/khc_indexbuilder.h8
-rw-r--r--khelpcenter/khelpcenter.kcfg2
-rw-r--r--khelpcenter/mainwindow.cpp6
-rw-r--r--khelpcenter/navigator.cpp6
-rw-r--r--khelpcenter/navigator.h2
-rw-r--r--khelpcenter/scrollkeepertreebuilder.cpp4
-rw-r--r--khelpcenter/searchengine.cpp30
-rw-r--r--khelpcenter/searchengine.h10
-rw-r--r--khelpcenter/searchhandler.cpp30
-rw-r--r--khelpcenter/searchhandler.h10
-rw-r--r--khelpcenter/searchwidget.cpp4
-rw-r--r--khelpcenter/toc.cpp12
-rw-r--r--khelpcenter/toc.h4
-rw-r--r--khelpcenter/view.cpp4
-rw-r--r--khotkeys/kcontrol/kcmkhotkeys.cpp2
-rw-r--r--khotkeys/kcontrol/menuedit.cpp2
-rw-r--r--khotkeys/shared/actions.cpp4
-rw-r--r--khotkeys/shared/input.cpp4
-rw-r--r--khotkeys/shared/input.h4
-rw-r--r--khotkeys/shared/khotkeysglobal.cpp2
-rw-r--r--khotkeys/shared/voices.cpp2
-rw-r--r--khotkeys/shared/voices.h4
-rw-r--r--kicker/applets/clock/clock.cpp38
-rw-r--r--kicker/applets/clock/clockapplet.kcfg6
-rw-r--r--kicker/applets/clock/init.cpp4
-rw-r--r--kicker/applets/launcher/quickbutton.cpp6
-rw-r--r--kicker/applets/launcher/quicklauncher.cpp4
-rw-r--r--kicker/applets/lockout/lockout.cpp4
-rw-r--r--kicker/applets/media/mediaapplet.cpp4
-rw-r--r--kicker/applets/menu/menuapplet.cpp4
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp10
-rw-r--r--kicker/applets/minipager/pagerapplet.h2
-rw-r--r--kicker/applets/minipager/pagerbutton.cpp2
-rw-r--r--kicker/applets/naughty/NaughtyApplet.cpp6
-rw-r--r--kicker/applets/run/runapplet.cpp8
-rw-r--r--kicker/applets/swallow/swallow.cpp10
-rw-r--r--kicker/applets/swallow/swallow.h8
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.cpp4
-rw-r--r--kicker/applets/taskbar/taskbarapplet.cpp4
-rw-r--r--kicker/applets/trash/trashapplet.cpp4
-rw-r--r--kicker/extensions/dockbar/dockbarextension.cpp6
-rw-r--r--kicker/extensions/kasbar/ChangeLog4
-rw-r--r--kicker/extensions/kasbar/kasaboutdlg.cpp4
-rw-r--r--kicker/extensions/kasbar/kasbar.cpp2
-rw-r--r--kicker/extensions/kasbar/kasbarapp.cpp2
-rw-r--r--kicker/extensions/kasbar/kasbarextension.cpp4
-rw-r--r--kicker/extensions/kasbar/kasclockitem.cpp4
-rw-r--r--kicker/extensions/kasbar/kasgroupitem.cpp4
-rw-r--r--kicker/extensions/kasbar/kasitem.cpp4
-rw-r--r--kicker/extensions/kasbar/kasprefsdlg.cpp4
-rw-r--r--kicker/extensions/kasbar/kasstartupitem.cpp12
-rw-r--r--kicker/extensions/kasbar/kastaskitem.cpp6
-rw-r--r--kicker/extensions/kasbar/kastaskpopup.cpp2
-rw-r--r--kicker/extensions/sidebar/sidebarextension.cpp8
-rw-r--r--kicker/extensions/taskbar/taskbarextension.cpp4
-rw-r--r--kicker/kicker/buttons/desktopbutton.cpp2
-rw-r--r--kicker/kicker/buttons/nonkdeappbutton.cpp6
-rw-r--r--kicker/kicker/buttons/servicebutton.cpp4
-rw-r--r--kicker/kicker/core/container_base.cpp2
-rw-r--r--kicker/kicker/core/container_extension.cpp10
-rw-r--r--kicker/kicker/core/extensionmanager.cpp8
-rw-r--r--kicker/kicker/core/kicker.cpp30
-rw-r--r--kicker/kicker/core/kicker.h4
-rw-r--r--kicker/kicker/core/main.cpp2
-rw-r--r--kicker/kicker/core/panelextension.cpp2
-rw-r--r--kicker/kicker/core/pluginmanager.cpp22
-rw-r--r--kicker/kicker/kicker-3.4-reverseLayout.cpp4
-rw-r--r--kicker/kicker/plugins/kickoff-beagle-plugin.cpp2
-rw-r--r--kicker/kicker/ui/addapplet.cpp22
-rw-r--r--kicker/kicker/ui/browser_mnu.cpp12
-rw-r--r--kicker/kicker/ui/hidebutton.cpp2
-rw-r--r--kicker/kicker/ui/itemview.cpp8
-rw-r--r--kicker/kicker/ui/k_mnu.cpp2
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp32
-rw-r--r--kicker/kicker/ui/service_mnu.cpp16
-rw-r--r--kicker/libkicker/global.cpp8
-rw-r--r--kicker/libkicker/kickerSettings.kcfg4
-rw-r--r--kicker/libkicker/panelbutton.cpp16
-rw-r--r--kicker/libkicker/panner.cpp2
-rw-r--r--kicker/libkicker/simplebutton.cpp2
-rw-r--r--kicker/menuext/find/findmenu.cpp2
-rw-r--r--kicker/menuext/kate/katesessionmenu.cpp2
-rw-r--r--kicker/menuext/konq-profiles/konqy_menu.cpp4
-rw-r--r--kicker/menuext/konsole/konsole_mnu.cpp8
-rw-r--r--kicker/menuext/prefmenu/prefmenu.cpp2
-rw-r--r--kicker/menuext/recentdocs/recentdocsmenu.cpp2
-rw-r--r--kicker/menuext/remote/remotemenu.cpp6
-rw-r--r--kicker/menuext/tdeprint/print_mnu.cpp2
-rw-r--r--kicker/menuext/tom/tom.cc10
-rw-r--r--kicker/proxy/appletproxy.cpp4
-rw-r--r--kicker/proxy/extensiondebugger.cpp4
-rw-r--r--kicker/proxy/extensionproxy.cpp4
-rw-r--r--kicker/taskbar/taskbar.cpp10
-rw-r--r--kicker/taskbar/taskbar.h4
-rw-r--r--kicker/taskbar/taskcontainer.cpp6
-rw-r--r--kicker/taskmanager/tasklmbmenu.cpp2
-rw-r--r--kicker/taskmanager/taskmanager.cpp16
-rw-r--r--kioslave/cgi/cgi.cpp2
-rw-r--r--kioslave/cgi/cgi.h2
-rw-r--r--kioslave/cgi/kcmcgi/kcmcgi.cpp2
-rw-r--r--kioslave/finger/kio_finger.cpp22
-rw-r--r--kioslave/finger/kio_finger.h4
-rw-r--r--kioslave/fish/fish.cpp4
-rw-r--r--kioslave/home/kdedmodule/homedirnotifymodule.cpp2
-rw-r--r--kioslave/info/info.cc16
-rw-r--r--kioslave/info/info.h2
-rw-r--r--kioslave/mac/kio_mac.cpp96
-rw-r--r--kioslave/mac/kio_mac.h6
-rw-r--r--kioslave/man/kio_man.cpp36
-rw-r--r--kioslave/man/kio_man.h4
-rw-r--r--kioslave/media/kcmodule/main.cpp2
-rw-r--r--kioslave/media/libmediacommon/notifieraction.cpp2
-rw-r--r--kioslave/media/libmediacommon/notifiersettings.cpp2
-rw-r--r--kioslave/media/mediamanager/dialog.cpp2
-rw-r--r--kioslave/media/mediamanager/halbackend.cpp16
-rw-r--r--kioslave/media/mediamanager/mediamanager.cpp2
-rw-r--r--kioslave/media/mediamanager/tdehardwarebackend.cpp24
-rw-r--r--kioslave/media/medianotifier/medianotifier.cpp4
-rw-r--r--kioslave/media/mounthelper/dialog.cpp2
-rw-r--r--kioslave/media/mounthelper/kio_media_mounthelper.cpp10
-rw-r--r--kioslave/media/mounthelper/kio_media_mounthelper.h2
-rw-r--r--kioslave/remote/kdedmodule/remotedirnotify.cpp4
-rw-r--r--kioslave/remote/kdedmodule/remotedirnotifymodule.cpp2
-rw-r--r--kioslave/remote/remoteimpl.cpp8
-rw-r--r--kioslave/sftp/CHANGELOG4
-rw-r--r--kioslave/smb/kio_smb.h6
-rw-r--r--kioslave/smb/kio_smb_mount.cpp40
-rw-r--r--kioslave/system/kdedmodule/systemdirnotify.cpp4
-rw-r--r--kioslave/system/kdedmodule/systemdirnotifymodule.cpp2
-rw-r--r--kioslave/system/systemimpl.cpp8
-rw-r--r--kioslave/thumbnail/exrcreator.cpp2
-rw-r--r--kioslave/thumbnail/thumbnail.cpp6
-rw-r--r--kioslave/trash/kfile-plugin/kfile_trash.cpp2
-rw-r--r--kioslave/trash/testtrash.cpp4
-rw-r--r--kioslave/trash/trashimpl.cpp6
-rw-r--r--klipper/applet.cpp2
-rw-r--r--klipper/configdialog.cpp2
-rw-r--r--klipper/configdialog.h4
-rw-r--r--klipper/klipperpopup.cpp4
-rw-r--r--klipper/toplevel.cpp12
-rw-r--r--klipper/toplevel.h2
-rw-r--r--klipper/urlgrabber.cpp4
-rw-r--r--kmenuedit/basictab.cpp2
-rw-r--r--kmenuedit/kmenuedit.cpp4
-rw-r--r--kmenuedit/menufile.cpp2
-rw-r--r--kmenuedit/treeview.cpp8
-rw-r--r--knetattach/knetattach.ui.h4
-rw-r--r--konqueror/ChangeLog2
-rw-r--r--konqueror/KonquerorIface.cc2
-rw-r--r--konqueror/about/konq_aboutpage.cc10
-rw-r--r--konqueror/client/kfmclient.cc12
-rw-r--r--konqueror/iconview/konq_iconview.cc2
-rw-r--r--konqueror/keditbookmarks/toplevel.cpp10
-rw-r--r--konqueror/konq_combo.cc4
-rw-r--r--konqueror/konq_extensionmanager.cc4
-rw-r--r--konqueror/konq_frame.cc2
-rw-r--r--konqueror/konq_main.cc4
-rw-r--r--konqueror/konq_mainwindow.cc62
-rw-r--r--konqueror/konq_mainwindow.h2
-rw-r--r--konqueror/konq_profiledlg.cc2
-rw-r--r--konqueror/konq_tabs.cc2
-rw-r--r--konqueror/konq_view.cc4
-rw-r--r--konqueror/konq_view.h2
-rw-r--r--konqueror/konq_viewmgr.cc16
-rw-r--r--konqueror/konqueror.kcfg4
-rw-r--r--konqueror/listview/konq_infolistviewitem.cc6
-rw-r--r--konqueror/listview/konq_listview.cc2
-rw-r--r--konqueror/listview/konq_listviewitems.cc10
-rw-r--r--konqueror/listview/konq_listviewwidget.cc12
-rw-r--r--konqueror/listview/konq_textviewitem.cc4
-rw-r--r--konqueror/remoteencodingplugin/kremoteencodingplugin.cpp4
-rw-r--r--konqueror/shellcmdplugin/kshellcmdexecutor.cpp2
-rw-r--r--konqueror/shellcmdplugin/kshellcmdplugin.cpp4
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp20
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp4
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp8
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.cpp2
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.cpp8
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.h2
-rw-r--r--konqueror/sidebar/trees/history_module/history_settings.cpp2
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.cpp2
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp18
-rw-r--r--konqueror/sidebar/trees/konqsidebar_tree.cpp2
-rw-r--r--konqueror/sidebar/web_module/web_module.cpp4
-rw-r--r--konsole/konsole/TEPty.cpp12
-rw-r--r--konsole/konsole/TEPty.h6
-rw-r--r--konsole/konsole/TEWidget.cpp4
-rw-r--r--konsole/konsole/keytrans.cpp2
-rw-r--r--konsole/konsole/konsole.cpp72
-rw-r--r--konsole/konsole/konsole_part.cpp18
-rw-r--r--konsole/konsole/konsole_part.h2
-rw-r--r--konsole/konsole/kwrited.cpp8
-rw-r--r--konsole/konsole/main.cpp12
-rw-r--r--konsole/konsole/schema.cpp2
-rw-r--r--konsole/konsole/session.cpp18
-rw-r--r--konsole/konsole/session.h8
-rw-r--r--kpager/desktop.cpp6
-rw-r--r--kpager/kpager.cpp6
-rw-r--r--kpersonalizer/kcountrypage.cpp12
-rw-r--r--kpersonalizer/keyecandypage.cpp112
-rw-r--r--kpersonalizer/kfindlanguage.cpp4
-rw-r--r--kpersonalizer/kospage.cpp2
-rw-r--r--kpersonalizer/kpersonalizer.cpp2
-rw-r--r--kpersonalizer/krefinepage.cpp2
-rw-r--r--kpersonalizer/kstylepage.cpp30
-rw-r--r--kpersonalizer/main.cpp2
-rw-r--r--kreadconfig/kreadconfig.cpp4
-rw-r--r--kscreensaver/blankscrn.cpp6
-rw-r--r--kscreensaver/random.cpp10
-rw-r--r--ksmserver/main.cpp2
-rw-r--r--ksmserver/server.cpp24
-rw-r--r--ksmserver/shutdown.cpp10
-rw-r--r--ksmserver/shutdowndlg.cpp14
-rw-r--r--ksmserver/startup.cpp10
-rw-r--r--ksplashml/kcmksplash/installer.cpp16
-rw-r--r--ksplashml/kcmksplash/main.cpp2
-rw-r--r--ksplashml/themeengine/default/themelegacy.cpp2
-rw-r--r--ksplashml/themeengine/redmond/themeredmond.cpp6
-rw-r--r--ksplashml/themeengine/standard/themestandard.cpp2
-rw-r--r--ksplashml/themeengine/standard/wndicon.cpp2
-rw-r--r--ksplashml/themeengine/standard/wndstatus.cpp2
-rw-r--r--ksplashml/themeengine/unified/themeunified.cpp2
-rw-r--r--kstart/kstart.cpp4
-rw-r--r--ksysguard/gui/KSysGuardApplet.cc6
-rw-r--r--ksysguard/gui/SensorBrowser.cc4
-rw-r--r--ksysguard/gui/SensorDisplayLib/ListView.cc12
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessList.cc16
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorDisplay.cc2
-rw-r--r--ksysguard/gui/Workspace.cc4
-rw-r--r--ksysguard/gui/ksgrd/SensorAgent.h2
-rw-r--r--ksysguard/gui/ksgrd/SensorShellAgent.cc30
-rw-r--r--ksysguard/gui/ksgrd/SensorShellAgent.h12
-rw-r--r--ksysguard/gui/ksysguard.cc12
-rw-r--r--ksystraycmd/ksystraycmd.cpp2
-rw-r--r--ksystraycmd/main.cpp2
-rw-r--r--kxkb/TODO4
-rw-r--r--kxkb/extension.cpp22
-rw-r--r--kxkb/kcmmisc.cpp6
-rw-r--r--kxkb/kxkb.cpp12
-rw-r--r--kxkb/kxkb.h4
-rw-r--r--libkonq/favicons/favicons.cpp2
-rw-r--r--libkonq/kfileivi.cc8
-rw-r--r--libkonq/konq_bgnddlg.cc8
-rw-r--r--libkonq/konq_dirpart.cc14
-rw-r--r--libkonq/konq_filetip.cc2
-rw-r--r--libkonq/konq_historymgr.cc6
-rw-r--r--libkonq/konq_iconviewwidget.cc42
-rw-r--r--libkonq/konq_operations.cc14
-rw-r--r--libkonq/konq_pixmapprovider.cc4
-rw-r--r--libkonq/konq_popupmenu.cc4
-rw-r--r--libkonq/konq_propsview.cc16
-rw-r--r--libkonq/konq_settings.cc8
-rw-r--r--libkonq/konq_settings.h2
-rw-r--r--libkonq/konq_xmlguiclient.cc6
-rw-r--r--nsplugins/nspluginloader.cpp12
-rw-r--r--nsplugins/nspluginloader.h6
-rw-r--r--nsplugins/pluginscan.cpp12
-rw-r--r--nsplugins/viewer/nsplugin.cpp10
-rw-r--r--tdeprint/slave/kio_print.cpp2
-rw-r--r--tdeprint/tdeprintfax/conffax.cpp6
-rw-r--r--tdeprint/tdeprintfax/confgeneral.cpp4
-rw-r--r--tdeprint/tdeprintfax/confsystem.cpp4
-rw-r--r--tdeprint/tdeprintfax/faxab.cpp4
-rw-r--r--tdeprint/tdeprintfax/faxctrl.cpp34
-rw-r--r--tdeprint/tdeprintfax/faxctrl.h8
-rw-r--r--tdesu/tdesu/sudlg.cpp2
-rw-r--r--tdesu/tdesu/tdesu.cpp4
-rw-r--r--tdm/kfrontend/kfdialog.cpp2
-rw-r--r--tdm/kfrontend/kgapp.cpp30
-rw-r--r--tdm/kfrontend/sakdlg.cc20
-rw-r--r--tdm/kfrontend/sakdlg.h4
-rw-r--r--tdm/kfrontend/tdmshutdown.cpp4
-rw-r--r--tdm/kfrontend/themer/tdmlabel.cpp6
-rw-r--r--tdm/kfrontend/themer/tdmpixmap.cpp2
-rw-r--r--tdmlib/kgreet_classic.cpp6
-rw-r--r--tdmlib/kgreet_pam.cpp6
-rw-r--r--tdmlib/kgreet_winbind.cpp10
-rw-r--r--tqt3integration/module/module.cpp2
-rw-r--r--twin/client.cpp16
-rw-r--r--twin/client.h6
-rw-r--r--twin/clients/b2/config/config.cpp2
-rw-r--r--twin/clients/default/config/config.cpp2
-rw-r--r--twin/clients/default/kdedefault.cpp2
-rw-r--r--twin/clients/keramik/config/config.cpp2
-rw-r--r--twin/clients/kwmtheme/cli_installer/main.cpp6
-rw-r--r--twin/clients/kwmtheme/kwmthemeclient.cpp4
-rw-r--r--twin/clients/modernsystem/config/config.cpp2
-rw-r--r--twin/clients/plastik/config/config.cpp2
-rw-r--r--twin/clients/quartz/config/config.cpp2
-rw-r--r--twin/kcmtwin/twindecoration/buttons.cpp2
-rw-r--r--twin/kcmtwin/twindecoration/preview.cpp4
-rw-r--r--twin/kcmtwin/twindecoration/twindecoration.cpp6
-rw-r--r--twin/kcmtwin/twinoptions/main.cpp12
-rw-r--r--twin/kcmtwin/twinoptions/mouse.cpp8
-rw-r--r--twin/kcmtwin/twinoptions/windows.cpp4
-rw-r--r--twin/kcmtwin/twinoptions/windows.h4
-rw-r--r--twin/kcmtwin/twinrules/kcm.cpp2
-rw-r--r--twin/killer/killer.cpp4
-rw-r--r--twin/lib/kdecoration_p.cpp2
-rw-r--r--twin/lib/kdecoration_plugins_p.cpp8
-rw-r--r--twin/main.cpp2
-rw-r--r--twin/options.cpp2
-rw-r--r--twin/plugins.cpp2
-rw-r--r--twin/popupinfo.cpp2
-rw-r--r--twin/tabbox.cpp8
-rw-r--r--twin/twinbindings.cpp2
-rw-r--r--twin/useractions.cpp14
-rw-r--r--twin/workspace.cpp52
-rw-r--r--twin/workspace.h14
490 files changed, 1962 insertions, 1962 deletions
diff --git a/doc/kinfocenter/samba/index.docbook b/doc/kinfocenter/samba/index.docbook
index 37b14c48..36df1da1 100644
--- a/doc/kinfocenter/samba/index.docbook
+++ b/doc/kinfocenter/samba/index.docbook
@@ -188,7 +188,7 @@ often, or which user opened the most files or whatever.</para>
<title>Contributors</title>
<listitem><para>Conversion to kcontrol applet:</para>
<para>&Matthias.Hoelzer-Kluepfel; &Matthias.Hoelzer-Kluepfel.mail;</para></listitem>
-<listitem><para>Use of <classname>KProcess</classname> instead of popen, and more error checking:</para>
+<listitem><para>Use of <classname>TDEProcess</classname> instead of popen, and more error checking:</para>
<para>&David.Faure; &David.Faure.mail;</para></listitem>
<listitem><para>Conversion to kcmodule, added tab pages 2,3,4, bug
fixed:</para>
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook
index b461e26c..15a82687 100644
--- a/doc/ksplashml/index.docbook
+++ b/doc/ksplashml/index.docbook
@@ -1154,7 +1154,7 @@ void Theme2k::initUi()
mText-&gt;setFixedHeight( 48 );
setFixedSize( vbox-&gt;sizeHint() );
- QRect rect(KGlobalSettings::splashScreenDesktopGeometry());
+ QRect rect(TDEGlobalSettings::splashScreenDesktopGeometry());
move( rect.x() + (rect.width() - size().width())/2,
rect.y() + (rect.height() - size().height())/2 );
}
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp
index 2688dec5..a76f9c9a 100644
--- a/drkonqi/backtrace.cpp
+++ b/drkonqi/backtrace.cpp
@@ -44,7 +44,7 @@ BackTrace::BackTrace(const KrashConfig *krashconf, TQObject *parent,
: TQObject(parent, name),
m_krashconf(krashconf), m_temp(NULL), m_temp_cmd(NULL)
{
- m_proc = new KProcess;
+ m_proc = new TDEProcess;
}
BackTrace::~BackTrace()
@@ -123,7 +123,7 @@ void BackTrace::start()
}
// start the debugger
- m_proc = new KProcess;
+ m_proc = new TDEProcess;
m_proc->setUseShell(true);
if (need_root_access == false) {
@@ -133,15 +133,15 @@ void BackTrace::start()
*m_proc << "tdesu -t --comment \"" << i18n("Administrative access is required to generate a backtrace") << "\" -c \"" << m_temp_cmd->name() << "\"";
}
- 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*)));
+ connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ TQT_SLOT(slotReadInput(TDEProcess*, char*, int)));
+ connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)),
+ TQT_SLOT(slotProcessExited(TDEProcess*)));
- m_proc->start ( KProcess::NotifyOnExit, KProcess::All );
+ m_proc->start ( TDEProcess::NotifyOnExit, TDEProcess::All );
}
-void BackTrace::slotReadInput(KProcess *, char* buf, int buflen)
+void BackTrace::slotReadInput(TDEProcess *, char* buf, int buflen)
{
TQString newstr = TQString::fromLocal8Bit(buf, buflen);
newstr.replace("\n\n", "\n");
@@ -156,7 +156,7 @@ void BackTrace::slotReadInput(KProcess *, char* buf, int buflen)
}
}
-void BackTrace::slotProcessExited(KProcess *proc)
+void BackTrace::slotProcessExited(TDEProcess *proc)
{
// start it again
kill(m_krashconf->pid(), SIGCONT);
diff --git a/drkonqi/backtrace.h b/drkonqi/backtrace.h
index 661dc246..94f5bcf9 100644
--- a/drkonqi/backtrace.h
+++ b/drkonqi/backtrace.h
@@ -28,7 +28,7 @@
#ifndef BACKTRACE_H
#define BACKTRACE_H
-class KProcess;
+class TDEProcess;
class KrashConfig;
class KTempFile;
@@ -52,13 +52,13 @@ signals:
void done(const TQString &); // replaces whole text
protected slots:
- void slotProcessExited(KProcess * proc);
- void slotReadInput(KProcess * proc, char * buf, int buflen);
+ void slotProcessExited(TDEProcess * proc);
+ void slotReadInput(TDEProcess * proc, char * buf, int buflen);
private:
bool usefulBacktrace();
void processBacktrace();
- KProcess *m_proc;
+ TDEProcess *m_proc;
const KrashConfig *m_krashconf;
KTempFile *m_temp;
KTempFile *m_temp_cmd;
diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp
index 372492c5..e73baee7 100644
--- a/drkonqi/debugger.cpp
+++ b/drkonqi/debugger.cpp
@@ -55,7 +55,7 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent,
m_backtrace = new KTextBrowser(this);
m_backtrace->setTextFormat(TQt::PlainText);
- m_backtrace->setFont(KGlobalSettings::fixedFont());
+ m_backtrace->setFont(TDEGlobalSettings::fixedFont());
TQWidget *w = new TQWidget( this );
( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true );
diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp
index 38e8c84c..9bdf405e 100644
--- a/drkonqi/krashconf.cpp
+++ b/drkonqi/krashconf.cpp
@@ -88,7 +88,7 @@ void KrashConfig :: readConfig()
KStartupInfo::sendFinish( id );
}
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("drkonqi");
// maybe we should check if it's relative?
diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp
index ab804281..f6ddecb9 100644
--- a/drkonqi/toplevel.cpp
+++ b/drkonqi/toplevel.cpp
@@ -176,10 +176,10 @@ void Toplevel :: slotUser2()
TQString str = m_krashconf->debugger();
m_krashconf->expandString(str, true);
- KProcess proc;
+ TDEProcess proc;
proc.setUseShell(true);
proc << str;
- proc.start(KProcess::DontCare);
+ proc.start(TDEProcess::DontCare);
}
void Toplevel :: slotNewDebuggingApp(const TQString& launchName)
diff --git a/kappfinder/common.cpp b/kappfinder/common.cpp
index 71ae2319..9fb00f9d 100644
--- a/kappfinder/common.cpp
+++ b/kappfinder/common.cpp
@@ -55,7 +55,7 @@ bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ,
// find out where to put the .desktop files
TQString destName;
if ( destDir.isNull() )
- destDir = KGlobal::dirs()->saveLocation( "apps" );
+ destDir = TDEGlobal::dirs()->saveLocation( "apps" );
else
destDir += "/";
@@ -82,7 +82,7 @@ bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ,
exec = exec.left( pos );
// try to locate the binary
- TQString pexec = KGlobal::dirs()->findExe( exec,
+ TQString pexec = TDEGlobal::dirs()->findExe( exec,
TQString( ::getenv( "PATH" ) ) + ":/usr/X11R6/bin:/usr/games" );
if ( pexec.isEmpty() ) {
kdDebug(DBG_CODE) << "looking for " << exec.local8Bit()
@@ -134,11 +134,11 @@ void decorateDirs( TQString destDir )
{
// find out where to put the .directory files
if ( destDir.isNull() )
- destDir = KGlobal::dirs()->saveLocation( "apps" );
+ destDir = TDEGlobal::dirs()->saveLocation( "apps" );
else
destDir += "/";
- TQStringList dirs = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.directory", true );
+ TQStringList dirs = TDEGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.directory", true );
TQStringList::Iterator it;
for ( it = dirs.begin(); it != dirs.end(); ++it ) {
diff --git a/kappfinder/main_install.cpp b/kappfinder/main_install.cpp
index d120a024..b6749b19 100644
--- a/kappfinder/main_install.cpp
+++ b/kappfinder/main_install.cpp
@@ -42,7 +42,7 @@ int main( int argc, char *argv[] )
return -1;
}
- TQStringList templates = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true );
+ TQStringList templates = TDEGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true );
TQString dir = TQString( argv[ 1 ] ) + "/";
diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp
index 9f67b6ed..931845b1 100644
--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@@ -161,9 +161,9 @@ TQListViewItem* TopLevel::addGroupItem( TQListViewItem *parent, const TQString &
void TopLevel::slotScan()
{
- KIconLoader* loader = KGlobal::iconLoader();
+ KIconLoader* loader = TDEGlobal::iconLoader();
- mTemplates = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true );
+ mTemplates = TDEGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true );
mAppCache.clear();
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index dd9d0ba8..9bf1c415 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -60,7 +60,7 @@ KateApp::KateApp (TDECmdLineArgs *args)
dcopClient()->suspend();
// insert right translations for the katepart
- KGlobal::locale()->insertCatalogue("katepart");
+ TDEGlobal::locale()->insertCatalogue("katepart");
// some global default
Kate::Document::setFileChangedDialogsActivated (true);
diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp
index b70de590..6ff64dc9 100644
--- a/kate/app/kateconsole.cpp
+++ b/kate/app/kateconsole.cpp
@@ -70,7 +70,7 @@ void KateConsole::loadConsoleIfNeeded()
setFocusProxy(m_part->widget());
- KGlobal::locale()->insertCatalogue("konsole");
+ TDEGlobal::locale()->insertCatalogue("konsole");
m_part->widget()->show();
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index 0542d0c3..627fe47d 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -69,7 +69,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
: TQWidget(parent, name/*, false*/), m_fixFocus(true), childproc(0)
{
setCaption(i18n("Find in Files"));
- config = KGlobal::config();
+ config = TDEGlobal::config();
config->setGroup("GrepTool");
lastSearchItems = config->readListEntry("LastSearchItems");
lastSearchPaths = config->readListEntry("LastSearchPaths");
@@ -351,7 +351,7 @@ void GrepTool::slotSearch()
TQString pattern = leTemplate->text();
pattern.replace( "%s", s );
- childproc = new KProcess();
+ childproc = new TDEProcess();
childproc->setWorkingDirectory( m_workingDir );
*childproc << "find" << ".";
if (!cbRecursive->isChecked())
@@ -377,18 +377,18 @@ void GrepTool::slotSearch()
*childproc << "/dev/null"; //trick to have grep always display the filename
*childproc << ";";
- connect( childproc, TQT_SIGNAL(processExited(KProcess *)),
+ connect( childproc, TQT_SIGNAL(processExited(TDEProcess *)),
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)) );
+ connect( childproc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ TQT_SLOT(receivedOutput(TDEProcess *, char *, int)) );
+ connect( childproc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+ TQT_SLOT(receivedErrOutput(TDEProcess *, char *, int)) );
// actually it should be checked whether the process was started successfully
lbResult->setCursor( TQCursor(Qt::WaitCursor) );
btnClear->setEnabled( false );
btnSearch->setGuiItem( KGuiItem(i18n("Cancel"), "button_cancel"));
- childproc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
+ childproc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
}
void GrepTool::slotSearchFor(const TQString &pattern)
@@ -483,13 +483,13 @@ void GrepTool::childExited()
finish();
}
-void GrepTool::receivedOutput(KProcess */*proc*/, char *buffer, int buflen)
+void GrepTool::receivedOutput(TDEProcess */*proc*/, char *buffer, int buflen)
{
buf += TQCString(buffer, buflen+1);
processOutput();
}
-void GrepTool::receivedErrOutput(KProcess */*proc*/, char *buffer, int buflen)
+void GrepTool::receivedErrOutput(TDEProcess */*proc*/, char *buffer, int buflen)
{
errbuf += TQCString( buffer, buflen + 1 );
}
diff --git a/kate/app/kategrepdialog.h b/kate/app/kategrepdialog.h
index 525d6b7f..0d8d4836 100644
--- a/kate/app/kategrepdialog.h
+++ b/kate/app/kategrepdialog.h
@@ -30,7 +30,7 @@ class TQCheckBox;
class TQListBox;
class KPushButton;
class TQLabel;
-class KProcess;
+class TDEProcess;
class KConfig;
class KURLRequester;
class TQEvent;
@@ -64,8 +64,8 @@ protected:
private slots:
void templateActivated(int index);
void childExited();
- void receivedOutput(KProcess *proc, char *buffer, int buflen);
- void receivedErrOutput(KProcess *proc, char *buffer, int buflen);
+ void receivedOutput(TDEProcess *proc, char *buffer, int buflen);
+ void receivedErrOutput(TDEProcess *proc, char *buffer, int buflen);
void itemSelected(const TQString&);
void slotSearch();
void slotCancel();
@@ -82,7 +82,7 @@ private:
TQCheckBox *cbCasesensitive, *cbRegex;
TQListBox *lbResult;
KPushButton *btnSearch, *btnClear;
- KProcess *childproc;
+ TDEProcess *childproc;
TQString buf;
TQString errbuf;
KConfig* config;
diff --git a/kate/app/katemain.h b/kate/app/katemain.h
index a0cb3c10..5c9c3d1b 100644
--- a/kate/app/katemain.h
+++ b/kate/app/katemain.h
@@ -45,7 +45,7 @@ class KFileViewItem;
class KHistoryCombo;
class KLineEdit;
class KListBox;
-class KProcess;
+class TDEProcess;
class KPushButton;
class KRecentFilesAction;
class KSelectAction;
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 948dc089..4220a4b1 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -287,7 +287,7 @@ void Sidebar::setSplitter (Splitter *sp)
{
m_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->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
m_ownSplit->setChildrenCollapsible( false );
m_splitter->setResizeMode( m_ownSplit, TQSplitter::KeepSize );
m_ownSplit->hide ();
@@ -673,7 +673,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
m_sidebars[KMultiTabBar::Left] = new Sidebar (KMultiTabBar::Left, this, hb);
m_hSplitter = new Splitter (Qt::Horizontal, hb);
- m_hSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
+ m_hSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
m_sidebars[KMultiTabBar::Left]->setSplitter (m_hSplitter);
@@ -683,7 +683,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
m_sidebars[KMultiTabBar::Top] = new Sidebar (KMultiTabBar::Top, this, vb);
m_vSplitter = new Splitter (Qt::Vertical, vb);
- m_vSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
+ m_vSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
m_sidebars[KMultiTabBar::Top]->setSplitter (m_vSplitter);
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index 0ea7cdc7..e8bee5a3 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -212,16 +212,16 @@ void KateMwModOnHdDialog::slotDiff()
if ( KateDocManager::self()->documentInfo( doc )->modifiedOnDiscReason == 3 )
return;
- // Start a KProcess that creates a diff
+ // Start a TDEProcess that creates a diff
KProcIO *p = new KProcIO();
- p->setComm( KProcess::All );
+ p->setComm( TDEProcess::All );
*p << "diff" << "-u" << "-" << doc->url().path();
- connect( p, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPDone(KProcess*)) );
+ connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) );
connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) );
setCursor( WaitCursor );
- p->start( KProcess::NotifyOnExit, true );
+ p->start( TDEProcess::NotifyOnExit, true );
uint lastln = doc->numLines();
for ( uint l = 0; l < lastln; l++ )
@@ -247,7 +247,7 @@ void KateMwModOnHdDialog::slotPRead( KProcIO *p)
p->ackRead();
}
-void KateMwModOnHdDialog::slotPDone( KProcess *p )
+void KateMwModOnHdDialog::slotPDone( TDEProcess *p )
{
setCursor( ArrowCursor );
if( ! m_tmpfile )
diff --git a/kate/app/katemwmodonhddialog.h b/kate/app/katemwmodonhddialog.h
index 7a5d8f7c..5cc406e9 100644
--- a/kate/app/katemwmodonhddialog.h
+++ b/kate/app/katemwmodonhddialog.h
@@ -26,7 +26,7 @@
typedef TQPtrVector<Kate::Document> DocVector;
class KProcIO;
-class KProcess;
+class TDEProcess;
/**
* A dialog for handling multiple documents modified on disk
* from within KateMainWindow
@@ -47,7 +47,7 @@ class KateMwModOnHdDialog : public KDialogBase
void slotDiff();
void slotSelectionChanged();
void slotPRead(KProcIO*);
- void slotPDone(KProcess*);
+ void slotPDone(TDEProcess*);
private:
enum Action { Ignore, Overwrite, Reload };
diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp
index 09257300..8d1c4975 100644
--- a/kate/app/katesavemodifieddialog.cpp
+++ b/kate/app/katesavemodifieddialog.cpp
@@ -48,7 +48,7 @@ public:
STATE state() const { return m_state;}
void setState(enum STATE state) {
m_state=state;
- KIconLoader *loader = KGlobal::instance()->iconLoader();
+ KIconLoader *loader = TDEGlobal::instance()->iconLoader();
switch (state) {
case InitialState:
setPixmap(0,TQPixmap());
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index a62924b9..e21b9f29 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -67,7 +67,7 @@ KateSession::KateSession (KateSessionManager *manager, const TQString &fileName,
void KateSession::init ()
{
// given file exists, use it to load some stuff ;)
- if (!m_sessionFileRel.isEmpty() && KGlobal::dirs()->exists(sessionFile ()))
+ if (!m_sessionFileRel.isEmpty() && TDEGlobal::dirs()->exists(sessionFile ()))
{
KSimpleConfig config (sessionFile (), true);
@@ -146,7 +146,7 @@ bool KateSession::create (const TQString &name, bool force)
KMD5 md5 (tname);
m_sessionFileRel = TQString ("%1.katesession").arg (md5.hexDigest().data());
- if (!KGlobal::dirs()->exists(sessionFile ()))
+ if (!TDEGlobal::dirs()->exists(sessionFile ()))
break;
}
@@ -211,7 +211,7 @@ KateSessionManager::KateSessionManager (TQObject *parent)
kdDebug() << "LOCAL SESSION DIR: " << m_sessionsDir << endl;
// create dir if needed
- KGlobal::dirs()->makeDir (m_sessionsDir);
+ TDEGlobal::dirs()->makeDir (m_sessionsDir);
}
KateSessionManager::~KateSessionManager()
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index 73ca6a09..33f87e7c 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -349,8 +349,8 @@ KateVSStatusBar::~KateVSStatusBar ()
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))
- .arg(KGlobal::locale()->formatNumber(c+1, 0)) );
+ i18n(" Line: %1 Col: %2 ").arg(TDEGlobal::locale()->formatNumber(r+1, 0))
+ .arg(TDEGlobal::locale()->formatNumber(c+1, 0)) );
if (ovr == 0)
m_insertModeLabel->setText( i18n(" R/O ") );
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index a7a06324..8f4e3886 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -455,7 +455,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal;
KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget());
- s->setOpaqueResize( KGlobalSettings::opaqueResize() );
+ s->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
if (! isFirstTime) {
// anders: make sure the split' viewspace is always
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 2f32d2c2..152a96b9 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -593,7 +593,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
TDEApplication a;
- KGlobal::locale()->insertCatalogue("katepart");
+ TDEGlobal::locale()->insertCatalogue("katepart");
DCOPClient *client = kapp->dcopClient();
if (!client->isRegistered())
diff --git a/kate/utils/messageview.h b/kate/utils/messageview.h
index ff9c7b28..1bf406d6 100644
--- a/kate/utils/messageview.h
+++ b/kate/utils/messageview.h
@@ -36,7 +36,7 @@
@section Usage
To use it in the intended way:
- @li Create a KProcess (or derived class)
+ @li Create a TDEProcess (or derived class)
@li As the output of the process arrives, hand it over
using addText(). The view will add it to the end and
make sure it is scrolled to the end.
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index d119ed68..01b5090d 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -115,14 +115,14 @@ KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled)
int KAccessApp::newInstance()
{
- KGlobal::config()->reparseConfiguration();
+ TDEGlobal::config()->reparseConfiguration();
readSettings();
return 0;
}
void KAccessApp::readSettings()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
// bell ---------------------------------------------------------------
@@ -790,7 +790,7 @@ void KAccessApp::applyChanges() {
unsigned int enabled = requestedFeatures & ~features;
unsigned int disabled = features & ~requestedFeatures;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("Keyboard");
if (enabled & XkbSlowKeysMask)
@@ -823,7 +823,7 @@ void KAccessApp::yesClicked() {
dialog->deleteLater();
dialog = 0;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("Keyboard");
switch (showModeCombobox->currentItem()) {
case 0:
@@ -854,7 +854,7 @@ void KAccessApp::noClicked() {
dialog = 0;
requestedFeatures = features;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("Keyboard");
switch (showModeCombobox->currentItem()) {
case 0:
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index 1e28238a..64cb290e 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -578,7 +578,7 @@ void KAccessConfig::changeFlashScreenColor()
void KAccessConfig::selectSound()
{
- TQStringList list = KGlobal::dirs()->findDirs("sound", "");
+ TQStringList list = TDEGlobal::dirs()->findDirs("sound", "");
TQString start;
if (list.count()>0)
start = list[0];
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index 6f6a39cd..c6a012fe 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -57,7 +57,7 @@ extern "C" {
KDE_EXPORT KCModule *create_arts(TQWidget *parent, const char* /*name*/)
{
- KGlobal::locale()->insertCatalogue("kcmarts");
+ TDEGlobal::locale()->insertCatalogue("kcmarts");
return new KArtsModule(parent, "kcmarts" );
}
}
@@ -96,16 +96,16 @@ static bool startArts()
*/
void KArtsModule::initAudioIOList()
{
- KProcess* artsd = new KProcess();
+ TDEProcess* artsd = new TDEProcess();
*artsd << "artsd";
*artsd << "-A";
- 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)));
+ connect(artsd, TQT_SIGNAL(processExited(TDEProcess*)),
+ this, TQT_SLOT(slotArtsdExited(TDEProcess*)));
+ connect(artsd, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ this, TQT_SLOT(slotProcessArtsdOutput(TDEProcess*, char*, int)));
- if (!artsd->start(KProcess::Block, KProcess::Stderr)) {
+ if (!artsd->start(TDEProcess::Block, TDEProcess::Stderr)) {
KMessageBox::error(0, i18n("Unable to start the sound server to "
"retrieve possible sound I/O methods.\n"
"Only automatic detection will be "
@@ -114,13 +114,13 @@ void KArtsModule::initAudioIOList()
}
}
-void KArtsModule::slotArtsdExited(KProcess* proc)
+void KArtsModule::slotArtsdExited(TDEProcess* proc)
{
latestProcessStatus = proc->exitStatus();
delete proc;
}
-void KArtsModule::slotProcessArtsdOutput(KProcess*, char* buf, int len)
+void KArtsModule::slotProcessArtsdOutput(TDEProcess*, char* buf, int len)
{
// XXX(gioele): I suppose this will be called with full lines, am I wrong?
@@ -438,10 +438,10 @@ void KArtsModule::slotTestSound()
if (configChanged && (userSavedChanges() == KMessageBox::Yes) || !artsdIsRunning() )
restartServer();
- KProcess test;
+ TDEProcess test;
test << "artsplay";
test << locate("sound", "KDE_Startup_1.ogg");
- test.start(KProcess::DontCare);
+ test.start(TDEProcess::DontCare);
}
void KArtsModule::defaults()
@@ -538,13 +538,13 @@ bool KArtsModule::realtimeIsPossible()
static bool checked = false;
if (!checked)
{
- KProcess* checkProcess = new KProcess();
+ TDEProcess* checkProcess = new TDEProcess();
*checkProcess << "artswrapper";
*checkProcess << "check";
- connect(checkProcess, TQT_SIGNAL(processExited(KProcess*)),
- this, TQT_SLOT(slotArtsdExited(KProcess*)));
- if (!checkProcess->start(KProcess::Block))
+ connect(checkProcess, TQT_SIGNAL(processExited(TDEProcess*)),
+ this, TQT_SLOT(slotArtsdExited(TDEProcess*)));
+ if (!checkProcess->start(TDEProcess::Block))
{
delete checkProcess;
realtimePossible = false;
@@ -574,10 +574,10 @@ void KArtsModule::restartServer()
DCOPRef("knotify", "qt/knotify").send("quit");
// Shut down artsd
- KProcess terminateArts;
+ TDEProcess terminateArts;
terminateArts << "artsshell";
terminateArts << "terminate";
- terminateArts.start(KProcess::Block);
+ terminateArts.start(TDEProcess::Block);
if (starting)
{
@@ -594,10 +594,10 @@ void KArtsModule::restartServer()
bool KArtsModule::artsdIsRunning()
{
- KProcess check;
+ TDEProcess check;
check << "artsshell";
check << "status";
- check.start(KProcess::Block);
+ check.start(TDEProcess::Block);
return (check.exitStatus() == 0);
}
diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h
index 80df5bd8..4e4b4fd8 100644
--- a/kcontrol/arts/arts.h
+++ b/kcontrol/arts/arts.h
@@ -43,7 +43,7 @@
#include "hardwaretab.h"
-class KProcess;
+class TDEProcess;
class DeviceManager;
class KArtsModule : public KCModule
@@ -67,8 +67,8 @@ private slots:
void slotChanged();
void slotTestSound();
- void slotArtsdExited(KProcess* proc);
- void slotProcessArtsdOutput(KProcess* p, char* buf, int len);
+ void slotArtsdExited(TDEProcess* proc);
+ void slotProcessArtsdOutput(TDEProcess* p, char* buf, int len);
//void slotStartServerChanged();
private:
diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp
index 0a188a47..6543b369 100644
--- a/kcontrol/arts/krichtextlabel.cpp
+++ b/kcontrol/arts/krichtextlabel.cpp
@@ -40,14 +40,14 @@ static TQString qrichtextify( const TQString& text )
KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
- m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
+ m_defaultWidth = TQMIN(500, TDEGlobalSettings::desktopGeometry(this).width()*3/5);
setAlignment( TQt::WordBreak );
setText(text);
}
KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
- m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
+ m_defaultWidth = TQMIN(500, TDEGlobalSettings::desktopGeometry(this).width()*3/5);
setAlignment( TQt::WordBreak );
}
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 53b095be..2905d7ac 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -69,8 +69,8 @@
BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
: BGDialog_UI(parent, "BGDialog")
{
- m_pGlobals = new KGlobalBackgroundSettings(_config);
- m_pDirs = KGlobal::dirs();
+ m_pGlobals = new TDEGlobalBackgroundSettings(_config);
+ m_pDirs = TDEGlobal::dirs();
m_multidesktop = _multidesktop;
m_previewUpdates = true;
@@ -246,7 +246,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
if (m_wallpaperPos == KBackgroundSettings::NoWallpaper)
m_wallpaperPos = KBackgroundSettings::Centred; // Default
- if (KGlobal::dirs()->isRestrictedResource("wallpaper"))
+ if (TDEGlobal::dirs()->isRestrictedResource("wallpaper"))
{
m_urlWallpaperButton->hide();
m_buttonSetupWallpapers->hide();
@@ -407,7 +407,7 @@ void BGDialog::slotIdentifyScreens()
{
TQLabel *screenLabel = new TQLabel(0,"Screen Identify", (WFlags)(WDestructiveClose | WStyle_Customize | WX11BypassWM));
- TQFont identifyFont(KGlobalSettings::generalFont());
+ TQFont identifyFont(TDEGlobalSettings::generalFont());
identifyFont.setPixelSize(100);
screenLabel->setFont(identifyFont);
@@ -1244,7 +1244,7 @@ void BGDialog::slotGetNewStuff()
//FIXME set this to a server when we get one
//should really be in a .rc file but could be either
//kcmshellrc or kcontrolrc
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("KNewStuff");
config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/wallpaper-providers.xml" );
config->writeEntry( "StandardResource", "wallpaper" );
diff --git a/kcontrol/background/bgdialog.h b/kcontrol/background/bgdialog.h
index 30bb0f00..86e10a03 100644
--- a/kcontrol/background/bgdialog.h
+++ b/kcontrol/background/bgdialog.h
@@ -83,7 +83,7 @@ protected slots:
protected:
void getEScreen();
- KGlobalBackgroundSettings *m_pGlobals;
+ TDEGlobalBackgroundSettings *m_pGlobals;
KStandardDirs *m_pDirs;
bool m_multidesktop;
bool m_useViewports;
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 51d11458..2c3da199 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -53,7 +53,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou
m_State = 0;
m_isBusyCursor = false;
m_enableBusyCursor = false;
- m_pDirs = KGlobal::dirs();
+ m_pDirs = TDEGlobal::dirs();
m_rSize = m_Size = drawBackgroundPerScreen ? TDEApplication::desktop()->screenGeometry(screen).size() : TDEApplication::desktop()->geometry().size();
m_pProc = 0L;
m_Tempfile = 0L;
@@ -238,8 +238,8 @@ int KBackgroundRenderer::doBackground(bool quit)
delete m_pProc;
m_pProc = new KShellProcess;
*m_pProc << file;
- connect(m_pProc, TQT_SIGNAL(processExited(KProcess *)),
- TQT_SLOT(slotBackgroundDone(KProcess *)));
+ connect(m_pProc, TQT_SIGNAL(processExited(TDEProcess *)),
+ TQT_SLOT(slotBackgroundDone(TDEProcess *)));
m_pProc->start(KShellProcess::NotifyOnExit);
retval = Wait;
break;
@@ -741,7 +741,7 @@ void KBackgroundRenderer::blend(TQImage& dst, TQRect dr, const TQImage& src, TQP
-void KBackgroundRenderer::slotBackgroundDone(KProcess *process)
+void KBackgroundRenderer::slotBackgroundDone(TDEProcess *process)
{
Q_ASSERT(process == m_pProc);
m_State |= BackgroundDone;
diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h
index cf168257..ee798894 100644
--- a/kcontrol/background/bgrender.h
+++ b/kcontrol/background/bgrender.h
@@ -24,7 +24,7 @@ class TQString;
class TQTimer;
class KConfig;
-class KProcess;
+class TDEProcess;
class KTempFile;
class KShellProcess;
class KStandardDirs;
@@ -68,7 +68,7 @@ signals:
void programSuccess(int desk); //programSuccess is emitted after imageDone
private slots:
- void slotBackgroundDone(KProcess *);
+ void slotBackgroundDone(TDEProcess *);
void render();
void done();
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index b89731c4..d5199529 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -42,7 +42,7 @@ KBackgroundPattern::KBackgroundPattern(TQString name)
dirty = false;
hashdirty = true;
- m_pDirs = KGlobal::dirs();
+ m_pDirs = TDEGlobal::dirs();
m_pDirs->addResourceType("dtop_pattern", m_pDirs->kde_default("data") +
"kdesktop/patterns");
m_pConfig = 0L;
@@ -182,7 +182,7 @@ int KBackgroundPattern::hash()
/* static */
TQStringList KBackgroundPattern::list()
{
- KStandardDirs *dirs = KGlobal::dirs();
+ KStandardDirs *dirs = TDEGlobal::dirs();
dirs->addResourceType("dtop_pattern", dirs->kde_default("data") +
"kdesktop/patterns");
TQStringList lst = dirs->findAllResources("dtop_pattern", "*.desktop",
@@ -209,7 +209,7 @@ KBackgroundProgram::KBackgroundProgram(TQString name)
dirty = false;
hashdirty = true;
- m_pDirs = KGlobal::dirs();
+ m_pDirs = TDEGlobal::dirs();
m_pDirs->addResourceType("dtop_program", m_pDirs->kde_default("data") +
"kdesktop/programs");
m_pConfig = 0L;
@@ -393,7 +393,7 @@ int KBackgroundProgram::hash()
/* static */
TQStringList KBackgroundProgram::list()
{
- KStandardDirs *dirs = KGlobal::dirs();
+ KStandardDirs *dirs = TDEGlobal::dirs();
dirs->addResourceType("dtop_program", dirs->kde_default("data") +
"kdesktop/programs");
TQStringList lst = dirs->findAllResources("dtop_program", "*.desktop",
@@ -489,7 +489,7 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou
ADD_STRING(NoMultiRandom)
#undef ADD_STRING
- m_pDirs = KGlobal::dirs();
+ m_pDirs = TDEGlobal::dirs();
if (!config) {
int screen_number = 0;
@@ -651,7 +651,7 @@ void KBackgroundSettings::setWallpaperMode(int mode)
void KBackgroundSettings::setWallpaperList(TQStringList list)
{
- KStandardDirs *d = KGlobal::dirs();
+ KStandardDirs *d = TDEGlobal::dirs();
if (m_WallpaperList == list)
return;
@@ -1029,7 +1029,7 @@ TQString KBackgroundSettings::fingerprint()
s += TQString("wm:%1;").arg(m_WallpaperMode);
if (m_WallpaperMode != NoWallpaper)
{
- TQ_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
+ TQ_UINT32 rh = TDEGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
s += TQString("wp:%2:%1;").arg(rh).arg(currentWallpaper());
}
@@ -1063,9 +1063,9 @@ void KBackgroundSettings::setEnabled(const bool enable)
hashdirty = true;
}
-/**** KGlobalBackgroundSettings ****/
+/**** TDEGlobalBackgroundSettings ****/
-KGlobalBackgroundSettings::KGlobalBackgroundSettings(KConfig *_config)
+TDEGlobalBackgroundSettings::TDEGlobalBackgroundSettings(KConfig *_config)
{
m_pConfig = _config;
@@ -1073,14 +1073,14 @@ KGlobalBackgroundSettings::KGlobalBackgroundSettings(KConfig *_config)
}
-TQString KGlobalBackgroundSettings::deskName(int desk)
+TQString TDEGlobalBackgroundSettings::deskName(int desk)
{
return m_Names[desk];
}
/*
-void KGlobalBackgroundSettings::setDeskName(int desk, TQString name)
+void TDEGlobalBackgroundSettings::setDeskName(int desk, TQString name)
{
if (name == m_Names[desk])
return;
@@ -1090,7 +1090,7 @@ void KGlobalBackgroundSettings::setDeskName(int desk, TQString name)
*/
-void KGlobalBackgroundSettings::setCacheSize(int size)
+void TDEGlobalBackgroundSettings::setCacheSize(int size)
{
if (size == m_CacheSize)
return;
@@ -1099,7 +1099,7 @@ void KGlobalBackgroundSettings::setCacheSize(int size)
}
-void KGlobalBackgroundSettings::setLimitCache(bool limit)
+void TDEGlobalBackgroundSettings::setLimitCache(bool limit)
{
if (limit == m_bLimitCache)
return;
@@ -1108,7 +1108,7 @@ void KGlobalBackgroundSettings::setLimitCache(bool limit)
}
-bool KGlobalBackgroundSettings::drawBackgroundPerScreen(int desk) const
+bool TDEGlobalBackgroundSettings::drawBackgroundPerScreen(int desk) const
{
if ( desk > int(m_bDrawBackgroundPerScreen.size()) )
return _defDrawBackgroundPerScreen;
@@ -1116,7 +1116,7 @@ bool KGlobalBackgroundSettings::drawBackgroundPerScreen(int desk) const
}
-void KGlobalBackgroundSettings::setDrawBackgroundPerScreen(int desk, bool perScreen)
+void TDEGlobalBackgroundSettings::setDrawBackgroundPerScreen(int desk, bool perScreen)
{
if ( desk >= int(m_bDrawBackgroundPerScreen.size()) )
return;
@@ -1129,7 +1129,7 @@ void KGlobalBackgroundSettings::setDrawBackgroundPerScreen(int desk, bool perScr
}
-void KGlobalBackgroundSettings::setCommonScreenBackground(bool common)
+void TDEGlobalBackgroundSettings::setCommonScreenBackground(bool common)
{
if (common == m_bCommonScreen)
return;
@@ -1138,7 +1138,7 @@ void KGlobalBackgroundSettings::setCommonScreenBackground(bool common)
}
-void KGlobalBackgroundSettings::setCommonDeskBackground(bool common)
+void TDEGlobalBackgroundSettings::setCommonDeskBackground(bool common)
{
if (common == m_bCommonDesk)
return;
@@ -1147,7 +1147,7 @@ void KGlobalBackgroundSettings::setCommonDeskBackground(bool common)
}
-void KGlobalBackgroundSettings::setDockPanel(bool dock)
+void TDEGlobalBackgroundSettings::setDockPanel(bool dock)
{
if (dock == m_bDock)
return;
@@ -1156,7 +1156,7 @@ void KGlobalBackgroundSettings::setDockPanel(bool dock)
}
-void KGlobalBackgroundSettings::setExportBackground(bool _export)
+void TDEGlobalBackgroundSettings::setExportBackground(bool _export)
{
if (_export == m_bExport)
return;
@@ -1164,7 +1164,7 @@ void KGlobalBackgroundSettings::setExportBackground(bool _export)
m_bExport = _export;
}
-void KGlobalBackgroundSettings::setTextColor(TQColor _color)
+void TDEGlobalBackgroundSettings::setTextColor(TQColor _color)
{
if (_color == m_TextColor)
return;
@@ -1172,7 +1172,7 @@ void KGlobalBackgroundSettings::setTextColor(TQColor _color)
m_TextColor = _color;
}
-void KGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color)
+void TDEGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color)
{
if (_color == m_TextBackgroundColor)
return;
@@ -1180,7 +1180,7 @@ void KGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color)
m_TextBackgroundColor = _color;
}
-void KGlobalBackgroundSettings::setShadowEnabled(bool enabled)
+void TDEGlobalBackgroundSettings::setShadowEnabled(bool enabled)
{
if (enabled == m_shadowEnabled)
return;
@@ -1188,7 +1188,7 @@ void KGlobalBackgroundSettings::setShadowEnabled(bool enabled)
m_shadowEnabled = enabled;
}
-void KGlobalBackgroundSettings::setTextLines(int lines)
+void TDEGlobalBackgroundSettings::setTextLines(int lines)
{
if (lines == m_textLines)
return;
@@ -1196,7 +1196,7 @@ void KGlobalBackgroundSettings::setTextLines(int lines)
m_textLines = lines;
}
-void KGlobalBackgroundSettings::setTextWidth(int width)
+void TDEGlobalBackgroundSettings::setTextWidth(int width)
{
if (width == m_textWidth)
return;
@@ -1204,7 +1204,7 @@ void KGlobalBackgroundSettings::setTextWidth(int width)
m_textWidth = width;
}
-void KGlobalBackgroundSettings::readSettings()
+void TDEGlobalBackgroundSettings::readSettings()
{
m_pConfig->setGroup("Background Common");
m_bCommonScreen = m_pConfig->readBoolEntry("CommonScreen", _defCommonScreen);
@@ -1220,7 +1220,7 @@ void KGlobalBackgroundSettings::readSettings()
for ( int i = 0 ; i < info.numberOfDesktops() ; ++i )
m_bDrawBackgroundPerScreen[i] = m_pConfig->readBoolEntry( TQString("DrawBackgroundPerScreen_%1").arg(i), _defDrawBackgroundPerScreen );
- m_TextColor = KGlobalSettings::textColor();
+ m_TextColor = TDEGlobalSettings::textColor();
m_pConfig->setGroup("FMSettings");
m_TextColor = m_pConfig->readColorEntry("NormalTextColor", &m_TextColor);
m_TextBackgroundColor = m_pConfig->readColorEntry("ItemTextBackground");
@@ -1234,7 +1234,7 @@ void KGlobalBackgroundSettings::readSettings()
dirty = false;
}
-void KGlobalBackgroundSettings::writeSettings()
+void TDEGlobalBackgroundSettings::writeSettings()
{
if (!dirty)
return;
diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h
index abb8b6cf..03aa171e 100644
--- a/kcontrol/background/bgsettings.h
+++ b/kcontrol/background/bgsettings.h
@@ -302,10 +302,10 @@ public:
/**
* A class to read/modify the global desktop background settings.
*/
-class KGlobalBackgroundSettings
+class TDEGlobalBackgroundSettings
{
public:
- KGlobalBackgroundSettings(KConfig *config);
+ TDEGlobalBackgroundSettings(KConfig *config);
TQString deskName(int desk);
//void setDeskName(int desk, TQString name);
diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp
index 82bb1d8a..f10add59 100644
--- a/kcontrol/background/bgwallpaper.cpp
+++ b/kcontrol/background/bgwallpaper.cpp
@@ -149,7 +149,7 @@ void BGMultiWallpaperDialog::slotAdd()
mimeTypes += "image/svg+xml";
#endif
- KFileDialog fileDialog(KGlobal::dirs()->findDirs("wallpaper", "").first(),
+ KFileDialog fileDialog(TDEGlobal::dirs()->findDirs("wallpaper", "").first(),
mimeTypes.join( " " ), this,
0L, true);
diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp
index 109e436c..e291387c 100644
--- a/kcontrol/clock/dtime.cpp
+++ b/kcontrol/clock/dtime.cpp
@@ -195,9 +195,9 @@ void Dtime::serverTimeCheck() {
}
void Dtime::findNTPutility(){
- KProcess proc;
+ TDEProcess proc;
proc << "which" << "ntpdate";
- proc.start(KProcess::Block);
+ proc.start(TDEProcess::Block);
if(proc.exitStatus() == 0) {
ntpUtility = "ntpdate";
kdDebug() << "ntpUtility = " << ntpUtility.latin1() << endl;
@@ -205,7 +205,7 @@ void Dtime::findNTPutility(){
}
proc.clearArguments();
proc << "which" << "rdate";
- proc.start(KProcess::Block);
+ proc.start(TDEProcess::Block);
if(proc.exitStatus() == 0) {
ntpUtility = "rdate";
kdDebug() << "ntpUtility = " << ntpUtility.latin1() << endl;
@@ -289,9 +289,9 @@ void Dtime::save()
timeServer.replace( TQRegExp("\\).*"), "" );
// Would this be better?: s/^.*\(([^)]*)\).*$/\1/
}
- KProcess proc;
+ TDEProcess proc;
proc << ntpUtility << timeServer;
- proc.start( KProcess::Block );
+ proc.start( TDEProcess::Block );
if( proc.exitStatus() != 0 ){
KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").arg(timeServer).latin1()));
setDateTimeAuto->setChecked( false );
@@ -303,7 +303,7 @@ void Dtime::save()
}
else {
// User time setting
- KProcess c_proc;
+ TDEProcess c_proc;
// BSD systems reverse year compared to Susv3
#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
@@ -321,7 +321,7 @@ void Dtime::save()
kdDebug() << "Set date " << BufS << endl;
c_proc << "date" << BufS;
- c_proc.start( KProcess::Block );
+ c_proc.start( TDEProcess::Block );
int result = c_proc.exitStatus();
if (result != 0
#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
@@ -333,9 +333,9 @@ void Dtime::save()
}
// try to set hardware clock. We do not care if it fails
- KProcess hwc_proc;
+ TDEProcess hwc_proc;
hwc_proc << "hwclock" << "--systohc";
- hwc_proc.start(KProcess::Block);
+ hwc_proc.start(TDEProcess::Block);
}
// restart time
diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp
index 69fece8e..5885c259 100644
--- a/kcontrol/clock/main.cpp
+++ b/kcontrol/clock/main.cpp
@@ -57,7 +57,7 @@ KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringLis
" the root password, but feel the system time should be corrected, please contact your system"
" administrator."));
- KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
+ TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index 041be096..8bf7607c 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -308,7 +308,7 @@ void KColorScheme::load()
}
void KColorScheme::load( bool useDefaults )
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setReadDefaults( useDefaults );
config->setGroup("KDE");
sCurrentScheme = config->readEntry("colorScheme");
@@ -335,7 +335,7 @@ void KColorScheme::load( bool useDefaults )
void KColorScheme::save()
{
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "General" );
cfg->writeEntry("background", cs->back, true, true);
cfg->writeEntry("selectBackground", cs->select, true, true);
@@ -560,7 +560,7 @@ void KColorScheme::slotAdd()
}
else
{
- sFile = KGlobal::dirs()->saveLocation("data", "kdisplay/color-schemes/") + sFile + ".kcsrc";
+ sFile = TDEGlobal::dirs()->saveLocation("data", "kdisplay/color-schemes/") + sFile + ".kcsrc";
KSimpleConfig *config = new KSimpleConfig(sFile);
config->setGroup( "Color Scheme");
config->writeEntry("Name", sName);
@@ -676,11 +676,11 @@ void KColorScheme::slotSelectColor(const TQColor &col)
// of course
if ( selection == CSM_Standard_background &&
color(CSM_Alternate_background) ==
- KGlobalSettings::calculateAlternateBackgroundColor(
+ TDEGlobalSettings::calculateAlternateBackgroundColor(
color(CSM_Standard_background) ) )
{
color(CSM_Alternate_background) =
- KGlobalSettings::calculateAlternateBackgroundColor( col );
+ TDEGlobalSettings::calculateAlternateBackgroundColor( col );
}
color(selection) = col;
@@ -791,7 +791,7 @@ void KColorScheme::readScheme( int index )
if (index == 0) {
// Current scheme
- config = KGlobal::config();
+ config = TDEGlobal::config();
config->setGroup("General");
} else {
// Open scheme file
@@ -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 );
- TQColor alternate = KGlobalSettings::calculateAlternateBackgroundColor(cs->window);
+ TQColor alternate = TDEGlobalSettings::calculateAlternateBackgroundColor(cs->window);
cs->alternateBackground = config->readColorEntry( "alternateBackground", &alternate );
if (index == 0)
@@ -860,7 +860,7 @@ void KColorScheme::readSchemeNames()
nSysSchemes = 2;
// Global + local schemes
- TQStringList list = KGlobal::dirs()->findAllResources("data",
+ TQStringList list = TDEGlobal::dirs()->findAllResources("data",
"kdisplay/color-schemes/*.kcsrc", false, true);
// And add them
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index 623fd67b..db39d21b 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -282,14 +282,14 @@ void WidgetCanvas::drawSampleWidgets()
// Keep in sync with kglobalsettings.
- TQFont windowFontGuess(KGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true);
+ TQFont windowFontGuess(TDEGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true);
windowFontGuess.setPixelSize(12);
c->setGroup("WM");
TQFont windowFont = c->readFontEntry("activeFont", &windowFontGuess);
c->setGroup("General");
- TQFont defaultMenuFont = KGlobalSettings::menuFont();
+ TQFont defaultMenuFont = TDEGlobalSettings::menuFont();
TQFont menuFont = c->readFontEntry("menuFont", &defaultMenuFont);
delete c;
@@ -468,7 +468,7 @@ void WidgetCanvas::drawSampleWidgets()
height(), cg, TRUE, 2, &brush);
// Standard text
- TQFont fnt = KGlobalSettings::generalFont();
+ TQFont fnt = TDEGlobalSettings::generalFont();
paint.setFont( fnt );
paint.setPen( windowTxt );
paint.drawText( 140, 127-20, i18n( "Standard text") );
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index f67065c2..616c98a5 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -169,7 +169,7 @@ void CfgEmailClient::selectEmailClient()
TQString client = dlg.text();
// get the preferred Terminal Application
- KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
+ KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
preferredTerminal += TQString::fromLatin1(" -e ");
@@ -198,7 +198,7 @@ void CfgEmailClient::save(KConfig *)
}
// insure proper permissions -- contains sensitive data
- TQString cfgName(KGlobal::dirs()->findResource("config", "emails"));
+ TQString cfgName(TDEGlobal::dirs()->findResource("config", "emails"));
if (!cfgName.isEmpty())
::chmod(TQFile::encodeName(cfgName), 0600);
@@ -386,7 +386,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name):
latestEditedService="";
TQStringList dummy;
- TQStringList services=KGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy);
+ TQStringList services=TDEGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy);
for (TQStringList::Iterator it=services.begin();it!=services.end();++it)
{
KSimpleConfig cfg(*it);
diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp
index fd9401d5..2e80ad14 100644
--- a/kcontrol/componentchooser/kcm_componentchooser.cpp
+++ b/kcontrol/componentchooser/kcm_componentchooser.cpp
@@ -57,7 +57,7 @@ extern "C"
{
KDE_EXPORT KCModule *create_componentchooser( TQWidget *parent, const char * )
{
- KGlobal::locale()->insertCatalogue("kcmcomponentchooser");
+ TDEGlobal::locale()->insertCatalogue("kcmcomponentchooser");
return new KCMComponentChooser( parent, "kcmcomponentchooser" );
}
}
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index 4c9b9967..6bdc6478 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -1227,7 +1227,7 @@ void KCryptoConfig::save()
authcfg->sync();
// insure proper permissions -- contains sensitive data
- TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults"));
+ TQString cfgName(TDEGlobal::dirs()->findResource("config", "cryptodefaults"));
if (!cfgName.isEmpty())
::chmod(TQFile::encodeName(cfgName), 0600);
@@ -1471,7 +1471,7 @@ TQDateTime qdt = x->getExpires();
int rc = kdtd.exec();
if (rc == KDialog::Accepted) {
x->setExpires(kdtd.getDateTime());
- untilDate->setText(KGlobal::locale()->formatDateTime(x->getExpires()));
+ untilDate->setText(TDEGlobal::locale()->formatDateTime(x->getExpires()));
configChanged();
}
}
@@ -1517,8 +1517,8 @@ TQString iss = TQString();
validFrom->setText(cert->getNotBefore());
validUntil->setText(cert->getNotAfter());
- untilDate->setText(x ? KGlobal::locale()->formatDateTime(x->getExpires())
- : KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC)));
+ untilDate->setText(x ? TDEGlobal::locale()->formatDateTime(x->getExpires())
+ : TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC)));
untilDate->setEnabled(x && !x->isPermanent());
pHash->setText(cert->getMD5DigestText());
delete cert;
@@ -2024,11 +2024,11 @@ void KCryptoConfig::slotCAImport() {
void KCryptoConfig::offerImportToKMail( const TQString& certFile )
{
if ( KMessageBox::questionYesNo( this, i18n( "Do you want to make this certificate available to KMail as well?" ), TQString(), i18n("Make Available"), i18n("Do Not Make Available") ) == KMessageBox::Yes ) {
- KProcess proc;
+ TDEProcess proc;
proc << "kleopatra";
proc << "--import-certificate";
proc << certFile;
- if ( !proc.start( KProcess::DontCare ) )
+ if ( !proc.start( TDEProcess::DontCare ) )
KMessageBox::error( this, i18n( "Could not execute Kleopatra. You might have to install or update the tdepim package." ) );
}
}
@@ -2054,7 +2054,7 @@ void KCryptoConfig::slotCARestore() {
// For now, we just rm the existing file and rebuild
- TQString path = KGlobal::dirs()->saveLocation("config");
+ TQString path = TDEGlobal::dirs()->saveLocation("config");
path += "/ksslcalist";
diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp
index 9706ccd5..e956edcc 100644
--- a/kcontrol/css/kcmcss.cpp
+++ b/kcontrol/css/kcmcss.cpp
@@ -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(TQFont(KGlobalSettings::generalFont().family(), bfs));
+ dlg->preview->viewport()->setFont(TQFont(TDEGlobalSettings::generalFont().family(), bfs));
dlg->exec();
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 3ca9e8cc..7a7ccc31 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -742,7 +742,7 @@ void KDisplayConfig::setRealResolutionSliderValue(int index) {
KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0)
{
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
m_randrsimple = new KRandrSimpleAPI();
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index c8bc0a8e..8cb99347 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -95,7 +95,7 @@ void KCMDnssd::save()
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;
+ TDEProcess *proc = new TDEProcess;
*proc << "tdesu";
@@ -103,13 +103,13 @@ void KCMDnssd::save()
if (KMessageBox::warningYesNo( this, scaryMessage, i18n("Enable Zeroconf Network Browsing"), KGuiItem(i18n("Enable Browsing")), KGuiItem(i18n("Don't Enable Browsing")) ) == KMessageBox::Yes) {
*proc << "/usr/share/avahi/enable_avahi 1";
- proc->start(KProcess::Block);
+ proc->start(TDEProcess::Block);
} else {
enableZeroconf->setChecked(false);
}
} else {
*proc << "/usr/share/avahi/enable_avahi 0";
- proc->start(KProcess::Block);
+ proc->start(TDEProcess::Block);
}
}
setCursor(TQCursor(Qt::ArrowCursor));
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
index 586f947f..f2e7fb20 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
@@ -50,7 +50,7 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider,
connect(m_dlg->leShortcut, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged()));
// Data init
- TQStringList charsets = KGlobal::charsets()->availableEncodingNames();
+ TQStringList charsets = TDEGlobal::charsets()->availableEncodingNames();
charsets.prepend(i18n("Default"));
m_dlg->cbCharset->insertStringList(charsets);
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
index 14626580..8b6da2a9 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
@@ -82,11 +82,11 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const
m_fullname = TQString::null;
- KProcess proc;
+ TDEProcess proc;
proc << helper << host;
- connect( &proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
- TQT_SLOT(receiveOutput(KProcess *, char *, int)) );
- if( !proc.start( KProcess::NotifyOnExit, KProcess::Stdout ))
+ connect( &proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ TQT_SLOT(receiveOutput(TDEProcess *, char *, int)) );
+ if( !proc.start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ))
return last_result = false;
last_host = host;
@@ -101,7 +101,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const
return last_result;
}
-void LocalDomainURIFilter::receiveOutput( KProcess *, char *buf, int )
+void LocalDomainURIFilter::receiveOutput( TDEProcess *, char *buf, int )
{
m_fullname = TQFile::decodeName( buf );
}
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
index b5154cbc..9d0c5f26 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
@@ -29,7 +29,7 @@
#include <tqregexp.h>
class TDEInstance;
-class KProcess;
+class TDEProcess;
/*
This filter takes care of hostnames in the local search domain.
@@ -59,7 +59,7 @@ class LocalDomainURIFilter : public KURIFilterPlugin, public DCOPObject
TQRegExp m_hostPortPattern;
private slots:
- void receiveOutput( KProcess *, char *, int );
+ void receiveOutput( TDEProcess *, char *, int );
};
#endif
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index ef338d92..93d76c28 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -162,7 +162,7 @@ void FontUseItem::readFont( bool useDefaults )
bool deleteme = false;
if (_rcfile.isEmpty())
- config = KGlobal::config();
+ config = TDEGlobal::config();
else
{
config = new KConfig(_rcfile, true);
@@ -182,7 +182,7 @@ void FontUseItem::writeFont()
KConfigBase *config;
if (_rcfile.isEmpty()) {
- config = KGlobal::config();
+ config = TDEGlobal::config();
config->setGroup(_rcgroup);
config->writeEntry(_rckey, font(), true, true);
} else {
@@ -713,7 +713,7 @@ void KFonts::save()
for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() )
i->writeFont();
- KGlobal::config()->sync();
+ TDEGlobal::config()->sync();
KConfig cfgfonts("kcmfonts");
cfgfonts.setGroup("General");
@@ -729,7 +729,7 @@ void KFonts::save()
proc << "xrdb" << "-quiet" << "-remove" << "-nocpp";
proc.writeStdin( TQCString( "Xft.dpi" ), true );
proc.closeWhenDone();
- proc.start( KProcess::Block );
+ proc.start( TDEProcess::Block );
}
// KDE-1.x support
diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp
index 64e2bcde..c271fa13 100644
--- a/kcontrol/hwmanager/devicepropsdlg.cpp
+++ b/kcontrol/hwmanager/devicepropsdlg.cpp
@@ -312,7 +312,7 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge
mainGrid->addWidget(base, 0, 0);
}
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(processHardwareRemoved(TDEGenericDevice*)));
connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(processHardwareUpdated(TDEGenericDevice*)));
diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp
index 04043366..a63eb84e 100644
--- a/kcontrol/hwmanager/hwmanager.cpp
+++ b/kcontrol/hwmanager/hwmanager.cpp
@@ -83,7 +83,7 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis
setRootOnlyMsg(i18n("<b>Hardware settings are system wide, and therefore require administrator access</b><br>To alter the system's hardware settings, click on the \"Administrator Mode\" button below."));
setUseRootOnlyMsg(true);
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(populateTreeView()));
@@ -139,7 +139,7 @@ void TDEHWManager::populateTreeView()
base->deviceTree->clear();
if (show_by_connection) {
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEGenericHardwareList hwlist = hwdevices->listByDeviceClass(TDEGenericDeviceType::RootSystem);
TDEGenericDevice *hwdevice;
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
@@ -152,7 +152,7 @@ void TDEHWManager::populateTreeView()
}
}
else {
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
for (int i=0;i<=TDEGenericDeviceType::Last;i++) {
if (i != TDEGenericDeviceType::Root) {
DeviceIconItem* rootitem = new DeviceIconItem(base->deviceTree, hwdevices->getFriendlyDeviceTypeStringFromType((TDEGenericDeviceType::TDEGenericDeviceType)i), hwdevices->getDeviceTypeIconFromType((TDEGenericDeviceType::TDEGenericDeviceType)i, base->deviceTree->iconSize()), 0);
@@ -172,7 +172,7 @@ void TDEHWManager::populateTreeView()
void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_connection, TQString selected_syspath) {
if (show_by_connection) {
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEGenericHardwareList hwlist = hwdevices->listAllPhysicalDevices();
TDEGenericDevice *hwdevice;
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index 80eb4f1a..8f9e46fb 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -135,8 +135,8 @@ TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *
void KIconConfig::init()
{
- mpLoader = KGlobal::iconLoader();
- mpConfig = KGlobal::config();
+ mpLoader = TDEGlobal::iconLoader();
+ mpConfig = TDEGlobal::config();
mpEffect = new KIconEffect;
mpTheme = mpLoader->theme();
mUsage = 0;
@@ -289,7 +289,7 @@ void KIconConfig::read()
mpKickerConfig->setGroup("General");
mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);
- KConfigGroup g( KGlobal::config(), "KDE" );
+ KConfigGroup g( TDEGlobal::config(), "KDE" );
mpRoundedCheck->setChecked(g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED));
mpActiveEffectCheck->setChecked(g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT));
}
@@ -410,7 +410,7 @@ void KIconConfig::load()
void KIconConfig::load( bool useDefaults )
{
- mpConfig = KGlobal::config();
+ mpConfig = TDEGlobal::config();
mpConfig->setReadDefaults( useDefaults );
read();
apply();
@@ -473,7 +473,7 @@ void KIconConfig::save()
mpKickerConfig->setGroup("General");
mpKickerConfig->writeEntry("panelIconWidth", mQuickLaunchSize);
- KConfigGroup g( KGlobal::config(), "KDE" );
+ KConfigGroup g( TDEGlobal::config(), "KDE" );
g.writeEntry("IconUseRoundedRect", mpRoundedCheck->isChecked(), true, true);
g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked(), true, true);
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 5d7f924a..6e8824cc 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -191,7 +191,7 @@ void IconThemesConfig::installNewTheme()
KIO::NetAccess::removeTempFile(themeTmpFile);
- KGlobal::instance()->newIconLoader();
+ TDEGlobal::instance()->newIconLoader();
loadThemes();
TQListViewItem *item=iconThemeItem(KIconTheme::current());
@@ -302,7 +302,7 @@ void IconThemesConfig::removeSelectedTheme()
unlink(TQFile::encodeName(icontheme.dir()+"/index.desktop").data());
KIO::del(KURL( icontheme.dir() ));
- KGlobal::instance()->newIconLoader();
+ TDEGlobal::instance()->newIconLoader();
loadThemes();
diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp
index 017f9477..0837209d 100644
--- a/kcontrol/info/info.cpp
+++ b/kcontrol/info/info.cpp
@@ -73,7 +73,7 @@ static bool sorting_allowed; /* is sorting allowed by user ? */
static const TQString Value( int val, int numbers=1 )
{
- return KGlobal::locale()->formatNumber(val, 0).rightJustify(numbers);
+ return TDEGlobal::locale()->formatNumber(val, 0).rightJustify(numbers);
}
static const TQString HexStr(unsigned long val, int digits )
@@ -189,8 +189,8 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie
Value((int)DisplayCells(dpy, scr)));
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)));
+ .arg(TDEGlobal::locale()->formatNumber(BlackPixel(dpy,scr), 0))
+ .arg(TDEGlobal::locale()->formatNumber(WhitePixel(dpy,scr), 0)));
TQString YES(i18n("Yes"));
TQString NO(i18n("No"));
@@ -239,7 +239,7 @@ static const TQString ByteString( unsigned long n )
return i18n("1 Byte"); // singular form: "1 Byte" (yes, it's "1", not "%1"!)
return i18n("%1 Bytes") // plural form: "%1 Bytes"
- .arg(KGlobal::locale()->formatNumber(n,0));
+ .arg(TDEGlobal::locale()->formatNumber(n,0));
}
static bool GetInfo_XServer_Generic( TQListView *lBox )
@@ -370,7 +370,7 @@ void KInfoListWidget::load()
/* is the user allowed to use sorting ? */
lBox->header()->setClickEnabled(sorting_allowed);
- lBox->header()->setFont(KGlobalSettings::generalFont());
+ lBox->header()->setFont(TDEGlobalSettings::generalFont());
lBox->setShowSortIndicator(sorting_allowed);
if (ok)
@@ -420,7 +420,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const
lBox = new TQListView(widgetStack);
widgetStack->addWidget(lBox, 0);
lBox->setMinimumSize(200,120);
- lBox->setFont(KGlobalSettings::generalFont()); /* default font */
+ lBox->setFont(TDEGlobalSettings::generalFont()); /* default font */
lBox->setAllColumnsShowFocus(true);
TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) );
NoInfoText = new TQLabel(widgetStack);
diff --git a/kcontrol/info/info_linux.cpp b/kcontrol/info/info_linux.cpp
index 18287c45..dc3872f0 100644
--- a/kcontrol/info/info_linux.cpp
+++ b/kcontrol/info/info_linux.cpp
@@ -140,7 +140,7 @@ bool GetInfo_CPU(TQListView * lBox)
bool GetInfo_IRQ(TQListView * lBox)
{
- lBox->setFont(KGlobalSettings::fixedFont());
+ lBox->setFont(TDEGlobalSettings::fixedFont());
return GetInfo_ReadfromFile(lBox, INFO_IRQ, 0);
}
diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp
index 483f7dd1..49cb03dd 100644
--- a/kcontrol/info/memory.cpp
+++ b/kcontrol/info/memory.cpp
@@ -80,11 +80,11 @@ static TQString formatted_unit(t_memsize value)
{
if (value > (1024 * 1024))
if (value > (1024 * 1024 * 1024))
- return i18n("%1 GB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024 * 1024.0), 2));
+ return i18n("%1 GB").arg(TDEGlobal::locale()->formatNumber(value / (1024 * 1024 * 1024.0), 2));
else
- return i18n("%1 MB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024.0), 2));
+ return i18n("%1 MB").arg(TDEGlobal::locale()->formatNumber(value / (1024 * 1024.0), 2));
else
- return i18n("%1 KB").arg(KGlobal::locale()->formatNumber(value / 1024.0, 2));
+ return i18n("%1 KB").arg(TDEGlobal::locale()->formatNumber(value / 1024.0, 2));
}
KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
@@ -368,7 +368,7 @@ void KMemoryWidget::update_Values()
label->clear();
else
label->setText(i18n("%1 bytes =").
- arg(KGlobal::locale()->
+ arg(TDEGlobal::locale()->
formatNumber(Memory_Info[i], 0)));
}
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index e61d5794..ed3975fc 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -178,7 +178,7 @@ void ThemePage::fixCursorFile()
//
// Run mkfontdir to update fonts.dir in that dir.
- KGlobal::dirs()->addResourceType( "font", "share/fonts/" );
+ TDEGlobal::dirs()->addResourceType( "font", "share/fonts/" );
KIO::mkdir( KURL::fromPathOrURL(TQDir::homeDirPath() + "/.fonts/kde-override") );
TQString overrideDir = TQDir::homeDirPath() + "/.fonts/kde-override/";
@@ -200,12 +200,12 @@ void ThemePage::fixCursorFile()
KIO::NetAccess::file_copy( source, installedFont, -1, true );
}
- TQString cmd = KGlobal::dirs()->findExe( "mkfontdir" );
+ TQString cmd = TDEGlobal::dirs()->findExe( "mkfontdir" );
if ( !cmd.isEmpty() )
{
- KProcess p;
+ TDEProcess p;
p << cmd << overrideDir;
- p.start(KProcess::Block);
+ p.start(TDEProcess::Block);
}
}
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index 68677270..ed43ef85 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -639,7 +639,7 @@ void MouseSettings::load(KConfig *config)
handedEnabled = true;
- // ## keep this in sync with KGlobalSettings::mouseSettings
+ // ## keep this in sync with TDEGlobalSettings::mouseSettings
if( num_buttons == 1 )
{
/* disable button remapping */
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
index a4cd605b..6ed69774 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
@@ -119,7 +119,7 @@ void KCMIOSlaveInfo::slotResult(KIO::Job *)
void KCMIOSlaveInfo::showInfo(const TQString& protocol)
{
TQString file = TQString("kioslave/%1.docbook").arg( protocol );
- file = KGlobal::locale()->langLookup( file );
+ file = TDEGlobal::locale()->langLookup( file );
if (m_tfj)
{
m_tfj->kill();
diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp
index ae629ac3..0214b279 100644
--- a/kcontrol/joystick/joywidget.cpp
+++ b/kcontrol/joystick/joywidget.cpp
@@ -54,7 +54,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
messageBox = new TQHBox(mainVbox);
messageBox->setSpacing(KDialog::spacingHint());
TQLabel *icon = new TQLabel(messageBox);
- icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup,
+ icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup,
KIcon::SizeMedium, KIcon::DefaultState, 0, true));
icon->setFixedSize(icon->sizeHint());
message = new TQLabel(messageBox);
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp
index 1bfd3d12..12db9e61 100644
--- a/kcontrol/kcontrol/aboutwidget.cpp
+++ b/kcontrol/kcontrol/aboutwidget.cpp
@@ -150,7 +150,7 @@ void AboutWidget::updatePixmap()
}
else
{
- KIconLoader *loader = KGlobal::instance()->iconLoader();
+ KIconLoader *loader = TDEGlobal::instance()->iconLoader();
TQString iconPath;
if (!_icon.isEmpty()) {
iconPath = loader->iconPath( _icon, KIcon::Toolbar );
diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp
index 5c4907a9..d6cdd91d 100644
--- a/kcontrol/kcontrol/dockcontainer.cpp
+++ b/kcontrol/kcontrol/dockcontainer.cpp
@@ -83,7 +83,7 @@ void ModuleTitle::showTitleFor( ConfigModule *config )
TQWhatsThis::remove( this );
TQWhatsThis::add( this, config->comment() );
- KIconLoader *loader = KGlobal::instance()->iconLoader();
+ KIconLoader *loader = TDEGlobal::instance()->iconLoader();
TQPixmap icon = loader->loadIcon( config->icon(), KIcon::NoGroup, 22 );
m_icon->setPixmap( icon );
m_name->setText( config->moduleName() );
diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp
index 7421d353..76fc756c 100644
--- a/kcontrol/kcontrol/helpwidget.cpp
+++ b/kcontrol/kcontrol/helpwidget.cpp
@@ -74,13 +74,13 @@ bool HelpWidget::clicked(const TQString & _url)
return true;
}
- KProcess process;
+ TDEProcess process;
KURL url(KURL("help:/"), _url);
if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") {
process << "khelpcenter"
<< url.url();
- process.start(KProcess::DontCare);
+ process.start(TDEProcess::DontCare);
} else {
new KRun(url);
}
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 411a9574..7edc8bd4 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -56,7 +56,7 @@ KControlApp::KControlApp()
toplevel = new TopLevel();
setMainWidget(toplevel);
- KGlobal::setActiveInstance(this);
+ TDEGlobal::setActiveInstance(this);
// KUniqueApplication does dcop regitration for us
ModuleIface *modIface = new ModuleIface(TQT_TQOBJECT(toplevel), "moduleIface");
@@ -64,8 +64,8 @@ KControlApp::KControlApp()
connect (modIface, TQT_SIGNAL(helpClicked()), toplevel, TQT_SLOT(slotHelpRequest()));
connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest()));
- TQRect desk = KGlobalSettings::desktopGeometry(toplevel);
- KConfig *config = KGlobal::config();
+ TQRect desk = TDEGlobalSettings::desktopGeometry(toplevel);
+ KConfig *config = TDEGlobal::config();
config->setGroup("General");
// Initial size is:
// never bigger than workspace as reported by desk
@@ -88,7 +88,7 @@ KControlApp::~KControlApp()
{
if (toplevel)
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("General");
TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop());
config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp
index ad60eda5..2b8f74b1 100644
--- a/kcontrol/kcontrol/modulemenu.cpp
+++ b/kcontrol/kcontrol/modulemenu.cpp
@@ -72,7 +72,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
TQString name = group->caption();
name.replace("&", "&&");
- parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall)
+ parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall)
, name, menu);
fill(menu, path);
@@ -87,7 +87,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
TQString name = module->moduleName();
name.replace("&", "&&");
- int realid = parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall)
+ int realid = parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall)
, name, id);
_moduleDict.insert(realid, module);
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index 58448083..592eb52c 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -189,7 +189,7 @@ void ConfigModule::runAsRoot()
TQString tdesu = KStandardDirs::findExe("tdesu");
if (!tdesu.isEmpty())
{
- _rootProcess = new KProcess;
+ _rootProcess = new TDEProcess;
*_rootProcess << tdesu;
*_rootProcess << "--nonewdcop";
// We have to disable the keep-password feature because
@@ -198,15 +198,15 @@ 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 << TQString("%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(TDEGlobal::locale()->language());
}
else {
- *_rootProcess << TQString("%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( TDEGlobal::locale()->language() );
}
- connect(_rootProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(rootExited(KProcess*)));
+ connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(rootExited(TDEProcess*)));
- if ( !_rootProcess->start(KProcess::NotifyOnExit) )
+ if ( !_rootProcess->start(TDEProcess::NotifyOnExit) )
{
delete _rootProcess;
_rootProcess = 0L;
@@ -226,7 +226,7 @@ void ConfigModule::runAsRoot()
}
-void ConfigModule::rootExited(KProcess *)
+void ConfigModule::rootExited(TDEProcess *)
{
if (_embedWidget->embeddedWinId())
XDestroyWindow(tqt_xdisplay(), _embedWidget->embeddedWinId());
diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h
index fc5406fa..bb612e37 100644
--- a/kcontrol/kcontrol/modules.h
+++ b/kcontrol/kcontrol/modules.h
@@ -30,7 +30,7 @@ class TQStringList;
class TDEAboutData;
class KCModule;
class ProxyWidget;
-class KProcess;
+class TDEProcess;
class QXEmbed;
class TQVBoxLayout;
class TQVBox;
@@ -63,7 +63,7 @@ private slots:
void clientClosed();
void clientChanged(bool state);
void runAsRoot();
- void rootExited(KProcess *proc);
+ void rootExited(TDEProcess *proc);
void embedded();
@@ -80,7 +80,7 @@ private:
bool _changed;
ProxyWidget *_module;
QXEmbed *_embedWidget;
- KProcess *_rootProcess;
+ TDEProcess *_rootProcess;
TQVBoxLayout *_embedLayout;
TQVBox *_embedFrame;
TQWidgetStack *_embedStack;
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index 794a69b9..7c095c5f 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -38,7 +38,7 @@
static TQPixmap appIcon(const TQString &iconName)
{
TQString path;
- TQPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, &path, true);
+ TQPixmap normal = TDEGlobal::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)
{
diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp
index 2333774b..1b32e0f7 100644
--- a/kcontrol/kcontrol/searchwidget.cpp
+++ b/kcontrol/kcontrol/searchwidget.cpp
@@ -39,7 +39,7 @@ class ModuleItem : public TQListBoxPixmap
public:
ModuleItem(ConfigModule *module, TQListBox * listbox = 0) :
TQListBoxPixmap(listbox,
- KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall),
+ TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall),
module->moduleName())
, m_module(module)
{
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index bd3c7022..62b23591 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -57,7 +57,7 @@ TopLevel::TopLevel(const char* name)
report_bug = 0;
// read settings
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("Index");
TQString viewmode = config->readEntry("ViewMode", "Tree");
@@ -182,8 +182,8 @@ TopLevel::TopLevel(const char* name)
TQT_SLOT( activateModule( ConfigModule * ) ) );
_dock->setBaseWidget( aw );
KWin::setIcons( winId(),
- KGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 32 ),
- KGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 16 ) );
+ TDEGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 32 ),
+ TDEGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 16 ) );
}
else
{
@@ -196,7 +196,7 @@ TopLevel::TopLevel(const char* name)
TopLevel::~TopLevel()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("Index");
if (KCGlobal::viewMode() == Tree)
config->writeEntry("ViewMode", "Tree");
@@ -486,7 +486,7 @@ void TopLevel::reportBug()
bool deleteit = false;
if (!_active) // report against kcontrol
- dummyAbout = const_cast<TDEAboutData*>(KGlobal::instance()->aboutData());
+ dummyAbout = const_cast<TDEAboutData*>(TDEGlobal::instance()->aboutData());
else
{
if (_active->aboutData())
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index 226e8431..af606f5f 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -148,7 +148,7 @@ void KDEDConfig::load( bool useDefaults ) {
_lvLoD->clear();
TQStringList files;
- KGlobal::dirs()->findAllResources( "services",
+ TDEGlobal::dirs()->findAllResources( "services",
TQString::fromLatin1( "kded/*.desktop" ),
true, true, files );
@@ -186,7 +186,7 @@ void KDEDConfig::save() {
TQCheckListItem* item = 0L;
TQStringList files;
- KGlobal::dirs()->findAllResources( "services",
+ TDEGlobal::dirs()->findAllResources( "services",
TQString::fromLatin1( "kded/*.desktop" ),
true, true, files );
diff --git a/kcontrol/keys/ChangeLog b/kcontrol/keys/ChangeLog
index b8ef570d..da787a8c 100644
--- a/kcontrol/keys/ChangeLog
+++ b/kcontrol/keys/ChangeLog
@@ -15,8 +15,8 @@
global.cpp did for just the global keys.
* converted main.cpp to use keyconfig.cpp rather than
global.cpp and standard.cpp for standard and globall
- key configuration. KGlobalConfig and KStdConfig disappear.
- (KGlobalConfig is renamed to KKeyConfig)
+ key configuration. TDEGlobalConfig and KStdConfig disappear.
+ (TDEGlobalConfig is renamed to KKeyConfig)
* appropriate changes to Makefile.am.
* standard key binding are now #include'd from
stdbindings.cpp
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index dc9d3095..539c6721 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -226,7 +226,7 @@ void KKeyModule::defaults()
/*void KKeyModule::slotRemove()
{
TQString kksPath =
- KGlobal::dirs()->saveLocation("data", "kcmkeys/" + KeyType);
+ TDEGlobal::dirs()->saveLocation("data", "kcmkeys/" + KeyType);
TQDir d( kksPath );
if (!d.exists()) // what can we do?
@@ -360,7 +360,7 @@ void KKeyModule::readScheme( int index )
TQT_SLOT( slotPreviewScheme( int ) ) );
- TQString kksPath = KGlobal::dirs()->saveLocation("data", "kcmkeys/");
+ TQString kksPath = TDEGlobal::dirs()->saveLocation("data", "kcmkeys/");
TQDir d( kksPath );
if ( !d.exists() )
@@ -426,7 +426,7 @@ void KKeyModule::readScheme( int index )
/*void KKeyModule::readSchemeNames( )
{
- TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc");
+ TQStringList schemes = TDEGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc");
//TQRegExp r( "-kde[34].kksrc$" );
TQRegExp r( "-trinity.kksrc$" );
@@ -472,11 +472,11 @@ void KKeyModule::init()
kdDebug(125) << "KKeyModule::init()\n";
/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
- KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
- TQString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
+ KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+ TQString fourMods = TDEGlobal::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 );
+ TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
*/
KAccelActions* keys = new KAccelActions();
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index a91fca23..456818be 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -132,9 +132,9 @@ extern "C"
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("twin");
- KGlobal::locale()->insertCatalogue("kdesktop");
- KGlobal::locale()->insertCatalogue("kicker");
+ TDEGlobal::locale()->insertCatalogue("twin");
+ TDEGlobal::locale()->insertCatalogue("kdesktop");
+ TDEGlobal::locale()->insertCatalogue("kicker");
return new KeyModule(parent, "kcmkeys");
}
@@ -142,8 +142,8 @@ extern "C"
{
kdDebug(125) << "KeyModule::initModifiers()" << endl;
- KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
- bool bMacSwap = KGlobal::config()->readBoolEntry( "Mac Modifier Swap", false );
+ KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+ bool bMacSwap = TDEGlobal::config()->readBoolEntry( "Mac Modifier Swap", false );
if( bMacSwap )
ModifiersModule::setupMacModifierKeys();
}
@@ -153,11 +153,11 @@ extern "C"
kdDebug(125) << "KeyModule::init()\n";
/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
- KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
- TQString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
+ KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+ TQString fourMods = TDEGlobal::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 );
+ TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
*/
KAccelActions* keys = new KAccelActions();
@@ -179,16 +179,16 @@ extern "C"
// This is needed to be able to check for conflicts with global keys in app's keyconfig
// dialogs, kdeglobals is empty as long as you don't apply any change in controlcenter/keys.
// However, avoid writing at every KDE startup, just update them after every rebuild of this file.
- KConfigGroup group( KGlobal::config(), "Global Shortcuts" );
+ KConfigGroup group( TDEGlobal::config(), "Global Shortcuts" );
if( group.readEntry( "Defaults timestamp" ) != __DATE__ __TIME__ ) {
kdDebug(125) << "KeyModule::init() - Read Config Bindings\n";
// Check for old group,
- if( KGlobal::config()->hasGroup( "Global Keys" ) ) {
+ if( TDEGlobal::config()->hasGroup( "Global Keys" ) ) {
keys->readActions( "Global Keys" );
- KGlobal::config()->deleteGroup( "Global Keys", true, true );
+ TDEGlobal::config()->deleteGroup( "Global Keys", true, true );
}
keys->readActions( "Global Shortcuts" );
- KGlobal::config()->deleteGroup( "Global Shortcuts", true, true );
+ TDEGlobal::config()->deleteGroup( "Global Shortcuts", true, true );
kdDebug(125) << "KeyModule::init() - Write Config Bindings\n";
keys->writeActions( "Global Shortcuts", 0, true, true );
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index db304f0c..05802de7 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -61,7 +61,7 @@ ModifiersModule::ModifiersModule( TQWidget *parent, const char *name )
void ModifiersModule::load( bool useDefaults )
{
- KConfig *c = KGlobal::config();
+ KConfig *c = TDEGlobal::config();
c->setReadDefaults( useDefaults );
@@ -82,35 +82,35 @@ void ModifiersModule::save()
{
kdDebug(125) << "ModifiersModule::save()" << endl;
- KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
+ KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
if( m_plblCtrl->text() != "Ctrl" )
- KGlobal::config()->writeEntry( "Label Ctrl", m_plblCtrl->text(), true, true );
+ TDEGlobal::config()->writeEntry( "Label Ctrl", m_plblCtrl->text(), true, true );
else
- KGlobal::config()->deleteEntry( "Label Ctrl", false, true );
+ TDEGlobal::config()->deleteEntry( "Label Ctrl", false, true );
if( m_plblAlt->text() != "Alt" )
- KGlobal::config()->writeEntry( "Label Alt", m_plblAlt->text(), true, true );
+ TDEGlobal::config()->writeEntry( "Label Alt", m_plblAlt->text(), true, true );
else
- KGlobal::config()->deleteEntry( "Label Alt", false, true );
+ TDEGlobal::config()->deleteEntry( "Label Alt", false, true );
if( m_plblWin->text() != "Win" )
- KGlobal::config()->writeEntry( "Label Win", m_plblWin->text(), true, true );
+ TDEGlobal::config()->writeEntry( "Label Win", m_plblWin->text(), true, true );
else
- KGlobal::config()->deleteEntry( "Label Win", false, true );
+ TDEGlobal::config()->deleteEntry( "Label Win", false, true );
if( m_pchkMacKeyboard->isChecked() )
- KGlobal::config()->writeEntry( "Mac Keyboard", true, true, true );
+ TDEGlobal::config()->writeEntry( "Mac Keyboard", true, true, true );
else
- KGlobal::config()->deleteEntry( "Mac Keyboard", false, true );
+ TDEGlobal::config()->deleteEntry( "Mac Keyboard", false, true );
bool bMacSwap = m_pchkMacKeyboard->isChecked() && m_pchkMacSwap->isChecked();
if( bMacSwap )
- KGlobal::config()->writeEntry( "Mac Modifier Swap", true, true, true );
+ TDEGlobal::config()->writeEntry( "Mac Modifier Swap", true, true, true );
else
- KGlobal::config()->deleteEntry( "Mac Modifier Swap", false, true );
+ TDEGlobal::config()->deleteEntry( "Mac Modifier Swap", false, true );
- KGlobal::config()->sync();
+ TDEGlobal::config()->sync();
if( m_bMacSwapOrig != bMacSwap ) {
if( bMacSwap )
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index 265f2556..3dac9dcf 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -69,10 +69,10 @@ void ShortcutsModule::save()
// FIXME: This isn't working. Why? -- ellis, 2002/01/27
// Check for old group,
- if( KGlobal::config()->hasGroup( "Keys" ) ) {
- KGlobal::config()->deleteGroup( "Keys", true, true );
+ if( TDEGlobal::config()->hasGroup( "Keys" ) ) {
+ TDEGlobal::config()->deleteGroup( "Keys", true, true );
}
- KGlobal::config()->sync();
+ TDEGlobal::config()->sync();
m_pkcGeneral->commitChanges();
m_pkcSequence->commitChanges();
@@ -104,7 +104,7 @@ TQString ShortcutsModule::quickHelp() const
void ShortcutsModule::initGUI()
{
- TQString kde_winkeys_env_dir = KGlobal::dirs()->localtdedir() + "/env/";
+ TQString kde_winkeys_env_dir = TDEGlobal::dirs()->localtdedir() + "/env/";
kdDebug(125) << "A-----------" << endl;
KAccelActions* keys = &m_actionsGeneral;
@@ -264,7 +264,7 @@ void ShortcutsModule::createActionsSequence()
void ShortcutsModule::readSchemeNames()
{
- TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/*.kksrc");
+ TQStringList schemes = TDEGlobal::dirs()->findAllResources("data", "kcmkeys/*.kksrc");
m_pcbSchemes->clear();
m_rgsSchemeFiles.clear();
@@ -406,7 +406,7 @@ void ShortcutsModule::slotSaveSchemeAs()
disconnect( m_pcbSchemes, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectScheme(int)) );
- TQString kksPath = KGlobal::dirs()->saveLocation( "data", "kcmkeys/" );
+ TQString kksPath = TDEGlobal::dirs()->saveLocation( "data", "kcmkeys/" );
TQDir dir( kksPath );
if( !dir.exists() && !dir.mkdir( kksPath ) ) {
@@ -458,7 +458,7 @@ void ShortcutsModule::slotRemoveScheme()
void ShortcutsModule::slotUseRmWinKeysClicked()
{
- TQString kde_winkeys_env_dir = KGlobal::dirs()->localtdedir() + "/env/";
+ TQString kde_winkeys_env_dir = TDEGlobal::dirs()->localtdedir() + "/env/";
// See if ~/.trinity/env/win-key.sh exists
TQFile f( kde_winkeys_env_dir + "win-key.sh" );
diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp
index 58de8a1f..31b39974 100644
--- a/kcontrol/keys/treeview.cpp
+++ b/kcontrol/keys/treeview.cpp
@@ -215,7 +215,7 @@ TQStringList AppTreeView::fileList(const TQString& rPath)
TQStringList filelist;
// loop through all resource dirs and build a file list
- TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
+ TQStringList resdirlist = TDEGlobal::dirs()->resourceDirs("apps");
for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
{
TQDir dir((*it) + "/" + relativePath);
@@ -254,7 +254,7 @@ TQStringList AppTreeView::dirList(const TQString& rPath)
TQStringList dirlist;
// loop through all resource dirs and build a subdir list
- TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
+ TQStringList resdirlist = TDEGlobal::dirs()->resourceDirs("apps");
for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
{
TQDir dir((*it) + "/" + relativePath);
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index 5b2ac8a1..814703b0 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -82,7 +82,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
#endif
itsConfig(KFI_UI_CFG_FILE)
{
- KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
+ TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
TDEAboutData* about = new TDEAboutData("kcmfontinst",
I18N_NOOP("TDE Font Installer"),
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
index df1bbe74..df50e81a 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
@@ -189,7 +189,7 @@ void CKFileFontView::slotActivate(TQListViewItem *item)
void CKFileFontView::selected(TQListViewItem *item)
{
if (item && !(TDEApplication::keyboardMouseState() & (ShiftButton|ControlButton)) &&
- KGlobalSettings::singleClick())
+ TDEGlobalSettings::singleClick())
{
const KFileItem *fi = ((CFontListViewItem*)item)->fileInfo();
@@ -632,7 +632,7 @@ void CFontListViewItem::init()
CFontListViewItem::setPixmap(COL_NAME, itsInf->pixmap(KIcon::SizeSmall));
setText(COL_NAME, itsInf->text());
- setText(COL_SIZE, itsInf->isDir() ? "" : KGlobal::locale()->formatNumber(itsInf->size(), 0));
+ setText(COL_SIZE, itsInf->isDir() ? "" : TDEGlobal::locale()->formatNumber(itsInf->size(), 0));
setText(COL_TYPE, itsInf->mimeComment());
}
diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
index 112e3562..a4f09cb5 100644
--- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
+++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
@@ -268,7 +268,7 @@ namespace KFI
KFileFontPlugin::KFileFontPlugin(TQObject *parent, const char *name, const TQStringList& args)
: KFilePlugin(parent, name, args)
{
- KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
+ TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
addMimeType("application/x-font-ttf"),
addMimeType("application/x-font-type1");
diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp
index 7421d168..15531901 100644
--- a/kcontrol/kfontinst/kio/KioFonts.cpp
+++ b/kcontrol/kfontinst/kio/KioFonts.cpp
@@ -1127,15 +1127,15 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
if(!Misc::dExists(itsFolders[destFolder].location))
{
cmd+="mkdir ";
- cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
+ cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location));
cmd+=" && chmod 0755 ";
- cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
+ cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location));
cmd+=" && ";
}
cmd+="cp -f ";
- cmd+=TQFile::encodeName(KProcess::quote(tmpFileC));
+ cmd+=TQFile::encodeName(TDEProcess::quote(tmpFileC));
cmd+=" ";
- cmd+=TQFile::encodeName(KProcess::quote(destC));
+ cmd+=TQFile::encodeName(TDEProcess::quote(destC));
cmd+=" && chmod 0644 ";
cmd+=destC;
@@ -1351,9 +1351,9 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
if(!Misc::dExists(itsFolders[destFolder].location))
{
cmd+="mkdir ";
- cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
+ cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location));
cmd+=" && chmod 0755 ";
- cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
+ cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location));
cmd+=" && ";
}
@@ -1363,9 +1363,9 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
for(; fIt!=fEnd; ++fIt)
{
cmd+="cp -f ";
- cmd+=TQFile::encodeName(KProcess::quote(fIt.key()));
+ cmd+=TQFile::encodeName(TDEProcess::quote(fIt.key()));
cmd+=" ";
- cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location+modifyName(fIt.data())));
+ cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location+modifyName(fIt.data())));
int s=getSize(TQFile::encodeName(fIt.key()));
if(s>0)
size+=s;
@@ -1540,7 +1540,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
toSys=FOLDER_SYS==destFolder;
TQCString userId,
groupId,
- destDir(TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location)));
+ destDir(TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location)));
userId.setNum(toSys ? 0 : getuid());
groupId.setNum(toSys ? 0 : getgid());
@@ -1548,7 +1548,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
for(; fIt!=fEnd; ++fIt)
{
TQCString cmd,
- destFile(TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location+fIt.data())));
+ destFile(TQFile::encodeName(TDEProcess::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+=TQFile::encodeName(KProcess::quote(fIt.key()));
+ cmd+=TQFile::encodeName(TDEProcess::quote(fIt.key()));
cmd+=" ";
cmd+=destFile;
cmd+=" && chmod -f 0644 ";
@@ -1631,7 +1631,7 @@ void CKioFonts::del(const KURL &url, bool)
modifiedDirs.add(Misc::getDir(file));
cmd+=" ";
- cmd+=TQFile::encodeName(KProcess::quote(file));
+ cmd+=TQFile::encodeName(TDEProcess::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+=TQFile::encodeName(KProcess::quote((*uIt).path()));
+ cmd+=TQFile::encodeName(TDEProcess::quote((*uIt).path()));
}
}
}
@@ -1800,7 +1800,7 @@ void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool
cmd+=" && kfontinst ";
cmd+=tmpCmd;
cmd+=" ";
- cmd+=TQFile::encodeName(KProcess::quote(*it));
+ cmd+=TQFile::encodeName(TDEProcess::quote(*it));
}
}
}
@@ -1809,7 +1809,7 @@ void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool
cmd+=" && kfontinst ";
cmd+=itsNrsKfiParams;
cmd+=" ";
- cmd+=TQFile::encodeName(KProcess::quote(itsFolders[FOLDER_SYS].location));
+ cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[FOLDER_SYS].location));
}
}
@@ -2437,7 +2437,7 @@ void CKioFonts::createAfm(const TQString &file, bool nrs, const TQString &passwd
if(nrs)
{
TQCString cmd("pf2afm ");
- cmd+=TQFile::encodeName(KProcess::quote(name));
+ cmd+=TQFile::encodeName(TDEProcess::quote(name));
doRootCmd(cmd, passwd);
}
else
diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp
index 44d180fd..3c232058 100644
--- a/kcontrol/kfontinst/lib/FcEngine.cpp
+++ b/kcontrol/kfontinst/lib/FcEngine.cpp
@@ -579,7 +579,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b
if(1==itsSizes.size())
title=i18n("%1 [1 pixel]", "%1 [%n pixels]", itsSizes[0]).arg(title);
- painter.setFont(KGlobalSettings::generalFont());
+ painter.setFont(TDEGlobalSettings::generalFont());
painter.setPen(Qt::black);
y=painter.fontMetrics().height();
drawText(painter, x, y, w-offset, title);
diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp
index 1e779b51..fe6054cd 100644
--- a/kcontrol/kfontinst/lib/Misc.cpp
+++ b/kcontrol/kfontinst/lib/Misc.cpp
@@ -133,7 +133,7 @@ bool createDir(const TQString &dir)
bool doCmd(const TQString &cmd, const TQString &p1, const TQString &p2, const TQString &p3)
{
- KProcess proc;
+ TDEProcess proc;
proc << cmd;
@@ -144,7 +144,7 @@ bool doCmd(const TQString &cmd, const TQString &p1, const TQString &p2, const TQ
if(!p3.isEmpty())
proc << p3;
- proc.start(KProcess::Block);
+ proc.start(TDEProcess::Block);
return proc.normalExit() && proc.exitStatus()==0;
}
diff --git a/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp b/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
index 363ebe06..aaf85e94 100644
--- a/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
+++ b/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
@@ -49,7 +49,7 @@ namespace KFI
CFontThumbnail::CFontThumbnail()
{
- KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
+ TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
}
bool CFontThumbnail::create(const TQString &path, int width, int height, TQImage &img)
diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
index 32f36f9e..41d06984 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
@@ -37,7 +37,7 @@ extern "C"
{
KDE_EXPORT void* init_libkfontviewpart()
{
- KGlobal::locale()->insertCatalogue("kfontinst");
+ TDEGlobal::locale()->insertCatalogue("kfontinst");
return new KFI::CFontViewPartFactory;
}
}
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
index bbac01bc..28dbd0f1 100644
--- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
@@ -100,7 +100,7 @@ void CFontViewerAppMainWindow::fileOpen()
CFontViewerApp::CFontViewerApp()
{
- KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
+ TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
setMainWidget(new CFontViewerAppMainWindow());
}
diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp
index fec6dc69..f2b7cc1b 100644
--- a/kcontrol/kicker/applettab_impl.cpp
+++ b/kcontrol/kicker/applettab_impl.cpp
@@ -120,7 +120,7 @@ void AppletTab::load( bool useDefaults )
list_group->setEnabled(trusted_rb->isChecked());
- TQStringList list = KGlobal::dirs()->findAllResources("applets", "*.desktop");
+ TQStringList list = TDEGlobal::dirs()->findAllResources("applets", "*.desktop");
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
{
TQFileInfo fi(*it);
diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp
index 24c640a1..b2e6a79d 100644
--- a/kcontrol/kicker/lookandfeeltab_impl.cpp
+++ b/kcontrol/kicker/lookandfeeltab_impl.cpp
@@ -319,7 +319,7 @@ void LookAndFeelTab::fillTileCombos()
m_tilename.clear();
m_tilename << "" << "Colorize";
- TQStringList list = KGlobal::dirs()->findAllResources("tiles","*_tiny_up.png");
+ TQStringList list = TDEGlobal::dirs()->findAllResources("tiles","*_tiny_up.png");
int minHeight = 0;
for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it)
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index 8bf4646d..5fa5ceb0 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -100,7 +100,7 @@ void KickerConfig::init()
}
TQString configname = configName();
- TQString configpath = KGlobal::dirs()->findResource("config", configname);
+ TQString configpath = TDEGlobal::dirs()->findResource("config", configname);
if (configpath.isEmpty())
configpath = locateLocal("config", configname);
KSharedConfig::Ptr config = KSharedConfig::openConfig(configname);
@@ -195,9 +195,9 @@ void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool re
// set config group
config.setGroup(group);
- TQString df = KGlobal::dirs()->findResource("extensions", config.readEntry("DesktopFile"));
+ TQString df = TDEGlobal::dirs()->findResource("extensions", config.readEntry("DesktopFile"));
TQString configname = config.readEntry("ConfigFile");
- TQString configpath = KGlobal::dirs()->findResource("config", configname);
+ TQString configpath = TDEGlobal::dirs()->findResource("config", configname);
if (checkExists)
{
@@ -383,14 +383,14 @@ extern "C"
KDE_EXPORT KCModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
{
- KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
+ TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
"kicker/extensions");
return new PositionConfig(parent, "kcmkicker");
}
KDE_EXPORT KCModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
{
- KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
+ TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
"kicker/extensions");
return new HidingConfig(parent, "kcmkicker");
}
@@ -403,9 +403,9 @@ extern "C"
KDE_EXPORT KCModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
{
KImageIO::registerFormats();
- KGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") +
+ TDEGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") +
"kicker/tiles");
- KGlobal::dirs()->addResourceType("hb_pics", KStandardDirs::kde_default("data") +
+ TDEGlobal::dirs()->addResourceType("hb_pics", KStandardDirs::kde_default("data") +
"kcmkicker/pics");
return new LookAndFeelConfig(parent, "kcmkicker");
}
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 8380efbd..5b08627c 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -84,7 +84,7 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
//connect(kcfg_ButtonFont, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(kmenuChanged()));
connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(kmenuChanged()));
- KIconLoader * ldr = KGlobal::iconLoader();
+ KIconLoader * ldr = TDEGlobal::iconLoader();
TQPixmap kmenu_icon;
m_kmenu_icon = KickerSettings::customKMenuIcon();
if (m_kmenu_icon.isNull() == true) {
@@ -136,7 +136,7 @@ void MenuTab::load( bool useDefaults )
TQStringList ext_default;
ext_default << "prefmenu.desktop" << "systemmenu.desktop";
TQStringList ext = c->readListEntry("Extensions", ext_default);
- TQStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/menuext");
+ TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kicker/menuext");
kSubMenuItem* menuItem(0);
for (TQStringList::ConstIterator dit=dirs.begin(); dit!=dirs.end(); ++dit)
{
@@ -312,7 +312,7 @@ void MenuTab::launchIconEditor()
return;
m_kmenu_icon = newIcon;
- KIconLoader * ldr = KGlobal::iconLoader();
+ KIconLoader * ldr = TDEGlobal::iconLoader();
TQPixmap kmenu_icon;
kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall);
btnCustomKMenuIcon->setPixmap(kmenu_icon);
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index 5e90a9c5..8c02821b 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -689,7 +689,7 @@ void PositionTab::showIdentify()
TQLabel *screenLabel = new TQLabel(0,"Screen Identify", (WFlags)(WDestructiveClose | WStyle_Customize | WX11BypassWM) );
- TQFont identifyFont(KGlobalSettings::generalFont());
+ TQFont identifyFont(TDEGlobalSettings::generalFont());
identifyFont.setPixelSize(100);
screenLabel->setFont(identifyFont);
diff --git a/kcontrol/kio/cache.cpp b/kcontrol/kio/cache.cpp
index d98cba30..1537ade1 100644
--- a/kcontrol/kio/cache.cpp
+++ b/kcontrol/kio/cache.cpp
@@ -117,9 +117,9 @@ void KCacheConfigDialog::configChanged()
void KCacheConfigDialog::slotClearCache()
{
- KProcess process;
+ TDEProcess process;
process << "kio_http_cache_cleaner" << "--clear-all";
- process.start(KProcess::DontCare);
+ process.start(TDEProcess::DontCare);
// Cleaning up might take a while. Better detach.
process.detach();
}
diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/kio/fakeuaprovider.cpp
index b3eec534..e00c6386 100644
--- a/kcontrol/kio/fakeuaprovider.cpp
+++ b/kcontrol/kio/fakeuaprovider.cpp
@@ -94,7 +94,7 @@ void FakeUASProvider::parseDescription()
tmp.replace( QFL("appSysRelease"), TQString(utsn.release) );
tmp.replace( QFL("appMachineType"), TQString(utsn.machine) );
- TQStringList languageList = KGlobal::locale()->languageList();
+ TQStringList languageList = TDEGlobal::locale()->languageList();
if ( languageList.count() )
{
TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp
index 9a4f6eb2..e825fd2a 100644
--- a/kcontrol/kio/kcookiesmanagement.cpp
+++ b/kcontrol/kio/kcookiesmanagement.cpp
@@ -334,7 +334,7 @@ bool KCookiesManagement::cookieDetails(CookieProp *cookie)
{
TQDateTime expDate;
expDate.setTime_t(tmp);
- cookie->expireDate = KGlobal::locale()->formatDateTime(expDate);
+ cookie->expireDate = TDEGlobal::locale()->formatDateTime(expDate);
}
tmp = (*c).toUInt();
diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp
index 90dfd917..1b0a4fea 100644
--- a/kcontrol/kio/smbrodlg.cpp
+++ b/kcontrol/kio/smbrodlg.cpp
@@ -63,7 +63,7 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent)
layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1);
m_encodingList = new KComboBox( false, this );
- TQStringList _strList = KGlobal::charsets()->availableEncodingNames();
+ TQStringList _strList = TDEGlobal::charsets()->availableEncodingNames();
m_encodingList->insertStringList( _strList );
label = new TQLabel( m_encodingList, i18n( "MS Windows encoding:" ), this );
@@ -99,7 +99,7 @@ void SMBRoOptions::load()
// m_workgroupLe->setText(cfg->readEntry("Workgroup"));
// m_showHiddenShares->setChecked(cfg->readBoolEntry("ShowHiddenShares",false));
-// TQStringList _strList = KGlobal::charsets()->availableEncodingNames();
+// TQStringList _strList = TDEGlobal::charsets()->availableEncodingNames();
// TQString m_encoding = TQTextCodec::codecForLocale()->name();
// m_encodingList->setCurrentItem( _strList.findIndex( cfg->readEntry( "Encoding", m_encoding.lower() ) ) );
diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp
index 30914e96..63438cbf 100644
--- a/kcontrol/knotify/knotify.cpp
+++ b/kcontrol/knotify/knotify.cpp
@@ -163,7 +163,7 @@ void KCMKNotify::load( bool useDefaults )
m_notifyWidget->clear();
TQStringList fullpaths =
- KGlobal::dirs()->findAllResources("data", "*/eventsrc", false, true );
+ TDEGlobal::dirs()->findAllResources("data", "*/eventsrc", false, true );
TQStringList::ConstIterator it = fullpaths.begin();
for ( ; it != fullpaths.end(); ++it)
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 307a04a6..757385cd 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -122,7 +122,7 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char *
* or left handed. The outer button functionality is actually swapped
*
*/
- bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded);
+ bool leftHandedMouse = ( TDEGlobalSettings::mouseSettings().handed == TDEGlobalSettings::KMouseSettings::LeftHanded);
m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media"));
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index 37ab6f71..a01cdc06 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -246,11 +246,11 @@ void KonqFontOptions::load( bool useDefaults )
if ( m_fSize == -1 )
m_fSize = TQFontInfo(stdFont).pointSize();
- normalTextColor = KGlobalSettings::textColor();
+ normalTextColor = TDEGlobalSettings::textColor();
normalTextColor = g_pConfig->readColorEntry( "NormalTextColor", &normalTextColor );
m_pNormalText->setColor( normalTextColor );
- /* highlightedTextColor = KGlobalSettings::highlightedTextColor();
+ /* highlightedTextColor = TDEGlobalSettings::highlightedTextColor();
highlightedTextColor = g_pConfig->readColorEntry( "HighlightedTextColor", &highlightedTextColor );
m_pHighlightedText->setColor( highlightedTextColor );
*/
@@ -298,7 +298,7 @@ void KonqFontOptions::defaults()
void KonqFontOptions::updateGUI()
{
if ( m_stdName.isEmpty() )
- m_stdName = KGlobalSettings::generalFont().family();
+ m_stdName = TDEGlobalSettings::generalFont().family();
m_pStandard->setCurrentFont( m_stdName );
m_pSize->setValue( m_fSize );
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 53c16f15..cfa36744 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -158,8 +158,8 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ )
void KPreviewOptions::load(bool useDefaults)
{
// *** load and apply to GUI ***
- KGlobal::config()->setReadDefaults(useDefaults);
- KConfigGroup group( KGlobal::config(), "PreviewSettings" );
+ TDEGlobal::config()->setReadDefaults(useDefaults);
+ KConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
TQPtrListIterator<TQCheckListItem> it( m_items );
for ( ; it.current() ; ++it ) {
@@ -176,7 +176,7 @@ void KPreviewOptions::load(bool useDefaults)
m_boostSize->setChecked( group.readBoolEntry( "BoostSize", false /*default*/ ) );
m_useFileThumbnails->setChecked( group.readBoolEntry( "UseFileThumbnails", true /*default*/ ) );
- KGlobal::config()->setReadDefaults(false);
+ TDEGlobal::config()->setReadDefaults(false);
}
void KPreviewOptions::load()
@@ -191,7 +191,7 @@ void KPreviewOptions::defaults()
void KPreviewOptions::save()
{
- KConfigGroup group( KGlobal::config(), "PreviewSettings" );
+ KConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
TQPtrListIterator<TQCheckListItem> it( m_items );
for ( ; it.current() ; ++it ) {
TQString protocol( it.current()->text() );
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index 589ad0e3..ea3c5baa 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -131,7 +131,7 @@ void DesktopPathConfig::load( bool useDefaults )
// Desktop Paths
config.setReadDefaults( useDefaults );
config.setGroup("Paths");
- urAutostart->setURL( config.readPathEntry( "Autostart" , KGlobalSettings::autostartPath() ));
+ urAutostart->setURL( config.readPathEntry( "Autostart" , TDEGlobalSettings::autostartPath() ));
KConfig xdguserconfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" );
@@ -148,7 +148,7 @@ void DesktopPathConfig::defaults()
void DesktopPathConfig::save()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfig *xdgconfig = new KConfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" );
KConfigGroupSaver cgs( config, "Paths" );
@@ -156,17 +156,17 @@ void DesktopPathConfig::save()
bool autostartMoved = false;
KURL desktopURL;
- desktopURL.setPath( KGlobalSettings::desktopPath() );
+ desktopURL.setPath( TDEGlobalSettings::desktopPath() );
KURL newDesktopURL;
newDesktopURL.setPath(urDesktop->url());
KURL autostartURL;
- autostartURL.setPath( KGlobalSettings::autostartPath() );
+ autostartURL.setPath( TDEGlobalSettings::autostartPath() );
KURL newAutostartURL;
newAutostartURL.setPath(urAutostart->url());
KURL documentURL;
- documentURL.setPath( KGlobalSettings::documentPath() );
+ documentURL.setPath( TDEGlobalSettings::documentPath() );
KURL newDocumentURL;
newDocumentURL.setPath(urDocument->url());
@@ -202,11 +202,11 @@ void DesktopPathConfig::save()
if ( newAutostartURL.equals( futureAutostartURL, true ) )
autostartMoved = true;
else
- autostartMoved = moveDir( KURL( KGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") );
+ autostartMoved = moveDir( KURL( TDEGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") );
}
}
- if ( moveDir( KURL( KGlobalSettings::desktopPath() ), KURL( urlDesktop ), i18n("Desktop") ) )
+ if ( moveDir( KURL( TDEGlobalSettings::desktopPath() ), KURL( urlDesktop ), i18n("Desktop") ) )
{
xdgconfig->writePathEntry( "XDG_DESKTOP_DIR", '"'+ urlDesktop + '"', true, false );
pathChanged = true;
@@ -216,7 +216,7 @@ void DesktopPathConfig::save()
if ( !newAutostartURL.equals( autostartURL, true ) )
{
if (!autostartMoved)
- autostartMoved = moveDir( KURL( KGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") );
+ autostartMoved = moveDir( KURL( TDEGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") );
if (autostartMoved)
{
config->writePathEntry( "Autostart", urAutostart->url(), true, true );
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index 1a20fd27..fa22ab53 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -212,7 +212,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget
m_pEncoding = new TQComboBox( false, this );
label->setBuddy( m_pEncoding );
- encodings = KGlobal::charsets()->availableEncodingNames();
+ encodings = TDEGlobal::charsets()->availableEncodingNames();
encodings.prepend(i18n("Use Language Encoding"));
m_pEncoding->insertStringList( encodings );
lay->addMultiCellWidget(m_pEncoding,r, r, M, W);
@@ -337,8 +337,8 @@ void KAppearanceOptions::load( bool useDefaults )
fSize = fMinSize;
defaultFonts = TQStringList();
- defaultFonts.append( READ_ENTRY( "StandardFont", KGlobalSettings::generalFont().family() ) );
- defaultFonts.append( READ_ENTRY( "FixedFont", KGlobalSettings::fixedFont().family() ) );
+ defaultFonts.append( READ_ENTRY( "StandardFont", TDEGlobalSettings::generalFont().family() ) );
+ defaultFonts.append( READ_ENTRY( "FixedFont", TDEGlobalSettings::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 ) );
diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp
index ca175e8e..93fb20d7 100644
--- a/kcontrol/konqhtml/khttpoptdlg.cpp
+++ b/kcontrol/konqhtml/khttpoptdlg.cpp
@@ -49,7 +49,7 @@ void KHTTPOptions::load( bool useDefaults )
m_pConfig->setReadDefaults( useDefaults );
m_pConfig->setGroup( "Browser Settings/HTTP" );
- tmp = m_pConfig->readEntry( "AcceptLanguages",KGlobal::locale()->languageList().join(","));
+ tmp = m_pConfig->readEntry( "AcceptLanguages",TDEGlobal::locale()->languageList().join(","));
le_languages->setText( tmp );
tmp = m_pConfig->readEntry( "AcceptCharsets",defaultCharsets);
le_charsets->setText( tmp );
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index 221b2f9e..c78a63ee 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -292,7 +292,7 @@ void KPluginOptions::scan()
}
m_nspluginscan = new KProcIO;
- TQString scanExe = KGlobal::dirs()->findExe("nspluginscan");
+ TQString scanExe = TDEGlobal::dirs()->findExe("nspluginscan");
if (!scanExe) {
kdDebug() << "can't find nspluginviewer" << endl;
delete m_nspluginscan;
@@ -314,7 +314,7 @@ void KPluginOptions::scan()
kdDebug() << "Running nspluginscan" << endl;
connect(m_nspluginscan, TQT_SIGNAL(readReady(KProcIO*)),
this, TQT_SLOT(progress(KProcIO*)));
- connect(m_nspluginscan, TQT_SIGNAL(processExited(KProcess *)),
+ connect(m_nspluginscan, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(scanDone()));
connect(m_progress, TQT_SIGNAL(cancelled()), this, TQT_SLOT(scanDone()));
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index e870aff3..f712c8c0 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -93,7 +93,7 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name)
transparencyCheck->setChecked(false);
- KGlobal::locale()->insertCatalogue("konsole"); // For schema translations
+ TDEGlobal::locale()->insertCatalogue("konsole"); // For schema translations
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()));
@@ -228,7 +228,7 @@ void SchemaEditor::show()
void SchemaEditor::loadAllSchema(TQString currentFile)
{
- TQStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.schema");
+ TQStringList list = TDEGlobal::dirs()->findAllResources("data", "konsole/*.schema");
TQStringList::ConstIterator it;
disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
schemaList->clear();
@@ -263,7 +263,7 @@ void SchemaEditor::imageSelect()
start = backgndLine->text();
if (start.isEmpty())
{
- TQStringList list=KGlobal::dirs()->resourceDirs("wallpaper");
+ TQStringList list=TDEGlobal::dirs()->resourceDirs("wallpaper");
if(list.count()>0)
start= list.last();
}
@@ -361,7 +361,7 @@ void SchemaEditor::saveCurrent()
}
if (fullpath[0] != '/')
- fullpath = KGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
+ fullpath = TDEGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
TQFile f(fullpath);
if (f.open(IO_WriteOnly)) {
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index e93084af..c9a767ca 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -56,8 +56,8 @@ SessionEditor::SessionEditor(TQWidget * parent, const char *name)
oldSession=-1;
loaded=false;
- KGlobal::locale()->insertCatalogue("konsole"); // For schema and keytab translations
- KGlobal::iconLoader()->addAppDir( "konsole" );
+ TDEGlobal::locale()->insertCatalogue("konsole"); // For schema and keytab translations
+ TDEGlobal::iconLoader()->addAppDir( "konsole" );
directoryLine->setMode(KFile::Directory);
connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int)));
@@ -97,7 +97,7 @@ void SessionEditor::show()
void SessionEditor::loadAllKeytab()
{
- TQStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
+ TQStringList lst = TDEGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
keytabCombo->clear();
keytabFilename.clear();
@@ -159,7 +159,7 @@ TQString SessionEditor::readKeymapTitle(const TQString & file)
void SessionEditor::loadAllSession(TQString currentFile)
{
- TQStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.desktop", false, true);
+ TQStringList list = TDEGlobal::dirs()->findAllResources("data", "konsole/*.desktop", false, true);
sessionList->clear();
TQListBoxItem* currentItem = 0;
@@ -296,7 +296,7 @@ void SessionEditor::saveCurrent()
exec = exec.mid( 7, exec.length() - 8 );
exec = KRun::binaryName( exec, false );
exec = KShell::tildeExpand( exec );
- TQString pexec = KGlobal::dirs()->findExe( exec );
+ TQString pexec = TDEGlobal::dirs()->findExe( exec );
if ( pexec.isEmpty() )
{
@@ -326,7 +326,7 @@ void SessionEditor::saveCurrent()
}
if (fullpath[0] != '/')
- fullpath = KGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
+ fullpath = TDEGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
KSimpleConfig* co = new KSimpleConfig(fullpath);
co->setDesktopGroup();
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index af817b4f..1f8dfcc7 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -210,7 +210,7 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings )
kdeAdded.clear();
//Merge in KDE ones..
- plugins = KGlobal::dirs()->resourceDirs( "qtplugins" );
+ plugins = TDEGlobal::dirs()->resourceDirs( "qtplugins" );
for (TQStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
{
@@ -257,7 +257,7 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings )
settings.writeEntry("/qt/style", style);
/* export font settings */
- settings.writeEntry("/qt/font", KGlobalSettings::generalFont().toString());
+ settings.writeEntry("/qt/font", TDEGlobalSettings::generalFont().toString());
/* ##### looks like kcmfonts skips this, so we don't do this here */
/*bool usexft = kglobals.readBoolEntry("AntiAliasing", false);
@@ -444,9 +444,9 @@ void runRdb( uint flags )
// 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/");
+ TDEGlobal::dirs()->addResourceType("appdefaults", KStandardDirs::kde_default("data") + "kdisplay/app-defaults/");
TQColorGroup cg = newPal.active();
- KGlobal::locale()->insertCatalogue("krdb");
+ TDEGlobal::locale()->insertCatalogue("krdb");
createGtkrc( true, cg, 1 );
createGtkrc( true, cg, 2 );
@@ -454,23 +454,23 @@ void runRdb( uint flags )
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));
- addColorDef(preproc, "LOWLIGHT" , backCol.dark(100+(2*KGlobalSettings::contrast()+4)*10));
+ addColorDef(preproc, "HIGHLIGHT" , backCol.light(100+(2*TDEGlobalSettings::contrast()+4)*16/1));
+ addColorDef(preproc, "LOWLIGHT" , backCol.dark(100+(2*TDEGlobalSettings::contrast()+4)*10));
addColorDef(preproc, "SELECT_BACKGROUND" , cg.highlight());
addColorDef(preproc, "SELECT_FOREGROUND" , cg.highlightedText());
addColorDef(preproc, "WINDOW_BACKGROUND" , cg.base());
addColorDef(preproc, "WINDOW_FOREGROUND" , cg.foreground());
- addColorDef(preproc, "INACTIVE_BACKGROUND", KGlobalSettings::inactiveTitleColor());
- addColorDef(preproc, "INACTIVE_FOREGROUND", KGlobalSettings::inactiveTitleColor());
- addColorDef(preproc, "ACTIVE_BACKGROUND" , KGlobalSettings::activeTitleColor());
- addColorDef(preproc, "ACTIVE_FOREGROUND" , KGlobalSettings::activeTitleColor());
+ addColorDef(preproc, "INACTIVE_BACKGROUND", TDEGlobalSettings::inactiveTitleColor());
+ addColorDef(preproc, "INACTIVE_FOREGROUND", TDEGlobalSettings::inactiveTitleColor());
+ addColorDef(preproc, "ACTIVE_BACKGROUND" , TDEGlobalSettings::activeTitleColor());
+ addColorDef(preproc, "ACTIVE_FOREGROUND" , TDEGlobalSettings::activeTitleColor());
//---------------------------------------------------------------
tmp.writeBlock( preproc.latin1(), preproc.length() );
TQStringList list;
- TQStringList adPaths = KGlobal::dirs()->findDirs("appdefaults", "");
+ TQStringList adPaths = TDEGlobal::dirs()->findDirs("appdefaults", "");
for (TQStringList::ConstIterator it = adPaths.begin(); it != adPaths.end(); ++it) {
TQDir dSys( *it );
@@ -556,13 +556,13 @@ void runRdb( uint flags )
tmpFile.close();
- KProcess proc;
+ TDEProcess proc;
#ifndef NDEBUG
proc << "xrdb" << "-merge" << "-nocpp" << tmpFile.name();
#else
proc << "xrdb" << "-quiet" << "-merge" << "-nocpp" << tmpFile.name();
#endif
- proc.start( KProcess::Block, KProcess::Stdin );
+ proc.start( TDEProcess::Block, TDEProcess::Stdin );
tmpFile.unlink();
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index 8cd96a01..aebf467a 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -54,7 +54,7 @@ KTheme::KTheme( TQWidget *parent, const TQString & xmlFile )
//kdDebug() << m_dom.toString( 2 ) << endl;
setName( TQFileInfo( file ).baseName() );
- m_kgd = KGlobal::dirs();
+ m_kgd = TDEGlobal::dirs();
}
KTheme::KTheme( TQWidget *parent, bool create )
@@ -72,7 +72,7 @@ KTheme::KTheme( TQWidget *parent, bool create )
m_root.appendChild( m_general );
}
- m_kgd = KGlobal::dirs();
+ m_kgd = TDEGlobal::dirs();
}
KTheme::~KTheme()
@@ -125,7 +125,7 @@ TQString KTheme::createYourself( bool pack )
// 1. General stuff set by methods setBlah()
// 2. Background theme
- KConfig * globalConf = KGlobal::config();
+ KConfig * globalConf = TDEGlobal::config();
KConfig twinConf( "twinrc", true );
twinConf.setGroup( "Desktops" );
@@ -448,7 +448,7 @@ void KTheme::apply()
TQDomElement iconElem = m_dom.elementsByTagName( "icons" ).item( 0 ).toElement();
if ( !iconElem.isNull() )
{
- KConfig * iconConf = KGlobal::config();
+ KConfig * iconConf = TDEGlobal::config();
iconConf->setGroup( "Icons" );
iconConf->writeEntry( "Theme", iconElem.attribute( "name", "crystalsvg" ), true, true );
@@ -526,7 +526,7 @@ void KTheme::apply()
if ( !colorsElem.isNull() )
{
TQDomNodeList colorList = colorsElem.childNodes();
- KConfig * colorConf = KGlobal::config();
+ KConfig * colorConf = TDEGlobal::config();
TQString sCurrentScheme = locateLocal("data", "kdisplay/color-schemes/thememgr.kcsrc");
KSimpleConfig *colorScheme = new KSimpleConfig( sCurrentScheme );
@@ -643,7 +643,7 @@ void KTheme::apply()
if ( !widgetsElem.isNull() )
{
- KConfig * widgetConf = KGlobal::config();
+ KConfig * widgetConf = TDEGlobal::config();
widgetConf->setGroup( "General" );
widgetConf->writeEntry( "widgetStyle", widgetsElem.attribute( "name" ), true, true );
widgetConf->sync();
@@ -654,7 +654,7 @@ void KTheme::apply()
TQDomElement fontsElem = m_dom.elementsByTagName( "fonts" ).item( 0 ).toElement();
if ( !fontsElem.isNull() )
{
- KConfig * fontsConf = KGlobal::config();
+ KConfig * fontsConf = TDEGlobal::config();
KConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" );
kde1xConf->setGroup( "General" );
@@ -688,7 +688,7 @@ void KTheme::apply()
bool KTheme::remove( const TQString & name )
{
kdDebug() << "Going to remove theme: " << name << endl;
- return KIO::NetAccess::del( KGlobal::dirs()->saveLocation( "themes", name + "/" ), 0L );
+ return KIO::NetAccess::del( TDEGlobal::dirs()->saveLocation( "themes", name + "/" ), 0L );
}
void KTheme::setProperty( const TQString & name, const TQString & value, TQDomElement parent )
diff --git a/kcontrol/kthememanager/ktheme.h b/kcontrol/kthememanager/ktheme.h
index 6ba23f53..fd659d3c 100644
--- a/kcontrol/kthememanager/ktheme.h
+++ b/kcontrol/kthememanager/ktheme.h
@@ -200,7 +200,7 @@ private:
bool copyFile( const TQString & from, const TQString & to );
/**
- * Wrapper around KGlobal::dirs()->findResource()
+ * Wrapper around TDEGlobal::dirs()->findResource()
* @param section Section to work on (desktop, sounds, panel etc)
* @param path The file to find
*/
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 4a3f2164..5489aedb 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -106,7 +106,7 @@ kthememanager::~kthememanager()
void kthememanager::init()
{
- KGlobal::dirs()->addResourceType( "themes", KStandardDirs::kde_default("data") +
+ TDEGlobal::dirs()->addResourceType( "themes", KStandardDirs::kde_default("data") +
"kthememanager/themes/" );
}
@@ -115,7 +115,7 @@ void kthememanager::updateButton()
TQListViewItem * cur = dlg->lvThemes->currentItem();
bool enable = (cur != 0);
if (enable) {
- enable = TQFile(KGlobal::dirs()->saveLocation( "themes", cur->text( 0 ) + "/"+ cur->text( 0 )+ ".xml" ,false)).exists() ;
+ enable = TQFile(TDEGlobal::dirs()->saveLocation( "themes", cur->text( 0 ) + "/"+ cur->text( 0 )+ ".xml" ,false)).exists() ;
}
dlg->btnRemove->setEnabled(enable);
}
@@ -160,7 +160,7 @@ void kthememanager::save()
{
TQString themeName = cur->text( 0 );
- m_theme = new KTheme( this, KGlobal::dirs()->findResource( "themes", themeName + "/" + themeName + ".xml") );
+ m_theme = new KTheme( this, TDEGlobal::dirs()->findResource( "themes", themeName + "/" + themeName + ".xml") );
m_theme->apply();
// Save the current theme name
@@ -180,7 +180,7 @@ void kthememanager::listThemes()
dlg->lvThemes->clear();
dlg->lbPreview->setPixmap( TQPixmap() );
- TQStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
+ TQStringList themes = TDEGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
TQStringList::const_iterator it;
@@ -197,7 +197,7 @@ void kthememanager::listThemes()
float kthememanager::getThemeVersion( const TQString & themeName )
{
- TQStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
+ TQStringList themes = TDEGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
TQStringList::const_iterator it;
@@ -325,7 +325,7 @@ void kthememanager::slotThemeChanged( TQListViewItem * item )
TQString themeName = item->text(0);
kdDebug() << "Activated theme: " << themeName << endl;
- TQString themeDir = KGlobal::dirs()->findResourceDir( "themes", themeName + "/" + themeName + ".xml") + themeName + "/";
+ TQString themeDir = TDEGlobal::dirs()->findResourceDir( "themes", themeName + "/" + themeName + ".xml") + themeName + "/";
TQString pixFile = themeDir + themeName + ".preview.png";
@@ -392,7 +392,7 @@ void kthememanager::queryLNFModules()
dlg->lvDetails->sort();*/
// For now use a static list
- KIconLoader * il = KGlobal::iconLoader();
+ KIconLoader * il = TDEGlobal::iconLoader();
dlg->btnBackground->setIconSet( il->loadIconSet( "background", KIcon::Desktop, 32 ) );
dlg->btnColors->setIconSet( il->loadIconSet( "colorscm", KIcon::Desktop, 32 ) );
dlg->btnStyle->setIconSet( il->loadIconSet( "style", KIcon::Desktop, 32 ) );
@@ -417,7 +417,7 @@ extern "C"
{
KDE_EXPORT KCModule *create_kthememanager(TQWidget *parent, const char *)
{
- KGlobal::locale()->insertCatalogue( "kthememanager" );
+ TDEGlobal::locale()->insertCatalogue( "kthememanager" );
return new kthememanager( parent, "kthememanager" );
}
}
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index f74fa71b..40bbf1ab 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -88,7 +88,7 @@ KLocaleConfig::KLocaleConfig(KLocale *locale,
// #### HPB: This should be implemented for KDE 3
// new TQLabel(this, I18N_NOOP("Encoding:"));
//TQComboBox * cb = new TQComboBox( this );
- //cb->insertStringList( KGlobal::charsets()->descriptiveEncodingNames() );
+ //cb->insertStringList( TDEGlobal::charsets()->descriptiveEncodingNames() );
lay->addMultiCellWidget(m_labCountry, 0, 0, 0, 1);
lay->addWidget(m_comboCountry, 0, 2);
@@ -122,41 +122,41 @@ KLocaleConfig::KLocaleConfig(KLocale *locale,
void KLocaleConfig::slotInstallLanguage()
{
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
*proc << "tdesu";
*proc << "qt-language-selector --mode install";
- TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
+ TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *)));
setEnabled(false);
proc->start();
}
void KLocaleConfig::slotUninstallLanguage()
{
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
*proc << "tdesu";
*proc << "qt-language-selector --mode uninstall";
- TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
+ TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *)));
setEnabled(false);
proc->start();
}
void KLocaleConfig::slotSelectLanguage()
{
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
*proc << "tdesu";
*proc << "qt-language-selector --mode select";
- TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
+ TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *)));
setEnabled(false);
proc->start();
}
-void KLocaleConfig::slotLanguageSelectorExited(KProcess *)
+void KLocaleConfig::slotLanguageSelectorExited(TDEProcess *)
{
//reload here
loadLanguageList();
@@ -256,8 +256,8 @@ void KLocaleConfig::slotLanguageDown()
void KLocaleConfig::loadLanguageList()
{
// temperary use of our locale as the global locale
- KLocale *lsave = KGlobal::_locale;
- KGlobal::_locale = m_locale;
+ KLocale *lsave = TDEGlobal::_locale;
+ TDEGlobal::_locale = m_locale;
// clear the list
m_addLanguage->clear();
@@ -277,7 +277,7 @@ void KLocaleConfig::loadLanguageList()
}
// add all languages to the list
- TQStringList alllang = KGlobal::dirs()->findAllResources("locale",
+ TQStringList alllang = TDEGlobal::dirs()->findAllResources("locale",
TQString::fromLatin1("*/entry.desktop"),
false, true);
TQStringList langlist = prilang;
@@ -313,21 +313,21 @@ void KLocaleConfig::loadLanguageList()
}
// restore the old global locale
- KGlobal::_locale = lsave;
+ TDEGlobal::_locale = lsave;
}
void KLocaleConfig::loadCountryList()
{
// temperary use of our locale as the global locale
- KLocale *lsave = KGlobal::_locale;
- KGlobal::_locale = m_locale;
+ KLocale *lsave = TDEGlobal::_locale;
+ TDEGlobal::_locale = m_locale;
TQString sub = TQString::fromLatin1("l10n/");
// clear the list
m_comboCountry->clear();
- TQStringList regionlist = KGlobal::dirs()->findAllResources("locale",
+ TQStringList regionlist = TDEGlobal::dirs()->findAllResources("locale",
sub + TQString::fromLatin1("*.desktop"),
false, true );
@@ -356,12 +356,12 @@ void KLocaleConfig::loadCountryList()
.arg(tag) ) );
TQIconSet icon;
if ( !map.isNull() )
- icon = KGlobal::iconLoader()->loadIconSet(map, KIcon::Small);
+ icon = TDEGlobal::iconLoader()->loadIconSet(map, KIcon::Small);
m_comboCountry->insertSubmenu( icon, name, tag, sub, -2 );
}
// add all languages to the list
- TQStringList countrylist = KGlobal::dirs()->findAllResources
+ TQStringList countrylist = TDEGlobal::dirs()->findAllResources
("locale", sub + TQString::fromLatin1("*/entry.desktop"), false, true);
for ( TQStringList::ConstIterator it = countrylist.begin();
@@ -383,20 +383,20 @@ void KLocaleConfig::loadCountryList()
TQString flag( locate( "locale",
TQString::fromLatin1( "l10n/%1/flag.png" )
.arg(tag) ) );
- TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) );
+ TQIconSet icon( TDEGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) );
m_comboCountry->insertItem( icon, name, tag, submenu, menu_index );
}
// restore the old global locale
- KGlobal::_locale = lsave;
+ TDEGlobal::_locale = lsave;
}
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;
+ KLocale *lsave = TDEGlobal::_locale;
+ TDEGlobal::_locale = m_locale;
// read the name
TQString filepath = TQString::fromLatin1("%1%2/entry.desktop")
@@ -408,12 +408,12 @@ void KLocaleConfig::readLocale(const TQString &path, TQString &name,
name = entry.readEntry("Name");
// restore the old global locale
- KGlobal::_locale = lsave;
+ TDEGlobal::_locale = lsave;
}
void KLocaleConfig::save()
{
- KConfigBase *config = KGlobal::config();
+ KConfigBase *config = TDEGlobal::config();
config->setGroup("Locale");
diff --git a/kcontrol/locale/kcmlocale.h b/kcontrol/locale/kcmlocale.h
index 511d9e9f..3a299282 100644
--- a/kcontrol/locale/kcmlocale.h
+++ b/kcontrol/locale/kcmlocale.h
@@ -79,7 +79,7 @@ private slots:
void slotInstallLanguage();
void slotUninstallLanguage();
void slotSelectLanguage();
- void slotLanguageSelectorExited(KProcess *);
+ void slotLanguageSelectorExited(TDEProcess *);
private:
TQStringList languageList() const;
diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp
index 1530fda6..dc4cb2c2 100644
--- a/kcontrol/locale/localemon.cpp
+++ b/kcontrol/locale/localemon.cpp
@@ -127,7 +127,7 @@ KLocaleConfigMoney::~KLocaleConfigMoney()
void KLocaleConfigMoney::save()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale",
diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp
index f6149d6d..a940a7ef 100644
--- a/kcontrol/locale/localenum.cpp
+++ b/kcontrol/locale/localenum.cpp
@@ -82,10 +82,10 @@ KLocaleConfigNumber::~KLocaleConfigNumber()
void KLocaleConfigNumber::save()
{
// temperary use of our locale as the global locale
- KLocale *lsave = KGlobal::_locale;
- KGlobal::_locale = m_locale;
+ KLocale *lsave = TDEGlobal::_locale;
+ TDEGlobal::_locale = m_locale;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale",
@@ -122,7 +122,7 @@ void KLocaleConfigNumber::save()
config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true);
// restore the old global locale
- KGlobal::_locale = lsave;
+ TDEGlobal::_locale = lsave;
}
void KLocaleConfigNumber::slotLocaleChanged()
diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp
index 1cf6b949..cf92ea1f 100644
--- a/kcontrol/locale/localeother.cpp
+++ b/kcontrol/locale/localeother.cpp
@@ -76,7 +76,7 @@ KLocaleConfigOther::~KLocaleConfigOther()
void KLocaleConfigOther::save()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale",
diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp
index 4ed4c263..df51ae8a 100644
--- a/kcontrol/locale/localetime.cpp
+++ b/kcontrol/locale/localetime.cpp
@@ -246,10 +246,10 @@ KLocaleConfigTime::~KLocaleConfigTime()
void KLocaleConfigTime::save()
{
// temperary use of our locale as the global locale
- KLocale *lsave = KGlobal::_locale;
- KGlobal::_locale = m_locale;
+ KLocale *lsave = TDEGlobal::_locale;
+ TDEGlobal::_locale = m_locale;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale",
@@ -299,7 +299,7 @@ void KLocaleConfigTime::save()
config->sync();
// restore the old global locale
- KGlobal::_locale = lsave;
+ TDEGlobal::_locale = lsave;
}
void KLocaleConfigTime::showEvent( TQShowEvent *e )
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index f561ecaf..5df0f5eb 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -172,8 +172,8 @@ void KLocaleApplication::load( bool useDefaults )
void KLocaleApplication::save()
{
// temperary use of our locale as the global locale
- KLocale *lsave = KGlobal::_locale;
- KGlobal::_locale = m_locale;
+ KLocale *lsave = TDEGlobal::_locale;
+ TDEGlobal::_locale = m_locale;
KMessageBox::information(this, m_locale->translate
("Changed language settings apply only to "
"newly started applications.\nTo change the "
@@ -182,9 +182,9 @@ void KLocaleApplication::save()
m_locale->translate("Applying Language Settings"),
TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms"));
// restore the old global locale
- KGlobal::_locale = lsave;
+ TDEGlobal::_locale = lsave;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, "Locale");
// ##### this doesn't make sense
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index 257dc6e2..e8da79f4 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -110,9 +110,9 @@ bool KPrivacyManager::clearFormCompletion() const
bool KPrivacyManager::clearWebCache() const
{
- KProcess process;
+ TDEProcess process;
process << "kio_http_cache_cleaner" << "--clear-all";
- return process.start(KProcess::DontCare);
+ return process.start(TDEProcess::DontCare);
}
bool KPrivacyManager::clearRecentDocuments() const
@@ -143,7 +143,7 @@ bool KPrivacyManager::clearWebHistory()
bool KPrivacyManager::clearFavIcons()
{
- TQDir favIconDir(KGlobal::dirs()->saveLocation( "cache", "favicons/" ));
+ TQDir favIconDir(TDEGlobal::dirs()->saveLocation( "cache", "favicons/" ));
favIconDir.setFilter( TQDir::Files );
TQStringList entries = favIconDir.entryList();
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index bc25083a..55b4246c 100644
--- a/kcontrol/privacy/privacy.cpp
+++ b/kcontrol/privacy/privacy.cpp
@@ -311,7 +311,7 @@ extern "C"
KDE_EXPORT KCModule *create_privacy(TQWidget *parent, const char * /*name*/)
{
- KGlobal::locale()->insertCatalogue("privacy");
+ TDEGlobal::locale()->insertCatalogue("privacy");
return new Privacy(parent, "Privacy");
}
}
diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp
index a284df69..70858752 100644
--- a/kcontrol/randr/configdialog.cpp
+++ b/kcontrol/randr/configdialog.cpp
@@ -35,7 +35,7 @@
#include "configdialog.h"
-ConfigDialog::ConfigDialog(KGlobalAccel *accel,
+ConfigDialog::ConfigDialog(TDEGlobalAccel *accel,
bool isApplet )
: KDialogBase( Tabbed, i18n("Configure"),
Ok | Cancel | Help,
diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h
index 58423797..56173207 100644
--- a/kcontrol/randr/configdialog.h
+++ b/kcontrol/randr/configdialog.h
@@ -33,7 +33,7 @@
#include <klistview.h>
#include <knuminput.h>
-class KGlobalAccel;
+class TDEGlobalAccel;
class KKeyChooser;
class KListView;
class TQPushButton;
@@ -45,7 +45,7 @@ class ConfigDialog : public KDialogBase
Q_OBJECT
public:
- ConfigDialog(KGlobalAccel *accel, bool isApplet );
+ ConfigDialog(TDEGlobalAccel *accel, bool isApplet );
~ConfigDialog();
virtual void show();
diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index 2cdcdb63..85a5e3f6 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -52,7 +52,7 @@
KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
: KSystemTray(parent, name)
, m_popupUp(false)
- , m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection()))
+ , m_help(new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection()))
{
setPixmap(KSystemTray::loadSizedIcon("randr", width()));
setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
@@ -61,8 +61,8 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
my_parent = parent;
//printf("Reading configuration...\n\r");
- globalKeys = new KGlobalAccel(TQT_TQOBJECT(this));
- KGlobalAccel* keys = globalKeys;
+ globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+ TDEGlobalAccel* keys = globalKeys;
#include "krandrbindings.cpp"
// the keys need to be read from kdeglobals, not kickerrc
globalKeys->readSettings();
@@ -90,7 +90,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
applyIccConfiguration(cur_profile, NULL);
}
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
}
diff --git a/kcontrol/randr/krandrtray.h b/kcontrol/randr/krandrtray.h
index eb2025ab..8a910f37 100644
--- a/kcontrol/randr/krandrtray.h
+++ b/kcontrol/randr/krandrtray.h
@@ -36,7 +36,7 @@ class KRandRSystemTray : public KSystemTray, public KRandrSimpleAPI
public:
KRandRSystemTray(TQWidget* parent = 0, const char *name = 0);
- KGlobalAccel *globalKeys;
+ TDEGlobalAccel *globalKeys;
virtual void contextMenuAboutToShow(KPopupMenu* menu);
diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp
index 18df71fb..1e8edc83 100644
--- a/kcontrol/randr/main.cpp
+++ b/kcontrol/randr/main.cpp
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
aboutData.addAuthor("Hamish Rodda",I18N_NOOP("Original developer and maintainer"), "rodda@kde.org");
aboutData.addCredit("Lubos Lunak",I18N_NOOP("Many fixes"), "l.lunak@suse.cz");
aboutData.setProductName("krandr/krandrtray");
- KGlobal::locale()->setMainCatalogue("krandr");
+ TDEGlobal::locale()->setMainCatalogue("krandr");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/kcontrol/samba/AUTHORS b/kcontrol/samba/AUTHORS
index 0bebeaa0..08f2ff61 100644
--- a/kcontrol/samba/AUTHORS
+++ b/kcontrol/samba/AUTHORS
@@ -6,7 +6,7 @@ Conversion to kcontrol applet:
Matthias Hoelzer <hoelzer@physik.uni-wuerzburg.de>
-Use of KProcess instead of popen, and more error checking
+Use of TDEProcess instead of popen, and more error checking
David Faure <David.Faure@insa-lyon.fr>
diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp
index 431e0f51..1e3fa217 100644
--- a/kcontrol/samba/kcmsambastatistics.cpp
+++ b/kcontrol/samba/kcmsambastatistics.cpp
@@ -126,8 +126,8 @@ void StatisticsView::setListInfo(TQListView *list, int nrOfFiles, int nrOfConnec
dataList=list;
filesCount=nrOfFiles;
connectionsCount=nrOfConnections;
- connectionsL->setText(i18n("Connections: %1").arg(KGlobal::locale()->formatNumber(connectionsCount, 0)));
- filesL->setText(i18n("File accesses: %1").arg(KGlobal::locale()->formatNumber(filesCount, 0)));
+ connectionsL->setText(i18n("Connections: %1").arg(TDEGlobal::locale()->formatNumber(connectionsCount, 0)));
+ filesL->setText(i18n("File accesses: %1").arg(TDEGlobal::locale()->formatNumber(filesCount, 0)));
clearStatistics();
}
diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp
index bf775dea..effd6731 100644
--- a/kcontrol/samba/ksmbstatus.cpp
+++ b/kcontrol/samba/ksmbstatus.cpp
@@ -130,7 +130,7 @@ void NetMon::processSambaLine(char *bufline, int)
// called when we get some data from smbstatus
// can be called for any size of buffer (one line, several lines,
// half of one ...)
-void NetMon::slotReceivedData(KProcess *, char *buffer, int )
+void NetMon::slotReceivedData(TDEProcess *, char *buffer, int )
{
//kdDebug()<<"received stuff"<<endl;
char s[250],*start,*end;
@@ -161,7 +161,7 @@ void NetMon::slotReceivedData(KProcess *, char *buffer, int )
void NetMon::update()
{
- KProcess * process = new KProcess();
+ TDEProcess * process = new TDEProcess();
memset(&lo, 0, sizeof(lo));
list->clear();
@@ -175,10 +175,10 @@ void NetMon::update()
nrpid=0;
process->setEnvironment("PATH", path);
connect(process,
- TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
- TQT_SLOT(slotReceivedData(KProcess *, char *, int)));
+ TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ TQT_SLOT(slotReceivedData(TDEProcess *, char *, int)));
*process << "smbstatus";
- if (!process->start(KProcess::Block,KProcess::Stdout))
+ if (!process->start(TDEProcess::Block,TDEProcess::Stdout))
version->setText(i18n("Error: Unable to run smbstatus"));
else if (rownumber==0) // empty result
version->setText(i18n("Error: Unable to open configuration file \"smb.conf\""));
@@ -197,16 +197,16 @@ void NetMon::update()
readingpart=nfs;
delete showmountProc;
- showmountProc=new KProcess();
+ showmountProc=new TDEProcess();
showmountProc->setEnvironment("PATH", path);
*showmountProc<<"showmount"<<"-a"<<"localhost";
- connect(showmountProc,TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),TQT_SLOT(slotReceivedData(KProcess *, char *, int)));
+ connect(showmountProc,TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),TQT_SLOT(slotReceivedData(TDEProcess *, char *, int)));
//without this timer showmount hangs up to 5 minutes
//if the portmapper daemon isn't running
TQTimer::singleShot(5000,this,TQT_SLOT(killShowmount()));
//kdDebug()<<"starting kill timer with 5 seconds"<<endl;
- connect(showmountProc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(killShowmount()));
- if (!showmountProc->start(KProcess::NotifyOnExit,KProcess::Stdout)) // run showmount
+ connect(showmountProc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(killShowmount()));
+ if (!showmountProc->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) // run showmount
{
delete showmountProc;
showmountProc=0;
diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h
index a38eca89..e256de06 100644
--- a/kcontrol/samba/ksmbstatus.h
+++ b/kcontrol/samba/ksmbstatus.h
@@ -30,7 +30,7 @@
class TQListView;
class TQListViewItem;
-class KProcess;
+class TDEProcess;
class NetMon : public TQWidget
{
@@ -41,7 +41,7 @@ public:
void loadSettings() {};
private:
KConfig *configFile;
- KProcess *showmountProc;
+ TDEProcess *showmountProc;
TQListView *list;
TQLabel *version;
TQTimer *timer;
@@ -59,7 +59,7 @@ private:
private slots:
void killShowmount();
void update();
- void slotReceivedData(KProcess *proc, char *buffer, int buflen);
+ void slotReceivedData(TDEProcess *proc, char *buffer, int buflen);
};
#endif // main_included
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index 85d1aa62..c9f1e8f2 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -82,8 +82,8 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
mTesting = false;
// Add non-TDE path
- KGlobal::dirs()->addResourceType("scrsav",
- KGlobal::dirs()->kde_default("apps") +
+ TDEGlobal::dirs()->addResourceType("scrsav",
+ TDEGlobal::dirs()->kde_default("apps") +
"apps/ScreenSavers/");
setQuickHelp( i18n("<h1>Screen Saver</h1> This module allows you to enable and"
@@ -107,19 +107,19 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
kdDebug() << "relPath=" << relPath << endl;
}
- KGlobal::dirs()->addResourceType("scrsav",
- KGlobal::dirs()->kde_default("apps") +
+ TDEGlobal::dirs()->addResourceType("scrsav",
+ TDEGlobal::dirs()->kde_default("apps") +
relPath);
readSettings( false );
- mSetupProc = new KProcess;
- connect(mSetupProc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotSetupDone(KProcess *)));
+ mSetupProc = new TDEProcess;
+ connect(mSetupProc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(slotSetupDone(TDEProcess *)));
- mPreviewProc = new KProcess;
- connect(mPreviewProc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotPreviewExited(KProcess *)));
+ mPreviewProc = new TDEProcess;
+ connect(mPreviewProc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(slotPreviewExited(TDEProcess *)));
TQBoxLayout *topLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
@@ -465,7 +465,7 @@ void KScreenSaver::save()
void KScreenSaver::findSavers()
{
if ( !mNumLoaded ) {
- mSaverFileList = KGlobal::dirs()->findAllResources("scrsav",
+ mSaverFileList = TDEGlobal::dirs()->findAllResources("scrsav",
"*.desktop", false, true);
new TQListViewItem ( mSaverListView, i18n("Loading...") );
if ( mSaverFileList.isEmpty() )
@@ -562,7 +562,7 @@ void KScreenSaver::setMonitor()
//---------------------------------------------------------------------------
//
-void KScreenSaver::slotPreviewExited(KProcess *)
+void KScreenSaver::slotPreviewExited(TDEProcess *)
{
// Ugly hack to prevent continual respawning of savers that crash
if (mSelected == mPrevSelected)
@@ -754,7 +754,7 @@ void KScreenSaver::slotTest()
return;
if (!mTestProc) {
- mTestProc = new KProcess;
+ mTestProc = new TDEProcess;
}
mTestProc->clearArguments();
@@ -800,7 +800,7 @@ void KScreenSaver::slotTest()
}
mTesting = true;
- mTestProc->start(KProcess::NotifyOnExit);
+ mTestProc->start(TDEProcess::NotifyOnExit);
}
}
@@ -851,7 +851,7 @@ void KScreenSaver::slotLock( bool l )
//---------------------------------------------------------------------------
//
-void KScreenSaver::slotSetupDone(KProcess *)
+void KScreenSaver::slotSetupDone(TDEProcess *)
{
mPrevSelected = -1; // see ugly hack in slotPreviewExited()
setMonitor();
diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h
index 9dcf7f46..afaa3450 100644
--- a/kcontrol/screensaver/scrnsave.h
+++ b/kcontrol/screensaver/scrnsave.h
@@ -28,7 +28,7 @@ class TQListView;
class TQListViewItem;
class TQPushButton;
class KIntNumInput;
-class KProcess;
+class TDEProcess;
//===========================================================================
class KScreenSaver : public KCModule
@@ -56,11 +56,11 @@ protected slots:
void slotTimeoutChanged( int );
void slotLockTimeoutChanged( int );
void slotLock( bool );
- void slotSetupDone(KProcess*);
+ void slotSetupDone(TDEProcess*);
// when selecting a new screensaver, the old preview will
// be killed. -- This callback is responsible for restarting the
// new preview
- void slotPreviewExited(KProcess *);
+ void slotPreviewExited(TDEProcess *);
void findSavers();
protected:
@@ -74,9 +74,9 @@ protected:
protected:
TestWin *mTestWin;
- KProcess *mTestProc;
- KProcess *mSetupProc;
- KProcess *mPreviewProc;
+ TDEProcess *mTestProc;
+ TDEProcess *mSetupProc;
+ TDEProcess *mPreviewProc;
KSSMonitor *mMonitor;
TQPushButton *mSetupBt;
TQPushButton *mTestBt;
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 274113bf..3a202558 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -75,7 +75,7 @@ extern "C"
{
KDE_EXPORT KCModule *create_style(TQWidget *parent, const char*)
{
- KGlobal::locale()->insertCatalogue("kcmstyle");
+ TDEGlobal::locale()->insertCatalogue("kcmstyle");
return new KCMStyle(parent, "kcmstyle");
}
@@ -96,7 +96,7 @@ extern "C"
TQByteArray properties;
TQDataStream d(properties, IO_WriteOnly);
d.setVersion( 3 ); // Qt2 apps need this.
- d << kapp->palette() << KGlobalSettings::generalFont();
+ d << kapp->palette() << TDEGlobalSettings::generalFont();
Atom a = XInternAtom(tqt_xdisplay(), "_QT_DESKTOP_PROPERTIES", false);
// do it for all root windows - multihead support
@@ -127,7 +127,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
m_bStyleDirty= false;
m_bToolbarsDirty = false;
- KGlobal::dirs()->addResourceType("themes",
+ TDEGlobal::dirs()->addResourceType("themes",
KStandardDirs::kde_default("data") + "kstyle/themes");
TDEAboutData *about =
@@ -727,7 +727,7 @@ void KCMStyle::loadStyle( KConfig& config )
styleEntries.setAutoDelete(true);
TQString strWidgetStyle;
- TQStringList list = KGlobal::dirs()->findAllResources("themes", "*.themerc", true, true);
+ TQStringList list = TDEGlobal::dirs()->findAllResources("themes", "*.themerc", true, true);
for (TQStringList::iterator it = list.begin(); it != list.end(); ++it)
{
KSimpleConfig config( *it, true );
diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp
index 0350ab96..3027106c 100644
--- a/kcontrol/style/keramik/keramikconf.cpp
+++ b/kcontrol/style/keramik/keramikconf.cpp
@@ -42,7 +42,7 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
{
//Should have no margins here, the dialog provides them
TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
- KGlobal::locale()->insertCatalogue("kstyle_keramik_config");
+ TDEGlobal::locale()->insertCatalogue("kstyle_keramik_config");
//highlightLineEdits = new TQCheckBox(i18n("Highlight active lineedits"), this);
highlightScrollBar = new TQCheckBox(i18n("Highlight scroll bar handles"), this);
@@ -70,7 +70,7 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
KeramikStyleConfig::~KeramikStyleConfig()
{
- KGlobal::locale()->removeCatalogue("kstyle_keramik_config");
+ TDEGlobal::locale()->removeCatalogue("kstyle_keramik_config");
}
diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp
index 190f0517..bad8270e 100644
--- a/kcontrol/style/menupreview.cpp
+++ b/kcontrol/style/menupreview.cpp
@@ -82,7 +82,7 @@ void MenuPreview::createPixmaps()
(x % 2) ?
((y % 2) ? c2 : c1 ) : // See the grid? ;-)
((y % 2) ? c1 : c2 ) );
- KIconLoader* icl = KGlobal::iconLoader();
+ KIconLoader* icl = TDEGlobal::iconLoader();
TQPixmap pix = icl->loadIcon("go", KIcon::Desktop, KIcon::SizeLarge, KIcon::ActiveState);
p.drawPixmap( (width()-2-pix.width())/2, (height()-2-pix.height())/2, pix );
}
diff --git a/kcontrol/tdm/background.h b/kcontrol/tdm/background.h
index 2e5182b1..d88629c3 100644
--- a/kcontrol/tdm/background.h
+++ b/kcontrol/tdm/background.h
@@ -16,7 +16,7 @@
class KSimpleConfig;
class BGDialog;
-class KGlobalBackgroundSettings;
+class TDEGlobalBackgroundSettings;
class TQCheckBox;
class TQLabel;
diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp
index d3693768..8348a617 100644
--- a/kcontrol/tdm/main.cpp
+++ b/kcontrol/tdm/main.cpp
@@ -121,7 +121,7 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
setlocale( LC_COLLATE, "C" );
- KGlobal::locale()->insertCatalogue("kcmbackground");
+ TDEGlobal::locale()->insertCatalogue("kcmbackground");
TQStringList sl;
TQMap<gid_t,TQStringList> tgmap;
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index d3629d86..bcd7517a 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -288,7 +288,7 @@ void TDMAppearanceWidget::makeReadOnly()
void TDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
{
- TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
+ TQStringList langlist = TDEGlobal::dirs()->findAllResources("locale",
TQString::fromLatin1("*/entry.desktop"));
langlist.sort();
for ( TQStringList::ConstIterator it = langlist.begin();
@@ -308,7 +308,7 @@ void TDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
void TDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
{
// XXX: Global + local schemes
- TQStringList list = KGlobal::dirs()->
+ TQStringList list = TDEGlobal::dirs()->
findAllResources("data", "kdisplay/color-schemes/*.kcsrc", false, true);
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
@@ -329,7 +329,7 @@ void TDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
void TDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
{
// XXX: Global + local schemes
- TQStringList list = KGlobal::dirs()->
+ TQStringList list = TDEGlobal::dirs()->
findAllResources("data", "kstyle/themes/*.themerc", false, true);
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
@@ -429,7 +429,7 @@ void TDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
// we gotta check if it is a non-local file and make a tmp copy at the hd.
if(!url->isLocalFile()) {
- pixurl.setPath(KGlobal::dirs()->resourceDirs("data").last() +
+ pixurl.setPath(TDEGlobal::dirs()->resourceDirs("data").last() +
"tdm/pics/" + url->fileName());
KIO::NetAccess::copy(*url, pixurl, parentWidget());
istmp = true;
@@ -462,7 +462,7 @@ void TDMAppearanceWidget::save()
config->writeEntry("LogoArea", noneRadio->isChecked() ? "None" :
logoRadio->isChecked() ? "Logo" : "Clock" );
- config->writeEntry("LogoPixmap", KGlobal::iconLoader()->iconPath(logopath, KIcon::Desktop, true));
+ config->writeEntry("LogoPixmap", TDEGlobal::iconLoader()->iconPath(logopath, KIcon::Desktop, true));
config->writeEntry("Compositor", compositorcombo->currentId());
diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp
index f4b48b9a..3be482a1 100644
--- a/kcontrol/tdm/tdm-users.cpp
+++ b/kcontrol/tdm/tdm-users.cpp
@@ -74,7 +74,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
// We assume that $kde_datadir/tdm exists, but better check for pics/ and pics/users,
// and create them if necessary.
config->setGroup( "X-*-Greeter" );
- m_userPixDir = config->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
+ m_userPixDir = config->readEntry( "FaceDir", TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
m_notFirst = false;
TQDir testDir( m_userPixDir );
if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ) && !geteuid() )
@@ -301,7 +301,7 @@ void TDMUsersWidget::changeUserPix(const TQString &pix)
void TDMUsersWidget::slotUserButtonClicked()
{
KFileDialog dlg(m_notFirst ? TQString::null :
- KGlobal::dirs()->resourceDirs("data").last() + "tdm/pics/users",
+ TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/pics/users",
KImageIO::pattern( KImageIO::Reading ),
this, 0, true);
dlg.setOperationMode( KFileDialog::Opening );
diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp
index 795b5849..c1443b22 100644
--- a/kcontrol/view1394/view1394.cpp
+++ b/kcontrol/view1394/view1394.cpp
@@ -325,7 +325,7 @@ extern "C"
KDE_EXPORT KCModule *create_view1394(TQWidget *parent, const char *name)
{
- KGlobal::locale()->insertCatalogue("kcmview1394");
+ TDEGlobal::locale()->insertCatalogue("kcmview1394");
return new View1394(parent, name);
}
}
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp
index c7033077..607cd875 100644
--- a/kcontrol/xinerama/kcmxinerama.cpp
+++ b/kcontrol/xinerama/kcmxinerama.cpp
@@ -218,7 +218,7 @@ void KCMXinerama::windowIndicator(int dpy) {
TQWidget *KCMXinerama::indicator(int dpy) {
TQLabel *si = new TQLabel(TQString::number(dpy+1), 0, "Screen Indicator", (WFlags)WX11BypassWM );
- TQFont fnt = KGlobalSettings::generalFont();
+ TQFont fnt = TDEGlobalSettings::generalFont();
fnt.setPixelSize(100);
si->setFont(fnt);
si->setFrameStyle(TQFrame::Panel);
@@ -240,7 +240,7 @@ void KCMXinerama::clearIndicator() {
extern "C" {
KDE_EXPORT KCModule *create_xinerama(TQWidget *parent, const char *name) {
- KGlobal::locale()->insertCatalogue("kcmxinerama");
+ TDEGlobal::locale()->insertCatalogue("kcmxinerama");
return new KCMXinerama(parent, name);
}
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index 716b7707..6eeb4300 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -114,7 +114,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
{
setExpandable(true);
setText(0, TQString::fromUtf8(app_));
- setPixmap(0, KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), KIcon::Small ));
+ setPixmap(0, TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), KIcon::Small ));
/* Get the icon: we use the icon from a mainwindow in that class.
diff --git a/kdepasswd/kcm/kcm_useraccount.kcfg b/kdepasswd/kcm/kcm_useraccount.kcfg
index 60007f4c..c780db21 100644
--- a/kdepasswd/kcm/kcm_useraccount.kcfg
+++ b/kdepasswd/kcm/kcm_useraccount.kcfg
@@ -9,7 +9,7 @@
<group name="X-*-Greeter">
<entry name="faceDir" type="Path">
<default code="true">
- KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" + '/'
+ TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" + '/'
</default>
</entry>
<entry name="UserFaceDir" type="Path">
diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp
index 11ac0724..fc58dcea 100644
--- a/kdepasswd/kcm/main.cpp
+++ b/kdepasswd/kcm/main.cpp
@@ -107,8 +107,8 @@ KCMUserAccount::KCMUserAccount( TQWidget *parent, const char *name,
void KCMUserAccount::slotChangePassword()
{
- KProcess *proc = new KProcess;
- TQString bin = KGlobal::dirs()->findExe("kdepasswd");
+ TDEProcess *proc = new TDEProcess;
+ TQString bin = TDEGlobal::dirs()->findExe("kdepasswd");
if ( !bin )
{
kdDebug() << "kcm_useraccount: kdepasswd was not found." << endl;
@@ -122,7 +122,7 @@ void KCMUserAccount::slotChangePassword()
}
*proc << bin << _ku->loginName() ;
- proc->start(KProcess::DontCare);
+ proc->start(TDEProcess::DontCare);
delete proc;
@@ -147,7 +147,7 @@ void KCMUserAccount::load()
_mw->leSMTP->setText( _kes->getSetting( KEMailSettings::OutServer ));
TQString _userPicsDir = KCFGUserAccount::faceDir() +
- KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces/";
+ TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces/";
TQString fs = KCFGUserAccount::faceSource();
if (fs == TQString::fromLatin1("UserOnly"))
@@ -270,7 +270,7 @@ void KCMUserAccount::slotFaceButtonClicked()
return;
}
- ChFaceDlg* pDlg = new ChFaceDlg( KGlobal::dirs()->resourceDirs("data").last() +
+ ChFaceDlg* pDlg = new ChFaceDlg( TDEGlobal::dirs()->resourceDirs("data").last() +
"/tdm/pics/users/" );
if ( pDlg->exec() == TQDialog::Accepted && !pDlg->getFaceImage().isNull() )
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc
index aa0aa598..e15c6aab 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cc
@@ -78,7 +78,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
m_Cache.resize( 1 );
m_Serial = 0; m_Hash = 0;
- m_pConfig = KGlobal::config();
+ m_pConfig = TDEGlobal::config();
m_bExport = m_bCommon = m_bInit = false;
m_pKwinmodule = twinModule;
m_pPixmapServer = new KPixmapServer();
@@ -136,7 +136,7 @@ KBackgroundManager::~KBackgroundManager()
for (unsigned i=0; i<m_Renderer.size(); i++)
delete m_Renderer[i];
- //delete m_pConfig; Very bad idea, this is KGlobal::config !
+ //delete m_pConfig; Very bad idea, this is TDEGlobal::config !
delete m_pPixmapServer;
delete m_pTimer;
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 42f7f8a7..ebd03162 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -92,7 +92,7 @@ bool KRootWidget::eventFilter ( TQObject *, TQEvent * e )
else if ( e->type() == TQEvent::DragEnter )
{
TQDragEnterEvent* de = static_cast<TQDragEnterEvent*>( e );
- bool b = !KGlobal::config()->isImmutable() && !KGlobal::dirs()->isRestrictedResource( "wallpaper" );
+ bool b = !TDEGlobal::config()->isImmutable() && !TDEGlobal::dirs()->isRestrictedResource( "wallpaper" );
bool imageURL = false;
if ( KURLDrag::canDecode( de ) )
@@ -146,9 +146,9 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) :
m_bWaitForKded = wait_for_kded;
m_miniCli = 0; // created on demand
keys = 0; // created later
- KGlobal::locale()->insertCatalogue("kdesktop");
- KGlobal::locale()->insertCatalogue("libkonq"); // needed for apps using libkonq
- KGlobal::locale()->insertCatalogue("libdmctl");
+ TDEGlobal::locale()->insertCatalogue("kdesktop");
+ TDEGlobal::locale()->insertCatalogue("libkonq"); // needed for apps using libkonq
+ TDEGlobal::locale()->insertCatalogue("libdmctl");
setCaption( "KDE Desktop");
@@ -393,7 +393,7 @@ KDesktop::slotStart()
m_pIconView->start();
// Global keys
- keys = new KGlobalAccel( TQT_TQOBJECT(this) );
+ keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
(void) new KRootWm( this );
#include "kdesktopbindings.cpp"
@@ -412,7 +412,7 @@ 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
- TQDir dir( KGlobalSettings::autostartPath() );
+ TQDir dir( TDEGlobalSettings::autostartPath() );
TQStringList entries = dir.entryList( TQDir::Files );
TQStringList::Iterator it = entries.begin();
TQStringList::Iterator end = entries.end();
@@ -525,7 +525,7 @@ void KDesktop::popupExecuteCommand(const TQString& command)
} else {
NETRootInfo i( tqt_xdisplay(), NET::Supported );
if( !i.isSupported( NET::WM2FullPlacement )) {
- TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
+ TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos());
m_miniCli->move(rect.x() + (rect.width() - m_miniCli->width())/2,
rect.y() + (rect.height() - m_miniCli->height())/2);
}
@@ -546,13 +546,13 @@ void KDesktop::slotShowWindowList()
void KDesktop::slotShowTaskManager()
{
//kdDebug(1204) << "Launching KSysGuard..." << endl;
- KProcess* p = new KProcess;
+ TDEProcess* p = new TDEProcess;
TQ_CHECK_PTR(p);
*p << "ksysguard";
*p << "--showprocesses";
- p->start(KProcess::DontCare);
+ p->start(TDEProcess::DontCare);
delete p;
}
@@ -772,7 +772,7 @@ void KDesktop::slotConfigure()
void KDesktop::configure()
{
// re-read configuration and apply it
- KGlobal::config()->reparseConfiguration();
+ TDEGlobal::config()->reparseConfiguration();
KDesktopSettings::self()->readConfig();
// If we have done start() already, then re-configure.
@@ -990,7 +990,7 @@ void KDesktop::handleImageDropEvent(TQDropEvent * e)
{
TQImage i;
TQImageDrag::decode(e, i);
- KTempFile tmpFile(KGlobal::dirs()->saveLocation("wallpaper"), ".png");
+ KTempFile tmpFile(TDEGlobal::dirs()->saveLocation("wallpaper"), ".png");
i.save(tmpFile.name(), "PNG");
kdDebug(1204) << "KDesktop::contentsDropEvent " << tmpFile.name() << endl;
bgMgr->setWallpaper(tmpFile.name());
@@ -1010,7 +1010,7 @@ void KDesktop::slotNewWallpaper(const KURL &url)
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 );
+ KTempFile tmpFile( TDEGlobal::dirs()->saveLocation("wallpaper"), "." + ext );
KURL localURL; localURL.setPath( tmpFile.name() );
// We pass 0 as parent window because passing the desktop is not a good idea
KIO::NetAccess::file_copy( url, localURL, -1, true /*overwrite*/ );
@@ -1155,7 +1155,7 @@ TQPoint KDesktop::findPlaceForIcon( int column, int row )
void KDesktop::addIcon(const TQString & _url, int x, int y)
{
- addIcon( _url, KGlobalSettings::desktopPath(), x, y );
+ addIcon( _url, TDEGlobalSettings::desktopPath(), x, y );
}
void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int y)
diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h
index a681dc9a..3aa81241 100644
--- a/kdesktop/desktop.h
+++ b/kdesktop/desktop.h
@@ -32,7 +32,7 @@ class KURL;
class TQCloseEvent;
class TQDropEvent;
class TQPopupMenu;
-class KGlobalAccel;
+class TDEGlobalAccel;
class KWinModule;
class KBackgroundManager;
class TQTimer;
@@ -187,7 +187,7 @@ signals:
private:
- KGlobalAccel *keys;
+ TDEGlobalAccel *keys;
KWinModule* m_pKwinmodule;
diff --git a/kdesktop/init.cc b/kdesktop/init.cc
index 81bce942..27990245 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cc
@@ -101,9 +101,9 @@ static void copyDirectoryFile(const TQString &fileName, const TQString& dir, boo
{
if (force || !TQFile::exists(dir + "/.directory")) {
TQString cmd = "cp ";
- cmd += KProcess::quote(locate("data", TQString("kdesktop/") + fileName));
+ cmd += TDEProcess::quote(locate("data", TQString("kdesktop/") + fileName));
cmd += " ";
- cmd += KProcess::quote(dir+"/.directory");
+ cmd += TDEProcess::quote(dir+"/.directory");
system( TQFile::encodeName(cmd) );
}
}
@@ -111,15 +111,15 @@ static void copyDirectoryFile(const TQString &fileName, const TQString& dir, boo
static void copyFile( const TQString& src, const TQString& dest )
{
TQCString cmd = "cp ";
- cmd += TQFile::encodeName(KProcess::quote(src));
+ cmd += TQFile::encodeName(TDEProcess::quote(src));
cmd += " ";
- cmd += TQFile::encodeName(KProcess::quote(dest));
+ cmd += TQFile::encodeName(TDEProcess::quote(dest));
system( cmd );
}
static TQString realDesktopPath()
{
- TQString desktopPath = KGlobalSettings::desktopPath();
+ TQString desktopPath = TDEGlobalSettings::desktopPath();
if (kdesktop_screen_number != 0) {
TQString dn = "Desktop";
dn += TQString::number(kdesktop_screen_number);
@@ -140,7 +140,7 @@ static void copyDesktopLinks()
return;
TQStringList list =
- KGlobal::dirs()->findAllResources("appdata", "DesktopLinks/*", false, true);
+ TDEGlobal::dirs()->findAllResources("appdata", "DesktopLinks/*", false, true);
TQString desktopPath = realDesktopPath();
@@ -197,15 +197,15 @@ void testLocalInstallation()
// Do not force copying that one (it would lose the icon positions)
copyDirectoryFile("directory.desktop", desktopPath, false);
- testDir( KGlobalSettings::autostartPath() );
+ testDir( TDEGlobalSettings::autostartPath() );
// we force the copying in case of a new release, to install new translations....
- copyDirectoryFile("directory.autostart", KGlobalSettings::autostartPath(), newRelease);
+ copyDirectoryFile("directory.autostart", TDEGlobalSettings::autostartPath(), newRelease);
if (emptyDesktop)
copyDesktopLinks();
// Take care of creating or updating trash.desktop
- const TQString trashDir = KGlobal::dirs()->localxdgdatadir() + "Trash";
+ const TQString trashDir = TDEGlobal::dirs()->localxdgdatadir() + "Trash";
const bool firstTimeWithNewTrash = !TQFile::exists( trashDir );
const TQString trashDesktopPath = desktopPath + "/trash.desktop";
const bool trashDesktopExists = TQFile::exists( trashDesktopPath );
diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cc
index 1d39a093..4a51cefd 100644
--- a/kdesktop/kcustommenu.cc
+++ b/kdesktop/kcustommenu.cc
@@ -84,9 +84,9 @@ KCustomMenu::insertMenuItem(KService::Ptr & s, int nId, int nIndex/*= -1*/)
// to accelators, replace them with two ampersands.
serviceName.replace("&", "&&");
- TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
+ TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
0, KIcon::DefaultState, 0L, true);
- TQPixmap active = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
+ TQPixmap active = TDEGlobal::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) {
diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index e83face7..6fee5d5c 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -411,11 +411,11 @@
<!-- config->writePathEntry( "CompletionItems", m_dlg->cbCommand->completionObject()->items() ); -->
</entry>
<entry key="CompletionMode" type="Int">
- <default code="true">KGlobalSettings::completionMode()</default>
+ <default code="true">TDEGlobalSettings::completionMode()</default>
<label></label>
<whatsthis></whatsthis>
<!-- minicli.cpp:210 -->
- <!-- int mode = config->readNumEntry( "CompletionMode", KGlobalSettings::completionMode() ); -->
+ <!-- int mode = config->readNumEntry( "CompletionMode", TDEGlobalSettings::completionMode() ); -->
<!-- minicli.cpp:252 -->
<!-- config->writeEntry( "CompletionMode", m_dlg->cbCommand->completionMode() ); -->
</entry>
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 387195a4..d461a6ec 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -154,7 +154,7 @@ KDIconView::KDIconView( TQWidget *parent, const char* name )
setIconArea( desktopRect() ); // the default is the whole desktop
// Initialise the shadow data objects...
- m_shadowEngine = new KShadowEngine(new KDesktopShadowSettings(KGlobal::config()));
+ m_shadowEngine = new KShadowEngine(new KDesktopShadowSettings(TDEGlobal::config()));
// Initialize media handler
mMediaListView = new TQListView();
@@ -164,7 +164,7 @@ KDIconView::KDIconView( TQWidget *parent, const char* name )
setURL( desktopURL() ); // sets m_url
- m_desktopDirs = KGlobal::dirs()->findDirs( "appdata", "Desktop" );
+ m_desktopDirs = TDEGlobal::dirs()->findDirs( "appdata", "Desktop" );
initDotDirectories();
connect( this, TQT_SIGNAL( executed( TQIconViewItem * ) ),
@@ -278,14 +278,14 @@ void KDIconView::initConfig( bool init )
KDesktopSettings::self()->readConfig();
}
- KConfig * config = KGlobal::config();
+ KConfig * config = TDEGlobal::config();
if ( !init ) {
KDesktopShadowSettings *shadowSettings = static_cast<KDesktopShadowSettings *>(m_shadowEngine->shadowSettings());
shadowSettings->setConfig(config);
}
- setMaySetWallpaper(!config->isImmutable() && !KGlobal::dirs()->isRestrictedResource("wallpaper"));
+ setMaySetWallpaper(!config->isImmutable() && !TDEGlobal::dirs()->isRestrictedResource("wallpaper"));
m_bShowDot = KDesktopSettings::showHidden();
m_bVertAlign = KDesktopSettings::vertAlign();
TQStringList oldPreview = previewSettings();
@@ -490,7 +490,7 @@ void KDIconView::setAutoAlign( bool b )
// Auto line-up icons
if ( b ) {
// set maxItemWidth to ensure sane initial icon layout before the auto align code is fully activated
- int sz = iconSize() ? iconSize() : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
setFont( font() ); // Force calcRect()
@@ -505,7 +505,7 @@ void KDIconView::setAutoAlign( bool b )
}
else {
// change maxItemWidth, because when grid-align was active, it changed this for the grid
- int sz = iconSize() ? iconSize() : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
setFont( font() ); // Force calcRect()
@@ -587,7 +587,7 @@ void KDIconView::recheckDesktopURL()
KURL KDIconView::desktopURL()
{
// Support both paths and URLs
- TQString desktopPath = KGlobalSettings::desktopPath();
+ TQString desktopPath = TDEGlobalSettings::desktopPath();
if (kdesktop_screen_number != 0) {
TQString dn = "Desktop";
dn += TQString::number(kdesktop_screen_number);
@@ -1540,7 +1540,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e )
bool isImageDrag = TQImageDrag::canDecode(e);
bool isUrlDrag = KURLDrag::canDecode(e);
- bool isImmutable = KGlobal::config()->isImmutable();
+ bool isImmutable = TDEGlobal::config()->isImmutable();
if ( (isColorDrag || isImageDrag) && !isUrlDrag ) {
// Hack to clear the drag shape
diff --git a/kdesktop/kfileividesktop.cpp b/kdesktop/kfileividesktop.cpp
index 9c2bd5f8..90dc6932 100644
--- a/kdesktop/kfileividesktop.cpp
+++ b/kdesktop/kfileividesktop.cpp
@@ -139,7 +139,7 @@ bool KFileIVIDesktop::shouldUpdateShadow(bool selected)
void KFileIVIDesktop::drawShadowedText( TQPainter *p, const TQColorGroup &cg )
{
- bool drawRoundedRect = KGlobalSettings::iconUseRoundedRect();
+ bool drawRoundedRect = TDEGlobalSettings::iconUseRoundedRect();
int textX;
if (drawRoundedRect == true)
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 283d46cb..403c89f1 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -136,7 +136,7 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
m_actionCollection, "open_terminal" );
}
- if (!KGlobal::config()->isImmutable())
+ if (!TDEGlobal::config()->isImmutable())
{
new KAction(i18n("Configure Desktop..."), "configure", 0, this, TQT_SLOT( slotConfigureDesktop() ),
m_actionCollection, "configdesktop" );
@@ -754,15 +754,15 @@ TQStringList KRootWm::configModules() {
void KRootWm::slotOpenTerminal()
{
// kdDebug() << "KRootWm::slotOpenTerminal" << endl;
- KProcess* p = new KProcess;
+ TDEProcess* p = new TDEProcess;
TQ_CHECK_PTR(p);
- KConfigGroupSaver gs(KGlobal::config(), "General");
- TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole");
+ KConfigGroupSaver gs(TDEGlobal::config(), "General");
+ TQString terminal = TDEGlobal::config()->readPathEntry("TerminalApplication", "konsole");
- *p << terminal << "--workdir=" + KGlobalSettings::desktopPath() + "/";
+ *p << terminal << "--workdir=" + TDEGlobalSettings::desktopPath() + "/";
- p->start(KProcess::DontCare);
+ p->start(TDEProcess::DontCare);
delete p;
}
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 005ac991..29dc8bd9 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -692,7 +692,7 @@ void PasswordDlg::slotStartNewSession()
// Calculate a proper size for the text.
{
TQSimpleRichText rt(qt_text, dialog->font());
- TQRect rect = KGlobalSettings::desktopGeometry(dialog);
+ TQRect rect = TDEGlobalSettings::desktopGeometry(dialog);
pref_width = rect.width() / 3;
rt.setWidth(pref_width);
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index cd8f38da..a3f5fb56 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -256,8 +256,8 @@ LockProcess::LockProcess()
XSelectInput( tqt_xdisplay(), tqt_xrootwin(), SubstructureNotifyMask | rootAttr.your_event_mask );
// Add non-TDE path
- KGlobal::dirs()->addResourceType("scrsav",
- KGlobal::dirs()->kde_default("apps") +
+ TDEGlobal::dirs()->addResourceType("scrsav",
+ TDEGlobal::dirs()->kde_default("apps") +
"System/ScreenSavers/");
// Add KDE specific screensaver path
@@ -268,8 +268,8 @@ LockProcess::LockProcess()
relPath=servGroup->relPath();
kdDebug(1204) << "relPath=" << relPath << endl;
}
- KGlobal::dirs()->addResourceType("scrsav",
- KGlobal::dirs()->kde_default("apps") +
+ TDEGlobal::dirs()->addResourceType("scrsav",
+ TDEGlobal::dirs()->kde_default("apps") +
relPath);
// virtual root property
@@ -356,7 +356,7 @@ void LockProcess::init(bool child, bool useBlankOnly)
connect( mHackDelayStartupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(closeDialogAndStartHack()) );
connect( mEnsureVRootWindowSecurityTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repaintRootWindowIfNeeded()) );
connect(tqApp, TQT_SIGNAL(mouseInteraction(XEvent *)), TQT_SLOT(slotMouseActivity(XEvent *)));
- connect(&mHackProc, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(hackExited(KProcess *)));
+ connect(&mHackProc, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(hackExited(TDEProcess *)));
connect(&mSuspendTimer, TQT_SIGNAL(timeout()), TQT_SLOT(suspend()));
#ifdef HAVE_DPMS
@@ -1684,7 +1684,7 @@ void LockProcess::stopHack()
//---------------------------------------------------------------------------
//
-void LockProcess::hackExited(KProcess *)
+void LockProcess::hackExited(TDEProcess *)
{
// Hack exited while we're supposed to be saving the screen.
// Make sure the saver window is black.
@@ -1831,11 +1831,11 @@ bool LockProcess::checkPass()
if (trinity_desktop_lock_use_sak) {
// Verify SAK operational status
- KProcess* checkSAKProcess = new KProcess;
- *checkSAKProcess << "tdmtsak" << "check";
- checkSAKProcess->start(KProcess::Block, KProcess::NoCommunication);
- int retcode = checkSAKProcess->exitStatus();
- delete checkSAKProcess;
+ TDEProcess* checkSATDEProcess = new TDEProcess;
+ *checkSATDEProcess << "tdmtsak" << "check";
+ checkSATDEProcess->start(TDEProcess::Block, TDEProcess::NoCommunication);
+ int retcode = checkSATDEProcess->exitStatus();
+ delete checkSATDEProcess;
if (retcode != 0) {
trinity_desktop_lock_use_sak = false;
}
@@ -1903,7 +1903,7 @@ int LockProcess::execDialog( TQDialog *dlg )
dlg->adjustSize();
TQRect rect = dlg->geometry();
- rect.moveCenter(KGlobalSettings::desktopGeometry(TQCursor::pos()).center());
+ rect.moveCenter(TDEGlobalSettings::desktopGeometry(TQCursor::pos()).center());
dlg->move( rect.topLeft() );
if (mDialogs.isEmpty())
@@ -2352,7 +2352,7 @@ void LockProcess::showVkbd()
mVkbdLastEventWindow = None;
mKWinModule = new KWinModule( NULL, KWinModule::INFO_WINDOWS );
connect( mKWinModule, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId )));
- mVkbdProcess = new KProcess;
+ mVkbdProcess = new TDEProcess;
*mVkbdProcess << "xvkbd" << "-compact" << "-geometry" << "-0-0" << "-xdm";
mVkbdProcess->start();
}
diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
index c5b72de8..1694a0eb 100644
--- a/kdesktop/lock/lockprocess.h
+++ b/kdesktop/lock/lockprocess.h
@@ -86,7 +86,7 @@ protected:
virtual void resizeEvent(TQResizeEvent *);
private slots:
- void hackExited(KProcess *);
+ void hackExited(TDEProcess *);
void signalPipeSignal();
bool startLock();
void suspend();
@@ -136,7 +136,7 @@ private:
int mLockGrace;
int mPriority;
bool mBusy;
- KProcess mHackProc;
+ TDEProcess mHackProc;
int mRootWidth;
int mRootHeight;
TQString mSaverExec;
@@ -168,7 +168,7 @@ private:
TQTimer *hackResumeTimer;
- KProcess* mVkbdProcess;
+ TDEProcess* mVkbdProcess;
KWinModule* mKWinModule;
struct VkbdWindow
{
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 89e29a5c..7f3f61cf 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -231,7 +231,7 @@ int main( int argc, char **argv )
int parent_connection = 0; // socket to the parent saver
TQValueList<int> child_sockets;
- if (KGlobalSettings::isMultiHead())
+ if (TDEGlobalSettings::isMultiHead())
{
Display *dpy = XOpenDisplay(NULL);
if (! dpy) {
@@ -290,7 +290,7 @@ int main( int argc, char **argv )
MyApp app;
kdDebug() << "app " << kdesktop_screen_number << " " << starting_screen << " " << child << " " << child_sockets.count() << " " << parent_connection << endl;
app.disableSessionManagement();
- KGlobal::locale()->insertCatalogue("libdmctl");
+ TDEGlobal::locale()->insertCatalogue("libdmctl");
struct stat st;
KSimpleConfig* tdmconfig;
diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc
index a79d0e50..6f983ce7 100644
--- a/kdesktop/lock/sakdlg.cc
+++ b/kdesktop/lock/sakdlg.cc
@@ -104,24 +104,24 @@ SAKDlg::SAKDlg(LockProcess *parent)
installEventFilter(this);
setFixedSize( sizeHint() );
- mSAKProcess = new KProcess;
- *mSAKProcess << "tdmtsak";
- connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
- mSAKProcess->start();
+ mSATDEProcess = new TDEProcess;
+ *mSATDEProcess << "tdmtsak";
+ connect(mSATDEProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSATDEProcessExited()));
+ mSATDEProcess->start();
}
-void SAKDlg::slotSAKProcessExited()
+void SAKDlg::slotSATDEProcessExited()
{
- int retcode = mSAKProcess->exitStatus();
+ int retcode = mSATDEProcess->exitStatus();
if (retcode != 0) trinity_desktop_lock_use_sak = false;
hide();
}
SAKDlg::~SAKDlg()
{
- if ((mSAKProcess) && (mSAKProcess->isRunning())) {
- mSAKProcess->kill(SIGTERM);
- delete mSAKProcess;
+ if ((mSATDEProcess) && (mSATDEProcess->isRunning())) {
+ mSATDEProcess->kill(SIGTERM);
+ delete mSATDEProcess;
}
hide();
}
diff --git a/kdesktop/lock/sakdlg.h b/kdesktop/lock/sakdlg.h
index d72f8d46..7bc8d1fa 100644
--- a/kdesktop/lock/sakdlg.h
+++ b/kdesktop/lock/sakdlg.h
@@ -37,7 +37,7 @@ public:
void closeDialogForced();
private slots:
- void slotSAKProcessExited();
+ void slotSATDEProcessExited();
protected slots:
virtual void reject();
@@ -51,7 +51,7 @@ private:
TQStringList layoutsList;
TQStringList::iterator currLayout;
int sPid, sFd;
- KProcess* mSAKProcess;
+ TDEProcess* mSATDEProcess;
};
#endif
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
index 553f0ce4..8a9e7cf8 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cc
@@ -54,7 +54,7 @@ SaverEngine::SaverEngine()
: TQWidget(),
KScreensaverIface(),
mBlankOnly(false),
- mSAKProcess(NULL),
+ mSATDEProcess(NULL),
mTerminationRequested(false)
{
struct sigaction act;
@@ -83,12 +83,12 @@ SaverEngine::SaverEngine()
mXAutoLock = 0;
mEnabled = false;
- connect(&mLockProcess, TQT_SIGNAL(processExited(KProcess *)),
+ connect(&mLockProcess, TQT_SIGNAL(processExited(TDEProcess *)),
TQT_SLOT(lockProcessExited()));
- mSAKProcess = new KProcess;
- *mSAKProcess << "tdmtsak";
- connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
+ mSATDEProcess = new TDEProcess;
+ *mSATDEProcess << "tdmtsak";
+ connect(mSATDEProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSATDEProcessExited()));
TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) );
@@ -134,7 +134,7 @@ void SaverEngine::lock()
bool ok = true;
if (mState != Saving)
{
- mSAKProcess->kill(SIGTERM);
+ mSATDEProcess->kill(SIGTERM);
ok = startLockProcess( ForceLock );
// It takes a while for kdesktop_lock to start and lock the screen.
// Therefore delay the DCOP call until it tells kdesktop that the locking is in effect.
@@ -179,7 +179,7 @@ void SaverEngine::save()
{
if (mState == Waiting)
{
- mSAKProcess->kill(SIGTERM);
+ mSATDEProcess->kill(SIGTERM);
startLockProcess( DefaultLock );
}
}
@@ -276,18 +276,18 @@ void SaverEngine::enableExports()
void SaverEngine::handleSecureDialog()
{
// Wait for SAK press
- if (!mSAKProcess->isRunning()) mSAKProcess->start();
+ if (!mSATDEProcess->isRunning()) mSATDEProcess->start();
}
-void SaverEngine::slotSAKProcessExited()
+void SaverEngine::slotSATDEProcessExited()
{
- int retcode = mSAKProcess->exitStatus();
- if ((retcode != 0) && (mSAKProcess->normalExit())) {
+ int retcode = mSATDEProcess->exitStatus();
+ if ((retcode != 0) && (mSATDEProcess->normalExit())) {
trinity_lockeng_sak_available = FALSE;
printf("[kdesktop] SAK driven secure dialog is not available for use (retcode %d). Check tdmtsak for proper functionality.\n", retcode); fflush(stdout);
}
- if ((mSAKProcess->normalExit()) && (trinity_lockeng_sak_available == TRUE)) {
+ if ((mSATDEProcess->normalExit()) && (trinity_lockeng_sak_available == TRUE)) {
bool ok = true;
if (mState == Waiting)
{
@@ -525,7 +525,7 @@ void SaverEngine::idleTimeout()
// disable X screensaver
XForceScreenSaver(tqt_xdisplay(), ScreenSaverReset );
XSetScreenSaver(tqt_xdisplay(), 0, mXInterval, PreferBlanking, DontAllowExposures);
- mSAKProcess->kill(SIGTERM);
+ mSATDEProcess->kill(SIGTERM);
startLockProcess( DefaultLock );
}
diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h
index d1133aae..0643e82c 100644
--- a/kdesktop/lockeng.h
+++ b/kdesktop/lockeng.h
@@ -89,7 +89,7 @@ protected slots:
private slots:
void handleSecureDialog();
- void slotSAKProcessExited();
+ void slotSATDEProcessExited();
/**
* Enable wallpaper exports
@@ -110,7 +110,7 @@ protected:
State mState;
XAutoLock *mXAutoLock;
- KProcess mLockProcess;
+ TDEProcess mLockProcess;
int mTimeout;
// the original X screensaver parameters
@@ -123,7 +123,7 @@ protected:
TQValueVector< DCOPClientTransaction* > mLockTransactions;
private:
- KProcess* mSAKProcess;
+ TDEProcess* mSATDEProcess;
bool mTerminationRequested;
};
diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index a12f241b..17fc4add 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -112,7 +112,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
signal(SIGHUP, signalHandler);
{
- if (KGlobalSettings::isMultiHead())
+ if (TDEGlobalSettings::isMultiHead())
{
Display *dpy = XOpenDisplay(NULL);
if (! dpy) {
@@ -156,7 +156,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
}
}
- KGlobal::locale()->setMainCatalogue("kdesktop");
+ TDEGlobal::locale()->setMainCatalogue("kdesktop");
if (kdesktop_screen_number == 0) {
kdesktop_name = "kdesktop";
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 89b4bc69..dca215de 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -130,7 +130,7 @@ Minicli::Minicli( TQWidget *parent, const char *name)
m_systempathAutocomplete = 0;
m_pURLCompletion = new KURLCompletion(KURLCompletion::FileCompletion);
m_pEXECompletion = new KURLCompletion(KURLCompletion::SystemExeCompletion);
- //m_pURLCompletion->setCompletionMode( KGlobalSettings::completionMode() );
+ //m_pURLCompletion->setCompletionMode( TDEGlobalSettings::completionMode() );
connect( m_pURLCompletion, TQT_SIGNAL( match(const TQString&) ), TQT_SLOT( slotMatch(const TQString&) ));
connect( m_pEXECompletion, TQT_SIGNAL( match(const TQString&) ), TQT_SLOT( slotEXEMatch(const TQString&) ));
@@ -241,7 +241,7 @@ void Minicli::loadConfig()
m_dlg->cbCommand->completionObject()->setItems( compList );
int mode = KDesktopSettings::completionMode();
- m_dlg->cbCommand->setCompletionMode( (KGlobalSettings::Completion) mode );
+ m_dlg->cbCommand->setCompletionMode( (TDEGlobalSettings::Completion) mode );
KCompletionBox* box = m_dlg->cbCommand->completionBox();
if (box)
@@ -268,7 +268,7 @@ void Minicli::loadConfig()
completion->insertItems (users);
m_dlg->leUsername->setCompletionObject(completion, true);
- m_dlg->leUsername->setCompletionMode(KGlobalSettings::completionMode());
+ m_dlg->leUsername->setCompletionMode(TDEGlobalSettings::completionMode());
m_dlg->leUsername->setAutoDeleteCompletionObject( true );
}
@@ -1074,7 +1074,7 @@ TQString Minicli::calculate(const TQString &exp)
TQString result, cmd;
const TQString bc = KStandardDirs::findExe("bc");
if ( !bc.isEmpty() )
- cmd = TQString("echo %1 | %2").arg(KProcess::quote(TQString("scale=8; ")+exp), KProcess::quote(bc));
+ cmd = TQString("echo %1 | %2").arg(TDEProcess::quote(TQString("scale=8; ")+exp), TDEProcess::quote(bc));
else
cmd = TQString("echo $((%1))").arg(exp);
FILE *fs = popen(TQFile::encodeName(cmd).data(), "r");
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 3bec0f9a..36d566e3 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -179,7 +179,7 @@ void StartupId::start_startupid( const TQString& icon_P )
= { Qt::black, Qt::darkGray, Qt::lightGray, Qt::white, Qt::white };
- TQPixmap icon_pixmap = KGlobal::iconLoader()->loadIcon( icon_P, KIcon::Small, 0,
+ TQPixmap icon_pixmap = TDEGlobal::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" );
diff --git a/kfind/ChangeLog b/kfind/ChangeLog
index 87849d49..9d8ae06b 100644
--- a/kfind/ChangeLog
+++ b/kfind/ChangeLog
@@ -64,7 +64,7 @@ ver. 0.4.1: Mario Weilguni <mweilguni@kde.org>
ver. 0.4: Mario Weilguni <mweilguni@kde.org>
* introduced this ChangeLog
- * kfind now uses KShellProcess instead of KProcess, makes
+ * kfind now uses KShellProcess instead of TDEProcess, makes
regular expression search possible with egrep/xargs
* kftabdlg.cpp: tab-dialog isn't closed anymore if Escape key
is pressed
@@ -83,7 +83,7 @@ ver. 0.3.4:
ver. 0.3.3:
- o uses KProcess
+ o uses TDEProcess
o supports other languages then english (at this time german and czech)
ver. 0.3.2:
diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp
index 5ac494f8..b901b0f0 100644
--- a/kfind/kdatecombo.cpp
+++ b/kfind/kdatecombo.cpp
@@ -49,12 +49,12 @@ KDateCombo::~KDateCombo()
TQString KDateCombo::date2String(const TQDate & date)
{
- return(KGlobal::locale()->formatDate(date, true));
+ return(TDEGlobal::locale()->formatDate(date, true));
}
TQDate & KDateCombo::string2Date(const TQString & str, TQDate *qd)
{
- return *qd = KGlobal::locale()->readDate(str);
+ return *qd = TDEGlobal::locale()->readDate(str);
}
TQDate & KDateCombo::getDate(TQDate *currentDate)
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index a16ad67c..75e89a9a 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -158,7 +158,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
betweenType->setCurrentItem(1);
- TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
+ TQDate dt = TDEGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
fromDate = new KDateCombo(dt, pages[1], "fromDate");
toDate = new KDateCombo(pages[1], "toDate");
@@ -380,7 +380,7 @@ KfindTabWidget::~KfindTabWidget()
void KfindTabWidget::setURL( const KURL & url )
{
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup("History");
m_url = url;
TQStringList sl = conf->readPathListEntry("Directories");
@@ -459,7 +459,7 @@ void KfindTabWidget::saveHistory()
void KfindTabWidget::loadHistory()
{
// Load pattern history
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup("History");
TQStringList sl = conf->readListEntry("Patterns");
if(!sl.isEmpty())
@@ -522,7 +522,7 @@ void KfindTabWidget::slotSizeBoxChanged(int index)
void KfindTabWidget::setDefaults()
{
- TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
+ TQDate dt = TDEGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
fromDate ->setDate(dt);
toDate ->setDate(TQDate::currentDate());
@@ -726,11 +726,11 @@ void KfindTabWidget::setQuery(KQuery *query)
}
TQString KfindTabWidget::date2String(const TQDate & date) {
- return(KGlobal::locale()->formatDate(date, true));
+ return(TDEGlobal::locale()->formatDate(date, true));
}
TQDate &KfindTabWidget::string2Date(const TQString & str, TQDate *qd) {
- return *qd = KGlobal::locale()->readDate(str);
+ return *qd = TDEGlobal::locale()->readDate(str);
}
void KfindTabWidget::getDirectory()
@@ -849,7 +849,7 @@ static void save_pattern(TQComboBox *obj,
}
}
- KConfig *conf = KGlobal::config();
+ KConfig *conf = TDEGlobal::config();
conf->setGroup(group);
conf->writePathEntry(entry, sl);
}
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index bdf07784..740c7ae3 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -61,11 +61,11 @@ KfFileLVI::KfFileLVI(KfindWindow* lv, const KFileItem &item, const TQString& mat
{
fileInfo = new TQFileInfo(item.url().path());
- TQString size = KGlobal::locale()->formatNumber(item.size(), 0);
+ TQString size = TDEGlobal::locale()->formatNumber(item.size(), 0);
TQDateTime dt;
dt.setTime_t(item.time(KIO::UDS_MODIFICATION_TIME));
- TQString date = KGlobal::locale()->formatDateTime(dt);
+ TQString date = TDEGlobal::locale()->formatDateTime(dt);
int perm_index;
if(fileInfo->isReadable())
@@ -372,7 +372,7 @@ void KfindWindow::resetColumns(bool init)
{
setColumnWidth(2, QMAX(fm.width(columnText(2)), fm.width("0000000")) + 15);
TQString sampleDate =
- KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
+ TDEGlobal::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);
diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp
index 4231f1aa..e6f8664f 100644
--- a/kfind/kquery.cpp
+++ b/kfind/kquery.cpp
@@ -20,10 +20,10 @@ KQuery::KQuery(TQObject *parent, const char * name)
{
m_regexps.setAutoDelete(true);
m_fileItems.setAutoDelete(true);
- processLocate = new KProcess(this);
- 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*)));
+ processLocate = new TDEProcess(this);
+ connect(processLocate,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdtout(TDEProcess*,char*,int)));
+ connect(processLocate,TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdterr(TDEProcess*,char*,int)));
+ connect(processLocate,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(slotendProcessLocate(TDEProcess*)));
// Files with these mime types can be ignored, even if
// findFormatByFileContent() in some cases may claim that
@@ -78,7 +78,7 @@ void KQuery::start()
*processLocate << m_url.path(1).latin1();
bufferLocate=NULL;
bufferLocateLength=0;
- processLocate->start(KProcess::NotifyOnExit,KProcess::AllOutput);
+ processLocate->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput);
return;
}
@@ -478,12 +478,12 @@ void KQuery::setUseFileIndex(bool useLocate)
m_useLocate=useLocate;
}
-void KQuery::slotreceivedSdterr(KProcess* ,char* str,int)
+void KQuery::slotreceivedSdterr(TDEProcess* ,char* str,int)
{
KMessageBox::error(NULL, TQString(str), i18n("Error while using locate"));
}
-void KQuery::slotreceivedSdtout(KProcess*,char* str,int l)
+void KQuery::slotreceivedSdtout(TDEProcess*,char* str,int l)
{
int i;
@@ -494,7 +494,7 @@ void KQuery::slotreceivedSdtout(KProcess*,char* str,int l)
bufferLocate[bufferLocateLength-l+i]=str[i];
}
-void KQuery::slotendProcessLocate(KProcess*)
+void KQuery::slotendProcessLocate(TDEProcess*)
{
TQString qstr;
TQStringList strlist;
diff --git a/kfind/kquery.h b/kfind/kquery.h
index ecd83b34..5ddc334f 100644
--- a/kfind/kquery.h
+++ b/kfind/kquery.h
@@ -53,9 +53,9 @@ class KQuery : public TQObject
void slotListEntries(KIO::Job *, const KIO::UDSEntryList &);
void slotResult(KIO::Job *);
void slotCanceled(KIO::Job *);
- void slotreceivedSdtout(KProcess*,char*,int);
- void slotreceivedSdterr(KProcess*,char*,int);
- void slotendProcessLocate(KProcess*);
+ void slotreceivedSdtout(TDEProcess*,char*,int);
+ void slotreceivedSdterr(TDEProcess*,char*,int);
+ void slotendProcessLocate(TDEProcess*);
signals:
void addFile(const KFileItem *filename, const TQString& matchingLine);
@@ -86,7 +86,7 @@ class KQuery : public TQObject
char* bufferLocate;
int bufferLocateLength;
TQStringList locateList;
- KProcess *processLocate;
+ TDEProcess *processLocate;
TQPtrList<TQRegExp> m_regexps;// regexps for file name
// TQValueList<bool> m_regexpsContainsGlobs; // what should this be good for ? Alex
KIO::ListJob *job;
diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp
index 2ff49607..a63b473c 100644
--- a/khelpcenter/docmetainfo.cpp
+++ b/khelpcenter/docmetainfo.cpp
@@ -123,7 +123,7 @@ void DocMetaInfo::scanMetaInfo( bool force )
{
if ( mLoaded && !force ) return;
- mLanguages = KGlobal::locale()->languagesTwoAlpha();
+ mLanguages = TDEGlobal::locale()->languagesTwoAlpha();
kdDebug( 1400 ) << "LANGS: " << mLanguages.join( " " ) << endl;
@@ -137,7 +137,7 @@ void DocMetaInfo::scanMetaInfo( bool force )
TQStringList metaInfos = config.readListEntry( "MetaInfoDirs" );
if ( metaInfos.isEmpty() ) {
- KStandardDirs* kstd = KGlobal::dirs();
+ KStandardDirs* kstd = TDEGlobal::dirs();
kstd->addResourceType( "data", "share/apps/khelpcenter" );
metaInfos = kstd->findDirs( "data", "plugins" );
}
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index e540ae81..1919ce84 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -134,7 +134,7 @@ void FontDialog::setupFontEncodingBox()
layout->addWidget( lDefaultEncoding, 0, 0 );
m_defaultEncoding = new KComboBox( false, gb );
layout->addWidget( m_defaultEncoding, 0, 1 );
- TQStringList encodings = KGlobal::charsets()->availableEncodingNames();
+ TQStringList encodings = TDEGlobal::charsets()->availableEncodingNames();
encodings.prepend( i18n( "Use Language Encoding" ) );
m_defaultEncoding->insertStringList( encodings );
lDefaultEncoding->setBuddy( m_defaultEncoding );
@@ -157,8 +157,8 @@ void FontDialog::load()
TQStringList fonts = cfg->readListEntry( "Fonts" );
if ( fonts.isEmpty() )
- fonts << KGlobalSettings::generalFont().family()
- << KGlobalSettings::fixedFont().family()
+ fonts << TDEGlobalSettings::generalFont().family()
+ << TDEGlobalSettings::fixedFont().family()
<< HTML_DEFAULT_VIEW_SERIF_FONT
<< HTML_DEFAULT_VIEW_SANSSERIF_FONT
<< HTML_DEFAULT_VIEW_CURSIVE_FONT
diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp
index b9f39428..892b2d0c 100644
--- a/khelpcenter/formatter.cpp
+++ b/khelpcenter/formatter.cpp
@@ -42,7 +42,7 @@ Formatter:: ~Formatter()
bool Formatter::readTemplates()
{
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "Templates" );
TQString mainTemplate = cfg->readEntry( "MainTemplate" );
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index b0ba4735..8a406230 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -146,9 +146,9 @@ void Glossary::rebuildGlossaryCache()
Q_ASSERT( mainWindow );
mainWindow->statusBar()->message( i18n( "Rebuilding cache..." ) );
- KProcess *meinproc = new KProcess;
- connect( meinproc, TQT_SIGNAL( processExited( KProcess * ) ),
- this, TQT_SLOT( meinprocExited( KProcess * ) ) );
+ TDEProcess *meinproc = new TDEProcess;
+ connect( meinproc, TQT_SIGNAL( processExited( TDEProcess * ) ),
+ this, TQT_SLOT( meinprocExited( TDEProcess * ) ) );
*meinproc << locate( "exe", TQString::fromLatin1( "meinproc" ) );
*meinproc << TQString::fromLatin1( "--output" ) << m_cacheFile;
@@ -156,10 +156,10 @@ void Glossary::rebuildGlossaryCache()
<< locate( "data", TQString::fromLatin1( "khelpcenter/glossary.xslt" ) );
*meinproc << m_sourceFile;
- meinproc->start( KProcess::NotifyOnExit );
+ meinproc->start( TDEProcess::NotifyOnExit );
}
-void Glossary::meinprocExited( KProcess *meinproc )
+void Glossary::meinprocExited( TDEProcess *meinproc )
{
delete meinproc;
diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h
index b288cb49..37594811 100644
--- a/khelpcenter/glossary.h
+++ b/khelpcenter/glossary.h
@@ -27,7 +27,7 @@
#include <tqstringlist.h>
class KConfig;
-class KProcess;
+class TDEProcess;
class EntryItem;
@@ -117,7 +117,7 @@ class Glossary : public KListView
void entrySelected( const GlossaryEntry &entry );
private slots:
- void meinprocExited( KProcess *meinproc );
+ void meinprocExited( TDEProcess *meinproc );
void treeItemSelected( TQListViewItem *item );
private:
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index c4730019..a4bca7e5 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -266,7 +266,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
delete _proc;
// prepare new process
- _proc = new KProcess();
+ _proc = new TDEProcess();
*_proc << exe << "-v" << "-c" << dataPath(_lang)+"/htdig.conf";
if (initial)
{
@@ -276,11 +276,11 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
kdDebug() << "Running htdig" << endl;
- connect(_proc, TQT_SIGNAL(receivedStdout(KProcess *,char*,int)),
- this, TQT_SLOT(htdigStdout(KProcess *,char*,int)));
+ connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
+ this, TQT_SLOT(htdigStdout(TDEProcess *,char*,int)));
- connect(_proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(htdigExited(KProcess *)));
+ connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(htdigExited(TDEProcess *)));
_htdigRunning = true;
@@ -308,7 +308,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
// execute htdig
- _proc->start(KProcess::NotifyOnExit, KProcess::Stdout );
+ _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout );
kapp->enter_loop();
@@ -335,17 +335,17 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
return false;
}
delete _proc;
- _proc = new KProcess();
+ _proc = new TDEProcess();
*_proc << exe << "-c" << dataPath(_lang)+"/htdig.conf";
kdDebug() << "Running htmerge" << endl;
- connect(_proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(htmergeExited(KProcess *)));
+ connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(htmergeExited(TDEProcess *)));
_htmergeRunning = true;
- _proc->start(KProcess::NotifyOnExit, KProcess::Stdout);
+ _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
kapp->enter_loop();
@@ -370,7 +370,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
-void HTMLSearch::htdigStdout(KProcess *, char *buffer, int len)
+void HTMLSearch::htdigStdout(TDEProcess *, char *buffer, int len)
{
TQString line = TQString(buffer).left(len);
@@ -389,7 +389,7 @@ void HTMLSearch::htdigStdout(KProcess *, char *buffer, int len)
}
-void HTMLSearch::htdigExited(KProcess *p)
+void HTMLSearch::htdigExited(TDEProcess *p)
{
kdDebug() << "htdig terminated " << p->exitStatus() << endl;
_htdigRunning = false;
@@ -397,7 +397,7 @@ void HTMLSearch::htdigExited(KProcess *p)
}
-void HTMLSearch::htmergeExited(KProcess *)
+void HTMLSearch::htmergeExited(TDEProcess *)
{
kdDebug() << "htmerge terminated" << endl;
_htmergeRunning = false;
@@ -405,13 +405,13 @@ void HTMLSearch::htmergeExited(KProcess *)
}
-void HTMLSearch::htsearchStdout(KProcess *, char *buffer, int len)
+void HTMLSearch::htsearchStdout(TDEProcess *, char *buffer, int len)
{
_searchResult += TQString::fromLocal8Bit(buffer,len);
}
-void HTMLSearch::htsearchExited(KProcess *)
+void HTMLSearch::htsearchExited(TDEProcess *)
{
kdDebug() << "htsearch terminated" << endl;
_htsearchRunning = false;
@@ -438,21 +438,21 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
delete config;
return TQString::null;
}
- _proc = new KProcess();
+ _proc = new TDEProcess();
*_proc << exe << "-c" << dataPath(_lang)+"/htdig.conf" <<
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, TQT_SIGNAL(receivedStdout(KProcess *,char*,int)),
- this, TQT_SLOT(htsearchStdout(KProcess *,char*,int)));
- connect(_proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(htsearchExited(KProcess *)));
+ connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
+ this, TQT_SLOT(htsearchStdout(TDEProcess *,char*,int)));
+ connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(htsearchExited(TDEProcess *)));
_htsearchRunning = true;
_searchResult = "";
- _proc->start(KProcess::NotifyOnExit, KProcess::Stdout);
+ _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
kapp->enter_loop();
diff --git a/khelpcenter/htmlsearch/htmlsearch.h b/khelpcenter/htmlsearch/htmlsearch.h
index f1d8464e..37d9bf39 100644
--- a/khelpcenter/htmlsearch/htmlsearch.h
+++ b/khelpcenter/htmlsearch/htmlsearch.h
@@ -10,7 +10,7 @@ class TQWidget;
class TQProgressDialog;
-class KProcess;
+class TDEProcess;
class ProgressDialog;
@@ -32,11 +32,11 @@ public:
protected slots:
- void htdigStdout(KProcess *proc, char *buffer, int buflen);
- void htdigExited(KProcess *proc);
- void htmergeExited(KProcess *proc);
- void htsearchStdout(KProcess *proc, char *buffer, int buflen);
- void htsearchExited(KProcess *proc);
+ void htdigStdout(TDEProcess *proc, char *buffer, int buflen);
+ void htdigExited(TDEProcess *proc);
+ void htmergeExited(TDEProcess *proc);
+ void htsearchStdout(TDEProcess *proc, char *buffer, int buflen);
+ void htsearchExited(TDEProcess *proc);
protected:
@@ -52,7 +52,7 @@ protected:
private:
TQStringList _files;
- KProcess *_proc;
+ TDEProcess *_proc;
int _filesToDig, _filesDigged, _filesScanned;
volatile bool _htdigRunning, _htmergeRunning, _htsearchRunning;
TQString _searchResult;
diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp
index c7b5bce4..82bf2368 100644
--- a/khelpcenter/htmlsearch/index.cpp
+++ b/khelpcenter/htmlsearch/index.cpp
@@ -22,7 +22,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options );
- KGlobal::locale()->setMainCatalogue("htmlsearch");
+ TDEGlobal::locale()->setMainCatalogue("htmlsearch");
TDEApplication app;
HTMLSearch search;
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 57824519..7bb403b0 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -178,7 +178,7 @@ void KHTMLSearchConfig::loadLanguages()
language->clear();
// add all languages to the list
- TQStringList langs = KGlobal::dirs()->findAllResources("locale",
+ TQStringList langs = TDEGlobal::dirs()->findAllResources("locale",
TQString::fromLatin1("*/entry.desktop"));
langs.sort();
@@ -186,7 +186,7 @@ void KHTMLSearchConfig::loadLanguages()
{
KSimpleConfig entry(*it);
entry.setGroup(TQString::fromLatin1("KCM Locale"));
- TQString name = entry.readEntry(TQString::fromLatin1("Name"), KGlobal::locale()->translate("without name"));
+ TQString name = entry.readEntry(TQString::fromLatin1("Name"), TDEGlobal::locale()->translate("without name"));
TQString path = *it;
int index = path.findRev('/');
@@ -272,7 +272,7 @@ void KHTMLSearchConfig::load()
searchPaths->insertItem(*it);
config->setGroup("Locale");
- TQString lang = config->readEntry("Search Language", KGlobal::locale()->language());
+ TQString lang = config->readEntry("Search Language", TDEGlobal::locale()->language());
language->setCurrentItem(lang);
emit changed(false);
@@ -320,7 +320,7 @@ void KHTMLSearchConfig::defaults()
searchPaths->clear();
- language->setCurrentItem(KGlobal::locale()->language());
+ language->setCurrentItem(TDEGlobal::locale()->language());
emit changed(true);
}
@@ -342,11 +342,11 @@ void KHTMLSearchConfig::generateIndex()
delete indexProc;
- indexProc = new KProcess;
+ indexProc = new TDEProcess;
*indexProc << exe << "--lang" << language->currentTag();
- connect(indexProc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(indexTerminated(KProcess *)));
+ connect(indexProc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(indexTerminated(TDEProcess *)));
runButton->setEnabled(false);
@@ -354,7 +354,7 @@ void KHTMLSearchConfig::generateIndex()
}
-void KHTMLSearchConfig::indexTerminated(KProcess *)
+void KHTMLSearchConfig::indexTerminated(TDEProcess *)
{
runButton->setEnabled(true);
}
@@ -364,7 +364,7 @@ extern "C"
{
KDE_EXPORT KCModule *create_htmlsearch(TQWidget *parent, const char *name)
{
- KGlobal::locale()->insertCatalogue("kcmhtmlsearch");
+ TDEGlobal::locale()->insertCatalogue("kcmhtmlsearch");
return new KHTMLSearchConfig(parent, name);
};
}
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h
index 37c4649d..1b9c0b0f 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.h
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h
@@ -29,7 +29,7 @@ class TQLineEdit;
class TQCheckBox;
class TQPushButton;
class KListBox;
-class KProcess;
+class TDEProcess;
class KLanguageCombo;
class KURLRequester;
@@ -60,7 +60,7 @@ protected slots:
void urlClicked(const TQString&);
void generateIndex();
- void indexTerminated(KProcess *proc);
+ void indexTerminated(TDEProcess *proc);
private:
@@ -74,7 +74,7 @@ private:
KListBox *searchPaths;
KLanguageCombo *language;
- KProcess *indexProc;
+ TDEProcess *indexProc;
};
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index 1c7e5439..10a3ced0 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -135,7 +135,7 @@ IndexProgressDialog::IndexProgressDialog( TQWidget *parent )
IndexProgressDialog::~IndexProgressDialog()
{
if ( !mLogView->isHidden() ) {
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "indexprogressdialog" );
cfg->writeEntry( "size", size() );
}
@@ -196,7 +196,7 @@ void IndexProgressDialog::slotEnd()
void IndexProgressDialog::toggleDetails()
{
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "indexprogressdialog" );
if ( mLogView->isHidden() ) {
mLogLabel->show();
@@ -234,7 +234,7 @@ KCMHelpCenter::KCMHelpCenter( KHC::SearchEngine *engine, TQWidget *parent,
setButtonOK( i18n("Build Index") );
- mConfig = KGlobal::config();
+ mConfig = TDEGlobal::config();
DocMetaInfo::self()->scanMetaInfo();
@@ -465,7 +465,7 @@ void KCMHelpCenter::startIndexProcess()
{
kdDebug() << "KCMHelpCenter::startIndexProcess()" << endl;
- mProcess = new KProcess;
+ mProcess = new TDEProcess;
if ( mRunAsRoot ) {
*mProcess << "tdesu" << "--nonewdcop";
@@ -476,14 +476,14 @@ void KCMHelpCenter::startIndexProcess()
*mProcess << mCmdFile->name();
*mProcess << Prefs::indexDirectory();
- 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 ) ) );
+ connect( mProcess, TQT_SIGNAL( processExited( TDEProcess * ) ),
+ TQT_SLOT( slotIndexFinished( TDEProcess * ) ) );
+ connect( mProcess, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+ TQT_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) );
+ connect( mProcess, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+ TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
- if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
+ if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
kdError() << "KCMHelpcenter::startIndexProcess(): Failed to start process."
<< endl;
}
@@ -502,7 +502,7 @@ void KCMHelpCenter::cancelBuildIndex()
}
}
-void KCMHelpCenter::slotIndexFinished( KProcess *proc )
+void KCMHelpCenter::slotIndexFinished( TDEProcess *proc )
{
kdDebug() << "KCMHelpCenter::slotIndexFinished()" << endl;
@@ -527,7 +527,7 @@ void KCMHelpCenter::slotIndexFinished( KProcess *proc )
return;
}
} else if ( !mProcess->normalExit() || mProcess->exitStatus() != 0 ) {
- kdDebug() << "KProcess reported an error." << endl;
+ kdDebug() << "TDEProcess reported an error." << endl;
KMessageBox::error( this, i18n("Failed to build index.") );
} else {
mConfig->setGroup( "Search" );
@@ -608,7 +608,7 @@ void KCMHelpCenter::advanceProgress()
}
}
-void KCMHelpCenter::slotReceivedStdout( KProcess *, char *buffer, int buflen )
+void KCMHelpCenter::slotReceivedStdout( TDEProcess *, char *buffer, int buflen )
{
TQString text = TQString::fromLocal8Bit( buffer, buflen );
int pos = text.findRev( '\n' );
@@ -622,7 +622,7 @@ void KCMHelpCenter::slotReceivedStdout( KProcess *, char *buffer, int buflen )
}
}
-void KCMHelpCenter::slotReceivedStderr( KProcess *, char *buffer, int buflen )
+void KCMHelpCenter::slotReceivedStderr( TDEProcess *, char *buffer, int buflen )
{
TQString text = TQString::fromLocal8Bit( buffer, buflen );
int pos = text.findRev( '\n' );
@@ -680,7 +680,7 @@ void KCMHelpCenter::findWriteableIndexDir()
{
TQFileInfo currentDir( Prefs::indexDirectory() );
if ( !currentDir.isWritable() )
- Prefs::setIndexDirectory( KGlobal::dirs()->saveLocation("data", "khelpcenter/index/") );
+ Prefs::setIndexDirectory( TDEGlobal::dirs()->saveLocation("data", "khelpcenter/index/") );
}
#include "kcmhelpcenter.moc"
diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h
index a5a336af..4e28428f 100644
--- a/khelpcenter/kcmhelpcenter.h
+++ b/khelpcenter/kcmhelpcenter.h
@@ -32,7 +32,7 @@ class TQProgressBar;
class TQTextEdit;
class TQLabel;
-class KProcess;
+class TDEProcess;
class KConfig;
class TDEAboutData;
class KTempFile;
@@ -123,11 +123,11 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
protected slots:
bool buildIndex();
void cancelBuildIndex();
- void slotIndexFinished( KProcess * );
+ void slotIndexFinished( TDEProcess * );
void slotIndexProgress();
void slotIndexError( const TQString & );
- void slotReceivedStdout(KProcess *proc, char *buffer, int buflen);
- void slotReceivedStderr(KProcess *proc, char *buffer, int buflen);
+ void slotReceivedStdout(TDEProcess *proc, char *buffer, int buflen);
+ void slotReceivedStderr(TDEProcess *proc, char *buffer, int buflen);
void slotProgressClosed();
void slotOk();
@@ -171,7 +171,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
KTempFile *mCmdFile;
- KProcess *mProcess;
+ TDEProcess *mProcess;
bool mIsClosing;
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index 3759b304..0efd5ac2 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -84,29 +84,29 @@ void IndexBuilder::processCmdQueue()
kdDebug(1402) << "PROCESS: " << cmd << endl;
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
proc->setRunPrivileged( true );
TQStringList args = TQStringList::split( " ", cmd );
*proc << args;
- 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 ) ) );
+ connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
+ TQT_SLOT( slotProcessExited( TDEProcess * ) ) );
+ connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ),
+ TQT_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) );
+ connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int ) ),
+ TQT_SLOT( slotReceivedStderr(TDEProcess *, char *, int ) ) );
mCmdQueue.remove( it );
- if ( !proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
+ if ( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
sendErrorSignal( i18n("Unable to start command '%1'.").arg( cmd ) );
processCmdQueue();
}
}
-void IndexBuilder::slotProcessExited( KProcess *proc )
+void IndexBuilder::slotProcessExited( TDEProcess *proc )
{
kdDebug(1402) << "IndexBuilder::slotIndexFinished()" << endl;
@@ -124,13 +124,13 @@ void IndexBuilder::slotProcessExited( KProcess *proc )
processCmdQueue();
}
-void IndexBuilder::slotReceivedStdout( KProcess *, char *buffer, int buflen )
+void IndexBuilder::slotReceivedStdout( TDEProcess *, char *buffer, int buflen )
{
TQString text = TQString::fromLocal8Bit( buffer, buflen );
std::cout << text.local8Bit().data() << std::flush;
}
-void IndexBuilder::slotReceivedStderr( KProcess *, char *buffer, int buflen )
+void IndexBuilder::slotReceivedStderr( TDEProcess *, char *buffer, int buflen )
{
TQString text = TQString::fromLocal8Bit( buffer, buflen );
std::cerr << text.local8Bit().data() << std::flush;
diff --git a/khelpcenter/khc_indexbuilder.h b/khelpcenter/khc_indexbuilder.h
index 07871c39..5eb84941 100644
--- a/khelpcenter/khc_indexbuilder.h
+++ b/khelpcenter/khc_indexbuilder.h
@@ -26,7 +26,7 @@
#include <tqobject.h>
#include <tqtimer.h>
-class KProcess;
+class TDEProcess;
namespace KHC {
@@ -44,9 +44,9 @@ class IndexBuilder : public QObject
protected slots:
void buildIndices();
- void slotProcessExited( KProcess * );
- void slotReceivedStdout( KProcess *, char *buffer, int buflen );
- void slotReceivedStderr( KProcess *, char *buffer, int buflen );
+ void slotProcessExited( TDEProcess * );
+ void slotReceivedStdout( TDEProcess *, char *buffer, int buflen );
+ void slotReceivedStderr( TDEProcess *, char *buffer, int buflen );
private:
TQString m_cmdFile;
diff --git a/khelpcenter/khelpcenter.kcfg b/khelpcenter/khelpcenter.kcfg
index 0ece51e1..836bb9f4 100644
--- a/khelpcenter/khelpcenter.kcfg
+++ b/khelpcenter/khelpcenter.kcfg
@@ -10,7 +10,7 @@
<entry type="Path" key="IndexDirectory">
<label>Path to index directory.</label>
<whatsthis>Path to directory containing search indices.</whatsthis>
- <default code="true">KGlobal::dirs()->saveLocation("data", "khelpcenter/index/")</default>
+ <default code="true">TDEGlobal::dirs()->saveLocation("data", "khelpcenter/index/")</default>
</entry>
<entry type="Int" key="Method">
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index 30f81015..f6e16da1 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -185,7 +185,7 @@ void MainWindow::readProperties( KConfig *config )
void MainWindow::readConfig()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup( "MainWindowState" );
TQValueList<int> sizes = config->readIntListEntry( "Splitter" );
if ( sizes.count() == 2 ) {
@@ -197,7 +197,7 @@ void MainWindow::readConfig()
void MainWindow::writeConfig()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup( "MainWindowState" );
config->writeEntry( "Splitter", mSplitter->sizes() );
@@ -237,7 +237,7 @@ void MainWindow::setupActions()
KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ),
actionCollection() );
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "Debug" );
if ( cfg->readBoolEntry( "SearchErrorLog", false ) ) {
new KAction( i18n("Show Search Error Log"), 0, TQT_TQOBJECT(this),
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index c2179e70..1907ac1f 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -131,7 +131,7 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
hideSearch();
} else {
mSearchWidget->updateScopeList();
- mSearchWidget->readConfig( KGlobal::config() );
+ mSearchWidget->readConfig( TDEGlobal::config() );
}
connect( mTabWidget, TQT_SIGNAL( currentChanged( QWidget * ) ),
@@ -591,7 +591,7 @@ void Navigator::hideSearch()
bool Navigator::checkSearchIndex()
{
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "Search" );
if ( cfg->readBoolEntry( "IndexExists", false ) ) return true;
@@ -626,7 +626,7 @@ KURL Navigator::homeURL()
{
if ( !mHomeUrl.isEmpty() ) return mHomeUrl;
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
// We have to reparse the configuration here in order to get a
// language-specific StartUrl, e.g. "StartUrl[de]".
cfg->reparseConfiguration();
diff --git a/khelpcenter/navigator.h b/khelpcenter/navigator.h
index 741660e1..e6912d5e 100644
--- a/khelpcenter/navigator.h
+++ b/khelpcenter/navigator.h
@@ -38,7 +38,7 @@ class TQPushButton;
class KListView;
class KService;
-class KProcess;
+class TDEProcess;
class KProcIO;
class KCMHelpCenter;
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index 55bdfa68..0b830725 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -54,7 +54,7 @@ void ScrollKeeperTreeBuilder::loadConfig()
NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent,
NavigatorItem *after )
{
- TQString lang = KGlobal::locale()->language();
+ TQString lang = TDEGlobal::locale()->language();
kdDebug(1400) << "ScrollKeeper language: " << lang << endl;
@@ -62,7 +62,7 @@ NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent,
proc << "scrollkeeper-get-content-list";
proc << lang;
connect(&proc,TQT_SIGNAL(readReady(KProcIO *)),TQT_SLOT(getContentsList(KProcIO *)));
- if (!proc.start(KProcess::Block)) {
+ if (!proc.start(TDEProcess::Block)) {
kdDebug(1400) << "Could not execute scrollkeeper-get-content-list" << endl;
return 0;
}
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index b779afc8..bc0a1d16 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -205,7 +205,7 @@ SearchEngine::SearchEngine( View *destination )
mProc( 0 ), mSearchRunning( false ), mView( destination ),
mRootTraverser( 0 )
{
- mLang = KGlobal::locale()->language().left( 2 );
+ mLang = TDEGlobal::locale()->language().left( 2 );
}
SearchEngine::~SearchEngine()
@@ -215,7 +215,7 @@ SearchEngine::~SearchEngine()
bool SearchEngine::initSearchHandlers()
{
- TQStringList resources = KGlobal::dirs()->findAllResources(
+ TQStringList resources = TDEGlobal::dirs()->findAllResources(
"appdata", "searchhandlers/*.desktop" );
TQStringList::ConstIterator it;
for( it = resources.begin(); it != resources.end(); ++it ) {
@@ -246,7 +246,7 @@ bool SearchEngine::initSearchHandlers()
return true;
}
-void SearchEngine::searchStdout(KProcess *, char *buffer, int len)
+void SearchEngine::searchStdout(TDEProcess *, char *buffer, int len)
{
if ( !buffer || len == 0 )
return;
@@ -262,7 +262,7 @@ void SearchEngine::searchStdout(KProcess *, char *buffer, int len)
free(p);
}
-void SearchEngine::searchStderr(KProcess *, char *buffer, int len)
+void SearchEngine::searchStderr(TDEProcess *, char *buffer, int len)
{
if ( !buffer || len == 0 )
return;
@@ -270,7 +270,7 @@ void SearchEngine::searchStderr(KProcess *, char *buffer, int len)
mStderr.append( TQString::fromUtf8( buffer, len ) );
}
-void SearchEngine::searchExited(KProcess *)
+void SearchEngine::searchExited(TDEProcess *)
{
kdDebug() << "Search terminated" << endl;
mSearchRunning = false;
@@ -293,7 +293,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
if ( method == "or" ) mOperation = Or;
else mOperation = And;
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "Search" );
TQString commonSearchProgram = cfg->readPathEntry( "CommonProgram" );
bool useCommon = cfg->readBoolEntry( "UseCommonProgram", false );
@@ -320,7 +320,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
return true;
} else {
- TQString lang = KGlobal::locale()->language().left(2);
+ TQString lang = TDEGlobal::locale()->language().left(2);
if ( lang.lower() == "c" || lang.lower() == "posix" )
lang = "en";
@@ -340,7 +340,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
kdDebug() << "Common Search: " << commonSearchProgram << endl;
- mProc = new KProcess();
+ mProc = new TDEProcess();
TQStringList cmd = TQStringList::split( " ", commonSearchProgram );
TQStringList::ConstIterator it;
@@ -352,18 +352,18 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
*mProc << arg.utf8();
}
- 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 * ) ) );
+ connect( mProc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+ TQT_SLOT( searchStdout( TDEProcess *, char *, int ) ) );
+ connect( mProc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+ TQT_SLOT( searchStderr( TDEProcess *, char *, int ) ) );
+ connect( mProc, TQT_SIGNAL( processExited( TDEProcess * ) ),
+ TQT_SLOT( searchExited( TDEProcess * ) ) );
mSearchRunning = true;
mSearchResult = "";
mStderr = "<b>" + commonSearchProgram + "</b>\n\n";
- mProc->start(KProcess::NotifyOnExit, KProcess::All);
+ mProc->start(TDEProcess::NotifyOnExit, TDEProcess::All);
while (mSearchRunning && mProc->isRunning())
kapp->processEvents();
diff --git a/khelpcenter/searchengine.h b/khelpcenter/searchengine.h
index 84f25274..31f4c667 100644
--- a/khelpcenter/searchengine.h
+++ b/khelpcenter/searchengine.h
@@ -11,7 +11,7 @@
#include "docentrytraverser.h"
class TQWidget;
-class KProcess;
+class TDEProcess;
class KConfig;
class KHTMLPart;
@@ -114,15 +114,15 @@ class SearchEngine : public TQObject
void searchFinished();
protected slots:
- void searchStdout(KProcess *proc, char *buffer, int buflen);
- void searchStderr(KProcess *proc, char *buffer, int buflen);
- void searchExited(KProcess *proc);
+ void searchStdout(TDEProcess *proc, char *buffer, int buflen);
+ void searchStderr(TDEProcess *proc, char *buffer, int buflen);
+ void searchExited(TDEProcess *proc);
protected:
void processSearchQueue();
private:
- KProcess *mProc;
+ TDEProcess *mProc;
bool mSearchRunning;
TQString mSearchResult;
diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp
index 9c34d739..07689042 100644
--- a/khelpcenter/searchhandler.cpp
+++ b/khelpcenter/searchhandler.cpp
@@ -37,7 +37,7 @@ using namespace KHC;
SearchHandler::SearchHandler()
{
- mLang = KGlobal::locale()->language().left( 2 );
+ mLang = TDEGlobal::locale()->language().left( 2 );
}
SearchHandler *SearchHandler::initFromFile( const TQString &filename )
@@ -102,7 +102,7 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
kdDebug() << "SearchHandler::search() CMD: " << cmdString << endl;
- KProcess *proc = new KProcess();
+ TDEProcess *proc = new TDEProcess();
TQStringList cmd = TQStringList::split( " ", cmdString );
TQStringList::ConstIterator it;
@@ -114,12 +114,12 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
*proc << arg.utf8();
}
- 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 * ) ) );
+ connect( proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+ TQT_SLOT( searchStdout( TDEProcess *, char *, int ) ) );
+ connect( proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+ TQT_SLOT( searchStderr( TDEProcess *, char *, int ) ) );
+ connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
+ TQT_SLOT( searchExited( TDEProcess * ) ) );
SearchJob *searchJob = new SearchJob;
searchJob->mEntry = entry;
@@ -128,7 +128,7 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
mProcessJobs.insert( proc, searchJob );
- if ( !proc->start( KProcess::NotifyOnExit, KProcess::All ) ) {
+ if ( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
TQString txt = i18n("Error executing search command '%1'.").arg( cmdString );
emit searchFinished( this, entry, txt );
}
@@ -155,7 +155,7 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
}
}
-void SearchHandler::searchStdout( KProcess *proc, char *buffer, int len )
+void SearchHandler::searchStdout( TDEProcess *proc, char *buffer, int len )
{
if ( !buffer || len == 0 )
return;
@@ -166,7 +166,7 @@ void SearchHandler::searchStdout( KProcess *proc, char *buffer, int len )
p = strncpy( p, buffer, len );
p[len] = '\0';
- TQMap<KProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
+ TQMap<TDEProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
if ( it != mProcessJobs.end() ) {
(*it)->mResult += bufferStr.fromUtf8( p );
}
@@ -174,18 +174,18 @@ void SearchHandler::searchStdout( KProcess *proc, char *buffer, int len )
free( p );
}
-void SearchHandler::searchStderr( KProcess *proc, char *buffer, int len )
+void SearchHandler::searchStderr( TDEProcess *proc, char *buffer, int len )
{
if ( !buffer || len == 0 )
return;
- TQMap<KProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
+ TQMap<TDEProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
if ( it != mProcessJobs.end() ) {
(*it)->mError += TQString::fromUtf8( buffer, len );
}
}
-void SearchHandler::searchExited( KProcess *proc )
+void SearchHandler::searchExited( TDEProcess *proc )
{
// kdDebug() << "SearchHandler::searchExited()" << endl;
@@ -193,7 +193,7 @@ void SearchHandler::searchExited( KProcess *proc )
TQString error;
DocEntry *entry = 0;
- TQMap<KProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
+ TQMap<TDEProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
if ( it != mProcessJobs.end() ) {
SearchJob *j = *it;
entry = j->mEntry;
diff --git a/khelpcenter/searchhandler.h b/khelpcenter/searchhandler.h
index 13a6a56c..356446db 100644
--- a/khelpcenter/searchhandler.h
+++ b/khelpcenter/searchhandler.h
@@ -38,7 +38,7 @@ class SearchJob
DocEntry *mEntry;
- KProcess *mProcess;
+ TDEProcess *mProcess;
KIO::Job *mKioJob;
TQString mCmd;
@@ -71,9 +71,9 @@ class SearchHandler : public QObject
bool checkBinary( const TQString &cmd ) const;
protected slots:
- void searchStdout( KProcess *proc, char *buffer, int buflen );
- void searchStderr( KProcess *proc, char *buffer, int buflen );
- void searchExited( KProcess *proc );
+ void searchStdout( TDEProcess *proc, char *buffer, int buflen );
+ void searchStderr( TDEProcess *proc, char *buffer, int buflen );
+ void searchExited( TDEProcess *proc );
void slotJobResult( KIO::Job *job );
void slotJobData( KIO::Job *, const TQByteArray &data );
@@ -88,7 +88,7 @@ class SearchHandler : public QObject
TQString mIndexCommand;
TQStringList mDocumentTypes;
- TQMap<KProcess *,SearchJob *> mProcessJobs;
+ TQMap<TDEProcess *,SearchJob *> mProcessJobs;
TQMap<KIO::Job *,SearchJob *> mKioJobs;
};
diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp
index 39b57bf3..df04f953 100644
--- a/khelpcenter/searchwidget.cpp
+++ b/khelpcenter/searchwidget.cpp
@@ -111,7 +111,7 @@ SearchWidget::SearchWidget( SearchEngine *engine, TQWidget *parent )
SearchWidget::~SearchWidget()
{
- writeConfig( KGlobal::config() );
+ writeConfig( TDEGlobal::config() );
}
@@ -311,7 +311,7 @@ int ScopeTraverser::mNestingLevel = 2;
void SearchWidget::searchIndexUpdated()
{
- KGlobal::config()->reparseConfiguration();
+ TDEGlobal::config()->reparseConfiguration();
updateScopeList();
update();
}
diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp
index d9b1752c..19bcb01c 100644
--- a/khelpcenter/toc.cpp
+++ b/khelpcenter/toc.cpp
@@ -78,7 +78,7 @@ void TOC::build( const TQString &file )
{
TQFileInfo fileInfo( file );
TQString fileName = fileInfo.absFilePath();
- const TQStringList resourceDirs = KGlobal::dirs()->resourceDirs( "html" );
+ const TQStringList resourceDirs = TDEGlobal::dirs()->resourceDirs( "html" );
TQStringList::ConstIterator it = resourceDirs.begin();
TQStringList::ConstIterator end = resourceDirs.end();
for ( ; it != end; ++it ) {
@@ -132,19 +132,19 @@ int TOC::cachedCTime() const
void TOC::buildCache()
{
- KProcess *meinproc = new KProcess;
- connect( meinproc, TQT_SIGNAL( processExited( KProcess * ) ),
- this, TQT_SLOT( meinprocExited( KProcess * ) ) );
+ TDEProcess *meinproc = new TDEProcess;
+ connect( meinproc, TQT_SIGNAL( processExited( TDEProcess * ) ),
+ this, TQT_SLOT( meinprocExited( TDEProcess * ) ) );
*meinproc << locate( "exe", "meinproc" );
*meinproc << "--stylesheet" << locate( "data", "khelpcenter/table-of-contents.xslt" );
*meinproc << "--output" << m_cacheFile;
*meinproc << m_sourceFile;
- meinproc->start( KProcess::NotifyOnExit );
+ meinproc->start( TDEProcess::NotifyOnExit );
}
-void TOC::meinprocExited( KProcess *meinproc )
+void TOC::meinprocExited( TDEProcess *meinproc )
{
if ( !meinproc->normalExit() || meinproc->exitStatus() != 0 ) {
delete meinproc;
diff --git a/khelpcenter/toc.h b/khelpcenter/toc.h
index 27011223..0a38c2ad 100644
--- a/khelpcenter/toc.h
+++ b/khelpcenter/toc.h
@@ -26,7 +26,7 @@
#include <tqlistview.h>
#include <tqobject.h>
-class KProcess;
+class TDEProcess;
namespace KHC {
@@ -47,7 +47,7 @@ class TOC : public QObject
private slots:
void slotItemSelected( TQListViewItem *item );
- void meinprocExited( KProcess *meinproc );
+ void meinprocExited( TDEProcess *meinproc );
private:
enum CacheStatus { NeedRebuild, CacheOk };
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index 3a559409..5e29114b 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -149,12 +149,12 @@ TQString View::langLookup( const TQString &fname )
TQStringList search;
// assemble the local search paths
- const TQStringList localDoc = KGlobal::dirs()->resourceDirs("html");
+ const TQStringList localDoc = TDEGlobal::dirs()->resourceDirs("html");
// look up the different languages
for (int id=localDoc.count()-1; id >= 0; --id)
{
- TQStringList langs = KGlobal::locale()->languageList();
+ TQStringList langs = TDEGlobal::locale()->languageList();
langs.append( "en" );
langs.remove( "C" );
TQStringList::ConstIterator lang;
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 45c406d0..5f1ca3df 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -51,7 +51,7 @@ extern "C"
KDE_EXPORT KCModule* create_khotkeys( TQWidget* parent_P, const char* name_P )
{
// sleep( 20 ); // CHECKME DEBUG
- KGlobal::locale()->insertCatalogue("khotkeys");
+ TDEGlobal::locale()->insertCatalogue("khotkeys");
KHotKeys::Module* ret = new KHotKeys::Module( parent_P, name_P );
ret->load(); // CHECKME
return ret;
diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp
index 2d0d23b1..990cd4ff 100644
--- a/khotkeys/kcontrol/menuedit.cpp
+++ b/khotkeys/kcontrol/menuedit.cpp
@@ -39,7 +39,7 @@ static TQObject* owner = NULL;
void khotkeys_init()
{
// I hope this works
- KGlobal::locale()->insertCatalogue("khotkeys");
+ TDEGlobal::locale()->insertCatalogue("khotkeys");
// CHECKME hack
assert( owner == NULL );
owner = new TQObject;
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp
index cb13893c..e25b1c35 100644
--- a/khotkeys/shared/actions.cpp
+++ b/khotkeys/shared/actions.cpp
@@ -292,9 +292,9 @@ void Dcop_action::execute()
}
}
kdDebug( 1217 ) << "DCOP call:" << app << ":" << obj << ":" << call << ":" << args_list << endl;
- KProcess proc;
+ TDEProcess proc;
proc << "dcop" << app << obj << call << args_list;
- proc.start( KProcess::DontCare );
+ proc.start( TDEProcess::DontCare );
}
TQString Dcop_action::description() const
diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp
index 10a52a55..25cc1c46 100644
--- a/khotkeys/shared/input.cpp
+++ b/khotkeys/shared/input.cpp
@@ -43,7 +43,7 @@ Kbd::Kbd( bool grabbing_enabled_P, TQObject* parent_P )
{
assert( keyboard_handler == NULL );
keyboard_handler = this;
- kga = new KGlobalAccel( NULL );
+ kga = new TDEGlobalAccel( NULL );
kga->setEnabled( grabbing_enabled_P );
}
@@ -122,7 +122,7 @@ void Kbd::ungrab_shortcut( const KShortcut& shortcut_P )
if( --grabs[ shortcut_P ] == 0 )
{
#if 0
- // CHECKME workaround for KGlobalAccel::disconnectItem() not working
+ // CHECKME workaround for TDEGlobalAccel::disconnectItem() not working
kga->setItemEnabled( ' ' + TQString::number( keycode_P ), false );
// kga->disconnectItem( ' ' + TQString::number( keycode_P ), NULL, NULL );
kga->removeItem( ' ' + TQString::number( keycode_P ));
diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h
index f7436894..08b71b76 100644
--- a/khotkeys/shared/input.h
+++ b/khotkeys/shared/input.h
@@ -21,7 +21,7 @@
#include <X11/X.h>
#include <fixx11h.h>
-class KGlobalAccel;
+class TDEGlobalAccel;
namespace KHotKeys
{
@@ -60,7 +60,7 @@ class Kbd
};
TQMap< Kbd_receiver*, Receiver_data > receivers;
TQMap< KShortcut, int > grabs;
- KGlobalAccel* kga;
+ TDEGlobalAccel* kga;
};
class Mouse
diff --git a/khotkeys/shared/khotkeysglobal.cpp b/khotkeys/shared/khotkeysglobal.cpp
index 4c6b8360..272c5c1c 100644
--- a/khotkeys/shared/khotkeysglobal.cpp
+++ b/khotkeys/shared/khotkeysglobal.cpp
@@ -61,7 +61,7 @@ bool khotkeys_active()
// "/opt/kde2/share/applnk/System/konsole.desktop" -> "System/konsole.desktop"
TQString get_menu_entry_from_path( const TQString& path_P )
{
- TQStringList dirs = KGlobal::dirs()->resourceDirs( "apps" );
+ TQStringList dirs = TDEGlobal::dirs()->resourceDirs( "apps" );
for( TQStringList::ConstIterator it = dirs.begin();
it != dirs.end();
++it )
diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp
index a6515fec..07ab899f 100644
--- a/khotkeys/shared/voices.cpp
+++ b/khotkeys/shared/voices.cpp
@@ -205,7 +205,7 @@ void Voice::set_shortcut( const KShortcut &shortcut)
if( !_enabled )
return;
if(!_kga)
- _kga = new KGlobalAccel( this );
+ _kga = new TDEGlobalAccel( this );
_kga->remove("voice");
_kga->insert( "voice", i18n("Voice"), TQString::null, shortcut, 0, this, TQT_SLOT(slot_key_pressed())) ;
diff --git a/khotkeys/shared/voices.h b/khotkeys/shared/voices.h
index 0f8496d8..abb5858b 100644
--- a/khotkeys/shared/voices.h
+++ b/khotkeys/shared/voices.h
@@ -16,7 +16,7 @@
class Sound;
class TQTimer;
-class KGlobalAccel;
+class TDEGlobalAccel;
namespace KHotKeys
{
@@ -70,7 +70,7 @@ class KDE_EXPORT Voice : public TQObject
SoundRecorder *_recorder;
KShortcut _shortcut;
- KGlobalAccel *_kga;
+ TDEGlobalAccel *_kga;
TQTimer *_timer;
};
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index ced1fb36..b29d52f1 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -218,7 +218,7 @@ PlainClock::PlainClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, cons
int PlainClock::preferedWidthForHeight(int ) const
{
- TQString maxLengthTime = KGlobal::locale()->formatTime( TQTime( 23, 59 ), _prefs->plainShowSeconds());
+ TQString maxLengthTime = TDEGlobal::locale()->formatTime( TQTime( 23, 59 ), _prefs->plainShowSeconds());
return fontMetrics().width( maxLengthTime ) + 8;
}
@@ -231,7 +231,7 @@ int PlainClock::preferedHeightForWidth(int /*w*/) const
void PlainClock::updateClock()
{
- TQString newStr = KGlobal::locale()->formatTime(_applet->clockGetTime(), _prefs->plainShowSeconds());
+ TQString newStr = TDEGlobal::locale()->formatTime(_applet->clockGetTime(), _prefs->plainShowSeconds());
if (_force || newStr != _timeStr) {
_timeStr = newStr;
@@ -334,7 +334,7 @@ void DigitalClock::updateClock()
if (_prefs->digitalShowSeconds())
format += sep + "%02d";
- if (KGlobal::locale()->use12Clock()) {
+ if (TDEGlobal::locale()->use12Clock()) {
if (h > 12)
h -= 12;
else if( h == 0)
@@ -940,8 +940,8 @@ ClockApplet::~ClockApplet()
{
delete m_shadowEngine;
//reverse for the moment
- KGlobal::locale()->removeCatalogue("clockapplet");
- KGlobal::locale()->removeCatalogue("timezones"); // For time zone translations
+ TDEGlobal::locale()->removeCatalogue("clockapplet");
+ TDEGlobal::locale()->removeCatalogue("timezones"); // For time zone translations
if (_calendar)
{
@@ -1019,7 +1019,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.
- TQString dateFormat = KGlobal::locale()->dateFormatShort();
+ TQString dateFormat = TDEGlobal::locale()->dateFormatShort();
dateFirst = dateFormat.at(1) == 'y' || dateFormat.at(1) == 'Y';
}
@@ -1508,7 +1508,7 @@ void ClockApplet::contextMenuActivated(int result)
return;
};
- KProcess proc;
+ TDEProcess proc;
switch (result)
{
case 102:
@@ -1519,13 +1519,13 @@ void ClockApplet::contextMenuActivated(int result)
proc << "--nonewdcop";
proc << TQString("%1 tde-clock.desktop --lang %2")
.arg(locate("exe", "kcmshell"))
- .arg(KGlobal::locale()->language());
- proc.start(KProcess::DontCare);
+ .arg(TDEGlobal::locale()->language());
+ proc.start(TDEProcess::DontCare);
break;
case 104:
proc << locate("exe", "kcmshell");
proc << "tde-language.desktop";
- proc.start(KProcess::DontCare);
+ proc.start(TDEProcess::DontCare);
break;
case 110:
preferences(true);
@@ -1540,7 +1540,7 @@ void ClockApplet::aboutToShowContextMenu()
menu->clear();
menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) );
- KLocale *loc = KGlobal::locale();
+ KLocale *loc = TDEGlobal::locale();
TQDateTime dt = TQDateTime::currentDateTime();
dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset));
@@ -1694,7 +1694,7 @@ void ClockApplet::positionChange(Position p)
void ClockApplet::updateDateLabel(bool reLayout)
{
_lastDate = clockGetDate();
- _dayOfWeek->setText(KGlobal::locale()->calendar()->weekDayName(_lastDate));
+ _dayOfWeek->setText(TDEGlobal::locale()->calendar()->weekDayName(_lastDate));
if (zone->zoneIndex() != 0)
{
@@ -1704,7 +1704,7 @@ void ClockApplet::updateDateLabel(bool reLayout)
}
else
{
- TQString dateStr = KGlobal::locale()->formatDate(_lastDate, true);
+ TQString dateStr = TDEGlobal::locale()->formatDate(_lastDate, true);
_date->setText(dateStr);
_date->setShown(showDate);
}
@@ -1728,9 +1728,9 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
TQString activeZone = zone->zone();
if (zoneCount == 0)
{
- TQString _time = KGlobal::locale()->formatTime(clockGetTime(),
+ TQString _time = TDEGlobal::locale()->formatTime(clockGetTime(),
_prefs->plainShowSeconds());
- TQString _date = KGlobal::locale()->formatDate(clockGetDate(), false);
+ TQString _date = TDEGlobal::locale()->formatDate(clockGetDate(), false);
data.message = _time;
data.subtext = _date;
@@ -1754,9 +1754,9 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
m_zone = i18n(m_zone.utf8()); // ensure it gets translated
}
- TQString _time = KGlobal::locale()->formatTime(clockGetTime(),
+ TQString _time = TDEGlobal::locale()->formatTime(clockGetTime(),
_prefs->plainShowSeconds());
- TQString _date = KGlobal::locale()->formatDate(clockGetDate(), false);
+ TQString _date = TDEGlobal::locale()->formatDate(clockGetDate(), false);
if (activeIndex == i)
{
@@ -1840,11 +1840,11 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
(m_clock->type() == Prefs::EnumType::Analog) )
{
// show full time (incl. hour) as tooltip for Fuzzy clock
- tipText = KGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset)));
+ tipText = TDEGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset)));
}
else
{
- tipText = KGlobal::locale()->formatDate(m_clock->clockGetDate());
+ tipText = TDEGlobal::locale()->formatDate(m_clock->clockGetDate());
}
if (m_clock->timezones() && m_clock->timezones()->zoneIndex() > 0)
diff --git a/kicker/applets/clock/clockapplet.kcfg b/kicker/applets/clock/clockapplet.kcfg
index e5b461e1..91c04333 100644
--- a/kicker/applets/clock/clockapplet.kcfg
+++ b/kicker/applets/clock/clockapplet.kcfg
@@ -29,7 +29,7 @@
<entry name="DateFont" type="Font" key="Font">
<label>Font for the clock.</label>
<code>
-TQFont defFont=KGlobalSettings::generalFont();
+TQFont defFont=TDEGlobalSettings::generalFont();
defFont.setPointSize(8);
</code>
<default code="true">defFont</default>
@@ -55,7 +55,7 @@ defFont.setPointSize(8);
<entry name="PlainFont" type="Font" key="Font">
<label>Font for the clock.</label>
<code>
-defFont=KGlobalSettings::generalFont();
+defFont=TDEGlobalSettings::generalFont();
defFont.setPointSize(8);
defFont.setBold(true);
</code>
@@ -162,7 +162,7 @@ defFont.setBold(true);
<entry name="FuzzyFont" type="Font" key="Font">
<label>Font for the clock.</label>
<code>
-defFont=KGlobalSettings::generalFont();
+defFont=TDEGlobalSettings::generalFont();
</code>
<default code="true">defFont</default>
</entry>
diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp
index a21a6275..9b89da87 100644
--- a/kicker/applets/clock/init.cpp
+++ b/kicker/applets/clock/init.cpp
@@ -70,8 +70,8 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("clockapplet");
- KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
+ TDEGlobal::locale()->insertCatalogue("clockapplet");
+ TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
return new ClockApplet(configFile, KPanelApplet::Normal,
KPanelApplet::Preferences, parent, "clockapplet");
}
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 24861481..47228e62 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -132,7 +132,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group,
TQPixmap pxmap;
// Load icon
if (_kurl.url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
- pxmap = KGlobal::iconLoader()->loadIcon("desktop", _group, _force_size, _state);
+ pxmap = TDEGlobal::iconLoader()->loadIcon("desktop", _group, _force_size, _state);
}
else {
pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state);
@@ -231,7 +231,7 @@ void QuickButton::mouseMoveEvent(TQMouseEvent *e)
{
if ((e->state() & Qt::LeftButton) == 0) return;
TQPoint p(e->pos() - _dragPos);
- if (p.manhattanLength() <= KGlobalSettings::dndEventDelay())
+ if (p.manhattanLength() <= TDEGlobalSettings::dndEventDelay())
return;
DEBUGSTR<<"dragstart"<<endl<<flush;
setDown(false);
@@ -344,7 +344,7 @@ void QuickButton::updateKickerTip(KickerTip::Data &data)
data.subtext = data.message;
}
if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
- data.icon = KGlobal::iconLoader()->loadIcon("desktop", KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
+ data.icon = TDEGlobal::iconLoader()->loadIcon("desktop", KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
}
else {
data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 7c693fc8..ee72d58b 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -71,7 +71,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("quicklauncher");
+ TDEGlobal::locale()->insertCatalogue("quicklauncher");
return new QuickLauncher(configFile, KPanelApplet::Normal,
KPanelApplet::Preferences,
parent, "quicklauncher");
@@ -143,7 +143,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
QuickLauncher::~QuickLauncher()
{
- KGlobal::locale()->removeCatalogue("quicklauncher");
+ TDEGlobal::locale()->removeCatalogue("quicklauncher");
setCustomMenu(0);
delete m_popup;
delete m_appletPopup;
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index daec7a98..00187fb3 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -48,7 +48,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("lockout");
+ TDEGlobal::locale()->insertCatalogue("lockout");
return new Lockout(configFile, parent, "lockout");
}
}
@@ -105,7 +105,7 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
Lockout::~Lockout()
{
- KGlobal::locale()->removeCatalogue("lockout");
+ TDEGlobal::locale()->removeCatalogue("lockout");
}
// the -2 is due to kicker allowing us a width/height of 42 and the buttons
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index 61aefd67..28d982e4 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -35,7 +35,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
{
- KGlobal::locale()->insertCatalogue("mediaapplet");
+ TDEGlobal::locale()->insertCatalogue("mediaapplet");
return new MediaApplet(configFile, KPanelApplet::Normal,
KPanelApplet::About | KPanelApplet::Preferences,
parent, "mediaapplet");
@@ -84,7 +84,7 @@ MediaApplet::~MediaApplet()
delete b;
}
- KGlobal::locale()->removeCatalogue("mediaapplet");
+ TDEGlobal::locale()->removeCatalogue("mediaapplet");
}
void MediaApplet::about()
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index 2b864e33..1a0ab5eb 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -61,7 +61,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P )
{
- KGlobal::locale()->insertCatalogue("kmenuapplet");
+ TDEGlobal::locale()->insertCatalogue("kmenuapplet");
return new KickerMenuApplet::Applet( configFile_P, parent_P );
}
}
@@ -102,7 +102,7 @@ Applet::~Applet()
delete selection;
delete selection_watcher;
delete module;
- KGlobal::locale()->removeCatalogue("kmenuapplet");
+ TDEGlobal::locale()->removeCatalogue("kmenuapplet");
}
void Applet::windowAdded( WId w_P )
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 6ab7febf..c6a2fdc9 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -75,7 +75,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("kminipagerapplet");
+ TDEGlobal::locale()->insertCatalogue("kminipagerapplet");
return new KMiniPager(configFile, KPanelApplet::Normal, 0, parent, "kminipagerapplet");
}
}
@@ -112,7 +112,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
m_group->setFrameStyle(TQFrame::NoFrame);
m_group->setExclusive( true );
- setFont( KGlobalSettings::taskbarFont() );
+ setFont( TDEGlobalSettings::taskbarFont() );
m_twin = new KWinModule(TQT_TQOBJECT(this));
m_activeWindow = m_twin->activeWindow();
@@ -164,7 +164,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
KMiniPager::~KMiniPager()
{
- KGlobal::locale()->removeCatalogue("kminipagerapplet");
+ TDEGlobal::locale()->removeCatalogue("kminipagerapplet");
delete m_contextMenu;
delete m_settings;
delete m_shadowEngine;
@@ -897,10 +897,10 @@ void KMiniPager::showPager()
TQString strAppPath(locate("exe", "kpager"));
if (!strAppPath.isEmpty())
{
- KProcess process;
+ TDEProcess process;
process << strAppPath;
process << "--hidden";
- process.start(KProcess::DontCare);
+ process.start(TDEProcess::DontCare);
}
}
}
diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h
index 9aa37001..9abe65f3 100644
--- a/kicker/applets/minipager/pagerapplet.h
+++ b/kicker/applets/minipager/pagerapplet.h
@@ -37,7 +37,7 @@ class TQButtonGroup;
class TQGridLayout;
class TQTimer;
-class KProcess;
+class TDEProcess;
class KWinModule;
class KTextShadowEngine;
class KSelectionOwner;
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index b7a1590c..b9af7efc 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -576,7 +576,7 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e)
}
if (m_currentWindow && !m_pager->clickPos.isNull() &&
- (m_pager->clickPos - e->pos()).manhattanLength() > KGlobalSettings::dndEventDelay())
+ (m_pager->clickPos - e->pos()).manhattanLength() > TDEGlobalSettings::dndEventDelay())
{
TQRect r = m_currentWindow->geometry();
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index c7b50d4a..eb663814 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -40,7 +40,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget * parent, const TQString & configFile)
{
- KGlobal::locale()->insertCatalogue("naughtyapplet");
+ TDEGlobal::locale()->insertCatalogue("naughtyapplet");
return new NaughtyApplet
(
@@ -63,7 +63,7 @@ NaughtyApplet::NaughtyApplet
)
: KPanelApplet(configFile, t, actions, parent, name)
{
- KGlobal::iconLoader()->addAppDir("naughtyapplet");
+ TDEGlobal::iconLoader()->addAppDir("naughtyapplet");
setBackgroundOrigin( AncestorOrigin );
button_ = new SimpleButton(this);
@@ -99,7 +99,7 @@ NaughtyApplet::NaughtyApplet
NaughtyApplet::~NaughtyApplet()
{
- KGlobal::locale()->removeCatalogue("naughtyapplet");
+ TDEGlobal::locale()->removeCatalogue("naughtyapplet");
}
void
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index fb7ac107..0f33f74d 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -44,7 +44,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("krunapplet");
+ TDEGlobal::locale()->insertCatalogue("krunapplet");
return new RunApplet(configFile, KPanelApplet::Stretch, 0, parent, "krunapplet");
}
}
@@ -87,8 +87,8 @@ RunApplet::RunApplet(const TQString& configFile, Type type, int actions,
_input->completionObject()->setItems(list);
list = c->readListEntry("History list");
_input->setHistoryItems(list);
- int mode = c->readNumEntry( "CompletionMode", KGlobalSettings::completionMode() );
- _input->setCompletionMode( (KGlobalSettings::Completion) mode );
+ int mode = c->readNumEntry( "CompletionMode", TDEGlobalSettings::completionMode() );
+ _input->setCompletionMode( (TDEGlobalSettings::Completion) mode );
_filterData = new KURIFilterData();
@@ -110,7 +110,7 @@ RunApplet::~RunApplet()
c->sync();
delete _filterData;
- KGlobal::locale()->removeCatalogue("krunapplet");
+ TDEGlobal::locale()->removeCatalogue("krunapplet");
}
void RunApplet::resizeEvent(TQResizeEvent*)
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index 21a36f35..b5910e3b 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -255,7 +255,7 @@ void SwallowApplet::removeApplet( SwallowApp *app )
///////////////////////////////////////////////////////////////////
-static void parseCommand(KProcess *proc, TQString cmd)
+static void parseCommand(TDEProcess *proc, TQString cmd)
{
int pos;
@@ -282,15 +282,15 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent,
this, TQT_SLOT(windowAdded(WId)));
if (!swc->cmdline.isEmpty()) {
- KProcess *process = new KProcess;
+ TDEProcess *process = new TDEProcess;
parseCommand(process, swc->cmdline);
// move window out of sight
// *process << "-geometry";
// *process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height());
- connect(process, TQT_SIGNAL(processExited(KProcess*)),
- this, TQT_SLOT(processExited(KProcess*)));
+ connect(process, TQT_SIGNAL(processExited(TDEProcess*)),
+ this, TQT_SLOT(processExited(TDEProcess*)));
process->start();
}
@@ -340,7 +340,7 @@ void SwallowApp::windowAdded(WId win)
}
-void SwallowApp::processExited(KProcess *)
+void SwallowApp::processExited(TDEProcess *)
{
SwallowApplet::removeApplet( this ); // also deletes this app
}
diff --git a/kicker/applets/swallow/swallow.h b/kicker/applets/swallow/swallow.h
index 437c3fa8..72795cc7 100644
--- a/kicker/applets/swallow/swallow.h
+++ b/kicker/applets/swallow/swallow.h
@@ -28,7 +28,7 @@
class TQBoxLayout;
class KConfig;
-class KProcess;
+class TDEProcess;
class KWinModule;
class SwallowApp;
@@ -61,7 +61,7 @@ public: // for KPanelApplet
int heightForWidth( int h );
void windowAdded(WId win);
- void processExited(KProcess *proc);
+ void processExited(TDEProcess *proc);
public slots:
virtual void preferences();
@@ -102,10 +102,10 @@ signals:
protected slots:
void windowAdded(WId win);
- void processExited(KProcess *proc);
+ void processExited(TDEProcess *proc);
private:
- KProcess *process;
+ TDEProcess *process;
TQString winTitle;
float wh_ratio;
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 0079ee9f..d10fd107 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -64,7 +64,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("ksystemtrayapplet");
+ TDEGlobal::locale()->insertCatalogue("ksystemtrayapplet");
return new SystemTrayApplet(configFile, KPanelApplet::Normal,
KPanelApplet::Preferences, parent, "ksystemtrayapplet");
}
@@ -201,7 +201,7 @@ SystemTrayApplet::~SystemTrayApplet()
if (m_leftSpacer) delete m_leftSpacer;
if (m_rightSpacer) delete m_rightSpacer;
- KGlobal::locale()->removeCatalogue("ksystemtrayapplet");
+ TDEGlobal::locale()->removeCatalogue("ksystemtrayapplet");
}
bool SystemTrayApplet::x11Event( XEvent *e )
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp
index 083a7e59..2d72e23f 100644
--- a/kicker/applets/taskbar/taskbarapplet.cpp
+++ b/kicker/applets/taskbar/taskbarapplet.cpp
@@ -41,7 +41,7 @@ extern "C"
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" );
+ TDEGlobal::locale()->insertCatalogue( "ktaskbarapplet" );
int options = 0;
if (kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
options = KPanelApplet::Preferences;
@@ -67,7 +67,7 @@ TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions
TaskbarApplet::~TaskbarApplet()
{
// FIXME: what about TWO taskbars?
- KGlobal::locale()->removeCatalogue( "ktaskbarapplet" );
+ TDEGlobal::locale()->removeCatalogue( "ktaskbarapplet" );
}
int TaskbarApplet::widthForHeight(int h) const
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index 94d8a92d..6e1f1150 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -33,7 +33,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("trashapplet");
+ TDEGlobal::locale()->insertCatalogue("trashapplet");
return new TrashApplet(configFile, KPanelApplet::Normal,
KPanelApplet::About, parent, "trashapplet");
}
@@ -70,7 +70,7 @@ TrashApplet::~TrashApplet()
disconnect( mpDirLister, TQT_SIGNAL( clear() ),
this, TQT_SLOT( slotClear() ) );
delete mpDirLister;
- KGlobal::locale()->removeCatalogue("trashapplet");
+ TDEGlobal::locale()->removeCatalogue("trashapplet");
}
void TrashApplet::about()
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index 63944e71..71160cbe 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -46,7 +46,7 @@ extern "C"
{
KDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("dockbarextension");
+ TDEGlobal::locale()->insertCatalogue("dockbarextension");
return new DockBarExtension(configFile, KPanelExtension::Normal,
0, parent, "dockbarextension");
}
@@ -316,9 +316,9 @@ void DockBarExtension::loadContainerConfig()
DockContainer* c = new DockContainer(cmd, this, resName, resClass );
addContainer(c);
- KProcess proc;
+ TDEProcess proc;
proc << KShell::splitArgs( cmd );
- if (!proc.start(KProcess::DontCare)) {
+ if (!proc.start(TDEProcess::DontCare)) {
fail_list.append(cmd);
removeContainer(c);
}
diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog
index 8cbb3386..c8ee5516 100644
--- a/kicker/extensions/kasbar/ChangeLog
+++ b/kicker/extensions/kasbar/ChangeLog
@@ -594,7 +594,7 @@
2002-08-30 Friday 10:37 pfeiffer
- * use KGlobal::taskbarFont(), patch by CCMAIL: Luciano Montanaro
+ * use TDEGlobal::taskbarFont(), patch by CCMAIL: Luciano Montanaro
<mikelima@virgilio.it>
2002-08-29 Thursday 17:38 mueller
@@ -656,7 +656,7 @@
* grrr, I fixed that before 2.2.2 and it's back :(
- + KGlobal::locale()->insertCatalogue("kasbarextension");
+ + TDEGlobal::locale()->insertCatalogue("kasbarextension");
2002-02-26 Tuesday 17:04 elter
diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp
index 35028d9e..4d51d92e 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.cpp
+++ b/kicker/extensions/kasbar/kasaboutdlg.cpp
@@ -80,8 +80,8 @@
#include "kasaboutdlg.h"
#include "version.h"
-#define Icon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
-#define LargeIcon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
+#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
+#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
KasAboutDialog::KasAboutDialog( TQWidget *parent )
: KDialogBase( KDialogBase::IconList, i18n("About Kasbar"),
diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp
index 89fcad75..430d98c8 100644
--- a/kicker/extensions/kasbar/kasbar.cpp
+++ b/kicker/extensions/kasbar/kasbar.cpp
@@ -717,7 +717,7 @@ void KasBar::addTestItems()
KasItem *i = new KasItem( this );
insert( 0, i );
i->setText( "Animated" );
- i->setIcon( KGlobal::iconLoader()->loadIcon( "icons", KIcon::NoGroup, KIcon::SizeMedium ) );
+ i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", KIcon::NoGroup, KIcon::SizeMedium ) );
i->setAnimation( resources()->startupAnimation() );
TQTimer *aniTimer = new TQTimer( i, "aniTimer" );
connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) );
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index 169fe5b5..708aeb1e 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -77,7 +77,7 @@ int main( int argc, char **argv )
{
TDECmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING );
TDECmdLineArgs::addCmdLineOptions( options );
- KGlobal::locale()->setMainCatalogue( "kasbarextension" );
+ TDEGlobal::locale()->setMainCatalogue( "kasbarextension" );
TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index 3a3a023f..6e011cc7 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -76,7 +76,7 @@ extern "C"
{
KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile )
{
- KGlobal::locale()->insertCatalogue("kasbarextension");
+ TDEGlobal::locale()->insertCatalogue("kasbarextension");
return new KasBarExtension( configFile,
KPanelExtension::Normal,
KPanelExtension::About | KPanelExtension::Preferences,
@@ -109,7 +109,7 @@ KasBarExtension::~KasBarExtension()
{
if ( detached_ && (!kasbar.isNull()) )
kasbar->deleteLater();
- KGlobal::locale()->removeCatalogue("kasbarextension");
+ TDEGlobal::locale()->removeCatalogue("kasbarextension");
}
void KasBarExtension::setDetached( bool detach )
diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp
index 51dac687..6545f57e 100644
--- a/kicker/extensions/kasbar/kasclockitem.cpp
+++ b/kicker/extensions/kasbar/kasclockitem.cpp
@@ -75,8 +75,8 @@ KasPopup *KasClockItem::createPopup()
void KasClockItem::updateTime()
{
- setText( KGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) );
- lcd->display( KGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) );
+ setText( TDEGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) );
+ lcd->display( TDEGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) );
update();
}
diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp
index 7e23ce7f..638213e8 100644
--- a/kicker/extensions/kasbar/kasgroupitem.cpp
+++ b/kicker/extensions/kasbar/kasgroupitem.cpp
@@ -144,7 +144,7 @@ void KasGroupItem::updateIcon()
bool usedIconLoader = false;
Task::Ptr t = items.first();
if (!t)
- p = KGlobal::iconLoader()->loadIcon( "kicker",
+ p = TDEGlobal::iconLoader()->loadIcon( "kicker",
KIcon::NoGroup,
KIcon::SizeSmall );
@@ -157,7 +157,7 @@ void KasGroupItem::updateIcon()
p = t->bestIcon( sizes[kasbar()->itemSize()], usedIconLoader );
if ( p.isNull() )
- p = KGlobal::iconLoader()->loadIcon( "error", KIcon::NoGroup, KIcon::SizeSmall );
+ p = TDEGlobal::iconLoader()->loadIcon( "error", KIcon::NoGroup, KIcon::SizeSmall );
setIcon( p );
}
diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp
index 32314871..866f6eb5 100644
--- a/kicker/extensions/kasbar/kasitem.cpp
+++ b/kicker/extensions/kasbar/kasitem.cpp
@@ -341,7 +341,7 @@ void KasItem::paintLabel( TQPainter *p )
}
}
- p->setFont( KGlobalSettings::taskbarFont() );
+ p->setFont( TDEGlobalSettings::taskbarFont() );
p->setPen( resources()->labelPenColor() );
if ( fontMetrics().width( text ) > extent()-4 )
@@ -405,7 +405,7 @@ void KasItem::paintArrowLabel( TQPainter *p, int arrowSize, bool arrowOnLeft )
w -= arrowSize;
}
- p->setFont( KGlobalSettings::taskbarFont() );
+ p->setFont( TDEGlobalSettings::taskbarFont() );
p->setPen( resources()->labelPenColor() );
if ( fontMetrics().width( text ) > w )
p->drawText( lx, ly, w, h-1, AlignLeft | AlignVCenter, text );
diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp
index 6dd39517..42199272 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.cpp
+++ b/kicker/extensions/kasbar/kasprefsdlg.cpp
@@ -75,8 +75,8 @@
#include "kasprefsdlg.h"
#include "kasprefsdlg.moc"
-#define Icon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
-#define LargeIcon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
+#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
+#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
KasPrefsDialog::KasPrefsDialog( KasTasker *kas, TQWidget *parent )
diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp
index 41adc524..6011612e 100644
--- a/kicker/extensions/kasbar/kasstartupitem.cpp
+++ b/kicker/extensions/kasbar/kasstartupitem.cpp
@@ -98,33 +98,33 @@ TQPixmap KasStartupItem::icon() const
switch( kasbar()->itemSize() ) {
case KasBar::Small:
/* ***** NOP ******
- pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(),
+ pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeSmall );
*/
break;
case KasBar::Medium:
- pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(),
+ pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeMedium );
break;
case KasBar::Large:
- pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(),
+ pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeLarge );
break;
case KasBar::Huge:
- pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(),
+ pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeHuge );
break;
case KasBar::Enormous:
- pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(),
+ pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeEnormous );
break;
default:
- pixmap = KGlobal::iconLoader()->loadIcon( "error",
+ pixmap = TDEGlobal::iconLoader()->loadIcon( "error",
KIcon::NoGroup,
KIcon::SizeSmall );
}
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index 8b6714ca..ae775171 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -85,7 +85,7 @@
#include "kastaskitem.h"
#include "kasbarextension.h"
-#define Icon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
+#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
static const int CHECK_ATTENTION_DELAY = 2000;
@@ -350,11 +350,11 @@ void KasTaskItem::sendToTray()
TQString s;
s.setNum( task_->window() );
- KProcess proc;
+ TDEProcess proc;
proc << "ksystraycmd";
proc << "--wid" << s << "--hidden";
- bool ok = proc.start( KProcess::DontCare );
+ bool ok = proc.start( TDEProcess::DontCare );
if ( !ok ) {
kdWarning(1345) << "Unable to launch ksystraycmd" << endl;
KPassivePopup::message( i18n("Could Not Send to Tray"),
diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp
index 25c096a6..6529fafe 100644
--- a/kicker/extensions/kasbar/kastaskpopup.cpp
+++ b/kicker/extensions/kasbar/kastaskpopup.cpp
@@ -73,7 +73,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name )
{
this->item = item;
- setFont(KGlobalSettings::generalFont());
+ setFont(TDEGlobalSettings::generalFont());
setMouseTracking( true );
TQString text = item->task()->visibleIconicName();
diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp
index 6ae140a2..fe5acd1b 100644
--- a/kicker/extensions/sidebar/sidebarextension.cpp
+++ b/kicker/extensions/sidebar/sidebarextension.cpp
@@ -33,8 +33,8 @@ extern "C"
{
KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile )
{
- KGlobal::locale()->insertCatalogue("kickersidebarextension");
- KGlobal::locale()->insertCatalogue("konqueror");
+ TDEGlobal::locale()->insertCatalogue("kickersidebarextension");
+ TDEGlobal::locale()->insertCatalogue("konqueror");
return new SidebarExtension( configFile,
KPanelExtension::Normal,
0,
@@ -106,8 +106,8 @@ void SidebarExtension::openURLRequest( const KURL &url, const KParts::URLArgs &)
SidebarExtension::~SidebarExtension()
{
- KGlobal::locale()->removeCatalogue("kickersidebarextension");
- KGlobal::locale()->removeCatalogue("konqueror");
+ TDEGlobal::locale()->removeCatalogue("kickersidebarextension");
+ TDEGlobal::locale()->removeCatalogue("konqueror");
}
bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) {
diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp
index 047dc2be..2b2d6521 100644
--- a/kicker/extensions/taskbar/taskbarextension.cpp
+++ b/kicker/extensions/taskbar/taskbarextension.cpp
@@ -44,7 +44,7 @@ extern "C"
{
KDE_EXPORT KPanelExtension* init( TQWidget *parent, const TQString& configFile )
{
- KGlobal::locale()->insertCatalogue( "taskbarextension" );
+ TDEGlobal::locale()->insertCatalogue( "taskbarextension" );
return new TaskBarExtension( configFile, KPanelExtension::Stretch,
KPanelExtension::Preferences, parent, "taskbarextension" );
}
@@ -78,7 +78,7 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type,
TaskBarExtension::~TaskBarExtension()
{
- KGlobal::locale()->removeCatalogue( "taskbarextension" );
+ TDEGlobal::locale()->removeCatalogue( "taskbarextension" );
}
void TaskBarExtension::positionChange( Position p )
diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp
index 9f23741e..c35a8bf4 100644
--- a/kicker/kicker/buttons/desktopbutton.cpp
+++ b/kicker/kicker/buttons/desktopbutton.cpp
@@ -76,7 +76,7 @@ void DesktopButton::dragEnterEvent( TQDragEnterEvent *ev )
void DesktopButton::dropEvent( TQDropEvent *ev )
{
- KURL dPath ( KGlobalSettings::desktopPath() );
+ KURL dPath ( TDEGlobalSettings::desktopPath() );
KFileItem item( dPath, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown );
KonqOperations::doDrop( &item, dPath, ev, this );
PanelButton::dropEvent(ev);
diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp
index c953d075..808d0263 100644
--- a/kicker/kicker/buttons/nonkdeappbutton.cpp
+++ b/kicker/kicker/buttons/nonkdeappbutton.cpp
@@ -182,12 +182,12 @@ void NonKDEAppButton::dropEvent(TQDropEvent *ev)
deskFile.setDesktopGroup();
// ... and add it to the exec string
- execStr += KProcess::quote(deskFile.readURL()) + " ";
+ execStr += TDEProcess::quote(deskFile.readURL()) + " ";
}
else
{
// it's just a URL of some sort, add it directly to the exec
- execStr += KProcess::quote(url.path()) + " ";
+ execStr += TDEProcess::quote(url.path()) + " ";
}
}
@@ -223,7 +223,7 @@ void NonKDEAppButton::runCommand(const TQString& execStr)
// run in a terminal? ok! we find this in the config file in the
// [misc] group (this will usually be in kdeglobal, actually, which
// get merged into the application config automagically for us
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("misc");
TQString termStr = config->readPathEntry("Terminal", "konsole");
diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp
index f7322a97..57a61995 100644
--- a/kicker/kicker/buttons/servicebutton.cpp
+++ b/kicker/kicker/buttons/servicebutton.cpp
@@ -54,7 +54,7 @@ ServiceButton::ServiceButton(const KService::Ptr &service, TQWidget* parent)
{
if (_id.startsWith("/"))
{
- TQString tmp = KGlobal::dirs()->relativeLocation("appdata", _id);
+ TQString tmp = TDEGlobal::dirs()->relativeLocation("appdata", _id);
if (!tmp.startsWith("/"))
_id = ":"+tmp;
}
@@ -112,7 +112,7 @@ void ServiceButton::loadServiceFromId(const TQString &id)
if (_id.startsWith("/"))
{
- TQString tmp = KGlobal::dirs()->relativeLocation("appdata", _id);
+ TQString tmp = TDEGlobal::dirs()->relativeLocation("appdata", _id);
if (!tmp.startsWith("/"))
_id = ":"+tmp;
}
diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp
index c4238717..e224efe7 100644
--- a/kicker/kicker/core/container_base.cpp
+++ b/kicker/kicker/core/container_base.cpp
@@ -105,7 +105,7 @@ void BaseContainer::slotRemoved(KConfig* config)
{
if (!config)
{
- config = KGlobal::config();
+ config = TDEGlobal::config();
}
config->deleteGroup(appletId().latin1());
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 9af99e3a..37cd1516 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -172,7 +172,7 @@ void ExtensionContainer::init()
updateHighlightColor();
// if we were hidden when kicker quit, let's start out hidden as well!
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup(extensionId());
int tmp = config->readNumEntry("UserHidden", Unhidden);
if (tmp > Unhidden && tmp <= RightBottom)
@@ -359,7 +359,7 @@ void ExtensionContainer::readConfig()
void ExtensionContainer::writeConfig()
{
// kdDebug(1210) << "ExtensionContainer::writeConfig()" << endl;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup(extensionId());
config->writePathEntry("ConfigFile", _info.configFile());
@@ -387,7 +387,7 @@ void ExtensionContainer::showPanelMenu( const TQPoint& globalPos )
if (!_opMnu)
{
- KDesktopFile f(KGlobal::dirs()->findResource("extensions", _info.desktopFile()));
+ KDesktopFile f(TDEGlobal::dirs()->findResource("extensions", _info.desktopFile()));
_opMnu = new PanelExtensionOpMenu(f.readName(),
m_extension ? m_extension->actions() : 0,
this);
@@ -984,7 +984,7 @@ void ExtensionContainer::animatedHide(bool left)
// save our hidden status so that when kicker starts up again
// we'll come back in the same state
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup(extensionId());
config->writeEntry("UserHidden", userHidden());
@@ -1385,7 +1385,7 @@ void ExtensionContainer::positionChange(KPanelExtension::Position p)
void ExtensionContainer::updateHighlightColor()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("WM");
TQColor color = TQApplication::palette().active().highlight();
m_highlightColor = config->readColorEntry("activeBackground", &color);
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index 4d6f2992..fce133a0 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -87,7 +87,7 @@ ExtensionManager::~ExtensionManager()
void ExtensionManager::initialize()
{
// kdDebug(1210) << "ExtensionManager::loadContainerConfig()" << endl;
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
PluginManager* pm = PluginManager::the();
// set up the "main" panel
@@ -179,7 +179,7 @@ void ExtensionManager::configureMenubar(bool duringInit)
if( KConfigGroup( &menuConfig, "KDE" ).readBoolEntry("macStyle", false)
|| KConfigGroup( &menuConfig, "Menubar" ).readBoolEntry( "ShowMenubar", false ))
{
- if (KGlobal::dirs()->findResource("applets", "menuapplet.desktop").isEmpty() ||
+ if (TDEGlobal::dirs()->findResource("applets", "menuapplet.desktop").isEmpty() ||
m_menubarPanel)
{
return;
@@ -239,7 +239,7 @@ void ExtensionManager::migrateMenubar()
// panel, meaning kickerrc itself would have to be vastly modified
// with lots of complications. not work it IMHO.
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("General");
if (config->readBoolEntry("CheckedForMenubar", false))
@@ -322,7 +322,7 @@ void ExtensionManager::saveContainerConfig()
{
// kdDebug(1210) << "ExtensionManager::saveContainerConfig()" << endl;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
// build the extension list
TQStringList elist;
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index e965d376..864bcec6 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -96,26 +96,26 @@ Kicker::Kicker()
dcopClient()->setDefaultObject("Panel");
disableSessionManagement();
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");
- KGlobal::dirs()->addResourceType("specialbuttons", dataPathBase + "menuext");
- KGlobal::dirs()->addResourceType("applets", dataPathBase + "applets");
- KGlobal::dirs()->addResourceType("tiles", dataPathBase + "tiles");
- KGlobal::dirs()->addResourceType("extensions", dataPathBase + "extensions");
+ TDEGlobal::dirs()->addResourceType("mini", dataPathBase + "pics/mini");
+ TDEGlobal::dirs()->addResourceType("icon", dataPathBase + "pics");
+ TDEGlobal::dirs()->addResourceType("builtinbuttons", dataPathBase + "builtins");
+ TDEGlobal::dirs()->addResourceType("specialbuttons", dataPathBase + "menuext");
+ TDEGlobal::dirs()->addResourceType("applets", dataPathBase + "applets");
+ TDEGlobal::dirs()->addResourceType("tiles", dataPathBase + "tiles");
+ TDEGlobal::dirs()->addResourceType("extensions", dataPathBase + "extensions");
KImageIO::registerFormats();
- KGlobal::iconLoader()->addExtraDesktopThemes();
+ TDEGlobal::iconLoader()->addExtraDesktopThemes();
- KGlobal::locale()->insertCatalogue("tdmgreet");
- KGlobal::locale()->insertCatalogue("libkonq");
- KGlobal::locale()->insertCatalogue("libdmctl");
- KGlobal::locale()->insertCatalogue("libtaskbar");
+ TDEGlobal::locale()->insertCatalogue("tdmgreet");
+ TDEGlobal::locale()->insertCatalogue("libkonq");
+ TDEGlobal::locale()->insertCatalogue("libdmctl");
+ TDEGlobal::locale()->insertCatalogue("libtaskbar");
// initialize our keys
// note that this creates the KMenu by calling MenuManager::the()
- keys = new KGlobalAccel( TQT_TQOBJECT(this) );
+ keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
#define KICKER_ALL_BINDINGS
#include "kickerbindings.cpp"
keys->readSettings();
@@ -197,7 +197,7 @@ void Kicker::slotSettingsChanged(int category)
void Kicker::paletteChanged()
{
- KConfigGroup c(KGlobal::config(), "General");
+ KConfigGroup c(TDEGlobal::config(), "General");
KickerSettings::setTintColor(c.readColorEntry("TintColor",
&palette().active().mid()));
KickerSettings::self()->writeConfig();
@@ -227,7 +227,7 @@ void Kicker::configure()
{
static bool notFirstConfig = false;
- KConfig* c = KGlobal::config();
+ KConfig* c = TDEGlobal::config();
c->reparseConfiguration();
c->setGroup("General");
m_canAddContainers = !c->entryIsImmutable("Applets2");
diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h
index 0416bc5c..81fa8123 100644
--- a/kicker/kicker/core/kicker.h
+++ b/kicker/kicker/core/kicker.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class KCMultiDialog;
class KDirWatch;
-class KGlobalAccel;
+class TDEGlobalAccel;
class KWinModule;
class PanelKMenu;
class PanelPopupButton;
@@ -122,7 +122,7 @@ private slots:
private:
static void crashHandler(int signal);
- KGlobalAccel* keys;
+ TDEGlobalAccel* keys;
KWinModule* m_twinModule;
KCMultiDialog* m_configDialog;
bool m_canAddContainers;
diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp
index 1085bd43..893efdd4 100644
--- a/kicker/kicker/core/main.cpp
+++ b/kicker/kicker/core/main.cpp
@@ -99,7 +99,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
}
}
- KGlobal::locale()->setMainCatalogue("kicker");
+ TDEGlobal::locale()->setMainCatalogue("kicker");
TQCString appname;
if (kicker_screen_number == 0)
diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp
index 73fa0c2b..6b41f1c5 100644
--- a/kicker/kicker/core/panelextension.cpp
+++ b/kicker/kicker/core/panelextension.cpp
@@ -388,7 +388,7 @@ void PanelExtension::slotBuildOpMenu()
if (kapp->authorize("action/help"))
{
- KHelpMenu* help = new KHelpMenu( this, KGlobal::instance()->aboutData(), false);
+ KHelpMenu* help = new KHelpMenu( this, TDEGlobal::instance()->aboutData(), false);
_opMnu->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), help->menu());
}
_opMnu->adjustSize();
diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp
index d1706ada..0ac38610 100644
--- a/kicker/kicker/core/pluginmanager.cpp
+++ b/kicker/kicker/core/pluginmanager.cpp
@@ -55,28 +55,28 @@ PluginManager* PluginManager::the()
AppletInfo::List PluginManager::applets(bool sort, AppletInfo::List* list)
{
TQStringList rel;
- KGlobal::dirs()->findAllResources("applets", "*.desktop", false, true, rel);
+ TDEGlobal::dirs()->findAllResources("applets", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::Applet, sort, list);
}
AppletInfo::List PluginManager::extensions(bool sort, AppletInfo::List* list)
{
TQStringList rel;
- KGlobal::dirs()->findAllResources("extensions", "*.desktop", false, true, rel);
+ TDEGlobal::dirs()->findAllResources("extensions", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::Extension, sort, list);
}
AppletInfo::List PluginManager::builtinButtons(bool sort, AppletInfo::List* list)
{
TQStringList rel;
- KGlobal::dirs()->findAllResources("builtinbuttons", "*.desktop", false, true, rel);
+ TDEGlobal::dirs()->findAllResources("builtinbuttons", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::BuiltinButton, sort, list);
}
AppletInfo::List PluginManager::specialButtons(bool sort, AppletInfo::List* list)
{
TQStringList rel;
- KGlobal::dirs()->findAllResources("specialbuttons", "*.desktop", false, true, rel);
+ TDEGlobal::dirs()->findAllResources("specialbuttons", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::SpecialButton, sort, list);
}
@@ -113,7 +113,7 @@ AppletInfo::List PluginManager::plugins(const TQStringList& desktopFiles,
PluginManager::PluginManager()
{
- KConfigGroup generalGroup(KGlobal::config(), "General");
+ KConfigGroup generalGroup(TDEGlobal::config(), "General");
m_untrustedApplets = generalGroup.readListEntry("UntrustedApplets");
m_untrustedExtensions = generalGroup.readListEntry("UntrustedExtensions");
}
@@ -250,13 +250,13 @@ AppletContainer* PluginManager::createAppletContainer(
TQWidget* parent,
bool isImmutable)
{
- TQString desktopPath = KGlobal::dirs()->findResource( "applets", desktopFile );
+ TQString desktopPath = TDEGlobal::dirs()->findResource( "applets", desktopFile );
// KDE4: remove
// support the old (KDE 2.2) nameing scheme
if (desktopPath.isEmpty())
{
- desktopPath = KGlobal::dirs()->findResource( "applets",
+ desktopPath = TDEGlobal::dirs()->findResource( "applets",
desktopFile.right(
desktopFile.length() - 1 ) );
}
@@ -282,7 +282,7 @@ AppletContainer* PluginManager::createAppletContainer(
{
// we haven't loaded this puppy before and we're not in the untrusted list
m_untrustedApplets.append(desktopFile);
- KConfigGroup generalGroup(KGlobal::config(), "General");
+ KConfigGroup generalGroup(TDEGlobal::config(), "General");
generalGroup.writeEntry("UntrustedApplets", m_untrustedApplets);
generalGroup.sync();
}
@@ -308,7 +308,7 @@ ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desk
return 0;
}
- TQString desktopPath = KGlobal::dirs()->findResource("extensions", desktopFile);
+ TQString desktopPath = TDEGlobal::dirs()->findResource("extensions", desktopFile);
if (desktopPath.isEmpty())
{
return 0;
@@ -335,7 +335,7 @@ ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desk
{
// we don't have an instance around and we're not in the untrusted list!
m_untrustedExtensions.append(desktopFile);
- KConfigGroup generalGroup(KGlobal::config(), "General");
+ KConfigGroup generalGroup(TDEGlobal::config(), "General");
generalGroup.writeEntry("UntrustedExtensions", m_untrustedExtensions);
generalGroup.sync();
}
@@ -349,7 +349,7 @@ void PluginManager::clearUntrustedLists()
m_untrustedExtensions.clear();
m_untrustedApplets.clear();
- KConfigGroup generalGroup(KGlobal::config(), "General");
+ KConfigGroup generalGroup(TDEGlobal::config(), "General");
generalGroup.writeEntry("UntrustedApplets", m_untrustedApplets);
generalGroup.writeEntry("UntrustedExtensions", m_untrustedExtensions);
generalGroup.sync();
diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp
index d3fd5f75..a588c625 100644
--- a/kicker/kicker/kicker-3.4-reverseLayout.cpp
+++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp
@@ -143,9 +143,9 @@ int main(int argc, char** argv)
tempFile.close();
// Run kconf_update on the childpanel config files.
- KProcess kconf_update;
+ TDEProcess kconf_update;
kconf_update << "kconf_update" << tempFile.name();
- kconf_update.start(KProcess::Block);
+ kconf_update.start(TDEProcess::Block);
tempFile.unlink();
}
diff --git a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp
index 223074a8..a3b3f812 100644
--- a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp
+++ b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp
@@ -407,7 +407,7 @@ HitMenuItem *KickoffBeaglePlugin::hitToHitMenuItem (int category, Hit *hit)
title = i18n("Conversation With %1").arg(title.isEmpty() ? i18n("Unknown Person") : title);
TQDateTime datetime;
datetime = datetimeFromString((*hit) [fixme_starttime]);
- info=i18n("Date: %1").arg(KGlobal::locale()->formatDateTime(datetime,false));
+ info=i18n("Date: %1").arg(TDEGlobal::locale()->formatDateTime(datetime,false));
if (hit->getMimeType()=="beagle/x-kopete-log")
icon="kopete";
else
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index d6b14480..75e4df12 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -74,7 +74,7 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent)
itemDescription->installEventFilter(this);
- KIconLoader * ldr = KGlobal::iconLoader();
+ KIconLoader * ldr = TDEGlobal::iconLoader();
TQPixmap icon = ldr->loadIcon(info.icon(), KIcon::Panel, KIcon::SizeLarge);
itemPixmap->setPixmap(icon);
itemPixmap->installEventFilter(this);
@@ -99,7 +99,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
{
TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
if ((me->pos() - m_dragStart).manhattanLength() >
- KGlobalSettings::dndEventDelay())
+ TDEGlobalSettings::dndEventDelay())
{
AppletInfoDrag* drag = new AppletInfoDrag(m_appletInfo, this);
@@ -165,7 +165,7 @@ void AppletWidget::mouseMoveEvent(TQMouseEvent *e)
if (e->button() == Qt::LeftButton &&
!m_dragStart.isNull() &&
(e->pos() - m_dragStart).manhattanLength() >
- KGlobalSettings::dndEventDelay())
+ TDEGlobalSettings::dndEventDelay())
{
AppletInfoDrag* drag = new AppletInfoDrag(m_appletInfo, this);
@@ -202,18 +202,18 @@ void AppletWidget::setSelected(bool selected)
// for now just used to switch colours around =)
if (m_selected)
{
- setPaletteBackgroundColor(KGlobalSettings::highlightColor());
- setPaletteForegroundColor(KGlobalSettings::highlightedTextColor());
+ setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
+ setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor());
}
else if (m_odd)
{
- setPaletteBackgroundColor(KGlobalSettings::baseColor());
- setPaletteForegroundColor(KGlobalSettings::textColor());
+ setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
+ setPaletteForegroundColor(TDEGlobalSettings::textColor());
}
else
{
- setPaletteBackgroundColor(KGlobalSettings::alternateBackgroundColor());
- setPaletteForegroundColor(KGlobalSettings::textColor());
+ setPaletteBackgroundColor(TDEGlobalSettings::alternateBackgroundColor());
+ setPaletteForegroundColor(TDEGlobalSettings::textColor());
}
}
@@ -241,7 +241,7 @@ AddAppletDialog::AddAppletDialog(ContainerArea* cArea,
m_mainWidget = new AppletView(this, "AddAppletDialog::m_mainWidget");
m_mainWidget->appletScrollView->setResizePolicy(TQScrollView::Manual);
m_mainWidget->appletScrollView->setHScrollBarMode(TQScrollView::AlwaysOff);
- m_mainWidget->appletScrollView->viewport()->setPaletteBackgroundColor(KGlobalSettings::baseColor());
+ m_mainWidget->appletScrollView->viewport()->setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
setMainWidget(m_mainWidget);
@@ -311,7 +311,7 @@ bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e)
void AddAppletDialog::populateApplets()
{
m_appletBox = new TQWidget(m_mainWidget->appletScrollView->viewport());
- m_appletBox->setPaletteBackgroundColor(KGlobalSettings::baseColor());
+ m_appletBox->setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
m_mainWidget->appletScrollView->addChild(m_appletBox, 0, 0);
m_appletBox->show();
TQVBoxLayout* layout = new TQVBoxLayout(m_appletBox);
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index 4998fc5c..69606526 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -149,7 +149,7 @@ void PanelBrowserMenu::initialize()
// only the first part menu got them
if(_startid == 0 && !_filesOnly) {
insertTitle(path());
- KConfig *c = KGlobal::config();
+ KConfig *c = TDEGlobal::config();
c->setGroup("menus");
insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager()));
if (kapp->authorize("shell_access") && c->readBoolEntry("kickerOpenInTerminalIsVisible",false))
@@ -196,7 +196,7 @@ void PanelBrowserMenu::initialize()
if ( iconPath.startsWith("./") )
iconPath = path + '/' + iconPath.mid(2);
- icon = KGlobal::iconLoader()->loadIcon(iconPath,
+ icon = TDEGlobal::iconLoader()->loadIcon(iconPath,
KIcon::Small, KIcon::SizeSmall,
KIcon::DefaultState, 0, true);
if(icon.isNull())
@@ -245,7 +245,7 @@ void PanelBrowserMenu::initialize()
TQString s = c.readEntry("Icon");
if(!_icons->contains(s)) {
- icon = KGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall,
+ icon = TDEGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall,
KIcon::DefaultState, 0, true);
if(icon.isNull()) {
@@ -309,7 +309,7 @@ void PanelBrowserMenu::initialize()
// WABA: tear off handles don't work together with dynamically updated
// menus. We can't update the menu while torn off, and we don't know
// when it is torn off.
- if(KGlobalSettings::insertTearOffHandle() && item_count > 0)
+ if(TDEGlobalSettings::insertTearOffHandle() && item_count > 0)
insertTearOffHandle();
#endif
@@ -453,13 +453,13 @@ void PanelBrowserMenu::slotOpenTerminal()
config->setGroup("General");
TQString term = config->readPathEntry("TerminalApplication", "konsole");
- KProcess proc;
+ TDEProcess proc;
proc << term;
if (term == "konsole")
proc << "--workdir" << path();
else
proc.setWorkingDirectory(path());
- proc.start(KProcess::DontCare);
+ proc.start(TDEProcess::DontCare);
}
void PanelBrowserMenu::slotOpenFileManager()
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index cd023eb8..0054fbb6 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -153,7 +153,7 @@ void HideButton::slotSettingsChanged(int category)
return;
}
- bool changeCursor = KGlobalSettings::changeCursorOverIcon();
+ bool changeCursor = TDEGlobalSettings::changeCursorOverIcon();
if (changeCursor)
{
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 913091bb..431b62e6 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -139,7 +139,7 @@ void KMenuItem::setDescription(const TQString& txt)
void KMenuItem::setIcon(const TQString& icon, int size)
{
m_icon = icon;
- TQListViewItem::setPixmap(0, KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, size ));
+ TQListViewItem::setPixmap(0, TDEGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, size ));
}
void KMenuItem::setHasChildren( bool flag )
@@ -152,7 +152,7 @@ void KMenuItem::setup()
{
// if someone configured a larger generalFont than 10pt, he might have a _real_ problem with 7pt
// the 7pt could be read out of konquerorrc I guess
- float min_font_size = 7. * TQMAX(1., KGlobalSettings::generalFont().pointSizeFloat() / 10.);
+ float min_font_size = 7. * TQMAX(1., TDEGlobalSettings::generalFont().pointSizeFloat() / 10.);
const int expected_height = 38;
description_font_size = TQMAX( pointSize( expected_height * .3, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ;
@@ -1013,8 +1013,8 @@ TQDragObject * ItemView::dragObject()
return 0;
o = new KMultipleDrag(viewport());
- TQPixmap pix = KGlobal::iconLoader()->loadIcon( kitem->icon(), KIcon::Panel, m_iconSize);
- TQPixmap add = KGlobal::iconLoader()->loadIcon( "add", KIcon::Small );
+ TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( kitem->icon(), KIcon::Panel, m_iconSize);
+ TQPixmap add = TDEGlobal::iconLoader()->loadIcon( "add", KIcon::Small );
TQPainter p( &pix );
p.drawPixmap(pix.height()-add.height(), pix.width()-add.width(), add);
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 48ef522f..8dca4603 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -404,7 +404,7 @@ void PanelKMenu::initialize()
// WABA: tear off handles don't work together with dynamically updated
// menus. We can't update the menu while torn off, and we don't know
// when it is torn off.
- if (KGlobalSettings::insertTearOffHandle())
+ if (TDEGlobalSettings::insertTearOffHandle())
insertTearOffHandle();
#endif
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index eb7fc811..7dc8424d 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -124,7 +124,7 @@ static TQString calculate(const TQString &exp)
TQString result, cmd;
const TQString bc = KStandardDirs::findExe("bc");
if ( !bc.isEmpty() )
- cmd = TQString("echo %1 | %2").arg(KProcess::quote(exp), KProcess::quote(bc));
+ cmd = TQString("echo %1 | %2").arg(TDEProcess::quote(exp), TDEProcess::quote(bc));
else
cmd = TQString("echo $((%1))").arg(exp);
FILE *fs = popen(TQFile::encodeName(cmd).data(), "r");
@@ -160,7 +160,7 @@ int base_category_id[] = {ACTIONS_ID_BASE, APP_ID_BASE, BOOKMARKS_ID_BASE, NOTES
static int used_size( TQLabel *label, int oldsize )
{
- TQSimpleRichText st( label->text(), KGlobalSettings::toolBarFont() );
+ TQSimpleRichText st( label->text(), TDEGlobalSettings::toolBarFont() );
st.setWidth( oldsize );
return QMAX( st.widthUsed(), oldsize );
}
@@ -344,7 +344,7 @@ KMenu::KMenu()
m_kcommand->setDuplicatesEnabled( false );
m_kcommand->setLineEdit(new KLineEdit(m_kcommand, "m_kcommand-lineedit"));
- m_kcommand->setCompletionMode( KGlobalSettings::CompletionAuto );
+ m_kcommand->setCompletionMode( TDEGlobalSettings::CompletionAuto );
connect(m_kcommand, TQT_SIGNAL(cleared()), TQT_SLOT(clearedHistory()));
connect(m_kcommand->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(searchAccept()));
connect(m_kcommand->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(searchChanged(const TQString &)));
@@ -1353,9 +1353,9 @@ void KMenu::insertStaticItems()
m_systemView->insertItem( "folder_home", i18n( "Home Folder" ),
TQDir::homeDirPath(), "file://"+TQDir::homeDirPath(), nId++, index++ );
- if ( KStandardDirs::exists( KGlobalSettings::documentPath() + "/" ) )
+ if ( KStandardDirs::exists( TDEGlobalSettings::documentPath() + "/" ) )
{
- TQString documentPath = KGlobalSettings::documentPath();
+ TQString documentPath = TDEGlobalSettings::documentPath();
if ( documentPath.endsWith( "/" ) )
documentPath = documentPath.left( documentPath.length() - 1 );
if (documentPath!=TQDir::homeDirPath())
@@ -2083,7 +2083,7 @@ void KMenu::searchProgramList(TQString relPath)
int pos = exe.find(' ');
if (pos>0)
exe=exe.left(pos);
- m_programsInMenu+=KGlobal::dirs()->findExe(exe);
+ m_programsInMenu+=TDEGlobal::dirs()->findExe(exe);
}
}
}
@@ -2282,7 +2282,7 @@ void KMenu::doQuery (bool return_pressed)
"kcalc", TQString(), (++max_category_id [ACTIONS]), ACTIONS, "kcalc");
int index = getHitMenuItemPosition (hit_item);
m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name,
- hit_item->display_info, KGlobal::dirs()->findExe("kcalc"), max_category_id [ACTIONS], index);
+ hit_item->display_info, TDEGlobal::dirs()->findExe("kcalc"), max_category_id [ACTIONS], index);
}
}
@@ -2321,7 +2321,7 @@ void KMenu::doQuery (bool return_pressed)
case KURIFilterData::SHELL:
case KURIFilterData::EXECUTABLE:
{
- exe = KGlobal::dirs()->findExe(filterData.uri().url());
+ exe = TDEGlobal::dirs()->findExe(filterData.uri().url());
#ifdef KDELIBS_SUSE
bool gimp_hack = false;
if (exe.endsWith("/bin/gimp")) {
@@ -2688,13 +2688,13 @@ void KMenu::slotStartURL(const TQString& u)
else {
addToHistory();
if (u.startsWith("kaddressbook:/")) {
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
*proc << "kaddressbook" << "--uid" << u.mid(14);
proc->start();
accept();
return;
} else if (u.startsWith("note:/")) {
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
*proc << "tomboy";
*proc << "--open-note" << u;
if (!proc->start())
@@ -2892,7 +2892,7 @@ void KMenu::slotContextMenu(int selected)
KURL src,dest;
KIO::CopyJob *job;
- KProcess *proc;
+ TDEProcess *proc;
TQStringList favs = KickerSettings::favorites();
@@ -2900,15 +2900,15 @@ void KMenu::slotContextMenu(int selected)
case AddItemToDesktop:
accept();
if (m_popupService) {
- src.setPath( KGlobal::dirs()->findResource( "apps", m_popupService->desktopEntryPath() ) );
- dest.setPath( KGlobalSettings::desktopPath() );
+ src.setPath( TDEGlobal::dirs()->findResource( "apps", m_popupService->desktopEntryPath() ) );
+ dest.setPath( TDEGlobalSettings::desktopPath() );
dest.setFileName( src.fileName() );
job = KIO::copyAs( src, dest );
job->setDefaultPermissions( true );
}
else {
- KDesktopFile* df = new KDesktopFile( newDesktopFile(KURL(m_popupPath.path), KGlobalSettings::desktopPath() ) );
+ KDesktopFile* df = new KDesktopFile( newDesktopFile(KURL(m_popupPath.path), TDEGlobalSettings::desktopPath() ) );
df->writeEntry("GenericName", m_popupPath.description);
df->writeEntry( "Icon", m_popupPath.icon );
df->writePathEntry( "URL", m_popupPath.path );
@@ -2933,7 +2933,7 @@ void KMenu::slotContextMenu(int selected)
case EditItem:
case EditMenu:
accept();
- proc = new KProcess(TQT_TQOBJECT(this));
+ proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1);
proc->start();
@@ -2951,7 +2951,7 @@ void KMenu::slotContextMenu(int selected)
case AddMenuToDesktop: {
accept();
- KDesktopFile *df = new KDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),KGlobalSettings::desktopPath()));
+ KDesktopFile *df = new KDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),TDEGlobalSettings::desktopPath()));
df->writeEntry( "Icon", m_popupPath.icon );
df->writePathEntry( "URL", "programs:/"+m_popupPath.menuPath );
df->writeEntry( "Name", m_popupPath.title );
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 8a483f08..64f77980 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -330,7 +330,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root,
// menus. We can't update the menu while torn off, and we don't know
// when it is torn off.
if ( count() > 0 && !relPath_.isEmpty() )
- if (KGlobalSettings::insertTearOffHandle())
+ if (TDEGlobalSettings::insertTearOffHandle())
insertTearOffHandle();
#endif
}
@@ -662,7 +662,7 @@ extern int kicker_screen_number;
void PanelServiceMenu::slotContextMenu(int selected)
{
- KProcess *proc;
+ TDEProcess *proc;
KService::Ptr service;
KServiceGroup::Ptr g;
TQByteArray ba;
@@ -676,8 +676,8 @@ void PanelServiceMenu::slotContextMenu(int selected)
case AddItemToDesktop:
service = static_cast<KService *>(contextKSycocaEntry_);
- src.setPath( KGlobal::dirs()->findResource( "apps", service->desktopEntryPath() ) );
- dest.setPath( KGlobalSettings::desktopPath() );
+ src.setPath( TDEGlobal::dirs()->findResource( "apps", service->desktopEntryPath() ) );
+ dest.setPath( TDEGlobalSettings::desktopPath() );
dest.setFileName( src.fileName() );
job = KIO::copyAs( src, dest );
@@ -694,7 +694,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
}
case EditItem:
- proc = new KProcess(TQT_TQOBJECT(this));
+ proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId();
proc->start();
@@ -713,7 +713,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
case AddMenuToDesktop:
g = static_cast<KServiceGroup *>(contextKSycocaEntry_);
- dest.setPath( KGlobalSettings::desktopPath() );
+ dest.setPath( TDEGlobalSettings::desktopPath() );
dest.setFileName( g->caption() );
df = new KDesktopFile( dest.path() );
@@ -738,7 +738,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
}
case EditMenu:
- proc = new KProcess(TQT_TQOBJECT(this));
+ proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath();
proc->start();
@@ -795,7 +795,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
case KST_KServiceGroup:
{
- icon = KGlobal::iconLoader()
+ icon = TDEGlobal::iconLoader()
->loadIcon(static_cast<KServiceGroup *>(e)->icon(), KIcon::Small);
url = "programs:/" + static_cast<KServiceGroup *>(e)->relPath();
break;
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index d4735c2b..0527f822 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -326,7 +326,7 @@ TQPoint popupPosition(KPanelApplet::Direction d,
void colorize(TQImage& image)
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("WM");
TQColor color = TQApplication::palette().active().highlight();
TQColor activeTitle = config->readColorEntry("activeBackground", &color);
@@ -414,20 +414,20 @@ TQIconSet menuIconSet(const TQString& icon)
{
if (iconSize > 0)
{
- iconset = KGlobal::iconLoader()->loadIconSet(icon,
+ iconset = TDEGlobal::iconLoader()->loadIconSet(icon,
KIcon::NoGroup,
iconSize, true);
}
else if (iconSize == 0)
{
- TQPixmap normal = KGlobal::iconLoader()->loadIcon(icon,
+ TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(icon,
KIcon::Small,
0,
KIcon::DefaultState,
0,
true);
- TQPixmap active = KGlobal::iconLoader()->loadIcon(icon,
+ TQPixmap active = TDEGlobal::iconLoader()->loadIcon(icon,
KIcon::Small,
0,
KIcon::ActiveState,
diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg
index 9a4abc7f..fcc14f71 100644
--- a/kicker/libkicker/kickerSettings.kcfg
+++ b/kicker/libkicker/kickerSettings.kcfg
@@ -441,12 +441,12 @@
<entry name="ButtonFont" key="Font" type="Font" >
<label>Font for the buttons with text.</label>
- <default code="true">KGlobalSettings::generalFont()</default>
+ <default code="true">TDEGlobalSettings::generalFont()</default>
</entry>
<entry name="ButtonTextColor" key="TextColor" type="Color" >
<label>Text color for the buttons.</label>
- <default code="true">KGlobalSettings::textColor()</default>
+ <default code="true">TDEGlobalSettings::textColor()</default>
</entry>
</group>
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index c862b09c..3ecc19df 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -80,11 +80,11 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
{
setBackgroundOrigin(AncestorOrigin);
setWFlags(TQt::WNoAutoErase);
- KGlobal::locale()->insertCatalogue("libkicker");
+ TDEGlobal::locale()->insertCatalogue("libkicker");
calculateIconSize();
setAcceptDrops(true);
- m_textColor = KGlobalSettings::textColor();
+ m_textColor = TDEGlobalSettings::textColor();
updateSettings(TDEApplication::SETTINGS_MOUSE);
@@ -108,7 +108,7 @@ void PanelButton::configure()
return;
}
- KConfigGroup tilesGroup( KGlobal::config(), "button_tiles" );
+ KConfigGroup tilesGroup( TDEGlobal::config(), "button_tiles" );
if( !tilesGroup.readBoolEntry( "Enable" + name + "Tiles", true ) ) {
setTile( TQString::null );
return;
@@ -171,7 +171,7 @@ TQImage PanelButton::loadTile(const TQString& tile,
name += state + ".png";
- TQImage tileImg(KGlobal::dirs()->findResource("tiles", name));
+ TQImage tileImg(TDEGlobal::dirs()->findResource("tiles", name));
// scale if size does not match exactly
if (!tileImg.isNull() && tileImg.size() != size)
@@ -225,7 +225,7 @@ void PanelButton::updateSettings(int category)
}
if (m_forceStandardCursor == FALSE)
- m_changeCursorOverItem = KGlobalSettings::changeCursorOverIcon();
+ m_changeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon();
else
m_changeCursorOverItem = FALSE;
@@ -490,7 +490,7 @@ void PanelButton::mouseMoveEvent(TQMouseEvent *e)
TQPoint p(e->pos() - m_lastLeftMouseButtonPress);
if (p.manhattanLength() <= 16)
{
- // KGlobalSettings::dndEventDelay() is not enough!
+ // TDEGlobalSettings::dndEventDelay() is not enough!
return;
}
@@ -781,7 +781,7 @@ int PanelButton::preferredIconSize(int proposed_size) const
{
// (re)calculates the icon sizes and report true if they have changed.
// Get sizes from icontheme. We assume they are sorted.
- KIconTheme *ith = KGlobal::iconLoader()->theme();
+ KIconTheme *ith = TDEGlobal::iconLoader()->theme();
if (!ith)
{
@@ -878,7 +878,7 @@ void PanelButton::loadTiles()
void PanelButton::loadIcons()
{
- KIconLoader * ldr = KGlobal::iconLoader();
+ KIconLoader * ldr = TDEGlobal::iconLoader();
TQString nm = m_iconName;
KIcon::States defaultState = isEnabled() ? KIcon::DefaultState :
KIcon::DisabledState;
diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp
index ddb990d8..2027f19d 100644
--- a/kicker/libkicker/panner.cpp
+++ b/kicker/libkicker/panner.cpp
@@ -42,7 +42,7 @@ Panner::Panner( TQWidget* parent, const char* name )
_cwidth(0), _cheight(0),
_cx(0), _cy(0)
{
- KGlobal::locale()->insertCatalogue("libkicker");
+ TDEGlobal::locale()->insertCatalogue("libkicker");
setBackgroundOrigin( AncestorOrigin );
_updateScrollButtonsTimer = new TQTimer(this);
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index 178277c2..87fd1720 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -172,7 +172,7 @@ void SimpleButton::slotSettingsChanged(int category)
bool changeCursor;
if (m_forceStandardCursor == FALSE)
- changeCursor = KGlobalSettings::changeCursorOverIcon();
+ changeCursor = TDEGlobalSettings::changeCursorOverIcon();
else
changeCursor = FALSE;
diff --git a/kicker/menuext/find/findmenu.cpp b/kicker/menuext/find/findmenu.cpp
index a3138102..90c4cb1e 100644
--- a/kicker/menuext/find/findmenu.cpp
+++ b/kicker/menuext/find/findmenu.cpp
@@ -44,7 +44,7 @@ FindMenu::~FindMenu()
void FindMenu::initialize()
{
- TQStringList list = KGlobal::dirs()->findAllResources( "data", "kicker/menuext/find/*.desktop", false, true );
+ TQStringList list = TDEGlobal::dirs()->findAllResources( "data", "kicker/menuext/find/*.desktop", false, true );
list.sort();
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index 9b237a70..032a2ab0 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -76,7 +76,7 @@ void KateSessionMenu::initialize()
insertSeparator();
- TQStringList list = KGlobal::dirs()->findAllResources( "data", "kate/sessions/*.katesession", false, true);
+ TQStringList list = TDEGlobal::dirs()->findAllResources( "data", "kate/sessions/*.katesession", false, true);
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
KSimpleConfig config( *it, true );
diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp
index cb340caf..ea7668c8 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.cpp
+++ b/kicker/menuext/konq-profiles/konqy_menu.cpp
@@ -41,7 +41,7 @@ KonquerorProfilesMenu::KonquerorProfilesMenu(TQWidget *parent, const char *name,
{
static bool tdeprintIconsInitialized = false;
if ( !tdeprintIconsInitialized ) {
- KGlobal::iconLoader()->addAppDir("tdeprint");
+ TDEGlobal::iconLoader()->addAppDir("tdeprint");
tdeprintIconsInitialized = true;
}
}
@@ -55,7 +55,7 @@ void KonquerorProfilesMenu::initialize()
if (initialized()) clear();
setInitialized(true);
- TQStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
+ TQStringList profiles = TDEGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
m_profiles.resize(profiles.count());
int id=1;
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index 093b4fc5..16e11a03 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -54,7 +54,7 @@ KonsoleMenu::KonsoleMenu(TQWidget *parent, const char *name, const TQStringList&
KonsoleMenu::~KonsoleMenu()
{
- KGlobal::locale()->removeCatalogue("libkickermenu_konsole");
+ TDEGlobal::locale()->removeCatalogue("libkickermenu_konsole");
}
static void insertItemSorted(KPopupMenu *menu,
@@ -96,7 +96,7 @@ void KonsoleMenu::initialize()
setInitialized(true);
- TQStringList list = KGlobal::dirs()->findAllResources("data",
+ TQStringList list = TDEGlobal::dirs()->findAllResources("data",
"konsole/*.desktop",
false, true);
@@ -126,7 +126,7 @@ void KonsoleMenu::initialize()
exec = KRun::binaryName(exec, false);
exec = KShell::tildeExpand(exec);
- TQString pexec = KGlobal::dirs()->findExe(exec);
+ TQString pexec = TDEGlobal::dirs()->findExe(exec);
if (text.isEmpty() ||
conf.readEntry("Type") != "KonsoleApplication" ||
(!exec.isEmpty() && pexec.isEmpty()))
@@ -197,7 +197,7 @@ void KonsoleMenu::initialize()
delete m_profileMenu;
m_profileMenu = new KPopupMenu(this);
- TQStringList profiles = KGlobal::dirs()->findAllResources("data",
+ TQStringList profiles = TDEGlobal::dirs()->findAllResources("data",
"konsole/profiles/*",
false, true );
m_profiles.resize(profiles.count());
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index ee2a5268..827b0e40 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -182,7 +182,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
case KST_KServiceGroup:
{
- icon = KGlobal::iconLoader()->loadIcon(static_cast<KServiceGroup*>(e)->icon(),
+ icon = TDEGlobal::iconLoader()->loadIcon(static_cast<KServiceGroup*>(e)->icon(),
KIcon::Small);
url = "programs:/" + static_cast<KServiceGroup*>(e)->relPath();
break;
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index cb26e4ca..3fb0b76d 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -119,7 +119,7 @@ void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) {
int dragLength = (e->pos() - _mouseDown).manhattanLength();
- if (dragLength <= KGlobalSettings::dndEventDelay())
+ if (dragLength <= TDEGlobalSettings::dndEventDelay())
return; // ignore it
int id = idAt(_mouseDown);
diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp
index c09f9a82..49cc0db7 100644
--- a/kicker/menuext/remote/remotemenu.cpp
+++ b/kicker/menuext/remote/remotemenu.cpp
@@ -42,10 +42,10 @@ RemoteMenu::RemoteMenu(TQWidget *parent, const char *name,
const TQStringList &/*args*/)
: KPanelMenu(parent, name), KDirNotify()
{
- KGlobal::dirs()->addResourceType("remote_entries",
+ TDEGlobal::dirs()->addResourceType("remote_entries",
KStandardDirs::kde_default("data") + "remoteview");
- TQString path = KGlobal::dirs()->saveLocation("remote_entries");
+ TQString path = TDEGlobal::dirs()->saveLocation("remote_entries");
TQDir dir = path;
if (!dir.exists())
@@ -76,7 +76,7 @@ void RemoteMenu::initialize()
m_desktopMap.clear();
TQStringList names_found;
- TQStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries");
+ TQStringList dirList = TDEGlobal::dirs()->resourceDirs("remote_entries");
TQStringList::ConstIterator dirpath = dirList.begin();
TQStringList::ConstIterator end = dirList.end();
diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp
index 930dcaf1..fb10e0f3 100644
--- a/kicker/menuext/tdeprint/print_mnu.cpp
+++ b/kicker/menuext/tdeprint/print_mnu.cpp
@@ -45,7 +45,7 @@ PrintMenu::PrintMenu(TQWidget *parent, const char *name, const TQStringList & /*
{
static bool tdeprintIconsInitialized = false;
if ( !tdeprintIconsInitialized ) {
- KGlobal::iconLoader()->addAppDir("tdeprint");
+ TDEGlobal::iconLoader()->addAppDir("tdeprint");
tdeprintIconsInitialized = true;
}
}
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index 8e41497b..5ab089f0 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -64,7 +64,7 @@ extern "C"
{
KDE_EXPORT void* init_kickermenu_tom()
{
- KGlobal::locale()->insertCatalogue("libkickermenu_tom");
+ TDEGlobal::locale()->insertCatalogue("libkickermenu_tom");
return new TOMFactory;
}
};
@@ -180,7 +180,7 @@ TOM::TOM(TQWidget *parent, const char *name)
setCaption(i18n("Task-Oriented Menu"));
// KMenu legacy: support some menu config options
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("menus");
m_detailedTaskEntries = config->readBoolEntry("DetailedMenuEntries", false);
if (m_detailedTaskEntries)
@@ -438,7 +438,7 @@ void TOM::initialize()
// TASKS
insertTitle(i18n("Tasks"), contextMenuTitleID);
- TQStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/tom/");
+ TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kicker/tom/");
TQStringList::ConstIterator dIt = dirs.begin();
TQStringList::ConstIterator dEnd = dirs.end();
@@ -516,7 +516,7 @@ void TOM::initialize()
}
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
TQStringList menu_ext = config->readListEntry("Extensions");
if (!menu_ext.isEmpty())
{
@@ -628,7 +628,7 @@ void TOM::removeTask()
*
bool TOM::loadSidePixmap()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
TQColor color = palette().active().highlight();
TQImage image;
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index 734c6ef8..d6de4c39 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -84,7 +84,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
TDEApplication a;
a.disableSessionManagement();
- KGlobal::dirs()->addResourceType("applets", KStandardDirs::kde_default("data") +
+ TDEGlobal::dirs()->addResourceType("applets", KStandardDirs::kde_default("data") +
"kicker/applets");
// setup proxy object
@@ -162,7 +162,7 @@ void AppletProxy::loadApplet(const TQString& desktopFile, const TQString& config
df = finfo.absFilePath();
} else {
// locate desktop file
- df = KGlobal::dirs()->findResource("applets", desktopFile);
+ df = TDEGlobal::dirs()->findResource("applets", desktopFile);
}
TQFile file(df);
diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp
index a27d5932..55c83243 100644
--- a/kicker/proxy/extensiondebugger.cpp
+++ b/kicker/proxy/extensiondebugger.cpp
@@ -88,7 +88,7 @@ int main( int argc, char ** argv )
TDEApplication a;
a.disableSessionManagement();
- KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
+ TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
"kicker/extensions");
TQString df;
@@ -109,7 +109,7 @@ int main( int argc, char ** argv )
df = finfo.absFilePath();
} else {
// locate desktop file
- df = KGlobal::dirs()->findResource("extensions", TQString(desktopFile));
+ df = TDEGlobal::dirs()->findResource("extensions", TQString(desktopFile));
}
// does the config file exist?
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index a2fc35ec..23289c63 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -70,7 +70,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
TDEApplication a;
a.disableSessionManagement();
- KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
+ TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
"kicker/extensions");
// setup proxy object
@@ -134,7 +134,7 @@ void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString
df = finfo.absFilePath();
} else {
// locate desktop file
- df = KGlobal::dirs()->findResource("extensions", TQString(desktopFile));
+ df = TDEGlobal::dirs()->findResource("extensions", TQString(desktopFile));
}
TQFile file(df);
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index 131a1d79..ddeef37a 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -125,7 +125,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TQWidget *parent, const char
blocklayout = false;
connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
- keys = new KGlobalAccel( TQT_TQOBJECT(this) );
+ keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
#include "taskbarbindings.cpp"
keys->readSettings();
keys->updateConnections();
@@ -172,7 +172,7 @@ 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
- TQFontMetrics fm(KGlobalSettings::taskbarFont());
+ TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ?
fm.height() : m_settingsObject->minimumButtonHeight();
@@ -183,7 +183,7 @@ 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
- TQFontMetrics fm(KGlobalSettings::taskbarFont());
+ TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ?
fm.height() : m_settingsObject->minimumButtonHeight();
@@ -710,7 +710,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
- TQFontMetrics fm(KGlobalSettings::taskbarFont());
+ TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ?
fm.height() : m_settingsObject->minimumButtonHeight();
@@ -970,7 +970,7 @@ int TaskBar::taskCount() const
int TaskBar::maximumButtonsWithoutShrinking() const
{
- TQFontMetrics fm(KGlobalSettings::taskbarFont());
+ TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ?
fm.height() : m_settingsObject->minimumButtonHeight();
int rows = contentsRect().height() / minButtonHeight;
diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h
index 78f95844..7c9540ef 100644
--- a/kicker/taskbar/taskbar.h
+++ b/kicker/taskbar/taskbar.h
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class Startup;
class Task;
-class KGlobalAccel;
+class TDEGlobalAccel;
class TaskBar : public Panner
{
@@ -127,7 +127,7 @@ private:
bool shouldGroup() const;
bool isGrouping;
void reGroup();
- KGlobalAccel* keys;
+ TDEGlobalAccel* keys;
KTextShadowEngine* m_textShadowEngine;
bool m_ignoreUpdates;
TQTimer m_relayoutTimer;
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 8e10d131..9d259176 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -577,7 +577,7 @@ void TaskContainer::drawButton(TQPainter *p)
bool drawButton = alwaysDrawButtons ||
(m_mouseOver && !halo && isEnabled() &&
m_settingsObject->showButtonOnHover());
- TQFont font(KGlobalSettings::taskbarFont());
+ TQFont font(TDEGlobalSettings::taskbarFont());
// draw sunken if we contain the active task
bool active = false;
@@ -1273,7 +1273,7 @@ bool TaskContainer::startDrag(const TQPoint& pos)
return false;
}
- int delay = KGlobalSettings::dndEventDelay();
+ int delay = TDEGlobalSettings::dndEventDelay();
if ((m_dragStartPos - pos).manhattanLength() > delay)
{
@@ -1663,7 +1663,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
data.message = m_startup->text();
data.duration = 4000;
data.subtext = i18n("Loading application ...");
- data.icon = KGlobal::iconLoader()->loadIcon(m_startup->icon(),
+ data.icon = TDEGlobal::iconLoader()->loadIcon(m_startup->icon(),
KIcon::Small,
KIcon::SizeMedium,
KIcon::DefaultState,
diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index 4eab82bc..f7434e3b 100644
--- a/kicker/taskmanager/tasklmbmenu.cpp
+++ b/kicker/taskmanager/tasklmbmenu.cpp
@@ -255,7 +255,7 @@ void TaskLMBMenu::mouseMoveEvent(TQMouseEvent* e)
return;
}
- int delay = KGlobalSettings::dndEventDelay();
+ int delay = TDEGlobalSettings::dndEventDelay();
TQPoint newPos(e->pos());
if ((m_dragStartPos - newPos).manhattanLength() > delay)
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 2ae85819..b5bcf40e 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -60,7 +60,7 @@ TaskManager::TaskManager()
m_winModule(new KWinModule()),
m_trackGeometry(false)
{
- KGlobal::locale()->insertCatalogue("libtaskmanager");
+ TDEGlobal::locale()->insertCatalogue("libtaskmanager");
connect(m_winModule, TQT_SIGNAL(windowAdded(WId)),
this, TQT_SLOT(windowAdded(WId)));
connect(m_winModule, TQT_SIGNAL(windowRemoved(WId)),
@@ -88,7 +88,7 @@ TaskManager::TaskManager()
TaskManager::~TaskManager()
{
- KGlobal::locale()->removeCatalogue("libtaskmanager");
+ TDEGlobal::locale()->removeCatalogue("libtaskmanager");
}
void TaskManager::configure_startup()
@@ -628,7 +628,7 @@ Task::Task(WId win, TQObject *parent, const char *name)
// try to guess the icon from the classhint
if(_pixmap.isNull())
{
- KGlobal::iconLoader()->loadIcon(className().lower(),
+ TDEGlobal::iconLoader()->loadIcon(className().lower(),
KIcon::Small,
KIcon::Small,
KIcon::DefaultState,
@@ -709,7 +709,7 @@ void Task::refreshIcon()
// try to guess the icon from the classhint
if(_pixmap.isNull())
{
- KGlobal::iconLoader()->loadIcon(className().lower(),
+ TDEGlobal::iconLoader()->loadIcon(className().lower(),
KIcon::Small,
KIcon::Small,
KIcon::DefaultState,
@@ -914,7 +914,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
- pixmap = KGlobal::iconLoader()->loadIcon( "go",
+ pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
KIcon::NoGroup,
KIcon::SizeSmall );
isStaticIcon = true;
@@ -937,7 +937,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
- pixmap = KGlobal::iconLoader()->loadIcon( "go",
+ pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
KIcon::NoGroup,
KIcon::SizeMedium );
isStaticIcon = true;
@@ -951,7 +951,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// If not, try to get one from the classname
if ( pixmap.isNull() || pixmap.width() != size || pixmap.height() != size ) {
- pixmap = KGlobal::iconLoader()->loadIcon( className(),
+ pixmap = TDEGlobal::iconLoader()->loadIcon( className(),
KIcon::NoGroup,
size,
KIcon::DefaultState,
@@ -968,7 +968,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
- pixmap = KGlobal::iconLoader()->loadIcon( "go",
+ pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
KIcon::NoGroup,
size );
isStaticIcon = true;
diff --git a/kioslave/cgi/cgi.cpp b/kioslave/cgi/cgi.cpp
index 0181c066..e527c2db 100644
--- a/kioslave/cgi/cgi.cpp
+++ b/kioslave/cgi/cgi.cpp
@@ -156,7 +156,7 @@ void CgiProtocol::get( const KURL& url )
} else {
kdDebug(7124) << "Cmd: " << cmd << endl;
- fd = popen( TQFile::encodeName(KProcess::quote( cmd )).data(), "r" );
+ fd = popen( TQFile::encodeName(TDEProcess::quote( cmd )).data(), "r" );
if ( !fd ) {
kdDebug(7124) << "Error running '" << cmd << "'" << endl;
diff --git a/kioslave/cgi/cgi.h b/kioslave/cgi/cgi.h
index fbfba7a9..908b6bc9 100644
--- a/kioslave/cgi/cgi.h
+++ b/kioslave/cgi/cgi.h
@@ -22,7 +22,7 @@
#include <kio/slavebase.h>
-class KProcess;
+class TDEProcess;
/*!
This class implements an ioslave for viewing CGI script output without the
diff --git a/kioslave/cgi/kcmcgi/kcmcgi.cpp b/kioslave/cgi/kcmcgi/kcmcgi.cpp
index 9c8a8df5..a5c0181c 100644
--- a/kioslave/cgi/kcmcgi/kcmcgi.cpp
+++ b/kioslave/cgi/kcmcgi/kcmcgi.cpp
@@ -35,7 +35,7 @@ extern "C"
{
KDE_EXPORT KCModule *create_cgi( TQWidget *parent, const char * )
{
- KGlobal::locale()->insertCatalogue("kcmcgi");
+ TDEGlobal::locale()->insertCatalogue("kcmcgi");
return new KCMCgi( parent, "kcmcgi" );
}
}
diff --git a/kioslave/finger/kio_finger.cpp b/kioslave/finger/kio_finger.cpp
index 356d35c9..efa4d7cb 100644
--- a/kioslave/finger/kio_finger.cpp
+++ b/kioslave/finger/kio_finger.cpp
@@ -121,17 +121,17 @@ void FingerProtocol::get(const KURL& url )
//kdDebug() << "Refresh rate: " << refreshRate << endl;
- myKProcess = new KProcess();
- *myKProcess << *myPerlPath << *myFingerPerlScript
+ myTDEProcess = new TDEProcess();
+ *myTDEProcess << *myPerlPath << *myFingerPerlScript
<< *myFingerPath << *myFingerCSSFile
<< refreshRate << myURL->host() << myURL->user() ;
- 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)));
+ connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+ //connect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+ // this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
- myKProcess->start(KProcess::Block, KProcess::All);
+ myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
data(TQCString(TQString(*myStdStream).local8Bit()));
@@ -140,14 +140,14 @@ void FingerProtocol::get(const KURL& url )
//clean up
- delete myKProcess;
+ delete myTDEProcess;
}
/* ---------------------------------------------------------------------------------- */
-void FingerProtocol::slotGetStdOutput(KProcess* /* p */, char *s, int len)
+void FingerProtocol::slotGetStdOutput(TDEProcess* /* p */, char *s, int len)
{
//kdDebug() << "void FingerProtocol::slotGetStdoutOutput()" << endl;
*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 TQString(KGlobal::dirs()->findExe("perl"));
+ myPerlPath = new TQString(TDEGlobal::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 TQString(KGlobal::dirs()->findExe("finger"));
+ myFingerPath = new TQString(TDEGlobal::dirs()->findExe("finger"));
if ((myFingerPath->isEmpty()))
{
//kdDebug() << "Finger command not found" << endl;
diff --git a/kioslave/finger/kio_finger.h b/kioslave/finger/kio_finger.h
index 92366f45..97c68f8c 100644
--- a/kioslave/finger/kio_finger.h
+++ b/kioslave/finger/kio_finger.h
@@ -41,7 +41,7 @@ public:
virtual void get(const KURL& url);
private slots:
- void slotGetStdOutput(KProcess*, char*, int);
+ void slotGetStdOutput(TDEProcess*, char*, int);
private:
KURL *myURL;
@@ -54,7 +54,7 @@ private:
QString *myStdStream;
- KProcess *myKProcess;
+ TDEProcess *myTDEProcess;
void getProgramPath();
void parseCommandLine(const KURL& url);
diff --git a/kioslave/fish/fish.cpp b/kioslave/fish/fish.cpp
index ccd81504..ac855629 100644
--- a/kioslave/fish/fish.cpp
+++ b/kioslave/fish/fish.cpp
@@ -19,9 +19,9 @@
done by David Faure <faure@kde.org>.
Structure is a bit complicated, since I made the mistake to use
- KProcess... now there is a lightweight homebrew async IO system
+ TDEProcess... now there is a lightweight homebrew async IO system
inside, but if signals/slots become available for ioslaves, switching
- back to KProcess should be easy.
+ back to TDEProcess should be easy.
*/
#include "config.h"
diff --git a/kioslave/home/kdedmodule/homedirnotifymodule.cpp b/kioslave/home/kdedmodule/homedirnotifymodule.cpp
index 03f66411..4eb71c33 100644
--- a/kioslave/home/kdedmodule/homedirnotifymodule.cpp
+++ b/kioslave/home/kdedmodule/homedirnotifymodule.cpp
@@ -30,7 +30,7 @@ HomeDirNotifyModule::HomeDirNotifyModule(const TQCString &obj)
extern "C" {
KDE_EXPORT KDEDModule *create_homedirnotify(const TQCString &obj)
{
- KGlobal::locale()->insertCatalogue("kio_home");
+ TDEGlobal::locale()->insertCatalogue("kio_home");
return new HomeDirNotifyModule(obj);
}
}
diff --git a/kioslave/info/info.cc b/kioslave/info/info.cc
index f220da58..4af1f4c6 100644
--- a/kioslave/info/info.cc
+++ b/kioslave/info/info.cc
@@ -25,7 +25,7 @@ InfoProtocol::InfoProtocol( const TQCString &pool, const TQCString &app )
{
kdDebug( 7108 ) << "InfoProtocol::InfoProtocol" << endl;
- m_perl = KGlobal::dirs()->findExe( "perl" );
+ m_perl = TDEGlobal::dirs()->findExe( "perl" );
m_infoScript = locate( "data", "kio_info/kde-info2html" );
m_infoConf = locate("data", "kio_info/kde-info2html.conf");
@@ -92,21 +92,21 @@ void InfoProtocol::get( const KURL& url )
// extract the path and node from url
decodeURL( url );
- TQString path = KGlobal::iconLoader()->iconPath("up", KIcon::Toolbar, true);
+ TQString path = TDEGlobal::iconLoader()->iconPath("up", KIcon::Toolbar, true);
int revindex = path.findRev('/');
path = path.left(revindex);
- TQString cmd = KProcess::quote(m_perl);
+ TQString cmd = TDEProcess::quote(m_perl);
cmd += " ";
- cmd += KProcess::quote(m_infoScript);
+ cmd += TDEProcess::quote(m_infoScript);
cmd += " ";
- cmd += KProcess::quote(m_infoConf);
+ cmd += TDEProcess::quote(m_infoConf);
cmd += " ";
- cmd += KProcess::quote(path);
+ cmd += TDEProcess::quote(path);
cmd += " ";
- cmd += KProcess::quote(m_page);
+ cmd += TDEProcess::quote(m_page);
cmd += " ";
- cmd += KProcess::quote(m_node);
+ cmd += TDEProcess::quote(m_node);
kdDebug( 7108 ) << "cmd: " << cmd << endl;
diff --git a/kioslave/info/info.h b/kioslave/info/info.h
index 20c142cf..06854680 100644
--- a/kioslave/info/info.h
+++ b/kioslave/info/info.h
@@ -5,7 +5,7 @@
#include <kio/slavebase.h>
-class KProcess;
+class TDEProcess;
class InfoProtocol : public KIO::SlaveBase
{
diff --git a/kioslave/mac/kio_mac.cpp b/kioslave/mac/kio_mac.cpp
index d13b59f7..47b56119 100644
--- a/kioslave/mac/kio_mac.cpp
+++ b/kioslave/mac/kio_mac.cpp
@@ -60,8 +60,8 @@ MacProtocol::~MacProtocol() {
delete logStream;
logStream = 0;
*/
- delete myKProcess;
- myKProcess = 0L;
+ delete myTDEProcess;
+ myTDEProcess = 0L;
}
//get() called when a file is to be read
@@ -100,24 +100,24 @@ void MacProtocol::get(const KURL& url) {
}
//now we can read the file
- myKProcess = new KProcess();
+ myTDEProcess = new TDEProcess();
- *myKProcess << "hpcopy" << mode << path << "-";
+ *myTDEProcess << "hpcopy" << mode << path << "-";
//data is now sent directly from the slot
- connect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
- this, TQT_SLOT(slotSetDataStdOutput(KProcess *, char *, int)));
+ connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ this, TQT_SLOT(slotSetDataStdOutput(TDEProcess *, char *, int)));
- myKProcess->start(KProcess::Block, KProcess::All);
+ myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
- if (!myKProcess->normalExit() || !(myKProcess->exitStatus() == 0)) {
+ if (!myTDEProcess->normalExit() || !(myTDEProcess->exitStatus() == 0)) {
error(ERR_SLAVE_DEFINED,
i18n("There was an error with hpcopy - please ensure it is installed"));
return;
}
//clean up
- delete myKProcess; myKProcess = 0;
+ delete myTDEProcess; myTDEProcess = 0;
//finish
data(TQByteArray());
finished();
@@ -130,24 +130,24 @@ void MacProtocol::listDir(const KURL& url) {
if (filename.isNull()) {
error(ERR_CANNOT_LAUNCH_PROCESS, i18n("No filename was found"));
} else {
- myKProcess = new KProcess();
- *myKProcess << "hpls" << "-la" << filename;
+ myTDEProcess = new TDEProcess();
+ *myTDEProcess << "hpls" << "-la" << filename;
standardOutputStream = TQString::null;
- connect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
- this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
+ connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
- myKProcess->start(KProcess::Block, KProcess::All);
+ myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
- if ((!myKProcess->normalExit()) || (!myKProcess->exitStatus() == 0)) {
+ if ((!myTDEProcess->normalExit()) || (!myTDEProcess->exitStatus() == 0)) {
error(ERR_SLAVE_DEFINED,
i18n("There was an error with hpls - please ensure it is installed"));
}
//clean up
- delete myKProcess; myKProcess = 0;
- disconnect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
- this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
+ delete myTDEProcess; myTDEProcess = 0;
+ disconnect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
UDSEntry entry;
if (!standardOutputStream.isEmpty()) {
@@ -186,25 +186,25 @@ TQValueList<KIO::UDSAtom> MacProtocol::doStat(const KURL& url) {
if (filename.isNull()) {
error(ERR_SLAVE_DEFINED, i18n("No filename was found in the URL"));
} else if (! filename.isEmpty()) {
- myKProcess = new KShellProcess();
+ myTDEProcess = new KShellProcess();
- *myKProcess << "hpls" << "-ld" << filename;
+ *myTDEProcess << "hpls" << "-ld" << filename;
standardOutputStream = TQString::null;
- connect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
- this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
+ connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
- myKProcess->start(KProcess::Block, KProcess::All);
+ myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
- if ((!myKProcess->normalExit()) || (!myKProcess->exitStatus() == 0)) {
+ if ((!myTDEProcess->normalExit()) || (!myTDEProcess->exitStatus() == 0)) {
error(ERR_SLAVE_DEFINED,
i18n("hpls did not exit normally - please ensure you have installed the hfsplus tools"));
}
//clean up
- delete myKProcess; myKProcess = 0;
- disconnect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
- this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
+ delete myTDEProcess; myTDEProcess = 0;
+ disconnect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
if (standardOutputStream.isEmpty()) {
filename.replace("\\ ", " "); //get rid of escapes
@@ -254,13 +254,13 @@ TQString MacProtocol::prepareHP(const KURL& url) {
delete config; config = 0;
//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";
+ myTDEProcess = new TDEProcess();
+ *myTDEProcess << "hpmount";
standardOutputStream = TQString::null;
- connect(myKProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
- this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
+ connect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
- myKProcess->start(KProcess::Block, KProcess::All);
+ myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
bool version102 = true;
@@ -268,21 +268,21 @@ TQString MacProtocol::prepareHP(const KURL& url) {
version102 = false;
}
- delete myKProcess; myKProcess = 0;
- disconnect(myKProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
- this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
+ delete myTDEProcess; myTDEProcess = 0;
+ disconnect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
//now mount the drive
- myKProcess = new KProcess();
+ myTDEProcess = new TDEProcess();
if (version102) {
- *myKProcess << "hpmount" << device;
+ *myTDEProcess << "hpmount" << device;
} else {
- *myKProcess << "hpmount" << "-r" << device;
+ *myTDEProcess << "hpmount" << "-r" << device;
}
- myKProcess->start(KProcess::Block, KProcess::All);
+ myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
- if ((!myKProcess->normalExit()) || (!myKProcess->exitStatus() == 0)) {
+ if ((!myTDEProcess->normalExit()) || (!myTDEProcess->exitStatus() == 0)) {
//TODO this error interrupts the user when typing ?dev=foo on each letter of foo
error(ERR_SLAVE_DEFINED,
i18n("hpmount did not exit normally - please ensure that hfsplus utils are installed,\n"
@@ -293,7 +293,7 @@ TQString MacProtocol::prepareHP(const KURL& url) {
}
//clean up
- delete myKProcess; myKProcess = 0;
+ delete myTDEProcess; myTDEProcess = 0;
//escape any funny characters
//TODO are there any more characters to escape?
@@ -310,19 +310,19 @@ TQString MacProtocol::prepareHP(const KURL& url) {
dir = path.left(s);
path = path.mid(s+1);
- myKProcess = new KProcess();
- *myKProcess << "hpcd" << dir;
+ myTDEProcess = new TDEProcess();
+ *myTDEProcess << "hpcd" << dir;
- myKProcess->start(KProcess::Block, KProcess::All);
+ myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
- if ((!myKProcess->normalExit()) || (!myKProcess->exitStatus() == 0)) {
+ if ((!myTDEProcess->normalExit()) || (!myTDEProcess->exitStatus() == 0)) {
error(ERR_SLAVE_DEFINED,
i18n("hpcd did not exit normally - please ensure it is installed"));
return NULL;
}
//clean up
- delete myKProcess; myKProcess = 0;
+ delete myTDEProcess; myTDEProcess = 0;
s = path.find('/');
}
@@ -412,13 +412,13 @@ TQValueList<KIO::UDSAtom> MacProtocol::makeUDS(const TQString& _line) {
//slotGetStdOutput() grabs output from the hp commands
// and adds it to the buffer
-void MacProtocol::slotGetStdOutput(KProcess*, char *s, int len) {
+void MacProtocol::slotGetStdOutput(TDEProcess*, char *s, int len) {
standardOutputStream += TQString::fromLocal8Bit(s, len);
}
//slotSetDataStdOutput() is used during hpcopy to give
//standard output to KDE
-void MacProtocol::slotSetDataStdOutput(KProcess*, char *s, int len) {
+void MacProtocol::slotSetDataStdOutput(TDEProcess*, char *s, int len) {
processedBytes += len;
processedSize(processedBytes);
TQByteArray array;
diff --git a/kioslave/mac/kio_mac.h b/kioslave/mac/kio_mac.h
index 7f74dfca..1376efe7 100644
--- a/kioslave/mac/kio_mac.h
+++ b/kioslave/mac/kio_mac.h
@@ -36,8 +36,8 @@ public:
virtual void listDir(const KURL& url);
virtual void stat(const KURL& url);
protected slots:
- void slotGetStdOutput(KProcess*, char*, int);
- void slotSetDataStdOutput(KProcess*, char *s, int len);
+ void slotGetStdOutput(TDEProcess*, char*, int);
+ void slotSetDataStdOutput(TDEProcess*, char *s, int len);
protected:
TQString prepareHP(const KURL& _url);
TQValueList<KIO::UDSAtom> makeUDS(const TQString& _line);
@@ -47,7 +47,7 @@ protected:
KIO::filesize_t processedBytes;
TQString standardOutputStream;
- KProcess* myKProcess;
+ TDEProcess* myTDEProcess;
//for debugging
//TQFile* logFile;
diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp
index 67778aac..cc7ac770 100644
--- a/kioslave/man/kio_man.cpp
+++ b/kioslave/man/kio_man.cpp
@@ -116,7 +116,7 @@ MANProtocol::MANProtocol(const TQCString &pool_socket, const TQCString &app_sock
{
assert(!_self);
_self = this;
- const TQString common_dir = KGlobal::dirs()->findResourceDir( "html", "en/common/kde-common.css" );
+ const TQString common_dir = TDEGlobal::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
@@ -195,12 +195,12 @@ TQMap<TQString, TQString> MANProtocol::buildIndexMap(const TQString &section)
break;
}
if ( it_name == names.end() ) {
- KProcess proc;
+ TDEProcess proc;
proc << "whatis" << "-M" << (*it_dir) << "-w" << "*";
myStdStream = TQString::null;
- connect( &proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int ) ),
- TQT_SLOT( slotGetStdOutput( KProcess *, char *, int ) ) );
- proc.start( KProcess::Block, KProcess::Stdout );
+ connect( &proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ),
+ TQT_SLOT( slotGetStdOutput( TDEProcess *, char *, int ) ) );
+ proc.start( TDEProcess::Block, TDEProcess::Stdout );
TQTextStream t( &myStdStream, IO_ReadOnly );
parseWhatIs( i, t, mark );
}
@@ -223,7 +223,7 @@ TQStringList MANProtocol::manDirectories()
{
// Translated pages in "<mandir>/<lang>" if the directory
// exists
- TQStringList languages = KGlobal::locale()->languageList();
+ TQStringList languages = TDEGlobal::locale()->languageList();
for (TQStringList::ConstIterator it_lang = languages.begin();
it_lang != languages.end();
@@ -512,12 +512,12 @@ void MANProtocol::get(const KURL& url )
finished();
}
-void MANProtocol::slotGetStdOutput(KProcess* /* p */, char *s, int len)
+void MANProtocol::slotGetStdOutput(TDEProcess* /* p */, char *s, int len)
{
myStdStream += TQString::fromLocal8Bit(s, len);
}
-void MANProtocol::slotGetStdOutputUtf8(KProcess* /* p */, char *s, int len)
+void MANProtocol::slotGetStdOutputUtf8(TDEProcess* /* p */, char *s, int len)
{
myStdStream += TQString::fromUtf8(s, len);
}
@@ -537,15 +537,15 @@ char *MANProtocol::readManPage(const char *_filename)
if (filename.contains("sman", false)) //file_mimetype == "text/html" || )
{
myStdStream =TQString::null;
- KProcess proc;
+ TDEProcess proc;
/* Determine path to sgml2roff, if not already done. */
getProgramPath();
proc << mySgml2RoffPath << filename;
- TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)),
- this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
- proc.start(KProcess::Block, KProcess::All);
+ TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+ proc.start(TDEProcess::Block, TDEProcess::All);
const TQCString cstr=myStdStream.latin1();
const int len = cstr.size()-1;
@@ -570,14 +570,14 @@ char *MANProtocol::readManPage(const char *_filename)
lastdir = filename.left(filename.findRev('/'));
myStdStream = TQString::null;
- KProcess proc;
+ TDEProcess proc;
/* TODO: detect availability of 'man --recode' so that this can go
* upstream */
proc << "man" << "--recode" << "UTF-8" << filename;
- TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)),
- this, TQT_SLOT(slotGetStdOutputUtf8(KProcess *, char *, int)));
- proc.start(KProcess::Block, KProcess::All);
+ TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
+ this, TQT_SLOT(slotGetStdOutputUtf8(TDEProcess *, char *, int)));
+ proc.start(TDEProcess::Block, TDEProcess::All);
const TQCString cstr=myStdStream.utf8();
const int len = cstr.size()-1;
@@ -1517,12 +1517,12 @@ void MANProtocol::getProgramPath()
if (!mySgml2RoffPath.isEmpty())
return;
- mySgml2RoffPath = KGlobal::dirs()->findExe("sgml2roff");
+ mySgml2RoffPath = TDEGlobal::dirs()->findExe("sgml2roff");
if (!mySgml2RoffPath.isEmpty())
return;
/* sgml2roff isn't found in PATH. Check some possible locations where it may be found. */
- mySgml2RoffPath = KGlobal::dirs()->findExe("sgml2roff", TQString(SGML2ROFF_DIRS));
+ mySgml2RoffPath = TDEGlobal::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 3a0db59e..ee987ddd 100644
--- a/kioslave/man/kio_man.h
+++ b/kioslave/man/kio_man.h
@@ -60,8 +60,8 @@ public:
static MANProtocol *self();
private slots:
- void slotGetStdOutput(KProcess*, char*, int);
- void slotGetStdOutputUtf8(KProcess*, char*, int);
+ void slotGetStdOutput(TDEProcess*, char*, int);
+ void slotGetStdOutputUtf8(TDEProcess*, char*, int);
private:
void checkManPaths();
diff --git a/kioslave/media/kcmodule/main.cpp b/kioslave/media/kcmodule/main.cpp
index 6760b4e8..29c48d99 100644
--- a/kioslave/media/kcmodule/main.cpp
+++ b/kioslave/media/kcmodule/main.cpp
@@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_media, MediaFactory( "kcmmedia" ) )
MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList& )
: KCModule(MediaFactory::instance(), parent, name )
{
- KGlobal::locale()->insertCatalogue("kio_media");
+ TDEGlobal::locale()->insertCatalogue("kio_media");
TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
TQTabWidget *tab = new TQTabWidget( this );
diff --git a/kioslave/media/libmediacommon/notifieraction.cpp b/kioslave/media/libmediacommon/notifieraction.cpp
index d1031470..0dfc4110 100644
--- a/kioslave/media/libmediacommon/notifieraction.cpp
+++ b/kioslave/media/libmediacommon/notifieraction.cpp
@@ -57,7 +57,7 @@ TQPixmap NotifierAction::pixmap() const
}
else
{
- TQString path = KGlobal::iconLoader()->iconPath( m_iconName, -32 );
+ TQString path = TDEGlobal::iconLoader()->iconPath( m_iconName, -32 );
return TQPixmap( path );
}
}
diff --git a/kioslave/media/libmediacommon/notifiersettings.cpp b/kioslave/media/libmediacommon/notifiersettings.cpp
index 0cdf6f26..cc90e5ef 100644
--- a/kioslave/media/libmediacommon/notifiersettings.cpp
+++ b/kioslave/media/libmediacommon/notifiersettings.cpp
@@ -361,7 +361,7 @@ bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString
TQValueList<NotifierServiceAction*> NotifierSettings::listServices( const TQString &mimetype ) const
{
TQValueList<NotifierServiceAction*> services;
- TQStringList dirs = KGlobal::dirs()->findDirs("data", "konqueror/servicemenus/");
+ TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "konqueror/servicemenus/");
TQStringList::ConstIterator dir_it = dirs.begin();
TQStringList::ConstIterator dir_end = dirs.end();
diff --git a/kioslave/media/mediamanager/dialog.cpp b/kioslave/media/mediamanager/dialog.cpp
index 549bbdc4..40e99a84 100644
--- a/kioslave/media/mediamanager/dialog.cpp
+++ b/kioslave/media/mediamanager/dialog.cpp
@@ -34,7 +34,7 @@ Dialog::Dialog(TQString url, TQString iconName) :
enableButton( User1, false );
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
decryptDialog->encryptedIcon->setPixmap( pixmap );
connect(decryptDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp
index ca0c4e26..9ebf0ade 100644
--- a/kioslave/media/mediamanager/halbackend.cpp
+++ b/kioslave/media/mediamanager/halbackend.cpp
@@ -376,9 +376,9 @@ void HALBackend::DeviceCondition(const char* udi, const char* condition)
}
}
if (medium) {
- KProcess p;
+ TDEProcess p;
p << "kio_media_mounthelper" << "-e" << medium->name();
- p.start(KProcess::DontCare);
+ p.start(TDEProcess::DontCare);
}
}
@@ -1128,7 +1128,7 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio
TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& command,
const TQString& dialogCaption, const TQString& dialogComment)
{
- KProcess tdesudoProcess;
+ TDEProcess tdesudoProcess;
tdesudoProcess << tdesudoPath
<< "-d"
@@ -1138,7 +1138,7 @@ TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& comman
<< "-c" << command;
// @todo handle tdesudo output
- tdesudoProcess.start(KProcess::Block);
+ tdesudoProcess.start(TDEProcess::Block);
return TQString();
}
@@ -1146,7 +1146,7 @@ TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& comman
TQString startKdeSuProcess(const TQString& tdesuPath, const TQString& command,
const TQString& dialogCaption)
{
- KProcess tdesuProcess;
+ TDEProcess tdesuProcess;
tdesuProcess << tdesuPath
<< "-d"
@@ -1155,7 +1155,7 @@ TQString startKdeSuProcess(const TQString& tdesuPath, const TQString& command,
<< "-c" << command;
// @todo handle tdesu output
- tdesuProcess.start(KProcess::Block);
+ tdesuProcess.start(TDEProcess::Block);
return TQString();
}
@@ -1299,7 +1299,7 @@ static TQString mount_priv(const char *udi, const char *mount_point, const char
TQString HALBackend::listUsingProcesses(const Medium* medium)
{
TQString proclist, fullmsg;
- TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
+ TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(TDEProcess::quote(medium->mountPoint()));
FILE *fuser = popen(cmdline.latin1(), "r");
uint counter = 0;
@@ -1336,7 +1336,7 @@ TQString HALBackend::listUsingProcesses(const Medium* medium)
TQString HALBackend::killUsingProcesses(const Medium* medium)
{
TQString proclist, fullmsg;
- TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
+ TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(TDEProcess::quote(medium->mountPoint()));
FILE *fuser = popen(cmdline.latin1(), "r");
uint counter = 0;
diff --git a/kioslave/media/mediamanager/mediamanager.cpp b/kioslave/media/mediamanager/mediamanager.cpp
index 6223036a..db2c12a7 100644
--- a/kioslave/media/mediamanager/mediamanager.cpp
+++ b/kioslave/media/mediamanager/mediamanager.cpp
@@ -415,7 +415,7 @@ void MediaManager::slotMediumChanged(const TQString &/*id*/, const TQString &nam
extern "C" {
KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj)
{
- KGlobal::locale()->insertCatalogue("kio_media");
+ TDEGlobal::locale()->insertCatalogue("kio_media");
return new MediaManager(obj);
}
}
diff --git a/kioslave/media/mediamanager/tdehardwarebackend.cpp b/kioslave/media/mediamanager/tdehardwarebackend.cpp
index 15e27a43..1086a3e7 100644
--- a/kioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/kioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -63,7 +63,7 @@ TDEBackend::TDEBackend(MediaList &list, TQObject* parent)
, m_parent(parent)
{
// Initialize the TDE device manager
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
// Connect device monitoring signals/slots
connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(AddDeviceHandler(TDEGenericDevice*)));
@@ -78,7 +78,7 @@ TDEBackend::TDEBackend(MediaList &list, TQObject* parent)
TDEBackend::~TDEBackend()
{
// Remove all media from the media list
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEGenericHardwareList hwlist = hwdevices->listAllPhysicalDevices();
TDEGenericDevice *hwdevice;
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
@@ -113,7 +113,7 @@ void TDEBackend::ModifyDeviceHandler(TDEGenericDevice *device) {
// List devices (at startup)
bool TDEBackend::ListDevices()
{
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEGenericHardwareList hwlist = hwdevices->listAllPhysicalDevices();
TDEGenericDevice *hwdevice;
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
@@ -391,7 +391,7 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat
void TDEBackend::setVolumeProperties(Medium* medium)
{
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) {
@@ -570,7 +570,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
// Handle floppies and zip drives
bool TDEBackend::setFloppyProperties(Medium* medium)
{
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) {
@@ -636,7 +636,7 @@ bool TDEBackend::setFloppyProperties(Medium* medium)
void TDEBackend::setCameraProperties(Medium* medium)
{
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) {
@@ -702,7 +702,7 @@ TQStringList TDEBackend::mountoptions(const TQString &name)
return TQStringList();
}
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) {
@@ -961,7 +961,7 @@ TQString TDEBackend::mount(const Medium *medium)
}
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) {
@@ -1162,7 +1162,7 @@ TQString TDEBackend::unmount(const TQString &_udi)
TQString udi = TQString::null;
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) {
@@ -1271,7 +1271,7 @@ TQString TDEBackend::isInFstab(const Medium *medium)
TQString TDEBackend::listUsingProcesses(const Medium* medium)
{
TQString proclist, fullmsg;
- TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
+ TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(TDEProcess::quote(medium->mountPoint()));
FILE *fuser = popen(cmdline.latin1(), "r");
uint counter = 0;
@@ -1308,7 +1308,7 @@ TQString TDEBackend::listUsingProcesses(const Medium* medium)
TQString TDEBackend::killUsingProcesses(const Medium* medium)
{
TQString proclist, fullmsg;
- TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
+ TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(TDEProcess::quote(medium->mountPoint()));
FILE *fuser = popen(cmdline.latin1(), "r");
uint counter = 0;
@@ -1346,7 +1346,7 @@ TQString TDEBackend::generateName(const TQString &devNode)
}
TQString TDEBackend::driveUDIFromDeviceUID(TQString uuid) {
- TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+ TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice * sdevice = hwdevices->findDiskByUID(uuid);
TQString ret;
diff --git a/kioslave/media/medianotifier/medianotifier.cpp b/kioslave/media/medianotifier/medianotifier.cpp
index d02f1c4b..94ee0e8c 100644
--- a/kioslave/media/medianotifier/medianotifier.cpp
+++ b/kioslave/media/medianotifier/medianotifier.cpp
@@ -199,7 +199,7 @@ bool MediaNotifier::execAutorun( const KFileItem &medium, const TQString &path,
// confirmed its execution the autostart file MUST be executed
// with the current working directory ( CWD ) set to the root
// directory of the medium.
- KProcess proc;
+ TDEProcess proc;
proc << "sh" << autorunFile;
proc.setWorkingDirectory( path );
proc.start();
@@ -313,7 +313,7 @@ extern "C"
{
KDE_EXPORT KDEDModule *create_medianotifier(const TQCString &name)
{
- KGlobal::locale()->insertCatalogue("kay");
+ TDEGlobal::locale()->insertCatalogue("kay");
return new MediaNotifier(name);
}
}
diff --git a/kioslave/media/mounthelper/dialog.cpp b/kioslave/media/mounthelper/dialog.cpp
index 549bbdc4..40e99a84 100644
--- a/kioslave/media/mounthelper/dialog.cpp
+++ b/kioslave/media/mounthelper/dialog.cpp
@@ -34,7 +34,7 @@ Dialog::Dialog(TQString url, TQString iconName) :
enableButton( User1, false );
- TQPixmap pixmap = KGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
decryptDialog->encryptedIcon->setPixmap( pixmap );
connect(decryptDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.cpp b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
index 23a207fa..f321293d 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.cpp
+++ b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
@@ -182,19 +182,19 @@ MountHelper::MountHelper() : TDEApplication()
void MountHelper::invokeEject(const TQString &device, bool quiet)
{
- KProcess *proc = new KProcess(TQT_TQOBJECT(this));
+ TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << "kdeeject";
if (quiet)
{
*proc << "-q";
}
*proc << device;
- connect( proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT( ejectFinished(KProcess *) ) );
+ connect( proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT( ejectFinished(TDEProcess *) ) );
proc->start();
}
-void MountHelper::ejectFinished(KProcess* proc)
+void MountHelper::ejectFinished(TDEProcess* proc)
{
/*
* If eject failed, report the error stored in m_errorStr
@@ -268,7 +268,7 @@ int main(int argc, char **argv)
"0.1");
TDECmdLineArgs::addCmdLineOptions( options );
- KGlobal::locale()->setMainCatalogue("kio_media");
+ TDEGlobal::locale()->setMainCatalogue("kio_media");
TDEApplication::addCmdLineOptions();
if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage();
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.h b/kioslave/media/mounthelper/kio_media_mounthelper.h
index ffb5d1db..7eff1e54 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.h
+++ b/kioslave/media/mounthelper/kio_media_mounthelper.h
@@ -47,7 +47,7 @@ private:
private slots:
void slotSendPassword();
void slotCancel();
- void ejectFinished(KProcess* proc);
+ void ejectFinished(TDEProcess* proc);
void error();
signals:
diff --git a/kioslave/remote/kdedmodule/remotedirnotify.cpp b/kioslave/remote/kdedmodule/remotedirnotify.cpp
index e6e2359a..fa880b78 100644
--- a/kioslave/remote/kdedmodule/remotedirnotify.cpp
+++ b/kioslave/remote/kdedmodule/remotedirnotify.cpp
@@ -30,10 +30,10 @@
RemoteDirNotify::RemoteDirNotify()
{
- KGlobal::dirs()->addResourceType("remote_entries",
+ TDEGlobal::dirs()->addResourceType("remote_entries",
KStandardDirs::kde_default("data") + "remoteview");
- TQString path = KGlobal::dirs()->saveLocation("remote_entries");
+ TQString path = TDEGlobal::dirs()->saveLocation("remote_entries");
m_baseURL.setPath(path);
}
diff --git a/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp b/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp
index 894400ce..13bfcfc2 100644
--- a/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp
+++ b/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp
@@ -30,7 +30,7 @@ RemoteDirNotifyModule::RemoteDirNotifyModule(const TQCString &obj)
extern "C" {
KDE_EXPORT KDEDModule *create_remotedirnotify(const TQCString &obj)
{
- KGlobal::locale()->insertCatalogue("kio_remote");
+ TDEGlobal::locale()->insertCatalogue("kio_remote");
return new RemoteDirNotifyModule(obj);
}
}
diff --git a/kioslave/remote/remoteimpl.cpp b/kioslave/remote/remoteimpl.cpp
index 47e41b82..fbc21bfe 100644
--- a/kioslave/remote/remoteimpl.cpp
+++ b/kioslave/remote/remoteimpl.cpp
@@ -36,10 +36,10 @@
RemoteImpl::RemoteImpl()
{
- KGlobal::dirs()->addResourceType("remote_entries",
+ TDEGlobal::dirs()->addResourceType("remote_entries",
KStandardDirs::kde_default("data") + "remoteview");
- TQString path = KGlobal::dirs()->saveLocation("remote_entries");
+ TQString path = TDEGlobal::dirs()->saveLocation("remote_entries");
TQDir dir = path;
if (!dir.exists())
@@ -54,7 +54,7 @@ void RemoteImpl::listRoot(TQValueList<KIO::UDSEntry> &list) const
kdDebug(1220) << "RemoteImpl::listRoot" << endl;
TQStringList names_found;
- TQStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries");
+ TQStringList dirList = TDEGlobal::dirs()->resourceDirs("remote_entries");
TQStringList::ConstIterator dirpath = dirList.begin();
TQStringList::ConstIterator end = dirList.end();
@@ -89,7 +89,7 @@ bool RemoteImpl::findDirectory(const TQString &filename, TQString &directory) co
{
kdDebug(1220) << "RemoteImpl::findDirectory" << endl;
- TQStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries");
+ TQStringList dirList = TDEGlobal::dirs()->resourceDirs("remote_entries");
TQStringList::ConstIterator dirpath = dirList.begin();
TQStringList::ConstIterator end = dirList.end();
diff --git a/kioslave/sftp/CHANGELOG b/kioslave/sftp/CHANGELOG
index 2b5f18de..b60e7f44 100644
--- a/kioslave/sftp/CHANGELOG
+++ b/kioslave/sftp/CHANGELOG
@@ -4,12 +4,12 @@
- After the user cancels with the stop button, we get ERR_CANNOT_LAUNCH_PROCESS
errors, until we kill the ioslave. Same thing after trying the wrong passwd
too many times.
- This is happening because KProcess thinks that the ssh process is still running
+ This is happening because TDEProcess thinks that the ssh process is still running
even though it exited.
- How to handle password and caching?
- Write our own askpass program using kde
- set env SSH_ASKPASS_PROGRAM before launching
- -how to do this? KProcess doesn't give us access to env variables.
+ -how to do this? TDEProcess doesn't give us access to env variables.
- Our askpass program can probably talk to the tdesu daemon to implement caching.
- chmod() succeeds, but konqueror always puts permissions to 0 afterwards. The properties
dialog is right though.
diff --git a/kioslave/smb/kio_smb.h b/kioslave/smb/kio_smb.h
index da40bda1..c7c31647 100644
--- a/kioslave/smb/kio_smb.h
+++ b/kioslave/smb/kio_smb.h
@@ -87,7 +87,7 @@ extern "C"
#define KIO_SMB 7106
using namespace KIO;
-class KProcess;
+class TDEProcess;
//===========================================================================
@@ -262,8 +262,8 @@ public:
virtual void special( const TQByteArray & );
private slots:
- void readOutput(KProcess *proc, char *buffer, int buflen);
- void readStdErr(KProcess *proc, char *buffer, int buflen);
+ void readOutput(TDEProcess *proc, char *buffer, int buflen);
+ void readStdErr(TDEProcess *proc, char *buffer, int buflen);
private:
TQString mybuf, mystderr;
diff --git a/kioslave/smb/kio_smb_mount.cpp b/kioslave/smb/kio_smb_mount.cpp
index f9c36623..5466ee06 100644
--- a/kioslave/smb/kio_smb_mount.cpp
+++ b/kioslave/smb/kio_smb_mount.cpp
@@ -25,12 +25,12 @@
#include <tqdir.h>
#include <kprocess.h>
-void SMBSlave::readOutput(KProcess *, char *buffer, int buflen)
+void SMBSlave::readOutput(TDEProcess *, char *buffer, int buflen)
{
mybuf += TQString::fromLocal8Bit(buffer, buflen);
}
-void SMBSlave::readStdErr(KProcess *, char *buffer, int buflen)
+void SMBSlave::readStdErr(TDEProcess *, char *buffer, int buflen)
{
mystderr += TQString::fromLocal8Bit(buffer, buflen);
}
@@ -85,7 +85,7 @@ void SMBSlave::special( const TQByteArray & data)
// using smbmount instead of "mount -t smbfs", because mount does not allow a non-root
// user to do a mount, but a suid smbmnt does allow this
- KProcess proc;
+ TDEProcess proc;
proc.setUseShell(true); // to have the path to smbmnt (which is used by smbmount); see man smbmount
proc << "smbmount";
@@ -98,28 +98,28 @@ void SMBSlave::special( const TQByteArray & data)
}
else
{
- options = "-o username=" + KProcess::quote(smburl.user());
+ options = "-o username=" + TDEProcess::quote(smburl.user());
user = smburl.user();
if ( ! smburl.pass().isEmpty() )
- options += ",password=" + KProcess::quote(smburl.pass());
+ options += ",password=" + TDEProcess::quote(smburl.pass());
}
// TODO: check why the control center uses encodings with a blank char, e.g. "cp 1250"
//if ( ! m_default_encoding.isEmpty() )
- //options += ",codepage=" + KProcess::quote(m_default_encoding);
+ //options += ",codepage=" + TDEProcess::quote(m_default_encoding);
- proc << KProcess::quote(remotePath.local8Bit());
- proc << KProcess::quote(mountPoint.local8Bit());
+ proc << TDEProcess::quote(remotePath.local8Bit());
+ proc << TDEProcess::quote(mountPoint.local8Bit());
proc << options;
- connect(&proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int )),
- TQT_SLOT(readOutput(KProcess *, char *, int)));
+ connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )),
+ TQT_SLOT(readOutput(TDEProcess *, char *, int)));
- connect(&proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int )),
- TQT_SLOT(readStdErr(KProcess *, char *, int)));
+ connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )),
+ TQT_SLOT(readStdErr(TDEProcess *, char *, int)));
- if (!proc.start( KProcess::Block, KProcess::AllOutput ))
+ if (!proc.start( TDEProcess::Block, TDEProcess::AllOutput ))
{
error(KIO::ERR_CANNOT_LAUNCH_PROCESS,
"smbmount"+i18n("\nMake sure that the samba package is installed properly on your system."));
@@ -146,21 +146,21 @@ void SMBSlave::special( const TQByteArray & data)
TQString mountPoint;
stream >> mountPoint;
- KProcess proc;
+ TDEProcess proc;
proc.setUseShell(true);
proc << "smbumount";
- proc << KProcess::quote(mountPoint);
+ proc << TDEProcess::quote(mountPoint);
mybuf.truncate(0);
mystderr.truncate(0);
- connect(&proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int )),
- TQT_SLOT(readOutput(KProcess *, char *, int)));
+ connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )),
+ TQT_SLOT(readOutput(TDEProcess *, char *, int)));
- connect(&proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int )),
- TQT_SLOT(readStdErr(KProcess *, char *, int)));
+ connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )),
+ TQT_SLOT(readStdErr(TDEProcess *, char *, int)));
- if ( !proc.start( KProcess::Block, KProcess::AllOutput ) )
+ if ( !proc.start( TDEProcess::Block, TDEProcess::AllOutput ) )
{
error(KIO::ERR_CANNOT_LAUNCH_PROCESS,
"smbumount"+i18n("\nMake sure that the samba package is installed properly on your system."));
diff --git a/kioslave/system/kdedmodule/systemdirnotify.cpp b/kioslave/system/kdedmodule/systemdirnotify.cpp
index 4f703efd..3a6f029e 100644
--- a/kioslave/system/kdedmodule/systemdirnotify.cpp
+++ b/kioslave/system/kdedmodule/systemdirnotify.cpp
@@ -41,11 +41,11 @@ void SystemDirNotify::init()
printf("[systemdirnotify] SystemDirNotify::init(mInited)");
return;
mInited = true;
- KGlobal::dirs()->addResourceType("system_entries",
+ TDEGlobal::dirs()->addResourceType("system_entries",
KStandardDirs::kde_default("data") + "systemview");
TQStringList names_found;
- TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
+ TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries");
TQStringList::ConstIterator dirpath = dirList.begin();
TQStringList::ConstIterator end = dirList.end();
diff --git a/kioslave/system/kdedmodule/systemdirnotifymodule.cpp b/kioslave/system/kdedmodule/systemdirnotifymodule.cpp
index b89daf12..64e8c8d6 100644
--- a/kioslave/system/kdedmodule/systemdirnotifymodule.cpp
+++ b/kioslave/system/kdedmodule/systemdirnotifymodule.cpp
@@ -30,7 +30,7 @@ SystemDirNotifyModule::SystemDirNotifyModule(const TQCString &obj)
extern "C" {
KDE_EXPORT KDEDModule *create_systemdirnotify(const TQCString &obj)
{
- KGlobal::locale()->insertCatalogue("kio_system");
+ TDEGlobal::locale()->insertCatalogue("kio_system");
return new SystemDirNotifyModule(obj);
}
}
diff --git a/kioslave/system/systemimpl.cpp b/kioslave/system/systemimpl.cpp
index 43792f8d..24d7776b 100644
--- a/kioslave/system/systemimpl.cpp
+++ b/kioslave/system/systemimpl.cpp
@@ -33,7 +33,7 @@
SystemImpl::SystemImpl() : TQObject()
{
- KGlobal::dirs()->addResourceType("system_entries",
+ TDEGlobal::dirs()->addResourceType("system_entries",
KStandardDirs::kde_default("data") + "systemview");
}
@@ -42,7 +42,7 @@ bool SystemImpl::listRoot(TQValueList<KIO::UDSEntry> &list)
kdDebug() << "SystemImpl::listRoot" << endl;
TQStringList names_found;
- TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
+ TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries");
TQStringList::ConstIterator dirpath = dirList.begin();
TQStringList::ConstIterator end = dirList.end();
@@ -114,7 +114,7 @@ bool SystemImpl::statByName(const TQString &filename, KIO::UDSEntry& entry)
{
kdDebug() << "SystemImpl::statByName" << endl;
- TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
+ TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries");
TQStringList::ConstIterator dirpath = dirList.begin();
TQStringList::ConstIterator end = dirList.end();
@@ -147,7 +147,7 @@ KURL SystemImpl::findBaseURL(const TQString &filename) const
{
kdDebug() << "SystemImpl::findBaseURL" << endl;
- TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
+ TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries");
TQStringList::ConstIterator dirpath = dirList.begin();
TQStringList::ConstIterator end = dirList.end();
diff --git a/kioslave/thumbnail/exrcreator.cpp b/kioslave/thumbnail/exrcreator.cpp
index d0edbd38..0cc8d54d 100644
--- a/kioslave/thumbnail/exrcreator.cpp
+++ b/kioslave/thumbnail/exrcreator.cpp
@@ -62,7 +62,7 @@ bool EXRCreator::create(const TQString &path, int, int, TQImage &img)
// EXR images just to turn it into an icon, so we go back
// to honouring it in here.
kdDebug() << "EXRcreator - using original image" << endl;
- KConfig * config = KGlobal::config();
+ KConfig * config = TDEGlobal::config();
KConfigGroupSaver cgs( config, "PreviewSettings" );
unsigned long long maxSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ );
unsigned long long fileSize = TQFile( path ).size();
diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp
index 29c3c862..ac7525c6 100644
--- a/kioslave/thumbnail/thumbnail.cpp
+++ b/kioslave/thumbnail/thumbnail.cpp
@@ -195,7 +195,7 @@ void ThumbnailProtocol::get(const KURL &url)
#endif
if (!iconSize)
- iconSize = KGlobal::iconLoader()->currentSize(KIcon::Desktop);
+ iconSize = TDEGlobal::iconLoader()->currentSize(KIcon::Desktop);
if (iconSize != m_iconSize)
m_iconDict.clear();
m_iconSize = iconSize;
@@ -206,7 +206,7 @@ void ThumbnailProtocol::get(const KURL &url)
TQImage img;
- KConfigGroup group( KGlobal::config(), "PreviewSettings" );
+ KConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
// ### KFMI
@@ -341,7 +341,7 @@ void ThumbnailProtocol::get(const KURL &url)
}
#endif
- if ((flags & ThumbCreator::BlendIcon) && KGlobal::iconLoader()->alphaBlending(KIcon::Desktop))
+ if ((flags & ThumbCreator::BlendIcon) && TDEGlobal::iconLoader()->alphaBlending(KIcon::Desktop))
{
// blending the mimetype icon in
TQImage icon = getIcon();
diff --git a/kioslave/trash/kfile-plugin/kfile_trash.cpp b/kioslave/trash/kfile-plugin/kfile_trash.cpp
index edd57014..182d9c40 100644
--- a/kioslave/trash/kfile-plugin/kfile_trash.cpp
+++ b/kioslave/trash/kfile-plugin/kfile_trash.cpp
@@ -34,7 +34,7 @@ K_EXPORT_COMPONENT_FACTORY(kfile_trash, TrashFactory("kfile_trash"))
KTrashPlugin::KTrashPlugin(TQObject *parent, const char *name,
const TQStringList &args) : KFilePlugin(parent, name, args)
{
- KGlobal::locale()->insertCatalogue( "kio_trash" );
+ TDEGlobal::locale()->insertCatalogue( "kio_trash" );
kdDebug(7034) << "Trash file meta info plugin\n";
diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp
index d1efdf2c..ef255e91 100644
--- a/kioslave/trash/testtrash.cpp
+++ b/kioslave/trash/testtrash.cpp
@@ -135,7 +135,7 @@ static void removeDir( const TQString& trashDir, const TQString& dirName )
void TestTrash::setup()
{
- m_trashDir = KGlobal::dirs()->localxdgdatadir() + "Trash";
+ m_trashDir = TDEGlobal::dirs()->localxdgdatadir() + "Trash";
kdDebug() << "setup: using trash directory " << m_trashDir << endl;
// Look for another writable partition than $HOME (not mandatory)
@@ -380,7 +380,7 @@ static void checkInfoFile( const TQString& infoPath, const TQString& origFilePat
infoFile.setGroup( "Trash Info" );
const TQString origPath = infoFile.readEntry( "Path" );
assert( !origPath.isEmpty() );
- assert( origPath == KURL::encode_string( origFilePath, KGlobal::locale()->fileEncodingMib() ) );
+ assert( origPath == KURL::encode_string( origFilePath, TDEGlobal::locale()->fileEncodingMib() ) );
const TQString date = infoFile.readEntry( "DeletionDate" );
assert( !date.isEmpty() );
assert( date.contains( "T" ) );
diff --git a/kioslave/trash/trashimpl.cpp b/kioslave/trash/trashimpl.cpp
index 081cc9ef..96888f9d 100644
--- a/kioslave/trash/trashimpl.cpp
+++ b/kioslave/trash/trashimpl.cpp
@@ -56,7 +56,7 @@ TrashImpl::TrashImpl() :
m_lastId( 0 ),
m_homeDevice( 0 ),
m_trashDirectoriesScanned( false ),
- m_mibEnum( KGlobal::locale()->fileEncodingMib() ),
+ m_mibEnum( TDEGlobal::locale()->fileEncodingMib() ),
// not using kio_trashrc since KIO uses that one already for kio_trash
// so better have a separate one, for faster parsing by e.g. kmimetype.cpp
m_config( "trashrc" )
@@ -132,7 +132,7 @@ 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 TQString xdgDataDir = KGlobal::dirs()->localxdgdatadir();
+ const TQString xdgDataDir = TDEGlobal::dirs()->localxdgdatadir();
if ( !KStandardDirs::makeDir( xdgDataDir, 0700 ) ) {
kdWarning() << "failed to create " << xdgDataDir << endl;
return false;
@@ -161,7 +161,7 @@ bool TrashImpl::init()
void TrashImpl::migrateOldTrash()
{
kdDebug() << k_funcinfo << endl;
- const TQString oldTrashDir = KGlobalSettings::trashPath();
+ const TQString oldTrashDir = TDEGlobalSettings::trashPath();
const TQStrList entries = listDir( oldTrashDir );
bool allOK = true;
TQStrListIterator entryIt( entries );
diff --git a/klipper/applet.cpp b/klipper/applet.cpp
index 97eee6ee..35820987 100644
--- a/klipper/applet.cpp
+++ b/klipper/applet.cpp
@@ -34,7 +34,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("klipper");
+ TDEGlobal::locale()->insertCatalogue("klipper");
int actions = KPanelApplet::Preferences | KPanelApplet::About | KPanelApplet::Help;
return new KlipperApplet(configFile, KPanelApplet::Normal, actions, parent, "klipper");
}
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index d48f45b9..2fcc2335 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -35,7 +35,7 @@
#include "configdialog.h"
-ConfigDialog::ConfigDialog( const ActionList *list, KGlobalAccel *accel,
+ConfigDialog::ConfigDialog( const ActionList *list, TDEGlobalAccel *accel,
bool isApplet )
: KDialogBase( Tabbed, i18n("Configure"),
Ok | Cancel | Help,
diff --git a/klipper/configdialog.h b/klipper/configdialog.h
index 514f40bc..7db964b4 100644
--- a/klipper/configdialog.h
+++ b/klipper/configdialog.h
@@ -35,7 +35,7 @@
#include "urlgrabber.h"
-class KGlobalAccel;
+class TDEGlobalAccel;
class KKeyChooser;
class KListView;
class TQPushButton;
@@ -137,7 +137,7 @@ class ConfigDialog : public KDialogBase
Q_OBJECT
public:
- ConfigDialog( const ActionList *list, KGlobalAccel *accel, bool isApplet );
+ ConfigDialog( const ActionList *list, TDEGlobalAccel *accel, bool isApplet );
~ConfigDialog();
ActionList * actionList() const { return actionWidget->actionList(); }
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index 3e2f9de7..3e1db75b 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -107,7 +107,7 @@ KlipperPopup::KlipperPopup( History* history, TQWidget* parent, const char* name
{
KWin::WindowInfo i = KWin::windowInfo( winId(), NET::WMGeometry );
TQRect g = i.geometry();
- TQRect screen = KGlobalSettings::desktopGeometry(g.center());
+ TQRect screen = TDEGlobalSettings::desktopGeometry(g.center());
int menu_height = ( screen.height() ) * 3/4;
int menu_width = ( screen.width() ) * 1/3;
@@ -167,7 +167,7 @@ void KlipperPopup::buildFromScratch() {
action->plug( this, -1 );
}
- if ( KGlobalSettings::insertTearOffHandle() ) {
+ if ( TDEGlobalSettings::insertTearOffHandle() ) {
insertTearOffHandle();
}
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index b16f5086..1a8010cc 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -206,8 +206,8 @@ KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config )
m_iconOrigHeight = height();
adjustSize();
- globalKeys = new KGlobalAccel(TQT_TQOBJECT(this));
- KGlobalAccel* keys = globalKeys;
+ globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+ TDEGlobalAccel* keys = globalKeys;
#include "klipperbindings.cpp"
// the keys need to be read from kdeglobals, not kickerrc --ellis, 22/9/02
globalKeys->readSettings();
@@ -337,7 +337,7 @@ void KlipperWidget::showPopupMenu( TQPopupMenu *menu )
} else {
KWin::WindowInfo i = KWin::windowInfo( winId(), NET::WMGeometry );
TQRect g = i.geometry();
- TQRect screen = KGlobalSettings::desktopGeometry(g.center());
+ TQRect screen = TDEGlobalSettings::desktopGeometry(g.center());
if ( g.x()-screen.x() > screen.width()/2 &&
g.y()-screen.y() + size.height() > screen.height() )
@@ -606,7 +606,7 @@ void KlipperWidget::slotQuit()
saveSession();
int autoStart = KMessageBox::questionYesNoCancel( 0L, i18n("Should Klipper start automatically\nwhen you login?"), i18n("Automatically Start Klipper?"), i18n("Start"), i18n("Do Not Start") );
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("General");
if ( autoStart == KMessageBox::Yes ) {
config->writeEntry("AutoStart", true);
@@ -1176,8 +1176,8 @@ static void ensureGlobalSyncOff(KConfig* config) {
true,
true );
config->sync();
- KClipboardSynchronizer::setSynchronizing( false );
- KClipboardSynchronizer::setReverseSynchronizing( false );
+ TDEClipboardSynchronizer::setSynchronizing( false );
+ TDEClipboardSynchronizer::setReverseSynchronizing( false );
KIPC::sendMessageAll( KIPC::ClipboardConfigChanged, 0 );
}
diff --git a/klipper/toplevel.h b/klipper/toplevel.h
index 59d7c739..b072bd18 100644
--- a/klipper/toplevel.h
+++ b/klipper/toplevel.h
@@ -59,7 +59,7 @@ public:
~KlipperWidget();
virtual void adjustSize();
- KGlobalAccel *globalKeys;
+ TDEGlobalAccel *globalKeys;
/**
* Get clipboard history (the "document")
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index 7e2cc6bd..f04bdf22 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -251,14 +251,14 @@ void URLGrabber::execute( const struct ClipCommand *command,
if ( cmdLine.isEmpty() )
return;
- KProcess proc;
+ TDEProcess proc;
const char *shell = getenv("KLIPPER_SHELL");
if (shell==NULL) shell = getenv("SHELL");
proc.setUseShell(true,shell);
proc << cmdLine.stripWhiteSpace();
- if ( !proc.start(KProcess::DontCare, KProcess::NoCommunication ))
+ if ( !proc.start(TDEProcess::DontCare, TDEProcess::NoCommunication ))
tqWarning("Klipper: Couldn't start process!");
}
}
diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp
index aac5d78d..9687384d 100644
--- a/kmenuedit/basictab.cpp
+++ b/kmenuedit/basictab.cpp
@@ -460,7 +460,7 @@ void BasicTab::slotExecSelected()
{
TQString path = _execEdit->lineEdit()->text();
if (!path.startsWith("'"))
- _execEdit->lineEdit()->setText(KProcess::quote(path));
+ _execEdit->lineEdit()->setText(TDEProcess::quote(path));
}
void BasicTab::slotCapturedShortcut(const KShortcut& cut)
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp
index 0f518f06..f0903d70 100644
--- a/kmenuedit/kmenuedit.cpp
+++ b/kmenuedit/kmenuedit.cpp
@@ -53,7 +53,7 @@ KMenuEdit::KMenuEdit (bool controlCenter, TQWidget *, const char *name)
KMenuEdit::~KMenuEdit()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("General");
config->writeEntry("SplitterSizes", m_splitter->sizes());
@@ -101,7 +101,7 @@ void KMenuEdit::setupView()
m_tree, TQT_SLOT(findServiceShortcut(const KShortcut&, KService::Ptr &)));
// restore splitter sizes
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
TQValueList<int> sizes = config->readIntListEntry("SplitterSizes");
if (sizes.isEmpty())
diff --git a/kmenuedit/menufile.cpp b/kmenuedit/menufile.cpp
index 162464a9..38f02ddc 100644
--- a/kmenuedit/menufile.cpp
+++ b/kmenuedit/menufile.cpp
@@ -194,7 +194,7 @@ static TQString entryToDirId(const TQString &path)
{
// XDG Desktop menu items come with absolute paths, we need to
// extract their relative path and then build a local path.
- local = KGlobal::dirs()->relativeLocation("xdgdata-dirs", path);
+ local = TDEGlobal::dirs()->relativeLocation("xdgdata-dirs", path);
}
if (local.isEmpty() || local.startsWith("/"))
diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index 693ba568..41740499 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -134,7 +134,7 @@ void TreeItem::setup()
static TQPixmap appIcon(const TQString &iconName)
{
- TQPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, 0L, true);
+ TQPixmap normal = TDEGlobal::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)
{
@@ -329,7 +329,7 @@ TQString TreeView::findName(KDesktopFile *df, bool deleted)
TQString res = df->resource();
bool isLocal = true;
- TQStringList files = KGlobal::dirs()->findAllResources(res.latin1(), file);
+ TQStringList files = TDEGlobal::dirs()->findAllResources(res.latin1(), file);
for(TQStringList::ConstIterator it = files.begin();
it != files.end();
++it)
@@ -598,7 +598,7 @@ TQStringList TreeView::fileList(const TQString& rPath)
TQStringList filelist;
// loop through all resource dirs and build a file list
- TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
+ TQStringList resdirlist = TDEGlobal::dirs()->resourceDirs("apps");
for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
{
TQDir dir((*it) + "/" + relativePath);
@@ -637,7 +637,7 @@ TQStringList TreeView::dirList(const TQString& rPath)
TQStringList dirlist;
// loop through all resource dirs and build a subdir list
- TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
+ TQStringList resdirlist = TDEGlobal::dirs()->resourceDirs("apps");
for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
{
TQDir dir((*it) + "/" + relativePath);
diff --git a/knetattach/knetattach.ui.h b/knetattach/knetattach.ui.h
index f60dab03..d4c3baf8 100644
--- a/knetattach/knetattach.ui.h
+++ b/knetattach/knetattach.ui.h
@@ -169,10 +169,10 @@ void KNetAttach::finished()
TQString name = _connectionName->text().stripWhiteSpace();
if (_createIcon->isChecked()) {
- KGlobal::dirs()->addResourceType("remote_entries",
+ TDEGlobal::dirs()->addResourceType("remote_entries",
KStandardDirs::kde_default("data") + "remoteview");
- TQString path = KGlobal::dirs()->saveLocation("remote_entries");
+ TQString path = TDEGlobal::dirs()->saveLocation("remote_entries");
path += name + ".desktop";
KSimpleConfig desktopFile(path, false);
desktopFile.setGroup("Desktop Entry");
diff --git a/konqueror/ChangeLog b/konqueror/ChangeLog
index e3af81e5..cc734cff 100644
--- a/konqueror/ChangeLog
+++ b/konqueror/ChangeLog
@@ -55,7 +55,7 @@
setHighlightingEnabled in the KonqDirPart constructor
* konq_mainwindow.cc (slotShowMenuBar): call saveMainWindowSettings and
- KGlobal::config()->sync() after toggling the visiblity of the menubar,
+ TDEGlobal::config()->sync() after toggling the visiblity of the menubar,
just like it is done for toolbars.
(slotPartActivated): connect and disconnect to/from the actionStatusText
and clearStatusText signals of the part's actioncollection
diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cc
index b726f759..9d62fb1c 100644
--- a/konqueror/KonquerorIface.cc
+++ b/konqueror/KonquerorIface.cc
@@ -182,7 +182,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString
void KonquerorIface::reparseConfiguration()
{
- KGlobal::config()->reparseConfiguration();
+ TDEGlobal::config()->reparseConfiguration();
KonqFMSettings::reparseConfiguration();
TQPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index 6b573d43..0f026a1e 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -98,7 +98,7 @@ TQString KonqAboutPageFactory::launch()
if ( res.isEmpty() )
return res;
- KIconLoader *iconloader = KGlobal::iconLoader();
+ KIconLoader *iconloader = TDEGlobal::iconLoader();
int iconSize = iconloader->currentSize(KIcon::Desktop);
TQString home_icon_path = iconloader->iconPath("kfm_home", KIcon::Desktop );
TQString storage_icon_path = iconloader->iconPath("system", KIcon::Desktop );
@@ -190,7 +190,7 @@ TQString KonqAboutPageFactory::intro()
if ( res.isEmpty() )
return res;
- KIconLoader *iconloader = KGlobal::iconLoader();
+ KIconLoader *iconloader = TDEGlobal::iconLoader();
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 );
@@ -244,7 +244,7 @@ TQString KonqAboutPageFactory::specs()
if ( s_specs_html )
return *s_specs_html;
- KIconLoader *iconloader = KGlobal::iconLoader();
+ KIconLoader *iconloader = TDEGlobal::iconLoader();
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() )
@@ -330,7 +330,7 @@ TQString KonqAboutPageFactory::tips()
if ( res.isEmpty() )
return res;
- KIconLoader *iconloader = KGlobal::iconLoader();
+ KIconLoader *iconloader = TDEGlobal::iconLoader();
TQString viewmag_icon_path =
iconloader->iconPath("viewmag", KIcon::Small );
TQString history_icon_path =
@@ -432,7 +432,7 @@ KonqAboutPage::KonqAboutPage( //KonqMainWindow *
: KHTMLPart( parentWidget, widgetName, parent, name, BrowserViewGUI )
{
//m_mainWindow = mainWindow;
- TQTextCodec* codec = KGlobal::locale()->codecForEncoding();
+ TQTextCodec* codec = TDEGlobal::locale()->codecForEncoding();
if (codec)
setCharset(codec->name(), true);
else
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index 566bb543..2fc8b336 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -308,9 +308,9 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
{
if ( tempFile )
kdWarning() << "kfmclient used with --tempfile but is passing to an external browser! Tempfile will never be deleted" << endl;
- KProcess proc;
+ TDEProcess proc;
proc << strBrowser << url.url();
- proc.start( KProcess::DontCare );
+ proc.start( TDEProcess::DontCare );
return true;
}
@@ -370,16 +370,16 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
KStartupInfoId id;
id.initId( startup_id_str );
id.setupStartupEnv();
- KProcess proc;
+ TDEProcess proc;
proc << "kshell" << "konqueror";
if ( !mimetype.isEmpty() )
proc << "-mimetype" << mimetype;
if ( tempFile )
proc << "-tempfile";
proc << url.url();
- proc.start( KProcess::DontCare );
+ proc.start( TDEProcess::DontCare );
KStartupInfo::resetStartupEnv();
- kdDebug( 1202 ) << "clientApp::createNewWindow KProcess started" << endl;
+ kdDebug( 1202 ) << "clientApp::createNewWindow TDEProcess started" << endl;
//}
}
return true;
@@ -422,7 +422,7 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url,
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.
+ // "app not found" in TDEProcessRunner, if that was the case.
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())
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index b3cc59d8..5157ed36 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -1059,7 +1059,7 @@ void KonqKfmIconView::showDirectoryOverlay(KFileIVI* item)
{
KFileItem* fileItem = item->item();
- if ( KGlobalSettings::showFilePreview( fileItem->url() ) ) {
+ if ( TDEGlobalSettings::showFilePreview( fileItem->url() ) ) {
m_paOutstandingOverlays.append(item);
if (m_paOutstandingOverlays.count() == 1)
{
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index f96ab6cd..8ae21861 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -185,8 +185,8 @@ TQString CurrentMgr::makeTimeStr(int b)
TQDateTime dt;
dt.setTime_t(b);
return (dt.daysTo(TQDateTime::currentDateTime()) > 31)
- ? KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false)
- : KGlobal::locale()->formatDateTime(dt, false);
+ ? TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false)
+ : TDEGlobal::locale()->formatDateTime(dt, false);
}
/* -------------------------- */
@@ -252,7 +252,7 @@ KEBApp::KEBApp(
ListView::self()->connectSignals();
- KGlobal::locale()->insertCatalogue("libkonq");
+ TDEGlobal::locale()->insertCatalogue("libkonq");
m_canPaste = false;
@@ -337,7 +337,7 @@ void KEBApp::notifyCommandExecuted() {
/* -------------------------- */
void KEBApp::slotConfigureToolbars() {
- saveMainWindowSettings(KGlobal::config(), "MainWindow");
+ saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
KEditToolbar dlg(actionCollection());
connect(&dlg, TQT_SIGNAL( newToolbarConfig() ),
TQT_SLOT( slotNewToolbarConfig() ));
@@ -347,7 +347,7 @@ void KEBApp::slotConfigureToolbars() {
void KEBApp::slotNewToolbarConfig() {
// called when OK or Apply is clicked
createGUI();
- applyMainWindowSettings(KGlobal::config(), "MainWindow");
+ applyMainWindowSettings(TDEGlobal::config(), "MainWindow");
}
/* -------------------------- */
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc
index dd1e7fe4..4edce07a 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cc
@@ -568,7 +568,7 @@ void KonqCombo::mouseMoveEvent( TQMouseEvent *e )
if ( e->state() & Qt::LeftButton &&
(e->pos() - m_dragStart).manhattanLength() >
- KGlobalSettings::dndEventDelay() )
+ TDEGlobalSettings::dndEventDelay() )
{
KURL url = KURL::fromPathOrURL( currentText() );
if ( url.isValid() )
@@ -733,7 +733,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter )
painter->drawText( pmWidth, 0, urlWidth + pmWidth, itemHeight,
Qt::AlignLeft | Qt::AlignTop, squeezedText );
- //painter->setPen( KGlobalSettings::inactiveTextColor() );
+ //painter->setPen( TDEGlobalSettings::inactiveTextColor() );
squeezedText = KStringHandler::rPixelSqueeze( title, listBox()->fontMetrics(), titleWidth );
TQFont font = painter->font();
font.setItalic( true );
diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc
index be14f7e6..34efa99e 100644
--- a/konqueror/konq_extensionmanager.cc
+++ b/konqueror/konq_extensionmanager.cc
@@ -61,7 +61,7 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai
// There's a limitation of KPluginSelector here... It assumes that all plugins in a given widget (as created by addPlugins)
// have their config in the same KConfig[Group]. So we can't show konqueror extensions and khtml extensions in the same tab.
- d->pluginSelector->addPlugins("konqueror", i18n("Extensions"), "Extensions", KGlobal::config());
+ d->pluginSelector->addPlugins("konqueror", i18n("Extensions"), "Extensions", TDEGlobal::config());
if ( activePart ) {
TDEInstance* instance = activePart->instance();
d->pluginSelector->addPlugins(instance->instanceName(), i18n("Tools"), "Tools", instance->config());
@@ -100,7 +100,7 @@ void KonqExtensionManager::apply()
setChanged(false);
if( d->mainWindow )
{
- KParts::Plugin::loadPlugins(TQT_TQOBJECT(d->mainWindow), d->mainWindow, KGlobal::instance());
+ KParts::Plugin::loadPlugins(TQT_TQOBJECT(d->mainWindow), d->mainWindow, TDEGlobal::instance());
TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(TQT_TQOBJECT(d->mainWindow));
TQPtrListIterator<KParts::Plugin> it(plugins);
KParts::Plugin *plugin;
diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc
index 7967384c..d53c9154 100644
--- a/konqueror/konq_frame.cc
+++ b/konqueror/konq_frame.cc
@@ -497,7 +497,7 @@ KonqFrameContainer::KonqFrameContainer( Orientation o,
m_pFirstChild = 0L;
m_pSecondChild = 0L;
m_pActiveChild = 0L;
- setOpaqueResize( KGlobalSettings::opaqueResize() );
+ setOpaqueResize( TDEGlobalSettings::opaqueResize() );
}
KonqFrameContainer::~KonqFrameContainer()
diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc
index 7e7a11ae..9be0b538 100644
--- a/konqueror/konq_main.cc
+++ b/konqueror/konq_main.cc
@@ -62,7 +62,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
KonquerorIface *kiface = new KonquerorIface;
app.dcopClient()->setDefaultObject( kiface->objId() );
- KGlobal::locale()->insertCatalogue("libkonq"); // needed for apps using libkonq
+ TDEGlobal::locale()->insertCatalogue("libkonq"); // needed for apps using libkonq
KImageIO::registerFormats();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
@@ -87,7 +87,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
{
if (args->isSet("profiles"))
{
- TQStringList profiles = KGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", false, true);
+ TQStringList profiles = TDEGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", false, true);
profiles.sort();
for(TQStringList::ConstIterator it = profiles.begin();
it != profiles.end(); ++it)
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index b1597ecc..30a6b7be 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -202,7 +202,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
// setup the completion object before createGUI(), so that the combo
// picks up the correct mode from the HistoryManager (in slotComboPlugged)
int mode = KonqSettings::settingsCompletionMode();
- s_pCompletion->setCompletionMode( (KGlobalSettings::Completion) mode );
+ s_pCompletion->setCompletionMode( (TDEGlobalSettings::Completion) mode );
}
connect(KParts::HistoryProvider::self(), TQT_SIGNAL(cleared()), TQT_SLOT(slotClearComboHistory()));
@@ -218,7 +218,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
initCombo();
initActions();
- setInstance( KGlobal::instance() );
+ setInstance( TDEGlobal::instance() );
connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ),
this, TQT_SLOT( slotDatabaseChanged() ) );
@@ -1455,7 +1455,7 @@ void KonqMainWindow::slotOpenTerminal()
}
}
- KProcess cmd;
+ TDEProcess cmd;
cmd.setWorkingDirectory(dir);
// Compensate for terminal having arguments.
@@ -1465,7 +1465,7 @@ void KonqMainWindow::slotOpenTerminal()
kdDebug(1202) << "slotOpenTerminal: directory " << dir
<< ", terminal:" << term << endl;
- cmd.start(KProcess::DontCare);
+ cmd.start(TDEProcess::DontCare);
}
void KonqMainWindow::slotOpenLocation()
@@ -1945,7 +1945,7 @@ void KonqMainWindow::slotGoTrash()
void KonqMainWindow::slotGoAutostart()
{
KURL u;
- u.setPath( KGlobalSettings::autostartPath() );
+ u.setPath( TDEGlobalSettings::autostartPath() );
openURL( 0L, u );
}
@@ -2022,7 +2022,7 @@ void KonqMainWindow::slotConfigureSpellChecking()
void KonqMainWindow::slotConfigureToolbars()
{
if ( autoSaveSettings() )
- saveMainWindowSettings( KGlobal::config(), "KonqMainWindow" );
+ saveMainWindowSettings( TDEGlobal::config(), "KonqMainWindow" );
KEditToolbar dlg(factory());
connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig()));
connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(initBookmarkBar()));
@@ -2038,7 +2038,7 @@ void KonqMainWindow::slotNewToolbarConfig() // This is called when OK or Apply i
plugViewModeActions();
- applyMainWindowSettings( KGlobal::config(), "KonqMainWindow" );
+ applyMainWindowSettings( TDEGlobal::config(), "KonqMainWindow" );
}
void KonqMainWindow::slotUndoAvailable( bool avail )
@@ -2728,7 +2728,7 @@ void KonqMainWindow::slotPopupThisWindow()
void KonqMainWindow::slotPopupNewTabAtFront()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") );
bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false );
popupNewTab(true, openAfterCurrentPage);
@@ -3281,8 +3281,8 @@ 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, TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)),
- TQT_SLOT( slotCompletionModeChanged( KGlobalSettings::Completion )));
+ connect( m_combo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+ TQT_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion )));
connect( m_combo, TQT_SIGNAL( completion( const TQString& )),
TQT_SLOT( slotMakeCompletion( const TQString& )));
connect( m_combo, TQT_SIGNAL( substringCompletion( const TQString& )),
@@ -3312,7 +3312,7 @@ void KonqMainWindow::bookmarksIntoCompletion()
}
// the user changed the completion mode in the combo
-void KonqMainWindow::slotCompletionModeChanged( KGlobalSettings::Completion m )
+void KonqMainWindow::slotCompletionModeChanged( TDEGlobalSettings::Completion m )
{
s_pCompletion->setCompletionMode( m );
@@ -3350,8 +3350,8 @@ void KonqMainWindow::slotMakeCompletion( const TQString& text )
completion = s_pCompletion->makeCompletion( text );
// some special handling necessary for CompletionPopup
- if ( m_combo->completionMode() == KGlobalSettings::CompletionPopup ||
- m_combo->completionMode() == KGlobalSettings::CompletionPopupAuto )
+ if ( m_combo->completionMode() == TDEGlobalSettings::CompletionPopup ||
+ m_combo->completionMode() == TDEGlobalSettings::CompletionPopupAuto )
m_combo->setCompletedItems( historyPopupCompletionItems( text ) );
else if ( !completion.isNull() )
@@ -3414,8 +3414,8 @@ void KonqMainWindow::slotMatch( const TQString &match )
m_urlCompletionStarted = false;
// some special handling necessary for CompletionPopup
- if ( m_combo->completionMode() == KGlobalSettings::CompletionPopup ||
- m_combo->completionMode() == KGlobalSettings::CompletionPopupAuto ) {
+ if ( m_combo->completionMode() == TDEGlobalSettings::CompletionPopup ||
+ m_combo->completionMode() == TDEGlobalSettings::CompletionPopupAuto ) {
TQStringList items = m_pURLCompletion->allMatches();
items += historyPopupCompletionItems( m_combo->currentText() );
// items.sort(); // should we?
@@ -3599,8 +3599,8 @@ void KonqMainWindow::slotForceSaveMainWindowSettings()
// kdDebug(1202)<<"slotForceSaveMainWindowSettings()"<<endl;
if ( autoSaveSettings() ) // don't do it on e.g. JS window.open windows with no toolbars!
{
- saveMainWindowSettings( KGlobal::config(), "KonqMainWindow" );
- KGlobal::config()->sync();
+ saveMainWindowSettings( TDEGlobal::config(), "KonqMainWindow" );
+ TDEGlobal::config()->sync();
}
}
@@ -5107,7 +5107,7 @@ void KonqMainWindow::updateViewModeActions()
// Another temporary map, the preferred service for each library (2 entries in our example)
TQMap<TQString,TQString> preferredServiceMap;
- KConfig * config = KGlobal::config();
+ KConfig * config = TDEGlobal::config();
config->setGroup( "ModeToolBarServices" );
KTrader::OfferList::ConstIterator it = services.begin();
@@ -5243,7 +5243,7 @@ void KonqMainWindow::saveToolBarServicesMap()
{
TQMap<TQString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.begin();
TQMap<TQString,KService::Ptr>::ConstIterator serviceEnd = m_viewModeToolBarServices.end();
- KConfig * config = KGlobal::config();
+ KConfig * config = TDEGlobal::config();
config->setGroup( "ModeToolBarServices" );
for ( ; serviceIt != serviceEnd ; ++serviceIt )
config->writeEntry( serviceIt.key(), serviceIt.data()->desktopEntryName() );
@@ -5295,7 +5295,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
KonqFrameTabs* tabContainer = static_cast<KonqFrameTabs*>(viewManager()->docContainer());
if ( tabContainer->count() > 1 )
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver cs( config, TQString::fromLatin1("Notification Messages") );
if ( !config->hasKey( "MultipleTabConfirm" ) )
@@ -5481,8 +5481,8 @@ void KonqMainWindow::slotAddWebSideBar(const KURL& url, const TQString& name)
void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group )
{
- static const TQString& http = KGlobal::staticQString( "http" );
- static const TQString& ftp = KGlobal::staticQString( "ftp" );
+ static const TQString& http = TDEGlobal::staticQString( "http" );
+ static const TQString& ftp = TDEGlobal::staticQString( "ftp" );
if ( group.isNull() )
return;
@@ -5990,23 +5990,23 @@ static int current_memory_usage( int* limit )
void KonqMainWindow::saveWindowSize() const
{
- TQString savedGroup = KGlobal::config()->group();
- KGlobal::config()->setGroup( "KonqMainWindow_Size" );
+ TQString savedGroup = TDEGlobal::config()->group();
+ TDEGlobal::config()->setGroup( "KonqMainWindow_Size" );
- KParts::MainWindow::saveWindowSize( KGlobal::config() );
+ KParts::MainWindow::saveWindowSize( TDEGlobal::config() );
- KGlobal::config()->setGroup( savedGroup );
- KGlobal::config()->sync();
+ TDEGlobal::config()->setGroup( savedGroup );
+ TDEGlobal::config()->sync();
}
void KonqMainWindow::restoreWindowSize()
{
- TQString savedGroup = KGlobal::config()->group();
- KGlobal::config()->setGroup( "KonqMainWindow_Size" );
+ TQString savedGroup = TDEGlobal::config()->group();
+ TDEGlobal::config()->setGroup( "KonqMainWindow_Size" );
- KParts::MainWindow::restoreWindowSize( KGlobal::config() );
+ KParts::MainWindow::restoreWindowSize( TDEGlobal::config() );
- KGlobal::config()->setGroup( savedGroup );
+ TDEGlobal::config()->setGroup( savedGroup );
}
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index ac73c367..c0dd7569 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -491,7 +491,7 @@ protected slots:
void slotForwardActivated( int id );
void slotGoHistoryDelayed();
- void slotCompletionModeChanged( KGlobalSettings::Completion );
+ void slotCompletionModeChanged( TDEGlobalSettings::Completion );
void slotMakeCompletion( const TQString& );
void slotSubstringcompletion( const TQString& );
void slotRotation( KCompletionBase::KeyBindingType );
diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc
index 2a354706..4c5fa868 100644
--- a/konqueror/konq_profiledlg.cc
+++ b/konqueror/konq_profiledlg.cc
@@ -42,7 +42,7 @@ KonqProfileMap KonqProfileDlg::readAllProfiles()
{
KonqProfileMap mapProfiles;
- TQStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
+ TQStringList profiles = TDEGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
TQStringList::ConstIterator pIt = profiles.begin();
TQStringList::ConstIterator pEnd = profiles.end();
for (; pIt != pEnd; ++pIt )
diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc
index 466504b4..8a5ff3e8 100644
--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cc
@@ -321,7 +321,7 @@ void KonqFrameTabs::removeChildFrame( KonqFrameBase * frame )
void KonqFrameTabs::slotCurrentChanged( TQWidget* newPage )
{
- setTabColor( newPage, KGlobalSettings::textColor() );
+ setTabColor( newPage, TDEGlobalSettings::textColor() );
KonqFrameBase* currentFrame = tqt_dynamic_cast<KonqFrameBase*>(newPage);
if (currentFrame && !m_pViewManager->isLoadingProfile()) {
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index 58ed78b3..6a7234c6 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -1342,9 +1342,9 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
void KonqView::setActiveInstance()
{
if ( m_bBuiltinView || !m_pPart->instance() /*never!*/)
- KGlobal::_activeInstance = KGlobal::instance();
+ TDEGlobal::_activeInstance = TDEGlobal::instance();
else
- KGlobal::_activeInstance = m_pPart->instance();
+ TDEGlobal::_activeInstance = m_pPart->instance();
}
bool KonqView::prepareReload( KParts::URLArgs& args )
diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h
index 5d0c0af5..2af897dd 100644
--- a/konqueror/konq_view.h
+++ b/konqueror/konq_view.h
@@ -309,7 +309,7 @@ public:
void goHistory( int steps );
- // Set the KGlobal active instance (the one used by KBugReport)
+ // Set the TDEGlobal active instance (the one used by KBugReport)
void setActiveInstance();
// Called before reloading this view. Sets args.reload to true, and offers to repost form data.
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc
index 8fce3f14..4413416f 100644
--- a/konqueror/konq_viewmgr.cc
+++ b/konqueror/konq_viewmgr.cc
@@ -1078,7 +1078,7 @@ void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString
{
TQString path = locateLocal( "data", TQString::fromLatin1( "konqueror/profiles/" ) +
- fileName, KGlobal::instance() );
+ fileName, TDEGlobal::instance() );
if ( TQFile::exists( path ) )
TQFile::remove( path );
@@ -1299,7 +1299,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename,
if( resetWindow )
{ // force default settings for the GUI
- m_pMainWindow->applyMainWindowSettings( KGlobal::config(), "KonqMainWindow", true );
+ m_pMainWindow->applyMainWindowSettings( TDEGlobal::config(), "KonqMainWindow", true );
}
// Apply menu/toolbar settings saved in profile. Read from a separate group
@@ -1411,7 +1411,7 @@ TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget )
int width = -1;
int height = -1;
- TQRect geom = KGlobalSettings::desktopGeometry(widget);
+ TQRect geom = TDEGlobalSettings::desktopGeometry(widget);
if ( widthStr.contains( '%' ) == 1 )
{
@@ -1755,15 +1755,15 @@ void KonqViewManager::setLoading( KonqView *view, bool loading )
TQColor color;
KonqFrameTabs* konqframetabs = static_cast<KonqFrameTabs*>( parentContainer );
if ( loading )
- color = TQColor( (KGlobalSettings::linkColor().red() + KGlobalSettings::inactiveTextColor().red())/2,
- (KGlobalSettings::linkColor().green()+ KGlobalSettings::inactiveTextColor().green())/2,
- (KGlobalSettings::linkColor().blue() + KGlobalSettings::inactiveTextColor().blue())/2 );
+ color = TQColor( (TDEGlobalSettings::linkColor().red() + TDEGlobalSettings::inactiveTextColor().red())/2,
+ (TDEGlobalSettings::linkColor().green()+ TDEGlobalSettings::inactiveTextColor().green())/2,
+ (TDEGlobalSettings::linkColor().blue() + TDEGlobalSettings::inactiveTextColor().blue())/2 );
else
{
if ( konqframetabs->currentPage() != view->frame() )
- color = KGlobalSettings::linkColor();
+ color = TDEGlobalSettings::linkColor();
else
- color = KGlobalSettings::textColor();
+ color = TDEGlobalSettings::textColor();
}
konqframetabs->setTabColor( view->frame(), color );
}
diff --git a/konqueror/konqueror.kcfg b/konqueror/konqueror.kcfg
index 756b80e2..c4a82225 100644
--- a/konqueror/konqueror.kcfg
+++ b/konqueror/konqueror.kcfg
@@ -53,7 +53,7 @@
</entry>
<!-- fontopts.cpp -->
<entry key="StandardFont" type="Font"> <!--LIBKONQ-->
- <default code="true">KGlobalSettings::generalFont()</default>
+ <default code="true">TDEGlobalSettings::generalFont()</default>
<label>Standard font</label>
<whatsthis>This is the font used to display text in Konqueror windows.</whatsthis>
<!-- checked -->
@@ -580,7 +580,7 @@ PATH_JAVA
<!-- checked -->
</entry>
<entry name="SettingsCompletionMode" key="CompletionMode" type="Enum">
- <default code="true">KGlobalSettings::completionMode()</default>
+ <default code="true">TDEGlobalSettings::completionMode()</default>
<label></label>
<whatsthis></whatsthis>
</entry>
diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc
index b06baaf7..188c3c39 100644
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cc
@@ -87,7 +87,7 @@ void KonqInfoListViewItem::updateContents()
break;
case KIO::UDS_SIZE:
if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() )
- setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
+ setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
else
setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" ");
break;
@@ -103,7 +103,7 @@ void KonqInfoListViewItem::updateContents()
if ( _time != 0 )
{
dt.setTime_t( _time );
- setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));
+ setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatDateTime(dt));
}
}
break;
@@ -202,7 +202,7 @@ void KonqInfoListViewItem::setDisabled( bool disabled )
{
KonqBaseListViewItem::setDisabled( disabled );
int iconSize = static_cast<KonqBaseListViewWidget *>(listView())->iconSize();
- iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
+ iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index b3b886d8..94f9211a 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -124,7 +124,7 @@ void ListViewBrowserExtension::updateActions()
{
canCopy++;
KURL url = item->url();
- if ( url.directory(false) == KGlobalSettings::trashPath() )
+ if ( url.directory(false) == TDEGlobalSettings::trashPath() )
bInTrash = true;
if ( KProtocolInfo::supportsDeleting( url ) )
canDel++;
diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc
index 016f3d77..616559ba 100644
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cc
@@ -119,7 +119,7 @@ void KonqListViewItem::updateContents()
break;
case KIO::UDS_SIZE:
if ( m_pListViewWidget->m_pSettings->fileSizeInBytes() )
- setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
+ setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
else
setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" ");
break;
@@ -135,7 +135,7 @@ void KonqListViewItem::updateContents()
if ( _time != 0 )
{
dt.setTime_t( _time );
- setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));
+ setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatDateTime(dt));
}
}
break;
@@ -146,7 +146,7 @@ void KonqListViewItem::updateContents()
{
TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr, Qt::ISODate ));
setText(tmpColumn->displayInColumn,
- KGlobal::locale()->formatDateTime(dt));
+ TDEGlobal::locale()->formatDateTime(dt));
}
else // if ( tmpColumn->type == TQVariant::String )
setText(tmpColumn->displayInColumn, entryStr);
@@ -164,7 +164,7 @@ void KonqListViewItem::setDisabled( bool disabled )
{
KonqBaseListViewItem::setDisabled( disabled );
int iconSize = m_pListViewWidget->iconSize();
- iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
+ iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}
@@ -176,7 +176,7 @@ void KonqListViewItem::setActive( bool active )
//#### Optimize away repaint if possible, like the iconview does?
KonqBaseListViewItem::setActive( active );
int iconSize = m_pListViewWidget->iconSize();
- iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
+ iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index 7156d10b..8c4b1731 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -276,7 +276,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
TQString str;
if ( tmpColumn->udsId == KIO::UDS_SIZE )
- str = KGlobal::locale()->formatNumber( 888888888, 0 ) + " ";
+ str = TDEGlobal::locale()->formatNumber( 888888888, 0 ) + " ";
else if ( tmpColumn->udsId == KIO::UDS_ACCESS )
str = "--Permissions--";
else if ( tmpColumn->udsId == KIO::UDS_USER )
@@ -296,7 +296,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
(tmpColumn->type & TQVariant::DateTime)) )
{
TQDateTime dt( TQDate( 2000, 10, 10 ), TQTime( 20, 20, 20 ) );
- str = KGlobal::locale()->formatDateTime( dt ) + "--";
+ str = TDEGlobal::locale()->formatDateTime( dt ) + "--";
}
else
str = "it_is_the_default_width";
@@ -492,7 +492,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e )
vp.setY( itemRect( item ).y() );
TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) );
m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) );
- m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) );
+ m_fileTip->setPreview( TDEGlobalSettings::showFilePreview( item->item()->url() ) );
setShowToolTips( !m_pSettings->showFileTips() );
}
else
@@ -839,7 +839,7 @@ void KonqBaseListViewWidget::startDrag()
if (( urls.count() > 1 ) || (pixmap0Invalid))
{
int iconSize = m_pBrowserView->m_pProps->iconSize();
- iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
+ iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
pixmap2 = DesktopIcon( "kmultiple", iconSize );
if ( pixmap2.isNull() )
kdWarning(1202) << "Could not find multiple pixmap" << endl;
@@ -977,7 +977,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
KURL url = fileItem->url();
url.cleanPath();
- bool isIntoTrash = url.isLocalFile() && url.path(1).startsWith(KGlobalSettings::trashPath());
+ bool isIntoTrash = url.isLocalFile() && url.path(1).startsWith(TDEGlobalSettings::trashPath());
if ( !isIntoTrash || (isIntoTrash && fileItem->isDir()) )
{
m_pBrowserView->lmbClicked( fileItem );
@@ -1010,7 +1010,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
TQPixmap *pix = new TQPixmap(*(_item->pixmap(0)));
// call the icon effect if enabled
- if (KGlobalSettings::showKonqIconActivationEffect() == true) {
+ if (TDEGlobalSettings::showKonqIconActivationEffect() == true) {
KIconEffect::visualActivate(viewport(), rect, pix);
}
diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc
index 8e03e171..e594e8a9 100644
--- a/konqueror/listview/konq_textviewitem.cc
+++ b/konqueror/listview/konq_textviewitem.cc
@@ -171,7 +171,7 @@ void KonqTextViewItem::updateContents()
break;
case KIO::UDS_SIZE:
if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() )
- setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber(size, 0)+" ");
+ setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber(size, 0)+" ");
else
setText(tmpColumn->displayInColumn,KIO::convertSize(size)+" ");
break;
@@ -187,7 +187,7 @@ void KonqTextViewItem::updateContents()
{
TQDateTime dt;
dt.setTime_t((time_t) (*it).m_long);
- setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));
+ setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatDateTime(dt));
break;
};
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index edaacf1d..a927f37e 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -77,7 +77,7 @@ KRemoteEncodingPlugin::loadSettings()
{
m_loaded = true;
- m_encodingDescriptions = KGlobal::charsets()->descriptiveEncodingNames();
+ m_encodingDescriptions = TDEGlobal::charsets()->descriptiveEncodingNames();
fillMenu();
}
@@ -172,7 +172,7 @@ KRemoteEncodingPlugin::slotItemSelected(int id)
if (!m_menu->popupMenu()->isItemChecked(id))
{
- TQString charset = KGlobal::charsets()->encodingForName(m_encodingDescriptions[id - 1]);
+ TQString charset = TDEGlobal::charsets()->encodingForName(m_encodingDescriptions[id - 1]);
config.setGroup(host);
config.writeEntry(DATA_KEY, charset);
diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
index 7af5ed2b..3f93fead 100644
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
@@ -39,7 +39,7 @@ KShellCommandExecutor::KShellCommandExecutor(const TQString& command, TQWidget*
,m_writeNotifier(0)
{
setTextFormat(PlainText);
- setFont( KGlobalSettings::fixedFont() );
+ setFont( TDEGlobalSettings::fixedFont() );
}
KShellCommandExecutor::~KShellCommandExecutor()
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
index 66dd0b7b..fefc52de 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
@@ -67,12 +67,12 @@ void KShellCmdPlugin::slotExecuteShellCommand()
bool ok;
TQString cmd = KInputDialog::getText( i18n("Execute Shell Command"),
i18n( "Execute shell command in current directory:" ),
- KProcess::quote( path ), &ok, part->widget() );
+ TDEProcess::quote( path ), &ok, part->widget() );
if ( ok )
{
TQString chDir;
chDir="cd ";
- chDir+=KProcess::quote(part->url().path());
+ chDir+=TDEProcess::quote(part->url().path());
chDir+="; ";
chDir+=cmd;
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index aba5e3a2..f1dd6ad2 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -67,7 +67,7 @@ void addBackEnd::aboutToShowAddMenu()
{
if (!menu)
return;
- KStandardDirs *dirs = KGlobal::dirs();
+ KStandardDirs *dirs = TDEGlobal::dirs();
TQStringList list = dirs->findAllResources("data","konqsidebartng/add/*.desktop",true,true);
libNames.setAutoDelete(true);
libNames.resize(0);
@@ -122,7 +122,7 @@ 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();
+ KStandardDirs *dirs = TDEGlobal::dirs();
TQString loc=dirs->saveLocation("data","konqsidebartng/" + m_currentProfile + "/",true);
TQDir dir(loc);
TQStringList dirEntries = dir.entryList( TQDir::Dirs | TQDir::NoSymLinks );
@@ -139,7 +139,7 @@ void addBackEnd::doRollBack()
static TQString findFileName(const TQString* tmpl,bool universal, const TQString &profile) {
TQString myFile, filename;
- KStandardDirs *dirs = KGlobal::dirs();
+ KStandardDirs *dirs = TDEGlobal::dirs();
TQString tmp = *tmpl;
if (universal) {
@@ -248,7 +248,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
{
m_relPath = "konqsidebartng/" + currentProfile + "/entries/";
}
- m_path = KGlobal::dirs()->saveLocation("data", m_relPath, true);
+ m_path = TDEGlobal::dirs()->saveLocation("data", m_relPath, true);
m_buttons.setAutoDelete(true);
m_hasStoredUrl = false;
m_latestViewed = -1;
@@ -331,7 +331,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
// << " [" << name << "]" << endl;
// Look for existing ones with this URL
- KStandardDirs *dirs = KGlobal::dirs();
+ KStandardDirs *dirs = TDEGlobal::dirs();
TQString list;
dirs->saveLocation("data", m_relPath, true);
list = locateLocal("data", m_relPath);
@@ -370,7 +370,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
void Sidebar_Widget::finishRollBack()
{
- m_path = KGlobal::dirs()->saveLocation("data",m_relPath,true);
+ m_path = TDEGlobal::dirs()->saveLocation("data",m_relPath,true);
initialCopy();
TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
}
@@ -421,9 +421,9 @@ void Sidebar_Widget::initialCopy()
kdDebug()<<"Initial copy"<<endl;
TQStringList dirtree_dirs;
if (m_universalMode)
- dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/kicker_entries/");
+ dirtree_dirs = TDEGlobal::dirs()->findDirs("data","konqsidebartng/kicker_entries/");
else
- dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/entries/");
+ dirtree_dirs = TDEGlobal::dirs()->findDirs("data","konqsidebartng/entries/");
if (dirtree_dirs.last()==m_path)
return; //oups;
@@ -467,9 +467,9 @@ void Sidebar_Widget::initialCopy()
!dirEntries.contains( *eIt ) )
{ // we don't have that one yet -> copy it.
TQString cp("cp -R -- ");
- cp += KProcess::quote(dirtree_dir + *eIt);
+ cp += TDEProcess::quote(dirtree_dir + *eIt);
cp += " ";
- cp += KProcess::quote(m_path);
+ cp += TDEProcess::quote(m_path);
kdDebug() << "SidebarWidget::intialCopy executing " << cp << endl;
::system( TQFile::encodeName(cp) );
}
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 811867b1..16520d0e 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -92,7 +92,7 @@ void KonqSidebarDirTreeItem::setOpen( bool open )
MYMODULE->openSubFolder( this );
else if ( hasStandardIcon() )
{
- int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
+ int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
if ( open )
setPixmap( 0, DesktopIcon( "folder_open", size ) );
else
@@ -159,7 +159,7 @@ void KonqSidebarDirTreeItem::itemSelected()
{
bool bInTrash = false;
- if ( m_fileItem->url().directory(false) == KGlobalSettings::trashPath() )
+ if ( m_fileItem->url().directory(false) == TDEGlobalSettings::trashPath() )
bInTrash = true;
TQMimeSource *data = TQApplication::clipboard()->data();
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index c8707970..7d8f7b1f 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -325,7 +325,7 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item )
if ( !item->isTopLevelItem() &&
static_cast<KonqSidebarDirTreeItem *>(item)->hasStandardIcon() )
{
- int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
+ int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
TQPixmap pix = DesktopIcon( "folder_open", size );
m_pTree->startAnimation( item, "kde", 6, &pix );
}
@@ -358,7 +358,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item )
{
// We have this directory listed already, just copy the entries as we
// can't use the dirlister, it would invalidate the old entries
- int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
+ int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
KonqSidebarTreeItem * parentItem = item;
KonqSidebarDirTreeItem *oldItem = static_cast<KonqSidebarDirTreeItem *> (openItem->firstChild());
while(oldItem)
@@ -424,7 +424,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )
}
kdDebug()<<"number of additional parent items:"<< (parentItemList?parentItemList->count():0)<<endl;
- int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
+ int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
do
{
kdDebug()<<"Parent Item URL:"<<parentItem->externalURL()<<endl;
@@ -456,7 +456,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )
void KonqSidebarDirTreeModule::slotRefreshItems( const KFileItemList &entries )
{
- int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
+ int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
TQPtrListIterator<KFileItem> kit ( entries );
kdDebug(1201) << "KonqSidebarDirTreeModule::slotRefreshItems " << entries.count() << " entries. First: " << kit.current()->url().url() << endl;
diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp
index 0d31551f..44389702 100644
--- a/konqueror/sidebar/trees/history_module/history_item.cpp
+++ b/konqueror/sidebar/trees/history_module/history_item.cpp
@@ -119,7 +119,7 @@ TQString KonqSidebarHistoryItem::toolTipText() const
// .arg() calls. So to fix this, we first substitute the last items
// and then put in the url.
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 tip.arg( TDEGlobal::locale()->formatDateTime( m_entry->lastVisited ) ).arg( TDEGlobal::locale()->formatDateTime( m_entry->firstVisited ) ).arg( m_entry->numberOfTimesVisited ).arg( m_entry->url.url() );
}
return m_entry->url.url();
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index a7fd943c..71c1b5a4 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -56,7 +56,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
m_dict.setAutoDelete( true );
m_currentTime = TQDateTime::currentDateTime();
- KConfig *kc = KGlobal::config();
+ KConfig *kc = TDEGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" );
m_sortsByName = kc->readEntry( "SortHistory", "byDate" ) == "byName";
@@ -111,7 +111,7 @@ KonqSidebarHistoryModule::~KonqSidebarHistoryModule()
++it;
}
- KConfig *kc = KGlobal::config();
+ KConfig *kc = TDEGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" );
kc->writeEntry("OpenGroups", openGroups);
kc->sync();
@@ -143,7 +143,7 @@ void KonqSidebarHistoryModule::slotCreateItems()
++it;
}
- KConfig *kc = KGlobal::config();
+ KConfig *kc = TDEGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" );
TQStringList openGroups = kc->readListEntry("OpenGroups");
TQStringList::Iterator it2 = openGroups.begin();
@@ -297,7 +297,7 @@ void KonqSidebarHistoryModule::sortingChanged()
{
m_topLevelItem->sort();
- KConfig *kc = KGlobal::config();
+ KConfig *kc = TDEGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" );
kc->writeEntry( "SortHistory", m_sortsByName ? "byName" : "byDate" );
kc->sync();
diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h
index 752ff57f..cbba4026 100644
--- a/konqueror/sidebar/trees/history_module/history_module.h
+++ b/konqueror/sidebar/trees/history_module/history_module.h
@@ -61,7 +61,7 @@ public:
bool sortsByName() const { return m_sortsByName; }
static TQString groupForURL( const KURL& url ) {
- static const TQString& misc = KGlobal::staticQString(i18n("Miscellaneous"));
+ static const TQString& misc = TDEGlobal::staticQString(i18n("Miscellaneous"));
return url.host().isEmpty() ? misc : url.host();
}
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 6871415a..3e8c8a5d 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -46,7 +46,7 @@ void KonqSidebarHistorySettings::readSettings(bool global)
TQString oldgroup;
if (global) {
- config = KGlobal::config();
+ config = TDEGlobal::config();
oldgroup= config->group();
}
else
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index 532e3a16..a1ef792d 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -51,7 +51,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_history, KCMHistoryFactory("kcmhistory") )
HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, const TQStringList & )
: KCModule (KCMHistoryFactory::instance(), parent, name)
{
- KGlobal::locale()->insertCatalogue("konqueror");
+ TDEGlobal::locale()->insertCatalogue("konqueror");
m_settings = new KonqSidebarHistorySettings( 0, "history settings" );
m_settings->readSettings( false );
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 2ed02b6c..7ba7c301 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -87,7 +87,7 @@ void KonqSidebarTree::loadModuleFactories()
{
pluginFactories.clear();
pluginInfo.clear();
- KStandardDirs *dirs=KGlobal::dirs();
+ KStandardDirs *dirs=TDEGlobal::dirs();
TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
@@ -168,12 +168,12 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg
/* assert( m_part->getInterfaces()->getInstance()->dirs );
TQString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */
-// assert( KGlobal::dirs() );
+// assert( TDEGlobal::dirs() );
// TQString dirtreeDir = part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" );
if (virt==VIRT_Folder)
{
- m_dirtreeDir.dir.setPath(KGlobal::dirs()->saveLocation("data","konqsidebartng/virtual_folders/"+path+"/"));
+ m_dirtreeDir.dir.setPath(TDEGlobal::dirs()->saveLocation("data","konqsidebartng/virtual_folders/"+path+"/"));
m_dirtreeDir.relDir=path;
}
else
@@ -620,10 +620,10 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
if (copyConfig)
{
// We will copy over the configuration for the dirtree, from the global directory
- TQStringList dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/");
+ TQStringList dirtree_dirs = TDEGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/");
-// TQString dirtree_dir = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/").last(); // most global
+// TQString dirtree_dir = TDEGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/").last(); // most global
// kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir=" << dirtree_dir << endl;
/*
@@ -655,9 +655,9 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
&& !entries.contains( *eIt ) && !dirEntries.contains( *eIt ) )
{ // we don't have that one yet -> copy it.
TQString cp("cp -R -- ");
- cp += KProcess::quote(dirtree_dir + *eIt);
+ cp += TDEProcess::quote(dirtree_dir + *eIt);
cp += " ";
- cp += KProcess::quote(path);
+ cp += TDEProcess::quote(path);
kdDebug(1201) << "KonqSidebarTree::scanDir executing " << cp << endl;
::system( TQFile::encodeName(cp) );
}
@@ -698,7 +698,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
{
TQString newPath = TQString( path ).append( *eIt ).append( '/' );
- if ( newPath == KGlobalSettings::autostartPath() )
+ if ( newPath == TDEGlobalSettings::autostartPath() )
continue;
loadTopLevelGroup( parent, newPath );
@@ -984,7 +984,7 @@ void KonqSidebarTree::slotCreateFolder()
name = name + "-2";
}
- KGlobal::dirs()->makeDir(path);
+ TDEGlobal::dirs()->makeDir(path);
loadTopLevelGroup(m_currentTopLevelItem, path);
}
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 0dc9303b..1cdf54da 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -134,7 +134,7 @@ extern "C"
{
KDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map)
{
- KStandardDirs *dirs=KGlobal::dirs();
+ KStandardDirs *dirs=TDEGlobal::dirs();
TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
TQStringList names;
for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it)
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index 3697c443..a337c65c 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -191,10 +191,10 @@ extern "C" {
extern "C" {
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");
+ TDEGlobal::dirs()->addResourceType("websidebardata", KStandardDirs::kde_default("data") + "konqsidebartng/websidebar");
KURL url;
url.setProtocol("file");
- TQStringList paths = KGlobal::dirs()->resourceDirs("websidebardata");
+ TQStringList paths = TDEGlobal::dirs()->resourceDirs("websidebardata");
for (TQStringList::Iterator i = paths.begin(); i != paths.end(); ++i) {
if (TQFileInfo(*i + "websidebar.html").exists()) {
url.setPath(*i + "websidebar.html");
diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp
index 409f4ca4..53aca227 100644
--- a/konsole/konsole/TEPty.cpp
+++ b/konsole/konsole/TEPty.cpp
@@ -171,11 +171,11 @@ void TEPty::setWriteable(bool writeable)
TEPty::TEPty()
{
m_bufferFull = false;
- connect(this, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
- this, TQT_SLOT(dataReceived(KProcess *,char *, int)));
- connect(this, TQT_SIGNAL(processExited(KProcess *)),
+ connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+ this, TQT_SLOT(dataReceived(TDEProcess *,char *, int)));
+ connect(this, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(donePty()));
- connect(this, TQT_SIGNAL(wroteStdin(KProcess *)),
+ connect(this, TQT_SIGNAL(wroteStdin(TDEProcess *)),
this, TQT_SLOT(writeReady()));
setUsePty(All, false); // utmp will be overridden later
@@ -237,7 +237,7 @@ void TEPty::send_bytes(const char* s, int len)
}
/*! indicates that a block of data is received */
-void TEPty::dataReceived(KProcess *,char *buf, int len)
+void TEPty::dataReceived(TDEProcess *,char *buf, int len)
{
emit block_in(buf,len);
}
@@ -252,7 +252,7 @@ void TEPty::lockPty(bool lock)
int TEPty::commSetupDoneC ()
{
- int ok = KProcess::commSetupDoneC ();
+ int ok = TDEProcess::commSetupDoneC ();
if ( ok ) {
emit forkedChild();
}
diff --git a/konsole/konsole/TEPty.h b/konsole/konsole/TEPty.h
index d6cee77d..21ea3ff9 100644
--- a/konsole/konsole/TEPty.h
+++ b/konsole/konsole/TEPty.h
@@ -29,7 +29,7 @@
#include <tqvaluelist.h>
#include <tqmemarray.h>
-class TEPty: public KProcess
+class TEPty: public TDEProcess
{
Q_OBJECT
@@ -94,12 +94,12 @@ Q_OBJECT
void send_string(const char* s);
bool buffer_full() { return m_bufferFull; }
- // override from KProcess to allow the client of konsolePart
+ // override from TDEProcess to allow the client of konsolePart
// to set up things after fork() but before exec()
virtual int commSetupDoneC();
protected slots:
- void dataReceived(KProcess *, char *buf, int len);
+ void dataReceived(TDEProcess *, char *buf, int len);
public slots:
void donePty();
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index f8bef39b..e13a5eb1 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -941,7 +941,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
if (!mResizeWidget)
{
mResizeWidget = new TQFrame(this);
- TQFont f = KGlobalSettings::generalFont();
+ TQFont f = TDEGlobalSettings::generalFont();
int fs = f.pointSize();
if (fs == -1)
fs = TQFontInfo(f).pointSize();
@@ -1367,7 +1367,7 @@ void TEWidget::mouseMoveEvent(TQMouseEvent* ev)
// we had a mouse down, but haven't confirmed a drag yet
// if the mouse has moved sufficiently, we will confirm
- int distance = KGlobalSettings::dndEventDelay();
+ int distance = TDEGlobalSettings::dndEventDelay();
if ( ev->x() > dragInfo.start.x() + distance || ev->x() < dragInfo.start.x() - distance ||
ev->y() > dragInfo.start.y() + distance || ev->y() < dragInfo.start.y() - distance) {
// we've left the drag square, we can start a real drag operation now
diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp
index 18d453a5..3a4168e8 100644
--- a/konsole/konsole/keytrans.cpp
+++ b/konsole/konsole/keytrans.cpp
@@ -716,7 +716,7 @@ void KeyTrans::loadAll()
KeyTrans* sc = new KeyTrans("[buildin]");
sc->addKeyTrans();
- TQStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
+ TQStringList lst = TDEGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
for(TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
{
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 3d5ad49c..225f6687 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -297,7 +297,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
// read and apply default values ///////////////////////////////////////////
resize(321, 321); // Dummy.
TQSize currentSize = size();
- KConfig * config = KGlobal::config();
+ KConfig * config = TDEGlobal::config();
config->setDesktopGroup();
applyMainWindowSettings(config);
if (currentSize != size())
@@ -367,7 +367,7 @@ Konsole::~Konsole()
}
// Wait a bit for all childs to clean themselves up.
- while(sessions.count() && KProcessController::theKProcessController->waitForProcessExit(1))
+ while(sessions.count() && TDEProcessController::theTDEProcessController->waitForProcessExit(1))
;
sessions.setAutoDelete(true);
@@ -652,7 +652,7 @@ void Konsole::makeGUI()
// encoding menu, start with default checked !
selectSetEncoding = new KSelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetEncoding()), actions, "set_encoding" );
- TQStringList list = KGlobal::charsets()->descriptiveEncodingNames();
+ TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames();
list.prepend( i18n( "Default" ) );
selectSetEncoding->setItems(list);
selectSetEncoding->setCurrentItem (0);
@@ -703,7 +703,7 @@ void Konsole::makeGUI()
KAction *configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actions);
configure->plug(m_options);
- if (KGlobalSettings::insertTearOffHandle())
+ if (TDEGlobalSettings::insertTearOffHandle())
m_options->insertTearOffHandle();
}
@@ -758,7 +758,7 @@ void Konsole::makeGUI()
}
m_rightButton->insertSeparator();
m_closeSession->plug(m_rightButton );
- if (KGlobalSettings::insertTearOffHandle())
+ if (TDEGlobalSettings::insertTearOffHandle())
m_rightButton->insertTearOffHandle();
}
@@ -884,8 +884,8 @@ void Konsole::slotSetEncoding()
else
{
bool found;
- TQString enc = KGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
- qtc = KGlobal::charsets()->codecForName(enc, found);
+ TQString enc = TDEGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
+ qtc = TDEGlobal::charsets()->codecForName(enc, found);
// BR114535 : Remove jis7 due to infinite loop.
if ( enc == "jis7" ) {
@@ -966,7 +966,7 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev )
{
TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
if ((mev->pos() - m_newSessionButtonMousePressPos).manhattanLength()
- > KGlobalSettings::dndEventDelay())
+ > TDEGlobalSettings::dndEventDelay())
{
m_newSessionButton->openPopup();
return true;
@@ -1167,7 +1167,7 @@ void Konsole::makeBasicGUI()
new KAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi");
// Should we load all *.desktop files now? Required for Session shortcuts.
- if ( KConfigGroup(KGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) {
+ if ( KConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) {
b_sessionShortcutsEnabled = true;
loadSessionCommands();
loadScreenSessions();
@@ -1438,7 +1438,7 @@ void Konsole::slotSaveSessionsProfile()
if ( ok ) {
TQString path = locateLocal( "data",
TQString::fromLatin1( "konsole/profiles/" ) + prof,
- KGlobal::instance() );
+ TDEGlobal::instance() );
if ( TQFile::exists( path ) )
TQFile::remove( path );
@@ -1454,7 +1454,7 @@ void Konsole::saveProperties(KConfig* config) {
uint active=0;
TQString key;
- if (config != KGlobal::config())
+ if (config != TDEGlobal::config())
{
// called by the session manager
config->writeEntry("numSes",sessions.count());
@@ -1526,7 +1526,7 @@ void Konsole::saveProperties(KConfig* config) {
if (selectSetEncoding)
{
- TQString encoding = KGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
+ TQString encoding = TDEGlobal::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) {
}
config->writeEntry("class",name());
- if (config != KGlobal::config())
+ if (config != TDEGlobal::config())
{
saveMainWindowSettings(config);
}
@@ -1551,7 +1551,7 @@ void Konsole::saveProperties(KConfig* config) {
}
-// Called by constructor (with config = KGlobal::config())
+// Called by constructor (with config = TDEGlobal::config())
// and by session-management (with config = sessionconfig).
// So it has to apply the settings when reading them.
void Konsole::readProperties(KConfig* config)
@@ -1567,7 +1567,7 @@ void Konsole::readProperties(KConfig* config)
void Konsole::readProperties(KConfig* config, const TQString &schema, bool globalConfigOnly)
{
- if (config==KGlobal::config())
+ if (config==TDEGlobal::config())
{
config->setDesktopGroup();
b_warnQuit=config->readBoolEntry( "WarnQuit", true );
@@ -1614,7 +1614,7 @@ void Konsole::readProperties(KConfig* config, const TQString &schema, bool globa
// (1) set menu items and Konsole members
- TQFont tmpFont = KGlobalSettings::fixedFont();
+ TQFont tmpFont = TDEGlobalSettings::fixedFont();
defaultFont = config->readFontEntry("defaultfont", &tmpFont);
//set the schema
@@ -2013,7 +2013,7 @@ void Konsole::slotSelectTabbar() {
void Konsole::slotSaveSettings()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setDesktopGroup();
saveProperties(config);
saveMainWindowSettings(config);
@@ -2047,7 +2047,7 @@ void Konsole::slotConfigureKeys()
m_shortcuts->action( i )->shortcut().count() &&
TQString(m_shortcuts->action( i )->name()).startsWith("SSC_") ) {
b_sessionShortcutsEnabled = true;
- KConfigGroup group(KGlobal::config(), "General");
+ KConfigGroup group(TDEGlobal::config(), "General");
group.writeEntry("SessionShortcutsEnabled", true);
}
}
@@ -2078,8 +2078,8 @@ void Konsole::slotConfigure()
void Konsole::reparseConfiguration()
{
- KGlobal::config()->reparseConfiguration();
- readProperties(KGlobal::config(), TQString::null, true);
+ TDEGlobal::config()->reparseConfiguration();
+ readProperties(TDEGlobal::config(), TQString::null, true);
// The .desktop files may have been changed by user...
b_sessionShortcutsMapped = false;
@@ -2125,7 +2125,7 @@ void Konsole::reparseConfiguration()
m_shortcuts->readShortcutSettings();
// User may have changed Schema->Set as default schema
- s_kconfigSchema = KGlobal::config()->readEntry("schema");
+ s_kconfigSchema = TDEGlobal::config()->readEntry("schema");
ColorSchema* sch = colors->find(s_kconfigSchema);
if (!sch)
{
@@ -2662,8 +2662,8 @@ void Konsole::setSessionEncoding( const TQString &encoding, TESession *session )
session = se;
bool found = false;
- TQString enc = KGlobal::charsets()->encodingForName(encoding);
- TQTextCodec * qtc = KGlobal::charsets()->codecForName(enc, found);
+ TQString enc = TDEGlobal::charsets()->encodingForName(encoding);
+ TQTextCodec * qtc = TDEGlobal::charsets()->codecForName(enc, found);
if ( !found || !qtc )
return;
@@ -2671,13 +2671,13 @@ void Konsole::setSessionEncoding( const TQString &encoding, TESession *session )
// it corresponds to.
int i = 0;
bool found_encoding = false;
- TQStringList encodingNames = KGlobal::charsets()->descriptiveEncodingNames();
+ TQStringList encodingNames = TDEGlobal::charsets()->descriptiveEncodingNames();
TQStringList::ConstIterator it = encodingNames.begin();
TQString t_encoding = encoding.lower();
while ( it != encodingNames.end() && !found_encoding )
{
- if ( TQString::compare( KGlobal::charsets()->encodingForName(*it),
+ if ( TQString::compare( TDEGlobal::charsets()->encodingForName(*it),
t_encoding ) == 0 ) {
found_encoding = true;
}
@@ -2727,7 +2727,7 @@ void Konsole::allowPrevNext()
KSimpleConfig *Konsole::defaultSession()
{
if (!m_defaultSession) {
- KConfig * config = KGlobal::config();
+ KConfig * config = TDEGlobal::config();
config->setDesktopGroup();
setDefaultSession(config->readEntry("DefaultSession","shell.desktop"));
}
@@ -2886,7 +2886,7 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis
initTEWidget(te, te_old);
}
else {
- readProperties(KGlobal::config(), "", true);
+ readProperties(TDEGlobal::config(), "", true);
te->setVTFont(font);
te->setScrollbarLocation(n_scroll);
te->setBellMode(n_bell);
@@ -3287,9 +3287,9 @@ void Konsole::notifySessionState(TESession* session, int state)
&& session->testAndSetStateIconName(state_iconname)
&& m_tabViewMode != ShowTextOnly) {
- TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(state_iconname,
+ TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(state_iconname,
KIcon::Small, 0, KIcon::DefaultState, 0L, true);
- TQPixmap active = KGlobal::instance()->iconLoader()->loadIcon(state_iconname,
+ TQPixmap active = TDEGlobal::instance()->iconLoader()->loadIcon(state_iconname,
KIcon::Small, 0, KIcon::ActiveState, 0L, true);
// make sure they are not larger than 16x16
@@ -3375,7 +3375,7 @@ void Konsole::addSessionCommand(const TQString &path)
exec = KRun::binaryName(exec, false);
exec = KShell::tildeExpand(exec);
- TQString pexec = KGlobal::dirs()->findExe(exec);
+ TQString pexec = TDEGlobal::dirs()->findExe(exec);
if (typ.isEmpty() || txt.isEmpty() || typ != "KonsoleApplication"
|| ( !exec.isEmpty() && pexec.isEmpty() ) )
@@ -3425,7 +3425,7 @@ void Konsole::loadSessionCommands()
addSessionCommand(TQString::null);
- TQStringList lst = KGlobal::dirs()->findAllResources("appdata", "*.desktop", false, true);
+ TQStringList lst = TDEGlobal::dirs()->findAllResources("appdata", "*.desktop", false, true);
for(TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
if (!(*it).endsWith("/shell.desktop"))
@@ -4128,9 +4128,9 @@ void Konsole::slotZModemUpload()
i18n("<p>The current session already has a ZModem file transfer in progress."));
return;
}
- TQString zmodem = KGlobal::dirs()->findExe("sz");
+ TQString zmodem = TDEGlobal::dirs()->findExe("sz");
if (zmodem.isEmpty())
- zmodem = KGlobal::dirs()->findExe("lsz");
+ zmodem = TDEGlobal::dirs()->findExe("lsz");
if (zmodem.isEmpty())
{
KMessageBox::sorry(this,
@@ -4155,9 +4155,9 @@ void Konsole::slotZModemDetected(TESession *session)
if(se != session)
activateSession(session);
- TQString zmodem = KGlobal::dirs()->findExe("rz");
+ TQString zmodem = TDEGlobal::dirs()->findExe("rz");
if (zmodem.isEmpty())
- zmodem = KGlobal::dirs()->findExe("lrz");