* 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, 2 insertions, 0 deletions

diff --git a/libkdepim/progressdialog.h b/libkdepim/progressdialog.h
index dc0e6794..cabcb69a 100644
--- a/libkdepim/progressdialog.h
+++ b/libkdepim/progressdialog.h
@@ -90,6 +90,7 @@ public:
   void setLabel( const TQString& );
   void setStatus( const TQString& );
   void setCrypto( bool );
+  void setTotalSteps( int totalSteps );
 
   ProgressItem* item() const { return mItem; }
 
@@ -132,6 +133,7 @@ void slotTransactionAdded( KPIM::ProgressItem *item );
   void slotTransactionStatus( KPIM::ProgressItem *item, const TQString& );
   void slotTransactionLabel( KPIM::ProgressItem *item, const TQString& );
   void slotTransactionUsesCrypto( KPIM::ProgressItem *item, bool );
+  void slotTransactionUsesBusyIndicator( KPIM::ProgressItem*, bool );
 
   void slotClose();
   void slotShow();