X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/blobdiff_plain/68b2df2aae1c3894cb2a720d088b5f41e17a93e1..080dc7d603d45ba0662aa731418993ddd45b5fe8:/src/gui/conflictsdialog.h

diff --git a/src/gui/conflictsdialog.h b/src/gui/conflictsdialog.h
index cca88db..07f9003 100644
--- a/src/gui/conflictsdialog.h
+++ b/src/gui/conflictsdialog.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011 Philipp Spitzer, gregor herrmann
+ * Copyright (C) 2011-2024 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -27,10 +27,10 @@ class ConflictsDialog : public QDialog, Ui::ConflictsDialog
 {
     Q_OBJECT
 public:
-    ConflictsDialog(int aEventId, QWidget *aParent = NULL);
+    ConflictsDialog(int aEventId, int aConferenceId, QWidget *aParent = NULL);
     ~ConflictsDialog();
 signals:
-    void eventHasChanged(int aEventId, bool aReloadModel = false);
+    void eventChanged(int aEventId, bool favouriteChanged);
 };
 
 #endif /* CONFLICTSDIALOG_H */