Switch to cmake

src/actors/actor.h

@@ -5,7 +5,7 @@
 #include <QString>
 #include <QJsonObject>
 
-#include "src/items/item.h"
+#include "items/item.h"
 
 class Actor : public Item
 {

src/actors/polynomalactor.h

@@ -1,7 +1,7 @@
 #ifndef POLYNOMALACTOR_H
 #define POLYNOMALACTOR_H
 #include "actor.h"
-#include "src/sensors/sensor.h"
+#include "sensors/sensor.h"
 
 class PolynomalActor: public Actor
 {

src/actors/regulator.h

@@ -3,7 +3,7 @@
 #include <QTimer>
 
 #include "actor.h"
-#include "src/sensors/sensor.h"
+#include "sensors/sensor.h"
 
 class Regulator : public Actor
 {

src/actors/sensoractor.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "actor.h"
-#include "src/sensors/sensor.h"
+#include "sensors/sensor.h"
 
 class SensorActor : public Actor
 {

src/items/auxitem.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "item.h"
-#include "src/microcontroller.h"
+#include "microcontroller.h"
 
 class AuxItem: public Item
 {

src/items/fixeditemsource.h

@@ -5,7 +5,7 @@
 #include "poweritem.h"
 #include "rgbitem.h"
 #include "auxitem.h"
-#include "src/microcontroller.h"
+#include "microcontroller.h"
 
 class FixedItemSource : public ItemSource
 {

src/items/item.cpp

@@ -1,9 +1,9 @@
 #include "item.h"
 
-#include "src/actors/sensoractor.h"
-#include "src/actors/regulator.h"
-#include "src/actors/polynomalactor.h"
-#include "src/programmode.h"
+#include "actors/sensoractor.h"
+#include "actors/regulator.h"
+#include "actors/polynomalactor.h"
+#include "programmode.h"
 #include "relay.h"
 #include "messageitem.h"
 #include "systemitem.h"

src/items/poweritem.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "item.h"
-#include "src/sensors/sensor.h"
-#include "src/microcontroller.h"
+#include "sensors/sensor.h"
+#include "microcontroller.h"
 
 #include <QTimer>
 

src/items/relay.h

@@ -4,7 +4,7 @@
 #include<stdint.h>
 #include<QObject>
 
-#include "src/sensors/sensor.h"
+#include "sensors/sensor.h"
 #include "item.h"
 
 class Microcontroller;

src/items/rgbitem.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/microcontroller.h"
+#include "microcontroller.h"
 #include "item.h"
 
 class RgbItem: public Item

src/main.cpp

@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
 
 			QTcpSocket* microSocket = new QTcpSocket;
 
-			qInfo()<<"connecting to "<<host.toStdString()<<':'<<port<<" for tcp micro";
+			qInfo()<<"connecting to "<<host<<':'<<port<<" for tcp micro";
 			microSocket->connectToHost(host, port, QIODevice::ReadWrite);
 
 			if(!microSocket->waitForConnected(1000))

src/sensors/sunsensor.h

@@ -2,7 +2,7 @@
 
 #include <QTimer>
 
-#include "src/sun.h"
+#include "sun.h"
 #include "sensor.h"
 
 

src/ui/actorwidgets/polynomalactorwidget.ui

@@ -132,7 +132,7 @@
   <customwidget>
    <class>SensorListWidget</class>
    <extends>QListView</extends>
-   <header location="local">src/ui/sensorlistwidget.h</header>
+   <header location="local">ui/sensorlistwidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

src/ui/actorwidgets/regulatorwdiget.ui

@@ -110,7 +110,7 @@
   <customwidget>
    <class>SensorListWidget</class>
    <extends>QListView</extends>
-   <header location="local">src/ui/sensorlistwidget.h</header>
+   <header location="local">ui/sensorlistwidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

src/ui/actorwidgets/sensoractorwidget.ui

@@ -89,7 +89,7 @@
   <customwidget>
    <class>SensorListWidget</class>
    <extends>QListView</extends>
-   <header location="local">src/ui/sensorlistwidget.h</header>
+   <header location="local">ui/sensorlistwidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

src/ui/itemsettingsdialog.cpp

@@ -8,9 +8,9 @@
 #include "../actors/factoractor.h"
 #include "../items/messageitem.h"
 #include "../items/systemitem.h"
-#include "./itemsettingswidgets/messageitemsettingswidget.h"
-#include "./itemsettingswidgets/systemitemsettingswidget.h"
-#include "./itemsettingswidgets/relayitemsettingswidget.h"
+#include "itemsettingswidgets/messageitemsettingswidget.h"
+#include "itemsettingswidgets/systemitemsettingswidget.h"
+#include "itemsettingswidgets/relayitemsettingswidget.h"
 #include<memory>
 
 ItemSettingsDialog::ItemSettingsDialog(std::shared_ptr<Item> item, QWidget *parent) :

src/ui/mainwindow-android.ui

@@ -245,13 +245,13 @@
   <customwidget>
    <class>ItemScrollBox</class>
    <extends>QWidget</extends>
-   <header location="global">../src/ui/itemscrollbox.h</header>
+   <header location="global">../ui/itemscrollbox.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>SensorListWidget</class>
    <extends>QListView</extends>
-   <header location="global">../src/ui/sensorlistwidget.h</header>
+   <header location="global">../ui/sensorlistwidget.h</header>
   </customwidget>
  </customwidgets>
  <resources>

src/ui/mainwindow.cpp

@@ -6,9 +6,9 @@
 #include "itemscrollbox.h"
 #include "itemsettingsdialog.h"
 #include "itemcreationdialog.h"
-#include "src/mainobject.h"
-#include "src/programmode.h"
-#include "src/items/poweritem.h"
+#include "mainobject.h"
+#include "programmode.h"
+#include "items/poweritem.h"
 
 MainWindow::MainWindow(MainObject * const mainObject, QWidget *parent) :
 	QMainWindow(parent),

src/ui/mainwindow.h

@@ -7,7 +7,7 @@
 #include <QTime>
 #include <memory>
 
-#include<src/items/item.h>
+#include<items/item.h>
 
 class MainObject;
 

src/ui/mainwindow.ui

@@ -249,12 +249,12 @@
   <customwidget>
    <class>SensorListWidget</class>
    <extends>QListView</extends>
-   <header location="global">src/ui/sensorlistwidget.h</header>
+   <header location="global">ui/sensorlistwidget.h</header>
   </customwidget>
   <customwidget>
    <class>ItemScrollBox</class>
    <extends>QWidget</extends>
-   <header location="global">src/ui/itemscrollbox.h</header>
+   <header location="global">ui/itemscrollbox.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

src/ui/sensorlistwidget.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <QTableWidget>
 #include <vector>
-#include "src/sensors/sensor.h"
+#include "sensors/sensor.h"
 
 class SensorListItem : public QTableWidgetItem
 {