Rename a number of classes to enhance compatibility with KDE4

5 files changed, 11 insertions, 11 deletions

diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp
index 9759cce..30893ea 100644
--- a/plugins/search/searchplugin.cpp
+++ b/plugins/search/searchplugin.cpp
@@ -63,7 +63,7 @@ namespace kt
 	void SearchPlugin::load()
 	{
 		engines.load(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines");
-		KToolBar* tb = getGUI()->addToolBar("search");
+		TDEToolBar* tb = getGUI()->addToolBar("search");
 		tab = new SearchTab(tb);
 		connect(tab,TQT_SIGNAL(search( const TQString&, int, bool )),
 				this,TQT_SLOT(search( const TQString&, int, bool )));
@@ -118,7 +118,7 @@ namespace kt
 		SearchWidget* search = new SearchWidget(this);
 		getGUI()->addTabPage(search,iload->loadIconSet("viewmag", KIcon::Small),text,this);
 		
-		KAction* copy_act = KStdAction::copy(TQT_TQOBJECT(search),TQT_SLOT(copy()),actionCollection());
+		TDEAction* copy_act = KStdAction::copy(TQT_TQOBJECT(search),TQT_SLOT(copy()),actionCollection());
 		copy_act->plug(search->rightClickMenu(),0);
 		searches.append(search);
 		
diff --git a/plugins/search/searchtab.cpp b/plugins/search/searchtab.cpp
index 02f3acf..002e62d 100644
--- a/plugins/search/searchtab.cpp
+++ b/plugins/search/searchtab.cpp
@@ -39,7 +39,7 @@ using namespace bt;
 namespace kt
 {
 
-	SearchTab::SearchTab(KToolBar* tb) : m_tool_bar(tb)
+	SearchTab::SearchTab(TDEToolBar* tb) : m_tool_bar(tb)
 	{
 		m_search_text = new KComboBox(tb);
 		m_search_text->setEditable(true);
diff --git a/plugins/search/searchtab.h b/plugins/search/searchtab.h
index 95236d3..27ee3c9 100644
--- a/plugins/search/searchtab.h
+++ b/plugins/search/searchtab.h
@@ -39,11 +39,11 @@ namespace kt
   
 	
 	public:
-		SearchTab(KToolBar* toolbar);
+		SearchTab(TDEToolBar* toolbar);
 		virtual ~SearchTab();
 		
 		/// Get the tool bar
-		KToolBar* getToolBar() {return m_tool_bar;}
+		TDEToolBar* getToolBar() {return m_tool_bar;}
 	
 		/// Update the search engine list
 		void updateSearchEngines(const SearchEngineList & sl);
@@ -66,7 +66,7 @@ namespace kt
 		void saveSearchHistory();
 	
 	private:
-		KToolBar* m_tool_bar;
+		TDEToolBar* m_tool_bar;
 		KComboBox* m_search_text;
 		KComboBox* m_search_engine;
 		KPushButton* m_clear_button;
diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp
index 61f871a..fc72a3d 100644
--- a/plugins/search/searchwidget.cpp
+++ b/plugins/search/searchwidget.cpp
@@ -64,7 +64,7 @@ namespace kt
 		sbar = new SearchBar(this);
 		html_part = new HTMLPart(this);
 	
-		right_click_menu = new KPopupMenu(this);
+		right_click_menu = new TDEPopupMenu(this);
 		right_click_menu->insertSeparator();
 		back_id = right_click_menu->insertItem(
                         TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() 
@@ -224,7 +224,7 @@ namespace kt
 		right_click_menu->popup(p);
 	}
 	
-	KPopupMenu* SearchWidget::rightClickMenu()
+	TDEPopupMenu* SearchWidget::rightClickMenu()
 	{
 		return right_click_menu;
 	}
diff --git a/plugins/search/searchwidget.h b/plugins/search/searchwidget.h
index c48be71..9d42b93 100644
--- a/plugins/search/searchwidget.h
+++ b/plugins/search/searchwidget.h
@@ -26,7 +26,7 @@
 
 class SearchBar;
 class KProgress;
-class KPopupMenu;
+class TDEPopupMenu;
 
 namespace KParts
 {
@@ -53,7 +53,7 @@ namespace kt
 		SearchWidget(SearchPlugin* sp);
 		virtual ~SearchWidget();
 	
-		KPopupMenu* rightClickMenu();
+		TDEPopupMenu* rightClickMenu();
 		
 		void updateSearchEngines(const SearchEngineList & sl);
 	
@@ -79,7 +79,7 @@ namespace kt
 	private:
 		HTMLPart* html_part;
 		SearchBar* sbar;
-		KPopupMenu* right_click_menu;
+		TDEPopupMenu* right_click_menu;
 		int back_id;
 		SearchPlugin* sp;
 		KProgress* prog;