Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit a3703745120ffe8f1beadd5fa58f9ab1470bc2f8.

1 files changed, 13 insertions, 13 deletions

diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp
index 7eca292..b94826b 100644
--- a/katapult/katapult/katapult.cpp
+++ b/katapult/katapult/katapult.cpp
@@ -81,7 +81,7 @@ Katapult::Katapult()
 	//show popup (unless we're session restored)
 	if (!settings->hideNotification()) {
 		TQString msg = i18n("Application successfully started !\nPress %1 to use it...")
-				.arg(globalAccel->shortcut("show_katapult").toString());
+				.tqarg(globalAccel->shortcut("show_katapult").toString());
 		KPassivePopup::message(i18n("Katapult Notification"), msg, kapp->miniIcon(), this, 0, settings->notificationTimeout());
 	}
 }
@@ -164,7 +164,7 @@ void Katapult::clearQuery()
 
 void Katapult::setQuery(TQString _query)
 {
-	allStatus=0;
+	alltqStatus=0;
 	bestMatch = Match();
 		
 	this->_query = _query;
@@ -181,12 +181,12 @@ void Katapult::setQuery(TQString _query)
 		}
 		display->setItem(0);
 		display->setAction(0);
-		display->setStatus(0);
+		display->settqStatus(0);
 		display->setSelected(0);
 		action = 0;
 	} else if(catalogs.count() == 0) {
-		allStatus = S_Active | S_NoResults;
-		display->setStatus(allStatus);
+		alltqStatus = S_Active | S_NoResults;
+		display->settqStatus(alltqStatus);
 	} else {
 		TQDictIterator<KatapultCatalog> it(catalogs);
 		KatapultCatalog *catalog;
@@ -200,8 +200,8 @@ void Katapult::setQuery(TQString _query)
 			status = catalog->status();
 			if(status & S_HasResults)
 			{
-				if(allStatus & S_HasResults)
-					allStatus |= S_Multiple;
+				if(alltqStatus & S_HasResults)
+					alltqStatus |= S_Multiple;
 				Match match = catalog->bestMatch();
 				if(!match.isNull())
 				{
@@ -209,7 +209,7 @@ void Katapult::setQuery(TQString _query)
 						bestMatch = match;
 				}
 			}
-			allStatus |= status;
+			alltqStatus |= status;
 		}
 		if(bestMatch.isNull() || bestMatch.rank() == 0)
 			bestMatch = Match();
@@ -219,7 +219,7 @@ void Katapult::setQuery(TQString _query)
 			connect(bestMatch.item(), TQT_SIGNAL(itemChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateDisplay()));
 		}
 	}
-	if(!(allStatus & S_HasResults) && allStatus & S_Active) {
+	if(!(alltqStatus & S_HasResults) && alltqStatus & S_Active) {
 			// no results
 		switch(settings->noResultsAction()) {
 			case KatapultSettings::NR_HideDisplay:
@@ -240,7 +240,7 @@ void Katapult::setQuery(TQString _query)
 			clearTimer->stop();
 	}
 	
-	if(!executing && settings->isAutoExecute() && allStatus & S_HasResults && !(allStatus & S_Multiple)) {
+	if(!executing && settings->isAutoExecute() && alltqStatus & S_HasResults && !(alltqStatus & S_Multiple)) {
 		execute();
 	}
 	
@@ -266,7 +266,7 @@ void Katapult::updateDisplay()
 			display->setAction(action);
 			display->setSelected(bestMatch.matched());
 		}
-		display->setStatus(allStatus);
+		display->settqStatus(alltqStatus);
 		display->update();
 	}
 }
@@ -276,7 +276,7 @@ void Katapult::showLauncher()
 	if(!settings->isConfiguring() && display != 0)
 	{
 		setQuery("");
-		display->setStatus(0);
+		display->settqStatus(0);
 		display->setQuery("");
 		display->show();
 		display->update();
@@ -306,7 +306,7 @@ void Katapult::execute()
 	executing = TRUE;
 	if(action == 0)
 	{
-		display->setStatus(S_Active | S_NoResults);
+		display->settqStatus(S_Active | S_NoResults);
 		display->update();
 		hideTimer->start(settings->hideDelay(), TRUE);
 	} else {