Merge remote-tracking branch 'mvo/bugfix/apt-get-source-unauthenticated-warning'...

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 9dfa1538a895345fb7dfddcc558248b1947a8537..f35bd9a133840b02a7835fc164a317b08d1166ec 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -10,7 +10,7 @@
    see all of the effects of an upgrade run.
 
    pkgDistUpgrade computes an upgrade that causes as many packages as
    see all of the effects of an upgrade run.
 
    pkgDistUpgrade computes an upgrade that causes as many packages as

-   possible to move to the newest verison.
+   possible to move to the newest version.

    
    pkgApplyStatus sets the target state based on the content of the status
    field in the status file. It is important to get proper crash recovery.
    
    pkgApplyStatus sets the target state based on the content of the status
    field in the status file. It is important to get proper crash recovery.


@@ -33,23 +33,25 @@
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>

+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>

 
 #include <iostream>
 
 #include <iostream>

+#include <string>

 
 #include <apt-pkg/macros.h>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/acquire.h>
 
 #include <apt-pkg/macros.h>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/acquire.h>

-// include pkg{DistUpgrade,AllUpgrade,MiniizeUpgrade} here for compatiblity

 using std::ostream;
 #endif
 
 #ifndef APT_9_CLEANER_HEADERS
 using std::ostream;
 #endif
 
 #ifndef APT_9_CLEANER_HEADERS

+// include pkg{DistUpgrade,AllUpgrade,MiniizeUpgrade} here for compatibility

 #include <apt-pkg/upgrade.h>
 #include <apt-pkg/upgrade.h>

+#include <apt-pkg/update.h>

 #endif
 
 #endif
 

-class pkgAcquireStatus;
-

 
 class pkgSimulate : public pkgPackageManager                           /*{{{*/
 {
 
 class pkgSimulate : public pkgPackageManager                           /*{{{*/
 {


@@ -112,7 +114,7 @@ class pkgProblemResolver                                            /*{{{*/
    
    // Sort stuff
    static pkgProblemResolver *This;
    
    // Sort stuff
    static pkgProblemResolver *This;

-   static int ScoreSort(const void *a,const void *b);
+   static int ScoreSort(const void *a,const void *b) APT_PURE;

 
    struct PackageKill
    {
 
    struct PackageKill
    {


@@ -141,7 +143,7 @@ class pkgProblemResolver                                            /*{{{*/
    // Try to resolve problems only by using keep
    bool ResolveByKeep();
 
    // Try to resolve problems only by using keep
    bool ResolveByKeep();
 

-   __deprecated void InstallProtect();
+   APT_DEPRECATED void InstallProtect();

 
    pkgProblemResolver(pkgDepCache *Cache);
    ~pkgProblemResolver();
 
    pkgProblemResolver(pkgDepCache *Cache);
    ~pkgProblemResolver();


@@ -152,8 +154,5 @@ bool pkgFixBroken(pkgDepCache &Cache);
 
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
 
 
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
 

-bool ListUpdate(pkgAcquireStatus &progress, pkgSourceList &List, int PulseInterval=0);
-bool AcquireUpdate(pkgAcquire &Fetcher, int const PulseInterval = 0,
-                  bool const RunUpdateScripts = true, bool const ListCleanup = true);

 
 #endif
 
 #endif