summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2018-03-11 10:50:38 +0100
committerAndré Hartmann <aha_1980@gmx.de>2018-04-26 16:45:47 +0000
commitea079680154f337e181eed3c3deb993c5c6b7c6b (patch)
treeb98fdf6a1708c29da3e79d4432b0541a25a3681f
parentc47553562264ea4d157772a8ff38a8832b93407a (diff)
downloadqtmultimedia-ea079680154f337e181eed3c3deb993c5c6b7c6b.tar.gz
QSound(Effect): Cleanup coding style
Change-Id: Ie8589bb55388c1f41b1706b6571e2eec401fc415 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
-rw-r--r--src/multimedia/audio/qsound.cpp4
-rw-r--r--src/multimedia/audio/qsound.h2
-rw-r--r--src/multimedia/audio/qsoundeffect_qaudio_p.cpp8
-rw-r--r--src/multimedia/audio/qsoundeffect_qaudio_p.h8
4 files changed, 11 insertions, 11 deletions
diff --git a/src/multimedia/audio/qsound.cpp b/src/multimedia/audio/qsound.cpp
index 7ad30608d..cbd336457 100644
--- a/src/multimedia/audio/qsound.cpp
+++ b/src/multimedia/audio/qsound.cpp
@@ -95,7 +95,7 @@
\sa stop(), loopsRemaining(), isFinished()
*/
-void QSound::play(const QString& filename)
+void QSound::play(const QString &filename)
{
// Object destruction is generally handled via deleteOnComplete
// Unexpected cases will be handled via parenting of QSound objects to qApp
@@ -113,7 +113,7 @@ void QSound::play(const QString& filename)
\sa play()
*/
-QSound::QSound(const QString& filename, QObject* parent)
+QSound::QSound(const QString &filename, QObject *parent)
: QObject(parent)
{
m_soundEffect = new QSoundEffect(this);
diff --git a/src/multimedia/audio/qsound.h b/src/multimedia/audio/qsound.h
index 57a254050..972847c37 100644
--- a/src/multimedia/audio/qsound.h
+++ b/src/multimedia/audio/qsound.h
@@ -56,7 +56,7 @@ public:
Infinite = -1
};
- static void play(const QString& filename);
+ static void play(const QString &filename);
explicit QSound(const QString &filename, QObject *parent = nullptr);
~QSound();
diff --git a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp
index 73f1d5cfd..388f84d91 100644
--- a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp
+++ b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
Q_GLOBAL_STATIC(QSampleCache, sampleCache)
-QSoundEffectPrivate::QSoundEffectPrivate(QObject* parent):
+QSoundEffectPrivate::QSoundEffectPrivate(QObject *parent):
QObject(parent),
d(new PrivateSoundSource(this))
{
@@ -302,7 +302,7 @@ void QSoundEffectPrivate::setCategory(const QString &category)
}
}
-PrivateSoundSource::PrivateSoundSource(QSoundEffectPrivate* s):
+PrivateSoundSource::PrivateSoundSource(QSoundEffectPrivate *s):
QIODevice(s)
{
soundeffect = s;
@@ -354,7 +354,7 @@ void PrivateSoundSource::stateChanged(QAudio::State state)
emit soundeffect->stop();
}
-qint64 PrivateSoundSource::readData( char* data, qint64 len)
+qint64 PrivateSoundSource::readData(char *data, qint64 len)
{
if ((m_runningCount > 0 || m_runningCount == QSoundEffect::Infinite) && m_playing) {
@@ -428,7 +428,7 @@ qint64 PrivateSoundSource::readData( char* data, qint64 len)
return 0;
}
-qint64 PrivateSoundSource::writeData(const char* data, qint64 len)
+qint64 PrivateSoundSource::writeData(const char *data, qint64 len)
{
Q_UNUSED(data)
Q_UNUSED(len)
diff --git a/src/multimedia/audio/qsoundeffect_qaudio_p.h b/src/multimedia/audio/qsoundeffect_qaudio_p.h
index db48e7ca6..c02a85969 100644
--- a/src/multimedia/audio/qsoundeffect_qaudio_p.h
+++ b/src/multimedia/audio/qsoundeffect_qaudio_p.h
@@ -66,11 +66,11 @@ class PrivateSoundSource : public QIODevice
friend class QSoundEffectPrivate;
Q_OBJECT
public:
- PrivateSoundSource(QSoundEffectPrivate* s);
+ PrivateSoundSource(QSoundEffectPrivate *s);
~PrivateSoundSource() {}
- qint64 readData( char* data, qint64 len) override;
- qint64 writeData(const char* data, qint64 len) override;
+ qint64 readData(char *data, qint64 len) override;
+ qint64 writeData(const char *data, qint64 len) override;
private Q_SLOTS:
void sampleReady();
@@ -101,7 +101,7 @@ class QSoundEffectPrivate : public QObject
Q_OBJECT
public:
- explicit QSoundEffectPrivate(QObject* parent);
+ explicit QSoundEffectPrivate(QObject *parent);
~QSoundEffectPrivate();
static QStringList supportedMimeTypes();