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

This reverts commit a3703745120ffe8f1beadd5fa58f9ab1470bc2f8.

35 files changed, 115 insertions, 115 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 *);
diff --git a/katapult/katapult/confdisplay.ui b/katapult/katapult/confdisplay.ui
index 2dc3a1c..e0e7d53 100644
--- a/katapult/katapult/confdisplay.ui
+++ b/katapult/katapult/confdisplay.ui
@@ -48,7 +48,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>80</height>
diff --git a/katapult/katapult/confgeneral.ui b/katapult/katapult/confgeneral.ui
index c3d4788..cee6595 100644
--- a/katapult/katapult/confgeneral.ui
+++ b/katapult/katapult/confgeneral.ui
@@ -237,7 +237,7 @@ This sets how long Katapult will wait before hiding the launcher.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>62</height>
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 {
diff --git a/katapult/katapult/katapult.h b/katapult/katapult/katapult.h
index 2270841..b34f34f 100644
--- a/katapult/katapult/katapult.h
+++ b/katapult/katapult/katapult.h
@@ -79,7 +79,7 @@ private:
 	void initAccel(TQWidget *);
 	
 	bool executing;
-	int allStatus;
+	int alltqStatus;
 	KatapultDisplay *display;
 	KGlobalAccel *globalAccel;
 	KActionCollection *actions;
diff --git a/katapult/katapult/katapultconfigdlg.cpp b/katapult/katapult/katapultconfigdlg.cpp
index ea6afce..97a7d24 100644
--- a/katapult/katapult/katapultconfigdlg.cpp
+++ b/katapult/katapult/katapultconfigdlg.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 
 #include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 #include <tqcheckbox.h>
 #include <tqstringlist.h>
@@ -173,7 +173,7 @@ void KatapultConfigDlg::addDisplaySettings()
 	if(displayConfig != 0)
 	{
 		displayConfig->reparent((TQWidget *) display->displaySettings, TQPoint(0, 0));
-		display->displaySettings->layout()->add(displayConfig);
+		display->displaySettings->tqlayout()->add(displayConfig);
 		displayConfig->show();
 	}
 }
diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp
index ec20e79..e0a4dc5 100644
--- a/katapult/katapult/katapultsettings.cpp
+++ b/katapult/katapult/katapultsettings.cpp
@@ -109,14 +109,14 @@ void KatapultSettings::writeSettings()
 	KatapultCatalog *catalog;
 	while((catalog = it.current()) != 0)
 	{
-		KConfigGroup group(config, TQString("Catalogs/%1").arg(it.currentKey()));
+		KConfigGroup group(config, TQString("Catalogs/%1").tqarg(it.currentKey()));
 		catalog->writeSettings(&group);
 		++it;
 	}
 	
 	if(_display != 0)
 	{
-		KConfigGroup group(config, TQString("Displays/%1").arg(_displayName));
+		KConfigGroup group(config, TQString("Displays/%1").tqarg(_displayName));
 		_display->writeSettings(&group);
 	}
 
@@ -323,7 +323,7 @@ void KatapultSettings::loadCatalogPlugins()
 				(service, 0, 0, TQStringList(), &errCode);
 			if(catalog != 0)
 			{
-				KConfigGroup group(kapp->config(), TQString("Catalogs/%1").arg(id));
+				KConfigGroup group(kapp->config(), TQString("Catalogs/%1").tqarg(id));
 				catalog->readSettings(&group);
 				catalog->initialize();
 				_activeCatalogs.insert(id, catalog);
@@ -364,7 +364,7 @@ void KatapultSettings::loadDisplayPlugins()
 	}
 	if(_display != 0)
 	{
-		KConfigGroup group(kapp->config(), TQString("Displays/%1").arg(_displayName));
+		KConfigGroup group(kapp->config(), TQString("Displays/%1").tqarg(_displayName));
 		_display->readSettings(&group);
 	}
 }
diff --git a/katapult/katapult/settings.cpp b/katapult/katapult/settings.cpp
index 33a3ce1..9dd8949 100644
--- a/katapult/katapult/settings.cpp
+++ b/katapult/katapult/settings.cpp
@@ -15,7 +15,7 @@
 #include <tqtabwidget.h>
 #include <tqwidget.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
