From 1ca24defb53765a8ca5ecd1aed396296fc1f4456 Mon Sep 17 00:00:00 2001
From: Vaclav Mares <maresva2@fit.cvut.cz>
Date: Wed, 5 Apr 2017 19:09:37 +0200
Subject: [PATCH] Adding folder structure

Fixing #includes
---
 agui2/ALIB.pro                                | 28 +++++++++----------
 agui2/connectionhelper.h                      |  4 +--
 agui2/{ => graphics/dialogs}/inputdialog.cpp  |  0
 agui2/{ => graphics/dialogs}/inputdialog.h    |  0
 agui2/{ => graphics/dialogs}/outputdialog.cpp |  0
 agui2/{ => graphics/dialogs}/outputdialog.h   |  0
 agui2/{ => graphics}/graphicsbox.cpp          |  2 +-
 agui2/{ => graphics}/graphicsbox.h            |  0
 agui2/{ => graphics}/graphicsconnection.cpp   |  0
 agui2/{ => graphics}/graphicsconnection.h     |  0
 agui2/{ => graphics}/graphicsscene.cpp        |  0
 agui2/{ => graphics}/graphicsscene.h          |  0
 agui2/{ => graphics}/inputgraphicsbox.cpp     |  8 +++---
 agui2/{ => graphics}/inputgraphicsbox.h       |  0
 agui2/{ => graphics}/outputgraphicsbox.cpp    |  2 +-
 agui2/{ => graphics}/outputgraphicsbox.h      |  0
 agui2/mainwindow.cpp                          |  6 ++--
 agui2/mainwindow.h                            |  2 +-
 agui2/modelbox.cpp                            |  2 +-
 agui2/wrapperbox.h                            |  4 +--
 20 files changed, 29 insertions(+), 29 deletions(-)
 rename agui2/{ => graphics/dialogs}/inputdialog.cpp (100%)
 rename agui2/{ => graphics/dialogs}/inputdialog.h (100%)
 rename agui2/{ => graphics/dialogs}/outputdialog.cpp (100%)
 rename agui2/{ => graphics/dialogs}/outputdialog.h (100%)
 rename agui2/{ => graphics}/graphicsbox.cpp (98%)
 rename agui2/{ => graphics}/graphicsbox.h (100%)
 rename agui2/{ => graphics}/graphicsconnection.cpp (100%)
 rename agui2/{ => graphics}/graphicsconnection.h (100%)
 rename agui2/{ => graphics}/graphicsscene.cpp (100%)
 rename agui2/{ => graphics}/graphicsscene.h (100%)
 rename agui2/{ => graphics}/inputgraphicsbox.cpp (95%)
 rename agui2/{ => graphics}/inputgraphicsbox.h (100%)
 rename agui2/{ => graphics}/outputgraphicsbox.cpp (93%)
 rename agui2/{ => graphics}/outputgraphicsbox.h (100%)

diff --git a/agui2/ALIB.pro b/agui2/ALIB.pro
index 25cca99caf..d44856a9d8 100644
--- a/agui2/ALIB.pro
+++ b/agui2/ALIB.pro
@@ -28,28 +28,28 @@ QMAKE_LFLAGS += -Wl,-no-as-needed
 SOURCES += main.cpp\
         mainwindow.cpp \
     $${ALIB_PATH}/aconvert2/src/DotConverter.cpp \
-    graphicsbox.cpp \
-    inputdialog.cpp \
-    graphicsconnection.cpp \
-    graphicsscene.cpp \
     connectionhelper.cpp \
     modelbox.cpp \
-    inputgraphicsbox.cpp \
     wrapperbox.cpp \
-    outputgraphicsbox.cpp \
-    outputdialog.cpp
+    graphics/graphicsbox.cpp \
+    graphics/graphicsconnection.cpp \
+    graphics/graphicsscene.cpp \
+    graphics/inputgraphicsbox.cpp \
+    graphics/outputgraphicsbox.cpp \
+    graphics/dialogs/outputdialog.cpp \
+    graphics/dialogs/inputdialog.cpp
 
 HEADERS  += mainwindow.h \
