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

---
 kcalc/dlabel.cpp             |  2 +-
 kcalc/kcalc.cpp              | 10 +++++-----
 kcalc/kcalc.h                |  2 +-
 kcalc/kcalc_const_button.cpp |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'kcalc')

diff --git a/kcalc/dlabel.cpp b/kcalc/dlabel.cpp
index f2e476c..f478b99 100644
--- a/kcalc/dlabel.cpp
+++ b/kcalc/dlabel.cpp
@@ -24,7 +24,7 @@
 */
 
 #include <tqglobal.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kstdaction.h>
 
 #include "kcalc_settings.h"
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"
 
 
diff --git a/kcalc/kcalc.h b/kcalc/kcalc.h
index d19e141..e596d9e 100644
--- a/kcalc/kcalc.h
+++ b/kcalc/kcalc.h
@@ -31,7 +31,7 @@ class TQHButtonGroup;
 class TQWidget;
 class DispLogic;
 class Constants;
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 /*
   Kcalc basically consist of a class for the GUI (here), a class for
diff --git a/kcalc/kcalc_const_button.cpp b/kcalc/kcalc_const_button.cpp
index 8294526..fa137f5 100644
--- a/kcalc/kcalc_const_button.cpp
+++ b/kcalc/kcalc_const_button.cpp
@@ -24,7 +24,7 @@
 
 #include <kcmenumngr.h>
 #include <kinputdialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "kcalc_const_button.h"
 #include "kcalc_const_menu.h"
-- 
cgit v1.2.1