summaryrefslogtreecommitdiffstats
path: root/noatun-plugins/lyrics
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:28:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:28:24 -0600
commit20de04ce44f63fb911103d7870d39d2782d14cda (patch)
treebddd13cef2fae98892caf538dc64b5357732c517 /noatun-plugins/lyrics
parent4c097708c4cc24f3b8e4c21f14644f5715767d47 (diff)
downloadtdeaddons-20de04ce44f63fb911103d7870d39d2782d14cda.tar.gz
tdeaddons-20de04ce44f63fb911103d7870d39d2782d14cda.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'noatun-plugins/lyrics')
-rw-r--r--noatun-plugins/lyrics/cmodule.cpp4
-rw-r--r--noatun-plugins/lyrics/lyrics.cpp8
-rw-r--r--noatun-plugins/lyrics/lyrics.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 1f94dcd..3d5f677 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -178,7 +178,7 @@ void LyricsCModule::queryChanged( const TQString &query ) {
void LyricsCModule::save() {
- KConfig *conf = TDEGlobal::config();
+ TDEConfig *conf = TDEGlobal::config();
conf->setGroup( "Lyrics" );
TQStringList queryList, nameList;
TQValueVector<SearchProvider>::iterator it;
@@ -197,7 +197,7 @@ void LyricsCModule::save() {
void LyricsCModule::reopen() {
TQStringList queryList, nameList;
- KConfig *conf = TDEGlobal::config();
+ TDEConfig *conf = TDEGlobal::config();
mProviders.clear();
providersBox->clear();
kdDebug(90020) << "config read" << endl;
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index 9fa4921..cd6754b 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -54,7 +54,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
/* Connect signals/slots */
connect( htmlpart->browserExtension(), TQT_SIGNAL(openURLRequestDelayed( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs & )));
- connect( htmlpart, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(loadingURL(KIO::Job *)) );
+ connect( htmlpart, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(loadingURL(TDEIO::Job *)) );
connect( htmlpart, TQT_SIGNAL(completed()), this, TQT_SLOT(loadedURL()) );
connect( history, TQT_SIGNAL(uiChanged(int, bool)), this, TQT_SLOT(changeUI(int, bool)) );
connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()) );
@@ -69,7 +69,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
setAutoSaveSettings("Lyrics");
/* Load configuration */
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("Lyrics");
follow_act->setChecked(config->readBoolEntry("follow", true));
/* Create config object */
@@ -112,7 +112,7 @@ void Lyrics::attach(bool a) {
}
}
-void Lyrics::loadingURL(KIO::Job *)
+void Lyrics::loadingURL(TDEIO::Job *)
{
statusBar()->changeItem(i18n("Loading..."), 0);
}
@@ -245,7 +245,7 @@ void Lyrics::openURLRequest( const KURL &url, const KParts::URLArgs & )
Lyrics::~Lyrics()
{
/* Save configurations */
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("Lyrics");
config->writeEntry("follow", follow_act->isChecked());
// Force saving, as closeEvent is probably never called
diff --git a/noatun-plugins/lyrics/lyrics.h b/noatun-plugins/lyrics/lyrics.h
index 8da656c..c41e186 100644
--- a/noatun-plugins/lyrics/lyrics.h
+++ b/noatun-plugins/lyrics/lyrics.h
@@ -33,7 +33,7 @@ protected:
protected slots:
void changeUI(int, bool);
void openURLRequest( const KURL &, const KParts::URLArgs & );
- void loadingURL(KIO::Job *);
+ void loadingURL(TDEIO::Job *);
void loadedURL();
void attach(bool);
void newSong();