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

diff --git a/kontact/src/sidepanebase.h b/kontact/src/sidepanebase.h
index 407d98de6..0b4a7a542 100644
--- a/kontact/src/sidepanebase.h
+++ b/kontact/src/sidepanebase.h
@@ -38,11 +38,6 @@ class SidePaneBase : public QVBox
     SidePaneBase( Core *core, TQWidget *parent, const char *name = 0 );
     virtual ~SidePaneBase();
 
-    void setActionCollection( KActionCollection *actionCollection );
-    KActionCollection *actionCollection() const;
-
-    virtual const TQPtrList<KAction> & actions() = 0;
-
   signals:
     void pluginSelected( Kontact::Plugin* );
 
@@ -53,17 +48,6 @@ class SidePaneBase : public QVBox
      */
     virtual void updatePlugins() = 0;
 
-    /**
-      Select the current plugin without emmiting a signal.
-      This is used to sync with the core.
-     */
-    virtual void selectPlugin( Kontact::Plugin* ) = 0;
-
-    /**
-      This is an overloaded member function. It behaves essentially like the
-      above function.
-     */
-    virtual void selectPlugin( const TQString &name ) = 0;
 
     virtual void indicateForegrunding( Kontact::Plugin* ) = 0;
   protected: