AndroidSdkPackage: Inline most of AndroidSdkPackage subclasses

Change-Id: Ib3242f9602a352fe0d4b1a6eb19454370e6d046b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

src/plugins/android/androidsdkpackage.cpp

@@ -96,11 +96,6 @@ bool SystemImage::isValid() const
     return m_platform && m_platform->isValid();
 }
 
-AndroidSdkPackage::PackageType SystemImage::type() const
-{
-    return SystemImagePackage;
-}
-
 const QString &SystemImage::abiName() const
 {
     return m_abiName;
@@ -141,16 +136,6 @@ SdkPlatform::~SdkPlatform()
     m_systemImages.clear();
 }
 
-bool SdkPlatform::isValid() const
-{
-    return m_apiLevel != -1;
-}
-
-AndroidSdkPackage::PackageType SdkPlatform::type() const
-{
-    return SdkPlatformPackage;
-}
-
 bool SdkPlatform::operator <(const AndroidSdkPackage &other) const
 {
     if (typeid(*this) != typeid(other))
@@ -198,102 +183,4 @@ SystemImageList SdkPlatform::systemImages(PackageState state) const
     });
 }
 
-BuildTools::BuildTools(const QVersionNumber &revision, const QString &sdkStylePathStr)
-    : AndroidSdkPackage(revision, sdkStylePathStr)
-{}
-
-bool BuildTools::isValid() const
-{
-    return true;
-}
-
-AndroidSdkPackage::PackageType BuildTools::type() const
-{
-    return AndroidSdkPackage::BuildToolsPackage;
-}
-
-SdkTools::SdkTools(const QVersionNumber &revision, const QString &sdkStylePathStr)
-    : AndroidSdkPackage(revision, sdkStylePathStr)
-{}
-
-bool SdkTools::isValid() const
-{
-    return true;
-}
-
-AndroidSdkPackage::PackageType SdkTools::type() const
-{
-    return AndroidSdkPackage::SdkToolsPackage;
-}
-
-PlatformTools::PlatformTools(const QVersionNumber &revision, const QString &sdkStylePathStr)
-    : AndroidSdkPackage(revision, sdkStylePathStr)
-{}
-
-bool PlatformTools::isValid() const
-{
-    return true;
-}
-
-AndroidSdkPackage::PackageType PlatformTools::type() const
-{
-    return AndroidSdkPackage::PlatformToolsPackage;
-}
-
-EmulatorTools::EmulatorTools(const QVersionNumber &revision, const QString &sdkStylePathStr)
-    : AndroidSdkPackage(revision, sdkStylePathStr)
-{}
-
-bool EmulatorTools::isValid() const
-{
-    return installedLocation().exists();
-}
-
-AndroidSdkPackage::PackageType EmulatorTools::type() const
-{
-    return AndroidSdkPackage::EmulatorToolsPackage;
-}
-
-ExtraTools::ExtraTools(const QVersionNumber &revision, const QString &sdkStylePathStr)
-    : AndroidSdkPackage(revision, sdkStylePathStr)
-{}
-
-bool ExtraTools::isValid() const
-{
-    return installedLocation().exists();
-}
-
-AndroidSdkPackage::PackageType ExtraTools::type() const
-{
-    return AndroidSdkPackage::ExtraToolsPackage;
-}
-
-Ndk::Ndk(const QVersionNumber &revision, const QString &sdkStylePathStr)
-    : AndroidSdkPackage(revision, sdkStylePathStr)
-{}
-
-bool Ndk::isValid() const
-{
-    return installedLocation().exists();
-}
-
-AndroidSdkPackage::PackageType Ndk::type() const
-{
-    return AndroidSdkPackage::NDKPackage;
-}
-
-GenericSdkPackage::GenericSdkPackage(const QVersionNumber &revision, const QString &sdkStylePathStr)
-    : AndroidSdkPackage(revision, sdkStylePathStr)
-{}
-
-bool GenericSdkPackage::isValid() const
-{
-    return installedLocation().exists();
-}
-
-AndroidSdkPackage::PackageType GenericSdkPackage::type() const
-{
-    return AndroidSdkPackage::GenericSdkPackage;
-}
-
 } // namespace Android

src/plugins/android/androidsdkpackage.h

@@ -98,7 +98,7 @@ public:
                 SdkPlatform *platform = nullptr);
 
     bool isValid() const override;
-    PackageType type() const override;
+    PackageType type() const override { return SystemImagePackage; }
 
     const QString &abiName() const;
     const SdkPlatform *platform() const;
