1 files changed, 405 insertions, 129 deletions

diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp
index de5e30b..d9cee2b 100644
--- a/libopie2/opiepim/oevent.cpp
+++ b/libopie2/opiepim/oevent.cpp
@@ -2,3 +2,3 @@
                              This file is part of the Opie Project
-                             Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de)
+                             Copyright (C) Stefan Eilers <Eilers.Stefan@epost.de>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
@@ -28,9 +28,6 @@
 */
-#include <qshared.h>
-#include <qarray.h>
 
-#include <qpe/palmtopuidgen.h>
-#include <qpe/categories.h>
-#include <qpe/stringutil.h>
+#include "oevent.h"
 
+/* OPIE */
 #include <opie2/orecur.h>
@@ -38,8 +35,15 @@
 #include <opie2/opimnotifymanager.h>
+#include <qpe/categories.h>
+#include <qpe/palmtopuidgen.h>
+#include <qpe/stringutil.h>
 
-#include <opie2/oevent.h>
+/* QT */
+#include <qshared.h>
+#include <qarray.h>
 
-namespace Opie {
+namespace Opie
+{
 
-int OCalendarHelper::week( const QDate& date) {
+int OCalendarHelper::week( const QDate& date )
+{
     // Calculates the week this date is in within that
@@ -55,3 +59,6 @@ int OCalendarHelper::week( const QDate& date) {
 }
-int OCalendarHelper::ocurrence( const QDate& date) {
+
+
+int OCalendarHelper::ocurrence( const QDate& date )
+{
     // calculates the number of occurrances of this day of the
@@ -60,6 +67,10 @@ int OCalendarHelper::ocurrence( const QDate& date) {
 }
-int OCalendarHelper::dayOfWeek( char day ) {
+
+
+int OCalendarHelper::dayOfWeek( char day )
+{
     int dayOfWeek = 1;
     char i = ORecur::MON;
-    while ( !( i & day ) && i <= ORecur::SUN ) {
+    while ( !( i & day ) && i <= ORecur::SUN )
+    {
         i <<= 1;
@@ -69,3 +80,6 @@ int OCalendarHelper::dayOfWeek( char day ) {
 }
-int OCalendarHelper::monthDiff( const QDate& first, const QDate& second ) {
+
+
+int OCalendarHelper::monthDiff( const QDate& first, const QDate& second )
+{
     return ( second.year() - first.year() ) * 12 +
@@ -74,4 +88,7 @@ int OCalendarHelper::monthDiff( const QDate& first, const QDate& second ) {
 
-struct OEvent::Data : public QShared {
-    Data() : QShared() {
+
+struct OEvent::Data : public QShared
+{
+    Data() : QShared()
+    {
         child = 0;
@@ -82,3 +99,4 @@ struct OEvent::Data : public QShared {
     }
-    ~Data() {
+    ~Data()
+    {
         delete manager;
@@ -100,6 +118,10 @@ struct OEvent::Data : public QShared {
 
+
 OEvent::OEvent( int uid )
-    : OPimRecord( uid ) {
+        : OPimRecord( uid )
+{
     data = new Data;
 }
+
+
 OEvent::OEvent( const OEvent& ev)
@@ -110,2 +132,3 @@ OEvent::OEvent( const OEvent& ev)
 
+
 OEvent::OEvent( const QMap<int, QString> map )
@@ -118,4 +141,7 @@ OEvent::OEvent( const QMap<int, QString> map )
 
-OEvent::~OEvent() {
-    if ( data->deref() ) {
+
+OEvent::~OEvent()
+{
+    if ( data->deref() )
+    {
         delete data;
@@ -124,3 +150,6 @@ OEvent::~OEvent() {
 }
-OEvent& OEvent::operator=( const OEvent& ev) {
+
+
+OEvent& OEvent::operator=( const OEvent& ev )
+{
     if ( this == &ev ) return  *this;
@@ -135,6 +164,12 @@ OEvent& OEvent::operator=( const OEvent& ev) {
 }
-QString OEvent::description()const {
+
+
+QString OEvent::description() const
+{
     return data->description;
 }
-void OEvent::setDescription( const QString& description ) {
+
+
+void OEvent::setDescription( const QString& description )
+{
     changeOrModify();
@@ -142,3 +177,6 @@ void OEvent::setDescription( const QString& description ) {
 }
-void OEvent::setLocation( const QString& loc ) {
+
+
+void OEvent::setLocation( const QString& loc )
+{
     changeOrModify();
@@ -146,6 +184,12 @@ void OEvent::setLocation( const QString& loc ) {
 }
-QString OEvent::location()const {
+
+
+QString OEvent::location() const
+{
     return data->location;
 }
-OPimNotifyManager &OEvent::notifiers()const {
+
+
+OPimNotifyManager &OEvent::notifiers() const
+{
     // I hope we can skip the changeOrModify here
@@ -158,3 +202,6 @@ OPimNotifyManager &OEvent::notifiers()const {
 }
-bool OEvent::hasNotifiers()const {
+
+
+bool OEvent::hasNotifiers() const
+{
     if (!data->manager )
@@ -167,3 +214,6 @@ bool OEvent::hasNotifiers()const {
 }
-ORecur OEvent::recurrence()const {
+
+
+ORecur OEvent::recurrence() const
+{
     if (!data->recur)
@@ -173,3 +223,6 @@ ORecur OEvent::recurrence()const {
 }
-void OEvent::setRecurrence( const ORecur& rec) {
+
+
+void OEvent::setRecurrence( const ORecur& rec )
+{
     changeOrModify();
@@ -180,3 +233,6 @@ void OEvent::setRecurrence( const ORecur& rec) {
 }
-bool OEvent::hasRecurrence()const {
+
+
+bool OEvent::hasRecurrence() const
+{
     if (!data->recur ) return false;
@@ -184,6 +240,12 @@ bool OEvent::hasRecurrence()const {
 }
-QString OEvent::note()const {
+
+
+QString OEvent::note() const
+{
     return data->note;
 }
-void OEvent::setNote( const QString& note ) {
+
+
+void OEvent::setNote( const QString& note )
+{
     changeOrModify();
@@ -191,6 +253,12 @@ void OEvent::setNote( const QString& note ) {
 }
-QDateTime OEvent::createdDateTime()const {
+
+
+QDateTime OEvent::createdDateTime() const
+{
     return data->created;
 }
-void OEvent::setCreatedDateTime( const QDateTime& time ) {
+
+
+void OEvent::setCreatedDateTime( const QDateTime& time )
+{
     changeOrModify();
@@ -198,3 +266,6 @@ void OEvent::setCreatedDateTime( const QDateTime& time ) {
 }
-QDateTime OEvent::startDateTime()const {
+
+
+QDateTime OEvent::startDateTime() const
+{
     if ( data->isAllDay )
@@ -203,3 +274,6 @@ QDateTime OEvent::startDateTime()const {
 }
-QDateTime OEvent::startDateTimeInZone()const {
+
+
+QDateTime OEvent::startDateTimeInZone() const
+{
     /* if no timezone, or all day event or if the current and this timeZone match... */
@@ -210,3 +284,6 @@ QDateTime OEvent::startDateTimeInZone()const {
 }
-void OEvent::setStartDateTime( const QDateTime& dt ) {
+
+
+void OEvent::setStartDateTime( const QDateTime& dt )
+{
     changeOrModify();
@@ -214,3 +291,6 @@ void OEvent::setStartDateTime( const QDateTime& dt ) {
 }
-QDateTime OEvent::endDateTime()const {
+
+
+QDateTime OEvent::endDateTime() const
+{
     /*
@@ -223,3 +303,6 @@ QDateTime OEvent::endDateTime()const {
 }
-QDateTime OEvent::endDateTimeInZone()const {
+
+
+QDateTime OEvent::endDateTimeInZone() const
+{
     /* if no timezone, or all day event or if the current and this timeZone match... */
@@ -230,3 +313,6 @@ QDateTime OEvent::endDateTimeInZone()const {
 }
-void OEvent::setEndDateTime( const QDateTime& dt ) {
+
+
+void OEvent::setEndDateTime( const QDateTime& dt )
+{
     changeOrModify();
@@ -234,9 +320,18 @@ void OEvent::setEndDateTime( const QDateTime& dt ) {
 }
-bool OEvent::isMultipleDay()const {
+
+
+bool OEvent::isMultipleDay() const
+{
     return data->end.date().day() - data->start.date().day();
 }
-bool OEvent::isAllDay()const {
+
+
+bool OEvent::isAllDay() const
+{
     return data->isAllDay;
 }
-void OEvent::setAllDay( bool allDay ) {
+
+
+void OEvent::setAllDay( bool allDay )
+{
     changeOrModify();
@@ -245,3 +340,6 @@ void OEvent::setAllDay( bool allDay ) {
 }
-void OEvent::setTimeZone( const QString& tz ) {
+
+
+void OEvent::setTimeZone( const QString& tz )
+{
     changeOrModify();
@@ -249,3 +347,6 @@ void OEvent::setTimeZone( const QString& tz ) {
 }
-QString OEvent::timeZone()const {
+
+
+QString OEvent::timeZone() const
+{
     if (data->isAllDay ) return QString::fromLatin1("UTC");
@@ -253,4 +354,8 @@ QString OEvent::timeZone()const {
 }
-bool OEvent::match( const QRegExp& re )const {
-    if ( re.match( data->description ) != -1 ){
+
+
+bool OEvent::match( const QRegExp& re ) const
+{
+    if ( re.match( data->description ) != -1 )
+    {
         setLastHitField( Qtopia::DatebookDescription );
@@ -258,3 +363,4 @@ bool OEvent::match( const QRegExp& re )const {
     }
-    if ( re.match( data->note ) != -1 ){
+    if ( re.match( data->note ) != -1 )
+    {
         setLastHitField( Qtopia::Note );
@@ -262,3 +368,4 @@ bool OEvent::match( const QRegExp& re )const {
     }
-    if ( re.match( data->location ) != -1 ){
+    if ( re.match( data->location ) != -1 )
+    {
         setLastHitField( Qtopia::Location );
@@ -266,3 +373,4 @@ bool OEvent::match( const QRegExp& re )const {
     }
-    if ( re.match( data->start.toString() ) != -1 ){
+    if ( re.match( data->start.toString() ) != -1 )
+    {
         setLastHitField( Qtopia::StartDateTime );
@@ -270,3 +378,4 @@ bool OEvent::match( const QRegExp& re )const {
     }
-    if ( re.match( data->end.toString() ) != -1 ){
+    if ( re.match( data->end.toString() ) != -1 )
+    {
         setLastHitField( Qtopia::EndDateTime );
@@ -276,3 +385,6 @@ bool OEvent::match( const QRegExp& re )const {
 }
-QString OEvent::toRichText()const {
+
+
+QString OEvent::toRichText() const
+{
     QString text, value;
@@ -281,3 +393,4 @@ QString OEvent::toRichText()const {
     text += "<b><h3><img src=\"datebook/DateBook\">";
-    if ( !description().isEmpty() ) {
+    if ( !description().isEmpty() )
+    {
         text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"),  "" );
@@ -287,3 +400,4 @@ QString OEvent::toRichText()const {
     // location
-    if ( !(value = location()).isEmpty() ) {
+    if ( !( value = location() ).isEmpty() )
+    {
         text += "<b>" + QObject::tr( "Location:" ) + "</b> ";
@@ -293,3 +407,4 @@ QString OEvent::toRichText()const {
     // all day event
-    if ( isAllDay() ) {
+    if ( isAllDay() )
+    {
         text += "<b><i>" + QObject::tr( "This is an all day event" ) + "</i></b><br>";
@@ -297,3 +412,4 @@ QString OEvent::toRichText()const {
     // multiple day event
-    else if ( isMultipleDay () ) {
+    else if ( isMultipleDay () )
+    {
         text += "<b><i>" + QObject::tr( "This is a multiple day event" ) + "</i></b><br>";
@@ -301,5 +417,7 @@ QString OEvent::toRichText()const {
     // start & end times
-    else {
+    else
+    {
         // start time
-        if ( startDateTime().isValid() ) {
+        if ( startDateTime().isValid() )
+        {
             text += "<b>" + QObject::tr( "Start:") + "</b> ";
@@ -310,3 +428,4 @@ QString OEvent::toRichText()const {
         // end time
-        if ( endDateTime().isValid() ) {
+        if ( endDateTime().isValid() )
+        {
             text += "<b>" + QObject::tr( "End:") + "</b> ";
@@ -318,3 +437,4 @@ QString OEvent::toRichText()const {
     // categories
-    if ( categoryNames("Calendar").count() ){
+    if ( categoryNames( "Calendar" ).count() )
+    {
             text += "<b>" + QObject::tr( "Category:") + "</b> ";
@@ -325,3 +445,4 @@ QString OEvent::toRichText()const {
     //notes
-    if ( !note().isEmpty() ) {
+    if ( !note().isEmpty() )
+    {
         text += "<b>" + QObject::tr( "Note:") + "</b><br>";
@@ -333,3 +454,6 @@ QString OEvent::toRichText()const {
 }
-QString OEvent::toShortText()const {
+
+
+QString OEvent::toShortText() const
+{
     QString text;
@@ -348,19 +472,38 @@ QString OEvent::toShortText()const {
 }
-QString OEvent::type()const {
+
+
+QString OEvent::type() const
+{
     return QString::fromLatin1("OEvent");
 }
-QString OEvent::recordField( int /*id */ )const {
+
+
+QString OEvent::recordField( int /*id */ ) const
+{
     return QString::null;
 }
-int OEvent::rtti() {
+
+
+int OEvent::rtti()
+{
     return OPimResolver::DateBook;
 }
-bool OEvent::loadFromStream( QDataStream& ) {
+
+
+bool OEvent::loadFromStream( QDataStream& )
+{
     return true;
 }
-bool OEvent::saveToStream( QDataStream& )const {
+
+
+bool OEvent::saveToStream( QDataStream& ) const
+{
     return true;
 }
-void OEvent::changeOrModify() {
-    if ( data->count != 1 ) {
+
+
+void OEvent::changeOrModify()
+{
+    if ( data->count != 1 )
+    {
         data->deref();
@@ -384,3 +527,4 @@ void OEvent::changeOrModify() {
 
-        if ( data->child ) {
+        if ( data->child )
+        {
             d2->child = new QArray<int>( *data->child );
@@ -392,4 +536,8 @@ void OEvent::changeOrModify() {
 }
-void OEvent::deref() {
-    if ( data->deref() ) {
+
+
+void OEvent::deref()
+{
+    if ( data->deref() )
+    {
         delete data;
@@ -403,3 +551,4 @@ void OEvent::deref() {
 // Encoding should happen at one place, only ! (eilers)
-QMap<int, QString> OEvent::toMap()const {
+QMap<int, QString> OEvent::toMap() const
+{
     QMap<int, QString> retMap;
@@ -422,6 +571,8 @@ QMap<int, QString> OEvent::toMap()const {
             retMap.insert( OEvent::FRecParent, QString::number( parent() ) );
-    if( children().count() ){
+    if ( children().count() )
+    {
             QArray<int> childr = children();
             QString buf;
-            for ( uint i = 0; i < childr.count(); i++ ) {
+        for ( uint i = 0; i < childr.count(); i++ )
+        {
                     if ( i != 0 ) buf += " ";
@@ -433,3 +584,4 @@ QMap<int, QString> OEvent::toMap()const {
     // Add recurrence stuff
-    if( hasRecurrence() ){
+    if ( hasRecurrence() )
+    {
             ORecur recur = recurrence();
@@ -444,3 +596,5 @@ QMap<int, QString> OEvent::toMap()const {
             retMap.insert( OEvent::FRExceptions, recFields[ORecur::Exceptions] );
-    } else {
+    }
+    else
+    {
             ORecur recur = recurrence();
@@ -453,2 +607,3 @@ QMap<int, QString> OEvent::toMap()const {
 
+
 void OEvent::fromMap( const QMap<int, QString>& map )
@@ -474,3 +629,4 @@ void OEvent::fromMap( const QMap<int, QString>& map )
         int sound = ( ( map[OEvent::FSound] == "loud" ) ? OPimAlarm::Loud : OPimAlarm::Silent );
-        if ( ( alarmTime != -1 )  ){
+    if ( ( alarmTime != -1 ) )
+    {
                 QDateTime dt = startDateTime().addSecs( -1*alarmTime*60 );
@@ -479,3 +635,4 @@ void OEvent::fromMap( const QMap<int, QString>& map )
         }
-        if ( !map[OEvent::FTimeZone].isEmpty() && ( map[OEvent::FTimeZone] != "None" ) ){
+    if ( !map[ OEvent::FTimeZone ].isEmpty() && ( map[ OEvent::FTimeZone ] != "None" ) )
+    {
                 setTimeZone( map[OEvent::FTimeZone] );
@@ -487,3 +644,4 @@ void OEvent::fromMap( const QMap<int, QString>& map )
         /* AllDay is always in UTC */
-        if ( isAllDay() ) {
+    if ( isAllDay() )
+    {
                 OTimeZone utc = OTimeZone::utc();
@@ -492,3 +650,5 @@ void OEvent::fromMap( const QMap<int, QString>& map )
                 setTimeZone( "UTC"); // make sure it is really utc
-        }else {
+    }
+    else
+    {
                 /* to current date time */
@@ -507,5 +667,7 @@ void OEvent::fromMap( const QMap<int, QString>& map )
 
-        if ( !map[OEvent::FRecChildren].isEmpty() ){
+    if ( !map[ OEvent::FRecChildren ].isEmpty() )
+    {
                 QStringList list = QStringList::split(' ', map[OEvent::FRecChildren] );
-                for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
+        for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+        {
                         addChild( (*it).toInt() );
@@ -515,3 +677,4 @@ void OEvent::fromMap( const QMap<int, QString>& map )
         // Fill recurrence stuff and put it directly into the ORecur-Object using fromMap..
-        if( !map[OEvent::FRType].isEmpty() ){
+    if ( !map[ OEvent::FRType ].isEmpty() )
+    {
                 QMap<int, QString> recFields;
@@ -532,6 +695,10 @@ void OEvent::fromMap( const QMap<int, QString>& map )
 
-int OEvent::parent()const {
+int OEvent::parent() const
+{
     return data->parent;
 }
-void OEvent::setParent( int uid ) {
+
+
+void OEvent::setParent( int uid )
+{
     changeOrModify();
@@ -539,3 +706,6 @@ void OEvent::setParent( int uid ) {
 }
-QArray<int> OEvent::children() const{
+
+
+QArray<int> OEvent::children() const
+{
     if (!data->child) return QArray<int>();
@@ -544,3 +714,6 @@ QArray<int> OEvent::children() const{
 }
-void OEvent::setChildren( const QArray<int>& arr ) {
+
+
+void OEvent::setChildren( const QArray<int>& arr )
+{
     changeOrModify();
@@ -551,8 +724,14 @@ void OEvent::setChildren( const QArray<int>& arr ) {
 }
-void OEvent::addChild( int uid ) {
+
+
+void OEvent::addChild( int uid )
+{
     changeOrModify();
-    if (!data->child ) {
+    if ( !data->child )
+    {
         data->child = new QArray<int>(1);
         (*data->child)[0] = uid;
-    }else{
+    }
+    else
+    {
         int count = data->child->count();
@@ -562,3 +741,6 @@ void OEvent::addChild( int uid ) {
 }
-void OEvent::removeChild( int uid ) {
+
+
+void OEvent::removeChild( int uid )
+{
     if (!data->child || !data->child->contains( uid ) ) return;
@@ -568,4 +750,6 @@ void OEvent::removeChild( int uid ) {
     uint count = data->child->count();
-    for ( uint i = 0; i < count; i++ ) {
-        if ( (*data->child)[i] != uid ) {
+    for ( uint i = 0; i < count; i++ )
+    {
+        if ( ( *data->child ) [ i ] != uid )
+        {
             newAr[j] = (*data->child)[i];
@@ -576,5 +760,8 @@ void OEvent::removeChild( int uid ) {
 }
-struct OEffectiveEvent::Data : public QShared {
-    Data() : QShared() {
-    }
+
+
+struct OEffectiveEvent::Data : public QShared
+{
+    Data() : QShared()
+    {}
     OEvent event;
@@ -586,3 +773,5 @@ struct OEffectiveEvent::Data : public QShared {
 
-OEffectiveEvent::OEffectiveEvent() {
+
+OEffectiveEvent::OEffectiveEvent()
+{
     data = new Data;
@@ -592,4 +781,7 @@ OEffectiveEvent::OEffectiveEvent() {
 }
+
+
 OEffectiveEvent::OEffectiveEvent( const OEvent& ev, const QDate& startDate,
-                                  Position pos ) {
+                                  Position pos )
+{
     data = new Data;
@@ -609,3 +801,6 @@ OEffectiveEvent::OEffectiveEvent( const OEvent& ev, const QDate& startDate,
 }
-OEffectiveEvent::OEffectiveEvent( const OEffectiveEvent& ev) {
+
+
+OEffectiveEvent::OEffectiveEvent( const OEffectiveEvent& ev )
+{
     data = ev.data;
@@ -613,4 +808,8 @@ OEffectiveEvent::OEffectiveEvent( const OEffectiveEvent& ev) {
 }
-OEffectiveEvent::~OEffectiveEvent() {
-    if ( data->deref() ) {
+
+
+OEffectiveEvent::~OEffectiveEvent()
+{
+    if ( data->deref() )
+    {
         delete data;
@@ -619,3 +818,6 @@ OEffectiveEvent::~OEffectiveEvent() {
 }
-OEffectiveEvent& OEffectiveEvent::operator=( const OEffectiveEvent& ev ) {
+
+
+OEffectiveEvent& OEffectiveEvent::operator=( const OEffectiveEvent& ev )
+{
     if ( *this == ev ) return  *this;
@@ -629,3 +831,5 @@ OEffectiveEvent& OEffectiveEvent::operator=( const OEffectiveEvent& ev ) {
 
-void OEffectiveEvent::setStartTime( const QTime& ti) {
+
+void OEffectiveEvent::setStartTime( const QTime& ti )
+{
     changeOrModify();
@@ -633,3 +837,6 @@ void OEffectiveEvent::setStartTime( const QTime& ti) {
 }
-void OEffectiveEvent::setEndTime( const QTime& en) {
+
+
+void OEffectiveEvent::setEndTime( const QTime& en )
+{
     changeOrModify();
@@ -637,3 +844,6 @@ void OEffectiveEvent::setEndTime( const QTime& en) {
 }
-void OEffectiveEvent::setEvent( const OEvent& ev) {
+
+
+void OEffectiveEvent::setEvent( const OEvent& ev )
+{
     changeOrModify();
@@ -641,3 +851,6 @@ void OEffectiveEvent::setEvent( const OEvent& ev) {
 }
-void OEffectiveEvent::setDate( const QDate& da) {
+
+
+void OEffectiveEvent::setDate( const QDate& da )
+{
     changeOrModify();
@@ -645,5 +858,9 @@ void OEffectiveEvent::setDate( const QDate& da) {
 }
+
+
 void OEffectiveEvent::setEffectiveDates( const QDate& from,
-                                         const QDate& to ) {
-    if (!from.isValid() ) {
+        const QDate& to )
+{
+    if ( !from.isValid() )
+    {
         data->dates = false;
@@ -655,24 +872,48 @@ void OEffectiveEvent::setEffectiveDates( const QDate& from,
 }
-QString OEffectiveEvent::description()const {
+
+
+QString OEffectiveEvent::description() const
+{
     return data->event.description();
 }
-QString OEffectiveEvent::location()const {
+
+
+QString OEffectiveEvent::location() const
+{
     return data->event.location();
 }
-QString OEffectiveEvent::note()const {
+
+
+QString OEffectiveEvent::note() const
+{
     return data->event.note();
 }
-OEvent OEffectiveEvent::event()const {
+
+
+OEvent OEffectiveEvent::event() const
+{
     return data->event;
 }
-QTime OEffectiveEvent::startTime()const {
+
+
+QTime OEffectiveEvent::startTime() const
+{
     return data->start;
 }
-QTime OEffectiveEvent::endTime()const {
+
+
+QTime OEffectiveEvent::endTime() const
+{
     return data->end;
 }
-QDate OEffectiveEvent::date()const {
+
+
+QDate OEffectiveEvent::date() const
+{
     return data->date;
 }
-int OEffectiveEvent::length()const {
+
+
+int OEffectiveEvent::length() const
+{
     return (data->end.hour() * 60 - data->start.hour() * 60)
@@ -680,3 +921,6 @@ int OEffectiveEvent::length()const {
 }
-int OEffectiveEvent::size()const {
+
+
+int OEffectiveEvent::size() const
+{
     return ( data->end.hour() - data->start.hour() ) * 3600
@@ -685,3 +929,6 @@ int OEffectiveEvent::size()const {
 }
-QDate OEffectiveEvent::startDate()const {
+
+
+QDate OEffectiveEvent::startDate() const
+{
     if ( data->dates )
@@ -693,3 +940,6 @@ QDate OEffectiveEvent::startDate()const {
 }
-QDate OEffectiveEvent::endDate()const {
+
+
+QDate OEffectiveEvent::endDate() const
+{
     if ( data->dates )
@@ -701,4 +951,8 @@ QDate OEffectiveEvent::endDate()const {
 }
-void OEffectiveEvent::deref() {
-    if ( data->deref() ) {
+
+
+void OEffectiveEvent::deref()
+{
+    if ( data->deref() )
+    {
         delete data;
@@ -707,4 +961,8 @@ void OEffectiveEvent::deref() {
 }
-void OEffectiveEvent::changeOrModify() {
-    if ( data->count != 1 ) {
+
+
+void OEffectiveEvent::changeOrModify()
+{
+    if ( data->count != 1 )
+    {
         data->deref();
@@ -721,3 +979,6 @@ void OEffectiveEvent::changeOrModify() {
 }
-bool OEffectiveEvent::operator<( const OEffectiveEvent &e ) const{
+
+
+bool OEffectiveEvent::operator<( const OEffectiveEvent &e ) const
+{
     if ( data->date < e.date() )
@@ -729,6 +990,12 @@ bool OEffectiveEvent::operator<( const OEffectiveEvent &e ) const{
 }
-bool OEffectiveEvent::operator<=( const OEffectiveEvent &e ) const{
+
+
+bool OEffectiveEvent::operator<=( const OEffectiveEvent &e ) const
+{
     return (data->date <= e.date() );
 }
-bool OEffectiveEvent::operator==( const OEffectiveEvent &e ) const {
+
+
+bool OEffectiveEvent::operator==( const OEffectiveEvent &e ) const
+{
     return ( date() == e.date()
@@ -738,9 +1005,18 @@ bool OEffectiveEvent::operator==( const OEffectiveEvent &e ) const {
 }
-bool OEffectiveEvent::operator!=( const OEffectiveEvent &e ) const {
+
+
+bool OEffectiveEvent::operator!=( const OEffectiveEvent &e ) const
+{
     return !(*this == e );
 }
-bool OEffectiveEvent::operator>( const OEffectiveEvent &e ) const {
+
+
+bool OEffectiveEvent::operator>( const OEffectiveEvent &e ) const
+{
     return !(*this <= e );
 }
-bool OEffectiveEvent::operator>= ( const OEffectiveEvent &e ) const {
+
+
+bool OEffectiveEvent::operator>= ( const OEffectiveEvent &e ) const
+{
     return !(*this < e);