Update of /cvsroot/mahogany/M/src/adb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31255/src/adb
Modified Files:
AdbDialogs.cpp AdbExport.cpp AdbFrame.cpp AdbImport.cpp
ExportPalm.cpp ExportText.cpp ExportVCard.cpp ImportPine.cpp
ImportText.cpp ImportVCard.cpp ProvBbdb.cpp ProvFC.cpp
ProvLine.cpp ProvPasswd.cpp
Log Message:
_T("") -> wxEmptyString
Index: AdbDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbDialogs.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -b -u -2 -r1.30 -r1.31
--- AdbDialogs.cpp 10 Jan 2004 18:49:23 -0000 1.30
+++ AdbDialogs.cpp 16 Jan 2006 20:32:26 -0000 1.31
@@ -211,5 +211,5 @@
// buttons
- (void)CreateStdButtonsAndBox(_T(""), TRUE /* no box please */);
+ (void)CreateStdButtonsAndBox(wxEmptyString, TRUE /* no box please */);
m_btnOk = (wxButton *)FindWindow(wxID_OK);
@@ -318,5 +318,5 @@
// final steps
- String file = wxConfigBase::Get()->Read(GetFileProfilePath(), _T(""));
+ String file = wxConfigBase::Get()->Read(GetFileProfilePath(),
wxEmptyString);
if ( !file.empty() )
{
@@ -633,5 +633,5 @@
// do import
- bool ok = AdbImport(filename, adbname, _T(""), importer);
+ bool ok = AdbImport(filename, adbname, wxEmptyString, importer);
// release it only if we created it
Index: AdbExport.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbExport.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- AdbExport.cpp 16 Oct 2003 10:29:23 -0000 1.6
+++ AdbExport.cpp 16 Jan 2006 20:32:26 -0000 1.7
@@ -44,4 +44,4 @@
{
// simple...
- return exporter.Export(group, _T(""));
+ return exporter.Export(group, wxEmptyString);
}
Index: AdbFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbFrame.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -b -u -2 -r1.120 -r1.121
--- AdbFrame.cpp 24 Nov 2005 13:30:53 -0000 1.120
+++ AdbFrame.cpp 16 Jan 2006 20:32:26 -0000 1.121
@@ -301,5 +301,5 @@
bool onClipboard = FALSE);
// a special ctor used by derived classes
- AdbTreeNode() : AdbTreeElement(TreeElement_Invalid, _T(""), 0)
+ AdbTreeNode() : AdbTreeElement(TreeElement_Invalid, wxEmptyString, 0)
{ m_bWasExpanded = FALSE; m_pGroup = NULL; }
@@ -1454,5 +1454,5 @@
if ( provPasswd )
{
- m_astrAdb.Add(_T("")); // no name for this provider
+ m_astrAdb.Add(wxEmptyString); // no name for this provider
m_astrProviders.Add(provPasswd->GetProviderName());
@@ -1875,5 +1875,5 @@
// remove the string which might have been left since the last time we
// were called
- SetStatusText(_T(""));
+ SetStatusText(wxEmptyString);
}
@@ -2455,9 +2455,9 @@
}
else {
- SetStatusText(_T(""), 0);
+ SetStatusText(wxEmptyString, 0);
}
// clear the text set previously
- SetStatusText(_T(""), 1);
+ SetStatusText(wxEmptyString, 1);
}
else {
@@ -2801,5 +2801,5 @@
// static box around everything except buttons
- (void)new wxStaticBox(this, -1, _T(""), wxPoint(LAYOUT_X_MARGIN, 0),
+ (void)new wxStaticBox(this, -1, wxEmptyString, wxPoint(LAYOUT_X_MARGIN, 0),
wxSize(widthDlg - 2*LAYOUT_X_MARGIN,
heightDlg - 2*LAYOUT_Y_MARGIN - heightBtn));
@@ -2808,5 +2808,5 @@
(void)new wxStaticText(this, -1, label, wxPoint(x, y + dy),
wxSize(widthLabel, heightLabel));
- m_textWhat = new wxTextCtrl(this, -1, _T(""),
+ m_textWhat = new wxTextCtrl(this, -1, wxEmptyString,
wxPoint(x + widthLabel + LAYOUT_X_MARGIN, y),
wxSize(widthText, heightText));
@@ -2954,5 +2954,5 @@
// a box around all entries
- (void)new wxStaticBox(this, -1, _T(""),
+ (void)new wxStaticBox(this, -1, wxEmptyString,
wxPoint(LAYOUT_X_MARGIN, 0),
wxSize(widthDlg - 2*LAYOUT_X_MARGIN,
@@ -2962,5 +2962,5 @@
(void)new wxStaticText(this, -1, label, wxPoint(x, y + dy),
wxSize(widthLabel, heightLabel));
- m_textName = new wxTextCtrl(this, -1, _T(""),
+ m_textName = new wxTextCtrl(this, -1, wxEmptyString,
wxPoint(x + widthLabel + LAYOUT_X_MARGIN, y),
wxSize(widthText, heightText));
@@ -3017,5 +3017,5 @@
// ----------------------------------------------------------------------------
wxADBPropertiesDialog::wxADBPropertiesDialog(wxWindow *parent, AdbTreeBook
*book)
- : wxDialog(parent, -1, _T(""),
+ : wxDialog(parent, -1, wxEmptyString,
wxDefaultPosition,
wxDefaultSize,
@@ -3063,5 +3063,5 @@
// and a box around all entries
- (void)new wxStaticBox(this, -1, _T(""),
+ (void)new wxStaticBox(this, -1, wxEmptyString,
wxPoint(LAYOUT_X_MARGIN, 0 /*LAYOUT_Y_MARGIN*/),
wxSize(widthDlg - 2*LAYOUT_X_MARGIN,
@@ -3082,14 +3082,14 @@
x = 3*LAYOUT_X_MARGIN + widthLabelMax;
y = 2*LAYOUT_Y_MARGIN;
- m_textName = new wxTextCtrl(this, -1, _T(""), wxPoint(x, y), sizeText);
+ m_textName = new wxTextCtrl(this, -1, wxEmptyString, wxPoint(x, y),
sizeText);
y += heightText;
- m_textFileName = new wxTextCtrl(this, -1, _T(""),
+ m_textFileName = new wxTextCtrl(this, -1, wxEmptyString,
wxPoint(x, y + dy), sizeText, wxTE_READONLY);
y += heightText;
- m_staticFileSize = new wxStaticText(this, -1, _T(""), wxPoint(x, y + dy),
sizeLabel);
+ m_staticFileSize = new wxStaticText(this, -1, wxEmptyString, wxPoint(x, y +
dy), sizeLabel);
y += heightText;
- m_textDescription = new wxTextCtrl(this, -1, _T(""), wxPoint(x, y),
sizeText);
+ m_textDescription = new wxTextCtrl(this, -1, wxEmptyString, wxPoint(x, y),
sizeText);
y += heightText;
- m_staticNumEntries = new wxStaticText(this, -1, _T(""), wxPoint(x, y + dy),
sizeLabel);
+ m_staticNumEntries = new wxStaticText(this, -1, wxEmptyString, wxPoint(x, y
+ dy), sizeLabel);
// finally add buttons
@@ -3519,5 +3519,5 @@
c->right.SameAs(this, wxRight, LAYOUT_X_MARGIN);
c->height.AsIs();
- wxTextCtrl *pText = new wxTextCtrl(this, -1, _T(""));
+ wxTextCtrl *pText = new wxTextCtrl(this, -1, wxEmptyString);
pText->SetConstraints(c);
@@ -3529,5 +3529,5 @@
{
wxStaticText *pLabel = new wxStaticText(this, -1, label);
- wxTextCtrl *textComments = new wxTextCtrl(this, -1, _T(""),
+ wxTextCtrl *textComments = new wxTextCtrl(this, -1, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE);
Index: AdbImport.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbImport.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -b -u -2 -r1.22 -r1.23
--- AdbImport.cpp 19 Sep 2003 13:31:20 -0000 1.22
+++ AdbImport.cpp 16 Jan 2006 20:32:26 -0000 1.23
@@ -221,5 +221,5 @@
// start importing: recursively copy all entries from the foreign ADB
into
// the native one
- ok = AdbImportGroup(importer, group, _T(""));
+ ok = AdbImportGroup(importer, group, wxEmptyString);
}
Index: ExportPalm.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ExportPalm.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -b -u -2 -r1.16 -r1.17
--- ExportPalm.cpp 16 Oct 2003 10:29:23 -0000 1.16
+++ ExportPalm.cpp 16 Jan 2006 20:32:26 -0000 1.17
@@ -419,5 +419,5 @@
m_textFileName->SetValue(
mApplication->GetProfile()->readEntry(ms_profilePathLastFile,
- _T("")));
+ wxEmptyString));
m_textCategoryName->SetValue(
Index: ExportText.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ExportText.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -u -2 -r1.13 -r1.14
--- ExportText.cpp 16 Oct 2003 10:29:23 -0000 1.13
+++ ExportText.cpp 16 Jan 2006 20:32:26 -0000 1.14
@@ -343,5 +343,5 @@
// a text with a label for entering the custom delimiter
m_labelCustomSep = new wxStaticText(parent, -1, _("Field &separator:"));
- m_textCustomSep = new wxPTextEntry(_T("AdbTextExportSep"), parent, -1,
_T(""));
+ m_textCustomSep = new wxPTextEntry(_T("AdbTextExportSep"), parent, -1,
wxEmptyString);
c = new wxLayoutConstraints;
@@ -360,5 +360,5 @@
// a hack: create an invisible static to take some place
- wxStaticText *dummy = new wxStaticText(parent, -1, _T(""));
+ wxStaticText *dummy = new wxStaticText(parent, -1, wxEmptyString);
c = new wxLayoutConstraints;
c->top.Below(radiobox, 2*LAYOUT_Y_MARGIN);
Index: ExportVCard.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ExportVCard.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -u -2 -r1.5 -r1.6
--- ExportVCard.cpp 24 Nov 2005 13:30:53 -0000 1.5
+++ ExportVCard.cpp 16 Jan 2006 20:32:26 -0000 1.6
@@ -100,5 +100,5 @@
vcard.SetName(familyName,
firstName,
- _T(""), // no middle name in the ADB
+ wxEmptyString, // no middle name in the ADB
prefix);
}
Index: ImportPine.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportPine.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -u -2 -r1.12 -r1.13
--- ImportPine.cpp 16 Mar 2004 00:00:57 -0000 1.12
+++ ImportPine.cpp 16 Jan 2006 20:32:26 -0000 1.13
@@ -386,5 +386,5 @@
FAIL_MSG( _T("we may only have simple subgroups in PINE addressbooks") );
- return _T("");
+ return wxEmptyString;
}
@@ -394,5 +394,5 @@
FAIL_MSG( _T("unknown group") );
- return _T("");
+ return wxEmptyString;
}
@@ -401,5 +401,5 @@
if ( !ParsePineADBEntry(&indexLine, NULL, &addresses) )
{
- return _T("");
+ return wxEmptyString;
}
Index: ImportText.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportText.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -u -2 -r1.11 -r1.12
--- ImportText.cpp 12 Oct 2003 22:03:37 -0000 1.11
+++ ImportText.cpp 16 Jan 2006 20:32:26 -0000 1.12
@@ -54,5 +54,5 @@
// implement base class pure virtuals
- virtual String GetDefaultFilename() const { return _T(""); }
+ virtual String GetDefaultFilename() const { return wxEmptyString; }
virtual bool CanImport(const String& filename);
virtual bool StartImport(const String& filename);
Index: ImportVCard.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportVCard.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- ImportVCard.cpp 12 Oct 2003 22:03:37 -0000 1.9
+++ ImportVCard.cpp 16 Jan 2006 20:32:26 -0000 1.10
@@ -44,5 +44,5 @@
// implement base class pure virtuals
- virtual String GetDefaultFilename() const { return _T(""); }
+ virtual String GetDefaultFilename() const { return wxEmptyString; }
virtual bool CanImport(const String& filename);
virtual bool StartImport(const String& filename);
Index: ProvBbdb.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvBbdb.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -b -u -2 -r1.40 -r1.41
--- ProvBbdb.cpp 13 Jul 2004 23:28:55 -0000 1.40
+++ ProvBbdb.cpp 16 Jan 2006 20:32:26 -0000 1.41
@@ -379,10 +379,10 @@
else
ReadNil(line);
- return _T("");
+ return wxEmptyString;
}
}
strutil_delwhitespace(*line);
- String str = _T("");
+ String str = wxEmptyString;
const wxChar *cptr = line->c_str();
bool escaped = false;
@@ -581,5 +581,5 @@
{
ll = *i; // each phone number has a list of strings for itself
- str = _T("");
+ str = wxEmptyString;
j = ll->begin(); j++; // skip description
for(; j != ll->end(); j++)
@@ -615,10 +615,10 @@
ll = *i; // each address number has a list of strings for itself
- str = _T("");
+ str = wxEmptyString;
j = ll->begin(); j++; // skip description
for(count2 = 1; j != ll->end(); j++,count2++)
{
k = (**j).begin(); // the entries are lists with one string each
- str = _T("");
+ str = wxEmptyString;
for(;k != (**j).end(); k++)
str << **k << ' ';
@@ -810,5 +810,5 @@
out << "nil ";
String home;
- home = _T("");
+ home = wxEmptyString;
APPEND_FIELD(AdbField_H_POBox, home);
APPEND_FIELD(AdbField_H_Street, home);
Index: ProvFC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvFC.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -b -u -2 -r1.50 -r1.51
--- ProvFC.cpp 16 Mar 2004 01:19:46 -0000 1.50
+++ ProvFC.cpp 16 Jan 2006 20:32:26 -0000 1.51
@@ -530,5 +530,5 @@
if ( !path || path.Last() != '/' )
path += '/';
- if ( !m_pConfig->Write(path, wxString(_T(""))) ) {
+ if ( !m_pConfig->Write(path, wxEmptyString) ) {
// something went wrong, don't create this group, the next line ensures
// that IsOk() will return FALSE
@@ -673,5 +673,5 @@
String FCBook::GetFullAdbPath(const String& filename)
{
- CHECK( !filename.empty(), _T(""), _T("ADB without name?") );
+ CHECK( !filename.empty(), wxEmptyString, _T("ADB without name?") );
String path;
Index: ProvLine.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvLine.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -u -2 -r1.12 -r1.13
--- ProvLine.cpp 16 Mar 2004 00:00:57 -0000 1.12
+++ ProvLine.cpp 16 Jan 2006 20:32:26 -0000 1.13
@@ -233,5 +233,5 @@
String LineBook::GetFullAdbPath(const String& filename)
{
- CHECK( !filename.empty(), _T(""), _T("ADB without name?") );
+ CHECK( !filename.empty(), wxEmptyString, _T("ADB without name?") );
String path;
@@ -368,5 +368,5 @@
if ( IsDirty() )
{
- String commit = wxFileName::CreateTempFileName(_T(""));
+ String commit = wxFileName::CreateTempFileName(wxEmptyString);
ofstream stream(commit.fn_str());
Index: ProvPasswd.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvPasswd.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -b -u -2 -r1.18 -r1.19
--- ProvPasswd.cpp 24 Oct 2003 15:00:07 -0000 1.18
+++ ProvPasswd.cpp 16 Jan 2006 20:32:26 -0000 1.19
@@ -417,5 +417,5 @@
String PasswdBook::GetFileName() const
{
- return _T("");
+ return wxEmptyString;
}
-------------------------------------------------------
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
