AndroidSdkPackage: Do some cleanup

Remove unused "parent" argument from c'tors.
Remove repeating "public:" sections.
Remove obvious comment about overrides.
Remove unneeded Q_OBJECT macros.

Change-Id: Ie823ea9b977fdf7f102ce301070a564fd9b44c76
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

src/plugins/android/androidsdkpackage.cpp

@@ -84,18 +84,12 @@ QString AndroidSdkPackage::extension() const
     return m_extension;
 }
 
-void AndroidSdkPackage::updatePackageDetails()
-{
-
-}
-
 SystemImage::SystemImage(const QVersionNumber &version, const QString &sdkStylePathStr,
-                         const QString &abi, SdkPlatform *platform):
-    AndroidSdkPackage(version, sdkStylePathStr, platform),
-    m_platform(platform),
-    m_abiName(abi)
-{
-}
+                         const QString &abi, SdkPlatform *platform)
+    : AndroidSdkPackage(version, sdkStylePathStr, platform)
+    , m_platform(platform)
+    , m_abiName(abi)
+{}
 
 bool SystemImage::isValid() const
 {
@@ -132,10 +126,9 @@ void SystemImage::setApiLevel(const int apiLevel)
     m_apiLevel = apiLevel;
 }
 
-SdkPlatform::SdkPlatform(const QVersionNumber &version, const QString &sdkStylePathStr,
-                         int api, QObject *parent) :
-    AndroidSdkPackage(version, sdkStylePathStr, parent),
-    m_apiLevel(api)
+SdkPlatform::SdkPlatform(const QVersionNumber &version, const QString &sdkStylePathStr, int api)
+    : AndroidSdkPackage(version, sdkStylePathStr)
+    , m_apiLevel(api)
 {
     setDisplayText(QString("android-%1")
                    .arg(m_apiLevel != -1 ? QString::number(m_apiLevel) : "Unknown"));
@@ -205,11 +198,9 @@ SystemImageList SdkPlatform::systemImages(PackageState state) const
     });
 }
 
-BuildTools::BuildTools(const QVersionNumber &revision, const QString &sdkStylePathStr,
-                       QObject *parent)
-    : AndroidSdkPackage(revision, sdkStylePathStr, parent)
-{
-}
+BuildTools::BuildTools(const QVersionNumber &revision, const QString &sdkStylePathStr)
+    : AndroidSdkPackage(revision, sdkStylePathStr)
+{}
 
 bool BuildTools::isValid() const
 {
@@ -221,11 +212,9 @@ AndroidSdkPackage::PackageType BuildTools::type() const
     return AndroidSdkPackage::BuildToolsPackage;
 }
 
-SdkTools::SdkTools(const QVersionNumber &revision, const QString &sdkStylePathStr, QObject *parent)
-    : AndroidSdkPackage(revision, sdkStylePathStr, parent)
-{
-
-}
+SdkTools::SdkTools(const QVersionNumber &revision, const QString &sdkStylePathStr)
+    : AndroidSdkPackage(revision, sdkStylePathStr)
+{}
 
 bool SdkTools::isValid() const
 {
@@ -237,12 +226,9 @@ AndroidSdkPackage::PackageType SdkTools::type() const
     return AndroidSdkPackage::SdkToolsPackage;
 }
 
-PlatformTools::PlatformTools(const QVersionNumber &revision, const QString &sdkStylePathStr,
-                             QObject *parent)
-    : AndroidSdkPackage(revision, sdkStylePathStr, parent)
-{
-
-}
+PlatformTools::PlatformTools(const QVersionNumber &revision, const QString &sdkStylePathStr)
+    : AndroidSdkPackage(revision, sdkStylePathStr)
+{}
 
 bool PlatformTools::isValid() const
 {
@@ -254,12 +240,9 @@ AndroidSdkPackage::PackageType PlatformTools::type() const
     return AndroidSdkPackage::PlatformToolsPackage;
 }
 
-EmulatorTools::EmulatorTools(const QVersionNumber &revision, const QString &sdkStylePathStr,
-                             QObject *parent)
-    : AndroidSdkPackage(revision, sdkStylePathStr, parent)
-{
-
-}
+EmulatorTools::EmulatorTools(const QVersionNumber &revision, const QString &sdkStylePathStr)
+    : AndroidSdkPackage(revision, sdkStylePathStr)
+{}
 
 bool EmulatorTools::isValid() const
 {
@@ -271,11 +254,9 @@ AndroidSdkPackage::PackageType EmulatorTools::type() const
     return AndroidSdkPackage::EmulatorToolsPackage;
 }
 
-ExtraTools::ExtraTools(const QVersionNumber &revision, const QString &sdkStylePathStr,
-                       QObject *parent)
-    : AndroidSdkPackage(revision, sdkStylePathStr, parent)
-{
-}
+ExtraTools::ExtraTools(const QVersionNumber &revision, const QString &sdkStylePathStr)
+    : AndroidSdkPackage(revision, sdkStylePathStr)
+{}
 
 bool ExtraTools::isValid() const
 {
@@ -287,10 +268,9 @@ AndroidSdkPackage::PackageType ExtraTools::type() const
     return AndroidSdkPackage::ExtraToolsPackage;
 }
 
-Ndk::Ndk(const QVersionNumber &revision, const QString &sdkStylePathStr, QObject *parent)
-    : AndroidSdkPackage(revision, sdkStylePathStr, parent)
-{
-}
+Ndk::Ndk(const QVersionNumber &revision, const QString &sdkStylePathStr)
+    : AndroidSdkPackage(revision, sdkStylePathStr)
+{}
 
 bool Ndk::isValid() const
 {
@@ -302,11 +282,9 @@ AndroidSdkPackage::PackageType Ndk::type() const
     return AndroidSdkPackage::NDKPackage;
 }
 
