diff --git a/framesenderwindow.cpp b/framesenderwindow.cpp index 818fdab..dd09216 100644 --- a/framesenderwindow.cpp +++ b/framesenderwindow.cpp @@ -32,13 +32,13 @@ FrameSenderWindow::FrameSenderWindow(const QVector *frames, QWidget *p createBlankRow(); connect(ui->tableSender, SIGNAL(cellChanged(int,int)), this, SLOT(onCellChanged(int,int))); - connect(intervalTimer, SIGNAL(timeout()), this, SLOT(handleTick()), Qt::QueuedConnection); + connect(intervalTimer, SIGNAL(timeout()), this, SLOT(handleTick())); connect(ui->btnClearGrid, SIGNAL(clicked(bool)), this, SLOT(clearGrid())); connect(ui->btnDisableAll, SIGNAL(clicked(bool)), this, SLOT(disableAll())); connect(ui->btnEnableAll, SIGNAL(clicked(bool)), this, SLOT(enableAll())); connect(ui->btnLoadGrid, SIGNAL(clicked(bool)), this, SLOT(loadGrid())); connect(ui->btnSaveGrid, SIGNAL(clicked(bool)), this, SLOT(saveGrid())); - connect(MainWindow::getReference(), SIGNAL(framesUpdated(int)), this, SLOT(updatedFrames(int)), Qt::QueuedConnection); + connect(MainWindow::getReference(), SIGNAL(framesUpdated(int)), this, SLOT(updatedFrames(int))); intervalTimer->start(); elapsedTimer.start(); @@ -195,7 +195,7 @@ void FrameSenderWindow::processIncomingFrame(CANFrame *frame) sendingData[sd].count++; doModifiers(sd); updateGridRow(sd); - CANConManager::getInstance()->sendFrame(CANFrame(sendingData[sd])); + CANConManager::getInstance()->sendFrame(sendingData[sd]); } else //delayed sending frame { diff --git a/framesenderwindow.h b/framesenderwindow.h index c07531d..8a5cd94 100644 --- a/framesenderwindow.h +++ b/framesenderwindow.h @@ -5,7 +5,6 @@ #include #include #include -#include #include "can_structs.h" #include "can_trigger_structs.h" diff --git a/main.cpp b/main.cpp index 1a6b3ca..df2f4a4 100644 --- a/main.cpp +++ b/main.cpp @@ -25,9 +25,9 @@ public: int main(int argc, char *argv[]) { #ifdef QT_DEBUG - qputenv("QT_FATAL_WARNINGS", "1"); - //qputenv("QT_MESSAGE_PATTERN", "Type: %{type}\nProduct Name: %{appname}\nFile: %{file}\nLine: %{line}\nMethod: %{function}\nThreadID: %{threadid}\nThreadPtr: %{qthreadptr}\nMessage: %{message}"); - qSetMessagePattern("Type: %{type}\nProduct Name: %{appname}\nFile: %{file}\nLine: %{line}\nMethod: %{function}\nThreadID: %{threadid}\nThreadPtr: %{qthreadptr}\nMessage: %{message}"); + //uncomment for verbose debug data in application output + //qputenv("QT_FATAL_WARNINGS", "1"); + //qSetMessagePattern("Type: %{type}\nProduct Name: %{appname}\nFile: %{file}\nLine: %{line}\nMethod: %{function}\nThreadID: %{threadid}\nThreadPtr: %{qthreadptr}\nMessage: %{message}"); #endif SavvyCANApplication a(argc, argv);