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 /libtdeedu | |
| 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 'libtdeedu')
| -rw-r--r-- | libtdeedu/extdate/Makefile.am | 4 | ||||
| -rw-r--r-- | libtdeedu/tdeeduui/tdeeduglossary.cpp | 4 | ||||
| -rw-r--r-- | libtdeedu/tdeeduui/tdeeduglossary.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libtdeedu/extdate/Makefile.am b/libtdeedu/extdate/Makefile.am index a877a28e..c32d024f 100644 --- a/libtdeedu/extdate/Makefile.am +++ b/libtdeedu/extdate/Makefile.am @@ -11,11 +11,11 @@ libextdate_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) test_extdate_SOURCES = test_extdate.cc test_extdate_LDADD = libextdate.la -test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor test_extdatepicker_SOURCES = testwidget.cpp main.cpp test_extdatepicker_LDADD = libextdate.la -test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/libtdeedu/tdeeduui/tdeeduglossary.cpp b/libtdeedu/tdeeduui/tdeeduglossary.cpp index 6b3c2843..7c935f7c 100644 --- a/libtdeedu/tdeeduui/tdeeduglossary.cpp +++ b/libtdeedu/tdeeduui/tdeeduglossary.cpp @@ -12,8 +12,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 <kglobal.h> #include <klistview.h> #include <klistviewsearchline.h> diff --git a/libtdeedu/tdeeduui/tdeeduglossary.h b/libtdeedu/tdeeduui/tdeeduglossary.h index c77b2135..43b5fd92 100644 --- a/libtdeedu/tdeeduui/tdeeduglossary.h +++ b/libtdeedu/tdeeduui/tdeeduglossary.h @@ -16,7 +16,7 @@ ***************************************************************************/ -#include <khtml_part.h> +#include <tdehtml_part.h> #include <kdialogbase.h> class TQChar; |