Update of /cvsroot/mahogany/M/src/classes
In directory usw-pr-cvs1:/tmp/cvs-serv3267
Modified Files:
MFolder.cpp
Log Message:
warning fix
Index: MFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MFolder.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -b -u -2 -r1.85 -r1.86
--- MFolder.cpp 7 Sep 2002 20:35:29 -0000 1.85
+++ MFolder.cpp 8 Sep 2002 18:59:11 -0000 1.86
@@ -180,9 +180,9 @@
virtual MFolder *CreateSubfolder(const String&,
MFolderType, bool) { return NULL; }
- virtual void Delete() { FAIL_MSG("doesn't make sense for MTempFolder"); }
+ virtual void Delete() { FAIL_MSG(_T("doesn't make sense for MTempFolder")); }
virtual bool Rename(const String&)
- { FAIL_MSG("doesn't make sense for MTempFolder"); return false; }
+ { FAIL_MSG(_T("doesn't make sense for MTempFolder")); return false; }
virtual bool Move(MFolder*)
- { FAIL_MSG("doesn't make sense for MTempFolder"); return false; }
+ { FAIL_MSG(_T("doesn't make sense for MTempFolder")); return false; }
private:
@@ -221,5 +221,5 @@
{
// this should never happen
- FAIL_MSG( "invalid MFolderFromProfile name!" );
+ FAIL_MSG( _T("invalid MFolderFromProfile name!") );
// to avoid crashes later
@@ -349,18 +349,18 @@
virtual String GetComment() const { return ""; }
virtual void SetComment(const String& /* comment */)
- { FAIL_MSG("can not set root folder attributes."); }
+ { FAIL_MSG(_T("can not set root folder attributes.")); }
virtual int GetFlags() const { return 0u; }
virtual void SetFlags(int /* flags */)
- { FAIL_MSG("can not set root folder attributes."); }
+ { FAIL_MSG(_T("can not set root folder attributes.")); }
virtual MFolder *GetParent() const { return NULL; }
virtual void Delete()
- { FAIL_MSG("can not delete root folder."); }
+ { FAIL_MSG(_T("can not delete root folder.")); }
virtual bool Rename(const String& /* newName */)
- { FAIL_MSG("can not rename root folder."); return false; }
+ { FAIL_MSG(_T("can not rename root folder.")); return false; }
virtual bool Move(const MFolder* /* newParent */)
- { FAIL_MSG("can not move root folder."); return false; }
+ { FAIL_MSG(_T("can not move root folder.")); return false; }
};
@@ -443,5 +443,5 @@
{
ASSERT_MSG( ms_aFolderNames.GetCount() == ms_aFolders.GetCount(),
- "folder cache corrupted" );
+ _T("folder cache corrupted") );
}
@@ -525,8 +525,8 @@
folder = Get(fullname);
- CHECK( folder, NULL, "Get() must succeed if Create() succeeded!" );
+ CHECK( folder, NULL, _T("Get() must succeed if Create() succeeded!") );
Profile_obj profile(folder->GetFullName());
- CHECK( profile, NULL, "panic in MFolder: no profile" );
+ CHECK( profile, NULL, _T("panic in MFolder: no profile") );
profile->writeEntry(MP_FOLDER_TYPE, type);
@@ -619,5 +619,5 @@
for ( n = 0; n < count; n++ )
{
- CHECK( profile, false, "failed to create profile?" );
+ CHECK( profile, false, _T("failed to create profile?") );
component = components[n];
@@ -631,5 +631,5 @@
if ( !folder )
{
- FAIL_MSG( "this folder must already exist!" );
+ FAIL_MSG( _T("this folder must already exist!") );
}
else
@@ -905,5 +905,5 @@
if ( index.Traverse(false) )
{
- FAIL_MSG( "invalid index in MFolderFromProfile::GetSubfolder()" );
+ FAIL_MSG( _T("invalid index in MFolderFromProfile::GetSubfolder()") );
return NULL;
@@ -964,10 +964,10 @@
void MFolderFromProfile::Delete()
{
- CHECK_RET( !m_folderName.empty(), "can't delete the root pseudo-folder" );
+ CHECK_RET( !m_folderName.empty(), _T("can't delete the root pseudo-folder") );
// delete this folder from the parent profile
String parentName = m_folderName.BeforeLast('/');
Profile_obj profile(parentName);
- CHECK_RET( profile, "panic in MFolder: no profile" );
+ CHECK_RET( profile, _T("panic in MFolder: no profile") );
profile->DeleteGroup(GetName());
@@ -985,5 +985,5 @@
// either we have managed to delete the root folder (bad) or something is
// seriously wrong (even worse)
- FAIL_MSG( "no parent for deleted folder?" );
+ FAIL_MSG( _T("no parent for deleted folder?") );
}
@@ -997,5 +997,5 @@
bool MFolderFromProfile::Rename(const String& newName)
{
- CHECK( !m_folderName.empty(), false, "can't rename the root pseudo-folder" );
+ CHECK( !m_folderName.empty(), false, _T("can't rename the root pseudo-folder") );
String path = m_folderName.BeforeLast('/'),
@@ -1022,5 +1022,5 @@
Profile_obj profile(path);
- CHECK( profile, false, "panic in MFolder: no profile" );
+ CHECK( profile, false, _T("panic in MFolder: no profile") );
if ( profile->Rename(name, newName) )
{
@@ -1060,14 +1060,14 @@
// There are things that do not make sense at all
- CHECK( GetFolderType(GetType()) != MF_ILLEGAL, false, "How did you manage to try
to move an MF_ILLEGAL folder ?" );
- CHECK( GetFolderType(GetType()) != MF_NNTP, false, "can't move NNTP folders" );
- CHECK( GetFolderType(GetType()) != MF_NEWS, false, "can't move News folders" );
- CHECK( GetFolderType(GetType()) != MF_INBOX, false, "can't move system Inbox" );
- CHECK( GetFolderType(GetType()) != MF_ROOT, false, "can't move the root
pseudo-folder" );
- //CHECK( !m_folderName.empty(), false, "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_NNTP, false, _T("can't move NNTP folders") );
+ 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") );
// And there are things we can't do yet.
- CHECK( GetSubfolderCount() == 0, false, "can't move a folder with sub-folders
(yet)" );
- CHECK( GetFolderType(GetType()) != MF_IMAP, false, "can't move IMAP folders (yet)"
);
+ CHECK( GetSubfolderCount() == 0, false, _T("can't move a folder with sub-folders
+(yet)") );
+ CHECK( GetFolderType(GetType()) != MF_IMAP, false, _T("can't move IMAP folders
+(yet)") );
if ( GetFolderType(GetType()) == MF_IMAP )
@@ -1075,5 +1075,5 @@
// IMAP folders have one more check: we must make sure that they stay on
// the same server, so that we can simply send it a RENAME command.
- CHECK( false, false, "Same server check not yet implemented" );
+ CHECK( false, false, _T("Same server check not yet implemented") );
}
@@ -1099,5 +1099,5 @@
// XNOTODO(?): make this some method of the Profile class
Profile_obj newProfile(newSubfolder->GetProfile());
- CHECK( newProfile, false, "panic in MFolder: no profile" );
+ CHECK( newProfile, false, _T("panic in MFolder: no profile") );
Profile_obj oldProfile(m_folderName);
@@ -1163,5 +1163,5 @@
// for this server (in this case, nothing changes on the server
// and no RENAME command should be issued).
- CHECK( false, false, "RENAME command to server not yet implemented" );
+ CHECK( false, false, _T("RENAME command to server not yet implemented") );
}
@@ -1192,5 +1192,5 @@
filterDesc.Set(dialogSettings);
filter->Set(filterDesc);
- wxLogStatus(_("Filter '%s' has been updated."), filterName);
+ wxLogStatus(_("Filter '%s' has been updated."), filterName.c_str());
}
else
@@ -1202,5 +1202,5 @@
{
// XNOTODO: Find out how to updqte this filter anyway
- wxLogError(_("Filter '%s' is not \"simple\" and has not been updated."),
filterName);
+ wxLogError(_("Filter '%s' is not \"simple\" and has not been updated."),
+filterName.c_str());
}
filter->DecRef();
@@ -1249,5 +1249,5 @@
// the caller should verify that it's not already in the cache
ASSERT_MSG( ms_aFolders.Index(folder) == wxNOT_FOUND,
- "can't add the folder to the cache - it's already there" );
+ _T("can't add the folder to the cache - it's already there") );
size_t index = ms_aFolderNames.Add(folder->GetFullName());
@@ -1262,5 +1262,5 @@
int index = ms_aFolders.Index(folder);
CHECK_RET( index != wxNOT_FOUND,
- "can't remove folder from cache because it's not in it" );
+ _T("can't remove folder from cache because it's not in it") );
#if wxCHECK_VERSION(2, 2, 8)
@@ -1313,5 +1313,5 @@
{
Profile_obj profile(start);
- CHECK( profile, false, "panic in MFolderTraversal: no profile" );
+ CHECK( profile, false, _T("panic in MFolderTraversal: no profile") );
// enumerate all groups
-------------------------------------------------------
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
