Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index 743c3f5d1dc52404ed35379a3b91bd7f5985be64..9e833556ab4935638e0f58d08733f0ecc63e6f19 100644 (file)
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -2,36 +2,46 @@
 /** Description \file edsp.h                                           {{{
    ######################################################################
    Set of methods to help writing and reading everything needed for EDSP
-   with the noteable exception of reading a scenario for conversion into
+   with the notable exception of reading a scenario for conversion into
    a Cache as this is handled by edsp interface for listparser and friends
    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_EDSP_H
 #define PKGLIB_EDSP_H
 
-#include <apt-pkg/depcache.h>
 #include <apt-pkg/cacheset.h>
-#include <apt-pkg/progress.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>
 
+#include <stdio.h>
+
+#include <list>
 #include <string>
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/progress.h>
+#endif
+
+class pkgDepCache;
+class OpProgress;
+
 class EDSP                                                             /*{{{*/
 {
        // we could use pkgCache::DepType and ::Priority, but these would be localized strings…
        static const char * const PrioMap[];
        static const char * const DepMap[];
 
-       bool static ReadLine(int const input, std::string &line);
-       bool static StringToBool(char const *answer, bool const defValue);
+       APT_HIDDEN bool static ReadLine(int const input, std::string &line);
+       APT_HIDDEN bool static StringToBool(char const *answer, bool const defValue);
 
-       void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output,
+       APT_HIDDEN void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output,
                                         pkgCache::PkgIterator const &Pkg,
                                         pkgCache::VerIterator const &Ver);
-       void static WriteScenarioDependency(pkgDepCache &Cache, FILE* output,
-                                           pkgCache::PkgIterator const &Pkg,
+       APT_HIDDEN void static WriteScenarioDependency(FILE* output,
                                            pkgCache::VerIterator const &Ver);
-       void static WriteScenarioLimitedDependency(pkgDepCache &Cache, FILE* output,
-                                                  pkgCache::PkgIterator const &Pkg,
+       APT_HIDDEN void static WriteScenarioLimitedDependency(FILE* output,
                                                   pkgCache::VerIterator const &Ver,
                                                   APT::PackageSet const &pkgset);
 public:
@@ -174,13 +184,13 @@ public:
         *  they were unable to calculate a solution for a given task.
         *  Obviously they can't send a solution through, so this
         *  methods deals with formatting an error message correctly
-        *  so that the front-ends can recieve and display it.
+        *  so that the front-ends can receive and display it.
         *
         *  The first line of the message should be a short description
         *  of the error so it can be used for dialog titles or alike
         *
         *  \param uuid of this error message
-        *  \param message is free form text to discribe the error
+        *  \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);
@@ -195,10 +205,10 @@ public:
         *  \param[out] solver_in will be the stdin of the solver
         *  \param[out] solver_out will be the stdout of the solver
         *
-        *  \return true if the solver could be started and the pipes
-        *  are set up correctly, otherwise false and the pipes are invalid
+        *  \return PID of the started solver or 0 if failure occurred
         */
-       bool static ExecuteSolver(const char* const solver, int *solver_in, int *solver_out);
+       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);
 
        /** \brief call an external resolver to handle the request
         *