diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:15:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:15:08 -0600 |
| commit | 39177c1528006932b00136d34cf022434df73d72 (patch) | |
| tree | a0791bebede3e7eb454ac2268a14c4e8a157de6d /noatun-plugins | |
| parent | 2a74bca8c834c4d4f391c70de8fdfa12a7cc972c (diff) | |
| download | tdeaddons-39177c1528006932b00136d34cf022434df73d72.tar.gz tdeaddons-39177c1528006932b00136d34cf022434df73d72.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'noatun-plugins')
| -rw-r--r-- | noatun-plugins/lyrics/lyrics.cpp | 2 | ||||
| -rw-r--r-- | noatun-plugins/lyrics/lyrics.h | 2 | ||||
| -rw-r--r-- | noatun-plugins/oblique/cmodule.cpp | 2 | ||||
| -rw-r--r-- | noatun-plugins/synaescope/Makefile.am | 2 | ||||
| -rw-r--r-- | noatun-plugins/tippercanoe/Makefile.am | 2 | ||||
| -rw-r--r-- | noatun-plugins/tyler/Makefile.am | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp index cd6754b..fdd73ee 100644 --- a/noatun-plugins/lyrics/lyrics.cpp +++ b/noatun-plugins/lyrics/lyrics.cpp @@ -2,7 +2,7 @@ #include <klineeditdlg.h> #include <kconfig.h> #include <kmessagebox.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <kstdaction.h> #include <kstatusbar.h> #include <tqregexp.h> diff --git a/noatun-plugins/lyrics/lyrics.h b/noatun-plugins/lyrics/lyrics.h index c41e186..85541ff 100644 --- a/noatun-plugins/lyrics/lyrics.h +++ b/noatun-plugins/lyrics/lyrics.h @@ -6,7 +6,7 @@ #include <noatun/app.h> #include <kmainwindow.h> #include <tqvaluevector.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include <kaction.h> #include "cmodule.h" diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp index f39f258..dd0ebb7 100644 --- a/noatun-plugins/oblique/cmodule.cpp +++ b/noatun-plugins/oblique/cmodule.cpp @@ -6,7 +6,7 @@ #include "file.h" #include <kregexpeditorinterface.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <klocale.h> #include <klistview.h> #include <klineedit.h> diff --git a/noatun-plugins/synaescope/Makefile.am b/noatun-plugins/synaescope/Makefile.am index f79c4cf..d1cb551 100644 --- a/noatun-plugins/synaescope/Makefile.am +++ b/noatun-plugins/synaescope/Makefile.am @@ -11,7 +11,7 @@ noatunsynaescope_la_LIBADD = $(LIB_KFILE) -lnoatun -lm bin_PROGRAMS = noatunsynaescope.bin noatunsynaescope_bin_SOURCES = core.cpp main.cpp sdlwrap.cpp ui.cpp -noatunsynaescope_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +noatunsynaescope_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor noatunsynaescope_bin_LDADD = $(LIB_TDEUI) -lnoatun $(SDL_LIBS) noatun_DATA = synaescope.plugin diff --git a/noatun-plugins/tippercanoe/Makefile.am b/noatun-plugins/tippercanoe/Makefile.am index 5192ae2..18a9e35 100644 --- a/noatun-plugins/tippercanoe/Makefile.am +++ b/noatun-plugins/tippercanoe/Makefile.am @@ -11,7 +11,7 @@ noatuntippecanoe_la_LIBADD = $(LIB_KFILE) -lnoatun -lm bin_PROGRAMS = noatuntippecanoe.bin noatuntippecanoe_bin_SOURCES = core.cpp main.cpp ui.cpp sdlwrap.cpp -noatuntippecanoe_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +noatuntippecanoe_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor noatuntippecanoe_bin_LDADD = $(LIB_TDEUI) -lm $(SDL_LIBS) noatun_DATA = tippecanoe.plugin diff --git a/noatun-plugins/tyler/Makefile.am b/noatun-plugins/tyler/Makefile.am index 4e84a80..bbba726 100644 --- a/noatun-plugins/tyler/Makefile.am +++ b/noatun-plugins/tyler/Makefile.am @@ -11,7 +11,7 @@ noatuntyler_la_LIBADD = $(LIB_KFILE) -lnoatun -lm bin_PROGRAMS = noatuntyler.bin noatuntyler_bin_SOURCES = main.cpp file.cpp compute.c display.c renderer.c -noatuntyler_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +noatuntyler_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor noatuntyler_bin_LDADD = $(LIB_TDECORE) -lm $(SDL_LIBS) noatun_DATA = tyler.plugin tylerstates |