Rename a number of libraries and executables to avoid conflicts with KDE4

5 files changed, 11 insertions, 11 deletions

diff --git a/kcontrol/performance/kcmkonqyperformance.desktop b/kcontrol/performance/kcmkonqyperformance.desktop
index 3104b244f..413953776 100644
--- a/kcontrol/performance/kcmkonqyperformance.desktop
+++ b/kcontrol/performance/kcmkonqyperformance.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=launch
 Type=Application
-Exec=kcmshell kcmkonqyperformance
+Exec=tdecmshell kcmkonqyperformance
 
 
 X-TDE-Library=performance
diff --git a/kcontrol/performance/kcmperformance.desktop b/kcontrol/performance/kcmperformance.desktop
index 4b7eb3094..df51d96fc 100644
--- a/kcontrol/performance/kcmperformance.desktop
+++ b/kcontrol/performance/kcmperformance.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=launch
 Type=Application
-Exec=kcmshell kcmperformance
+Exec=tdecmshell kcmperformance
 
 
 X-TDE-Library=performance
diff --git a/kcontrol/performance/konqueror.cpp b/kcontrol/performance/konqueror.cpp
index 3c8bb6db3..46dd70774 100644
--- a/kcontrol/performance/konqueror.cpp
+++ b/kcontrol/performance/konqueror.cpp
@@ -19,7 +19,7 @@
 #include "konqueror.h"
 
 #include <dcopref.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqwhatsthis.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
diff --git a/kcontrol/performance/system.cpp b/kcontrol/performance/system.cpp
index 500178002..57d50ee14 100644
--- a/kcontrol/performance/system.cpp
+++ b/kcontrol/performance/system.cpp
@@ -18,7 +18,7 @@
 
 #include "system.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
@@ -49,9 +49,9 @@ SystemWidget::SystemWidget( TQWidget* parent_P )
               " handler will refuse to provide backtrace for the bugreport with this option"
               " turned on (you will need to reproduce it again with this option turned off,"
               " or turn on the developer mode for the crash handler).</p>" );
-    TQWhatsThis::add( cb_disable_kbuildsycoca, tmp );
-    TQWhatsThis::add( label_kbuildsycoca, tmp );
-    connect( cb_disable_kbuildsycoca, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
+    TQWhatsThis::add( cb_disable_tdebuildsycoca, tmp );
+    TQWhatsThis::add( label_tdebuildsycoca, tmp );
+    connect( cb_disable_tdebuildsycoca, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
     defaults();
     }
 
@@ -60,14 +60,14 @@ void SystemWidget::load(bool useDefaults )
     TDEConfig cfg( "kdedrc", true );
 	 cfg.setReadDefaults( useDefaults );
     cfg.setGroup( "General" );
-    cb_disable_kbuildsycoca->setChecked( cfg.readBoolEntry( "DelayedCheck", false ));
+    cb_disable_tdebuildsycoca->setChecked( cfg.readBoolEntry( "DelayedCheck", false ));
     }
 
 void SystemWidget::save()
     {
     TDEConfig cfg( "kdedrc" );
     cfg.setGroup( "General" );
-    cfg.writeEntry( "DelayedCheck", cb_disable_kbuildsycoca->isChecked());
+    cfg.writeEntry( "DelayedCheck", cb_disable_tdebuildsycoca->isChecked());
     }
 
 void SystemWidget::defaults()
diff --git a/kcontrol/performance/system_ui.ui b/kcontrol/performance/system_ui.ui
index 384ad2f86..878c73ddf 100644
--- a/kcontrol/performance/system_ui.ui
+++ b/kcontrol/performance/system_ui.ui
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQCheckBox">
                     <property name="name">
-                        <cstring>cb_disable_kbuildsycoca</cstring>
+                        <cstring>cb_disable_tdebuildsycoca</cstring>
                     </property>
                     <property name="text">
                         <string>Disable &amp;system configuration startup check</string>
@@ -37,7 +37,7 @@
                 </widget>
                 <widget class="TQLabel">
                     <property name="name">
-                        <cstring>label_kbuildsycoca</cstring>
+                        <cstring>label_tdebuildsycoca</cstring>
                     </property>
                     <property name="text">
                         <string>&lt;b&gt;WARNING:&lt;/b&gt; This option may in rare cases lead to various problems. Consult the What's This? (Shift+F1) help for details.</string>