Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 19 insertions, 19 deletions

diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index 65eba0b..ab20a38 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -81,15 +81,15 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name,
 	                                                     0, 0, actionCollection(), "toolbar_search_bar");
 	m_searchComboAction->setShortcutConfigurable(false);
 
-	connect(m_searchCombo, TQT_SIGNAL(activated(const TQString &)),
-	                       TQT_SLOT(startSearch(const TQString &)));
-	connect(m_searchCombo, TQT_SIGNAL(iconClicked()), TQT_SLOT(showSelectionMenu()));
+	connect(m_searchCombo, TQ_SIGNAL(activated(const TQString &)),
+	                       TQ_SLOT(startSearch(const TQString &)));
+	connect(m_searchCombo, TQ_SIGNAL(iconClicked()), TQ_SLOT(showSelectionMenu()));
 
 	TQWhatsThis::add(m_searchCombo, i18n("Search Bar<p>"
 	                                    "Enter a search term. Click on the icon to change search mode or provider."));
 
 	new TDEAction( i18n( "Focus Searchbar" ), CTRL+Key_S,
-			       this, TQT_SLOT(focusSearchbar()),
+			       this, TQ_SLOT(focusSearchbar()),
 			       actionCollection(), "focus_search_bar");
 
 	configurationChanged();
@@ -100,15 +100,15 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name,
 	KParts::PartManager *partMan = static_cast<KParts::PartManager*>(mainWin->child(0, "KParts::PartManager"));
 	if (partMan)
 	{
-		connect(partMan, TQT_SIGNAL(activePartChanged(KParts::Part*)),
-		                 TQT_SLOT  (partChanged      (KParts::Part*)));
+		connect(partMan, TQ_SIGNAL(activePartChanged(KParts::Part*)),
+		                 TQ_SLOT  (partChanged      (KParts::Part*)));
 		partChanged(partMan->activePart());
 	}
 
-	connect(this, TQT_SIGNAL(gsCompleteDelayed()), TQT_SLOT(gsStartDelay()));
-	connect(&m_gsTimer, TQT_SIGNAL(timeout()), TQT_SLOT(gsMakeCompletionList()));
-	connect(m_searchCombo->listBox(), TQT_SIGNAL(highlighted(const TQString&)), TQT_SLOT(gsSetCompletedText(const TQString&)));
-	connect(m_searchCombo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(gsPutTextInBox(const TQString&)));
+	connect(this, TQ_SIGNAL(gsCompleteDelayed()), TQ_SLOT(gsStartDelay()));
+	connect(&m_gsTimer, TQ_SIGNAL(timeout()), TQ_SLOT(gsMakeCompletionList()));
+	connect(m_searchCombo->listBox(), TQ_SIGNAL(highlighted(const TQString&)), TQ_SLOT(gsSetCompletedText(const TQString&)));
+	connect(m_searchCombo, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(gsPutTextInBox(const TQString&)));
 }
 
 SearchBarPlugin::~SearchBarPlugin()
@@ -382,7 +382,7 @@ void SearchBarPlugin::showSelectionMenu()
 		list << "kurisearchfilter" << "kuriikwsfilter";
 
 		m_popupMenu = new TQPopupMenu(m_searchCombo, "search selection menu");
-		m_popupMenu->insertItem(SmallIcon("edit-find"), i18n("Find in This Page"), this, TQT_SLOT(useFindInThisPage()),  0, 999);
+		m_popupMenu->insertItem(SmallIcon("edit-find"), i18n("Find in This Page"), this, TQ_SLOT(useFindInThisPage()),  0, 999);
 		m_popupMenu->insertSeparator();
 
 		int i=-1;
@@ -413,14 +413,14 @@ void SearchBarPlugin::showSelectionMenu()
 		}
 
 		m_popupMenu->insertSeparator();
-		m_googleMenu = new TDESelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, this, TQT_SLOT(selectGoogleSuggestMode()), m_popupMenu);
+		m_googleMenu = new TDESelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, this, TQ_SLOT(selectGoogleSuggestMode()), m_popupMenu);
 		TQStringList google_modes;
                 google_modes << i18n("For Google Only") << i18n("For All Searches") << i18n("Never");
 		m_googleMenu->setItems(google_modes);
 		m_googleMenu->plug(m_popupMenu);
 		m_popupMenu->insertItem(SmallIcon("enhanced_browsing"), i18n("Select Search Engines..."),
-			this, TQT_SLOT(selectSearchEngines()), 0, 1000);
-		connect(m_popupMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(useSearchProvider(int)));
+			this, TQ_SLOT(selectSearchEngines()), 0, 1000);
+		connect(m_popupMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(useSearchProvider(int)));
 	}
 	m_googleMenu->setCurrentItem(m_googleMode);
 	m_popupMenu->popup(m_searchCombo->mapToGlobal(TQPoint(0, m_searchCombo->height() + 1)), 0);
@@ -450,7 +450,7 @@ void SearchBarPlugin::selectSearchEngines()
 
 	*process << "tdecmshell" << "ebrowsing";
 
-	connect(process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(searchEnginesSelected(TDEProcess *)));
+	connect(process, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(searchEnginesSelected(TDEProcess *)));
 
 	if(!process->start())
 	{
@@ -518,7 +518,7 @@ void SearchBarPlugin::partChanged(KParts::Part *newPart)
 	m_part = ::tqt_cast<TDEHTMLPart*>(newPart);
 
 	//Delay since when destroying tabs part 0 gets activated for a bit, before the proper part
-	TQTimer::singleShot(0, this, TQT_SLOT(updateComboVisibility()));
+	TQTimer::singleShot(0, this, TQ_SLOT(updateComboVisibility()));
 }
 
 void SearchBarPlugin::updateComboVisibility()
@@ -546,7 +546,7 @@ SearchBarCombo::SearchBarCombo(TQWidget *parent, const char *name) :
   KHistoryCombo(parent, name),
   m_pluginActive(true)
 {
-	connect(this, TQT_SIGNAL(cleared()), TQT_SLOT(historyCleared()));
+	connect(this, TQ_SIGNAL(cleared()), TQ_SLOT(historyCleared()));
 }
 
 const TQPixmap &SearchBarCombo::icon() const
@@ -649,8 +649,8 @@ void SearchBarPlugin::gsMakeCompletionList()
 	{
 		TDEIO::TransferJob* tj =
 				TDEIO::get(KURL("http://www.google.com/complete/search?hl=en&js=true&qu=" + m_searchCombo->currentText()), false, false);
-		connect(tj, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), this, TQT_SLOT(gsDataArrived(TDEIO::Job*, const TQByteArray&)));
-		connect(tj, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(gsJobFinished(TDEIO::Job*)));
+		connect(tj, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), this, TQ_SLOT(gsDataArrived(TDEIO::Job*, const TQByteArray&)));
+		connect(tj, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(gsJobFinished(TDEIO::Job*)));
 	}
 }