Rename a number of libraries and executables to avoid conflicts with KDE4

1 files changed, 13 insertions, 13 deletions

diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp
index ba85e438..07edf700 100644
--- a/tdemid/tdemidclient.cpp
+++ b/tdemid/tdemidclient.cpp
@@ -39,7 +39,7 @@
 
 #include <kapplication.h>
 #include <kcharsets.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -79,11 +79,11 @@ tdemidClient::tdemidClient(TQWidget *parent, KActionCollection *ac, const char *
     noteArray=0L;
     shuttingdown=false;
 
-    TDEConfig *kconf=TDEGlobal::instance()->config();
+    TDEConfig *tdeconf=TDEGlobal::instance()->config();
 
-    kconf->setGroup("KMid");
+    tdeconf->setGroup("KMid");
     TQString tmp2 = locateLocal("appdata", "collections");
-    collectionsfile=kconf->readPathEntry("CollectionsFile",tmp2);
+    collectionsfile=tdeconf->readPathEntry("CollectionsFile",tmp2);
     slman=new SLManager();
     slman->loadConfig(TQFile::encodeName(collectionsfile));
     currentsl=NULL;
@@ -174,16 +174,16 @@ tdemidClient::tdemidClient(TQWidget *parent, KActionCollection *ac, const char *
     }
 
 
-    kconf->setGroup("KMid");
-    int mididev=kconf->readNumEntry("MidiPortNumber",-1);
+    tdeconf->setGroup("KMid");
+    int mididev=tdeconf->readNumEntry("MidiPortNumber",-1);
 
     midi = new DeviceManager(mididev);
     midi->initManager();
     m_kMid.midi=midi;
     player= new MidiPlayer(midi,m_kMid.pctl);
 
-    kconf->setGroup("Midimapper");
-    TQCString qs=TQFile::encodeName(kconf->readPathEntry("Loadfile","gm.map"));
+    tdeconf->setGroup("Midimapper");
+    TQCString qs=TQFile::encodeName(tdeconf->readPathEntry("Loadfile","gm.map"));
 
 #ifdef KMidDEBUG
     printf("Read Config file: %s\n",qs.data());
@@ -191,8 +191,8 @@ tdemidClient::tdemidClient(TQWidget *parent, KActionCollection *ac, const char *
     setMidiMapFilename(qs.data());
 
     initializing_songs=1;
-    kconf->setGroup("KMid");
-    setActiveCollection(kconf->readNumEntry("ActiveCollection",0));
+    tdeconf->setGroup("KMid");
+    setActiveCollection(tdeconf->readNumEntry("ActiveCollection",0));
     initializing_songs=0;
 
     TQVBoxLayout *lv=new TQVBoxLayout( this );
@@ -1208,10 +1208,10 @@ void tdemidClient::setSLManager(SLManager *slm)
 void tdemidClient::setActiveCollection(int i)
 {
     activecollection=i;
-    TDEConfig *kconf=TDEGlobal::instance()->config();
+    TDEConfig *tdeconf=TDEGlobal::instance()->config();
 
-    kconf->setGroup("KMid");
-    kconf->writeEntry("ActiveCollection",activecollection);
+    tdeconf->setGroup("KMid");
+    tdeconf->writeEntry("ActiveCollection",activecollection);
     currentsl=slman->getCollection(activecollection);
     generateCPL();
     initializing_songs=1;