Rename old tq methods that no longer need a unique name

15 files changed, 50 insertions, 50 deletions

diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
index 7ca1f9b..2425469 100644
--- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
+++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
@@ -47,7 +47,7 @@ AmarokCatalog::AmarokCatalog(TQObject*, const char*, const TQStringList&): _resu
 {
 	_minQueryLen = 3;
 	ActionRegistry::self()->registerAction(new ActionPlaySong());
-	_gotCollectiontqStatus = false;
+	_gotCollectionStatus = false;
 	_dynamicCollection = false;
 	checkCollectionType();	
 
@@ -58,16 +58,16 @@ AmarokCatalog::~AmarokCatalog()
 
 void AmarokCatalog::queryChanged()
 {
-	int newtqStatus = 0;
+	int newStatus = 0;
 	TQString queryString = query();
 	
 	if((TQString(queryString).remove(':').remove('\"').remove(' ').isEmpty()) || (queryString.length() < _minQueryLen)) {
 		reset();
 		setBestMatch(Match());
-		settqStatus(0);
+		setStatus(0);
 	} else {
 
-		if ( _gotCollectiontqStatus)
+		if ( _gotCollectionStatus)
 		{
 
 			if (!_dynamicCollection)
@@ -101,7 +101,7 @@ void AmarokCatalog::queryChanged()
 				arg << sqlQuery;
 				if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)",
 				     sqlQueryData, replyType, replyData)) {
-					newtqStatus = 0;
+					newStatus = 0;
 				} else {
 					TQDataStream reply(replyData, IO_ReadOnly);
 					if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) {
@@ -109,7 +109,7 @@ void AmarokCatalog::queryChanged()
 						reply >> sqlResult;
 					
 						if(sqlResult.isEmpty()) {
-							newtqStatus = 0;
+							newStatus = 0;
 						} else {
 							reset();
 							//Reads information from SQL-Query
@@ -141,12 +141,12 @@ void AmarokCatalog::queryChanged()
 					
 							//Checks if there are multiple results
 							if( !sqlResult[5].isEmpty() )
-								newtqStatus = S_HasResults | S_Multiple;
+								newStatus = S_HasResults | S_Multiple;
 							else 
-								newtqStatus = S_HasResults;
+								newStatus = S_HasResults;
 						}
 					} else {
-						newtqStatus = 0;
+						newStatus = 0;
 					}
 				}
 
@@ -176,7 +176,7 @@ void AmarokCatalog::queryChanged()
 				arg << sqlQuery;
 				if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)",
 				     sqlQueryData, replyType, replyData)) {
-					newtqStatus = 0;
+					newStatus = 0;
 				} else {
 					TQDataStream reply(replyData, IO_ReadOnly);
 					if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) {
@@ -184,7 +184,7 @@ void AmarokCatalog::queryChanged()
 						reply >> sqlResult;
 					
 						if(sqlResult.isEmpty()) {
-							newtqStatus = 0;
+							newStatus = 0;
 						} else {
 							reset();
 							//Reads information from SQL-Query
@@ -231,25 +231,25 @@ void AmarokCatalog::queryChanged()
 					
 							//Checks if there are multiple results
 						 	if( !sqlResult[7].isEmpty() )
-								newtqStatus = S_HasResults | S_Multiple;
+								newStatus = S_HasResults | S_Multiple;
 							else 
-								newtqStatus = S_HasResults;
+								newStatus = S_HasResults;
 						}
 					} else {
-						newtqStatus = 0;
+						newStatus = 0;
 					}
 				}
 
 
 			} //end of >1.4.2 section
-		settqStatus(newtqStatus);
+		setStatus(newStatus);
 
 		} else {                //We haven't got the collection status
 
 			checkCollectionType();	
 			reset();
 			setBestMatch(Match());
-			settqStatus(0);
+			setStatus(0);
 		}
 
 
@@ -275,7 +275,7 @@ void AmarokCatalog::checkCollectionType()
 	arg << sqlQuery;
 	if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)", sqlQueryData, replyType, replyData))
 	{
-		_gotCollectiontqStatus = false;
+		_gotCollectionStatus = false;
 
 	}
 	else
@@ -296,11 +296,11 @@ void AmarokCatalog::checkCollectionType()
 				_dynamicCollection = false;
 
 			}
-			_gotCollectiontqStatus = true;
+			_gotCollectionStatus = true;
 		}
 		else
 		{
-			_gotCollectiontqStatus = false;
+			_gotCollectionStatus = false;
 		}
 	}
 }
diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h
index aaff457..f103bec 100644
--- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h
+++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h
@@ -56,7 +56,7 @@ protected:
 private:
 	unsigned int _minQueryLen;
 	bool _dynamicCollection;
-	bool _gotCollectiontqStatus;	
+	bool _gotCollectionStatus;	
 	Song _result;
 };
 
diff --git a/katapult/plugins/catalogs/amarokcatalog/settings.ui b/katapult/plugins/catalogs/amarokcatalog/settings.ui
index 384f4fc..1f8dc5f 100644
--- a/katapult/plugins/catalogs/amarokcatalog/settings.ui
+++ b/katapult/plugins/catalogs/amarokcatalog/settings.ui
@@ -64,7 +64,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>370</height>
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/settings.ui b/katapult/plugins/catalogs/bookmarkcatalog/settings.ui
index c6f900b..a5b6f38 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/settings.ui
+++ b/katapult/plugins/catalogs/bookmarkcatalog/settings.ui
@@ -98,7 +98,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>100</height>
diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp
index 05a6c74..724c371 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp
+++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp
@@ -141,7 +141,7 @@ CalculatorCatalog::~CalculatorCatalog()
 
 void CalculatorCatalog::queryChanged()
 {
-	int newtqStatus = 0;
+	int newStatus = 0;
 	TQString cmd = query();
 
 	if (cmd.isEmpty()) {
@@ -203,12 +203,12 @@ void CalculatorCatalog::queryChanged()
 			//set status.
 			//add S_Multiple to make sure katapult doesn't auto-exec and close the window
 			//add S_Active to make sure katapult doesn't start the hideTimer or clearTimer
-			newtqStatus = S_HasResults | S_Multiple | S_Active;
+			newStatus = S_HasResults | S_Multiple | S_Active;
 		} else {
-			newtqStatus = 0;
+			newStatus = 0;
 		}
 	}
-	settqStatus(newtqStatus);
+	setStatus(newStatus);
 }
 
 void CalculatorCatalog::reset()
diff --git a/katapult/plugins/catalogs/calculatorcatalog/settings.ui b/katapult/plugins/catalogs/calculatorcatalog/settings.ui
index a1a0c18..50bc410 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/settings.ui
+++ b/katapult/plugins/catalogs/calculatorcatalog/settings.ui
@@ -200,7 +200,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
index faa129c..bdcc1c6 100644
--- a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
+++ b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
@@ -98,7 +98,7 @@ void DocumentCatalog::refreshFiles()
 
 void DocumentCatalog::queryChanged()
 {
-	int newtqStatus = 0;
+	int newStatus = 0;
 	if(query() == "")
 	{
 		// reset query
@@ -169,21 +169,21 @@ void DocumentCatalog::queryChanged()
 			if(currentDirDoc != 0 && path.isEmpty())
 				newBestMatch = Match(currentDirDoc, 100, currentPath.length());
 
-			newtqStatus |= S_Active;
+			newStatus |= S_Active;
 			if(files.count() > 0)
 			{
-				newtqStatus |= S_HasResults;
+				newStatus |= S_HasResults;
 				if(files.count() > 1 || files.at(0)->className() == "Directory")
-					newtqStatus |= S_Multiple;
+					newStatus |= S_Multiple;
 			} else
-				newtqStatus |= S_NoResults;
+				newStatus |= S_NoResults;
 				
  			setBestMatch(newBestMatch);
 		} else {
 			setBestMatch(Match());
 		}
 	}
-	settqStatus(newtqStatus);
+	setStatus(newStatus);
 }
 
 unsigned int DocumentCatalog::minQueryLen() const
diff --git a/katapult/plugins/catalogs/documentcatalog/settings.ui b/katapult/plugins/catalogs/documentcatalog/settings.ui
index 6f3c990..07353c8 100644
--- a/katapult/plugins/catalogs/documentcatalog/settings.ui
+++ b/katapult/plugins/catalogs/documentcatalog/settings.ui
@@ -66,7 +66,7 @@
 	    <property name="sizeType">
 		    <enum>Expanding</enum>
 	    </property>
-	    <property name="tqsizeHint">
+	    <property name="sizeHint">
 		    <size>
 			    <width>20</width>
 			    <height>410</height>
diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp
index 78ef7af..75642c8 100644
--- a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp
+++ b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp
@@ -52,7 +52,7 @@ ExecCatalog::~ExecCatalog()
 
 void ExecCatalog::queryChanged()
 {
-	int newtqStatus = 0;
+	int newStatus = 0;
 	TQString cmd = query();
 	int origLength = cmd.length();
 
@@ -67,12 +67,12 @@ void ExecCatalog::queryChanged()
 			//set status.
 			//add S_Multiple to make sure katapult doesn't auto-exec and close the window
 			//add S_Active to make sure katapult doesn't start the hideTimer or clearTimer
-			newtqStatus = S_HasResults | S_Multiple | S_Active;
+			newStatus = S_HasResults | S_Multiple | S_Active;
 		} else {
-			newtqStatus = 0;
+			newStatus = 0;
 		}
 	}
-	settqStatus(newtqStatus);
+	setStatus(newStatus);
 }
 
 bool ExecCatalog::accepts(const TQString& str) const
diff --git a/katapult/plugins/catalogs/execcatalog/settings.ui b/katapult/plugins/catalogs/execcatalog/settings.ui
index 9cfba9a..892cfb7 100644
--- a/katapult/plugins/catalogs/execcatalog/settings.ui
+++ b/katapult/plugins/catalogs/execcatalog/settings.ui
@@ -50,7 +50,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>150</height>
diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
index 050d135..0c0b7c2 100644
--- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
+++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
@@ -52,7 +52,7 @@ GoogleCatalog::~GoogleCatalog()
 
 void GoogleCatalog::queryChanged()
 {
-	int newtqStatus = 0;
+	int newStatus = 0;
 	TQString cmd = query();
 	int origLength = cmd.length();
 
@@ -67,12 +67,12 @@ void GoogleCatalog::queryChanged()
 			//set status.
 			//add S_Multiple to make sure katapult doesn't auto-exec and close the window
 			//add S_Active to make sure katapult doesn't start the hideTimer or clearTimer
-			newtqStatus = S_HasResults | S_Multiple | S_Active;
+			newStatus = S_HasResults | S_Multiple | S_Active;
 		} else {
-			newtqStatus = 0;
+			newStatus = 0;
 		}
 	}
-	settqStatus(newtqStatus);
+	setStatus(newStatus);
 }
 
 bool GoogleCatalog::accepts(const TQString& str) const
diff --git a/katapult/plugins/catalogs/googlecatalog/settings.ui b/katapult/plugins/catalogs/googlecatalog/settings.ui
index 27b2ef4..fe8ff14 100644
--- a/katapult/plugins/catalogs/googlecatalog/settings.ui
+++ b/katapult/plugins/catalogs/googlecatalog/settings.ui
@@ -50,7 +50,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>150</height>
diff --git a/katapult/plugins/catalogs/programcatalog/settings.ui b/katapult/plugins/catalogs/programcatalog/settings.ui
index d62d902..42a21a8 100644
--- a/katapult/plugins/catalogs/programcatalog/settings.ui
+++ b/katapult/plugins/catalogs/programcatalog/settings.ui
@@ -85,7 +85,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>370</height>
diff --git a/katapult/plugins/catalogs/spellcatalog/settings.ui b/katapult/plugins/catalogs/spellcatalog/settings.ui
index d1d6fa2..39a01e8 100644
--- a/katapult/plugins/catalogs/spellcatalog/settings.ui
+++ b/katapult/plugins/catalogs/spellcatalog/settings.ui
@@ -50,7 +50,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>150</height>
diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
index cbc3b8b..93e103c 100644
--- a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
+++ b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
@@ -52,7 +52,7 @@ SpellCatalog::~SpellCatalog()
 
 void SpellCatalog::queryChanged()
 {
-	int newtqStatus = 0;
+	int newStatus = 0;
 	TQString cmd = query();
 	int origLength = cmd.length();
 
@@ -67,12 +67,12 @@ void SpellCatalog::queryChanged()
 			//set status.
 			//add S_Multiple to make sure katapult doesn't auto-exec and close the window
 			//add S_Active to make sure katapult doesn't start the hideTimer or clearTimer
-			newtqStatus = S_HasResults | S_Multiple | S_Active;
+			newStatus = S_HasResults | S_Multiple | S_Active;
 		} else {
-			newtqStatus = 0;
+			newStatus = 0;
 		}
 	}
-	settqStatus(newtqStatus);
+	setStatus(newStatus);
 }
 
 bool SpellCatalog::accepts(const TQString& str) const