add d-pointer, virtual destructors and de-inline de/constructors

To have a chance to keep the ABI for a while we need all three to team
up. One of them missing and we might loose, so ensuring that they are
available is a very tedious but needed task once in a while.

Git-Dch: Ignore

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 5460280ec8387856a866b2717aadb584e858c53b..3313aaabcc47cea4b74ee3fc6cb626d44cbb16b6 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -438,7 +438,7 @@ APT_PURE pkgAcquire * pkgAcquire::Item::GetOwner() const            /*{{{*/
    return Owner;
 }
                                                                        /*}}}*/
    return Owner;
 }
                                                                        /*}}}*/

-pkgAcquire::ItemDesc &pkgAcquire::Item::GetItemDesc()                  /*{{{*/
+APT_CONST pkgAcquire::ItemDesc &pkgAcquire::Item::GetItemDesc()                /*{{{*/

 {
    return Desc;
 }
 {
    return Desc;
 }


@@ -1098,6 +1098,7 @@ bool pkgAcqMetaBase::VerifyVendor(string const &Message)          /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+pkgAcqMetaBase::~pkgAcqMetaBase() {}

 
 pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire * const Owner,       /*{{{*/
       IndexTarget const &ClearsignedTarget,
 
 pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire * const Owner,       /*{{{*/
       IndexTarget const &ClearsignedTarget,


@@ -1319,6 +1320,7 @@ std::string pkgAcqMetaIndex::DescURI() const                              /*{{{*/
    return Target.URI;
 }
                                                                        /*}}}*/
    return Target.URI;
 }
                                                                        /*}}}*/

+pkgAcqMetaIndex::~pkgAcqMetaIndex() {}

 
 // AcqMetaSig::AcqMetaSig - Constructor                                        /*{{{*/
 pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire * const Owner,
 
 // AcqMetaSig::AcqMetaSig - Constructor                                        /*{{{*/
 pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire * const Owner,


@@ -1491,6 +1493,7 @@ pkgAcqBaseIndex::pkgAcqBaseIndex(pkgAcquire * const Owner,
 {
 }
                                                                        /*}}}*/
 {
 }
                                                                        /*}}}*/

+pkgAcqBaseIndex::~pkgAcqBaseIndex() {}

 
 // AcqDiffIndex::AcqDiffIndex - Constructor                            /*{{{*/
 // ---------------------------------------------------------------------
 
 // AcqDiffIndex::AcqDiffIndex - Constructor                            /*{{{*/
 // ---------------------------------------------------------------------


@@ -1893,6 +1896,7 @@ void pkgAcqDiffIndex::Done(string const &Message,HashStringList const &Hashes,    /
    return;
 }
                                                                        /*}}}*/
    return;
 }
                                                                        /*}}}*/

+pkgAcqDiffIndex::~pkgAcqDiffIndex() {}

 
 // AcqIndexDiffs::AcqIndexDiffs - Constructor                          /*{{{*/
 // ---------------------------------------------------------------------
 
 // AcqIndexDiffs::AcqIndexDiffs - Constructor                          /*{{{*/
 // ---------------------------------------------------------------------


@@ -2119,6 +2123,7 @@ std::string pkgAcqIndexDiffs::Custom600Headers() const                    /*{{{*/
    return patchhashes.str();
 }
                                                                        /*}}}*/
    return patchhashes.str();
 }
                                                                        /*}}}*/

+pkgAcqIndexDiffs::~pkgAcqIndexDiffs() {}

 
 // AcqIndexMergeDiffs::AcqIndexMergeDiffs - Constructor                        /*{{{*/
 pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire * const Owner,
 
 // AcqIndexMergeDiffs::AcqIndexMergeDiffs - Constructor                        /*{{{*/
 pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire * const Owner,


@@ -2263,6 +2268,7 @@ std::string pkgAcqIndexMergeDiffs::Custom600Headers() const               /*{{{*/
    return patchhashes.str();
 }
                                                                        /*}}}*/
    return patchhashes.str();
 }
                                                                        /*}}}*/

+pkgAcqIndexMergeDiffs::~pkgAcqIndexMergeDiffs() {}

 
 // AcqIndex::AcqIndex - Constructor                                    /*{{{*/
 pkgAcqIndex::pkgAcqIndex(pkgAcquire * const Owner,
 
 // AcqIndex::AcqIndex - Constructor                                    /*{{{*/
 pkgAcqIndex::pkgAcqIndex(pkgAcquire * const Owner,


@@ -2539,6 +2545,7 @@ void pkgAcqIndex::StageDecompressDone(string const &,
    return;
 }
                                                                        /*}}}*/
    return;
 }
                                                                        /*}}}*/

+pkgAcqIndex::~pkgAcqIndex() {}

 
 
 // AcqArchive::AcqArchive - Constructor                                        /*{{{*/
 
 
 // AcqArchive::AcqArchive - Constructor                                        /*{{{*/


@@ -2836,6 +2843,7 @@ std::string pkgAcqArchive::ShortDesc() const                              /*{{{*/
    return Desc.ShortDesc;
 }
                                                                        /*}}}*/
    return Desc.ShortDesc;
 }
                                                                        /*}}}*/

+pkgAcqArchive::~pkgAcqArchive() {}

 
 // AcqChangelog::pkgAcqChangelog - Constructors                                /*{{{*/
 pkgAcqChangelog::pkgAcqChangelog(pkgAcquire * const Owner, pkgCache::VerIterator const &Ver,
 
 // AcqChangelog::pkgAcqChangelog - Constructors                                /*{{{*/
 pkgAcqChangelog::pkgAcqChangelog(pkgAcquire * const Owner, pkgCache::VerIterator const &Ver,


@@ -3156,3 +3164,4 @@ string pkgAcqFile::Custom600Headers() const                               /*{{{*/
    return "";
 }
                                                                        /*}}}*/
    return "";
 }
                                                                        /*}}}*/

+pkgAcqFile::~pkgAcqFile() {}

diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 9dbacc1ea54ee7b554f0858fb9308af07806d086..df1380b5eda7211ad42959f81c9e6a53f0741d7a 100644 (file)
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-item.h,v 1.26.2.3 2004/01/02 18:51:00 mdz Exp $

 /* ######################################################################
 
    Acquire Item - Item to acquire
 /* ######################################################################
 
    Acquire Item - Item to acquire


@@ -345,6 +344,7 @@ class pkgAcquire::Item : public WeakPointable                               /*{{{*/
 class APT_HIDDEN pkgAcqTransactionItem: public pkgAcquire::Item                /*{{{*/
 /** \brief baseclass for the indexes files to manage them all together */
 {
 class APT_HIDDEN pkgAcqTransactionItem: public pkgAcquire::Item                /*{{{*/
 /** \brief baseclass for the indexes files to manage them all together */
 {

+   void *d;

    protected:
    IndexTarget const Target;
    HashStringList GetExpectedHashesFor(std::string const MetaKey) const;
    protected:
    IndexTarget const Target;
    HashStringList GetExpectedHashesFor(std::string const MetaKey) const;


@@ -380,7 +380,6 @@ class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem              /*{{{*/
 /** \brief the manager of a transaction */
 {
    void *d;
 /** \brief the manager of a transaction */
 {
    void *d;

-

  protected:
    std::vector<pkgAcqTransactionItem*> Transaction;
 
  protected:
    std::vector<pkgAcqTransactionItem*> Transaction;
 


@@ -478,6 +477,7 @@ class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem              /*{{{*/
                  std::vector<IndexTarget> const IndexTargets,
                  IndexTarget const &DataTarget,
                  indexRecords* const MetaIndexParser);
                  std::vector<IndexTarget> const IndexTargets,
                  IndexTarget const &DataTarget,
                  indexRecords* const MetaIndexParser);

+   virtual ~pkgAcqMetaBase();

 };
                                                                        /*}}}*/
 /** \brief An item that is responsible for downloading the meta-index  {{{
 };
                                                                        /*}}}*/
 /** \brief An item that is responsible for downloading the meta-index  {{{


@@ -493,7 +493,6 @@ class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem              /*{{{*/
 class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase
 {
    void *d;
 class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase
 {
    void *d;

-

    protected:
    IndexTarget const DetachedSigTarget;
 
    protected:
    IndexTarget const DetachedSigTarget;
 


@@ -513,6 +512,7 @@ class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase
    pkgAcqMetaIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
                   IndexTarget const &DataTarget, IndexTarget const &DetachedSigTarget,
                   std::vector<IndexTarget> const IndexTargets, indexRecords * const MetaIndexParser);
    pkgAcqMetaIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
                   IndexTarget const &DataTarget, IndexTarget const &DetachedSigTarget,
                   std::vector<IndexTarget> const IndexTargets, indexRecords * const MetaIndexParser);

+   virtual ~pkgAcqMetaIndex();

 
    friend class pkgAcqMetaSig;
 };
 
    friend class pkgAcqMetaSig;
 };


@@ -589,6 +589,7 @@ class APT_HIDDEN pkgAcqBaseIndex : public pkgAcqTransactionItem
 
    pkgAcqBaseIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
                    IndexTarget const Target);
 
    pkgAcqBaseIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
                    IndexTarget const Target);

+   virtual ~pkgAcqBaseIndex();

 };
                                                                        /*}}}*/
 /** \brief An item that is responsible for fetching an index file of   {{{
 };
                                                                        /*}}}*/
 /** \brief An item that is responsible for fetching an index file of   {{{


@@ -652,6 +653,7 @@ class APT_HIDDEN pkgAcqDiffIndex : public pkgAcqBaseIndex
     */
    pkgAcqDiffIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
                    IndexTarget const Target);
     */
    pkgAcqDiffIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
                    IndexTarget const Target);

+   virtual ~pkgAcqDiffIndex();

  private:
    APT_HIDDEN void QueueOnIMSHit() const;
 };
  private:
    APT_HIDDEN void QueueOnIMSHit() const;
 };


@@ -751,6 +753,7 @@ class APT_HIDDEN pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
    pkgAcqIndexMergeDiffs(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
                          IndexTarget const Target, DiffInfo const &patch,
                          std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches);
    pkgAcqIndexMergeDiffs(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
                          IndexTarget const Target, DiffInfo const &patch,
                          std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches);

+   virtual ~pkgAcqIndexMergeDiffs();

 };
                                                                        /*}}}*/
 /** \brief An item that is responsible for fetching server-merge patches {{{
 };
                                                                        /*}}}*/
 /** \brief An item that is responsible for fetching server-merge patches {{{


@@ -864,6 +867,7 @@ class APT_HIDDEN pkgAcqIndexDiffs : public pkgAcqBaseIndex
    pkgAcqIndexDiffs(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
                     IndexTarget const Target,
                    std::vector<DiffInfo> const &diffs=std::vector<DiffInfo>());
    pkgAcqIndexDiffs(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
                     IndexTarget const Target,
                    std::vector<DiffInfo> const &diffs=std::vector<DiffInfo>());

+   virtual ~pkgAcqIndexDiffs();

 };
                                                                        /*}}}*/
 /** \brief An acquire item that is responsible for fetching an index   {{{
 };
                                                                        /*}}}*/
 /** \brief An acquire item that is responsible for fetching an index   {{{


@@ -940,8 +944,10 @@ class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex
 
    pkgAcqIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
                IndexTarget const Target);
 
    pkgAcqIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
                IndexTarget const Target);

+   virtual ~pkgAcqIndex();

 
 

-   void Init(std::string const &URI, std::string const &URIDesc,
+   private:
+   APT_HIDDEN void Init(std::string const &URI, std::string const &URIDesc,

              std::string const &ShortDesc);
 };
                                                                        /*}}}*/
              std::string const &ShortDesc);
 };
                                                                        /*}}}*/


@@ -1030,6 +1036,7 @@ class pkgAcqArchive : public pkgAcquire::Item
    pkgAcqArchive(pkgAcquire * const Owner,pkgSourceList * const Sources,
                 pkgRecords * const Recs,pkgCache::VerIterator const &Version,
                 std::string &StoreFilename);
    pkgAcqArchive(pkgAcquire * const Owner,pkgSourceList * const Sources,
                 pkgRecords * const Recs,pkgCache::VerIterator const &Version,
                 std::string &StoreFilename);

+   virtual ~pkgAcqArchive();

 };
                                                                        /*}}}*/
 /** \brief Retrieve the changelog for the given version                        {{{
 };
                                                                        /*}}}*/
 /** \brief Retrieve the changelog for the given version                        {{{


@@ -1211,6 +1218,7 @@ class pkgAcqFile : public pkgAcquire::Item
              std::string const &Desc, std::string const &ShortDesc,
              std::string const &DestDir="", std::string const &DestFilename="",
              bool const IsIndexFile=false);
              std::string const &Desc, std::string const &ShortDesc,
              std::string const &DestDir="", std::string const &DestFilename="",
              bool const IsIndexFile=false);

+   virtual ~pkgAcqFile();

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

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index a8fc75f8eccec894946d040f69ba70298f6a6972..d3aff4d5e335718c7a25924760f426904d950d58 100644 (file)
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -478,5 +478,9 @@ void pkgAcqMethod::Dequeue() {                                              /*{{{*/
    delete Tmp;
 }
                                                                        /*}}}*/
    delete Tmp;
 }
                                                                        /*}}}*/

