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

This reverts commit a3703745120ffe8f1beadd5fa58f9ab1470bc2f8.

7 files changed, 18 insertions, 18 deletions

diff --git a/katapult/common/cachedcatalog.cpp b/katapult/common/cachedcatalog.cpp
index 07824a6..19c15a9 100644
--- a/katapult/common/cachedcatalog.cpp
+++ b/katapult/common/cachedcatalog.cpp
@@ -46,7 +46,7 @@ unsigned int CachedCatalog::minQueryLen() const
 
 void CachedCatalog::queryChanged()
 {
-	int newStatus = 0;
+	int newtqStatus = 0;
 	if(query() == "")
 	{
 		results.clear();
@@ -87,19 +87,19 @@ void CachedCatalog::queryChanged()
 				}
 			}
 			
-			newStatus |= S_Active;
+			newtqStatus |= S_Active;
 			if(results.count() > 0)
 			{
-				newStatus |= S_HasResults;
+				newtqStatus |= S_HasResults;
 				if(results.count() > 1)
-					newStatus |= S_Multiple;
+					newtqStatus |= S_Multiple;
 			} else
-				newStatus |= S_NoResults;
+				newtqStatus |= S_NoResults;
 				
 			setBestMatch(newBestMatch);
 		}
 	}
-	setStatus(newStatus);
+	settqStatus(newtqStatus);
 }
 
 Match CachedCatalog::queryItem(const KatapultItem *item, TQString query) const
diff --git a/katapult/common/imagedisplay.cpp b/katapult/common/imagedisplay.cpp
index eee9de1..2204615 100644
--- a/katapult/common/imagedisplay.cpp
+++ b/katapult/common/imagedisplay.cpp
@@ -208,7 +208,7 @@ void ImageDisplay::drawText(TQPixmap & pixmap, int x, int width, TQString text,
 	TQPainter painter(&pixmap);
 	painter.setFont(font);
 
-	painter.setPen(colorGroup().color(TQColorGroup::Link));
+	painter.setPen(tqcolorGroup().color(TQColorGroup::Link));
 	painter.drawText(x, singlesize[1]-offset[3], hilighted);
 	painter.setPen(TQColor(255, 255, 255));
 	painter.drawText(x+metrics.width(hilighted), singlesize[1]-offset[3], remaining);
diff --git a/katapult/common/imagedisplaysettings.ui b/katapult/common/imagedisplaysettings.ui
index 3e77f36..84e0bb7 100644
--- a/katapult/common/imagedisplaysettings.ui
+++ b/katapult/common/imagedisplaysettings.ui
@@ -66,7 +66,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -90,7 +90,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>91</width>
                                     <height>20</height>
@@ -106,7 +106,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout7</cstring>
+                        <cstring>tqlayout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -130,7 +130,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>181</width>
                                     <height>20</height>
@@ -146,7 +146,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -170,7 +170,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>191</width>
                                     <height>20</height>
@@ -196,7 +196,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>160</height>
diff --git a/katapult/common/katapultcatalog.cpp b/katapult/common/katapultcatalog.cpp
index 65ff83d..4fb0eeb 100644
--- a/katapult/common/katapultcatalog.cpp
+++ b/katapult/common/katapultcatalog.cpp
@@ -50,7 +50,7 @@ void KatapultCatalog::setQuery(TQString _query)
 	}
 }
 
-void KatapultCatalog::setStatus(int _status)
+void KatapultCatalog::settqStatus(int _status)
 {
 	this->_status = _status;
 }
diff --git a/katapult/common/katapultcatalog.h b/katapult/common/katapultcatalog.h
index e97569b..cc861b5 100644
--- a/katapult/common/katapultcatalog.h
+++ b/katapult/common/katapultcatalog.h
@@ -53,7 +53,7 @@ public:
 protected:
 	TQString query() const;
 	
-	void setStatus(int);
+	void settqStatus(int);
 	void setBestMatch(Match);
 	
 	virtual void queryChanged();
diff --git a/katapult/common/katapultdisplay.cpp b/katapult/common/katapultdisplay.cpp
index b6d3dc6..fdb02a5 100644
--- a/katapult/common/katapultdisplay.cpp
+++ b/katapult/common/katapultdisplay.cpp
@@ -76,7 +76,7 @@ void KatapultDisplay::setAction(const KatapultAction *_action)
 	this->_action = _action;
 }
 
-void KatapultDisplay::setStatus(int _status)
+void KatapultDisplay::settqStatus(int _status)
 {
 	this->_status = _status;
 }
diff --git a/katapult/common/katapultdisplay.h b/katapult/common/katapultdisplay.h
index 414c597..bea1702 100644
--- a/katapult/common/katapultdisplay.h
+++ b/katapult/common/katapultdisplay.h
@@ -46,7 +46,7 @@ public:
 	void setSelected(unsigned int);
 	void setItem(const KatapultItem *);
 	void setAction(const KatapultAction *);
-	void setStatus(int);
+	void settqStatus(int);
 
 	virtual void readSettings(KConfigBase *);
 	virtual void writeSettings(KConfigBase *);