From bdb366013480b17ffeadedc9b862f9a2bc458f38 Mon Sep 17 00:00:00 2001
From: NeoTheFox <soniczerops@gmail.com>
Date: Sun, 15 Mar 2015 16:42:50 +0300
Subject: [PATCH] Removed unneeded concurrent module

---
 RepRaptor.pro  | 2 +-
 mainwindow.cpp | 5 +++--
 mainwindow.h   | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/RepRaptor.pro b/RepRaptor.pro
index e3c5963..7c0cbd1 100644
--- a/RepRaptor.pro
+++ b/RepRaptor.pro
@@ -5,7 +5,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui serialport concurrent
+QT       += core gui serialport
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 2364dc8..90a20f7 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -364,8 +364,9 @@ void MainWindow::homeall()
 
 void MainWindow::on_sendbtn_clicked()
 {
-    emit injectCommand(ui->sendtext->text());
-    userHistory.append(ui->sendtext->text());
+    QString command = ui->sendtext->text();
+    emit injectCommand(command);
+    userHistory.append(command);
     userHistoryPos = 0;
 }
 
diff --git a/mainwindow.h b/mainwindow.h
index 549c029..bd8c31d 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -5,14 +5,13 @@
 #include <QFileDialog>
 #include <QtSerialPort/QtSerialPort>
 #include <QFile>
-#include <QFuture>
+#include <QThread>
 #include <QVector>
 #include <QTextStream>
-#include <QtConcurrent/QtConcurrent>
 #include <QSettings>
 #include <QElapsedTimer>
-#include <QMessageBox>
 #include <QRegExp>
+#include <QMap>
 
 #include "settingswindow.h"
 #include "aboutwindow.h"
@@ -43,6 +42,7 @@ public:
     QThread *senderThread;
 
 protected:
+    QMap <QString, QString> macros;
     QFile gfile;
     QVector<QString> gcode;
     QQueue <QString> userCommands;