From c954cd41d38d75615d182ca8649fb4320148bdb3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 16 Nov 2011 13:50:19 -0600 Subject: Additional renaming of kde to tde --- kalzium/Makefile.am | 2 +- kalzium/RELEASE-PLAN | 2 +- kalzium/src/Makefile.am | 4 ++-- kalzium/src/kalzium.cpp | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kalzium') diff --git a/kalzium/Makefile.am b/kalzium/Makefile.am index eccd27a1..1ccfe136 100644 --- a/kalzium/Makefile.am +++ b/kalzium/Makefile.am @@ -2,5 +2,5 @@ SUBDIRS = src AUTOMAKE_OPTIONS = foreign -DOXYGEN_REFERENCES = tdeui tdecore kfile libkdeedu +DOXYGEN_REFERENCES = tdeui tdecore kfile libtdeedu include ../admin/Doxyfile.am diff --git a/kalzium/RELEASE-PLAN b/kalzium/RELEASE-PLAN index 3554ccb1..b9ddf5d5 100644 --- a/kalzium/RELEASE-PLAN +++ b/kalzium/RELEASE-PLAN @@ -35,7 +35,7 @@ Dates * Standalone release of Kalzium + After one week of testing and improving I would like to release - Kalzium (together with libkdeedu for the plotting and the glossary) + Kalzium (together with libtdeedu for the plotting and the glossary) on the 30th of August (a tuesday). Two days later I leave to to aKademy in Malaga, Spain. diff --git a/kalzium/src/Makefile.am b/kalzium/src/Makefile.am index 512e9f21..1ccdcbe5 100644 --- a/kalzium/src/Makefile.am +++ b/kalzium/src/Makefile.am @@ -1,5 +1,5 @@ # set the include path for X, qt and KDE -INCLUDES= -I$(srcdir)/../../libkdeedu/kdeeduplot -I$(srcdir)/../../libkdeedu/kdeeduui $(all_includes) +INCLUDES= -I$(srcdir)/../../libtdeedu/tdeeduplot -I$(srcdir)/../../libtdeedu/tdeeduui $(all_includes) bin_PROGRAMS = kalzium kalzium_SOURCES = eqresult.cpp eqchemview.cpp kalzium.cpp \ @@ -35,7 +35,7 @@ kalzium_SOURCES = eqresult.cpp eqchemview.cpp kalzium.cpp \ moleculeparser.cpp \ tempunit.cpp -kalzium_LDADD = ../../libkdeedu/kdeeduplot/libkdeeduplot.la ../../libkdeedu/kdeeduui/libkdeeduui.la $(LIB_KIO) $(LIB_TDEUI) $(LIB_KHTML) $(OCAMLLIB_FLAGS) $(FACILELIB_FLAGS) $(EQCHEM_LDADD) +kalzium_LDADD = ../../libtdeedu/tdeeduplot/libtdeeduplot.la ../../libtdeedu/tdeeduui/libtdeeduui.la $(LIB_KIO) $(LIB_TDEUI) $(LIB_KHTML) $(OCAMLLIB_FLAGS) $(FACILELIB_FLAGS) $(EQCHEM_LDADD) KDE_CXXFLAGS = -D_ISOC99_SOURCE SUBDIRS = icons elementpics data $(EQCHEM_SUB) diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp index 011aecb6..2046825b 100644 --- a/kalzium/src/kalzium.cpp +++ b/kalzium/src/kalzium.cpp @@ -50,7 +50,7 @@ #include #include -#include +#include #define PerodicTableView_MARGIN 5 #define IDS_ELEMENTINFO 7 @@ -84,8 +84,8 @@ Kalzium::Kalzium() setupSidebars(); setupActions(); - // adding the libkdeedu catalog - KGlobal::locale()->insertCatalogue( "libkdeedu" ); + // adding the libtdeedu catalog + KGlobal::locale()->insertCatalogue( "libtdeedu" ); // creating the glossary dialog and loading the glossaries we have m_glossarydlg = new GlossaryDialog( true, this, "glossary" ); -- cgit v1.2.1