jansson update. 2.11 to 2.12 (#724)

[proxmark3-svn] / client / proxguiqt.h

diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index 4b2b2a2773054db7f24d38c7c090ea28b71b0bc8..5f7199fc09202ea2660c55fb7043c027a7b197bf 100644 (file)
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -21,7 +21,6 @@
 #include <QPainter>
 #include <QtGui>
 
-#include "uart.h"
 #include "ui/ui_overlays.h"
 /**
  * @brief The actual plot, black area were we paint the graph
@@ -29,6 +28,7 @@
 class Plot: public QWidget
 {
 private:
+       QWidget *master;
        int GraphStart;
        double GraphPixelsPerPoint;
        int CursorAPos;
@@ -92,14 +92,13 @@ class ProxWidget : public QWidget
 class WorkerThread : public QThread {
                Q_OBJECT;
        public:
-               WorkerThread(char*, char*, bool, serial_port*);
+               WorkerThread(char*, char*, bool);
                ~WorkerThread();
                void run();
        private:
                char *script_cmds_file = NULL;
                char *script_cmd = NULL;
                bool usb_present;
-               serial_port *sp = NULL;
 };
 
 class ProxGuiQT : public QObject
@@ -111,7 +110,6 @@ class ProxGuiQT : public QObject
                ProxWidget *plotwidget;
                int argc;
                char **argv;
-               void (*main_func)(void);
                WorkerThread *proxmarkThread;
        
        public: