Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

6 files changed, 41 insertions, 41 deletions

diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index 2db96950..3b03971b 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=KGlobal::config(); // +
+	KConfig *config=TDEGlobal::config(); // +
 	config->setGroup(TQString()); // 1
 	if (!config->readEntry("Modules").length())
 	{
@@ -146,7 +146,7 @@ NoatunApp::NoatunApp()
 NoatunApp::~NoatunApp()
 {
 	saveEngineState();
-	KConfig *config = KGlobal::config();
+	KConfig *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=KGlobal::config(); \
+	KConfig *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=KGlobal::config();
+	KConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	return config->readNumEntry("StartupPlayMode", autoPlay() ? Play : Restore);
 }
 
 void NoatunApp::setStartupPlayMode(int mode)
 {
-	KConfig *config=KGlobal::config();
+	KConfig *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=KGlobal::config();
+	KConfig *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=KGlobal::config();
+		KConfig *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=KGlobal::config();
+	KConfig *config=TDEGlobal::config();
 	config->setGroup("KDE");
 	config->writeEntry("MultipleInstances", !b);
 	config->sync();
@@ -255,31 +255,31 @@ void NoatunApp::setOneInstance(bool b)
 
 void NoatunApp::setLoopList(bool b)
 {
-	KConfig *config=KGlobal::config();
+	KConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("LoopList", b);
-	KGlobal::config()->sync();
+	TDEGlobal::config()->sync();
 }
 
 void NoatunApp::setAutoPlay(bool b)
 {
-	KConfig *config=KGlobal::config();
+	KConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("AutoPlay", b);
-	KGlobal::config()->sync();
+	TDEGlobal::config()->sync();
 }
 
 void NoatunApp::setRememberPositions(bool b)
 {
-	KConfig *config=KGlobal::config();
+	KConfig *config=TDEGlobal::config();
 	config->setGroup(TQString());
 	config->writeEntry("RememberPositions", b);
-	KGlobal::config()->sync();
+	TDEGlobal::config()->sync();
 }
 
 void NoatunApp::setSaveDirectory(const TQString &s)
 {
-	KConfig *config=KGlobal::config();
+	KConfig *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=KGlobal::config();
+	KConfig *c=TDEGlobal::config();
 	c->setGroup(TQString());
 	return c->readPathEntry("SaveDirectory", TQString(getenv("HOME")));
 }
 
 TQString NoatunApp::titleFormat() const
 {
-	KConfig *c=KGlobal::config();
+	KConfig *c=TDEGlobal::config();
 	c->setGroup(TQString());
 	return c->readEntry("TitleFormat", "$(\"[\"author\"] - \")$(title)$(\" (\"bitrate\"kbps)\")");
 }
 
 void NoatunApp::setTitleFormat(const TQString &format)
 {
-	KConfig *c=KGlobal::config();
+	KConfig *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=KGlobal::config();
+	KConfig *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=KGlobal::config();
+	KConfig *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 = KGlobal::config();
+	KConfig* 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=KGlobal::config();
+	KConfig* 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/noatun/plugin.h b/noatun/library/noatun/plugin.h
index 14b53ec8..23b6e481 100644
--- a/noatun/library/noatun/plugin.h
+++ b/noatun/library/noatun/plugin.h
@@ -77,7 +77,7 @@ class TimerThingy;
  * then exec() to be able to use this.
  * Its perfectly safe to create
  * a visualization in a binary executed by
- * KProcess.
+ * TDEProcess.
  **/
 class Visualization
 {
diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp
index b1ea94d5..add75782 100644
--- a/noatun/library/noatuntags/tags.cpp
+++ b/noatun/library/noatuntags/tags.cpp
@@ -21,14 +21,14 @@ TagsGetter::TagsGetter()
 
 int TagsGetter::interval() const
 {
-	KGlobal::config()->setGroup("Tags");
-	return KGlobal::config()->readNumEntry("interval", 250);
+	TDEGlobal::config()->setGroup("Tags");
+	return TDEGlobal::config()->readNumEntry("interval", 250);
 }
 
 bool TagsGetter::loadAuto() const
 {
-	KGlobal::config()->setGroup("Tags");
-	return KGlobal::config()->readBoolEntry("LoadAuto", true);
+	TDEGlobal::config()->setGroup("Tags");
+	return TDEGlobal::config()->readBoolEntry("LoadAuto", true);
 }
 
 void TagsGetter::added(PlaylistItem &i)
@@ -93,17 +93,17 @@ void TagsGetter::setInterval(int ms)
 	killTimers();
 	startTimer(ms);
 	
-	KGlobal::config()->setGroup("Tags");
-	KGlobal::config()->writeEntry("interval", ms);
-	KGlobal::config()->sync();
+	TDEGlobal::config()->setGroup("Tags");
+	TDEGlobal::config()->writeEntry("interval", ms);
+	TDEGlobal::config()->sync();
 }
 
 void TagsGetter::setLoadAuto(bool eh)
 {
 	
-	KGlobal::config()->setGroup("Tags");
-	KGlobal::config()->writeEntry("LoadAuto", eh);
-	KGlobal::config()->sync();
+	TDEGlobal::config()->setGroup("Tags");
+	TDEGlobal::config()->writeEntry("LoadAuto", eh);
+	TDEGlobal::config()->sync();
 	
 	killTimers();
 	
diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp
index 0897e76d..f715590a 100644
--- a/noatun/library/pluginloader.cpp
+++ b/noatun/library/pluginloader.cpp
@@ -52,7 +52,7 @@ LibraryLoader::~LibraryLoader()
 TQValueList<NoatunLibraryInfo> LibraryLoader::available() const
 {
 	TQValueList<NoatunLibraryInfo> items;
-	TQStringList files=KGlobal::dirs()->findAllResources("appdata", "*.plugin", false, true);
+	TQStringList files=TDEGlobal::dirs()->findAllResources("appdata", "*.plugin", false, true);
 	for (TQStringList::Iterator i=files.begin(); i!=files.end(); ++i)
 		items.append(getInfo(*i));
 
@@ -69,7 +69,7 @@ TQPtrList<Plugin> LibraryLoader::plugins() const
 
 bool LibraryLoader::loadAll()
 {
-	KConfig *config=KGlobal::config();
+	KConfig *config=TDEGlobal::config();
 	config->setGroup("");
 	TQStringList modules = config->readListEntry("Modules");
 	return loadAll(modules);
@@ -135,7 +135,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules)
 NoatunLibraryInfo LibraryLoader::getInfo(const TQString &spec) const
 {
 	NoatunLibraryInfo info;
-	TQString specPath = (spec[0]=='/') ? spec : KGlobal::dirs()->findResource("appdata", spec);
+	TQString specPath = (spec[0]=='/') ? spec : TDEGlobal::dirs()->findResource("appdata", spec);
 	if (!TQFile::exists(specPath))
 		return info;
 	KSimpleConfig file(specPath);
@@ -180,7 +180,7 @@ bool LibraryLoader::loadSO(const TQString &spec)
 
 		if (!listitem)
 		{
-			TQString filename = KGlobal::dirs()->findResource("module", info.filename);
+			TQString filename = TDEGlobal::dirs()->findResource("module", info.filename);
 			KLibrary *lib = loader->library(TQFile::encodeName(filename));
 			if (!lib)
 				return false;
@@ -221,7 +221,7 @@ void LibraryLoader::add(const TQString &spec)
 
 void LibraryLoader::setModules(const TQStringList &mods)
 {
-	KConfig *config=KGlobal::config();
+	KConfig *config=TDEGlobal::config();
 	config->setGroup(0);
 	config->writeEntry("Modules", mods);
 	config->sync();
diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp
index 98c05453..73285ad1 100644
--- a/noatun/library/pref.cpp
+++ b/noatun/library/pref.cpp
@@ -55,7 +55,7 @@ void NoatunPreferences::remove(CModule *page)
 }
 
 CModule::CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *owner)
-	: TQWidget(napp->preferencesBox()->addPage(name, description, KGlobal::iconLoader()->loadIcon(
+	: TQWidget(napp->preferencesBox()->addPage(name, description, TDEGlobal::iconLoader()->loadIcon(
 		icon, KIcon::Small,0, KIcon::DefaultState,0, true)))
 {
 	if (owner)
diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp
index 71a40663..76c2215d 100644
--- a/noatun/library/vequalizer.cpp
+++ b/noatun/library/vequalizer.cpp
@@ -712,7 +712,7 @@ VPreset VEqualizer::createPreset(const TQString &name, bool smart)
 
 TQValueList<VPreset> VEqualizer::presets() const
 {
-	KConfig *conf=KGlobal::config();
+	KConfig *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=KGlobal::config();
+	KConfig *conf=TDEGlobal::config();
 	conf->setGroup("Equalizer");
 	TQStringList list=kapp->config()->readListEntry("presets");
 	if (list.contains(file))