From 6079b276a959086ff18302cab752b6d7cfe5ad9f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 26 Oct 2015 11:42:32 +0100 Subject: move apts cmdline helper type into -private Its not as simple as I initially thought to abstract this enough to make it globally usable, so lets not pollute global namespace with this for now. Git-Dch: Ignore --- apt-pkg/contrib/cmndline.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'apt-pkg/contrib/cmndline.h') diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index 33d9f9f3a..805cb9eae 100644 --- 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 -- cgit v1.2.3