1

Author: danmar

gui/CMakeLists.txt

@@ -21,8 +21,9 @@ CheckOptions:
     QT_WRAP_UI(uis_hdrs ${uis})
     QT_ADD_RESOURCES(resources "gui.qrc")
     # TODO: passing "-no-obsolete" here breaks the translations
-    QT_CREATE_TRANSLATION(qms ${CMAKE_CURRENT_SOURCE_DIR} ${tss})
-    list(APPEND cppcheck-gui-deps ${hdrs} ${uis_hdrs} ${resources} ${qms})
+    # TODO fix this, we get updated ts files even if no related changes are made.
+    #QT_CREATE_TRANSLATION(qms ${CMAKE_CURRENT_SOURCE_DIR} ${tss})
+    list(APPEND cppcheck-gui-deps ${hdrs} ${uis_hdrs} ${resources}) # ${qms})
     add_custom_target(gui-build-deps SOURCES ${cppcheck-gui-deps})
 
     list(APPEND cppcheck-gui_SOURCES ${srcs})

gui/cppcheck_de.ts

@@ -1134,10 +1134,17 @@ QPair<bool,Settings> MainWindow::getCppcheckSettings()
 
         result.maxCtuDepth = mProjectFile->getMaxCtuDepth();
         result.maxTemplateRecursion = mProjectFile->getMaxTemplateRecursion();
-        if (mProjectFile->isCheckLevelExhaustive())
-            result.setCheckLevel(Settings::CheckLevel::exhaustive);
-        else
+        switch (mProjectFile->getCheckLevel()) {
+        case ProjectFile::CheckLevel::reduced:
+            result.setCheckLevel(Settings::CheckLevel::reduced);
+            break;
+        case ProjectFile::CheckLevel::normal:
             result.setCheckLevel(Settings::CheckLevel::normal);
+            break;
+        case ProjectFile::CheckLevel::exhaustive:
+            result.setCheckLevel(Settings::CheckLevel::exhaustive);
+            break;
+        };
         result.checkHeaders = mProjectFile->getCheckHeaders();
         result.checkUnusedTemplates = mProjectFile->getCheckUnusedTemplates();
         result.safeChecks.classes = mProjectFile->safeChecks.classes;

gui/cppcheck_es.ts

@@ -151,6 +151,12 @@ bool ProjectFile::read(const QString &filename)
             if (xmlReader.name() == QString(CppcheckXml::CheckLevelExhaustiveElementName))
                 mCheckLevel = CheckLevel::exhaustive;
 
+            if (xmlReader.name() == QString(CppcheckXml::CheckLevelNormalElementName))
+                mCheckLevel = CheckLevel::normal;
+
+            if (xmlReader.name() == QString(CppcheckXml::CheckLevelReducedElementName))
+                mCheckLevel = CheckLevel::reduced;
+
             // Find include directory from inside project element
             if (xmlReader.name() == QString(CppcheckXml::IncludeDirElementName))
                 readIncludeDirs(xmlReader);
@@ -804,11 +810,6 @@ void ProjectFile::setCheckLevel(ProjectFile::CheckLevel checkLevel)
     mCheckLevel = checkLevel;
 }
 
-bool ProjectFile::isCheckLevelExhaustive() const
-{
-    return mCheckLevel == CheckLevel::exhaustive;
-}
-
 void ProjectFile::setWarningTags(std::size_t hash, const QString& tags)
 {
     if (tags.isEmpty())
@@ -1016,6 +1017,11 @@ bool ProjectFile::write(const QString &filename)
         xmlWriter.writeEndElement();
     }
 
