summaryrefslogtreecommitdiffstats
path: root/certmanager/lib/kleo
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
commitcfb328d59024a251690b6e47c9f8d343fd8c241c (patch)
tree7c11070cd07e5e023a26ddcfa41832c208c63732 /certmanager/lib/kleo
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'certmanager/lib/kleo')
-rw-r--r--certmanager/lib/kleo/cryptobackendfactory.cpp4
-rw-r--r--certmanager/lib/kleo/dn.cpp2
-rw-r--r--certmanager/lib/kleo/enum.cpp2
-rw-r--r--certmanager/lib/kleo/hierarchicalkeylistjob.cpp2
-rw-r--r--certmanager/lib/kleo/multideletejob.cpp2
-rw-r--r--certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp2
6 files changed, 7 insertions, 7 deletions
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index f6af5283d..ce31cc9a5 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -47,9 +47,9 @@
#include <ui/backendconfigwidget.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <iterator>
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index b5b016447..d4ed13018 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -41,7 +41,7 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstringlist.h>
#include <tqvaluevector.h>
diff --git a/certmanager/lib/kleo/enum.cpp b/certmanager/lib/kleo/enum.cpp
index 1d48c6b6e..bc9011fc2 100644
--- a/certmanager/lib/kleo/enum.cpp
+++ b/certmanager/lib/kleo/enum.cpp
@@ -32,7 +32,7 @@
#include "enum.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstring.h>
#include <tqstringlist.h>
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
index ffd3c6db9..65b597255 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
@@ -38,7 +38,7 @@
#include "cryptobackend.h"
#include "keylistjob.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstringlist.h>
#include <tqtl.h>
diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp
index 7d1a27302..7c83c24bc 100644
--- a/certmanager/lib/kleo/multideletejob.cpp
+++ b/certmanager/lib/kleo/multideletejob.cpp
@@ -38,7 +38,7 @@
#include "cryptobackend.h"
#include "deletejob.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <gpgmepp/key.h>
#include <gpgmepp/context.h>
diff --git a/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp
index 05c6d04d5..fd0766b9e 100644
--- a/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp
+++ b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp
@@ -37,7 +37,7 @@
#include "tdeconfigbasedkeyfilter.h"
#include <tdeconfigbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const struct {
const char * name;