summaryrefslogtreecommitdiffstats
path: root/kcalc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:57 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:57 -0600
commit0ea54195f4400f13a5cc109feee4b3779fbd2f0f (patch)
tree14f5fe9a43c0a4bc41119c9d518713a3f91bd4c1 /kcalc
parent0ec14ccb8401eff2be20f861953a77431410955c (diff)
downloadtdeutils-0ea54195f4400f13a5cc109feee4b3779fbd2f0f.tar.gz
tdeutils-0ea54195f4400f13a5cc109feee4b3779fbd2f0f.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcalc')
-rw-r--r--kcalc/ChangeLog2
-rw-r--r--kcalc/Makefile.am2
-rw-r--r--kcalc/kcalc.cpp4
-rw-r--r--kcalc/kcalc_settings.kcfgc2
4 files changed, 5 insertions, 5 deletions
diff --git a/kcalc/ChangeLog b/kcalc/ChangeLog
index 00abb5b..4e96f0c 100644
--- a/kcalc/ChangeLog
+++ b/kcalc/ChangeLog
@@ -46,7 +46,7 @@
* further refactoring of configuration options for const buttons
2004-12-05 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
- * understood how kconfigxt handles indexed configuration options
+ * understood how tdeconfigxt handles indexed configuration options
2004-12-03 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
* moving through history is now done via undo/redo
diff --git a/kcalc/Makefile.am b/kcalc/Makefile.am
index cd6d8b0..73d3d7c 100644
--- a/kcalc/Makefile.am
+++ b/kcalc/Makefile.am
@@ -32,7 +32,7 @@ rc_DATA = kcalcui.rc
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kcalc.pot
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
update_DATA = kcalcrc.upd
DOXYGEN_EMPTY = YES
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index c3665c8..7d84ecb 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -47,8 +47,8 @@
#include <kcmdlineargs.h>
#include <kcolorbutton.h>
#include <kcolordrag.h>
-#include <kconfig.h>
-#include <kconfigdialog.h>
+#include <tdeconfig.h>
+#include <tdeconfigdialog.h>
#include <kdialog.h>
#include <kfontdialog.h>
#include <kglobal.h>
diff --git a/kcalc/kcalc_settings.kcfgc b/kcalc/kcalc_settings.kcfgc
index 1ee30f0..392100c 100644
--- a/kcalc/kcalc_settings.kcfgc
+++ b/kcalc/kcalc_settings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=kcalc.kcfg
ClassName=KCalcSettings
Singleton=true