From 91ebce663d5f11e5763851ad131e55d4c020421b Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 10 Feb 2011 17:16:35 +0000 Subject: [PATCH] Some cleanup, no functional change * typedef base classes as 'inherited' and use that instead of the explicit base class name * remove superfluous scopes in case blocks git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40420 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/package/hpkg/PackageWriterImpl.h | 2 ++ headers/private/package/hpkg/RepositoryWriterImpl.h | 2 ++ src/kits/package/hpkg/PackageWriterImpl.cpp | 4 ++-- src/kits/package/hpkg/RepositoryWriterImpl.cpp | 10 ++++------ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/headers/private/package/hpkg/PackageWriterImpl.h b/headers/private/package/hpkg/PackageWriterImpl.h index 525d87881f..5a3eaed0fe 100644 --- a/headers/private/package/hpkg/PackageWriterImpl.h +++ b/headers/private/package/hpkg/PackageWriterImpl.h @@ -30,6 +30,8 @@ namespace BPrivate { struct hpkg_header; class PackageWriterImpl : public WriterImplBase { + typedef WriterImplBase inherited; + public: PackageWriterImpl( BPackageWriterListener* listener); diff --git a/headers/private/package/hpkg/RepositoryWriterImpl.h b/headers/private/package/hpkg/RepositoryWriterImpl.h index 37c993469c..6255921221 100644 --- a/headers/private/package/hpkg/RepositoryWriterImpl.h +++ b/headers/private/package/hpkg/RepositoryWriterImpl.h @@ -32,6 +32,8 @@ struct hpkg_header; class RepositoryWriterImpl : public WriterImplBase, private BPackageContentHandler { + typedef WriterImplBase inherited; + public: RepositoryWriterImpl( BRepositoryWriterListener* listener, diff --git a/src/kits/package/hpkg/PackageWriterImpl.cpp b/src/kits/package/hpkg/PackageWriterImpl.cpp index c09d43c822..718d96a87d 100644 --- a/src/kits/package/hpkg/PackageWriterImpl.cpp +++ b/src/kits/package/hpkg/PackageWriterImpl.cpp @@ -292,7 +292,7 @@ PackageWriterImpl::_AddAttribute(const char* attributeName, Type value) PackageWriterImpl::PackageWriterImpl(BPackageWriterListener* listener) : - WriterImplBase(listener), + inherited(listener), fListener(listener), fDataBuffer(NULL), fDataBufferSize(2 * B_HPKG_DEFAULT_DATA_CHUNK_SIZE_ZLIB), @@ -397,7 +397,7 @@ PackageWriterImpl::Finish() status_t PackageWriterImpl::_Init(const char* fileName) { - status_t result = WriterImplBase::Init(fileName, "package"); + status_t result = inherited::Init(fileName, "package"); if (result != B_OK) return result; diff --git a/src/kits/package/hpkg/RepositoryWriterImpl.cpp b/src/kits/package/hpkg/RepositoryWriterImpl.cpp index 846e95ba3f..b904f8f99c 100644 --- a/src/kits/package/hpkg/RepositoryWriterImpl.cpp +++ b/src/kits/package/hpkg/RepositoryWriterImpl.cpp @@ -38,7 +38,7 @@ struct RepositoryWriterImpl::PackageNameSet : public std::set { RepositoryWriterImpl::RepositoryWriterImpl(BRepositoryWriterListener* listener, const BRepositoryInfo* repositoryInfo) : - WriterImplBase(listener), + inherited(listener), fListener(listener), fRepositoryInfo(repositoryInfo), fPackageCount(0), @@ -136,10 +136,8 @@ RepositoryWriterImpl::HandlePackageAttribute( break; case B_PACKAGE_INFO_VENDOR: - { fPackageInfo.SetVendor(value.string); break; - } case B_PACKAGE_INFO_PACKAGER: fPackageInfo.SetPackager(value.string); @@ -150,11 +148,9 @@ RepositoryWriterImpl::HandlePackageAttribute( break; case B_PACKAGE_INFO_ARCHITECTURE: - { fPackageInfo.SetArchitecture( (BPackageArchitecture)value.unsignedInt); break; - } case B_PACKAGE_INFO_VERSION: fPackageInfo.SetVersion(value.version); @@ -222,7 +218,7 @@ RepositoryWriterImpl::HandleErrorOccurred() status_t RepositoryWriterImpl::_Init(const char* fileName) { - return WriterImplBase::Init(fileName, "repository"); + return inherited::Init(fileName, "repository"); } @@ -294,6 +290,8 @@ RepositoryWriterImpl::_AddPackage(const BEntry& packageEntry) } fPackageInfo.SetChecksum(checksum); + + return packageReader.ParseContent(this); }