fixed #13135 - removed deprecated --showtime= value top5 (danmar#5907)

Author: firewave

cli/cmdlineparser.cpp

@@ -1397,10 +1397,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 mSettings.showtime = SHOWTIME_MODES::SHOWTIME_FILE_TOTAL;
             else if (showtimeMode == "summary")
                 mSettings.showtime = SHOWTIME_MODES::SHOWTIME_SUMMARY;
-            else if (showtimeMode == "top5") {
-                mSettings.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_FILE;
-                mLogger.printMessage("--showtime=top5 is deprecated and will be removed in Cppcheck 2.14. Please use --showtime=top5_file or --showtime=top5_summary instead.");
-            }
             else if (showtimeMode == "top5_file")
                 mSettings.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_FILE;
             else if (showtimeMode == "top5_summary")
@@ -1412,7 +1408,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 return Result::Fail;
             }
             else {
-                mLogger.printError("unrecognized --showtime mode: '" + showtimeMode + "'. Supported modes: file, file-total, summary, top5, top5_file, top5_summary.");
+                mLogger.printError("unrecognized --showtime mode: '" + showtimeMode + "'. Supported modes: file, file-total, summary, top5_file, top5_summary.");
                 return Result::Fail;
             }
         }
@@ -1968,8 +1964,6 @@ void CmdLineParser::printHelp() const
         "                                 Show the top 5 for each processed file\n"
         "                          * top5_summary\n"
         "                                 Show the top 5 summary at the end\n"
-        "                          * top5\n"
-        "                                 Alias for top5_file (deprecated)\n"
         "    --std=<id>           Set standard.\n"
         "                         The available options are:\n"
         "                          * c89\n"

man/cppcheck.1.xml

@@ -630,7 +630,6 @@ There are false positives with this option. Each result must be carefully invest
               <glossentry><glossterm>summary</glossterm><glossdef><para>Show a summary at the end</para></glossdef></glossentry>
               <glossentry><glossterm>top5_file</glossterm><glossdef><para>Show the top 5 for each processed file</para></glossdef></glossentry>
               <glossentry><glossterm>top5_summary</glossterm><glossdef><para>Show the top 5 summary at the end</para></glossdef></glossentry>
-              <glossentry><glossterm>top5</glossterm><glossdef><para>Alias for top5_file (deprecated)</para></glossdef></glossentry>
             </glosslist>
           </para>
         </listitem>

releasenotes.txt

@@ -28,4 +28,5 @@ Other:
 - Fix checking a project that contains several project file entries for the same file.
 - Fixed --file-filter matching of looked up files in provided paths.
 - Split up cstyleCast checker; dangerous casts produce portability/warning reports, safe casts produce style reports.
+- Removed deprecated '--showtime=' value 'top5'. Please use 'top5_file' or 'top5_summary' instead.
 -

test/testcmdlineparser.cpp

@@ -2026,9 +2026,8 @@ class TestCmdlineParser : public TestFixture {
     void showtimeTop5() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=top5", "file.cpp"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT(settings->showtime == SHOWTIME_MODES::SHOWTIME_TOP5_FILE);
-        ASSERT_EQUALS("cppcheck: --showtime=top5 is deprecated and will be removed in Cppcheck 2.14. Please use --showtime=top5_file or --showtime=top5_summary instead.\n", logger->str());
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized --showtime mode: 'top5'. Supported modes: file, file-total, summary, top5_file, top5_summary.\n", logger->str());
     }
 
     void showtimeTop5File() {
@@ -2063,7 +2062,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=top10", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: unrecognized --showtime mode: 'top10'. Supported modes: file, file-total, summary, top5, top5_file, top5_summary.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: unrecognized --showtime mode: 'top10'. Supported modes: file, file-total, summary, top5_file, top5_summary.\n", logger->str());
     }
 
     void errorlist() {