Rename a number of old tq methods that are no longer tq specific

5 files changed, 14 insertions, 14 deletions

diff --git a/ksokoban/ImageData.cpp b/ksokoban/ImageData.cpp
index 76fd0f2b..22190469 100644
--- a/ksokoban/ImageData.cpp
+++ b/ksokoban/ImageData.cpp
@@ -163,10 +163,10 @@ ImageData::brighten(TQImage& img) {
 
 void
 ImageData::wall(TQPainter &p, int x, int y, int index, bool left, bool right) {
-  if (left) p.tqdrawPixmap(x, y, upperLarge(index-1), halfSize_);
+  if (left) p.drawPixmap(x, y, upperLarge(index-1), halfSize_);
   else p.drawPixmap(x, y, leftSmall(index));
 
-  if (right) p.tqdrawPixmap(x+halfSize_, y, upperLarge(index), 0, 0, halfSize_);
+  if (right) p.drawPixmap(x+halfSize_, y, upperLarge(index), 0, 0, halfSize_);
   else p.drawPixmap(x+halfSize_, y, rightSmall(index));
 
   p.drawPixmap(x, y+halfSize_, lowerLarge(index));
diff --git a/ksokoban/ModalLabel.cpp b/ksokoban/ModalLabel.cpp
index 560c4b9d..c0ccbbad 100644
--- a/ksokoban/ModalLabel.cpp
+++ b/ksokoban/ModalLabel.cpp
@@ -57,7 +57,7 @@ ModalLabel::ModalLabel(const TQString &text, TQWidget *parent,
   if (width < 300) width = 300;
   if (height < 75) height = 75;
 
-  tqsetAlignment (AlignCenter);
+  setAlignment (AlignCenter);
   setFrameStyle (TQFrame::Panel | TQFrame::Raised);
   setLineWidth (4);
   setFont (font);
@@ -65,7 +65,7 @@ ModalLabel::ModalLabel(const TQString &text, TQWidget *parent,
   resize (width, height);
   show ();
 
-  TQWidgetList  *list = TQApplication::tqallWidgets();
+  TQWidgetList  *list = TQApplication::allWidgets();
   TQWidgetListIt it( *list );
   while (it.current()) {
     it.current()->installEventFilter (this);
diff --git a/ksokoban/NEWS b/ksokoban/NEWS
index 8c42ec6c..6f1352ed 100644
--- a/ksokoban/NEWS
+++ b/ksokoban/NEWS
@@ -48,7 +48,7 @@ New features:
 
 * Bookmarks
 * Animation speed menu
-* tqStatus bar
+* Status bar
 * Internationalisation
 
 -------------------------------------------------------------------------------
diff --git a/ksokoban/PlayField.cpp b/ksokoban/PlayField.cpp
index c3fe57fe..77c3b69b 100644
--- a/ksokoban/PlayField.cpp
+++ b/ksokoban/PlayField.cpp
@@ -599,7 +599,7 @@ PlayField::keyPressEvent(TQKeyEvent * e) {
   case Key_X:
     levelMap_->random();
     levelChange();
-    tqrepaint(false);
+    repaint(false);
     break;
 
   case Key_R:
@@ -620,7 +620,7 @@ PlayField::keyPressEvent(TQKeyEvent * e) {
     break;
   case Key_I:
     history_->redo(levelMap_);
-    tqrepaint(false);
+    repaint(false);
     return;
     break;
 
@@ -644,7 +644,7 @@ PlayField::keyPressEvent(TQKeyEvent * e) {
     }
     updateStepsXpm();
     updatePushesXpm();
-    tqrepaint(false);
+    repaint(false);
     return;
     break;
 #endif
@@ -855,7 +855,7 @@ this level yet."), this);
 
   level(levelMap_->level()+1);
   levelChange();
-  tqrepaint(false);
+  repaint(false);
 }
 
 void
@@ -868,7 +868,7 @@ the current collection."), this);
   }
   level(levelMap_->level()-1);
   levelChange();
-  tqrepaint(false);
+  repaint(false);
 }
 
 void
@@ -892,7 +892,7 @@ PlayField::restartLevel() {
   level(levelMap_->level());
   updateStepsXpm();
   updatePushesXpm();
-  tqrepaint(false);
+  repaint(false);
 }
 
 void
@@ -901,7 +901,7 @@ PlayField::changeCollection(LevelCollection *collection) {
   levelMap_->changeCollection(collection);
   levelChange();
   //erase(collRect_);
-  tqrepaint(false);
+  repaint(false);
 }
 
 void
@@ -1030,7 +1030,7 @@ PlayField::goToBookmark(Bookmark *bm) {
   //updateLevelXpm();
   updateStepsXpm();
   updatePushesXpm();
-  tqrepaint(false);
+  repaint(false);
 }
 
 bool
diff --git a/ksokoban/PlayField.h b/ksokoban/PlayField.h
index b4380033..3b6375b9 100644
--- a/ksokoban/PlayField.h
+++ b/ksokoban/PlayField.h
@@ -26,7 +26,7 @@
 #include <tqfontmetrics.h>
 #include <tqpixmap.h>
 #include <tqimage.h>
-#include <tqbrush.h>
+#include <brush.h>
 
 #include "ImageData.h"
 #include "LevelMap.h"