Multimedia: examples coding style unification
Change-Id: Iffae3a276bb2b01f871aee76dc069ce006d69fce Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
@@ -40,7 +40,7 @@
|
||||
|
||||
#include "videoplayer.h"
|
||||
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QApplication>
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
|
||||
@@ -41,11 +41,11 @@
|
||||
#include "videoplayer.h"
|
||||
|
||||
#include <QtWidgets>
|
||||
#include <qvideosurfaceformat.h>
|
||||
#include <qgraphicsvideoitem.h>
|
||||
#include <QVideoSurfaceFormat>
|
||||
#include <QGraphicsVideoItem>
|
||||
|
||||
VideoPlayer::VideoPlayer(QWidget *parent, Qt::WindowFlags flags)
|
||||
: QWidget(parent, flags)
|
||||
VideoPlayer::VideoPlayer(QWidget *parent)
|
||||
: QWidget(parent)
|
||||
, mediaPlayer(0, QMediaPlayer::VideoSurface)
|
||||
, videoItem(0)
|
||||
, playButton(0)
|
||||
|
||||
@@ -41,10 +41,9 @@
|
||||
#ifndef VIDEOPLAYER_H
|
||||
#define VIDEOPLAYER_H
|
||||
|
||||
#include <qmediaplayer.h>
|
||||
|
||||
#include <QtGui/QMovie>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QMediaPlayer>
|
||||
#include <QMovie>
|
||||
#include <QWidget>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QAbstractButton;
|
||||
@@ -55,8 +54,9 @@ QT_END_NAMESPACE
|
||||
class VideoPlayer : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
VideoPlayer(QWidget *parent = 0, Qt::WindowFlags flags = 0);
|
||||
VideoPlayer(QWidget *parent = 0);
|
||||
~VideoPlayer();
|
||||
|
||||
QSize sizeHint() const { return QSize(800, 600); }
|
||||
|
||||
Reference in New Issue
Block a user