diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:31:10 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:31:10 -0600 |
commit | 0e2b76239f354a9eead0b4e37d86d390ec57ffa9 (patch) | |
tree | cd20202507f54f61a4e58ae64fcd7cdb894abe19 /libksirtet | |
parent | 84ace1135cac57993b72fee7105b92def1638d32 (diff) | |
download | tdegames-0e2b76239f354a9eead0b4e37d86d390ec57ffa9.tar.gz tdegames-0e2b76239f354a9eead0b4e37d86d390ec57ffa9.zip |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'libksirtet')
-rw-r--r-- | libksirtet/base/board.cpp | 4 | ||||
-rw-r--r-- | libksirtet/base/board.h | 2 | ||||
-rw-r--r-- | libksirtet/base/field.cpp | 2 | ||||
-rw-r--r-- | libksirtet/base/kzoommainwindow.cpp | 4 | ||||
-rw-r--r-- | libksirtet/base/kzoommainwindow.h | 2 | ||||
-rw-r--r-- | libksirtet/common/field.cpp | 4 | ||||
-rw-r--r-- | libksirtet/common/misc_ui.cpp | 10 | ||||
-rw-r--r-- | libksirtet/common/misc_ui.h | 6 | ||||
-rw-r--r-- | libksirtet/lib/meeting.cpp | 2 | ||||
-rw-r--r-- | libksirtet/lib/mp_simple_interface.cpp | 2 | ||||
-rw-r--r-- | libksirtet/lib/pline.cpp | 8 |
11 files changed, 23 insertions, 23 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..ec5b4f23 100644 --- a/libksirtet/base/field.cpp +++ b/libksirtet/base/field.cpp @@ -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(); 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/common/field.cpp b/libksirtet/common/field.cpp index 8b1d3f7b..4c00ba4e 100644 --- a/libksirtet/common/field.cpp +++ b/libksirtet/common/field.cpp @@ -39,7 +39,7 @@ Field::Field(TQWidget *parent) // level progress levelLabel = new TQLabel(this); - levelLabel->tqsetAlignment(AlignCenter); + levelLabel->setAlignment(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->tqsetAlignment(AlignCenter); + labShowNext->setAlignment(AlignCenter); vbl->addWidget(labShowNext, 0); showNext = new ShowNextPiece(board, this); _snRootPixmap = new KCanvasRootPixmap(showNext); diff --git a/libksirtet/common/misc_ui.cpp b/libksirtet/common/misc_ui.cpp index 6638e67a..f6426a4d 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::tqsizeHint() const +TQSize Shadow::sizeHint() const { return TQSize(_xOffset + _board->matrix().width() * BasePrefs::blockSize(), SHADOW_HEIGHT); @@ -86,7 +86,7 @@ class Led : public TQWidget TQSizePolicy sizePolicy() const { return TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); } - TQSize tqsizeHint() const { return TQSize(LED_WIDTH, LED_HEIGHT); } + TQSize sizeHint() const { return TQSize(LED_WIDTH, LED_HEIGHT); } void on() { if (!_on) { _on = TRUE; tqrepaint(); } } void off() { if (_on) {_on = FALSE; tqrepaint(); } } @@ -114,9 +114,9 @@ GiftPool::GiftPool(TQWidget *parent) leds.insert(i, new Led(yellow, this)); } -TQSize GiftPool::tqsizeHint() const +TQSize GiftPool::sizeHint() const { - TQSize s = (leds.size() ? leds[0]->tqsizeHint() : TQSize()); + TQSize s = (leds.size() ? leds[0]->sizeHint() : 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::tqsizeHint() const +TQSize PlayerProgress::sizeHint() 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 708bd484..181e0b2f 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 tqsizeHint() const; + virtual TQSize sizeHint() 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 tqsizeHint() const; + virtual TQSize sizeHint() 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 tqsizeHint() const; + virtual TQSize sizeHint() const; virtual TQSizePolicy sizePolicy() const; private: diff --git a/libksirtet/lib/meeting.cpp b/libksirtet/lib/meeting.cpp index 5e0e679f..c6c81cbe 100644 --- a/libksirtet/lib/meeting.cpp +++ b/libksirtet/lib/meeting.cpp @@ -37,7 +37,7 @@ NetMeeting::NetMeeting(const cId &_id, Socket *socket, top->addWidget(wl); labWait = new TQLabel(i18n("Waiting for clients"), plainPage()); - labWait->tqsetAlignment(AlignCenter); + labWait->setAlignment(AlignCenter); top->addWidget(labWait); // options widget diff --git a/libksirtet/lib/mp_simple_interface.cpp b/libksirtet/lib/mp_simple_interface.cpp index 17515fb0..1b83be40 100644 --- a/libksirtet/lib/mp_simple_interface.cpp +++ b/libksirtet/lib/mp_simple_interface.cpp @@ -9,7 +9,7 @@ #define PAUSE_ACTION \ - ((KToggleAction *)((KMainWindow *)tqtopLevelWidget())->action("game_pause")) + ((KToggleAction *)((KMainWindow *)topLevelWidget())->action("game_pause")) MPSimpleInterface::MPSimpleInterface(const MPGameInfo &gi, uint nbActions, const ActionData *data, diff --git a/libksirtet/lib/pline.cpp b/libksirtet/lib/pline.cpp index 3a63a0b0..3afb8eff 100644 --- a/libksirtet/lib/pline.cpp +++ b/libksirtet/lib/pline.cpp @@ -26,7 +26,7 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine, /* Name */ lname = new TQLabel(" ", this); - lname->tqsetAlignment(AlignCenter); + lname->setAlignment(AlignCenter); lname->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); lname->setLineWidth(2); lname->setMidLineWidth(3); @@ -34,7 +34,7 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine, f.setBold(TRUE); lname->setFont(f); lname->setFixedSize(lname->fontMetrics().maxWidth()*NAME_MAX_LENGTH, - lname->tqsizeHint().height()); + lname->sizeHint().height()); hbl->addWidget(lname); hbl->addStretch(1); @@ -51,7 +51,7 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine, qle->setMaxLength(TALKER_MAX_LENGTH); qle->setFont( TQFont("fixed", 12, TQFont::Bold) ); qle->setFixedSize(qle->fontMetrics().maxWidth()*TALKER_MAX_LENGTH, - qle->tqsizeHint().height()); + qle->sizeHint().height()); connect(qle, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(_textChanged(const TQString &))); qle->setEnabled(isOwner); @@ -102,7 +102,7 @@ PlayerLine::PlayerLine(PlayerComboBox::Type type, const TQString &txt, edit = new TQLineEdit(txt, this); edit->setMaxLength(NAME_MAX_LENGTH); edit->setFixedSize(edit->fontMetrics().maxWidth()*(NAME_MAX_LENGTH+2), - edit->tqsizeHint().height()); + edit->sizeHint().height()); hbl->addWidget(edit); /* settings button */ |