slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename namespace QtMultimedia -> QMultimedia

Browse Source 
Main code, examples, tests and docs updated. Method:
1. Mass find+replace "QtMultimedia::" -> "QMultimedia::"
2. Hand-modified declaration in qtmedianamespace.h/cpp

For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed.

Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)

Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Sze Howe Koh
2012-11-01 00:33:21 +08:00
committed by The Qt Project
parent 13fd00199a
commit 832c3929f2
78 changed files with 381 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/multimedia/recording/qmediaencodersettings.cpp
View File

@@ -62,11 +62,11 @@ class QAudioEncoderSettingsPrivate : public QSharedData
public:
QAudioEncoderSettingsPrivate() :
isNull(true),
encodingMode(QtMultimedia::ConstantQualityEncoding),
encodingMode(QMultimedia::ConstantQualityEncoding),
bitrate(-1),
sampleRate(-1),
channels(-1),
quality(QtMultimedia::NormalQuality)
quality(QMultimedia::NormalQuality)
{
}
@@ -84,12 +84,12 @@ public:
}
bool isNull;
QtMultimedia::EncodingMode encodingMode;
QMultimedia::EncodingMode encodingMode;
QString codec;
int bitrate;
int sampleRate;
int channels;
QtMultimedia::EncodingQuality quality;
QMultimedia::EncodingQuality quality;
QVariantMap encodingOptions;
private:
@@ -199,9 +199,9 @@ bool QAudioEncoderSettings::isNull() const
/*!
Returns the audio encoding mode.
\sa QtMultimedia::EncodingMode
\sa QMultimedia::EncodingMode
*/
QtMultimedia::EncodingMode QAudioEncoderSettings::encodingMode() const
QMultimedia::EncodingMode QAudioEncoderSettings::encodingMode() const
{
return d->encodingMode;
}
@@ -209,16 +209,16 @@ QtMultimedia::EncodingMode QAudioEncoderSettings::encodingMode() const
/*!
Sets the audio encoding \a mode setting.
If QtMultimedia::ConstantQualityEncoding is set, the quality
If QMultimedia::ConstantQualityEncoding is set, the quality
encoding parameter is used and bit rate is ignored,
otherwise the bitrate is used.
The audio codec, channels count and sample rate settings are used in all
the encoding modes.
\sa encodingMode(), QtMultimedia::EncodingMode
\sa encodingMode(), QMultimedia::EncodingMode
*/
void QAudioEncoderSettings::setEncodingMode(QtMultimedia::EncodingMode mode)
void QAudioEncoderSettings::setEncodingMode(QMultimedia::EncodingMode mode)
{
d->encodingMode = mode;
}
@@ -301,7 +301,7 @@ void QAudioEncoderSettings::setSampleRate(int rate)
Returns the audio encoding quality.
*/
QtMultimedia::EncodingQuality QAudioEncoderSettings::quality() const
QMultimedia::EncodingQuality QAudioEncoderSettings::quality() const
{
return d->quality;
}
@@ -313,9 +313,9 @@ QtMultimedia::EncodingQuality QAudioEncoderSettings::quality() const
set of encoding parameters to achieve the desired quality level.
The \a quality settings parameter is only used in the
\l {QtMultimedia::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
\l {QMultimedia::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
*/
void QAudioEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality)
void QAudioEncoderSettings::setQuality(QMultimedia::EncodingQuality quality)
{
d->isNull = false;
d->quality = quality;
@@ -377,10 +377,10 @@ class QVideoEncoderSettingsPrivate : public QSharedData
public:
QVideoEncoderSettingsPrivate() :
isNull(true),
encodingMode(QtMultimedia::ConstantQualityEncoding),
encodingMode(QMultimedia::ConstantQualityEncoding),
bitrate(-1),
frameRate(0),
quality(QtMultimedia::NormalQuality)
quality(QMultimedia::NormalQuality)
{
}
@@ -398,12 +398,12 @@ public:
}
bool isNull;
QtMultimedia::EncodingMode encodingMode;
QMultimedia::EncodingMode encodingMode;
QString codec;
int bitrate;
QSize resolution;
qreal frameRate;
QtMultimedia::EncodingQuality quality;
QMultimedia::EncodingQuality quality;
QVariantMap encodingOptions;
private:
@@ -508,9 +508,9 @@ bool QVideoEncoderSettings::isNull() const
/*!
Returns the video encoding mode.
\sa QtMultimedia::EncodingMode
\sa QMultimedia::EncodingMode
*/
QtMultimedia::EncodingMode QVideoEncoderSettings::encodingMode() const
QMultimedia::EncodingMode QVideoEncoderSettings::encodingMode() const
{
return d->encodingMode;
}
@@ -518,15 +518,15 @@ QtMultimedia::EncodingMode QVideoEncoderSettings::encodingMode() const
/*!
Sets the video encoding \a mode.
If QtMultimedia::ConstantQualityEncoding is set,
If QMultimedia::ConstantQualityEncoding is set,
the quality encoding parameter is used and bit rate is ignored,
otherwise the bitrate is used.
The rest of encoding settings are respected regardless of encoding mode.
\sa QtMultimedia::EncodingMode
\sa QMultimedia::EncodingMode
*/
void QVideoEncoderSettings::setEncodingMode(QtMultimedia::EncodingMode mode)
void QVideoEncoderSettings::setEncodingMode(QMultimedia::EncodingMode mode)
{
d->isNull = false;
d->encodingMode = mode;
@@ -629,7 +629,7 @@ void QVideoEncoderSettings::setResolution(int width, int height)
Returns the video encoding quality.
*/
QtMultimedia::EncodingQuality QVideoEncoderSettings::quality() const
QMultimedia::EncodingQuality QVideoEncoderSettings::quality() const
{
return d->quality;
}
@@ -641,13 +641,13 @@ QtMultimedia::EncodingQuality QVideoEncoderSettings::quality() const
set of encoding parameters to achieve the desired quality level.
The \a quality settings parameter is only used in the
\l {QtMultimedia::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
\l {QMultimedia::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
The \a quality settings parameter is only used in the \l
{QtMultimedia::ConstantQualityEncoding}{constant quality}
{QMultimedia::ConstantQualityEncoding}{constant quality}
\l{encodingMode()}{encoding mode}.
*/
void QVideoEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality)
void QVideoEncoderSettings::setQuality(QMultimedia::EncodingQuality quality)
{
d->isNull = false;
d->quality = quality;
@@ -710,7 +710,7 @@ class QImageEncoderSettingsPrivate : public QSharedData
public:
QImageEncoderSettingsPrivate() :
isNull(true),
quality(QtMultimedia::NormalQuality)
quality(QMultimedia::NormalQuality)
{
}
@@ -727,7 +727,7 @@ public:
bool isNull;
QString codec;
QSize resolution;
QtMultimedia::EncodingQuality quality;
QMultimedia::EncodingQuality quality;
QVariantMap encodingOptions;
private:
@@ -887,7 +887,7 @@ void QImageEncoderSettings::setResolution(int width, int height)
Returns the image encoding quality.
*/
QtMultimedia::EncodingQuality QImageEncoderSettings::quality() const
QMultimedia::EncodingQuality QImageEncoderSettings::quality() const
{
return d->quality;
}
@@ -896,7 +896,7 @@ QtMultimedia::EncodingQuality QImageEncoderSettings::quality() const
Sets the image encoding \a quality.
*/
void QImageEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality)
void QImageEncoderSettings::setQuality(QMultimedia::EncodingQuality quality)
{
d->isNull = false;
d->quality = quality;

20
src/multimedia/recording/qmediaencodersettings.h
View File

@@ -70,8 +70,8 @@ public:
bool isNull() const;
QtMultimedia::EncodingMode encodingMode() const;
void setEncodingMode(QtMultimedia::EncodingMode);
QMultimedia::EncodingMode encodingMode() const;
void setEncodingMode(QMultimedia::EncodingMode);
QString codec() const;
void setCodec(const QString& codec);
@@ -85,8 +85,8 @@ public:
int sampleRate() const;
void setSampleRate(int rate);
QtMultimedia::EncodingQuality quality() const;
void setQuality(QtMultimedia::EncodingQuality quality);
QMultimedia::EncodingQuality quality() const;
void setQuality(QMultimedia::EncodingQuality quality);
QVariant encodingOption(const QString &option) const;
QVariantMap encodingOptions() const;
@@ -112,8 +112,8 @@ public:
bool isNull() const;
QtMultimedia::EncodingMode encodingMode() const;
void setEncodingMode(QtMultimedia::EncodingMode);
QMultimedia::EncodingMode encodingMode() const;
void setEncodingMode(QMultimedia::EncodingMode);
QString codec() const;
void setCodec(const QString &);
@@ -128,8 +128,8 @@ public:
int bitRate() const;
void setBitRate(int bitrate);
QtMultimedia::EncodingQuality quality() const;
void setQuality(QtMultimedia::EncodingQuality quality);
QMultimedia::EncodingQuality quality() const;
void setQuality(QMultimedia::EncodingQuality quality);
QVariant encodingOption(const QString &option) const;
QVariantMap encodingOptions() const;
@@ -162,8 +162,8 @@ public:
void setResolution(const QSize &);
void setResolution(int width, int height);
QtMultimedia::EncodingQuality quality() const;
void setQuality(QtMultimedia::EncodingQuality quality);
QMultimedia::EncodingQuality quality() const;
void setQuality(QMultimedia::EncodingQuality quality);
QVariant encodingOption(const QString &option) const;
QVariantMap encodingOptions() const;

20
src/multimedia/recording/qmediarecorder.cpp
View File

@@ -185,7 +185,7 @@ void QMediaRecorderPrivate::_q_applySettings()
}
}
void QMediaRecorderPrivate::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability)
void QMediaRecorderPrivate::_q_availabilityChanged(QMultimedia::AvailabilityStatus availability)
{
Q_Q(QMediaRecorder);
Q_UNUSED(error)
@@ -327,8 +327,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
service->releaseControl(d->metaDataControl);
}
if (d->availabilityControl) {
disconnect(d->availabilityControl, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)),
this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus)));
disconnect(d->availabilityControl, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)),
this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus)));
service->releaseControl(d->availabilityControl);
}
}
@@ -379,8 +379,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
d->availabilityControl = service->requestControl<QMediaAvailabilityControl*>();
if (d->availabilityControl) {
connect(d->availabilityControl, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)),
this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus)));
connect(d->availabilityControl, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)),
this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus)));
}
connect(d->control, SIGNAL(stateChanged(QMediaRecorder::State)),
@@ -449,7 +449,7 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
*/
bool QMediaRecorder::isAvailable() const
{
return availability() == QtMultimedia::Available;
return availability() == QMultimedia::Available;
}
/*!
@@ -457,15 +457,15 @@ bool QMediaRecorder::isAvailable() const
\sa availabilityChanged()
*/
QtMultimedia::AvailabilityStatus QMediaRecorder::availability() const
QMultimedia::AvailabilityStatus QMediaRecorder::availability() const
{
if (d_func()->control == NULL)
return QtMultimedia::ServiceMissing;
return QMultimedia::ServiceMissing;
if (d_func()->availabilityControl)
return d_func()->availabilityControl->availability();
return QtMultimedia::Available;
return QMultimedia::Available;
}
QUrl QMediaRecorder::outputLocation() const
@@ -987,7 +987,7 @@ void QMediaRecorder::stop()
*/
/*!
\fn QMediaRecorder::availabilityChanged(QtMultimedia::AvailabilityStatus availability)
\fn QMediaRecorder::availabilityChanged(QMultimedia::AvailabilityStatus availability)
Signals that the service availability has changed to \a availability.
*/

6
src/multimedia/recording/qmediarecorder.h
View File

@@ -116,7 +116,7 @@ public:
QMediaObject *mediaObject() const;
bool isAvailable() const;
QtMultimedia::AvailabilityStatus availability() const;
QMultimedia::AvailabilityStatus availability() const;
QUrl outputLocation() const;
bool setOutputLocation(const QUrl &location);
@@ -194,7 +194,7 @@ Q_SIGNALS:
void metaDataChanged(const QString &key, const QVariant &value);
void availabilityChanged(bool available);
void availabilityChanged(QtMultimedia::AvailabilityStatus availability);
void availabilityChanged(QMultimedia::AvailabilityStatus availability);
protected:
QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = 0);
@@ -211,7 +211,7 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_updateActualLocation(const QUrl &))
Q_PRIVATE_SLOT(d_func(), void _q_updateNotifyInterval(int))
Q_PRIVATE_SLOT(d_func(), void _q_applySettings())
Q_PRIVATE_SLOT(d_func(), void _q_availabilityChanged(QtMultimedia::AvailabilityStatus))
Q_PRIVATE_SLOT(d_func(), void _q_availabilityChanged(QMultimedia::AvailabilityStatus))
};
QT_END_NAMESPACE

2
src/multimedia/recording/qmediarecorder_p.h
View File

@@ -92,7 +92,7 @@ public:
void _q_notify();
void _q_updateNotifyInterval(int ms);
void _q_applySettings();
void _q_availabilityChanged(QtMultimedia::AvailabilityStatus availability);
void _q_availabilityChanged(QMultimedia::AvailabilityStatus availability);
QMediaRecorder *q_ptr;
};