feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AndroidSdkPackage: Do some cleanup

Browse Source 
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>
This commit is contained in:
Jarek Kobus
2024-01-31 23:45:11 +01:00
parent 531a65301e
commit 1c4ac36b6d
2 changed files with 38 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/plugins/android/androidsdkpackage.cpp
View File

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

44
src/plugins/android/androidsdkpackage.h
View File

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