Skip to content

Commit

Permalink
Replaced 'local' include paths with standard include style paths
Browse files Browse the repository at this point in the history
  • Loading branch information
emmenlau committed Jul 24, 2024
1 parent 8995887 commit 3a57ab5
Show file tree
Hide file tree
Showing 59 changed files with 180 additions and 187 deletions.
2 changes: 1 addition & 1 deletion src/QuickQanava
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
// \date 2016 02 04
//-----------------------------------------------------------------------------

#include "./QuickQanava.h"
#include "QuickQanava.h"
46 changes: 23 additions & 23 deletions src/QuickQanava.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,34 +35,34 @@
#pragma once

// QuickContainers headers
#include "./quickcontainers/QuickContainers.h"
#include "quickcontainers/QuickContainers.h"

// Qt header
#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 "./qanTableGroupItem.h"
#include "./qanTableBorder.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 "qanTableGroupItem.h"
#include "qanTableBorder.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) {
Expand Down
2 changes: 1 addition & 1 deletion src/gtpo/container_adapter.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#include <QSet>

// QuickContainers headers
#include "../quickcontainers/qcmContainer.h"
#include "quickcontainers/qcmContainer.h"

namespace gtpo { // ::gtpo

Expand Down
3 changes: 1 addition & 2 deletions src/gtpo/edge.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include <iterator> // std::back_inserter

// GTpo headers
#include "./graph_property.h"
#include "gtpo/graph_property.h"

namespace gtpo { // ::gtpo

Expand Down Expand Up @@ -103,4 +103,3 @@ class edge : public edge_base_t,
};

} // ::gtpo

8 changes: 4 additions & 4 deletions src/gtpo/graph.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -316,4 +316,4 @@ class graph : public graph_base_t,

} // ::gtpo

#include "./graph.hpp"
#include "gtpo/graph.hpp"
13 changes: 6 additions & 7 deletions src/gtpo/node.h
Original file line number Diff line number Diff line change
Expand Up @@ -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/qcmContainer.h"
#include "quickcontainers/qcmContainer.h"

namespace gtpo { // ::gtpo

Expand Down Expand Up @@ -182,5 +182,4 @@ class node : public node_base_t,

} // ::gtpo

#include "./node.hpp"

#include "gtpo/node.hpp"
2 changes: 1 addition & 1 deletion src/gtpo/observer.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include <utility> // c++14 std::index_sequence

// GTPO headers
#include "./observable.h"
#include "gtpo/observable.h"

namespace gtpo { // ::gtpo

Expand Down
2 changes: 1 addition & 1 deletion src/qanAnalysisTimeHeatMap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <QPainter>

// Topoi++ headers
#include "./qanAnalysisTimeHeatMap.h"
#include "qanAnalysisTimeHeatMap.h"

namespace qan { // ::qan

Expand Down
2 changes: 1 addition & 1 deletion src/qanAnalysisTimeHeatMap.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <QImage>

// QuickQanava headers
#include "./qanNavigablePreview.h"
#include "qanNavigablePreview.h"

namespace qan { // ::qan

Expand Down
6 changes: 3 additions & 3 deletions src/qanBehaviour.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 2 additions & 3 deletions src/qanBehaviour.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
#include <QQuickItem>

// QuickQanava headers
#include "./gtpo/observer.h"
#include "./qanEdge.h"
#include "gtpo/observer.h"
#include "qanEdge.h"

namespace qan { // ::qan

Expand Down Expand Up @@ -126,4 +126,3 @@ class NodeBehaviour : public QObject,
} // ::qan

QML_DECLARE_TYPE(qan::NodeBehaviour)

2 changes: 1 addition & 1 deletion src/qanBottomResizer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <QMouseEvent>

// QuickQanava headers
#include "./qanBottomResizer.h"
#include "qanBottomResizer.h"

namespace qan { // ::qan

Expand Down
2 changes: 1 addition & 1 deletion src/qanBottomRightResizer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include <QMouseEvent>

// QuickQanava headers
#include "./qanBottomRightResizer.h"
#include "qanBottomRightResizer.h"

namespace qan { // ::qan

Expand Down
10 changes: 5 additions & 5 deletions src/qanConnector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
#include <QQuickItem>

// 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

Expand Down
8 changes: 4 additions & 4 deletions src/qanConnector.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
#include <QQuickItem>

// 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

Expand Down
2 changes: 1 addition & 1 deletion src/qanDraggable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
//-----------------------------------------------------------------------------

// QuickQanava headers
#include "./qanDraggable.h"
#include "qanDraggable.h"

namespace qan { // ::qan

Expand Down
6 changes: 3 additions & 3 deletions src/qanDraggableCtrl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/qanDraggableCtrl.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
#include <QPointer>

// QuickQanava headers
#include "./qanAbstractDraggableCtrl.h"
#include "./qanGroup.h"
#include "qanAbstractDraggableCtrl.h"
#include "qanGroup.h"

namespace qan { // ::qan

Expand Down
8 changes: 4 additions & 4 deletions src/qanEdge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
#include <QPainter>

// 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

Expand Down
6 changes: 3 additions & 3 deletions src/qanEdge.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Q_MOC_INCLUDE("./qanGraph.h")
Q_MOC_INCLUDE("./qanEdgeItem.h")
Expand Down
6 changes: 3 additions & 3 deletions src/qanEdgeDraggableCtrl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/qanEdgeDraggableCtrl.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
#include <QPointer>

// QuickQanava headers
#include "./qanAbstractDraggableCtrl.h"
#include "./qanGroup.h"
#include "qanAbstractDraggableCtrl.h"
#include "qanGroup.h"

namespace qan { // ::qan

Expand Down
16 changes: 8 additions & 8 deletions src/qanEdgeItem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
#include <QPainter>

// 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

Expand Down
6 changes: 3 additions & 3 deletions src/qanEdgeItem.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
#include <QLineF>

// QuickQanava headers
#include "./qanStyle.h"
#include "./qanNodeItem.h"
#include "./qanSelectable.h"
#include "qanStyle.h"
#include "qanNodeItem.h"
#include "qanSelectable.h"

namespace qan { // ::qan

Expand Down
18 changes: 9 additions & 9 deletions src/qanGraph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@
#include <QQmlComponent>

// QuickQanava headers
#include "./qanUtils.h"
#include "./qanGraph.h"
#include "./qanNodeItem.h"
#include "./qanPortItem.h"
#include "./qanEdgeItem.h"
#include "./qanTableGroupItem.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 "qanTableGroupItem.h"
#include "qanGroup.h"
#include "qanGroupItem.h"
#include "qanConnector.h"

namespace qan { // ::qan

Expand Down
Loading

0 comments on commit 3a57ab5

Please sign in to comment.