Included application version in the about dialog. This closes ticket #9.

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

diff --git a/src/gui/conflictdialogcontainer.cpp b/src/gui/conflictdialogcontainer.cpp
index b83bb8f73626de66a4b97ac05a4eb487df50b2c1..8e3e00bcac1c0908c725b6e070d3d83912c7cb55 100644 (file)
--- a/src/gui/conflictdialogcontainer.cpp
+++ b/src/gui/conflictdialogcontainer.cpp
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2010 Ixonos Plc.
+ * Copyright (C) 2011 Philipp Spitzer, gregor herrmann
+ *
+ * This file is part of ConfClerk.
+ *
+ * ConfClerk is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * ConfClerk is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * ConfClerk.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "conflictdialogcontainer.h"
 
@@ -8,7 +27,15 @@ ConflictDialogContainer::ConflictDialogContainer(QWidget *aParent)
 
 void ConflictDialogContainer::loadEvents( const QDate &aDate, const int aConferenceId )
 {
+    Q_UNUSED(aDate);
+
     static_cast<EventModel*>(treeView->model())->loadConflictEvents( mEventId, aConferenceId );
     dayNavigator->hide();
 }
 
+void ConflictDialogContainer::updateTreeView(const QDate &aDate)
+{
+    TabContainer::updateTreeView(aDate);
+    treeView->setAllExpanded(true);
+}
+