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/ui/backendconfigwidget.cpp          | 4 ++--
 certmanager/lib/ui/cryptoconfigdialog.cpp           | 2 +-
 certmanager/lib/ui/cryptoconfigmodule.cpp           | 4 ++--
 certmanager/lib/ui/dnattributeorderconfigwidget.cpp | 2 +-
 certmanager/lib/ui/keyapprovaldialog.cpp            | 4 ++--
 certmanager/lib/ui/keyrequester.cpp                 | 4 ++--
 certmanager/lib/ui/keyselectiondialog.cpp           | 6 +++---
 certmanager/lib/ui/messagebox.cpp                   | 2 +-
 certmanager/lib/ui/messagebox.h                     | 2 +-
 certmanager/lib/ui/passphrasedialog.cpp             | 2 +-
 certmanager/lib/ui/progressdialog.cpp               | 2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'certmanager/lib/ui')

diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 7b65a538..2589e4d6 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -43,9 +43,9 @@
 
 #include <tdelistview.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 
diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp
index 410f4348..52402d6d 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.cpp
+++ b/certmanager/lib/ui/cryptoconfigdialog.cpp
@@ -31,7 +31,7 @@
 
 #include "cryptoconfigdialog.h"
 #include "cryptoconfigmodule.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaccelmanager.h>
 
 Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, const char* name )
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index c1c710d2..135958c0 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -37,12 +37,12 @@
 #include <kleo/cryptoconfig.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kdebug.h>
 #include <knuminput.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurlrequester.h>
 
 #include <tqgrid.h>
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index 71ac8a95..262ad6c7 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -38,7 +38,7 @@
 
 #include "kleo/dn.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index 434699d0..0ee6d865 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -45,8 +45,8 @@
 #include <cryptplugfactory.h>
 #include <kleo/cryptobackend.h>
 
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kseparator.h>
 
 #include <tqstringlist.h>
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index c3bcf024..53db6ce9 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -63,11 +63,11 @@
 #include <gpgmepp/keylistresult.h>
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialog.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 
 // TQt
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 53d65843..9e005d58 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -52,14 +52,14 @@
 #include <gpgmepp/keylistresult.h>
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <twin.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kactivelabel.h>
 #include <kurl.h>
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index 571ceccd..935084bd 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -43,7 +43,7 @@
 
 #include <tdefiledialog.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksavefile.h>
 #include <kguiitem.h>
 #include <kdebug.h>
diff --git a/certmanager/lib/ui/messagebox.h b/certmanager/lib/ui/messagebox.h
index 69dea34c..083c1603 100644
--- a/certmanager/lib/ui/messagebox.h
+++ b/certmanager/lib/ui/messagebox.h
@@ -33,7 +33,7 @@
 #ifndef __KLEO_UI_MESSAGEBOX_H__
 #define __KLEO_UI_MESSAGEBOX_H__
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace GpgME {
     class SigningResult;
diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp
index 5c7c44bd..a2d0e7c3 100644
--- a/certmanager/lib/ui/passphrasedialog.cpp
+++ b/certmanager/lib/ui/passphrasedialog.cpp
@@ -54,7 +54,7 @@
 
 #include <kpassdlg.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp
index d6552922..692ee4cb 100644
--- a/certmanager/lib/ui/progressdialog.cpp
+++ b/certmanager/lib/ui/progressdialog.cpp
@@ -37,7 +37,7 @@
 #include <kleo/job.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqtimer.h>
 
-- 
cgit v1.2.3