diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:58:18 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:58:18 -0600 |
commit | 48afe4d8df11f862f7ccc60f0594991f857f81db (patch) | |
tree | 3f24a7c318e7f7dd10ada3a918006ad495ad9245 /twin-styles/system/systemclient.cpp | |
parent | 5c194e6e7059ddcc96b0e0166ce6157c35fc183e (diff) | |
download | tdeartwork-48afe4d8df11f862f7ccc60f0594991f857f81db.tar.gz tdeartwork-48afe4d8df11f862f7ccc60f0594991f857f81db.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 5c194e6e7059ddcc96b0e0166ce6157c35fc183e.
Diffstat (limited to 'twin-styles/system/systemclient.cpp')
-rw-r--r-- | twin-styles/system/systemclient.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp index 1204c388..a676a02a 100644 --- a/twin-styles/system/systemclient.cpp +++ b/twin-styles/system/systemclient.cpp @@ -1,6 +1,6 @@ #include "systemclient.h" -#include <layout.h> +#include <tqlayout.h> #include <tqdrawutil.h> #include <tqbitmap.h> #include <tqtooltip.h> @@ -13,7 +13,7 @@ #include <kapplication.h> #include <kdebug.h> -// Default button layout +// Default button tqlayout const char default_left[] = "X"; const char default_right[] = "HSIA"; @@ -78,7 +78,7 @@ static void create_pixmaps() aUpperGradient->resize(32, 18); iUpperGradient = new KPixmap; iUpperGradient->resize(32, 18); - TQColor bgColor = kapp->palette().active().background(); + TQColor bgColor = kapp->tqpalette().active().background(); KPixmapEffect::gradient(*aUpperGradient, KDecoration::options()->color(KDecorationOptions::ColorFrame, true).light(130), bgColor, @@ -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()->colorGroup(KDecorationOptions::ColorFrame, true)); + drawButtonFrame(btnPix, KDecoration::options()->tqcolorGroup(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()->colorGroup(KDecorationOptions::ColorFrame, false)); + drawButtonFrame(iBtnPix, KDecoration::options()->tqcolorGroup(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()->colorGroup(KDecorationOptions::ColorFrame, + drawButtonFrame(btnPixDown, KDecoration::options()->tqcolorGroup(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()->colorGroup(KDecorationOptions::ColorFrame, + drawButtonFrame(iBtnPixDown, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, false)); } if(tqGray(KDecoration::options()->color(KDecorationOptions::ColorButtonBg, true).rgb()) > 128) @@ -211,21 +211,21 @@ void SystemButton::setTipText(const TQString &tip) } -TQSize SystemButton::sizeHint() const +TQSize SystemButton::tqsizeHint() const { return(TQSize(14, 14)); } void SystemButton::reset() { - repaint(false); + tqrepaint(false); } void SystemButton::setBitmap(const unsigned char *bitmap) { deco = TQBitmap(8, 8, bitmap, true); deco.setMask(deco); - repaint(); + tqrepaint(); } void SystemButton::drawButton(TQPainter *p) @@ -237,7 +237,7 @@ void SystemButton::drawButton(TQPainter *p) p->drawPixmap(0, 0, isDown() ? *iBtnPixDown : *iBtnPix); } else{ - TQColorGroup g = KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, + TQColorGroup g = KDecoration::options()->tqcolorGroup(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()->colorGroup(KDecorationOptions::ColorButtonBg, client->isActive()); + g = KDecoration::options()->tqcolorGroup(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); @@ -440,7 +440,7 @@ void SystemClient::reset(unsigned long) { titleBuffer.resize(0, 0); recalcTitleBuffer(); - widget()->repaint(); + widget()->tqrepaint(); if (button[ButtonClose]) button[ButtonClose]->reset(); if (button[ButtonSticky]) @@ -466,7 +466,7 @@ void SystemClient::resizeEvent( TQResizeEvent* ) /* if ( isVisibleToTLW() && !testWFlags( WStaticContents )) { TQPainter p( this ); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); t.setTop( 0 ); TQRegion r = rect(); r = r.subtract( t ); @@ -481,9 +481,9 @@ void SystemClient::resize( const TQSize& s ) } -TQSize SystemClient::minimumSize() const +TQSize SystemClient::tqminimumSize() const { - return widget()->minimumSize(); + return widget()->tqminimumSize(); } @@ -499,10 +499,10 @@ void SystemClient::recalcTitleBuffer() p.drawTiledPixmap(0, 0, width(), 18, *aUpperGradient); else p.fillRect(0, 0, width(), 18, - options()->colorGroup(KDecorationOptions::ColorFrame, true). + options()->tqcolorGroup(KDecorationOptions::ColorFrame, true). brush(TQColorGroup::Button)); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); t.setTop( 2 ); t.setLeft( t.left() + 4 ); t.setRight( t.right() - 2 ); @@ -532,24 +532,24 @@ void SystemClient::recalcTitleBuffer() void SystemClient::captionChange() { recalcTitleBuffer(); - widget()->repaint(titlebar->geometry(), false); + widget()->tqrepaint(titlebar->tqgeometry(), false); } void SystemClient::drawRoundFrame(TQPainter &p, int x, int y, int w, int h) { kDrawRoundButton(&p, x, y, w, h, - options()->colorGroup(KDecorationOptions::ColorFrame, isActive()), false); + options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()), false); } void SystemClient::paintEvent( TQPaintEvent* ) { TQPainter p(widget()); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); - TQBrush fillBrush(TQBrush(widget()->colorGroup().brush(TQColorGroup::Background)).pixmap() ? - widget()->colorGroup().brush(TQColorGroup::Background) : - options()->colorGroup(KDecorationOptions::ColorFrame, isActive()). + TQBrush fillBrush(TQBrush(widget()->tqcolorGroup().brush(TQColorGroup::Background)).pixmap() ? + widget()->tqcolorGroup().brush(TQColorGroup::Background) : + options()->tqcolorGroup(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()->colorGroup(KDecorationOptions::ColorFrame, isActive()).light()); + p.setPen(options()->tqcolorGroup(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()->colorGroup(KDecorationOptions::ColorFrame, isActive()).dark()); + p.setPen(options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()).dark()); p.drawLine(width()-20, height()-6, width()-10, height()-6); p.drawLine(width()-20, height()-4, width()-10, height()-4); @@ -597,7 +597,7 @@ void SystemClient::showEvent(TQShowEvent *) // Client::showEvent(ev); doShape(); widget()->show(); -// widget()->repaint(); +// widget()->tqrepaint(); } /*void SystemClient::windowWrapperShowEvent( TQShowEvent* ) @@ -607,13 +607,13 @@ void SystemClient::showEvent(TQShowEvent *) void SystemClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) titlebarDblClickOperation(); } void SystemClient::wheelEvent( TQWheelEvent *e ) { - if (isSetShade() || TQRect( 0, 0, width(), titlebar->geometry().height() ).contains( e->pos() ) ) + if (isSetShade() || TQRect( 0, 0, width(), titlebar->tqgeometry().height() ).contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } @@ -633,7 +633,7 @@ void SystemClient::maximizeChange() void SystemClient::activeChange() { - widget()->repaint(false); + widget()->tqrepaint(false); if (button[ButtonClose]) button[ButtonClose]->reset(); if (button[ButtonSticky]) @@ -649,7 +649,7 @@ void SystemClient::activeChange() void SystemClient::iconChange() { // if (button[BtnMenu] && button[BtnMenu]->isVisible()) -// button[BtnMenu]->repaint(false); +// button[BtnMenu]->tqrepaint(false); } void SystemClient::desktopChange() |