X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/afdcb8c159a73aba95a017f1cfec98e8fa2b93c1..refs/pull/461/head:/client/proxgui.cpp?ds=inline diff --git a/client/proxgui.cpp b/client/proxgui.cpp index 6e4ec98e..e899174c 100644 --- a/client/proxgui.cpp +++ b/client/proxgui.cpp @@ -11,15 +11,11 @@ #include "proxgui.h" #include "proxguiqt.h" #include "proxmark3.h" -#include "uart.h" static ProxGuiQT *gui = NULL; static WorkerThread *main_loop_thread = NULL; -WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd, - bool usb_present, serial_port* sp) - : script_cmds_file(script_cmds_file), script_cmd(script_cmd), - usb_present(usb_present), sp(sp) +WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd, bool usb_present) : script_cmds_file(script_cmds_file), script_cmd(script_cmd), usb_present(usb_present) { } @@ -28,7 +24,7 @@ WorkerThread::~WorkerThread() } void WorkerThread::run() { - main_loop(script_cmds_file, script_cmd, usb_present, sp); + main_loop(script_cmds_file, script_cmd, usb_present); } extern "C" void ShowGraphWindow(void) @@ -63,9 +59,7 @@ extern "C" void MainGraphics(void) gui->MainLoop(); } -extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, - char *script_cmd, bool usb_present, - serial_port* sp) +extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool usb_present) { #ifdef Q_WS_X11 bool useGUI = getenv("DISPLAY") != 0; @@ -75,7 +69,7 @@ extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, if (!useGUI) return; - main_loop_thread = new WorkerThread(script_cmds_file, script_cmd, usb_present, sp); + main_loop_thread = new WorkerThread(script_cmds_file, script_cmd, usb_present); gui = new ProxGuiQT(argc, argv, main_loop_thread); }