Browse Source

revert 2184.1.3: forward declaration instead of headers

The breakage is just to big for now, so guard the change with
#ifndef APT_8_CLEANER_HEADERS and be nice to library users
debian/1.8.y
David Kalnischkies 10 years ago
parent
commit
b9dadc24b9
  1. 3
      apt-inst/contrib/arfile.h
  2. 2
      apt-inst/contrib/extracttar.h
  3. 4
      apt-inst/database.h
  4. 4
      apt-inst/deb/debfile.h
  5. 8
      apt-pkg/acquire-item.h
  6. 5
      apt-pkg/acquire-method.h
  7. 1
      apt-pkg/algorithms.h
  8. 6
      apt-pkg/cachefile.h
  9. 4
      apt-pkg/cacheset.h
  10. 1
      apt-pkg/cdrom.h
  11. 4
      apt-pkg/contrib/cmndline.h
  12. 1
      apt-pkg/contrib/mmap.h
  13. 4
      apt-pkg/contrib/netrc.h
  14. 4
      apt-pkg/deb/deblistparser.h
  15. 4
      apt-pkg/deb/debmetaindex.h
  16. 4
      apt-pkg/deb/debrecords.h
  17. 5
      apt-pkg/depcache.h
  18. 5
      apt-pkg/edsp.h
  19. 4
      apt-pkg/edsp/edspindexfile.h
  20. 6
      apt-pkg/edsp/edsplistparser.h
  21. 4
      apt-pkg/indexrecords.h
  22. 5
      apt-pkg/init.h
  23. 3
      apt-pkg/metaindex.h
  24. 1
      apt-pkg/packagemanager.h
  25. 4
      apt-pkg/pkgsystem.h
  26. 26
      apt-pkg/sourcelist.h
  27. 4
      apt-pkg/tagfile.h
  28. 2
      apt-pkg/vendorlist.h

3
apt-inst/contrib/arfile.h

@ -17,6 +17,9 @@
#include <string>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/fileutl.h>
#endif
class FileFd;

2
apt-inst/contrib/extracttar.h

@ -19,6 +19,8 @@
#include <string>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/dirstream.h>
#include <algorithm>
using std::min;
#endif

4
apt-inst/database.h

@ -25,6 +25,10 @@
#include <string>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/filelist.h>
#endif
class pkgFLCache;
class OpProgress;

4
apt-inst/deb/debfile.h

@ -29,6 +29,10 @@
#include <apt-pkg/tagfile.h>
#include <apt-pkg/pkgcache.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/database.h>
#endif
class FileFd;
class pkgDataBase;

8
apt-pkg/acquire-item.h

@ -25,6 +25,14 @@
#include <apt-pkg/weakptr.h>
#include <apt-pkg/pkgcache.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/indexfile.h>
#include <apt-pkg/vendor.h>
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/indexrecords.h>
#endif
/** \addtogroup acquire
* @{
*

5
apt-pkg/acquire-method.h

@ -25,6 +25,11 @@
#include <string>
#include <vector>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/configuration.h>
#include <apt-pkg/strutl.h>
#endif
class Hashes;
class pkgAcqMethod
{

1
apt-pkg/algorithms.h

@ -37,6 +37,7 @@
#include <iostream>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/acquire.h>
using std::ostream;
#endif

6
apt-pkg/cachefile.h

@ -20,6 +20,12 @@
#include <apt-pkg/depcache.h>
#include <apt-pkg/macros.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/acquire.h>
#include <apt-pkg/policy.h>
#include <apt-pkg/sourcelist.h>
#endif
class pkgPolicy;
class pkgSourceList;
class OpProgress;

4
apt-pkg/cacheset.h

@ -20,6 +20,10 @@
#include <apt-pkg/error.h>
#include <apt-pkg/pkgcache.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/cachefile.h>
#endif
/*}}}*/
class pkgCacheFile;

1
apt-pkg/cdrom.h

@ -5,6 +5,7 @@
#include<vector>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/init.h>
using namespace std;
#endif

4
apt-pkg/contrib/cmndline.h

@ -44,6 +44,10 @@
#ifndef PKGLIB_CMNDLINE_H
#define PKGLIB_CMNDLINE_H
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/configuration.h>
#endif
class Configuration;
class CommandLine

1
apt-pkg/contrib/mmap.h

@ -29,6 +29,7 @@
#include <string>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/fileutl.h>
using std::string;
#endif

4
apt-pkg/contrib/netrc.h

@ -16,6 +16,10 @@
#include <string>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/strutl.h>
#endif
#define DOT_CHAR "."
#define DIR_CHAR "/"

4
apt-pkg/deb/deblistparser.h

