Rename KApplication to TDEApplication to avoid conflicts with KDE4

3 files changed, 7 insertions, 7 deletions

diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index e6a698153..c862b09c5 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -86,7 +86,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
 
     m_textColor = KGlobalSettings::textColor();
 
-    updateSettings(KApplication::SETTINGS_MOUSE);
+    updateSettings(TDEApplication::SETTINGS_MOUSE);
 
     kapp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged);
 
@@ -219,7 +219,7 @@ void PanelButton::updateIcon(int group)
 
 void PanelButton::updateSettings(int category)
 {
-    if (category != KApplication::SETTINGS_MOUSE)
+    if (category != TDEApplication::SETTINGS_MOUSE)
     {
         return;
     }
diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h
index 7fd2cca6d..3a455a58f 100644
--- a/kicker/libkicker/panelbutton.h
+++ b/kicker/libkicker/panelbutton.h
@@ -352,14 +352,14 @@ protected:
 
 protected slots:
     /**
-     * Called from KApplication when global icon settings have changed.
+     * Called from TDEApplication when global icon settings have changed.
      * @param group the new group
      */
     void updateIcon(int group);
 
     /**
-     * Called from KApplication when global settings have changed.
-     * @param category the settings category, see KApplication::SettingsCategory
+     * Called from TDEApplication when global settings have changed.
+     * @param category the settings category, see TDEApplication::SettingsCategory
      */
     void updateSettings(int category);
 
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index d4ca8faac..178277c25 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -55,7 +55,7 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandar
     kapp->addKipcEventMask( KIPC::SettingsChanged );
     kapp->addKipcEventMask( KIPC::IconChanged );
 
-    slotSettingsChanged( KApplication::SETTINGS_MOUSE );
+    slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
 }
 
 void SimpleButton::setPixmap(const TQPixmap &pix)
@@ -165,7 +165,7 @@ void SimpleButton::generateIcons()
 
 void SimpleButton::slotSettingsChanged(int category)
 {
-    if (category != KApplication::SETTINGS_MOUSE)
+    if (category != TDEApplication::SETTINGS_MOUSE)
     {
         return;
     }