Refined parameter validation code. Parameters in the "--param=value" format are now...

[x264-launcher/x264-launcher.git] / src / tool_abstract.h

diff --git a/src/tool_abstract.h b/src/tool_abstract.h
index d9f9cae..6ef7d3b 100644 (file)
--- a/src/tool_abstract.h
+++ b/src/tool_abstract.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Simple x264 Launcher
-// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -45,13 +45,13 @@ public:
        AbstractTool(JobObject *jobObject, const OptionsModel *options, const SysinfoModel *const sysinfo, const PreferencesModel *const preferences, JobStatus &jobStatus, volatile bool *abort, volatile bool *pause, QSemaphore *semaphorePause);
        virtual ~AbstractTool(void) {/*NOP*/}
        
-       virtual const QString &getName(void) = 0;
+       virtual QString getName(void) const = 0;
 
        virtual unsigned int checkVersion(bool &modified);
        virtual bool isVersionSupported(const unsigned int &revision, const bool &modified) = 0;
        virtual QString printVersion(const unsigned int &revision, const bool &modified) = 0;
 
-       static const unsigned int REV_MULT = 10000;
+       //static const unsigned int REV_MULT = 10000;
 
 signals:
        void statusChanged(const JobStatus &newStatus);
@@ -64,10 +64,10 @@ protected:
        static const unsigned int m_processTimeoutMaxCounter = 120;
        static const unsigned int m_processTimeoutWarning = 24;
 
-       virtual const QString &getBinaryPath(void) = 0;
+       virtual QString getBinaryPath(void) const = 0;
 
        virtual void checkVersion_init(QList<QRegExp*> &patterns, QStringList &cmdLine) = 0;
-       virtual void checkVersion_parseLine(const QString &line, QList<QRegExp*> &patterns, unsigned int &coreVers, unsigned int &revision, bool &modified) = 0;
+       virtual void checkVersion_parseLine(const QString &line, QList<QRegExp*> &patterns, unsigned int &core, unsigned int &build, bool &modified) = 0;
        virtual bool checkVersion_succeeded(const int &exitCode);
 
        void log(const QString &text) { emit messageLogged(text); }
@@ -88,7 +88,9 @@ protected:
 
        static QString commandline2string(const QString &program, const QStringList &arguments);
        static QString stringToHash(const QString &string);
-       
+       static unsigned int makeRevision(const unsigned int &core, const unsigned int &build);
+       static void splitRevision(const unsigned int &revision, unsigned int &core, unsigned int &build);
+
        static QMutex s_mutexStartProcess;
 };