summaryrefslogtreecommitdiffstats
path: root/kicker/applets/minipager
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/applets/minipager')
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp6
-rw-r--r--kicker/applets/minipager/pagerbutton.cpp42
2 files changed, 24 insertions, 24 deletions
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 3bb7f65d4..a684aa6f8 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqtooltip.h>
#include <tqlineedit.h>
#include <tqpopupmenu.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqbuttongroup.h>
#include <dcopref.h>
@@ -365,7 +365,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
if( m_desktopLayoutOwner == NULL )
{ // must own manager selection before setting global desktop layout
int screen = DefaultScreen( qt_xdisplay());
- m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
+ m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).tqarg( screen ).latin1(),
screen, TQT_TQOBJECT(this) );
if( !m_desktopLayoutOwner->claim( false ))
{
@@ -865,7 +865,7 @@ void KMiniPager::slotDesktopNamesChanged()
{
TQString name = m_twin->desktopName(i);
(*it)->setDesktopName(name);
- (*it)->repaint();
+ (*it)->tqrepaint();
TQToolTip::remove((*it));
TQToolTip::add((*it), name);
}
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 1dfa5ee25..e494d538d 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqlineedit.h>
#include <tqpainter.h>
#include <tqpopupmenu.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
#include <netwm.h>
#include <dcopclient.h>
@@ -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().contains(r.topLeft()) &&
+ !TQApplication::desktop()->tqgeometry().contains(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 = TQBrush(KickerLib::blendColors(colorGroup().mid(),
- colorGroup().midlight()));
+ background = TQBrush(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 (twin->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)
@@ -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);