@@ -35,7 +35,7 @@ MyDialog1::MyDialog1( TQWidget* parent, const char* name, bool modal, WFlags fl
     MyDialog1Layout = new TQGridLayout( this, 1, 1, 11, 6, "MyDialog1Layout"); 
 
     listBox = new TQListBox( this, "listBox" );
-    listBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, listBox->sizePolicy().hasHeightForWidth() ) );
+    listBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, listBox->sizePolicy().hasHeightForWidth() ) );
 
     MyDialog1Layout->addWidget( listBox, 0, 0 );
 
@@ -68,7 +68,7 @@ MyDialog1::MyDialog1( TQWidget* parent, const char* name, bool modal, WFlags fl
 
     MyDialog1Layout->addMultiCellLayout( Layout1, 1, 1, 0, 1 );
     languageChange();
-    resize( TQSize(597, 364).expandedTo(minimumSizeHint()) );
+    resize( TQSize(597, 364).expandedTo(tqminimumSizeHint()) );
     clearWState( WState_Polished );
 
     // signals and slots connections
diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
index 6ad0892..7ca1f9b 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());
-	_gotCollectionStatus = false;
+	_gotCollectiontqStatus = false;
 	_dynamicCollection = false;
 	checkCollectionType();	
 
@@ -58,16 +58,16 @@ AmarokCatalog::~AmarokCatalog()
 
 void AmarokCatalog::queryChanged()
 {
-	int newStatus = 0;
+	int newtqStatus = 0;
 	TQString queryString = query();
 	
 	if((TQString(queryString).remove(':').remove('\"').remove(' ').isEmpty()) || (queryString.length() < _minQueryLen)) {
 		reset();
 		setBestMatch(Match());
-		setStatus(0);
+		settqStatus(0);
 	} else {
 
-		if ( _gotCollectionStatus)
+		if ( _gotCollectiontqStatus)
 		{
 
 			if (!_dynamicCollection)
@@ -89,8 +89,8 @@ void AmarokCatalog::queryChanged()
 		
 				queryList = TQStringList::split ( TQString(" "), TQString(queryString).replace(TQChar(':')," ").replace(TQChar('\''), " ").replace(TQChar('\''), "%") );	
 				for(TQStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) {
-					sqlQuery.append(TQString(" AND (t.title LIKE '\%%1\%'").arg(*it));
-					sqlQuery.append(TQString(" OR a.name LIKE '\%%1\%')").arg(*it));
+					sqlQuery.append(TQString(" AND (t.title LIKE '\%%1\%'").tqarg(*it));
+					sqlQuery.append(TQString(" OR a.name LIKE '\%%1\%')").tqarg(*it));
 				}
 				sqlQuery.append(" ORDER BY a.name, t.title, s.percentage DESC");
 				
@@ -101,7 +101,7 @@ void AmarokCatalog::queryChanged()
 				arg << sqlQuery;
 				if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)",
 				     sqlQueryData, replyType, replyData)) {
-					newStatus = 0;
+					newtqStatus = 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()) {
-							newStatus = 0;
+							newtqStatus = 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() )
-								newStatus = S_HasResults | S_Multiple;
+								newtqStatus = S_HasResults | S_Multiple;
 							else 
-								newStatus = S_HasResults;
+								newtqStatus = S_HasResults;
 						}
 					} else {
-						newStatus = 0;
+						newtqStatus = 0;
 					}
 				}
 
@@ -163,8 +163,8 @@ void AmarokCatalog::queryChanged()
         TQStringList clauses;
 				for(TQStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) {
 
-					clauses += TQString(" (t.title LIKE '\%%1\%'").arg(*it) +
-            TQString(" OR a.name LIKE '\%%1\%')").arg(*it);
+					clauses += TQString(" (t.title LIKE '\%%1\%'").tqarg(*it) +
+            TQString(" OR a.name LIKE '\%%1\%')").tqarg(*it);
 				}
         sqlQuery.append(clauses.join(TQString(" AND ")));
 				sqlQuery.append(" ORDER BY a.name, t.title, s.percentage DESC");
@@ -176,7 +176,7 @@ void AmarokCatalog::queryChanged()
 				arg << sqlQuery;
 				if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)",
 				     sqlQueryData, replyType, replyData)) {
-					newStatus = 0;
+					newtqStatus = 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()) {
-							newStatus = 0;
+							newtqStatus = 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() )
-								newStatus = S_HasResults | S_Multiple;
+								newtqStatus = S_HasResults | S_Multiple;
 							else 
-								newStatus = S_HasResults;
+								newtqStatus = S_HasResults;
 						}
 					} else {
-						newStatus = 0;
+						newtqStatus = 0;
 					}
 				}
 
 
 			} //end of >1.4.2 section
-		setStatus(newStatus);
+		settqStatus(newtqStatus);
 
 		} else {                //We haven't got the collection status
 
 			checkCollectionType();	
 			reset();
 			setBestMatch(Match());
-			setStatus(0);
+			settqStatus(0);
 		}
 
 
@@ -275,7 +275,7 @@ void AmarokCatalog::checkCollectionType()
 	arg << sqlQuery;
 	if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)", sqlQueryData, replyType, replyData))
 	{
-		_gotCollectionStatus = false;
+		_gotCollectiontqStatus = false;
 
 	}
 	else
@@ -296,11 +296,11 @@ void AmarokCatalog::checkCollectionType()
 				_dynamicCollection = false;
 
 			}
-			_gotCollectionStatus = true;
+			_gotCollectiontqStatus = true;
 		}
 		else
 		{
-			_gotCollectionStatus = false;
+			_gotCollectiontqStatus = false;
 		}
 	}
 }
diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h
index f103bec..aaff457 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 _gotCollectionStatus;	
+	bool _gotCollectiontqStatus;	
 	Song _result;
 };
 
diff --git a/katapult/plugins/catalogs/amarokcatalog/settings.ui b/katapult/plugins/catalogs/amarokcatalog/settings.ui
index 350a20e..384f4fc 100644
--- a/katapult/plugins/catalogs/amarokcatalog/settings.ui
+++ b/katapult/plugins/catalogs/amarokcatalog/settings.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -64,7 +64,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>370</height>
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/settings.ui b/katapult/plugins/catalogs/bookmarkcatalog/settings.ui
index 24ae2e2..c6f900b 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/settings.ui
+++ b/katapult/plugins/catalogs/bookmarkcatalog/settings.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -98,7 +98,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>100</height>
diff --git a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp
index 038071e..74fce5b 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp
+++ b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp
@@ -28,7 +28,7 @@
 #include <kurl.h>
 #include <klocale.h>
 
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include "calculatorcatalog.h"
 #include "expression.h"
@@ -150,7 +150,7 @@ void ActionEvaluateExpression::execute(const KatapultItem* item) const
 
 		// Copy calculation and result into clipboard (unless there's a parse error).
 		if (!_expr->parseError()) {
-			TQClipboard *cb = TQApplication::clipboard();
+			TQClipboard *cb = TQApplication::tqclipboard();
 			TQString s = _expr->catalog()->formatString();
 			s.replace("%1", _expr->text());
 			s.replace("%2", text());
diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp
index 724c371..05a6c74 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 newStatus = 0;
+	int newtqStatus = 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
-			newStatus = S_HasResults | S_Multiple | S_Active;
+			newtqStatus = S_HasResults | S_Multiple | S_Active;
 		} else {
-			newStatus = 0;
+			newtqStatus = 0;
 		}
 	}
-	setStatus(newStatus);
+	settqStatus(newtqStatus);
 }
 
 void CalculatorCatalog::reset()
