Remove additional unneeded tq method conversions

12 files changed, 48 insertions, 48 deletions

diff --git a/kpat/card.cpp b/kpat/card.cpp
index 30f5d81d..d3dba426 100644
--- a/kpat/card.cpp
+++ b/kpat/card.cpp
@@ -45,7 +45,7 @@ Card::Card( Rank r, Suit s, TQCanvas* _parent )
 {
     // Set the name of the card
     // FIXME: i18n()
-    m_name = TQString("%1 %2").tqarg(suit_names[s-1]).tqarg(rank_names[r-1]).utf8();
+    m_name = TQString("%1 %2").arg(suit_names[s-1]).arg(rank_names[r-1]).utf8();
 
     // Default for the card is face up, standard size.
     m_faceup = true;
diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp
index d49c3f15..dbd27787 100644
--- a/kpat/dealer.cpp
+++ b/kpat/dealer.cpp
@@ -1160,14 +1160,14 @@ void Dealer::won()
     { // wrap in own scope to make KConfigGroupSave work
 	KConfig *config = kapp->config();
 	KConfigGroupSaver kcs(config, scores_group);
-	unsigned int n = config->readUnsignedNumEntry(TQString("won%1").tqarg(_id),0) + 1;
-	config->writeEntry(TQString("won%1").tqarg(_id),n);
-	n = config->readUnsignedNumEntry(TQString("winstreak%1").tqarg(_id),0) + 1;
-	config->writeEntry(TQString("winstreak%1").tqarg(_id),n);
-	unsigned int m = config->readUnsignedNumEntry(TQString("maxwinstreak%1").tqarg(_id),0);
+	unsigned int n = config->readUnsignedNumEntry(TQString("won%1").arg(_id),0) + 1;
+	config->writeEntry(TQString("won%1").arg(_id),n);
+	n = config->readUnsignedNumEntry(TQString("winstreak%1").arg(_id),0) + 1;
+	config->writeEntry(TQString("winstreak%1").arg(_id),n);
+	unsigned int m = config->readUnsignedNumEntry(TQString("maxwinstreak%1").arg(_id),0);
 	if (n>m)
-	    config->writeEntry(TQString("maxwinstreak%1").tqarg(_id),n);
-	config->writeEntry(TQString("loosestreak%1").tqarg(_id),0);
+	    config->writeEntry(TQString("maxwinstreak%1").arg(_id),n);
+	config->writeEntry(TQString("loosestreak%1").arg(_id),0);
     }
 
     // sort cards by increasing z
@@ -1430,9 +1430,9 @@ void Dealer::countGame()
         kdDebug(11111) << "counting game as played." << endl;
         KConfig *config = kapp->config();
         KConfigGroupSaver kcs(config, scores_group);
-        unsigned int Total = config->readUnsignedNumEntry(TQString("total%1").tqarg(_id),0);
+        unsigned int Total = config->readUnsignedNumEntry(TQString("total%1").arg(_id),0);
         ++Total;
-        config->writeEntry(TQString("total%1").tqarg(_id),Total);
+        config->writeEntry(TQString("total%1").arg(_id),Total);
         _gameRecorded = true;
     }
 }
@@ -1443,12 +1443,12 @@ void Dealer::countLoss()
         // update score
         KConfig *config = kapp->config();
         KConfigGroupSaver kcs(config, scores_group);
-        unsigned int n = config->readUnsignedNumEntry(TQString("loosestreak%1").tqarg(_id),0) + 1;
-        config->writeEntry(TQString("loosestreak%1").tqarg(_id),n);
-        unsigned int m = config->readUnsignedNumEntry(TQString("maxloosestreak%1").tqarg(_id),0);
+        unsigned int n = config->readUnsignedNumEntry(TQString("loosestreak%1").arg(_id),0) + 1;
+        config->writeEntry(TQString("loosestreak%1").arg(_id),n);
+        unsigned int m = config->readUnsignedNumEntry(TQString("maxloosestreak%1").arg(_id),0);
         if (n>m)
-            config->writeEntry(TQString("maxloosestreak%1").tqarg(_id),n);
-        config->writeEntry(TQString("winstreak%1").tqarg(_id),0);
+            config->writeEntry(TQString("maxloosestreak%1").arg(_id),n);
+        config->writeEntry(TQString("winstreak%1").arg(_id),0);
     }
 }
 
