summaryrefslogtreecommitdiffstats
path: root/kicker/applets/launcher/quickbutton.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/quickbutton.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/quickbutton.cpp')
-rw-r--r--kicker/applets/launcher/quickbutton.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 2ac0742ca..6e68e2ce1 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -67,7 +67,7 @@ QuickURL::QuickURL(const TQString &u)
if (_menuId.endsWith(".desktop")) {
// Strip path
TQString s = _menuId;
- s = s.mid(s.findRev('/')+1);
+ s = s.mid(s.tqfindRev('/')+1);
s = s.left(s.length()-8);
_service = KService::serviceByStorageId(s);
if (!_service) {
@@ -121,7 +121,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group,
{ // Load icon
TQPixmap pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state);
// Resize to fit button
- pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQImage::ScaleMin));
+ pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQ_ScaleMin));
return pxmap;
}
@@ -140,7 +140,7 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction,
TQToolTip::add(this, _qurl->name());
resize(int(DEFAULT_ICON_DIM),int(DEFAULT_ICON_DIM));
- TQBrush bgbrush(colorGroup().brush(TQColorGroup::Background));
+ TQBrush bgbrush(tqcolorGroup().brush(TQColorGroup::Background));
QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu(
parent, this, _qurl->url());
@@ -152,7 +152,7 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction,
this, TQT_SLOT(removeApp()));
m_stickyAction = new KToggleAction(i18n("Never Remove Automatically"),
- KShortcut(), this);
+ KShortcut(), TQT_TQOBJECT(this));
connect(m_stickyAction, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(slotStickyToggled(bool)));
m_stickyAction->plug(_popup, 2);
@@ -197,9 +197,9 @@ void QuickButton::resizeEvent(TQResizeEvent *e)
void QuickButton::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == RightButton)
+ if (e->button() == Qt::RightButton)
_popup->popup(e->globalPos());
- else if (e->button() == LeftButton) {
+ else if (e->button() == Qt::LeftButton) {
_dragPos = e->pos();
TQButton::mousePressEvent(e);
}
@@ -207,7 +207,7 @@ void QuickButton::mousePressEvent(TQMouseEvent *e)
void QuickButton::mouseMoveEvent(TQMouseEvent *e)
{
- if ((e->state() & LeftButton) == 0) return;
+ if ((e->state() & Qt::LeftButton) == 0) return;
TQPoint p(e->pos() - _dragPos);
if (p.manhattanLength() <= KGlobalSettings::dndEventDelay())
return;