Bug #807012 also involves package dependencies :/.

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

diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index 33d9f9f3ad64cfd829978b4ca2c2aa63704a8364..805cb9eae83bc5310bd56e226b6b7b137eff9338 100644 (file)
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -84,14 +84,12 @@ class CommandLine
    bool Parse(int argc,const char **argv);
    void ShowHelp();
    unsigned int FileSize() const APT_PURE;
+   // FIXME: merge on next ABI break
    bool DispatchArg(Dispatch *List,bool NoMatch = true);
-   bool DispatchArg(DispatchWithHelp const * const 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 char const * GetCommand(DispatchWithHelp 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;
@@ -117,11 +115,5 @@ struct CommandLine::Dispatch
    const char *Match;
    bool (*Handler)(CommandLine &);
 };
-struct CommandLine::DispatchWithHelp
-{
-   const char *Match;
-   bool (*Handler)(CommandLine &);
-   const char *Help;
-};
 
 #endif