diff options
Diffstat (limited to 'twin-styles/kstep')
-rw-r--r-- | twin-styles/kstep/nextclient.cpp | 38 | ||||
-rw-r--r-- | twin-styles/kstep/nextclient.h | 4 |
2 files changed, 21 insertions, 21 deletions
diff --git a/twin-styles/kstep/nextclient.cpp b/twin-styles/kstep/nextclient.cpp index 0cafc44a..08867a62 100644 --- a/twin-styles/kstep/nextclient.cpp +++ b/twin-styles/kstep/nextclient.cpp @@ -1,7 +1,7 @@ #include "nextclient.h" #include <tqdatetime.h> #include <tqdrawutil.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <tqbitmap.h> #include <tqlabel.h> @@ -340,14 +340,14 @@ NextButton::NextButton(NextClient *parent, const char *name, void NextButton::reset() { - repaint(false); + tqrepaint(false); } void NextButton::setBitmap(const unsigned char *bitmap, int w, int h) { deco = new TQBitmap(w, h, bitmap, true); deco->setMask(*deco); - repaint(); + tqrepaint(); } void NextButton::drawButton(TQPainter *p) @@ -602,7 +602,7 @@ bool NextClient::mustDrawHandle() const void NextClient::iconChange() { if (button[MENU_IDX] && button[MENU_IDX]->isVisible()) - button[MENU_IDX]->repaint(false); + button[MENU_IDX]->tqrepaint(false); } void NextClient::menuButtonPressed() @@ -658,9 +658,9 @@ void NextClient::resizeEvent(TQResizeEvent *) // TODO ? update border area only? widget()->update(); #if 0 - widget()->update(titlebar->geometry()); + widget()->update(titlebar->tqgeometry()); TQPainter p(widget()); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); t.setTop( 0 ); TQRegion r = widget()->rect(); r = r.subtract( t ); @@ -672,7 +672,7 @@ void NextClient::resizeEvent(TQResizeEvent *) void NextClient::captionChange() { - widget()->repaint(titlebar->geometry(), false); + widget()->tqrepaint(titlebar->tqgeometry(), false); } @@ -686,12 +686,12 @@ void NextClient::paintEvent( TQPaintEvent* ) p.drawRect(fr); // Draw title bar - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); t.setTop(1); p.drawTiledPixmap(t.x()+1, t.y()+1, t.width()-2, t.height()-2, isActive() ? *aTitlePix : *iTitlePix); qDrawShadePanel(&p, t.x(), t.y(), t.width(), t.height()-1, - options()->colorGroup(KDecoration::ColorTitleBar, isActive())); + options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive())); p.drawLine(t.x(), t.bottom(), t.right(), t.bottom()); #if 0 @@ -716,7 +716,7 @@ void NextClient::paintEvent( TQPaintEvent* ) int corner = 16 + 3*handleSize/2; qDrawShadePanel(&p, fr.x() + 1, fr.bottom() - handleSize, corner-1, handleSize, - options()->colorGroup(KDecoration::ColorHandle, isActive()), + options()->tqcolorGroup(KDecoration::ColorHandle, isActive()), false); p.drawTiledPixmap(fr.x() + 2, fr.bottom() - handleSize + 1, corner - 3, handleSize - 2, isActive() ? *aHandlePix : *iHandlePix); @@ -724,7 +724,7 @@ void NextClient::paintEvent( TQPaintEvent* ) qDrawShadePanel(&p, fr.x() + corner, fr.bottom() - handleSize, fr.width() - 2*corner, handleSize, - options()->colorGroup(KDecoration::ColorFrame, isActive()), + options()->tqcolorGroup(KDecoration::ColorFrame, isActive()), false); p.drawTiledPixmap(fr.x() + corner + 1, fr.bottom() - handleSize + 1, fr.width() - 2*corner - 2, handleSize - 2, @@ -732,7 +732,7 @@ void NextClient::paintEvent( TQPaintEvent* ) qDrawShadePanel(&p, fr.right() - corner + 1, fr.bottom() - handleSize, corner - 1, handleSize, - options()->colorGroup(KDecoration::ColorHandle, isActive()), + options()->tqcolorGroup(KDecoration::ColorHandle, isActive()), false); p.drawTiledPixmap(fr.right() - corner + 2, fr.bottom() - handleSize + 1, corner - 3, handleSize - 2, isActive() ? *aHandlePix : *iHandlePix); @@ -741,7 +741,7 @@ void NextClient::paintEvent( TQPaintEvent* ) void NextClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if (e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) ) + if (e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) titlebarDblClickOperation(); } @@ -753,7 +753,7 @@ void NextClient::wheelEvent( TQWheelEvent * e ) void NextClient::showEvent(TQShowEvent *) { - widget()->repaint(); + widget()->tqrepaint(); } void NextClient::desktopChange() @@ -782,7 +782,7 @@ void NextClient::maximizeChange() void NextClient::activeChange() { - widget()->repaint(false); + widget()->tqrepaint(false); slotReset(); } @@ -839,7 +839,7 @@ void NextClient::keepAboveChange(bool above) TQToolTip::remove(b); TQToolTip::add(b, above ? i18n("Do not keep above others") : i18n("Keep above others")); - b->repaint(false); + b->tqrepaint(false); } } @@ -850,11 +850,11 @@ void NextClient::keepBelowChange(bool below) TQToolTip::remove(b); TQToolTip::add(b, below ? i18n("Do not keep below others") : i18n("Keep below others")); - b->repaint(false); + b->tqrepaint(false); } } -TQSize NextClient::minimumSize() const +TQSize NextClient::tqminimumSize() const { return TQSize(titleHeight * 6 + 2, titleHeight + handleSize + 2); } @@ -870,7 +870,7 @@ void NextClient::reset(unsigned long) if (button[i]) button[i]->reset(); } - widget()->repaint(); + widget()->tqrepaint(); } bool NextClient::eventFilter(TQObject *o, TQEvent *e) diff --git a/twin-styles/kstep/nextclient.h b/twin-styles/kstep/nextclient.h index e2cbe19a..b24da66d 100644 --- a/twin-styles/kstep/nextclient.h +++ b/twin-styles/kstep/nextclient.h @@ -4,7 +4,7 @@ #include <tqvariant.h> #include <tqbitmap.h> #include <kpixmap.h> -#include <layout.h> +#include <tqlayout.h> #include <tqbutton.h> #include <kdecoration.h> #include <kdecorationfactory.h> @@ -61,7 +61,7 @@ protected: void activeChange(); void shadeChange(); void iconChange(); - TQSize minimumSize() const; + TQSize tqminimumSize() const; void resize(const TQSize &size); void borders(int &left, int &right, int &top, int &bottom) const; void reset(unsigned long changed); |