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/lib/ui/backendconfigwidget.cpp | 4 ++--
 certmanager/lib/ui/cryptoconfigdialog.cpp  | 2 +-
 certmanager/lib/ui/keylistview.h           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'certmanager/lib/ui')

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