Skip to content

Commit

Permalink
Add a MythCommandLineParser::GetExtra() helper method
Browse files Browse the repository at this point in the history
This also fixes mythmessage by calling the helper instead of
cmdline.toMap("extra") which needed to be "_extra" (now?).

NOTE: This changes MYTH_BINARY_VERSION, so make clean, etc..
  • Loading branch information
cpinkham committed Oct 7, 2011
1 parent a598436 commit 2c56a65
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
5 changes: 5 additions & 0 deletions mythtv/libs/libmythbase/mythcommandlineparser.cpp
Expand Up @@ -1287,6 +1287,11 @@ QStringList MythCommandLineParser::GetArgs(void) const
return toStringList("_args");
}

QMap<QString,QString> MythCommandLineParser::GetExtra(void) const
{
return toMap("_extra");
}

QString MythCommandLineParser::GetPassthrough(void) const
{
return toStringList("_passthrough").join(" ");
Expand Down
1 change: 1 addition & 0 deletions mythtv/libs/libmythbase/mythcommandlineparser.h
Expand Up @@ -215,6 +215,7 @@ class MBASE_PUBLIC MythCommandLineParser

QVariant operator[](const QString &name);
QStringList GetArgs(void) const;
QMap<QString,QString> GetExtra(void) const;
QString GetPassthrough(void) const;
QMap<QString,QString> GetSettingsOverride(void);
QString GetLogFilePath(void);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythbase/mythversion.h
Expand Up @@ -12,7 +12,7 @@
/// Update this whenever the plug-in API changes.
/// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
/// libmythui class methods used by plug-ins.
#define MYTH_BINARY_VERSION "0.25.20111006-1"
#define MYTH_BINARY_VERSION "0.25.20111007-1"

/** \brief Increment this whenever the MythTV network protocol changes.
*
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythmessage/main.cpp
Expand Up @@ -71,7 +71,7 @@ int main(int argc, char *argv[])
address.setAddress(cmdline.toString("addr"));

QMap<QString,QString>::const_iterator i;
QMap<QString,QString> extras = cmdline.toMap("extra");
QMap<QString,QString> extras = cmdline.GetExtra();
for (i = extras.begin(); i != extras.end(); ++i)
{
QString name = i.key();
Expand Down

0 comments on commit 2c56a65

Please sign in to comment.