diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2012-11-01 00:33:21 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-06 18:20:06 +0100 |
| commit | 832c3929f2222e0e10ada33549c9d1cf90373018 (patch) | |
| tree | 81160e77da3704c2403d03ad0cc60f06ace98ac8 /src/multimedia/qmediaobject.h | |
| parent | 13fd00199a6a41af2bdbb876fe33c75547e3d996 (diff) | |
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>
Diffstat (limited to 'src/multimedia/qmediaobject.h')
| -rw-r--r-- | src/multimedia/qmediaobject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/qmediaobject.h b/src/multimedia/qmediaobject.h index abfcff9dd..258b430ba 100644 --- a/src/multimedia/qmediaobject.h +++ b/src/multimedia/qmediaobject.h @@ -65,7 +65,7 @@ public: ~QMediaObject(); virtual bool isAvailable() const; - virtual QtMultimedia::AvailabilityStatus availability() const; + virtual QMultimedia::AvailabilityStatus availability() const; virtual QMediaService* service() const; @@ -88,7 +88,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: QMediaObject(QObject *parent, QMediaService *service); |