Update of /cvsroot/mahogany/M/include
In directory usw-pr-cvs1:/tmp/cvs-serv19119/include
Modified Files:
MSearch.h MailFolder.h MailFolderCC.h
Log Message:
implemented searching in multiple folders, it compiles and seems to work for
single folder searches but dies horribly when searching in more than one
folder for now
Index: MSearch.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MSearch.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- MSearch.h 22 Jul 2002 13:51:50 -0000 1.4
+++ MSearch.h 23 Jul 2002 18:47:11 -0000 1.5
@@ -43,11 +43,8 @@
bool m_Invert;
- /// the number of folders in m_Folders array (if 0, only the current one)
- size_t m_nFolders;
+ /// the array of the names of folders to search
+ wxArrayString m_Folders;
- /// the array of size m_nFolders of folders to search
- MFolder *m_Folders;
-
- SearchCriterium() { m_What = SC_ILLEGAL; m_Invert = false; m_nFolders = 0; }
+ SearchCriterium() { m_What = SC_ILLEGAL; m_Invert = false; }
};
@@ -56,10 +53,9 @@
function returns true, the caller should continue with searching, otherwise
the search is cancelled. In the former case, crit out parameter contains not
- only what to search, but also where to search for it: either just in the
- current folder in which case crit->m_nFolders == 0 or in all of the folders
- in crit->m_Folders array which, then, should all be DecRef()'d by caller.
+ only what to search, but also where to search for it (m_Folders names array)
@param crit the search criterium filled by this function
@param profile the profile to use for the last search values
+ @param folder the default folder to search in
@param parent the parent window for the dialog
@return true if ok, false if the dialog was cancelled
@@ -69,4 +65,5 @@
ConfigureSearchMessages(SearchCriterium *crit,
Profile *profile,
+ const MFolder *folder,
wxWindow *parent);
Index: MailFolder.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MailFolder.h,v
retrieving revision 1.180
retrieving revision 1.181
diff -b -u -2 -r1.180 -r1.181
--- MailFolder.h 16 Jul 2002 20:21:43 -0000 1.180
+++ MailFolder.h 23 Jul 2002 18:47:11 -0000 1.181
@@ -538,5 +538,5 @@
@return message handler
*/
- virtual Message *GetMessage(unsigned long uid) = 0;
+ virtual Message *GetMessage(unsigned long uid) const = 0;
/** Delete a message, really delete, not move to trash. UNSUPPORTED!
Index: MailFolderCC.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MailFolderCC.h,v
retrieving revision 1.210
retrieving revision 1.211
diff -b -u -2 -r1.210 -r1.211
--- MailFolderCC.h 17 Jul 2002 19:22:49 -0000 1.210
+++ MailFolderCC.h 23 Jul 2002 18:47:11 -0000 1.211
@@ -137,5 +137,5 @@
@return message header information class
*/
- virtual Message *GetMessage(unsigned long uid);
+ virtual Message *GetMessage(unsigned long uid) const;
virtual bool SetMessageFlag(unsigned long uid,
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
