Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.empty() string cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-02-01 19:37:36 +00:00
parent bcf576ccfe
commit b494c48b31
14 changed files with 84 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/filefn.cpp
View File

@@ -309,7 +309,7 @@ wxFileExists (const wxString& filename)
bool
wxIsAbsolutePath (const wxString& filename)
{
if (filename != wxT(""))
if (!filename.empty())
{
#if defined(__WXMAC__) && !defined(__DARWIN__)
// Classic or Carbon CodeWarrior like
@@ -432,7 +432,7 @@ wxChar *wxRealPath (wxChar *path)
// Must be destroyed
wxChar *wxCopyAbsolutePath(const wxString& filename)
{
if (filename == wxT(""))
if (filename.empty())
return (wxChar *) NULL;
if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) {
@@ -588,7 +588,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
if (nm[1] == SEP || nm[1] == 0)
{ /* ~/filename */
// FIXME: wxGetUserHome could return temporary storage in Unicode mode
if ((s = WXSTRINGCAST wxGetUserHome(wxT(""))) != NULL) {
if ((s = WXSTRINGCAST wxGetUserHome(wxEmptyString)) != NULL) {
if (*++nm)
nm++;
}
@@ -647,7 +647,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
{
static wxChar dest[_MAXPATHLEN];
if (filename == wxT(""))
if (filename.empty())
return (wxChar *) NULL;
wxStrcpy (dest, WXSTRINGCAST filename);
@@ -683,7 +683,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
if (wxStrncmp(dest, val, len) == 0)
{
wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
if (user != wxT(""))
if (!user.empty())
wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user);
wxStrcat(wxFileFunctionsBuffer, dest + len);
wxStrcpy (dest, wxFileFunctionsBuffer);
@@ -775,7 +775,7 @@ wxPathOnly (wxChar *path)
// Return just the directory, or NULL if no directory
wxString wxPathOnly (const wxString& path)
{
if (path != wxT(""))
if (!path.empty())
{
wxChar buf[_MAXPATHLEN];
@@ -828,7 +828,7 @@ wxString wxPathOnly (const wxString& path)
}
#endif
}
return wxString(wxT(""));
return wxEmptyString;
}
// Utility for converting delimiters in DOS filenames to UNIX style