diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:54:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:54:06 -0600 |
| commit | 71049a71c6648791e95cf421b19047415a2c4c84 (patch) | |
| tree | 4f75fdaee1cce5a44f58f1f54980099f50a82b10 /konq-plugins/sidebar/mediaplayer | |
| parent | 6fe537d6dff11f4c638c51ed1f652765b63f8591 (diff) | |
| download | tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.tar.gz tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/sidebar/mediaplayer')
| -rw-r--r-- | konq-plugins/sidebar/mediaplayer/engine.cpp | 4 | ||||
| -rw-r--r-- | konq-plugins/sidebar/mediaplayer/mediaplayer.cpp | 6 | ||||
| -rw-r--r-- | konq-plugins/sidebar/mediaplayer/mediawidget.cpp | 2 | ||||
| -rw-r--r-- | konq-plugins/sidebar/mediaplayer/player.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp index 92343cc..d8d1fdd 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.cpp +++ b/konq-plugins/sidebar/mediaplayer/engine.cpp @@ -28,8 +28,8 @@ extern "C" #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <kstandarddirs.h> #include <kurl.h> diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp index b615e88..00e499c 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp @@ -16,14 +16,14 @@ ***************************************************************************/ #include "mediaplayer.h" -#include <klocale.h> +#include <tdelocale.h> #include "mediaplayer.moc" #include <kdebug.h> #include <ksimpleconfig.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <kmessagebox.h> -#include <kglobal.h> +#include <tdemessagebox.h> +#include <tdeglobal.h> #include <kdemacros.h> #include "mediawidget.h" diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp index 5130cbb..ad20c07 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <kurl.h> #include <kurldrag.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqwidget.h> diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp index 38ac506..26904cf 100644 --- a/konq-plugins/sidebar/mediaplayer/player.cpp +++ b/konq-plugins/sidebar/mediaplayer/player.cpp @@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdemediaplayer/player.h> |