[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/frameworks] plugins/videoshape: fix headers with qt5's phonon
From:       Cyrille Berger <cberger () cberger ! net>
Date:       2015-04-13 7:38:09
Message-ID: E1YhYwb-0008MA-6O () scm ! kde ! org
[Download RAW message or body]

Git commit 17e4dfab3b7b9f13f48dc567015a48cf28ddd469 by Cyrille Berger.
Committed on 13/04/2015 at 07:37.
Pushed by berger into branch 'frameworks'.

fix headers with qt5's phonon

M  +2    -2    plugins/videoshape/FullScreenPlayer.cpp
M  +1    -1    plugins/videoshape/FullScreenPlayer.h
M  +1    -1    plugins/videoshape/SelectVideoWidget.cpp
M  +1    -1    plugins/videoshape/VideoThumbnailer.cpp
M  +2    -2    plugins/videoshape/VideoThumbnailer.h

http://commits.kde.org/calligra/17e4dfab3b7b9f13f48dc567015a48cf28ddd469

diff --git a/plugins/videoshape/FullScreenPlayer.cpp b/plugins/videoshape/F=
ullScreenPlayer.cpp
index 08402b7..02af398 100644
--- a/plugins/videoshape/FullScreenPlayer.cpp
+++ b/plugins/videoshape/FullScreenPlayer.cpp
@@ -27,8 +27,8 @@
 #include <phonon/videowidget.h>
 #include <phonon/audiooutput.h>
 #include <phonon/mediaobject.h>
-#include <Phonon/VolumeSlider>
-#include <Phonon/SeekSlider>
+#include <phonon/VolumeSlider>
+#include <phonon/SeekSlider>
 =

 #include <QUrl>
 #include <QVBoxLayout>
diff --git a/plugins/videoshape/FullScreenPlayer.h b/plugins/videoshape/Ful=
lScreenPlayer.h
index 70957dc..29546a1 100644
--- a/plugins/videoshape/FullScreenPlayer.h
+++ b/plugins/videoshape/FullScreenPlayer.h
@@ -21,7 +21,7 @@
 #define FULLSCREENPLAYER_H
 =

 #include <QWidget>
-#include <Phonon/Global>
+#include <phonon/Global>
 =

 namespace Phonon
 {
diff --git a/plugins/videoshape/SelectVideoWidget.cpp b/plugins/videoshape/=
SelectVideoWidget.cpp
index 40328f7..bee2407 100644
--- a/plugins/videoshape/SelectVideoWidget.cpp
+++ b/plugins/videoshape/SelectVideoWidget.cpp
@@ -24,7 +24,7 @@
 #include <kurl.h>
 =

 #include <kfilewidget.h>
-#include <Phonon/BackendCapabilities>
+#include <phonon/BackendCapabilities>
 =

 #include <QVBoxLayout>
 #include <QCheckBox>
diff --git a/plugins/videoshape/VideoThumbnailer.cpp b/plugins/videoshape/V=
ideoThumbnailer.cpp
index ddb5fb7..d30a9bf 100644
--- a/plugins/videoshape/VideoThumbnailer.cpp
+++ b/plugins/videoshape/VideoThumbnailer.cpp
@@ -22,7 +22,7 @@
 =

 #include "VideoData.h"
 =

-#include <Phonon/Experimental/VideoFrame2>
+#include <phonon/experimental/videoframe2.h>
 #include <QTime>
 #include <QVBoxLayout>
 #include <QVarLengthArray>
diff --git a/plugins/videoshape/VideoThumbnailer.h b/plugins/videoshape/Vid=
eoThumbnailer.h
index 615594d..5578450 100644
--- a/plugins/videoshape/VideoThumbnailer.h
+++ b/plugins/videoshape/VideoThumbnailer.h
@@ -20,8 +20,8 @@
 #ifndef VIDEOTHUMBNAILER_H
 #define VIDEOTHUMBNAILER_H
 =

-#include <Phonon/MediaObject>
-#include <Phonon/Global>
+#include <phonon/MediaObject>
+#include <phonon/Global>
 #include <phonon/experimental/videodataoutput2.h>
 =

 #include <QObject>
[prev in list] [next in list] [prev in thread] [next in thread]