Fix MythCommandLineParser::SetValue

Previously, this would store the new value to the CommandLineArg
instance, but would not mark the instance as having been used.  Thus, if
the argument had not actually been used on the command line, attempting
to retrieve the value would result in getting the default.  This
requires a version bump, so it also carries staging for a SetDeprecated
method to CommandLineArg.

Fixes #10083.

Author: wagnerrp

mythtv/libs/libmythbase/mythcommandlineparser.cpp

@@ -100,18 +100,19 @@ const char* NamedOptType(int type)
 CommandLineArg::CommandLineArg(QString name, QVariant::Type type,
                    QVariant def, QString help, QString longhelp) :
     ReferenceCounter(), m_given(false), m_name(name), m_group(""),
-    m_type(type), m_default(def), m_help(help), m_longhelp(longhelp)
+    m_deprecated(""), m_type(type), m_default(def), m_help(help),
+    m_longhelp(longhelp)
 {
 }
 
 CommandLineArg::CommandLineArg(QString name, QVariant::Type type, QVariant def)
   : ReferenceCounter(), m_given(false), m_name(name), m_group(""),
-    m_type(type), m_default(def)
+    m_deprecated(""), m_type(type), m_default(def)
 {
 }
 
 CommandLineArg::CommandLineArg(QString name) :
-    ReferenceCounter(), m_given(false), m_name(name), 
+    ReferenceCounter(), m_given(false), m_name(name), m_deprecated(""),
     m_type(QVariant::Invalid)
 {
 }
@@ -446,6 +447,11 @@ CommandLineArg* CommandLineArg::SetBlocks(QStringList opts)
     return this;
 }
 
+CommandLineArg* CommandLineArg::SetDeprecated(QString depstr)
+{
+    return this;
+}
+
 void CommandLineArg::SetParentOf(CommandLineArg *other, bool forward)
 {
     int i;

mythtv/libs/libmythbase/mythcommandlineparser.h

@@ -36,7 +36,8 @@ class MBASE_PUBLIC CommandLineArg : public ReferenceCounter
 
     bool            Set(QString opt);
     bool            Set(QString opt, QString val);
-    void            Set(QVariant val)               { m_stored = val; }
+    void            Set(QVariant val)               { m_stored = val;
+                                                      m_given = true; }
 
     CommandLineArg* SetParentOf(QString opt);
     CommandLineArg* SetParentOf(QStringList opts);
@@ -48,6 +49,7 @@ class MBASE_PUBLIC CommandLineArg : public ReferenceCounter
     CommandLineArg* SetRequires(QStringList opts);
     CommandLineArg* SetBlocks(QString opt);
     CommandLineArg* SetBlocks(QStringList opts);
+    CommandLineArg* SetDeprecated(QString depstr = "");
 
     static void     AllowOneOf(QList<CommandLineArg*> args);
 
@@ -70,6 +72,7 @@ class MBASE_PUBLIC CommandLineArg : public ReferenceCounter
     bool                    m_given;
     QString                 m_name;
     QString                 m_group;
+    QString                 m_deprecated;
     QVariant::Type          m_type;
     QVariant                m_default;
     QVariant                m_stored;

mythtv/libs/libmythbase/mythversion.h

@@ -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.20111007-1"
+#define MYTH_BINARY_VERSION "0.25.20111009-1"
 
 /** \brief Increment this whenever the MythTV network protocol changes.
  *

mythtv/programs/mythfilldatabase/main.cpp

@@ -242,7 +242,7 @@ int main(int argc, char *argv[])
                 cmdline.toStringList("refresh") << "nottomorrow");
     if (cmdline.toBool("refreshsecond"))
         cmdline.SetValue("refresh", 
-                cmdline.toStringList("refresh") << "today");
+                cmdline.toStringList("refresh") << "second");
     if (cmdline.toBool("refreshall"))
         cmdline.SetValue("refresh", 
                 cmdline.toStringList("refresh") << "all");
@@ -251,7 +251,7 @@ int main(int argc, char *argv[])
                 cmdline.toStringList("refresh") << 
                          QString::number(cmdline.toUInt("refreshday")));
 
-    QStringList sl =cmdline.toStringList("refresh");
+    QStringList sl = cmdline.toStringList("refresh");
     if (!sl.isEmpty())
     {
         QStringList::const_iterator i = sl.constBegin();