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

List:       kde-commits
Subject:    branches/work/akonadi-ports/kdepim/korganizer
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-01-06 14:04:54
Message-ID: 1262786694.903286.2359.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1070698 by ervin:

Move AkonadiCalendarAdaptor out of korganizer interfaces, and make it
independent from IncidenceChanger.


 M  +1 -0      CMakeLists.txt  
 M  +2 -2      actionmanager.cpp  
 A             akonadicalendaradaptor.cpp   [License: LGPL (v2+)]
 A             akonadicalendaradaptor.h   \
interfaces/korganizer/akonadicalendaradaptor.h#1070599 [License: GPL (v2+)]  M  +7 -7 \
calendarview.cpp    M  +2 -2      eventarchiver.cpp  
 M  +2 -2      incidencechanger.cpp  
 D             interfaces/korganizer/akonadicalendaradaptor.h  
 M  +1 -1      kogroupware.cpp  
 M  +4 -4      mailscheduler.cpp  


--- branches/work/akonadi-ports/kdepim/korganizer/CMakeLists.txt #1070697:1070698
@@ -139,6 +139,7 @@
 ########### next target ###############
 
 set(korganizer_core_LIB_SRCS
+    akonadicalendaradaptor.cpp
     kogroupware.cpp
     freebusymanager.cpp
     freebusyurldialog.cpp
--- branches/work/akonadi-ports/kdepim/korganizer/actionmanager.cpp #1070697:1070698
@@ -42,7 +42,7 @@
 #include "kowindowlist.h"
 #include "reminderclient.h"
 #include "akonadicalendar.h"
-#include "interfaces/korganizer/akonadicalendaradaptor.h"
+#include "akonadicalendaradaptor.h"
 #include "akonadicollectionview.h"
 #include "htmlexport.h"
 #include "htmlexportsettings.h"
@@ -1655,7 +1655,7 @@
   } else {
     IncidenceChanger changer( mCalendar, 0 );  //AKONADI_PORT avoid this local \
incidence changer copy...  
-    AkonadiCalendarAdaptor cal( mCalendar, &changer );  FileStorage storage( &cal );
+    AkonadiCalendarAdaptor cal( mCalendar );  FileStorage storage( &cal );
     storage.setFileName( filename );
     storage.setSaveFormat( new ICalFormat );
     if ( !storage.load() ) {
--- branches/work/akonadi-ports/kdepim/korganizer/calendarview.cpp #1070697:1070698
@@ -59,7 +59,7 @@
 #include "views/monthview/monthview.h"
 #include "views/multiagendaview/multiagendaview.h"
 #include "views/todoview/kotodoview.h"
-#include <interfaces/korganizer/akonadicalendaradaptor.h>
+#include "akonadicalendaradaptor.h"
 
 #include <akonadi/kcal/utils.h>
 #include <akonadi/kcal/collectionselection.h>
@@ -368,7 +368,7 @@
     return false;
   }
 
-  AkonadiCalendarAdaptor adaptor( mCalendar, mChanger );
+  AkonadiCalendarAdaptor adaptor( mCalendar );
   // merge in a file
   FileStorage storage( &adaptor );
   storage.setFileName( filename );
@@ -400,7 +400,7 @@
   // Store back all unsaved data into calendar object
   mViewManager->currentView()->flushView();
 
-  AkonadiCalendarAdaptor adaptor( mCalendar, mChanger );  
+  AkonadiCalendarAdaptor adaptor( mCalendar );
   FileStorage storage( &adaptor );
   storage.setFileName( filename );
   storage.setSaveFormat( new ICalFormat );
@@ -843,7 +843,7 @@
     return;
   }
 
-  AkonadiCalendarAdaptor cal( mCalendar, mChanger );
+  AkonadiCalendarAdaptor cal( mCalendar );
   DndFactory factory( &cal );
   Incidence::Ptr incidence = Akonadi::incidence(item);
   if ( !factory.copyIncidence( incidence.get() ) ) {
@@ -893,7 +893,7 @@
     return;
   }
 
-  AkonadiCalendarAdaptor cal( mCalendar, mChanger );
+  AkonadiCalendarAdaptor cal( mCalendar );
   DndFactory factory( &cal );
   Incidence *pastedIncidence;
   if ( time.isValid() ) {
@@ -1691,7 +1691,7 @@
       }
     }
     ICalFormat *format = new ICalFormat;
