summaryrefslogtreecommitdiffstats
path: root/examples/player/playercontrols.h
diff options
context:
space:
mode:
authorhjk <qthjk@ovi.com>2012-11-20 18:27:28 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-21 14:01:44 +0100
commit21c39152055131d87614f051ca08566bd51f268f (patch)
tree95854dfdd5fee984742c18507eb6efca3d2761dc /examples/player/playercontrols.h
parent9f4d6e824c1b75642150f448f8a359dbc95fb955 (diff)
Multimedia: examples coding style unification
Change-Id: Iffae3a276bb2b01f871aee76dc069ce006d69fce Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'examples/player/playercontrols.h')
-rw-r--r--examples/player/playercontrols.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/examples/player/playercontrols.h b/examples/player/playercontrols.h
index 23ba8e1e6..35ae30252 100644
--- a/examples/player/playercontrols.h
+++ b/examples/player/playercontrols.h
@@ -41,9 +41,8 @@
#ifndef PLAYERCONTROLS_H
#define PLAYERCONTROLS_H
-#include <qmediaplayer.h>
-
-#include <QtWidgets/qwidget.h>
+#include <QMediaPlayer>
+#include <QWidget>
QT_BEGIN_NAMESPACE
class QAbstractButton;
@@ -51,16 +50,14 @@ class QAbstractSlider;
class QComboBox;
QT_END_NAMESPACE
-QT_USE_NAMESPACE
-
class PlayerControls : public QWidget
{
Q_OBJECT
+
public:
PlayerControls(QWidget *parent = 0);
QMediaPlayer::State state() const;
-
int volume() const;
bool isMuted() const;
qreal playbackRate() const;
@@ -98,4 +95,4 @@ private:
QComboBox *rateBox;
};
-#endif
+#endif // PLAYERCONTROLS_H