Clang static code analyzer suggestions.

GUI/coregui/Models/FitParameterHelper.cpp

@@ -124,7 +124,7 @@ ParameterItem *FitParameterHelper::getParameterItem(FitParameterContainerItem *c
     while (cur && cur->modelType() != Constants::JobItemType) {
         cur = cur->parent();
     }
-    Q_ASSERT(cur->modelType() == Constants::JobItemType);
+    Q_ASSERT(cur && cur->modelType() == Constants::JobItemType);
     JobItem *jobItem = dynamic_cast<JobItem *>(cur);
     Q_ASSERT(jobItem);
     return dynamic_cast<ParameterItem *>(

GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.cpp

@@ -190,9 +190,8 @@ void PythonSyntaxHighlighter::highlightBlock(const QString &text)
     setCurrentBlockState(0);
 
     // Do multi-line strings
-    bool isInMultilne = matchMultiline(text, triSingleQuote, 1, basicStyles.value("string2"));
-    if (!isInMultilne)
-        isInMultilne = matchMultiline(text, triDoubleQuote, 2, basicStyles.value("string2"));
+    if(!matchMultiline(text, triSingleQuote, 1, basicStyles.value("string2")))
+        matchMultiline(text, triDoubleQuote, 2, basicStyles.value("string2"));
 }
 
 bool PythonSyntaxHighlighter::matchMultiline(const QString &text, const QRegExp &delimiter,

GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp

@@ -106,10 +106,10 @@ void RectangularDetectorWidget::setColumnResizer(ColumnResizer* columnResizer)
     if (m_columnResizer) {
         connect(m_columnResizer, SIGNAL(destroyed(QObject*)), this,
                 SLOT(onColumnResizerDestroyed(QObject*)));
+        m_columnResizer->addWidgetsFromGridLayout(m_gridLayout, 0);
+        m_columnResizer->addWidgetsFromGridLayout(m_gridLayout, 1);
+        m_columnResizer->addWidgetsFromGridLayout(m_gridLayout, 2);
     }
-    m_columnResizer->addWidgetsFromGridLayout(m_gridLayout, 0);
-    m_columnResizer->addWidgetsFromGridLayout(m_gridLayout, 1);
-    m_columnResizer->addWidgetsFromGridLayout(m_gridLayout, 2);
 }
 
 //! create various editors to hold RectangularDetector properties