Skip to content

Commit ea5e01b

Browse files
Sebastian Wieczorekrkollataj
authored andcommitted
Fixing CanRawData and CanSignalModel c++ include dependencies
1 parent f09b40c commit ea5e01b

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

src/common/datamodeltypes/canrawdata.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
#ifndef __CANRAWDATA_H
22
#define __CANRAWDATA_H
33

4+
#include <nodes/NodeData>
45
#include <nodes/NodeDataModel>
56

67
#include <QCanBusFrame>
78
#include "datadirection.h"
89

9-
using QtNodes::NodeDataType;
10-
1110
/**
1211
* @brief The class describing data model used as output for CanDevice node
1312
*/
14-
class CanRawData : public NodeData {
13+
class CanRawData : public QtNodes::NodeData {
1514
public:
1615
CanRawData(){};
1716
CanRawData(QCanBusFrame const& frame, Direction const direction = Direction::TX, bool status = true)
@@ -24,9 +23,9 @@ class CanRawData : public NodeData {
2423
* @brief Used to get data type id and displayed text for ports
2524
* @return NodeDataType of rawview
2625
*/
27-
NodeDataType type() const override
26+
QtNodes::NodeDataType type() const override
2827
{
29-
return NodeDataType{ "rawframe", "RAW" };
28+
return QtNodes::NodeDataType{ "rawframe", "RAW" };
3029
}
3130

3231
/**

src/common/datamodeltypes/cansignalmodel.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
#ifndef CANSIGNALMODEL_H
22
#define CANSIGNALMODEL_H
33

4+
#include <QVariant>
5+
#include <nodes/NodeData>
46
#include <nodes/NodeDataModel>
7+
58
#include "datadirection.h"
69

7-
class CanSignalModel : public NodeData {
10+
class CanSignalModel : public QtNodes::NodeData {
811
public:
912
CanSignalModel(){};
1013
CanSignalModel(const QString& sigName, const QVariant& value, const Direction& dir = Direction::TX)
@@ -14,9 +17,9 @@ class CanSignalModel : public NodeData {
1417
{
1518
}
1619

17-
NodeDataType type() const override
20+
QtNodes::NodeDataType type() const override
1821
{
19-
return NodeDataType{ "signal", "SIG" };
22+
return QtNodes::NodeDataType{ "signal", "SIG" };
2023
}
2124

2225
QVariant value() const

0 commit comments

Comments
 (0)