Replaced 'local' include paths with standard include style paths

cneben · Mar 31, 2023 · 5581c83 · 5581c83
1 parent 16f5c02
commit 5581c83
Show file tree

Hide file tree

Showing 67 changed files with 214 additions and 223 deletions.
diff --git a/QuickContainers/samples/containermodel/qcmContainerModelSample.cpp b/QuickContainers/samples/containermodel/qcmContainerModelSample.cpp
@@ -34,9 +34,9 @@
 #include <QQmlContext>
 
 // 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
@@ -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
@@ -39,8 +39,8 @@
 #include <QSignalSpy>
 
 // 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
@@ -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
@@ -40,7 +40,7 @@
 // QuickQanava headers
 #include <QuickQanava.h>
 
-#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
@@ -40,7 +40,7 @@
 // QuickQanava headers
 #include <QuickQanava>
 
-#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
@@ -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
@@ -38,9 +38,9 @@
 #include <QQuickStyle>
 
 // 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
@@ -38,7 +38,7 @@
 #include <QQuickStyle>
 
 // 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
@@ -37,8 +37,8 @@
 #include <QQmlComponent>
 
 // 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
@@ -37,8 +37,8 @@
 #include <QQuickStyle>
 
 // 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
@@ -38,7 +38,7 @@
 #include <QIcon>
 
 // 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
@@ -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
@@ -33,15 +33,15 @@
 //-----------------------------------------------------------------------------
 
 // QuickQanava headers
-#include "../../src/QuickQanava.h"
+#include "QuickQanava.h"
 
 // Qt headers
 #include <QApplication>
 #include <QQuickStyle>
 #include <QIcon>
 
 // 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
@@ -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 $<$<CONFIG:Debug>: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
@@ -32,4 +32,4 @@
 // \date	2016 02 04
 //-----------------------------------------------------------------------------
 
-#include "./QuickQanava.h"
+#include "QuickQanava.h"
diff --git a/src/QuickQanava.h b/src/QuickQanava.h
@@ -41,26 +41,26 @@
 #include <QQmlEngine>
 
 // 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
@@ -46,7 +46,7 @@
 #include <QSet>
 
 // 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
@@ -40,7 +40,7 @@
 #include <iterator>         // 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
@@ -40,9 +40,9 @@
 #include <iterator>         // 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
@@ -40,13 +40,13 @@
 #include <iterator>         // 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
@@ -42,7 +42,7 @@
 #include <utility>          // 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
@@ -34,7 +34,7 @@
 #include <QPainter>
 
 // Topoi++ headers
-#include "./qanAnalysisTimeHeatMap.h"
+#include "qanAnalysisTimeHeatMap.h"
 
 namespace qan { // ::qan