follow the recommendation of cppcheck to make some method methods (scnr)

[apt.git] / apt-pkg / packagemanager.h

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 44f5d5ef74eebd28039b68d1957817f06d9700ae..053b4dc1317087d7703a708398b1bf71c5bb93d3 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -28,6 +28,7 @@
 #include <iostream>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/depcache.h>
 #include <iostream>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/depcache.h>

+#include <set>

 
 using std::string;
 
 
 using std::string;
 


@@ -47,13 +48,17 @@ class pkgPackageManager : protected pkgCache::Namespace
    pkgDepCache &Cache;
    pkgOrderList *List;
    bool Debug;
    pkgDepCache &Cache;
    pkgOrderList *List;
    bool Debug;

-         
+
+   /** \brief saves packages dpkg let disappear
+
+       This way APT can retreat from trying to configure these
+       packages later on and a frontend can choose to display a
+       notice to inform the user about these disappears.
+   */
+   std::set<std::string> disappearedPkgs;
+

    bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0);
    bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0);

-   // binary-compat change, fix on next abi break
-   void ImmediateAdd(PkgIterator P, bool UseInstallVer) {
-      ImmediateAdd(P, UseInstallVer, 0);
-   }
-   void ImmediateAdd(PkgIterator P, bool UseInstallVer, unsigned const int &Depth);
+   void ImmediateAdd(PkgIterator P, bool UseInstallVer, unsigned const int &Depth = 0);

    virtual OrderResult OrderInstall();
    bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);
    bool CreateOrderList();
    virtual OrderResult OrderInstall();
    bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);
    bool CreateOrderList();


@@ -64,7 +69,9 @@ class pkgPackageManager : protected pkgCache::Namespace
    // Install helpers
    bool ConfigureAll();
    bool SmartConfigure(PkgIterator Pkg);
    // Install helpers
    bool ConfigureAll();
    bool SmartConfigure(PkgIterator Pkg);

+   //FIXME: merge on abi break

    bool SmartUnPack(PkgIterator Pkg);
    bool SmartUnPack(PkgIterator Pkg);

+   bool SmartUnPack(PkgIterator Pkg, bool const Immediate);

    bool SmartRemove(PkgIterator Pkg);
    bool EarlyRemove(PkgIterator Pkg);   
    
    bool SmartRemove(PkgIterator Pkg);
    bool EarlyRemove(PkgIterator Pkg);   
    


@@ -97,7 +104,10 @@ class pkgPackageManager : protected pkgCache::Namespace
    // stuff that needs to be done after the fork
    OrderResult DoInstallPostFork(int statusFd=-1);
    bool FixMissing();
    // stuff that needs to be done after the fork
    OrderResult DoInstallPostFork(int statusFd=-1);
    bool FixMissing();

-   
+
+   /** \brief returns all packages dpkg let disappear */
+   inline std::set<std::string> GetDisappearedPackages() { return disappearedPkgs; };
+

    pkgPackageManager(pkgDepCache *Cache);
    virtual ~pkgPackageManager();
 };
    pkgPackageManager(pkgDepCache *Cache);
    virtual ~pkgPackageManager();
 };