'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 44ad43c5c1b1af5bda81dc34c1034a986bf40327..26d1bdfa1d6a6ee0318d8430603efffc6548ddf1 100644 (file)
--- a/src/mvc/eventmodel.h
+++ b/src/mvc/eventmodel.h
@@ -18,9 +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);
     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,6 +45,7 @@ private:
     void createTrackGroups();
     void createTrackGroupsNew();
     void clearModel();
+    void createRoomGroups();
 
 public slots:
     void updateModel(int aEventId);