Fix FTBFS resulting from KCModule rename

pull/16/head
Timothy Pearson 12 years ago
parent c56660aff3
commit b7658a0d5e

@ -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>

@ -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

@ -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 \

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

@ -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} )

@ -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)

@ -23,7 +23,7 @@
#include <tqstringlist.h>
#include <tqptrlist.h>
#include <kcmodule.h>
#include <tdecmodule.h>
#include <kconfig.h>
class KTimerDialog;

@ -22,7 +22,7 @@
#ifndef KRESOURCES_KCMKRESOURCES_H
#define KRESOURCES_KCMKRESOURCES_H
#include <kcmodule.h>
#include <tdecmodule.h>
class KRESOURCES_EXPORT KCMKResources : public TDECModule
{

@ -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

@ -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

@ -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.
*/

@ -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"

@ -33,7 +33,7 @@ class TDECModuleProxy;
class TDECModuleInfo;
/**
* @ingroup kcmodule
* @ingroup tdecmodule
* @short A method that offers a KDialogBase containing arbitrary
* KControl Modules.
*

@ -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.

@ -33,7 +33,7 @@
#include <kiconloader.h>
#include <tqvbox.h>
#include <tqlabel.h>
#include "kcmoduleinfo.h"
#include "tdecmoduleinfo.h"
namespace KSettings
{

@ -20,7 +20,7 @@
#ifndef KSETTINGS_PLUGINPAGE_H
#define KSETTINGS_PLUGINPAGE_H
#include <kcmodule.h>
#include <tdecmodule.h>
#include <tdelibs_export.h>
class KPluginSelector;

@ -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

@ -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

@ -29,7 +29,7 @@
#include <kstandarddirs.h>
#include <klocale.h>
#include "kcmoduleinfo.h"
#include "tdecmoduleinfo.h"
class TDECModuleInfo::TDECModuleInfoPrivate
{

@ -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

@ -31,7 +31,7 @@
#include <kmessagebox.h>
#include <kparts/componentfactory.h>
#include "kcmoduleloader.h"
#include "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

@ -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

@ -34,7 +34,7 @@ class TDEInstance;
class TDEProcess;
/**
* @ingroup kcmodule
* @ingroup tdecmodule
*
* @brief Encapsulates a TDECModule for embedding.
*

@ -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

@ -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"

@ -19,7 +19,7 @@
#ifndef __KCMODULEPROXYIFACEIMPL_H__
#define __KCMODULEPROXYIFACEIMPL_H__
#include "kcmoduleproxyIface.h"
#include "tdecmoduleproxyIface.h"
class TDECModuleProxy;

@ -95,7 +95,7 @@
1402 khc_indexbuilder
1420 kikbd
1421 ki18b_keys (kcmodule)
1421 ki18b_keys (tdecmodule)
1430 nspluginviewer (Qt/Xt)
1431 nspluginviewer (plugin)

@ -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

@ -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>

@ -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 \

@ -31,8 +31,8 @@
#include <kinstance.h>
#include <klocale.h>
#include "kcmodule.h"
#include "kcmodule.moc"
#include "tdecmodule.h"
#include "tdecmodule.moc"
class TDECModulePrivate
{

@ -30,7 +30,7 @@ kbugreport.cpp \
kbuttonbox.cpp \
kcharselect.cpp \
kcmenumngr.cpp \
kcmodule.cpp \
tdecmodule.cpp \
kcolorbutton.cpp \
kcolorcombo.cpp \
kcolordialog.cpp \

Loading…
Cancel
Save