-

 pkgAcqMethod::~pkgAcqMethod() {}
 pkgAcqMethod::~pkgAcqMethod() {}

+
+pkgAcqMethod::FetchItem::FetchItem() {}
+pkgAcqMethod::FetchItem::~FetchItem() {}
+
+pkgAcqMethod::FetchResult::~FetchResult() {}

diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 6480eb4b57f4ea3dad497bba344019a7a84fc9fa..f6659ef1f2b6b8bdf44ed66bef20a7445395e5c5 100644 (file)
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-method.h,v 1.15.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    Acquire Method - Method helper class + functions
 /* ######################################################################
 
    Acquire Method - Method helper class + functions


@@ -53,6 +52,11 @@ class pkgAcqMethod
       // for when we know it or a arbitrary limit when we don't know the
       // filesize (like a InRelease file)
       unsigned long long MaximumSize;
       // for when we know it or a arbitrary limit when we don't know the
       // filesize (like a InRelease file)
       unsigned long long MaximumSize;

+
+      FetchItem();
+      virtual ~FetchItem();
+      private:
+      void *d;

    };
    
    struct FetchResult
    };
    
    struct FetchResult


@@ -67,6 +71,9 @@ class pkgAcqMethod
       
       void TakeHashes(class Hashes &Hash);
       FetchResult();
       
       void TakeHashes(class Hashes &Hash);
       FetchResult();

+      virtual ~FetchResult();
+      private:
+      void *d;

    };
 
    // State
    };
 
    // State

diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h
index 3a3ef706d64920e9cc35d11e1c6133af5741e802..b8e8fefed4230de6395a2b9fa42ca9751cad049e 100644 (file)
--- a/apt-pkg/acquire-worker.h
+++ b/apt-pkg/acquire-worker.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-worker.h,v 1.12 2001/02/20 07:03:17 jgg Exp $

 /* ######################################################################
 
    Acquire Worker - Worker process manager
 /* ######################################################################
 
    Acquire Worker - Worker process manager

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 5e5bec95ce9dbc670a6765b3f526e1378c1e6cb3..75df858a83219fb056041f5b1a23ab9aaa064ced 100644 (file)
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -1143,6 +1143,15 @@ void pkgAcquireStatus::Fetched(unsigned long long Size,unsigned long long Resume
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

+pkgAcquire::UriIterator::UriIterator(pkgAcquire::Queue *Q) : d(NULL), CurQ(Q), CurItem(0)
+{
+   while (CurItem == 0 && CurQ != 0)
+   {
+      CurItem = CurQ->Items;
+      CurQ = CurQ->Next;
+   }
+}
+

 APT_CONST pkgAcquire::UriIterator::~UriIterator() {}
 APT_CONST pkgAcquire::MethodConfig::~MethodConfig() {}
 APT_CONST pkgAcquireStatus::~pkgAcquireStatus() {}
 APT_CONST pkgAcquire::UriIterator::~UriIterator() {}
 APT_CONST pkgAcquire::MethodConfig::~MethodConfig() {}
 APT_CONST pkgAcquireStatus::~pkgAcquireStatus() {}

diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 02031dafddc3908ae767d017d3160fcc1bc3cb11..b7e6c68f1b522c2455644c8bb34eb8e025b7c5e8 100644 (file)
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire.h,v 1.29.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    Acquire - File Acquiration
 /* ######################################################################
 
    Acquire - File Acquiration


@@ -626,14 +625,7 @@ class pkgAcquire::UriIterator
     *
     *  \param Q The queue over which this UriIterator should iterate.
     */
     *
     *  \param Q The queue over which this UriIterator should iterate.
     */

-   UriIterator(pkgAcquire::Queue *Q) : d(NULL), CurQ(Q), CurItem(0)
-   {
-      while (CurItem == 0 && CurQ != 0)
-      {
-        CurItem = CurQ->Items;
-        CurQ = CurQ->Next;
-      }
-   }   
+   UriIterator(pkgAcquire::Queue *Q);

    virtual ~UriIterator();
 };
                                                                        /*}}}*/
    virtual ~UriIterator();
 };
                                                                        /*}}}*/

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 2ac28c0d753a4b8896996a2f27bf8c4b3776c2bc..dab844220689f6d99870a797b868a493db796c61 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: algorithms.h,v 1.10 2001/05/22 04:17:41 jgg Exp $

 /* ######################################################################
 
    Algorithms - A set of misc algorithms
 /* ######################################################################
 
    Algorithms - A set of misc algorithms


@@ -55,6 +54,7 @@ using std::ostream;
 
 class pkgSimulate : public pkgPackageManager                           /*{{{*/
 {
 
 class pkgSimulate : public pkgPackageManager                           /*{{{*/
 {

+   void *d;

    protected:
 
    class Policy : public pkgDepCache::Policy
    protected:
 
    class Policy : public pkgDepCache::Policy


@@ -88,7 +88,7 @@ private:
    public:
 
    pkgSimulate(pkgDepCache *Cache);
    public:
 
    pkgSimulate(pkgDepCache *Cache);

-   ~pkgSimulate();
+   virtual ~pkgSimulate();

 };
                                                                        /*}}}*/
 class pkgProblemResolver                                               /*{{{*/
 };
                                                                        /*}}}*/
 class pkgProblemResolver                                               /*{{{*/


@@ -156,7 +156,7 @@ class pkgProblemResolver                                            /*{{{*/
    APT_DEPRECATED void InstallProtect();
 
    pkgProblemResolver(pkgDepCache *Cache);
    APT_DEPRECATED void InstallProtect();
 
    pkgProblemResolver(pkgDepCache *Cache);

-   ~pkgProblemResolver();
+   virtual ~pkgProblemResolver();

 };
                                                                        /*}}}*/
 bool pkgApplyStatus(pkgDepCache &Cache);
 };
                                                                        /*}}}*/
 bool pkgApplyStatus(pkgDepCache &Cache);

diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h
index c7b8d2d73d68e17b05011f789cfd7398bbb13158..353843c3e737e864b72cb9cd2c597cfd6fced73e 100644 (file)
--- a/apt-pkg/aptconfiguration.h
+++ b/apt-pkg/aptconfiguration.h
@@ -16,8 +16,7 @@
 #include <limits>
                                                                        /*}}}*/
 namespace APT {
 #include <limits>
                                                                        /*}}}*/
 namespace APT {

-class Configuration {                                                  /*{{{*/
-public:                                                                        /*{{{*/
+namespace Configuration {                                                      /*{{{*/

        /** \brief Returns a vector of usable Compression Types
         *
         *  Files can be compressed in various ways to decrease the size of the
        /** \brief Returns a vector of usable Compression Types
         *
         *  Files can be compressed in various ways to decrease the size of the


@@ -39,7 +38,7 @@ public:                                                                       /*{{{*/
         *
         *  \return a vector of the compression types in the preferred usage order
         */
         *
         *  \return a vector of the compression types in the preferred usage order
         */

-       std::vector<std::string> static const getCompressionTypes(bool const &Cached = true);
+       std::vector<std::string> const getCompressionTypes(bool const &Cached = true);

 
        /** \brief Returns a vector of Language Codes
         *
 
        /** \brief Returns a vector of Language Codes
         *


@@ -64,7 +63,7 @@ public:                                                                       /*{{{*/
         *
         *  \return a vector of (all) Language Codes in the preferred usage order
         */
         *
         *  \return a vector of (all) Language Codes in the preferred usage order
         */

-       std::vector<std::string> static const getLanguages(bool const &All = false,
+       std::vector<std::string> const getLanguages(bool const &All = false,

                        bool const &Cached = true, char const ** const Locale = 0);
 
        /** \brief Are we interested in the given Language?
                        bool const &Cached = true, char const ** const Locale = 0);
 
        /** \brief Are we interested in the given Language?


@@ -73,7 +72,7 @@ public:                                                                       /*{{{*/
         *  \param All defines if we check against all codes or only against used codes
         *  \return true if we are interested, false otherwise
         */
         *  \param All defines if we check against all codes or only against used codes
         *  \return true if we are interested, false otherwise
         */

-       bool static checkLanguage(std::string Lang, bool const All = false);
+       bool checkLanguage(std::string Lang, bool const All = false);

 
        /** \brief Returns a vector of Architectures we support
         *
 
        /** \brief Returns a vector of Architectures we support
         *


@@ -82,14 +81,14 @@ public:                                                                     /*{{{*/
         *
         *  \return a vector of Architectures in preferred order
         */
         *
         *  \return a vector of Architectures in preferred order
         */

-       std::vector<std::string> static const getArchitectures(bool const &Cached = true);
+       std::vector<std::string> const getArchitectures(bool const &Cached = true);

 
        /** \brief Are we interested in the given Architecture?
         *
         *  \param Arch we want to check
         *  \return true if we are interested, false otherwise
         */
 
        /** \brief Are we interested in the given Architecture?
         *
         *  \param Arch we want to check
         *  \return true if we are interested, false otherwise
         */

-       bool static checkArchitecture(std::string const &Arch);
+       bool checkArchitecture(std::string const &Arch);

 
        /** \brief Representation of supported compressors */
        struct Compressor {
 
        /** \brief Representation of supported compressors */
        struct Compressor {


@@ -113,15 +112,15 @@ public:                                                                   /*{{{*/
         *
         *  \return a vector of Compressors
         */
         *
         *  \return a vector of Compressors
         */

-       std::vector<Compressor> static const getCompressors(bool const Cached = true);
+       std::vector<Compressor> const getCompressors(bool const Cached = true);

 
        /** \brief Return a vector of extensions supported for data.tar's */
 
        /** \brief Return a vector of extensions supported for data.tar's */

-       std::vector<std::string> static const getCompressorExtensions();
+       std::vector<std::string> const getCompressorExtensions();

 
        /** \return Return a vector of enabled build profile specifications */
 
        /** \return Return a vector of enabled build profile specifications */

-       std::vector<std::string> static const getBuildProfiles();
+       std::vector<std::string> const getBuildProfiles();

        /** \return Return a comma-separated list of enabled build profile specifications */
        /** \return Return a comma-separated list of enabled build profile specifications */

-       std::string static const getBuildProfilesString();
+       std::string const getBuildProfilesString();

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

diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index 36b20893a27743c6e0750646664be242f8d2bda3..74a092593d3f64adf7718a2215ac00fd4b82c406 100644 (file)
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cachefile.h,v 1.5 2002/04/27 04:28:04 jgg Exp $

 /* ######################################################################
    
    CacheFile - Simple wrapper class for opening, generating and whatnot
 /* ######################################################################
    
    CacheFile - Simple wrapper class for opening, generating and whatnot

diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index 0ad99713a57718eb9e56e1844855e95c33bd9c49..c42f761129fe14dc1afe796fbac5562cf0025734 100644 (file)
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -37,7 +37,6 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 namespace APT {
 #include <apti18n.h>
                                                                        /*}}}*/
 namespace APT {

-

 // PackageFrom - selecting the appropriate method for package selection        /*{{{*/
 bool CacheSetHelper::PackageFrom(enum PkgSelector const select, PackageContainerInterface * const pci,
       pkgCacheFile &Cache, std::string const &pattern) {
 // PackageFrom - selecting the appropriate method for package selection        /*{{{*/
 bool CacheSetHelper::PackageFrom(enum PkgSelector const select, PackageContainerInterface * const pci,
       pkgCacheFile &Cache, std::string const &pattern) {


@@ -812,4 +811,18 @@ APT_CONST void CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const &
                                         bool const /*verIsRel*/) {
 }
                                                                        /*}}}*/
                                         bool const /*verIsRel*/) {
 }
                                                                        /*}}}*/

+
+CacheSetHelper::CacheSetHelper(bool const ShowError, GlobalError::MsgType ErrorType) :
+   ShowError(ShowError), ErrorType(ErrorType) {}
+CacheSetHelper::~CacheSetHelper() {}
+
+PackageContainerInterface::PackageContainerInterface() : ConstructedBy(CacheSetHelper::UNKNOWN) {}
+PackageContainerInterface::PackageContainerInterface(CacheSetHelper::PkgSelector const by) : ConstructedBy(by) {}
+PackageContainerInterface::~PackageContainerInterface() {}
+
+PackageUniverse::PackageUniverse(pkgCache * const Owner) : _cont(Owner) { }
+PackageUniverse::~PackageUniverse() {}
+
+VersionContainerInterface::VersionContainerInterface() {}
+VersionContainerInterface::~VersionContainerInterface() {}

 }
 }

diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h
index 97aee8c2de9161e5423242762b67633eb4c2b566..1a6feb5f7c95879b43cbaccc055c5cc703c47472 100644 (file)
--- a/apt-pkg/cacheset.h
+++ b/apt-pkg/cacheset.h
@@ -50,9 +50,8 @@ class CacheSetHelper {                                                        /*{{{*/
 */
 public:                                                                        /*{{{*/
        CacheSetHelper(bool const ShowError = true,
 */
 public:                                                                        /*{{{*/
        CacheSetHelper(bool const ShowError = true,

-               GlobalError::MsgType ErrorType = GlobalError::ERROR) :
-                       ShowError(ShowError), ErrorType(ErrorType) {}
-       virtual ~CacheSetHelper() {}
+               GlobalError::MsgType ErrorType = GlobalError::ERROR);
+       virtual ~CacheSetHelper();

 
        enum PkgSelector { UNKNOWN, REGEX, TASK, FNMATCH, PACKAGENAME, STRING };
 
 
        enum PkgSelector { UNKNOWN, REGEX, TASK, FNMATCH, PACKAGENAME, STRING };
 


@@ -203,6 +202,8 @@ protected:
        bool PackageFromFnmatch(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern);
        bool PackageFromPackageName(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern);
        bool PackageFromString(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &pattern);
        bool PackageFromFnmatch(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern);
        bool PackageFromPackageName(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern);
        bool PackageFromString(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &pattern);

+private:
+       void *d;

 };                                                                     /*}}}*/
 
 class PackageContainerInterface {                                      /*{{{*/
 };                                                                     /*}}}*/
 
 class PackageContainerInterface {                                      /*{{{*/


@@ -263,8 +264,9 @@ APT_IGNORE_DEPRECATED_POP
 
        void setConstructor(CacheSetHelper::PkgSelector const by) { ConstructedBy = by; }
        CacheSetHelper::PkgSelector getConstructor() const { return ConstructedBy; }
 
        void setConstructor(CacheSetHelper::PkgSelector const by) { ConstructedBy = by; }
        CacheSetHelper::PkgSelector getConstructor() const { return ConstructedBy; }

-       PackageContainerInterface() : ConstructedBy(CacheSetHelper::UNKNOWN) {}
-       PackageContainerInterface(CacheSetHelper::PkgSelector const by) : ConstructedBy(by) {}
+       PackageContainerInterface();
+       PackageContainerInterface(CacheSetHelper::PkgSelector const by);
+       virtual ~PackageContainerInterface();

 
        APT_DEPRECATED static bool FromTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) {
           return helper.PackageFrom(CacheSetHelper::TASK, pci, Cache, pattern); }
 
        APT_DEPRECATED static bool FromTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) {
           return helper.PackageFrom(CacheSetHelper::TASK, pci, Cache, pattern); }


@@ -292,6 +294,7 @@ APT_IGNORE_DEPRECATED_POP
 
 private:
        CacheSetHelper::PkgSelector ConstructedBy;
 
 private:
        CacheSetHelper::PkgSelector ConstructedBy;

+       void *d;

 };
                                                                        /*}}}*/
 template<class Container> class PackageContainer : public PackageContainerInterface {/*{{{*/
 };
                                                                        /*}}}*/
 template<class Container> class PackageContainer : public PackageContainerInterface {/*{{{*/


@@ -355,7 +358,7 @@ public:                                                                     /*{{{*/
        iterator end() { return iterator(_cont.end()); }
        const_iterator find(pkgCache::PkgIterator const &P) const { return const_iterator(_cont.find(P)); }
 
        iterator end() { return iterator(_cont.end()); }
        const_iterator find(pkgCache::PkgIterator const &P) const { return const_iterator(_cont.find(P)); }
 

-       PackageContainer() : PackageContainerInterface() {}
+       PackageContainer() : PackageContainerInterface(CacheSetHelper::UNKNOWN) {}

        PackageContainer(CacheSetHelper::PkgSelector const &by) : PackageContainerInterface(by) {}
 APT_IGNORE_DEPRECATED_PUSH
        APT_DEPRECATED PackageContainer(Constructor const &by) : PackageContainerInterface((CacheSetHelper::PkgSelector)by) {}
        PackageContainer(CacheSetHelper::PkgSelector const &by) : PackageContainerInterface(by) {}
 APT_IGNORE_DEPRECATED_PUSH
        APT_DEPRECATED PackageContainer(Constructor const &by) : PackageContainerInterface((CacheSetHelper::PkgSelector)by) {}


@@ -552,6 +555,7 @@ template<> template<class Compare> inline bool PackageContainer<std::vector<pkgC
     private methods. */
 class APT_HIDDEN PackageUniverse : public PackageContainerInterface {
        pkgCache * const _cont;
     private methods. */
 class APT_HIDDEN PackageUniverse : public PackageContainerInterface {
        pkgCache * const _cont;

+       void *d;

 public:
        typedef pkgCache::PkgIterator iterator;
        typedef pkgCache::PkgIterator const_iterator;
 public:
        typedef pkgCache::PkgIterator iterator;
        typedef pkgCache::PkgIterator const_iterator;


@@ -564,7 +568,8 @@ public:
        APT_PUBLIC iterator begin() { return _cont->PkgBegin(); }
        APT_PUBLIC iterator end() { return _cont->PkgEnd(); }
 
        APT_PUBLIC iterator begin() { return _cont->PkgBegin(); }
        APT_PUBLIC iterator end() { return _cont->PkgEnd(); }
 

-       APT_PUBLIC PackageUniverse(pkgCache * const Owner) : _cont(Owner) { }
+       APT_PUBLIC PackageUniverse(pkgCache * const Owner);
+       APT_PUBLIC virtual ~PackageUniverse();

 
 private:
        bool insert(pkgCache::PkgIterator const &) { return true; }
 
 private:
        bool insert(pkgCache::PkgIterator const &) { return true; }


@@ -701,6 +706,11 @@ APT_IGNORE_DEPRECATED_PUSH
        }
 APT_IGNORE_DEPRECATED_POP
 
        }
 APT_IGNORE_DEPRECATED_POP
 

+       VersionContainerInterface();
+       virtual ~VersionContainerInterface();
+private:
+       void *d;
+

 protected:                                                             /*{{{*/
 
        /** \brief returns the candidate version of the package
 protected:                                                             /*{{{*/
 
        /** \brief returns the candidate version of the package

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 8cec4b78edf0e5dc9bd36c67036e6556a7b3b700..de5cd0657d3080d1199ba863458cb59f64c2fe49 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -1022,3 +1022,9 @@ pkgUdevCdromDevices::~pkgUdevCdromDevices()                             /*{{{*/
       dlclose(libudev_handle);
 }
                                                                        /*}}}*/
       dlclose(libudev_handle);
 }
                                                                        /*}}}*/

+
+pkgCdromStatus::pkgCdromStatus() : totalSteps(0) {}
+pkgCdromStatus::~pkgCdromStatus() {}
+
+pkgCdrom::pkgCdrom() {}
+pkgCdrom::~pkgCdrom() {}

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index bd09021760e07b2f5020a2d535a5becaa6289af0..5626b5059e9ed4d9c38921970421117db66cdae9 100644 (file)
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -18,12 +18,13 @@ class OpProgress;
 
 class pkgCdromStatus                                                   /*{{{*/
 {
 
 class pkgCdromStatus                                                   /*{{{*/
 {

+   void *d;

  protected:
    int totalSteps;
 
  public:
  protected:
    int totalSteps;
 
  public:

-   pkgCdromStatus() : totalSteps(0) {};
-   virtual ~pkgCdromStatus() {};
+   pkgCdromStatus();
+   virtual ~pkgCdromStatus();

 
    // total steps
    virtual void SetTotal(int total) { totalSteps = total; };
 
    // total steps
    virtual void SetTotal(int total) { totalSteps = total; };


@@ -74,7 +75,12 @@ class pkgCdrom                                                               /*{{{*/
    bool Ident(std::string &ident, pkgCdromStatus *log);
    bool Add(pkgCdromStatus *log);
 
    bool Ident(std::string &ident, pkgCdromStatus *log);
    bool Add(pkgCdromStatus *log);
 

+   pkgCdrom();
+   virtual ~pkgCdrom();
+

  private:
  private:

+   void *d;
+

    APT_HIDDEN bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM,
         std::string &ident, pkgCdromStatus * const log, bool const interactive);
    APT_HIDDEN bool UnmountCDROM(std::string const &CDROM, pkgCdromStatus * const log);
    APT_HIDDEN bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM,
         std::string &ident, pkgCdromStatus * const log, bool const interactive);
    APT_HIDDEN bool UnmountCDROM(std::string const &CDROM, pkgCdromStatus * const log);


@@ -92,6 +98,7 @@ struct CdromDevice                                                    /*{{{*/
                                                                        /*}}}*/
 class pkgUdevCdromDevices                                              /*{{{*/
 {
                                                                        /*}}}*/
 class pkgUdevCdromDevices                                              /*{{{*/
 {

+   void *d;

  protected:
    // libudev dlopen structure
    void *libudev_handle;
  protected:
    // libudev dlopen structure
    void *libudev_handle;

diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc
index 0fca60ba94c43f30acde501202f1d4ccf9b95265..d05ae83b95d052ee4f37fb6a736df3f487a1ff02 100644 (file)
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -132,4 +132,5 @@ bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

+pkgArchiveCleaner::pkgArchiveCleaner() {}

 APT_CONST pkgArchiveCleaner::~pkgArchiveCleaner() {}
 APT_CONST pkgArchiveCleaner::~pkgArchiveCleaner() {}

diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h
index 466cb67a92d0d143f71b83c79912618db93b3a59..a1495702b7b3019ea31125c2efb555ce59dface8 100644 (file)
--- a/apt-pkg/clean.h
+++ b/apt-pkg/clean.h
@@ -30,6 +30,8 @@ class pkgArchiveCleaner
    public:
 
    bool Go(std::string Dir,pkgCache &Cache);
    public:
 
    bool Go(std::string Dir,pkgCache &Cache);

+
+   pkgArchiveCleaner();

    virtual ~pkgArchiveCleaner();
 };
 
    virtual ~pkgArchiveCleaner();
 };
 

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 944cbe0bf20deab08093ede58fc08c9604eb5076..0fffa52b05fc0c66495321d0e6caa24b143673ca 100644 (file)
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -576,3 +576,4 @@ debTranslationsIndex::~debTranslationsIndex() {}
 debSourcesIndex::~debSourcesIndex() {}
 
 debDebPkgFileIndex::~debDebPkgFileIndex() {}
 debSourcesIndex::~debSourcesIndex() {}
 
 debDebPkgFileIndex::~debDebPkgFileIndex() {}

+debDscFileIndex::~debDscFileIndex() {}

diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 6b8c78e5ab2b2e37bd05b2438d4fcdca66dec1d0..6285a9e5c05433f147d441ea51473974e6912a7c 100644 (file)
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: debindexfile.h,v 1.3.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    Debian Index Files
 /* ######################################################################
 
    Debian Index Files


@@ -30,6 +29,7 @@ class pkgCacheGenerator;
 
 class APT_HIDDEN debStatusIndex : public pkgIndexFile
 {
 
 class APT_HIDDEN debStatusIndex : public pkgIndexFile
 {

+   void *d;

    protected:
    std::string File;
 
    protected:
    std::string File;
 


@@ -53,6 +53,7 @@ class APT_HIDDEN debStatusIndex : public pkgIndexFile
 
 class APT_HIDDEN debPackagesIndex : public pkgIndexTargetFile
 {
 
 class APT_HIDDEN debPackagesIndex : public pkgIndexTargetFile
 {

+   void *d;

    public:
 
    virtual const Type *GetType() const APT_CONST;
    public:
 
    virtual const Type *GetType() const APT_CONST;


@@ -71,6 +72,7 @@ class APT_HIDDEN debPackagesIndex : public pkgIndexTargetFile
 
 class APT_HIDDEN debTranslationsIndex : public pkgIndexTargetFile
 {
 
 class APT_HIDDEN debTranslationsIndex : public pkgIndexTargetFile
 {

+   void *d;

    public:
 
    virtual const Type *GetType() const APT_CONST;
    public:
 
    virtual const Type *GetType() const APT_CONST;


@@ -86,6 +88,7 @@ class APT_HIDDEN debTranslationsIndex : public pkgIndexTargetFile
 
 class APT_HIDDEN debSourcesIndex : public pkgIndexTargetFile
 {
 
 class APT_HIDDEN debSourcesIndex : public pkgIndexTargetFile
 {

+   void *d;

    public:
 
    virtual const Type *GetType() const APT_CONST;
    public:
 
    virtual const Type *GetType() const APT_CONST;


@@ -145,6 +148,7 @@ class APT_HIDDEN debDebPkgFileIndex : public pkgIndexFile
 class APT_HIDDEN debDscFileIndex : public pkgIndexFile
 {
  private:
 class APT_HIDDEN debDscFileIndex : public pkgIndexFile
 {
  private:

+   void *d;

    std::string DscFile;
  public:
    virtual const Type *GetType() const APT_CONST;
    std::string DscFile;
  public:
    virtual const Type *GetType() const APT_CONST;


@@ -157,7 +161,7 @@ class APT_HIDDEN debDscFileIndex : public pkgIndexFile
    };
 
    debDscFileIndex(std::string &DscFile);
    };
 
    debDscFileIndex(std::string &DscFile);

-   virtual ~debDscFileIndex() {};
+   virtual ~debDscFileIndex();

 };
 
 class APT_HIDDEN debDebianSourceDirIndex : public debDscFileIndex
 };
 
 class APT_HIDDEN debDebianSourceDirIndex : public debDscFileIndex

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index b328fcea800e025d1f5363503b7dccb48baa4ee7..34fc988385068dcf53fc0454eefbd6a3b75c012b 100644 (file)
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -459,6 +459,8 @@ pkgCache::RlsFileIterator debReleaseIndex::FindInCache(pkgCache &Cache, bool con
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

+debDebFileMetaIndex::~debDebFileMetaIndex() {}
+

 class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type
 {
    protected:
 class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type
 {
    protected:

diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index b448ecc53e1b3e8cc10f1f2c90460142a3473d93..f2706e08aac5452b2c8d65a45c18b98c59a3fe64 100644 (file)
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -75,6 +75,7 @@ class APT_HIDDEN debReleaseIndex : public metaIndex {
 class APT_HIDDEN debDebFileMetaIndex : public metaIndex
 {
  private:
 class APT_HIDDEN debDebFileMetaIndex : public metaIndex
 {
  private:

+    void *d;

    std::string DebFile;
    debDebPkgFileIndex *DebIndex;
  public:
    std::string DebFile;
    debDebPkgFileIndex *DebIndex;
  public:


@@ -94,7 +95,7 @@ class APT_HIDDEN debDebFileMetaIndex : public metaIndex
       return true;
    }
    debDebFileMetaIndex(std::string const &DebFile);
       return true;
    }
    debDebFileMetaIndex(std::string const &DebFile);

-   virtual ~debDebFileMetaIndex() {};
+   virtual ~debDebFileMetaIndex();

 
 };
 
 
 };
 

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 335bcfda0ac2207307c05d4ba67764ba1e98d2b1..f527042e4988adb5940c1ac49f0061c92523a990 100644 (file)
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -51,6 +51,7 @@ bool debRecordParser::Jump(pkgCache::DescFileIterator const &Desc)
                                                                        /*}}}*/
 debRecordParser::~debRecordParser() {}
 
                                                                        /*}}}*/
 debRecordParser::~debRecordParser() {}
 

+debRecordParserBase::debRecordParserBase() : Parser() {}

 // RecordParserBase::FileName - Return the archive filename on the site        /*{{{*/
 string debRecordParserBase::FileName()
 {
 // RecordParserBase::FileName - Return the archive filename on the site        /*{{{*/
 string debRecordParserBase::FileName()
 {


@@ -207,3 +208,9 @@ bool debDebFileRecordParser::LoadContent()
       return _error->Error(_("Unable to parse package file %s (%d)"), debFileName.c_str(), 3);
    return true;
 }
       return _error->Error(_("Unable to parse package file %s (%d)"), debFileName.c_str(), 3);
    return true;
 }

+bool debDebFileRecordParser::Jump(pkgCache::VerFileIterator const &) { return LoadContent(); }
+bool debDebFileRecordParser::Jump(pkgCache::DescFileIterator const &) { return LoadContent(); }
+std::string debDebFileRecordParser::FileName() { return debFileName; }
+
+debDebFileRecordParser::debDebFileRecordParser(std::string FileName) : debRecordParserBase(), debFileName(FileName) {}
+debDebFileRecordParser::~debDebFileRecordParser() {}

diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index 38e0719403f2228ec43687e4ef425fb04c117ee9..8efcec8cdbb052c3eb015bb67b83d03a57632648 100644 (file)
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -27,6 +27,7 @@
 
 class APT_HIDDEN debRecordParserBase : public pkgRecords::Parser
 {
 
 class APT_HIDDEN debRecordParserBase : public pkgRecords::Parser
 {

+   void *d;

  protected:
    pkgTagSection Section;
 
  protected:
    pkgTagSection Section;
 


@@ -50,12 +51,13 @@ class APT_HIDDEN debRecordParserBase : public pkgRecords::Parser
 
    virtual void GetRec(const char *&Start,const char *&Stop);
 
 
    virtual void GetRec(const char *&Start,const char *&Stop);
 

-   debRecordParserBase() : Parser() {}
+   debRecordParserBase();

    virtual ~debRecordParserBase();
 };
 
 class APT_HIDDEN debRecordParser : public debRecordParserBase
 {
    virtual ~debRecordParserBase();
 };
 
 class APT_HIDDEN debRecordParser : public debRecordParserBase
 {

+   void *d;

  protected:
    FileFd File;
    pkgTagFile Tags;
  protected:
    FileFd File;
    pkgTagFile Tags;


@@ -71,20 +73,21 @@ class APT_HIDDEN debRecordParser : public debRecordParserBase
 // custom record parser that reads deb files directly
 class APT_HIDDEN debDebFileRecordParser : public debRecordParserBase
 {
 // custom record parser that reads deb files directly
 class APT_HIDDEN debDebFileRecordParser : public debRecordParserBase
 {

+   void *d;

    std::string debFileName;
    std::string controlContent;
 
    APT_HIDDEN bool LoadContent();
  protected:
    // single file files, so no jumping whatsoever
    std::string debFileName;
    std::string controlContent;
 
    APT_HIDDEN bool LoadContent();
  protected:
    // single file files, so no jumping whatsoever

-   bool Jump(pkgCache::VerFileIterator const &) { return LoadContent(); }
-   bool Jump(pkgCache::DescFileIterator const &) { return LoadContent(); }
+   bool Jump(pkgCache::VerFileIterator const &);
+   bool Jump(pkgCache::DescFileIterator const &);

 
  public:
 
  public:

-   virtual std::string FileName() { return debFileName; }
+   virtual std::string FileName();

 
 

-   debDebFileRecordParser(std::string FileName)
-      : debRecordParserBase(), debFileName(FileName) {};
+   debDebFileRecordParser(std::string FileName);
+   virtual ~debDebFileRecordParser();

 };
 
 #endif
 };
 
 #endif

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index ca6d098967f38af7335835e6585dd291d50b1333..21a4ff8ea29190dfc5e721e6e530b08ce88af147 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -32,6 +32,10 @@
 using std::max;
 using std::string;
 
 using std::max;
 using std::string;
 

+debSrcRecordParser::debSrcRecordParser(std::string const &File,pkgIndexFile const *Index)
+   : Parser(Index), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400),
+   iOffset(0), Buffer(NULL) {}
+

 // SrcRecordParser::Binaries - Return the binaries field               /*{{{*/
 // ---------------------------------------------------------------------
 /* This member parses the binaries field into a pair of class arrays and
 // SrcRecordParser::Binaries - Return the binaries field               /*{{{*/
 // ---------------------------------------------------------------------
 /* This member parses the binaries field into a pair of class arrays and

diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h
index cd246d624b9332dedc73db62919f3c63fdf4a4b8..7aeb2db8825bcf8c099ae76e36da5e1b6192a08c 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.h
+++ b/apt-pkg/deb/debsrcrecords.h
@@ -56,9 +56,7 @@ class APT_HIDDEN debSrcRecordParser : public pkgSrcRecords::Parser
    virtual bool Files(std::vector<pkgSrcRecords::File> &F);
    bool Files2(std::vector<pkgSrcRecords::File2> &F);
 
    virtual bool Files(std::vector<pkgSrcRecords::File> &F);
    bool Files2(std::vector<pkgSrcRecords::File2> &F);
 

-   debSrcRecordParser(std::string const &File,pkgIndexFile const *Index) 
-      : Parser(Index), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400),
-        iOffset(0), Buffer(NULL) {}
+   debSrcRecordParser(std::string const &File,pkgIndexFile const *Index);

    virtual ~debSrcRecordParser();
 };
 
    virtual ~debSrcRecordParser();
 };
 

diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h
index 434ff4a2e4c06779c30247ff3b6760b5db625367..7befe63726ca827cfd541ab0444ec79d6868395d 100644 (file)
--- a/apt-pkg/deb/debversion.h
+++ b/apt-pkg/deb/debversion.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: debversion.h,v 1.3 2001/05/03 05:25:04 jgg Exp $

 /* ######################################################################
 
    Debian Version - Versioning system for Debian
 /* ######################################################################
 
    Debian Version - Versioning system for Debian

diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 20d263c67e11179492f211dcbf3f5135a137f5ca..94c1088f2ad12620269c630eee5749867414c9cf 100644 (file)
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -1,6 +1,5 @@
 // -*- mode: c++; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: c++; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: depcache.h,v 1.14 2001/02/20 07:03:17 jgg Exp $

 /* ######################################################################
 
    DepCache - Dependency Extension data for the cache
 /* ######################################################################
 
    DepCache - Dependency Extension data for the cache


@@ -164,6 +163,7 @@ class pkgDepCache : protected pkgCache::Namespace
     */
    class ActionGroup
    {
     */
    class ActionGroup
    {

+       void *d;

        pkgDepCache &cache;
 
        bool released;
        pkgDepCache &cache;
 
        bool released;


@@ -192,7 +192,7 @@ class pkgDepCache : protected pkgCache::Namespace
        *  If this is the last action group, the automatic cache
        *  cleanup operations will be undertaken.
        */
        *  If this is the last action group, the automatic cache
        *  cleanup operations will be undertaken.
        */

-       ~ActionGroup();
+       virtual ~ActionGroup();

    };
 
    /** \brief Returns \b true for packages matching a regular
    };
 
    /** \brief Returns \b true for packages matching a regular


@@ -503,6 +503,8 @@ class pkgDepCache : protected pkgCache::Namespace
         bool const rPurge, unsigned long const Depth, bool const FromUser);
 
    private:
         bool const rPurge, unsigned long const Depth, bool const FromUser);
 
    private:

+   void *d;
+

    APT_HIDDEN bool IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg,
                        unsigned long const Depth, bool const FromUser);
 };
    APT_HIDDEN bool IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg,
                        unsigned long const Depth, bool const FromUser);
 };

diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index 41cc2cdfefda92519d39dde1b7b961bcaa8b7a8d..25d53747cf6b07cff3f34d1af17e646dd6c48606 100644 (file)
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -39,60 +39,15 @@
 using std::string;
 
 // we could use pkgCache::DepType and ::Priority, but these would be localized strings…
 using std::string;
 
 // we could use pkgCache::DepType and ::Priority, but these would be localized strings…

-const char * const EDSP::PrioMap[] = {0, "important", "required", "standard",
+const char * const PrioMap[] = {0, "important", "required", "standard",

                                      "optional", "extra"};
                                      "optional", "extra"};

-const char * const EDSP::DepMap[] = {"", "Depends", "Pre-Depends", "Suggests",
+const char * const DepMap[] = {"", "Depends", "Pre-Depends", "Suggests",

                                     "Recommends" , "Conflicts", "Replaces",
                                     "Obsoletes", "Breaks", "Enhances"};
 
                                     "Recommends" , "Conflicts", "Replaces",
                                     "Obsoletes", "Breaks", "Enhances"};
 

-// EDSP::WriteScenario - to the given file descriptor                  /*{{{*/
-bool EDSP::WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress)
-{
-   if (Progress != NULL)
-      Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver"));
-   unsigned long p = 0;
-   std::vector<std::string> archs = APT::Configuration::getArchitectures();
-   for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; ++Pkg)
-   {
-      std::string const arch = Pkg.Arch();
-      if (std::find(archs.begin(), archs.end(), arch) == archs.end())
-        continue;
-      for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver, ++p)
-      {
-        WriteScenarioVersion(Cache, output, Pkg, Ver);
-        WriteScenarioDependency(output, Ver);
-        fprintf(output, "\n");
-        if (Progress != NULL && p % 100 == 0)
-           Progress->Progress(p);
-      }
-   }
-   return true;
-}
-                                                                       /*}}}*/
-// EDSP::WriteLimitedScenario - to the given file descriptor           /*{{{*/
-bool EDSP::WriteLimitedScenario(pkgDepCache &Cache, FILE* output,
-                               APT::PackageSet const &pkgset,
-                               OpProgress *Progress)
-{
-   if (Progress != NULL)
-      Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver"));
-   unsigned long p  = 0;
-   for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg, ++p)
-      for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
-      {
-        WriteScenarioVersion(Cache, output, Pkg, Ver);
-        WriteScenarioLimitedDependency(output, Ver, pkgset);
-        fprintf(output, "\n");
-        if (Progress != NULL && p % 100 == 0)
-           Progress->Progress(p);
-      }
-   if (Progress != NULL)
-      Progress->Done();
-   return true;
-}
-                                                                       /*}}}*/
-// EDSP::WriteScenarioVersion                                          /*{{{*/
-void EDSP::WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgIterator const &Pkg,
+
+// WriteScenarioVersion                                                        /*{{{*/
+static void WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgIterator const &Pkg,

                                pkgCache::VerIterator const &Ver)
 {
    fprintf(output, "Package: %s\n", Pkg.Name());
                                pkgCache::VerIterator const &Ver)
 {
    fprintf(output, "Package: %s\n", Pkg.Name());


@@ -147,8 +102,8 @@ void EDSP::WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgI
       fprintf(output, "APT-Automatic: yes\n");
 }
                                                                        /*}}}*/
       fprintf(output, "APT-Automatic: yes\n");
 }
                                                                        /*}}}*/

