From cd6fed070da9d86ad2957d3c9d86b55e1ecdfb65 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Wed, 14 Mar 2012 20:03:42 +0100 Subject: Port ObjectDescriptionModel meta-objects to revision 7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There appear to be no autotests for the description model classes, but this is a best effort to port them to the new revision. Change-Id: I90a789aa1a3a9d8866550b72784451e9f93d509d Reviewed-by: João Abecasis --- .../phonon/phonon/objectdescriptionmodel.cpp | 93 ++++++++++++++++------ 1 file changed, 70 insertions(+), 23 deletions(-) diff --git a/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp b/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp index 613a6bc..184296d 100644 --- a/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp +++ b/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp @@ -40,75 +40,122 @@ QT_BEGIN_NAMESPACE static const uint qt_meta_data_Phonon__ObjectDescriptionModel[] = { // content: - 1, // revision + 7, // revision 0, // classname 0, 0, // classinfo 0, 0, // methods 0, 0, // properties 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount 0 // eod }; -static const char qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioOutputDeviceType[] = { "Phonon::AudioOutputDevice\0" }; -static const char qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioCaptureDeviceType[] = { "Phonon::AudioCaptureDevice\0" }; -static const char qt_meta_stringdata_Phonon__ObjectDescriptionModel_EffectType[] = { "Phonon::EffectDescription\0" }; -static const char qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioChannelType[] = { "Phonon::AudioChannelDescription\0" }; -static const char qt_meta_stringdata_Phonon__ObjectDescriptionModel_SubtitleType[] = { "Phonon::SubtitleDescription\0" }; +struct qt_meta_stringdata_Phonon__ObjectDescriptionModel_t { + QByteArrayData data[1]; + char stringdata[33]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) { \ + Q_REFCOUNT_INITIALIZE_STATIC, len, 0, 0, \ + offsetof(qt_meta_stringdata_Phonon__ObjectDescriptionModel_t, stringdata) + ofs \ + - idx * sizeof(QByteArrayData) \ + } +static const qt_meta_stringdata_Phonon__ObjectDescriptionModel_t +qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioOutputDeviceType = { + { QT_MOC_LITERAL(0, 0, 25) }, "Phonon::AudioOutputDevice\0" +}; +static const qt_meta_stringdata_Phonon__ObjectDescriptionModel_t +qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioCaptureDeviceType = { + { QT_MOC_LITERAL(0, 0, 26) }, "Phonon::AudioCaptureDevice\0" +}; +static const qt_meta_stringdata_Phonon__ObjectDescriptionModel_t +qt_meta_stringdata_Phonon__ObjectDescriptionModel_EffectType = { + { QT_MOC_LITERAL(0, 0, 25) }, "Phonon::EffectDescription\0" +}; +static const qt_meta_stringdata_Phonon__ObjectDescriptionModel_t +qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioChannelType = { + { QT_MOC_LITERAL(0, 0, 31) }, "Phonon::AudioChannelDescription\0" +}; +static const qt_meta_stringdata_Phonon__ObjectDescriptionModel_t +qt_meta_stringdata_Phonon__ObjectDescriptionModel_SubtitleType = { + { QT_MOC_LITERAL(0, 0, 27) }, "Phonon::SubtitleDescription\0" +}; +#undef QT_MOC_LITERAL + /* -static const char qt_meta_stringdata_Phonon__ObjectDescriptionModel_VideoOutputDeviceType[] = { "Phonon::VideoOutputDevice\0" }; -static const char qt_meta_stringdata_Phonon__ObjectDescriptionModel_VideoCaptureDeviceType[] = { "Phonon::VideoCaptureDevice\0" }; -static const char qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioCodecType[] = { "Phonon::AudioCodecDescription\0" }; -static const char qt_meta_stringdata_Phonon__ObjectDescriptionModel_VideoCodecType[] = { "Phonon::VideoCodecDescription\0" }; -static const char qt_meta_stringdata_Phonon__ObjectDescriptionModel_ContainerFormatType[] = { "Phonon::ContainerFormatDescription\0" }; -static const char qt_meta_stringdata_Phonon__ObjectDescriptionModel_VisualizationType[] = { "Phonon::VisualizationDescription\0" }; +static const qt_meta_stringdata_Phonon__ObjectDescriptionModel_t +qt_meta_stringdata_Phonon__ObjectDescriptionModel_VideoOutputDeviceType = { + { QT_MOC_LITERAL(0, 0, 25) }, "Phonon::VideoOutputDevice\0" +}; +static const qt_meta_stringdata_Phonon__ObjectDescriptionModel_t +qt_meta_stringdata_Phonon__ObjectDescriptionModel_VideoCaptureDeviceType = { + { QT_MOC_LITERAL(0, 0, 26) }, "Phonon::VideoCaptureDevice\0" +}; +static const qt_meta_stringdata_Phonon__ObjectDescriptionModel_t +qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioCodecType = { + { QT_MOC_LITERAL(0, 0, 29) }, "Phonon::AudioCodecDescription\0" +}; +static const qt_meta_stringdata_Phonon__ObjectDescriptionModel_t +qt_meta_stringdata_Phonon__ObjectDescriptionModel_VideoCodecType = { + { QT_MOC_LITERAL(0, 0, 29) }, "Phonon::VideoCodecDescription\0" +}; +static const qt_meta_stringdata_Phonon__ObjectDescriptionModel_t +qt_meta_stringdata_Phonon__ObjectDescriptionModel_ContainerFormatType = { + { QT_MOC_LITERAL(0, 0, 34) }, "Phonon::ContainerFormatDescription\0" +}; +static const qt_meta_stringdata_Phonon__ObjectDescriptionModel_t +qt_meta_stringdata_Phonon__ObjectDescriptionModel_VisualizationType = { + { QT_MOC_LITERAL(0, 0, 32) }, "Phonon::VisualizationDescription\0" +}; */ namespace Phonon { template<> const QMetaObject ObjectDescriptionModel::staticMetaObject = { - { &QAbstractListModel::staticMetaObject, reinterpret_cast(qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioOutputDeviceType), + { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioOutputDeviceType.data, qt_meta_data_Phonon__ObjectDescriptionModel, 0 } }; template<> const QMetaObject ObjectDescriptionModel::staticMetaObject = { - { &QAbstractListModel::staticMetaObject, reinterpret_cast(qt_meta_stringdata_Phonon__ObjectDescriptionModel_EffectType), + { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_EffectType.data, qt_meta_data_Phonon__ObjectDescriptionModel, 0 } }; template<> const QMetaObject ObjectDescriptionModel::staticMetaObject = { - { &QAbstractListModel::staticMetaObject, reinterpret_cast(qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioChannelType), + { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioChannelType.data, qt_meta_data_Phonon__ObjectDescriptionModel, 0 } }; template<> const QMetaObject ObjectDescriptionModel::staticMetaObject = { - { &QAbstractListModel::staticMetaObject, reinterpret_cast(qt_meta_stringdata_Phonon__ObjectDescriptionModel_SubtitleType), + { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_SubtitleType.data, qt_meta_data_Phonon__ObjectDescriptionModel, 0 } }; template<> const QMetaObject ObjectDescriptionModel::staticMetaObject = { - { &QAbstractListModel::staticMetaObject, reinterpret_cast(qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioCaptureDeviceType), + { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioCaptureDeviceType.data, qt_meta_data_Phonon__ObjectDescriptionModel, 0 } }; /*template<> const QMetaObject ObjectDescriptionModel::staticMetaObject = { - { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_VideoOutputDeviceType, + { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_VideoOutputDeviceType.data, qt_meta_data_Phonon__ObjectDescriptionModel, 0 } }; template<> const QMetaObject ObjectDescriptionModel::staticMetaObject = { - { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_VideoCaptureDeviceType, + { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_VideoCaptureDeviceType.data, qt_meta_data_Phonon__ObjectDescriptionModel, 0 } }; template<> const QMetaObject ObjectDescriptionModel::staticMetaObject = { - { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioCodecType, + { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioCodecType.data, qt_meta_data_Phonon__ObjectDescriptionModel, 0 } }; template<> const QMetaObject ObjectDescriptionModel::staticMetaObject = { - { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_VideoCodecType, + { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_VideoCodecType.data, qt_meta_data_Phonon__ObjectDescriptionModel, 0 } }; template<> const QMetaObject ObjectDescriptionModel::staticMetaObject = { - { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_ContainerFormatType, + { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_ContainerFormatType.data, qt_meta_data_Phonon__ObjectDescriptionModel, 0 } }; template<> const QMetaObject ObjectDescriptionModel::staticMetaObject = { - { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_VisualizationType, + { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_VisualizationType.data, qt_meta_data_Phonon__ObjectDescriptionModel, 0 } };*/ -- cgit v1.2.3