-    graphicsbox.h \
-    inputdialog.h \
-    graphicsconnection.h \
-    graphicsscene.h \
     connectionhelper.h \
     modelbox.h \
-    inputgraphicsbox.h \
     wrapperbox.h \
-    outputgraphicsbox.h \
-    outputdialog.h
+    graphics/graphicsbox.h \
+    graphics/graphicsconnection.h \
+    graphics/graphicsscene.h \
+    graphics/inputgraphicsbox.h \
+    graphics/outputgraphicsbox.h \
+    graphics/dialogs/inputdialog.h \
+    graphics/dialogs/outputdialog.h
 
 FORMS    += mainwindow.ui \
     inputdialog.ui \
diff --git a/agui2/connectionhelper.h b/agui2/connectionhelper.h
index 366845e7f8..1883f03565 100644
--- a/agui2/connectionhelper.h
+++ b/agui2/connectionhelper.h
@@ -1,8 +1,8 @@
 #ifndef CONNECTIONHELPER_H
 #define CONNECTIONHELPER_H
 
-#include "graphicsconnection.h"
-#include "graphicsbox.h"
+#include "graphics/graphicsconnection.h"
+#include "graphics/graphicsbox.h"
 
 class ConnectionHelper
 {
diff --git a/agui2/inputdialog.cpp b/agui2/graphics/dialogs/inputdialog.cpp
similarity index 100%
rename from agui2/inputdialog.cpp
rename to agui2/graphics/dialogs/inputdialog.cpp
diff --git a/agui2/inputdialog.h b/agui2/graphics/dialogs/inputdialog.h
similarity index 100%
rename from agui2/inputdialog.h
rename to agui2/graphics/dialogs/inputdialog.h
diff --git a/agui2/outputdialog.cpp b/agui2/graphics/dialogs/outputdialog.cpp
similarity index 100%
rename from agui2/outputdialog.cpp
rename to agui2/graphics/dialogs/outputdialog.cpp
diff --git a/agui2/outputdialog.h b/agui2/graphics/dialogs/outputdialog.h
similarity index 100%
rename from agui2/outputdialog.h
rename to agui2/graphics/dialogs/outputdialog.h
diff --git a/agui2/graphicsbox.cpp b/agui2/graphics/graphicsbox.cpp
similarity index 98%
rename from agui2/graphicsbox.cpp
rename to agui2/graphics/graphicsbox.cpp
index 432506570d..b84986f0d0 100644
--- a/agui2/graphicsbox.cpp
+++ b/agui2/graphics/graphicsbox.cpp
@@ -5,10 +5,10 @@
 #include <QGraphicsScene>
 
 #include "graphicsbox.h"
-#include "inputdialog.h"
 #include "graphicsconnection.h"
 #include "graphicsscene.h"
 #include "connectionhelper.h"
+#include "dialogs/inputdialog.h"
 
 GraphicsBox::GraphicsBox(QString text, qreal x, qreal y)
     : QGraphicsObject( NULL )
diff --git a/agui2/graphicsbox.h b/agui2/graphics/graphicsbox.h
similarity index 100%
rename from agui2/graphicsbox.h
rename to agui2/graphics/graphicsbox.h
diff --git a/agui2/graphicsconnection.cpp b/agui2/graphics/graphicsconnection.cpp
similarity index 100%
rename from agui2/graphicsconnection.cpp
rename to agui2/graphics/graphicsconnection.cpp
diff --git a/agui2/graphicsconnection.h b/agui2/graphics/graphicsconnection.h
similarity index 100%
rename from agui2/graphicsconnection.h
rename to agui2/graphics/graphicsconnection.h
diff --git a/agui2/graphicsscene.cpp b/agui2/graphics/graphicsscene.cpp
similarity index 100%
rename from agui2/graphicsscene.cpp
rename to agui2/graphics/graphicsscene.cpp
diff --git a/agui2/graphicsscene.h b/agui2/graphics/graphicsscene.h
similarity index 100%
rename from agui2/graphicsscene.h
rename to agui2/graphics/graphicsscene.h
diff --git a/agui2/inputgraphicsbox.cpp b/agui2/graphics/inputgraphicsbox.cpp
similarity index 95%
rename from agui2/inputgraphicsbox.cpp
rename to agui2/graphics/inputgraphicsbox.cpp
index e24ebf1e6b..9bdc02de6a 100644
--- a/agui2/inputgraphicsbox.cpp
+++ b/agui2/graphics/inputgraphicsbox.cpp
@@ -1,11 +1,11 @@
-#include "inputgraphicsbox.h"
-#include "inputdialog.h"
-#include "connectionhelper.h"
-
 #include <QMenu>
 #include <QAction>
 #include <QObject>
 
+#include "inputgraphicsbox.h"
+#include "connectionhelper.h"
+#include "dialogs/inputdialog.h"
+
 void InputGraphicsBox::on_SetInput()
 {
     InputDialog * inputDlg = new InputDialog();
diff --git a/agui2/inputgraphicsbox.h b/agui2/graphics/inputgraphicsbox.h
similarity index 100%
rename from agui2/inputgraphicsbox.h
rename to agui2/graphics/inputgraphicsbox.h
diff --git a/agui2/outputgraphicsbox.cpp b/agui2/graphics/outputgraphicsbox.cpp
similarity index 93%
rename from agui2/outputgraphicsbox.cpp
rename to agui2/graphics/outputgraphicsbox.cpp
index d4257aa01f..0c3369f605 100644
--- a/agui2/outputgraphicsbox.cpp
+++ b/agui2/graphics/outputgraphicsbox.cpp
@@ -1,5 +1,5 @@
 #include "outputgraphicsbox.h"
-#include "outputdialog.h"
+#include "dialogs/outputdialog.h"
 
 #include <QMenu>
 #include <QAction>
diff --git a/agui2/outputgraphicsbox.h b/agui2/graphics/outputgraphicsbox.h
similarity index 100%
rename from agui2/outputgraphicsbox.h
rename to agui2/graphics/outputgraphicsbox.h
diff --git a/agui2/mainwindow.cpp b/agui2/mainwindow.cpp
index f1819b7828..e9b0aa7dd9 100644
--- a/agui2/mainwindow.cpp
+++ b/agui2/mainwindow.cpp
@@ -7,9 +7,9 @@
 
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
-#include "inputdialog.h"
-#include "inputgraphicsbox.h"
-#include "outputgraphicsbox.h"
+#include "graphics/inputgraphicsbox.h"
+#include "graphics/outputgraphicsbox.h"
+#include "graphics/dialogs/inputdialog.h"
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
diff --git a/agui2/mainwindow.h b/agui2/mainwindow.h
index bfd6c3028b..fbb4957304 100644
--- a/agui2/mainwindow.h
+++ b/agui2/mainwindow.h
@@ -8,7 +8,7 @@
 #include <QGraphicsItem>
 
 #include "modelbox.h"
-#include "graphicsscene.h"
+#include "graphics/graphicsscene.h"
 
 namespace Ui {
 class MainWindow;
diff --git a/agui2/modelbox.cpp b/agui2/modelbox.cpp
index d9129b82bd..d830f8a62a 100644
--- a/agui2/modelbox.cpp
+++ b/agui2/modelbox.cpp
@@ -1,5 +1,5 @@
 #include "modelbox.h"
-#include "inputgraphicsbox.h"
+#include "graphics/inputgraphicsbox.h"
 
 ModelBox::ModelBox(int maxInConnections, int maxOutConnections)
     : m_maxInConnections( maxInConnections ), m_maxOutConnections( maxOutConnections )
diff --git a/agui2/wrapperbox.h b/agui2/wrapperbox.h
index 9de898e0d3..a70a787d6c 100644
--- a/agui2/wrapperbox.h
+++ b/agui2/wrapperbox.h
@@ -2,8 +2,8 @@
 #define WRAPPERBOX_H
 
 #include "modelbox.h"
-#include "graphicsbox.h"
-#include "graphicsconnection.h"
+#include "graphics/graphicsbox.h"
+#include "graphics/graphicsconnection.h"
 
 class ModelBox;
 class GraphicsBox;
-- 
GitLab