diff --git a/katapult/plugins/catalogs/calculatorcatalog/settings.ui b/katapult/plugins/catalogs/calculatorcatalog/settings.ui
index ca86824..a1a0c18 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/settings.ui
+++ b/katapult/plugins/catalogs/calculatorcatalog/settings.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout13</cstring>
+                <cstring>tqlayout13</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -59,7 +59,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -156,7 +156,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -200,7 +200,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp b/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp
index 06c71da..3de6f5a 100644
--- a/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp
+++ b/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp
@@ -51,7 +51,7 @@ void ActionOpenDocument::execute(const KatapultItem* item) const
 {
 	if(strcmp(item->className(), "Document") == 0 || strcmp(item->className(), "Directory") == 0) {
 	    const Document *document = (const Document *) item;
-		qDebug("%s", TQString("Running: %1").arg(document->path()).latin1());
+		qDebug("%s", TQString("Running: %1").tqarg(document->path()).latin1());
 		new KRun(document->path());
 	}
 }
diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
index bdcc1c6..faa129c 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 newStatus = 0;
+	int newtqStatus = 0;
 	if(query() == "")
 	{
 		// reset query
@@ -169,21 +169,21 @@ void DocumentCatalog::queryChanged()
 			if(currentDirDoc != 0 && path.isEmpty())
 				newBestMatch = Match(currentDirDoc, 100, currentPath.length());
 
-			newStatus |= S_Active;
+			newtqStatus |= S_Active;
 			if(files.count() > 0)
 			{
-				newStatus |= S_HasResults;
+				newtqStatus |= S_HasResults;
 				if(files.count() > 1 || files.at(0)->className() == "Directory")
-					newStatus |= S_Multiple;
+					newtqStatus |= S_Multiple;
 			} else
-				newStatus |= S_NoResults;
+				newtqStatus |= S_NoResults;
 				
  			setBestMatch(newBestMatch);
 		} else {
 			setBestMatch(Match());
 		}
 	}
-	setStatus(newStatus);
+	settqStatus(newtqStatus);
 }
 
 unsigned int DocumentCatalog::minQueryLen() const
diff --git a/katapult/plugins/catalogs/documentcatalog/settings.ui b/katapult/plugins/catalogs/documentcatalog/settings.ui
index d688553..6f3c990 100644
--- a/katapult/plugins/catalogs/documentcatalog/settings.ui
+++ b/katapult/plugins/catalogs/documentcatalog/settings.ui
@@ -18,7 +18,7 @@
     <vbox>
     <widget class="TQLayoutWidget">
         <property name="name">
-            <cstring>layout1</cstring>
+            <cstring>tqlayout1</cstring>
         </property>
         <hbox>
             <property name="name">
@@ -66,7 +66,7 @@
 	    <property name="sizeType">
 		    <enum>Expanding</enum>
 	    </property>
-	    <property name="sizeHint">
+	    <property name="tqsizeHint">
 		    <size>
 			    <width>20</width>
 			    <height>410</height>
diff --git a/katapult/plugins/catalogs/execcatalog/command.cpp b/katapult/plugins/catalogs/execcatalog/command.cpp
index 02583d2..5954405 100644
--- a/katapult/plugins/catalogs/execcatalog/command.cpp
+++ b/katapult/plugins/catalogs/execcatalog/command.cpp
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <kapplication.h>
 
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include "execcatalog.h"
 #include "command.h"
diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp
index 7915065..78ef7af 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 newStatus = 0;
+	int newtqStatus = 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
-			newStatus = S_HasResults | S_Multiple | S_Active;
+			newtqStatus = S_HasResults | S_Multiple | S_Active;
 		} else {
-			newStatus = 0;
+			newtqStatus = 0;
 		}
 	}
-	setStatus(newStatus);
+	settqStatus(newtqStatus);
 }
 
 bool ExecCatalog::accepts(const TQString& str) const
@@ -99,7 +99,7 @@ TQWidget * ExecCatalog::configure()
 	settings->triggerWordLE->setText(_triggerWord);
 	connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&)));
 
-	settings->introLabel->setText(i18n("Use with \"%1 exec query\"").arg(_triggerWord));
+	settings->introLabel->setText(i18n("Use with \"%1 exec query\"").tqarg(_triggerWord));
 
 	return settings;
 }
