diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:45:12 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:45:12 -0600 |
commit | 5c194e6e7059ddcc96b0e0166ce6157c35fc183e (patch) | |
tree | 0738f35b062d40a4899e85d801ccc3395e56e0ff /twin-styles/riscos | |
parent | 19904387391902d5944ef4209a255cbb1a912940 (diff) | |
download | tdeartwork-5c194e6e7059ddcc96b0e0166ce6157c35fc183e.tar.gz tdeartwork-5c194e6e7059ddcc96b0e0166ce6157c35fc183e.zip |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'twin-styles/riscos')
-rw-r--r-- | twin-styles/riscos/Button.cpp | 14 | ||||
-rw-r--r-- | twin-styles/riscos/Button.h | 4 | ||||
-rw-r--r-- | twin-styles/riscos/Manager.cpp | 26 | ||||
-rw-r--r-- | twin-styles/riscos/Manager.h | 2 | ||||
-rw-r--r-- | twin-styles/riscos/MaximiseButton.cpp | 2 | ||||
-rw-r--r-- | twin-styles/riscos/Static.cpp | 24 | ||||
-rw-r--r-- | twin-styles/riscos/StickyButton.cpp | 2 |
7 files changed, 37 insertions, 37 deletions
diff --git a/twin-styles/riscos/Button.cpp b/twin-styles/riscos/Button.cpp index 7bf4f477..3588c1dd 100644 --- a/twin-styles/riscos/Button.cpp +++ b/twin-styles/riscos/Button.cpp @@ -48,19 +48,19 @@ Button::~Button() // Empty. } -void Button::tqsetAlignment(Alignment a) +void Button::setAlignment(Alignment a) { alignment_ = a; - tqrepaint(); + repaint(); } void Button::setActive(bool b) { active_ = b; - tqrepaint(); + repaint(); } -Button::Alignment Button::tqalignment() const +Button::Alignment Button::alignment() const { return alignment_; } @@ -69,7 +69,7 @@ void Button::mousePressEvent(TQMouseEvent *e) { down_ = true; lastButton_ = e->button(); - tqrepaint(); + repaint(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton, @@ -81,7 +81,7 @@ void Button::mouseReleaseEvent(TQMouseEvent *e) { down_ = false; lastButton_ = e->button(); - tqrepaint(); + repaint(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton, e->state()); @@ -133,7 +133,7 @@ void Button::setPixmap(const TQPixmap &p) iPixmap_.setMask(*p.mask()); } } - tqrepaint(); + repaint(); } void Button::paintEvent(TQPaintEvent *) diff --git a/twin-styles/riscos/Button.h b/twin-styles/riscos/Button.h index 0c7c66c5..f2efb1aa 100644 --- a/twin-styles/riscos/Button.h +++ b/twin-styles/riscos/Button.h @@ -46,9 +46,9 @@ class Button : public TQWidget const ButtonState realizeButton = Qt::LeftButton); virtual ~Button(); - void tqsetAlignment(Alignment); + void setAlignment(Alignment); - Alignment tqalignment() const; + Alignment alignment() const; protected slots: diff --git a/twin-styles/riscos/Manager.cpp b/twin-styles/riscos/Manager.cpp index 837bec9c..2ad3b6c9 100644 --- a/twin-styles/riscos/Manager.cpp +++ b/twin-styles/riscos/Manager.cpp @@ -27,7 +27,7 @@ #include <tqapplication.h> #include <tqimage.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <netwm.h> @@ -134,22 +134,22 @@ void Manager::resize(const TQSize &s) widget()->resize(s); } -TQSize Manager::tqminimumSize() const +TQSize Manager::minimumSize() const { - return widget()->tqminimumSize(); + return widget()->minimumSize(); } void Manager::activeChange() { updateTitleBuffer(); - widget()->tqrepaint(); + widget()->repaint(); emit(activeChanged(isActive())); } void Manager::captionChange() { updateTitleBuffer(); - widget()->tqrepaint(); + widget()->repaint(); } void Manager::iconChange() @@ -197,7 +197,7 @@ void Manager::paintEvent(TQPaintEvent *e) // Title bar. - TQRect tr = titleSpacer_->tqgeometry(); + TQRect tr = titleSpacer_->geometry(); bitBlt(widget(), tr.topLeft(), &titleBuf_); // Resize bar. @@ -224,7 +224,7 @@ void Manager::resizeEvent(TQResizeEvent*) { updateButtonVisibility(); updateTitleBuffer(); - widget()->tqrepaint(); + widget()->repaint(); } void Manager::updateButtonVisibility() @@ -282,7 +282,7 @@ void Manager::updateButtonVisibility() break; } - tqlayout()->activate(); + layout()->activate(); #endif } @@ -292,7 +292,7 @@ void Manager::updateTitleBuffer() Static * s = Static::instance(); - TQRect tr = titleSpacer_->tqgeometry(); + TQRect tr = titleSpacer_->geometry(); if (tr.width() == 0 || tr.height() == 0) titleBuf_.resize(8, 8); @@ -352,13 +352,13 @@ KDecoration::Position Manager::mousePosition(const TQPoint& p) const void Manager::mouseDoubleClickEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton && titleSpacer_->tqgeometry().contains(e->pos())) + if (e->button() == Qt::LeftButton && titleSpacer_->geometry().contains(e->pos())) titlebarDblClickOperation(); } void Manager::wheelEvent(TQWheelEvent *e) { - if (isSetShade() || titleLayout_->tqgeometry().contains(e->pos()) ) + if (isSetShade() || titleLayout_->geometry().contains(e->pos()) ) titlebarMouseWheelOperation( e->delta()); } @@ -678,7 +678,7 @@ void Manager::createTitle() for (TQPtrListIterator<Button> it(leftButtonList_); it.current(); ++it) { - it.current()->tqsetAlignment(Button::Left); + it.current()->setAlignment(Button::Left); titleLayout_->addWidget(it.current()); } @@ -689,7 +689,7 @@ void Manager::createTitle() for (TQPtrListIterator<Button> it(rightButtonList_); it.current(); ++it) { - it.current()->tqsetAlignment(Button::Right); + it.current()->setAlignment(Button::Right); titleLayout_->addWidget(it.current()); } } diff --git a/twin-styles/riscos/Manager.h b/twin-styles/riscos/Manager.h index 5668a7fc..75810c91 100644 --- a/twin-styles/riscos/Manager.h +++ b/twin-styles/riscos/Manager.h @@ -56,7 +56,7 @@ class Manager : public KDecoration void reset(unsigned long changed); void borders(int&, int&, int&, int&) const; void resize(const TQSize&); - TQSize tqminimumSize() const; + TQSize minimumSize() const; void activeChange(); void captionChange(); void iconChange(); diff --git a/twin-styles/riscos/MaximiseButton.cpp b/twin-styles/riscos/MaximiseButton.cpp index dcc1b52a..e7f55db7 100644 --- a/twin-styles/riscos/MaximiseButton.cpp +++ b/twin-styles/riscos/MaximiseButton.cpp @@ -78,7 +78,7 @@ void MaximiseButton::setOn(bool on) on_ = on; setPixmap(on_ ? TQPixmap((const char **)unmaximise_xpm) : TQPixmap((const char **)maximise_xpm)); - tqrepaint(); + repaint(); TQToolTip::remove(this); TQToolTip::add(this, on_ ? i18n("Restore") : i18n("Maximize")); } diff --git a/twin-styles/riscos/Static.cpp b/twin-styles/riscos/Static.cpp index 7aac6f5a..92d38ff0 100644 --- a/twin-styles/riscos/Static.cpp +++ b/twin-styles/riscos/Static.cpp @@ -372,22 +372,22 @@ void Static::_drawTitleTextAreaSides() _drawBorder(temp, 4, titleHeight_ - 2); painter_.begin(&aTitleTextLeft_); - painter_.tqdrawPixmap(1, 1, temp, 0, 1); + painter_.drawPixmap(1, 1, temp, 0, 1); painter_.end(); painter_.begin(&aTitleTextRight_); - painter_.tqdrawPixmap(0, 1, temp, 2, 1); + painter_.drawPixmap(0, 1, temp, 2, 1); painter_.end(); palette_ = iTitlePal_; _drawBorder(temp, 4, titleHeight_ - 2); painter_.begin(&iTitleTextLeft_); - painter_.tqdrawPixmap(1, 1, temp, 0, 1); + painter_.drawPixmap(1, 1, temp, 0, 1); painter_.end(); painter_.begin(&iTitleTextRight_); - painter_.tqdrawPixmap(0, 1, temp, 2, 1); + painter_.drawPixmap(0, 1, temp, 2, 1); painter_.end(); } @@ -403,22 +403,22 @@ void Static::_drawResizeCentralAreaSides() _drawBorder(temp, 4, resizeHeight_ - 3); painter_.begin(&aResizeMidLeft_); - painter_.tqdrawPixmap(0, 1, temp, 0, 1); + painter_.drawPixmap(0, 1, temp, 0, 1); painter_.end(); painter_.begin(&aResizeMidRight_); - painter_.tqdrawPixmap(0, 1, temp, 2, 1); + painter_.drawPixmap(0, 1, temp, 2, 1); painter_.end(); palette_ = iResizePal_; _drawBorder(temp, 4, resizeHeight_ - 3); painter_.begin(&iResizeMidLeft_); - painter_.tqdrawPixmap(0, 1, temp, 0, 1); + painter_.drawPixmap(0, 1, temp, 0, 1); painter_.end(); painter_.begin(&iResizeMidRight_); - painter_.tqdrawPixmap(0, 1, temp, 2, 1); + painter_.drawPixmap(0, 1, temp, 2, 1); painter_.end(); } @@ -433,7 +433,7 @@ void Static::_drawTitleTextAreaBackground() _drawBorder(temp, 70, titleHeight_ - 3); painter_.begin(&aTitleTextMid_); - painter_.tqdrawPixmap(0, 1, temp, 2, 0); + painter_.drawPixmap(0, 1, temp, 2, 0); if (hicolour_) painter_.drawTiledPixmap(0, 4, 64, titleHeight_ - 8, aTexture_); painter_.end(); @@ -442,7 +442,7 @@ void Static::_drawTitleTextAreaBackground() _drawBorder(temp, 70, titleHeight_ - 3); painter_.begin(&iTitleTextMid_); - painter_.tqdrawPixmap(0, 1, temp, 2, 0); + painter_.drawPixmap(0, 1, temp, 2, 0); if (hicolour_) painter_.drawTiledPixmap(0, 4, 64, titleHeight_ - 8, iTexture_); painter_.end(); @@ -459,7 +459,7 @@ void Static::_drawResizeCentralAreaBackground() _drawBorder(temp, 70, resizeHeight_ - 3); painter_.begin(&aResizeMid_); - painter_.tqdrawPixmap(0, 0, temp, 2, 0); + painter_.drawPixmap(0, 0, temp, 2, 0); if (hicolour_) painter_.drawTiledPixmap(0, 4, 64, resizeHeight_ - 8, aTexture_); painter_.end(); @@ -468,7 +468,7 @@ void Static::_drawResizeCentralAreaBackground() _drawBorder(temp, 70, 7); painter_.begin(&iResizeMid_); - painter_.tqdrawPixmap(0, 0, temp, 2, 0); + painter_.drawPixmap(0, 0, temp, 2, 0); if (hicolour_) painter_.drawTiledPixmap(0, 4, 64, resizeHeight_ - 8, iTexture_); painter_.end(); diff --git a/twin-styles/riscos/StickyButton.cpp b/twin-styles/riscos/StickyButton.cpp index 2229f915..b40db535 100644 --- a/twin-styles/riscos/StickyButton.cpp +++ b/twin-styles/riscos/StickyButton.cpp @@ -77,7 +77,7 @@ void StickyButton::setOn(bool on) on_ = on; setPixmap(on_ ? TQPixmap((const char **)unsticky_xpm) : TQPixmap((const char **)sticky_xpm)); - tqrepaint(); + repaint(); TQToolTip::remove(this); TQToolTip::add(this, on_ ? i18n("Not on all desktops") : i18n("On all desktops")); |