Support hardnested(), darkside(), readblk(),

readsec() in latest Iceman repo

common/util.cpp

@@ -1,11 +1,12 @@
 #include "util.h"
 
+Util::ClientType Util::clientType = CLIENTTYPE_OFFICIAL;
+
 Util::Util(QObject *parent) : QObject(parent)
 {
     isRequiringOutput = false;
     requiredOutput = new QString();
     timeStamp = QTime::currentTime();
-    this->clientType = CLIENTTYPE_OFFICIAL;
     qRegisterMetaType<Util::ClientType>("Util::ClientType");
 }
 
@@ -79,14 +80,15 @@ void Util::delay(unsigned int msec)
     while(QTime::currentTime() < timer)
         QApplication::processEvents(QEventLoop::AllEvents, 100);
 }
+
 Util::ClientType Util::getClientType()
 {
-    return this->clientType;
+    return Util::clientType;
 }
 
 void Util::setClientType(Util::ClientType clientType)
 {
-    this->clientType = clientType;
+    Util::clientType = clientType;
 }
 
 void Util::setRunningState(bool st)

common/util.h

@@ -52,12 +52,12 @@ public:
     void execCMD(const QString& cmd);
     QString execCMDWithOutput(const QString& cmd, ReturnTrigger trigger = 10000);
     void delay(unsigned int msec);
-    ClientType getClientType();
+    static ClientType getClientType();
     static const int rawTabIndex = 1;
     static bool chooseLanguage(QSettings *guiSettings, QMainWindow *window);
 public slots:
     void processOutput(const QString& output);
-    void setClientType(Util::ClientType clientType);
+    static void setClientType(Util::ClientType clientType);
     void setRunningState(bool st);
 
 private:
@@ -65,7 +65,7 @@ private:
     bool isRunning;
     QString* requiredOutput;
     QTime timeStamp;
-    ClientType clientType;
+    static ClientType clientType;
 signals:
     void refreshOutput(const QString& output);
     void write(QString data); // connected to PM3Process::write(QString data);