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

---
 kandy/src/kandy.cpp            | 6 +++---
 kandy/src/kandy.h              | 2 +-
 kandy/src/kandyprefsdialog.cpp | 2 +-
 kandy/src/mobilemain.cpp       | 6 +++---
 kandy/src/mobilemain.h         | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kandy/src')

diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index c46f96874..7877cd9f8 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -33,7 +33,7 @@
 #include <kiconloader.h>
 #include <kmenubar.h>
 #include <kkeydialog.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
@@ -43,8 +43,8 @@
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kedittoolbar.h>
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kurldrag.h>
 
diff --git a/kandy/src/kandy.h b/kandy/src/kandy.h
index 10147d772..54e3dc2a4 100644
--- a/kandy/src/kandy.h
+++ b/kandy/src/kandy.h
@@ -29,7 +29,7 @@
 #endif 
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
  
 #include "kandyview.h"
 
diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp
index 3be5ed72d..76dfb8008 100644
--- a/kandy/src/kandyprefsdialog.cpp
+++ b/kandy/src/kandyprefsdialog.cpp
@@ -41,7 +41,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kcolordialog.h>
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index e66909394..788fdc9bd 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -27,7 +27,7 @@
 #include <kiconloader.h>
 #include <kmenubar.h>
 #include <kkeydialog.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
@@ -35,8 +35,8 @@
 #include <kedittoolbar.h>
 #include <kurldrag.h>
 
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 #include <tqpushbutton.h>
diff --git a/kandy/src/mobilemain.h b/kandy/src/mobilemain.h
index b27124c66..1b7a7f427 100644
--- a/kandy/src/mobilemain.h
+++ b/kandy/src/mobilemain.h
@@ -29,7 +29,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "kandyprefs.h"
 
-- 
cgit v1.2.1