From 99858d4628617cd64a8ca5a2c52ad7d1a380416f Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sat, 18 Feb 2017 11:11:21 -0800
Subject: [PATCH] Use wxString::empty() instead of comparison to wxEmptyString

---
 src/common/fs_arc.cpp      |  2 +-
 src/common/prntbase.cpp    |  2 +-
 src/common/tarstrm.cpp     | 20 ++++++++++----------
 src/gtk/webview_webkit.cpp |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/common/fs_arc.cpp b/src/common/fs_arc.cpp
index 94aac59b54..f9802bf6e0 100644
--- a/src/common/fs_arc.cpp
+++ b/src/common/fs_arc.cpp
@@ -478,7 +478,7 @@ wxString wxArchiveFSHandler::DoFind()
     wxString namestr, dir, filename;
     wxString match;
 
-    while (match == wxEmptyString)
+    while (match.empty())
     {
         m_FindEntry = m_Archive->GetNext(m_FindEntry);
 
diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 2ca6b4726d..eb2d92ecdb 100644
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -1632,7 +1632,7 @@ void wxPreviewControlBar::SetZoomControl(int zoom)
 
 int wxPreviewControlBar::GetZoomControl()
 {
-    if (m_zoomControl && (m_zoomControl->GetStringSelection() != wxEmptyString))
+    if (m_zoomControl && !m_zoomControl->GetStringSelection().empty())
     {
         long val;
         if (m_zoomControl->GetStringSelection().BeforeFirst(wxT('%')).ToLong(&val))
diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp
index d909e7fcb2..f56a0d530b 100644
--- a/src/common/tarstrm.cpp
+++ b/src/common/tarstrm.cpp
@@ -865,9 +865,9 @@ wxString wxTarInputStream::GetExtendedHeader(const wxString& key) const
 
 wxString wxTarInputStream::GetHeaderPath() const
 {
-    wxString path;
+    wxString path(GetExtendedHeader(wxS("path")));
 
-    if ((path = GetExtendedHeader(wxT("path"))) != wxEmptyString)
+    if (!path.empty())
         return path;
 
     path = wxString(m_hdr->Get(TAR_NAME), GetConv());
@@ -880,10 +880,10 @@ wxString wxTarInputStream::GetHeaderPath() const
 
 wxDateTime wxTarInputStream::GetHeaderDate(const wxString& key) const
 {
-    wxString value;
+    wxString value(GetExtendedHeader(key));
 
     // try extended header, stored as decimal seconds since the epoch
-    if ((value = GetExtendedHeader(key)) != wxEmptyString) {
+    if (!value.empty()) {
         wxLongLong ll;
         ll.Assign(wxAtof(value) * 1000.0);
         return ll;
@@ -897,9 +897,9 @@ wxDateTime wxTarInputStream::GetHeaderDate(const wxString& key) const
 
 wxTarNumber wxTarInputStream::GetHeaderNumber(int id) const
 {
-    wxString value;
+    wxString value(GetExtendedHeader(m_hdr->Name(id)));
 
-    if ((value = GetExtendedHeader(m_hdr->Name(id))) != wxEmptyString) {
+    if (!value.empty()) {
         wxTarNumber n = 0;
         wxString::const_iterator p = value.begin();
         while (p != value.end() && *p == ' ')
@@ -914,12 +914,12 @@ wxTarNumber wxTarInputStream::GetHeaderNumber(int id) const
 
 wxString wxTarInputStream::GetHeaderString(int id) const
 {
-    wxString value;
+    wxString value(GetExtendedHeader(m_hdr->Name(id)));
 
-    if ((value = GetExtendedHeader(m_hdr->Name(id))) != wxEmptyString)
-        return value;
+    if (value.empty())
+        value = wxString(m_hdr->Get(id), GetConv());
 
-    return wxString(m_hdr->Get(id), GetConv());
+    return value;
 }
 
 // An extended header consists of one or more records, each constructed:
diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp
index d371ec75ff..e36b324f5c 100644
--- a/src/gtk/webview_webkit.cpp
+++ b/src/gtk/webview_webkit.cpp
@@ -1005,7 +1005,7 @@ long wxWebViewWebKit::Find(const wxString& text, int flags)
     m_findText = text;
 
     //If the search string is empty then we clear any selection and highlight
-    if(text == "")
+    if (text.empty())
     {
         webkit_web_view_unmark_text_matches(m_web_view);
         webkit_web_view_set_highlight_text_matches(m_web_view, false);