3 files changed, 9 insertions, 9 deletions
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index ac0133668..d6a7d0f4e 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -131,7 +131,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin
 
     blocklayout = false;
 
-    connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+    connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
     keys = new TDEGlobalAccel( this );
 #include "taskbarbindings.cpp"
     keys->readSettings();
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index efde7dd2c..32ad5531e 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -161,7 +161,7 @@ void TaskBarContainer::configure()
                 break;
         }
 
-        windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
+        windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon,
                                                                  TDEIcon::Panel,
                                                                  16));
         windowListButton->setMinimumSize(windowListButton->sizeHint());
@@ -188,20 +188,20 @@ void TaskBarContainer::preferences()
 {
     TQByteArray data;
 
-    if (!kapp->dcopClient()->isAttached())
+    if (!tdeApp->dcopClient()->isAttached())
     {
-        kapp->dcopClient()->attach();
+        tdeApp->dcopClient()->attach();
     }
 
     if (configFile == GLOBAL_TASKBAR_CONFIG_FILE_NAME)
     {
-        kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
+        tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
     }
     else
     {
         TQDataStream args( data, IO_WriteOnly );
         args << configFile;
-        kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data);
+        tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data);
     }
 }
 
@@ -266,7 +266,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d)
 
     if (windowListButton)
     {
-        windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
+        windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon,
                                                                  TDEIcon::Panel,
                                                                  16));
         windowListButton->setMinimumSize(windowListButton->sizeHint());
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 5a8464cd5..bbb449a52 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -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() )
       {
@@ -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;
         }