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

---
 kopete/plugins/cryptography/cryptographyguiclient.cpp     | 2 +-
 kopete/plugins/cryptography/cryptographyselectuserkey.cpp | 2 +-
 kopete/plugins/cryptography/kgpginterface.cpp             | 2 +-
 kopete/plugins/cryptography/kgpgselkey.cpp                | 2 +-
 kopete/plugins/cryptography/popuppublic.cpp               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kopete/plugins/cryptography')

diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp
index d8cafd85..8adf8fab 100644
--- a/kopete/plugins/cryptography/cryptographyguiclient.cpp
+++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp
@@ -22,7 +22,7 @@
 
 #include <tdeaction.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 class CryptographyPlugin;
diff --git a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
index ae92647b..26551a7e 100644
--- a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
+++ b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
diff --git a/kopete/plugins/cryptography/kgpginterface.cpp b/kopete/plugins/cryptography/kgpginterface.cpp
index 73858012..5763e910 100644
--- a/kopete/plugins/cryptography/kgpginterface.cpp
+++ b/kopete/plugins/cryptography/kgpginterface.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
 
 #include <stdlib.h>
diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp
index 8604e97c..403efbb7 100644
--- a/kopete/plugins/cryptography/kgpgselkey.cpp
+++ b/kopete/plugins/cryptography/kgpgselkey.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <kprocess.h>
 #include <kiconloader.h>
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index 7263e95c..e5aaeebf 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -35,7 +35,7 @@
 #include <tdelistview.h>
 #include <kprocess.h>
 #include <kprocio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaccel.h>
 #include <tdelistviewsearchline.h>
 #include <kactivelabel.h>
-- 
cgit v1.2.1