From 73a9f69f2df0edfaaeccc15fff3dcc091cb880b2 Mon Sep 17 00:00:00 2001 From: Martin Hanzik <martin@hanzik.com> Date: Wed, 28 Mar 2018 17:06:36 +0200 Subject: [PATCH] Rename files to match class names --- ...onhandler.cpp => AlibExceptionHandler.cpp} | 2 +- ...eptionhandler.h => AlibExceptionHandler.h} | 0 agui2/CMakeLists.txt | 84 +++++++++---------- ...nectionhelper.cpp => ConnectionHelper.cpp} | 2 +- ...{connectionhelper.h => ConnectionHelper.h} | 4 +- agui2/{converter.cpp => Converter.cpp} | 4 +- agui2/{converter.h => Converter.h} | 0 agui2/{dialog.ui => Dialog.ui} | 0 .../Dialogs/InputDialog.cpp} | 6 +- .../Dialogs/InputDialog.h} | 4 +- .../Dialogs/InputDialog.ui} | 0 .../Dialogs/OutputDialog.cpp} | 4 +- .../Dialogs/OutputDialog.h} | 6 +- .../Dialogs/OutputDialog.ui} | 0 .../Dialogs/ResultDialog.cpp} | 4 +- .../Dialogs/ResultDialog.h} | 2 +- .../Dialogs/ResultDialog.ui} | 0 .../DoubleGraphicsBox.cpp} | 2 +- .../DoubleGraphicsBox.h} | 2 +- .../GraphicsBox.cpp} | 10 +-- .../graphicsbox.h => Graphics/GraphicsBox.h} | 4 +- .../GraphicsConnection.cpp} | 4 +- .../GraphicsConnection.h} | 2 +- .../GraphicsScene.cpp} | 6 +- .../GraphicsScene.h} | 2 +- .../InputGraphicsBox.cpp} | 8 +- .../InputGraphicsBox.h} | 4 +- .../OutputGraphicsBox.cpp} | 2 +- .../OutputGraphicsBox.h} | 6 +- ...zintegrator.cpp => GraphvizIntegrator.cpp} | 2 +- ...phvizintegrator.h => GraphvizIntegrator.h} | 0 agui2/{mainwindow.cpp => MainWindow.cpp} | 14 ++-- agui2/{mainwindow.h => MainWindow.h} | 6 +- agui2/{mainwindow.ui => MainWindow.ui} | 0 .../DoubleModelBox.cpp} | 2 +- .../DoubleModelBox.h} | 2 +- .../InputModelBox.cpp} | 2 +- .../InputModelBox.h} | 2 +- .../modelbox.cpp => Models/ModelBox.cpp} | 4 +- .../{models/modelbox.h => Models/ModelBox.h} | 4 +- .../OutputModelBox.cpp} | 8 +- .../OutputModelBox.h} | 4 +- .../SingleModelBox.cpp} | 2 +- .../SingleModelBox.h} | 2 +- agui2/{wrapperbox.cpp => WrapperBox.cpp} | 2 +- agui2/{wrapperbox.h => WrapperBox.h} | 6 +- ...{wrapperfactory.cpp => WrapperFactory.cpp} | 16 ++-- agui2/{wrapperfactory.h => WrapperFactory.h} | 2 +- agui2/main.cpp | 2 +- 49 files changed, 128 insertions(+), 128 deletions(-) rename agui2/{alibexceptionhandler.cpp => AlibExceptionHandler.cpp} (96%) rename agui2/{alibexceptionhandler.h => AlibExceptionHandler.h} (100%) rename agui2/{connectionhelper.cpp => ConnectionHelper.cpp} (95%) rename agui2/{connectionhelper.h => ConnectionHelper.h} (79%) rename agui2/{converter.cpp => Converter.cpp} (98%) rename agui2/{converter.h => Converter.h} (100%) rename agui2/{dialog.ui => Dialog.ui} (100%) rename agui2/{graphics/dialogs/inputdialog.cpp => Graphics/Dialogs/InputDialog.cpp} (98%) rename agui2/{graphics/dialogs/inputdialog.h => Graphics/Dialogs/InputDialog.h} (94%) rename agui2/{graphics/dialogs/inputdialog.ui => Graphics/Dialogs/InputDialog.ui} (100%) rename agui2/{graphics/dialogs/outputdialog.cpp => Graphics/Dialogs/OutputDialog.cpp} (97%) rename agui2/{graphics/dialogs/outputdialog.h => Graphics/Dialogs/OutputDialog.h} (87%) rename agui2/{graphics/dialogs/outputdialog.ui => Graphics/Dialogs/OutputDialog.ui} (100%) rename agui2/{graphics/dialogs/resultdialog.cpp => Graphics/Dialogs/ResultDialog.cpp} (93%) rename agui2/{graphics/dialogs/resultdialog.h => Graphics/Dialogs/ResultDialog.h} (92%) rename agui2/{graphics/dialogs/resultdialog.ui => Graphics/Dialogs/ResultDialog.ui} (100%) rename agui2/{graphics/doublegraphicsbox.cpp => Graphics/DoubleGraphicsBox.cpp} (97%) rename agui2/{graphics/doublegraphicsbox.h => Graphics/DoubleGraphicsBox.h} (94%) rename agui2/{graphics/graphicsbox.cpp => Graphics/GraphicsBox.cpp} (94%) rename agui2/{graphics/graphicsbox.h => Graphics/GraphicsBox.h} (95%) rename agui2/{graphics/graphicsconnection.cpp => Graphics/GraphicsConnection.cpp} (98%) rename agui2/{graphics/graphicsconnection.h => Graphics/GraphicsConnection.h} (97%) rename agui2/{graphics/graphicsscene.cpp => Graphics/GraphicsScene.cpp} (88%) rename agui2/{graphics/graphicsscene.h => Graphics/GraphicsScene.h} (89%) rename agui2/{graphics/inputgraphicsbox.cpp => Graphics/InputGraphicsBox.cpp} (90%) rename agui2/{graphics/inputgraphicsbox.h => Graphics/InputGraphicsBox.h} (86%) rename agui2/{graphics/outputgraphicsbox.cpp => Graphics/OutputGraphicsBox.cpp} (94%) rename agui2/{graphics/outputgraphicsbox.h => Graphics/OutputGraphicsBox.h} (73%) rename agui2/{graphvizintegrator.cpp => GraphvizIntegrator.cpp} (97%) rename agui2/{graphvizintegrator.h => GraphvizIntegrator.h} (100%) rename agui2/{mainwindow.cpp => MainWindow.cpp} (96%) rename agui2/{mainwindow.h => MainWindow.h} (93%) rename agui2/{mainwindow.ui => MainWindow.ui} (100%) rename agui2/{models/doublemodelbox.cpp => Models/DoubleModelBox.cpp} (98%) rename agui2/{models/doublemodelbox.h => Models/DoubleModelBox.h} (96%) rename agui2/{models/inputmodelbox.cpp => Models/InputModelBox.cpp} (96%) rename agui2/{models/inputmodelbox.h => Models/InputModelBox.h} (97%) rename agui2/{models/modelbox.cpp => Models/ModelBox.cpp} (53%) rename agui2/{models/modelbox.h => Models/ModelBox.h} (93%) rename agui2/{models/outputmodelbox.cpp => Models/OutputModelBox.cpp} (97%) rename agui2/{models/outputmodelbox.h => Models/OutputModelBox.h} (97%) rename agui2/{models/singlemodelbox.cpp => Models/SingleModelBox.cpp} (97%) rename agui2/{models/singlemodelbox.h => Models/SingleModelBox.h} (96%) rename agui2/{wrapperbox.cpp => WrapperBox.cpp} (98%) rename agui2/{wrapperbox.h => WrapperBox.h} (85%) rename agui2/{wrapperfactory.cpp => WrapperFactory.cpp} (93%) rename agui2/{wrapperfactory.h => WrapperFactory.h} (96%) diff --git a/agui2/alibexceptionhandler.cpp b/agui2/AlibExceptionHandler.cpp similarity index 96% rename from agui2/alibexceptionhandler.cpp rename to agui2/AlibExceptionHandler.cpp index 45a506be2d..6dbcdcd148 100644 --- a/agui2/alibexceptionhandler.cpp +++ b/agui2/AlibExceptionHandler.cpp @@ -1,4 +1,4 @@ -#include <alibexceptionhandler.h> +#include <AlibExceptionHandler.h> #include <QRegExp> #include <QStringList> diff --git a/agui2/alibexceptionhandler.h b/agui2/AlibExceptionHandler.h similarity index 100% rename from agui2/alibexceptionhandler.h rename to agui2/AlibExceptionHandler.h diff --git a/agui2/CMakeLists.txt b/agui2/CMakeLists.txt index 472c2fe135..732cd5eee6 100644 --- a/agui2/CMakeLists.txt +++ b/agui2/CMakeLists.txt @@ -32,49 +32,49 @@ include_directories( link_directories(${ALIB_PATH}/bin-debug) add_executable(${PROJECT_NAME} - graphics/dialogs/inputdialog.cpp - graphics/dialogs/inputdialog.h - graphics/dialogs/outputdialog.cpp - graphics/dialogs/outputdialog.h - graphics/dialogs/resultdialog.cpp - graphics/dialogs/resultdialog.h - graphics/doublegraphicsbox.cpp - graphics/doublegraphicsbox.h - graphics/graphicsbox.cpp - graphics/graphicsbox.h - graphics/graphicsconnection.cpp - graphics/graphicsconnection.h - graphics/graphicsscene.cpp - graphics/graphicsscene.h - graphics/inputgraphicsbox.cpp - graphics/inputgraphicsbox.h - graphics/outputgraphicsbox.cpp - graphics/outputgraphicsbox.h - models/doublemodelbox.cpp - models/doublemodelbox.h - models/inputmodelbox.cpp - models/inputmodelbox.h - models/modelbox.cpp - models/modelbox.h - models/outputmodelbox.cpp - models/outputmodelbox.h - models/singlemodelbox.cpp - models/singlemodelbox.h - alibexceptionhandler.cpp - alibexceptionhandler.h - connectionhelper.cpp - connectionhelper.h - converter.cpp - converter.h - graphvizintegrator.cpp - graphvizintegrator.h + Graphics/Dialogs/InputDialog.cpp + Graphics/Dialogs/InputDialog.h + Graphics/Dialogs/OutputDialog.cpp + Graphics/Dialogs/OutputDialog.h + Graphics/Dialogs/ResultDialog.cpp + Graphics/Dialogs/ResultDialog.h + Graphics/DoubleGraphicsBox.cpp + Graphics/DoubleGraphicsBox.h + Graphics/GraphicsBox.cpp + Graphics/GraphicsBox.h + Graphics/GraphicsConnection.cpp + Graphics/GraphicsConnection.h + Graphics/GraphicsScene.cpp + Graphics/GraphicsScene.h + Graphics/InputGraphicsBox.cpp + Graphics/InputGraphicsBox.h + Graphics/OutputGraphicsBox.cpp + Graphics/OutputGraphicsBox.h + Models/DoubleModelBox.cpp + Models/DoubleModelBox.h + Models/InputModelBox.cpp + Models/InputModelBox.h + Models/ModelBox.cpp + Models/ModelBox.h + Models/OutputModelBox.cpp + Models/OutputModelBox.h + Models/SingleModelBox.cpp + Models/SingleModelBox.h + AlibExceptionHandler.cpp + AlibExceptionHandler.h + ConnectionHelper.cpp + ConnectionHelper.h + Converter.cpp + Converter.h + GraphvizIntegrator.cpp + GraphvizIntegrator.h main.cpp - mainwindow.cpp - mainwindow.h - wrapperbox.cpp - wrapperbox.h - wrapperfactory.cpp - wrapperfactory.h) + MainWindow.cpp + MainWindow.h + WrapperBox.cpp + WrapperBox.h + WrapperFactory.cpp + WrapperFactory.h) target_link_libraries( ${PROJECT_NAME} diff --git a/agui2/connectionhelper.cpp b/agui2/ConnectionHelper.cpp similarity index 95% rename from agui2/connectionhelper.cpp rename to agui2/ConnectionHelper.cpp index b50a801ad1..1b105a88d4 100644 --- a/agui2/connectionhelper.cpp +++ b/agui2/ConnectionHelper.cpp @@ -1,4 +1,4 @@ -#include <connectionhelper.h> +#include <ConnectionHelper.h> #include <QGraphicsScene> diff --git a/agui2/connectionhelper.h b/agui2/ConnectionHelper.h similarity index 79% rename from agui2/connectionhelper.h rename to agui2/ConnectionHelper.h index 155ddc30c1..a0520b067b 100644 --- a/agui2/connectionhelper.h +++ b/agui2/ConnectionHelper.h @@ -1,7 +1,7 @@ #pragma once -#include <graphics/graphicsconnection.h> -#include <graphics/graphicsbox.h> +#include <Graphics/GraphicsConnection.h> +#include <Graphics/GraphicsBox.h> class ConnectionHelper { diff --git a/agui2/converter.cpp b/agui2/Converter.cpp similarity index 98% rename from agui2/converter.cpp rename to agui2/Converter.cpp index 38b5fcb6f7..bbd1f5e22d 100644 --- a/agui2/converter.cpp +++ b/agui2/Converter.cpp @@ -7,8 +7,8 @@ #include <sax/SaxParseInterface.h> #include <sax/SaxComposeInterface.h> -#include <converter.h> -#include <graphvizintegrator.h> +#include <Converter.h> +#include <GraphvizIntegrator.h> #include <QDomComment> diff --git a/agui2/converter.h b/agui2/Converter.h similarity index 100% rename from agui2/converter.h rename to agui2/Converter.h diff --git a/agui2/dialog.ui b/agui2/Dialog.ui similarity index 100% rename from agui2/dialog.ui rename to agui2/Dialog.ui diff --git a/agui2/graphics/dialogs/inputdialog.cpp b/agui2/Graphics/Dialogs/InputDialog.cpp similarity index 98% rename from agui2/graphics/dialogs/inputdialog.cpp rename to agui2/Graphics/Dialogs/InputDialog.cpp index 0d9d1caffd..c403d67a47 100644 --- a/agui2/graphics/dialogs/inputdialog.cpp +++ b/agui2/Graphics/Dialogs/InputDialog.cpp @@ -1,8 +1,8 @@ #include <common/AlgorithmHelper.h> #include <abstraction/ImmediateValueAbstraction.hpp> -#include <converter.h> -#include <graphics/dialogs/inputdialog.h> -#include <graphvizintegrator.h> +#include <Converter.h> +#include <Graphics/Dialogs/InputDialog.h> +#include <GraphvizIntegrator.h> #include <gvc.h> #include <QImage> diff --git a/agui2/graphics/dialogs/inputdialog.h b/agui2/Graphics/Dialogs/InputDialog.h similarity index 94% rename from agui2/graphics/dialogs/inputdialog.h rename to agui2/Graphics/Dialogs/InputDialog.h index 118505a87c..7faa6502bb 100644 --- a/agui2/graphics/dialogs/inputdialog.h +++ b/agui2/Graphics/Dialogs/InputDialog.h @@ -1,9 +1,9 @@ #pragma once -#include <models/inputmodelbox.h> +#include <Models/InputModelBox.h> #include <abstraction/OperationAbstraction.hpp> -#include <ui_inputdialog.h> +#include <ui_InputDialog.h> #include <QDialog> diff --git a/agui2/graphics/dialogs/inputdialog.ui b/agui2/Graphics/Dialogs/InputDialog.ui similarity index 100% rename from agui2/graphics/dialogs/inputdialog.ui rename to agui2/Graphics/Dialogs/InputDialog.ui diff --git a/agui2/graphics/dialogs/outputdialog.cpp b/agui2/Graphics/Dialogs/OutputDialog.cpp similarity index 97% rename from agui2/graphics/dialogs/outputdialog.cpp rename to agui2/Graphics/Dialogs/OutputDialog.cpp index 09915bb11c..a0a50dc4d7 100644 --- a/agui2/graphics/dialogs/outputdialog.cpp +++ b/agui2/Graphics/Dialogs/OutputDialog.cpp @@ -1,5 +1,5 @@ -#include <graphics/dialogs/outputdialog.h> -#include <ui_outputdialog.h> +#include <Graphics/Dialogs/OutputDialog.h> +#include <ui_OutputDialog.h> #include <QFileDialog> #include <QTextStream> diff --git a/agui2/graphics/dialogs/outputdialog.h b/agui2/Graphics/Dialogs/OutputDialog.h similarity index 87% rename from agui2/graphics/dialogs/outputdialog.h rename to agui2/Graphics/Dialogs/OutputDialog.h index 98ed196b48..f00dd24b98 100644 --- a/agui2/graphics/dialogs/outputdialog.h +++ b/agui2/Graphics/Dialogs/OutputDialog.h @@ -1,10 +1,10 @@ #pragma once -#include <graphics/outputgraphicsbox.h> -#include <models/outputmodelbox.h> +#include <Graphics/OutputGraphicsBox.h> +#include <Models/OutputModelBox.h> #include <QDialog> -#include <ui_outputdialog.h> +#include <ui_OutputDialog.h> struct OutputSettings; diff --git a/agui2/graphics/dialogs/outputdialog.ui b/agui2/Graphics/Dialogs/OutputDialog.ui similarity index 100% rename from agui2/graphics/dialogs/outputdialog.ui rename to agui2/Graphics/Dialogs/OutputDialog.ui diff --git a/agui2/graphics/dialogs/resultdialog.cpp b/agui2/Graphics/Dialogs/ResultDialog.cpp similarity index 93% rename from agui2/graphics/dialogs/resultdialog.cpp rename to agui2/Graphics/Dialogs/ResultDialog.cpp index 826f448405..fdf8d03823 100644 --- a/agui2/graphics/dialogs/resultdialog.cpp +++ b/agui2/Graphics/Dialogs/ResultDialog.cpp @@ -1,5 +1,5 @@ -#include <graphics/dialogs/resultdialog.h> -#include <ui_resultdialog.h> +#include <Graphics/Dialogs/ResultDialog.h> +#include <ui_ResultDialog.h> #include <QPixmap> #include <QDesktopWidget> #include <QPlainTextEdit> diff --git a/agui2/graphics/dialogs/resultdialog.h b/agui2/Graphics/Dialogs/ResultDialog.h similarity index 92% rename from agui2/graphics/dialogs/resultdialog.h rename to agui2/Graphics/Dialogs/ResultDialog.h index d471b5059e..9bdb572995 100644 --- a/agui2/graphics/dialogs/resultdialog.h +++ b/agui2/Graphics/Dialogs/ResultDialog.h @@ -4,7 +4,7 @@ #include <QDialog> #include <QImage> -#include <ui_resultdialog.h> +#include <ui_ResultDialog.h> class ResultDialog : public QDialog { diff --git a/agui2/graphics/dialogs/resultdialog.ui b/agui2/Graphics/Dialogs/ResultDialog.ui similarity index 100% rename from agui2/graphics/dialogs/resultdialog.ui rename to agui2/Graphics/Dialogs/ResultDialog.ui diff --git a/agui2/graphics/doublegraphicsbox.cpp b/agui2/Graphics/DoubleGraphicsBox.cpp similarity index 97% rename from agui2/graphics/doublegraphicsbox.cpp rename to agui2/Graphics/DoubleGraphicsBox.cpp index 4cd922fd5a..5648c3fbf5 100644 --- a/agui2/graphics/doublegraphicsbox.cpp +++ b/agui2/Graphics/DoubleGraphicsBox.cpp @@ -1,4 +1,4 @@ -#include <graphics/doublegraphicsbox.h> +#include <Graphics/DoubleGraphicsBox.h> #include <iostream> #include <QGraphicsScene> diff --git a/agui2/graphics/doublegraphicsbox.h b/agui2/Graphics/DoubleGraphicsBox.h similarity index 94% rename from agui2/graphics/doublegraphicsbox.h rename to agui2/Graphics/DoubleGraphicsBox.h index 45cb407a0a..c6ba0decdd 100644 --- a/agui2/graphics/doublegraphicsbox.h +++ b/agui2/Graphics/DoubleGraphicsBox.h @@ -1,6 +1,6 @@ #pragma once -#include <graphics/graphicsbox.h> +#include <Graphics/GraphicsBox.h> class DoubleGraphicsBox : public GraphicsBox diff --git a/agui2/graphics/graphicsbox.cpp b/agui2/Graphics/GraphicsBox.cpp similarity index 94% rename from agui2/graphics/graphicsbox.cpp rename to agui2/Graphics/GraphicsBox.cpp index 40ffaf35c1..5d4e73b732 100644 --- a/agui2/graphics/graphicsbox.cpp +++ b/agui2/Graphics/GraphicsBox.cpp @@ -1,8 +1,8 @@ -#include <graphics/graphicsbox.h> -#include <graphics/graphicsconnection.h> -#include <graphics/graphicsscene.h> -#include <connectionhelper.h> -#include <graphics/dialogs/inputdialog.h> +#include <Graphics/GraphicsBox.h> +#include <Graphics/GraphicsConnection.h> +#include <Graphics/GraphicsScene.h> +#include <ConnectionHelper.h> +#include <Graphics/Dialogs/InputDialog.h> #include <QGraphicsSceneContextMenuEvent> #include <QDialog> diff --git a/agui2/graphics/graphicsbox.h b/agui2/Graphics/GraphicsBox.h similarity index 95% rename from agui2/graphics/graphicsbox.h rename to agui2/Graphics/GraphicsBox.h index ae6e860434..60a5b4a936 100644 --- a/agui2/graphics/graphicsbox.h +++ b/agui2/Graphics/GraphicsBox.h @@ -1,7 +1,7 @@ #pragma once -#include <graphics/graphicsconnection.h> -#include <wrapperbox.h> +#include <Graphics/GraphicsConnection.h> +#include <WrapperBox.h> #include <QAction> #include <QBrush> diff --git a/agui2/graphics/graphicsconnection.cpp b/agui2/Graphics/GraphicsConnection.cpp similarity index 98% rename from agui2/graphics/graphicsconnection.cpp rename to agui2/Graphics/GraphicsConnection.cpp index ec50cdc59b..b20d17f583 100644 --- a/agui2/graphics/graphicsconnection.cpp +++ b/agui2/Graphics/GraphicsConnection.cpp @@ -1,5 +1,5 @@ -#include <graphics/graphicsconnection.h> -#include <connectionhelper.h> +#include <Graphics/GraphicsConnection.h> +#include <ConnectionHelper.h> #include <QMenu> #include <QAction> diff --git a/agui2/graphics/graphicsconnection.h b/agui2/Graphics/GraphicsConnection.h similarity index 97% rename from agui2/graphics/graphicsconnection.h rename to agui2/Graphics/GraphicsConnection.h index cbdeb9ccf6..f539fe64d2 100644 --- a/agui2/graphics/graphicsconnection.h +++ b/agui2/Graphics/GraphicsConnection.h @@ -1,7 +1,7 @@ #pragma once #include <tuple> -#include <graphics/graphicsbox.h> +#include <Graphics/GraphicsBox.h> #include <QGraphicsItem> #include <QGraphicsSceneMouseEvent> diff --git a/agui2/graphics/graphicsscene.cpp b/agui2/Graphics/GraphicsScene.cpp similarity index 88% rename from agui2/graphics/graphicsscene.cpp rename to agui2/Graphics/GraphicsScene.cpp index 7c09618ae4..2409219296 100644 --- a/agui2/graphics/graphicsscene.cpp +++ b/agui2/Graphics/GraphicsScene.cpp @@ -1,6 +1,6 @@ -#include <graphics/graphicsscene.h> -#include <graphics/graphicsbox.h> -#include <connectionhelper.h> +#include <Graphics/GraphicsScene.h> +#include <Graphics/GraphicsBox.h> +#include <ConnectionHelper.h> #include <QGraphicsView> diff --git a/agui2/graphics/graphicsscene.h b/agui2/Graphics/GraphicsScene.h similarity index 89% rename from agui2/graphics/graphicsscene.h rename to agui2/Graphics/GraphicsScene.h index bb5585dfbd..292c7e8274 100644 --- a/agui2/graphics/graphicsscene.h +++ b/agui2/Graphics/GraphicsScene.h @@ -1,6 +1,6 @@ #pragma once -#include <graphics/graphicsconnection.h> +#include <Graphics/GraphicsConnection.h> #include <QGraphicsScene> #include <QObject> diff --git a/agui2/graphics/inputgraphicsbox.cpp b/agui2/Graphics/InputGraphicsBox.cpp similarity index 90% rename from agui2/graphics/inputgraphicsbox.cpp rename to agui2/Graphics/InputGraphicsBox.cpp index 3b836e91c8..0b85039eca 100644 --- a/agui2/graphics/inputgraphicsbox.cpp +++ b/agui2/Graphics/InputGraphicsBox.cpp @@ -1,7 +1,7 @@ -#include <graphics/inputgraphicsbox.h> -#include <connectionhelper.h> -#include <graphics/dialogs/inputdialog.h> -#include <models/inputmodelbox.h> +#include <Graphics/InputGraphicsBox.h> +#include <ConnectionHelper.h> +#include <Graphics/Dialogs/InputDialog.h> +#include <Models/InputModelBox.h> #include <QMenu> #include <QAction> diff --git a/agui2/graphics/inputgraphicsbox.h b/agui2/Graphics/InputGraphicsBox.h similarity index 86% rename from agui2/graphics/inputgraphicsbox.h rename to agui2/Graphics/InputGraphicsBox.h index 7aaac5d597..fe7d460abb 100644 --- a/agui2/graphics/inputgraphicsbox.h +++ b/agui2/Graphics/InputGraphicsBox.h @@ -1,7 +1,7 @@ #pragma once -#include <graphics/graphicsbox.h> -#include <graphics/dialogs/inputdialog.h> +#include <Graphics/GraphicsBox.h> +#include <Graphics/Dialogs/InputDialog.h> class GraphicsBox; diff --git a/agui2/graphics/outputgraphicsbox.cpp b/agui2/Graphics/OutputGraphicsBox.cpp similarity index 94% rename from agui2/graphics/outputgraphicsbox.cpp rename to agui2/Graphics/OutputGraphicsBox.cpp index d770d14e4a..9e6e333f2b 100644 --- a/agui2/graphics/outputgraphicsbox.cpp +++ b/agui2/Graphics/OutputGraphicsBox.cpp @@ -1,4 +1,4 @@ -#include <graphics/outputgraphicsbox.h> +#include <Graphics/OutputGraphicsBox.h> #include <QMenu> #include <QAction> diff --git a/agui2/graphics/outputgraphicsbox.h b/agui2/Graphics/OutputGraphicsBox.h similarity index 73% rename from agui2/graphics/outputgraphicsbox.h rename to agui2/Graphics/OutputGraphicsBox.h index fef9f01000..0dfd1ea304 100644 --- a/agui2/graphics/outputgraphicsbox.h +++ b/agui2/Graphics/OutputGraphicsBox.h @@ -1,8 +1,8 @@ #pragma once -#include <graphics/graphicsbox.h> -#include <graphics/dialogs/outputdialog.h> -#include <models/outputmodelbox.h> +#include <Graphics/GraphicsBox.h> +#include <Graphics/Dialogs/OutputDialog.h> +#include <Models/OutputModelBox.h> class OutputDialog; diff --git a/agui2/graphvizintegrator.cpp b/agui2/GraphvizIntegrator.cpp similarity index 97% rename from agui2/graphvizintegrator.cpp rename to agui2/GraphvizIntegrator.cpp index b5b70b7764..2b59306680 100644 --- a/agui2/graphvizintegrator.cpp +++ b/agui2/GraphvizIntegrator.cpp @@ -1,5 +1,5 @@ -#include <graphvizintegrator.h> +#include <GraphvizIntegrator.h> #include <gvc.h> QString selectFormat(GraphvizIntegrator::PictureFormat format) { diff --git a/agui2/graphvizintegrator.h b/agui2/GraphvizIntegrator.h similarity index 100% rename from agui2/graphvizintegrator.h rename to agui2/GraphvizIntegrator.h diff --git a/agui2/mainwindow.cpp b/agui2/MainWindow.cpp similarity index 96% rename from agui2/mainwindow.cpp rename to agui2/MainWindow.cpp index a4e2d2746f..405ab2cd42 100644 --- a/agui2/mainwindow.cpp +++ b/agui2/MainWindow.cpp @@ -1,12 +1,12 @@ #include <iostream> -#include <mainwindow.h> -#include <ui_mainwindow.h> -#include <graphics/inputgraphicsbox.h> -#include <graphics/outputgraphicsbox.h> -#include <graphics/dialogs/inputdialog.h> -#include <wrapperfactory.h> -#include <connectionhelper.h> +#include <MainWindow.h> +#include <ui_MainWindow.h> +#include <Graphics/InputGraphicsBox.h> +#include <Graphics/OutputGraphicsBox.h> +#include <Graphics/Dialogs/InputDialog.h> +#include <WrapperFactory.h> +#include <ConnectionHelper.h> #include <QFileDialog> #include <QGraphicsItem> diff --git a/agui2/mainwindow.h b/agui2/MainWindow.h similarity index 93% rename from agui2/mainwindow.h rename to agui2/MainWindow.h index 6ff131f532..48847c60e9 100644 --- a/agui2/mainwindow.h +++ b/agui2/MainWindow.h @@ -1,7 +1,7 @@ #pragma once -#include <wrapperbox.h> -#include <graphics/graphicsscene.h> +#include <WrapperBox.h> +#include <Graphics/GraphicsScene.h> #include <memory> @@ -10,7 +10,7 @@ #include <QGraphicsScene> #include <QGraphicsItem> -#include <ui_mainwindow.h> +#include <ui_MainWindow.h> class MainWindow : public QMainWindow { diff --git a/agui2/mainwindow.ui b/agui2/MainWindow.ui similarity index 100% rename from agui2/mainwindow.ui rename to agui2/MainWindow.ui diff --git a/agui2/models/doublemodelbox.cpp b/agui2/Models/DoubleModelBox.cpp similarity index 98% rename from agui2/models/doublemodelbox.cpp rename to agui2/Models/DoubleModelBox.cpp index 48b74ddeab..2118afe0bd 100644 --- a/agui2/models/doublemodelbox.cpp +++ b/agui2/Models/DoubleModelBox.cpp @@ -1,5 +1,5 @@ #include <common/AlgorithmHelper.h> -#include <models/doublemodelbox.h> +#include <Models/DoubleModelBox.h> DoubleModelBox::DoubleModelBox(std::string func) { diff --git a/agui2/models/doublemodelbox.h b/agui2/Models/DoubleModelBox.h similarity index 96% rename from agui2/models/doublemodelbox.h rename to agui2/Models/DoubleModelBox.h index 98da2e57db..b866c439da 100644 --- a/agui2/models/doublemodelbox.h +++ b/agui2/Models/DoubleModelBox.h @@ -1,6 +1,6 @@ #pragma once -#include <models/modelbox.h> +#include <Models/ModelBox.h> class DoubleModelBox : public ModelBox { diff --git a/agui2/models/inputmodelbox.cpp b/agui2/Models/InputModelBox.cpp similarity index 96% rename from agui2/models/inputmodelbox.cpp rename to agui2/Models/InputModelBox.cpp index 5600d75391..0a8e7f4996 100644 --- a/agui2/models/inputmodelbox.cpp +++ b/agui2/Models/InputModelBox.cpp @@ -1,4 +1,4 @@ -#include <models/inputmodelbox.h> +#include <Models/InputModelBox.h> InputModelBox::InputModelBox() { diff --git a/agui2/models/inputmodelbox.h b/agui2/Models/InputModelBox.h similarity index 97% rename from agui2/models/inputmodelbox.h rename to agui2/Models/InputModelBox.h index db77c06dd7..d2d8e7fbc2 100644 --- a/agui2/models/inputmodelbox.h +++ b/agui2/Models/InputModelBox.h @@ -1,6 +1,6 @@ #pragma once -#include <models/modelbox.h> +#include <Models/ModelBox.h> struct InputSettings { diff --git a/agui2/models/modelbox.cpp b/agui2/Models/ModelBox.cpp similarity index 53% rename from agui2/models/modelbox.cpp rename to agui2/Models/ModelBox.cpp index e1c9fe3319..9dafa92b62 100644 --- a/agui2/models/modelbox.cpp +++ b/agui2/Models/ModelBox.cpp @@ -1,5 +1,5 @@ -#include <models/modelbox.h> -#include <graphics/inputgraphicsbox.h> +#include <Models/ModelBox.h> +#include <Graphics/InputGraphicsBox.h> void ModelBox::setWrapper( WrapperBox* wrapper ) { diff --git a/agui2/models/modelbox.h b/agui2/Models/ModelBox.h similarity index 93% rename from agui2/models/modelbox.h rename to agui2/Models/ModelBox.h index 62cfa23ad1..0975e8c277 100644 --- a/agui2/models/modelbox.h +++ b/agui2/Models/ModelBox.h @@ -1,13 +1,13 @@ #pragma once -#include <wrapperbox.h> +#include <WrapperBox.h> #include <abstraction/OperationAbstraction.hpp> #include <exception/CommonException.h> #include <memory> -#include <alibexceptionhandler.h> +#include <AlibExceptionHandler.h> #include <QString> #include <QList> diff --git a/agui2/models/outputmodelbox.cpp b/agui2/Models/OutputModelBox.cpp similarity index 97% rename from agui2/models/outputmodelbox.cpp rename to agui2/Models/OutputModelBox.cpp index 855bc31c16..c4ab759748 100644 --- a/agui2/models/outputmodelbox.cpp +++ b/agui2/Models/OutputModelBox.cpp @@ -1,7 +1,7 @@ -#include <models/outputmodelbox.h> -#include <graphics/dialogs/resultdialog.h> -#include <mainwindow.h> -#include <converter.h> +#include <Models/OutputModelBox.h> +#include <Graphics/Dialogs/ResultDialog.h> +#include <MainWindow.h> +#include <Converter.h> #include <QDomDocument> #include <QMessageBox> diff --git a/agui2/models/outputmodelbox.h b/agui2/Models/OutputModelBox.h similarity index 97% rename from agui2/models/outputmodelbox.h rename to agui2/Models/OutputModelBox.h index 3f2d8a85c3..ccff8f160c 100644 --- a/agui2/models/outputmodelbox.h +++ b/agui2/Models/OutputModelBox.h @@ -1,7 +1,7 @@ #pragma once -#include <models/modelbox.h> -#include <graphvizintegrator.h> +#include <Models/ModelBox.h> +#include <GraphvizIntegrator.h> struct OutputSettings { enum format { diff --git a/agui2/models/singlemodelbox.cpp b/agui2/Models/SingleModelBox.cpp similarity index 97% rename from agui2/models/singlemodelbox.cpp rename to agui2/Models/SingleModelBox.cpp index 077bf3e93d..e0bcd10d17 100644 --- a/agui2/models/singlemodelbox.cpp +++ b/agui2/Models/SingleModelBox.cpp @@ -1,5 +1,5 @@ #include <common/AlgorithmHelper.h> -#include <models/singlemodelbox.h> +#include <Models/SingleModelBox.h> SingleModelBox::SingleModelBox( std::string func ) { diff --git a/agui2/models/singlemodelbox.h b/agui2/Models/SingleModelBox.h similarity index 96% rename from agui2/models/singlemodelbox.h rename to agui2/Models/SingleModelBox.h index b57a00ec91..d234f10c48 100644 --- a/agui2/models/singlemodelbox.h +++ b/agui2/Models/SingleModelBox.h @@ -1,6 +1,6 @@ #pragma once -#include <models/modelbox.h> +#include <Models/ModelBox.h> class SingleModelBox : public ModelBox { diff --git a/agui2/wrapperbox.cpp b/agui2/WrapperBox.cpp similarity index 98% rename from agui2/wrapperbox.cpp rename to agui2/WrapperBox.cpp index 50c3ae670a..6434c384ed 100644 --- a/agui2/wrapperbox.cpp +++ b/agui2/WrapperBox.cpp @@ -1,4 +1,4 @@ -#include <wrapperbox.h> +#include <WrapperBox.h> WrapperBox::WrapperBox( ModelBox * model, GraphicsBox * graphics ) : m_model( model ), m_graphics( graphics ) diff --git a/agui2/wrapperbox.h b/agui2/WrapperBox.h similarity index 85% rename from agui2/wrapperbox.h rename to agui2/WrapperBox.h index 78be1397b7..dd371d5abd 100644 --- a/agui2/wrapperbox.h +++ b/agui2/WrapperBox.h @@ -1,8 +1,8 @@ #pragma once -#include <models/modelbox.h> -#include <graphics/graphicsbox.h> -#include <graphics/graphicsconnection.h> +#include <Models/ModelBox.h> +#include <Graphics/GraphicsBox.h> +#include <Graphics/GraphicsConnection.h> class ModelBox; class GraphicsBox; diff --git a/agui2/wrapperfactory.cpp b/agui2/WrapperFactory.cpp similarity index 93% rename from agui2/wrapperfactory.cpp rename to agui2/WrapperFactory.cpp index 080a47bec0..47638d93ac 100644 --- a/agui2/wrapperfactory.cpp +++ b/agui2/WrapperFactory.cpp @@ -1,11 +1,11 @@ -#include <wrapperfactory.h> -#include <graphics/inputgraphicsbox.h> -#include <graphics/outputgraphicsbox.h> -#include <graphics/doublegraphicsbox.h> -#include <models/inputmodelbox.h> -#include <models/outputmodelbox.h> -#include <models/singlemodelbox.h> -#include <models/doublemodelbox.h> +#include <WrapperFactory.h> +#include <Graphics/InputGraphicsBox.h> +#include <Graphics/OutputGraphicsBox.h> +#include <Graphics/DoubleGraphicsBox.h> +#include <Models/InputModelBox.h> +#include <Models/OutputModelBox.h> +#include <Models/SingleModelBox.h> +#include <Models/DoubleModelBox.h> #include <QChar> #include <QString> diff --git a/agui2/wrapperfactory.h b/agui2/WrapperFactory.h similarity index 96% rename from agui2/wrapperfactory.h rename to agui2/WrapperFactory.h index 29ebcded9a..a8257e8117 100644 --- a/agui2/wrapperfactory.h +++ b/agui2/WrapperFactory.h @@ -1,6 +1,6 @@ #pragma once -#include <wrapperbox.h> +#include <WrapperBox.h> class WrapperBox; diff --git a/agui2/main.cpp b/agui2/main.cpp index ba07cefdd1..24e57324a4 100644 --- a/agui2/main.cpp +++ b/agui2/main.cpp @@ -1,4 +1,4 @@ -#include <mainwindow.h> +#include <MainWindow.h> #include <QApplication> int main(int argc, char *argv[]) -- GitLab