summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 16:23:58 -0600
committerTimothy Pearson <[email protected]>2013-01-25 16:23:58 -0600
commit1a9478c6e1b77b05814af8fa02cd563a5da8946b (patch)
tree9923e3bdc030bd502a6bb0783b6c651e719dbce8
parent8084850061bd3560b73e6663a3f5c1dfbf0c0bed (diff)
downloadtdebase-1a9478c6e1b77b05814af8fa02cd563a5da8946b.tar.gz
tdebase-1a9478c6e1b77b05814af8fa02cd563a5da8946b.zip
Fix FTBFS resulting from KCModule rename
-rw-r--r--doc/kinfocenter/samba/index.docbook2
-rw-r--r--kcontrol/access/kcmaccess.h2
-rw-r--r--kcontrol/accessibility/accessibilityconfigwidget.ui2
-rw-r--r--kcontrol/arts/arts.cpp2
-rw-r--r--kcontrol/arts/arts.h2
-rw-r--r--kcontrol/background/main.h2
-rw-r--r--kcontrol/bell/bell.h2
-rw-r--r--kcontrol/clock/main.h2
-rw-r--r--kcontrol/colors/colorscm.h2
-rw-r--r--kcontrol/componentchooser/kcm_componentchooser.h2
-rw-r--r--kcontrol/crypto/crypto.h2
-rw-r--r--kcontrol/css/kcmcss.h2
-rw-r--r--kcontrol/display/display.cpp2
-rw-r--r--kcontrol/display/display.h2
-rw-r--r--kcontrol/displayconfig/displayconfig.cpp2
-rw-r--r--kcontrol/dnssd/configdialog.ui4
-rw-r--r--kcontrol/ebrowsing/filteropts.h2
-rw-r--r--kcontrol/ebrowsing/main.h2
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/ikwsopts.h2
-rw-r--r--kcontrol/energy/energy.h2
-rw-r--r--kcontrol/filetypes/filetypesview.h2
-rw-r--r--kcontrol/fonts/fonts.h2
-rw-r--r--kcontrol/hwmanager/hwmanager.h2
-rw-r--r--kcontrol/icons/icons.h2
-rw-r--r--kcontrol/icons/iconthemes.h2
-rw-r--r--kcontrol/icons/main.h2
-rw-r--r--kcontrol/info/info.h2
-rw-r--r--kcontrol/info/memory.h2
-rw-r--r--kcontrol/input/mouse.h2
-rw-r--r--kcontrol/ioslaveinfo/kcmioslaveinfo.h2
-rw-r--r--kcontrol/joystick/joystick.h2
-rw-r--r--kcontrol/kcontrol/kcrootonly.h2
-rw-r--r--kcontrol/kcontrol/modules.cpp2
-rw-r--r--kcontrol/kcontrol/modules.h2
-rw-r--r--kcontrol/kcontrol/proxywidget.cpp2
-rw-r--r--kcontrol/kded/kcmkded.h2
-rw-r--r--kcontrol/keys/keyconfig.h2
-rw-r--r--kcontrol/keys/main.h2
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KCmFontInst.h2
-rw-r--r--kcontrol/kicker/hidingconfig.h2
-rw-r--r--kcontrol/kicker/lookandfeelconfig.h2
-rw-r--r--kcontrol/kicker/lookandfeeltab_kcm.h2
-rw-r--r--kcontrol/kicker/main.cpp2
-rw-r--r--kcontrol/kicker/menuconfig.h2
-rw-r--r--kcontrol/kicker/positionconfig.h2
-rw-r--r--kcontrol/kio/cache.h2
-rw-r--r--kcontrol/kio/kcookiesmain.h2
-rw-r--r--kcontrol/kio/kcookiesmanagement.h2
-rw-r--r--kcontrol/kio/kcookiespolicies.h2
-rw-r--r--kcontrol/kio/kproxydlg.h2
-rw-r--r--kcontrol/kio/main.cpp2
-rw-r--r--kcontrol/kio/main.h2
-rw-r--r--kcontrol/kio/netpref.h2
-rw-r--r--kcontrol/kio/smbrodlg.h2
-rw-r--r--kcontrol/kio/socks.h2
-rw-r--r--kcontrol/kio/useragentdlg.h2
-rw-r--r--kcontrol/knotify/knotify.h2
-rw-r--r--kcontrol/konq/behaviour.h2
-rw-r--r--kcontrol/konq/browser.cpp2
-rw-r--r--kcontrol/konq/browser.h2
-rw-r--r--kcontrol/konq/desktop.h2
-rw-r--r--kcontrol/konq/desktopbehavior_impl.h2
-rw-r--r--kcontrol/konq/fontopts.h2
-rw-r--r--kcontrol/konq/previews.h2
-rw-r--r--kcontrol/konq/rootopts.h2
-rw-r--r--kcontrol/konqhtml/appearance.h2
-rw-r--r--kcontrol/konqhtml/filteropts.h2
-rw-r--r--kcontrol/konqhtml/htmlopts.h2
-rw-r--r--kcontrol/konqhtml/javaopts.h2
-rw-r--r--kcontrol/konqhtml/jsopts.h2
-rw-r--r--kcontrol/konqhtml/khttpoptdlg.h2
-rw-r--r--kcontrol/konqhtml/main.h2
-rw-r--r--kcontrol/konqhtml/pluginopts.h2
-rw-r--r--kcontrol/konsole/kcmkonsole.h2
-rw-r--r--kcontrol/kthememanager/kthememanager.h2
-rw-r--r--kcontrol/launch/kcmlaunch.h2
-rw-r--r--kcontrol/locale/toplevel.h2
-rw-r--r--kcontrol/nics/nic.h2
-rw-r--r--kcontrol/performance/kcmperformance.h2
-rw-r--r--kcontrol/performance/system.h2
-rw-r--r--kcontrol/privacy/privacy.h2
-rw-r--r--kcontrol/randr/krandrmodule.cpp2
-rw-r--r--kcontrol/samba/main.cpp2
-rw-r--r--kcontrol/screensaver/scrnsave.h2
-rw-r--r--kcontrol/smartcard/smartcard.h2
-rw-r--r--kcontrol/smserver/kcmsmserver.h2
-rw-r--r--kcontrol/spellchecking/spellchecking.h2
-rw-r--r--kcontrol/style/kcmstyle.h2
-rw-r--r--kcontrol/taskbar/kcmtaskbar.h2
-rw-r--r--kcontrol/tdm/main.h2
-rw-r--r--kcontrol/usbview/kcmusb.h2
-rw-r--r--kcontrol/view1394/view1394.h2
-rw-r--r--kcontrol/xinerama/kcmxinerama.h2
-rw-r--r--kdepasswd/kcm/main.h2
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.h2
-rw-r--r--khotkeys/kcontrol/kcmkhotkeys.cpp2
-rw-r--r--khotkeys/kcontrol/kcmkhotkeys.h2
-rw-r--r--kioslave/cgi/kcmcgi/kcmcgi.h2
-rw-r--r--kioslave/media/CMakeLists.txt2
-rw-r--r--kioslave/media/Makefile.am2
-rw-r--r--kioslave/media/tdecmodule/CMakeLists.txt (renamed from kioslave/media/kcmodule/CMakeLists.txt)0
-rw-r--r--kioslave/media/tdecmodule/Makefile.am (renamed from kioslave/media/kcmodule/Makefile.am)0
-rw-r--r--kioslave/media/tdecmodule/main.cpp (renamed from kioslave/media/kcmodule/main.cpp)0
-rw-r--r--kioslave/media/tdecmodule/main.h (renamed from kioslave/media/kcmodule/main.h)2
-rw-r--r--kioslave/media/tdecmodule/managermodule.cpp (renamed from kioslave/media/kcmodule/managermodule.cpp)0
-rw-r--r--kioslave/media/tdecmodule/managermodule.h (renamed from kioslave/media/kcmodule/managermodule.h)2
-rw-r--r--kioslave/media/tdecmodule/managermoduleview.ui (renamed from kioslave/media/kcmodule/managermoduleview.ui)0
-rw-r--r--kioslave/media/tdecmodule/media.desktop (renamed from kioslave/media/kcmodule/media.desktop)0
-rw-r--r--kioslave/media/tdecmodule/mimetypelistboxitem.cpp (renamed from kioslave/media/kcmodule/mimetypelistboxitem.cpp)0
-rw-r--r--kioslave/media/tdecmodule/mimetypelistboxitem.h (renamed from kioslave/media/kcmodule/mimetypelistboxitem.h)0
-rw-r--r--kioslave/media/tdecmodule/notifiermodule.cpp (renamed from kioslave/media/kcmodule/notifiermodule.cpp)0
-rw-r--r--kioslave/media/tdecmodule/notifiermodule.h (renamed from kioslave/media/kcmodule/notifiermodule.h)2
-rw-r--r--kioslave/media/tdecmodule/notifiermoduleview.ui (renamed from kioslave/media/kcmodule/notifiermoduleview.ui)0
-rw-r--r--kioslave/media/tdecmodule/serviceconfigdialog.cpp (renamed from kioslave/media/kcmodule/serviceconfigdialog.cpp)0
-rw-r--r--kioslave/media/tdecmodule/serviceconfigdialog.h (renamed from kioslave/media/kcmodule/serviceconfigdialog.h)0
-rw-r--r--kioslave/media/tdecmodule/serviceview.ui (renamed from kioslave/media/kcmodule/serviceview.ui)0
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.h2
-rw-r--r--ksplashml/kcmksplash/main.cpp2
-rw-r--r--kxkb/kcmlayout.h2
-rw-r--r--kxkb/kcmmisc.h2
-rw-r--r--tdeprint/printmgr/kcmprintmgr.h2
-rw-r--r--twin/kcmtwin/twindecoration/twindecoration.cpp2
-rw-r--r--twin/kcmtwin/twindecoration/twindecoration.h2
-rw-r--r--twin/kcmtwin/twinoptions/main.h2
-rw-r--r--twin/kcmtwin/twinoptions/mouse.h2
-rw-r--r--twin/kcmtwin/twinoptions/windows.h2
-rw-r--r--twin/kcmtwin/twinrules/kcm.h2
127 files changed, 115 insertions, 115 deletions
diff --git a/doc/kinfocenter/samba/index.docbook b/doc/kinfocenter/samba/index.docbook
index 36df1da1b..69d7b91b9 100644
--- a/doc/kinfocenter/samba/index.docbook
+++ b/doc/kinfocenter/samba/index.docbook
@@ -190,7 +190,7 @@ often, or which user opened the most files or whatever.</para>
<para>&Matthias.Hoelzer-Kluepfel; &Matthias.Hoelzer-Kluepfel.mail;</para></listitem>
<listitem><para>Use of <classname>TDEProcess</classname> instead of popen, and more error checking:</para>
<para>&David.Faure; &David.Faure.mail;</para></listitem>
-<listitem><para>Conversion to kcmodule, added tab pages 2,3,4, bug
+<listitem><para>Conversion to tdecmodule, added tab pages 2,3,4, bug
fixed:</para>
<para>&Alexander.Neundorf; &Alexander.Neundorf.mail;</para></listitem>
</itemizedlist>
diff --git a/kcontrol/access/kcmaccess.h b/kcontrol/access/kcmaccess.h
index 0553979bc..14a441a59 100644
--- a/kcontrol/access/kcmaccess.h
+++ b/kcontrol/access/kcmaccess.h
@@ -9,7 +9,7 @@
#define __kcmaccess_h__
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <knuminput.h>
diff --git a/kcontrol/accessibility/accessibilityconfigwidget.ui b/kcontrol/accessibility/accessibilityconfigwidget.ui
index 43914c62d..0aa9c5ffd 100644
--- a/kcontrol/accessibility/accessibilityconfigwidget.ui
+++ b/kcontrol/accessibility/accessibilityconfigwidget.ui
@@ -1613,7 +1613,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
- <includehint>kcmodule.h</includehint>
+ <includehint>tdecmodule.h</includehint>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index feea9b1d1..86086cbd9 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -38,7 +38,7 @@
#include <kaboutdata.h>
#include <kapplication.h>
-#include <kcmoduleloader.h>
+#include <tdecmoduleloader.h>
#include <kdebug.h>
#include <kdialog.h>
#include <klineedit.h>
diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h
index fe30b4961..cd2b4f2ff 100644
--- a/kcontrol/arts/arts.h
+++ b/kcontrol/arts/arts.h
@@ -35,7 +35,7 @@
#include <tqradiobutton.h>
#include <tqtimer.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <knuminput.h>
#include <kprogress.h>
diff --git a/kcontrol/background/main.h b/kcontrol/background/main.h
index a879becd8..9fdba57b8 100644
--- a/kcontrol/background/main.h
+++ b/kcontrol/background/main.h
@@ -10,7 +10,7 @@
#ifndef __Bgnd_h_Included__
#define __Bgnd_h_Included__
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TDEConfig;
class BGDialog;
diff --git a/kcontrol/bell/bell.h b/kcontrol/bell/bell.h
index da7d184bc..844698e9e 100644
--- a/kcontrol/bell/bell.h
+++ b/kcontrol/bell/bell.h
@@ -21,7 +21,7 @@
#ifndef __bell_h__
#define __bell_h__
-#include "kcmodule.h"
+#include "tdecmodule.h"
class TQCheckBox;
class KIntNumInput;
diff --git a/kcontrol/clock/main.h b/kcontrol/clock/main.h
index 82e501dfc..7754da34f 100644
--- a/kcontrol/clock/main.h
+++ b/kcontrol/clock/main.h
@@ -21,7 +21,7 @@
#ifndef main_included
#define main_included
-#include <kcmodule.h>
+#include <tdecmodule.h>
class Dtime;
class Tzone;
diff --git a/kcontrol/colors/colorscm.h b/kcontrol/colors/colorscm.h
index edc14325d..abfd3d403 100644
--- a/kcontrol/colors/colorscm.h
+++ b/kcontrol/colors/colorscm.h
@@ -13,7 +13,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kdialogbase.h>
#include "widgetcanvas.h"
diff --git a/kcontrol/componentchooser/kcm_componentchooser.h b/kcontrol/componentchooser/kcm_componentchooser.h
index 905c0a9b5..001306506 100644
--- a/kcontrol/componentchooser/kcm_componentchooser.h
+++ b/kcontrol/componentchooser/kcm_componentchooser.h
@@ -16,7 +16,7 @@
#ifndef _KCM_KTEXTEDITORCHOOSER_H_
#define _KCM_KTEXTEDITORCHOOSER_H_
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include "componentchooser.h"
diff --git a/kcontrol/crypto/crypto.h b/kcontrol/crypto/crypto.h
index efcef6072..c94d1f24d 100644
--- a/kcontrol/crypto/crypto.h
+++ b/kcontrol/crypto/crypto.h
@@ -33,7 +33,7 @@
#include <tqtabwidget.h>
#include <tqvbuttongroup.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <ksimpleconfig.h>
class TQGridLayout;
diff --git a/kcontrol/css/kcmcss.h b/kcontrol/css/kcmcss.h
index 585452b3e..da93fcdf5 100644
--- a/kcontrol/css/kcmcss.h
+++ b/kcontrol/css/kcmcss.h
@@ -21,7 +21,7 @@
#include <tqmap.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class CSSConfigDialog;
diff --git a/kcontrol/display/display.cpp b/kcontrol/display/display.cpp
index f9a27ca92..b3e15d021 100644
--- a/kcontrol/display/display.cpp
+++ b/kcontrol/display/display.cpp
@@ -21,7 +21,7 @@
#include <tqlayout.h>
#include <tqtabwidget.h>
-#include <kcmoduleloader.h>
+#include <tdecmoduleloader.h>
#include <kdialog.h>
#include <kgenericfactory.h>
diff --git a/kcontrol/display/display.h b/kcontrol/display/display.h
index bb5d44e6f..42373a42f 100644
--- a/kcontrol/display/display.h
+++ b/kcontrol/display/display.h
@@ -20,7 +20,7 @@
#ifndef DISPLAY_H
#define DISPLAY_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQTabWidget;
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 046ad9e16..017b1537c 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -41,7 +41,7 @@
#include <kpopupmenu.h>
#include <kinputdialog.h>
#include <kurlrequester.h>
-#include <kcmoduleloader.h>
+#include <tdecmoduleloader.h>
#include <kgenericfactory.h>
#include <kstandarddirs.h>
diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui
index fdb6ebf6f..0066f7d90 100644
--- a/kcontrol/dnssd/configdialog.ui
+++ b/kcontrol/dnssd/configdialog.ui
@@ -316,11 +316,11 @@ is configured with 'Browse local network' option above.</string>
<slot>radioButton2_2_toggled(bool)</slot>
</Q_SLOTS>
<includes>
- <include location="global" impldecl="in declaration">kcmodule.h</include>
+ <include location="global" impldecl="in declaration">tdecmodule.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>kcmodule.h</includehint>
+ <includehint>tdecmodule.h</includehint>
<includehint>keditlistbox.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kcontrol/ebrowsing/filteropts.h b/kcontrol/ebrowsing/filteropts.h
index 144525e9b..3ea140ffc 100644
--- a/kcontrol/ebrowsing/filteropts.h
+++ b/kcontrol/ebrowsing/filteropts.h
@@ -23,7 +23,7 @@
#ifndef __FILTEROPTS_H___
#define __FILTEROPTS_H___
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQListBox;
diff --git a/kcontrol/ebrowsing/main.h b/kcontrol/ebrowsing/main.h
index 94780c995..4234ffe3e 100644
--- a/kcontrol/ebrowsing/main.h
+++ b/kcontrol/ebrowsing/main.h
@@ -25,7 +25,7 @@
#ifndef __MAIN_H__
#define __MAIN_H__
-#include <kcmodule.h>
+#include <tdecmodule.h>
class KURIFilter;
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
index 2150e4883..be82459b6 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <tqtabwidget.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kservice.h>
class FilterOptionsUI;
diff --git a/kcontrol/energy/energy.h b/kcontrol/energy/energy.h
index 8faeaca1a..982171846 100644
--- a/kcontrol/energy/energy.h
+++ b/kcontrol/energy/energy.h
@@ -15,7 +15,7 @@
#define __Energy_h_Included__
#include <tqobject.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQCheckBox;
class KIntNumInput;
diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h
index db1116b29..e7217c4ba 100644
--- a/kcontrol/filetypes/filetypesview.h
+++ b/kcontrol/filetypes/filetypesview.h
@@ -5,7 +5,7 @@
#include <tqmap.h>
#include <kconfig.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include "typeslistitem.h"
diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h
index d69035b4c..f8b5e8fe6 100644
--- a/kcontrol/fonts/fonts.h
+++ b/kcontrol/fonts/fonts.h
@@ -10,7 +10,7 @@
#include <tqobject.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kdialogbase.h>
#include <kfontdialog.h>
#include <kfontrequester.h>
diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h
index 7e395d0a3..0a3fa2221 100644
--- a/kcontrol/hwmanager/hwmanager.h
+++ b/kcontrol/hwmanager/hwmanager.h
@@ -25,7 +25,7 @@
#include <config.h>
#endif
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <klistviewsearchline.h>
#include <dcopobject.h>
diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h
index 3c824af33..aafa31748 100644
--- a/kcontrol/icons/icons.h
+++ b/kcontrol/icons/icons.h
@@ -16,7 +16,7 @@
#include <tqimage.h>
#include <tqvaluelist.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kdialogbase.h>
#include <ksimpleconfig.h>
diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h
index 8eb9716fe..f648bf02c 100644
--- a/kcontrol/icons/iconthemes.h
+++ b/kcontrol/icons/iconthemes.h
@@ -20,7 +20,7 @@
#define ICONTHEMES_H
#include <tqimage.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <tqmap.h>
#include <klistview.h>
diff --git a/kcontrol/icons/main.h b/kcontrol/icons/main.h
index 431f40254..515cc47e9 100644
--- a/kcontrol/icons/main.h
+++ b/kcontrol/icons/main.h
@@ -27,7 +27,7 @@
#include <tqtabwidget.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class IconModule : public TDECModule
{
diff --git a/kcontrol/info/info.h b/kcontrol/info/info.h
index d26c7ba1f..36503a556 100644
--- a/kcontrol/info/info.h
+++ b/kcontrol/info/info.h
@@ -12,7 +12,7 @@
#include <tqfile.h>
#include <tqevent.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kaboutdata.h>
#include "config.h"
diff --git a/kcontrol/info/memory.h b/kcontrol/info/memory.h
index aaeb56f86..9ffc9956c 100644
--- a/kcontrol/info/memory.h
+++ b/kcontrol/info/memory.h
@@ -8,7 +8,7 @@
#include <tqpushbutton.h>
#include <tqtimer.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kaboutdata.h>
#include <config.h>
diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h
index 809ac4817..32c8f6c10 100644
--- a/kcontrol/input/mouse.h
+++ b/kcontrol/input/mouse.h
@@ -48,7 +48,7 @@
#include "logitechmouse.h"
#endif
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include "kmousedlg.h"
#include "themepage.h"
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.h b/kcontrol/ioslaveinfo/kcmioslaveinfo.h
index b587c39ec..04db54566 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.h
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.h
@@ -28,7 +28,7 @@
#include <tqstring.h>
#include <kaboutdata.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kio/job.h>
#include <klistbox.h>
#include <ktextbrowser.h>
diff --git a/kcontrol/joystick/joystick.h b/kcontrol/joystick/joystick.h
index 2a201b28f..eadccd0fd 100644
--- a/kcontrol/joystick/joystick.h
+++ b/kcontrol/joystick/joystick.h
@@ -21,7 +21,7 @@
#ifndef _JOYSTICK_H_
#define _JOYSTICK_H_
-#include <kcmodule.h>
+#include <tdecmodule.h>
class JoyWidget;
diff --git a/kcontrol/kcontrol/kcrootonly.h b/kcontrol/kcontrol/kcrootonly.h
index e167c4452..6fca1d1a2 100644
--- a/kcontrol/kcontrol/kcrootonly.h
+++ b/kcontrol/kcontrol/kcrootonly.h
@@ -2,7 +2,7 @@
#ifndef _kcontrol_kcrootonly_
#define _kcontrol_kcrootonly_
-#include <kcmodule.h>
+#include <tdecmodule.h>
class KCRootOnly: public TDECModule {
public:
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index 047fa75e6..8382c5d81 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -37,7 +37,7 @@
#include "modules.moc"
#include "global.h"
#include "proxywidget.h"
-#include <kcmoduleloader.h>
+#include <tdecmoduleloader.h>
#include "kcrootonly.h"
#include <X11/Xlib.h>
diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h
index f2bce1d6d..b5b4a8085 100644
--- a/kcontrol/kcontrol/modules.h
+++ b/kcontrol/kcontrol/modules.h
@@ -20,7 +20,7 @@
#ifndef MODULES_H
#define MODULES_H
-#include <kcmoduleinfo.h>
+#include <tdecmoduleinfo.h>
#include <tqobject.h>
#include <tqdict.h>
#include <qxembed.h>
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index 5d540d2c6..1d975f4a3 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <klocale.h>
#include <kapplication.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kseparator.h>
#include <kdialog.h>
#include <kstdguiitem.h>
diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h
index 86f5aaf94..4f49ab140 100644
--- a/kcontrol/kded/kcmkded.h
+++ b/kcontrol/kded/kcmkded.h
@@ -21,7 +21,7 @@
#include <tqlistview.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class KListView;
diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h
index 5595e76e2..d1760728d 100644
--- a/kcontrol/keys/keyconfig.h
+++ b/kcontrol/keys/keyconfig.h
@@ -13,7 +13,7 @@
#include <kaccel.h>
#include <kkeydialog.h>
-//#include <kcmodule.h>
+//#include <tdecmodule.h>
#include <tqdict.h>
class TQCheckBox;
diff --git a/kcontrol/keys/main.h b/kcontrol/keys/main.h
index eec44060f..5299e3884 100644
--- a/kcontrol/keys/main.h
+++ b/kcontrol/keys/main.h
@@ -25,7 +25,7 @@
#define __keys_main_h
#include <tqtabwidget.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class CommandShortcutsModule;
class ShortcutsModule;
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
index 1483ee4de..14cb8ee58 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
@@ -34,7 +34,7 @@
#endif
#include <tqstringlist.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kurl.h>
#include <kconfig.h>
#include <kio/job.h>
diff --git a/kcontrol/kicker/hidingconfig.h b/kcontrol/kicker/hidingconfig.h
index 342da29b9..8aee0fb51 100644
--- a/kcontrol/kicker/hidingconfig.h
+++ b/kcontrol/kicker/hidingconfig.h
@@ -18,7 +18,7 @@
#ifndef __hidingconfig_h__
#define __hidingconfig_h__
-#include <kcmodule.h>
+#include <tdecmodule.h>
class HidingTab;
diff --git a/kcontrol/kicker/lookandfeelconfig.h b/kcontrol/kicker/lookandfeelconfig.h
index c3190ce08..cd368ce36 100644
--- a/kcontrol/kicker/lookandfeelconfig.h
+++ b/kcontrol/kicker/lookandfeelconfig.h
@@ -18,7 +18,7 @@
#ifndef __lookandfeelconfig_h__
#define __lookandfeelconfig_h__
-#include <kcmodule.h>
+#include <tdecmodule.h>
class LookAndFeelTab;
diff --git a/kcontrol/kicker/lookandfeeltab_kcm.h b/kcontrol/kicker/lookandfeeltab_kcm.h
index ecf7ff0e6..d4d113687 100644
--- a/kcontrol/kicker/lookandfeeltab_kcm.h
+++ b/kcontrol/kicker/lookandfeeltab_kcm.h
@@ -18,7 +18,7 @@
#ifndef __lookandfeelconfig_h__
#define __lookandfeelconfig_h__
-#include <kcmodule.h>
+#include <tdecmodule.h>
class LookAndFeelTab;
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index dda2f08db..b24be9ba7 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -20,7 +20,7 @@
#include <dcopclient.h>
#include <kaboutdata.h>
#include <kapplication.h>
-#include <kcmodulecontainer.h>
+#include <tdecmodulecontainer.h>
#include <kdirwatch.h>
#include <kimageio.h>
#include <klistview.h>
diff --git a/kcontrol/kicker/menuconfig.h b/kcontrol/kicker/menuconfig.h
index 30178b18c..e6e548f83 100644
--- a/kcontrol/kicker/menuconfig.h
+++ b/kcontrol/kicker/menuconfig.h
@@ -18,7 +18,7 @@
#ifndef __menuconfig_h__
#define __menuconfig_h__
-#include <kcmodule.h>
+#include <tdecmodule.h>
class MenuTab;
diff --git a/kcontrol/kicker/positionconfig.h b/kcontrol/kicker/positionconfig.h
index 13d026f3b..6c4ec3680 100644
--- a/kcontrol/kicker/positionconfig.h
+++ b/kcontrol/kicker/positionconfig.h
@@ -18,7 +18,7 @@
#ifndef __positionconfig_h__
#define __positionconfig_h__
-#include <kcmodule.h>
+#include <tdecmodule.h>
class PositionTab;
diff --git a/kcontrol/kio/cache.h b/kcontrol/kio/cache.h
index f7d0dd695..03a4d0581 100644
--- a/kcontrol/kio/cache.h
+++ b/kcontrol/kio/cache.h
@@ -22,7 +22,7 @@
#ifndef CACHE_H
#define CACHE_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
class CacheDlgUI;
diff --git a/kcontrol/kio/kcookiesmain.h b/kcontrol/kio/kcookiesmain.h
index e11cf1a52..14b202ff4 100644
--- a/kcontrol/kio/kcookiesmain.h
+++ b/kcontrol/kio/kcookiesmain.h
@@ -6,7 +6,7 @@
#ifndef __KCOOKIESMAIN_H
#define __KCOOKIESMAIN_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQTabWidget;
class DCOPClient;
diff --git a/kcontrol/kio/kcookiesmanagement.h b/kcontrol/kio/kcookiesmanagement.h
index 3b8696e2c..51e31fbee 100644
--- a/kcontrol/kio/kcookiesmanagement.h
+++ b/kcontrol/kio/kcookiesmanagement.h
@@ -28,7 +28,7 @@
#include <tqstringlist.h>
#include <tqlistview.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class DCOPClient;
diff --git a/kcontrol/kio/kcookiespolicies.h b/kcontrol/kio/kcookiespolicies.h
index 04a45672a..50ce7a62b 100644
--- a/kcontrol/kio/kcookiespolicies.h
+++ b/kcontrol/kio/kcookiespolicies.h
@@ -27,7 +27,7 @@
#define __KCOOKIESPOLICIES_H
#include <tqmap.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include "policydlg.h"
diff --git a/kcontrol/kio/kproxydlg.h b/kcontrol/kio/kproxydlg.h
index ecb99a77a..30bdb935b 100644
--- a/kcontrol/kio/kproxydlg.h
+++ b/kcontrol/kio/kproxydlg.h
@@ -24,7 +24,7 @@
#include <tqstring.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQTabWidget;
diff --git a/kcontrol/kio/main.cpp b/kcontrol/kio/main.cpp
index 06d02d4f1..5a19288d9 100644
--- a/kcontrol/kio/main.cpp
+++ b/kcontrol/kio/main.cpp
@@ -25,7 +25,7 @@
#include <tqlayout.h>
#include <tqtabwidget.h>
-#include <kcmoduleloader.h>
+#include <tdecmoduleloader.h>
#include <klocale.h>
#include "kcookiesmain.h"
diff --git a/kcontrol/kio/main.h b/kcontrol/kio/main.h
index 1122af019..ca2e15da0 100644
--- a/kcontrol/kio/main.h
+++ b/kcontrol/kio/main.h
@@ -21,7 +21,7 @@
#ifndef MYMAIN_H
#define MYMAIN_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kglobal.h>
class TQTabWidget;
diff --git a/kcontrol/kio/netpref.h b/kcontrol/kio/netpref.h
index ebe9ee3b6..30584a598 100644
--- a/kcontrol/kio/netpref.h
+++ b/kcontrol/kio/netpref.h
@@ -1,7 +1,7 @@
#ifndef KIOPREFERENCES_H
#define KIOPREFERENCES_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQLabel;
class TQVGroupBox;
diff --git a/kcontrol/kio/smbrodlg.h b/kcontrol/kio/smbrodlg.h
index 2174cfc18..1c9d0347d 100644
--- a/kcontrol/kio/smbrodlg.h
+++ b/kcontrol/kio/smbrodlg.h
@@ -25,7 +25,7 @@
#include <tqlineedit.h>
#include <tqcheckbox.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class KComboBox;
diff --git a/kcontrol/kio/socks.h b/kcontrol/kio/socks.h
index 165d1d329..f5c5cb2a4 100644
--- a/kcontrol/kio/socks.h
+++ b/kcontrol/kio/socks.h
@@ -26,7 +26,7 @@
#include <config.h>
#endif
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include "socksbase.h"
diff --git a/kcontrol/kio/useragentdlg.h b/kcontrol/kio/useragentdlg.h
index 39885956d..746a8524a 100644
--- a/kcontrol/kio/useragentdlg.h
+++ b/kcontrol/kio/useragentdlg.h
@@ -25,7 +25,7 @@
#ifndef _USERAGENTDLG_H
#define _USERAGENTDLG_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TDEConfig;
class FakeUASProvider;
diff --git a/kcontrol/knotify/knotify.h b/kcontrol/knotify/knotify.h
index a37393f97..12aa35333 100644
--- a/kcontrol/knotify/knotify.h
+++ b/kcontrol/knotify/knotify.h
@@ -25,7 +25,7 @@
#include <tqstring.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kdialogbase.h>
class TQCheckBox;
diff --git a/kcontrol/konq/behaviour.h b/kcontrol/konq/behaviour.h
index e9bded291..edc723c53 100644
--- a/kcontrol/konq/behaviour.h
+++ b/kcontrol/konq/behaviour.h
@@ -19,7 +19,7 @@
#ifndef __BEHAVIOUR_H__
#define __BEHAVIOUR_H__
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQCheckBox;
class TQLabel;
diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp
index e25b6143d..96f370d77 100644
--- a/kcontrol/konq/browser.cpp
+++ b/kcontrol/konq/browser.cpp
@@ -23,7 +23,7 @@
#include <klocale.h>
#include <kdialog.h>
#include <fixx11h.h>
-#include <kcmoduleloader.h>
+#include <tdecmoduleloader.h>
#include "behaviour.h"
#include "fontopts.h"
diff --git a/kcontrol/konq/browser.h b/kcontrol/konq/browser.h
index 5e4aadebf..928fc6eeb 100644
--- a/kcontrol/konq/browser.h
+++ b/kcontrol/konq/browser.h
@@ -20,7 +20,7 @@
#ifndef __KBROWSER_OPTIONS_H__
#define __KBROWSER_OPTIONS_H__
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TDEConfig;
class TQTabWidget;
diff --git a/kcontrol/konq/desktop.h b/kcontrol/konq/desktop.h
index c7c10de0a..b7a05c3bc 100644
--- a/kcontrol/konq/desktop.h
+++ b/kcontrol/konq/desktop.h
@@ -19,7 +19,7 @@
#ifndef __desktop_h__
#define __desktop_h__
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQSpinBox;
class TQLabel;
diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h
index 1dcb3bee1..640d6a2c3 100644
--- a/kcontrol/konq/desktopbehavior_impl.h
+++ b/kcontrol/konq/desktopbehavior_impl.h
@@ -24,7 +24,7 @@
#include "desktopbehavior.h"
#include "tqlistview.h"
#include <kconfig.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class DesktopBehavior : public DesktopBehaviorBase
{
diff --git a/kcontrol/konq/fontopts.h b/kcontrol/konq/fontopts.h
index 4e1575652..0a0a18823 100644
--- a/kcontrol/konq/fontopts.h
+++ b/kcontrol/konq/fontopts.h
@@ -37,7 +37,7 @@
#include <tqstringlist.h>
#include <tqspinbox.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQCheckBox;
class TQRadioButton;
diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h
index 10c5e32a7..a1b4772bf 100644
--- a/kcontrol/konq/previews.h
+++ b/kcontrol/konq/previews.h
@@ -33,7 +33,7 @@ Configuration of the maximum image size
#include <tqstring.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TDEConfig;
class TQCheckBox;
diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h
index d4429c1dd..5fe1fe5c7 100644
--- a/kcontrol/konq/rootopts.h
+++ b/kcontrol/konq/rootopts.h
@@ -15,7 +15,7 @@
#include <tqstring.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kio/global.h>
#include <kurl.h>
diff --git a/kcontrol/konqhtml/appearance.h b/kcontrol/konqhtml/appearance.h
index 6bca1908f..c833e8111 100644
--- a/kcontrol/konqhtml/appearance.h
+++ b/kcontrol/konqhtml/appearance.h
@@ -14,7 +14,7 @@
#include <tqwidget.h>
#include <tqmap.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQSpinBox;
class KFontCombo;
diff --git a/kcontrol/konqhtml/filteropts.h b/kcontrol/konqhtml/filteropts.h
index fae52b53f..eba3dad7d 100644
--- a/kcontrol/konqhtml/filteropts.h
+++ b/kcontrol/konqhtml/filteropts.h
@@ -18,7 +18,7 @@
#ifndef FILTEROPTS_H
#define FILTEROPTS_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQListBox;
class TQPushButton;
diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h
index 151607419..5a582e68c 100644
--- a/kcontrol/konqhtml/htmlopts.h
+++ b/kcontrol/konqhtml/htmlopts.h
@@ -26,7 +26,7 @@
#include <tqstring.h>
#include <kconfig.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQRadioButton;
class KIntNumInput;
diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h
index b93a77e86..0c179edd0 100644
--- a/kcontrol/konqhtml/javaopts.h
+++ b/kcontrol/konqhtml/javaopts.h
@@ -15,7 +15,7 @@
#ifndef __JAVAOPTS_H__
#define __JAVAOPTS_H__
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include "domainlistview.h"
#include "policies.h"
diff --git a/kcontrol/konqhtml/jsopts.h b/kcontrol/konqhtml/jsopts.h
index f5735294d..000f7f770 100644
--- a/kcontrol/konqhtml/jsopts.h
+++ b/kcontrol/konqhtml/jsopts.h
@@ -10,7 +10,7 @@
#ifndef __JSOPTS_H__
#define __JSOPTS_H__
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include "domainlistview.h"
#include "jspolicies.h"
diff --git a/kcontrol/konqhtml/khttpoptdlg.h b/kcontrol/konqhtml/khttpoptdlg.h
index 0a3507085..3342f434b 100644
--- a/kcontrol/konqhtml/khttpoptdlg.h
+++ b/kcontrol/konqhtml/khttpoptdlg.h
@@ -7,7 +7,7 @@
#include <tqcheckbox.h>
#include <tqstring.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kconfig.h>
diff --git a/kcontrol/konqhtml/main.h b/kcontrol/konqhtml/main.h
index 182ac2756..2be4963fb 100644
--- a/kcontrol/konqhtml/main.h
+++ b/kcontrol/konqhtml/main.h
@@ -26,7 +26,7 @@
#ifndef __MAIN_H__
#define __MAIN_H__
-#include <kcmodule.h>
+#include <tdecmodule.h>
class KJavaOptions;
class KJavaScriptOptions;
diff --git a/kcontrol/konqhtml/pluginopts.h b/kcontrol/konqhtml/pluginopts.h
index 37aeceeda..efd3e0157 100644
--- a/kcontrol/konqhtml/pluginopts.h
+++ b/kcontrol/konqhtml/pluginopts.h
@@ -19,7 +19,7 @@
class TDEConfig;
class TQCheckBox;
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include "nsconfigwidget.h"
class TQBoxLayout;
diff --git a/kcontrol/konsole/kcmkonsole.h b/kcontrol/konsole/kcmkonsole.h
index 71b0fb7a7..561cb4502 100644
--- a/kcontrol/konsole/kcmkonsole.h
+++ b/kcontrol/konsole/kcmkonsole.h
@@ -18,7 +18,7 @@
#ifndef KCMKONSOLE_H
#define KCMKONSOLE_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include "kcmkonsoledialog.h"
diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h
index 3ca337300..56b25f94c 100644
--- a/kcontrol/kthememanager/kthememanager.h
+++ b/kcontrol/kthememanager/kthememanager.h
@@ -19,7 +19,7 @@
#ifndef KTHEMEMANAGER_H
#define KTHEMEMANAGER_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <krun.h>
#include <kservice.h>
#include <kurl.h>
diff --git a/kcontrol/launch/kcmlaunch.h b/kcontrol/launch/kcmlaunch.h
index 13c980bf7..e0219ffd3 100644
--- a/kcontrol/launch/kcmlaunch.h
+++ b/kcontrol/launch/kcmlaunch.h
@@ -18,7 +18,7 @@
#ifndef __kcmlaunch_h__
#define __kcmlaunch_h__
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQCheckBox;
class TQComboBox;
diff --git a/kcontrol/locale/toplevel.h b/kcontrol/locale/toplevel.h
index a999d64d0..4514ecfc5 100644
--- a/kcontrol/locale/toplevel.h
+++ b/kcontrol/locale/toplevel.h
@@ -25,7 +25,7 @@
#ifndef __TOPLEVEL_H__
#define __TOPLEVEL_H__
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kgenericfactory.h>
class TQTabWidget;
diff --git a/kcontrol/nics/nic.h b/kcontrol/nics/nic.h
index 0c1939d46..f9bc2e082 100644
--- a/kcontrol/nics/nic.h
+++ b/kcontrol/nics/nic.h
@@ -21,7 +21,7 @@
#ifndef KCONTROL_NIC_H
#define KCONTROL_NIC_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQStringList;
class TQPushButton;
diff --git a/kcontrol/performance/kcmperformance.h b/kcontrol/performance/kcmperformance.h
index 2ae868093..a9963e18a 100644
--- a/kcontrol/performance/kcmperformance.h
+++ b/kcontrol/performance/kcmperformance.h
@@ -19,7 +19,7 @@
#ifndef _KCM_PERFORMANCE_H
#define _KCM_PERFORMANCE_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
namespace KCMPerformance
{
diff --git a/kcontrol/performance/system.h b/kcontrol/performance/system.h
index 1358c8e79..cb570b506 100644
--- a/kcontrol/performance/system.h
+++ b/kcontrol/performance/system.h
@@ -19,7 +19,7 @@
#ifndef _KCM_PERF_SYSTEM_H
#define _KCM_PERF_SYSTEM_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include "system_ui.h"
diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h
index 1df7c4acc..3300fec6d 100644
--- a/kcontrol/privacy/privacy.h
+++ b/kcontrol/privacy/privacy.h
@@ -21,7 +21,7 @@
#ifndef _PRIVACY_H_
#define _PRIVACY_H_
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <klistview.h>
#include "kcmprivacydialog.h"
diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp
index 474bc0416..3eaf46f8b 100644
--- a/kcontrol/randr/krandrmodule.cpp
+++ b/kcontrol/randr/krandrmodule.cpp
@@ -28,7 +28,7 @@
#include <tqvbuttongroup.h>
#include <tqwhatsthis.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kcombobox.h>
#include <kdebug.h>
#include <kdialog.h>
diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp
index 2db372feb..65b5957e1 100644
--- a/kcontrol/samba/main.cpp
+++ b/kcontrol/samba/main.cpp
@@ -20,7 +20,7 @@
#include <tqtabwidget.h>
#include <kaboutdata.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kdialog.h>
#include <kgenericfactory.h>
diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h
index 72a00c410..a622cd673 100644
--- a/kcontrol/screensaver/scrnsave.h
+++ b/kcontrol/screensaver/scrnsave.h
@@ -10,7 +10,7 @@
#define __SCRNSAVE_H__
#include <tqwidget.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include "kssmonitor.h"
#include "saverconfig.h"
diff --git a/kcontrol/smartcard/smartcard.h b/kcontrol/smartcard/smartcard.h
index 8a7367341..0a4b7d704 100644
--- a/kcontrol/smartcard/smartcard.h
+++ b/kcontrol/smartcard/smartcard.h
@@ -27,7 +27,7 @@
#include <dcopobject.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include "smartcardbase.h"
#include "nosmartcardbase.h"
diff --git a/kcontrol/smserver/kcmsmserver.h b/kcontrol/smserver/kcmsmserver.h
index c66caaa93..c346033c6 100644
--- a/kcontrol/smserver/kcmsmserver.h
+++ b/kcontrol/smserver/kcmsmserver.h
@@ -21,7 +21,7 @@
#ifndef __kcmsmserver_h__
#define __kcmsmserver_h__
-#include <kcmodule.h>
+#include <tdecmodule.h>
class SMServerConfigImpl;
diff --git a/kcontrol/spellchecking/spellchecking.h b/kcontrol/spellchecking/spellchecking.h
index 19aadbc76..10db546fd 100644
--- a/kcontrol/spellchecking/spellchecking.h
+++ b/kcontrol/spellchecking/spellchecking.h
@@ -19,7 +19,7 @@
#ifndef __spellchecking_h__
#define __spellchecking_h__
-#include "kcmodule.h"
+#include "tdecmodule.h"
class KSpellConfig;
diff --git a/kcontrol/style/kcmstyle.h b/kcontrol/style/kcmstyle.h
index 44fb68c0e..81bddf550 100644
--- a/kcontrol/style/kcmstyle.h
+++ b/kcontrol/style/kcmstyle.h
@@ -30,7 +30,7 @@
#include <tqstring.h>
#include <tqtimer.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include "stylepreview.h"
#include "menupreview.h"
diff --git a/kcontrol/taskbar/kcmtaskbar.h b/kcontrol/taskbar/kcmtaskbar.h
index 8b313c0e6..1f9a1e813 100644
--- a/kcontrol/taskbar/kcmtaskbar.h
+++ b/kcontrol/taskbar/kcmtaskbar.h
@@ -21,7 +21,7 @@
#include <tqvaluelist.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TaskbarConfigUI;
class TaskBarSettings;
diff --git a/kcontrol/tdm/main.h b/kcontrol/tdm/main.h
index dbfb936dc..144d1db20 100644
--- a/kcontrol/tdm/main.h
+++ b/kcontrol/tdm/main.h
@@ -27,7 +27,7 @@
#include <tqtabwidget.h>
#include <tqmap.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TDMAppearanceWidget;
class TDMFontWidget;
diff --git a/kcontrol/usbview/kcmusb.h b/kcontrol/usbview/kcmusb.h
index 3b81a3f80..eb33a475c 100644
--- a/kcontrol/usbview/kcmusb.h
+++ b/kcontrol/usbview/kcmusb.h
@@ -14,7 +14,7 @@
#include <tqintdict.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQListView;
class TQListViewItem;
diff --git a/kcontrol/view1394/view1394.h b/kcontrol/view1394/view1394.h
index c88722b82..6d015bce8 100644
--- a/kcontrol/view1394/view1394.h
+++ b/kcontrol/view1394/view1394.h
@@ -21,7 +21,7 @@
#ifndef VIEW1394_H_
#define VIEW1394_H_
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <tqmap.h>
#include <tqsocketnotifier.h>
diff --git a/kcontrol/xinerama/kcmxinerama.h b/kcontrol/xinerama/kcmxinerama.h
index 707bba28c..83fdf6de9 100644
--- a/kcontrol/xinerama/kcmxinerama.h
+++ b/kcontrol/xinerama/kcmxinerama.h
@@ -21,7 +21,7 @@
#ifndef _KCM_XINERAMA_H
#define _KCM_XINERAMA_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <tqptrlist.h>
#include <tqtimer.h>
diff --git a/kdepasswd/kcm/main.h b/kdepasswd/kcm/main.h
index a2b8b5ba9..350c42820 100644
--- a/kdepasswd/kcm/main.h
+++ b/kdepasswd/kcm/main.h
@@ -19,7 +19,7 @@
#ifndef MAIN_H
#define MAIN_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include "main_widget.h"
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h
index c4073388f..476807db2 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.h
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h
@@ -22,7 +22,7 @@
#define __kcmhtmlsearch_h__
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQLineEdit;
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 46f96c9fc..ae2411b09 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -22,7 +22,7 @@
#include <tqlayout.h>
#include <tqsplitter.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kaboutdata.h>
#include <klocale.h>
#include <kapplication.h>
diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h
index fdc12a8f2..92bf49efb 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.h
+++ b/khotkeys/kcontrol/kcmkhotkeys.h
@@ -11,7 +11,7 @@
#ifndef _KCMKHOTKEYS_H_
#define _KCMKHOTKEYS_H_
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kshortcut.h>
#include <actions.h>
diff --git a/kioslave/cgi/kcmcgi/kcmcgi.h b/kioslave/cgi/kcmcgi/kcmcgi.h
index f6ad715b3..ccd2f2f3d 100644
--- a/kioslave/cgi/kcmcgi/kcmcgi.h
+++ b/kioslave/cgi/kcmcgi/kcmcgi.h
@@ -18,7 +18,7 @@
#ifndef KCMCGI_H
#define KCMCGI_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TQListBox;
class TQPushButton;
diff --git a/kioslave/media/CMakeLists.txt b/kioslave/media/CMakeLists.txt
index 41821df59..6c39b47fe 100644
--- a/kioslave/media/CMakeLists.txt
+++ b/kioslave/media/CMakeLists.txt
@@ -14,7 +14,7 @@ add_subdirectory( mediamanager )
add_subdirectory( medianotifier )
add_subdirectory( mounthelper )
add_subdirectory( kfile-plugin )
-add_subdirectory( kcmodule )
+add_subdirectory( tdecmodule )
add_subdirectory( mimetypes )
add_subdirectory( services )
add_subdirectory( propsdlgplugin )
diff --git a/kioslave/media/Makefile.am b/kioslave/media/Makefile.am
index e727fc4a3..978f17cbc 100644
--- a/kioslave/media/Makefile.am
+++ b/kioslave/media/Makefile.am
@@ -3,7 +3,7 @@ PROPSDLGPLUGINDIR = propsdlgplugin
endif
SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \
- kfile-plugin kcmodule mimetypes services $(PROPSDLGPLUGINDIR)
+ kfile-plugin tdecmodule mimetypes services $(PROPSDLGPLUGINDIR)
INCLUDES = -I$(srcdir)/libmediacommon $(all_includes)
METASOURCES = AUTO
diff --git a/kioslave/media/kcmodule/CMakeLists.txt b/kioslave/media/tdecmodule/CMakeLists.txt
index 4a1dc2345..4a1dc2345 100644
--- a/kioslave/media/kcmodule/CMakeLists.txt
+++ b/kioslave/media/tdecmodule/CMakeLists.txt
diff --git a/kioslave/media/kcmodule/Makefile.am b/kioslave/media/tdecmodule/Makefile.am
index 72f9f385c..72f9f385c 100644
--- a/kioslave/media/kcmodule/Makefile.am
+++ b/kioslave/media/tdecmodule/Makefile.am
diff --git a/kioslave/media/kcmodule/main.cpp b/kioslave/media/tdecmodule/main.cpp
index 9036583df..9036583df 100644
--- a/kioslave/media/kcmodule/main.cpp
+++ b/kioslave/media/tdecmodule/main.cpp
diff --git a/kioslave/media/kcmodule/main.h b/kioslave/media/tdecmodule/main.h
index b5297aed5..5052d58eb 100644
--- a/kioslave/media/kcmodule/main.h
+++ b/kioslave/media/tdecmodule/main.h
@@ -20,7 +20,7 @@
#ifndef _MAIN_H_
#define _MAIN_H_
-#include <kcmodule.h>
+#include <tdecmodule.h>
class MediaModule : public TDECModule
{
diff --git a/kioslave/media/kcmodule/managermodule.cpp b/kioslave/media/tdecmodule/managermodule.cpp
index 4c9859889..4c9859889 100644
--- a/kioslave/media/kcmodule/managermodule.cpp
+++ b/kioslave/media/tdecmodule/managermodule.cpp
diff --git a/kioslave/media/kcmodule/managermodule.h b/kioslave/media/tdecmodule/managermodule.h
index a26c7a24a..a0a384675 100644
--- a/kioslave/media/kcmodule/managermodule.h
+++ b/kioslave/media/tdecmodule/managermodule.h
@@ -21,7 +21,7 @@
#define _MANAGERMODULE_H_
#include <tqmap.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class ManagerModuleView;
diff --git a/kioslave/media/kcmodule/managermoduleview.ui b/kioslave/media/tdecmodule/managermoduleview.ui
index afde70c75..afde70c75 100644
--- a/kioslave/media/kcmodule/managermoduleview.ui
+++ b/kioslave/media/tdecmodule/managermoduleview.ui
diff --git a/kioslave/media/kcmodule/media.desktop b/kioslave/media/tdecmodule/media.desktop
index 4afd68cb5..4afd68cb5 100644
--- a/kioslave/media/kcmodule/media.desktop
+++ b/kioslave/media/tdecmodule/media.desktop
diff --git a/kioslave/media/kcmodule/mimetypelistboxitem.cpp b/kioslave/media/tdecmodule/mimetypelistboxitem.cpp
index e7334248a..e7334248a 100644
--- a/kioslave/media/kcmodule/mimetypelistboxitem.cpp
+++ b/kioslave/media/tdecmodule/mimetypelistboxitem.cpp
diff --git a/kioslave/media/kcmodule/mimetypelistboxitem.h b/kioslave/media/tdecmodule/mimetypelistboxitem.h
index e02f58b11..e02f58b11 100644
--- a/kioslave/media/kcmodule/mimetypelistboxitem.h
+++ b/kioslave/media/tdecmodule/mimetypelistboxitem.h
diff --git a/kioslave/media/kcmodule/notifiermodule.cpp b/kioslave/media/tdecmodule/notifiermodule.cpp
index 4146c514f..4146c514f 100644
--- a/kioslave/media/kcmodule/notifiermodule.cpp
+++ b/kioslave/media/tdecmodule/notifiermodule.cpp
diff --git a/kioslave/media/kcmodule/notifiermodule.h b/kioslave/media/tdecmodule/notifiermodule.h
index 391feb47f..d5d97a96d 100644
--- a/kioslave/media/kcmodule/notifiermodule.h
+++ b/kioslave/media/tdecmodule/notifiermodule.h
@@ -20,7 +20,7 @@
#ifndef _NOTIFIERMODULE_H_
#define _NOTIFIERMODULE_H_
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <tqlistbox.h>
#include "notifiersettings.h"
diff --git a/kioslave/media/kcmodule/notifiermoduleview.ui b/kioslave/media/tdecmodule/notifiermoduleview.ui
index ad508c03d..ad508c03d 100644
--- a/kioslave/media/kcmodule/notifiermoduleview.ui
+++ b/kioslave/media/tdecmodule/notifiermoduleview.ui
diff --git a/kioslave/media/kcmodule/serviceconfigdialog.cpp b/kioslave/media/tdecmodule/serviceconfigdialog.cpp
index 61dd060f2..61dd060f2 100644
--- a/kioslave/media/kcmodule/serviceconfigdialog.cpp
+++ b/kioslave/media/tdecmodule/serviceconfigdialog.cpp
diff --git a/kioslave/media/kcmodule/serviceconfigdialog.h b/kioslave/media/tdecmodule/serviceconfigdialog.h
index 24e907205..24e907205 100644
--- a/kioslave/media/kcmodule/serviceconfigdialog.h
+++ b/kioslave/media/tdecmodule/serviceconfigdialog.h
diff --git a/kioslave/media/kcmodule/serviceview.ui b/kioslave/media/tdecmodule/serviceview.ui
index a6c3063f6..a6c3063f6 100644
--- a/kioslave/media/kcmodule/serviceview.ui
+++ b/kioslave/media/tdecmodule/serviceview.ui
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.h b/konqueror/sidebar/trees/history_module/kcmhistory.h
index 5731ae267..ac82cdd60 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.h
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.h
@@ -21,7 +21,7 @@
#ifndef __kcmhistory_h__
#define __kcmhistory_h__
-#include <kcmodule.h>
+#include <tdecmodule.h>
class KonqHistoryManager;
class KonqSidebarHistorySettings;
diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp
index cceebc0e1..3344145a5 100644
--- a/ksplashml/kcmksplash/main.cpp
+++ b/ksplashml/kcmksplash/main.cpp
@@ -16,7 +16,7 @@
#include <tqtabwidget.h>
#include <kaboutdata.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kstandarddirs.h>
diff --git a/kxkb/kcmlayout.h b/kxkb/kcmlayout.h
index 14d9e734e..769b08048 100644
--- a/kxkb/kcmlayout.h
+++ b/kxkb/kcmlayout.h
@@ -2,7 +2,7 @@
#define __KCM_LAYOUT_H__
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <tqstring.h>
#include <tqlistview.h>
diff --git a/kxkb/kcmmisc.h b/kxkb/kcmmisc.h
index b40f50a0d..603de53bd 100644
--- a/kxkb/kcmmisc.h
+++ b/kxkb/kcmmisc.h
@@ -26,7 +26,7 @@
#include <kapplication.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class KeyboardConfigWidget;
diff --git a/tdeprint/printmgr/kcmprintmgr.h b/tdeprint/printmgr/kcmprintmgr.h
index 18cf68a91..f2ce5dfea 100644
--- a/tdeprint/printmgr/kcmprintmgr.h
+++ b/tdeprint/printmgr/kcmprintmgr.h
@@ -20,7 +20,7 @@
#ifndef KCMPRINTMGR_H
#define KCMPRINTMGR_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
class KMMainView;
diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp
index 30695cdef..788a0d3e7 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.cpp
+++ b/twin/kcmtwin/twindecoration/twindecoration.cpp
@@ -834,7 +834,7 @@ void KWinDecorationModule::writeConfig( TDEConfig* conf )
oldLibraryName = currentLibraryName;
currentLibraryName = libName;
- // We saved, so tell kcmodule that there have been no new user changes made.
+ // We saved, so tell tdecmodule that there have been no new user changes made.
emit TDECModule::changed(false);
}
diff --git a/twin/kcmtwin/twindecoration/twindecoration.h b/twin/kcmtwin/twindecoration/twindecoration.h
index 14e24c777..49af27d71 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.h
+++ b/twin/kcmtwin/twindecoration/twindecoration.h
@@ -30,7 +30,7 @@
#ifndef KWINDECORATION_H
#define KWINDECORATION_H
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <dcopobject.h>
#include <buttons.h>
#include <kconfig.h>
diff --git a/twin/kcmtwin/twinoptions/main.h b/twin/kcmtwin/twinoptions/main.h
index 4935cf39f..c1146fa92 100644
--- a/twin/kcmtwin/twinoptions/main.h
+++ b/twin/kcmtwin/twinoptions/main.h
@@ -26,7 +26,7 @@
#define __MAIN_H__
#include <tqtabwidget.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
class TDEConfig;
class KFocusConfig;
diff --git a/twin/kcmtwin/twinoptions/mouse.h b/twin/kcmtwin/twinoptions/mouse.h
index 70ff2bfca..772bc5ac9 100644
--- a/twin/kcmtwin/twinoptions/mouse.h
+++ b/twin/kcmtwin/twinoptions/mouse.h
@@ -25,7 +25,7 @@
class TDEConfig;
#include <tqwidget.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <tqcombobox.h>
#include <tqtooltip.h>
diff --git a/twin/kcmtwin/twinoptions/windows.h b/twin/kcmtwin/twinoptions/windows.h
index f0b0bcd9f..10424207d 100644
--- a/twin/kcmtwin/twinoptions/windows.h
+++ b/twin/kcmtwin/twinoptions/windows.h
@@ -23,7 +23,7 @@
#define __KWINDOWCONFIG_H__
#include <tqwidget.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <config.h>
class TQRadioButton;
diff --git a/twin/kcmtwin/twinrules/kcm.h b/twin/kcmtwin/twinrules/kcm.h
index 1237a5a64..33d7c2664 100644
--- a/twin/kcmtwin/twinrules/kcm.h
+++ b/twin/kcmtwin/twinrules/kcm.h
@@ -20,7 +20,7 @@
#ifndef __KCM_H__
#define __KCM_H__
-#include <kcmodule.h>
+#include <tdecmodule.h>
#include <kconfig.h>
class TDEConfig;