Ticket #6160: 00-6160-mythfrontend-showusage.2.patch

mythtv/programs/mythfrontend/main.cpp

@@ -971 +971 @@
     query.exec();
 }
 
-void PrintHelp(const MythCommandLineParser &cmdlineparser)
+void ShowUsage(const MythCommandLineParser &cmdlineparser)
 {
     QString    help  = cmdlineparser.GetHelpString(false);
     QByteArray ahelp = help.toLocal8Bit();
@@ -1090 +1090 @@
                 !strcmp(a.argv()[argpos],"--help") ||
                 !strcmp(a.argv()[argpos],"--usage"))
         {
-            PrintHelp(cmdline);
+            ShowUsage(cmdline);
             return FRONTEND_EXIT_OK;
         }
         else if (!strcmp(a.argv()[argpos],"--prompt") ||
@@ -1240 +1240 @@
                 !strcmp(a.argv()[argpos],"--help") ||
                 !strcmp(a.argv()[argpos],"--usage")))
                 cerr << "Invalid argument: " << a.argv()[argpos] << endl;
-            PrintHelp(cmdline);
+            ShowUsage(cmdline);
             return FRONTEND_EXIT_INVALID_CMDLINE;
         }
     }

mythtv/programs/mythfrontend/exitprompt.cpp

@@ -7 +7 @@
 #include "mythdialogbox.h"
 #include "mythmainwindow.h"
 #include "mythscreenstack.h"
+#include "mythsystem.h"
 
 void ExitPrompter::quit()
 {
@@ -19 +20 @@
                                             "sudo /sbin/halt -p");
     if (!halt_cmd.isEmpty())
     {
-        QByteArray tmp = halt_cmd.toAscii();
-        system(tmp.constData());
+        myth_system(halt_cmd);
     }
     else
         VERBOSE(VB_IMPORTANT, "Cannot halt - null command!");
@@ -32 +32 @@
                                               "sudo /sbin/reboot");
     if (!reboot_cmd.isEmpty())
     {
-        QByteArray tmp = reboot_cmd.toAscii();
-        system(tmp.constData());
+        myth_system(reboot_cmd);
     }
     else
         VERBOSE(VB_IMPORTANT, "Cannot reboot - null command!");