summaryrefslogtreecommitdiffstats
path: root/tdemid/tdemidclient.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:32 -0600
commit793cf2dff35dffe3ec4c7b24252947dde758a1b2 (patch)
tree7d9972d99ed281a36418ae9f5fc128e3c951532c /tdemid/tdemidclient.cpp
parent04f764aaf273340e1d5811d4216dd8127cacc5db (diff)
downloadtdemultimedia-793cf2dff35dffe3ec4c7b24252947dde758a1b2.tar.gz
tdemultimedia-793cf2dff35dffe3ec4c7b24252947dde758a1b2.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdemid/tdemidclient.cpp')
-rw-r--r--tdemid/tdemidclient.cpp26
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;