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.
---
 libksirtet/common/ai.cpp         |  6 +++---
 libksirtet/common/field.cpp      |  6 +++---
 libksirtet/common/highscores.cpp |  6 +++---
 libksirtet/common/misc_ui.cpp    | 16 ++++++++--------
 libksirtet/common/misc_ui.h      |  6 +++---
 libksirtet/common/settings.cpp   |  2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'libksirtet/common')

diff --git a/libksirtet/common/ai.cpp b/libksirtet/common/ai.cpp
index 4e397cdd..3960291e 100644
--- a/libksirtet/common/ai.cpp
+++ b/libksirtet/common/ai.cpp
@@ -6,7 +6,7 @@
 #include <tqlabel.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgrid.h>
 #include <tqwhatsthis.h>
 
@@ -343,14 +343,14 @@ TQCString AIConfig::coefficientKey(const char *name)
 
 double AIConfig::coefficient(const AI::Data &data)
 {
-    KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Coefficient_%1").arg(data.name) );
+    KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Coefficient_%1").tqarg(data.name) );
     assert(item);
     return item->property().toDouble();
 }
 
 int AIConfig::trigger(const AI::Data &data)
 {
-    KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Trigger_%1").arg(data.name) );
+    KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Trigger_%1").tqarg(data.name) );
     assert(item);
     return item->property().toInt();
 }
diff --git a/libksirtet/common/field.cpp b/libksirtet/common/field.cpp
index f8cff64a..8b1d3f7b 100644
--- a/libksirtet/common/field.cpp
+++ b/libksirtet/common/field.cpp
@@ -3,7 +3,7 @@
 
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <kprogress.h>
@@ -39,7 +39,7 @@ Field::Field(TQWidget *parent)
 
     // level progress
     levelLabel = new TQLabel(this);
-    levelLabel->setAlignment(AlignCenter);
+    levelLabel->tqsetAlignment(AlignCenter);
     lcds->addWidget(levelLabel, 5, 0);
     toLevel = new KProgress(this);
     toLevel->setTextEnabled(true);
@@ -77,7 +77,7 @@ Field::Field(TQWidget *parent)
     vbl->addStretch(1);
 
     labShowNext = new TQLabel(i18n("Next Tile"), this);
-    labShowNext->setAlignment(AlignCenter);
+    labShowNext->tqsetAlignment(AlignCenter);
     vbl->addWidget(labShowNext, 0);
     showNext = new ShowNextPiece(board, this);
     _snRootPixmap = new KCanvasRootPixmap(showNext);
diff --git a/libksirtet/common/highscores.cpp b/libksirtet/common/highscores.cpp
index bd9be550..fb1642c0 100644
--- a/libksirtet/common/highscores.cpp
+++ b/libksirtet/common/highscores.cpp
@@ -23,13 +23,13 @@ void CommonHighscores::convertLegacy(uint)
     KConfigGroupSaver cg(kapp->config(), "High Scores");
     for (uint i=0; i<10; i++) {
         TQString name
-            = cg.config()->readEntry(TQString("name%1").arg(i), TQString());
+            = cg.config()->readEntry(TQString("name%1").tqarg(i), TQString());
         if ( name.isNull() ) break;
         if ( name.isEmpty() ) name = i18n("anonymous");
         uint score
-            = cg.config()->readUnsignedNumEntry(TQString("score%1").arg(i), 0);
+            = cg.config()->readUnsignedNumEntry(TQString("score%1").tqarg(i), 0);
         uint level
-            = cg.config()->readUnsignedNumEntry(TQString("level%1").arg(i), 1);
+            = cg.config()->readUnsignedNumEntry(TQString("level%1").tqarg(i), 1);
         Score s(Won);
         s.setScore(score);
         s.setData("name", name);
diff --git a/libksirtet/common/misc_ui.cpp b/libksirtet/common/misc_ui.cpp
index 376c0c57..6638e67a 100644
--- a/libksirtet/common/misc_ui.cpp
+++ b/libksirtet/common/misc_ui.cpp
@@ -41,7 +41,7 @@ Shadow::Shadow(BaseBoard *board, TQWidget *parent)
     connect(board, TQT_SIGNAL(updatePieceConfigSignal()), TQT_SLOT(update()));
 }
 
