Skip to content
Snippets Groups Projects

Reduce include dependences in GUI; break cyclic dependence between View and Model

Merged Wuttke, Joachim requested to merge sf7 into develop
1 file
+ 8
9
Compare changes
  • Side-by-side
  • Inline
@@ -111,7 +111,6 @@ void ApplicationModels::writeTo(QXmlStreamWriter* writer)
@@ -111,7 +111,6 @@ void ApplicationModels::writeTo(QXmlStreamWriter* writer)
void ApplicationModels::readFrom(QXmlStreamReader* reader, MessageService* messageService)
void ApplicationModels::readFrom(QXmlStreamReader* reader, MessageService* messageService)
{
{
try {
try {
for (auto model : modelList()) {
for (auto model : modelList()) {
if (model->getModelTag() == reader->name()) {
if (model->getModelTag() == reader->name()) {
model->readFrom(reader, messageService);
model->readFrom(reader, messageService);
@@ -147,12 +146,12 @@ QVector<SessionItem*> ApplicationModels::nonXMLItems() const
@@ -147,12 +146,12 @@ QVector<SessionItem*> ApplicationModels::nonXMLItems() const
void ApplicationModels::connectModel(SessionModel* model) const
void ApplicationModels::connectModel(SessionModel* model) const
{
{
if (model) {
if (!model)
connect(model, &SessionModel::dataChanged, this, &ApplicationModels::modelChanged,
return;
Qt::UniqueConnection);
connect(model, &SessionModel::dataChanged, this, &ApplicationModels::modelChanged,
connect(model, &SessionModel::rowsRemoved, this, &ApplicationModels::modelChanged,
Qt::UniqueConnection);
Qt::UniqueConnection);
connect(model, &SessionModel::rowsRemoved, this, &ApplicationModels::modelChanged,
connect(model, &SessionModel::rowsInserted, this, &ApplicationModels::modelChanged,
Qt::UniqueConnection);
Qt::UniqueConnection);
connect(model, &SessionModel::rowsInserted, this, &ApplicationModels::modelChanged,
}
Qt::UniqueConnection);
}
}
Loading