SessionModel ..

GUI/Model/Session/SessionModel.cpp

@@ -59,21 +59,18 @@ Qt::ItemFlags SessionModel::flags(const QModelIndex& index) const
             && item->isEditable() && item->isEnabled())
             result_flags |= Qt::ItemIsEditable;
         QVector<QString> acceptable_child_items = acceptableDefaultItemTypes(index);
-        if (acceptable_child_items.contains(m_dragged_item_type)) {
+        if (acceptable_child_items.contains(m_dragged_item_type))
             result_flags |= Qt::ItemIsDropEnabled;
-        }
-    } else {
+    } else
         result_flags |= Qt::ItemIsDropEnabled;
-    }
     return result_flags;
 }
 
 QVariant SessionModel::data(const QModelIndex& index, int role) const
 {
     if (!m_root_item || !index.isValid() || index.column() < 0
-        || index.column() >= columnCount(QModelIndex())) {
-        return QVariant();
-    }
+        || index.column() >= columnCount(QModelIndex()))
+        return {};
     if (SessionItem* item = itemForIndex(index)) {
         if (role == Qt::DisplayRole || role == Qt::EditRole) {
             if (index.column() == SessionFlags::ITEM_VALUE)
@@ -86,24 +83,24 @@ QVariant SessionModel::data(const QModelIndex& index, int role) const
             return GUI::Session::ItemUtils::ForegroundRole(*item);
         } else if (role == Qt::CheckStateRole && index.column() == SessionFlags::ITEM_VALUE) {
             return GUI::Session::ItemUtils::CheckStateRole(*item);
-        } else {
+        } else
             return item->roleProperty(role);
-        }
     }
-    return QVariant();
+    return {};
 }
 
 QVariant SessionModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
-    if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
-        switch (section) {
-        case SessionFlags::ITEM_NAME:
-            return "Name";
-        case SessionFlags::ITEM_VALUE:
-            return "Value";
-        }
+    if (orientation != Qt::Horizontal || role != Qt::DisplayRole)
+        return {};
+    switch (section) {
+    case SessionFlags::ITEM_NAME:
+        return "Name";
+    case SessionFlags::ITEM_VALUE:
+        return "Value";
+    default:
+        return {};
     }
-    return QVariant();
 }
 
 int SessionModel::rowCount(const QModelIndex& parent) const
@@ -143,7 +140,6 @@ QModelIndex SessionModel::parent(const QModelIndex& child) const
         if (SessionItem* parent_item = child_item->parent()) {
             if (parent_item == m_root_item)
                 return QModelIndex();
-
             return createIndex(GUI::Session::ItemUtils::ParentRow(*parent_item), 0, parent_item);
         }
     }
@@ -271,12 +267,10 @@ SessionItem* SessionModel::insertNewItem(QString model_type, SessionItem* parent
     }
 
     SessionItem* new_item = GUI::Model::ItemFactory::CreateItem(model_type);
+    ASSERT(new_item);
 
-    if (!new_item)
-        throw Error("SessionModel::insertNewItem() -> Wrong model type " + model_type);
-
-    if (!parent_item->insertItem(row, new_item, tag))
-        throw Error("SessionModel::insertNewItem -> Error. Can't insert item");
+    const auto success = parent_item->insertItem(row, new_item, tag);
+    ASSERT(success);
 
     return new_item;
 }