fix clang compiler warnings

[proxmark3-svn] / client / proxguiqt.h

diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index aa3b5b355e55ee03caeca0f4c84bc377b5a7d244..45a65b040c5702dc922644c8deb18bbbbe6206a0 100644 (file)
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -11,6 +11,9 @@
 #ifndef PROXGUI_QT
 #define PROXGUI_QT
 
 #ifndef PROXGUI_QT
 #define PROXGUI_QT
 

+#include <stdint.h>
+#include <string.h>
+

 #include <QApplication>
 #include <QPushButton>
 #include <QObject>
 #include <QApplication>
 #include <QPushButton>
 #include <QObject>


@@ -35,6 +38,7 @@ private:
        int xCoordOf(int i, QRect r );
        int yCoordOf(int v, QRect r, int maxVal);
        int valueOf_yCoord(int y, QRect r, int maxVal);
        int xCoordOf(int i, QRect r );
        int yCoordOf(int v, QRect r, int maxVal);
        int valueOf_yCoord(int y, QRect r, int maxVal);

+       void setMaxAndStart(int *buffer, int len, QRect plotRect);

        QColor getColor(int graphNum);
 public:
        Plot(QWidget *parent = 0);
        QColor getColor(int graphNum);
 public:
        Plot(QWidget *parent = 0);


@@ -84,6 +88,18 @@ class ProxWidget : public QWidget
                void vchange_dthr_down(int v);
 };
 
                void vchange_dthr_down(int v);
 };
 

+class WorkerThread : public QThread {
+               Q_OBJECT;
+       public:
+               WorkerThread(char*, char*, bool);
+               ~WorkerThread();
+               void run();
+       private:
+               char *script_cmds_file = NULL;
+               char *script_cmd = NULL;
+               bool usb_present;
+};
+

 class ProxGuiQT : public QObject
 {
        Q_OBJECT;
 class ProxGuiQT : public QObject
 {
        Q_OBJECT;


@@ -94,9 +110,10 @@ class ProxGuiQT : public QObject
                int argc;
                char **argv;
                void (*main_func)(void);
                int argc;
                char **argv;
                void (*main_func)(void);

+               WorkerThread *proxmarkThread;

        
        public:
        
        public:

-               ProxGuiQT(int argc, char **argv);
+               ProxGuiQT(int argc, char **argv, WorkerThread *wthread);

                ~ProxGuiQT(void);
                void ShowGraphWindow(void);
                void RepaintGraphWindow(void);
                ~ProxGuiQT(void);
                void ShowGraphWindow(void);
                void RepaintGraphWindow(void);


@@ -108,10 +125,12 @@ class ProxGuiQT : public QObject
                void _RepaintGraphWindow(void);
                void _HideGraphWindow(void);
                void _Exit(void);
                void _RepaintGraphWindow(void);
                void _HideGraphWindow(void);
                void _Exit(void);

+               void _StartProxmarkThread(void);

        signals:
                void ShowGraphWindowSignal(void);
                void RepaintGraphWindowSignal(void);
                void HideGraphWindowSignal(void);
                void ExitSignal(void);
 };
        signals:
                void ShowGraphWindowSignal(void);
                void RepaintGraphWindowSignal(void);
                void HideGraphWindowSignal(void);
                void ExitSignal(void);
 };

+

 #endif // PROXGUI_QT
 #endif // PROXGUI_QT