From cfb328d59024a251690b6e47c9f8d343fd8c241c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:59:38 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 certmanager/lib/backends/chiasmus/chiasmusbackend.cpp         | 2 +-
 certmanager/lib/backends/chiasmus/chiasmusjob.cpp             | 4 ++--
 certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp         | 2 +-
 certmanager/lib/backends/chiasmus/obtainkeysjob.cpp           | 4 ++--
 certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp  | 2 +-
 certmanager/lib/backends/kpgp/kpgpbackendbase.cpp             | 2 +-
 certmanager/lib/backends/qgpgme/qgpgmebackend.cpp             | 2 +-
 certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp        | 6 +++---
 certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp          | 2 +-
 certmanager/lib/backends/qgpgme/qgpgmejob.cpp                 | 2 +-
 certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp          | 4 ++--
 certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp | 2 +-
 certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp      | 2 +-
 certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp             | 2 +-
 14 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'certmanager/lib/backends')

diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index 53ad316d5..7ed31197d 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -42,7 +42,7 @@
 
 #include "kleo/cryptoconfig.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kshell.h>
 #include <kdebug.h>
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
index 2154f7aa6..265d759b7 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
@@ -44,9 +44,9 @@
 #include <gpg-error.h>
 
 #include <kshell.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqtimer.h>
 #include <tqfileinfo.h>
diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
index 002bf0182..6bb588d63 100644
--- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
@@ -39,7 +39,7 @@
 
 #include <klibloader.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 
diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
index 677fc6ec2..d7ae22c1f 100644
--- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
+++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
@@ -40,8 +40,8 @@
 
 #include "kleo/cryptoconfig.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kshell.h>
 
 #include <tqdir.h>
diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
index ec396537e..9391f023f 100644
--- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
+++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
@@ -32,7 +32,7 @@
 
 #include "symcryptrunprocessbase.h"
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include <kshell.h>
 
diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp
index 2395dc6e6..b5b006b56 100644
--- a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp
+++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp
@@ -41,7 +41,7 @@
 #include "pgp6backend.h"
 #include "gpg1backend.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqstring.h>
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
index 744dd1133..c38097ed1 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
@@ -42,7 +42,7 @@
 #include <gpgmepp/context.h>
 #include <gpgmepp/engineinfo.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqfile.h>
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index 191ff4279..e73b4363f 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -34,11 +34,11 @@
 #include <kdebug.h>
 #include <kprocio.h>
 #include <errno.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <assert.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqfile.h>
 #include <stdlib.h>
 #include <tqtextcodec.h>
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp
index 480e6c8a5..433859bd4 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp
@@ -45,7 +45,7 @@
 #include <gpgmepp/encryptionresult.h>
 #include <gpgmepp/data.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <assert.h>
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
index 847b92f31..ee879742c 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
@@ -46,7 +46,7 @@
 #include <gpgmepp/context.h>
 #include <gpgmepp/data.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqstring.h>
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
index c6370674b..5561625c8 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
@@ -43,8 +43,8 @@
 #include <gpgmepp/keylistresult.h>
 #include <gpg-error.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqstringlist.h>
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
index c2e21bb9b..bc0d232eb 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
@@ -36,7 +36,7 @@
 
 #include "qgpgmeprogresstokenmapper.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqstring.h>
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp
index 1392afd5e..70ff6b8fd 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp
@@ -45,7 +45,7 @@
 #include <gpgmepp/data.h>
 #include <gpgmepp/key.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <assert.h>
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
index db5c225e8..032514cd3 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
@@ -46,7 +46,7 @@
 #include <gpgmepp/data.h>
 #include <gpgmepp/key.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <assert.h>
 
-- 
cgit v1.2.1