@@ -119,8 +119,8 @@ public:
     SdkPlatform(const QVersionNumber &revision, const QString &sdkStylePathStr, int api);
     ~SdkPlatform() override;
 
-    bool isValid() const override;
+    bool isValid() const override { return m_apiLevel != -1; }
-    PackageType type() const override;
+    PackageType type() const override { return SdkPlatformPackage; }
     bool operator <(const AndroidSdkPackage &other) const override;
 
     int apiLevel() const;
@@ -139,66 +139,73 @@ using SdkPlatformList = QList<SdkPlatform*>;
 class BuildTools : public AndroidSdkPackage
 {
 public:
-    BuildTools(const QVersionNumber &revision, const QString &sdkStylePathStr);
+    BuildTools(const QVersionNumber &revision, const QString &sdkStylePathStr)
+        : AndroidSdkPackage(revision, sdkStylePathStr) {}
 
-    bool isValid() const override;
+    bool isValid() const override { return true; }
-    PackageType type() const override;
+    PackageType type() const override { return AndroidSdkPackage::BuildToolsPackage; }
 };
 using BuildToolsList = QList<BuildTools *>;
 
 class PlatformTools : public AndroidSdkPackage
 {
 public:
-    PlatformTools(const QVersionNumber &revision, const QString &sdkStylePathStr);
+    PlatformTools(const QVersionNumber &revision, const QString &sdkStylePathStr)
+        : AndroidSdkPackage(revision, sdkStylePathStr) {}
 
-    bool isValid() const override;
+    bool isValid() const override { return true; }
-    PackageType type() const override;
+    PackageType type() const override { return AndroidSdkPackage::PlatformToolsPackage; }
 };
 
 class EmulatorTools : public AndroidSdkPackage
 {
 public:
-    EmulatorTools(const QVersionNumber &revision, const QString &sdkStylePathStr);
+    EmulatorTools(const QVersionNumber &revision, const QString &sdkStylePathStr)
+        : AndroidSdkPackage(revision, sdkStylePathStr) {}
 
-    bool isValid() const override;
+    bool isValid() const override { return installedLocation().exists(); }
-    PackageType type() const override;
+    PackageType type() const override { return AndroidSdkPackage::EmulatorToolsPackage; }
 };
 
 class SdkTools : public AndroidSdkPackage
 {
 public:
-    SdkTools(const QVersionNumber &revision, const QString &sdkStylePathStr);
+    SdkTools(const QVersionNumber &revision, const QString &sdkStylePathStr)
+        : AndroidSdkPackage(revision, sdkStylePathStr) {}
 
-    bool isValid() const override;
+    bool isValid() const override { return true; }
-    PackageType type() const override;
+    PackageType type() const override { return AndroidSdkPackage::SdkToolsPackage; }
 };
 
 class Ndk : public AndroidSdkPackage
 {
 public:
-    Ndk(const QVersionNumber &revision, const QString &sdkStylePathStr);
+    Ndk(const QVersionNumber &revision, const QString &sdkStylePathStr)
+        : AndroidSdkPackage(revision, sdkStylePathStr) {}
 
-    bool isValid() const override;
+    bool isValid() const override { return installedLocation().exists(); }
-    PackageType type() const override;
+    PackageType type() const override { return AndroidSdkPackage::NDKPackage; }
 };
 using NdkList = QList<Ndk *>;
 
 class ExtraTools : public AndroidSdkPackage
 {
 public:
-    ExtraTools(const QVersionNumber &revision, const QString &sdkStylePathStr);
+    ExtraTools(const QVersionNumber &revision, const QString &sdkStylePathStr)
+        : AndroidSdkPackage(revision, sdkStylePathStr) {}
 
-    bool isValid() const override;
+    bool isValid() const override { return installedLocation().exists(); }
-    PackageType type() const override;
+    PackageType type() const override { return AndroidSdkPackage::ExtraToolsPackage; }
 };
 
 class GenericSdkPackage : public AndroidSdkPackage
 {
 public:
-    GenericSdkPackage(const QVersionNumber &revision, const QString &sdkStylePathStr);
+    GenericSdkPackage(const QVersionNumber &revision, const QString &sdkStylePathStr)
+        : AndroidSdkPackage(revision, sdkStylePathStr) {}
 
-    bool isValid() const override;
+    bool isValid() const override { return installedLocation().exists(); }
-    PackageType type() const override;
+    PackageType type() const override { return AndroidSdkPackage::GenericSdkPackage; }
 };
 } // namespace Android