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

9 files changed, 22 insertions, 22 deletions

diff --git a/tdemid/channel.cpp b/tdemid/channel.cpp
index 97fc5133..c97ea5c9 100644
--- a/tdemid/channel.cpp
+++ b/tdemid/channel.cpp
@@ -30,7 +30,7 @@
 
 #include <kglobal.h>
 #include <kinstance.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include "tdemidbutton.h"
diff --git a/tdemid/channelview.cpp b/tdemid/channelview.cpp
index bf1ebf55..d97fdee9 100644
--- a/tdemid/channelview.cpp
+++ b/tdemid/channelview.cpp
@@ -28,7 +28,7 @@
 #include "channelview.h"
 #include "channel3d.h"
 #include "channel4d.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 ChannelView::ChannelView(void) : KMainWindow(0, "ChannelView")
diff --git a/tdemid/collectdlg.cpp b/tdemid/collectdlg.cpp
index 20ac8def..0e4a84fe 100644
--- a/tdemid/collectdlg.cpp
+++ b/tdemid/collectdlg.cpp
@@ -26,7 +26,7 @@
 #include <tqlabel.h>
 
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
diff --git a/tdemid/kdisptext.cpp b/tdemid/kdisptext.cpp
index edaede4a..3152a277 100644
--- a/tdemid/kdisptext.cpp
+++ b/tdemid/kdisptext.cpp
@@ -28,7 +28,7 @@
 #include <tqrect.h>
 #include <tqtextcodec.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kinstance.h>
diff --git a/tdemid/main.cpp b/tdemid/main.cpp
index a35647e0..77a09e73 100644
--- a/tdemid/main.cpp
+++ b/tdemid/main.cpp
@@ -30,7 +30,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 
diff --git a/tdemid/midicfgdlg.cpp b/tdemid/midicfgdlg.cpp
index 46577c28..3724abcf 100644
--- a/tdemid/midicfgdlg.cpp
+++ b/tdemid/midicfgdlg.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <libtdemid/deviceman.h>
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;
diff --git a/tdemid/tdemidclient.h b/tdemid/tdemidclient.h
index 526b0656..5a6ee79b 100644
--- a/tdemid/tdemidclient.h
+++ b/tdemid/tdemidclient.h
@@ -38,7 +38,7 @@
 #include "version.h"
 #include "tdemidIface.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class DeviceManager;
 
diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp
index cbadbc73..edcfbfe0 100644
--- a/tdemid/tdemidframe.cpp
+++ b/tdemid/tdemidframe.cpp
@@ -33,9 +33,9 @@
 
 #include <kaccel.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcmdlineargs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfontdialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>