Adjust shown event time when displayTimeShift is set.

[toast/confclerk.git] / src / mvc / conferencemodel.h

diff --git a/src/mvc/conferencemodel.h b/src/mvc/conferencemodel.h
index fe0f242214416c7267cd5721012f584a34768a4d..34cfa35a024fd4f2a2188f6834c4c3723ec05936 100644 (file)
--- a/src/mvc/conferencemodel.h
+++ b/src/mvc/conferencemodel.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -29,7 +29,8 @@
 
 It also provides typed access to the conferences from ConferenceEditor.
 
-It does not actually modify anything in DB, this is performed by other classes.
+It does not actually modify anything in DB (unless methods changing the conference instance returned by conferenceFromIndex are used),
+this is performed by other classes.
 
 \see ConferenceEditor, MainWindow::showConferences()
 */
@@ -43,6 +44,7 @@ public:
     virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
 
     const Conference& conferenceFromIndex(const QModelIndex&) const;
+    Conference& conferenceFromIndex(const QModelIndex&);
     QModelIndex indexFromId(int id) const;
 public slots:
     void newConferenceBegin();
@@ -52,8 +54,9 @@ private:
     // reinitialize list from database
     void reinit()
     {
+        beginResetModel();
         conferences = Conference::getAll();
-        reset();
+        endResetModel();
     }
 
     QList<Conference> conferences;