From kde-commits  Tue Aug 31 23:38:34 2004
From: Michael Brade <brade () kde ! org>
Date: Tue, 31 Aug 2004 23:38:34 +0000
To: kde-commits
Subject: kdepim/knotes
Message-Id: <20040831233834.A3BF59020 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=109399552118091

CVS commit by brade: 

Hmpf, I didn't find a way to implement two DCOP interfaces in one class yet.
(where's all those people who are supposed to be on IRC??) So I duplicated
some of the functions for the KNotesAppIface for now.

I need two interfaces so that other apps implementing the KNotesIface do
not have to provide implementations for things like show/hide notes, which
doesn't make sense in Kontact, for instance.


  A            KNotesAppIface.h   1.1 [GPL (v2+) (+Qt exception)]
  M +0 -36     KNotesIface.h   1.11
  M +2 -2      Makefile.am   1.69
  M +3 -3      knotesapp.h   1.43


--- kdepim/knotes/KNotesIface.h  #1.10:1.11
@@ -54,16 +54,4 @@ k_dcop:
 
     /**
-     * Show a note as if it had been selected from the "notes" menu.
-     * @param noteId the id of the note to show
-     */
-    virtual ASYNC showNote( const QString& noteId ) const = 0;
-
-    /**
-     * Hide a note.
-     * @param noteId the id of the note to hide
-     */
-    virtual ASYNC hideNote( const QString& noteId ) const = 0;
-
-    /**
      * Deletes a note forever.
      * @param noteId the id of the note to kill
@@ -111,28 +99,4 @@ k_dcop:
      */
     virtual QString text( const QString& noteId ) const = 0;
-
-    /**
-     * This tells KNotes that a specific app has synchronized with all the notes.
-     * @param app the app that has synced with KNotes
-     */
-    virtual ASYNC sync( const QString& app ) = 0;
-
-    /**
-     * Test if a note was created new after the last sync.
-     * @param app the app that wants to get the status since the last sync
-     * @param noteId the id of the note
-     * @return true if the note is new, false if not or if the note does
-     *         not exist
-     */
-    virtual bool isNew( const QString& app, const QString& noteId ) const = 0;
-
-    /**
-     * Test if a note was modified since the last sync.
-     * @param app the app that wants to get the status since the last sync
-     * @param noteId the id of the note
-     * @return true if modified (note that this will return true if the note is
-     *         new as well!) and false if the note is not modified or doesn't exist
-     */
-    virtual bool isModified( const QString& app, const QString& noteId ) const = 0;
 };
 

--- kdepim/knotes/Makefile.am  #1.68:1.69
@@ -5,5 +5,5 @@
 bin_PROGRAMS    = knotes
 
-include_HEADERS = KNotesIface.h
+include_HEADERS = KNotesIface.h KNotesAppIface.h
 noinst_HEADERS  = knotesapp.h knote.h knoteedit.h knotebutton.h knoteconfigdlg.h \
                   knoteslegacy.h resourcemanager.h resourcenotes.h resourcelocal.h \
@@ -19,5 +19,5 @@
 libknote_la_SOURCES = knote.cpp knotebutton.cpp knoteconfigdlg.cpp knotehostdlg.cpp
 
-knotes_SOURCES  = main.cpp knotesapp.cpp KNotesIface.skel
+knotes_SOURCES  = main.cpp knotesapp.cpp KNotesAppIface.skel
 knotes_LDADD    = libknote.la libknoteseditor.la libknotesnetwork.la libknotesresources.la \
                   libknotesconfig.la  $(top_builddir)/libkcal/libkcal.la $(LIB_KIO) \

--- kdepim/knotes/knotesapp.h  #1.42:1.43
@@ -31,5 +31,5 @@
 #include <kxmlguiclient.h>
 
-#include "KNotesIface.h"
+#include "KNotesAppIface.h"
 
 class KNote;
@@ -49,6 +49,6 @@ namespace KCal {
 
 
-class KNotesApp : public QLabel, virtual public KNotesIface, public KSessionManaged,
-    virtual public KXMLGUIClient
+class KNotesApp : public QLabel, public KSessionManaged, virtual public KXMLGUIClient,
+    virtual public KNotesAppIface
 {
     Q_OBJECT