diff --git a/kpat/freecell-solver/caas.c b/kpat/freecell-solver/caas.c
index 8e8f5ebb..82492f34 100644
--- a/kpat/freecell-solver/caas.c
+++ b/kpat/freecell-solver/caas.c
@@ -531,7 +531,7 @@ GCC_INLINE int freecell_solver_check_and_add_state(
         /* The new state was not found in the cache, and it was already inserted */
         if (new_state->parent)
         {
-            new_state->parent->num_active_tqchildren++;
+            new_state->parent->num_active_children++;
         }
         instance->num_states_in_collection++;
 
diff --git a/kpat/freecell-solver/pqueue.c b/kpat/freecell-solver/pqueue.c
index 90afc168..47e6280d 100644
--- a/kpat/freecell-solver/pqueue.c
+++ b/kpat/freecell-solver/pqueue.c
@@ -145,7 +145,7 @@ void *freecell_solver_PQueuePop( PTQUEUE *pq)
 
         for( i=PTQ_FIRST_ENTRY; (child = PTQ_LEFT_CHILD_INDEX(i)) <= CurrentSize; i=child )
         {
-            /* set child to the smaller of the two tqchildren... */
+            /* set child to the smaller of the two children... */
 
             if( (child != CurrentSize) &&
                 (PGetRating(Elements[child + 1]) > PGetRating(Elements[child])) )
diff --git a/kpat/freecell-solver/pqueue.h b/kpat/freecell-solver/pqueue.h
index 875741ae..cef1b854 100644
--- a/kpat/freecell-solver/pqueue.h
+++ b/kpat/freecell-solver/pqueue.h
@@ -47,7 +47,7 @@ typedef struct _PTQUEUE
 #define PTQ_PARENT_INDEX(i) ((i)>>1)
 #define PTQ_FIRST_ENTRY (1)
 
-/* left and right tqchildren are index * 2 and (index * 2) +1 respectively */
+/* left and right children are index * 2 and (index * 2) +1 respectively */
 #define PTQ_LEFT_CHILD_INDEX(i) ((i)<<1)
 #define PTQ_RIGHT_CHILD_INDEX(i) (((i)<<1)+1)
 
diff --git a/kpat/freecell-solver/state.h b/kpat/freecell-solver/state.h
index 302d6d9a..e52b717c 100644
--- a/kpat/freecell-solver/state.h
+++ b/kpat/freecell-solver/state.h
@@ -77,7 +77,7 @@ struct fcs_struct_state_with_locations_t
     int depth;
     int visited;
     int visited_iter;
-    int num_active_tqchildren;
+    int num_active_children;
     int scan_visited[MAX_NUM_SCANS_BUCKETS];
 };
 
@@ -237,7 +237,7 @@ struct fcs_struct_state_with_locations_t
     int depth;
     int visited;
     int visited_iter;
-    int num_active_tqchildren;
+    int num_active_children;
     int scan_visited[MAX_NUM_SCANS_BUCKETS];
 };
 
@@ -508,11 +508,11 @@ struct fcs_struct_state_with_locations_t
      * */
     int visited_iter;
     /*
-     * This is the number of direct tqchildren of this state which were not
+     * This is the number of direct children of this state which were not
      * yet declared as dead ends. Once this counter reaches zero, this
      * state too is declared as a dead end.
      * */
-    int num_active_tqchildren;
+    int num_active_children;
     /*
      * This is a vector of flags - one for each scan. Each indicates whether
      * its scan has already visited this state
diff --git a/kpat/freecell-solver/test_arr.h b/kpat/freecell-solver/test_arr.h
index 911ff511..cfc5cd12 100644
--- a/kpat/freecell-solver/test_arr.h
+++ b/kpat/freecell-solver/test_arr.h
@@ -88,8 +88,8 @@ extern freecell_solver_solve_for_state_test_t freecell_solver_sfs_tests[FCS_TEST
         if (ptr_state != NULL)                    \
         {           \
             /* Decrease the refcount of the state */    \
