[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-pim
Subject:    [Kde-pim] KDE/kdepimlibs/kcal
From:       Allen Winter <winter () kde ! org>
Date:       2006-07-25 23:41:01
Message-ID: 1153870861.045053.13781.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 566377 by winterz:

Rename RecurrenceRule::Observer to RecurrenceRule::RuleObserver.
This is needed because the Recurrence class also has an Observer
subclass .. and that apparently causes problems with some compilers.

CCMAIL: kde-pim@kde.org,Ch.Ehrlicher@gmx.de


 M  +1 -1      recurrence.cpp  
 M  +1 -1      recurrence.h  
 M  +3 -3      recurrencerule.cpp  
 M  +6 -7      recurrencerule.h  


--- trunk/KDE/kdepimlibs/kcal/recurrence.cpp #566376:566377
@@ -47,7 +47,7 @@
 }
 
 Recurrence::Recurrence( const Recurrence &r )
-: RecurrenceRule::Observer(),
+: RecurrenceRule::RuleObserver(),
   mRDateTimes( r.mRDateTimes ), mRDates( r.mRDates ),
   mExDateTimes( r.mExDateTimes ), mExDates( r.mExDates ),
   mStartDateTime( r.mStartDateTime ),
--- trunk/KDE/kdepimlibs/kcal/recurrence.h #566376:566377
@@ -86,7 +86,7 @@
   the specified type. The add* and the other set* methods will change only
   the first recurrence rule, but leave the others untouched.
 */
-class KCAL_EXPORT Recurrence : public RecurrenceRule::Observer
+class KCAL_EXPORT Recurrence : public RecurrenceRule::RuleObserver
 {
   public:
     class Observer {
--- trunk/KDE/kdepimlibs/kcal/recurrencerule.cpp #566376:566377
@@ -539,13 +539,13 @@
   return true;
 }
 
-void RecurrenceRule::addObserver( Observer *observer )
+void RecurrenceRule::addObserver( RuleObserver *observer )
 {
   if ( !mObservers.contains( observer ) )
     mObservers.append( observer );
 }
 
-void RecurrenceRule::removeObserver( Observer *observer )
+void RecurrenceRule::removeObserver( RuleObserver *observer )
 {
   if ( mObservers.contains( observer ) )
     mObservers.removeAll( observer );
@@ -631,7 +631,7 @@
   mDirty = true;
   mCached = false;
   mCachedDates.clear();
-  for ( QList<Observer*>::ConstIterator it = mObservers.begin();
+  for ( QList<RuleObserver*>::ConstIterator it = mObservers.begin();
         it != mObservers.end(); ++it ) {
     if ( (*it) ) (*it)->recurrenceChanged( this );
   }
--- trunk/KDE/kdepimlibs/kcal/recurrencerule.h #566376:566377
@@ -25,10 +25,9 @@
 #define KCAL_RECURRENCERULE_H
 
 #include <QDateTime>
-//Added by qt3to4:
 #include <QList>
-#include "kcal/listbase.h"
 
+#include "listbase.h"
 #include "kcal.h"
 
 template <class T>
@@ -70,9 +69,9 @@
 class KCAL_EXPORT RecurrenceRule
 {
   public:
-    class Observer {
+    class RuleObserver {
       public:
-        virtual ~Observer() {}
+        virtual ~RuleObserver() {}
         /** This method will be called on each change of the recurrence object */
         virtual void recurrenceChanged( RecurrenceRule * ) = 0;
     };
@@ -243,14 +242,14 @@
       @param observer the Recurrence::Observer-derived object, which
       will be installed as an observer of this object.
     */
-    void addObserver( Observer *observer );
+    void addObserver( RuleObserver *observer );
     /**
       Removes an observer that was added with addObserver. If the
       given object was not an observer, it does nothing.
       @param observer the Recurrence::Observer-derived object to
       be removed from the list of observers of this object.
     */
-    void removeObserver( Observer *observer );
+    void removeObserver( RuleObserver *observer );
 
     /**
       Debug output.
@@ -331,7 +330,7 @@
     Constraint::List mConstraints;
     void buildConstraints();
     bool mDirty;
-    QList<Observer*> mObservers;
+    QList<RuleObserver*> mObservers;
 
     // Cache for duration
     mutable DateTimeList mCachedDates;
_______________________________________________
kde-pim mailing list
kde-pim@kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
kde-pim home page at http://pim.kde.org/
[prev in list] [next in list] [prev in thread] [next in thread]