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
@@ -1,5 +1,5 @@
 /*
                              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>
             .=l.
@@ -27,20 +27,24 @@
                              Boston, MA 02111-1307, USA.
 */
-#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>
 #include <opie2/opimresolver.h>
 #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
     // month. Equals the "row" is is in in the month view
@@ -54,13 +58,20 @@ int OCalendarHelper::week( const QDate& date) {
     return week;
 }
-int OCalendarHelper::ocurrence( const QDate& date) {
+
+
+int OCalendarHelper::ocurrence( const QDate& date )
+{
     // calculates the number of occurrances of this day of the
     // week till the given date (e.g 3rd Wednesday of the month)
     return ( date.day() - 1 ) / 7 + 1;
 }
-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;
         ++dayOfWeek;
@@ -68,11 +79,17 @@ int OCalendarHelper::dayOfWeek( char day ) {
     return dayOfWeek;
 }
-int OCalendarHelper::monthDiff( const QDate& first, const QDate& second ) {
+
+
+int OCalendarHelper::monthDiff( const QDate& first, const QDate& second )
+{
     return ( second.year() - first.year() ) * 12 +
         second.month() - first.month();
 }
 
-struct OEvent::Data : public QShared {
-    Data() : QShared() {
+
+struct OEvent::Data : public QShared
+{
+    Data() : QShared()
+    {
         child = 0;
         recur = 0;
@@ -81,5 +98,6 @@ struct OEvent::Data : public QShared {
         parent = 0;
     }
-    ~Data() {
+    ~Data()
+    {
         delete manager;
         delete recur;
@@ -99,8 +117,12 @@ struct OEvent::Data : public QShared {
 };
 
+
 OEvent::OEvent( int uid )
-    : OPimRecord( uid ) {
+        : OPimRecord( uid )
+{
     data = new Data;
 }
+
+
 OEvent::OEvent( const OEvent& ev)
     : OPimRecord( ev ), data( ev.data )
@@ -109,4 +131,5 @@ OEvent::OEvent( const OEvent& ev)
 }
 
+
 OEvent::OEvent( const QMap<int, QString> map )
     : OPimRecord( 0 )
@@ -117,11 +140,17 @@ OEvent::OEvent( const QMap<int, QString> map )
 }
 
-OEvent::~OEvent() {
-    if ( data->deref() ) {
+
+OEvent::~OEvent()
+{
+    if ( data->deref() )
+    {
         delete data;
         data = 0;
     }
 }
-OEvent& OEvent::operator=( const OEvent& ev) {
+
+
+OEvent& OEvent::operator=( const OEvent& ev )
+{
     if ( this == &ev ) return  *this;
 
@@ -134,19 +163,34 @@ OEvent& OEvent::operator=( const OEvent& ev) {
     return *this;
 }
-QString OEvent::description()const {
+
+
+QString OEvent::description() const
+{
     return data->description;
 }
-void OEvent::setDescription( const QString& description ) {
+
+
+void OEvent::setDescription( const QString& description )
+{
     changeOrModify();
     data->description = description;
 }
-void OEvent::setLocation( const QString& loc ) {
+
+
+void OEvent::setLocation( const QString& loc )
+{
     changeOrModify();
     data->location = 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
     // the notifier should take care of it
@@ -157,5 +201,8 @@ OPimNotifyManager &OEvent::notifiers()const {
     return *data->manager;
 }
-bool OEvent::hasNotifiers()const {
+
+
+bool OEvent::hasNotifiers() const
+{
     if (!data->manager )
         return false;
@@ -166,5 +213,8 @@ bool OEvent::hasNotifiers()const {
     return true;
 }
-ORecur OEvent::recurrence()const {
+
+
+ORecur OEvent::recurrence() const
+{
     if (!data->recur)
         data->recur = new ORecur;
@@ -172,5 +222,8 @@ ORecur OEvent::recurrence()const {
     return *data->recur;
 }
-void OEvent::setRecurrence( const ORecur& rec) {
+
+
+void OEvent::setRecurrence( const ORecur& rec )
+{
     changeOrModify();
     if (data->recur )
@@ -179,28 +232,49 @@ void OEvent::setRecurrence( const ORecur& rec) {
         data->recur = new ORecur( rec );
 }
-bool OEvent::hasRecurrence()const {
+
+
+bool OEvent::hasRecurrence() const
+{
     if (!data->recur ) return false;
     return data->recur->doesRecur();
 }
-QString OEvent::note()const {
+
+
+QString OEvent::note() const
+{
     return data->note;
 }
-void OEvent::setNote( const QString& note ) {
+
+
+void OEvent::setNote( const QString& note )
+{
     changeOrModify();
     data->note = 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();
     data->created = time;
 }
-QDateTime OEvent::startDateTime()const {
+
+
+QDateTime OEvent::startDateTime() const
+{
     if ( data->isAllDay )
         return QDateTime( data->start.date(), QTime(0, 0, 0 ) );
     return data->start;
 }
-QDateTime OEvent::startDateTimeInZone()const {
+
+
+QDateTime OEvent::startDateTimeInZone() const
+{
     /* if no timezone, or all day event or if the current and this timeZone match... */
     if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return startDateTime();
@@ -209,9 +283,15 @@ QDateTime OEvent::startDateTimeInZone()const {
     return zone.toDateTime( data->start, OTimeZone::current() );
 }
-void OEvent::setStartDateTime( const QDateTime& dt ) {
+
+
+void OEvent::setStartDateTime( const QDateTime& dt )
+{
     changeOrModify();
     data->start = dt;
 }
-QDateTime OEvent::endDateTime()const {
+
+
+QDateTime OEvent::endDateTime() const
+{
     /*
      * if all Day event the end time needs
@@ -222,5 +302,8 @@ QDateTime OEvent::endDateTime()const {
     return data->end;
 }
-QDateTime OEvent::endDateTimeInZone()const {
+
+
+QDateTime OEvent::endDateTimeInZone() const
+{
     /* if no timezone, or all day event or if the current and this timeZone match... */
     if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return endDateTime();
@@ -229,45 +312,71 @@ QDateTime OEvent::endDateTimeInZone()const {
     return zone.toDateTime( data->end, OTimeZone::current() );
 }
-void OEvent::setEndDateTime( const QDateTime& dt ) {
+
+
+void OEvent::setEndDateTime( const QDateTime& dt )
+{
     changeOrModify();
     data->end =    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();
     data->isAllDay = allDay;
     if (allDay ) data->timezone = "UTC";
 }
-void OEvent::setTimeZone( const QString& tz ) {
+
+
+void OEvent::setTimeZone( const QString& tz )
+{
     changeOrModify();
     data->timezone = tz;
 }
-QString OEvent::timeZone()const {
+
+
+QString OEvent::timeZone() const
+{
     if (data->isAllDay ) return QString::fromLatin1("UTC");
     return data->timezone;
 }
-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 );
         return true;
     }
-    if ( re.match( data->note ) != -1 ){
+    if ( re.match( data->note ) != -1 )
+    {
         setLastHitField( Qtopia::Note );
         return true;
     }
-    if ( re.match( data->location ) != -1 ){
+    if ( re.match( data->location ) != -1 )
+    {
         setLastHitField( Qtopia::Location );
         return true;
     }
-    if ( re.match( data->start.toString() ) != -1 ){
+    if ( re.match( data->start.toString() ) != -1 )
+    {
         setLastHitField( Qtopia::StartDateTime );
         return true;
     }
-    if ( re.match( data->end.toString() ) != -1 ){
+    if ( re.match( data->end.toString() ) != -1 )
+    {
         setLastHitField( Qtopia::EndDateTime );
         return true;
@@ -275,10 +384,14 @@ bool OEvent::match( const QRegExp& re )const {
     return false;
 }
-QString OEvent::toRichText()const {
+
+
+QString OEvent::toRichText() const
+{
     QString text, value;
 
     // description
     text += "<b><h3><img src=\"datebook/DateBook\">";
-    if ( !description().isEmpty() ) {
+    if ( !description().isEmpty() )
+    {
         text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"),  "" );
     }
@@ -286,5 +399,6 @@ QString OEvent::toRichText()const {
 
     // location
-    if ( !(value = location()).isEmpty() ) {
+    if ( !( value = location() ).isEmpty() )
+    {
         text += "<b>" + QObject::tr( "Location:" ) + "</b> ";
         text += Qtopia::escapeString(value) + "<br>";
@@ -292,15 +406,19 @@ 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>";
     }
     // multiple day event
-    else if ( isMultipleDay () ) {
+    else if ( isMultipleDay () )
+    {
         text += "<b><i>" + QObject::tr( "This is a multiple day event" ) + "</i></b><br>";
     }
     // start & end times
-    else {
+    else
+    {
         // start time
-        if ( startDateTime().isValid() ) {
+        if ( startDateTime().isValid() )
+        {
             text += "<b>" + QObject::tr( "Start:") + "</b> ";
             text += Qtopia::escapeString(startDateTime().toString() ).
@@ -309,5 +427,6 @@ QString OEvent::toRichText()const {
 
         // end time
-        if ( endDateTime().isValid() ) {
+        if ( endDateTime().isValid() )
+        {
             text += "<b>" + QObject::tr( "End:") + "</b> ";
             text += Qtopia::escapeString(endDateTime().toString() ).
@@ -317,5 +436,6 @@ QString OEvent::toRichText()const {
 
     // categories
-    if ( categoryNames("Calendar").count() ){
+    if ( categoryNames( "Calendar" ).count() )
+    {
             text += "<b>" + QObject::tr( "Category:") + "</b> ";
             text += categoryNames("Calendar").join(", ");
@@ -324,5 +444,6 @@ QString OEvent::toRichText()const {
 
     //notes
-    if ( !note().isEmpty() ) {
+    if ( !note().isEmpty() )
+    {
         text += "<b>" + QObject::tr( "Note:") + "</b><br>";
         text += note();
@@ -332,5 +453,8 @@ QString OEvent::toRichText()const {
     return text;
 }
-QString OEvent::toShortText()const {
+
+
+QString OEvent::toShortText() const
+{
     QString text;
     text += QString::number( startDateTime().date().day() );
@@ -347,21 +471,40 @@ QString OEvent::toShortText()const {
     return text;
 }
-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();
         Data* d2 = new Data;
@@ -383,5 +526,6 @@ void OEvent::changeOrModify() {
         d2->parent = data->parent;
 
-        if ( data->child ) {
+        if ( data->child )
+        {
             d2->child = new QArray<int>( *data->child );
             d2->child->detach();
@@ -391,6 +535,10 @@ void OEvent::changeOrModify() {
     }
 }
-void OEvent::deref() {
-    if ( data->deref() ) {
+
+
+void OEvent::deref()
+{
+    if ( data->deref() )
+    {
         delete data;
         data = 0;
@@ -402,5 +550,6 @@ void OEvent::deref() {
 // for it and for all other places..
 // Encoding should happen at one place, only ! (eilers)
-QMap<int, QString> OEvent::toMap()const {
+QMap<int, QString> OEvent::toMap() const
+{
     QMap<int, QString> retMap;
 
@@ -421,8 +570,10 @@ QMap<int, QString> OEvent::toMap()const {
     if( parent() )
             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 += " ";
                     buf += QString::number( childr[i] );
@@ -432,5 +583,6 @@ QMap<int, QString> OEvent::toMap()const {
     
     // Add recurrence stuff
-    if( hasRecurrence() ){
+    if ( hasRecurrence() )
+    {
             ORecur recur = recurrence();
             QMap<int, QString> recFields = recur.toMap();
@@ -443,5 +595,7 @@ QMap<int, QString> OEvent::toMap()const {
             retMap.insert( OEvent::FRCreated, recFields[ORecur::Created] );
             retMap.insert( OEvent::FRExceptions, recFields[ORecur::Exceptions] );
-    } else {
+    }
+    else
+    {
             ORecur recur = recurrence();
             QMap<int, QString> recFields = recur.toMap();
@@ -452,4 +606,5 @@ QMap<int, QString> OEvent::toMap()const {
 }
 
+
 void OEvent::fromMap( const QMap<int, QString>& map )
 {
@@ -473,10 +628,12 @@ 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 );
                 OPimAlarm al( sound ,  dt  );
                 notifiers().add( al );
         }
-        if ( !map[OEvent::FTimeZone].isEmpty() && ( map[OEvent::FTimeZone] != "None" ) ){
+    if ( !map[ OEvent::FTimeZone ].isEmpty() && ( map[ OEvent::FTimeZone ] != "None" ) )
+    {
                 setTimeZone( map[OEvent::FTimeZone] );
         }
@@ -486,10 +643,13 @@ void OEvent::fromMap( const QMap<int, QString>& map )
 
         /* AllDay is always in UTC */
-        if ( isAllDay() ) {
+    if ( isAllDay() )
+    {
                 OTimeZone utc = OTimeZone::utc();
                 setStartDateTime( utc.fromUTCDateTime( start ) );
                 setEndDateTime  ( utc.fromUTCDateTime( end   ) );
                 setTimeZone( "UTC"); // make sure it is really utc
-        }else {
+    }
+    else
+    {
                 /* to current date time */
                 // qWarning(" Start is %d", start );
@@ -506,7 +666,9 @@ void OEvent::fromMap( const QMap<int, QString>& map )
                 setParent( map[OEvent::FRecParent].toInt() );
 
-        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() );
                 }
@@ -514,5 +676,6 @@ 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;
                 recFields.insert( ORecur::RType, map[OEvent::FRType] );
@@ -531,17 +694,27 @@ 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();
     data->parent = uid;
 }
-QArray<int> OEvent::children() const{
+
+
+QArray<int> OEvent::children() const
+{
     if (!data->child) return QArray<int>();
     else
         return data->child->copy();
 }
-void OEvent::setChildren( const QArray<int>& arr ) {
+
+
+void OEvent::setChildren( const QArray<int>& arr )
+{
     changeOrModify();
     if (data->child) delete data->child;
@@ -550,10 +723,16 @@ void OEvent::setChildren( const QArray<int>& arr ) {
     data->child->detach();
 }
-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();
         data->child->resize( count + 1 );
@@ -561,5 +740,8 @@ void OEvent::addChild( int uid ) {
     }
 }
-void OEvent::removeChild( int uid ) {
+
+
+void OEvent::removeChild( int uid )
+{
     if (!data->child || !data->child->contains( uid ) ) return;
     changeOrModify();
@@ -567,6 +749,8 @@ void OEvent::removeChild( int uid ) {
     int j = 0;
     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];
             j++;
@@ -575,7 +759,10 @@ void OEvent::removeChild( int uid ) {
     (*data->child) = newAr;
 }
-struct OEffectiveEvent::Data : public QShared {
-    Data() : QShared() {
-    }
+
+
+struct OEffectiveEvent::Data : public QShared
+{
+    Data() : QShared()
+    {}
     OEvent event;
     QDate date;
@@ -585,5 +772,7 @@ struct OEffectiveEvent::Data : public QShared {
 };
 
-OEffectiveEvent::OEffectiveEvent() {
+
+OEffectiveEvent::OEffectiveEvent()
+{
     data = new Data;
     data->date = QDate::currentDate();
@@ -591,6 +780,9 @@ OEffectiveEvent::OEffectiveEvent() {
     data->dates = false;
 }
+
+
 OEffectiveEvent::OEffectiveEvent( const OEvent& ev, const QDate& startDate,
-                                  Position pos ) {
+                                  Position pos )
+{
     data = new Data;
     data->event = ev;
@@ -608,15 +800,25 @@ OEffectiveEvent::OEffectiveEvent( const OEvent& ev, const QDate& startDate,
     data->dates = false;
 }
-OEffectiveEvent::OEffectiveEvent( const OEffectiveEvent& ev) {
+
+
+OEffectiveEvent::OEffectiveEvent( const OEffectiveEvent& ev )
+{
     data = ev.data;
     data->ref();
 }
-OEffectiveEvent::~OEffectiveEvent() {
-    if ( data->deref() ) {
+
+
+OEffectiveEvent::~OEffectiveEvent()
+{
+    if ( data->deref() )
+    {
         delete data;
         data = 0;
     }
 }
-OEffectiveEvent& OEffectiveEvent::operator=( const OEffectiveEvent& ev ) {
+
+
+OEffectiveEvent& OEffectiveEvent::operator=( const OEffectiveEvent& ev )
+{
     if ( *this == ev ) return  *this;
 
@@ -628,23 +830,38 @@ OEffectiveEvent& OEffectiveEvent::operator=( const OEffectiveEvent& ev ) {
 }
 
-void OEffectiveEvent::setStartTime( const QTime& ti) {
+
+void OEffectiveEvent::setStartTime( const QTime& ti )
+{
     changeOrModify();
     data->start = ti;
 }
-void OEffectiveEvent::setEndTime( const QTime& en) {
+
+
+void OEffectiveEvent::setEndTime( const QTime& en )
+{
     changeOrModify();
     data->end = en;
 }
-void OEffectiveEvent::setEvent( const OEvent& ev) {
+
+
+void OEffectiveEvent::setEvent( const OEvent& ev )
+{
     changeOrModify();
     data->event = ev;
 }
-void OEffectiveEvent::setDate( const QDate& da) {
+
+
+void OEffectiveEvent::setDate( const QDate& da )
+{
     changeOrModify();
     data->date = da;
 }
+
+
 void OEffectiveEvent::setEffectiveDates( const QDate& from,
-                                         const QDate& to ) {
-    if (!from.isValid() ) {
+        const QDate& to )
+{
+    if ( !from.isValid() )
+    {
         data->dates = false;
         return;
@@ -654,35 +871,65 @@ void OEffectiveEvent::setEffectiveDates( const QDate& from,
     data->endDate = to;
 }
-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)
         + QABS(data->start.minute() - data->end.minute() );
 }
-int OEffectiveEvent::size()const {
+
+
+int OEffectiveEvent::size() const
+{
     return ( data->end.hour() - data->start.hour() ) * 3600
         + (data->end.minute() - data->start.minute() * 60
         + data->end.second() - data->start.second() );
 }
-QDate OEffectiveEvent::startDate()const {
+
+
+QDate OEffectiveEvent::startDate() const
+{
     if ( data->dates )
         return data->startDate;
@@ -692,5 +939,8 @@ QDate OEffectiveEvent::startDate()const {
         return data->event.startDateTime().date();
 }
-QDate OEffectiveEvent::endDate()const {
+
+
+QDate OEffectiveEvent::endDate() const
+{
     if ( data->dates )
         return data->endDate;
@@ -700,12 +950,20 @@ QDate OEffectiveEvent::endDate()const {
         return data->event.endDateTime().date();
 }
-void OEffectiveEvent::deref() {
-    if ( data->deref() ) {
+
+
+void OEffectiveEvent::deref()
+{
+    if ( data->deref() )
+    {
         delete data;
         data = 0;
     }
 }
-void OEffectiveEvent::changeOrModify() {
-    if ( data->count != 1 ) {
+
+
+void OEffectiveEvent::changeOrModify()
+{
+    if ( data->count != 1 )
+    {
         data->deref();
         Data* d2 = new Data;
@@ -720,5 +978,8 @@ void OEffectiveEvent::changeOrModify() {
     }
 }
-bool OEffectiveEvent::operator<( const OEffectiveEvent &e ) const{
+
+
+bool OEffectiveEvent::operator<( const OEffectiveEvent &e ) const
+{
     if ( data->date < e.date() )
         return TRUE;
@@ -728,8 +989,14 @@ bool OEffectiveEvent::operator<( const OEffectiveEvent &e ) const{
         return FALSE;
 }
-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()
              && startTime() == e.startTime()
@@ -737,11 +1004,20 @@ bool OEffectiveEvent::operator==( const OEffectiveEvent &e ) const {
              && event() == e.event() );
 }
-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);
 }