'conflict' dialog now contains list of events in conflict with given eventId

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

diff --git a/src/mvc/eventmodel.h b/src/mvc/eventmodel.h
index bba57643561d171d41d39c14536b52f393b22278..26d1bdfa1d6a6ee0318d8430603efffc6548ddf1 100644 (file)
--- a/src/mvc/eventmodel.h
+++ b/src/mvc/eventmodel.h
@@ -18,11 +18,11 @@ public:
     int rowCount ( const QModelIndex & parent = QModelIndex() ) const;
     void loadEvents(const QDate &aDate, int aConferenceId); // loads Events from the DB
     void loadFavEvents(const QDate &aDate, int aConferenceId); // loads Favourite events from the DB
-    void loadEventsByTrack(const QDate &aDate, int aConferenceId); // loads Events grouped by Track from the DB
+    void loadEventsByTrack(const QDate &aDate, int aConferenceId); // loads Events sorted by Track id and Event start from the DB
     int loadSearchResultEvents(const QDate &aDate, int aConferenceId);
-    // a method to force 'EventModel' emit signal 'dataChanged()'
-    // a 'view', eg. 'TreeView' listens for this signal and redraws changed items(indexes)
-    void emitDataChangedSignal(const QModelIndex &aTopLeft, const QModelIndex &aBottomRight);
+    void loadNowEvents(int aConferenceId); // loads Now events from the DB
+    void loadEventsByRoom(const QDate &aDate, int aConferenceId);
+    void loadConflictEvents(int aEventId, int aConferenceId); // loads events in conflict
 
 private:
     struct Group
@@ -43,7 +43,12 @@ private:
 private:
     void createTimeGroups();
     void createTrackGroups();
+    void createTrackGroupsNew();
     void clearModel();
+    void createRoomGroups();
+
+public slots:
+    void updateModel(int aEventId);
 
 private:
     QList<Event> mEvents;