-// EDSP::WriteScenarioDependency                                       /*{{{*/
-void EDSP::WriteScenarioDependency( FILE* output, pkgCache::VerIterator const &Ver)
+// WriteScenarioDependency                                             /*{{{*/
+static void WriteScenarioDependency( FILE* output, pkgCache::VerIterator const &Ver)

 {
    std::string dependencies[pkgCache::Dep::Enhances + 1];
    bool orGroup = false;
 {
    std::string dependencies[pkgCache::Dep::Enhances + 1];
    bool orGroup = false;


@@ -183,8 +138,8 @@ void EDSP::WriteScenarioDependency( FILE* output, pkgCache::VerIterator const &V
       fprintf(output, "Provides: %s\n", provides.c_str()+2);
 }
                                                                        /*}}}*/
       fprintf(output, "Provides: %s\n", provides.c_str()+2);
 }
                                                                        /*}}}*/

-// EDSP::WriteScenarioLimitedDependency                                        /*{{{*/
-void EDSP::WriteScenarioLimitedDependency(FILE* output,
+// WriteScenarioLimitedDependency                                      /*{{{*/
+static void WriteScenarioLimitedDependency(FILE* output,

                                          pkgCache::VerIterator const &Ver,
                                          APT::PackageSet const &pkgset)
 {
                                          pkgCache::VerIterator const &Ver,
                                          APT::PackageSet const &pkgset)
 {


@@ -235,6 +190,52 @@ void EDSP::WriteScenarioLimitedDependency(FILE* output,
       fprintf(output, "Provides: %s\n", provides.c_str()+2);
 }
                                                                        /*}}}*/
       fprintf(output, "Provides: %s\n", provides.c_str()+2);
 }
                                                                        /*}}}*/

+// EDSP::WriteScenario - to the given file descriptor                  /*{{{*/
+bool EDSP::WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress)
+{
+   if (Progress != NULL)
+      Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver"));
+   unsigned long p = 0;
+   std::vector<std::string> archs = APT::Configuration::getArchitectures();
+   for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; ++Pkg)
+   {
+      std::string const arch = Pkg.Arch();
+      if (std::find(archs.begin(), archs.end(), arch) == archs.end())
+        continue;
+      for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver, ++p)
+      {
+        WriteScenarioVersion(Cache, output, Pkg, Ver);
+        WriteScenarioDependency(output, Ver);
+        fprintf(output, "\n");
+        if (Progress != NULL && p % 100 == 0)
+           Progress->Progress(p);
+      }
+   }
+   return true;
+}
+                                                                       /*}}}*/
+// EDSP::WriteLimitedScenario - to the given file descriptor           /*{{{*/
+bool EDSP::WriteLimitedScenario(pkgDepCache &Cache, FILE* output,
+                               APT::PackageSet const &pkgset,
+                               OpProgress *Progress)
+{
+   if (Progress != NULL)
+      Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver"));
+   unsigned long p  = 0;
+   for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg, ++p)
+      for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
+      {
+        WriteScenarioVersion(Cache, output, Pkg, Ver);
+        WriteScenarioLimitedDependency(output, Ver, pkgset);
+        fprintf(output, "\n");
+        if (Progress != NULL && p % 100 == 0)
+           Progress->Progress(p);
+      }
+   if (Progress != NULL)
+      Progress->Done();
+   return true;
+}
+                                                                       /*}}}*/

 // EDSP::WriteRequest - to the given file descriptor                   /*{{{*/
 bool EDSP::WriteRequest(pkgDepCache &Cache, FILE* output, bool const Upgrade,
                        bool const DistUpgrade, bool const AutoRemove,
 // EDSP::WriteRequest - to the given file descriptor                   /*{{{*/
 bool EDSP::WriteRequest(pkgDepCache &Cache, FILE* output, bool const Upgrade,
                        bool const DistUpgrade, bool const AutoRemove,


@@ -365,13 +366,13 @@ bool EDSP::ReadResponse(int const input, pkgDepCache &Cache, OpProgress *Progres
        return true;
 }
                                                                        /*}}}*/
        return true;
 }
                                                                        /*}}}*/

-// EDSP::ReadLine - first line from the given file descriptor          /*{{{*/
+// ReadLine - first line from the given file descriptor                        /*{{{*/

 // ---------------------------------------------------------------------
 /* Little helper method to read a complete line into a string. Similar to
    fgets but we need to use the low-level read() here as otherwise the
    listparser will be confused later on as mixing of fgets and read isn't
    a supported action according to the manpages and results are undefined */
 // ---------------------------------------------------------------------
 /* Little helper method to read a complete line into a string. Similar to
    fgets but we need to use the low-level read() here as otherwise the
    listparser will be confused later on as mixing of fgets and read isn't
    a supported action according to the manpages and results are undefined */

-bool EDSP::ReadLine(int const input, std::string &line) {
+static bool ReadLine(int const input, std::string &line) {

        char one;
        ssize_t data = 0;
        line.erase();
        char one;
        ssize_t data = 0;
        line.erase();


@@ -390,11 +391,11 @@ bool EDSP::ReadLine(int const input, std::string &line) {
        return false;
 }
                                                                        /*}}}*/
        return false;
 }
                                                                        /*}}}*/

-// EDSP::StringToBool - convert yes/no to bool                         /*{{{*/
+// StringToBool - convert yes/no to bool                               /*{{{*/

 // ---------------------------------------------------------------------
 /* we are not as lazy as we are in the global StringToBool as we really
    only accept yes/no here - but we will ignore leading spaces */
 // ---------------------------------------------------------------------
 /* we are not as lazy as we are in the global StringToBool as we really
    only accept yes/no here - but we will ignore leading spaces */

-bool EDSP::StringToBool(char const *answer, bool const defValue) {
+static bool StringToBool(char const *answer, bool const defValue) {

    for (; isspace(*answer) != 0; ++answer);
    if (strncasecmp(answer, "yes", 3) == 0)
       return true;
    for (; isspace(*answer) != 0; ++answer);
    if (strncasecmp(answer, "yes", 3) == 0)
       return true;


@@ -443,11 +444,11 @@ bool EDSP::ReadRequest(int const input, std::list<std::string> &install,
            request = &remove;
         }
         else if (line.compare(0, 8, "Upgrade:") == 0)
            request = &remove;
         }
         else if (line.compare(0, 8, "Upgrade:") == 0)

-           upgrade = EDSP::StringToBool(line.c_str() + 9, false);
+           upgrade = StringToBool(line.c_str() + 9, false);

         else if (line.compare(0, 13, "Dist-Upgrade:") == 0)
         else if (line.compare(0, 13, "Dist-Upgrade:") == 0)

-           distUpgrade = EDSP::StringToBool(line.c_str() + 14, false);
+           distUpgrade = StringToBool(line.c_str() + 14, false);

         else if (line.compare(0, 11, "Autoremove:") == 0)
         else if (line.compare(0, 11, "Autoremove:") == 0)

-           autoRemove = EDSP::StringToBool(line.c_str() + 12, false);
+           autoRemove = StringToBool(line.c_str() + 12, false);

         else if (line.compare(0, 13, "Architecture:") == 0)
            _config->Set("APT::Architecture", line.c_str() + 14);
         else if (line.compare(0, 14, "Architectures:") == 0)
         else if (line.compare(0, 13, "Architecture:") == 0)
            _config->Set("APT::Architecture", line.c_str() + 14);
         else if (line.compare(0, 14, "Architectures:") == 0)

diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index 9e833556ab4935638e0f58d08733f0ecc63e6f19..72b886a319da56dccd7dcf22fa73d0b581a6279a 100644 (file)
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -27,24 +27,8 @@
 class pkgDepCache;
 class OpProgress;
 
 class pkgDepCache;
 class OpProgress;
 

-class EDSP                                                             /*{{{*/
+namespace EDSP                                                         /*{{{*/

 {
 {

-       // we could use pkgCache::DepType and ::Priority, but these would be localized strings…
-       static const char * const PrioMap[];
-       static const char * const DepMap[];
-
-       APT_HIDDEN bool static ReadLine(int const input, std::string &line);
-       APT_HIDDEN bool static StringToBool(char const *answer, bool const defValue);
-
-       APT_HIDDEN void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output,
-                                        pkgCache::PkgIterator const &Pkg,
-                                        pkgCache::VerIterator const &Ver);
-       APT_HIDDEN void static WriteScenarioDependency(FILE* output,
-                                           pkgCache::VerIterator const &Ver);
-       APT_HIDDEN void static WriteScenarioLimitedDependency(FILE* output,
-                                                  pkgCache::VerIterator const &Ver,
-                                                  APT::PackageSet const &pkgset);
-public:

        /** \brief creates the EDSP request stanza
         *
         *  In the EDSP protocol the first thing send to the resolver is a stanza
        /** \brief creates the EDSP request stanza
         *
         *  In the EDSP protocol the first thing send to the resolver is a stanza


@@ -61,7 +45,7 @@ public:
         *
         *  \return true if request was composed successfully, otherwise false
         */
         *
         *  \return true if request was composed successfully, otherwise false
         */

-       bool static WriteRequest(pkgDepCache &Cache, FILE* output,
+       bool WriteRequest(pkgDepCache &Cache, FILE* output,

                                 bool const upgrade = false,
                                 bool const distUpgrade = false,
                                 bool const autoRemove = false,
                                 bool const upgrade = false,
                                 bool const distUpgrade = false,
                                 bool const autoRemove = false,


@@ -84,7 +68,7 @@ public:
         *
         *  \return true if universe was composed successfully, otherwise false
         */
         *
         *  \return true if universe was composed successfully, otherwise false
         */

-       bool static WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress = NULL);
+       bool WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress = NULL);

 
        /** \brief creates a limited scenario representing the package universe
         *
 
        /** \brief creates a limited scenario representing the package universe
         *


@@ -101,7 +85,7 @@ public:
         *
         *  \return true if universe was composed successfully, otherwise false
         */
         *
         *  \return true if universe was composed successfully, otherwise false
         */

-       bool static WriteLimitedScenario(pkgDepCache &Cache, FILE* output,
+       bool WriteLimitedScenario(pkgDepCache &Cache, FILE* output,

                                         APT::PackageSet const &pkgset,
                                         OpProgress *Progress = NULL);
 
                                         APT::PackageSet const &pkgset,
                                         OpProgress *Progress = NULL);
 


@@ -118,7 +102,7 @@ public:
         *
         *  \return true if a solution is found and applied correctly, otherwise false
         */
         *
         *  \return true if a solution is found and applied correctly, otherwise false
         */

-       bool static ReadResponse(int const input, pkgDepCache &Cache, OpProgress *Progress = NULL);
+       bool ReadResponse(int const input, pkgDepCache &Cache, OpProgress *Progress = NULL);

 
        /** \brief search and read the request stanza for action later
         *
 
        /** \brief search and read the request stanza for action later
         *


@@ -136,7 +120,7 @@ public:
         *
         *  \return true if the request could be found and worked on, otherwise false
         */
         *
         *  \return true if the request could be found and worked on, otherwise false
         */

-       bool static ReadRequest(int const input, std::list<std::string> &install,
+       bool ReadRequest(int const input, std::list<std::string> &install,

                        std::list<std::string> &remove, bool &upgrade,
                        bool &distUpgrade, bool &autoRemove);
 
                        std::list<std::string> &remove, bool &upgrade,
                        bool &distUpgrade, bool &autoRemove);
 


@@ -152,7 +136,7 @@ public:
         *
         *  \return false if the request couldn't be applied, true otherwise
         */
         *
         *  \return false if the request couldn't be applied, true otherwise
         */

-       bool static ApplyRequest(std::list<std::string> const &install,
+       bool ApplyRequest(std::list<std::string> const &install,

                                 std::list<std::string> const &remove,
                                 pkgDepCache &Cache);
 
                                 std::list<std::string> const &remove,
                                 pkgDepCache &Cache);
 


@@ -168,7 +152,7 @@ public:
         *
         *  \return true if solution could be written, otherwise false
         */
         *
         *  \return true if solution could be written, otherwise false
         */

-       bool static WriteSolution(pkgDepCache &Cache, FILE* output);
+       bool WriteSolution(pkgDepCache &Cache, FILE* output);

 
        /** \brief sends a progress report
         *
 
        /** \brief sends a progress report
         *


@@ -176,7 +160,7 @@ public:
         *  \param message the solver wants the user to see
         *  \param output the front-end listens for progress report
         */
         *  \param message the solver wants the user to see
         *  \param output the front-end listens for progress report
         */

-       bool static WriteProgress(unsigned short const percent, const char* const message, FILE* output);
+       bool WriteProgress(unsigned short const percent, const char* const message, FILE* output);

 
        /** \brief sends an error report
         *
 
        /** \brief sends an error report
         *


@@ -193,7 +177,7 @@ public:
         *  \param message is free form text to describe the error
         *  \param output the front-end listens for error messages
         */
         *  \param message is free form text to describe the error
         *  \param output the front-end listens for error messages
         */

-       bool static WriteError(char const * const uuid, std::string const &message, FILE* output);
+       bool WriteError(char const * const uuid, std::string const &message, FILE* output);

 
 
        /** \brief executes the given solver and returns the pipe ends
 
 
        /** \brief executes the given solver and returns the pipe ends


@@ -207,8 +191,8 @@ public:
         *
         *  \return PID of the started solver or 0 if failure occurred
         */
         *
         *  \return PID of the started solver or 0 if failure occurred
         */

-       pid_t static ExecuteSolver(const char* const solver, int * const solver_in, int * const solver_out, bool /*overload*/);
-       APT_DEPRECATED bool static ExecuteSolver(const char* const solver, int *solver_in, int *solver_out);
+       pid_t ExecuteSolver(const char* const solver, int * const solver_in, int * const solver_out, bool /*overload*/);
+       APT_DEPRECATED bool ExecuteSolver(const char* const solver, int *solver_in, int *solver_out);

 
        /** \brief call an external resolver to handle the request
         *
 
        /** \brief call an external resolver to handle the request
         *


@@ -224,7 +208,7 @@ public:
         *  \return true if the solver has successfully solved the problem,
         *  otherwise false
         */
         *  \return true if the solver has successfully solved the problem,
         *  otherwise false
         */

-       bool static ResolveExternal(const char* const solver, pkgDepCache &Cache,
+       bool ResolveExternal(const char* const solver, pkgDepCache &Cache,

                                    bool const upgrade, bool const distUpgrade,
                                    bool const autoRemove, OpProgress *Progress = NULL);
 };
                                    bool const upgrade, bool const distUpgrade,
                                    bool const autoRemove, OpProgress *Progress = NULL);
 };

diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index a2ec0a19bfcc4d2bdcea412ae7df6af3e54390ab..5d9383e94a9f35a01232e1e1de7426d73cb2ed36 100644 (file)
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -81,3 +81,5 @@ const pkgIndexFile::Type *edspIndex::GetType() const
    return &_apt_Universe;
 }
                                                                        /*}}}*/
    return &_apt_Universe;
 }
                                                                        /*}}}*/

