diff options
Diffstat (limited to 'twin/clients/plastik')
-rw-r--r-- | twin/clients/plastik/plastik.cpp | 24 | ||||
-rw-r--r-- | twin/clients/plastik/plastik.h | 2 | ||||
-rw-r--r-- | twin/clients/plastik/plastikbutton.cpp | 22 | ||||
-rw-r--r-- | twin/clients/plastik/plastikclient.cpp | 4 |
4 files changed, 26 insertions, 26 deletions
diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp index b5cdeb85b..b5a4808d7 100644 --- a/twin/clients/plastik/plastik.cpp +++ b/twin/clients/plastik/plastik.cpp @@ -185,9 +185,9 @@ void PlastikHandler::readConfig() m_titleHeightTool++; TQString value = config.readEntry("TitleAlignment", "AlignLeft"); - if (value == "AlignLeft") m_titleAlign = Qt::AlignLeft; - else if (value == "AlignHCenter") m_titleAlign = Qt::AlignHCenter; - else if (value == "AlignRight") m_titleAlign = Qt::AlignRight; + if (value == "AlignLeft") m_titleAlign = TQt::AlignLeft; + else if (value == "AlignHCenter") m_titleAlign = TQt::AlignHCenter; + else if (value == "AlignRight") m_titleAlign = TQt::AlignRight; m_coloredBorder = config.readBoolEntry("ColoredBorder", true); m_animateButtons = config.readBoolEntry("AnimateButtons", true); @@ -210,27 +210,27 @@ TQColor PlastikHandler::getColor(KWinPlastik::ColorType type, const bool active) break; case ShadeTitleLight: return alphaBlendColors(KDecoration::options()->color(ColorTitleBar, active), - Qt::white, active?205:215); + TQt::white, active?205:215); break; case ShadeTitleDark: return alphaBlendColors(KDecoration::options()->color(ColorTitleBar, active), - Qt::black, active?205:215); + TQt::black, active?205:215); break; case Border: return KDecoration::options()->color(ColorFrame, active); case TitleFont: return KDecoration::options()->color(ColorFont, active); default: - return Qt::black; + return TQt::black; } } -void PlastikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir ) const +void PlastikHandler::pretile( TQPixmap *&pix, int size, TQt::Orientation dir ) const { TQPixmap *newpix; TQPainter p; - if ( dir == Qt::Horizontal ) + if ( dir == TQt::Horizontal ) newpix = new TQPixmap( size, pix->height() ); else newpix = new TQPixmap( pix->width(), size ); @@ -300,7 +300,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo painter.end(); } - pretile(pm, 64, Qt::Horizontal); + pretile(pm, 64, TQt::Horizontal); break; } @@ -399,7 +399,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo painter.end(); - pretile(pm, 64, Qt::Vertical); + pretile(pm, 64, TQt::Vertical); break; } @@ -433,7 +433,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo } painter.end(); - pretile(pm, 64, Qt::Vertical); + pretile(pm, 64, TQt::Vertical); break; } @@ -523,7 +523,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo painter.drawPoint(0, h-1); painter.end(); - pretile(pm, 64, Qt::Horizontal); + pretile(pm, 64, TQt::Horizontal); break; } diff --git a/twin/clients/plastik/plastik.h b/twin/clients/plastik/plastik.h index 85b9e5fa0..587d93f4e 100644 --- a/twin/clients/plastik/plastik.h +++ b/twin/clients/plastik/plastik.h @@ -101,7 +101,7 @@ public: private: void readConfig(); - void pretile(TQPixmap *&pix, int size, Qt::Orientation dir) const; + void pretile(TQPixmap *&pix, int size, TQt::Orientation dir) const; bool m_coloredBorder; bool m_titleShadow; diff --git a/twin/clients/plastik/plastikbutton.cpp b/twin/clients/plastik/plastikbutton.cpp index 3a097be15..5fdadc8e1 100644 --- a/twin/clients/plastik/plastikbutton.cpp +++ b/twin/clients/plastik/plastikbutton.cpp @@ -170,17 +170,17 @@ void PlastikButton::drawButton(TQPainter *painter) if(type() == CloseButton) { highlightColor = TQColor(255,64,0); } else { - highlightColor = Qt::white; + highlightColor = TQt::white; } TQColor contourTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active), - Qt::black, 215); + TQt::black, 215); TQColor contourBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active), - Qt::black, 215); + TQt::black, 215); TQColor sourfaceTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active), - Qt::white, 210); + TQt::white, 210); TQColor sourfaceBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active), - Qt::white, 210); + TQt::white, 210); int highlightAlpha = static_cast<int>(255-((60/static_cast<double>(ANIMATIONSTEPS))* static_cast<double>(animProgress) ) ); @@ -190,10 +190,10 @@ void PlastikButton::drawButton(TQPainter *painter) sourfaceBottom = alphaBlendColors(sourfaceBottom, highlightColor, highlightAlpha); if (isDown() ) { - contourTop = alphaBlendColors(contourTop, Qt::black, 200); - contourBottom = alphaBlendColors(contourBottom, Qt::black, 200); - sourfaceTop = alphaBlendColors(sourfaceTop, Qt::black, 200); - sourfaceBottom = alphaBlendColors(sourfaceBottom, Qt::black, 200); + contourTop = alphaBlendColors(contourTop, TQt::black, 200); + contourBottom = alphaBlendColors(contourBottom, TQt::black, 200); + sourfaceTop = alphaBlendColors(sourfaceTop, TQt::black, 200); + sourfaceBottom = alphaBlendColors(sourfaceBottom, TQt::black, 200); } TQPixmap buffer; @@ -291,10 +291,10 @@ TQBitmap IconEngine::icon(ButtonIcon icon, int size) --size; TQBitmap bitmap(size,size); - bitmap.fill(Qt::color0); + bitmap.fill(TQt::color0); TQPainter p(&bitmap); - p.setPen(Qt::color1); + p.setPen(TQt::color1); TQRect r = bitmap.rect(); diff --git a/twin/clients/plastik/plastikclient.cpp b/twin/clients/plastik/plastikclient.cpp index 31c9e2ad9..6fa993721 100644 --- a/twin/clients/plastik/plastikclient.cpp +++ b/twin/clients/plastik/plastikclient.cpp @@ -402,10 +402,10 @@ TQRect PlastikClient::captionRect() const } else { tW = caption.width(); } - if (a == Qt::AlignLeft || (caption.width() > titleWidth) ) { + if (a == TQt::AlignLeft || (caption.width() > titleWidth) ) { // Align left tX = titleLeft; - } else if (a == Qt::AlignHCenter) { + } else if (a == TQt::AlignHCenter) { // Align center tX = titleLeft+(titleWidth- caption.width() )/2; } else { |