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

7 files changed, 16 insertions, 16 deletions

diff --git a/libktorrent/functions.cpp b/libktorrent/functions.cpp
index 2bc76eb..f57837d 100644
--- a/libktorrent/functions.cpp
+++ b/libktorrent/functions.cpp
@@ -30,7 +30,7 @@ namespace kt
 {
 	TQString DataDir()
 	{
-		TQString str = KGlobal::dirs()->saveLocation("data","ktorrent");
+		TQString str = TDEGlobal::dirs()->saveLocation("data","ktorrent");
 		if (!str.endsWith(bt::DirSeparator()))
 			return str + bt::DirSeparator();
 		else
diff --git a/libktorrent/interfaces/filetreediritem.cpp b/libktorrent/interfaces/filetreediritem.cpp
index 93db727..cc199ce 100644
--- a/libktorrent/interfaces/filetreediritem.cpp
+++ b/libktorrent/interfaces/filetreediritem.cpp
@@ -39,7 +39,7 @@ namespace kt
 	{
 		parent = 0;
 		size = 0;
-		setPixmap(0,KGlobal::iconLoader()->loadIcon("folder",KIcon::Small));
+		setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",KIcon::Small));
 		setText(0,name);
 		setText(1,BytesToString(size));
 		setText(2,i18n("Yes"));
@@ -53,7 +53,7 @@ namespace kt
 	name(name),parent(parent)
 	{
 		size = 0;
-		setPixmap(0,KGlobal::iconLoader()->loadIcon("folder",KIcon::Small));
+		setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",KIcon::Small));
 		setText(0,name);
 		setText(1,BytesToString(size));
 		setText(2,i18n("Yes"));
diff --git a/libktorrent/interfaces/functions.cpp b/libktorrent/interfaces/functions.cpp
index 6a19d7f..630e32a 100644
--- a/libktorrent/interfaces/functions.cpp
+++ b/libktorrent/interfaces/functions.cpp
@@ -30,7 +30,7 @@ namespace kt
 	
 	TQString BytesToString(Uint64 bytes,int precision)
 	{
-		KLocale* loc = KGlobal::locale();
+		KLocale* loc = TDEGlobal::locale();
 		if (bytes >= 1024 * 1024 * 1024)
 			return i18n("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
 		else if (bytes >= 1024*1024)
@@ -43,13 +43,13 @@ namespace kt
 
 	TQString KBytesPerSecToString(double speed,int precision)
 	{
-		KLocale* loc = KGlobal::locale();
+		KLocale* loc = TDEGlobal::locale();
 		return i18n("%1 KB/s").arg(loc->formatNumber(speed,precision));
 	}
 
 	TQString DurationToString(Uint32 nsecs)
 	{
-		KLocale* loc = KGlobal::locale();
+		KLocale* loc = TDEGlobal::locale();
 		TQTime t;
 		int ndays = nsecs / 86400;
 		t = t.addSecs(nsecs % 86400);
diff --git a/libktorrent/labelview.cpp b/libktorrent/labelview.cpp
index d7ce947..ca44f5d 100644
--- a/libktorrent/labelview.cpp
+++ b/libktorrent/labelview.cpp
@@ -69,18 +69,18 @@ namespace kt
 
 		if (selected)
 		{
-			setPaletteBackgroundColor(KGlobalSettings::highlightColor());
-			setPaletteForegroundColor(KGlobalSettings::highlightedTextColor());
+			setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
+			setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor());
 		}
 		else if (odd)
 		{
-			setPaletteBackgroundColor(KGlobalSettings::baseColor());
-			setPaletteForegroundColor(KGlobalSettings::textColor());
+			setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
+			setPaletteForegroundColor(TDEGlobalSettings::textColor());
 		}
 		else
 		{
-			setPaletteBackgroundColor(KGlobalSettings::alternateBackgroundColor());
-			setPaletteForegroundColor(KGlobalSettings::textColor());
+			setPaletteBackgroundColor(TDEGlobalSettings::alternateBackgroundColor());
+			setPaletteForegroundColor(TDEGlobalSettings::textColor());
 		}
 	}
 	
@@ -109,7 +109,7 @@ namespace kt
 	public:
 		LabelViewBox(TQWidget* parent) : TQWidget(parent)
 		{
-			setPaletteBackgroundColor(KGlobalSettings::baseColor());
+			setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
 			layout = new TQVBoxLayout(this);
 			layout->setMargin(0);
 		}
diff --git a/libktorrent/pluginmanagerprefpage.cpp b/libktorrent/pluginmanagerprefpage.cpp
index 8a6e33c..145d4de 100644
--- a/libktorrent/pluginmanagerprefpage.cpp
+++ b/libktorrent/pluginmanagerprefpage.cpp
@@ -60,7 +60,7 @@ namespace kt
 	};
 
 	PluginManagerPrefPage::PluginManagerPrefPage(PluginManager* pman)
-	: PrefPageInterface(i18n("Plugins"), i18n("Plugin Options"),KGlobal::iconLoader()->loadIcon("ktplugins",KIcon::NoGroup)),pman(pman)
+	: PrefPageInterface(i18n("Plugins"), i18n("Plugin Options"),TDEGlobal::iconLoader()->loadIcon("ktplugins",KIcon::NoGroup)),pman(pman)
 	{
 		pmw = 0;
 	}
diff --git a/libktorrent/util/autorotatelogjob.cpp b/libktorrent/util/autorotatelogjob.cpp
index de4d1c5..c703026 100644
--- a/libktorrent/util/autorotatelogjob.cpp
+++ b/libktorrent/util/autorotatelogjob.cpp
@@ -70,7 +70,7 @@ namespace bt
 		else
 		{
 				// final log file is moved, now zip it and end the job
-			std::system(TQString("gzip " + KProcess::quote(file + "-1")).local8Bit());
+			std::system(TQString("gzip " + TDEProcess::quote(file + "-1")).local8Bit());
 			m_error = 0;
 			lg->logRotateDone();
 			emitResult();
diff --git a/libktorrent/util/log.cpp b/libktorrent/util/log.cpp
index 2fb36f9..258506a 100644
--- a/libktorrent/util/log.cpp
+++ b/libktorrent/util/log.cpp
@@ -87,7 +87,7 @@ namespace bt
 			
 			// move current log to 1 and zip it
 			bt::Move(file,file + "-1",true);
-			system(TQString("gzip " + KProcess::quote(file + "-1")).local8Bit());
+			system(TQString("gzip " + TDEProcess::quote(file + "-1")).local8Bit());
 		}
 
 		void setOutputFile(const TQString & file)