@@ -12,10 +12,11 @@ * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFObject.h" +#import "OFArchiveEntry.h" OF_ASSUME_NONNULL_BEGIN /** @file */ @@ -46,11 +47,12 @@ /** * @class OFTarArchiveEntry OFTarArchiveEntry.h ObjFW/OFTarArchiveEntry.h * * @brief A class which represents an entry of a tar archive. */ -@interface OFTarArchiveEntry: OFObject +@interface OFTarArchiveEntry: OFObject { OFString *_fileName; unsigned long _mode; unsigned long long _compressedSize, _uncompressedSize; unsigned long _UID, _GID; @@ -60,15 +62,10 @@ OFString *_Nullable _owner, *_Nullable _group; unsigned long _deviceMajor, _deviceMinor; OF_RESERVE_IVARS(OFTarArchiveEntry, 4) } -/** - * @brief The file name of the entry. - */ -@property (readonly, copy, nonatomic) OFString *fileName; - /** * @brief The mode of the entry. */ @property (readonly, nonatomic) unsigned long mode; @@ -80,20 +77,10 @@ /** * @brief The GID of the group. */ @property (readonly, nonatomic) unsigned long GID; -/** - * @brief The compressed size of the file. - */ -@property (readonly, nonatomic) unsigned long long compressedSize; - -/** - * @brief The uncompressed size of the file. - */ -@property (readonly, nonatomic) unsigned long long uncompressedSize; - /** * @brief The date of the last modification of the file. */ @property (readonly, retain, nonatomic) OFDate *modificationDate;