diff options
author | Timothy Pearson <[email protected]> | 2011-12-18 18:28:28 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-18 18:28:28 -0600 |
commit | f35eb5f602bee29af07ecaffe26cda71cea62b93 (patch) | |
tree | 1fc05bfb9117480c134ca063285ec604c07c6271 /twin-styles/system/systemclient.cpp | |
parent | 48afe4d8df11f862f7ccc60f0594991f857f81db (diff) | |
download | tdeartwork-f35eb5f602bee29af07ecaffe26cda71cea62b93.tar.gz tdeartwork-f35eb5f602bee29af07ecaffe26cda71cea62b93.zip |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'twin-styles/system/systemclient.cpp')
-rw-r--r-- | twin-styles/system/systemclient.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp index a676a02a..895d60d0 100644 --- a/twin-styles/system/systemclient.cpp +++ b/twin-styles/system/systemclient.cpp @@ -124,12 +124,12 @@ static void create_pixmaps() btnPix = new KPixmap; btnPix->resize(14, 14); bitBlt(TQT_TQPAINTDEVICE(btnPix), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true); - drawButtonFrame(btnPix, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, true)); + drawButtonFrame(btnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, true)); iBtnPix = new KPixmap; iBtnPix->resize(14, 14); bitBlt(TQT_TQPAINTDEVICE(iBtnPix), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true); - drawButtonFrame(iBtnPix, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, false)); + drawButtonFrame(iBtnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, false)); // pressed buttons @@ -158,13 +158,13 @@ static void create_pixmaps() btnPixDown = new KPixmap; btnPixDown->resize(14, 14); bitBlt(TQT_TQPAINTDEVICE(btnPixDown), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true); - drawButtonFrame(btnPixDown, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, + drawButtonFrame(btnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, true)); iBtnPixDown = new KPixmap; iBtnPixDown->resize(14, 14); bitBlt(TQT_TQPAINTDEVICE(iBtnPixDown), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true); - drawButtonFrame(iBtnPixDown, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, + drawButtonFrame(iBtnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, false)); } if(tqGray(KDecoration::options()->color(KDecorationOptions::ColorButtonBg, true).rgb()) > 128) @@ -211,7 +211,7 @@ void SystemButton::setTipText(const TQString &tip) } -TQSize SystemButton::tqsizeHint() const +TQSize SystemButton::sizeHint() const { return(TQSize(14, 14)); } @@ -237,7 +237,7 @@ void SystemButton::drawButton(TQPainter *p) p->drawPixmap(0, 0, isDown() ? *iBtnPixDown : *iBtnPix); } else{ - TQColorGroup g = KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, + TQColorGroup g = KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, client->isActive()); int x2 = width()-1; int y2 = height()-1; @@ -251,7 +251,7 @@ void SystemButton::drawButton(TQPainter *p) p->setPen(g.dark()); p->drawRect(1, 1, width()-2, height()-2); // inner frame - g = KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorButtonBg, client->isActive()); + g = KDecoration::options()->colorGroup(KDecorationOptions::ColorButtonBg, client->isActive()); p->fillRect(3, 3, width()-6, height()-6, g.background()); p->setPen(isDown() ? g.mid() : g.light()); p->drawLine(2, 2, x2-2, 2); @@ -481,9 +481,9 @@ void SystemClient::resize( const TQSize& s ) } -TQSize SystemClient::tqminimumSize() const +TQSize SystemClient::minimumSize() const { - return widget()->tqminimumSize(); + return widget()->minimumSize(); } @@ -499,7 +499,7 @@ void SystemClient::recalcTitleBuffer() p.drawTiledPixmap(0, 0, width(), 18, *aUpperGradient); else p.fillRect(0, 0, width(), 18, - options()->tqcolorGroup(KDecorationOptions::ColorFrame, true). + options()->colorGroup(KDecorationOptions::ColorFrame, true). brush(TQColorGroup::Button)); TQRect t = titlebar->tqgeometry(); @@ -538,7 +538,7 @@ void SystemClient::captionChange() void SystemClient::drawRoundFrame(TQPainter &p, int x, int y, int w, int h) { kDrawRoundButton(&p, x, y, w, h, - options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()), false); + options()->colorGroup(KDecorationOptions::ColorFrame, isActive()), false); } @@ -547,9 +547,9 @@ void SystemClient::paintEvent( TQPaintEvent* ) TQPainter p(widget()); TQRect t = titlebar->tqgeometry(); - TQBrush fillBrush(TQBrush(widget()->tqcolorGroup().brush(TQColorGroup::Background)).pixmap() ? - widget()->tqcolorGroup().brush(TQColorGroup::Background) : - options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()). + TQBrush fillBrush(TQBrush(widget()->colorGroup().brush(TQColorGroup::Background)).pixmap() ? + widget()->colorGroup().brush(TQColorGroup::Background) : + options()->colorGroup(KDecorationOptions::ColorFrame, isActive()). brush(TQColorGroup::Button)); p.fillRect(1, 18, width()-2, height()-19, fillBrush); @@ -570,10 +570,10 @@ void SystemClient::paintEvent( TQPaintEvent* ) p.drawText(t, AlignCenter, caption() ); } - p.setPen(options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()).light()); + p.setPen(options()->colorGroup(KDecorationOptions::ColorFrame, isActive()).light()); p.drawLine(width()-20, height()-7, width()-10, height()-7); p.drawLine(width()-20, height()-5, width()-10, height()-5); - p.setPen(options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()).dark()); + p.setPen(options()->colorGroup(KDecorationOptions::ColorFrame, isActive()).dark()); p.drawLine(width()-20, height()-6, width()-10, height()-6); p.drawLine(width()-20, height()-4, width()-10, height()-4); |