Update of /cvsroot/mahogany/M/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31255/src/util
Modified Files:
strutil.cpp upgrade.cpp
Log Message:
_T("") -> wxEmptyString
Index: strutil.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/util/strutil.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -b -u -2 -r1.139 -r1.140
--- strutil.cpp 22 Mar 2005 01:42:08 -0000 1.139
+++ strutil.cpp 16 Jan 2006 20:32:28 -0000 1.140
@@ -81,5 +81,5 @@
{
char ch;
- str = _T("");
+ str = wxEmptyString;
for(;;)
{
@@ -95,5 +95,5 @@
{
char ch;
- str = _T("");
+ str = wxEmptyString;
for(;;)
{
@@ -119,5 +119,5 @@
strutil_before(const String &str, const wxChar delim)
{
- String newstr = _T("");
+ String newstr = wxEmptyString;
const wxChar *cptr = str.c_str();
while(*cptr && *cptr != delim)
@@ -129,5 +129,5 @@
strutil_after(const String &str, const wxChar delim)
{
- String newstr = _T("");
+ String newstr = wxEmptyString;
const wxChar *cptr = str.c_str();
while(*cptr && *cptr != delim)
@@ -144,5 +144,5 @@
strutil_delwhitespace(String &str)
{
- String newstr = _T("");
+ String newstr = wxEmptyString;
const wxChar *cptr = str.c_str();
@@ -157,5 +157,5 @@
strutil_toupper(String &str)
{
- String s = _T("");
+ String s = wxEmptyString;
const wxChar *cptr = str.c_str();
while(*cptr)
@@ -167,5 +167,5 @@
strutil_tolower(String &str)
{
- String s = _T("");
+ String s = wxEmptyString;
const wxChar *cptr = str.c_str();
while(*cptr)
@@ -454,5 +454,5 @@
if(strutil_isempty(ipath))
- return _T("");
+ return wxEmptyString;
if(ipath[0u]=='~')
@@ -500,5 +500,5 @@
const wxChar *cptr = wxStrrchr(path.c_str(),separator);
if(cptr == NULL) // not found
- return _T("");
+ return wxEmptyString;
return path.Left(cptr - path.c_str());
@@ -516,5 +516,5 @@
const wxChar *cptr = wxStrrchr(path.c_str(),separator);
if(cptr == NULL) // not found
- return _T("");
+ return wxEmptyString;
return String(cptr+1);
@@ -536,5 +536,5 @@
if(! cptr)
- return _T("");
+ return wxEmptyString;
while(*cptr)
{
@@ -632,5 +632,5 @@
String ToHex(void)
{
- String to = _T("");
+ String to = wxEmptyString;
String tmp;
for(size_t i = 0; i < len; i++)
@@ -651,5 +651,5 @@
while(*cptr)
{
- tmp = _T("");
+ tmp = wxEmptyString;
tmp << *cptr << *(cptr+1);
cptr += 2;
@@ -816,5 +816,5 @@
}
- return _T("");
+ return wxEmptyString;
}
@@ -825,5 +825,5 @@
{
ERRORMESSAGE((_("Strong encryption algorithm not available.")));
- return _T("");
+ return wxEmptyString;
}
if ( !setup_twofish() )
@@ -840,5 +840,5 @@
return output.data;
}
- return _T("");
+ return wxEmptyString;
}
@@ -939,5 +939,5 @@
{
if(original.Length() == 0)
- return _T("");
+ return wxEmptyString;
if(! strutil_encrypt_initialised)
@@ -1009,5 +1009,5 @@
{
if(original.Length() == 0)
- return _T("");
+ return wxEmptyString;
if(! strutil_encrypt_initialised)
@@ -1022,5 +1022,5 @@
wxLogWarning(_("Decrypt function called with illegal string."));
- return _T("");
+ return wxEmptyString;
}
@@ -1035,10 +1035,10 @@
while(*cptr)
{
- tmpstr = _T("");
+ tmpstr = wxEmptyString;
tmpstr << *cptr << *(cptr+1);
cptr += 2;
wxSscanf(tmpstr.c_str(), _T("%02x"), &i);
pair[0] = (unsigned char) i;
- tmpstr = _T("");
+ tmpstr = wxEmptyString;
tmpstr << *cptr << *(cptr+1);
cptr += 2;
Index: upgrade.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/util/upgrade.cpp,v
retrieving revision 1.224
retrieving revision 1.225
diff -b -u -2 -r1.224 -r1.225
--- upgrade.cpp 9 Apr 2005 15:39:33 -0000 1.224
+++ upgrade.cpp 16 Jan 2006 20:32:28 -0000 1.225
@@ -1725,5 +1725,5 @@
gs_installWizardData.pop =
gs_installWizardData.imap =
- gs_installWizardData.nntp = _T("");
+ gs_installWizardData.nntp = wxEmptyString;
// don't try to send the test message if the SMTP server wasn't
@@ -2144,5 +2144,5 @@
rc = false;
- Profile_obj p(_T(""));
+ Profile_obj p(wxEmptyString);
kbStringList
folders;
@@ -2224,5 +2224,5 @@
Profile::ReadResult found;
- String hostname = profile->readEntry(MP_OLD_FOLDER_HOST, _T(""),
&found);
+ String hostname = profile->readEntry(MP_OLD_FOLDER_HOST,
wxEmptyString, &found);
if ( found == Profile::Read_FromHere )
{
@@ -2258,5 +2258,5 @@
// enumerate all folders recursively
- MFolder_obj folderRoot(_T(""));
+ MFolder_obj folderRoot(wxEmptyString);
UpgradeFolderFrom020Traversal traverse(folderRoot);
traverse.Traverse();
@@ -2306,5 +2306,5 @@
if ( profile->HasEntry(entry) )
{
- String templateValue = profile->readEntry(entry, _T(""));
+ String templateValue = profile->readEntry(entry, wxEmptyString);
String entryNew;
@@ -2362,5 +2362,5 @@
// enumerate all folders recursively
- MFolder_obj folderRoot(_T(""));
+ MFolder_obj folderRoot(wxEmptyString);
TemplateFixFolderTraversal traverse(folderRoot);
traverse.Traverse();
@@ -2477,5 +2477,5 @@
{
headerNames.Add(name);
- headerValues.Add(config->Read(name, _T("")));
+ headerValues.Add(config->Read(name, wxEmptyString));
}
@@ -2515,5 +2515,5 @@
{
names.Add(name);
- values.Add(config->Read(name, _T("")));
+ values.Add(config->Read(name, wxEmptyString));
}
@@ -2674,5 +2674,5 @@
{
// add MF_FLAGS_MONITOR to all folders with MF_FLAGS_INCOMING flag
- MFolder_obj folderRoot(_T(""));
+ MFolder_obj folderRoot(wxEmptyString);
UpgradeFolderFrom064Traversal traverse(folderRoot);
@@ -2790,5 +2790,5 @@
{
// replace SSL flags with SSL profile settings
- MFolder_obj folderRoot(_T(""));
+ MFolder_obj folderRoot(wxEmptyString);
UpgradeFolderFrom0641Traversal traverse(folderRoot);
@@ -3410,5 +3410,5 @@
int flags)
{
- return CreateFolderTreeEntry(NULL, name, type, flags, _T(""), false);
+ return CreateFolderTreeEntry(NULL, name, type, flags, wxEmptyString, false);
}
@@ -3701,5 +3701,5 @@
tmpfile.Close();
- wxFileConfig fc(_T(""), _T(""), filename, _T(""), wxCONFIG_USE_LOCAL_FILE);
+ wxFileConfig fc(wxEmptyString, wxEmptyString, filename, wxEmptyString,
wxCONFIG_USE_LOCAL_FILE);
bool rc = true;
@@ -3763,5 +3763,5 @@
MEventData *data = new MEventFolderTreeChangeData
(
- _T(""),
+ wxEmptyString,
MEventFolderTreeChangeData::CreateUnder
);
@@ -3867,5 +3867,5 @@
wxString filename = wxGetTempFileName(_T("MTemp"));
- wxFileConfig fc(_T(""), _T(""), filename, _T(""), wxCONFIG_USE_LOCAL_FILE);
+ wxFileConfig fc(wxEmptyString, wxEmptyString, filename, wxEmptyString,
wxCONFIG_USE_LOCAL_FILE);
bool rc = true;
@@ -3990,5 +3990,5 @@
// do we need to upgrade something?
- String version = profile->readEntry(MP_VERSION, _T(""));
+ String version = profile->readEntry(MP_VERSION, wxEmptyString);
if ( version != M_VERSION )
{
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
