add more dpointer placeholders

diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h
index 06283922e5e4dbe41c951b083d2eefd866ee68e7..62545829a264d28a9618c5d16c321e05557c5048 100644 (file)
--- a/apt-pkg/acquire-worker.h
+++ b/apt-pkg/acquire-worker.h
@@ -44,6 +44,9 @@
  */
 class pkgAcquire::Worker : public WeakPointable
 {
  */
 class pkgAcquire::Worker : public WeakPointable
 {

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+  

    friend class pkgAcquire;
    
    protected:
    friend class pkgAcquire;
    
    protected:


@@ -314,7 +317,7 @@ class pkgAcquire::Worker : public WeakPointable
     *  Closes the file descriptors; if MethodConfig::NeedsCleanup is
     *  \b false, also rudely interrupts the worker with a SIGINT.
     */
     *  Closes the file descriptors; if MethodConfig::NeedsCleanup is
     *  \b false, also rudely interrupts the worker with a SIGINT.
     */

-   ~Worker();
+   virtual ~Worker();

 };
 
 /** @} */
 };
 
 /** @} */

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index cf4a98c4f95818b069336362ba0c178e5997d8f1..42945a6f244e9958cf85e62e2aaf7fd6079884df 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -78,6 +78,9 @@ private:
                                                                        /*}}}*/
 class pkgProblemResolver                                               /*{{{*/
 {
                                                                        /*}}}*/
 class pkgProblemResolver                                               /*{{{*/
 {

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+

    pkgDepCache &Cache;
    typedef pkgCache::PkgIterator PkgIterator;
    typedef pkgCache::VerIterator VerIterator;
    pkgDepCache &Cache;
    typedef pkgCache::PkgIterator PkgIterator;
    typedef pkgCache::VerIterator VerIterator;

diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index 09d3ec2676675c3063f32f5cc016b11eb7d245fe..d07337d387d216b180fc1798c38961fa2a840e9d 100644 (file)
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -25,6 +25,9 @@
 
 class pkgCacheFile
 {
 
 class pkgCacheFile
 {

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+

    protected:
    
    MMap *Map;
    protected:
    
    MMap *Map;

diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h
index e7ab1723fe992e0b54e4e49b1be06d3053688aae..5d426008b26288abb9f83a2f1d671fedfe8ead51 100644 (file)
--- a/apt-pkg/cachefilter.h
+++ b/apt-pkg/cachefilter.h
@@ -16,6 +16,8 @@ namespace APT {
 namespace CacheFilter {
 // PackageNameMatchesRegEx                                             /*{{{*/
 class PackageNameMatchesRegEx {
 namespace CacheFilter {
 // PackageNameMatchesRegEx                                             /*{{{*/
 class PackageNameMatchesRegEx {

+         /** \brief dpointer placeholder (for later in case we need it) */
+         void *d;

        regex_t* pattern;
 public:
        PackageNameMatchesRegEx(std::string const &Pattern);
        regex_t* pattern;
 public:
        PackageNameMatchesRegEx(std::string const &Pattern);

diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h
index 2aee2bf54fe31dbd61fe917a50f966653d5cabc3..1ebf68dc94d91fab50a46d3f43457daa45e9735d 100644 (file)
--- a/apt-pkg/clean.h
+++ b/apt-pkg/clean.h
@@ -15,6 +15,9 @@
 
 class pkgArchiveCleaner
 {
 
 class pkgArchiveCleaner
 {

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+

    protected:
    
    virtual void Erase(const char * /*File*/,string /*Pkg*/,string /*Ver*/,struct stat & /*St*/) {};
    protected:
    
    virtual void Erase(const char * /*File*/,string /*Pkg*/,string /*Ver*/,struct stat & /*St*/) {};

diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index 6fcd3b8ce4e1a110c9efd9639931d5233de0f78e..277fb561c0b3410efa34da2b87b5279a29e8d3d3 100644 (file)
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -24,6 +24,9 @@ class pkgCdromStatus;
 
 class IndexCopy                                                                /*{{{*/
 {
 
 class IndexCopy                                                                /*{{{*/
 {

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+

    protected:
    
    pkgTagSection *Section;
    protected:
    
    pkgTagSection *Section;


@@ -55,7 +58,6 @@ class PackageCopy : public IndexCopy                                  /*{{{*/
    virtual const char *GetFileName() {return "Packages";};
    virtual const char *Type() {return "Package";};
    
    virtual const char *GetFileName() {return "Packages";};
    virtual const char *Type() {return "Package";};
    

-   public:

 };
                                                                        /*}}}*/
 class SourceCopy : public IndexCopy                                    /*{{{*/
 };
                                                                        /*}}}*/
 class SourceCopy : public IndexCopy                                    /*{{{*/


@@ -67,7 +69,6 @@ class SourceCopy : public IndexCopy                                   /*{{{*/
    virtual const char *GetFileName() {return "Sources";};
    virtual const char *Type() {return "Source";};
    
    virtual const char *GetFileName() {return "Sources";};
    virtual const char *Type() {return "Source";};
    

-   public:

 };
                                                                        /*}}}*/
 class TranslationsCopy                                                 /*{{{*/
 };
                                                                        /*}}}*/
 class TranslationsCopy                                                 /*{{{*/


@@ -82,6 +83,9 @@ class TranslationsCopy                                                        /*{{{*/
                                                                        /*}}}*/
 class SigVerify                                                                /*{{{*/
 {
                                                                        /*}}}*/
 class SigVerify                                                                /*{{{*/
 {

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+

    bool Verify(string prefix,string file, indexRecords *records);
    bool CopyMetaIndex(string CDROM, string CDName, 
                      string prefix, string file);
    bool Verify(string prefix,string file, indexRecords *records);
    bool CopyMetaIndex(string CDROM, string CDName, 
                      string prefix, string file);

diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index c2c98188a7e12fce76b512c767e56f1c9b256c21..93e3425348a7a43dc0b92d93e1f9e0e32d72697b 100644 (file)
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -28,12 +28,13 @@ class pkgRecords                                                    /*{{{*/
    class Parser;
    
    private:
    class Parser;
    
    private:

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;

    
    pkgCache &Cache;
    std::vector<Parser *>Files;
 
    
    pkgCache &Cache;
    std::vector<Parser *>Files;
 

-   public:
-
+    public:

    // Lookup function
    Parser &Lookup(pkgCache::VerFileIterator const &Ver);
    Parser &Lookup(pkgCache::DescFileIterator const &Desc);
    // Lookup function
    Parser &Lookup(pkgCache::VerFileIterator const &Ver);
    Parser &Lookup(pkgCache::DescFileIterator const &Desc);

diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index a495338648f324de010f985d6c60f67eb965f84c..a681d2e314bf788d6037b3ab60077c4dd48786c9 100644 (file)
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -79,6 +79,8 @@ class pkgSrcRecords
    };
    
    private:
    };
    
    private:

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;

    
    // The list of files and the current parser pointer
    vector<Parser*> Files;
    
    // The list of files and the current parser pointer
    vector<Parser*> Files;