@ -14,6 +14,10 @@
#include <apt-pkg/pkgcachegen.h>
#include <apt-pkg/tagfile.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/indexfile.h>
#endif
class debListParser : public pkgCacheGenerator::ListParser
{
public:

4
apt-pkg/deb/debmetaindex.h

@ -8,6 +8,10 @@
#include <string>
#include <vector>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/sourcelist.h>
#endif
class debReleaseIndex : public metaIndex {
public:

4
apt-pkg/deb/debrecords.h

@ -18,6 +18,10 @@
#include <apt-pkg/tagfile.h>
#include <apt-pkg/fileutl.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/indexfile.h>
#endif
class debRecordParser : public pkgRecords::Parser
{
/** \brief dpointer placeholder (for later in case we need it) */

5
apt-pkg/depcache.h

@ -46,6 +46,11 @@
#include <set>
#include <list>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/progress.h>
#include <apt-pkg/error.h>
#endif
class OpProgress;
class pkgDepCache : protected pkgCache::Namespace

5
apt-pkg/edsp.h

@ -15,6 +15,11 @@
#include <list>
#include <string>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/depcache.h>
#include <apt-pkg/progress.h>
#endif
class pkgDepCache;
class OpProgress;

4
apt-pkg/edsp/edspindexfile.h

@ -10,6 +10,10 @@
#include <apt-pkg/debindexfile.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/indexfile.h>
#endif
class edspIndex : public debStatusIndex
{
/** \brief dpointer placeholder (for later in case we need it) */

6
apt-pkg/edsp/edsplistparser.h

@ -13,6 +13,12 @@
#include <apt-pkg/deblistparser.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/pkgcachegen.h>
#include <apt-pkg/indexfile.h>
#include <apt-pkg/tagfile.h>
#endif
class FileFd;
class edspListParser : public debListParser

4
apt-pkg/indexrecords.h

@ -13,6 +13,10 @@
#include <vector>
#include <ctime>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/fileutl.h>
#endif
class indexRecords
{
bool parseSumData(const char *&Start, const char *End, std::string &Name,

5
apt-pkg/init.h

@ -13,6 +13,11 @@
#ifndef PKGLIB_INIT_H
#define PKGLIB_INIT_H
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/configuration.h>
#include <apt-pkg/pkgsystem.h>
#endif
class pkgSystem;
class Configuration;

3
apt-pkg/metaindex.h

@ -7,6 +7,9 @@
#include <apt-pkg/indexfile.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/srcrecords.h>
#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/vendor.h>
using std::string;
#endif

1
apt-pkg/packagemanager.h

@ -30,6 +30,7 @@
#include <set>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/depcache.h>
using std::string;
#endif

4
apt-pkg/pkgsystem.h

@ -41,6 +41,10 @@
#include <vector>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/depcache.h>
#endif
class pkgDepCache;
class pkgPackageManager;
class pkgVersioningSystem;

26
apt-pkg/sourcelist.h

@ -32,9 +32,11 @@
#include <map>
#include <apt-pkg/pkgcache.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/metaindex.h>
using std::string;
using std::vector;
#endif
class pkgAcquire;
class pkgIndexFile;
@ -58,31 +60,31 @@ class pkgSourceList
const char *Label;
bool FixupURI(string &URI) const;
virtual bool ParseLine(vector<metaIndex *> &List,
virtual bool ParseLine(std::vector<metaIndex *> &List,
const char *Buffer,
unsigned long const &CurLine,string const &File) const;
virtual bool CreateItem(vector<metaIndex *> &List,string const &URI,
string const &Dist,string const &Section,
std::map<string, string> const &Options) const = 0;
unsigned long const &CurLine,std::string const &File) const;
virtual bool CreateItem(vector<metaIndex *> &List,std::string const &URI,
std::string const &Dist,std::string const &Section,
std::map<std::string, std::string> const &Options) const = 0;
Type();
virtual ~Type() {};
};
typedef vector<metaIndex *>::const_iterator const_iterator;
typedef std::vector<metaIndex *>::const_iterator const_iterator;
protected:
vector<metaIndex *> SrcList;
std::vector<metaIndex *> SrcList;
public:
bool ReadMainList();
bool Read(string File);
bool Read(std::string File);
// CNC:2003-03-03
void Reset();
bool ReadAppend(string File);
bool ReadSourceDir(string Dir);
bool ReadAppend(std::string File);
bool ReadSourceDir(std::string Dir);
// List accessors
inline const_iterator begin() const {return SrcList.begin();};
@ -98,7 +100,7 @@ class pkgSourceList
time_t GetLastModifiedTime();
pkgSourceList();
pkgSourceList(string File);
pkgSourceList(std::string File);
~pkgSourceList();
};

4
apt-pkg/tagfile.h

@ -24,6 +24,10 @@
#include <string>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/fileutl.h>
#endif
class FileFd;
class pkgTagSection

2
apt-pkg/vendorlist.h

@ -18,6 +18,8 @@
#include <apt-pkg/macros.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/vendor.h>
#include <apt-pkg/configuration.h>
using std::string;
using std::vector;
#endif

Loading…
Cancel
Save