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

---
 kgeography/src/boxasker.cpp   | 2 +-
 kgeography/src/kgeography.cpp | 2 +-
 kgeography/src/kgeography.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kgeography/src')

diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp
index 6bc0444a..16a5ad60 100644
--- a/kgeography/src/boxasker.cpp
+++ b/kgeography/src/boxasker.cpp
@@ -10,7 +10,7 @@
 
 #include <stdlib.h> // for RAND_MAX
 
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp
index 0355ba96..67762cd9 100644
--- a/kgeography/src/kgeography.cpp
+++ b/kgeography/src/kgeography.cpp
@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kinputdialog.h>
diff --git a/kgeography/src/kgeography.h b/kgeography/src/kgeography.h
index a48c0fb5..a9343079 100644
--- a/kgeography/src/kgeography.h
+++ b/kgeography/src/kgeography.h
@@ -11,7 +11,7 @@
 #ifndef KGEOGRAPHY_H
 #define KGEOGRAPHY_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TDEAction;
 class KPushButton;
-- 
cgit v1.2.1