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>
This commit is contained in:
committed by
The Qt Project
parent
13fd00199a
commit
832c3929f2
@@ -50,18 +50,18 @@ class MockAvailabilityControl : public QMediaAvailabilityControl
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
MockAvailabilityControl(QtMultimedia::AvailabilityStatus available)
|
||||
MockAvailabilityControl(QMultimedia::AvailabilityStatus available)
|
||||
: m_availability(available)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
QtMultimedia::AvailabilityStatus availability() const
|
||||
QMultimedia::AvailabilityStatus availability() const
|
||||
{
|
||||
return m_availability;
|
||||
}
|
||||
|
||||
void setAvailability(QtMultimedia::AvailabilityStatus availability)
|
||||
void setAvailability(QMultimedia::AvailabilityStatus availability)
|
||||
{
|
||||
if (m_availability != availability) {
|
||||
m_availability = availability;
|
||||
@@ -69,7 +69,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
QtMultimedia::AvailabilityStatus m_availability;
|
||||
QMultimedia::AvailabilityStatus m_availability;
|
||||
};
|
||||
|
||||
#endif // MOCKAVAILABILITYCONTROL_H
|
||||
|
||||
Reference in New Issue
Block a user