diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:00:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:00:38 -0600 |
| commit | 4bc3dcd8cbc23e1470e121e25a83d57c22e61b26 (patch) | |
| tree | 7d379893635b06789888944241a976a4f2b440ab /konq-plugins/sidebar/mediaplayer | |
| parent | 08a66075486dc740840cfb817bf0ca301c6f0385 (diff) | |
| download | tdeaddons-4bc3dcd8cbc23e1470e121e25a83d57c22e61b26.tar.gz tdeaddons-4bc3dcd8cbc23e1470e121e25a83d57c22e61b26.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/sidebar/mediaplayer')
| -rw-r--r-- | konq-plugins/sidebar/mediaplayer/Makefile.am | 2 | ||||
| -rw-r--r-- | konq-plugins/sidebar/mediaplayer/engine.cpp | 2 | ||||
| -rw-r--r-- | konq-plugins/sidebar/mediaplayer/mediaplayer.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/konq-plugins/sidebar/mediaplayer/Makefile.am b/konq-plugins/sidebar/mediaplayer/Makefile.am index 12ba913..3a79209 100644 --- a/konq-plugins/sidebar/mediaplayer/Makefile.am +++ b/konq-plugins/sidebar/mediaplayer/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = . pics # set the include path for X, qt and KDE -INCLUDES = -I$(kde_includes)/kio -I$(kde_includes)/arts $(all_includes) +INCLUDES = -I$(kde_includes)/tdeio -I$(kde_includes)/arts $(all_includes) # these are the headers for your project noinst_HEADERS = diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp index e4590b6..92343cc 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.cpp +++ b/konq-plugins/sidebar/mediaplayer/engine.cpp @@ -26,7 +26,7 @@ extern "C" #include <sys/wait.h> } -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp index fc281b4..b615e88 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp @@ -20,7 +20,7 @@ #include "mediaplayer.moc" #include <kdebug.h> #include <ksimpleconfig.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kmessagebox.h> #include <kglobal.h> |