summaryrefslogtreecommitdiffstats
path: root/kwin/clients/laptop/laptopclient.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kwin/clients/laptop/laptopclient.cpp
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kwin/clients/laptop/laptopclient.cpp')
-rw-r--r--kwin/clients/laptop/laptopclient.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/kwin/clients/laptop/laptopclient.cpp b/kwin/clients/laptop/laptopclient.cpp
index db91cf15d..db37feae6 100644
--- a/kwin/clients/laptop/laptopclient.cpp
+++ b/kwin/clients/laptop/laptopclient.cpp
@@ -157,7 +157,7 @@ static void create_pixmaps()
KPixmapEffect::VerticalGradient);
}
// buttons (active/inactive, sunken/unsunken, 2 sizes each)
- TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true);
+ TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true);
TQColor c = g.background();
btnPix1 = new KPixmap;
btnPix1->resize(btnWidth1, titleHeight);
@@ -184,7 +184,7 @@ static void create_pixmaps()
KPixmapEffect::DiagonalGradient);
KPixmapEffect::gradient(*btnDownPix2, c.dark(130), c.light(120),
KPixmapEffect::DiagonalGradient);
- g = options()->colorGroup(KDecoration::ColorButtonBg, false);
+ g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
c = g.background();
KPixmapEffect::gradient(*iBtnPix1, c.light(120), c.dark(130),
KPixmapEffect::DiagonalGradient);
@@ -200,27 +200,27 @@ static void create_pixmaps()
btnDownPix1->fill(c.rgb());
btnPix2->fill(c.rgb());
btnDownPix2->fill(c.rgb());
- g = options()->colorGroup(KDecoration::ColorButtonBg, false);
+ g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
c = g.background();
iBtnPix1->fill(c.rgb());
iBtnDownPix1->fill(c.rgb());
iBtnPix2->fill(c.rgb());
iBtnDownPix2->fill(c.rgb());
}
- g = options()->colorGroup(KDecoration::ColorButtonBg, true);
+ g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true);
c = g.background();
drawButtonFrame(btnPix1, g, false);
drawButtonFrame(btnDownPix1, g, true);
drawButtonFrame(btnPix2, g, false);
drawButtonFrame(btnDownPix2, g, true);
- g = options()->colorGroup(KDecoration::ColorButtonBg, false);
+ g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
c = g.background();
drawButtonFrame(iBtnPix1, g, false);
drawButtonFrame(iBtnDownPix1, g, true);
drawButtonFrame(iBtnPix2, g, false);
drawButtonFrame(iBtnDownPix2, g, true);
- if(qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128)
+ if(tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128)
btnForeground = Qt::black;
else
btnForeground = Qt::white;
@@ -293,7 +293,7 @@ void LaptopButton::setBitmap(const unsigned char *bitmap)
deco.fill(Qt::color0);
}
deco.setMask(deco);
- repaint();
+ tqrepaint();
}
void LaptopButton::drawButton(TQPainter *p)
@@ -314,7 +314,7 @@ void LaptopButton::drawButton(TQPainter *p)
}
}
else{
- TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, decoration()->isActive());
+ TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, decoration()->isActive());
int w = width();
int h = height();
p->fillRect(1, 1, w-2, h-2, isDown() ? g.mid() : g.button());
@@ -469,7 +469,7 @@ void LaptopClient::captionChange()
void LaptopClient::paintEvent( TQPaintEvent* )
{
TQPainter p(widget());
- TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive());
+ TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive());
TQRect r(widget()->rect());
p.setPen(Qt::black);
@@ -546,7 +546,7 @@ void LaptopClient::paintEvent( TQPaintEvent* )
p.setFont(options()->font(false, isToolWindow() ));
TQFontMetrics fm(options()->font(false));
- g = options()->colorGroup(KDecoration::ColorTitleBar, false);
+ g = options()->tqcolorGroup(KDecoration::ColorTitleBar, false);
if(iUpperGradient)
p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4,
r.y(), fm.width(caption())+8, r.height()-1,
@@ -564,7 +564,7 @@ void LaptopClient::paintEvent( TQPaintEvent* )
p.setPen(options()->color(KDecoration::ColorFont, false));
p.drawText(r.x(), r.y(), r.width(), r.height()-1,
AlignCenter, caption() );
- g = options()->colorGroup(KDecoration::ColorFrame, true);
+ g = options()->tqcolorGroup(KDecoration::ColorFrame, true);
p.setPen(g.background());
p.drawPoint(r.x(), r.y());
p.drawPoint(r.right(), r.y());
@@ -629,7 +629,7 @@ void LaptopClient::updateActiveBuffer( )
p.setFont(options()->font(true, isToolWindow() ));
TQFontMetrics fm(options()->font(true));
- TQColorGroup g = options()->colorGroup(KDecoration::ColorTitleBar, true);
+ TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorTitleBar, true);
if(aUpperGradient)
p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4,
r.y(), fm.width(caption())+8, r.height()-1,
@@ -647,7 +647,7 @@ void LaptopClient::updateActiveBuffer( )
p.setPen(options()->color(KDecoration::ColorFont, true));
p.drawText(r.x(), r.y(), r.width(), r.height()-1,
AlignCenter, caption() );
- g = options()->colorGroup(KDecoration::ColorFrame, true);
+ g = options()->tqcolorGroup(KDecoration::ColorFrame, true);
p.setPen(g.background());
p.drawPoint(r.x(), r.y());
p.drawPoint(r.right(), r.y());