rename xmlX -> xmlvX

Author: ludviggunne

cli/cmdlineparser.cpp

@@ -1016,14 +1016,14 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 mSettings.outputFormat = Settings::OutputFormat::sarif;
             else if (format == "xml")
                 mSettings.outputFormat = Settings::OutputFormat::xml;
-            else if (format == "xml2") {
+            else if (format == "xmlv2") {
                 mSettings.outputFormat = Settings::OutputFormat::xml;
                 mSettings.xml_version = 2;
-            } else if (format == "xml3") {
+            } else if (format == "xmlv3") {
                 mSettings.outputFormat = Settings::OutputFormat::xml;
                 mSettings.xml_version = 3;
             } else {
-                mLogger.printError("argument to '--output-format=' must be 'text', 'sarif', 'xml' (deprecated), 'xml2' or 'xml3'.");
+                mLogger.printError("argument to '--output-format=' must be 'text', 'sarif', 'xml' (deprecated), 'xmlv2' or 'xmlv3'.");
                 return Result::Fail;
             }
             mSettings.plistOutput = "";
@@ -1839,8 +1839,8 @@ void CmdLineParser::printHelp() const
         "                          * text\n"
         "                          * sarif\n"
         "                          * xml (deprecated)\n"
-        "                          * xml2\n"
-        "                          * xml3\n"
+        "                          * xmlv2\n"
+        "                          * xmlv3\n"
         "    --platform=<type>, --platform=<file>\n"
         "                         Specifies platform specific types and sizes. The\n"
         "                         available builtin platforms are:\n"

test/testcmdlineparser.cpp

@@ -227,8 +227,8 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(outputFormatText);
         TEST_CASE(outputFormatSarif);
         TEST_CASE(outputFormatXml);
-        TEST_CASE(outputFormatXml2);
-        TEST_CASE(outputFormatXml3);
+        TEST_CASE(outputFormatXmlv2);
+        TEST_CASE(outputFormatXmlv3);
         TEST_CASE(outputFormatOther);
         TEST_CASE(outputFormatImplicitPlist);
         TEST_CASE(outputFormatImplicitXml);
@@ -1384,17 +1384,17 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS_ENUM(Settings::OutputFormat::xml, settings->outputFormat);
     }
 
-    void outputFormatXml2() {
+    void outputFormatXmlv2() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--output-format=xml2", "file.cpp"};
+        const char * const argv[] = {"cppcheck", "--output-format=xmlv2", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS_ENUM(Settings::OutputFormat::xml, settings->outputFormat);
         ASSERT_EQUALS(2, settings->xml_version);
     }
 
-    void outputFormatXml3() {
+    void outputFormatXmlv3() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--output-format=xml3", "file.cpp"};
+        const char * const argv[] = {"cppcheck", "--output-format=xmlv3", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS_ENUM(Settings::OutputFormat::xml, settings->outputFormat);
         ASSERT_EQUALS(3, settings->xml_version);
@@ -1404,7 +1404,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--output-format=plist", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--output-format=' must be 'text', 'sarif', 'xml' (deprecated), 'xml2' or 'xml3'.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--output-format=' must be 'text', 'sarif', 'xml' (deprecated), 'xmlv2' or 'xmlv3'.\n", logger->str());
     }
 
     void outputFormatImplicitPlist() {