[haiku-commits] r40420 - in haiku/trunk: headers/private/package/hpkg src/kits/package/hpkg
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 10 Feb 2011 18:16:36 +0100 (CET)
Author: zooey
Date: 2011-02-10 18:16:35 +0100 (Thu, 10 Feb 2011)
New Revision: 40420
Changeset: http://dev.haiku-os.org/changeset/40420
Modified:
haiku/trunk/headers/private/package/hpkg/PackageWriterImpl.h
haiku/trunk/headers/private/package/hpkg/RepositoryWriterImpl.h
haiku/trunk/src/kits/package/hpkg/PackageWriterImpl.cpp
haiku/trunk/src/kits/package/hpkg/RepositoryWriterImpl.cpp
Log:
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
Modified: haiku/trunk/headers/private/package/hpkg/PackageWriterImpl.h
===================================================================
--- haiku/trunk/headers/private/package/hpkg/PackageWriterImpl.h
2011-02-10 13:19:22 UTC (rev 40419)
+++ haiku/trunk/headers/private/package/hpkg/PackageWriterImpl.h
2011-02-10 17:16:35 UTC (rev 40420)
@@ -30,6 +30,8 @@
struct hpkg_header;
class PackageWriterImpl : public WriterImplBase {
+ typedef WriterImplBase inherited;
+
public:
PackageWriterImpl(
BPackageWriterListener* listener);
Modified: haiku/trunk/headers/private/package/hpkg/RepositoryWriterImpl.h
===================================================================
--- haiku/trunk/headers/private/package/hpkg/RepositoryWriterImpl.h
2011-02-10 13:19:22 UTC (rev 40419)
+++ haiku/trunk/headers/private/package/hpkg/RepositoryWriterImpl.h
2011-02-10 17:16:35 UTC (rev 40420)
@@ -32,6 +32,8 @@
class RepositoryWriterImpl
: public WriterImplBase, private BPackageContentHandler {
+ typedef WriterImplBase inherited;
+
public:
RepositoryWriterImpl(
BRepositoryWriterListener* listener,
Modified: haiku/trunk/src/kits/package/hpkg/PackageWriterImpl.cpp
===================================================================
--- haiku/trunk/src/kits/package/hpkg/PackageWriterImpl.cpp 2011-02-10
13:19:22 UTC (rev 40419)
+++ haiku/trunk/src/kits/package/hpkg/PackageWriterImpl.cpp 2011-02-10
17:16:35 UTC (rev 40420)
@@ -292,7 +292,7 @@
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 @@
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;
Modified: haiku/trunk/src/kits/package/hpkg/RepositoryWriterImpl.cpp
===================================================================
--- haiku/trunk/src/kits/package/hpkg/RepositoryWriterImpl.cpp 2011-02-10
13:19:22 UTC (rev 40419)
+++ haiku/trunk/src/kits/package/hpkg/RepositoryWriterImpl.cpp 2011-02-10
17:16:35 UTC (rev 40420)
@@ -38,7 +38,7 @@
RepositoryWriterImpl::RepositoryWriterImpl(BRepositoryWriterListener* listener,
const BRepositoryInfo* repositoryInfo)
:
- WriterImplBase(listener),
+ inherited(listener),
fListener(listener),
fRepositoryInfo(repositoryInfo),
fPackageCount(0),
@@ -136,10 +136,8 @@
break;
case B_PACKAGE_INFO_VENDOR:
- {
fPackageInfo.SetVendor(value.string);
break;
- }
case B_PACKAGE_INFO_PACKAGER:
fPackageInfo.SetPackager(value.string);
@@ -150,11 +148,9 @@
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 @@
status_t
RepositoryWriterImpl::_Init(const char* fileName)
{
- return WriterImplBase::Init(fileName, "repository");
+ return inherited::Init(fileName, "repository");
}
@@ -294,6 +290,8 @@
}
fPackageInfo.SetChecksum(checksum);
+
+
return packageReader.ParseContent(this);
}
Other related posts:
- » [haiku-commits] r40420 - in haiku/trunk: headers/private/package/hpkg src/kits/package/hpkg - zooey
