Cleanup

Author: vudeam

QtFileCRUD/DateEditDelegate.cpp

@@ -41,7 +41,8 @@ DateEditDelegate::setModelData(QWidget* editor,
 
     auto editorEnrollValue{ dateEdit->date() };
 
-    model->setData(idx, editorEnrollValue); /* data is set using EditRole by default */
+    /* data is set using EditRole by default */
+    model->setData(idx, editorEnrollValue);
 }
 
 void

QtFileCRUD/QtFileCRUD.cpp

@@ -17,8 +17,6 @@ QtFileCRUD::QtFileCRUD(QWidget* parent)
     resize(850, 400);
 
     studentView->setModel(studentModel);
-    // studentView->setSelectionBehavior(QAbstractItemView::SelectRows);
-    // studentView->setSelectionMode(QAbstractItemView::ContiguousSelection);
 
     auto d1{ new SpinBoxDelegate{} };
     studentView->setItemDelegateForColumn(Student::Course, d1);
@@ -28,6 +26,11 @@ QtFileCRUD::QtFileCRUD(QWidget* parent)
 
     setCentralWidget(studentView);
 
+    connect(studentModel, &QAbstractTableModel::rowsRemoved,
+            this, &QtFileCRUD::updateActions);
+    connect(studentModel, &QAbstractTableModel::rowsInserted,
+            this, &QtFileCRUD::updateActions);
+
     createMenus();
     updateActions();
 
@@ -73,7 +76,10 @@ QtFileCRUD::createMenus()
     connect(addAct,
             &QAction::triggered,
             this,
-            [this]() { studentModel->insertRows(studentModel->rowCount(), 1); });
+            [this]()
+            {
+                studentModel->insertRows(studentModel->rowCount(), 1);
+            });
 
     /* Edit -> Remove row(s) */
     removeAct = new QAction{ tr("&Remove row(s)"), this };
@@ -92,11 +98,6 @@ QtFileCRUD::createMenus()
             });
 
     menuBar()->addSeparator();
-
-    connect(studentModel, &QAbstractTableModel::rowsRemoved,
-            this, &QtFileCRUD::updateActions);
-    connect(studentModel, &QAbstractTableModel::rowsInserted,
-            this, &QtFileCRUD::updateActions);
 }
 
 void
@@ -140,8 +141,7 @@ QtFileCRUD::openFile()
     if (studentModel->rowCount() > 0)
     {
         /* clear table (remove all rows from 0 to end) */
-        studentModel->removeRows(0,
-                                 studentModel->rowCount());
+        studentModel->removeRows(0, studentModel->rowCount());
     }
 
     /**
@@ -206,8 +206,7 @@ QtFileCRUD::addStudentEntry(const Student& stud)
 
     const auto insertRow{ studentModel->rowCount() };
 
-    studentModel->insertRows(insertRow,
-                             1);
+    studentModel->insertRows(insertRow, 1);
 
     /* set each column with corrensponding field */
     for (auto field{0}; field <= Student::IsBudget; field++)
@@ -227,8 +226,7 @@ QtFileCRUD::addStudentEntry(const Student& stud)
         case Field::IsBudget:  val = stud.m_isBudget; break;
         }
 
-        studentModel->setData(idx,
-                              val);
+        studentModel->setData(idx, val);
     }
 }
 

QtFileCRUD/QtFileCRUD.hpp

@@ -3,7 +3,6 @@
 
 #include "StudentModel.hpp"
 
-#include <QItemSelection>
 #include <QMainWindow>
 #include <QTableView>
 

QtFileCRUD/StudentModel.cpp

@@ -146,41 +146,15 @@ StudentModel::setData(const QModelIndex& idx,
 
         switch (idx.column())
         {
-        case Field::Name:
-            // studentData[idx.column()].m_name = val.toString();
-            stud.m_name = val.toString();
-            break;
-        case Field::Surname:
-            // studentData[idx.column()].m_surname = val.toString();
-            stud.m_surname = val.toString();
-            break;
-        case Field::LastName:
-            // studentData[idx.column()].m_lastName = val.toString();
-            stud.m_lastName = val.toString();
-            break;
-        case Field::Course:
-            // studentData[idx.column()].m_course = val.toInt();
-            stud.m_course = val.toInt();
-            break;
-        case Field::Enroll:
-            // studentData[idx.column()].m_enroll = QDate::fromString(val.toString(), JSON_DATE_FORMAT);
-            // stud.m_enroll = QDate::fromString(val.toString(), JSON_DATE_FORMAT);
-            stud.m_enroll = val.toDate();
-            break;
-        case Field::Institute:
-            // studentData[idx.column()].m_institute = val.toString();
-            stud.m_institute = val.toString();
-            break;
-        case Field::Chair:
-            // studentData[idx.column()].m_chair = val.toString();
-            stud.m_chair = val.toString();
-            break;
-        case Field::IsBudget:
-            // studentData[idx.column()].m_isBudget = val.toBool();
-            stud.m_isBudget = val.toBool();
-            break;
-        default:
-            return false;
+        case Field::Name:      stud.m_name = val.toString(); break;
+        case Field::Surname:   stud.m_surname = val.toString(); break;
+        case Field::LastName:  stud.m_lastName = val.toString(); break;
+        case Field::Course:    stud.m_course = val.toInt(); break;
+        case Field::Enroll:    stud.m_enroll = val.toDate(); break;
+        case Field::Institute: stud.m_institute = val.toString(); break;
+        case Field::Chair:     stud.m_chair = val.toString(); break;
+        case Field::IsBudget:  stud.m_isBudget = val.toBool(); break;
+        default: return false;
         }
 
         studentData.replace(idx.row(), stud);

QtFileCRUD/main.cpp

@@ -5,7 +5,7 @@
 
 int main(int argc, char* argv[])
 {
-    QApplication app{argc, argv};
+    QApplication app{ argc, argv };
 
     QtFileCRUD window{};
     window.show();