Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some cleanup, no functional change

Browse Source 
* 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
This commit is contained in:
Oliver Tappe 2011-02-10 17:16:35 +00:00
parent 3db9c51d0f
commit 91ebce663d
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
headers/private/package/hpkg/PackageWriterImpl.h
View File

@ -30,6 +30,8 @@ namespace BPrivate {
struct hpkg_header; struct hpkg_header;
class PackageWriterImpl : public WriterImplBase { class PackageWriterImpl : public WriterImplBase {
typedef WriterImplBase inherited;
public: public:
PackageWriterImpl( PackageWriterImpl(
BPackageWriterListener* listener); BPackageWriterListener* listener);

2
headers/private/package/hpkg/RepositoryWriterImpl.h
View File

@ -32,6 +32,8 @@ struct hpkg_header;
class RepositoryWriterImpl class RepositoryWriterImpl
: public WriterImplBase, private BPackageContentHandler { : public WriterImplBase, private BPackageContentHandler {
typedef WriterImplBase inherited;
public: public:
RepositoryWriterImpl( RepositoryWriterImpl(
BRepositoryWriterListener* listener, BRepositoryWriterListener* listener,

4
src/kits/package/hpkg/PackageWriterImpl.cpp
View File

@ -292,7 +292,7 @@ PackageWriterImpl::_AddAttribute(const char* attributeName, Type value)
PackageWriterImpl::PackageWriterImpl(BPackageWriterListener* listener) PackageWriterImpl::PackageWriterImpl(BPackageWriterListener* listener)
: :
WriterImplBase(listener), inherited(listener),
fListener(listener), fListener(listener),
fDataBuffer(NULL), fDataBuffer(NULL),
fDataBufferSize(2 * B_HPKG_DEFAULT_DATA_CHUNK_SIZE_ZLIB), fDataBufferSize(2 * B_HPKG_DEFAULT_DATA_CHUNK_SIZE_ZLIB),
@ -397,7 +397,7 @@ PackageWriterImpl::Finish()
status_t status_t
PackageWriterImpl::_Init(const char* fileName) PackageWriterImpl::_Init(const char* fileName)
{ {
status_t result = WriterImplBase::Init(fileName, "package"); status_t result = inherited::Init(fileName, "package");
if (result != B_OK) if (result != B_OK)
return result; return result;

10
src/kits/package/hpkg/RepositoryWriterImpl.cpp
View File

@ -38,7 +38,7 @@ struct RepositoryWriterImpl::PackageNameSet : public std::set<BString> {
RepositoryWriterImpl::RepositoryWriterImpl(BRepositoryWriterListener* listener, RepositoryWriterImpl::RepositoryWriterImpl(BRepositoryWriterListener* listener,
const BRepositoryInfo* repositoryInfo) const BRepositoryInfo* repositoryInfo)
: :
WriterImplBase(listener), inherited(listener),
fListener(listener), fListener(listener),
fRepositoryInfo(repositoryInfo), fRepositoryInfo(repositoryInfo),
fPackageCount(0), fPackageCount(0),
@ -136,10 +136,8 @@ RepositoryWriterImpl::HandlePackageAttribute(
break; break;
case B_PACKAGE_INFO_VENDOR: case B_PACKAGE_INFO_VENDOR:
{
fPackageInfo.SetVendor(value.string); fPackageInfo.SetVendor(value.string);
break; break;
}
case B_PACKAGE_INFO_PACKAGER: case B_PACKAGE_INFO_PACKAGER:
fPackageInfo.SetPackager(value.string); fPackageInfo.SetPackager(value.string);
@ -150,11 +148,9 @@ RepositoryWriterImpl::HandlePackageAttribute(
break; break;
case B_PACKAGE_INFO_ARCHITECTURE: case B_PACKAGE_INFO_ARCHITECTURE:
{
fPackageInfo.SetArchitecture( fPackageInfo.SetArchitecture(
(BPackageArchitecture)value.unsignedInt); (BPackageArchitecture)value.unsignedInt);
break; break;
}
case B_PACKAGE_INFO_VERSION: case B_PACKAGE_INFO_VERSION:
fPackageInfo.SetVersion(value.version); fPackageInfo.SetVersion(value.version);
@ -222,7 +218,7 @@ RepositoryWriterImpl::HandleErrorOccurred()
status_t status_t
RepositoryWriterImpl::_Init(const char* fileName) 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); fPackageInfo.SetChecksum(checksum);
return packageReader.ParseContent(this); return packageReader.ParseContent(this);
} }