diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:43 -0600 |
| commit | cb68a7857c80661d242ee5527ec6f99dc3f79fa7 (patch) | |
| tree | a3b54203ca6bce0e8e1dc5107dc9653db246a281 /kaboodle | |
| parent | 7534907d3759a8c520eeb9a701b316d891c63bdf (diff) | |
| download | tdemultimedia-cb68a7857c80661d242ee5527ec6f99dc3f79fa7.tar.gz tdemultimedia-cb68a7857c80661d242ee5527ec6f99dc3f79fa7.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kaboodle')
| -rw-r--r-- | kaboodle/Makefile.am | 10 | ||||
| -rw-r--r-- | kaboodle/engine.h | 2 | ||||
| -rw-r--r-- | kaboodle/kaboodle_factory.h | 2 | ||||
| -rw-r--r-- | kaboodle/player.h | 4 | ||||
| -rw-r--r-- | kaboodle/userinterface.h | 2 | ||||
| -rw-r--r-- | kaboodle/view.h | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/kaboodle/Makefile.am b/kaboodle/Makefile.am index 0c1a0cee..1f39c8f4 100644 --- a/kaboodle/Makefile.am +++ b/kaboodle/Makefile.am @@ -12,11 +12,11 @@ libkaboodle_noinst_la_SOURCES = conf.cpp \ view.cpp \ kaboodle_factory.cpp -libs = $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -lkmediaplayer +libs = $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -ltdemediaplayer libkaboodlepart_la_SOURCES = dummy.cpp -libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -libkaboodlepart_la_LIBADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl +libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl +libkaboodlepart_la_LIBADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl kaboodle_SOURCES = main.cpp \ kaboodleapp.cpp \ @@ -27,8 +27,8 @@ dummy.cpp: CLEANFILES = dummy.cpp -kaboodle_LDADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl +kaboodle_LDADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl +kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl bin_PROGRAMS = kaboodle diff --git a/kaboodle/engine.h b/kaboodle/engine.h index b4d1b24b..974a8541 100644 --- a/kaboodle/engine.h +++ b/kaboodle/engine.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqobject.h> #include <kmedia2.h> -#include <kmediaplayer/player.h> +#include <tdemediaplayer/player.h> #include <kurl.h> namespace Arts diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h index 7a85afb8..ca00c084 100644 --- a/kaboodle/kaboodle_factory.h +++ b/kaboodle/kaboodle_factory.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kaboutdata.h> #include <kinstance.h> -#include <kparts/factory.h> +#include <tdeparts/factory.h> namespace Kaboodle { diff --git a/kaboodle/player.h b/kaboodle/player.h index 67bc2e65..f269dbbf 100644 --- a/kaboodle/player.h +++ b/kaboodle/player.h @@ -25,8 +25,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define PLAYER_H #include <kmedia2.h> -#include <kmediaplayer/player.h> -#include <kparts/browserextension.h> +#include <tdemediaplayer/player.h> +#include <tdeparts/browserextension.h> #include <kurl.h> #include <tqobject.h> #include <tqtimer.h> diff --git a/kaboodle/userinterface.h b/kaboodle/userinterface.h index 90a18ad0..f786ad81 100644 --- a/kaboodle/userinterface.h +++ b/kaboodle/userinterface.h @@ -27,7 +27,7 @@ #include "kaboodleapp.h" #include <kaction.h> -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> #include <kurl.h> #include "player.h" diff --git a/kaboodle/view.h b/kaboodle/view.h index 59c26358..9b4e8fba 100644 --- a/kaboodle/view.h +++ b/kaboodle/view.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef KABOODLEVIEW_H #define KABOODLEVIEW_H -#include <kmediaplayer/player.h> -#include <kmediaplayer/view.h> +#include <tdemediaplayer/player.h> +#include <tdemediaplayer/view.h> #include <kurl.h> #include <tqevent.h> #include <tqhbox.h> |