-            ptr_state->num_active_tqchildren--;   \
-            while((ptr_state->num_active_tqchildren == 0) && (ptr_state->visited & FCS_VISITED_ALL_TESTS_DONE))  \
+            ptr_state->num_active_children--;   \
+            while((ptr_state->num_active_children == 0) && (ptr_state->visited & FCS_VISITED_ALL_TESTS_DONE))  \
             {          \
                 /* Mark as dead end */        \
                 ptr_state->visited |= FCS_VISITED_DEAD_END;  \
@@ -100,7 +100,7 @@ extern freecell_solver_solve_for_state_test_t freecell_solver_sfs_tests[FCS_TEST
                     break;             \
                 }      \
                 /* Decrease the refcount */       \
-                ptr_state->num_active_tqchildren--;     \
+                ptr_state->num_active_children--;     \
             }       \
         }   \
     }      \
diff --git a/kpat/freecell-solver/tests.h b/kpat/freecell-solver/tests.h
index 0293ed85..ce0b35b5 100644
--- a/kpat/freecell-solver/tests.h
+++ b/kpat/freecell-solver/tests.h
@@ -66,8 +66,8 @@ extern "C" {
     ptr_new_state_with_locations->depth = ptr_state_with_locations->depth + 1; \
     /* Mark this state as a state that was not yet visited */                  \
     ptr_new_state_with_locations->visited = 0;                                 \
-    /* It's a newly created state which does not have tqchildren yet. */         \
-    ptr_new_state_with_locations->num_active_tqchildren = 0;                     \
+    /* It's a newly created state which does not have children yet. */         \
+    ptr_new_state_with_locations->num_active_children = 0;                     \
     memset(ptr_new_state_with_locations->scan_visited, '\0',                   \
         sizeof(ptr_new_state_with_locations->scan_visited)                     \
         );                                                                     \
@@ -119,13 +119,13 @@ fcs_move_stack_push(moves, temp_move);                                    \
                     );                                                    \
             if (!(existing_state->visited & FCS_VISITED_DEAD_END))        \
             {                                                             \
-                if ((--existing_state->parent->num_active_tqchildren) == 0) \
+                if ((--existing_state->parent->num_active_children) == 0) \
                 {                                                         \
                     mark_as_dead_end(                                     \
                         existing_state->parent                            \
                         );                                                \
                 }                                                         \
-                ptr_state_with_locations->num_active_tqchildren++;          \
+                ptr_state_with_locations->num_active_children++;          \
             }                                                             \
             existing_state->parent = ptr_state_with_locations;            \
             existing_state->depth = ptr_state_with_locations->depth + 1;  \
diff --git a/kpat/freecell.cpp b/kpat/freecell.cpp
index 56f9a043..4575d95b 100644
--- a/kpat/freecell.cpp
+++ b/kpat/freecell.cpp
@@ -280,8 +280,8 @@ void FreecellBase::resumeSolution()
         return;
 
     emit gameInfo(i18n("%1 tries - depth %2")
-                  .tqarg(freecell_solver_user_get_num_times(solver_instance))
-                  .tqarg(freecell_solver_user_get_current_depth(solver_instance)));
+                  .arg(freecell_solver_user_get_num_times(solver_instance))
+                  .arg(freecell_solver_user_get_current_depth(solver_instance)));
 
     if (solver_ret == FCS_STATE_WAS_SOLVED)
     {
@@ -296,7 +296,7 @@ void FreecellBase::resumeSolution()
 	int moves = freecell_solver_user_get_num_times(solver_instance);
         freeSolution();
         emit gameInfo(i18n("unsolved after %1 moves")
-                      .tqarg(moves));
+                      .arg(moves));
         stopDemo();
         return;
     }
@@ -379,7 +379,7 @@ TQString FreecellBase::solverFormat() const
         tmp += suitToString(target[i]->top()->suit()) + "-" + rankToString(target[i]->top()->rank()) + " ";
     }
     if (!tmp.isEmpty())