-TQSize Shadow::sizeHint() const
+TQSize Shadow::tqsizeHint() const
 {
 	return TQSize(_xOffset + _board->matrix().width() * BasePrefs::blockSize(),
 				 SHADOW_HEIGHT);
@@ -86,11 +86,11 @@ class Led : public TQWidget
 
 	TQSizePolicy sizePolicy() const
 		{ return TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); }
-	TQSize sizeHint() const { return TQSize(LED_WIDTH, LED_HEIGHT); }
+	TQSize tqsizeHint() const { return TQSize(LED_WIDTH, LED_HEIGHT); }
 
-	void on()  { if (!_on) { _on = TRUE; repaint(); } }
-	void off() { if (_on)  {_on = FALSE; repaint(); } }
-	void setColor(const TQColor &c) { if (c!=col) { col = c; repaint(); } }
+	void on()  { if (!_on) { _on = TRUE; tqrepaint(); } }
+	void off() { if (_on)  {_on = FALSE; tqrepaint(); } }
+	void setColor(const TQColor &c) { if (c!=col) { col = c; tqrepaint(); } }
 
  protected:
 	void paintEvent(TQPaintEvent *) {
@@ -114,9 +114,9 @@ GiftPool::GiftPool(TQWidget *parent)
         leds.insert(i, new Led(yellow, this));
 }
 
-TQSize GiftPool::sizeHint() const
+TQSize GiftPool::tqsizeHint() const
 {
-	TQSize s = (leds.size() ? leds[0]->sizeHint() : TQSize());
+	TQSize s = (leds.size() ? leds[0]->tqsizeHint() : TQSize());
 	return TQSize((s.width()+LED_SPACING)*leds.size()-LED_SPACING, s.height());
 }
 
@@ -182,7 +182,7 @@ PlayerProgress::PlayerProgress(BaseBoard *board, TQWidget *parent,
   KZoomMainWindow::addWidget(this);
 }
 
-TQSize PlayerProgress::sizeHint() const
+TQSize PlayerProgress::tqsizeHint() const
 {
   return TQSize(10, _board->matrix().height() * BasePrefs::blockSize())
     + 2 * TQSize(frameWidth(), frameWidth());
diff --git a/libksirtet/common/misc_ui.h b/libksirtet/common/misc_ui.h
index 181e0b2f..708bd484 100644
--- a/libksirtet/common/misc_ui.h
+++ b/libksirtet/common/misc_ui.h
@@ -27,7 +27,7 @@ class LIBKSIRTET_EXPORT Shadow : public TQWidget
  public:
     Shadow(BaseBoard *, TQWidget *parent);
 
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
     virtual TQSizePolicy sizePolicy() const;
     void setDisplay(bool show);
 
@@ -49,7 +49,7 @@ class LIBKSIRTET_EXPORT GiftPool : public TQHBox
  public:
     GiftPool(TQWidget *parent);
 
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
     virtual TQSizePolicy sizePolicy() const;
 
     void reset();
@@ -75,7 +75,7 @@ class LIBKSIRTET_EXPORT PlayerProgress : public KGameProgress
 public:
   PlayerProgress(BaseBoard *board, TQWidget *parent = 0, const char *name = 0);
   
-  virtual TQSize sizeHint() const;
+  virtual TQSize tqsizeHint() const;
   virtual TQSizePolicy sizePolicy() const;
   
 private:
diff --git a/libksirtet/common/settings.cpp b/libksirtet/common/settings.cpp
index e54799dc..058de034 100644
--- a/libksirtet/common/settings.cpp
+++ b/libksirtet/common/settings.cpp
@@ -2,7 +2,7 @@
 #include "settings.moc"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
 
-- 
cgit v1.2.1