Update of /cvsroot/mahogany/M/include
In directory usw-pr-cvs1:/tmp/cvs-serv12518/include

Modified Files:
        ASMailFolder.h MailFolder.h MailFolderCmn.h 
Log Message:
finally got rid of bool parameter in MF::DeleteMessages(); added another parameter to 
DeleteOrTrashMessages() to allow not copy the messages to trash folder (useful when 
deleting messages as part of moving them)

Index: ASMailFolder.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/ASMailFolder.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -b -u -2 -r1.56 -r1.57
--- ASMailFolder.h      16 Jul 2002 20:21:39 -0000      1.56
+++ ASMailFolder.h      5 Sep 2002 23:45:16 -0000       1.57
@@ -394,5 +394,7 @@
        @return ResultInt boolean
    */
-   virtual Ticket DeleteOrTrashMessages(const UIdArray *messages, UserData ud = 0) = 
0;
+   virtual Ticket DeleteOrTrashMessages(const UIdArray *messages,
+                                        int flags = MailFolder::DELETE_ALLOW_TRASH,
+                                        UserData ud = 0) = 0;
 
    /** Mark messages as deleted.
@@ -402,5 +404,5 @@
    */
    virtual Ticket DeleteMessages(const UIdArray *messages,
-                                 bool expunge = false,
+                                 int flags = MailFolder::DELETE_NO_EXPUNGE,
                                  UserData ud = 0) = 0;
 

Index: MailFolder.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MailFolder.h,v
retrieving revision 1.182
retrieving revision 1.183
diff -b -u -2 -r1.182 -r1.183
--- MailFolder.h        8 Aug 2002 16:30:58 -0000       1.182
+++ MailFolder.h        5 Sep 2002 23:45:16 -0000       1.183
@@ -158,4 +158,27 @@
    };
 
+   /// flags for DeleteOrTrashMessages
+   enum
+   {
+      /// use the trash setting of the folder (default)
+      DELETE_ALLOW_TRASH = 0,
+
+      /**
+         don't move the messages to trash, even if the folder is configured to
+         use it, always delete them
+       */
+      DELETE_NO_TRASH = 1,
+   };
+
+   /// flags for DeleteMessages
+   enum
+   {
+      /// don't expunge after deleting the messages, this is the default
+      DELETE_NO_EXPUNGE = 0,
+
+      /// expunge the messages after deleting them
+      DELETE_EXPUNGE = 1
+   };
+
    /**
      The structure containing the parameters for Forward/ReplyMessage(s)
@@ -677,16 +700,19 @@
 
    /** Mark messages as deleted or move them to trash.
-       @param messages pointer to an array holding the message numbers
+
+       @param messages pointer to an array holding the message UIDs, !NULL
+       @param flags combination of DELETE_XXX values
        @return true on success
    */
-   virtual bool DeleteOrTrashMessages(const UIdArray *messages) = 0;
+   virtual bool DeleteOrTrashMessages(const UIdArray *messages,
+                                      int flags = DELETE_ALLOW_TRASH) = 0;
 
    /** Mark messages as deleted.
        @param messages pointer to an array holding the message numbers
-       @param expunge expunge deleted messages
+       @param flags combination of DELETE_XXX values
        @return true on success
    */
    virtual bool DeleteMessages(const UIdArray *messages,
-                               bool expunge = false) = 0;
+                               int flags = DELETE_NO_EXPUNGE) = 0;
 
    /** Mark messages as no longer deleted.

Index: MailFolderCmn.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MailFolderCmn.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -b -u -2 -r1.78 -r1.79
--- MailFolderCmn.h     17 Jul 2002 19:22:49 -0000      1.78
+++ MailFolderCmn.h     5 Sep 2002 23:45:16 -0000       1.79
@@ -83,12 +83,13 @@
        @return true on success
    */
-   virtual bool DeleteOrTrashMessages(const UIdArray *messages);
+   virtual bool DeleteOrTrashMessages(const UIdArray *messages,
+                                      int flags = DELETE_ALLOW_TRASH);
 
    /** Mark messages as deleted.
        @param messages pointer to an array holding the message numbers
-       @param expunge expunge messages after deletion
        @return true on success
    */
-   virtual bool DeleteMessages(const UIdArray *messages, bool expunge = false);
+   virtual bool DeleteMessages(const UIdArray *messages,
+                               int flags = DELETE_NO_EXPUNGE);
 
    /** Mark messages as no longer deleted.



-------------------------------------------------------
This sf.net email is sponsored by: OSDN - Tired of that same old
cell phone?  Get a new here for FREE!
https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to