From b7658a0d5eca24a9d37c6e04f88298ef02389db0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 16:27:34 -0600 Subject: [PATCH] Fix FTBFS resulting from KCModule rename --- kcmshell/main.cpp | 6 +++--- kdewidgets/pics/CMakeLists.txt | 2 +- kdewidgets/pics/Makefile.am | 2 +- .../pics/{kcmodule.png => tdecmodule.png} | Bin kio/CMakeLists.txt | 2 +- kio/Makefile.am | 2 +- kio/{kcmodule.desktop => tdecmodule.desktop} | 0 krandr/randr.h | 2 +- kresources/kcmkresources.h | 2 +- kutils/CMakeLists.txt | 12 ++++++------ kutils/Makefile.am | 16 ++++++++-------- kutils/groups.dox | 2 +- kutils/kcmultidialog.cpp | 4 ++-- kutils/kcmultidialog.h | 2 +- kutils/kpluginselector.cpp | 10 +++++----- kutils/ksettings/dialog.cpp | 2 +- kutils/ksettings/pluginpage.h | 2 +- ...ulecontainer.cpp => tdecmodulecontainer.cpp} | 12 ++++++------ ...cmodulecontainer.h => tdecmodulecontainer.h} | 8 ++++---- kutils/{kcmoduleinfo.cpp => tdecmoduleinfo.cpp} | 2 +- kutils/{kcmoduleinfo.h => tdecmoduleinfo.h} | 2 +- ...{kcmoduleloader.cpp => tdecmoduleloader.cpp} | 2 +- kutils/{kcmoduleloader.h => tdecmoduleloader.h} | 6 +++--- .../{kcmoduleproxy.cpp => tdecmoduleproxy.cpp} | 14 +++++++------- kutils/{kcmoduleproxy.h => tdecmoduleproxy.h} | 2 +- ...oduleproxyIface.h => tdecmoduleproxyIface.h} | 4 ++-- ...aceImpl.cpp => tdecmoduleproxyIfaceImpl.cpp} | 6 +++--- ...xyIfaceImpl.h => tdecmoduleproxyIfaceImpl.h} | 2 +- tdecore/kdebug.areas | 2 +- tdeui/CMakeLists.txt | 4 ++-- tdeui/MAINTAINERS | 2 +- tdeui/Makefile.am | 4 ++-- tdeui/{kcmodule.cpp => tdecmodule.cpp} | 4 ++-- tdeui/{kcmodule.h => tdecmodule.h} | 0 win/pro_files/tdeui/tdeui.pro | 2 +- 35 files changed, 73 insertions(+), 73 deletions(-) rename kdewidgets/pics/{kcmodule.png => tdecmodule.png} (100%) rename kio/{kcmodule.desktop => tdecmodule.desktop} (100%) rename kutils/{kcmodulecontainer.cpp => tdecmodulecontainer.cpp} (97%) rename kutils/{kcmodulecontainer.h => tdecmodulecontainer.h} (98%) rename kutils/{kcmoduleinfo.cpp => tdecmoduleinfo.cpp} (99%) rename kutils/{kcmoduleinfo.h => tdecmoduleinfo.h} (99%) rename kutils/{kcmoduleloader.cpp => tdecmoduleloader.cpp} (99%) rename kutils/{kcmoduleloader.h => tdecmoduleloader.h} (98%) rename kutils/{kcmoduleproxy.cpp => tdecmoduleproxy.cpp} (98%) rename kutils/{kcmoduleproxy.h => tdecmoduleproxy.h} (99%) rename kutils/{kcmoduleproxyIface.h => tdecmoduleproxyIface.h} (98%) rename kutils/{kcmoduleproxyIfaceImpl.cpp => tdecmoduleproxyIfaceImpl.cpp} (96%) rename kutils/{kcmoduleproxyIfaceImpl.h => tdecmoduleproxyIfaceImpl.h} (98%) rename tdeui/{kcmodule.cpp => tdecmodule.cpp} (99%) rename tdeui/{kcmodule.h => tdecmodule.h} (100%) 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 #include #include -#include -#include -#include +#include +#include +#include #include #include #include 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 similarity index 100% rename from kdewidgets/pics/kcmodule.png rename to 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 similarity index 100% rename from kio/kcmodule.desktop rename to 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 #include -#include +#include #include 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 +#include 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 #include -#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 #include #include -#include +#include #include #include #include #include #include -#include -#include "kcmoduleinfo.h" -#include "kcmoduleloader.h" +#include +#include "tdecmoduleinfo.h" +#include "tdecmoduleloader.h" #include #include #include "kplugininfo.h" #include #include #include -#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 #include #include -#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 +#include #include class KPluginSelector; diff --git a/kutils/kcmodulecontainer.cpp b/kutils/tdecmodulecontainer.cpp similarity index 97% rename from kutils/kcmodulecontainer.cpp rename to kutils/tdecmodulecontainer.cpp index b91ffb641..04cbf6751 100644 --- a/kutils/kcmodulecontainer.cpp +++ b/kutils/tdecmodulecontainer.cpp @@ -24,10 +24,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -36,8 +36,8 @@ #include #include -#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 similarity index 98% rename from kutils/kcmodulecontainer.h rename to kutils/tdecmodulecontainer.h index 956b23efd..5708f80cf 100644 --- a/kutils/kcmodulecontainer.h +++ b/kutils/tdecmodulecontainer.h @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include 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 similarity index 99% rename from kutils/kcmoduleinfo.cpp rename to kutils/tdecmoduleinfo.cpp index c1892df36..3a7fdfd63 100644 --- a/kutils/kcmoduleinfo.cpp +++ b/kutils/tdecmoduleinfo.cpp @@ -29,7 +29,7 @@ #include #include -#include "kcmoduleinfo.h" +#include "tdecmoduleinfo.h" class TDECModuleInfo::TDECModuleInfoPrivate { diff --git a/kutils/kcmoduleinfo.h b/kutils/tdecmoduleinfo.h similarity index 99% rename from kutils/kcmoduleinfo.h rename to 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 similarity index 99% rename from kutils/kcmoduleloader.cpp rename to kutils/tdecmoduleloader.cpp index da31a72c2..c661ac22f 100644 --- a/kutils/kcmoduleloader.cpp +++ b/kutils/tdecmoduleloader.cpp @@ -31,7 +31,7 @@ #include #include -#include "kcmoduleloader.h" +#include "tdecmoduleloader.h" /***************************************************************/ diff --git a/kutils/kcmoduleloader.h b/kutils/tdecmoduleloader.h similarity index 98% rename from kutils/kcmoduleloader.h rename to 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 -#include +#include +#include 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 similarity index 98% rename from kutils/kcmoduleproxy.cpp rename to kutils/tdecmoduleproxy.cpp index df6b2bb98..673074c16 100644 --- a/kutils/kcmoduleproxy.cpp +++ b/kutils/tdecmoduleproxy.cpp @@ -37,9 +37,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -50,9 +50,9 @@ #include -#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 similarity index 99% rename from kutils/kcmoduleproxy.h rename to 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 similarity index 98% rename from kutils/kcmoduleproxyIface.h rename to kutils/tdecmoduleproxyIface.h index 5bf24ac91..22bfa8e52 100644 --- a/kutils/kcmoduleproxyIface.h +++ b/kutils/tdecmoduleproxyIface.h @@ -23,7 +23,7 @@ #include /** - * @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 similarity index 96% rename from kutils/kcmoduleproxyIfaceImpl.cpp rename to kutils/tdecmoduleproxyIfaceImpl.cpp index 5e1ca4986..53019f72f 100644 --- a/kutils/kcmoduleproxyIfaceImpl.cpp +++ b/kutils/tdecmoduleproxyIfaceImpl.cpp @@ -22,10 +22,10 @@ #include #include -#include +#include #include -#include "kcmoduleproxyIfaceImpl.h" +#include "tdecmoduleproxyIfaceImpl.h" #include @@ -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 similarity index 98% rename from kutils/kcmoduleproxyIfaceImpl.h rename to 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 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 similarity index 99% rename from tdeui/kcmodule.cpp rename to tdeui/tdecmodule.cpp index 904c1cdc4..0b1b4f5fb 100644 --- a/tdeui/kcmodule.cpp +++ b/tdeui/tdecmodule.cpp @@ -31,8 +31,8 @@ #include #include -#include "kcmodule.h" -#include "kcmodule.moc" +#include "tdecmodule.h" +#include "tdecmodule.moc" class TDECModulePrivate { diff --git a/tdeui/kcmodule.h b/tdeui/tdecmodule.h similarity index 100% rename from tdeui/kcmodule.h rename to 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 \