diff options
Diffstat (limited to 'libksirtet/base')
| -rw-r--r-- | libksirtet/base/board.cpp | 4 | ||||
| -rw-r--r-- | libksirtet/base/board.h | 2 | ||||
| -rw-r--r-- | libksirtet/base/field.cpp | 10 | ||||
| -rw-r--r-- | libksirtet/base/kzoommainwindow.cpp | 4 | ||||
| -rw-r--r-- | libksirtet/base/kzoommainwindow.h | 2 | ||||
| -rw-r--r-- | libksirtet/base/settings.cpp | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/libksirtet/base/board.cpp b/libksirtet/base/board.cpp index 95293387..12193e31 100644 --- a/libksirtet/base/board.cpp +++ b/libksirtet/base/board.cpp @@ -16,7 +16,7 @@ FixedCanvasView::FixedCanvasView(TQWidget *parent, const char *name) : TQCanvasView(parent, name, WNoAutoErase) {} -TQSize FixedCanvasView::tqsizeHint() const +TQSize FixedCanvasView::sizeHint() const { if ( canvas()==0 ) return TQSize(); return canvas()->size() + 2 * TQSize(frameWidth(), frameWidth()); @@ -24,7 +24,7 @@ TQSize FixedCanvasView::tqsizeHint() const void FixedCanvasView::adjustSize() { - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); } //----------------------------------------------------------------------------- diff --git a/libksirtet/base/board.h b/libksirtet/base/board.h index b525ee5b..f78b8168 100644 --- a/libksirtet/base/board.h +++ b/libksirtet/base/board.h @@ -19,7 +19,7 @@ class KDE_EXPORT FixedCanvasView : public TQCanvasView public: FixedCanvasView(TQWidget *parent = 0, const char *name = 0); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: virtual void adjustSize(); diff --git a/libksirtet/base/field.cpp b/libksirtet/base/field.cpp index 5f7cf10d..dde0ef0a 100644 --- a/libksirtet/base/field.cpp +++ b/libksirtet/base/field.cpp @@ -1,7 +1,7 @@ #include "field.h" #include <tqwhatsthis.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpushbutton.h> @@ -41,8 +41,8 @@ void BaseField::init(bool AI, bool multiplayer, bool server, bool first, _flags.multiplayer = multiplayer; _flags.server = server; _flags.first = first; - TQString text = (AI ? i18n("%1\n(AI player)").tqarg(name) - : (multiplayer ? i18n("%1\n(Human player)").tqarg(name) + TQString text = (AI ? i18n("%1\n(AI player)").arg(name) + : (multiplayer ? i18n("%1\n(Human player)").arg(name) : TQString())); if ( first && !server ) text += i18n("\nWaiting for server"); setMessage(text, (first && server ? StartButton : NoButton)); @@ -81,7 +81,7 @@ void BaseField::setMessage(const TQString &label, ButtonType type) TQString str = (isArcade() ? i18n("Arcade game") + '\n' : TQString()) + label; _label = new TQLabel(str, board); - _label->tqsetAlignment(TQt::AlignCenter); + _label->setAlignment(TQt::AlignCenter); _label->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); _boardLayout->addWidget(_label, 0, TQt::AlignCenter); _label->show(); @@ -128,7 +128,7 @@ void BaseField::stop(bool gameover) if ( board->arcadeStage()==bfactory->bbi.nbArcadeStages ) msg = i18n("The End"); else { - msg = i18n("Stage #%1 done").tqarg(board->arcadeStage()); + msg = i18n("Stage #%1 done").arg(board->arcadeStage()); button = ProceedButton; } } diff --git a/libksirtet/base/kzoommainwindow.cpp b/libksirtet/base/kzoommainwindow.cpp index 1d0f5319..8d0521bc 100644 --- a/libksirtet/base/kzoommainwindow.cpp +++ b/libksirtet/base/kzoommainwindow.cpp @@ -58,7 +58,7 @@ void KZoomMainWindow::init(const char *popupName) void KZoomMainWindow::addWidget(TQWidget *widget) { widget->adjustSize(); - TQWidget *tlw = widget->tqtopLevelWidget(); + TQWidget *tlw = widget->topLevelWidget(); KZoomMainWindow *zm = static_cast<KZoomMainWindow *>(tlw->qt_cast("KZoomMainWindow")); Q_ASSERT(zm); @@ -74,7 +74,7 @@ void KZoomMainWindow::widgetDestroyed() bool KZoomMainWindow::eventFilter(TQObject *o, TQEvent *e) { if ( e->type()==TQEvent::LayoutHint ) - setFixedSize(tqminimumSize()); // because K/TQMainWindow + setFixedSize(minimumSize()); // because K/TQMainWindow // does not manage fixed central widget // with hidden menubar... return KMainWindow::eventFilter(o, e); diff --git a/libksirtet/base/kzoommainwindow.h b/libksirtet/base/kzoommainwindow.h index 18e85ddb..3b70eae4 100644 --- a/libksirtet/base/kzoommainwindow.h +++ b/libksirtet/base/kzoommainwindow.h @@ -52,7 +52,7 @@ public: /** Add a widget to be managed i.e. the adjustSize() method of the * widget is called whenever the zoom is changed. - * This function assumes that the tqtopLevelWidget() is the KZoomMainWindow. + * This function assumes that the topLevelWidget() is the KZoomMainWindow. */ static void addWidget(TQWidget *widget); diff --git a/libksirtet/base/settings.cpp b/libksirtet/base/settings.cpp index a695d746..2d8db301 100644 --- a/libksirtet/base/settings.cpp +++ b/libksirtet/base/settings.cpp @@ -3,7 +3,7 @@ #include <tqlabel.h> #include <tqhbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqhgroupbox.h> |