summaryrefslogtreecommitdiffstats
path: root/kicker/applets/launcher/quicklauncher.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 /kicker/applets/launcher/quicklauncher.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 'kicker/applets/launcher/quicklauncher.cpp')
-rw-r--r--kicker/applets/launcher/quicklauncher.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index a278b39c9..9c1228a2d 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -108,7 +108,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
m_dragButtons = 0;
m_configAction = new KAction(i18n("Configure Quicklauncher..."), "configure", KShortcut(),
- this, TQT_SLOT(slotConfigure()), this);
+ TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this));
m_saveTimer = new TQTimer(this, "m_saveTimer");
connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig()));
@@ -503,7 +503,7 @@ void QuickLauncher::about()
void QuickLauncher::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == RightButton)
+ if (e->button() == Qt::RightButton)
{
m_popup->popup(e->globalPos());
}
@@ -828,7 +828,7 @@ void QuickLauncher::loadConfig()
for (n=0; n<int(m_buttons->size()); ++n)
{
QuickButton* button = (*m_buttons)[n];
- if (volatileButtons.contains(button->menuId()) == false)
+ if (volatileButtons.tqcontains(button->menuId()) == false)
{
button->setSticky(true);
}
@@ -1040,19 +1040,19 @@ void QuickLauncher::updateStickyHighlightLayer()
m_stickyHighlightLayer = TQImage(width(), height(), 32);
m_stickyHighlightLayer.setAlphaBuffer(true);
int pix, tlPix, brPix, w(width()), h(height());
- QRgb transparent(qRgba(0, 0, 0, 0));
+ QRgb transparent(tqRgba(0, 0, 0, 0));
for (int y = h-1; y >= 0; --y)
{
for (int x = w-1; x >= 0; --x)
{
- pix = qRed(areaLayer.pixel(x, y));
+ pix = tqRed(areaLayer.pixel(x, y));
if (pix == 0)
{
- tlPix = (y>0 && x>0) ? qRed(areaLayer.pixel(x-1,y-1)) : 255;
- brPix = (y<h-1 && x<w-1) ? qRed(areaLayer.pixel(x+1,y+1)) : 255;
+ tlPix = (y>0 && x>0) ? tqRed(areaLayer.pixel(x-1,y-1)) : 255;
+ brPix = (y<h-1 && x<w-1) ? tqRed(areaLayer.pixel(x+1,y+1)) : 255;
int c = tlPix-brPix < 0 ? 255 : 0;
int alpha = abs(tlPix-brPix)/2;
- m_stickyHighlightLayer.setPixel(x, y, qRgba(c, c, c, alpha));
+ m_stickyHighlightLayer.setPixel(x, y, tqRgba(c, c, c, alpha));
}
else
{
@@ -1060,7 +1060,7 @@ void QuickLauncher::updateStickyHighlightLayer()
}
}
}
- repaint();
+ tqrepaint();
}
void QuickLauncher::paintEvent(TQPaintEvent* e)