Changeset 54b69e2


Ignore:
Timestamp:
01/13/15 23:27:16 (7 years ago)
Author:
Philipp Spitzer <philipp@…>
Branches:
master, qt5
Children:
ebe26af
Parents:
4b6ae6b
Message:

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

Files:
69 edited

Legend:

Unmodified
Added
Removed
  • NEWS

    r4b6ae6b r54b69e2  
    22fosdem-schedule; cf. docs/fosdem-schedule for the historic documentation.
    33
    4 version 0.6.1, $DATE
    5 *
     4version 0.6.2, $DATE
     5* ...
     6
     7version 0.6.1, 2014-09-11
     8* Fix typos in documentation.
     9* Add Keyword entry to .desktop file. 
     10* Make it impossible to hide the toolbar by disallowing its context menu.
     11  (Fixes: #51).
     12* Fix bugs around rooms.
     13  Insert names into database, handle room name changes.
    614
    715version 0.6.0, 2013-06-13
  • README

    r4b6ae6b r54b69e2  
    2525
    2626  Copyright (C) 2010 Ixonos Plc.
    27   Copyright (C) 2011-2013, Philipp Spitzer, gregor herrmann, Stefan Strahl
     27  Copyright (C) 2011-2014, Philipp Spitzer, gregor herrmann, Stefan Strahl
    2828
    2929  This program is free software; you can redistribute it and/or modify
     
    123123
    124124
    125 Tested pentabarf (or frab) instances:
     125Tested pentabarf (or frab, or summit with patches) instances:
    126126
     127- 30C3: https://events.ccc.de/congress/2013/Fahrplan/schedule.xml
     128- DebConf (2013, pentbarf): https://penta.debconf.org/dc13_schedule/schedule.en.xml
     129- DebConf (2014, summit): https://summit.debconf.org/debconf14.xml
    127130- FOSDEM: http://fosdem.org/schedule/xml
    128 - Grazer Linuxtage (2013): http://glt13-programm.linuxtage.at/schedule.de.xml
    129 - DebConf (2012): http://penta.debconf.org/dc12_schedule/schedule.en.xml
    130 - 29C3: http://events.ccc.de/congress/2012/Fahrplan/schedule.en.xml
    131 - FrOSCon (2012): http://programm.froscon.org/2012/schedule.xml
     131- FrOSCon (2014): http://programm.froscon.org/2014/schedule.xml
     132- Grazer Linuxtage (2014): http://glt14-programm.linuxtage.at/schedule.de.xml
  • confclerk.pro

    r4b6ae6b r54b69e2  
    1313include(src/global.pri)
    1414
    15 QMAKE_EXTRA_TARGETS += changelog icon man release releaseclean tarball
     15QMAKE_EXTRA_TARGETS += changelog icon man release releaseclean tarball signature
    1616
    1717changelog.target = ChangeLog
     
    2525
    2626man.target = data/$${TARGET}.1
    27 man.commands = pod2man --utf8 --center=\"Offlince conference scheduler\" --release=\"Version $${VERSION}\" data/$${TARGET}.pod > data/$${TARGET}.1
     27man.commands = \
     28        pod2man --utf8 --center=\"Offline conference scheduler\" --release=\"Version $${VERSION}\" data/$${TARGET}.pod > data/$${TARGET}.1
    2829man.depends = data/$${TARGET}.pod
    2930
    30 release.depends = releaseclean tarball
    31 
    3231releaseclean.commands = \
    33  $(DEL_FILE) data/$${TARGET}.png data/$${TARGET}.1 ChangeLog
     32 $(DEL_FILE) data/$${TARGET}.png data/$${TARGET}.1 ChangeLog $${TARGET}-$${VERSION}.tar.gz.asc
     33release.depends = distclean releaseclean tarball signature
    3434#releaseclean.CONFIG = phony
    3535
     
    4646        $(DEL_FILE) -r $${TARGET}-$${VERSION}
    4747tarball.depends = changelog icon man
     48
     49signature.target = $${TARGET}-$${VERSION}.tar.gz.asc
     50signature.commands = \
     51        gpg --armor --detach-sign $${TARGET}-$${VERSION}.tar.gz
     52signature.depends = tarball
  • data/confclerk.pod

    r4b6ae6b r54b69e2  
    6666
    6767    Copyright (C) 2010 Ixonos Plc.
    68     Copyright (C) 2011-2013, Philipp Spitzer <philipp@toastfreeware.priv.at>
    69     Copyright (C) 2011-2013, gregor herrmann <gregor@toastfreeware.priv.at>
    70     Copyright (C) 2011-2013, Stefan Strahl <stefan@toastfreeware.priv.at>
     68    Copyright (C) 2011-2014, Philipp Spitzer <philipp@toastfreeware.priv.at>
     69    Copyright (C) 2011-2014, gregor herrmann <gregor@toastfreeware.priv.at>
     70    Copyright (C) 2011-2014, Stefan Strahl <stefan@toastfreeware.priv.at>
    7171
    7272    This program is free software; you can redistribute it and/or modify
  • src/alarm/alarm.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/alarm/alarm.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/app/application.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/app/application.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/app/appsettings.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/app/appsettings.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/app/main.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/global.pri

    r4b6ae6b r54b69e2  
    55
    66# VERSION
    7 VERSION = 0.6.1
     7VERSION = 0.6.2
    88DEFINES += VERSION=\\\"$$VERSION\\\"
    99
  • src/gui/about.ui

    r4b6ae6b r54b69e2  
    138138&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;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.&lt;/p&gt;
    139139&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;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.&lt;/p&gt;
    140 &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>
     140&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>
    141141         </property>
    142142         <property name="textFormat">
  • src/gui/conferenceeditor.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/conferenceeditor.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/conflictdialogcontainer.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/conflictdialogcontainer.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/conflictsdialog.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/conflictsdialog.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/daynavigatorwidget.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/daynavigatorwidget.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/dayviewtabcontainer.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/dayviewtabcontainer.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/errormessage.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/errormessage.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/eventdialog.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/eventdialog.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/favtabcontainer.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/favtabcontainer.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/mainwindow.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/mainwindow.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/roomstabcontainer.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/roomstabcontainer.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/searchhead.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/searchhead.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/searchtabcontainer.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/searchtabcontainer.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/settingsdialog.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/settingsdialog.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/tabcontainer.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/tabcontainer.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/trackstabcontainer.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/trackstabcontainer.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/urlinputdialog.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/gui/urlinputdialog.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/mvc/conference.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/mvc/conference.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/mvc/conferencemodel.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/mvc/conferencemodel.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/mvc/delegate.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/mvc/delegate.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/mvc/event.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
     
    7474    QString aliasEvent("E");
    7575    QString aliasEventRoom("R");
    76     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(
     76    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(
    7777                    columnsForSelect(aliasEvent), Event::sTableName, aliasEvent, "EVENT_ROOM", aliasEventRoom));
    78     query.bindValue(":conf", conferenceId);
     78    query.bindValue(":conf_e", conferenceId);
     79    query.bindValue(":conf_r", conferenceId);
    7980    query.bindValue(":start", dayStart.toTime_t());
    8081    query.bindValue(":end", dayStart.addDays(1).toTime_t());
  • src/mvc/event.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/mvc/eventmodel.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/mvc/eventmodel.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/mvc/room.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/mvc/room.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/mvc/track.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/mvc/track.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/mvc/treeview.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/mvc/treeview.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/orm/ormrecord.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/sql/schedulexmlparser.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/sql/schedulexmlparser.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/sql/sqlengine.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/sql/sqlengine.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/test/main.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/test/mvc/eventtest.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/test/mvc/eventtest.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
Note: See TracChangeset for help on using the changeset viewer.