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/plugins/v4l | |
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/plugins/v4l')
-rw-r--r-- | src/plugins/v4l/radio/v4lradiocontrol.cpp | 6 | ||||
-rw-r--r-- | src/plugins/v4l/radio/v4lradiocontrol.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/v4l/radio/v4lradiocontrol.cpp b/src/plugins/v4l/radio/v4lradiocontrol.cpp index b55938c72..4dc85bbab 100644 --- a/src/plugins/v4l/radio/v4lradiocontrol.cpp +++ b/src/plugins/v4l/radio/v4lradiocontrol.cpp @@ -88,12 +88,12 @@ bool V4LRadioControl::isAvailable() const return available; } -QtMultimedia::AvailabilityStatus V4LRadioControl::availability() const +QMultimedia::AvailabilityStatus V4LRadioControl::availability() const { if (fd > 0) - return QtMultimedia::Available; + return QMultimedia::Available; else - return QtMultimedia::ResourceError; + return QMultimedia::ResourceError; } QRadioTuner::State V4LRadioControl::state() const diff --git a/src/plugins/v4l/radio/v4lradiocontrol.h b/src/plugins/v4l/radio/v4lradiocontrol.h index b020a651e..f8d79fc3e 100644 --- a/src/plugins/v4l/radio/v4lradiocontrol.h +++ b/src/plugins/v4l/radio/v4lradiocontrol.h @@ -65,7 +65,7 @@ public: ~V4LRadioControl(); bool isAvailable() const; - QtMultimedia::AvailabilityStatus availability() const; + QMultimedia::AvailabilityStatus availability() const; QRadioTuner::State state() const; |