summaryrefslogtreecommitdiffstats
path: root/kontact/src/kcmkontact.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kontact/src/kcmkontact.cpp
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kontact/src/kcmkontact.cpp')
-rw-r--r--kontact/src/kcmkontact.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 9e46eef2d..96101ec00 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -42,7 +42,7 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kontactconfig( TQWidget *parent, const char * ) {
+ KDE_EXPORT TDECModule *create_kontactconfig( TQWidget *parent, const char * ) {
return new KcmKontact( parent, "kcmkontact" );
}
}
@@ -100,7 +100,7 @@ const TDEAboutData* KcmKontact::aboutData() const
}
-PluginSelection::PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent )
+PluginSelection::PluginSelection( TDEConfigSkeleton::ItemString *item, TQWidget *parent )
{
mItem = item;
mPluginCombo = new TQComboBox( parent );