diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:07 -0600 |
| commit | fb758f679005d3eb923888302ade9b6e4dda15bb (patch) | |
| tree | 60658c27bd33523266b992b1e50774ca76b965a1 /kalzium | |
| parent | 9f2c757e1a1694373c11427a00502c2ff4c2d403 (diff) | |
| download | tdeedu-fb758f679005d3eb923888302ade9b6e4dda15bb.tar.gz tdeedu-fb758f679005d3eb923888302ade9b6e4dda15bb.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kalzium')
| -rw-r--r-- | kalzium/src/Makefile.am | 2 | ||||
| -rw-r--r-- | kalzium/src/detailinfodlg.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kalzium/src/Makefile.am b/kalzium/src/Makefile.am index 1ccdcbe5..7bd41796 100644 --- a/kalzium/src/Makefile.am +++ b/kalzium/src/Makefile.am @@ -79,7 +79,7 @@ rcui_DATA = kalziumui.rc KDE_ICON = AUTO # the library search path. -kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor #this RegExp-monster grep for <name origin=foo">bar</name> and puts the i18n() around foo and bar messages-old: rc.cpp diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp index c9791771..6dd03422 100644 --- a/kalzium/src/detailinfodlg.cpp +++ b/kalzium/src/detailinfodlg.cpp @@ -21,8 +21,8 @@ #include <kdebug.h> #include <klocale.h> #include <kiconloader.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <kstandarddirs.h> #include <kactioncollection.h> #include <kcombobox.h> |