* 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, 10 insertions, 6 deletions

diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h
index 5f1dfb977..e75d994e5 100644
--- a/korganizer/koattendeeeditor.h
+++ b/korganizer/koattendeeeditor.h
@@ -23,6 +23,7 @@
 
 #include <tqwidget.h>
 #include <libkcal/attendee.h>
+#include <kabc/addressee.h>
 
 class TQBoxLayout;
 class TQComboBox;
@@ -30,15 +31,12 @@ class TQCheckBox;
 class TQLabel;
 class TQPushButton;
 class TQHBox;
+class TQListViewItem;
 
 namespace KPIM {
   class AddresseeLineEdit;
 }
 
-namespace KABC {
-  class Addressee;
-}
-
 namespace KCal {
   class Incidence;
 }
@@ -52,7 +50,8 @@ class KOAttendeeEditor : public QWidget
   public:
     KOAttendeeEditor( TQWidget *parent, const char *name = 0 );
 
-    virtual void insertAttendee( KCal::Attendee* attendee, bool fetchFB = true ) = 0;
+    virtual void insertAttendee( KCal::Attendee *attendee, bool fetchFB = true ) = 0;
+    virtual void removeAttendee( KCal::Attendee *attendee ) = 0;
 
     virtual void readEvent( KCal::Incidence *incidence );
     virtual void writeEvent( KCal::Incidence *incidence );
@@ -79,10 +78,13 @@ class KOAttendeeEditor : public QWidget
     void insertAttendeeFromAddressee( const KABC::Addressee &a, const KCal::Attendee* at=0 );
 
     void fillOrganizerCombo();
-
+    virtual TQListViewItem* hasExampleAttendee() const = 0;
+    bool isExampleAttendee( const KCal::Attendee* ) const;
     virtual KCal::Attendee* currentAttendee() const = 0;
     virtual void updateCurrentItem() = 0;
 
+    virtual void setSelected ( int index ) = 0;
+    virtual int selectedIndex() = 0;
     virtual void changeStatusForMe( KCal::Attendee::PartStat status ) = 0;
 
     virtual bool eventFilter( TQObject *, TQEvent *);
@@ -95,6 +97,7 @@ class KOAttendeeEditor : public QWidget
     void updateAttendeeInput();
     void clearAttendeeInput();
     void fillAttendeeInput( KCal::Attendee *a );
+    void expandAttendee();
     void updateAttendee();
 
   protected:
@@ -118,6 +121,7 @@ class KOAttendeeEditor : public QWidget
     TQPtrList<KCal::Attendee> mnewAttendees;
 
   private:
+    KABC::Addressee::List expandDistList( const TQString &text ) const;
     bool mDisableItemUpdate;
 };