Update of /cvsroot/mahogany/M/src/util
In directory usw-pr-cvs1:/tmp/cvs-serv9699/src/util
Modified Files:
matchurl.cpp strutil.cpp upgrade.cpp
Log Message:
a few fixes for Unicode compilation
Index: matchurl.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/util/matchurl.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -b -u -2 -r1.17 -r1.18
--- matchurl.cpp 3 Jun 2002 11:18:47 -0000 1.17
+++ matchurl.cpp 8 Sep 2002 19:23:12 -0000 1.18
@@ -224,5 +224,5 @@
// This is not the end of a keyword
// Go on
- CHECK( current->_son, -1, "current cell must have a son" );
+ CHECK( current->_son, -1, _T("current cell must have a son") );
return scanAtStart(toBeScanned+1, current->_son, longueurDejaVue+1,
lngDernierTrouve);
}
@@ -280,5 +280,5 @@
// This is not the end of a keyword
// Go on
- CHECK( current->_son, -1, "current cell must have a son" );
+ CHECK( current->_son, -1, _T("current cell must have a son") );
current = current->_son;
atRootLevel = false;
@@ -309,5 +309,5 @@
currentPosition = currentPosition + lng - current->_isKey;
lng = current->_isKey;
- ASSERT_MSG( lng > 0, "length must be non 0" );
+ ASSERT_MSG( lng > 0, _T("length must be non 0") );
current = current->_son;
}
@@ -323,5 +323,5 @@
{
ASSERT_MSG(parentBack == 0 || parentBack->_c == '\000',
- "logic error in KeywordDetectorCell?");
+ _T("logic error in KeywordDetectorCell?"));
KeywordDetectorCell* back = 0;
@@ -362,5 +362,5 @@
// There must be a son, otherwise the current node would be a keyword
// and there is no need for a back node
- CHECK(lastSon, 0, "node with a back link must have a son");
+ CHECK(lastSon, 0, _T("node with a back link must have a son"));
while (lastSon->_brother)
Index: strutil.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/util/strutil.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -b -u -2 -r1.105 -r1.106
--- strutil.cpp 4 Jul 2002 14:12:05 -0000 1.105
+++ strutil.cpp 8 Sep 2002 19:23:12 -0000 1.106
@@ -356,5 +356,5 @@
default:
- FAIL_MSG("unknown size field");
+ FAIL_MSG(_T("unknown size field"));
}
break;
@@ -979,5 +979,5 @@
wxString testdata = READ_APPCONFIG(MP_CRYPT_TESTDATA);
- CHECK( !testdata.empty(), true, "shouldn't be called if no old password" );
+ CHECK( !testdata.empty(), true, _T("shouldn't be called if no old password") );
String oldPassword = gs_GlobalPassword;
@@ -1075,5 +1075,5 @@
{
// oops - failed to init MH
- FAIL_MSG("can't construct MH folder full name");
+ FAIL_MSG(_T("can't construct MH folder full name"));
}
else
@@ -1228,5 +1228,5 @@
int flags)
{
- CHECK( regex, FALSE, "NULL regex" );
+ CHECK( regex, FALSE, _T("NULL regex") );
return regex->Matches(pattern, flags);
@@ -1365,5 +1365,5 @@
{
CHECK( strUtf, wxFONTENCODING_SYSTEM,
- "NULL string in ConvertUnicodeToSystem" );
+ _T("NULL string in ConvertUnicodeToSystem") );
if ( !strUtf->empty() )
@@ -1391,5 +1391,5 @@
else
{
- ASSERT_MSG( enc == wxFONTENCODING_UTF8, "unknown Unicode enocding" );
+ ASSERT_MSG( enc == wxFONTENCODING_UTF8, _T("unknown Unicode encoding") );
}
Index: upgrade.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/util/upgrade.cpp,v
retrieving revision 1.193
retrieving revision 1.194
diff -b -u -2 -r1.193 -r1.194
--- upgrade.cpp 14 Apr 2002 12:16:55 -0000 1.193
+++ upgrade.cpp 8 Sep 2002 19:23:12 -0000 1.194
@@ -1132,5 +1132,5 @@
if ( !dial )
{
- FAIL_MSG( "GetDialUpManager() returned NULL?" );
+ FAIL_MSG( _T("GetDialUpManager() returned NULL?") );
nCount = 0;
}
@@ -1466,5 +1466,5 @@
if ( gs_isWizardRunning )
{
- FAIL_MSG( "the installation wizard is already running!" );
+ FAIL_MSG( _T("the installation wizard is already running!") );
return false;
@@ -1683,5 +1683,5 @@
else
{
- FAIL_MSG( "Cannot get main folder?" );
+ FAIL_MSG( _T("Cannot get main folder?") );
}
}
@@ -1874,5 +1874,5 @@
{
case wxConfigBase::Type_Unknown:
- wxFAIL_MSG("unexpected entry type");
+ wxFAIL_MSG(_T("unexpected entry type"));
// fall through
@@ -2087,5 +2087,5 @@
{
// what can we do? nothing...
- FAIL_MSG( "profile without config - can't delete entry" );
+ FAIL_MSG( _T("profile without config - can't delete entry") );
}
@@ -2507,5 +2507,5 @@
{
MFolder_obj folder(folderName);
- CHECK( folder, false, "traversed folder which doesn't exist?" );
+ CHECK( folder, false, _T("traversed folder which doesn't exist?") );
if ( folder->GetFlags() & MF_FLAGS_INCOMING )
@@ -2627,5 +2627,5 @@
default:
- FAIL_MSG("invalid version value");
+ FAIL_MSG(_T("invalid version value"));
// fall through
@@ -2782,5 +2782,5 @@
if ( !folder )
{
- FAIL_MSG( "folder must exist" );
+ FAIL_MSG( _T("folder must exist") );
}
else
@@ -2921,5 +2921,5 @@
default:
- FAIL_MSG( "unexpected VerifyStdFolder return value" );
+ FAIL_MSG( _T("unexpected VerifyStdFolder return value") );
// fall through
@@ -2974,5 +2974,5 @@
default:
- FAIL_MSG( "unexpected VerifyStdFolder return value" );
+ FAIL_MSG( _T("unexpected VerifyStdFolder return value") );
// fall through
-------------------------------------------------------
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
