forked from qt-creator/qt-creator
McuSupport: Small virtual/final cleanup
Change-Id: I5a187a6b573326685fb471dc7e31e9731760602d Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -23,8 +23,7 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#ifndef MCUSUPPORTVERSIONDETECTION_H
|
#pragma once
|
||||||
#define MCUSUPPORTVERSIONDETECTION_H
|
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
@@ -47,7 +46,7 @@ public:
|
|||||||
McuPackageExecutableVersionDetector(const QString &detectionPath,
|
McuPackageExecutableVersionDetector(const QString &detectionPath,
|
||||||
const QStringList &detectionArgs,
|
const QStringList &detectionArgs,
|
||||||
const QString &detectionRegExp);
|
const QString &detectionRegExp);
|
||||||
virtual QString parseVersion(const QString &packagePath) const;
|
QString parseVersion(const QString &packagePath) const final;
|
||||||
private:
|
private:
|
||||||
const QString m_detectionPath;
|
const QString m_detectionPath;
|
||||||
const QStringList m_detectionArgs;
|
const QStringList m_detectionArgs;
|
||||||
@@ -62,7 +61,7 @@ public:
|
|||||||
const QString &elementName,
|
const QString &elementName,
|
||||||
const QString &versionAttribute,
|
const QString &versionAttribute,
|
||||||
const QString &versionRegExp);
|
const QString &versionRegExp);
|
||||||
QString parseVersion(const QString &packagePath) const;
|
QString parseVersion(const QString &packagePath) const final;
|
||||||
private:
|
private:
|
||||||
const QString m_filePattern;
|
const QString m_filePattern;
|
||||||
const QString m_versionElement;
|
const QString m_versionElement;
|
||||||
@@ -75,7 +74,7 @@ class McuPackageDirectoryVersionDetector : public McuPackageVersionDetector
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
McuPackageDirectoryVersionDetector(const QString &filePattern, const QString &versionRegExp, const bool isFile);
|
McuPackageDirectoryVersionDetector(const QString &filePattern, const QString &versionRegExp, const bool isFile);
|
||||||
QString parseVersion(const QString &packagePath) const;
|
QString parseVersion(const QString &packagePath) const final;
|
||||||
private:
|
private:
|
||||||
const QString m_filePattern;
|
const QString m_filePattern;
|
||||||
const QString m_versionRegExp;
|
const QString m_versionRegExp;
|
||||||
@@ -87,12 +86,10 @@ class McuPackagePathVersionDetector : public McuPackageVersionDetector
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
McuPackagePathVersionDetector(const QString &versionRegExp);
|
McuPackagePathVersionDetector(const QString &versionRegExp);
|
||||||
QString parseVersion(const QString &packagePath) const;
|
QString parseVersion(const QString &packagePath) const final;
|
||||||
private:
|
private:
|
||||||
const QString m_versionRegExp;
|
const QString m_versionRegExp;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // Internal
|
} // Internal
|
||||||
} // McuSupport
|
} // McuSupport
|
||||||
|
|
||||||
#endif // MCUSUPPORTVERSIONDETECTION_H
|
|
||||||
|
Reference in New Issue
Block a user