...

.clang-tidy

@@ -108,6 +108,7 @@ Checks: '*,
 -misc-non-private-member-variables-in-classes,
 -modernize-loop-convert,
 -modernize-pass-by-value,
+-modernize-raw-string-literal,
 -modernize-use-default-member-init,
 -modernize-use-using,
 -readability-avoid-const-params-in-decl,
@@ -116,7 +117,6 @@ Checks: '*,
 -readability-inconsistent-declaration-parameter-name,
 -readability-qualified-auto,
 
-
 -SectionComment_Temporarily_disabled_checks__We_need_to_investigate_them_one_by_one,
 
 

GUI/View/Fit/FitSessionWidget.cpp

@@ -66,8 +66,8 @@ void FitSessionWidget::setModelTuningWidget(ParameterTuningWidget* tuningWidget)
 void FitSessionWidget::setSessionController(FitSessionController* sessionController)
 {
     if (m_sessionController) {
-        disconnect(m_sessionController, 0, this, 0);
-        disconnect(m_controlWidget, 0, m_sessionController, 0);
+        disconnect(m_sessionController, nullptr, this, nullptr);
+        disconnect(m_controlWidget, nullptr, m_sessionController, nullptr);
     }
 
     m_sessionController = sessionController;

GUI/View/Fit/JobRealTimeWidget.cpp

@@ -60,7 +60,6 @@ void JobRealTimeWidget::setItem(JobItem* jobItem)
         m_stackedWidget->hideWidgets();
         return;
     }
-
     m_stackedWidget->setItem(jobItem);
 }
 
@@ -68,8 +67,5 @@ void JobRealTimeWidget::setItem(JobItem* jobItem)
 
 bool JobRealTimeWidget::isValidJobItem(JobItem* item)
 {
-    if (item && (item->isCompleted() || item->isCanceled() || item->isFailed()))
-        return true;
-
-    return false;
+    return item && (item->isCompleted() || item->isCanceled() || item->isFailed());
 }

GUI/View/Fit/ParameterTuningDelegate.cpp

@@ -134,7 +134,7 @@ QWidget* ParameterTuningDelegate::createEditor(QWidget* parent, const QStyleOpti
     if (index.column() != m_valueColumn)
         return QItemDelegate::createEditor(parent, option, index);
 
-    if (index.parent().isValid() == false)
+    if (!index.parent().isValid())
         return nullptr;
 
     QVariant data = index.model()->data(index, Qt::EditRole);

GUI/View/Info/CautionSign.cpp

@@ -83,7 +83,7 @@ void CautionSign::setArea(QWidget* area)
 
 bool CautionSign::isShown() const
 {
-    return (m_cautionWidget == nullptr ? false : true);
+    return m_cautionWidget != nullptr;
 }
 
 bool CautionSign::eventFilter(QObject* obj, QEvent* event)

GUI/View/Info/PythonSyntaxHighlighter.cpp

@@ -232,7 +232,7 @@ bool PythonSyntaxHighlighter::matchMultiline(const QString& text, const QRegExp&
     return currentBlockState() == inState;
 }
 
-const QTextCharFormat PythonSyntaxHighlighter::getTextCharFormat(const QString& colorName,
+QTextCharFormat PythonSyntaxHighlighter::getTextCharFormat(const QString& colorName,
                                                                  const QString& style)
 {
     QTextCharFormat charFormat;

GUI/View/Info/PythonSyntaxHighlighter.h

@@ -79,7 +79,7 @@ private:
     // multi-line section.
     bool matchMultiline(const QString& text, const QRegExp& delimiter, const int inState,
                         const QTextCharFormat& style);
-    const QTextCharFormat getTextCharFormat(const QString& colorName, const QString& style = "");
+    QTextCharFormat getTextCharFormat(const QString& colorName, const QString& style = "");
 
     QList<HighlightingRule> rules;
     QRegExp triSingleQuote;

GUI/View/Instrument/InstrumentListModel.cpp

@@ -16,44 +16,36 @@
 #include "GUI/Model/Instrument/InstrumentItems.h"
 #include "GUI/Model/Instrument/InstrumentModel.h"
 
-
-//--------------------------------------------------------------------------------------------------
-// free functions
-//--------------------------------------------------------------------------------------------------
+namespace {
 
 /// Get the default name for an instrument (i.e. the name a newly created instrument should get)
-template <typename T> const QString defaultInstrumentName()
+template <typename T> QString defaultInstrumentName()
 {
     return "Untitled";
 }
 
-template <> const QString defaultInstrumentName<SpecularInstrumentItem>()
+template <> QString defaultInstrumentName<SpecularInstrumentItem>()
 {
     return "Specular";
 }
 
-template <> const QString defaultInstrumentName<DepthProbeInstrumentItem>()
+template <> QString defaultInstrumentName<DepthProbeInstrumentItem>()
 {
     return "DepthProbe";
 }
 
-template <> const QString defaultInstrumentName<GISASInstrumentItem>()
+template <> QString defaultInstrumentName<GISASInstrumentItem>()
 {
     return "GISAS";
 }
 
-template <> const QString defaultInstrumentName<OffSpecularInstrumentItem>()
+template <> QString defaultInstrumentName<OffSpecularInstrumentItem>()
 {
     return "OffSpecular";
 }
 
-//==================================================================================================
-// InstrumentListModel
-//==================================================================================================
+} // namespace
 
-//--------------------------------------------------------------------------------------------------
-// public member functions
-//--------------------------------------------------------------------------------------------------
 
 InstrumentListModel::InstrumentListModel(InstrumentModel* instruments, QObject* parent)
     : QAbstractListModel(parent), m_instruments(instruments)
@@ -166,10 +158,6 @@ QModelIndex InstrumentListModel::copyInstrument(const InstrumentItem* source)
     return m_instruments->indexOfItem(copy);
 }
 
-//--------------------------------------------------------------------------------------------------
-// private member functions
-//--------------------------------------------------------------------------------------------------
-
 template <class Instrument> QModelIndex InstrumentListModel::addNewInstrument()
 {
     QString name = m_instruments->suggestInstrumentName(defaultInstrumentName<Instrument>());

GUI/View/Instrument/ResolutionFunctionEditor.cpp

@@ -24,7 +24,7 @@
 
 namespace {
 
-const QString unitString(const ResolutionFunctionEditor::Unit unit)
+QString unitString(const ResolutionFunctionEditor::Unit unit)
 {
     switch (unit) {
     case ResolutionFunctionEditor::Degree:
@@ -44,7 +44,7 @@ const QString unitString(const ResolutionFunctionEditor::Unit unit)
 /// form for the parameters of the gauss 2D resolution function
 class GaussResolutionFunctionForm : public QWidget {
 public:
-    GaussResolutionFunctionForm(const ResolutionFunctionEditor::Unit unit,
+    GaussResolutionFunctionForm(ResolutionFunctionEditor::Unit unit,
                                 QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
     void setItem(ResolutionFunction2DGaussianItem* item);