+    if (mCheckLevel == CheckLevel::reduced) {
+        xmlWriter.writeStartElement(CppcheckXml::CheckLevelReducedElementName);
+        xmlWriter.writeEndElement();
+    }
+
     // Cppcheck Premium
     if (mBughunting) {
         xmlWriter.writeStartElement(CppcheckXml::BughuntingElementName);

gui/cppcheck_fi.ts

@@ -55,6 +55,7 @@ class ProjectFile : public QObject {
     }
 
     enum class CheckLevel : std::uint8_t {
+        reduced,
         normal,
         exhaustive
     };
@@ -352,7 +353,9 @@ class ProjectFile : public QObject {
 
     /** CheckLevel: normal/exhaustive */
     void setCheckLevel(CheckLevel checkLevel);
-    bool isCheckLevelExhaustive() const;
+    CheckLevel getCheckLevel() const {
+        return mCheckLevel;
+    }
 
     /**
      * @brief Set tags.

gui/cppcheck_fr.ts

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>940</width>
-    <height>701</height>
+    <height>704</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="mTabPathsAndDefines">
       <attribute name="title">
@@ -458,6 +458,13 @@
           <string>Check level</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_18">
+          <item>
+           <widget class="QRadioButton" name="mCheckLevelReduced">
+            <property name="text">
+             <string>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <widget class="QRadioButton" name="mCheckLevelNormal">
             <property name="text">

gui/cppcheck_it.ts

@@ -310,10 +310,17 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
         else
             item->setCheckState(Qt::Unchecked);
     }
-    if (projectFile->isCheckLevelExhaustive())
-        mUI->mCheckLevelExhaustive->setChecked(true);
-    else
+    switch (projectFile->getCheckLevel()) {
+    case ProjectFile::CheckLevel::reduced:
+        mUI->mCheckLevelReduced->setChecked(true);
+        break;
+    case ProjectFile::CheckLevel::normal:
         mUI->mCheckLevelNormal->setChecked(true);
+        break;
+    case ProjectFile::CheckLevel::exhaustive:
+        mUI->mCheckLevelExhaustive->setChecked(true);
+        break;
+    };
     mUI->mCheckHeaders->setChecked(projectFile->getCheckHeaders());
     mUI->mCheckUnusedTemplates->setChecked(projectFile->getCheckUnusedTemplates());
     mUI->mInlineSuppressions->setChecked(projectFile->getInlineSuppression());
@@ -460,7 +467,12 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
     projectFile->setCheckPaths(getCheckPaths());
     projectFile->setExcludedPaths(getExcludedPaths());
     projectFile->setLibraries(getLibraries());
-    projectFile->setCheckLevel(mUI->mCheckLevelExhaustive->isChecked() ? ProjectFile::CheckLevel::exhaustive : ProjectFile::CheckLevel::normal);
+    if (mUI->mCheckLevelReduced->isChecked())
+        projectFile->setCheckLevel(ProjectFile::CheckLevel::reduced);
+    else if (mUI->mCheckLevelNormal->isChecked())
+        projectFile->setCheckLevel(ProjectFile::CheckLevel::normal);
+    else // if (mUI->mCheckLevelExhaustive->isChecked())
+        projectFile->setCheckLevel(ProjectFile::CheckLevel::exhaustive);
     projectFile->clangParser = mUI->mBtnClangParser->isChecked();
     projectFile->safeChecks.classes = mUI->mBtnSafeClasses->isChecked();
     if (mUI->mComboBoxPlatform->currentText().endsWith(".xml"))

gui/cppcheck_ja.ts

@@ -168,6 +168,8 @@ namespace CppcheckXml {
     static constexpr char WarningElementName[] = "warning";
     static constexpr char HashAttributeName[] = "hash";
     static constexpr char CheckLevelExhaustiveElementName[] = "check-level-exhaustive";
+    static constexpr char CheckLevelNormalElementName[] = "check-level-normal";
+    static constexpr char CheckLevelReducedElementName[] = "check-level-reduced";
     static constexpr char CheckHeadersElementName[] = "check-headers";
     static constexpr char CheckUnusedTemplatesElementName[] = "check-unused-templates";
     static constexpr char MaxCtuDepthElementName[] = "max-ctu-depth";

gui/cppcheck_ka.ts

@@ -1086,6 +1086,12 @@ Example usage:
 
 # Check Level
 
+## Reduced
+
+The "reduced" check level performs a limited data flow analysis. If developers
+want to run cppcheck directly during development and require faster results
+than "normal" provides then this reduced checking can be an option.
+
 ## Normal
 
 The "normal" check level is chosen by default. Our aim is that this checking level will provide an effective checking in "reasonable" time.

gui/cppcheck_ko.ts

@@ -10,7 +10,8 @@ GUI:
 -
 
 Changed interface:
--
+-Added `reduced` check level. It can be activated with `--check-level=reduced`. You get faster analysis
+but some fewer results. The motivation is to be able to make analysis time "acceptable" for direct usage.
 
 Deprecations:
 -