-        output += TQString::fromLatin1("Foundations: %1\n").tqarg(tmp);
+        output += TQString::fromLatin1("Foundations: %1\n").arg(tmp);
 
     tmp.truncate(0);
     for (uint i = 0; i < freecell.count(); i++) {
@@ -389,7 +389,7 @@ TQString FreecellBase::solverFormat() const
             tmp += rankToString(freecell[i]->top()->rank()) + suitToString(freecell[i]->top()->suit()) + " ";
     }
     if (!tmp.isEmpty())
-        output += TQString::fromLatin1("Freecells: %1\n").tqarg(tmp);
+        output += TQString::fromLatin1("Freecells: %1\n").arg(tmp);
 
     for (uint i = 0; i < store.count(); i++)
     {
@@ -544,7 +544,7 @@ MoveHint *FreecellBase::chooseHint()
 {
     if (solver_instance && freecell_solver_user_get_moves_left(solver_instance)) {
 
-        emit gameInfo(i18n("%1 moves before finish").tqarg(freecell_solver_user_get_moves_left(solver_instance)));
+        emit gameInfo(i18n("%1 moves before finish").arg(freecell_solver_user_get_moves_left(solver_instance)));
 
         fcs_move_t move;
         if (!freecell_solver_user_get_next_move(solver_instance, &move)) {
diff --git a/kpat/gamestats.ui b/kpat/gamestats.ui
index 14daf215..9ad673ea 100644
--- a/kpat/gamestats.ui
+++ b/kpat/gamestats.ui
@@ -84,7 +84,7 @@
                             <property name="text">
                                 <string>%1</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -119,7 +119,7 @@
                             <property name="text">
                                 <string>%1</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -138,7 +138,7 @@
                             <property name="text">
                                 <string>%1</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -157,7 +157,7 @@
                             <property name="text">
                                 <string>%1</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
diff --git a/kpat/gamestatsimpl.cpp b/kpat/gamestatsimpl.cpp
index 2850da01..11b95fee 100644
--- a/kpat/gamestatsimpl.cpp
+++ b/kpat/gamestatsimpl.cpp
@@ -42,16 +42,16 @@ void GameStatsImpl::setGameType(int id)
 	languageChange();
 	KConfig *config = kapp->config();
 	KConfigGroupSaver kcs(config, scores_group);
-	unsigned int t = config->readUnsignedNumEntry(TQString("total%1").tqarg(id),0);
-	Played->setText(Played->text().tqarg(t));
-	unsigned int w = config->readUnsignedNumEntry(TQString("won%1").tqarg(id),0);
-	Won->setText(Won->text().tqarg(w));
+	unsigned int t = config->readUnsignedNumEntry(TQString("total%1").arg(id),0);
+	Played->setText(Played->text().arg(t));
+	unsigned int w = config->readUnsignedNumEntry(TQString("won%1").arg(id),0);
+	Won->setText(Won->text().arg(w));
 	if (t)
-		WonPerc->setText(WonPerc->text().tqarg(w*100/t));
+		WonPerc->setText(WonPerc->text().arg(w*100/t));
 	else
-		WonPerc->setText(WonPerc->text().tqarg(0));
+		WonPerc->setText(WonPerc->text().arg(0));
 	WinStreak->setText(
-		WinStreak->text().tqarg(config->readUnsignedNumEntry(TQString("maxwinstreak%1").tqarg(id),0)));
+		WinStreak->text().arg(config->readUnsignedNumEntry(TQString("maxwinstreak%1").arg(id),0)));
 	LooseStreak->setText(
-		LooseStreak->text().tqarg(config->readUnsignedNumEntry(TQString("maxloosestreak%1").tqarg(id),0)));
+		LooseStreak->text().arg(config->readUnsignedNumEntry(TQString("maxloosestreak%1").arg(id),0)));
 }
diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp
index d51b67f6..4901d75f 100644
--- a/kpat/pwidget.cpp
+++ b/kpat/pwidget.cpp
@@ -239,7 +239,7 @@ void pWidget::changeWallpaper()
         return;
     background = TQPixmap(bgpath);
     if (background.isNull()) {
-        KMessageBox::sorry(this, i18n("<qt>Couldn't load wallpaper<br/>%1</qt>").tqarg(bgpath));
+        KMessageBox::sorry(this, i18n("<qt>Couldn't load wallpaper<br/>%1</qt>").arg(bgpath));
         return;
     }