* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 15 insertions, 3 deletions

diff --git a/knotes/knote.h b/knotes/knote.h
index a3bfd7b3e..6bb2ffe84 100644
--- a/knotes/knote.h
+++ b/knotes/knote.h
@@ -56,7 +56,8 @@ public:
            const char *name = 0 );
     ~KNote();
 
-    void saveData();
+    void changeJournal(KCal::Journal *);
+    void saveData( bool update = true);
     void saveConfig() const;
 
     TQString noteId() const;
@@ -82,6 +83,8 @@ public:
 
     static void setStyle( int style );
 
+    void deleteWhenIdle();
+    void blockEmitDataChanged( bool _b ) { m_blockEmitDataChanged = _b;}
 public slots:
     void slotKill( bool force = false );
 
@@ -89,7 +92,7 @@ signals:
     void sigRequestNewNote();
     void sigShowNextNote();
     void sigNameChanged();
-    void sigDataChanged();
+    void sigDataChanged(const TQString &);
     void sigColorChanged();
     void sigKillNote( KCal::Journal* );
 
@@ -108,6 +111,10 @@ protected:
 
     virtual bool focusNextPrevChild( bool );
 
+    /// Protect against deletion while we are running a sub-eventloop
+    void aboutToEnterEventLoop();
+    void eventLoopLeft();
+
 private slots:
     void slotRename();
     void slotUpdateReadOnly();
@@ -133,7 +140,8 @@ private slots:
     void slotUpdateDesktopActions();
 
     void slotUpdateViewport( int, int );
-
+    void slotRequestNewNote();
+    void slotSaveData();
 private:
     void updateFocus();
     void updateMask();
@@ -170,6 +178,10 @@ private:
     KSharedConfig::Ptr m_kwinConf;
 
     static int s_ppOffset;
+
+    int m_busy;
+    bool m_deleteWhenIdle;
+    bool m_blockEmitDataChanged;
 };
 
 #endif