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

---
 kaboodle/controls.h      | 4 ++--
 kaboodle/player.cpp      | 2 +-
 kaboodle/userinterface.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kaboodle')

diff --git a/kaboodle/controls.h b/kaboodle/controls.h
index 9b6d97aa..307281e4 100644
--- a/kaboodle/controls.h
+++ b/kaboodle/controls.h
@@ -26,8 +26,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqguardedptr.h>
 
-#include <kaction.h>
-#include <ktoolbar.h>
+#include <tdeaction.h>
+#include <tdetoolbar.h>
 #include <tqslider.h>
 #include <tqstringlist.h>
 
diff --git a/kaboodle/player.cpp b/kaboodle/player.cpp
index 798cf782..cebab8cd 100644
--- a/kaboodle/player.cpp
+++ b/kaboodle/player.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurl.h>
diff --git a/kaboodle/userinterface.h b/kaboodle/userinterface.h
index 62395098..d82186a4 100644
--- a/kaboodle/userinterface.h
+++ b/kaboodle/userinterface.h
@@ -26,7 +26,7 @@
 #define USERINTERFACE_H
 
 #include "kaboodleapp.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/mainwindow.h>
 #include <kurl.h>
 
-- 
cgit v1.2.1