summaryrefslogtreecommitdiffstats
path: root/kicker/taskmanager
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/taskmanager')
-rw-r--r--kicker/taskmanager/tasklmbmenu.cpp6
-rw-r--r--kicker/taskmanager/tasklmbmenu.h6
-rw-r--r--kicker/taskmanager/taskmanager.cpp24
-rw-r--r--kicker/taskmanager/taskmanager.h6
-rw-r--r--kicker/taskmanager/taskrmbmenu.cpp4
-rw-r--r--kicker/taskmanager/taskrmbmenu.h2
6 files changed, 24 insertions, 24 deletions
diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index 864d10f5d..837a7fcec 100644
--- a/kicker/taskmanager/tasklmbmenu.cpp
+++ b/kicker/taskmanager/tasklmbmenu.cpp
@@ -75,7 +75,7 @@ void TaskMenuItem::paint(TQPainter *p, const TQColorGroup &cg,
p->drawText(x, y, w, h, AlignAuto|AlignVCenter|DontClip|ShowPrefix, m_text);
}
-TQSize TaskMenuItem::sizeHint()
+TQSize TaskMenuItem::tqsizeHint()
{
TQFont font = TQFont();
if (m_isActive)
@@ -111,7 +111,7 @@ void TaskLMBMenu::fillMenu()
{
Task::Ptr t = (*it);
- TQString text = t->visibleName().replace("&", "&&");
+ TQString text = t->visibleName().tqreplace("&", "&&");
TaskMenuItem *menuItem = new TaskMenuItem(text,
t->isActive(),
@@ -229,7 +229,7 @@ void TaskLMBMenu::dragSwitch()
void TaskLMBMenu::mousePressEvent( TQMouseEvent* e )
{
- if (e->button() == LeftButton)
+ if (e->button() == Qt::LeftButton)
{
m_dragStartPos = e->pos();
}
diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h
index d11091d82..973cf666f 100644
--- a/kicker/taskmanager/tasklmbmenu.h
+++ b/kicker/taskmanager/tasklmbmenu.h
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "taskmanager.h"
-class TaskMenuItem : public QCustomMenuItem
+class TaskMenuItem : public TQCustomMenuItem
{
public:
TaskMenuItem(const TQString &text,
@@ -38,7 +38,7 @@ public:
~TaskMenuItem();
void paint(TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int);
- TQSize sizeHint();
+ TQSize tqsizeHint();
void setAttentionState(bool state) { m_attentionState = state; }
private:
@@ -51,7 +51,7 @@ private:
/*****************************************************************************/
-class KDE_EXPORT TaskLMBMenu : public QPopupMenu
+class KDE_EXPORT TaskLMBMenu : public TQPopupMenu
{
Q_OBJECT
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())
diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h
index 8f5876360..a12a062d1 100644
--- a/kicker/taskmanager/taskmanager.h
+++ b/kicker/taskmanager/taskmanager.h
@@ -282,7 +282,7 @@ public:
//* @internal
void removeTransient( WId w );
//* @internal
- bool hasTransient(WId w) const { return _transients.find(w) != _transients.end(); }
+ bool hasTransient(WId w) const { return _transients.tqfind(w) != _transients.end(); }
//* @internal
void updateDemandsAttentionState( WId w );
//* @internal
@@ -483,7 +483,7 @@ private:
/**
* Provids a drag object for tasks across desktops.
*/
-class KDE_EXPORT TaskDrag : public QStoredDrag
+class KDE_EXPORT TaskDrag : public TQStoredDrag
{
public:
/**
@@ -565,7 +565,7 @@ private:
* @see Startup
* @see KWinModule
*/
-class KDE_EXPORT TaskManager : public QObject
+class KDE_EXPORT TaskManager : public TQObject
{
Q_OBJECT
Q_PROPERTY( int currentDesktop READ currentDesktop )
diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp
index fb4c9ae87..bb5ee6035 100644
--- a/kicker/taskmanager/taskrmbmenu.cpp
+++ b/kicker/taskmanager/taskrmbmenu.cpp
@@ -236,7 +236,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t)
m->insertSeparator();
for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) {
- TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
+ TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).tqreplace('&', "&&"));
id = m->insertItem( name, t, TQT_SLOT( toDesktop(int) ) );
m->setItemParameter( id, i );
m->setItemChecked( id, !t->isOnAllDesktops() && t->desktop() == i );
@@ -256,7 +256,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu()
m->insertSeparator();
for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) {
- TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
+ TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).tqreplace('&', "&&"));
id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) );
m->setItemParameter( id, i );
}
diff --git a/kicker/taskmanager/taskrmbmenu.h b/kicker/taskmanager/taskrmbmenu.h
index 6657bf909..d95230f9b 100644
--- a/kicker/taskmanager/taskrmbmenu.h
+++ b/kicker/taskmanager/taskrmbmenu.h
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqpopupmenu.h>
-class KDE_EXPORT TaskRMBMenu : public QPopupMenu
+class KDE_EXPORT TaskRMBMenu : public TQPopupMenu
{
Q_OBJECT