From: Philipp Spitzer Date: Tue, 13 Jan 2015 22:27:16 +0000 (+0000) Subject: Merged changes from trunk. It still compiles successfully. :-) X-Git-Tag: 0.6.3~18 X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/commitdiff_plain/54b69e25c788102c591647d94d57f6d16fc32773 Merged changes from trunk. It still compiles successfully. :-) --- diff --git a/NEWS b/NEWS index 02e26e5..6f3591f 100644 --- 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. -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. diff --git a/README b/README index fafda23..7bc92e9 100644 --- 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 (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 @@ -122,10 +122,11 @@ Toastfreeware 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 -- 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 625060d..a8ff1b0 100644 --- 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) -QMAKE_EXTRA_TARGETS += changelog icon man release releaseclean tarball +QMAKE_EXTRA_TARGETS += changelog icon man release releaseclean tarball signature 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 -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 -release.depends = releaseclean tarball - 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 @@ -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 + +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 da2e75a..c6a61fc 100644 --- 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. - Copyright (C) 2011-2013, Philipp Spitzer - Copyright (C) 2011-2013, gregor herrmann - Copyright (C) 2011-2013, Stefan Strahl + Copyright (C) 2011-2014, Philipp Spitzer + Copyright (C) 2011-2014, gregor herrmann + Copyright (C) 2011-2014, 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 diff --git a/src/alarm/alarm.cpp b/src/alarm/alarm.cpp index 6f8f2f5..a25971c 100644 --- a/src/alarm/alarm.cpp +++ b/src/alarm/alarm.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/alarm/alarm.h b/src/alarm/alarm.h index 25f4e6f..e41008d 100644 --- a/src/alarm/alarm.h +++ b/src/alarm/alarm.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/app/application.cpp b/src/app/application.cpp index baa86ef..db63e3a 100644 --- a/src/app/application.cpp +++ b/src/app/application.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/app/application.h b/src/app/application.h index db33795..51225c1 100644 --- a/src/app/application.h +++ b/src/app/application.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/app/appsettings.cpp b/src/app/appsettings.cpp index f204bb6..642aefb 100644 --- a/src/app/appsettings.cpp +++ b/src/app/appsettings.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/app/appsettings.h b/src/app/appsettings.h index 38149c9..97f2434 100644 --- a/src/app/appsettings.h +++ b/src/app/appsettings.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/app/main.cpp b/src/app/main.cpp index d7df6bc..4721306 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/global.pri b/src/global.pri index 6ecf01e..86126e6 100644 --- a/src/global.pri +++ b/src/global.pri @@ -4,7 +4,7 @@ # USAGE: include(./global.pri) # VERSION -VERSION = 0.6.1 +VERSION = 0.6.2 DEFINES += VERSION=\\\"$$VERSION\\\" # Define 'MAEMO' specific CONFIG/DEFINE diff --git a/src/gui/about.ui b/src/gui/about.ui index 99fee95..9b92d17 100644 --- 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:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Copyright (C) 2010 Ixonos Plc.<br />Copyright (C) 2011-2013 Philipp Spitzer &amp; gregor herrmann</p></body></html> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Copyright (C) 2010 Ixonos Plc.<br />Copyright (C) 2011-2014 Philipp Spitzer &amp; gregor herrmann &amp; Stefan Strahl</p></body></html> Qt::RichText diff --git a/src/gui/conferenceeditor.cpp b/src/gui/conferenceeditor.cpp index b61aa48..13d4add 100644 --- a/src/gui/conferenceeditor.cpp +++ b/src/gui/conferenceeditor.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/conferenceeditor.h b/src/gui/conferenceeditor.h index 6d39b74..a3d1983 100644 --- a/src/gui/conferenceeditor.h +++ b/src/gui/conferenceeditor.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/conflictdialogcontainer.cpp b/src/gui/conflictdialogcontainer.cpp index 25ba50f..361cbf0 100644 --- a/src/gui/conflictdialogcontainer.cpp +++ b/src/gui/conflictdialogcontainer.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/conflictdialogcontainer.h b/src/gui/conflictdialogcontainer.h index 99f1f3c..35c72e8 100644 --- a/src/gui/conflictdialogcontainer.h +++ b/src/gui/conflictdialogcontainer.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/conflictsdialog.cpp b/src/gui/conflictsdialog.cpp index 9fcb9c2..d153d3e 100644 --- a/src/gui/conflictsdialog.cpp +++ b/src/gui/conflictsdialog.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/conflictsdialog.h b/src/gui/conflictsdialog.h index ae4a595..4b71fd2 100644 --- a/src/gui/conflictsdialog.h +++ b/src/gui/conflictsdialog.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/daynavigatorwidget.cpp b/src/gui/daynavigatorwidget.cpp index 50e1129..cd7698d 100644 --- a/src/gui/daynavigatorwidget.cpp +++ b/src/gui/daynavigatorwidget.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/daynavigatorwidget.h b/src/gui/daynavigatorwidget.h index eb11acf..577f0be 100644 --- a/src/gui/daynavigatorwidget.h +++ b/src/gui/daynavigatorwidget.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/dayviewtabcontainer.cpp b/src/gui/dayviewtabcontainer.cpp index 4a7faac..9607689 100644 --- a/src/gui/dayviewtabcontainer.cpp +++ b/src/gui/dayviewtabcontainer.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/dayviewtabcontainer.h b/src/gui/dayviewtabcontainer.h index 933077e..b0448ce 100644 --- a/src/gui/dayviewtabcontainer.h +++ b/src/gui/dayviewtabcontainer.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/errormessage.cpp b/src/gui/errormessage.cpp index 6fa8336..dbac21a 100644 --- a/src/gui/errormessage.cpp +++ b/src/gui/errormessage.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/errormessage.h b/src/gui/errormessage.h index c3051db..16a30ba 100644 --- a/src/gui/errormessage.h +++ b/src/gui/errormessage.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp index 4094d74..1b2d476 100644 --- a/src/gui/eventdialog.cpp +++ b/src/gui/eventdialog.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/eventdialog.h b/src/gui/eventdialog.h index 7640f35..82eff01 100644 --- a/src/gui/eventdialog.h +++ b/src/gui/eventdialog.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/favtabcontainer.cpp b/src/gui/favtabcontainer.cpp index 034af37..8dab56f 100644 --- a/src/gui/favtabcontainer.cpp +++ b/src/gui/favtabcontainer.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/favtabcontainer.h b/src/gui/favtabcontainer.h index dd264ce..ba0820f 100644 --- a/src/gui/favtabcontainer.h +++ b/src/gui/favtabcontainer.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 567942f..896f160 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 338a7a3..9f4bf9f 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/roomstabcontainer.cpp b/src/gui/roomstabcontainer.cpp index 6d23c7b..eb0e769 100644 --- a/src/gui/roomstabcontainer.cpp +++ b/src/gui/roomstabcontainer.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/roomstabcontainer.h b/src/gui/roomstabcontainer.h index 9cb1790..9920cc4 100644 --- a/src/gui/roomstabcontainer.h +++ b/src/gui/roomstabcontainer.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/searchhead.cpp b/src/gui/searchhead.cpp index 4f53c44..75650d7 100644 --- a/src/gui/searchhead.cpp +++ b/src/gui/searchhead.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/searchhead.h b/src/gui/searchhead.h index 155e3ea..a53b43e 100644 --- a/src/gui/searchhead.h +++ b/src/gui/searchhead.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/searchtabcontainer.cpp b/src/gui/searchtabcontainer.cpp index 7cebadd..b0fcb9c 100644 --- a/src/gui/searchtabcontainer.cpp +++ b/src/gui/searchtabcontainer.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/searchtabcontainer.h b/src/gui/searchtabcontainer.h index f6e4809..dfeb836 100644 --- a/src/gui/searchtabcontainer.h +++ b/src/gui/searchtabcontainer.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index 7ed770c..d807e39 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h index 0b6d22b..d94c8d7 100644 --- a/src/gui/settingsdialog.h +++ b/src/gui/settingsdialog.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp index 7ceb718..e5d7b57 100644 --- a/src/gui/tabcontainer.cpp +++ b/src/gui/tabcontainer.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/tabcontainer.h b/src/gui/tabcontainer.h index d8277c0..16cd43b 100644 --- a/src/gui/tabcontainer.h +++ b/src/gui/tabcontainer.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/trackstabcontainer.cpp b/src/gui/trackstabcontainer.cpp index 45288c6..1ee9e21 100644 --- a/src/gui/trackstabcontainer.cpp +++ b/src/gui/trackstabcontainer.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/trackstabcontainer.h b/src/gui/trackstabcontainer.h index 09498f2..ee3915a 100644 --- a/src/gui/trackstabcontainer.h +++ b/src/gui/trackstabcontainer.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/urlinputdialog.cpp b/src/gui/urlinputdialog.cpp index d5a5cf2..5a6e166 100644 --- a/src/gui/urlinputdialog.cpp +++ b/src/gui/urlinputdialog.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/gui/urlinputdialog.h b/src/gui/urlinputdialog.h index 199922e..4854dfd 100644 --- a/src/gui/urlinputdialog.h +++ b/src/gui/urlinputdialog.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/mvc/conference.cpp b/src/mvc/conference.cpp index 7e7558d..46858b3 100644 --- a/src/mvc/conference.cpp +++ b/src/mvc/conference.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/mvc/conference.h b/src/mvc/conference.h index 51dee99..f6817cc 100644 --- a/src/mvc/conference.h +++ b/src/mvc/conference.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/mvc/conferencemodel.cpp b/src/mvc/conferencemodel.cpp index f8688c1..ce344c3 100644 --- a/src/mvc/conferencemodel.cpp +++ b/src/mvc/conferencemodel.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/mvc/conferencemodel.h b/src/mvc/conferencemodel.h index 37cff64..63f3217 100644 --- a/src/mvc/conferencemodel.h +++ b/src/mvc/conferencemodel.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp index 843720a..ff873c9 100644 --- a/src/mvc/delegate.cpp +++ b/src/mvc/delegate.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/mvc/delegate.h b/src/mvc/delegate.h index e0f60c4..3030813 100644 --- a/src/mvc/delegate.h +++ b/src/mvc/delegate.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp index c8cc349..227c57d 100644 --- a/src/mvc/event.cpp +++ b/src/mvc/event.cpp @@ -1,6 +1,6 @@ /* * 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. * @@ -73,9 +73,10 @@ QList Event::getByDateAndRoom(const QDate& date, int conferenceId) { 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)); - 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()); diff --git a/src/mvc/event.h b/src/mvc/event.h index 101e8f6..befe506 100644 --- a/src/mvc/event.h +++ b/src/mvc/event.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp index 6b8d47b..406a095 100644 --- a/src/mvc/eventmodel.cpp +++ b/src/mvc/eventmodel.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/mvc/eventmodel.h b/src/mvc/eventmodel.h index 4d89925..7aa2202 100644 --- a/src/mvc/eventmodel.h +++ b/src/mvc/eventmodel.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/mvc/room.cpp b/src/mvc/room.cpp index 5a894c4..f823610 100644 --- a/src/mvc/room.cpp +++ b/src/mvc/room.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/mvc/room.h b/src/mvc/room.h index 613a514..f0820a7 100644 --- a/src/mvc/room.h +++ b/src/mvc/room.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/mvc/track.cpp b/src/mvc/track.cpp index ae77d19..769ec97 100644 --- a/src/mvc/track.cpp +++ b/src/mvc/track.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/mvc/track.h b/src/mvc/track.h index 384f4bd..2a1d78b 100644 --- a/src/mvc/track.h +++ b/src/mvc/track.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp index 74ee119..0731263 100644 --- a/src/mvc/treeview.cpp +++ b/src/mvc/treeview.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/mvc/treeview.h b/src/mvc/treeview.h index 6d27f81..b591679 100644 --- a/src/mvc/treeview.h +++ b/src/mvc/treeview.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/orm/ormrecord.h b/src/orm/ormrecord.h index 8357b6b..fe5d58d 100644 --- a/src/orm/ormrecord.h +++ b/src/orm/ormrecord.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/sql/schedulexmlparser.cpp b/src/sql/schedulexmlparser.cpp index 80531f8..699c7b6 100644 --- a/src/sql/schedulexmlparser.cpp +++ b/src/sql/schedulexmlparser.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/sql/schedulexmlparser.h b/src/sql/schedulexmlparser.h index fd1a1ad..f7401a9 100644 --- a/src/sql/schedulexmlparser.h +++ b/src/sql/schedulexmlparser.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp index d5245be..ef29650 100644 --- a/src/sql/sqlengine.cpp +++ b/src/sql/sqlengine.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/sql/sqlengine.h b/src/sql/sqlengine.h index 7348ec8..17e2587 100644 --- a/src/sql/sqlengine.h +++ b/src/sql/sqlengine.h @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/test/main.cpp b/src/test/main.cpp index ce9b559..52f03ec 100644 --- a/src/test/main.cpp +++ b/src/test/main.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/test/mvc/eventtest.cpp b/src/test/mvc/eventtest.cpp index 2f3c8fe..e760d85 100644 --- a/src/test/mvc/eventtest.cpp +++ b/src/test/mvc/eventtest.cpp @@ -1,6 +1,6 @@ /* * 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. * diff --git a/src/test/mvc/eventtest.h b/src/test/mvc/eventtest.h index 656024c..ae1ce44 100644 --- a/src/test/mvc/eventtest.h +++ b/src/test/mvc/eventtest.h @@ -1,6 +1,6 @@ /* * 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. *