From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:37:21 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 korganizer/koprefsdialog.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'korganizer/koprefsdialog.cpp')

diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 54ca4dfc8..06ecccd33 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -138,7 +138,7 @@ void KOPrefsDialogMain::toggleEmailSettings( bool on )
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_korganizerconfigmain( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_korganizerconfigmain( TQWidget *parent, const char * )
   {
     return new KOPrefsDialogMain( parent, "kcmkorganizermain" );
   }
@@ -479,7 +479,7 @@ class KOPrefsDialogTime : public KPrefsModule
 
 extern "C"
 {
-  KCModule *create_korganizerconfigtime( TQWidget *parent, const char * )
+  TDECModule *create_korganizerconfigtime( TQWidget *parent, const char * )
   {
     TDEGlobal::locale()->insertCatalogue( "timezones" );
     return new KOPrefsDialogTime( parent, "kcmkorganizertime" );
@@ -579,7 +579,7 @@ class KOPrefsDialogViews : public KPrefsModule
 
 extern "C"
 {
-  KCModule *create_korganizerconfigviews( TQWidget *parent, const char * )
+  TDECModule *create_korganizerconfigviews( TQWidget *parent, const char * )
   {
     return new KOPrefsDialogViews( parent, "kcmkorganizerviews" );
   }
@@ -639,7 +639,7 @@ class KOPrefsDialogFonts : public KPrefsModule
 
 extern "C"
 {
-  KCModule *create_korganizerconfigfonts( TQWidget *parent, const char * )
+  TDECModule *create_korganizerconfigfonts( TQWidget *parent, const char * )
   {
     return new KOPrefsDialogFonts( parent, "kcmkorganizerfonts" );
   }
@@ -842,7 +842,7 @@ void KOPrefsDialogColors::updateResourceColor()
 }
 extern "C"
 {
-  KCModule *create_korganizerconfigcolors( TQWidget *parent, const char * )
+  TDECModule *create_korganizerconfigcolors( TQWidget *parent, const char * )
   {
     return new KOPrefsDialogColors( parent, "kcmkorganizercolors" );
   }
@@ -1005,7 +1005,7 @@ void KOPrefsDialogGroupScheduling::updateInput()
 
 extern "C"
 {
-  KCModule *create_korganizerconfiggroupscheduling( TQWidget *parent,
+  TDECModule *create_korganizerconfiggroupscheduling( TQWidget *parent,
                                                      const char * )
   {
     return new KOPrefsDialogGroupScheduling( parent,
@@ -1063,13 +1063,13 @@ void KOPrefsDialogGroupwareScheduling::usrWriteConfig()
 
   // clear the url cache for our user
   TQString configFile = locateLocal( "data", "korganizer/freebusyurls" );
-  KConfig cfg( configFile );
+  TDEConfig cfg( configFile );
   cfg.deleteGroup( KOPrefs::instance()->email() );
 }
 
 extern "C"
 {
-  KCModule *create_korganizerconfigfreebusy( TQWidget *parent, const char * )
+  TDECModule *create_korganizerconfigfreebusy( TQWidget *parent, const char * )
   {
     return new KOPrefsDialogGroupwareScheduling( parent,
                                                  "kcmkorganizerfreebusy" );
@@ -1210,7 +1210,7 @@ void KOPrefsDialogPlugins::selectionChanged( TQListViewItem *i )
 
 extern "C"
 {
-  KCModule *create_korganizerconfigplugins( TQWidget *parent, const char * )
+  TDECModule *create_korganizerconfigplugins( TQWidget *parent, const char * )
   {
     return new KOPrefsDialogPlugins( parent,
                                      "kcmkorganizerplugins" );
@@ -1220,7 +1220,7 @@ extern "C"
 
 extern "C"
 {
-  KCModule *create_korgdesignerfields( TQWidget *parent, const char * ) {
+  TDECModule *create_korgdesignerfields( TQWidget *parent, const char * ) {
     return new KOPrefsDesignerFields( parent, "kcmkorgdesignerfields" );
   }
 }
-- 
cgit v1.2.1