summaryrefslogtreecommitdiff
path: root/apt-pkg/sourcelist.h
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-11-07 21:26:49 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2014-11-08 14:29:25 +0100
commit0dc0b42d73ffd08bbdbe08b0678fbaae02364622 (patch)
treedaec65c014ba55ee0fa8e1206d612b6b2cd0e8a9 /apt-pkg/sourcelist.h
parent32ab4bd05cb298f6bf1f9574f5b20570beaae429 (diff)
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
Diffstat (limited to 'apt-pkg/sourcelist.h')
-rw-r--r--apt-pkg/sourcelist.h24
1 files changed, 10 insertions, 14 deletions
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<metaIndex *> 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<metaIndex *>::const_iterator const_iterator;
-
- public:
+
+ protected:
+
+ std::vector<metaIndex *> SrcList;
int ParseFileDeb822(std::string File);
bool ParseFileOldStyle(std::string File);
+ public:
+
bool ReadMainList();
bool Read(std::string File);