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

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 35b786e1a1556b57d646cf9d3316e9e1279250b6..9983575092f25d4fbb337104b28c028464b680b3 100644 (file)
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -52,23 +52,15 @@ class pkgAcquire;
 class pkgIndexFile;
 class metaIndex;
 
 class pkgIndexFile;
 class metaIndex;
 

-class pkgSource
-{
-   protected:
-
-   std::vector<metaIndex *> SrcList;
-
-};
-
-class pkgSourceList : public pkgSource
+class pkgSourceList

 {
    public:
 {
    public:

-   
+

    // List of supported source list types
    class Type
    {
       public:
    // List of supported source list types
    class Type
    {
       public:

-      
+

       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;
       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;


@@ -91,14 +83,18 @@ class pkgSourceList : public pkgSource
       Type();
       virtual ~Type() {};
    };
       Type();
       virtual ~Type() {};
    };

-   
+

    typedef std::vector<metaIndex *>::const_iterator const_iterator;
    typedef std::vector<metaIndex *>::const_iterator const_iterator;

-   
-   public:
+
+   protected:
+
+   std::vector<metaIndex *> SrcList;

 
    int ParseFileDeb822(std::string File);
    bool ParseFileOldStyle(std::string File);
 
 
    int ParseFileDeb822(std::string File);
    bool ParseFileOldStyle(std::string File);
 

+   public:
+

    bool ReadMainList();
    bool Read(std::string File);
 
    bool ReadMainList();
    bool Read(std::string File);