Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
c162cde5
Commit
c162cde5
authored
May 24, 2019
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Silence some cppcheck warnings
parent
8c8ad188
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
17 deletions
+17
-17
common/BaseObjectData.hh
common/BaseObjectData.hh
+5
-5
common/perObjectData.hh
common/perObjectData.hh
+12
-12
No files found.
common/BaseObjectData.hh
View file @
c162cde5
...
...
@@ -135,12 +135,12 @@ class DLLEXPORT BaseObjectData : public BaseObject
/** Clean all data structures of the object
*
* */
virtual
void
cleanup
();
virtual
void
cleanup
()
override
;
/** @} */
virtual
void
setName
(
QString
_name
);
virtual
void
setName
(
QString
_name
)
override
;
//===========================================================================
/** @name Object visualization
...
...
@@ -155,10 +155,10 @@ class DLLEXPORT BaseObjectData : public BaseObject
virtual
void
hide
();
/// return visiblity
virtual
bool
visible
();
virtual
bool
visible
()
override
;
/// Sets visiblity of the whole Scenegraph subtree of this node
virtual
void
visible
(
bool
_visible
);
virtual
void
visible
(
bool
_visible
)
override
;
/** get the base node of this object (Use this node to add custom Nodes to the Object
* which should not be transformed with the manipulator of the Object)
...
...
@@ -298,7 +298,7 @@ class DLLEXPORT BaseObjectData : public BaseObject
*
* \note Do not call this function yourself to avoid unnecessary overhead(the core will call it via the type plugins when it is required)
*/
virtual
void
update
(
UpdateType
_type
=
UPDATE_ALL
);
virtual
void
update
(
UpdateType
_type
=
UPDATE_ALL
)
override
;
/** @} */
...
...
common/perObjectData.hh
View file @
c162cde5
...
...
@@ -93,18 +93,18 @@ class DLLEXPORT PerObjectData {
//=============================================================================
#define PER_OBJECT_DATA(_CLASS, _VALUE) \
class DLLEXPORT _CLASS : public PerObjectData { \
\
public: \
inline _CLASS() : data_( 0) { } \
inline explicit _CLASS(const _VALUE& _x) : data_(_x) { } \
inline virtual ~_CLASS() { } \
inline virtual _CLASS* copyPerObjectData() { return new _CLASS(data_); } \
inline _VALUE& data() { return data_; } \
inline const _VALUE& data() const { return data_; } \
private: \
_VALUE data_; \
#define PER_OBJECT_DATA(_CLASS, _VALUE)
\
class DLLEXPORT _CLASS : public PerObjectData {
\
\
public:
\
inline _CLASS() : data_( 0) { }
\
inline explicit _CLASS(const _VALUE& _x) : data_(_x) { }
\
inline virtual ~_CLASS() { }
\
inline virtual _CLASS* copyPerObjectData()
override
{ return new _CLASS(data_); } \
inline _VALUE& data() { return data_; }
\
inline const _VALUE& data() const { return data_; }
\
private:
\
_VALUE data_;
\
}
//=============================================================================
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment