Update of /cvsroot/mahogany/M/src/adb
In directory usw-pr-cvs1:/tmp/cvs-serv9699/src/adb
Modified Files:
AdbDialogs.cpp AdbFrame.cpp AdbManager.cpp AdbModule.cpp
AdbProvider.cpp Collect.cpp ImportEudora.cpp ImportMailrc.cpp
ImportPine.cpp ImportText.cpp ImportVCard.cpp ImportXFMail.cpp
ProvBbdb.cpp ProvDummy.cpp ProvFC.cpp ProvPalm.cpp
ProvPasswd.cpp
Log Message:
a few fixes for Unicode compilation
Index: AdbDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbDialogs.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -u -2 -r1.20 -r1.21
--- AdbDialogs.cpp 8 Sep 2002 16:22:14 -0000 1.20
+++ AdbDialogs.cpp 8 Sep 2002 19:23:08 -0000 1.21
@@ -503,5 +503,5 @@
{
size_t n = (size_t)m_listbox->GetSelection();
- CHECK_RET( n >= m_nGroups, "should be disabled" );
+ CHECK_RET( n >= m_nGroups, _T("should be disabled") );
// first remove it from the listbox
@@ -558,5 +558,5 @@
{
// we can't guess everything!
- CHECK( importer, FALSE, "should have either importer or filename" );
+ CHECK( importer, FALSE, _T("should have either importer or filename") );
filename = importer->GetDefaultFilename();
Index: AdbFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbFrame.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -b -u -2 -r1.93 -r1.94
--- AdbFrame.cpp 5 Jul 2002 16:56:18 -0000 1.93
+++ AdbFrame.cpp 8 Sep 2002 19:23:08 -0000 1.94
@@ -244,5 +244,5 @@
delete m_data;
else
- wxASSERT_MSG( !m_data, "memory leak in AdbTreeElement" );
+ wxASSERT_MSG( !m_data, _T("memory leak in AdbTreeElement") );
}
@@ -1206,5 +1206,5 @@
m_eventNewADB = MEventManager::Register(*this, MEventId_NewADB);
- ASSERT_MSG( m_eventNewADB, "ADB editor failed to register with event manager" );
+ ASSERT_MSG( m_eventNewADB, _T("ADB editor failed to register with event manager") );
// create our menu
@@ -1391,5 +1391,5 @@
}
else {
- wxFAIL_MSG( "no default ADB provider?" );
+ wxFAIL_MSG( _T("no default ADB provider?") );
}
@@ -1597,5 +1597,5 @@
{
wxCHECK_RET( element && element->GetParent(),
- "bad parameter in AddNewTreeElement" );
+ _T("bad parameter in AddNewTreeElement") );
AdbTreeNode *parent = element->GetParent();
@@ -1673,5 +1673,5 @@
void wxAdbEditFrame::DoDeleteNode(bool bAskConfirmation)
{
- wxCHECK_RET( !m_current->IsRoot(), "command should be disabled" );
+ wxCHECK_RET( !m_current->IsRoot(), _T("command should be disabled") );
AdbTreeNode *parent = m_current->GetParent();
@@ -1699,5 +1699,5 @@
// for file based books we have to take account of the fact that either
// string may be relative or absolute filename
- wxASSERT_MSG( IsAbsPath(strName), "book name should be absolute" );
+ wxASSERT_MSG( IsAbsPath(strName), _T("book name should be absolute") );
#ifdef __WXMSW__
@@ -1725,5 +1725,5 @@
{
// this is never supposed to happen
- wxFAIL_MSG( "deleting book which isn't opened??" );
+ wxFAIL_MSG( _T("deleting book which isn't opened??") );
return;
@@ -1873,5 +1873,5 @@
void wxAdbEditFrame::DoUndoChanges()
{
- wxCHECK_RET( !m_current->IsGroup(), "command should be disabled" );
+ wxCHECK_RET( !m_current->IsGroup(), _T("command should be disabled") );
// the IncRef() done by GetData() compensated with DecRef() in SetData()
@@ -2146,5 +2146,5 @@
default:
- wxFAIL_MSG("unknown ADB name format");
+ wxFAIL_MSG(_T("unknown ADB name format"));
}
@@ -2169,5 +2169,5 @@
}
else {
- wxFAIL_MSG("book should be in the cache if it was created");
+ wxFAIL_MSG(_T("book should be in the cache if it was created"));
}
}
@@ -2180,5 +2180,5 @@
{
wxCHECK_RET( m_current->IsGroup() && !m_current->IsRoot(),
- "command should be disabled" );
+ _T("command should be disabled") );
if ( AdbShowExportDialog(*(GetCurNode()->AdbGroup())) )
@@ -2212,5 +2212,5 @@
void wxAdbEditFrame::ExportVCardEntry()
{
- wxCHECK_RET( !m_current->IsGroup(), "command should be disabled" );
+ wxCHECK_RET( !m_current->IsGroup(), _T("command should be disabled") );
AdbExporter *exporter = AdbExporter::GetExporterByName("AdbVCardExporter");
@@ -2258,5 +2258,5 @@
// check that we have a group to import it under
wxCHECK_MSG( GetCurNode() && GetCurNode()->AdbGroup(), FALSE,
- "should be disabled as there is no current group" );
+ _T("should be disabled as there is no current group") );
// check that we have the importer for vCards
@@ -2300,5 +2300,5 @@
void wxAdbEditFrame::DoShowAdbProperties()
{
- wxCHECK_RET( m_current->IsBook(), "command should be disabled" );
+ wxCHECK_RET( m_current->IsBook(), _T("command should be disabled") );
AdbTreeBook *book = (AdbTreeBook *)m_current;
@@ -2313,5 +2313,5 @@
{
AdbTreeNode *parent = m_current->GetParent();
- wxCHECK_RET( parent && parent != m_root, "command should be disabled" );
+ wxCHECK_RET( parent && parent != m_root, _T("command should be disabled") );
// first of all, delete the previous clipboard's contents
@@ -2347,5 +2347,5 @@
// we must have something to paste and we can't paste address books (yet?)
wxCHECK_RET( m_clipboard != NULL && !m_current->IsRoot(),
- "command should be disabled" );
+ _T("command should be disabled") );
AdbTreeNode *group = GetCurNode();
@@ -3308,5 +3308,5 @@
}
else {
- wxFAIL_MSG("entry outside of an address book?");
+ wxFAIL_MSG(_T("entry outside of an address book?"));
}
@@ -3618,8 +3618,8 @@
default:
- wxFAIL_MSG("unknown field type in LayoutControls");
+ wxFAIL_MSG(_T("unknown field type in LayoutControls"));
}
- wxCHECK_RET( last, "control creation failed" );
+ wxCHECK_RET( last, _T("control creation failed") );
entries.Add(last);
@@ -3824,5 +3824,5 @@
default:
- wxFAIL_MSG("unknown tree element type");
+ wxFAIL_MSG(_T("unknown tree element type"));
}
@@ -3877,9 +3877,9 @@
// currently it's not possible - if it changes later, this assert will
// remind that this case has never been tested
- wxCHECK_RET( !m_data, "copying to item which already has some data?" );
+ wxCHECK_RET( !m_data, _T("copying to item which already has some data?") );
// we're copying data to the clipboard
AdbEntry *otherEntry = other.GetAdbEntry();
- wxCHECK_RET( otherEntry, "can't copy from entry without data" );
+ wxCHECK_RET( otherEntry, _T("can't copy from entry without data") );
m_data = new AdbData(*otherEntry);
@@ -3891,5 +3891,5 @@
AdbEntry *entry = GetAdbEntry();
- wxCHECK_RET( other.IsOnClipboard() && entry, "error copying data" );
+ wxCHECK_RET( other.IsOnClipboard() && entry, _T("error copying data") );
other.m_data->Copy(entry);
@@ -3977,5 +3977,5 @@
EnsureHasGroup();
- wxCHECK_RET( m_pGroup, "AdbTreeNode without associated AdbEntryGroup" );
+ wxCHECK_RET( m_pGroup, _T("AdbTreeNode without associated AdbEntryGroup") );
wxArrayString aNames;
@@ -4010,5 +4010,5 @@
AdbTreeElement *AdbTreeNode::CreateChild(const wxString& name, bool bGroup)
{
- wxCHECK_MSG( !IsRoot(), NULL, "only address books can be created at root");
+ wxCHECK_MSG( !IsRoot(), NULL, _T("only address books can be created at root") );
wxString strWhat = bGroup ? _("Group") : _("Entry");
@@ -4081,5 +4081,5 @@
default:
- wxFAIL_MSG("something weird in our ADB tree");
+ wxFAIL_MSG(_T("something weird in our ADB tree"));
}
Index: AdbManager.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbManager.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -b -u -2 -r1.35 -r1.36
--- AdbManager.cpp 4 Jul 2002 14:01:03 -0000 1.35
+++ AdbManager.cpp 8 Sep 2002 19:23:08 -0000 1.36
@@ -218,5 +218,5 @@
{
AdbManager_obj manager;
- CHECK( manager, FALSE, "can't expand address: no AdbManager" );
+ CHECK( manager, FALSE, _T("can't expand address: no AdbManager") );
results.Empty();
@@ -372,5 +372,5 @@
{
wxCHECK_RET( ms_pManager,
- "AdbManager::Unget() called without matching Get()!" );
+ _T("AdbManager::Unget() called without matching Get()!") );
if ( !ms_pManager->DecRef() ) {
@@ -388,5 +388,5 @@
// objects could still have references to us
ASSERT_MSG( !mApplication->IsRunning(),
- "AdbManager::Delete() called, but the app is still running!" );
+ _T("AdbManager::Delete() called, but the app is still running!") );
#ifdef DEBUG
@@ -403,5 +403,5 @@
// there should be _exactly_ one extra IncRef(), not several
- ASSERT_MSG( count < 2, "Forgot AdbManager::Unget() somewhere" );
+ ASSERT_MSG( count < 2, _T("Forgot AdbManager::Unget() somewhere") );
}
@@ -473,5 +473,5 @@
{
ASSERT_MSG( gs_provCache.Count() == gs_booksCache.Count(),
- "mismatch between gs_booksCache and gs_provCache!" );
+ _T("mismatch between gs_booksCache and gs_provCache!") );
return gs_booksCache.Count();
Index: AdbModule.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbModule.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -u -2 -r1.1 -r1.2
--- AdbModule.cpp 19 May 2000 15:56:00 -0000 1.1
+++ AdbModule.cpp 8 Sep 2002 19:23:08 -0000 1.2
@@ -118,5 +118,5 @@
{
#ifdef USE_ADB_MODULES
- ASSERT_MSG( !ms_listModules, "forgot to call FreeAdbModuleInfo()!" );
+ ASSERT_MSG( !ms_listModules, _T("forgot to call FreeAdbModuleInfo()!") );
// find all modules implementing AdbModule interface
Index: AdbProvider.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbProvider.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- AdbProvider.cpp 6 Jul 1999 10:26:37 -0000 1.4
+++ AdbProvider.cpp 8 Sep 2002 19:23:08 -0000 1.5
@@ -59,5 +59,5 @@
AdbDataProvider *provider = GetProviderByName("FCDataProvider");
- ASSERT_MSG( provider, "native ADB data provider not linked in??" );
+ ASSERT_MSG( provider, _T("native ADB data provider not linked in??") );
return provider;
Index: Collect.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/Collect.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -u -2 -r1.13 -r1.14
--- Collect.cpp 3 Jul 2002 09:02:01 -0000 1.13
+++ Collect.cpp 8 Sep 2002 19:23:08 -0000 1.14
@@ -135,5 +135,5 @@
{
AdbManager_obj manager;
- CHECK_RET( manager, "can't get AdbManager" );
+ CHECK_RET( manager, _T("can't get AdbManager") );
AdbBook *autocollectbook = manager->CreateBook(bookName);
@@ -364,5 +364,5 @@
{
AdbManager_obj manager;
- CHECK( manager, -1, "can't get AdbManager" );
+ CHECK( manager, -1, _T("can't get AdbManager") );
AdbBook_obj autocollectbook(manager->CreateBook(bookName));
Index: ImportEudora.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportEudora.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- ImportEudora.cpp 21 Apr 2000 18:33:51 -0000 1.4
+++ ImportEudora.cpp 8 Sep 2002 19:23:08 -0000 1.5
@@ -128,5 +128,5 @@
const char *pc = *ppc;
- ASSERT_MSG( *pc == '<', "should be at the start of the entry!" );
+ ASSERT_MSG( *pc == '<', _T("should be at the start of the entry!") );
// skip '<'
@@ -333,5 +333,5 @@
wxArrayString& entries) const
{
- ASSERT_MSG( !path, "where did this path come from?" );
+ ASSERT_MSG( !path, _T("where did this path come from?") );
entries.Empty();
@@ -360,5 +360,5 @@
wxArrayString& groups) const
{
- ASSERT_MSG( !path, "where did this path come from?" );
+ ASSERT_MSG( !path, _T("where did this path come from?") );
return 0;
@@ -369,5 +369,5 @@
AdbEntry *entry)
{
- CHECK( index < m_lineNumbers.GetCount(), FALSE, "invalid entry index" );
+ CHECK( index < m_lineNumbers.GetCount(), FALSE, _T("invalid entry index") );
wxString nickname;
@@ -380,5 +380,5 @@
wxString nicknameReal;
entry->GetField(AdbField_NickName, &nicknameReal);
- ASSERT_MSG( nicknameReal == nickname, "importing wrong entry?" );
+ ASSERT_MSG( nicknameReal == nickname, _T("importing wrong entry?") );
#endif // DEBUG
Index: ImportMailrc.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportMailrc.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -u -2 -r1.5 -r1.6
--- ImportMailrc.cpp 23 Dec 2000 20:53:49 -0000 1.5
+++ ImportMailrc.cpp 8 Sep 2002 19:23:08 -0000 1.6
@@ -285,5 +285,5 @@
wxArrayString& entries) const
{
- ASSERT_MSG( !path, "where did this path come from?" );
+ ASSERT_MSG( !path, _T("where did this path come from?") );
entries.Empty();
@@ -326,5 +326,5 @@
wxArrayString& groups) const
{
- ASSERT_MSG( !path, "where did this path come from?" );
+ ASSERT_MSG( !path, _T("where did this path come from?") );
return 0;
@@ -335,5 +335,5 @@
AdbEntry *entry)
{
- CHECK( index < m_lineNumbers.GetCount(), FALSE, "invalid entry index" );
+ CHECK( index < m_lineNumbers.GetCount(), FALSE, _T("invalid entry index") );
wxString line = m_textfile.GetLine((size_t)m_lineNumbers[index]);
@@ -354,5 +354,5 @@
wxString nicknameReal;
entry->GetField(AdbField_NickName, &nicknameReal);
- ASSERT_MSG( nicknameReal == nickname, "importing wrong entry?" );
+ ASSERT_MSG( nicknameReal == nickname, _T("importing wrong entry?") );
#endif // DEBUG
Index: ImportPine.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportPine.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- ImportPine.cpp 7 Sep 2002 19:50:32 -0000 1.6
+++ ImportPine.cpp 8 Sep 2002 19:23:08 -0000 1.7
@@ -380,5 +380,5 @@
if ( components.GetCount() != 1 )
{
- FAIL_MSG( "we may only have simple subgroups in PINE addressbooks" );
+ FAIL_MSG( _T("we may only have simple subgroups in PINE addressbooks") );
return "";
@@ -388,5 +388,5 @@
if ( indexGroup == wxNOT_FOUND )
{
- FAIL_MSG( "unknown group" );
+ FAIL_MSG( _T("unknown group") );
return "";
@@ -407,5 +407,5 @@
wxArrayString *emails) const
{
- CHECK( nicks, 0, "must pass a valid pointer to nicknames array" );
+ CHECK( nicks, 0, _T("must pass a valid pointer to nicknames array") );
if ( !addresses || addresses[0u] != '(' || addresses.Last() != ')' )
@@ -582,5 +582,5 @@
// a top level entry
CHECK( index < m_entriesLineNumbers.GetCount(), FALSE,
- "invalid entry index" );
+ _T("invalid entry index") );
size_t nLine = m_entriesLineNumbers[index];
@@ -607,5 +607,5 @@
size_t count = SplitMailingListAddresses(addresses, &nicks, &emails);
- CHECK( index < count, FALSE, "invalid entry index" );
+ CHECK( index < count, FALSE, _T("invalid entry index") );
#ifdef DEBUG
@@ -621,5 +621,5 @@
entry->GetField(AdbField_NickName, &nickReal);
- ASSERT_MSG( nickname == nickReal, "wrong index or wrong entry" );
+ ASSERT_MSG( nickname == nickReal, _T("wrong index or wrong entry") );
#endif // DEBUG
Index: ImportText.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportText.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- ImportText.cpp 11 Jul 2001 14:15:18 -0000 1.6
+++ ImportText.cpp 8 Sep 2002 19:23:08 -0000 1.7
@@ -266,10 +266,10 @@
// the text file is flat, there are nothing in subgroups
- FAIL_MSG("how did we get here in the first place?");
+ FAIL_MSG(_T("how did we get here in the first place?"));
return 0;
}
- CHECK( m_textfile.IsOpened(), 0, "forgot to call StartImport?" );
+ CHECK( m_textfile.IsOpened(), 0, _T("forgot to call StartImport?") );
entries.Empty();
Index: ImportVCard.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportVCard.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- ImportVCard.cpp 4 Jan 2001 20:01:33 -0000 1.4
+++ ImportVCard.cpp 8 Sep 2002 19:23:08 -0000 1.5
@@ -127,5 +127,5 @@
wxArrayString& entries) const
{
- wxCHECK_MSG( !path, 0, "path can be only empty in AdbVCardImporter" );
+ wxCHECK_MSG( !path, 0, _T("path can be only empty in AdbVCardImporter") );
// we suppose that vCard contains info for just one person
@@ -187,5 +187,5 @@
{
wxCHECK_MSG( !path && (index < m_cards.GetCount()), false,
- "unexpected params in AdbVCardImporter" );
+ _T("unexpected params in AdbVCardImporter") );
// set all simple fields
Index: ImportXFMail.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportXFMail.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- ImportXFMail.cpp 21 Apr 2000 18:33:51 -0000 1.6
+++ ImportXFMail.cpp 8 Sep 2002 19:23:08 -0000 1.7
@@ -139,5 +139,5 @@
wxArrayString& entries) const
{
- ASSERT_MSG( !path, "where did this path come from?" );
+ ASSERT_MSG( !path, _T("where did this path come from?") );
entries.Empty();
@@ -205,5 +205,5 @@
wxArrayString& groups) const
{
- ASSERT_MSG( !path, "where did this path come from?" );
+ ASSERT_MSG( !path, _T("where did this path come from?") );
// no groups
@@ -215,5 +215,5 @@
AdbEntry *entry)
{
- CHECK( index < m_lineNumbers.GetCount(), FALSE, "invalid entry index" );
+ CHECK( index < m_lineNumbers.GetCount(), FALSE, _T("invalid entry index") );
wxString line = m_textfile.GetLine((size_t)m_lineNumbers[index]);
Index: ProvBbdb.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvBbdb.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -b -u -2 -r1.26 -r1.27
--- ProvBbdb.cpp 11 Mar 2002 19:40:51 -0000 1.26
+++ ProvBbdb.cpp 8 Sep 2002 19:23:08 -0000 1.27
@@ -945,5 +945,5 @@
{
MOcheck();
- wxFAIL_MSG("Not implemented");
+ wxFAIL_MSG(_T("Not implemented"));
}
Index: ProvDummy.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvDummy.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -b -u -2 -r1.19 -r1.20
--- ProvDummy.cpp 14 Apr 2002 09:03:57 -0000 1.19
+++ ProvDummy.cpp 8 Sep 2002 19:23:08 -0000 1.20
@@ -329,10 +329,10 @@
void DummyEntryGroup::DeleteEntry(const String& strName)
{
- wxFAIL_MSG("Not implemented");
+ wxFAIL_MSG(_T("Not implemented"));
}
void DummyEntryGroup::DeleteGroup(const String& strName)
{
- wxFAIL_MSG("Not implemented");
+ wxFAIL_MSG(_T("Not implemented"));
}
Index: ProvFC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvFC.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -b -u -2 -r1.35 -r1.36
--- ProvFC.cpp 27 Jun 2002 09:46:18 -0000 1.35
+++ ProvFC.cpp 8 Sep 2002 19:23:08 -0000 1.36
@@ -436,5 +436,5 @@
bool FCEntry::Save()
{
- wxCHECK_MSG( m_bDirty, TRUE, "shouldn't save unmodified FCEntry" );
+ wxCHECK_MSG( m_bDirty, TRUE, _T("shouldn't save unmodified FCEntry") );
size_t nFieldMax = m_astrFields.Count();
@@ -628,5 +628,5 @@
AdbEntry *FCEntryGroup::CreateEntry(const String& name)
{
- CHECK( !!name, NULL, "can't create entries with empty names" );
+ CHECK( !!name, NULL, _T("can't create entries with empty names") );
FCEntry *pEntry = new FCEntry((FCEntryGroup *)this, name, TRUE /* new */);
@@ -673,5 +673,5 @@
String FCBook::GetFullAdbPath(const String& filename)
{
- CHECK( !filename.empty(), "", "ADB without name?" );
+ CHECK( !filename.empty(), "", _T("ADB without name?") );
String path;
@@ -840,5 +840,5 @@
default:
- FAIL_MSG("invalid test in TestBookAccess");
+ FAIL_MSG(_T("invalid test in TestBookAccess"));
}
Index: ProvPalm.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvPalm.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -b -u -2 -r1.17 -r1.18
--- ProvPalm.cpp 15 Feb 2002 21:29:11 -0000 1.17
+++ ProvPalm.cpp 8 Sep 2002 19:23:08 -0000 1.18
@@ -223,6 +223,6 @@
void PalmEntryGroup::AddEntry(PalmEntry* p_Entry)
{
- ASSERT_MSG (!!m_entries, "AddEntry: non-initialized m_entries" );
- ASSERT_MSG (!!p_Entry, "AddEntry: non-initialized p_Entry" );
+ ASSERT_MSG (!!m_entries, _T("AddEntry: non-initialized m_entries") );
+ ASSERT_MSG (!!p_Entry, _T("AddEntry: non-initialized p_Entry") );
m_entries->push_back(p_Entry);
}
@@ -230,5 +230,5 @@
AdbEntry *PalmEntryGroup::CreateEntry(const String& name)
{
- CHECK( !!name, NULL, "can't create entries with empty names" );
+ CHECK( !!name, NULL, _T("can't create entries with empty names") );
PalmEntry *pEntry = new PalmEntry((PalmEntryGroup *)this, name, TRUE /* new */);
@@ -381,5 +381,5 @@
return FALSE;
default:
- FAIL_MSG("invalid test in TestBookAccess");
+ FAIL_MSG(_T("invalid test in TestBookAccess"));
return FALSE;
}
Index: ProvPasswd.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvPasswd.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- ProvPasswd.cpp 14 Apr 2002 11:51:33 -0000 1.6
+++ ProvPasswd.cpp 8 Sep 2002 19:23:08 -0000 1.7
@@ -263,5 +263,5 @@
void PasswdEntry::GetEMail(size_t n, String *pstr) const
{
- CHECK_RET( !n, "we have only one email" );
+ CHECK_RET( !n, _T("we have only one email") );
AddressList_obj addrList(m_username, READ_APPCONFIG(MP_HOSTNAME));
@@ -451,5 +451,5 @@
AdbBook *PasswdDataProvider::CreateBook(const String& name)
{
- ASSERT_MSG( name.empty(), "book name is ignored by PasswdDataProvider" );
+ ASSERT_MSG( name.empty(), _T("book name is ignored by PasswdDataProvider") );
return new PasswdBook();
@@ -467,5 +467,5 @@
{
default:
- FAIL_MSG( "unknown access method" );
+ FAIL_MSG( _T("unknown access method") );
// 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
