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

List:       kde-commits
Subject:    kdepim/kresources/imap/knotes
From:       Bo Thorsen <bo () sonofthor ! dk>
Date:       2004-01-28 8:18:07
Message-ID: 20040128081807.97E0998FC () office ! kde ! org
[Download RAW message or body]

CVS commit by thorsen: 

The resource now compiles and links. Skeleton methods only though


  M +7 -6      Makefile.am   1.2
  M +33 -4     resourceimap.cpp   1.2
  M +28 -8     resourceimap.h   1.2


--- kdepim/kresources/imap/knotes/Makefile.am  #1.1:1.2
@@ -1,5 +1,6 @@
 METASOURCES = AUTO
 
-INCLUDES = -I$(top_srcdir)/kresources/imap/shared $(all_includes)
+INCLUDES = -I$(top_srcdir)/kresources/imap/shared \
+        -I$(top_srcdir)/knotes $(all_includes)
 
 kde_module_LTLIBRARIES = knotes_imap.la
@@ -7,10 +8,10 @@
 noinst_HEADERS = resourceimap.h
 
-knotes_imap_la_SOURCES = resourceimap.cpp resourceimap.skel kmailicalIface.stub
+knotes_imap_la_SOURCES = resourceimap.cpp
 knotes_imap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-knotes_imap_la_LIBADD = -lkresources \
-        $(top_builddir)/kresources/imap/shared/libresourceimapshared.la
-
-kmailicalIface_DIR = $(top_srcdir)/kmail
+knotes_imap_la_LIBADD = -lkresources -lkdeprint \
+        $(top_builddir)/kresources/imap/shared/libresourceimapshared.la \
+        $(top_builddir)/knotes/libknotes.la \
+        $(top_builddir)/libkcal/libkcal.la
 
 messages: rc.cpp

--- kdepim/kresources/imap/knotes/resourceimap.cpp  #1.1:1.2
@@ -32,7 +32,4 @@
 #include <kdebug.h>
 #include <kglobal.h>
-#include <klocale.h>
-
-#include "kmailicalIface_stub.h"
 
 #include "resourceimap.h"
@@ -63,5 +60,7 @@ extern "C"
 
 KNotesIMAP::ResourceIMAP::ResourceIMAP( const KConfig *config )
-  : ResourceIMAPShared( "ResourceIMAP-KNotes" )
+  : ResourceNotes( config ),
+    ResourceIMAPBase::ResourceIMAPShared( "ResourceIMAP-KNotes" ),
+    mSilent( false )
 {
 }
@@ -71,4 +70,33 @@ KNotesIMAP::ResourceIMAP::~ResourceIMAP(
 }
 
+bool KNotesIMAP::ResourceIMAP::load()
+{
+  kdDebug() << "NYI: KNotesIMAP::ResourceIMAP::load()\n";
+  return false;
+}
+
+bool KNotesIMAP::ResourceIMAP::save()
+{
+  kdDebug() << "NYI: KNotesIMAP::ResourceIMAP::save()\n";
+  return false;
+}
+
+bool KNotesIMAP::ResourceIMAP::addNote( KCal::Journal* )
+{
+  kdDebug() << "NYI: KNotesIMAP::ResourceIMAP::addNote( KCal::Journal* )\n";
+  return false;
+}
+
+bool KNotesIMAP::ResourceIMAP::deleteNote( KCal::Journal* )
+{
+  kdDebug() << "NYI: KNotesIMAP::ResourceIMAP::deleteNote( KCal::Journal* )\n";
+  return false;
+}
+
+void KNotesIMAP::ResourceIMAP::incidenceUpdated( KCal::IncidenceBase* )
+{
+  kdDebug() << "NYI: KNotesIMAP::ResourceIMAP::incidenceUpdated( KCal::IncidenceBase* )\n";
+}
+
 /*
  * These are the DCOP slots that KMail call to notify when something
@@ -81,4 +109,5 @@ bool KNotesIMAP::ResourceIMAP::addIncide
   Q_UNUSED( note );
   kdDebug() << "NYI: KNotesIMAP::ResourceIMAP::addIncidence()\n";
+  return false;
 }
 

--- kdepim/kresources/imap/knotes/resourceimap.h  #1.1:1.2
@@ -34,4 +34,6 @@
 
 #include <resourceimapshared.h>
+#include <resourcenotes.h>
+#include <libkcal/incidencebase.h>
 
 class KMailICalIface_stub;
@@ -44,14 +46,9 @@ namespace KNotesIMAP {
  * clients).
  */
-  class ResourceIMAP : public Resource,
-                       virtual public ResourceIMAP::ResourceIMAPShared
+  class ResourceIMAP : public ResourceNotes,
+                       public KCal::IncidenceBase::Observer,
+                       public ResourceIMAPBase::ResourceIMAPShared
 {
   Q_OBJECT
-  K_DCOP
-
-  k_dcop:
-    virtual bool addIncidence( const QString& type, const QString& notes );
-    virtual void deleteIncidence( const QString& type, const QString& uid );
-    virtual void slotRefresh( const QString& type );
 
 public:
@@ -59,4 +56,27 @@ public:
   virtual ~ResourceIMAP();
 
+    /**
+     * Load resource data.
+     */
+    virtual bool load();
+
+    /**
+     * Save resource data.
+     */
+    virtual bool save();
+
+    virtual bool addNote( KCal::Journal* );
+
+    virtual bool deleteNote( KCal::Journal* );
+
+    virtual void incidenceUpdated( KCal::IncidenceBase* );
+
+    // The IMAPBase methods called by KMail
+    virtual bool addIncidence( const QString& type, const QString& notes );
+    virtual void deleteIncidence( const QString& type, const QString& uid );
+    virtual void slotRefresh( const QString& type );
+
+private:
+    bool mSilent;
 };
 


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