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

17 files changed, 18 insertions, 18 deletions

diff --git a/wizards/egroupwareconfig.kcfgc b/wizards/egroupwareconfig.kcfgc
index 47927939c..5869e0093 100644
--- a/wizards/egroupwareconfig.kcfgc
+++ b/wizards/egroupwareconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=egroupware.kcfg
 ClassName=EGroupwareConfig
 Singleton=true
diff --git a/wizards/egroupwarewizard.h b/wizards/egroupwarewizard.h
index 2a920467f..431c61d3c 100644
--- a/wizards/egroupwarewizard.h
+++ b/wizards/egroupwarewizard.h
@@ -21,7 +21,7 @@
 #ifndef EGROUPWAREWIZARD_H
 #define EGROUPWAREWIZARD_H
 
-#include <kconfigwizard.h>
+#include <tdeconfigwizard.h>
 #include <tdepimmacros.h>
 
 class KLineEdit;
diff --git a/wizards/exchangewizard.h b/wizards/exchangewizard.h
index f453356da..ffa35d025 100644
--- a/wizards/exchangewizard.h
+++ b/wizards/exchangewizard.h
@@ -20,7 +20,7 @@
 #ifndef EXCHANGEWIZARD_H
 #define EXCHANGEWIZARD_H
 
-#include <kconfigwizard.h>
+#include <tdeconfigwizard.h>
 #include <tdepimmacros.h>
 
 class KLineEdit;
diff --git a/wizards/groupwiseconfig.kcfgc b/wizards/groupwiseconfig.kcfgc
index 09231e2e7..8034a0ec6 100644
--- a/wizards/groupwiseconfig.kcfgc
+++ b/wizards/groupwiseconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=groupwise.kcfg
 ClassName=GroupwiseConfig
 Singleton=true
diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h
index 073de386a..7960a39be 100644
--- a/wizards/groupwisewizard.h
+++ b/wizards/groupwisewizard.h
@@ -20,7 +20,7 @@
 #ifndef GROUPWISEWIZARD_H
 #define GROUPWISEWIZARD_H
 
-#include <kconfigwizard.h>
+#include <tdeconfigwizard.h>
 #include <tdepimmacros.h>
 
 class KLineEdit;
diff --git a/wizards/kmailchanges.h b/wizards/kmailchanges.h
index f238b3628..3fc412a1d 100644
--- a/wizards/kmailchanges.h
+++ b/wizards/kmailchanges.h
@@ -22,8 +22,8 @@
 #ifndef KMAILCHANGES_H
 #define KMAILCHANGES_H
 
-#include <kconfigpropagator.h>
-#include <kconfig.h>
+#include <tdeconfigpropagator.h>
+#include <tdeconfig.h>
 
 namespace KWallet {
   class Wallet;
diff --git a/wizards/kolabconfig.kcfgc b/wizards/kolabconfig.kcfgc
index 4c265d26a..c2177b863 100644
--- a/wizards/kolabconfig.kcfgc
+++ b/wizards/kolabconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kolab.kcfg
 ClassName=KolabConfig
 Singleton=true
diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp
index 0adfc46b7..6227383fc 100644
--- a/wizards/kolabkmailchanges.cpp
+++ b/wizards/kolabkmailchanges.cpp
@@ -25,7 +25,7 @@
 #include "kmailchanges.h"
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 class KolabCustomWriter : public CreateDisconnectedImapAccount::CustomWriter
diff --git a/wizards/kolabkmailchanges.h b/wizards/kolabkmailchanges.h
index 74d07691b..c4c9ad89b 100644
--- a/wizards/kolabkmailchanges.h
+++ b/wizards/kolabkmailchanges.h
@@ -21,7 +21,7 @@
 #ifndef KOLABKMAILCHANGES_H
 #define KOLABKMAILCHANGES_H
 
-#include <kconfigpropagator.h>
+#include <tdeconfigpropagator.h>
 
 void createKMailChanges( TDEConfigPropagator::Change::List& );
 
diff --git a/wizards/kolabwizard.h b/wizards/kolabwizard.h
index eec252336..99fd0c0d2 100644
--- a/wizards/kolabwizard.h
+++ b/wizards/kolabwizard.h
@@ -22,7 +22,7 @@
 #ifndef KOLABWIZARD_H
 #define KOLABWIZARD_H
 
-#include <kconfigwizard.h>
+#include <tdeconfigwizard.h>
 #include <tdepimmacros.h>
 
 class KLineEdit;
diff --git a/wizards/scalixconfig.kcfgc b/wizards/scalixconfig.kcfgc
index f4893ca07..82be44329 100644
--- a/wizards/scalixconfig.kcfgc
+++ b/wizards/scalixconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=scalix.kcfg
 ClassName=ScalixConfig
 Singleton=true
diff --git a/wizards/scalixkmailchanges.cpp b/wizards/scalixkmailchanges.cpp
index 4926678ed..89ea65d54 100644
--- a/wizards/scalixkmailchanges.cpp
+++ b/wizards/scalixkmailchanges.cpp
@@ -25,7 +25,7 @@
 #include "kmailchanges.h"
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 class ScalixCustomWriter : public CreateDisconnectedImapAccount::CustomWriter
diff --git a/wizards/scalixkmailchanges.h b/wizards/scalixkmailchanges.h
index 91ae7b303..e3f23aa14 100644
--- a/wizards/scalixkmailchanges.h
+++ b/wizards/scalixkmailchanges.h
@@ -21,7 +21,7 @@
 #ifndef SCALIXKMAILCHANGES_H
 #define SCALIXKMAILCHANGES_H
 
-#include <kconfigpropagator.h>
+#include <tdeconfigpropagator.h>
 
 void createKMailChanges( TDEConfigPropagator::Change::List& );
 
diff --git a/wizards/scalixwizard.h b/wizards/scalixwizard.h
index 6ff44b054..273f6c4a6 100644
--- a/wizards/scalixwizard.h
+++ b/wizards/scalixwizard.h
@@ -22,7 +22,7 @@
 #ifndef SCALIXWIZARD_H
 #define SCALIXWIZARD_H
 
-#include <kconfigwizard.h>
+#include <tdeconfigwizard.h>
 #include <tdepimmacros.h>
 
 class KComboBox;
diff --git a/wizards/servertype.h b/wizards/servertype.h
index c7d8e7ea7..700de0e8f 100644
--- a/wizards/servertype.h
+++ b/wizards/servertype.h
@@ -22,7 +22,7 @@
 #ifndef SERVERTYPE
 #define SERVERTYPE
 
-#include <kconfigpropagator.h>
+#include <tdeconfigpropagator.h>
 #include <klibloader.h>
 
 #include <tqobject.h>
diff --git a/wizards/sloxconfig.kcfgc b/wizards/sloxconfig.kcfgc
index be2757887..5ca5414cc 100644
--- a/wizards/sloxconfig.kcfgc
+++ b/wizards/sloxconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=slox.kcfg
 ClassName=SloxConfig
 Singleton=true
diff --git a/wizards/sloxwizard.h b/wizards/sloxwizard.h
index f43525d1a..d9b24c60c 100644
--- a/wizards/sloxwizard.h
+++ b/wizards/sloxwizard.h
@@ -20,7 +20,7 @@
 #ifndef SLOXWIZARD_H
 #define SLOXWIZARD_H
 
-#include <kconfigwizard.h>
+#include <tdeconfigwizard.h>
 #include <tdepimmacros.h>
 
 class KLineEdit;