summaryrefslogtreecommitdiffstats
path: root/kcalc/kcalc.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:31 -0600
commitbd11bce76f195adf4f3806cef8cf2e0737c99ff2 (patch)
treee3c1714d74f67cc51cd04162cd4afa927dd7f7d4 /kcalc/kcalc.cpp
parent2d7591be424ae10d974d01e0e2f781d19ef07cd6 (diff)
downloadtdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.tar.gz
tdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kcalc/kcalc.cpp')
-rw-r--r--kcalc/kcalc.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index b18882d..63d8e81 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -41,8 +41,8 @@
#include <kaboutdata.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
#include <kcolorbutton.h>
@@ -50,14 +50,14 @@
#include <tdeconfig.h>
#include <tdeconfigdialog.h>
#include <kdialog.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kglobal.h>
#include <kglobalsettings.h>
#include <kkeydialog.h>
#include <kmenubar.h>
#include <knotifyclient.h>
#include <knumvalidator.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kpushbutton.h>
#include <kstatusbar.h>
#include <kstdaction.h>
@@ -69,7 +69,7 @@
#include "general.h"
#include "colors.h"
#include "constants.h"
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include "kcalc_settings.h"