Using the typedef ModelItemValues for "QHash<int, QVariant>".

data/filehandler.cpp

@@ -40,8 +40,8 @@ QByteArray FileHandler::loadJSONDataFromFile(const QString fileName) {
   return fileContent.second;
 }
 
-QList<QHash<int, QVariant>> FileHandler::getItemValuesFromCSVFile(const QString& filePath) {
+QList<ModelItemValues> FileHandler::getItemValuesFromCSVFile(const QString& filePath) {
-  QList<QHash<int, QVariant>> result;
+  QList<ModelItemValues> result;
   QFile file;
   file.setFileName(filePath);
   if (file.exists()) {

data/filehandler.h

@@ -3,6 +3,8 @@
 
 #include <QVariant>
 
+typedef QHash<int, QVariant> ModelItemValues;
+
 class QJsonDocument;
 class QString;
 class QByteArray;
@@ -14,7 +16,7 @@ class FileHandler {
   static QByteArray loadJSONDataFromFile(const QString fileName);
 
   /// CSV
-  static QList<QHash<int, QVariant>> getItemValuesFromCSVFile(const QString& filePath);
+  static QList<ModelItemValues> getItemValuesFromCSVFile(const QString& filePath);
 
  private:
   explicit FileHandler();

formats/csvparser.cpp

@@ -9,15 +9,15 @@
 
 using namespace rapidcsv;
 
-QList<QHash<int, QVariant>> CsvParser::getItemsFromCSVFile(const QString& fileName) {
+QList<ModelItemValues> CsvParser::getItemsFromCSVFile(const QString& fileName) {
   Document doc(fileName.toStdString());
 
   const bool isCompatible = isCsvCompatible(doc);
   if (isCompatible) {
-    const QList<QHash<int, QVariant>> result = createListItemsFromCsvEntries(doc);
+    const QList<ModelItemValues> result = createListItemsFromCsvEntries(doc);
     return result;
   } else {
-    return QList<QHash<int, QVariant>>();
+    return QList<ModelItemValues>();
   }
 }
 
@@ -47,9 +47,8 @@ bool CsvParser::isCsvCompatible(const rapidcsv::Document& doc) {
   return true;
 }
 
-QList<QHash<int, QVariant>> CsvParser::createListItemsFromCsvEntries(
+QList<ModelItemValues> CsvParser::createListItemsFromCsvEntries(const rapidcsv::Document& doc) {
-    const rapidcsv::Document& doc) {
+  QList<ModelItemValues> result;
-  QList<QHash<int, QVariant>> result;
   const int rowCount               = doc.GetRowCount();
   const QList<QString> headerNames = GET_HEADER_NAMES();
 
@@ -58,7 +57,7 @@ QList<QHash<int, QVariant>> CsvParser::createListItemsFromCsvEntries(
 
   /// get item values for each row
   for (int row = 0; row < rowCount; ++row) {
-    const QHash<int, QVariant> itemValues = getItemValuesForRow(headerNames, columnValueMap, row);
+    const ModelItemValues itemValues = getItemValuesForRow(headerNames, columnValueMap, row);
     result.append(itemValues);
   }
   return result;
@@ -85,11 +84,11 @@ QHash<QString, std::vector<std::string>> CsvParser::extractColumnValues(
   return columnValueMap;
 }
 
-QHash<int, QVariant> CsvParser::getItemValuesForRow(
+ModelItemValues CsvParser::getItemValuesForRow(
     const QList<QString>& headerNames,
     const QHash<QString, std::vector<std::string>>& columnValueMap,
     const int row) {
-  QHash<int, QVariant> result;
+  ModelItemValues result;
   for (const QString& columnName : headerNames) {
     if (!columnValueMap.contains(columnName)) {
       continue;

formats/csvparser.h

@@ -3,23 +3,25 @@
 
 #include <QString>
 
+typedef QHash<int, QVariant> ModelItemValues;
+
 namespace rapidcsv {
 class Document;
 }
 
 class CsvParser {
  public:
-  static QList<QHash<int, QVariant>> getItemsFromCSVFile(const QString& fileName);
+  static QList<ModelItemValues> getItemsFromCSVFile(const QString& fileName);
 
  private:
   explicit CsvParser();
 
   static bool isCsvCompatible(const rapidcsv::Document& doc);
-  static QList<QHash<int, QVariant>> createListItemsFromCsvEntries(const rapidcsv::Document& doc);
+  static QList<ModelItemValues> createListItemsFromCsvEntries(const rapidcsv::Document& doc);
   static QHash<QString, std::vector<std::string>> extractColumnValues(
       const QList<QString> headerNames,
       const rapidcsv::Document& doc);
-  static QHash<int, QVariant> getItemValuesForRow(
+  static ModelItemValues getItemValuesForRow(
       const QList<QString>& headerNames,
       const QHash<QString, std::vector<std::string>>& columnValueMap,
       const int row);

formats/jsonparser.cpp

@@ -5,9 +5,9 @@
 
 #include "../model/metadata.h"
 
-QList<QHash<int, QVariant>> JsonParser::toItemValuesList(const QByteArray& jsonData,
+QList<ModelItemValues> JsonParser::toItemValuesList(const QByteArray& jsonData,
                                                     const QString& objectName) {
-  QList<QHash<int, QVariant>> result;
+  QList<ModelItemValues> result;
 
   if (jsonData.isEmpty()) {
     return result;
@@ -17,13 +17,13 @@ QList<QHash<int, QVariant>> JsonParser::toItemValuesList(const QByteArray& jsonD
 
   foreach (QJsonValue value, itemArray) {
     QJsonObject itemJsonObject = value.toObject();
-    QHash<int, QVariant> values = jsonObjectToItemValues(itemJsonObject);
+    ModelItemValues values     = jsonObjectToItemValues(itemJsonObject);
     result.append(values);
   }
   return result;
 }
 
-QByteArray JsonParser::itemValuesListToJson(const QList<QHash<int, QVariant>>& itemValuesList,
+QByteArray JsonParser::itemValuesListToJson(const QList<ModelItemValues>& itemValuesList,
                                             const QString& objectName) {
   QJsonDocument jsonDoc;
   QJsonObject rootObject;
@@ -72,8 +72,8 @@ QJsonArray JsonParser::extractItemArray(const QByteArray& jsonData, const QStrin
   return itemArray;
 }
 
-QHash<int, QVariant> JsonParser::jsonObjectToItemValues(const QJsonObject& itemJsonObject) {
+ModelItemValues JsonParser::jsonObjectToItemValues(const QJsonObject& itemJsonObject) {
-  QHash<int, QVariant> values;
+  ModelItemValues values;
 
   QListIterator<UserRoles> i(USER_FACING_ROLES);
   while (i.hasNext()) {

formats/jsonparser.h

@@ -8,20 +8,22 @@ class QString;
 class QByteArray;
 class QJsonArray;
 
+typedef QHash<int, QVariant> ModelItemValues;
+
 using namespace std;
 
 class JsonParser {
  public:
-  static QList<QHash<int, QVariant>> toItemValuesList(const QByteArray& jsonData,
+  static QList<ModelItemValues> toItemValuesList(const QByteArray& jsonData,
                                                  const QString& objectName = "");
-  static QByteArray itemValuesListToJson(const QList<QHash<int, QVariant>>& itemValuesList,
+  static QByteArray itemValuesListToJson(const QList<ModelItemValues>& itemValuesList,
                                          const QString& objectName = "");
 
  private:
   explicit JsonParser();
 
   static QJsonArray extractItemArray(const QByteArray& jsonData, const QString& objectName);
-  static QHash<int, QVariant> jsonObjectToItemValues(const QJsonObject& itemJsonObject);
+  static ModelItemValues jsonObjectToItemValues(const QJsonObject& itemJsonObject);
 
   static pair<int, QVariant> getKeyValuePair(const QJsonObject& itemJsonObject, const int role);
 };

genericcore.cpp

@@ -111,8 +111,7 @@ void GenericCore::saveItems() {
 void GenericCore::importCSVFile(const QString& filePath) {
   qInfo() << "importing items from CSV...";
   qDebug() << "filePath:" << filePath;
-  const QList<QHash<int, QVariant>> itemValuesList =
+  const QList<ModelItemValues> itemValuesList = FileHandler::getItemValuesFromCSVFile(filePath);
-      FileHandler::getItemValuesFromCSVFile(filePath);
   // NEXT inform UI on errors
   if (itemValuesList.isEmpty()) {
     qDebug() << "No items found. Doing nothing...";

model/commands/insertrowscommand.cpp

@@ -6,7 +6,7 @@
 
 InsertRowsCommand::InsertRowsCommand(TableModel* model,
                                      int startRow,
-                                   QList<QHash<int, QVariant> > valueList,
+                                     QList<ModelItemValues> valueList,
                                      QUndoCommand* parent)
     : QUndoCommand(parent)
     , m_tableModel(model)

model/commands/insertrowscommand.h

@@ -3,6 +3,8 @@
 
 #include <QUndoCommand>
 
+typedef QHash<int, QVariant> ModelItemValues;
+
 class TableModel;
 
 class InsertRowsCommand : public QUndoCommand {
@@ -12,7 +14,7 @@ class InsertRowsCommand : public QUndoCommand {
   /// unclean undo stack
   InsertRowsCommand(TableModel* model,
                     int startRow,
-                   QList<QHash<int, QVariant> > valueList,
+                    QList<ModelItemValues> valueList,
                     QUndoCommand* parent = nullptr);
 
   /// QUndoCommand interface
@@ -22,7 +24,7 @@ class InsertRowsCommand : public QUndoCommand {
  private:
   TableModel* m_tableModel;
   const int m_startRow;
-  const QList<QHash<int, QVariant> > m_valueList;
+  const QList<ModelItemValues> m_valueList;
 };
 
 #endif  // INSERTROWSCOMMAND_H

model/commands/removerowscommand.cpp

@@ -20,7 +20,7 @@ RemoveRowsCommand::RemoveRowsCommand(TableModel* model,
     const int rowPosition = startRow + row;
     QModelIndex index     = m_tableModel->index(rowPosition, 0);
 
-    QHash<int, QVariant> values = m_tableModel->getItemValues(index);
+    ModelItemValues values = m_tableModel->getItemValues(index);
 
     m_valueList.append(values);
   }

model/commands/removerowscommand.h

@@ -5,6 +5,8 @@
 
 class TableModel;
 
+typedef QHash<int, QVariant> ModelItemValues;
+
 class RemoveRowsCommand : public QUndoCommand {
  public:
   // TODO don't use simple pointer to model
@@ -22,7 +24,7 @@ class RemoveRowsCommand : public QUndoCommand {
  private:
   TableModel* m_tableModel;
   const int m_startRow;
-  QList<QHash<int, QVariant>> m_valueList;
+  QList<ModelItemValues> m_valueList;
 };
 
 #endif  // REMOVEROWSCOMMAND_H

model/modelitem.cpp

@@ -5,7 +5,7 @@
 #include <QJsonObject>
 #include <QJsonValue>
 
-ModelItem::ModelItem(const QHash<int, QVariant> values)
+ModelItem::ModelItem(const ModelItemValues values)
     : m_values(values) {}
 
 QVariant ModelItem::data(int role) const { return m_values.value(role); }

model/modelitem.h

@@ -3,9 +3,11 @@
 
 #include <QVariant>
 
+typedef QHash<int, QVariant> ModelItemValues;
+
 class ModelItem {
  public:
-  ModelItem(const QHash<int, QVariant> values);
+  ModelItem(const ModelItemValues values);
 
   QVariant data(int role) const;
   bool setData(const QVariant& value, int role);

model/tablemodel.cpp

@@ -120,8 +120,8 @@ bool TableModel::setItemData(const QModelIndex& index, const QMap<int, QVariant>
   return false;
 }
 
-QHash<int, QVariant> TableModel::getItemValues(const QModelIndex& index) const {
+ModelItemValues TableModel::getItemValues(const QModelIndex& index) const {
-  QHash<int, QVariant> values;
+  ModelItemValues values;
 
   QListIterator<UserRoles> i(USER_FACING_ROLES);
   while (i.hasNext()) {
@@ -169,14 +169,13 @@ void TableModel::appendItems(const QByteArray& jsonDoc) { insertItems(-1, jsonDo
 void TableModel::insertItems(int startPosition,
                              const QByteArray& jsonDoc,
                              const QModelIndex& parentIndex) {
-  const QList<QHash<int, QVariant>> valueList =
+  const QList<ModelItemValues> valueList = JsonParser::toItemValuesList(jsonDoc, ITEM_KEY_STRING);
-      JsonParser::toItemValuesList(jsonDoc, ITEM_KEY_STRING);
 
   insertItems(startPosition, valueList, parentIndex);
 }
 
 void TableModel::insertItems(int startPosition,
-                             const QList<QHash<int, QVariant>>& itemValuesList,
+                             const QList<ModelItemValues>& itemValuesList,
                              const QModelIndex& parentIndex) {
   qInfo() << "Inserting item(s) into model...";
   if (parentIndex != QModelIndex()) {
@@ -192,7 +191,7 @@ void TableModel::insertItems(int startPosition,
   m_undoStack->push(insertCommand);
 }
 
-void TableModel::execInsertItems(const int firstRow, const QList<QHash<int, QVariant>> valueList) {
+void TableModel::execInsertItems(const int firstRow, const QList<ModelItemValues> valueList) {
   const int nRows = valueList.size();
   qDebug() << "Inserting" << nRows << "items...";
 

model/tablemodel.h

@@ -8,6 +8,8 @@ class ModelItem;
 
 using namespace std;
 
+typedef QHash<int, QVariant> ModelItemValues;
+
 class TableModel : public QAbstractTableModel {
   Q_OBJECT
 
@@ -32,7 +34,7 @@ class TableModel : public QAbstractTableModel {
   bool setData(const QModelIndex& index, const QVariant& value, int role) override;
   bool setItemData(const QModelIndex& index, const QMap<int, QVariant>& roles) override;
 
-  QHash<int, QVariant> getItemValues(const QModelIndex& index) const;
+  ModelItemValues getItemValues(const QModelIndex& index) const;
   QJsonDocument getAllItemsAsJsonDoc() const;
 
  public slots:
@@ -44,7 +46,7 @@ class TableModel : public QAbstractTableModel {
                    const QByteArray& jsonDoc,
                    const QModelIndex& parentIndex = QModelIndex());
   void insertItems(int startPosition,
-                   const QList<QHash<int, QVariant>>& itemValuesList,
+                   const QList<ModelItemValues>& itemValuesList,
                    const QModelIndex& parentIndex = QModelIndex());
 
  private:
@@ -55,7 +57,7 @@ class TableModel : public QAbstractTableModel {
 
   /// *** functions ***
   /// undo/redo functions
-  void execInsertItems(const int firstRow, const QList<QHash<int, QVariant>> valueList);
+  void execInsertItems(const int firstRow, const QList<ModelItemValues> valueList);
   void execRemoveItems(const int firstRow, const int nRows);
   void execEditItemData(const int row, const QMap<int, QVariant>& changedValues);