Sfoglia il codice sorgente

add more dpointer placeholders

Michael Vogt 15 anni fa
parent
commit
be9b62f764

+ 4 - 1
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;
    friend class pkgAcquire;
    
    
    protected:
    protected:
@@ -314,7 +317,7 @@ class pkgAcquire::Worker : public WeakPointable
     *  Closes the file descriptors; if MethodConfig::NeedsCleanup is
     *  Closes the file descriptors; if MethodConfig::NeedsCleanup is
     *  \b false, also rudely interrupts the worker with a SIGINT.
     *  \b false, also rudely interrupts the worker with a SIGINT.
     */
     */
-   ~Worker();
+   virtual ~Worker();
 };
 };
 
 
 /** @} */
 /** @} */

+ 3 - 0
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;
    pkgDepCache &Cache;
    typedef pkgCache::PkgIterator PkgIterator;
    typedef pkgCache::PkgIterator PkgIterator;
    typedef pkgCache::VerIterator VerIterator;
    typedef pkgCache::VerIterator VerIterator;

+ 3 - 0
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:
    protected:
    
    
    MMap *Map;
    MMap *Map;

+ 2 - 0
apt-pkg/cachefilter.h

@@ -16,6 +16,8 @@ namespace APT {
 namespace CacheFilter {
 namespace CacheFilter {
 // PackageNameMatchesRegEx						/*{{{*/
 // PackageNameMatchesRegEx						/*{{{*/
 class PackageNameMatchesRegEx {
 class PackageNameMatchesRegEx {
+         /** \brief dpointer placeholder (for later in case we need it) */
+         void *d;
 	regex_t* pattern;
 	regex_t* pattern;
 public:
 public:
 	PackageNameMatchesRegEx(std::string const &Pattern);
 	PackageNameMatchesRegEx(std::string const &Pattern);

+ 3 - 0
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:
    protected:
    
    
    virtual void Erase(const char * /*File*/,string /*Pkg*/,string /*Ver*/,struct stat & /*St*/) {};
    virtual void Erase(const char * /*File*/,string /*Pkg*/,string /*Ver*/,struct stat & /*St*/) {};

+ 6 - 2
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:
    protected:
    
    
    pkgTagSection *Section;
    pkgTagSection *Section;
@@ -55,7 +58,6 @@ class PackageCopy : public IndexCopy					/*{{{*/
    virtual const char *GetFileName() {return "Packages";};
    virtual const char *GetFileName() {return "Packages";};
    virtual const char *Type() {return "Package";};
    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 *GetFileName() {return "Sources";};
    virtual const char *Type() {return "Source";};
    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 Verify(string prefix,string file, indexRecords *records);
    bool CopyMetaIndex(string CDROM, string CDName, 
    bool CopyMetaIndex(string CDROM, string CDName, 
 		      string prefix, string file);
 		      string prefix, string file);

+ 3 - 2
apt-pkg/pkgrecords.h

@@ -28,12 +28,13 @@ class pkgRecords							/*{{{*/
    class Parser;
    class Parser;
    
    
    private:
    private:
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
    
    
    pkgCache &Cache;
    pkgCache &Cache;
    std::vector<Parser *>Files;
    std::vector<Parser *>Files;
 
 
-   public:
-
+    public:
    // Lookup function
    // Lookup function
    Parser &Lookup(pkgCache::VerFileIterator const &Ver);
    Parser &Lookup(pkgCache::VerFileIterator const &Ver);
    Parser &Lookup(pkgCache::DescFileIterator const &Desc);
    Parser &Lookup(pkgCache::DescFileIterator const &Desc);

+ 2 - 0
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
    // The list of files and the current parser pointer
    vector<Parser*> Files;
    vector<Parser*> Files;