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

---
 ksayit/src/DocTreeView.ui       | 2 +-
 ksayit/src/Types.h              | 2 +-
 ksayit/src/contextmenuhandler.h | 4 ++--
 ksayit/src/docbookclasses.h     | 2 +-
 ksayit/src/doctreeviewimpl.h    | 4 ++--
 ksayit/src/ksayit.cpp           | 2 +-
 ksayit/src/ksayit.h             | 8 ++++----
 ksayit/src/ksayitsystemtray.h   | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'ksayit/src')

diff --git a/ksayit/src/DocTreeView.ui b/ksayit/src/DocTreeView.ui
index bc5e2c6..166b9b6 100644
--- a/ksayit/src/DocTreeView.ui
+++ b/ksayit/src/DocTreeView.ui
@@ -156,6 +156,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/ksayit/src/Types.h b/ksayit/src/Types.h
index ff9ca65..81ee8b1 100644
--- a/ksayit/src/Types.h
+++ b/ksayit/src/Types.h
@@ -25,7 +25,7 @@
 #include <tqmap.h>
 
 // KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 typedef TQValueList<int> ParameterList_type;
 typedef TQMap<TQString, ParameterList_type> EffectConfig_type;
diff --git a/ksayit/src/contextmenuhandler.h b/ksayit/src/contextmenuhandler.h
index bd0f2f3..104b76c 100644
--- a/ksayit/src/contextmenuhandler.h
+++ b/ksayit/src/contextmenuhandler.h
@@ -18,8 +18,8 @@
 #include <tqxml.h>
 
 // KDE includes
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 
 //forward declarations
 class ContextMenuHandler;
diff --git a/ksayit/src/docbookclasses.h b/ksayit/src/docbookclasses.h
index 89d104e..82096a9 100644
--- a/ksayit/src/docbookclasses.h
+++ b/ksayit/src/docbookclasses.h
@@ -19,7 +19,7 @@
 #include <tqvaluelist.h>
 
 // KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
  
 // App specific includes
 #include "Types.h"
diff --git a/ksayit/src/doctreeviewimpl.h b/ksayit/src/doctreeviewimpl.h
index b0f7a35..1dfeea7 100644
--- a/ksayit/src/doctreeviewimpl.h
+++ b/ksayit/src/doctreeviewimpl.h
@@ -17,8 +17,8 @@
 
 // KDE includes
 #include <kurl.h>
-#include <klistview.h>
-#include <kpopupmenu.h>
+#include <tdelistview.h>
+#include <tdepopupmenu.h>
 
 // App specific includes
 #include "Types.h"
diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp
index c5be390..82ceb31 100644
--- a/ksayit/src/ksayit.cpp
+++ b/ksayit/src/ksayit.cpp
@@ -31,7 +31,7 @@
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
 #include <kmenubar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h
index 451cf36..f0e3479 100644
--- a/ksayit/src/ksayit.h
+++ b/ksayit/src/ksayit.h
@@ -30,10 +30,10 @@ using namespace std;
 
 // include files for KDE 
 #include <kapplication.h>
-#include <kmainwindow.h>
-#include <kaccel.h>
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdemainwindow.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <kurl.h>
 #include <dcopobject.h>
 #include <kbookmarkmanager.h>
diff --git a/ksayit/src/ksayitsystemtray.h b/ksayit/src/ksayitsystemtray.h
index ebef2d6..d5dd4bc 100644
--- a/ksayit/src/ksayitsystemtray.h
+++ b/ksayit/src/ksayitsystemtray.h
@@ -25,8 +25,8 @@
 // KDE includes
 #include <kapplication.h>
 #include <ksystemtray.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <kmenubar.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-- 
cgit v1.2.1