bent/GenericQtClientCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using "model/metadata.h" for file and JSON object naming as well. Using all upper case for naming static meta data constants and functions.

Browse Source
This commit is contained in:
Bent Witthold
2025-12-29 10:35:00 +01:00
parent 0c3d711513
commit 3610aa3841
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
model/tablemodel.cpp
View File

@ -28,7 +28,7 @@ QByteArray TableModel::generateExampleItems() {
array.append(itemObject);
}
rootObject.insert("items", array);
rootObject.insert(ITEM_KEY_STRING, array);
doc.setObject(rootObject);
return doc.toJson();
@ -65,7 +65,7 @@ QVariant TableModel::data(const QModelIndex& index, int role) const {
return QVariant();
}
int roleForColumn = getRoleForColumn(column);
int roleForColumn = GET_ROLE_FOR_COLUMN(column);
switch (role) {
case Qt::DisplayRole:
case Qt::EditRole:
@ -84,7 +84,7 @@ QVariant TableModel::data(const QModelIndex& index, int role) const {
QVariant TableModel::headerData(int section, Qt::Orientation orientation, int role) const {
if (role == Qt::DisplayRole) {
if (orientation == Qt::Horizontal) {
const int columnRole = getRoleForColumn(section);
const int columnRole = GET_ROLE_FOR_COLUMN(section);
const QString headerName = ROLE_NAMES.value(columnRole);
return QString("%1").arg(headerName);
} else {
@ -97,7 +97,7 @@ QVariant TableModel::headerData(int section, Qt::Orientation orientation, int ro
bool TableModel::setData(const QModelIndex& index, const QVariant& value, int role) {
if (role == Qt::EditRole && checkIndex(index)) {
const int column = index.column();
const int roleForColumn = getRoleForColumn(column);
const int roleForColumn = GET_ROLE_FOR_COLUMN(column);
return setItemData(index, {{roleForColumn, value}});
}
return false;
@ -129,7 +129,7 @@ QJsonDocument TableModel::getAllItemsAsJsonDoc() const {
QJsonObject itemObject = item->toJsonObject();
array.append(itemObject);
}
rootObject.insert("items", array);
rootObject.insert(ITEM_KEY_STRING, array);
doc.setObject(rootObject);
return doc;
@ -167,7 +167,7 @@ void TableModel::insertItems(int startPosition,
startPosition = m_items.size();
}
QList<QHash<int, QVariant>> valueList = JsonParser::toItemValuesList(jsonDoc, "items");
QList<QHash<int, QVariant>> valueList = JsonParser::toItemValuesList(jsonDoc, ITEM_KEY_STRING);
InsertRowsCommand* insertCommand = new InsertRowsCommand(this, startPosition, valueList);
m_undoStack->push(insertCommand);
@ -237,7 +237,7 @@ QMap<int, QVariant> TableModel::onlyChangedValues(const QModelIndex& index,
bool TableModel::isEmptyValueEqualToZero(const int role) const {
const QString roleName = ROLE_NAMES.value(role);
if (intColumns.contains(roleName)) {
if (INT_COLUMNS.contains(roleName)) {
return true;
}
return false;