encode UTF-8 characters correctly in QuoteString

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 28057fa5c05504f7dbc7a6ed4baf687af7c7889d..77a39b4151b810ac21ca3384aaa2d2ff38569911 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -113,8 +113,7 @@ class pkgProblemResolver                                            /*{{{*/
    bool Debug;
    
    // Sort stuff
    bool Debug;
    
    // Sort stuff

-   static pkgProblemResolver *This;
-   APT_HIDDEN static int ScoreSort(const void *a,const void *b) APT_PURE;
+   APT_HIDDEN int ScoreSort(Package const *A, Package const *B) APT_PURE;

 
    struct PackageKill
    {
 
    struct PackageKill
    {


@@ -138,20 +137,10 @@ class pkgProblemResolver                                          /*{{{*/
    inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};
 
    // Try to intelligently resolve problems by installing and removing packages
    inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};
 
    // Try to intelligently resolve problems by installing and removing packages

-#if APT_PKG_ABI >= 413

    bool Resolve(bool BrokenFix = false, OpProgress * const Progress = NULL);
    bool Resolve(bool BrokenFix = false, OpProgress * const Progress = NULL);

-#else
-   bool Resolve(bool BrokenFix = false);
-   bool Resolve(bool BrokenFix, OpProgress * const Progress);
-#endif

 
    // Try to resolve problems only by using keep
 
    // Try to resolve problems only by using keep

-#if APT_PKG_ABI >= 413

    bool ResolveByKeep(OpProgress * const Progress = NULL);
    bool ResolveByKeep(OpProgress * const Progress = NULL);

-#else
-   bool ResolveByKeep();
-   bool ResolveByKeep(OpProgress * const Progress);
-#endif

 
    APT_DEPRECATED void InstallProtect();
 
 
    APT_DEPRECATED void InstallProtect();