added Path::isHeader2() as a convenience function

Author: firewave

cli/cmdlineparser.cpp

@@ -185,9 +185,7 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
     // Output a warning for the user if he tries to exclude headers
     const std::vector<std::string>& ignored = getIgnoredPaths();
     const bool warn = std::any_of(ignored.cbegin(), ignored.cend(), [](const std::string& i) {
-        bool header;
-        Path::identify(i, &header);
-        return header;
+        return Path::isHeader2(i);
     });
     if (warn) {
         mLogger.printMessage("filename exclusion does not apply to header (.h and .hpp) files.");

gui/resultstree.cpp

@@ -962,9 +962,7 @@ void ResultsTree::recheckSelectedFiles()
                 askFileDir(currentFile);
                 return;
             }
-            bool header = false;
-            Path::identify(currentFile.toStdString(), &header);
-            if (header) {
+            if (Path::isHeader2(currentFile.toStdString())) {
                 if (!data[FILE0].toString().isEmpty() && !selectedItems.contains(data[FILE0].toString())) {
                     selectedItems<<((!mCheckPath.isEmpty() && (data[FILE0].toString().indexOf(mCheckPath) != 0)) ? (mCheckPath + "/" + data[FILE0].toString()) : data[FILE0].toString());
                     if (!selectedItems.contains(fileNameWithCheckPath))

gui/resultsview.cpp

@@ -462,12 +462,8 @@ void ResultsView::updateDetails(const QModelIndex &index)
     QString formattedMsg = message;
 
     const QString file0 = data["file0"].toString();
-    if (!file0.isEmpty()) {
-        bool header = false;
-        Path::identify(data["file"].toString().toStdString(), &header);
-        if (header)
-            formattedMsg += QString("\n\n%1: %2").arg(tr("First included by"), QDir::toNativeSeparators(file0));
-    }
+    if (!file0.isEmpty() && Path::isHeader2(data["file"].toString().toStdString()))
+        formattedMsg += QString("\n\n%1: %2").arg(tr("First included by"), QDir::toNativeSeparators(file0));
 
     if (data["cwe"].toInt() > 0)
         formattedMsg.prepend("CWE: " + QString::number(data["cwe"].toInt()) + "\n");

lib/path.cpp

@@ -270,6 +270,13 @@ Standards::Language Path::identify(const std::string &path, bool *header)
     return Standards::Language::None;
 }
 
+bool Path::isHeader2(const std::string &path)
+{
+    bool header;
+    (void)Path::identify(path, &header);
+    return header;
+}
+
 std::string Path::getAbsoluteFilePath(const std::string& filePath)
 {
     std::string absolute_path;

lib/path.h

@@ -173,10 +173,17 @@ class CPPCHECKLIB Path {
      * @brief Is filename a header based on file extension
      * @param path filename to check. path info is optional
      * @return true if filename extension is meant for headers
-     * @deprecated returns only heuristic result - use @identify() instead
+     * @deprecated returns only heuristic result - use @identify() or @isHeader2() instead
      */
     static DEPRECATED bool isHeader(const std::string &path);
 
+    /**
+     * @brief Is filename a header based on file extension
+     * @param path filename to check. path info is optional
+     * @return true if filename extension is meant for headers
+     */
+    static bool isHeader2(const std::string &path);
+
     /**
      * @brief Identify the language based on the file extension
      * @param path filename to check. path info is optional

test/testpath.cpp

@@ -46,6 +46,7 @@ class TestPath : public TestFixture {
         TEST_CASE(sameFileName);
         TEST_CASE(getFilenameExtension);
         TEST_CASE(identify);
+        TEST_CASE(is_header_2);
     }
 
     void removeQuotationMarks() const {
@@ -361,6 +362,20 @@ class TestPath : public TestFixture {
         ASSERT_EQUALS(Standards::Language::None, Path::identify("index.htm"));
         ASSERT_EQUALS(Standards::Language::None, Path::identify("index.html"));
     }
+
+    void is_header_2() const {
+        ASSERT(Path::isHeader2("index.h"));
+        ASSERT(Path::isHeader2("index.hpp"));
+        ASSERT(Path::isHeader2("index.hxx"));
+        ASSERT(Path::isHeader2("index.h++"));
+        ASSERT(Path::isHeader2("index.hh"));
+
+        ASSERT(Path::isHeader2("index.c")==false);
+        ASSERT(Path::isHeader2("index.cpp")==false);
+        ASSERT(Path::isHeader2("index.header")==false);
+        ASSERT(Path::isHeader2("index.htm")==false);
+        ASSERT(Path::isHeader2("index.html")==false);
+    }
 };
 
 REGISTER_TEST(TestPath)