Add Stefan as a copyright holder to source files, too.

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

diff --git a/src/gui/conflictsdialog.h b/src/gui/conflictsdialog.h
index 995ff3ff73a8e6eac3564c99462cf1e9dea66b2e..fa79c6797208655cd76902881fa995d50801e169 100644 (file)
--- a/src/gui/conflictsdialog.h
+++ b/src/gui/conflictsdialog.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
+ * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -26,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 */