From 0dc0b42d73ffd08bbdbe08b0678fbaae02364622 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 7 Nov 2014 21:26:49 +0100 Subject: revert useless abibreak in sourceslist.h No idea what the intension was here, but it seems like a leftover from a workover which happened to be done differently later. As it doesn't provide anything at the moment we just revert to the previous abi here. Git-Dch: Ignore --- apt-pkg/sourcelist.h | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'apt-pkg/sourcelist.h') diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 35b786e1a..998357509 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -52,23 +52,15 @@ class pkgAcquire; class pkgIndexFile; class metaIndex; -class pkgSource -{ - protected: - - std::vector SrcList; - -}; - -class pkgSourceList : public pkgSource +class pkgSourceList { public: - + // List of supported source list types class Type { public: - + // Global list of Items supported static Type **GlobalList; static unsigned long GlobalListLen; @@ -91,14 +83,18 @@ class pkgSourceList : public pkgSource Type(); virtual ~Type() {}; }; - + typedef std::vector::const_iterator const_iterator; - - public: + + protected: + + std::vector SrcList; int ParseFileDeb822(std::string File); bool ParseFileOldStyle(std::string File); + public: + bool ReadMainList(); bool Read(std::string File); -- cgit v1.2.3-18-g5258