--- a/src/SimulatorSocketServer.h Thu Mar 14 16:46:16 2019 +0100
+++ b/src/SimulatorSocketServer.h Thu Mar 14 17:41:43 2019 +0100
@@ -17,7 +17,7 @@
*/
#pragma once
-#include <qt5/QtCore/QObject>
+#include <QObject>
#include "MotionEvent.h"
#include "ButtonEvent.h"
--- a/src/SimulatorWindow.cpp Thu Mar 14 16:46:16 2019 +0100
+++ b/src/SimulatorWindow.cpp Thu Mar 14 17:41:43 2019 +0100
@@ -16,10 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <QtWidgets/QFormLayout>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QGridLayout>
-#include <qt5/QtCore/qobject.h>
+#include <QFormLayout>
+#include <QLabel>
+#include <QGridLayout>
+#include <QObject>
#include "SimulatorWindow.h"
@@ -95,6 +95,7 @@
}
void SimulatorWindow::centerAll() {
+ // TODO: add option for suppressing events in sendMotionEvent() and call this method from here instead of through sliders signals, so only one event will be emitted?
for (QSlider* s : motions) s->setValue(0);
for (QSlider* s : rotations) s->setValue(0);
}
--- a/src/SimulatorWindow.h Thu Mar 14 16:46:16 2019 +0100
+++ b/src/SimulatorWindow.h Thu Mar 14 17:41:43 2019 +0100
@@ -18,10 +18,10 @@
#pragma once
#include <vector>
-#include <QtWidgets/QMainWindow>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QSlider>
-#include <QtWidgets/QPushButton>
+#include <QMainWindow>
+#include <QCheckBox>
+#include <QSlider>
+#include <QPushButton>
#include "MotionEvent.h"
#include "ButtonEvent.h"