-    AkonadiCalendarAdaptor calendar( mCalendar, mChanger );
+    AkonadiCalendarAdaptor calendar( mCalendar );
     FileStorage storage( &calendar, filename, format );
     if ( !storage.save() ) {
       QString errmess;
@@ -1740,7 +1740,7 @@
       }
     }
     VCalFormat *format = new VCalFormat;
-    AkonadiCalendarAdaptor calendar( mCalendar, mChanger );
+    AkonadiCalendarAdaptor calendar( mCalendar );
     FileStorage storage( &calendar, filename, format );
     if ( !storage.save() ) {
       QString errmess;
--- branches/work/akonadi-ports/kdepim/korganizer/eventarchiver.cpp #1070697:1070698
@@ -27,6 +27,7 @@
 #include "akonadicalendar.h"
 #include "koprefs.h"
 #include "incidencechanger.h"
+#include "akonadicalendaradaptor.h"
 
 #include <kio/netaccess.h>
 #include <kcal/icalformat.h>
@@ -35,7 +36,6 @@
 #include <kcal/calendarlocal.h>
 
 #include <akonadi/kcal/utils.h>
-#include <interfaces/korganizer/akonadicalendaradaptor.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
@@ -165,7 +165,7 @@
   Q_UNUSED( limitDate );
   Q_UNUSED( withGUI );
 
-  AkonadiCalendarAdaptor cal( calendar, changer );
+  AkonadiCalendarAdaptor cal( calendar );
   FileStorage storage( &cal );
 
   // Save current calendar to disk
--- branches/work/akonadi-ports/kdepim/korganizer/incidencechanger.cpp \
#1070697:1070698 @@ -29,7 +29,7 @@
 #include "akonadicalendar.h"
 #include "akonadicalendar.h"
 #include <akonadi/kcal/utils.h>
-#include <interfaces/korganizer/akonadicalendaradaptor.h>
+#include "akonadicalendaradaptor.h"
 
 #include <Akonadi/ItemCreateJob>
 #include <Akonadi/ItemDeleteJob>
@@ -280,7 +280,7 @@
   if( doDelete ) {
 
     // @TODO: the factory needs to do the locking!
-    AkonadiCalendarAdaptor cal( mCalendar, this );
+    AkonadiCalendarAdaptor cal( mCalendar );
     DndFactory factory( &cal );
     Akonadi::Item incidenceItem;
     incidenceItem.setPayload<Incidence::Ptr>( incidence );
--- branches/work/akonadi-ports/kdepim/korganizer/kogroupware.cpp #1070697:1070698
@@ -163,7 +163,7 @@
 
   f.remove();
 
-  AkonadiCalendarAdaptor adaptor(mCalendar, mView->incidenceChanger());
+  AkonadiCalendarAdaptor adaptor(mCalendar);
   ScheduleMessage *message = mFormat.parseScheduleMessage( &adaptor, iCal );
   if ( !message ) {
     QString errorMessage;
--- branches/work/akonadi-ports/kdepim/korganizer/mailscheduler.cpp #1070697:1070698
@@ -28,7 +28,7 @@
 #include "komailclient.h"
 #include "koprefs.h"
 #include "akonadicalendar.h"
-#include <interfaces/korganizer/akonadicalendaradaptor.h>
+#include "akonadicalendaradaptor.h"
 
 #include <KCal/Calendar>
 #include <KCal/ICalFormat>
@@ -142,9 +142,9 @@
         messageString.remove( QRegExp( "\n[ \t]" ) );
         messageString = QString::fromUtf8( messageString.toLatin1() );
 
-        AkonadiCalendarAdaptor caladaptor(mCalendar, mChanger);
+        AkonadiCalendarAdaptor caladaptor(mCalendar);
         ScheduleMessage *mess = mFormat->parseScheduleMessage( &caladaptor, \
                messageString );
-        
+
         if ( mess ) {
           kDebug() << "got message '" << (*it) << "'";
           messageList.append( mess );
@@ -211,7 +211,7 @@
       AkonadiCalendarAdaptor *m_calendar;
   };
 
-  AkonadiCalendarAdaptor caladaptor(mCalendar, mChanger);
+  AkonadiCalendarAdaptor caladaptor(mCalendar);
   SchedulerAdaptor scheduleradaptor(this, &caladaptor);
   return scheduleradaptor.acceptTransaction(incidence, method, status, email);
 }


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