-GenericSdkPackage::GenericSdkPackage(const QVersionNumber &revision, const QString &sdkStylePathStr,
-                                     QObject  *parent)
-    : AndroidSdkPackage(revision, sdkStylePathStr, parent)
-{
-}
+GenericSdkPackage::GenericSdkPackage(const QVersionNumber &revision, const QString &sdkStylePathStr)
+    : AndroidSdkPackage(revision, sdkStylePathStr)
+{}
 
 bool GenericSdkPackage::isValid() const
 {

src/plugins/android/androidsdkpackage.h

@@ -73,7 +73,7 @@ protected:
     void setInstalledLocation(const Utils::FilePath &path);
     void setExtension(const QString &extension);
 
-    virtual void updatePackageDetails();
+    virtual void updatePackageDetails() {}
 
 private:
     QString m_displayText;
@@ -93,12 +93,10 @@ using AndroidSdkPackageList = QList<AndroidSdkPackage*>;
 
 class SystemImage : public AndroidSdkPackage
 {
-    Q_OBJECT
 public:
     SystemImage(const QVersionNumber &revision, const QString &sdkStylePathStr, const QString &abi,
                 SdkPlatform *platform = nullptr);
 
-// AndroidSdkPackage Overrides
     bool isValid() const override;
     PackageType type() const override;
 
@@ -115,17 +113,12 @@ private:
 };
 using SystemImageList = QList<SystemImage*>;
 
-
 class SdkPlatform : public AndroidSdkPackage
 {
-    Q_OBJECT
 public:
-    SdkPlatform(const QVersionNumber &revision, const QString &sdkStylePathStr, int api,
-                QObject *parent = nullptr);
-
+    SdkPlatform(const QVersionNumber &revision, const QString &sdkStylePathStr, int api);
     ~SdkPlatform() override;
 
-// AndroidSdkPackage Overrides
     bool isValid() const override;
     PackageType type() const override;
     bool operator <(const AndroidSdkPackage &other) const override;
@@ -146,11 +139,8 @@ using SdkPlatformList = QList<SdkPlatform*>;
 class BuildTools : public AndroidSdkPackage
 {
 public:
-    BuildTools(const QVersionNumber &revision, const QString &sdkStylePathStr,
-               QObject *parent = nullptr);
+    BuildTools(const QVersionNumber &revision, const QString &sdkStylePathStr);
 
-// AndroidSdkPackage Overrides
-public:
     bool isValid() const override;
     PackageType type() const override;
 };
@@ -159,11 +149,8 @@ using BuildToolsList = QList<BuildTools*>;
 class PlatformTools : public AndroidSdkPackage
 {
 public:
-    PlatformTools(const QVersionNumber &revision, const QString &sdkStylePathStr,
-                  QObject *parent = nullptr);
+    PlatformTools(const QVersionNumber &revision, const QString &sdkStylePathStr);
 
-// AndroidSdkPackage Overrides
-public:
     bool isValid() const override;
     PackageType type() const override;
 };
@@ -171,11 +158,8 @@ public:
 class EmulatorTools : public AndroidSdkPackage
 {
 public:
-    EmulatorTools(const QVersionNumber &revision, const QString &sdkStylePathStr,
-                  QObject *parent = nullptr);
+    EmulatorTools(const QVersionNumber &revision, const QString &sdkStylePathStr);
 
-// AndroidSdkPackage Overrides
-public:
     bool isValid() const override;
     PackageType type() const override;
 };
@@ -183,11 +167,8 @@ public:
 class SdkTools : public AndroidSdkPackage
 {
 public:
-    SdkTools(const QVersionNumber &revision, const QString &sdkStylePathStr,
-             QObject *parent = nullptr);
+    SdkTools(const QVersionNumber &revision, const QString &sdkStylePathStr);
 
-// AndroidSdkPackage Overrides
-public:
     bool isValid() const override;
     PackageType type() const override;
 };
@@ -195,9 +176,8 @@ public:
 class Ndk : public AndroidSdkPackage
 {
 public:
-    Ndk(const QVersionNumber &revision, const QString &sdkStylePathStr, QObject *parent = nullptr);
+    Ndk(const QVersionNumber &revision, const QString &sdkStylePathStr);
 
-    // AndroidSdkPackage Overrides
     bool isValid() const override;
     PackageType type() const override;
 };
@@ -206,11 +186,8 @@ using NdkList = QList<Ndk *>;
 class ExtraTools : public AndroidSdkPackage
 {
 public:
-    ExtraTools(const QVersionNumber &revision, const QString &sdkStylePathStr,
-               QObject *parent = nullptr);
+    ExtraTools(const QVersionNumber &revision, const QString &sdkStylePathStr);
 
-// AndroidSdkPackage Overrides
-public:
     bool isValid() const override;
     PackageType type() const override;
 };
@@ -218,11 +195,8 @@ public:
 class GenericSdkPackage : public AndroidSdkPackage
 {
 public:
-    GenericSdkPackage(const QVersionNumber &revision, const QString &sdkStylePathStr,
-                      QObject *parent = nullptr);
+    GenericSdkPackage(const QVersionNumber &revision, const QString &sdkStylePathStr);
 
-// AndroidSdkPackage Overrides
-public:
     bool isValid() const override;
     PackageType type() const override;
 };