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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepimlibs
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-10-27 14:42:13
Message-ID: 1256654533.659969.1862.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1041185 by tmcguire:

Merged revisions 1036874 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs

........
  r1036874 | winterz | 2009-10-18 03:00:01 +0200 (Sun, 18 Oct 2009) | 10 lines
  
  Backport r1036873 by winterz from trunk to the 4.3 branch:
  
  Remove the mDeletedIncidences list. As it was, the mDeletedIncidences.clearAll() in \
the  close() method was crashy; it should have just been mDeletedIncidences.clear().
  
  Upon further inspection, I realized mDeletedIncidences wasn't even used anymore.
  MERGE: 4.3
........


 _M            . (directory)  
 M  +1 -9      kcal/calendarlocal.cpp  


** branches/kdepim/enterprise4/kdepimlibs #property svnmerge-integrated
   - /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575,990631,990684,991932,9 \
96755,997101,997490,998251,1000615,1007460,1008037,1008812,1009437,1011841,1013328-101 \
3331,1013810,1015198,1015975-1016224,1016226-1016229,1019800,1021325,1024435,1026793,1031598,1035634
  + /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575,990631,990684,991932,99 \
6755,997101,997490,998251,1000615,1007460,1008037,1008812,1009437,1011841,1013328-1013 \
331,1013810,1015198,1015975-1016224,1016226-1016229,1019800,1021325,1024435,1026793,1031598,1035634,1036874
                
--- branches/kdepim/enterprise4/kdepimlibs/kcal/calendarlocal.cpp #1041184:1041185
@@ -59,10 +59,7 @@
 class KCal::CalendarLocal::Private
 {
   public:
-    Private()
-    {
-      mDeletedIncidences.setAutoDelete( true );
-    }
+    Private() {}
     QString mFileName;                     // filename where calendar is stored
     CalFormat *mFormat;                    // calendar format
 
@@ -72,7 +69,6 @@
     QMultiHash<QString, Todo*>mTodosForDate;// on due dates for all Todos
     QHash<QString, Journal *>mJournals;    // hash on uids of all Journals
     QMultiHash<QString, Journal *>mJournalsForDate; // on dates of all Journals
-    Incidence::List mDeletedIncidences;    // list of all deleted Incidences
 
     void insertEvent( Event *event );
     void insertTodo( Todo *todo );
@@ -168,7 +164,6 @@
   deleteAllTodos();
   deleteAllJournals();
 
-  d->mDeletedIncidences.clearAll();
   setModified( false );
 
   setObserversEnabled( true );
@@ -193,7 +188,6 @@
   if ( d->mEvents.remove( uid ) ) {
     setModified( true );
     notifyIncidenceDeleted( event );
-    d->mDeletedIncidences.append( event );
     if ( !event->recurs() ) {
       removeIncidenceFromMultiHashByUID<Event *>(
         d->mEventsForDate, event->dtStart().date().toString(), event->uid() );
@@ -269,7 +263,6 @@
   if ( d->mTodos.remove( todo->uid() ) ) {
     setModified( true );
     notifyIncidenceDeleted( todo );
-    d->mDeletedIncidences.append( todo );
     if ( todo->hasDueDate() ) {
       removeIncidenceFromMultiHashByUID<Todo *>(
         d->mTodosForDate, todo->dtDue().date().toString(), todo->uid() );
@@ -588,7 +581,6 @@
   if ( d->mJournals.remove( journal->uid() ) ) {
     setModified( true );
     notifyIncidenceDeleted( journal );
-    d->mDeletedIncidences.append( journal );
     removeIncidenceFromMultiHashByUID<Journal *>(
       d->mJournalsForDate, journal->dtStart().date().toString(), journal->uid() );
     return true;


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