From e2e0a9a7188d7045348baeee9af68b58eb434b12 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 31 Jan 2024 21:30:41 +0100 Subject: [PATCH] SdkManagerOutputParser: Hide subclasses for package parsers Change-Id: I05543aeb8b5f039cad349dad6fc3af557e487dfc Reviewed-by: Alessandro Portale Reviewed-by: Qt CI Bot Reviewed-by: --- .../android/sdkmanageroutputparser.cpp | 14 ++++---- src/plugins/android/sdkmanageroutputparser.h | 14 ++++---- .../android/sdkmanageroutputparser_test.cpp | 33 ++++++++----------- 3 files changed, 28 insertions(+), 33 deletions(-) diff --git a/src/plugins/android/sdkmanageroutputparser.cpp b/src/plugins/android/sdkmanageroutputparser.cpp index aaff0c486dd..cc9237317fd 100644 --- a/src/plugins/android/sdkmanageroutputparser.cpp +++ b/src/plugins/android/sdkmanageroutputparser.cpp @@ -328,7 +328,7 @@ QPair SdkManagerOutputParser::parseSystemImage(const QString return result; } -BuildTools *SdkManagerOutputParser::parseBuildToolsPackage(const QStringList &data) const +AndroidSdkPackage *SdkManagerOutputParser::parseBuildToolsPackage(const QStringList &data) const { BuildTools *buildTools = nullptr; GenericPackageData packageData; @@ -344,7 +344,7 @@ BuildTools *SdkManagerOutputParser::parseBuildToolsPackage(const QStringList &da return buildTools; } -SdkTools *SdkManagerOutputParser::parseSdkToolsPackage(const QStringList &data) const +AndroidSdkPackage *SdkManagerOutputParser::parseSdkToolsPackage(const QStringList &data) const { SdkTools *sdkTools = nullptr; GenericPackageData packageData; @@ -360,7 +360,7 @@ SdkTools *SdkManagerOutputParser::parseSdkToolsPackage(const QStringList &data) return sdkTools; } -PlatformTools *SdkManagerOutputParser::parsePlatformToolsPackage(const QStringList &data) const +AndroidSdkPackage *SdkManagerOutputParser::parsePlatformToolsPackage(const QStringList &data) const { PlatformTools *platformTools = nullptr; GenericPackageData packageData; @@ -376,7 +376,7 @@ PlatformTools *SdkManagerOutputParser::parsePlatformToolsPackage(const QStringLi return platformTools; } -EmulatorTools *SdkManagerOutputParser::parseEmulatorToolsPackage(const QStringList &data) const +AndroidSdkPackage *SdkManagerOutputParser::parseEmulatorToolsPackage(const QStringList &data) const { EmulatorTools *emulatorTools = nullptr; GenericPackageData packageData; @@ -392,7 +392,7 @@ EmulatorTools *SdkManagerOutputParser::parseEmulatorToolsPackage(const QStringLi return emulatorTools; } -Ndk *SdkManagerOutputParser::parseNdkPackage(const QStringList &data) const +AndroidSdkPackage *SdkManagerOutputParser::parseNdkPackage(const QStringList &data) const { Ndk *ndk = nullptr; GenericPackageData packageData; @@ -408,7 +408,7 @@ Ndk *SdkManagerOutputParser::parseNdkPackage(const QStringList &data) const return ndk; } -ExtraTools *SdkManagerOutputParser::parseExtraToolsPackage(const QStringList &data) const +AndroidSdkPackage *SdkManagerOutputParser::parseExtraToolsPackage(const QStringList &data) const { ExtraTools *extraTools = nullptr; GenericPackageData packageData; @@ -424,7 +424,7 @@ ExtraTools *SdkManagerOutputParser::parseExtraToolsPackage(const QStringList &da return extraTools; } -GenericSdkPackage *SdkManagerOutputParser::parseGenericTools(const QStringList &data) const +AndroidSdkPackage *SdkManagerOutputParser::parseGenericTools(const QStringList &data) const { GenericSdkPackage *sdkPackage = nullptr; GenericPackageData packageData; diff --git a/src/plugins/android/sdkmanageroutputparser.h b/src/plugins/android/sdkmanageroutputparser.h index bb062c4de68..5dd9b23366d 100644 --- a/src/plugins/android/sdkmanageroutputparser.h +++ b/src/plugins/android/sdkmanageroutputparser.h @@ -43,13 +43,13 @@ private: void parsePackageData(MarkerTag packageMarker, const QStringList &data); AndroidSdkPackage *parsePlatform(const QStringList &data) const; QPair parseSystemImage(const QStringList &data) const; - BuildTools *parseBuildToolsPackage(const QStringList &data) const; - SdkTools *parseSdkToolsPackage(const QStringList &data) const; - PlatformTools *parsePlatformToolsPackage(const QStringList &data) const; - EmulatorTools *parseEmulatorToolsPackage(const QStringList &data) const; - Ndk *parseNdkPackage(const QStringList &data) const; - ExtraTools *parseExtraToolsPackage(const QStringList &data) const; - GenericSdkPackage *parseGenericTools(const QStringList &data) const; + AndroidSdkPackage *parseBuildToolsPackage(const QStringList &data) const; + AndroidSdkPackage *parseSdkToolsPackage(const QStringList &data) const; + AndroidSdkPackage *parsePlatformToolsPackage(const QStringList &data) const; + AndroidSdkPackage *parseEmulatorToolsPackage(const QStringList &data) const; + AndroidSdkPackage *parseNdkPackage(const QStringList &data) const; + AndroidSdkPackage *parseExtraToolsPackage(const QStringList &data) const; + AndroidSdkPackage *parseGenericTools(const QStringList &data) const; MarkerTag parseMarkers(const QString &line); MarkerTag m_currentSection = MarkerTag::None; diff --git a/src/plugins/android/sdkmanageroutputparser_test.cpp b/src/plugins/android/sdkmanageroutputparser_test.cpp index e6f7c6f144e..0d689defe72 100644 --- a/src/plugins/android/sdkmanageroutputparser_test.cpp +++ b/src/plugins/android/sdkmanageroutputparser_test.cpp @@ -132,7 +132,7 @@ void SdkManagerOutputParserTest::testParseBuildToolsPackage() QFETCH(QString, displayText); QFETCH(QVersionNumber, revision); - BuildTools *actualBuildTools = m_parser.parseBuildToolsPackage(output); + AndroidSdkPackage *actualBuildTools = m_parser.parseBuildToolsPackage(output); QVERIFY(actualBuildTools != nullptr); QCOMPARE(actualBuildTools->descriptionText(), description); @@ -142,7 +142,7 @@ void SdkManagerOutputParserTest::testParseBuildToolsPackage() void SdkManagerOutputParserTest::testParseBuildToolsPackageEmpty() { - BuildTools *actualBuildTools = m_parser.parseBuildToolsPackage({""}); + AndroidSdkPackage *actualBuildTools = m_parser.parseBuildToolsPackage({""}); QVERIFY(actualBuildTools == nullptr); } @@ -178,7 +178,7 @@ void SdkManagerOutputParserTest::testParseSdkToolsPackage() QFETCH(QString, displayText); QFETCH(QVersionNumber, revision); - std::unique_ptr actualSdkTool(m_parser.parseSdkToolsPackage(output)); + std::unique_ptr actualSdkTool(m_parser.parseSdkToolsPackage(output)); QVERIFY(actualSdkTool != nullptr); QCOMPARE(actualSdkTool->descriptionText(), description); @@ -188,7 +188,7 @@ void SdkManagerOutputParserTest::testParseSdkToolsPackage() void SdkManagerOutputParserTest::testParseSdkToolsPackageEmpty() { - std::unique_ptr actualSdkTool(m_parser.parseSdkToolsPackage({""})); + std::unique_ptr actualSdkTool(m_parser.parseSdkToolsPackage({""})); QVERIFY(actualSdkTool == nullptr); } @@ -217,7 +217,7 @@ void SdkManagerOutputParserTest::testParsePlatformToolsPackage() QFETCH(QString, displayText); QFETCH(QVersionNumber, revision); - std::unique_ptr actualPlatformTool( + std::unique_ptr actualPlatformTool( m_parser.parsePlatformToolsPackage(output)); QVERIFY(actualPlatformTool != nullptr); @@ -228,8 +228,7 @@ void SdkManagerOutputParserTest::testParsePlatformToolsPackage() void SdkManagerOutputParserTest::testParsePlatformToolsPackageEmpty() { - std::unique_ptr actualPlatformTool( - m_parser.parsePlatformToolsPackage({""})); + std::unique_ptr actualPlatformTool(m_parser.parsePlatformToolsPackage({""})); QVERIFY(actualPlatformTool == nullptr); } @@ -256,7 +255,7 @@ void SdkManagerOutputParserTest::testParseEmulatorToolsPackage() QFETCH(QString, displayText); QFETCH(QVersionNumber, revision); - std::unique_ptr actualEmulatorTools( + std::unique_ptr actualEmulatorTools( m_parser.parseEmulatorToolsPackage(output)); QVERIFY(actualEmulatorTools != nullptr); @@ -267,7 +266,7 @@ void SdkManagerOutputParserTest::testParseEmulatorToolsPackage() void SdkManagerOutputParserTest::testParseEmulatorToolsPackageEmpty() { - std::unique_ptr actualEmulatorTools( + std::unique_ptr actualEmulatorTools( m_parser.parseEmulatorToolsPackage({""})); QVERIFY(actualEmulatorTools == nullptr); @@ -296,7 +295,7 @@ void SdkManagerOutputParserTest::testParseNdkPackage() QFETCH(QString, displayText); QFETCH(QVersionNumber, revision); - std::unique_ptr actualNdkPackage(m_parser.parseNdkPackage(output)); + std::unique_ptr actualNdkPackage(m_parser.parseNdkPackage(output)); QVERIFY(actualNdkPackage != nullptr); QCOMPARE(actualNdkPackage->descriptionText(), description); @@ -306,7 +305,7 @@ void SdkManagerOutputParserTest::testParseNdkPackage() void SdkManagerOutputParserTest::testParseNdkPackageEmpty() { - std::unique_ptr actualNdkPackage(m_parser.parseNdkPackage({""})); + std::unique_ptr actualNdkPackage(m_parser.parseNdkPackage({""})); QVERIFY(actualNdkPackage == nullptr); } @@ -338,8 +337,7 @@ void SdkManagerOutputParserTest::testParseExtraToolsPackage() QFETCH(QString, displayText); QFETCH(QVersionNumber, revision); - std::unique_ptr actualExtraTools( - m_parser.parseExtraToolsPackage(output)); + std::unique_ptr actualExtraTools(m_parser.parseExtraToolsPackage(output)); QVERIFY(actualExtraTools != nullptr); QCOMPARE(actualExtraTools->descriptionText(), description); @@ -349,8 +347,7 @@ void SdkManagerOutputParserTest::testParseExtraToolsPackage() void SdkManagerOutputParserTest::testParseExtraToolsPackageEmpty() { - std::unique_ptr actualExtraTools( - m_parser.parseExtraToolsPackage({""})); + std::unique_ptr actualExtraTools(m_parser.parseExtraToolsPackage({""})); QVERIFY(actualExtraTools == nullptr); } @@ -379,8 +376,7 @@ void SdkManagerOutputParserTest::testParseGenericToolsPackage() QFETCH(QString, displayText); QFETCH(QVersionNumber, revision); - std::unique_ptr actualGenericTools( - m_parser.parseGenericTools(output)); + std::unique_ptr actualGenericTools(m_parser.parseGenericTools(output)); QVERIFY(actualGenericTools != nullptr); QCOMPARE(actualGenericTools->descriptionText(), description); @@ -390,8 +386,7 @@ void SdkManagerOutputParserTest::testParseGenericToolsPackage() void SdkManagerOutputParserTest::testParseGenericToolsPackageEmpty() { - std::unique_ptr actualGenericTools( - m_parser.parseGenericTools({""})); + std::unique_ptr actualGenericTools(m_parser.parseGenericTools({""})); QVERIFY(actualGenericTools == nullptr); }