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

Remove initializations of wxString with wxEmptyString

Browse Source 
An empty string is the default
This commit is contained in:
Paul Cornett
2017-05-28 23:53:44 -07:00
parent 7358202d29
commit 01909a20c8
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/html/htmlcell.h
View File

@@ -648,8 +648,8 @@ protected:
class WXDLLIMPEXP_HTML wxHtmlLinkInfo : public wxObject class WXDLLIMPEXP_HTML wxHtmlLinkInfo : public wxObject
{ {
public: public:
wxHtmlLinkInfo() : wxObject() wxHtmlLinkInfo()
{ m_Href = m_Target = wxEmptyString; m_Event = NULL; m_Cell = NULL; } { m_Event = NULL; m_Cell = NULL; }
wxHtmlLinkInfo(const wxString& href, const wxString& target = wxString()) wxHtmlLinkInfo(const wxString& href, const wxString& target = wxString())
: m_Href(href) : m_Href(href)
, m_Target(target) , m_Target(target)

2
src/html/chm.cpp
View File

@@ -516,7 +516,7 @@ size_t wxChmInputStream::OnSysRead(void *buffer, size_t bufsize)
wxFileOffset wxChmInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode) wxFileOffset wxChmInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
{ {
wxString mode_str = wxEmptyString; wxString mode_str;
if ( !m_contentStream || m_contentStream->Eof() ) if ( !m_contentStream || m_contentStream->Eof() )
{ {

2
src/html/helpwnd.cpp
View File

@@ -829,7 +829,7 @@ bool wxHtmlHelpWindow::KeywordSearch(const wxString& keyword,
int foundcnt = 0; int foundcnt = 0;
wxString foundstr; wxString foundstr;
wxString book = wxEmptyString; wxString book;
if (!m_Splitter->IsSplit()) if (!m_Splitter->IsSplit())
{ {

2
src/html/htmlwin.cpp
View File

@@ -589,7 +589,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
else else
{ {
wxList::compatibility_iterator node; wxList::compatibility_iterator node;
wxString src = wxEmptyString; wxString src;
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
if (m_RelatedStatusBarIndex != -1) if (m_RelatedStatusBarIndex != -1)

4
src/msw/webview_ie.cpp
View File

@@ -1248,7 +1248,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
{ {
wxString url = evt[1].GetString(); wxString url = evt[1].GetString();
// TODO: set target parameter if possible // TODO: set target parameter if possible
wxString target = wxEmptyString; wxString target;
wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATED, wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATED,
GetId(), url, target); GetId(), url, target);
event.SetEventObject(this); event.SetEventObject(this);
@@ -1299,7 +1299,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
//Reset the find values. //Reset the find values.
FindClear(); FindClear();
// TODO: set target parameter if possible // TODO: set target parameter if possible
wxString target = wxEmptyString; wxString target;
wxWebViewEvent event(wxEVT_WEBVIEW_LOADED, GetId(), wxWebViewEvent event(wxEVT_WEBVIEW_LOADED, GetId(),
url, target); url, target);
event.SetEventObject(this); event.SetEventObject(this);

4
src/ribbon/bar.cpp
View File

@@ -74,7 +74,7 @@ void wxRibbonBar::AddPage(wxRibbonPage *page)
// info.rect not set (intentional) // info.rect not set (intentional)
wxClientDC dcTemp(this); wxClientDC dcTemp(this);
wxString label = wxEmptyString; wxString label;
if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS) if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS)
label = page->GetLabel(); label = page->GetLabel();
wxBitmap icon = wxNullBitmap; wxBitmap icon = wxNullBitmap;
@@ -174,7 +174,7 @@ bool wxRibbonBar::Realize()
{ {
status = false; status = false;
} }
wxString label = wxEmptyString; wxString label;
if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS) if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS)
label = info.page->GetLabel(); label = info.page->GetLabel();
wxBitmap icon = wxNullBitmap; wxBitmap icon = wxNullBitmap;