summaryrefslogtreecommitdiffstats
path: root/noatun/modules/marquis
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:36 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:36 -0600
commitde9a6aa007626eba4e333ac4080cbdfcb9f98386 (patch)
tree79166818db79c0ac7acfbbb545a4929c0cd62b04 /noatun/modules/marquis
parent27430f06c6cc2187c639f59f342f07f1fde91a8b (diff)
downloadtdemultimedia-de9a6aa007626eba4e333ac4080cbdfcb9f98386.tar.gz
tdemultimedia-de9a6aa007626eba4e333ac4080cbdfcb9f98386.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'noatun/modules/marquis')
-rw-r--r--noatun/modules/marquis/marquis.cpp8
-rw-r--r--noatun/modules/marquis/marquis.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp
index 566e291d..62c959ac 100644
--- a/noatun/modules/marquis/marquis.cpp
+++ b/noatun/modules/marquis/marquis.cpp
@@ -94,7 +94,7 @@ void Marquis::restore(void)
}
// unload every window, and save the config as TQStringList of those loaded
-void Marquis::saveSessionConfig(KConfig *c)
+void Marquis::saveSessionConfig(TDEConfig *c)
{
kdDebug(66666) << k_funcinfo << endl;
@@ -135,7 +135,7 @@ void Marquis::saveSessionConfig(KConfig *c)
}
// get the list of loaded plugins from the config, and load them
-void Marquis::readSessionConfig(KConfig *c)
+void Marquis::readSessionConfig(TDEConfig *c)
{
Player *player = napp->player();
@@ -173,13 +173,13 @@ void Marquis::readSessionConfig(KConfig *c)
void Marquis::dynamicSave()
{
- KConfig config( "marquisrc" );
+ TDEConfig config( "marquisrc" );
saveSessionConfig( &config );
}
void Marquis::dynamicRestore()
{
- KConfig config( "marquisrc" );
+ TDEConfig config( "marquisrc" );
readSessionConfig( &config );
}
diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h
index c96a6bd1..d07ed297 100644
--- a/noatun/modules/marquis/marquis.h
+++ b/noatun/modules/marquis/marquis.h
@@ -43,8 +43,8 @@ public:
virtual void restore(void);
private:
- void saveSessionConfig(KConfig *);
- void readSessionConfig(KConfig *);
+ void saveSessionConfig(TDEConfig *);
+ void readSessionConfig(TDEConfig *);
private slots:
void dynamicSave();
void dynamicRestore();