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

14 files changed, 17 insertions, 17 deletions

diff --git a/certmanager/lib/CMakeLists.txt b/certmanager/lib/CMakeLists.txt
index 79c729f33..74dc46ea5 100644
--- a/certmanager/lib/CMakeLists.txt
+++ b/certmanager/lib/CMakeLists.txt
@@ -47,6 +47,6 @@ tde_add_library( kleopatra SHARED AUTOMOC
   LINK
     kleopatra_backend_qgpgme-static
     kleopatra_backend_chiasmus-static
-    qgpgme-shared kio-shared
+    qgpgme-shared tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index da875e303..53ad316d5 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -43,7 +43,7 @@
 #include "kleo/cryptoconfig.h"
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kshell.h>
 #include <kdebug.h>
 
diff --git a/certmanager/lib/cryptplugfactory.cpp b/certmanager/lib/cryptplugfactory.cpp
index a5015a54d..50db2ab74 100644
--- a/certmanager/lib/cryptplugfactory.cpp
+++ b/certmanager/lib/cryptplugfactory.cpp
@@ -37,7 +37,7 @@
 #include "cryptplugfactory.h"
 #include "cryptplugwrapperlist.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index f997e9309..eb2ccafea 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -64,7 +64,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 // other
 #include <memory>
diff --git a/certmanager/lib/kleo/CMakeLists.txt b/certmanager/lib/kleo/CMakeLists.txt
index 63d238e7d..aab4ce210 100644
--- a/certmanager/lib/kleo/CMakeLists.txt
+++ b/certmanager/lib/kleo/CMakeLists.txt
@@ -43,6 +43,6 @@ tde_add_library( kleopatra_core STATIC_PIC AUTOMOC
   SOURCES
     cryptobackend.cpp cryptobackendfactory.cpp
     enum.cpp dn.cpp job.cpp multideletejob.cpp
-    hierarchicalkeylistjob.cpp kconfigbasedkeyfilter.cpp
+    hierarchicalkeylistjob.cpp tdeconfigbasedkeyfilter.cpp
     keyfiltermanager.cpp
 )
diff --git a/certmanager/lib/kleo/Makefile.am b/certmanager/lib/kleo/Makefile.am
index ad9054d15..b81d43bf8 100644
--- a/certmanager/lib/kleo/Makefile.am
+++ b/certmanager/lib/kleo/Makefile.am
@@ -14,7 +14,7 @@ libkleopatra_core_la_SOURCES = \
 	multideletejob.cpp \
 	hierarchicalkeylistjob.cpp \
 	\
-	kconfigbasedkeyfilter.cpp \
+	tdeconfigbasedkeyfilter.cpp \
 	keyfiltermanager.cpp
 
 kleodir = $(includedir)/kleo
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index f67343ca8..0397e168d 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -46,7 +46,7 @@
 #include <backends/chiasmus/chiasmusbackend.h>
 #include <ui/backendconfigwidget.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index 3249cc73b..847127eab 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -40,7 +40,7 @@
 #include "ui/dnattributeorderconfigwidget.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include <tqstringlist.h>
diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp
index 1276f9fd3..1aa2b170a 100644
--- a/certmanager/lib/kleo/keyfiltermanager.cpp
+++ b/certmanager/lib/kleo/keyfiltermanager.cpp
@@ -35,11 +35,11 @@
 #endif
 
 #include "keyfiltermanager.h"
-#include "kconfigbasedkeyfilter.h"
+#include "tdeconfigbasedkeyfilter.h"
 
 #include "cryptobackendfactory.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqapplication.h>
 #include <tqregexp.h>
diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp
index 4ed6ab37d..05c6d04d5 100644
--- a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
+++ b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp
@@ -1,5 +1,5 @@
 /*
-    kconfigbasedkeyfilter.cpp
+    tdeconfigbasedkeyfilter.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
     Copyright (c) 2004 Klarälvdalens Datakonsult AB
@@ -34,9 +34,9 @@
 #include <config.h>
 #endif
 
-#include "kconfigbasedkeyfilter.h"
+#include "tdeconfigbasedkeyfilter.h"
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <klocale.h>
 
 static const struct {
diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.h b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.h
index 487b3791a..3d65e7a2f 100644
--- a/certmanager/lib/kleo/kconfigbasedkeyfilter.h
+++ b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.h
@@ -1,5 +1,5 @@
 /*
-    kconfigbasedkeyfilter.h
+    tdeconfigbasedkeyfilter.h
 
     This file is part of libkleopatra, the KDE keymanagement library
     Copyright (c) 2004 Klarälvdalens Datakonsult AB
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index 4cfcfb20a..67f1929e8 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -42,7 +42,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include <tqtoolbutton.h>
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index adb257493..b785137d7 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -58,7 +58,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <twin.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kactivelabel.h>
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index 96b710c37..571ceccd4 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -41,7 +41,7 @@
 #include <gpgmepp/signingresult.h>
 #include <gpgmepp/encryptionresult.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <ksavefile.h>