From e217a3a425ba72e8b6ce395e1ecd411fbe58e916 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Tue, 26 Feb 2019 11:59:38 +0100
Subject: pkgSrcRecords::Parser: Fold Files2() into Files()

This is possible now with the API break. Cleaner code, woohoo.
---
 apt-pkg/srcrecords.h | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'apt-pkg/srcrecords.h')

diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index 8c52f5683..77d648fa8 100644
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -29,21 +29,14 @@ class pkgSrcRecords
 {
    public:
 
-APT_IGNORE_DEPRECATED_PUSH
    // Describes a single file
    struct File
    {
-      APT_DEPRECATED_MSG("Use Hashes member instead of hardcoded hash algorithm") std::string MD5Hash;
-      APT_DEPRECATED_MSG("Use FileSize member instead") unsigned long Size;
       std::string Path;
       std::string Type;
-   };
-   struct File2 : public File
-   {
       unsigned long long FileSize;
       HashStringList Hashes;
    };
-APT_IGNORE_DEPRECATED_POP
 
    // Abstract parser for each source record
    class Parser
@@ -86,7 +79,6 @@ APT_IGNORE_DEPRECATED_POP
       static const char *BuildDepType(unsigned char const &Type) APT_PURE;
 
       virtual bool Files(std::vector<pkgSrcRecords::File> &F) = 0;
-      bool Files2(std::vector<pkgSrcRecords::File2> &F);
 
       explicit Parser(const pkgIndexFile *Index);
       virtual ~Parser();
-- 
cgit v1.2.3