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

6
src/multimedia/radio/qradiodata.cpp
View File

@@ -228,15 +228,15 @@ bool QRadioData::setMediaObject(QMediaObject *mediaObject)
Returns the availability of the radio data service.
A long as there is a media service which provides radio functionality, then the
\l{QtMultimedia::AvailabilityStatus}{availability} will be that
\l{QMultimedia::AvailabilityStatus}{availability} will be that
of the \l{QRadioTuner::availability()}{radio tuner}.
*/
QtMultimedia::AvailabilityStatus QRadioData::availability() const
QMultimedia::AvailabilityStatus QRadioData::availability() const
{
Q_D(const QRadioData);
if (d->control == 0)
return QtMultimedia::ServiceMissing;
return QMultimedia::ServiceMissing;
return d->mediaObject->availability();
}

2
src/multimedia/radio/qradiodata.h
View File

@@ -89,7 +89,7 @@ public:
QRadioData(QMediaObject *mediaObject, QObject *parent = 0);
~QRadioData();
QtMultimedia::AvailabilityStatus availability() const;
QMultimedia::AvailabilityStatus availability() const;
QMediaObject *mediaObject() const;

6
src/multimedia/radio/qradiotuner.cpp
View File

@@ -159,13 +159,13 @@ QRadioTuner::~QRadioTuner()
/*!
Returns the availability of the radio tuner.
*/
QtMultimedia::AvailabilityStatus QRadioTuner::availability() const
QMultimedia::AvailabilityStatus QRadioTuner::availability() const
{
if (d_func()->control == 0)
return QtMultimedia::ServiceMissing;
return QMultimedia::ServiceMissing;
if (!d_func()->control->isAntennaConnected())
return QtMultimedia::ResourceError;
return QMultimedia::ResourceError;
return QMediaObject::availability();
}

2
src/multimedia/radio/qradiotuner.h
View File

@@ -85,7 +85,7 @@ public:
QRadioTuner(QObject *parent = 0);
~QRadioTuner();
QtMultimedia::AvailabilityStatus availability() const;
QMultimedia::AvailabilityStatus availability() const;
State state() const;