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

---
 kcharselect/kcharselectdia.cc | 4 ++--
 kcharselect/kcharselectdia.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kcharselect')

diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cc
index dd24702..49ea862 100644
--- a/kcharselect/kcharselectdia.cc
+++ b/kcharselect/kcharselectdia.cc
@@ -11,10 +11,10 @@
 
 #include <kdialog.h>
 #include <kapplication.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 /******************************************************************/
 /* class KCharSelectDia                                           */
diff --git a/kcharselect/kcharselectdia.h b/kcharselect/kcharselectdia.h
index 5fddec4..62f07c2 100644
--- a/kcharselect/kcharselectdia.h
+++ b/kcharselect/kcharselectdia.h
@@ -14,7 +14,7 @@
 
 #include <kpushbutton.h>
 #include <kcharselect.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 static const char *version = "v1.1"; 
 
-- 
cgit v1.2.3