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
@@ -137,10 +137,10 @@ public:
|
||||
};
|
||||
|
||||
enum Availability {
|
||||
Available = QtMultimedia::Available,
|
||||
Busy = QtMultimedia::Busy,
|
||||
Unavailable = QtMultimedia::ServiceMissing,
|
||||
ResourceMissing = QtMultimedia::ResourceError
|
||||
Available = QMultimedia::Available,
|
||||
Busy = QMultimedia::Busy,
|
||||
Unavailable = QMultimedia::ServiceMissing,
|
||||
ResourceMissing = QMultimedia::ResourceError
|
||||
};
|
||||
|
||||
QDeclarativeRadioData(QObject *parent = 0);
|
||||
@@ -176,7 +176,7 @@ Q_SIGNALS:
|
||||
private Q_SLOTS:
|
||||
void _q_programTypeChanged(QRadioData::ProgramType programType);
|
||||
void _q_error(QRadioData::Error errorCode);
|
||||
void _q_availabilityChanged(QtMultimedia::AvailabilityStatus);
|
||||
void _q_availabilityChanged(QMultimedia::AvailabilityStatus);
|
||||
|
||||
private:
|
||||
void connectSignals();
|
||||
|
||||
Reference in New Issue
Block a user