* 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, 9 insertions, 4 deletions

diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index ac2975106..2e6fded32 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -24,6 +24,8 @@
 #ifndef KABCORE_H
 #define KABCORE_H
 
+#include <config.h> // FOR KDEPIM_NEW_DISTRLISTS
+
 #include <kabc/field.h>
 
 #include <tqdict.h>
@@ -48,6 +50,7 @@ class KAboutData;
 class KAction;
 class KActionCollection;
 class KConfig;
+class KPushButton;
 class KStatusBar;
 class KToggleAction;
 class KXMLGUIClient;
@@ -157,7 +160,7 @@ class KDE_EXPORT KABCore : public KAB::Core
 
     /**
       sets the distribution list to display. If null, the regular
-      address book is to be displayed.  
+      address book is to be displayed.
      */
     virtual void setSelectedDistributionList( const TQString &name );
 #endif
@@ -308,7 +311,7 @@ class KDE_EXPORT KABCore : public KAB::Core
      */
     virtual void newContact();
 
-    /** 
+    /**
      DCOP METHOD: Opens distribution list editor to create a new distribution list
     */
     virtual void newDistributionList();
@@ -347,7 +350,7 @@ class KDE_EXPORT KABCore : public KAB::Core
      * If the adding to the new resource is successfull, the contact is
      * removed from the old one, unless the Copy flag is given. */
     void storeContactIn( const TQString &uid = TQString::null, bool copy = false );
-    
+
     /**
      * Lets the user chose a different resource for the selected contacts and
      * copies it there.
@@ -421,7 +424,7 @@ class KDE_EXPORT KABCore : public KAB::Core
 
     void removeSelectedContactsFromDistList();
     void editSelectedDistributionList();
-    void sendMailToDistributionList( const TQString &id ); 
+    void sendMailToDistributionList( const TQString &id );
 
   private:
     void initGUI();
@@ -443,6 +446,8 @@ class KDE_EXPORT KABCore : public KAB::Core
 
 #ifdef KDEPIM_NEW_DISTRLISTS
     TQString mSelectedDistributionList;
+    KPushButton *mAddDistListButton;
+    KPushButton *mRemoveDistListButton;
     TQWidget *mDistListButtonWidget;
 #endif