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/controls | |
| parent | 13fd00199a6a41af2bdbb876fe33c75547e3d996 (diff) | |
| download | qtmultimedia-832c3929f2222e0e10ada33549c9d1cf90373018.tar.gz | |
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/controls')
| -rw-r--r-- | src/multimedia/controls/qmediaavailabilitycontrol.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/controls/qmediaavailabilitycontrol.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.cpp b/src/multimedia/controls/qmediaavailabilitycontrol.cpp index 92139ac36..0f522e978 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.cpp +++ b/src/multimedia/controls/qmediaavailabilitycontrol.cpp @@ -90,7 +90,7 @@ QMediaAvailabilityControl::~QMediaAvailabilityControl() /*! - \fn QtMultimedia::AvailabilityStatus QMediaAvailabilityControl::availability() const + \fn QMultimedia::AvailabilityStatus QMediaAvailabilityControl::availability() const Returns the current availability of this instance of the media service. If the availability changes at run time (for example, some other media @@ -100,7 +100,7 @@ QMediaAvailabilityControl::~QMediaAvailabilityControl() /*! - \fn void QMediaAvailabilityControl::availabilityChanged(QtMultimedia::AvailabilityStatus availability) + \fn void QMediaAvailabilityControl::availabilityChanged(QMultimedia::AvailabilityStatus availability) Signal emitted when the current \a availability value changed. */ diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.h b/src/multimedia/controls/qmediaavailabilitycontrol.h index 2cdc06196..ee1b642f0 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.h +++ b/src/multimedia/controls/qmediaavailabilitycontrol.h @@ -60,10 +60,10 @@ class Q_MULTIMEDIA_EXPORT QMediaAvailabilityControl : public QMediaControl public: ~QMediaAvailabilityControl(); - virtual QtMultimedia::AvailabilityStatus availability() const = 0; + virtual QMultimedia::AvailabilityStatus availability() const = 0; Q_SIGNALS: - void availabilityChanged(QtMultimedia::AvailabilityStatus availability); + void availabilityChanged(QMultimedia::AvailabilityStatus availability); protected: QMediaAvailabilityControl(QObject* parent = 0); |