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

No real changes, just use wxString::clear() instead of assignment.

Browse Source 
Consistently use clear() everywhere instead of assigning wxEmptyString in some
places and wxT("") in some others to a string in order to clear it.

See #15091.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-03-09 15:08:40 +00:00
parent 6aa4e3989f
commit 3cca1b3d8b
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/filename.h
View File

@@ -498,8 +498,8 @@ public:
// Other accessors // Other accessors
void SetExt( const wxString &ext ) { m_ext = ext; m_hasExt = !m_ext.empty(); } void SetExt( const wxString &ext ) { m_ext = ext; m_hasExt = !m_ext.empty(); }
void ClearExt() { m_ext = wxEmptyString; m_hasExt = false; } void ClearExt() { m_ext.clear(); m_hasExt = false; }
void SetEmptyExt() { m_ext = wxT(""); m_hasExt = true; } void SetEmptyExt() { m_ext.clear(); m_hasExt = true; }
wxString GetExt() const { return m_ext; } wxString GetExt() const { return m_ext; }
bool HasExt() const { return m_hasExt; } bool HasExt() const { return m_hasExt; }

13
src/common/filename.cpp
View File

@@ -608,11 +608,10 @@ void wxFileName::AssignDir(const wxString& dir, wxPathFormat format)
void wxFileName::Clear() void wxFileName::Clear()
{ {
m_dirs.Clear(); m_dirs.clear();
m_volume.clear();
m_volume = m_name.clear();
m_name = m_ext.clear();
m_ext = wxEmptyString;
// we don't have any absolute path for now // we don't have any absolute path for now
m_relative = true; m_relative = true;
@@ -1912,7 +1911,7 @@ wxString wxFileName::GetForbiddenChars(wxPathFormat format)
case wxPATH_MAC: case wxPATH_MAC:
// On a Mac even names with * and ? are allowed (Tested with OS // On a Mac even names with * and ? are allowed (Tested with OS
// 9.2.1 and OS X 10.2.5) // 9.2.1 and OS X 10.2.5)
strForbiddenChars = wxEmptyString; strForbiddenChars.clear();
break; break;
case wxPATH_DOS: case wxPATH_DOS:
@@ -2294,7 +2293,7 @@ wxString wxFileName::GetLongPath() const
GetVolumeSeparator(wxPATH_DOS) + GetVolumeSeparator(wxPATH_DOS) +
GetPathSeparator(wxPATH_DOS); GetPathSeparator(wxPATH_DOS);
else else
pathOut = wxEmptyString; pathOut.clear();
wxArrayString dirs = GetDirs(); wxArrayString dirs = GetDirs();
dirs.Add(GetFullName()); dirs.Add(GetFullName());