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

Use clear() instead of assignment to wxEmptyString

Browse Source
This commit is contained in:
Paul Cornett
2018-08-22 09:45:20 -07:00
parent f4bcb12709
commit 86ab6de0c1
7 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/html/helpctrl.cpp
View File

@@ -58,7 +58,7 @@ void wxHtmlHelpController::Init(int style)
m_helpDialog = NULL;
#if wxUSE_CONFIG
m_Config = NULL;
m_ConfigRoot = wxEmptyString;
m_ConfigRoot.clear();
#endif // wxUSE_CONFIG
m_titleFormat = _("Help: %s");
m_FrameStyle = style;

5
src/html/helpdata.cpp
View File

@@ -185,7 +185,8 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
}
else if (tag.GetName() == wxT("OBJECT"))
{
m_name = m_page = wxEmptyString;
m_name.clear();
m_page.clear();
ParseInner(tag);
#if 0
@@ -845,7 +846,7 @@ bool wxHtmlSearchStatus::Search()
return false;
}
m_Name = wxEmptyString;
m_Name.clear();
m_CurItem = NULL;
thepage = m_Data->m_contents[i].page;

5
src/html/helpwnd.cpp
View File

@@ -268,7 +268,7 @@ void wxHtmlHelpWindow::Init(wxHtmlHelpData* data)
#if wxUSE_CONFIG
m_Config = NULL;
m_ConfigRoot = wxEmptyString;
m_ConfigRoot.clear();
#endif // wxUSE_CONFIG
m_Cfg.x = m_Cfg.y = wxDefaultCoord;
@@ -278,7 +278,8 @@ void wxHtmlHelpWindow::Init(wxHtmlHelpData* data)
m_Cfg.navig_on = true;
m_NormalFonts = m_FixedFonts = NULL;
m_NormalFace = m_FixedFace = wxEmptyString;
m_NormalFace.clear();
m_FixedFace.clear();
#ifdef __WXMSW__
m_FontSize = 10;
#else

10
src/html/htmlwin.cpp
View File

@@ -310,7 +310,9 @@ void wxHtmlWindow::Init()
#endif // wxUSE_STATUSBAR
m_RelatedFrame = NULL;
m_TitleFormat = wxT("%s");
m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
m_OpenedPage.clear();
m_OpenedAnchor.clear();
m_OpenedPageTitle.clear();
m_Cell = NULL;
m_Parser = new wxHtmlWinParser(this);
m_Parser->SetFS(m_FS);
@@ -433,7 +435,9 @@ void wxHtmlWindow::SetStandardFonts(int size,
bool wxHtmlWindow::SetPage(const wxString& source)
{
m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
m_OpenedPage.clear();
m_OpenedAnchor.clear();
m_OpenedPageTitle.clear();
return DoSetPage(source);
}
@@ -853,7 +857,7 @@ bool wxHtmlWindow::HistoryForward()
if (m_HistoryPos == -1) return false;
if (m_HistoryPos >= (int)m_History->GetCount() - 1)return false;
m_OpenedPage = wxEmptyString; // this will disable adding new entry into history in LoadPage()
m_OpenedPage.clear(); // this will disable adding new entry into history in LoadPage()
m_HistoryPos++;
l = (*m_History)[m_HistoryPos].GetPage();