provide access to usage string from command line class

changed Tester::options() to a static member function
added CommandLine::m_usage member variable to hold usage string
added CommandLine::usage() access function
the usage string is now created at the beginning of the contructor

commandline.cpp

@@ -46,6 +46,12 @@ CommandLine::CommandLine(const QStringList &args)
 	m_returnCode = -1;
 	// NOTE: leave m_returnCode set to -1 to start GUI,
 
+	// create usage string
+	QStringList options = Tester::options();
+	// append any other options here
+	options.prepend("-h|-?|-v");
+	m_usage = tr("usage: %1 %2").arg(m_programName).arg(options.join("|"));
+
 	// parse command line arguments
 	if (isVersionOption(args))
 	{
@@ -76,12 +82,8 @@ CommandLine::CommandLine(const QStringList &args)
 	}
 
 	// unsupported option (NOTE: other options get checked before this)
-	QStringList options = tester.options();
-	// append any other options here
-	options.prepend("-h|-?|-v");
 	m_returnCode = isHelpOption(args) ? 0 : 1;  // error if not help option
-	cout(m_returnCode == 0 ? stdout : stderr) << tr("usage: ") << m_programName
-		<< options.join("|") << endl;
+	cout(m_returnCode == 0 ? stdout : stderr) << m_usage << endl;
 }
 
 

commandline.h

@@ -43,6 +43,7 @@ class CommandLine
 	QString m_programName;
 	int m_returnCode;
 	QTextStream m_cout;
+	QString m_usage;
 public:
     CommandLine(const QStringList &args);
 	~CommandLine();
@@ -59,6 +60,10 @@ class CommandLine
 	{
 		return m_programName;
 	}
+	QString usage(void) const
+	{
+		return m_usage;
+	}
 	QString version(void) const;
 	int copyrightYear(void) const;
 	static const char **gplStatement(void)

test_ibcp.cpp

@@ -114,7 +114,7 @@ bool Tester::isOption(const QString &arg, const QString &exp,
 
 
 // function to return list of valid options
-QStringList Tester::options(void) const
+QStringList Tester::options(void)
 {
 	return QStringList() << QString("-t <%1>").arg(tr("test_file")) << "-tp"
 		<< "-te" << "-tt";

test_ibcp.h

@@ -67,7 +67,7 @@ class Tester
 	Tester(const QStringList &args);
 	~Tester(void) {}
 
-	QStringList options(void) const;
+	static QStringList options(void);
 	bool run(QTextStream &cout, CommandLine *commandLine);
 	bool hasOption(void) const  // has a test option been specified?
 	{