cleanup

CMakeLists.txt

@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.6)
 project(cpp_nanotekspice)
+include_directories(include)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
@@ -12,7 +13,7 @@ set(CMAKE_CXX_STANDARD 11)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall -Werror -std=c++11")
 
-set(SOURCE_FILES src/components/Clock.cpp src/components/c4040.cpp src/components/AComponent.cpp src/components/c4008.cpp src/components/c4013.cpp src/components/c4017.cpp src/components/c4001.cpp src/components/False.cpp src/components/Input.cpp src/components/c4011.cpp src/components/c4030.cpp src/components/c4069.cpp src/components/c4071.cpp src/components/c4081.cpp src/components/Pin.cpp src/components/Tristate.cpp src/components/Output.cpp src/components/True.cpp main.cpp src/editor/elements/Block.cpp src/editor/elements/Connection.cpp src/editor/MainWindow.cpp src/editor/elements/Port.cpp src/editor/Editor.cpp src/editor/EditorView.cpp src/editor/EditorView.h)
+set(SOURCE_FILES src/components/Clock.cpp include/MainWindow.hpp include/Connection.hpp include/Editor.hpp include/c4001.hpp include/c4001.hpp include/c4008.hpp include/c4013.hpp include/c4040.hpp src/components/c4040.cpp src/components/AComponent.cpp src/components/c4008.cpp src/components/c4013.cpp src/components/c4017.cpp src/components/c4001.cpp src/components/False.cpp src/components/Input.cpp src/components/c4011.cpp src/components/c4030.cpp src/components/c4069.cpp src/components/c4071.cpp src/components/c4081.cpp src/components/Pin.cpp src/components/Tristate.cpp src/components/Output.cpp src/components/True.cpp src/main_editor.cpp src/editor/elements/Block.cpp src/editor/elements/Connection.cpp src/editor/MainWindow.cpp src/editor/elements/Port.cpp src/editor/Editor.cpp src/editor/EditorView.cpp include/EditorView.hpp)
 add_executable(cpp_nanotekspice ${SOURCE_FILES})
 
 target_link_libraries(cpp_nanotekspice ${CURSES_LIBRARIES})

src/editor/elements/Block.h → include/Block.hpp

@@ -2,8 +2,8 @@
 #define QNEBLOCK_H
 
 #include <QGraphicsPathItem>
-#include <src/components/Pin.hpp>
-#include <src/components/AComponent.hpp>
+#include "Pin.hpp"
+#include "AComponent.hpp"
 
 namespace nts {
 

src/editor/Editor.h → include/Editor.hpp

@@ -3,7 +3,7 @@
 
 #include <QObject>
 #include <QtWidgets/QGraphicsScene>
-#include <src/editor/elements/Connection.h>
+#include <include/Connection.hpp>
 
 
 class QPointF;

src/editor/MainWindow.h → include/MainWindow.hpp

@@ -3,11 +3,12 @@
 
 #include <QMainWindow>
 #include <QtWidgets>
-#include <src/components/IComponent.hpp>
-#include <src/components/Pin.hpp>
-#include <src/components/AComponent.hpp>
-#include <src/editor/elements/Block.h>
-#include "EditorView.h"
+#include "AComponent.hpp"
+#include "IComponent.hpp"
+#include "Pin.hpp"
+#include "AComponent.hpp"
+#include "Block.hpp"
+#include "EditorView.hpp"
 
 
 namespace nts {

src/editor/elements/Port.h → include/Port.hpp

@@ -2,7 +2,7 @@
 #define QNEPORT_H
 
 #include <QGraphicsPathItem>
-#include <src/components/Pin.hpp>
+#include "Pin.hpp"
 
 
 namespace nts {

src/editor/Editor.cpp

@@ -1,12 +1,12 @@
-#include "Editor.h"
+#include "Editor.hpp"
 
 #include <QEvent>
 #include <QGraphicsSceneMouseEvent>
 #include <QtWidgets/QGraphicsItem>
 
-#include "src/editor/elements/Port.h"
-#include "src/editor/elements/Connection.h"
-#include "src/editor/elements/Block.h"
+#include "include/Port.hpp"
+#include "include/Connection.hpp"
+#include "include/Block.hpp"
 
 namespace nts {
     Editor::Editor(::QObject *parent) :

src/editor/EditorView.cpp

@@ -5,7 +5,7 @@
 #include <QtWidgets/QAction>
 #include <QtWidgets/QMenu>
 #include <QtWidgets/QPushButton>
-#include "EditorView.h"
+#include "EditorView.hpp"
 
 namespace nts {
     static const int GRID_STEP = 30;

src/editor/MainWindow.cpp

@@ -1,14 +1,14 @@
-#include "MainWindow.h"
+#include "MainWindow.hpp"
 
-#include "Editor.h"
+#include "Editor.hpp"
 
-#include "src/editor/elements/Port.h"
+#include "Port.hpp"
 #include <typeinfo>
-#include <src/components/Input.hpp>
-#include <src/components/True.hpp>
-#include <src/components/False.hpp>
-#include <src/components/Clock.hpp>
-#include <src/components/Output.hpp>
+#include "Input.hpp"
+#include "True.hpp"
+#include "False.hpp"
+#include "Clock.hpp"
+#include "Output.hpp"
 
 namespace nts {
 

src/editor/elements/Block.cpp

@@ -1,14 +1,14 @@
-#include "Block.h"
+#include "Block.hpp"
 
 #include <QPen>
 #include <QGraphicsScene>
 #include <QFontMetrics>
 #include <QPainter>
 
 #include <QStyleOptionGraphicsItem>
-#include <src/components/Pin.hpp>
+#include "Pin.hpp"
 
-#include "Port.h"
+#include "Port.hpp"
 
 namespace nts {
     Block::Block(QGraphicsItem *parent) : QGraphicsPathItem(parent) {

src/editor/elements/Connection.cpp

@@ -1,6 +1,6 @@
-#include "Connection.h"
+#include "Connection.hpp"
 
-#include "Port.h"
+#include "Port.hpp"
 
 #include <QBrush>
 #include <QPen>

src/editor/elements/Port.cpp

@@ -1,9 +1,9 @@
-#include "Port.h"
+#include "Port.hpp"
 
 #include <QGraphicsScene>
 #include <QFontMetrics>
 
-#include "Connection.h"
+#include "Connection.hpp"
 
 namespace nts {
     Port::Port(QGraphicsItem *parent) :

src/main_editor.cpp

@@ -1,9 +1,9 @@
 #include <QtWidgets>
-#include <src/components/IComponent.hpp>
-#include <src/components/True.hpp>
-#include <src/components/c4001.hpp>
-#include <src/components/Output.hpp>
-#include "src/editor/MainWindow.h"
+#include "IComponent.hpp"
+#include "True.hpp"
+#include "c4001.hpp"
+#include "Output.hpp"
+#include "include/MainWindow.hpp"
 #include <typeinfo>
 #include <cxxabi.h>