Merge branch 'pu/cleanups' into 'master'

Cleanup ABI - make stuff virtual, etc

See merge request apt-team/apt!106

1 files changed, 9 insertions, 11 deletions

diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index a44e5c21e..1c1cada0c 100644
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -44,6 +44,11 @@ protected:
    // parsed from a file
    std::string Suite;
    std::string Codename;
+   std::string Origin;
+   std::string Label;
+   std::string Version;
+   signed short DefaultPin;
+   std::string ReleaseNotes;
    time_t Date;
    time_t ValidUntil;
    bool SupportsAcquireByHash;
@@ -68,7 +73,7 @@ public:
    bool GetSupportsAcquireByHash() const;
    time_t GetValidUntil() const;
    time_t GetDate() const;
-   APT_HIDDEN time_t GetNotBefore() const; // FIXME make virtual
+   virtual time_t GetNotBefore() const = 0;
 
    std::string GetExpectedDist() const;
    bool CheckDist(std::string const &MaybeDist) const;
@@ -102,16 +107,9 @@ public:
              char const * const Type);
    virtual ~metaIndex();
 
-   // FIXME: make virtual on next abi break
-   bool IsArchitectureSupported(std::string const &arch) const;
-   bool IsArchitectureAllSupportedFor(IndexTarget const &target) const;
-   bool HasSupportForComponent(std::string const &component) const;
-   // FIXME: should be members of the class on abi break
-   APT_HIDDEN void SetOrigin(std::string const &origin);
-   APT_HIDDEN void SetLabel(std::string const &label);
-   APT_HIDDEN void SetVersion(std::string const &version);
-   APT_HIDDEN void SetDefaultPin(signed short const defaultpin);
-   APT_HIDDEN void SetReleaseNotes(std::string const &notes);
+   virtual bool IsArchitectureSupported(std::string const &arch) const;
+   virtual bool IsArchitectureAllSupportedFor(IndexTarget const &target) const;
+   virtual bool HasSupportForComponent(std::string const &component) const;
 };
 
 #endif