+
+edspIndex::~edspIndex() {}

diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h
index 8c18d8cbdf9ce816f57fba774830febda8a10330..0f63b7b2a5a577d8522670e50b600df81086256b 100644 (file)
--- a/apt-pkg/edsp/edspindexfile.h
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -30,6 +30,7 @@ class APT_HIDDEN edspIndex : public debStatusIndex
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
 
    edspIndex(std::string File);
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
 
    edspIndex(std::string File);

+   virtual ~edspIndex();

 };
 
 #endif
 };
 
 #endif

diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc
index d62abe709505ff410e201377dc895d3355171a68..d1c0cf7e8d95a911d7d178f80619e9bd39360508 100644 (file)
--- a/apt-pkg/edsp/edsplistparser.cc
+++ b/apt-pkg/edsp/edsplistparser.cc
@@ -92,3 +92,5 @@ APT_CONST bool edspListParser::LoadReleaseInfo(pkgCache::RlsFileIterator & /*Fil
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+
+edspListParser::~edspListParser() {}

diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h
index abe2ef139ea7f5b4645a82df4a791269bc0540ab..ef5179e68e5bba30a80b45510d59e7ddf8399799 100644 (file)
--- a/apt-pkg/edsp/edsplistparser.h
+++ b/apt-pkg/edsp/edsplistparser.h
@@ -27,6 +27,7 @@ class FileFd;
 
 class APT_HIDDEN edspListParser : public debListParser
 {
 
 class APT_HIDDEN edspListParser : public debListParser
 {

+   void *d;

    public:
    virtual bool NewVersion(pkgCache::VerIterator &Ver);
    virtual std::string Description();
    public:
    virtual bool NewVersion(pkgCache::VerIterator &Ver);
    virtual std::string Description();


@@ -38,6 +39,7 @@ class APT_HIDDEN edspListParser : public debListParser
                        std::string const &section);
 
    edspListParser(FileFd *File, std::string const &Arch = "");
                        std::string const &section);
 
    edspListParser(FileFd *File, std::string const &Arch = "");

+   virtual ~edspListParser();

 
    protected:
    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
 
    protected:
    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);

diff --git a/apt-pkg/edsp/edspsystem.h b/apt-pkg/edsp/edspsystem.h
index 06a63f40c265b5f10bc471260395e4ca6a706203..1e27d2cb03d983fed5bbae1c1bfb59a307bcfc42 100644 (file)
--- a/apt-pkg/edsp/edspsystem.h
+++ b/apt-pkg/edsp/edspsystem.h
@@ -42,7 +42,7 @@ class APT_HIDDEN edspSystem : public pkgSystem
                          pkgIndexFile *&Found) const;
 
    edspSystem();
                          pkgIndexFile *&Found) const;
 
    edspSystem();

-   ~edspSystem();
+   virtual ~edspSystem();

 };
 
 #endif
 };
 
 #endif

diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 461aa42172fa6c41e6a219e3f239082129ffdeff..120d061ad942816bce25739db05ec0fd8750b6ba 100644 (file)
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -770,4 +770,14 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,  /*{{{*/
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

+IndexCopy::IndexCopy() {}

 APT_CONST IndexCopy::~IndexCopy() {}
 APT_CONST IndexCopy::~IndexCopy() {}

+
+PackageCopy::PackageCopy() : IndexCopy() {}
+APT_CONST PackageCopy::~PackageCopy() {}
+SourceCopy::SourceCopy() : IndexCopy() {}
+APT_CONST SourceCopy::~SourceCopy() {}
+TranslationsCopy::TranslationsCopy() {}
+APT_CONST TranslationsCopy::~TranslationsCopy() {}
+SigVerify::SigVerify() {}
+APT_CONST SigVerify::~SigVerify() {}

diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index 729b0c8cb1a3ba89dd2a62994e5dd584fff1cc52..7ee162542a78a8d1c7274159b2044b9fde387a1b 100644 (file)
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: indexcopy.h,v 1.3 2001/05/27 04:46:54 jgg Exp $

 /* ######################################################################
 
    Index Copying - Aid for copying and verifying the index files
 /* ######################################################################
 
    Index Copying - Aid for copying and verifying the index files


@@ -54,39 +53,52 @@ class IndexCopy                                                             /*{{{*/
 
    bool CopyPackages(std::string CDROM,std::string Name,std::vector<std::string> &List,
                     pkgCdromStatus *log);
 
    bool CopyPackages(std::string CDROM,std::string Name,std::vector<std::string> &List,
                     pkgCdromStatus *log);

+   IndexCopy();

    virtual ~IndexCopy();
 };
                                                                        /*}}}*/
 class PackageCopy : public IndexCopy                                   /*{{{*/
 {
    virtual ~IndexCopy();
 };
                                                                        /*}}}*/
 class PackageCopy : public IndexCopy                                   /*{{{*/
 {

+   void *d;

    protected:
    protected:

-   
+

    virtual bool GetFile(std::string &Filename,unsigned long long &Size);
    virtual bool RewriteEntry(FileFd &Target, std::string const &File);
    virtual const char *GetFileName() {return "Packages";};
    virtual const char *Type() {return "Package";};
    virtual bool GetFile(std::string &Filename,unsigned long long &Size);
    virtual bool RewriteEntry(FileFd &Target, std::string const &File);
    virtual const char *GetFileName() {return "Packages";};
    virtual const char *Type() {return "Package";};

-   
+
+   public:
+   PackageCopy();
+   virtual ~PackageCopy();

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

+   void *d;

    protected:
    
    virtual bool GetFile(std::string &Filename,unsigned long long &Size);
    virtual bool RewriteEntry(FileFd &Target, std::string const &File);
    virtual const char *GetFileName() {return "Sources";};
    virtual const char *Type() {return "Source";};
    protected:
    
    virtual bool GetFile(std::string &Filename,unsigned long long &Size);
    virtual bool RewriteEntry(FileFd &Target, std::string const &File);
    virtual const char *GetFileName() {return "Sources";};
    virtual const char *Type() {return "Source";};

-   
+
+   public:
+   SourceCopy();
+   virtual ~SourceCopy();

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

+   void *d;

    protected:
    pkgTagSection *Section;
 
    public:
    bool CopyTranslations(std::string CDROM,std::string Name,std::vector<std::string> &List,
                         pkgCdromStatus *log);
    protected:
    pkgTagSection *Section;
 
    public:
    bool CopyTranslations(std::string CDROM,std::string Name,std::vector<std::string> &List,
                         pkgCdromStatus *log);

+
+   TranslationsCopy();
+   virtual ~TranslationsCopy();

 };
                                                                        /*}}}*/
 class SigVerify                                                                /*{{{*/
 };
                                                                        /*}}}*/
 class SigVerify                                                                /*{{{*/


