Implemented the reload button functionality. Closes: #34

[toast/confclerk.git] / src / gui / conflictdialogcontainer.h

diff --git a/src/gui/conflictdialogcontainer.h b/src/gui/conflictdialogcontainer.h
index 9f1616b245a11c03d876d4a1195c20712a881a1f..068c081fe3d1c54b85a38bb15cefac3ed88a363a 100644 (file)
--- a/src/gui/conflictdialogcontainer.h
+++ b/src/gui/conflictdialogcontainer.h
@@ -28,18 +28,18 @@ class ConflictDialogContainer: public TabContainer
     Q_OBJECT
 public:
     ConflictDialogContainer(QWidget *aParent);
-    virtual ~ConflictDialogContainer(){}
+    virtual ~ConflictDialogContainer() {}
 
-    void setEventId(int aEventId) { mEventId = aEventId; }
+public slots:
+    void setEventId(int aEventId, int conferenceId);
+    void loadEvents(); // update the conflicts
 
 protected:
-    virtual void loadEvents( const QDate &aDate, const int aConferenceId );
-
-protected slots:
-    virtual void updateTreeView(const QDate &aDate);
+    virtual void loadEvents(const QDate &aDate, const int aConferenceId); // the date and conference are ignored
 
 private:
     int mEventId;
+    int mConferenceId;
 };
 
 #endif /* CONFLICTDIALOGCONTAINER_H */