From de9a6aa007626eba4e333ac4080cbdfcb9f98386 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:36 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- noatun/library/app.cpp | 38 +++++++++++++++++++------------------- noatun/library/downloader.cpp | 14 +++++++------- noatun/library/engine.cpp | 4 ++-- noatun/library/ksaver.cpp | 2 +- noatun/library/ksaver.h | 2 +- noatun/library/noatun/downloader.h | 10 +++++----- noatun/library/playlistsaver.cpp | 10 +++++----- noatun/library/pluginloader.cpp | 4 ++-- noatun/library/vequalizer.cpp | 14 +++++++------- 9 files changed, 49 insertions(+), 49 deletions(-) (limited to 'noatun/library') diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp index 3b03971b..0e1ae639 100644 --- a/noatun/library/app.cpp +++ b/noatun/library/app.cpp @@ -68,7 +68,7 @@ NoatunApp::NoatunApp() // set the default config data // TODO: Maybe a first time wizard instead? - KConfig *config=TDEGlobal::config(); // + + TDEConfig *config=TDEGlobal::config(); // + config->setGroup(TQString()); // 1 if (!config->readEntry("Modules").length()) { @@ -146,7 +146,7 @@ NoatunApp::NoatunApp() NoatunApp::~NoatunApp() { saveEngineState(); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("Volume", player()->volume()); config->writeEntry("LoopStyle", player()->loopStyle()); @@ -184,7 +184,7 @@ inline bool logicalXOR(bool A, bool B) #define READBOOLOPT_EX(name, string, def, group, reversal) \ bool NoatunApp::name() const \ { \ - KConfig *config=TDEGlobal::config(); \ + TDEConfig *config=TDEGlobal::config(); \ config->setGroup(group); \ return logicalXOR(config->readBoolEntry(string, def), reversal); \ } @@ -211,14 +211,14 @@ bool NoatunApp::clearOnStart() const int NoatunApp::startupPlayMode() const { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup(TQString()); return config->readNumEntry("StartupPlayMode", autoPlay() ? Play : Restore); } void NoatunApp::setStartupPlayMode(int mode) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("StartupPlayMode", mode); config->sync(); @@ -226,7 +226,7 @@ void NoatunApp::setStartupPlayMode(int mode) void NoatunApp::setHackUpPlaylist(bool b) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("HackUpPlaylist", b); config->sync(); @@ -237,7 +237,7 @@ void NoatunApp::setFastMixer(bool b) bool whatBefore=fastMixer(); if (whatBefore!=b) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("FastMixer", b); config->sync(); @@ -247,7 +247,7 @@ void NoatunApp::setFastMixer(bool b) void NoatunApp::setOneInstance(bool b) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup("KDE"); config->writeEntry("MultipleInstances", !b); config->sync(); @@ -255,7 +255,7 @@ void NoatunApp::setOneInstance(bool b) void NoatunApp::setLoopList(bool b) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("LoopList", b); TDEGlobal::config()->sync(); @@ -263,7 +263,7 @@ void NoatunApp::setLoopList(bool b) void NoatunApp::setAutoPlay(bool b) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("AutoPlay", b); TDEGlobal::config()->sync(); @@ -271,7 +271,7 @@ void NoatunApp::setAutoPlay(bool b) void NoatunApp::setRememberPositions(bool b) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("RememberPositions", b); TDEGlobal::config()->sync(); @@ -279,7 +279,7 @@ void NoatunApp::setRememberPositions(bool b) void NoatunApp::setSaveDirectory(const TQString &s) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writePathEntry("SaveDirectory", s); config->sync(); @@ -287,21 +287,21 @@ void NoatunApp::setSaveDirectory(const TQString &s) TQString NoatunApp::saveDirectory() const { - KConfig *c=TDEGlobal::config(); + TDEConfig *c=TDEGlobal::config(); c->setGroup(TQString()); return c->readPathEntry("SaveDirectory", TQString(getenv("HOME"))); } TQString NoatunApp::titleFormat() const { - KConfig *c=TDEGlobal::config(); + TDEConfig *c=TDEGlobal::config(); c->setGroup(TQString()); return c->readEntry("TitleFormat", "$(\"[\"author\"] - \")$(title)$(\" (\"bitrate\"kbps)\")"); } void NoatunApp::setTitleFormat(const TQString &format) { - KConfig *c=TDEGlobal::config(); + TDEConfig *c=TDEGlobal::config(); c->setGroup(TQString()); return c->writeEntry("TitleFormat", format); } @@ -313,7 +313,7 @@ void NoatunApp::setClearOnStart(bool b) void NoatunApp::setClearOnOpen(bool b) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("ClearOnOpen", b); config->sync(); @@ -321,7 +321,7 @@ void NoatunApp::setClearOnOpen(bool b) void NoatunApp::setDisplayRemaining(bool b) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("DisplayRemaining", b); config->sync(); @@ -501,7 +501,7 @@ TQImage NoatunApp::readPNG(const TQString &filename) void NoatunApp::restoreEngineState() { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup(TQString()); int state = config->readNumEntry("EngineState", Arts::posPlaying); switch (state) @@ -521,7 +521,7 @@ void NoatunApp::restoreEngineState() void NoatunApp::saveEngineState() { - KConfig* config=TDEGlobal::config(); + TDEConfig* config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("EngineState", player()->engine()->state()); // we don't sync here since it's done in the destructor afterwards anyway diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp index 7836e61b..e1e210cb 100644 --- a/noatun/library/downloader.cpp +++ b/noatun/library/downloader.cpp @@ -179,10 +179,10 @@ void Downloader::getNext() localfile=new TQFile(current->local); localfile->open(IO_ReadWrite | IO_Append); - mJob= KIO::get(current->file, true, false); - connect(mJob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), TQT_SLOT(data(KIO::Job*, const TQByteArray&))); - connect(mJob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(jobDone(KIO::Job*))); - connect(mJob, TQT_SIGNAL(percent(KIO::Job*, unsigned long)), TQT_SLOT(percent(KIO::Job*, unsigned long))); + mJob= TDEIO::get(current->file, true, false); + connect(mJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), TQT_SLOT(data(TDEIO::Job*, const TQByteArray&))); + connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(jobDone(TDEIO::Job*))); + connect(mJob, TQT_SIGNAL(percent(TDEIO::Job*, unsigned long)), TQT_SLOT(percent(TDEIO::Job*, unsigned long))); if (mTimeout) delete mTimeout; @@ -191,7 +191,7 @@ void Downloader::getNext() connect(mTimeout, TQT_SIGNAL(timeout()), TQT_SLOT(giveUpWithThisDownloadServerIsRunningNT())); } -void Downloader::data(KIO::Job *, const TQByteArray &data) +void Downloader::data(TDEIO::Job *, const TQByteArray &data) { localfile->writeBlock(data); localfile->flush(); @@ -199,7 +199,7 @@ void Downloader::data(KIO::Job *, const TQByteArray &data) mTimeout=0; } -void Downloader::jobDone(KIO::Job *) +void Downloader::jobDone(TDEIO::Job *) { delete mTimeout; mTimeout=0; @@ -226,7 +226,7 @@ void Downloader::giveUpWithThisDownloadServerIsRunningNT() getNext(); } -void Downloader::percent( KIO::Job *, unsigned long percent) +void Downloader::percent( TDEIO::Job *, unsigned long percent) { if (current && current->notifier) current->notifier->downloaded((int)percent); diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp index 5cfd23ed..86c10381 100644 --- a/noatun/library/engine.cpp +++ b/noatun/library/engine.cpp @@ -462,7 +462,7 @@ bool Engine::initArts() { // aRts seems not to be running, let's try to run it // First, let's read the configuration as in kcmarts - KConfig config("kcmartsrc"); + TDEConfig config("kcmartsrc"); TQCString cmdline; config.setGroup("Arts"); @@ -472,7 +472,7 @@ bool Engine::initArts() // put the value of x11Comm into .mcoprc { - KConfig X11CommConfig(TQDir::homeDirPath()+"/.mcoprc"); + TDEConfig X11CommConfig(TQDir::homeDirPath()+"/.mcoprc"); if(x11Comm) X11CommConfig.writeEntry("GlobalComm", "Arts::X11GlobalComm"); diff --git a/noatun/library/ksaver.cpp b/noatun/library/ksaver.cpp index 40b3606c..f787c585 100644 --- a/noatun/library/ksaver.cpp +++ b/noatun/library/ksaver.cpp @@ -115,7 +115,7 @@ bool Noatun::KSaver::close(void) d->textStream = 0; d->dataStream = 0; - bool retval = KIO::NetAccess::upload(d->tempFile->name(), d->url); + bool retval = TDEIO::NetAccess::upload(d->tempFile->name(), d->url); delete d->tempFile; d->tempFile = 0; diff --git a/noatun/library/ksaver.h b/noatun/library/ksaver.h index 91fc4af8..f9da43e2 100644 --- a/noatun/library/ksaver.h +++ b/noatun/library/ksaver.h @@ -42,7 +42,7 @@ class KSaver public: /** * The constructor takes the url and decides the best way to save, - * which will mean using something like KIO::NetAccess or TQFile. + * which will mean using something like TDEIO::NetAccess or TQFile. */ KSaver(const KURL &_target); diff --git a/noatun/library/noatun/downloader.h b/noatun/library/noatun/downloader.h index 19b1d30d..093b57d0 100644 --- a/noatun/library/noatun/downloader.h +++ b/noatun/library/noatun/downloader.h @@ -10,7 +10,7 @@ class TQTimer; class Downloader; -namespace KIO +namespace TDEIO { class TransferJob; class Job; @@ -102,9 +102,9 @@ signals: private slots: void getNext(); - void data( KIO::Job *, const TQByteArray &data); - void percent( KIO::Job *, unsigned long percent); - void jobDone( KIO::Job *); + void data( TDEIO::Job *, const TQByteArray &data); + void percent( TDEIO::Job *, unsigned long percent); + void jobDone( TDEIO::Job *); void giveUpWithThisDownloadServerIsRunningNT(); private: @@ -112,7 +112,7 @@ private: TQPtrList *mUnstartedQueue; TQFile *localfile; Downloader::QueueItem *current; - KIO::TransferJob *mJob; + TDEIO::TransferJob *mJob; TQTimer *mTimeout; bool mStarted; }; diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp index dbb91766..49c6084b 100644 --- a/noatun/library/playlistsaver.cpp +++ b/noatun/library/playlistsaver.cpp @@ -440,7 +440,7 @@ bool PlaylistSaver::loadXML(const KURL &url, int opt) "file='" << url.url() << "', opt=" << opt << endl; TQString dest; - if(KIO::NetAccess::download(url, dest, 0L)) + if(TDEIO::NetAccess::download(url, dest, 0L)) { TQFile file(dest); if (!file.open(IO_ReadOnly)) @@ -479,7 +479,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) kdDebug(66666) << k_funcinfo << "file='" << file.path() << endl; TQString localFile; - if(!KIO::NetAccess::download(file, localFile, 0L)) + if(!TDEIO::NetAccess::download(file, localFile, 0L)) return false; // if it's a PLS, transfer control, again (KIO bug?) @@ -616,7 +616,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) prop.clear(); } // END while() - KIO::NetAccess::removeTempFile(localFile); + TDEIO::NetAccess::removeTempFile(localFile); // kdDebug(66666) << k_funcinfo << "END" << endl; return true; @@ -678,7 +678,7 @@ bool PlaylistSaver::saveM3U(const KURL &file, int opt) } saver.close(); - KIO::NetAccess::upload(local, file, 0L); + TDEIO::NetAccess::upload(local, file, 0L); saver.remove(); return true; } @@ -698,7 +698,7 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/) kdDebug(66666) << k_funcinfo << "file='" << file.path() << endl; TQString localFile; - if(!KIO::NetAccess::download(file, localFile, 0L)) + if(!TDEIO::NetAccess::download(file, localFile, 0L)) return false; TQFile checkFile(localFile); diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp index f715590a..4ba9ce3d 100644 --- a/noatun/library/pluginloader.cpp +++ b/noatun/library/pluginloader.cpp @@ -69,7 +69,7 @@ TQPtrList LibraryLoader::plugins() const bool LibraryLoader::loadAll() { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup(""); TQStringList modules = config->readListEntry("Modules"); return loadAll(modules); @@ -221,7 +221,7 @@ void LibraryLoader::add(const TQString &spec) void LibraryLoader::setModules(const TQStringList &mods) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup(0); config->writeEntry("Modules", mods); config->sync(); diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp index 76c2215d..08895643 100644 --- a/noatun/library/vequalizer.cpp +++ b/noatun/library/vequalizer.cpp @@ -323,7 +323,7 @@ void VEqualizer::init() } else { - KConfig *config=kapp->config(); + TDEConfig *config=kapp->config(); config->setGroup("Equalizer"); setEnabled(config->readBoolEntry("enabled", false)); } @@ -535,7 +535,7 @@ void VEqualizer::setEnabled(bool e) { update(true); // just in case ETQBACK->enabled((long)e); - KConfig *config=kapp->config(); + TDEConfig *config=kapp->config(); config->setGroup("Equalizer"); config->writeEntry("enabled", e); config->sync(); @@ -586,7 +586,7 @@ bool VEqualizer::save(const KURL &filename, const TQString &friendly) const bool VEqualizer::load(const KURL &filename) { TQString dest; - if(KIO::NetAccess::download(filename, dest, 0L)) + if(TDEIO::NetAccess::download(filename, dest, 0L)) { TQFile file(dest); if (!file.open(IO_ReadOnly)) @@ -698,7 +698,7 @@ VPreset VEqualizer::createPreset(const TQString &name, bool smart) preset.setName(nameReal); save(preset.file(), nameReal); - KConfig *config=kapp->config(); + TDEConfig *config=kapp->config(); config->setGroup("Equalizer"); TQStringList list = config->readListEntry("presets"); list += preset.file(); @@ -712,7 +712,7 @@ VPreset VEqualizer::createPreset(const TQString &name, bool smart) TQValueList VEqualizer::presets() const { - KConfig *conf=TDEGlobal::config(); + TDEConfig *conf=TDEGlobal::config(); conf->setGroup("Equalizer"); TQStringList list; @@ -761,7 +761,7 @@ VPreset VEqualizer::presetByName(const TQString &name) VPreset VEqualizer::presetByFile(const TQString &file) { - KConfig *conf=TDEGlobal::config(); + TDEConfig *conf=TDEGlobal::config(); conf->setGroup("Equalizer"); TQStringList list=kapp->config()->readListEntry("presets"); if (list.contains(file)) @@ -911,7 +911,7 @@ TQString VPreset::file() const void VPreset::remove() { - KConfig *config=kapp->config(); + TDEConfig *config=kapp->config(); config->setGroup("Equalizer"); TQStringList items=config->readListEntry("presets"); items.remove(file()); -- cgit v1.2.1