diff --git a/src/gui/models/CMakeLists.txt b/src/gui/models/CMakeLists.txt index a1c5912907..f3acd7055a 100644 --- a/src/gui/models/CMakeLists.txt +++ b/src/gui/models/CMakeLists.txt @@ -8,7 +8,6 @@ set(models_MOC_HDRS configurationModel.h dataManagerSimulationModel.h dissolveModel.h - dissolveModelImageProvider.h enumOptionsModel.h forcefieldModel.h isotopologueSetModel.h @@ -64,6 +63,7 @@ set(models_SRCS dataManagerSimulationModel.cpp dissolveModel.cpp dissolveModelImageProvider.cpp + dissolveModelImageProvider.h enumOptionsModel.cpp expressionVariableVectorModel.cpp externalPotentialModel.cpp @@ -86,6 +86,7 @@ set(models_SRCS pairPotentialModel.cpp procedureModel.cpp procedureModelMimeData.cpp + procedureModelMimeData.h procedureNodeModel.cpp rangeVectorModel.cpp renderableGroupManagerModel.cpp @@ -121,7 +122,6 @@ qt6_wrap_cpp( forcefieldModel.h isotopologueSetModel.h pairPotentialModel.h - procedureModelMimeData.h rangeVectorModel.h speciesAngleModel.h speciesAtomModel.h diff --git a/src/gui/models/forcefieldModel.cpp b/src/gui/models/forcefieldModel.cpp index 7e785850ec..d3ee30119a 100644 --- a/src/gui/models/forcefieldModel.cpp +++ b/src/gui/models/forcefieldModel.cpp @@ -25,6 +25,8 @@ QVariant ForcefieldModel::data(const QModelIndex &index, int role) const return QString::fromStdString(std::string(forcefields_[index.row()]->description())); case RawRole: return QVariant::fromValue(forcefields_[index.row()].get()); + default: + return {}; } } @@ -36,11 +38,3 @@ QHash ForcefieldModel::roleNames() const roles[RawRole] = "raw"; return roles; } - -// QVariant ForcefieldModel::headerData(int section, Qt::Orientation orientation, int role) const { -// return {}; -// } - -// Qt::ItemFlags ForcefieldModel::flags(const QModelIndex &index) const { -// return Qt::ItemIsSelectable | Qt::ItemIsEnabled; -// } diff --git a/src/keywords/enumOptions.h b/src/keywords/enumOptions.h index 318ea8d37d..a38dca6628 100644 --- a/src/keywords/enumOptions.h +++ b/src/keywords/enumOptions.h @@ -113,5 +113,5 @@ template class EnumOptionsKeyword : public EnumOptionsBaseKeyword // Express as a serialisable value SerialisedValue serialise() const override { return optionData_.keyword(data_); } // Read values from a serialisable value - void deserialise(const SerialisedValue &node, const CoreData &coreData) { data_ = optionData_.deserialise(node); } + void deserialise(const SerialisedValue &node, const CoreData &coreData) override { data_ = optionData_.deserialise(node); } };