1 files changed, 9 insertions, 9 deletions

diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index efde7dd2c..e9cc87979 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <twindowlistmenu.h>
 
 #include <X11/X.h>
@@ -65,10 +65,10 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid
     TQFile configFileObject(locateLocal("config", configFile));
     if (!configFileObject.exists())
     {
-        TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE);
+        TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, true, true);
         TDEConfig localConfig(configFile);
         globalConfig.copyTo(configFile, &localConfig);
-        localConfig.writeEntry("UseGlobalSettings", TRUE);
+        localConfig.writeEntry("UseGlobalSettings", true);
         localConfig.sync();
     }
     settingsObject = new TaskBarSettings(TDESharedConfig::openConfig(configFile));
@@ -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());