Ticket #7662: help3.patch

libs/libmyth/mythcommandlineparser.h

@@ -24 +24 @@
 class MPUBLIC MythCommandLineParser
 {
   public:
-    MythCommandLineParser(int things_to_parse);
+    MythCommandLineParser(int things_to_parse, void (*helpFunc)(const MythCommandLineParser&) = NULL);
 
     bool PreParse(int argc, const char * const * argv, int &argpos, bool &err);
     bool Parse(int argc, const char * const * argv, int &argpos, bool &err);
@@ -40 +40 @@
     bool    WantsToExit(void) const { return wantsToExit; }
 
   private:
+    QString GetHelpStringInternal(bool with_header) const;
+
     int                   parseTypes;
 
     QMap<QString,QString> settingsOverride;
@@ -48 +50 @@
     QString               geometry;
 
     bool                  wantsToExit;
+    void              (*helpFunction)(const MythCommandLineParser &);
 };

libs/libmyth/mythcommandlineparser.cpp

@@ -10 +10 @@
 #include "mythverbose.h"
 #include "mythversion.h"
 
-MythCommandLineParser::MythCommandLineParser(int things_to_parse) :
+MythCommandLineParser::MythCommandLineParser(int things_to_parse, void (*helpFunc)(const MythCommandLineParser&)) :
     parseTypes(things_to_parse),
     display(QString::null), geometry(QString::null),
-    wantsToExit(false)
+    wantsToExit(false), helpFunction(helpFunc)
 {
 }
 
@@ -100 +100 @@
               !strcmp(argv[argpos],"--help") ||
               !strcmp(argv[argpos],"--usage")))
     {
-        QString help = GetHelpString(false);
+        QString help = GetHelpStringInternal(false);
         QByteArray ahelp = help.toLocal8Bit();
         cerr << ahelp.constData();
         wantsToExit = true;
@@ -276 +276 @@
     }
 }
 
+QString MythCommandLineParser::GetHelpStringInternal(bool with_header) const
+{
+    if (helpFunction)
+    {
+        helpFunction(*this);
+        return "";
+    }
+
+    return GetHelpString(with_header);
+}
+
 QString MythCommandLineParser::GetHelpString(bool with_header) const
 {
     QString str;

programs/mythfrontend/main.cpp

@@ -1119 +1119 @@
         kCLPDisplay              |
 #endif // USING_X11
         kCLPExtra                |
-        kCLPGeometry);
+        kCLPGeometry             |
+        kCLPHelp,
+        ShowUsage);
 
+    // This will catch any help lines (e.g. --h) and display them
     for (int argpos = 1; argpos < argc; ++argpos)
     {
         if (cmdline.PreParse(argc, argv, argpos, cmdline_err))
@@ -1160 +1163 @@
 
     for (int argpos = 1; argpos < a.argc(); ++argpos)
     {
-        if (!strcmp(a.argv()[argpos],"-h") ||
-                !strcmp(a.argv()[argpos],"--help") ||
-                !strcmp(a.argv()[argpos],"--usage"))
-        {
-            ShowUsage(cmdline);
-            return FRONTEND_EXIT_OK;
-        }
-        else if (!strcmp(a.argv()[argpos],"--prompt") ||
+        if (!strcmp(a.argv()[argpos],"--prompt") ||
                  !strcmp(a.argv()[argpos],"-p" ))
         {
             bPromptForBackend = true;
@@ -1307 +1303 @@
                 !strcmp(a.argv()[argpos],"--help") ||
                 !strcmp(a.argv()[argpos],"--usage")))
                 cerr << "Invalid argument: " << a.argv()[argpos] << endl;
-            ShowUsage(cmdline);
-            return FRONTEND_EXIT_INVALID_CMDLINE;
+                ShowUsage(cmdline);
+                return FRONTEND_EXIT_INVALID_CMDLINE;
         }
     }
     settingsOverride = cmdline.GetSettingsOverride();

programs/mythwelcome/main.cpp

@@ -77 +77 @@
     MythCommandLineParser cmdline(
         kCLPOverrideSettingsFile |
         kCLPOverrideSettings     |
-        kCLPQueryVersion);
+        kCLPQueryVersion         |
+        kCLPHelp,
+        showUsage);
 
     for (int argpos = 0; argpos < argc; ++argpos)
     {