Refactor

hgx11.cpp

@@ -4,41 +4,49 @@
 
 hgx11::hgx11(QHash<QString, QString> opts)
 {
+    QString addr = "localhost";
+    unsigned short port = 19444;
+    unsigned short scale = 8;
+    unsigned short frameskip = 0;
+    QString redAdjust = "", greenAdjust = "", blueAdjust = "";
+    QString temperature = "", threshold = "", transform = "";
     QHashIterator<QString, QString> i(opts);
     while (i.hasNext()) {
         i.next();
         if ((i.key() == "a" || i.key() == "address") && !(i.value().isNull() && i.value().isEmpty())) {
-             _addr_m = i.value();
+             addr = i.value();
-        } else if ((i.key() == "p" || i.key() == "port") && (i.value().toInt() > 0 && i.value().toInt() < 65536)) {
+        } else if ((i.key() == "p" || i.key() == "port") && i.value().toUShort()) {
-            _port_m = i.value();
+            port = i.value().toUShort();
-        } else if ((i.key() == "s" || i.key() == "scale") && (i.value().toInt() > 0 && i.value().toInt() < 1001)) {
+        } else if ((i.key() == "s" || i.key() == "scale") && i.value().toUShort()) {
-            _scale_m = i.value();
+            scale = i.value().toUShort();
-        } else if ((i.key() == "f" || i.key() == "frameskip") && (i.value().toInt() > 0 && i.value().toInt() < 256)) {
+        } else if ((i.key() == "f" || i.key() == "frameskip") && (i.value().toUShort() && i.value().toUShort() <= 255)) {
-             _frameskip_m = i.value();
+            frameskip = i.value().toUShort();
-        } else if ((i.key() == "i" || i.key() == "inactive") && (i.value().toInt() > 0)) {
+        } else if ((i.key() == "i" || i.key() == "inactive") && i.value().toInt()) {
             _inactiveTime_m = (i.value().toInt() * 1000);
         } else if (i.key() == "r" || i.key() == "redadjust") {
-            _redAdjust_m = _parseColorArr(i.value(), 1);
+            redAdjust = _parseColorArr(i.value(), 1);
         } else if (i.key() == "g" || i.key() == "greenadjust") {
-            _greenAdjust_m = _parseColorArr(i.value(), 1);
+            greenAdjust = _parseColorArr(i.value(), 1);
         } else if (i.key() == "b" || i.key() == "blueadjust") {
-            _blueAdjust_m = _parseColorArr(i.value(), 1);
+            blueAdjust = _parseColorArr(i.value(), 1);
         } else if (i.key() == "t" || i.key() == "temperature") {
-            _temperature_m = _parseColorArr(i.value(), 1);
+            temperature = _parseColorArr(i.value(), 1);
         } else if (i.key() == "d" || i.key() == "threshold") {
-            _threshold_m = _parseColorArr(i.value(), 0);
+            threshold = _parseColorArr(i.value(), 0);
         }else if ((i.key() == "l" || i.key() == "transform") && _parseColorArr(i.value(), 0) != "") {
-            _transform_m = i.value();
+            transform = i.value();
         }
     }
 
-    _grabber_p = new hgx11grab(_scale_m.toInt(), _frameskip_m.toUShort());
+    _grabber_p = new hgx11grab(scale, frameskip);
-    _hclient_p = new hgx11net(_addr_m, _port_m.toUShort());
+
+    _hclient_p = new hgx11net(addr, port);
+
     _damage_p = new hgx11damage();
 
     _hclient_p->imgWidth = QString::number(_grabber_p->getDest_width());
     _hclient_p->imgHeight = QString::number(_grabber_p->getDest_height());
-    _hclient_p->ledAdjustments(_redAdjust_m, _greenAdjust_m, _blueAdjust_m, _temperature_m, _threshold_m, _transform_m);
+    _hclient_p->ledAdjustments(redAdjust, greenAdjust, blueAdjust, temperature, threshold, transform);
 
     _damage_p->start();
 

hgx11.h

@@ -23,16 +23,6 @@ private:
     QTimer *_timer_p;
 
     int _inactiveTime_m = 0;
-    QString _addr_m = "localhost";
-    QString _port_m = "19444";
-    QString _scale_m = "8";
-    QString _frameskip_m = "0";
-    QString _redAdjust_m = "";
-    QString _greenAdjust_m = "";
-    QString _blueAdjust_m = "";
-    QString _temperature_m = "";
-    QString _threshold_m = "";
-    QString _transform_m = "";
     QString _destWidth_m;
     QString _destHeight_m;
 
@@ -43,7 +33,6 @@ private slots:
     void _inActivity();
     void _activity();
     void _setImgSize();
-
 };
 
 #endif // HGX11_H

hgx11grab.cpp

@@ -2,7 +2,7 @@
 
 // public
 
-hgx11grab::hgx11grab(int scaleDivisor, ushort frameSkip)
+hgx11grab::hgx11grab(unsigned short scaleDivisor, unsigned short frameSkip)
 {
     _frameSkip_m = frameSkip;
     _x11Display_p = XOpenDisplay(nullptr);

hgx11grab.h

@@ -14,7 +14,7 @@ class hgx11grab : public QObject
 public:
     QByteArray imgdata_m;
 
-    hgx11grab(int, ushort);
+    hgx11grab(unsigned short, unsigned short);
     ~hgx11grab();
 
     int getDest_width() const;