6 files changed, 24 insertions, 24 deletions
diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index 55eb642fe..0c002b5fa 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -285,7 +285,7 @@ void KBehaviourOptions::save()
     config.sync();
 
     // Tell the running server
-    if ( kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
+    if ( tdeApp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
     {
       UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
       uiserver.setListMode( cbListProgress->isChecked() );
@@ -293,10 +293,10 @@ void KBehaviourOptions::save()
 
     // Send signal to konqueror
     TQByteArray data;
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
-    kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", data );
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", data );
 }
 
 TQString KBehaviourOptions::handbookSection() const
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index 6ea6178db..65212f68f 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -221,11 +221,11 @@ void KDesktopConfig::save()
   delete config;
 
   // Tell kdesktop about the new config file
-  if ( !kapp->dcopClient()->isAttached() )
-     kapp->dcopClient()->attach();
+  if ( !tdeApp->dcopClient()->isAttached() )
+     tdeApp->dcopClient()->attach();
   TQByteArray data;
 
-  kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
+  tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
 
   emit changed(false);
 }
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 3d149ef39..16f8688d7 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -418,8 +418,8 @@ void DesktopBehavior::save()
     g_pConfig->sync();
 
     // Tell kdesktop about the new config file
-    if ( !kapp->dcopClient()->isAttached() )
-       kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+       tdeApp->dcopClient()->attach();
     TQByteArray data;
 
     int konq_screen_number = TDEApplication::desktop()->primaryScreen();
@@ -428,11 +428,11 @@ void DesktopBehavior::save()
         appname = "kdesktop";
     else
         appname.sprintf("kdesktop-screen-%d", konq_screen_number);
-    kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
     // for the standalone menubar setting
-    kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
-    kapp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data );
-    kapp->dcopClient()->send( "twin*", "", "reconfigure()", data );
+    tdeApp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
+    tdeApp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data );
+    tdeApp->dcopClient()->send( "twin*", "", "reconfigure()", data );
 }
 
 void DesktopBehavior::enableChanged()
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index e8a99297d..ae03a0534 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -330,9 +330,9 @@ void KonqFontOptions::save()
     // Send signal to konqueror
     // Warning. In case something is added/changed here, keep kfmclient in sync
     TQByteArray data;
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 
     // Tell kdesktop about the new config file
     int konq_screen_number = TDEApplication::desktop()->primaryScreen();
@@ -341,7 +341,7 @@ void KonqFontOptions::save()
         appname = "kdesktop";
     else
         appname.sprintf("kdesktop-screen-%d", konq_screen_number);
-    kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
 }
 
 TQString KonqFontOptions::handbookSection() const
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 309651dbb..2e85ab609 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -206,9 +206,9 @@ void KPreviewOptions::save()
     // Send signal to konqueror
     // Warning. In case something is added/changed here, keep kfmclient in sync
     TQByteArray data;
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 }
 
 TQString KPreviewOptions::handbookSection() const
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index be73dcb7a..f83d68fe3 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -512,8 +512,8 @@ void DesktopPathConfig::save()
     }
 
     // Tell kdesktop about the new config file
-    if ( !kapp->dcopClient()->isAttached() )
-       kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+       tdeApp->dcopClient()->attach();
     TQByteArray data;
 
     int konq_screen_number = TDEApplication::desktop()->primaryScreen();
@@ -524,7 +524,7 @@ void DesktopPathConfig::save()
     else {
         appname.sprintf("kdesktop-screen-%d", konq_screen_number);
     }
-    kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
 }
 
 bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQString & type )