summaryrefslogtreecommitdiffstats
path: root/kicker/taskbar
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/taskbar')
-rw-r--r--kicker/taskbar/taskbar.cpp20
-rw-r--r--kicker/taskbar/taskcontainer.cpp12
-rw-r--r--kicker/taskbar/taskcontainer.h6
3 files changed, 19 insertions, 19 deletions
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index 33109c576..4da304daf 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -358,7 +358,7 @@ void TaskBar::add(Startup::Ptr startup)
it != containers.end();
++it)
{
- if ((*it)->tqcontains(startup))
+ if ((*it)->contains(startup))
{
return;
}
@@ -372,7 +372,7 @@ void TaskBar::add(Startup::Ptr startup)
void TaskBar::showTaskContainer(TaskContainer* container)
{
- TaskContainer::List::iterator it = m_hiddenContainers.tqfind(container);
+ TaskContainer::List::iterator it = m_hiddenContainers.find(container);
if (it != m_hiddenContainers.end())
{
m_hiddenContainers.erase(it);
@@ -432,7 +432,7 @@ void TaskBar::remove(Task::Ptr task, TaskContainer* container)
it != m_hiddenContainers.end();
++it)
{
- if ((*it)->tqcontains(task))
+ if ((*it)->contains(task))
{
(*it)->finish();
m_deletableContainers.append(*it);
@@ -447,7 +447,7 @@ void TaskBar::remove(Task::Ptr task, TaskContainer* container)
it != containers.end();
++it)
{
- if ((*it)->tqcontains(task))
+ if ((*it)->contains(task))
{
container = *it;
break;
@@ -464,7 +464,7 @@ void TaskBar::remove(Task::Ptr task, TaskContainer* container)
if (container->isEmpty())
{
- TaskContainer::List::iterator it = containers.tqfind(container);
+ TaskContainer::List::iterator it = containers.find(container);
if (it != containers.end())
{
containers.erase(it);
@@ -490,7 +490,7 @@ void TaskBar::remove(Startup::Ptr startup, TaskContainer* container)
it != m_hiddenContainers.end();
++it)
{
- if ((*it)->tqcontains(startup))
+ if ((*it)->contains(startup))
{
(*it)->remove(startup);
@@ -511,7 +511,7 @@ void TaskBar::remove(Startup::Ptr startup, TaskContainer* container)
it != containers.end();
++it)
{
- if ((*it)->tqcontains(startup))
+ if ((*it)->contains(startup))
{
container = *it;
break;
@@ -530,7 +530,7 @@ void TaskBar::remove(Startup::Ptr startup, TaskContainer* container)
return;
}
- TaskContainer::List::iterator it = containers.tqfind(container);
+ TaskContainer::List::iterator it = containers.find(container);
if (it != containers.end())
{
containers.erase(it);
@@ -580,7 +580,7 @@ void TaskBar::windowChanged(Task::Ptr task)
{
TaskContainer* c = *it;
- if (c->tqcontains(task))
+ if (c->contains(task))
{
container = c;
break;
@@ -620,7 +620,7 @@ void TaskBar::windowChangedGeometry(Task::Ptr task)
++it)
{
TaskContainer* c = *it;
- if (c->tqcontains(task))
+ if (c->contains(task))
{
container = c;
break;
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 7da0cd50e..5b084a962 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -390,7 +390,7 @@ void TaskContainer::remove(Startup::Ptr startup)
}
}
-bool TaskContainer::tqcontains(Task::Ptr task)
+bool TaskContainer::contains(Task::Ptr task)
{
if (!task)
{
@@ -408,12 +408,12 @@ bool TaskContainer::tqcontains(Task::Ptr task)
return false;
}
-bool TaskContainer::tqcontains(Startup::Ptr startup)
+bool TaskContainer::contains(Startup::Ptr startup)
{
return startup && (m_startup == startup);
}
-bool TaskContainer::tqcontains(WId win)
+bool TaskContainer::contains(WId win)
{
Task::List::iterator itEnd = tasks.end();
for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
@@ -638,7 +638,7 @@ void TaskContainer::drawButton(TQPainter *p)
// modified overlay
static TQString modStr = "[" + i18n( "modified" ) + "]";
- int modStrPos = text.tqfind( modStr );
+ int modStrPos = text.find( modStr );
int textPos = ( taskBar->showIcon() && (!pixmap.isNull() || m_startup)) ? 2 + 16 + 2 : 0;
if (modStrPos >= 0)
@@ -944,7 +944,7 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
// This is to avoid the flicker caused by redrawing the
// button as unpressed just before it's activated.
- if (!TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos()))
+ if (!TQT_TQRECT_OBJECT(rect()).contains(e->pos()))
{
TQToolButton::mouseReleaseEvent(e);
return;
@@ -1623,7 +1623,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
details.append(i18n("Has unsaved changes"));
static TQString modStr = "[" + i18n( "modified" ) + "]";
- int modStrPos = name.tqfind(modStr);
+ int modStrPos = name.find(modStr);
if (modStrPos >= 0)
{
diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h
index 4d2e0de9b..8dfdf6d2d 100644
--- a/kicker/taskbar/taskcontainer.h
+++ b/kicker/taskbar/taskcontainer.h
@@ -57,9 +57,9 @@ public:
void remove(Task::Ptr);
void remove(Startup::Ptr);
- bool tqcontains(Task::Ptr);
- bool tqcontains(Startup::Ptr);
- bool tqcontains(WId);
+ bool contains(Task::Ptr);
+ bool contains(Startup::Ptr);
+ bool contains(WId);
bool isEmpty();
bool onCurrentDesktop();