Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

5 files changed, 11 insertions, 11 deletions

diff --git a/kttsd/kcmkttsmgr/kcmkttsd.desktop b/kttsd/kcmkttsmgr/kcmkttsd.desktop
index 2348b29..20e2544 100644
--- a/kttsd/kcmkttsmgr/kcmkttsd.desktop
+++ b/kttsd/kcmkttsmgr/kcmkttsd.desktop
@@ -91,7 +91,7 @@ Comment[tr]=Metinden Konuşmaya Kontrol Modülü
 Comment[uk]=Модуль керування синтезом мовлення з тексту
 Comment[vi]=Mô đun Điều khiển Văn bản sang Tiếng nói
 Comment[zh_TW]=文字轉語音控制模組
-ServiceTypes=Application,KCModule
+ServiceTypes=Application,TDECModule
 DocPath=kttsd
 NoDisplay=false
 StartupNotify=false
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index 46a395e..e9cbd86 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -107,7 +107,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kttsd, KCMKttsMgrFactory("kttsd") )
 KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &) :
     DCOPStub("kttsd", "KSpeech"),
     DCOPObject("kcmkttsmgr_kspeechsink"),
-    KCModule(KCMKttsMgrFactory::instance(), parent, name)
+    TDECModule(KCMKttsMgrFactory::instance(), parent, name)
 {
     // kdDebug() << "KCMKttsMgr contructor running." << endl;
 
@@ -240,7 +240,7 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &)
     m_kttsmgrw->keepAudioPath->setURL(locateLocal("data", "kttsd/audio/"));
 
     // Object for the KTTSD configuration.
-    m_config = new KConfig("kttsdrc");
+    m_config = new TDEConfig("kttsdrc");
 
     // Load configuration.
     load();
@@ -1059,7 +1059,7 @@ void KCMKttsMgr::init(){
 */
 int KCMKttsMgr::buttons() {
     // kdDebug() << "KCMKttsMgr::buttons: Running"<< endl;
-    return KCModule::Ok|KCModule::Apply|KCModule::Help|KCModule::Default;
+    return TDECModule::Ok|TDECModule::Apply|TDECModule::Help|TDECModule::Default;
 }
 
 /**
@@ -2707,7 +2707,7 @@ KttsCheckListItem::KttsCheckListItem( TQListView *parent,
 
 /*virtual*/ /*void resizeEvent( TQResizeEvent ev )
 {
-    dynamic_cast<KCModule>(resizeEvent(ev));
+    dynamic_cast<TDECModule>(resizeEvent(ev));
     updateGeometry();
 }
 */
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.h b/kttsd/kcmkttsmgr/kcmkttsmgr.h
index be03565..57312be 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.h
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.h
@@ -41,7 +41,7 @@ class PlugInConf;
 class KttsFilterConf;
 class KListViewItem;
 class TDEAboutData;
-class KConfig;
+class TDEConfig;
 class TQPopupMenu;
 
 /**
@@ -50,7 +50,7 @@ class TQPopupMenu;
 */
 
 class KCMKttsMgr :
-    public KCModule,
+    public TDECModule,
     public KSpeech_stub,
     virtual public KSpeechSink
 {
@@ -326,7 +326,7 @@ class KCMKttsMgr :
         /**
         * Object holding all the configuration
         */
-        KConfig *m_config;
+        TDEConfig *m_config;
 
         /**
         * KTTS Job Manager.
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
index 199ce65..63ba784 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
+++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>KCMKttsMgrWidget</class>
 <author>Gary Cramblitt</author>
-<widget class="KCModule">
+<widget class="TDECModule">
     <property name="name">
         <cstring>KCMKttsMgrWidget</cstring>
     </property>
diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp
index de97a6c..685e1f7 100644
--- a/kttsd/kcmkttsmgr/selectevent.cpp
+++ b/kttsd/kcmkttsmgr/selectevent.cpp
@@ -60,7 +60,7 @@ SelectEvent::SelectEvent(TQWidget* parent, const char* name, WFlags fl, const TQ
         TQString relativePath = *it;
         if ( !relativePath.isEmpty() )
         {
-            KConfig* config = new KConfig(relativePath, true, false, "data");
+            TDEConfig* config = new TDEConfig(relativePath, true, false, "data");
             config->setGroup( TQString::fromLatin1("!Global!") );
             TQString icon = config->readEntry(TQString::fromLatin1("IconName"),
                 TQString::fromLatin1("misc"));
@@ -90,7 +90,7 @@ void SelectEvent::slotEventSrcComboBox_activated(int index)
     TQListViewItem* item = 0;
     TQString eventSrc = m_eventSrcNames[index];
     TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" );
-    KConfig* config = new KConfig( configFilename, true, false, "data" );
+    TDEConfig* config = new TDEConfig( configFilename, true, false, "data" );
     TQStringList eventNames = config->groupList();
     uint eventNamesCount = eventNames.count();
     for (uint ndx = 0; ndx < eventNamesCount; ++ndx)