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

8
src/multimedia/camera/qcamera.cpp
View File

@@ -412,17 +412,17 @@ QCamera::~QCamera()
/*!
Returns the availability state of the camera service.
*/
QtMultimedia::AvailabilityStatus QCamera::availability() const
QMultimedia::AvailabilityStatus QCamera::availability() const
{
Q_D(const QCamera);
if (d->control == NULL)
return QtMultimedia::ServiceMissing;
return QMultimedia::ServiceMissing;
if (d->deviceControl && d->deviceControl->deviceCount() == 0)
return QtMultimedia::ResourceError;
return QMultimedia::ResourceError;
if (d->error != QCamera::NoError)
return QtMultimedia::ResourceError;
return QMultimedia::ResourceError;
return QMediaObject::availability();
}