@@ -106,6 +118,9 @@ class SigVerify                                                             /*{{{*/
                       int const &statusfd, int fd[2]);
    APT_DEPRECATED static bool RunGPGV(std::string const &File, std::string const &FileOut,
                              int const &statusfd = -1);
                       int const &statusfd, int fd[2]);
    APT_DEPRECATED static bool RunGPGV(std::string const &File, std::string const &FileOut,
                              int const &statusfd = -1);

+
+   SigVerify();
+   virtual ~SigVerify();

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

diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index 605bbeb4721ed5fea9ae82847d34115bbda5f103..b3c5cf229449c9e2b93ad1606ae7c4d5dfb06285 100644 (file)
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -227,3 +227,6 @@ bool pkgIndexTargetFile::Exists() const                                     /*{{{*/
    return FileExists(IndexFileName());
 }
                                                                        /*}}}*/
    return FileExists(IndexFileName());
 }
                                                                        /*}}}*/

+
+APT_CONST pkgIndexFile::~pkgIndexFile() {}
+APT_CONST pkgIndexTargetFile::~pkgIndexTargetFile() {}

diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 042e5c2f715882f61f6a7168048025b9dca22a85..c51879bb895c760c172fa8bc6f34f94816d772e6 100644 (file)
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: indexfile.h,v 1.6.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    Index File - Abstraction for an index of archive/source file.
 /* ######################################################################
 
    Index File - Abstraction for an index of archive/source file.


@@ -90,6 +89,7 @@ class IndexTarget                                                     /*{{{*/
 
 class pkgIndexFile
 {
 
 class pkgIndexFile
 {

+   void *d;

    protected:
    bool Trusted;
 
    protected:
    bool Trusted;
 


@@ -145,11 +145,12 @@ class pkgIndexFile
    bool IsTrusted() const { return Trusted; };
 
    pkgIndexFile(bool Trusted);
    bool IsTrusted() const { return Trusted; };
 
    pkgIndexFile(bool Trusted);

-   virtual ~pkgIndexFile() {};
+   virtual ~pkgIndexFile();

 };
 
 class pkgIndexTargetFile : public pkgIndexFile
 {
 };
 
 class pkgIndexTargetFile : public pkgIndexFile
 {

+   void *d;

 protected:
    IndexTarget const Target;
 
 protected:
    IndexTarget const Target;
 


@@ -162,6 +163,7 @@ public:
    virtual unsigned long Size() const;
 
    pkgIndexTargetFile(IndexTarget const &Target, bool const Trusted);
    virtual unsigned long Size() const;
 
    pkgIndexTargetFile(IndexTarget const &Target, bool const Trusted);

+   virtual ~pkgIndexTargetFile();

 };
 
 #endif
 };
 
 #endif

diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index 6ed5f0c2b1dadc7a32135400c6b82c0ad752f09f..f7dfa3235176ebecb1c3727344ddb80ea1c3443c 100644 (file)
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -1,7 +1,4 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-

-// Description                                                         /*{{{*/
-// $Id: indexrecords.h,v 1.1.2.1 2003/12/24 23:09:17 mdz Exp $
-                                                                       /*}}}*/

 #ifndef PKGLIB_INDEXRECORDS_H
 #define PKGLIB_INDEXRECORDS_H
 
 #ifndef PKGLIB_INDEXRECORDS_H
 #define PKGLIB_INDEXRECORDS_H
 

diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc
index 5ea8bf4d025338a6a83ceb6eadf6931087787d41..ee2ef683fed48461e2e7d744028107e880d392b0 100644 (file)
--- a/apt-pkg/install-progress.cc
+++ b/apt-pkg/install-progress.cc
@@ -69,6 +69,7 @@ PackageManagerProgressFd::PackageManagerProgressFd(int progress_fd)
 {
    OutStatusFd = progress_fd;
 }
 {
    OutStatusFd = progress_fd;
 }

