Rename old tq methods that no longer need a unique name

6 files changed, 22 insertions, 22 deletions

diff --git a/kpat/CHANGES b/kpat/CHANGES
index d6016123..2480f12e 100644
--- a/kpat/CHANGES
+++ b/kpat/CHANGES
@@ -132,7 +132,7 @@ since kpat-0.2
 
 since kpat-0.1
 
-    - changed shading tqcolorGroup (Paul)
+    - changed shading colorGroup (Paul)
     - fixed drawing of suit symbols (Paul)
     - renamed "very easy" to "cheating" :) (Paul)
     - fixed spurious core dump(Paul)
diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp
index d3cdecad..d49c3f15 100644
--- a/kpat/dealer.cpp
+++ b/kpat/dealer.cpp
@@ -99,7 +99,7 @@ const Dealer *Dealer::instance()
 void Dealer::setBackgroundPixmap(const TQPixmap &background, const TQColor &midcolor)
 {
     _midcolor = midcolor;
-    canvas()->tqsetBackgroundPixmap(background);
+    canvas()->setBackgroundPixmap(background);
     for (PileList::Iterator it = piles.begin(); it != piles.end(); ++it) {
         (*it)->resetCache();
         (*it)->initSizes();
@@ -114,7 +114,7 @@ void Dealer::setupActions() {
 
     if (actions() & Dealer::Hint) {
 
-        ahint = new KAction( i18n("&Hint"), TQString::tqfromLatin1("wizard"), Key_H, TQT_TQOBJECT(this),
+        ahint = new KAction( i18n("&Hint"), TQString::fromLatin1("wizard"), Key_H, TQT_TQOBJECT(this),
                              TQT_SLOT(hint()),
                              parent()->actionCollection(), "game_hint");
         actionlist.append(ahint);
@@ -122,7 +122,7 @@ void Dealer::setupActions() {
         ahint = 0;
 
     if (actions() & Dealer::Demo) {
-        ademo = new KToggleAction( i18n("&Demo"), TQString::tqfromLatin1("1rightarrow"), CTRL+Key_D, TQT_TQOBJECT(this),
+        ademo = new KToggleAction( i18n("&Demo"), TQString::fromLatin1("1rightarrow"), CTRL+Key_D, TQT_TQOBJECT(this),
                                    TQT_SLOT(toggleDemo()),
                                    parent()->actionCollection(), "game_demo");
         actionlist.append(ademo);
@@ -130,14 +130,14 @@ void Dealer::setupActions() {
         ademo = 0;
 
     if (actions() & Dealer::Redeal) {
-        aredeal = new KAction (i18n("&Redeal"), TQString::tqfromLatin1("queue"), 0, TQT_TQOBJECT(this),
+        aredeal = new KAction (i18n("&Redeal"), TQString::fromLatin1("queue"), 0, TQT_TQOBJECT(this),
                                TQT_SLOT(redeal()),
                                parent()->actionCollection(), "game_redeal");
         actionlist.append(aredeal);
     } else
         aredeal = 0;
 
-    parent()->guiFactory()->plugActionList( parent(), TQString::tqfromLatin1("game_actions"), actionlist);
+    parent()->guiFactory()->plugActionList( parent(), TQString::fromLatin1("game_actions"), actionlist);
 }
 
 Dealer::~Dealer()
@@ -145,7 +145,7 @@ Dealer::~Dealer()
 	 if (!_won)
 		 countLoss();
     clearHints();
-    parent()->guiFactory()->unplugActionList( parent(), TQString::tqfromLatin1("game_actions"));
+    parent()->guiFactory()->unplugActionList( parent(), TQString::fromLatin1("game_actions"));
 
     while (!piles.isEmpty())
         delete piles.first(); // removes itself
@@ -535,8 +535,8 @@ void Dealer::resizeEvent(TQResizeEvent *e)
 {
     int x = width();
     int y = height();
-    int hs = horizontalScrollBar()->tqsizeHint().height();
-    int vs = verticalScrollBar()->tqsizeHint().width();
+    int hs = horizontalScrollBar()->sizeHint().height();
+    int vs = verticalScrollBar()->sizeHint().width();
 
     int mx = minsize.width();
     int my = minsize.height();
@@ -778,7 +778,7 @@ void Dealer::setState(State *st)
         CardState s = *it;
         bool target = c->takenDown(); // abused
         s.source->add(c, s.source_index);
-        c->tqsetVisible(s.source->isVisible());
+        c->setVisible(s.source->isVisible());
         c->setAnimated(false);
         c->setX(s.x);
         c->setY(s.y);
@@ -962,7 +962,7 @@ void Dealer::openGame(TQDomDocument &doc)
                                 (*it2)->setX(card.attribute("x").toInt());
                                 (*it2)->setY(card.attribute("y").toInt());
                                 (*it2)->setZ(card.attribute("z").toInt());
-                                (*it2)->tqsetVisible(p->isVisible());
+                                (*it2)->setVisible(p->isVisible());
                                 cards.remove(it2);
                                 break;
                             }
diff --git a/kpat/freecell.cpp b/kpat/freecell.cpp
index 74d00b68..56f9a043 100644
--- a/kpat/freecell.cpp
+++ b/kpat/freecell.cpp
@@ -379,7 +379,7 @@ TQString FreecellBase::solverFormat() const
         tmp += suitToString(target[i]->top()->suit()) + "-" + rankToString(target[i]->top()->rank()) + " ";
     }
     if (!tmp.isEmpty())
-        output += TQString::tqfromLatin1("Foundations: %1\n").tqarg(tmp);
+        output += TQString::fromLatin1("Foundations: %1\n").tqarg(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::tqfromLatin1("Freecells: %1\n").tqarg(tmp);
+        output += TQString::fromLatin1("Freecells: %1\n").tqarg(tmp);
 
     for (uint i = 0; i < store.count(); i++)
     {
diff --git a/kpat/gamestats.ui b/kpat/gamestats.ui
index ac2597fd..14daf215 100644
--- a/kpat/gamestats.ui
+++ b/kpat/gamestats.ui
@@ -173,7 +173,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>250</width>
                             <height>20</height>
@@ -192,7 +192,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>71</height>
@@ -223,7 +223,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kpat/pile.cpp b/kpat/pile.cpp
index fab94efa..8e6ce1db 100644
--- a/kpat/pile.cpp
+++ b/kpat/pile.cpp
@@ -32,7 +32,7 @@ Pile::Pile( int _index, Dealer* _dealer)
     // Make the patience aware of this pile.
     dealer()->addPile(this);
 
-    TQCanvasRectangle::tqsetVisible(true); // default
+    TQCanvasRectangle::setVisible(true); // default
     _checkIndex = -1;
     m_addFlags    = 0;
     m_removeFlags = 0;
@@ -193,12 +193,12 @@ bool Pile::legalRemove(const Card *c) const
 
 void Pile::setVisible(bool vis)
 {
-    TQCanvasRectangle::tqsetVisible(vis);
+    TQCanvasRectangle::setVisible(vis);
     dealer()->enlargeCanvas(this);
 
     for (CardList::Iterator it = m_cards.begin(); it != m_cards.end(); ++it)
     {
-        (*it)->tqsetVisible(vis);
+        (*it)->setVisible(vis);
         dealer()->enlargeCanvas(*it);
     }
 }
diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp
index 428981bf..d51b67f6 100644
--- a/kpat/pwidget.cpp
+++ b/kpat/pwidget.cpp
@@ -75,7 +75,7 @@ pWidget::pWidget()
                            actionCollection(), "save");
     (void)new KAction(i18n("&Choose Game..."), 0, TQT_TQOBJECT(this), TQT_SLOT(chooseGame()),
                       actionCollection(), "choose_game");
-    (void)new KAction(i18n("Restart &Game"), TQString::tqfromLatin1("reload"), 0,
+    (void)new KAction(i18n("Restart &Game"), TQString::fromLatin1("reload"), 0,
                       TQT_TQOBJECT(this), TQT_SLOT(restart()),
                       actionCollection(), "restart_game");
     (void)KStdAction::help(TQT_TQOBJECT(this), TQT_SLOT(helpGame()), actionCollection(), "help_game");
@@ -468,11 +468,11 @@ void pWidget::gameLost()
     // The following code is taken out of kmessagebox.cpp in tdeui.
     // Is there a better way?
     KConfig  *config = 0;
-    TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+    TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
 
     config = KGlobal::config();
     KConfigGroupSaver saver(config,
-			    TQString::tqfromLatin1("Notification Messages"));
+			    TQString::fromLatin1("Notification Messages"));
     TQString dontAsk = config->readEntry(dontAskAgainName).lower();
 
     // If we are ordered never to ask again and to continue the game,