From 604bf3f969d880708ea9a1affce0b304c29e6ff5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:25:33 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 plugins/search/searchplugin.cpp   |  6 +++---
 plugins/search/searchprefpage.cpp |  6 +++---
 plugins/search/searchwidget.cpp   | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'plugins/search')

diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp
index 2f63f4e..9759cce 100644
--- a/plugins/search/searchplugin.cpp
+++ b/plugins/search/searchplugin.cpp
@@ -62,7 +62,7 @@ namespace kt
 
 	void SearchPlugin::load()
 	{
-		engines.load(KGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines");
+		engines.load(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines");
 		KToolBar* tb = getGUI()->addToolBar("search");
 		tab = new SearchTab(tb);
 		connect(tab,TQT_SIGNAL(search( const TQString&, int, bool )),
@@ -113,7 +113,7 @@ namespace kt
 			return;
 		}
 		
-		KIconLoader* iload = KGlobal::iconLoader();
+		KIconLoader* iload = TDEGlobal::iconLoader();
 		
 		SearchWidget* search = new SearchWidget(this);
 		getGUI()->addTabPage(search,iload->loadIconSet("viewmag", KIcon::Small),text,this);
@@ -128,7 +128,7 @@ namespace kt
 	
 	void SearchPlugin::preferencesUpdated()
 	{
-		engines.load(KGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines");
+		engines.load(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines");
 		if (tab)
 			tab->updateSearchEngines(engines);
 		
diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp
index c3f1517..8de3e28 100644
--- a/plugins/search/searchprefpage.cpp
+++ b/plugins/search/searchprefpage.cpp
@@ -99,7 +99,7 @@ namespace kt
  
 	void SearchPrefPageWidget::saveSearchEngines()
 	{
-		TQFile fptr(KGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines");
+		TQFile fptr(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines");
 		if (!fptr.open(IO_WriteOnly))
 			return;
 		TQTextStream out(&fptr);
@@ -185,7 +185,7 @@ namespace kt
 	
 	void SearchPrefPageWidget::btnUpdate_clicked()
 	{
-		TQString fn = KGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines.tmp";
+		TQString fn = TDEGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines.tmp";
 		KURL source("http://www.ktorrent.org/downloads/search_engines");
 		
 		if (KIO::NetAccess::download(source,fn,NULL))
@@ -245,7 +245,7 @@ namespace kt
 
 	SearchPrefPage::SearchPrefPage(SearchPlugin* plugin)
 		: PrefPageInterface(i18n("a noun", "Search"), i18n("Search Engine Options"),
-							KGlobal::iconLoader()->loadIcon("viewmag",KIcon::NoGroup)), m_plugin(plugin)
+							TDEGlobal::iconLoader()->loadIcon("viewmag",KIcon::NoGroup)), m_plugin(plugin)
 	{
 		widget = 0;
 	}
diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp
index 01c27f7..0cf99a9 100644
--- a/plugins/search/searchwidget.cpp
+++ b/plugins/search/searchwidget.cpp
@@ -67,11 +67,11 @@ namespace kt
 		right_click_menu = new KPopupMenu(this);
 		right_click_menu->insertSeparator();
 		back_id = right_click_menu->insertItem(
-                        KGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() 
+                        TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() 
                         ? "forward" : "back",KIcon::Small),
 				i18n("Back"),html_part,TQT_SLOT(back()));
 		right_click_menu->insertItem(
-				KGlobal::iconLoader()->loadIconSet("reload",KIcon::Small),
+				TDEGlobal::iconLoader()->loadIconSet("reload",KIcon::Small),
 				i18n("Reload"),html_part,TQT_SLOT(reload()));
 	
 		right_click_menu->setItemEnabled(back_id,false);
@@ -83,13 +83,13 @@ namespace kt
 		connect(sbar->m_reload,TQT_SIGNAL(clicked()),html_part,TQT_SLOT(reload()));
 	
 		sbar->m_clear_button->setIconSet(
-				KGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() 
+				TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() 
                         ? "clear_left" : "locationbar_erase",KIcon::Small));
 		sbar->m_back->setIconSet(
-                        KGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() 
+                        TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() 
                         ? "forward" : "back", KIcon::Small));
 		sbar->m_reload->setIconSet(
-				KGlobal::iconLoader()->loadIconSet("reload",KIcon::Small));
+				TDEGlobal::iconLoader()->loadIconSet("reload",KIcon::Small));
 		
 		
 		connect(html_part,TQT_SIGNAL(backAvailable(bool )),
-- 
cgit v1.2.1