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

Use wxScopedPtr<> instead of wxSharedPtr<> in archive sample

Browse Source 
There is no need to use wxSharedPtr<> when ownership is not shared, use
simpler and overhead-free wxScopedPtr<> instead.
This commit is contained in:
Vadim Zeitlin
2018-03-30 22:38:03 +02:00
parent a0cc236678
commit b9c10f215d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/archive/archive.cpp
View File

@@ -18,7 +18,7 @@
#include "wx/app.h" #include "wx/app.h"
#include "wx/cmdline.h" #include "wx/cmdline.h"
#include "wx/filename.h" #include "wx/filename.h"
#include "wx/sharedptr.h" #include "wx/scopedptr.h"
#include "wx/vector.h" #include "wx/vector.h"
#include "wx/wfstream.h" #include "wx/wfstream.h"
#include "wx/zipstrm.h" #include "wx/zipstrm.h"
@@ -149,7 +149,7 @@ int ArchiveApp::DoCreate()
} }
wxTempFileOutputStream fileOutputStream(m_archiveFileName); wxTempFileOutputStream fileOutputStream(m_archiveFileName);
wxSharedPtr<wxArchiveOutputStream> archiveOutputStream(m_archiveClassFactory->NewStream(fileOutputStream)); wxScopedPtr<wxArchiveOutputStream> archiveOutputStream(m_archiveClassFactory->NewStream(fileOutputStream));
if (m_archiveClassFactory->GetProtocol().IsSameAs("zip", false) && m_forceZip64) if (m_archiveClassFactory->GetProtocol().IsSameAs("zip", false) && m_forceZip64)
reinterpret_cast<wxZipOutputStream*>(archiveOutputStream.get())->SetFormat(wxZIP_FORMAT_ZIP64); reinterpret_cast<wxZipOutputStream*>(archiveOutputStream.get())->SetFormat(wxZIP_FORMAT_ZIP64);
@@ -184,7 +184,7 @@ int ArchiveApp::DoList()
if (!fileInputStream.IsOk()) if (!fileInputStream.IsOk())
return 1; return 1;
wxSharedPtr<wxArchiveInputStream> archiveStream(m_archiveClassFactory->NewStream(fileInputStream)); wxScopedPtr<wxArchiveInputStream> archiveStream(m_archiveClassFactory->NewStream(fileInputStream));
wxPrintf("Archive: %s\n", m_archiveFileName); wxPrintf("Archive: %s\n", m_archiveFileName);
wxPrintf("Length Date Time Name\n"); wxPrintf("Length Date Time Name\n");
wxPrintf("---------- ---------- -------- ----\n"); wxPrintf("---------- ---------- -------- ----\n");
@@ -213,7 +213,7 @@ int ArchiveApp::DoExtract()
if (!fileInputStream.IsOk()) if (!fileInputStream.IsOk())
return 1; return 1;
wxSharedPtr<wxArchiveInputStream> archiveStream(m_archiveClassFactory->NewStream(fileInputStream)); wxScopedPtr<wxArchiveInputStream> archiveStream(m_archiveClassFactory->NewStream(fileInputStream));
wxPrintf("Extracting from: %s\n", m_archiveFileName); wxPrintf("Extracting from: %s\n", m_archiveFileName);
for (wxArchiveEntry* entry = archiveStream->GetNextEntry(); entry; for (wxArchiveEntry* entry = archiveStream->GetNextEntry(); entry;
entry = archiveStream->GetNextEntry()) entry = archiveStream->GetNextEntry())