From f0dabc7442bca41050d48c5c43e0a7d10e649f31 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 14 Feb 2019 08:56:19 +0100 Subject: [PATCH] QtSupport: De-qobjectify QtVersionFactory hierarchy Change-Id: I6ceccf96f5f6a5dc4e33d667d4fc234e15b88926 Reviewed-by: Christian Kandeler --- src/plugins/android/androidqtversionfactory.cpp | 3 +-- src/plugins/android/androidqtversionfactory.h | 2 +- src/plugins/ios/iosqtversionfactory.cpp | 3 +-- src/plugins/ios/iosqtversionfactory.h | 2 +- src/plugins/qnx/qnxqtversionfactory.cpp | 3 +-- src/plugins/qnx/qnxqtversionfactory.h | 3 +-- src/plugins/qtsupport/desktopqtversionfactory.cpp | 3 +-- src/plugins/qtsupport/desktopqtversionfactory.h | 2 +- src/plugins/qtsupport/qtsupportconstants.h | 2 ++ src/plugins/qtsupport/qtversionfactory.cpp | 9 +++++---- src/plugins/qtsupport/qtversionfactory.h | 10 +++------- .../remotelinux/embeddedlinuxqtversionfactory.cpp | 3 +-- .../remotelinux/embeddedlinuxqtversionfactory.h | 2 +- src/plugins/winrt/winrtqtversionfactory.cpp | 6 ++---- src/plugins/winrt/winrtqtversionfactory.h | 4 ++-- 15 files changed, 24 insertions(+), 33 deletions(-) diff --git a/src/plugins/android/androidqtversionfactory.cpp b/src/plugins/android/androidqtversionfactory.cpp index bf30be935ce..b3e5863601d 100644 --- a/src/plugins/android/androidqtversionfactory.cpp +++ b/src/plugins/android/androidqtversionfactory.cpp @@ -33,8 +33,7 @@ namespace Android { namespace Internal { -AndroidQtVersionFactory::AndroidQtVersionFactory(QObject *parent) - : QtSupport::QtVersionFactory(parent) +AndroidQtVersionFactory::AndroidQtVersionFactory() { setQtVersionCreator([] { return new AndroidQtVersion; }); setSupportedType(Constants::ANDROIDQT); diff --git a/src/plugins/android/androidqtversionfactory.h b/src/plugins/android/androidqtversionfactory.h index 47e6ec9e14b..789db4c290b 100644 --- a/src/plugins/android/androidqtversionfactory.h +++ b/src/plugins/android/androidqtversionfactory.h @@ -33,7 +33,7 @@ namespace Internal { class AndroidQtVersionFactory : public QtSupport::QtVersionFactory { public: - explicit AndroidQtVersionFactory(QObject *parent = nullptr); + AndroidQtVersionFactory(); QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected = false, const QString &autoDetectionSource = QString()) override; diff --git a/src/plugins/ios/iosqtversionfactory.cpp b/src/plugins/ios/iosqtversionfactory.cpp index d03eee1e149..99ca2b51ad7 100644 --- a/src/plugins/ios/iosqtversionfactory.cpp +++ b/src/plugins/ios/iosqtversionfactory.cpp @@ -32,8 +32,7 @@ namespace Ios { namespace Internal { -IosQtVersionFactory::IosQtVersionFactory(QObject *parent) - : QtSupport::QtVersionFactory(parent) +IosQtVersionFactory::IosQtVersionFactory() { setQtVersionCreator([] { return new IosQtVersion; }); setSupportedType(Constants::IOSQT); diff --git a/src/plugins/ios/iosqtversionfactory.h b/src/plugins/ios/iosqtversionfactory.h index 1e003608179..230fd28f4f2 100644 --- a/src/plugins/ios/iosqtversionfactory.h +++ b/src/plugins/ios/iosqtversionfactory.h @@ -33,7 +33,7 @@ namespace Internal { class IosQtVersionFactory : public QtSupport::QtVersionFactory { public: - explicit IosQtVersionFactory(QObject *parent = nullptr); + IosQtVersionFactory(); QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected = false, diff --git a/src/plugins/qnx/qnxqtversionfactory.cpp b/src/plugins/qnx/qnxqtversionfactory.cpp index 37b3b2098c1..5d2a23d7e72 100644 --- a/src/plugins/qnx/qnxqtversionfactory.cpp +++ b/src/plugins/qnx/qnxqtversionfactory.cpp @@ -33,8 +33,7 @@ using namespace Qnx; using namespace Qnx::Internal; -QnxQtVersionFactory::QnxQtVersionFactory(QObject *parent) : - QtSupport::QtVersionFactory(parent) +QnxQtVersionFactory::QnxQtVersionFactory() { setQtVersionCreator([] { return new QnxQtVersion; }); setSupportedType(Constants::QNX_QNX_QT); diff --git a/src/plugins/qnx/qnxqtversionfactory.h b/src/plugins/qnx/qnxqtversionfactory.h index 382f46dc509..8c842af9ed5 100644 --- a/src/plugins/qnx/qnxqtversionfactory.h +++ b/src/plugins/qnx/qnxqtversionfactory.h @@ -32,9 +32,8 @@ namespace Internal { class QnxQtVersionFactory : public QtSupport::QtVersionFactory { - Q_OBJECT public: - explicit QnxQtVersionFactory(QObject *parent = nullptr); + QnxQtVersionFactory(); QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, diff --git a/src/plugins/qtsupport/desktopqtversionfactory.cpp b/src/plugins/qtsupport/desktopqtversionfactory.cpp index 324c9704f70..5f27d5c2505 100644 --- a/src/plugins/qtsupport/desktopqtversionfactory.cpp +++ b/src/plugins/qtsupport/desktopqtversionfactory.cpp @@ -30,8 +30,7 @@ using namespace QtSupport; using namespace QtSupport::Internal; -DesktopQtVersionFactory::DesktopQtVersionFactory(QObject *parent) - : QtVersionFactory(parent) +DesktopQtVersionFactory::DesktopQtVersionFactory() { setQtVersionCreator([] { return new DesktopQtVersion; }); setSupportedType(Constants::DESKTOPQT); diff --git a/src/plugins/qtsupport/desktopqtversionfactory.h b/src/plugins/qtsupport/desktopqtversionfactory.h index 60de0d5a3d1..c650019fcbc 100644 --- a/src/plugins/qtsupport/desktopqtversionfactory.h +++ b/src/plugins/qtsupport/desktopqtversionfactory.h @@ -33,7 +33,7 @@ namespace Internal { class DesktopQtVersionFactory : public QtVersionFactory { public: - explicit DesktopQtVersionFactory(QObject *parent = nullptr); + DesktopQtVersionFactory(); BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected = false, const QString &autoDetectionSource = QString()) override; diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h index 202378ef2ea..a674dea1a75 100644 --- a/src/plugins/qtsupport/qtsupportconstants.h +++ b/src/plugins/qtsupport/qtsupportconstants.h @@ -25,6 +25,8 @@ #pragma once +#include + namespace QtSupport { namespace Constants { diff --git a/src/plugins/qtsupport/qtversionfactory.cpp b/src/plugins/qtsupport/qtversionfactory.cpp index ad16aa0ebdb..2337adaeec4 100644 --- a/src/plugins/qtsupport/qtversionfactory.cpp +++ b/src/plugins/qtsupport/qtversionfactory.cpp @@ -42,8 +42,7 @@ using namespace QtSupport::Internal; static QList g_qtVersionFactories; -QtVersionFactory::QtVersionFactory(QObject *parent) : - QObject(parent) +QtVersionFactory::QtVersionFactory() { g_qtVersionFactories.append(this); } @@ -106,8 +105,10 @@ BaseQtVersion *QtVersionFactory::createQtVersionFromQMakePath(const Utils::FileN } } ProFileCacheManager::instance()->decRefCount(); - if (error) - *error = tr("No factory found for qmake: \"%1\"").arg(qmakePath.toUserOutput()); + if (error) { + *error = QCoreApplication::translate("QtSupport::QtVersionFactory", + "No factory found for qmake: \"%1\"").arg(qmakePath.toUserOutput()); + } return 0; } diff --git a/src/plugins/qtsupport/qtversionfactory.h b/src/plugins/qtsupport/qtversionfactory.h index 2d4d8178709..8ae0926a19b 100644 --- a/src/plugins/qtsupport/qtversionfactory.h +++ b/src/plugins/qtsupport/qtversionfactory.h @@ -27,11 +27,9 @@ #include "qtsupport_global.h" -#include #include QT_BEGIN_NAMESPACE -class QSettings; class ProFileEvaluator; QT_END_NAMESPACE @@ -41,13 +39,11 @@ namespace QtSupport { class BaseQtVersion; -class QTSUPPORT_EXPORT QtVersionFactory : public QObject +class QTSUPPORT_EXPORT QtVersionFactory { - Q_OBJECT - public: - explicit QtVersionFactory(QObject *parent = nullptr); - ~QtVersionFactory() override; + QtVersionFactory(); + virtual ~QtVersionFactory(); static const QList allQtVersionFactories(); diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp index 44876f915c5..74d5d1a1ea0 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp +++ b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp @@ -33,8 +33,7 @@ namespace RemoteLinux { namespace Internal { -EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory(QObject *parent) - : QtSupport::QtVersionFactory(parent) +EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory() { setQtVersionCreator([] { return new EmbeddedLinuxQtVersion; }); setSupportedType(RemoteLinux::Constants::EMBEDDED_LINUX_QT); diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h index 54b6f589467..e73ef8f6e76 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h +++ b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h @@ -33,7 +33,7 @@ namespace Internal { class EmbeddedLinuxQtVersionFactory : public QtSupport::QtVersionFactory { public: - explicit EmbeddedLinuxQtVersionFactory(QObject *parent = nullptr); + EmbeddedLinuxQtVersionFactory(); QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected = false, diff --git a/src/plugins/winrt/winrtqtversionfactory.cpp b/src/plugins/winrt/winrtqtversionfactory.cpp index 0f0adae9b90..c2b08aef8cb 100644 --- a/src/plugins/winrt/winrtqtversionfactory.cpp +++ b/src/plugins/winrt/winrtqtversionfactory.cpp @@ -33,8 +33,7 @@ namespace WinRt { namespace Internal { -WinRtQtVersionFactory::WinRtQtVersionFactory(QObject *parent) - : QtSupport::QtVersionFactory(parent) +WinRtQtVersionFactory::WinRtQtVersionFactory() { setQtVersionCreator([] { return new WinRtQtVersion; }); setSupportedType(Constants::WINRT_WINRTQT); @@ -54,8 +53,7 @@ QtSupport::BaseQtVersion *WinRtQtVersionFactory::create(const Utils::FileName &q -WinRtPhoneQtVersionFactory::WinRtPhoneQtVersionFactory(QObject *parent) - : QtSupport::QtVersionFactory(parent) +WinRtPhoneQtVersionFactory::WinRtPhoneQtVersionFactory() { setQtVersionCreator([] { return new WinRtPhoneQtVersion; }); setSupportedType(Constants::WINRT_WINPHONEQT); diff --git a/src/plugins/winrt/winrtqtversionfactory.h b/src/plugins/winrt/winrtqtversionfactory.h index 886738fab0a..e3e93dfc235 100644 --- a/src/plugins/winrt/winrtqtversionfactory.h +++ b/src/plugins/winrt/winrtqtversionfactory.h @@ -33,7 +33,7 @@ namespace Internal { class WinRtQtVersionFactory : public QtSupport::QtVersionFactory { public: - explicit WinRtQtVersionFactory(QObject *parent = nullptr); + WinRtQtVersionFactory(); QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected = false, const QString &autoDetectionSource = QString()); @@ -42,7 +42,7 @@ public: class WinRtPhoneQtVersionFactory : public QtSupport::QtVersionFactory { public: - explicit WinRtPhoneQtVersionFactory(QObject *parent = nullptr); + WinRtPhoneQtVersionFactory(); QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected = false, const QString &autoDetectionSource = QString());