Multimedia: examples coding style unification

Change-Id: Iffae3a276bb2b01f871aee76dc069ce006d69fce
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
hjk
2012-11-20 18:27:28 +01:00
committed by The Qt Project
parent 9f4d6e824c
commit 21c3915205
69 changed files with 394 additions and 466 deletions

View File

@@ -40,7 +40,7 @@
#include "videoplayer.h"
#include <QtWidgets/QApplication>
#include <QApplication>
int main(int argc, char **argv)
{

View File

@@ -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)

View File

@@ -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); }