The entire concept of PendingError() is flawed :/.

[apt.git] / apt-pkg / contrib / cmndline.h

diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index b201d98550d62aaffad9941b7fc5f5cd9cdda4c8..805cb9eae83bc5310bd56e226b6b7b137eff9338 100644 (file)
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -44,6 +44,12 @@
 #ifndef PKGLIB_CMNDLINE_H
 #define PKGLIB_CMNDLINE_H
 
 #ifndef PKGLIB_CMNDLINE_H
 #define PKGLIB_CMNDLINE_H
 

+#include <apt-pkg/macros.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/configuration.h>
+#endif
+

 class Configuration;
 
 class CommandLine
 class Configuration;
 
 class CommandLine


@@ -51,6 +57,7 @@ class CommandLine
    public:
    struct Args;
    struct Dispatch;
    public:
    struct Args;
    struct Dispatch;

+   struct DispatchWithHelp;

    
    protected:
    
    
    protected:
    


@@ -76,9 +83,18 @@ class CommandLine
    
    bool Parse(int argc,const char **argv);
    void ShowHelp();
    
    bool Parse(int argc,const char **argv);
    void ShowHelp();

-   unsigned int FileSize() const;
+   unsigned int FileSize() const APT_PURE;
+   // FIXME: merge on next ABI break

    bool DispatchArg(Dispatch *List,bool NoMatch = true);
    bool DispatchArg(Dispatch *List,bool NoMatch = true);

+   bool DispatchArg(Dispatch const * const List,bool NoMatch = true);

       
       

+   static char const * GetCommand(Dispatch const * const Map,
+        unsigned int const argc, char const * const * const argv) APT_PURE;
+
+   static CommandLine::Args MakeArgs(char ShortOpt, char const *LongOpt,
+        char const *ConfName, unsigned long Flags) APT_CONST;
+
+   CommandLine();

    CommandLine(Args *AList,Configuration *Conf);
    ~CommandLine();
 };
    CommandLine(Args *AList,Configuration *Conf);
    ~CommandLine();
 };