suppress pragma once diagnostics on header files

hicknhack-software · Nov 7, 2020 · fc24ac3 · fc24ac3
1 parent 0b1807e
commit fc24ac3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -455,6 +455,7 @@ class FileOptionsBuilder
 
         addLanguageOptions();
         addGlobalDiagnosticOptions(); // Before addDiagnosticOptions() so users still can overwrite.
+        if (filePath.endsWith(".h")) addHeaderDiagnosticOptions();
         addDiagnosticOptions();
         addGlobalOptions();
         addPrecompiledHeaderOptions();
@@ -519,6 +520,10 @@ class FileOptionsBuilder
     {
         m_options += CppTools::ClangDiagnosticConfigsModel::globalDiagnosticOptions();
     }
+    void addHeaderDiagnosticOptions()
+    {
+        m_options += QStringLiteral("-Wno-pragma-once-outside-header");
+    }
 
     void addGlobalOptions()
     {

diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp
@@ -64,6 +64,13 @@ static QStringList tidyChecksArguments(const ClangDiagnosticConfig diagnosticCon
     return {"--warnings-as-errors=-*"};
 }
 
+static QStringList clangHeaderArguments(const QString file) {
+    if (file.endsWith(".h")) {
+        return {"-Wno-pragma-once-outside-header"};
+    }
+    else return {};
+}
+
 static QStringList clazyChecksArguments(const ClangDiagnosticConfig diagnosticConfig)
 {
     const QString clazyChecks = diagnosticConfig.clazyChecks();
@@ -97,6 +104,7 @@ ClangTidyRunner::ClangTidyRunner(const ClangDiagnosticConfig &config, QObject *p
         return QStringList() << tidyChecksArguments(config)
                              << mainToolArguments()
                              << "--"
+                             << clangHeaderArguments(fileToAnalyze())
                              << clangArguments(config, baseOptions);
     });
 }
@@ -111,6 +119,7 @@ ClazyStandaloneRunner::ClazyStandaloneRunner(const ClangDiagnosticConfig &config
         return QStringList() << clazyChecksArguments(config)
                              << mainToolArguments()
                              << "--"
+                             << clangHeaderArguments(fileToAnalyze())
                              << clangArguments(config, baseOptions);
     });
 }