summaryrefslogtreecommitdiffstats
path: root/kicker/applets/minipager/pagerbutton.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
commit495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch)
treedaabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kicker/applets/minipager/pagerbutton.cpp
parent50001f1757f97510e80cb1990e2f2d5b00144c2a (diff)
downloadtdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz
tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/applets/minipager/pagerbutton.cpp')
-rw-r--r--kicker/applets/minipager/pagerbutton.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 10a5aa8c9..3d7f06985 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -106,7 +106,7 @@ TQRect KMiniPagerButton::mapGeometryToViewport(const KWin::WindowInfo& info) con
if (!m_useViewports)
return info.frameGeometry();
- // ### fix vertically layouted viewports
+ // ### fix vertically tqlayouted viewports
TQRect _r(info.frameGeometry());
TQPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop()));
@@ -129,7 +129,7 @@ TQPoint KMiniPagerButton::mapPointToViewport(const TQPoint& _p) const
TQPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop()));
- // ### fix vertically layouted viewports
+ // ### fix vertically tqlayouted viewports
TQPoint p(_p);
p.setX(p.x() + (m_desktop - vx.x()) * TQApplication::desktop()->width());
return p;
@@ -157,8 +157,8 @@ bool KMiniPagerButton::shouldPaintWindow( KWin::WindowInfo *info ) const
TQRect r = mapGeometryToViewport(*info);
if (!info->hasState(NET::Sticky) &&
- !TQApplication::desktop()->geometry().contains(r.topLeft()) &&
- !TQApplication::desktop()->geometry().contains(r.topRight()))
+ !TQApplication::desktop()->tqgeometry().tqcontains(r.topLeft()) &&
+ !TQApplication::desktop()->tqgeometry().tqcontains(r.topRight()))
return false;
}
@@ -404,16 +404,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
// transparent windows get an 1 pixel frame...
if (on)
{
- bp->setPen(colorGroup().midlight());
+ bp->setPen(tqcolorGroup().midlight());
}
else if (down)
{
- bp->setPen(KickerLib::blendColors(colorGroup().mid(),
- colorGroup().midlight()));
+ bp->setPen(KickerLib::blendColors(tqcolorGroup().mid(),
+ tqcolorGroup().midlight()));
}
else
{
- bp->setPen(colorGroup().dark());
+ bp->setPen(tqcolorGroup().dark());
}
bp->drawRect(0, 0, w, h);
@@ -424,16 +424,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
if (on)
{
- background = colorGroup().brush(TQColorGroup::Midlight);
+ background = tqcolorGroup().brush(TQColorGroup::Midlight);
}
else if (down)
{
- background = KickerLib::blendColors(colorGroup().mid(),
- colorGroup().midlight());
+ background = KickerLib::blendColors(tqcolorGroup().mid(),
+ tqcolorGroup().midlight());
}
else
{
- background = colorGroup().brush(TQColorGroup::Mid);
+ background = tqcolorGroup().brush(TQColorGroup::Mid);
}
bp->fillRect(0, 0, w, h, background);
@@ -462,12 +462,12 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
if (kwin->activeWindow() == info->win())
{
- TQBrush brush = colorGroup().brush(TQColorGroup::Highlight);
- qDrawShadeRect(bp, r, colorGroup(), false, 1, 0, &brush);
+ TQBrush brush = tqcolorGroup().brush(TQColorGroup::Highlight);
+ qDrawShadeRect(bp, r, tqcolorGroup(), false, 1, 0, &brush);
}
else
{
- TQBrush brush = colorGroup().brush(TQColorGroup::Button);
+ TQBrush brush = tqcolorGroup().brush(TQColorGroup::Button);
if (on)
{
@@ -475,7 +475,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
}
bp->fillRect(r, brush);
- qDrawShadeRect(bp, r, colorGroup(), true, 1, 0);
+ qDrawShadeRect(bp, r, tqcolorGroup(), true, 1, 0);
}
if (m_pager->windowIcons() && r.width() > 15 && r.height() > 15)
@@ -498,11 +498,11 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
// makes it look a bit more finished.
if (on)
{
- bp->setPen(colorGroup().midlight());
+ bp->setPen(tqcolorGroup().midlight());
}
else
{
- bp->setPen(colorGroup().mid());
+ bp->setPen(tqcolorGroup().mid());
}
bp->drawRect(0, 0, w, h);
@@ -515,7 +515,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
if (transparent || liveBkgnd)
{
- bp->setPen(on ? colorGroup().midlight() : colorGroup().buttonText());
+ bp->setPen(on ? tqcolorGroup().midlight() : tqcolorGroup().buttonText());
m_pager->shadowEngine()->drawText(*bp, TQRect(0, 0, w, h), AlignCenter, label, size());
}
else
@@ -523,7 +523,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
}
if (m_inside)
- KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), colorGroup().foreground());
+ KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), tqcolorGroup().foreground());
}
void KMiniPagerButton::mousePressEvent(TQMouseEvent * e)
@@ -578,7 +578,7 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e)
if (m_currentWindow && !m_pager->clickPos.isNull() &&
(m_pager->clickPos - e->pos()).manhattanLength() > KGlobalSettings::dndEventDelay())
{
- TQRect r = m_currentWindow->geometry();
+ TQRect r = m_currentWindow->tqgeometry();
// preview window height, window width
int ww = r.width() * w / dw;
@@ -586,9 +586,9 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e)
TQPixmap windowImage(ww, wh);
TQPainter bp(&windowImage, this);
- bp.setPen(colorGroup().foreground());
+ bp.setPen(tqcolorGroup().foreground());
bp.drawRect(0, 0, ww, wh);
- bp.fillRect(1, 1, ww - 2, wh - 2, colorGroup().background());
+ bp.fillRect(1, 1, ww - 2, wh - 2, tqcolorGroup().background());
Task::List tasklist;
tasklist.append(m_currentWindow);