* 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, 5 insertions, 1 deletions

diff --git a/korganizer/koeditoralarms.h b/korganizer/koeditoralarms.h
index ed01d656b..971df799b 100644
--- a/korganizer/koeditoralarms.h
+++ b/korganizer/koeditoralarms.h
@@ -35,7 +35,8 @@ class KOEditorAlarms : public KDialogBase
 {
     Q_OBJECT
   public:
-    KOEditorAlarms( KCal::Alarm::List *alarms, TQWidget *parent = 0,
+    KOEditorAlarms( const TQCString &type,
+                    KCal::Alarm::List *alarms, TQWidget *parent = 0,
                     const char *name = 0 );
     ~KOEditorAlarms();
 
@@ -46,11 +47,14 @@ class KOEditorAlarms : public KDialogBase
     void slotRemove();
     void changed();
     void selectionChanged( TQListViewItem *listviewitem );
+
   protected:
     void init();
     void readAlarm( KCal::Alarm *alarm );
     void writeAlarm( KCal::Alarm *alarm );
+
   private:
+    TQCString mType; // as in the Incidence::type
     KCal::Alarm::List *mAlarms;
     KOEditorAlarms_base *mWidget;
     bool mInitializing;