diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 16:27:34 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 16:27:34 -0600 |
commit | b7658a0d5eca24a9d37c6e04f88298ef02389db0 (patch) | |
tree | 6e9804ffbdc330c3ddb5799e19d84562cd019e5e | |
parent | c56660aff3294f6b61ed9d2861f0fc520b5c8efe (diff) | |
download | tdelibs-b7658a0d5eca24a9d37c6e04f88298ef02389db0.tar.gz tdelibs-b7658a0d5eca24a9d37c6e04f88298ef02389db0.zip |
Fix FTBFS resulting from KCModule rename
-rw-r--r-- | kcmshell/main.cpp | 6 | ||||
-rw-r--r-- | kdewidgets/pics/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kdewidgets/pics/Makefile.am | 2 | ||||
-rw-r--r-- | kdewidgets/pics/tdecmodule.png (renamed from kdewidgets/pics/kcmodule.png) | bin | 1340 -> 1340 bytes | |||
-rw-r--r-- | kio/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kio/Makefile.am | 2 | ||||
-rw-r--r-- | kio/tdecmodule.desktop (renamed from kio/kcmodule.desktop) | 0 | ||||
-rw-r--r-- | krandr/randr.h | 2 | ||||
-rw-r--r-- | kresources/kcmkresources.h | 2 | ||||
-rw-r--r-- | kutils/CMakeLists.txt | 12 | ||||
-rw-r--r-- | kutils/Makefile.am | 16 | ||||
-rw-r--r-- | kutils/groups.dox | 2 | ||||
-rw-r--r-- | kutils/kcmultidialog.cpp | 4 | ||||
-rw-r--r-- | kutils/kcmultidialog.h | 2 | ||||
-rw-r--r-- | kutils/kpluginselector.cpp | 10 | ||||
-rw-r--r-- | kutils/ksettings/dialog.cpp | 2 | ||||
-rw-r--r-- | kutils/ksettings/pluginpage.h | 2 | ||||
-rw-r--r-- | kutils/tdecmodulecontainer.cpp (renamed from kutils/kcmodulecontainer.cpp) | 12 | ||||
-rw-r--r-- | kutils/tdecmodulecontainer.h (renamed from kutils/kcmodulecontainer.h) | 8 | ||||
-rw-r--r-- | kutils/tdecmoduleinfo.cpp (renamed from kutils/kcmoduleinfo.cpp) | 2 | ||||
-rw-r--r-- | kutils/tdecmoduleinfo.h (renamed from kutils/kcmoduleinfo.h) | 2 | ||||
-rw-r--r-- | kutils/tdecmoduleloader.cpp (renamed from kutils/kcmoduleloader.cpp) | 2 | ||||
-rw-r--r-- | kutils/tdecmoduleloader.h (renamed from kutils/kcmoduleloader.h) | 6 | ||||
-rw-r--r-- | kutils/tdecmoduleproxy.cpp (renamed from kutils/kcmoduleproxy.cpp) | 14 | ||||
-rw-r--r-- | kutils/tdecmoduleproxy.h (renamed from kutils/kcmoduleproxy.h) | 2 | ||||
-rw-r--r-- | kutils/tdecmoduleproxyIface.h (renamed from kutils/kcmoduleproxyIface.h) | 4 | ||||
-rw-r--r-- | kutils/tdecmoduleproxyIfaceImpl.cpp (renamed from kutils/kcmoduleproxyIfaceImpl.cpp) | 6 | ||||
-rw-r--r-- | kutils/tdecmoduleproxyIfaceImpl.h (renamed from kutils/kcmoduleproxyIfaceImpl.h) | 2 | ||||
-rw-r--r-- | tdecore/kdebug.areas | 2 | ||||
-rw-r--r-- | tdeui/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tdeui/MAINTAINERS | 2 | ||||
-rw-r--r-- | tdeui/Makefile.am | 4 | ||||
-rw-r--r-- | tdeui/tdecmodule.cpp (renamed from tdeui/kcmodule.cpp) | 4 | ||||
-rw-r--r-- | tdeui/tdecmodule.h (renamed from tdeui/kcmodule.h) | 0 | ||||
-rw-r--r-- | win/pro_files/tdeui/tdeui.pro | 2 |
35 files changed, 73 insertions, 73 deletions
diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp index 5d71fbaa7..29aba0501 100644 --- a/kcmshell/main.cpp +++ b/kcmshell/main.cpp @@ -30,9 +30,9 @@ #include <kaboutdata.h> #include <kapplication.h> #include <kcmdlineargs.h> -#include <kcmoduleinfo.h> -#include <kcmoduleloader.h> -#include <kcmoduleproxy.h> +#include <tdecmoduleinfo.h> +#include <tdecmoduleloader.h> +#include <tdecmoduleproxy.h> #include <kcmultidialog.h> #include <kdebug.h> #include <kdialogbase.h> diff --git a/kdewidgets/pics/CMakeLists.txt b/kdewidgets/pics/CMakeLists.txt index 8e7ff6b13..b122c8b28 100644 --- a/kdewidgets/pics/CMakeLists.txt +++ b/kdewidgets/pics/CMakeLists.txt @@ -15,7 +15,7 @@ install( FILES klineedit.png ktextbrowser.png kpasswordedit.png kdatewidget.png kfontrequester.png kurlrequester.png kcombobox.png kiconview.png kintspinbox.png kled.png ksqueezedtextlabel.png kprogress.png - kurllabel.png kruler.png kcmodule.png kdoublespinbox.png + kurllabel.png kruler.png tdecmodule.png kdoublespinbox.png kdoublenuminput.png klistbox.png klistview.png kactivelabel.png kiconbutton.png kcolorcombo.png khsselector.png kcolorbutton.png kgradientselector.png kdualcolorbutton.png ktimewidget.png diff --git a/kdewidgets/pics/Makefile.am b/kdewidgets/pics/Makefile.am index 83e8aa357..aeda8e4cb 100644 --- a/kdewidgets/pics/Makefile.am +++ b/kdewidgets/pics/Makefile.am @@ -1,7 +1,7 @@ kdewidgetsdata_DATA = klineedit.png ktextbrowser.png kpasswordedit.png kdatewidget.png \ kfontrequester.png kurlrequester.png kcombobox.png kiconview.png kintspinbox.png \ kled.png ksqueezedtextlabel.png kprogress.png kurllabel.png \ - kruler.png kcmodule.png kdoublespinbox.png kdoublenuminput.png \ + kruler.png tdecmodule.png kdoublespinbox.png kdoublenuminput.png \ klistbox.png klistview.png kactivelabel.png kiconbutton.png \ kcolorcombo.png khsselector.png kcolorbutton.png \ kgradientselector.png kdualcolorbutton.png ktimewidget.png \ diff --git a/kdewidgets/pics/kcmodule.png b/kdewidgets/pics/tdecmodule.png Binary files differindex 1a6a9dc17..1a6a9dc17 100644 --- a/kdewidgets/pics/kcmodule.png +++ b/kdewidgets/pics/tdecmodule.png diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt index c89f33e99..3bd4ba8b7 100644 --- a/kio/CMakeLists.txt +++ b/kio/CMakeLists.txt @@ -41,7 +41,7 @@ install( FILES magic DESTINATION ${MIME_INSTALL_DIR} ) install( FILES application.desktop kurifilterplugin.desktop kcomprfilter.desktop kscan.desktop kdatatool.desktop - kfileplugin.desktop kcmodule.desktop + kfileplugin.desktop tdecmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) install( FILES kioslave.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) diff --git a/kio/Makefile.am b/kio/Makefile.am index 4a28986ef..b639d43df 100644 --- a/kio/Makefile.am +++ b/kio/Makefile.am @@ -37,7 +37,7 @@ libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \ kde_mime_DATA = magic kde_servicetypes_DATA = application.desktop kurifilterplugin.desktop \ kcomprfilter.desktop kscan.desktop kdatatool.desktop \ - kfileplugin.desktop kcmodule.desktop + kfileplugin.desktop tdecmodule.desktop EXTRA_DIST = $(kde_mime_DATA) diff --git a/kio/kcmodule.desktop b/kio/tdecmodule.desktop index 5cbe9b786..5cbe9b786 100644 --- a/kio/kcmodule.desktop +++ b/kio/tdecmodule.desktop diff --git a/krandr/randr.h b/krandr/randr.h index bec5f1b61..af3712e71 100644 --- a/krandr/randr.h +++ b/krandr/randr.h @@ -23,7 +23,7 @@ #include <tqstringlist.h> #include <tqptrlist.h> -#include <kcmodule.h> +#include <tdecmodule.h> #include <kconfig.h> class KTimerDialog; diff --git a/kresources/kcmkresources.h b/kresources/kcmkresources.h index 38279d29a..29adc6583 100644 --- a/kresources/kcmkresources.h +++ b/kresources/kcmkresources.h @@ -22,7 +22,7 @@ #ifndef KRESOURCES_KCMKRESOURCES_H #define KRESOURCES_KCMKRESOURCES_H -#include <kcmodule.h> +#include <tdecmodule.h> class KRESOURCES_EXPORT KCMKResources : public TDECModule { diff --git a/kutils/CMakeLists.txt b/kutils/CMakeLists.txt index a033088cd..073ffe3a0 100644 --- a/kutils/CMakeLists.txt +++ b/kutils/CMakeLists.txt @@ -33,9 +33,9 @@ link_directories( install( FILES kfind.h kfinddialog.h kreplace.h kreplacedialog.h - kcmoduleinfo.h kcmoduleloader.h kcmultidialog.h - kmultitabbar.h kplugininfo.h kcmoduleproxy.h - kpluginselector.h kcmodulecontainer.h + tdecmoduleinfo.h tdecmoduleloader.h kcmultidialog.h + kmultitabbar.h kplugininfo.h tdecmoduleproxy.h + kpluginselector.h tdecmodulecontainer.h DESTINATION ${INCLUDE_INSTALL_DIR} ) @@ -50,10 +50,10 @@ set( target kutils ) set( ${target}_SRCS kfind.cpp kfinddialog.cpp kreplace.cpp - kreplacedialog.cpp kcmoduleinfo.cpp kcmoduleloader.cpp + kreplacedialog.cpp tdecmoduleinfo.cpp tdecmoduleloader.cpp kcmultidialog.cpp kmultitabbar.cpp kplugininfo.cpp - kcmoduleproxy.cpp kpluginselector.cpp kcmodulecontainer.cpp - kcmoduleproxyIface.skel kcmoduleproxyIfaceImpl.cpp + tdecmoduleproxy.cpp kpluginselector.cpp tdecmodulecontainer.cpp + tdecmoduleproxyIface.skel tdecmoduleproxyIfaceImpl.cpp ) tde_add_library( ${target} SHARED AUTOMOC diff --git a/kutils/Makefile.am b/kutils/Makefile.am index d8ebcf156..5ff9bd041 100644 --- a/kutils/Makefile.am +++ b/kutils/Makefile.am @@ -7,19 +7,19 @@ libkutils_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2 libkutils_la_LIBADD = ../kio/libkio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_X11) libkutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \ - kreplacedialog.cpp kcmoduleinfo.cpp kcmoduleloader.cpp \ + kreplacedialog.cpp tdecmoduleinfo.cpp tdecmoduleloader.cpp \ kcmultidialog.cpp kmultitabbar.cpp kplugininfo.cpp \ - kcmoduleproxy.cpp kpluginselector.cpp \ - kcmodulecontainer.cpp kcmoduleproxyIface.skel \ - kcmoduleproxyIfaceImpl.cpp + tdecmoduleproxy.cpp kpluginselector.cpp \ + tdecmodulecontainer.cpp tdecmoduleproxyIface.skel \ + tdecmoduleproxyIfaceImpl.cpp include_HEADERS = kfind.h kfinddialog.h kreplace.h kreplacedialog.h \ - kcmoduleinfo.h kcmoduleloader.h kcmultidialog.h \ - kmultitabbar.h kplugininfo.h kcmoduleproxy.h \ - kpluginselector.h kcmodulecontainer.h + tdecmoduleinfo.h tdecmoduleloader.h kcmultidialog.h \ + kmultitabbar.h kplugininfo.h tdecmoduleproxy.h \ + kpluginselector.h tdecmodulecontainer.h noinst_HEADERS = kmultitabbar_p.h kpluginselector_p.h \ - kcmoduleproxyIface.h kcmoduleproxyIfaceImpl.h + tdecmoduleproxyIface.h tdecmoduleproxyIfaceImpl.h kde_servicetypes_DATA = kplugininfo.desktop diff --git a/kutils/groups.dox b/kutils/groups.dox index 95d926d73..a4e0a633f 100644 --- a/kutils/groups.dox +++ b/kutils/groups.dox @@ -27,7 +27,7 @@ namespace description for an overview. */ /** -@defgroup kcmodule KControl module classes +@defgroup tdecmodule KControl module classes Thwse classes provide the KControl module API. */ diff --git a/kutils/kcmultidialog.cpp b/kutils/kcmultidialog.cpp index 5fe862177..b09f25e88 100644 --- a/kutils/kcmultidialog.cpp +++ b/kutils/kcmultidialog.cpp @@ -38,8 +38,8 @@ #include <kstdguiitem.h> #include <kuser.h> -#include "kcmoduleloader.h" -#include "kcmoduleproxy.h" +#include "tdecmoduleloader.h" +#include "tdecmoduleproxy.h" #include "kcmultidialog.h" #include "kcmultidialog.moc" diff --git a/kutils/kcmultidialog.h b/kutils/kcmultidialog.h index 7c89621ca..46dde98fb 100644 --- a/kutils/kcmultidialog.h +++ b/kutils/kcmultidialog.h @@ -33,7 +33,7 @@ class TDECModuleProxy; class TDECModuleInfo; /** - * @ingroup kcmodule + * @ingroup tdecmodule * @short A method that offers a KDialogBase containing arbitrary * KControl Modules. * diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp index 7f07b7ed2..fb1386106 100644 --- a/kutils/kpluginselector.cpp +++ b/kutils/kpluginselector.cpp @@ -43,22 +43,22 @@ #include <kglobalsettings.h> #include <kstandarddirs.h> #include <ktabctl.h> -#include <kcmoduleinfo.h> +#include <tdecmoduleinfo.h> #include <tqvaluelist.h> #include <kservice.h> #include <ktrader.h> #include <ktabwidget.h> #include <kiconloader.h> -#include <kcmodule.h> -#include "kcmoduleinfo.h" -#include "kcmoduleloader.h" +#include <tdecmodule.h> +#include "tdecmoduleinfo.h" +#include "tdecmoduleloader.h" #include <tqsplitter.h> #include <tqframe.h> #include "kplugininfo.h" #include <kinstance.h> #include <tqptrdict.h> #include <tqstringlist.h> -#include "kcmoduleproxy.h" +#include "tdecmoduleproxy.h" /* QCheckListViewItem that holds a pointer to the KPluginInfo object. diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp index 727ca1072..e3bfa579f 100644 --- a/kutils/ksettings/dialog.cpp +++ b/kutils/ksettings/dialog.cpp @@ -33,7 +33,7 @@ #include <kiconloader.h> #include <tqvbox.h> #include <tqlabel.h> -#include "kcmoduleinfo.h" +#include "tdecmoduleinfo.h" namespace KSettings { diff --git a/kutils/ksettings/pluginpage.h b/kutils/ksettings/pluginpage.h index 2ba4f2142..7f5c7e952 100644 --- a/kutils/ksettings/pluginpage.h +++ b/kutils/ksettings/pluginpage.h @@ -20,7 +20,7 @@ #ifndef KSETTINGS_PLUGINPAGE_H #define KSETTINGS_PLUGINPAGE_H -#include <kcmodule.h> +#include <tdecmodule.h> #include <tdelibs_export.h> class KPluginSelector; diff --git a/kutils/kcmodulecontainer.cpp b/kutils/tdecmodulecontainer.cpp index b91ffb641..04cbf6751 100644 --- a/kutils/kcmodulecontainer.cpp +++ b/kutils/tdecmodulecontainer.cpp @@ -24,10 +24,10 @@ #include <tqtooltip.h> #include <tqvaluelist.h> -#include <kcmodule.h> -#include <kcmoduleinfo.h> -#include <kcmoduleloader.h> -#include <kcmoduleproxy.h> +#include <tdecmodule.h> +#include <tdecmoduleinfo.h> +#include <tdecmoduleloader.h> +#include <tdecmoduleproxy.h> #include <kdebug.h> #include <kdialog.h> #include <kglobal.h> @@ -36,8 +36,8 @@ #include <kservice.h> #include <kstdguiitem.h> -#include "kcmodulecontainer.h" -#include "kcmodulecontainer.moc" +#include "tdecmodulecontainer.h" +#include "tdecmodulecontainer.moc" /***********************************************************************/ class TDECModuleContainer::TDECModuleContainerPrivate diff --git a/kutils/kcmodulecontainer.h b/kutils/tdecmodulecontainer.h index 956b23efd..5708f80cf 100644 --- a/kutils/kcmodulecontainer.h +++ b/kutils/tdecmodulecontainer.h @@ -24,8 +24,8 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <kcmodule.h> -#include <kcmoduleloader.h> +#include <tdecmodule.h> +#include <tdecmoduleloader.h> class TQTabWidget; class TQWidget; @@ -34,7 +34,7 @@ class TQVBoxLayout; class TDECModuleProxy; /** - * @ingroup kcmodule + * @ingroup tdecmodule * @brief TDECModuleContainer is a convenience class encapsulating several TDECModules. * * The TDECModuleContainer class is a convenience class for organizing a multiple set @@ -170,7 +170,7 @@ class KUTILS_EXPORT TDECModuleContainer : public TDECModule }; /** - * @ingroup kcmodule + * @ingroup tdecmodule * This macro creates an factory declaration which when run creates an TDECModule with specified * modules. For example: * \code diff --git a/kutils/kcmoduleinfo.cpp b/kutils/tdecmoduleinfo.cpp index c1892df36..3a7fdfd63 100644 --- a/kutils/kcmoduleinfo.cpp +++ b/kutils/tdecmoduleinfo.cpp @@ -29,7 +29,7 @@ #include <kstandarddirs.h> #include <klocale.h> -#include "kcmoduleinfo.h" +#include "tdecmoduleinfo.h" class TDECModuleInfo::TDECModuleInfoPrivate { diff --git a/kutils/kcmoduleinfo.h b/kutils/tdecmoduleinfo.h index a17f6af7a..0bd7c44e3 100644 --- a/kutils/kcmoduleinfo.h +++ b/kutils/tdecmoduleinfo.h @@ -31,7 +31,7 @@ class TQString; class TQStringList; /** - * @ingroup kcmodule + * @ingroup tdecmodule * A class that provides information about a TDECModule * * TDECModuleInfo provides various technical information, such as icon, library diff --git a/kutils/kcmoduleloader.cpp b/kutils/tdecmoduleloader.cpp index da31a72c2..c661ac22f 100644 --- a/kutils/kcmoduleloader.cpp +++ b/kutils/tdecmoduleloader.cpp @@ -31,7 +31,7 @@ #include <kmessagebox.h> #include <kparts/componentfactory.h> -#include "kcmoduleloader.h" +#include "tdecmoduleloader.h" /***************************************************************/ diff --git a/kutils/kcmoduleloader.h b/kutils/tdecmoduleloader.h index b4b57e21a..1ae9f6b9f 100644 --- a/kutils/kcmoduleloader.h +++ b/kutils/tdecmoduleloader.h @@ -21,14 +21,14 @@ #ifndef MODLOADER_H #define MODLOADER_H -#include <kcmodule.h> -#include <kcmoduleinfo.h> +#include <tdecmodule.h> +#include <tdecmoduleinfo.h> class TQWidget; class KLibLoader; /** - * @ingroup kcmodule + * @ingroup tdecmodule * @brief Loads a KControl Module. * * TDECModuleLoader tries in several ways diff --git a/kutils/kcmoduleproxy.cpp b/kutils/tdecmoduleproxy.cpp index df6b2bb98..673074c16 100644 --- a/kutils/kcmoduleproxy.cpp +++ b/kutils/tdecmoduleproxy.cpp @@ -37,9 +37,9 @@ #include <kapplication.h> #include <kaboutdata.h> -#include <kcmodule.h> -#include <kcmoduleinfo.h> -#include <kcmoduleloader.h> +#include <tdecmodule.h> +#include <tdecmoduleinfo.h> +#include <tdecmoduleloader.h> #include <kdebug.h> #include <kdialog.h> #include <klocale.h> @@ -50,9 +50,9 @@ #include <X11/Xlib.h> -#include "kcmoduleproxy.h" -#include "kcmoduleproxyIface.h" -#include "kcmoduleproxyIfaceImpl.h" +#include "tdecmoduleproxy.h" +#include "tdecmoduleproxyIface.h" +#include "tdecmoduleproxyIfaceImpl.h" /***************************************************************/ class TDECModuleProxy::TDECModuleProxyPrivate @@ -645,6 +645,6 @@ void TDECModuleProxy::emitQuickHelpChanged() } /***************************************************************/ -#include "kcmoduleproxy.moc" +#include "tdecmoduleproxy.moc" // vim: sw=4 ts=4 noet diff --git a/kutils/kcmoduleproxy.h b/kutils/tdecmoduleproxy.h index 2ffeabf56..9fc559d97 100644 --- a/kutils/kcmoduleproxy.h +++ b/kutils/tdecmoduleproxy.h @@ -34,7 +34,7 @@ class TDEInstance; class TDEProcess; /** - * @ingroup kcmodule + * @ingroup tdecmodule * * @brief Encapsulates a TDECModule for embedding. * diff --git a/kutils/kcmoduleproxyIface.h b/kutils/tdecmoduleproxyIface.h index 5bf24ac91..22bfa8e52 100644 --- a/kutils/kcmoduleproxyIface.h +++ b/kutils/tdecmoduleproxyIface.h @@ -23,7 +23,7 @@ #include <dcopobject.h> /** - * @ingroup kcmodule + * @ingroup tdecmodule * @brief DCOP Interface for TDECModule. * * A module (which is loaded via TDECModuleProxy) does always have @@ -90,7 +90,7 @@ k_dcop_signals: }; /** - * @ingroup kcmodule + * @ingroup tdecmodule * @brief DCOP interface for communicating with the real module running in root mode. * * When a TDECModuleProxy tells kcmshell to load "itself" and embed into the diff --git a/kutils/kcmoduleproxyIfaceImpl.cpp b/kutils/tdecmoduleproxyIfaceImpl.cpp index 5e1ca4986..53019f72f 100644 --- a/kutils/kcmoduleproxyIfaceImpl.cpp +++ b/kutils/tdecmoduleproxyIfaceImpl.cpp @@ -22,10 +22,10 @@ #include <dcopclient.h> #include <kapplication.h> -#include <kcmoduleproxy.h> +#include <tdecmoduleproxy.h> #include <kdebug.h> -#include "kcmoduleproxyIfaceImpl.h" +#include "tdecmoduleproxyIfaceImpl.h" #include <tqmessagebox.h> @@ -126,4 +126,4 @@ void TDECModuleProxyRootCommunicatorImpl::quickHelpChanged() p->emitQuickHelpChanged(); } -#include "kcmoduleproxyIfaceImpl.moc" +#include "tdecmoduleproxyIfaceImpl.moc" diff --git a/kutils/kcmoduleproxyIfaceImpl.h b/kutils/tdecmoduleproxyIfaceImpl.h index 9de3d58dd..fec8c6e5c 100644 --- a/kutils/kcmoduleproxyIfaceImpl.h +++ b/kutils/tdecmoduleproxyIfaceImpl.h @@ -19,7 +19,7 @@ #ifndef __KCMODULEPROXYIFACEIMPL_H__ #define __KCMODULEPROXYIFACEIMPL_H__ -#include "kcmoduleproxyIface.h" +#include "tdecmoduleproxyIface.h" class TDECModuleProxy; diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas index ab08d0ed2..92e62aaee 100644 --- a/tdecore/kdebug.areas +++ b/tdecore/kdebug.areas @@ -95,7 +95,7 @@ 1402 khc_indexbuilder 1420 kikbd -1421 ki18b_keys (kcmodule) +1421 ki18b_keys (tdecmodule) 1430 nspluginviewer (Qt/Xt) 1431 nspluginviewer (plugin) diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt index 9ff7efc91..f7c1027d7 100644 --- a/tdeui/CMakeLists.txt +++ b/tdeui/CMakeLists.txt @@ -58,7 +58,7 @@ install( FILES kdualcolorbtn.h kdualcolorbutton.h ktoolbarbutton.h ktoolbarradiogroup.h ktextbrowser.h kaction.h kactioncollection.h kactionclasses.h khelpmenu.h kswitchlanguagedialog.h - kcmodule.h kcmenumngr.h kpanelmenu.h kpanelappmenu.h + tdecmodule.h kcmenumngr.h kpanelmenu.h kpanelappmenu.h kactionshortcutlist.h kstdaction.h kcombobox.h kiconview.h klistview.h klistbox.h kbugreport.h kpassdlg.h kxmlguiclient.h kxmlgui.h kxmlguibuilder.h kxmlguifactory.h @@ -129,7 +129,7 @@ set( ${target}_SRCS kanimwidget.cpp krootpixmap.cpp kaboutkde.cpp kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp - kcompletionbox.cpp ksqueezedtextlabel.cpp kcmodule.cpp + kcompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp kcommand.cpp twindowlistmenu.cpp kfontcombo.cpp ktip.cpp kdatewidget.cpp karrowbutton.cpp kmainwindowiface.cpp kmainwindowiface.skel kguiitem.cpp kstdguiitem.cpp diff --git a/tdeui/MAINTAINERS b/tdeui/MAINTAINERS index f666536cb..a5c4465b6 100644 --- a/tdeui/MAINTAINERS +++ b/tdeui/MAINTAINERS @@ -16,7 +16,7 @@ kbugreport.cpp kbuttonbox.cpp kcharselect.cpp kcmenumngr.cpp -kcmodule.cpp +tdecmodule.cpp kcolorbutton.cpp kcolorcombo.cpp kcolordialog.cpp Waldo Bastian <bastian@kde.org> diff --git a/tdeui/Makefile.am b/tdeui/Makefile.am index 821e2e682..b28c38584 100644 --- a/tdeui/Makefile.am +++ b/tdeui/Makefile.am @@ -55,7 +55,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \ kdualcolorbtn.h kdualcolorbutton.h ktoolbarbutton.h \ ktoolbarradiogroup.h ktextbrowser.h \ kaction.h kactioncollection.h kactionclasses.h khelpmenu.h kswitchlanguagedialog.h \ - kcmodule.h kcmenumngr.h kpanelmenu.h kpanelappmenu.h \ + tdecmodule.h kcmenumngr.h kpanelmenu.h kpanelappmenu.h \ kactionshortcutlist.h kstdaction.h kcombobox.h \ kiconview.h klistview.h klistbox.h kbugreport.h kpassdlg.h \ kxmlguiclient.h kxmlgui.h kxmlguibuilder.h kxmlguifactory.h \ @@ -110,7 +110,7 @@ libtdeui_la_SOURCES = \ kanimwidget.cpp krootpixmap.cpp kaboutkde.cpp \ kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp \ kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp \ - kcompletionbox.cpp ksqueezedtextlabel.cpp kcmodule.cpp \ + kcompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp \ kcommand.cpp twindowlistmenu.cpp kfontcombo.cpp ktip.cpp \ kdatewidget.cpp karrowbutton.cpp kmainwindowiface.cpp \ kmainwindowiface.skel kguiitem.cpp kstdguiitem.cpp \ diff --git a/tdeui/kcmodule.cpp b/tdeui/tdecmodule.cpp index 904c1cdc4..0b1b4f5fb 100644 --- a/tdeui/kcmodule.cpp +++ b/tdeui/tdecmodule.cpp @@ -31,8 +31,8 @@ #include <kinstance.h> #include <klocale.h> -#include "kcmodule.h" -#include "kcmodule.moc" +#include "tdecmodule.h" +#include "tdecmodule.moc" class TDECModulePrivate { diff --git a/tdeui/kcmodule.h b/tdeui/tdecmodule.h index 41d8d095e..41d8d095e 100644 --- a/tdeui/kcmodule.h +++ b/tdeui/tdecmodule.h diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro index 5c438b6cf..26813b1b7 100644 --- a/win/pro_files/tdeui/tdeui.pro +++ b/win/pro_files/tdeui/tdeui.pro @@ -30,7 +30,7 @@ kbugreport.cpp \ kbuttonbox.cpp \ kcharselect.cpp \ kcmenumngr.cpp \ -kcmodule.cpp \ +tdecmodule.cpp \ kcolorbutton.cpp \ kcolorcombo.cpp \ kcolordialog.cpp \ |