From 769d9f539ffa81925d11cf5480e396d26a43b86d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:55:55 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit a3703745120ffe8f1beadd5fa58f9ab1470bc2f8.
---
 katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp |  2 +-
 katapult/plugins/catalogs/spellcatalog/settings.ui            |  2 +-
 katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp       | 10 +++++-----
 katapult/plugins/catalogs/spellcatalog/spelling.cpp           |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'katapult/plugins/catalogs/spellcatalog')

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);
 }
-- 
cgit v1.2.3