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

---
 kmag/kmag.cpp | 2 +-
 kmag/kmag.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kmag')

diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp
index 204195c..7eb6560 100644
--- a/kmag/kmag.cpp
+++ b/kmag/kmag.cpp
@@ -52,7 +52,7 @@
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 #include <ktempfile.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kedittoolbar.h>
 #include <twin.h>
 
diff --git a/kmag/kmag.h b/kmag/kmag.h
index 5be881f..2ed5da7 100644
--- a/kmag/kmag.h
+++ b/kmag/kmag.h
@@ -34,10 +34,10 @@
 
 // include files for KDE
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdockwidget.h>
-#include <kaction.h>
-#include <kaccel.h>
+#include <tdeaction.h>
+#include <tdeaccel.h>
 #include <knuminput.h>
 
 /**
-- 
cgit v1.2.3