+PackageManagerProgressFd::~PackageManagerProgressFd() {}

 
 void PackageManagerProgressFd::WriteToStatusFd(std::string s)
 {
 
 void PackageManagerProgressFd::WriteToStatusFd(std::string s)
 {


@@ -157,6 +158,7 @@ PackageManagerProgressDeb822Fd::PackageManagerProgressDeb822Fd(int progress_fd)
 {
    OutStatusFd = progress_fd;
 }
 {
    OutStatusFd = progress_fd;
 }

+PackageManagerProgressDeb822Fd::~PackageManagerProgressDeb822Fd() {}

 
 void PackageManagerProgressDeb822Fd::WriteToStatusFd(std::string s)
 {
 
 void PackageManagerProgressDeb822Fd::WriteToStatusFd(std::string s)
 {


@@ -433,6 +435,10 @@ bool PackageManagerText::StatusChanged(std::string PackageName,
    return true;
 }
 
    return true;
 }
 

+PackageManagerText::PackageManagerText() : PackageManager() {}
+PackageManagerText::~PackageManagerText() {}
+
+

 
 
 } // namespace progress
 
 
 } // namespace progress

diff --git a/apt-pkg/install-progress.h b/apt-pkg/install-progress.h
index d8b4a5c8265b51b839ab8ec015985ed3295cb072..a4c5daf7f682fad0d59f9a433b9e0d9637764a0a 100644 (file)
--- a/apt-pkg/install-progress.h
+++ b/apt-pkg/install-progress.h
@@ -61,6 +61,7 @@ namespace Progress {
 
  class PackageManagerProgressFd : public PackageManager
  {
 
  class PackageManagerProgressFd : public PackageManager
  {

+    void *d;

  protected:
     int OutStatusFd;
     int StepsDone;
  protected:
     int OutStatusFd;
     int StepsDone;


@@ -69,6 +70,7 @@ namespace Progress {
 
  public:
     PackageManagerProgressFd(int progress_fd);
 
  public:
     PackageManagerProgressFd(int progress_fd);

+    virtual ~PackageManagerProgressFd();

 
     virtual void StartDpkg();
     virtual void Stop();
 
     virtual void StartDpkg();
     virtual void Stop();


@@ -90,6 +92,7 @@ namespace Progress {
 
  class PackageManagerProgressDeb822Fd : public PackageManager
  {
 
  class PackageManagerProgressDeb822Fd : public PackageManager
  {

+    void *d;

  protected:
     int OutStatusFd;
     int StepsDone;
  protected:
     int OutStatusFd;
     int StepsDone;


@@ -98,6 +101,7 @@ namespace Progress {
 
  public:
     PackageManagerProgressDeb822Fd(int progress_fd);
 
  public:
     PackageManagerProgressDeb822Fd(int progress_fd);

+    virtual ~PackageManagerProgressDeb822Fd();

 
     virtual void StartDpkg();
     virtual void Stop();
 
     virtual void StartDpkg();
     virtual void Stop();


@@ -118,6 +122,7 @@ namespace Progress {
 
  class PackageManagerFancy : public PackageManager
  {
 
  class PackageManagerFancy : public PackageManager
  {

+    void *d;

  private:
     APT_HIDDEN static void staticSIGWINCH(int);
     static std::vector<PackageManagerFancy*> instances;
  private:
     APT_HIDDEN static void staticSIGWINCH(int);
     static std::vector<PackageManagerFancy*> instances;


@@ -138,7 +143,7 @@ namespace Progress {
 
  public:
     PackageManagerFancy();
 
  public:
     PackageManagerFancy();

-    ~PackageManagerFancy();
+    virtual ~PackageManagerFancy();

     virtual void Start(int child_pty=-1);
     virtual void Stop();
     virtual bool StatusChanged(std::string PackageName,
     virtual void Start(int child_pty=-1);
     virtual void Stop();
     virtual bool StatusChanged(std::string PackageName,


@@ -153,11 +158,15 @@ namespace Progress {
 
  class PackageManagerText : public PackageManager
  {
 
  class PackageManagerText : public PackageManager
  {

+    void *d;

  public:
     virtual bool StatusChanged(std::string PackageName,
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);
  public:
     virtual bool StatusChanged(std::string PackageName,
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);

+
+    PackageManagerText();
+    virtual ~PackageManagerText();

  };
 
 
  };
 
 

diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index e1810fb278817527573f6e77dca94aea0dd9deec..760c7dd158e93d926fb03311eee235dd3d42b2a5 100644 (file)
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -28,6 +28,7 @@ class OpProgress;
 
 class metaIndex
 {
 
 class metaIndex
 {

+   void *d;

    protected:
    std::vector <pkgIndexFile *> *Indexes;
    const char *Type;
    protected:
    std::vector <pkgIndexFile *> *Indexes;
    const char *Type;

diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h
index b8bad81b379359a61a257161401f6c1d6bfc0d6f..29ef79b84f3ba21d99a777863d060808e320d13f 100644 (file)
--- a/apt-pkg/orderlist.h
+++ b/apt-pkg/orderlist.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: orderlist.h,v 1.9 2001/02/20 07:03:17 jgg Exp $

 /* ######################################################################
 
    Order List - Represents and Manipulates an ordered list of packages.
 /* ######################################################################
 
    Order List - Represents and Manipulates an ordered list of packages.


@@ -25,6 +24,7 @@
 class pkgDepCache;
 class pkgOrderList : protected pkgCache::Namespace
 {
 class pkgDepCache;
 class pkgOrderList : protected pkgCache::Namespace
 {

+   void *d;

    protected:
 
    pkgDepCache &Cache;   
    protected:
 
    pkgDepCache &Cache;   


@@ -123,7 +123,7 @@ class pkgOrderList : protected pkgCache::Namespace
    int Score(PkgIterator Pkg);
 
    pkgOrderList(pkgDepCache *Cache);
    int Score(PkgIterator Pkg);
 
    pkgOrderList(pkgDepCache *Cache);

-   ~pkgOrderList();
+   virtual ~pkgOrderList();

 };
 
 #endif
 };
 
 #endif

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index fce0ad301b42dcb3d038979f7b54eb0d6554b7e2..60414ae1cb2c2ab0f5395bf1c66bf0dd24513a10 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: packagemanager.h,v 1.14 2001/05/07 04:24:08 jgg Exp $

 /* ######################################################################
 
    Package Manager - Abstacts the package manager
 /* ######################################################################
 
    Package Manager - Abstacts the package manager


@@ -146,6 +145,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    virtual ~pkgPackageManager();
 
    private:
    virtual ~pkgPackageManager();
 
    private:

+   void *d;

    enum APT_HIDDEN SmartAction { UNPACK_IMMEDIATE, UNPACK, CONFIGURE };
    APT_HIDDEN bool NonLoopingSmart(SmartAction const action, pkgCache::PkgIterator &Pkg,
       pkgCache::PkgIterator DepPkg, int const Depth, bool const PkgLoop,
    enum APT_HIDDEN SmartAction { UNPACK_IMMEDIATE, UNPACK, CONFIGURE };
    APT_HIDDEN bool NonLoopingSmart(SmartAction const action, pkgCache::PkgIterator &Pkg,
       pkgCache::PkgIterator DepPkg, int const Depth, bool const PkgLoop,

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 9fe38210869dcd8f94cbcb94300c61e1070669f0..dc7698edd5c5bbce2ffd295a6f02a98a4fa82334 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -1059,3 +1059,5 @@ bool pkgCache::PrvIterator::IsMultiArchImplicit() const
    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/

+
+pkgCache::~pkgCache() {}

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 3cc85f1e83d70ec9dcb1053c9c7fc233bc8dd267..b7bf26c2acba67ba136ab15ea17228aaeb731af2 100644 (file)
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -266,11 +266,12 @@ class pkgCache                                                            /*{{{*/
    static const char *CompTypeDeb(unsigned char Comp) APT_CONST;
    static const char *CompType(unsigned char Comp) APT_CONST;
    static const char *DepType(unsigned char Dep);
    static const char *CompTypeDeb(unsigned char Comp) APT_CONST;
    static const char *CompType(unsigned char Comp) APT_CONST;
    static const char *DepType(unsigned char Dep);

-   
+

    pkgCache(MMap *Map,bool DoMap = true);
    pkgCache(MMap *Map,bool DoMap = true);

-   virtual ~pkgCache() {}
+   virtual ~pkgCache();

 
 private:
 
 private:

+   void *d;

    bool MultiArchEnabled;
    APT_HIDDEN PkgIterator SingleArchFindPkg(const std::string &Name);
 };
    bool MultiArchEnabled;
    APT_HIDDEN PkgIterator SingleArchFindPkg(const std::string &Name);
 };

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index ea02059447b8089c60b3ef8f6188167caf8b6347..54e2ef19c07b80c6fbffe445bb872f3377ddc4ad 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -1720,3 +1720,6 @@ bool pkgCacheGenerator::FinishCache(OpProgress * /*Progress*/)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+
+pkgCacheGenerator::ListParser::ListParser() : Owner(NULL), OldDepLast(NULL), FoundFileDeps(false) {}
+pkgCacheGenerator::ListParser::~ListParser() {}

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index ade93795bf31a3dc9ac591ef2ca2e1c8d064f391..3c1a40972238045b63088a2721ba6818cf493620 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgcachegen.h,v 1.19 2002/07/08 03:13:30 jgg Exp $

 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.


@@ -123,9 +122,10 @@ class APT_HIDDEN pkgCacheGenerator                                 /*{{{*/
    void ReMap(void const * const oldMap, void const * const newMap);
 
    pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress);
    void ReMap(void const * const oldMap, void const * const newMap);
 
    pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress);

-   ~pkgCacheGenerator();
+   virtual ~pkgCacheGenerator();

 
    private:
 
    private:

+   void *d;

    APT_HIDDEN bool MergeListGroup(ListParser &List, std::string const &GrpName);
    APT_HIDDEN bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg);
    APT_HIDDEN bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,
    APT_HIDDEN bool MergeListGroup(ListParser &List, std::string const &GrpName);
    APT_HIDDEN bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg);
    APT_HIDDEN bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,


@@ -151,7 +151,9 @@ class APT_HIDDEN pkgCacheGenerator::ListParser
 
    // Flag file dependencies
    bool FoundFileDeps;
 
    // Flag file dependencies
    bool FoundFileDeps;

-      
+
+   void *d;
+

    protected:
 
    inline map_stringitem_t StoreString(pkgCacheGenerator::StringType const type, std::string const &S) {return Owner->StoreString(type, S);};
    protected:
 
    inline map_stringitem_t StoreString(pkgCacheGenerator::StringType const type, std::string const &S) {return Owner->StoreString(type, S);};


@@ -182,10 +184,7 @@ class APT_HIDDEN pkgCacheGenerator::ListParser
     * \param Hash of the currently parsed version
     * \param Ver to compare with
     */
     * \param Hash of the currently parsed version
     * \param Ver to compare with
     */

-#if APT_PKG_ABI >= 413
-   virtual
-#endif
-      APT_PURE bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver);
+   virtual bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver);

    virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
                           pkgCache::VerIterator &Ver) = 0;
    virtual map_filesize_t Offset() = 0;
    virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
                           pkgCache::VerIterator &Ver) = 0;
    virtual map_filesize_t Offset() = 0;


@@ -197,8 +196,8 @@ class APT_HIDDEN pkgCacheGenerator::ListParser
    virtual bool CollectFileProvides(pkgCache &/*Cache*/,
                                    pkgCache::VerIterator &/*Ver*/) {return true;};
 
    virtual bool CollectFileProvides(pkgCache &/*Cache*/,
                                    pkgCache::VerIterator &/*Ver*/) {return true;};
 

-   ListParser() : Owner(NULL), OldDepLast(NULL), FoundFileDeps(false) {};
-   virtual ~ListParser() {};
+   ListParser();
+   virtual ~ListParser();

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

diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index 859af3a0921a0bc58d1d663c3f0fbaaf5a2fa9a3..87c965f87cc47a79aa671adab83cc9e2c5b42828 100644 (file)
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -76,3 +76,6 @@ pkgRecords::Parser &pkgRecords::Lookup(pkgCache::DescFileIterator const &Desc)
    return *Files[Desc.File()->ID];
 }
                                                                        /*}}}*/
    return *Files[Desc.File()->ID];
 }
                                                                        /*}}}*/

+
+pkgRecords::Parser::Parser() {}
+pkgRecords::Parser::~Parser() {}

diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index bcc05baba8054727f1e263aaf227498644134619..66eb17857e829fc83b6f889f96fb9d82f23b0757 100644 (file)
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -43,7 +43,7 @@ class pkgRecords                                                      /*{{{*/
 
    // Construct destruct
    pkgRecords(pkgCache &Cache);
 
    // Construct destruct
    pkgRecords(pkgCache &Cache);

-   ~pkgRecords();
+   virtual ~pkgRecords();

 };
                                                                        /*}}}*/
 class pkgRecords::Parser                                               /*{{{*/
 };
                                                                        /*}}}*/
 class pkgRecords::Parser                                               /*{{{*/


@@ -106,10 +106,12 @@ class pkgRecords::Parser                                          /*{{{*/
 
    // The record in binary form
    virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;};
 
    // The record in binary form
    virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;};

-   
-   virtual ~Parser() {};
+
+   Parser();
+   virtual ~Parser();

 
    private:
 
    private:

+   void *d;

    APT_HIDDEN std::string GetHashFromHashes(char const * const type) const
    {
       HashStringList const hashes = Hashes();
    APT_HIDDEN std::string GetHashFromHashes(char const * const type) const
    {
       HashStringList const hashes = Hashes();

diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc
index 14d090c7a64f680ef8b2d98e15c2b263e4e3fd82..98daeb2b9badf31b47d0e197f8260ecf17d3b614 100644 (file)
--- a/apt-pkg/pkgsystem.cc
+++ b/apt-pkg/pkgsystem.cc
@@ -45,3 +45,5 @@ APT_PURE pkgSystem *pkgSystem::GetSystem(const char *Label)
    return 0;   
 }
                                                                        /*}}}*/
    return 0;   
 }
                                                                        /*}}}*/

+
+pkgSystem::~pkgSystem() {}

diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h
index f88ffa7c82ab2980a55328e9fd56837b0e7f1883..3a447da8bc318510597bae233f016856f249b83d 100644 (file)
--- a/apt-pkg/pkgsystem.h
+++ b/apt-pkg/pkgsystem.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgsystem.h,v 1.6 2002/11/11 06:55:50 doogie Exp $

 /* ######################################################################
 
    System - Abstraction for running on different systems.
 /* ######################################################################
 
    System - Abstraction for running on different systems.


@@ -93,7 +92,9 @@ class pkgSystem
    };
    
    pkgSystem();
    };
    
    pkgSystem();

-   virtual ~pkgSystem() {};
+   virtual ~pkgSystem();
+   private:
+   void *d;

 };
 
 // The environment we are operating in.
 };
 
 // The environment we are operating in.

diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index bd40ad2d9ea5b5b0101cdda04943edfcc837e604..6da6ed606580d6ccce748b4cc4e87e5d5a91eb09 100644 (file)
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -439,3 +439,5 @@ bool ReadPinFile(pkgPolicy &Plcy,string File)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+
+pkgPolicy::~pkgPolicy() {delete [] PFPriority; delete [] Pins;}

diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index f15d8c0a019e8bcf8c748235651b26101a2b82b3..c4b1cbaddf3caa285e6a58c2e2774f26423be2e9 100644 (file)
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: policy.h,v 1.4 2001/05/07 04:24:08 jgg Exp $

 /* ######################################################################
 
    Package Version Policy implementation
 /* ######################################################################
 
    Package Version Policy implementation


@@ -85,7 +84,9 @@ class pkgPolicy : public pkgDepCache::Policy
    bool InitDefaults();
    
    pkgPolicy(pkgCache *Owner);
    bool InitDefaults();
    
    pkgPolicy(pkgCache *Owner);

-   virtual ~pkgPolicy() {delete [] PFPriority; delete [] Pins;};
+   virtual ~pkgPolicy();
+   private:
+   void *d;

 };
 
 bool ReadPinFile(pkgPolicy &Plcy, std::string File = "");
 };
 
 bool ReadPinFile(pkgPolicy &Plcy, std::string File = "");

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 9983575092f25d4fbb337104b28c028464b680b3..c92643829f952242042831d4f7708338360c36e3 100644 (file)
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: sourcelist.h,v 1.12.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    SourceList - Manage a list of sources
 /* ######################################################################
 
    SourceList - Manage a list of sources


@@ -54,6 +53,7 @@ class metaIndex;
 
 class pkgSourceList
 {
 
 class pkgSourceList
 {

+   void *d;

    public:
 
    // List of supported source list types
    public:
 
    // List of supported source list types


@@ -118,7 +118,7 @@ class pkgSourceList
 
    pkgSourceList();
    pkgSourceList(std::string File);
 
    pkgSourceList();
    pkgSourceList(std::string File);

-   ~pkgSourceList();      
+   virtual ~pkgSourceList();

 };
 
 #endif
 };
 
 #endif

diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index c931e17b72f24f4865b2ba5572a5d25bdab75397..dda66ce4886fd665a98fe3201f49740792cb6489 100644 (file)
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: srcrecords.h,v 1.8.2.1 2003/12/26 16:27:34 mdz Exp $

 /* ######################################################################
    
    Source Package Records - Allows access to source package records
 /* ######################################################################
    
    Source Package Records - Allows access to source package records

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 1189545419caa3733c35f2eab50431598fe295cd..24eda02f75868a5235f19bd0b038d11c7329e9cb 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: tagfile.h,v 1.20 2003/05/19 17:13:57 doogie Exp $

 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information


@@ -47,7 +46,6 @@ class pkgTagSection
    APT_DEPRECATED unsigned int TagCount;
 #endif
 
    APT_DEPRECATED unsigned int TagCount;
 #endif
 

-   // dpointer placeholder (for later in case we need it)

    pkgTagSectionPrivate *d;
 
    protected:
    pkgTagSectionPrivate *d;
 
    protected:

diff --git a/apt-pkg/version.cc b/apt-pkg/version.cc
index 29bee46da0b396be0eb88acb5d6561dce7a62c58..f32d39a699b5b91e74bbc2e28086af42053d7860 100644 (file)
--- a/apt-pkg/version.cc
+++ b/apt-pkg/version.cc
@@ -40,3 +40,6 @@ pkgVersioningSystem *pkgVersioningSystem::GetVS(const char *Label)
    return 0;
 }
                                                                        /*}}}*/
    return 0;
 }
                                                                        /*}}}*/

+
+
+pkgVersioningSystem::~pkgVersioningSystem() {}

diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index d98809f7e1ddb74333c0ac7b43aeb033b9b9bcdf..5110ecaa7d9f8d0ed4e11dd1534209faca6599f4 100644 (file)
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -55,7 +55,7 @@ class pkgVersioningSystem
    APT_MKSTRCMP(CmpReleaseVer,DoCmpReleaseVer);
    
    pkgVersioningSystem();
    APT_MKSTRCMP(CmpReleaseVer,DoCmpReleaseVer);
    
    pkgVersioningSystem();

-   virtual ~pkgVersioningSystem() {};
+   virtual ~pkgVersioningSystem();

 };
 
 #endif
 };
 
 #endif

