summaryrefslogtreecommitdiffstats
path: root/kicker/libkicker/global.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/libkicker/global.cpp')
-rw-r--r--kicker/libkicker/global.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index 62f7f055a..224cf427a 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -114,19 +114,19 @@ KPanelApplet::Direction arrowToDirection(TQt::ArrowType p)
{
switch (p)
{
- case Qt::DownArrow:
+ case TQt::DownArrow:
return KPanelApplet::Down;
break;
- case Qt::LeftArrow:
+ case TQt::LeftArrow:
return KPanelApplet::Left;
break;
- case Qt::RightArrow:
+ case TQt::RightArrow:
return KPanelApplet::Right;
break;
- case Qt::UpArrow:
+ case TQt::UpArrow:
default:
return KPanelApplet::Up;
break;
@@ -464,20 +464,15 @@ TQIconSet menuIconSet(const TQString& icon)
void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color, int alpha)
{
static TQPixmap pix;
- static TQColor last_color = Qt::black;
+ static TQColor last_color = TQt::black;
static int last_alpha = 0;
if (pix.isNull() || last_color != color || last_alpha != alpha)
{
TQImage img(16, 16, 32);
-#ifdef USE_QT4
+ img.setAlphaBuffer(false);
+ img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF));
img.setAlphaBuffer(true);
- img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF));
-#else // USE_QT4
- img.setAlphaBuffer(false);
- img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF));
- img.setAlphaBuffer(true);
-#endif // USE_QT4
pix.convertFromImage(img);
last_color = color;
last_alpha = alpha;