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

---
 tdewallet/allyourbase.h                 | 2 +-
 tdewallet/konfigurator/konfigurator.cpp | 2 +-
 tdewallet/kwmapeditor.cpp               | 4 ++--
 tdewallet/tdewalleteditor.cpp           | 6 +++---
 tdewallet/tdewalleteditor.h             | 2 +-
 tdewallet/tdewalletmanager.cpp          | 2 +-
 tdewallet/tdewalletmanager.h            | 2 +-
 tdewallet/tdewalletpopup.cpp            | 2 +-
 tdewallet/tdewalletpopup.h              | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'tdewallet')

diff --git a/tdewallet/allyourbase.h b/tdewallet/allyourbase.h
index 34c37d3..b6b0770 100644
--- a/tdewallet/allyourbase.h
+++ b/tdewallet/allyourbase.h
@@ -22,7 +22,7 @@
 #define ALLYOURBASE_H
 
 #include <kiconview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdewallet.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
diff --git a/tdewallet/konfigurator/konfigurator.cpp b/tdewallet/konfigurator/konfigurator.cpp
index 406a58e..96cd94b 100644
--- a/tdewallet/konfigurator/konfigurator.cpp
+++ b/tdewallet/konfigurator/konfigurator.cpp
@@ -27,7 +27,7 @@
 #include <kdialog.h>
 #include <kgenericfactory.h>
 #include <kinputdialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdewallet.h>
 
 #include <tqcheckbox.h>
diff --git a/tdewallet/kwmapeditor.cpp b/tdewallet/kwmapeditor.cpp
index 3d85950..c7b17ae 100644
--- a/tdewallet/kwmapeditor.cpp
+++ b/tdewallet/kwmapeditor.cpp
@@ -19,10 +19,10 @@
 
 #include "kwmapeditor.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstdaction.h>
 #include <twin.h>
 
diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp
index 05b6e83..054824b 100644
--- a/tdewallet/tdewalleteditor.cpp
+++ b/tdewallet/tdewalleteditor.cpp
@@ -26,7 +26,7 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
@@ -34,11 +34,11 @@
 #include <kiconview.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <klocale.h>
 #include <kmdcodec.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ksqueezedtextlabel.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
diff --git a/tdewallet/tdewalleteditor.h b/tdewallet/tdewalleteditor.h
index 6016c95..83d5138 100644
--- a/tdewallet/tdewalleteditor.h
+++ b/tdewallet/tdewalleteditor.h
@@ -23,7 +23,7 @@
 
 #include "walletwidget.h"
 #include <tdewallet.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqstringlist.h>
 
 class TDEAction;
diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp
index 25978f5..296e2e5 100644
--- a/tdewallet/tdewalletmanager.cpp
+++ b/tdewallet/tdewalletmanager.cpp
@@ -25,7 +25,7 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/tdewallet/tdewalletmanager.h b/tdewallet/tdewalletmanager.h
index 0a12f99..77cf00f 100644
--- a/tdewallet/tdewalletmanager.h
+++ b/tdewallet/tdewalletmanager.h
@@ -20,7 +20,7 @@
 #ifndef KWALLETMANAGER_H
 #define KWALLETMANAGER_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <dcopobject.h>
 #include <tqptrlist.h>
 
diff --git a/tdewallet/tdewalletpopup.cpp b/tdewallet/tdewalletpopup.cpp
index 4a2037a..d95ac73 100644
--- a/tdewallet/tdewalletpopup.cpp
+++ b/tdewallet/tdewalletpopup.cpp
@@ -20,7 +20,7 @@
 
 #include "tdewalletpopup.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconview.h>
 #include <klocale.h>
diff --git a/tdewallet/tdewalletpopup.h b/tdewallet/tdewalletpopup.h
index c0b5616..ab8cc8f 100644
--- a/tdewallet/tdewalletpopup.h
+++ b/tdewallet/tdewalletpopup.h
@@ -20,7 +20,7 @@
 #ifndef KWALLETPOPUP_H
 #define KWALLETPOPUP_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqmap.h>
 #include <tqstring.h>
 
-- 
cgit v1.2.3