From 5581c832e4c0fcf29bfca3a4ebc768293ff02896 Mon Sep 17 00:00:00 2001 From: Mario Emmenlauer Date: Sun, 29 Jan 2023 13:33:45 +0100 Subject: [PATCH] Replaced 'local' include paths with standard include style paths --- .../qcmContainerModelSample.cpp | 6 +-- QuickContainers/src/qcmPlugin.cpp | 2 +- .../tests/qcmContainerModelTests.cpp | 4 +- QuickContainers/tests/qcmTests.cpp | 5 +-- samples/cpp/cpp_sample.cpp | 4 +- samples/dataflow/dataflow.cpp | 4 +- samples/dataflow/qanDataFlow.cpp | 4 +- samples/navigable/navigable.cpp | 6 +-- samples/resizer/resizer.cpp | 2 +- samples/style/custom.cpp | 4 +- samples/style/style.cpp | 5 +-- samples/tools/tools.cpp | 3 +- samples/topology/qanFaceNode.cpp | 4 +- samples/topology/topology.cpp | 5 +-- src/CMakeLists.txt | 17 ++++++-- src/QuickQanava | 2 +- src/QuickQanava.h | 40 +++++++++---------- src/gtpo/container_adapter.h | 2 +- src/gtpo/edge.h | 3 +- src/gtpo/graph.h | 8 ++-- src/gtpo/node.h | 13 +++--- src/gtpo/observer.h | 2 +- src/qanAnalysisTimeHeatMap.cpp | 2 +- src/qanAnalysisTimeHeatMap.h | 2 +- src/qanBehaviour.cpp | 6 +-- src/qanBehaviour.h | 5 +-- src/qanBottomResizer.cpp | 2 +- src/qanBottomRightResizer.cpp | 2 +- src/qanConnector.cpp | 10 ++--- src/qanConnector.h | 8 ++-- src/qanDraggable.cpp | 2 +- src/qanDraggableCtrl.cpp | 6 +-- src/qanDraggableCtrl.h | 4 +- src/qanEdge.cpp | 8 ++-- src/qanEdge.h | 6 +-- src/qanEdgeDraggableCtrl.cpp | 6 +-- src/qanEdgeDraggableCtrl.h | 4 +- src/qanEdgeItem.cpp | 16 ++++---- src/qanEdgeItem.h | 6 +-- src/qanGraph.cpp | 16 ++++---- src/qanGraph.h | 22 +++++----- src/qanGraphView.cpp | 7 ++-- src/qanGraphView.h | 8 ++-- src/qanGrid.cpp | 2 +- src/qanGroup.cpp | 8 ++-- src/qanGroup.h | 4 +- src/qanGroupItem.cpp | 8 ++-- src/qanGroupItem.h | 4 +- src/qanLineGrid.cpp | 2 +- src/qanLineGrid.h | 2 +- src/qanNavigable.cpp | 2 +- src/qanNavigable.h | 2 +- src/qanNavigablePreview.cpp | 2 +- src/qanNavigablePreview.h | 2 +- src/qanNode.cpp | 10 ++--- src/qanNode.h | 8 ++-- src/qanNodeItem.cpp | 8 ++-- src/qanNodeItem.h | 12 +++--- src/qanPlugin.cpp | 38 +++++++++--------- src/qanPortItem.cpp | 2 +- src/qanPortItem.h | 4 +- src/qanRightResizer.cpp | 2 +- src/qanSelectable.cpp | 4 +- src/qanStyle.cpp | 5 +-- src/qanStyleManager.cpp | 5 +-- src/qanStyleManager.h | 5 +-- src/qanUtils.cpp | 3 +- 67 files changed, 214 insertions(+), 223 deletions(-) diff --git a/QuickContainers/samples/containermodel/qcmContainerModelSample.cpp b/QuickContainers/samples/containermodel/qcmContainerModelSample.cpp index f6fb2f7e..3a601cdc 100644 --- a/QuickContainers/samples/containermodel/qcmContainerModelSample.cpp +++ b/QuickContainers/samples/containermodel/qcmContainerModelSample.cpp @@ -34,9 +34,9 @@ #include // QuickContainers headers -#include "../../src/QuickContainers.h" -#include "../../src/qcmContainerModel.h" -#include "./qcmContainerModelSample.h" +#include "QuickContainers.h" +#include "qcmContainerModel.h" +#include "qcmContainerModelSample.h" using namespace qcm; diff --git a/QuickContainers/src/qcmPlugin.cpp b/QuickContainers/src/qcmPlugin.cpp index 1ea7fdc5..8e491b1c 100644 --- a/QuickContainers/src/qcmPlugin.cpp +++ b/QuickContainers/src/qcmPlugin.cpp @@ -24,7 +24,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "./qcmPlugin.h" +#include "qcmPlugin.h" #include "qcmAbstractContainer.h" #include "qcmContainer.h" diff --git a/QuickContainers/tests/qcmContainerModelTests.cpp b/QuickContainers/tests/qcmContainerModelTests.cpp index 96f3d8a4..836ffa7e 100644 --- a/QuickContainers/tests/qcmContainerModelTests.cpp +++ b/QuickContainers/tests/qcmContainerModelTests.cpp @@ -39,8 +39,8 @@ #include // QuickContainers headers -#include "./qcmTests.h" -#include "./qcmContainerModelTests.h" +#include "qcmTests.h" +#include "qcmContainerModelTests.h" //----------------------------------------------------------------------------- // Static tag dispatching test diff --git a/QuickContainers/tests/qcmTests.cpp b/QuickContainers/tests/qcmTests.cpp index 145a041f..da95fd8a 100644 --- a/QuickContainers/tests/qcmTests.cpp +++ b/QuickContainers/tests/qcmTests.cpp @@ -33,12 +33,9 @@ //----------------------------------------------------------------------------- // QuickContainers headers -#include "./qcmTests.h" +#include "qcmTests.h" int main(int argc, char **argv) { ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } - - - diff --git a/samples/cpp/cpp_sample.cpp b/samples/cpp/cpp_sample.cpp index 8067ab56..46b3bd21 100644 --- a/samples/cpp/cpp_sample.cpp +++ b/samples/cpp/cpp_sample.cpp @@ -40,7 +40,7 @@ // QuickQanava headers #include -#include "./cpp_sample.h" +#include "cpp_sample.h" using namespace qan; @@ -181,5 +181,3 @@ int main( int argc, char** argv ) return app.exec(); } //----------------------------------------------------------------------------- - - diff --git a/samples/dataflow/dataflow.cpp b/samples/dataflow/dataflow.cpp index 5439def5..b8867793 100644 --- a/samples/dataflow/dataflow.cpp +++ b/samples/dataflow/dataflow.cpp @@ -40,7 +40,7 @@ // QuickQanava headers #include -#include "./qanDataFlow.h" +#include "qanDataFlow.h" using namespace qan; @@ -63,5 +63,3 @@ int main( int argc, char** argv ) return app.exec(); } //----------------------------------------------------------------------------- - - diff --git a/samples/dataflow/qanDataFlow.cpp b/samples/dataflow/qanDataFlow.cpp index b3e1e1eb..ff11fcdd 100644 --- a/samples/dataflow/qanDataFlow.cpp +++ b/samples/dataflow/qanDataFlow.cpp @@ -33,8 +33,8 @@ //----------------------------------------------------------------------------- // QuickQanava headers -#include "../../src/QuickQanava.h" -#include "./qanDataFlow.h" +#include "QuickQanava.h" +#include "qanDataFlow.h" namespace qan { // ::qan diff --git a/samples/navigable/navigable.cpp b/samples/navigable/navigable.cpp index 0bc47ae3..26efaeef 100644 --- a/samples/navigable/navigable.cpp +++ b/samples/navigable/navigable.cpp @@ -38,9 +38,9 @@ #include // QuickQanava headers -#include "../../src/qanNavigable.h" -#include "../../src/qanNavigablePreview.h" -#include "../../src/qanLineGrid.h" +#include "qanNavigable.h" +#include "qanNavigablePreview.h" +#include "qanLineGrid.h" int main(int argc, char *argv[]) { diff --git a/samples/resizer/resizer.cpp b/samples/resizer/resizer.cpp index 07757eb6..50a1975c 100644 --- a/samples/resizer/resizer.cpp +++ b/samples/resizer/resizer.cpp @@ -38,7 +38,7 @@ #include // QuickQanava headers -#include "../../src/qanBottomRightResizer.h" +#include "qanBottomRightResizer.h" int main(int argc, char *argv[]) { diff --git a/samples/style/custom.cpp b/samples/style/custom.cpp index 2dd2c396..ff04b8d6 100644 --- a/samples/style/custom.cpp +++ b/samples/style/custom.cpp @@ -37,8 +37,8 @@ #include // QuickQanava headers -#include "../../src/qanGraph.h" -#include "./custom.h" +#include "qanGraph.h" +#include "custom.h" QQmlComponent* CustomRectNode::delegate(QQmlEngine& engine) noexcept { diff --git a/samples/style/style.cpp b/samples/style/style.cpp index c1a0aa35..958a5e80 100644 --- a/samples/style/style.cpp +++ b/samples/style/style.cpp @@ -37,8 +37,8 @@ #include // QuickQanava headers -#include "../../src/QuickQanava.h" -#include "./custom.h" +#include "QuickQanava.h" +#include "custom.h" using namespace qan; @@ -58,4 +58,3 @@ int main( int argc, char** argv ) engine.load(QUrl("qrc:/style.qml")); return app.exec(); } - diff --git a/samples/tools/tools.cpp b/samples/tools/tools.cpp index 618bc39f..418f4790 100644 --- a/samples/tools/tools.cpp +++ b/samples/tools/tools.cpp @@ -38,7 +38,7 @@ #include // QuickQanava headers -#include "../../src/QuickQanava.h" +#include "QuickQanava.h" using namespace qan; @@ -56,4 +56,3 @@ int main(int argc, char** argv) engine.load(QUrl("qrc:/tools.qml")); return app.exec(); } - diff --git a/samples/topology/qanFaceNode.cpp b/samples/topology/qanFaceNode.cpp index ad8af1b1..f379d01a 100644 --- a/samples/topology/qanFaceNode.cpp +++ b/samples/topology/qanFaceNode.cpp @@ -33,8 +33,8 @@ //----------------------------------------------------------------------------- // QuickQanava headers -#include "../../src/QuickQanava.h" -#include "./qanFaceNode.h" +#include "QuickQanava.h" +#include "qanFaceNode.h" namespace qan { // ::qan diff --git a/samples/topology/topology.cpp b/samples/topology/topology.cpp index 23896f77..cebaf672 100644 --- a/samples/topology/topology.cpp +++ b/samples/topology/topology.cpp @@ -33,7 +33,7 @@ //----------------------------------------------------------------------------- // QuickQanava headers -#include "../../src/QuickQanava.h" +#include "QuickQanava.h" // Qt headers #include @@ -41,7 +41,7 @@ #include // Topology sample headers -#include "./qanFaceNode.h" +#include "qanFaceNode.h" using namespace qan; @@ -67,4 +67,3 @@ int main(int argc, char** argv) engine.load(QUrl("qrc:/topology.qml")); return app.exec(); } - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7617fb8d..45283f61 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,6 +30,7 @@ set(qan_source_files set (qan_header_files qanAbstractDraggableCtrl.h + qanAnalysisTimeHeatMap.h qanBehaviour.h qanBottomRightResizer.h qanRightResizer.h @@ -41,6 +42,7 @@ set (qan_header_files qanEdgeDraggableCtrl.h qanEdgeItem.h qanGraph.h + qanGraph.hpp qanGraphView.h qanGrid.h qanGroup.h @@ -57,6 +59,9 @@ set (qan_header_files qanAnalysisTimeHeatMap.cpp qanUtils.h QuickQanava.h + ) + +set (gtpo_header_files gtpo/container_adapter.h gtpo/edge.h gtpo/graph.h @@ -68,7 +73,7 @@ set (qan_header_files gtpo/observer.h ) -source_group("Headers" FILES ${qan_header_files}) +source_group("Headers" FILES ${qan_header_files} ${gtpo_header_files}) source_group("Sources" FILES ${qan_source_files}) set (qan_plugin_files @@ -78,7 +83,7 @@ set (qan_plugin_files # Configure Qt set(CMAKE_AUTOMOC ON) -qt_wrap_cpp(qan_source_files, qan_header_files) # Creates .moc files from sources +qt_wrap_cpp(qan_source_files, qan_header_files gtpo_header_files) # Creates .moc files from sources set(CMAKE_AUTORCC ON) set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$:QT_QML_DEBUG>) @@ -90,7 +95,7 @@ else() endif(QUICK_QANAVA_BUILD_STATIC_QRC) list(APPEND qan_resources GraphicalEffects${QT_VERSION_MAJOR}/QuickQanavaGraphicalEffects.qrc) -add_library(QuickQanava STATIC ${qan_source_files} ${qan_header_files} ${qan_resources}) +add_library(QuickQanava STATIC ${qan_source_files} ${qan_header_files} ${gtpo_header_files} ${qan_resources}) target_include_directories(QuickQanava PUBLIC @@ -108,6 +113,11 @@ install(FILES DESTINATION include/quickqanava ) +install(FILES + ${gtpo_header_files} + DESTINATION include/quickqanava/gtpo + ) + install(TARGETS QuickQanava EXPORT Targets LIBRARY DESTINATION lib @@ -163,4 +173,3 @@ install( DESTINATION ${DESTDIR} FILES_MATCHING PATTERN "*.qml" ) - diff --git a/src/QuickQanava b/src/QuickQanava index 147c5cc9..5b22e6fc 100644 --- a/src/QuickQanava +++ b/src/QuickQanava @@ -32,4 +32,4 @@ // \date 2016 02 04 //----------------------------------------------------------------------------- -#include "./QuickQanava.h" +#include "QuickQanava.h" diff --git a/src/QuickQanava.h b/src/QuickQanava.h index 74a62678..a042e846 100755 --- a/src/QuickQanava.h +++ b/src/QuickQanava.h @@ -41,26 +41,26 @@ #include // QuickQanava headers -#include "./qanEdge.h" -#include "./qanEdgeItem.h" -#include "./qanNode.h" -#include "./qanNodeItem.h" -#include "./qanPortItem.h" -#include "./qanConnector.h" -#include "./qanGroup.h" -#include "./qanGroupItem.h" -#include "./qanGraph.h" -#include "./qanNavigable.h" -#include "./qanGrid.h" -#include "./qanLineGrid.h" -#include "./qanGraphView.h" -#include "./qanStyle.h" -#include "./qanStyleManager.h" -#include "./qanBottomRightResizer.h" -#include "./qanRightResizer.h" -#include "./qanBottomResizer.h" -#include "./qanNavigablePreview.h" -#include "./qanAnalysisTimeHeatMap.h" +#include "qanEdge.h" +#include "qanEdgeItem.h" +#include "qanNode.h" +#include "qanNodeItem.h" +#include "qanPortItem.h" +#include "qanConnector.h" +#include "qanGroup.h" +#include "qanGroupItem.h" +#include "qanGraph.h" +#include "qanNavigable.h" +#include "qanGrid.h" +#include "qanLineGrid.h" +#include "qanGraphView.h" +#include "qanStyle.h" +#include "qanStyleManager.h" +#include "qanBottomRightResizer.h" +#include "qanRightResizer.h" +#include "qanBottomResizer.h" +#include "qanNavigablePreview.h" +#include "qanAnalysisTimeHeatMap.h" struct QuickQanava { static void initialize(QQmlEngine* engine) { diff --git a/src/gtpo/container_adapter.h b/src/gtpo/container_adapter.h index 4b22f93d..04dd0ca9 100755 --- a/src/gtpo/container_adapter.h +++ b/src/gtpo/container_adapter.h @@ -46,7 +46,7 @@ #include // QuickContainers headers -#include "../QuickContainers/include/qcmContainer.h" +#include "qcmContainer.h" namespace gtpo { // ::gtpo diff --git a/src/gtpo/edge.h b/src/gtpo/edge.h index 8000443a..31d1c1e8 100644 --- a/src/gtpo/edge.h +++ b/src/gtpo/edge.h @@ -40,7 +40,7 @@ #include // std::back_inserter // GTpo headers -#include "./graph_property.h" +#include "gtpo/graph_property.h" namespace gtpo { // ::gtpo @@ -103,4 +103,3 @@ class edge : public edge_base_t, }; } // ::gtpo - diff --git a/src/gtpo/graph.h b/src/gtpo/graph.h index cd2446ac..428368c4 100644 --- a/src/gtpo/graph.h +++ b/src/gtpo/graph.h @@ -40,9 +40,9 @@ #include // std::back_inserter // GTpo headers -#include "./container_adapter.h" -#include "./observable.h" -#include "./observer.h" +#include "gtpo/container_adapter.h" +#include "gtpo/observable.h" +#include "gtpo/observer.h" /*! \brief GTPO for Generic Graph ToPolOgy. */ @@ -316,4 +316,4 @@ class graph : public graph_base_t, } // ::gtpo -#include "./graph.hpp" +#include "gtpo/graph.hpp" diff --git a/src/gtpo/node.h b/src/gtpo/node.h index 795eb5ff..ac777b78 100644 --- a/src/gtpo/node.h +++ b/src/gtpo/node.h @@ -40,13 +40,13 @@ #include // std::back_inserter // GTpo headers -#include "./graph_property.h" -#include "./observable.h" -#include "./observer.h" -#include "./container_adapter.h" +#include "gtpo/graph_property.h" +#include "gtpo/observable.h" +#include "gtpo/observer.h" +#include "gtpo/container_adapter.h" // QuickContainers headers -#include "../../QuickContainers/include/qcmContainer.h" +#include "qcmContainer.h" namespace gtpo { // ::gtpo @@ -182,5 +182,4 @@ class node : public node_base_t, } // ::gtpo -#include "./node.hpp" - +#include "gtpo/node.hpp" diff --git a/src/gtpo/observer.h b/src/gtpo/observer.h index 60737541..c6c8a3ca 100644 --- a/src/gtpo/observer.h +++ b/src/gtpo/observer.h @@ -42,7 +42,7 @@ #include // c++14 std::index_sequence // GTPO headers -#include "./observable.h" +#include "gtpo/observable.h" namespace gtpo { // ::gtpo diff --git a/src/qanAnalysisTimeHeatMap.cpp b/src/qanAnalysisTimeHeatMap.cpp index 6700b249..911f740f 100755 --- a/src/qanAnalysisTimeHeatMap.cpp +++ b/src/qanAnalysisTimeHeatMap.cpp @@ -34,7 +34,7 @@ #include // Topoi++ headers -#include "./qanAnalysisTimeHeatMap.h" +#include "qanAnalysisTimeHeatMap.h" namespace qan { // ::qan diff --git a/src/qanAnalysisTimeHeatMap.h b/src/qanAnalysisTimeHeatMap.h index 0fddfa5c..ae36a6c3 100755 --- a/src/qanAnalysisTimeHeatMap.h +++ b/src/qanAnalysisTimeHeatMap.h @@ -37,7 +37,7 @@ #include // QuickQanava headers -#include "./qanNavigablePreview.h" +#include "qanNavigablePreview.h" namespace qan { // ::qan diff --git a/src/qanBehaviour.cpp b/src/qanBehaviour.cpp index 376f57bb..fa935574 100644 --- a/src/qanBehaviour.cpp +++ b/src/qanBehaviour.cpp @@ -33,9 +33,9 @@ //----------------------------------------------------------------------------- // QuickQanava headers -#include "./qanBehaviour.h" -#include "./qanNode.h" -#include "./qanEdge.h" +#include "qanBehaviour.h" +#include "qanNode.h" +#include "qanEdge.h" namespace qan { // ::qan diff --git a/src/qanBehaviour.h b/src/qanBehaviour.h index 5aabc779..0894635c 100755 --- a/src/qanBehaviour.h +++ b/src/qanBehaviour.h @@ -39,8 +39,8 @@ #include // QuickQanava headers -#include "./gtpo/observer.h" -#include "./qanEdge.h" +#include "gtpo/observer.h" +#include "qanEdge.h" namespace qan { // ::qan @@ -126,4 +126,3 @@ class NodeBehaviour : public QObject, } // ::qan QML_DECLARE_TYPE(qan::NodeBehaviour) - diff --git a/src/qanBottomResizer.cpp b/src/qanBottomResizer.cpp index 0f57c441..953068b2 100644 --- a/src/qanBottomResizer.cpp +++ b/src/qanBottomResizer.cpp @@ -37,7 +37,7 @@ #include // QuickQanava headers -#include "./qanBottomResizer.h" +#include "qanBottomResizer.h" namespace qan { // ::qan diff --git a/src/qanBottomRightResizer.cpp b/src/qanBottomRightResizer.cpp index 89b8a67b..626eb0a7 100644 --- a/src/qanBottomRightResizer.cpp +++ b/src/qanBottomRightResizer.cpp @@ -40,7 +40,7 @@ #include // QuickQanava headers -#include "./qanBottomRightResizer.h" +#include "qanBottomRightResizer.h" namespace qan { // ::qan diff --git a/src/qanConnector.cpp b/src/qanConnector.cpp index 3846f78e..809998d8 100644 --- a/src/qanConnector.cpp +++ b/src/qanConnector.cpp @@ -36,11 +36,11 @@ #include // QuickQanava headers -#include "./qanGraph.h" -#include "./qanNode.h" -#include "./qanEdgeItem.h" -#include "./qanPortItem.h" -#include "./qanConnector.h" +#include "qanGraph.h" +#include "qanNode.h" +#include "qanEdgeItem.h" +#include "qanPortItem.h" +#include "qanConnector.h" namespace qan { // ::qan diff --git a/src/qanConnector.h b/src/qanConnector.h index 7e31e180..8b01f017 100644 --- a/src/qanConnector.h +++ b/src/qanConnector.h @@ -38,10 +38,10 @@ #include // QuickQanava headers -#include "./qanGroupItem.h" -#include "./qanNodeItem.h" -#include "./qanPortItem.h" -#include "./qanGraph.h" +#include "qanGroupItem.h" +#include "qanNodeItem.h" +#include "qanPortItem.h" +#include "qanGraph.h" namespace qan { // ::qan diff --git a/src/qanDraggable.cpp b/src/qanDraggable.cpp index 3f126b57..b40c8e0a 100644 --- a/src/qanDraggable.cpp +++ b/src/qanDraggable.cpp @@ -33,7 +33,7 @@ //----------------------------------------------------------------------------- // QuickQanava headers -#include "./qanDraggable.h" +#include "qanDraggable.h" namespace qan { // ::qan diff --git a/src/qanDraggableCtrl.cpp b/src/qanDraggableCtrl.cpp index 5f3ad3fa..fe0a6a15 100644 --- a/src/qanDraggableCtrl.cpp +++ b/src/qanDraggableCtrl.cpp @@ -33,9 +33,9 @@ //----------------------------------------------------------------------------- // QuickQanava headers -#include "./qanDraggableCtrl.h" -#include "./qanNodeItem.h" -#include "./qanGraph.h" +#include "qanDraggableCtrl.h" +#include "qanNodeItem.h" +#include "qanGraph.h" namespace qan { // ::qan diff --git a/src/qanDraggableCtrl.h b/src/qanDraggableCtrl.h index 9563379d..5d0bfdcd 100644 --- a/src/qanDraggableCtrl.h +++ b/src/qanDraggableCtrl.h @@ -42,8 +42,8 @@ #include // QuickQanava headers -#include "./qanAbstractDraggableCtrl.h" -#include "./qanGroup.h" +#include "qanAbstractDraggableCtrl.h" +#include "qanGroup.h" namespace qan { // ::qan diff --git a/src/qanEdge.cpp b/src/qanEdge.cpp index c17ca48e..f02b6e30 100644 --- a/src/qanEdge.cpp +++ b/src/qanEdge.cpp @@ -37,10 +37,10 @@ #include // QuickQanava headers -#include "./qanNode.h" -#include "./qanEdge.h" -#include "./qanEdgeItem.h" -#include "./qanGraph.h" +#include "qanNode.h" +#include "qanEdge.h" +#include "qanEdgeItem.h" +#include "qanGraph.h" namespace qan { // ::qan diff --git a/src/qanEdge.h b/src/qanEdge.h index a1e0c8b9..30129a53 100644 --- a/src/qanEdge.h +++ b/src/qanEdge.h @@ -35,9 +35,9 @@ #pragma once // QuickQanava headers -#include "./gtpo/edge.h" -#include "./qanStyle.h" -#include "./qanNode.h" +#include "gtpo/edge.h" +#include "qanStyle.h" +#include "qanNode.h" #if QT_VERSION > QT_VERSION_CHECK(6, 0, 0) Q_MOC_INCLUDE("./qanGraph.h") diff --git a/src/qanEdgeDraggableCtrl.cpp b/src/qanEdgeDraggableCtrl.cpp index 8e2f8a75..2f3a6fa1 100644 --- a/src/qanEdgeDraggableCtrl.cpp +++ b/src/qanEdgeDraggableCtrl.cpp @@ -33,9 +33,9 @@ //----------------------------------------------------------------------------- // QuickQanava headers -#include "./qanEdgeDraggableCtrl.h" -#include "./qanEdgeItem.h" -#include "./qanGraph.h" +#include "qanEdgeDraggableCtrl.h" +#include "qanEdgeItem.h" +#include "qanGraph.h" namespace qan { // ::qan diff --git a/src/qanEdgeDraggableCtrl.h b/src/qanEdgeDraggableCtrl.h index 4399cb52..aaa18a0b 100644 --- a/src/qanEdgeDraggableCtrl.h +++ b/src/qanEdgeDraggableCtrl.h @@ -42,8 +42,8 @@ #include // QuickQanava headers -#include "./qanAbstractDraggableCtrl.h" -#include "./qanGroup.h" +#include "qanAbstractDraggableCtrl.h" +#include "qanGroup.h" namespace qan { // ::qan diff --git a/src/qanEdgeItem.cpp b/src/qanEdgeItem.cpp index 3aa07e7f..f48d9a41 100644 --- a/src/qanEdgeItem.cpp +++ b/src/qanEdgeItem.cpp @@ -38,14 +38,14 @@ #include // QuickQanava headers -#include "./qanUtils.h" -#include "./qanEdgeItem.h" -#include "./qanNodeItem.h" // Resolve forward declaration -#include "./qanGroupItem.h" -#include "./qanGraph.h" -#include "./qanEdgeDraggableCtrl.h" - -#include "./bezier/include/bezier.h" +#include "qanUtils.h" +#include "qanEdgeItem.h" +#include "qanNodeItem.h" // Resolve forward declaration +#include "qanGroupItem.h" +#include "qanGraph.h" +#include "qanEdgeDraggableCtrl.h" + +#include "bezier/include/bezier.h" namespace qan { // ::qan diff --git a/src/qanEdgeItem.h b/src/qanEdgeItem.h index 93ed6f4f..f5c516ed 100644 --- a/src/qanEdgeItem.h +++ b/src/qanEdgeItem.h @@ -38,9 +38,9 @@ #include // QuickQanava headers -#include "./qanStyle.h" -#include "./qanNodeItem.h" -#include "./qanSelectable.h" +#include "qanStyle.h" +#include "qanNodeItem.h" +#include "qanSelectable.h" namespace qan { // ::qan diff --git a/src/qanGraph.cpp b/src/qanGraph.cpp index 71dbb06a..2fc2c4ed 100644 --- a/src/qanGraph.cpp +++ b/src/qanGraph.cpp @@ -42,14 +42,14 @@ #include // QuickQanava headers -#include "./qanUtils.h" -#include "./qanGraph.h" -#include "./qanNodeItem.h" -#include "./qanPortItem.h" -#include "./qanEdgeItem.h" -#include "./qanGroup.h" -#include "./qanGroupItem.h" -#include "./qanConnector.h" +#include "qanUtils.h" +#include "qanGraph.h" +#include "qanNodeItem.h" +#include "qanPortItem.h" +#include "qanEdgeItem.h" +#include "qanGroup.h" +#include "qanGroupItem.h" +#include "qanConnector.h" namespace qan { // ::qan diff --git a/src/qanGraph.h b/src/qanGraph.h index 35662e2a..d3d9a23e 100644 --- a/src/qanGraph.h +++ b/src/qanGraph.h @@ -34,8 +34,8 @@ #pragma once -#include "./gtpo/node.h" -#include "./gtpo/graph.h" +#include "gtpo/node.h" +#include "gtpo/graph.h" // Qt headers #include @@ -45,14 +45,14 @@ #include // QuickQanava headers -#include "./qanUtils.h" -#include "./qanStyleManager.h" -#include "./qanEdge.h" -#include "./qanNode.h" -#include "./qanGroup.h" -#include "./qanNavigable.h" -#include "./qanSelectable.h" -#include "./qanConnector.h" +#include "qanUtils.h" +#include "qanStyleManager.h" +#include "qanEdge.h" +#include "qanNode.h" +#include "qanGroup.h" +#include "qanNavigable.h" +#include "qanSelectable.h" +#include "qanConnector.h" //! Main QuickQanava namespace @@ -1085,7 +1085,7 @@ class Graph : public gtpo::graph } // ::qan -#include "./qanGraph.hpp" +#include "qanGraph.hpp" Q_DECLARE_METATYPE(QAbstractItemModel*) Q_DECLARE_METATYPE(QAbstractListModel*) diff --git a/src/qanGraphView.cpp b/src/qanGraphView.cpp index 1980a174..d678a598 100644 --- a/src/qanGraphView.cpp +++ b/src/qanGraphView.cpp @@ -36,9 +36,9 @@ #include // QuickQanava headers -#include "./qanNavigable.h" -#include "./qanGraphView.h" -#include "./qanGraph.h" +#include "qanNavigable.h" +#include "qanGraphView.h" +#include "qanGraph.h" namespace qan { // ::qan @@ -181,4 +181,3 @@ void GraphView::selectionRectEnd() //----------------------------------------------------------------------------- } // ::qan - diff --git a/src/qanGraphView.h b/src/qanGraphView.h index 7be7654b..32c81e24 100644 --- a/src/qanGraphView.h +++ b/src/qanGraphView.h @@ -35,10 +35,10 @@ #pragma once // QuickQanava headers -#include "./qanGraph.h" -#include "./qanGroup.h" -#include "./qanNavigable.h" -#include "./qanPortItem.h" +#include "qanGraph.h" +#include "qanGroup.h" +#include "qanNavigable.h" +#include "qanPortItem.h" // Qt headers #include diff --git a/src/qanGrid.cpp b/src/qanGrid.cpp index bb8ee220..495922b8 100644 --- a/src/qanGrid.cpp +++ b/src/qanGrid.cpp @@ -39,7 +39,7 @@ // Qt headers // QuickQanava headers -#include "./qanGrid.h" +#include "qanGrid.h" namespace qan { // ::qan diff --git a/src/qanGroup.cpp b/src/qanGroup.cpp index 987df033..cc59e470 100644 --- a/src/qanGroup.cpp +++ b/src/qanGroup.cpp @@ -38,10 +38,10 @@ #include // QuickQanava headers -#include "./qanNode.h" -#include "./qanGroup.h" -#include "./qanGroupItem.h" -#include "./qanGraph.h" +#include "qanNode.h" +#include "qanGroup.h" +#include "qanGroupItem.h" +#include "qanGraph.h" namespace qan { // ::qan diff --git a/src/qanGroup.h b/src/qanGroup.h index 73af67e0..e725d5fc 100644 --- a/src/qanGroup.h +++ b/src/qanGroup.h @@ -40,8 +40,8 @@ #include // QuickQanava headers -#include "./qanStyle.h" -#include "./qanNode.h" +#include "qanStyle.h" +#include "qanNode.h" #if QT_VERSION > QT_VERSION_CHECK(6, 0, 0) Q_MOC_INCLUDE("./qanGraph.h") diff --git a/src/qanGroupItem.cpp b/src/qanGroupItem.cpp index 4788a331..d762ec29 100644 --- a/src/qanGroupItem.cpp +++ b/src/qanGroupItem.cpp @@ -33,10 +33,10 @@ //----------------------------------------------------------------------------- // QuickQanava headers -#include "./qanGraph.h" -#include "./qanGroupItem.h" -#include "./qanEdgeItem.h" -#include "./qanGroup.h" +#include "qanGraph.h" +#include "qanGroupItem.h" +#include "qanEdgeItem.h" +#include "qanGroup.h" namespace qan { // ::qan diff --git a/src/qanGroupItem.h b/src/qanGroupItem.h index 2389fb42..8ec3c9cb 100644 --- a/src/qanGroupItem.h +++ b/src/qanGroupItem.h @@ -40,8 +40,8 @@ #include // QuickQanava headers -#include "./qanNodeItem.h" -#include "./qanGroup.h" +#include "qanNodeItem.h" +#include "qanGroup.h" namespace qan { // ::qan diff --git a/src/qanLineGrid.cpp b/src/qanLineGrid.cpp index ce036764..011c5972 100644 --- a/src/qanLineGrid.cpp +++ b/src/qanLineGrid.cpp @@ -39,7 +39,7 @@ // Qt headers // QuickQanava headers -#include "./qanLineGrid.h" +#include "qanLineGrid.h" namespace qan { // ::qan diff --git a/src/qanLineGrid.h b/src/qanLineGrid.h index 6e82ec6d..fe17ada0 100644 --- a/src/qanLineGrid.h +++ b/src/qanLineGrid.h @@ -40,7 +40,7 @@ #include // QuickQanava headers -#include "./qanGrid.h" +#include "qanGrid.h" namespace qan { // ::qan diff --git a/src/qanNavigable.cpp b/src/qanNavigable.cpp index 86d68959..72a96461 100644 --- a/src/qanNavigable.cpp +++ b/src/qanNavigable.cpp @@ -33,7 +33,7 @@ //----------------------------------------------------------------------------- // QuickQanava headers -#include "./qanNavigable.h" +#include "qanNavigable.h" namespace qan { // ::qan diff --git a/src/qanNavigable.h b/src/qanNavigable.h index 88f54248..c25d695c 100644 --- a/src/qanNavigable.h +++ b/src/qanNavigable.h @@ -38,7 +38,7 @@ #include // QuickQanava headers -#include "./qanGrid.h" +#include "qanGrid.h" namespace qan { // ::qan diff --git a/src/qanNavigablePreview.cpp b/src/qanNavigablePreview.cpp index b569e109..d57fe5d0 100644 --- a/src/qanNavigablePreview.cpp +++ b/src/qanNavigablePreview.cpp @@ -33,7 +33,7 @@ //----------------------------------------------------------------------------- // QuickQanava headers -#include "./qanNavigablePreview.h" +#include "qanNavigablePreview.h" namespace qan { // ::qan diff --git a/src/qanNavigablePreview.h b/src/qanNavigablePreview.h index fe6eeeb0..29dc9ce1 100644 --- a/src/qanNavigablePreview.h +++ b/src/qanNavigablePreview.h @@ -38,7 +38,7 @@ #include // QuickQanava headers -#include "./qanNavigable.h" +#include "qanNavigable.h" namespace qan { // ::qan diff --git a/src/qanNode.cpp b/src/qanNode.cpp index faa324d0..6db54ba6 100644 --- a/src/qanNode.cpp +++ b/src/qanNode.cpp @@ -37,11 +37,11 @@ #include // QuickQanava headers -#include "./qanNode.h" -#include "./qanNodeItem.h" -#include "./qanPortItem.h" -#include "./qanGroup.h" -#include "./qanGraph.h" +#include "qanNode.h" +#include "qanNodeItem.h" +#include "qanPortItem.h" +#include "qanGroup.h" +#include "qanGraph.h" namespace qan { // ::qan diff --git a/src/qanNode.h b/src/qanNode.h index a2ed28de..43e2df59 100644 --- a/src/qanNode.h +++ b/src/qanNode.h @@ -40,10 +40,10 @@ #include // QuickQanava headers -#include "./gtpo/node.h" -#include "./qanEdge.h" -#include "./qanStyle.h" -#include "./qanBehaviour.h" +#include "gtpo/node.h" +#include "qanEdge.h" +#include "qanStyle.h" +#include "qanBehaviour.h" namespace qan { // ::qan diff --git a/src/qanNodeItem.cpp b/src/qanNodeItem.cpp index 60f27de3..a0338d33 100644 --- a/src/qanNodeItem.cpp +++ b/src/qanNodeItem.cpp @@ -41,10 +41,10 @@ #include // QuickQanava headers -#include "./qanNode.h" -#include "./qanNodeItem.h" -#include "./qanGraph.h" -#include "./qanDraggableCtrl.h" +#include "qanNode.h" +#include "qanNodeItem.h" +#include "qanGraph.h" +#include "qanDraggableCtrl.h" namespace qan { // ::qan diff --git a/src/qanNodeItem.h b/src/qanNodeItem.h index 4cc9e655..b24b64e1 100644 --- a/src/qanNodeItem.h +++ b/src/qanNodeItem.h @@ -46,11 +46,11 @@ #include // QuickQanava headers -#include "./qanStyle.h" -#include "./qanNode.h" -#include "./qanSelectable.h" -#include "./qanDraggable.h" -#include "./qanAbstractDraggableCtrl.h" +#include "qanStyle.h" +#include "qanNode.h" +#include "qanSelectable.h" +#include "qanDraggable.h" +#include "qanAbstractDraggableCtrl.h" namespace qan { // ::qan @@ -133,7 +133,7 @@ class NodeItem : public QQuickItem, public: //! Utility function to ease initialization from c++, call setX(), setY(), setWidth() and setHEight() with the content of \c rect bounding rect. - auto setRect(const QRectF& r) noexcept -> void; + auto setRect(const QRectF& r) noexcept -> void; //@} //------------------------------------------------------------------------- diff --git a/src/qanPlugin.cpp b/src/qanPlugin.cpp index a7313c2a..7341071d 100644 --- a/src/qanPlugin.cpp +++ b/src/qanPlugin.cpp @@ -34,24 +34,24 @@ //----------------------------------------------------------------------------- // QuickQanava headers -#include "./qanPlugin.h" -#include "./qanEdge.h" -#include "./qanEdgeItem.h" -#include "./qanNode.h" -#include "./qanNodeItem.h" -#include "./qanPortItem.h" -#include "./qanConnector.h" -#include "./qanGroup.h" -#include "./qanGroupItem.h" -#include "./qanGraph.h" -#include "./qanNavigable.h" -#include "./qanGrid.h" -#include "./qanLineGrid.h" -#include "./qanGraphView.h" -#include "./qanStyle.h" -#include "./qanStyleManager.h" -#include "./qanBottomRightResizer.h" -#include "./qanNavigablePreview.h" +#include "qanPlugin.h" +#include "qanEdge.h" +#include "qanEdgeItem.h" +#include "qanNode.h" +#include "qanNodeItem.h" +#include "qanPortItem.h" +#include "qanConnector.h" +#include "qanGroup.h" +#include "qanGroupItem.h" +#include "qanGraph.h" +#include "qanNavigable.h" +#include "qanGrid.h" +#include "qanLineGrid.h" +#include "qanGraphView.h" +#include "qanStyle.h" +#include "qanStyleManager.h" +#include "qanBottomRightResizer.h" +#include "qanNavigablePreview.h" static void initResources() { @@ -101,7 +101,7 @@ void QuickQanavaPlugin::registerTypes(const char *uri) qmlRegisterType(uri, 2, 0, "AbstractGraphView"); qmlRegisterType(uri, 2, 0, "Navigable"); qmlRegisterType(uri, 2, 0, "AbstractNavigablePreview"); - + qmlRegisterType(uri, 2, 0, "AbstractGrid"); qmlRegisterType(uri, 2, 0, "OrthoGrid"); qmlRegisterType(uri, 2, 0, "AbstractLineGrid"); diff --git a/src/qanPortItem.cpp b/src/qanPortItem.cpp index ad703bd7..07fceb5f 100644 --- a/src/qanPortItem.cpp +++ b/src/qanPortItem.cpp @@ -37,7 +37,7 @@ #include // QuickQanava headers -#include "./qanPortItem.h" +#include "qanPortItem.h" namespace qan { // ::qan diff --git a/src/qanPortItem.h b/src/qanPortItem.h index 756133c5..4d706b8e 100644 --- a/src/qanPortItem.h +++ b/src/qanPortItem.h @@ -42,8 +42,8 @@ #include // QuickQanava headers -#include "./qanNodeItem.h" -#include "./qanEdgeItem.h" +#include "qanNodeItem.h" +#include "qanEdgeItem.h" namespace qan { // ::qan diff --git a/src/qanRightResizer.cpp b/src/qanRightResizer.cpp index 755d7339..f21f983f 100644 --- a/src/qanRightResizer.cpp +++ b/src/qanRightResizer.cpp @@ -37,7 +37,7 @@ #include // QuickQanava headers -#include "./qanRightResizer.h" +#include "qanRightResizer.h" namespace qan { // ::qan diff --git a/src/qanSelectable.cpp b/src/qanSelectable.cpp index 57ac1e89..cdde44ac 100644 --- a/src/qanSelectable.cpp +++ b/src/qanSelectable.cpp @@ -33,8 +33,8 @@ //----------------------------------------------------------------------------- // QuickQanava headers -#include "./qanSelectable.h" -#include "./qanGraph.h" +#include "qanSelectable.h" +#include "qanGraph.h" namespace qan { // ::qan diff --git a/src/qanStyle.cpp b/src/qanStyle.cpp index eff8e189..8aab4126 100644 --- a/src/qanStyle.cpp +++ b/src/qanStyle.cpp @@ -36,8 +36,8 @@ #include // QuickQanava headers -#include "./qanStyle.h" -#include "./qanGraph.h" +#include "qanStyle.h" +#include "qanGraph.h" namespace qan { // ::qan @@ -282,4 +282,3 @@ const QVector& EdgeStyle::getDashPattern() const noexcept { return _dashP //----------------------------------------------------------------------------- } // ::qan - diff --git a/src/qanStyleManager.cpp b/src/qanStyleManager.cpp index 1c1b4288..0bc8c3ff 100644 --- a/src/qanStyleManager.cpp +++ b/src/qanStyleManager.cpp @@ -38,8 +38,8 @@ #include // QuickQanava headers -#include "./qanGraph.h" -#include "./qanStyleManager.h" +#include "qanGraph.h" +#include "qanStyleManager.h" namespace qan { // ::qan @@ -125,4 +125,3 @@ qan::Style* StyleManager::getStyleAt( int s ) //----------------------------------------------------------------------------- } // ::qan - diff --git a/src/qanStyleManager.h b/src/qanStyleManager.h index b1b0fd2b..4132e3c8 100755 --- a/src/qanStyleManager.h +++ b/src/qanStyleManager.h @@ -40,10 +40,10 @@ #include // QuickContainers headers -#include "../QuickContainers/include/qcmContainer.h" +#include "qcmContainer.h" // QuickQanava headers -#include "./qanStyle.h" +#include "qanStyle.h" namespace qan { // ::qan @@ -123,4 +123,3 @@ class StyleManager : public QObject QML_DECLARE_TYPE( qan::StyleManager ) #endif // qanStyleManager_h - diff --git a/src/qanUtils.cpp b/src/qanUtils.cpp index 53225608..ecf203e3 100644 --- a/src/qanUtils.cpp +++ b/src/qanUtils.cpp @@ -35,9 +35,8 @@ // Qt headers // QuickQanava headers -#include "./qanUtils.h" +#include "qanUtils.h" namespace qan { // ::qan } // ::qan -