mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shell (Windows): std::auto_ptr -> std::unique_ptr

Browse Source 
Change-Id: I44c843c028c2dfcfcea9f6a2196440ca700fc3a8
This commit is contained in:
Stephan Bergmann
2014-10-02 15:20:54 +02:00
parent fb515368bd
commit 36d24bced0
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shell/inc/internal/zipfile.hxx
View File

@@ -40,7 +40,7 @@ class ZipFile
public: public:
typedef std::vector<std::string> Directory_t; typedef std::vector<std::string> Directory_t;
typedef std::auto_ptr<Directory_t> DirectoryPtr_t; typedef std::unique_ptr<Directory_t> DirectoryPtr_t;
typedef std::vector<char> ZipContentBuffer_t; typedef std::vector<char> ZipContentBuffer_t;
public: public:

2
shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
View File

@@ -55,7 +55,7 @@ typedef std::vector<statistic_group_t> statistic_group_list_t;
class document_statistic_reader; class document_statistic_reader;
typedef std::auto_ptr<document_statistic_reader> document_statistic_reader_ptr; typedef std::unique_ptr<document_statistic_reader> document_statistic_reader_ptr;
document_statistic_reader_ptr create_document_statistic_reader(const std::string& document_name, CMetaInfoReader* meta_info_accessor); document_statistic_reader_ptr create_document_statistic_reader(const std::string& document_name, CMetaInfoReader* meta_info_accessor);

2
shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
View File

@@ -35,7 +35,7 @@
class list_view_builder; class list_view_builder;
typedef std::auto_ptr<list_view_builder> list_view_builder_ptr; typedef std::unique_ptr<list_view_builder> list_view_builder_ptr;
// factory method for list_view_builder // factory method for list_view_builder
list_view_builder_ptr create_list_view_builder( list_view_builder_ptr create_list_view_builder(

2
shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
View File

@@ -357,7 +357,7 @@ HRESULT STDMETHODCALLTYPE CThumbviewer::Extract(HBITMAP *phBmpImage)
try try
{ {
std::wstring fname = getShortPathName( filename_ ); std::wstring fname = getShortPathName( filename_ );
std::auto_ptr<ZipFile> zipfile( new ZipFile( WStringToString( fname ) ) ); std::unique_ptr<ZipFile> zipfile( new ZipFile( WStringToString( fname ) ) );
if (zipfile->HasContent(THUMBNAIL_CONTENT)) if (zipfile->HasContent(THUMBNAIL_CONTENT))
{ {