From eca7d998e102ee10fc5a765a2b8d4a2176a5e2f5 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Tue, 16 Jun 2015 14:37:02 +0200 Subject: Set up signalling to display notes in planner again. This got broken in a recent transition to more abstract models. Signed-off-by: Robert C. Helling Signed-off-by: Dirk Hohndel --- qt-models/diveplannermodel.cpp | 7 +------ qt-models/diveplannermodel.h | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'qt-models') diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index 5dd43c787..bace54e20 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -840,12 +840,7 @@ void DivePlannerPointsModel::createTemporaryPlan() #endif if (recalcQ() && !diveplan_empty(&diveplan)) { plan(&diveplan, &cache, isPlanner(), false); - /* TODO: - * Hook this signal to the mainwindow(s), the call to MainWindow - * can't be here as we are now dealing with QML too. - */ - //MainWindow::instance()->setPlanNotes(displayed_dive.notes); - emit calculatedPlanNotes(displayed_dive.notes); + emit calculatedPlanNotes(); } // throw away the cache free(cache); diff --git a/qt-models/diveplannermodel.h b/qt-models/diveplannermodel.h index 403b86b6d..4d1ef3227 100644 --- a/qt-models/diveplannermodel.h +++ b/qt-models/diveplannermodel.h @@ -97,7 +97,7 @@ signals: void cylinderModelEdited(); void startTimeChanged(QDateTime); void recreationChanged(bool); - void calculatedPlanNotes(const QString& notes); + void calculatedPlanNotes(); private: explicit DivePlannerPointsModel(QObject *parent = 0); -- cgit v1.2.3-70-g09d2