From d318087925a540a204c9d3820d5a09fbda58b8b2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:21:55 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 certmanager/certmanager.cpp                    | 6 +++---
 certmanager/certmanager.h                      | 2 +-
 certmanager/conf/appearanceconfigwidget.cpp    | 4 ++--
 certmanager/customactions.cpp                  | 2 +-
 certmanager/customactions.h                    | 2 +-
 certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp | 2 +-
 certmanager/kwatchgnupg/kwatchgnupgmainwin.h   | 2 +-
 certmanager/lib/ui/backendconfigwidget.cpp     | 4 ++--
 certmanager/lib/ui/cryptoconfigdialog.cpp      | 2 +-
 certmanager/lib/ui/keylistview.h               | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'certmanager')

diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 170f64268..9e01cc6d0 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -73,12 +73,12 @@
 // KDE
 #include <tdefiledialog.h>
 #include <kprocess.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <dcopclient.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kstatusbar.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
@@ -87,7 +87,7 @@
 #include <ktempfile.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 
 // TQt
 #include <tqfontmetrics.h>
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index 5ed440bd5..c61ce7dba 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -35,7 +35,7 @@
 
 //#include <gpgme.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdepimmacros.h>
 #include <kurl.h>
 #include <tqcstring.h>
diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp
index 432f2ce99..19224cf9f 100644
--- a/certmanager/conf/appearanceconfigwidget.cpp
+++ b/certmanager/conf/appearanceconfigwidget.cpp
@@ -40,13 +40,13 @@
 #include <kleo/cryptobackendfactory.h>
 #include <kleo/keyfiltermanager.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kcolordialog.h>
 
 #include <tqpushbutton.h>
diff --git a/certmanager/customactions.cpp b/certmanager/customactions.cpp
index 268b85eec..e8ea4312f 100644
--- a/certmanager/customactions.cpp
+++ b/certmanager/customactions.cpp
@@ -32,7 +32,7 @@
 
 #include "customactions.h"
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kapplication.h>
 
 #include <tqlineedit.h>
diff --git a/certmanager/customactions.h b/certmanager/customactions.h
index c07157bd1..67a429f95 100644
--- a/certmanager/customactions.h
+++ b/certmanager/customactions.h
@@ -33,7 +33,7 @@
 #ifndef __CUSTOMACTIONS_H__
 #define __CUSTOMACTIONS_H__
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqstringlist.h>
 
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 729492547..738f01b1e 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -41,7 +41,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kprocio.h>
 #include <tdeconfig.h>
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
index 9b6b4cd5f..7df540514 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
@@ -33,7 +33,7 @@
 #ifndef KWATCHGNUPGMAINWIN_H
 #define KWATCHGNUPGMAINWIN_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class KWatchGnuPGTray;
 class KWatchGnuPGConfig;
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index d2312c725..cc9f0c257 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -41,7 +41,7 @@
 #include "kleo/cryptobackendfactory.h"
 #include "ui/keylistview.h" // for lvi_cast<>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kdebug.h>
@@ -108,7 +108,7 @@ private:
 };
 
 
-// Checklist item under a BackendListViewItem
+// Chectdelist item under a BackendListViewItem
 // (e.g. "GpgME supports protocol OpenPGP")
 class Kleo::ProtocolCheckListItem : public TQCheckListItem
 {
diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp
index d6dc823e7..410f4348c 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.cpp
+++ b/certmanager/lib/ui/cryptoconfigdialog.cpp
@@ -32,7 +32,7 @@
 #include "cryptoconfigdialog.h"
 #include "cryptoconfigmodule.h"
 #include <klocale.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 
 Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, const char* name )
   : KDialogBase( Swallow,
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index 2f383cc53..4149cb41e 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -33,7 +33,7 @@
 #ifndef __KLEO_KEYLISTVIEW_H__
 #define __KLEO_KEYLISTVIEW_H__
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <gpgmepp/key.h>
 #include <tdepimmacros.h>
-- 
cgit v1.2.1