diff --git a/test/libapt/acqprogress_test.cc b/test/libapt/acqprogress_test.cc
index c634733d4de86da025976f442d8d26953a3580ea..dc31423fc9e25dadef50f45b9c909e385cef0295 100644 (file)
--- a/test/libapt/acqprogress_test.cc
+++ b/test/libapt/acqprogress_test.cc
@@ -25,21 +25,23 @@ TEST(AcqProgress, IMSHit)
    AcqTextStatus Stat(out, width, 0);
    Stat.Start();
 
    AcqTextStatus Stat(out, width, 0);
    Stat.Start();
 

+   pkgAcquire Acq(&Stat);

    pkgAcquire::ItemDesc hit;
    hit.URI = "http://example.org/file";
    hit.Description = "Example File from example.org";
    hit.ShortDesc = "Example File";
    pkgAcquire::ItemDesc hit;
    hit.URI = "http://example.org/file";
    hit.Description = "Example File from example.org";
    hit.ShortDesc = "Example File";

-   hit.Owner = NULL;
+   TestItem hitO(&Acq);
+   hit.Owner = &hitO;

 
    EXPECT_EQ("", out.str());
    Stat.IMSHit(hit);
 
    EXPECT_EQ("", out.str());
    Stat.IMSHit(hit);

-   EXPECT_EQ("Hit Example File from example.org\n", out.str());
+   EXPECT_EQ("Hit:1 Example File from example.org\n", out.str());

    Stat.IMSHit(hit);
    Stat.IMSHit(hit);

-   EXPECT_EQ("Hit Example File from example.org\n"
-            "Hit Example File from example.org\n", out.str());
+   EXPECT_EQ("Hit:1 Example File from example.org\n"
+            "Hit:1 Example File from example.org\n", out.str());

    Stat.Stop();
    Stat.Stop();

-   EXPECT_EQ("Hit Example File from example.org\n"
-            "Hit Example File from example.org\n", out.str());
+   EXPECT_EQ("Hit:1 Example File from example.org\n"
+            "Hit:1 Example File from example.org\n", out.str());

 }
 TEST(AcqProgress, FetchNoFileSize)
 {
 }
 TEST(AcqProgress, FetchNoFileSize)
 {


@@ -61,10 +63,10 @@ TEST(AcqProgress, FetchNoFileSize)
    EXPECT_EQ("Get:1 Example File from example.org\n", out.str());
    Stat.Fetch(fetch);
    EXPECT_EQ("Get:1 Example File from example.org\n"
    EXPECT_EQ("Get:1 Example File from example.org\n", out.str());
    Stat.Fetch(fetch);
    EXPECT_EQ("Get:1 Example File from example.org\n"

-            "Get:2 Example File from example.org\n", out.str());
+            "Get:1 Example File from example.org\n", out.str());

    Stat.Stop();
    EXPECT_EQ("Get:1 Example File from example.org\n"
    Stat.Stop();
    EXPECT_EQ("Get:1 Example File from example.org\n"

-            "Get:2 Example File from example.org\n", out.str());
+            "Get:1 Example File from example.org\n", out.str());

 }
 TEST(AcqProgress, FetchFileSize)
 {
 }
 TEST(AcqProgress, FetchFileSize)
 {


@@ -88,10 +90,10 @@ TEST(AcqProgress, FetchFileSize)
    fetchO.FileSize = 42;
    Stat.Fetch(fetch);
    EXPECT_EQ("Get:1 Example File from example.org [100 B]\n"
    fetchO.FileSize = 42;
    Stat.Fetch(fetch);
    EXPECT_EQ("Get:1 Example File from example.org [100 B]\n"

-            "Get:2 Example File from example.org [42 B]\n", out.str());
+            "Get:1 Example File from example.org [42 B]\n", out.str());

    Stat.Stop();
    EXPECT_EQ("Get:1 Example File from example.org [100 B]\n"
    Stat.Stop();
    EXPECT_EQ("Get:1 Example File from example.org [100 B]\n"

-            "Get:2 Example File from example.org [42 B]\n", out.str());
+            "Get:1 Example File from example.org [42 B]\n", out.str());

 }
 TEST(AcqProgress, Fail)
 {
 }
 TEST(AcqProgress, Fail)
 {


@@ -112,30 +114,34 @@ TEST(AcqProgress, Fail)
 
    EXPECT_EQ("", out.str());
    Stat.Fail(fetch);
 
    EXPECT_EQ("", out.str());
    Stat.Fail(fetch);

-   EXPECT_EQ("", out.str());
+   EXPECT_EQ("Ign:1 Example File from example.org\n", out.str());

    fetchO.Status = pkgAcquire::Item::StatDone;
    Stat.Fail(fetch);
    fetchO.Status = pkgAcquire::Item::StatDone;
    Stat.Fail(fetch);

-   EXPECT_EQ("Ign Example File from example.org\n", out.str());
+   EXPECT_EQ("Ign:1 Example File from example.org\n"
+            "Ign:1 Example File from example.org\n", out.str());

    fetchO.Status = pkgAcquire::Item::StatError;
    fetchO.ErrorText = "An error test!";
    Stat.Fail(fetch);
    fetchO.Status = pkgAcquire::Item::StatError;
    fetchO.ErrorText = "An error test!";
    Stat.Fail(fetch);

-   EXPECT_EQ("Ign Example File from example.org\n"
-            "Err Example File from example.org\n"
+   EXPECT_EQ("Ign:1 Example File from example.org\n"
+            "Ign:1 Example File from example.org\n"
+            "Err:1 Example File from example.org\n"

             "  An error test!\n", out.str());
    _config->Set("Acquire::Progress::Ignore::ShowErrorText", true);
    fetchO.Status = pkgAcquire::Item::StatDone;
    Stat.Fail(fetch);
             "  An error test!\n", out.str());
    _config->Set("Acquire::Progress::Ignore::ShowErrorText", true);
    fetchO.Status = pkgAcquire::Item::StatDone;
    Stat.Fail(fetch);

-   EXPECT_EQ("Ign Example File from example.org\n"
-            "Err Example File from example.org\n"
+   EXPECT_EQ("Ign:1 Example File from example.org\n"
+            "Ign:1 Example File from example.org\n"
+            "Err:1 Example File from example.org\n"

             "  An error test!\n"
             "  An error test!\n"

-            "Ign Example File from example.org\n"
+            "Ign:1 Example File from example.org\n"

             "  An error test!\n", out.str());
    _config->Set("Acquire::Progress::Ignore::ShowErrorText", true);
    Stat.Stop();
             "  An error test!\n", out.str());
    _config->Set("Acquire::Progress::Ignore::ShowErrorText", true);
    Stat.Stop();

-   EXPECT_EQ("Ign Example File from example.org\n"
-            "Err Example File from example.org\n"
+   EXPECT_EQ("Ign:1 Example File from example.org\n"
+            "Ign:1 Example File from example.org\n"
+            "Err:1 Example File from example.org\n"

             "  An error test!\n"
             "  An error test!\n"

-            "Ign Example File from example.org\n"
+            "Ign:1 Example File from example.org\n"

             "  An error test!\n", out.str());
 }
 TEST(AcqProgress, Pulse)
             "  An error test!\n", out.str());
 }
 TEST(AcqProgress, Pulse)