rectify var name

GUI/Model/Fit/FitParameterModel.cpp

@@ -33,7 +33,7 @@ using boost::polymorphic_downcast;
 using GUI::Session::ItemUtils::ParentRow;
 
 FitParameterModel::FitParameterModel(FitParameterContainerItem* fitParContainer, QObject* parent)
-    : QAbstractItemModel(parent), m_root_item(fitParContainer)
+    : QAbstractItemModel(parent), m_parameterContainer(fitParContainer)
 {
     addColumn(COL_NAME, "Name", "Name of fit parameter");
     addColumn(COL_TYPE, "Type", "Fit parameter limits type");
@@ -43,26 +43,26 @@ FitParameterModel::FitParameterModel(FitParameterContainerItem* fitParContainer,
 
     connectModel(fitParContainer->model());
 
-    m_root_item->mapper()->setOnItemDestroy(
+    m_parameterContainer->mapper()->setOnItemDestroy(
         [this](SessionItem* parentItem) {
-            if (parentItem != m_root_item) {
+            if (parentItem != m_parameterContainer) {
                 throw Error("FitParameterModel::FitParameterModel() -> Error. "
                             "Wrong item reported.");
             }
-            m_root_item = nullptr;
+            m_parameterContainer = nullptr;
         },
         this);
 }
 
 FitParameterModel::~FitParameterModel()
 {
-    if (m_root_item)
-        m_root_item->mapper()->unsubscribe(this);
+    if (m_parameterContainer)
+        m_parameterContainer->mapper()->unsubscribe(this);
 }
 
 Qt::ItemFlags FitParameterModel::flags(const QModelIndex& index) const
 {
-    if (!m_root_item)
+    if (!m_parameterContainer)
         return Qt::NoItemFlags;
 
     Qt::ItemFlags returnVal = Qt::ItemIsEnabled | Qt::ItemIsSelectable;
@@ -91,7 +91,7 @@ Qt::ItemFlags FitParameterModel::flags(const QModelIndex& index) const
 
 QModelIndex FitParameterModel::index(int row, int column, const QModelIndex& parent) const
 {
-    if (!m_root_item || row < 0 || column < 0 || column >= columnCount(QModelIndex())
+    if (!m_parameterContainer || row < 0 || column < 0 || column >= columnCount(QModelIndex())
         || (parent.isValid() && parent.column() != COL_NAME))
         return QModelIndex();
 
@@ -138,7 +138,7 @@ QModelIndex FitParameterModel::index(int row, int column, const QModelIndex& par
 
 QModelIndex FitParameterModel::parent(const QModelIndex& child) const
 {
-    if (!m_root_item)
+    if (!m_parameterContainer)
         return QModelIndex();
 
     if (!child.isValid())
@@ -161,14 +161,14 @@ QModelIndex FitParameterModel::parent(const QModelIndex& child) const
 
 int FitParameterModel::rowCount(const QModelIndex& parent) const
 {
-    if (!m_root_item)
+    if (!m_parameterContainer)
         return 0;
 
     if (parent.isValid() && parent.column() != COL_NAME)
         return 0;
 
     SessionItem* parent_item = itemForIndex(parent);
-    if (parent_item != m_root_item && !isValidSourceItem(parent_item))
+    if (parent_item != m_parameterContainer && !isValidSourceItem(parent_item))
         return 0;
 
     if (parent_item->hasModelType<FitParameterContainerItem>())
@@ -180,7 +180,7 @@ int FitParameterModel::rowCount(const QModelIndex& parent) const
 
 int FitParameterModel::columnCount(const QModelIndex& parent) const
 {
-    if (!m_root_item)
+    if (!m_parameterContainer)
         return 0;
 
     if (parent.isValid() && parent.column() != COL_NAME)
@@ -200,7 +200,7 @@ int FitParameterModel::columnCount(const QModelIndex& parent) const
 
 QVariant FitParameterModel::data(const QModelIndex& index, int role) const
 {
-    if (!m_root_item)
+    if (!m_parameterContainer)
         return QVariant();
 
     if (!index.isValid() || index.column() < 0 || index.column() >= NUM_COLUMNS)
@@ -222,7 +222,7 @@ QVariant FitParameterModel::data(const QModelIndex& index, int role) const
 
 bool FitParameterModel::setData(const QModelIndex& index, const QVariant& value, int role)
 {
-    if (!m_root_item)
+    if (!m_parameterContainer)
         return false;
 
     if (!index.isValid())
@@ -251,7 +251,7 @@ QMimeData* FitParameterModel::mimeData(const QModelIndexList& indexes) const
     if (index.isValid()) {
         if (SessionItem* item = itemForIndex(index)) {
             QString path = item->value().toString();
-            auto* parameterItem = FitParameterHelper::getParameterItem(m_root_item, path);
+            auto* parameterItem = FitParameterHelper::getParameterItem(m_parameterContainer, path);
             QByteArray data;
             data.setNum(reinterpret_cast<qlonglong>(parameterItem));
             mimeData->setData(GUI::Session::XML::LinkMimeType, data);
@@ -287,13 +287,13 @@ bool FitParameterModel::dropMimeData(const QMimeData* data, Qt::DropAction actio
             ParameterItem* parItem = reinterpret_cast<ParameterItem*>(
                 data->data(GUI::Session::XML::LinkMimeType).toULongLong());
             ASSERT(parItem);
-            m_root_item->addToFitParameter(parItem, fitParItem->displayName());
+            m_parameterContainer->addToFitParameter(parItem, fitParItem->displayName());
         }
     } else {
         ParameterItem* parItem = reinterpret_cast<ParameterItem*>(
             data->data(GUI::Session::XML::LinkMimeType).toULongLong());
         ASSERT(parItem);
-        m_root_item->createFitParameter(parItem);
+        m_parameterContainer->createFitParameter(parItem);
     }
     return true;
 }
@@ -334,7 +334,7 @@ void FitParameterModel::onSourceRowsRemoved(const QModelIndex& parent, int first
 
 void FitParameterModel::onSourceAboutToBeReset()
 {
-    if (!m_root_item)
+    if (!m_parameterContainer)
         return;
     beginResetModel();
     endResetModel();
@@ -369,7 +369,7 @@ void FitParameterModel::addColumn(FitParameterModel::EColumn id, const QString&
 
 QModelIndex FitParameterModel::indexOfItem(SessionItem* item) const
 {
-    if (!m_root_item)
+    if (!m_parameterContainer)
         return QModelIndex();
 
     if (SessionItem* parent_item = item->parent()) {
@@ -401,7 +401,7 @@ QModelIndex FitParameterModel::indexOfItem(SessionItem* item) const
 
 SessionItem* FitParameterModel::itemForIndex(const QModelIndex& index) const
 {
-    if (!m_root_item)
+    if (!m_parameterContainer)
         return nullptr;
 
     if (index.isValid()) {
@@ -412,21 +412,22 @@ SessionItem* FitParameterModel::itemForIndex(const QModelIndex& index) const
             return item;
         }
     }
-    return m_root_item;
+    return m_parameterContainer;
 }
 
 SessionModel* FitParameterModel::sourceModel() const
 {
-    ASSERT(m_root_item);
-    return m_root_item->model();
+    ASSERT(m_parameterContainer);
+    return m_parameterContainer->model();
 }
 
 //! Returns true if given item still exists in source model
 bool FitParameterModel::isValidSourceItem(SessionItem* item) const
 {
-    if (item == m_root_item)
+    if (item == m_parameterContainer)
         return true;
-    if (sourceModel() && GUI::Model::Path::isValidItem(sourceModel(), item, m_root_item->index()))
+    if (sourceModel()
+        && GUI::Model::Path::isValidItem(sourceModel(), item, m_parameterContainer->index()))
         return true;
     return false;
 }

GUI/Model/Fit/FitParameterModel.h

@@ -70,7 +70,7 @@ private:
     void connectModel(QAbstractItemModel* sourceModel, bool isConnect = true) const;
     void addColumn(EColumn id, const QString& name, const QString& tooltip);
 
-    FitParameterContainerItem* m_root_item;
+    FitParameterContainerItem* m_parameterContainer;
     QMap<int, QString> m_columnNames;
     QMap<int, QString> m_columnToolTips;
 };