summaryrefslogtreecommitdiffstats
path: root/kicker/taskmanager/taskmanager.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/taskmanager/taskmanager.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/taskmanager/taskmanager.cpp')
-rw-r--r--kicker/taskmanager/taskmanager.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 739c626b5..103205042 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -247,9 +247,9 @@ Task::Ptr TaskManager::findTask(int desktop, const TQPoint& p)
continue;
}
- if (t->geometry().contains(p))
+ if (t->geometry().tqcontains(p))
{
- int index = list.findIndex(t->window());
+ int index = list.tqfindIndex(t->window());
if (index > currentIndex)
{
currentIndex = index;
@@ -295,7 +295,7 @@ void TaskManager::windowAdded(WId w )
WId transient_for = (WId) transient_for_tmp;
// check if it's transient for a skiptaskbar window
- if( _skiptaskbar_windows.contains( transient_for ))
+ if( _skiptaskbar_windows.tqcontains( transient_for ))
return;
// lets see if this is a transient for an existing task
@@ -807,7 +807,7 @@ bool Task::isModified() const
static TQString modStr = TQString::fromUtf8("[") +
i18n("modified") +
TQString::fromUtf8("]");
- int modStrPos = _info.visibleName().find(modStr);
+ int modStrPos = _info.visibleName().tqfind(modStr);
return ( modStrPos != -1 );
}
@@ -831,7 +831,7 @@ void Task::updateDemandsAttentionState( WId w )
NETWinInfo i( qt_xdisplay(), w, qt_xrootwin(), NET::WMState );
if(i.state() & NET::DemandsAttention)
{
- if (!_transients_demanding_attention.contains(w))
+ if (!_transients_demanding_attention.tqcontains(w))
{
_transients_demanding_attention.append(w);
}
@@ -984,10 +984,10 @@ bool Task::idMatch( const TQString& id1, const TQString& id2 )
if ( id1.isEmpty() || id2.isEmpty() )
return false;
- if ( id1.contains( id2 ) > 0 )
+ if ( id1.tqcontains( id2 ) > 0 )
return true;
- if ( id2.contains( id1 ) > 0 )
+ if ( id2.tqcontains( id1 ) > 0 )
return true;
return false;
@@ -1305,7 +1305,7 @@ void Task::updateThumbnail()
// by the thumbnail generation. This makes things much smoother
// on slower machines.
//
- TQWidget *rootWin = qApp->desktop();
+ TQWidget *rootWin = TQT_TQWIDGET(tqApp->desktop());
TQRect geom = _info.geometry();
_grab = TQPixmap::grabWindow(rootWin->winId(),
geom.x(), geom.y(),
@@ -1329,7 +1329,7 @@ void Task::generateThumbnail()
width = width * _thumbSize;
height = height * _thumbSize;
- img = img.smoothScale( qRound(width), qRound(height) );
+ img = img.smoothScale( tqRound(width), tqRound(height) );
_thumb = img;
_grab.resize( 0, 0 ); // Makes grab a null image.
@@ -1356,7 +1356,7 @@ TQPixmap Task::thumbnail(int maxDimension)
Picture picture = XRenderCreatePicture(dpy, m_windowPixmap, format,
CPSubwindowMode, &picAttr);
- // Get shaped windows handled correctly.
+ // Get tqshaped windows handled correctly.
XserverRegion region = XFixesCreateRegionFromWindow(dpy, m_frameId,
WindowRegionBounding);
XFixesSetPictureClipRegion(dpy, picture, 0, 0, region);
@@ -1375,7 +1375,7 @@ TQPixmap Task::thumbnail(int maxDimension)
int thumbnailHeight = (int)(winAttr.height * factor);
TQPixmap thumbnail(thumbnailWidth, thumbnailHeight);
- thumbnail.fill(TQApplication::palette().active().background());
+ thumbnail.fill(TQApplication::tqpalette().active().background());
#if 0 // TQImage::smoothScale() scaling
TQPixmap full(winAttr.width, winAttr.height);
@@ -1499,7 +1499,7 @@ bool TaskDrag::canDecode(const TQMimeSource* e)
Task::List TaskDrag::decode( const TQMimeSource* e )
{
- TQByteArray data(e->encodedData("taskbar/task"));
+ TQByteArray data(e->tqencodedData("taskbar/task"));
Task::List tasks;
if (data.size())