Bump copyright years.

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

diff --git a/src/gui/conflictdialogcontainer.h b/src/gui/conflictdialogcontainer.h
index 758cd02afa1cfbbfd16ef90a3a39e4cfad51b2ee..f71655c589d36e008e151ca98e03d2d063d5dd6e 100644 (file)
--- a/src/gui/conflictdialogcontainer.h
+++ b/src/gui/conflictdialogcontainer.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
+ * Copyright (C) 2011-2024 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -27,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 */