Преглед изворни кода

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
David Kalnischkies пре 11 година
родитељ
комит
0dc0b42d73
1 измењених фајлова са 10 додато и 14 уклоњено
  1. 10 14
      apt-pkg/sourcelist.h

+ 10 - 14
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);