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

5 files changed, 15 insertions, 15 deletions

diff --git a/plugins/rssfeed/rss/loader.cpp b/plugins/rssfeed/rss/loader.cpp
index 6c5b3d5..f725186 100644
--- a/plugins/rssfeed/rss/loader.cpp
+++ b/plugins/rssfeed/rss/loader.cpp
@@ -179,12 +179,12 @@ void OutputRetriever::retrieveData(const KURL &url)
    d->buffer->open(IO_WriteOnly);
 
    d->process = new KShellProcess();
-   connect(d->process, TQT_SIGNAL(processExited(KProcess *)),
-                       TQT_SLOT(slotExited(KProcess *)));
-   connect(d->process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
-                       TQT_SLOT(slotOutput(KProcess *, char *, int)));
+   connect(d->process, TQT_SIGNAL(processExited(TDEProcess *)),
+                       TQT_SLOT(slotExited(TDEProcess *)));
+   connect(d->process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+                       TQT_SLOT(slotOutput(TDEProcess *, char *, int)));
    *d->process << url.path();
-   d->process->start(KProcess::NotifyOnExit, KProcess::Stdout);
+   d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
 }
 
 int OutputRetriever::errorCode() const
@@ -192,12 +192,12 @@ int OutputRetriever::errorCode() const
    return d->lastError;
 }
 
-void OutputRetriever::slotOutput(KProcess *, char *data, int length)
+void OutputRetriever::slotOutput(TDEProcess *, char *data, int length)
 {
    d->buffer->writeBlock(data, length);
 }
 
-void OutputRetriever::slotExited(KProcess *p)
+void OutputRetriever::slotExited(TDEProcess *p)
 {
    if (!p->normalExit())
       d->lastError = p->exitStatus();
diff --git a/plugins/rssfeed/rss/loader.h b/plugins/rssfeed/rss/loader.h
index f81406d..ae2a3b9 100644
--- a/plugins/rssfeed/rss/loader.h
+++ b/plugins/rssfeed/rss/loader.h
@@ -21,7 +21,7 @@ namespace KIO
 {
 	class Job;
 }
-class KProcess;
+class TDEProcess;
 
 namespace RSS
 {
@@ -192,8 +192,8 @@ namespace RSS
 			virtual void abort() {}
 			
 		private slots:
-			void slotOutput(KProcess *process, char *data, int length);
-			void slotExited(KProcess *process);
+			void slotOutput(TDEProcess *process, char *data, int length);
+			void slotExited(TDEProcess *process);
 
 		private:
 			OutputRetriever(const OutputRetriever &other);
diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp
index 119b9b2..dea28b3 100644
--- a/plugins/rssfeed/rssfeed.cpp
+++ b/plugins/rssfeed/rssfeed.cpp
@@ -181,8 +181,8 @@ namespace kt
 	TQString RssFeed::getFilename()
 	{
 		TQDir directory;
-		directory.mkdir(KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds");
-		return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds/" + m_feedUrl.prettyURL(-1).replace("/", "_").replace(":", "_") + ".ktr";
+		directory.mkdir(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds");
+		return TDEGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds/" + m_feedUrl.prettyURL(-1).replace("/", "_").replace(":", "_") + ".ktr";
 		
 	}
 	
diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/plugins/rssfeed/rssfeedmanager.cpp
index 20f81a6..65d1d6b 100644
--- a/plugins/rssfeed/rssfeedmanager.cpp
+++ b/plugins/rssfeed/rssfeedmanager.cpp
@@ -1082,12 +1082,12 @@ namespace kt
 	
 	TQString RssFeedManager::getFeedListFilename()
 	{
-		return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds.ktr";
+		return TDEGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds.ktr";
 	}
 	
 	TQString RssFeedManager::getFilterListFilename()
 	{
-		return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfilters.ktr";
+		return TDEGlobal::dirs()->saveLocation("data","ktorrent") + "rssfilters.ktr";
 	}
 	
 	void RssFeedManager::saveFeedList()
diff --git a/plugins/rssfeed/rssfeedplugin.cpp b/plugins/rssfeed/rssfeedplugin.cpp
index fbe83e4..8025055 100644
--- a/plugins/rssfeed/rssfeedplugin.cpp
+++ b/plugins/rssfeed/rssfeedplugin.cpp
@@ -61,7 +61,7 @@ namespace kt
 	void RssFeedPlugin::load()
 	{
 		//add the new tab to the gui
-		KIconLoader* iload = KGlobal::iconLoader();
+		KIconLoader* iload = TDEGlobal::iconLoader();
 		m_rssFeedManager = new RssFeedManager(getCore());
 		getGUI()->addTabPage(
 			m_rssFeedManager,iload->loadIconSet("player_playlist", KIcon::Small),