From a3703745120ffe8f1beadd5fa58f9ab1470bc2f8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:30:03 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp    | 4 ++--
 katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp | 8 ++++----
 katapult/plugins/catalogs/calculatorcatalog/settings.ui           | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp
index 74fce5b..038071e 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 <tqclipboard.h>
+#include <clipboard.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::tqclipboard();
+			TQClipboard *cb = TQApplication::clipboard();
 			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 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..ca86824 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>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -59,7 +59,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -156,7 +156,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -200,7 +200,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
-- 
cgit v1.2.1