diff options
author | Lukáš Tinkl <ltinkl@luxoft.com> | 2018-01-08 18:44:39 +0100 |
---|---|---|
committer | Daniel d'Andrada <daniel.dandrada@luxoft.com> | 2018-02-28 15:58:24 +0100 |
commit | 9521826abcffff80169774dd3b2c868107898c8e (patch) | |
tree | 58d6361ebc5505522261ec94cb052100db7c5ce6 /plugins/systeminfo | |
parent | 96246229ac40655581830246ad8a9ec6bf3fd933 (diff) |
some const and override fixes
Diffstat (limited to 'plugins/systeminfo')
-rw-r--r-- | plugins/systeminfo/plugin.cpp | 5 | ||||
-rw-r--r-- | plugins/systeminfo/systeminfo.h | 11 |
2 files changed, 7 insertions, 9 deletions
diff --git a/plugins/systeminfo/plugin.cpp b/plugins/systeminfo/plugin.cpp index 1ef61630..ff3de51c 100644 --- a/plugins/systeminfo/plugin.cpp +++ b/plugins/systeminfo/plugin.cpp @@ -36,12 +36,11 @@ class SystemInfoPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - virtual void registerTypes(const char *uri) + void registerTypes(const char *uri) override { Q_ASSERT(QLatin1String(uri) == QLatin1String("com.pelagicore.systeminfo")); - Q_UNUSED(uri); qmlRegisterType<SystemInfo>(uri, 1, 0, "SystemInfo"); } diff --git a/plugins/systeminfo/systeminfo.h b/plugins/systeminfo/systeminfo.h index 92bd0e1c..c11bd44f 100644 --- a/plugins/systeminfo/systeminfo.h +++ b/plugins/systeminfo/systeminfo.h @@ -45,7 +45,6 @@ class SystemInfo : public QObject, public QQmlParserStatus public: explicit SystemInfo(QObject *parent = nullptr); - void getAddress(); QStringList addressList() const; public slots: @@ -55,12 +54,12 @@ signals: void addressListChanged(); protected: - QStringList m_addressList; + void classBegin() override; + void componentComplete() override; - // QQmlParserStatus interface -public: - virtual void classBegin() override; - virtual void componentComplete() override; +private: + void getAddress(); + QStringList m_addressList; }; #endif // SYSTEMINFO_H |