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

diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h
index 03f838c97..674980c01 100644
--- a/kontact/src/iconsidepane.h
+++ b/kontact/src/iconsidepane.h
@@ -37,6 +37,7 @@ namespace Kontact
 {
 
 class Core;
+class IconSidePane;
 class Plugin;
 class Navigator;
 
@@ -118,7 +119,7 @@ class Navigator : public KListBox
 {
     Q_OBJECT
   public:
-    Navigator( SidePaneBase *parent = 0, const char *name = 0 );
+    Navigator( IconSidePane *parent = 0, const char *name = 0 );
 
     virtual void setSelected( TQListBoxItem *, bool );
 
@@ -156,7 +157,7 @@ class Navigator : public KListBox
     void slotStopHighlight();
 
   private:
-    SidePaneBase *mSidePane;
+    IconSidePane *mSidePane;
     IconViewMode mViewMode;
 
     TQListBoxItem* mMouseOn;