fixx

4 files changed, 96 insertions, 29 deletions

diff --git a/libkcal/attachment.cpp b/libkcal/attachment.cpp
index 1ead923..520ac95 100644
--- a/libkcal/attachment.cpp
+++ b/libkcal/attachment.cpp
@@ -2,2 +2,3 @@
     This file is part of libkcal.
+
     Copyright (c) 2002 Michael Brade <brade@kde.org>
@@ -24,2 +25,11 @@ using namespace KCal;
 
+Attachment::Attachment( const Attachment &attachment)
+{
+  mMimeType = attachment.mMimeType;
+  mData = attachment.mData;
+  mBinary = attachment.mBinary;
+	mShowInline = attachment.mShowInline;
+	mLabel = attachment.mLabel;
+}
+
 Attachment::Attachment(const QString& uri, const QString& mime)
@@ -29,2 +39,4 @@ Attachment::Attachment(const QString& uri, const QString& mime)
   mBinary = false;
+	mShowInline = false;
+	mLabel = QString::null;
 }
@@ -36,5 +48,7 @@ Attachment::Attachment(const char *base64, const QString& mime)
   mBinary = true;
+	mShowInline = false;
+	mLabel = QString::null;
 }
 
-bool Attachment::isURI() const
+bool Attachment::isUri() const
 {
@@ -51,3 +65,3 @@ QString Attachment::uri() const
 
-void Attachment::setURI(const QString& uri)
+void Attachment::setUri(const QString& uri)
 {
@@ -86 +100,21 @@ void Attachment::setMimeType(const QString& mime)
 
+bool Attachment::showInline() const
+{
+  return mShowInline;
+}
+
+void Attachment::setShowInline( bool showinline )
+{
+  mShowInline = showinline;
+}
+
+QString Attachment::label() const
+{
+  return mLabel;
+}
+
+void Attachment::setLabel( const QString& label )
+{
+  mLabel = label;
+}
+
diff --git a/libkcal/attachment.h b/libkcal/attachment.h
index cdf2458..5301420 100644
--- a/libkcal/attachment.h
+++ b/libkcal/attachment.h
@@ -2,2 +2,3 @@
     This file is part of libkcal.
+
     Copyright (c) 2002 Michael Brade <brade@kde.org>
@@ -19,8 +20,8 @@
 */
+#ifndef KCAL_ATTACHMENT_H
+#define KCAL_ATTACHMENT_H
 
-#ifndef _ATTACHMENT_H
-#define _ATTACHMENT_H
 
-#include <qstring.h>
 
+#include <qstring.h>
 
@@ -29,25 +30,35 @@ namespace KCal {
 /**
- * This class represents information related to an attachment.
- */
+  This class represents information related to an attachment.
+*/
 class Attachment
 {
-public:
+  public:
+
     /**
-     * Create a Reference to some URI.
-     * @param uri the uri this attachment refers to
-     * @param mime the mime type of the resource being linked to
-     */
-    Attachment(const QString& uri, const QString& mime = QString::null);
+      Create a Reference to some URI by copying an existing Attachment.
+      
+      @param attachment the attachment to be duplicated
+    */
+    Attachment( const Attachment &attachment );
 
     /**
-     * Create a binary attachment.
-     * @param base64 the attachment in base64 format
-     * @param mime the mime type of the attachment
-     */
-    Attachment(const char *base64, const QString& mime = QString::null);
-
-    /* The VALUE parameter in Cal */
-    bool isURI() const;
+      Create a Reference to some URI.
+      
+      @param uri the uri this attachment refers to
+      @param mime the mime type of the resource being linked to
+    */
+    Attachment( const QString &uri, const QString &mime = QString::null );
+
+    /**
+      Create a binary attachment.
+     
+      @param base64 the attachment in base64 format
+      @param mime the mime type of the attachment
+    */
+    Attachment( const char *base64, const QString &mime = QString::null );
+
+    /* The VALUE parameter in iCal */
+    bool isUri() const;
     QString uri() const;
-    void setURI(const QString& uri);
+    void setUri( const QString &uri );
     
@@ -55,3 +66,3 @@ public:
     char *data() const;
-    void setData(const char *base64);
+    void setData( const char *base64 );
 
@@ -59,4 +70,13 @@ public:
     QString mimeType() const;
-    void setMimeType(const QString& mime);
-private:
+    void setMimeType( const QString &mime );
+		
+		/* The custom X-CONTENT-DISPOSITION parameter, used by OGo etc. */
+		bool showInline() const;
+		void setShowInline( bool showinline );
+		
+		/* The custom X-LABEL parameter to show a human-readable title */
+		QString label() const;
+		void setLabel( const QString &label );
+
+  private:
     QString mMimeType;
@@ -64,2 +84,7 @@ private:
     bool mBinary;
+		bool mShowInline;
+		QString mLabel;
+
+    class Private;
+    Private *d;
 };
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index 53aa039..65eabc8 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -516,3 +516,3 @@ icalproperty *ICalFormatImpl::writeAttachment(Attachment *att)
    icalattachtype* attach = icalattachtype_new();
-  if (att->isURI())
+  if (att->isUri())
     icalattachtype_set_url(attach, att->uri().utf8().data());
@@ -522,3 +522,3 @@ icalproperty *ICalFormatImpl::writeAttachment(Attachment *att)
   icalattach *attach;
-  if (att->isURI())
+  if (att->isUri())
       attach = icalattach_new_from_url( att->uri().utf8().data());
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 549014e..39c14f5 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -58,6 +58,13 @@ Incidence::Incidence( const Incidence &i ) : IncidenceBase( i )
   mRelatedTo = 0;
-  mRelatedToUid = i.mRelatedToUid;
+  mRelatedToUid = i.mRelatedToUid; 
 //  QPtrList<Incidence> mRelations;    QPtrList<Incidence> mRelations;
   mExDates = i.mExDates;
-  mAttachments = i.mAttachments;
+  QPtrListIterator<Attachment> itat( i.mAttachments );
+  Attachment *at;
+  while( (at = itat.current()) ) {
+      Attachment *a = new Attachment( *at );
+      mAttachments.append( a );
+      ++itat;
+  }
+  mAttachments.setAutoDelete( true );
   mResources = i.mResources;
@@ -759,2 +766,3 @@ Recurrence *Incidence::recurrence()
         mRecurrence->setRecurStart( dtStart() );
+        mRecurrence->setRecurReadOnly( isReadOnly());
         //qDebug("creating new recurence ");