summaryrefslogtreecommitdiffstats
path: root/kmag
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:17:45 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:17:45 -0600
commit6b23c84fe51a08a5b6107a2fa44100e747424796 (patch)
tree9d1bab3454172bc65b8d91d35ad3ab38c5d2f8fd /kmag
parent8d6262f12ea35c0a67dbbdadc732f9b640c19b07 (diff)
downloadtdeaccessibility-6b23c84fe51a08a5b6107a2fa44100e747424796.tar.gz
tdeaccessibility-6b23c84fe51a08a5b6107a2fa44100e747424796.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kmag')
-rw-r--r--kmag/kmag.cpp2
-rw-r--r--kmag/kmag.h6
2 files changed, 4 insertions, 4 deletions
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>
/**