summaryrefslogtreecommitdiffstats
path: root/kcalc
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 22:00:04 -0600
committerTimothy Pearson <[email protected]>2013-02-15 22:00:04 -0600
commit783715b853042d24841e3e888051f3a184e78a40 (patch)
tree33ce107e439bb622368ba17b8a2a6485ef28e3b5 /kcalc
parent980088ed866120f458c10c1ec64295e84ad8ba82 (diff)
downloadtdeutils-783715b853042d24841e3e888051f3a184e78a40.tar.gz
tdeutils-783715b853042d24841e3e888051f3a184e78a40.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcalc')
-rw-r--r--kcalc/kcalc.cpp6
-rw-r--r--kcalc/kcalc.kcfg2
-rw-r--r--kcalc/kcalc_const_button.h2
-rw-r--r--kcalc/kcalc_const_menu.cpp2
-rw-r--r--kcalc/kcalc_core.cpp4
-rw-r--r--kcalc/kcalcdisplay.cpp4
6 files changed, 10 insertions, 10 deletions
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index 3c48ed3..3b186fd 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -51,10 +51,10 @@
#include <tdeconfigdialog.h>
#include <kdialog.h>
#include <tdefontdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kkeydialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <knotifyclient.h>
#include <knumvalidator.h>
#include <tdepopupmenu.h>
diff --git a/kcalc/kcalc.kcfg b/kcalc/kcalc.kcfg
index d1fbf7e..2192df3 100644
--- a/kcalc/kcalc.kcfg
+++ b/kcalc/kcalc.kcfg
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<include>tdeapplication.h</include>
- <include>kglobalsettings.h</include>
+ <include>tdeglobalsettings.h</include>
<include>config.h</include>
<kcfgfile name="kcalcrc"/>
<group name="Colors">
diff --git a/kcalc/kcalc_const_button.h b/kcalc/kcalc_const_button.h
index a30b657..0658571 100644
--- a/kcalc/kcalc_const_button.h
+++ b/kcalc/kcalc_const_button.h
@@ -24,7 +24,7 @@
#ifndef _KCALC_CONST_BUTTON_H
#define _KCALC_CONST_BUTTON_H
-#include <klocale.h>
+#include <tdelocale.h>
#include "kcalc_button.h"
diff --git a/kcalc/kcalc_const_menu.cpp b/kcalc/kcalc_const_menu.cpp
index f758c9f..23790cb 100644
--- a/kcalc/kcalc_const_menu.cpp
+++ b/kcalc/kcalc_const_menu.cpp
@@ -19,7 +19,7 @@
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "kcalc_const_menu.h"
diff --git a/kcalc/kcalc_core.cpp b/kcalc/kcalc_core.cpp
index ff7af42..068b442 100644
--- a/kcalc/kcalc_core.cpp
+++ b/kcalc/kcalc_core.cpp
@@ -49,8 +49,8 @@
#include <config.h>
#include "kcalc_core.h"
#include <stdlib.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "kcalctype.h"
#ifndef HAVE_FUNC_ISINF
diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp
index f768ffa..8ad1350 100644
--- a/kcalc/kcalcdisplay.cpp
+++ b/kcalc/kcalcdisplay.cpp
@@ -31,8 +31,8 @@
#include <tqpainter.h>
#include <tqregexp.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
#include "kcalc_settings.h"
#include "kcalcdisplay.h"