Skip to content

Commit abf6a41

Browse files
schumacbpaceholder
authored andcommitted
Apply some minor cleanup (warnings and undefined behavior) (paceholder#92)
* Surpessed warnings for unused parameters (-Wunused-parameter) in NodeDataModel * Initialized som former uninitialized members * Q_OBJECT macro removed, as it is already in base class * explicitly deleted copy constructor and assignment operator for classes with pointer members * Revert "Q_OBJECT macro removed, as it is already in base class" This reverts commit 7aaa2b8. * removed unnecessary breaks after return statements * replaced default branch of switch case with explicit enum value * hack to silence warning, this needs some proper handling * Update NodeDataModel.hpp
1 parent e0f53c1 commit abf6a41

File tree

6 files changed

+24
-19
lines changed

6 files changed

+24
-19
lines changed

examples/connection_colors/models.hpp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ class NaiveDataModel : public NodeDataModel
8383

8484
case PortType::Out:
8585
result = 2;
86-
87-
default:
86+
break;
87+
case PortType::None:
8888
break;
8989
}
9090

@@ -102,11 +102,8 @@ class NaiveDataModel : public NodeDataModel
102102
{
103103
case 0:
104104
return MyNodeData().type();
105-
break;
106-
107105
case 1:
108106
return SimpleNodeData().type();
109-
break;
110107
}
111108
break;
112109

@@ -115,17 +112,16 @@ class NaiveDataModel : public NodeDataModel
115112
{
116113
case 0:
117114
return MyNodeData().type();
118-
break;
119-
120115
case 1:
121116
return SimpleNodeData().type();
122-
break;
123117
}
124118
break;
125119

126-
default:
120+
case PortType::None:
127121
break;
128122
}
123+
// FIXME: control may reach end of non-void function [-Wreturn-type]
124+
return NodeDataType();
129125
}
130126

131127
std::shared_ptr<NodeData>

src/Connection.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ class Connection
5858
Node& nodeOut,
5959
PortIndex portIndexOut);
6060

61+
Connection(const Connection&) = delete;
62+
Connection operator=(const Connection&) = delete;
63+
6164
~Connection();
6265

6366
public:

src/ConnectionState.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ class ConnectionState
2323
: _requiredPort(port)
2424
{}
2525

26+
ConnectionState(const ConnectionState&) = delete;
27+
ConnectionState operator=(const ConnectionState&) = delete;
28+
2629
~ConnectionState();
2730

2831
public:
@@ -55,6 +58,6 @@ class ConnectionState
5558

5659
PortType _requiredPort;
5760

58-
Node* _lastHoveredNode = nullptr;
61+
Node* _lastHoveredNode{nullptr};
5962
};
6063
}

src/DataModelRegistry.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ class NODE_EDITOR_PUBLIC DataModelRegistry
2626

2727
struct TypeConverterItem
2828
{
29-
RegistryItemPtr Model;
30-
NodeDataType SourceType;
31-
NodeDataType DestinationType;
29+
RegistryItemPtr Model{};
30+
NodeDataType SourceType{};
31+
NodeDataType DestinationType{};
3232
};
3333

3434
using ConvertingTypesPair = std::pair<QString, QString>; //Source type ID, Destination type ID in this order
@@ -112,9 +112,9 @@ class NODE_EDITOR_PUBLIC DataModelRegistry
112112

113113
private:
114114

115-
RegisteredModelsCategoryMap _registeredModelsCategory;
116-
CategoriesSet _categories;
117-
RegisteredModelsMap _registeredModels;
118-
RegisteredTypeConvertersMap _registeredTypeConverters;
115+
RegisteredModelsCategoryMap _registeredModelsCategory{};
116+
CategoriesSet _categories{};
117+
RegisteredModelsMap _registeredModels{};
118+
RegisteredTypeConvertersMap _registeredTypeConverters{};
119119
};
120120
}

src/FlowView.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ class NODE_EDITOR_PUBLIC FlowView
1616

1717
FlowView(FlowScene *scene);
1818

19+
FlowView(const FlowView&) = delete;
20+
FlowView operator=(const FlowView&) = delete;
21+
1922
QAction* clearSelectionAction() const;
2023

2124
QAction* deleteSelectionAction() const;

src/NodeDataModel.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ class NODE_EDITOR_PUBLIC NodeDataModel
4747

4848
/// Port caption is used in GUI to label individual ports
4949
virtual QString
50-
portCaption(PortType portType, PortIndex portIndex) const { return QString(""); }
50+
portCaption(PortType, PortIndex) const { return QString(); }
5151

5252
/// It is possible to hide port caption in GUI
5353
virtual bool
54-
portCaptionVisible(PortType portType, PortIndex portIndex) const { return false; }
54+
portCaptionVisible(PortType, PortIndex) const { return false; }
5555

5656
/// Name makes this model unique
5757
virtual QString

0 commit comments

Comments
 (0)