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

This reverts commit 97d1732e257f8700488d7ca1660ae7eba8fc6065.
---
 ktron/ai.ui         |  4 ++--
 ktron/appearance.ui |  8 ++++----
 ktron/general.ui    |  8 ++++----
 ktron/ktron.cpp     | 14 +++++++-------
 ktron/ktron.h       |  2 +-
 ktron/tron.cpp      | 12 ++++++------
 6 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'ktron')

diff --git a/ktron/ai.ui b/ktron/ai.ui
index 7fcf5df8..dc84bc32 100644
--- a/ktron/ai.ui
+++ b/ktron/ai.ui
@@ -78,7 +78,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>101</width>
                             <height>20</height>
@@ -126,7 +126,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>60</height>
diff --git a/ktron/appearance.ui b/ktron/appearance.ui
index 0c817317..d6176a69 100644
--- a/ktron/appearance.ui
+++ b/ktron/appearance.ui
@@ -90,7 +90,7 @@
                             <property name="text">
                                 <string>Large</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -101,7 +101,7 @@
                             <property name="text">
                                 <string>Small</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
@@ -112,7 +112,7 @@
                             <property name="text">
                                 <string>Medium</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>
@@ -261,7 +261,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
diff --git a/ktron/general.ui b/ktron/general.ui
index c2f1cf4b..0971ec1a 100644
--- a/ktron/general.ui
+++ b/ktron/general.ui
@@ -154,7 +154,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout1</cstring>
+                                <cstring>tqlayout1</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -175,7 +175,7 @@
                                     <property name="text">
                                         <string>Default</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignCenter</set>
                                     </property>
                                 </widget>
@@ -186,7 +186,7 @@
                                     <property name="text">
                                         <string>Fast</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                 </widget>
@@ -204,7 +204,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>21</height>
diff --git a/ktron/ktron.cpp b/ktron/ktron.cpp
index 31437999..9057f7c0 100644
--- a/ktron/ktron.cpp
+++ b/ktron/ktron.cpp
@@ -46,7 +46,7 @@ KTron::KTron(TQWidget *parent, const char *name) : KMainWindow(parent, name) {
   playerPoints[0]=playerPoints[1]=0;
 
   tron=new Tron(this, "Tron");
-  connect(tron,TQT_SIGNAL(gameEnds(Player)),TQT_SLOT(changeStatus(Player)));
+  connect(tron,TQT_SIGNAL(gameEnds(Player)),TQT_SLOT(changetqStatus(Player)));
   setCentralWidget(tron);
   tron->setMinimumSize(200,180);
 
@@ -108,17 +108,17 @@ void KTron::updateStatusbar(){
 
     TQString name;
     if(tron->isComputer(Both))
-      name=i18n("Computer(%1)").arg(i+1);
+      name=i18n("Computer(%1)").tqarg(i+1);
     else if(tron->isComputer(player))
       name=i18n("Computer");
     else
       name=playerName[i];
-    TQString string = TQString("%1: %2").arg(name).arg(playerPoints[i]);
+    TQString string = TQString("%1: %2").tqarg(name).tqarg(playerPoints[i]);
     statusBar()->changeItem(string,ID_STATUS_BASE+i+1);
   }
 }
 
-void KTron::changeStatus(Player player) {
+void KTron::changetqStatus(Player player) {
   // if player=Nobody, then new game
   if(player==Nobody){
     playerPoints[0]=playerPoints[1]=0;
@@ -158,12 +158,12 @@ void KTron::showWinner(Player winner){
   if(!tron->isComputer(winner))
     winnerName = playerName[winner];
   
-  TQString message=i18n("%1 has won!").arg(winnerName);
+  TQString message=i18n("%1 has won!").tqarg(winnerName);
   statusBar()->message(message,MESSAGE_TIME);
 
   message = i18n("%1 has won versus %2 with %3 : %4 points!");
-      message=message.arg(winnerName).arg(loserName);
-      message=message.arg(playerPoints[winner]).arg(playerPoints[loser]);
+      message=message.tqarg(winnerName).tqarg(loserName);
+      message=message.tqarg(playerPoints[winner]).tqarg(playerPoints[loser]);
   
   KMessageBox::information(this, message, i18n("Winner"));
   tron->newGame();
diff --git a/ktron/ktron.h b/ktron/ktron.h
index 6008009d..a46c008c 100644
--- a/ktron/ktron.h
+++ b/ktron/ktron.h
@@ -58,7 +58,7 @@ protected:
 private slots:
   void loadSettings();
   /** updates players points in statusbar and checks if someone has won */
-  void changeStatus(Player);
+  void changetqStatus(Player);
   
   void showWinner(Player winner);
   void showSettings();
diff --git a/ktron/tron.cpp b/ktron/tron.cpp
index 40a384e4..9ed00d8c 100644
--- a/ktron/tron.cpp
+++ b/ktron/tron.cpp
@@ -81,7 +81,7 @@ void Tron::loadSettings(){
   // Style
   if(pixmap){
     updatePixmap();
-    repaint();
+    tqrepaint();
   }
 
   // Backgroundimage
@@ -96,7 +96,7 @@ void Tron::loadSettings(){
         setBackgroundPix(pix);
       } else {
   	TQString msg=i18n("Wasn't able to load wallpaper\n%1");
-	msg=msg.arg(tmpFile);
+	msg=msg.tqarg(tmpFile);
 	KMessageBox::sorry(this, msg);
       }
       KIO::NetAccess::removeTempFile(tmpFile);
@@ -268,7 +268,7 @@ void Tron::showWinner(Player player)
       updatePixmap();
    }
 
-   repaint();
+   tqrepaint();
 
    emit gameEnds(player);
 
@@ -313,8 +313,8 @@ void Tron::updatePixmap()
      }
 
    // draw frame
-   TQColor light=parentWidget()->colorGroup().midlight();
-   TQColor dark=parentWidget()->colorGroup().mid();
+   TQColor light=parentWidget()->tqcolorGroup().midlight();
+   TQColor dark=parentWidget()->tqcolorGroup().mid();
 
    p.setPen(NoPen);
    p.setBrush(light);
@@ -810,7 +810,7 @@ void Tron::showBeginHint()
       if(players[0].score==0 && players[1].score==0)
       {
          beginHint=true;
-         repaint();
+         tqrepaint();
       }
    }
 }
-- 
cgit v1.2.1