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

Rename wxTarEntryPtr_ to wxTarEntryPtr

Browse Source 
Remove the unusual underscore at the end of the type and use a single
wxDEFINE_SCOPED_PTR_TYPE() macro instead of 2 of them to simplify code.
This commit is contained in:
Vadim Zeitlin
2018-05-20 17:58:09 +02:00
parent d9d5e1d5f7
commit 58e6355695
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/tarstrm.cpp
View File

@@ -639,8 +639,7 @@ void wxTarEntry::SetMode(int mode)
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Input stream // Input stream
wxDECLARE_SCOPED_PTR(wxTarEntry, wxTarEntryPtr_) wxDEFINE_SCOPED_PTR_TYPE(wxTarEntry)
wxDEFINE_SCOPED_PTR (wxTarEntry, wxTarEntryPtr_)
wxTarInputStream::wxTarInputStream(wxInputStream& stream, wxTarInputStream::wxTarInputStream(wxInputStream& stream,
wxMBConv& conv /*=wxConvLocal*/) wxMBConv& conv /*=wxConvLocal*/)
@@ -683,7 +682,7 @@ wxTarEntry *wxTarInputStream::GetNextEntry()
if (!IsOk()) if (!IsOk())
return NULL; return NULL;
wxTarEntryPtr_ entry(new wxTarEntry); wxTarEntryPtr entry(new wxTarEntry);
entry->SetMode(GetHeaderNumber(TAR_MODE)); entry->SetMode(GetHeaderNumber(TAR_MODE));
entry->SetUserId(GetHeaderNumber(TAR_UID)); entry->SetUserId(GetHeaderNumber(TAR_UID));
@@ -1099,7 +1098,7 @@ wxTarOutputStream::~wxTarOutputStream()
bool wxTarOutputStream::PutNextEntry(wxTarEntry *entry) bool wxTarOutputStream::PutNextEntry(wxTarEntry *entry)
{ {
wxTarEntryPtr_ e(entry); wxTarEntryPtr e(entry);
if (!CloseEntry()) if (!CloseEntry())
return false; return false;