Rename namespace QtMultimedia -> QMultimedia
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:
committed by
The Qt Project
parent
13fd00199a
commit
832c3929f2
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user