summaryrefslogtreecommitdiffstats
path: root/kalzium
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:03:10 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:03:10 -0600
commit782ea254f2b2cc59c01c9fa9c26df3262b05648a (patch)
treeea2570417efdc330ee127513e1ca90180ab59311 /kalzium
parentc7c2e1330f7496d86e25cd9e408ae9f62f2d9bcb (diff)
downloadtdeedu-782ea254f2b2cc59c01c9fa9c26df3262b05648a.tar.gz
tdeedu-782ea254f2b2cc59c01c9fa9c26df3262b05648a.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kalzium')
-rw-r--r--kalzium/Makefile.am2
-rw-r--r--kalzium/src/kalzium.cpp2
-rw-r--r--kalzium/src/prefs.kcfgc2
-rw-r--r--kalzium/src/spectrumviewimpl.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/kalzium/Makefile.am b/kalzium/Makefile.am
index 1ccfe136..eba3cc01 100644
--- a/kalzium/Makefile.am
+++ b/kalzium/Makefile.am
@@ -2,5 +2,5 @@ SUBDIRS = src
AUTOMAKE_OPTIONS = foreign
-DOXYGEN_REFERENCES = tdeui tdecore kfile libtdeedu
+DOXYGEN_REFERENCES = tdeui tdecore tdefile libtdeedu
include ../admin/Doxyfile.am
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index d9bcdf6a..17e8a953 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -39,7 +39,7 @@
#include <tqscrollview.h>
#include <tqspinbox.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/kalzium/src/prefs.kcfgc b/kalzium/src/prefs.kcfgc
index e6df4e2e..2cafdda0 100644
--- a/kalzium/src/prefs.kcfgc
+++ b/kalzium/src/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=kalzium.kcfg
#IncludeFiles=defines.h
ClassName=Prefs
diff --git a/kalzium/src/spectrumviewimpl.cpp b/kalzium/src/spectrumviewimpl.cpp
index f360b485..e74c8a59 100644
--- a/kalzium/src/spectrumviewimpl.cpp
+++ b/kalzium/src/spectrumviewimpl.cpp
@@ -14,7 +14,7 @@
#include <tqspinbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kguiitem.h>
#include <klocale.h>
#include <kmessagebox.h>