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

List:       kde-commits
Subject:    kdepim
From:       Guenter Schwann <vogel () sbox ! tugraz ! at>
Date:       2003-11-16 16:20:37
[Download RAW message or body]

CVS commit by schwann: 

store freebusy data in correct place (korganizer and kontact in same place)


  M +5 -0      korganizer/mailscheduler.cpp   1.23
  M +3 -0      korganizer/mailscheduler.h   1.12
  M +7 -0      libkcal/dummyscheduler.cpp   1.9
  M +2 -0      libkcal/dummyscheduler.h   1.7
  M +9 -9      libkcal/scheduler.cpp   1.29
  M +3 -0      libkcal/scheduler.h   1.14


--- kdepim/korganizer/mailscheduler.cpp  #1.22:1.23
@@ -145,2 +145,7 @@ bool MailScheduler::deleteTransaction(In
     return f.remove();
 }
+
+QString MailScheduler::freeBusyDir()
+{
+  return locateLocal("data","korganizer/freebusy");
+}

--- kdepim/korganizer/mailscheduler.h  #1.11:1.12
@@ -51,4 +51,7 @@ class MailScheduler : public IMIPSchedul
     bool deleteTransaction(IncidenceBase *incidence);
 
+    /** Returns the directory where the free-busy information is stored */
+    virtual QString freeBusyDir();
+  
   private:
     QMap<IncidenceBase*, QString> mEventMap;

--- kdepim/libkcal/dummyscheduler.cpp  #1.8:1.9
@@ -27,4 +27,5 @@
 
 #include <kdebug.h>
+#include <kstandarddirs.h>
 
 #include "event.h"
@@ -117,3 +118,9 @@ QPtrList<ScheduleMessage> DummyScheduler
 
   return messageList;
+}
+
+QString DummyScheduler::freeBusyDir()
+{
+  // the dummy scheduler should never handle freebusy stuff - so it's hardcoded
+  return QString("");
 }

--- kdepim/libkcal/dummyscheduler.h  #1.6:1.7
@@ -42,4 +42,6 @@ class DummyScheduler : public Scheduler 
     QPtrList<ScheduleMessage> retrieveTransactions();
 
+    virtual QString freeBusyDir();
+  
   protected:
     bool saveMessage(const QString &);

--- kdepim/libkcal/scheduler.cpp  #1.28:1.29
@@ -310,6 +310,5 @@ bool Scheduler::acceptFreeBusy(Incidence
   FreeBusy *freebusy = static_cast<FreeBusy *>(incidence);
 
-  QString freeBusyDirName = locateLocal("appdata","freebusy");
-  kdDebug() << "acceptFreeBusy:: freeBusyDirName: " << freeBusyDirName << endl;
+  kdDebug() << "acceptFreeBusy:: freeBusyDirName: " << freeBusyDir() << endl;
 
   QString from;
@@ -322,16 +321,16 @@ bool Scheduler::acceptFreeBusy(Incidence
   }
 
-  QDir freeBusyDir(freeBusyDirName);
-  if (!freeBusyDir.exists()) {
-    kdDebug() << "Directory " << freeBusyDirName << " does not exist!" << endl;
-    kdDebug() << "Creating directory: " << freeBusyDirName << endl;
+  QDir freeBusyDirectory(freeBusyDir());
+  if (!freeBusyDirectory.exists()) {
+    kdDebug() << "Directory " << freeBusyDir() << " does not exist!" << endl;
+    kdDebug() << "Creating directory: " << freeBusyDir() << endl;
     
-    if(!freeBusyDir.mkdir(freeBusyDirName, TRUE)) {
-      kdDebug() << "Could not create directory: " << freeBusyDirName << endl;
+    if(!freeBusyDirectory.mkdir(freeBusyDir(), true)) {
+      kdDebug() << "Could not create directory: " << freeBusyDir() << endl;
       return false;
     }
   }
 
-  QString filename(freeBusyDirName);
+  QString filename(freeBusyDir());
   filename += "/";
   filename += from;

--- kdepim/libkcal/scheduler.h  #1.13:1.14
@@ -112,4 +112,7 @@ class Scheduler {
 
     virtual bool deleteTransaction(IncidenceBase *incidence);
+    
+    /** Returns the directory where the free-busy information is stored */
+    virtual QString freeBusyDir() = 0;
 
   protected:


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