diff --git a/mythplugins/mytharchive/mytharchivehelper/main.cpp b/mythplugins/mytharchive/mytharchivehelper/main.cpp index 7808726b5e0..92fdb8107dd 100644 --- a/mythplugins/mytharchive/mytharchivehelper/main.cpp +++ b/mythplugins/mytharchive/mytharchivehelper/main.cpp @@ -2467,7 +2467,6 @@ void MythArchiveHelperCommandLineParser::LoadArguments(void) { addHelp(); addVersion(); - addVerbose(); addLogging(); add(QStringList( QStringList() << "-t" << "--createthumbnail" ), diff --git a/mythplugins/mythnetvision/mythfillnetvision/main.cpp b/mythplugins/mythnetvision/mythfillnetvision/main.cpp index 75164bf4c67..157d9efc10d 100644 --- a/mythplugins/mythnetvision/mythfillnetvision/main.cpp +++ b/mythplugins/mythnetvision/mythfillnetvision/main.cpp @@ -41,7 +41,6 @@ void MythFillNVCommandLineParser::LoadArguments(void) { addHelp(); addVersion(); - addVerbose(); addLogging(); add("--refresh-all", "refresh-all", false, diff --git a/mythtv/libs/libmythbase/mythcommandlineparser.cpp b/mythtv/libs/libmythbase/mythcommandlineparser.cpp index 9a2845b9897..f3494da8469 100644 --- a/mythtv/libs/libmythbase/mythcommandlineparser.cpp +++ b/mythtv/libs/libmythbase/mythcommandlineparser.cpp @@ -910,17 +910,6 @@ void MythCommandLineParser::addSettingsOverride(void) "loaded for setting overrides.", ""); } -void MythCommandLineParser::addVerbose(void) -{ - add(QStringList( QStringList() << "-v" << "--verbose" ), "verbose", - "important,general", - "Specify log filtering. Use '-v help' for level info.", ""); - add("-V", "verboseint", 0U, "", - "This option is intended for internal use only.\n" - "This option takes an unsigned value corresponding " - "to the bitwise log verbosity operator."); -} - void MythCommandLineParser::addRecording(void) { add("--chanid", "chanid", 0U, @@ -949,6 +938,13 @@ void MythCommandLineParser::addUPnP(void) void MythCommandLineParser::addLogging(void) { + add(QStringList( QStringList() << "-v" << "--verbose" ), "verbose", + "important,general", + "Specify log filtering. Use '-v help' for level info.", ""); + add("-V", "verboseint", 0U, "", + "This option is intended for internal use only.\n" + "This option takes an unsigned value corresponding " + "to the bitwise log verbosity operator."); add(QStringList( QStringList() << "-l" << "--logfile" << "--logpath" ), "logpath", "", "Writes logging messages to a file at logpath.\n" diff --git a/mythtv/libs/libmythbase/mythcommandlineparser.h b/mythtv/libs/libmythbase/mythcommandlineparser.h index e3b910ef737..761fb7af6a6 100644 --- a/mythtv/libs/libmythbase/mythcommandlineparser.h +++ b/mythtv/libs/libmythbase/mythcommandlineparser.h @@ -157,7 +157,6 @@ class MBASE_PUBLIC MythCommandLineParser void addWindowed(bool); void addDaemon(void); void addSettingsOverride(void); - void addVerbose(void); void addRecording(void); void addGeometry(void); void addDisplay(void); diff --git a/mythtv/programs/mythavtest/commandlineparser.cpp b/mythtv/programs/mythavtest/commandlineparser.cpp index 1c141b9235b..66d0b3cf0d5 100644 --- a/mythtv/programs/mythavtest/commandlineparser.cpp +++ b/mythtv/programs/mythavtest/commandlineparser.cpp @@ -22,7 +22,6 @@ void MythAVTestCommandLineParser::LoadArguments(void) addSettingsOverride(); addVersion(); addWindowed(false); - addVerbose(); addGeometry(); addDisplay(); addLogging(); diff --git a/mythtv/programs/mythbackend/commandlineparser.cpp b/mythtv/programs/mythbackend/commandlineparser.cpp index 4acda7fdfef..f73ca52d99c 100644 --- a/mythtv/programs/mythbackend/commandlineparser.cpp +++ b/mythtv/programs/mythbackend/commandlineparser.cpp @@ -16,7 +16,6 @@ void MythBackendCommandLineParser::LoadArguments(void) addVersion(); addDaemon(); addSettingsOverride(); - addVerbose(); addUPnP(); addLogging(); addPIDFile(); diff --git a/mythtv/programs/mythcommflag/commandlineparser.cpp b/mythtv/programs/mythcommflag/commandlineparser.cpp index 76fb0be5b90..73f115b6e50 100644 --- a/mythtv/programs/mythcommflag/commandlineparser.cpp +++ b/mythtv/programs/mythcommflag/commandlineparser.cpp @@ -15,7 +15,6 @@ void MythCommFlagCommandLineParser::LoadArguments(void) addHelp(); addSettingsOverride(); addVersion(); - addVerbose(); addJob(); addRecording(); addLogging(); diff --git a/mythtv/programs/mythfilldatabase/commandlineparser.cpp b/mythtv/programs/mythfilldatabase/commandlineparser.cpp index 31fb344c420..a7fad6a9299 100644 --- a/mythtv/programs/mythfilldatabase/commandlineparser.cpp +++ b/mythtv/programs/mythfilldatabase/commandlineparser.cpp @@ -14,7 +14,6 @@ void MythFillDatabaseCommandLineParser::LoadArguments(void) { addHelp(); addVersion(); - addVerbose(); addLogging(); add("--manual", "manual", false, "Run interactive configuration", diff --git a/mythtv/programs/mythfrontend/commandlineparser.cpp b/mythtv/programs/mythfrontend/commandlineparser.cpp index 9c3cd160e53..868d1f7c518 100644 --- a/mythtv/programs/mythfrontend/commandlineparser.cpp +++ b/mythtv/programs/mythfrontend/commandlineparser.cpp @@ -16,7 +16,6 @@ void MythFrontendCommandLineParser::LoadArguments(void) addVersion(); addWindowed(false); addSettingsOverride(); - addVerbose(); addGeometry(); addDisplay(); addUPnP(); diff --git a/mythtv/programs/mythjobqueue/commandlineparser.cpp b/mythtv/programs/mythjobqueue/commandlineparser.cpp index 6883ba9cd35..e378c72dec0 100644 --- a/mythtv/programs/mythjobqueue/commandlineparser.cpp +++ b/mythtv/programs/mythjobqueue/commandlineparser.cpp @@ -21,7 +21,6 @@ void MythJobQueueCommandLineParser::LoadArguments(void) addHelp(); addSettingsOverride(); addVersion(); - addVerbose(); addLogging(); addPIDFile(); addDaemon(); diff --git a/mythtv/programs/mythlcdserver/commandlineparser.cpp b/mythtv/programs/mythlcdserver/commandlineparser.cpp index 23d5a6de20e..2a1711786e7 100644 --- a/mythtv/programs/mythlcdserver/commandlineparser.cpp +++ b/mythtv/programs/mythlcdserver/commandlineparser.cpp @@ -14,7 +14,6 @@ void MythLCDServerCommandLineParser::LoadArguments(void) { addHelp(); addVersion(); - addVerbose(); addDaemon(); addLogging(); //addPIDFile(); diff --git a/mythtv/programs/mythmediaserver/commandlineparser.cpp b/mythtv/programs/mythmediaserver/commandlineparser.cpp index 7289fc7bc14..96920628c6f 100644 --- a/mythtv/programs/mythmediaserver/commandlineparser.cpp +++ b/mythtv/programs/mythmediaserver/commandlineparser.cpp @@ -21,7 +21,6 @@ void MythMediaServerCommandLineParser::LoadArguments(void) { addHelp(); addVersion(); - addVerbose(); addSettingsOverride(); addPIDFile(); addDaemon(); diff --git a/mythtv/programs/mythmessage/commandlineparser.cpp b/mythtv/programs/mythmessage/commandlineparser.cpp index bbb84cb84bb..357141b1fe3 100644 --- a/mythtv/programs/mythmessage/commandlineparser.cpp +++ b/mythtv/programs/mythmessage/commandlineparser.cpp @@ -14,7 +14,6 @@ void MythMessageCommandLineParser::LoadArguments(void) { addHelp(); addVersion(); - addVerbose(); allowExtras(); add("--udpport", "port", 6948, "(optional) UDP Port to send to", ""); @@ -22,5 +21,7 @@ void MythMessageCommandLineParser::LoadArguments(void) "(optional) IP address to send to", ""); add("--print-template", "printtemplate", false, "Print the template to be sent to the frontend", ""); + add(QStringList( QStringList() << "-v" << "--verbose" ), "verbose", + false, "Turn on verbose debugging", ""); } diff --git a/mythtv/programs/mythmetadatalookup/main.cpp b/mythtv/programs/mythmetadatalookup/main.cpp index 954a00ce113..0772e0550bd 100644 --- a/mythtv/programs/mythmetadatalookup/main.cpp +++ b/mythtv/programs/mythmetadatalookup/main.cpp @@ -37,7 +37,6 @@ void MythMetadataLookupCommandLineParser::LoadArguments(void) { addHelp(); addVersion(); - addVerbose(); addRecording(); addLogging(); diff --git a/mythtv/programs/mythpreviewgen/commandlineparser.cpp b/mythtv/programs/mythpreviewgen/commandlineparser.cpp index 70a7e76fd03..e4ba9e711ca 100644 --- a/mythtv/programs/mythpreviewgen/commandlineparser.cpp +++ b/mythtv/programs/mythpreviewgen/commandlineparser.cpp @@ -14,7 +14,6 @@ void MythPreviewGeneratorCommandLineParser::LoadArguments(void) { addHelp(); addVersion(); - addVerbose(); addRecording(); addLogging(); diff --git a/mythtv/programs/mythshutdown/commandlineparser.cpp b/mythtv/programs/mythshutdown/commandlineparser.cpp index 05549041e9b..8e0645fe603 100644 --- a/mythtv/programs/mythshutdown/commandlineparser.cpp +++ b/mythtv/programs/mythshutdown/commandlineparser.cpp @@ -14,7 +14,6 @@ void MythShutdownCommandLineParser::LoadArguments(void) { addHelp(); addVersion(); - addVerbose(); addLogging(); add(QStringList( QStringList() << "-w" << "--setwakeup" ), "setwakeup", "", diff --git a/mythtv/programs/mythtranscode/commandlineparser.cpp b/mythtv/programs/mythtranscode/commandlineparser.cpp index 962ee0ab79e..7411fdd4b03 100644 --- a/mythtv/programs/mythtranscode/commandlineparser.cpp +++ b/mythtv/programs/mythtranscode/commandlineparser.cpp @@ -14,7 +14,6 @@ void MythTranscodeCommandLineParser::LoadArguments(void) { addHelp(); addVersion(); - addVerbose(); addJob(); addRecording(); addSettingsOverride(); diff --git a/mythtv/programs/mythtv-setup/commandlineparser.cpp b/mythtv/programs/mythtv-setup/commandlineparser.cpp index 75682df906f..66e674378c9 100644 --- a/mythtv/programs/mythtv-setup/commandlineparser.cpp +++ b/mythtv/programs/mythtv-setup/commandlineparser.cpp @@ -24,7 +24,6 @@ void MythTVSetupCommandLineParser::LoadArguments(void) addSettingsOverride(); addVersion(); addWindowed(false); - addVerbose(); addGeometry(); addDisplay(); addLogging(); diff --git a/mythtv/programs/mythwelcome/commandlineparser.cpp b/mythtv/programs/mythwelcome/commandlineparser.cpp index fb6194aed4e..32099ddd867 100644 --- a/mythtv/programs/mythwelcome/commandlineparser.cpp +++ b/mythtv/programs/mythwelcome/commandlineparser.cpp @@ -21,7 +21,6 @@ void MythWelcomeCommandLineParser::LoadArguments(void) addHelp(); addSettingsOverride(); addVersion(); - addVerbose(); addLogging(); add(QStringList( QStringList() << "-s" << "--setup" ), "setup", false,