Merged changes from trunk. It still compiles successfully. :-)

diff --git a/NEWS b/NEWS
index 02e26e58023276abb5b3a34bed9e478a3079787a..6f3591f030d2efa75ed8366c1b2ba42c9d627a6f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,16 @@
 This is the NEWS file for ConfClerk. ConfClerk is the successor of
 fosdem-schedule; cf. docs/fosdem-schedule for the historic documentation.
 
 This is the NEWS file for ConfClerk. ConfClerk is the successor of
 fosdem-schedule; cf. docs/fosdem-schedule for the historic documentation.
 

-version 0.6.1, $DATE
-*
+version 0.6.2, $DATE
+* ...
+
+version 0.6.1, 2014-09-11
+* Fix typos in documentation.
+* Add Keyword entry to .desktop file.  
+* Make it impossible to hide the toolbar by disallowing its context menu.
+  (Fixes: #51).
+* Fix bugs around rooms.
+  Insert names into database, handle room name changes.

 
 version 0.6.0, 2013-06-13
 * New DB schema 001. Datebase is converted on first start.
 
 version 0.6.0, 2013-06-13
 * New DB schema 001. Datebase is converted on first start.

diff --git a/README b/README
index fafda23da2f3bedf81368bc3b4bff0f0c8118d70..7bc92e9ce13c9960659dd77fd2fbf6002e25ffde 100644 (file)
--- a/README
+++ b/README
@@ -24,7 +24,7 @@ See the file ./INSTALL for building and installation instructions, and
 Copyright and License:
 
   Copyright (C) 2010 Ixonos Plc.
 Copyright and License:
 
   Copyright (C) 2010 Ixonos Plc.

-  Copyright (C) 2011-2013, Philipp Spitzer, gregor herrmann, Stefan Strahl
+  Copyright (C) 2011-2014, Philipp Spitzer, gregor herrmann, Stefan Strahl

 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by


@@ -122,10 +122,11 @@ Toastfreeware
 http://www.toastfreeware.priv.at/confclerk/
 
 
 http://www.toastfreeware.priv.at/confclerk/
 
 

-Tested pentabarf (or frab) instances:
+Tested pentabarf (or frab, or summit with patches) instances:

 
 

+- 30C3: https://events.ccc.de/congress/2013/Fahrplan/schedule.xml
+- DebConf (2013, pentbarf): https://penta.debconf.org/dc13_schedule/schedule.en.xml
+- DebConf (2014, summit): https://summit.debconf.org/debconf14.xml

 - FOSDEM: http://fosdem.org/schedule/xml
 - FOSDEM: http://fosdem.org/schedule/xml

-- Grazer Linuxtage (2013): http://glt13-programm.linuxtage.at/schedule.de.xml
-- DebConf (2012): http://penta.debconf.org/dc12_schedule/schedule.en.xml
-- 29C3: http://events.ccc.de/congress/2012/Fahrplan/schedule.en.xml
-- FrOSCon (2012): http://programm.froscon.org/2012/schedule.xml
+- FrOSCon (2014): http://programm.froscon.org/2014/schedule.xml
+- Grazer Linuxtage (2014): http://glt14-programm.linuxtage.at/schedule.de.xml

diff --git a/confclerk.pro b/confclerk.pro
index 625060d328ce580acdfae5d3699734c0093a80e8..a8ff1b01d53373c4cd35ad531cd421fc889b54fa 100644 (file)
--- a/confclerk.pro
+++ b/confclerk.pro
@@ -12,7 +12,7 @@ SUBDIRS = src
 # The global.pri defines the VERSION of the project
 include(src/global.pri)
 
 # The global.pri defines the VERSION of the project
 include(src/global.pri)
 

-QMAKE_EXTRA_TARGETS += changelog icon man release releaseclean tarball
+QMAKE_EXTRA_TARGETS += changelog icon man release releaseclean tarball signature

 
 changelog.target = ChangeLog
 changelog.commands = \
 
 changelog.target = ChangeLog
 changelog.commands = \


@@ -24,13 +24,13 @@ icon.commands = convert data/$${TARGET}.svg data/$${TARGET}.png
 icon.depends = data/$${TARGET}.svg
 
 man.target = data/$${TARGET}.1
 icon.depends = data/$${TARGET}.svg
 
 man.target = data/$${TARGET}.1

-man.commands = pod2man --utf8 --center=\"Offlince conference scheduler\" --release=\"Version $${VERSION}\" data/$${TARGET}.pod > data/$${TARGET}.1
+man.commands = \
+       pod2man --utf8 --center=\"Offline conference scheduler\" --release=\"Version $${VERSION}\" data/$${TARGET}.pod > data/$${TARGET}.1

 man.depends = data/$${TARGET}.pod
 
 man.depends = data/$${TARGET}.pod
 

-release.depends = releaseclean tarball
-

 releaseclean.commands = \
 releaseclean.commands = \

- $(DEL_FILE) data/$${TARGET}.png data/$${TARGET}.1 ChangeLog
+ $(DEL_FILE) data/$${TARGET}.png data/$${TARGET}.1 ChangeLog $${TARGET}-$${VERSION}.tar.gz.asc
+release.depends = distclean releaseclean tarball signature

 #releaseclean.CONFIG = phony
 
 tarball.target = $${TARGET}-$${VERSION}.tar.gz
 #releaseclean.CONFIG = phony
 
 tarball.target = $${TARGET}-$${VERSION}.tar.gz


@@ -45,3 +45,8 @@ tarball.commands = \
        tar -cz --exclude=.svn --exclude=*.tar.gz -f $$tarball.target $${TARGET}-$${VERSION} ; \
        $(DEL_FILE) -r $${TARGET}-$${VERSION}
 tarball.depends = changelog icon man
        tar -cz --exclude=.svn --exclude=*.tar.gz -f $$tarball.target $${TARGET}-$${VERSION} ; \
        $(DEL_FILE) -r $${TARGET}-$${VERSION}
 tarball.depends = changelog icon man

+
+signature.target = $${TARGET}-$${VERSION}.tar.gz.asc
+signature.commands = \
+       gpg --armor --detach-sign $${TARGET}-$${VERSION}.tar.gz
+signature.depends = tarball

diff --git a/data/confclerk.pod b/data/confclerk.pod
index da2e75ab77483861eb9c40e821079468771297ea..c6a61fc0fc7030b6dd22a7c23fa0d037cd23e3cc 100644 (file)
--- a/data/confclerk.pod
+++ b/data/confclerk.pod
@@ -65,9 +65,9 @@ F<~/.local/share/data/Toastfreeware/ConfClerk/ConfClerk.sqlite>.
 =head2 Main code
 
     Copyright (C) 2010 Ixonos Plc.
 =head2 Main code
 
     Copyright (C) 2010 Ixonos Plc.

-    Copyright (C) 2011-2013, Philipp Spitzer <philipp@toastfreeware.priv.at>
-    Copyright (C) 2011-2013, gregor herrmann <gregor@toastfreeware.priv.at>
-    Copyright (C) 2011-2013, Stefan Strahl <stefan@toastfreeware.priv.at>
+    Copyright (C) 2011-2014, Philipp Spitzer <philipp@toastfreeware.priv.at>
+    Copyright (C) 2011-2014, gregor herrmann <gregor@toastfreeware.priv.at>
+    Copyright (C) 2011-2014, Stefan Strahl <stefan@toastfreeware.priv.at>

 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/alarm/alarm.cpp b/src/alarm/alarm.cpp
index 6f8f2f57b731eb51cc9b2ce58d774254b748e509..a25971c46d0d2591d3c6f66ab84ba9dd3c6716c6 100644 (file)
--- a/src/alarm/alarm.cpp
+++ b/src/alarm/alarm.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/alarm/alarm.h b/src/alarm/alarm.h
index 25f4e6f78c352ac57ed5782efdd61da5222eaa28..e41008dfc5b20887d566e12dc05788dc6f7fef3b 100644 (file)
--- a/src/alarm/alarm.h
+++ b/src/alarm/alarm.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/app/application.cpp b/src/app/application.cpp
index baa86ef57d90581e2ca4a7fa8f2ef452bace720c..db63e3aadbcedde093fc7b57aac79d38ec0ef6c7 100644 (file)
--- a/src/app/application.cpp
+++ b/src/app/application.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/app/application.h b/src/app/application.h
index db337958b06616b93dc68afd0a6b1da7ca67f457..51225c1241d0300efa5579acf4b404634e56b39b 100644 (file)
--- a/src/app/application.h
+++ b/src/app/application.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/app/appsettings.cpp b/src/app/appsettings.cpp
index f204bb6578dbaa1602340e7997b43ebb845a376e..642aefb53d7f5d3d2e17b6a8f73323d9aa9d12d9 100644 (file)
--- a/src/app/appsettings.cpp
+++ b/src/app/appsettings.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/app/appsettings.h b/src/app/appsettings.h
index 38149c9236b82e060e6216cd532b3f12b747f3d2..97f24340462baf971ced3c397c4c8df34b764c55 100644 (file)
--- a/src/app/appsettings.h
+++ b/src/app/appsettings.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/app/main.cpp b/src/app/main.cpp
index d7df6bc374a91374c7d02c6a017c10d203b9350c..4721306198f8542316600b312faf557028e1d984 100644 (file)
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/global.pri b/src/global.pri
index 6ecf01e3314c8d6dee3c30bd24201a3efa356d4b..86126e6c290eab193fae09f46ce995d52e1cc312 100644 (file)
--- a/src/global.pri
+++ b/src/global.pri
@@ -4,7 +4,7 @@
 # USAGE: include(./global.pri)
 
 # VERSION
 # USAGE: include(./global.pri)
 
 # VERSION

-VERSION = 0.6.1
+VERSION = 0.6.2

 DEFINES += VERSION=\\\"$$VERSION\\\"
 
 # Define 'MAEMO' specific CONFIG/DEFINE
 DEFINES += VERSION=\\\"$$VERSION\\\"
 
 # Define 'MAEMO' specific CONFIG/DEFINE

diff --git a/src/gui/about.ui b/src/gui/about.ui
index 99fee956631bc34cf7e7bf189500ed01a0c8aa1d..9b92d17a2958d74e4d934335d9baf943dfc40f45 100644 (file)
--- a/src/gui/about.ui
+++ b/src/gui/about.ui
@@ -137,7 +137,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; font-weight:600;">Copyright and license</span></p>
 <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">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, or (at your option) any later version.</p>
 <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">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.</p>
 <p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; font-weight:600;">Copyright and license</span></p>
 <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">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, or (at your option) any later version.</p>
 <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">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.</p>

-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright (C) 2010 Ixonos Plc.&lt;br /&gt;Copyright (C) 2011-2013 Philipp Spitzer &amp;amp; gregor herrmann&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright (C) 2010 Ixonos Plc.&lt;br /&gt;Copyright (C) 2011-2014 Philipp Spitzer &amp;amp; gregor herrmann &amp;amp; Stefan Strahl&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

          </property>
          <property name="textFormat">
           <enum>Qt::RichText</enum>
          </property>
          <property name="textFormat">
           <enum>Qt::RichText</enum>

diff --git a/src/gui/conferenceeditor.cpp b/src/gui/conferenceeditor.cpp
index b61aa486aa822f182f40b3e83bee6bc0d01b055b..13d4addf4720869077ed691d9fc1f0d3ae9e551c 100644 (file)
--- a/src/gui/conferenceeditor.cpp
+++ b/src/gui/conferenceeditor.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/conferenceeditor.h b/src/gui/conferenceeditor.h
index 6d39b749a70354b3c7d2fa003aa3addadddaa3cb..a3d1983d0da4442b1f6128beea70e02686d73ab7 100644 (file)
--- a/src/gui/conferenceeditor.h
+++ b/src/gui/conferenceeditor.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/conflictdialogcontainer.cpp b/src/gui/conflictdialogcontainer.cpp
index 25ba50f980d9df89b652533df2109d6fc8a510e2..361cbf0f5a22da5b9ab667fb8ce3fc2a3a896d2c 100644 (file)
--- a/src/gui/conflictdialogcontainer.cpp
+++ b/src/gui/conflictdialogcontainer.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/conflictdialogcontainer.h b/src/gui/conflictdialogcontainer.h
index 99f1f3c40499e4907609717b0362c350e25cdeab..35c72e8d0300a4ac5f22b59c724b020a6790fdc6 100644 (file)
--- a/src/gui/conflictdialogcontainer.h
+++ b/src/gui/conflictdialogcontainer.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/conflictsdialog.cpp b/src/gui/conflictsdialog.cpp
index 9fcb9c2a9de7619bd807187c37950379e47867f7..d153d3e8cb31214b56f374681321c9b5545ef889 100644 (file)
--- a/src/gui/conflictsdialog.cpp
+++ b/src/gui/conflictsdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/conflictsdialog.h b/src/gui/conflictsdialog.h
index ae4a59565462dd9a27d42b56ad569af75aab081d..4b71fd29140e8c849f27aedd935539fc23238589 100644 (file)
--- a/src/gui/conflictsdialog.h
+++ b/src/gui/conflictsdialog.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/daynavigatorwidget.cpp b/src/gui/daynavigatorwidget.cpp
index 50e1129a486e13cfcfc67da0df64571f01565a1b..cd7698d689da461eb0fcd04681c032d7a7c9e764 100644 (file)
--- a/src/gui/daynavigatorwidget.cpp
+++ b/src/gui/daynavigatorwidget.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/daynavigatorwidget.h b/src/gui/daynavigatorwidget.h
index eb11acfd53a888f1df131d27253763836aeaf216..577f0be4dbf2c6b2c252c096aa2a3325883f8468 100644 (file)
--- a/src/gui/daynavigatorwidget.h
+++ b/src/gui/daynavigatorwidget.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/dayviewtabcontainer.cpp b/src/gui/dayviewtabcontainer.cpp
index 4a7faac79389162558e79bb47b6b4ddcb67bb0c0..960768985eb3c08e369bde4cb5bd5cd61b3c53ee 100644 (file)
--- a/src/gui/dayviewtabcontainer.cpp
+++ b/src/gui/dayviewtabcontainer.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/dayviewtabcontainer.h b/src/gui/dayviewtabcontainer.h
index 933077e1cc6e0392ead147d3532fa5d50956ac96..b0448cee7fbe619a9c03c14cd6fedb0ae3764b95 100644 (file)
--- a/src/gui/dayviewtabcontainer.h
+++ b/src/gui/dayviewtabcontainer.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/errormessage.cpp b/src/gui/errormessage.cpp
index 6fa8336d11708fde5c0007b06e7d91663bc80982..dbac21a16669d8d9ce74c002fa6bcb0c5e6f6bba 100644 (file)
--- a/src/gui/errormessage.cpp
+++ b/src/gui/errormessage.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/errormessage.h b/src/gui/errormessage.h
index c3051db1518eb37159efd2fc8140a48af6927358..16a30ba014ebb2dc0371b2a98039bae285efdf81 100644 (file)
--- a/src/gui/errormessage.h
+++ b/src/gui/errormessage.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index 4094d742200f0e2e5e44ca99780ceab41db4b599..1b2d4763e3988624110991caf01e88f6a8e3c640 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/eventdialog.h b/src/gui/eventdialog.h
index 7640f3594b938ea720655245593cb4ead773ce31..82eff016f335560f53738177d4a49eff527d7da6 100644 (file)
--- a/src/gui/eventdialog.h
+++ b/src/gui/eventdialog.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/favtabcontainer.cpp b/src/gui/favtabcontainer.cpp
index 034af37d86506d2bde5f7c2f5e580d427207fbfa..8dab56f7fa4b67c407be8ac08a47c1c3f28e0330 100644 (file)
--- a/src/gui/favtabcontainer.cpp
+++ b/src/gui/favtabcontainer.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/favtabcontainer.h b/src/gui/favtabcontainer.h
index dd264ce30d283080f0876826c1d57b4a6ca8122a..ba0820f62efcac7742b9241935a1c7d41f8891d7 100644 (file)
--- a/src/gui/favtabcontainer.h
+++ b/src/gui/favtabcontainer.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 567942f1408c926d6cfa75f688fc1cb0bd6109b7..896f1607fda813b6ba951066ff9876ebc6c4cc54 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 338a7a3669b6bcf5af2872efcd57bb5ee2b1e1df..9f4bf9f545b70eaed0bc62f95f707bd038e6ca1c 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/roomstabcontainer.cpp b/src/gui/roomstabcontainer.cpp
index 6d23c7be0afb7367307759a79ce3f908e5576621..eb0e769bff96554f21aa65b237fa1f177c79f02b 100644 (file)
--- a/src/gui/roomstabcontainer.cpp
+++ b/src/gui/roomstabcontainer.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/roomstabcontainer.h b/src/gui/roomstabcontainer.h
index 9cb179080c3c02349160e2d32c27697597c1c031..9920cc4c2e245325bb4f3a938a4ea00bf8b738dd 100644 (file)
--- a/src/gui/roomstabcontainer.h
+++ b/src/gui/roomstabcontainer.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/searchhead.cpp b/src/gui/searchhead.cpp
index 4f53c44de3311de4a250fc3bf9606563ef945253..75650d78ccb8a09c58d92d63103616defb18f0b2 100644 (file)
--- a/src/gui/searchhead.cpp
+++ b/src/gui/searchhead.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/searchhead.h b/src/gui/searchhead.h
index 155e3ea401631e8fb0f15fb21ba12a552bda132b..a53b43e5cd4dbe5d6ab5154cc3d4504916fc36bf 100644 (file)
--- a/src/gui/searchhead.h
+++ b/src/gui/searchhead.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/searchtabcontainer.cpp b/src/gui/searchtabcontainer.cpp
index 7cebadd1bd80c90592874b56c85eae2d7aeb733e..b0fcb9c0ef253a81b1c00d81ac0792bfe8c25384 100644 (file)
--- a/src/gui/searchtabcontainer.cpp
+++ b/src/gui/searchtabcontainer.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/searchtabcontainer.h b/src/gui/searchtabcontainer.h
index f6e4809118bdb6a765cc4f593bb462ca16e7064d..dfeb836846571482ebb5328c9c8c839f37d55538 100644 (file)
--- a/src/gui/searchtabcontainer.h
+++ b/src/gui/searchtabcontainer.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 7ed770c2c415aca3fcb8834dfd5f2d4b8d6308f1..d807e3989b06f7e6254af706830ed13e315a0fc3 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h
index 0b6d22b4d9b8cb1fb578300cd0c326ace1bdeec9..d94c8d79f37114e57f6aed28b4d4d8b97cc566c4 100644 (file)
--- a/src/gui/settingsdialog.h
+++ b/src/gui/settingsdialog.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp
index 7ceb718438412e60fb5081f5de57625328f1c8fe..e5d7b57240fb84159a083bee20baeeb9f8b406c2 100644 (file)
--- a/src/gui/tabcontainer.cpp
+++ b/src/gui/tabcontainer.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/tabcontainer.h b/src/gui/tabcontainer.h
index d8277c030d62aeef7124b48c59f707702c58b6f7..16cd43b4fb0e8c9f5ff5d1b7157c48597d157383 100644 (file)
--- a/src/gui/tabcontainer.h
+++ b/src/gui/tabcontainer.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/trackstabcontainer.cpp b/src/gui/trackstabcontainer.cpp
index 45288c6e7f767d6456f8afa37760f6785de0ade0..1ee9e215f825457cf6b9d6f98d333aee70e2de03 100644 (file)
--- a/src/gui/trackstabcontainer.cpp
+++ b/src/gui/trackstabcontainer.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/trackstabcontainer.h b/src/gui/trackstabcontainer.h
index 09498f221ec43d1e6c3624f6e4f1c2b2292e4928..ee3915aa0a8dc914efbfbbc2d6fb936b442bc882 100644 (file)
--- a/src/gui/trackstabcontainer.h
+++ b/src/gui/trackstabcontainer.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/urlinputdialog.cpp b/src/gui/urlinputdialog.cpp
index d5a5cf22a88f827364ee3620d4e1df40de2dcae8..5a6e166cec21067bb94b0ba39c7a85d725fe3b32 100644 (file)
--- a/src/gui/urlinputdialog.cpp
+++ b/src/gui/urlinputdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/gui/urlinputdialog.h b/src/gui/urlinputdialog.h
index 199922e68f19e3a4e13f0ef7135a3085f909c6fa..4854dfdc691b623dba857f63754102399b771d57 100644 (file)
--- a/src/gui/urlinputdialog.h
+++ b/src/gui/urlinputdialog.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/mvc/conference.cpp b/src/mvc/conference.cpp
index 7e7558d9f8b36758e9899203e7206d2f66f67d46..46858b3a488933357bb39488fe31e270d2f5ada4 100644 (file)
--- a/src/mvc/conference.cpp
+++ b/src/mvc/conference.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/mvc/conference.h b/src/mvc/conference.h
index 51dee99896705e161e889ed35c996aab43d047ef..f6817cc8be8f78e3dfed4747c43a2e6d96adb6e0 100644 (file)
--- a/src/mvc/conference.h
+++ b/src/mvc/conference.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/mvc/conferencemodel.cpp b/src/mvc/conferencemodel.cpp
index f8688c10824f8ff5a4a74cc7e63f43fe4b205235..ce344c32aa9a82d789d90b2343be2b2a9d963aa7 100644 (file)
--- a/src/mvc/conferencemodel.cpp
+++ b/src/mvc/conferencemodel.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/mvc/conferencemodel.h b/src/mvc/conferencemodel.h
index 37cff64acefeefb8fc466d06064a05377bd02ace..63f32176fa273aff6a9010b1e8772ee570d862b6 100644 (file)
--- a/src/mvc/conferencemodel.h
+++ b/src/mvc/conferencemodel.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 843720a2ac65c59c6e0e57c50d55b211f3108c84..ff873c9cf21361a33cb41a88f240c188abf16370 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/mvc/delegate.h b/src/mvc/delegate.h
index e0f60c41f5cfbcf1db7e568875d195532f376bd0..3030813e06e9ebf88b8b770698c163714ea8f6bd 100644 (file)
--- a/src/mvc/delegate.h
+++ b/src/mvc/delegate.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index c8cc349c99dcac1332f1e51cbea728039747698d..227c57d0a99d6b0b51eec47ad570ddc461d5fd72 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *


@@ -73,9 +73,10 @@ QList<Event> Event::getByDateAndRoom(const QDate& date, int conferenceId) {
     QSqlQuery query;
     QString aliasEvent("E");
     QString aliasEventRoom("R");
     QSqlQuery query;
     QString aliasEvent("E");
     QString aliasEventRoom("R");

-    query.prepare(QString("SELECT %1 FROM %2 %3, %4 %5 WHERE %3.xid_conference = :conf AND %3.start >= :start AND %3.start < :end AND %3.id = R.xid_event ORDER BY %5.xid_room, %3.start, %3.duration").arg(
+    query.prepare(QString("SELECT %1 FROM %2 %3, %4 %5 WHERE %3.xid_conference = :conf_e AND %5.xid_conference = :conf_r AND %3.start >= :start AND %3.start < :end AND %3.id = %5.xid_event ORDER BY %5.xid_room, %3.start, %3.duration").arg(

                     columnsForSelect(aliasEvent), Event::sTableName, aliasEvent, "EVENT_ROOM", aliasEventRoom));
                     columnsForSelect(aliasEvent), Event::sTableName, aliasEvent, "EVENT_ROOM", aliasEventRoom));

-    query.bindValue(":conf", conferenceId);
+    query.bindValue(":conf_e", conferenceId);
+    query.bindValue(":conf_r", conferenceId);

     query.bindValue(":start", dayStart.toTime_t());
     query.bindValue(":end", dayStart.addDays(1).toTime_t());
 
     query.bindValue(":start", dayStart.toTime_t());
     query.bindValue(":end", dayStart.addDays(1).toTime_t());
 

diff --git a/src/mvc/event.h b/src/mvc/event.h
index 101e8f64fb36a69b6c70649d1cc95780bc531215..befe50611280cb5fd9b573958bbe7b022a6c5177 100644 (file)
--- a/src/mvc/event.h
+++ b/src/mvc/event.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index 6b8d47bedc47fd72facab48ac6144ef9260c284f..406a095644ea4087de19ac3b930b05c7d0cac4d2 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/mvc/eventmodel.h b/src/mvc/eventmodel.h
index 4d8992533477093b5aed111ee4bab3a1fc7582cb..7aa22027a870ee2f842f1209a6865289a7f8a97b 100644 (file)
--- a/src/mvc/eventmodel.h
+++ b/src/mvc/eventmodel.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/mvc/room.cpp b/src/mvc/room.cpp
index 5a894c437ef0344784f895480ae117af3bf1f84e..f8236103d5aaf57025392936aae497847491d598 100644 (file)
--- a/src/mvc/room.cpp
+++ b/src/mvc/room.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/mvc/room.h b/src/mvc/room.h
index 613a5146b74459f9495059c75e2a0ee824f498a5..f0820a790d3f06ac2a0e028753d6c6e8bf01710e 100644 (file)
--- a/src/mvc/room.h
+++ b/src/mvc/room.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/mvc/track.cpp b/src/mvc/track.cpp
index ae77d199762140819695bd2b78c9b722cb053589..769ec977b71272bcc122f7656d07bc217642e248 100644 (file)
--- a/src/mvc/track.cpp
+++ b/src/mvc/track.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/mvc/track.h b/src/mvc/track.h
index 384f4bd0caa0a6944ac86e3f4adaa6065e06ab46..2a1d78ba1dc8d3a5201177313bd67be83992f560 100644 (file)
--- a/src/mvc/track.h
+++ b/src/mvc/track.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index 74ee1195fc59fdeb9b3b97c996998d6ccc5433b5..073126350ff53f00533c8b18ac28785c3e4a398d 100644 (file)
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/mvc/treeview.h b/src/mvc/treeview.h
index 6d27f81c8b4bef196b397aaa0cf1aef96a980b9e..b591679d1f5f6791f9ec55efcd6dd838b1f22cd6 100644 (file)
--- a/src/mvc/treeview.h
+++ b/src/mvc/treeview.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/orm/ormrecord.h b/src/orm/ormrecord.h
index 8357b6bfc2fabe5f4ad055e8c3444036bcfaddb6..fe5d58dc17f1c94ecbba43af441effa343ed7118 100644 (file)
--- a/src/orm/ormrecord.h
+++ b/src/orm/ormrecord.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/sql/schedulexmlparser.cpp b/src/sql/schedulexmlparser.cpp
index 80531f880788e0ee47f024809e0d309fb608da8a..699c7b6e84e9cbe4b669b9c328257a3067d61e2f 100644 (file)
--- a/src/sql/schedulexmlparser.cpp
+++ b/src/sql/schedulexmlparser.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/sql/schedulexmlparser.h b/src/sql/schedulexmlparser.h
index fd1a1ad4b8cf10ea3b1f397eefda1fd15b7cd435..f7401a9f22abfbedd95e188725aa1b395938a51f 100644 (file)
--- a/src/sql/schedulexmlparser.h
+++ b/src/sql/schedulexmlparser.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index d5245bec003248ffeef2cde6590196b49a3f0f2d..ef29650db2e8b6ba5ab8d3edd4721857ffc504ce 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/sql/sqlengine.h b/src/sql/sqlengine.h
index 7348ec8a1e6b05166f6376eb3b1afb7ee9e2c944..17e2587f5cb62b6cadeb02af54c31efad95ea11a 100644 (file)
--- a/src/sql/sqlengine.h
+++ b/src/sql/sqlengine.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/test/main.cpp b/src/test/main.cpp
index ce9b559dce8d37176a18bb9974c2ab390a81d015..52f03ececa5d75cd252b9f061070b0880798f969 100644 (file)
--- a/src/test/main.cpp
+++ b/src/test/main.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/test/mvc/eventtest.cpp b/src/test/mvc/eventtest.cpp
index 2f3c8fe1c2570b0ce645bbe18c1a3618aad5cc34..e760d8597efbc24bfba81c15e85e6b2a968bfa6c 100644 (file)
--- a/src/test/mvc/eventtest.cpp
+++ b/src/test/mvc/eventtest.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *

diff --git a/src/test/mvc/eventtest.h b/src/test/mvc/eventtest.h
index 656024c7452f0d3b1b7aa17a693dee4365410bcf..ae1ce449aecbf34a34bd252567e6f7b8f7ab7085 100644 (file)
--- a/src/test/mvc/eventtest.h
+++ b/src/test/mvc/eventtest.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *