summaryrefslogtreecommitdiffstats
path: root/kicker/taskmanager
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/taskmanager')
-rw-r--r--kicker/taskmanager/tasklmbmenu.cpp2
-rw-r--r--kicker/taskmanager/taskmanager.cpp14
-rw-r--r--kicker/taskmanager/taskmanager.h2
-rw-r--r--kicker/taskmanager/taskrmbmenu.cpp4
4 files changed, 11 insertions, 11 deletions
diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index fd344f0d2..af7f6e854 100644
--- a/kicker/taskmanager/tasklmbmenu.cpp
+++ b/kicker/taskmanager/tasklmbmenu.cpp
@@ -111,7 +111,7 @@ void TaskLMBMenu::fillMenu()
{
Task::Ptr t = (*it);
- TQString text = t->visibleName().tqreplace("&", "&&");
+ TQString text = t->visibleName().replace("&", "&&");
TaskMenuItem *menuItem = new TaskMenuItem(text,
t->isActive(),
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 103205042..3b2316e4d 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().tqcontains(p))
+ if (t->geometry().contains(p))
{
- int index = list.tqfindIndex(t->window());
+ int index = list.findIndex(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.tqcontains( transient_for ))
+ if( _skiptaskbar_windows.contains( 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().tqfind(modStr);
+ int modStrPos = _info.visibleName().find(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.tqcontains(w))
+ if (!_transients_demanding_attention.contains(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.tqcontains( id2 ) > 0 )
+ if ( id1.contains( id2 ) > 0 )
return true;
- if ( id2.tqcontains( id1 ) > 0 )
+ if ( id2.contains( id1 ) > 0 )
return true;
return false;
diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h
index a12a062d1..ddd5327d2 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.tqfind(w) != _transients.end(); }
+ bool hasTransient(WId w) const { return _transients.find(w) != _transients.end(); }
//* @internal
void updateDemandsAttentionState( WId w );
//* @internal
diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp
index bb5ee6035..fb4c9ae87 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).tqreplace('&', "&&"));
+ TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
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).tqreplace('&', "&&"));
+ TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) );
m->setItemParameter( id, i );
}