Fix FTBFS resulting from KCModule rename

12 years ago · 1a9478c6e1
parent 8084850061
commit 1a9478c6e1
127 changed files with 115 additions and 115 deletions
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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;
--- 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;
--- 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;
--- 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"
--- 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"
--- 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;
--- 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;
--- 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>
--- 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;
--- 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>
--- 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>
--- 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;
--- 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;
--- 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;
--- 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;
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
 {
--- 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"
--- 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>
--- 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"
--- 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>
--- 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;
--- 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:
--- 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>
--- 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>
--- 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>
--- 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;
--- 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;
--- 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;
--- 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>
--- 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;
--- 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;
--- 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;
--- 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>
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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"
--- 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;
--- 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"
--- 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;
--- 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;
--- 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;
--- 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"
--- 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;
--- 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;
--- 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;
--- 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"
--- 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;
--- 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;
--- 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
 {
--- 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;
--- 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;
--- 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>
--- 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;
--- 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;
--- 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;
--- 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"
--- 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"
--- 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>
--- 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;
--- 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;
--- 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"
--- 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>
--- 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;
--- 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;
--- 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;
--- 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
 {
--- 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"
--- 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"
--- 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>
--- 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>
--- 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"
--- 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"
--- 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;
--- 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;
--- 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"
--- 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;
--- 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;
--- 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;
--- 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>
--- 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>
--- 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"
--- 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;
--- 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>
--- 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>
--- 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;
--- 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 )
--- 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
--- a/kioslave/media/tdecmodule/CMakeLists.txt
+++ b/kioslave/media/tdecmodule/CMakeLists.txt
--- a/kioslave/media/tdecmodule/Makefile.am
+++ b/kioslave/media/tdecmodule/Makefile.am
--- a/kioslave/media/tdecmodule/main.cpp
+++ b/kioslave/media/tdecmodule/main.cpp
--- a/kioslave/media/tdecmodule/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
 {
--- a/kioslave/media/tdecmodule/managermodule.cpp
+++ b/kioslave/media/tdecmodule/managermodule.cpp
--- a/kioslave/media/tdecmodule/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;
--- a/kioslave/media/tdecmodule/managermoduleview.ui
+++ b/kioslave/media/tdecmodule/managermoduleview.ui
--- a/kioslave/media/tdecmodule/media.desktop
+++ b/kioslave/media/tdecmodule/media.desktop
--- a/kioslave/media/tdecmodule/mimetypelistboxitem.cpp
+++ b/kioslave/media/tdecmodule/mimetypelistboxitem.cpp
--- a/kioslave/media/tdecmodule/mimetypelistboxitem.h
+++ b/kioslave/media/tdecmodule/mimetypelistboxitem.h
--- a/kioslave/media/tdecmodule/notifiermodule.cpp
+++ b/kioslave/media/tdecmodule/notifiermodule.cpp
--- a/kioslave/media/tdecmodule/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"
--- a/kioslave/media/tdecmodule/notifiermoduleview.ui
+++ b/kioslave/media/tdecmodule/notifiermoduleview.ui
--- a/kioslave/media/tdecmodule/serviceconfigdialog.cpp
+++ b/kioslave/media/tdecmodule/serviceconfigdialog.cpp
--- a/kioslave/media/tdecmodule/serviceconfigdialog.h
+++ b/kioslave/media/tdecmodule/serviceconfigdialog.h
--- a/kioslave/media/tdecmodule/serviceview.ui
+++ b/kioslave/media/tdecmodule/serviceview.ui
--- 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;
--- 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>
--- 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>
--- a/kxkb/kcmmisc.h
+++ b/kxkb/kcmmisc.h
@ -26,7 +26,7 @@
 #include <kapplication.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
 class KeyboardConfigWidget;
--- 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;
--- 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);
 }
--- 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>
--- 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;
--- 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>
--- 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;
--- 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;