From c2751b1d664748cfbd05d2e397f95f2cc0bec13f Mon Sep 17 00:00:00 2001 From: Andre de la Rocha Date: Mon, 21 Aug 2017 13:23:48 +0200 Subject: Active Qt Examples: Brush up to C++ 11 Use nullptr, member initialization, new connect syntax, QStringLiteral, etc. Change-Id: Ia79473ca302216f91eec6a32f670cf606761ed0d Reviewed-by: Michael Winkelmann Reviewed-by: Friedemann Kleint --- examples/activeqt/wrapper/main.cpp | 169 ++++++++++++++++++------------------- 1 file changed, 82 insertions(+), 87 deletions(-) (limited to 'examples/activeqt/wrapper/main.cpp') diff --git a/examples/activeqt/wrapper/main.cpp b/examples/activeqt/wrapper/main.cpp index 2c0db5f..b18d6cf 100644 --- a/examples/activeqt/wrapper/main.cpp +++ b/examples/activeqt/wrapper/main.cpp @@ -44,117 +44,112 @@ #include #include #include - -/* XPM */ -static const char *fileopen[] = { -" 16 13 5 1", -". c #040404", -"# c #808304", -"a c None", -"b c #f3f704", -"c c #f3f7f3", -"aaaaaaaaa...aaaa", -"aaaaaaaa.aaa.a.a", -"aaaaaaaaaaaaa..a", -"a...aaaaaaaa...a", -".bcb.......aaaaa", -".cbcbcbcbc.aaaaa", -".bcbcbcbcb.aaaaa", -".cbcb...........", -".bcb.#########.a", -".cb.#########.aa", -".b.#########.aaa", -"..#########.aaaa", -"...........aaaaa" -}; - +#include //! [0] class ActiveQtFactory : public QAxFactory { public: - ActiveQtFactory( const QUuid &lib, const QUuid &app ) - : QAxFactory( lib, app ) + ActiveQtFactory(const QUuid &lib, const QUuid &app) + : QAxFactory(lib, app) {} + QStringList featureList() const { - QStringList list; - list << "QCheckBox"; - list << "QRadioButton"; - list << "QPushButton"; - list << "QToolButton"; - return list; + return m_activeElements.keys(); } + QObject *createObject(const QString &key) { - if ( key == "QCheckBox" ) - return new QCheckBox(0); - if ( key == "QRadioButton" ) - return new QRadioButton(0); - if ( key == "QPushButton" ) - return new QPushButton(0 ); - if ( key == "QToolButton" ) { - QToolButton *tb = new QToolButton(0); -// tb->setIcon( QPixmap(fileopen) ); - return tb; - } - - return 0; + auto it = m_activeElements.find(key); + if (it != m_activeElements.end()) + return it->create(); + return nullptr; } - const QMetaObject *metaObject( const QString &key ) const - { - if ( key == "QCheckBox" ) - return &QCheckBox::staticMetaObject; - if ( key == "QRadioButton" ) - return &QRadioButton::staticMetaObject; - if ( key == "QPushButton" ) - return &QPushButton::staticMetaObject; - if ( key == "QToolButton" ) - return &QToolButton::staticMetaObject; - return 0; - } - QUuid classID( const QString &key ) const + const QMetaObject *metaObject(const QString &key) const { - if ( key == "QCheckBox" ) - return "{6E795DE9-872D-43CF-A831-496EF9D86C68}"; - if ( key == "QRadioButton" ) - return "{AFCF78C8-446C-409A-93B3-BA2959039189}"; - if ( key == "QPushButton" ) - return "{2B262458-A4B6-468B-B7D4-CF5FEE0A7092}"; - if ( key == "QToolButton" ) - return "{7c0ffe7a-60c3-4666-bde2-5cf2b54390a1}"; + auto it = m_activeElements.find(key); + if (it != m_activeElements.end()) + return it->metaObject; + return nullptr; + } + QUuid classID(const QString &key) const + { + auto it = m_activeElements.find(key); + if (it != m_activeElements.end()) + return it->classID; return QUuid(); } - QUuid interfaceID( const QString &key ) const - { - if ( key == "QCheckBox" ) - return "{4FD39DD7-2DE0-43C1-A8C2-27C51A052810}"; - if ( key == "QRadioButton" ) - return "{7CC8AE30-206C-48A3-A009-B0A088026C2F}"; - if ( key == "QPushButton" ) - return "{06831CC9-59B6-436A-9578-6D53E5AD03D3}"; - if ( key == "QToolButton" ) - return "{6726080f-d63d-4950-a366-9bf33e5cdf84}"; + QUuid interfaceID(const QString &key) const + { + auto it = m_activeElements.find(key); + if (it != m_activeElements.end()) + return it->interfaceID; return QUuid(); } - QUuid eventsID( const QString &key ) const - { - if ( key == "QCheckBox" ) - return "{FDB6FFBE-56A3-4E90-8F4D-198488418B3A}"; - if ( key == "QRadioButton" ) - return "{73EE4860-684C-4A66-BF63-9B9EFFA0CBE5}"; - if ( key == "QPushButton" ) - return "{3CC3F17F-EA59-4B58-BBD3-842D467131DD}"; - if ( key == "QToolButton" ) - return "{f4d421fd-4ead-4fd9-8a25-440766939639}"; + QUuid eventsID(const QString &key) const + { + auto it = m_activeElements.find(key); + if (it != m_activeElements.end()) + return it->eventsID; return QUuid(); } + +private: + + struct ActiveElement { + QUuid classID; + QUuid interfaceID; + QUuid eventsID; + const QMetaObject *metaObject; + std::function create; + }; + + const QHash m_activeElements { + { + QStringLiteral("QCheckBox"), { + QUuid("{6E795DE9-872D-43CF-A831-496EF9D86C68}"), + QUuid("{4FD39DD7-2DE0-43C1-A8C2-27C51A052810}"), + QUuid("{FDB6FFBE-56A3-4E90-8F4D-198488418B3A}"), + &QCheckBox::staticMetaObject, + []() { return new QCheckBox; } + } + }, + { + QStringLiteral("QRadioButton"), { + QUuid("{AFCF78C8-446C-409A-93B3-BA2959039189}"), + QUuid("{7CC8AE30-206C-48A3-A009-B0A088026C2F}"), + QUuid("{73EE4860-684C-4A66-BF63-9B9EFFA0CBE5}"), + &QRadioButton::staticMetaObject, + []() { return new QRadioButton; } + } + }, + { + QStringLiteral("QPushButton"), { + QUuid("{2B262458-A4B6-468B-B7D4-CF5FEE0A7092}"), + QUuid("{06831CC9-59B6-436A-9578-6D53E5AD03D3}"), + QUuid("{3CC3F17F-EA59-4B58-BBD3-842D467131DD}"), + &QPushButton::staticMetaObject, + []() { return new QPushButton; } + } + }, + { + QStringLiteral("QToolButton"), { + QUuid("{7c0ffe7a-60c3-4666-bde2-5cf2b54390a1}"), + QUuid("{6726080f-d63d-4950-a366-9bf33e5cdf84}"), + QUuid("{f4d421fd-4ead-4fd9-8a25-440766939639}"), + &QToolButton::staticMetaObject, + []() { return new QToolButton; } + } + }, + }; + }; //! [0] //! [1] -QAXFACTORY_EXPORT( ActiveQtFactory, "{3B756301-0075-4E40-8BE8-5A81DE2426B7}", "{AB068077-4924-406a-BBAF-42D91C8727DD}" ) +QAXFACTORY_EXPORT(ActiveQtFactory, "{3B756301-0075-4E40-8BE8-5A81DE2426B7}", "{AB068077-4924-406a-BBAF-42D91C8727DD}") //! [1] -- cgit v1.2.3 From a07f521f9bfa535ad18cbdd93e228276133ff4d9 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 28 Sep 2017 13:26:23 +0200 Subject: Fix outdated BSD license header Use new version with commercial exception. Change-Id: I20b377176e99b80db47f41596d20192ae7d5564f Reviewed-by: Friedemann Kleint --- examples/activeqt/wrapper/main.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'examples/activeqt/wrapper/main.cpp') diff --git a/examples/activeqt/wrapper/main.cpp b/examples/activeqt/wrapper/main.cpp index b18d6cf..2683a41 100644 --- a/examples/activeqt/wrapper/main.cpp +++ b/examples/activeqt/wrapper/main.cpp @@ -6,7 +6,17 @@ ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are -- cgit v1.2.3