TQt4 port Katapult

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/katapult@1233929 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 15 insertions, 15 deletions

diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
index a180a30..050d135 100644
--- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
+++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
@@ -29,8 +29,8 @@
 #include <ksycocatype.h>
 #include <kapplication.h>
 
-#include <qlineedit.h>
-#include <qlabel.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
 
 #include "settings.h"
 #include "googlecatalog.h"
@@ -41,7 +41,7 @@
 K_EXPORT_COMPONENT_FACTORY( katapult_googlecatalog,
                             KGenericFactory<GoogleCatalog>( "katapult_googlecatalog" ) )
 
-GoogleCatalog::GoogleCatalog(QObject*, const char*, const QStringList&): _result(this, QString::null)
+GoogleCatalog::GoogleCatalog(TQObject*, const char*, const TQStringList&): _result(this, TQString())
 {
 	ActionRegistry::self()->registerAction(new ActionSearch());
 }
@@ -52,8 +52,8 @@ GoogleCatalog::~GoogleCatalog()
 
 void GoogleCatalog::queryChanged()
 {
-	int newStatus = 0;
-	QString cmd = query();
+	int newtqStatus = 0;
+	TQString cmd = query();
 	int origLength = cmd.length();
 
 	if (cmd.isEmpty()) {
@@ -67,15 +67,15 @@ 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 QString& str) const
+bool GoogleCatalog::accepts(const TQString& str) const
 {
 	//accept if we begin with the triggerWord
 	int length = _triggerWord.length();
@@ -92,21 +92,21 @@ void GoogleCatalog::writeSettings(KConfigBase* config)
         config->writeEntry("TriggerWord", _triggerWord);
 }
 
-QWidget * GoogleCatalog::configure()
+TQWidget * GoogleCatalog::configure()
 {
 	GoogleCatalogSettings* settings = new GoogleCatalogSettings();
 
 	settings->triggerWordLE->setText(_triggerWord);
-	connect(settings->triggerWordLE, SIGNAL(textChanged(const QString&)), this, SLOT(triggerWordChanged(const QString&)));
+	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;
 }
 
-void GoogleCatalog::triggerWordChanged(const QString& triggerWord)
+void GoogleCatalog::triggerWordChanged(const TQString& triggerWord)
 {
-	_triggerWord = QString(triggerWord);
+	_triggerWord = TQString(triggerWord);
 }
 
 int GoogleCatalog::triggerWordLength()
@@ -116,7 +116,7 @@ int GoogleCatalog::triggerWordLength()
 
 void GoogleCatalog::reset()
 {
-	_result.setText(QString::null);
+	_result.setText(TQString());
 }
 
 #include "googlecatalog.moc"