diff --git a/katapult/plugins/catalogs/execcatalog/settings.ui b/katapult/plugins/catalogs/execcatalog/settings.ui
index 892cfb7..9cfba9a 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="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>150</height>
diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
index a6493e6..050d135 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 newStatus = 0;
+	int newtqStatus = 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
-			newStatus = S_HasResults | S_Multiple | S_Active;
+			newtqStatus = S_HasResults | S_Multiple | S_Active;
 		} else {
-			newStatus = 0;
+			newtqStatus = 0;
 		}
 	}
-	setStatus(newStatus);
+	settqStatus(newtqStatus);
 }
 
 bool GoogleCatalog::accepts(const TQString& str) const
@@ -99,7 +99,7 @@ TQWidget * GoogleCatalog::configure()
 	settings->triggerWordLE->setText(_triggerWord);
 	connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&)));
 
-	settings->introLabel->setText(i18n("Use with \"%1 search query\"").arg(_triggerWord));
+	settings->introLabel->setText(i18n("Use with \"%1 search query\"").tqarg(_triggerWord));
 
 	return settings;
 }
diff --git a/katapult/plugins/catalogs/googlecatalog/query.cpp b/katapult/plugins/catalogs/googlecatalog/query.cpp
index d34aed9..96c7aa6 100644
--- a/katapult/plugins/catalogs/googlecatalog/query.cpp
+++ b/katapult/plugins/catalogs/googlecatalog/query.cpp
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <kapplication.h>
 
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include "googlecatalog.h"
 #include "query.h"
diff --git a/katapult/plugins/catalogs/googlecatalog/settings.ui b/katapult/plugins/catalogs/googlecatalog/settings.ui
index fe8ff14..27b2ef4 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="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>150</height>
diff --git a/katapult/plugins/catalogs/programcatalog/settings.ui b/katapult/plugins/catalogs/programcatalog/settings.ui
index 16c5e91..d62d902 100644
--- a/katapult/plugins/catalogs/programcatalog/settings.ui
+++ b/katapult/plugins/catalogs/programcatalog/settings.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -85,7 +85,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>370</height>
diff --git a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp
index 5b19d69..51f2068 100644
--- a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp
+++ b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp
@@ -26,7 +26,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include "spellcatalog.h"
 #include "spelling.h"
diff --git a/katapult/plugins/catalogs/spellcatalog/settings.ui b/katapult/plugins/catalogs/spellcatalog/settings.ui
index 39a01e8..d1d6fa2 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="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>150</height>
diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
index fce2495..cbc3b8b 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 newStatus = 0;
+	int newtqStatus = 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
-			newStatus = S_HasResults | S_Multiple | S_Active;
+			newtqStatus = S_HasResults | S_Multiple | S_Active;
 		} else {
-			newStatus = 0;
+			newtqStatus = 0;
 		}
 	}
-	setStatus(newStatus);
+	settqStatus(newtqStatus);
 }
 
 bool SpellCatalog::accepts(const TQString& str) const
@@ -99,7 +99,7 @@ TQWidget * SpellCatalog::configure()
 	settings->triggerWordLE->setText(_triggerWord);
 	connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&)));
 
-	settings->introLabel->setText(i18n("Use with \"%1 myword\"").arg(_triggerWord));
+	settings->introLabel->setText(i18n("Use with \"%1 myword\"").tqarg(_triggerWord));
 
 	return settings;
 }
diff --git a/katapult/plugins/catalogs/spellcatalog/spelling.cpp b/katapult/plugins/catalogs/spellcatalog/spelling.cpp
index 706d03e..edadc18 100644
--- a/katapult/plugins/catalogs/spellcatalog/spelling.cpp
+++ b/katapult/plugins/catalogs/spellcatalog/spelling.cpp
@@ -26,7 +26,7 @@
 #include <kiconloader.h>
 #include <kapplication.h>
 
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include "spellcatalog.h"
 #include "spelling.h"
@@ -125,7 +125,7 @@ void Spelling::evaluate() const
 }
 
 void Spelling::copyToClipboard() const {
-	TQClipboard* clipBoard = TQApplication::clipboard();
+	TQClipboard* clipBoard = TQApplication::tqclipboard();
 	clipBoard->setText(suggestedWords, TQClipboard::Clipboard);
 	clipBoard->setText(suggestedWords, TQClipboard::Selection);
 }