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

---
 quanta/src/document.cpp    | 4 ++--
 quanta/src/quanta.cpp      | 8 ++++----
 quanta/src/quanta_init.cpp | 6 +++---
 quanta/src/quantadoc.cpp   | 4 ++--
 quanta/src/quantaview.cpp  | 2 +-
 quanta/src/viewmanager.cpp | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'quanta/src')

diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index 22430940..8365b59d 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -35,8 +35,8 @@
 #include <kapplication.h>
 #include <twin.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kmdcodec.h>
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index 9bbd2e1c..67a88532 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -51,7 +51,7 @@
 // include files for KDE
 #include <kapplication.h>
 #include <kaboutdata.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kbugreport.h>
 #include <kcolordialog.h>
 #include <kcombobox.h>
@@ -70,7 +70,7 @@
 #include <klibloader.h>
 #include <kdockwidget.h>
 #include <kstatusbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <kprocess.h>
 #include <kprogress.h>
@@ -80,7 +80,7 @@
 #include <kdebug.h>
 #include <ktar.h>
 #include <kedittoolbar.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcharsets.h>
 #include <kdirwatch.h>
 #include <kstandarddirs.h>
@@ -157,7 +157,7 @@
 #include "tagdialog.h"
 #include "tagmaildlg.h"
 #include "tagmisc.h"
-#include "tagquicklistdlg.h"
+#include "tagquictdelistdlg.h"
 #include "tableeditor.h"
 
 #include "csseditor.h"
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 155a376b..17d5d15c 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -35,7 +35,7 @@
 
 // include files for KDE
 #include <dcopclient.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
@@ -48,9 +48,9 @@
 #include <tdehtmlview.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kprogress.h>
 #include <ktip.h>
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index 61a6db43..fdf9497c 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -28,9 +28,9 @@
 
 // include files for KDE
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <kdirwatch.h>
 #include <tdeversion.h>
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index d214bab6..e8d6c6a0 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -32,7 +32,7 @@
 #include <tqscrollview.h>
 
 // include files for KDE
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <tdehtmlview.h>
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index ae22d25e..7c73f093 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <tdemdimainfrm.h>
 #include <kurl.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdetexteditor/view.h>
 #include <tdetexteditor/encodinginterface.h>
 #include <tdetexteditor/highlightinginterface.h>
-- 
cgit v1.2.1