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

McuSupport: refactor McuPackage

Browse Source 
rename 'type' to 'toolChainType' in McuToolChainPackage
'addToPath' and 'relativePath' set in McuPackage constructor
put McuToolChainPackage methods together in same source file
'detectionPath' type changed from QString to FilePath
renamed boolean getters

Task-number: QTCREATORBUG-26897
Change-Id: If59c299901a169d08efa8f39614ef7c6d48d44ed
Reviewed-by: Piotr Mućko <piotr.mucko@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Christiaan Janssen
2022-02-21 15:24:46 +01:00
parent ec80ae2322
commit 7d9bb3f7e8
12 changed files with 461 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/mcusupport/mcupackage.h
View File

@@ -55,33 +55,35 @@ class McuPackage : public McuAbstractPackage
public:
McuPackage(const QString &label,
const Utils::FilePath &defaultPath,
const QString &detectionPath,
const Utils::FilePath &detectionPath,
const QString &settingsKey,
const QString &envVarName = {},
const QString &downloadUrl = {},
const McuPackageVersionDetector *versionDetector = nullptr);
const McuPackageVersionDetector *versionDetector = nullptr,
const bool addToPath = false,
const Utils::FilePath &relativePathModifier = Utils::FilePath());
~McuPackage() override = default;
QString label() const override;
const QString &environmentVariableName() const override;
bool isAddToSystemPath() const override;
void setVersions(const QStringList &versions) override;
Utils::FilePath basePath() const override;
Utils::FilePath path() const override;
QString label() const override;
Utils::FilePath defaultPath() const override;
QString detectionPath() const override;
QString statusText() const override;
void updateStatus() override;
Utils::FilePath detectionPath() const override;
void updateStatus() override;
Status status() const override;
bool validStatus() const override;
void setAddToPath(bool addToPath) override;
bool addToPath() const override;
bool isValidStatus() const override;
QString statusText() const override;
bool writeToSettings() const override;
void setRelativePathModifier(const QString &path) override;
void setVersions(const QStringList &versions) override;
QWidget *widget() override;
const QString &environmentVariableName() const override;
private:
void updatePath();
void updateStatusUi();
@@ -92,17 +94,17 @@ private:
const QString m_label;
const Utils::FilePath m_defaultPath;
const QString m_detectionPath;
const Utils::FilePath m_detectionPath;
const QString m_settingsKey;
const McuPackageVersionDetector *m_versionDetector;
Utils::FilePath m_path;
QString m_relativePathModifier; // relative path to m_path to be returned by path()
Utils::FilePath m_relativePathModifier; // relative path to m_path to be returned by path()
QString m_detectedVersion;
QStringList m_versions;
const QString m_environmentVariableName;
const QString m_downloadUrl;
bool m_addToPath = false;
const bool m_addToSystemPath;
Status m_status = Status::InvalidPath;
};
@@ -110,17 +112,17 @@ private:
class McuToolChainPackage : public McuPackage
{
public:
enum class Type { IAR, KEIL, MSVC, GCC, ArmGcc, GHS, GHSArm, Unsupported };
enum class ToolChainType { IAR, KEIL, MSVC, GCC, ArmGcc, GHS, GHSArm, Unsupported };
McuToolChainPackage(const QString &label,
const Utils::FilePath &defaultPath,
const QString &detectionPath,
const Utils::FilePath &detectionPath,
const QString &settingsKey,
Type type,
ToolChainType toolchainType,
const QString &envVarName = {},
const McuPackageVersionDetector *versionDetector = nullptr);
Type type() const;
ToolChainType toolchainType() const;
bool isDesktopToolchain() const;
ProjectExplorer::ToolChain *toolChain(Utils::Id language) const;
QString toolChainName() const;
@@ -128,7 +130,7 @@ public:
QVariant debuggerId() const;
private:
const Type m_type;
const ToolChainType m_type;
};
} // namespace Internal