Merge branch 'InternalErrors'

gui/common.h

@@ -48,6 +48,7 @@ ShowTypes;
 #define SETTINGS_CHECK_THREADS          "Check threads"
 #define SETTINGS_SHOW_FULL_PATH         "Show full path"
 #define SETTINGS_SHOW_NO_ERRORS         "Show no errors message"
+#define SETTINGS_SHOW_DEBUG_WARNINGS    "Show debug warnings"
 #define SETTINGS_SAVE_ALL_ERRORS        "Save all errors"
 #define SETTINGS_SAVE_FULL_PATH         "Save full path"
 #define SETTINGS_CHECK_DIALOG_WIDTH     "Check dialog width"

gui/erroritem.cpp

@@ -37,3 +37,12 @@ ErrorItem::ErrorItem(const ErrorLine &line)
     severity = line.severity;
     msg = line.msg;
 }
+
+QString ErrorItem::ToString() const
+{
+    QString str = file + " - " + id + " - " + severity +"\n";
+    str += "  " + msg;
+    for (int i = 0; i < files.size(); i++)
+        str += "  " + files[i] + ": " + lines[i] + "\n";
+    return str;
+}

gui/erroritem.h

@@ -39,6 +39,12 @@ public:
     ErrorItem(const ErrorLine &line);
     ~ErrorItem() { }
 
+    /**
+    * @brief Convert error item to string.
+    * @return Error item as string.
+    */
+    QString ToString() const;
+
     QString file;
     QStringList files;
     QList<unsigned int> lines;

gui/mainwindow.cpp

@@ -361,7 +361,7 @@ Settings MainWindow::GetCppcheckSettings()
     }
 
     result.debug = false;
-    result.debugwarnings = false;
+    result.debugwarnings = mSettings->value(SETTINGS_SHOW_DEBUG_WARNINGS, 0).toBool();
     result._checkCodingStyle = true;
     result._errorsOnly = false;
     result._verbose = true;
@@ -819,6 +819,14 @@ void MainWindow::Log(const QString &logline)
     }
 }
 
+void MainWindow::DebugError(const ErrorItem &item)
+{
+    if (mLogView)
+    {
+        mLogView->AppendLine(item.ToString());
+    }
+}
+
 void MainWindow::EnableProjectActions(bool enable)
 {
     mUI.mActionCloseProjectFile->setEnabled(enable);

gui/mainwindow.h

@@ -36,6 +36,7 @@ class ThreadHandler;
 class LogView;
 class HelpWindow;
 class Project;
+class ErrorItem;
 
 /// @addtogroup GUI
 /// @{
@@ -218,6 +219,12 @@ protected slots:
     */
     void Log(const QString &logline);
 
+    /**
+    * @brief Handle new debug error.
+    *
+    */
+    void DebugError(const ErrorItem &item);
+
 protected:
 
     /**

gui/settings.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>589</width>
-    <height>274</height>
+    <height>281</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -61,6 +61,13 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QCheckBox" name="mShowDebugWarnings">
+           <property name="text">
+            <string>Show internal warnings in log</string>
+           </property>
+          </widget>
+         </item>
          <item>
           <spacer name="verticalSpacer_2">
            <property name="orientation">
@@ -164,6 +171,22 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>mJobs</tabstop>
+  <tabstop>mForce</tabstop>
+  <tabstop>mShowFullPath</tabstop>
+  <tabstop>mShowNoErrorsMessage</tabstop>
+  <tabstop>mShowDebugWarnings</tabstop>
+  <tabstop>mListWidget</tabstop>
+  <tabstop>mButtonAdd</tabstop>
+  <tabstop>mButtonDelete</tabstop>
+  <tabstop>mButtonModify</tabstop>
+  <tabstop>mButtonDefault</tabstop>
+  <tabstop>mSaveAllErrors</tabstop>
+  <tabstop>mSaveFullPath</tabstop>
+  <tabstop>mButtons</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>

gui/settingsdialog.cpp

@@ -46,7 +46,7 @@ SettingsDialog::SettingsDialog(QSettings *programSettings,
     mUI.mForce->setCheckState(BoolToCheckState(programSettings->value(SETTINGS_CHECK_FORCE, false).toBool()));
     mUI.mShowFullPath->setCheckState(BoolToCheckState(programSettings->value(SETTINGS_SHOW_FULL_PATH, false).toBool()));
     mUI.mShowNoErrorsMessage->setCheckState(BoolToCheckState(programSettings->value(SETTINGS_SHOW_NO_ERRORS, false).toBool()));
-
+    mUI.mShowDebugWarnings->setCheckState(BoolToCheckState(programSettings->value(SETTINGS_SHOW_DEBUG_WARNINGS, false).toBool()));
 
     connect(mUI.mButtonAdd, SIGNAL(clicked()),
             this, SLOT(AddApplication()));
@@ -122,6 +122,7 @@ void SettingsDialog::SaveCheckboxValues()
     SaveCheckboxValue(mUI.mSaveFullPath, SETTINGS_SAVE_FULL_PATH);
     SaveCheckboxValue(mUI.mShowFullPath, SETTINGS_SHOW_FULL_PATH);
     SaveCheckboxValue(mUI.mShowNoErrorsMessage, SETTINGS_SHOW_NO_ERRORS);
+    SaveCheckboxValue(mUI.mShowDebugWarnings, SETTINGS_SHOW_DEBUG_WARNINGS);
 }
 
 void SettingsDialog::SaveCheckboxValue(QCheckBox *box, const QString &name)

gui/threadhandler.cpp

@@ -146,6 +146,9 @@ void ThreadHandler::Initialize(ResultsView *view)
 
     connect(&mResults, SIGNAL(Log(const QString &)),
             parent(), SLOT(Log(const QString &)));
+
+    connect(&mResults, SIGNAL(Error(const ErrorItem &)),
+            parent(), SLOT(Error(const ErrorItem &)));
 }
 
 void ThreadHandler::LoadSettings(QSettings &settings)

gui/threadresult.cpp

@@ -71,7 +71,10 @@ void ThreadResult::reportErr(const ErrorLogger::ErrorMessage &msg)
     item.msg = QString(msg._msg.c_str());
     item.severity = QString::fromStdString(Severity::toString(msg._severity));
 
-    emit Error(item);
+    if (msg._severity != Severity::debug)
+        emit Error(item);
+    else
+        emit DebugError(item);
 }
 
 QString ThreadResult::GetNextFile()

gui/threadresult.h

@@ -100,6 +100,13 @@ signals:
     */
     void Log(const QString &logline);
 
+    /**
+    * @brief Signal of a debug error
+    *
+    * @param item Error data
+    */
+    void DebugError(const ErrorItem &item);
+
 protected:
 
     /**