1 files changed, 20 insertions, 20 deletions

diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index d6b873e2b..8e44f100f 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kiconloader.h>
 #include <kimageeffect.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <netwm.h>
 #include <fixx11h.h>
@@ -117,7 +117,7 @@ bool is_process_resumable(pid_t pid) {
 		TQByteArray statRaw = procStatFile.readAll();
 		procStatFile.close();
 		TQString statString(statRaw);
-		TQStringList statFields = TQStringList::split(" ", statString, TRUE);
+		TQStringList statFields = TQStringList::split(" ", statString, true);
 		TQString tcomm = statFields[1];
 		TQString state = statFields[2];
 		if( state == "T" ) {
@@ -186,7 +186,7 @@ TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames, Ta
 
     sid = m_startup->bin();
 
-    connect(m_startup, TQT_SIGNAL(changed()), TQT_SLOT(update()));
+    connect(m_startup, TQ_SIGNAL(changed()), TQ_SLOT(update()));
 
     dragSwitchTimer.start(333, true);
 }
@@ -212,10 +212,10 @@ void TaskContainer::init()
 
     installEventFilter(KickerTip::the());
 
-    connect(&animationTimer, TQT_SIGNAL(timeout()), TQT_SLOT(animationTimerFired()));
-    connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(showMe()));
-    connect(&attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimerFired()));
-    connect(&m_paintEventCompressionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateNow()));
+    connect(&animationTimer, TQ_SIGNAL(timeout()), TQ_SLOT(animationTimerFired()));
+    connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(showMe()));
+    connect(&attentionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(attentionTimerFired()));
+    connect(&m_paintEventCompressionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateNow()));
 }
 
 TaskContainer::~TaskContainer()
@@ -235,8 +235,8 @@ void TaskContainer::showMe()
         animationTimer.start(100);
 
     emit showMe(this);
-    disconnect(&dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showMe()));
-    connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch()));
+    disconnect(&dragSwitchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showMe()));
+    connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(dragSwitch()));
 }
 
 void TaskContainer::stopTimers()
@@ -442,9 +442,9 @@ void TaskContainer::add(Task::Ptr task)
     KickerTip::Client::updateKickerTip();
     update();
 
-    connect(task, TQT_SIGNAL(changed(bool)), TQT_SLOT(taskChanged(bool)));
-    connect(task, TQT_SIGNAL(iconChanged()), TQT_SLOT(iconChanged()));
-    connect(task, TQT_SIGNAL(activated()), TQT_SLOT(setLastActivated()));
+    connect(task, TQ_SIGNAL(changed(bool)), TQ_SLOT(taskChanged(bool)));
+    connect(task, TQ_SIGNAL(iconChanged()), TQ_SLOT(iconChanged()));
+    connect(task, TQ_SIGNAL(activated()), TQ_SLOT(setLastActivated()));
 }
 
 void TaskContainer::remove(Task::Ptr task)
@@ -724,7 +724,7 @@ void TaskContainer::drawButton(TQPainter *p)
     if (taskBar->showIcons())
     {
       if (pixmap.isNull() && m_startup)
-          pixmap = kapp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize);
+          pixmap = tdeApp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize);
 
       if ( !pixmap.isNull() )
       {
@@ -1097,7 +1097,7 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
     }
 
     performAction( buttonAction );
-    TQTimer::singleShot(0, this, TQT_SLOT(update()));
+    TQTimer::singleShot(0, this, TQ_SLOT(update()));
 }
 
 void TaskContainer::performAction(int action)
@@ -1254,7 +1254,7 @@ void TaskContainer::popupMenu(int action)
     }
     else if (action == m_settingsObject->ShowOperationsMenu)
     {
-        if (!kapp->authorizeTDEAction("twin_rmb"))
+        if (!tdeApp->authorizeTDEAction("twin_rmb"))
         {
             return;
         }
@@ -1310,22 +1310,22 @@ TQPopupMenu* TaskContainer::makeTaskMoveMenu()
 
     id = menu->insertItem(SmallIconSet("go-first"),
                           i18n("Move to Beginning"),
-                          this, TQT_SLOT(slotTaskMoveBeginning()));
+                          this, TQ_SLOT(slotTaskMoveBeginning()));
     menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left));
 
     id = menu->insertItem(SmallIconSet("back"),
                           i18n("Move Left"),
-                          this, TQT_SLOT(slotTaskMoveLeft()));
+                          this, TQ_SLOT(slotTaskMoveLeft()));
     menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left));
 
     id = menu->insertItem(SmallIconSet("forward"),
                           i18n("Move Right"),
-                          this, TQT_SLOT(slotTaskMoveRight()));
+                          this, TQ_SLOT(slotTaskMoveRight()));
     menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right));
 
     id = menu->insertItem(SmallIconSet("go-last"),
                           i18n("Move to End"),
-                          this, TQT_SLOT(slotTaskMoveEnd()));
+                          this, TQ_SLOT(slotTaskMoveEnd()));
     menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right));
 
     return menu;
@@ -1665,7 +1665,7 @@ void TaskContainer::updateFilteredTaskList()
             (!READ_MERGED_TASKBAR_SETTING(showOnlyIconified) || t->isIconified()))
         {
             pid_t pid = 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
             Atom type_ret;
             int format_ret;
             unsigned long nitems_ret = 0, unused = 0;