Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14973/src/classes
Modified Files:
MFolder.cpp
Log Message:
no changes (wanted to implement Move() fuller but didn't have time...)
Index: MFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MFolder.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -b -u -2 -r1.104 -r1.105
--- MFolder.cpp 11 Mar 2004 17:14:31 -0000 1.104
+++ MFolder.cpp 14 Mar 2004 23:16:58 -0000 1.105
@@ -1143,4 +1143,6 @@
bool MFolderFromProfile::Move(MFolder *newParent)
{
+ CHECK( newParent, false, _T("no new parent in MFolder::Move()") );
+
// This does not really 'move' the folder, but it creates a new one with the
// correct parent and name, and copies all the profile information from the
@@ -1150,9 +1152,12 @@
// There are things that do not make sense at all
- CHECK( GetFolderType(GetType()) != MF_ILLEGAL, false, _T("How did you manage to
try to move an MF_ILLEGAL folder ?") );
- CHECK( GetFolderType(GetType()) != MF_NEWS, false, _T("can't move News folders") );
- CHECK( GetFolderType(GetType()) != MF_INBOX, false, _T("can't move system Inbox")
);
- CHECK( GetFolderType(GetType()) != MF_ROOT, false, _T("can't move the root
pseudo-folder") );
- //CHECK( !m_folderName.empty(), false, _T("can't move the root pseudo-folder") );
+ CHECK( GetFolderType(GetType()) != MF_ILLEGAL, false,
+ _T("How did you manage to try to move an MF_ILLEGAL folder ?") );
+ CHECK( GetFolderType(GetType()) != MF_NEWS, false,
+ _T("can't move News folders") );
+ CHECK( GetFolderType(GetType()) != MF_INBOX, false,
+ _T("can't move system Inbox") );
+ CHECK( GetFolderType(GetType()) != MF_ROOT, false,
+ _T("can't move the root pseudo-folder") );
// And there are things we can't do yet.
@@ -1210,7 +1215,6 @@
// it appears.
wxArrayString allFilterNames = MFilter::GetAllFilters();
- for ( size_t i = 0; i < allFilterNames.GetCount(); ++i)
+ for ( size_t i = 0; i < allFilterNames.GetCount(); ++i )
{
-
wxString filterName = allFilterNames[i];
MFilter *filter = MFilter::CreateFromProfile(filterName);
@@ -1235,5 +1239,5 @@
else
{
- // XNOTODO: Find out how to updqte this filter anyway
+ // XNOTODO: Find out how to update this filter anyway
wxLogError(_("Filter '%s' is not \"simple\" and has not been updated."),
filterName.c_str());
}
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
