Update of /cvsroot/mahogany/M/src/classes
In directory usw-pr-cvs1:/tmp/cvs-serv9699/src/classes
Modified Files:
ComposeTemplate.cpp FolderMonitor.cpp FolderView.cpp
MApplication.cpp MEvent.cpp MFilter.cpp MModule.cpp
MessageTemplate.cpp MessageView.cpp Moptions.cpp Mpers.cpp
Profile.cpp Sequence.cpp
Log Message:
a few fixes for Unicode compilation
Index: ComposeTemplate.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/ComposeTemplate.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -b -u -2 -r1.36 -r1.37
--- ComposeTemplate.cpp 13 Aug 2002 11:33:08 -0000 1.36
+++ ComposeTemplate.cpp 8 Sep 2002 19:23:09 -0000 1.37
@@ -542,5 +542,5 @@
size_t nCount = m_texts.GetCount();
ASSERT_MSG( m_attachments.GetCount() == nCount,
- "something is very wrong in template expansion sink" );
+ _T("something is very wrong in template expansion sink") );
for ( size_t n = 0; n < nCount; n++ )
@@ -1004,5 +1004,5 @@
default:
CHECK( header <= MessageHeader_LastControl, FALSE,
- "unexpected macro in message category" );
+ _T("unexpected macro in message category") );
// the MessageHeader enum values are the same as RecipientType ones,
@@ -1552,5 +1552,5 @@
// sanity test
ASSERT_MSG( !wrapMargin || lineCur.length() <= wrapMargin,
- "logic error in auto wrap code" );
+ _T("logic error in auto wrap code") );
*value += lineCur;
Index: FolderMonitor.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/FolderMonitor.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -b -u -2 -r1.17 -r1.18
--- FolderMonitor.cpp 21 May 2002 11:34:02 -0000 1.17
+++ FolderMonitor.cpp 8 Sep 2002 19:23:09 -0000 1.18
@@ -118,5 +118,5 @@
else
{
- FAIL_MSG( "NULL folder in FolderMonitorFolderEntry?" );
+ FAIL_MSG( _T("NULL folder in FolderMonitorFolderEntry?") );
}
@@ -201,5 +201,5 @@
MFolder_obj folder(folderName);
- CHECK( folder, true, "traversed a non-existing folder?" );
+ CHECK( folder, true, _T("traversed a non-existing folder?") );
if ( folder->GetFlags() & MF_FLAGS_MONITOR )
@@ -290,5 +290,5 @@
static FolderMonitor *s_folderMonitor = NULL;
- CHECK( !s_folderMonitor, NULL, "FolderMonitor::Create() called twice!" );
+ CHECK( !s_folderMonitor, NULL, _T("FolderMonitor::Create() called twice!") );
// do create it
@@ -379,10 +379,10 @@
FolderMonitorImpl::AddOrRemoveFolder(MFolder *folder, bool monitor)
{
- CHECK( folder, false, "FolderMonitor::AddOrRemoveFolder(): NULL folder" );
+ CHECK( folder, false, _T("FolderMonitor::AddOrRemoveFolder(): NULL folder") );
#ifdef DEBUG
if ( IsBeingMonitored(folder) == monitor )
{
- FAIL_MSG( "FolderMonitor::AddOrRemoveFolder(): nothing to do!" );
+ FAIL_MSG( _T("FolderMonitor::AddOrRemoveFolder(): nothing to do!") );
folder->DecRef();
@@ -402,5 +402,5 @@
{
// this is impossible in debug mode because of the check above
- FAIL_MSG( "logic error in FolderMonitor::AddOrRemoveFolder()" );
+ FAIL_MSG( _T("logic error in FolderMonitor::AddOrRemoveFolder()") );
return false;
@@ -417,5 +417,5 @@
{
// this could lead to a crash in CheckNewMail()
- CHECK( !m_inNewMailCheck.IsLocked(), false, "can't remove it now" );
+ CHECK( !m_inNewMailCheck.IsLocked(), false, _T("can't remove it now") );
for ( FolderMonitorFolderList::iterator i = m_list.begin();
@@ -519,5 +519,5 @@
default:
- FAIL_MSG( "unknown folder state" );
+ FAIL_MSG( _T("unknown folder state") );
// fall through
Index: FolderView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/FolderView.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -u -2 -r1.11 -r1.12
--- FolderView.cpp 8 Sep 2001 18:10:43 -0000 1.11
+++ FolderView.cpp 8 Sep 2002 19:23:09 -0000 1.12
@@ -61,5 +61,5 @@
) )
{
- FAIL_MSG( "Failed to register folder view with event manager" );
+ FAIL_MSG( _T("Failed to register folder view with event manager") );
}
}
@@ -134,5 +134,5 @@
profile = mApplication->GetProfile();
- CHECK( profile, NULL, "no global profile?" );
+ CHECK( profile, NULL, _T("no global profile?") );
}
Index: MApplication.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MApplication.cpp,v
retrieving revision 1.260
retrieving revision 1.261
diff -b -u -2 -r1.260 -r1.261
--- MApplication.cpp 29 Aug 2002 00:24:27 -0000 1.260
+++ MApplication.cpp 8 Sep 2002 19:23:09 -0000 1.261
@@ -289,5 +289,5 @@
if ( name->empty() )
{
- FAIL_MSG( "empty folder name in the list of folders to open?" );
+ FAIL_MSG( _T("empty folder name in the list of folders to open?") );
continue;
}
@@ -562,9 +562,9 @@
MEventId_OptionsChange);
CHECK( m_eventOptChangeReg, FALSE,
- "failed to register event handler for options change event " );
+ _T("failed to register event handler for options change event") );
m_eventFolderUpdateReg = MEventManager::Register(*this,
MEventId_FolderUpdate);
CHECK( m_eventFolderUpdateReg, FALSE,
- "failed to register event handler for folder status event " );
+ _T("failed to register event handler for folder status event") );
// finish non critical initialization
@@ -801,5 +801,5 @@
MAppBase::Exit(bool ask)
{
- CHECK_RET( m_topLevelFrame, "can't close main window - there is none" );
+ CHECK_RET( m_topLevelFrame, _T("can't close main window - there is none") );
// if we don't ask, force closing the frame by passing TRUE to Close()
@@ -849,5 +849,5 @@
else
{
- FAIL_MSG("unexpected event in MAppBase");
+ FAIL_MSG(_T("unexpected event in MAppBase"));
}
@@ -1024,5 +1024,5 @@
MAppBase::SendOutbox(const String & outbox, bool checkOnline ) const
{
- CHECK_RET( outbox.length(), "missing outbox folder name" );
+ CHECK_RET( outbox.length(), _T("missing outbox folder name") );
UIdType count = 0;
@@ -1101,5 +1101,5 @@
// time in some 'to-be-determined' cases...
if (lastMsgTried == msg) {
- wxFAIL_MSG("Sending same message again !?");
+ wxFAIL_MSG(_T("Sending same message again !?"));
i++;
continue;
@@ -1220,5 +1220,5 @@
}
- FAIL_MSG( "logic error in GetStatusField" );
+ FAIL_MSG( _T("logic error in GetStatusField") );
return -1;
@@ -1306,5 +1306,5 @@
bool MAppBase::IsMailDebuggingEnabled() const
{
- ASSERT_MSG( m_debugMail != -1, "command line not parsed yet!" );
+ ASSERT_MSG( m_debugMail != -1, _T("command line not parsed yet!") );
return m_debugMail == 1; // don't use TRUE to avoid VC++ warning
Index: MEvent.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MEvent.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -b -u -2 -r1.35 -r1.36
--- MEvent.cpp 9 Nov 2001 21:59:53 -0000 1.35
+++ MEvent.cpp 8 Sep 2002 19:23:09 -0000 1.36
@@ -93,5 +93,5 @@
if ( &(info->receiver) == this )
{
- FAIL_MSG( "Forgot to Deregister() - will probably crash!" );
+ FAIL_MSG( _T("Forgot to Deregister() - will probably crash!") );
break;
@@ -145,5 +145,5 @@
bool MEventManager::Dispatch(MEventData *dataptr)
{
- CHECK( dataptr, false, "NULL event in Dispatch()" );
+ CHECK( dataptr, false, _T("NULL event in Dispatch()") );
if ( gs_IsSuspended )
@@ -205,6 +205,6 @@
if ( info->id == eventId && &(info->receiver) == &who )
{
- FAIL_MSG( "Registering the same handler twice in "
- "MEventManager::Register()" );
+ FAIL_MSG( _T("Registering the same handler twice in "
+ "MEventManager::Register()") );
}
}
@@ -225,5 +225,5 @@
CHECK( index != wxNOT_FOUND, false,
- "unregistering event handler which was not registered" );
+ _T("unregistering event handler which was not registered") );
size_t n = (size_t)index;
@@ -240,5 +240,5 @@
CHECK_RET( suspend || gs_IsSuspended > 0,
- "resuming events but not suspended" );
+ _T("resuming events but not suspended") );
gs_IsSuspended += suspend ? 1 : -1;
Index: MFilter.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MFilter.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -b -u -2 -r1.21 -r1.22
--- MFilter.cpp 20 Jun 2002 18:12:06 -0000 1.21
+++ MFilter.cpp 8 Sep 2002 19:23:09 -0000 1.22
@@ -178,5 +178,5 @@
{
CHECK( test >= 0 && (unsigned)test < WXSIZEOF(ORC_T_Flags), false,
- "invalid filter test" );
+ _T("invalid filter test") );
return (ORC_T_Flags[test] & ORC_F_NeedsArg) != 0;
@@ -186,5 +186,5 @@
{
CHECK( test >= 0 && (unsigned)test < WXSIZEOF(ORC_T_Flags), false,
- "invalid filter test" );
+ _T("invalid filter test") );
return (ORC_T_Flags[test] & ORC_F_NeedsTarget) != 0;
@@ -251,5 +251,5 @@
String program;
- CHECK( m_Test >= 0 && m_Test < ORC_T_Max, program, "illegal filter test" );
+ CHECK( m_Test >= 0 && m_Test < ORC_T_Max, program, _T("illegal filter test") );
// This returns the bit to go into an if between the brackets:
@@ -266,5 +266,5 @@
default:
- FAIL_MSG( "unknown logical filter operation" );
+ FAIL_MSG( _T("unknown logical filter operation") );
case ORC_L_None:
@@ -288,5 +288,5 @@
else
{
- FAIL_MSG("This must not happen!");
+ FAIL_MSG(_T("This must not happen!"));
return "";
}
@@ -521,5 +521,5 @@
if(m_Action < 0 || m_Action >= OAC_T_Max)
{
- ASSERT_MSG(0,"illegal action - must not happen");
+ ASSERT_MSG(0, _T("illegal action - must not happen"));
return "";
}
@@ -833,5 +833,5 @@
{
// GUI code is supposed to check for this
- CHECK( nameSrc != nameDst, false, "can't copy filter over itself" );
+ CHECK( nameSrc != nameDst, false, _T("can't copy filter over itself") );
Profile_obj profileSrc(Profile::CreateFilterProfile(nameSrc));
@@ -894,5 +894,5 @@
GetFilterForFolder(const MFolder *folder)
{
- CHECK( folder, NULL, "GetFilterForFolder: NULL parameter" );
+ CHECK( folder, NULL, _T("GetFilterForFolder: NULL parameter") );
// build a single program from all filter rules:
Index: MModule.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MModule.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -b -u -2 -r1.71 -r1.72
--- MModule.cpp 16 Mar 2002 13:47:05 -0000 1.71
+++ MModule.cpp 8 Sep 2002 19:23:09 -0000 1.72
@@ -461,5 +461,5 @@
#ifndef USE_MODULES_STATIC
// this function only works for loaded modules in dynamic case
- ASSERT_MSG( !listall, "this mode is not supported with dynamic modules" );
+ ASSERT_MSG( !listall, _T("this mode is not supported with dynamic modules") );
#endif // USE_MODULES_STATIC
@@ -504,5 +504,5 @@
if ( !m )
{
- FAIL_MSG( "module should be loaded" );
+ FAIL_MSG( _T("module should be loaded") );
continue;
@@ -631,5 +631,5 @@
ASSERT_MSG( WXSIZEOF(MMD_HEADERS) == MMD_LINE_LAST,
- "forgot to update the constants describing MMD format" );
+ _T("forgot to update the constants describing MMD format") );
// Second: load list info:
Index: MessageTemplate.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MessageTemplate.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -b -u -2 -r1.28 -r1.29
--- MessageTemplate.cpp 14 Apr 2002 12:16:54 -0000 1.28
+++ MessageTemplate.cpp 8 Sep 2002 19:23:09 -0000 1.29
@@ -90,5 +90,5 @@
const char *pc = *ppc;
- ASSERT_MSG( *pc == '$', "we should be called for $expression only" );
+ ASSERT_MSG( *pc == '$', _T("we should be called for $expression only") );
// what kind of brackets do we have? some of them imply the category
@@ -418,5 +418,5 @@
default:
- FAIL_MSG("unknown alignment value");
+ FAIL_MSG(_T("unknown alignment value"));
}
}
@@ -551,5 +551,5 @@
default:
- FAIL_MSG("unknown template kind");
+ FAIL_MSG(_T("unknown template kind"));
}
@@ -640,5 +640,5 @@
default:
- FAIL_MSG("unknown template kind");
+ FAIL_MSG(_T("unknown template kind"));
// fall through
Index: MessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MessageView.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -b -u -2 -r1.94 -r1.95
--- MessageView.cpp 17 Jul 2002 00:06:28 -0000 1.94
+++ MessageView.cpp 8 Sep 2002 19:23:09 -0000 1.95
@@ -181,5 +181,5 @@
: m_errormsg(errormsg)
{
- ASSERT_MSG( process && pid, "invalid process in ProcessInfo" );
+ ASSERT_MSG( process && pid, _T("invalid process in ProcessInfo") );
m_process = process;
@@ -456,5 +456,5 @@
wxArrayString *descs)
{
- CHECK( names && descs, 0, "NULL pointer in GetAllAvailableViewers" );
+ CHECK( names && descs, 0, _T("NULL pointer in GetAllAvailableViewers") );
MModuleListing *listing =
@@ -489,5 +489,5 @@
viewer = CreateDefaultViewer();
- ASSERT_MSG( viewer, "must have default viewer, will crash without it!" );
+ ASSERT_MSG( viewer, _T("must have default viewer, will crash without it!") );
m_usingDefViewer = true;
@@ -598,6 +598,6 @@
String MessageView::GetFolderName() const
{
- CHECK( m_mailMessage->GetFolder(), "unknown",
- "no folder in MessageView?" );
+ CHECK( m_mailMessage->GetFolder(), _T("unknown"),
+ _T("no folder in MessageView?") );
return m_mailMessage->GetFolder()->GetName();
@@ -634,7 +634,7 @@
// register with the event manager
m_regCookieOptionsChange = MEventManager::Register(*this, MEventId_OptionsChange);
- ASSERT_MSG( m_regCookieOptionsChange, "can't register for options change event");
+ ASSERT_MSG( m_regCookieOptionsChange, _T("can't register for options change
+event"));
m_regCookieASFolderResult = MEventManager::Register(*this,
MEventId_ASFolderResult);
- ASSERT_MSG( m_regCookieASFolderResult, "can't reg folder view with event manager");
+ ASSERT_MSG( m_regCookieASFolderResult, _T("can't reg folder view with event
+manager"));
}
@@ -685,5 +685,5 @@
default:
- FAIL_MSG("unknown options change event");
+ FAIL_MSG(_T("unknown options change event"));
}
@@ -719,5 +719,5 @@
default:
- FAIL_MSG("Unexpected async result event");
+ FAIL_MSG(_T("Unexpected async result event"));
}
}
@@ -767,5 +767,5 @@
{
Profile *profile = GetProfile();
- CHECK_RET( profile, "MessageView::ReadAllSettings: no profile" );
+ CHECK_RET( profile, _T("MessageView::ReadAllSettings: no profile") );
// a macro to make setting many colour options less painful
@@ -941,5 +941,5 @@
ASSERT_MSG( EnvelopHeader_Max == WXSIZEOF(envelopHeadersNames),
- "forgot to update something - should be kept in sync!" );
+ _T("forgot to update something - should be kept in sync!") );
for ( n = 0; n < WXSIZEOF(envelopHeadersNames); n++ )
@@ -996,5 +996,5 @@
// did their number change from just recounting?
- ASSERT_MSG( nNonEnv == countNonEnvHeaders, "logic error" );
+ ASSERT_MSG( nNonEnv == countNonEnvHeaders, _T("logic error") );
headerPtrs[countNonEnvHeaders] = NULL;
@@ -1019,5 +1019,5 @@
{
// if headerIsEnv, then it must be in the array
- FAIL_MSG( "logic error" );
+ FAIL_MSG( _T("logic error") );
continue;
@@ -1036,5 +1036,5 @@
switch ( envhdr )
{
- default: FAIL_MSG( "forgot to add header here ");
+ default: FAIL_MSG( _T("forgot to add header here") );
case EnvelopHeader_From: mat = MAT_FROM; break;
case EnvelopHeader_To: mat = MAT_TO; break;
@@ -1075,5 +1075,5 @@
default:
- FAIL_MSG( "unknown envelop header" );
+ FAIL_MSG( _T("unknown envelop header") );
}
@@ -1303,5 +1303,5 @@
CHECK( qlevel < QUOTE_LEVEL_MAX, wxNullColour,
- "MessageView::GetQuoteColour(): invalid quoting level" );
+ _T("MessageView::GetQuoteColour(): invalid quoting level") );
return m_ProfileValues.QuotedCol[qlevel];
@@ -1836,5 +1836,5 @@
MessageView::ProcessPart(const MimePart *mimepart)
{
- CHECK_RET( mimepart, "MessageView::ProcessPart: NULL mimepart" );
+ CHECK_RET( mimepart, _T("MessageView::ProcessPart: NULL mimepart") );
MimeType type = mimepart->GetType();
@@ -1872,5 +1872,5 @@
// show just the best one
- CHECK_RET(partBest != 0, "No part can be displayed !");
+ CHECK_RET(partBest != 0, _T("No part can be displayed !"));
ShowPart(partBest);
}
@@ -1907,5 +1907,5 @@
default:
- FAIL_MSG( "unknown MIME type" );
+ FAIL_MSG( _T("unknown MIME type") );
}
}
@@ -1929,5 +1929,5 @@
const MimePart *mimepart = m_mailMessage->GetTopMimePart();
- CHECK_RET( mimepart, "No MIME part to show?" );
+ CHECK_RET( mimepart, _T("No MIME part to show?") );
m_encodingAuto = mimepart->GetTextEncoding();
@@ -2689,8 +2689,8 @@
return false;
- CHECK( GetFolder(), false, "no folder in message view?" );
+ CHECK( GetFolder(), false, _T("no folder in message view?") );
Profile *profile = GetProfile();
- CHECK( profile, false, "no profile in message view?" );
+ CHECK( profile, false, _T("no profile in message view?") );
UIdArray msgs;
@@ -2759,5 +2759,5 @@
MessageView::DoMouseCommand(int id, const ClickableInfo *ci, const wxPoint& pt)
{
- CHECK_RET( ci, "MessageView::DoMouseCommand(): NULL ClickableInfo" );
+ CHECK_RET( ci, _T("MessageView::DoMouseCommand(): NULL ClickableInfo") );
switch ( ci->GetType() )
@@ -2781,5 +2781,5 @@
default:
- FAIL_MSG("unknown mouse action");
+ FAIL_MSG(_T("unknown mouse action"));
}
}
@@ -2832,5 +2832,5 @@
default:
- FAIL_MSG("unknown embedded object type");
+ FAIL_MSG(_T("unknown embedded object type"));
}
}
@@ -2866,8 +2866,8 @@
{
wxFrame *frame = GetParentFrame();
- CHECK_RET( frame, "message view without parent frame?" );
+ CHECK_RET( frame, _T("message view without parent frame?") );
wxMenuBar *mbar = frame->GetMenuBar();
- CHECK_RET( mbar, "message view frame without menu bar?" );
+ CHECK_RET( mbar, _T("message view frame without menu bar?") );
mbar->Check(WXMENU_MSG_TOGGLEHEADERS, m_ProfileValues.showHeaders);
@@ -2985,6 +2985,6 @@
MessageView::DoShowMessage(Message *mailMessage)
{
- CHECK_RET( mailMessage, "no message to show in MessageView" );
- CHECK_RET( m_asyncFolder, "no folder in MessageView::DoShowMessage()" );
+ CHECK_RET( mailMessage, _T("no message to show in MessageView") );
+ CHECK_RET( m_asyncFolder, _T("no folder in MessageView::DoShowMessage()") );
if ( !CheckMessageSize(mailMessage) )
@@ -3006,5 +3006,5 @@
{
MailFolder *mf = m_mailMessage->GetFolder();
- CHECK_RET( mf, "mail message without associated folder?" );
+ CHECK_RET( mf, _T("mail message without associated folder?") );
// mark it as seen if we can
@@ -3123,5 +3123,5 @@
}
- CHECK_RET( n != procCount, "unknown process terminated!" );
+ CHECK_RET( n != procCount, _T("unknown process terminated!") );
ProcessInfo *info = m_processes[n];
Index: Moptions.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Moptions.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -b -u -2 -r1.44 -r1.45
--- Moptions.cpp 21 Jul 2002 19:28:08 -0000 1.44
+++ Moptions.cpp 8 Sep 2002 19:23:09 -0000 1.45
@@ -879,5 +879,5 @@
{
ASSERT_MSG( (size_t)opt.GetId() < WXSIZEOF(MOptions),
- "invalid option index!" );
+ _T("invalid option index!") );
return MOptions[opt.GetId()].name;
@@ -915,5 +915,5 @@
if ( font < 0 || (size_t)font > WXSIZEOF(fontFamilies) )
{
- wxFAIL_MSG( "bad font setting in config" );
+ wxFAIL_MSG( _T("bad font setting in config") );
font = 0;
Index: Mpers.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Mpers.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- Mpers.cpp 1 Sep 2002 23:30:14 -0000 1.7
+++ Mpers.cpp 8 Sep 2002 19:23:09 -0000 1.8
@@ -192,7 +192,7 @@
{
ASSERT_MSG( M_MSGBOX_MAX->GetId() == WXSIZEOF(gs_persMsgBoxData),
- "should be kept in sync!" );
+ _T("should be kept in sync!") );
- CHECK( which, "", "NULL pointer in GetPersMsgBoxName" );
+ CHECK( which, "", _T("NULL pointer in GetPersMsgBoxName") );
return gs_persMsgBoxData[which->GetId()].name;
Index: Profile.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Profile.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -b -u -2 -r1.134 -r1.135
--- Profile.cpp 7 Sep 2002 20:53:15 -0000 1.134
+++ Profile.cpp 8 Sep 2002 19:23:09 -0000 1.135
@@ -254,5 +254,5 @@
{
// we don't even have an associated wxConfig!
- FAIL_MSG( "not supposed to be called" );
+ FAIL_MSG( _T("not supposed to be called") );
return "";
@@ -381,5 +381,5 @@
ASSERT_MSG( path.Length() == 0 || path[0u] != '/',
- "only relative paths allowed" );
+ _T("only relative paths allowed") );
m_ProfilePath = path;
@@ -1071,5 +1071,5 @@
if ( m_Suspended )
{
- FAIL_MSG( "deleting a suspended profile" );
+ FAIL_MSG( _T("deleting a suspended profile") );
Discard(); // but we tidy up, no big deal
@@ -1135,5 +1135,5 @@
PCHECK();
- CHECK( !path.empty(), false, "must have a valid group name to delete it" );
+ CHECK( !path.empty(), false, _T("must have a valid group name to delete it") );
if ( path[0u] != '/' )
@@ -1379,5 +1379,5 @@
!cfg->Write(truePath + name, strValue) )
{
- FAIL_MSG("failed to copy config entry");
+ FAIL_MSG(_T("failed to copy config entry"));
}
break;
@@ -1387,10 +1387,10 @@
!cfg->Write(truePath + name, numValue) )
{
- FAIL_MSG("failed to copy config entry");
+ FAIL_MSG(_T("failed to copy config entry"));
}
break;
default:
- FAIL_MSG("unsupported config entry type");
+ FAIL_MSG(_T("unsupported config entry type"));
}
@@ -1414,5 +1414,5 @@
PCHECK();
- CHECK_RET( m_Suspended, "calling Commit() without matching Suspend()" );
+ CHECK_RET( m_Suspended, _T("calling Commit() without matching Suspend()") );
String truePath = GetName();
@@ -1436,5 +1436,5 @@
PCHECK();
- CHECK_RET( m_Suspended, "calling Discard() without matching Suspend()" );
+ CHECK_RET( m_Suspended, _T("calling Discard() without matching Suspend()") );
if ( !--m_Suspended )
@@ -1455,9 +1455,9 @@
ms_GlobalConfig->DeleteGroup(path);
- ASSERT_MSG( success, "failed to delete suspended settings" );
+ ASSERT_MSG( success, _T("failed to delete suspended settings") );
}
}
- ASSERT_MSG( ms_suspendCount > 0, "suspend count broken" );
+ ASSERT_MSG( ms_suspendCount > 0, _T("suspend count broken") );
ms_suspendCount--;
@@ -1527,5 +1527,5 @@
{
wxConfigBase *conf = profile->GetConfig();
- CHECK_RET( conf, "can't be used with non config based profile!" );
+ CHECK_RET( conf, _T("can't be used with non config based profile!") );
conf->SetPath(profile->GetConfigPath());
@@ -1537,5 +1537,5 @@
{
wxConfigBase *conf = profile->GetConfig();
- CHECK_RET( conf, "can't be used with non config based profile!" );
+ CHECK_RET( conf, _T("can't be used with non config based profile!") );
conf->SetPath(profile->GetConfigPath());
@@ -1612,5 +1612,5 @@
if ( *p )
{
- ASSERT_MSG( *p == '/', "profile path must start with slash" );
+ ASSERT_MSG( *p == _T('/'), _T("profile path must start with slash") );
// erase the slash
@@ -1639,6 +1639,6 @@
{
// remove "/M" prefix
- ASSERT_MSG( path[0u] == '/' && path[1u] == 'M',
- "all profile sections must start with \"/M\"" );
+ ASSERT_MSG( path[0u] == _T('/') && path[1u] == _T('M'),
+ _T("all profile sections must start with \"/M\"") );
path.erase(0, 2);
Index: Sequence.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Sequence.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -u -2 -r1.5 -r1.6
--- Sequence.cpp 4 Jul 2002 17:22:37 -0000 1.5
+++ Sequence.cpp 8 Sep 2002 19:23:09 -0000 1.6
@@ -129,5 +129,5 @@
void Sequence::AddRange(UIdType from, UIdType to)
{
- CHECK_RET( from <= to, "invalid range in Sequence::AddRange" );
+ CHECK_RET( from <= to, _T("invalid range in Sequence::AddRange") );
Add(from);
@@ -251,5 +251,5 @@
{
// nothing else can follow the end of the range
- ASSERT_MSG( m_seq[cookie] == ',', "bad sequence string format" );
+ ASSERT_MSG( m_seq[cookie] == ',', _T("bad sequence string format") );
cookie++;
@@ -277,5 +277,5 @@
String GetSequenceString(const UIdArray *messages)
{
- CHECK( messages, "", "NULL messages array in GetSequenceString" );
+ CHECK( messages, "", _T("NULL messages array in GetSequenceString") );
Sequence seq;
-------------------------------------------------------
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
