summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/khelpcenter/license/TDELicenseDlg.cpp2
-rw-r--r--doc/ksplashml/index.docbook2
-rw-r--r--drkonqi/backtrace.cpp2
-rw-r--r--drkonqi/bugdescriptiondialog.cpp2
-rw-r--r--drkonqi/toplevel.cpp2
-rw-r--r--kappfinder/common.cpp2
-rw-r--r--kappfinder/main_install.cpp2
-rw-r--r--kappfinder/toplevel.cpp2
-rw-r--r--kate/app/kateconfigdialog.cpp2
-rw-r--r--kate/app/katemain.cpp2
-rw-r--r--kate/app/katemainwindow.cpp2
-rw-r--r--kate/app/katesession.cpp2
-rw-r--r--kate/app/kateviewmanager.cpp2
-rw-r--r--kate/app/kateviewspacecontainer.cpp2
-rw-r--r--kate/app/kbookmarkhandler.cpp2
-rw-r--r--kcontrol/access/kcmaccess.cpp2
-rw-r--r--kcontrol/arts/arts.cpp2
-rw-r--r--kcontrol/background/bgadvanced.cpp2
-rw-r--r--kcontrol/background/bgdialog.cpp2
-rw-r--r--kcontrol/background/bgmonitor.cpp2
-rw-r--r--kcontrol/background/bgrender.cpp2
-rw-r--r--kcontrol/background/bgsettings.cpp2
-rw-r--r--kcontrol/background/bgwallpaper.cpp2
-rw-r--r--kcontrol/clock/tzone.cpp2
-rw-r--r--kcontrol/colors/colorscm.cpp2
-rw-r--r--kcontrol/componentchooser/componentchooser.cpp2
-rw-r--r--kcontrol/crypto/crypto.cpp2
-rw-r--r--kcontrol/css/kcmcss.cpp2
-rw-r--r--kcontrol/displayconfig/displayconfig.cpp2
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp2
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp2
-rw-r--r--kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp2
-rw-r--r--kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp2
-rw-r--r--kcontrol/energy/energy.cpp2
-rw-r--r--kcontrol/filetypes/filetypesview.cpp2
-rw-r--r--kcontrol/filetypes/keditfiletype.cpp2
-rw-r--r--kcontrol/filetypes/kservicelistwidget.cpp2
-rw-r--r--kcontrol/filetypes/typeslistitem.cpp2
-rw-r--r--kcontrol/fonts/fonts.cpp2
-rw-r--r--kcontrol/hwmanager/deviceiconview.cpp2
-rw-r--r--kcontrol/hwmanager/hwdevicetray.cpp2
-rw-r--r--kcontrol/icons/iconthemes.cpp2
-rw-r--r--kcontrol/input/core/themepage.cpp2
-rw-r--r--kcontrol/input/mouse.cpp2
-rw-r--r--kcontrol/input/xcursor/themepage.cpp2
-rw-r--r--kcontrol/kcontrol/aboutwidget.cpp2
-rw-r--r--kcontrol/kcontrol/moduleiconview.cpp2
-rw-r--r--kcontrol/kcontrol/modulemenu.cpp2
-rw-r--r--kcontrol/kcontrol/modules.cpp2
-rw-r--r--kcontrol/kcontrol/toplevel.cpp2
-rw-r--r--kcontrol/kded/kcmkded.cpp2
-rw-r--r--kcontrol/keys/keyconfig.cpp2
-rw-r--r--kcontrol/keys/shortcuts.cpp2
-rw-r--r--kcontrol/keys/treeview.cpp2
-rw-r--r--kcontrol/kicker/applettab_impl.cpp2
-rw-r--r--kcontrol/kicker/lookandfeeltab_impl.cpp2
-rw-r--r--kcontrol/kicker/main.cpp2
-rw-r--r--kcontrol/kicker/menutab_impl.cpp2
-rw-r--r--kcontrol/kicker/positiontab_impl.cpp2
-rw-r--r--kcontrol/knotify/knotify.cpp2
-rw-r--r--kcontrol/konq/behaviour.cpp2
-rw-r--r--kcontrol/konq/rootopts.cpp2
-rw-r--r--kcontrol/konqhtml/pluginopts.cpp2
-rw-r--r--kcontrol/konsole/schemaeditor.cpp2
-rw-r--r--kcontrol/konsole/sessioneditor.cpp2
-rw-r--r--kcontrol/krdb/krdb.cpp2
-rw-r--r--kcontrol/kthememanager/ktheme.cpp2
-rw-r--r--kcontrol/kthememanager/kthememanager.cpp2
-rw-r--r--kcontrol/locale/kcmlocale.cpp2
-rw-r--r--kcontrol/locale/localemon.cpp2
-rw-r--r--kcontrol/locale/localenum.cpp2
-rw-r--r--kcontrol/locale/localeother.cpp2
-rw-r--r--kcontrol/locale/localetime.cpp2
-rw-r--r--kcontrol/privacy/kprivacymanager.cpp2
-rw-r--r--kcontrol/randr/tderandrtray.cpp2
-rw-r--r--kcontrol/screensaver/advanceddialog.cpp2
-rw-r--r--kcontrol/screensaver/scrnsave.cpp2
-rw-r--r--kcontrol/style/kcmstyle.cpp2
-rw-r--r--kcontrol/taskbar/kcmtaskbar.cpp2
-rw-r--r--kcontrol/tdefontinst/lib/Misc.cpp2
-rw-r--r--kcontrol/tdeio/fakeuaprovider.cpp2
-rw-r--r--kcontrol/tdm/tdm-appear.cpp2
-rw-r--r--kcontrol/tdm/tdm-users.cpp2
-rw-r--r--kcontrol/usbview/usbdb.cpp2
-rw-r--r--kcontrol/view1394/view1394.cpp2
-rw-r--r--kdesktop/desktop.cpp2
-rw-r--r--kdesktop/init.cpp2
-rw-r--r--kdesktop/kdesktopshadowsettings.h2
-rw-r--r--kdesktop/kdiconview.cpp2
-rw-r--r--kdesktop/krootwm.cpp2
-rw-r--r--kdesktop/lock/infodlg.cpp2
-rw-r--r--kdesktop/lock/lockdlg.cpp2
-rw-r--r--kdesktop/lock/lockprocess.cpp2
-rw-r--r--kdesktop/lock/main.cpp2
-rw-r--r--kdesktop/lock/querydlg.cpp2
-rw-r--r--kdesktop/lock/sakdlg.cpp2
-rw-r--r--kdesktop/lock/securedlg.cpp2
-rw-r--r--kdesktop/lockeng.cpp2
-rw-r--r--kdesktop/minicli.cpp2
-rw-r--r--kfind/kfinddlg.cpp2
-rw-r--r--kfind/kftabdlg.cpp2
-rw-r--r--kfind/kfwin.cpp2
-rw-r--r--kfind/kquery.cpp2
-rw-r--r--khelpcenter/docentry.cpp2
-rw-r--r--khelpcenter/docmetainfo.cpp2
-rw-r--r--khelpcenter/formatter.cpp2
-rw-r--r--khelpcenter/glossary.cpp2
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.cpp2
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.cpp2
-rw-r--r--khelpcenter/htmlsearch/klangcombo.cpp2
-rw-r--r--khelpcenter/htmlsearch/progressdialog.cpp2
-rw-r--r--khelpcenter/htmlsearchconfig.cpp2
-rw-r--r--khelpcenter/infotree.cpp2
-rw-r--r--khelpcenter/kcmhelpcenter.cpp2
-rw-r--r--khelpcenter/khc_indexbuilder.cpp2
-rw-r--r--khelpcenter/khelpcenter.kcfg2
-rw-r--r--khelpcenter/navigator.cpp2
-rw-r--r--khelpcenter/searchengine.cpp2
-rw-r--r--khelpcenter/searchhandler.cpp2
-rw-r--r--khelpcenter/toc.cpp2
-rw-r--r--khelpcenter/view.cpp2
-rw-r--r--khotkeys/kcontrol/voicerecorder.cpp2
-rw-r--r--khotkeys/kcontrol/voicerecordpage.cpp2
-rw-r--r--khotkeys/shared/actions.cpp2
-rw-r--r--khotkeys/shared/khotkeysglobal.cpp2
-rw-r--r--khotkeys/update/update.cpp2
-rw-r--r--kicker/applets/clock/clock.cpp2
-rw-r--r--kicker/applets/clock/init.cpp2
-rw-r--r--kicker/applets/clock/zone.cpp2
-rw-r--r--kicker/applets/launcher/quickaddappsmenu.cpp2
-rw-r--r--kicker/applets/launcher/quickbutton.cpp2
-rw-r--r--kicker/applets/launcher/quicklauncher.cpp2
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp2
-rw-r--r--kicker/extensions/dockbar/dockbarextension.cpp2
-rw-r--r--kicker/extensions/kasbar/kasaboutdlg.cpp2
-rw-r--r--kicker/extensions/kasbar/kasclockitem.cpp2
-rw-r--r--kicker/extensions/kasbar/kasloaditem.cpp2
-rw-r--r--kicker/extensions/kasbar/kasresources.cpp2
-rw-r--r--kicker/extensions/taskbar/taskbarextension.cpp2
-rw-r--r--kicker/kicker/buttons/knewbutton.cpp2
-rw-r--r--kicker/kicker/buttons/servicebutton.cpp2
-rw-r--r--kicker/kicker/core/container_applet.cpp2
-rw-r--r--kicker/kicker/core/container_extension.cpp2
-rw-r--r--kicker/kicker/core/containerarea.cpp2
-rw-r--r--kicker/kicker/core/extensionmanager.cpp2
-rw-r--r--kicker/kicker/core/kicker.cpp2
-rw-r--r--kicker/kicker/core/pluginmanager.cpp2
-rw-r--r--kicker/kicker/ui/addapplet.cpp2
-rw-r--r--kicker/kicker/ui/addbutton_mnu.cpp2
-rw-r--r--kicker/kicker/ui/exe_dlg.cpp2
-rw-r--r--kicker/kicker/ui/flipscrollview.h2
-rw-r--r--kicker/kicker/ui/hidebutton.cpp2
-rw-r--r--kicker/kicker/ui/itemview.cpp2
-rw-r--r--kicker/kicker/ui/k_mnu.cpp2
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp2
-rw-r--r--kicker/kicker/ui/popupmenutop.cpp2
-rw-r--r--kicker/kicker/ui/service_mnu.cpp2
-rw-r--r--kicker/libkicker/global.cpp2
-rw-r--r--kicker/libkicker/menuinfo.cpp2
-rw-r--r--kicker/libkicker/panelbutton.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.cpp2
-rw-r--r--kicker/menuext/konsole/konsole_mnu.cpp2
-rw-r--r--kicker/menuext/konsole/konsolebookmarkhandler.cpp2
-rw-r--r--kicker/menuext/konsole/konsolebookmarkmenu.cpp2
-rw-r--r--kicker/menuext/prefmenu/prefmenu.cpp2
-rw-r--r--kicker/menuext/remote/remotemenu.cpp2
-rw-r--r--kicker/menuext/tom/tom.cpp2
-rw-r--r--kicker/proxy/appletproxy.cpp2
-rw-r--r--kicker/proxy/extensiondebugger.cpp2
-rw-r--r--kicker/proxy/extensionproxy.cpp2
-rw-r--r--kicker/taskbar/taskbar.cpp2
-rw-r--r--kicker/taskbar/taskbarcontainer.cpp2
-rw-r--r--klipper/toplevel.cpp2
-rw-r--r--kmenuedit/basictab.cpp2
-rw-r--r--kmenuedit/kcontrol_main.cpp2
-rw-r--r--kmenuedit/menufile.cpp2
-rw-r--r--kmenuedit/menuinfo.cpp2
-rw-r--r--kmenuedit/treeview.cpp2
-rw-r--r--knetattach/knetattach.ui2
-rw-r--r--konqueror/about/konq_aboutpage.cpp2
-rw-r--r--konqueror/client/kfmclient.cpp2
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp2
-rw-r--r--konqueror/keditbookmarks/importers.cpp2
-rw-r--r--konqueror/keditbookmarks/kbookmarkmerger.cpp2
-rw-r--r--konqueror/keditbookmarks/main.cpp2
-rw-r--r--konqueror/konq_main.cpp2
-rw-r--r--konqueror/konq_mainwindow.cpp2
-rw-r--r--konqueror/konq_misc.cpp2
-rw-r--r--konqueror/konq_profiledlg.cpp2
-rw-r--r--konqueror/konq_viewmgr.cpp2
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp2
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp2
-rw-r--r--konqueror/sidebar/trees/konqsidebar_tree.cpp2
-rw-r--r--konqueror/sidebar/web_module/web_module.cpp2
-rw-r--r--konsole/konsole/TEPty.cpp2
-rw-r--r--konsole/konsole/keytrans.cpp2
-rw-r--r--konsole/konsole/konsole.cpp2
-rw-r--r--konsole/konsole/konsolebookmarkhandler.cpp2
-rw-r--r--konsole/konsole/konsolebookmarkmenu.cpp2
-rw-r--r--konsole/konsole/main.cpp2
-rw-r--r--konsole/konsole/schema.cpp2
-rw-r--r--konsole/konsole/session.cpp2
-rw-r--r--kpersonalizer/kcountrypage.cpp2
-rw-r--r--kpersonalizer/keyecandypage.cpp2
-rw-r--r--kpersonalizer/kfindlanguage.cpp2
-rw-r--r--kpersonalizer/kospage.cpp2
-rw-r--r--kpersonalizer/kpersonalizer.cpp2
-rw-r--r--kpersonalizer/tdestylepage.cpp2
-rw-r--r--krootbacking/krootbacking.cpp2
-rw-r--r--ksmserver/server.cpp2
-rw-r--r--ksmserver/shutdown.cpp2
-rw-r--r--ksmserver/startup.cpp2
-rw-r--r--ksplashml/kcmksplash/installer.cpp2
-rw-r--r--ksplashml/kcmksplash/main.cpp2
-rw-r--r--ksplashml/themeengine/default/themelegacy.cpp2
-rw-r--r--ksplashml/themeengine/objkstheme.cpp2
-rw-r--r--ksplashml/themeengine/redmond/main.cpp2
-rw-r--r--ksplashml/themeengine/redmond/themeredmond.cpp2
-rw-r--r--ksplashml/themeengine/standard/themestandard.cpp2
-rw-r--r--ksplashml/themeengine/unified/themeunified.cpp2
-rw-r--r--ksplashml/wndmain.cpp2
-rw-r--r--ksysguard/gui/KSysGuardApplet.cpp2
-rw-r--r--ksysguard/gui/Workspace.cpp2
-rw-r--r--ksysguard/gui/ksysguard.cpp2
-rw-r--r--ktip/ktipwindow.cpp2
-rw-r--r--kxkb/extension.cpp2
-rw-r--r--kxkb/kcmlayout.cpp2
-rw-r--r--kxkb/kcmmisc.cpp2
-rw-r--r--kxkb/kxkb.cpp2
-rw-r--r--kxkb/pixmap.cpp2
-rw-r--r--kxkb/rules.cpp2
-rw-r--r--kxkb/x11helper.cpp2
-rw-r--r--libkonq/favicons/favicons.cpp2
-rw-r--r--libkonq/kivdirectoryoverlay.cpp2
-rw-r--r--libkonq/kivfreespaceoverlay.cpp2
-rw-r--r--libkonq/knewmenu.cpp2
-rw-r--r--libkonq/konq_bgnddlg.cpp2
-rw-r--r--libkonq/konq_filetip.cpp2
-rw-r--r--libkonq/konq_historymgr.cpp2
-rw-r--r--libkonq/konq_iconviewwidget.cpp2
-rw-r--r--libkonq/konq_popupmenu.cpp2
-rw-r--r--libkonq/konq_propsview.cpp2
-rw-r--r--libkonq/konqbookmarkmanager.h2
-rw-r--r--libkonq/tdefileivi.cpp2
-rw-r--r--nsplugins/kcm_nsplugins.cpp2
-rw-r--r--nsplugins/nspluginloader.cpp2
-rw-r--r--nsplugins/pluginscan.cpp2
-rw-r--r--nsplugins/viewer/nsplugin.cpp2
-rw-r--r--tdedebugdialog/main.cpp2
-rw-r--r--tdeinit/displayconfig.cpp2
-rw-r--r--tdeinit/phase1.cpp2
-rw-r--r--tdeioslave/cgi/cgi.cpp2
-rw-r--r--tdeioslave/finger/tdeio_finger.cpp2
-rw-r--r--tdeioslave/fish/fish.cpp2
-rw-r--r--tdeioslave/info/info.cpp2
-rw-r--r--tdeioslave/man/kmanpart.cpp2
-rw-r--r--tdeioslave/man/tdeio_man.cpp2
-rw-r--r--tdeioslave/media/libmediacommon/notifierserviceaction.cpp2
-rw-r--r--tdeioslave/media/libmediacommon/notifiersettings.cpp2
-rw-r--r--tdeioslave/media/mediamanager/fstabbackend.cpp2
-rw-r--r--tdeioslave/media/mediamanager/mediamanager.cpp2
-rw-r--r--tdeioslave/media/mediamanager/removablebackend.cpp2
-rw-r--r--tdeioslave/media/mediamanager/tdehardwarebackend.cpp2
-rw-r--r--tdeioslave/media/medianotifier/medianotifier.cpp2
-rw-r--r--tdeioslave/media/medianotifier/notificationdialog.cpp2
-rw-r--r--tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp2
-rw-r--r--tdeioslave/remote/kdedmodule/remotedirnotify.cpp2
-rw-r--r--tdeioslave/remote/remoteimpl.cpp2
-rw-r--r--tdeioslave/settings/tdeio_settings.cpp2
-rw-r--r--tdeioslave/sftp/tdeio_sftp.cpp2
-rw-r--r--tdeioslave/smb/tdeio_smb_mount.cpp2
-rw-r--r--tdeioslave/system/kdedmodule/systemdirnotify.cpp2
-rw-r--r--tdeioslave/system/systemimpl.cpp2
-rw-r--r--tdeioslave/thumbnail/textcreator.cpp2
-rw-r--r--tdeioslave/trash/testtrash.cpp2
-rw-r--r--tdeioslave/trash/trashimpl.cpp2
-rw-r--r--tdepasswd/kcm/kcm_useraccount.kcfg2
-rw-r--r--tdepasswd/kcm/main.cpp2
-rw-r--r--tdepasswd/passwd.cpp2
-rw-r--r--tdeprint/kprinter/printwrapper.cpp2
-rw-r--r--tdeprint/slave/tdeio_print.cpp2
-rw-r--r--tdeprint/tdeprintfax/conffilters.cpp2
-rw-r--r--tdeprint/tdeprintfax/defcmds.cpp2
-rw-r--r--tdeprint/tdeprintfax/faxctrl.cpp2
-rw-r--r--tdescreensaver/random.cpp2
-rw-r--r--tdesu/tdesu/tdesu.cpp2
-rw-r--r--tdesu/tdesud/tdesud.cpp2
-rw-r--r--tdm/kfrontend/kgapp.cpp2
-rw-r--r--tdm/kfrontend/kgreeter.cpp2
-rw-r--r--tdm/kfrontend/sakdlg.cpp2
-rw-r--r--tdm/kfrontend/tdmshutdown.cpp2
-rw-r--r--tdm/kfrontend/themer/tdmpixmap.cpp2
-rw-r--r--tdm/kfrontend/themer/tdmpixmap.h2
-rw-r--r--twin/client.cpp2
-rw-r--r--twin/clients/kwmtheme/cli_installer/main.cpp2
-rw-r--r--twin/clients/kwmtheme/kwmthemeclient.cpp2
-rw-r--r--twin/data/update_default_rules.cpp2
-rw-r--r--twin/kcmtwin/twindecoration/twindecoration.cpp2
301 files changed, 301 insertions, 301 deletions
diff --git a/doc/khelpcenter/license/TDELicenseDlg.cpp b/doc/khelpcenter/license/TDELicenseDlg.cpp
index 9417a2c87..049009fcb 100644
--- a/doc/khelpcenter/license/TDELicenseDlg.cpp
+++ b/doc/khelpcenter/license/TDELicenseDlg.cpp
@@ -5,7 +5,7 @@
#include <kiconloader.h>
#include <kpushbutton.h>
#include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ktabwidget.h>
#include <ktextbrowser.h>
#include <tdelocale.h>
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook
index b348c6286..263aaa7fb 100644
--- a/doc/ksplashml/index.docbook
+++ b/doc/ksplashml/index.docbook
@@ -1101,7 +1101,7 @@ appropriate plugin.</para>
#include &lt;tdeglobalsettings.h&gt;
#include &lt;tdelocale.h&gt;
#include &lt;ksplash/objkstheme.h&gt;
-#include &lt;kstandarddirs.h&gt;
+#include &lt;tdestandarddirs.h&gt;
#include "rotwidget.h"
#include "theme2k.h"
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp
index c87384d1f..c026d09f5 100644
--- a/drkonqi/backtrace.cpp
+++ b/drkonqi/backtrace.cpp
@@ -32,7 +32,7 @@
#include <tdeprocess.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
#include <tdetempfile.h>
diff --git a/drkonqi/bugdescriptiondialog.cpp b/drkonqi/bugdescriptiondialog.cpp
index 19c4abcec..ba9e832eb 100644
--- a/drkonqi/bugdescriptiondialog.cpp
+++ b/drkonqi/bugdescriptiondialog.cpp
@@ -32,7 +32,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstdguiitem.h>
#include <kurl.h>
#include <kurllabel.h>
diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp
index fc5c48bee..d0a11d80e 100644
--- a/drkonqi/toplevel.cpp
+++ b/drkonqi/toplevel.cpp
@@ -31,7 +31,7 @@
#include <tdelocale.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kbugreport.h>
#include <tdefiledialog.h>
#include <tdemessagebox.h>
diff --git a/kappfinder/common.cpp b/kappfinder/common.cpp
index 51d30dee5..14bc673a7 100644
--- a/kappfinder/common.cpp
+++ b/kappfinder/common.cpp
@@ -22,7 +22,7 @@
#include <kdebug.h>
#include <kdesktopfile.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqdir.h>
#include <tqfile.h>
diff --git a/kappfinder/main_install.cpp b/kappfinder/main_install.cpp
index c56179548..5625ca84e 100644
--- a/kappfinder/main_install.cpp
+++ b/kappfinder/main_install.cpp
@@ -23,7 +23,7 @@
#include <tdeglobal.h>
#include <kinstance.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqstringlist.h>
diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp
index 00d3c5ae5..a757aa104 100644
--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@@ -31,7 +31,7 @@
#include <kprogress.h>
#include <kservice.h>
#include <kservicegroup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstdguiitem.h>
#include <tdestartupinfo.h>
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index c153cc00f..5ed8f8354 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -56,7 +56,7 @@
#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <twin.h>
#include <kseparator.h>
diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp
index d0212210b..1f7853fd2 100644
--- a/kate/app/katemain.cpp
+++ b/kate/app/katemain.cpp
@@ -19,7 +19,7 @@
#include "kateapp.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 734a078fe..89e67229e 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -68,7 +68,7 @@
#include <ksimpleconfig.h>
#include <kstatusbar.h>
#include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ktrader.h>
#include <kurldrag.h>
#include <kdesktopfile.h>
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index d57101310..9461a8a4a 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -22,7 +22,7 @@
#include "katemainwindow.h"
#include "katedocmanager.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kdirwatch.h>
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 6ae57f2ec..3beb95826 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -41,7 +41,7 @@
#include <tdemessagebox.h>
#include <ksimpleconfig.h>
#include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobalsettings.h>
#include <tdestdaccel.h>
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index 72ffc8644..0908fb778 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -42,7 +42,7 @@
#include <tdemessagebox.h>
#include <ksimpleconfig.h>
#include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobalsettings.h>
#include <kstringhandler.h>
diff --git a/kate/app/kbookmarkhandler.cpp b/kate/app/kbookmarkhandler.cpp
index 8dbf8461d..4e6fd3394 100644
--- a/kate/app/kbookmarkhandler.cpp
+++ b/kate/app/kbookmarkhandler.cpp
@@ -27,7 +27,7 @@
#include <kbookmarkimporter.h>
#include <tdepopupmenu.h>
#include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdediroperator.h>
#include <tdeaction.h>
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index 7346dd398..b7e20d27b 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -24,7 +24,7 @@
#include <kcombobox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kcolorbutton.h>
#include <tdefiledialog.h>
#include <tdeapplication.h>
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index 27c024df0..bb206a433 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -46,7 +46,7 @@
#include <tdeprocess.h>
#include <krichtextlabel.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurlrequester.h>
#include <libtdemid/deviceman.h>
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index 03be761d7..2d5db7b8f 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -37,7 +37,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <twin.h>
#include "bgrender.h"
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index c5d56af0f..13c314d89 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -47,7 +47,7 @@
#include <kimageio.h>
#include <tdelocale.h>
#include <kpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstringhandler.h>
#include <kurlrequester.h>
#include <twin.h>
diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp
index c75d42f6c..ac826a1ff 100644
--- a/kcontrol/background/bgmonitor.cpp
+++ b/kcontrol/background/bgmonitor.cpp
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <tdelocale.h>
#include <kpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurldrag.h>
#include <tqapplication.h>
#include <tqpixmap.h>
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index fe74e00ef..522065711 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -24,7 +24,7 @@
#include <dcopclient.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kimageeffect.h>
#include <tdeprocess.h>
#include <kpixmapio.h>
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index 87d9479de..9a3392d84 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <tdeglobalsettings.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <krandomsequence.h>
#include <konq_defaults.h>
diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp
index bc7de3e63..f75151247 100644
--- a/kcontrol/background/bgwallpaper.cpp
+++ b/kcontrol/background/bgwallpaper.cpp
@@ -30,7 +30,7 @@
#include <tdefiledialog.h>
#include <kimageio.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurldrag.h>
#include "bgsettings.h"
diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp
index 593b9ca1d..17e80f26d 100644
--- a/kcontrol/clock/tzone.cpp
+++ b/kcontrol/clock/tzone.cpp
@@ -40,7 +40,7 @@
#if defined(USE_SOLARIS)
#include <tdetempfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index 225cf6f89..e7b069584 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -32,7 +32,7 @@
#include <kipc.h>
#include <tdemessagebox.h>
#include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeaboutdata.h>
#if defined TQ_WS_X11 && !defined K_WS_QTONLY
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index d858dac40..011b977c9 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -34,7 +34,7 @@
#include <tdemessagebox.h>
#include <kopenwith.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ktrader.h>
#include <kurlrequester.h>
#include <tdeprocess.h>
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index 84a5f5d5a..cf6ec0a5c 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -66,7 +66,7 @@
#include <kpushbutton.h>
#include <kresolver.h>
#include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurllabel.h>
#include <kurlrequester.h>
diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp
index 9bae3214d..d66e6b5f3 100644
--- a/kcontrol/css/kcmcss.cpp
+++ b/kcontrol/css/kcmcss.cpp
@@ -12,7 +12,7 @@
#include <tdefontdialog.h>
#include <kgenericfactory.h>
#include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurlrequester.h>
#include "cssconfig.h"
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index af1744692..192940e60 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -47,7 +47,7 @@
#include <kurlrequester.h>
#include <tdecmoduleloader.h>
#include <kgenericfactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <unistd.h>
#include <ksimpleconfig.h>
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index 3013dfc8f..9a5adf2fc 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -39,7 +39,7 @@
#include <tdemessagebox.h>
#include <kservice.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ktrader.h>
#include "ikwsopts.h"
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
index 8d327dc0d..741e55200 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
@@ -33,7 +33,7 @@
#include <kdebug.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kprotocolinfo.h>
#include <ksimpleconfig.h>
#include <kstaticdeleter.h>
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
index 18952b87e..01e9b93b5 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
@@ -23,7 +23,7 @@
#include "localdomainurifilter.h"
#include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tqregexp.h>
diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
index 598cee24e..28beeada0 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
@@ -32,7 +32,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <kprotocolinfo.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfig.h>
#include <kmimetype.h>
diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp
index 04f5c8c17..05aa07174 100644
--- a/kcontrol/energy/energy.cpp
+++ b/kcontrol/energy/energy.cpp
@@ -28,7 +28,7 @@
#include <tdelocale.h>
#include <knuminput.h>
#include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurllabel.h>
#include <dcopref.h>
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index 43b53540a..c362dbfcc 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -16,7 +16,7 @@
#include <klineedit.h>
#include <tdelistview.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "newtypedlg.h"
#include "filetypedetails.h"
diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp
index 8c6c06931..b78886ef7 100644
--- a/kcontrol/filetypes/keditfiletype.cpp
+++ b/kcontrol/filetypes/keditfiletype.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <tdecmdlineargs.h>
#include <tdesycoca.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#ifdef TQ_WS_X11
#include <X11/Xlib.h>
diff --git a/kcontrol/filetypes/kservicelistwidget.cpp b/kcontrol/filetypes/kservicelistwidget.cpp
index 16669168a..bc8555634 100644
--- a/kcontrol/filetypes/kservicelistwidget.cpp
+++ b/kcontrol/filetypes/kservicelistwidget.cpp
@@ -35,7 +35,7 @@
#include "kserviceselectdlg.h"
#include "typeslistitem.h"
#include <kpropertiesdialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
KServiceListItem::KServiceListItem( KService *pService, int kind )
: TQListBoxText(), desktopPath(pService->desktopEntryPath())
diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp
index 63d65e4ec..97e9a031d 100644
--- a/kcontrol/filetypes/typeslistitem.cpp
+++ b/kcontrol/filetypes/typeslistitem.cpp
@@ -20,7 +20,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdesktopfile.h>
#include <kstaticdeleter.h>
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index 489d479b7..8c93d556f 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -30,7 +30,7 @@
#include <knuminput.h>
#include <tdeprocio.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <stdlib.h>
#ifdef HAVE_FREETYPE2
diff --git a/kcontrol/hwmanager/deviceiconview.cpp b/kcontrol/hwmanager/deviceiconview.cpp
index a5e41ba83..3ad111378 100644
--- a/kcontrol/hwmanager/deviceiconview.cpp
+++ b/kcontrol/hwmanager/deviceiconview.cpp
@@ -22,7 +22,7 @@
#include <tqcursor.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kservicegroup.h>
#include <kiconloader.h>
#include <tdemessagebox.h>
diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp
index 432440f38..6655bec65 100644
--- a/kcontrol/hwmanager/hwdevicetray.cpp
+++ b/kcontrol/hwmanager/hwdevicetray.cpp
@@ -37,7 +37,7 @@
#include <kpropertiesdialog.h>
#include <krun.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeaction.h>
#include <tdeapplication.h>
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 4d54fae0d..44b6cb04c 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -28,7 +28,7 @@
#include <kdebug.h>
#include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kservice.h>
#include <tdelocale.h>
#include <ksimpleconfig.h>
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index 2523bf9b0..38d6432bb 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -20,7 +20,7 @@
*/
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurl.h>
#include <tdeprocess.h>
#include <tdeio/job.h>
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index aa7008f56..576e2c376 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -61,7 +61,7 @@
#include <tdelocale.h>
#include <kdialog.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tdeaboutdata.h>
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index e575b6cd2..33d31357a 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -22,7 +22,7 @@
#include <tdelocale.h>
#include <tdeaboutdata.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelistview.h>
#include <ksimpleconfig.h>
#include <tdeglobalsettings.h>
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp
index ff02be68c..cd3859124 100644
--- a/kcontrol/kcontrol/aboutwidget.cpp
+++ b/kcontrol/kcontrol/aboutwidget.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <tqfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kpixmap.h>
diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp
index 6c0f39115..13b1aa366 100644
--- a/kcontrol/kcontrol/moduleiconview.cpp
+++ b/kcontrol/kcontrol/moduleiconview.cpp
@@ -22,7 +22,7 @@
#include <tqcursor.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kservicegroup.h>
#include <kiconloader.h>
#include <tdecmoduleloader.h>
diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp
index 2d1af0879..1c1a874ce 100644
--- a/kcontrol/kcontrol/modulemenu.cpp
+++ b/kcontrol/kcontrol/modulemenu.cpp
@@ -29,7 +29,7 @@ that is intentional :-]
#include <tdelocale.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#include <kservicegroup.h>
#include <kdebug.h>
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index b96b92bd6..c6d9f73ee 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -30,7 +30,7 @@
#include <tdeprocess.h>
#include <qxembed.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "modules.h"
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index 667290c3b..84f140a54 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -19,7 +19,7 @@
*/
#include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfig.h>
#include <kbugreport.h>
#include <tdeaboutapplication.h>
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index e7fe16170..b71170b56 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -37,7 +37,7 @@
#include <tdelistview.h>
#include <tdemessagebox.h>
#include <kservice.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "kcmkded.h"
#include "kcmkded.moc"
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index b0eaf1305..3235d15c7 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -20,7 +20,7 @@
#include <kdebug.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ksimpleconfig.h>
#include <tdemessagebox.h>
#include <kseparator.h>
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index 4fb58a9b5..99a5aa2a6 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -40,7 +40,7 @@
#include <tdemessagebox.h>
#include <tdeshortcutlist.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <dcopref.h>
ShortcutsModule::ShortcutsModule( TQWidget *parent, const char *name )
diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp
index 31879e2f2..7cb5de9b5 100644
--- a/kcontrol/keys/treeview.cpp
+++ b/kcontrol/keys/treeview.cpp
@@ -25,7 +25,7 @@
#include <tqstringlist.h>
#include <tqcursor.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kiconloader.h>
#include <kservicegroup.h>
diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp
index 7c5436b52..a03d1d157 100644
--- a/kcontrol/kicker/applettab_impl.cpp
+++ b/kcontrol/kicker/applettab_impl.cpp
@@ -31,7 +31,7 @@
#include <tdeglobal.h>
#include <tdelocale.h>
#include <kdialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelistview.h>
#include <kdebug.h>
diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp
index 858cc2cb3..cc8c61515 100644
--- a/kcontrol/kicker/lookandfeeltab_impl.cpp
+++ b/kcontrol/kicker/lookandfeeltab_impl.cpp
@@ -31,7 +31,7 @@
#include <klineedit.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kickerSettings.h>
#include "advancedDialog.h"
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index 291b47071..ae5260f6e 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -25,7 +25,7 @@
#include <kimageio.h>
#include <tdelistview.h>
#include <kstaticdeleter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include "hidingconfig.h"
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 259027a0b..2c03414b7 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -35,7 +35,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <knuminput.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdefontrequester.h>
#include <kkeybutton.h>
#include <tdemessagebox.h>
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index ee44badaa..ffbfc833e 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -33,7 +33,7 @@
#include <knuminput.h>
#include <kpanelextension.h>
#include <kpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <twin.h>
#include "main.h"
diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp
index 5565a05d8..785ee7c0c 100644
--- a/kcontrol/knotify/knotify.cpp
+++ b/kcontrol/knotify/knotify.cpp
@@ -32,7 +32,7 @@
#include <tdeconfig.h>
#include <knotifydialog.h>
#include <tdeparts/genericfactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurlcompletion.h>
#include <kurlrequester.h>
diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index 0c002b5fa..a6ab581ed 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -33,7 +33,7 @@
#include <tdeio/uiserver_stub.h>
#include <tdelocale.h>
#include <konq_defaults.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurlrequester.h>
#include "behaviour.h"
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index f83d68fe3..03c805588 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -35,7 +35,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kmimetype.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ktrader.h>
#include <konq_defaults.h> // include default values directly from libkonq
#include <kurlrequester.h>
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index b80aab5f4..0af6b8db8 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -23,7 +23,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <tdeprocio.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurlrequester.h>
#include "htmlopts.h"
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index 8f56905f3..81fc2adff 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -29,7 +29,7 @@
#include <tqcombobox.h>
#include <kdebug.h>
#include <tqcheckbox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
//#include <errno.h>
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index e6ed3ee4c..2132a01c3 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -21,7 +21,7 @@
#include <tqlineedit.h>
#include <tqcombobox.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <tdefiledialog.h>
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index 5ea6bdab2..96467679d 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -33,7 +33,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeprocio.h>
#include <ksavefile.h>
#include <tdetempfile.h>
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index f4b471a52..6907b87d2 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <tdelocale.h>
#include <kservice.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ktar.h>
#include <tdestyle.h>
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index dec553976..46dcbd59e 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -34,7 +34,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kservicegroup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurldrag.h>
#include "kthememanager.h"
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index 4e449e027..68a9ec3fb 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -37,7 +37,7 @@
#include <kiconloader.h>
#include <klanguagebutton.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "kcmlocale.h"
#include "kcmlocale.moc"
diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp
index 85bb44195..22b4bd533 100644
--- a/kcontrol/locale/localemon.cpp
+++ b/kcontrol/locale/localemon.cpp
@@ -35,7 +35,7 @@
#include <knuminput.h>
#include <kdialog.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "toplevel.h"
#include "localemon.h"
diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp
index dcec347b1..9eec5ec01 100644
--- a/kcontrol/locale/localenum.cpp
+++ b/kcontrol/locale/localenum.cpp
@@ -29,7 +29,7 @@
#include <kdialog.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "toplevel.h"
#include "localenum.h"
diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp
index e2fdd910e..0f6ccd561 100644
--- a/kcontrol/locale/localeother.cpp
+++ b/kcontrol/locale/localeother.cpp
@@ -29,7 +29,7 @@
#include <kdialog.h>
#include <tdelocale.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "localeother.h"
#include "localeother.moc"
diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp
index f9622dde5..cfe76557d 100644
--- a/kcontrol/locale/localetime.cpp
+++ b/kcontrol/locale/localetime.cpp
@@ -30,7 +30,7 @@
#include <kdialog.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <kcalendarsystem.h>
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index 3e4d18d1c..1167207b0 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -28,7 +28,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <tderecentdocument.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqstringlist.h>
#include <tqfile.h>
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index 0283a294b..37d49dbb0 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -36,7 +36,7 @@
#include <kstdguiitem.h>
#include <tdeglobal.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <cstdlib>
#include <unistd.h>
diff --git a/kcontrol/screensaver/advanceddialog.cpp b/kcontrol/screensaver/advanceddialog.cpp
index e277a8853..ca4bbfae6 100644
--- a/kcontrol/screensaver/advanceddialog.cpp
+++ b/kcontrol/screensaver/advanceddialog.cpp
@@ -1,5 +1,5 @@
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqcombobox.h>
#include <kdebug.h>
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index d98787da6..a31be2be0 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -42,7 +42,7 @@
#include <knuminput.h>
#include <tdeprocess.h>
#include <kservicegroup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ksimpleconfig.h>
#include <X11/Xlib.h>
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index d9efc8807..a2a7edaf2 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -53,7 +53,7 @@
#include <tdemessagebox.h>
#include <ksimpleconfig.h>
#include <tdestyle.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "../krdb/krdb.h"
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index ab584c629..73b0a1f96 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -35,7 +35,7 @@
#include <kgenericfactory.h>
#include <twin.h>
#include <kcolorbutton.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#define protected public
diff --git a/kcontrol/tdefontinst/lib/Misc.cpp b/kcontrol/tdefontinst/lib/Misc.cpp
index ab5c837ef..7f21abf0b 100644
--- a/kcontrol/tdefontinst/lib/Misc.cpp
+++ b/kcontrol/tdefontinst/lib/Misc.cpp
@@ -29,7 +29,7 @@
#include "Misc.h"
#include <tqfile.h>
#include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <klargefile.h>
#include <tdeio/netaccess.h>
#include <unistd.h>
diff --git a/kcontrol/tdeio/fakeuaprovider.cpp b/kcontrol/tdeio/fakeuaprovider.cpp
index b48d19738..b31645574 100644
--- a/kcontrol/tdeio/fakeuaprovider.cpp
+++ b/kcontrol/tdeio/fakeuaprovider.cpp
@@ -22,7 +22,7 @@
#include <kdebug.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "fakeuaprovider.h"
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index 973d1dc35..06eb86c32 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -40,7 +40,7 @@
#include <kimageio.h>
#include <kcombobox.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeio/netaccess.h>
#include <kiconloader.h>
#include <kurldrag.h>
diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp
index 5195c3bfd..901287dee 100644
--- a/kcontrol/tdm/tdm-users.cpp
+++ b/kcontrol/tdm/tdm-users.cpp
@@ -34,7 +34,7 @@
#include <kimagefilepreview.h>
#include <tdeio/netaccess.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdemessagebox.h>
#include <kurldrag.h>
diff --git a/kcontrol/usbview/usbdb.cpp b/kcontrol/usbview/usbdb.cpp
index be5f3b63a..8e920952b 100644
--- a/kcontrol/usbview/usbdb.cpp
+++ b/kcontrol/usbview/usbdb.cpp
@@ -17,7 +17,7 @@
#include <tqregexp.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "usbdb.h"
diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp
index c9b9ccc30..5db7c84da 100644
--- a/kcontrol/view1394/view1394.cpp
+++ b/kcontrol/view1394/view1394.cpp
@@ -26,7 +26,7 @@
#include <kdialog.h>
#include <tdeglobal.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "view1394.h"
diff --git a/kdesktop/desktop.cpp b/kdesktop/desktop.cpp
index e32a3248a..3ef0e33e7 100644
--- a/kdesktop/desktop.cpp
+++ b/kdesktop/desktop.cpp
@@ -44,7 +44,7 @@
#include <dcopclient.h>
#include <kcursor.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kimageio.h>
#include <kinputdialog.h>
#include <kipc.h>
diff --git a/kdesktop/init.cpp b/kdesktop/init.cpp
index f881d614f..9a2b3644a 100644
--- a/kdesktop/init.cpp
+++ b/kdesktop/init.cpp
@@ -19,7 +19,7 @@
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdesktopfile.h>
#include <tdeglobalsettings.h>
#include <tdeapplication.h>
diff --git a/kdesktop/kdesktopshadowsettings.h b/kdesktop/kdesktopshadowsettings.h
index c7e73db71..3c08cd574 100644
--- a/kdesktop/kdesktopshadowsettings.h
+++ b/kdesktop/kdesktopshadowsettings.h
@@ -24,7 +24,7 @@
#define __FX_DATA_DESKTOP
#include <tqcolor.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfig.h>
#include <kshadowsettings.h>
diff --git a/kdesktop/kdiconview.cpp b/kdesktop/kdiconview.cpp
index 62319e1fd..597d78139 100644
--- a/kdesktop/kdiconview.cpp
+++ b/kdesktop/kdiconview.cpp
@@ -42,7 +42,7 @@
#include <kivfreespaceoverlay.h>
#include <kprotocolinfo.h>
#include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurldrag.h>
#include <twin.h>
#include <twinmodule.h>
diff --git a/kdesktop/krootwm.cpp b/kdesktop/krootwm.cpp
index 28d1dbd98..abe4b52e1 100644
--- a/kdesktop/krootwm.cpp
+++ b/kdesktop/krootwm.cpp
@@ -33,7 +33,7 @@
#include <errno.h>
#include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdepopupmenu.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
diff --git a/kdesktop/lock/infodlg.cpp b/kdesktop/lock/infodlg.cpp
index 6fc604b43..a37c92b8e 100644
--- a/kdesktop/lock/infodlg.cpp
+++ b/kdesktop/lock/infodlg.cpp
@@ -14,7 +14,7 @@
#include <tdelocale.h>
#include <kpushbutton.h>
#include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobalsettings.h>
#include <tdeconfig.h>
#include <kiconloader.h>
diff --git a/kdesktop/lock/lockdlg.cpp b/kdesktop/lock/lockdlg.cpp
index d26830e3a..3f59fd461 100644
--- a/kdesktop/lock/lockdlg.cpp
+++ b/kdesktop/lock/lockdlg.cpp
@@ -20,7 +20,7 @@
#include <tdelocale.h>
#include <kpushbutton.h>
#include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ksimpleconfig.h>
#include <tdeglobalsettings.h>
#include <tdeconfig.h>
diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp
index 47db882ef..d36b02559 100644
--- a/kdesktop/lock/lockprocess.cpp
+++ b/kdesktop/lock/lockprocess.cpp
@@ -38,7 +38,7 @@
#include <dmctl.h>
#include <dcopref.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeapplication.h>
#include <kservicegroup.h>
#include <kdebug.h>
diff --git a/kdesktop/lock/main.cpp b/kdesktop/lock/main.cpp
index f80f406a1..3e789e780 100644
--- a/kdesktop/lock/main.cpp
+++ b/kdesktop/lock/main.cpp
@@ -34,7 +34,7 @@
#include <tdeglobalsettings.h>
#include <dcopref.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdmtsak.h>
diff --git a/kdesktop/lock/querydlg.cpp b/kdesktop/lock/querydlg.cpp
index edab1fd97..5b1fea0f3 100644
--- a/kdesktop/lock/querydlg.cpp
+++ b/kdesktop/lock/querydlg.cpp
@@ -14,7 +14,7 @@
#include <tdelocale.h>
#include <kpushbutton.h>
#include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobalsettings.h>
#include <tdeconfig.h>
#include <kiconloader.h>
diff --git a/kdesktop/lock/sakdlg.cpp b/kdesktop/lock/sakdlg.cpp
index a9bb25f40..5b23a9c5a 100644
--- a/kdesktop/lock/sakdlg.cpp
+++ b/kdesktop/lock/sakdlg.cpp
@@ -14,7 +14,7 @@
#include <tdelocale.h>
#include <kpushbutton.h>
#include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobalsettings.h>
#include <tdeconfig.h>
#include <kiconloader.h>
diff --git a/kdesktop/lock/securedlg.cpp b/kdesktop/lock/securedlg.cpp
index 5be274660..ba2b08af0 100644
--- a/kdesktop/lock/securedlg.cpp
+++ b/kdesktop/lock/securedlg.cpp
@@ -14,7 +14,7 @@
#include <tdelocale.h>
#include <kpushbutton.h>
#include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobalsettings.h>
#include <tdeconfig.h>
#include <kiconloader.h>
diff --git a/kdesktop/lockeng.cpp b/kdesktop/lockeng.cpp
index 57a33bf53..a9f0cb2f7 100644
--- a/kdesktop/lockeng.cpp
+++ b/kdesktop/lockeng.cpp
@@ -20,7 +20,7 @@
#include <tdecryptographiccarddevice.h>
#endif
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeapplication.h>
#include <kservicegroup.h>
#include <ksimpleconfig.h>
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 15abec3f5..2ac8b3ecd 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -59,7 +59,7 @@
#include <krun.h>
#include <twin.h>
#include <tdesu/su.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <kpushbutton.h>
diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp
index f26710ce2..2e9dbf235 100644
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@@ -14,7 +14,7 @@
#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdeaboutapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "kftabdlg.h"
#include "kquery.h"
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index 3820eaead..57ca1fc91 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -25,7 +25,7 @@
#include <tdefiledialog.h>
#include <kregexpeditorinterface.h>
#include <tdeparts/componentfactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "kquery.h"
#include "kftabdlg.h"
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index f3c56956e..1a581553b 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -27,7 +27,7 @@
#include <krun.h>
#include <tdeprocess.h>
#include <kpropertiesdialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdemessagebox.h>
#include <kmimetype.h>
#include <tdeglobal.h>
diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp
index b9dc76aa3..39e914fab 100644
--- a/kfind/kquery.cpp
+++ b/kfind/kquery.cpp
@@ -7,7 +7,7 @@
#include <tdeapplication.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kzip.h>
#include "kquery.h"
diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp
index eba2fda2d..d77fce982 100644
--- a/khelpcenter/docentry.cpp
+++ b/khelpcenter/docentry.cpp
@@ -4,7 +4,7 @@
#include <kdebug.h>
#include <kdesktopfile.h>
#include <kurl.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeapplication.h>
#include "prefs.h"
diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp
index e56062a07..6a4998b35 100644
--- a/khelpcenter/docmetainfo.cpp
+++ b/khelpcenter/docmetainfo.cpp
@@ -1,7 +1,7 @@
#include <tqregexp.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <ksimpleconfig.h>
diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp
index c42aaaece..77d540c29 100644
--- a/khelpcenter/formatter.cpp
+++ b/khelpcenter/formatter.cpp
@@ -24,7 +24,7 @@
#include <tdeglobal.h>
#include <kdebug.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqfile.h>
#include <tqtextstream.h>
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index 73d98d113..815bfca32 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -27,7 +27,7 @@
#include <tdelocale.h>
#include <tdemainwindow.h>
#include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstatusbar.h>
#include <tqheader.h>
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index 9b2f67abf..0a9c78b69 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -4,7 +4,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeprocess.h>
#include <tdelocale.h>
#include <tdeconfig.h>
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index d737f2528..e823fc34b 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -19,7 +19,7 @@
*/
#include <tqlayout.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kurllabel.h>
#include <tdeapplication.h>
diff --git a/khelpcenter/htmlsearch/klangcombo.cpp b/khelpcenter/htmlsearch/klangcombo.cpp
index 308109d12..a53a1b01f 100644
--- a/khelpcenter/htmlsearch/klangcombo.cpp
+++ b/khelpcenter/htmlsearch/klangcombo.cpp
@@ -23,7 +23,7 @@
#include <tqiconset.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "klangcombo.h"
#include "klangcombo.moc"
diff --git a/khelpcenter/htmlsearch/progressdialog.cpp b/khelpcenter/htmlsearch/progressdialog.cpp
index 33a783127..a289d3f7c 100644
--- a/khelpcenter/htmlsearch/progressdialog.cpp
+++ b/khelpcenter/htmlsearch/progressdialog.cpp
@@ -4,7 +4,7 @@
#include <tdelocale.h>
#include <kprogress.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "progressdialog.moc"
diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp
index d62e9fdb2..8ca4ddfb2 100644
--- a/khelpcenter/htmlsearchconfig.cpp
+++ b/khelpcenter/htmlsearchconfig.cpp
@@ -22,7 +22,7 @@
#include <tqwhatsthis.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kurllabel.h>
#include <tdeapplication.h>
diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp
index 83c2ce5ea..f7e44c813 100644
--- a/khelpcenter/infotree.cpp
+++ b/khelpcenter/infotree.cpp
@@ -29,7 +29,7 @@
#include <kiconloader.h>
#include <tdelistview.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurl.h>
#include <tqfile.h>
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index 5d03c92eb..0f9cf08bd 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -32,7 +32,7 @@
#include <tdeglobal.h>
#include <tdeaboutdata.h>
#include <kdialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeprocess.h>
#include <tdeapplication.h>
#include <dcopclient.h>
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index df7a2a3aa..cea3ad289 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -30,7 +30,7 @@
#include <kdebug.h>
#include <dcopclient.h>
#include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfig.h>
#include <tqfile.h>
diff --git a/khelpcenter/khelpcenter.kcfg b/khelpcenter/khelpcenter.kcfg
index 836bb9f45..d23e31753 100644
--- a/khelpcenter/khelpcenter.kcfg
+++ b/khelpcenter/khelpcenter.kcfg
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <include>kstandarddirs.h</include>
+ <include>tdestandarddirs.h</include>
<kcfgfile name="khelpcenterrc"/>
<group name="Search">
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index 7568736d6..e52d4bab5 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -40,7 +40,7 @@
#include <tdeaction.h>
#include <tdeapplication.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobal.h>
#include <tdelocale.h>
#include <kdebug.h>
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index a99926dfe..e24279f0d 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -4,7 +4,7 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeprocess.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp
index 6c12660f8..b52643f5e 100644
--- a/khelpcenter/searchhandler.cpp
+++ b/khelpcenter/searchhandler.cpp
@@ -29,7 +29,7 @@
#include <kdebug.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <stdlib.h>
diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp
index 4884979c0..0ee679549 100644
--- a/khelpcenter/toc.cpp
+++ b/khelpcenter/toc.cpp
@@ -24,7 +24,7 @@
#include <kiconloader.h>
#include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tqdir.h>
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index 21def32d3..b0190afd8 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -13,7 +13,7 @@
#include <tdehtmlview.h>
#include <tdelocale.h>
#include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqfileinfo.h>
#include <tqclipboard.h>
diff --git a/khotkeys/kcontrol/voicerecorder.cpp b/khotkeys/kcontrol/voicerecorder.cpp
index 9af645045..daef922c9 100644
--- a/khotkeys/kcontrol/voicerecorder.cpp
+++ b/khotkeys/kcontrol/voicerecorder.cpp
@@ -24,7 +24,7 @@
#include <tqpainter.h>
#include <tdemessagebox.h>
#include <klibloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp
index c450abe44..d34ef7fad 100644
--- a/khotkeys/kcontrol/voicerecordpage.cpp
+++ b/khotkeys/kcontrol/voicerecordpage.cpp
@@ -12,7 +12,7 @@
#include <tqlabel.h>
#include <tqpushbutton.h>
#include <klineedit.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp
index 563a4a5dc..72ac70afd 100644
--- a/khotkeys/shared/actions.cpp
+++ b/khotkeys/shared/actions.cpp
@@ -21,7 +21,7 @@
#include <kdebug.h>
#include <kurifilter.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeapplication.h>
#include <dcopclient.h>
#include <kdesktopfile.h>
diff --git a/khotkeys/shared/khotkeysglobal.cpp b/khotkeys/shared/khotkeysglobal.cpp
index 87fe74c38..123aa8bf9 100644
--- a/khotkeys/shared/khotkeysglobal.cpp
+++ b/khotkeys/shared/khotkeysglobal.cpp
@@ -18,7 +18,7 @@
#include <assert.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <klibloader.h>
#include "input.h"
diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp
index 58fd42050..d5ccea906 100644
--- a/khotkeys/update/update.cpp
+++ b/khotkeys/update/update.cpp
@@ -16,7 +16,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <dcopclient.h>
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index dab00ba20..7cfe949eb 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdebug.h>
#include <kcolorbutton.h>
#include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeapplication.h>
#include <tdeprocess.h>
#include <tdelocale.h>
diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp
index c5dc929f1..253f8656c 100644
--- a/kicker/applets/clock/init.cpp
+++ b/kicker/applets/clock/init.cpp
@@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdebug.h>
#include <kcolorbutton.h>
#include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeapplication.h>
#include <tdeprocess.h>
#include <tdelocale.h>
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index 85a4f3f19..d33af74b3 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kcolorbutton.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstringhandler.h>
#include <tdelocale.h>
diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp
index bf496e028..69c65864f 100644
--- a/kicker/applets/launcher/quickaddappsmenu.cpp
+++ b/kicker/applets/launcher/quickaddappsmenu.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdesktopfile.h>
#include <tdeglobalsettings.h>
#include <tdesycocaentry.h>
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 5878c0acd..ee608a92e 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kipc.h>
#include <kiconloader.h>
#include <kurldrag.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <math.h>
#include <algorithm>
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 876c85926..3f703348f 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdemessagebox.h>
#include <knuminput.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurldrag.h>
#include <kdebug.h>
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index fb805bef5..d1d9fa68b 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdebug.h>
#include <tdeprocess.h>
#include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#include <dcopclient.h>
#include <netwm.h>
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index cba72ce09..ac35bfdbc 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeprocess.h>
#include <kshell.h>
#include <twin.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <dcopclient.h>
diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp
index e1c9f4afc..a37af0883 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.cpp
+++ b/kicker/extensions/kasbar/kasaboutdlg.cpp
@@ -61,7 +61,7 @@
#include <tdeversion.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobal.h>
#include <kiconloader.h>
#include <ktextbrowser.h>
diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp
index a99c5f8ba..2e5b8d459 100644
--- a/kicker/extensions/kasbar/kasclockitem.cpp
+++ b/kicker/extensions/kasbar/kasclockitem.cpp
@@ -12,7 +12,7 @@
#include <kpixmap.h>
#include <kpixmapeffect.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdepopupmenu.h>
#include <taskmanager.h>
diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp
index 450d80154..2643ab932 100644
--- a/kicker/extensions/kasbar/kasloaditem.cpp
+++ b/kicker/extensions/kasbar/kasloaditem.cpp
@@ -19,7 +19,7 @@
#include <kpixmap.h>
#include <kpixmapeffect.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdepopupmenu.h>
#include <taskmanager.h>
diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp
index 219c324fb..25b28d5f6 100644
--- a/kicker/extensions/kasbar/kasresources.cpp
+++ b/kicker/extensions/kasbar/kasresources.cpp
@@ -48,7 +48,7 @@
** SUCH DAMAGE.
*/
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kpixmapeffect.h>
#include "kasbar.h"
diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp
index 47d457d0d..4e6740f8a 100644
--- a/kicker/extensions/taskbar/taskbarextension.cpp
+++ b/kicker/extensions/taskbar/taskbarextension.cpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeglobal.h>
#include <tdelocale.h>
#include <krootpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "global.h"
#include "kickerSettings.h"
diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp
index 52e6c0faa..1e5c2a7f8 100644
--- a/kicker/kicker/buttons/knewbutton.cpp
+++ b/kicker/kicker/buttons/knewbutton.cpp
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdelocale.h>
#include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp
index 6b3836d20..f6062854b 100644
--- a/kicker/kicker/buttons/servicebutton.cpp
+++ b/kicker/kicker/buttons/servicebutton.cpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kicontheme.h>
#include <kpropertiesdialog.h>
#include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurl.h>
#include "global.h"
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index 63a0815da..5ba59dfbc 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -40,7 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kpanelapplet.h>
#include <tdepopupmenu.h>
#include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "applethandle.h"
#include "appletinfo.h"
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 877f828d9..66fbfce79 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -43,7 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdesktopfile.h>
#include <tdeglobal.h>
#include <kicker.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <twin.h>
#include <tdelocale.h>
#include <tdeglobalsettings.h>
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index d62d5396c..6b54a0dbe 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeapplication.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurl.h>
#include <kdebug.h>
#include <kdesktopfile.h>
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index 14cc96b29..bf22f3b70 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdelocale.h>
#include <tdemenubar.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <twinmodule.h>
#include <dcopref.h>
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index 7b2913b9c..21ff97684 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -41,7 +41,7 @@
#include <kimageio.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <twin.h>
#include <twinmodule.h>
diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp
index d11dee27f..bb7044aec 100644
--- a/kicker/kicker/core/pluginmanager.cpp
+++ b/kicker/kicker/core/pluginmanager.cpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <klibloader.h>
#include <kpanelapplet.h>
#include <kpanelextension.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstaticdeleter.h>
#include "appletinfo.h"
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index fb5e3f16d..f3b864ed8 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdebug.h>
#include <tdeglobalsettings.h>
#include <kpushbutton.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstdguiitem.h>
#include <paneldrag.h>
diff --git a/kicker/kicker/ui/addbutton_mnu.cpp b/kicker/kicker/ui/addbutton_mnu.cpp
index a544d0f74..a70a9cfd6 100644
--- a/kicker/kicker/ui/addbutton_mnu.cpp
+++ b/kicker/kicker/ui/addbutton_mnu.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdesycocaentry.h>
#include <kservice.h>
#include <kservicegroup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include "addbutton_mnu.h"
diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp
index 6861ba988..a0c572685 100644
--- a/kicker/kicker/ui/exe_dlg.cpp
+++ b/kicker/kicker/ui/exe_dlg.cpp
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kicondialog.h>
#include <tdemessagebox.h>
#include <kmimetype.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurlcompletion.h>
#include <kurlrequester.h>
#include <kurl.h>
diff --git a/kicker/kicker/ui/flipscrollview.h b/kicker/kicker/ui/flipscrollview.h
index 6ba2615b3..7c761b5ac 100644
--- a/kicker/kicker/ui/flipscrollview.h
+++ b/kicker/kicker/ui/flipscrollview.h
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqframe.h>
#include <tqtimer.h>
#include <tqpainter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "service_mnu.h"
class ItemView;
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 3bfd341c4..f7637a100 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -29,7 +29,7 @@
#include <kiconloader.h>
#include <kicontheme.h>
#include <kipc.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
HideButton::HideButton(TQWidget *parent, const char *name)
: TQButton(parent, name),
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 155584ab9..aef71d84f 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -57,7 +57,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kiconloader.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kcombobox.h>
#include <twin.h>
#include <kdebug.h>
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 7048f02c1..80bf0e108 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <klineedit.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetoolbarbutton.h>
#include <twin.h>
#include <popupmenutop.h>
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index b92440474..c7e347fb5 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -68,7 +68,7 @@
#include <klineedit.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kcombobox.h>
#include <twin.h>
#include <kdebug.h>
diff --git a/kicker/kicker/ui/popupmenutop.cpp b/kicker/kicker/ui/popupmenutop.cpp
index 571d1c7dc..c05545aae 100644
--- a/kicker/kicker/ui/popupmenutop.cpp
+++ b/kicker/kicker/ui/popupmenutop.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "popupmenutop.h"
#include "kickerSettings.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqimage.h>
#include <kdebug.h>
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 648b7088d..f18816d69 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <dcopclient.h>
#include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <kdesktopfile.h>
#include <tdeglobalsettings.h>
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index 224cf427a..43169f0c8 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kiconeffect.h>
#include <kiconloader.h>
#include <tdeio/netaccess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kservice.h>
#include <ksimpleconfig.h>
diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp
index 808c90f80..4f8b9f80a 100644
--- a/kicker/libkicker/menuinfo.cpp
+++ b/kicker/libkicker/menuinfo.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeapplication.h>
#include <ksimpleconfig.h>
#include <klibloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kpanelmenu.h>
#include <tdeparts/componentfactory.h>
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index 688f5604d..9d97cdf8b 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -43,7 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kicontheme.h>
#include <kiconeffect.h>
#include <kipc.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kdebug.h>
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index b6eaf3b79..a8387cbb6 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -30,7 +30,7 @@
#include <kiconeffect.h>
#include <kicontheme.h>
#include <kipc.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "kickerSettings.h"
diff --git a/kicker/menuext/find/findmenu.cpp b/kicker/menuext/find/findmenu.cpp
index 3708a9dd1..36c64843a 100644
--- a/kicker/menuext/find/findmenu.cpp
+++ b/kicker/menuext/find/findmenu.cpp
@@ -24,7 +24,7 @@
#include <tdeapplication.h>
#include <kiconloader.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "findmenu.h"
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index a8f16053a..b270daad3 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -30,7 +30,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqvalidator.h>
diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp
index 85f85b7bc..45ed07bd7 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.cpp
+++ b/kicker/menuext/konq-profiles/konqy_menu.cpp
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeglobal.h>
#include <tdeapplication.h>
#include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeio/global.h>
#include <ksimpleconfig.h>
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index 17ca9d629..ed28d5e49 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <krun.h>
#include <kshell.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "konsole_mnu.h"
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index b2249d858..1b1254a54 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -9,7 +9,7 @@
#include <kmimetype.h>
#include <tdepopupmenu.h>
#include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "konsole_mnu.h"
#include "konsolebookmarkmenu.h"
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
index 840b3b8f6..811cc3f29 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
@@ -7,7 +7,7 @@
#include <kmimetype.h>
#include <tdepopupmenu.h>
#include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
//#include <kbookmarkmenu.h>
#include "konsole_mnu.h"
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 97da9b986..6df543bc3 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdelocale.h>
#include <kservice.h>
#include <kservicegroup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdesycoca.h>
#include <kurl.h>
#include <kurldrag.h>
diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp
index 8c0a8407a..c01c7aa24 100644
--- a/kicker/menuext/remote/remotemenu.cpp
+++ b/kicker/menuext/remote/remotemenu.cpp
@@ -21,7 +21,7 @@
#include <kdebug.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <krun.h>
#include <kiconloader.h>
#include <kdesktopfile.h>
diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp
index 17d1a8b01..bbae60622 100644
--- a/kicker/menuext/tom/tom.cpp
+++ b/kicker/menuext/tom/tom.cpp
@@ -47,7 +47,7 @@ using namespace std;
#include <tderecentdocument.h>
#include <kservice.h>
#include <kservicegroup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstdaction.h>
#include <tdesycocaentry.h>
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index ee443523c..1084b5667 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeglobal.h>
#include <klibloader.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <tdemessagebox.h>
diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp
index e91d7ac7f..4591f9c34 100644
--- a/kicker/proxy/extensiondebugger.cpp
+++ b/kicker/proxy/extensiondebugger.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeglobal.h>
#include <klibloader.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <kpanelextension.h>
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index 1c2a8d2a6..10ab9ff5d 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeglobal.h>
#include <klibloader.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <kpanelextension.h>
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index f4dc14d69..3f82f1e50 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeglobalaccel.h>
#include <kimageeffect.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "kickerSettings.h"
#include "taskbarsettings.h"
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index 32ad5531e..911ce8810 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeapplication.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <twindowlistmenu.h>
#include <X11/X.h>
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index aaabcc0ff..70d4b6c65 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -40,7 +40,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ksimpleconfig.h>
#include <kstringhandler.h>
#include <ksystemtray.h>
diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp
index 0b6580b40..2805ec1b3 100644
--- a/kmenuedit/basictab.cpp
+++ b/kmenuedit/basictab.cpp
@@ -27,7 +27,7 @@
#include <tqwhatsthis.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobal.h>
#include <kdialog.h>
#include <kkeybutton.h>
diff --git a/kmenuedit/kcontrol_main.cpp b/kmenuedit/kcontrol_main.cpp
index 0a6169d24..1801e7709 100644
--- a/kmenuedit/kcontrol_main.cpp
+++ b/kmenuedit/kcontrol_main.cpp
@@ -25,7 +25,7 @@
#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "kmenuedit.h"
diff --git a/kmenuedit/menufile.cpp b/kmenuedit/menufile.cpp
index 2322cc31d..ec3f91afd 100644
--- a/kmenuedit/menufile.cpp
+++ b/kmenuedit/menufile.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <tdeglobal.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "menufile.h"
diff --git a/kmenuedit/menuinfo.cpp b/kmenuedit/menuinfo.cpp
index 03c3a2e57..ed0c9bf77 100644
--- a/kmenuedit/menuinfo.cpp
+++ b/kmenuedit/menuinfo.cpp
@@ -24,7 +24,7 @@
#include <kdesktopfile.h>
#include <khotkeys.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
//
// MenuFolderInfo
diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index 8340b4090..94aff5e2b 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -34,7 +34,7 @@
#include <tqstringlist.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kinputdialog.h>
#include <tdelocale.h>
#include <ksimpleconfig.h>
diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui
index 0fe4c0823..0e97c008a 100644
--- a/knetattach/knetattach.ui
+++ b/knetattach/knetattach.ui
@@ -424,7 +424,7 @@
<include location="global" impldecl="in implementation">tdeglobalsettings.h</include>
<include location="global" impldecl="in implementation">ksimpleconfig.h</include>
<include location="global" impldecl="in implementation">tdeapplication.h</include>
- <include location="global" impldecl="in implementation">kstandarddirs.h</include>
+ <include location="global" impldecl="in implementation">tdestandarddirs.h</include>
<include location="global" impldecl="in implementation">kdirnotify_stub.h</include>
<include location="global" impldecl="in implementation">kcombobox.h</include>
<include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/konqueror/about/konq_aboutpage.cpp b/konqueror/about/konq_aboutpage.cpp
index b7605adea..c2e85c479 100644
--- a/konqueror/about/konq_aboutpage.cpp
+++ b/konqueror/about/konq_aboutpage.cpp
@@ -8,7 +8,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeaction.h>
#include <kiconloader.h>
#include <kurifilter.h>
diff --git a/konqueror/client/kfmclient.cpp b/konqueror/client/kfmclient.cpp
index 50f79fe64..81c527f55 100644
--- a/konqueror/client/kfmclient.cpp
+++ b/konqueror/client/kfmclient.cpp
@@ -31,7 +31,7 @@
#include <tdelocale.h>
#include <ktrader.h>
#include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kopenwith.h>
#include <kurlrequesterdlg.h>
#include <tdemessagebox.h>
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 052fa341c..2a0b43923 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -51,7 +51,7 @@
#include <kdatastream.h>
#include <tdetempfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeparts/part.h>
#include <tdeparts/componentfactory.h>
diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp
index 104db0048..60c2636ea 100644
--- a/konqueror/keditbookmarks/importers.cpp
+++ b/konqueror/keditbookmarks/importers.cpp
@@ -178,7 +178,7 @@ TQString GaleonImportCommand::requestFilename() const {
i18n("*.xbel|Galeon Bookmark Files (*.xbel)"));
}
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
TQString KDE2ImportCommand::requestFilename() const {
return KFileDialog::getOpenFileName(
diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp
index f4cf038fd..2248dea8e 100644
--- a/konqueror/keditbookmarks/kbookmarkmerger.cpp
+++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp
@@ -27,7 +27,7 @@
#include <kbookmarkmanager.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <dcopclient.h>
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index 6bb249beb..8635e88d3 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -26,7 +26,7 @@
#include <dcopref.h>
#include <tdelocale.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/konqueror/konq_main.cpp b/konqueror/konq_main.cpp
index f7a9c6c00..df43f2403 100644
--- a/konqueror/konq_main.cpp
+++ b/konqueror/konq_main.cpp
@@ -27,7 +27,7 @@
#include <tdetempfile.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tdecmdlineargs.h>
#include <dcopclient.h>
diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp
index f1eac5ca8..f81eaadb2 100644
--- a/konqueror/konq_mainwindow.cpp
+++ b/konqueror/konq_mainwindow.cpp
@@ -87,7 +87,7 @@
#include <kprotocolinfo.h>
#include <tdestdaccel.h>
#include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdesycoca.h>
#include <tdetempfile.h>
#include <kurlrequesterdlg.h>
diff --git a/konqueror/konq_misc.cpp b/konqueror/konq_misc.cpp
index 52f5e2857..673048b0f 100644
--- a/konqueror/konq_misc.cpp
+++ b/konqueror/konq_misc.cpp
@@ -27,7 +27,7 @@
#include <tdemessagebox.h>
#include <kurifilter.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <twin.h>
#include <kprotocolinfo.h>
#include <kurldrag.h>
diff --git a/konqueror/konq_profiledlg.cpp b/konqueror/konq_profiledlg.cpp
index 6819990a9..55114690f 100644
--- a/konqueror/konq_profiledlg.cpp
+++ b/konqueror/konq_profiledlg.cpp
@@ -32,7 +32,7 @@
#include <kdebug.h>
#include <kstdguiitem.h>
#include <tdeio/global.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kseparator.h>
diff --git a/konqueror/konq_viewmgr.cpp b/konqueror/konq_viewmgr.cpp
index 810d67376..435710ad8 100644
--- a/konqueror/konq_viewmgr.cpp
+++ b/konqueror/konq_viewmgr.cpp
@@ -28,7 +28,7 @@
#include <tqptrlist.h>
#include <tdeaccelgen.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tdeapplication.h>
#include <tdeglobalsettings.h>
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 955927558..5c82a55ef 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -29,7 +29,7 @@
#include <tdelocale.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kicondialog.h>
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index dad6fd7bd..33b35aeb4 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -43,7 +43,7 @@
#include <tdeprocess.h>
#include <kpropertiesdialog.h>
#include <kprotocolinfo.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurldrag.h>
#include <stdlib.h>
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 293616f21..f0ccc2e6d 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -2,7 +2,7 @@
#include "konqsidebar_tree.moc"
#include "konq_sidebartree.h"
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ksimpleconfig.h>
#include <kinputdialog.h>
#include <kiconloader.h>
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index 02543b652..a64cfaf18 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -29,7 +29,7 @@
#include <tdelocale.h>
#include <konq_pixmapprovider.h>
#include <tdeparts/browserextension.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name)
diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp
index fbb152289..5e7aefa5b 100644
--- a/konsole/konsole/TEPty.cpp
+++ b/konsole/konsole/TEPty.cpp
@@ -80,7 +80,7 @@
#include <errno.h>
#include <termios.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kpty.h>
diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp
index 7a2b3f566..6400598f6 100644
--- a/konsole/konsole/keytrans.cpp
+++ b/konsole/konsole/keytrans.cpp
@@ -30,7 +30,7 @@
#include <tqobject.h>
#include <tqintdict.h>
#include <tqfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <stdio.h>
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 45775f2e1..b28256e55 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -99,7 +99,7 @@ Time to start a requirement list.
#include <tdefontdialog.h>
#include <kkeydialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqpainter.h>
#include <tdemenubar.h>
#include <tdemessagebox.h>
diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp
index 1b9f70c3c..8316455ac 100644
--- a/konsole/konsole/konsolebookmarkhandler.cpp
+++ b/konsole/konsole/konsolebookmarkhandler.cpp
@@ -19,7 +19,7 @@
// Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.cpp
#include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kshell.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp
index d199808df..d52175b0e 100644
--- a/konsole/konsole/konsolebookmarkmenu.cpp
+++ b/konsole/konsole/konsolebookmarkmenu.cpp
@@ -17,7 +17,7 @@
*/
#include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeaction.h>
#include "konsole.h"
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index 282720278..21bbbe66c 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -37,7 +37,7 @@
#include <tdecmdlineargs.h>
#include <kimageio.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobalsettings.h>
#include <tdeio/netaccess.h>
#include <tdemessagebox.h>
diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp
index 2f52dc6a7..cf80136f3 100644
--- a/konsole/konsole/schema.cpp
+++ b/konsole/konsole/schema.cpp
@@ -55,7 +55,7 @@
#include <tqdir.h>
#include <tqdatetime.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp
index 4bb930266..4a3b1975e 100644
--- a/konsole/konsole/session.cpp
+++ b/konsole/konsole/session.cpp
@@ -29,7 +29,7 @@
#include <tdeprocio.h>
#include <krun.h>
#include <kshell.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <stdlib.h>
#include <tqfile.h>
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index 66d56cc73..6621d8638 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -23,7 +23,7 @@
#include <ksimpleconfig.h>
#include <tdelocale.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#include <dcopclient.h>
#include <tdeprocess.h>
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index b0c9e8767..faf7138a8 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -26,7 +26,7 @@
#include <ksimpleconfig.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <dcopclient.h>
#include <kipc.h>
diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp
index 150c67b28..31dc1c411 100644
--- a/kpersonalizer/kfindlanguage.cpp
+++ b/kpersonalizer/kfindlanguage.cpp
@@ -23,7 +23,7 @@
#include <ksimpleconfig.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include "kfindlanguage.h"
diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp
index bd7f1a7c2..aee2a68b3 100644
--- a/kpersonalizer/kospage.cpp
+++ b/kpersonalizer/kospage.cpp
@@ -22,7 +22,7 @@
#include <tqmap.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeapplication.h>
#include <tdelocale.h>
#include <dcopclient.h>
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index d30b163a2..007326922 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -28,7 +28,7 @@
#include <ksimpleconfig.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdelistview.h>
diff --git a/kpersonalizer/tdestylepage.cpp b/kpersonalizer/tdestylepage.cpp
index f82525617..b7eb45557 100644
--- a/kpersonalizer/tdestylepage.cpp
+++ b/kpersonalizer/tdestylepage.cpp
@@ -26,7 +26,7 @@
#include <tqobjectlist.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeapplication.h>
#include <tdeglobal.h>
#include <kdebug.h>
diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp
index 9af05caac..bab627df1 100644
--- a/krootbacking/krootbacking.cpp
+++ b/krootbacking/krootbacking.cpp
@@ -33,7 +33,7 @@
#include <dcopref.h>
#include <ksharedpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <krootbacking.h>
static TQString wallpaperForDesktop(int desktop)
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index 25116593b..b41adc551 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -69,7 +69,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdelocale.h>
#include <tdeglobal.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <unistd.h>
#include <tdeapplication.h>
#include <kstaticdeleter.h>
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index 93720ee47..ced5ceb79 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -69,7 +69,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdelocale.h>
#include <tdeglobal.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <unistd.h>
#include <tdeapplication.h>
#include <kstaticdeleter.h>
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index 9f1e894a4..23fb2275b 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -68,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdelocale.h>
#include <tdeglobal.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <unistd.h>
#include <tdeapplication.h>
#include <kstaticdeleter.h>
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp
index f421ffe2e..7a8b53b57 100644
--- a/ksplashml/kcmksplash/installer.cpp
+++ b/ksplashml/kcmksplash/installer.cpp
@@ -26,7 +26,7 @@
#include <tdemessagebox.h>
#include <tdeprocess.h>
#include <kpushbutton.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ktar.h>
#include <ktrader.h>
#include <kurldrag.h>
diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp
index 4a2f9cf5c..0e9972bbe 100644
--- a/ksplashml/kcmksplash/main.cpp
+++ b/ksplashml/kcmksplash/main.cpp
@@ -19,7 +19,7 @@
#include <tdecmodule.h>
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "installer.h"
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index fd943a8e5..86bdcc6a3 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -15,7 +15,7 @@
#include <kgenericfactory.h>
#include <tdeglobalsettings.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kprogress.h>
#include <tqcheckbox.h>
diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp
index e7d41d132..d5b072f80 100644
--- a/ksplashml/themeengine/objkstheme.cpp
+++ b/ksplashml/themeengine/objkstheme.cpp
@@ -15,7 +15,7 @@
#include <kdebug.h>
#include <tdeglobal.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqcolor.h>
#include <tqcursor.h>
diff --git a/ksplashml/themeengine/redmond/main.cpp b/ksplashml/themeengine/redmond/main.cpp
index 7b4a6bb2e..6e910064d 100644
--- a/ksplashml/themeengine/redmond/main.cpp
+++ b/ksplashml/themeengine/redmond/main.cpp
@@ -10,7 +10,7 @@
* *
***************************************************************************/
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqlabel.h>
#include <tqpixmap.h>
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index da7665baf..548e62769 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -22,7 +22,7 @@
#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kuser.h>
#include <tdeemailsettings.h>
diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp
index 4c62f24a0..c0fdff594 100644
--- a/ksplashml/themeengine/standard/themestandard.cpp
+++ b/ksplashml/themeengine/standard/themestandard.cpp
@@ -15,7 +15,7 @@
#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfig.h>
#include <tqdesktopwidget.h>
diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp
index 200fb3a30..26c59f87a 100644
--- a/ksplashml/themeengine/unified/themeunified.cpp
+++ b/ksplashml/themeengine/unified/themeunified.cpp
@@ -15,7 +15,7 @@
#include <kgenericfactory.h>
#include <tdeglobalsettings.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kprogress.h>
#include <tqcheckbox.h>
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index 13a293b0f..f8e7a4907 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -19,7 +19,7 @@
#include <klibloader.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ktrader.h>
#include <twin.h>
#include <dcopclient.h>
diff --git a/ksysguard/gui/KSysGuardApplet.cpp b/ksysguard/gui/KSysGuardApplet.cpp
index 471a28055..007b629e5 100644
--- a/ksysguard/gui/KSysGuardApplet.cpp
+++ b/ksysguard/gui/KSysGuardApplet.cpp
@@ -34,7 +34,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdepopupmenu.h>
#include <ksgrd/SensorClient.h>
diff --git a/ksysguard/gui/Workspace.cpp b/ksysguard/gui/Workspace.cpp
index 9aa511884..f32108662 100644
--- a/ksysguard/gui/Workspace.cpp
+++ b/ksysguard/gui/Workspace.cpp
@@ -30,7 +30,7 @@
#include <tdeio/netaccess.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeaccelmanager.h>
#include "WorkSheet.h"
diff --git a/ksysguard/gui/ksysguard.cpp b/ksysguard/gui/ksysguard.cpp
index 6f46e8f22..ee7aeb6b5 100644
--- a/ksysguard/gui/ksysguard.cpp
+++ b/ksysguard/gui/ksysguard.cpp
@@ -47,7 +47,7 @@
#include <ksgrd/SensorAgent.h>
#include <ksgrd/SensorManager.h>
#include <ksgrd/StyleEngine.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstatusbar.h>
#include <kstdaction.h>
#include <twin.h>
diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp
index 74a0d51d6..93e976b69 100644
--- a/ktip/ktipwindow.cpp
+++ b/ktip/ktipwindow.cpp
@@ -23,7 +23,7 @@
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ktip.h>
#include <tdeuniqueapplication.h>
#include <twin.h>
diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp
index cf2751068..da0bf73c2 100644
--- a/kxkb/extension.cpp
+++ b/kxkb/extension.cpp
@@ -7,7 +7,7 @@
#include <tqdir.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeprocess.h>
#include <X11/Xatom.h>
diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp
index 5bf9a7281..70132cd1b 100644
--- a/kxkb/kcmlayout.cpp
+++ b/kxkb/kcmlayout.cpp
@@ -21,7 +21,7 @@
#include <tdeglobal.h>
#include <tdeconfig.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tdeapplication.h>
#include <kiconloader.h>
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
index fce6349be..0fb62a466 100644
--- a/kxkb/kcmmisc.cpp
+++ b/kxkb/kcmmisc.cpp
@@ -42,7 +42,7 @@
#include <knuminput.h>
#include <tdeapplication.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeprocess.h>
#include <kdialog.h>
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp
index c4c00bf47..ffde6073a 100644
--- a/kxkb/kxkb.cpp
+++ b/kxkb/kxkb.cpp
@@ -41,7 +41,7 @@ DESCRIPTION
#include <twinmodule.h>
#include <twin.h>
#include <tdetempfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kipc.h>
#include <tdeaction.h>
#include <tdepopupmenu.h>
diff --git a/kxkb/pixmap.cpp b/kxkb/pixmap.cpp
index 63fc4f1db..e7f720ca1 100644
--- a/kxkb/pixmap.cpp
+++ b/kxkb/pixmap.cpp
@@ -5,7 +5,7 @@
#include <tqregexp.h>
#include <tqdict.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobalsettings.h>
#include <tdelocale.h>
#include <kdebug.h>
diff --git a/kxkb/rules.cpp b/kxkb/rules.cpp
index ab89b4f17..f0f4b38b2 100644
--- a/kxkb/rules.cpp
+++ b/kxkb/rules.cpp
@@ -5,7 +5,7 @@
#include <tqstringlist.h>
#include <tqdir.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobal.h>
#include <tdelocale.h>
#include <kdebug.h>
diff --git a/kxkb/x11helper.cpp b/kxkb/x11helper.cpp
index 90e29d9e2..d325b32a0 100644
--- a/kxkb/x11helper.cpp
+++ b/kxkb/x11helper.cpp
@@ -8,7 +8,7 @@
#include <tqregexp.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <X11/Xlib.h>
diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp
index 756636bc7..ec786d050 100644
--- a/libkonq/favicons/favicons.cpp
+++ b/libkonq/favicons/favicons.cpp
@@ -30,7 +30,7 @@
#include <kicontheme.h>
#include <kimageio.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeio/job.h>
#include "favicons.moc"
diff --git a/libkonq/kivdirectoryoverlay.cpp b/libkonq/kivdirectoryoverlay.cpp
index 590747b9c..a9e780134 100644
--- a/libkonq/kivdirectoryoverlay.cpp
+++ b/libkonq/kivdirectoryoverlay.cpp
@@ -27,7 +27,7 @@
#include <tdefileitem.h>
#include <tdeapplication.h>
#include <kdirlister.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#include <konq_settings.h>
#include <tdelocale.h>
diff --git a/libkonq/kivfreespaceoverlay.cpp b/libkonq/kivfreespaceoverlay.cpp
index d0cd82e7d..6651a9d53 100644
--- a/libkonq/kivfreespaceoverlay.cpp
+++ b/libkonq/kivfreespaceoverlay.cpp
@@ -32,7 +32,7 @@
#include <tdefileitem.h>
#include <tdeapplication.h>
#include <kdirlister.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#include <konq_settings.h>
#include <tdelocale.h>
diff --git a/libkonq/knewmenu.cpp b/libkonq/knewmenu.cpp
index 4dc1070cb..b6a5ffc18 100644
--- a/libkonq/knewmenu.cpp
+++ b/libkonq/knewmenu.cpp
@@ -26,7 +26,7 @@
#include <kinputdialog.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kprotocolinfo.h>
#include <tdepopupmenu.h>
#include <krun.h>
diff --git a/libkonq/konq_bgnddlg.cpp b/libkonq/konq_bgnddlg.cpp
index 04a95f3b0..53039e908 100644
--- a/libkonq/konq_bgnddlg.cpp
+++ b/libkonq/konq_bgnddlg.cpp
@@ -29,7 +29,7 @@
#include <kimagefilepreview.h>
#include <tdelocale.h>
//#include <tderecentdocument.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurlrequester.h>
#include "konq_bgnddlg.h"
diff --git a/libkonq/konq_filetip.cpp b/libkonq/konq_filetip.cpp
index ee5e9e272..b70a3158c 100644
--- a/libkonq/konq_filetip.cpp
+++ b/libkonq/konq_filetip.cpp
@@ -23,7 +23,7 @@
#include <tdefileitem.h>
#include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeapplication.h>
#include <tqlabel.h>
diff --git a/libkonq/konq_historymgr.cpp b/libkonq/konq_historymgr.cpp
index 8d07ab416..11f15071e 100644
--- a/libkonq/konq_historymgr.cpp
+++ b/libkonq/konq_historymgr.cpp
@@ -25,7 +25,7 @@
#include <kdebug.h>
#include <ksavefile.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <zlib.h>
diff --git a/libkonq/konq_iconviewwidget.cpp b/libkonq/konq_iconviewwidget.cpp
index 0dbd11782..246a60828 100644
--- a/libkonq/konq_iconviewwidget.cpp
+++ b/libkonq/konq_iconviewwidget.cpp
@@ -45,7 +45,7 @@
#include <kicontheme.h>
#include <kiconeffect.h>
#include <kurldrag.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kprotocolinfo.h>
#include <ktrader.h>
diff --git a/libkonq/konq_popupmenu.cpp b/libkonq/konq_popupmenu.cpp
index c26484485..d04f00159 100644
--- a/libkonq/konq_popupmenu.cpp
+++ b/libkonq/konq_popupmenu.cpp
@@ -30,7 +30,7 @@
#include <kiconloader.h>
#include <kinputdialog.h>
#include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kxmlguifactory.h>
#include <kxmlguibuilder.h>
#include <tdeparts/componentfactory.h>
diff --git a/libkonq/konq_propsview.cpp b/libkonq/konq_propsview.cpp
index f72aee191..e0b1ab9bb 100644
--- a/libkonq/konq_propsview.cpp
+++ b/libkonq/konq_propsview.cpp
@@ -21,7 +21,7 @@
#include "konq_settings.h"
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kpixmap.h>
#include <tqpixmapcache.h>
#include <tqiconview.h>
diff --git a/libkonq/konqbookmarkmanager.h b/libkonq/konqbookmarkmanager.h
index 1c6f092f4..d2173cd03 100644
--- a/libkonq/konqbookmarkmanager.h
+++ b/libkonq/konqbookmarkmanager.h
@@ -2,7 +2,7 @@
#define KONQBOOKMARKMANAGER_H
#include <kbookmarkmanager.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurl.h>
#include <tdeio/job.h>
#include <libkonq_export.h>
diff --git a/libkonq/tdefileivi.cpp b/libkonq/tdefileivi.cpp
index ad2d743a1..aa086d3f2 100644
--- a/libkonq/tdefileivi.cpp
+++ b/libkonq/tdefileivi.cpp
@@ -33,7 +33,7 @@
#include <krun.h>
#include <kservice.h>
#include <kmimetype.h> // for KDEDesktopMimeType
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#undef Bool
diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp
index 076d3523e..c394afa8f 100644
--- a/nsplugins/kcm_nsplugins.cpp
+++ b/nsplugins/kcm_nsplugins.cpp
@@ -22,7 +22,7 @@
#include <tqregexp.h>
#include <tqlayout.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kiconloader.h>
#include <tdefiledialog.h>
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index 8ddc26a42..274e81f69 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -32,7 +32,7 @@
#include <kdebug.h>
#include <tdeglobal.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfig.h>
#include <dcopclient.h>
#include <dcopstub.h>
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index 2e02b6d91..bd7a8fb89 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -43,7 +43,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <klibloader.h>
#include <tdeconfig.h>
#include <tdecrash.h>
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 995b4a9a6..1aec3dd44 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -51,7 +51,7 @@
#include <tdelocale.h>
#include <tdeprocess.h>
#include <tdeprotocolmanager.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kurl.h>
diff --git a/tdedebugdialog/main.cpp b/tdedebugdialog/main.cpp
index d88e7e5a5..07f5c3c73 100644
--- a/tdedebugdialog/main.cpp
+++ b/tdedebugdialog/main.cpp
@@ -21,7 +21,7 @@
#include "tdelistdebugdialog.h"
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqtextstream.h>
#include <tdelocale.h>
#include <kdebug.h>
diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp
index db0ae5b9b..119bb1f66 100644
--- a/tdeinit/displayconfig.cpp
+++ b/tdeinit/displayconfig.cpp
@@ -26,7 +26,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp
index 0a421d8af..9e8397223 100644
--- a/tdeinit/phase1.cpp
+++ b/tdeinit/phase1.cpp
@@ -26,7 +26,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
diff --git a/tdeioslave/cgi/cgi.cpp b/tdeioslave/cgi/cgi.cpp
index a60adea4c..6fae4e5bd 100644
--- a/tdeioslave/cgi/cgi.cpp
+++ b/tdeioslave/cgi/cgi.cpp
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kinstance.h>
#include <tdelocale.h>
#include <tdeconfig.h>
diff --git a/tdeioslave/finger/tdeio_finger.cpp b/tdeioslave/finger/tdeio_finger.cpp
index 610a29ee0..1605435b9 100644
--- a/tdeioslave/finger/tdeio_finger.cpp
+++ b/tdeioslave/finger/tdeio_finger.cpp
@@ -30,7 +30,7 @@
#include <kdebug.h>
#include <kinstance.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kurl.h>
diff --git a/tdeioslave/fish/fish.cpp b/tdeioslave/fish/fish.cpp
index 7404ffa66..edac73fe0 100644
--- a/tdeioslave/fish/fish.cpp
+++ b/tdeioslave/fish/fish.cpp
@@ -65,7 +65,7 @@
#include <tdemessagebox.h>
#include <kinstance.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kremoteencoding.h>
#include <kurl.h>
diff --git a/tdeioslave/info/info.cpp b/tdeioslave/info/info.cpp
index c9e839f7a..53badf3b4 100644
--- a/tdeioslave/info/info.cpp
+++ b/tdeioslave/info/info.cpp
@@ -9,7 +9,7 @@
#include <kdebug.h>
#include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#include <kinstance.h>
#include <tdelocale.h>
diff --git a/tdeioslave/man/kmanpart.cpp b/tdeioslave/man/kmanpart.cpp
index a93d3daf8..5e67d8db5 100644
--- a/tdeioslave/man/kmanpart.cpp
+++ b/tdeioslave/man/kmanpart.cpp
@@ -24,7 +24,7 @@
#include <tdeglobal.h>
#include <kdebug.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeaboutdata.h>
#include <tdeversion.h>
diff --git a/tdeioslave/man/tdeio_man.cpp b/tdeioslave/man/tdeio_man.cpp
index 55f23278a..f987cff26 100644
--- a/tdeioslave/man/tdeio_man.cpp
+++ b/tdeioslave/man/tdeio_man.cpp
@@ -34,7 +34,7 @@
#include <kdebug.h>
#include <kinstance.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeprocess.h>
#include <tdelocale.h>
#include <kmimetype.h>
diff --git a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
index 521c9ea2b..5ebd976b1 100644
--- a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
+++ b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
@@ -22,7 +22,7 @@
#include <tqdir.h>
#include <tqfile.h>
#include <tqfileinfo.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdesktopfile.h>
#include <tdelocale.h>
diff --git a/tdeioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp
index aaa90fefc..15ac5fb45 100644
--- a/tdeioslave/media/libmediacommon/notifiersettings.cpp
+++ b/tdeioslave/media/libmediacommon/notifiersettings.cpp
@@ -21,7 +21,7 @@
#include <tdeglobal.h>
#include <kdesktopfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqdir.h>
#include <tqfile.h>
diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp
index 2bd528c19..2f60dfcbf 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.cpp
+++ b/tdeioslave/media/mediamanager/fstabbackend.cpp
@@ -43,7 +43,7 @@
#include <kdirwatch.h>
#include <kurl.h>
#include <kmountpoint.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#ifdef _OS_SOLARIS_
#define FSTAB "/etc/vfstab"
diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp
index d61e6946c..dc1671b22 100644
--- a/tdeioslave/media/mediamanager/mediamanager.cpp
+++ b/tdeioslave/media/mediamanager/mediamanager.cpp
@@ -26,7 +26,7 @@
#include <tdelocale.h>
#include <kdirnotify_stub.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "mediamanagersettings.h"
diff --git a/tdeioslave/media/mediamanager/removablebackend.cpp b/tdeioslave/media/mediamanager/removablebackend.cpp
index a9207cd92..9e8b447f4 100644
--- a/tdeioslave/media/mediamanager/removablebackend.cpp
+++ b/tdeioslave/media/mediamanager/removablebackend.cpp
@@ -22,7 +22,7 @@
#include <kdirwatch.h>
#include <kurl.h>
#include <kmountpoint.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#ifdef _OS_SOLARIS_
#define MTAB "/etc/mnttab"
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index 46670cd24..fb038e7b2 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -33,7 +33,7 @@
#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kprotocolinfo.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "dialog.h"
diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp
index b3eec63d6..29527d055 100644
--- a/tdeioslave/media/medianotifier/medianotifier.cpp
+++ b/tdeioslave/media/medianotifier/medianotifier.cpp
@@ -47,7 +47,7 @@
#include <krun.h>
#include <tdemessagebox.h>
#include <kstdguiitem.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "notificationdialog.h"
#include "notifiersettings.h"
diff --git a/tdeioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp
index a8bb81ea5..0859e2e5e 100644
--- a/tdeioslave/media/medianotifier/notificationdialog.cpp
+++ b/tdeioslave/media/medianotifier/notificationdialog.cpp
@@ -26,7 +26,7 @@
#include <krun.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeio/global.h>
#include <tdelistbox.h>
#include <tqlabel.h>
diff --git a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
index f8e5dae44..f89e8a20a 100644
--- a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
@@ -29,7 +29,7 @@
#include <tdefileshare.h>
#include <tdemessagebox.h>
#include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdialog.h>
#include <tdeglobal.h>
#include <dcopref.h>
diff --git a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
index 5b042295d..474201350 100644
--- a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
+++ b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
@@ -21,7 +21,7 @@
#include <kdebug.h>
#include <tdelocale.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdesktopfile.h>
#include <kdirnotify_stub.h>
diff --git a/tdeioslave/remote/remoteimpl.cpp b/tdeioslave/remote/remoteimpl.cpp
index 51182686f..4f11381ed 100644
--- a/tdeioslave/remote/remoteimpl.cpp
+++ b/tdeioslave/remote/remoteimpl.cpp
@@ -21,7 +21,7 @@
#include <kdebug.h>
#include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdesktopfile.h>
#include <kservice.h>
#include <tdelocale.h>
diff --git a/tdeioslave/settings/tdeio_settings.cpp b/tdeioslave/settings/tdeio_settings.cpp
index 7bb06b8dc..6371c2f4f 100644
--- a/tdeioslave/settings/tdeio_settings.cpp
+++ b/tdeioslave/settings/tdeio_settings.cpp
@@ -29,7 +29,7 @@
#include <tdeprocess.h>
#include <kservice.h>
#include <kservicegroup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
class SettingsProtocol : public TDEIO::SlaveBase
{
diff --git a/tdeioslave/sftp/tdeio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp
index d2a9e859a..3e88b8e65 100644
--- a/tdeioslave/sftp/tdeio_sftp.cpp
+++ b/tdeioslave/sftp/tdeio_sftp.cpp
@@ -54,7 +54,7 @@
#include <kdebug.h>
#include <tdemessagebox.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kurl.h>
#include <tdeio/ioslave_defaults.h>
diff --git a/tdeioslave/smb/tdeio_smb_mount.cpp b/tdeioslave/smb/tdeio_smb_mount.cpp
index dc02ec599..ea4928bec 100644
--- a/tdeioslave/smb/tdeio_smb_mount.cpp
+++ b/tdeioslave/smb/tdeio_smb_mount.cpp
@@ -19,7 +19,7 @@
*/
#include "tdeio_smb.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqcstring.h>
#include <unistd.h>
#include <tqdir.h>
diff --git a/tdeioslave/system/kdedmodule/systemdirnotify.cpp b/tdeioslave/system/kdedmodule/systemdirnotify.cpp
index 059c7cfc9..3a404d85b 100644
--- a/tdeioslave/system/kdedmodule/systemdirnotify.cpp
+++ b/tdeioslave/system/kdedmodule/systemdirnotify.cpp
@@ -21,7 +21,7 @@
#include <kdebug.h>
#include <tdelocale.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdesktopfile.h>
#include <kdirnotify_stub.h>
diff --git a/tdeioslave/system/systemimpl.cpp b/tdeioslave/system/systemimpl.cpp
index 164b9a467..9a44bc4e4 100644
--- a/tdeioslave/system/systemimpl.cpp
+++ b/tdeioslave/system/systemimpl.cpp
@@ -21,7 +21,7 @@
#include <kdebug.h>
#include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdesktopfile.h>
#include <tqapplication.h>
diff --git a/tdeioslave/thumbnail/textcreator.cpp b/tdeioslave/thumbnail/textcreator.cpp
index d4f8cde5f..8d8e378e3 100644
--- a/tdeioslave/thumbnail/textcreator.cpp
+++ b/tdeioslave/thumbnail/textcreator.cpp
@@ -22,7 +22,7 @@
#include <tqpixmap.h>
#include <tqimage.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kpixmapsplitter.h>
#include <kmimetype.h>
diff --git a/tdeioslave/trash/testtrash.cpp b/tdeioslave/trash/testtrash.cpp
index 4a1ca12f8..f294c92de 100644
--- a/tdeioslave/trash/testtrash.cpp
+++ b/tdeioslave/trash/testtrash.cpp
@@ -41,7 +41,7 @@
#include <unistd.h>
#include <assert.h>
#include <tdefileitem.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
static bool check(const TQString& txt, TQString a, TQString b)
{
diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp
index 8c062256c..7a54309af 100644
--- a/tdeioslave/trash/trashimpl.cpp
+++ b/tdeioslave/trash/trashimpl.cpp
@@ -29,7 +29,7 @@
#include <kurl.h>
#include <kdirnotify_stub.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobalsettings.h>
#include <kmountpoint.h>
#include <tdemessagebox.h>
diff --git a/tdepasswd/kcm/kcm_useraccount.kcfg b/tdepasswd/kcm/kcm_useraccount.kcfg
index 549afdb1e..9bd2c60ea 100644
--- a/tdepasswd/kcm/kcm_useraccount.kcfg
+++ b/tdepasswd/kcm/kcm_useraccount.kcfg
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<include>tdeglobal.h</include>
- <include>kstandarddirs.h</include>
+ <include>tdestandarddirs.h</include>
<kcfgfile name="tdm/tdmrc"/>
<group name="X-*-Greeter">
<entry name="faceDir" type="Path">
diff --git a/tdepasswd/kcm/main.cpp b/tdepasswd/kcm/main.cpp
index 5d7e98e66..1d08564c3 100644
--- a/tdepasswd/kcm/main.cpp
+++ b/tdepasswd/kcm/main.cpp
@@ -37,7 +37,7 @@
#include <kuser.h>
#include <kdialog.h>
#include <kimageio.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeaboutdata.h>
#include <kgenericfactory.h>
#include <tdemessagebox.h>
diff --git a/tdepasswd/passwd.cpp b/tdepasswd/passwd.cpp
index 3db14efbf..fc3873770 100644
--- a/tdepasswd/passwd.cpp
+++ b/tdepasswd/passwd.cpp
@@ -26,7 +26,7 @@
#include <tqcstring.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdesu/process.h>
#include "passwd.h"
diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp
index 16adb438a..77f5012c8 100644
--- a/tdeprint/kprinter/printwrapper.cpp
+++ b/tdeprint/kprinter/printwrapper.cpp
@@ -35,7 +35,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeio/netaccess.h>
#include <kurl.h>
#include <kdebug.h>
diff --git a/tdeprint/slave/tdeio_print.cpp b/tdeprint/slave/tdeio_print.cpp
index 9c9ecd1b1..2915c9999 100644
--- a/tdeprint/slave/tdeio_print.cpp
+++ b/tdeprint/slave/tdeio_print.cpp
@@ -30,7 +30,7 @@
#include <kdebug.h>
#include <kinstance.h>
#include <tdeio/global.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#include <kmimetype.h>
#include <tdeio/job.h>
diff --git a/tdeprint/tdeprintfax/conffilters.cpp b/tdeprint/tdeprintfax/conffilters.cpp
index 8a2456e73..9af40d224 100644
--- a/tdeprint/tdeprintfax/conffilters.cpp
+++ b/tdeprint/tdeprintfax/conffilters.cpp
@@ -32,7 +32,7 @@
#include <tdelocale.h>
#include <tdelistview.h>
#include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdemessagebox.h>
ConfFilters::ConfFilters(TQWidget *parent, const char *name)
diff --git a/tdeprint/tdeprintfax/defcmds.cpp b/tdeprint/tdeprintfax/defcmds.cpp
index 9529c757d..d785d06f6 100644
--- a/tdeprint/tdeprintfax/defcmds.cpp
+++ b/tdeprint/tdeprintfax/defcmds.cpp
@@ -20,7 +20,7 @@
#include "defcmds.h"
#include <tqregexp.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
TQString defaultCommand(const TQString& cmd)
{
diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp
index d96f6c93c..5c4c349bc 100644
--- a/tdeprint/tdeprintfax/faxctrl.cpp
+++ b/tdeprint/tdeprintfax/faxctrl.cpp
@@ -41,7 +41,7 @@
#include <tdelocale.h>
#include <kdialogbase.h>
#include <kmimetype.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeapplication.h>
#include <twin.h>
#include <tdeemailsettings.h>
diff --git a/tdescreensaver/random.cpp b/tdescreensaver/random.cpp
index b7c90db97..07e39b1fb 100644
--- a/tdescreensaver/random.cpp
+++ b/tdescreensaver/random.cpp
@@ -22,7 +22,7 @@
#include <tqfileinfo.h>
#include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobal.h>
#include <tdelocale.h>
#include <kdesktopfile.h>
diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp
index fef3d76a4..b5c75471d 100644
--- a/tdesu/tdesu/tdesu.cpp
+++ b/tdesu/tdesu/tdesu.cpp
@@ -30,7 +30,7 @@
#include <kdebug.h>
#include <tdeglobal.h>
#include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfig.h>
#include <tdelocale.h>
#include <tdeaboutdata.h>
diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp
index 950bb91b4..e79049c74 100644
--- a/tdesu/tdesud/tdesud.cpp
+++ b/tdesu/tdesud/tdesud.cpp
@@ -68,7 +68,7 @@
#include <kdebug.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeaboutdata.h>
#include <tdesu/client.h>
#include <tdesu/defaults.h>
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index e7c6ddff7..7b9cf6b4c 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tdeprocess.h>
#include <tdecmdlineargs.h>
#include <tdecrash.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ksimpleconfig.h>
#include <tdelocale.h>
#include <kdebug.h>
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index c623a2fd6..2a3c90327 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tdeapplication.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kseparator.h>
#include <tdelistview.h>
#include <ksimpleconfig.h>
diff --git a/tdm/kfrontend/sakdlg.cpp b/tdm/kfrontend/sakdlg.cpp
index 879e30e02..8a2f6264d 100644
--- a/tdm/kfrontend/sakdlg.cpp
+++ b/tdm/kfrontend/sakdlg.cpp
@@ -20,7 +20,7 @@
#include <tdelocale.h>
#include <kpushbutton.h>
#include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobalsettings.h>
#include <tdeconfig.h>
#include <kiconloader.h>
diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp
index 8dc4f7f43..cc16cf7ed 100644
--- a/tdm/kfrontend/tdmshutdown.cpp
+++ b/tdm/kfrontend/tdmshutdown.cpp
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kstdguiitem.h>
#include <tdeprocio.h>
#include <kdialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kuser.h>
#include <tdeconfig.h>
#include <kiconloader.h>
diff --git a/tdm/kfrontend/themer/tdmpixmap.cpp b/tdm/kfrontend/themer/tdmpixmap.cpp
index fa9e0fcf5..c64f1f34b 100644
--- a/tdm/kfrontend/themer/tdmpixmap.cpp
+++ b/tdm/kfrontend/themer/tdmpixmap.cpp
@@ -30,7 +30,7 @@
#endif
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqfile.h>
#include <tqpainter.h>
diff --git a/tdm/kfrontend/themer/tdmpixmap.h b/tdm/kfrontend/themer/tdmpixmap.h
index 90d0a38aa..c3994b15c 100644
--- a/tdm/kfrontend/themer/tdmpixmap.h
+++ b/tdm/kfrontend/themer/tdmpixmap.h
@@ -28,7 +28,7 @@
#include <tqpixmap.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
/*
* KdmPixmap. A pixmap element
diff --git a/twin/client.cpp b/twin/client.cpp
index 687ee9890..2f1849fed 100644
--- a/twin/client.cpp
+++ b/twin/client.cpp
@@ -20,7 +20,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <tqfile.h>
#include <tdeprocess.h>
#include <unistd.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqwhatsthis.h>
#include <twin.h>
#include <kiconloader.h>
diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp
index 27af172e1..d222ce288 100644
--- a/twin/clients/kwmtheme/cli_installer/main.cpp
+++ b/twin/clients/kwmtheme/cli_installer/main.cpp
@@ -4,7 +4,7 @@
#include <ksimpleconfig.h>
#include <tdeglobal.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdecmdlineargs.h>
#include <tdelocale.h>
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index 5cff37b3c..b0473261b 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -5,7 +5,7 @@
#include <tqdrawutil.h>
#include <tqpainter.h>
#include <kpixmapeffect.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tdelocale.h>
#include <tqbitmap.h>
diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp
index 1afde0bee..f771229fc 100644
--- a/twin/data/update_default_rules.cpp
+++ b/twin/data/update_default_rules.cpp
@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <tdeconfig.h>
#include <kdebug.h>
#include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
int main( int argc, char* argv[] )
{
diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp
index a1de82d0a..63547b918 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.cpp
+++ b/twin/kcmtwin/twindecoration/twindecoration.cpp
@@ -48,7 +48,7 @@
#include <kcombobox.h>
#include <kdebug.h>
#include <kdesktopfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobal.h>
#include <tdelocale.h>
#include <kdialog.h>