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

5 files changed, 15 insertions, 15 deletions

diff --git a/kpersonalizer/CMakeLists.txt b/kpersonalizer/CMakeLists.txt
index 27a5ede93..4c151b493 100644
--- a/kpersonalizer/CMakeLists.txt
+++ b/kpersonalizer/CMakeLists.txt
@@ -40,6 +40,6 @@ tde_add_executable( kpersonalizer AUTOMOC
     kpersonalizer.cpp main.cpp kfindlanguage.cpp
     kcountrypagedlg.ui kospagedlg.ui keyecandypagedlg.ui
     kstylepagedlg.ui krefinepagedlg.ui ksysinfo.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index 818fd02e3..b48e84b22 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -167,7 +167,7 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan
 			kapp->dcopClient()->attach();
 		// tdesycoca needs to be rebuilt
 		TDEProcess proc;
-		proc << TQString::fromLatin1("kbuildsycoca");
+		proc << TQString::fromLatin1("tdebuildsycoca");
 		proc.start(TDEProcess::DontCare);
 		kdDebug() << "KLocaleConfig::save : sending signal to kdesktop" << endl;
 		// inform kicker and kdeskop about the new language
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index 2ad4a486b..47c0ce37c 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -34,7 +34,7 @@
 #include <klistview.h>
 #include <krun.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <stdlib.h>
 
diff --git a/kpersonalizer/krefinepage.cpp b/kpersonalizer/krefinepage.cpp
index d6038deae..8ea304140 100644
--- a/kpersonalizer/krefinepage.cpp
+++ b/kpersonalizer/krefinepage.cpp
@@ -18,7 +18,7 @@
 #include <tqpushbutton.h>
 
 #include <krun.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp
index 1b10d3082..eff55cb39 100644
--- a/kpersonalizer/kstylepage.cpp
+++ b/kpersonalizer/kstylepage.cpp
@@ -25,7 +25,7 @@
 #include <tqstyle.h>
 #include <tqobjectlist.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
 #include <kglobal.h>
@@ -187,17 +187,17 @@ void KStylePage::saveColors(bool curSettings){
 
 	////////////////////////////////////////////////////
 	// KDE-1.x support
-	KSimpleConfig *kconfig =
+	KSimpleConfig *tdeconfig =
 	new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" );
-	kconfig->setGroup( "General" );
-	kconfig->writeEntry("background", toSave->background );
-	kconfig->writeEntry("selectBackground", toSave->selectBackground );
-	kconfig->writeEntry("foreground", toSave->foreground );
-	kconfig->writeEntry("windowForeground", toSave->windowForeground );
-	kconfig->writeEntry("windowBackground", toSave->windowBackground );
-	kconfig->writeEntry("selectForeground", toSave->selectForeground );
-	kconfig->sync();
-	delete kconfig;
+	tdeconfig->setGroup( "General" );
+	tdeconfig->writeEntry("background", toSave->background );
+	tdeconfig->writeEntry("selectBackground", toSave->selectBackground );
+	tdeconfig->writeEntry("foreground", toSave->foreground );
+	tdeconfig->writeEntry("windowForeground", toSave->windowForeground );
+	tdeconfig->writeEntry("windowBackground", toSave->windowBackground );
+	tdeconfig->writeEntry("selectForeground", toSave->selectForeground );
+	tdeconfig->sync();
+	delete tdeconfig;
 
 	config->setGroup("KDE");
 	// write the color scheme filename and the contrast, default 7, otherwise from file