From: Andrzej Popowski Date: Fri, 16 Oct 2015 12:03:57 +0000 (+0200) Subject: [Archive] - Disabled copy constructor and assigment operator and removed not needed... X-Git-Tag: submit/tizen/20151026.073646^2^2~16^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d34f3ad2d8dc43bf437b2ef1eb60ac604add7d92;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [Archive] - Disabled copy constructor and assigment operator and removed not needed null assigment into tizen_2.4 Change-Id: I76e92d6d59acb1d7ce39c3cb5fc47e0322914101 Signed-off-by: Andrzej Popowski --- diff --git a/src/archive/archive_file.cc b/src/archive/archive_file.cc index 68e772d0..990d6c58 100755 --- a/src/archive/archive_file.cc +++ b/src/archive/archive_file.cc @@ -312,7 +312,6 @@ PlatformResult ArchiveFile::extractAllTask(ExtractAllProgressCallback* callback) if(m_created_as_new_empty_archive) { //We do not call progress callback since we do not have any ArchiveFileEntry callback->callSuccessCallbackOnMainThread(); - callback = NULL; return PlatformResult(ErrorCode::NO_ERROR); } else { diff --git a/src/archive/un_zip.cc b/src/archive/un_zip.cc index b961e0e9..579958ed 100755 --- a/src/archive/un_zip.cc +++ b/src/archive/un_zip.cc @@ -222,7 +222,6 @@ PlatformResult UnZip::extractAllFilesTo(const std::string& extract_path, } callback->callSuccessCallbackOnMainThread(); - callback = NULL; return PlatformResult(ErrorCode::NO_ERROR); } @@ -307,7 +306,6 @@ PlatformResult UnZip::extractTo(ExtractEntryProgressCallback* callback) // after finish extracting success callback will be called callback->callSuccessCallbackOnMainThread(); - callback = NULL; return PlatformResult(ErrorCode::NO_ERROR); } diff --git a/src/archive/un_zip_extract_request.h b/src/archive/un_zip_extract_request.h index ee7fabb7..04d7391d 100755 --- a/src/archive/un_zip_extract_request.h +++ b/src/archive/un_zip_extract_request.h @@ -45,6 +45,11 @@ private: const std::string& extract_path, const std::string& base_strip_path, BaseProgressCallback* callback); + + //Not copyable, assignable + UnZipExtractRequest(UnZipExtractRequest const&) = delete; + UnZipExtractRequest& operator=(UnZipExtractRequest const&) = delete; + PlatformResult run(); PlatformResult getCurrentFileInfo(); PlatformResult handleDirectoryEntry(); diff --git a/src/archive/zip_add_request.h b/src/archive/zip_add_request.h index ec9d0871..49459d87 100755 --- a/src/archive/zip_add_request.h +++ b/src/archive/zip_add_request.h @@ -42,6 +42,9 @@ public: private: ZipAddRequest(Zip& owner, AddProgressCallback*& callback); + ZipAddRequest(ZipAddRequest const&) = delete; + ZipAddRequest& operator=(ZipAddRequest const&) = delete; + PlatformResult run(); void addNodeAndSubdirsToList(filesystem::NodePtr src_node,