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

Use wxString::empty() instead of comparison to wxEmptyString

Browse Source
This commit is contained in:
Paul Cornett
2017-05-29 00:05:52 -07:00
parent d16afbd3c1
commit c1f2bbce5d
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/html/htmlwin.cpp
View File

@@ -611,7 +611,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
}
node = node->GetNext();
}
if (src == wxEmptyString)
if (src.empty())
{
if (m_DefaultFilter == NULL) m_DefaultFilter = GetDefaultFilter();
src = m_DefaultFilter->ReadFile(*f);
@@ -620,7 +620,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
m_FS->ChangePathTo(f->GetLocation());
rt_val = SetPage(src);
m_OpenedPage = f->GetLocation();
if (f->GetAnchor() != wxEmptyString)
if (!f->GetAnchor().empty())
{
ScrollToAnchor(f->GetAnchor());
}
@@ -651,7 +651,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
}
}
if (m_OpenedPageTitle == wxEmptyString)
if (m_OpenedPageTitle.empty())
OnSetTitle(wxFileNameFromPath(m_OpenedPage));
if (needs_refresh)
@@ -832,7 +832,7 @@ void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path)
int p_fontsizes[7];
wxString p_fff, p_ffn;
if (path != wxEmptyString)
if (!path.empty())
{
oldpath = cfg->GetPath();
cfg->SetPath(path);
@@ -848,7 +848,7 @@ void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path)
}
SetFonts(p_ffn, p_fff, p_fontsizes);
if (path != wxEmptyString)
if (!path.empty())
cfg->SetPath(oldpath);
}
@@ -859,7 +859,7 @@ void wxHtmlWindow::WriteCustomization(wxConfigBase *cfg, wxString path)
wxString oldpath;
wxString tmp;
if (path != wxEmptyString)
if (!path.empty())
{
oldpath = cfg->GetPath();
cfg->SetPath(path);
@@ -874,7 +874,7 @@ void wxHtmlWindow::WriteCustomization(wxConfigBase *cfg, wxString path)
cfg->Write(tmp, (long) m_Parser->m_FontsSizes[i]);
}
if (path != wxEmptyString)
if (!path.empty())
cfg->SetPath(oldpath);
}
#endif // wxUSE_CONFIG
@@ -897,7 +897,7 @@ bool wxHtmlWindow::HistoryBack()
a = (*m_History)[m_HistoryPos].GetAnchor();
m_HistoryOn = false;
m_tmpCanDrawLocks++;
if (a == wxEmptyString) LoadPage(l);
if (a.empty()) LoadPage(l);
else LoadPage(l + wxT("#") + a);
m_HistoryOn = true;
m_tmpCanDrawLocks--;
@@ -927,7 +927,7 @@ bool wxHtmlWindow::HistoryForward()
a = (*m_History)[m_HistoryPos].GetAnchor();
m_HistoryOn = false;
m_tmpCanDrawLocks++;
if (a == wxEmptyString) LoadPage(l);
if (a.empty()) LoadPage(l);
else LoadPage(l + wxT("#") + a);
m_HistoryOn = true;
m_tmpCanDrawLocks--;