From a49e7948029d8219d7cb182fbc1b0adb587691b8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 23 Apr 2014 13:51:48 +0200 Subject: create debIFTypeDscFile type --- apt-pkg/sourcelist.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apt-pkg/sourcelist.h') diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 9df0c1d74..0ebf4e080 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -86,7 +86,7 @@ class pkgSourceList typedef std::vector::const_iterator const_iterator; - protected: + public: std::vector SrcList; -- cgit v1.2.3 From 0d29b9d4368284782862c7b507c47002b79ddb27 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 26 Apr 2014 00:00:51 +0200 Subject: WIP local deb install --- apt-pkg/sourcelist.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'apt-pkg/sourcelist.h') diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 9df0c1d74..4943dd32a 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -116,6 +116,11 @@ class pkgSourceList // query last-modified time time_t GetLastModifiedTime(); + // Add custom metaIndex (e.g. local files) + void Add(metaIndex *mi) { + SrcList.push_back(mi); + } + pkgSourceList(); pkgSourceList(std::string File); ~pkgSourceList(); -- cgit v1.2.3 From 94f6611592b4b77ac257ec37445776ac2845f682 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 7 May 2014 16:23:37 +0200 Subject: rename pkgSourceList::Add() to pkgSourceList::AddMetaIndex() --- apt-pkg/sourcelist.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apt-pkg/sourcelist.h') diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 4943dd32a..cdf8d9762 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -117,7 +117,7 @@ class pkgSourceList time_t GetLastModifiedTime(); // Add custom metaIndex (e.g. local files) - void Add(metaIndex *mi) { + void AddMetaIndex(metaIndex *mi) { SrcList.push_back(mi); } -- cgit v1.2.3 From aaf677da5b62d3d0fdeb26f9b4c63fed544b63cd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 7 May 2014 16:41:25 +0200 Subject: move pkgSourceList::AddMetaIndex() into a private subclass until we decide about a good API --- apt-pkg/sourcelist.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'apt-pkg/sourcelist.h') diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index cdf8d9762..99e83f454 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -52,7 +52,15 @@ class pkgAcquire; class pkgIndexFile; class metaIndex; -class pkgSourceList +class pkgSource +{ + protected: + + std::vector SrcList; + +}; + +class pkgSourceList : public pkgSource { public: @@ -116,11 +124,6 @@ class pkgSourceList // query last-modified time time_t GetLastModifiedTime(); - // Add custom metaIndex (e.g. local files) - void AddMetaIndex(metaIndex *mi) { - SrcList.push_back(mi); - } - pkgSourceList(); pkgSourceList(std::string File); ~pkgSourceList(); -- cgit v1.2.3 From 9d02c1ac77717a2a8055e56dad4974abb15c800b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 27 Sep 2014 00:51:03 +0200 Subject: fix: The class 'pkgSourceList' defines member variable with name 'SrcList' also defined in its parent class 'pkgSource' Git-Dch: Ignore Reported-By: cppcheck --- apt-pkg/sourcelist.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'apt-pkg/sourcelist.h') diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 261dd8161..35b786e1a 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -96,13 +96,9 @@ class pkgSourceList : public pkgSource public: - 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 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