diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:54 -0600 |
| commit | ed99a30644c19b0a3cf0d2147243532df4daa16b (patch) | |
| tree | 7f3f2850e59824fdf100a642367a82b1e7f0204f /interfaces/tdetexteditor | |
| parent | e5f2d46e9caf6942f365f1b454087dda71a340f7 (diff) | |
| download | tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'interfaces/tdetexteditor')
| -rw-r--r-- | interfaces/tdetexteditor/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | interfaces/tdetexteditor/Makefile.am | 2 | ||||
| -rw-r--r-- | interfaces/tdetexteditor/editorchooser.cpp | 2 | ||||
| -rw-r--r-- | interfaces/tdetexteditor/templateinterface.cpp | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/interfaces/tdetexteditor/CMakeLists.txt b/interfaces/tdetexteditor/CMakeLists.txt index 0808a84f3..ca0176ce7 100644 --- a/interfaces/tdetexteditor/CMakeLists.txt +++ b/interfaces/tdetexteditor/CMakeLists.txt @@ -90,7 +90,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 0.0.0 - LINK tdeui-shared kabc-shared tdeparts-shared + LINK tdeui-shared tdeabc-shared tdeparts-shared DEPENDENCIES dcopidl dcopidl2cpp DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am index b535b39cc..4b1590abe 100644 --- a/interfaces/tdetexteditor/Makefile.am +++ b/interfaces/tdetexteditor/Makefile.am @@ -46,7 +46,7 @@ servicetype_DATA = tdetexteditor.desktop tdetexteditoreditor.desktop tdetextedit kcm_tdetexteditor_DATA = kcm_tdetexteditor.desktop kcm_tdetexteditordir = $(kde_datadir)/kcm_componentchooser -templateinterface.lo: $(top_builddir)/kabc/addressee.h +templateinterface.lo: $(top_builddir)/tdeabc/addressee.h include ../../admin/Doxyfile.am diff --git a/interfaces/tdetexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp index aed904c54..1eddfb8d6 100644 --- a/interfaces/tdetexteditor/editorchooser.cpp +++ b/interfaces/tdetexteditor/editorchooser.cpp @@ -6,7 +6,7 @@ #include <tdeconfig.h> #include <tqstringlist.h> #include <kservice.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tdeapplication.h> #include <tqlayout.h> diff --git a/interfaces/tdetexteditor/templateinterface.cpp b/interfaces/tdetexteditor/templateinterface.cpp index ecc34c7e2..01e0c292f 100644 --- a/interfaces/tdetexteditor/templateinterface.cpp +++ b/interfaces/tdetexteditor/templateinterface.cpp @@ -22,11 +22,11 @@ #include <addressee.h> #include <addresseedialog.h> #include <tqstring.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tqdatetime.h> #include <tqregexp.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcalendarsystem.h> #include <unistd.h> |